From fedora-extras-commits at redhat.com  Sat Apr  1 00:33:30 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 31 Mar 2006 17:33:30 -0700
Subject: rpms/perl-Clone/devel .cvsignore, 1.2, 1.3 perl-Clone.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200604010033.k310XWId000902@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	.cvsignore perl-Clone.spec sources 
Log Message:

0.20



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Clone/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Jan 2006 16:25:53 -0000	1.2
+++ .cvsignore	1 Apr 2006 00:33:30 -0000	1.3
@@ -1 +1,2 @@
 Clone-0.18.tar.gz
+Clone-0.20.tar.gz


Index: perl-Clone.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Clone/devel/perl-Clone.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Clone.spec	28 Feb 2006 23:23:30 -0000	1.2
+++ perl-Clone.spec	1 Apr 2006 00:33:30 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Clone
-Version:        0.18
-Release:        3%{?dist}
+Version:        0.20
+Release:        1%{?dist}
 Summary:        Recursively copy perl datatypes
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -8,7 +8,7 @@
 Source0:        http://search.cpan.org/CPAN/authors/id/R/RD/RDF/Clone-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	perl(ExtUtils::ParseXS)
+BuildRequires:	perl(ExtUtils::ParseXS), perl(Taint::Runtime)
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -50,6 +50,10 @@
 
 
 %changelog
+* Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.20-1
+- bump to 0.20
+- new BR: perl-Taint-Runtime
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.18-3
 - bump for FC-5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Clone/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Jan 2006 16:25:53 -0000	1.2
+++ sources	1 Apr 2006 00:33:30 -0000	1.3
@@ -1 +1 @@
-7e37be978c939054100f40d64a2850db  Clone-0.18.tar.gz
+f369cb742a92733688a9a7b8514a2538  Clone-0.20.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  1 00:33:29 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 31 Mar 2006 17:33:29 -0700
Subject: rpms/perl-Clone/FC-5 perl-Clone.spec,1.2,1.3 sources,1.2,1.3
Message-ID: <200604010033.k310XVoO000896@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Clone/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv829/FC-5

Modified Files:
	perl-Clone.spec sources 
Log Message:

0.20



Index: perl-Clone.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Clone/FC-5/perl-Clone.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Clone.spec	28 Feb 2006 23:23:30 -0000	1.2
+++ perl-Clone.spec	1 Apr 2006 00:33:29 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Clone
-Version:        0.18
-Release:        3%{?dist}
+Version:        0.20
+Release:        1%{?dist}
 Summary:        Recursively copy perl datatypes
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -8,7 +8,7 @@
 Source0:        http://search.cpan.org/CPAN/authors/id/R/RD/RDF/Clone-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	perl(ExtUtils::ParseXS)
+BuildRequires:	perl(ExtUtils::ParseXS), perl(Taint::Runtime)
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -50,6 +50,10 @@
 
 
 %changelog
+* Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.20-1
+- bump to 0.20
+- new BR: perl-Taint-Runtime
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.18-3
 - bump for FC-5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Clone/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Jan 2006 16:25:53 -0000	1.2
+++ sources	1 Apr 2006 00:33:29 -0000	1.3
@@ -1 +1 @@
-7e37be978c939054100f40d64a2850db  Clone-0.18.tar.gz
+f369cb742a92733688a9a7b8514a2538  Clone-0.20.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  1 00:33:28 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 31 Mar 2006 17:33:28 -0700
Subject: rpms/perl-Clone/FC-3 perl-Clone.spec,1.2,1.3 sources,1.2,1.3
Message-ID: <200604010034.k310Y0Ts000906@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Clone/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv829/FC-3

Modified Files:
	perl-Clone.spec sources 
Log Message:

0.20



Index: perl-Clone.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Clone/FC-3/perl-Clone.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Clone.spec	28 Feb 2006 23:23:18 -0000	1.2
+++ perl-Clone.spec	1 Apr 2006 00:33:28 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Clone
-Version:        0.18
-Release:        3%{?dist}
+Version:        0.20
+Release:        1%{?dist}
 Summary:        Recursively copy perl datatypes
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -8,7 +8,7 @@
 Source0:        http://search.cpan.org/CPAN/authors/id/R/RD/RDF/Clone-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	perl(ExtUtils::ParseXS)
+BuildRequires:	perl(ExtUtils::ParseXS), perl(Taint::Runtime)
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -50,6 +50,10 @@
 
 
 %changelog
+* Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.20-1
+- bump to 0.20
+- new BR: perl-Taint-Runtime
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.18-3
 - bump for FC-5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Clone/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Jan 2006 16:25:53 -0000	1.2
+++ sources	1 Apr 2006 00:33:28 -0000	1.3
@@ -1 +1 @@
-7e37be978c939054100f40d64a2850db  Clone-0.18.tar.gz
+f369cb742a92733688a9a7b8514a2538  Clone-0.20.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  1 00:33:29 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 31 Mar 2006 17:33:29 -0700
Subject: rpms/perl-Clone/FC-4 perl-Clone.spec,1.2,1.3 sources,1.2,1.3
Message-ID: <200604010034.k310Y1ja000910@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Clone/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv829/FC-4

Modified Files:
	perl-Clone.spec sources 
Log Message:

0.20



Index: perl-Clone.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Clone/FC-4/perl-Clone.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Clone.spec	28 Feb 2006 23:23:24 -0000	1.2
+++ perl-Clone.spec	1 Apr 2006 00:33:28 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Clone
-Version:        0.18
-Release:        3%{?dist}
+Version:        0.20
+Release:        1%{?dist}
 Summary:        Recursively copy perl datatypes
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -8,7 +8,7 @@
 Source0:        http://search.cpan.org/CPAN/authors/id/R/RD/RDF/Clone-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	perl(ExtUtils::ParseXS)
+BuildRequires:	perl(ExtUtils::ParseXS), perl(Taint::Runtime)
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -50,6 +50,10 @@
 
 
 %changelog
+* Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.20-1
+- bump to 0.20
+- new BR: perl-Taint-Runtime
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.18-3
 - bump for FC-5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Clone/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Jan 2006 16:25:53 -0000	1.2
+++ sources	1 Apr 2006 00:33:28 -0000	1.3
@@ -1 +1 @@
-7e37be978c939054100f40d64a2850db  Clone-0.18.tar.gz
+f369cb742a92733688a9a7b8514a2538  Clone-0.20.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  1 05:33:14 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 31 Mar 2006 22:33:14 -0700
Subject: rpms/perl-Class-DBI/devel .cvsignore, 1.2, 1.3 perl-Class-DBI.spec, 
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200604010533.k315XGlb011500@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11421/devel

Modified Files:
	.cvsignore perl-Class-DBI.spec sources 
Log Message:

3.0.14



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Aug 2005 03:28:25 -0000	1.2
+++ .cvsignore	1 Apr 2006 05:33:14 -0000	1.3
@@ -1 +1,2 @@
 Class-DBI-0.96.tar.gz
+Class-DBI-v3.0.14.tar.gz


Index: perl-Class-DBI.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI/devel/perl-Class-DBI.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-DBI.spec	31 Aug 2005 23:24:19 -0000	1.2
+++ perl-Class-DBI.spec	1 Apr 2006 05:33:14 -0000	1.3
@@ -1,18 +1,18 @@
 Name:           perl-Class-DBI
-Version:        0.96
-Release:        6%{?dist}
+Version:        3.0.14
+Release:        1%{?dist}
 Summary:        Simple Database Abstraction
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Class-DBI/
-Source0:        http://search.cpan.org/CPAN/authors/id/T/TM/TMTM/Class-DBI-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/T/TM/TMTM/Class-DBI-v%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl(Class::Accessor), perl(Class::Data::Inheritable)
 BuildRequires:  perl(Class::Trigger), perl(Ima::DBI), perl(UNIVERSAL::moniker)
 BuildRequires:  perl-DBD-Pg, perl(DBD::SQLite), perl(Date::Simple)
-BuildRequires:  perl(Time::Piece::MySQL)
+BuildRequires:  perl(Time::Piece::MySQL), perl(Clone), perl(version)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:  perl(Class::Accessor), perl(Ima::DBI)
 
@@ -20,7 +20,7 @@
 %{summary}.
 
 %prep
-%setup -q -n Class-DBI-%{version}
+%setup -q -n Class-DBI-v%{version}
 perldoc -t perlgpl > COPYING
 perldoc -t perlartistic > Artistic
 
@@ -51,6 +51,12 @@
 
 
 %changelog
+* Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 3.0.14-1
+- bump to 3.0.14
+
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 3.0.13-1
+- bump to 3.0.13
+
 * Wed Aug 31 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.96-6
 - comment out make test, since it fails.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Aug 2005 03:28:25 -0000	1.2
+++ sources	1 Apr 2006 05:33:14 -0000	1.3
@@ -1 +1 @@
-5026f142435b589c31aae1a97b2f1344  Class-DBI-0.96.tar.gz
+c61f5da79207b8a8c440c10cde2b35bd  Class-DBI-v3.0.14.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  1 05:33:13 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 31 Mar 2006 22:33:13 -0700
Subject: rpms/perl-Class-DBI/FC-5 perl-Class-DBI.spec, 1.2, 1.3 sources, 1.2,
	1.3
Message-ID: <200604010533.k315XFnM011494@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11421/FC-5

Modified Files:
	perl-Class-DBI.spec sources 
Log Message:

3.0.14



Index: perl-Class-DBI.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI/FC-5/perl-Class-DBI.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-DBI.spec	31 Aug 2005 23:24:19 -0000	1.2
+++ perl-Class-DBI.spec	1 Apr 2006 05:33:13 -0000	1.3
@@ -1,18 +1,18 @@
 Name:           perl-Class-DBI
-Version:        0.96
-Release:        6%{?dist}
+Version:        3.0.14
+Release:        1%{?dist}
 Summary:        Simple Database Abstraction
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Class-DBI/
-Source0:        http://search.cpan.org/CPAN/authors/id/T/TM/TMTM/Class-DBI-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/T/TM/TMTM/Class-DBI-v%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl(Class::Accessor), perl(Class::Data::Inheritable)
 BuildRequires:  perl(Class::Trigger), perl(Ima::DBI), perl(UNIVERSAL::moniker)
 BuildRequires:  perl-DBD-Pg, perl(DBD::SQLite), perl(Date::Simple)
-BuildRequires:  perl(Time::Piece::MySQL)
+BuildRequires:  perl(Time::Piece::MySQL), perl(Clone), perl(version)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:  perl(Class::Accessor), perl(Ima::DBI)
 
@@ -20,7 +20,7 @@
 %{summary}.
 
 %prep
-%setup -q -n Class-DBI-%{version}
+%setup -q -n Class-DBI-v%{version}
 perldoc -t perlgpl > COPYING
 perldoc -t perlartistic > Artistic
 
@@ -51,6 +51,12 @@
 
 
 %changelog
+* Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 3.0.14-1
+- bump to 3.0.14
+
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 3.0.13-1
+- bump to 3.0.13
+
 * Wed Aug 31 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.96-6
 - comment out make test, since it fails.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Aug 2005 03:28:25 -0000	1.2
+++ sources	1 Apr 2006 05:33:13 -0000	1.3
@@ -1 +1 @@
-5026f142435b589c31aae1a97b2f1344  Class-DBI-0.96.tar.gz
+c61f5da79207b8a8c440c10cde2b35bd  Class-DBI-v3.0.14.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  1 05:33:07 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 31 Mar 2006 22:33:07 -0700
Subject: rpms/perl-Class-DBI/FC-3 perl-Class-DBI.spec, 1.2, 1.3 sources, 1.2,
	1.3
Message-ID: <200604010533.k315XdvI011506@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11421/FC-3

Modified Files:
	perl-Class-DBI.spec sources 
Log Message:

3.0.14



Index: perl-Class-DBI.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI/FC-3/perl-Class-DBI.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-DBI.spec	31 Aug 2005 23:24:13 -0000	1.2
+++ perl-Class-DBI.spec	1 Apr 2006 05:33:07 -0000	1.3
@@ -1,18 +1,18 @@
 Name:           perl-Class-DBI
-Version:        0.96
-Release:        6%{?dist}
+Version:        3.0.14
+Release:        1%{?dist}
 Summary:        Simple Database Abstraction
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Class-DBI/
-Source0:        http://search.cpan.org/CPAN/authors/id/T/TM/TMTM/Class-DBI-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/T/TM/TMTM/Class-DBI-v%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl(Class::Accessor), perl(Class::Data::Inheritable)
 BuildRequires:  perl(Class::Trigger), perl(Ima::DBI), perl(UNIVERSAL::moniker)
 BuildRequires:  perl-DBD-Pg, perl(DBD::SQLite), perl(Date::Simple)
-BuildRequires:  perl(Time::Piece::MySQL)
+BuildRequires:  perl(Time::Piece::MySQL), perl(Clone), perl(version)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:  perl(Class::Accessor), perl(Ima::DBI)
 
@@ -20,7 +20,7 @@
 %{summary}.
 
 %prep
-%setup -q -n Class-DBI-%{version}
+%setup -q -n Class-DBI-v%{version}
 perldoc -t perlgpl > COPYING
 perldoc -t perlartistic > Artistic
 
@@ -51,6 +51,12 @@
 
 
 %changelog
+* Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 3.0.14-1
+- bump to 3.0.14
+
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 3.0.13-1
+- bump to 3.0.13
+
 * Wed Aug 31 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.96-6
 - comment out make test, since it fails.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Aug 2005 03:28:25 -0000	1.2
+++ sources	1 Apr 2006 05:33:07 -0000	1.3
@@ -1 +1 @@
-5026f142435b589c31aae1a97b2f1344  Class-DBI-0.96.tar.gz
+c61f5da79207b8a8c440c10cde2b35bd  Class-DBI-v3.0.14.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  1 05:33:08 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 31 Mar 2006 22:33:08 -0700
Subject: rpms/perl-Class-DBI/FC-4 perl-Class-DBI.spec, 1.2, 1.3 sources, 1.2,
	1.3
Message-ID: <200604010533.k315XeRL011510@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11421/FC-4

Modified Files:
	perl-Class-DBI.spec sources 
Log Message:

3.0.14



Index: perl-Class-DBI.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI/FC-4/perl-Class-DBI.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-DBI.spec	31 Aug 2005 23:24:13 -0000	1.2
+++ perl-Class-DBI.spec	1 Apr 2006 05:33:08 -0000	1.3
@@ -1,18 +1,18 @@
 Name:           perl-Class-DBI
-Version:        0.96
-Release:        6%{?dist}
+Version:        3.0.14
+Release:        1%{?dist}
 Summary:        Simple Database Abstraction
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Class-DBI/
-Source0:        http://search.cpan.org/CPAN/authors/id/T/TM/TMTM/Class-DBI-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/T/TM/TMTM/Class-DBI-v%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl(Class::Accessor), perl(Class::Data::Inheritable)
 BuildRequires:  perl(Class::Trigger), perl(Ima::DBI), perl(UNIVERSAL::moniker)
 BuildRequires:  perl-DBD-Pg, perl(DBD::SQLite), perl(Date::Simple)
-BuildRequires:  perl(Time::Piece::MySQL)
+BuildRequires:  perl(Time::Piece::MySQL), perl(Clone), perl(version)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:  perl(Class::Accessor), perl(Ima::DBI)
 
@@ -20,7 +20,7 @@
 %{summary}.
 
 %prep
-%setup -q -n Class-DBI-%{version}
+%setup -q -n Class-DBI-v%{version}
 perldoc -t perlgpl > COPYING
 perldoc -t perlartistic > Artistic
 
@@ -51,6 +51,12 @@
 
 
 %changelog
+* Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 3.0.14-1
+- bump to 3.0.14
+
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 3.0.13-1
+- bump to 3.0.13
+
 * Wed Aug 31 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.96-6
 - comment out make test, since it fails.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Aug 2005 03:28:25 -0000	1.2
+++ sources	1 Apr 2006 05:33:08 -0000	1.3
@@ -1 +1 @@
-5026f142435b589c31aae1a97b2f1344  Class-DBI-0.96.tar.gz
+c61f5da79207b8a8c440c10cde2b35bd  Class-DBI-v3.0.14.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  1 05:40:56 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 31 Mar 2006 22:40:56 -0700
Subject: rpms/perl-Class-DBI-Loader/devel .cvsignore, 1.2,
	1.3 perl-Class-DBI-Loader.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200604010540.k315ewTX011745@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Loader/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11676/devel

Modified Files:
	.cvsignore perl-Class-DBI-Loader.spec sources 
Log Message:

0.32



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Sep 2005 18:26:15 -0000	1.2
+++ .cvsignore	1 Apr 2006 05:40:55 -0000	1.3
@@ -1 +1,2 @@
 Class-DBI-Loader-0.22.tar.gz
+Class-DBI-Loader-0.32.tar.gz


Index: perl-Class-DBI-Loader.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader/devel/perl-Class-DBI-Loader.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-Loader.spec	14 Sep 2005 18:26:15 -0000	1.1
+++ perl-Class-DBI-Loader.spec	1 Apr 2006 05:40:55 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-Loader
-Version:        0.22
-Release:        4%{?dist}
+Version:        0.32
+Release:        1%{?dist}
 Summary:        Dynamic definition of Class::DBI sub classes
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.32-1
+- bump for 0.32
+
 * Fri Sep  9 2005 Paul Howarth <paul at city-fan.org> 0.22-4
 - include POD tests in %%check, but disable failing POD coverage test
 - remove explicit Class::DBI dep because it's pulled in by other deps


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Sep 2005 18:26:15 -0000	1.2
+++ sources	1 Apr 2006 05:40:55 -0000	1.3
@@ -1 +1 @@
-fdb246040add571cffc1134184e9ca0f  Class-DBI-Loader-0.22.tar.gz
+194acde55d137c86fc44291dfb97687e  Class-DBI-Loader-0.32.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  1 05:40:49 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 31 Mar 2006 22:40:49 -0700
Subject: rpms/perl-Class-DBI-Loader/FC-3 perl-Class-DBI-Loader.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200604010541.k315fL2x011749@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Loader/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11676/FC-3

Modified Files:
	perl-Class-DBI-Loader.spec sources 
Log Message:

0.32



Index: perl-Class-DBI-Loader.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader/FC-3/perl-Class-DBI-Loader.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-Loader.spec	14 Sep 2005 18:26:15 -0000	1.1
+++ perl-Class-DBI-Loader.spec	1 Apr 2006 05:40:48 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-Loader
-Version:        0.22
-Release:        4%{?dist}
+Version:        0.32
+Release:        1%{?dist}
 Summary:        Dynamic definition of Class::DBI sub classes
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.32-1
+- bump for 0.32
+
 * Fri Sep  9 2005 Paul Howarth <paul at city-fan.org> 0.22-4
 - include POD tests in %%check, but disable failing POD coverage test
 - remove explicit Class::DBI dep because it's pulled in by other deps


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Sep 2005 18:26:15 -0000	1.2
+++ sources	1 Apr 2006 05:40:48 -0000	1.3
@@ -1 +1 @@
-fdb246040add571cffc1134184e9ca0f  Class-DBI-Loader-0.22.tar.gz
+194acde55d137c86fc44291dfb97687e  Class-DBI-Loader-0.32.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  1 05:40:49 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 31 Mar 2006 22:40:49 -0700
Subject: rpms/perl-Class-DBI-Loader/FC-4 perl-Class-DBI-Loader.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200604010541.k315fLK5011753@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Loader/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11676/FC-4

Modified Files:
	perl-Class-DBI-Loader.spec sources 
Log Message:

0.32



Index: perl-Class-DBI-Loader.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader/FC-4/perl-Class-DBI-Loader.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-Loader.spec	14 Sep 2005 18:26:15 -0000	1.1
+++ perl-Class-DBI-Loader.spec	1 Apr 2006 05:40:49 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-Loader
-Version:        0.22
-Release:        4%{?dist}
+Version:        0.32
+Release:        1%{?dist}
 Summary:        Dynamic definition of Class::DBI sub classes
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.32-1
+- bump for 0.32
+
 * Fri Sep  9 2005 Paul Howarth <paul at city-fan.org> 0.22-4
 - include POD tests in %%check, but disable failing POD coverage test
 - remove explicit Class::DBI dep because it's pulled in by other deps


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Sep 2005 18:26:15 -0000	1.2
+++ sources	1 Apr 2006 05:40:49 -0000	1.3
@@ -1 +1 @@
-fdb246040add571cffc1134184e9ca0f  Class-DBI-Loader-0.22.tar.gz
+194acde55d137c86fc44291dfb97687e  Class-DBI-Loader-0.32.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  1 05:40:50 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 31 Mar 2006 22:40:50 -0700
Subject: rpms/perl-Class-DBI-Loader/FC-5 perl-Class-DBI-Loader.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200604010541.k315fMoB011757@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Loader/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11676/FC-5

Modified Files:
	perl-Class-DBI-Loader.spec sources 
Log Message:

0.32



Index: perl-Class-DBI-Loader.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader/FC-5/perl-Class-DBI-Loader.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-Loader.spec	14 Sep 2005 18:26:15 -0000	1.1
+++ perl-Class-DBI-Loader.spec	1 Apr 2006 05:40:50 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-Loader
-Version:        0.22
-Release:        4%{?dist}
+Version:        0.32
+Release:        1%{?dist}
 Summary:        Dynamic definition of Class::DBI sub classes
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.32-1
+- bump for 0.32
+
 * Fri Sep  9 2005 Paul Howarth <paul at city-fan.org> 0.22-4
 - include POD tests in %%check, but disable failing POD coverage test
 - remove explicit Class::DBI dep because it's pulled in by other deps


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Sep 2005 18:26:15 -0000	1.2
+++ sources	1 Apr 2006 05:40:50 -0000	1.3
@@ -1 +1 @@
-fdb246040add571cffc1134184e9ca0f  Class-DBI-Loader-0.22.tar.gz
+194acde55d137c86fc44291dfb97687e  Class-DBI-Loader-0.32.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  1 05:45:21 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 31 Mar 2006 22:45:21 -0700
Subject: rpms/perl-Class-DBI-Plugin-RetrieveAll/devel .cvsignore, 1.3,
	1.4 perl-Class-DBI-Plugin-RetrieveAll.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200604010545.k315jN96011993@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11922/devel

Modified Files:
	.cvsignore perl-Class-DBI-Plugin-RetrieveAll.spec sources 
Log Message:

1.04



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Jan 2006 16:54:31 -0000	1.3
+++ .cvsignore	1 Apr 2006 05:45:21 -0000	1.4
@@ -1,2 +1,3 @@
 Class-DBI-Plugin-RetrieveAll-1.01.tar.gz
 Class-DBI-Plugin-RetrieveAll-1.02.tar.gz
+Class-DBI-Plugin-RetrieveAll-1.04.tar.gz


Index: perl-Class-DBI-Plugin-RetrieveAll.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/devel/perl-Class-DBI-Plugin-RetrieveAll.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-DBI-Plugin-RetrieveAll.spec	5 Jan 2006 16:54:31 -0000	1.2
+++ perl-Class-DBI-Plugin-RetrieveAll.spec	1 Apr 2006 05:45:21 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-Class-DBI-Plugin-RetrieveAll
-Version:        1.02
+Version:        1.04
 Release:        1%{?dist}
 Summary:        More complex retrieve_all() for Class::DBI
 Group:          Development/Libraries
@@ -46,6 +46,9 @@
 
 
 %changelog
+* Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.04-1
+- bump to 1.04
+
 * Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.02-1
 - bump to 1.02
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Jan 2006 16:54:31 -0000	1.3
+++ sources	1 Apr 2006 05:45:21 -0000	1.4
@@ -1 +1 @@
-69480add94fa1800c9db2c8da87f40f2  Class-DBI-Plugin-RetrieveAll-1.02.tar.gz
+859fe774e6d74636b6406b821d4d66d1  Class-DBI-Plugin-RetrieveAll-1.04.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  1 05:45:14 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 31 Mar 2006 22:45:14 -0700
Subject: rpms/perl-Class-DBI-Plugin-RetrieveAll/FC-3
	perl-Class-DBI-Plugin-RetrieveAll.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200604010545.k315jkSM011997@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11922/FC-3

Modified Files:
	perl-Class-DBI-Plugin-RetrieveAll.spec sources 
Log Message:

1.04



Index: perl-Class-DBI-Plugin-RetrieveAll.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/FC-3/perl-Class-DBI-Plugin-RetrieveAll.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-DBI-Plugin-RetrieveAll.spec	5 Jan 2006 16:54:19 -0000	1.2
+++ perl-Class-DBI-Plugin-RetrieveAll.spec	1 Apr 2006 05:45:14 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-Class-DBI-Plugin-RetrieveAll
-Version:        1.02
+Version:        1.04
 Release:        1%{?dist}
 Summary:        More complex retrieve_all() for Class::DBI
 Group:          Development/Libraries
@@ -46,6 +46,9 @@
 
 
 %changelog
+* Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.04-1
+- bump to 1.04
+
 * Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.02-1
 - bump to 1.02
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Jan 2006 16:54:19 -0000	1.3
+++ sources	1 Apr 2006 05:45:14 -0000	1.4
@@ -1 +1 @@
-69480add94fa1800c9db2c8da87f40f2  Class-DBI-Plugin-RetrieveAll-1.02.tar.gz
+859fe774e6d74636b6406b821d4d66d1  Class-DBI-Plugin-RetrieveAll-1.04.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  1 05:45:16 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 31 Mar 2006 22:45:16 -0700
Subject: rpms/perl-Class-DBI-Plugin-RetrieveAll/FC-5
	perl-Class-DBI-Plugin-RetrieveAll.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200604010545.k315jmZl012003@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11922/FC-5

Modified Files:
	perl-Class-DBI-Plugin-RetrieveAll.spec sources 
Log Message:

1.04



Index: perl-Class-DBI-Plugin-RetrieveAll.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/FC-5/perl-Class-DBI-Plugin-RetrieveAll.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-DBI-Plugin-RetrieveAll.spec	5 Jan 2006 16:54:31 -0000	1.2
+++ perl-Class-DBI-Plugin-RetrieveAll.spec	1 Apr 2006 05:45:16 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-Class-DBI-Plugin-RetrieveAll
-Version:        1.02
+Version:        1.04
 Release:        1%{?dist}
 Summary:        More complex retrieve_all() for Class::DBI
 Group:          Development/Libraries
@@ -46,6 +46,9 @@
 
 
 %changelog
+* Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.04-1
+- bump to 1.04
+
 * Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.02-1
 - bump to 1.02
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Jan 2006 16:54:31 -0000	1.3
+++ sources	1 Apr 2006 05:45:16 -0000	1.4
@@ -1 +1 @@
-69480add94fa1800c9db2c8da87f40f2  Class-DBI-Plugin-RetrieveAll-1.02.tar.gz
+859fe774e6d74636b6406b821d4d66d1  Class-DBI-Plugin-RetrieveAll-1.04.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  1 05:45:15 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 31 Mar 2006 22:45:15 -0700
Subject: rpms/perl-Class-DBI-Plugin-RetrieveAll/FC-4
	perl-Class-DBI-Plugin-RetrieveAll.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200604010545.k315jlVE012001@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11922/FC-4

Modified Files:
	perl-Class-DBI-Plugin-RetrieveAll.spec sources 
Log Message:

1.04



Index: perl-Class-DBI-Plugin-RetrieveAll.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/FC-4/perl-Class-DBI-Plugin-RetrieveAll.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-DBI-Plugin-RetrieveAll.spec	5 Jan 2006 16:54:25 -0000	1.2
+++ perl-Class-DBI-Plugin-RetrieveAll.spec	1 Apr 2006 05:45:15 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-Class-DBI-Plugin-RetrieveAll
-Version:        1.02
+Version:        1.04
 Release:        1%{?dist}
 Summary:        More complex retrieve_all() for Class::DBI
 Group:          Development/Libraries
@@ -46,6 +46,9 @@
 
 
 %changelog
+* Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.04-1
+- bump to 1.04
+
 * Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.02-1
 - bump to 1.02
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Jan 2006 16:54:25 -0000	1.3
+++ sources	1 Apr 2006 05:45:15 -0000	1.4
@@ -1 +1 @@
-69480add94fa1800c9db2c8da87f40f2  Class-DBI-Plugin-RetrieveAll-1.02.tar.gz
+859fe774e6d74636b6406b821d4d66d1  Class-DBI-Plugin-RetrieveAll-1.04.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  1 10:58:01 2006
From: fedora-extras-commits at redhat.com (Duncan Ferguson (duncs))
Date: Sat,  1 Apr 2006 03:58:01 -0700
Subject: rpms/perl-X11-Protocol/FC-3 perl-X11-Protocol.spec,1.2,1.3
Message-ID: <200604011058.k31Aw3jf022550@cvs-int.fedora.redhat.com>

Author: duncs

Update of /cvs/extras/rpms/perl-X11-Protocol/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22533

Modified Files:
	perl-X11-Protocol.spec 
Log Message:
Fix potential bug in specfile


Index: perl-X11-Protocol.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-X11-Protocol/FC-3/perl-X11-Protocol.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-X11-Protocol.spec	31 Mar 2006 18:01:07 -0000	1.2
+++ perl-X11-Protocol.spec	1 Apr 2006 10:58:01 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-X11-Protocol
 Version:        0.55
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        X11-Protocol - Raw interface to X Window System servers
 
 Group:          Development/Libraries
@@ -29,7 +29,7 @@
 
 # Testing requires X - use "rpmbuild --with X"
 %{!?_with_X:\
-%{__perl} -pi -e 'print "print \"Remaining tests require X\n\"; exit 0;"
+%{__perl} -pi -e 'print "print \"Remaining tests require X\n\"; exit 0;" \
 			if /Insert your test code below/;' test.pl \
 }
 
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Sat Apr 01 2006 Duncan Ferguson <duncan_j_ferguson at yahoo.co.uk> 0.55-2
+- Specfile bugfile
+
 * Fri Mar 31 2006 Duncan Ferguson <duncan_j_ferguson at yahoo.co.uk> 0.55-1
 - Update to new version of X11::Protocol
 



From fedora-extras-commits at redhat.com  Sat Apr  1 12:03:28 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sat,  1 Apr 2006 05:03:28 -0700
Subject: rpms/ser/FC-3 ser.spec,1.2,1.3
Message-ID: <200604011203.k31C3UIn027111@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ser/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27084

Modified Files:
	ser.spec 
Log Message:
* Thu Mar 30 2006 Andreas Thienemann <andreas at bawue.net> 0.9.6-5
- Do not package serweb for FC-3, as we do not have MySQL 4



Index: ser.spec
===================================================================
RCS file: /cvs/extras/rpms/ser/FC-3/ser.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ser.spec	30 Mar 2006 16:34:29 -0000	1.2
+++ ser.spec	1 Apr 2006 12:03:28 -0000	1.3
@@ -1,10 +1,14 @@
 %define special_modules mysql jabber cpl-c postgres pa
 %define serweb_version 0.9.4
 
+%if "%{fedora}" >= "4"
+   %define serweb true
+%endif
+
 Summary: SIP Express Router
 Name: ser
 Version: 0.9.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://ftp.iptel.org/pub/ser/latest/src/ser-%{version}_src.tar.gz
@@ -191,16 +195,24 @@
 %{_libdir}/ser/modules/postgres.so
 %{_sbindir}/serpgctl
 
+# Only package, if dependencies can be met
+%if "%{serweb}" == "true"
+
 %files serweb
 %defattr(-,root,root,-)
 %doc serweb-%{serweb_version}/README serweb-%{serweb_version}/INSTALL serweb-%{serweb_version}/COPYING serweb-%{serweb_version}/CHANGELOG
 %dir %{_datadir}/serweb
 %{_datadir}/serweb/*
 %dir %{_sysconfdir}/ser/serweb
-%config(noreplace) %{_sysconfdir}/ser/serweb/*.php
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/serweb.conf
+%config(noreplace) %{_sysconfdir}/ser/serweb/*.php
+
+%endif
 
 %changelog
+* Thu Mar 30 2006 Andreas Thienemann <andreas at bawue.net> 0.9.6-5
+- Do not package serweb for FC-3, as we do not have MySQL 4
+
 * Thu Mar 30 2006 Andreas Thienemann <andreas at bawue.net> 0.9.6-4
 - Fix buildissue with %%{_libdir}
 



From fedora-extras-commits at redhat.com  Sat Apr  1 12:19:16 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sat,  1 Apr 2006 05:19:16 -0700
Subject: rpms/ser/FC-3 ser.spec,1.3,1.4
Message-ID: <200604011219.k31CJIp7027196@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ser/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27179

Modified Files:
	ser.spec 
Log Message:
* Thu Apr 01 2006 Andreas Thienemann <andreas at bawue.net> 0.9.6-6
- *bump*



Index: ser.spec
===================================================================
RCS file: /cvs/extras/rpms/ser/FC-3/ser.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ser.spec	1 Apr 2006 12:03:28 -0000	1.3
+++ ser.spec	1 Apr 2006 12:19:16 -0000	1.4
@@ -8,7 +8,7 @@
 Summary: SIP Express Router
 Name: ser
 Version: 0.9.6
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://ftp.iptel.org/pub/ser/latest/src/ser-%{version}_src.tar.gz
@@ -140,6 +140,8 @@
 ls README.* | grep -v -E '(mysql|postgres)' | sed -e 's/\(.*\)/%doc \1/' >> filelist
 
 # serweb configuration
+%if "%{serweb}" == "true"
+
 mkdir -p %{buildroot}%{_datadir}/serweb
 mkdir -p %{buildroot}%{_sysconfdir}/ser/serweb
 find serweb-%{serweb_version} -name '.cvsignore' -exec rm -f {} \;
@@ -149,6 +151,8 @@
 cp -rP serweb-%{serweb_version}/config/* %{buildroot}%{_sysconfdir}/ser/serweb/
 install -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/serweb.conf
 
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -210,7 +214,10 @@
 %endif
 
 %changelog
-* Thu Mar 30 2006 Andreas Thienemann <andreas at bawue.net> 0.9.6-5
+* Thu Apr 01 2006 Andreas Thienemann <andreas at bawue.net> 0.9.6-6
+- *bump*
+
+* Thu Apr 01 2006 Andreas Thienemann <andreas at bawue.net> 0.9.6-5
 - Do not package serweb for FC-3, as we do not have MySQL 4
 
 * Thu Mar 30 2006 Andreas Thienemann <andreas at bawue.net> 0.9.6-4



From fedora-extras-commits at redhat.com  Sat Apr  1 12:43:07 2006
From: fedora-extras-commits at redhat.com (Jeff Sheltren (sheltren))
Date: Sat,  1 Apr 2006 05:43:07 -0700
Subject: rpms/cfengine/FC-5 .cvsignore, 1.10, 1.11 cfengine.spec, 1.16,
	1.17 sources, 1.10, 1.11
Message-ID: <200604011243.k31Ch92m027373@cvs-int.fedora.redhat.com>

Author: sheltren

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

Modified Files:
	.cvsignore cfengine.spec sources 
Log Message:
Update to upstream 2.1.20



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cfengine/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	3 Mar 2006 13:12:26 -0000	1.10
+++ .cvsignore	1 Apr 2006 12:43:07 -0000	1.11
@@ -1,4 +1,4 @@
-cfengine-2.1.19p1.tar.gz
+cfengine-2.1.20.tar.gz
 cfenvd
 cfexecd
 cfservd


Index: cfengine.spec
===================================================================
RCS file: /cvs/extras/rpms/cfengine/FC-5/cfengine.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- cfengine.spec	3 Mar 2006 13:12:26 -0000	1.16
+++ cfengine.spec	1 Apr 2006 12:43:07 -0000	1.17
@@ -1,10 +1,10 @@
 Summary: A systems administration tool for networks
 Name: cfengine
-Version: 2.1.19p1
+Version: 2.1.20
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System
-Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.19p1.tar.gz
+Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.20.tar.gz
 Source1: cfexecd
 Source2: cfservd
 Source3: cfenvd
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Fri Mar 31 2006 Jeff Sheltren <sheltren at cs.ucsb.edu> - 2.1.20-1
+- Update to upstream 2.1.20
+
 * Thu Mar  2 2006 Jeff Sheltren <sheltren at cs.ucsb.edu> - 2.1.19p1-1
 - Update to upstream 2.1.19p1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cfengine/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	3 Mar 2006 13:12:26 -0000	1.10
+++ sources	1 Apr 2006 12:43:07 -0000	1.11
@@ -1,4 +1,4 @@
-0524e0bcbf947d021c78f8c37461c323  cfengine-2.1.19p1.tar.gz
+2510349fef9ccc47d80f133d4a35322e  cfengine-2.1.20.tar.gz
 37c565f98d2b252c9c6cf1c88d654e02  cfenvd
 19f07f0d576abf8bf8cb875ab6ad66c6  cfexecd
 fe6c086a41f428d47bde30646e0310c4  cfservd



From fedora-extras-commits at redhat.com  Sat Apr  1 12:47:11 2006
From: fedora-extras-commits at redhat.com (Jeff Sheltren (sheltren))
Date: Sat,  1 Apr 2006 05:47:11 -0700
Subject: rpms/cfengine/FC-4 .cvsignore, 1.10, 1.11 cfengine.spec, 1.14,
	1.15 sources, 1.10, 1.11
Message-ID: <200604011247.k31ClD5l027454@cvs-int.fedora.redhat.com>

Author: sheltren

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

Modified Files:
	.cvsignore cfengine.spec sources 
Log Message:
Update to upstream 2.1.20



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cfengine/FC-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	3 Mar 2006 13:14:40 -0000	1.10
+++ .cvsignore	1 Apr 2006 12:47:11 -0000	1.11
@@ -1,4 +1,4 @@
-cfengine-2.1.19p1.tar.gz
+cfengine-2.1.20.tar.gz
 cfenvd
 cfexecd
 cfservd


Index: cfengine.spec
===================================================================
RCS file: /cvs/extras/rpms/cfengine/FC-4/cfengine.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- cfengine.spec	3 Mar 2006 13:14:40 -0000	1.14
+++ cfengine.spec	1 Apr 2006 12:47:11 -0000	1.15
@@ -1,10 +1,10 @@
 Summary: A systems administration tool for networks
 Name: cfengine
-Version: 2.1.19p1
+Version: 2.1.20
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System
-Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.19p1.tar.gz
+Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.20.tar.gz
 Source1: cfexecd
 Source2: cfservd
 Source3: cfenvd
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Fri Mar 31 2006 Jeff Sheltren <sheltren at cs.ucsb.edu> - 2.1.20-1
+- Update to upstream 2.1.20
+
 * Thu Mar  2 2006 Jeff Sheltren <sheltren at cs.ucsb.edu> - 2.1.19p1-1
 - Update to upstream 2.1.19p1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cfengine/FC-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	3 Mar 2006 13:14:40 -0000	1.10
+++ sources	1 Apr 2006 12:47:11 -0000	1.11
@@ -1,4 +1,4 @@
-0524e0bcbf947d021c78f8c37461c323  cfengine-2.1.19p1.tar.gz
+2510349fef9ccc47d80f133d4a35322e  cfengine-2.1.20.tar.gz
 37c565f98d2b252c9c6cf1c88d654e02  cfenvd
 19f07f0d576abf8bf8cb875ab6ad66c6  cfexecd
 fe6c086a41f428d47bde30646e0310c4  cfservd



From fedora-extras-commits at redhat.com  Sat Apr  1 12:49:00 2006
From: fedora-extras-commits at redhat.com (Jeff Sheltren (sheltren))
Date: Sat,  1 Apr 2006 05:49:00 -0700
Subject: rpms/cfengine/FC-3 .cvsignore, 1.11, 1.12 cfengine.spec, 1.13,
	1.14 sources, 1.11, 1.12
Message-ID: <200604011249.k31Cn2dR027533@cvs-int.fedora.redhat.com>

Author: sheltren

Update of /cvs/extras/rpms/cfengine/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27512

Modified Files:
	.cvsignore cfengine.spec sources 
Log Message:
Update to upstream 2.1.20



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cfengine/FC-3/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	3 Mar 2006 13:16:15 -0000	1.11
+++ .cvsignore	1 Apr 2006 12:49:00 -0000	1.12
@@ -1,4 +1,4 @@
-cfengine-2.1.19p1.tar.gz
+cfengine-2.1.20.tar.gz
 cfenvd
 cfexecd
 cfservd


Index: cfengine.spec
===================================================================
RCS file: /cvs/extras/rpms/cfengine/FC-3/cfengine.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- cfengine.spec	3 Mar 2006 13:16:15 -0000	1.13
+++ cfengine.spec	1 Apr 2006 12:49:00 -0000	1.14
@@ -1,10 +1,10 @@
 Summary: A systems administration tool for networks
 Name: cfengine
-Version: 2.1.19p1
+Version: 2.1.20
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System
-Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.19p1.tar.gz
+Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.20.tar.gz
 Source1: cfexecd
 Source2: cfservd
 Source3: cfenvd
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Fri Mar 31 2006 Jeff Sheltren <sheltren at cs.ucsb.edu> - 2.1.20-1
+- Update to upstream 2.1.20
+
 * Thu Mar  2 2006 Jeff Sheltren <sheltren at cs.ucsb.edu> - 2.1.19p1-1
 - Update to upstream 2.1.19p1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cfengine/FC-3/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	3 Mar 2006 13:16:15 -0000	1.11
+++ sources	1 Apr 2006 12:49:00 -0000	1.12
@@ -1,4 +1,4 @@
-0524e0bcbf947d021c78f8c37461c323  cfengine-2.1.19p1.tar.gz
+2510349fef9ccc47d80f133d4a35322e  cfengine-2.1.20.tar.gz
 37c565f98d2b252c9c6cf1c88d654e02  cfenvd
 19f07f0d576abf8bf8cb875ab6ad66c6  cfexecd
 fe6c086a41f428d47bde30646e0310c4  cfservd



From fedora-extras-commits at redhat.com  Sat Apr  1 12:50:33 2006
From: fedora-extras-commits at redhat.com (Jeff Sheltren (sheltren))
Date: Sat,  1 Apr 2006 05:50:33 -0700
Subject: rpms/cfengine/devel .cvsignore, 1.10, 1.11 cfengine.spec, 1.16,
	1.17 sources, 1.10, 1.11
Message-ID: <200604011250.k31CoZ3W027612@cvs-int.fedora.redhat.com>

Author: sheltren

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

Modified Files:
	.cvsignore cfengine.spec sources 
Log Message:
Update to upstream 2.1.20



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cfengine/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	3 Mar 2006 13:12:26 -0000	1.10
+++ .cvsignore	1 Apr 2006 12:50:33 -0000	1.11
@@ -1,4 +1,4 @@
-cfengine-2.1.19p1.tar.gz
+cfengine-2.1.20.tar.gz
 cfenvd
 cfexecd
 cfservd


Index: cfengine.spec
===================================================================
RCS file: /cvs/extras/rpms/cfengine/devel/cfengine.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- cfengine.spec	3 Mar 2006 13:12:26 -0000	1.16
+++ cfengine.spec	1 Apr 2006 12:50:33 -0000	1.17
@@ -1,10 +1,10 @@
 Summary: A systems administration tool for networks
 Name: cfengine
-Version: 2.1.19p1
+Version: 2.1.20
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System
-Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.19p1.tar.gz
+Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.20.tar.gz
 Source1: cfexecd
 Source2: cfservd
 Source3: cfenvd
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Fri Mar 31 2006 Jeff Sheltren <sheltren at cs.ucsb.edu> - 2.1.20-1
+- Update to upstream 2.1.20
+
 * Thu Mar  2 2006 Jeff Sheltren <sheltren at cs.ucsb.edu> - 2.1.19p1-1
 - Update to upstream 2.1.19p1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cfengine/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	3 Mar 2006 13:12:26 -0000	1.10
+++ sources	1 Apr 2006 12:50:33 -0000	1.11
@@ -1,4 +1,4 @@
-0524e0bcbf947d021c78f8c37461c323  cfengine-2.1.19p1.tar.gz
+2510349fef9ccc47d80f133d4a35322e  cfengine-2.1.20.tar.gz
 37c565f98d2b252c9c6cf1c88d654e02  cfenvd
 19f07f0d576abf8bf8cb875ab6ad66c6  cfexecd
 fe6c086a41f428d47bde30646e0310c4  cfservd



From fedora-extras-commits at redhat.com  Sat Apr  1 15:36:13 2006
From: fedora-extras-commits at redhat.com (James Bowes (jbowes))
Date: Sat,  1 Apr 2006 08:36:13 -0700
Subject: rpms/pwgen - New directory
Message-ID: <200604011536.k31FaFYY001844@cvs-int.fedora.redhat.com>

Author: jbowes

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

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




From fedora-extras-commits at redhat.com  Sat Apr  1 15:36:13 2006
From: fedora-extras-commits at redhat.com (James Bowes (jbowes))
Date: Sat,  1 Apr 2006 08:36:13 -0700
Subject: rpms/pwgen/devel - New directory
Message-ID: <200604011536.k31FaFM4001847@cvs-int.fedora.redhat.com>

Author: jbowes

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

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




From fedora-extras-commits at redhat.com  Sat Apr  1 15:36:26 2006
From: fedora-extras-commits at redhat.com (James Bowes (jbowes))
Date: Sat,  1 Apr 2006 08:36:26 -0700
Subject: rpms/pwgen Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604011536.k31FaSEK001893@cvs-int.fedora.redhat.com>

Author: jbowes

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

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


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

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

common : CVS/Root
	@cvs 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 Apr  1 15:36:27 2006
From: fedora-extras-commits at redhat.com (James Bowes (jbowes))
Date: Sat,  1 Apr 2006 08:36:27 -0700
Subject: rpms/pwgen/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200604011536.k31FaTZh001896@cvs-int.fedora.redhat.com>

Author: jbowes

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

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


--- 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 Apr  1 15:36:47 2006
From: fedora-extras-commits at redhat.com (James Bowes (jbowes))
Date: Sat,  1 Apr 2006 08:36:47 -0700
Subject: rpms/pwgen import.log,1.1,1.2
Message-ID: <200604011537.k31FbJXI001968@cvs-int.fedora.redhat.com>

Author: jbowes

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pwgen/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	1 Apr 2006 15:36:26 -0000	1.1
+++ import.log	1 Apr 2006 15:36:47 -0000	1.2
@@ -0,0 +1 @@
+pwgen-2_05-3:HEAD:pwgen-2.05-3.src.rpm:1143905804



From fedora-extras-commits at redhat.com  Sat Apr  1 15:36:48 2006
From: fedora-extras-commits at redhat.com (James Bowes (jbowes))
Date: Sat,  1 Apr 2006 08:36:48 -0700
Subject: rpms/pwgen/devel pwgen.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200604011537.k31FbK52001974@cvs-int.fedora.redhat.com>

Author: jbowes

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

Modified Files:
	.cvsignore sources 
Added Files:
	pwgen.spec 
Log Message:
auto-import pwgen-2.05-3 on branch devel from pwgen-2.05-3.src.rpm


--- NEW FILE pwgen.spec ---
Name:           pwgen
Version:        2.05
Release:        3%{?dist}
Summary:        Automatic password generation

Group:          Applications/System
License:        GPL 
URL:            http://sf.net/projects/pwgen
Source0:        http://dl.sf.net/pwgen/pwgen-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
pwgen generates random, meaningless but pronounceable passwords. These
passwords contain either only lowercase letters, or upper and lower case, or
upper case, lower case and numeric digits. Upper case letters and numeric
digits are placed in a way that eases memorizing the password.

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


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


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog
%{_bindir}/pwgen
%{_mandir}/man1/pwgen.1.*


%changelog
* Sat Mar 25 2006 James Bowes <jbowes at redhat.com> - 2.05-3
- Add dist tag to release.
- Don't strip binary, since rpmbuild will do it.
* Fri Mar 24 2006 James Bowes <jbowes at redhat.com> - 2.05-2
- Use url for Source0 in spec file.
- Use glob for man page extension.
- Increment release number.
* Sun Mar 12 2006 James Bowes <jbowes at redhat.com> - 2.05-1
- Initial Fedora packaging.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pwgen/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Apr 2006 15:36:26 -0000	1.1
+++ .cvsignore	1 Apr 2006 15:36:48 -0000	1.2
@@ -0,0 +1 @@
+pwgen-2.05.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pwgen/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Apr 2006 15:36:26 -0000	1.1
+++ sources	1 Apr 2006 15:36:48 -0000	1.2
@@ -0,0 +1 @@
+b94546a346cb352054ea2d3d09f7f885  pwgen-2.05.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  1 15:49:41 2006
From: fedora-extras-commits at redhat.com (James Bowes (jbowes))
Date: Sat,  1 Apr 2006 08:49:41 -0700
Subject: owners owners.list,1.787,1.788
Message-ID: <200604011549.k31Fnh0e002086@cvs-int.fedora.redhat.com>

Author: jbowes

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

Modified Files:
	owners.list 
Log Message:
Add myself as pwgen owner


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.787
retrieving revision 1.788
diff -u -r1.787 -r1.788
--- owners.list	31 Mar 2006 22:45:51 -0000	1.787
+++ owners.list	1 Apr 2006 15:49:41 -0000	1.788
@@ -1158,6 +1158,7 @@
 Fedora Extras|pth|GNU Pth - The GNU Portable Threads|bugs.michael at gmx.net|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|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|
 Fedora Extras|pydot|Python interface to Graphviz's Dot language|tcallawa at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Apr  1 15:52:44 2006
From: fedora-extras-commits at redhat.com (James Bowes (jbowes))
Date: Sat,  1 Apr 2006 08:52:44 -0700
Subject: rpms/pwgen/devel pwgen.spec,1.1,1.2
Message-ID: <200604011552.k31FqkW5002122@cvs-int.fedora.redhat.com>

Author: jbowes

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

Modified Files:
	pwgen.spec 
Log Message:
Fix man page file globbing. Add spaces between changelog entries.


Index: pwgen.spec
===================================================================
RCS file: /cvs/extras/rpms/pwgen/devel/pwgen.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pwgen.spec	1 Apr 2006 15:36:48 -0000	1.1
+++ pwgen.spec	1 Apr 2006 15:52:44 -0000	1.2
@@ -37,16 +37,17 @@
 %defattr(-,root,root,-)
 %doc ChangeLog
 %{_bindir}/pwgen
-%{_mandir}/man1/pwgen.1.*
+%{_mandir}/man1/pwgen.1*
 
 
 %changelog
 * Sat Mar 25 2006 James Bowes <jbowes at redhat.com> - 2.05-3
 - Add dist tag to release.
 - Don't strip binary, since rpmbuild will do it.
+
 * Fri Mar 24 2006 James Bowes <jbowes at redhat.com> - 2.05-2
 - Use url for Source0 in spec file.
 - Use glob for man page extension.
-- Increment release number.
+
 * Sun Mar 12 2006 James Bowes <jbowes at redhat.com> - 2.05-1
 - Initial Fedora packaging.



From fedora-extras-commits at redhat.com  Sat Apr  1 18:01:02 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  1 Apr 2006 11:01:02 -0700
Subject: rpms/libmpcdec - New directory
Message-ID: <200604011801.k31I14Ji008283@cvs-int.fedora.redhat.com>

Author: rdieter

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

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




From fedora-extras-commits at redhat.com  Sat Apr  1 18:01:03 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  1 Apr 2006 11:01:03 -0700
Subject: rpms/libmpcdec/devel - New directory
Message-ID: <200604011801.k31I15U7008404@cvs-int.fedora.redhat.com>

Author: rdieter

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

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




From fedora-extras-commits at redhat.com  Sat Apr  1 18:01:12 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  1 Apr 2006 11:01:12 -0700
Subject: rpms/libmpcdec Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604011801.k31I1FUO008508@cvs-int.fedora.redhat.com>

Author: rdieter

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

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


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

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

common : CVS/Root
	@cvs 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 Apr  1 18:01:18 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  1 Apr 2006 11:01:18 -0700
Subject: rpms/libmpcdec/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604011801.k31I1Lii008528@cvs-int.fedora.redhat.com>

Author: rdieter

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

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


--- 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 Apr  1 18:01:55 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  1 Apr 2006 11:01:55 -0700
Subject: rpms/libmpcdec import.log,1.1,1.2
Message-ID: <200604011802.k31I2VEa008604@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	import.log 
Log Message:
auto-import libmpcdec-1.2.2-1 on branch devel from libmpcdec-1.2.2-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libmpcdec/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	1 Apr 2006 18:01:12 -0000	1.1
+++ import.log	1 Apr 2006 18:01:55 -0000	1.2
@@ -0,0 +1 @@
+libmpcdec-1_2_2-1:HEAD:libmpcdec-1.2.2-1.src.rpm:1143914510



From fedora-extras-commits at redhat.com  Sat Apr  1 18:02:00 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  1 Apr 2006 11:02:00 -0700
Subject: rpms/libmpcdec/devel libmpcdec.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604011802.k31I2YDa008606@cvs-int.fedora.redhat.com>

Author: rdieter

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

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


--- NEW FILE libmpcdec.spec ---

Summary: Musepack audio decoding library
Name:	 libmpcdec
Version: 1.2.2
Release: 1%{?dist}

License: LGPL
Group: 	 System Environment/Libraries
URL: 	 http://www.musepack.net/
Source:	 http://files2.musepack.net/source/libmpcdec-1.2.2.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Musepack is an audio compression format with a strong emphasis on high quality.
It's not lossless, but it is designed for transparency, so that you won't be
able to hear differences between the original wave file and the much smaller
MPC file.
It is based on the MPEG-1 Layer-2 / MP2 algorithms, but has rapidly developed
and vastly improved and is now at an advanced stage in which it contains
heavily optimized and patentless code.


%package devel
Summary: Development files for the Musepack audio decoding library
Group:	 Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
%{summary}.


%prep
%setup -q


%build
%configure --disable-static

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT

#Unpackaged files
rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la


%clean
rm -rf $RPM_BUILD_ROOT 


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


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

%files devel
%defattr(-,root,root,-)
%doc docs/html/*
%{_includedir}/*
%{_libdir}/lib*.so


%changelog
* Thu Jan 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.2.2-1
- libmpcdec-1.2.2

* Thu Jan 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.1-2
- cleanup

* Fri Jun 17 2005 Mihai Maties <mihai at xcyb.org> 1.1-1
- update to 1.1
- changed license to BSD
- updated the spec to use autotools

* Fri Nov 26 2004 Matthias Saou <http://freshrpms.net/> 1.0.2-1
- Initial RPM release.
- Include the mandatory copy of the LGPL (there is none in the sources...).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libmpcdec/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Apr 2006 18:01:18 -0000	1.1
+++ .cvsignore	1 Apr 2006 18:02:00 -0000	1.2
@@ -0,0 +1 @@
+libmpcdec-1.2.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libmpcdec/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Apr 2006 18:01:18 -0000	1.1
+++ sources	1 Apr 2006 18:02:00 -0000	1.2
@@ -0,0 +1 @@
+f14e07285b9b102a806649074c1d779b  libmpcdec-1.2.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Apr  1 18:08:13 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  1 Apr 2006 11:08:13 -0700
Subject: rpms/libmpcdec/devel libmpcdec.spec,1.1,1.2
Message-ID: <200604011808.k31I8Fl2008701@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	libmpcdec.spec 
Log Message:
* Sat Apr 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.2.2-2
- License: BSD



Index: libmpcdec.spec
===================================================================
RCS file: /cvs/extras/rpms/libmpcdec/devel/libmpcdec.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libmpcdec.spec	1 Apr 2006 18:02:00 -0000	1.1
+++ libmpcdec.spec	1 Apr 2006 18:08:13 -0000	1.2
@@ -2,9 +2,9 @@
 Summary: Musepack audio decoding library
 Name:	 libmpcdec
 Version: 1.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
-License: LGPL
+License: BSD 
 Group: 	 System Environment/Libraries
 URL: 	 http://www.musepack.net/
 Source:	 http://files2.musepack.net/source/libmpcdec-1.2.2.tar.bz2
@@ -19,7 +19,6 @@
 and vastly improved and is now at an advanced stage in which it contains
 heavily optimized and patentless code.
 
-
 %package devel
 Summary: Development files for the Musepack audio decoding library
 Group:	 Development/Libraries
@@ -69,6 +68,9 @@
 
 
 %changelog
+* Sat Apr 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.2.2-2
+- License: BSD
+
 * Thu Jan 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.2.2-1
 - libmpcdec-1.2.2
 



From fedora-extras-commits at redhat.com  Sat Apr  1 18:19:35 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Sat,  1 Apr 2006 11:19:35 -0700
Subject: rpms/gnokii - New directory
Message-ID: <200604011819.k31IJb2s008839@cvs-int.fedora.redhat.com>

Author: snirkel

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

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




From fedora-extras-commits at redhat.com  Sat Apr  1 18:19:36 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Sat,  1 Apr 2006 11:19:36 -0700
Subject: rpms/gnokii/devel - New directory
Message-ID: <200604011819.k31IJcYK008842@cvs-int.fedora.redhat.com>

Author: snirkel

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

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




From fedora-extras-commits at redhat.com  Sat Apr  1 18:19:55 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Sat,  1 Apr 2006 11:19:55 -0700
Subject: rpms/gnokii Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604011819.k31IJvR1008886@cvs-int.fedora.redhat.com>

Author: snirkel

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

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


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

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

common : CVS/Root
	@cvs 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 Apr  1 18:19:55 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Sat,  1 Apr 2006 11:19:55 -0700
Subject: rpms/gnokii/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604011820.k31IJvno008889@cvs-int.fedora.redhat.com>

Author: snirkel

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

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


--- 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 Apr  1 18:24:59 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Sat,  1 Apr 2006 11:24:59 -0700
Subject: rpms/gnokii import.log,1.1,1.2
Message-ID: <200604011825.k31IP16Z009024@cvs-int.fedora.redhat.com>

Author: snirkel

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnokii/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	1 Apr 2006 18:19:55 -0000	1.1
+++ import.log	1 Apr 2006 18:24:58 -0000	1.2
@@ -0,0 +1 @@
+gnokii-0_6_12-2:HEAD:gnokii-0.6.12-2.src.rpm:1143915886



From fedora-extras-commits at redhat.com  Sat Apr  1 18:24:59 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Sat,  1 Apr 2006 11:24:59 -0700
Subject: rpms/gnokii/devel gnokii-config.patch, NONE,
	1.1 gnokii-htmlview.patch, NONE, 1.1 gnokii-pkgconfig.patch, NONE,
	1.1 gnokii-smsd-README.smsd2mail, NONE,
	1.1 gnokii-smsd-rename.patch, NONE, 1.1 gnokii-smsd-sql.patch,
	NONE, 1.1 gnokii-smsd.init, NONE, 1.1 gnokii-smsd.logrotate,
	NONE, 1.1 gnokii-smsd.sysconfig, NONE, 1.1 gnokii-smsd2mail.sh,
	NONE, 1.1 gnokii-xgnokii-pkgconfig.patch, NONE, 1.1 gnokii.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604011825.k31IP1mB009041@cvs-int.fedora.redhat.com>

Author: snirkel

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

Modified Files:
	.cvsignore sources 
Added Files:
	gnokii-config.patch gnokii-htmlview.patch 
	gnokii-pkgconfig.patch gnokii-smsd-README.smsd2mail 
	gnokii-smsd-rename.patch gnokii-smsd-sql.patch 
	gnokii-smsd.init gnokii-smsd.logrotate gnokii-smsd.sysconfig 
	gnokii-smsd2mail.sh gnokii-xgnokii-pkgconfig.patch gnokii.spec 
Log Message:
auto-import gnokii-0.6.12-2 on branch devel from gnokii-0.6.12-2.src.rpm

gnokii-config.patch:

--- NEW FILE gnokii-config.patch ---
--- Docs/sample/gnokiirc~	2005-07-24 22:16:22.000000000 +0300
+++ Docs/sample/gnokiirc	2005-08-06 23:33:26.000000000 +0300
@@ -59,7 +59,7 @@
 # port software (eg. minicom). If you have wrong permissions for the
 # directory, a warning will be generated. If you don't want a lockfile, set
 # it to 'no'.
-use_locking = yes
+use_locking = no
 
 # Baudrate to use on serial port connections.
 # Currently used only by models AT and BIP/CIMD. Defaults to 19200.
@@ -115,7 +115,7 @@
 # permissions 4750, owned by root, group gnokii.  Ensure you
 # are in the gnokii group and that the group exists...
 [gnokiid]
-bindir = /usr/local/sbin/
+bindir = /usr/sbin/
 
 # Any entries in the following two sections will be set as environment
 # variables when running the scripts.

gnokii-htmlview.patch:

--- NEW FILE gnokii-htmlview.patch ---
--- xgnokii/xgnokii_cfg.c~	2006-02-15 23:49:56.000000000 +0100
+++ xgnokii/xgnokii_cfg.c	2006-03-05 21:27:15.000000000 +0100
@@ -73,7 +73,7 @@
 	xgnokiiConfig.user.fax = g_strdup("");
 	xgnokiiConfig.user.email = g_strdup("");
 	xgnokiiConfig.user.address = g_strdup("");
-	xgnokiiConfig.helpviewer = g_strdup("mozilla");
+	xgnokiiConfig.helpviewer = g_strdup("htmlview");
 	if ((homedir = g_get_home_dir()) == NULL)
 		homedir = "";
 	xgnokiiConfig.mailbox = g_strdup_printf("%s/Mail/smsbox", homedir);

gnokii-pkgconfig.patch:

--- NEW FILE gnokii-pkgconfig.patch ---
--- common/gnokii.pc.in~	2006-02-15 23:49:56.000000000 +0100
+++ common/gnokii.pc.in	2006-03-05 21:40:46.000000000 +0100
@@ -6,5 +6,5 @@
 Name: gnokii
 Description: Gnokii library interface
 Version: @VERSION@
-Libs: -L${libdir} -lgnokii @LIBS@ @XPM_LIBS@ @LIBICONV@
-Cflags: -I${includedir} @CFLAGS@ @XPM_CFLAGS@
+Libs: -L${libdir} -lgnokii
+Cflags: -I${includedir}


--- NEW FILE gnokii-smsd-README.smsd2mail ---
* Make the gnokii user a member of a group that has read and write access to
  the SMS device.  For example on RHL-9 and later and ttyS0, add gnokii to the
  uucp group.  See "ls -l /dev/ttyS*".

* Copy smsd2mail.sh somewhere, eg. /usr/local/sbin, make sure it's executable
  by the gnokii user.

* Configure SMSD_OPTIONS in /etc/sysconfig/gnokii-smsd like:

  SMSD_OPTS="-u /usr/local/sbin/smsd2mail.sh -m file"

gnokii-smsd-rename.patch:

--- NEW FILE gnokii-smsd-rename.patch ---
diff -ru smsd.orig/Makefile smsd/Makefile
--- smsd.orig/Makefile	2005-07-24 22:16:22.000000000 +0300
+++ smsd/Makefile	2005-08-06 23:54:55.000000000 +0300
@@ -20,7 +20,9 @@
 
 SMSD_MAN=man/smsd.8
 
-CFLAGS += -DMODULES_DIR=\"${libdir}/smsd\" $(PTHREAD_CFLAGS) \
+pkglibdir = ${libdir}/gnokii-smsd
+
+CFLAGS += -DMODULES_DIR=\"$(pkglibdir)\" $(PTHREAD_CFLAGS) \
 	  $(shell $(GLIBCFLAGS))
 
 LDLIBS += $(PTHREAD_LIBS) \
@@ -56,7 +58,7 @@
 libpq.la: pq.lo
 	$(LIBTOOL) --mode=link $(CC) -o libpq.la pq.lo \
 	$(shell $(GLIBLDLIBS)) -L$(shell pg_config --libdir) -lpq \
-	-export-dynamic -avoid-version -rpath ${libdir}/smsd
+	-export-dynamic -avoid-version -rpath $(pkglibdir)
 
 # MySQL support
 mysql.lo: smsd.h mysql.c
@@ -66,7 +68,7 @@
 libmysql.la: mysql.lo
 	$(LIBTOOL) --mode=link $(CC) -o libmysql.la mysql.lo \
 	$(shell $(GLIBLDLIBS)) $(shell mysql_config --libs) \
-	-export-dynamic -avoid-version -rpath ${libdir}/smsd
+	-export-dynamic -avoid-version -rpath $(pkglibdir)
 
 # File support
 file.lo: smsd.h file.c
@@ -76,7 +78,7 @@
 libfile.la: file.lo
 	$(LIBTOOL) --mode=link $(CC) -o libfile.la file.lo \
 	$(shell $(GLIBLDLIBS)) \
-	-export-dynamic -avoid-version -rpath ${libdir}/smsd
+	-export-dynamic -avoid-version -rpath $(pkglibdir)
 
 ### End of DB Modules
 
@@ -90,11 +92,11 @@
 install: all
 	$(INSTALL) -d $(DESTDIR)$(sbindir)
 	$(LIBTOOL) --mode=install $(INSTALL) -m 755 smsd $(DESTDIR)$(sbindir)
-	$(INSTALL) -d $(DESTDIR)${libdir}/smsd
+	$(INSTALL) -d $(DESTDIR)$(pkglibdir)
 	for f in $(DB_LIBS) ; do \
-	$(LIBTOOL) --mode=install $(INSTALL) $$f $(DESTDIR)${libdir}/smsd ; \
+	$(LIBTOOL) --mode=install $(INSTALL) $$f $(DESTDIR)$(pkglibdir) ; \
 	done
-	$(LIBTOOL) --mode=finish ${libdir}/smsd
+	$(LIBTOOL) --mode=finish $(pkglibdir)
 	$(INSTALL) -d $(DESTDIR)$(man8dir)
 	$(INSTALL_DATA) $(SMSD_MAN) $(DESTDIR)$(man8dir)
 
diff -ru smsd.orig/man/smsd.8 smsd/man/smsd.8
--- smsd.orig/man/smsd.8	2005-07-24 22:16:22.000000000 +0300
+++ smsd/man/smsd.8	2005-08-06 23:51:36.000000000 +0300
@@ -1,13 +1,13 @@
-.TH "smsd" "8" "April  26, 2005" "" "Gnokii"
+.TH "gnokii-smsd" "8" "April  26, 2005" "" "Gnokii"
 .SH "NAME"
-smsd \- daemon for handling incoming and outgoing SMSes using libgnokii
+gnokii-smsd \- daemon for handling incoming and outgoing SMSes using libgnokii
 .SH "SYNOPSIS"
-.B smsd \fI[OPTIONS]\fR
+.B gnokii-smsd \fI[OPTIONS]\fR
 
 .SH "DESCRIPTION"
 .PP 
 The
-.B SMSD
+.B gnokii-smsd
 (SMS daemon) program is intended for receiving and sending SMSes.
 
 .PP

gnokii-smsd-sql.patch:

--- NEW FILE gnokii-smsd-sql.patch ---
diff -ru gnokii-0.6.8.orig/smsd/sms.tables.mysql.sql gnokii-0.6.8/smsd/sms.tables.mysql.sql
--- gnokii-0.6.8.orig/smsd/sms.tables.mysql.sql	2005-07-24 22:16:22.000000000 +0300
+++ gnokii-0.6.8/smsd/sms.tables.mysql.sql	2005-08-06 23:13:49.000000000 +0300
@@ -1,12 +1,6 @@
-# MySQL dump 8.13
-#
-# Host: localhost    Database: sms
-#--------------------------------------------------------
-# Server version	3.23.36
+-- CREATE DATABASE smsd;
 
-#
-# Table structure for table 'inbox'
-#
+-- USE smsd;
 
 CREATE TABLE inbox (
   id int(10) unsigned NOT NULL auto_increment,
@@ -17,16 +11,7 @@
   phone tinyint(4),
   processed tinyint(4) NOT NULL default '0',
   PRIMARY KEY  (id)
-) TYPE=MyISAM;
-
-#
-# Dumping data for table 'inbox'
-#
-
-
-#
-# Table structure for table 'outbox'
-#
+);
 
 CREATE TABLE outbox (
   id int(10) unsigned NOT NULL auto_increment,
@@ -41,10 +26,8 @@
   not_before time NOT NULL default '00:00:00',
   not_after time  NOT NULL default '23:59:59',
   PRIMARY KEY  (id)
-) TYPE=MyISAM;
-
-#
-# Dumping data for table 'outbox'
-#
-
+);
 
+-- CREATE INDEX outbox_processed_ix ON outbox (processed);
+ 
+-- GRANT SELECT, INSERT, UPDATE, DELETE ON smsd.* TO smsd at localhost;
diff -ru gnokii-0.6.8.orig/smsd/sms.tables.pq.sql gnokii-0.6.8/smsd/sms.tables.pq.sql
--- gnokii-0.6.8.orig/smsd/sms.tables.pq.sql	2005-07-24 22:16:22.000000000 +0300
+++ gnokii-0.6.8/smsd/sms.tables.pq.sql	2005-08-06 23:13:49.000000000 +0300
@@ -1,3 +1,14 @@
+-- \set ON_ERROR_STOP 1;
+-- CREATE USER "smsd" WITH NOCREATEDB NOCREATEUSER;
+-- CREATE DATABASE "smsd" WITH OWNER = "smsd";
+-- \connect "smsd" "smsd"
+-- COMMENT ON DATABASE "smsd" IS 'Gnokii SMSD Database';
+-- \set ON_ERROR_STOP 1;
+-- CREATE USER "smsd" WITH NOCREATEDB NOCREATEUSER;
+-- CREATE DATABASE "smsd" WITH OWNER = "smsd";
+-- \connect "smsd" "smsd"
+-- COMMENT ON DATABASE "smsd" IS 'Gnokii SMSD Database';
+
 CREATE TABLE "inbox" (
 	"id" serial,
 	"number" character varying(20) NOT NULL,
@@ -23,3 +34,5 @@
         "not_after" time without time zone DEFAULT '23:59:59' NOT NULL,
 	PRIMARY KEY ("id")
 );
+
+-- CREATE INDEX "outbox_processed_ix" ON "outbox" (processed);


--- NEW FILE gnokii-smsd.init ---
#!/bin/sh
#
# gnokii-smsd  Starts and stops the Gnokii SMS daemon
#
# chkconfig:   - 95 05
#
# processname: gnokii-smsd
# description: Gnokii SMS daemon receives and sends SMS messages.
# config:      /etc/gnokiirc
# config:      /etc/sysconfig/gnokii-smsd

exec=/usr/sbin/gnokii-smsd
prog=$(basename $exec)

# Make sure relevant files exist
[ -x $exec -a -e /etc/sysconfig/gnokii-smsd ] || exit 0

# Source SMSD configuration.
. /etc/sysconfig/gnokii-smsd

[ -n "$SMSD_OPTS" ] || exit 0
[ -z "$SMSD_LOG"  ] || SMSD_OPTS="$SMSD_OPTS --logfile \"$SMSD_LOG\""

# Source function library.
. /etc/rc.d/init.d/functions

lockfile=/var/lock/subsys/$prog

start() {
    # Ensure that we have a writable log file.
    if [ -n "$SMSD_LOG" ]; then
        [ -e "$SMSD_LOG" ] || > "$SMSD_LOG"
        chmod 0640 "$SMSD_LOG"
        chown gnokii:gnokii "$SMSD_LOG"
    fi
    echo -n $"Starting Gnokii SMS daemon ($prog): "
    daemon --user gnokii $exec $SMSD_OPTS \&
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop() {
    echo -n $"Stopping Gnokii SMS daemon ($prog): "
    killproc $prog
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

restart() {
    stop
    start
}

# See how we were called.
case "$1" in
  start|stop|restart)
    $1
    ;;
  reload|force-reload)
    restart
    ;;
  condrestart|try-restart)
    [ ! -f $lockfile ] || restart
    ;;
  status)
    status $prog
    ;;
  *)
    echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
    exit 2
esac


--- NEW FILE gnokii-smsd.logrotate ---
/var/log/gnokii-smsd {
    missingok
    notifempty
    create 0640 gnokii gnokii
}


--- NEW FILE gnokii-smsd.sysconfig ---
#                                                                    -*- sh -*-
# All options to Gnokii SMS daemon (gnokii-smsd), *except* log file.
#
# Note that due to security reasons, it is not advisable to set the
# database password here (if you can avoid doing so) because it may be
# visible in eg. ps(1) output.
#
# Example:
#  SMSD_OPTS="--user smsd --db smsd --host 127.0.0.1 --module pq"
#

SMSD_OPTS=""

#
# Log file location.  If you adjust this, see also /etc/logrotate.d/gnokii-smsd
#

SMSD_LOG="/var/log/gnokii-smsd"


--- NEW FILE gnokii-smsd2mail.sh ---
#!/bin/sh
TO=root at localhost
( echo From: $1 ; echo Date: $2 ; echo ; cat ) | mail -s "SMS from $1" $TO

gnokii-xgnokii-pkgconfig.patch:

--- NEW FILE gnokii-xgnokii-pkgconfig.patch ---
--- xgnokii/xgnokii.pc.in~	2006-02-15 23:49:56.000000000 +0100
+++ xgnokii/xgnokii.pc.in	2006-03-08 20:52:36.000000000 +0100
@@ -7,5 +7,5 @@
 Name: xgnokii
 Description: GTK2 gnokii library interface
 Version: @XVERSION@
-Libs: -L${libdir} -lgnokii @LIBS@ @XPM_LIBS@ @LIBICONV@
-Cflags: -I${includedir} @CFLAGS@ @XPM_CFLAGS@
+Libs: -L${libdir} -lgnokii
+Cflags: -I${includedir}


--- NEW FILE gnokii.spec ---
# TODO: DKU2 kernel module (usb-serial.h missing from kernel-devel)
# TODO: merge patches upstream where applicable

Name:           gnokii
Version:        0.6.12
Release:        2%{?dist}
Summary:        Linux/Unix tool suite for various mobile phones

Group:          Applications/Communications
License:        GPL
URL:            http://www.gnokii.org/
Source0:        http://www.gnokii.org/download/gnokii/%{name}-%{version}.tar.bz2
Source2:        %{name}-smsd.init
Source3:        %{name}-smsd.sysconfig
Source4:        %{name}-smsd.logrotate
Source5:        %{name}-smsd2mail.sh
Source6:        %{name}-smsd-README.smsd2mail
# Patch to make gnokii use "htmlview" instead of "mozilla" as default browser
Patch0:         %{name}-htmlview.patch
# Patch to also guide the user on how to create the smsd database without presupposing 
# it already exists plus a more apropriate index setup.
Patch1:         %{name}-smsd-sql.patch
# Patch to remove port locking and apply the system-wide /usr/sbin directory
# to the path instead of the default /usr/local
Patch2:         %{name}-config.patch
# Patch to rename smdsd to gnokii-smsd (also in doc)
Patch3:         %{name}-smsd-rename.patch
# Patch to fix the superfluous include statements
Patch4:         %{name}-pkgconfig.patch
Patch5:		%{name}-xgnokii-pkgconfig.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  flex
BuildRequires:  gettext
BuildRequires:  gtk2-devel
BuildRequires:  desktop-file-utils
BuildRequires:  ImageMagick
BuildRequires:  postgresql-devel
BuildRequires:  mysql-devel
BuildRequires:  zlib-devel
BuildRequires:  bluez-libs-devel
%{?_with_libical:BuildRequires: libical-devel >= 0.24}
%if "%fedora" >= "5"
BuildRequires:	libXt-devel
BuildRequires:	libXpm-devel 
%else
# openssl-devel: https://bugzilla.redhat.com/159569
BuildRequires:  openssl-devel
%endif
Requires(pre):  %{_sbindir}/groupadd

%description
Gnokii provides tools and a user space driver for use with mobile
phones under Linux, various unices and Win32. With gnokii you can do
such things as make data calls, update your address book, change
calendar entires, send and receive SMS messages and load ring tones
depending on the phone you have.

%package     -n xgnokii
Summary:        Graphical Linux/Unix tool suite for various mobile phones
Group:          Applications/Communications
Requires:       %{name} = %{version}-%{release}

%description -n xgnokii
Xgnokii is graphical Linux/Unix tool suite for various mobile
phones. It allows you to edit your contacts book, send/read SMS's
from/in computer and more other features.

%package        smsd
Summary:        Gnokii SMS daemon
Group:          System Environment/Daemons
Requires:       %{name} = %{version}-%{release}
Requires(pre):  %{_sbindir}/useradd
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig

%description    smsd
The Gnokii SMS daemon receives and sends SMS messages.

%package        smsd-pgsql
Summary:        PostgreSQL support for Gnokii SMS daemon
Group:          System Environment/Daemons
Requires:       %{name}-smsd = %{version}-%{release}
Obsoletes:      %{name}-smsd-postgresql < 0.6.4-0.lvn.2

%description    smsd-pgsql
%{summary}.

%package        smsd-mysql
Summary:        MySQL support for Gnokii SMS daemon
Group:          System Environment/Daemons
Requires:       %{name}-smsd = %{version}-%{release}

%description    smsd-mysql
%{summary}.

%package        devel
Summary:        Gnokii development files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig

%description    devel
%{summary}.


%prep
%setup -q
%patch0 -p0
%patch1 -p1
%patch2 -p0
%patch3 -p0
%patch4 -p0
%patch5 -p0
install -pm 644 %{SOURCE5} smsd2mail.sh
install -pm 644 %{SOURCE6} README.smsd2mail
# Fix up X86_64 library placement issue
%{__sed} -i -e 's|/lib /usr/lib\b|/%{_lib} %{_libdir}|' configure


%build
%configure --enable-security --disable-rpath --disable-static \
  %{?_with_libical:--with-libical=%{_prefix}}
make # -j X for X > 1 fails as of 0.5.6 - 0.6.7
make %{?_smp_mflags} -C smsd all libpq.la libmysql.la libfile.la


%install
rm -rf $RPM_BUILD_ROOT __docinst

make install install-docs DESTDIR=$RPM_BUILD_ROOT \
  xmandir=%{_mandir}/man1 docdir=/__docinst

mv $RPM_BUILD_ROOT/__docinst .
rm __docinst/{README-MacOSX,README-WIN32,packaging-howto}

make install DESTDIR=$RPM_BUILD_ROOT pkglibdir=%{_libdir}/gnokii-smsd -C smsd \
  DB_LIBS="libfile.la libpq.la libmysql.la"
mv $RPM_BUILD_ROOT%{_sbindir}/{,gnokii-}smsd
mv $RPM_BUILD_ROOT%{_mandir}/man8/{,gnokii-}smsd.8

rm $RPM_BUILD_ROOT%{_libdir}{,/gnokii-smsd}/lib*.la

install -Dpm 644 Docs/sample/gnokiirc $RPM_BUILD_ROOT%{_sysconfdir}/gnokiirc

desktop-file-install \
  --delete-original \
  --vendor fedora \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --mode 644 \
  --add-category X-Fedora \
  $RPM_BUILD_ROOT%{_datadir}/applications/xgnokii.desktop

install -dm 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
convert Docs/sample/logo/gnokii.xpm \
  $RPM_BUILD_ROOT%{_datadir}/pixmaps/xgnokii.png
chmod 644 $RPM_BUILD_ROOT%{_datadir}/pixmaps/xgnokii.png

install -Dpm 755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/gnokii-smsd
install -Dpm 640 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/gnokii-smsd
install -Dpm 644 %{SOURCE4} \
  $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/gnokii-smsd

iconv -f iso8859-2 -t utf8 -o iconv.tmp ChangeLog
mv iconv.tmp ChangeLog
iconv -f iso8859-2 -t utf8 -o iconv.tmp Docs/CREDITS
mv iconv.tmp Docs/CREDITS
iconv -f iso8859-2 -t utf8 -o iconv.tmp Docs/README
mv iconv.tmp Docs/README
iconv -f iso8859-2 -t utf8 -o iconv.tmp COPYRIGHT
mv iconv.tmp COPYRIGHT
iconv -f iso8859-2 -t utf8 -o iconv.tmp smsd/ChangeLog
mv iconv.tmp smsd/ChangeLog
iconv -f iso8859-2 -t utf8 -o iconv.tmp xgnokii/ChangeLog
mv iconv.tmp xgnokii/ChangeLog



%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%pre
%{_sbindir}/groupadd -r gnokii >/dev/null 2>&1 || :

%pre smsd
%{_sbindir}/useradd -r -M -d / -g gnokii \
  -s /sbin/nologin -c "Gnokii system user" gnokii >/dev/null 2>&1 || :

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%post smsd
/sbin/chkconfig --add gnokii-smsd

%preun smsd
if [ $1 -eq 0 ] ; then
  %{_initrddir}/gnokii-smsd stop >/dev/null 2>&1 || :
  /sbin/chkconfig --del gnokii-smsd
fi

%postun smsd
if [ $1 -ge 1 ] ; then
  %{_initrddir}/gnokii-smsd try-restart >/dev/null 2>&1 || :
fi


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc ChangeLog COPY* MAINTAINERS TODO VERSION __docinst/*
%config(noreplace) %{_sysconfdir}/gnokiirc
%attr(4750,root,gnokii) %{_sbindir}/mgnokiidev
%{_bindir}/gnokii
%{_bindir}/ppm2nokia
%{_bindir}/sendsms
%{_bindir}/todologo
%{_sbindir}/gnokiid
%{_libdir}/libgnokii.so.*
%{_mandir}/man1/gnokii.1*
%{_mandir}/man1/ppm2nokia.1*
%{_mandir}/man1/sendsms.1*
%{_mandir}/man1/todologo.1*
%{_mandir}/man8/gnokiid.8*
%{_mandir}/man8/mgnokiidev.8*

%files -n xgnokii
%defattr(-,root,root,-)
%doc xgnokii/ChangeLog xgnokii/README.vcard xgnokii/VERSION
%{_bindir}/xgnokii
%{_datadir}/pixmaps/xgnokii.png
%{_datadir}/applications/*xgnokii.desktop
%{_datadir}/xgnokii/
%{_mandir}/man1/xgnokii.1*

%files smsd
%defattr(-,root,root,-)
%doc smsd/action smsd/ChangeLog smsd/README README.smsd2mail smsd2mail.sh
%attr(-,gnokii,gnokii) %config(noreplace) %{_sysconfdir}/sysconfig/gnokii-smsd
%config(noreplace) %{_sysconfdir}/logrotate.d/gnokii-smsd
%{_initrddir}/gnokii-smsd
%{_sbindir}/gnokii-smsd
%{_mandir}/man8/gnokii-smsd.8*
%dir %{_libdir}/gnokii-smsd/
%{_libdir}/gnokii-smsd/libfile.so

%files smsd-pgsql
%defattr(-,root,root,-)
%doc smsd/sms.tables.pq.sql
%{_libdir}/gnokii-smsd/libpq.so

%files smsd-mysql
%defattr(-,root,root,-)
%doc smsd/sms.tables.mysql.sql
%{_libdir}/gnokii-smsd/libmysql.so

%files devel
%defattr(-,root,root,-)
%{_includedir}/gnokii*
%{_libdir}/libgnokii.so
%{_libdir}/pkgconfig/gnokii.pc
%{_libdir}/pkgconfig/xgnokii.pc

%changelog
* Thu Mar 31 2006 Linus Walleij <triad at df.lth.se> - 0.6.12-2
- Updated after comments from Ville.

* Thu Mar 16 2006 Linus Walleij <triad at df.lth.se> - 0.6.12-1
- New upstream tarball

* Wed Mar 8 2006 Linus Walleij <triad at df.lth.se> - 0.6.11-2
- Updated after comments from Ville.

* Sun Mar 5 2006 Linus Walleij <triad at df.lth.se> - 0.6.11-1
- 0.6.11
- Modified to drop into the Fedora Extras as the nice package it now is
- Based work off Ville's good olde package

* Sun Nov 13 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.6.10-0.lvn.1
- 0.6.10.
- Clean up pkgconfig file and -devel dependencies from bits needed only
  for static libs.

* Thu Nov  3 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.6.9-0.lvn.1
- 0.6.9, desktop entry file included upstream.
- Drop zero Epochs.

* Sat Aug  6 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.6.8-0.lvn.1
- 0.6.8.
- Don't ship static libraries.
- Rename smsd to gnokii-smsd to avoid conflicts with smstools.
- Remove not included files instead of using %%exclude.

* Sat Jun  4 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.6.7-0.lvn.2
- BuildRequire openssl-devel to work around https://bugzilla.redhat.com/159569

* Thu Jun  2 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.6.7-0.lvn.1
- 0.6.7.
- Build unconditionally with bluetooth support.

* Mon May  2 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.6.5-0.lvn.1
- 0.6.5.

* Fri Nov  5 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.6.4-0.lvn.2
- Rename -smsd-postgresql to -smsd-pgsql for consistency with other similar
  packages in FC/Extras.

* Fri Oct 22 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.6.4-0.lvn.1
- Update to 0.6.4, perms and pgsql patches applied upstream.
- Xgnokii help locale symlink hack no longer necessary.
- Don't remove user/group on last erase, move smsd user to -smsd subpackage.
- Add libical support (disabled), rebuild with "--with libical" to enable.

* Mon Jul  5 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.6.3-0.lvn.1
- Update to 0.6.3.

* Sun Jun 20 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.6.1-0.lvn.4
- Improve Xgnokii desktop entry according to GNOME HIG.

* Sun Jun 13 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.6.1-0.lvn.3
- Remove duplicate gettext build dependency (bug 95).

* Sun Jun  6 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.6.1-0.lvn.2
- Fix chown syntax in smsd init script.
- Summary and description improvements.
- Trim $RPM_OPT_FLAGS out from gnokii.pc.
- Make -devel require XFree86-devel.

* Sun Apr 18 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.6.1-0.lvn.1
- Update to 0.6.1.

* Thu Mar 18 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.6.0-0.lvn.2
- Make -devel require pkgconfig.

* Mon Feb 23 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.6.0-0.lvn.1
- Update to 0.6.0.

* Mon Feb  2 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.5.10-0.lvn.1
- Update to 0.5.10.

* Tue Jan 27 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.5.9-0.lvn.1
- Update to 0.5.9.
- Specfile cleanups, small init script enhancements.

* Sat Dec 27 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.5.7-0.lvn.1
- Update to 0.5.7.
- Move smsd man page into -smsd subpackage.

* Sat Nov 15 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.5.6-0.lvn.1
- Update to 0.5.6.
- Include sample action script for forwarding SMSD messages to mail.
- s/fedora/livna/.
- Specfile and init script cleanups.

* Sat Jul 19 2003 Warren Togami <warren at togami.com> - 0:0.5.2-0.fdr.2
- Disable smp flags to prevent build failure

* Sun Jun 15 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.5.2-0.fdr.1
- Update to 0.5.2.

* Thu May 29 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.5.1-0.fdr.1
- Update to 0.5.1.
- Include init script, sysconfig and logrotate config for smsd.

* Tue May 27 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.5.0-0.fdr.1
- Update to 0.5.0.

* Sun Nov  3 2002 Ville Skytt?? <ville.skytta at iki.fi> 0.4.3-1cr
- RedHat'ified PLD version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnokii/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Apr 2006 18:19:55 -0000	1.1
+++ .cvsignore	1 Apr 2006 18:24:59 -0000	1.2
@@ -0,0 +1 @@
+gnokii-0.6.12.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnokii/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Apr 2006 18:19:55 -0000	1.1
+++ sources	1 Apr 2006 18:24:59 -0000	1.2
@@ -0,0 +1 @@
+846e03e7cf3581000c9d0141c2950b79  gnokii-0.6.12.tar.bz2



From fedora-extras-commits at redhat.com  Sat Apr  1 18:44:10 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Sat,  1 Apr 2006 11:44:10 -0700
Subject: owners owners.list,1.788,1.789
Message-ID: <200604011844.k31IiChk009136@cvs-int.fedora.redhat.com>

Author: snirkel

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

Modified Files:
	owners.list 
Log Message:
Added gnokii



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.788
retrieving revision 1.789
diff -u -r1.788 -r1.789
--- owners.list	1 Apr 2006 15:49:41 -0000	1.788
+++ owners.list	1 Apr 2006 18:44:10 -0000	1.789
@@ -342,6 +342,7 @@
 Fedora Extras|gmpc|GNOME frontend for the MPD|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|gnet2|A simple network library built upon glib|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnofract4d|Gnofract 4D is a Gnome-based program to draw fractals|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|gnokii|Mobile phone management program|triad at df.lth.se|extras-qa at fedoraproject.org|
 Fedora Extras|gnomad2|Manager for digital audio players|triad at df.lth.se|extras-qa at fedoraproject.org|
 Fedora Extras|gnomebaker|Gnome CD burner|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-applet-music|A GNOME panel applet to control various music players|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:11 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:11 -0700
Subject: rpms/perl-GD-SVG/devel .cvsignore, 1.2, NONE Makefile, 1.1,
	NONE perl-GD-SVG.spec, 1.1, NONE sources, 1.2, NONE
Message-ID: <200604011848.k31ImD9g009262@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-GD-SVG/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-GD-SVG/devel

Removed Files:
	.cvsignore Makefile perl-GD-SVG.spec sources 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- perl-GD-SVG.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:13 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:13 -0700
Subject: rpms/perl-Graph/devel .cvsignore, 1.2, NONE Makefile, 1.1,
	NONE perl-Graph.spec, 1.1, NONE sources, 1.2, NONE
Message-ID: <200604011848.k31ImFxv009291@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Removed Files:
	.cvsignore Makefile perl-Graph.spec sources 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- perl-Graph.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:26 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:26 -0700
Subject: rpms/perl-Heap/devel .cvsignore, 1.2, NONE Makefile, 1.1,
	NONE perl-Heap.spec, 1.1, NONE sources, 1.2, NONE
Message-ID: <200604011848.k31ImSWd009355@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Removed Files:
	.cvsignore Makefile perl-Heap.spec sources 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- perl-Heap.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:39 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:39 -0700
Subject: rpms/perl-SVG/devel .cvsignore, 1.2, NONE Makefile, 1.1,
	NONE perl-SVG.spec, 1.1, NONE sources, 1.2, NONE
Message-ID: <200604011848.k31Imf6D009412@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Removed Files:
	.cvsignore Makefile perl-SVG.spec sources 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- perl-SVG.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:51 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:51 -0700
Subject: rpms/perl-Text-Shellwords/devel .cvsignore, 1.2, NONE Makefile, 1.1,
	NONE perl-Text-Shellwords.spec, 1.1, NONE sources, 1.2, NONE
Message-ID: <200604011848.k31ImrS7009469@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Text-Shellwords/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-Text-Shellwords/devel

Removed Files:
	.cvsignore Makefile perl-Text-Shellwords.spec sources 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- perl-Text-Shellwords.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:59 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:59 -0700
Subject: rpms/perl-XML-Writer/devel .cvsignore, 1.2, NONE Makefile, 1.1,
	NONE perl-XML-Writer.spec, 1.1, NONE sources, 1.2, NONE
Message-ID: <200604011849.k31In1ji009526@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-XML-Writer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-XML-Writer/devel

Removed Files:
	.cvsignore Makefile perl-XML-Writer.spec sources 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- perl-XML-Writer.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:10 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:10 -0700
Subject: rpms/perl-GD-SVG/FC-5 perl-GD-SVG.spec,1.1,1.2
Message-ID: <200604011849.k31InCZk009575@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-GD-SVG/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-GD-SVG/FC-5

Modified Files:
	perl-GD-SVG.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-GD-SVG.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GD-SVG/FC-5/perl-GD-SVG.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-GD-SVG.spec	11 Apr 2005 22:34:59 -0000	1.1
+++ perl-GD-SVG.spec	1 Apr 2006 18:48:10 -0000	1.2
@@ -22,6 +22,12 @@
 
 
 %prep
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %setup -q -n GD-SVG-%{version}
 
 # avoid extra dependencies



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:45 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:45 -0700
Subject: rpms/perl-Text-Shellwords/FC-4 perl-Text-Shellwords.spec,1.1,1.2
Message-ID: <200604011849.k31InH5o009589@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Text-Shellwords/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-Text-Shellwords/FC-4

Modified Files:
	perl-Text-Shellwords.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-Text-Shellwords.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-Shellwords/FC-4/perl-Text-Shellwords.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Text-Shellwords.spec	11 Apr 2005 22:45:15 -0000	1.1
+++ perl-Text-Shellwords.spec	1 Apr 2006 18:48:45 -0000	1.2
@@ -24,6 +24,12 @@
 
 
 %prep
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %setup -q -n Text-Shellwords-%{version}
 # Clean up /usr/local/bin/perl mess
 #%{__perl} -pi -e 's|/usr/local/bin/perl\b|%{__perl}|' \



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:46 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:46 -0700
Subject: rpms/perl-Text-Shellwords/FC-5 perl-Text-Shellwords.spec,1.1,1.2
Message-ID: <200604011849.k31InIdJ009592@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Text-Shellwords/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-Text-Shellwords/FC-5

Modified Files:
	perl-Text-Shellwords.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-Text-Shellwords.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-Shellwords/FC-5/perl-Text-Shellwords.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Text-Shellwords.spec	11 Apr 2005 22:45:15 -0000	1.1
+++ perl-Text-Shellwords.spec	1 Apr 2006 18:48:46 -0000	1.2
@@ -24,6 +24,12 @@
 
 
 %prep
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %setup -q -n Text-Shellwords-%{version}
 # Clean up /usr/local/bin/perl mess
 #%{__perl} -pi -e 's|/usr/local/bin/perl\b|%{__perl}|' \



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:11 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:11 -0700
Subject: rpms/perl-Graph/FC-3 perl-Graph.spec,1.1,1.2
Message-ID: <200604011849.k31InDh4009578@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Graph/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-Graph/FC-3

Modified Files:
	perl-Graph.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-Graph.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Graph/FC-3/perl-Graph.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Graph.spec	11 Apr 2005 22:37:28 -0000	1.1
+++ perl-Graph.spec	1 Apr 2006 18:48:11 -0000	1.2
@@ -27,6 +27,12 @@
 
 
 %prep
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %setup -q -n Graph-%{version}
 
 



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:12 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:12 -0700
Subject: rpms/perl-Graph/FC-4 perl-Graph.spec,1.1,1.2
Message-ID: <200604011849.k31InExb009582@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Graph/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-Graph/FC-4

Modified Files:
	perl-Graph.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-Graph.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Graph/FC-4/perl-Graph.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Graph.spec	11 Apr 2005 22:37:28 -0000	1.1
+++ perl-Graph.spec	1 Apr 2006 18:48:12 -0000	1.2
@@ -27,6 +27,12 @@
 
 
 %prep
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %setup -q -n Graph-%{version}
 
 



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:14 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:14 -0700
Subject: rpms/perl-Heap/FC-3 perl-Heap.spec,1.1,1.2
Message-ID: <200604011849.k31InGYj009586@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Heap/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-Heap/FC-3

Modified Files:
	perl-Heap.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-Heap.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Heap/FC-3/perl-Heap.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Heap.spec	11 Apr 2005 22:39:52 -0000	1.1
+++ perl-Heap.spec	1 Apr 2006 18:48:14 -0000	1.2
@@ -24,6 +24,12 @@
 
 
 %prep
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %setup -q -n Heap-%{version}
 
 



From fedora-extras-commits at redhat.com  Sat Apr  1 18:49:12 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:49:12 -0700
Subject: rpms/perl-bioperl/devel .cvsignore, 1.2, NONE Makefile, 1.1,
	NONE bioperl-1.5.0-paths.patch, 1.1, NONE filter-requires.sh,
	1.1, NONE perl-bioperl.spec, 1.1, NONE sources, 1.2, NONE
Message-ID: <200604011849.k31InEKq009579@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Removed Files:
	.cvsignore Makefile bioperl-1.5.0-paths.patch 
	filter-requires.sh perl-bioperl.spec sources 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- bioperl-1.5.0-paths.patch DELETED ---


--- filter-requires.sh DELETED ---


--- perl-bioperl.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:52 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:52 -0700
Subject: rpms/perl-XML-Writer/FC-3 perl-XML-Writer.spec,1.1,1.2
Message-ID: <200604011849.k31InOgd009605@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-XML-Writer/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-XML-Writer/FC-3

Modified Files:
	perl-XML-Writer.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-XML-Writer.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-Writer/FC-3/perl-XML-Writer.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-XML-Writer.spec	11 Apr 2005 22:46:26 -0000	1.1
+++ perl-XML-Writer.spec	1 Apr 2006 18:48:52 -0000	1.2
@@ -23,6 +23,12 @@
 
 
 %prep
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %setup -q -n XML-Writer-%{version}
 
 



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:13 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:13 -0700
Subject: rpms/perl-Graph/FC-5 perl-Graph.spec,1.1,1.2
Message-ID: <200604011849.k31InF6S009585@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Graph/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-Graph/FC-5

Modified Files:
	perl-Graph.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-Graph.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Graph/FC-5/perl-Graph.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Graph.spec	11 Apr 2005 22:37:28 -0000	1.1
+++ perl-Graph.spec	1 Apr 2006 18:48:12 -0000	1.2
@@ -27,6 +27,12 @@
 
 
 %prep
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %setup -q -n Graph-%{version}
 
 



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:20 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:20 -0700
Subject: rpms/perl-Heap/FC-4 perl-Heap.spec,1.1,1.2
Message-ID: <200604011849.k31InMtW009599@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Heap/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-Heap/FC-4

Modified Files:
	perl-Heap.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-Heap.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Heap/FC-4/perl-Heap.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Heap.spec	11 Apr 2005 22:39:52 -0000	1.1
+++ perl-Heap.spec	1 Apr 2006 18:48:19 -0000	1.2
@@ -24,6 +24,12 @@
 
 
 %prep
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %setup -q -n Heap-%{version}
 
 



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:20 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:20 -0700
Subject: rpms/perl-Heap/FC-5 perl-Heap.spec,1.1,1.2
Message-ID: <200604011849.k31InM3q009602@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Heap/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-Heap/FC-5

Modified Files:
	perl-Heap.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-Heap.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Heap/FC-5/perl-Heap.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Heap.spec	11 Apr 2005 22:39:52 -0000	1.1
+++ perl-Heap.spec	1 Apr 2006 18:48:20 -0000	1.2
@@ -24,6 +24,12 @@
 
 
 %prep
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %setup -q -n Heap-%{version}
 
 



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:58 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:58 -0700
Subject: rpms/perl-XML-Writer/FC-4 perl-XML-Writer.spec,1.1,1.2
Message-ID: <200604011849.k31InUao009611@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-XML-Writer/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-XML-Writer/FC-4

Modified Files:
	perl-XML-Writer.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-XML-Writer.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-Writer/FC-4/perl-XML-Writer.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-XML-Writer.spec	11 Apr 2005 22:46:26 -0000	1.1
+++ perl-XML-Writer.spec	1 Apr 2006 18:48:58 -0000	1.2
@@ -23,6 +23,12 @@
 
 
 %prep
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %setup -q -n XML-Writer-%{version}
 
 



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:32 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:32 -0700
Subject: rpms/perl-SVG/FC-4 perl-SVG.spec,1.1,1.2
Message-ID: <200604011849.k31InZ4w009620@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-SVG/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-SVG/FC-4

Modified Files:
	perl-SVG.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-SVG.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SVG/FC-4/perl-SVG.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-SVG.spec	11 Apr 2005 22:43:59 -0000	1.1
+++ perl-SVG.spec	1 Apr 2006 18:48:32 -0000	1.2
@@ -18,6 +18,12 @@
 (scaleable vector graphics) images using the W3C SVG xml recommendation.
 
 %prep
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %setup -q -n SVG-%{version}
 
 # avoid extra dependencies



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:33 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:33 -0700
Subject: rpms/perl-SVG/FC-5 perl-SVG.spec,1.1,1.2
Message-ID: <200604011849.k31InZTl009623@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-SVG/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-SVG/FC-5

Modified Files:
	perl-SVG.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-SVG.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SVG/FC-5/perl-SVG.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-SVG.spec	11 Apr 2005 22:43:59 -0000	1.1
+++ perl-SVG.spec	1 Apr 2006 18:48:33 -0000	1.2
@@ -18,6 +18,12 @@
 (scaleable vector graphics) images using the W3C SVG xml recommendation.
 
 %prep
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %setup -q -n SVG-%{version}
 
 # avoid extra dependencies



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:58 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:58 -0700
Subject: rpms/perl-XML-Writer/FC-5 perl-XML-Writer.spec,1.1,1.2
Message-ID: <200604011849.k31InUwS009614@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-XML-Writer/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-XML-Writer/FC-5

Modified Files:
	perl-XML-Writer.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-XML-Writer.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-Writer/FC-5/perl-XML-Writer.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-XML-Writer.spec	11 Apr 2005 22:46:26 -0000	1.1
+++ perl-XML-Writer.spec	1 Apr 2006 18:48:58 -0000	1.2
@@ -23,6 +23,12 @@
 
 
 %prep
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %setup -q -n XML-Writer-%{version}
 
 



From fedora-extras-commits at redhat.com  Sat Apr  1 18:49:00 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:49:00 -0700
Subject: rpms/perl-bioperl/FC-3 perl-bioperl.spec,1.1,1.2
Message-ID: <200604011849.k31InWkF009617@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-bioperl/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-bioperl/FC-3

Modified Files:
	perl-bioperl.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-bioperl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-bioperl/FC-3/perl-bioperl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-bioperl.spec	11 Apr 2005 22:50:21 -0000	1.1
+++ perl-bioperl.spec	1 Apr 2006 18:48:59 -0000	1.2
@@ -25,6 +25,12 @@
 
 
 %prep
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %setup -q -n bioperl-%{version}
 %patch0 -p1 
 



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:27 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:27 -0700
Subject: rpms/perl-SVG/FC-3 perl-SVG.spec,1.1,1.2
Message-ID: <200604011849.k31InTN6009608@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-SVG/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-SVG/FC-3

Modified Files:
	perl-SVG.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-SVG.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SVG/FC-3/perl-SVG.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-SVG.spec	11 Apr 2005 22:43:59 -0000	1.1
+++ perl-SVG.spec	1 Apr 2006 18:48:26 -0000	1.2
@@ -25,6 +25,12 @@
 
 
 %build
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 



From fedora-extras-commits at redhat.com  Sat Apr  1 18:49:05 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:49:05 -0700
Subject: rpms/perl-bioperl/FC-4 perl-bioperl.spec,1.1,1.2
Message-ID: <200604011849.k31InbHc009626@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-bioperl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-bioperl/FC-4

Modified Files:
	perl-bioperl.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-bioperl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-bioperl/FC-4/perl-bioperl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-bioperl.spec	11 Apr 2005 22:50:21 -0000	1.1
+++ perl-bioperl.spec	1 Apr 2006 18:49:05 -0000	1.2
@@ -25,6 +25,12 @@
 
 
 %prep
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %setup -q -n bioperl-%{version}
 %patch0 -p1 
 



From fedora-extras-commits at redhat.com  Sat Apr  1 18:49:06 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:49:06 -0700
Subject: rpms/perl-bioperl/FC-5 perl-bioperl.spec,1.1,1.2
Message-ID: <200604011849.k31IncCS009629@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-bioperl/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-bioperl/FC-5

Modified Files:
	perl-bioperl.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-bioperl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-bioperl/FC-5/perl-bioperl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-bioperl.spec	11 Apr 2005 22:50:21 -0000	1.1
+++ perl-bioperl.spec	1 Apr 2006 18:49:06 -0000	1.2
@@ -25,6 +25,12 @@
 
 
 %prep
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %setup -q -n bioperl-%{version}
 %patch0 -p1 
 



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:09 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:09 -0700
Subject: rpms/perl-GD-SVG/FC-3 perl-GD-SVG.spec,1.1,1.2
Message-ID: <200604011849.k31Infku009630@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-GD-SVG/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-GD-SVG/FC-3

Modified Files:
	perl-GD-SVG.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-GD-SVG.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GD-SVG/FC-3/perl-GD-SVG.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-GD-SVG.spec	11 Apr 2005 22:34:59 -0000	1.1
+++ perl-GD-SVG.spec	1 Apr 2006 18:48:09 -0000	1.2
@@ -22,6 +22,12 @@
 
 
 %prep
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %setup -q -n GD-SVG-%{version}
 
 # avoid extra dependencies



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:39 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:39 -0700
Subject: rpms/perl-Text-Shellwords/FC-3 perl-Text-Shellwords.spec,1.1,1.2
Message-ID: <200604011849.k31InfAA009633@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Text-Shellwords/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-Text-Shellwords/FC-3

Modified Files:
	perl-Text-Shellwords.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-Text-Shellwords.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-Shellwords/FC-3/perl-Text-Shellwords.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Text-Shellwords.spec	11 Apr 2005 22:45:15 -0000	1.1
+++ perl-Text-Shellwords.spec	1 Apr 2006 18:48:39 -0000	1.2
@@ -24,6 +24,12 @@
 
 
 %prep
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %setup -q -n Text-Shellwords-%{version}
 # Clean up /usr/local/bin/perl mess
 #%{__perl} -pi -e 's|/usr/local/bin/perl\b|%{__perl}|' \



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:09 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:09 -0700
Subject: rpms/perl-GD-SVG/FC-4 perl-GD-SVG.spec,1.1,1.2
Message-ID: <200604011849.k31IngZ4009634@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-GD-SVG/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-GD-SVG/FC-4

Modified Files:
	perl-GD-SVG.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-GD-SVG.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GD-SVG/FC-4/perl-GD-SVG.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-GD-SVG.spec	11 Apr 2005 22:34:59 -0000	1.1
+++ perl-GD-SVG.spec	1 Apr 2006 18:48:09 -0000	1.2
@@ -22,6 +22,12 @@
 
 
 %prep
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %setup -q -n GD-SVG-%{version}
 
 # avoid extra dependencies



From fedora-extras-commits at redhat.com  Sat Apr  1 18:50:57 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:50:57 -0700
Subject: owners owners.list,1.789,1.790
Message-ID: <200604011850.k31IoxKm009661@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	owners.list 
Log Message:
Some fire'n'forget packages which have never been built before. Removed them from devel and disabled them in the branches.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.789
retrieving revision 1.790
diff -u -r1.789 -r1.790
--- owners.list	1 Apr 2006 18:44:10 -0000	1.789
+++ owners.list	1 Apr 2006 18:50:56 -0000	1.790
@@ -826,7 +826,6 @@
 Fedora Extras|perl-Array-Compare|Perl extension for comparing arrays|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Authen-SASL|SASL Authentication framework for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-BerkeleyDB|Perl interface to Berkeley DB|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-bioperl|A package of public domain Perl tools for computational molecular biology|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Boulder|An API for hierarchical tag/value structures|orion at cora.nwra.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 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-Cache|Cache-Cache module for perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -926,16 +925,13 @@
 Fedora Extras|perl-GDGraph3d|3D graph generation package for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-GDGraph|Graph generation package for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-GD|Perl interface to the GD graphics library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-GD-SVG|GD SVG enables SVG output from scripts written using GD|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-GDTextUtil|Text utilities for use with GD|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-gettext|Interface to gettext family of functions|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Glib|Perl interface to GLib|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gnome2-Canvas|Perl interface to Gnome Canvas|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|perl-GnuPG-Interface|Perl interface to GnuPG|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Graph|A Perl module for dealing with graphs, the abstract data structures|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gtk2|Perl interface to the 2.x series of the Gimp Toolkit library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gtk2-GladeXML|Perl interface to Gtk2 GladeXML|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
-Fedora Extras|perl-Heap|A collection of routines for managing a heap data structure|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Hook-LexWrap|Lexically scoped subroutine wrappers|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Format|HTML formatter modules|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Mason|HTML::Mason Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1046,7 +1042,6 @@
 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-ShellQuote|Perl module for quoting strings for passing through the shell|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Sub-Uplevel|Run a perl function in an upper stack frame|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-SVG|An extention to generate stand-alone or inline SVG|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Taint-Runtime|Runtime enable taint checking|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Template-Plugin-Class|Allow calling of class methods on arbitrary classes|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Template-Toolkit|Template processing system|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1074,7 +1069,6 @@
 Fedora Extras|perl-Text-Levenshtein|Text::Levenshtein Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Quoted|Extract the structure of a quoted mail message|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Reform|Manual text wrapping and reformatting|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Text-Shellwords|A thin wrapper around the shellwords.pl package|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Template|Expand template text with embedded Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Unidecode|US-ASCII transliterations of Unicode text|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|perl-Text-WikiFormat|Translate Wiki formatted text into other formats|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1108,7 +1102,6 @@
 Fedora Extras|perl-XML-RegExp|Regular expressions for XML tokens|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-XML-RSS|Perl module for managing RDF Site Summary (RSS) files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-XML-Simple|Easy API to maintain XML in Perl|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-XML-Writer|A simple Perl module for writing XML documents|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-XML-XPath|XPath parser and evaluator for Perl|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|extras-orphan at fedoraproject.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



From fedora-extras-commits at redhat.com  Sat Apr  1 19:29:03 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat,  1 Apr 2006 12:29:03 -0700
Subject: rpms/graveman/FC-5 graveman-membug.patch, NONE, 1.1 graveman.spec, 
	1.12, 1.13
Message-ID: <200604011929.k31JT5nb011743@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	graveman.spec 
Added Files:
	graveman-membug.patch 
Log Message:


graveman-membug.patch:

--- NEW FILE graveman-membug.patch ---
--- graveman-0.3.12-4/src/support.c.membug	2006-04-01 21:25:42.000000000 +0200
+++ graveman-0.3.12-4/src/support.c	2006-04-01 21:25:54.000000000 +0200
@@ -168,7 +168,7 @@
 {
   g_return_val_if_fail(Agrave != NULL, NULL);
 
-  g_free(Agrave->xml);
+  //g_free(Agrave->xml);
   if (Agrave->data) g_hash_table_destroy(Agrave->data);
 
   g_free(Agrave);


Index: graveman.spec
===================================================================
RCS file: /cvs/extras/rpms/graveman/FC-5/graveman.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- graveman.spec	17 Feb 2006 20:42:00 -0000	1.12
+++ graveman.spec	1 Apr 2006 19:29:03 -0000	1.13
@@ -1,12 +1,13 @@
 Name:           graveman
 Version:        0.3.12.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A frontend for cdrtools, dvd+rw-tools and sox
 
 Group:          Applications/Archiving
 License:        GPL
 URL:            http://graveman.tuxfamily.org
 Source0:        http://graveman.tuxfamily.org/sources/graveman-0.3.12-4.tar.bz2
+Patch0:		graveman-membug.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libid3tag-devel, libvorbis-devel, gtk2-devel, libogg-devel, desktop-file-utils
@@ -66,6 +67,9 @@
 
 
 %changelog
+* Sat Apr  1 2006 Gerard Milmeister <gemi at bluewin.ch> - 0.3.12.4-4
+- Patch for memory bug
+
 * Fri Feb 17 2006 Gerard Milmeister <gemi at bluewin.ch> - 0.3.12.4-3
 - Rebuild for Fedora Extras 5
 



From fedora-extras-commits at redhat.com  Sat Apr  1 19:33:57 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat,  1 Apr 2006 12:33:57 -0700
Subject: rpms/graveman/FC-5 graveman.spec,1.13,1.14
Message-ID: <200604011933.k31JXxjG011810@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	graveman.spec 
Log Message:



Index: graveman.spec
===================================================================
RCS file: /cvs/extras/rpms/graveman/FC-5/graveman.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- graveman.spec	1 Apr 2006 19:29:03 -0000	1.13
+++ graveman.spec	1 Apr 2006 19:33:57 -0000	1.14
@@ -23,6 +23,7 @@
 
 %prep
 %setup -q -n graveman-0.3.12-4
+%patch0
 perl -pi -e 's|^Applicationman = .*|Applicationman=\$(DESTDIR)%{_mandir}|' man/Makefile.in
 
 



From fedora-extras-commits at redhat.com  Sat Apr  1 19:42:21 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat,  1 Apr 2006 12:42:21 -0700
Subject: rpms/graveman/FC-5 graveman.spec,1.14,1.15
Message-ID: <200604011942.k31JgNq0011866@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	graveman.spec 
Log Message:



Index: graveman.spec
===================================================================
RCS file: /cvs/extras/rpms/graveman/FC-5/graveman.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- graveman.spec	1 Apr 2006 19:33:57 -0000	1.14
+++ graveman.spec	1 Apr 2006 19:42:21 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           graveman
 Version:        0.3.12.4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A frontend for cdrtools, dvd+rw-tools and sox
 
 Group:          Applications/Archiving
@@ -23,7 +23,7 @@
 
 %prep
 %setup -q -n graveman-0.3.12-4
-%patch0
+%patch0 -p1
 perl -pi -e 's|^Applicationman = .*|Applicationman=\$(DESTDIR)%{_mandir}|' man/Makefile.in
 
 



From fedora-extras-commits at redhat.com  Sat Apr  1 19:44:00 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat,  1 Apr 2006 12:44:00 -0700
Subject: rpms/graveman/devel graveman-membug.patch, NONE, 1.1 graveman.spec, 
	1.12, 1.13
Message-ID: <200604011944.k31Ji2Qj011935@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	graveman.spec 
Added Files:
	graveman-membug.patch 
Log Message:


graveman-membug.patch:

--- NEW FILE graveman-membug.patch ---
--- graveman-0.3.12-4/src/support.c.membug	2006-04-01 21:25:42.000000000 +0200
+++ graveman-0.3.12-4/src/support.c	2006-04-01 21:25:54.000000000 +0200
@@ -168,7 +168,7 @@
 {
   g_return_val_if_fail(Agrave != NULL, NULL);
 
-  g_free(Agrave->xml);
+  //g_free(Agrave->xml);
   if (Agrave->data) g_hash_table_destroy(Agrave->data);
 
   g_free(Agrave);


Index: graveman.spec
===================================================================
RCS file: /cvs/extras/rpms/graveman/devel/graveman.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- graveman.spec	17 Feb 2006 20:42:00 -0000	1.12
+++ graveman.spec	1 Apr 2006 19:44:00 -0000	1.13
@@ -1,12 +1,13 @@
 Name:           graveman
 Version:        0.3.12.4
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        A frontend for cdrtools, dvd+rw-tools and sox
 
 Group:          Applications/Archiving
 License:        GPL
 URL:            http://graveman.tuxfamily.org
 Source0:        http://graveman.tuxfamily.org/sources/graveman-0.3.12-4.tar.bz2
+Patch0:		graveman-membug.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libid3tag-devel, libvorbis-devel, gtk2-devel, libogg-devel, desktop-file-utils
@@ -22,6 +23,7 @@
 
 %prep
 %setup -q -n graveman-0.3.12-4
+%patch0 -p1
 perl -pi -e 's|^Applicationman = .*|Applicationman=\$(DESTDIR)%{_mandir}|' man/Makefile.in
 
 
@@ -66,6 +68,9 @@
 
 
 %changelog
+* Sat Apr  1 2006 Gerard Milmeister <gemi at bluewin.ch> - 0.3.12.4-4
+- Patch for memory bug
+
 * Fri Feb 17 2006 Gerard Milmeister <gemi at bluewin.ch> - 0.3.12.4-3
 - Rebuild for Fedora Extras 5
 



From fedora-extras-commits at redhat.com  Sat Apr  1 22:08:05 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat,  1 Apr 2006 15:08:05 -0700
Subject: rpms/azureus/FC-5 azureus-MessageSlideShell-swt-3.1.patch, NONE,
	1.1 azureus-no-update-manager-MainStatusBar.patch, NONE,
	1.1 .cvsignore, 1.4, 1.5 azureus-no-install-remove-plugins.patch,
	1.1, 1.2 azureus-no-update-manager-AzureusCoreImpl.patch, 1.1,
	1.2 azureus-no-update-manager-CoreUpdateChecker.patch, 1.1,
	1.2 azureus-no-update-manager-UpdateMonitor.patch, 1.1,
	1.2 azureus.spec, 1.19, 1.20 sources, 1.4, 1.5
Message-ID: <200604012208.k31M8889018326@cvs-int.fedora.redhat.com>

Author: green

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

Modified Files:
	.cvsignore azureus-no-install-remove-plugins.patch 
	azureus-no-update-manager-AzureusCoreImpl.patch 
	azureus-no-update-manager-CoreUpdateChecker.patch 
	azureus-no-update-manager-UpdateMonitor.patch azureus.spec 
	sources 
Added Files:
	azureus-MessageSlideShell-swt-3.1.patch 
	azureus-no-update-manager-MainStatusBar.patch 
Log Message:
Update to latest source snapshot.


azureus-MessageSlideShell-swt-3.1.patch:

--- NEW FILE azureus-MessageSlideShell-swt-3.1.patch ---
--- org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java.~1.15.~	2006-03-20 23:10:27.000000000 -0800
+++ org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java	2006-03-25 17:30:47.000000000 -0800
@@ -269,13 +269,7 @@
 
 		// Create shell & widgets
 		shell = new Shell(display, SWT.ON_TOP);
-		if (USE_SWT32_BG_SET) {
-			try {
-				shell.setBackgroundMode(SWT.INHERIT_DEFAULT);
-			} catch (NoSuchMethodError e) {
-				// Ignore
-			}
-		}
+
 		Utils.setShellIcon(shell);
 		shell.setText(popupParams.title);
 
@@ -507,13 +501,6 @@
 			gc.dispose();
 
 			boolean bAlternateDrawing = true;
-			if (USE_SWT32_BG_SET) {
-				try {
-					shell.setBackgroundImage(imgBackground);
-					bAlternateDrawing = false;
-				} catch (NoSuchMethodError e) {
-				}
-			}
 
 			if (bAlternateDrawing) {
 				// Drawing of BG Image for pre SWT 3.2

azureus-no-update-manager-MainStatusBar.patch:

--- NEW FILE azureus-no-update-manager-MainStatusBar.patch ---
--- org/gudy/azureus2/ui/swt/mainwindow/MainStatusBar.java.~1.1.~	2006-03-20 23:21:17.000000000 -0800
+++ org/gudy/azureus2/ui/swt/mainwindow/MainStatusBar.java	2006-03-25 18:13:47.000000000 -0800
@@ -544,8 +544,6 @@
 		});
 		statusDown.setMenu(menuDownSpeed);
 
-		addUpdateListener();
-
 		return statusBar;
 	}
 
@@ -619,16 +617,6 @@
 		}
 	}
 
-	private void addUpdateListener() {
-		azureusCore.getPluginManager().getDefaultPluginInterface()
-				.getUpdateManager().addListener(new UpdateManagerListener() {
-					public void checkInstanceCreated(UpdateCheckInstance instance) {
-
-						new updateStatusChanger(instance);
-					}
-				});
-	}
-
 	protected class updateStatusChanger {
 		UpdateCheckInstance instance;
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/azureus/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Feb 2006 17:00:46 -0000	1.4
+++ .cvsignore	1 Apr 2006 22:08:05 -0000	1.5
@@ -1,3 +1,3 @@
+azureus2-cvs-20060325.tar.gz
 azplugins_1.8.8.jar
-azureus2-cvs-20060209.tar.gz
 bdcc_2.2.2.zip

azureus-no-install-remove-plugins.patch:

Index: azureus-no-install-remove-plugins.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/FC-5/azureus-no-install-remove-plugins.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- azureus-no-install-remove-plugins.patch	9 Feb 2006 08:45:07 -0000	1.1
+++ azureus-no-install-remove-plugins.patch	1 Apr 2006 22:08:05 -0000	1.2
@@ -1,8 +1,8 @@
---- org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java.~1.58.~	2006-01-31 14:43:47.000000000 -0500
-+++ org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java	2006-02-09 00:05:11.000000000 -0500
+--- org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java.orig	2006-03-28 04:35:35.000000000 -0800
++++ org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java	2006-03-28 04:41:30.000000000 -0800
 @@ -347,26 +347,6 @@
-       menu_plugin.setMenu(pluginMenu);
-       if(notMainWindow) {performOneTimeDisable(menu_plugin, true);}
+ 			menu_plugin_logViews.setMenu(pluginLogsMenu);
+ 			menu_plugin_logViews.setData("EOL", "1");
  
 -      new MenuItem(pluginMenu, SWT.SEPARATOR);
 -      
@@ -38,7 +38,7 @@
 -        help_checkupdate.addListener(SWT.Selection, new Listener() {
 -        	public void handleEvent(Event e) {
 -        		mainWindow.getShell().setFocus();
--        		UpdateMonitor.getSingleton( mainWindow.getAzureusCore()).performCheck();
+-        		UpdateMonitor.getSingleton( mainWindow.getAzureusCore()).performCheck(true);
 -        	}
 -        });
 -      }

azureus-no-update-manager-AzureusCoreImpl.patch:

Index: azureus-no-update-manager-AzureusCoreImpl.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/FC-5/azureus-no-update-manager-AzureusCoreImpl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- azureus-no-update-manager-AzureusCoreImpl.patch	10 Feb 2006 17:00:46 -0000	1.1
+++ azureus-no-update-manager-AzureusCoreImpl.patch	1 Apr 2006 22:08:05 -0000	1.2
@@ -1,6 +1,6 @@
---- com/aelitis/azureus/core/impl/AzureusCoreImpl.java.orig	2006-02-09 23:23:01.000000000 -0500
-+++ com/aelitis/azureus/core/impl/AzureusCoreImpl.java	2006-02-09 23:23:19.000000000 -0500
-@@ -391,13 +391,6 @@
+--- com/aelitis/azureus/core/impl/AzureusCoreImpl.java.orig	2006-03-25 14:17:49.000000000 -0800
++++ com/aelitis/azureus/core/impl/AzureusCoreImpl.java	2006-03-25 15:14:01.000000000 -0800
+@@ -584,14 +584,6 @@
  			if (Logger.isEnabled())
  				Logger.log(new LogEvent(LOGID, "Stop operation completes"));
  	
@@ -11,6 +11,7 @@
 -				
 -				AzureusRestarterFactory.create( this ).restart( true );
 -			}
- 		}finally{
- 			
- 			stopping_sem.releaseForever();
+-			
+ 			try{
+ 				ThreadGroup	tg = Thread.currentThread().getThreadGroup();
+ 				

azureus-no-update-manager-CoreUpdateChecker.patch:

Index: azureus-no-update-manager-CoreUpdateChecker.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/FC-5/azureus-no-update-manager-CoreUpdateChecker.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- azureus-no-update-manager-CoreUpdateChecker.patch	10 Feb 2006 17:00:46 -0000	1.1
+++ azureus-no-update-manager-CoreUpdateChecker.patch	1 Apr 2006 22:08:05 -0000	1.2
@@ -1,6 +1,6 @@
---- org/gudy/azureus2/update/CoreUpdateChecker.java.orig	2006-02-09 23:27:55.000000000 -0500
-+++ org/gudy/azureus2/update/CoreUpdateChecker.java	2006-02-09 23:28:47.000000000 -0500
-@@ -124,8 +124,6 @@
+--- org/gudy/azureus2/update/CoreUpdateChecker.java.orig	2006-03-25 14:18:45.000000000 -0800
++++ org/gudy/azureus2/update/CoreUpdateChecker.java	2006-03-25 17:19:32.000000000 -0800
+@@ -122,8 +122,6 @@
  		props.setProperty( "plugin.version", plugin_interface.getAzureusVersion());
  		
  		rdf = plugin_interface.getUtilities().getResourceDownloaderFactory();
@@ -9,7 +9,7 @@
  	}
  	
  	public String
-@@ -144,178 +142,9 @@
+@@ -142,155 +140,9 @@
  	checkForUpdate(
  		final UpdateChecker	checker )
  	{
@@ -17,15 +17,7 @@
 -			String	current_version = plugin_interface.getAzureusVersion();
 -			
 -			log.log( "Update check starts: current = " + current_version );
--									
--			boolean	TESTING = false;	// !!!!TODO: REMOVE THIS
--			
--			if ( TESTING ){
--			
--				System.out.println( "CoreUpdater: !!!! Testing mode !!!!" );
--				
--			}
--				
+-													
 -			Map	decoded = VersionCheckClient.getSingleton().getVersionCheckInfo(
 -		  			first_check?VersionCheckClient.REASON_UPDATE_CHECK_START:VersionCheckClient.REASON_UPDATE_CHECK_PERIODIC);
 -
@@ -61,26 +53,11 @@
 -			
 -			log.log( msg );
 -			
--			boolean	latest_is_cvs	= Constants.isCVSVersion( latest_version );
--			String	latest_base		= Constants.getBaseVersion( latest_version );
--			
--			String	current_base	= Constants.getBaseVersion();
--				
--				// currently we upgrade from, for example
--				//  1) 2.0.8.4     -> 2.0.8.6
--				//	2) 2.0.8.5_CVS -> 2.0.8.6
--				// but not to a CVS version (also currently never reported as latest...)
--				
--			if ( latest_is_cvs && !TESTING ){
+-			if ( !shouldUpdate( current_version, latest_version )){
 -				
 -				return;
 -			}
--
--			if ( Constants.compareVersions( current_base, latest_base ) >= 0 && !TESTING){
 -				
--				return;
--			}
--			
 -			final String	f_latest_version	= latest_version;
 -			final String	f_latest_file_name	= latest_file_name;
 -			

azureus-no-update-manager-UpdateMonitor.patch:

Index: azureus-no-update-manager-UpdateMonitor.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/FC-5/azureus-no-update-manager-UpdateMonitor.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- azureus-no-update-manager-UpdateMonitor.patch	10 Feb 2006 17:00:46 -0000	1.1
+++ azureus-no-update-manager-UpdateMonitor.patch	1 Apr 2006 22:08:05 -0000	1.2
@@ -1,6 +1,6 @@
---- org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.orig	2006-02-09 23:25:26.000000000 -0500
-+++ org/gudy/azureus2/ui/swt/update/UpdateMonitor.java	2006-02-09 23:26:30.000000000 -0500
-@@ -87,147 +87,18 @@
+--- org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.orig	2006-03-28 04:35:36.000000000 -0800
++++ org/gudy/azureus2/ui/swt/update/UpdateMonitor.java	2006-03-28 04:44:37.000000000 -0800
+@@ -88,149 +88,19 @@
  	{
  		azureus_core	= _azureus_core;
  		
@@ -49,12 +49,14 @@
  	{
 -		boolean check_at_start	= false;
 -		boolean check_periodic	= false;
+-		boolean bOldSWT = SWT.getVersion() < 3139;
 -	
 -			// no update checks for java web start
 -		
 -		if ( !SystemProperties.isJavaWebStartInstance()){
 -					
--			check_at_start	= COConfigurationManager.getBooleanParameter( "update.start", true );
+-			// force check when SWT is really old
+-			check_at_start	= COConfigurationManager.getBooleanParameter( "update.start", true ) || bOldSWT;
 -			check_periodic	= COConfigurationManager.getBooleanParameter( "update.periodic", true );
 -		}
 -		
@@ -65,7 +67,7 @@
 -		if (	( check_at_start && start_of_day) ||
 -				( check_periodic && !start_of_day )){
 -			
--			performCheck();	// this will implicitly do usage stats
+-			performCheck(bOldSWT);	// this will implicitly do usage stats
 -			
 -		}else{
 -
@@ -84,10 +86,11 @@
 -						}
 -					});
 -		}
++
  	}
  	
  	public void
- 	performCheck()
+ 	performCheck(final boolean bForce)
  	{
 -		if ( SystemProperties.isJavaWebStartInstance()){
 -			
@@ -135,7 +138,7 @@
 -				
 -			    		current_update_instance = 
 -			    			um.createUpdateCheckInstance(
--			    				UpdateCheckInstance.UCI_UPDATE,
+-			    				bForce ? UpdateCheckInstance.UCI_INSTALL : UpdateCheckInstance.UCI_UPDATE,
 -			  					"update.instance.update" );
 -			  	
 -			    		current_update_instance.start();


Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/FC-5/azureus.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- azureus.spec	14 Feb 2006 04:48:03 -0000	1.19
+++ azureus.spec	1 Apr 2006 22:08:05 -0000	1.20
@@ -1,49 +1,51 @@
-Name:           azureus
-Version:        2.4.0.0
-Release:        0.20060209cvs_1%{?dist}
-Summary:        A BitTorrent Client
-
-Group:          Applications/Internet
-License:        GPL
-URL:            http://azureus.sourceforge.net
+Name:		azureus
+Version:	2.4.0.3
+Release:	0.20060328cvs_1%{?dist}
+Summary:	A BitTorrent Client
+
+Group:		Applications/Internet
+License:	GPL
+URL:		http://azureus.sourceforge.net
 
 # A cvs snapshot with the build and bouncycastle directories
 # removed.
-Source0:        azureus2-cvs-20060209.tar.gz
+Source0:	azureus2-cvs-20060325.tar.gz
 
-Source1:        azureus.script
-Source2:        Azureus.desktop
-Source3:        azureus.applications
-Source4:        azureus-License.txt
-Source5:        azureus-ChangeLog.txt
+Source1:	azureus.script
+Source2:	Azureus.desktop
+Source3:	azureus.applications
+Source4:	azureus-License.txt
+Source5:	azureus-ChangeLog.txt
 
 Source6:	azplugins_1.8.8.jar
 Source7:	bdcc_2.2.2.zip
 
-Patch0:         azureus-remove-win32-osx-platforms.patch
-Patch1:         azureus-remove-win32-PlatformManagerUpdateChecker.patch
-Patch2:         azureus-cache-size.patch
-Patch3:         azureus-remove-manifest-classpath.patch
-Patch4:         azureus-ConfigSectionPlugins-swt-3.1.patch
-Patch5:         azureus-Messages-swt-3.1.patch
-Patch6:         azureus-TableView-swt-3.1.patch
-Patch7:         azureus-themed.patch
-Patch8:         azureus-rh-bugzilla-180418.patch
-Patch9:         azureus-no-shared-plugins.patch
-Patch10:        azureus-no-install-remove-plugins.patch
-Patch11:        azureus-no-restart.patch
-Patch12:        azureus-no-updates-PluginInitializer.patch
-Patch13:        azureus-no-updates-PluginInterfaceImpl.patch
-Patch14:        azureus-no-update-manager-AzureusCoreImpl.patch
-Patch15:        azureus-no-update-manager-CorePatchChecker.patch
-Patch16:        azureus-no-update-manager-CoreUpdateChecker.patch
-Patch17:        azureus-no-update-manager-MainWindow.patch
-Patch18:        azureus-no-update-manager-PluginInstallerImpl.patch
-Patch19:        azureus-no-update-manager-PluginUpdatePlugin.patch
-Patch20:        azureus-no-update-manager-SWTUpdateChecker.patch
-#Patch21:        azureus-no-update-manager-TableView.patch
-Patch22:        azureus-no-update-manager-UpdateMonitor.patch
-Patch23:        azureus-no-update-manager-PluginInstallerImpl-2.patch
+Patch0:		azureus-remove-win32-osx-platforms.patch
+Patch1:		azureus-remove-win32-PlatformManagerUpdateChecker.patch
+Patch2:		azureus-cache-size.patch
+Patch3:		azureus-remove-manifest-classpath.patch
+Patch4:		azureus-ConfigSectionPlugins-swt-3.1.patch
+Patch5:		azureus-Messages-swt-3.1.patch
+Patch6:		azureus-TableView-swt-3.1.patch
+Patch7:		azureus-themed.patch
+Patch8:		azureus-rh-bugzilla-180418.patch
+Patch9:		azureus-no-shared-plugins.patch
+Patch10:	azureus-no-install-remove-plugins.patch
+Patch11:	azureus-no-restart.patch
+Patch12:	azureus-no-updates-PluginInitializer.patch
+Patch13:	azureus-no-updates-PluginInterfaceImpl.patch
+Patch14:	azureus-no-update-manager-AzureusCoreImpl.patch
+Patch15:	azureus-no-update-manager-CorePatchChecker.patch
+Patch16:	azureus-no-update-manager-CoreUpdateChecker.patch
+Patch17:	azureus-no-update-manager-MainWindow.patch
+Patch18:	azureus-no-update-manager-PluginInstallerImpl.patch
+Patch19:	azureus-no-update-manager-PluginUpdatePlugin.patch
+Patch20:	azureus-no-update-manager-SWTUpdateChecker.patch
+#Patch21:	 azureus-no-update-manager-TableView.patch
+Patch22:	azureus-no-update-manager-UpdateMonitor.patch
+Patch23:	azureus-no-update-manager-PluginInstallerImpl-2.patch
+Patch24:	azureus-MessageSlideShell-swt-3.1.patch
+Patch25:	azureus-no-update-manager-MainStatusBar.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -84,20 +86,22 @@
 %patch14 -p0
 %patch15 -p0
 %patch16 -p0
-%patch17 -p0
+#%patch17 -p0
 %patch18 -p0
 %patch19 -p0
 %patch20 -p0
 #%patch21 -p0
 %patch22 -p0
 %patch23 -p0
+%patch24 -p0
+%patch25 -p0
 cp %{SOURCE4} License.txt
 cp %{SOURCE5} ChangeLog.txt
 
 %build
 mkdir -p build/libs
 build-jar-repository build/libs jakarta-commons-cli swt-gtk-3.1.1 log4j gnu-crypto gtk2.8 glib0.2
-ln -s /usr/share/java/gcj-endorsed/bcprov-131.jar build/libs
+ln -s /usr/share/java/gcj-endorsed/bcprov-1.31.jar build/libs
 find ./ -name osx | xargs rm -r
 find ./ -name macosx | xargs rm -r
 find ./ -name [Ww]in32\* | xargs rm -r
@@ -199,6 +203,10 @@
 %{_libdir}/gcj/*
 
 %changelog
+* Tue Mar 28 2006 Anthony Green <green at redhat.com> - 2.4.0.3-0.20060328cvs_1
+- Update sources.
+- Fix bcprov jar file reference.
+
 * Mon Feb 13 2006 Anthony Green <green at redhat.com> - 2.4.0.0-0.20060207cvs_1
 - Remove absolute path from azureus-no-updates-PluginInterfaceImpl.patch.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/azureus/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Feb 2006 17:00:46 -0000	1.4
+++ sources	1 Apr 2006 22:08:05 -0000	1.5
@@ -1,3 +1,3 @@
+a1827e2041841940c4ca16fdf240afac  azureus2-cvs-20060325.tar.gz
 28f136e1d99d8a0d0d04ef4398f782b4  azplugins_1.8.8.jar
-ed4b5f0e19ad6632198731baeb48aac5  azureus2-cvs-20060209.tar.gz
 0e88c3952b36ba221e277420a7080b43  bdcc_2.2.2.zip



From fedora-extras-commits at redhat.com  Sat Apr  1 23:17:09 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat,  1 Apr 2006 16:17:09 -0700
Subject: rpms/lib765 import.log,1.5,1.6
Message-ID: <200604012317.k31NHBbP020593@cvs-int.fedora.redhat.com>

Author: pfj

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

Modified Files:
	import.log 
Log Message:
auto-import lib765-0.3.4-1 on branch devel from lib765-0.3.4-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/lib765/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	10 Mar 2006 22:32:56 -0000	1.5
+++ import.log	1 Apr 2006 23:17:09 -0000	1.6
@@ -2,3 +2,4 @@
 lib765-0_3_3-4:HEAD:lib765-0.3.3-4.src.rpm:1141758291
 lib765-0_3_3-5:HEAD:lib765-0.3.3-5.src.rpm:1141954170
 lib765-0_3_3-6:HEAD:lib765-0.3.3-6.src.rpm:1142029964
+lib765-0_3_4-1:HEAD:lib765-0.3.4-1.src.rpm:1143933417



From fedora-extras-commits at redhat.com  Sat Apr  1 23:17:10 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat,  1 Apr 2006 16:17:10 -0700
Subject: rpms/lib765/devel .cvsignore, 1.2, 1.3 lib765.spec, 1.4, 1.5 sources,
	1.2, 1.3
Message-ID: <200604012317.k31NHC3M020599@cvs-int.fedora.redhat.com>

Author: pfj

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

Modified Files:
	.cvsignore lib765.spec sources 
Log Message:
auto-import lib765-0.3.4-1 on branch devel from lib765-0.3.4-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lib765/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Jan 2006 00:58:49 -0000	1.2
+++ .cvsignore	1 Apr 2006 23:17:10 -0000	1.3
@@ -1 +1 @@
-lib765-0.3.3.tar.gz
+lib765-0.3.4.tar.gz


Index: lib765.spec
===================================================================
RCS file: /cvs/extras/rpms/lib765/devel/lib765.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lib765.spec	10 Mar 2006 22:33:02 -0000	1.4
+++ lib765.spec	1 Apr 2006 23:17:10 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: A library for emulating the uPD765a floppy controller
 Name: lib765
-Version: 0.3.3
-Release: 6%{?dist}
+Version: 0.3.4
+Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source: http://www.seasip.demon.co.uk/Unix/LibDsk/lib765-%{version}.tar.gz
@@ -51,6 +51,9 @@
 %exclude %{_libdir}/lib765.la
 
 %changelog
+* Sun Apr 02 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.3.4-1
+- Bump to new version
+
 * Fri Mar 10 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.3.3-6
 - Minor tweak to the spec file
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lib765/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Jan 2006 00:58:49 -0000	1.2
+++ sources	1 Apr 2006 23:17:10 -0000	1.3
@@ -1 +1 @@
-831929572120af53781322e0456c708b  lib765-0.3.3.tar.gz
+fd916b3fe613c39e07540bdbc0effc7f  lib765-0.3.4.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  1 23:18:48 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat,  1 Apr 2006 16:18:48 -0700
Subject: rpms/libdsk import.log,1.2,1.3
Message-ID: <200604012318.k31NIoPq020702@cvs-int.fedora.redhat.com>

Author: pfj

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

Modified Files:
	import.log 
Log Message:
auto-import libdsk-1.1.9-1 on branch devel from libdsk-1.1.9-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libdsk/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	13 Jan 2006 01:08:19 -0000	1.2
+++ import.log	1 Apr 2006 23:18:48 -0000	1.3
@@ -1 +1,2 @@
 libdsk-1_1_6-1:HEAD:libdsk-1.1.6-1.src.rpm:1137114439
+libdsk-1_1_9-1:HEAD:libdsk-1.1.9-1.src.rpm:1143933516



From fedora-extras-commits at redhat.com  Sat Apr  1 23:18:49 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat,  1 Apr 2006 16:18:49 -0700
Subject: rpms/libdsk/devel .cvsignore, 1.2, 1.3 libdsk.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200604012318.k31NIp2t020708@cvs-int.fedora.redhat.com>

Author: pfj

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

Modified Files:
	.cvsignore libdsk.spec sources 
Log Message:
auto-import libdsk-1.1.9-1 on branch devel from libdsk-1.1.9-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libdsk/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Jan 2006 01:08:43 -0000	1.2
+++ .cvsignore	1 Apr 2006 23:18:49 -0000	1.3
@@ -1 +1 @@
-libdsk-1.1.6.tar.gz
+libdsk-1.1.9.tar.gz


Index: libdsk.spec
===================================================================
RCS file: /cvs/extras/rpms/libdsk/devel/libdsk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libdsk.spec	13 Jan 2006 01:08:43 -0000	1.1
+++ libdsk.spec	1 Apr 2006 23:18:49 -0000	1.2
@@ -1,6 +1,6 @@
 Summary: Library for accessing disk images
 Name: libdsk
-Version: 1.1.6
+Version: 1.1.9
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
@@ -68,6 +68,8 @@
 %{_bindir}/md3serial
 %{_bindir}/dskdump
 %{_bindir}/dskscan
+%{_bindir}/dskutil
+%{_mandir}/man1/dskutil.1*
 %{_mandir}/man1/dskdump.1*
 %{_mandir}/man1/dskscan.1*
 %{_mandir}/man1/dskform.1*
@@ -83,6 +85,9 @@
 %exclude %{_libdir}/libdsk.la
 
 %changelog
+* Sun Apr 02 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 1.1.9-1
+- Bump to new version
+
 * Fri Nov 11 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 1.1.6.1
 - Removed packager
 - Altered BR to remove requirement for sed


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libdsk/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Jan 2006 01:08:43 -0000	1.2
+++ sources	1 Apr 2006 23:18:49 -0000	1.3
@@ -1 +1 @@
-8abf60a90ab13c7f9f57d4a94dcd2166  libdsk-1.1.6.tar.gz
+a773876031e3a0813f36e76214d73753  libdsk-1.1.9.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  1 23:55:59 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  1 Apr 2006 16:55:59 -0700
Subject: rpms/k3b-extras - New directory
Message-ID: <200604012356.k31Nu1xB021227@cvs-int.fedora.redhat.com>

Author: rdieter

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

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




From fedora-extras-commits at redhat.com  Sat Apr  1 23:56:00 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  1 Apr 2006 16:56:00 -0700
Subject: rpms/k3b-extras/devel - New directory
Message-ID: <200604012356.k31Nu2DE021230@cvs-int.fedora.redhat.com>

Author: rdieter

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

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




From fedora-extras-commits at redhat.com  Sat Apr  1 23:56:07 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  1 Apr 2006 16:56:07 -0700
Subject: rpms/k3b-extras Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604012356.k31Nu9kT021279@cvs-int.fedora.redhat.com>

Author: rdieter

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

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


--- NEW FILE Makefile ---
# Top level Makefile for module k3b-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  Sat Apr  1 23:56:08 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  1 Apr 2006 16:56:08 -0700
Subject: rpms/k3b-extras/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604012356.k31NuAN8021282@cvs-int.fedora.redhat.com>

Author: rdieter

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

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module k3b-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  Sat Apr  1 23:56:24 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  1 Apr 2006 16:56:24 -0700
Subject: rpms/k3b-extras import.log,1.1,1.2
Message-ID: <200604012356.k31NuQKf021343@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	import.log 
Log Message:
auto-import k3b-extras-0.12.14-1 on branch devel from k3b-extras-0.12.14-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/k3b-extras/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	1 Apr 2006 23:56:07 -0000	1.1
+++ import.log	1 Apr 2006 23:56:24 -0000	1.2
@@ -0,0 +1 @@
+k3b-extras-0_12_14-1:HEAD:k3b-extras-0.12.14-1.src.rpm:1143935781



From fedora-extras-commits at redhat.com  Sat Apr  1 23:56:25 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  1 Apr 2006 16:56:25 -0700
Subject: rpms/k3b-extras/devel k3b-extras.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604012356.k31NuRwN021348@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore sources 
Added Files:
	k3b-extras.spec 
Log Message:
auto-import k3b-extras-0.12.14-1 on branch devel from k3b-extras-0.12.14-1.src.rpm


--- NEW FILE k3b-extras.spec ---

Name:           k3b-extras
Summary:        Free codec plugins for k3b
Version:        0.12.14
Release:        1%{?dist}

Group:          Applications/Multimedia
License:        GPL
URL:            http://www.k3b.org/
Source0:        http://dl.sf.net/k3b/k3b-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  kdelibs-devel 
BuildRequires:  taglib-devel
BuildRequires:  libmusicbrainz-devel
BuildRequires:  gettext
BuildRequires:  libmpcdec-devel
BuildRequires:  libsndfile-devel

# It already Requires: libk3b.so.2 libk3bdevice.so.2, isn't that enough?  -- Rex
Requires:       k3b >= %{version}


%description
Free decoder/encoder plugins for k3b, including:
musepack decoder (libmpcdec)
sndfile decoder (libsndfile)


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


%build
unset QTDIR || : ; source /etc/profile.d/qt.sh
export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include

%configure \
  --disable-rpath \
  --enable-new-ldflags \
  --disable-debug --disable-warnings \
  --disable-dependancy-tracking --enable-final \
  --with-musepack \
  --with-sndfile

for dir in libk3bdevice libk3b plugins/decoder/libsndfile plugins/decoder/musepack ; do
make -C $dir %{?_smp_mflags}
done


%install
rm -rf $RPM_BUILD_ROOT

for dir in plugins/decoder/libsndfile plugins/decoder/musepack ; do
make -C $dir install DESTDIR=$RPM_BUILD_ROOT
done


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,755)
%{_libdir}/kde3/libk3blibsndfiledecoder.*
%{_libdir}/kde3/libk3bmpcdecoder.*
%{_datadir}/apps/k3b/plugins/k3blibsndfiledecoder.plugin
%{_datadir}/apps/k3b/plugins/k3bmpcdecoder.plugin


%changelog
* Mon Mar 27 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.12.14-1
- -extras subpkg for libsndfile, libmpcdec



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/k3b-extras/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Apr 2006 23:56:08 -0000	1.1
+++ .cvsignore	1 Apr 2006 23:56:25 -0000	1.2
@@ -0,0 +1 @@
+k3b-0.12.14.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/k3b-extras/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Apr 2006 23:56:08 -0000	1.1
+++ sources	1 Apr 2006 23:56:25 -0000	1.2
@@ -0,0 +1 @@
+51ef4fdf98365a285489dc1e11a07a3c  k3b-0.12.14.tar.bz2



From fedora-extras-commits at redhat.com  Sat Apr  1 23:57:38 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  1 Apr 2006 16:57:38 -0700
Subject: rpms/k3b-extras/devel k3b-extras.spec,1.1,1.2
Message-ID: <200604012357.k31NveZm021407@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	k3b-extras.spec 
Log Message:
* Sat Apr 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.12.14-2
- drop extraneous BR: taglib-devel, libmusicbrainz-devel
- Requires: k3b >= 0.12



Index: k3b-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/k3b-extras/devel/k3b-extras.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- k3b-extras.spec	1 Apr 2006 23:56:25 -0000	1.1
+++ k3b-extras.spec	1 Apr 2006 23:57:38 -0000	1.2
@@ -2,7 +2,7 @@
 Name:           k3b-extras
 Summary:        Free codec plugins for k3b
 Version:        0.12.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Group:          Applications/Multimedia
 License:        GPL
@@ -11,15 +11,14 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdelibs-devel 
-BuildRequires:  taglib-devel
-BuildRequires:  libmusicbrainz-devel
+#BuildRequires:  taglib-devel
+#BuildRequires:  libmusicbrainz-devel
 BuildRequires:  gettext
 BuildRequires:  libmpcdec-devel
 BuildRequires:  libsndfile-devel
 
 # It already Requires: libk3b.so.2 libk3bdevice.so.2, isn't that enough?  -- Rex
-Requires:       k3b >= %{version}
-
+Requires:       k3b >= 0.12 
 
 %description
 Free decoder/encoder plugins for k3b, including:
@@ -43,17 +42,17 @@
   --with-musepack \
   --with-sndfile
 
-for dir in libk3bdevice libk3b plugins/decoder/libsndfile plugins/decoder/musepack ; do
-make -C $dir %{?_smp_mflags}
-done
+make %{?_smp_mflags} -C libk3bdevice
+make %{?_smp_mflags} -C libk3b
+make %{?_smp_mflags} -C plugins/decoder/libsndfile
+make %{?_smp_mflags} -C plugins/decoder/musepack
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-for dir in plugins/decoder/libsndfile plugins/decoder/musepack ; do
-make -C $dir install DESTDIR=$RPM_BUILD_ROOT
-done
+make install DESTDIR=$RPM_BUILD_ROOT -C plugins/decoder/libsndfile
+make install DESTDIR=$RPM_BUILD_ROOT -C plugins/decoder/musepack
 
 
 %clean
@@ -61,7 +60,7 @@
 
 
 %files
-%defattr(-,root,root,755)
+%defattr(-,root,root,-)
 %{_libdir}/kde3/libk3blibsndfiledecoder.*
 %{_libdir}/kde3/libk3bmpcdecoder.*
 %{_datadir}/apps/k3b/plugins/k3blibsndfiledecoder.plugin
@@ -69,6 +68,10 @@
 
 
 %changelog
+* Sat Apr 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.12.14-2
+- drop extraneous BR: taglib-devel, libmusicbrainz-devel
+- Requires: k3b >= 0.12
+
 * Mon Mar 27 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.12.14-1
 - -extras subpkg for libsndfile, libmpcdec
 



From fedora-extras-commits at redhat.com  Sun Apr  2 00:18:55 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  1 Apr 2006 17:18:55 -0700
Subject: owners owners.list,1.790,1.791
Message-ID: <200604020018.k320IvEi023486@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	owners.list 
Log Message:
+libmpcdec
+k3b-extras



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.790
retrieving revision 1.791
diff -u -r1.790 -r1.791
--- owners.list	1 Apr 2006 18:50:56 -0000	1.790
+++ owners.list	2 Apr 2006 00:18:55 -0000	1.791
@@ -494,6 +494,7 @@
 Fedora Extras|jpgraph|An OO graph drawing class library for PHP|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|js|JavaScript interpreter|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|juk|Jukebox and music manager for KDE|nomis80 at nomis80.org|extras-qa at fedoraproject.org|
+Fedora Extras|k3b-extras|Free codec plugins for k3b|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kadischi|An application for Fedora-based LiveCD generation|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
 Fedora Extras|kakasi|A Japanese character set conversion filter|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|kanatest|Hiragana and Katakana drill tool|robert at marcanoonline.com|extras-qa at fedoraproject.org|
@@ -590,6 +591,7 @@
 Fedora Extras|libmatroska|An open Audio/Video container format|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|libmcrypt|Encryption algorithms library|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|libmodplug|Modplug mod music file format library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|libmpcdec|Musepack audio decoding library|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|libmthca|Mellanox InfiniBand HCA Userspace Driver|rolandd at cisco.com|extras-qa at fedoraproject.org|
 Fedora Extras|libnc-dap|The NetCDF interface to DAP-2 from OPeNDAP|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|libnasl|Nessus Attack Scripting Language|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Apr  2 03:34:32 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat,  1 Apr 2006 20:34:32 -0700
Subject: rpms/azureus/FC-5 azureus.script,1.7,1.8 azureus.spec,1.20,1.21
Message-ID: <200604020334.k323YYeb029744@cvs-int.fedora.redhat.com>

Author: green

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

Modified Files:
	azureus.script azureus.spec 
Log Message:
Revision 2.  Bugzilla #186152.



Index: azureus.script
===================================================================
RCS file: /cvs/extras/rpms/azureus/FC-5/azureus.script,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- azureus.script	10 Feb 2006 17:00:46 -0000	1.7
+++ azureus.script	2 Apr 2006 03:34:32 -0000	1.8
@@ -9,10 +9,10 @@
 # Reconstruct the plugins dir.
 rm -rf $APPDIR/plugins
 mkdir -p $APPDIR/plugins
-pushd $APPDIR/plugins
+pushd $APPDIR/plugins > /dev/null 2>&1
 for pdir in /usr/share/azureus/plugins/*; do
   ln -s $pdir .;
 done;
-popd
+popd > /dev/null 2>&1
 
-CLASSPATH=`build-classpath jakarta-commons-cli log4j swt-gtk-3.1.1 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 CLASSPATH=`build-classpath jakarta-commons-cli log4j swt-gtk-3.1.1 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-5/azureus.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- azureus.spec	1 Apr 2006 22:08:05 -0000	1.20
+++ azureus.spec	2 Apr 2006 03:34:32 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		azureus
 Version:	2.4.0.3
-Release:	0.20060328cvs_1%{?dist}
+Release:	0.20060328cvs_2%{?dist}
 Summary:	A BitTorrent Client
 
 Group:		Applications/Internet
@@ -134,6 +134,7 @@
 install -dm 755 $RPM_BUILD_ROOT%{_datadir}/azureus/plugins
 install -pm 644 dist/Azureus2.jar $RPM_BUILD_ROOT%{_datadir}/azureus/Azureus2.jar
 install -p -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/azureus
+sed --in-place "s:/usr/lib:%{_libdir}:" $RPM_BUILD_ROOT%{_bindir}/azureus
 
 install -dm 755 $RPM_BUILD_ROOT%{_datadir}/azureus/plugins/azplugins
 install -pm 644 plugins/azplugins/azplugins_1.8.8.jar $RPM_BUILD_ROOT%{_datadir}/azureus/plugins/azplugins/azplugins_1.8.8.jar
@@ -203,6 +204,10 @@
 %{_libdir}/gcj/*
 
 %changelog
+* Sat Apr 01 2006 Anthony Green <green at redhat.com> - 2.4.0.3-0.20060328cvs_2
+- Set LD_LIBRARY_PATH for Sun java alternative.  Bugzilla #186152.
+- Remove pushd/popd noise from startup script.
+
 * Tue Mar 28 2006 Anthony Green <green at redhat.com> - 2.4.0.3-0.20060328cvs_1
 - Update sources.
 - Fix bcprov jar file reference.



From fedora-extras-commits at redhat.com  Sun Apr  2 03:59:39 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat,  1 Apr 2006 20:59:39 -0700
Subject: rpms/rssowl/FC-5 rssowl.spec,1.6,1.7
Message-ID: <200604020359.k323xfgf029854@cvs-int.fedora.redhat.com>

Author: green

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

Modified Files:
	rssowl.spec 
Log Message:
Move to rev -13.



Index: rssowl.spec
===================================================================
RCS file: /cvs/extras/rpms/rssowl/FC-5/rssowl.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rssowl.spec	10 Mar 2006 14:01:01 -0000	1.6
+++ rssowl.spec	2 Apr 2006 03:59:39 -0000	1.7
@@ -1,6 +1,6 @@
 %define name    rssowl
 %define version 1.2
-%define release 12%{?dist}
+%define release 13%{?dist}
 %define jdk     java
 
 Name:           %name
@@ -138,7 +138,7 @@
 %{_libdir}/gcj/%{name}
 
 %changelog
-* Fri Mar 10 2006 Anthony Green <green at redhat.com> - 1.2-12
+* Fri Mar 10 2006 Anthony Green <green at redhat.com> - 1.2-13
 - Fix script goof.
 
 * Thu Mar  9 2006 Anthony Green <green at redhat.com> - 1.2-11



From fedora-extras-commits at redhat.com  Sun Apr  2 04:45:10 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  1 Apr 2006 21:45:10 -0700
Subject: owners owners.list,1.791,1.792
Message-ID: <200604020445.k324jC9f032021@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	owners.list 
Log Message:
+kdemultimedia-extras



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.791
retrieving revision 1.792
diff -u -r1.791 -r1.792
--- owners.list	2 Apr 2006 00:18:55 -0000	1.791
+++ owners.list	2 Apr 2006 04:45:10 -0000	1.792
@@ -504,6 +504,7 @@
 Fedora Extras|kawa|Kawa scheme implementation|green at redhat.com|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|kdesvn|A subversion client for KDE|orion at cora.nwra.com|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|kdetoys|K Desktop Environment - Toys and Amusements|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kdissert|Mind-mapping-like tool for KDE|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|kdocker|Dock any application in the system tray|rdieter at math.unl.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Apr  2 06:49:25 2006
From: fedora-extras-commits at redhat.com (András Tóth (tbandi72))
Date: Sat,  1 Apr 2006 23:49:25 -0700
Subject: rpms/gnome-yum import.log,1.2,1.3
Message-ID: <200604020649.k326nRes003755@cvs-int.fedora.redhat.com>

Author: tbandi72

Update of /cvs/extras/rpms/gnome-yum
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3722

Modified Files:
	import.log 
Log Message:
auto-import gnome-yum-0.1.3-1.fc4 on branch FC-4 from gnome-yum-0.1.3-1.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnome-yum/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	29 Mar 2006 16:08:25 -0000	1.2
+++ import.log	2 Apr 2006 06:49:25 -0000	1.3
@@ -1 +1,2 @@
 gnome-yum-0_1_3-1:HEAD:gnome-yum-0.1.3-1.src.rpm:1143648486
+gnome-yum-0_1_3-1_fc4:FC-4:gnome-yum-0.1.3-1.fc4.src.rpm:1143960557



From fedora-extras-commits at redhat.com  Sun Apr  2 06:49:26 2006
From: fedora-extras-commits at redhat.com (András Tóth (tbandi72))
Date: Sat,  1 Apr 2006 23:49:26 -0700
Subject: rpms/gnome-yum/FC-4 gnome-yum.spec, 1.2, 1.3 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604020649.k326nSlk003761@cvs-int.fedora.redhat.com>

Author: tbandi72

Update of /cvs/extras/rpms/gnome-yum/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3722/FC-4

Modified Files:
	.cvsignore sources 
Added Files:
	gnome-yum.spec 
Log Message:
auto-import gnome-yum-0.1.3-1.fc4 on branch FC-4 from gnome-yum-0.1.3-1.fc4.src.rpm


Index: gnome-yum.spec
===================================================================
RCS file: gnome-yum.spec
diff -N gnome-yum.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnome-yum.spec	2 Apr 2006 06:49:26 -0000	1.3
@@ -0,0 +1,54 @@
+Summary:         GNOME interface for YUM
+Name:            gnome-yum
+Version:         0.1.3
+Release:         1%{?dist}
+Group:           Applications/System
+License:         GPL
+Source0:         http://prdownloads.sourceforge.net/g/gn/gnome-yum/%{name}-%{version}.tar.bz2
+Url:             http://gnome-yum.sourceforge.net
+Requires:        usermode
+BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:   GConf2-devel vte-devel gnome-vfs2-devel desktop-file-utils libgnomeui-devel
+
+%description 
+GNOME Interface for YUM
+
+%prep
+%setup -q
+
+%build
+%configure
+make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%makeinstall
+%find_lang gnome-yum
+rm -f $RPM_BUILD_ROOT%{_bindir}/gnome-yum
+cd $RPM_BUILD_ROOT%{_bindir}
+ln -s consolehelper gnome-yum
+for doc in ABOUT-NLS AUTHORS README COPYING INSTALL NEWS TODO ChangeLog; do
+	rm -f $RPM_BUILD_ROOT%{_prefix}/doc/gnome-yum/$doc
+done
+desktop-file-install --vendor fedora --delete-original       \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
+  $RPM_BUILD_ROOT%{_datadir}/applications/gnome-yum.desktop
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files -f gnome-yum.lang
+%doc ABOUT-NLS AUTHORS README COPYING INSTALL TODO ChangeLog 
+%defattr(-,root,root)
+%dir %{_datadir}/pixmaps/gnome-yum
+%{_datadir}/pixmaps/gnome-yum
+%{_datadir}/applications/*.desktop
+%{_bindir}/gnome-yum
+%{_sbindir}/gnome-yum
+%config(noreplace) %{_sysconfdir}/pam.d/gnome-yum
+%config(noreplace) %{_sysconfdir}/security/console.apps/gnome-yum
+%attr(0755,root,root) %{_datadir}/gnome-yum/gyum-query.sh
+
+%changelog
+* Sat Jan 14 2006 Andr??s T??th  <toth_bandi at users.sourceforge.net> - 0.1.3-1
+- Fixed specfile format bugs


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-yum/FC-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Mar 2006 04:50:44 -0000	1.1
+++ .cvsignore	2 Apr 2006 06:49:26 -0000	1.2
@@ -0,0 +1 @@
+gnome-yum-0.1.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-yum/FC-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Mar 2006 04:50:44 -0000	1.1
+++ sources	2 Apr 2006 06:49:26 -0000	1.2
@@ -0,0 +1 @@
+0a3bbb714418b8b849e5fa3ecab877fc  gnome-yum-0.1.3.tar.bz2



From fedora-extras-commits at redhat.com  Sun Apr  2 06:51:15 2006
From: fedora-extras-commits at redhat.com (András Tóth (tbandi72))
Date: Sat,  1 Apr 2006 23:51:15 -0700
Subject: rpms/gnome-yum import.log,1.3,1.4
Message-ID: <200604020651.k326pHQi003871@cvs-int.fedora.redhat.com>

Author: tbandi72

Update of /cvs/extras/rpms/gnome-yum
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3837

Modified Files:
	import.log 
Log Message:
auto-import gnome-yum-0.1.3-1.fc5 on branch FC-5 from gnome-yum-0.1.3-1.fc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnome-yum/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	2 Apr 2006 06:49:25 -0000	1.3
+++ import.log	2 Apr 2006 06:51:15 -0000	1.4
@@ -1,2 +1,3 @@
 gnome-yum-0_1_3-1:HEAD:gnome-yum-0.1.3-1.src.rpm:1143648486
 gnome-yum-0_1_3-1_fc4:FC-4:gnome-yum-0.1.3-1.fc4.src.rpm:1143960557
+gnome-yum-0_1_3-1_fc5:FC-5:gnome-yum-0.1.3-1.fc5.src.rpm:1143960666



From fedora-extras-commits at redhat.com  Sun Apr  2 06:51:15 2006
From: fedora-extras-commits at redhat.com (András Tóth (tbandi72))
Date: Sat,  1 Apr 2006 23:51:15 -0700
Subject: rpms/gnome-yum/FC-5 gnome-yum.spec, 1.2, 1.3 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604020651.k326pHpk003877@cvs-int.fedora.redhat.com>

Author: tbandi72

Update of /cvs/extras/rpms/gnome-yum/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3837/FC-5

Modified Files:
	.cvsignore sources 
Added Files:
	gnome-yum.spec 
Log Message:
auto-import gnome-yum-0.1.3-1.fc5 on branch FC-5 from gnome-yum-0.1.3-1.fc5.src.rpm


Index: gnome-yum.spec
===================================================================
RCS file: gnome-yum.spec
diff -N gnome-yum.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnome-yum.spec	2 Apr 2006 06:51:15 -0000	1.3
@@ -0,0 +1,54 @@
+Summary:         GNOME interface for YUM
+Name:            gnome-yum
+Version:         0.1.3
+Release:         1%{?dist}
+Group:           Applications/System
+License:         GPL
+Source0:         http://prdownloads.sourceforge.net/g/gn/gnome-yum/%{name}-%{version}.tar.bz2
+Url:             http://gnome-yum.sourceforge.net
+Requires:        usermode
+BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:   GConf2-devel vte-devel gnome-vfs2-devel desktop-file-utils libgnomeui-devel
+
+%description 
+GNOME Interface for YUM
+
+%prep
+%setup -q
+
+%build
+%configure
+make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%makeinstall
+%find_lang gnome-yum
+rm -f $RPM_BUILD_ROOT%{_bindir}/gnome-yum
+cd $RPM_BUILD_ROOT%{_bindir}
+ln -s consolehelper gnome-yum
+for doc in ABOUT-NLS AUTHORS README COPYING INSTALL NEWS TODO ChangeLog; do
+	rm -f $RPM_BUILD_ROOT%{_prefix}/doc/gnome-yum/$doc
+done
+desktop-file-install --vendor fedora --delete-original       \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
+  $RPM_BUILD_ROOT%{_datadir}/applications/gnome-yum.desktop
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files -f gnome-yum.lang
+%doc ABOUT-NLS AUTHORS README COPYING INSTALL TODO ChangeLog 
+%defattr(-,root,root)
+%dir %{_datadir}/pixmaps/gnome-yum
+%{_datadir}/pixmaps/gnome-yum
+%{_datadir}/applications/*.desktop
+%{_bindir}/gnome-yum
+%{_sbindir}/gnome-yum
+%config(noreplace) %{_sysconfdir}/pam.d/gnome-yum
+%config(noreplace) %{_sysconfdir}/security/console.apps/gnome-yum
+%attr(0755,root,root) %{_datadir}/gnome-yum/gyum-query.sh
+
+%changelog
+* Sat Jan 14 2006 Andr??s T??th  <toth_bandi at users.sourceforge.net> - 0.1.3-1
+- Fixed specfile format bugs


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-yum/FC-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Mar 2006 04:50:44 -0000	1.1
+++ .cvsignore	2 Apr 2006 06:51:15 -0000	1.2
@@ -0,0 +1 @@
+gnome-yum-0.1.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-yum/FC-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Mar 2006 04:50:44 -0000	1.1
+++ sources	2 Apr 2006 06:51:15 -0000	1.2
@@ -0,0 +1 @@
+0a3bbb714418b8b849e5fa3ecab877fc  gnome-yum-0.1.3.tar.bz2



From fedora-extras-commits at redhat.com  Sun Apr  2 06:59:58 2006
From: fedora-extras-commits at redhat.com (András Tóth (tbandi72))
Date: Sat,  1 Apr 2006 23:59:58 -0700
Subject: rpms/gnome-yum/FC-4 gnome-yum-0.1.3-1.fc4.src.rpm,NONE,1.1.2.1
Message-ID: <200604020700.k32700wJ004046@cvs-int.fedora.redhat.com>

Author: tbandi72

Update of /cvs/extras/rpms/gnome-yum/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4031

Added Files:
      Tag: gnome-yum-0_1_3-1_fc4
	gnome-yum-0.1.3-1.fc4.src.rpm 
Log Message:



--- NEW FILE gnome-yum-0.1.3-1.fc4.src.rpm ---
????


 '
eXa?[???I?l|R|?C??

-O????????;s?9]9?@??mt/???;[??z?1?tj,?D???_P??<????W??}????????Bi????l???.m?)C??\?l?*???DF?{??:z?????)?:?]???g???hO?.
??9W_?????~7????MZ?,
_5)?\\??_?o#?d?}?f#oj??m???&Pg??L???Jq
?k&????o?;g[ 0?y?????E?)L??u

?6tz39??????d????IN?????GN?"?(?X??H??%G?\|?1'H??h??????pVW[WMN?a?,c??xn?????m??m???A???~?~?.+,???($"?){????????O?
?E-?"q?r?T???EZx<???Qo???t?????)h?hk?????[sqQ}.?q????}39y??E?????????h%??ur?????????;???IHj?L??G??????)?]zM??S?V?]P?&?t?VKw?a1?+?I?
??a?:???@I9???{w^?(?????v??Qm???????s[?_??T???v'?H4?q???&PR?\??76???? +??[??s?'vN??????#~??=XtT??8?2635??/?.????}g	??~?%ao7wz?Q?>?FT$???Rs?0??d??R5???l???74??? ?2???Dc????h?.??'???L???u?q?F4?
??W?gt????RS?S?Q?Q??l3`^nK	b?k??'?r\?bP+?-
3??>?AL?R7T>j?},?k?T?J?/??????8?#???U??qe?{?\@?????[3v@?U?v??\?+??R??U? ?=;gp{f?????WLm???1?p???M3d?%?F????J:??5??SKa??O???7??w?????65???9F+?=-?5???$,$??+~?W????c?5?8C/?r?????u?[???????cs&??m???????$??`???V?????0??????U?yf<???{?j?@8Ujg???k??????)Q?o*?EJe{??G;t#x+????ud\?-rG??j(?hM>#?
?????P|???@?g?G???v?????5?????`???`????*??PH????E?
??I%6v???????xZ???2~fzK???K???u	?=??v??p??
??p@?y-????M?=??U????NOt(??<4=T:??KJ?Z????e?Ky)???	(K???
????^???????9?w?]t??$????(??9K?#b???\??9??r[
vC????%???F??????W?]Y??&??P??}?{'
u:+???qh??(????#dV?W%????k???a??q????_?x??(?A??T????T?$mj???E$?rI?L??M?&??G?????-???f?,????7?O?9?{?????e?;??$q0
}??d?5??c??uc??|ex(?wG???i???^7????B???????}??????ZB??A????]?;o}R??U0lX0GW6u???	???:?(???%&????6X8	+?*"yoI7????????hZ(???????????????1???ZC?w???K?)??So7+??7.^?S^?Kh8??????zhU7?^V{{????c????A?E??????l???????'L?P??W@?,??I?AZ?W???5Z?.n??_Z?p??J???$v=nmju?#?b?b????v??????q%??)T??m?3?7?_??Q+?~P??0?B???????V??d??
/`L5?[+n!q?Wo9???4ab??*Ar?L0?H?Bz??6?????h?s&O?&??v???n?????	n<?(BGh?????-c???H???4???C???cT????!Xn??
?U?|+?M???B??;OGmC??_?d??}N?u5AQ?Qg??`??5???ih?s0???,Bw?d?5T?x?(4s?C?w??<{|??(?B??'""lp???{?B!
HVBU????_?v?????,?}+/D??2????K?{"?=?????UL ??,,???Efy??%=<???6???-??pj+??????\*?9?0e??F??:?s?;??u/??K???W??N??s??v?_??????2?"??t???S?c???Vy???8?2??{??Z?eyQUN???????\:?|?ti?????B????o??*????ocI"????"???Cw!6??`??G??????????-??8??????]Z?v??????]?f?	?)??V]/K?x'??m?'?9?xjiEa????1w?;???C?E??|??????~???Eg?
U?	??yB(?e?v?j????P?v?z????b??+?y??
??@?z<6?9?.?||?}56~?Z????d}@KZ5D>??3y???K?p?vcZ?.T.b??>??????P%?u??o2?????.??$?kq????6???HD?(??m1_K?=;?D????5v.???u?E??%{?l?z6?N~?J??h ??7??<?c????B?W?S?uc???3W?|???@?????p?k????E$*?I???????????A%2G<?????N??*??3?????'"???????Q??
^?[.?(\?u?4I??t??&:?*A???wL??????0??Q???BxP???????'Iv?v???????u,%?????0?
v??????????uT??Z-??a4Fr????(V?????`?E????D5\??r????2u? ??j??u?,~Uv?[??~}?L??p3Dr:H??h????>>????
?g[#??[??+????o5F??FJ???0??<?y???v4?I???^?U??M
'"3?r???O????????????e
?B????L@??N?jd???;?V~z`K??-(u?=4^????C??????8>?*?/K???<n??{?J???h?C?\???RM???<?RR?f?>???=???QJ?;?_???0?R`pqK??)D???4`Fr?:?nf??K,???Xc???S?\?v???.?
????????i8??4I???z???-=q??:|?j??+??
???R?^7
??8??)t^?X?????Or?*D???I	w?O????aEB??j?z??N??h8??
J??:
??""|U?w?n!'E??Bn????k?H????*?>*&G??~[8???a:18y??
???[B??T?
?S???bt?????ni#lLXn?z??:y7'??Y?^T?????????U??l?4S?v	????~??|
=?yh??iA??Tw??,?0@KK?+u?h??8????????#
z??p]nL???????od|?s'?R?[??


0??D-n?A????A?:u????h;>?0?6;??f???h????J
)??0A&??~a5[?G(?r???N?kS#?1m!????u
?+??P??D??g??k????}Q?q7???*#?]??????
??c????
?r??Q??@??\ga??hhB??N/7[?Wl?P??r-Db?mO
??$"
??V??3?#?
u
ho??%;5!g? ?Z^RBQ?"??,ej?d??6??-?
??????U???f???I1?CD?Q	????????*???A???Yw]?#3?t/ahl
'?????e"/?N2v??`D:J<0?"?A????v???n?Y(w7?M6;1q?r?^?u?A????'U????y?PJ?39?<'??n??????B?" ~?_?
??J?1P??'?~'??y?!?>/??{???}???XD|?
'???N(?	
\????;????F?????9???=&+????[DE$?(-t?=??m???n??Q
???G?#?8?????tM??s?????p

??+)???OK?zqXic?l??i>$??A&???}~?QBC????J$9?r?y???:???N????????????'????u??+7??o???w?s??
??X
,???f?Q??l??6Wej'?????x???73???xi?????Ol=?YH??&u?t?????;!b??+?*?????~]?"?}??5Q?7?h??,pVn???th??}????o?y?=m?c??????????M????????Oh???V???????/?=????H?_?1?kd?"?~?b]?????:?rN?O?}bp?F?o????]????pL??H??
R?q??H
p>?WG?N
??=??????????? 	?Q???
xV\G?`?T??p??????a?
i??3??m?M{?d????7??}???/64t?
eGMj??	???E???~o?JW&??X?pb?????2??H?z
^DF??*:?
sAH??I?d???D?z01???+??EX?b?t????)?,????WV??n????????%???
qN)?i2?ei?f6+X6?R??M???:L,??b????Rt|?(????.&?p?Gh(g????, T@????"H?#!"???_????????????c&??r??(??t	+
????'?~g,8wg??ID?R??O???=???9???p?n????S?<???`?m7???G?!??uW????g89??????r???mGc?e<.>??.<j???v???????0?/???U?V?p???4?a??Y????G;??g~??<????.??WN<?9b??N\ ?x>N??bz?3??9R?>RI%u?v??I?lF??m?z.???????wt??0F???}???
???]'???)?j?J?wB?r?c??Y?N????`?4?,U?T[eQA~??
?uN?+??&f????T??\3???/*???)F;P0v?yb??V???	??*!$?<?]??4??AU8wu?{2*:xd??1?J?TB-???p?$????"p??s??T,Q??@?K?b?c.Sz?
?Ub?T0PQs???A?g???P??p,?F????',??.?Vipf+)~??V&?????5??Mu?T7?h?F?n\?c
??6?aQ?????:?y{q???H{/yl3???OK[??????>R>?|??????D|
???S?>?????C?E?\,??f??z????_?J???[7??????I????dM??d?k????.v?L??????&%u?vM_?v?`i???2\"???l?Vk??:@?i??
(?2T? ??,X|???0DU??H")<?
????.?XO??_???B(d(??;??????l?=??OS???I?S??

???D??|g????[??????<?fj#u?x?????{hdx?o?a???N
??vk^?
??????|????????Cx????????q?,D?}?X
 8>?T?K<E??&???D8?DVv????m?x???e?;?p4w?%??.??7????I??????????td?b???v+????6?u??_??????x?T?h?T???e????s??(?j??"??E:??????W??????W???
?8|??????_o????B??l????hg?????????????
By???Eb??0?'dDP??!?O?X"k????C>Y6hBdO??? ?Gk???????
??X1?"?PTe?a?b?b+"?`?TTX?AQFE"?????p'?	????$??P?BiD
-????T????CV
P@?9r	!QR\?R??@??F(???T?%??a????RN???{u??	(??_v?-Jv?"T?H'u??n7???"??5??(????????:p?=??^?7?U??????Gxm|???{?@t??????X?!?k's,#?2?g?N?y7RD?e??N?R3'?e
_g6???VA%j#Z?(????O7?[???q??1???8:?]???m??6Yu?e7?0AQg;?M?t`;?????O^?h?_H?1zt^oc????qz??;????\??A??R??q??2??&???
?@@?
(??G????l?l??;c??zg[~
@??b?Ub????"I? ???ZBuR??.???G????~?D??5????v?Y,A]s
Yp`7?1?z??)?jOc?8?RE!?5?,?s?0???bhe$d	?|/cI3?w?LRE???`?!?D9?u8?1??

?????=??
*??}`RBD??H?????U[???r:?RLhj?G.?t?S=h?Y???????1???}T?-??g?????>?E)U??VyX?Z?????rOV?????i???????k?}uO???b{p?gVA??? ??}V??S???????t7Z>?'%????Cs?q?~????5?>???{?Z???d??+?????K[j?E-??wX?g'o?????p2?????>#?U?G??!?|.???u$3[??z;9??v=??????1??????B#O?Y6??ji?????t??7m??eN??	????@x`[?y?=w?????	??	U???-x| a`N????VQ???A?C0??_???`?'??2?	5?|?D/D??P??U<?????iO??A??V?a?$$%R??b???b&8?	}?UF?Z;?????Up??1J?PaU?`J?pz?@?@E?O?P%??q??b????,???ek??;H
 ?c???Ni???
xD????????R????o??0J???????r?rWYz??etl?
*?V*q????
(
0~T????)9?I	??~?!
??X?i??[??Q~???[=???????W=?????z8??HL~??????????N???N?^>?????
$?u?3w<?y??S?P?"I?????l????E?Sl??['fh?s?EGl??????T4???>q????Lf	f ?GW??x/
=??.????Ia??YN???G
???I?8E?l?ca:*?????"O??O??UQUb????????{o??????IURu?C??p???=?]<bD?3`&?3???;?V??r?(?==
?zk?DU???
 ?p?{	???Z?M
I$A???(J??
C?_V???Eb
E??V1D
Z?+	Z?UX(?"??"??b(???*???$
tl??|dU??????T5g;??c???">????d.?a?,e??[?B]6????X???@A?? d?g???W??q?????^??v??
`???%?1??????W
?\??H??er??|?'1?6?????*d?????3???P??z?E??OZ??????B????
?"=
k?W?A??C,F0??~<??=?l?t
Z?h?%????t8dB???W?z???.?A!????????
?2?=?E??<?b?m??^?w??W?????O???\V??-&^?????c<<.???]?p??\???????&|?6?,?DS?y`_??PT??2??#~??????6???</?#????M?-oUS?t???????n
??-u??}<?-???t?c???zi	O?zTo?1?((7
07#??6s????q??
???????Y~ 8?hC??!n?????;7?X:???{:?q?~???jd\n1???5??h6??k?D??(????%??????sTyP?d?O;??????:????3??E?nf??CH???$c?M?b?p???S??>?B??Hr?k???;C2{"D?????I?#??b??t-?&Tr??}r?e?(???????
?R???????w??? p??'????"W?6?8??_~???U????????K%??b???=x0?e?b??h??%? S

^?5i{)|+?|?j>??}??O???b??*-P?????????UEX????9????????AADw???V?4@?e?$a??8F???R\?l9????????
?S?????
V?e??g	wM?g|??N??C?}?k?7
????.W.?!???F?z??u???U???0?)'??>Q??@7?*<=?}!Y??0?B?!????KXA?W`??%?Z??XC??????\~<?????X?;?????g?C?????D???J??S!??+??\??u$????KY?_????D?r??fp7????2???v???7?_8?C?P??p?"=.??VL:?????OJ????3?<&q?V})Y040}?????$(?,>f?%	??3?? ????u??N?n?????
?o???A?????J????l
???1C"?9??>???,cq???l
???G??????CV?;???0??
??b??C???u?e?a`U?GD?&7
e1	??????;????????~???H?W?`????kD??6^i3??4?SR\?XZOE??i?????o?z??m??q?/??JB?4???-!??8???????H??@M?A???Q?n5I?(
?qte?"jm????5)?Un"[3|???o?HZU ;PL
???$=?#?&????T_??Xj	i?G,7?G???v???A??@??B????E\?????K-0Q>?????r??|-@?u??>$???bc"?
[??????????~?Q?mKR??"????cU1?Z?-|????Evn???X??cU?z?????C??>???c?-;????m?V??H0?q^R??t?a^9u???F??0??}???`?bp?b6??&?fY-C
,O??[?6xI?}P]?x????7y(???????c?? 
E??S"
???i??+is?EN?nx
??F???a???"??N[j?w?{??.?~.?\+??K!??t?~^??i???? ?-?h????JfZb?u.???_??Y???S>?(????C}O????y1?t?????])?8????
?/R?*??H$$??:?VC	????Ab?j>5?o????????????;?Yt??i?????~6?C??X
?ta??r???U?f?sn???x??c??T????
c??G?4?RcJo]?k"'?
Q???7>?6???A?T???|?	??????r????K??_y??(????Bvm?,=?????O?Z?xb???4?g?f????????P???*??IDRF?????r??nH?T?{b??)`?W&~e???h7?QL=??c%?Gf????BZ???????J????????Y?F??8??v?j~???.???T?]#????[?dl????#+?j?@N??G????+Doiy]?c]
???C? ?c?
???$?=8???\ ? ???IM??W???X?Z/?????
??%?kw92Y?A??Z??i????c1?\????m???I?.??&6?1Q??z?Tl?,????

E?gin????D[J????????V~1Y?O{?i?-?=-??D????j?C?ZExh5$?????????X??zE??*?????????sUh?Pi6k?<^?0???@?V\?g???f????2????l
????s??m/?8f?J0_#p???^??Y?<??_S?\?+??;?????????????s?5?*??f3$D???&X??f??p?:?4?.3Xc?????%??<?3Q?]??x???a'F??V??}?w????{?%#???Z!?]	
?????*???VO?7$<?k??~?H?j?????u???p-R?D?^?XSIk???O?^?1?1t?	?It$??0P/?N?E?&??8?%Q???'r??w?*?????????^?l?????w7?:?^3????yu?P?A?ox???N
G9????>??22???73?PM????I>??m????????T??{2n?m<?m?3??o????W???T?`??
k?m?M??a???|??????"P?.e??q?;??4c?????"?t??m?XRS??o????]3ag???lQG??]R??????"???v)6?hT????wN?}_,`??o?(?r???"????I?Nx6?i????D)C?#??MD^??]???|?(?T?h?1?Z????*AO?w????,?????
,???[[???J?tX??aG??b??.?%G??"???;<??4???????G?e??V2?r?U?j?3?O*~)?2Gg	?K???wV???`?S?/????{???RR?+????:?W?[???]N????y???F2??Y??bD??E????W?}??el6????????????)D?6??@h4?]?Bo?1@?u?,=??? ???|?X?"C???dX?R?:??b?U??
bO?c?@??S???4;k5?p?F??;??????vP????
??_?R????
]?*t?u?o????? Y?'??t?s????g?c??u?!?'??``?.Bd??*d?O?Ek*?K]SI???hr???{?>??X?h???3?"?9:W?1?!}?O?0?F?2??
?"_???????u?\W[???d??/??4?C???e?<???????x?????W????s??Q?/?G<Q??%?<?G???@?fB`?lcp?
?Y
?????a??/>??U???#???????
?P????y???m?~?U?s[???1????#G???&c??L?\OU???????_R9????|\:?}>?\??????Jm?e ??
?/B6)??(o7??????D??^?''?????????@?@P??S?DW??'?????'k???????=?Q?m#?????? ?!??
??R?????]???~?$?H?`???D0??$X?H?U,??`??t??H?P:2
g???H?@?,cE????? ET?
??M?!?Vf?P ?Z
G???%????F?$H2?,$P??R??1J?3???JiT?idd??d
0*D???X?PSQ?b ?2??y?
>4?x2IA?J?
Q??C	?????BtN?b?n?J??Y"k???I$??Hh?!?zt???????:6???????????Q?K????4b{?
D7R`&k?#^](???T?;???1Ll????]H???w??
?:?q???r??{;n???DA???d?
Hk??a??h$?S`????]?	?"??*?Q
e??`aH??K?
???O&???$|??C@[ 
??T-`m`B?????*?N????T?b?`??/????#?v???zPY4????3H7|?a???af%|????p?C=
??????Aa?;????O??2 l"m
C-?0"V	F
?)ha?????P?s
???U?J (
*?"??(d`))E?"??#???W!0"Ie??,??&(??%?
+J!)??0??X(#%?J??d???p3]>?5?	#?	?vha??%($0I??I?Ya?h???"d???P
 q?:+??3??o&?RL?,?I????D?I?=?)&?Q???uo ?
?r
??l?KT??1?'???/
??H?????m??I?sUUUUUUUUU??
"??D?"D!d?;*????*???2um??????h???W???u??L????sq?dhT??
?)?S
?-?m!-????
??ZJx???f,z%?????%??{???sz6H7MN
?*?X*?6???UJ?????UPQEX?*(?ciQ?V(??Ub?TZ?K??K?.???????&????^?v?i???'??????v2?~???g???m`?T??q	???:R???Y??{???????????7>?!d*?v????@1??s??g ??????wM7_O??????o?????~?^#?l????t????{?v?%6H????H???*
{????
v??????&}?????^%vO
?t/h???N?P(??S???7??p?98?f?!?f??.???>???E?`??i?3?g?.@?C?`|9Y0)?	>
??D?1R(??f`T?b????\X?NqE?"AZe?????????3?
o??&2??JL,P?*z.???%b20X?(x??/?????	'X?,??`?????b
??
(HS R?D?}q$??hea???j'??,?gC???uE
H??
%;?	@?B?5R???Po/??q)?? z'??\]????+r????,?
?a???|=?h{[r?{??A??8????b???aG?.=@>????^[?D~?0Z?]?W????Dr???(?rc3?t?T?ut??j?27?vTG	???hHD????.?t?2?T$?m\xQ??2g<k0?J??Sj?73?g?????*zSo{<???68?n??A4???k????2??@???>??/????vv?9????&??5 ?"(A`?dSY1N?$?D?8?~?s??^????0a??:?z$6'4?r???????|???;?.5??gV?u??8g?uc1??g??!?[z???5o??S?z"??>=???fx?Y???&?M??A???????
H?? ?s,??????f?@?@?!?7.?~	/Go????^#???|?d?2?KI???b?lT???8???yC??????RN????tqR3Y? 
!?????R?T= P?p?m),?4|?q?TTC?????|?QP?!Q???"????????5??$ :???D\?????}?n???????2?j???L9}???p{?@k????bb~?????P !?N??["??zx??????x
;????9?? ???*
E?c ?H
DI
d?$?$P?
??R"?H#
@,Y
@DQ ??,?Ad@R, ?"?

,?XAD`, ?T??
?? ???E?!
?A??b??DU`???dFH?
??!$b*?#
	?"?1b?"??H?#
b??1#??"	??b*???? "??1?AAHI ???*?TX ?????dA?1?0D0dA`???
TX?/4???[?5???Ao?f????U?;?@??
`?<????u??Oo#Y?Y??W{????_}???u??[???#??,k??v??t6?o
??J<R???|\M>/??H|????????\,Q????D??)R1W??!6???8{,W?zH ???x?????f?!??cUh(]???.?TB

A??????h:?]?k??y??j?@?,?
`?i???;E???(tD?
[?s?*??#7??-?MG?yIz??m?vt??????^/??"??_?"????)Ji?Y^?Ju??,?{R???V???W?4N??t? ?-2??=oU1D?{^???J??b?1j%?iw?????1L??:r)zR#)?Q???g????^/ui???xYe?(??O??F??r?(?kcM6?{o{??1??F?
?M2???7?\???????U2@F??\7?~/?~>.^??o???1?^???}?9?B??????C?????????v??;??_g??F??W????{??????3U?vs???lsU?Y?*2RBo??????g?B?P??v-d?@?|????#?$Ea5?.r??U
??2??JVgG?2??T?=?????OwG_=>?'?6????f6m???v??e?u??g????4?M" xb?}?:?
?`w`?z)?\4!?[?0?R?????7s_"]???????
+?B????y??{;
??7?*?CD?p
]?j??{r2O??JS??->9?g??
????????[??nM??%N???C???L?SvL?F?,.?FCu `?v3?'_?3?-??Qq?B????????????rrs ?|??\?^#?Yo!4N??`????C??D^q]Rt??? ??8GR?\????Q??V???(c???/??~o'?F??#M????
oe???w???,|LRW???oj6???????C?>?????\b?|=l????P3&$B~M?=?un?d-?5??)o?	?ccM|?@;D0?8??1
mm0+?T=A(8^}??TKn?r??w'U]??^?Z???cO`7?Pi?RT???jjN?#?i=Y??????[?Cm??T@???
?^K]??!g???T?4?A??5QL?
%m???&?$???3??t??E???zgH???? ?0??}??>F???Ux?54???k?Z?]~P@?w-??}}U^?-??????????~?L&K???A<,???i??*c,?	??Mj??C??z&E#??N.?;?UF0`3??x.V3??z?%F?"???????<???G?,??5!W?9?\)?{?-(t???9?Sxs-??????]E[?SaF?0??j)>?ufm??!?1Pk7Y???Z?^]??E)~M ??Zx?o??18p?6?su?
??@?G
????f'?????????O?t"??]A???=N#(?k}8RH??
?(????7xY???]<@y??f*T???3??2????j	?*??????
.?(Ar???l?6?|A??5=$q???zn????:?_wT?@?Uj?`?EZ?$?#E????FfK????????Y??$B?H?4.?M
?@B+*??Z?O?c??z6????ns?????????^`???p?????t????-[?9??????By?	Wa]M??????B????.,?H?I?????m?e??????!?_d?O5p?????9R?????z???????S~?M;4???w??_/^?9??=|?E9Gm??#
?????9??[??????>>?&???
?Lq?r?*7??F|?L?)g?????:(H?0????:I?v??}4H??????????<'???J??????d?????{??Q??FJ?X??p???E?E.??8?;ra???\??nMS????:??$Y|??.!v?u?HWF?5S?O?^N?/??S??3??????c?"???mo??E??`???????^?????m??m??m??2???n????0?c{????;??}??G????b]??????O@?????
)????????S?{%/QS??]?E?%]??{?^?{??}?"^)??o???Mk?U??~m]#???)V?????v-??nD?d_m-?0???}&1?g?|mg)?;??Y????????7???5Lk
??F?_?z??Q???S??Vl????6U???????F}
?3G?/\??CLj???_J???+S????F???G????uv?????=m??
"??^?t?(???2?????@?~]z?h??????O(t??ys????ho??in????O?cNk
U?<???f|vk??k6?5`?
?<?n?!%i?1?#??~5J??????cS{?????w?_?y?vQEQEQEQEQEQE??oc???????#'????+K?7i?p??[0na>?????yy
?v?e?F	 ????;??O?e?#H)/??1??V1??@???3?i}F?k9??oR?,?D????????~??c???pe??[m7?R?d?l<b??r???[?6"Z?T98$eY????
??7x?2E&??	?C?m[????)?]R?W>?@?Wl?IN?}??#?AU?????(??)%??W???z?i?Y????r??n????L?9?vLe????VS??&`?3G]V???CDX???f????.e3???_?R`:?D????????V?~B???~?W??1????Jz?w?????{Qv	?^?y???m?-????????58!fF????????!_%???HQ?q????j?f?DT??????a[??N?3?n??x??c?	??be? ????c7???IG3<?g?oNt#?`?w??	;t?,Hg??+????v??+??\}??u?{F0??&iPc=????????C????~?VB??||??tf?s}|K?{??:e?X??%???LD??	???4TTs3o???^3Nq??|6m??mg@???????w5??	??t?l?i?'?qh??v?r]???D9?9????z>B?E1???L?J+h|g^q?????~*??{??;y7??<??????????+R?-??????[Kim-?????m-???/?5?={>??n??=]?<EE?\????TY???Q??I???c?=?]?????!?s?C??F!??Y?`??@{??{rK???yN???e???8??dp?O?!
 zU?j?Vj??????^???V?6?????????G?xO??z[?P?????9?S'??????v~???I?e????G??9
??????t?
}??)*?E?
?????q??%???3$??"?}??"???????[?p????d??'??O?5pm-????-??}?9f?s9?7vU?`??V????=c????{?suH?t????Y?]??o???^ff?&???yE??Jo|q`?????7D8?$??A???q?e??%'5??y#?{IgP?et%??L^}?ry?rr\%?m??{?P????
???[?|<?%wFqT-?9?l???-$?m<?????-,???I?
lR"FK?y???/?f???????T??t&????b\??#nS,Y&8??
???(?)T?Z?'??S????z?NK+d*???F?n?^?2??????$_?_!$Pj)??.???9???=??s?L???????b??MZ>?M???)?tS??)?^??MD?? ??H}??-)L??L?AU???zu?y??????e???Y????O???????k???l?J?'
K?74?+???0?U??|????	?????7D??{?z
???P?????"q???d#d^S??s???iJ1Q+???y?W??!m?????q????	#??	?????
Z+<???M?s???J??	??U?8??8s?7???Pu$]^
?G1??E$ii???vm?Ym?|?)a??I??????9-???C?	??W?rs? ?~D?^??Wu}ZF??"??jRy?o???-?x?????/;??dfV	e?{???C?<?w?'?????K?<q ?T??g?'?_?????s????LS????O&??#f?W?"??C?7I>v%???
?{	??????c??
M??W>??S&?Q:???$O???2?g?iP?e?E??????aU??????U????A?iWe?Mu???Y????U?6??Zo??D?S<??}^??\?&s>?u
?ed?G|??????N??
?q?T??.?"T?2H???
??
W??>??J??????7?????3o??*E???H???ap????`?/???~???Q	?5??~A??
<?????'
??{2?-s??v?5????a?F~gd_"??e@
???{?\?;??,?$?2??_?3>5*N??u????`???T?*?'?Ff%k??a???"???.?;?k????}?,K??Vap?a?eo)?>???P?!????E?(??K/tb?&???y4?*D?H??b??U????K??w??
u
?B?'?t?#}?)?n?|
\wk+?A????b5jkF?D?V???G?9???6K?@(?????_?L???T?72D?
?o|?J???el???0 )f?a2?^??kn2%o?[}4?????'?g?7~????2~??AR??h??hh???S>??=
?|L??f?Ky???4???3K&??n??Q???w??y)?KUa??????n??!?m,????f??Jo?f??\A?o??%???i?t8???_???@7?????{)????????[????d??s??{??3xH?1Q[??`?	?`7??:?P???<?.:v?????4?C?,tu?*	?Bl???;'e~?/F?X??=?QPf(9?4????d?????)??<?vl?D??T??q&i{???w;J{?Q?~?H?<???F_J]T?s?a?.???=?/u??p?
?V????K#^f[%$???q%?W?s
	?<??`?I?3L???|???w????GA?<h?'[??N+>?SC?R??y?3???c0E?
b$$?]&?k?W????b?W?p?1N???9?(0?z?>???&nr;???+?iw?p!?K?~)???T???!R?Q?Q???C?n?????????:r\????K=%??????97?uF??]??(????w{{?$;+??&@w?_???????r???]?a?#??????Da?%?SqEY????.x?R)D???xL?^??Bj)s?E3??[#???T?J?
?????~?x?E?W6???1?????5-????
{m+!{J0{o????
????38tKf???G???w;,?T????I?f??T?5??h?]!+????iQ?|????X"n_=_s??]'s?????x?????G????????r{d?e??
??????=??????^^g|.=k?|??hN<????8rRE,]???	??wE-?f\2???tR??H??E?s?M???I)|??g=5??X????gf??+f????
?C???w??\?hl?'<?w???.?o?\????(Lsd+???y???????E2;wlh???????????t???n?B??????u?w`???i??<?L??x<x???G]?#k]??\??~??8'iP?????_~"d
?$6>??'??D%?????<0"???????Wf?G]/?e?????
????,?2??%?J?^lq`Y??????t???nj?E?eO?2Y?Fj?;'n?
???????????g,??'?V????!????~e=?
a???!0?0?um
{??~?a?????4??Q?luM
???k???K??*??)_?_~?M?Pr??a??,@???G??=?)?W1p?(C??c^?????g??@C?
??????\?s???	???P?&9#?P?q????
|?????mk?y??WR#i?d??E?"????$,e???]???t\??B???LD???|X?????ui??WK??r?s?0?'`"?uk?,?/Y?????????`	??????8????9??????#? ?d???L9?(??-Cr??F???????????S?!??????Asaj?'?&???=n?u?>
|??6???^q??3k??<v<????][;z??
397????tr???m}???dt?b??#qC?8?5.#?"$?p?v?#w?8???p????iH???CV?[^?mW????'???-??1????dI?7u??
?e??p{2?c?q?ZnBo?b?I??S?
e?<H??k???	.?????!?l?~?q?#?T????2z?W?s?9??{{=??i\???Z:????%c???b?????8? ?VT?O?I?2???v??
?,???$G\???????z?>??????????eO?)??
??`sUS?#?
?????d?R^?[_????=??????????7?L???j??e?f??x
w??B???K?????1????]??????&;i^???e???p?`yO?C?X(??|"H?:a??? b?`?gT??;+uL?h?C0?87???k???X?2t?e~??5????|
?s??????^?7
9?????lY??????% ~???{???q|k?X??#1?!?7*???N?T??{[4?Kh?s?'C??
l)?ceu-?y?/??P?8?@tga?????	?e?#.HL2n??
Qf?o?[?.??9t???a?y???i??F?,0???H?*E:t_?ThY??i??????s??J?/?D????\R`0?
????,?%???u?~?u_?????hCsgW??????E?w??}??????B????j?
?,x?|r;q?_?'S.?_d???4F?
?H}J?tZY????
X?#?H?w?:8:?'??????mX?9?q??w????Y?@???8U5t??????)W"?lJ????I^?	?R?p??8???Xh??Bm??|???????????a???K??????K??L????????-??)E(?^C/??/'?d?'?S~???t??K???~?;vGL?	Ox???ON??%L?B?e"???Y???,#??Ev????????"
Z???<?"hZ????Qa|+?s&?\?nk??C?,?8c]??}Q`cR??g?1

J???Fa????Z??????Y??????t+M?!C????O,???*???`?????5???2????::?????~g,???g??>W???`?gg?j????R??J?????c??J?U?<P?A????a?;??oQ???]?n?hW/<Lq?R,??H???M:ud?<?????t?e?J????,8)?ZM??B=?XL@?i?_?i??QX?G?????D????????S?5+:'?%??yU??SO
??KU??(????5b9???m?c???c?_???T????k?k??h5?U??G?:??_vcw?????[O8~???^9?tz??; ikM??S??k_>??????w??/?J??rh'???w???????\??{?LK`???
??4?F?$??}?
S??
???	??#2}*??UD?0?s?????<?/|
?Q????T???9?-???r?<Y{{??a?V*c?|%?????E??g?????6???q?&??o??L?O??,????????'lh?C)m?!y??!?HH??%%]	=????0K1H??9(r???m zAD????`3~????D??x???0??r?`,?{?7??3?????????H-4{??S^?n3E?&o?[]?TV8??dE??D*"?k#?V
%?f??}?8?????\,:??"?O??S??J?q{oJ~???????!?R??#????x?
?=??Uh??v?]c?r+[w?R??\??????&kR=J.C??????w?????d???
?&%?????N!??;=?%?
??+?6?S??j?Vc_h???c?????'???
?&?)????2?T??UZuq?d??pgL?9?o;sz????8?8zQ:4?-?)?1 ????fW7?r??HP?4U??q??N????I?/?(f?%y?.?:?;u??
:??;?\??9?Fv??????????OT???:?5?:?ue????X?-D(?\hoI`_l????>?y54?
?
?
8??+??????
?3F?jq*??)n6V?D????&Z_B??G,3S%?????fG?O}??a??`C?f?R?{j?_??06???;?^A??????L???U?1???NO?<<?41?8?Leo????SG???Nnc?F?????
.??V|-???F?=W0F}????`??sI?HRL?2R\?]?1??z?C??
Ydut???_??
W????????z??\Q?-X??z???L????B??o)???N?n?KkNlN???
?7y>b)?>9u???u???s??-??????hH????????N????,j_B?<?
?iz??kX??z4
_.??W?/???w
=???N??H3 ??8??G?`??B???A?O[+*[????lC??????B7??b?=?of?`]e??W?P?3G?"???M?*?????5???q?I???	 
?	$t?%'??X???(??k???X??d??	a?_I???????
ie2-?K????6e6u?V
l????YUH??e9?t????x2%v(???m??????????/L?Mg3i?		t??E/? 
?N?P???\???'ng?Q???!V?#"$ ????@??n6U???n?<????{???D?????i?M??
f.?????;?????r???,#?Z??????v????????Z
G????`?V?????Y???z???9???????O"A???1?Ci??????y$?o???`??W???/?d'?$??1????2?"?Xo???<|k?{???9?5>-?Sa???8??r0?W2????c??h??-?<B??'?????*?hd??~N?9??\???y7?Y.?????P?q????R?i_N!?1??}_???A??3???PR~?????2(=????p?Y?e??B?t?u?mq=?R?k??????mpW(8<2B??{mA?TU?1??.???????x[??nF?/??}?+?z??P????A??`1??C/7L?CH2?Ic!?P?*?ue? [??X\?CWHJP?c?rxv??J?>???k?~Z??L?dW>?Hz?!???A??,???????g????Y	M"!9L ?!/ ^]*?+?g??_?3UUgB???an??t?T?????S??)?????U?*?:?N??????:t$??J?????J?q
????c??N??s????4,?J??#?#p??z?? ?D?$???u?????&:?C;0A"y?????2
V??????\????N?.?>W??_5?kR?b?L-
GZ????0?UO??/?K???jby?S?H???X|??zX?GC???shGA?V????Td$%???r&0?*?? ?*?????6oj?`Ud$0z??@?[?o???????x?G?u
???????}5.????d$!?~?)?2
???*???C??`??,T??"???+	Tk(????O??I????b?-????:V*?????Uh?U]?u-W%?~O?t^#3?J?`??9?Y?k?K`???)`???UUV ?????uU?
??qj??m?8-hR????.]????}??O`tz*?5???=iJ?J??Qo[???e??[4?????)
Z???%%??@fR???!?Vq7?l?P?p??pP?*??&*?|?."\?BA?6lB?????%?L?@@??
-oQ??2u??N??}3??u???
?????|??5b?+?G?????W??:?^e+&wYfyu?n?CV???????p????~?c??"".`??8%?????)?gi?d ??|??5????g?b8??Pm??<?-??E????s??+'???J???y???L??.-?????l
?????2L?????<??????;$DJU?*";?+5??{??=??????????_?z????r+???c
?HH???'??2	?	????1????????hu?.@??????5o?????>?[ERuh??C#???????EUL?-x??L???z??ZT??w]@??r?5?h2?????f?	,t??Rc??P??2???F?????"*???a???Z??t?H??S?J+?C?????(q?@_?8??M?I???Hb???UQ]?c?I??`??!?????????
?Fcg????U
X*\?%???}?M???gD?I?(3??
? ?()L??Q????cN$\d?"?E*P??9?2???8B

?????C"f??????x???\?ZKP??"?"
?????T/?=?'l"??Wx1???e?????:????oN?v?(?t?I%{?hO?#??9iT?V?????MF?	????r~0?
?X??	?y?q??u??}7N!?? ???????l?????y ???yMYa????u????v?\????a?h`???????:?R???f??????1v?_`?3?I??,j4par????I?|???????=???)j?,????^?*?MH????R
?X2????
?
? j??Ri?3?}K?WH'???8?#?,F??F?C?2#?>?EW????1???4?#???*8z?#]??
??U???H*?b?GP?(!?HF?4??-?M??B??c!?k??Z5{??????$>x???1?^Y=??j6?v#????J?G?("G??^H??C
0k?{?5G???yX?Y?????W?*a"??]?/E???2	#"@????????????{_???}???7????)??????^?W.???+N??E?u?????p???
? ??:??<?gO???
?y??w??T?%*h????
?y)t/p?2????Pn??zs|??HcP??q?|	1?&?3??!??
5???@)?4???tl}??Au??dB???A??[?xS?.?'?+>?:M???F*s???F?/0?Y?sSe???=,??Y???C
G??uQ?D`?qL???XP????
?w?`??@F
??"? ????{?!??????y??????
@?<?B?B???&?????????hg??Wg?ai?=???Ua????????V??r??mw?????w?L/??4O??
? ????????'???@??o?8?b2t)?,?????????????X0>??k?@@?#?B?w?p?0/cP?K[???u?????o~?????
]wN:??C&???"]?,n??qaZ>???[b`?`h???????q?o?RL?v?Fv????^P^/???T^bEUd??????1????,F? G??u??J?:p41@?S
??Dv?e??y?.I??%???[??.a("[&s??~yk?zy??????_?z???|??7???A?n???q??N????^dw??R???_????P??|UP`???1?!?C2?????CN^r??????`??Tt|??5	???F7)????????D}0J?Q?n?S???????%(r??[?p???Eb?q??v?q??_?Y?o?S?)
?_o>?9G???.x??b??1?H"
?e#??t??T??Ce?u\M;{??s?'m??W???Q???J??}??N/G+S)DL??0?$p?j?????n_D$?f??????3tA]}???x	??H????????H??J??%??>RQ??Tk???????c??(^f????
H???"????_??r???f????y??C??3~?.4??c(????\.????5???;???Z?#????)?????/?P?,???!?e????n???W??Dp;????h?@P???8????{???????`?u??M<??.?XKQq%?|?Co???^?,???t?:1???S7Sw??j?????T?1
??@.??@???? ?(z???T??{h\O????L?@?a$?2H?
?d?j?????d??&*?????r?01O?	FD????????k=??V?k??$??;??
??N[2????d5\?_????oB?k???`????<[L?!??,??)??"}?K?>I??v????38I/O?????>??:?s????9???S?v????T?????????R??????t=??=?,?C????N???*l??8ot\??)aE?rO$??)ad?Bi%??K???d!??Q?k??U?~ ???3? ?T??RqI??????UD??*'z_?C??;??5?N?x?>?'c?QUNY?cEU???x?????????7?^???d???????NP??2=??A+U?J?u????9????{?8|=???a?V??cV?&????-??^?????#*??????8???#_=]??:?W????x9???o??S?s??X???!?????H???&?`
N??=?M?pE?z??~G??nd????x??CO?0??8?=
?
U??j?rD?}?$?za?I???i?b???hI?J?????k`???>
U???6c%?]
??Qs?z?J??J?\L?t????s?K\1?N??*??M????"<??))h?7\x?9??k
?q?h?]S?X kE???/????8???6?I2I!S?bI??tn?^>?[??P???????2k??1?VUxRQ??s?sDI???"Hi
C????#?-t?'q???"?T????c8T.'a?Z??l??3?g????????????U?RG????*8??m???
???}?????A???????3????>?.?A?R
H?Q0=i???1??S0?&???;????????6/?{???2tq??&0?p`?d???{
?*?"?a?????????
Ba???}G??l?BE5?"o????i??4?Dd1?s!
??F?????,]?L????iHu=????O?Dp?iv??'<9|$?i8?Z?E?%C?{OS?j?]&?mq??????i??	@BF?b?@?f>dy?P}@sb???h*?{p??????U<
??4csFv????A?]?m|O??O at a?J?j*?&?]?l7.???F?u??N?eb?/9?f??r)S???n	?Rb0?)?v?I?H????%????M?H?4t????0?????
5????\?=??K/\P????b??!ceH?h?1?U;??5?1??a4????q
?=?t?Z?Iu???-a????????>????o??&?u?'/??w
??q??z??6?9?r
[...1653 lines suppressed...]
??l???Y)
q{??\N????????m?I???)V?I?H????z
?>?__?????4?V?$-?F?@????w??@??@r+??X?e?V??????!Xg??E??@C??k
w?0$C$??????i?Sz[n?IT?!QV?-+j!uH't at GN?:?~??IKH%??5T????????Y&???*??r;*?????trH~~9^X??
f??>????????R???o???sz?z"D??\?ly????SL???!#?	???
??M????ws?????[??[????;?3??M?????E].2v
???~???4???"? 6?t???Zb
????)!?k%????C?U????jT?=a?s?????v???"???nFa??????H!Y?h?X??f?;j?AY?G??b??;???v-????????\?`????G??>"9-?#??D???*??-?<&?H?1aI?,/?????j&??!$??????????kyJ%?@?$?ciI??BIV0?1??`??(????"??
"LB??d?&cE&E&_?
r?r???W????dg;yf?_?4n?q)????=????u?????k??<?????K??$?"????O???$??oK??%??????u????????~?}*>?=T???n?
???$?&???@x??tQ7?z}_???????}??
c&(,?l?e?E?k?<$??????KJ???????2?????=?70QILU?'
?!5???i????)??????PPR	??M_Kf?l?l?n?f?
8?B@??(U??I???????aX???(?0?Ez??s?<??N?N?-%{??
-?v9????C??7
U4B 
m?8???n?B???,D???/??Q}?O?}r??~s????g?????X????????k????l????*?Vm??-?3??U????F?dR{?$?????b??=f	?"?X??????I??>??????@T?V??GG?-??g?????o?4????7?%?-*u??cIU"%%?n?M??bD`?????p??E6?*0?&`}???l#???~\??"=ga?`|6E???%?A
HA??Z(??0???a?B??g?%?
8 $ ??Dqw$?Uf?zic?w@?\?5(??r?????57]?	?.Q???)??M??
???1u?{'6???q??c????.&G?N??u
?![S??
????/&??LJ?e?? ???u?\?gS??Y<??#?2?u??7?}??o1????h??,?N?I????)???"l?o?m?K???????Z?M??????V?t????I?$?Z?L?,VF?W:?s??--?N?%mk52??Y?]?W??<y/.L7`Q??7??
#`aTw?
E??G`?P???-?AC??W?lDn?????6??	g??$??C????Po
H?P*"?B???????f?X?m/e??????z0??G??s?LE??????????p:?e????dN?????p??1OO6,????PL+?K????@?;Xuh???J?????l?k?I??xj???Pe??
t??R?l/.
??a??`7E`jf0R????$?{??\
?4:r
??????????`??K?>?>???????D??C
F????????????g&??c7}?????G????}w?l??_??????)??J?Z*oR<?<?A?nl????-6???Qj??D???E[E?G???=?~l?E??`?as?S'??%L?~??Kk???f??O?D?L?J?????T??d???????EJf????
??????{L???ZM?~??????b??????T???Ph?{$9???B%?Mv
??($XY
??BY?;g,
?m?%??P8?4?????xo?m??(Q-s:6?`?X?
v????Jk?R?,???|4
h(?
V???"4m?>?6M???K	E?????{?????E???m????
?d?'?i??????]??u????????}S-??t?-*B???[nZ?c??m?25aM??J?J?(h)????&K?]?tul~????Q????	)T?:6n?%B?
TD?
d1???X?y???'?1???2t????5!p??b??Q???'??????
P 
{j,!?P?N?7WK.??l^#?A??}?5='4??S??z?k??2ld?N???zk?	E\.)?f?R???IQj???????"l?a??????'??A
t6?
?????4zN???lX????r+U?H~?4K??j!K?d??I	f????}M????-?-?,V???	???<?1|R<?
???"@??U?d"??a???{?)?,??_6
2?D)??4?Jgyd?;C?????o???2T[2?P^????
&='xi????n??	??Q2????d??3?x#??JF??A?,0JFRX????2i?I!?Kp?b???????x=h?<???x	
?s?.????Y?{n??o?Ct?i?a?????"*:Kl=?Rz??"?je???%dr?aM:?C$?)57?
?%?*h?U?P?,e????_??{????'|Q??Hy??`R1?????i?(h?N??????GC,??DL`???:?_f?????-COI?q?e??m?
?]ua???????"?
?B2??u???????		=X?s
??(f??????? ?C?70????v"??a??Le%b?@??KAbn?d?Ox~??h0?R?)????
???(?0?S?9l????o!}??
*R?+??5,cNl??????e????&?HY??3???M?%21$?`'=?1	? ??#?o
?SE?]X4??6H?ad#???$?!?J??H????FL5??+?&?IU?A????]A0??e??q3??D-?Z?E}???????s????????c]??????>?O?5??!??{???v[???D?tO?j?&0??ZZI+gY???l????6Cx???Y	>Dp????IT??6???k<G???C???
????(??
?K!d???j??2???c???H?;?<?=????JI??(>^????????N?*7d??n?h+
%?0??CE??e?`xGM??
e?,?\???n|?/mhQ?x??'@"???l??????c??~ZKO??~(??0????p?Tbcc>???u>??r'?
D?|?????\_v'???7??Y?????R*?????~??Q????????j???P?31^?o?:^??? 85??M(???h???[bc????B????*?K,????"A???
o???2?Z??????Y?;??Y;,?-?????R????De??r
???~s??x??$??AM[??^;??/?1?!OS?Uep2C?X?1?Q?????.F\?c)?????$L?V??	B????w?D??h<a?:Z??q?h?LQ)	??7t6?:?
?!?o?? ????P`1?K?3?;R8?s?w???
?IRRW??*?tt??7?????L?. ??(R??.b??w???@??PF?j
H:?7BtBhL????c
?9?	???wgPZ'H???'?lz???7?~???a????hh($?1?????????b0b?}??"?x?'?cy??S???;S?@?RyU,,?uq?C
???%{~cN??h?'?TJ?>I?-???N??ZN\?????????I?C??G??(?!|=???%@?4?B$O???3?D?SR???&???o???oS?M??m?3?
??9rV?@n??U???	?,??????%????(t@?N??	-*???>????????nC1R???u'??)???L??^H???A????^X????D*???h???N???k5????P\???$?+?w?D???e???k???0C/??E?8h???7Aj?q	?c
$I??a?dK??F????:??i??av??r%p?????f?7?UI]?~L?)P????{}?+1?2????#??M;xpk?a/?u@q	????????%Rh??>~zb??s4-,?{db?A???$!6???????\8i????h?K?,O?????
X?+?646??4?1.u{??|?P4A???B?)M?6??5???"$?
???T6v????`?D????~?&9L????8#K:;??{4
?(5????y?"????T!?w?]p???4??T???\?????e$M8`??(H?"??B?&?\??X<?????#?2?RB
?6???
?JhZ????YK?t???p??/&a-?A?0????I$?v1H????@(Pa+i?&??0??$?+	IR??N??$???'F?G?Ma??D?*??/???c?]?KQ	???qKQ?f????u?6??at^??H??>?AV???1???U???>_?]???f???*????vC}?h??3????d!h??CI?9?+?????)A?"&?AWT0???????v???????7lG?????9
??I?"?<?x5?

h%bI??????=`???	L.C<n????#?(T?K???	??SBHA A0@???/"????4[IL?m?F?
??f????vtGE;?o?m?`.3#A??NH??l?{dp???;h0???d?D??
?]?4EKK$????(kb??f???4??h"WdsK??C??????]???!?#}??F
??^^????^???d???f?
`OI?)??N???U??,apP@?????X?'?&d?ER??????)???????x?%????IV?8??u?g?? ?????k|	?
?r??5C????#~?x<t?(?{?8???=?M-?	????~????x?O(??9??B?Q1?^?eM
?9??!?C?i?*X????I?im*\?
iDA?wk??	?????Tt????m_?T&?+"J?xS???`??X`#??*??p?g	"?PL?Y-??T^x??~?qHa????J??R5?Z??/K??Ix?_>???Jn???@3y??@??:?c}??gTm?L?f????.Mn???#m%?$[F_:???4?A??` lP?c
&?%g?"?(??J??????8ZG#<-?-??s?!??????????0??8?????U?????\???(?T?9\@C???rGH?-?p?d:?snu?V????d?:?DB2?u???l
b??i??}o????`3?{?&???VS1????^??a=???,
`n\Z#SU???=9?R?=/~???;?#??e???)???A?r8s???3^?EuqNs???*?4????6?K%???=????.E?P$8D????????N(?|
?2?$f??V???PmH??F?gZ!Er
?mS?{X?9g+v?l???6???rY???????-b`?{??
??G????QUAb??\B<J
8?????I???
??HKF?fE???&??]y??eL%?$i?
jR????????4S
?e8l??~^???{???U at 0???(?(?????d??`?,^mL>-TO.?x??+	??p,
?HI)?ct???e+YN???da???a?$???.X??FJ???#[*W$;6b???1???w??i]FU?3?[??????gK????|f?<N???t?;|:%z?^??x?????+?
?Q?6v4?o???,?:R?X?G+,?h??0?e?4f??'U???(TZG]?N??0
?u??+(?b;?pa???D??4????B?CJA????%?B???+ISj???i??:f?<?????K<?V"]t?4??FY?????1??HNJ???P?c?I"?xDc?????5??Gg1???xpO'?	?5??Frg(B??pc????8L???5??p???xv?d?5???t3?<v?????3!
?b??KX?4aTD
r???????S?"C?RC]R
????1??G??s?A????f?8?Ic*$??dHU???gy?1o?r?"54??5?Jr?8?-	?lX?????f?p?[??>,?Kv??@?????? x?12Pb?(?h???`Z`?
???1?
AK?_p;?x_^?!b??1??(<	?h*??	?;
5Qb???b\? ??E??He5???V?????J?f?+m????????Z?!&???
??I/,Q????Ui????o`ov??6{??Rk,???M?U$??U%???z6X??;7????J+Y2?L?(U?H
IdD???aO???]??0??\?R}????????~s??#4	_J	?b*~L"H}&?0??????]??l??A??G ??d4????????)??Z$
"XkC?	6?F??K3????jo8I!("??Q%s??E?\?4$Y?"????????"??????N??_1?ldY	??;k:?p???$??H??oR?\????{Y??S?jp?Q????8`???>???????D=?gd??kT????`x+^?D>?*(P
{?l??,
?mm?????h??H??t??nk???<M"?,?#/@?x(?R?Y?Q???tl}L???#mu5?PT?$UY	])?d at 8?
j?>6?I?0?$?I?t/???%E
1???T/??o?8?Q??d?}?(B?B???????????JF??yX8??b!t???Cp;t?g???:????B:?7?????3/??k????6k????5%?????g??????0?
???i??1?-
????>?i^??9?x\?F?
??R0?$l?!v?5?5?????a??.??>???????^??
??lDJ1naH`y??~?l?1??LBD?%A??B?.?r?1?3?%&*h%?(??w????M
#????b??p??N^5?W
[Z??Z???Vc&?%??]*?{!
???;?L????C?S=?
L?V?????T9?????{:A??V??e??(5Y??cF?>^??l?S7?BJZ#?q??????Y{kh??2NE?F??Cx,?????j?)
??%MP[
???W!?a?A?X?X?0???U)??'W1?"??wI?h??R?H??????Q???y$Q???4????AU?i?7???I????h?T??w~W???d????{a?9?i,?????E?wQfH????"? H?????6d&<????F|???[=~?m?<?z?'1?Akd/????RL??:0P?????F
P*1?C??
?tS????
j??v=?V
k	?"C??1?@? 1
??@??j?m?q0~???a?A?????W
?Z??	;?$t???;-?C???R??Mh?^??=?????k?g?~?<:?????
?U?d?2?b=k???T?au???.~)?]h|??V?@??G?c?-%?-$?v??c?t?n??????h??????%-????????D?$:?(??????1?;sO<+M?i?vVB??
?Ve??c?Q?w?F?_?L?????jC?M^????m??I?E??xV?x?<?[(^
C?6???d??1:q?V?0m??U&???a?T???H?i<?.?I?d,??B$ ??+"?F	?I?]o????gb?B????1?S?O?k{????a"!????D?%!??mMV??????k??$=??#?d??:cA??,?)6,??z?n"5??Q??o0??0?,?C2Vg??U?O?N#j? ??????b?$1?????????I,?,?3??i???pT*R? ????!?D5;L?z??z??C?B?2u???E?Z?)?`<???
???g???|?$O|?R?HJ?%??????X?ZiZ$J???D
?~?
?'??'H???{?&??
???M(?hX???????R-R?V?B?*C?
(???i?b-w?5?d?Sa?????q?w9???????????PJ????YC0??5?(??m4??b4?????r_/3??\Mo???????l??n?A/
?$?!~?'?P??d	??e???-????Z??????+R-i?ke)X??4DM5??$??!$?D????Co??>???_;H?f??Z5?U,???????? ????
?#??!???U?8??!?'?6MrvG?????:f?"
<[B?A????????d???1?W???0?|?x???????,=?7?"*?)?(j??H?Q< ?z.41U???]?Tr<?|?4>????t??+??????Q?:??9??Uio4??5t?n?%?
0?3??6??%?RCh
M??4?????oM??3?$PL???Mh.??????"<?;????	!?#?JU(?qPg=d at r???a?\??G1?=,?Ia	?????\?4?:?!???_H??D????_?[????)L6R??lvA??F?J+?`t??J?<???`?C????iJC?2?4?*6?v;@m4???QY?,?`?x?vEa???m????8}?tV"???q?Z??@eqZ	????
8X at b?44G?1*X??\7???:u~??????;?K;??#??E!?i`?%???-?W??O??,??o?I?S5??{L
Z??>?Z?na?~Xx#?zeW?e-????;`?j???#Q????JG??????#??)$???????)hX???H?3???B????B????lY?6??Ur?i?4r?????HB?$???????-O??l???E+?a?N?i?*0~?k??=??
z??G???@??}?@???B??????E<??h
"|?	?(?l???&a1?5R??@?f
4?$????m?%????JRt???+???tC?;???P?"????	?;??
???(???7%-?????f:?????E????.*g3.?u???P
5o? ?Kk?????Wy???Y???[??
?L4*I#Ddq???????D?Jy????h?I??=?R5-???n?y???,?3|lL?N?@??R??/??T?)?K?x.????<???4?yT-??8C?a+MU h}??~???ps8
?D"R'?,?s???Y1k"??2M?
Rm???i?!??%0[???T?Y
?D

9y??cLliBc!?9?	A,,??<m1'm$a??%???I???N?X|???d?E*E"?X???mT??"???Giv?"8?h;9????s8???yZr?gK???"?QF?$$????2?;?:??a+J?0??? 6?BVMCQ???\Zs????S?Gb????M?8????????z?"??x????????n?WXn????L?H?d6X*???????i?R??1'T?B=??,??V%*R???N?g9i$0??R?,+??]?A??L<??w???????BvG?D4?n???N?N?FB?	>?????DZ?r?3??'3?E??u??k?*??????
m?+?I7?VZ?Hm1?~?K??w???vZ?#B)??1@??Y???[76?b???c???HE	?ab?sQ??{1V$9
?L5?
Zy
??&??M?
??3????:??I!?u????e????l?m;?M????)?S
?w??Y0&?v?l??% ???s????5EQ??H??eE?h	
:gg??&??5?o?7??q4l?N????2H]Q?~????"?"?8"???PM	?/B
???l"<?B?x??_???|?2.?s??t?P???n??D????WG?U?O??G??`$?^????????K>],1AUE$#????4?pd8???|}K?P?"?????&c~?o?!2p?@t&`????>????Y
Kh?)@??J?^???|??$?!Pk2??g?&?O??0C]???(?{?
=?=?/PA???}Q?4?????<0
?T?`h?	???Q??Eg??n4L?? ?|?O4?????,00I?3$n&H
9?	?B?r?r??????'?%aI0?GtBJh5?4????=[??,?h????i?[Y??I????R???@??J??L?A???Ph?
*h?i'?14"?0*?e?B-?0?2&??L
 ??3,?Y?'???zs'=y????fCR?`?B?`Q?U
}6I?3????	Wa?.)?Hx?????
????4?TP?
8B???aR???r?AC?*?T????6??9?YA)??Q??dA??s?>????6jn
$?E?,???[T?,?E???%?QM??
????y????]????????^1aw{"?(D???P?IBU'?'???|A?}?j?Ol]@? ?(F$?J
`???-?????????@??????t??$}???%???8Tl@?7+????}q}??S?JN????9Ro????~?>???GO?>??i?glb?d??)lB?X?
?Z?Kh??!)??Zy??;uUU?Q4?a /???w???m??c1v???e?X?0m?6?~??s?m??i??[????????????P?I??????
S
"<???0M@???,?:??$?%??y?????(???????Hq??d1M???@l>w?? ??d?m>c
YA????5H?F???o?\??V?>t???a'??IDa?!2ZX?????1CG????L??6???e????6,??)
X<W?????
f?
I"?????????:$?? ??	bJ?6V3??QQl?f????mYb?hn?????[Z1Dj
???2????89??($GR?CB-66?*?m?t?????P>?????$??n?#???ViJ??6Sr?X??"??O?
?????
P???G?y??Z?%6?RH????(ZT??|?>zr?<??sOmTVSI????SV??X?ZZ??j???KQU????H0bD??`PX?`?Z?????"???i
?
?G'???F?M?<???n??????}?q?CA?2S?J@?$?rz??x?e???A?c?>?'?=
?!??????#8?????$V?<!2
?y?????
SO???xp???????{?6>??nk??6???g[q??Q??/?c??tO6????u?????X?B??$?I3:????;?qtk:!EZ9?2Q??o?0???(???V?%$T?@??Q.?d0?``#?0??<???????k????\

S]?S~/x?#mgT
??A #?e?[X???`x?J?????Gp??????(?	????????}?M"?E)??r=??Q??
?I?*?lO$~Y??yy?????
f0!o???3??t?>?[s??8E??<n????1#??*[V???}v??c?????hsF?!??i????-[c??l8?:F?????7l???l?????kf??Z?C#,?????,?-??i?
?f?????,
???M??"2???F62#j"??????e*?
????50S???$Go??N?PK
??I?#?bj??????9^?)??r??l?3???|C????)??lk?h???e??~?3?sSm?M??4?????X???d???e]?4(V/?W?????0?@0?#??#?T>(??q?Y?5_o??<?>?I_????MU?"??H?????{?@?G?{?	??UUB?=????????2=k??"'?Jb2H????g??7E??\?J?{+=???<i???)S?????X???{????X?y?9KV?????????k
X5?Y????1q?!B??k%????~e
?|?Q???TaF??
'?iU?Y3??x?X\gq???i.?0?zSN??y??n???jx????U?D???9 at n ????-??)???T
j <??#?G?4.??-??>??<?A???[??YDY#d?vA??J?0:Djr??0?!?9?$??????t?]$????\#.X5J#??d^
??c@$??.5v;?P18
R?mlPR^???9??C?-??X*Q???D??(?(?"?"?TQ$Qq?????o??V~&s?{?$?w????h!??	sy??#??t?#U8???????L\=M???????O????V?f?q??X0`??b?,?YUW??>?m?1?;???????_k?HI`F$$??W"??I????0????tDH?c$???8?|????Pn+?]`?M?@?V???
/?
}Z&?;?????b??D1????BuOQ??????.U??X??wF'??????2!??$?BR??*??????~]????Mf?([b-%j?m?e??
??????[%??)?3&?Em4eeSSTEl???%%??VV?IX?-??kT?R)?????H??5mF??i?IcV,?km??????H?RLD?MD?1[j?b????????V?(???KJQ?q!?-NC??pS?u??o!=???6C??=?FbH??de ????Bw:??_tf??U@?j???'g??'?[??'?,???????????]?g?{?P????u?f?mU???M?Z56??J?f?$?Z???j?2?6Dn]??KlF?-?:???&?M[fZ??kY?Bl?d?jb<N?h?D?*)r&1&?n<??y?h?}???0#Hd^???
?? ?C?rAJt4????0?a?\??O??6X?????4?Y?mg:MD?6?/?G????>bM??QMQ???u?yc
?@VA
  ?^?????1@X?d????jC? ??????=VH???E???`SIV
KSN?n?rc:???f???K????????<_?$DXEPy??????N????;??QFDD????????G?G^@g?=9??9???Z8?? Jl?o#`a?Y???????????NR9????ad?P; *?$?????9?$??Z??????K?@\g??l8???B???'?qat??7?A6??o
MObcb(??I?????E`a?cd?@??W'?6iA???`T??n????E??3???)??@_*??U(?B
@UOo??rX&?~??8a
	d8?K?O??Bg?<?R??QJ%???4???R?u??c??e??ao
?????gvtL??(????&??0?????B?j*-K
'???M>?a??k??m???
fD???RV?DW&??? ??@??\a0n??
"kM??CO?
DR?B??p?????D????	B?*????m?l??????"$??e!w?	H?
9?F#<????$|??"N9$&P???
?b?mI?D?SG?:?EY>,??	6??hd|?w?.??Y#B?l???"?Q?G?1?
?u?dH???????~?}?? ??Y????b?;???H?-?;y?b?n?T8N??_d5?????{|?gs?cl?????\#????965*??c[o?e?t?DJ????R?I?4?'?H??}`B??>?6?VH?3????4?\????yi	???&??k
V:@??????uk?Sd????t??4???J?z?T??? 	AL??v????O|?wG???M??)????????M-?LN,?.IN?????2?M??UfI??R?O-??(??]L??p????? ry
????)??Z?i??M????S????bL%???%]"??_???h?BUG$+??????I8?@?2DT??y????P?=??????(??h??()?K??A???{8?=??*S:DX????Oa
?K ????=??6_?0f+??|!??"??~d.8T	F?/_????????AC??&ILP???I????y??p??????P[q?????????Q??IM??P????&?????pe?? ?__???M?? ???F?a?o???wB?A?jJ??Zy?????????f?Ye?6????2???????CSG at l??/G?$????
$"O???c?i?^??[Yn?????7?UU$3-M??F?$??X?@?G(??S6?
????My??M??dF?T?A?c"l0????|???x?gI?|Y????y4????F????$??J?,{`EN
N?%?]??N??<??_m?5?8? x?7??o;x??Y?L???*?Q???????;0?#???????<??????"5??-QI$??.?MI????????'?????????R?(??I???m?<Ux????t?????
a??????T3???????H?d%?o??|?????????|/IX???????Y??Ve?m??J?iAd?q???Q??h???????>K
z?#Nc????
??BpAt??`x??GU=4*?BX!??_??????
???f?k-?o??{b???J????py??M???U??D??m???-?TSC?'rtX???)???1?b????l`??m??%???y???I)U?z????????ac?iLS&g?D?dR,V??`?U??.XnTpQ9X???m???i?m??{???m?
&??L?
??3??g1yM????f????^F?ccfc5??=?L?????????i????k??%????????#????L=Vs????????q?????hP???????i2I<?????{M
?KAb?
??@?Z????)?()
*?E?1To?	????\K???E??????l????'????/???0?r??|?~B?EB????Y???us
??NG????+??<"????w?Mdjb??$?????
??b`I/?'wm)????#?????W
9(??????b?Rb?
?<8:i&oH????E(?K??Iu???	????
???!R7?_,?h'G?????????l=R?m?????%?zE?%???st??w???Y??N
?@????=^<??A?@?0???z?>!?6?)z??
JU???$J?#%B??!e??A???K
???????x/J??%	C??1jb???z???
?B?????????=????o??[?O?@?'??H@??x?X???S$?y????(??????UF?Z?.???A?^f???]Q????UTR\???/t???v?`???u?-
???:?Uu"????h<?=zA??h?(?Pa?L?bR???@Hf+Ul-???a????????????T?-(b?b&?I`_??\a5??4-|??}'???O?????L????1??9%???i?2jUl??!#&?a??[B??t/??@R?p?????xf	I?s?z?<s?=7o^_????X
1t???@?)
??}??>
?[??1???HmYf??b???-
??(A!
H)'??RN??[&F??1*jf?[?v?????m??R?d??i?oQ?"Z????????H?'?A$?K
A%??
?#=.?M??v???????M???q????.????u?	?sZ?i-??+%g?qe???Y?????s??U?5?Yf?m&f????&tu?n?t?kk6-2??[v[??8??????

?Y?
|o??;V??????? md@?lo>m?xy7?o?PL?Rl,?*%????I???e
??
??4??X???|????Vy$0$??fE%<! ??``Mg?Y?Bhp?8??4? ??z2?,"?P0??'c%E0?L3 B??;?He?M
y???
a?bi-?	*?>?
?(k??%	?>?8??5
G??)?@D.$?)>T??cu?_%t -?ahPA)[BzvXt\?1???,??I??????????<?aaG????x?[!0{ G:?,????B?6?"?LC??=C?IH>4@?B??D?Asm?z?D<?@?JH?Q??A?[JGR??n?O??M???Mh??e+?B?1?R	
'?_	???l??c)D?Bz????????
KaH?:x?o?-??i(3h>?8<IQ?????^*P?Jd?,.?h?
??7?1??v??y????I?????,(??c????cf????CU?D-???p_??A?ycYV??b?3????c	?D???W????+"?*???dz???%
@??N?
	A???cL?P?'Jy?Z ???3{{?IIE?'BC?Y??:}=???0????G?H???\?1[?T??D???4`??R~0?CBP?H?[%??p??LA?AJ???@?Ci??????6N:?+??,?
d??JH8??F?????????Zd8?s????|b?e?6?%)xQ
??2?G*?0 ??T??? ??????X$LHAt?.?4???q??X???8?x>??6??v?????????????"?M?bB??????aWkOez	????yT?????I?
D~p?????B?!????e????p?vS???"??????d50+??bB(?sCIG???)5??0?FF?N??W$Q?h4?H????0?0L????b$????'k1qx?I*?p
?R?W???$??RF?2M*??I?\?2%????T???f1
k)?\7?`????v!?F
?????R0)R%$\b ??P:??E
???Jix??????D?
?3?
?"R?7?????7?????z??r?$??G'???????O?-?-??A?Ds?>?bv;?????B?????????=???^0PB?
???I?D-???h????>G??O????#??RR?????8<??%???
?q?UUj?(C?A?.???_??)?xp??8?}??????Xn@??eUa*?e
?_p??????Nt
?s?}X)??\|?|???|(?R
~&????6"?0???v<g?J??B??????[V?2Ii?&?5??2?2?E?;M5MC?A???6?????S?}7?].L????n??;&???J-UD<b$~Rn???q?	??c#???`YH??/y???x?v?'?o ???\???HF?5?d3	0?
?6??????????H????6???7??<??$?2?+hZ???2?dld?*? h??l?????!ZJ
d???eAJ?w???,???E??L????T?J?i?????????<DQl??J??;76&???F2??u???$`/????????0?
D??!?l???b
?J??A?Is????p??F?g??~R`?#t??I???jMT?W????U????w~???g?-?????'?(??g?????#5??7YK>6
????5MX??T#??E?T?<D??i??"&?*
k??~????z?R?i.????TJ$?$(07???"?????D???}?
Y#Q>]??#!
???+f??l??8!I5[k,???d???^=???j?dV?DM?D??vn?4?}H????`???N&6D C??????DTP?DM ?B????>??????8?jj?M??[?YIc?=6{???vM"?A???p??4nIIT?C??G,??);#??Mc*???bd???B?@?NWnT?vZ??`x?%?????4Y7??7?c??r??qf ??
??PQ?2?;n??9g6W????g??3?b#???qj???D??)A8?M?:?r
~N?x?H??g@e??Z?p?0??n????E?I??5??!?p)R????bH???^:?,`??%??a-??(M-????h??????K\?#2?`???H?IT????oH?d??4hMVib?Ax???r]?b
"??I??J??0?f?g???M?
?!BKX?????????(?w????|?.
X0?T???w?7???T??X?c?dt/2?'!???L?P?????]?fN??I????2<??G?g?hP???)c?F9Z?K?????4T??v??	?%?0
?h??????
?0?]?d?6?Z(+??rS at Fq??m?-???x??bLE?@?-??nr ?WsG?
W|??o??O?n6?1?[(?z????s?b?$
???,?B???????#m6???C",????q?????n?yw,?T?+$?O?(&-??e?4d??TfGfq?6dS(?;?:I^\XU?7???
???3???J?[R?????'H?Nr??1?G??????[K???h??2Y&??5[X?	?7??????j??i??????????q?A?
?=F^ ??D?u??p?G?I??
{?/??Y?Y????	??[o\D??cW???UB=2dy?}	???!CP?IA?M?h?Qm?-"??????L??Z?M?5?gsg-??????^?Ny???d$;???y????X?????<??CaOm-??N???)?o??Oq???'?=!?????di?X??b???5??9?i?i?!?g??o???<bW??>Q&
??(F(?<N???P?????I?&?*??
??l?M>?g?y?+T?~}m???1??????!?R?bKCX?zx?m?WP?Y?E??JE$D????E??
???
"?PH???V???x?e_v????VM?1Y?S?AT??L+~m???~s??G?u???S?D?d???4G!??[_???m?z???|??????*??u?-l??G?D?EpyA???j|q at x?$?$%??Pv`B.???9<?F???,P????
?
G????e?M??m?h?|?|????el????4??a????A???&?FT?;_?????Ac??D
eY"?????(K?\m?M?c!?cR?2alE??w?[?k??4d:???;GJ-?ZF5(
?? ??AC^?iaI^??@p?
?*$??p????u
z???r??M??=??2???|???-?@?$y~.??Xt4I???????????R??R?,????????u?c??G?eu???y???m????;?SDs??T?????eHXH?)jy???Z????qI-4?dJrI??+??]?L??????5????(H?o??|S????<N??0`?)???6?X0??c?2	'?bJ
G9?4?+mo?Wl???h??),?kG????=??|?q?N,??t?FR??M?P?n?u????v*???,??????d!?_??2f??y??N?}?????kkZ??BD at -?C???????>??Q
`_?6e
???H??
??Nh?RF2l?b??d~???	y???I8H?????n#??0??????I??}?2z}?????_M??

(ZY?'???????Q?,W?3??W?0?&A????????
????O????B|j?
?T}???q?d?[%?m??7?$?????*([n??I??l????%??I??:??M6&f??DZ2???9????0QH?H$????Ib?,YeX??	?X?)m[V?C|??C?
?4N?:?/?????{>?EA?
??i???b???}I
sS?key????2??y?K$Nm?6?n,s????Y????&?;
??m???????Y?(??????|??`s?M??Z??N6~??*?
???q?T???????*KJa9?0???`?A??????L0d?Q???$???f??O??B????A	wJpC$??X??????????G?[#??!?w??Iu?^w???\x????
L??6??44?+??=?l?????{d????K'?"??t??k	?|Y2?#%+?-?????????^Tu?`Aa?{Q??|?????z?=?ig}??(<??fy%????I$????mU??'??????RPRz0?????s??X[?????1C??X?>?@?E???O>
M?o??C?^???#??P'?????3Cm?D.o??????????C???v
p#??????3??3??????N??
D??????-L?6>?6??$m?s*?$}v,?,??)a??q?????Y]d??????<
??I2?A?D ?A:?%????
`?#?"FR?`?YDi?,
AR?CJ??.?()$XJM???i?mX?2???????T????"?PK?d???aE`?B(?
Z?M?
5t??AN??k{b7?m?,??khE??h?Z3??V+)D??L?
??L?n??n????s???h[:/?8{[v?X?!ey?W???)??Ef???Ft"?EkU?????c?3?,!c???t??`l?
?!?,%H?X??(???	?b??6?;z%???"?"??????3?Oc??jv?h???kB?1??>?J???9??p??`?
?(k???&'??<H0??(Mo??\tY2[3??X D?(?0Q???H?B????(?bf@??Ci?=????=??2?????*9F???V?n?v?E????Ua[m?YM?Fy??q??????['??xu???f?f??Z???b1bL?d??'???XPk*J?????8?+!??,"	??g??!??J????e?6u?t?sg??;???s?X?`0?E??4TR(?a?h?&???$??????i??Q??*(?:
???GEAL??)0??X??&????h:-??7??a?PB???H??)`&??mfI?y??U?6??
?s?_????[My&???1d%?X?Z?e??E?!DQ
?????3)XE?Ze???n?{?T<mf?h?o?4??	?j?U??w???S???~?_Y
&??t"N,???>?A???N$4r??j??GVa?*|???X??????t???????n???d??????R?%?HD?H?W?(F???v?,Nr??w??H9o???V?i??b??U,K&??????F??????8????"???|??Mt?TiD$Y???@
w*$?;???o?)C?<???l???neC(RW?B?=?????6??d???5??}?8????]??r??*!D???E???$WAK??I*??]?"???2?d?H?Sd?Q????k?+???p??[
????&?t???q??/X?EI???R??KR???c?????????c??PF?1??	?Fy??JStG?
Jz:0?h?L??-?5???U?x	U'?Ej???(w
i?@R?H3??	?)??8y2? E+????
!@?nC?????}\??9*??b??????????A??nID0>KP at +?????E?KO??~?<???e????X?f?D????????b?C??>?G:?'0"7?	??`?k??/y??g?F??????v	?`???\v$S5b???C?X-??B5C?B	??	???EE????B2$&m-?U?d??V????j??(7??nm??2}h}Pc?C?c???????{ ??$?0?<?>?C??7?;?y$?????'H|??C?????z|???=??j*??T?'?j??
??????h' ?a
.F*?	T?'?dj???X??qc?zR??P??R??v'???w?b7??\?M??D?65"F
5 ???$%??Y at BP(???Yn?MM?6?B?-?i?<?qy??r?
#??>D0?hy?b??D"h???#j?#?+?@`?P?H?	"%??h?&?3??v???F?K?V ?3d?xM?D?R?????=???????Pz5+n?
?4?#Fn$@??2qI?????h;(??}*F??V?????5???)?Q??#??HI?
?4i(4??M???{?d???	"k&D[??MYAkV???o]'?4?o?!?sl????~sVqJ`?a?B?K?5????+????$??!?	?cF?L6???CV?b????OF???x???????xJ????X???q???+??
,dPPbgq<??~'????*?K#*	9?j~O?Re?S??????F???????x at h=^??V??~~~???p?k?(`Bk?N????:N???????????Y?Q?????c=???M??????'q?????????w>?NT?&
3(?&????=? 4?D??`lZ?]??Z@?!?^?NG-??9?!^?o0?"H?tN)R?2v#?????Nu??4??3y?????g????=????????^??@?j??"??i?\???H?tB??}??\???s??p??F;\???2+Y???=?m?KB?Y????Z?p??$?*Z???X:V??o?.c"c!F???h??	?h/?^?#A??85???|?(!?"???,Q?=M??)?0??5?iS?2{?BzlF????2v=?L%F????x =RB??1??:?%??0??K??o"?}=
}O??k???A??????0Q???`s]???2??z??#?-??d????????:I??K[|?<???e?:?q*???r?W??K???r?0????s?
P????v
x???aO?0l?k?n???%?d?o?>o??_X?:\z?#+33???ar??????????????l*?#?I?????xK?y;???=3??N??\?}|???????>??5F$m??,04?1 at D?T????
????_u????o;?r?u?????
?%?????'u0E|?Y?;B3;	?\B??z?V2???cm3?1t????s????;?`?????@?w':?lN:R?,\??qj<??+`S???H@???/;H??Z?(9??t??jO
?
????????)I?????a???^?Hp^\???I?R?R?b?e}??11,?*
?@?=??t?h'??v?q????T?9?J?e??^??__,?pJ???	?A*?+4V??"???G5??????-??cR?#?~=?g?;?R[MT???0`??U???;f)??????B?DD?cQc???,??8??pAX??????e?????W??
^?yx*?a???Q?K%???q?6????`?ouhcm0?}:Uy@??WH
?VY?on ???
;S?,??MR%?2?N%??<R???(N)y??ddd9s??;$??fHoH???Q?????g????&]1m????J?2K?S?]?N????g? ?????
?lA??U8
????7?<???8f??<zy????~?:?k?????????&?{??Z?,?H?|!?j??_>=3??o{?
^L?u????Q}0E$??P?I???????_~?w?
?d???O??@RH?	;?e6???$ {??t?qY?C?K.?C??%?X?l=7?6???U?b??UmUTUUU??????!???????F+aB?????U2
???a!?H?c?b{gN?s[??????'?^aD??1v#???L??H? ?????
?6????????H??t	~?%.?b????iG?2d?a?>V/???LUV4?d?$??)???
?Q2b?0/E?1aI????'?(?-?H/????y???????L??0?E???NF".????*??VQ??b	?q??w???NO?3???S????s????l?????Jx???O????}?U???%??b!?Ae??)%?mF?????=6~????y|?|*???
?>??fBu?6??? g?zsQ????[,R?.S5fO?L????0??%???}Y?a?rc???r??L??qhg?X??iQ1"?????@\kg?6??O???t?=*???H???AzI+?;
?`???arTj61?OP6???????
???g?M?X?????m???I??}?l????<?q???o?y2v?eO?u???1?MfZps
?\2?$???.??-<,??f2???pr>?e??R
??
h??53?????Y3?\??Y??????I3??X	?Iv?N?US????l??????O+?t??+e>?|??????g?-A??'?!m?|rF?,+?C0Ez?g??"?(?BD?????
?' ??
??CT"=????y"?
 ?P?$ud??<????
?pS??&??3?N??r???!?iA??Mk6?C?0N??q?'*??f3,{?????U??"??+?|?8i\?v?^t??????H?s???????S?-???JC???}k-?7|;???b???Y7??'??????Y_??sY4?wX??Y!e6[>??o74????-?[z??????x?EKX?,?????RE?<r>??m????q?7?BI'$PVA?{=m?6?3l??????fn(\O1??x	?@a???%???P<!?%??$????h,?	e???F??N!?i)(u/.?%?
?2????q???1?C?8;?g?jv?c?	a??j?*?\f??6?i*tL
???HHRV??L??&??B?i???#??
Ul??{?
?Emi???M?Q???2??M!D)?NH4V
g?D	??!`%x???NjS?D??b_????!??LOw?
3?D??b:;?;?`?>??{??y?>1????
6b??!?mw{?ZS??"?????H?k?tcj3?&??
??G<qc&??cVV????m?
*]??_??m?X???	??\???B?"{r?@E????%DD?hn????g???v?~X
?{?D????E?Y????6h????d5??3\??%?tKY?}4i???ad?/9?m???L?q/(\]??7??M\?O??
?"?[P-C?pkn???q??e8
d?S???s??????U-?K"'???\?N??g???[&????'uLe?s??wK???f?(4D?"????????
??cv?Z??7?Z??$????$??B???>`
k'??PHC?zJ???y?e9f?d?%?O??'<?86??h~?
???7??{||^?&T/??=I???w??4?w????kk????Z+z???ZL??%???F?Sz???l/'? ???]{????f??Te|??????.t?*1???????????0Y?8?? ??d??cw?4??@l?%<9AHRQ?x??H?\?f??c?xdt??????K?&X??UkM???hq?{???FA???<??Z:fk?JWQ???nT??<P??O?Q???D?i?X??	??????j?vly??qwb,?9?,?A??E}?1>9G??wWb????Pp*????c?K???+??74t?k???h?>??t?????i??
!?l?,??c??R?%?N??H+???ip??;?h?&???:!6????W?
?w?
[w??0?j?t??)?
?0?s??????t?r??u&r(x??cD:??"?]C[2??????k?d?{ #?&?l ???5??E??????|?PO/??JN?aX?EgY??})
?8.?'??|V??IN.p???S&????8eiHr?R???? t?#JT?+h??6K??kr?w?zY??G+%J???????A??vm??p?[?????un??it?|R??1F??w??~Ma?,.?????????r????d?\??p?Xb?4?ePJ?uh??p??%?????h???~????(?
????w???C?6?id??Y???-?]?qf???
??{1?????`?,u???y??Tmn
I??f??wv9l?97?P'??Q?T?U???YA
??z?0?J?
???`?X.?????t?]N???]????\[??	??#??N|1?c?o???*?x????????W??mkh?HU??H+?Fb4?CE??)a>?]?C?##?Z7/?A?^???c??NB?w?	???>T/????f9??9?_^$5??????t??,?????}?????3??P????Q??4?{????b??F?(?,=H;F??O;
(?????{^'?????4i???9v?h?Y%<I??uI>????&?XO????29<?85`U?=?d????n)?????|#??5Y?????q\?g????????.??%//p?????7?o6<+????H?nu?!{?L?s+?i?`?ukkt?v??:????`???C"?K????%F0????z??C@??;?j_?g?&JWO[?G???y\?(??9?????e
?Nsae?T?????:?TW??Fl?"?????A?g???5???|??x|??N\????&?iOL(??}??z
	K)4????}???u?Y?????????%??d?s??rKI??%{@??????q???=O?f[RZq??h????P?????d?R?d??x&?4G?+???z+??IZ??1c?x?w?n
~?W????EZ??U?N??
OZN??K??O??U	T&?????O?:??+????I_??yKh?????EJ???$??????&4M????xd?K?5[??b??T?????~?
???F??eX;PH????!i??+?-E<o-*???S?
?y?|???$FQ?}n?me;|p?????????????L?/?L?hl????E?`??
??y?????-?oR9?G???|?;???{???M?]4Z??sxMS???;?V9???;?.?D???[???vz??NCo>g???<?!????$??????Uq????|=,?e????x?????3!cB????C??T?E??*?????)????????`?j?N??fs????MA???V?c?cQ8??????????s?b???????K?????u?]\sKl?,!?f?g at Q~GQ3P?????k???P7?M?z??mHK????????`?=T????a?????B?c%?j?B??@?9AFk?Rq?t??????>f&?:?/w?{P'?;@Vi?^NE???X?L>(?m?c??????????x??/??????eL	X??&}^5s?,?r?K4
?,=)w?^????8:????Jq?t?2???S
?????????aS??l??P???b?Y,???z	%???4tN????_?????_j??L?I5?~?7	???????l???l]?m?^?3?m??k?h??`?I?l?????E???)w??^???#koC????????f???2???????cee?????????????MD???77??H?>;,Lj???Hlb??
9????FE? ???e???[?H>;^r????K??M?b???c????:T;VAA???<+??S||\E??\????:0???w?S?D*???_i_??C?N?!u&;??m
x??6?A!?0h0\H???B?
???&)J>~?Q?O?
8??F?.?),????4???`?_Np??}?d?_x"?1n????+?
}???s?????(?p?????zM???4??B_????^????????:6-??J???? M????yVvL?^06a??"???R?n'?]*?
?2??$\L?C??g?B????
?A?Y#^?TR?G5-,??????k?h?.}??6??|'`y??????????E??B??
F?=?<??IR??H?}??\??,?{eG???J?$Y??6???h"?????do3?g!?S?y?%?6?Q??pns{??4w?Ue????(??J????qQ??<e)ZHg????V??6uLd4`?????a~?Vk???E???8=.??>	??`????QWl?Q?'??N???f~9'5?0?mI???6e???zaz~??,?:?}??o??t??0???j?-???h?;???"???
\T`?????GA??????KPf???s??V???a0??
?E??r?d\
?B????\????????74????E????<4?>??Z??{???	????9f??<.^??q[?};??F?????r?2oG[??????W????w'?!-U??[???????	$??h?`$VL?5?G?????k9!)*9??????4??)z?4??d?|??n?=??6??)-&e??i?'??5?n?(?*???????Nmj?ni?@
b??h??5?:??)??P?2??sG??s?/#?r?V??[\O?$?????????D2?Vy??N???'???????[O??????]*3?t?QC	?]?"??m???p;kl????L`G???U????Ge	N??*?%?m???P>??<U@?Z4U??8?2?%????J????+|?w?????oo/?n/S??G0,?!?F
r??6?????o???I????????<??xI??)
???0![???????t?/?t9?M?A?????]y??M?????Jc>?>?????w?P%?????o?
s2???\?e^L/o??9????R/?
[d`Sx????????g?????????????
?fP??'a?k?I?d?iV????I?T$??;%"?n?#????]0?Eg??N>H?k}P??M?8??ti?c$?????tzK?*a??#?-NA??E?TAl_????d??}j?}
?????[????????#?G]CP/bv{g?XW5???5d7i??R2Ei?d);?
-??o[???????A9?z??H4%]k??????????C:???A?S??"?[	??????G?)_??w?????0?>??eJe8??I?V??u?n????????????&e?djn4?j??7?+?lS?C,?\??a?gl??N#?uv??,?:dDI??dM?[:7?U.z(3?;???egTs???D?$???B8NV<?!??6C?????D/?f???z???#[???=:J???
??+???l?????0??
X?<z&?~?8???d???L???L?????z?>$????+???{??l8???L???? u?????I,??u>$?b??
f???<????????~?=?6???A??=?z?$?vT??H?????F?rL?? ???X??z??i?F*?o??W?(?.???3$P5??(ni?z
J???JbrjH_)?8???????b??Y??]????rz??zN}?
_?L??g0????q???	?B6?bE?Zv??z!?0H??i???6V?#]?:O?%t??n??=4 ??k?)?i??????a?-?
3?#.|bK?#??R?????	.$0??t?c&????3Jr:w???4???7??@Z
????w??{u??#?2?f????dW????<??B?>?e???M?????%?????@S??z&c$???99??7m\??/????0Glu??P?lwVx#?V??k???;?^?Z?kw??FU	???I????E"%?_SE?????
??????l?B?j4???K???f?~??W???x?l%?R?NS?
K?~???????,?c?G??? ?????/LZ?~??p?L?B?xH
	:/?a???#_.?Sf??G??!??-??m??????g???)????????0m?T??YQ?Z.I?8t?



From fedora-extras-commits at redhat.com  Sun Apr  2 07:03:38 2006
From: fedora-extras-commits at redhat.com (András Tóth (tbandi72))
Date: Sun,  2 Apr 2006 00:03:38 -0700
Subject: rpms/gnome-yum/FC-4 gnome-yum-0.1.3.tar.bz2,NONE,1.2.4.1
Message-ID: <200604020703.k3273eGa006122@cvs-int.fedora.redhat.com>

Author: tbandi72

Update of /cvs/extras/rpms/gnome-yum/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6107

Added Files:
      Tag: gnome-yum-0_1_3-1_fc4
	gnome-yum-0.1.3.tar.bz2 
Log Message:



--- NEW FILE gnome-yum-0.1.3.tar.bz2 ---
BZh91AY&SY?F?`?????????????????????????????????????????????q??M?Uv?A??Q
[`@
?at?u?{?
]?????@???[?w?<????????y??k?5
???n??[i?|??>??v?u??-`?`
	%TU?jU=?N???9???8Z<???@???v/????>?}????X?}???????;k??????t???N??|}?zuR/??s?S???P?Z???=???)?`??%0?0*a??]??L???a{???xtw??!:x??`u???T?
?;????Vm2???8;P??U`??p
(?`
??#??????^??k???[??ml.????\suU???????

	M @
l?4
4??zLh??j??SS?OMOE=O'???????=S??%?My?M
O?=???Q???????T~??j??d???z?$???&?@L	?4	?!?S?'?L?&M2i?d???d???C&E?L&MM?&&?`##???h?f?MOd??{F?????PD?
G???????5A?eLO?'?????2???OT??H?4???d??#
????6??xo????BH~
????7???6I??H?@G?S??
?? v??U??e?b?t?%p??@??`??Tm???????No/???Id@?
???W?7.????????mn?x????x???r??{V????C?SL??????D??f?)??%b	??)W??U??R?,!?5??>???sJ??GK?M??=?xXo??r??D., "|?????'????mp$|?-B???????{?W??>g??Ct1N????s?L??%twKd??y?`[??E{?w??L|??!
	
?~??X,$X?????^????!??w?????n????5????V?'??b`[c?9?rR6????g??w^S??'?D??Q??????<?>NW??uE?
k??}??u~??Y??????v?????l)?6`h5l<????C!{??!??6?u?i?]\?D???@
?V:????SQ??????m?'?????]o}o??y8?i?0??Q
 ???????L@?	
?????k????
<5D4O??uh{?O????????????<?7?q?[q???nGCY?{\??<?Z???6pp???a0?O??z?^f?fJ??l?$!
???9?<?a??/
1???5?F???
?y?cl0???"?????f#?????????????(????K??p.[?/??
?I???T???????Ai1?z??j<>C????2??i??1?????cCP???]????P???9I??&_??#???????x??1??????G?????
???]?P??V.??xb???#$?=?9U?>;??
\??A???,D ?n??*G????|s???
??	?U??_?
??r{?b?0
I-?$]E0
?
yC??~?~? }(
Q?|=+;???A?~??1????5U?ln?????x4n?l????#????????\/=v?y???#,c??l?
?	??F?^vF3?V1???wic"??i??s??.??
cB???x4???f?!v3??D50?>??{\Zq 6????~??50D?????zBd?~6kiZ??j?|b(-?p??9???AU??v??)????M??G??26PX??]q???N*????o?????Q?r?x2m???????3?9q?.?
??????5o/??A?F?1?*????????"?`

??> iY?~l4??r??G5??????????`?H?Wuu????9|??????!??L?E(???C??????~h??C??R????P??Nw+??~9???????eC_????[\????E???fg??}???G?J?ZG?lxtP????k??}??'c???;[O???)?*
2~i???q?z??A?r?~????h?w?UE????$
???K2?b??nX???%k???U????
????
aAR???b?Po?N$???\T?x?(?-?)y??q??O?Z5^??9???^E??????]?{J1D??~?o?a??<{??ME?????=?G?????:???`?UU?"?Q
?Ii????(y??????????????p?p??c?Cm?B?(?"??x?^?
??A?&


0??D-n?A????A?:u????h;>?0?6;??f???h????J
)??0A&??~a5[?G(?r???N?kS#?1m!????u
?+??P??D??g??k????}Q?q7???*#?]??????
??c????
?r??Q??@??\ga??hhB??N/7[?Wl?P??r-Db?mO
??$"
??V??3?#?
u
ho??%;5!g? ?Z^RBQ?"??,ej?d??6??-?
??????U???f???I1?CD?Q	????????*???A???Yw]?#3?t/ahl
'?????e"/?N2v??`D:J<0?"?A????v???n?Y(w7?M6;1q?r?^?u?A????'U????y?PJ?39?<'??n??????B?" ~?_?
??J?1P??'?~'??y?!?>/??{???}???XD|?
'???N(?	
?"#Db?*A?)XPUX??J?%B?$Eb??#UEX?b"1PV(?1TbDc,X??(?@X? ?????X`
C<6????}?
???e*IYU"???d|i@?C??w?/
o??=Aq1o~?????/?eD?"@ IO?????

?X?,b1
Ub?$b?$????&????/?????C'i?Y?????????l?????0?>|?v????????I!?A?oL?????????D??????GB???7?6!???Hc
D?~?>?d$!??U$
"??$?$d
"?0b???EX, at X11??d???????5?=???XJ???=?
c E??Ad???I
?R!!!
????EEb??????????*)?D?*??1?)???"?UY`??DA"#b?Tc"?(?`"?,E@2 (?
?EV"(?0T"
???$T?????b?A??DPb ?R"r???(? ??A??E??+AX?0AQX?b(1U 1?
?" ?j,`?TF0dA?,`?DY#?0B#PAA?H$D?b?(E??
???Q0U4???s???????:A ??2d????l???O,??}?HR@????`?zFK_???>??-
b6Ra??Y@???t?1??{D???~?C3?y[??+5U???iQ????F?>???T???????B?#F;???/?WE??????q???g?t?;?[????Q????\????k??1}%???????????>kV?:(???#??U?/e???%?Z?a?6:;?????#?,??mB2?1T?E<>Z|??2?`??*\tR??2c???
???s?t??????????J????$???"?b:????KtrU*E?????r?????*????]/7I?$o-?p?g???a??2?Yd??d)???7?3?	XpFX??n???D?q??2????
Dzm?,)1^??z;9??!P?n9????)u???
k0??m?/ct?*]?384$?'6
eGMj??	???E???~o?JW&??X?pb?????2??H?z
^DF??*:?
sAH??I?d???D?z01???+??EX?b?t????)?,????WV??n????????%???
qN)?i2?ei?f6+X6?R??M???:L,??b????Rt|?(????.&?p?Gh(g????, T@????"H?#!"???_????????????c&??r??(??t	+
????'?~g,8wg??ID?R??O???=???9???p?n????S?<???`?m7???G?!??uW????g89??????r???mGc?e<.>??.<j???v???????0?/???U?V?p???4?a??Y????G;??g~??<????.??WN<?9b??N\ ?x>N??bz?3??9R?>RI%u?v??I?lF??m?z.???????wt??0F???}???
???]'???)?j?J?wB?r?c??Y?N????`?4?,U?T[eQA~??
?uN?+??&f????T??\3???/*???)F;P0v?yb??V???	??*!$?<?]??4??AU8wu?{2*:xd??1?J?TB-???p?$????"p??s??T,Q??@?K?b?c.Sz?
?Ub?T0PQs???A?g???P??p,?F????',??.?Vipf+)~??V&?????5??Mu?T7?h?F?n\?c
??6?aQ?????:?y{q???H{/yl3???OK[??????>R>?|??????D|
???S?>?????C?E?\,??f??z????_?J???[7??????I????dM??d?k????.v?L??????&%u?vM_?v?`i???2\"???l?Vk??:@?i??
(?2T? ??,X|???0DU??H")<?
????.?XO??_???B(d(??;??????l?=??OS???I?S??

???D??|g????[??????<?fj#u?x?????{hdx?o?a???N
??vk^?
??????|????????Cx????????q?,D?}?X
 8>?T?K<E??&???D8?DVv????m?x???e?;?p4w?%??.??7????I??????????td?b???v+????6?u??_??????x?T?h?T???e????s??(?j??"??E:??????W??????W???
?8|??????_o????B??l????hg?????????????
By???Eb??0?'dDP??!?O?X"k????C>Y6hBdO??? ?Gk???????
??X1?"?PTe?a?b?b+"?`?TTX?AQFE"?????p'?	????$??P?BiD
-????T????CV
P@?9r	!QR\?R??@??F(???T?%??a????RN???{u??	(??_v?-Jv?"T?H'u??n7???"??5??(????????:p?=??^?7?U??????Gxm|???{?@t??????X?!?k's,#?2?g?N?y7RD?e??N?R3'?e
_g6???VA%j#Z?(????O7?[???q??1???8:?]???m??6Yu?e7?0AQg;?M?t`;?????O^?h?_H?1zt^oc????qz??;????\??A??R??q??2??&???
?@@?
(??G????l?l??;c??zg[~
@??b?Ub????"I? ???ZBuR??.???G????~?D??5????v?Y,A]s
Yp`7?1?z??)?jOc?8?RE!?5?,?s?0???bhe$d	?|/cI3?w?LRE???`?!?D9?u8?1??

?????=??
*??}`RBD??H?????U[???r:?RLhj?G.?t?S=h?Y???????1???}T?-??g?????>?E)U??VyX?Z?????rOV?????i???????k?}uO???b{p?gVA??? ??}V??S???????t7Z>?'%????Cs?q?~????5?>???{?Z???d??+?????K[j?E-??wX?g'o?????p2?????>#?U?G??!?|.???u$3[??z;9??v=??????1??????B#O?Y6??ji?????t??7m??eN??	????@x`[?y?=w?????	??	U???-x| a`N????VQ???A?C0??_???`?'??2?	5?|?D/D??P??U<?????iO??A??V?a?$$%R??b???b&8?	}?UF?Z;?????Up??1J?PaU?`J?pz?@?@E?O?P%??q??b????,???ek??;H
 ?c???Ni???
xD????????R????o??0J???????r?rWYz??etl?
*?V*q????
(
0~T????)9?I	??~?!
??X?i??[??Q~???[=???????W=?????z8??HL~??????????N???N?^>?????
$?u?3w<?y??S?P?"I?????l????E?Sl??['fh?s?EGl??????T4???>q????Lf	f ?GW??x/
=??.????Ia??YN???G
???I?8E?l?ca:*?????"O??O??UQUb????????{o??????IURu?C??p???=?]<bD?3`&?3???;?V??r?(?==
?zk?DU???
 ?p?{	???Z?M
I$A???(J??
C?_V???Eb
E??V1D
Z?+	Z?UX(?"??"??b(???*???$
tl??|dU??????T5g;??c???">????d.?a?,e??[?B]6????X???@A?? d?g???W??q?????^??v??
`???%?1??????W
?\??H??er??|?'1?6?????*d?????3???P??z?E??OZ??????B????
?"=
k?W?A??C,F0??~<??=?l?t
Z?h?%????t8dB???W?z???.?A!????????
?2?=?E??<?b?m??^?w??W?????O???\V??-&^?????c<<.???]?p??\???????&|?6?,?DS?y`_??PT??2??#~??????6???</?#????M?-oUS?t???????n
??-u??}<?-???t?c???zi	O?zTo?1?((7
07#??6s????q??
???????Y~ 8?hC??!n?????;7?X:???{:?q?~???jd\n1???5??h6??k?D??(????%??????sTyP?d?O;??????:????3??E?nf??CH???$c?M?b?p???S??>?B??Hr?k???;C2{"D?????I?#??b??t-?&Tr??}r?e?(???????
?R???????w??? p??'????"W?6?8??_~???U????????K%??b???=x0?e?b??h??%? S

^?5i{)|+?|?j>??}??O???b??*-P?????????UEX????9????????AADw???V?4@?e?$a??8F???R\?l9????????
?S?????
V?e??g	wM?g|??N??C?}?k?7
????.W.?!???F?z??u???U???0?)'??>Q??@7?*<=?}!Y??0?B?!????KXA?W`??%?Z??XC??????\~<?????X?;?????g?C?????D???J??S!??+??\??u$????KY?_????D?r??fp7????2???v???7?_8?C?P??p?"=.??VL:?????OJ????3?<&q?V})Y040}?????$(?,>f?%	??3?? ????u??N?n?????
?o???A?????J????l
???1C"?9??>???,cq???l
???G??????CV?;???0??
??b??C???u?e?a`U?GD?&7
e1	??????;????????~???H?W?`????kD??6^i3??4?SR\?XZOE??i?????o?z??m??q?/??JB?4???-!??8???????H??@M?A???Q?n5I?(
?qte?"jm????5)?Un"[3|???o?HZU ;PL
???$=?#?&????T_??Xj	i?G,7?G???v???A??@??B????E\?????K-0Q>?????r??|-@?u??>$???bc"?
[??????????~?Q?mKR??"????cU1?Z?-|????Evn???X??cU?z?????C??>???c?-;????m?V??H0?q^R??t?a^9u???F??0??}???`?bp?b6??&?fY-C
,O??[?6xI?}P]?x????7y(???????c?? 
E??S"
???i??+is?EN?nx
??F???a???"??N[j?w?{??.?~.?\+??K!??t?~^??i???? ?-?h????JfZb?u.???_??Y???S>?(????C}O????y1?t?????])?8????
?/R?*??H$$??:?VC	????Ab?j>5?o????????????;?Yt??i?????~6?C??X
?ta??r???U?f?sn???x??c??T????
c??G?4?RcJo]?k"'?
Q???7>?6???A?T???|?	??????r????K??_y??(????Bvm?,=?????O?Z?xb???4?g?f????????P???*??IDRF?????r??nH?T?{b??)`?W&~e???h7?QL=??c%?Gf????BZ???????J????????Y?F??8??v?j~???.???T?]#????[?dl????#+?j?@N??G????+Doiy]?c]
???C? ?c?
???$?=8???\ ? ???IM??W???X?Z/?????
??%?kw92Y?A??Z??i????c1?\????m???I?.??&6?1Q??z?Tl?,????

E?gin????D[J????????V~1Y?O{?i?-?=-??D????j?C?ZExh5$?????????X??zE??*?????????sUh?Pi6k?<^?0???@?V\?g???f????2????l
????s??m/?8f?J0_#p???^??Y?<??_S?\?+??;?????????????s?5?*??f3$D???&X??f??p?:?4?.3Xc?????%??<?3Q?]??x???a'F??V??}?w????{?%#???Z!?]	
?????*???VO?7$<?k??~?H?j?????u???p-R?D?^?XSIk???O?^?1?1t?	?It$??0P/?N?E?&??8?%Q???'r??w?*?????????^?l?????w7?:?^3????yu?P?A?ox???N
G9????>??22???73?PM????I>??m????????T??{2n?m<?m?3??o????W???T?`??
k?m?M??a???|??????"P?.e??q?;??4c?????"?t??m?XRS??o????]3ag???lQG??]R??????"???v)6?hT????wN?}_,`??o?(?r???"????I?Nx6?i????D)C?#??MD^??]???|?(?T?h?1?Z????*AO?w????,?????
,???[[???J?tX??aG??b??.?%G??"???;<??4???????G?e??V2?r?U?j?3?O*~)?2Gg	?K???wV???`?S?/????{???RR?+????:?W?[???]N????y???F2??Y??bD??E????W?}??el6????????????)D?6??@h4?]?Bo?1@?u?,=??? ???|?X?"C???dX?R?:??b?U??I?G??q???\nBn?n?SM?O???u?<??\????Ql????7??? ;????X?zEt'/??c$?!??????w#K
bO?c?@??S???4;k5?p?F??;??????vP????
??_?R????
]?*t?u?o????? Y?'??t?s????g?c??u?!?'??``?.Bd??*d?O?Ek*?K]SI???hr???{?>??X?h???3?"?9:W?1?!}?O?0?F?2??
?"_???????u?\W[???d??/??4?C???e?<???????x?????W????s??Q?/?G<Q??%?<?G???@?fB`?lcp?
?Y
?????a??/>??U???#???????
?P????y???m?~?U?s[???1????#G???&c??L?\OU???????_R9????|\:?}>?\??????Jm?e ??
?/B6)??(o7??????D??^?''?????????@?@P??S?DW??'?????'k???????=?Q?m#?????? ?!??
??R?????]???~?$?H?`???D0??$X?H?U,??`??t??H?P:2
g???H?@?,cE????? ET?
??M?!?Vf?P ?Z
G???%????F?$H2?,$P??R??1J?3???JiT?idd??d
0*D???X?PSQ?b ?2??y?
>4?x2IA?J?
Q??C	?????BtN?b?n?J??Y"k???I$??Hh?!?zt???????:6???????????Q?K????4b{?
D7R`&k?#^](???T?;???1Ll????]H???w??
?:?q???r??{;n???DA???d?
Hk??a??h$?S`????]?	?"??*?Q
e??`aH??K?
???O&???$|??C@[ 
??T-`m`B?????*?N????T?b?`??/????#?v???zPY4????3H7|?a???af%|????p?C=
??????Aa?;????O??2 l"m
C-?0"V	F
?)ha?????P?s
???U?J (
*?"??(d`))E?"??#???W!0"Ie??,??&(??%?
+J!)??0??X(#%?J??d???p3]>?5?	#?	?vha??%($0I??I?Ya?h???"d???P
 q?:+??3??o&?RL?,?I????D?I?=?)&?Q???uo ?
?r
??l?KT??1?'???/??.???I+??????h?4]FI???ha??}}???w??*???|T???"?,|?l?????, F0H%?k??????^?QQ=?Z??kNej???%(T?????M?????JC??0N????H?M?????PS?`?`?8?#??=?O?I??I?W???}>?r????/s???G???t?????????"`w???h??2
??H?????m??I?sUUUUUUUUU??
"??D?"D!d?;*????*???2um??????h???W???u??L????sq?dhT??
?)?S
?-?m!-????
??ZJx???f,z%?????%??{???sz6H7MN
?*?X*?6???UJ?????UPQEX?*(?ciQ?V(??Ub?TZ?K??K?.???????&????^?v?i???'??????v2?~???g???m`?T??q	???:R???Y??{???????????7>?!d*?v????@1??s??g ??????wM7_O??????o?????~?^#?l????t????{?v?%6H????H???*
{????
v??????&}?????^%vO
?t/h???N?P(??S???7??p?98?f?!?f??.???>???E?`??i?3?g?.@?C?`|9Y0)?	>
??D?1R(??f`T?b????\X?NqE?"AZe?????????3?
o??&2??JL,P?*z.???%b20X?(x??/?????	'X?,??`?????b
??
(HS R?D?}q$??hea???j'??,?gC???uE
H??
%;?	@?B?5R???Po/??q)?? z'??\]????+r????,?
?a???|=?h{[r?{??A??8????b???aG?.=@>????^[?D~?0Z?]?W????Dr???(?rc3?t?T?ut??j?27?vTG	???hHD????.?t?2?T$?m\xQ??2g<k0?J??Sj?73?g?????*zSo{<???68?n??A4???k????2??@???>??/????vv?9????&??5 ?"(A`?dSY1N?$?D?8?~?s??^????0a??:?z$6'4?r???????|???;?.5??gV?u??8g?uc1??g??!?[z???5o??S?z"??>=???fx?Y???&?M??A???????
H?? ?s,??????f?@?@?!?7.?~	/Go????^#???|?d?2?KI???b?lT???8???yC??????RN????tqR3Y? 
!?????R?T= P?p?m),?4|?q?TTC?????|?QP?!Q???"????????5??$ :???D\?????}?n???????2?j???L9}???p{?@k????bb~?????P !?N??["??zx??????x
;????9?? ???*
E?c ?H
DI
d?$?$P?
??R"?H#
@,Y
@DQ ??,?Ad@R, ?"?

,?XAD`, ?T??
?? ???E?!
?A??b??DU`???dFH?
??!$b*?#
	?"?1b?"??H?#
b??1#??"	??b*???? "??1?AAHI ???*?TX ?????dA?1?0D0dA`???
TX?/4???[?5???Ao?f????U?;?@??
`?<????u??Oo#Y?Y??W{????_}???u??[???#??,k??v??t6?o
??J<R???|\M>/??H|????????\,Q????D??)R1W??!6???8{,W?zH ???x?????f?!??cUh(]???.?TB

A??????h:?]?k??y??j?@?,?
`?i???;E???(tD?
[?s?*??#7??-?MG?yIz??m?vt??????^/??"??_?"????)Ji?Y^?Ju??,?{R???V???W?4N??t? ?-2??=oU1D?{^???J??b?1j%?iw?????1L??:r)zR#)?Q???g????^/ui???xYe?(??O??F??r?(?kcM6?{o{??1??F?
?M2???7?\???????U2@F??\7?~/?~>.^??o???1?^???}?9?B??????C?????????v??;??_g??F??W????{??????3U?vs???lsU?Y?*2RBo??????g?B?P??v-d?@?|????#?$Ea5?.r??U
??2??JVgG?2??T?=?????OwG_=>?'?6????f6m???v??e?u??g????4?M" xb?}?:?
?`w`?z)?\4!?[?0?R?????7s_"]???????
+?B????y??{;
??7?*?CD?p
]?j??{r2O??JS??->9?g??
????????[??nM??%N???C???L?SvL?F?,.?FCu `?v3?'_?3?-??Qq?B????????????rrs ?|??\?^#?Yo!4N??`????C??D^q]Rt??? ??8GR?\????Q??V???(c???/??~o'?F??#M????
oe???w???,|LRW???oj6???????C?>?????\b?|=l????P3&$B~M?=?un?d-?5??)o?	?ccM|?@;D0?8??1
mm0+?T=A(8^}??TKn?r??w'U]??^?Z???cO`7?Pi?RT???jjN?#?i=Y??????[?Cm??T@???
?^K]??!g???T?4?A??5QL?
%m???&?$???3??t??E???zgH???? ?0??}??>F???Ux?54???k?Z?]~P@?w-??}}U^?-??????????~?L&K???A<,???i??*c,?	??Mj??C??z&E#??N.?;?UF0`3??x.V3??z?%F?"???????<???G?,??5!W?9?\)?{?-(t???9?Sxs-??????]E[?SaF?0??j)>?ufm??!?1Pk7Y???Z?^]??E)~M ??Zx?o??18p?6?su?
??@?G
????f'?????????O?t"??]A???=N#(?k}8RH??
?(????7xY???]<@y??f*T???3??2????j	?*??????
.?(Ar???l?6?|A??5=$q???zn????:?_wT?@?Uj?`?EZ?$?#E????FfK????????Y??$B?H?4.?M
?@B+*??Z?O?c??z6????ns?????????^`???p?????t????-[?9??????By?	Wa]M??????B????.,?H?I?????m?e??????!?_d?O5p?????9R?????z???????S~?M;4???w??_/^?9??=|?E9Gm??#
?????9??[??????>>?&???
?Lq?r?*7??F|?L?)g?????:(H?0????:I?v??}4H??????????<'???J??????d?????{??Q??FJ?X??p???E?E.??8?;ra???\??nMS????:??$Y|??.!v?u?HWF?5S?O?^N?/??S??3??????c?"???mo??E??`???????^?????m??m??m??2???n????0?c{????;??}??G????b]??????O@?????
)????????S?{%/QS??]?E?%]??{?^?{??}?"^)??o???Mk?U??~m]#???)V?????v-??nD?d_m-?0???}&1?g?|mg)?;??Y????????7???5Lk
??F?_?z??Q???S??Vl????6U???????F}
?3G?/\??CLj???_J???+S????F???G????uv?????=m??
"??^?t?(???2?????@?~]z?h??????O(t??ys????ho??in????O?cNk
U?<???f|vk??k6?5`?
?<?n?!%i?1?#??~5J??????cS{?????w?_?y?vQEQEQEQEQEQE??oc???????#'????+K?7i?p??[0na>?????yy
?v?e?F	 ????;??O?e?#H)/??1??V1??@???3?i}F?k9??oR?,?D????????~??c???pe??[m7?R?d?l<b??r???[?6"Z?T98$eY????
??7x?2E&??	?C?m[????)?]R?W>?@?Wl?IN?}??#?AU?????(??)%??W???z?i?Y????r??n????L?9?vLe????VS??&`?3G]V???CDX???f????.e3???_?R`:?D????????V?~B???~?W??1????Jz?w?????{Qv	?^?y???m?-????????58!fF????????!_%???HQ?q????j?f?DT??????a[??N?3?n??x??c?	??be? ????c7???IG3<?g?oNt#?`?w??	;t?,Hg??+????v??+??\}??u?{F0??&iPc=????????C????~?VB??||??tf?s}|K?{??:e?X??%???LD??	???4TTs3o???^3Nq??|6m??mg@???????w5??	??t?l?i?'?qh??v?r]???D9?9????z>B?E1???L?J+h|g^q?????~*??{??;y7??<??????????+R?-??????[Kim-?????m-???/?5?={>??n??=]?<EE?\????TY???Q??I???c?=?]?????!?s?C??F!??Y?`??@{??{rK???yN???e???8??dp?O?!
 zU?j?Vj??????^???V?6?????????G?xO??z[?P?????9?S'??????v~???I?e????G??9
??????t???D?o`t
7?Vg?G]Fu?J?????????p???y???e???
?k??1?E$?@.~??h?r?????<??q?j3[vjr??I?z?4??/<oX????Dd?";?NG
\???e?=w?7A?:_?I$?I$??ow???????B????S^b??Q?{T??,????????"?}?n ???L????????5?K?J???Z|?w#?|t:.??x??7\?;????7;E7?????<T????r?????Np??y?e^?????ojO19?????\????????yN(i?I??s1??iQz???????p1?u?x??X[S-??`?f??r;?4??q%\??`?xpf??:?????'???va!????/?????U?N??[?7???????????F?`1?G?laL1??D?8?s'>SH'?FM?>???P?wk??r?jn???U?2'c|O?????vy?%???????U??(x??????r??*?]@N#???b?s?4?y?????59xP???????
?`"7h??V??"?V?$?I$????????n????Z.??8?u{???]n???Io?=????Sy???%Q?G4V???????4????Lmze?c]?{]Cm?A5&8W?A?'i?
9?D? ??*r??o?C?d? ?b????\?,?1J>?NQ????n_?????&??`?P??
cn???
?A?&]c??v~>?g?>N?p?3x??I$?I*x?m??kp??yG??S??I??
???f?;????3????I?8P?r?Q???o?4_????w37?????????C]
?QH???%
?b???4?J((E?D
 ?X0?E??RB([ H?2
??{?C\m??ms?60?c"?=h??!??y?m????NN7?k]???[?????J??"kZ2fj1??????Mk??????(??(??(????E)h??b???e4R??jR?? ?1?N!?????w?qb?P?
????$??{?vq???S[?~q;???G{xH?:?g???etTz25?3eA????
 ???
?OQEQEQEQEQEQEQEQ!!!!!!!#2?m???<@8?s?????:?=??Io?_???	???]Q???`??;???K??yh?:?!?Z
v7?E????O^]?>?6??5?,n?????y?(a???Lh?-Evm?zO??%P=~????L4}O?'?#?E??_U?S?+???7sMr?????B???2
'??3@0?]?y?I?}?u?47?Vs?i??nM_?
??M?d?{?L	?5s{?}?-kZ?Kim-?kZ?J???kZ??????[Kim<?:?D>)???J?									?|T??W?^???`l????Y!
???u{???}2??|??@????u'	?/G?????L?D???'-?^????N5?
?z0???C*R?D?:
?%'Z??I?woU??n??atz??N?SN+9??rdE_.Qi????-Gz??d{?o1??E"?,?Y?f?icE?L-&?F??????~<xz?9?c,7?@?m?9*~??c??!??l?yx?k????G8??}:N?????2??W?q?:???ra.???@_`????[x??????}}m? ??G??t2:U??~??????????????????Yz??[???6f??|&???j?c?????=n????J]??S??Z????M???G?5??xqL??^^???tm????}?]??ez?&????|<;?2?[??C9?83?}?T?JUw??????r?4H0??????IT=?Ot?[?;W??:?\.v?{???m??????i	}_???Mx??;?Z??y$?
g?'?b~??7Y?(?m
(q?9??????_?;$??a???>5?|?????U?t?\???????"`r"",X??i[?N4y_'?B?5?36?"???i)A?z
?DH0???4vK?B?
?h?<????Z??wfb?K4????I??Y??????Hqm???A?k:e#?U/?1??{?9m??i???<??QEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE????^??SO??/?????d?w?Q?????N_/?????7ZjL_?mu???????s??[^-???????gJ9??f?4)??D?Y????+?d?}Y?????Jk?ZhEv8(??b???QA??k???G?M^??]???uZ???J????{???2??Ib[l????|/^??7?p?jm??l??M?b?i?B
???v`???g???:???N?h?9?Ln???*F!?????.>l????c????]?C???Gw????????6?6????p?T<???ru4?P?y??
???????s?z??'??t???Z8f?
s}0?`?*?i?)??3??;??;?z????????t'???w&??wJyjSY?`??????mc?2	3???n?yo???BC???????C??I?L?????&Nv?N|??&@????3B????Wv
??^???i?]"?????{??n??Z?}v8
????f_<??&?????!C??.W???!\r"Y?1???H???l?/P?Z???r?e?????U?????)??|k]^s;Y?l1-9??>?[????8?q)?R???&x?X????M????????Rxup?B?N??(??v?89O????3???#????Mi??^N8????????	c???BDc%wf
????
#???t??G?u?'*??2????B???mZ????V?+8q??
t?MT??1?k?sR?o????7??X???7Ow,?H?oA??o{o?\?I&
D@??;?tQE?2????eQE?u???:???CvK"???[Kim.??>??????k????n[~Y?-7??v_????m??DCsf??pm??x??ot?Bvo?????uDh??U?QEQEQEQE2sf???2???	19??>?&?@???d `3Dr??????}?S~??U??+H????J??-?6?????~	?????H???h ???mg?r?R?Hx??t=??7??"??.?!????eZ?#????n}?????9????f?%??Z?????
?P?K?i??5mZ??-8???58[?????f?q?o??{;?^?_4?{???~??????w?}M6t!0??N?)=.w?<&?Ik???Z?@?v?~Z:?A????q?0y??l ??o7IDp???<?~???zg\??u????A\?Y?.??=Oo???:BgV?1??!?G?U???;9?y?P(Zm??9ggp?|?O??o?o?`??7
-??S???'?+?jZ??)?????)???g??G????V??????s?]????F+??)??&??{Q?|??8?A6????_m?w?v?????"?_b??8?>W?1????zs??~?(??(?????o?{`??~?k??????????)??N??<????_-o??i?\a??W)
??????e
?@??D?C??????,????1u(,?1l????d)?? {MS?)????4?:??.?????wL??w,?{k??m?/??17DW????1???|???kk?0????SU?i???A?`?m??6Dn????L???B?1??????cK^??0???6??#u|???24|h"??hF????d?w%/??-?v~Zi??i??????Bv|???F?t??{??sK?8????]????D8?????3Z????l????/?!???{?T?Xr???Lw??????&S??o*
?k?D(w??????;'3?-'i'O????k?????'fo????Sp??dg&?y??l?????
7@?Niw?.?g??3E???^/^Yg??,?????-??m5Y???;???fe?'??=,?[L??L??_?=
???"??	
?X??K7?KY++q???????Z?k???V??m??E?????/???]??h?Z????v??W7???.U???:????a??&'?[z*????{?I$"z{????|?_?S?????a2??Bl??T??0Bww
??x?????_?e?X?e??.?@w?ZaoqL?????j???[??S??????.<@????h??Y??????{?u(?^?;??????<?:????r?n?_??[/?cL?????dY?$?E
????r5???????=b???????OG??K7?????22???,???Nt)????sIw`?c?????FfF?????o`?	X??????*?
????vr?????f??Ay??p???MSb?]]^?????5A^??*?qe?Z?`[??e????Yg?V?_K??????1??b?$??=?????jb????????C??"??$$(????(??(??(??"(???s??-2&f`?ea??3???M-???L?,????L$?N? `??4?z??a?1:?0Xq??#??u?_???b^?eaR?U??Q2?e?C??$???J?X*?<S?>89??(^;?5?1??P??|i?<{????X??	?I?o?$????v??a ?NX1??L??^??8?=?????????\A?????}MIa??????n?#Q?L??>?!n?????m?=??.???_?n;?x?jTS???O?T?????????s3?????i?/T?X^??^??%???w?????j4s?5?S7??|??_??>???w??j?-???\3?XL=uI???!w?_???%???o(?8????<Y_J??J|????>? ??^eZzH?i??U?c??_???~^Npdq???xES????e??f??us???V?Q??&?/???????Dz]?[[W?V?`??}-?r??w????td%4
???'????$L???X P? ?B=?????c?_Jd????Nw??????
?S?\tt???mU
?:?+?(?#???d???Yo???]??I5????eLm????#?m??os%O?p??o?M????????8JM???????m?K???B???U????]?7*??????*??{$??K?,??J?b???eZQ\R+???&?htq?y|???R?R?????/?JyNY?c??9_??2UWS?y?L0?q????Ol??S????k@?wp???6]???>?:?????t?fH??#PU>/???:???az?)?????>)>????r????Q?EQ??h?????????}?Q?H?#?l!]??V?)>?bG%?Z?${hP1??$??yr?B??k?-d?????????6?XU??Us???P?j?+ab;?p#??lfC-IW6?2~QQCZ?Nq????TRu?c???-??4??%>?????;???F??
??$e?c???????????[692t?;&?Q-
0???DH??#
???B(??bDB0b?p0????KaY*EUV?a?i?N?
?u?I??n??????Ws1]?,?\?a??????g??2?s?O?????i?)??????????8}?1d?_???XP??Vg?>n??z?1??:Q?Yb?||<Q,???;????????????9??\??7T??[S???,?t??????????????kZ????>?d??f???P???U?jC?j??^?nm9?SFF?T???(kG/h??I?I?a'y??,?????}??Tz??(_??=???~Elw_)_j?Lm?????"?H??>z*???ju????_j??|?])????nQ???:#T$f?e??~n???.w8??U?U??+???????w?dc?;mB???~O??&,Ms?	???????Z???m??0??<?y^?fw?[??????
4??ux?<??p;U???S?uT??t?p???V?=VF1??^???/Nki?
1??u?#??????kx?W?v?'??G?`?????~;j????|zo{??N????~D????)??_%f???4?~?o??]???{??w????yr??}q?3??w?t??\:????\7?????)?L?:^?)????w\c????:???s??-??N3??'??<4???o?-_?2?MM??Z>8d?8?b???Va?S??Z?9m??????i??????uGf#??????????nL?Y?????????????x???oGWg}F?????:F?*v?\"?e????@p0?*!????zz[X?
G????`?V?????Y???z???9???????O"A???1?Ci??????y$?o???`??W???/?d'?$??1????2?"?Xo???<|k?{???9?5>-?Sa???8??r0?W2????c??h??-?<B??'?????*?hd??~N?9??\???y7?Y.?????P?q????R?i_N!?1??}_???A??3???PR~?????2(=????p?Y?e??B?t?u?mq=?R?k??????mpW(8<2B??{mA?TU?1??.???????x[??nF?/??}?+?z??P????A??`1??C/7L?CH2?Ic!?P?*?ue? [??X\?CWHJP?c?rxv??J?>???k?~Z??L?dW>?Hz?!???A??,???????g????Y	M"!9L ?!/ ^]*?+?g??_?3UUgB???an??t?T?????S??)?????U?*?:?N??????:t$??J?????J?q
????c??N??s????4,?J??#?#p??z?? ?D?$???u?????&:?C;0A"y?????2
V??????\????N?.?>W??_5?kR?b?L-
GZ????0?UO??/?K???jby?S?H???X|??zX?GC???shGA?V????Td$%???r&0?*?? ?*?????6oj?`Ud$0z??@?[?o???????x?G?u
???????}5.????d$!?~?)?2
???*???C??`??,T??"???+	Tk(????O??I????b?-????:V*?????Uh?U]?u-W%?~O?t^#3?J?`??9?Y?k?K`???)`???UUV ?????uU?
??qj??m?8-hR????.]????}??O`tz*?5???=iJ?J??Qo[???e??[4?????)
Z???%%??@fR???!?Vq7?l?P?p??pP?*??&*?|?."\?BA?6lB?????%?L?@@??
-oQ??2u??N??}3??u???
?????|??5b?+?G?????W??:?^e+&wYfyu?n?CV???????p????~?c??"".`??8%?????)?gi?d ??|??5????g?b8??Pm??<?-??E????s??+'???J???y???L??.-?????l
?????2L?????<??????;$DJU?*";?+5??{??=??????????_?z????r+???c
?HH???'??2	?	????1????????hu?.@??????5o?????>?[ERuh??C#???????EUL?-x??L???z??ZT??w]@??r?5?h2?????f?	,t??Rc??P??2???F?????"*???a???Z??t?H??S?J+?C?????(q?@_?8??M?I???Hb???UQ]?c?I??`??!?????????
?Fcg????U
X*\?%???}?M???gD?I?(3??
? ?()L??Q????cN$\d?"?E*P??9?2???8B

?????C"f??????x???\?ZKP??"?"
?????T/?=?'l"??Wx1???e?????:????oN?v?(?t?I%{?hO?#??9iT?V?????MF?	????r~0?
?X??	?y?q??u??}7N!?? ???????l?????y ???yMYa????u????v?\????a?h`???????:?R???f??????1v?_`?3?I??,j4par????I?|???????=???)j?,????^?*?MH????R
?X2????
?
? j??Ri?3?}K?WH'???8?#?,F??F?C?2#?>?EW????1???4?#???*8z?#]??
??U???H*?b?GP?(!?HF?4??-?M??B??c!?k??Z5{??????$>x???1?^Y=??j6?v#????J?G?("G??^H??C
0k?{?5G???yX?Y?????W?*a"??]?/E???2	#"@????????????{_???}???7????)??????^?W.???+N??E?u?????p???
? ??:??<?gO???
?y??w??T?%*h????
?y)t/p?2????Pn??zs|??HcP??q?|	1?&?3??!??
5???@)?4???tl}??Au??dB???A??[?xS?.?'?+>?:M???F*s???F?/0?Y?sSe???=,??Y???C
G??uQ?D`?qL???XP????
?w?`??@F
??"? ????{?!??????y??????
@?<?B?B???&?????????hg??Wg?ai?=???Ua????????V??r??mw?????w?L/??4O??t?B}9?{??tu=???sb?????????gp??????C??J????>???S??~:?
? ????????'???@??o?8?b2t)?,?????????????X0>??k?@@?#?B?w?p?0/cP?K[???u?????o~?????
]wN:??C&???"]?,n??qaZ>???[b`?`h???????q?o?RL?v?Fv????^P^/???T^bEUd??????1????,F? G??u??J?:p41@?S
??Dv?e??y?.I??%???[??.a("[&s??~yk?zy??????_?z???|??7???A?n???q??N????^dw??R???_????P??|UP`???1?!?C2?????CN^r??????`??Tt|??5	???F7)????????D}0J?Q?n?S???????%(r??[?p???Eb?q??v?q??_?Y?o?S?)
?_o>?9G???.x??b??1?H"
?e#??t??T??Ce?u\M;{??s?'m??W???Q???J??}??N/G+S)DL??0?$p?j?????n_D$?f??????3tA]}???x	??H????????H??J??%??>RQ??Tk???????c??(^f????
H???"????_??r???f????y??C??3~?.4??c(????\.????5???;???Z?#????)?????/?P?,???!?e????n???W??Dp;????h?@P???8????{???????`?u??M<??.?XKQq%?|?Co???^?,???t?:1???S7Sw??j?????T?1
??@.??@???? ?(z???T??{h\O????L?@?a$?2H?
?d?j?????d??&*?????r?01O?	FD????????k=??V?k??$??;??
??N[2????d5\?_????oB?k???`????<[L?!??,??)??"}?K?>I??v????38I/O?????>??:?s????9???S?v????T?????????R??????t=??=?,?C????N???*l??8ot\??)aE?rO$??)ad?Bi%??K???d!??Q?k??U?~ ???3? ?T??RqI??????UD??*'z_?C??;??5?N?x?>?'c?QUNY?cEU???x?????????7?^???d???????NP??2=??A+U?J?u????9????{?8|=???a?V??cV?&????-??^?????#*??????8???#_=]??:?W????x9???o??S?s??X???!?????H???&?`
N??=?M?pE?z??~G??nd????x??CO?0??8?=
?
U??j?rD?}?$?za?I???i?b???hI?J?????k`???>
U???6c%?]
??Qs?z?J??J?\L?t????s?K\1?N??*??M????"<??))h?7\x?9??k
?q?h?]S?X kE???/????8???6?I2I!S?bI??tn?^>?[??P???????2k??1?VUxRQ??s?sDI???"Hi
C????#?-t?'q???"?T????c8T.'a?Z??l??3?g????????????U?RG????*8??m???
???}?????A???????3????>?.?A?R
H?Q0=i???1??S0?&???;????????6/?{???2tq??&0?p`?d???{
?*?"?a?????????
Ba???}G??l?BE5?"o????i??4?Dd1?s!
??F?????,]?L????iHu=????O?Dp?iv??'<9|$?i8?Z?E?%C?{OS?j?]&?mq??????i??	@BF?b?@?f>dy?P}@sb???h*?{p??????U<
??4csFv????A?]?m|O??O at a?J?j*?&?]?l7.???F?u??N?eb?/9?f??r)S???n	?Rb0?)?v?I?H????%????M?H?4t????0?????
5????\?=??K/\P????b??!ceH?h?1?U;??5?1??a4????q
[...1780 lines suppressed...]
?4:r
??????????`??K?>?>???????D??C
F????????????g&??c7}?????G????}w?l??_??????)??J?Z*oR<?<?A?nl????-6???Qj??D???E[E?G???=?~l?E??`?as?S'??%L?~??Kk???f??O?D?L?J?????T??d???????EJf????
??????{L???ZM?~??????b??????T???Ph?{$9???B%?Mv
??($XY
??BY?;g,
?m?%??P8?4?????xo?m??(Q-s:6?`?X?
v????Jk?R?,???|4
h(?
V???"4m?>?6M???K	E?????{?????E???m????
?d?'?i??????]??u????????}S-??t?-*B???[nZ?c??m?25aM??J?J?(h)????&K?]?tul~????Q????	)T?:6n?%B?
TD?
d1???X?y???'?1???2t????5!p??b??Q???'??????
P 
{j,!?P?N?7WK.??l^#?A??}?5='4??S??z?k??2ld?N???zk?	E\.)?f?R???IQj???????"l?a??????'??A
t6?
?????4zN???lX????r+U?H~?4K??j!K?d??I	f????}M????-?-?,V???	???<?1|R<?
???"@??U?d"??a???{?)?,??_6
2?D)??4?Jgyd?;C?????o???2T[2?P^????
&='xi????n??	??Q2????d??3?x#??JF??A?,0JFRX????2i?I!?Kp?b???????x=h?<???x	
?s?.????Y?{n??o?Ct?i?a?????"*:Kl=?Rz??"?je???%dr?aM:?C$?)57?
?%?*h?U?P?,e????_??{????'|Q??Hy??`R1?????i?(h?N??????GC,??DL`???:?_f?????-COI?q?e??m?
?]ua???????"?
?B2??u???????		=X?s
??(f??????? ?C?70????v"??a??Le%b?@??KAbn?d?Ox~??h0?R?)????
???(?0?S?9l????o!}??
*R?+??5,cNl??????e????&?HY??3???M?%21$?`'=?1	? ??#?o
?SE?]X4??6H?ad#???$?!?J??H????FL5??+?&?IU?A????]A0??e??q3??D-?Z?E}???????s????????c]??????>?O?5??!??{???v[???D?tO?j?&0??ZZI+gY???l????6Cx???Y	>Dp????IT??6???k<G???C???
????(??
?K!d???j??2???c???H?;?<?=????JI??(>^????????N?*7d??n?h+
%?0??CE??e?`xGM??
e?,?\???n|?/mhQ?x??'@"???l??????c??~ZKO??~(??0????p?Tbcc>???u>??r'?
D?|?????\_v'???7??Y?????R*?????~??Q????????j???P?31^?o?:^??? 85??M(???h???[bc????B????*?K,????"A???
o???2?Z??????Y?;??Y;,?-?????R????De??r
???~s??x??$??AM[??^;??/?1?!OS?Uep2C?X?1?Q?????.F\?c)?????$L?V??	B????w?D??h<a?:Z??q?h?LQ)	??7t6?:?
?!?o?? ????P`1?K?3?;R8?s?w???
?IRRW??*?tt??7?????L?. ??(R??.b??w???@??PF?j
H:?7BtBhL????c
?9?	???wgPZ'H???'?lz???7?~???a????hh($?1?????????b0b?}??"?x?'?cy??S???;S?@?RyU,,?uq?C
???%{~cN??h?'?TJ?>I?-???N??ZN\?????????I?C??G??(?!|=???%@?4?B$O???3?D?SR???&???o???oS?M??m?3?
??9rV?@n??U???	?,??????%????(t@?N??	-*???>????????nC1R???u'??)???L??^H???A????^X????D*???h???N???k5????P\???$?+?w?D???e???k???0C/??E?8h???7Aj?q	?c
$I??a?dK??F????:??i??av??r%p?????f?7?UI]?~L?)P????{}?+1?2????#??M;xpk?a/?u@q	????????%Rh??>~zb??s4-,?{db?A???$!6???????\8i????h?K?,O?????
X?+?646??4?1.u{??|?P4A???B?)M?6??5???"$?
???T6v????`?D????~?&9L????8#K:;??{4
?(5????y?"????T!?w?]p???4??T???\?????e$M8`??(H?"??B?&?\??X<?????#?2?RB
?6???
?JhZ????YK?t???p??/&a-?A?0????I$?v1H????@(Pa+i?&??0??$?+	IR??N??$???'F?G?Ma??D?*??/???c?]?KQ	???qKQ?f????u?6??at^??H??>?AV???1???U???>_?]???f???*????vC}?h??3????d!h??CI?9?+?????)A?"&?AWT0???????v???????7lG?????9
??I?"?<?x5?

h%bI??????=`???	L.C<n????#?(T?K???	??SBHA A0@???/"????4[IL?m?F?
??f????vtGE;?o?m?`.3#A??NH??l?{dp???;h0???d?D??
?]?4EKK$????(kb??f???4??h"WdsK??C??????]???!?#}??F
??^^????^???d???f?
`OI?)??N???U??,apP@?????X?'?&d?ER??????)???????x?%????IV?8??u?g?? ?????k|	?
?r??5C????#~?x<t?(?{?8???=?M-?	????~????x?O(??9??B?Q1?^?eM
?9??!?C?i?*X????I?im*\?
iDA?wk??	?????Tt????m_?T&?+"J?xS???`??X`#??*??p?g	"?PL?Y-??T^x??~?qHa????J??R5?Z??/K??Ix?_>???Jn???@3y??@??:?c}??gTm?L?f????.Mn???#m%?$[F_:???4?A??` lP?c
&?%g?"?(??J??????8ZG#<-?-??s?!??????????0??8?????U?????\???(?T?9\@C???rGH?-?p?d:?snu?V????d?:?DB2?u???l
b??i??}o????`3?{?&???VS1????^??a=???,
`n\Z#SU???=9?R?=/~???;?#??e???)???A?r8s???3^?EuqNs???*?4????6?K%???=????.E?P$8D????????N(?|
?2?$f??V???PmH??F?gZ!Er
?mS?{X?9g+v?l???6???rY???????-b`?{??
??G????QUAb??\B<J
8?????I???
??HKF?fE???&??]y??eL%?$i?
jR????????4S
?e8l??~^???{???U at 0???(?(?????d??`?,^mL>-TO.?x??+	??p,
?HI)?ct???e+YN???da???a?$???.X??FJ???#[*W$;6b???1???w??i]FU?3?[??????gK????|f?<N???t?;|:%z?^??x?????+?
?Q?6v4?o???,?:R?X?G+,?h??0?e?4f??'U???(TZG]?N??0
?u??+(?b;?pa???D??4????B?CJA????%?B???+ISj???i??:f?<?????K<?V"]t?4??FY?????1??HNJ???P?c?I"?xDc?????5??Gg1???xpO'?	?5??Frg(B??pc????8L???5??p???xv?d?5???t3?<v?????3!
?b??KX?4aTD
r???????S?"C?RC]R
????1??G??s?A????f?8?Ic*$??dHU???gy?1o?r?"54??5?Jr?8?-	?lX?????f?p?[??>,?Kv??@?????? x?12Pb?(?h???`Z`?
???1?
AK?_p;?x_^?!b??1??(<	?h*??	?;
5Qb???b\? ??E??He5???V?????J?f?+m????????Z?!&???
??I/,Q????Ui????o`ov??6{??Rk,???M?U$??U%???z6X??;7????J+Y2?L?(U?H
IdD???aO???]??0??\?R}????????~s??#4	_J	?b*~L"H}&?0??????]??l??A??G ??d4????????)??Z$
"XkC?	6?F??K3????jo8I!("??Q%s??E?\?4$Y?"????????"??????N??_1?ldY	??;k:?p???$??H??oR?\????{Y??S?jp?Q????8`???>???????D=?gd??kT????`x+^?D>?*(P
{?l??,
?mm?????h??H??t??nk???<M"?,?#/@?x(?R?Y?Q???tl}L???#mu5?PT?$UY	])?d at 8?
j?>6?I?0?$?I?t/???%E
1???T/??o?8?Q??d?}?(B?B???????????JF??yX8??b!t???Cp;t?g???:????B:?7?????3/??k????6k????5%?????g??????0?
???i??1?-
????>?i^??9?x\?F?
??R0?$l?!v?5?5?????a??.??>???????^??
??lDJ1naH`y??~?l?1??LBD?%A??B?.?r?1?3?%&*h%?(??w????M
#????b??p??N^5?W
[Z??Z???Vc&?%??]*?{!
???;?L????C?S=?
L?V?????T9?????{:A??V??e??(5Y??cF?>^??l?S7?BJZ#?q??????Y{kh??2NE?F??Cx,?????j?)
??%MP[
???W!?a?A?X?X?0???U)??'W1?"??wI?h??R?H??????Q???y$Q???4????AU?i?7???I????h?T??w~W???d????{a?9?i,?????E?wQfH????"? H?????6d&<????F|???[=~?m?<?z?'1?Akd/????RL??:0P?????F
P*1?C??
?tS????
j??v=?V
k	?"C??1?@? 1
??@??j?m?q0~???a?A?????W
?Z??	;?$t???;-?C???R??Mh?^??=?????k?g?~?<:?????
?U?d?2?b=k???T?au???.~)?]h|??V?@??G?c?-%?-$?v??c?t?n??????h??????%-????????D?$:?(??????1?;sO<+M?i?vVB??
?Ve??c?Q?w?F?_?L?????jC?M^????m??I?E??xV?x?<?[(^
C?6???d??1:q?V?0m??U&???a?T???H?i<?.?I?d,??B$ ??+"?F	?I?]o????gb?B????1?S?O?k{????a"!????D?%!??mMV??????k??$=??#?d??:cA??,?)6,??z?n"5??Q??o0??0?,?C2Vg??U?O?N#j? ??????b?$1?????????I,?,?3??i???pT*R? ????!?D5;L?z??z??C?B?2u???E?Z?)?`<???
???g???|?$O|?R?HJ?%??????X?ZiZ$J???D
?~?
?'??'H???{?&??
???M(?hX???????R-R?V?B?*C?
(???i?b-w?5?d?Sa?????q?w9???????????PJ????YC0??5?(??m4??b4?????r_/3??\Mo???????l??n?A/
?$?!~?'?P??d	??e???-????Z??????+R-i?ke)X??4DM5??$??!$?D????Co??>???_;H?f??Z5?U,???????? ????
?#??!???U?8??!?'?6MrvG?????:f?"
<[B?A????????d???1?W???0?|?x???????,=?7?"*?)?(j??H?Q< ?z.41U???]?Tr<?|?4>????t??+??????Q?:??9??Uio4??5t?n?%?
0?3??6??%?RCh
M??4?????oM??3?$PL???Mh.??????"<?;????	!?#?JU(?qPg=d at r???a?\??G1?=,?Ia	?????\?4?:?!???_H??D????_?[????)L6R??lvA??F?J+?`t??J?<???`?C????iJC?2?4?*6?v;@m4???QY?,?`?x?vEa???m????8}?tV"???q?Z??@eqZ	????
8X at b?44G?1*X??\7???:u~??????;?K;??#??E!?i`?%???-?W??O??,??o?I?S5??{L
Z??>?Z?na?~Xx#?zeW?e-????;`?j???#Q????JG??????#??)$???????)hX???H?3???B????B????lY?6??Ur?i?4r?????HB?$???????-O??l???E+?a?N?i?*0~?k??=??
z??G???@??}?@???B??????E<??h
"|?	?(?l???&a1?5R??@?f
4?$????m?%????JRt???+???tC?;???P?"????	?;??
???(???7%-?????f:?????E????.*g3.?u???P
5o? ?Kk?????Wy???Y???[??
?L4*I#Ddq???????D?Jy????h?I??=?R5-???n?y???,?3|lL?N?@??R??/??T?)?K?x.????<???4?yT-??8C?a+MU h}??~???ps8
?D"R'?,?s???Y1k"??2M?
Rm???i?!??%0[???T?Y
?D

9y??cLliBc!?9?	A,,??<m1'm$a??%???I???N?X|???d?E*E"?X???mT??"???Giv?"8?h;9????s8???yZr?gK???"?QF?$$????2?;?:??a+J?0??? 6?BVMCQ???\Zs????S?Gb????M?8????????z?"??x????????n?WXn????L?H?d6X*???????i?R??1'T?B=??,??V%*R???N?g9i$0??R?,+??]?A??L<??w???????BvG?D4?n???N?N?FB?	>?????DZ?r?3??'3?E??u??k?*??????
m?+?I7?VZ?Hm1?~?K??w???vZ?#B)??1@??Y???[76?b???c???HE	?ab?sQ??{1V$9
?L5?
Zy
??&??M?
??3????:??I!?u????e????l?m;?M????)?S
?w??Y0&?v?l??% ???s????5EQ??H??eE?h	
:gg??&??5?o?7??q4l?N????2H]Q?~????"?"?8"???PM	?/B
???l"<?B?x??_???|?2.?s??t?P???n??D????WG?U?O??G??`$?^????????K>],1AUE$#????4?pd8???|}K?P?"?????&c~?o?!2p?@t&`????>????Y
Kh?)@??J?^???|??$?!Pk2??g?&?O??0C]???(?{?
=?=?/PA???}Q?4?????<0
?T?`h?	???Q??Eg??n4L?? ?|?O4?????,00I?3$n&H
9?	?B?r?r??????'?%aI0?GtBJh5?4????=[??,?h????i?[Y??I????R???@??J??L?A???Ph?
*h?i'?14"?0*?e?B-?0?2&??L
 ??3,?Y?'???zs'=y????fCR?`?B?`Q?U
}6I?3????	Wa?.)?Hx?????
????4?TP?
8B???aR???r?AC?*?T????6??9?YA)??Q??dA??s?>????6jn
$?E?,???[T?,?E???%?QM??
????y????]????????^1aw{"?(D???P?IBU'?'???|A?}?j?Ol]@? ?(F$?J
`???-?????????@??????t??$}???%???8Tl@?7+????}q}??S?JN????9Ro????~?>???GO?>??i?glb?d??)lB?X?
?Z?Kh??!)??Zy??;uUU?Q4?a /???w???m??c1v???e?X?0m?6?~??s?m??i??[????????????P?I??????
S
"<???0M@???,?:??$?%??y?????(???????Hq??d1M???@l>w?? ??d?m>c
YA????5H?F???o?\??V?>t???a'??IDa?!2ZX?????1CG????L??6???e????6,??)
X<W?????
f?
I"?????????:$?? ??	bJ?6V3??QQl?f????mYb?hn?????[Z1Dj
???2????89??($GR?CB-66?*?m?t?????P>?????$??n?#???ViJ??6Sr?X??"??O?
?????
P???G?y??Z?%6?RH????(ZT??|?>zr?<??sOmTVSI????SV??X?ZZ??j???KQU????H0bD??`PX?`?Z?????"???i
?
?G'???F?M?<???n??????}?q?CA?2S?J@?$?rz??x?e???A?c?>?'?=
?!??????#8?????$V?<!2
?y?????
SO???xp???????{?6>??nk??6???g[q??Q??/?c??tO6????u?????X?B??$?I3:????;?qtk:!EZ9?2Q??o?0???(???V?%$T?@??Q.?d0?``#?0??<???????k????\

S]?S~/x?#mgT
??A #?e?[X???`x?J?????Gp??????(?	????????}?M"?E)??r=??Q??
?I?*?lO$~Y??yy?????
f0!o???3??t?>?[s??8E??<n????1#??*[V???}v??c?????hsF?!??i????-[c??l8?:F?????7l???l?????kf??Z?C#,?????,?-??i?
?f?????,
???M??"2???F62#j"??????e*?
????50S???$Go??N?PK
??I?#?bj??????9^?)??r??l?3???|C????)??lk?h???e??~?3?sSm?M??4?????X???d???e]?4(V/?W?????0?@0?#??#?T>(??q?Y?5_o??<?>?I_????MU?"??H?????{?@?G?{?	??UUB?=????????2=k??"'?Jb2H????g??7E??\?J?{+=???<i???)S?????X???{????X?y?9KV?????????k
X5?Y????1q?!B??k%????~e
?|?Q???TaF??
'?iU?Y3??x?X\gq???i.?0?zSN??y??n???jx????U?D???9 at n ????-??)???T
j <??#?G?4.??-??>??<?A???[??YDY#d?vA??J?0:Djr??0?!?9?$??????t?]$????\#.X5J#??d^
??c@$??.5v;?P18
R?mlPR^???9??C?-??X*Q???D??(?(?"?"?TQ$Qq?????o??V~&s?{?$?w????h!??	sy??#??t?#U8???????L\=M???????O????V?f?q??X0`??b?,?YUW??>?m?1?;???????_k?HI`F$$??W"??I????0????tDH?c$???8?|????Pn+?]`?M?@?V???
/?
}Z&?;?????b??D1????BuOQ??????.U??X??wF'??????2!??$?BR??*??????~]????Mf?([b-%j?m?e??
??????[%??)?3&?Em4eeSSTEl???%%??VV?IX?-??kT?R)?????H??5mF??i?IcV,?km??????H?RLD?MD?1[j?b????????V?(???KJQ?q!?-NC??pS?u??o!=???6C??=?FbH??de ????Bw:??_tf??U@?j???'g??'?[??'?,???????????]?g?{?P????u?f?mU???M?Z56??J?f?$?Z???j?2?6Dn]??KlF?-?:???&?M[fZ??kY?Bl?d?jb<N?h?D?*)r&1&?n<??y?h?}???0#Hd^???
?? ?C?rAJt4????0?a?\??O??6X?????4?Y?mg:MD?6?/?G????>bM??QMQ???u?yc
?@VA
  ?^?????1@X?d????jC? ??????=VH???E???`SIV
KSN?n?rc:???f???K????????<_?$DXEPy??????N????;??QFDD????????G?G^@g?=9??9???Z8?? Jl?o#`a?Y???????????NR9????ad?P; *?$?????9?$??Z??????K?@\g??l8???B???'?qat??7?A6??o
MObcb(??I?????E`a?cd?@??W'?6iA???`T??n????E??3???)??@_*??U(?B
@UOo??rX&?~??8a
	d8?K?O??Bg?<?R??QJ%???4???R?u??c??e??ao
?????gvtL??(????&??0?????B?j*-K
'???M>?a??k??m???
fD???RV?DW&??? ??@??\a0n??
"kM??CO?
DR?B??p?????D????	B?*????m?l??????"$??e!w?	H?
9?F#<????$|??"N9$&P???
?b?mI?D?SG?:?EY>,??	6??hd|?w?.??Y#B?l???"?Q?G?1?
?u?dH???????~?}?? ??Y????b?;???H?-?;y?b?n?T8N??_d5?????{|?gs?cl?????\#????965*??c[o?e?t?DJ????R?I?4?'?H??}`B??>?6?VH?3????4?\????yi	???&??k
V:@??????uk?Sd????t??4???J?z?T??? 	AL??v????O|?wG???M??)????????M-?LN,?.IN?????2?M??UfI??R?O-??(??]L??p????? ry
????)??Z?i??M????S????bL%???%]"??_???h?BUG$+??????I8?@?2DT??y????P?=??????(??h??()?K??A???{8?=??*S:DX????Oa
?K ????=??6_?0f+??|!??"??~d.8T	F?/_????????AC??&ILP???I????y??p??????P[q?????????Q??IM??P????&?????pe?? ?__???M?? ???F?a?o???wB?A?jJ??Zy?????????f?Ye?6????2???????CSG at l??/G?$????
$"O???c?i?^??[Yn?????7?UU$3-M??F?$??X?@?G(??S6?
????My??M??dF?T?A?c"l0????|???x?gI?|Y????y4????F????$??J?,{`EN
N?%?]??N??<??_m?5?8? x?7??o;x??Y?L???*?Q???????;0?#???????<??????"5??-QI$??.?MI????????'?????????R?(??I???m?<Ux????t?????
a??????T3???????H?d%?o??|?????????|/IX???????Y??Ve?m??J?iAd?q???Q??h???????>K
z?#Nc????
??BpAt??`x??GU=4*?BX!??_??????
???f?k-?o??{b???J????py??M???U??D??m???-?TSC?'rtX???)???1?b????l`??m??%???y???I)U?z????????ac?iLS&g?D?dR,V??`?U??.XnTpQ9X???m???i?m??{???m?
&??L?
??3??g1yM????f????^F?ccfc5??=?L?????????i????k??%????????#????L=Vs????????q?????hP???????i2I<?????{M
?KAb?
??@?Z????)?()
*?E?1To?	????\K???E??????l????'????/???0?r??|?~B?EB????Y???us
??NG????+??<"????w?Mdjb??$?????
??b`I/?'wm)????#?????W
9(??????b?Rb?
?<8:i&oH????E(?K??Iu???	????
???!R7?_,?h'G?????????l=R?m?????%?zE?%???st??w???Y??N
?@????=^<??A?@?0???z?>!?6?)z??
JU???$J?#%B??!e??A???K
???????x/J??%	C??1jb???z???
?B?????????=????o??[?O?@?'??H@??x?X???S$?y????(??????UF?Z?.???A?^f???]Q????UTR\???/t???v?`???u?-
???:?Uu"????h<?=zA??h?(?Pa?L?bR???@Hf+Ul-???a????????????T?-(b?b&?I`_??\a5??4-|??}'???O?????L????1??9%???i?2jUl??!#&?a??[B??t/??@R?p?????xf	I?s?z?<s?=7o^_????X
1t???@?)
??}??>
?[??1???HmYf??b???-
??(A!
H)'??RN??[&F??1*jf?[?v?????m??R?d??i?oQ?"Z????????H?'?A$?K
A%??
?#=.?M??v???????M???q????.????u?	?sZ?i-??+%g?qe???Y?????s??U?5?Yf?m&f????&tu?n?t?kk6-2??[v[??8??????

?Y?
|o??;V??????? md@?lo>m?xy7?o?PL?Rl,?*%????I???e
??
??4??X???|????Vy$0$??fE%<! ??``Mg?Y?Bhp?8??4? ??z2?,"?P0??'c%E0?L3 B??;?He?M
y???
a?bi-?	*?>?
?(k??%	?>?8??5
G??)?@D.$?)>T??cu?_%t -?ahPA)[BzvXt\?1???,??I??????????<?aaG????x?[!0{ G:?,????B?6?"?LC??=C?IH>4@?B??D?Asm?z?D<?@?JH?Q??A?[JGR??n?O??M???Mh??e+?B?1?R	
'?_	???l??c)D?Bz?????????,?@????l?H?# ??Gf
?q?+)??
KaH?:x?o?-??i(3h>?8<IQ?????^*P?Jd?,.?h?
??7?1??v??y????I?????,(??c????cf????CU?D-???p_??A?ycYV??b?3????c	?D???W????+"?*???dz???%
@??N?
	A???cL?P?'Jy?Z ???3{{?IIE?'BC?Y??:}=???0????G?H???\?1[?T??D???4`??R~0?CBP?H?[%??p??LA?AJ???@?Ci??????6N:?+??,?
d??JH8??F?????????Zd8?s????|b?e?6?%)xQ
??2?G*?0 ??T??? ??????X$LHAt?.?4???q??X???8?x>??6??v?????????????"?M?bB??????aWkOez	????yT?????I?
D~p?????B?!????e????p?vS???"??????d50+??bB(?sCIG???)5??0?FF?N??W$Q?h4?H????0?0L????b$????'k1qx?I*?p
?R?W???$??RF?2M*??I?\?2%????T???f1
k)?\7?`????v!?F
?????R0)R%$\b ??P:??E
???Jix??????D?
?3?
?"R?7?????7?????z??r?$??G'???????O?-?-??A?Ds?>?bv;?????B?????????=???^0PB?
???I?D-???h????>G??O????#??RR?????8<??%???
?q?UUj?(C?A?.???_??)?xp??8?}??????Xn@??eUa*?e
?_p??????Nt
?s?}X)??\|?|???|(?R
~&????6"?0???v<g?J??B??????[V?2Ii?&?5??2?2?E?;M5MC?A???6?????S?}7?].L????n??;&???J-UD<b$~Rn???q?	??c#???`YH??/y???x?v?'?o ???\???HF?5?d3	0?
?6??????????H????6???7??<??$?2?+hZ???2?dld?*? h??l?????!ZJ
d???eAJ?w???,???E??L????T?J?i?????????<DQl??J??;76&???F2??u???$`/????????0?
D??!?l???b
?J??A?Is????p??F?g??~R`?#t??I???jMT?W????U????w~???g?-?????'?(??g?????#5??7YK>6
????5MX??T#??E?T?<D??i??"&?*
k??~????z?R?i.????TJ$?$(07???"?????D???}?
Y#Q>]??#!
???+f??l??8!I5[k,???d???^=???j?dV?DM?D??vn?4?}H????`???N&6D C??????DTP?DM ?B????>??????8?jj?M??[?YIc?=6{???vM"?A???p??4nIIT?C??G,??);#??Mc*???bd???B?@?NWnT?vZ??`x?%?????4Y7??7?c??r??qf ??
??PQ?2?;n??9g6W????g??3?b#???qj???D??)A8?M?:?r
~N?x?H??g@e??Z?p?0??n????E?I??5??!?p)R????bH???^:?,`??%??a-??(M-????h??????K\?#2?`???H?IT????oH?d??4hMVib?Ax???r]?b
"??I??J??0?f?g???M?
?!BKX?????????(?w????|?.
X0?T???w?7???T??X?c?dt/2?'!???L?P?????]?fN??I????2<??G?g?hP???)c?F9Z?K?????4T??v??	?%?0
?h??????
?0?]?d?6?Z(+??rS at Fq??m?-???x??bLE?@?-??nr ?WsG?
W|??o??O?n6?1?[(?z????s?b?$
???,?B???????#m6???C",????q?????n?yw,?T?+$?O?(&-??e?4d??TfGfq?6dS(?;?:I^\XU?7???
???3???J?[R?????'H?Nr??1?G??????[K???h??2Y&??5[X?	?7??????j??i??????????q?A?
?=F^ ??D?u??p?G?I??
{?/??Y?Y????	??[o\D??cW???UB=2dy?}	???!CP?IA?M?h?Qm?-"??????L??Z?M?5?gsg-??????^?Ny???d$;???y????X?????<??CaOm-??N???)?o??Oq???'?=!?????di?X??b???5??9?i?i?!?g??o???<bW??>Q&
??(F(?<N???P?????I?&?*??
??l?M>?g?y?+T?~}m???1??????!?R?bKCX?zx?m?WP?Y?E??JE$D????E??
???Oxn(Gp)V	?QX?#?d?C?-????(???n-?H0?VVg?{??Yu?
?6?M?[?|?SZ???M?I?N?`lm
??????EV????5?fI??k?I?(?????dG?TP?h??'-??
3?@
?,Gy??{=??U'?hv????g??)?kn?=?fte9y??*h at t?_?C???a?4B+?
"?PH???V???x?e_v????VM?1Y?S?AT??L+~m???~s??G?u???S?D?d???4G!??[_???m?z???|??????*??u?-l??G?D?EpyA???j|q at x?$?$%??Pv`B.???9<?F???,P????
????&E???a???v???+?VmX?
G????e?M??m?h?|?|????el????4??a????A???&?FT?;_?????Ac??D
eY"?????(K?\m?M?c!?cR?2alE??w?[?k??4d:???;GJ-?ZF5(
?? ??AC^?iaI^??@p?
?*$??p????u
z???r??M??=??2???|???-?@?$y~.??Xt4I???????????R??R?,????????u?c??G?eu???y???m????;?SDs??T?????eHXH?)jy???Z????qI-4?dJrI??+??]?L??????5????(H?o??|S????<N??0`?)???6?X0??c?2	'?bJ
G9?4?+mo?Wl???h??),?kG????=??|?q?N,??t?FR??M?P?n?u????v*???,??????d!?_??2f??y??N?}?????kkZ??BD at -?C???????>??Q
`_?6e
???H??
??Nh?RF2l?b??d~???	y???I8H?????n#??0??????I??}?2z}?????_M??

(ZY?'???????Q?,W?3??W?0?&A????????
????O????B|j?
?T}???q?d?[%?m??7?$?????*([n??I??l????%??I??:??M6&f??DZ2???9????0QH?H$????Ib?,YeX??	?X?)m[V?C|??C?
?4N?:?/?????{>?EA?
??i???b???}I
sS?key????2??y?K$Nm?6?n,s????Y????&?;
??m???????Y?(??????|??`s?M??Z??N6~??*?
???q?T???????*KJa9?0???`?A??????L0d?Q???$???f??O??B????A	wJpC$??X??????????G?[#??!?w??Iu?^w???\x????
L??6??44?+??=?l?????{d????K'?"??t??k	?|Y2?#%+?-?????????^Tu?`Aa?{Q??|?????z?=?ig}??(<??fy%????I$????mU??'??????RPRz0?????s??X[?????1C??X?>?@?E???O>
M?o??C?^???#??P'?????3Cm?D.o??????????C???v
p#??????3??3??????N??
D??????-L?6>?6??$m?s*?$}v,?,??)a??q?????Y]d??????<
??I2?A?D ?A:?%????
`?#?"FR?`?YDi?,
AR?CJ??.?()$XJM???i?mX?2???????T????"?PK?d???aE`?B(?
Z?M?
5t??AN??k{b7?m?,??khE??h?Z3??V+)D??L?
??L?n??n????s???h[:/?8{[v?X?!ey?W???)??Ef???Ft"?EkU?????c?3?,!c???t??`l?
?!?,%H?X??(???	?b??6?;z%???"?"??????3?Oc??jv?h???kB?1??>?J???9??p??`?
?(k???&'??<H0??(Mo??\tY2[3??X D?(?0Q???H?B????(?bf@??Ci?=????=??2?????*9F???V?n?v?E????Ua[m?YM?Fy??q??????['??xu???f?f??Z???b1bL?d??'???XPk*J?????8?+!??,"	??g??!??J????e?6u?t?sg??;???s?X?`0?E??4TR(?a?h?&???$??????i??Q??*(?:
???GEAL??)0??X??&????h:-??7??a?PB???H??)`&??mfI?y??U?6??
?s?_????[My&???1d%?X?Z?e??E?!DQ
?????3)XE?Ze???n?{?T<mf?h?o?4??	?j?U??w???S???~?_Y
&??t"N,???>?A???N$4r??j??GVa?*|???X??????t???????n???d??????R?%?HD?H?W?(F???v?,Nr??w??H9o???V?i??b??U,K&??????F??????8????"???|??Mt?TiD$Y???@
w*$?;???o?)C?<???l???neC(RW?B?=?????6??d???5??}?8????]??r??*!D???E???$WAK??I*??]?"???2?d?H?Sd?Q????k?+???p??[
????&?t???q??/X?EI???R??KR???c?????????c??PF?1??	?Fy??JStG?
Jz:0?h?L??-?5???U?x	U'?Ej???(w
i?@R?H3??	?)??8y2? E+????
!@?nC?????}\??9*??b??????????A??nID0>KP at +?????E?KO??~?<???e????X?f?D????????b?C??>?G:?'0"7?	??`?k??/y??g?F??????v	?`???\v$S5b???C?X-??B5C?B	??	???EE????B2$&m-?U?d??V????j??(7??nm??2}h}Pc?C?c???????{ ??$?0?<?>?C??7?;?y$?????'H|??C?????z|???=??j*??T?'?j??
??????h' ?a
.F*?	T?'?dj???X??qc?zR??P??R??v'???w?b7??\?M??D?65"F
5 ???$%??Y at BP(???Yn?MM?6?B?-?i?<?qy??r?
#??>D0?hy?b??D"h???#j?#?+?@`?P?H?	"%??h?&?3??v???F?K?V ?3d?xM?D?R?????=???????Pz5+n?
?4?#Fn$@??2qI?????h;(??}*F??V?????5???)?Q??#??HI?
?4i(4??M???{?d???	"k&D[??MYAkV???o]'?4?o?!?sl????~sVqJ`?a?B?K?5????+????$??!?	?cF?L6???CV?b????OF???x???????xJ????X???q???+??
,dPPbgq<??~'????*?K#*	9?j~O?Re?S??????F???????x at h=^??V??~~~???p?k?(`Bk?N????:N???????????Y?Q?????c=???M??????'q?????????w>?NT?&
3(?&????=? 4?D??`lZ?]??Z@?!?^?NG-??9?!^?o0?"H?tN)R?2v#?????Nu??4??3y?????g????=????????^??@?j??"??i?\???H?tB??}??\???s??p??F;\???2+Y???=?m?KB?Y????Z?p??$?*Z???X:V??o?.c"c!F???h??	?h/?^?#A??85???|?(!?"???,Q?=M??)?0??5?iS?2{?BzlF????2v=?L%F????x =RB??1??:?%??0??K??o"?}=
}O??k???A??????0Q???`s]???2??z??#?-??d????????:I??K[|?<???e?:?q*???r?W??K???r?0????s?
P????v
x???aO?0l?k?n???%?d?o?>o??_X?:\z?#+33???ar??????????????l*?#?I?????xK?y;???=3??N??\?}|???????>??5F$m??,04?1 at D?T????
????_u????o;?r?u?????
?%?????'u0E|?Y?;B3;	?\B??z?V2???cm3?1t????s????;?`?????@?w':?lN:R?,\??qj<??+`S???H@???/;H??Z?(9??t??jO
?
????????)I?????a???^?Hp^\???I?R?R?b?e}??11,?*
?@?=??t?h'??v?q????T?9?J?e??^??__,?pJ???	?A*?+4V??"???G5??????-??cR?#?~=?g?;?R[MT???0`??U???;f)??????B?DD?cQc???,??8??pAX??????e?????W??
^?yx*?a???Q?K%???q?6????`?ouhcm0?}:Uy@??WH
?VY?on ???
;S?,??MR%?2?N%??<R???(N)y??ddd9s??;$??fHoH???Q?????g????&]1m????J?2K?S?]?N????g? ?????
?lA??U8
????7?<???8f??<zy????~?:?k?????????&?{??Z?,?H?|!?j??_>=3??o{?
^L?u????Q}0E$??P?I???????_~?w?
?d???O??@RH?	;?e6???$ {??t?qY?C?K.?C??%?X?l=7?6???U?b??UmUTUUU??????!???????F+aB?????U2
???a!?H?c?b{gN?s[??????'?^aD??1v#???L??H? ?????
?6????????H??t	~?%.?b????iG?2d?a?>V/???LUV4?d?$??)???
?Q2b?0/E?1aI????'?(?-?H/????y???????L??0?E???NF".????*??VQ??b	?q??w???NO?3???S????s????l?????Jx???O????}?U???%??b!?Ae??)%?mF?????=6~????y|?|*???
?>??fBu?6??? g?zsQ????[,R?.S5fO?L????0??%???}Y?a?rc???r??L??qhg?X??iQ1"?????@\kg?6??O???t?=*???H???AzI+?;
?`???arTj61?OP6???????
???g?M?X?????m???I??}?l????<?q???o?y2v?eO?u???1?MfZps
?\2?$???.??-<,??f2???pr>?e??R
??
h??53?????Y3?\??Y??????I3??X	?Iv?N?US????l??????O+?t??+e>?|??????g?-A??'?!m?|rF?,+?C0Ez?g??"?(?BD????????????v?MH??t?f?d?[?%?n?4??????????6????5E??%?T?
?' ??
??CT"=????y"?
 ?P?$ud??<????
?pS??&??3?N??r???!?iA??Mk6?C?0N??q?'*??f3,{?????U??"??+?|?8i\?v?^t??????H?s???????S?-???JC???}k-?7|;???b???Y7??'??????Y_??sY4?wX??Y!e6[>??o74????-?[z??????x?EKX?,?????RE?<r>??m????q?7?BI'$PVA?{=m?6?3l??????fn(\O1??x	?@a???%???P<!?%??$????h,?	e???F??N!?i)(u/.?%?
?2????q???1?C?8;?g?jv?c?	a??j?*?\f??6?i*tL
???HHRV??L??&??B?i???#??
Ul??{?
?Emi???M?Q???2??M!D)?NH4V
g?D	??!`%x???NjS?D??b_????!??LOw?'=4d?d'?Hra8p?O*F @(%??U?Wq?W?????#????P?C??E.1UC?b???b??EUk?
?}>v?G?OL???YM?Y(zA?y???o??%???????d??R"X?????m@?R9(?
?AaC?????t:w~;
?1?????O?$??h7%??_|Cv???????Y@?=J?XdX?)??L?F????X??h????fy??G??D???
?8?y???]Q????@9G???(^?H??%)?1)?Dz??I?
[Q\?dP??$??3>??L??Y?tearb??a?
????&R?R?-?
E?G?><Sd???EI?w20??7.??dRM?<JQ??(??MnR?j??????N?&?????
L&L??>?}N?D?:?s???@??	?	?
???z??|0?????0L?
?iV?,??`0?????HY??Bky?%????2?s?{0A+????P???*??,?|??{?	???pU/?(?N#}?T??R:???o?KHk?KV????1?
??M????0??UJ?	???K?B??
?]?!
?wc('0??P??hU a?
 ?QC????VDKQ??i?:??x@?H
?H??B?b???dl? n?N???p ?? ??dAu	r?F?|y?Vb?v??U???\?f?S??v??"C??,r<h??	i?X?x??9 ???q9p??*?
dK,z5k?*a)R????-A??DaR	D?;????Q|Z2?0KH?1??P?@??m?>????m.M?
???T????>~?????["??x;*1F@?E???@PZ??*U???)??>??
?s?D?g?3?????E9,P?L?5?bf^8?7+Qz%???s?D.n??b?????^???1 ?,-Y?"??r?85??v??s??c????hQ???????:FT%4W{
??VjP?jt???sw??Cg??XJ9????6???F
?x5?Oe??2??'?N?%???Y?L??=?E?`?X?H???So?0????F\7?2^F??]?Y6H0$|\-?a??2C?IKGQH?]NX?<B\??*?	?????tN:u?@??
0?)X?mTF??E??(????
?????A?
??
az???9C????A?Pw7+b?????rx??E?Y?1J at h?b??n?FT????b?????????V?;rw1??ps??@D???????cagn??????0?U???k?o????i5??,)
"??c?z?F\jR?cA?w??????NI?y??6l?--t?z at o?3???Ca?n?3??O
#?m	???
gD?*??S????4?&B???]?+3???a(???V??J?????"
?:???????u??1-?rJ
?f?&????????? ?yI??U?,&???WL??J?q\`??3?????2a2!?B?C??vRXs,A????F;9?`g?P3,??0pHpq%?Pv??v?N??7???W?b|s???t???MSCh??	???o&???0?V???L[Yq?:9-?E)n/?????F[????Ii?????0?MaK??f?????[?????????-
????RUGJ??pI???X1
??c???.M"X??H?L??y1r?@?Y!*Tp?k?/(?&??] ?gP?Ub???fu?3c???c1??1?.??"d?x?6G?????4???S"DM{?j??T?5??w?C???B98?z,??????????0??k??fb??D?1?qIh!?b0*?w#??9??18E???
???m?'??D?
????U
`?l*jc?Y=?Yp?6m???foH??4??h\?%??<(q?X?8PC7??9"?	?h????*??&???J??????'N?MC?h0??Wz?UMb?jB?I8:<???:???	????w4????
P<??9???0#-?E|??(?A?N0?	1??? J?.)?q?&2h?4?????^FZ??k?F\1P<U?5m`???eY?	1
0Y9y
f?XD??B?e??M???9?R@?????	1m!???a<B?
?A?Z?0+)3??k??,?Q???0&??A?Y2T???O????Bl?????}a???z??????????j[?O?I=???.O?Wd????3??'??Ldj????UU[m??n????QbjM#IY?
???j?*???????T????? \?j ????RE??,?~???(???g?-f?(&JbM5??6???1???9?? y????z???VH?4G?/\QBDD?ocq??7
7~?????????

???L}?	????}????-v+?
D
j%y?""f??????U??rjmC?HdG?=???+??n?z?di??>?#???m????g??,z??@RJd?????????i??CsI!??hn=?O}??>?]
??1>.?
??M??%??T???&???`?????^^???Df$,JbR?'??iF?S?1???#v?????????g?????.?)???A!?I?????7???p?B?E?9????:??l??qQEI?RI?M"fQ
N!??WxI"
?=??rP#N?nE????H?x?",?
????3?`?Ru?{~bz9?N
?EX??k aB???A_?
;????TP??e<66t?'F??6?qk??2.
?S?w]??*???6??E?iaP?_uGT????XP?"1?}?B:?#3???@?R?*???'?<
)Dp1?w???,???1)??i?&?{?2
`??8?{8?
z???DT??????A?????E{??????Oo?J?E????a???;?1?{*?J8J*O?F????'??#)????)??'??1?????
D????`??$??(??QV$??+??[y]Tp'??V?s?:?pcb?o??[!m?S?|J}???B??0??????1????d.??x?Ub??c?_????"?-???~?E?C?P??!??Q?%??Y%-?&L???????*QG&???RM??????????LMd?D??|???IK?Cx]??M~%7k!??4?$EP?P?&pR?$~???t?"!?aXE???????:???v??_?w?-????R?iB4?=?<q?8?W??)?}
h*N??a?IH!?~????a?C?FM??????N??h?
[0??[b?dm??????x
????>????
]??h3?WBb???????G??S???????C??Q??< H??\??????+?
t#M???
-O#??O?????????#?:u???????"???W>>??D A?S?? EW?"?s?+??TP?~????%B}p???g.?z???LB,?7 ?ZT??????MI?k!???5P???f?\?lIS????{?O<??
ooM??L??;?J?P?x??x0(??D?????|??????????????'????P??5?????[?$D? ?E^?"H???a?R6@??eR?s?t???-????c????4??+!
????M??h?W!h[?@|C?4
??a????b=u?<sJl1Jj72G&??o{i??A?E?6??S????????????????mV?b???RT?Xhh??EO????>o~D?)?pb?4?v?U0U?J??w!? ??/1??+?<5?^??/ZR??$?/Y???yS??D2?-Hs2?S3?a?>??V????}??o????63?F??f???BH?????~#?G?W?O?i??
|?N?D?QqX?>x|??.r`3.8
????|p??ov??????rZP??f?????]D??zs???????????8?l?rI??): `??Lu??[???q	???????IK
???j?Yd{?ji?????aa???????)\6?p?Y????t?????L$?IZ??????a?|??P
??4?,???m??x?J\H?Ft????K?Sv?e?????3-x?L/(?,???????PC{V7?
?!2???,?9 at 3?2???;?$??#"0n??.??fb??\?S??vqV???????D?&f??
??3[?`????0????4@?S??????\BK????<b_~?}??A~3????L?g?{a??????<3O????s	]C??<??7`?D????\?)???0? ????Vr?@H~v??~y1?A??f?1??
??`???????2!?v??@?=???*?nm?? ?E?>Rb?}???????9?Bq&?y?$?#x????C~???????	"?\????"	F(T??~)??@??f?f)????z?I*???,?,???X<b~????X?z|???????+????J0
?R?06<u=0?*??_
1\D=?rT????"???O0??`?"?H???'??	u??#??????????X$???????]iy??0>g?."
???$?;???????2??
y7|?$???@??????b??UP??
0xy/#???ck?2z??v??B?{??S??X???????L??!?jG???DA??f?$V?(s?1?H<?????O???;U2L58;ISGt????R????????G?R?????T?1?2D????H?

?v 



From fedora-extras-commits at redhat.com  Sun Apr  2 07:12:50 2006
From: fedora-extras-commits at redhat.com (András Tóth (tbandi72))
Date: Sun,  2 Apr 2006 00:12:50 -0700
Subject: rpms/gnome-yum/FC-5 gnome-yum-0.1.3-1.fc5.src.rpm, NONE,
	1.1.2.1 gnome-yum-0.1.3.tar.bz2, NONE, 1.2.4.1
Message-ID: <200604020712.k327Cqpa006294@cvs-int.fedora.redhat.com>

Author: tbandi72

Update of /cvs/extras/rpms/gnome-yum/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6279

Added Files:
      Tag: gnome-yum-0_1_3-1_fc5
	gnome-yum-0.1.3-1.fc5.src.rpm gnome-yum-0.1.3.tar.bz2 
Log Message:



--- NEW FILE gnome-yum-0.1.3-1.fc5.src.rpm ---
????

??
??	??x	??
?D,2?
????
	?nov+?^hpm?????????@J&??I??M?6???[]???n?????6U7?P[?"?1????(?
??9I????%j?a?2.?s?]3fJ,??kb??}?????s.h?,_k?,?j19?t?),?<??_p?[t?	?y?"2?h*?l-89?
+?QO?\~A~?/~??>?????F?U???jG?st*9k????[f??JS?4???
M?6DWO??C??F	??3W?mS???Y??{]??W?{?t??#?|R??g?????n?? ???1	????'???;???O
K;e2
??u??}3?i2(?;?x?'AQ??H???#???a?????c?????7?9*4<j
Z<???<4<??\\T??s????u?LA??d?a>?????
<Z?4Dx????'????3???g?Z%?g?Q?????di?i?^???T?UnT?I(]????xX?
k-????2hL?O?N??8?"?d??=?D.?_??+k?
???y??????????k????_??}?x7???
?L
?mG?K??x?jy?YB1??O?B???
???u????
IlDm???+L?9?{?T
p?"????
M6!=????!???i?-???????	?-!?bj?u\??+???????w?l????To?@?i4????R????????W??
~OKp?
""&	????????Fa???
E??c?????,h?q??%'?n?xr??]d](:??=???
gt????ze3??o????????P??&w?a??1C?????wW?7??0.?r~????B?????g:<???x?Y?U?U?|g(?????~Xpa{h??$?2=Jik?????
)=?G?F?????
??\?8??u?	C??le??k??O???&Kw???M??c??e?>pucY???.IL?X?Z?*?9/xn-"??wb??DtM?y)W???=R?,?$r??}X?	-)l????x?J?
!??????{ %??M|?=??~?????Er?%?j????`P?+??n??[??g>EF????M]?,mow??>
?'i?	>?g?
N???
?H?[?
-p8??&|9???v?s?????????>>v{j???P???q??vJ??????
??????W???E?#k2??Z????????e???X???5tl?}?#<?![~?s?oe??	?=?iG8??P&????f?i??G?$(dA????<????\???l2>?]?[?D???????~?????a?Ek???o\	?y
??q[?????W?n?J?Tf!????ll#i???!?$
???????]?d<?-?
??"?????p???PH
?D??<????vl?+zaP??O?:(??????n?L??F??????/??O?v*z????+
?Dz?#M??1?<?????J?y7?]?
S8{"l?#"aT?j?F?v??'l??I???]9???E?(fK???s?(?d???????w4x?|???VK??D??\|*?$??c??`"?q`??3Q
w???????L?"?b?Z?b?6?_??????__?Sx'???'1g?y=???h???????8???e?JE????[?????R??3?1?f???v??t????eU?}S??????z????3?jx??dl???bY@??k??=P??S???????????2aJ?e???v???P?????:?O?
????8b??
??????+)???<h??T&? ??G???????@??7?r?e??O??C?D??O?%??\?cb
?
?n?.
??????????
!9???@?-?T=?]5e??_0@G<??l???????H? ??????M?XN??U#??
?SF]??S?Ol???q???l?J?
+????X?y?K2????t?~??fS??q??F???.?@????????6????7?d?tso??qm???(o~?t?%?v??:MR????+??DKO??D?????????-}?T???M??k?x
?'?'?9,????
????rR?]??O??gX??=????????#?ek??????y??_U
?????C?IQs?????????(R?c??
????q???D%?e?NN?e;


0??D-n?A????A?:u????h;>?0?6;??f???h????J
)??0A&??~a5[?G(?r???N?kS#?1m!????u
?+??P??D??g??k????}Q?q7???*#?]??????
??c????
?r??Q??@??\ga??hhB??N/7[?Wl?P??r-Db?mO
??$"
??V??3?#?
u
ho??%;5!g? ?Z^RBQ?"??,ej?d??6??-?
??????U???f???I1?CD?Q	????????*???A???Yw]?#3?t/ahl
'?????e"/?N2v??`D:J<0?"?A????v???n?Y(w7?M6;1q?r?^?u?A????'U????y?PJ?39?<'??n??????B?" ~?_?
??J?1P??'?~'??y?!?>/??{???}???XD|?
'???N(?	
\????;????F?????9???=&+????[DE$?(-t?=??m???n??Q
???G?#?8?????tM??s?????p

??+)???OK?zqXic?l??i>$??A&???}~?QBC????J$9?r?y???:???N????????????'????u??+7??o???w?s??
??X
,???f?Q??l??6Wej'?????x???73???xi?????Ol=?YH??&u?t?????;!b??+?*?????~]?"?}??5Q?7?h??,pVn???th??}????o?y?=m?c??????????M????????Oh???V???????/?=????H?_?1?kd?"?~?b]?????:?rN?O?}bp?F?o????]????pL??H??
R?q??H
p>?WG?N
??=??????????? 	?Q???
xV\G?`?T??p??????a?
i??3??m?M{?d????7??}???/64t?
eGMj??	???E???~o?JW&??X?pb?????2??H?z
^DF??*:?
sAH??I?d???D?z01???+??EX?b?t????)?,????WV??n????????%???
qN)?i2?ei?f6+X6?R??M???:L,??b????Rt|?(????.&?p?Gh(g????, T@????"H?#!"???_????????????c&??r??(??t	+
????'?~g,8wg??ID?R??O???=???9???p?n????S?<???`?m7???G?!??uW????g89??????r???mGc?e<.>??.<j???v???????0?/???U?V?p???4?a??Y????G;??g~??<????.??WN<?9b??N\ ?x>N??bz?3??9R?>RI%u?v??I?lF??m?z.???????wt??0F???}???
???]'???)?j?J?wB?r?c??Y?N????`?4?,U?T[eQA~??
?uN?+??&f????T??\3???/*???)F;P0v?yb??V???	??*!$?<?]??4??AU8wu?{2*:xd??1?J?TB-???p?$????"p??s??T,Q??@?K?b?c.Sz?
?Ub?T0PQs???A?g???P??p,?F????',??.?Vipf+)~??V&?????5??Mu?T7?h?F?n\?c
??6?aQ?????:?y{q???H{/yl3???OK[??????>R>?|??????D|
???S?>?????C?E?\,??f??z????_?J???[7??????I????dM??d?k????.v?L??????&%u?vM_?v?`i???2\"???l?Vk??:@?i??
(?2T? ??,X|???0DU??H")<?
????.?XO??_???B(d(??;??????l?=??OS???I?S??

???D??|g????[??????<?fj#u?x?????{hdx?o?a???N
??vk^?
??????|????????Cx????????q?,D?}?X
 8>?T?K<E??&???D8?DVv????m?x???e?;?p4w?%??.??7????I??????????td?b???v+????6?u??_??????x?T?h?T???e????s??(?j??"??E:??????W??????W???
?8|??????_o????B??l????hg?????????????
By???Eb??0?'dDP??!?O?X"k????C>Y6hBdO??? ?Gk???????
??X1?"?PTe?a?b?b+"?`?TTX?AQFE"?????p'?	????$??P?BiD
-????T????CV
P@?9r	!QR\?R??@??F(???T?%??a????RN???{u??	(??_v?-Jv?"T?H'u??n7???"??5??(????????:p?=??^?7?U??????Gxm|???{?@t??????X?!?k's,#?2?g?N?y7RD?e??N?R3'?e
_g6???VA%j#Z?(????O7?[???q??1???8:?]???m??6Yu?e7?0AQg;?M?t`;?????O^?h?_H?1zt^oc????qz??;????\??A??R??q??2??&???
?@@?
(??G????l?l??;c??zg[~
@??b?Ub????"I? ???ZBuR??.???G????~?D??5????v?Y,A]s
Yp`7?1?z??)?jOc?8?RE!?5?,?s?0???bhe$d	?|/cI3?w?LRE???`?!?D9?u8?1??

?????=??
*??}`RBD??H?????U[???r:?RLhj?G.?t?S=h?Y???????1???}T?-??g?????>?E)U??VyX?Z?????rOV?????i???????k?}uO???b{p?gVA??? ??}V??S???????t7Z>?'%????Cs?q?~????5?>???{?Z???d??+?????K[j?E-??wX?g'o?????p2?????>#?U?G??!?|.???u$3[??z;9??v=??????1??????B#O?Y6??ji?????t??7m??eN??	????@x`[?y?=w?????	??	U???-x| a`N????VQ???A?C0??_???`?'??2?	5?|?D/D??P??U<?????iO??A??V?a?$$%R??b???b&8?	}?UF?Z;?????Up??1J?PaU?`J?pz?@?@E?O?P%??q??b????,???ek??;H
 ?c???Ni???
xD????????R????o??0J???????r?rWYz??etl?
*?V*q????
(
0~T????)9?I	??~?!
??X?i??[??Q~???[=???????W=?????z8??HL~??????????N???N?^>?????
$?u?3w<?y??S?P?"I?????l????E?Sl??['fh?s?EGl??????T4???>q????Lf	f ?GW??x/
=??.????Ia??YN???G
???I?8E?l?ca:*?????"O??O??UQUb????????{o??????IURu?C??p???=?]<bD?3`&?3???;?V??r?(?==
?zk?DU???
 ?p?{	???Z?M
I$A???(J??
C?_V???Eb
E??V1D
Z?+	Z?UX(?"??"??b(???*???$
tl??|dU??????T5g;??c???">????d.?a?,e??[?B]6????X???@A?? d?g???W??q?????^??v??
`???%?1??????W
?\??H??er??|?'1?6?????*d?????3???P??z?E??OZ??????B????
?"=
k?W?A??C,F0??~<??=?l?t
Z?h?%????t8dB???W?z???.?A!????????
?2?=?E??<?b?m??^?w??W?????O???\V??-&^?????c<<.???]?p??\???????&|?6?,?DS?y`_??PT??2??#~??????6???</?#????M?-oUS?t???????n
??-u??}<?-???t?c???zi	O?zTo?1?((7
07#??6s????q??
???????Y~ 8?hC??!n?????;7?X:???{:?q?~???jd\n1???5??h6??k?D??(????%??????sTyP?d?O;??????:????3??E?nf??CH???$c?M?b?p???S??>?B??Hr?k???;C2{"D?????I?#??b??t-?&Tr??}r?e?(???????
?R???????w??? p??'????"W?6?8??_~???U????????K%??b???=x0?e?b??h??%? S

^?5i{)|+?|?j>??}??O???b??*-P?????????UEX????9????????AADw???V?4@?e?$a??8F???R\?l9????????
?S?????
V?e??g	wM?g|??N??C?}?k?7
????.W.?!???F?z??u???U???0?)'??>Q??@7?*<=?}!Y??0?B?!????KXA?W`??%?Z??XC??????\~<?????X?;?????g?C?????D???J??S!??+??\??u$????KY?_????D?r??fp7????2???v???7?_8?C?P??p?"=.??VL:?????OJ????3?<&q?V})Y040}?????$(?,>f?%	??3?? ????u??N?n?????
?o???A?????J????l
???1C"?9??>???,cq???l
???G??????CV?;???0??
??b??C???u?e?a`U?GD?&7
e1	??????;????????~???H?W?`????kD??6^i3??4?SR\?XZOE??i?????o?z??m??q?/??JB?4???-!??8???????H??@M?A???Q?n5I?(
?qte?"jm????5)?Un"[3|???o?HZU ;PL
???$=?#?&????T_??Xj	i?G,7?G???v???A??@??B????E\?????K-0Q>?????r??|-@?u??>$???bc"?
[??????????~?Q?mKR??"????cU1?Z?-|????Evn???X??cU?z?????C??>???c?-;????m?V??H0?q^R??t?a^9u???F??0??}???`?bp?b6??&?fY-C
,O??[?6xI?}P]?x????7y(???????c?? 
E??S"
???i??+is?EN?nx
??F???a???"??N[j?w?{??.?~.?\+??K!??t?~^??i???? ?-?h????JfZb?u.???_??Y???S>?(????C}O????y1?t?????])?8????
?/R?*??H$$??:?VC	????Ab?j>5?o????????????;?Yt??i?????~6?C??X
?ta??r???U?f?sn???x??c??T????
c??G?4?RcJo]?k"'?
Q???7>?6???A?T???|?	??????r????K??_y??(????Bvm?,=?????O?Z?xb???4?g?f????????P???*??IDRF?????r??nH?T?{b??)`?W&~e???h7?QL=??c%?Gf????BZ???????J????????Y?F??8??v?j~???.???T?]#????[?dl????#+?j?@N??G????+Doiy]?c]
???C? ?c?
???$?=8???\ ? ???IM??W???X?Z/?????
??%?kw92Y?A??Z??i????c1?\????m???I?.??&6?1Q??z?Tl?,????

E?gin????D[J????????V~1Y?O{?i?-?=-??D????j?C?ZExh5$?????????X??zE??*?????????sUh?Pi6k?<^?0???@?V\?g???f????2????l
????s??m/?8f?J0_#p???^??Y?<??_S?\?+??;?????????????s?5?*??f3$D???&X??f??p?:?4?.3Xc?????%??<?3Q?]??x???a'F??V??}?w????{?%#???Z!?]	
?????*???VO?7$<?k??~?H?j?????u???p-R?D?^?XSIk???O?^?1?1t?	?It$??0P/?N?E?&??8?%Q???'r??w?*?????????^?l?????w7?:?^3????yu?P?A?ox???N
G9????>??22???73?PM????I>??m????????T??{2n?m<?m?3??o????W???T?`??
k?m?M??a???|??????"P?.e??q?;??4c?????"?t??m?XRS??o????]3ag???lQG??]R??????"???v)6?hT????wN?}_,`??o?(?r???"????I?Nx6?i????D)C?#??MD^??]???|?(?T?h?1?Z????*AO?w????,?????
,???[[???J?tX??aG??b??.?%G??"???;<??4???????G?e??V2?r?U?j?3?O*~)?2Gg	?K???wV???`?S?/????{???RR?+????:?W?[???]N????y???F2??Y??bD??E????W?}??el6????????????)D?6??@h4?]?Bo?1@?u?,=??? ???|?X?"C???dX?R?:??b?U??
bO?c?@??S???4;k5?p?F??;??????vP????
??_?R????
]?*t?u?o????? Y?'??t?s????g?c??u?!?'??``?.Bd??*d?O?Ek*?K]SI???hr???{?>??X?h???3?"?9:W?1?!}?O?0?F?2??
?"_???????u?\W[???d??/??4?C???e?<???????x?????W????s??Q?/?G<Q??%?<?G???@?fB`?lcp?
?Y
?????a??/>??U???#???????
?P????y???m?~?U?s[???1????#G???&c??L?\OU???????_R9????|\:?}>?\??????Jm?e ??
?/B6)??(o7??????D??^?''?????????@?@P??S?DW??'?????'k???????=?Q?m#?????? ?!??
??R?????]???~?$?H?`???D0??$X?H?U,??`??t??H?P:2
g???H?@?,cE????? ET?
??M?!?Vf?P ?Z
G???%????F?$H2?,$P??R??1J?3???JiT?idd??d
0*D???X?PSQ?b ?2??y?
>4?x2IA?J?
Q??C	?????BtN?b?n?J??Y"k???I$??Hh?!?zt???????:6???????????Q?K????4b{?
D7R`&k?#^](???T?;???1Ll????]H???w??
?:?q???r??{;n???DA???d?
Hk??a??h$?S`????]?	?"??*?Q
e??`aH??K?
???O&???$|??C@[ 
??T-`m`B?????*?N????T?b?`??/????#?v???zPY4????3H7|?a???af%|????p?C=
??????Aa?;????O??2 l"m
C-?0"V	F
?)ha?????P?s
???U?J (
*?"??(d`))E?"??#???W!0"Ie??,??&(??%?
+J!)??0??X(#%?J??d???p3]>?5?	#?	?vha??%($0I??I?Ya?h???"d???P
 q?:+??3??o&?RL?,?I????D?I?=?)&?Q???uo ?
?r
??l?KT??1?'???/
??H?????m??I?sUUUUUUUUU??
"??D?"D!d?;*????*???2um??????h???W???u??L????sq?dhT??
?)?S
?-?m!-????
??ZJx???f,z%?????%??{???sz6H7MN
?*?X*?6???UJ?????UPQEX?*(?ciQ?V(??Ub?TZ?K??K?.???????&????^?v?i???'??????v2?~???g???m`?T??q	???:R???Y??{???????????7>?!d*?v????@1??s??g ??????wM7_O??????o?????~?^#?l????t????{?v?%6H????H???*
{????
v??????&}?????^%vO
?t/h???N?P(??S???7??p?98?f?!?f??.???>???E?`??i?3?g?.@?C?`|9Y0)?	>
??D?1R(??f`T?b????\X?NqE?"AZe?????????3?
o??&2??JL,P?*z.???%b20X?(x??/?????	'X?,??`?????b
??
(HS R?D?}q$??hea???j'??,?gC???uE
H??
%;?	@?B?5R???Po/??q)?? z'??\]????+r????,?
?a???|=?h{[r?{??A??8????b???aG?.=@>????^[?D~?0Z?]?W????Dr???(?rc3?t?T?ut??j?27?vTG	???hHD????.?t?2?T$?m\xQ??2g<k0?J??Sj?73?g?????*zSo{<???68?n??A4???k????2??@???>??/????vv?9????&??5 ?"(A`?dSY1N?$?D?8?~?s??^????0a??:?z$6'4?r???????|???;?.5??gV?u??8g?uc1??g??!?[z???5o??S?z"??>=???fx?Y???&?M??A???????
H?? ?s,??????f?@?@?!?7.?~	/Go????^#???|?d?2?KI???b?lT???8???yC??????RN????tqR3Y? 
!?????R?T= P?p?m),?4|?q?TTC?????|?QP?!Q???"????????5??$ :???D\?????}?n???????2?j???L9}???p{?@k????bb~?????P !?N??["??zx??????x
;????9?? ???*
E?c ?H
DI
d?$?$P?
??R"?H#
@,Y
@DQ ??,?Ad@R, ?"?

,?XAD`, ?T??
?? ???E?!
?A??b??DU`???dFH?
??!$b*?#
	?"?1b?"??H?#
b??1#??"	??b*???? "??1?AAHI ???*?TX ?????dA?1?0D0dA`???
TX?/4???[?5???Ao?f????U?;?@??
`?<????u??Oo#Y?Y??W{????_}???u??[???#??,k??v??t6?o
??J<R???|\M>/??H|????????\,Q????D??)R1W??!6???8{,W?zH ???x?????f?!??cUh(]???.?TB

A??????h:?]?k??y??j?@?,?
`?i???;E???(tD?
[?s?*??#7??-?MG?yIz??m?vt??????^/??"??_?"????)Ji?Y^?Ju??,?{R???V???W?4N??t? ?-2??=oU1D?{^???J??b?1j%?iw?????1L??:r)zR#)?Q???g????^/ui???xYe?(??O??F??r?(?kcM6?{o{??1??F?
?M2???7?\???????U2@F??\7?~/?~>.^??o???1?^???}?9?B??????C?????????v??;??_g??F??W????{??????3U?vs???lsU?Y?*2RBo??????g?B?P??v-d?@?|????#?$Ea5?.r??U
??2??JVgG?2??T?=?????OwG_=>?'?6????f6m???v??e?u??g????4?M" xb?}?:?
?`w`?z)?\4!?[?0?R?????7s_"]???????
+?B????y??{;
??7?*?CD?p
]?j??{r2O??JS??->9?g??
????????[??nM??%N???C???L?SvL?F?,.?FCu `?v3?'_?3?-??Qq?B????????????rrs ?|??\?^#?Yo!4N??`????C??D^q]Rt??? ??8GR?\????Q??V???(c???/??~o'?F??#M????
oe???w???,|LRW???oj6???????C?>?????\b?|=l????P3&$B~M?=?un?d-?5??)o?	?ccM|?@;D0?8??1
mm0+?T=A(8^}??TKn?r??w'U]??^?Z???cO`7?Pi?RT???jjN?#?i=Y??????[?Cm??T@???
?^K]??!g???T?4?A??5QL?
%m???&?$???3??t??E???zgH???? ?0??}??>F???Ux?54???k?Z?]~P@?w-??}}U^?-??????????~?L&K???A<,???i??*c,?	??Mj??C??z&E#??N.?;?UF0`3??x.V3??z?%F?"???????<???G?,??5!W?9?\)?{?-(t???9?Sxs-??????]E[?SaF?0??j)>?ufm??!?1Pk7Y???Z?^]??E)~M ??Zx?o??18p?6?su?
??@?G
????f'?????????O?t"??]A???=N#(?k}8RH??
?(????7xY???]<@y??f*T???3??2????j	?*??????
.?(Ar???l?6?|A??5=$q???zn????:?_wT?@?Uj?`?EZ?$?#E????FfK????????Y??$B?H?4.?M
?@B+*??Z?O?c??z6????ns?????????^`???p?????t????-[?9??????By?	Wa]M??????B????.,?H?I?????m?e??????!?_d?O5p?????9R?????z???????S~?M;4???w??_/^?9??=|?E9Gm??#
?????9??[??????>>?&???
?Lq?r?*7??F|?L?)g?????:(H?0????:I?v??}4H??????????<'???J??????d?????{??Q??FJ?X??p???E?E.??8?;ra???\??nMS????:??$Y|??.!v?u?HWF?5S?O?^N?/??S??3??????c?"???mo??E??`???????^?????m??m??m??2???n????0?c{????;??}??G????b]??????O@?????
)????????S?{%/QS??]?E?%]??{?^?{??}?"^)??o???Mk?U??~m]#???)V?????v-??nD?d_m-?0???}&1?g?|mg)?;??Y????????7???5Lk
??F?_?z??Q???S??Vl????6U???????F}
?3G?/\??CLj???_J???+S????F???G????uv?????=m??
"??^?t?(???2?????@?~]z?h??????O(t??ys????ho??in????O?cNk
U?<???f|vk??k6?5`?
?<?n?!%i?1?#??~5J??????cS{?????w?_?y?vQEQEQEQEQEQE??oc???????#'????+K?7i?p??[0na>?????yy
?v?e?F	 ????;??O?e?#H)/??1??V1??@???3?i}F?k9??oR?,?D????????~??c???pe??[m7?R?d?l<b??r???[?6"Z?T98$eY????
??7x?2E&??	?C?m[????)?]R?W>?@?Wl?IN?}??#?AU?????(??)%??W???z?i?Y????r??n????L?9?vLe????VS??&`?3G]V???CDX???f????.e3???_?R`:?D????????V?~B???~?W??1????Jz?w?????{Qv	?^?y???m?-????????58!fF????????!_%???HQ?q????j?f?DT??????a[??N?3?n??x??c?	??be? ????c7???IG3<?g?oNt#?`?w??	;t?,Hg??+????v??+??\}??u?{F0??&iPc=????????C????~?VB??||??tf?s}|K?{??:e?X??%???LD??	???4TTs3o???^3Nq??|6m??mg@???????w5??	??t?l?i?'?qh??v?r]???D9?9????z>B?E1???L?J+h|g^q?????~*??{??;y7??<??????????+R?-??????[Kim-?????m-???/?5?={>??n??=]?<EE?\????TY???Q??I???c?=?]?????!?s?C??F!??Y?`??@{??{rK???yN???e???8??dp?O?!
 zU?j?Vj??????^???V?6?????????G?xO??z[?P?????9?S'??????v~???I?e????G??9
??????t?
}??)*?E?
?????q??%???3$??"?}??"???????[?p????d??'??O?5pm-????-??}?9f?s9?7vU?`??V????=c????{?suH?t????Y?]??o???^ff?&???yE??Jo|q`?????7D8?$??A???q?e??%'5??y#?{IgP?et%??L^}?ry?rr\%?m??{?P????
???[?|<?%wFqT-?9?l???-$?m<?????-,???I?
lR"FK?y???/?f???????T??t&????b\??#nS,Y&8??
???(?)T?Z?'??S????z?NK+d*???F?n?^?2??????$_?_!$Pj)??.???9???=??s?L???????b??MZ>?M???)?tS??)?^??MD?? ??H}??-)L??L?AU???zu?y??????e???Y????O???????k???l?J?'
K?74?+???0?U??|????	?????7D??{?z
???P?????"q???d#d^S??s???iJ1Q+???y?W??!m?????q????	#??	?????
Z+<???M?s???J??	??U?8??8s?7???Pu$]^
?G1??E$ii???vm?Ym?|?)a??I??????9-???C?	??W?rs? ?~D?^??Wu}ZF??"??jRy?o???-?x?????/;??dfV	e?{???C?<?w?'?????K?<q ?T??g?'?_?????s????LS????O&??#f?W?"??C?7I>v%???
?{	??????c??
M??W>??S&?Q:???$O???2?g?iP?e?E??????aU??????U????A?iWe?Mu???Y????U?6??Zo??D?S<??}^??\?&s>?u
?ed?G|??????N??
?q?T??.?"T?2H???
??
W??>??J??????7?????3o??*E???H???ap????`?/???~???Q	?5??~A??
<?????'
??{2?-s??v?5????a?F~gd_"??e@
???{?\?;??,?$?2??_?3>5*N??u????`???T?*?'?Ff%k??a???"???.?;?k????}?,K??Vap?a?eo)?>???P?!????E?(??K/tb?&???y4?*D?H??b??U????K??w??
u
?B?'?t?#}?)?n?|
\wk+?A????b5jkF?D?V???G?9???6K?@(?????_?L???T?72D?
?o|?J???el???0 )f?a2?^??kn2%o?[}4?????'?g?7~????2~??AR??h??hh???S>??=
?|L??f?Ky???4???3K&??n??Q???w??y)?KUa??????n??!?m,????f??Jo?f??\A?o??%???i?t8???_???@7?????{)????????[????d??s??{??3xH?1Q[??`?	?`7??:?P???<?.:v?????4?C?,tu?*	?Bl???;'e~?/F?X??=?QPf(9?4????d?????)??<?vl?D??T??q&i{???w;J{?Q?~?H?<???F_J]T?s?a?.???=?/u??p?
?V????K#^f[%$???q%?W?s
	?<??`?I?3L???|???w????GA?<h?'[??N+>?SC?R??y?3???c0E?
b$$?]&?k?W????b?W?p?1N???9?(0?z?>???&nr;???+?iw?p!?K?~)???T???!R?Q?Q???C?n?????????:r\????K=%??????97?uF??]??(????w{{?$;+??&@w?_???????r???]?a?#??????Da?%?SqEY????.x?R)D???xL?^??Bj)s?E3??[#???T?J?
?????~?x?E?W6???1?????5-????
{m+!{J0{o????
????38tKf???G???w;,?T????I?f??T?5??h?]!+????iQ?|????X"n_=_s??]'s?????x?????G????????r{d?e??
??????=??????^^g|.=k?|??hN<????8rRE,]???	??wE-?f\2???tR??H??E?s?M???I)|??g=5??X????gf??+f????
?C???w??\?hl?'<?w???.?o?\????(Lsd+???y???????E2;wlh???????????t???n?B??????u?w`???i??<?L??x<x???G]?#k]??\??~??8'iP?????_~"d
?$6>??'??D%?????<0"???????Wf?G]/?e?????
????,?2??%?J?^lq`Y??????t???nj?E?eO?2Y?Fj?;'n?
???????????g,??'?V????!????~e=?
a???!0?0?um
{??~?a?????4??Q?luM
???k???K??*??)_?_~?M?Pr??a??,@???G??=?)?W1p?(C??c^?????g??@C?
??????\?s???	???P?&9#?P?q????
|?????mk?y??WR#i?d??E?"????$,e???]???t\??B???LD???|X?????ui??WK??r?s?0?'`"?uk?,?/Y?????????`	??????8????9??????#? ?d???L9?(??-Cr??F???????????S?!??????Asaj?'?&???=n?u?>
|??6???^q??3k??<v<????][;z??
397????tr???m}???dt?b??#qC?8?5.#?"$?p?v?#w?8???p????iH???CV?[^?mW????'???-??1????dI?7u??
?e??p{2?c?q?ZnBo?b?I??S?
e?<H??k???	.?????!?l?~?q?#?T????2z?W?s?9??{{=??i\???Z:????%c???b?????8? ?VT?O?I?2???v??
?,???$G\???????z?>??????????eO?)??
??`sUS?#?
?????d?R^?[_????=??????????7?L???j??e?f??x
w??B???K?????1????]??????&;i^???e???p?`yO?C?X(??|"H?:a??? b?`?gT??;+uL?h?C0?87???k???X?2t?e~??5????|
?s??????^?7
9?????lY??????% ~???{???q|k?X??#1?!?7*???N?T??{[4?Kh?s?'C??
l)?ceu-?y?/??P?8?@tga?????	?e?#.HL2n??
Qf?o?[?.??9t???a?y???i??F?,0???H?*E:t_?ThY??i??????s??J?/?D????\R`0?
????,?%???u?~?u_?????hCsgW??????E?w??}??????B????j?
?,x?|r;q?_?'S.?_d???4F?
?H}J?tZY????
X?#?H?w?:8:?'??????mX?9?q??w????Y?@???8U5t??????)W"?lJ????I^?	?R?p??8???Xh??Bm??|???????????a???K??????K??L????????-??)E(?^C/??/'?d?'?S~???t??K???~?;vGL?	Ox???ON??%L?B?e"???Y???,#??Ev????????"
Z???<?"hZ????Qa|+?s&?\?nk??C?,?8c]??}Q`cR??g?1

J???Fa????Z??????Y??????t+M?!C????O,???*???`?????5???2????::?????~g,???g??>W???`?gg?j????R??J?????c??J?U?<P?A????a?;??oQ???]?n?hW/<Lq?R,??H???M:ud?<?????t?e?J????,8)?ZM??B=?XL@?i?_?i??QX?G?????D????????S?5+:'?%??yU??SO
??KU??(????5b9???m?c???c?_???T????k?k??h5?U??G?:??_vcw?????[O8~???^9?tz??; ikM??S??k_>??????w??/?J??rh'???w???????\??{?LK`???
??4?F?$??}?
S??
???	??#2}*??UD?0?s?????<?/|
?Q????T???9?-???r?<Y{{??a?V*c?|%?????E??g?????6???q?&??o??L?O??,????????'lh?C)m?!y??!?HH??%%]	=????0K1H??9(r???m zAD????`3~????D??x???0??r?`,?{?7??3?????????H-4{??S^?n3E?&o?[]?TV8??dE??D*"?k#?V
%?f??}?8?????\,:??"?O??S??J?q{oJ~???????!?R??#????x?
?=??Uh??v?]c?r+[w?R??\??????&kR=J.C??????w?????d???
?&%?????N!??;=?%?
??+?6?S??j?Vc_h???c?????'???
?&?)????2?T??UZuq?d??pgL?9?o;sz????8?8zQ:4?-?)?1 ????fW7?r??HP?4U??q??N????I?/?(f?%y?.?:?;u??
:??;?\??9?Fv??????????OT???:?5?:?ue????X?-D(?\hoI`_l????>?y54?
?
?
8??+??????
?3F?jq*??)n6V?D????&Z_B??G,3S%?????fG?O}??a??`C?f?R?{j?_??06???;?^A??????L???U?1???NO?<<?41?8?Leo????SG???Nnc?F?????
.??V|-???F?=W0F}????`??sI?HRL?2R\?]?1??z?C??
Ydut???_??
W????????z??\Q?-X??z???L????B??o)???N?n?KkNlN???
?7y>b)?>9u???u???s??-??????hH????????N????,j_B?<?
?iz??kX??z4
_.??W?/???w
=???N??H3 ??8??G?`??B???A?O[+*[????lC??????B7??b?=?of?`]e??W?P?3G?"???M?*?????5???q?I???	 
?	$t?%'??X???(??k???X??d??	a?_I???????
ie2-?K????6e6u?V
l????YUH??e9?t????x2%v(???m??????????/L?Mg3i?		t??E/? 
?N?P???\???'ng?Q???!V?#"$ ????@??n6U???n?<????{???D?????i?M??
f.?????;?????r???,#?Z??????v????????Z
G????`?V?????Y???z???9???????O"A???1?Ci??????y$?o???`??W???/?d'?$??1????2?"?Xo???<|k?{???9?5>-?Sa???8??r0?W2????c??h??-?<B??'?????*?hd??~N?9??\???y7?Y.?????P?q????R?i_N!?1??}_???A??3???PR~?????2(=????p?Y?e??B?t?u?mq=?R?k??????mpW(8<2B??{mA?TU?1??.???????x[??nF?/??}?+?z??P????A??`1??C/7L?CH2?Ic!?P?*?ue? [??X\?CWHJP?c?rxv??J?>???k?~Z??L?dW>?Hz?!???A??,???????g????Y	M"!9L ?!/ ^]*?+?g??_?3UUgB???an??t?T?????S??)?????U?*?:?N??????:t$??J?????J?q
????c??N??s????4,?J??#?#p??z?? ?D?$???u?????&:?C;0A"y?????2
V??????\????N?.?>W??_5?kR?b?L-
GZ????0?UO??/?K???jby?S?H???X|??zX?GC???shGA?V????Td$%???r&0?*?? ?*?????6oj?`Ud$0z??@?[?o???????x?G?u
???????}5.????d$!?~?)?2
???*???C??`??,T??"???+	Tk(????O??I????b?-????:V*?????Uh?U]?u-W%?~O?t^#3?J?`??9?Y?k?K`???)`???UUV ?????uU?
??qj??m?8-hR????.]????}??O`tz*?5???=iJ?J??Qo[???e??[4?????)
Z???%%??@fR???!?Vq7?l?P?p??pP?*??&*?|?."\?BA?6lB?????%?L?@@??
-oQ??2u??N??}3??u???
?????|??5b?+?G?????W??:?^e+&wYfyu?n?CV???????p????~?c??"".`??8%?????)?gi?d ??|??5????g?b8??Pm??<?-??E????s??+'???J???y???L??.-?????l
?????2L?????<??????;$DJU?*";?+5??{??=??????????_?z????r+???c
?HH???'??2	?	????1????????hu?.@??????5o?????>?[ERuh??C#???????EUL?-x??L???z??ZT??w]@??r?5?h2?????f?	,t??Rc??P??2???F?????"*???a???Z??t?H??S?J+?C?????(q?@_?8??M?I???Hb???UQ]?c?I??`??!?????????
?Fcg????U
X*\?%???}?M???gD?I?(3??
? ?()L??Q????cN$\d?"?E*P??9?2???8B

?????C"f??????x???\?ZKP??"?"
?????T/?=?'l"??Wx1???e?????:????oN?v?(?t?I%{?hO?#??9iT?V?????MF?	????r~0?
?X??	?y?q??u??}7N!?? ???????l?????y ???yMYa????u????v?\????a?h`???????:?R???f??????1v?_`?3?I??,j4par????I?|???????=???)j?,????^?*?MH????R
?X2????
?
? j??Ri?3?}K?WH'???8?#?,F??F?C?2#?>?EW????1???4?#???*8z?#]??
??U???H*?b?GP?(!?HF?4??-?M??B??c!?k??Z5{??????$>x???1?^Y=??j6?v#????J?G?("G??^H??C
0k?{?5G???yX?Y?????W?*a"??]?/E???2	#"@????????????{_???}???7????)??????^?W.???+N??E?u?????p???
? ??:??<?gO???
?y??w??T?%*h????
?y)t/p?2????Pn??zs|??HcP??q?|	1?&?3??!??
5???@)?4???tl}??Au??dB???A??[?xS?.?'?+>?:M???F*s???F?/0?Y?sSe???=,??Y???C
G??uQ?D`?qL???XP????
?w?`??@F
??"? ????{?!??????y??????
@?<?B?B???&?????????hg??Wg?ai?=???Ua????????V??r??mw?????w?L/??4O??
? ????????'???@??o?8?b2t)?,?????????????X0>??k?@@?#?B?w?p?0/cP?K[???u?????o~?????
]wN:??C&???"]?,n??qaZ>???[b`?`h???????q?o?RL?v?Fv????^P^/???T^bEUd??????1????,F? G??u??J?:p41@?S
??Dv?e??y?.I??%???[??.a("[&s??~yk?zy??????_?z???|??7???A?n???q??N????^dw??R???_????P??|UP`???1?!?C2?????CN^r??????`??Tt|??5	???F7)????????D}0J?Q?n?S???????%(r??[?p???Eb?q??v?q??_?Y?o?S?)
?_o>?9G???.x??b??1?H"
?e#??t??T??Ce?u\M;{??s?'m??W???Q???J??}??N/G+S)DL??0?$p?j?????n_D$?f??????3tA]}???x	??H????????H??J??%??>RQ??Tk???????c??(^f????
H???"????_??r???f????y??C??3~?.4??c(????\.????5???;???Z?#????)?????/?P?,???!?e????n???W??Dp;????h?@P???8????{???????`?u??M<??.?XKQq%?|?Co???^?,???t?:1???S7Sw??j?????T?1
??@.??@???? ?(z???T??{h\O????L?@?a$?2H?
?d?j?????d??&*?????r?01O?	FD????????k=??V?k??$??;??
??N[2????d5\?_????oB?k???`????<[L?!??,??)??"}?K?>I??v????38I/O?????>??:?s????9???S?v????T?????????R??????t=??=?,?C????N???*l??8ot\??)aE?rO$??)ad?Bi%??K???d!??Q?k??U?~ ???3? ?T??RqI??????UD??*'z_?C??;??5?N?x?>?'c?QUNY?cEU???x?????????7?^???d???????NP??2=??A+U?J?u????9????{?8|=???a?V??cV?&????-??^?????#*??????8???#_=]??:?W????x9???o??S?s??X???!?????H???&?`
N??=?M?pE?z??~G??nd????x??CO?0??8?=
?
U??j?rD?}?$?za?I???i?b???hI?J?????k`???>
U???6c%?]
??Qs?z?J??J?\L?t????s?K\1?N??*??M????"<??))h?7\x?9??k
?q?h?]S?X kE???/????8???6?I2I!S?bI??tn?^>?[??P???????2k??1?VUxRQ??s?sDI???"Hi
C????#?-t?'q???"?T????c8T.'a?Z??l??3?g????????????U?RG????*8??m???
???}?????A???????3????>?.?A?R
[...1665 lines suppressed...]
U4B 
m?8???n?B???,D???/??Q}?O?}r??~s????g?????X????????k????l????*?Vm??-?3??U????F?dR{?$?????b??=f	?"?X??????I??>??????@T?V??GG?-??g?????o?4????7?%?-*u??cIU"%%?n?M??bD`?????p??E6?*0?&`}???l#???~\??"=ga?`|6E???%?A
HA??Z(??0???a?B??g?%?
8 $ ??Dqw$?Uf?zic?w@?\?5(??r?????57]?	?.Q???)??M??
???1u?{'6???q??c????.&G?N??u
?![S??
????/&??LJ?e?? ???u?\?gS??Y<??#?2?u??7?}??o1????h??,?N?I????)???"l?o?m?K???????Z?M??????V?t????I?$?Z?L?,VF?W:?s??--?N?%mk52??Y?]?W??<y/.L7`Q??7??
#`aTw?
E??G`?P???-?AC??W?lDn?????6??	g??$??C????Po
H?P*"?B???????f?X?m/e??????z0??G??s?LE??????????p:?e????dN?????p??1OO6,????PL+?K????@?;Xuh???J?????l?k?I??xj???Pe??
t??R?l/.
??a??`7E`jf0R????$?{??\
?4:r
??????????`??K?>?>???????D??C
F????????????g&??c7}?????G????}w?l??_??????)??J?Z*oR<?<?A?nl????-6???Qj??D???E[E?G???=?~l?E??`?as?S'??%L?~??Kk???f??O?D?L?J?????T??d???????EJf????
??????{L???ZM?~??????b??????T???Ph?{$9???B%?Mv
??($XY
??BY?;g,
?m?%??P8?4?????xo?m??(Q-s:6?`?X?
v????Jk?R?,???|4
h(?
V???"4m?>?6M???K	E?????{?????E???m????
?d?'?i??????]??u????????}S-??t?-*B???[nZ?c??m?25aM??J?J?(h)????&K?]?tul~????Q????	)T?:6n?%B?
TD?
d1???X?y???'?1???2t????5!p??b??Q???'??????
P 
{j,!?P?N?7WK.??l^#?A??}?5='4??S??z?k??2ld?N???zk?	E\.)?f?R???IQj???????"l?a??????'??A
t6?
?????4zN???lX????r+U?H~?4K??j!K?d??I	f????}M????-?-?,V???	???<?1|R<?
???"@??U?d"??a???{?)?,??_6
2?D)??4?Jgyd?;C?????o???2T[2?P^????
&='xi????n??	??Q2????d??3?x#??JF??A?,0JFRX????2i?I!?Kp?b???????x=h?<???x	
?s?.????Y?{n??o?Ct?i?a?????"*:Kl=?Rz??"?je???%dr?aM:?C$?)57?
?%?*h?U?P?,e????_??{????'|Q??Hy??`R1?????i?(h?N??????GC,??DL`???:?_f?????-COI?q?e??m?
?]ua???????"?
?B2??u???????		=X?s
??(f??????? ?C?70????v"??a??Le%b?@??KAbn?d?Ox~??h0?R?)????
???(?0?S?9l????o!}??
*R?+??5,cNl??????e????&?HY??3???M?%21$?`'=?1	? ??#?o
?SE?]X4??6H?ad#???$?!?J??H????FL5??+?&?IU?A????]A0??e??q3??D-?Z?E}???????s????????c]??????>?O?5??!??{???v[???D?tO?j?&0??ZZI+gY???l????6Cx???Y	>Dp????IT??6???k<G???C???
????(??
?K!d???j??2???c???H?;?<?=????JI??(>^????????N?*7d??n?h+
%?0??CE??e?`xGM??
e?,?\???n|?/mhQ?x??'@"???l??????c??~ZKO??~(??0????p?Tbcc>???u>??r'?
D?|?????\_v'???7??Y?????R*?????~??Q????????j???P?31^?o?:^??? 85??M(???h???[bc????B????*?K,????"A???
o???2?Z??????Y?;??Y;,?-?????R????De??r
???~s??x??$??AM[??^;??/?1?!OS?Uep2C?X?1?Q?????.F\?c)?????$L?V??	B????w?D??h<a?:Z??q?h?LQ)	??7t6?:?
?!?o?? ????P`1?K?3?;R8?s?w???
?IRRW??*?tt??7?????L?. ??(R??.b??w???@??PF?j
H:?7BtBhL????c
?9?	???wgPZ'H???'?lz???7?~???a????hh($?1?????????b0b?}??"?x?'?cy??S???;S?@?RyU,,?uq?C
???%{~cN??h?'?TJ?>I?-???N??ZN\?????????I?C??G??(?!|=???%@?4?B$O???3?D?SR???&???o???oS?M??m?3?
??9rV?@n??U???	?,??????%????(t@?N??	-*???>????????nC1R???u'??)???L??^H???A????^X????D*???h???N???k5????P\???$?+?w?D???e???k???0C/??E?8h???7Aj?q	?c
$I??a?dK??F????:??i??av??r%p?????f?7?UI]?~L?)P????{}?+1?2????#??M;xpk?a/?u@q	????????%Rh??>~zb??s4-,?{db?A???$!6???????\8i????h?K?,O?????
X?+?646??4?1.u{??|?P4A???B?)M?6??5???"$?
???T6v????`?D????~?&9L????8#K:;??{4
?(5????y?"????T!?w?]p???4??T???\?????e$M8`??(H?"??B?&?\??X<?????#?2?RB
?6???
?JhZ????YK?t???p??/&a-?A?0????I$?v1H????@(Pa+i?&??0??$?+	IR??N??$???'F?G?Ma??D?*??/???c?]?KQ	???qKQ?f????u?6??at^??H??>?AV???1???U???>_?]???f???*????vC}?h??3????d!h??CI?9?+?????)A?"&?AWT0???????v???????7lG?????9
??I?"?<?x5?

h%bI??????=`???	L.C<n????#?(T?K???	??SBHA A0@???/"????4[IL?m?F?
??f????vtGE;?o?m?`.3#A??NH??l?{dp???;h0???d?D??
?]?4EKK$????(kb??f???4??h"WdsK??C??????]???!?#}??F
??^^????^???d???f?
`OI?)??N???U??,apP@?????X?'?&d?ER??????)???????x?%????IV?8??u?g?? ?????k|	?
?r??5C????#~?x<t?(?{?8???=?M-?	????~????x?O(??9??B?Q1?^?eM
?9??!?C?i?*X????I?im*\?
iDA?wk??	?????Tt????m_?T&?+"J?xS???`??X`#??*??p?g	"?PL?Y-??T^x??~?qHa????J??R5?Z??/K??Ix?_>???Jn???@3y??@??:?c}??gTm?L?f????.Mn???#m%?$[F_:???4?A??` lP?c
&?%g?"?(??J??????8ZG#<-?-??s?!??????????0??8?????U?????\???(?T?9\@C???rGH?-?p?d:?snu?V????d?:?DB2?u???l
b??i??}o????`3?{?&???VS1????^??a=???,
`n\Z#SU???=9?R?=/~???;?#??e???)???A?r8s???3^?EuqNs???*?4????6?K%???=????.E?P$8D????????N(?|
?2?$f??V???PmH??F?gZ!Er
?mS?{X?9g+v?l???6???rY???????-b`?{??
??G????QUAb??\B<J
8?????I???
??HKF?fE???&??]y??eL%?$i?
jR????????4S
?e8l??~^???{???U at 0???(?(?????d??`?,^mL>-TO.?x??+	??p,
?HI)?ct???e+YN???da???a?$???.X??FJ???#[*W$;6b???1???w??i]FU?3?[??????gK????|f?<N???t?;|:%z?^??x?????+?
?Q?6v4?o???,?:R?X?G+,?h??0?e?4f??'U???(TZG]?N??0
?u??+(?b;?pa???D??4????B?CJA????%?B???+ISj???i??:f?<?????K<?V"]t?4??FY?????1??HNJ???P?c?I"?xDc?????5??Gg1???xpO'?	?5??Frg(B??pc????8L???5??p???xv?d?5???t3?<v?????3!
?b??KX?4aTD
r???????S?"C?RC]R
????1??G??s?A????f?8?Ic*$??dHU???gy?1o?r?"54??5?Jr?8?-	?lX?????f?p?[??>,?Kv??@?????? x?12Pb?(?h???`Z`?
???1?
AK?_p;?x_^?!b??1??(<	?h*??	?;
5Qb???b\? ??E??He5???V?????J?f?+m????????Z?!&???
??I/,Q????Ui????o`ov??6{??Rk,???M?U$??U%???z6X??;7????J+Y2?L?(U?H
IdD???aO???]??0??\?R}????????~s??#4	_J	?b*~L"H}&?0??????]??l??A??G ??d4????????)??Z$
"XkC?	6?F??K3????jo8I!("??Q%s??E?\?4$Y?"????????"??????N??_1?ldY	??;k:?p???$??H??oR?\????{Y??S?jp?Q????8`???>???????D=?gd??kT????`x+^?D>?*(P
{?l??,
?mm?????h??H??t??nk???<M"?,?#/@?x(?R?Y?Q???tl}L???#mu5?PT?$UY	])?d at 8?
j?>6?I?0?$?I?t/???%E
1???T/??o?8?Q??d?}?(B?B???????????JF??yX8??b!t???Cp;t?g???:????B:?7?????3/??k????6k????5%?????g??????0?
???i??1?-
????>?i^??9?x\?F?
??R0?$l?!v?5?5?????a??.??>???????^??
??lDJ1naH`y??~?l?1??LBD?%A??B?.?r?1?3?%&*h%?(??w????M
#????b??p??N^5?W
[Z??Z???Vc&?%??]*?{!
???;?L????C?S=?
L?V?????T9?????{:A??V??e??(5Y??cF?>^??l?S7?BJZ#?q??????Y{kh??2NE?F??Cx,?????j?)
??%MP[
???W!?a?A?X?X?0???U)??'W1?"??wI?h??R?H??????Q???y$Q???4????AU?i?7???I????h?T??w~W???d????{a?9?i,?????E?wQfH????"? H?????6d&<????F|???[=~?m?<?z?'1?Akd/????RL??:0P?????F
P*1?C??
?tS????
j??v=?V
k	?"C??1?@? 1
??@??j?m?q0~???a?A?????W
?Z??	;?$t???;-?C???R??Mh?^??=?????k?g?~?<:?????
?U?d?2?b=k???T?au???.~)?]h|??V?@??G?c?-%?-$?v??c?t?n??????h??????%-????????D?$:?(??????1?;sO<+M?i?vVB??
?Ve??c?Q?w?F?_?L?????jC?M^????m??I?E??xV?x?<?[(^
C?6???d??1:q?V?0m??U&???a?T???H?i<?.?I?d,??B$ ??+"?F	?I?]o????gb?B????1?S?O?k{????a"!????D?%!??mMV??????k??$=??#?d??:cA??,?)6,??z?n"5??Q??o0??0?,?C2Vg??U?O?N#j? ??????b?$1?????????I,?,?3??i???pT*R? ????!?D5;L?z??z??C?B?2u???E?Z?)?`<???
???g???|?$O|?R?HJ?%??????X?ZiZ$J???D
?~?
?'??'H???{?&??
???M(?hX???????R-R?V?B?*C?
(???i?b-w?5?d?Sa?????q?w9???????????PJ????YC0??5?(??m4??b4?????r_/3??\Mo???????l??n?A/
?$?!~?'?P??d	??e???-????Z??????+R-i?ke)X??4DM5??$??!$?D????Co??>???_;H?f??Z5?U,???????? ????
?#??!???U?8??!?'?6MrvG?????:f?"
<[B?A????????d???1?W???0?|?x???????,=?7?"*?)?(j??H?Q< ?z.41U???]?Tr<?|?4>????t??+??????Q?:??9??Uio4??5t?n?%?
0?3??6??%?RCh
M??4?????oM??3?$PL???Mh.??????"<?;????	!?#?JU(?qPg=d at r???a?\??G1?=,?Ia	?????\?4?:?!???_H??D????_?[????)L6R??lvA??F?J+?`t??J?<???`?C????iJC?2?4?*6?v;@m4???QY?,?`?x?vEa???m????8}?tV"???q?Z??@eqZ	????
8X at b?44G?1*X??\7???:u~??????;?K;??#??E!?i`?%???-?W??O??,??o?I?S5??{L
Z??>?Z?na?~Xx#?zeW?e-????;`?j???#Q????JG??????#??)$???????)hX???H?3???B????B????lY?6??Ur?i?4r?????HB?$???????-O??l???E+?a?N?i?*0~?k??=??
z??G???@??}?@???B??????E<??h
"|?	?(?l???&a1?5R??@?f
4?$????m?%????JRt???+???tC?;???P?"????	?;??
???(???7%-?????f:?????E????.*g3.?u???P
5o? ?Kk?????Wy???Y???[??
?L4*I#Ddq???????D?Jy????h?I??=?R5-???n?y???,?3|lL?N?@??R??/??T?)?K?x.????<???4?yT-??8C?a+MU h}??~???ps8
?D"R'?,?s???Y1k"??2M?
Rm???i?!??%0[???T?Y
?D

9y??cLliBc!?9?	A,,??<m1'm$a??%???I???N?X|???d?E*E"?X???mT??"???Giv?"8?h;9????s8???yZr?gK???"?QF?$$????2?;?:??a+J?0??? 6?BVMCQ???\Zs????S?Gb????M?8????????z?"??x????????n?WXn????L?H?d6X*???????i?R??1'T?B=??,??V%*R???N?g9i$0??R?,+??]?A??L<??w???????BvG?D4?n???N?N?FB?	>?????DZ?r?3??'3?E??u??k?*??????
m?+?I7?VZ?Hm1?~?K??w???vZ?#B)??1@??Y???[76?b???c???HE	?ab?sQ??{1V$9
?L5?
Zy
??&??M?
??3????:??I!?u????e????l?m;?M????)?S
?w??Y0&?v?l??% ???s????5EQ??H??eE?h	
:gg??&??5?o?7??q4l?N????2H]Q?~????"?"?8"???PM	?/B
???l"<?B?x??_???|?2.?s??t?P???n??D????WG?U?O??G??`$?^????????K>],1AUE$#????4?pd8???|}K?P?"?????&c~?o?!2p?@t&`????>????Y
Kh?)@??J?^???|??$?!Pk2??g?&?O??0C]???(?{?
=?=?/PA???}Q?4?????<0
?T?`h?	???Q??Eg??n4L?? ?|?O4?????,00I?3$n&H
9?	?B?r?r??????'?%aI0?GtBJh5?4????=[??,?h????i?[Y??I????R???@??J??L?A???Ph?
*h?i'?14"?0*?e?B-?0?2&??L
 ??3,?Y?'???zs'=y????fCR?`?B?`Q?U
}6I?3????	Wa?.)?Hx?????
????4?TP?
8B???aR???r?AC?*?T????6??9?YA)??Q??dA??s?>????6jn
$?E?,???[T?,?E???%?QM??
????y????]????????^1aw{"?(D???P?IBU'?'???|A?}?j?Ol]@? ?(F$?J
`???-?????????@??????t??$}???%???8Tl@?7+????}q}??S?JN????9Ro????~?>???GO?>??i?glb?d??)lB?X?
?Z?Kh??!)??Zy??;uUU?Q4?a /???w???m??c1v???e?X?0m?6?~??s?m??i??[????????????P?I??????
S
"<???0M@???,?:??$?%??y?????(???????Hq??d1M???@l>w?? ??d?m>c
YA????5H?F???o?\??V?>t???a'??IDa?!2ZX?????1CG????L??6???e????6,??)
X<W?????
f?
I"?????????:$?? ??	bJ?6V3??QQl?f????mYb?hn?????[Z1Dj
???2????89??($GR?CB-66?*?m?t?????P>?????$??n?#???ViJ??6Sr?X??"??O?
?????
P???G?y??Z?%6?RH????(ZT??|?>zr?<??sOmTVSI????SV??X?ZZ??j???KQU????H0bD??`PX?`?Z?????"???i
?
?G'???F?M?<???n??????}?q?CA?2S?J@?$?rz??x?e???A?c?>?'?=
?!??????#8?????$V?<!2
?y?????
SO???xp???????{?6>??nk??6???g[q??Q??/?c??tO6????u?????X?B??$?I3:????;?qtk:!EZ9?2Q??o?0???(???V?%$T?@??Q.?d0?``#?0??<???????k????\

S]?S~/x?#mgT
??A #?e?[X???`x?J?????Gp??????(?	????????}?M"?E)??r=??Q??
?I?*?lO$~Y??yy?????
f0!o???3??t?>?[s??8E??<n????1#??*[V???}v??c?????hsF?!??i????-[c??l8?:F?????7l???l?????kf??Z?C#,?????,?-??i?
?f?????,
???M??"2???F62#j"??????e*?
????50S???$Go??N?PK
??I?#?bj??????9^?)??r??l?3???|C????)??lk?h???e??~?3?sSm?M??4?????X???d???e]?4(V/?W?????0?@0?#??#?T>(??q?Y?5_o??<?>?I_????MU?"??H?????{?@?G?{?	??UUB?=????????2=k??"'?Jb2H????g??7E??\?J?{+=???<i???)S?????X???{????X?y?9KV?????????k
X5?Y????1q?!B??k%????~e
?|?Q???TaF??
'?iU?Y3??x?X\gq???i.?0?zSN??y??n???jx????U?D???9 at n ????-??)???T
j <??#?G?4.??-??>??<?A???[??YDY#d?vA??J?0:Djr??0?!?9?$??????t?]$????\#.X5J#??d^
??c@$??.5v;?P18
R?mlPR^???9??C?-??X*Q???D??(?(?"?"?TQ$Qq?????o??V~&s?{?$?w????h!??	sy??#??t?#U8???????L\=M???????O????V?f?q??X0`??b?,?YUW??>?m?1?;???????_k?HI`F$$??W"??I????0????tDH?c$???8?|????Pn+?]`?M?@?V???
/?
}Z&?;?????b??D1????BuOQ??????.U??X??wF'??????2!??$?BR??*??????~]????Mf?([b-%j?m?e??
??????[%??)?3&?Em4eeSSTEl???%%??VV?IX?-??kT?R)?????H??5mF??i?IcV,?km??????H?RLD?MD?1[j?b????????V?(???KJQ?q!?-NC??pS?u??o!=???6C??=?FbH??de ????Bw:??_tf??U@?j???'g??'?[??'?,???????????]?g?{?P????u?f?mU???M?Z56??J?f?$?Z???j?2?6Dn]??KlF?-?:???&?M[fZ??kY?Bl?d?jb<N?h?D?*)r&1&?n<??y?h?}???0#Hd^???
?? ?C?rAJt4????0?a?\??O??6X?????4?Y?mg:MD?6?/?G????>bM??QMQ???u?yc
?@VA
  ?^?????1@X?d????jC? ??????=VH???E???`SIV
KSN?n?rc:???f???K????????<_?$DXEPy??????N????;??QFDD????????G?G^@g?=9??9???Z8?? Jl?o#`a?Y???????????NR9????ad?P; *?$?????9?$??Z??????K?@\g??l8???B???'?qat??7?A6??o
MObcb(??I?????E`a?cd?@??W'?6iA???`T??n????E??3???)??@_*??U(?B
@UOo??rX&?~??8a
	d8?K?O??Bg?<?R??QJ%???4???R?u??c??e??ao
?????gvtL??(????&??0?????B?j*-K
'???M>?a??k??m???
fD???RV?DW&??? ??@??\a0n??
"kM??CO?
DR?B??p?????D????	B?*????m?l??????"$??e!w?	H?
9?F#<????$|??"N9$&P???
?b?mI?D?SG?:?EY>,??	6??hd|?w?.??Y#B?l???"?Q?G?1?
?u?dH???????~?}?? ??Y????b?;???H?-?;y?b?n?T8N??_d5?????{|?gs?cl?????\#????965*??c[o?e?t?DJ????R?I?4?'?H??}`B??>?6?VH?3????4?\????yi	???&??k
V:@??????uk?Sd????t??4???J?z?T??? 	AL??v????O|?wG???M??)????????M-?LN,?.IN?????2?M??UfI??R?O-??(??]L??p????? ry
????)??Z?i??M????S????bL%???%]"??_???h?BUG$+??????I8?@?2DT??y????P?=??????(??h??()?K??A???{8?=??*S:DX????Oa
?K ????=??6_?0f+??|!??"??~d.8T	F?/_????????AC??&ILP???I????y??p??????P[q?????????Q??IM??P????&?????pe?? ?__???M?? ???F?a?o???wB?A?jJ??Zy?????????f?Ye?6????2???????CSG at l??/G?$????
$"O???c?i?^??[Yn?????7?UU$3-M??F?$??X?@?G(??S6?
????My??M??dF?T?A?c"l0????|???x?gI?|Y????y4????F????$??J?,{`EN
N?%?]??N??<??_m?5?8? x?7??o;x??Y?L???*?Q???????;0?#???????<??????"5??-QI$??.?MI????????'?????????R?(??I???m?<Ux????t?????
a??????T3???????H?d%?o??|?????????|/IX???????Y??Ve?m??J?iAd?q???Q??h???????>K
z?#Nc????
??BpAt??`x??GU=4*?BX!??_??????
???f?k-?o??{b???J????py??M???U??D??m???-?TSC?'rtX???)???1?b????l`??m??%???y???I)U?z????????ac?iLS&g?D?dR,V??`?U??.XnTpQ9X???m???i?m??{???m?
&??L?
??3??g1yM????f????^F?ccfc5??=?L?????????i????k??%????????#????L=Vs????????q?????hP???????i2I<?????{M
?KAb?
??@?Z????)?()
*?E?1To?	????\K???E??????l????'????/???0?r??|?~B?EB????Y???us
??NG????+??<"????w?Mdjb??$?????
??b`I/?'wm)????#?????W
9(??????b?Rb?
?<8:i&oH????E(?K??Iu???	????
???!R7?_,?h'G?????????l=R?m?????%?zE?%???st??w???Y??N
?@????=^<??A?@?0???z?>!?6?)z??
JU???$J?#%B??!e??A???K
???????x/J??%	C??1jb???z???
?B?????????=????o??[?O?@?'??H@??x?X???S$?y????(??????UF?Z?.???A?^f???]Q????UTR\???/t???v?`???u?-
???:?Uu"????h<?=zA??h?(?Pa?L?bR???@Hf+Ul-???a????????????T?-(b?b&?I`_??\a5??4-|??}'???O?????L????1??9%???i?2jUl??!#&?a??[B??t/??@R?p?????xf	I?s?z?<s?=7o^_????X
1t???@?)
??}??>
?[??1???HmYf??b???-
??(A!
H)'??RN??[&F??1*jf?[?v?????m??R?d??i?oQ?"Z????????H?'?A$?K
A%??
?#=.?M??v???????M???q????.????u?	?sZ?i-??+%g?qe???Y?????s??U?5?Yf?m&f????&tu?n?t?kk6-2??[v[??8??????

?Y?
|o??;V??????? md@?lo>m?xy7?o?PL?Rl,?*%????I???e
??
??4??X???|????Vy$0$??fE%<! ??``Mg?Y?Bhp?8??4? ??z2?,"?P0??'c%E0?L3 B??;?He?M
y???
a?bi-?	*?>?
?(k??%	?>?8??5
G??)?@D.$?)>T??cu?_%t -?ahPA)[BzvXt\?1???,??I??????????<?aaG????x?[!0{ G:?,????B?6?"?LC??=C?IH>4@?B??D?Asm?z?D<?@?JH?Q??A?[JGR??n?O??M???Mh??e+?B?1?R	
'?_	???l??c)D?Bz????????
KaH?:x?o?-??i(3h>?8<IQ?????^*P?Jd?,.?h?
??7?1??v??y????I?????,(??c????cf????CU?D-???p_??A?ycYV??b?3????c	?D???W????+"?*???dz???%
@??N?
	A???cL?P?'Jy?Z ???3{{?IIE?'BC?Y??:}=???0????G?H???\?1[?T??D???4`??R~0?CBP?H?[%??p??LA?AJ???@?Ci??????6N:?+??,?
d??JH8??F?????????Zd8?s????|b?e?6?%)xQ
??2?G*?0 ??T??? ??????X$LHAt?.?4???q??X???8?x>??6??v?????????????"?M?bB??????aWkOez	????yT?????I?
D~p?????B?!????e????p?vS???"??????d50+??bB(?sCIG???)5??0?FF?N??W$Q?h4?H????0?0L????b$????'k1qx?I*?p
?R?W???$??RF?2M*??I?\?2%????T???f1
k)?\7?`????v!?F
?????R0)R%$\b ??P:??E
???Jix??????D?
?3?
?"R?7?????7?????z??r?$??G'???????O?-?-??A?Ds?>?bv;?????B?????????=???^0PB?
???I?D-???h????>G??O????#??RR?????8<??%???
?q?UUj?(C?A?.???_??)?xp??8?}??????Xn@??eUa*?e
?_p??????Nt
?s?}X)??\|?|???|(?R
~&????6"?0???v<g?J??B??????[V?2Ii?&?5??2?2?E?;M5MC?A???6?????S?}7?].L????n??;&???J-UD<b$~Rn???q?	??c#???`YH??/y???x?v?'?o ???\???HF?5?d3	0?
?6??????????H????6???7??<??$?2?+hZ???2?dld?*? h??l?????!ZJ
d???eAJ?w???,???E??L????T?J?i?????????<DQl??J??;76&???F2??u???$`/????????0?
D??!?l???b
?J??A?Is????p??F?g??~R`?#t??I???jMT?W????U????w~???g?-?????'?(??g?????#5??7YK>6
????5MX??T#??E?T?<D??i??"&?*
k??~????z?R?i.????TJ$?$(07???"?????D???}?
Y#Q>]??#!
???+f??l??8!I5[k,???d???^=???j?dV?DM?D??vn?4?}H????`???N&6D C??????DTP?DM ?B????>??????8?jj?M??[?YIc?=6{???vM"?A???p??4nIIT?C??G,??);#??Mc*???bd???B?@?NWnT?vZ??`x?%?????4Y7??7?c??r??qf ??
??PQ?2?;n??9g6W????g??3?b#???qj???D??)A8?M?:?r
~N?x?H??g@e??Z?p?0??n????E?I??5??!?p)R????bH???^:?,`??%??a-??(M-????h??????K\?#2?`???H?IT????oH?d??4hMVib?Ax???r]?b
"??I??J??0?f?g???M?
?!BKX?????????(?w????|?.
X0?T???w?7???T??X?c?dt/2?'!???L?P?????]?fN??I????2<??G?g?hP???)c?F9Z?K?????4T??v??	?%?0
?h??????
?0?]?d?6?Z(+??rS at Fq??m?-???x??bLE?@?-??nr ?WsG?
W|??o??O?n6?1?[(?z????s?b?$
???,?B???????#m6???C",????q?????n?yw,?T?+$?O?(&-??e?4d??TfGfq?6dS(?;?:I^\XU?7???
???3???J?[R?????'H?Nr??1?G??????[K???h??2Y&??5[X?	?7??????j??i??????????q?A?
?=F^ ??D?u??p?G?I??
{?/??Y?Y????	??[o\D??cW???UB=2dy?}	???!CP?IA?M?h?Qm?-"??????L??Z?M?5?gsg-??????^?Ny???d$;???y????X?????<??CaOm-??N???)?o??Oq???'?=!?????di?X??b???5??9?i?i?!?g??o???<bW??>Q&
??(F(?<N???P?????I?&?*??
??l?M>?g?y?+T?~}m???1??????!?R?bKCX?zx?m?WP?Y?E??JE$D????E??
???
"?PH???V???x?e_v????VM?1Y?S?AT??L+~m???~s??G?u???S?D?d???4G!??[_???m?z???|??????*??u?-l??G?D?EpyA???j|q at x?$?$%??Pv`B.???9<?F???,P????
?
G????e?M??m?h?|?|????el????4??a????A???&?FT?;_?????Ac??D
eY"?????(K?\m?M?c!?cR?2alE??w?[?k??4d:???;GJ-?ZF5(
?? ??AC^?iaI^??@p?
?*$??p????u
z???r??M??=??2???|???-?@?$y~.??Xt4I???????????R??R?,????????u?c??G?eu???y???m????;?SDs??T?????eHXH?)jy???Z????qI-4?dJrI??+??]?L??????5????(H?o??|S????<N??0`?)???6?X0??c?2	'?bJ
G9?4?+mo?Wl???h??),?kG????=??|?q?N,??t?FR??M?P?n?u????v*???,??????d!?_??2f??y??N?}?????kkZ??BD at -?C???????>??Q
`_?6e
???H??
??Nh?RF2l?b??d~???	y???I8H?????n#??0??????I??}?2z}?????_M??

(ZY?'???????Q?,W?3??W?0?&A????????
????O????B|j?
?T}???q?d?[%?m??7?$?????*([n??I??l????%??I??:??M6&f??DZ2???9????0QH?H$????Ib?,YeX??	?X?)m[V?C|??C?
?4N?:?/?????{>?EA?
??i???b???}I
sS?key????2??y?K$Nm?6?n,s????Y????&?;
??m???????Y?(??????|??`s?M??Z??N6~??*?
???q?T???????*KJa9?0???`?A??????L0d?Q???$???f??O??B????A	wJpC$??X??????????G?[#??!?w??Iu?^w???\x????
L??6??44?+??=?l?????{d????K'?"??t??k	?|Y2?#%+?-?????????^Tu?`Aa?{Q??|?????z?=?ig}??(<??fy%????I$????mU??'??????RPRz0?????s??X[?????1C??X?>?@?E???O>
M?o??C?^???#??P'?????3Cm?D.o??????????C???v
p#??????3??3??????N??
D??????-L?6>?6??$m?s*?$}v,?,??)a??q?????Y]d??????<
??I2?A?D ?A:?%????
`?#?"FR?`?YDi?,
AR?CJ??.?()$XJM???i?mX?2???????T????"?PK?d???aE`?B(?
Z?M?
5t??AN??k{b7?m?,??khE??h?Z3??V+)D??L?
??L?n??n????s???h[:/?8{[v?X?!ey?W???)??Ef???Ft"?EkU?????c?3?,!c???t??`l?
?!?,%H?X??(???	?b??6?;z%???"?"??????3?Oc??jv?h???kB?1??>?J???9??p??`?
?(k???&'??<H0??(Mo??\tY2[3??X D?(?0Q???H?B????(?bf@??Ci?=????=??2?????*9F???V?n?v?E????Ua[m?YM?Fy??q??????['??xu???f?f??Z???b1bL?d??'???XPk*J?????8?+!??,"	??g??!??J????e?6u?t?sg??;???s?X?`0?E??4TR(?a?h?&???$??????i??Q??*(?:
???GEAL??)0??X??&????h:-??7??a?PB???H??)`&??mfI?y??U?6??
?s?_????[My&???1d%?X?Z?e??E?!DQ
?????3)XE?Ze???n?{?T<mf?h?o?4??	?j?U??w???S???~?_Y
&??t"N,???>?A???N$4r??j??GVa?*|???X??????t???????n???d??????R?%?HD?H?W?(F???v?,Nr??w??H9o???V?i??b??U,K&??????F??????8????"???|??Mt?TiD$Y???@
w*$?;???o?)C?<???l???neC(RW?B?=?????6??d???5??}?8????]??r??*!D???E???$WAK??I*??]?"???2?d?H?Sd?Q????k?+???p??[
????&?t???q??/X?EI???R??KR???c?????????c??PF?1??	?Fy??JStG?
Jz:0?h?L??-?5???U?x	U'?Ej???(w
i?@R?H3??	?)??8y2? E+????
!@?nC?????}\??9*??b??????????A??nID0>KP at +?????E?KO??~?<???e????X?f?D????????b?C??>?G:?'0"7?	??`?k??/y??g?F??????v	?`???\v$S5b???C?X-??B5C?B	??	???EE????B2$&m-?U?d??V????j??(7??nm??2}h}Pc?C?c???????{ ??$?0?<?>?C??7?;?y$?????'H|??C?????z|???=??j*??T?'?j??
??????h' ?a
.F*?	T?'?dj???X??qc?zR??P??R??v'???w?b7??\?M??D?65"F
5 ???$%??Y at BP(???Yn?MM?6?B?-?i?<?qy??r?
#??>D0?hy?b??D"h???#j?#?+?@`?P?H?	"%??h?&?3??v???F?K?V ?3d?xM?D?R?????=???????Pz5+n?
?4?#Fn$@??2qI?????h;(??}*F??V?????5???)?Q??#??HI?
?4i(4??M???{?d???	"k&D[??MYAkV???o]'?4?o?!?sl????~sVqJ`?a?B?K?5????+????$??!?	?cF?L6???CV?b????OF???x???????xJ????X???q???+??
,dPPbgq<??~'????*?K#*	9?j~O?Re?S??????F???????x at h=^??V??~~~???p?k?(`Bk?N????:N???????????Y?Q?????c=???M??????'q?????????w>?NT?&
3(?&????=? 4?D??`lZ?]??Z@?!?^?NG-??9?!^?o0?"H?tN)R?2v#?????Nu??4??3y?????g????=????????^??@?j??"??i?\???H?tB??}??\???s??p??F;\???2+Y???=?m?KB?Y????Z?p??$?*Z???X:V??o?.c"c!F???h??	?h/?^?#A??85???|?(!?"???,Q?=M??)?0??5?iS?2{?BzlF????2v=?L%F????x =RB??1??:?%??0??K??o"?}=
}O??k???A??????0Q???`s]???2??z??#?-??d????????:I??K[|?<???e?:?q*???r?W??K???r?0????s?
P????v
x???aO?0l?k?n???%?d?o?>o??_X?:\z?#+33???ar??????????????l*?#?I?????xK?y;???=3??N??\?}|???????>??5F$m??,04?1 at D?T????
????_u????o;?r?u?????
?%?????'u0E|?Y?;B3;	?\B??z?V2???cm3?1t????s????;?`?????@?w':?lN:R?,\??qj<??+`S???H@???/;H??Z?(9??t??jO
?
????????)I?????a???^?Hp^\???I?R?R?b?e}??11,?*
?@?=??t?h'??v?q????T?9?J?e??^??__,?pJ???	?A*?+4V??"???G5??????-??cR?#?~=?g?;?R[MT???0`??U???;f)??????B?DD?cQc???,??8??pAX??????e?????W??
^?yx*?a???Q?K%???q?6????`?ouhcm0?}:Uy@??WH
?VY?on ???
;S?,??MR%?2?N%??<R???(N)y??ddd9s??;$??fHoH???Q?????g????&]1m????J?2K?S?]?N????g? ?????
?lA??U8
????7?<???8f??<zy????~?:?k?????????&?{??Z?,?H?|!?j??_>=3??o{?
^L?u????Q}0E$??P?I???????_~?w?
?d???O??@RH?	;?e6???$ {??t?qY?C?K.?C??%?X?l=7?6???U?b??UmUTUUU??????!???????F+aB?????U2
???a!?H?c?b{gN?s[??????'?^aD??1v#???L??H? ?????
?6????????H??t	~?%.?b????iG?2d?a?>V/???LUV4?d?$??)???
?Q2b?0/E?1aI????'?(?-?H/????y???????L??0?E???NF".????*??VQ??b	?q??w???NO?3???S????s????l?????Jx???O????}?U???%??b!?Ae??)%?mF?????=6~????y|?|*???
?>??fBu?6??? g?zsQ????[,R?.S5fO?L????0??%???}Y?a?rc???r??L??qhg?X??iQ1"?????@\kg?6??O???t?=*???H???AzI+?;
?`???arTj61?OP6???????
???g?M?X?????m???I??}?l????<?q???o?y2v?eO?u???1?MfZps
?\2?$???.??-<,??f2???pr>?e??R
??
h??53?????Y3?\??Y??????I3??X	?Iv?N?US????l??????O+?t??+e>?|??????g?-A??'?!m?|rF?,+?C0Ez?g??"?(?BD?????
?' ??
??CT"=????y"?
 ?P?$ud??<????
?pS??&??3?N??r???!?iA??Mk6?C?0N??q?'*??f3,{?????U??"??+?|?8i\?v?^t??????H?s???????S?-???JC???}k-?7|;???b???Y7??'??????Y_??sY4?wX??Y!e6[>??o74????-?[z??????x?EKX?,?????RE?<r>??m????q?7?BI'$PVA?{=m?6?3l??????fn(\O1??x	?@a???%???P<!?%??$????h,?	e???F??N!?i)(u/.?%?
?2????q???1?C?8;?g?jv?c?	a??j?*?\f??6?i*tL
???HHRV??L??&??B?i???#??
Ul??{?
?Emi???M?Q???2??M!D)?NH4V
g?D	??!`%x???NjS?D??b_????!??LOw?
)?????????k??????J?
Z?f?fgU?t??G2:????:K?v????5????TB\?S???A?13
a>Y???w?Ja?x?i*.AtC<{4gO?{E+|#C?`?G/?
?HSCEG%???????3?
???,M??Z????w??LhP?	%*???"??5?2?r?~???w????jq????c[;?]??!?3)???e(*????c?<????,r?k???2WrD_iK???V?0????2??eqCB??/??aG??}?V&?W????Bb[m!?`	?5A?
???BA?q??
??{??*?i?zh?C?cbf?LMF?R???s!q??'????zd?L?????i???????FX6gR??????  ??B????i?di??I??}??x????G?.??????}YBu#
 ??T??-Q??c
?jX)?*S?p??
??????w$?$/MG?*X?E
:?0???)?&?{??tcJI)???M??O:ZV??????g??0k???JE??p??&wW+???y?[???b&?????
tUK?q????l???q?uQ???*E???????e1??D?'?;
??8?QUX>mk?]7?p?????i?)??<I?s?FA??&?)O?
bm???h??%B??U)7F?G??
1E?z?D_WO?:??d?Sk??????I?M?S??#	i???Xd?l?e,w0o??jra?6:M?????
???[????/Q?E?A????n???>
{X???
????:????o?Z?`???LnGI,i??`??F}y????+??#?A?!H??`g?F??]7?????<p??=????l@???y1#d?8????)#/yy?????m?7ro????*???R????#?j??????N??Fa\???????????-]E=?????&!??Gm??"??\V??????????V
?[??9
???
&??bR??%0?#????Q??1?9a?as=???y?=j??v(3?BI?zj??Jq??????????5/I?j?;??????
^?f???7????????,~???l?+lB??5??7u???;?????XE?N?~\[?\??????z????w,??s?#P?r?????+v??X??2Cv????u+S?????L????????????????-^???v?Bo[???Y"????"U?ReZH?O???o???&]|N??-?Idj>o ?3?/X??W*?????t?f????????????P?~VaR?fI???z?1??[??xCC?~????m??6?rl6A?3 ?7??G+{?^?=?(KN?8?g9???|???
91\?f?R?0'??
??#?????\??JYi??im??{?^??:??7?d'?[
????d?&?[B???n????v??,D,?h}?|.????????3?0?W?F*???-?a??\??>??????!?!?f?T???b??E?!??????(???????e???i???5_U:??>?.??@(??????A?8R????*wd??o???	????d????
???(???E??_???a?\hTq??\*????g?k]?|???*??l???QS?????~?)?m-?/^?|??o G??????)????????????(g].M?d?m?????.K?[???I?4?? ?LZgPWtL*?\?0Eh-??????5?ea?*~^-??DC?dm\d??G?g4?{??|8???Pj??8zli???x?x?eKa	?|?`?L?}	????Q?????z5Q?p<6?F??Jf5?B?X*3?W~??O?v?????M'??huw?gX_OK????dP2g??=NN??c??????*og7?0|r[?[?l???J?k??m?i??r??*?H?h~3??x??s??
?
???TB
?A'?U?nSQ??VUJ?I??m??H?=?W?Z?
X1??????1?t? S??????g???Z?Ll???l??k?????f=Bs?R????X??b?4P?H6?0??
???sW?u?60U?vh??BcX??2I?,?Uo?y???]?o?8??,\????
?{7>?b*?????"?Y??H+N???k
?$m{
]V?1xoX?u@~????:?o%O?E|H??b??i???yD????????M&??u????q??}wy????@?o?4?????C????>?w(Hy?????f??	????h???$?e??7?0rOrJ?v\??hr?????=!?()??????d?,???&???yE?|!??~????U?p????7??%}??{2??O:?rMZw??????"??T?i5???????????v??Z8}]W?P?ws??=|oK"6~??4????z"??U?Z????Q?C#$???!??,???	w?f'??cZ??{?q`1Gu??]?s?`m?,I???[{A?Q8$??,?S???????(R??"l????zSx??????????vC?^t???
???hV??z?D??ZLD?x????d.????????u;? ca??)?=?9?~?s?"???/?g????'?????'?']_{k?????G?uH???'-??j??2???	s?f?y???K??
?E??!?N??e??Hd?,K??z^???d%???yU??=?????j?A??3QI??[????'?d?_??KBi?m??nE??;Z??Uu????m?1C?,?T??_?b?L??:?)?{?vc??t????!&@?)V?q
?v??=?P???????Q2??;?#?Y.N?{?+???$???e?hR?CZ?/?????C??1?/?}? 9v??????W???C???H?xq?{C?lq?`???v
I?!??<?y?\X??p1????H?	???b???<?????Esn??3U?K?h??)?#
<H,;W
?z?012??H??????7??D???F???xw?Jy??}?O?Oj?
RV?U
???????w???f????_???6??>n`?WA??~JE???K??)??e2?>g ??P-i?
????????????}???Ak4g,?la??!c???W:??
;? ?4gDf?aof??????({G??'?????-?ra?O???C???@r???O:??"vT?%?y??B??I??:OY?_?Lnra7??????y???F?d[?????8?K5xg?$???mh_??J??[?9??]??	;?s??@??"IP????
1??La??yU-`5????6??2??:T?#z????0???F??[C9???:n??b,G???"qx?J&";U%p? 	??X~??\YGf{?_?#(?????9????g??c?????O???rjf?F*|?I?}%?i??VrK??
?`[? ??)?"BX?&??????.	?cn?<~????q?"??fp?\?<c???}K?/??,?B???6^??Yi\?i???
???e?G???]?_??? ??H0B??????!|"??L
k??IS1?k??4???:+????i?eOF?M?Z?ip?'?L??XF??h??????\0O?`"????MsH?????:?3??C??z<?9?NA??????r	__~J?;???C$??]S~O?t?????;?H?1?O680?1W??a:?B??????7*/C^vv??OULV?d???y???Y?????2^E???I	????
}?w?+???????????gA?`???????,
A???w@??EmP????q???????F????_w7;? ?7O;?`???????z??j 'w_;o{?????dn?K??t?????_Z?&v?>N??]?@D??v?vH?#AxB??:???kx{?y????????
?????A>?vn?:N6v??????z?y????;????)??????G?????G???z?1?`'?n????????????'???Y??yB????0_??*X???????/????????^~N?v>?E????v???#V?sr?Exx?????????????x??
?c?H??I??!N?j??v??a?{????F2 at b?a9?;??w??p?K??Tc???4.?@Uk?_???N??[????|;+?.?[??y?YN!9-????l?
Q????T??e
1r???????I?)Nj	?r?.??^?qd??<0???PLnU???[???1?l???WM?.???Jl
c???Xu*?.??G?>?e????Mx?kpZM???I_?J?-?"U??X?Y^?M?_?]???????????????b$Q??3+??%?L?W???B?????
a?n?a?????
15N??Kq????+3s???+??\??Y?????[?3?V?~?e z?mg

--- NEW FILE gnome-yum-0.1.3.tar.bz2 ---
BZh91AY&SY?F?`?????????????????????????????????????????????q??M?Uv?A??Q
[`@
?at?u?{?
]?????@???[?w?<????????y??k?5
???n??[i?|??>??v?u??-`?`
	%TU?jU=?N???9???8Z<???@???v/????>?}????X?}???????;k??????t???N??|}?zuR/??s?S???P?Z???=???)?`??%0?0*a??]??L???a{???xtw??!:x??`u???T?
?;????Vm2???8;P??U`??p
(?`
??#??????^??k???[??ml.????\suU???????

	M @
l?4
4??zLh??j??SS?OMOE=O'???????=S??%?My?M
O?=???Q???????T~??j??d???z?$???&?@L	?4	?!?S?'?L?&M2i?d???d???C&E?L&MM?&&?`##???h?f?MOd??{F?????PD?
G???????5A?eLO?'?????2???OT??H?4???d??#
????6??xo????BH~
????7???6I??H?@G?S??
?? v??U??e?b?t?%p??@??`??Tm???????No/???Id@?
???W?7.????????mn?x????x???r??{V????C?SL??????D??f?)??%b	??)W??U??R?,!?5??>???sJ??GK?M??=?xXo??r??D., "|?????'????mp$|?-B???????{?W??>g??Ct1N????s?L??%twKd??y?`[??E{?w??L|??!
	
?~??X,$X?????^????!??w?????n????5????V?'??b`[c?9?rR6????g??w^S??'?D??Q??????<?>NW??uE?
k??}??u~??Y??????v?????l)?6`h5l<????C!{??!??6?u?i?]\?D???@
?V:????SQ??????m?'?????]o}o??y8?i?0??Q
 ???????L@?	
?????k????
<5D4O??uh{?O????????????<?7?q?[q???nGCY?{\??<?Z???6pp???a0?O??z?^f?fJ??l?$!
???9?<?a??/
1???5?F???
?y?cl0???"?????f#?????????????(????K??p.[?/??
?I???T???????Ai1?z??j<>C????2??i??1?????cCP???]????P???9I??&_??#???????x??1??????G?????
???]?P??V.??xb???#$?=?9U?>;??
\??A???,D ?n??*G????|s???
??	?U??_?
??r{?b?0
I-?$]E0
?
yC??~?~? }(
Q?|=+;???A?~??1????5U?ln?????x4n?l????#????????\/=v?y???#,c??l?
?	??F?^vF3?V1???wic"??i??s??.??
cB???x4???f?!v3??D50?>??{\Zq 6????~??50D?????zBd?~6kiZ??j?|b(-?p??9???AU??v??)????M??G??26PX??]q???N*????o?????Q?r?x2m???????3?9q?.?
??????5o/??A?F?1?*????????"?`

??> iY?~l4??r??G5??????????`?H?Wuu????9|??????!??L?E(???C??????~h??C??R????P??Nw+??~9???????eC_????[\????E???fg??}???G?J?ZG?lxtP????k??}??'c???;[O???)?*
2~i???q?z??A?r?~????h?w?UE????$
???K2?b??nX???%k???U????
????
aAR???b?Po?N$???\T?x?(?-?)y??q??O?Z5^??9???^E??????]?{J1D??~?o?a??<{??ME?????=?G?????:???`?UU?"?Q
?Ii????(y??????????????p?p??c?Cm?B?(?"??x?^?
??A?&


0??D-n?A????A?:u????h;>?0?6;??f???h????J
)??0A&??~a5[?G(?r???N?kS#?1m!????u
?+??P??D??g??k????}Q?q7???*#?]??????
??c????
?r??Q??@??\ga??hhB??N/7[?Wl?P??r-Db?mO
??$"
??V??3?#?
u
ho??%;5!g? ?Z^RBQ?"??,ej?d??6??-?
??????U???f???I1?CD?Q	????????*???A???Yw]?#3?t/ahl
'?????e"/?N2v??`D:J<0?"?A????v???n?Y(w7?M6;1q?r?^?u?A????'U????y?PJ?39?<'??n??????B?" ~?_?
??J?1P??'?~'??y?!?>/??{???}???XD|?
'???N(?	
?"#Db?*A?)XPUX??J?%B?$Eb??#UEX?b"1PV(?1TbDc,X??(?@X? ?????X`
C<6????}?
???e*IYU"???d|i@?C??w?/
o??=Aq1o~?????/?eD?"@ IO?????

?X?,b1
Ub?$b?$????&????/?????C'i?Y?????????l?????0?>|?v????????I!?A?oL?????????D??????GB???7?6!???Hc
D?~?>?d$!??U$
"??$?$d
"?0b???EX, at X11??d???????5?=???XJ???=?
c E??Ad???I
?R!!!
????EEb??????????*)?D?*??1?)???"?UY`??DA"#b?Tc"?(?`"?,E@2 (?
?EV"(?0T"
???$T?????b?A??DPb ?R"r???(? ??A??E??+AX?0AQX?b(1U 1?
?" ?j,`?TF0dA?,`?DY#?0B#PAA?H$D?b?(E??
???Q0U4???s???????:A ??2d????l???O,??}?HR@????`?zFK_???>??-
b6Ra??Y@???t?1??{D???~?C3?y[??+5U???iQ????F?>???T???????B?#F;???/?WE??????q???g?t?;?[????Q????\????k??1}%???????????>kV?:(???#??U?/e???%?Z?a?6:;?????#?,??mB2?1T?E<>Z|??2?`??*\tR??2c???
???s?t??????????J????$???"?b:????KtrU*E?????r?????*????]/7I?$o-?p?g???a??2?Yd??d)???7?3?	XpFX??n???D?q??2????
Dzm?,)1^??z;9??!P?n9????)u???
k0??m?/ct?*]?384$?'6
eGMj??	???E???~o?JW&??X?pb?????2??H?z
^DF??*:?
sAH??I?d???D?z01???+??EX?b?t????)?,????WV??n????????%???
qN)?i2?ei?f6+X6?R??M???:L,??b????Rt|?(????.&?p?Gh(g????, T@????"H?#!"???_????????????c&??r??(??t	+
????'?~g,8wg??ID?R??O???=???9???p?n????S?<???`?m7???G?!??uW????g89??????r???mGc?e<.>??.<j???v???????0?/???U?V?p???4?a??Y????G;??g~??<????.??WN<?9b??N\ ?x>N??bz?3??9R?>RI%u?v??I?lF??m?z.???????wt??0F???}???
???]'???)?j?J?wB?r?c??Y?N????`?4?,U?T[eQA~??
?uN?+??&f????T??\3???/*???)F;P0v?yb??V???	??*!$?<?]??4??AU8wu?{2*:xd??1?J?TB-???p?$????"p??s??T,Q??@?K?b?c.Sz?
?Ub?T0PQs???A?g???P??p,?F????',??.?Vipf+)~??V&?????5??Mu?T7?h?F?n\?c
??6?aQ?????:?y{q???H{/yl3???OK[??????>R>?|??????D|
???S?>?????C?E?\,??f??z????_?J???[7??????I????dM??d?k????.v?L??????&%u?vM_?v?`i???2\"???l?Vk??:@?i??
(?2T? ??,X|???0DU??H")<?
????.?XO??_???B(d(??;??????l?=??OS???I?S??

???D??|g????[??????<?fj#u?x?????{hdx?o?a???N
??vk^?
??????|????????Cx????????q?,D?}?X
 8>?T?K<E??&???D8?DVv????m?x???e?;?p4w?%??.??7????I??????????td?b???v+????6?u??_??????x?T?h?T???e????s??(?j??"??E:??????W??????W???
?8|??????_o????B??l????hg?????????????
By???Eb??0?'dDP??!?O?X"k????C>Y6hBdO??? ?Gk???????
??X1?"?PTe?a?b?b+"?`?TTX?AQFE"?????p'?	????$??P?BiD
-????T????CV
P@?9r	!QR\?R??@??F(???T?%??a????RN???{u??	(??_v?-Jv?"T?H'u??n7???"??5??(????????:p?=??^?7?U??????Gxm|???{?@t??????X?!?k's,#?2?g?N?y7RD?e??N?R3'?e
_g6???VA%j#Z?(????O7?[???q??1???8:?]???m??6Yu?e7?0AQg;?M?t`;?????O^?h?_H?1zt^oc????qz??;????\??A??R??q??2??&???
?@@?
(??G????l?l??;c??zg[~
@??b?Ub????"I? ???ZBuR??.???G????~?D??5????v?Y,A]s
Yp`7?1?z??)?jOc?8?RE!?5?,?s?0???bhe$d	?|/cI3?w?LRE???`?!?D9?u8?1??

?????=??
*??}`RBD??H?????U[???r:?RLhj?G.?t?S=h?Y???????1???}T?-??g?????>?E)U??VyX?Z?????rOV?????i???????k?}uO???b{p?gVA??? ??}V??S???????t7Z>?'%????Cs?q?~????5?>???{?Z???d??+?????K[j?E-??wX?g'o?????p2?????>#?U?G??!?|.???u$3[??z;9??v=??????1??????B#O?Y6??ji?????t??7m??eN??	????@x`[?y?=w?????	??	U???-x| a`N????VQ???A?C0??_???`?'??2?	5?|?D/D??P??U<?????iO??A??V?a?$$%R??b???b&8?	}?UF?Z;?????Up??1J?PaU?`J?pz?@?@E?O?P%??q??b????,???ek??;H
 ?c???Ni???
xD????????R????o??0J???????r?rWYz??etl?
*?V*q????
(
0~T????)9?I	??~?!
??X?i??[??Q~???[=???????W=?????z8??HL~??????????N???N?^>?????
$?u?3w<?y??S?P?"I?????l????E?Sl??['fh?s?EGl??????T4???>q????Lf	f ?GW??x/
=??.????Ia??YN???G
???I?8E?l?ca:*?????"O??O??UQUb????????{o??????IURu?C??p???=?]<bD?3`&?3???;?V??r?(?==
?zk?DU???
 ?p?{	???Z?M
I$A???(J??
C?_V???Eb
E??V1D
Z?+	Z?UX(?"??"??b(???*???$
tl??|dU??????T5g;??c???">????d.?a?,e??[?B]6????X???@A?? d?g???W??q?????^??v??
`???%?1??????W
?\??H??er??|?'1?6?????*d?????3???P??z?E??OZ??????B????
?"=
k?W?A??C,F0??~<??=?l?t
Z?h?%????t8dB???W?z???.?A!????????
?2?=?E??<?b?m??^?w??W?????O???\V??-&^?????c<<.???]?p??\???????&|?6?,?DS?y`_??PT??2??#~??????6???</?#????M?-oUS?t???????n
??-u??}<?-???t?c???zi	O?zTo?1?((7
07#??6s????q??
???????Y~ 8?hC??!n?????;7?X:???{:?q?~???jd\n1???5??h6??k?D??(????%??????sTyP?d?O;??????:????3??E?nf??CH???$c?M?b?p???S??>?B??Hr?k???;C2{"D?????I?#??b??t-?&Tr??}r?e?(???????
?R???????w??? p??'????"W?6?8??_~???U????????K%??b???=x0?e?b??h??%? S

^?5i{)|+?|?j>??}??O???b??*-P?????????UEX????9????????AADw???V?4@?e?$a??8F???R\?l9????????
?S?????
V?e??g	wM?g|??N??C?}?k?7
????.W.?!???F?z??u???U???0?)'??>Q??@7?*<=?}!Y??0?B?!????KXA?W`??%?Z??XC??????\~<?????X?;?????g?C?????D???J??S!??+??\??u$????KY?_????D?r??fp7????2???v???7?_8?C?P??p?"=.??VL:?????OJ????3?<&q?V})Y040}?????$(?,>f?%	??3?? ????u??N?n?????
?o???A?????J????l
???1C"?9??>???,cq???l
???G??????CV?;???0??
??b??C???u?e?a`U?GD?&7
e1	??????;????????~???H?W?`????kD??6^i3??4?SR\?XZOE??i?????o?z??m??q?/??JB?4???-!??8???????H??@M?A???Q?n5I?(
?qte?"jm????5)?Un"[3|???o?HZU ;PL
???$=?#?&????T_??Xj	i?G,7?G???v???A??@??B????E\?????K-0Q>?????r??|-@?u??>$???bc"?
[??????????~?Q?mKR??"????cU1?Z?-|????Evn???X??cU?z?????C??>???c?-;????m?V??H0?q^R??t?a^9u???F??0??}???`?bp?b6??&?fY-C
,O??[?6xI?}P]?x????7y(???????c?? 
E??S"
???i??+is?EN?nx
??F???a???"??N[j?w?{??.?~.?\+??K!??t?~^??i???? ?-?h????JfZb?u.???_??Y???S>?(????C}O????y1?t?????])?8????
?/R?*??H$$??:?VC	????Ab?j>5?o????????????;?Yt??i?????~6?C??X
?ta??r???U?f?sn???x??c??T????
c??G?4?RcJo]?k"'?
Q???7>?6???A?T???|?	??????r????K??_y??(????Bvm?,=?????O?Z?xb???4?g?f????????P???*??IDRF?????r??nH?T?{b??)`?W&~e???h7?QL=??c%?Gf????BZ???????J????????Y?F??8??v?j~???.???T?]#????[?dl????#+?j?@N??G????+Doiy]?c]
???C? ?c?
???$?=8???\ ? ???IM??W???X?Z/?????
??%?kw92Y?A??Z??i????c1?\????m???I?.??&6?1Q??z?Tl?,????

E?gin????D[J????????V~1Y?O{?i?-?=-??D????j?C?ZExh5$?????????X??zE??*?????????sUh?Pi6k?<^?0???@?V\?g???f????2????l
????s??m/?8f?J0_#p???^??Y?<??_S?\?+??;?????????????s?5?*??f3$D???&X??f??p?:?4?.3Xc?????%??<?3Q?]??x???a'F??V??}?w????{?%#???Z!?]	
?????*???VO?7$<?k??~?H?j?????u???p-R?D?^?XSIk???O?^?1?1t?	?It$??0P/?N?E?&??8?%Q???'r??w?*?????????^?l?????w7?:?^3????yu?P?A?ox???N
G9????>??22???73?PM????I>??m????????T??{2n?m<?m?3??o????W???T?`??
k?m?M??a???|??????"P?.e??q?;??4c?????"?t??m?XRS??o????]3ag???lQG??]R??????"???v)6?hT????wN?}_,`??o?(?r???"????I?Nx6?i????D)C?#??MD^??]???|?(?T?h?1?Z????*AO?w????,?????
,???[[???J?tX??aG??b??.?%G??"???;<??4???????G?e??V2?r?U?j?3?O*~)?2Gg	?K???wV???`?S?/????{???RR?+????:?W?[???]N????y???F2??Y??bD??E????W?}??el6????????????)D?6??@h4?]?Bo?1@?u?,=??? ???|?X?"C???dX?R?:??b?U??I?G??q???\nBn?n?SM?O???u?<??\????Ql????7??? ;????X?zEt'/??c$?!??????w#K
bO?c?@??S???4;k5?p?F??;??????vP????
??_?R????
]?*t?u?o????? Y?'??t?s????g?c??u?!?'??``?.Bd??*d?O?Ek*?K]SI???hr???{?>??X?h???3?"?9:W?1?!}?O?0?F?2??
?"_???????u?\W[???d??/??4?C???e?<???????x?????W????s??Q?/?G<Q??%?<?G???@?fB`?lcp?
?Y
?????a??/>??U???#???????
?P????y???m?~?U?s[???1????#G???&c??L?\OU???????_R9????|\:?}>?\??????Jm?e ??
?/B6)??(o7??????D??^?''?????????@?@P??S?DW??'?????'k???????=?Q?m#?????? ?!??
??R?????]???~?$?H?`???D0??$X?H?U,??`??t??H?P:2
g???H?@?,cE????? ET?
??M?!?Vf?P ?Z
G???%????F?$H2?,$P??R??1J?3???JiT?idd??d
0*D???X?PSQ?b ?2??y?
>4?x2IA?J?
Q??C	?????BtN?b?n?J??Y"k???I$??Hh?!?zt???????:6???????????Q?K????4b{?
D7R`&k?#^](???T?;???1Ll????]H???w??
?:?q???r??{;n???DA???d?
Hk??a??h$?S`????]?	?"??*?Q
e??`aH??K?
???O&???$|??C@[ 
??T-`m`B?????*?N????T?b?`??/????#?v???zPY4????3H7|?a???af%|????p?C=
??????Aa?;????O??2 l"m
C-?0"V	F
?)ha?????P?s
???U?J (
*?"??(d`))E?"??#???W!0"Ie??,??&(??%?
+J!)??0??X(#%?J??d???p3]>?5?	#?	?vha??%($0I??I?Ya?h???"d???P
 q?:+??3??o&?RL?,?I????D?I?=?)&?Q???uo ?
?r
??l?KT??1?'???/??.???I+??????h?4]FI???ha??}}???w??*???|T???"?,|?l?????, F0H%?k??????^?QQ=?Z??kNej???%(T?????M?????JC??0N????H?M?????PS?`?`?8?#??=?O?I??I?W???}>?r????/s???G???t?????????"`w???h??2
??H?????m??I?sUUUUUUUUU??
"??D?"D!d?;*????*???2um??????h???W???u??L????sq?dhT??
?)?S
?-?m!-????
??ZJx???f,z%?????%??{???sz6H7MN
?*?X*?6???UJ?????UPQEX?*(?ciQ?V(??Ub?TZ?K??K?.???????&????^?v?i???'??????v2?~???g???m`?T??q	???:R???Y??{???????????7>?!d*?v????@1??s??g ??????wM7_O??????o?????~?^#?l????t????{?v?%6H????H???*
{????
v??????&}?????^%vO
?t/h???N?P(??S???7??p?98?f?!?f??.???>???E?`??i?3?g?.@?C?`|9Y0)?	>
??D?1R(??f`T?b????\X?NqE?"AZe?????????3?
o??&2??JL,P?*z.???%b20X?(x??/?????	'X?,??`?????b
??
(HS R?D?}q$??hea???j'??,?gC???uE
H??
%;?	@?B?5R???Po/??q)?? z'??\]????+r????,?
?a???|=?h{[r?{??A??8????b???aG?.=@>????^[?D~?0Z?]?W????Dr???(?rc3?t?T?ut??j?27?vTG	???hHD????.?t?2?T$?m\xQ??2g<k0?J??Sj?73?g?????*zSo{<???68?n??A4???k????2??@???>??/????vv?9????&??5 ?"(A`?dSY1N?$?D?8?~?s??^????0a??:?z$6'4?r???????|???;?.5??gV?u??8g?uc1??g??!?[z???5o??S?z"??>=???fx?Y???&?M??A???????
H?? ?s,??????f?@?@?!?7.?~	/Go????^#???|?d?2?KI???b?lT???8???yC??????RN????tqR3Y? 
!?????R?T= P?p?m),?4|?q?TTC?????|?QP?!Q???"????????5??$ :???D\?????}?n???????2?j???L9}???p{?@k????bb~?????P !?N??["??zx??????x
;????9?? ???*
E?c ?H
DI
d?$?$P?
??R"?H#
@,Y
@DQ ??,?Ad@R, ?"?

,?XAD`, ?T??
?? ???E?!
?A??b??DU`???dFH?
??!$b*?#
	?"?1b?"??H?#
b??1#??"	??b*???? "??1?AAHI ???*?TX ?????dA?1?0D0dA`???
TX?/4???[?5???Ao?f????U?;?@??
`?<????u??Oo#Y?Y??W{????_}???u??[???#??,k??v??t6?o
??J<R???|\M>/??H|????????\,Q????D??)R1W??!6???8{,W?zH ???x?????f?!??cUh(]???.?TB

A??????h:?]?k??y??j?@?,?
`?i???;E???(tD?
[?s?*??#7??-?MG?yIz??m?vt??????^/??"??_?"????)Ji?Y^?Ju??,?{R???V???W?4N??t? ?-2??=oU1D?{^???J??b?1j%?iw?????1L??:r)zR#)?Q???g????^/ui???xYe?(??O??F??r?(?kcM6?{o{??1??F?
?M2???7?\???????U2@F??\7?~/?~>.^??o???1?^???}?9?B??????C?????????v??;??_g??F??W????{??????3U?vs???lsU?Y?*2RBo??????g?B?P??v-d?@?|????#?$Ea5?.r??U
??2??JVgG?2??T?=?????OwG_=>?'?6????f6m???v??e?u??g????4?M" xb?}?:?
?`w`?z)?\4!?[?0?R?????7s_"]???????
+?B????y??{;
??7?*?CD?p
]?j??{r2O??JS??->9?g??
????????[??nM??%N???C???L?SvL?F?,.?FCu `?v3?'_?3?-??Qq?B????????????rrs ?|??\?^#?Yo!4N??`????C??D^q]Rt??? ??8GR?\????Q??V???(c???/??~o'?F??#M????
oe???w???,|LRW???oj6???????C?>?????\b?|=l????P3&$B~M?=?un?d-?5??)o?	?ccM|?@;D0?8??1
mm0+?T=A(8^}??TKn?r??w'U]??^?Z???cO`7?Pi?RT???jjN?#?i=Y??????[?Cm??T@???
?^K]??!g???T?4?A??5QL?
%m???&?$???3??t??E???zgH???? ?0??}??>F???Ux?54???k?Z?]~P@?w-??}}U^?-??????????~?L&K???A<,???i??*c,?	??Mj??C??z&E#??N.?;?UF0`3??x.V3??z?%F?"???????<???G?,??5!W?9?\)?{?-(t???9?Sxs-??????]E[?SaF?0??j)>?ufm??!?1Pk7Y???Z?^]??E)~M ??Zx?o??18p?6?su?
??@?G
????f'?????????O?t"??]A???=N#(?k}8RH??
?(????7xY???]<@y??f*T???3??2????j	?*??????
.?(Ar???l?6?|A??5=$q???zn????:?_wT?@?Uj?`?EZ?$?#E????FfK????????Y??$B?H?4.?M
?@B+*??Z?O?c??z6????ns?????????^`???p?????t????-[?9??????By?	Wa]M??????B????.,?H?I?????m?e??????!?_d?O5p?????9R?????z???????S~?M;4???w??_/^?9??=|?E9Gm??#
?????9??[??????>>?&???
?Lq?r?*7??F|?L?)g?????:(H?0????:I?v??}4H??????????<'???J??????d?????{??Q??FJ?X??p???E?E.??8?;ra???\??nMS????:??$Y|??.!v?u?HWF?5S?O?^N?/??S??3??????c?"???mo??E??`???????^?????m??m??m??2???n????0?c{????;??}??G????b]??????O@?????
)????????S?{%/QS??]?E?%]??{?^?{??}?"^)??o???Mk?U??~m]#???)V?????v-??nD?d_m-?0???}&1?g?|mg)?;??Y????????7???5Lk
??F?_?z??Q???S??Vl????6U???????F}
?3G?/\??CLj???_J???+S????F???G????uv?????=m??
"??^?t?(???2?????@?~]z?h??????O(t??ys????ho??in????O?cNk
U?<???f|vk??k6?5`?
?<?n?!%i?1?#??~5J??????cS{?????w?_?y?vQEQEQEQEQEQE??oc???????#'????+K?7i?p??[0na>?????yy
?v?e?F	 ????;??O?e?#H)/??1??V1??@???3?i}F?k9??oR?,?D????????~??c???pe??[m7?R?d?l<b??r???[?6"Z?T98$eY????
??7x?2E&??	?C?m[????)?]R?W>?@?Wl?IN?}??#?AU?????(??)%??W???z?i?Y????r??n????L?9?vLe????VS??&`?3G]V???CDX???f????.e3???_?R`:?D????????V?~B???~?W??1????Jz?w?????{Qv	?^?y???m?-????????58!fF????????!_%???HQ?q????j?f?DT??????a[??N?3?n??x??c?	??be? ????c7???IG3<?g?oNt#?`?w??	;t?,Hg??+????v??+??\}??u?{F0??&iPc=????????C????~?VB??||??tf?s}|K?{??:e?X??%???LD??	???4TTs3o???^3Nq??|6m??mg@???????w5??	??t?l?i?'?qh??v?r]???D9?9????z>B?E1???L?J+h|g^q?????~*??{??;y7??<??????????+R?-??????[Kim-?????m-???/?5?={>??n??=]?<EE?\????TY???Q??I???c?=?]?????!?s?C??F!??Y?`??@{??{rK???yN???e???8??dp?O?!
 zU?j?Vj??????^???V?6?????????G?xO??z[?P?????9?S'??????v~???I?e????G??9
??????t???D?o`t
7?Vg?G]Fu?J?????????p???y???e???
?k??1?E$?@.~??h?r?????<??q?j3[vjr??I?z?4??/<oX????Dd?";?NG
\???e?=w?7A?:_?I$?I$??ow???????B????S^b??Q?{T??,????????"?}?n ???L????????5?K?J???Z|?w#?|t:.??x??7\?;????7;E7?????<T????r?????Np??y?e^?????ojO19?????\????????yN(i?I??s1??iQz???????p1?u?x??X[S-??`?f??r;?4??q%\??`?xpf??:?????'???va!????/?????U?N??[?7???????????F?`1?G?laL1??D?8?s'>SH'?FM?>???P?wk??r?jn???U?2'c|O?????vy?%???????U??(x??????r??*?]@N#???b?s?4?y?????59xP???????
?`"7h??V??"?V?$?I$????????n????Z.??8?u{???]n???Io?=????Sy???%Q?G4V???????4????Lmze?c]?{]Cm?A5&8W?A?'i?
9?D? ??*r??o?C?d? ?b????\?,?1J>?NQ????n_?????&??`?P??
cn???
?A?&]c??v~>?g?>N?p?3x??I$?I*x?m??kp??yG??S??I??
???f?;????3????I?8P?r?Q???o?4_????w37?????????C]
?QH???%
?b???4?J((E?D
 ?X0?E??RB([ H?2
??{?C\m??ms?60?c"?=h??!??y?m????NN7?k]???[?????J??"kZ2fj1??????Mk??????(??(??(????E)h??b???e4R??jR?? ?1?N!?????w?qb?P?
????$??{?vq???S[?~q;???G{xH?:?g???etTz25?3eA????
 ???
?OQEQEQEQEQEQEQEQ!!!!!!!#2?m???<@8?s?????:?=??Io?_???	???]Q???`??;???K??yh?:?!?Z
v7?E????O^]?>?6??5?,n?????y?(a???Lh?-Evm?zO??%P=~????L4}O?'?#?E??_U?S?+???7sMr?????B???2
'??3@0?]?y?I?}?u?47?Vs?i??nM_?
??M?d?{?L	?5s{?}?-kZ?Kim-?kZ?J???kZ??????[Kim<?:?D>)???J?									?|T??W?^???`l????Y!
???u{???}2??|??@????u'	?/G?????L?D???'-?^????N5?
?z0???C*R?D?:
?%'Z??I?woU??n??atz??N?SN+9??rdE_.Qi????-Gz??d{?o1??E"?,?Y?f?icE?L-&?F??????~<xz?9?c,7?@?m?9*~??c??!??l?yx?k????G8??}:N?????2??W?q?:???ra.???@_`????[x??????}}m? ??G??t2:U??~??????????????????Yz??[???6f??|&???j?c?????=n????J]??S??Z????M???G?5??xqL??^^???tm????}?]??ez?&????|<;?2?[??C9?83?}?T?JUw??????r?4H0??????IT=?Ot?[?;W??:?\.v?{???m??????i	}_???Mx??;?Z??y$?
g?'?b~??7Y?(?m
(q?9??????_?;$??a???>5?|?????U?t?\???????"`r"",X??i[?N4y_'?B?5?36?"???i)A?z
?DH0???4vK?B?
?h?<????Z??wfb?K4????I??Y??????Hqm???A?k:e#?U/?1??{?9m??i???<??QEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE????^??SO??/?????d?w?Q?????N_/?????7ZjL_?mu???????s??[^-???????gJ9??f?4)??D?Y????+?d?}Y?????Jk?ZhEv8(??b???QA??k???G?M^??]???uZ???J????{???2??Ib[l????|/^??7?p?jm??l??M?b?i?B
???v`???g???:???N?h?9?Ln???*F!?????.>l????c????]?C???Gw????????6?6????p?T<???ru4?P?y??
???????s?z??'??t???Z8f?
s}0?`?*?i?)??3??;??;?z????????t'???w&??wJyjSY?`??????mc?2	3???n?yo???BC???????C??I?L?????&Nv?N|??&@????3B????Wv
??^???i?]"?????{??n??Z?}v8
????f_<??&?????!C??.W???!\r"Y?1???H???l?/P?Z???r?e?????U?????)??|k]^s;Y?l1-9??>?[????8?q)?R???&x?X????M????????Rxup?B?N??(??v?89O????3???#????Mi??^N8????????	c???BDc%wf
????
#???t??G?u?'*??2????B???mZ????V?+8q??
t?MT??1?k?sR?o????7??X???7Ow,?H?oA??o{o?\?I&
D@??;?tQE?2????eQE?u???:???CvK"???[Kim.??>??????k????n[~Y?-7??v_????m??DCsf??pm??x??ot?Bvo?????uDh??U?QEQEQEQE2sf???2???	19??>?&?@???d `3Dr??????}?S~??U??+H????J??-?6?????~	?????H???h ???mg?r?R?Hx??t=??7??"??.?!????eZ?#????n}?????9????f?%??Z?????
?P?K?i??5mZ??-8???58[?????f?q?o??{;?^?_4?{???~??????w?}M6t!0??N?)=.w?<&?Ik???Z?@?v?~Z:?A????q?0y??l ??o7IDp???<?~???zg\??u????A\?Y?.??=Oo???:BgV?1??!?G?U???;9?y?P(Zm??9ggp?|?O??o?o?`??7
-??S???'?+?jZ??)?????)???g??G????V??????s?]????F+??)??&??{Q?|??8?A6????_m?w?v?????"?_b??8?>W?1????zs??~?(??(?????o?{`??~?k??????????)??N??<????_-o??i?\a??W)
??????e
?@??D?C??????,????1u(,?1l????d)?? {MS?)????4?:??.?????wL??w,?{k??m?/??17DW????1???|???kk?0????SU?i???A?`?m??6Dn????L???B?1??????cK^??0???6??#u|???24|h"??hF????d?w%/??-?v~Zi??i??????Bv|???F?t??{??sK?8????]????D8?????3Z????l????/?!???{?T?Xr???Lw??????&S??o*
?k?D(w??????;'3?-'i'O????k?????'fo????Sp??dg&?y??l?????
7@?Niw?.?g??3E???^/^Yg??,?????-??m5Y???;???fe?'??=,?[L??L??_?=
???"??	
?X??K7?KY++q???????Z?k???V??m??E?????/???]??h?Z????v??W7???.U???:????a??&'?[z*????{?I$"z{????|?_?S?????a2??Bl??T??0Bww
??x?????_?e?X?e??.?@w?ZaoqL?????j???[??S??????.<@????h??Y??????{?u(?^?;??????<?:????r?n?_??[/?cL?????dY?$?E
????r5???????=b???????OG??K7?????22???,???Nt)????sIw`?c?????FfF?????o`?	X??????*?
????vr?????f??Ay??p???MSb?]]^?????5A^??*?qe?Z?`[??e????Yg?V?_K??????1??b?$??=?????jb????????C??"??$$(????(??(??(??"(???s??-2&f`?ea??3???M-???L?,????L$?N? `??4?z??a?1:?0Xq??#??u?_???b^?eaR?U??Q2?e?C??$???J?X*?<S?>89??(^;?5?1??P??|i?<{????X??	?I?o?$????v??a ?NX1??L??^??8?=?????????\A?????}MIa??????n?#Q?L??>?!n?????m?=??.???_?n;?x?jTS???O?T?????????s3?????i?/T?X^??^??%???w?????j4s?5?S7??|??_??>???w??j?-???\3?XL=uI???!w?_???%???o(?8????<Y_J??J|????>? ??^eZzH?i??U?c??_???~^Npdq???xES????e??f??us???V?Q??&?/???????Dz]?[[W?V?`??}-?r??w????td%4
???'????$L???X P? ?B=?????c?_Jd????Nw??????
?S?\tt???mU
?:?+?(?#???d???Yo???]??I5????eLm????#?m??os%O?p??o?M????????8JM???????m?K???B???U????]?7*??????*??{$??K?,??J?b???eZQ\R+???&?htq?y|???R?R?????/?JyNY?c??9_??2UWS?y?L0?q????Ol??S????k@?wp???6]???>?:?????t?fH??#PU>/???:???az?)?????>)>????r????Q?EQ??h?????????}?Q?H?#?l!]??V?)>?bG%?Z?${hP1??$??yr?B??k?-d?????????6?XU??Us???P?j?+ab;?p#??lfC-IW6?2~QQCZ?Nq????TRu?c???-??4??%>?????;???F??
??$e?c???????????[692t?;&?Q-
0???DH??#
???B(??bDB0b?p0????KaY*EUV?a?i?N?
?u?I??n??????Ws1]?,?\?a??????g??2?s?O?????i?)??????????8}?1d?_???XP??Vg?>n??z?1??:Q?Yb?||<Q,???;????????????9??\??7T??[S???,?t??????????????kZ????>?d??f???P???U?jC?j??^?nm9?SFF?T???(kG/h??I?I?a'y??,?????}??Tz??(_??=???~Elw_)_j?Lm?????"?H??>z*???ju????_j??|?])????nQ???:#T$f?e??~n???.w8??U?U??+???????w?dc?;mB???~O??&,Ms?	???????Z???m??0??<?y^?fw?[??????
4??ux?<??p;U???S?uT??t?p???V?=VF1??^???/Nki?
1??u?#??????kx?W?v?'??G?`?????~;j????|zo{??N????~D????)??_%f???4?~?o??]???{??w????yr??}q?3??w?t??\:????\7?????)?L?:^?)????w\c????:???s??-??N3??'??<4???o?-_?2?MM??Z>8d?8?b???Va?S??Z?9m??????i??????uGf#??????????nL?Y?????????????x???oGWg}F?????:F?*v?\"?e????@p0?*!????zz[X?
G????`?V?????Y???z???9???????O"A???1?Ci??????y$?o???`??W???/?d'?$??1????2?"?Xo???<|k?{???9?5>-?Sa???8??r0?W2????c??h??-?<B??'?????*?hd??~N?9??\???y7?Y.?????P?q????R?i_N!?1??}_???A??3???PR~?????2(=????p?Y?e??B?t?u?mq=?R?k??????mpW(8<2B??{mA?TU?1??.???????x[??nF?/??}?+?z??P????A??`1??C/7L?CH2?Ic!?P?*?ue? [??X\?CWHJP?c?rxv??J?>???k?~Z??L?dW>?Hz?!???A??,???????g????Y	M"!9L ?!/ ^]*?+?g??_?3UUgB???an??t?T?????S??)?????U?*?:?N??????:t$??J?????J?q
????c??N??s????4,?J??#?#p??z?? ?D?$???u?????&:?C;0A"y?????2
V??????\????N?.?>W??_5?kR?b?L-
GZ????0?UO??/?K???jby?S?H???X|??zX?GC???shGA?V????Td$%???r&0?*?? ?*?????6oj?`Ud$0z??@?[?o???????x?G?u
???????}5.????d$!?~?)?2
???*???C??`??,T??"???+	Tk(????O??I????b?-????:V*?????Uh?U]?u-W%?~O?t^#3?J?`??9?Y?k?K`???)`???UUV ?????uU?
??qj??m?8-hR????.]????}??O`tz*?5???=iJ?J??Qo[???e??[4?????)
Z???%%??@fR???!?Vq7?l?P?p??pP?*??&*?|?."\?BA?6lB?????%?L?@@??
-oQ??2u??N??}3??u???
?????|??5b?+?G?????W??:?^e+&wYfyu?n?CV???????p????~?c??"".`??8%?????)?gi?d ??|??5????g?b8??Pm??<?-??E????s??+'???J???y???L??.-?????l
?????2L?????<??????;$DJU?*";?+5??{??=??????????_?z????r+???c
?HH???'??2	?	????1????????hu?.@??????5o?????>?[ERuh??C#???????EUL?-x??L???z??ZT??w]@??r?5?h2?????f?	,t??Rc??P??2???F?????"*???a???Z??t?H??S?J+?C?????(q?@_?8??M?I???Hb???UQ]?c?I??`??!?????????
?Fcg????U
X*\?%???}?M???gD?I?(3??
? ?()L??Q????cN$\d?"?E*P??9?2???8B

?????C"f??????x???\?ZKP??"?"
?????T/?=?'l"??Wx1???e?????:????oN?v?(?t?I%{?hO?#??9iT?V?????MF?	????r~0?
?X??	?y?q??u??}7N!?? ???????l?????y ???yMYa????u????v?\????a?h`???????:?R???f??????1v?_`?3?I??,j4par????I?|???????=???)j?,????^?*?MH????R
?X2????
?
? j??Ri?3?}K?WH'???8?#?,F??F?C?2#?>?EW????1???4?#???*8z?#]??
??U???H*?b?GP?(!?HF?4??-?M??B??c!?k??Z5{??????$>x???1?^Y=??j6?v#????J?G?("G??^H??C
0k?{?5G???yX?Y?????W?*a"??]?/E???2	#"@????????????{_???}???7????)??????^?W.???+N??E?u?????p???
? ??:??<?gO???
?y??w??T?%*h????
?y)t/p?2????Pn??zs|??HcP??q?|	1?&?3??!??
5???@)?4???tl}??Au??dB???A??[?xS?.?'?+>?:M???F*s???F?/0?Y?sSe???=,??Y???C
G??uQ?D`?qL???XP????
?w?`??@F
??"? ????{?!??????y??????
@?<?B?B???&?????????hg??Wg?ai?=???Ua????????V??r??mw?????w?L/??4O??t?B}9?{??tu=???sb?????????gp??????C??J????>???S??~:?
? ????????'???@??o?8?b2t)?,?????????????X0>??k?@@?#?B?w?p?0/cP?K[???u?????o~?????
]wN:??C&???"]?,n??qaZ>???[b`?`h???????q?o?RL?v?Fv????^P^/???T^bEUd??????1????,F? G??u??J?:p41@?S
??Dv?e??y?.I??%???[??.a("[&s??~yk?zy??????_?z???|??7???A?n???q??N????^dw??R???_????P??|UP`???1?!?C2?????CN^r??????`??Tt|??5	???F7)????????D}0J?Q?n?S???????%(r??[?p???Eb?q??v?q??_?Y?o?S?)
?_o>?9G???.x??b??1?H"
?e#??t??T??Ce?u\M;{??s?'m??W???Q???J??}??N/G+S)DL??0?$p?j?????n_D$?f??????3tA]}???x	??H????????H??J??%??>RQ??Tk???????c??(^f????
H???"????_??r???f????y??C??3~?.4??c(????\.????5???;???Z?#????)?????/?P?,???!?e????n???W??Dp;????h?@P???8????{???????`?u??M<??.?XKQq%?|?Co???^?,???t?:1???S7Sw??j?????T?1
??@.??@???? ?(z???T??{h\O????L?@?a$?2H?
?d?j?????d??&*?????r?01O?	FD????????k=??V?k??$??;??
??N[2????d5\?_????oB?k???`????<[L?!??,??)??"}?K?>I??v????38I/O?????>??:?s????9???S?v????T?????????R??????t=??=?,?C????N???*l??8ot\??)aE?rO$??)ad?Bi%??K???d!??Q?k??U?~ ???3? ?T??RqI??????UD??*'z_?C??;??5?N?x?>?'c?QUNY?cEU???x?????????7?^???d???????NP??2=??A+U?J?u????9????{?8|=???a?V??cV?&????-??^?????#*??????8???#_=]??:?W????x9???o??S?s??X???!?????H???&?`
N??=?M?pE?z??~G??nd????x??CO?0??8?=
?
U??j?rD?}?$?za?I???i?b???hI?J?????k`???>
U???6c%?]
??Qs?z?J??J?\L?t????s?K\1?N??*??M????"<??))h?7\x?9??k
?q?h?]S?X kE???/????8???6?I2I!S?bI??tn?^>?[??P???????2k??1?VUxRQ??s?sDI???"Hi
C????#?-t?'q???"?T????c8T.'a?Z??l??3?g????????????U?RG????*8??m???
???}?????A???????3????>?.?A?R
H?Q0=i???1??S0?&???;????????6/?{???2tq??&0?p`?d???{
?*?"?a?????????
Ba???}G??l?BE5?"o????i??4?Dd1?s!
??F?????,]?L????iHu=????O?Dp?iv??'<9|$?i8?Z?E?%C?{OS?j?]&?mq??????i??	@BF?b?@?f>dy?P}@sb???h*?{p??????U<
??4csFv????A?]?m|O??O at a?J?j*?&?]?l7.???F?u??N?eb?/9?f??r)S???n	?Rb0?)?v?I?H????%????M?H?4t????0?????
5????\?=??K/\P????b??!ceH?h?1?U;??5?1??a4????q
[...1780 lines suppressed...]
?4:r
??????????`??K?>?>???????D??C
F????????????g&??c7}?????G????}w?l??_??????)??J?Z*oR<?<?A?nl????-6???Qj??D???E[E?G???=?~l?E??`?as?S'??%L?~??Kk???f??O?D?L?J?????T??d???????EJf????
??????{L???ZM?~??????b??????T???Ph?{$9???B%?Mv
??($XY
??BY?;g,
?m?%??P8?4?????xo?m??(Q-s:6?`?X?
v????Jk?R?,???|4
h(?
V???"4m?>?6M???K	E?????{?????E???m????
?d?'?i??????]??u????????}S-??t?-*B???[nZ?c??m?25aM??J?J?(h)????&K?]?tul~????Q????	)T?:6n?%B?
TD?
d1???X?y???'?1???2t????5!p??b??Q???'??????
P 
{j,!?P?N?7WK.??l^#?A??}?5='4??S??z?k??2ld?N???zk?	E\.)?f?R???IQj???????"l?a??????'??A
t6?
?????4zN???lX????r+U?H~?4K??j!K?d??I	f????}M????-?-?,V???	???<?1|R<?
???"@??U?d"??a???{?)?,??_6
2?D)??4?Jgyd?;C?????o???2T[2?P^????
&='xi????n??	??Q2????d??3?x#??JF??A?,0JFRX????2i?I!?Kp?b???????x=h?<???x	
?s?.????Y?{n??o?Ct?i?a?????"*:Kl=?Rz??"?je???%dr?aM:?C$?)57?
?%?*h?U?P?,e????_??{????'|Q??Hy??`R1?????i?(h?N??????GC,??DL`???:?_f?????-COI?q?e??m?
?]ua???????"?
?B2??u???????		=X?s
??(f??????? ?C?70????v"??a??Le%b?@??KAbn?d?Ox~??h0?R?)????
???(?0?S?9l????o!}??
*R?+??5,cNl??????e????&?HY??3???M?%21$?`'=?1	? ??#?o
?SE?]X4??6H?ad#???$?!?J??H????FL5??+?&?IU?A????]A0??e??q3??D-?Z?E}???????s????????c]??????>?O?5??!??{???v[???D?tO?j?&0??ZZI+gY???l????6Cx???Y	>Dp????IT??6???k<G???C???
????(??
?K!d???j??2???c???H?;?<?=????JI??(>^????????N?*7d??n?h+
%?0??CE??e?`xGM??
e?,?\???n|?/mhQ?x??'@"???l??????c??~ZKO??~(??0????p?Tbcc>???u>??r'?
D?|?????\_v'???7??Y?????R*?????~??Q????????j???P?31^?o?:^??? 85??M(???h???[bc????B????*?K,????"A???
o???2?Z??????Y?;??Y;,?-?????R????De??r
???~s??x??$??AM[??^;??/?1?!OS?Uep2C?X?1?Q?????.F\?c)?????$L?V??	B????w?D??h<a?:Z??q?h?LQ)	??7t6?:?
?!?o?? ????P`1?K?3?;R8?s?w???
?IRRW??*?tt??7?????L?. ??(R??.b??w???@??PF?j
H:?7BtBhL????c
?9?	???wgPZ'H???'?lz???7?~???a????hh($?1?????????b0b?}??"?x?'?cy??S???;S?@?RyU,,?uq?C
???%{~cN??h?'?TJ?>I?-???N??ZN\?????????I?C??G??(?!|=???%@?4?B$O???3?D?SR???&???o???oS?M??m?3?
??9rV?@n??U???	?,??????%????(t@?N??	-*???>????????nC1R???u'??)???L??^H???A????^X????D*???h???N???k5????P\???$?+?w?D???e???k???0C/??E?8h???7Aj?q	?c
$I??a?dK??F????:??i??av??r%p?????f?7?UI]?~L?)P????{}?+1?2????#??M;xpk?a/?u@q	????????%Rh??>~zb??s4-,?{db?A???$!6???????\8i????h?K?,O?????
X?+?646??4?1.u{??|?P4A???B?)M?6??5???"$?
???T6v????`?D????~?&9L????8#K:;??{4
?(5????y?"????T!?w?]p???4??T???\?????e$M8`??(H?"??B?&?\??X<?????#?2?RB
?6???
?JhZ????YK?t???p??/&a-?A?0????I$?v1H????@(Pa+i?&??0??$?+	IR??N??$???'F?G?Ma??D?*??/???c?]?KQ	???qKQ?f????u?6??at^??H??>?AV???1???U???>_?]???f???*????vC}?h??3????d!h??CI?9?+?????)A?"&?AWT0???????v???????7lG?????9
??I?"?<?x5?

h%bI??????=`???	L.C<n????#?(T?K???	??SBHA A0@???/"????4[IL?m?F?
??f????vtGE;?o?m?`.3#A??NH??l?{dp???;h0???d?D??
?]?4EKK$????(kb??f???4??h"WdsK??C??????]???!?#}??F
??^^????^???d???f?
`OI?)??N???U??,apP@?????X?'?&d?ER??????)???????x?%????IV?8??u?g?? ?????k|	?
?r??5C????#~?x<t?(?{?8???=?M-?	????~????x?O(??9??B?Q1?^?eM
?9??!?C?i?*X????I?im*\?
iDA?wk??	?????Tt????m_?T&?+"J?xS???`??X`#??*??p?g	"?PL?Y-??T^x??~?qHa????J??R5?Z??/K??Ix?_>???Jn???@3y??@??:?c}??gTm?L?f????.Mn???#m%?$[F_:???4?A??` lP?c
&?%g?"?(??J??????8ZG#<-?-??s?!??????????0??8?????U?????\???(?T?9\@C???rGH?-?p?d:?snu?V????d?:?DB2?u???l
b??i??}o????`3?{?&???VS1????^??a=???,
`n\Z#SU???=9?R?=/~???;?#??e???)???A?r8s???3^?EuqNs???*?4????6?K%???=????.E?P$8D????????N(?|
?2?$f??V???PmH??F?gZ!Er
?mS?{X?9g+v?l???6???rY???????-b`?{??
??G????QUAb??\B<J
8?????I???
??HKF?fE???&??]y??eL%?$i?
jR????????4S
?e8l??~^???{???U at 0???(?(?????d??`?,^mL>-TO.?x??+	??p,
?HI)?ct???e+YN???da???a?$???.X??FJ???#[*W$;6b???1???w??i]FU?3?[??????gK????|f?<N???t?;|:%z?^??x?????+?
?Q?6v4?o???,?:R?X?G+,?h??0?e?4f??'U???(TZG]?N??0
?u??+(?b;?pa???D??4????B?CJA????%?B???+ISj???i??:f?<?????K<?V"]t?4??FY?????1??HNJ???P?c?I"?xDc?????5??Gg1???xpO'?	?5??Frg(B??pc????8L???5??p???xv?d?5???t3?<v?????3!
?b??KX?4aTD
r???????S?"C?RC]R
????1??G??s?A????f?8?Ic*$??dHU???gy?1o?r?"54??5?Jr?8?-	?lX?????f?p?[??>,?Kv??@?????? x?12Pb?(?h???`Z`?
???1?
AK?_p;?x_^?!b??1??(<	?h*??	?;
5Qb???b\? ??E??He5???V?????J?f?+m????????Z?!&???
??I/,Q????Ui????o`ov??6{??Rk,???M?U$??U%???z6X??;7????J+Y2?L?(U?H
IdD???aO???]??0??\?R}????????~s??#4	_J	?b*~L"H}&?0??????]??l??A??G ??d4????????)??Z$
"XkC?	6?F??K3????jo8I!("??Q%s??E?\?4$Y?"????????"??????N??_1?ldY	??;k:?p???$??H??oR?\????{Y??S?jp?Q????8`???>???????D=?gd??kT????`x+^?D>?*(P
{?l??,
?mm?????h??H??t??nk???<M"?,?#/@?x(?R?Y?Q???tl}L???#mu5?PT?$UY	])?d at 8?
j?>6?I?0?$?I?t/???%E
1???T/??o?8?Q??d?}?(B?B???????????JF??yX8??b!t???Cp;t?g???:????B:?7?????3/??k????6k????5%?????g??????0?
???i??1?-
????>?i^??9?x\?F?
??R0?$l?!v?5?5?????a??.??>???????^??
??lDJ1naH`y??~?l?1??LBD?%A??B?.?r?1?3?%&*h%?(??w????M
#????b??p??N^5?W
[Z??Z???Vc&?%??]*?{!
???;?L????C?S=?
L?V?????T9?????{:A??V??e??(5Y??cF?>^??l?S7?BJZ#?q??????Y{kh??2NE?F??Cx,?????j?)
??%MP[
???W!?a?A?X?X?0???U)??'W1?"??wI?h??R?H??????Q???y$Q???4????AU?i?7???I????h?T??w~W???d????{a?9?i,?????E?wQfH????"? H?????6d&<????F|???[=~?m?<?z?'1?Akd/????RL??:0P?????F
P*1?C??
?tS????
j??v=?V
k	?"C??1?@? 1
??@??j?m?q0~???a?A?????W
?Z??	;?$t???;-?C???R??Mh?^??=?????k?g?~?<:?????
?U?d?2?b=k???T?au???.~)?]h|??V?@??G?c?-%?-$?v??c?t?n??????h??????%-????????D?$:?(??????1?;sO<+M?i?vVB??
?Ve??c?Q?w?F?_?L?????jC?M^????m??I?E??xV?x?<?[(^
C?6???d??1:q?V?0m??U&???a?T???H?i<?.?I?d,??B$ ??+"?F	?I?]o????gb?B????1?S?O?k{????a"!????D?%!??mMV??????k??$=??#?d??:cA??,?)6,??z?n"5??Q??o0??0?,?C2Vg??U?O?N#j? ??????b?$1?????????I,?,?3??i???pT*R? ????!?D5;L?z??z??C?B?2u???E?Z?)?`<???
???g???|?$O|?R?HJ?%??????X?ZiZ$J???D
?~?
?'??'H???{?&??
???M(?hX???????R-R?V?B?*C?
(???i?b-w?5?d?Sa?????q?w9???????????PJ????YC0??5?(??m4??b4?????r_/3??\Mo???????l??n?A/
?$?!~?'?P??d	??e???-????Z??????+R-i?ke)X??4DM5??$??!$?D????Co??>???_;H?f??Z5?U,???????? ????
?#??!???U?8??!?'?6MrvG?????:f?"
<[B?A????????d???1?W???0?|?x???????,=?7?"*?)?(j??H?Q< ?z.41U???]?Tr<?|?4>????t??+??????Q?:??9??Uio4??5t?n?%?
0?3??6??%?RCh
M??4?????oM??3?$PL???Mh.??????"<?;????	!?#?JU(?qPg=d at r???a?\??G1?=,?Ia	?????\?4?:?!???_H??D????_?[????)L6R??lvA??F?J+?`t??J?<???`?C????iJC?2?4?*6?v;@m4???QY?,?`?x?vEa???m????8}?tV"???q?Z??@eqZ	????
8X at b?44G?1*X??\7???:u~??????;?K;??#??E!?i`?%???-?W??O??,??o?I?S5??{L
Z??>?Z?na?~Xx#?zeW?e-????;`?j???#Q????JG??????#??)$???????)hX???H?3???B????B????lY?6??Ur?i?4r?????HB?$???????-O??l???E+?a?N?i?*0~?k??=??
z??G???@??}?@???B??????E<??h
"|?	?(?l???&a1?5R??@?f
4?$????m?%????JRt???+???tC?;???P?"????	?;??
???(???7%-?????f:?????E????.*g3.?u???P
5o? ?Kk?????Wy???Y???[??
?L4*I#Ddq???????D?Jy????h?I??=?R5-???n?y???,?3|lL?N?@??R??/??T?)?K?x.????<???4?yT-??8C?a+MU h}??~???ps8
?D"R'?,?s???Y1k"??2M?
Rm???i?!??%0[???T?Y
?D

9y??cLliBc!?9?	A,,??<m1'm$a??%???I???N?X|???d?E*E"?X???mT??"???Giv?"8?h;9????s8???yZr?gK???"?QF?$$????2?;?:??a+J?0??? 6?BVMCQ???\Zs????S?Gb????M?8????????z?"??x????????n?WXn????L?H?d6X*???????i?R??1'T?B=??,??V%*R???N?g9i$0??R?,+??]?A??L<??w???????BvG?D4?n???N?N?FB?	>?????DZ?r?3??'3?E??u??k?*??????
m?+?I7?VZ?Hm1?~?K??w???vZ?#B)??1@??Y???[76?b???c???HE	?ab?sQ??{1V$9
?L5?
Zy
??&??M?
??3????:??I!?u????e????l?m;?M????)?S
?w??Y0&?v?l??% ???s????5EQ??H??eE?h	
:gg??&??5?o?7??q4l?N????2H]Q?~????"?"?8"???PM	?/B
???l"<?B?x??_???|?2.?s??t?P???n??D????WG?U?O??G??`$?^????????K>],1AUE$#????4?pd8???|}K?P?"?????&c~?o?!2p?@t&`????>????Y
Kh?)@??J?^???|??$?!Pk2??g?&?O??0C]???(?{?
=?=?/PA???}Q?4?????<0
?T?`h?	???Q??Eg??n4L?? ?|?O4?????,00I?3$n&H
9?	?B?r?r??????'?%aI0?GtBJh5?4????=[??,?h????i?[Y??I????R???@??J??L?A???Ph?
*h?i'?14"?0*?e?B-?0?2&??L
 ??3,?Y?'???zs'=y????fCR?`?B?`Q?U
}6I?3????	Wa?.)?Hx?????
????4?TP?
8B???aR???r?AC?*?T????6??9?YA)??Q??dA??s?>????6jn
$?E?,???[T?,?E???%?QM??
????y????]????????^1aw{"?(D???P?IBU'?'???|A?}?j?Ol]@? ?(F$?J
`???-?????????@??????t??$}???%???8Tl@?7+????}q}??S?JN????9Ro????~?>???GO?>??i?glb?d??)lB?X?
?Z?Kh??!)??Zy??;uUU?Q4?a /???w???m??c1v???e?X?0m?6?~??s?m??i??[????????????P?I??????
S
"<???0M@???,?:??$?%??y?????(???????Hq??d1M???@l>w?? ??d?m>c
YA????5H?F???o?\??V?>t???a'??IDa?!2ZX?????1CG????L??6???e????6,??)
X<W?????
f?
I"?????????:$?? ??	bJ?6V3??QQl?f????mYb?hn?????[Z1Dj
???2????89??($GR?CB-66?*?m?t?????P>?????$??n?#???ViJ??6Sr?X??"??O?
?????
P???G?y??Z?%6?RH????(ZT??|?>zr?<??sOmTVSI????SV??X?ZZ??j???KQU????H0bD??`PX?`?Z?????"???i
?
?G'???F?M?<???n??????}?q?CA?2S?J@?$?rz??x?e???A?c?>?'?=
?!??????#8?????$V?<!2
?y?????
SO???xp???????{?6>??nk??6???g[q??Q??/?c??tO6????u?????X?B??$?I3:????;?qtk:!EZ9?2Q??o?0???(???V?%$T?@??Q.?d0?``#?0??<???????k????\

S]?S~/x?#mgT
??A #?e?[X???`x?J?????Gp??????(?	????????}?M"?E)??r=??Q??
?I?*?lO$~Y??yy?????
f0!o???3??t?>?[s??8E??<n????1#??*[V???}v??c?????hsF?!??i????-[c??l8?:F?????7l???l?????kf??Z?C#,?????,?-??i?
?f?????,
???M??"2???F62#j"??????e*?
????50S???$Go??N?PK
??I?#?bj??????9^?)??r??l?3???|C????)??lk?h???e??~?3?sSm?M??4?????X???d???e]?4(V/?W?????0?@0?#??#?T>(??q?Y?5_o??<?>?I_????MU?"??H?????{?@?G?{?	??UUB?=????????2=k??"'?Jb2H????g??7E??\?J?{+=???<i???)S?????X???{????X?y?9KV?????????k
X5?Y????1q?!B??k%????~e
?|?Q???TaF??
'?iU?Y3??x?X\gq???i.?0?zSN??y??n???jx????U?D???9 at n ????-??)???T
j <??#?G?4.??-??>??<?A???[??YDY#d?vA??J?0:Djr??0?!?9?$??????t?]$????\#.X5J#??d^
??c@$??.5v;?P18
R?mlPR^???9??C?-??X*Q???D??(?(?"?"?TQ$Qq?????o??V~&s?{?$?w????h!??	sy??#??t?#U8???????L\=M???????O????V?f?q??X0`??b?,?YUW??>?m?1?;???????_k?HI`F$$??W"??I????0????tDH?c$???8?|????Pn+?]`?M?@?V???
/?
}Z&?;?????b??D1????BuOQ??????.U??X??wF'??????2!??$?BR??*??????~]????Mf?([b-%j?m?e??
??????[%??)?3&?Em4eeSSTEl???%%??VV?IX?-??kT?R)?????H??5mF??i?IcV,?km??????H?RLD?MD?1[j?b????????V?(???KJQ?q!?-NC??pS?u??o!=???6C??=?FbH??de ????Bw:??_tf??U@?j???'g??'?[??'?,???????????]?g?{?P????u?f?mU???M?Z56??J?f?$?Z???j?2?6Dn]??KlF?-?:???&?M[fZ??kY?Bl?d?jb<N?h?D?*)r&1&?n<??y?h?}???0#Hd^???
?? ?C?rAJt4????0?a?\??O??6X?????4?Y?mg:MD?6?/?G????>bM??QMQ???u?yc
?@VA
  ?^?????1@X?d????jC? ??????=VH???E???`SIV
KSN?n?rc:???f???K????????<_?$DXEPy??????N????;??QFDD????????G?G^@g?=9??9???Z8?? Jl?o#`a?Y???????????NR9????ad?P; *?$?????9?$??Z??????K?@\g??l8???B???'?qat??7?A6??o
MObcb(??I?????E`a?cd?@??W'?6iA???`T??n????E??3???)??@_*??U(?B
@UOo??rX&?~??8a
	d8?K?O??Bg?<?R??QJ%???4???R?u??c??e??ao
?????gvtL??(????&??0?????B?j*-K
'???M>?a??k??m???
fD???RV?DW&??? ??@??\a0n??
"kM??CO?
DR?B??p?????D????	B?*????m?l??????"$??e!w?	H?
9?F#<????$|??"N9$&P???
?b?mI?D?SG?:?EY>,??	6??hd|?w?.??Y#B?l???"?Q?G?1?
?u?dH???????~?}?? ??Y????b?;???H?-?;y?b?n?T8N??_d5?????{|?gs?cl?????\#????965*??c[o?e?t?DJ????R?I?4?'?H??}`B??>?6?VH?3????4?\????yi	???&??k
V:@??????uk?Sd????t??4???J?z?T??? 	AL??v????O|?wG???M??)????????M-?LN,?.IN?????2?M??UfI??R?O-??(??]L??p????? ry
????)??Z?i??M????S????bL%???%]"??_???h?BUG$+??????I8?@?2DT??y????P?=??????(??h??()?K??A???{8?=??*S:DX????Oa
?K ????=??6_?0f+??|!??"??~d.8T	F?/_????????AC??&ILP???I????y??p??????P[q?????????Q??IM??P????&?????pe?? ?__???M?? ???F?a?o???wB?A?jJ??Zy?????????f?Ye?6????2???????CSG at l??/G?$????
$"O???c?i?^??[Yn?????7?UU$3-M??F?$??X?@?G(??S6?
????My??M??dF?T?A?c"l0????|???x?gI?|Y????y4????F????$??J?,{`EN
N?%?]??N??<??_m?5?8? x?7??o;x??Y?L???*?Q???????;0?#???????<??????"5??-QI$??.?MI????????'?????????R?(??I???m?<Ux????t?????
a??????T3???????H?d%?o??|?????????|/IX???????Y??Ve?m??J?iAd?q???Q??h???????>K
z?#Nc????
??BpAt??`x??GU=4*?BX!??_??????
???f?k-?o??{b???J????py??M???U??D??m???-?TSC?'rtX???)???1?b????l`??m??%???y???I)U?z????????ac?iLS&g?D?dR,V??`?U??.XnTpQ9X???m???i?m??{???m?
&??L?
??3??g1yM????f????^F?ccfc5??=?L?????????i????k??%????????#????L=Vs????????q?????hP???????i2I<?????{M
?KAb?
??@?Z????)?()
*?E?1To?	????\K???E??????l????'????/???0?r??|?~B?EB????Y???us
??NG????+??<"????w?Mdjb??$?????
??b`I/?'wm)????#?????W
9(??????b?Rb?
?<8:i&oH????E(?K??Iu???	????
???!R7?_,?h'G?????????l=R?m?????%?zE?%???st??w???Y??N
?@????=^<??A?@?0???z?>!?6?)z??
JU???$J?#%B??!e??A???K
???????x/J??%	C??1jb???z???
?B?????????=????o??[?O?@?'??H@??x?X???S$?y????(??????UF?Z?.???A?^f???]Q????UTR\???/t???v?`???u?-
???:?Uu"????h<?=zA??h?(?Pa?L?bR???@Hf+Ul-???a????????????T?-(b?b&?I`_??\a5??4-|??}'???O?????L????1??9%???i?2jUl??!#&?a??[B??t/??@R?p?????xf	I?s?z?<s?=7o^_????X
1t???@?)
??}??>
?[??1???HmYf??b???-
??(A!
H)'??RN??[&F??1*jf?[?v?????m??R?d??i?oQ?"Z????????H?'?A$?K
A%??
?#=.?M??v???????M???q????.????u?	?sZ?i-??+%g?qe???Y?????s??U?5?Yf?m&f????&tu?n?t?kk6-2??[v[??8??????

?Y?
|o??;V??????? md@?lo>m?xy7?o?PL?Rl,?*%????I???e
??
??4??X???|????Vy$0$??fE%<! ??``Mg?Y?Bhp?8??4? ??z2?,"?P0??'c%E0?L3 B??;?He?M
y???
a?bi-?	*?>?
?(k??%	?>?8??5
G??)?@D.$?)>T??cu?_%t -?ahPA)[BzvXt\?1???,??I??????????<?aaG????x?[!0{ G:?,????B?6?"?LC??=C?IH>4@?B??D?Asm?z?D<?@?JH?Q??A?[JGR??n?O??M???Mh??e+?B?1?R	
'?_	???l??c)D?Bz?????????,?@????l?H?# ??Gf
?q?+)??
KaH?:x?o?-??i(3h>?8<IQ?????^*P?Jd?,.?h?
??7?1??v??y????I?????,(??c????cf????CU?D-???p_??A?ycYV??b?3????c	?D???W????+"?*???dz???%
@??N?
	A???cL?P?'Jy?Z ???3{{?IIE?'BC?Y??:}=???0????G?H???\?1[?T??D???4`??R~0?CBP?H?[%??p??LA?AJ???@?Ci??????6N:?+??,?
d??JH8??F?????????Zd8?s????|b?e?6?%)xQ
??2?G*?0 ??T??? ??????X$LHAt?.?4???q??X???8?x>??6??v?????????????"?M?bB??????aWkOez	????yT?????I?
D~p?????B?!????e????p?vS???"??????d50+??bB(?sCIG???)5??0?FF?N??W$Q?h4?H????0?0L????b$????'k1qx?I*?p
?R?W???$??RF?2M*??I?\?2%????T???f1
k)?\7?`????v!?F
?????R0)R%$\b ??P:??E
???Jix??????D?
?3?
?"R?7?????7?????z??r?$??G'???????O?-?-??A?Ds?>?bv;?????B?????????=???^0PB?
???I?D-???h????>G??O????#??RR?????8<??%???
?q?UUj?(C?A?.???_??)?xp??8?}??????Xn@??eUa*?e
?_p??????Nt
?s?}X)??\|?|???|(?R
~&????6"?0???v<g?J??B??????[V?2Ii?&?5??2?2?E?;M5MC?A???6?????S?}7?].L????n??;&???J-UD<b$~Rn???q?	??c#???`YH??/y???x?v?'?o ???\???HF?5?d3	0?
?6??????????H????6???7??<??$?2?+hZ???2?dld?*? h??l?????!ZJ
d???eAJ?w???,???E??L????T?J?i?????????<DQl??J??;76&???F2??u???$`/????????0?
D??!?l???b
?J??A?Is????p??F?g??~R`?#t??I???jMT?W????U????w~???g?-?????'?(??g?????#5??7YK>6
????5MX??T#??E?T?<D??i??"&?*
k??~????z?R?i.????TJ$?$(07???"?????D???}?
Y#Q>]??#!
???+f??l??8!I5[k,???d???^=???j?dV?DM?D??vn?4?}H????`???N&6D C??????DTP?DM ?B????>??????8?jj?M??[?YIc?=6{???vM"?A???p??4nIIT?C??G,??);#??Mc*???bd???B?@?NWnT?vZ??`x?%?????4Y7??7?c??r??qf ??
??PQ?2?;n??9g6W????g??3?b#???qj???D??)A8?M?:?r
~N?x?H??g@e??Z?p?0??n????E?I??5??!?p)R????bH???^:?,`??%??a-??(M-????h??????K\?#2?`???H?IT????oH?d??4hMVib?Ax???r]?b
"??I??J??0?f?g???M?
?!BKX?????????(?w????|?.
X0?T???w?7???T??X?c?dt/2?'!???L?P?????]?fN??I????2<??G?g?hP???)c?F9Z?K?????4T??v??	?%?0
?h??????
?0?]?d?6?Z(+??rS at Fq??m?-???x??bLE?@?-??nr ?WsG?
W|??o??O?n6?1?[(?z????s?b?$
???,?B???????#m6???C",????q?????n?yw,?T?+$?O?(&-??e?4d??TfGfq?6dS(?;?:I^\XU?7???
???3???J?[R?????'H?Nr??1?G??????[K???h??2Y&??5[X?	?7??????j??i??????????q?A?
?=F^ ??D?u??p?G?I??
{?/??Y?Y????	??[o\D??cW???UB=2dy?}	???!CP?IA?M?h?Qm?-"??????L??Z?M?5?gsg-??????^?Ny???d$;???y????X?????<??CaOm-??N???)?o??Oq???'?=!?????di?X??b???5??9?i?i?!?g??o???<bW??>Q&
??(F(?<N???P?????I?&?*??
??l?M>?g?y?+T?~}m???1??????!?R?bKCX?zx?m?WP?Y?E??JE$D????E??
???Oxn(Gp)V	?QX?#?d?C?-????(???n-?H0?VVg?{??Yu?
?6?M?[?|?SZ???M?I?N?`lm
??????EV????5?fI??k?I?(?????dG?TP?h??'-??
3?@
?,Gy??{=??U'?hv????g??)?kn?=?fte9y??*h at t?_?C???a?4B+?
"?PH???V???x?e_v????VM?1Y?S?AT??L+~m???~s??G?u???S?D?d???4G!??[_???m?z???|??????*??u?-l??G?D?EpyA???j|q at x?$?$%??Pv`B.???9<?F???,P????
????&E???a???v???+?VmX?
G????e?M??m?h?|?|????el????4??a????A???&?FT?;_?????Ac??D
eY"?????(K?\m?M?c!?cR?2alE??w?[?k??4d:???;GJ-?ZF5(
?? ??AC^?iaI^??@p?
?*$??p????u
z???r??M??=??2???|???-?@?$y~.??Xt4I???????????R??R?,????????u?c??G?eu???y???m????;?SDs??T?????eHXH?)jy???Z????qI-4?dJrI??+??]?L??????5????(H?o??|S????<N??0`?)???6?X0??c?2	'?bJ
G9?4?+mo?Wl???h??),?kG????=??|?q?N,??t?FR??M?P?n?u????v*???,??????d!?_??2f??y??N?}?????kkZ??BD at -?C???????>??Q
`_?6e
???H??
??Nh?RF2l?b??d~???	y???I8H?????n#??0??????I??}?2z}?????_M??

(ZY?'???????Q?,W?3??W?0?&A????????
????O????B|j?
?T}???q?d?[%?m??7?$?????*([n??I??l????%??I??:??M6&f??DZ2???9????0QH?H$????Ib?,YeX??	?X?)m[V?C|??C?
?4N?:?/?????{>?EA?
??i???b???}I
sS?key????2??y?K$Nm?6?n,s????Y????&?;
??m???????Y?(??????|??`s?M??Z??N6~??*?
???q?T???????*KJa9?0???`?A??????L0d?Q???$???f??O??B????A	wJpC$??X??????????G?[#??!?w??Iu?^w???\x????
L??6??44?+??=?l?????{d????K'?"??t??k	?|Y2?#%+?-?????????^Tu?`Aa?{Q??|?????z?=?ig}??(<??fy%????I$????mU??'??????RPRz0?????s??X[?????1C??X?>?@?E???O>
M?o??C?^???#??P'?????3Cm?D.o??????????C???v
p#??????3??3??????N??
D??????-L?6>?6??$m?s*?$}v,?,??)a??q?????Y]d??????<
??I2?A?D ?A:?%????
`?#?"FR?`?YDi?,
AR?CJ??.?()$XJM???i?mX?2???????T????"?PK?d???aE`?B(?
Z?M?
5t??AN??k{b7?m?,??khE??h?Z3??V+)D??L?
??L?n??n????s???h[:/?8{[v?X?!ey?W???)??Ef???Ft"?EkU?????c?3?,!c???t??`l?
?!?,%H?X??(???	?b??6?;z%???"?"??????3?Oc??jv?h???kB?1??>?J???9??p??`?
?(k???&'??<H0??(Mo??\tY2[3??X D?(?0Q???H?B????(?bf@??Ci?=????=??2?????*9F???V?n?v?E????Ua[m?YM?Fy??q??????['??xu???f?f??Z???b1bL?d??'???XPk*J?????8?+!??,"	??g??!??J????e?6u?t?sg??;???s?X?`0?E??4TR(?a?h?&???$??????i??Q??*(?:
???GEAL??)0??X??&????h:-??7??a?PB???H??)`&??mfI?y??U?6??
?s?_????[My&???1d%?X?Z?e??E?!DQ
?????3)XE?Ze???n?{?T<mf?h?o?4??	?j?U??w???S???~?_Y
&??t"N,???>?A???N$4r??j??GVa?*|???X??????t???????n???d??????R?%?HD?H?W?(F???v?,Nr??w??H9o???V?i??b??U,K&??????F??????8????"???|??Mt?TiD$Y???@
w*$?;???o?)C?<???l???neC(RW?B?=?????6??d???5??}?8????]??r??*!D???E???$WAK??I*??]?"???2?d?H?Sd?Q????k?+???p??[
????&?t???q??/X?EI???R??KR???c?????????c??PF?1??	?Fy??JStG?
Jz:0?h?L??-?5???U?x	U'?Ej???(w
i?@R?H3??	?)??8y2? E+????
!@?nC?????}\??9*??b??????????A??nID0>KP at +?????E?KO??~?<???e????X?f?D????????b?C??>?G:?'0"7?	??`?k??/y??g?F??????v	?`???\v$S5b???C?X-??B5C?B	??	???EE????B2$&m-?U?d??V????j??(7??nm??2}h}Pc?C?c???????{ ??$?0?<?>?C??7?;?y$?????'H|??C?????z|???=??j*??T?'?j??
??????h' ?a
.F*?	T?'?dj???X??qc?zR??P??R??v'???w?b7??\?M??D?65"F
5 ???$%??Y at BP(???Yn?MM?6?B?-?i?<?qy??r?
#??>D0?hy?b??D"h???#j?#?+?@`?P?H?	"%??h?&?3??v???F?K?V ?3d?xM?D?R?????=???????Pz5+n?
?4?#Fn$@??2qI?????h;(??}*F??V?????5???)?Q??#??HI?
?4i(4??M???{?d???	"k&D[??MYAkV???o]'?4?o?!?sl????~sVqJ`?a?B?K?5????+????$??!?	?cF?L6???CV?b????OF???x???????xJ????X???q???+??
,dPPbgq<??~'????*?K#*	9?j~O?Re?S??????F???????x at h=^??V??~~~???p?k?(`Bk?N????:N???????????Y?Q?????c=???M??????'q?????????w>?NT?&
3(?&????=? 4?D??`lZ?]??Z@?!?^?NG-??9?!^?o0?"H?tN)R?2v#?????Nu??4??3y?????g????=????????^??@?j??"??i?\???H?tB??}??\???s??p??F;\???2+Y???=?m?KB?Y????Z?p??$?*Z???X:V??o?.c"c!F???h??	?h/?^?#A??85???|?(!?"???,Q?=M??)?0??5?iS?2{?BzlF????2v=?L%F????x =RB??1??:?%??0??K??o"?}=
}O??k???A??????0Q???`s]???2??z??#?-??d????????:I??K[|?<???e?:?q*???r?W??K???r?0????s?
P????v
x???aO?0l?k?n???%?d?o?>o??_X?:\z?#+33???ar??????????????l*?#?I?????xK?y;???=3??N??\?}|???????>??5F$m??,04?1 at D?T????
????_u????o;?r?u?????
?%?????'u0E|?Y?;B3;	?\B??z?V2???cm3?1t????s????;?`?????@?w':?lN:R?,\??qj<??+`S???H@???/;H??Z?(9??t??jO
?
????????)I?????a???^?Hp^\???I?R?R?b?e}??11,?*
?@?=??t?h'??v?q????T?9?J?e??^??__,?pJ???	?A*?+4V??"???G5??????-??cR?#?~=?g?;?R[MT???0`??U???;f)??????B?DD?cQc???,??8??pAX??????e?????W??
^?yx*?a???Q?K%???q?6????`?ouhcm0?}:Uy@??WH
?VY?on ???
;S?,??MR%?2?N%??<R???(N)y??ddd9s??;$??fHoH???Q?????g????&]1m????J?2K?S?]?N????g? ?????
?lA??U8
????7?<???8f??<zy????~?:?k?????????&?{??Z?,?H?|!?j??_>=3??o{?
^L?u????Q}0E$??P?I???????_~?w?
?d???O??@RH?	;?e6???$ {??t?qY?C?K.?C??%?X?l=7?6???U?b??UmUTUUU??????!???????F+aB?????U2
???a!?H?c?b{gN?s[??????'?^aD??1v#???L??H? ?????
?6????????H??t	~?%.?b????iG?2d?a?>V/???LUV4?d?$??)???
?Q2b?0/E?1aI????'?(?-?H/????y???????L??0?E???NF".????*??VQ??b	?q??w???NO?3???S????s????l?????Jx???O????}?U???%??b!?Ae??)%?mF?????=6~????y|?|*???
?>??fBu?6??? g?zsQ????[,R?.S5fO?L????0??%???}Y?a?rc???r??L??qhg?X??iQ1"?????@\kg?6??O???t?=*???H???AzI+?;
?`???arTj61?OP6???????
???g?M?X?????m???I??}?l????<?q???o?y2v?eO?u???1?MfZps
?\2?$???.??-<,??f2???pr>?e??R
??
h??53?????Y3?\??Y??????I3??X	?Iv?N?US????l??????O+?t??+e>?|??????g?-A??'?!m?|rF?,+?C0Ez?g??"?(?BD????????????v?MH??t?f?d?[?%?n?4??????????6????5E??%?T?
?' ??
??CT"=????y"?
 ?P?$ud??<????
?pS??&??3?N??r???!?iA??Mk6?C?0N??q?'*??f3,{?????U??"??+?|?8i\?v?^t??????H?s???????S?-???JC???}k-?7|;???b???Y7??'??????Y_??sY4?wX??Y!e6[>??o74????-?[z??????x?EKX?,?????RE?<r>??m????q?7?BI'$PVA?{=m?6?3l??????fn(\O1??x	?@a???%???P<!?%??$????h,?	e???F??N!?i)(u/.?%?
?2????q???1?C?8;?g?jv?c?	a??j?*?\f??6?i*tL
???HHRV??L??&??B?i???#??
Ul??{?
?Emi???M?Q???2??M!D)?NH4V
g?D	??!`%x???NjS?D??b_????!??LOw?'=4d?d'?Hra8p?O*F @(%??U?Wq?W?????#????P?C??E.1UC?b???b??EUk?
?}>v?G?OL???YM?Y(zA?y???o??%???????d??R"X?????m@?R9(?
?AaC?????t:w~;
?1?????O?$??h7%??_|Cv???????Y@?=J?XdX?)??L?F????X??h????fy??G??D???
?8?y???]Q????@9G???(^?H??%)?1)?Dz??I?
[Q\?dP??$??3>??L??Y?tearb??a?
????&R?R?-?
E?G?><Sd???EI?w20??7.??dRM?<JQ??(??MnR?j??????N?&?????
L&L??>?}N?D?:?s???@??	?	?
???z??|0?????0L?
?iV?,??`0?????HY??Bky?%????2?s?{0A+????P???*??,?|??{?	???pU/?(?N#}?T??R:???o?KHk?KV????1?
??M????0??UJ?	???K?B??
?]?!
?wc('0??P??hU a?
 ?QC????VDKQ??i?:??x@?H
?H??B?b???dl? n?N???p ?? ??dAu	r?F?|y?Vb?v??U???\?f?S??v??"C??,r<h??	i?X?x??9 ???q9p??*?
dK,z5k?*a)R????-A??DaR	D?;????Q|Z2?0KH?1??P?@??m?>????m.M?
???T????>~?????["??x;*1F@?E???@PZ??*U???)??>??
?s?D?g?3?????E9,P?L?5?bf^8?7+Qz%???s?D.n??b?????^???1 ?,-Y?"??r?85??v??s??c????hQ???????:FT%4W{
??VjP?jt???sw??Cg??XJ9????6???F
?x5?Oe??2??'?N?%???Y?L??=?E?`?X?H???So?0????F\7?2^F??]?Y6H0$|\-?a??2C?IKGQH?]NX?<B\??*?	?????tN:u?@??
0?)X?mTF??E??(????
?????A?
??
az???9C????A?Pw7+b?????rx??E?Y?1J at h?b??n?FT????b?????????V?;rw1??ps??@D???????cagn??????0?U???k?o????i5??,)
"??c?z?F\jR?cA?w??????NI?y??6l?--t?z at o?3???Ca?n?3??O
#?m	???
gD?*??S????4?&B???]?+3???a(???V??J?????"
?:???????u??1-?rJ
?f?&????????? ?yI??U?,&???WL??J?q\`??3?????2a2!?B?C??vRXs,A????F;9?`g?P3,??0pHpq%?Pv??v?N??7???W?b|s???t???MSCh??	???o&???0?V???L[Yq?:9-?E)n/?????F[????Ii?????0?MaK??f?????[?????????-
????RUGJ??pI???X1
??c???.M"X??H?L??y1r?@?Y!*Tp?k?/(?&??] ?gP?Ub???fu?3c???c1??1?.??"d?x?6G?????4???S"DM{?j??T?5??w?C???B98?z,??????????0??k??fb??D?1?qIh!?b0*?w#??9??18E???
???m?'??D?
????U
`?l*jc?Y=?Yp?6m???foH??4??h\?%??<(q?X?8PC7??9"?	?h????*??&???J??????'N?MC?h0??Wz?UMb?jB?I8:<???:???	????w4????
P<??9???0#-?E|??(?A?N0?	1??? J?.)?q?&2h?4?????^FZ??k?F\1P<U?5m`???eY?	1
0Y9y
f?XD??B?e??M???9?R@?????	1m!???a<B?
?A?Z?0+)3??k??,?Q???0&??A?Y2T???O????Bl?????}a???z??????????j[?O?I=???.O?Wd????3??'??Ldj????UU[m??n????QbjM#IY?
???j?*???????T????? \?j ????RE??,?~???(???g?-f?(&JbM5??6???1???9?? y????z???VH?4G?/\QBDD?ocq??7
7~?????????

???L}?	????}????-v+?
D
j%y?""f??????U??rjmC?HdG?=???+??n?z?di??>?#???m????g??,z??@RJd?????????i??CsI!??hn=?O}??>?]
??1>.?
??M??%??T???&???`?????^^???Df$,JbR?'??iF?S?1???#v?????????g?????.?)???A!?I?????7???p?B?E?9????:??l??qQEI?RI?M"fQ
N!??WxI"
?=??rP#N?nE????H?x?",?
????3?`?Ru?{~bz9?N
?EX??k aB???A_?
;????TP??e<66t?'F??6?qk??2.
?S?w]??*???6??E?iaP?_uGT????XP?"1?}?B:?#3???@?R?*???'?<
)Dp1?w???,???1)??i?&?{?2
`??8?{8?
z???DT??????A?????E{??????Oo?J?E????a???;?1?{*?J8J*O?F????'??#)????)??'??1?????
D????`??$??(??QV$??+??[y]Tp'??V?s?:?pcb?o??[!m?S?|J}???B??0??????1????d.??x?Ub??c?_????"?-???~?E?C?P??!??Q?%??Y%-?&L???????*QG&???RM??????????LMd?D??|???IK?Cx]??M~%7k!??4?$EP?P?&pR?$~???t?"!?aXE???????:???v??_?w?-????R?iB4?=?<q?8?W??)?}
h*N??a?IH!?~????a?C?FM??????N??h?
[0??[b?dm??????x
????>????
]??h3?WBb???????G??S???????C??Q??< H??\??????+?
t#M???
-O#??O?????????#?:u???????"???W>>??D A?S?? EW?"?s?+??TP?~????%B}p???g.?z???LB,?7 ?ZT??????MI?k!???5P???f?\?lIS????{?O<??
ooM??L??;?J?P?x??x0(??D?????|??????????????'????P??5?????[?$D? ?E^?"H???a?R6@??eR?s?t???-????c????4??+!
????M??h?W!h[?@|C?4
??a????b=u?<sJl1Jj72G&??o{i??A?E?6??S????????????????mV?b???RT?Xhh??EO????>o~D?)?pb?4?v?U0U?J??w!? ??/1??+?<5?^??/ZR??$?/Y???yS??D2?-Hs2?S3?a?>??V????}??o????63?F??f???BH?????~#?G?W?O?i??
|?N?D?QqX?>x|??.r`3.8
????|p??ov??????rZP??f?????]D??zs???????????8?l?rI??): `??Lu??[???q	???????IK
???j?Yd{?ji?????aa???????)\6?p?Y????t?????L$?IZ??????a?|??P
??4?,???m??x?J\H?Ft????K?Sv?e?????3-x?L/(?,???????PC{V7?
?!2???,?9 at 3?2???;?$??#"0n??.??fb??\?S??vqV???????D?&f??
??3[?`????0????4@?S??????\BK????<b_~?}??A~3????L?g?{a??????<3O????s	]C??<??7`?D????\?)???0? ????Vr?@H~v??~y1?A??f?1??
??`???????2!?v??@?=???*?nm?? ?E?>Rb?}???????9?Bq&?y?$?#x????C~???????	"?\????"	F(T??~)??@??f?f)????z?I*???,?,???X<b~????X?z|???????+????J0
?R?06<u=0?*??_
1\D=?rT????"???O0??`?"?H???'??	u??#??????????X$???????]iy??0>g?."
???$?;???????2??
y7|?$???@??????b??UP??
0xy/#???ck?2z??v??B?{??S??X???????L??!?jG???DA??f?$V?(s?1?H<?????O???;U2L58;ISGt????R????????G?R?????T?1?2D????H?

?v 



From fedora-extras-commits at redhat.com  Sun Apr  2 08:01:06 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun,  2 Apr 2006 01:01:06 -0700
Subject: rpms/python-myghty/FC-5 .cvsignore, 1.5, 1.6 python-myghty.spec, 1.5,
	1.6 sources, 1.5, 1.6
Message-ID: <200604020801.k32818fd008417@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-myghty/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8375

Modified Files:
	.cvsignore python-myghty.spec sources 
Log Message:
1.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-myghty/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	26 Jan 2006 07:17:19 -0000	1.5
+++ .cvsignore	2 Apr 2006 08:01:06 -0000	1.6
@@ -1 +1 @@
-Myghty-1.0.tar.gz
+Myghty-1.0.1.tar.gz


Index: python-myghty.spec
===================================================================
RCS file: /cvs/extras/rpms/python-myghty/FC-5/python-myghty.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-myghty.spec	26 Jan 2006 07:17:19 -0000	1.5
+++ python-myghty.spec	2 Apr 2006 08:01:06 -0000	1.6
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-myghty
-Version:        1.0
+Version:        1.0.1
 Release:        1%{?dist}
 Summary:        A Python-based templating system derived from HTML::Mason
 
@@ -12,7 +12,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  python
+BuildRequires:  python-setuptools
+
 
 %description
 Myghty is a Python based web and templating framework originally based on
@@ -48,6 +49,9 @@
 
 
 %changelog
+* Sun Apr 02 2006 Luke Macken <lmacken at redhat.com> 1.0.1-1
+- 1.0.1
+
 * Wed Jan 04 2006 Luke Macken <lmacken at redhat.com> 1.0-1
 - 1.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-myghty/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	26 Jan 2006 07:17:19 -0000	1.5
+++ sources	2 Apr 2006 08:01:06 -0000	1.6
@@ -1 +1 @@
-4329dea233683c2e073036ea48f23fd8  Myghty-1.0.tar.gz
+82b2a05f421b2b81cae716ccde74dce1  Myghty-1.0.1.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr  2 08:03:24 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun,  2 Apr 2006 01:03:24 -0700
Subject: rpms/python-myghty/FC-5 python-myghty.spec,1.6,1.7
Message-ID: <200604020803.k3283Q7f008569@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-myghty/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8552

Modified Files:
	python-myghty.spec 
Log Message:
rebuild


Index: python-myghty.spec
===================================================================
RCS file: /cvs/extras/rpms/python-myghty/FC-5/python-myghty.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-myghty.spec	2 Apr 2006 08:01:06 -0000	1.6
+++ python-myghty.spec	2 Apr 2006 08:03:24 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           python-myghty
 Version:        1.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Python-based templating system derived from HTML::Mason
 
 Group:          Development/Libraries
@@ -49,7 +49,7 @@
 
 
 %changelog
-* Sun Apr 02 2006 Luke Macken <lmacken at redhat.com> 1.0.1-1
+* Sun Apr 02 2006 Luke Macken <lmacken at redhat.com> 1.0.1-2
 - 1.0.1
 
 * Wed Jan 04 2006 Luke Macken <lmacken at redhat.com> 1.0-1



From fedora-extras-commits at redhat.com  Sun Apr  2 08:05:40 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun,  2 Apr 2006 01:05:40 -0700
Subject: rpms/python-myghty/FC-4 .cvsignore, 1.2, 1.3 python-myghty.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200604020805.k3285gid008640@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-myghty/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8619

Modified Files:
	.cvsignore python-myghty.spec sources 
Log Message:
1.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-myghty/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Sep 2005 17:55:21 -0000	1.2
+++ .cvsignore	2 Apr 2006 08:05:39 -0000	1.3
@@ -1 +1 @@
-Myghty-0.98c.tar.gz
+Myghty-1.0.1.tar.gz


Index: python-myghty.spec
===================================================================
RCS file: /cvs/extras/rpms/python-myghty/FC-4/python-myghty.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-myghty.spec	14 Sep 2005 17:55:21 -0000	1.1
+++ python-myghty.spec	2 Apr 2006 08:05: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:           python-myghty
-Version:        0.98c
-Release:        1
+Version:        1.0.1
+Release:        1%{?dist}
 Summary:        A Python-based templating system derived from HTML::Mason
 
 Group:          Development/Libraries
@@ -12,7 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  python
+BuildRequires:  python-setuptools
 
 %description
 Myghty is a Python based web and templating framework originally based on
@@ -49,6 +49,9 @@
 
 
 %changelog
+* Sun Apr 02 2006 Luke Macken <lmacken at redhat.com> 1.0.1-1
+- 1.0.1
+
 * Mon Sep 12 2005 Luke Macken <lmacken at redhat.com> 0.98c-1
 - Bump to version 0.98c
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-myghty/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Sep 2005 17:55:21 -0000	1.2
+++ sources	2 Apr 2006 08:05:40 -0000	1.3
@@ -1 +1 @@
-73d5ee5302ffb610059928c8353f2201  Myghty-0.98c.tar.gz
+82b2a05f421b2b81cae716ccde74dce1  Myghty-1.0.1.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr  2 12:11:48 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Sun,  2 Apr 2006 05:11:48 -0700
Subject: rpms/gwget/FC-5 gwget-epiphany214.patch, NONE, 1.1 gwget.spec, 1.11,
	1.12
Message-ID: <200604021211.k32CBovJ017290@cvs-int.fedora.redhat.com>

Author: thl

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

Modified Files:
	gwget.spec 
Added Files:
	gwget-epiphany214.patch 
Log Message:
0.97-3 -- - Add LDFLAGS=-Wl,--export-dynamic #187623

gwget-epiphany214.patch:

--- NEW FILE gwget-epiphany214.patch ---
diff -Naur gwget-0.97.org/configure.in gwget-0.97/configure.in
--- gwget-0.97.org/configure.in	2006-04-02 10:28:42.000000000 +0200
+++ gwget-0.97/configure.in	2006-04-02 10:39:58.000000000 +0200
@@ -71,8 +71,10 @@
 
 dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8 or 1.10
 EPHY_AUTODETECT="(autodetect)"
-if pkg-config --exists epiphany-1.10; then
-               EPHY_VER=1.10
+if pkg-config --exists epiphany-2.14; then
+        EPHY_VER=2.14
+elif pkg-config --exists epiphany-1.10; then
+        EPHY_VER=1.10
 elif pkg-config --exists epiphany-1.8; then
        	EPHY_VER=1.8
 elif pkg-config --exists epiphany-1.6; then
@@ -107,11 +109,15 @@
           AC_DEFINE_UNQUOTED(EPHY_VERSION, 110, [Define to the Epiphany version (12 or 14 or 16)])
           EPIPHANY_PKGCONFIG=epiphany-1.10
           EPIPHANY_REQUIRED=1.9.0
+elif test $EPHY_VER = "2.14"; then
+          AC_DEFINE_UNQUOTED(EPHY_VERSION, 214, [Define to the Epiphany version (12 or 14 or 16)])
+          EPIPHANY_PKGCONFIG=epiphany-2.14
+          EPIPHANY_REQUIRED=2.14
 else
      	AC_MSG_RESULT([no epiphany installed])
 fi
 
-if test $EPHY_VER = "1.2" || test $EPHY_VER = "1.4" || test $EPHY_VER = "1.6" || test $EPHY_VER = "1.8" || test $EPHY_VER = "1.10"; then
+if test $EPHY_VER = "1.2" || test $EPHY_VER = "1.4" || test $EPHY_VER = "1.6" || test $EPHY_VER = "1.8" || test $EPHY_VER = "1.10"  || test $EPHY_VER = "2.14" ; then
 AC_MSG_RESULT([$EPHY_VER $EPHY_AUTODETECT])
 
 LIBGLIB_REQUIRED=2.4.0


Index: gwget.spec
===================================================================
RCS file: /cvs/extras/rpms/gwget/FC-5/gwget.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gwget.spec	13 Feb 2006 17:31:50 -0000	1.11
+++ gwget.spec	2 Apr 2006 12:11:47 -0000	1.12
@@ -1,13 +1,14 @@
-%define epimajor 1.9
+%define epimajor 2.14
 
 Summary:	Graphical download manager that uses wget
 Name:		gwget
 Version:	0.97
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		Applications/Internet
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gwget/0.97/gwget-0.97.tar.bz2
 Source1:	gwget.desktop
+Patch0:		gwget-epiphany214.patch
 URL:		http://gnome.org/projects/gwget
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildrequires:	libgnomeui-devel >= 2.0
@@ -16,6 +17,7 @@
 BuildRequires:	gettext >= 0.14.1
 BuildRequires:	desktop-file-utils
 BuildRequires:	epiphany-devel >= %{epimajor}
+BuildRequires:	autoconf
 Requires:	wget >= 1.9
 Requires(post):		GConf2
 Requires(preun):	GConf2
@@ -37,9 +39,12 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .patch0
+autoreconf -f
 
 %build
-%configure
+export LDFLAGS="${LDFLAGS} -Wl,--export-dynamic"
+%configure 
 make %{?_smp_mflags}
 
 %install
@@ -90,7 +95,11 @@
 
 
 %changelog
-* Mon Feb 13 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info>
+* Sun Apr 02 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.97-3
+- Add LDFLAGS="-Wl,--export-dynamic" #187623
+- Add patch from cvs to build against latest epiphany
+
+* Mon Feb 13 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.97-2
 - Rebuild for Fedora Extras 5
 
 * Wed Feb 01 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.97-1



From fedora-extras-commits at redhat.com  Sun Apr  2 12:31:18 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Sun,  2 Apr 2006 05:31:18 -0700
Subject: rpms/brightside/FC-5 brightside.spec,1.11,1.12
Message-ID: <200604021231.k32CVK4L017412@cvs-int.fedora.redhat.com>

Author: thl

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

Modified Files:
	brightside.spec 
Log Message:
1.4.0-11 -- Update URL, Use desktop-file-install (fixes #187638)


Index: brightside.spec
===================================================================
RCS file: /cvs/extras/rpms/brightside/FC-5/brightside.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- brightside.spec	13 Feb 2006 17:31:21 -0000	1.11
+++ brightside.spec	2 Apr 2006 12:31:17 -0000	1.12
@@ -1,12 +1,12 @@
 Name:           brightside
 Version:        1.4.0
-Release: 	10%{?dist}
+Release: 	11%{?dist}
 
 Summary:        Add reactivity to the corners and edges of your GNOME desktop
 
 Group:          Applications/Productivity
 License:        GPL
-URL:            http://home.jesus.ox.ac.uk/~ecatmur/brightside/
+URL:            http://catmur.co.uk/~ed/main/brightside/
 Source0:        http://home.jesus.ox.ac.uk/~ecatmur/brightside/download/brightside-1.4.0.tar.bz2
 Patch0:         %{name}-gconf-mouse-speed.patch
 Patch1:         %{name}-libwnck.patch
@@ -19,6 +19,7 @@
 BuildRequires:  libwnck-devel >= 2.6.0
 BuildRequires:  libgnomeui-devel >= 2.6.0
 BuildRequires:  libglade2-devel >= 2.2.0
+BuildRequires:	desktop-file-utils
 
 ExcludeArch: 	ppc ppc64
 
@@ -45,6 +46,12 @@
 # For GConf apps: prevent schemas from being installed at this stage
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
+desktop-file-install --vendor fedora                   \
+  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications      \
+  --add-category X-Fedora                              \
+  --delete-original                                    \
+  $RPM_BUILD_ROOT/%{_datadir}/control-center-2.0/capplets/brightside.desktop
+
 # Note: the find_lang macro requires gettext
 %find_lang Brightside
 
@@ -79,11 +86,15 @@
 %{_datadir}/%{name}
 %{_sysconfdir}/gconf/schemas/brightside.schemas
 %{_datadir}/pixmaps/brightside-48.png
-%{_datadir}/control-center-2.0/capplets/brightside.desktop
+%{_datadir}/applications/*.desktop
 
 
 %changelog
-* Mon Feb 13 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info>
+* Sun Apr 02 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - - 1.4.0-11
+- Update URL
+- Use desktop-file-install
+
+* Mon Feb 13 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.4.0-10
 - Rebuild for Fedora Extras 5
 
 * Wed Aug 17 2005 Thorsten Leemhuis <fedora[AT]leemhuis[dot]info> - 1.4.0-9



From fedora-extras-commits at redhat.com  Sun Apr  2 12:55:47 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Sun,  2 Apr 2006 05:55:47 -0700
Subject: rpms/brightside/devel brightside.spec,1.11,1.12
Message-ID: <200604021255.k32CtnLx017551@cvs-int.fedora.redhat.com>

Author: thl

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

Modified Files:
	brightside.spec 
Log Message:
1.4.0-11 -- Update URL, Use desktop-file-install (fixes #187638)


Index: brightside.spec
===================================================================
RCS file: /cvs/extras/rpms/brightside/devel/brightside.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- brightside.spec	13 Feb 2006 17:31:21 -0000	1.11
+++ brightside.spec	2 Apr 2006 12:55:47 -0000	1.12
@@ -1,12 +1,12 @@
 Name:           brightside
 Version:        1.4.0
-Release: 	10%{?dist}
+Release: 	11%{?dist}
 
 Summary:        Add reactivity to the corners and edges of your GNOME desktop
 
 Group:          Applications/Productivity
 License:        GPL
-URL:            http://home.jesus.ox.ac.uk/~ecatmur/brightside/
+URL:            http://catmur.co.uk/~ed/main/brightside/
 Source0:        http://home.jesus.ox.ac.uk/~ecatmur/brightside/download/brightside-1.4.0.tar.bz2
 Patch0:         %{name}-gconf-mouse-speed.patch
 Patch1:         %{name}-libwnck.patch
@@ -19,6 +19,7 @@
 BuildRequires:  libwnck-devel >= 2.6.0
 BuildRequires:  libgnomeui-devel >= 2.6.0
 BuildRequires:  libglade2-devel >= 2.2.0
+BuildRequires:	desktop-file-utils
 
 ExcludeArch: 	ppc ppc64
 
@@ -45,6 +46,12 @@
 # For GConf apps: prevent schemas from being installed at this stage
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
+desktop-file-install --vendor fedora                   \
+  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications      \
+  --add-category X-Fedora                              \
+  --delete-original                                    \
+  $RPM_BUILD_ROOT/%{_datadir}/control-center-2.0/capplets/brightside.desktop
+
 # Note: the find_lang macro requires gettext
 %find_lang Brightside
 
@@ -79,11 +86,15 @@
 %{_datadir}/%{name}
 %{_sysconfdir}/gconf/schemas/brightside.schemas
 %{_datadir}/pixmaps/brightside-48.png
-%{_datadir}/control-center-2.0/capplets/brightside.desktop
+%{_datadir}/applications/*.desktop
 
 
 %changelog
-* Mon Feb 13 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info>
+* Sun Apr 02 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - - 1.4.0-11
+- Update URL
+- Use desktop-file-install
+
+* Mon Feb 13 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.4.0-10
 - Rebuild for Fedora Extras 5
 
 * Wed Aug 17 2005 Thorsten Leemhuis <fedora[AT]leemhuis[dot]info> - 1.4.0-9



From fedora-extras-commits at redhat.com  Sun Apr  2 13:08:44 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Sun,  2 Apr 2006 06:08:44 -0700
Subject: rpms/gwget/devel gwget-epiphany214.patch, NONE, 1.1 gwget.spec, 1.11,
	1.12
Message-ID: <200604021308.k32D8kYd019624@cvs-int.fedora.redhat.com>

Author: thl

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

Modified Files:
	gwget.spec 
Added Files:
	gwget-epiphany214.patch 
Log Message:
0.97-3 -- - Add LDFLAGS=-Wl,--export-dynamic to fix #187623; add patch for epiphany

gwget-epiphany214.patch:

--- NEW FILE gwget-epiphany214.patch ---
diff -Naur gwget-0.97.org/configure.in gwget-0.97/configure.in
--- gwget-0.97.org/configure.in	2006-04-02 10:28:42.000000000 +0200
+++ gwget-0.97/configure.in	2006-04-02 10:39:58.000000000 +0200
@@ -71,8 +71,10 @@
 
 dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8 or 1.10
 EPHY_AUTODETECT="(autodetect)"
-if pkg-config --exists epiphany-1.10; then
-               EPHY_VER=1.10
+if pkg-config --exists epiphany-2.14; then
+        EPHY_VER=2.14
+elif pkg-config --exists epiphany-1.10; then
+        EPHY_VER=1.10
 elif pkg-config --exists epiphany-1.8; then
        	EPHY_VER=1.8
 elif pkg-config --exists epiphany-1.6; then
@@ -107,11 +109,15 @@
           AC_DEFINE_UNQUOTED(EPHY_VERSION, 110, [Define to the Epiphany version (12 or 14 or 16)])
           EPIPHANY_PKGCONFIG=epiphany-1.10
           EPIPHANY_REQUIRED=1.9.0
+elif test $EPHY_VER = "2.14"; then
+          AC_DEFINE_UNQUOTED(EPHY_VERSION, 214, [Define to the Epiphany version (12 or 14 or 16)])
+          EPIPHANY_PKGCONFIG=epiphany-2.14
+          EPIPHANY_REQUIRED=2.14
 else
      	AC_MSG_RESULT([no epiphany installed])
 fi
 
-if test $EPHY_VER = "1.2" || test $EPHY_VER = "1.4" || test $EPHY_VER = "1.6" || test $EPHY_VER = "1.8" || test $EPHY_VER = "1.10"; then
+if test $EPHY_VER = "1.2" || test $EPHY_VER = "1.4" || test $EPHY_VER = "1.6" || test $EPHY_VER = "1.8" || test $EPHY_VER = "1.10"  || test $EPHY_VER = "2.14" ; then
 AC_MSG_RESULT([$EPHY_VER $EPHY_AUTODETECT])
 
 LIBGLIB_REQUIRED=2.4.0


Index: gwget.spec
===================================================================
RCS file: /cvs/extras/rpms/gwget/devel/gwget.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gwget.spec	13 Feb 2006 17:31:50 -0000	1.11
+++ gwget.spec	2 Apr 2006 13:08:44 -0000	1.12
@@ -1,13 +1,14 @@
-%define epimajor 1.9
+%define epimajor 2.14
 
 Summary:	Graphical download manager that uses wget
 Name:		gwget
 Version:	0.97
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		Applications/Internet
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gwget/0.97/gwget-0.97.tar.bz2
 Source1:	gwget.desktop
+Patch0:		gwget-epiphany214.patch
 URL:		http://gnome.org/projects/gwget
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildrequires:	libgnomeui-devel >= 2.0
@@ -16,6 +17,7 @@
 BuildRequires:	gettext >= 0.14.1
 BuildRequires:	desktop-file-utils
 BuildRequires:	epiphany-devel >= %{epimajor}
+BuildRequires:	autoconf
 Requires:	wget >= 1.9
 Requires(post):		GConf2
 Requires(preun):	GConf2
@@ -37,9 +39,12 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .patch0
+autoreconf -f
 
 %build
-%configure
+export LDFLAGS="${LDFLAGS} -Wl,--export-dynamic"
+%configure 
 make %{?_smp_mflags}
 
 %install
@@ -90,7 +95,11 @@
 
 
 %changelog
-* Mon Feb 13 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info>
+* Sun Apr 02 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.97-3
+- Add LDFLAGS="-Wl,--export-dynamic" #187623
+- Add patch from cvs to build against latest epiphany
+
+* Mon Feb 13 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.97-2
 - Rebuild for Fedora Extras 5
 
 * Wed Feb 01 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.97-1



From fedora-extras-commits at redhat.com  Sun Apr  2 14:20:00 2006
From: fedora-extras-commits at redhat.com (Duncan Ferguson (duncs))
Date: Sun,  2 Apr 2006 07:20:00 -0700
Subject: rpms/perl-X11-Protocol/FC-3 perl-X11-Protocol.spec,1.3,1.4
Message-ID: <200604021420.k32EK2U0021860@cvs-int.fedora.redhat.com>

Author: duncs

Update of /cvs/extras/rpms/perl-X11-Protocol/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21843

Modified Files:
	perl-X11-Protocol.spec 
Log Message:
Fix bug with builds on FC-3


Index: perl-X11-Protocol.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-X11-Protocol/FC-3/perl-X11-Protocol.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-X11-Protocol.spec	1 Apr 2006 10:58:01 -0000	1.3
+++ perl-X11-Protocol.spec	2 Apr 2006 14:20:00 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-X11-Protocol
 Version:        0.55
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        X11-Protocol - Raw interface to X Window System servers
 
 Group:          Development/Libraries
@@ -28,10 +28,10 @@
 %setup -q -n X11-Protocol-%{version}
 
 # Testing requires X - use "rpmbuild --with X"
-%{!?_with_X:\
-%{__perl} -pi -e 'print "print \"Remaining tests require X\n\"; exit 0;" \
-			if /Insert your test code below/;' test.pl \
-}
+%if 0%{!?_with_X:1}
+%{__perl} -pi -e 'print "print \"Remaining tests require X\n\"; exit 0;" 
+			if /Insert your test code below/;' test.pl 
+%endif
 
 perldoc -t perlartistic > Artistic
 perldoc -t perlgpl > COPYING
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Sun Apr 02 2006 Duncan Ferguson <duncan_j_ferguson at yahoo.co.uk> 0.55-3
+- Change tests for X environment
+
 * Sat Apr 01 2006 Duncan Ferguson <duncan_j_ferguson at yahoo.co.uk> 0.55-2
 - Specfile bugfile
 



From fedora-extras-commits at redhat.com  Sun Apr  2 14:42:05 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Sun,  2 Apr 2006 07:42:05 -0700
Subject: owners owners.list,1.792,1.793
Message-ID: <200604021442.k32Eg7Ks021958@cvs-int.fedora.redhat.com>

Author: thl

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

Modified Files:
	owners.list 
Log Message:
Christoph Wickert takes over gwget


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.792
retrieving revision 1.793
diff -u -r1.792 -r1.793
--- owners.list	2 Apr 2006 04:45:10 -0000	1.792
+++ owners.list	2 Apr 2006 14:42:05 -0000	1.793
@@ -423,7 +423,7 @@
 Fedora Extras|gv|A X front-end for the Ghostscript PostScript(TM) interpreter|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|gweled|Swapping gem game|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|gwenview|Simple image viewer for KDE|gauret at free.fr|extras-qa at fedoraproject.org|
-Fedora Extras|gwget|GUI Download manager using wget|fedora at leemhuis.info|extras-qa at fedoraproject.org|
+Fedora Extras|gwget|GUI Download manager using wget|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 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|



From fedora-extras-commits at redhat.com  Sun Apr  2 15:47:45 2006
From: fedora-extras-commits at redhat.com (Duncan Ferguson (duncs))
Date: Sun,  2 Apr 2006 08:47:45 -0700
Subject: rpms/perl-X11-Protocol/FC-4 perl-X11-Protocol.spec,1.2,1.3
Message-ID: <200604021547.k32FllPn024132@cvs-int.fedora.redhat.com>

Author: duncs

Update of /cvs/extras/rpms/perl-X11-Protocol/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24115

Modified Files:
	perl-X11-Protocol.spec 
Log Message:
Fixes for FC-3


Index: perl-X11-Protocol.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-X11-Protocol/FC-4/perl-X11-Protocol.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-X11-Protocol.spec	31 Mar 2006 18:04:06 -0000	1.2
+++ perl-X11-Protocol.spec	2 Apr 2006 15:47:44 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-X11-Protocol
 Version:        0.55
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        X11-Protocol - Raw interface to X Window System servers
 
 Group:          Development/Libraries
@@ -28,10 +28,10 @@
 %setup -q -n X11-Protocol-%{version}
 
 # Testing requires X - use "rpmbuild --with X"
-%{!?_with_X:\
-%{__perl} -pi -e 'print "print \"Remaining tests require X\n\"; exit 0;"
-			if /Insert your test code below/;' test.pl \
-}
+%if 0%{!?_with_X:1}
+%{__perl} -pi -e 'print "print \"Remaining tests require X\n\"; exit 0;" 
+			if /Insert your test code below/;' test.pl 
+%endif
 
 perldoc -t perlartistic > Artistic
 perldoc -t perlgpl > COPYING
@@ -69,6 +69,12 @@
 
 
 %changelog
+* Sun Apr 02 2006 Duncan Ferguson <duncan_j_ferguson at yahoo.co.uk> 0.55-3
+- Change tests for X environment
+
+* Sat Apr 01 2006 Duncan Ferguson <duncan_j_ferguson at yahoo.co.uk> 0.55-2
+- Specfile bugfile
+
 * Fri Mar 31 2006 Duncan Ferguson <duncan_j_ferguson at yahoo.co.uk> 0.55-1
 - Update to new version of X11::Protocol
 



From fedora-extras-commits at redhat.com  Sun Apr  2 15:47:52 2006
From: fedora-extras-commits at redhat.com (Duncan Ferguson (duncs))
Date: Sun,  2 Apr 2006 08:47:52 -0700
Subject: rpms/perl-X11-Protocol/devel perl-X11-Protocol.spec,1.2,1.3
Message-ID: <200604021547.k32Fls5C024155@cvs-int.fedora.redhat.com>

Author: duncs

Update of /cvs/extras/rpms/perl-X11-Protocol/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24138

Modified Files:
	perl-X11-Protocol.spec 
Log Message:
Fixes for FC-3


Index: perl-X11-Protocol.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-X11-Protocol/devel/perl-X11-Protocol.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-X11-Protocol.spec	31 Mar 2006 18:07:02 -0000	1.2
+++ perl-X11-Protocol.spec	2 Apr 2006 15:47:52 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-X11-Protocol
 Version:        0.55
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        X11-Protocol - Raw interface to X Window System servers
 
 Group:          Development/Libraries
@@ -28,10 +28,10 @@
 %setup -q -n X11-Protocol-%{version}
 
 # Testing requires X - use "rpmbuild --with X"
-%{!?_with_X:\
-%{__perl} -pi -e 'print "print \"Remaining tests require X\n\"; exit 0;"
-			if /Insert your test code below/;' test.pl \
-}
+%if 0%{!?_with_X:1}
+%{__perl} -pi -e 'print "print \"Remaining tests require X\n\"; exit 0;" 
+			if /Insert your test code below/;' test.pl 
+%endif
 
 perldoc -t perlartistic > Artistic
 perldoc -t perlgpl > COPYING
@@ -69,6 +69,12 @@
 
 
 %changelog
+* Sun Apr 02 2006 Duncan Ferguson <duncan_j_ferguson at yahoo.co.uk> 0.55-3
+- Change tests for X environment
+
+* Sat Apr 01 2006 Duncan Ferguson <duncan_j_ferguson at yahoo.co.uk> 0.55-2
+- Specfile bugfile
+
 * Fri Mar 31 2006 Duncan Ferguson <duncan_j_ferguson at yahoo.co.uk> 0.55-1
 - Update to new version of X11::Protocol
 



From fedora-extras-commits at redhat.com  Sun Apr  2 16:11:34 2006
From: fedora-extras-commits at redhat.com (András Tóth (tbandi72))
Date: Sun,  2 Apr 2006 09:11:34 -0700
Subject: rpms/gnome-yum/FC-4 gnome-yum-0.1.3-1.fc4.src.rpm, 1.1.2.1,
	NONE gnome-yum-0.1.3.tar.bz2, 1.2.4.1, NONE
Message-ID: <200604021611.k32GBafF026464@cvs-int.fedora.redhat.com>

Author: tbandi72

Update of /cvs/extras/rpms/gnome-yum/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26449

Removed Files:
      Tag: gnome-yum-0_1_3-1_fc4
	gnome-yum-0.1.3-1.fc4.src.rpm gnome-yum-0.1.3.tar.bz2 
Log Message:



--- gnome-yum-0.1.3-1.fc4.src.rpm DELETED ---


--- gnome-yum-0.1.3.tar.bz2 DELETED ---



From fedora-extras-commits at redhat.com  Sun Apr  2 16:13:31 2006
From: fedora-extras-commits at redhat.com (András Tóth (tbandi72))
Date: Sun,  2 Apr 2006 09:13:31 -0700
Subject: rpms/gnome-yum/FC-5 gnome-yum-0.1.3-1.fc5.src.rpm, 1.1.2.1,
	NONE gnome-yum-0.1.3.tar.bz2, 1.2.4.1, NONE
Message-ID: <200604021613.k32GDXof026507@cvs-int.fedora.redhat.com>

Author: tbandi72

Update of /cvs/extras/rpms/gnome-yum/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26492

Removed Files:
      Tag: gnome-yum-0_1_3-1_fc5
	gnome-yum-0.1.3-1.fc5.src.rpm gnome-yum-0.1.3.tar.bz2 
Log Message:



--- gnome-yum-0.1.3-1.fc5.src.rpm DELETED ---


--- gnome-yum-0.1.3.tar.bz2 DELETED ---



From fedora-extras-commits at redhat.com  Sun Apr  2 18:36:10 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Sun,  2 Apr 2006 11:36:10 -0700
Subject: rpms/vnstat/devel vnstat.spec,1.4,1.5
Message-ID: <200604021836.k32IaCDU031660@cvs-int.fedora.redhat.com>

Author: adrian

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

Modified Files:
	vnstat.spec 
Log Message:
* Fri Mar 18 2006 Adrian Reber <adrian at lisas.de> - 1.4-7
- rebuilt; fixed dist tag



Index: vnstat.spec
===================================================================
RCS file: /cvs/extras/rpms/vnstat/devel/vnstat.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vnstat.spec	23 May 2005 00:22:11 -0000	1.4
+++ vnstat.spec	2 Apr 2006 18:36:10 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:	Console-based network traffic monitor
 Name:		vnstat
 Version:	1.4
-Release: 5
+Release:	7%{?dist}
 
 License:	GPL
 Group:		System Environment/Daemons
@@ -87,6 +87,12 @@
 %attr(-,vnstat,vnstat)%{_localstatedir}/lib/%{name}
 
 %changelog
+* Fri Mar 18 2006 Adrian Reber <adrian at lisas.de> - 1.4-7
+- rebuilt; fixed dist tag
+
+* Fri Mar 18 2006 Adrian Reber <adrian at lisas.de> - 1.4-6
+- rebuilt
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.4-5
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Sun Apr  2 18:51:11 2006
From: fedora-extras-commits at redhat.com (Duncan Ferguson (duncs))
Date: Sun,  2 Apr 2006 11:51:11 -0700
Subject: rpms/perl-X11-Protocol/FC-5 perl-X11-Protocol.spec,1.1,1.2
Message-ID: <200604021851.k32IpDw8031750@cvs-int.fedora.redhat.com>

Author: duncs

Update of /cvs/extras/rpms/perl-X11-Protocol/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31733

Modified Files:
	perl-X11-Protocol.spec 
Log Message:
Updated to latest version, with spec file bugfixes


Index: perl-X11-Protocol.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-X11-Protocol/FC-5/perl-X11-Protocol.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-X11-Protocol.spec	10 Sep 2005 10:29:51 -0000	1.1
+++ perl-X11-Protocol.spec	2 Apr 2006 18:51:11 -0000	1.2
@@ -1,12 +1,12 @@
 Name:           perl-X11-Protocol
-Version:        0.54
-Release:        2%{?dist}
+Version:        0.55
+Release:        3%{?dist}
 Summary:        X11-Protocol - Raw interface to X Window System servers
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/X11-Protocol/
-Source0:        http://search.cpan.org/CPAN/authors/id/S/SM/SMCCAM/X11-Protocol-0.54.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/S/SM/SMCCAM/X11-Protocol-0.55.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -28,10 +28,10 @@
 %setup -q -n X11-Protocol-%{version}
 
 # Testing requires X - use "rpmbuild --with X"
-%{!?_with_X:\
-%{__perl} -pi -e 'print "print \"Remaining tests require X\n\"; exit 0;"
-			if /Insert your test code below/;' test.pl \
-}
+%if 0%{!?_with_X:1}
+%{__perl} -pi -e 'print "print \"Remaining tests require X\n\"; exit 0;" 
+			if /Insert your test code below/;' test.pl 
+%endif
 
 perldoc -t perlartistic > Artistic
 perldoc -t perlgpl > COPYING
@@ -69,6 +69,15 @@
 
 
 %changelog
+* Sun Apr 02 2006 Duncan Ferguson <duncan_j_ferguson at yahoo.co.uk> 0.55-3
+- Change tests for X environment
+
+* Sat Apr 01 2006 Duncan Ferguson <duncan_j_ferguson at yahoo.co.uk> 0.55-2
+- Specfile bugfile
+
+* Fri Mar 31 2006 Duncan Ferguson <duncan_j_ferguson at yahoo.co.uk> 0.55-1
+- Update to new version of X11::Protocol
+
 * Fri Aug 26 2005 Paul Howarth <paul at city-fan.org> 0.54-2
 - remove redundant BR: perl
 - remove compiler optimization flags, redundant for noarch package



From fedora-extras-commits at redhat.com  Sun Apr  2 20:08:06 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sun,  2 Apr 2006 13:08:06 -0700
Subject: rpms/tclhttpd/devel tclhttpd-3.5.1-nofork.patch, NONE,
	1.1 tclhttpd.spec, 1.5, 1.6
Message-ID: <200604022008.k32K88xA003512@cvs-int.fedora.redhat.com>

Author: wart

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

Modified Files:
	tclhttpd.spec 
Added Files:
	tclhttpd-3.5.1-nofork.patch 
Log Message:
- Don't create the tclhttpd home directory when adding the user.
- Added patch to disable [fork] if we're running in a threaded Tcl.
- Add newlines to make the ChangeLog more readable.



tclhttpd-3.5.1-nofork.patch:

--- NEW FILE tclhttpd-3.5.1-nofork.patch ---
diff -Naur tclhttpd3.5.1/bin/httpd.tcl tclhttpd3.5.1.new/bin/httpd.tcl
--- tclhttpd3.5.1/bin/httpd.tcl	2006-04-02 12:57:00.000000000 -0700
+++ tclhttpd3.5.1.new/bin/httpd.tcl	2006-04-02 12:57:50.000000000 -0700
@@ -342,6 +342,11 @@
 
 # Fork a child process if expect is present.
 if {$Config(daemon)} {
+    if {[info exists tcl_platform(threaded)] && $tcl_platform(threaded) == 1} {
+	Stderr "Can't fork with a threaded interpreter.  Please run without the -daemon flag."
+        exit 1
+    }
+
     if {![catch {package require Expect}] || ![catch {package require Tclx}]} {
         if {[fork]} {
             exit
diff -Naur tclhttpd3.5.1/bin/redhat.init.tclhttpd tclhttpd3.5.1.new/bin/redhat.init.tclhttpd
--- tclhttpd3.5.1/bin/redhat.init.tclhttpd	2006-04-02 12:57:00.000000000 -0700
+++ tclhttpd3.5.1.new/bin/redhat.init.tclhttpd	2006-04-02 12:58:23.000000000 -0700
@@ -142,7 +142,7 @@
 'start')
         echo -n $"Starting $prog: "
         ln -sf /var/run/tclhttpd/tclhttpd.pid /var/run/tclhttpd.pid
-	daemon $prog -daemon 1 -config /etc/tclhttpd/tclhttpd.rc -docRoot /var/www/tclhttpd/htdocs -library /var/www/tclhttpd/custom
+	daemon $prog -config /etc/tclhttpd/tclhttpd.rc -docRoot /var/www/tclhttpd/htdocs -library /var/www/tclhttpd/custom 2>1 >> /var/log/tclhttpd/startup.log &
         RETVAL=$?
         echo
         [ $RETVAL = 0 ] && touch /var/lock/subsys/tclhttpd


Index: tclhttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/devel/tclhttpd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tclhttpd.spec	21 Feb 2006 17:32:00 -0000	1.5
+++ tclhttpd.spec	2 Apr 2006 20:08:06 -0000	1.6
@@ -1,7 +1,7 @@
 %define contentdir %_var/www/tclhttpd
 Name: tclhttpd
 Version: 3.5.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: Extensible Web+Application server written in Tcl
 
 Group: System Environment/Daemons
@@ -10,6 +10,7 @@
 Source0:        http://prdownloads.sourceforge.net/tclhttpd/tclhttpd3.5.1.tar.gz
 Patch0:		tclhttpd_fedora.1.patch
 Patch1:		tclhttpd-md5-3.5.1.patch
+Patch2:		tclhttpd-3.5.1-nofork.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: tcl-devel
@@ -28,10 +29,10 @@
 %setup -q -n %{name}%{version}
 %patch0 -p1
 %patch1
+%patch2 -p1
 
 %build
 %configure --with-serverroot=%{contentdir}
-#make limit_LIB_FILE=liblimit.so crypt_LIB_FILE=libcrypt.so %{?_smp_mflags}
 make %{?_smp_mflags}
 
 %install
@@ -92,7 +93,7 @@
 # server as "root" or "nobody".
 user_uid=`id -u tclhttpd 2>/dev/null`
 if [ x"$user_uid" = x ] ; then
-    /usr/sbin/fedora-useradd 16 -c "Tclhttpd" -s /bin/false -d %{contentdir} tclhttpd
+    /usr/sbin/fedora-useradd 16 -c "Tclhttpd" -s /bin/false -d %{contentdir} -M tclhttpd
 fi
 
 %post
@@ -133,36 +134,51 @@
 %ghost %{_var}/run/tclhttpd/tclhttpd.pid
 
 %changelog
+* Fri Mar 31 2006 Wart <wart at kobold.org> - 3.5.1-11
+- Don't create the tclhttpd home directory when adding the user.
+- Added patch to disable [fork] if we're running in a threaded Tcl.
+- Add newlines to make the ChangeLog more readable.
+
 * Tue Feb 21 2006 Wart <wart at kobold.org> - 3.5.1-10
 - Rebuild for FC5
+
 * Fri Jan 27 2006 Wart <wart at kobold.org> - 3.5.1-9
 - Added patch for utils.tcl to prevent error due to missing md5 function.
+
 * Fri Jan 27 2006 Wart <wart at kobold.org> - 3.5.1-8
 - Updated patch so that tclhttpd starts as root and then switches to
   the tclhttpd user.  This is necessary if tclhttpd is to listen
   on port 80.
+
 * Sun Jan 21 2006 Wart <wart at kobold.org> - 3.5.1-7
 - Check if the tclhttpd user exists before trying to create it
+
 * Sun Jan 15 2006 Wart <wart at kobold.org> - 3.5.1-6
 - Use ghosted files for runtime state files.
 - Update patch to remove build dependency on autoconf.
+
 * Tue Nov 22 2005 Wart <wart at kobold.org> - 3.5.1-5
 - Move bin/httpdthread.tcl out of the bin directory.
+
 * Sun Nov 20 2005 Wart <wart at kobold.org> - 3.5.1-4
 - Use fedora_useradd/fedora_userdel to create/delete the tclhttpd user.
 - Added BuildRequires: autoconf.
 - Clean up file permissions to remove many rpmlint warnings.
+
 * Thu Jul 7 2005 <wart at kobold.org> - 3.5.1-3
 - Add 'restart' in the rpm postun stage.  Add post/preun requirements
   for /sbin/chkconfig and /sbin/service.
 - Changed the default runlevel in the init script to '-' to prevent the
   service from being started by default.
+
 * Thu Jun 30 2005 <wart at kobold.org> - 3.5.1-2
 - Updated release tag to include %{dist}
 - Don't include changes to the spec in the patchfile.
 - run autoreconf in the prep stage, not the build stage.
+
 * Fri Jun 17 2005 <wart at kobold.org> - 3.5.1-1
 - Updated spec file to conform to Fedora Core 4 standards.
+
 * Sat Nov 13 2004 <wart at kobold.org> - 3.5.1-0.fdr.8
 - Change content directory again to prevent rpmlint warnings.
 - Change ownership of content directory to prevent rpmlint warnings.
@@ -170,13 +186,16 @@
 - Move crypt and limit dynamically loadable modules into the proper
   subdirectories
 - Turn off potentially insecure debug url.
+
 * Sun Nov 7 2004 <wart at kobold.org> - 3.5.1-0.fdr.7
 - Change content directory to /var/tclhttpd
 - Move logs to /var/log/tclhttpd
 - Remove the debug auth password.
+
 * Wed Nov 3 2004 <wart at kobold.org> - 3.5.1-0.fdr.6
 - Add missing #include <crypt.h> to crypt.c to fix a segfault on
   x86_64.
+
 * Sat Oct 30 2004 <wart at kobold.org> - 3.5.1-0.fdr.5
 - Add expect to the dependency list.
 - Let tclhttpd fork into the background if either one of tclx
@@ -184,15 +203,19 @@
 - Add existing docs to %doc list.
 - Move configuration file to /etc/tclhttpd.
 - Clean up some rpmlint warnings
+
 * Sun Oct 24 2004 <wart at kobold.org> - 3.5.1-0.fdr.4
 - Change package group in the specfile.  Add tcllib to dependency list.
   Remove tclhttpd user during uninstall.
+
 * Wed Oct 6 2004 <wart at kobold.org> - 3.5.1-0.fdr.3
 - Fix bug in the /etc/init.d/tclhttpd startup script that was causing
   it to kill a random tclsh process during shutdown, and misreporting
   the status of tclhttpd.
+
 * Tue Sep 21 2004 <wart at kobold.org> - 3.5.1-0.fdr.2
 - remove hardcoded path in the %build section of the rpm spec file.
+
 * Sun Sep 12 2004 <wart at kobold.org> - 3.5.1-0.fdr.1
 - Initial rpm with a Fedora-compatible spec file.  Included patch
   for better /etc/init.d script behaviour.



From fedora-extras-commits at redhat.com  Sun Apr  2 20:12:42 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sun,  2 Apr 2006 13:12:42 -0700
Subject: rpms/tclhttpd/FC-5 tclhttpd-3.5.1-nofork.patch, NONE,
	1.1 tclhttpd.spec, 1.5, 1.6
Message-ID: <200604022012.k32KCis4003584@cvs-int.fedora.redhat.com>

Author: wart

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

Modified Files:
	tclhttpd.spec 
Added Files:
	tclhttpd-3.5.1-nofork.patch 
Log Message:
- Don't create the tclhttpd home directory when adding the user.
- Added patch to disable [fork] if we're running in a threaded Tcl.
- Add newlines to make the ChangeLog more readable.



tclhttpd-3.5.1-nofork.patch:

--- NEW FILE tclhttpd-3.5.1-nofork.patch ---
diff -Naur tclhttpd3.5.1/bin/httpd.tcl tclhttpd3.5.1.new/bin/httpd.tcl
--- tclhttpd3.5.1/bin/httpd.tcl	2006-04-02 12:57:00.000000000 -0700
+++ tclhttpd3.5.1.new/bin/httpd.tcl	2006-04-02 12:57:50.000000000 -0700
@@ -342,6 +342,11 @@
 
 # Fork a child process if expect is present.
 if {$Config(daemon)} {
+    if {[info exists tcl_platform(threaded)] && $tcl_platform(threaded) == 1} {
+	Stderr "Can't fork with a threaded interpreter.  Please run without the -daemon flag."
+        exit 1
+    }
+
     if {![catch {package require Expect}] || ![catch {package require Tclx}]} {
         if {[fork]} {
             exit
diff -Naur tclhttpd3.5.1/bin/redhat.init.tclhttpd tclhttpd3.5.1.new/bin/redhat.init.tclhttpd
--- tclhttpd3.5.1/bin/redhat.init.tclhttpd	2006-04-02 12:57:00.000000000 -0700
+++ tclhttpd3.5.1.new/bin/redhat.init.tclhttpd	2006-04-02 12:58:23.000000000 -0700
@@ -142,7 +142,7 @@
 'start')
         echo -n $"Starting $prog: "
         ln -sf /var/run/tclhttpd/tclhttpd.pid /var/run/tclhttpd.pid
-	daemon $prog -daemon 1 -config /etc/tclhttpd/tclhttpd.rc -docRoot /var/www/tclhttpd/htdocs -library /var/www/tclhttpd/custom
+	daemon $prog -config /etc/tclhttpd/tclhttpd.rc -docRoot /var/www/tclhttpd/htdocs -library /var/www/tclhttpd/custom 2>1 >> /var/log/tclhttpd/startup.log &
         RETVAL=$?
         echo
         [ $RETVAL = 0 ] && touch /var/lock/subsys/tclhttpd


Index: tclhttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/FC-5/tclhttpd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tclhttpd.spec	21 Feb 2006 17:32:00 -0000	1.5
+++ tclhttpd.spec	2 Apr 2006 20:12:42 -0000	1.6
@@ -1,7 +1,7 @@
 %define contentdir %_var/www/tclhttpd
 Name: tclhttpd
 Version: 3.5.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: Extensible Web+Application server written in Tcl
 
 Group: System Environment/Daemons
@@ -10,6 +10,7 @@
 Source0:        http://prdownloads.sourceforge.net/tclhttpd/tclhttpd3.5.1.tar.gz
 Patch0:		tclhttpd_fedora.1.patch
 Patch1:		tclhttpd-md5-3.5.1.patch
+Patch2:		tclhttpd-3.5.1-nofork.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: tcl-devel
@@ -28,16 +29,15 @@
 %setup -q -n %{name}%{version}
 %patch0 -p1
 %patch1
+%patch2 -p1
 
 %build
 %configure --with-serverroot=%{contentdir}
-#make limit_LIB_FILE=liblimit.so crypt_LIB_FILE=libcrypt.so %{?_smp_mflags}
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# Override the names of the library files so that rpm does not try to think
-# that this is a library package.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 install -p -D bin/redhat.init.tclhttpd $RPM_BUILD_ROOT/%{_initrddir}/tclhttpd
 mkdir -p $RPM_BUILD_ROOT%_var/run/tclhttpd
@@ -92,7 +92,7 @@
 # server as "root" or "nobody".
 user_uid=`id -u tclhttpd 2>/dev/null`
 if [ x"$user_uid" = x ] ; then
-    /usr/sbin/fedora-useradd 16 -c "Tclhttpd" -s /bin/false -d %{contentdir} tclhttpd
+    /usr/sbin/fedora-useradd 16 -c "Tclhttpd" -s /bin/false -d %{contentdir} -M tclhttpd
 fi
 
 %post
@@ -133,36 +133,51 @@
 %ghost %{_var}/run/tclhttpd/tclhttpd.pid
 
 %changelog
+* Fri Mar 31 2006 Wart <wart at kobold.org> - 3.5.1-11
+- Don't create the tclhttpd home directory when adding the user.
+- Added patch to disable [fork] if we're running in a threaded Tcl.
+- Add newlines to make the ChangeLog more readable.
+
 * Tue Feb 21 2006 Wart <wart at kobold.org> - 3.5.1-10
 - Rebuild for FC5
+
 * Fri Jan 27 2006 Wart <wart at kobold.org> - 3.5.1-9
 - Added patch for utils.tcl to prevent error due to missing md5 function.
+
 * Fri Jan 27 2006 Wart <wart at kobold.org> - 3.5.1-8
 - Updated patch so that tclhttpd starts as root and then switches to
   the tclhttpd user.  This is necessary if tclhttpd is to listen
   on port 80.
+
 * Sun Jan 21 2006 Wart <wart at kobold.org> - 3.5.1-7
 - Check if the tclhttpd user exists before trying to create it
+
 * Sun Jan 15 2006 Wart <wart at kobold.org> - 3.5.1-6
 - Use ghosted files for runtime state files.
 - Update patch to remove build dependency on autoconf.
+
 * Tue Nov 22 2005 Wart <wart at kobold.org> - 3.5.1-5
 - Move bin/httpdthread.tcl out of the bin directory.
+
 * Sun Nov 20 2005 Wart <wart at kobold.org> - 3.5.1-4
 - Use fedora_useradd/fedora_userdel to create/delete the tclhttpd user.
 - Added BuildRequires: autoconf.
 - Clean up file permissions to remove many rpmlint warnings.
+
 * Thu Jul 7 2005 <wart at kobold.org> - 3.5.1-3
 - Add 'restart' in the rpm postun stage.  Add post/preun requirements
   for /sbin/chkconfig and /sbin/service.
 - Changed the default runlevel in the init script to '-' to prevent the
   service from being started by default.
+
 * Thu Jun 30 2005 <wart at kobold.org> - 3.5.1-2
 - Updated release tag to include %{dist}
 - Don't include changes to the spec in the patchfile.
 - run autoreconf in the prep stage, not the build stage.
+
 * Fri Jun 17 2005 <wart at kobold.org> - 3.5.1-1
 - Updated spec file to conform to Fedora Core 4 standards.
+
 * Sat Nov 13 2004 <wart at kobold.org> - 3.5.1-0.fdr.8
 - Change content directory again to prevent rpmlint warnings.
 - Change ownership of content directory to prevent rpmlint warnings.
@@ -170,13 +185,16 @@
 - Move crypt and limit dynamically loadable modules into the proper
   subdirectories
 - Turn off potentially insecure debug url.
+
 * Sun Nov 7 2004 <wart at kobold.org> - 3.5.1-0.fdr.7
 - Change content directory to /var/tclhttpd
 - Move logs to /var/log/tclhttpd
 - Remove the debug auth password.
+
 * Wed Nov 3 2004 <wart at kobold.org> - 3.5.1-0.fdr.6
 - Add missing #include <crypt.h> to crypt.c to fix a segfault on
   x86_64.
+
 * Sat Oct 30 2004 <wart at kobold.org> - 3.5.1-0.fdr.5
 - Add expect to the dependency list.
 - Let tclhttpd fork into the background if either one of tclx
@@ -184,15 +202,19 @@
 - Add existing docs to %doc list.
 - Move configuration file to /etc/tclhttpd.
 - Clean up some rpmlint warnings
+
 * Sun Oct 24 2004 <wart at kobold.org> - 3.5.1-0.fdr.4
 - Change package group in the specfile.  Add tcllib to dependency list.
   Remove tclhttpd user during uninstall.
+
 * Wed Oct 6 2004 <wart at kobold.org> - 3.5.1-0.fdr.3
 - Fix bug in the /etc/init.d/tclhttpd startup script that was causing
   it to kill a random tclsh process during shutdown, and misreporting
   the status of tclhttpd.
+
 * Tue Sep 21 2004 <wart at kobold.org> - 3.5.1-0.fdr.2
 - remove hardcoded path in the %build section of the rpm spec file.
+
 * Sun Sep 12 2004 <wart at kobold.org> - 3.5.1-0.fdr.1
 - Initial rpm with a Fedora-compatible spec file.  Included patch
   for better /etc/init.d script behaviour.



From fedora-extras-commits at redhat.com  Sun Apr  2 20:21:02 2006
From: fedora-extras-commits at redhat.com (Duncan Ferguson (duncs))
Date: Sun,  2 Apr 2006 13:21:02 -0700
Subject: rpms/perl-X11-Protocol/FC-5 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200604022021.k32KL4tU003660@cvs-int.fedora.redhat.com>

Author: duncs

Update of /cvs/extras/rpms/perl-X11-Protocol/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3641

Modified Files:
	.cvsignore sources 
Log Message:
version update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-X11-Protocol/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Sep 2005 10:29:51 -0000	1.2
+++ .cvsignore	2 Apr 2006 20:21:02 -0000	1.3
@@ -1 +1 @@
-X11-Protocol-0.54.tar.gz
+X11-Protocol-0.55.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-X11-Protocol/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Sep 2005 10:29:51 -0000	1.2
+++ sources	2 Apr 2006 20:21:02 -0000	1.3
@@ -1 +1 @@
-b2ad4dc41755f2b08f9cd2899636346c  X11-Protocol-0.54.tar.gz
+3d914cb8945105a8b96ec1497dee47e2  X11-Protocol-0.55.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr  2 20:31:51 2006
From: fedora-extras-commits at redhat.com (Duncan Ferguson (duncs))
Date: Sun,  2 Apr 2006 13:31:51 -0700
Subject: rpms/perl-X11-Protocol/FC-5 perl-X11-Protocol.spec,1.2,1.3
Message-ID: <200604022031.k32KVrrt003854@cvs-int.fedora.redhat.com>

Author: duncs

Update of /cvs/extras/rpms/perl-X11-Protocol/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3837

Modified Files:
	perl-X11-Protocol.spec 
Log Message:
Correct silly procedural mistake


Index: perl-X11-Protocol.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-X11-Protocol/FC-5/perl-X11-Protocol.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-X11-Protocol.spec	2 Apr 2006 18:51:11 -0000	1.2
+++ perl-X11-Protocol.spec	2 Apr 2006 20:31:51 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-X11-Protocol
 Version:        0.55
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        X11-Protocol - Raw interface to X Window System servers
 
 Group:          Development/Libraries
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Sun Apr 02 2006 Duncan Ferguson <duncan_j_ferguson at yahoo.co.uk> 0.55-4
+- Correct silly procedural mistake
+
 * Sun Apr 02 2006 Duncan Ferguson <duncan_j_ferguson at yahoo.co.uk> 0.55-3
 - Change tests for X environment
 



From fedora-extras-commits at redhat.com  Sun Apr  2 20:44:31 2006
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 2 Apr 2006 13:44:31 -0700
Subject: owners owners.list,1.793,1.794
Message-ID: <200604022044.k32KiVeC003992@cvs-int.fedora.redhat.com>

Author: wtogami

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

Modified Files:
	owners.list 
Log Message:
nabi is orphaned



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.793
retrieving revision 1.794
diff -u -r1.793 -r1.794
--- owners.list	2 Apr 2006 14:42:05 -0000	1.793
+++ owners.list	2 Apr 2006 20:44:31 -0000	1.794
@@ -723,7 +723,7 @@
 Fedora Extras|muine|Music Player for GNOME|foolish at guezz.net|extras-qa at fedoraproject.org|
 Fedora Extras|munin|Network-wide graphing framework (grapher/gatherer)|kevin at tummy.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|nabi|Simple Hangul X Input Method|djoo at redhat.com|extras-qa at fedoraproject.org|wtogami at redhat.com
+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|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|



From fedora-extras-commits at redhat.com  Sun Apr  2 21:03:00 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Sun,  2 Apr 2006 14:03:00 -0700
Subject: rpms/gnokii/devel gnokii.spec,1.1,1.2
Message-ID: <200604022103.k32L32Ah006130@cvs-int.fedora.redhat.com>

Author: snirkel

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

Modified Files:
	gnokii.spec 
Log Message:
Post-approval patches.



Index: gnokii.spec
===================================================================
RCS file: /cvs/extras/rpms/gnokii/devel/gnokii.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnokii.spec	1 Apr 2006 18:24:59 -0000	1.1
+++ gnokii.spec	2 Apr 2006 21:03:00 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           gnokii
 Version:        0.6.12
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Linux/Unix tool suite for various mobile phones
 
 Group:          Applications/Communications
@@ -116,6 +116,19 @@
 install -pm 644 %{SOURCE6} README.smsd2mail
 # Fix up X86_64 library placement issue
 %{__sed} -i -e 's|/lib /usr/lib\b|/%{_lib} %{_libdir}|' configure
+# Polish default font, cool but ISO8859-2
+iconv -f iso8859-2 -t utf8 -o iconv.tmp ChangeLog
+mv iconv.tmp ChangeLog
+iconv -f iso8859-2 -t utf8 -o iconv.tmp Docs/CREDITS
+mv iconv.tmp Docs/CREDITS
+iconv -f iso8859-2 -t utf8 -o iconv.tmp Docs/README
+mv iconv.tmp Docs/README
+iconv -f iso8859-2 -t utf8 -o iconv.tmp COPYRIGHT
+mv iconv.tmp COPYRIGHT
+iconv -f iso8859-2 -t utf8 -o iconv.tmp smsd/ChangeLog
+mv iconv.tmp smsd/ChangeLog
+iconv -f iso8859-2 -t utf8 -o iconv.tmp xgnokii/ChangeLog
+mv iconv.tmp xgnokii/ChangeLog
 
 
 %build
@@ -161,20 +174,6 @@
 install -Dpm 644 %{SOURCE4} \
   $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/gnokii-smsd
 
-iconv -f iso8859-2 -t utf8 -o iconv.tmp ChangeLog
-mv iconv.tmp ChangeLog
-iconv -f iso8859-2 -t utf8 -o iconv.tmp Docs/CREDITS
-mv iconv.tmp Docs/CREDITS
-iconv -f iso8859-2 -t utf8 -o iconv.tmp Docs/README
-mv iconv.tmp Docs/README
-iconv -f iso8859-2 -t utf8 -o iconv.tmp COPYRIGHT
-mv iconv.tmp COPYRIGHT
-iconv -f iso8859-2 -t utf8 -o iconv.tmp smsd/ChangeLog
-mv iconv.tmp smsd/ChangeLog
-iconv -f iso8859-2 -t utf8 -o iconv.tmp xgnokii/ChangeLog
-mv iconv.tmp xgnokii/ChangeLog
-
-
 
 %find_lang %{name}
 
@@ -235,6 +234,8 @@
 %{_datadir}/applications/*xgnokii.desktop
 %{_datadir}/xgnokii/
 %{_mandir}/man1/xgnokii.1*
+%{_libdir}/pkgconfig/xgnokii.pc
+%dir %{_prefix}/share/xgnokii
 
 %files smsd
 %defattr(-,root,root,-)
@@ -262,9 +263,11 @@
 %{_includedir}/gnokii*
 %{_libdir}/libgnokii.so
 %{_libdir}/pkgconfig/gnokii.pc
-%{_libdir}/pkgconfig/xgnokii.pc
 
 %changelog
+* Sun Apr 2 2006 Linus Walleij <triad at df.lth.se> - 0.6.12-3
+- Post-import updates.
+
 * Thu Mar 31 2006 Linus Walleij <triad at df.lth.se> - 0.6.12-2
 - Updated after comments from Ville.
 



From fedora-extras-commits at redhat.com  Sun Apr  2 21:37:40 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Sun,  2 Apr 2006 14:37:40 -0700
Subject: rpms/gnokii/devel gnokii.spec,1.2,1.3
Message-ID: <200604022137.k32LbgPl006299@cvs-int.fedora.redhat.com>

Author: snirkel

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

Modified Files:
	gnokii.spec 
Log Message:
Fixed a goof-up.



Index: gnokii.spec
===================================================================
RCS file: /cvs/extras/rpms/gnokii/devel/gnokii.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnokii.spec	2 Apr 2006 21:03:00 -0000	1.2
+++ gnokii.spec	2 Apr 2006 21:37:40 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           gnokii
 Version:        0.6.12
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Linux/Unix tool suite for various mobile phones
 
 Group:          Applications/Communications
@@ -232,10 +232,8 @@
 %{_bindir}/xgnokii
 %{_datadir}/pixmaps/xgnokii.png
 %{_datadir}/applications/*xgnokii.desktop
-%{_datadir}/xgnokii/
 %{_mandir}/man1/xgnokii.1*
-%{_libdir}/pkgconfig/xgnokii.pc
-%dir %{_prefix}/share/xgnokii
+%{_prefix}/share/xgnokii/
 
 %files smsd
 %defattr(-,root,root,-)
@@ -263,8 +261,12 @@
 %{_includedir}/gnokii*
 %{_libdir}/libgnokii.so
 %{_libdir}/pkgconfig/gnokii.pc
+%{_libdir}/pkgconfig/xgnokii.pc
 
 %changelog
+* Sun Apr 2 2006 Linus Walleij <triad at df.lth.se> - 0.6.12-4
+- Goofed up. Fixit it...
+
 * Sun Apr 2 2006 Linus Walleij <triad at df.lth.se> - 0.6.12-3
 - Post-import updates.
 



From fedora-extras-commits at redhat.com  Sun Apr  2 21:44:44 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Sun,  2 Apr 2006 14:44:44 -0700
Subject: rpms/python-imaging/devel python-imaging-lib64.patch, NONE,
	1.1 python-imaging.spec, 1.7, 1.8
Message-ID: <200604022144.k32LikGd006388@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/python-imaging/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6364

Modified Files:
	python-imaging.spec 
Added Files:
	python-imaging-lib64.patch 
Log Message:
* Sun Apr  2 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-2
- Fix bug #185203 (Thanks to Rick L Vinyard Jr)


python-imaging-lib64.patch:

--- NEW FILE python-imaging-lib64.patch ---
--- setup-old.py	2005-03-23 18:16:40.000000000 +0000
+++ setup.py	2006-04-02 22:34:04.000000000 +0100
@@ -180,6 +180,7 @@
         add_directory(library_dirs, "/usr/local/lib")
         add_directory(include_dirs, "/usr/local/include")
 
+        add_directory(library_dirs, "/usr/lib64")
         add_directory(library_dirs, "/usr/lib")
         add_directory(include_dirs, "/usr/include")
 


Index: python-imaging.spec
===================================================================
RCS file: /cvs/extras/rpms/python-imaging/devel/python-imaging.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-imaging.spec	6 Mar 2006 01:31:12 -0000	1.7
+++ python-imaging.spec	2 Apr 2006 21:44:44 -0000	1.8
@@ -5,12 +5,13 @@
 Summary: Python's own image processing library
 Name: python-imaging
 Version: 1.1.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: Distributable
 Group: Development/Languages
 Source0: http://effbot.org/downloads/Imaging-%{version}.tar.gz
 Patch0: %{name}-no-xv.patch
+Patch1: %{name}-lib64.patch
 URL: http://www.pythonware.com/products/pil/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -48,6 +49,7 @@
 %prep
 %setup -q -n Imaging-%{version}
 %patch0 -p1
+%patch1 -p0
 
 # fix the interpreter path for Scripts/*.py
 cd Scripts
@@ -102,6 +104,9 @@
 
 
 %changelog
+* Sun Apr  2 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-2
+- Fix bug #185203 (Thanks to Rick L Vinyard Jr)
+
 * Sun Mar  5 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-1
 - Update to 1.1.5
 



From fedora-extras-commits at redhat.com  Sun Apr  2 21:57:27 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Sun,  2 Apr 2006 14:57:27 -0700
Subject: rpms/python-imaging/FC-5 python-imaging-lib64.patch, NONE,
	1.1 python-imaging.spec, 1.7, 1.8
Message-ID: <200604022157.k32LvTTU006472@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/python-imaging/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6452

Modified Files:
	python-imaging.spec 
Added Files:
	python-imaging-lib64.patch 
Log Message:
* Sun Apr  2 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-2
- Fix bug #185203 (Thanks to Rick L Vinyard Jr)


python-imaging-lib64.patch:

--- NEW FILE python-imaging-lib64.patch ---
--- setup-old.py	2005-03-23 18:16:40.000000000 +0000
+++ setup.py	2006-04-02 22:34:04.000000000 +0100
@@ -180,6 +180,7 @@
         add_directory(library_dirs, "/usr/local/lib")
         add_directory(include_dirs, "/usr/local/include")
 
+        add_directory(library_dirs, "/usr/lib64")
         add_directory(library_dirs, "/usr/lib")
         add_directory(include_dirs, "/usr/include")
 


Index: python-imaging.spec
===================================================================
RCS file: /cvs/extras/rpms/python-imaging/FC-5/python-imaging.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-imaging.spec	6 Mar 2006 01:31:12 -0000	1.7
+++ python-imaging.spec	2 Apr 2006 21:57:26 -0000	1.8
@@ -5,12 +5,13 @@
 Summary: Python's own image processing library
 Name: python-imaging
 Version: 1.1.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: Distributable
 Group: Development/Languages
 Source0: http://effbot.org/downloads/Imaging-%{version}.tar.gz
 Patch0: %{name}-no-xv.patch
+Patch1: %{name}-lib64.patch
 URL: http://www.pythonware.com/products/pil/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -48,6 +49,7 @@
 %prep
 %setup -q -n Imaging-%{version}
 %patch0 -p1
+%patch1 -p0
 
 # fix the interpreter path for Scripts/*.py
 cd Scripts
@@ -102,6 +104,9 @@
 
 
 %changelog
+* Sun Apr  2 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-2
+- Fix bug #185203 (Thanks to Rick L Vinyard Jr)
+
 * Sun Mar  5 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-1
 - Update to 1.1.5
 



From fedora-extras-commits at redhat.com  Sun Apr  2 21:59:25 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Sun,  2 Apr 2006 14:59:25 -0700
Subject: rpms/python-imaging/FC-4 python-imaging-lib64.patch, NONE,
	1.1 python-imaging.spec, 1.7, 1.8
Message-ID: <200604022159.k32LxRH0006541@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/python-imaging/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6521

Modified Files:
	python-imaging.spec 
Added Files:
	python-imaging-lib64.patch 
Log Message:
* Sun Apr  2 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-2
- Fix bug #185203 (Thanks to Rick L Vinyard Jr)


python-imaging-lib64.patch:

--- NEW FILE python-imaging-lib64.patch ---
--- setup-old.py	2005-03-23 18:16:40.000000000 +0000
+++ setup.py	2006-04-02 22:34:04.000000000 +0100
@@ -180,6 +180,7 @@
         add_directory(library_dirs, "/usr/local/lib")
         add_directory(include_dirs, "/usr/local/include")
 
+        add_directory(library_dirs, "/usr/lib64")
         add_directory(library_dirs, "/usr/lib")
         add_directory(include_dirs, "/usr/include")
 


Index: python-imaging.spec
===================================================================
RCS file: /cvs/extras/rpms/python-imaging/FC-4/python-imaging.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-imaging.spec	6 Mar 2006 01:49:15 -0000	1.7
+++ python-imaging.spec	2 Apr 2006 21:59:25 -0000	1.8
@@ -5,12 +5,13 @@
 Summary: Python's own image processing library
 Name: python-imaging
 Version: 1.1.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: Distributable
 Group: Development/Languages
 Source0: http://effbot.org/downloads/Imaging-%{version}.tar.gz
 Patch0: %{name}-no-xv.patch
+Patch1: %{name}-lib64.patch
 URL: http://www.pythonware.com/products/pil/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -48,6 +49,7 @@
 %prep
 %setup -q -n Imaging-%{version}
 %patch0 -p1
+%patch1 -p0
 
 # fix the interpreter path for Scripts/*.py
 cd Scripts
@@ -102,6 +104,9 @@
 
 
 %changelog
+* Sun Apr  2 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-2
+- Fix bug #185203 (Thanks to Rick L Vinyard Jr)
+
 * Sun Mar  5 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-1
 - Update to 1.1.5
 



From fedora-extras-commits at redhat.com  Sun Apr  2 22:08:14 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun,  2 Apr 2006 15:08:14 -0700
Subject: fedora-rpmdevtools spectemplate-lib.spec, NONE,
	1.1 fedora-newrpmspec, 1.6, 1.7 fedora-rpmdevtools.spec, 1.92, 1.93
Message-ID: <200604022208.k32M8EKM008647@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-rpmdevtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8626

Modified Files:
	fedora-newrpmspec fedora-rpmdevtools.spec 
Added Files:
	spectemplate-lib.spec 
Log Message:
* Mon Apr  3 2006 Ville Skytt?? <ville.skytta at iki.fi>
- Add spec template for library packages (#185606, Ignacio Vazquez-Abrams).



--- NEW FILE spectemplate-lib.spec ---
Name:           
Version:        
Release:        1%{?dist}
Summary:        

Group:          System Environment/Libraries
License:        
URL:            
Source0:        
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  
Requires:       

%description


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q


%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc
%{_includedir}/*
%{_libdir}/*.so


%changelog


Index: fedora-newrpmspec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/fedora-newrpmspec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fedora-newrpmspec	5 Feb 2006 14:05:34 -0000	1.6
+++ fedora-newrpmspec	2 Apr 2006 22:08:11 -0000	1.7
@@ -14,8 +14,10 @@
 Options:
   -o FILE  Output the specfile to FILE.  "-" means stdout.  The default is
            "<appname>.spec", or "$DEFSPEC" if appname is not given.
-  -t TYPE  Force use of the TYPE spec template.  The default is "$DEFTYPE",
-           see $SPECDIR/spectemplate-*.spec for available types.
+  -t TYPE  Force use of the TYPE spec template.  The default is guessed
+           from <appname>, falling back to "$DEFTYPE" if the guesswork
+           does not result in a more specific one or if <appname> is not
+           given.  See $SPECDIR/spectemplate-*.spec for available types.
   -h       Show this usage message
 EOF
     exit $ret
@@ -65,6 +67,9 @@
         ruby-*)
             spectype=ruby
             ;;
+        lib*|*-lib|*-libs)
+            spectype=lib
+            ;;
         *)
             spectype=$DEFTYPE
             ;;


Index: fedora-rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/fedora-rpmdevtools.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- fedora-rpmdevtools.spec	26 Feb 2006 15:53:55 -0000	1.92
+++ fedora-rpmdevtools.spec	2 Apr 2006 22:08:11 -0000	1.93
@@ -127,6 +127,9 @@
 
 
 %changelog
+* Mon Apr  3 2006 Ville Skytt?? <ville.skytta at iki.fi>
+- Add spec template for library packages (#185606, Ignacio Vazquez-Abrams).
+
 * Sun Feb 26 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.5-1
 - Improve diffarchive and extract error messages.
 



From fedora-extras-commits at redhat.com  Sun Apr  2 22:08:18 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sun,  2 Apr 2006 15:08:18 -0700
Subject: rpms/abe/devel abe-1.1-settings.patch,NONE,1.1 abe.spec,1.11,1.12
Message-ID: <200604022208.k32M8KUU008669@cvs-int.fedora.redhat.com>

Author: wart

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

Modified Files:
	abe.spec 
Added Files:
	abe-1.1-settings.patch 
Log Message:
Enable changing the video settings in-game.



abe-1.1-settings.patch:

--- NEW FILE abe-1.1-settings.patch ---
diff -Naur --exclude '*.swp' abe-1.1/src/Menu.c abe-1.1.new/src/Menu.c
--- abe-1.1/src/Menu.c	2005-03-05 08:20:04.000000000 -0800
+++ abe-1.1.new/src/Menu.c	2006-04-02 15:04:37.000000000 -0700
@@ -116,7 +116,7 @@
   if(n == SOUND_ENABLED || n == MUSIC_ENABLED)
     return sound_loaded;
   else
-    return 0;
+    return 1;
 }
 
 void


Index: abe.spec
===================================================================
RCS file: /cvs/extras/rpms/abe/devel/abe.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- abe.spec	4 Mar 2006 21:24:50 -0000	1.11
+++ abe.spec	2 Apr 2006 22:08:18 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           abe
 Version:        1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Scrolling, platform-jumping, ancient pyramid exploring game
 Group:          Amusements/Games
@@ -8,6 +8,7 @@
 URL:            http://abe.sourceforge.net/
 Source0:        http://dl.sourceforge.net/abe/abe-1.1.tar.gz
 Source1:        %{name}.png
+Patch0:		abe-1.1-settings.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL-devel >= 1.2.3, SDL_mixer-devel >= 1.2.3
@@ -19,6 +20,7 @@
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 %configure --with-data-dir=%{_datadir}/%{name}
@@ -63,6 +65,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Sun Apr 2 2006 Wart <wart at kobold.org> 1.1-2
+- Enable changing the video settings (BZ #187589)
+
 * Sat Mar 4 2006 Wart <wart at kobold.org> 1.1-1
 - Update to 1.1
 



From fedora-extras-commits at redhat.com  Sun Apr  2 22:19:53 2006
From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb))
Date: Sun,  2 Apr 2006 15:19:53 -0700
Subject: rpms/muine/FC-5 muine.spec,1.2,1.3
Message-ID: <200604022219.k32MJtX2008760@cvs-int.fedora.redhat.com>

Author: sindrepb

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

Modified Files:
	muine.spec 
Log Message:
Removed %{epoch} dependency in -devel pacakge


Index: muine.spec
===================================================================
RCS file: /cvs/extras/rpms/muine/FC-5/muine.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- muine.spec	23 Mar 2006 13:32:28 -0000	1.2
+++ muine.spec	2 Apr 2006 22:19:53 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           muine
 Version:        0.8.4
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Music Player for GNOME
 
 Group:          Applications/Multimedia
@@ -34,7 +34,7 @@
 %package devel
 Summary: Files required for Muine plug-in development
 Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}
+Requires: %{name} = %{version}
 
 %description devel
 Files needed for building plug-ins for Muine.
@@ -115,6 +115,9 @@
 %{_libdir}/muine/*.a
 
 %changelog
+* Sun Apr 02 2006 Sindre Pedersen Bj??rdal <foolish[AT]guezz.net> - 0.8.4-7
+- Remove %{epoch} in -devel Requires
+
 * Tue Mar 23 2006 Sindre Pedersen Bj??rdal <foolish[AT]guezz.net> - 0.8.4-6
 - Add missing mono-web dependency 
 



From fedora-extras-commits at redhat.com  Sun Apr  2 22:20:09 2006
From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb))
Date: Sun,  2 Apr 2006 15:20:09 -0700
Subject: rpms/muine/devel muine.spec,1.1,1.2
Message-ID: <200604022220.k32MKB1O008783@cvs-int.fedora.redhat.com>

Author: sindrepb

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

Modified Files:
	muine.spec 
Log Message:
Removed %{epoch} dependency in -devel pacakge


Index: muine.spec
===================================================================
RCS file: /cvs/extras/rpms/muine/devel/muine.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- muine.spec	15 Mar 2006 15:27:18 -0000	1.1
+++ muine.spec	2 Apr 2006 22:20:09 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           muine
 Version:        0.8.4
-Release:        5%{?dist}
+Release:        7%{?dist}
 Summary:        Music Player for GNOME
 
 Group:          Applications/Multimedia
@@ -17,7 +17,7 @@
 BuildRequires:	libid3tag-devel
 BuildRequires:	libvorbis-devel, flac-devel
 BuildRequires:	desktop-file-utils, gettext
-Requires:       mono-core, dbus-sharp >= 0.50, gtk-sharp2
+Requires:       mono-core, mono-web, dbus-sharp >= 0.50, gtk-sharp2
 
 Requires(pre): 	GConf2
 Requires(post): GConf2, desktop-file-utils
@@ -34,7 +34,7 @@
 %package devel
 Summary: Files required for Muine plug-in development
 Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}
+Requires: %{name} = %{version}
 
 %description devel
 Files needed for building plug-ins for Muine.
@@ -115,6 +115,12 @@
 %{_libdir}/muine/*.a
 
 %changelog
+* Sun Apr 02 2006 Sindre Pedersen Bj??rdal <foolish[AT]guezz.net> - 0.8.4-7
+- Remove %{epoch} in -devel Requires
+
+* Tue Mar 23 2006 Sindre Pedersen Bj??rdal <foolish[AT]guezz.net> - 0.8.4-6
+- Add missing mono-web dependency 
+
 * Tue Mar 14 2006 Sindre Pedersen Bj??rdal <foolish[AT]fedoraforum.org> - 0.8.4-5
 - Patch added to really fix the x86_64 issue
 



From fedora-extras-commits at redhat.com  Sun Apr  2 22:24:19 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sun,  2 Apr 2006 15:24:19 -0700
Subject: rpms/abe/FC-5 abe.spec,1.11,1.12
Message-ID: <200604022224.k32MOLKo008808@cvs-int.fedora.redhat.com>

Author: wart

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

Modified Files:
	abe.spec 
Log Message:
- Enable changing the video settings (BZ #187589)




Index: abe.spec
===================================================================
RCS file: /cvs/extras/rpms/abe/FC-5/abe.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- abe.spec	4 Mar 2006 21:24:50 -0000	1.11
+++ abe.spec	2 Apr 2006 22:24:19 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           abe
 Version:        1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Scrolling, platform-jumping, ancient pyramid exploring game
 Group:          Amusements/Games
@@ -8,6 +8,7 @@
 URL:            http://abe.sourceforge.net/
 Source0:        http://dl.sourceforge.net/abe/abe-1.1.tar.gz
 Source1:        %{name}.png
+Patch0:		abe-1.1-settings.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL-devel >= 1.2.3, SDL_mixer-devel >= 1.2.3
@@ -19,6 +20,7 @@
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 %configure --with-data-dir=%{_datadir}/%{name}
@@ -63,6 +65,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Sun Apr 2 2006 Wart <wart at kobold.org> 1.1-2
+- Enable changing the video settings (BZ #187589)
+
 * Sat Mar 4 2006 Wart <wart at kobold.org> 1.1-1
 - Update to 1.1
 



From fedora-extras-commits at redhat.com  Sun Apr  2 22:24:59 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sun,  2 Apr 2006 15:24:59 -0700
Subject: rpms/abe/FC-4 abe-1.1-settings.patch,NONE,1.1 abe.spec,1.9,1.10
Message-ID: <200604022225.k32MP1LW008858@cvs-int.fedora.redhat.com>

Author: wart

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

Modified Files:
	abe.spec 
Added Files:
	abe-1.1-settings.patch 
Log Message:
- Enable changing the video settings (BZ #187589)



abe-1.1-settings.patch:

--- NEW FILE abe-1.1-settings.patch ---
diff -Naur --exclude '*.swp' abe-1.1/src/Menu.c abe-1.1.new/src/Menu.c
--- abe-1.1/src/Menu.c	2005-03-05 08:20:04.000000000 -0800
+++ abe-1.1.new/src/Menu.c	2006-04-02 15:04:37.000000000 -0700
@@ -116,7 +116,7 @@
   if(n == SOUND_ENABLED || n == MUSIC_ENABLED)
     return sound_loaded;
   else
-    return 0;
+    return 1;
 }
 
 void


Index: abe.spec
===================================================================
RCS file: /cvs/extras/rpms/abe/FC-4/abe.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- abe.spec	4 Mar 2006 23:10:55 -0000	1.9
+++ abe.spec	2 Apr 2006 22:24:59 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           abe
 Version:        1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Scrolling, platform-jumping, ancient pyramid exploring game
 Group:          Amusements/Games
@@ -8,6 +8,7 @@
 URL:            http://abe.sourceforge.net/
 Source0:        http://dl.sourceforge.net/abe/abe-1.1.tar.gz
 Source1:        %{name}.png
+Patch0:		abe-1.1-settings.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL-devel >= 1.2.3, SDL_mixer-devel >= 1.2.3
@@ -19,6 +20,7 @@
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 %configure --with-data-dir=%{_datadir}/%{name}
@@ -63,6 +65,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Sun Apr 2 2006 Wart <wart at kobold.org> 1.1-2
+- Enable changing the video settings (BZ #187589)
+
 * Sat Mar 4 2006 Wart <wart at kobold.org> 1.1-1
 - Update to 1.1
 



From fedora-extras-commits at redhat.com  Sun Apr  2 22:25:00 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sun,  2 Apr 2006 15:25:00 -0700
Subject: rpms/abe/FC-5 abe-1.1-settings.patch,NONE,1.1
Message-ID: <200604022225.k32MP2rS008863@cvs-int.fedora.redhat.com>

Author: wart

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

Added Files:
	abe-1.1-settings.patch 
Log Message:
- Enable changing the video settings (BZ #187589)



abe-1.1-settings.patch:

--- NEW FILE abe-1.1-settings.patch ---
diff -Naur --exclude '*.swp' abe-1.1/src/Menu.c abe-1.1.new/src/Menu.c
--- abe-1.1/src/Menu.c	2005-03-05 08:20:04.000000000 -0800
+++ abe-1.1.new/src/Menu.c	2006-04-02 15:04:37.000000000 -0700
@@ -116,7 +116,7 @@
   if(n == SOUND_ENABLED || n == MUSIC_ENABLED)
     return sound_loaded;
   else
-    return 0;
+    return 1;
 }
 
 void



From fedora-extras-commits at redhat.com  Sun Apr  2 23:37:04 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun,  2 Apr 2006 16:37:04 -0700
Subject: rpms/anjuta import.log,1.7,1.8
Message-ID: <200604022337.k32Nb6fw011074@cvs-int.fedora.redhat.com>

Author: pfj

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

Modified Files:
	import.log 
Log Message:
auto-import anjuta-1.2.4-5 on branch FC-5 from anjuta-1.2.4-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/anjuta/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	24 Mar 2006 23:50:40 -0000	1.7
+++ import.log	2 Apr 2006 23:37:03 -0000	1.8
@@ -4,3 +4,4 @@
 anjuta-1_2_4-2:HEAD:anjuta-1.2.4-2.src.rpm:1140477846
 anjuta-1_2_4-3:HEAD:anjuta-1.2.4-3.src.rpm:1140643945
 anjuta-1_2_4-5:HEAD:anjuta-1.2.4-5.src.rpm:1143244226
+anjuta-1_2_4-5:FC-5:anjuta-1.2.4-5.src.rpm:1144021011



From fedora-extras-commits at redhat.com  Sun Apr  2 23:37:04 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun,  2 Apr 2006 16:37:04 -0700
Subject: rpms/anjuta/FC-5 anjuta-encodings.patch, 1.1, 1.2 anjuta.spec, 1.15,
	1.16
Message-ID: <200604022337.k32Nb6YT011082@cvs-int.fedora.redhat.com>

Author: pfj

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

Modified Files:
	anjuta-encodings.patch anjuta.spec 
Log Message:
auto-import anjuta-1.2.4-5 on branch FC-5 from anjuta-1.2.4-5.src.rpm

anjuta-encodings.patch:

Index: anjuta-encodings.patch
===================================================================
RCS file: /cvs/extras/rpms/anjuta/FC-5/anjuta-encodings.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- anjuta-encodings.patch	20 Feb 2006 23:24:25 -0000	1.1
+++ anjuta-encodings.patch	2 Apr 2006 23:37:04 -0000	1.2
@@ -1,4 +1,4 @@
---- src/anjuta-encodings.c.orig	2005-12-15 18:50:55.000000000 +0100
+--- src/anjuta-encodings.c	2005-12-15 18:50:55.000000000 +0100
 +++ src/anjuta-encodings.c	2005-12-15 18:51:38.000000000 +0100
 @@ -707,15 +707,15 @@
  	gtk_tree_view_set_search_column (GTK_TREE_VIEW (stock_treeview),
@@ -37,4 +37,16 @@
  	
  	anjuta_preferences_register_property_custom (pref, supported_treeview,
  												SUPPORTED_ENCODINGS,
- 												"ISO-8859-15",
+
+--- src/Makefile.in	2005-08-12 16:37:02.000000000 +0200
++++ src/Makefile.in	2006-03-24 19:16:54.000000000 +0100
+@@ -723,7 +723,7 @@
+ 	done
+ anjuta$(EXEEXT): $(anjuta_OBJECTS) $(anjuta_DEPENDENCIES) 
+ 	@rm -f anjuta$(EXEEXT)
+-	$(CXXLINK) $(anjuta_LDFLAGS) $(anjuta_OBJECTS) $(anjuta_LDADD) $(LIBS)
++	$(CXXLINK) -Wl,--export-dynamic $(anjuta_LDFLAGS) $(anjuta_OBJECTS) $(anjuta_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+									"ISO-8859-15",


Index: anjuta.spec
===================================================================
RCS file: /cvs/extras/rpms/anjuta/FC-5/anjuta.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- anjuta.spec	22 Feb 2006 21:32:45 -0000	1.15
+++ anjuta.spec	2 Apr 2006 23:37:04 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           anjuta
 Version:        1.2.4
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        GNOME IDE for C and C++
 
 Group:          Development/Tools
@@ -20,6 +20,8 @@
 BuildRequires:  libtool
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
+BuildRequires:	libgnome-devel
+BuildRequires:	gtk2-devel
 Epoch: 1
 Requires:       pkgconfig libtool gettext-devel
 Requires(post):   scrollkeeper
@@ -46,12 +48,12 @@
 
 %prep
 %setup -q
-%patch -p0 -b patch0
+%patch -p0 -b .encodings
 
 %build
 # configure option --enable-final does not work corretly on x86_64; Use
 # -DNDEBUG in CFLAGS
-export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
+export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
 %configure
 %define libnoprefix %(echo %_libdir | sed 's,%_prefix/,,')
 sed -i -e 's!\(.*PACKAGE_PLUGIN_DIR@,.*\)lib\(/anjuta.*\)!\1%{libnoprefix}\2!g' config.status ; ./config.status
@@ -78,6 +80,10 @@
     s!(^GLOBAL_TAGS_FILE=).*!$1%{_datadir}/%{name}/system.tags!;
     s!tm_global_tags!%{name}_tm_global_tags!g;
 ' ${RPM_BUILD_ROOT}%{_bindir}/anjuta_create_global_tags.sh
+pushd ${RPM_BUILD_ROOT}%{_docdir}
+ln -s anjuta-1.2.4 anjuta
+popd
+
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -95,6 +101,7 @@
 %{_bindir}/%{name}*
 %{_libdir}/%{name}
 %{_datadir}/%{name}
+%{_datadir}/doc/anjuta
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/pixmaps/%{name}
 %{_datadir}/mime-info/anjuta.mime
@@ -107,6 +114,15 @@
 %{_datadir}/omf/%{name}
 
 %changelog
+* Fri Mar 24 2006 Michael Schwendt <bugs.michael at gmx.net> - 1.2.4-5
+- Added export dynamic
+- trivial spec changes
+
+* Fri Mar 24 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 1.2.4-4
+- Added dependancies for gtk2-devel and libgnome-devel
+- Re-instated debug
+- Add symlink for documentation
+
 * Wed Feb 22 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 1.2.4-3
 - Added back in the epoch - oopsie!
 



From fedora-extras-commits at redhat.com  Sun Apr  2 23:38:48 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun,  2 Apr 2006 16:38:48 -0700
Subject: rpms/anjuta/FC-4 anjuta-encodings.patch, NONE, 1.1 .cvsignore, 1.4, 
	1.5 anjuta.spec, 1.10, 1.11 sources, 1.4, 1.5
Message-ID: <200604022338.k32NcoHC011191@cvs-int.fedora.redhat.com>

Author: pfj

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

Modified Files:
	.cvsignore anjuta.spec sources 
Added Files:
	anjuta-encodings.patch 
Log Message:
auto-import anjuta-1.2.4-5 on branch FC-4 from anjuta-1.2.4-5.src.rpm

anjuta-encodings.patch:

--- NEW FILE anjuta-encodings.patch ---
--- src/anjuta-encodings.c	2005-12-15 18:50:55.000000000 +0100
+++ src/anjuta-encodings.c	2005-12-15 18:51:38.000000000 +0100
@@ -707,15 +707,15 @@
 	gtk_tree_view_set_search_column (GTK_TREE_VIEW (stock_treeview),
 									 COLUMN_ENCODING_NAME);
 	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (stock_treeview));
 	g_return_if_fail (selection != NULL);
 	gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE);
-	g_signal_connect (G_OBJECT (selection), "changed",
-					  G_CALLBACK (on_stock_selection_changed), NULL);
 
 	model = create_encodings_treeview_model ();
 	gtk_tree_view_set_model (GTK_TREE_VIEW (stock_treeview), model);
+	g_signal_connect (G_OBJECT (selection), "changed",
+					  G_CALLBACK (on_stock_selection_changed), NULL);
 	g_object_unref (model);
 
 	/* Add the encoding column for supported treeview*/
 	cell = gtk_cell_renderer_text_new ();
 	column = gtk_tree_view_column_new_with_attributes (_("Supported Encodings"),
@@ -726,17 +726,17 @@
 	gtk_tree_view_set_search_column (GTK_TREE_VIEW (supported_treeview),
 									 COLUMN_ENCODING_NAME);
 	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (supported_treeview));
 	g_return_if_fail (selection != NULL);
 	gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);
-	g_signal_connect (G_OBJECT (selection), "changed",
-					  G_CALLBACK (on_supported_selection_changed), NULL);
 
 	/* create list store */
 	model = GTK_TREE_MODEL (gtk_list_store_new (SUPPORTED_ENCODING_NUM_COLS,
 												G_TYPE_STRING, G_TYPE_POINTER));
 	gtk_tree_view_set_model (GTK_TREE_VIEW (supported_treeview), model);
+	g_signal_connect (G_OBJECT (selection), "changed",
+					  G_CALLBACK (on_supported_selection_changed), NULL);
 	g_object_unref (model);
 	
 	anjuta_preferences_register_property_custom (pref, supported_treeview,
 												SUPPORTED_ENCODINGS,

--- src/Makefile.in	2005-08-12 16:37:02.000000000 +0200
+++ src/Makefile.in	2006-03-24 19:16:54.000000000 +0100
@@ -723,7 +723,7 @@
 	done
 anjuta$(EXEEXT): $(anjuta_OBJECTS) $(anjuta_DEPENDENCIES) 
 	@rm -f anjuta$(EXEEXT)
-	$(CXXLINK) $(anjuta_LDFLAGS) $(anjuta_OBJECTS) $(anjuta_LDADD) $(LIBS)
+	$(CXXLINK) -Wl,--export-dynamic $(anjuta_LDFLAGS) $(anjuta_OBJECTS) $(anjuta_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
									"ISO-8859-15",


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/anjuta/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Jul 2005 14:07:32 -0000	1.4
+++ .cvsignore	2 Apr 2006 23:38:48 -0000	1.5
@@ -1 +1 @@
-anjuta-1.2.3.tar.gz
+anjuta-1.2.4.tar.gz


Index: anjuta.spec
===================================================================
RCS file: /cvs/extras/rpms/anjuta/FC-4/anjuta.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- anjuta.spec	7 Jul 2005 14:07:32 -0000	1.10
+++ anjuta.spec	2 Apr 2006 23:38:48 -0000	1.11
@@ -1,7 +1,6 @@
 Name:           anjuta
-Version:        1.2.3
-Release:        1%{?dist}
-Epoch:          1
+Version:        1.2.4
+Release:        5%{?dist}
 Summary:        GNOME IDE for C and C++
 
 Group:          Development/Tools
@@ -9,18 +8,21 @@
 URL:            http://anjuta.org/
 Source0:        http://download.sourceforge.net/anjuta/anjuta-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+Patch0: anjuta-encodings.patch
 BuildRequires:  libgnomeui-devel >= 2.0.2
 BuildRequires:  libbonoboui-devel >= 2.0.1
 BuildRequires:  libgnomeprintui22-devel
 BuildRequires:  ncurses-devel >= 5.0
 BuildRequires:  pcre-devel >= 3.9
+BuildRequires:  popt
 BuildRequires:  vte-devel
 BuildRequires:  scrollkeeper
 BuildRequires:  libtool
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
-
+BuildRequires:	libgnome-devel
+BuildRequires:	gtk2-devel
+Epoch: 1
 Requires:       pkgconfig libtool gettext-devel
 Requires(post):   scrollkeeper
 Requires(postun): scrollkeeper
@@ -44,24 +46,19 @@
 %description docs
 Anjuta documentation.
 
-
-
 %prep
 %setup -q
-
-
+%patch -p0 -b .encodings
 
 %build
 # configure option --enable-final does not work corretly on x86_64; Use
 # -DNDEBUG in CFLAGS
-export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
+export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
 %configure
 %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
 
-
-
 %install
 rm -rf ${RPM_BUILD_ROOT}
 %makeinstall
@@ -83,24 +80,20 @@
     s!(^GLOBAL_TAGS_FILE=).*!$1%{_datadir}/%{name}/system.tags!;
     s!tm_global_tags!%{name}_tm_global_tags!g;
 ' ${RPM_BUILD_ROOT}%{_bindir}/anjuta_create_global_tags.sh
-
+pushd ${RPM_BUILD_ROOT}%{_docdir}
+ln -s anjuta-1.2.4 anjuta
+popd
 
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
-
-
 %post docs
 scrollkeeper-update -q
 
-
-
 %postun docs
 scrollkeeper-update -q
 
-
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
@@ -108,6 +101,7 @@
 %{_bindir}/%{name}*
 %{_libdir}/%{name}
 %{_datadir}/%{name}
+%{_datadir}/doc/anjuta
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/pixmaps/%{name}
 %{_datadir}/mime-info/anjuta.mime
@@ -119,10 +113,30 @@
 %{_datadir}/gnome/help/%{name}
 %{_datadir}/omf/%{name}
 
+%changelog
+* Fri Mar 24 2006 Michael Schwendt <bugs.michael at gmx.net> - 1.2.4-5
+- Added export dynamic
+- trivial spec changes
+
+* Fri Mar 24 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 1.2.4-4
+- Added dependancies for gtk2-devel and libgnome-devel
+- Re-instated debug
+- Add symlink for documentation
+
+* Wed Feb 22 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 1.2.4-3
+- Added back in the epoch - oopsie!
+
+* Mon Feb 20 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 1.2.4-2
+- Added patch from Anjuta-bugzilla
+
+* Sat Feb 17 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 1.2.4-1
+- bumped to 1.2.4
+- change of maintainer
 
+* Thu Aug 18 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1:1.2.3-3
+- rebuilt
 
-%changelog
-* Thu Jul  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1:1.2.3-1
+* Thu Jul  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1:1.2.3-2
 - Update to 1.2.3.
 - Add gettext-devel dependency (Paul Frields).
 - Add libtool (+automake, +autoconf) dependency.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/anjuta/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Jul 2005 14:07:33 -0000	1.4
+++ sources	2 Apr 2006 23:38:48 -0000	1.5
@@ -1 +1 @@
-a2fc3873519f566607cf268276db3b90  anjuta-1.2.3.tar.gz
+5a709fbaedc816a88fd8b9ad5276a47b  anjuta-1.2.4.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr  2 23:38:47 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun,  2 Apr 2006 16:38:47 -0700
Subject: rpms/anjuta import.log,1.8,1.9
Message-ID: <200604022338.k32NcnS2011183@cvs-int.fedora.redhat.com>

Author: pfj

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

Modified Files:
	import.log 
Log Message:
auto-import anjuta-1.2.4-5 on branch FC-4 from anjuta-1.2.4-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/anjuta/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	2 Apr 2006 23:37:03 -0000	1.8
+++ import.log	2 Apr 2006 23:38:47 -0000	1.9
@@ -5,3 +5,4 @@
 anjuta-1_2_4-3:HEAD:anjuta-1.2.4-3.src.rpm:1140643945
 anjuta-1_2_4-5:HEAD:anjuta-1.2.4-5.src.rpm:1143244226
 anjuta-1_2_4-5:FC-5:anjuta-1.2.4-5.src.rpm:1144021011
+anjuta-1_2_4-5:FC-4:anjuta-1.2.4-5.src.rpm:1144021115



From fedora-extras-commits at redhat.com  Sun Apr  2 23:45:55 2006
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Sun,  2 Apr 2006 16:45:55 -0700
Subject: owners owners.list,1.794,1.795
Message-ID: <200604022345.k32NjwMd011257@cvs-int.fedora.redhat.com>

Author: sopwith

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

Modified Files:
	owners.list 
Log Message:
fix bouncing e-mail address


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.794
retrieving revision 1.795
diff -u -r1.794 -r1.795
--- owners.list	2 Apr 2006 20:44:31 -0000	1.794
+++ owners.list	2 Apr 2006 23:45:55 -0000	1.795
@@ -364,7 +364,7 @@
 Fedora Extras|gnome-themes-extras|Collection of metathemes for the GNOME desktop environment|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-translate|GNOME interface to libtranslate -- Natural language translator|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-vfsmm26|C++ wrapper for gnome-vfs|denis at poolshark.org|extras-qa at fedoraproject.org|
-Fedora Extras|gnome-yum|GNOME Interface for YUM|tbandi at users.sourceforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|gnome-yum|GNOME Interface for YUM|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnonlin|GStreamer extension library for non-linear editing|redhat at flyn.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnotime|Tracks and reports time spent|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnuchess|The GNU chess program|kaboom at oobleck.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Apr  3 00:07:11 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun,  2 Apr 2006 17:07:11 -0700
Subject: owners owners.list,1.795,1.796
Message-ID: <200604030007.k3307D83013498@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	owners.list 
Log Message:
fetch correct email addr from bug 176542


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.795
retrieving revision 1.796
diff -u -r1.795 -r1.796
--- owners.list	2 Apr 2006 23:45:55 -0000	1.795
+++ owners.list	3 Apr 2006 00:07:11 -0000	1.796
@@ -364,7 +364,7 @@
 Fedora Extras|gnome-themes-extras|Collection of metathemes for the GNOME desktop environment|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-translate|GNOME interface to libtranslate -- Natural language translator|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-vfsmm26|C++ wrapper for gnome-vfs|denis at poolshark.org|extras-qa at fedoraproject.org|
-Fedora Extras|gnome-yum|GNOME Interface for YUM|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|gnome-yum|GNOME Interface for YUM|toth_bandi at users.sourceforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnonlin|GStreamer extension library for non-linear editing|redhat at flyn.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnotime|Tracks and reports time spent|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnuchess|The GNU chess program|kaboom at oobleck.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Apr  3 00:33:11 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Sun,  2 Apr 2006 17:33:11 -0700
Subject: rpms/pam_mount import.log,1.14,1.15
Message-ID: <200604030033.k330XDX0013609@cvs-int.fedora.redhat.com>

Author: mikep

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

Modified Files:
	import.log 
Log Message:
auto-import pam_mount-0.13.0-1 on branch devel from pam_mount-0.13.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pam_mount/import.log,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- import.log	2 Jan 2006 04:53:23 -0000	1.14
+++ import.log	3 Apr 2006 00:33:11 -0000	1.15
@@ -11,3 +11,4 @@
 pam_mount-0_9_25-4:HEAD:pam_mount-0.9.25-4.src.rpm:1118332757
 pam_mount-0_9_25-5:HEAD:pam_mount-0.9.25-5.src.rpm:1132804079
 pam_mount-0_11_0-1:HEAD:pam_mount-0.11.0-1.src.rpm:1136177590
+pam_mount-0_13_0-1:HEAD:pam_mount-0.13.0-1.src.rpm:1144024378



From fedora-extras-commits at redhat.com  Mon Apr  3 00:33:11 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Sun,  2 Apr 2006 17:33:11 -0700
Subject: rpms/pam_mount/devel pam_mount-0.13.0-loop.patch, NONE,
	1.1 pam_mount-0.13.0.tbz2, NONE, 1.1 pam_mount.spec, 1.10,
	1.11 pam_mount-0.11.0.tbz2, 1.1, NONE
Message-ID: <200604030033.k330XEtV013615@cvs-int.fedora.redhat.com>

Author: mikep

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

Modified Files:
	pam_mount.spec 
Added Files:
	pam_mount-0.13.0-loop.patch pam_mount-0.13.0.tbz2 
Removed Files:
	pam_mount-0.11.0.tbz2 
Log Message:
auto-import pam_mount-0.13.0-1 on branch devel from pam_mount-0.13.0-1.src.rpm

pam_mount-0.13.0-loop.patch:

--- NEW FILE pam_mount-0.13.0-loop.patch ---
diff -u --recursive --new-file pam_mount-0.13.0-vanilla/include/linux/loop.h pam_mount-0.13.0/include/linux/loop.h
--- pam_mount-0.13.0-vanilla/include/linux/loop.h	1969-12-31 18:00:00.000000000 -0600
+++ pam_mount-0.13.0/include/linux/loop.h	2006-04-02 19:16:24.000000000 -0500
@@ -0,0 +1,163 @@
+#ifndef _LINUX_LOOP_H
+#define _LINUX_LOOP_H
+
+/*
+ * include/linux/loop.h
+ *
+ * Written by Theodore Ts'o, 3/29/93.
+ *
+ * Copyright 1993 by Theodore Ts'o.  Redistribution of this file is
+ * permitted under the GNU General Public License.
+ */
+
+#define LO_NAME_SIZE	64
+#define LO_KEY_SIZE	32
+
+#ifdef __KERNEL__
+#include <linux/bio.h>
+#include <linux/blkdev.h>
+#include <linux/spinlock.h>
+
+/* Possible states of device */
+enum {
+	Lo_unbound,
+	Lo_bound,
+	Lo_rundown,
+};
+
+struct loop_func_table;
+
+struct loop_device {
+	int		lo_number;
+	int		lo_refcnt;
+	loff_t		lo_offset;
+	loff_t		lo_sizelimit;
+	int		lo_flags;
+	int		(*transfer)(struct loop_device *, int cmd,
+				    struct page *raw_page, unsigned raw_off,
+				    struct page *loop_page, unsigned loop_off,
+				    int size, sector_t real_block);
+	char		lo_file_name[LO_NAME_SIZE];
+	char		lo_crypt_name[LO_NAME_SIZE];
+	char		lo_encrypt_key[LO_KEY_SIZE];
+	int		lo_encrypt_key_size;
+	struct loop_func_table *lo_encryption;
+	__u32           lo_init[2];
+	uid_t		lo_key_owner;	/* Who set the key */
+	int		(*ioctl)(struct loop_device *, int cmd, 
+				 unsigned long arg); 
+
+	struct file *	lo_backing_file;
+	struct block_device *lo_device;
+	unsigned	lo_blocksize;
+	void		*key_data; 
+
+	gfp_t		old_gfp_mask;
+
+	spinlock_t		lo_lock;
+	struct bio 		*lo_bio;
+	struct bio		*lo_biotail;
+	int			lo_state;
+	struct completion	lo_done;
+	struct completion	lo_bh_done;
+	struct semaphore	lo_ctl_mutex;
+	int			lo_pending;
+
+	request_queue_t		*lo_queue;
+};
+
+#endif /* __KERNEL__ */
+
+/*
+ * Loop flags
+ */
+enum {
+	LO_FLAGS_READ_ONLY	= 1,
+	LO_FLAGS_USE_AOPS	= 2,
+};
+
+#include <asm/posix_types.h>	/* for __kernel_old_dev_t */
+#include <asm/types.h>		/* for __u64 */
+
+typedef unsigned short __kernel_old_dev_t;
+
+/* Backwards compatibility version */
+struct loop_info {
+	int		   lo_number;		/* ioctl r/o */
+	__kernel_old_dev_t lo_device; 		/* ioctl r/o */
+	unsigned long	   lo_inode; 		/* ioctl r/o */
+	__kernel_old_dev_t lo_rdevice; 		/* ioctl r/o */
+	int		   lo_offset;
+	int		   lo_encrypt_type;
+	int		   lo_encrypt_key_size; 	/* ioctl w/o */
+	int		   lo_flags;			/* ioctl r/o */
+	char		   lo_name[LO_NAME_SIZE];
+	unsigned char	   lo_encrypt_key[LO_KEY_SIZE]; /* ioctl w/o */
+	unsigned long	   lo_init[2];
+	char		   reserved[4];
+};
+
+struct loop_info64 {
+	__u64		   lo_device;			/* ioctl r/o */
+	__u64		   lo_inode;			/* ioctl r/o */
+	__u64		   lo_rdevice;			/* ioctl r/o */
+	__u64		   lo_offset;
+	__u64		   lo_sizelimit;/* bytes, 0 == max available */
+	__u32		   lo_number;			/* ioctl r/o */
+	__u32		   lo_encrypt_type;
+	__u32		   lo_encrypt_key_size;		/* ioctl w/o */
+	__u32		   lo_flags;			/* ioctl r/o */
+	__u8		   lo_file_name[LO_NAME_SIZE];
+	__u8		   lo_crypt_name[LO_NAME_SIZE];
+	__u8		   lo_encrypt_key[LO_KEY_SIZE]; /* ioctl w/o */
+	__u64		   lo_init[2];
+};
+
+/*
+ * Loop filter types
+ */
+
+#define LO_CRYPT_NONE		0
+#define LO_CRYPT_XOR		1
+#define LO_CRYPT_DES		2
+#define LO_CRYPT_FISH2		3    /* Twofish encryption */
+#define LO_CRYPT_BLOW		4
+#define LO_CRYPT_CAST128	5
+#define LO_CRYPT_IDEA		6
+#define LO_CRYPT_DUMMY		9
+#define LO_CRYPT_SKIPJACK	10
+#define LO_CRYPT_CRYPTOAPI	18
+#define MAX_LO_CRYPT		20
+
+#ifdef __KERNEL__
+/* Support for loadable transfer modules */
+struct loop_func_table {
+	int number;	/* filter type */ 
+	int (*transfer)(struct loop_device *lo, int cmd,
+			struct page *raw_page, unsigned raw_off,
+			struct page *loop_page, unsigned loop_off,
+			int size, sector_t real_block);
+	int (*init)(struct loop_device *, const struct loop_info64 *); 
+	/* release is called from loop_unregister_transfer or clr_fd */
+	int (*release)(struct loop_device *); 
+	int (*ioctl)(struct loop_device *, int cmd, unsigned long arg);
+	struct module *owner;
+}; 
+
+int loop_register_transfer(struct loop_func_table *funcs);
+int loop_unregister_transfer(int number); 
+
+#endif
+/*
+ * IOCTL commands --- we will commandeer 0x4C ('L')
+ */
+
+#define LOOP_SET_FD		0x4C00
+#define LOOP_CLR_FD		0x4C01
+#define LOOP_SET_STATUS		0x4C02
+#define LOOP_GET_STATUS		0x4C03
+#define LOOP_SET_STATUS64	0x4C04
+#define LOOP_GET_STATUS64	0x4C05
+#define LOOP_CHANGE_FD		0x4C06
+
+#endif


--- NEW FILE pam_mount-0.13.0.tbz2 ---
BZh91AY&SYQ???_??????????????????
?[????V??x?MO??;g??????????mI??v?w`?????????}Zg6??2?s?}?<????l??F?wW_g?/l???????Q?E?P
???}8???oWr??[F???E?1??v????????_y????]?4=
?ami?lY??xc?7g(???sA????
u?????????f??}?t?
A?????????????????gCC??v\?j?>????uy[i??r???????s???uZ\qYa???V?z?????????
?????H?W??_>?????Z?v????y}k|?u?}??yg????}??K?{???=???5
g)>?:?v???????????|????Z:???6?(+ZP?????????????????3????
?
?1?)?RR1A????@???b?*lJ?@?D
???
?z/??>ytp?uMOr|Rb4LVT????:?????sHI??A8,??????Z0???k l?A?7?
?WB?#Tp
y?-C??? ??M?k???0#1?Yc?????(??g?????(??c?a?^?L???V????%?IA??5??w??????Q????U??K
bH?l{?4OP?[??1?aij??B-?7??~l?d???f
%S*
???'?p?:??????]V???x?;A>??0?
[?3VRNr???y?K?'5!a??j?7@????
+????(9???\?5(;L%8Ns??GcC(C4??k????n?A????=????%V2W?zU??(?(h};x??????:?????aFd;????m?I??y???d'nNN?
Ul0?0c?	???4?A? ???C?(aw?H????y???*?Wpl}?Ds#?????,??>O??A???H???Ag?A
? q????
??dK>????;ps-{?1??z?????U??/??????YA??D??\????I?y?c\?;#S?m(?<??1???) ?v??'??s?w"b??????
3??_&?`&??v-????a??:??#???g?eI?x?????E;?????G?V??96??!?Cy?b??????s?!?(?<c`<?:??|:??s?k12??
Eq??????O??%k??@?R?2?fHoC??%\?3^??*???????g??Fa?3??^?:?b$
?????U?B????@?????
??C???%#CwQ-U3O??T??????????gPi???"?u^??j??X?????k{???9?=??~???w?n$?{7M?=g??U;??[2k`?j???9??
??t??H#????&8fic?SQ&4
???g??b{/???4r
a??NFg?7B??f?!?~?????:?YY-??r0TG\&?s??`??Yzb?K!?)B????A????yo?
?]Q?;
Z?UIUU\?g
eC
R??????c?p???<?HIr@?:
????JG????K#????	??????'??.?s}????_???????gow??c????'?&?_????=]??E?s?M???.?Sxz???O7????Z??dq???O??\x7p???????|?~{???????{[?.?3m????	?MOk???_??<?'?r
????Z??2?&>g?|?>j?$??4?%???`??<?
?zD?2]??p????F?F???:????w??B???6?? ??(?D?Y6??????1<Q???0?
?s[??
:?S??????H^??{?U??FSAI????	\?????'S?}?|s?????s?D>???G??B???.????!?@?W?<F?S
?RN5S?]?<?A,u????*mYm?h????nj?vF???s?64?4{;o??????d#???????E!_?qM?|n3??????%#?(`?I?O?g'??7$s2? k?SQ~Y?2???B?L??S>R??J???PM	?2?h?JW???????X1??=.p?F??p?Rmp!<???????? ??R2?I?<????W???
?[?|d?????i>z????37?;? ????w?U?ciQ????^?)	?T????h?Mr
??N??o?x???O?N?P???6???5?9???B???????X??5??]??z o1????$p?*#??&?????#?1????????)C?LM	?%??;&l?????rK?+(??y??"?A???+(?\?)??0?B??
?ad-?>?LN	?I??$(T?????`?^E"????$`?h2|>I?O??am??????
??;?|V?:Y>I?VIJ??h?jH?K?c?:W?'Fmr???m$?p?^I?
)?0???"??t???a?!??%?????vU?T$[??3?N??p66a?i\g?;-?-?*rc??B3.L?
?uJ?NZ??
?4Xq??? 29W'd?P?r$??$DN1J?q??
.\B???{????e????9????V<????Wg0?#?c?&?l???C@?W?<L??$?B???l?{9?Bt??@??e?_??B???el??!P?`?
Yff????.?$???Pq?N?z?i????cs?Df???R???????M|??I??-?g???6?fu%F?????"??e??"H?E??)!v?d?T-ae?{!?T??xZ?L???
?%!A?+?9?LP_%?d)??baS???????!??92????t?i%?K?F=1'?@??Os??Z?6??????`D?????I?'??xp?????)Y?At??M????y??{XA?xGt??b???G????x?m???-?[?
*3
rsZ??
5???
%d?XP???k???fF8?????8?8??@S%&??\k4z????V1C,B!A??\)????H????????Tu`=n?<?????1???I?*]???jY??!d?Oqff??aH??u???L@ P???M????'?;?????nY?,????mC??C???????f????95?-???=?CH?J?8??=??\f?????r??????@h
S??E0X?v:????NM?Z???fG??z7g?0T??WlW??*??"?i?v0???^???+]l?.??79??KP?QL?T??P??fK.???2.b??U)???^?d??mi?????w?^???|?#5T??d??7?bS?~B
??K	??&?L?p???ZF??????S\??7o??S%6?c?C?9#V?W?@?w?M???p????????<fU?v?s?xK??i}???C}	???c?O/?_???'^?m??1??i????I??r?.D??*?)???(?????>H-J???
?J02??RH?O?g9fr>???????u ?2??dL?N?
0F??DI>????D???0??????Ne?~??y???mIOE
?
???C?n
???7????fa?<?2L?z??%h??d%X?b?Q?;???$CL????Q?y??C???,?0?=??pz?$0Q????W???
??Q?]??
???v?5s???T?0(??8?f5?kW??[d7??Z???'?S?@??'?=?;?0?Q????SB?0Q??I??B??1??c??)??"?y???0????Z???jX?QCz?UL?I???Uv^E??7???'?a>??????0??2,??a?>??$?(??2???????#??v5????QP$XT?$????XP???*_Y? ????z?N?C"z????P??????h????b,PgC.Kys,.?e?@???H???-2+??(?W??Y#??2?x???P^F??Y?.??^???P+???o^u[???(Z?)x,?i?Y?NW'?3?w?!??H????7K????j?
?6}V????t?i??v??:???o???j\O??mf]0?f??6},6C?j??/??@?Ek???K0?}???(?[~??)?+?y??_?pQ??p8????g5?I?QM?NJ?N0??8w??L
a???Xo??!aB????_	e??H????0????Q????C??$?<b??g??
 ??????<;+??s?]??M9??
?T{A??A?0[?@?? ???? ???%q?)??@?^^9?`??)AAH?^1/r@?^??#?c????H?i?Ar!?XF?fR??????tf(80j?`??9??G`a????T??
7??)?5??,*8M?#9???z?CU???4'\:?????D?4??fn
s{h????????
TE]B~??
????@?m?
??7?"u????F???+??aO???[?610B??'O??`?)?v<)?TB??Y?#????~??;????z1_^?7?????M?
$??Ga??1???aR?s?F?@0'?C??B?*?Z?
?
E07?#*>&&T?)N????;4?=o?N_q??A?????x?'?0/7W?+???G?46)?-?X??Y?2J?7????e????L|?8?`??a?wc??"h???0??U??l??v~W&?$???aPi;qf"H?}1???'pyP]=C??HGd\??\????i???Q??????{ZB1G??v4???u`????}????????c??????
??K?W9HZP????,L??Ci?????????@?L/?(?86l?8?e??3?D=? ????L?+?b,????~?%|???x???????x?1????c????L????????}8\@??}??.s??	{??g]I?v8???G?E????Y?aO???/??%:???t'?.??`???:4 at EH?/?<?D????;??<Sd????>CVuIL?6"??????FTw?j??,????}#5y~X??f?0?`?#0?='????????K????\??O<?%??uU]?Q?????3U???m\?(?5pP??????????8?O?Zi??????\hd ????AS???A#$R????l??d?E??&~?????3M?2#7??{????O??????M?????????C?? ??
!???5A?DP?0???9?iJ?Gx????b?J?tTC|?H??? ?)?K`????[????a??Wu*???????2zJ??o??????????? ??E?g8v]????f??rn?<??p%??????o*?O??????}???R???????)???R33?x}:^??p_?z?X?r??|??2d??`?]??
T??????L?B????$7??|??h0a'-??=?bm???k???K?P5?????????A?v#?<F??L'R??^?????.?j????+??-l??v}??Q-?[Q"
??i??7X???????????????~??\??5x??:gWm????9?M??F?AG?rI?,???o??,?H43|?D
?Z?????W?U??z{??}??????u????\j???gi?o4?lLD3,????)??!??N+j???K???U????????1>ZU?\???V?f??K(??R????????????s?;?????x??7??a??[n?N?e?[?|???e?<?5I????w????2?c?@J$?wW&=]??<??_-?gPH??m???d??8??@??90?y??6?g?w?c??7"???Lw|???y??!?/????i?y??YP?(Q?nCfCb??F?x?Z.%????m???U?bTS5<{G?qzh??s%L>Q?????b???????TKx?[d???an?W?>2?s3?4"?f???????Zg=?	????o?]?q???????Y%g???s?#`?!f?k?????W???^?5?V?@??1??`o#?@?>s?????7??o_7@?O)}oP??7)X?7{Qc+???????u???j{Ujc???<??C?<?????
??OA??h??R4F?l??s?`is?s3
[$? ?$9?-a????}n???Om??	?&	??
`guWq?PF%zg2$q???'?S??jIB?
???@?4F??e",w?&??E???)??%?x???????q???f?9>bx3?tLLL???????????????d?10?E!R??????????s??{=##??~????2?:H?C
??????,?WgF?2???h]\???????<???4??u??*???61??X???a9
?#????;???y?4??V????}hL??<w???j???Gt???ESl?wpw??s?x???~???`>,?&???H?=???;@?2???Q????????d?o??oa?:?fW????>?G??d?Te"??U??(0?aA?b\n6?*U??Nw???@???3$o??D?O??s???????W???
?z???n?"??????E??A?v?G	?M???l?u??e ??U??1?????8?x*I?S???RZ??Z???\???qe??T.Q?
?99?\Q*??f????E<???eG?L?
?WyB????aTS?.?P????9m?[???<.??&??,?;7T:?r??Q?1??9??54?,?K at -
?
?????d????f?{;?#zjt~?S+??????'?:>T??<n???9V?Y$]???~f???N???y&,???wE?T??
+8?4o?r?\2j4p?P??\??Pgz???6??x?|c?r??t?:MFR??rF9+,?fN+????k?A<?v????`ME???4r????=v?+ZP???*8????????????J?????l?6
?????L?:??N???V???x???"g?T?j???1?\?A?c????>?_??9??"?????j???????;?%???{x@?A1?jC?.0??[!R?h	)??F??i$?		i????5?K
P??@D?P?	?AJSP????)???b
bF%J%)%h? 2???A???	??)?
?*J?d????$?dA
8c?????DJ????????&F?
?0?4??;g?%(b?`??|`1(=??'?a"H?????1,(
???2>?bF??E?T=2?T(
D?T???
?4?? ??GD*)?
??Jh?>r?5
L???$???+?@$????:@??9IG!F?ON???s???	?8CA????#??Y0N8!?c?6??Pz!?M;8h2C?5Bz?C???????3?.?a	?<{2?c?^??????9x?o>zC??"??EN????
?a?8???2?=To??ON??0C???????>?;?????p?"q?
)+%Y?*
G??|??# ??@?$? ??????w???Q??%8G?
%?
BaQ?E?
B???h???"$ZJ!?0???HL?N<?0??`??????????	?bP@?(??????ab??#?
u0?Hd?,,1X?d?	?"@??2:?*D?:4
D??
?Q(hC??
?"
 ?0?!mYd($o?F??\S?
?????? @P??a	A?Q?U??b`?xI?@?+Hp???,k d??@?????:~?d9?A?@!DF??D?
????0dd ?????1???C
L`jx{|?%f??-??b?;6L(??t??? ???$??!??P?8????v$	???
B?r	r8??p???"?,???<V??`(,?l??(8?HB$(?bt(-???)?????
46?`&????tC?ERq& ???q?VkT?????n?h?H?:??zHI?{T?|}???	n???cF^????V?I?jp?.'DB?
e??%???R?Yj*?:`E???8`,??a?
???X?&At?~??
??????j/???}	????,?e7?=?t6?????x?L????a??]??~?7?!??Wy??+*?H& ??@??31Q1??????:;oZ*<????a<??;?eI?$`$?7?? 	?JN"J??z'??????Xu>?T??@a?$????R?8?????i?y?w$s?DYE??,??H-y???b?:%s?? ?L?a?=!v????Xa^`B?!?(" w&??&?????!?????<??3?(??G??K??????O3?}?i?[???9??@@0C?=?:\\????X$??,?
??$??80??n?Y???a??a????;Y?}]?we?Q????????z????"
$???)?r?+d?
x????F
M???????i??N"@???
?HD0???????J???B???A9?-??c?!18?Gq????~wV
1?????~?!?o#??HG????(*???`??Hq}???q!?i?<??~'!??O???Q???0b00?
?`??ga???????z`0@???????
?\p????ID?x9????`n$6??|;?c@??@???G`Km?TT?vo?:?5??	?J?t{	?q????=?;???,p??K???=??:?T??{???(|?X???]?????????/??s?ic??e??F#
??^z??^m?????U?P.????JAI7?Q?6????:c?r??{?!h???!X?zL?D???? |????? ?_???9?f<?`?N??/p?~f?NSb9(?????????"?a???f)???0??C?V
??JZ4??hL?????#????^??????D?(qG??R?_5(c???Nw???5-??,??????.?^u??y??_??+H?-Y??/?l?#\??C
'y?n*>Bs??}???Q)d?07?y?O?????z/?c
???D??J??Q&???d4?Xt???J??u?H?0?dg!?X6G?
n2??B?`???{
???+??0p?B
T??A	?????(U?>h"M?????D`l}??z{c???????O3?#??T??`??(?$ l??6k?aF`?~+?<?O??-???r??C??h?qmp
 u???hs:?s;J?8A?!?
?v!6?w?B  0;B#?``M\L ??????c?,"V& ?\0??-????F?>???????/q?E:?9????F?{???}???6???A??8??1??????P-??HX?S?Q?B??L
j?????l:0??)?P?hLXP`?@?p5{?`5?
??????2? ?&???????q??????S6??o???'T?r	d???>	?s!Ay?i?.?/?$L??dr7?1? ???#??LFr??????v?]A?]=l?W???????+???????
M??_??Y?:4?1?I}?dM??? !U????{N?b????T?p???	?^|??=?????? #?0u? ????6?N&I??
?e???J6?E(.@G??HS??*?Fak??tM??+??:A??????8?wI?Y?	???PL??b?g??_y??z?????D?p$?L??\?W???,?1
??C [???e?[v??
?>?}??k?M?h~M?J?p??4??PF
B?:??C??XRrZGZ??J??	?h ?)]g????H(?JU???????T$?~????D???e?dAL????????c9:?N??fy&9?b`i??e?????v4??? ?????Yrr??G?9_J?p?i?fj?D??Ne?????o?????K?e$?>U?"???????;?
???X??(v?@
??????mg??l??b?|w:??@????Jy?kZ_?Gb?g?y_>?F)EA?bUKbk?i?;K?????@6A???k??A ??/hC?????7h?4!
=?{?M???p????ri?q??yT_???C???
R?n
?`????:l??????F???Oj?r&a??XN??????Fo	?N!?'???????y?=?I???"??V??N??~'?H???Q?=bB?:K??????m?
??s???(?pM??^??~r~??sY??|?? ?bs??????????`?#?	8??????E~?????Ai1A9q?yI9H????? p?0?C?0`?? 35(??2?z}J?a?S?D??h?KTb7?????P+t%?^???a?AE?
c?????? `??H?<?SE?????<
?P0x??O?!/???a?Hy at w??D ???%z?? ???c????bP?[?? ,QZ?H??c?Ty?<??X??j??
m????P??Z??]<???????ir?q?e3.???#????jK?=c????H?b??d?? R??M?x>??Ns5?????i??&F
,0?~??"	mO?????=i
??I???????#?????q???&?????K???????#?J???????????Nsp.p?:D?J0?R,<?&<??q?????F???bi???7???P?-?d?????O??? h??p?\?t?? ?/2?%bd ,b???[???

?"
!)???H?31??i?8R??Os	L?& ,?.mZf?????}ZV???#y???FhS?ui?????n.?2E?????i?fCW]
N???zd??APYy:???????l???2?
O??#?S?p???<??*Nc?9?>??y?>???U???r???6oy??? B?h??fB??7??`?FJ??`j4Nsff"pT?/??Sh,>?>#?_x@?.7??6	??M??t":?L?<???H??>?0?Q0??vV?C??????A?M???l?L??Q&???[P??|???g|??????w?uN?j'?2E|C"???@??	%??>
?!?Z?V?HI?????kZ??(
?3!1?G'cWF???~n?`???????>?V??5c5hml+c	fU??Y???*T!V?J?s%2????y?[??????:+}]????#?:???Ig|??[!?????;????4V?>????n??x?uE???u???R?z?l?t?]t??
??8???!hh5_?Z??3IYoTQl?7??><o??
?dZ"??????`?I???)bM?B??|
??????P$yg at C?M	M5????6:s8?????~s?,W????Xe???Bc??
Sq4
????XxsM at w?cQt	?
?????????|???
?4-???=??0?	?h?4??cM??1	?(I%CX?[??q???x?@`fn8??W?LFG<?Y?O??????~G?&b??"s?
jjg",Ho:?F?R0x???????y???JC??
?;3'?9?	c?9?9L???????k?&?T?L?d??E0?s/??6?%1?????#D?2^?ew?z?e?bg~??`2????U`?e??"??gD?_?????BQ?U??)H??????Q1ze=p???ru<?????o????:bd????g????YB2?ZbBH??2??:&Jr'???????1?[??,?]?4????k??1??n???$?ytq??	???f??\'?_?yUUUUUWL-??h??in
?,?~8:??j?q?NQ??????L?]2R??6??????;????_?????g;????7q??u*}3?{ng*n???T??6$??I$i??????Ug?????^8|L?!c?????/#???8Ni?1?W??L?N?O??-??o??m;1)?|}???	
?`
9?"?S+O?r at D?X
Z??n"q?!??{???M???pu???@:L?<?z??<(?9v???J2am?lp?/??3????|??U?4?H
?Yi9? ??35?? %H?+???mK???| ?C??3z?? ??????YC?-???`?PpO?'z9	?B?$???:?)!$?{?(\?/Z?B???We?4?}?8P8???6B??L#?cp0??@????????]c??l>-)???,
?g+???k??g??k,??
=S,?:?(??Ns??????
=#N??d?B?v??2?pzD??6??_?Ku3????Y?r????{>!t1
??k8?0&k'[Y
?U?KS\??????w????b??2???r???
|`dI???@??I?2?b?cowQ????B??2?)?2?D#Lvr#??w?KL0???$??????q????W??;
?????4????W&??<K??????5??q?p}???
? ?f?R???t??M.^???Z?:8?????????y?bs?????????2?X=!?ov???I-??k???pM??h,?k???w1???D?i??2??#U??5?????D??0?2??c?8????"?l??9?p???wi?O?9Ol???W?
o???P8???H?Ks???JGA?t?ww?&2m)*?p?????~????uk?c?a?0?Xt??O8?
j+?3???V?4P>
??Wk?&Q????g`?????R????~????LVYD.n!f??H?P?0??Zr?5;7??{H ?E}?x?S
*?1???c??????*?2??????X???Z????)E?1?=#???):?J?@?
??:S
?zh??l?`???,\???Q??q5W*??G????D????@vE(<B????1?&??w?b=??=Zn?
6`??r7????s?? ?p?~??
m??%?	?B??0?uv?d???g?Li?Hp???U?rf?R?[@?h?H9#tX??w?B???-$:????R?`?+X:
%?-t?"?lBDP?
?&???9??H???w??
???|M?a;?;W
!??R??	????eM{??&>-????E?r?a?I??
????4??&K??i????ES?0T??;3??do	?>P&K??????*????z?/D^?`??P?A?R?B??K
?? @??0R???dAg?b?{J-???^#B:??2????^?????rQ8.?F??H?T#?3?SE??????40Ad??F?|=??????? ??z??}-?????#*???+*AZ?D?F?C?8?3b??8i??Z??
'?%j?#C??sk???/?c)?2??Y~Bg/???T_? ??^?Q??6?E"?3:???r??????.m4?%?8h???ds??r???/+i@?fX|)?Si??Y
3?&r??????Z?2?G???Y??6fI\?1??2???2Syn:?	?f??w???$?5??Sx2pu2?????-Y????"
?|?`|?j??????/\??2+?r??0'"2(3(?E?;??@??`?3??,???+?????A?????S ?!???Md!>????t??>l??f?)'?29???
E?????4X.?,*????????D?M?0?f??y?
?G??z?k_M?2C????%??v9?QR???(o??O?@x?H?C??Q?a??/?@ta
?N^?
3NW	??Z?@
: ????X??=u?M????5?Q????f???W?e?Q%9?W??J?
?a=%juZ?.??G{?i?r
8?	?4&?AB??pV?ET?``<?>??%???~?}????{??9????D?4????P&a????????uN8{??a?!??C???
????)?T?I>J????????#??w-?K?&?2"?@??3??Fy??:[?????ST?'`?X??a????6?'F2??A????E?TZl?#???(>?)??_?Z/??q??\??t#v???
?b??aW'?*?i?H???V??[??Q????D*g\?zNz*?????f?Y?kj?}|?K!?c????h???uKGr+xt?]?^?ryipp$iK,6??`Q?|J?O??m???????
??c??S?0?_??^=?[I?0?U???????????p???7?Y?L/?NZ'j?I?g	 ?o?D??=??*Eq?L????R?"R/
R?`<c?0??4????!(??s??H??)???3ikJ?g?????Yg???f??rD??=&.V?`??@w?????!??
?~????uk???Z????}=??k??nH??n?w??"?????{WE?nK??h?$??l?!?M[\?5???M??+?	5?7??8?n?~??&P???Z?????fl-?'}-F8?&?`?M?SH*X??y {??%Eu??T?Z???|c?jV???y8
??????e?????o?xA??:?????????{h??c?#G???t?A?bC?Q??&;??\??X????>0?f?i?<
??HR/???A?
??x4?J?%&??????u?D?yj?*?J	????h?;?????*?#c?mC")??5??L?\?.?U?5?ld???V????Y?Q??*??0&?S??????&????B???#?U)?Mo
????Pe?|%??}1HQ?%?ow?<c?Z??P?l????Cg??U[[_??Vg?vG?t??
???6?G???(_4???s??a??+9u_?j???&?$???c?T&?C?j????D??`+%(1h????
O?i??=L???Q??]???????|?????? ??`h?????)?3??: gU,IM!??+?????~PL???B}]?l?J]p
????6|5cF?g????2-?????^z????H?c?'a?0???a!:@?lq?????6)???1?t)D+?dz?
??????t????
i
?>G2)BWl?\
??Z?
:D?????C,?@g?qj7?0itrh)3?z??Z???2??&T??`.h??J?.?N??)
w_??%?S/?/?1 at 1???I????A??:????<?~/?d6??r???d??????8r?Ys?_???????6z{????9?Pcl?"?????3rV80?S$"????0s;???4k
???{D?-??L?(H?Oy?=?gK????aA!*?|???$1!???4Q?e?$?vT6Nj?&a??
~B!??eU?J?????_O??.W-y?:\Y?sM_?Y??;?b??SB?{?S5??W59?????'??]?z{???`???g?8|???O?Pg?u???B':T?
?K\?? ???Q???s;?=??D??R?&	???x????a?$c???????5x:?[*??I???v?A?F?BY??\kb???q6
?????_?????Xfr??????yIU
D2:q,??????????I??3????O?? aP?E??L!Q???c0^?9?*?rK????E?U)?.KRmGn?
?mP0????Hw?????hd???1h???
?A??V?mS?#m??c
?n>?\}???_?	;L&?N ?+=?????????y?~?'?#4z?#?~Tw4?
??ihw$?~E/
???
9?f|?? {[????n??-?3{??V????2??=M?@?m?T<?&???A8??2]ll?@?Y??=??H???X
????Op?[??2??9r3-|????????5??$????m????2Z
??+?^???F??&_?z???=^????J??ma??6Lg????V1?.u??`???????????C	}??? ????s?hr???x???s??Y?k(???
m??vN?]??????U??m8??Is?AQ?]N?????"dU'hD\D4
Y?01?WzB??????jx????N??2??B?<?s^???6??*?FG%??
?l?/?iL?y????b9??c?s?"G
a??o???????Ya2%???A.???h??p?xul??_?6=0Z`??65?????:?????,2?????w?Q at 9M?{gL????4??N:v??[3muk???#C??u?s????6?[?P4`?MX?a?!?{?.??i????j?rB@?P???NE?K?B???z
??????w??:h?????????ee???a]s*Vi???xn????d4??g???|)?	??o??I??
A?
????
k???y_I??z???v????????1??b$???C???~CJ???Q)?lK
?p?B?J??F?>z?8???R?
?I2??
x???x{0??a?8d??",?dJ?)?2??}??17nC??DK,a??9J????a??xP???)U!;x??a???????>????;b$???b???~??]M???h?????Zw@:?3??B#??o?*SNuc?a??p??]???Hb??gr?d??5&,??`?Th??r?6???o?x?69???+????RA???v>O??
?%?G?^`??/u?xL6wN??zs at Da??'?????#?J??y
???? ????;
P??`g?7???kE???Z?????J?Hl??0?u%?????!B????????w?:&??o>_??
?$h?!{?t^%}?'b????{T+@Q??????{c??M(???Xa)H?P???l?@??)??f??f???V3d?'????S33W??Y?4CN?S?l?gL?Q}?Qk??>?B%??}r+a??sj?=?M?
6??d?dz??[??~3-????????xyt?NDG?$1??l??K?????6Z?\?6???w??m7??g??:t?%i;????L82??	??$??:h:??d???&
>i?@?q??_????L???h?L?S??????/|r??????2??d?K8i?!\??k??PA?a?;N??Zp$;"p?????????B??6??=x?m???N^????	4???Y?8??r?]?Y???~???^??e2=?????&u???wD???8??R???u?!0l	?.?a??
????
?	??6?I?
??t?
!d<@??????g?\=?k?%U$??
"???1????> L}Q?bFdN??K!?`?~???R??t??OY???i?C&4]7?,?????W?????%e{/f?M|3??{)????c??a?z??YrqJ??X?;3F&!9???7,?\??^???.0"?WI?T??N?{??7???"??`zvrc?????n?b???k?
?w?/ty???g-?N???????Y9???q?;
R?0????[4??\9z9B!????A??]	??A?q?\??m??????J?? RUP??c ???!1????aw??1?))??+???
PL-?F?T?????Sle"Z^?C???E???????M??8?? ??Z?????f??*Zf????mu~?0?=??????`TC??z??3????M?Q(????????SB???,?:?>]p??B????????????{^???!??	?;??7'?QA g|?2?'L???zj?a??8u??>VS?ti?u?wG}?5??\????RD?Mc ?p? ??t??
??~?l?s$???x?O?R?@?=?,4?|????#????!'.??????[?s???{? ???H?zG??????v???9?????e	h??.*???S]??()?i??*c,?JD?c
???*S??Reh???N??9edx????m?L
6?u0?x\??yr>??????V?o#vRQ???HM?mN?W*6??~&B??	???	#	??]?S?"A???? ?R\?K???y?????3]?o??;]z???g!?????=?=$<??:@Kp?2??e
???????i$?ky??l7?I??Nr&,}???????
???s?3??#????)??,{C^?	?=??q??????F?\?C???????fm???q<Q????l??J?
?0+V??t?"???????!??1??	?@?P???qU?????O1?GIFtl???3??G?>??+M?H?[?~?Q	?r????"c*?HZ???N???=M??,??y/???am8;j???S
?;4???????W?m[??!c?
???;Z
?f? ??c3?X?????+??L?.G??L?????Y???????h??%
????C??9???&
?uz??M???l?
?=?????!????vt??q?M4Q????
?	T?@?Wo.6k?Omu???u$z???6?b0hv?????u?S???#jTq4T???m?R??????.?????e?[???Ck??Q?aA??YR?/?4??5???????????7?'u??v
???P?5??????\?\
C?9`?#?
???q???ej$????c???q?Z6?L???????2?>(K??"?@(z!
@h!QA?/???i?C
???vPq?&v?O3cCyge07?H???i?????,?w
'Z???&<111?I
?^?	?Iq*???1?2#Ic3Ob? ??9????b????i=xSbG??????z/??|?}+?
??w?~??O????c??????????p??u?1?t????$?`cl???h????.?J???x??S???l6??????&?o
????|'-A?qe&??w??0?x?k???????,???????@?b??D????@????p????????A????????W?????+???I[+??*f???
0???aB?)~O????????~??????^?Y?1??`????Gi<???Vg?v$?
?
?92v?Dt?I????T?7?q?|7???
h?VN???_?V9?,?)?h?K??????{???k??;N$????8J?V?1?rb??UM	??Er-?g?1?7?Y??:??Ilrxl?a?/8?2??k?>?J???S	z??i?f?)?.:?R"???EG????M??s???????h???????s? n??h??4
3?h?'P?1???FO?69????+q>???????du?q|/?x?d????(?~U?Y?`??z?k:?u??;???xp?naS~??.p?en#?&?#!4??{?q?a?!1]X??,L??x-@??<
#?<N?\Wym}E4:?zRh<G?8?W????+$	x}????'c}????%f4>????
??P????ku\S|?2???o?I?.???i)T)?;?W?`???X,??J`??\????>????]:/
???gHI?O]???A?w?????}>2?\?lu{^??/????Bx??W
?x??6???&???e????e?0?{??>??*??F?6ca.??N0{?Y?'??0???|??~r??????/zr?fUf?!?T1&F? Ma???)c1?W?-??^?b?3Y!?+Xp?/???<??8????1????A?_??&s??p_??????7??????4xGi??X-l??7h???+????
P??o>?9???????-?Y??ZTR????\|.F?,:R
???6??a at i??7?t{?(:?????K?;????s?*&,?O?\{Hpa??HCX?qXJ?????S	??+W
Q??J??r?1?,?cr??!
se??5?U?)t?dg????i?????_Nz?	?M???8d??r?i ??l=???X,s?G??k??W?r:(?li8??_?o????1?????LQ&/t??c??c??M????
&???3??
[K?Ik4??????|????????b?s?{#?p~??\|*E?????}?^`N???????c?8)?EM??6?C??*'"?lW?2??????O???.?.#\9?d??m?J?/??C???"aW???xZ?aa?{N????q??????????????P^????i?3?~?;hY??te?[???b???????I?q"
z"?
???@p?>01????P?6??ud	h?h8T0?<????;?C(??d??j?? ?=M??????????'G?1D?{4A /???eC&
!:?*e{?j???z?1!?#???x0\?*???????{y?mpq
??:?
_AP???wy?????r????)?r]**?LF?v'?3?\???'u??4?I?S?>?p?`?t??	?E?5?XX?K?b??T?????&?*???S?2>????a3#
???A?J?A??z????P??d
?w?|88Nw3?y9?Ju??>D8?#4p,-?????YXI,??e?Z??K?4?`?e+????Aq???#????4?/fX??)????_?,8?=u??|??v?]?el?Z?B????dT??9?????????9?O'???A
J?|O
a????2 ???????7%(
????E?gir??1??y
?W?r??=Fh???3??i*X??8dM??8??2??92?|??40?$??F????9l
D??$???y??*2?V?$sA?
y?Tk????q?!????/? !P
$D??? m?_?????????{??=c?]3S?]???Yc??,?.?{*??A???I?????b~??OH???/c??AvD???q??y??????????G??2?I=?3!?K????&R3?&?Q?????R?1)???????`hT???Y????
t|??rJc?-*?
?????16L??H?QFl?.2?????????^??M??c?k??#?'?HM?
%R?=K!?q???yS??F?"?V?x~?????zg?Z??Na%WP?a??,?E?*???lJ?91!???E5???*?!????2??	???q]?f????:zgy??????_A?Z??4??-(R&????1A??f?g??8U?+?r,??e?bK???:????)?NYI8?????5?n(????b`?????5u?????.?_??????6???????????#?9_???OF??T??*?:?9v??ZT???????W?6?)??[??<?`??f?L~?????q{?i?\?ri?Xt ~?8??e??.ub?????^N
?F??|??j?d??ny??IUYv?''Wl???h(?36?|?>0A?YB??9?x?+p?[?Z\;??+r?2;	?
????d??8+?q???O?????9??#??>p??&??|??
??9D?*N????e??Si ??|3??G&3??B2??^5??&???^????Ap????L??*
B?u?h?]??g????)n?????dSg??V?
?)??L}L?>?O"h????scK,?aWwETO????!????????d%????C??NE??
<????
?;4????kx?>??H???F???2????A??u??7????`????Q??	????????????4N5??????z?}?
?H?|)????.7Y*?$?Z?c??(????c??oUT???^??~?X???	=??d
???O?e?<??M0F?f?1????<l?D???T??w??????LM??0
XU??????W
4?b?W??06??Ch??J?]?????w???'Xe?aB?n?|?T&L3??=?

??
K(?20j??(d?hM??&??P???D?????&r	"?x?`????G?????y?q= ?5?'?4?+G????XT?qr??v?I??Gi?q???k??6P???[???4?c?-?t????
"8Yx?"??????U[{	y4r
???A?MIJh??5?p?*?????|1?H????L*??)8??????M?Gl?#??`?X??+A?u???e#
BiIB???Y?>o??x??bNhpg
?S??
?HI?????h???J????y?????Cu?????b?H00w#?#?8^mb???b???<d(8h|?c????j???? ?9?`??????9>?>?~]??'????o??j?o?"??.n???(@?D?1e??d??????????Xv????M??@?]?n??d=>???-?? ??
?J*?????$IJZ``L~?!x???Sz?Up?????U?.?R%??M4??R??W??>?*?????{	?SM)j*?\???'<???!???>??f
{?q???T??K8@]?	'?o????`?m????{B%?T ?
?*????1x}?Y????C??+g?_?5???K
W???JGx)?8??O??????????4??????w???/A?????2LA?'??????%v?w?"?L0??T????A?h???R?b?)?G??8F??eR<&!???Wp?LO??0D
# ?D?<<<0R??????c??4,J?&??qUUU???????????*?W????????0"pd?1??
??1?xg?0???"??????v&B?Q)?4QF)@P8?@??w%?c?,dsS?XN??L?eQ?(P??p'??
?q?F??AK?hQ???@??q?8?JI?x`??kD??6?@p?,F??ShX
?phYy?
?a?&??1??)?hX?????1?C?H???1C?;?N!?4??
?Q?8???7??????
???|?L?6,?#J_S?"}4g??1!???????
?H??????#??"e$a?iH[n?p?*?Ji???????"#
h???6????NZ#??FL????r4A??o'?????`@9
PQ)$?+{0%???k???C?q????2D?`>e?e?	W^??[(X?(2jP(?aX VHVIU??????<Jag?I?`~????pu???OB?_@?#??R???!@??J2J?%RE??]?:9s(??]coG?N?@????"jw??06$6?.??7?"?????<??0???t???nge?
G]8?I:$?!???6C?~]?{?????????_?|C????????bFkrN??"?(2b?O??E??KMa????.?	????x???"?Y8????}2EI,??????"7?&m??}?!?O&Y	0%gf?4($T?w???8~?]`????pTT? W????kn?NT?????*
Y4?????????'??lwM?0??G?j?ID???HX*
!?YZD$1?
?]???-??R1	TeG???
A??D?C?S??/?<?)c
????W??_?(C!??,?????w?z
b???????=??$[*??mp??$?K*;1Z`?y?;?alX??hbE?R??x?	?aI??b0??333?5???????`$7???i?&M???3?0??
?Za???????c?6AK,.?S??? ??m?B?D"?L???Z??? ?!?G"?v^??7????U@?LL~
?? ?HX@???	?????!???C?F??G]?(k3:???6q!I`??=?v?BLD[?xA???8??e?U?? 4?Zg???SX?o?????'zv
?0)??? !???Q
?S???0?`?I?>????Q???????Fq?g at y???8??!Q9[F?]??)??(?;?????w2.?aj`?4w
??????!Ui?(Q??a1?
?m?(
`???D2A,?$:?
0??I??L???2a?<??]??I&$?$????S??a;i{v????2???r?mU? b??<C??{G
?? S??Y???4?8???-??8???km?????1a??f??<???H?)"F=
???];C???S?|?am????m???CH??(???%$?6dv{(:HdS??n???n???O'A0?!???
?SQWwCB;?C?In u[
???????
??(??????hqCN?C?) P??'?Y?#??????f@?i:VITh?v????0 ????
?z?k?!?ti??a?6%D2?A
? ?&?4?F???B]~?
J???HI?%v?%`???@?A
??<?0???$?#????R??ib?,?{ r\H??)????d3rhV	?,?@h}lL??@H?X"U?x	????Ha?
zOh@?E ?f?}????t+?o???L??
?&NhY?#??M?`??3U	????4G?:O?L??~??????d???T?J?d??Qg??????n???W?	0????Vc
??z"???w?????E???h?0?'??
??0????8??@5?R;U	???
k?!?
???L???
??w????w ?Y?ab??	?>?"a???????e
J?????h???<?8n??T?H
?
?*I!T?t???!?5y????9???
??C??!wh?"?E??y?h1??h?$?B?W????0eg9???F?`???c1??????????S3=?fdx?'X??NgH?8:b??w??X.?DI?1x?i?v?`0??e!?`??.6|!W!???jwiJ??m$?????????U?p[?????:?H$?Q???g??v3Y??d?K?D???1
?/I?????????????XoFE?X*???A??x???Y??<^g?????|????q??)(1\??j2??E??E???(/y??????t_?L???(A?1?0?b|V?pz??h??##I?8??????? fg???@??5??????K;5?A???8?????9??al?????Y1?Ah0'
4E? ?XF;?"F??$z??j?&^H`?g2??&X??N??Z?d??<Y*^????a?o???1????B.?#
?'?p??(.*??;?????????l(???
??N??mbW?2?~?*ws
??9W?A:2?W??????u?3yT?K???@?????v???I?Bq2
??.???????;??7?-i?j???0?m??1L?L?xg@?1!?c(M?????GNNq???? ?	??92?.X^?!?
???????l?d??{x??\	??Lz???`GA?P????+5?4?????????43(?M?????p????????	??(??????.9?|9??F'?x??0??&'???ln??4?dHN???A??xw??p?h??fSAw?K?|??v?????a??c3??>??)???n0?D???`f
0?????"`??????????

?&?????!J|?& b",?1`0??????	??O??p?"?8*D?
wU?Y??x[GDj??i7??'>?2? ,??en.?SS???ckE??V.E??????s?t???`??????4?{??|?wok?77Dm?1???
?????n/?C0EzX???N??4??o?Z?? E????b??a??l?#
1????U??H????H?????k???'???|?mi??C??TY

?e??!<?h%R?k????wO????8?p5'?????@(???
?????#?+??8-@?????q?????	?q????M7?5?a(vv??!???_sZ0s?????o[??T0x?=?T??????^?;???????#E;????8??????O???????4?'??<?B2?|E\?Q?,f8???????y?????A??qq0?
??31?qn+?U???/??VMA???????{L?!???v??6??Q??????x?-?K???,s????c???p???2?????h.
?x?OI?$y??'&?^???~=?K?????U??	?)???9?w?Q$??oG?????1??I?????iX\??T?i???x:???6?????{K?-?W???????q?"??`c<?F?%?a??o???>???Z8?f?????`??9K}d?e?l.?g???X???G???W???/?wVV?&W?x??ts=???????yc??RQ??????
??A??qU??^?(??2?zW?iB?O???d?)6???f????!&:0t?????`???>R?? ?r?R*]?J?h???^??????t??b?X8?q??????????B??0W???%?]?t???<?%d?S?P?-R?????n)UC??>1!-??`1)M$IE4?bf&#??2B<9????,o#?-A?T??????????"?????	???v?f??QS?????ST??
??U?!A??:?x?UQT?&?%?E)?b???_@$F?
"@??=fK-?o?k??????hzf?????v?U
dO???"?xp??????
??=???????Y'?
?\xf?!$?1???????{}?^??gl3}?g?????S???v????M*?:?=g?CN?L:?SS}??????T?\??C??y \??]?)??mG?p_<6??;h??y??g?7?-? ?4CG?K????j??? ??L?i??6?B1?X??'?4?0??EL!H????B?H??M????Cf?r???N,3 T?t??Y@?V????m???m/R?b??)?9?8Fc????????
?I?;;_??	a???Z?~??1?>:?O@?	?
@???X?
?,?????&?"?{??0Sh$?pp? '
?at????>???fRrCJNI2Xsv?f(?????s?y?lC?"8?3?QA?RL???f?????r???R2???Ew??6???4???<EF?88v!?{???i
??A#!E????!???K3$????'/x??l*`?0RAr????2-?uZ?N?B?"?Y
????T?I3
??????6o?~j???x|#??.??q&-n???h??????z???L?
??v?%?k0"???.???7K?F???jC.????{a??5????}5??????>}??:?mr??\?s;q??h?@?2???[nb??????K??4?i??NH?0??s.?X??tTZm???)w
????`(? PA`E?'S??$?@?w4+?????????????*,??d?mN8??????zo]?8?^??????^?^?f????&?*??	0]??7?????Ga??q
??????A?Y?Yk???C?=?TM?Q?????3Rv??pw
??G?????+?o7	r??????;"?h?0???$?g?????s???C?\?@a??|)9?i?RZx?????5Nv?%R?]g?E??,?`)6????q?+o?%
?u???????v?jK?\??_???8??????????v9???8h^??9??P???>]???'[?#WZ????w@&????b?*????3???????????????m????: ??GE}v[????W+??^9y???v?MriC)\WUxE???C|WsB?ff?;?2???A3F?2?Y>CR?+*?V?:!?<?O??4????<?dU[???z/,?J???F?*?2k?[??JW?"?r?eiR?>??4OW??J???6S??7+K??{???D??r??2??#B?I???9?Q8??U?i"????*?&2^+??c#f?&??3g?MV?????@?Q????u??~??
?????/aE?????Q?rPJ???\????7????v?-?|????|h???0%???
??C??|5???fS???
????1???????g??h?? ???S['c??AN?????%t[??2????9>.?%??BuQ?n@?a?R???m??1H+K?|_%?p?=5????????_?h4??????Tn?T???9??M??@m?????y????Xvo??A<.?-2f7??!p??4?D$U????cQI???????e??#qA???H?f????Q?-U?2?LI??iI?1([???? UR?4????v1?????ZU(?(yy??N???H?E0?????Zc??M?n??????????<)n?9?{????;???/RA???_?J?A]B.9?????QB??t??t??????M?{ @??S^?Sk"??=0DAi?z
$A?????????d??????'??G??%&?w5?&???N??
u?
O???*??|?e??(C=???l?}?F!M4?????UU'??'2??_????#???????????9?m??E??]f?B??1???o??
?D4^
]BSGS?jJ>?0
?-?:T?????
u-x?2`?lH??$hP??Wd0??0P?8?k
O?
?7Vi?~!v TdT??? ????z?gW?)??_p???h
q?D}?????????[??;?s`???
???l<c

??C`???`?0`7
??dA????M????????*???A???9/{????????
?h%?oD??ci?`e?Pfkk?6?[(???K4???,?
{F??+??[?Sh?K?? ??2??c?{??z?8?:?8?h(?x?3?fs]??_???ts??-??]7??

0b?????{?M?=I?(wOC?[U?k??T?:???7U?_?&???&\$!??FL????zb?Dt???v????^???q???@f???h?????p$;???2?,?????????>b???ct?~7??I?]#?#T#Tk=Y?l???{???zn??v&?3?9?????Au3L??H???? ?_?D
??~=?????3-6?????L????
a????$????%H?k?????Dv??SOO@?
??H?;{
????T??3`??????D?N??xA???????'fi?????FN??k?b'5
IS3{?????-???|?WX???A?,?qX???]s????u????g??(??a??CmG??2i???f%S?????J@?????????1???? U"?[;L}{??~??"qd?,?-V??Up??5^?t??b?????><0P????*?p??????k?C???????:???u??Q^?2h}?????'????E?iGLC???~?p?
(S?????"ji?t?z?>N>9ca??k???3X(?>??<?~^??'~?=|1?6W??0???I??q???8?7???64a?U9}4
Nx
?*??(?q???#??2};wwa?+????z?>?M??6k??y?2L?K?RTa????xn:????????c??R}??q???Q}Y???a??????????x|}?k???????f<????8Q??6?b?????U?
??b?S????J?O?WW??????+|???SG?sl?j???1**9H????A??kuH?u??y???	d?pb??$??9????l???Q5u?
??????7?\u?twEw/?????c?u?:??1?#ZJ??????O???J?L??5?A
???GW?&k?[g?Y"
1F???[H#?nn#???^1?yGE???M??s??$??/??r89?r?)D??Q?\??/?V?ms???S??A_?ej=z4Wk????
[?qY]?;?z?$@y??F?????? ?ZW?`E???????s?#????[??)??B?W???m????'???!??U??_??L???O?e??l?MF?z?????n!o??L?u?P6.?ek?e:??R?=F????<?0??r??8s{}y?M??hp??bs??Z.H????H?????
?????'?A??????x6??k7)?
?tm?(x????y$??lt?????_%???h?????p???n0?z??????A???????8i??#???|6?tz?p??@????	2

A??	??)??xM?????E????tpG??`???&-?4z?8%??X#??x??
?4?2??
?T?fwP?
?W|z??fv?0?Jc?s????<e?k'??U?k???m?T?n?4?k???r?G?c??E?/.??YU?hP]??h?????TN?x???????A+?OC?Z^????jt???VX?[?2????m?uCk{E???Z?6?KT???????feg???:???|??&??]?t?)J??-F}&?Y-??}?????O??
d?|?~Ia=9scQ]>?l?T??7f??-+L?????}Z?????=r?5?(??>\%???H?^??u_?????c=?3A?)?_?y????u??Z?
???H???&???Ti:a?q???'a3
???6??3UI???;?$? ,n_????a(?d8?2v?8???C?0
???&??OV???=??????????X,????TG?????????c?!?e?o'BX???7#????m"ir?BA?"??UMb??RW???E??E?8?????z
c
???<???|?@02u0?B
??E1
b*b?]?l^?G?????tlH??FK&?^?7?/?z??h)?OE?_?i????#g? ?XPljb???N???l?G(?BD?? ?
` ????$	???4??0C,L??)2?@?33?
?ys=,"???????jt?:
?t3
9?Tf4? ?5|0>s_t'?m'?1B~???
C?z?}?r????d?p2????0?D???P
#???????r!?tDo??????3u??w?m?????Lv?4?1
??? ?m???o?~V???Gam
\w
?0?$hN?7q?3x?
???Z??$??ah?G>????6W????R}? UP&??z?"_2?j???
??2q??L?????|??-???De??W{?(8?a??L?????c?
(???bq??r??N?HfF?3??V???Y??7??6a????I?A??????
^=EM?qw???]?=?]??;???]&???r?,(_??U?7?Q??8C?e????D????|Pi=??rj???tN.?G?!Q?(?4?J??;? EC??:??$;??l??`??A~?0???C?J-???;??$??[ ?y??"?BR
????????h]C{?:??m?X???^?`????Q83??????????m$TO???????F???&o/	??%?k??Y?q?(???P? ??5|??r??;`????0Z?@?#,?@&?
????????&?????}%e?[?#???h?BP,??q??T??f?F???w?????A-H.2?
n?ip??	???q2?d??i??qc?V???C`Xg>????e]?U??????c???0??#5\?8D??ux%K?a5Rt????
d?>??.$?$????H???????b'????T?B?Z{;?O???R??]ui L??[[?????.?#?"!??0e?
?u?/L?"??@ay??????????h
?u??W??iy?Jz"`cWGX?e?t.4??k??????^H??21T?E??b??
??Q>??
?????`F)W?????(??S	?]???=?O???r<v	A??|?/T?}?`e?d at DDk????r?????@r0rs???9{??dP?| %"
??? ?H'??3??1$??KMM??^?:*QF?G?	?
?????P?A??"dN?$Z???1?Z???L?????????"WS[??
?p??fo-?$???GpG~?????#5????d??@]n?)?{==?#??3H?+8bQ?????????i?;i?n???2bj?[??5?b??6??p??M??0?&?2
?/fS??)? ?P9??G.R??9???
???5??}?9??&??5!??	???Y	r?1#??(?????TB??q???
??????'?DE?hn.Fz*??9???y????O7??p?Y4?UPOqe??
?vO)zLK PB?????%5?????~/p???
??p???y?
????K?????/-??af%
:?u?????"-n9Y???H??
^?x?????a?,9?1?M.~hR2??TT????e=???*?????;3w???HA?>?W????????{?
[%??k???Mpj?	?????]?m??y??????5???;rJ?g?=????#"?(s?V?k??????????????r9X??6?dN??Ts`???????K7??,?33_>?????????*fR?fR??&b???G_????n??????O?????)rp??$OQ5-??RD?I#_????C??????p??o??2!|F9_/??:4
??O?B?|D???Xtr??k???i??wo?/*p *+BC at 9?'??BmR???????G??6$??????6?\6?\?'_???`O?&
???EN8ZO1?.y?*?l#)i!??0?h?X??er?EY?#?<2????g$l?????l??SR^8?s??S??)??P????(?w????
???fHx???"????f?M?>q??????D??*>?'?????)???p?^[?????A????????Fo?8MUUUA5U5U?E??_???wE???????????,????B?3?&qI????y?
Lgf???I?G???7?????>2???,??????UUKED{??;H
F??????'?e?IH????$Hi&0(6X:"]l\????X?@U@
?)?T????E
;????_??I	?R?sg?d>(?xM(?K?>??<{????S1?N??`?O?????

?awf???N??0?i%?^F?#? ??????'???N3?Y????????/[_???S????f?7???????^dg???0?????????E??O)?x????w????p?:???`??j4??????P??@?????m??, }lq?<???O??|?0&7ao?O>????>? ??[??L?????2*?J?.0????P?%
''@?,dd=L?d???Lh
???	S?????8?'??(?T??h7	P?
??
ms????EM?5??&?%?]?

???VW??????>C?!???
?$?C?LB2QR,Iy(?2??J?Q?\??A?0??,?uc????(.???e8??E?D??[?o??q?3?D;'2'?	? TJ?????????	2?E$??!AI#A
J?"???????y??n??p?r???<
??*???w9L'???,????7??
x?/???@R4?i5FR?Q?/??##
A
v)?_?9yf???c??4?F5?*?z??y5?Z4d???@?q???u?%A???E??,?p?a????@??R
???{b??(?(L??????I
?E??y
?m?????????|{????!?7?*F?????eS<)?rC????iC. c?aT?}?{;;3=?&
'?e7?K^???X$??W?1B8?MQ???k?!QR?5d&3?DN5??FRF???$?	6???qbv?E???a??????.?
)?????
:?'???nO???<?!??%????Ue??X )??7?Q?*??&CU4?z1q??????JR?????{.z???????????????l??a?P(v>??ov;??P;?2-?l-?a??&ur?????U?D?L?=$?^?l?C?u??S?6l?YNY???0J???2?&42[
?l0X?u???R?
?0[#o0o=w??????8?S???wM?%?NoJ??TD??uqi??o????$8??9
?;????9E	~s!???q	???C??8l??R{??e?S?e{,?tj?0=?j?_??]?'??????I9?:???,?????R9??*???\?o?(?b???U??UUj?Z?UUUUj?U?U?!??aJw>-UDT?UUUUYVUU'??}?k?im8????s?}+Z?_??v\?P?????v???(E?R?B"?(????]??u??W5Z??8K?<????ET0*
?sR??????e??|??'?????????????*????m??m?????p}??????Ym???Z?r
\??????y???X0N8??km??j???s???>?5????v???k????^UWkm??Uv???J'???]???o??(??"~Vw?5?g????P??1???	??:??????#??/?U7?z???[?><?I??o?9u?????Yes8??
?a}
?A?????c????m???nn????'??H0??;?4?E????????=Eur?????(?@#?n)?Pc
h??????@?*2??p?|?{??-<H??I??O84A??X?S??)[Ya???Ul?t??E?3|F?	??Rc??l??=?X???? a`p?o???Y.??[ ?&?\?????v?????]?pv?H??jC??
??S;?????h??n????=.??/?????7?.Z?1?N1?t
?]?(???0?;n????Z6C???]?|?0??????>;zs???4l??a?$]Q??LG???6??N????A???????q?h?T???"c??????BK$!$?????A>?H?~b$??~??6 H ???@??[?	{??|?ucz?@?????J
X BEf?y?I???????????"??J'?>d??) ?2 at KL-@,?
??"JB???
???Q
?
??2?T.?1??@:??$9!`y??#???????>z??????I????~? ??V?????_?0?
O??
 ??C??q?d?f?????A???@?	L1??j6?3??Q??R5?Fu??????1? c?C?]?}??
?'^?p?
??t
?+N?qExz??@X|TC
Di??d?P?b ???b???'$?h??
{F?A??z????W?????W?fQ??????C??W	2
??y u;:00w??????M$P?/?'?f7????4Z%iA?
????u??M at Q\1#2b?v????Y2)Sr?68-=B??q?VZ?-??????$3?L???'WQ???%?w????a
???d?E?*t????z?@???5??(^?_a?
?L?M
??%`?????U
 ??xD0a?D?~???Gn/?X?8C??>?0X ?N
?,???p????B
U0?/l`??vf???bP??c20s?
[?zF?8F?+?Ht?.!??G.C?&????L??>?i??.?e,?]?#?'????e? z?St??I??N%!?
|
??BH?0?w_???`C??m?71???.LH???Q?? ?;?Q??
??U%V??q~?Q?"2f?<?0?nZ$|??
?H???????ja??j?C???=??5?+??iJM??r?b????a?????rmq?,??2`?`aP5????P?????Giv???????,??????1?J ?g?0YAFh?u??B?p??D	??p0??;??@6(??E`??????Zx???????I ???6?JR?x)`!?????h9{??e? ?J$P6`a?>A?
K6?????@;5??7$?4???=????yo] .?4??D#90????.B(,?X:p2%?$! ?r	???Ax?/?56RE????p?~+*9x??P<D??`#?xd?8????a#TBh?
/Q???D)(?lM~? ???%"?? ?i?,????5????s?&?38hm=?K???#t??????
bE???U`fAC???K??
??q??[
?C????{?;B?3?q>??9`?t????#F????2
???
?Z?80.??n?pL?$
T???????1U??uRq'
???,??'?A?w^/x(??G?*(H?'?s?\Oj??!$)???????m??nww%d:??9X`[
??%?#2???????zq?hh?3+<??f`k????Z`D????????P.??????+?t?g.s??N???QJ??? ??$?I$?I9Af?$?h?Fdt?P?$??~??X&gI?`/???`K-?3?
?G?W?Q?_?LP?!???MB?H?d? F????????x,z?i? 22L`?
@z1???????!o????V<???T?E????`????6???????????/???????????????YL?\?,?/??D???(?(z??"?ll??@?C}
??a$??9?$?a??P??0?D?
,?????????
????
p???????2?1??2???????????G??*???????G3t?}_?\?c	?N;nw,???=bl?N???t??????TiU?_??????@?EN??H?T\?
@
p?o?dE???G???:
????GB??81??Q>?ZQ???q?|
?
.T??R!?pf??C
d?,&??NO?Xl?eI!????
A?R??
??f`_?m~X`|?( ??C?U<@3?2?3@??>3?yu??
$"?????Ey?|???L??????\?!?0R?{^?J$0???*????s3h?????S??R?*??GP*?J;???)0d???2?j*????:?k?`xE5S??Q>>???#g?>Sc_?,C3X???4???.1?8A?#'????
iI" ?????L
?#??ynrW????@js?37???? p?!?CFu??V`9M?e!Nnv?DUPKI?"*h?v
??
#J??%
????<zz?p?8??GZ(??oD?
????s?a?????at&??1?$$8&
?eBD??X?s??@?$? ??0@??P????0????K ?Ar??<???p???D???hE??4?
???+????o?E?HCD??D"?	?$?Z??C?{???n???E???,0*???
zh?tAA?C0h?LN?1?J! ????K??Ne?J??J??X?@ev*??i>:t?"???m?q? p??wnkK.?lW!??lt

4????!???H
1H?;???5??b???<P3?
?????)??C)?j??A???>?W@?SBn??????-??!B0?x?0 at D:??9?-]??<?WE?00?U?q?]??M?S
6?<?????"'???`?8?ZD?-?[2?G???r????y?Vf	?A
??	w?8XM
????n????4IT?c???-?????{z?a??e?@A)?9hz.?B??C?
,???$Q???`?t?`g
E?]*R????&?PI?KP????
J!:%#?A???CB?t1r?	??T?`qaE????#?,?x?*???#?????D?	????z?@?>vt?1??????|??e<?=]
fQQ%S?,j?F??g??Oi?w??H?
????l,7WewV+??l?i?dXjjC;?
?H?
6%j???7
?	??$%??L?G??(?+
D????9%?VZ (No?g	?Q	E?`
??H-?Pv?;`?|G;%
?????????????6~mZS)????H[?[?7?h?#f?A	?`??f????Z?c??9?$ov4|?1????rg?]c?Irq2????5Q????c,?Gg?????;?L?9?x???7CO??$DLw6323	)x??q??!
??

??d9Bl???bYf
X?e|9?#?2b?UP|?L?V{z)'???2P	H?6]?a?P????iF?Q	???G ?J
/????%? ?
HC*
M
B???6?bDB	M??4??&4????Bfe???Xq|b? =?V?c??y??r?3??%v
????*???L?.U?dA?)?M?
?T?L??9?$*R?????Gr&ZQ8:???'????4d??C ???-?s4????,??
?`7
?
^??WRd.N
?Y??W??-CH
o?!??
H??B?LR0? ?Bu?@?"!?{@????ceE"]?V?8?|0?3???Xfb????a?Z8"fr?"?*Z?=HK(W!@??|??v??v*???R????"?Zj????"9?w?[??>?#r|????0[4??+)eRQT????g??7?T?6???T?F??Nh"?9?8oW1??'?????~xl??f?T?? S
8??*X?]z&?*p?@?|?-D??????`?!???{ ?y?'?B?(_4[????Nd'+(?????/i?p??W?v??8? ???7d'?=??u~Y????sKc"????",?2??`Du	?$h?????x?i!;???A?@?!??f|)???>??|?r??i,??r??I?-/??p?dU??FC?;dA?+??^%?+????MSA?
H?/G?A??N?&???L?Gp&??v???]eR~#??Qv0/?o?qOj?
@????C?P?0???a????`u?z??	('?
z??^
??
e%!???Y??M?$M?a?7??+Cy?Z?Hr?`a?Y?9 K???h?`|?f???~?i??$?????p??5
?"	D
~??j?wP??Qv"?}7a???$?A????????.?@?*?2
? @??W\????????T?B???}?C?ZR??.JZ??????~??,Kp????	??/????b??b?D*s?BBA?Hb?L???????M?T ?1?>=????????'???I?
???P?:V?;V?z at H?
??F???????N???O?{A\$(?V?t?????|??p??? ???????????8?????]?(???rN???,????DEc?????s??????,?????, ???k{??L???iT?8O??8????	4 ?`?????q':??)????????|?ad?8?$??7??D at d?f??!9?{
?????*????k????+NX[????)?~_</C
j??XF??_]?pi6??r??
?????f?_???f??????;qy???y???????	?0O?v
??o
??H??????
:"???????0eN?S?!Hs??(??.@ ??$0"?j
?_??l?????H8,B?B;???S??@??j'??n0
Q??k???cI???3??s-N	???????-R???mN??c?S?4???hL??W?a???B???FEH???ENa??G???????L?Y
`aI??4?$O?y?V?F$?A?B?1 at Ls??0
?-??9H?*\?C6?
j??:}????,????m???M????????????????*tM?^?3?
'N9?r??;9?????ZWM"?!?*1k?Xm??Bz8????????i???\Ld??54?dh?????Z????!FW????Br???|}??=pEU????E??<??s??????????;?#{U??t?8??$?????J??K?/??R??)??C?G???q???AR+D?ql???2J#??-(??o7?C?8??*???????S??3???Q???2
	!3???????o??f3B_\8?????=?@?J,?????bM?U`X??mP?J?rmeY%]??@??p???won?W???;y<?<|?<??G?b?v???g?2?????x?]p?F???????q?z???UWQ?_??WW??,=?????a??????q{???y?g????mO?W/	??i(j??Wt?3??e???Z<??2??????????<?K/771o??+??]??s?q\? ?A????AAf??"?|Jfi????'???L??!??7S7????;7'
5)}_*???XfcLw????C ?*???u|f}GAQF????.???s`?1Y??l<?wvfv?`?T?????/~?#?D?
B!?F?a?)??
@>&Gr`8??"??????D??N~p????T*?Q?A
!?
??,???v??f??|???!????"????~????,I????%???CSv_??qdJ)w?CT????5???u????t?&t[?B-?m
?iZy?6|?????qdP??l????????oo9?A?Q?\?_wk?=?n?|N;?0?i????O\v+q?1A0?L?D%???????y????7ir?I?`?=??<wi??#h_e?U'???{??? (@?
%???f???*?N.??pwL???pwq???L??9?3??`?????
???????a????f?g9?????]?zl??r??B??????????;?T???v??????E6Dz???_
m,*?%{??#???H{?c
R*???????>?v?A?
?????}????N?(?6??6v???n?Y*????
>??d5(7?@?????b?X????MD?>?5N????Pg?j?
?!&c?:??	!????&?P????????%??	a2fXd????~??UP?7({?;`
??h?@@?
/??????Q	Q(?&??U(???S?
???W???~?????hG??P?>???3????_X`T?_N??????p
?`#?c??2`?!?????
????
 A
???f
? ?!????????????????fH?=A??a???o*??
?e???[?=?q=?y0k????4=La1??=?s?(??`?Y?@?^Y?\?L???M2U??{/Ue$F"
AS`&??F?$?	?uG??A?%M?x?.??????
H??m??h??
T7??0?F??hW?N>???)@?8?"??`'?(?w????l??)?#wB
?B???

?re?/?@??c????L1l?Ha03<??;H,?0??????mHA?	???0??
"??P???6?mF????R???
KP????%??iJX!ZY,
[$?
F??????%%?????T@???	?8??7Q??p??UUUEUUIZg??x????A?x?
b "?"b????#??;???P;?&X
?:??3???K??!????????|?
?/c???????pE?P8oH?????I??bQ????
?N?@?
???C)?<
?????+?B?yjpH????0 *r6?61B0^T?
?M
1P*?????
.h??p???U??????X?Q?
RUq??w??HF1???q???u?z+?r0wC??NC???C????eM???>S?<N?)E???q#DF	??*?WH??
i???0???L???4?@@?Fb`H?fB?XQ"?D???iN?? ?oTY5L???|}??G?? ?P??@?a?d$!?>`:?`?!?D$??P$??(?N?A

9?????6?2???-????@QEC?P?}????O!S???Q`?j??0?:??@ ?M?z?z?_f????;?+???D?Lg~@hs?S*??TzB?!`c@?s?P<?=?-???????o?r???????????P?	G?.?????~?!????????? R!?B?"d?-S
???:H?<?bhB=?
??\L
?|2?0???s??)c??>?w?}d?y?1
???
???ddt"9F???"??????;??b??3
;
???f!T????]????'???	?'?/q?A??:c??f?wc??Sq?????;?? ??q?;@@?8?{?$?Y-?Bb???bwRR?bc???;8?Y???11?bc??(|]??@??Ck??k??M?&1?m?4?M??lll??7v
D?j???????FL??a
?c
>?p8F?0??7\D?5T?5?p4?Dj?s???[K?!1
??????1???d???
???@? ?	??}???R?j??/?|&Ri?
?`a$??,-??7????)"??>?????t?O??\??8?*?
??'w
b? !????y
???f??`=\_?>???p?rE???????"-?U?F?C??F??\????@Lx
0?Y!?]+M?L?d?
+bP?%???|???a?$=?????B?rG?
j?Gs
??????J?????B??g???(??j?????*????>a$E
RtC..%??? c?#???@????;??????R&J?fS?????C?	)?Hr(?k??zE?????.v?VY?A?Fb??????^eM????(?#????W??????	????u>Y??^9?3?'?ty?_???$auT?????)Y??bE#*??`!???Q???? 
???
0r$
??@)w??!}?`Qa"?A??t???q????I?$x=GVcJ?D?$f??`|?
???/h??CIe?\`???X"	|?????s$???J??
Y????j?4??D??(x$??0$??3Ra?ru?/)H?|E*M4?

(?m????	?H?]Y
!?Z?E???EO?D?`??g.??.Qbt??T}3????@????`&@,T???n=~?PD???%zQ_??O~<?;jE?b"?
?i????????o??/?	D\Cq?l?$e"=R??lP????o??R?R?????@???
bTZP????*???(^})?g?sw??R	?"??M?????
??M??}????0?@NPq?!?<????AJ?M.$??
??t?0?
/? HE)U??H&)??i(*!b?P??????s7??M#?AL4?&A\?!???'????A??c???L0?}??????T???%??h??-??m???')a??N???=?7????>U???"zqe1"@?aC?P??C??%Uo*hD??8????C???!????a|t)??o?(?Zb???wh????????Q?W?'4?t?!?2(?0+ ?*??*	??
?E???A&Q?G?a??VM???2#o??h_?)N?W?
?!??~???????c]????_?????Q??<0*_??????NF?O???}??
?C?
?R???!?
@??O??t"????.?
cI(d-
LMP?????8(=@?6
&"~????sW?)KP???(S??? O7?????/j>?
@???0!???
???0b??1??
T++?e$X?t?&C??"T2?`???Z??)*??l?i/??+Bc??z$4O>?[1.?L
?Y?l??E??;Yd??3???luL?Ub??8??T??	?o3!kf??7?qa?n,?		?QQf????
M ???,?E`DTaW??y??'nE??R?=?,?	?" ?#??Dl?6NS?C??=G?{Y?? ????a?,;iB`????^[??????dT?*!????w???.?i??]???\??wvj?:O???,?!????3.???^%?$???????=8??|?UAg?
???d hnY(*j?rn`	??^?16	?A?erC(B????;7???q?
 =y??h?L#B_??!@O???~??
?g??i??{?Ig?R?i???c"4?Q6$ ??~???9?s3naM??e#dd<,?H"A???Uf?:wD?,??8I??S?
PU_G?`??H??5uU#??????3?>x??Fa.???p?h?jc?1??(y?????I
g?8hMC?h

R??j??
?T!:??h???#?@)"Qy.?A`?A&!"
??#-)
sG?{ xAC???X(b?}?	8?pK?Tx? ?H????? ?%? $?b?+????HQ$?F`C??9Q@?,? b`%$bC???? ?Q ?? R???#?.??@??y@???D????=?e??~??8	????A?$?8?@?:h????ArM?I?????s?M?\B?T:?????+??'??6??%b"s%?G(?R??F-NYe????9???4FF?<?f?a?C???6???p?8??t?A??3G??	?E!??:^?}??ph?^????S?'?,??DNY???/0?P22l???y??GCv?????tN?????r?G?T????q??=p?Rhz(?N??	?UB?@? J?#??k?P??f?d???	@@"""!???R2??B?+A??>?l?2??pL????&?C???K$j??B??C??YL?kZ?()??~???)??I?<!ndb????U?Bb???????????????.??&?h
iA b	????Cb?
`??
?O??????'?v?
B?!??a7????	??x?`S??>?T,|Y>??C?O8???M???????)?>?t?aL8XJ??{????????
qwM???
?#51??e?x???|}??p????U6	?i4?????i??R???????+ml)O0U?l'?,>???&?m)?|N?!}?w?
???k5[20?@?C!?1}*?8`?,?1Fb??????!?T???)0?T??d?J?U94?#?L$???)???g?a?RT)c
?2??K?????}????t??e?^6??]?Dp?#@0???C?
"?,O??? ?!?`^?e??????W?[P-???<b??uV????F
?l
"?D??????sK?x?x%??*??a???	?MQ
M,????!??
c6?)???d?l????\?)h???i?GK???d?`h??:?G????j???F
@??*?>??y?j?
H0*??j??q%*(}x?N%u?}??i?jZ??Q???????=Bb})??>??7@?M?0?$????:?p
CF???hu?m"i?
{?*|????{=p???$?)4?8Qum?\????
nY??y??4PQ3E8i?CH?W???S???z???0R?%???8?c?e
???3?w?A?;??????????:|<?gp

(eo?????C??8&(?:
?L??^??Jk??O'???}*?R????Kz??u??4M
j(?:@O.??'O
y'?$I	G??#??
?????h|??!?N?Y?6????<?-??AT
/R??<B??????x,?JKK	A'????q?p3?22?~????90
P)???+ah???S??2H?,0'iE??f?	???}??fbW~????fg????????|a??F?I ?&H(a????????r??gY4?O??&?S??w$$????????QD8?Ne9P???NE^?9?n@?????ZP?T2C????z??F??? _RQ!@?=y&??E
??%@?????y?
????k*????????????	??K?Q?*D?>??W???????N?V!"a1`?)Yd?erB?7??????5?8?H??}??puz?i?=A??????
??6NaJ`;???h???>??????????3?;?C?0
d
?J???!I?????sn?;Nn???&`& ?7
	N
?????2
?AK?$Q??$???}0e
da?{??|??~???i??? ??=???FS)>L?M???G4P8?;'L?9?i????G-X??u??p?.!?????S??????F]???6?Y-v-?????L????)??1l l?/:e????9?48?F???"	NZrT<?(F:C,??? C?(??UL98??9?? ?
???
?.6?F
??1U??J?]e]Q???????p??96?E?s????nsL?E	??D??n?d??s? ?cg?&0?3??X?????????8?zU??T??,?W:?+!$jh?e??'nn??3?=6?4s???E???N0?6?????(tSPK?????x?L?g? J?"?C?F?w????
???2
K ?
H$A?@x
???!W?.????h????}?JF,'?	u?????.?>N?s????W?4???"F
\:9d??J2?? Y?*,dj????m_Rh?q?J??d?g?n??????0?;g????I?w
?,?{?B?l?????&z$??]?????w?v?H???e
]???	?d?R???????vk?9BD'????????l???jA??tc20?4?dy?????????7??q?02a6,!???3 ?4???P???X?s?Es??Y??:@1??? ?&FRp?Q????-??T7c??????????????D2A???
QD3????7N^H'}??9?0r?b???2zY?P1~d?r>B?Ag
%<?
????=?zm0a?rf
?0?	zC
?(H?A?N?pe?????Q??????????s???d'l3*?T?l8?]9?k??p?H2??d>F0?^O??????p??

C??? ??D&??????m??`m?
?P#?`R?P????-??
P??Ac&1A
?"?hh1??\'D6??)??
???!H?{?c	????;6v)5?'??d????<dG8O?c?h????'?
?:?,???!??=
.[?A??????E?gC?h??????????????q?m??e??%w????QCI&0???1??#???zY+?:?,?]C(s???sJ7yFI
octx?F??????&Gh??b?gh??H?a?F???T??]?%?,>??b!????>L?&?2????]?rQP[
s???????l|????lt??p???N????v"???????c??$?p?????Y@?????

E
u??
??%?G? h??;?6???;"B?O3???{????????z&G?!????)????;(????]'^5?????#3Yi??2???3?I?0??I(?K?????Ob?7e?#!P?????8?sD?eX?K[T?????WEZI??$Ge??8`G ??d2??? ???y??81z-?????B??O?2?9??k????pO?]?E??????< ??$x/?D:?N??;???%%???U?7J??ud[???**???!????H???j$?Ahq0??&?:??bQ#%&?;???rX??????????@?c?o	?????ea?b?\?r"T????L??p?{?Q?^+?UX???xj?a???`?R??2N?G,?]???d?#???F?Cr??&??\??#?B?c?W?r??2
=b2?(?)<?Ej?z???$?????+????6?????e?hc'$#?"WlK d???r?B+?d?Ysl@???h?mI?kVa?S8??K?9[l?bi+T?46???`???????D?d?"EY?&???6?l?9aN????D?B??l?5
&?B?u?{Md$68iVZ?f???^\?7?p6^[M5???'99?>N??Qx3???=??+??????B?X???????v?L'??????H?n1?P'?T*?
z???N????0??]?U,?/?x9rZ[?????,/X?u??$???X?????a&
?` hI???%????#0??\]? ??OvD:q%???=b?6U?{_w?G?J[8??ym?M?????B?"?"(`Hu?n?:?9F?(?y??]??[%?????? w+??b?vc??E+|!???V?????N:??^r ??v???gl7W?,??e	?#?":?}?1???.
`?R?]t?.0H1?[?X?T
?0>????????S???
F
?5DC?Q???5o	?FQCr:[??)?Hd??B?lY???????
a

?CD??
?? m?(
3???AB?DP?
a?t?????{??w?
????=+?s???????
?%??
??
??8H?
?C??>
??oF?Dl?????*?%g???FfhEh??2?m?TX??Y
??????H?CIJ'???N'????>?D????C
??????]????B???HFWBC?J?3???a??V`?p_????!?.??"I?LYr<??????J?:(N6?edTCe???D????9???a???Pm$,?C
?????*g??`?5?4?t?2??"?D???????H???f?^?sg ??G?p?1\???)??p'?
R???>?????
!

'
R?Ksb????=P?b?X??ta?).?.Fv?4$0??0K
0y?t?k|?L6Jh?|?*
??U^K?fX?5?n??1t#?:?&?d?G? ?'!?$T?4"ak?????XIn?a??p(?e$???#???tP???
?!
?l?????)?D?A?k?4n?m?:3???~
?T??i5$?y??U?
M4?*	?v?a??????.??_4????2?R?(???%LBUS@?
??$ \?3o?jf?in????`??e?????Vu?????m???,h*?;?h??M7???WiX???a??K?J2??'v?!??Q?>n????De1?w?9?
??[Q?2r?%??o.B?u??K?h:???a??p???i?B\?.??d?)?elp?d?]^???
AJP'l???a2v`??
0)4?-p????q
?r?????y;v??	?c????~4g????r?aG?KD8???;n?9s??5w]ial?,&2J???C?u{ ?c?????A?U???l?H!B??%aB?n0x
'??C
??kD?z??
j? ?D
p??<???BP!?A?`X}P>? @?h(?4"iJ?m????q????
?1B7?q?0??RE`?~-?[TB:??`k?????&??N???
??uht@>?`????JE?j??lL|??x?a,u?6?P???M????E?\Bh??Y
????(??o?
?*v??*?&????I5???JBi=Vj??D??x???dD?@?/?y?8???z??|?????
???S`??0M
?"d??'??????D[??c???????L!?;3?w??S?C???:
??B?n?|W?
????t(?.?????@?7F????|qqasxsu??NS??X
@;???????,??Hf
T?#??
I8?Xv?$?3?I?B$D`?$?`?L	B
???????t?? t??	?,??F?P?G??0???O?p????;?C?Pv& ?m?	d??ie?Bp+?K????F??D????Z&-???C??;c?
hM?x
m?B`Y???7S??J	??y?7??1??B*W at AmA??i|?i?4x?3??
?g?Q8?????
2??
^bta?g???:?e??e?$?*MA?@?????R??J??XB
f+?
????|?`dGK? ??????

Sb?#??????1???Q????TDQ,TRm????8?D?1/? ?
?b:"`?\?$???mp?Q/"????????Ux?xP???? ??OS?@?	?
????%?FK?:H???3???M.???O?????FFytP??$`???X(??cJ?(?X4ZP%J?? ?KdTiK+T??.8????c?2?#
R??\D?5}?}i??f???O????
`D??L@?Z????`J???"??"D???4
???*
?JF?((Fe@?"?b?9Q??????:?man*`?????*=??"VC?D&?0??????B0B??B?BT@??@a-!2

2??L,0??D(?"2-P?
??
?j??
=?? dH?[0X??9?????~?C?
Q#?z1!4?qvX`???R	(C???I?V!T????b????
h??"
	jX????%J???b??B$?$"X??(??3
0???p????B???R
?N?'x
?D@?F?XQ???:{?StQQ?f"Pb??E?!SyF?? ?@y??????6
v?Z?????? nP?,N?8L%??$?H_;?8;K	F???????W?&
1P??k??oB%?????m??T?Q???
?f)3???_T??H?? w4	?@!?C2TO?-??3??Gq?+???'??D?????G?hzL????,?.`?3?I
A??{?a?#?????p ?qx?r????:??D%Q?8?-?,'??x?
?R+?!57# ??F3M?P??v??u?`?}2?????B????
=??y?Chi?n?\=l?7?A
N?>K?Ij?:q?U?2????)?9G ?^?qC?
??h?9???%0@?/????????;'??`??? ?????
?Q$D?9i2d(,???
???/??????? jX?????P???@
?@B?Hd&h?& ?R?"??$f??)
P?? $*jfj?
&E??Y?B?&Q?($?j{???8cg???f`r#??bL
:?G:?M>#&4??&K?#????%????k:????5<??" ?)??
8??,?rq?UEU0L
00?C1?ey
?6)??$"I??WID?&???????ZY?h???	?bh?S
b
?%&?\#?
~???`l????=?t ?H at p??????M?U	*????
??:?u8Ih??Z}r????	??
a?;Yv"`"??4?k????Y'?>2?3?1????????!)?-0K?Z??	???EKt4??4??-
	2*xvq;???N??K??]???)e'?????e?`]?
9???%B????1?O?$=?F\R?[?#Rz??:??q?XE????a;?? bh?l?H`0?C??????V?=?xu{#%?B??>x??f??31????q??"????/?????4cCFL ???]??I?(??"H?TV??H?qV??'Df=???,?8??'??z5<?
o*?????&??u
??U	M??*?GHh?:??!???w?s?9??? ??O@????J????0??? ?Z?"???,?y??7Ph?+
?0a?$???G??
?D???z??
L4H????;Y?YP?????-????HH
??_???4x???d[BHXG???????H?;xQ??\b??":??;(vJ???`D? n at m??i??	1?fA????@?d???kQa%?`??#(HJ?B
BD$????C?d!X
??M?w?????v?)?b?h|4r??!rA??9"r???	??7??????@?E?4?8A??p??@CO]??A{??S$?n
a??@A?
'?
C???'?q7?,?z??H?$g-??h?+???~?h?F???u?$D,AUf????<a~????xk??f??&%-???}u????A?i
1
6?$???`????
+)?3?F??h]1h???|HH}Dd?
(ls?vez??x"???Le?`??sgw?~t>Sc ?	?	????4?????:u>????l????
?(??e??;??
qd????%,??? !?g?fN?E,
Y?cz?????,?)?4???K? `&??cR?CJ???????K?f??A?m????e???pU?????3bS???/c ?????? ?????x?h?q:?8??K???,<??g???*????vG.?h(	@??
>@????p?????S?a%??dP??)3?b,?3?N?Cr???
???$?D$
?
"N???'?????/%
????0PEC0-
?
+1 at Q-?AQ ?D1@?2?QJD??????D%EKFfKL?AA??
IL?
???E?$A??dCP1+?????	?`?i? ?	E$Rp?p&H$Bf&????$?R$j????d???b???F~l?C?]dVO&D?!t??A?EB??dN
? IRR??vs?E???h?AGx??H???"Z
????W??9'????v|C?_
?AA(a?+?r
(d?T??+???????033 A$M?KBI
?L3"?m??$???$ ??"?VPIB??"(??9???
1??????:w:??????EW
?O??????J??
%
t&???45$?~??X?d	? T?`???C?#??????j?"?E???=?x?u?udP/V9???<?
?"x?w5??@??????
??e????R*b
????RR%?p?m?H?x?M
??%?
0?L???Q?X????"'CD??09??\7?(R?p?KS#d
?d??U???~'???A?2A2??
??4U???d?0Zf???$?S????-_?3?Cv()?J$?X?L?)??w??#?`Q_|??????
9`???z?:=h}?.????,??G??W?><&???6x????/}?l5?;`????L?x7?Ui=???T!???(D?
D???T?|P??????t9?+???%?????yb? d??T??=?y?<?#4???????6?????e?J?F???,???s
?2v8?F62????J?(??!?M?A??????~?!??Gq?????xvf????
??77?v??`???D?????1^.o???~??]?i??d?SP?iG?`Q???v???"?H?O??B?J??Ga???g?
"?S??c?v	?56??D?HHO?%M?????:
AtJb?)????l?4r`?M?1????Sur????????P>Xvzi?	O
F??n4U B)&H??=D?????????ac&0;t`2[??J?GxNR??
??%-s?S?@?????~%? p?{?2?RP?Hx??B?e%?C7?N?K+
?+c?=???z??z0_?
AE?,?1g??S!???h??&$?qR??????i??Q?$~Y?2????i?????gLP?F?H??????z?=a?&V??+?sE???jV??nChXY?Y???#x???Q4??+?A?A???C?@q? 7?
??E?=?tX??	I??T?p??&?8?o?$6G?l
???O#d,;
???? ?????gDx??qA at CqD????aE?Kxt?????????9?
?`????j??????g#daqB
:??:?H?pa???????&??%N??9???AM?t? ???
?:???S?u?????(??f?'??0?!B??g?8
r??q?N?_Ad]?c???!lcG?1`^?? ?F?w/L????L??i-)??,@???!T???[x?O???j???????????hz?x?!FUN???a%?? ,a?f
(?0HM3??lJ??B??L???V?2:???
???b?}?C?9sy$-????Mv????? ?P?t
1?3??
R,?I?Q??e?C????y??<\?u?
????x0?????U0T????
">??? Y?IU	????
?3???I4!????S??=	?????5??,?|[
8?7[cme?qo?????	???i?hR???60??0?##??g??M??=?(?"??"l?:D???i??w/c???V?GRS????ts??????!)@t0/aB(?8={??`#=??X?Z%??P?B:?14H?%?b?C
0G(??lX??:?R



?!?&T?YI??6%c!Q??G@?
??????BA?#
???`2 f?fC?cO????6?Lv??
?h????????d?a8ux???
?)
D:0??;'?#B???})?????[`?l'??????"??y??<?s?
?ph??,
!??@5b
??B??+b??b%u"?GD?
}XQIIV?V??g70?@????R2"[M???V?y?X8@{? ???_?_?,h?f????TatE??????????"J,??????2%h?H8?!?q9p????8)!c?B????h??d/'???0??????X??bF?B	??P???<9BQ???8?}??D??m?2z??C<?R;5???N!??!0???$??4?? ?]?bsgt!???
LM??H
?B?]?0jX?B??!????JoSX?@dm88???r0?"?1?c%?q???B?KJ 2??!/??%??Z\?K?4??9#?
S?%MX!??.3 at R?????D??"?"n9?	De?B???
??d?J?RUp??
x???@??qg????i?"??b?!???*`1???O???@?
D?K)?RQ???0FIa=0??C0???=??<??"?{?Rc8?9R?H??q???;??T??wj??DD(??N2??0??P?0??7J???K=q?1'?a'??	=?9 ?HI$4???t??`^??Y-???!_??:l?????;?D2T?p??r?SE|9????o????p?&?1h ?y??3?1???x?T?B??5
???b?2?e??2?(?H2??+z????hK?6???g9?0?_6?????p0sG????DF3??C?p??30` 9?????<??wjQ?fF??p?3RRv?1"e>v'B?y?vMO??	??>????
i.??4?]-?g;2Z9??E'*P44 ?0?)J????0???@???7e?R
@????????m????8?R??F??g?N?1?PIqA?q??????=z?iX?S|?A??????V??N?0f6?.H?)?R$??p?????@XF??
?c??
?\????]kP??
?X?
ln&???A3A*?h????PRuB?b@?ZR???P?ke1S[
??P?d0???)?(S?,$?2?u
=?
????l?D?Z?CD*i?6???Q????>??
?lPT>RPm??C??X?/?S?80v??nv_?????????nI??s?Vq?r?D??\_??????E^B????faP???????b???6??V#???z?yGbR?D?????
k?DX+???$?& ????????\
E?		
|(>???=?d??]+?@?\?z?!???;/(??$)|C???`?n??D???????(??????b
?wPW?\???!K?
??,?[ v????
?{?
H?,?`a??? ?????dY??????d??6??A???
?"?e?MS.???U??????!
p?L?K*!UC?9?H: ;8???.?)74?????5??
C?l?C]???wU???I??Nh??XThZ~??b^\?<??RxDI??_?S???A??`?4???Y1??;?????t??{K?.?Nb9?\8)?0?i4?0??@?`?
?$??|?F?????>p
??X?(m??{#?,?????Z?)?|?x)??(E??S?`/@{??>^????@?=?2?6G??q?^?n?#?"~?a??2?7??@??|;???f??l`a????????o??_??j?:??v???Q?B
(
?3?z??a??1????d@
??w>??
$\
?On}Ym??,?0??'??`?}S???P??wO?t?f
yt????_??????3??0(h?@??h????P?HQIE
???
kX???h?6JYx?&?{?Y&CM?O
,?
?

??0c?$???e9??v????Y???3?!???h?CL?????G?
i??9??p1?T??[?$??XJ'??s???? $?XE?F^?ai
?)
	?c|6?????z	?fg'?by?'_?JO'??<)?????_???o?p?/'}???\???D?A?$E?????4R?e?
&)?X&cc??q?'p????F?pdd$&`?e ?0?e?'?&	???G?o
?????D?,B$?{?w at 8{SS?????; l?&??
?
?W?_<?}uu??????YAhy?
?!?C??b%ga??DD????")4Y
?
?C??U?
?F??5!?R??!???<??XOX??B???RBH
P@h
????@?(@d!?"?$ z)????YvX??M4?|L?e	??T??1Re??L4nA?:q?HL?H	BCva??E????a???
*D?>d??1CMA?T0
+H?j?0?
	p?<?@F1'!Yi
?Hq<?	|@????q<????({`?q
R?????
???q>?
?V4?+???c??D(D?)"
W?(a
L
?a	?
I?%VIB???? ?Kim???l*$??
:B?Z`?????6?X??*FT?????l??q),???????????I??x??:x?e???f??s?U0??O5#??hq,(
Q?<?u?M??1?bD???d?7N???.F??g
? ??FC?Q8E0z?	<??@A$?pP???P?Sb???pB?
r??q?	??)??h!
B!?r4(kJ?%????d?Z???TY ?l	??
?i?????=b'?A[????B??
5??uAv4y?QTg?0<v??T??????$l:".0
)??_$???)?6<?\	@?p?S cV?#?<C?n98?<????????

2?u
??dSm????1????K?#G
???
?3?????N?[?T?????????@1?&u???6???M0bc?1.?ad`?]?2FD?
L$0 ??
??S?E8h ??<-?,????_Aq???
?
?)????L
J?<N1@(??1J??M=2?yAb??2?z y??
?x?!m?H??&?%=?74r??p??	?@?N=cc@??k?kD???}q:a?\?9?=?h??????/;?
	??????u?8?]???
d??!???????
0%YH???m????R?<pi
?.Z??	??|h???`??`Y~t?
?B9??r??8H??I??????&tJ??77?
??cF????Q?H?b??$A??????
??=a?
????$M????
?V???l?M?J??wk???p??Y????v?F0???O??Z!??;??P;s?:?f^?pnQ]??D?P?a1???c~???[D????,:??%?
?@??,=??p????U?'p????O?@
???+L?h5

7??A???????)??9???$ >Ys?'???~??Q=?
?/?}?l???*w?I??.
!?
??????? ??^J C$
?T?tA):???*
???#???a?G?T<j??5Q<????"??a? F%-$bJ
bW?0` q?
?`?O,~9??`RE? 	\	??R??$??jH
=?>????:J&?-@?P?}??o???B4?D?B
{????U8 ?????
Ta??!oaJ??
??? 9
Nq=!^?"s'I?I?????B?E!D`r6??y??cHw?????j?"Q&?\?~????Z1?s???C?Gs?B)c??4?Nt????)?z\?? }|?@?9
B?J
AC??????0\?',?Z?9?f??Y<?V???z?)?
??<hi{?P
???u ?@??
1??M?b???.,#?VP??	@?!0?J?1d??`?@??B?0?E?D
?1#??6b ?q?"Q??vDj
?&
?:???33?s?z^r??(B4n??c??Di? 
"+G???|<v?;??<????p?]???<m???c|k>??ZEC?-?^'8m?$??b?h????d'.???`??7??????Y ???"?*?h6X??I
h?"t8J("!???0
??????rA?a???<??7?????#na?????B?? ??K
?8????"D?????	??`?!J?TI9	????p8`	??

<!/&C?@??????4?HRTE%DHT
MALITL!	*???d7CC?&y???ba??w??9??<?D?x@?-,-	P??R?J?????d??y??S?JA#?*???,??0#J) ?C@?-B???????CH?)B?)9?>?P
???"6?'??`Hzn??Qu??????N?W%?VQC
f?bJ?aJ??c?J?Y?Y??q?o%??????a[?h????
T?CA?C?I!Z?@m???!??D?&????Y%pD??n????Q`?9Kg&?jMF-H???W!)@???e?4a????XX)??P9??V-PCD??LJ,e???=F!:?X?"???t'!??pg?]????A?
HM=??&??0?A	+g?._?i?n??????j???Gz?????????n{!???L?:%? !Mi????+?o???a?????#???C???c?`j)b?)?v?9"Bq?-?5K.?1??????( ?M?'!???\?$?.????`?/
Gk!
H^?f??"?*L?????????=?$!J?p~????O4?	??????FPQ????????
?5??-?>
p??,1%D?V?????_
?^???A?B??5,??s`???TP?eF?P?I?id
\5??TvH??
?1(i\H??v| 1?-1*?????F?????`l? ?q?A??i9j^Z,?r??5M~??;?0p???.??$,q?6fp??]??
.?????_?%l???1
 g??@??S????U>??a??P??Y6?????q_`P?}WC$??C?+??$?`EH?'?????ic?
05??d4_???^Lc.??r?4?<????`u`???g?/1s??X#p?`@??p???p`????? W??>???"@?????$1B6Z!?
@?B??v????HQ? ?????h?aLCp??zJ[E??G?MSU_c??8??!?w????>?
??| ?????#?0???e?*??"'??H??????i?$S?$P<?9??.???Q????)??h??X?M at x???H|?y?AA?kc??^???F)0?P4Es?&m???y????%???w??<S?y??r?????GQ8????
?????,	"H???8.??
???p????JI4Q?DF????a{?
????i???0??0>??? d@B&???#?b	?U_1???????u~??&?JI$?baG?r?0y>s??G??N?5/|S1=?A?\DA
\F???	???O?.?R???
??&????(?@?????Xi??!H'9T?J)4"G??0wz??Q????>?????X?
D>?\?VMc?v??):?D?c?|?B???c4?7!?9X?C??.4?I??;???H?1????4?hh?????R?AR?R)
u??SS?ej.??D.???:??
???A0?????"I
d?6?A?x?,?H"R?Q?????12F"C??0?$c()ju?#9(?J( E??d9?>???bC?
??1?fi7 ?K8` u?h?<??kB??LiYh???g?N(Z??Q???FY??v
u(R!???p?bP<?P??????K
???t??-A1IHP?5B
???z????bbD?a??B??&<`c33
?2}?
/??3????a>I??a?????Nhz?E,)?D???l???T?.?eT?%?"(???a?9?T`,"??????v?QW3?Z9???3?,?kZ?VP4,?4???`m]??????tjW?2???:?
??kD\R
JR?_?<,??`??z???<???V*?P(?z?*C
???iB???\?`#???B?????&??h KA?
?J??slhhH??b(`6??T|l?0F2"oaNFF?
6,&?S?7??4-?@3?"?DP0P? ???
?n?'Y?S??.?P?:c??????1?q?<`b@!??tE"(Gz??v!?Ac 5?????@e!@;?=,???????(???
?9????
?a?????;?
&?q
B?@??6?A?@?vGf
???b??,PRg?.JG?$??M??M?f+??x:8i
5b?
"?qA?<'Y(?!R	?????A
Ym-?C dA?????-'
?;T???YL??9rO?x2VF?D??];??wy@?M!DfjgVcYaqFR????B???OZ?c::?
A?A@?MX?0???f?f
?1{?
??~?7??^????$? ?@??P=O?????????]2?#0?".?????_7B???>X40H ?A?#I??d?dBI?
x!?????*|"y??"??x?"4?p??a???3?SI?<?a??-(??\U?
)JO5?)T ?????????????"?TJ%J!????|
"???p?^(?????{%)?`?\U"??9?? ??#F??D? )???=?z?y&;??? ?u!FG???????Z#??|I		???W???Q	!???F?????
??y4;?
4J??????tG ;???
?$
	?
?E??CWT
????T"s
??D???J?1H??????&???p???qTvy?j??a?R???`qc?jd
???H`???
j(d?@?E?
?'??1???$"XE?.d]U?1???Y?|?]?R{y<3??GHO=??XR??$??B?H?J?????
???
;????"P?Y
?l"??c S!4A9?
?`?1??d.?{???j3?4?P???b?H?^}f1s?EQSL??X???m?p?8!?e?????!?
:0'e??????L?X	"?l?C????????3K???-
?G?O??<?Ps???
?`??
2??v?+J3,?C??5??^??????.GSjvg=???!??rQ??=S??Z W=??h????I?d?1??z]`????N??l??"	?q??2?%??af?????a?0Ca7EM?`yS?v??'???????<?js?Txt??k??xhn9?	??|C?e9?a?O);?Bja?o?7?n??z?:vEKm?<?C'
????gW??_hx
?m
00e?fm
Q?H???K
??QR%k
(b"1P?B!??T? ?Zn?Q?`d6?P?B`?(^???B?????}i???N?V?K?=x?V'??Oe?+A??Cd??M??P???,
? ?aUXDIA
4]'=?Z??-::3$	????H?????s%????
?=?8??\i&d??\??????8=`?F?Rx????f??ja?)?,^???@6???)??\2??&Y?w
?a?_3#?pAxe?"?1~L?z?t???g c??????k?'??e?????{+?Sj??]??????63???qy??%?m2????mR?LI&+*,L??tP????G??????R
?je/?ES?4&?????4?V????????kM??FD?????-??!iX??1T?&Fc+??.N?$1?YN9a?:d??Gw?n??;?1??:[?????R????????e?`d?&?`$?
??l2E?c??q@?L?0z|?>X?0????{ :rJ:T??y?^???!33??.?Cd?QiM
_?)?Q??e]c9??-3?#??I???@??c?E[??&d??!0?ZL?2q???R ?y	??/???!??!???.?1?U??F#??8N????B?'?'c??A?s|s?Q???)?I
?.?????Y????a=????;??u?r?lDn9?a??S???6f??$6!C????pt?je?W?]P?l??1??&?p?????	d+!,?\?F8?v%>????0b????q????????C????84?????1?9??? ????D?N?$?B?xX????????Yo	?1c?8?td:???????i?k?:b?=q???'Q??|?+	????	1R?.?er?>?I??Uu?(??e0?k???
!?Q?Q????L<??m?el1E?????C@??	????Q??u:A*??????+ZrkN?g)???F??9?W^??????=??1`???q?u????W3&#t??0?D3???T?iIL?(?????q??9LA?=O???????5?q|??!????(+C???[?B=C#	???2
G$???K?)9?:tL?{X59?=k`??
???? u??S???.??9??v??WX?Wj?;1??????'?X?|G??042l?cAC?h?X&`zl?????w?(_HA?>?Ya??;/{????1+?(?>-????s?o2??W??lvQ+8G(0??n`P07?????jQ??H??mY1?w???PK?0n{)?m?osq????	?J
??Mr??l??&??(>=??	?E
&??P?/?~=d`?%y?	M???s?????o_
????o+?????????????*R?2H????E?b%am-????L?<??t?8P??1w?????G?????0o??
?????
???=?fBT??`b???j?V?0<Qrz?B???
?{D>???d-?	CY?V&???]?A???jr???"FfQ??PW???'/?
?3??%????;-0k??v{3)y??????O????b??.??????p??????f=d)2gM&??<?????c?5?P??N?I??	??{????q?o???????Y?~h???db\	??0?
?F?x?????\??A?Q?@??[A?3@?W%?`?????CX?z,=?0?p3??y?V?.??)G7?,<???F
4?Y? o?qG??POJ??j?{??(?	R??9??????>??`?le?O??Ia<~-.?1mBc???)
????|H?z!qI????u	~????RSe?lb
XE`L?_???3?2?
?%5?ZCa??
{a?1??????=???o|h?)???b?U?2?!??>????X:???#$??yD?@BE?
?w?1c?????s?~2"?B?w?|@?? ??????>&'???3/????~oZ??????????!?d?.?????@?
?S5

???4h?Z??????????B??????bp?;?5]5?Q#??,p?7?;??[??Y?O
4]??????e;?c?{o????Hp0???g???????a?H?Q???????U??C*??10??"????? a???????5??fY????!?A?H	???5?}??B?l7??`a

?a?@???<???N4??`1?N???c??+n??3????v????????6????4???>?<????????????????? 'J??U`o?NkJT
???1??0&L??D?l?
?lJ??:aT?U??'	\??DhL??h??k"???b**S?!Z2?Ld/????{?N????F???CU??????:D????
???l????YB??????z}s?f?"r??4r:?%>??xI??????????Hf?X?ae??id?9??%RR(??tA?0??A+?V?x??	?????`3?T?jZj
#?{[y?0y1?6"X??c????
?G???????JB?hu?KPN???m?3???
???`???Q
??X_q?V2O?@?2#??C.??[?(??G<I?8yD4 at u????=?z8t?r6mxsw??b??^	<???8?????n???T0?D$??c??
%?o??p#1?O?	?8?0?i ;?|? @?I58-?$?K04?KC?1m??Hj?H?XC????S+*?:=_
?Tx???f*B??D?`y??V?>??
??`"ZV?!?6??
u?ga???` ??	??N!OI??F?#
?M??!?b??????:q&[??%??1??J
4 ??PUJ5?(z4?FL}z"w3??Ct?????0???c=YY???VE?(?-?`q?L?
??^h%??? *p?t?G????.F???ly?
?
??V?J )_????|?r?;?ah??=??XA???h?=??O?????? ??	??j???
?r10R=|;C2????b??b?4?]???0S?:?H??hN
" ??B%?@(??B???!??01>??I?????(j- 	? 
p??M????.??QA|??$L2UP?w|???#?e ?'MJ?W?x
?aHQ???j$??|????z???B??UD??	PK9?G0?
????P(?h??????H?j!??%?+?f=?/*-N?
??? ?????~P!?+QGov?1????p?b%??9i??,m???1?D?a?pHI?ae?]=?a??????Cbz????
?bK?`/Y?q???n?3-?bx?A???9?7??_H?H?????I??????`b?
[`?5R:?xf????
??d???????`I???????RHT??Q????u9??>
?I??@3#?\$?S????????FZ51?l"??????#rb#)??S!`?i088a?j?6E??WM:?T1??H2B??r??o?????Q?7???Yp/????$p=9?????
;?
H???????n?] #??&2R4?????? ??(
\$P8m?)???
?Y?P?Pa??`???
????Q{?2????A?@x??<?.?
x?<?G?
?J8??b??)^)???<0?a??????	??`-????(X?%Y??2B?R???????"???h^00?y?
?H?`?M?%??m;??e??"EH:???I??
??#????t?i"?fff v?:=E`zn@?c????????2??{? j?;??J?;H?a?Z&M?i-?WJ,{!? ?R?(?Q?qn??????-???OC}?-S-{????03/?t???ve??5-
?`7i????I?.?V?/???F?2?J.??#?S??;?0?? B?1?loo.N????&3??&??j??d???s?00!?[2?????:&??Q???*????b9H?8d?
?1Nh?])?BEk?ZrP?@?????f?
D??'4\c&??n*n?k?&9?r???
j?#P????B?2??_(???
?-	&??<x$????l? ??
??????b???en8??d#0,??????!?y<???|??.??&??b???j?3?????Y?/???z???Qk?=?D?V?!???ID_???=??nm??G????V???(5???-pH??2???F
hLpB?q?1??: Q?X?*!???9??Qz?@?G?p:???JvK??IB?o?e?F?+"j;???????i>???V
???6w??I??tM??@?T??{U???
???gE?J?????*??Es??,??,??n^af?e?4y4t????3???W?k?VM????6?*sD??????L5(0$,??"X??@XH?L2d?. v2???w?1I??aRG??*?q?,hn?]?O
??<J????;???A????<?????pz????l?-?+
3@gvh'g[%?M.????T??.?Mpip??
?3?W???k	%?S??e????g?C??H{??????:]0?G?AZ2Z???Ue??f??Kh???R??4bdVQ??[?R?Y
??%??]??Y????C8??ZYX???s?? ??M.cl???#?-?????
???p!???3%??8????U??+A?#???Z??K+??n?8gT?l&????&f?X????Y???$v?0?dwv?q+n??\q??`?????EM???9?C??#???.d?(??N7LJ?v???dK+i??m.3?:??????

??h[???J??{3?F
%d&
????8%?&K?N??d0?Z????n????sV?<qJGA????jHb?5G???D?4
2?.????????[???~?
@'?????????????

W??a???!????B6q???32}:)??'??c???{e??????{????A?(?H??
??l3??X???????(?/?8B0???@c=??%<?~J\?p?;?e??)&|?9U
!????B?&?S?y??<(?
???x?:am??????x??8??4	
B
kP?H??
??|???
Yff"t?48???5????k$zX	d?<?.y, /Ee??CB?K1lS,A? ?u????iIVCu(??????h?p?? 2??Y^"hf?S2V?wc?r{#>=???8C&??
VbX?]??|$0Cdd???MLgtH??F??Ab[ Ghs$>	?4?!??>?T??;??:hp}`?,$???"??J@-???
?*???????
??

0-t&?N9 at lO_??'f_???
H??
????e??VA^????[c?!?s?g?]N>TX?a??d??H??ww????V????K?8#?DaiN?"<???[?0
St4??I?jr????.?(?
?????Y????????<?????it?%S)?"o?qS??S?$?% ??Q??G&Wyx??2??r#?+?X??G?dB?'	????
J(T?F?(B?'2?P???4??6??x!)?1z0c2rP?????B$bB%y???
????6?)B!_1??j??{?2T"!G1??M
R?
h????$P?G$Z?? ??+?%R??????h@??(
?????6?h\???r_l?8T????C???@?d?C ???(????K?<QHo(????B%(?%@T0?7!?
?:?v?wu?u1
!+?#HK?D???,?Z?b%(R? P???G??TF
?n"Xi
RW?_RH}0??????`h?h?:HS??	I?
?y};I?F??M"?????c-??H???0?
)B???'?????$???I?*|??d==z7??Z?D??S???S??c/?T??e8?)?=7????UC???<?'??m"v??e@??2?yY?xYNU ??I?V?J??G???2??0

R?$??5???-???N
p?+???h????1.%$)???0p?)??M at 0???(?()?.2`D1q3(??????yya?I#?v????G9q:ZCR???a	1h?)?>Pzt<?y}Z	?????B???~?pyPj?t?z?0YD|
af??y.???sJ _	7???)*?)?XSe[Ca???|?xF?o??m??????*?O??u?????:a????N>$tZnBY?]?c????0???f?X??F\?+?l?9? ??|	A??dIH?9?J?`u:?JXL&??O?-?Rd??[g9??4???????Pr"??b??+??"h))$!??#?v,K??4D]\0??%?P?????C??
h?'vKJ??I?!?Z????"l/??
E7?"???m??0??0?=KBVt?Z?	Fr@?c?s??-??jm???D?\5??@=??h?&?d!??IP????i?8??I?h??zG????:????}?????@u:?o??
?YX?"c???;???F??tXw?PZ%??%E?????
:U?WN??.?J??*<???==Q?=bQ?L*????C[??j??0K?9??e9~?????1.L?qD?SV???OCp?N?????P? ? #??????L??)P????r?:???|Q?Va? ?????8???N??????/??P???????F????Hdb,?"?4?
H?D?gO ?A?@??
Ho//d?P????#MR?rh???<?a?C???JvC??#z
??R*!!?S?/??Z?H?N?oQWl????J????????q?<???9A;C&+?????gy???[?1C?a??%
?r?g???F8u?x
?c?,N
=?????~???j}?*???}NkM,O??h?????N???F0??RE??,(*??(?D?Z??ev?f??T?!-%P?$CE,??-Na?e
??
b
a $???0??_?!?M$?'C
?3?)??B??|1????????????zMu;?
 ??????nI???/???9???<?????
L??1???`8??*?!)?"M???
P???P??d)`?;??`???9?Q?Z??D???q?7?/?6p,???s???GT??o9=????,?$^[
?@?4??eQ??~?"?"?L,2?xsS??
??
0`???r!??Hq??
?
?j?
%???<?Q? q?
R?;!7??A?1>?z1?*c?a?????~?4)????S!??JR???H??&??	+???A??^?a?0?j??????/??
7?4cx???????%?W??2????k+????4
 ht?9r-????q????HdH?
?H?`??c?????w???????v?>?mg@?F??
R	?	???n^??"??@?1???uk~???wx????3?y??X???>???U2CI??1\?z4?UTw?0 R6???H?T8??I??s?=m`?6wxq?q?????;L?m?$

????Q??2?J?g??????C???:?X)2b3?z?S????????a????S??
E???_?V;?a??*?????h???cOn};m?|E4?E4>?R3??Cm"c?????????????)pl?????Y>?A?Kd?????{g??O"%3%?~b?2Q+O????FR?1*G
?V????[`??P???)?Ki??j;#P?%?	F??b(???]H???((???c?94?x0???eF?w?2?'??@Q? J????,?&-0?;H?3<?`??f??7C;@???%(XR;#\?<??Fz(?*????RvC??`x?>-?q???$??q(?r?-?
?!qP*?x?y ???Yq????"?????y??eU?x???Zz?M???????f???1??2?R?eL-JR?X#8??+?r??f?????V???\?j????m?d(?LQg	???E?DS?<"aff(??(??9q?>]a?`a?6?H???P+4?3?N???????E?"M?$???E?F6???}?S???h4I[Z?hS??3G#aI Q'3e?M???"wrNP?B7
>+f??
??5??O
???Y?fU??#;???I?H!|??t?u?fYOp?W2???

V??J at _?y?)JS??A???PW?DA?/?@`?`???`???????O??|?^?7??i?u?o?????????t??????`?F
??P? ?d!??KR?YKtP?f?|???O???)??????)E^$Q
?dJbB??BF1?H2B??>?G?z>????????
??C
?v???????'?g(s?,?18??????????></????*a??Q2??UM???U?G? ????@????????b???"?
?H?!??k ??=??? C`P??Xrb?M?V!HC.
?:?????p<??>??b+?Rp???*,<???????8?,?
??0?{??w???<?Pv=???H?????g???m????????)???8D
?????????????????????!?|?$??$1?????

?P?
]4m????????}o?????.?????+????/??T???hk }P???{?4i?^????9???????s? ^??z???????m?z^b??^????????w2	%Z??m?i???????n;?tL@?{?y????
?c?R??PD????W?c\???7o???fa???@
Jz
???
????v`&????}?????????3M4$?????60Z|?$t?m@?v/m?{????-?????N???zQ?v????T??????mw?}vyw}??3?k-?
???WN??
?
DB
b=??~"?dM#??=F??C@
??????a?YX??^?S?& ??????L??????(4a?ad?0/?q??`?YfYibB "F#??2B?h??<???D	d|??
?(P??
 1??
R?L??!KM3$	.?1?vBAE*RDEQ
&?H?*
i????J(?"(*eI?	?**F??"J??
??`? &%"&
?&???h??(?B`JfT?%)N??S????HH??T#IH?KMUP?D?P?
?%'q??e@?Q
DJ??	J?+!J?
4?9??M)H?"S3I at P?
?"%Q at P?
TD-D?U??AA@?P?D???D?ACE
?!CIAJ%0
@?T)@D?+)E RP??BD?hC(??JY?+d?+
AJa?!???&&B4?H??QC*1
M?J!@?
4?B?HR?@1?
?*?H? `@?R? ?,???
c ?)?T at aCAE?dP?	?a?5T!I@?P?J5????D??Bd?XH?"a1?!?Q??ELL at TQh????`(?U???n??HP??E(%?0?(B??(h;???????"?)+	2????u4????A??Z0?????R?`?? i???F??$?J???b*???()?"???"?!????JH	??+PL4fa??
P?\m??1??????????ET???3VFTPQ?eQTa?_F?d4??s???TH?I?$1?I?J????? ?j	?"????????l????$L?A
PP?)
(?J
?&?A????))?"???f(????&E&$(?? ?(?? )HX
"?I($a
R?
?L??,?
?i?"J"d ??*"?b
?*D?dM
*UDAAE	I?D?4?QLAPSQMDJ?- ?? 2?Q???0
DIC0?CS?5@{I$??fT#DS??f(0???1-P-	EI???'"?B???@???p&?)H?%?&??&?1?*??&
 ?(????L?DATHL5SKf+????1BD??)h?(?e?
?Z?iH??X"(C????y?????
?X?y?y????2?????Z?????S??
?^?/??5?!????=C7!:???2?Ra? ?????T???1?CHl????9}?)??????KdN??46???0???J?o???
??P??)
=$?96pa?$a8%????44??????????_?y??9f???A?e?H9??6?r??????d?B??O??lm?|0???N
????
?}?o???k?6?]??X??<j
d?O75
:?p$?A??
????c2r????+?v<???T?b?2?A?*??Q?????????j?=a?.x?|8?F????u??/??/????????n??????z???b1:??Y??Z?>52Y16????>???W??nrU?1=??0???????-[5E??~ & ???Q??WE??J??KC?i?\S?????W
Y+???R%??DG????s?=
?i?n??1.?z?T?Y???M??T?N??e?dok?'??P!?c??????h?-???)P? ? m?:ovc!????%i????L??JR???a
KD8??}?$%????O
z??5?!?D?Bv|H?5?:????\?g?6??2;J?g???#:??yW??x??Vs??)????g??Z???{?$??F?m!?????cU?????????H.j}9??l&?	????h?h??+I?2A??HlTt????k???8D??Lp?4?e?s?????zu?1???'??Y?E??!~g??*`wx+ ,c`&??5cY?;?O;s?o?8?v???\z??|?aH??F?"A????, ?+=??x???Z?&J/????0tcP?K???$?*R??$??6[??0`???????>?8v?|?;???D???$G??????s??'a?%???[???O????v}/o???Z?_Ht5?2?t?%??????ZSj2??vkd#$???A!!????;w?~g?????d~????G?y??4/????l?q???Y?h?#??
???MBj??d?r???f??r?v(,??L?<????dg?
7?4???o?S?&?W??WQ?????/???{|<x<?g[wi?`f2M?????q?]??_gk??e??FU/iP?y?I??uvo/?~?T??y???np?[?w?????#???????????q?n???????;_)???@?:??????+????'????$$a??_KqF??/??k??G????]-[????3?
?9L????????tv??U??.l?^G????????y???wd??Y?:?z?hm?m???5o????/t$??????T+?O;??>c??\?s at 0CCE???!/???]UzI?K???0M?????#??x???k??U?????o??
???y/???BO?z??7??{??U?d.?p???8???o?A?l}Q??Q?=I??eX9Q?U??Mc,s????>1??????8q??????	??w?B??w??tv?&)???U?_?^?[N?u:g4y1Y????s????:????s?%7??[??;????n?????J?j1FvRwiox???????1???????S?Z4^#???]???<??'0"a??O??k?a??Y?q??D!?J???\LOlj???<?t?b?a
?i4Z??r??~???q_????Buj??|)???xfV#??5.	?|??,?cfD??q??????Kl??Y?A?m???L?3:??
4??]?+1?"?|??N&-F???)%Z?&?1?|???@??=2<???r??(/?????<??????m?^X???d????>?xv???b?8???????*`?(y?????q>???x????s???*i??uW??
A?#?B<??&????????P?c???????
} ?HH???$;?hr
j?????v?}?pD?DU?7??v2-Dk???$]]_??a\?z?o??XkN??bq??nns>11?>?D?>??)]=(K?C?\?P?]?#?-?????S?????(???O????za?=l;?m??#?????d??|??

k??|????|???????5)?/_??????rh?????;@d??A?I??Y??
?i
?&?_??Qp????{???1?&i	??;t?c????+"?n?g??N?i??mB?9??????2:/??
?qc????5+"p?6Pr]?I?k?({"3?w:X2,W??>???t?wu?`?z?[M??*<x3?}???WQ???5#????qJ'?????,??y?n?2?????????<5???-????y???E?g????B???????j?$?I$?[}K??F???fc?????
?x,???j?Z??????}I?loR?????x???j?)?k?)J?j????}UT???
??1?N?????m????*?*5??
??????Q
??+_2?p????*??w|??+?)Ob?^?l?Jqd??}??%`?W??0?R??V?/"?[m???????????v???	1?&????(N??C??????????j ?f?
???i3??*2??7W?????????-U?????T?? ???????.?J??k?a?('????LD?R???h????????P???_??IW??f{>??22/???B??k?????%?<0?-?W?????~9jv?=ux?J??????X>??>?(?}?Y???l?}0??A,v??|?????????#?G?;B?q?6?p????L?,?z??2Lv?"??b???cIt?'B?v?Gr?-??e?ZH????yPtb^?"?S?> ?#y????:?i???{??93
?d?%???B?????pv??C????L?|nZ\?v??< ?/?5p),??????F??Tb+Y`???z??l????oV??!?_??t\??^????????2]L-[Z??x?????????]>?%?BI$?!??c?b?sk??d???G ??4z!?????
m?-?d3h?}W??@???
?1Y?=??#??
?{???6H???P.?;?>?????C?~?~???????l??gd????sCd?e???yb???8L?0??P?:??2|??w0??|#???noB{/???!???$?AS??0?????l???oL/A??s??bd
4d}"?!/?zO?g???u??
?j???$Y06o?j)0??u???wa??]?u;???k???;?&??7???Z?]`????!u?w?a????.I?f??S96!'?!K#S???oL9us?|Ns?S?%x??czZ?5AP0??(y?37i?'??}F??A???<4?l?m
??l'???3???t?Hk?q?
???9We????n????3??Q??7?N?P??x?????6,??????Q
n??~2u????2<o=9???X?q?$??,???x?Q???vbZ0?{m|>?????i?:g=q#wn8???`r??v?Y1$?uN?I(?????y??????Q??0{a??y?n?FwJb?!+2?B?:!?????P	XY???????-?g6???M{;??|????j??????g?=?H??0.0?g?/?/??L}??????o%???e??D???H0????6?5i
Q??7F<?I7?wO?$???}???c?????z4ml:?&?Q??`)????;?U?"n?O???K?Mx?a??L????~b?l????(a??????"???{oW?v?]?????\[??U?2?0??Y;=J5?er?3_co?????&??Elg%dM?r??8Pl?E?3'??pe+???6Xdok?5??.??????@?????Q?2c?9??@??!??????I?d"???D??jC,W??3??I<??/'>?]yJ???6
E!$U??fQ?P?,?N?????8Ma(E?6Ga?T?6(??H"G$,??K??p{????^??Z???k.f?\5i?(M??v"??#F?i?D???????3?J?8????v*?????!
 ?R??{?nr??JFD??????d??3??jMJ?}V(?^???W,[?R?e?m?Xa??dY?????{'???0?C??????????lr5??3OoI?C?sl+?[>???????hy??o?U?????K+??\????2?C??+X??f?O??????ck?Q??a?????h??z'???}??Y?Jn? !X??s4??8??}???H?D9P??\???|/?
?_??z??????-#U??/:`??jVE??????k?9??xn??rCm???l%??N?????M????S??#{???i|?f??'g???5??????hcgVn?????d_?~_
7?R?[?CT!<?w?M???>???`?8??)'??#G????????1?;??2???{??M)??q? fB?Q?Y[oP??-;K?z??-??~?}?9??????|J?P??`?(??xBY????j
????l??]?co7?A?/??G??z?u??y^???;??_5R???3?@?>?????3?P?]?n?
x????M?x:??lz???C?0Q??li???Q[??6?
,E?????L!??i?M0?H?q??qH??rU?9qm??#&>??wg??????{?cz????GHJ?$s????9?7??h ??_??5???6B
j??h????Bd????? ??)??h?{???t;?"????`???M??u???'?y`?Sg??(???fF??e&??q8???qG?y????a??????1??.???%G??o?+k?????p?Cv??$???0?:?&<k???B?j??????K{?2@??'??-4$???	????*?
???K??X??dXU??G??{i#???9?9;u?\U?>p|?KA|#??????5?*?0?hA???Z?+T]?U^z^G????[??jl??ff3??/s???h??g ?????u?????~?/e%???/Z?3?{o?g?f??Z???????cd?3??.??"??7?*,"=?u????>?I?m?????N?,?YHBI,wv?????<?D?mP??L??????????8?f???;??TrS????R?S9Z??^lB??Od????]_??l????H???`?8?\?.?O??????
<?@?/?AP????yq?N5???????
????J?3?0a???)?`??????(????n???]?P???<!%HF&??ibv?/+U??k??E?_u?????&???????j??u?j???e\V??R5/?b??B?{9R????F?????????d?8?_?l1?H?k-W?????5y>_??U/?????*?oj???cB?7?1l&????$-!W-?y?
?w??E"H?Q??|?&CQ?M8?)??????ro?N???91?????A????}(?$??EyF&?XVcVp?xv?7vLn?H??=??>??W??H?/??h<y?t??<?N??h?z?d?&?*???????+?8E+1????:???
??*?&^?j???U2I???@???????H?q??H?2!??9#???
r?0Q3K?nr?????+?b?/??]?/Q????????Z5z???$??!?u-G?$?^?%?????[
??	8p^_%E????)?d(?r??W!??L?u?e?iU?b/\?b????O?(CE
30???VT1??VC???s?@????^0????C?_?J?1?b?n???*??e:?`?????Q?4?,8?5??",3??7???????i???G???
/?-?hVE?1??	?Bt???fOr+?z???>a?;Ko?B??.f?????7?/2?q???Q??^}f?
???Mw????O??b5r?]?^2??????tk?f?wA?ay~?:BYm????9?Es?l?????????s?????bg?6?????????????1?3s"? z"?tw?,PX
&??
C@?c.??4?b?p??&??1??90????y?rF5w?R??JP?1??aZ?b?????1?a??t?	%A????uv5`?%??"F???	*	u?x??&fa?9X????5??4??|????L???m???_H?i???B<?1?c?Y??$???r
??|????l??OY^;J???-???rIf??????'????FO??dAV?R????V????!?Z??????????????m?f?$,-??~U?
?65??+C=??????????y?????+????
9C?g??3??????j??Lb???0??F???d??&ZP?????U~??p?1~R-?????????XLfk???"c?E?1ub?HQ`q??9?
????&?W?Uo.#????X??:??.Trm??2KR?vtP?m????
?+?7?????/7m????uX????#???A37?7??????B?#bgT?Kuz???|I+???|1?+g?e??????^?^?G,w5???-I~??D???????X???j???????Y?i?s??]??5??a??[?+x??H!?e?
??f???k1??	wQ?2~???,f)?'?-?Q??????;??:?[??????g?#?Q4???$q???N???X},?oBVC???i??:????	?????P{???????v?????? L?L?????C??
?P??????%???p|L?QS?aBH?{oNp?2Zr
?.?nn?	?	??I$???Y?_?#?~??k?zb??jo??wG?y??n????*??9????QN????e??+U?r{rub?t1?el}_?y???????????>
?$V?G???SUn??t?*C?'4?0??v??_?5t?97??/^VQ?t?^OJE	???????o??
???o?:6???0?T:?|?7?3?l?
7hm???+<?c?? tM:q???L??Lq?Q???gnN???i????n?Y??~????}?????????
~2?+??????o?js?Z?`?2?ar?*+?:???l?????96W9???$??I	?!??E??'???????]???rb?Ll??e???5(/F??lAM???o?bEp?|?6
? ??|N?%??.?A????/{s{?j?~?,??@???2u6??i??;A!?????O`jWx?J,?!????H?Y??$??"J??5??xi???|??(????N1???t?\?????-????????}}?B???/
D?bbO???CM.??????????????????f???~m??<?W;??f??????p?????E???????=E??????@??f?/)$K?r??i?????N!???:c??*?L0???????*?U~???z6????d?Ctl??z?(.q?@??}N?m??U???H!?A??w??=*??x??/?gf???&H??J?????|}7??ko???
??k??o??tO??1???a????s????p?G?1>"TNj7xp,8<??;????PH?????4?

Q?-?uI()???7?z?B?)d?jW?f])?_/??~?x???q???5?0??
C??pV?<??R?Z4h?l$?.??M??????8??ER???jj??k???Y?0??]?????P_??F?Z-??]???+????I[??W???U.??????????A:??y?:?S5SZ??B^?@????L?q??#?i?9?????zC?3?_???????~?kUUUUZ?,???3++0??????DTUUTZ?#3#(????????????????qf?????????U???3?f??]PeeUXEDTGK??????`OAd?
+??6??:9???d?6?]?'+[7/h?=8?Cm?d	$?BJ??j???Y???lO?1?4?'t9\?v?A?u?kO?????z????W?#CAJ!??.(}?J:b_@w9P8???e?????[?~??? d
=??@?
E??DG?a?@~/???@??<?x|Mg?:;vue???cf?????}??+?????????W??8???&??????F?}?gGT???r?>??+,f?-Vn%)?z??H?Z?5q=??(?J???????&??????
??f??(??$?a??"
B(?)???X???h"")h$?????a??????JF`???J"J"J???$??2J?D?@L?AT*A4??H???4???
J?
$??
???H??&
??
?0
BT?AM#04?????!D?B&$E?1??/????n0?'???m???????GY}??)??zu????;??????(??B'g?m??}{|?0????c?
2???h???????o?$??u??M?
?Z

F?????%?
Z???b
I?)"??(???????&)?P??	V
j??????!???C2$$EC???i?JA??5?L

??I`???B$?`D???D3%4?@???&?p??@"
?H,?Tm?`8a?????????C>*j
"?Q??5a?^<?,o^|???!P?N?w???j*ujT???c?z?!?	?2?F?i<?@?
?
????????k?cW(&?b??3????
=}x???r& ???[0\???6???xi?9[~??Zb?	)
$??2G?`[??C;g?*?Z??d??71?-?2P?	????=s???X?o??c?????4?????
L?f?????fNNs????????I
e?E&Y??`SY??EC??????.??&?fcrS?9$U-1$?A?M9?f8?I5IX???????_2??i?l:/??Dk????$J(?b?%??32 at 3????8x3??t??*???
m
`!0?bJ?b"~????,F?????????? ?'?B????D???,?
L?)rh)?7??D?w?c	??A????8f????2C|d?j0k,????
D(?8H)??d??	??????v?\_?,
??g2??p$120
???	!N"?E	?C? ?qR???h)(@l!a???)L1?H?JJBf(*?RR?
?Re2?b???d
D????$D?G
?HL%0DC???
?q??p??s??i$??%,?7???ys?P???I??Mi?1J???5.???kC
&b??X??????N4??*?Tm??!?X?+#$?`<tg??hY2???;??@?,????I0K?!
L????m???=`BF ????o??<?o??????z1gu?=<?t???}n8????{{??H???vO???]g??&?z???????=?T	p??????G???)r?;IDe?)???F?Di?????_?R5e~n??
????:??????:sb?????-???0??????<???m?N8El???@?=5;??,}?}z_?k?Y??6J?S??
q?W.??k??wI?????S??*?IN???F?=?`????D????]??J??cLv???????O?8x,uF?3?]3|N????/?P??@???(???=?c?a? X=?A?L?`?9??2?????????*???n?g!??????9f?????:2:C?>R?)T??	7d?&j??[?&?????-kP????c??)?b?]oZ????j:??4oS&?r???n:\3??-?:??c@???????Fe?5$x4?b:?0N???RFM%<???Q$;?5?????LC*???5??<+
???>?(??0??ZoG?9???zK????=?_Q?????j??
	J?`?<|?}J>?
?sV??IL???L1yE???q?2?Y???d??\??,?%>?=r????Ro???;v????J@??:??eZPm~
??/A0x???.??W??sGZ?F5????Y?;?;^wk????ui?????j???(}??h??,?J?????Rr???u????B??8 ?&?%???g????Nd?N?CKe?Z?,?j?f??5^^V?>?|*utc????H??=(/`?
?N????????a?4r2??u???S?#1??????}H4??????3?([?nI?Pm^??il<?=?????TK>T??n???@?12?????m7U?Fj?30?3!	$?_????????????????d^k???"O?<g??#??N
???kLM??C;?X
i?"a?!??<?z??l8????mP?lm???D/?c??m%??2????? ?@?mU#a?&1$Y$??y{?xz
r9?????^?off?V@??$?}?'?(???0?
?8?}D?:)???@9`??H??&{????(!??(?)?t???
l?o?q??j:l !*??o?k.l?????a?????`?^6??E????a`?{ ??~?&3W?F?D???r??b?b(?????<V??y?Vx? zjN*k VZ?????]+K??[?~c4?Hh?????? f km	A??????o`X0z????'o??????
dG U;????P3?S=^?????@Z?Q??JWhKs3
Wb?GX7?E!^??.????|yo?"p?Dae?
DyN???I??2??v~,?
?BKH,4?IX??s?aj?B????PdN???^}??^?i2e??T"3DO?#|j6??>??*@}?????LT?fB????c??????'?>Tk{>?????X?1?0`??0V0L????p"?o
?C8?{#??????3.+ 	?
n.??9?????`??6?`!?2;?;? w?,8?P?;??|GJ?????zO?Y?"???A??????5i?M?W#HNG?????E?F`??1?1???L?????y!s?f????1??1??I?????Eu?1a?????4m
o4?}?N???}???????}K?)
????7|?p????>?pD?q?l???
????
e?????J?t@??_?9??RU??+?oD???u &2?"Yk?\D?<cU"L^???2??}k^??????`?!?
^nA??$?8ytO?????9
???????%	?	??????z??h[??=??J
????D?!?Ge?	DRHP
c?N????BBwM"?Ci??z?&F?0??Qd?vo???)P??A??
?yJS?????C?+?O?F??p??.l<??|?t?zU???x?????}??????pM???8??{q??????o????.?g??????????e??69??5??q?/w???QSR?N???!?d^?&<Vt?s?u2G?|#????P???????[|w???,???/6?f?s_??Z???????8
O??b?3uU??Aw?tB?;?_?vM?za1?????n|#??F2c???e"?"???2??P??;???reT???x??Rs>l??
!~???wk?
=?@d{h???N?v?X$.?A,+?2???????
?????????????J???2"??Y??
???	???(x????yfa ?U$I?j+??H???f??*?j *?)fc??'??Tr8$$H??4?7?F?.??<??}?s????xr??????JM??????}????]
u??;??l??8???iU??????N?/?????E??}???????)??]???O.y?%~?A?|SB????U?o?E???:?:9B?r?u????}?#??????#??h?A?|~???fZ?????????w??????S??]/?????q?3s??z?????U?*i9>??????r?*AJ??o??D???F????}u???w???_?z????l[?z.?Us?SN???W?5??X???g?u???M?Xkslm???H???????o??d?W_?|?l?]?s0???]??O?]??<!??????j???,[?A??r?f????????????T??????w?~7??1W=?f???:???]En????z??D ?????funH.?4?0y#????6????A0_E??T4?
????????5W
?w??)????c+?C<LW??B??w??9?C?i|5
63??<0?<??[Cj?
???g??
??0??!???-CJ?q????5O????|K1?E??Abq
??:
??,?X?]q?ar?l?k
???5???p???US??
t!G?
J0?p?;,\z??8???????U????7@?vPe?s??	??1g??,???L?	?????B???k?4:??]?}???@,?v??b@??g??va?Z??`0b??MLL?|G0??`8H?0?????1?????????Ek???P[CtN???????pnQ??j?%????;?:	z??????`?I03?gI??1????Y???y;?h?????O?V?B?????30u?f
??t?;???'86W?F!?0??????7????
QCw???H?	?;??a?K?0?b|=D?`?j??F??DF&aG
?,4?#??2????Z?y??l????h?p?PY????Zg??(?G?????d??Y???U1	????3&Rk??2L??f3
h??????E?n?5?/????Vv?U???????#Pl??m?????????Jp?^?{djV??Vtd??sLy????DX???????"?Vm?G%???!?
? 7?q
??ZI??????|????P`b??t???l&?Y???j?R??6C?x?=??C?4???g>(??8:a???!?k??U?|??0M????B???????Oy??<??X[????5G????`?>????`?`BW?(`[B?q8?1??+
R?n?;|:k??UL??@?B3S
:?&6??B??*$?
 ?a????????
???z<?9??q>9??2???95????9????9??&!?+?????z??r??????Q#?KX?q????O???????X~4????,????ZJ?`9?,;??@?
???????@??o????Ga??0V??6rPj?3??'?7 ?@x?-??kB?????5???y0?CBC??0(?
??????I????(?j0?=????!??~??>??_oz~?????L??~7o?{s?3?m(~?`???b)??A? %PT????95?@?j(??*???????y?k
*%?H?f1D?b?????O(?J??????
?????M???r?C??o?????K???,9?`sE??@5????;-?-??f4/????	?4[??&8\w???$Xs????K??r??I??x???????&o??z???O?~?<^/???????ps,?s=?|??j????M???bRGA? ?*????????r?
(??4qLO?[,Ly???+?`hIy??JG=????/??n?Z?a??}9?GC??0???&"=+P?zf????_&^@pr?????E
?I?eH?nUFy????y]n?(*5X???-??~????M?N??m?@mh?L?$d?????O??=?v?N??(?:J?M?<.?q?$?a*??q???
'??VW?????c^???????1???H5??????U:1?G?|6???\?=?F8?*?3end#?IA#??yuT4*LKt?'V{k?k????????????5?"?C???&#?,!2??9w???????????T6??0?????"[x??v~???<?	????O???fE
???$f;?????3??????& ??V?|\=?{1Gw???~>
??u???"???2?M??~u5?>
?X>?40i`I^2???
&??? 3?^?B?o????y??+??80@?o_K??????Yw?????V#???'??G?JxO????]5?h????U;Ov7????W?????e?;?>~]/?q??F???
Q?W?T6????llYAor??"??n?Z>??6???f????/?bX'?(??????m`????????}>??
q&8[?u?w?]????2lR?g}?|'??K???:)???????$e?o??/?(??n????vv???(z????? %i`??.?|?.??*??;
?m?.?3"f?
?	 @?E?????H?`???\?4?$|eY????^!?Q????
^F??F?&??>3????K?
???$"	???3????Z??I?c4?Y0?B??4?Md8 at Ye4????LZL1 ??Y??|?????n???l?v
:??D?F?(C????
????????Y$o?i???=FG?,?i????????]???S?r
<?M
??vO??????! DS??
$(?dT
T??????!5>\????W4?3!
???e?F??{??????A??8{U??8???xq
v?{+\??p???&t?7v???I???U0?:?K?U?????5?@5ck?!y??1e;t????x7??y????y'3?[b<??eE??/????cL??l????B^S??qK??rI$?I$?BF??I$?Gww?/??`KD?[????R.nL3+J?lv??????qb?";w????U
?F??Tg??k6?
?}??r5????-?aC???????"i?!]?Y???.?S?d>_???????????Ld???mR-??e?V?????V??{Ww?K????e/2??!R????aO?h?u??g??G?D{??5?D?Cv??c -?e7??]L??o??ph?P?%??W?????O?}???????7<?X?4???G??|Qm?3??D%~H??p?a,t3??60?oc????????z?H?`?T??)Q??5&?????A0f?	??{6??x???J??
K?}wU?}|j??}EG???>??H	9??L??J2?J?/2x????3|??X??2Ln<?K??"8$?1???????????????y??1C?|KZ?"2[*"M&Q,??t??????|???s????}?ABE$RE(Y?v?8B~?N???
?E.???????
?Q4?M|????$??????
M?xQ????f??&B?c
??:??F??k???{]??B~+????,??+l??l?u??I$?I3??kZ?r?2I$?Nk?????%???????z???[d?I&,Y?m????3?????9h??????x&?G??(o?|????_@5L#?zC?9??b?Bd??wf7N?)z?#k_????X`????????*???i??,???0?,?M?B??]C
?v????????J*K??\c??R?[?j?V????&?%&0?J????G????eQ?GY??P]w	#V????d??Fl??Y???(?+0,?w??._ML?Y
?hP???[o<?@|?aGU???????c??>??5J?? ??G??9?&???????????;?r?>b???? w?<m???,g????W?G&?Y{??C[??sTv\?X?
?????;??H?[
???Tj???^??lr?5?+a??%=jK??%d57#????"??:KQ???????F???U(T"?P?VNl??IW?`N??????Y
J??6???Ju???}$???[^?W?????????Ye?mzO??O???F?lDYv281?~??b?[Ph?*+s??
?*??-??y??kY???v??k????e??jg?M??F?l?,?yI[???????s]??$????g-X?>4?U?Sm6?'???8OX??O?????
=\?9*?;?vQ'M?'Ye?Ni)?h??N?
??w?}\?M?h??Q?] Is,N??!?k??F?	M-??!D	???Y???5?S[o???K9F?3???{???kE?????B?V??????{??euPxA?m????os+a????3&????(ye??9?}??8??8??`?pU,s???o??C?????x?i?"W
5wc?N?4?9?
H;????1`P?$d?M^*????yz??G??f???&`62???0????I?w:?
<?
8?"?????NS:*?z?????E???G?.??=??<?}e?,f????o#}EXy?s?G5[??W???,????}{?+??2?J???9?s????$
??Ai??B???3?@????n??0?????7????Qes?????a??????\b??Eu?t<?????x??v??H?A?;???u'???P?L?J +
??;3?,fd
V??r5[??Ih6??q??b?	?=%??~~???g?}>?/????R???????`?B??s?a?f)?J?6ac?xU????1h?f??A#???\I?W7??N??.f??1?%?(.Ng??????x?e)?pP???#,':??\x?A?mrwT??~?,~v?G<?.[???0#??????a???"C
?????f?C????MD??g?S
???L?!T??z??
???BX?K?[4J?t/??M?h????
?I?>?f??!???,?H?????u?N??X??%E ???r?4???}t???z???????b???[bX??'4??????}ft????????Lz9??o?PH??!?R?Gg???????????C?L?'fb9:?A?a??X???*?????+?-S???0s??7?Ni??2??i?f???i?Ou???82q??K????B??r?`0?p??T?Re?^??t-??p.\f??.?*?s??`{??U]v??
c?o??g1?|{?f???m?7<?2jR??4?????,??u2HI$???S3?Fw}?9?'L?<?%?????m?awM?E???B?`?H;34<??(j????j"?D?Iv2?~?=?zMs*?U??6*|;?????f?f???noU0F????????l?*X???5?w?????xBH
?????B??g?	O?7+?Z|?+?a?n?????]2	Jl?E?sD???$/}??xm
;??7???{??????~?>?# ~{>l???3??d???6ALB??u????N8?%???d?????l? ????]FL?O?Mz?9*?<B??*]4	??-???Kiv?X2d?v?f??s#????1t??ce??-H?v????kp?!X|???$?????S?J?ie{??T???1L??'????]?RQ9???2??N?w?????m???l??~????{?m??Q?/"?3????j?_?p'%l??P?u??&s?#????>7??$a??D#?g?@???|?????YXl???7>?o?
?=???}? ?0}??9??V4
??????????????w????=es-?}?d??i???x??????(W8?/?Yb??V<??H]????G???????Y?6c=??~x??f=o?(?z???d????e???l??N???F???9?1??X??uz%??>????5\M?w4?x~?????q?4?r??????T??/7??????_??>X?
t?\?a??a???????????/!?
k???????|KN&52W??;??c?#5w???@?$3T2k?8?AJK??myA???<>s?Uyrq]?T?a????'???l???nff-ttTP?2*7???t?(???A?p6??rI??!
o?
?????x??6>P???D??&?L?e?_c?OM???h??m??v??V?*^s?4???iO
?V???j&(-Pi?8c?~?C?@???_b??&N-?.??m?7???Z?xO???W?HQ??L?
???h?C??x???Y?k?}?>??,4?(?H?N]
???u?~G	1?????w?.H?l??r???'+K?n???J??????*Z)?b???W
?MB???Ir?^>?3?,??:.??/?5+:G?a?sN???8?8?
?=q#???5S?J??] ?LFV?D????>L
??????$?????ua??g??'???tZ???@?u+
x???Oq?<?7*0gvU???[,4??g??|)??D?s??5?k	???LQ=??=?`l??>?H????,?????s?V>??X'?q,??(?
 ?p?????
???h?6???F???@X?XC3?
E??b?C?U[#3?<Gj?H?H?dZ???h??$???-!?????"0??M?:^"?13??O?????L)?F?s??\?;I?^???;?????v???x???A-?3%e???,b?X&?o?9aY??P\????^?A????????ej??T??G?|zz?????r??ncK?Q??L??tr?~b????s?5I?????~_?k!??^??u????2??R???A*?WH??????~??Q???
?[?tO?(?R?????	r4U0b?:??C??aU]??ac ??]?????,?????.???????l#E%z?1Y ??A?????$EG=?.?<u????w5?b??l?e???`????_?}??7^?A-??-nH=?b??????0i?Ce??]d?U0&<?$=-?R???%???N?r??h'?=??2D??:$	???,!E?2/|??????L??a?$(?i??N??i&?=????vr??e?~?????yX?3???RYN9!??(??C-?=???EJ?&n?V?lfD?C??? ?Z?
??4?%?3*????.???y?c;>???2???F??(????,l	? ?d!C0?
2?P?0A???Y?=??~}??M???e?TK???????v????Y)l=MU???xT[???%?l????.???L"????UduVE/=Dz~	X?;F#??tf?$??????O???U?w???UP??}m??_o3??536????>Hu????.Jp????(?Y+???q????qW?/???????H??P?Z?+?=#1??Xi7?L????QIV3l??B??wb?bB?.??m?k ?+Bq?V at i~v?G?;?v???YXIj??0?lJN?H?2 1=Z?Tx?U,4l?R?'?7.U
?[F??????=j???ll?????
$???pLpM?)?e?F&?c?4??#P??4?????V???s?=}?[???=????<
???BI*?b???H??????g?????????g6??!T??
?x?h??y)yw??C???QJ"??}?????'M?*?c
??/???rS?.bq?C??:???B????????%?`??hz???W(X??????J???1???)??E?ew(????}?}L?=?e????=?????+??f???TJ???'U??XW?"?GZ.f`???'k?m??A??z?V?A??	Z?	?P???D?=??M??:????lr#e??&??K'*?U???.P???4?m???n??0?9?X8n?{??X??<`J?8?wn??@+??1????"Em'W???nW?w??Tz4?e??"??(A???2|	???Ps??U4w???r?6?r
?????*??C??n=???)????????3???de?bV?&?????+4???[<??.?0?aT???^?%M&?T??

?A??T???[?(???3?>u?1?????rJf???????????t!?`????????
? C>b?M"5?@?|??y??a??????5u??W????#F?2???+}\??F`??F?9????2I??2?}#cm<tZ??llS???vy	?SU???Go?d?~??????:???T??4???a???$!?	1?D?&_g????=?,??)?V?+USK????g?NI?????@?:	???z?\PV?N??5?????????`l?????q9???|??????????5?????W??n??m????????>??Y?m??qosC?q??5Sa????4?
1?S?p?a1lG???r~^l?i;ST_???????S???cwfKED?&L?/S;A?NU????0!FX???????8?q??kRV@??<z????6?Z??k/sRJx?@y?!??E??F4?$di?`;???C??<$ 8i???????/???nU?????i?vz??l???*?
??Y_?OM?[*????F?el?UKD????(???t]8?$?l?w??i???M?J??WBH???#qYU\r?b2?ZCRb:Yh?&?h7?\?02a?9cdC???\?d`????+[ ???5GPK?M\????l/?,?ZN?h`yjYz?z??	?b???rd????[w?I?T??D?9S???t]=??4d?
{^?0L?"N?g?bd"0???????A0?u????kCc3???_???d??????????%?wX=?Z?????$?r]??.:
>???r??k?q????%)???9?)????l??}C?Z??????????\*?I???$?V???~?:???b?S0b
?D???^???a?pR?h?H~??`??Px?h?'???X?qB????
?	?p???:???~s????I???~??}??#???????es???q??,&
Fh?A5?9 at b??sAG?????1?x???j:??M???e?????h???W9???R????f?d?2V?'?q??0T???94C?s??2??$????$eM??k5#p?a:+?y!?dqx??#?c??e?
]b~r???'i??k=m??G	]iS?????DP; ?AJ+YCj???]??&?????1?Y
Y????6??pLL'?,???}|v?C??)(?(??&?????\?_*??B0??OyT?/>??(U??PL
??	???&???2????"?ax91????2?\?6???c????sS??$!?r???;?????T???e?*1?M??????$?SD7?o>)?QLV2?C?
8?p???*??:=??
??n??
?P?$?V??i?E9LI?T?,?j|??????????T????ug^/??>?+???c??{??#0XY??#?????	Z~*?1]F??K???1?*?%???c?H?? @?????#??=k??sr!??/?l[???g???+?@???62?X??!?????l?060??m?OE?a??=l?:*?@??;'?~)??t??J??????4?????'??g5??6BM~???!??OQ9?b????:qq&???@	9dp??????"9??#?,r?h}???c??w?<???e%??c?fl???????m???|gX??;fO??Rw?3?w??'H??????T?1<????k????kp???j'?Z???m:???<??Y???
._?q?<
I?????*pe????O?iY?7???c

?d?B'(?l?b;??sy-
?!4??????9B%????????t40?Q;1(th????????7?j;^??????a??L??tH?Jd??zt??'?bE?u?O5k??4?4?????F??q#6????3M?_\?.??A??p?z??a?????$??4*?s????:?????w??b?s?VH?+?Zd]X&+h?=??D??iI?)? ??*???L-I??l???i>???????yz???0D-????N?
	????N?S?m??KsZ????]??Q????6????p9?<j_?Dn%??'&?????????S?7z???????U??4???S???Z8@?W	(d??g+J?V?0C???T??_Pq	B???"N?o-?Q??'hd?N??F????P???p??????'??y:??c??l?:Z[??f????????{<????>???W????T??+`?0u1nvl?]?$AUk??N*?*??????=%???
??T??`?aa???a??????<b!??
????????80\3)H!_??&??V???A?+?i??i??aJ???&l6X???s????Q_??<5?????2b+?gm??U???iH?????,??]??1?YYj??7???d??1???Ne5yR??s?????	?FX6?Jq+LHi6????)?????????3??f??Nv4j?sE]?}??\?<V????????g=?	?*n??o9?Ak??,?^?2???M?????3??Zj?~??????aO?L????cr?y+???(?n-?q+Xf?/+.{??7-

??_?a'dK>w??KL?????e??g??	???%?t?O0?
???u??e?%x?7??Y?????{K??4I???:?93??b?3?^????V?????A??8?[?T?
|	+???T????ho??0
??Juc+x?nm?}?3F????g,?k
??]RI",???ioj????*,?@?F????j??J?\Y?????$??????;RsB=f?<??%?2
??X???,??ak??*h??=:?j?*z???????W\J&????????,?!]N5?A??1j??@b????#;2??}5??????3?E????????g????gT?g??????)L[???????%?=?Q???R?j???v??%?? ??<V????&>i???a?_6?s?9?????????M?	?I?6?~??[??B.?????e??s??8
??? ?&g?"???V?????dS?ad????tr??7???gg}%??s.?z?6??8VD?2j??R??s3??Uc=mv}S??2A?+???D??Z>?$?Kq'?=??????T????V?%?????Ka6V??(,??@H!?
?~??[1?@f5E?Z?u??6?p?
7?`?ppSP?	??y9?Iz??f!CKz??E^?/&h?n??em?Z??????x:??;?n???_n`?k???qF	???d*4s j??y???4m???]?CI?h??C???L?^mO{w???????????????j?C??17????Vb?T?!ES?c??[???l????p?*???o?W?%?mM?????[KY???P??f?
-"/G\??y?*?=?&?O?4?;o?1?|3i0D?u%??
?+???a?;???d9j??rd?u?T?????-???S????!JR0Y?zo??
?0??????Y??F??'&???k??Qf{??'KS????F9?bp;w???h&!???<?-<W?%MAO"?e?h?m???w??????????A?7.;e?$??C*l???n?-q?2&??T?!hV
?;@?D?"i??N?JtL?RC???6???.)P??fS?r???????_?>_?q????s8r(8YE?Plcr6?y?yw_?>/??hD???65a?5
Xp>r?bKTQ???f??m?Sm?lr!?*0????w??p??S?2??????5?????XB??6????i:???C?????	?
r???"Rq????ys??]w???7|??+a"?t^?+???
we?:?;????
_j???`!???h:??\??"??t????^?LE?Txv?????ah?5`=?0?F???YH>Ye%??{??????j?so?M????F??}?+??????t?H$??{??|?hh?d?} ^???Qy??a?????>???14?A??U
???X7???o??????	hQ?:?b?M??>2y?????~%?gg3?FWjv??60?U???????P- ???
oc??EZ~????@??s?(????R????-?,?iID?^8??????????R
$ v;???]?_?+?????8???S??	?P?P?q?l??R?1??TbV???{?N????c??W?H?p??{?@???n<IX????)??>W????b"???G?<??[9????????????i??6n%?
???VB~)?UXE?G1??8?????????^T?? G???cP??fk?^?>p?$
:??l!6mi\0??????#<?!?e??5(?U~?w?c8?0V??@I?}?ev???yx0u7????
}ri??????|#LV???r??mf???W?)??????bbv????????_??s
???F?B??
[Y???m?+?7?fg?b????????????????%Y2???y?9??B_?e"x?'^???<?O'??p????uH?"#
?X?n??????[???????t?0???Vn???kP???+"1???[
Z?,? ????t???Cuj?eI1?%N~?s??LtV?=+,ZG?"2??H???X?N?VC??m?0uAZ???q?-e?}??{
k??u?P%P?t`n?ez??~%??9?j?X?1[???1U!??-?
:?h?o?G???#??]?x??AHV??Zz?k?_i)???`iIB??\????????US?J	?wYC+???
???1??>??,yG????z??u?#;???qd???????????????,?1?V?)(N+T8[x??D?j??U???z?F'??p?ak??Wv????s@Z?D?p???R#H??m??	??se???)?1??+?%?????N0{?GR!??d?8"??)
?C??prS?1?^|???*jrqv?t?z?GH?????KE??v,#f?"_GR?%A?<??X???r8??vv????6????5]l?bN3????D?HC???O??H4o5]?Q? $??N?e?A??x??	+e??XS??2?vY??|A?E?bP^???_E?i?/f?7??3??oD[?q??6????P ?^?$h?=?????\??^C?"????yX	Ev2W??rR?@?m?6r??c0z?B%??????
|??wG???m?'9tiZ7???7MM????????z5??????]gQ???f???-?_8??K
Q???v?8V?|??7?0[???U???yj????cl?)4??d4?/]???L\?????Dv+a?l?o??15???=R?a?n&?=?
#{"p1i??"???3`?3??u?????]^????"???we?u/jk5????_j?=E4A(o?(>$t?????????3m??zh??
?_e??????(h?3?|?2?h???V6?e[jV?P??T??*4Q?
???@??????????i9?C?w???=p???\??27T?eWr???l??l??:1???&-'c???m?y~??(???&?P??^5??
A??x\n?'?9'`tRjwf?p}?
(?O/>?????[G??0?	??:8(9?$<R???_?q???U"A???????M?????3????L?yb{l??m^??y??&h??^2?????v9=fy???:q??+'4 at hd?%{^??B??V-??? ??A?\??,?c-
@?`?>t???v??[
EABFD?J??Z??????y`??? ?<S?????(\????(?a?63r?pFi?97{?/?k???????y??f0??$??X?^?/?
?????????0?.1???9P;?0??<!^?(,????C?O???*n????-+0Z??????)?i???Xm~??;?U;?@|:????!?=(??&?l)?'??2?o??I??-E
?????#??6
?0
?A??A"?????,dhU1?6?;+
HQ?f?rm??x?+????K??l7Jt??y>?
???!??'B7dd?Hs??hC?pK??)?<??Pn???N#q??R?? )?????k6V1I@?ga?P
?(??d ??V<?????m??Ca?gc??k??!K?.]_O?g_?L?Et_z5?f???U??D?|e?Q???!/?p??|5?}???W?)?1??k?o?%:8???]3?Y?:?`"C(????S)GP?x???>Y`f?U&cdw?{?3???cm?Nf??-?:???Hi?*9??~???Mx????3???l??\????v)???{l?19m?????O?d^???	?P]w)?_9????g???)
???P?!?X?a'?'p??
^D8w?`0i?X??c??????	?d?zlQ:2??z?????7???]???????????|??????jS?U??P?c?6????3??Z?6K.?R??-?d-???)Q??t?94?]r????5??@8	C?ris~k?'G]??_????(???????????D?:O?????\N?L?X[??J???$??????O#K?e?o??;\0cK??7???????)0?{???[?:-?q?????w?}?????e=?p??s???3???kLp#5'???X(?!??J??n?K!????Dv6??OH???Z????? ?VH?hy0?????k?M\?A?
I?2UT>t?Rf?R`??~?[??k?QG\?1{?t??
?????4?????V ????,??F?&?lM
q???d??1?H;?Mq???S?M?????u?\?|F.Yr7?l????;??>[Fo??+?/>?^??l?<?? ??zS????Gcwvh??w"??}?L?<?I??Fu?{0y?????????-????5???O?=c???M???[????w?LN?m?r????x?$?y?!??H(?$????na??8s	?t??!
 ???4???-?id???l=?p????.!??N??C-	????q?:*?P?|0??Z_X??5?[2????_???[Zs???B?
??c?\??~#`??Kch4??l\f(K???\???=
?z<?[??????q??????3???????'e1?9!?u?I?1?]???F??=?#??m?^???R??$;????D??4R???]?qq?N?I???I!?A?cXJP['????_#???z?SM?9?"??
??mGm???D,;?/?J??j1k^???=?;???D??
?)?J6???
Q???1?Q~_]R+bx???
?7t???Q2?{???v?\?E?P!?g?S?i???;?6?f?l?
^yO?????bk???>r.y?J?xw????m?+?.??mkQ6u8!?=??
o2?j?YI???Z?2?!_*??1AiZ?,-?/E?\y$?I???????:m"????5hFi??P?8O??pWoN????|??D'4M??T?1]5-
??-y???????QZsL?[Sb	?#?$?????g??3?'??H?:?A6M??|2???~?????E<?n????Z???r?t??1????j?????.tr(?n?? H???(?^C\{?54l?K=?.???$?/#??o?gaj0??????0?KJ???*?a8??j?qo-*?czus?hY?<k?????^?>?<6?9?9DZU?m???c?p.?????R?
??q;'hC?:a3K???????nx?????5??Ws?`9??4??????
?s?g?Me??|6??)??E?A??*0??????a?
5W%p?b??=??<?[T_???@??6dj?}-??4D?I?l??#^|9?n7?u??X@????
^fh?4?Ti?<$??SR???c?A?98s?
nk3??
??/w &?q tl??Xh	?j`????3[????Q??8d??>???SA?pZg???b???{?|?W?/?do?????aO???L????]?*????])?b&!r?wX??iN?	?h~{C??????#?^??h?t?%??CUV???jLP&R?<?DF?*O5l??????[?{'hI???v?
G????wXP{?PT?/Ax????N??K!?&r??M?#??&??o?f?QF?[7w8?KV?'M<?B??_?P??Hg8??\r?u??z?????Q?????j;#?O???<P.{??/B??L????q?IEg?"g??I?$?s?}3-?x@??:w?l??a????,f?16L????|?<?xhBv?E]???;???oK?^-@??tw??N"??
?
T??????????????p?=????????@?|???zC??=?Si??p??????q?hR\4"?H2
2?x?\~?????
??
??? o?????$??HC?
O??Gg1?
}=?

?")??# z??? ?<?????W?g??oo???A??|??Q?t??????????O???G??T????l"?B??c????TQ??????I??'?????h?&a*?C
?r8U?vd;
?5?j??4????c6?}v?M???z??Z5?k????????????#?n:?r 4_???p????mr?)?^@??\??"<?kF??h1???c?l??????~V?RF?Ll?????????X???T???H+?d??xhN???gp???]AL-?z???8G?h?1???eZ?????c?P???2s?W#O?gVk?m??{??=A#???-?L,??.???????????[4h??P????q????k??z???:?+??=j??i
??G???yd-????U????r???F?????J??}t?'?4?B?????D?q????l?q?mP??
>??B?vc]Z?????r?._?y?[.???ZZC??\?D?Fb?:??????^?'??QZ??q??L?Q?????jUG??=?u?/??h????
o???"?V????d??(?e?g??kD??c?E?o????V??E~?u?C????G??-??|???????4l???4???????l0?IV????t?????~????????{??NZ
?+?x?wU8{6?????9????^?[?????I??U??????u?a?&??e?akY?(????M???pe???2a???i??????4'??~iS???k???4??????r????>?r9W"????7??_???}????2H4?Io??	??<??{??????;?3}?d??u[w?.u????3??Ec<???@????_#?.???s?ZC???n ???c????g????$A????\??????x????C??D;H?T???Mt"t3?9.]+?M?k???'?~t?/???y_q?Em?oF????|?s*?????Jt?C???r???-4a??&???4?qI?; ;8?-')?f???}'1?c?a??.,?o?_}TGr?O?W?4??3?W???QP?z??s?8?]?55:CP#SD?tJ?R???q?D?????vv;?C?dm??:e????#??JB??v??????u??p?}?HN
Yp?>????7~Tp?V??p??/>>cY}\????[?<??#?????#?A)$????/fR-DBYOs:???
??m???x?^w?iqho-:?{F??Z?9?:?"????2o??dH????0_?2?,(;?L?????w??1?????m??-??~n??????_??#???dT????A'?gv?O????v????ezn?w	;???????? {???&?;}?(A*??=????7?1&?)?I?D??02{?0?^g?rz??Q?o?4?o?K??6?tK?B???]??T-?-?]$??U??H????shh????8?I?D?P????Mo????kZ???dH?A???$???????,???z?.o????N9Vt???#?.???+yQz????Qi48?g?8Q?O{?
>x~OO?R??+????1???Z{H???;??]??????;???v???O=X{??&?????t	B????p?|?Jv???Qa? r?K83L??F???g<?204????????ad?d1ML@=;?
BF?1/?MMU?????C?2??)???.i??v)???,?????VF???C?S?R

??#3??????h>???q????^
x?Q??????~>b?,ra???
"??????9???2??\???
????{9?g?? ??g??m?????G??V?T?F?[??M&9^-?=?_?1R
??fb?????X?!????_f?!??J6pK???]Fj???xH???I??[??????????\~?f?1hD??e????q?%??t?K;??*?$??^???????{??m?j?4?E????7-W?C??
}%?P???????
??y??(b????!M?!,D?[??????l_??????\???S?^V??. +?	?????e????t??DI

E|????????>|?b?i?/??r(?????4ff???2?????W?>???HP???a???0???t???? ?ZL
???????%?B=Dlt????u??I1@? ???"i?H??bD?I??
)JBJ"??I?3T?!`@Q6CHJBV?10Bt?)?zqz???
I??C???????W??Fjv?hN??????J9%daQMY aHD6?>???e??????D??L0Aa??DB?J?XF$16a??`EY?l0?b'?A?SLh??`?7?c?0L????2}Q?D@-?AH?|
?Q?0?$!?b?????/????t?_?>/??????|????G????????-???$??'yng???W?N??\gs??|l??N?$?*??B?~??	??3????P?l??9?,?O??9???`??=pO~_???{3?j?????t??
??T*"???.ithb[q"?$??,kZ????m9?????|????????PD???DB???AMD4???=p???'???A?b??)?@?q?=y??^?q|??K~??>b?v??o??_??QHe{w?9???60*?????.o?3C3k??7f4???????k???7??5L??,?{O?3B;fBRwx?)
?????`?W7??}#e
?[?9???Q?.tu=.z|???N?}?????U?s?<??g??[25?~,r??WFu?G??m?
???7U(h????uU
:!??XY>5'/??_)?)?\???????`?]??{????"????UG%r??x????Q???M????[_?C??H?????ob??P4q?"??E????SG?t?>????[
U?D??????????,M??{Z???3?MBD{&mcD?c??Zd8(@???5:???0j8?????H
?*??gl?Q??3????P(????|?
?6???T?????;O/?F>?3"???E??80?LS??8?????J?????nG????U6???=??M??Q?, -?E#2/???R??F?!???WJ6??$Oa
?P2[????9???_<??CM3W??W????
?vIHtAic ?]?????'????1B??(?????c???c??%?
?:??2??????H??R?a&??5q??\?X??s0Fq
??V2Fi???ikR??????y?5?$m?&?T?!???f?7]??p??[?B?r?C+?+??J3&???C+u??bO?Gd???F??mp`?XEC-M?e(?Z??L?^E)?	Z?N????????4??M&4T?Jk
L2??q??+-??`8?%0???D?%x????i?$3r`H???5#e??=;HK??(E?@v*?#?{3N?4\
dU?@?uI?W ?+q????Q#|?? ?	?T?????h??' ?5???Wl???
X?D(?'??hf??F)u?V??P
???c+???8???Cp?m?U0??HM????N?.4???4?1???)Vf`?X2??n?f?????,?B???B7(????c??!???mz#??f?1\?Mh_?i??Y-%??d?B$D ????97?G$??+??I??I.??uZ"f??1?4????N???r:?5?@??M8??&*;?D????(?nh???K??XL
??:11?&z&???.???T?R?k
~???z in?h??e,?B?Ay??d(a?}?????Y?%?@<???C???????#?B??
04?2???"T+G?????
??-?????+gf??4??!!hi?????????k`S6B?R*$0!jp{**)??????????=??w??1?_+D?hS???5??&L?2??,???k???i??t?u3??$ w:?+?SD?
?LKD???
S??0)?Z}n??$q1--?RC
	?RZ?n??JW?'?+?fs?7%?3???v?<pq#???;?????k???,$C??cW?[Ad8<???ZZT?	`????????89?y=0M?T?S.?????{??????A5E?a?h????????AEK???u!E_k?"??D]A}zW??`?]IvH!?#Da?s??????%?R?4????(???B?
y?f
?_???h???hb???J?R?b??????????I%??????????KL????Ifx??U	%S?f#???k? HS >???#wXG?V???A=???OG?$G?@DAO=u$?N????{KH????`_?U|???~A????#	1?????6i??X??!?? @?IX??????$??@?,Q(C??7L?T?a[M?tMX?Mgl?_?!?????-i?XM???o?
??MC?I??wO=?!?!???h:+$2j??@?????a???ik?Js?=?S?
??MH?J,?,?9b?z?>_??;??]>K?-???4-??S?????????[VH?dcn?!?r\?ci5Y]??????L?y?=H? ????H????I+nRQ?QIIP??*???b{X? ?M????r?7?Vny?9?6??0??A???q???????	3va?Hg?+?=Al:????P?(?_(]?=R?{H+?"*??Mbh9????????8?M?p??Z?
?T????.??4dA?m?GM
?Q?|??3?>iI?h1?c???I??g?`?O??W-??$m?6??d??gN?L???d<x@??d$o??h at J?@d?4???? ????h????z0???|??????]<5?n?d??????4s??{
p?.?31q?@wU#??,?-??d0c?$
??*e????j
?q?m7?I??])?W?Q?E9????f@???)?W???
?6??????<?????O?$?vH?,$???????b???^???????E\??*????@???Nt??dP0$x?8[oF?i+?A????Z:?}????E(v?????7??bx?1??[aa i^B
*?e!???qVP??S??0??t6oHjj?,??P@??t>&?o?AQ??|??B=? ?a1$'????????T?!?c14DcQ?3A??
9??~??@?K
???<?w?t???`??C
??|6K???L?a????ra?w>??R??zU5???	h??W??E?@?bA????Q3???9?y}???`?a-? pdq?>??????????I????V??<_D??v
??U???L9L;,????S??"?W
???e?????
????
R?	?A???k?Vy??<
)$??`:???????@?????????U??2?d?0??F?????U??`}?9?.??yT??"i
???7????G8X??(r<??l@k???????	??]!?8???BL?I
pJ{]?5????HSf??
????`qX?z?6S??+?????
??0fL?I?R?y?????eN_???~
????s????z????????m?rNz1???????>??w????k{??????"*?u?1??????T??;???7KI-s ?~??9????<?W??	???a??*?s?0?q??s?Y?l?????-4??F?'?$?.????u?TV???e?aYX?&u???M?IB?v???0b?Y????
(I???-?XFzn????S??:?P??P?????<???m??hJ?????aa0<?bM?(??????^Q?~z??"?????Z?>??5?k/??Tc=???	??m????F,h??n??f??F7K??ZF}v??c?K??>i??}??I???
O?{?i?}<?????????k???8???Jzh\m?1???ts99?wXQ_?R?!?l?2??u'???????0?2O?iL	?
????6?Q????????I?
CLB??W6?9:A?H???>?y????6?r?E4???<[?x??h?E??U?qUmFk?xo????EwA????t?KB?=????Jg+?*???d?R)??J???????0=Gvh???4?c8?9y&??????"??????%?I?q?H???0????Ig?????V??p"Q6???j1??j??~bH??u?c????????????<D??5KA7???????f?U????5?Q????e??!?s????????Q?????3?.?8???N???wG?2??_Iy5???0??????s%?5??	?Cy??????b??\?/n
?????"?????????A??:V??Dkrg?"[??2??Z
*??|?-*?"?o?n?????
?stT_???U??05???4k???????v???0'Qt??F?Y??~?????n???4tL1??u?1?I]???k??D9???l?????t=?????????`????3S?R???!s??X4???;????????????I
OD@,??"?5l?/s??8?4??1??/??dhf??w??d?????o?Q?	???an'U??U?h?
????.?v??????T?????????$M?@k?	~?`l??????????'????7?8??o????>-3?X????t/_?????eQ5Y???????p???8????????+e?;?;y???Ti?k?;??j???m????{???\??o-????-??A???nk??n?6U???Q?Y?~{d???}8??????e??@n<Q?3c????\=????*D=??p*I???????K????Bt????}??????	???????<???f????x<??p9???r+y?7+??e?????????{"????w?z?????^??????????????Y?j??4???????p"b??????y<?
~(L??lH?@lABD(?Vo7p??`??$x/K??]??J???=??]o???F??????sD$1?????]??:??v?yI??O??5N????8x?Wmt???7??J??#S????????:w???
?????^UE?f????v????q??Ok!%????)???Ai???`h?v??+m)??U;
W?/c?????'RW?y????????}??"0?#?0?t?i/???1?:/???z4?>?g?i ????04<P?9?$??5???	*Hrm???[??>?>?????0s?!?Dt?`?1?`?n?c??????>?V?hTE/.?k
??`?x/+c??z???W?Y2???c??p?????tq???=??f?o??a}v\?{y??}??
I?y??Z2?:??????????rL?G??Y?/?&l?????}u??;r;W?Y??????
??m.\?
??M'??4?5Hr`????_7OE????Y?;??1??=????u???h?ep3?(B?D
S?%tm?(????K?I??s?xZ????????*??~f??$j41?(??,??\??????Dit?z=?Xttr?j?U??????1???]q^?p~8_A???=??>;u?? ????3??Q??sR?}??E?a?W?]lz?C??H??wV}4?5?$'??F'??????!
??[S??u?E+?F+??|?:?AD{C?G??|?c?????]??3\???G_A??V??o=?]G??U?g>?}?W6?o?=??K[2
???I?????????
[??>?d?)?h??\6?????.z???????W?y:v?????h?}??=Ma???Z%t&?G???'?,_uh?*?%????????0o[:c?]skj??{?????u???ELtX?-H??*R???m?#????????????a?J?|??^X??"???X???lzMhm
c'`Q9p?m??bk????Q~<\[&?U??C?\??_????????????t?s??xVE????q9????????4???????m'??u???/??MV=8|??2??:????T,??9???T?
?
 L&
?t?$
7???R?op\??6??P?GA?(8?F?dY8?c????x?c??_??b??l+x??????R?;???<???U????<??{$&?u?^??,??=]=?;XF????	CD?M~?u??????m?n??wl????+???f????????L v}?????t???4H??m?I??QP`??	~k?C?(?????-?????j?? ?????3_dq?]??<?!E}??|??*?<???m????N???o?y?A?B??E:?eZq?l????T<?y??t???F?}|1???HZ??7???R?N?s1?????u???C??/???|?v??nr?Z??8????
n???????f?q?F??I/X?'????%-'?fI"???~,A??????>?'?d??$??????/.^5?cJ??3?_GQ?o?>????????qt??E???q?(e?9?t0_k?^?3?:zo??u4?N?????}?dM??UqV=??F?[k?_9?=?\?5????vUd??4Yz??al0??W??f <???d??X8?!ow!t??=??Z]???M???y]?&??h??m
??Fbs>l??????k???+??>????q?????s????o??w?6???K$??U?<???S?Tv???<s4d?1C?3???4p?sF??!?u????7L????0?\^?????|?????????????_/?|???^?????srEp?????Z???<?_?N?:89	??\?MG?j????2~??m%2"??ka????M??????S??$??Q????)????C
?|)?6??????PH??@B??X??@??qJ ??X???uh?H?'!h?a??T=?5NbF&f(LDHX?N!p????E???2S"??r?3"H????t?Ga?
t!??(??????"?E?R`?Rz??6o=?DRF2??C?Y*yHXD?????J???3?b?_o?pp?????M????????F????h??w_?Q???,??j?????Q
??EPb@TFF?b? ?V`hb(?(?Q??[8>/?}??S?)g?beU)!J~!\???
?Z?x?E7b?$~zss
:G?12?D??????S(?d?????)??wm?\f0?X}??;???u?o??????q?vTvnYV????7?de3iGa???e?-?P??1?,???3P??????\Aztj?yu?????????d
?????l????,??-?YwI????lu?d~?Ps???]???^?.???P)?bTp`}i/y?????}?T}??k??Q?m?px??[?#-?"?????H??ei??????Q??y??*-???jt??C??D&UG?>?)?T??(='x}??????c?
(???Q
?p????B???C????s???\???*??X???5?"-??????}?~?p??q??!:d?HT???Zi??){?????T?????`???>???JV"&%ud???F


??? y??9v??"f??y???QDG???F?????#???}???e??`?Mu3???*??F?????????l?.K^!???s???@#??bB>Y??}??v?"	*???Z?? R???D?? ?b.???K`?y??d;???d:??IG@?r?E???U??/????#?F?v????IQ?
?b??"K?0X	h??
#????u!??x??}dpH????|:??<p??i??`&?{2xH??0R?E$B?w?A6?ks?9???8?1	?@9v
??E Pn????????Vf&Yt??????:??e;?2~X:B???8?4?6???????4????^??:??b
=
FV??dvB!WZ?V??"Z??f??2SU"1cM?aox???&??hY????.
?????L7?nB??H??????{{?>???????Z??g????W????/??Z?S???}?N?t???!???_?????hd???%?)??F?m?Y?e\"|?? ???C?N=???K12?oG?u?S?????{D??I?=?vh?A???? ????6??/??)?e??~??P?????7???C??
H6r>l?{?/?x?
v???G?????????3?.y??3RNn??w?+'????Z???#Sc???G_??'?????)?"_?	L?+?z??l?????"j?o???,FM??4?1_????????[?V?"?-????;?'q???F???6?)C?x?=??o?o
|	???.?.???f+???
?????x?$???]_?><??{?????nW?????1ET?X????R???
?=g??W?lZ\?<?=??U-!?? mh?a.vB????wz?0?MU?#;????A?;	?:?SN??????U0w?????0?
??j8??`???y?^aKO?^"?:???o?b80&[^?5
Y,?Y.v5?????|??????>l?mA?-`?1?n?K??????{V??_???F?k|?*??v?Lx???m%????J??c?f\U???Tw????E?8?$`??ew????U??p?5\?:6K??R?'??n{	/?????????]?E?G^???x?????s?89?Q???/+?????U[s???nb.???to??i???3?^?R\?????(WF?{??fH??????~D?<?Y?$?~m???
T????w??w????g?EU?X?V???????p??>????l???$??"3???=??=A???0?b??%]U???z6U???????/9??mc??3?]p|}??\????>?9?f[????5h??J????? 0?84??b??????d??????F?????;??E????N@?`??	q?:l?u??q??????l???*`?*J|???9?3?<?:I??l3dM`?Q?>S~N6A?N?????????M??????-?.?aep???A&?<????m=[???????[:?m????j#??lr??????q?<?????Z?'????
[A?
?dY6?Y??IL???s}<w?xi?.oH?l?81?K'?C?d?c????l????fV?!Y???#??_aa
???.?z???U4???W?.?A?????*?+?s?~
S??%b?LE?w?/\?1Q???"??Z?i??~-??w????!??0??yre???0?`}+???Bu??j3??
7h??
??{????~?????q??????x??\?g*? ??mg????#?>"?D
??=????/Um??=??????vp6?F?G????????VV}q\!Eg!Z???(6????p??72%?quE ?
Wc&A8*F????Q????b?<?7??{????*}?=??";!?>???vox"??"N??&??(Kf)???mt,Y?+x/??n\?5Qv?R?vg??????<i?/}
???)??d?MN&?(G???v<oh?~	?????Z?}r'???Ak?|	???j&?6??&????????V???v??Z0~??ZRH?O?n?i4?s??????d|
??{??????H?R?y??^?E?*$h?>?=mT???~#Q???????y??h??e??I at P
?1T]T	?BhD?v?????;~Z
3???8@@??W??Q?c???????hX?c???Er????0???????
O??y?=&?J"A!?-?k??8???z`?>?#???)C??'?l?F?M???OK
????!?0?D==???S?
??H????G?????????Rt? ?}?}?H1 ;[????H7 t ?0?h????xP?aC?W??'??D??H???c1?F?u???tV?Sg???B??:??!P&QL??S??iR<?Ub??'???vf?????*??K??x?{=??Dh^?????????	?O???
K?0
?M?Hc?7?HE?`???7??$???Q_k???D??Be?o??@?l?b\?0u?s)?CR?s?9?st?F	?Q?:?tD?J??I?4[P?D??????u??3a??1w??[P???????????|_?r~64??f
?;?p?Yn?????
??????MG?i????$P{%?v?)?,?O???"?b?????;3?>??qIL?,>sG?_4?,#??s?'??r???{D(???O??]?0??ej?'Y?$???a?A?]?r??????~n{>?
ph2??Z ?w:q?D??I$??pQ???E???V
?M	?&???CS???????^hEz?
?"?u?y|2d:??@?x???//
?N?9? C??lvS?
???:#?_P
??????I!???M???
??;??I$???wn'P?,?A{q?7?,?)4??`?m?'(nw?fR??M??
??:p?@1?vM???????@iJ?h???A??QT?.c, at o?b?a?2>?????:=Vu??????w???(????????
yP???%?I>q???????2~??u?_??cZw2???^?t??fg???pF??zF?G???	G???F?R??7?C?E??J?g?rFF5]????Z??W5??mf??Np?E????YS??????O??=`?;???9?????Z??x??;kP?#SC??M??q??E?~?q????X?z?_}T??
g???Vc
?c????u#L?W?z,?5???5?\V???????>???????:????<?e(??
??vl???*k6???[*?? ???Vi???K?c!?cinl???	?????=?e??>|;H./?????0????_vu4???/?b ?
~?e!?e
?d?\4(?e-0?:n?Mu??
?~([?i???YQ9?hz?]?7?ie%?T????Wc??0 ?:s/RN?\(?b?f\?^?H,?AG,~?Ln?<\??N?V?B???Y1?V/????~????o???77?e????6?
?Al???u?V?{?~Oy??S]??:?Z?Z"H????L`!?#?????kV5me?)d???N??e?E?CT?gm2??<?2???????|t???YJG??#c?;?????????a!?R??N???"??A??\Ii??wJR>?W7EQ??$?	??x??D?????-?3?3?B???????Q?????????g4??d??8ff??c???	?.s??6O???3Vd?6??h5??????}y$??{&R?t?l'?q)??X!l?!????,-???^?????1L??z????qUn?\?S???????,???'?eTp?~??Q X???3)??G%??#?q???2?
?A???v??!?I&W????????Ma??2A_4T'?????<???? ~??0j???r2L???????z?=>???rW??|QDDb??e?????????'U?2?ui??a??s????4]????L??6dY??]?E,6<Q<???
????.C??????BPI??
?W?
??a%??????!R???
vX-p?~?p?&Z@??M$%?%???8?5p5
?P??s?w?0e}?i??4?f5?Y]??HV???i??u_?Tw???J?j2z<???WT??U4? ?x??yd
?m??k??P????I???.?4???d?
	?`L?p??8y??y4oM?C?f?o??R?>?8>??}?h????:9Q??|"?}E??ZZw??Q?HU_~?9y?????l<?9g?{??vD??"????=??	?H??F????2??G??)X???s'b??	???@?]?W
???/??PAe?)?1B?FT?nLu??
?gy??3?i?
?c?s^??=l?dZ?[??-+??i%?d????Y???7_?|???q?????03??AL?_8i#i_y?^?\?h&?"1lB?b??$H<^8_Q@??@???
j?m[???????`?vEMF+
????l;P{
???1?????x]9??E3%????e\c??#|M???????Y????^???h?I?|??d_?|p????O?????????2,???!(?ISvQ?aC????1?X?@?0?
kR?Yz:o
???F{tPLb????h.????Z??+?06??m?*?????51?=9jepl|O?0??[?????q??1??FF@??*\?*&sn?9?>'??V?UH?J?q*???^%?o??.??|?<XlJ8??F+ ?-Hy????f{~????fv?%m??8??"??+&}?o????f??'A????#?Q????N?C@??"2o???yK???>	3t?3o?c?9????`?e?$??!??O?G]?B?A???#~???????????oLx?O????O?G\M?*(d4g??/??\ds?
?>@>????F B?h<;?? k?Wt?Q?>????3?
?~???f???)?f?-?'??R??"?$?Y???9?4"??jD?*????{?U??Jy at n#?x
????
	??j?uL
,?,?????=X????A??h???_?u,???x]+???j?JL?
=??t;??-~?O?u??vu?=`m?3??Q???*????????
?&*?
E3?d?^I&;?? ?0U???9?
@<?N??w??

v?W'?	AA?m?pbk????????????&xr.NC?G]??
?H???>>?C????a_-?AHq?{?y?/?@????,_?:Jl?9l~KC0???????????7????t?b?? vA9??]??Z?Z/
?????l????7??js?A??>U??R`t?L?
???z?^?R?x?77?F#??O??l??\??????J??D1????_???"_??[
????@?jz?;{?+?Cbo??s??o?????
??
.(?D1???.?
??a:?????HSM?I?????W<N??m????6I?????lN6?w~???
?s??
??p??D?%?-K? ?H?????;
?"?b?r?D??p:????"Eb?I?X
?l?.???m??;?K?k;??V3_|	???J0????>Gw??U'{?c??q????X
????????
3RZX?*:??HQ??????r9?????FS9:?T??0C?A??9?<aA??>?i"Gh>???9?W??*?_7????e????^??;??I??? ???6???5??ws?\]x1?_ [?????Wd-??"???sbJ?H??k?fu?B?R?[sX0?/?B#
$P?ED*?#?H???/?gC????|??ut??gd8??Q?????y~x???]!???-????F`??h??????nz??+M?:??fiH?`???a?y\?GAs???pc??&???l?jd??^???g??NaG???O??gY???%?!???"??0?{mB?=????`??1?????nW?tN$??Tfg?q??m#???D??R?Hk3POf?-??o???2=&??????8?H?;
fC
Z???c?bB$????j?;(6?;??"3??????,?lN??+8???
??&K
!?I
L?<V?1Oi?dEa?"?????"Ul?<?
??s?jjAR?>?hb?_?aa?$?3??V??d".f???",?$(?????Y???[???@?????G?x8?7??? i????$4?SHj???I(2K? ???9,??|??v?j?B?L???
5?DHtR????'?}rI?&??0?
??>X??????????tX{?%?
?oy??X?Xt????xQ??++{H???3=c?h????f.dh
2<??????>|?J????oD???w??>A$??Ps?i???H?
?t????$??YY??[??:G?4l?<*??|??ia???2M?v??????:?Q?&=?????a??0?)Ed???.??t>j?S???+?r
?$????oy??4????bJ5????`v?/???????????s????nPB?\???\?/v'?????q??k?~??????????????W??;kh??'_???`;h??D?E=???L?:?_+r????5?M??"*N?bD?????D*?p??????@?/???a????M???o??O????X???0??:?neT??TUSm????kB)???g??????t??	 ??zF???l???_???\;?N?P?~{?!da??t2f???N?i???S??pMw}?s?sZ??+????
?Mn??
(I?
??j????Y?2|RH?Y
F*?~?P>h?8???d7???
?2m??%H?fEq8]?_I??m7?\O?N$
?~vJ????f??#?0{?????V???z8?6???<M???)a?o????[??{?Y??F{?y?l*??N??c?4i??Zb????0???3?]
???W??????<??k??|Q??j?;\|?(H?.P;p?=7E
??+?/??
??E'm???
???E?????wE???F??W?Q????C5y?4b??????4(=?K?{???%????*u#?1?????????f?????U??t_??m?
?{??#Hd?5?T???:FH?$~???do??M?R??~??5??c
??9????jk4k?Z?GkV??%?????=?????????Iw?%?P?AX??m?`???l??S?&?g???T?cv?m???C>?,?T\?Y{H??.G?v??=^?f??*?"?*4_???;{??:`?8"9?h???}??q?4sy?oG? ?,?w???mu?B?
\?:Nw????j9E?&????(??????w??y?d???j??	4?? ?^b[?1??c)?)???lz??e.?{s???a 6??+???m!kw?B???8g??cNy^B?Hd??>??8????a?????;%U?ewOmT4E????9z???_)?"I??3Z? "c??SE?q?<ul?V?
?S2????n?J3.?q???]J?+y????4C#K;?????",?0???b????m?Btuo{?W???x??G????t??1??on?"2???+,?{??(_~i?6???D???`O?T?O7?n?????y#?e??????????}?m???!???BG???Y???????7?6??fh?=?]?????}uH?7???0%g???#??????w?F?)????9]C=?]?<9??x ????I?#ia? =?A??.&?5FSRA
????t?0?5?t??+ ??(?? O?z?9?,??????v?v?O?????mt??0f??l?IH???e???????6;??|];??a?Fa??9????syy?????]?7?G??????BfHfctB??s?|Oi*1$?B??l??g?WO?jzT???g??????G\b?YqU?1s:?[^?????x??SN?~?7FC????5??7W?? ???O???????Tj???Q'??6?s??v?[P????(e:????md?p???r/~?&??2??=+#??iH??</?R?????????Cr???k_\??$?>!?];??m?=C7????w????(8y?=i??L?Z?2??????
??vC?dx??7?:O^t|??T?0Ow???|?????c????F?_??]6fZ?????:*X?E?$J?B?2Cq;6???75??)?y??{l;?H?2??????J? ??-
!s???? ????I4a?y??o#???p?L]?v??????)?!??v?zt?K)N3z2?\}:???UN??SZo???^!??q?????Q?$jv?.??~0?(xj???UY|?}?j???[??3?bt???V??C??&+????HRr?D?NDMO,6?9?? ?ad????.??<?1???????"'????S??wM"4??{(M?'>???????????
0??ys?=?')?<tp?h?uz?G???y#?x?8?f??U!???Q?2???x?5???R??
Mx???G?????>xu?za?M?J?L/?????`??{??$?P??H??_??;y?
??T?@
??#1Q???J??s:3?yed???j?<LX???b??O????s?jw??w??4?%T?o?.G???_????????e???+????	???
B????P?!5*8?u?????
???2????~&?????N?????)???]e????????=<?k?I?%s????,??)?U?*???y???M(uj?^??T?????w??[??A???]?j??!b???<!???N??????w?????h?9?}???????
 ??f$DVS??E8?d,??U??C?j???????????
\??????????d????????
???@?C??????p??Sy?P?HJZB?`????(?8??T
????4IHS at e?u?	??6???
X????L???"9??s??????|???!*A???C?7o??p ?_?]?]XTV??b???H??}ZvQ?????R??:P+??????Q?9???5[?w?M?)v?6???z?~Y????M0?'+;
x?p??X?(?	?!f???~o??e?N??B?D??gT?
???\?3%Bm??_?R?!]=%|'?[??^?@
??9??1?>b"s")?a7t?a1??	?|?t at a2$&?x?/?E???? ,??e?",:??%??A???cA????H|??????+?|!&?aYr.?????bV??????k???b??M????C???I??Ri???????\y,?V?"??Xg.????-??'?#Ywo8????D????E@???6V???H??????|o?;b??y?-??????.??????i?k+5??n??S??ho????@A?????W??
i????)?z?r????lU???]zu?????Md????=%3?3?
??m???c???G??)??0B???????s?mz?
?zu??X????????Z?0??5????UPte?i?a???\Cw?v?n\
5c_??y????n?????.?n?O??y?oT}?q????v?$????g2?*f?????????UQQUUUUUT?{??M???????????t?:qr?wv???T??eW??0????????6kU???[????N8Sr??bJ??k*?r????9?v?????? ??6U????5?b??3??m?as?l???D?HR?????????UK??+
??;??U?	|^?m???G??QQ
8yZ??K^?i??????????d?g9?c??5?Nl?;?3yp<?/f??,????2`?
??D????|???+??x$o??n?Nf?C	$????u??????o??fo`h???L??L#?lr??FhfyK?0??0?`?w??B???,?Cn5?~?qe??G`?;/?\z??G
DR??H???L:T????	??`D	?M?0??%????Z(F?ZgI?@G?????b`/
???J?}I??5y,?e?????+\'I-??C?M????\U?d??;??xr>Ret????
W?FEU??????GHa! ?v???????,k??W_-a??O?Z?c'd??UxH?? 
uK??V???}	?????g????UF'5?+???????OO??????????~^5UEUUV?(???@??IH??I%=,??(?I"?24Z?????d(?!?
?I8`?;??}?h???q\??GI??a	?{??x
????Hy7}???&9??I	$??G??a?????hs9I$??/H?K\?}?%S??A?$?w?N<????`?s???]??fxn?:??QUS0V;?B?p4??+>Nx?????q??g-??yr?a?>[????w?-lX??@C[?????:v?????
TSC%2E0?I?@L?A??vf?p'???lhF"?'?f[z????????? ??
???-"D!@D??
??
&U0?M?.94?M4?M4?M4?M4?M4?M4?
?b??M4?M4?M4?M4?M?<??i??i)????N??8$??<C?A??i???G?????i??c?9 ?s??:??i?<O???8x???a??}???p?y??v??dddg
j3R?(??UvEm8F??O?j?	???#??Q=??R?????(}'???x?P?I?	?????)yh?????~?)T0?^??I,?H?
 ??{???=a???????!
?RXT?&
?l(?D??#???AA??????????6?X?zOPz???n??B B&?Eh?
?$?C"]?*??*????8???????H?l?DJ=S!?wCn??h???h?Piipd
???0???X???????>????Ea?T??r??????*?RB$?????paJr?0d???????!?Q<H9??8>4!U%+??????7?>??H??_??=??R1?S?+??
?o?a???7?T???,?^Sr????V\=??a???(?LByxa?U??*
?$:?z?g
?Q?{?x8g??I??B??C????!i:???}?e????c?U%i]Z????>
??-???wS???0r???q?l?i??%(????????????*????????0E????LX???u???:gY??XR?-\? ?B?n{R??"??<_??z??9aO\A??? ah???o?k?[5?A^Z???o??M???I&<?#? 2Z?3^sy.ny
	tt
A1N?.
	???a?'?'????L?}?A?`????@?.&??xb??i??a?%??f?p?=???B,?(9Ea??!??OBk???????6;g?i? E??0?j??(*??<}?bu?"?????Q?s?c??v??g?_v)??@~???N?khq?%?r????1???@???????????>}j??0??0???$????????e??j?O.???\?v#^F&A??ER?????????9?!??[?%l?8y??????????
Jv?_???:??)?s ???oUE??4??????%zwB(???WX?0??A?????P$q-]???y?@h"?? ?)9?6?"y$;??Y?X??A=08??(???=
?
?P??????D?2_?y?8H>???,z?TX?E{?8$8f??5l??L9????6????????(g??????mv???????w???/"??"????h5WR9?\-Id?e?$h3
<?cY????????B???????????`??h??~)_+???i?*"
???iK?|?G???=?@??>?"hbN?????(?c?w??i?&`??l????%2r???y??V?fh>
i?60
?9?#??aq?r??s??A?G???ix B?R$????
s`???J?Ld????g_?E?D???!????G??b?X`	??
?4]<?}?W??{?U?/?	ym3f?&???RlK?pf>Xcr??r?B?`A%up\?`?
??:P??????E???Z??`K,?p?XsG(Qy%6?\?1???*U?O??dI
?K#?o???aM32,?U!?EP}?da=?O]??N??@??#?h~???X???q
{?(??L$?aI??b??L;???U????"
?<H??H?	?H??q&=??W?y????K?r????2?=f?bu?f?d???+E?$mm?()7!@?hd "|Q????7t???@?H2??O|L?	??i>x??JOSl`I@
?
?6{w{>?~????????<?? `bo???#??wl}?Cd?J??@?$???
?	|F??}???Q?/?P$!;?l??!?P?c??p????Ja>?C??C?Y?bu?T
P????(N?6???????P?v?H|wW???C`*???Z*??????7fa???
cT?fIh?-???"?B?/?z7;LX?zi?[?????PIii?[/??8?%zS??:Fz??	$"R??1?O?	?s?/?H0?J?@??"<?????z???9
9Q<?/??"???$c'??|?3?}^L??D?]7???yl;P2u?U??D81??>,??w??DX?(Q[??O????!??0>?????p?+%@?T$?I ??(_;?I
}?`}:?P?A?????omY!;f?ap?0???` 
vc????
3??0?????????qD??`?????DC?)D??(7??????QH??
z??F??O,??`??I??????Dk????
P%b?y:?M????"??N\?????
???Q;?[?P???2????N?????!1??;((??j?U??`p7]?B??
>???Q0I&,?:4Q??uQ??? f??????*?i???N???Op?k??r?#?.?????h<?r<??c??=C???
EJQ$S7???}?g?S?&AL?T
?>aodB at 3|@??????j??W?nFFBBH
%Rdd%RKE?y}{?Q?l9???e??9??8M?!T??a?3
?????
?m??80??????V???E}h??R0?x?[??PG0?L???R??????y?t:?????	m?P?u??C??I?lC?X?8??=,C?2E@#L?v?-m???2?EE?~a??k???HQB%2
]1???????#`????.x?s5o<$>??9?z?g	c??0e1?0?*302?n???R??<?st?s?:)?j?V?S????|?????l??Y%hm??]y?
??z?x??????&???T??D?e`?jD>
R/?]??
?P???	6??mYE???Drr?<?m???j??ZU?~?bxU0?|5`?w<?@cCG??@?4??
?????
P;p#????y?I???A?q?t??????B?L?=?/??Z)???8???|9??`E?w@?00?k5,;???U,

?
???6?+S?????b=4Y?%????!??(0?A?;?i?
??@H./T????????v?.??a'??	????W?v???4?x??IN?6V??{b @~?=p?^r?M?_??f
 w????????>S??3>R~?F?k??i??pVb
fvY??]a???-?&?H??\C??&p?n??2qY
v?#?-
???]=(o4&??h.]?/???+o????^x?????Hd-??4k??w?Nc??=^??vB6Z9z??bd????r???ar\?y???g(
??? ?????j?=????q????1?W?9x?uS?:??j??r??I??????????Bp?3*~?#??hD???~?r?h>???&?peQ????BG?'??3"_?y?N?|??
ED?1?????;??????
c]3w?<Ad0&1?p????'DAV}C??!??????"??F!?0?L??k???!MOu}??
?S?	??????oT????K?v?U)H?EL????'???h2?/%???(?????s?!??5?E???N?"O?????O???^?:??
?L?B???y??
s?????????&H	?)???e*DkN?+H??|^??zR????+?-??;L&???G?	????d*(????S??l?_`?4???&??B???z#???1????1????6??z???
?? *k

jF?
E? :?PQ:f
 ?I?2!???W???!????z?3:2>?]H9C
hK?)?W???S?H$?:A
|$??????
???~??v?L?5?!?0T~*D8?#???P61???Hw(?d?n[O[?V?w??"??Fl/?/
??d???G?<Y??!
?PD?"&P?Z?????
????6??Lq??@??T	G???a?B`;??)??(? ?+,4?jLZ$?"?G?G??

??2??okP???????
"}??Ro??x?k
n?}(6????????3f?\?H????I(?w1??l?X?;??'??;?U???????y|x?5??k???K???????4???w?9W?hq???? ?PD???Z??:???2
?i6??ye?4?OW5?J?M?QIuui???Oc??n]?!m4?wwW.??)??????1?6'??$?<Q?E?b???????m	??[l??&????}??M???Ese??????L$???.N?.?l???fe-???n??P?hm????
?b?b?C?t?y$??
?o??R???? 1????h???"v?*n1Z?$???(?s.??D????v?B;u?b0?????V?m???n???q???%???
????1????}??=N???????
 B
??s3??-??Zf???.???T:?c????ms???,?X??m:
sdr???;?y?zx?Jw?w??!#???J}2?uJz???KaF??????|6V!5?
>??L?='??r????	?;B???m????6????29??C?ZB??O>.V????j?^
??
??n@??T?]????????y??A??d?S?el?F??oI?-z??f?N?-?o|?????/??
+??9.gN?+j-08??g?_3??@C????s??d????m:v?????.??t??:?*@T??z ?
?Ne(pM?R5%RAr>?0???n?rI?w/???v?????c??m????]?
?99M???????L??)K?t?o??x?#rm???26?Kq at m$?
82F??????&Z????58??R????xc?uY?rap????&
??|??????3???AP?;???@?
*
<?,?
??X??????9???7???C?F<???4/?K??E???V2??a?M7k?I#?:5?<?d?d?pM?g
?0???????p?X????	\??????????>???z????=???~???q?!L???Kj?)?%n?m?????iF$m?q???
F?I???=??U?`???	???{?0??b??M+h0??g
?h??tm
<6;?.d?ML???:5!<?)sixf`?q#i?h??(???? ?A?v|S??N<:?>BX?V
???%t?Q?Z$;jR???
*??%BUP?w?A????@#?mrC?4O1b?&A?$???s???'c???p+??
?56?>?a???|??Q?SCKM/?B??HC????|??A^Z
?7?lg7?c?cORI
<??	???H??????M??XT
??D?CQ qx?
u!A'ba
b?>??C?o?????:?*I	h9C????j?6A??????<?iZ???Z	?hT ??N0?
?
h?????3.?#?J9
?<??2??@L???
?@??:?0	
??7?Q??????p?r?
R
?A Z{?(c????R=X?.cv0h???<U?w?oQf8??}5???????R???.? ?f2?|??$9HQ??d8???4?3KW6???l??T?A?v?l?+????nS??I2s??G???y6k)l?K7?d*n????h6??K???g?u?:?????[TR?g^q???/???j???#4AB(M?D?v ?f???24GD?C????JM@??l.?9??
??v??0JP?C'?O;?????7?rX??^08Ae?????gF
??PRDRRD2H?A?N??E4Z????W??=$`C?/V????/	Mdp2Q??<=?z??CK?
T?X=??CQLH P?
 ?-??!S2L&F<???m?l[jB@?????6*wiS??!?|?^?+??@???7?	??L???T???IV???k????_?.???wD?{????(#???1?LDe??$??	?x?$??2m?UH01W.??T?jh?]?["?????2?:0??u?????h??t?!6]?????Hx????p!&??2f?????(???ZW?,?l???2:*??f????z?&???BR?'??$@????
X????A?????;5$?/|zh??'?	O?O??8:~xS7???)?m?(iP?B?m1??x????3?
?P1"i???F????sM???!y
B??t??1??
!0%?
B

?
???H??P?=>?!??
?C$*???}?_??L???wD"sp?1?*h??jS_&?(4?????D??o;?o?N???#oXEX?1B?P?%	????P	??8{???

??u?D V?|]?!?0b????3+?:$7.????0pP?&?v at h
(?e??X????2g5<?E@??????j???2??ZHtDU??d
?@?R????y??~?A?T
?$&F?2???ED???u0??"?

m??k'?6FE?? ?@?CIz"????
?????I????"gq??fh
I??_6??5??T{'?b?Ea}vC??????XCk??N???D?? |??F???E$LMC^^?1`?p?
?C3???G?I?S??b?!/HZ?*?????6?P?IB?
H??g??7???5_!?Q%#??z???Y?>u4??????_S?????I,9L????K
?7????m??kBV??4???v??/B/z??wG?t{???Y??Q at P[h??Wm????Is]B??
???T???????;??(
??L`$?


4 dE?$??h^|????
) ???X
????LR?:??m?????mX}~>a?|??I?`?P?<??????B?i??8?????|4N?#i???(e??k???Tc??=?d?	????????4??-?>w?)4r??L?8M at 8T??!?Z??
()W???&?;??u]?`??Qs5?p?"Y??~?F??g{@fr)??????"??zb9?1?@????wp;???"L?h?t6k


P.??1
?U?4?
p
v??~"0??"?g?I?\????[c?r"8?????I4?p??????A?G??1?-??????QS?r???u?????????@8H*V?H>T????|?s)w
?$U??F??\??C??@>L
?}:?V??Yc%?????@?????~??<?a?p"?/??tb?eF?0??\???r?D??9?
SDp[y??O???z??4?3!??O??????P?FD?	 ?
??ni???P??s??}??J`@???X	????[*?OT
??d?Z2dc?T?E?E2/?(R?&o
(|W|?.?c3???N???
?=?H'z?'$DI2?5D!P+S??%
+??e8
SLY|q?????M?^??h?"f?U8???SI?|TZ(???????l????3B|oaC???j?7$r?*?yo4#??}H?????bI,??x:??????q
3A_?;&@????
P;:?QN?G?
T("?$?&@??$?\???1??`????%?!K`!?2???e?r
#
?c?L?(???
8????E??p?j?n?(??>T????^C?k??DSPB1D)??7?dG?e?=??D?@N'???????????4C?)I?;???	?	??G????#h????4????I????W????]?TM"???z???N1CA>??yG??O?V??B????N????????C?_Y?	?
??!??????#??5$V??pW2)q~?????yv???h?[hh?)??>E?????
m`wD1?P?f?????`?
4???;a??????L???&0~R
?
D
??5S!??u?G???(a?
?w?UCpm@???z?cVy??F?
|???0%??H?4??#?????^D???'d8???)?*s(4?A#|L?A? `1
1????C(V?0?X?$_Q????fc??6???gP?C?1O??????S??g?ck{????Ta???D???'7??Yt??9??'?k????j?#0?)dLcl??5B?la&-LT??a???bB%??X???><?Z|	?4???c??k?z?????X?X??'7??g????????
???0???2?????????I??gM?4???xqE??A?N?
C?

%????*?r9%R??QU3??B??R?3???r?4???Ya?W?)?gc??#2
?d?????jh^]?????jx?Z.5???P}?0??f??29QiI H7??%?	U e.?1????<D?k?? 6???`sq?hwR?3?a?e6??|????????iP??,???????""?"????"*?"????cG?!???N???W+e??K???C}"??Z??????n???gd?????$s?h]qU?4_??PpD=?a?L??????<?b???z???StT??JV[
????S?w??C?sZL??"?x?YM[??4h?'FE?gK???? )s2	?T SAkCH???j??	!?s?8?+@?2?~???????,??6??6????Kr1Qb??F8d!J??Qb?X??(??SL??\???i?4?c??r??
???????rV@?8q??????2A????z???B
IDBHD?q/????va???6X??CcB?Sd?????@?I?,%Z?~	?TF??9??nl???ZJq???L??xE??M??????;3?Y5P,?h?@?Y9)?h?d?B!:n???ZE3U??Q???????@?+?u??2?ZY?/??6o???c????$????&???
!0LD?|?
-??-<??$??B???/?`??HR|?D????G$?|)??0??????d)?#?}K???#???E?????G
??a?0^F??)9
?SYQU??F?T?b??{/)??+.????;R??@????D???F1O????w?D??!b???D????S?Dj?37?+-.?????Y
???????l?P??qU?
??*A?%"6???2A?
??,?-bj0?P???z????	?????,&3V??L[|ak
???a???!?E??RA7?Q???`?8??????5?????
????T<!I???a?2???5]??F??3?z?s??-ZeKJT)c???t+!??dh?? ???pl???x??Q;??'?	@??I?????]?J?}?&4=?a??z]?????|y????D????????4?????7VG??m???&?$?M???d$#X?c????c5?j+	u1?(Y?k???(???? ?A?n???Zw*??U
????P<C??C^??y{0=m6
?2G+??
58d,?
h;i?I?P	?M????bQ"TAC???c?	?t0??S?T?MH?@0"????;??S?P
???<?? ???(?Y?wh6iS?
?!|?
jP?	???
?E?T????$8???Q?x?:?mE??????pZE???p?^t1j$^????`?j?NT??????AO)??yu<z
?????{?x???/t?9?C)???}?????N?,?????ZK???,?*2*???I8?8???{1?p???{??x??2?6?ToJ	{??,???:?????????2?k"(P?)??&?5	C????H4
????c?
????h?V?H?<l0??y?8 v3? ?b0?R
P4?6&??q0z0 ?8?x?A?ar??q?????n|???q??a???
???h~?h???b? ???9IW?:Ed?q?5??a:?;CSa????e???qqH?a?r?????P??EClTF??&x{P??]
???0?b[hSz??(??*g??1??'?Tw?.?
h???*?J?????B?t}???4?!?fB?h`O?#XU??#hme1"C	?
?Q1(@c?eY\DN?4??
Wrw??a???$?F'?&%??C?5wq4??F
??@?S??JD?XX<ba?@?z?36?H??U????????M1??
X?1?gZP????Y???#I?????`EdM?E???h?"9?jt	?j?.1?Vj???P?TU????k@?dG?'Q?!r;?N????|?????5fc?? /????^]??)????\?B?AA???m:???i?4aX?;
?X?HM?5.?Ej?????QD?? ZV???p^]&|y?o?8?G?^??????1??k?"eM1??b/Fz#Q???|????m???0=???0??? ?7?f?)h
7??3$?	H?E]!Ol?
??S??)??7/'?e???O?{s$??.aB?I?AB*Q?U?+\No???v?8]?????O?Y1v??mty???#???8?r-?C
??K?\?f<=D??N??p??7X????????n??h??&?????T(?8?0?*?L!??(L??P?0!?????DP?????t??fR??Z?F???@?2?
?????k?b`
???xl"~T??????>j??
?,??`@lBQ??MK??b'????wy~`???QA??`?0???y?l|?9	Z?l???o?/??.???AW????J"CN?3	E)??P2?O????&I8a8IC?ub
J
?????>?Oi?k?Nm???8??&<IT?H?P???[???'?Oyws??b?????	???2??=+?3? ?d2c.??,$PO?2!??'?jQH?
??Cl???-Vxp???t?A???L??b??@?'??I??u?""/W?>
???i?
??Gd]Yj???????\??v??j????(j?S??`?
 ???}8K,?y?Ny=?jQEc`)??}t-4P??sl!	g^????Q??w?"U????`[??? ??P?Z?
??p&
??]W??????9????8
 ??Y\?`??M??~o??|S8m???T|?B?oS;l?L6l??*???u?????(l????,V??M????Iab???0)?AE??f?+??????nZl?$?J?y?E$?:?\vB??????z?2?>?=K!?
??8$???B???)P?D?E?a????7/}???e????fODg?
	?vrm???`??r???qr?$???k?L0/+!?G????
?D{??~????P?a??????A
???p +??cs ?
?	B?????C?!?=??d??
?$???????????,L3?fC&1??r????n?????????? ?$!&?Qv;?~??
??Q() 8"1
????1?X*?yh????O$??D??
??

J????!?/w7#?j	QqS????5j!?Q????K$???0?Y???????{`????%
???!?K?;???D?)?h}a???`R???9???C??	??j?c?7?}???_+>;?k3?C?Dq??H?%x?/????????t8?:X???????n??Pr?X?c)
m????I???b?L????*A?jq;?uaAO?x?C????????w???R??A???C???(??E0.?s
??(?8F??1?{??f????iWNtb???gd\???e7?cT?5zzz??3fR?g?br???3,?q?%D?7?????d??????,C`ph?????Tq??Z??3??k$|?4c???4??!FIbd??2i?? ???gs?????Pb????c?
h??9&$b,?7R???h?w??s}?c
??;x??%?????<???s?4??b-???<??h?e???
????D;???S???y??????wrY??
?o?%Wu
???F??~H?gM??%A,<d??O:??Gw???"-??????3?????*?$?(^?M??????????????:5?Wo??<s??Ln<?;??o;??v"????96????????z??H?
??d?L?f??q?B??|9?b at -?7ij????ST8????
H???V??????b?6?f?X2?3zJ&%????v?#H>O??Gm??????L#??8?s?$??r
?1???*?dbhL?????n??9?m!QbY???+?dn????L?v?v]3??Xj??4??`?x????gi?dx0p??B????T??
?????(7??BP???+I;9k?C?5?b_q?|t???'?h?c??d3?
??[?Kmr??5??!??x?????M????S?I"!?bMc???[?;&0w?mOM?.9?? ?????P$3?!3? ??)x??1X?NHdx!
B	3t?6H?MS21??????
%C???8??La!
?:d???R??[???:<e74?R?xi?:k4??:????$??e?g?}U?I??M?h"o=??w??]??l?j?C?X??7%.?.M????"sI?????%N?!??a--1???#???9?xa???Y???6FM??,???C??	X??Ci??l?m??????H???eqs<?
???y68?m??0?M??u"??s'lha?Da?$O????^<z?V0;0]^?I}??F??C?1?????8??6??{?Mr?"??g?8w?u=?Z
???&L7????;.?5????'?7H'?T#V?WsX???&fs.J??;;
!?^????f%??s?????Wn??!???y
x????+j?
???1?????????m??v]?*R??????t?L?%k???'c?x?U?WQ?l5]`[???i?6??????q
????D?????/hlZb?l}G??\?eNS???#??5+??R??]X???s?
???i3qa???!??N*????(P$6??Z??C?l'?a?%``nF????YLS?Q ????(?t?D???xr????^n-????? wr???[b]??1???/?'?#'?????:e?X3M?;pq?8???
)?^<":?j?????-y?El??"?YWq"????7??q8?1?n?I???????4???C??,???5Z? ??q???cZ??`??0????i??????m????????v:?k?"?#g?????????a??(?p?-???o?%?G(a???6!???????s?J???R
;??|?U??
?(??(?M/o?-?ii????M?lh? p??<{?J?D\?????qU?A???^?k??5=wR??@?3z???$a??E???`??gf?I????u??L???b*D4!?l[?Z?|!?1?u???S?MsC??????8H(?n??l???;????b??wT?=?XI????P??\?qc?k?l?
t-??
2TCpZc?????c??d??D??????????o??3?['?T{D?Z???M9???O???a?O?\????J?:cT???p(;?yY??;!z	???a6q>??81?X0?8????EM8r?$?*?|?j?v???=s}????0?g??T?H$w??V?LO?w???
??,?4????L???';?g?\??~S\?"??S@?7vz{n?*????c?~O?v??3??????6
?D?"KF?? ????????4
????
s
?h?9?;?T?[,????????????;?|8??
v6????`M????);S??
4P"??????`????????Ph)??h??#?U3UT?UM?}:b
?a*|????)?S??$?E?xBR?lQ?5!?H{D:???[??d??
6?!^??[n???T2???? zx?????j??z??????0I at E?V"???`???
Q ?)??R
4%X???lC?f?$ sTE?yCU?!)?U??V??4?i????wmB&L?@EBA???,???Dm????~x??????(3x?H?????F0Xo?i?"H??`S??A?#???????0^R???kV?C?D???E???_h?9G?X?(Z???X???/?_???F??*?Bl??L??'tAC???08??fQ????A?j???
?\????W
?@?@?U??e???????3?a???XcK{?????f?"X???????)^??w??IE?BpD#?-?@n?,??P?:i!&??E-???$$V?02D,r????3nxp??IgX??o??S????3?#?m??W4'!?n[?lu??V?h?????&D?U??b??^'?????#???$o?x??
?u:??????l ?Dr?ps????e2B????!?W??2qf??????D?S????q??????2K+|??-?z{+??z?f???M????j????:??a?]??f?0?]<???????m????R?Z$??L`?5gy:???7??=?-??:??YKt?;p?\?5?????<2?
}??q?pc?'?0??BMZ2b]e[#?OC?
?gI????^`???#??Nw??????	?$5&????)Z??q????b?f??Ap??????A?U????u"h????Sb?GMCZ?????<?.S?????????hZ9?`???/m??z!z;
?2kfn????C)??+:9??7]???)_r?v5\??}"?\?.????Q?v??%_cIA?^}???j?Wv?J?TC?5??B?t???d??Zg?	??o)??V_m6??x0v?	AYvc2?d????;te?b?y?`(0?f?
????BkH-?c+?O#0aC$ix???&A??@??.
i?A`so
?u3A4????[??p?81??.%???
(???D?3?!???[3???????z)?%??k??9?7?9)p83R?-??????	RH??B?4?AFELTjsoiRy?3?ZS%#1JJ!????????`|?Ji?c??_d?U]?q??{??2???T?)??s? P
%E??1mM:?3~~b=??A?D?@d?D(7? &???(tq??????s????KR???(?E<h???jm?D???x??*?{??]^????z?	"'3?;K??B*???6x?n?n?$?g"
??y?bBd@??"QN?w?h?_|Sr8?#?????
????????P?7?t????4??@,???O??6?????:h?
?8B??e
??dQ?a???k?B.??-???????M??\ZW??????s?2??g.?=:?????qR{??5??????????????;v!Tl(?&??'
$S]3/\?,?	?imzi?????t)?U?[?5?0s?0:
?v&?
?6?YM
?X,
&Q?itf!j???)
Qo*L??FI2?eVb-2??s?F??Z??urq?\???n????Cy?M?
?c6?Me?BHuo?l?k?jI???t????wge??9	?U???XC7 Wr?s?d??m?"??/4????{???
rHA?l?Gbq?Hk??JK4S???????d???
????9?V)??m?
 ??C/??33??,?)?uEE]i=.C
R3L?5??c?q?N?}????q? ??
?p?V?6!A?UT at ED1$1?q?:???	?	?
ArP????
bF?X?);f??6?V?R?C???'n??
q?-*P.??0?>?k-?f?'4'???!??
J??T??0
??*R10\????t?.????A??h?&??????A???tY?L??q??&??JC???~??{?2?\????Q?C?;??>?|?|z???V9f)D?|?????2@
?
0C?SX=?a-?w(?Y
@?_?]yq????a????R?y0e-
+K


?e?0`pI?????00??
?jn?????GV:?e?w??	;!?YK??(?J???l?
?K

1n?????x)?>u????q????l=K"?fb?????
???b?B??U?m
W?#s??p?=
????%J????????????4?0?)???>

?????\
?*?.l?j?J\?|?r?1#
]rr4?*G8?????$a?8FX?H?k???Hd683???7F?(??	?B????H?T?5?8?`?????lHL2H?Cgh0?i?????z4.
(??????+h?'??*M&??F???.HX??U??? ?A? ?P?A???.?:p?m?cf&9?H?????8g`T???L???[(?Gp?@@f&??e??9aL1#;'ycLn???????D?A?c??0??Z?0??!?dYa??P9?Bb6	??	$@?cC?ry???<?UDk?8F?????X??c????Q!??#Ts ??a?P?!{?f	?.??4&s{???4??????O)???%?mr?H(A????
?
D?S??$??k"???x?]?X??"!???(Q?L)"
R??!8???8]
F;8[?dHM??U${f?2???[z
????	?q??Q]2??#?=??h??&????!?0?kn?\?????{a?P?b?|"?fO?K??	????$SJ|??D?n?:?r
i,??
$?#R
???8????M??yt
??
Y?OV?<?????&~?Op??5????%?THj0)J)BhJ	i ?????g????8Z??j^?D???$z?`?
??N'C;??	?I??F:????
Of:??"}?C?(?e????
dly??0A?d\!???6P?t?)??(t???????u'XW	:??~?	?
?V???L?:@i?N?H11Des
??!??j??H?`?4???? 36??Hh?????????]	i?? ` ???x??)6K?n
????n.8?xrj??0??H?14???N??1????`?4:?kjF&b???????&??????x?B#z)88La?????0???KS0O?????^??0t??0E?Ecq?V?eIS???Z??????,?????mI#?F???Lc?&????Z??
RQ?+IG????
M4??
????N???H????Q?8?MF.
e[i,s??????\oZbW?5%Y???"i2?^?\q??^???.??]?????
??Q???
??\?v?z?!@??:?
?X?P??
~??$? ??z??eI?"?e?*p??
?$??h??*?G??y?V5??`??????^?v?}??k???UbK(???
(?b?@<{??!4??K?1?????6K??i69s??1??=D???P?c?;??b?"??P?-??&?L442??]?????eD9???l?
?	B?!?T???Q?f4D?5??+
%pc???#.??8?.Td?b`??ZmZ	fQ???3?0?"n???t$????:??@aJ
#??I54?]?1GB??(PP}8??	??????????J
??J?
+?{?*??l-C`>UTRB??fa?a??\
%&	???S@?H?Z?? ?L?Z??N????-???c_;"C?#
????h_??>?K?s???????D6{?lv?+l&???z???B4????m+-?K0?-?b????&?? riMi?Aet@?A?"?P?f""p0
u??v?6???_?J}Rd??(?Ar
)?	??Q????DT='??0??^?@'
??;H8F?!2????@
H*??
?(1+@?4(L?R???N$?	0?4?#B-R?4?Q-(?B?L?(&08?X?}??5?????)PUP_o(?@?%	T?AC1*?O?T?E??t???C??????T??X8'?]??
A?
?D??0LL??P@??b??AD?TQ?Xg????f????
??
??P?
?9p1*???:8F#??Sb??U??
4B8H?`???}??CP)i??rH?}
)0oCHD???!D?%???P????8
?????u?c??????XDm???_?T(?Y??????M??qV?????%??X
?I~!?@?
???8?s?CC????t0:Q????m+$H2E30?z???$Z?????!?1?H??2????a?#H???T???{?)?????n?OA???\?????E
EA?QM?2J?&CTu"?
-"?2%? ??
DP\(,G?-??.??an?=?RFe`?W????40??$??M??#i?Q3RK??G?BW?baX?Q??d*?i???
,4q???IU
4?
!LMV?c$2L????B	?J&`E?C!2^?4Wv??F6a ?}??@??J??5]T?E?
?h?:q?	???;?,? 2X?bz??j
IHl?????j2???
4?"???@S? ?>?!9%?G??!???R?9?SP^a???^0?HHD(?????p
@?C?????E??o?B?E9???n?j}?|?F???
M???Oy???:??f??ZB!???&?W>x???D??<??
????0???!?????4??!??	?C??$?1'cdp?.??$??#??C???xN?#?v?2(q'???y9??]N<?$f??????C???????'2??
?
I?i6??E?j?3??UZu?L`p?S?D??G(m??C?CB?X>?+?\??dx??Ah??rU??????rt
|????K?}??Ei?tZ
a????????0
?p`?(??54?????	????{?8????`7H!H??4Cs????czs?? C????Q?vO????????5??g???8??\????????Oh??l??F??5?+?4??]n??????????VteG1"d?@27?????!?!???h?@?Z(v??gr?:??xn????0????WF?yh??c?5U?b???&?????8?????<??&??fX?????M?E?i?l??
 3????8l??nw5???????u?5?v?Tg?`??1?B??OM*t??ms,<??C^3???$]??q?)?
?????-?e?d?????????!???e?S??Q???]'&????9
'?
?f?	??
???&??'?Gd@?y??"}???!\ &*?????A???8{p?A^i2??&?8?m*??6f?>?~???#????M????U??^a??8?.7????_t??+A????p?;?-?I???n?CF1$?`?3V?????u??s|????i???4?bI??j?H?<?|
???b%?h??l	?Qe?,?Q?r?c?y?????!??i?M?RK$?????L?S?+???%#?h?B?8???`?
+?P?8z ?!
?*?????O/??w?P
E$??3,EJ?I	)E5DE??D?DI#II at KH?R?%!)T?*SD)?4PT?T$T?S
$K"?-4?L???(T4?
)L%$%ST$??R
??f??=
?CA`?+??,x??#????f?P`@?.??Y(
M?,??}?i?@??h$	!?"B?J;?%)Q???">X1(Q??"	?fA?H&a ??? ????$?????h?????????XBd????`??I?F
? ?b(BI1p????!?0C?E=??*i???jQ?????{???<???J?J?????????l?9/????Bh=????
?`Kb?i@?! A??
??Q?]?pJ?D???????	P?*???]??g{<??}???r}?Qw=?9???(??eC?&|??;?k???KF???
V??JyWCuI8?M?":a??,
???FD?? ???UO?'q?M???F???Y?U?tu?}f?"?1
???QS??????MT? ??GCDH??~oW?L?^?[#~???
?z??wf?w?~,=KLz?"????:B~I???rdF.:B?Q??4?=??YF??BT?YP??11?cz?G?:L`:?i??(??
????m?'"J???F4??? ?1`?6364?P?(?c???`R&?A1?<??"?j????? ???4X????lcx?^H?=j?0yE?????PR?@?_???M?????
H?? 

	g3:!?C?tg?????S'?M#?q?`???H
}(
?0??>?OT\ bT? `??i???T9??IAT
?
?????]"???p??Q
????gi?;????X?!`c?f(FT4D?cS
hz?pp$|?
@???#?????Q???`nQ1)M?Y0??`???????5X???M??X?xL??
??/???????l%????os???A???&??DR=n?V????U?????4?8Lx?6!?%?C? ???@3T???
T?A6+???A5&K?S?9s8??????:?
??@(?E

-?LS?????L???iQF4?!??tAI?
????QI?>(???;v/?????|
??I?v??q?a	q??
E"wN??
f9??&??L?d?+?9MHiQ?J?SBG???$?????@??M?D?N?:?}?5}%W?????=a?n/l?	
d	?zR??C?Q>????hy?????*?r???
)??h?9????0? .?G}/?&???a?A$KA??????o???????-~!??RvL??pR!B$?A??:EX?!i8????$???l'2?;???88Ii ?A?f??=????????u????v?`? ?a?J??????a??:?????Z????2z???S?~2?pZ?Zg\??`
6?j
M.??WfA?C?//??????????YExK?????W?
Xo{#"?C????6?$9???"0??hb??z?^m?V???R?f4aG?C?J/8?;?^??X?1?BD5789!ITCA4?,?@d??M(C?????9?0b}r??d???2Q?'??p?>G?KRt-?
HAn???B?
I
^C?????@?!3a?qD&?x??hsQ?Rm?Ox?????A??`?#?Q	??O???95?xC=???C????qz/????4?$?K?????C?]I???<
?	
?~c_?????7?'?;tjh)? +????(C??V~Vu?W????y?????"jh???8??A???a
Y?{???u at 9]n?V????r9?Bj???<)??!hz???G??`wb???Q7P?
C??!L+????0f?d7?a?????k???i?xe)?~>
?-b05c(?x?N???D????y`??|D??Ek@??(??????}???D?=B?i?m?????W9U??oxRUD?0?UD'^?&?6s??*???>8I???nl`?d??|'l????J???B?%??C(D????5?P??;??)@?d??((D? a?jdr??????;(???D???x~$5'???
?*~+T5??7???]?5?????$1?????$????#A???+n??q?r??:9yfgn??&?[??
?Wj?A?
l`??8\?]?9?u?-???? x???)??r?:
??.#??L??!?f????:?PY?????:"??=y???????zs??2?G1S
|n?rXi??Vu????y{~?????Sr|?p??M??????t,?qHL
(#??(p?Z?P=@e"?C???
)!??d
&K@?*1)m?"?$5?Lf?+?8?;;k4???f
$PpY????
?????6?	?????
?*???^4P??JC??t??R??
b8???N?<???D&U????v??^??????-;N????sc?)tU?X?>?u?????r!2r0?? MO)$]?rQ?`U?O?????oQ??D;j?i?d??``?3`??????z?+?LC$tS1K#?baP^??????MC"?{??0????????y???@?>E????*??r?,??d{?sTs???B??t?(?(?c?B?E??Z??q???$?????M
??p?$:???????"?????i??]eEfW2?? }^`?}??|?????Q_b??J'a,?>`??O??=.??z???X??MQI???D??!?????e??1?h??Q???2&QV"?_[???%??"3??0n?n??b????WML?Q@;?l?{???@B????

^{G????@???!8??'?Oi??]???m?r?_y_`?)?$??q??{?5"??????L|^P?
?B??
?e??}??????%"?V 
s??L?p?IdB!??aD4??&?	'0???8?h

i???$??Y??)	??BL0??
(??d?
??p at w0u?6c??Zi??/?F%??(???jT??P?m????g???h p??????[^?C?????2?F??
?P?T???2?Jl??C ??
?N??z.??-@???i?K???
?i?
?lY??(4?;t?5???<a?	????v???p::dW?,?\???6hq??x?
E?`A?
?L1??&L 4`?#???bl+?D3R,?c
?+???????#D??
?m???????F+?????
SJ??iTx0w(4???

A8 "S?	? ?1?lpB$q??^?????A?L?>?LcDcN?#UZ"?3??	$?(
ih?d*C??H?j??6a???	L?R???1?'??~~????C?cT?S????
2P?,?$??
~??
r??Z?e
y?P?(B)?
F~???G??v??O???{[ap?(??+??'?,"zL?8???!???C?e ??R???nj,z?8H?8N?$??5????.?????X??r\.?{?'?l??;(k??|??`+???`D?]C???:?!?<?
???D???
???I`?*E?F?ThP`?JZ(E"T?E2" ?T?)bI%?"h???R????j?B?

z??D>?!???F(??Cb??!??GK?l9?????l??>p????%0?mc?:w??Q?`%????
~b?+xK???!H:N?????v??lP??0?.??????.HP??<??`h9???? ????h/?
??N?Y??C??#?'?
??? wB+?*?CB9??5?,??(?N?x???
|?2???? !y??_a?<?
HiaQ??;FZJ????I?@?n4&??T????Z?[m???b?h?1??BD@?v?Q??
i?C??"i4?9?_4T
?h???UQ]e??c??Q'N???%A?v?5?$?@??HZ'?F??
R?|??dU?U$??8???O?_zr??8??M?SQB?	?!?????PM????"$"??&
rF??9Tr???O)??w?X2??":????0???Q?ih?2?0??1??b!?"Dy%??J??P????,w??Z+qA??(??@
H??????M??????TP??QDH?-5"n@???f??a?????b??v@??Y???H?a??f?i%??
?D?v?5?!???l<?t;?:?!?ul??@l?)?b?HqS??0?G??;??5????
H?p??!E
??|??:a????C??4??0?\??l2i??	??(w?;#??4l
?.??T??6??k???.[*?(??D??j)????N?(??Mwp`wf?F???? 	bb%??6??9????z'L?
}?/<??tb|6??!??# 2?p(??`??"o??????@?
?a??S???
X???;?Y????t???4???	??[??@????BZrf??w?)?5???D$A1?$C?w???]?bZ??3????}??e?C8u?????/Ac???????#????L?????Z@??m;?pr??Y0ZV??%???<?C@:?~?@??=s#?F??????C???
?`???r???A????1??N?"S$???s ????_????]???
s-?3j??-`?R"??S???P?jt>??V??BsO[???"M???o?????? 0????:??????????Qx~0?G?$??q?hq?BeH"H"?!)Z??[?Z???????)Wp???0H`??0???d?@zJA?N?)H
%?{!?????NgT??
61??1$J???Y-?"w,+Dv??0?aA??????P1?

?%P??)~
?)K?ZP??6<<??Q?'8????
??PUELMS?tQ_????=?9??R??Rb?LM?T?f?f?0~??pz?(????<N??{???}??"&??Pw1??>B'e??Z?B??P:H?"ng
?M???
?) ??(???e?I?D?P_UJZa??
JD??Y?3???9 8?
?T?Q V@?

??
}t@?DE%e$d?""Q??=P:1v?G???X?!??Y????	f?(W?1??(?aN?e????? ?fB	??#1H???@????H??	?yx/?
A????02??[3jz?H?r???;?I`?K#???| yI??%$M???W?1???
1?mP$:??w?????R?Y???T?"?U"?I"`BiiI??DJF?@??X
????P???f?6C?#,?1?	j"?????B']?jJ?d???C,?!????MK4????Pd4?jj$???
\+??lc?i??pYC' $?????4dFv?Li??A2qD??Ji??.??"gD9?E4w?5k ?!S:]?6????#cZ??{?oR???u?@?	?4K+
F???,??!??)I??????.??$
?	?l???-b??)J????f&?"'m????d?L"?d ??S??????q!?6?V	?@+-????d? ?F??
6?0r0?UZ)?
t?

R?"???J!?i??J?Xb@

A(BIRHe???w?RI-_??RH&
?dPI~?65
3?w???????`ZO???c?????|e??????L?/??ccI0??v??6h??2=?bX0T!?M?P???PY???&
?:{??TQ5I?aL???}??????h?Tc??c??a?!?JQ~"B??U'"z?????9H5?C?N?Y???182??? ?]?
?fW\1?cF?R?
g??P4kgGr
??Dh?2?s?/O????/??????	G?

pa??!?cH0?3~q">24^j??R???^8p???'???0s??#?Bf-z?y???T?Py??_
?5$#$??????O2??l@?_b????c??\????4VY2l;%H???U????|?[a?A
i4??D??[
l?FSB-??p?s?0Y?L?i?w?!???
?|&Al?+????)E3{%o???????
9#??,??hp???_????xWti=??1]3?????X???4??C?Y??x???u?f?	?M??\???z$?^QzAZ?4?F?n?sLx95??#?Q:?t?????%?wA`O?wp??5?<d&??\??y?
?????lY????.?????8????il .?
?*??i??htYtt?????{?D;?9???X???y?^??H????3???Y?U?a?k?c??R0$?	??n~c?6?????p??O{qa??Ga3_?y??????o??W?O???>?????????8????W???_??l?????????????????_?_??tb}-w????????????????????
???tf?j????Q.j)??????]?3?lb??B??N8B?Cm?rd?f??8T?%???n228?$?yLq???w????R$???????h5????U?TA?s?.????
?l??
?T<d
??$
Ba?z???T??[(?N???:??I;????f?H??????e?gd??F#?vXx??????] ??5??~S??????"( C??4??M@?"?u??334r{?_??U???&?F?>?SS?!?????????=????a???m??Ukm?,'<? W??N?!?0]
??A?mH???????V?D
??pD???!?EK;$?????@?"t???
??	??????H?C?j?)x?????4????L?i?:?(?'?????2I'??$h?u?1????????|???
???

>?D2@$b?0?8?xC2?sw?hM?S? '@@1

?????@?Dre?W?Q??0??/~4|???F????Xp?X1r??*?NEpb??
&%?a?8?Y.)u$?"??L?d???0???Xw{??WU{??D4SzA5??<??`t%lm?-?)?
?&?'LnA??D
P?? ???????>?O'?~??????C
u??p??'?88?"!?I??b???r;????!?_?D?u4?
???c?????HAPY?d4HQ$@a?a+??,?EKJA???9fDw???YS???'?`????a???H??E>`k???v?????PbB(XW???^?N??7o?$?$??????P?a?9l?)????????Q?'?wt??x?G?/?t??4??8??lBx???D?:??i?k&?????
=NM?P?{???PUd??d??F???D??$?_T????B?
D?(f?1?X@D?0r?$????s7??!????y???U4a??c???7N???p(?L?	&,R??BcE?F8??1???? ?0jt?Ca
6??0?$??44?IP?f
4?21A?l$??(????Z
?LH?n:?*?{?]@?
b????f?d???`?h??T)F???<???kY.?6`?a
?*????(A?????`??BR#?A?
4??@9?^???5FA?&???J:???,?M=\h?D??C
P??[?<?2????Y!"e?dd
}(???`?I?"?A?????? ?
`?$e4m?,??I?2?lY???t???I0b%?a?)&h???;???p???lM???,{??H?UOL?1a?'?x????Y??30?	"
?
?V????B5k??\C\?"??#?
?3@?6m???????"?m9?.?`?
??K0?2??jX
Hc?i%US@????
?i?X??
=?)??????t?$?$U?(?C??7??2?D???:Z1???d?_?d???	???0?Z?-?.?:?????HY??av
??.(C???-
??>	????0????)?H1`aZV?SY?d????t?;???Q????#?d?????)?t]????o??????FE#!a????
????c??o?D#$d @??"P?3!
?@???
?qA??lH??6?o????+???N??????(?8
s?tq??>h&;(;???y???iy#?9ru?C?Ic???X7?%2?c??	I??T?j-r)????6?<"??|?}SI)
Xz?`hq?iX?FDv?????????;rk??p?>B??W?)??a?UYk_9?Q??.?t????Ey???S???se??n?@??
??2?+??
m?q?X?Q?_S?	\j?F?X&G#+sxD?"?	?M0??$Hn?.q??*?K?nf ??6m????Q4C???S??????{?
????P?"???,=??4
5G ???$?
6?wfh0??D???P>?
???q?}?I2???B?
?A?????4?O&Bd(ShB??4h??^????	??RRZ??	wL??$`???n#@???oj??3Y????N?:?\????x?6/????Z
h???4?qB?
????)?
?????Z??X?#??N??
???l?&??
45???????6?x?|????A?B??7?!?s4O?D?4?G??[U,m??d?8?f??
?6:D?S?&?U?>@;????PQh`?:U?
?)#????f(?'0R?b?e@????Q??*?*?%(`J`??q??IMA??
a??f??=?Oh5)?C?????"/H=2?K?
?C
W$",?????rD?li??iS???pP????6?dd
???B??(tY	???`q ne???R??
??Jw
$????xn?G??????9e?>?Ci>??<??;'??
d!???:4?5c???u?O??~??????pu[??Mh????v?9 )mR?	u??4r9H??6?C?uo_?:??^??$F???I@?I?Y`?Z4????;R}?b???<?T.H~yi?S?3QP3bJ?
?-???q?w6????I??2&?\?2?\#?????n??bmy?4v?`?????
(?&???<B??A??;???9BB???;c??@?$L3v?L??$-??+?r?f??4'?I????!?+??
+???9?"?4????l?Q\?.f????;?o???c?N??0n?o??*3??3????Z2)OG??`???Q%\2 ??}?c?"???B??????1?
???????r???????6??p')31/???"?????
3?3?A??4?lm?(?Y????sz1??Xj?/????8?)???ejF??C?h]X??????5???3?t?????T?,1	*?????l?&?G??h61???'i
c
/,??u|???????r?mi0?x?dd?1/#*??????J????]zZ??7??l8q|-?t???J3]?????<???hD#????b?J6? ??A
??CJ?2?_<??o??+W?M?rh-??m?gx?d?U??????ht?v?????2k?H??p?o?FY?\?????9lv???;??b????I??h???v?q??-?0????i_A????????]???pic#"?\??`v,U??2?x??;?1{J?m??u???1??E??.????a?8-?P?#?a??dT"????-??>4w?FrZIgBb?\
t?j[?"?=?L???O?V;<?zQ????rA????AC?<?'??]?????>?Z at J???
?	????_8k????????p???Hr?W?|??X??4]??????v=??:?pY???6]???uq????????s?????5"?E, ??????`?7?fe?C?W*&M*?|pt7?8?=(fF?"J???w?.j3?????C8???T?YV?K?????
}?_-F?~??J???mG??M?~??
|1US1(??B??g??*?1??R,?c?F?8=???i?P??@/????$?Y_????e??6???
~0=??????l?Oob	?????:u????3????A??\B=O*???V?-v):????4i?F????<j?f?F??Z??|+B?fM??')?h??24?????8?
?89???LY?0 f
%)????XC?l???????}PC??|6?*^?)*}?R?????$??9=&?qA?????r"C??!l4,9
?0t
??B???K????@<ah^JU?:
??-Np??i=???+?w?4]????#C?1?r	??	?`Fqf<]??iE"`i$????4??[UJ???*<??b?`???
???`?j???Y?X?o? Z?1?N??}?;"??0?Q`	F!???i?i?%?P????B?,1CPaH? a&?i"9 ????'????Q??0????????b+????=??i??dC???0%?=???_,Jn?
B??(??G??D????#?k?
=?9U@??_?qJ{?\??r ? H???^`?{??n:fC;??`?9?I?]?s???	?????M?(??h???A???????{????iS?h????0a% bI???dr?????M?X?R????~?t?uL?Gt????
????b?????ut?w0??\??@??*EP???)??w6?4"D	?x??-???Z?d??B7?H0L???????C b4?R??u~g6
???$&s??(*?<?
"E"<!?cf?E4
?=1<B?:?
I&?`??(P=x`P?0gO???L0?@???t?)??IB???g??A$?5???;?i?????
ZS !?B?????
???@???"??Xhv;~????8I(??D?c??]68?B}???w/??>?M???i?bb?l~????0~????????
?@ ???eb??????s???d?1JWH#]?uY?r#X0b4?B"D?$???C$:?i??bzd!Xai>P3?G??a(??????????
?;?W?
zAx at W?nC??A????T???T???1Mr??IcP2?pL?0u??y?
bD?P?MX9?8FP??M(????^,??b!??Ru??k??j(?
/????m???b,Y??%@??y?u0J.??^??}??p?????????1????B??H?
X(F??%??Jm7
2??1Sx3?:????:?.?8?Z??w4ej??"?6?`7=??|?GM/!M5I?;R?0;6U???1???vj`?e?<c???v??(p?7?o?q*2????UHS?j`z?p??r?	97h?&qt???0`T8R????'X?Zr?Jv???ff25?f?1
@?AI??Zi?Z?. e? z?o<???c:???????I76<t5?Z??q????*j?????*s#?K???']p?H?q?:???8?b?N??0????<
z???&??$0l$?rl??\?`w?YA?a?7?Uyi?????ZX?????7?zg?Q#ar???^?i?T??`?\bs
????LE4xim?7????tY?I????utp??
??`*??[d????nd?o
?#x??ZLX?h#??
???I"??$:?(??"$r
??ks&p5?*?b]:[?cSwff.m?=??????
?;??? 8#??@I?????6SE6H?Ip+?F???e?iMk,?n&]??
0J??X???jb??Yjz?\??d????5???E????}*X?cG5?R)??????
?L?$"x'??S?b???*t????U=?????j;????a?@???C#5%??m@d at k????e??`-0<(Wz??????0?????\bs
??6?Rt?$!*4A??????gx????wEc??o?M?],p?Ck*?8+:jV6?X????l?6Y?Ah?!???^??2g????
?s? ?Rl???R??D7T?????p?5???5?0??;sw???Ls????:????<TH??:
0?XS??I?|BY0x?FQ-??.?'2)CCAzX?Xh???? X?a
?8K??
???0c????'????HU~??A58P?t??"?
j??'@c
h$=i?rOU??????!?m at 9p?	??@?aI???B??R????bK?T~
`]?e?	????1????9?1????pq???R?H?hK%?????T?&Prvl??S???N??a??M~?$??(h??M???w???o???n?
a?*?-?<?P?A?_????2?~ ?8'?(h??}???????M\e?\??n????(d????{t
??p??!?8+?Z??*?d??l;Ft?A^K??O?J?Ss???.?k??|P??????}P?VT"?5???????!?L
%4%w?????w??y?x%X|??????6b???]H???H??(@??M+?+????M"?????&?!??"$?"P?	?
 >?`nl??h&)???t?ww?H^8???[???+

??+?U!H?E|?????DK?v?R?$B9V?f)@l?`2U???? ???B?0n??Mfd?=$?_???0L?"rJd!@??????
S?
???9?sE??b????DO??##j?@<Js6?2Q?!q?L
??jq?g( ? ?"?J
i?????HG??$??>??H?$?I???4????]??m??PS?!?P	??u1@`<<?qK???2p-??A
?
???
?m??4??F???*?WP?S???hF	A ???X
z??t??????2???Ac?(5H??$2??E2??m??????TcY?bCFA?d ?YJ?kQ&BT?-S??7X?z?T?*v$?h??f
!?!???v/?&`=???`?(J8B?0?B?c1TT? w63HB?B?J%??S
6Y??J????? iV?*??j?I? h?? ?S?;?0??????C`!)??4
?!???l?s9Tb???'?	?kF??Qi8????wC??!?E?X?
??G?? GY?MG?.????T? 
e????C???wL=Y?>??8??{???
Y?P?b???X?D???? ?3Krx;ox at Qv
?S?JuW?? ??!?Q??
??{?i?$??(????X+????8D???mo???????b??a?y?????WgY:0Py?C???2"??&?DLU?@-:?K??K??yf?\:6?V}$-!W?
?
/2(B?"??b	?y????_?
????#S"???f|??`SrH0`1????

J?P???a?5
?d??%(?C????yK??	?H#?&?J? H?
X|~?SQ
S2,
:u(H0'H'????O???{?????!?:?????P??CJ,????I
?S??Bf??G??wa?qC9?
9?*????6?p???O$r?&??R?$??1???$??3??/r?AHZs?|????????P?E1?A????=??*?A5]??
M0L??AG?2??{??????,?0?2}*??"k?s@?L?"??%Ot?x?$?&?
??M???S[go???`??M24??+O$??C??BH??????(O??8??X???M%?>???A???x??G$	?? J?????>?????U?A3a&%???BIk???C?J??????????^7!??CrT{)???H4
L4PY???`??#??????????
i??1
??!?"(d?#!?d'???u9,?
?4?cJ?? ????P
?>?X?l??U??O?&??
?>)4??))??&?"`??81??@?G?p???6BqP????0?????8<*???<???t??????e?
??????Q????s2x}/?(?U4OFT7z?????}y???!????D?$i?1???oSa?? L?SN_??N#z!?]?????3q=?U??+Q??;?O7???????b???
h?$?M	
	??	????8U7??a?ZY?')???TA
H?I?S? |??
1?b$?4&??`;tS?A/M?#????Gyv?G??@pFa??$CD???0
H???4 ?\?1
?s???vQB6AH!NK?N9???D[3????#"U\??3???;Z??1???z???h?H?nw???%?-U{E???z?C?4GC?_??{?SC???fu??@?N?:?
?:?'?????$[???[?B8???u?9?(4?ZV?&96?????K[aDX??Ud?2g
_?1
??|?e??:?2(>???G??S??4!?9??EX??R$$A?)?????@3??NKF?,?KJ:?U$??#G??
?/??/h?+?p?S}??w???????b?Wr2?g???4??	-?6xs??b>?"3:??Su_?h??"#?"b?d?_SY??UM?N??ye?x?j9d?b???
A???5??L6N?:????!r??v&?d5??$??6e???????????l?k??{??????5?N?L?5M?s??QZB#D??\?????)??F*\G=*??3@???Ce+???j?bq&????2?4=??C:E?D?h?p
??'s??iAH?k?#<EF?H??
$?????5?\????Z
_4??]?k;A??M0(28???8A?
}?2?$A???:Q??Yk??Y??A~?
@?
 ?#???? ,s@????US?"?,I?
s??/j??D#? "?p@?$0c????A???a???Q?O??@?!?
%?(J???j*(B?????~x????????????h?"??*i????(?*??b"Bj
b??????&L??*??b (?!?L?0
b??a????=?Xs?Rb????c?VX&S???yO???????	??!?c?4??c?G?????Q????bQ?t??-?W??	?U?
?K????`???;???G????,???C?G?XA?
|<???????0??4??n?fO???RP?,?YiS???????V

Index: pam_mount.spec
===================================================================
RCS file: /cvs/extras/rpms/pam_mount/devel/pam_mount.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pam_mount.spec	2 Jan 2006 04:53:30 -0000	1.10
+++ pam_mount.spec	3 Apr 2006 00:33:11 -0000	1.11
@@ -1,10 +1,11 @@
 Summary: A PAM module that can mount volumes for a user session
 Name: pam_mount
-Version: 0.11.0
+Version: 0.13.0
 Release: 1
 License: LGPL
 Group: System Environment/Base
 Source: http://prdownloads.sourceforge.net/pam-mount/%{name}-%{version}.tbz2
+Patch0: pam_mount-0.13.0-loop.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://pam-mount.sourceforge.net/
 Requires: pam
@@ -50,17 +51,16 @@
 
 
 %setup
+%patch0 -p1
 
 
 %build
-# See BZ 174190 for why this definition is required.
-export CFLAGS=-I/lib/modules/`uname -r`/build/include/
 %configure --libdir=/%{_lib}
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall libdir=/%{_lib}
+%makeinstall libdir=/${RPM_BUILD_ROOT}/%{_lib}
 mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/security
 mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/selinux/strict/src/policy/macros
 mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/selinux/strict/src/policy/file_contexts/misc
@@ -97,6 +97,11 @@
 
 
 %changelog
+* Sun Apr 02 2006 W. Michael Petullo <mike[@]flyn.org> - 0.13.0-1
+   - Updated to pam_mount 0.13.0.
+   - Added patch to allow to build with local loop.h (see RH BZ 174190.)
+   - Ensure module installed in RPM_BUILD_ROOT when building package.
+
 * Sun Jan 01 2006 W. Michael Petullo <mike[@]flyn.org> - 0.11.0-1
    - Updated to pam_mount 0.11.0.
    - Mike Petullo is no longer the up-stream maintainer.


--- pam_mount-0.11.0.tbz2 DELETED ---



From fedora-extras-commits at redhat.com  Mon Apr  3 01:33:35 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Sun,  2 Apr 2006 18:33:35 -0700
Subject: rpms/pam_mount import.log,1.15,1.16
Message-ID: <200604030134.k331Y76v015813@cvs-int.fedora.redhat.com>

Author: mikep

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pam_mount/import.log,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- import.log	3 Apr 2006 00:33:11 -0000	1.15
+++ import.log	3 Apr 2006 01:33:35 -0000	1.16
@@ -12,3 +12,4 @@
 pam_mount-0_9_25-5:HEAD:pam_mount-0.9.25-5.src.rpm:1132804079
 pam_mount-0_11_0-1:HEAD:pam_mount-0.11.0-1.src.rpm:1136177590
 pam_mount-0_13_0-1:HEAD:pam_mount-0.13.0-1.src.rpm:1144024378
+pam_mount-0_13_0-2:HEAD:pam_mount-0.13.0-2.src.rpm:1144028006



From fedora-extras-commits at redhat.com  Mon Apr  3 01:33:36 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Sun,  2 Apr 2006 18:33:36 -0700
Subject: rpms/pam_mount/devel pam_mount.spec,1.11,1.12
Message-ID: <200604030134.k331Y8rl015816@cvs-int.fedora.redhat.com>

Author: mikep

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

Modified Files:
	pam_mount.spec 
Log Message:
auto-import pam_mount-0.13.0-2 on branch devel from pam_mount-0.13.0-2.src.rpm


Index: pam_mount.spec
===================================================================
RCS file: /cvs/extras/rpms/pam_mount/devel/pam_mount.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pam_mount.spec	3 Apr 2006 00:33:11 -0000	1.11
+++ pam_mount.spec	3 Apr 2006 01:33:36 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: A PAM module that can mount volumes for a user session
 Name: pam_mount
 Version: 0.13.0
-Release: 1
+Release: 2
 License: LGPL
 Group: System Environment/Base
 Source: http://prdownloads.sourceforge.net/pam-mount/%{name}-%{version}.tbz2
@@ -64,9 +64,9 @@
 mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/security
 mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/selinux/strict/src/policy/macros
 mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/selinux/strict/src/policy/file_contexts/misc
-install --owner=root --group=root --mode=0644 config/pam_mount.conf ${RPM_BUILD_ROOT}/%{_sysconfdir}/security
-install --owner=root --group=root --mode=0644 config/pam_mount_macros.te ${RPM_BUILD_ROOT}/%{_sysconfdir}/selinux/strict/src/policy/macros
-install --owner=root --group=root --mode=0644 config/pam_mount.fc ${RPM_BUILD_ROOT}/%{_sysconfdir}/selinux/strict/src/policy/file_contexts/misc
+install --mode=0644 config/pam_mount.conf ${RPM_BUILD_ROOT}/%{_sysconfdir}/security
+install --mode=0644 config/pam_mount_macros.te ${RPM_BUILD_ROOT}/%{_sysconfdir}/selinux/strict/src/policy/macros
+install --mode=0644 config/pam_mount.fc ${RPM_BUILD_ROOT}/%{_sysconfdir}/selinux/strict/src/policy/file_contexts/misc
 rm -f ${RPM_BUILD_ROOT}/%{_lib}/security/pam_mount.a
 rm -f ${RPM_BUILD_ROOT}/%{_lib}/security/pam_mount.la
 
@@ -97,6 +97,9 @@
 
 
 %changelog
+* Sun Apr 02 2006 W. Michael Petullo <mike[@]flyn.org> - 0.13.0-2
+   - Don't use --owner=root or --group=root on install.
+
 * Sun Apr 02 2006 W. Michael Petullo <mike[@]flyn.org> - 0.13.0-1
    - Updated to pam_mount 0.13.0.
    - Added patch to allow to build with local loop.h (see RH BZ 174190.)



From fedora-extras-commits at redhat.com  Mon Apr  3 01:54:09 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  2 Apr 2006 18:54:09 -0700
Subject: rpms/ebtables/FC-3 ebtables.spec,1.6,1.7
Message-ID: <200604030154.k331sfXL016033@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ebtables/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15969/FC-3

Modified Files:
	ebtables.spec 
Log Message:

Package up shared libs too



Index: ebtables.spec
===================================================================
RCS file: /cvs/extras/rpms/ebtables/FC-3/ebtables.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ebtables.spec	29 Mar 2006 21:42:10 -0000	1.6
+++ ebtables.spec	3 Apr 2006 01:54:08 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:		ebtables
 Version:	2.0.8
-Release:	0.3.%{prever}%{?dist}
+Release:	0.4.%{prever}%{?dist}
 Summary:	Ethernet Bridge frame table administration tool
 License:	GPL
 Group:		System Environment/Base
@@ -33,6 +33,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -D -m0755 extensions/*.so $RPM_BUILD_ROOT%{_libdir}
+install -D -m0755 *.so $RPM_BUILD_ROOT%{_libdir}
 install -D -m0755 ebtables $RPM_BUILD_ROOT/sbin/ebtables
 install -D -m0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/ebtables
 install -D -m0644 ethertypes $RPM_BUILD_ROOT%{_sysconfdir}/ethertypes
@@ -46,6 +48,7 @@
 
 %post
 /sbin/chkconfig --add ebtables
+/sbin/ldconfig
 
 %preun
 if [ $1 -eq 0 ]; then
@@ -57,6 +60,7 @@
 if [ $1 -ge 1 ]; then
 	/sbin/service ebtables condrestart &> /dev/null || :
 fi
+/sbin/ldconfig
 
 %files
 %defattr(-, root, root, 0755)
@@ -64,12 +68,16 @@
 %doc %{_mandir}/man8/ebtables.8*
 %config(noreplace) %{_sysconfdir}/ethertypes
 %{_initrddir}/ebtables
+%{_libdir}/libebt*.so
 /sbin/ebtables
 %ghost %{_sysconfdir}/ebtables.filter
 %ghost %{_sysconfdir}/ebtables.nat
 %ghost %{_sysconfdir}/ebtables.broute
 
 %changelog
+* Sun Apr  2 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.4.rc1
+- package up the shared libs too
+
 * Wed Mar 29 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.3.rc1
 - use -fPIC
 



From fedora-extras-commits at redhat.com  Mon Apr  3 01:54:09 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  2 Apr 2006 18:54:09 -0700
Subject: rpms/ebtables/FC-4 ebtables.spec,1.6,1.7
Message-ID: <200604030154.k331sfqw016036@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	ebtables.spec 
Log Message:

Package up shared libs too



Index: ebtables.spec
===================================================================
RCS file: /cvs/extras/rpms/ebtables/FC-4/ebtables.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ebtables.spec	29 Mar 2006 21:42:11 -0000	1.6
+++ ebtables.spec	3 Apr 2006 01:54:09 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:		ebtables
 Version:	2.0.8
-Release:	0.3.%{prever}%{?dist}
+Release:	0.4.%{prever}%{?dist}
 Summary:	Ethernet Bridge frame table administration tool
 License:	GPL
 Group:		System Environment/Base
@@ -33,6 +33,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -D -m0755 extensions/*.so $RPM_BUILD_ROOT%{_libdir}
+install -D -m0755 *.so $RPM_BUILD_ROOT%{_libdir}
 install -D -m0755 ebtables $RPM_BUILD_ROOT/sbin/ebtables
 install -D -m0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/ebtables
 install -D -m0644 ethertypes $RPM_BUILD_ROOT%{_sysconfdir}/ethertypes
@@ -46,6 +48,7 @@
 
 %post
 /sbin/chkconfig --add ebtables
+/sbin/ldconfig
 
 %preun
 if [ $1 -eq 0 ]; then
@@ -57,6 +60,7 @@
 if [ $1 -ge 1 ]; then
 	/sbin/service ebtables condrestart &> /dev/null || :
 fi
+/sbin/ldconfig
 
 %files
 %defattr(-, root, root, 0755)
@@ -64,12 +68,16 @@
 %doc %{_mandir}/man8/ebtables.8*
 %config(noreplace) %{_sysconfdir}/ethertypes
 %{_initrddir}/ebtables
+%{_libdir}/libebt*.so
 /sbin/ebtables
 %ghost %{_sysconfdir}/ebtables.filter
 %ghost %{_sysconfdir}/ebtables.nat
 %ghost %{_sysconfdir}/ebtables.broute
 
 %changelog
+* Sun Apr  2 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.4.rc1
+- package up the shared libs too
+
 * Wed Mar 29 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.3.rc1
 - use -fPIC
 



From fedora-extras-commits at redhat.com  Mon Apr  3 01:54:15 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  2 Apr 2006 18:54:15 -0700
Subject: rpms/ebtables/FC-5 ebtables.spec,1.7,1.8
Message-ID: <200604030154.k331slF9016039@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	ebtables.spec 
Log Message:

Package up shared libs too



Index: ebtables.spec
===================================================================
RCS file: /cvs/extras/rpms/ebtables/FC-5/ebtables.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ebtables.spec	29 Mar 2006 21:42:12 -0000	1.7
+++ ebtables.spec	3 Apr 2006 01:54:15 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:		ebtables
 Version:	2.0.8
-Release:	0.3.%{prever}%{?dist}
+Release:	0.4.%{prever}%{?dist}
 Summary:	Ethernet Bridge frame table administration tool
 License:	GPL
 Group:		System Environment/Base
@@ -33,6 +33,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -D -m0755 extensions/*.so $RPM_BUILD_ROOT%{_libdir}
+install -D -m0755 *.so $RPM_BUILD_ROOT%{_libdir}
 install -D -m0755 ebtables $RPM_BUILD_ROOT/sbin/ebtables
 install -D -m0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/ebtables
 install -D -m0644 ethertypes $RPM_BUILD_ROOT%{_sysconfdir}/ethertypes
@@ -46,6 +48,7 @@
 
 %post
 /sbin/chkconfig --add ebtables
+/sbin/ldconfig
 
 %preun
 if [ $1 -eq 0 ]; then
@@ -57,6 +60,7 @@
 if [ $1 -ge 1 ]; then
 	/sbin/service ebtables condrestart &> /dev/null || :
 fi
+/sbin/ldconfig
 
 %files
 %defattr(-, root, root, 0755)
@@ -64,12 +68,16 @@
 %doc %{_mandir}/man8/ebtables.8*
 %config(noreplace) %{_sysconfdir}/ethertypes
 %{_initrddir}/ebtables
+%{_libdir}/libebt*.so
 /sbin/ebtables
 %ghost %{_sysconfdir}/ebtables.filter
 %ghost %{_sysconfdir}/ebtables.nat
 %ghost %{_sysconfdir}/ebtables.broute
 
 %changelog
+* Sun Apr  2 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.4.rc1
+- package up the shared libs too
+
 * Wed Mar 29 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.3.rc1
 - use -fPIC
 



From fedora-extras-commits at redhat.com  Mon Apr  3 01:54:16 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  2 Apr 2006 18:54:16 -0700
Subject: rpms/ebtables/devel ebtables.spec,1.7,1.8
Message-ID: <200604030154.k331smqD016042@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	ebtables.spec 
Log Message:

Package up shared libs too



Index: ebtables.spec
===================================================================
RCS file: /cvs/extras/rpms/ebtables/devel/ebtables.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ebtables.spec	29 Mar 2006 21:42:13 -0000	1.7
+++ ebtables.spec	3 Apr 2006 01:54:15 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:		ebtables
 Version:	2.0.8
-Release:	0.3.%{prever}%{?dist}
+Release:	0.4.%{prever}%{?dist}
 Summary:	Ethernet Bridge frame table administration tool
 License:	GPL
 Group:		System Environment/Base
@@ -33,6 +33,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -D -m0755 extensions/*.so $RPM_BUILD_ROOT%{_libdir}
+install -D -m0755 *.so $RPM_BUILD_ROOT%{_libdir}
 install -D -m0755 ebtables $RPM_BUILD_ROOT/sbin/ebtables
 install -D -m0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/ebtables
 install -D -m0644 ethertypes $RPM_BUILD_ROOT%{_sysconfdir}/ethertypes
@@ -46,6 +48,7 @@
 
 %post
 /sbin/chkconfig --add ebtables
+/sbin/ldconfig
 
 %preun
 if [ $1 -eq 0 ]; then
@@ -57,6 +60,7 @@
 if [ $1 -ge 1 ]; then
 	/sbin/service ebtables condrestart &> /dev/null || :
 fi
+/sbin/ldconfig
 
 %files
 %defattr(-, root, root, 0755)
@@ -64,12 +68,16 @@
 %doc %{_mandir}/man8/ebtables.8*
 %config(noreplace) %{_sysconfdir}/ethertypes
 %{_initrddir}/ebtables
+%{_libdir}/libebt*.so
 /sbin/ebtables
 %ghost %{_sysconfdir}/ebtables.filter
 %ghost %{_sysconfdir}/ebtables.nat
 %ghost %{_sysconfdir}/ebtables.broute
 
 %changelog
+* Sun Apr  2 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.4.rc1
+- package up the shared libs too
+
 * Wed Mar 29 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.3.rc1
 - use -fPIC
 



From fedora-extras-commits at redhat.com  Mon Apr  3 02:21:13 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  2 Apr 2006 19:21:13 -0700
Subject: rpms/ebtables/devel ebtables.spec,1.8,1.9
Message-ID: <200604030221.k332LFuR019204@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	ebtables.spec 
Log Message:

Fix stupid mistake.



Index: ebtables.spec
===================================================================
RCS file: /cvs/extras/rpms/ebtables/devel/ebtables.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ebtables.spec	3 Apr 2006 01:54:15 -0000	1.8
+++ ebtables.spec	3 Apr 2006 02:21:13 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:		ebtables
 Version:	2.0.8
-Release:	0.4.%{prever}%{?dist}
+Release:	0.5.%{prever}%{?dist}
 Summary:	Ethernet Bridge frame table administration tool
 License:	GPL
 Group:		System Environment/Base
@@ -33,8 +33,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -D -m0755 extensions/*.so $RPM_BUILD_ROOT%{_libdir}
-install -D -m0755 *.so $RPM_BUILD_ROOT%{_libdir}
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+install -m0755 extensions/*.so $RPM_BUILD_ROOT%{_libdir}
+install -m0755 *.so $RPM_BUILD_ROOT%{_libdir}
 install -D -m0755 ebtables $RPM_BUILD_ROOT/sbin/ebtables
 install -D -m0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/ebtables
 install -D -m0644 ethertypes $RPM_BUILD_ROOT%{_sysconfdir}/ethertypes
@@ -75,6 +76,9 @@
 %ghost %{_sysconfdir}/ebtables.broute
 
 %changelog
+* Sun Apr  2 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.5.rc1
+- learn to use "install" correctly. :/
+
 * Sun Apr  2 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.4.rc1
 - package up the shared libs too
 



From fedora-extras-commits at redhat.com  Mon Apr  3 02:21:06 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  2 Apr 2006 19:21:06 -0700
Subject: rpms/ebtables/FC-3 ebtables.spec,1.7,1.8
Message-ID: <200604030221.k332LcKP019451@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ebtables/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18941/FC-3

Modified Files:
	ebtables.spec 
Log Message:

Fix stupid mistake.



Index: ebtables.spec
===================================================================
RCS file: /cvs/extras/rpms/ebtables/FC-3/ebtables.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ebtables.spec	3 Apr 2006 01:54:08 -0000	1.7
+++ ebtables.spec	3 Apr 2006 02:21:05 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:		ebtables
 Version:	2.0.8
-Release:	0.4.%{prever}%{?dist}
+Release:	0.5.%{prever}%{?dist}
 Summary:	Ethernet Bridge frame table administration tool
 License:	GPL
 Group:		System Environment/Base
@@ -33,8 +33,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -D -m0755 extensions/*.so $RPM_BUILD_ROOT%{_libdir}
-install -D -m0755 *.so $RPM_BUILD_ROOT%{_libdir}
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+install -m0755 extensions/*.so $RPM_BUILD_ROOT%{_libdir}
+install -m0755 *.so $RPM_BUILD_ROOT%{_libdir}
 install -D -m0755 ebtables $RPM_BUILD_ROOT/sbin/ebtables
 install -D -m0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/ebtables
 install -D -m0644 ethertypes $RPM_BUILD_ROOT%{_sysconfdir}/ethertypes
@@ -75,6 +76,9 @@
 %ghost %{_sysconfdir}/ebtables.broute
 
 %changelog
+* Sun Apr  2 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.5.rc1
+- learn to use "install" correctly. :/
+
 * Sun Apr  2 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.4.rc1
 - package up the shared libs too
 



From fedora-extras-commits at redhat.com  Mon Apr  3 02:21:06 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  2 Apr 2006 19:21:06 -0700
Subject: rpms/ebtables/FC-4 ebtables.spec,1.7,1.8
Message-ID: <200604030221.k332LcBa019462@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	ebtables.spec 
Log Message:

Fix stupid mistake.



Index: ebtables.spec
===================================================================
RCS file: /cvs/extras/rpms/ebtables/FC-4/ebtables.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ebtables.spec	3 Apr 2006 01:54:09 -0000	1.7
+++ ebtables.spec	3 Apr 2006 02:21:06 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:		ebtables
 Version:	2.0.8
-Release:	0.4.%{prever}%{?dist}
+Release:	0.5.%{prever}%{?dist}
 Summary:	Ethernet Bridge frame table administration tool
 License:	GPL
 Group:		System Environment/Base
@@ -33,8 +33,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -D -m0755 extensions/*.so $RPM_BUILD_ROOT%{_libdir}
-install -D -m0755 *.so $RPM_BUILD_ROOT%{_libdir}
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+install -m0755 extensions/*.so $RPM_BUILD_ROOT%{_libdir}
+install -m0755 *.so $RPM_BUILD_ROOT%{_libdir}
 install -D -m0755 ebtables $RPM_BUILD_ROOT/sbin/ebtables
 install -D -m0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/ebtables
 install -D -m0644 ethertypes $RPM_BUILD_ROOT%{_sysconfdir}/ethertypes
@@ -75,6 +76,9 @@
 %ghost %{_sysconfdir}/ebtables.broute
 
 %changelog
+* Sun Apr  2 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.5.rc1
+- learn to use "install" correctly. :/
+
 * Sun Apr  2 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.4.rc1
 - package up the shared libs too
 



From fedora-extras-commits at redhat.com  Mon Apr  3 02:21:07 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  2 Apr 2006 19:21:07 -0700
Subject: rpms/ebtables/FC-5 ebtables.spec,1.8,1.9
Message-ID: <200604030221.k332Ldxj019474@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	ebtables.spec 
Log Message:

Fix stupid mistake.



Index: ebtables.spec
===================================================================
RCS file: /cvs/extras/rpms/ebtables/FC-5/ebtables.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ebtables.spec	3 Apr 2006 01:54:15 -0000	1.8
+++ ebtables.spec	3 Apr 2006 02:21:07 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:		ebtables
 Version:	2.0.8
-Release:	0.4.%{prever}%{?dist}
+Release:	0.5.%{prever}%{?dist}
 Summary:	Ethernet Bridge frame table administration tool
 License:	GPL
 Group:		System Environment/Base
@@ -33,8 +33,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -D -m0755 extensions/*.so $RPM_BUILD_ROOT%{_libdir}
-install -D -m0755 *.so $RPM_BUILD_ROOT%{_libdir}
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+install -m0755 extensions/*.so $RPM_BUILD_ROOT%{_libdir}
+install -m0755 *.so $RPM_BUILD_ROOT%{_libdir}
 install -D -m0755 ebtables $RPM_BUILD_ROOT/sbin/ebtables
 install -D -m0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/ebtables
 install -D -m0644 ethertypes $RPM_BUILD_ROOT%{_sysconfdir}/ethertypes
@@ -75,6 +76,9 @@
 %ghost %{_sysconfdir}/ebtables.broute
 
 %changelog
+* Sun Apr  2 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.5.rc1
+- learn to use "install" correctly. :/
+
 * Sun Apr  2 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.4.rc1
 - package up the shared libs too
 



From fedora-extras-commits at redhat.com  Mon Apr  3 05:56:16 2006
From: fedora-extras-commits at redhat.com (Radek Vokál (rvokal))
Date: Sun,  2 Apr 2006 22:56:16 -0700
Subject: rpms/gjots2 - New directory
Message-ID: <200604030556.k335uIRU027960@cvs-int.fedora.redhat.com>

Author: rvokal

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

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




From fedora-extras-commits at redhat.com  Mon Apr  3 05:56:17 2006
From: fedora-extras-commits at redhat.com (Radek Vokál (rvokal))
Date: Sun,  2 Apr 2006 22:56:17 -0700
Subject: rpms/gjots2/devel - New directory
Message-ID: <200604030556.k335uJI5027963@cvs-int.fedora.redhat.com>

Author: rvokal

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

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




From fedora-extras-commits at redhat.com  Mon Apr  3 05:57:09 2006
From: fedora-extras-commits at redhat.com (Radek Vokál (rvokal))
Date: Sun,  2 Apr 2006 22:57:09 -0700
Subject: rpms/gjots2 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604030557.k335vBti028012@cvs-int.fedora.redhat.com>

Author: rvokal

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

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


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

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

common : CVS/Root
	@cvs 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 Apr  3 05:57:10 2006
From: fedora-extras-commits at redhat.com (Radek Vokál (rvokal))
Date: Sun,  2 Apr 2006 22:57:10 -0700
Subject: rpms/gjots2/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604030557.k335vCAp028015@cvs-int.fedora.redhat.com>

Author: rvokal

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

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


--- 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 Apr  3 05:58:56 2006
From: fedora-extras-commits at redhat.com (Radek Vokál (rvokal))
Date: Sun,  2 Apr 2006 22:58:56 -0700
Subject: rpms/gjots2 import.log,1.1,1.2
Message-ID: <200604030558.k335wwbC028082@cvs-int.fedora.redhat.com>

Author: rvokal

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

Modified Files:
	import.log 
Log Message:
auto-import gjots2-2.3.4-4 on branch devel from gjots2-2.3.4-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gjots2/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	3 Apr 2006 05:57:09 -0000	1.1
+++ import.log	3 Apr 2006 05:58:56 -0000	1.2
@@ -0,0 +1 @@
+gjots2-2_3_4-4:HEAD:gjots2-2.3.4-4.src.rpm:1144043916



From fedora-extras-commits at redhat.com  Mon Apr  3 05:58:57 2006
From: fedora-extras-commits at redhat.com (Radek Vokál (rvokal))
Date: Sun,  2 Apr 2006 22:58:57 -0700
Subject: rpms/gjots2/devel gjots2-2.3.4-sitelib.patch, NONE, 1.1 gjots2.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604030558.k335wxkg028089@cvs-int.fedora.redhat.com>

Author: rvokal

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

Modified Files:
	.cvsignore sources 
Added Files:
	gjots2-2.3.4-sitelib.patch gjots2.spec 
Log Message:
auto-import gjots2-2.3.4-4 on branch devel from gjots2-2.3.4-4.src.rpm

gjots2-2.3.4-sitelib.patch:

--- NEW FILE gjots2-2.3.4-sitelib.patch ---
--- gjots2-2.3.4/bin/gjots2.lib	2005-12-24 09:02:42.000000000 +0100
+++ gjots2-2.3.4/bin/gjots2	2006-03-28 16:16:13.000000000 +0200
@@ -3,6 +3,7 @@
 import sys, os, getopt
 import gettext
 gettext.install('gjots2', '/usr/share/locale')
+from distutils.sysconfig import get_python_lib
 
 def ver2str(ver):
     return ".".join(map(str,ver))
@@ -63,7 +64,7 @@
 	else:
 		# Assumption: we're running from $prefix/bin
 		prefix, bin = os.path.split(dirName)
-		sys.path = [ prefix + '/lib/gjots2' ] + sys.path
+		sys.path = [ get_python_lib() + '/gjots2' ] + sys.path
 
 	from gui import *
 	from version import *


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

# $Id: gjots2.spec,v 1.12.2.12 2006/01/23 17:26:14 bhepple Exp $
#   Copyright (C) 2002-2005 Robert Hepple 
#
#   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.

%define ver 2.3.4
%define rel 4

Summary: A note jotter - Organise your ideas, notes, facts in a hierarchy
Name: gjots2
Version: %{ver}
Release: %{rel}%{?dist}
URL: http://bhepple.freeshell.org/gjots
Source: http://bhepple.freeshell.org/gjots/%{name}-%{version}.tgz
Patch0: gjots2-2.3.4-sitelib.patch
License: GPL
Group: Applications/Productivity
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: desktop-file-utils

Requires: python >= 2.3, pygtk2 >= 2.4.0, gnome-python2 >= 2.0.2
Requires: libglade2 >= 2.4, gnome-python2-gconf >= 2.6.0

%description

gjots2 ("gee-jots" or, if you prefer, "gyachts"!) is a way to marshall
and organise your text notes in a convenient, hierachical way. I use
it for all my notes on Unix, my personal bits and pieces, recipes and
even PINs and passwords (encrypted with ccrypt(1)).

You can also use it to "mind-map" your compositions - write down all
your thoughts and then start to organise them into a tree. By
manipulating the tree you can easily reorder your thoughts and
structure them appropriately.

%prep
%setup -q
%patch0 -p1 -b .lib

iconv -f iso-8859-1 -t utf-8 -o man.tmp share/man/man1/docbook2gjots.1 && mv man.tmp share/man/man1/docbook2gjots.1
iconv -f iso-8859-1 -t utf-8 -o man.tmp share/man/man1/gjots2docbook.1 && mv man.tmp share/man/man1/gjots2docbook.1
iconv -f iso-8859-1 -t utf-8 -o man.tmp share/man/man1/gjots2html.1 && mv man.tmp share/man/man1/gjots2html.1

%build
%install

# typically:
#	buildroot=/var/tmp/root-gjots2-2.3.4
#	_datadir=/usr/share
#	_bindir=/usr/bin
#	_libdir=/usr/lib

%{__rm} -rf %{buildroot}
%{__install} -d -m0755  \
                        %{buildroot}%{_datadir}/applications \
                        %{buildroot}%{_datadir}/%{name} \
                        %{buildroot}%{_datadir}/pixmaps \
                        %{buildroot}%{_datadir}/man/man1 \
                        %{buildroot}%{python_sitelib}/%{name} \
                        %{buildroot}%{_bindir} \
						%{buildroot}%{_datadir}/locale/en_US/LC_MESSAGES \
						%{buildroot}%{_datadir}/locale/fr/LC_MESSAGES \
						%{buildroot}%{_datadir}/locale/no/LC_MESSAGES \
						%{buildroot}%{_datadir}/locale/nb/LC_MESSAGES \
						%{buildroot}%{_datadir}/locale/ru/LC_MESSAGES

%{__install} -m0755 bin/gjots2 bin/gjots2docbook bin/gjots2html bin/docbook2gjots %{buildroot}%{_bindir}/
%{__install} -m0644 lib/*.py %{buildroot}%{python_sitelib}/%{name}/
%{__install} -m0644 gjots.glade2 %{buildroot}%{_datadir}/%{name}
%{__install} -m0644 gjots.png %{buildroot}%{_datadir}/%{name}
%{__install} -m0644 gjots.png %{buildroot}%{_datadir}/pixmaps/
%{__install} -m0644 gjots2-hide-all.png %{buildroot}%{_datadir}/%{name}
%{__install} -m0644 gjots2-merge-items.png %{buildroot}%{_datadir}/%{name}
%{__install} -m0644 gjots2-new-child.png %{buildroot}%{_datadir}/%{name}
%{__install} -m0644 gjots2-new-page.png %{buildroot}%{_datadir}/%{name}
%{__install} -m0644 gjots2-show-all.png %{buildroot}%{_datadir}/%{name}
%{__install} -m0644 gjots2-split-item.png %{buildroot}%{_datadir}/%{name}
desktop-file-install --vendor fedora                            \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
                --add-category X-Fedora                         \
                        %{name}.desktop

%{__install} -m0644 share/man/man1/gjots2.1 %{buildroot}%{_datadir}/man/man1
%{__install} -m0644 share/man/man1/gjots2html.1 %{buildroot}%{_datadir}/man/man1
%{__install} -m0644 share/man/man1/gjots2docbook.1 %{buildroot}%{_datadir}/man/man1
%{__install} -m0644 share/man/man1/docbook2gjots.1 %{buildroot}%{_datadir}/man/man1
%{__install} -m0644 po/en_US/LC_MESSAGES/gjots2.mo %{buildroot}%{_datadir}/locale/en_US/LC_MESSAGES
%{__install} -m0644 po/fr/LC_MESSAGES/gjots2.mo %{buildroot}%{_datadir}/locale/fr/LC_MESSAGES
%{__install} -m0644 po/no/LC_MESSAGES/gjots2.mo %{buildroot}%{_datadir}/locale/no/LC_MESSAGES
%{__install} -m0644 po/nb/LC_MESSAGES/gjots2.mo %{buildroot}%{_datadir}/locale/nb/LC_MESSAGES
%{__install} -m0644 po/ru/LC_MESSAGES/gjots2.mo %{buildroot}%{_datadir}/locale/ru/LC_MESSAGES
%find_lang %{name}

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


%files -f gjots2.lang
%defattr(-,root,root)
%doc AUTHORS INSTALL README COPYING ChangeLog gjots2.gjots gjots2.en_US.gjots gjots2.fr.gjots gjots2.nb.gjots gjots2.no.gjots gjots2.ru.gjots
%dir %{python_sitelib}/%{name}
%{python_sitelib}/%{name}/*.py
%{python_sitelib}/%{name}/*.pyc
%ghost %{python_sitelib}/%{name}/*.pyo
%{_bindir}/gjots2
%{_bindir}/gjots2html*
%{_bindir}/gjots2docbook
%{_bindir}/docbook2gjots
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*
%{_datadir}/pixmaps/gjots.png
%{_datadir}/applications/fedora-gjots2.desktop
%{_mandir}/man1/%{name}*
%{_mandir}/man1/docbook2gjots*

%changelog
* Thu Mar 30 2006 Radek Vok??l <rvokal at redhat.com> 2.3.4-4
- BuildRequires: desktop-file-utils

* Tue Mar 28 2006 Radek Vok??l <rvokal at redhat.com> 2.3.4-3
- move libs to python_sitelib

* Fri Mar 17 2006 Radek Vok??l <rvokal at redhat.com> 2.3.4-2
- convert man pages to UTF-8
- add file list

* Wed Mar 15 2006 Radek Vok??l <rvokal at redhat.com> 2.3.4-1
- initial build for Fedora Core


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gjots2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Apr 2006 05:57:10 -0000	1.1
+++ .cvsignore	3 Apr 2006 05:58:56 -0000	1.2
@@ -0,0 +1 @@
+gjots2-2.3.4.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gjots2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Apr 2006 05:57:10 -0000	1.1
+++ sources	3 Apr 2006 05:58:56 -0000	1.2
@@ -0,0 +1 @@
+ae05d1ea976de08dd9fc80faa04c558f  gjots2-2.3.4.tgz



From fedora-extras-commits at redhat.com  Mon Apr  3 06:03:25 2006
From: fedora-extras-commits at redhat.com (Radek Vokál (rvokal))
Date: Sun,  2 Apr 2006 23:03:25 -0700
Subject: owners owners.list,1.796,1.797
Message-ID: <200604030603.k3363RFQ030154@cvs-int.fedora.redhat.com>

Author: rvokal

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

Modified Files:
	owners.list 
Log Message:
gjots2


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.796
retrieving revision 1.797
diff -u -r1.796 -r1.797
--- owners.list	3 Apr 2006 00:07:11 -0000	1.796
+++ owners.list	3 Apr 2006 06:03:25 -0000	1.797
@@ -321,6 +321,7 @@
 Fedora Extras|gift-openft|Openft plugin for giFT|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|ginac|C++ library for symbolic calculation|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|git-core|A distributed SCM|chrisw at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|gjots2|Simple jotter application for your desktop - an outline processor|rvokal at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-aclock|Analog clock plugin for GKrellM|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-freq|CPU frequency display plugin for GKrellM|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-hddtemp|Hard disk temperature plugin for GKrellM|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Apr  3 07:11:12 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon,  3 Apr 2006 00:11:12 -0700
Subject: rpms/jabberd/devel .cvsignore, 1.4, 1.5 jabberd.spec, 1.12,
	1.13 sources, 1.4, 1.5
Message-ID: <200604030711.k337BExn032317@cvs-int.fedora.redhat.com>

Author: adrian

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

Modified Files:
	.cvsignore jabberd.spec sources 
Log Message:
* Mon Apr 03 2006 Adrian Reber <adrian at lisas.de> - 2.0-0.s11.9
- updated to 2.0-0.s11



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jabberd/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Nov 2005 12:28:12 -0000	1.4
+++ .cvsignore	3 Apr 2006 07:11:12 -0000	1.5
@@ -1 +1 @@
-jabberd-2.0s10.tar.gz
+jabberd-2.0s11.tar.gz


Index: jabberd.spec
===================================================================
RCS file: /cvs/extras/rpms/jabberd/devel/jabberd.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jabberd.spec	15 Feb 2006 21:25:29 -0000	1.12
+++ jabberd.spec	3 Apr 2006 07:11:12 -0000	1.13
@@ -1,10 +1,10 @@
 Summary: OpenSource server implementation of the Jabber protocols
 Name: jabberd
 Version: 2.0
-Release: 0.s10.9%{?dist}
+Release: 0.s11.9%{?dist}
 License: GPL
 Group: System Environment/Daemons
-Source0: http://files.jabberstudio.org/jabberd2/jabberd-2.0s10.tar.gz
+Source0: http://files.jabberstudio.org/jabberd2/jabberd-2.0s11.tar.gz
 Source1: jabberd
 Source2: jabberd.sysconfig
 URL: http://jabberd.jabberstudio.org/2/
@@ -33,7 +33,7 @@
 This packages defaults to use pam and the Berkeley DB.
 
 %prep
-%setup -q -n %{name}-%{version}s10
+%setup -q -n %{name}-%{version}s11
 
 %build
 %define _sysconfdir /etc/jabberd
@@ -177,6 +177,9 @@
 %ghost %{_sysconfdir}/jabberd/server.pem
 
 %changelog
+* Mon Apr 03 2006 Adrian Reber <adrian at lisas.de> - 2.0-0.s11.9
+- updated to 2.0-0.s11
+
 * Wed Feb 15 2006 Adrian Reber <adrian at lisas.de> - 2.0-0.s10.9
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jabberd/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Nov 2005 12:28:12 -0000	1.4
+++ sources	3 Apr 2006 07:11:12 -0000	1.5
@@ -1 +1 @@
-e8df4a9a5680009071204d423cff2de0  jabberd-2.0s10.tar.gz
+67d1663ed97a5ba707d5d145b1d19c55  jabberd-2.0s11.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr  3 07:25:28 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon,  3 Apr 2006 00:25:28 -0700
Subject: rpms/jabberd/FC-5 .cvsignore, 1.4, 1.5 jabberd.spec, 1.12,
	1.13 sources, 1.4, 1.5
Message-ID: <200604030725.k337PUBP032403@cvs-int.fedora.redhat.com>

Author: adrian

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

Modified Files:
	.cvsignore jabberd.spec sources 
Log Message:
* Mon Apr 03 2006 Adrian Reber <adrian at lisas.de> - 2.0-0.s11.9
- updated to 2.0-0.s11



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jabberd/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Nov 2005 12:28:12 -0000	1.4
+++ .cvsignore	3 Apr 2006 07:25:28 -0000	1.5
@@ -1 +1 @@
-jabberd-2.0s10.tar.gz
+jabberd-2.0s11.tar.gz


Index: jabberd.spec
===================================================================
RCS file: /cvs/extras/rpms/jabberd/FC-5/jabberd.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jabberd.spec	15 Feb 2006 21:25:29 -0000	1.12
+++ jabberd.spec	3 Apr 2006 07:25:28 -0000	1.13
@@ -1,10 +1,10 @@
 Summary: OpenSource server implementation of the Jabber protocols
 Name: jabberd
 Version: 2.0
-Release: 0.s10.9%{?dist}
+Release: 0.s11.9%{?dist}
 License: GPL
 Group: System Environment/Daemons
-Source0: http://files.jabberstudio.org/jabberd2/jabberd-2.0s10.tar.gz
+Source0: http://files.jabberstudio.org/jabberd2/jabberd-2.0s11.tar.gz
 Source1: jabberd
 Source2: jabberd.sysconfig
 URL: http://jabberd.jabberstudio.org/2/
@@ -33,7 +33,7 @@
 This packages defaults to use pam and the Berkeley DB.
 
 %prep
-%setup -q -n %{name}-%{version}s10
+%setup -q -n %{name}-%{version}s11
 
 %build
 %define _sysconfdir /etc/jabberd
@@ -177,6 +177,9 @@
 %ghost %{_sysconfdir}/jabberd/server.pem
 
 %changelog
+* Mon Apr 03 2006 Adrian Reber <adrian at lisas.de> - 2.0-0.s11.9
+- updated to 2.0-0.s11
+
 * Wed Feb 15 2006 Adrian Reber <adrian at lisas.de> - 2.0-0.s10.9
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jabberd/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Nov 2005 12:28:12 -0000	1.4
+++ sources	3 Apr 2006 07:25:28 -0000	1.5
@@ -1 +1 @@
-e8df4a9a5680009071204d423cff2de0  jabberd-2.0s10.tar.gz
+67d1663ed97a5ba707d5d145b1d19c55  jabberd-2.0s11.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr  3 07:27:00 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon,  3 Apr 2006 00:27:00 -0700
Subject: rpms/jabberd/FC-4 .cvsignore, 1.4, 1.5 jabberd.spec, 1.11,
	1.12 sources, 1.4, 1.5
Message-ID: <200604030727.k337R2Oj032473@cvs-int.fedora.redhat.com>

Author: adrian

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

Modified Files:
	.cvsignore jabberd.spec sources 
Log Message:
* Mon Apr 03 2006 Adrian Reber <adrian at lisas.de> - 2.0-0.s11.9
- updated to 2.0-0.s11



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jabberd/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Nov 2005 09:06:16 -0000	1.4
+++ .cvsignore	3 Apr 2006 07:27:00 -0000	1.5
@@ -1 +1 @@
-jabberd-2.0s10.tar.gz
+jabberd-2.0s11.tar.gz


Index: jabberd.spec
===================================================================
RCS file: /cvs/extras/rpms/jabberd/FC-4/jabberd.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jabberd.spec	28 Nov 2005 09:10:26 -0000	1.11
+++ jabberd.spec	3 Apr 2006 07:27:00 -0000	1.12
@@ -1,10 +1,10 @@
 Summary: OpenSource server implementation of the Jabber protocols
 Name: jabberd
 Version: 2.0
-Release: 0.s10.8%{?dist}
+Release: 0.s11.9%{?dist}
 License: GPL
 Group: System Environment/Daemons
-Source0: http://files.jabberstudio.org/jabberd2/jabberd-2.0s10.tar.gz
+Source0: http://files.jabberstudio.org/jabberd2/jabberd-2.0s11.tar.gz
 Source1: jabberd
 Source2: jabberd.sysconfig
 URL: http://jabberd.jabberstudio.org/2/
@@ -33,7 +33,7 @@
 This packages defaults to use pam and the Berkeley DB.
 
 %prep
-%setup -q -n %{name}-%{version}s10
+%setup -q -n %{name}-%{version}s11
 
 %build
 %define _sysconfdir /etc/jabberd
@@ -177,6 +177,12 @@
 %ghost %{_sysconfdir}/jabberd/server.pem
 
 %changelog
+* Mon Apr 03 2006 Adrian Reber <adrian at lisas.de> - 2.0-0.s11.9
+- updated to 2.0-0.s11
+
+* Wed Feb 15 2006 Adrian Reber <adrian at lisas.de> - 2.0-0.s10.9
+- rebuilt
+
 * Sun Nov 27 2005 Adrian Reber <adrian at lisas.de> - 2.0-0.s10.8
 - %%{_sysconfdir}/jabberd/server.pem was listed twice
 - added /sbin/service dependency to %%post, %%postun and %%preun


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jabberd/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Nov 2005 09:06:16 -0000	1.4
+++ sources	3 Apr 2006 07:27:00 -0000	1.5
@@ -1 +1 @@
-e8df4a9a5680009071204d423cff2de0  jabberd-2.0s10.tar.gz
+67d1663ed97a5ba707d5d145b1d19c55  jabberd-2.0s11.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr  3 08:44:29 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  3 Apr 2006 01:44:29 -0700
Subject: rpms/wine-docs/FC-5 .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 wine-docs.spec, 1.7, 1.8
Message-ID: <200604030844.k338iVTb002267@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-serv2192/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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	15 Mar 2006 22:27:37 -0000	1.7
+++ .cvsignore	3 Apr 2006 08:44:29 -0000	1.8
@@ -1 +1 @@
-wine-docs-0.9.10.tar.bz2
+wine-docs-0.9.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	15 Mar 2006 22:27:37 -0000	1.7
+++ sources	3 Apr 2006 08:44:29 -0000	1.8
@@ -1 +1 @@
-8057a2d7901c6436d69ee7bbe88700b4  wine-docs-0.9.10.tar.bz2
+a9de221c2a1442270f4eec1066379598  wine-docs-0.9.11.tar.bz2


Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-5/wine-docs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wine-docs.spec	15 Mar 2006 22:27:37 -0000	1.7
+++ wine-docs.spec	3 Apr 2006 08:44:29 -0000	1.8
@@ -1,12 +1,12 @@
 Name:           wine-docs
-Version:        0.9.10
+Version:        0.9.11
 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.10.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.11.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
+* Mon Apr 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.11-1
+- version upgrade
+
 * Wed Mar 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.10-1
 - version upgrade



From fedora-extras-commits at redhat.com  Mon Apr  3 08:44:28 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  3 Apr 2006 01:44:28 -0700
Subject: rpms/wine-docs/FC-4 .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 wine-docs.spec, 1.11, 1.12
Message-ID: <200604030844.k338iUfe002263@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-serv2192/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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	15 Mar 2006 22:27:32 -0000	1.7
+++ .cvsignore	3 Apr 2006 08:44:28 -0000	1.8
@@ -1 +1 @@
-wine-docs-0.9.10.tar.bz2
+wine-docs-0.9.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	15 Mar 2006 22:27:32 -0000	1.7
+++ sources	3 Apr 2006 08:44:28 -0000	1.8
@@ -1 +1 @@
-8057a2d7901c6436d69ee7bbe88700b4  wine-docs-0.9.10.tar.bz2
+a9de221c2a1442270f4eec1066379598  wine-docs-0.9.11.tar.bz2


Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-4/wine-docs.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wine-docs.spec	22 Mar 2006 00:04:33 -0000	1.11
+++ wine-docs.spec	3 Apr 2006 08:44:28 -0000	1.12
@@ -1,12 +1,12 @@
 Name:           wine-docs
-Version:        0.9.10
+Version:        0.9.11
 Release:        0.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.10.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.11.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  docbook-utils-pdf
@@ -46,6 +46,10 @@
 %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB
 
 %changelog
+* Mon Apr 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.11-0.1
+- version upgrade
+
 * Wed Mar 22 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.9.10-0.1
 - make this release 0.1 as to not move the old tag
 - insert docbook2txt wrapper script in %%build to get strace output



From fedora-extras-commits at redhat.com  Mon Apr  3 08:44:30 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  3 Apr 2006 01:44:30 -0700
Subject: rpms/wine-docs/devel .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 wine-docs.spec, 1.7, 1.8
Message-ID: <200604030844.k338iWpB002273@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2192/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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	15 Mar 2006 22:27:37 -0000	1.7
+++ .cvsignore	3 Apr 2006 08:44:29 -0000	1.8
@@ -1 +1 @@
-wine-docs-0.9.10.tar.bz2
+wine-docs-0.9.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	15 Mar 2006 22:27:37 -0000	1.7
+++ sources	3 Apr 2006 08:44:29 -0000	1.8
@@ -1 +1 @@
-8057a2d7901c6436d69ee7bbe88700b4  wine-docs-0.9.10.tar.bz2
+a9de221c2a1442270f4eec1066379598  wine-docs-0.9.11.tar.bz2


Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/devel/wine-docs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wine-docs.spec	15 Mar 2006 22:27:37 -0000	1.7
+++ wine-docs.spec	3 Apr 2006 08:44:29 -0000	1.8
@@ -1,12 +1,12 @@
 Name:           wine-docs
-Version:        0.9.10
+Version:        0.9.11
 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.10.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.11.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
+* Mon Apr 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.11-1
+- version upgrade
+
 * Wed Mar 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.10-1
 - version upgrade



From fedora-extras-commits at redhat.com  Mon Apr  3 08:44:27 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  3 Apr 2006 01:44:27 -0700
Subject: rpms/wine-docs/FC-3 .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 wine-docs.spec, 1.10, 1.11
Message-ID: <200604030845.k338j0bO002281@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-serv2192/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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	15 Mar 2006 22:27:26 -0000	1.7
+++ .cvsignore	3 Apr 2006 08:44:27 -0000	1.8
@@ -1 +1 @@
-wine-docs-0.9.10.tar.bz2
+wine-docs-0.9.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-3/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	15 Mar 2006 22:27:26 -0000	1.7
+++ sources	3 Apr 2006 08:44:27 -0000	1.8
@@ -1 +1 @@
-8057a2d7901c6436d69ee7bbe88700b4  wine-docs-0.9.10.tar.bz2
+a9de221c2a1442270f4eec1066379598  wine-docs-0.9.11.tar.bz2


Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-3/wine-docs.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- wine-docs.spec	15 Mar 2006 22:27:26 -0000	1.10
+++ wine-docs.spec	3 Apr 2006 08:44:27 -0000	1.11
@@ -1,12 +1,12 @@
 Name:           wine-docs
-Version:        0.9.10
+Version:        0.9.11
 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.10.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.11.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
+* Mon Apr 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.11-1
+- version upgrade
+
 * Wed Mar 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.10-1
 - version upgrade



From fedora-extras-commits at redhat.com  Mon Apr  3 11:07:59 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  3 Apr 2006 04:07:59 -0700
Subject: rpms/wine/FC-3 wine-prefixfonts.patch, NONE, 1.1 .cvsignore, 1.10, 
	1.11 sources, 1.11, 1.12 wine.spec, 1.16, 1.17
Message-ID: <200604031108.k33B8VeL009249@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8882/FC-3

Modified Files:
	.cvsignore sources wine.spec 
Added Files:
	wine-prefixfonts.patch 
Log Message:
- version upgrade
- fix #187546


wine-prefixfonts.patch:

--- NEW FILE wine-prefixfonts.patch ---
--- tools/wineprefixcreate.in.orig	2006-04-03 10:04:18.000000000 +0200
+++ tools/wineprefixcreate.in	2006-04-03 10:06:20.000000000 +0200
@@ -170,6 +170,9 @@
 export WINEPREFIX
 "${WINELOADER:-wine}" rundll32.exe setupapi.dll,InstallHinfSection DefaultInstall 128 wine.inf
 
+# Copy the font files
+cp /usr/share/wine/fonts/* "$CROOT/windows/fonts/"
+
 # Wait for the wineserver to finish
 
 if [ $do_wait = 1 ]


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	17 Mar 2006 13:24:42 -0000	1.10
+++ .cvsignore	3 Apr 2006 11:07:59 -0000	1.11
@@ -1 +1 @@
-wine-0.9.10-fe.tar.bz2
+wine-0.9.11-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	17 Mar 2006 13:24:42 -0000	1.11
+++ sources	3 Apr 2006 11:07:59 -0000	1.12
@@ -1 +1 @@
-054e71983834d777be3271f63f8484d6  wine-0.9.10-fe.tar.bz2
+7e67d02051dfb3671990f40734aca89a  wine-0.9.11-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/wine.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- wine.spec	17 Mar 2006 13:55:47 -0000	1.16
+++ wine.spec	3 Apr 2006 11:07:59 -0000	1.17
@@ -1,5 +1,5 @@
 Name:		wine
-Version:	0.9.10
+Version:	0.9.11
 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.10-fe.tar.bz2
+Source0:        wine-0.9.11-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -18,6 +18,7 @@
 Source104:      wine-winefile.desktop
 Source105:      wine-winemine.desktop
 Source106:      wine-winhelp.desktop
+Patch0:         wine-prefixfonts.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExclusiveArch:  %{ix86}
@@ -143,6 +144,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}-fe
+%patch0
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -330,8 +332,6 @@
 %{_libdir}/wine/avicap32.dll.so
 %{_libdir}/wine/avifil32.dll.so
 %{_libdir}/wine/avifile.dll16
-%{_libdir}/wine/aviinfo.exe.so
-%{_libdir}/wine/aviplay.exe.so
 %{_libdir}/wine/cabinet.dll.so
 %{_libdir}/wine/cards.dll.so
 %{_libdir}/wine/cfgmgr32.dll.so
@@ -517,6 +517,7 @@
 %{_libdir}/wine/winnls32.dll.so
 %{_libdir}/wine/winsock.dll16
 %{_libdir}/wine/winspool.drv.so
+%{_libdir}/wine/spoolss.dll.so
 %{_libdir}/wine/wintab.dll16
 %{_libdir}/wine/wintab32.dll.so
 %{_libdir}/wine/wintrust.dll.so
@@ -633,6 +634,11 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Mon Apr 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.11-1
+- version upgrade
+- fix #187546
+
 * Fri Mar 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de
 0.9.10-1
 - version upgrade



From fedora-extras-commits at redhat.com  Mon Apr  3 11:08:00 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  3 Apr 2006 04:08:00 -0700
Subject: rpms/wine/FC-4 wine-prefixfonts.patch, NONE, 1.1 .cvsignore, 1.11, 
	1.12 sources, 1.12, 1.13 wine.spec, 1.18, 1.19
Message-ID: <200604031108.k33B8WB5009254@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	.cvsignore sources wine.spec 
Added Files:
	wine-prefixfonts.patch 
Log Message:
- version upgrade
- fix #187546


wine-prefixfonts.patch:

--- NEW FILE wine-prefixfonts.patch ---
--- tools/wineprefixcreate.in.orig	2006-04-03 10:04:18.000000000 +0200
+++ tools/wineprefixcreate.in	2006-04-03 10:06:20.000000000 +0200
@@ -170,6 +170,9 @@
 export WINEPREFIX
 "${WINELOADER:-wine}" rundll32.exe setupapi.dll,InstallHinfSection DefaultInstall 128 wine.inf
 
+# Copy the font files
+cp /usr/share/wine/fonts/* "$CROOT/windows/fonts/"
+
 # Wait for the wineserver to finish
 
 if [ $do_wait = 1 ]


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	17 Mar 2006 13:24:48 -0000	1.11
+++ .cvsignore	3 Apr 2006 11:07:59 -0000	1.12
@@ -1 +1 @@
-wine-0.9.10-fe.tar.bz2
+wine-0.9.11-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	17 Mar 2006 13:24:48 -0000	1.12
+++ sources	3 Apr 2006 11:07:59 -0000	1.13
@@ -1 +1 @@
-054e71983834d777be3271f63f8484d6  wine-0.9.10-fe.tar.bz2
+7e67d02051dfb3671990f40734aca89a  wine-0.9.11-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/wine.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- wine.spec	17 Mar 2006 13:55:53 -0000	1.18
+++ wine.spec	3 Apr 2006 11:07:59 -0000	1.19
@@ -1,5 +1,5 @@
 Name:		wine
-Version:	0.9.10
+Version:	0.9.11
 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.10-fe.tar.bz2
+Source0:        wine-0.9.11-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -18,6 +18,7 @@
 Source104:      wine-winefile.desktop
 Source105:      wine-winemine.desktop
 Source106:      wine-winhelp.desktop
+Patch0:         wine-prefixfonts.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExclusiveArch:  %{ix86}
@@ -143,6 +144,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}-fe
+%patch0
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -330,8 +332,6 @@
 %{_libdir}/wine/avicap32.dll.so
 %{_libdir}/wine/avifil32.dll.so
 %{_libdir}/wine/avifile.dll16
-%{_libdir}/wine/aviinfo.exe.so
-%{_libdir}/wine/aviplay.exe.so
 %{_libdir}/wine/cabinet.dll.so
 %{_libdir}/wine/cards.dll.so
 %{_libdir}/wine/cfgmgr32.dll.so
@@ -517,6 +517,7 @@
 %{_libdir}/wine/winnls32.dll.so
 %{_libdir}/wine/winsock.dll16
 %{_libdir}/wine/winspool.drv.so
+%{_libdir}/wine/spoolss.dll.so
 %{_libdir}/wine/wintab.dll16
 %{_libdir}/wine/wintab32.dll.so
 %{_libdir}/wine/wintrust.dll.so
@@ -633,6 +634,11 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Mon Apr 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.11-1
+- version upgrade
+- fix #187546
+
 * Fri Mar 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de
 0.9.10-1
 - version upgrade



From fedora-extras-commits at redhat.com  Mon Apr  3 11:08:00 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  3 Apr 2006 04:08:00 -0700
Subject: rpms/wine/FC-5 wine-prefixfonts.patch, NONE, 1.1 .cvsignore, 1.12, 
	1.13 sources, 1.13, 1.14 wine.spec, 1.23, 1.24
Message-ID: <200604031108.k33B8WYq009259@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	.cvsignore sources wine.spec 
Added Files:
	wine-prefixfonts.patch 
Log Message:
- version upgrade
- fix #187546


wine-prefixfonts.patch:

--- NEW FILE wine-prefixfonts.patch ---
--- tools/wineprefixcreate.in.orig	2006-04-03 10:04:18.000000000 +0200
+++ tools/wineprefixcreate.in	2006-04-03 10:06:20.000000000 +0200
@@ -170,6 +170,9 @@
 export WINEPREFIX
 "${WINELOADER:-wine}" rundll32.exe setupapi.dll,InstallHinfSection DefaultInstall 128 wine.inf
 
+# Copy the font files
+cp /usr/share/wine/fonts/* "$CROOT/windows/fonts/"
+
 # Wait for the wineserver to finish
 
 if [ $do_wait = 1 ]


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	17 Mar 2006 13:24:54 -0000	1.12
+++ .cvsignore	3 Apr 2006 11:08:00 -0000	1.13
@@ -1 +1 @@
-wine-0.9.10-fe.tar.bz2
+wine-0.9.11-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	17 Mar 2006 13:24:54 -0000	1.13
+++ sources	3 Apr 2006 11:08:00 -0000	1.14
@@ -1 +1 @@
-054e71983834d777be3271f63f8484d6  wine-0.9.10-fe.tar.bz2
+7e67d02051dfb3671990f40734aca89a  wine-0.9.11-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-5/wine.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- wine.spec	19 Mar 2006 23:47:46 -0000	1.23
+++ wine.spec	3 Apr 2006 11:08:00 -0000	1.24
@@ -1,15 +1,16 @@
 %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.10
-Release:	2%{?dist}
+Version:	0.9.11
+Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
 License:	LGPL
 URL:		http://www.winehq.org/
 # special fedora tarball without winemp3 stuff
-Source0:        wine-0.9.10-fe.tar.bz2
+Patch0:         wine-prefixfonts.patch
+Source0:        wine-0.9.11-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -155,6 +156,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}-fe
+%patch0
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -343,8 +345,6 @@
 %{_libdir}/wine/avicap32.dll.so
 %{_libdir}/wine/avifil32.dll.so
 %{_libdir}/wine/avifile.dll16
-%{_libdir}/wine/aviinfo.exe.so
-%{_libdir}/wine/aviplay.exe.so
 %{_libdir}/wine/cabinet.dll.so
 %{_libdir}/wine/cards.dll.so
 %{_libdir}/wine/cfgmgr32.dll.so
@@ -530,6 +530,7 @@
 %{_libdir}/wine/winnls32.dll.so
 %{_libdir}/wine/winsock.dll16
 %{_libdir}/wine/winspool.drv.so
+%{_libdir}/wine/spoolss.dll.so
 %{_libdir}/wine/wintab.dll16
 %{_libdir}/wine/wintab32.dll.so
 %{_libdir}/wine/wintrust.dll.so
@@ -646,6 +647,11 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Mon Apr 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.11-1
+- version upgrade
+- fix #187546
+
 * Mon Mar 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.10-2
 - bump for x86_64 tree inclusion \o/



From fedora-extras-commits at redhat.com  Mon Apr  3 11:08:01 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  3 Apr 2006 04:08:01 -0700
Subject: rpms/wine/devel wine-prefixfonts.patch, NONE, 1.1 .cvsignore, 1.12, 
	1.13 sources, 1.13, 1.14 wine.spec, 1.23, 1.24
Message-ID: <200604031108.k33B8XeA009266@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	.cvsignore sources wine.spec 
Added Files:
	wine-prefixfonts.patch 
Log Message:
- version upgrade
- fix #187546


wine-prefixfonts.patch:

--- NEW FILE wine-prefixfonts.patch ---
--- tools/wineprefixcreate.in.orig	2006-04-03 10:04:18.000000000 +0200
+++ tools/wineprefixcreate.in	2006-04-03 10:06:20.000000000 +0200
@@ -170,6 +170,9 @@
 export WINEPREFIX
 "${WINELOADER:-wine}" rundll32.exe setupapi.dll,InstallHinfSection DefaultInstall 128 wine.inf
 
+# Copy the font files
+cp /usr/share/wine/fonts/* "$CROOT/windows/fonts/"
+
 # Wait for the wineserver to finish
 
 if [ $do_wait = 1 ]


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	17 Mar 2006 13:25:00 -0000	1.12
+++ .cvsignore	3 Apr 2006 11:08:01 -0000	1.13
@@ -1 +1 @@
-wine-0.9.10-fe.tar.bz2
+wine-0.9.11-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	17 Mar 2006 13:25:00 -0000	1.13
+++ sources	3 Apr 2006 11:08:01 -0000	1.14
@@ -1 +1 @@
-054e71983834d777be3271f63f8484d6  wine-0.9.10-fe.tar.bz2
+7e67d02051dfb3671990f40734aca89a  wine-0.9.11-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- wine.spec	19 Mar 2006 23:47:51 -0000	1.23
+++ wine.spec	3 Apr 2006 11:08:01 -0000	1.24
@@ -1,15 +1,16 @@
 %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.10
-Release:	2%{?dist}
+Version:	0.9.11
+Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
 License:	LGPL
 URL:		http://www.winehq.org/
 # special fedora tarball without winemp3 stuff
-Source0:        wine-0.9.10-fe.tar.bz2
+Patch0:         wine-prefixfonts.patch
+Source0:        wine-0.9.11-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -155,6 +156,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}-fe
+%patch0
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -343,8 +345,6 @@
 %{_libdir}/wine/avicap32.dll.so
 %{_libdir}/wine/avifil32.dll.so
 %{_libdir}/wine/avifile.dll16
-%{_libdir}/wine/aviinfo.exe.so
-%{_libdir}/wine/aviplay.exe.so
 %{_libdir}/wine/cabinet.dll.so
 %{_libdir}/wine/cards.dll.so
 %{_libdir}/wine/cfgmgr32.dll.so
@@ -530,6 +530,7 @@
 %{_libdir}/wine/winnls32.dll.so
 %{_libdir}/wine/winsock.dll16
 %{_libdir}/wine/winspool.drv.so
+%{_libdir}/wine/spoolss.dll.so
 %{_libdir}/wine/wintab.dll16
 %{_libdir}/wine/wintab32.dll.so
 %{_libdir}/wine/wintrust.dll.so
@@ -646,6 +647,11 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Mon Apr 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.11-1
+- version upgrade
+- fix #187546
+
 * Mon Mar 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.10-2
 - bump for x86_64 tree inclusion \o/



From fedora-extras-commits at redhat.com  Mon Apr  3 12:05:38 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  3 Apr 2006 05:05:38 -0700
Subject: rpms/fluxbox/FC-5 fluxbox-menu.patch, 1.1, 1.2 fluxbox.spec, 1.17,
	1.18
Message-ID: <200604031205.k33C5egp011957@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	fluxbox-menu.patch fluxbox.spec 
Log Message:
- fix #187734


fluxbox-menu.patch:

Index: fluxbox-menu.patch
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/FC-5/fluxbox-menu.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fluxbox-menu.patch	2 Mar 2006 22:57:50 -0000	1.1
+++ fluxbox-menu.patch	3 Apr 2006 12:05:38 -0000	1.2
@@ -5,7 +5,7 @@
  # idesk &
  
 +if [ -x /usr/bin/fluxbox-xdg-menu.py ]; then
-+ /usr/bin/fluxbox-generate_menu --with-icons &
++ /usr/bin/fluxbox-xdg-menu.py --with-icons &
 +fi
 +
  # And last but not least we start fluxbox.


Index: fluxbox.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/FC-5/fluxbox.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- fluxbox.spec	19 Mar 2006 23:31:03 -0000	1.17
+++ fluxbox.spec	3 Apr 2006 12:05:38 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           fluxbox
 Version:        0.9.15
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:	Window Manager based on Blackbox
 
@@ -78,6 +78,10 @@
 %{_datadir}/xsessions/fluxbox.desktop
 
 %changelog
+* Mon Apr 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.15-2
+- fix #187734
+
 * Sun Mar 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.15-1
 - version upgrade



From fedora-extras-commits at redhat.com  Mon Apr  3 12:05:39 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  3 Apr 2006 05:05:39 -0700
Subject: rpms/fluxbox/devel fluxbox-menu.patch, 1.1, 1.2 fluxbox.spec, 1.17,
	1.18
Message-ID: <200604031205.k33C5fdF011965@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	fluxbox-menu.patch fluxbox.spec 
Log Message:
- fix #187734


fluxbox-menu.patch:

Index: fluxbox-menu.patch
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/devel/fluxbox-menu.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fluxbox-menu.patch	2 Mar 2006 22:57:50 -0000	1.1
+++ fluxbox-menu.patch	3 Apr 2006 12:05:39 -0000	1.2
@@ -5,7 +5,7 @@
  # idesk &
  
 +if [ -x /usr/bin/fluxbox-xdg-menu.py ]; then
-+ /usr/bin/fluxbox-generate_menu --with-icons &
++ /usr/bin/fluxbox-xdg-menu.py --with-icons &
 +fi
 +
  # And last but not least we start fluxbox.


Index: fluxbox.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/devel/fluxbox.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- fluxbox.spec	19 Mar 2006 23:31:09 -0000	1.17
+++ fluxbox.spec	3 Apr 2006 12:05:39 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           fluxbox
 Version:        0.9.15
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:	Window Manager based on Blackbox
 
@@ -78,6 +78,10 @@
 %{_datadir}/xsessions/fluxbox.desktop
 
 %changelog
+* Mon Apr 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.15-2
+- fix #187734
+
 * Sun Mar 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.15-1
 - version upgrade



From fedora-extras-commits at redhat.com  Mon Apr  3 12:12:11 2006
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon,  3 Apr 2006 05:12:11 -0700
Subject: rpms/driftnet - New directory
Message-ID: <200604031212.k33CCDjb012125@cvs-int.fedora.redhat.com>

Author: hadess

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

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




From fedora-extras-commits at redhat.com  Mon Apr  3 12:12:12 2006
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon,  3 Apr 2006 05:12:12 -0700
Subject: rpms/driftnet/devel - New directory
Message-ID: <200604031212.k33CCExI012128@cvs-int.fedora.redhat.com>

Author: hadess

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

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




From fedora-extras-commits at redhat.com  Mon Apr  3 12:12:41 2006
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon,  3 Apr 2006 05:12:41 -0700
Subject: rpms/driftnet Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604031212.k33CChPP012177@cvs-int.fedora.redhat.com>

Author: hadess

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

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


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

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

common : CVS/Root
	@cvs 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 Apr  3 12:12:42 2006
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon,  3 Apr 2006 05:12:42 -0700
Subject: rpms/driftnet/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604031212.k33CCiaI012180@cvs-int.fedora.redhat.com>

Author: hadess

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

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


--- 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 Apr  3 12:15:00 2006
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon,  3 Apr 2006 05:15:00 -0700
Subject: rpms/driftnet import.log,1.1,1.2
Message-ID: <200604031215.k33CF2vP012273@cvs-int.fedora.redhat.com>

Author: hadess

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

Modified Files:
	import.log 
Log Message:
auto-import driftnet-0.1.6-7 on branch devel from driftnet-0.1.6-7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/driftnet/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	3 Apr 2006 12:12:41 -0000	1.1
+++ import.log	3 Apr 2006 12:14:59 -0000	1.2
@@ -0,0 +1 @@
+driftnet-0_1_6-7:HEAD:driftnet-0.1.6-7.src.rpm:1144066487



From fedora-extras-commits at redhat.com  Mon Apr  3 12:15:00 2006
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon,  3 Apr 2006 05:15:00 -0700
Subject: rpms/driftnet/devel driftnet-0.1.6-no-makedepend.patch, NONE,
	1.1 driftnet-0.1.6-pam.config, NONE,
	1.1 driftnet-0.1.6-security.config, NONE,
	1.1 driftnet-dont-use-tmpnam.patch, NONE,
	1.1 driftnet-gtk2-port.patch, NONE, 1.1 driftnet.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604031215.k33CF2dl012284@cvs-int.fedora.redhat.com>

Author: hadess

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

Modified Files:
	.cvsignore sources 
Added Files:
	driftnet-0.1.6-no-makedepend.patch driftnet-0.1.6-pam.config 
	driftnet-0.1.6-security.config driftnet-dont-use-tmpnam.patch 
	driftnet-gtk2-port.patch driftnet.spec 
Log Message:
auto-import driftnet-0.1.6-7 on branch devel from driftnet-0.1.6-7.src.rpm

driftnet-0.1.6-no-makedepend.patch:

--- NEW FILE driftnet-0.1.6-no-makedepend.patch ---
diff -urN driftnet-0.1.6.old/endian.c driftnet-0.1.6/endian.c
--- driftnet-0.1.6.old/endian.c	2002-07-09 20:26:41.000000000 +0100
+++ driftnet-0.1.6/endian.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,37 +0,0 @@
-/*
- * endian.c:
- * Determine platform endianness.
- *
- * Copyright (c) 2002 . All rights reserved.
- * Email: chris at ex-parrot.com; WWW: http://www.ex-parrot.com/~chris/
- *
- */
-
-static const char rcsid[] = "$Id: endian.c,v 1.5 2002/06/10 21:25:48 chris Exp $";
-
-#include <stdio.h>
-#ifdef USE_SYS_TYPES_H
-#   include <sys/types.h>       /* Solaris etc. */
-#else
-#   include <stdint.h>          /* C99 standard. */
-#endif
-
-int main(void) {
-#if defined(LITTLE_ENDIAN) || defined(_LITTLE_ENDIAN)
-    printf("-DDRIFTNET_LITTLE_ENDIAN\n");
-	return 0;
-#elif defined(BIG_ENDIAN) || defined(_BIG_ENDIAN)
-    printf("-DDRIFTNET_BIG_ENDIAN\n");
-	return 0;
-#else
-    uint32_t a = 0;
-    *((uint8_t*)&a) = 0xff;
-    if (a == 0xff000000)
-        printf("-DDRIFTNET_BIG_ENDIAN\n");
-    else if (a == 0x000000ff)
-        printf("-DDRIFTNET_LITTLE_ENDIAN\n");
-    else
-        return -1; /* don't know. */
-#endif  /* endianness test */
-    return 0;
-}
diff -urN driftnet-0.1.6.old/img.h driftnet-0.1.6/img.h
--- driftnet-0.1.6.old/img.h	2002-07-09 20:26:41.000000000 +0100
+++ driftnet-0.1.6/img.h	2006-04-03 13:05:04.000000000 +0100
@@ -21,12 +21,13 @@
 #endif
 
 #include <stdio.h>
+#include <glib.h>
 
 typedef uint8_t chan;
 typedef uint32_t pel;
 
 /* Yuk. GDKRGB expects data in a specific ordering. */
-#if defined(DRIFTNET_LITTLE_ENDIAN)
+#if (G_BYTE_ORDER == G_LITTLE_ENDIAN)
 #   define PEL(r, g, b)        ((pel)((chan)(r) | ((chan)(g) << 8) | ((chan)(b) << 16)))
 #   define PELA(r, g, b, a)    ((pel)((chan)(r) | ((chan)(g) << 8) | ((chan)(b) << 16) | ((chan)(a) << 24)))
 
@@ -34,7 +35,7 @@
 #   define GETG(p)             ((chan)(((p) & (pel)0x0000ff00) >>  8))
 #   define GETB(p)             ((chan)(((p) & (pel)0x00ff0000) >> 16))
 #   define GETA(p)             ((chan)(((p) & (pel)0xff000000) >> 24))
-#elif defined(DRIFTNET_BIG_ENDIAN)
+#elif defined(G_BYTE_ORDER == G_BIG_ENDIAN)
 #   define PEL(r, g, b)        ((pel)(((chan)(r) << 24) | ((chan)(g) << 16) | ((chan)(b) << 8)))
 #   define PELA(r, g, b, a)    ((pel)(((chan)(r) << 24) | ((chan)(g) << 16) | ((chan)(b) << 8) | ((chan)(a))))
 
diff -urN driftnet-0.1.6.old/Makefile driftnet-0.1.6/Makefile
--- driftnet-0.1.6.old/Makefile	2006-04-03 13:02:13.000000000 +0100
+++ driftnet-0.1.6/Makefile	2006-04-03 13:06:00.000000000 +0100
@@ -67,7 +67,7 @@
 
 SUBDIRS = 
 
-TXTS = README TODO COPYING CHANGES CREDITS driftnet.1 driftnet.1.in endian.c
+TXTS = README TODO COPYING CHANGES CREDITS driftnet.1 driftnet.1.in
 SRCS = audio.c mpeghdr.c gif.c img.c jpeg.c png.c driftnet.c image.c \
        display.c playaudio.c connection.c media.c
 HDRS = img.h driftnet.h mpeghdr.h
@@ -77,41 +77,26 @@
 
 default: driftnet driftnet.1
 
-driftnet:   depend $(OBJS)
+driftnet:   $(OBJS)
 	$(CC) -o driftnet $(OBJS) $(LDFLAGS) $(LDLIBS)
 
 driftnet.1: driftnet.1.in Makefile
 	( echo '.\" DO NOT EDIT THIS FILE-- edit driftnet.1.in instead' ; sed s/@@@VERSION@@@/$(VERSION)/ ) < driftnet.1.in > driftnet.1
 
-endianness: endian
-	./endian > endianness
+%.o:    %.c Makefile
+	$(CC) $(CFLAGS) -c -o $@ $<
 
-endian: endian.c
-	$(CC) $(CFLAGS) -o endian endian.c
-
-%.o:    %.c Makefile endianness
-	$(CC) $(CFLAGS) `cat endianness` -c -o $@ $<
-
-clean:  nodepend
-	rm -f *~ *.bak *.o core $(BINS) TAGS driftnet.1 endian endianness
+clean:
+	rm -f *~ *.bak *.o core $(BINS) TAGS driftnet.1
 
 tags:
 	etags *.c *.h
 
-tarball: nodepend $(SRCS) $(HDRS) $(TXTS)
+tarball: $(SRCS) $(HDRS) $(TXTS)
 	mkdir driftnet-$(VERSION)
 	set -e ; for i in Makefile $(SRCS) $(HDRS) $(TXTS) ; do cp $$i driftnet-$(VERSION)/$$i ; done
 	tar cvzf driftnet-$(VERSION).tar.gz driftnet-$(VERSION)
 	rm -rf driftnet-$(VERSION)
 	mv driftnet-$(VERSION).tar.gz ..
 	
-depend: endianness
-	makedepend -- $(CFLAGS) `cat endianness` -- $(SRCS)
-	touch depend
-	rm -f Makefile.bak
-
-nodepend:
-	makedepend -- --
-	rm -f depend Makefile.bak
-
 # DO NOT DELETE


--- NEW FILE driftnet-0.1.6-pam.config ---
#%PAM-1.0
auth       sufficient   pam_rootok.so
auth       sufficient   pam_timestamp.so
auth       include      system-auth
session    required     pam_permit.so
session    optional     pam_xauth.so
session    optional     pam_timestamp.so
account    required     pam_permit.so


--- NEW FILE driftnet-0.1.6-security.config ---
USER=root
PROGRAM=/usr/sbin/driftnet
SESSION=true

driftnet-dont-use-tmpnam.patch:

--- NEW FILE driftnet-dont-use-tmpnam.patch ---
diff -urp driftnet-0.1.6.old/driftnet.c driftnet-0.1.6/driftnet.c
--- driftnet-0.1.6.old/driftnet.c	2002-07-09 20:26:41.000000000 +0100
+++ driftnet-0.1.6/driftnet.c	2005-12-13 16:52:04.000000000 +0000
@@ -11,6 +11,8 @@ static const char rcsid[] = "$Id: driftn
 
 #undef NDEBUG
 
+#include <glib.h>
+
 #include <assert.h>
 #include <dirent.h>
 #include <errno.h>
@@ -585,10 +587,15 @@ int main(int argc, char *argv[]) {
     } else {
         /* need to make a temporary directory. */
         for (;;) {
-            tmpdir = strdup(tmpnam(NULL));
-            if (mkdir(tmpdir, 0700) == 0)
-                break;
-            free(tmpdir);
+            const char *tmp;
+	    char *template;
+
+	    tmp = g_get_tmp_dir();
+	    template = g_build_filename(tmp, "drifnet-XXXXXX", NULL);
+	    tmpdir = mkdtemp (template);
+	    g_free (template);
+	    if (tmpdir)
+		break;
         }
     }
 

driftnet-gtk2-port.patch:

--- NEW FILE driftnet-gtk2-port.patch ---
diff -urN driftnet-0.1.6/display.c driftnet-0.1.6.bak/display.c
--- driftnet-0.1.6/display.c	2002-07-09 20:26:41.000000000 +0100
+++ driftnet-0.1.6.bak/display.c	2004-04-17 22:08:25.373349299 +0100
@@ -20,6 +20,7 @@
 #include <fcntl.h>
 #include <string.h>
 #include <errno.h>
+#include <time.h>
 
 #include <sys/stat.h>
 
@@ -104,7 +105,7 @@
         GdkGC *gc;
         gc = gdk_gc_new(drawable);
         gdk_draw_rgb_32_image(drawable, gc, 0, 0, width, height, GDK_RGB_DITHER_NORMAL, (guchar*)backing_image->flat, sizeof(pel) * width);
-        gdk_gc_destroy(gc);
+        g_object_unref(gc);
     }
 }
 
@@ -172,7 +173,7 @@
  * React to an expose event, perhaps changing the backing image size. */
 void expose_event(GtkWidget *widget, GdkEvent *event, gpointer data) {
     if (darea) drawable = darea->window;
-    gdk_window_get_size(drawable, &width, &height);
+    gdk_drawable_get_size(GDK_DRAWABLE(drawable), &width, &height);
     if (!backing_image || backing_image->width != width || backing_image->height != height)
         make_backing_image();
 
@@ -183,7 +184,7 @@
  * React to a configure event, perhaps changing the backing image size. */
 void configure_event(GtkWidget *widget, GdkEvent *event, gpointer data) {
     if (darea) drawable = darea->window;
-    gdk_window_get_size(drawable, &width, &height);
+    gdk_drawable_get_size(GDK_DRAWABLE(drawable), &width, &height);
     if (!backing_image || backing_image->width != width || backing_image->height != height)
         make_backing_image();
 
@@ -387,28 +388,26 @@
        
     /* do some init thing */
     gtk_init(&argc, &argv);
-    gdk_rgb_init();
 
-    gtk_widget_set_default_colormap(gdk_rgb_get_cmap());
-    gtk_widget_set_default_visual(gdk_rgb_get_visual());
+    gtk_widget_push_colormap(gdk_rgb_get_colormap());
 
     /* Make our own window. */
     window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-    gtk_widget_set_usize(window, 0, 0);
+    gtk_widget_set_size_request(window, 0, 0);
 
     darea = gtk_drawing_area_new();
     gtk_container_add(GTK_CONTAINER(window), darea);
     gtk_widget_set_events(darea, GDK_EXPOSURE_MASK|GDK_BUTTON_PRESS_MASK|GDK_BUTTON_RELEASE_MASK);
 
-    gtk_signal_connect(GTK_OBJECT(window), "delete_event", GTK_SIGNAL_FUNC(delete_event), NULL);
-    gtk_signal_connect(GTK_OBJECT(window), "destroy", GTK_SIGNAL_FUNC(destroy), NULL);
+    g_signal_connect(G_OBJECT(window), "delete_event", GTK_SIGNAL_FUNC(delete_event), NULL);
+    g_signal_connect(G_OBJECT(window), "destroy", GTK_SIGNAL_FUNC(destroy), NULL);
 
-    gtk_signal_connect(GTK_OBJECT(darea), "expose-event", GTK_SIGNAL_FUNC(expose_event), NULL);
-    gtk_signal_connect(GTK_OBJECT(darea), "configure_event", GTK_SIGNAL_FUNC(expose_event), NULL);
+    g_signal_connect(G_OBJECT(darea), "expose-event", GTK_SIGNAL_FUNC(expose_event), NULL);
+    g_signal_connect(G_OBJECT(darea), "configure_event", GTK_SIGNAL_FUNC(expose_event), NULL);
     
     /* mouse button press/release for saving images */
-    gtk_signal_connect(GTK_OBJECT(darea), "button_press_event", GTK_SIGNAL_FUNC(button_press_event), NULL);
-    gtk_signal_connect(GTK_OBJECT(darea), "button_press_event", GTK_SIGNAL_FUNC(button_release_event), NULL);
+    g_signal_connect(G_OBJECT(darea), "button_press_event", GTK_SIGNAL_FUNC(button_press_event), NULL);
+    g_signal_connect(G_OBJECT(darea), "button_press_event", GTK_SIGNAL_FUNC(button_release_event), NULL);
 
     gtk_widget_show_all(window);
 
diff -urN driftnet-0.1.6/Makefile driftnet-0.1.6.bak/Makefile
--- driftnet-0.1.6/Makefile	2004-04-17 21:57:20.454251440 +0100
+++ driftnet-0.1.6.bak/Makefile	2004-04-17 22:08:31.654607973 +0100
@@ -31,8 +31,11 @@
 
 # Optional C compiler and linker flags. Typical driftnet builds have support
 # for displaying captured images in an X window, and need the following flags:
-CFLAGS  += `gtk-config --cflags`
-LDLIBS  += -ljpeg -lungif `gtk-config --libs`
+CFLAGS  += `pkg-config --cflags gtk+-2.0`
+LDLIBS  += -ljpeg -lungif `pkg-config --libs gtk+-2.0`
+
+# For development, disable the deprecated shite
+CFLAGS += -DGTK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED
 
 # Alternatively, you can build a version of driftnet which can only be used
 # in `adjunct' mode as the back end for some other image-processing program. To


--- NEW FILE driftnet.spec ---
Name: driftnet
License: GPL
Group: Applications/Internet
Version: 0.1.6
Release: 7
Summary: Network image sniffer
URL: http://www.ex-parrot.com/~chris/driftnet/
Source0: http://www.ex-parrot.com/~chris/driftnet/driftnet-0.1.6.tar.gz
Source1: %name-%{version}-pam.config
Source2: %name-%{version}-security.config
Patch0: driftnet-gtk2-port.patch
Patch1: driftnet-dont-use-tmpnam.patch
Patch2: driftnet-0.1.6-no-makedepend.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libpcap gtk2-devel libungif-devel libjpeg-devel
Requires: %{_bindir}/consolehelper

%description
Driftnet is a program which listens to network traffic and picks out images 
from TCP streams it observes. Fun to run on a host which sees lots of web 
traffic.

%prep
%setup -q
%patch0 -p1 -b .gtk2
%patch1 -p1 -b .tmpnam
%patch2 -p1 -b .makedep

%build
CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -Dpm 0755 driftnet  \
	$RPM_BUILD_ROOT%{_sbindir}/driftnet
install -Dpm 0644 driftnet.1 \
	$RPM_BUILD_ROOT/%{_mandir}/man1/driftnet.1
ln -sf consolehelper $RPM_BUILD_ROOT%{_bindir}/driftnet
install -Dpm 644 %{SOURCE1} \
	$RPM_BUILD_ROOT%{_sysconfdir}/pam.d/driftnet
install -Dpm 644 %{SOURCE2} \
	$RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/driftnet

%files
%defattr(-,root,root,-)
%doc CHANGES COPYING CREDITS README TODO
%{_bindir}/driftnet
%{_sbindir}/driftnet
%config(noreplace) %{_sysconfdir}/pam.d/driftnet
%config %{_sysconfdir}/security/console.apps/driftnet
%{_mandir}/man1/driftnet.1*

%clean
rm -rf $RPM_BUILD_ROOT

%changelog
* Mon Apr 03 2006 - Bastien Nocera <hadess at hadess.net> - 0.1.6-7
- spell "driftnet" correctly in driftnet-dont-use-tmpnam.patch
  Add patch2 to remove imake dependency
  update the PAM config to be more like existing ones
  move buildroot deletion to install from prep
  Thanks to Adrian Reber <adrian at lisas.de> for pointing to those last 2

* Tue Dec 13 2005 - Bastien Nocera <hadess at hadess.net> - 0.1.6-6
- update for FC5, don't use tmpnam

* Fri Nov 11 2005 - Bastien Nocera <hadess at hadess.net> - 0.1.6-5
- Major cleanups by Adrian Reber <adrian at lisas.de>

* Sat Apr 17 2004 - Bastien Nocera <hadess at hadess.net> - 0.1.6-4
- Oops, it wasn't a GTK2 application, ended up porting it

* Sat Apr 10 2004 - Bastien Nocera <hadess at hadess.net> - 0.1.6-3
- Recompile against a newer libpcap

* Fri Jun 20 2003 - Bastien Nocera <hadess at hadess.net> - 0.1.6-2
- Added a PAM configuration file

* Fri Jun 20 2003 - Bastien Nocera <hadess at hadess.net> - 0.1.6-1
- First release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/driftnet/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Apr 2006 12:12:41 -0000	1.1
+++ .cvsignore	3 Apr 2006 12:15:00 -0000	1.2
@@ -0,0 +1 @@
+driftnet-0.1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/driftnet/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Apr 2006 12:12:41 -0000	1.1
+++ sources	3 Apr 2006 12:15:00 -0000	1.2
@@ -0,0 +1 @@
+8e11d77770452f97bb3c23f510489815  driftnet-0.1.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr  3 12:23:29 2006
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon,  3 Apr 2006 05:23:29 -0700
Subject: owners owners.list,1.797,1.798
Message-ID: <200604031223.k33CNVg0012370@cvs-int.fedora.redhat.com>

Author: hadess

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

Modified Files:
	owners.list 
Log Message:
Added driftnet



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.797
retrieving revision 1.798
diff -u -r1.797 -r1.798
--- owners.list	3 Apr 2006 06:03:25 -0000	1.797
+++ owners.list	3 Apr 2006 12:23:29 -0000	1.798
@@ -197,6 +197,7 @@
 Fedora Extras|doulos-fonts|Doulos SIL fonts|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|drgeo-doc|html documentation for drgeo|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
 Fedora Extras|drgeo|Interactive educational geometry software|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
+Fedora Extras|driftnet|Network image sniffer|hadess at hadess.net|extras-qa at fedoraproject.org|
 Fedora Extras|drivel|A journal or "blog" client|stickster at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|drscheme|Graphical environment for developing programs using Scheme|gemi at bluewin.ch|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|



From fedora-extras-commits at redhat.com  Mon Apr  3 13:04:45 2006
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon,  3 Apr 2006 06:04:45 -0700
Subject: rpms/driftnet/devel driftnet-0.1.6-no-makedepend.patch, 1.1,
	1.2 driftnet.spec, 1.1, 1.2
Message-ID: <200604031304.k33D4lKk014649@cvs-int.fedora.redhat.com>

Author: hadess

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

Modified Files:
	driftnet-0.1.6-no-makedepend.patch driftnet.spec 
Log Message:
* Mon Apr 03 2006 - Bastien Nocera <hadess at hadess.net> - 0.1.6-8
- Fix typo in the imake removal patch that broke on big endian machines


driftnet-0.1.6-no-makedepend.patch:

Index: driftnet-0.1.6-no-makedepend.patch
===================================================================
RCS file: /cvs/extras/rpms/driftnet/devel/driftnet-0.1.6-no-makedepend.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- driftnet-0.1.6-no-makedepend.patch	3 Apr 2006 12:15:00 -0000	1.1
+++ driftnet-0.1.6-no-makedepend.patch	3 Apr 2006 13:04:44 -0000	1.2
@@ -62,7 +62,7 @@
  #   define GETB(p)             ((chan)(((p) & (pel)0x00ff0000) >> 16))
  #   define GETA(p)             ((chan)(((p) & (pel)0xff000000) >> 24))
 -#elif defined(DRIFTNET_BIG_ENDIAN)
-+#elif defined(G_BYTE_ORDER == G_BIG_ENDIAN)
++#elif (G_BYTE_ORDER == G_BIG_ENDIAN)
  #   define PEL(r, g, b)        ((pel)(((chan)(r) << 24) | ((chan)(g) << 16) | ((chan)(b) << 8)))
  #   define PELA(r, g, b, a)    ((pel)(((chan)(r) << 24) | ((chan)(g) << 16) | ((chan)(b) << 8) | ((chan)(a))))
  


Index: driftnet.spec
===================================================================
RCS file: /cvs/extras/rpms/driftnet/devel/driftnet.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- driftnet.spec	3 Apr 2006 12:15:00 -0000	1.1
+++ driftnet.spec	3 Apr 2006 13:04:44 -0000	1.2
@@ -2,7 +2,7 @@
 License: GPL
 Group: Applications/Internet
 Version: 0.1.6
-Release: 7
+Release: 8
 Summary: Network image sniffer
 URL: http://www.ex-parrot.com/~chris/driftnet/
 Source0: http://www.ex-parrot.com/~chris/driftnet/driftnet-0.1.6.tar.gz
@@ -55,6 +55,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 03 2006 - Bastien Nocera <hadess at hadess.net> - 0.1.6-8
+- Fix typo in the imake removal patch that broke on big endian machines
+
 * Mon Apr 03 2006 - Bastien Nocera <hadess at hadess.net> - 0.1.6-7
 - spell "driftnet" correctly in driftnet-dont-use-tmpnam.patch
   Add patch2 to remove imake dependency



From fedora-extras-commits at redhat.com  Mon Apr  3 13:10:33 2006
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon,  3 Apr 2006 06:10:33 -0700
Subject: rpms/driftnet/devel driftnet.spec,1.2,1.3
Message-ID: <200604031310.k33DAZnT014776@cvs-int.fedora.redhat.com>

Author: hadess

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

Modified Files:
	driftnet.spec 
Log Message:
- build update



Index: driftnet.spec
===================================================================
RCS file: /cvs/extras/rpms/driftnet/devel/driftnet.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- driftnet.spec	3 Apr 2006 13:04:44 -0000	1.2
+++ driftnet.spec	3 Apr 2006 13:10:33 -0000	1.3
@@ -2,7 +2,7 @@
 License: GPL
 Group: Applications/Internet
 Version: 0.1.6
-Release: 8
+Release: 9
 Summary: Network image sniffer
 URL: http://www.ex-parrot.com/~chris/driftnet/
 Source0: http://www.ex-parrot.com/~chris/driftnet/driftnet-0.1.6.tar.gz
@@ -55,7 +55,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Mon Apr 03 2006 - Bastien Nocera <hadess at hadess.net> - 0.1.6-8
+* Mon Apr 03 2006 - Bastien Nocera <hadess at hadess.net> - 0.1.6-9
 - Fix typo in the imake removal patch that broke on big endian machines
 
 * Mon Apr 03 2006 - Bastien Nocera <hadess at hadess.net> - 0.1.6-7



From fedora-extras-commits at redhat.com  Mon Apr  3 13:16:49 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  3 Apr 2006 06:16:49 -0700
Subject: rpms/kile/devel .cvsignore, 1.4, 1.5 kile.spec, 1.24, 1.25 sources, 
	1.4, 1.5
Message-ID: <200604031316.k33DGpxq014853@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore kile.spec sources 
Log Message:
* Fri Mar 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9-1
- 1.9(final)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kile/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Aug 2005 18:28:43 -0000	1.4
+++ .cvsignore	3 Apr 2006 13:16:49 -0000	1.5
@@ -1 +1 @@
-kile-1.8.1.tar.bz2
+kile-1.9.tar.bz2


Index: kile.spec
===================================================================
RCS file: /cvs/extras/rpms/kile/devel/kile.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- kile.spec	1 Mar 2006 16:37:43 -0000	1.24
+++ kile.spec	3 Apr 2006 13:16:49 -0000	1.25
@@ -1,24 +1,23 @@
 
 Name:	 kile
 Summary: (La)TeX source editor and TeX shell
-Version: 1.8.1
-Release: 7%{?dist}.2
+Version: 1.9
+Release: 1%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
 URL:	 http://kile.sourceforge.net/
-Source0: http://dl.sourceforge.net/sourceforge/kile/kile-1.8.1.tar.bz2
+Source0: http://dl.sourceforge.net/sourceforge/kile/kile-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
+BuildRequires: gettext
 BuildRequires: desktop-file-utils
-
-BuildRequires: qt-devel >= 1:3.3
-BuildRequires: kdelibs-devel >= 6:3.3
+BuildRequires: kdelibs-devel
 
 Requires: tetex-latex
 ## Optional/recommended, but not absolutely required.
-#Requires: gnuplot
-#Requires: xfig
+#Requires(hint): gnuplot
+#Requires(hint): xfig
 
 # kile-i18n is no longer separate pkg
 Obsoletes: kile-i18n < %{version}
@@ -52,8 +51,10 @@
 
 %configure \
   --disable-rpath \
+  --disable-gcc-hidden-visibility \
+  --enable-new-ldflags \
   --disable-debug --disable-warnings \
-  --disable-dependency-tracking --enable-final
+  --disable-dependancy-tracking --enable-final 
 
 make %{?_smp_mflags}
 
@@ -63,11 +64,11 @@
 
 make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install --vendor fedora \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/appl*/*/*.desktop
+desktop-file-install \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  --vendor="" \
+  --add-category="X-Fedora" \
+  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
   
 ## File lists
 # locale's
@@ -94,29 +95,25 @@
 
 
 %post
-for icon_theme in hicolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
 
 %postun
-for icon_theme in hicolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog README TODO
 %{_bindir}/*
-%{_datadir}/apps/kile
+%{_datadir}/apps/kile/
 %{_datadir}/apps/kconf_update/kile*
 %config %{_datadir}/config*/*
 %{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/kde/*.desktop
 %{_datadir}/mimelnk/*/*.desktop
 
 
@@ -125,6 +122,12 @@
 
 
 %changelog
+* Fri Mar 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9-1
+- 1.9(final)
+
+* Mon Mar 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9-0.1.rc
+- 1.9rc1
+
 * Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net>
 - fc5: gcc/glibc respin
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kile/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Aug 2005 18:28:43 -0000	1.4
+++ sources	3 Apr 2006 13:16:49 -0000	1.5
@@ -1 +1 @@
-9ac4cd9294c6aff1acca1def68923a7d  kile-1.8.1.tar.bz2
+32b660b4baccecf895d40c5ed43d2ffc  kile-1.9.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr  3 13:19:56 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Mon,  3 Apr 2006 06:19:56 -0700
Subject: rpms/mediawiki/devel .cvsignore, 1.3, 1.4 mediawiki.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200604031319.k33DJwJN014924@cvs-int.fedora.redhat.com>

Author: roozbeh

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

Modified Files:
	.cvsignore mediawiki.spec sources 
Log Message:
* Mon Apr 03 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.5.8-1
- Update to upstream 1.5.8 (contains security fixes)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Mar 2006 21:15:59 -0000	1.3
+++ .cvsignore	3 Apr 2006 13:19:56 -0000	1.4
@@ -1 +1 @@
-mediawiki-1.5.7.tar.gz
+mediawiki-1.5.8.tar.gz


Index: mediawiki.spec
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/devel/mediawiki.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mediawiki.spec	2 Mar 2006 21:15:59 -0000	1.4
+++ mediawiki.spec	3 Apr 2006 13:19:56 -0000	1.5
@@ -1,7 +1,7 @@
 %define wikidir %{_var}/www/mediawiki
 
 Name:           mediawiki
-Version:        1.5.7
+Version:        1.5.8
 Release:        1%{?dist}
 Summary:        The PHP-based wiki software behind Wikipedia
 
@@ -89,6 +89,9 @@
 
 
 %changelog
+* Mon Apr 03 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.5.8-1
+- Update to upstream 1.5.8 (contains security fixes)
+
 * Thu Mar 02 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.5.7-1
 - Update to upstream 1.5.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Mar 2006 21:15:59 -0000	1.3
+++ sources	3 Apr 2006 13:19:56 -0000	1.4
@@ -1 +1 @@
-0a2347e2422006d8f75479b06c1963d8  mediawiki-1.5.7.tar.gz
+1eef94157377fa8c3d049877a27c0163  mediawiki-1.5.8.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr  3 13:25:11 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Mon,  3 Apr 2006 06:25:11 -0700
Subject: rpms/mediawiki/FC-4 .cvsignore, 1.3, 1.4 mediawiki.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200604031325.k33DPDor014975@cvs-int.fedora.redhat.com>

Author: roozbeh

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

Modified Files:
	.cvsignore mediawiki.spec sources 
Log Message:
* Mon Apr 03 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.5.8-1
- Update to upstream 1.5.8 (contains security fixes)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Mar 2006 21:33:16 -0000	1.3
+++ .cvsignore	3 Apr 2006 13:25:11 -0000	1.4
@@ -1 +1 @@
-mediawiki-1.5.7.tar.gz
+mediawiki-1.5.8.tar.gz


Index: mediawiki.spec
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/FC-4/mediawiki.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mediawiki.spec	2 Mar 2006 21:33:16 -0000	1.3
+++ mediawiki.spec	3 Apr 2006 13:25:11 -0000	1.4
@@ -1,7 +1,7 @@
 %define wikidir %{_var}/www/mediawiki
 
 Name:           mediawiki
-Version:        1.5.7
+Version:        1.5.8
 Release:        1%{?dist}
 Summary:        The PHP-based wiki software behind Wikipedia
 
@@ -89,6 +89,9 @@
 
 
 %changelog
+* Mon Apr 03 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.5.8-1
+- Update to upstream 1.5.8 (contains security fixes)
+
 * Thu Mar 02 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.5.7-1
 - Update to upstream 1.5.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Mar 2006 21:33:16 -0000	1.3
+++ sources	3 Apr 2006 13:25:11 -0000	1.4
@@ -1 +1 @@
-0a2347e2422006d8f75479b06c1963d8  mediawiki-1.5.7.tar.gz
+1eef94157377fa8c3d049877a27c0163  mediawiki-1.5.8.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr  3 13:36:11 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  3 Apr 2006 06:36:11 -0700
Subject: rpms/kile/FC-5 .cvsignore, 1.4, 1.5 kile.spec, 1.24, 1.25 sources,
	1.4, 1.5
Message-ID: <200604031336.k33DaDvP015061@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore kile.spec sources 
Log Message:
* Fri Mar 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9-1
- 1.9(final)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Aug 2005 18:28:43 -0000	1.4
+++ .cvsignore	3 Apr 2006 13:36:11 -0000	1.5
@@ -1 +1 @@
-kile-1.8.1.tar.bz2
+kile-1.9.tar.bz2


Index: kile.spec
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-5/kile.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- kile.spec	1 Mar 2006 16:37:43 -0000	1.24
+++ kile.spec	3 Apr 2006 13:36:11 -0000	1.25
@@ -1,24 +1,23 @@
 
 Name:	 kile
 Summary: (La)TeX source editor and TeX shell
-Version: 1.8.1
-Release: 7%{?dist}.2
+Version: 1.9
+Release: 1%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
 URL:	 http://kile.sourceforge.net/
-Source0: http://dl.sourceforge.net/sourceforge/kile/kile-1.8.1.tar.bz2
+Source0: http://dl.sourceforge.net/sourceforge/kile/kile-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
+BuildRequires: gettext
 BuildRequires: desktop-file-utils
-
-BuildRequires: qt-devel >= 1:3.3
-BuildRequires: kdelibs-devel >= 6:3.3
+BuildRequires: kdelibs-devel
 
 Requires: tetex-latex
 ## Optional/recommended, but not absolutely required.
-#Requires: gnuplot
-#Requires: xfig
+#Requires(hint): gnuplot
+#Requires(hint): xfig
 
 # kile-i18n is no longer separate pkg
 Obsoletes: kile-i18n < %{version}
@@ -52,8 +51,10 @@
 
 %configure \
   --disable-rpath \
+  --disable-gcc-hidden-visibility \
+  --enable-new-ldflags \
   --disable-debug --disable-warnings \
-  --disable-dependency-tracking --enable-final
+  --disable-dependancy-tracking --enable-final 
 
 make %{?_smp_mflags}
 
@@ -63,11 +64,11 @@
 
 make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install --vendor fedora \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/appl*/*/*.desktop
+desktop-file-install \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  --vendor="" \
+  --add-category="X-Fedora" \
+  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
   
 ## File lists
 # locale's
@@ -94,29 +95,25 @@
 
 
 %post
-for icon_theme in hicolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
 
 %postun
-for icon_theme in hicolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog README TODO
 %{_bindir}/*
-%{_datadir}/apps/kile
+%{_datadir}/apps/kile/
 %{_datadir}/apps/kconf_update/kile*
 %config %{_datadir}/config*/*
 %{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/kde/*.desktop
 %{_datadir}/mimelnk/*/*.desktop
 
 
@@ -125,6 +122,12 @@
 
 
 %changelog
+* Fri Mar 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9-1
+- 1.9(final)
+
+* Mon Mar 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9-0.1.rc
+- 1.9rc1
+
 * Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net>
 - fc5: gcc/glibc respin
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Aug 2005 18:28:43 -0000	1.4
+++ sources	3 Apr 2006 13:36:11 -0000	1.5
@@ -1 +1 @@
-9ac4cd9294c6aff1acca1def68923a7d  kile-1.8.1.tar.bz2
+32b660b4baccecf895d40c5ed43d2ffc  kile-1.9.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr  3 13:36:36 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  3 Apr 2006 06:36:36 -0700
Subject: rpms/kile/FC-4 .cvsignore, 1.3, 1.4 kile.spec, 1.19, 1.20 sources,
	1.4, 1.5
Message-ID: <200604031336.k33DacMp015126@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore kile.spec sources 
Log Message:
* Fri Mar 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9-1
- 1.9(final)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Jan 2005 15:32:49 -0000	1.3
+++ .cvsignore	3 Apr 2006 13:36:36 -0000	1.4
@@ -1 +1 @@
-kile-1.7.1.tar.bz2
+kile-1.9.tar.bz2


Index: kile.spec
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-4/kile.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- kile.spec	15 Dec 2005 17:52:52 -0000	1.19
+++ kile.spec	3 Apr 2006 13:36:36 -0000	1.20
@@ -1,26 +1,23 @@
 
 Name:	 kile
 Summary: (La)TeX source editor and TeX shell
-Version: 1.8.1
-Release: 7%{?dist}
+Version: 1.9
+Release: 1%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
 URL:	 http://kile.sourceforge.net/
-Source0: http://dl.sourceforge.net/sourceforge/kile/kile-1.8.1.tar.bz2
+Source0: http://dl.sourceforge.net/sourceforge/kile/kile-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
+BuildRequires: gettext
 BuildRequires: desktop-file-utils
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
-
-BuildRequires: qt-devel >= 1:3.3
-BuildRequires: kdelibs-devel >= 6:3.3
+BuildRequires: kdelibs-devel
 
 Requires: tetex-latex
 ## Optional/recommended, but not absolutely required.
-#Requires: gnuplot
-#Requires: xfig
+#Requires(hint): gnuplot
+#Requires(hint): xfig
 
 # kile-i18n is no longer separate pkg
 Obsoletes: kile-i18n < %{version}
@@ -54,8 +51,10 @@
 
 %configure \
   --disable-rpath \
+  --disable-gcc-hidden-visibility \
+  --enable-new-ldflags \
   --disable-debug --disable-warnings \
-  --disable-dependency-tracking --enable-final
+  --disable-dependancy-tracking --enable-final 
 
 make %{?_smp_mflags}
 
@@ -65,11 +64,11 @@
 
 make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install --vendor fedora \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/appl*/*/*.desktop
+desktop-file-install \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  --vendor="" \
+  --add-category="X-Fedora" \
+  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
   
 ## File lists
 # locale's
@@ -96,29 +95,25 @@
 
 
 %post
-for icon_theme in hicolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
 
 %postun
-for icon_theme in hicolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog README TODO
 %{_bindir}/*
-%{_datadir}/apps/kile
+%{_datadir}/apps/kile/
 %{_datadir}/apps/kconf_update/kile*
 %config %{_datadir}/config*/*
 %{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/kde/*.desktop
 %{_datadir}/mimelnk/*/*.desktop
 
 
@@ -127,6 +122,15 @@
 
 
 %changelog
+* Fri Mar 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9-1
+- 1.9(final)
+
+* Mon Mar 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9-0.1.rc
+- 1.9rc1
+
+* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net>
+- fc5: gcc/glibc respin
+
 * Thu Nov 10 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.3-7
 - fix symlinks
 - simplify configure


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	5 Aug 2005 17:35:52 -0000	1.4
+++ sources	3 Apr 2006 13:36:36 -0000	1.5
@@ -1 +1 @@
-9ac4cd9294c6aff1acca1def68923a7d  kile-1.8.1.tar.bz2
+32b660b4baccecf895d40c5ed43d2ffc  kile-1.9.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr  3 13:37:00 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  3 Apr 2006 06:37:00 -0700
Subject: rpms/kile/FC-3 .cvsignore, 1.3, 1.4 kile.spec, 1.15, 1.16 sources,
	1.4, 1.5
Message-ID: <200604031337.k33Db2N8015195@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kile/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15174

Modified Files:
	.cvsignore kile.spec sources 
Log Message:
* Fri Mar 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9-1
- 1.9(final)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Jan 2005 15:32:49 -0000	1.3
+++ .cvsignore	3 Apr 2006 13:37:00 -0000	1.4
@@ -1 +1 @@
-kile-1.7.1.tar.bz2
+kile-1.9.tar.bz2


Index: kile.spec
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-3/kile.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- kile.spec	15 Dec 2005 17:52:47 -0000	1.15
+++ kile.spec	3 Apr 2006 13:37:00 -0000	1.16
@@ -1,26 +1,23 @@
 
 Name:	 kile
 Summary: (La)TeX source editor and TeX shell
-Version: 1.8.1
-Release: 7%{?dist}
+Version: 1.9
+Release: 1%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
 URL:	 http://kile.sourceforge.net/
-Source0: http://dl.sourceforge.net/sourceforge/kile/kile-1.8.1.tar.bz2
+Source0: http://dl.sourceforge.net/sourceforge/kile/kile-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
+BuildRequires: gettext
 BuildRequires: desktop-file-utils
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
-
-BuildRequires: qt-devel >= 1:3.3
-BuildRequires: kdelibs-devel >= 6:3.3
+BuildRequires: kdelibs-devel
 
 Requires: tetex-latex
 ## Optional/recommended, but not absolutely required.
-#Requires: gnuplot
-#Requires: xfig
+#Requires(hint): gnuplot
+#Requires(hint): xfig
 
 # kile-i18n is no longer separate pkg
 Obsoletes: kile-i18n < %{version}
@@ -54,8 +51,10 @@
 
 %configure \
   --disable-rpath \
+  --disable-gcc-hidden-visibility \
+  --enable-new-ldflags \
   --disable-debug --disable-warnings \
-  --disable-dependency-tracking --enable-final
+  --disable-dependancy-tracking --enable-final 
 
 make %{?_smp_mflags}
 
@@ -65,11 +64,11 @@
 
 make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install --vendor fedora \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/appl*/*/*.desktop
+desktop-file-install \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  --vendor="" \
+  --add-category="X-Fedora" \
+  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
   
 ## File lists
 # locale's
@@ -96,29 +95,25 @@
 
 
 %post
-for icon_theme in hicolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
 
 %postun
-for icon_theme in hicolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog README TODO
 %{_bindir}/*
-%{_datadir}/apps/kile
+%{_datadir}/apps/kile/
 %{_datadir}/apps/kconf_update/kile*
 %config %{_datadir}/config*/*
 %{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/kde/*.desktop
 %{_datadir}/mimelnk/*/*.desktop
 
 
@@ -127,6 +122,15 @@
 
 
 %changelog
+* Fri Mar 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9-1
+- 1.9(final)
+
+* Mon Mar 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9-0.1.rc
+- 1.9rc1
+
+* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net>
+- fc5: gcc/glibc respin
+
 * Thu Nov 10 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.3-7
 - fix symlinks
 - simplify configure


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	5 Aug 2005 17:47:59 -0000	1.4
+++ sources	3 Apr 2006 13:37:00 -0000	1.5
@@ -1 +1 @@
-9ac4cd9294c6aff1acca1def68923a7d  kile-1.8.1.tar.bz2
+32b660b4baccecf895d40c5ed43d2ffc  kile-1.9.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr  3 13:37:18 2006
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon,  3 Apr 2006 06:37:18 -0700
Subject: owners owners.list,1.798,1.799
Message-ID: <200604031337.k33DbKKY015252@cvs-int.fedora.redhat.com>

Author: hadess

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

Modified Files:
	owners.list 
Log Message:
- change my e-mail address to match the one in bugzilla



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.798
retrieving revision 1.799
diff -u -r1.798 -r1.799
--- owners.list	3 Apr 2006 12:23:29 -0000	1.798
+++ owners.list	3 Apr 2006 13:37:18 -0000	1.799
@@ -197,7 +197,7 @@
 Fedora Extras|doulos-fonts|Doulos SIL fonts|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|drgeo-doc|html documentation for drgeo|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
 Fedora Extras|drgeo|Interactive educational geometry software|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
-Fedora Extras|driftnet|Network image sniffer|hadess at hadess.net|extras-qa at fedoraproject.org|
+Fedora Extras|driftnet|Network image sniffer|bnocera at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|drivel|A journal or "blog" client|stickster at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|drscheme|Graphical environment for developing programs using Scheme|gemi at bluewin.ch|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|



From fedora-extras-commits at redhat.com  Mon Apr  3 13:44:34 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Mon,  3 Apr 2006 06:44:34 -0700
Subject: rpms/mediawiki/FC-5 .cvsignore, 1.3, 1.4 mediawiki.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200604031344.k33Diaxk015390@cvs-int.fedora.redhat.com>

Author: roozbeh

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

Modified Files:
	.cvsignore mediawiki.spec sources 
Log Message:
* Mon Apr 03 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.5.8-1
- Update to upstream 1.5.8 (contains security fixes)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Mar 2006 21:15:59 -0000	1.3
+++ .cvsignore	3 Apr 2006 13:44:34 -0000	1.4
@@ -1 +1 @@
-mediawiki-1.5.7.tar.gz
+mediawiki-1.5.8.tar.gz


Index: mediawiki.spec
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/FC-5/mediawiki.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mediawiki.spec	2 Mar 2006 21:15:59 -0000	1.4
+++ mediawiki.spec	3 Apr 2006 13:44:34 -0000	1.5
@@ -1,7 +1,7 @@
 %define wikidir %{_var}/www/mediawiki
 
 Name:           mediawiki
-Version:        1.5.7
+Version:        1.5.8
 Release:        1%{?dist}
 Summary:        The PHP-based wiki software behind Wikipedia
 
@@ -89,6 +89,9 @@
 
 
 %changelog
+* Mon Apr 03 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.5.8-1
+- Update to upstream 1.5.8 (contains security fixes)
+
 * Thu Mar 02 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.5.7-1
 - Update to upstream 1.5.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Mar 2006 21:15:59 -0000	1.3
+++ sources	3 Apr 2006 13:44:34 -0000	1.4
@@ -1 +1 @@
-0a2347e2422006d8f75479b06c1963d8  mediawiki-1.5.7.tar.gz
+1eef94157377fa8c3d049877a27c0163  mediawiki-1.5.8.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr  3 16:22:06 2006
From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom))
Date: Mon,  3 Apr 2006 09:22:06 -0700
Subject: owners owners.list,1.799,1.800
Message-ID: <200604031622.k33GM8sR022922@cvs-int.fedora.redhat.com>

Author: kaboom

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

Modified Files:
	owners.list 
Log Message:
Orphaning openbox



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.799
retrieving revision 1.800
diff -u -r1.799 -r1.800
--- owners.list	3 Apr 2006 13:37:18 -0000	1.799
+++ owners.list	3 Apr 2006 16:22:06 -0000	1.800
@@ -783,7 +783,7 @@
 Fedora Extras|oidentd|Implementation of the RFC1413 identification server|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|oneko|Cat chases the cursor|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|openal|Open Audio Library|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
-Fedora Extras|openbox|Openbox window manager|kaboom at oobleck.net|extras-qa at fedoraproject.org|
+Fedora Extras|openbox|Openbox window manager|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|opencdk|Provides basic parts of the OpenPGP message format|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|openct|Middleware framework for smart card terminals|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|opencv|Collection of algorithms for computer vision|nomis80 at nomis80.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Apr  3 16:45:28 2006
From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom))
Date: Mon,  3 Apr 2006 09:45:28 -0700
Subject: owners owners.list,1.800,1.801
Message-ID: <200604031645.k33GjU0r023012@cvs-int.fedora.redhat.com>

Author: kaboom

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

Modified Files:
	owners.list 
Log Message:
owning cgoban



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.800
retrieving revision 1.801
diff -u -r1.800 -r1.801
--- owners.list	3 Apr 2006 16:22:06 -0000	1.800
+++ owners.list	3 Apr 2006 16:45:28 -0000	1.801
@@ -119,7 +119,7 @@
 Fedora Extras|cfitsio|Library for manipulating FITS data files|matt at truch.net|extras-qa at fedoraproject.org|
 Fedora Extras|cfs|An userspace crypto-filesystem|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|cfv|A checksum creation and verification utility|a.kurtz at hardsun.net|extras-qa at fedoraproject.org|
-Fedora Extras|cgoban|X board for playing go|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|cgoban|X board for playing go|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|charis-fonts|Charis SIL fonts|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|check|A unit test framework for C|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|chkrootkit|A tool to locally check for signs of a rootkit|bugs.michael at gmx.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Apr  3 17:00:08 2006
From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom))
Date: Mon,  3 Apr 2006 10:00:08 -0700
Subject: rpms/cgoban/FC-5 cgoban.spec,1.10,1.11
Message-ID: <200604031700.k33H0AkW023066@cvs-int.fedora.redhat.com>

Author: kaboom

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

Modified Files:
	cgoban.spec 
Log Message:
rebuilding for fe5



Index: cgoban.spec
===================================================================
RCS file: /cvs/extras/rpms/cgoban/FC-5/cgoban.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cgoban.spec	2 Mar 2006 21:28:23 -0000	1.10
+++ cgoban.spec	3 Apr 2006 17:00:07 -0000	1.11
@@ -1,17 +1,14 @@
-Name:           cgoban
-Version:        1.9.14
-Release:        6%{?dist}
-
-Summary:        X board for playing go
-
-Group:          Amusements/Games
-License:        GPL
-URL:            http://cgoban1.sourceforge.net/
-Source0:	http://download.sourceforge.net/cgoban1/cgoban-1.9.14.tar.gz
-Source1:        cgoban.desktop
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	desktop-file-utils
+Name: cgoban
+Version: 1.9.14
+Release: 7%{?dist}
+Summary: X board for playing go
+Group: Amusements/Games
+License: GPL
+URL: http://cgoban1.sourceforge.net/
+Source0: http://download.sourceforge.net/cgoban1/cgoban-1.9.14.tar.gz
+Source1: cgoban.desktop
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: desktop-file-utils
 BuildRequires: libICE-devel, libXmu-devel, libSM-devel, xorg-x11-proto-devel
 BuildRequires: libXext-devel, libXaw-devel, libXt-devel
 
@@ -20,26 +17,16 @@
 to be a computerized go board, view and edit smart-go files, and connect to
 go servers on the Internet.
 
-
 %prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
-
 rm -rf ${RPM_BUILD_ROOT}
 %setup -q
 
-
 %build
 %configure
 perl -pi -e "s/-O2 -fomit-frame-pointer/$RPM_OPT_FLAGS/" config.status
 ./config.status
 make %{?_smp_mflags}
 
-
 %install
 rm -rf ${RPM_BUILD_ROOT}
 %makeinstall
@@ -50,11 +37,9 @@
   --add-category X-Fedora                          \
   %{SOURCE1}
 
-
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
-
 %files
 %defattr(-,root,root,-)
 %doc COPYING README TODO
@@ -65,6 +50,10 @@
 
 
 %changelog
+* Mon Apr  3 2006 Chris Ricker <kaboom at oobleck.net> 1.9.14-7
+- Rebuild again for FE5
+- die, tabs, die!
+
 * Wed Mar  1 2006 Chris Ricker <kaboom at oobleck.net> 1.9.14-6
 - Rebuild for FE5
 - add dist tag



From fedora-extras-commits at redhat.com  Mon Apr  3 17:04:37 2006
From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom))
Date: Mon,  3 Apr 2006 10:04:37 -0700
Subject: devel/cgoban cgoban.spec,1.10,1.11
Message-ID: <200604031704.k33H4dHI025135@cvs-int.fedora.redhat.com>

Author: kaboom

Update of /cvs/extras/devel/cgoban
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25118

Modified Files:
	cgoban.spec 
Log Message:
build for devel



Index: cgoban.spec
===================================================================
RCS file: /cvs/extras/devel/cgoban/cgoban.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cgoban.spec	2 Mar 2006 21:28:23 -0000	1.10
+++ cgoban.spec	3 Apr 2006 17:04:37 -0000	1.11
@@ -1,17 +1,14 @@
-Name:           cgoban
-Version:        1.9.14
-Release:        6%{?dist}
-
-Summary:        X board for playing go
-
-Group:          Amusements/Games
-License:        GPL
-URL:            http://cgoban1.sourceforge.net/
-Source0:	http://download.sourceforge.net/cgoban1/cgoban-1.9.14.tar.gz
-Source1:        cgoban.desktop
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	desktop-file-utils
+Name: cgoban
+Version: 1.9.14
+Release: 7%{?dist}
+Summary: X board for playing go
+Group: Amusements/Games
+License: GPL
+URL: http://cgoban1.sourceforge.net/
+Source0: http://download.sourceforge.net/cgoban1/cgoban-1.9.14.tar.gz
+Source1: cgoban.desktop
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: desktop-file-utils
 BuildRequires: libICE-devel, libXmu-devel, libSM-devel, xorg-x11-proto-devel
 BuildRequires: libXext-devel, libXaw-devel, libXt-devel
 
@@ -20,26 +17,16 @@
 to be a computerized go board, view and edit smart-go files, and connect to
 go servers on the Internet.
 
-
 %prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
-
 rm -rf ${RPM_BUILD_ROOT}
 %setup -q
 
-
 %build
 %configure
 perl -pi -e "s/-O2 -fomit-frame-pointer/$RPM_OPT_FLAGS/" config.status
 ./config.status
 make %{?_smp_mflags}
 
-
 %install
 rm -rf ${RPM_BUILD_ROOT}
 %makeinstall
@@ -50,11 +37,9 @@
   --add-category X-Fedora                          \
   %{SOURCE1}
 
-
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
-
 %files
 %defattr(-,root,root,-)
 %doc COPYING README TODO
@@ -65,6 +50,10 @@
 
 
 %changelog
+* Mon Apr  3 2006 Chris Ricker <kaboom at oobleck.net> 1.9.14-7
+- Rebuild again for FE5
+- die, tabs, die!
+
 * Wed Mar  1 2006 Chris Ricker <kaboom at oobleck.net> 1.9.14-6
 - Rebuild for FE5
 - add dist tag



From fedora-extras-commits at redhat.com  Mon Apr  3 17:05:10 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Mon,  3 Apr 2006 10:05:10 -0700
Subject: rpms/azureus/FC-5 azureus.script,1.8,1.9 azureus.spec,1.21,1.22
Message-ID: <200604031705.k33H5C6V025160@cvs-int.fedora.redhat.com>

Author: green

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

Modified Files:
	azureus.script azureus.spec 
Log Message:
_3 revision.  One more fix to LD_LIBRARY_PATH.



Index: azureus.script
===================================================================
RCS file: /cvs/extras/rpms/azureus/FC-5/azureus.script,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- azureus.script	2 Apr 2006 03:34:32 -0000	1.8
+++ azureus.script	3 Apr 2006 17:05:09 -0000	1.9
@@ -15,4 +15,4 @@
 done;
 popd > /dev/null 2>&1
 
-LD_LIBRARY_PATH=/usr/lib/eclipse CLASSPATH=`build-classpath jakarta-commons-cli log4j swt-gtk-3.1.1 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=`build-classpath jakarta-commons-cli log4j swt-gtk-3.1.1 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-5/azureus.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- azureus.spec	2 Apr 2006 03:34:32 -0000	1.21
+++ azureus.spec	3 Apr 2006 17:05:10 -0000	1.22
@@ -1,6 +1,6 @@
 Name:		azureus
 Version:	2.4.0.3
-Release:	0.20060328cvs_2%{?dist}
+Release:	0.20060328cvs_3%{?dist}
 Summary:	A BitTorrent Client
 
 Group:		Applications/Internet
@@ -204,6 +204,9 @@
 %{_libdir}/gcj/*
 
 %changelog
+* Mon Apr 03 2006 Anthony Green <green at redhat.com> - 2.4.0.3-0.20060328cvs_3
+- One more correction to LD_LIBRARY_PATH.  Bugzilla #186152.
+
 * Sat Apr 01 2006 Anthony Green <green at redhat.com> - 2.4.0.3-0.20060328cvs_2
 - Set LD_LIBRARY_PATH for Sun java alternative.  Bugzilla #186152.
 - Remove pushd/popd noise from startup script.



From fedora-extras-commits at redhat.com  Mon Apr  3 18:24:37 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Mon,  3 Apr 2006 11:24:37 -0700
Subject: rpms/gdesklets/FC-5 gdesklets.spec,1.11,1.12
Message-ID: <200604031824.k33IOdw0031029@cvs-int.fedora.redhat.com>

Author: luya

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

Modified Files:
	gdesklets.spec 
Log Message:

updated gdesklets.spec for ppc64




Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-5/gdesklets.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gdesklets.spec	28 Feb 2006 21:15:09 -0000	1.11
+++ gdesklets.spec	3 Apr 2006 18:24:37 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           gdesklets
 Version:        0.35.3
-Release:        4%{?dist}
+Release:        6%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
@@ -18,7 +18,7 @@
 #							    #
 #############################################################
 
-BuildRequires:  python-devel >= 2.0.0, pyorbit-devel >= 2.0.1, pygtk2-devel >= 2.4.0, 
+BuildRequires:  python-devel > 2.0.0, pyorbit-devel > 2.0.1, pygtk2-devel > 2.4.0, 
 BuildRequires:  librsvg2-devel, libgtop2-devel >= 2.8.0, gettext   
 BuildRequires:  libXau-devel, libXdmcp-devel
 BuildRequires:  gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0, desktop-file-utils
@@ -96,6 +96,12 @@
 
 
 %changelog
+* Mon Apr 03 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-6
+- Bump 
+
+* Mon Apr 03 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-5
+- Ajusted pyorbit requirement for ppc64
+
 * Thu Jan 19 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-4
 - Rebuild for Fedora Extras 5
 



From fedora-extras-commits at redhat.com  Mon Apr  3 18:33:39 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Mon,  3 Apr 2006 11:33:39 -0700
Subject: rpms/gdesklets/FC-5 gdesklets.spec,1.12,1.13
Message-ID: <200604031833.k33IXfwQ031104@cvs-int.fedora.redhat.com>

Author: luya

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

Modified Files:
	gdesklets.spec 
Log Message:

update gdesklets.spec



Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-5/gdesklets.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gdesklets.spec	3 Apr 2006 18:24:37 -0000	1.12
+++ gdesklets.spec	3 Apr 2006 18:33:39 -0000	1.13
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Mon Apr 03 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-7
+- Bump 
+
 * Mon Apr 03 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-6
 - Bump 
 



From fedora-extras-commits at redhat.com  Mon Apr  3 18:39:40 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon,  3 Apr 2006 11:39:40 -0700
Subject: comps comps-fe5.xml.in,1.32,1.33
Message-ID: <200604031839.k33Idgm6031174@cvs-int.fedora.redhat.com>

Author: wart

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

Modified Files:
	comps-fe5.xml.in 
Log Message:
Added njam and shippy to the games group.




Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- comps-fe5.xml.in	30 Mar 2006 18:04:10 -0000	1.32
+++ comps-fe5.xml.in	3 Apr 2006 18:39:40 -0000	1.33
@@ -225,6 +225,7 @@
         <packagereq type="optional">nethack-vultures</packagereq>
         <packagereq type="optional">neverball</packagereq>
         <packagereq type="optional">nexuiz</packagereq>
+        <packagereq type="optional">njam</packagereq>
         <packagereq type="optional">overgod</packagereq>
         <packagereq type="optional">powermanga</packagereq>
         <packagereq type="optional">ppracer</packagereq>
@@ -233,6 +234,7 @@
         <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>



From fedora-extras-commits at redhat.com  Mon Apr  3 19:23:34 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon,  3 Apr 2006 12:23:34 -0700
Subject: rpms/zasx - New directory
Message-ID: <200604031923.k33JNaiC000865@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

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




From fedora-extras-commits at redhat.com  Mon Apr  3 19:23:34 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon,  3 Apr 2006 12:23:34 -0700
Subject: rpms/zasx/devel - New directory
Message-ID: <200604031923.k33JNabV000868@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

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




From fedora-extras-commits at redhat.com  Mon Apr  3 19:23:50 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon,  3 Apr 2006 12:23:50 -0700
Subject: rpms/zasx Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604031923.k33JNq7T000919@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

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


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

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

common : CVS/Root
	@cvs 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 Apr  3 19:23:50 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon,  3 Apr 2006 12:23:50 -0700
Subject: rpms/zasx/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200604031923.k33JNqom000922@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

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


--- 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 Apr  3 19:24:54 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon,  3 Apr 2006 12:24:54 -0700
Subject: rpms/zasx import.log,1.1,1.2
Message-ID: <200604031925.k33JPQdE001031@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	import.log 
Log Message:
auto-import zasx-1.30-1 on branch devel from zasx-1.30-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/zasx/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	3 Apr 2006 19:23:50 -0000	1.1
+++ import.log	3 Apr 2006 19:24:54 -0000	1.2
@@ -0,0 +1 @@
+zasx-1_30-1:HEAD:zasx-1.30-1.src.rpm:1144092122



From fedora-extras-commits at redhat.com  Mon Apr  3 19:24:55 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon,  3 Apr 2006 12:24:55 -0700
Subject: rpms/zasx/devel zasx-1.30-datadir.patch, NONE,
	1.1 zasx-1.30-fixes.patch, NONE, 1.1 zasx.desktop, NONE,
	1.1 zasx.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604031925.k33JPRBT001035@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	.cvsignore sources 
Added Files:
	zasx-1.30-datadir.patch zasx-1.30-fixes.patch zasx.desktop 
	zasx.spec 
Log Message:
auto-import zasx-1.30-1 on branch devel from zasx-1.30-1.src.rpm

zasx-1.30-datadir.patch:

--- NEW FILE zasx-1.30-datadir.patch ---
--- Zasx/src/weapon.c~	2006-04-02 22:47:23.000000000 +0200
+++ Zasx/src/weapon.c	2006-04-02 22:52:03.000000000 +0200
@@ -260,6 +260,22 @@
 				c->Image[i]= NULL;
 
 				sscanf(temp, "%[^ \n\t;]", buf2);
+				/* Move temp to the next image before we
+				   "fix" buf2 */
+				temp += strlen(buf2) + 1;
+#ifdef DATADIR
+				/* Image names usually start with "data/",
+				   this should be replaced with DATADIR */
+				if (strncmp(buf2, "data/", 5) == 0)
+				{
+					/* move the rest of the string back */
+					memmove(buf2 + strlen(DATADIR),
+						buf2 + 5,
+						strlen(buf2 + 5) + 1);
+					/* and put DATADIR in front */
+					memcpy(buf2, DATADIR, strlen(DATADIR));
+				}
+#endif
 
 				/* Attempt to load it as a datafile object */
 				if ((g = strstr(buf2, "#"))) {
@@ -299,7 +313,6 @@
 					c->Image[i] = load_bitmap(buf2, pal);
 				}
 
-				temp += strlen(buf2) + 1;
 			}
 			continue;
 		}
@@ -324,7 +324,19 @@
 			DATAFILE *d;
 			char oldg;
 			char *g;
-
+#ifdef DATADIR
+			/* Sound names usually start with "data/",
+			   this should be replaced with DATADIR */
+			if (strncmp(buf2, "data/", 5) == 0)
+			{
+				/* move the rest of the string back */
+				memmove(buf2 + strlen(DATADIR),
+					buf2 + 5,
+					strlen(buf2 + 5) + 1);
+				/* and put DATADIR in front */
+				memcpy(buf2, DATADIR, strlen(DATADIR));
+			}
+#endif
 			g = strstr(buf2, "#");
 			if (g) {
 				oldg = *g;

zasx-1.30-fixes.patch:

--- NEW FILE zasx-1.30-fixes.patch ---
diff -urN Zasx.org/Makefile Zasx/Makefile
--- Zasx.org/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ Zasx/Makefile	2006-04-02 20:16:58.000000000 +0200
@@ -0,0 +1,25 @@
+PREFIX  = /usr/local
+DATADIR = $(PREFIX)/share/$(TARGET)
+CFLAGS  = -g -Wall -Wno-deprecated-declarations -O2 -fsigned-char
+LDFLAGS = `allegro-config --libs` -ldumb -laldmb
+DEFINES = -DDATADIR=\"$(DATADIR)/\" -Iinclude
+OBJS    = obj/anim.o obj/dataload.o obj/gamemenu.o obj/input.o obj/log.o \
+ obj/particle.o obj/scorer.o obj/asteroid.o obj/drs.o obj/gametimer.o \
+ obj/player.o obj/star.o obj/config.o obj/effect.o obj/gfx.o obj/main.o \
+ obj/ppcol.o obj/weapon.o obj/jgmod.o obj/unix.o
+TARGET  = zasx
+
+$(TARGET): $(OBJS)
+	$(CC) $(LDFLAGS) -o $@ $^
+
+obj/%.o: src/%.c
+	$(CC) $(CFLAGS) $(DEFINES) -o $@ -c $<
+
+install: $(TARGET)
+	mkdir -p $(PREFIX)/bin
+	mkdir -p $(DATADIR)
+	install -p -m 755 $(TARGET) $(PREFIX)/bin
+	install -p -m 644 data/*.dat $(DATADIR)
+	
+clean:
+	rm -f $(OBJS) $(TARGET) src/*~ include/*~
diff -urN Zasx.org/include/anim.h Zasx/include/anim.h
--- Zasx.org/include/anim.h	2001-08-09 01:18:44.000000000 +0200
+++ Zasx/include/anim.h	2006-04-02 20:16:58.000000000 +0200
@@ -1,3 +1,3 @@
 void load_anim_bank(char *key, char *filename);
 struct PARTICLE *make_anim_particle(char *key);
-void remove_anim();
\ No newline at end of file
+void remove_anim();
diff -urN Zasx.org/include/asteroid.h Zasx/include/asteroid.h
--- Zasx.org/include/asteroid.h	2001-04-10 17:32:02.000000000 +0200
+++ Zasx/include/asteroid.h	2006-04-02 20:16:58.000000000 +0200
@@ -9,4 +9,4 @@
 } ASTEROID;
 
 ASTEROID *create_asteroid(int family, int size);
-void destroy_asteroid(ASTEROID *a);
\ No newline at end of file
+void destroy_asteroid(ASTEROID *a);
diff -urN Zasx.org/include/config.h Zasx/include/config.h
--- Zasx.org/include/config.h	2001-04-14 16:31:28.000000000 +0200
+++ Zasx/include/config.h	2006-04-02 20:16:58.000000000 +0200
@@ -5,4 +5,4 @@
 
 extern const char *config_get_input_name(int type);
 extern const char *config_get_key_name(int n);
-extern void get_default_player_config(int n, INPUT *dev);
\ No newline at end of file
+extern void get_default_player_config(int n, INPUT *dev);
diff -urN Zasx.org/include/game.h Zasx/include/game.h
--- Zasx.org/include/game.h	2001-08-09 01:04:14.000000000 +0200
+++ Zasx/include/game.h	2006-04-02 20:16:58.000000000 +0200
@@ -42,3 +42,4 @@
 
 extern void DoGame(int n);
 
+extern int FullscreenToggleRequested;
diff -urN Zasx.org/include/gamemenu.h Zasx/include/gamemenu.h
--- Zasx.org/include/gamemenu.h	2001-04-14 16:55:02.000000000 +0200
+++ Zasx/include/gamemenu.h	2006-04-02 20:16:58.000000000 +0200
@@ -1 +1 @@
-extern void DoMenu();
\ No newline at end of file
+extern void DoMenu();
diff -urN Zasx.org/include/gametimer.h Zasx/include/gametimer.h
--- Zasx.org/include/gametimer.h	2001-04-14 16:03:48.000000000 +0200
+++ Zasx/include/gametimer.h	2006-04-02 20:16:58.000000000 +0200
@@ -37,4 +37,4 @@
 #endif
 
 
-#endif
\ No newline at end of file
+#endif
diff -urN Zasx.org/include/gfx.h Zasx/include/gfx.h
--- Zasx.org/include/gfx.h	2001-05-20 22:28:12.000000000 +0200
+++ Zasx/include/gfx.h	2006-04-02 20:16:58.000000000 +0200
@@ -8,8 +8,11 @@
 
 
 extern BITMAP *BackBuffer;
+extern int display_w;
+extern int display_h;
+extern int fullscreen;
 
-extern int GFX_Init(int w, int h, int c, int f);
+extern int GFX_Init(void);
 extern int GFX_Shutdown();
 
 extern BITMAP *GFX_CreateAccelBitmap(int w, int h);
@@ -17,8 +20,8 @@
 
 extern void GFX_HQ_RotateSprite(BITMAP *dest, BITMAP *src, int x, int y, fixed angle);
 
-#define DISPLAY_W 640
-#define DISPLAY_H 480
+#define DISPLAY_W display_w
+#define DISPLAY_H display_h
 
 
 #ifdef __cplusplus
@@ -26,4 +29,4 @@
 #endif
 
 
-#endif
\ No newline at end of file
+#endif
diff -urN Zasx.org/include/jgmod.h Zasx/include/jgmod.h
--- Zasx.org/include/jgmod.h	1970-01-01 01:00:00.000000000 +0100
+++ Zasx/include/jgmod.h	2006-04-02 20:16:58.000000000 +0200
@@ -0,0 +1,40 @@
+/*  incomplete DUMB JGMOD compatibility wrapper, because JGMOD's license is
+    not opensource / GPL compatible and because there are already enough mod
+    playing libs.
+   
+    Copyright 2006 Hans de Goede <j.w.r.degoede at hhs.nl>
+   
+    This wrapper is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public   
+    License as published by the Free Software Foundation; either 
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of 
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA   
+*/
+   
+#ifndef __JGMOD_H
+#define __JGMOD_H
+
+#include <aldumb.h>
+
+#define JGMOD DUH
+
+void install_mod(int channels); /* ignored */
+void remove_mod(void);
+
+JGMOD *load_mod(const char *path); /* path may be a packfile # index */
+void destroy_mod(JGMOD *mod);
+
+void play_mod(JGMOD *mod, int loop);
+void stop_mod(void);
+
+void set_mod_volume(int volume); /* 0 - 255 */
+
+#endif
diff -urN Zasx.org/include/log.h Zasx/include/log.h
--- Zasx.org/include/log.h	2001-04-18 13:34:38.000000000 +0200
+++ Zasx/include/log.h	2006-04-02 20:16:58.000000000 +0200
@@ -53,10 +53,10 @@
 #else
 
 
-#define ERROR(n, x) {}
-#define ERROR2(n, x, y) {}
-#define VERROR(n, x) {}
-#define LOG {}
+#define ERROR(n, x)
+#define ERROR2(n, x, y)
+#define VERROR(n, x)
+#define LOG(format, arg...)
 
 #endif
 
diff -urN Zasx.org/include/particle.h Zasx/include/particle.h
--- Zasx.org/include/particle.h	2001-05-13 22:56:30.000000000 +0200
+++ Zasx/include/particle.h	2006-04-02 20:16:58.000000000 +0200
@@ -94,4 +94,4 @@
 void clear_particles();
 int install_particle();
 
-#endif
\ No newline at end of file
+#endif
diff -urN Zasx.org/include/star.h Zasx/include/star.h
--- Zasx.org/include/star.h	2001-05-13 16:42:06.000000000 +0200
+++ Zasx/include/star.h	2006-04-02 20:16:58.000000000 +0200
@@ -18,4 +18,4 @@
 void clear_stars();
 void destroy_star(STAR *star);
 int install_star();
-void add_ray();
\ No newline at end of file
+void add_ray();
diff -urN Zasx.org/include/weapon.h Zasx/include/weapon.h
--- Zasx.org/include/weapon.h	2001-04-21 20:05:48.000000000 +0200
+++ Zasx/include/weapon.h	2006-04-02 20:16:58.000000000 +0200
@@ -52,4 +52,4 @@
 extern WEAPON *load_weapon(char *filename);
 
 extern int get_ship_weapon_ammo(SHIP_WEAPON *w);
-extern int get_weapon_ammo(WEAPON *w);
\ No newline at end of file
+extern int get_weapon_ammo(WEAPON *w);
diff -urN Zasx.org/src/anim.c Zasx/src/anim.c
--- Zasx.org/src/anim.c	2001-08-09 01:20:10.000000000 +0200
+++ Zasx/src/anim.c	2006-04-02 20:16:58.000000000 +0200
@@ -328,4 +328,4 @@
 	AnimKeys = NULL;
 
 	return;
-}
\ No newline at end of file
+}
diff -urN Zasx.org/src/asteroid.c Zasx/src/asteroid.c
--- Zasx.org/src/asteroid.c	2001-08-02 01:38:10.000000000 +0200
+++ Zasx/src/asteroid.c	2006-04-02 20:16:58.000000000 +0200
@@ -52,4 +52,4 @@
 	free(a);
 
 	return;
-}
\ No newline at end of file
+}
diff -urN Zasx.org/src/config.c Zasx/src/config.c
--- Zasx.org/src/config.c	2001-08-02 01:38:08.000000000 +0200
+++ Zasx/src/config.c	2006-04-02 20:16:58.000000000 +0200
@@ -26,6 +26,11 @@
 	{"W", "S", "D", "A", "LControl"}
 };
 
+const char *default_joy[NUM_PLAYERS][NUM_KEYS] = {
+	{"Joy0 0 -2", "Joy0 0 1", "Joy0 0 0", "Joy0 0 -1", "Joy0 0 0"},
+	{"Joy1 0 -2", "Joy1 0 1", "Joy1 0 0", "Joy1 0 -1", "Joy1 0 0"}
+};
+
 
 INPUT *load_player_input_config(int n) {
 
@@ -41,7 +46,9 @@
 		return NULL;
 	}
 
+#ifndef __unix__
 	set_config_file("zasx.cfg");
+#endif
 
 	sprintf(keyname, "Player%i_Type", n);
 	type = get_config_string("controls", keyname, "keyboard");
@@ -57,7 +64,10 @@
 
 		for (i = 0; i < NUM_KEYS; i++) {
 			sprintf(keyname, "Player%i_%s", n, control_name[i]);
-			new_key = get_config_string("controls", keyname, default_key[n - 1][i]);
+			new_key = get_config_string("controls", keyname,
+				(itype== INPUT_TYPE_JOYSTICK)?
+				default_joy[n - 1][i]:
+				default_key[n - 1][i]);
 			set_input(ret, input_names[i], new_key);
 		}
 	}
@@ -90,7 +100,9 @@
 		return;
 	}
 
+#ifndef __unix__
 	set_config_file("zasx.cfg");
+#endif
 
 	sprintf(keyname, "Player%i_Type", n);
 	type = get_input_type_name(in);
@@ -99,7 +111,7 @@
 
 	for (i = 0; i < NUM_KEYS; i++) {
 		sprintf(keyname, "Player%i_%s", n, control_name[i]);
-		set_config_string("controls", keyname, get_input_name(in, input_names[i], buf, 11));
+		set_config_string("controls", keyname, get_input_name(in, input_names[i], buf, 0));
 	}		
 
 	return;
@@ -119,8 +131,29 @@
 		return;
 	}
 
-	for (i = 0; i < NUM_KEYS; i++)
-		set_input(dev, input_names[i], default_key[n - 1][i]);
+	if (get_input_type(dev) == INPUT_TYPE_JOYSTICK)
+	{
+		/* <sigh> broken by design get the full name to find the
+		   joystick number, after this use player 1 defaults as base
+		   and replace the joystick number with the device joy number.
+		   */
+		char buf[16], *p = get_input_type_full_name(dev);
+		int joynum;
+
+		p += strlen("Joystick ");
+		joynum = atoi(p) - 1;
+		
+		for (i = 0; i < NUM_KEYS; i++)
+		{
+			/* replace the joystick number */
+			snprintf(buf, sizeof(buf), "Joy%d %s", joynum,
+				default_joy[0][i] + strlen("Joy0 "));
+			set_input(dev, input_names[i], buf);
+		}
+	}
+	else
+		for (i = 0; i < NUM_KEYS; i++)
+			set_input(dev, input_names[i], default_key[n - 1][i]);
 
 	return;
-}
\ No newline at end of file
+}
diff -urN Zasx.org/src/dataload.c Zasx/src/dataload.c
--- Zasx.org/src/dataload.c	2001-08-09 01:20:16.000000000 +0200
+++ Zasx/src/dataload.c	2006-04-02 20:16:58.000000000 +0200
@@ -7,15 +7,17 @@
  */
 
 #include "allegro.h"
-#include "game.h"
-
 #include "gfx.h"
 #include "demo.h"
 #include "jgmod.h"
 #include "weapon.h"
 #include "anim.h"
+#include "game.h"
 
 
+#ifndef DATADIR
+#define DATADIR "data/"
+#endif
 
 int LoadData() {
 	
@@ -42,10 +44,10 @@
 		set_color_conversion(COLORCONV_NONE);
 
 	/* Load Demo data file, convert to color depth, scale if necessary */
-	demodata = load_datafile("data/demo.dat");
+	demodata = load_datafile(DATADIR "demo.dat");
 	if (!demodata) {
 		set_gfx_mode(GFX_TEXT, 0, 0, 0, 0);
-		allegro_message("Can't load Datafile!\ndata/demo.dat\n");
+		allegro_message("Can't load datafile demo.dat!\n");
 		return -2;
 	}
 
@@ -61,7 +63,7 @@
 
 	UPDATE_LOAD_BAR("Color mapping tables     ");
 
-	if (!exists("data/colormap.bin")) {
+	if (!exists(DATADIR "colormap.bin")) {
 		PACKFILE *file;
 		create_rgb_table(&palette_map, GamePal, NULL);
 
@@ -82,7 +84,7 @@
 
 		set_add_blender(128, 128, 128, 255);
 
-		file = pack_fopen("data/colormap.bin", "wp");
+		file = pack_fopen(DATADIR "colormap.bin", "wp");
 
 		if (file) {
 			pack_fwrite(&palette_map, sizeof(RGB_MAP), file);
@@ -96,7 +98,7 @@
 	else {
 		PACKFILE *file;
 
-		file = pack_fopen("data/colormap.bin", "rp");
+		file = pack_fopen(DATADIR "colormap.bin", "rp");
 
 		if (file) {
 			pack_fread(&palette_map, sizeof(RGB_MAP), file);
@@ -174,22 +176,22 @@
 
 	UPDATE_LOAD_BAR("Music                    ");
 
-	Music = load_mod("data/demo.dat#ZASX_XM");
+	Music = load_mod(DATADIR "demo.dat#ZASX_XM");
 
 	UPDATE_LOAD_BAR("Weapons                  ");
 
-	NormalGun = load_weapon("data/demo.dat#NORMALGUN_WPN");
-	RapidFireGun = load_weapon("data/demo.dat#RAPIDFIRE_WPN");
-	LaserGun =  load_weapon("data/demo.dat#LASER_WPN");	
-	Laser2Gun = load_weapon("data/demo.dat#LASER2_WPN");	
-	Laser3Gun = load_weapon("data/demo.dat#LASER3_WPN");	
+	NormalGun = load_weapon(DATADIR "demo.dat#NORMALGUN_WPN");
+	RapidFireGun = load_weapon(DATADIR "demo.dat#RAPIDFIRE_WPN");
+	LaserGun =  load_weapon(DATADIR "demo.dat#LASER_WPN");	
+	Laser2Gun = load_weapon(DATADIR "demo.dat#LASER2_WPN");	
+	Laser3Gun = load_weapon(DATADIR "demo.dat#LASER3_WPN");	
 
 	UPDATE_LOAD_BAR("Health power-up          ");	
-	load_anim_bank("Health", "data/health.dat");
+	load_anim_bank("Health", DATADIR "health.dat");
 	UPDATE_LOAD_BAR("RapidFire power-up       ");
-	load_anim_bank("RapidFire", "data/rapid.dat");
+	load_anim_bank("RapidFire", DATADIR "rapid.dat");
 	UPDATE_LOAD_BAR("Laser power-up           ");
-	load_anim_bank("LaserGun", "data/laser.dat");
+	load_anim_bank("LaserGun", DATADIR "laser.dat");
 	UPDATE_LOAD_BAR("Done.                    ");
 
 #undef UPDATE_LOAD_BAR
@@ -209,4 +211,4 @@
 	remove_anim();
 
 	return 0;
-}
\ No newline at end of file
+}
diff -urN Zasx.org/src/drs.c Zasx/src/drs.c
--- Zasx.org/src/drs.c	2001-05-12 22:52:12.000000000 +0200
+++ Zasx/src/drs.c	2006-04-02 20:16:58.000000000 +0200
@@ -24,6 +24,7 @@
 #include <allegro.h>
 
 #include "drs.h"
+#include "gfx.h"
 
 /* Rectangle.  */
 typedef struct __DRS_rect_t
@@ -89,9 +90,9 @@
   __DRS_size = 2 * _size;
 
   /* Allocate memory.  */
-  DRS_work = create_bitmap (SCREEN_W, SCREEN_H);
-  __DRS_bank = (int*) malloc (sizeof (int) * SCREEN_H);
-  __DRS_span = (__DRS_span_t*) malloc (sizeof (__DRS_span_t) * SCREEN_W);
+  DRS_work = create_bitmap (DISPLAY_W, DISPLAY_H);
+  __DRS_bank = (int*) malloc (sizeof (int) * DISPLAY_H);
+  __DRS_span = (__DRS_span_t*) malloc (sizeof (__DRS_span_t) * DISPLAY_W);
   __DRS_omem = (__DRS_rect_t*) malloc (sizeof (__DRS_rect_t) * __DRS_size);
   __DRS_nmem = (__DRS_rect_t*) malloc (sizeof (__DRS_rect_t) * __DRS_size);
 
@@ -122,10 +123,10 @@
   /* Calculate bank starts.  */
   {
     int i;
-    int next_bank_line = SCREEN_H;
+    int next_bank_line = DISPLAY_H;
 
-    __DRS_bank[SCREEN_H - 1] = SCREEN_H;
-    for (i = SCREEN_H - 2; i >= 0; i--)
+    __DRS_bank[DISPLAY_H - 1] = DISPLAY_H;
+    for (i = DISPLAY_H - 2; i >= 0; i--)
       {
 	if (screen->line[i] >= screen->line[i + 1])
 	  next_bank_line = i + 1;
@@ -263,7 +264,7 @@
       if (__DRS_bbmp == 0)
 	clear_to_color (DRS_work, __DRS_bcol);
       else
-	blit (__DRS_bbmp, DRS_work, __DRS_xoff, __DRS_yoff, 0, 0, SCREEN_W, SCREEN_H);
+	blit (__DRS_bbmp, DRS_work, __DRS_xoff, __DRS_yoff, 0, 0, DISPLAY_W, DISPLAY_H);
       __DRS_nnum = 0;
     }
   else
@@ -288,7 +289,7 @@
 	  ybeg = (rbeg->y <= yend) ? yend : rbeg->y;
 	  yend = rbeg->y + rbeg->h;
 
-	  if (ybeg >= SCREEN_H)
+	  if (ybeg >= DISPLAY_H)
 	    break;
 
 	  /* Add more rectangles to the strip.  */
@@ -389,8 +390,8 @@
 
   if (__DRS_dbuf != 0)
     return;
-  else if ((_w > 0) && (x < SCREEN_W) && ((x + _w) > 0)
-	   && (_h > 0) && (y < SCREEN_H) && ((y + _h) > 0))
+  else if ((_w > 0) && (x < DISPLAY_W) && ((x + _w) > 0)
+	   && (_h > 0) && (y < DISPLAY_H) && ((y + _h) > 0))
     {
       /* Rectangle is visible on screen.  */
       if ((__DRS_onum >= __DRS_size) || (__DRS_nnum >= __DRS_size))
@@ -427,8 +428,8 @@
 
   if (__DRS_dbuf != 0)
     return;
-  else if ((_w > 0) && (x < SCREEN_W) && ((x + _w) > 0)
-	   && (_h > 0) && (y < SCREEN_H) && ((y + _h) > 0))
+  else if ((_w > 0) && (x < DISPLAY_W) && ((x + _w) > 0)
+	   && (_h > 0) && (y < DISPLAY_H) && ((y + _h) > 0))
     {
       /* Rectangle is visible on screen.  */
       if (__DRS_nnum >= __DRS_size)
@@ -459,8 +460,8 @@
 
   if (__DRS_dbuf != 0)
     return;
-  else if ((_w > 0) && (x < SCREEN_W) && ((x + _w) > 0)
-	   && (_h > 0) && (y < SCREEN_H) && ((y + _h) > 0))
+  else if ((_w > 0) && (x < DISPLAY_W) && ((x + _w) > 0)
+	   && (_h > 0) && (y < DISPLAY_H) && ((y + _h) > 0))
     {
       /* Rectangle is visible on screen.  */
       if (__DRS_onum >= __DRS_size)
@@ -493,7 +494,7 @@
 	vsync ();
 
       /* Update the whole screen.  */
-      blit (DRS_work, screen, 0, 0, 0, 0, SCREEN_W, SCREEN_H);
+      blit (DRS_work, screen, 0, 0, 0, 0, DISPLAY_W, DISPLAY_H);
 
       /* If double-buffering, then do full update always.  */
       __DRS_full = __DRS_dbuf;
@@ -523,7 +524,7 @@
 	  ybeg = (rbeg->y <= yend) ? yend : rbeg->y;
 	  yend = rbeg->y + rbeg->h;
 
-	  if (ybeg >= SCREEN_H)
+	  if (ybeg >= DISPLAY_H)
 	    break;
 
 	  /* Limit height of the strip to fit in one bank.  */
diff -urN Zasx.org/src/gamemenu.c Zasx/src/gamemenu.c
--- Zasx.org/src/gamemenu.c	2001-08-02 01:37:52.000000000 +0200
+++ Zasx/src/gamemenu.c	2006-04-02 20:16:58.000000000 +0200
@@ -300,10 +300,7 @@
 
 			SEND_MESSAGE(&ZasxDialog[0], MSG_DRAW, 0);
 
-			if (DISPLAY_W != SCREEN_W || DISPLAY_H != SCREEN_H)
-				stretch_blit(BackBuffer, screen, 0, 0, BackBuffer->w, BackBuffer->h, 0, 0, SCREEN_W, SCREEN_H);
-			else
-				blit(BackBuffer, screen, 0, 0, 0, 0, SCREEN_W, SCREEN_H);
+			blit(BackBuffer, screen, 0, 0, 0, 0, DISPLAY_W, DISPLAY_H);
 
 		} while (1);
 
diff -urN Zasx.org/src/gametimer.c Zasx/src/gametimer.c
--- Zasx.org/src/gametimer.c	2001-08-02 01:37:50.000000000 +0200
+++ Zasx/src/gametimer.c	2006-04-02 20:25:10.000000000 +0200
@@ -6,9 +6,9 @@
  * Please refer to the accompanying file 'copying.txt' for details.
  */
 #include "allegro.h"
-
+#include "gfx.h"
 #include "gametimer.h"
-
+#include "game.h"
 #include "log.h"
 
 
@@ -150,9 +150,28 @@
 
 int GTIME_Poll() {
 
-	int the_time = GameTime;
-	int i, r;
+	int the_time, i, r, timers_elapsed = 0;
 
+	/* We have todo this in a function which gets called from both
+	   the game loop and the menu loop hence we do it here. Not a logical
+	   place or pretty, but it works. */
+	if (FullscreenToggleRequested)
+	{
+		fullscreen = !fullscreen;
+		if (set_gfx_mode(fullscreen? GFX_AUTODETECT_FULLSCREEN:
+				GFX_AUTODETECT_WINDOWED,
+				DISPLAY_W, DISPLAY_H, 0, 0))
+		{
+			fprintf(stderr,
+				"FATAL error switching Fullscreen<->Window\n");
+			exit(1);
+		}
+		set_palette(GamePal);
+		FullscreenToggleRequested = 0;
+	}
+	
+	the_time = GameTime;
+	
 	for (i = 0; i < NumPolled; i++) {
 
 		GTIME_POLL *p = Polled + i;		
@@ -187,8 +206,13 @@
 				i--;
 				continue;
 			}
+			timers_elapsed++;
 		}
 	}
+
+	if (timers_elapsed == 0)
+		rest(1);
+		
 	return GTIME_OK;
 }
 
@@ -206,4 +230,4 @@
 
 int GTIME_IsFrozen() {
 	return GTIME_FreezeFlag;
-}
\ No newline at end of file
+}
diff -urN Zasx.org/src/gfx.c Zasx/src/gfx.c
--- Zasx.org/src/gfx.c	2001-08-02 20:08:04.000000000 +0200
+++ Zasx/src/gfx.c	2006-04-02 20:16:58.000000000 +0200
@@ -10,31 +10,22 @@
 #include "gfx.h"
 
 
-static BITMAP *oldscreen = NULL;
 BITMAP *BackBuffer = NULL;
+int display_w = 640;
+int display_h = 480;
+int fullscreen = 1;
 
 
-int GFX_Init(int w, int h, int c, int f) {
-
-	int mode = GFX_AUTODETECT;
-
-	if (oldscreen)
-		destroy_bitmap(oldscreen);
-	if (BackBuffer)
-		destroy_bitmap(BackBuffer);	
-
-	set_color_depth(c);
-
-	if (!f)
-		mode = GFX_AUTODETECT_WINDOWED;
-
-	if (set_gfx_mode(mode, w, h, 0, 0)) {	
+int GFX_Init(void)
+{
+	set_color_depth(8);
+	if (set_gfx_mode(fullscreen?
+			GFX_AUTODETECT_FULLSCREEN:GFX_AUTODETECT_WINDOWED,
+			display_w, display_h, 0, 0)) {
 		allegro_message("Can't set graphics mode!\n");
 		return -1;
 	}
 
-	oldscreen = create_video_bitmap(w, h);
-
 	return 0;
 }
 
@@ -42,12 +33,8 @@
 
 int GFX_Shutdown() {
 
-	if (oldscreen)
-		destroy_bitmap(oldscreen);
-
 	set_gfx_mode(GFX_TEXT, 0, 0, 0, 0);
 
-	oldscreen = NULL;
 	BackBuffer = NULL;
 
 	return 0;
diff -urN Zasx.org/src/input.c Zasx/src/input.c
--- Zasx.org/src/input.c	2001-08-02 01:37:42.000000000 +0200
+++ Zasx/src/input.c	2006-04-02 20:16:58.000000000 +0200
@@ -23,7 +23,7 @@
    "T",          "U",          "V",          "W",
    "X",          "Y",          "Z",          "0",
    "1",          "2",          "3",          "4",
-   "5",          "6",          "7",          "_8",
+   "5",          "6",          "7",          "8",
    "9",          "0_PAD",      "1_PAD",      "2_PAD",
    "3_PAD",      "4_PAD",      "5_PAD",      "6_PAD",
    "7_PAD",      "8_PAD",      "9_PAD",      "F1",
@@ -40,7 +40,10 @@
    "MINUS_PAD",  "PLUS_PAD",   "DEL_PAD",    "ENTER_PAD",
    "PRTSCR",     "PAUSE",      "ABNT_C1",    "YEN",
    "KANA",       "CONVERT",    "NOCONVERT",  "AT",
-   "CIRCUMFLEX", "COLON2",     "KANJI",
+   "CIRCUMFLEX", "COLON2",     "KANJI",	     
+   "EQUALS_PAD", "BACKQUOTE",  "SEMICOLON",  "COMMAND",
+   "UNKNOWN1",   "UNKNOWN2",   "UNKNOWN3",   "UNKNOWN4",
+   "UNKNOWN5",   "UNKNOWN6",   "UNKNOWN7",   "UNKNOWN8",
    "LSHIFT",     "RSHIFT",     "LCONTROL",   "RCONTROL",
    "ALT",        "ALTGR",      "LWIN",       "RWIN",
    "MENU",       "SCRLOCK",    "NUMLOCK",    "CAPSLOCK",
@@ -48,7 +51,7 @@
 };
 
 static char *input_name[] = {
-	"(none)", "Keyboard", "Mouse", "Joystick  "
+	"(none)", "Keyboard", "Mouse", "Joystick"
 };
 
 
@@ -305,21 +308,12 @@
 		return 0;
 	}
 
-	if (dev->InputType == INPUT_TYPE_JOYSTICK) {
-		INPUT_JOY *joys = dev->InputData;
-
-		if (joys)
-			sprintf(input_name[dev->InputType], "Joystick");
-	}
-
 	return input_name[dev->InputType];
 }
 
 
 char* get_input_type_full_name(INPUT *dev) {
 
-	char *ret;
-
 	if (!dev) {
 		LOG("--== Error ==-- Input::get_input_type: Null argument 'dev'\n");
 		return 0;
@@ -330,16 +324,18 @@
 		return 0;
 	}
 
-	ret = input_name[dev->InputType];
-
 	if (dev->InputType == INPUT_TYPE_JOYSTICK) {
 		INPUT_JOY *joys = dev->InputData;
 
-		if (joys)
-			sprintf(ret, "Joystick %i", joys->JoystickNum + 1);
+		if (joys) {
+			static char buf[16];
+			snprintf(buf, sizeof(buf), "Joystick %i",
+				joys->JoystickNum + 1);
+			return buf;
+		}
 	}
 
-	return ret;
+	return input_name[dev->InputType];
 }
 
 
@@ -478,7 +474,7 @@
 	}
 
 
-	if (length < 11) {
+	if (length && length < 11) {
 		LOG("--== Error ==-- Input::get_input_name: Buffer length (%i) must be at least 11 bytes long.\n");
 		return NULL;
 	}
@@ -510,8 +506,13 @@
 			return NULL;
 		}
 
-		sprintf(buf, "%*s", length - 1, r);
-		return buf;
+		if (length)
+		{
+			sprintf(buf, "%*s", length - 1, r);
+			return buf;
+		}
+		else
+			return r;
 	}
 
 	else if (dev->InputType == INPUT_TYPE_JOYSTICK) {
@@ -560,7 +561,7 @@
 		}
 
 		/* Print minimal form? */
-		if (length < 12)
+		if (length == 0)
 			sprintf(buf, "Joy%i %i %i", joys->JoystickNum, sn, an);
 		else
 			sprintf(buf, "%*s%c", length - 1, r, nse ? 0 : ((an < 0) ? '+' : '-'));
diff -urN Zasx.org/src/jgmod.c Zasx/src/jgmod.c
--- Zasx.org/src/jgmod.c	1970-01-01 01:00:00.000000000 +0100
+++ Zasx/src/jgmod.c	2006-04-02 20:16:58.000000000 +0200
@@ -0,0 +1,146 @@
+/*  incomplete DUMB JGMOD compatibility wrapper, because JGMOD's license is
+    not opensource / GPL compatible and because there are already enough mod
+    playing libs.
+   
+    Copyright 2006 Hans de Goede <j.w.r.degoede at hhs.nl>
+   
+    This wrapper is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public   
+    License as published by the Free Software Foundation; either 
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of 
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA   
+*/
+#include <unistd.h>
+#include <pthread.h>
+#include <string.h>
+#include <strings.h>
+#include "jgmod.h"
+
+static AL_DUH_PLAYER *duh_player = NULL;
+static pthread_t duh_player_thread;
+static pthread_mutex_t duh_player_mutex;
+static int pattern = 0; /* from t3ss implementation, might need it someday */
+static int mod_volume = 255;
+
+void install_mod(int channels) /* ignored */
+{
+    dumb_register_packfiles();
+    pthread_mutex_init(&duh_player_mutex, NULL);
+}
+
+void remove_mod(void)
+{
+    stop_mod();
+    dumb_exit();
+}
+
+JGMOD *load_mod(const char *path) /* path may be a packfile # index */
+{
+    char *p, ext[64];
+
+    snprintf(ext, sizeof(ext), "%s", get_extension(path));
+    if ((p = strrchr(ext, '_')))
+        memmove(ext, p+1, strlen(p));
+    
+    if (!strcasecmp(ext, "it"))
+        return dumb_load_it_quick(path);
+    if (!strcasecmp(ext, "xm"))
+        return dumb_load_xm_quick(path);
+    if (!strcasecmp(ext, "s3m"))
+        return dumb_load_s3m_quick(path);
+    if (!strcasecmp(ext, "mod"))
+        return dumb_load_mod_quick(path);
+    return NULL;                
+}
+
+void destroy_mod(JGMOD *mod)
+{
+    unload_duh(mod);
+}
+
+static void *duh_player_thread_function(void *arg)
+{
+    while(1)
+    {
+        pthread_mutex_lock(&duh_player_mutex);
+        al_poll_duh(duh_player);
+        pthread_mutex_unlock(&duh_player_mutex);
+        pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
+        usleep(10000);
+        pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL);
+    }
+}
+
+void play_mod(JGMOD *mod, int loop)
+{
+    DUMB_IT_SIGDATA *sigdata;
+    DUH_SIGRENDERER *renderer;
+    int num_patterns;
+    
+    if (duh_player)
+        stop_mod();
+    
+    if (!mod)
+        return;
+    
+    sigdata = duh_get_it_sigdata(mod);
+    if (sigdata)
+        num_patterns = dumb_it_sd_get_n_orders(sigdata);
+    else
+        num_patterns = 0;
+        
+    if (pattern >= num_patterns)
+        pattern = 0;
+        
+    renderer = dumb_it_start_at_order(mod, 2, pattern);
+    if (!renderer)
+        return;
+
+    duh_player = al_duh_encapsulate_sigrenderer(renderer, mod_volume/255.0f,
+        2048, 44100);
+    if (!duh_player)
+    {
+        duh_end_sigrenderer(renderer);
+        return;
+    }
+    
+    if (pthread_create(&duh_player_thread, NULL,
+            duh_player_thread_function, NULL))
+    {
+        al_stop_duh(duh_player);
+        duh_player = NULL;
+    }
+}
+
+
+void stop_mod(void)
+{
+    if (duh_player)
+    {
+        /* stop the player thread */
+        pthread_cancel(duh_player_thread);
+        pthread_join(duh_player_thread, NULL);
+        /* and clean up everything */
+        al_stop_duh(duh_player);
+        duh_player = NULL;
+    }
+}
+
+void set_mod_volume(int volume) /* 0 - 255 */
+{
+    mod_volume = volume;
+    if (duh_player)
+    {
+        pthread_mutex_lock(&duh_player_mutex);
+        al_duh_set_volume(duh_player, mod_volume/255.0f);
+        pthread_mutex_unlock(&duh_player_mutex);
+    }
+}
diff -urN Zasx.org/src/main.c Zasx/src/main.c
--- Zasx.org/src/main.c	2001-10-06 13:13:28.000000000 +0200
+++ Zasx/src/main.c	2006-04-02 20:33:36.000000000 +0200
@@ -34,11 +34,10 @@
 
 #define DIST(x, y) sqrt((x)*(x) + (y)*(y))
 
-int ShowFPS = 0, WaitForVSync = 0;
-int Redraw = 0;
+static int ShowFPS = 0;
+static int Redraw = 0;
 
 BITMAP *Ast[9];
-BITMAP *BackBuffer;
 DATAFILE *demodata;
 BITMAP *Smoke, *Bullet, *Dust;
 BITMAP *PlayerBitmap[NUM_PLAYERS];
@@ -60,6 +59,7 @@
 RGB* GamePal;
 
 int GamePaused = 0;
+int FullscreenToggleRequested = 0;
 
 #ifndef M_PI
 #define M_PI 3.14159
@@ -217,9 +217,6 @@
 
 
 int play_game(void* dummy) {
-
-	static int smokecount = 0;
-
 	int d, i, j, k;
 	float vx, vy;
 
@@ -807,7 +804,7 @@
 		}
 		x += DISPLAY_W / 2;
 			
-		if (x >= SCREEN_W) {
+		if (x >= DISPLAY_W) {
 			x = 0;
 			y += 60;
 		}
@@ -828,8 +825,15 @@
 
 	poll_joystick();
 
+	if (key[KEY_F11]) {
+		/* Don't toggle twice (or more) for the same keypress */
+		key[KEY_F11] = 0;
+		ShowFPS = !ShowFPS;
+	}
+
 	if (key[KEY_F12]) {
-		clear_keybuf();
+		/* Don't toggle twice (or more) for the same keypress */
+		key[KEY_F12] = 0;
 		GamePaused ^= 1;
 	}
 
@@ -934,6 +938,7 @@
 	GTIME_AddFunction(play_game, 20, NULL, GTIME_NORMAL);
 	GTIME_AddFunction(game_input, 50, NULL, GTIME_NORMAL);
 
+	GamePaused = 0;
 	LOG("Starting game...NOW!\n");
 	
 	do {
@@ -950,13 +955,10 @@
 				frame_start_time = GameTime;
 				frame_count = 0;
 			}
-			textprintf(BackBuffer, font, 0, SCREEN_H - 10, makecol(255, 255, 255), "FPS: %.2f", frame_rate);
-			DRS_add_rectangle(0, SCREEN_H - 10, 128, 8);
+			textprintf(BackBuffer, font, 0, DISPLAY_H - 10, makecol(255, 255, 255), "FPS: %.2f", frame_rate);
+			DRS_add_rectangle(0, DISPLAY_H - 10, 128, 8);
 		}
 
-		if (WaitForVSync)
-			vsync();
-
 		acquire_screen();
 
 		if (frame_timer != GameTime / 1000) {
@@ -1033,24 +1035,49 @@
 	return;
 }
 
+/* We use a keyboard_callback handler to detect left-alt + enter for
+   fullscreen toggle, by doing this in the callback handler we can
+   make sure that enter with alt pressed doesn't get into the buffer and thus
+   doesn't cause any menu choices to be made. */
+static int ZasxKeyboardCallback(int keypress)
+{
+	if (key[KEY_ALT] && ((keypress >> 8) == KEY_ENTER))
+	{
+		FullscreenToggleRequested = 1;
+		return 0;
+	}
+	return keypress;
+}
+
 
 int main() {
 
 	int r;
-	int w, h, c, mvol, muvol, fullscreen;
+	int mvol, muvol;
+
+#ifdef __unix__
+	char *get_home_dir(void);
+	char config_file_name[512];
+	char *home_dir = get_home_dir();
+	
+	allegro_init();	
+	
+	snprintf(config_file_name, sizeof(config_file_name)/sizeof(char),
+		"%s/.%s", home_dir? home_dir:".", "zasx.cfg");
+      
+	override_config_file(config_file_name);
+#else
 	allegro_init();	
+	override_config_file("zasx.cfg");
+#endif
 
-	set_config_file("zasx.cfg");
-	w = get_config_int("[screen]", "width", 640);
-	h = get_config_int("[screen]", "height", 480);
-	c = get_config_int("[screen]", "color", 8);
+	display_w = get_config_int("[screen]", "width", 640);
+	display_h = get_config_int("[screen]", "height", 480);
 	fullscreen = get_config_int("[screen]", "full_screen", 1);
 	ShowFPS = get_config_int("[screen]", "show_fps", 0);
-	WaitForVSync = get_config_int("[screen]", "vsync", 0);
 	mvol = get_config_int("[sound]", "master_volume", 255);
 	muvol = get_config_int("[sound]", "music_volume", 255);
 	
-
 	/* Log init */
 	LOG("\n\n\n");
 	LOG("******************************************\n");
@@ -1061,11 +1088,12 @@
 
 
 	/* Init */
-	GFX_Init(w, h, c, fullscreen);
+	GFX_Init();
 	set_window_title("Zasx v" VERSION);	
 	set_display_switch_callback(SWITCH_IN, SwitchCallback);
 
 
+	keyboard_callback = ZasxKeyboardCallback;
 	install_keyboard();
 	install_joystick(JOY_TYPE_AUTODETECT);
 	install_timer();
@@ -1110,6 +1138,16 @@
 
 	GFX_Shutdown();
 
+	/* fullscreen and ShowFPS may have been changed, remember them. For
+	   the others make sure we write them to the config file if they were
+	   not there to give the user a clue howto change these settings :) */
+	set_config_int("[screen]", "full_screen", fullscreen);
+	set_config_int("[screen]", "show_fps", ShowFPS);
+	set_config_int("[screen]", "width", display_w);
+	set_config_int("[screen]", "height", display_h);
+	set_config_int("[sound]", "master_volume", mvol);
+	set_config_int("[sound]", "music_volume", muvol);	
+
 	return 0;
 } END_OF_MAIN();
 
diff -urN Zasx.org/src/scorer.c Zasx/src/scorer.c
--- Zasx.org/src/scorer.c	2001-10-06 12:38:38.000000000 +0200
+++ Zasx/src/scorer.c	2006-04-02 20:16:58.000000000 +0200
@@ -66,7 +66,7 @@
 
 		textprintf_centre(BackBuffer, font, DISPLAY_W / 2, DISPLAY_H - text_height(font), makecol(255, 255, 255), "Press any key to continue...");
 
-		stretch_blit(BackBuffer, screen, 0, 0, BackBuffer->w, BackBuffer->h, 0, 0, SCREEN_W, SCREEN_H);
+		blit(BackBuffer, screen, 0, 0, 0, 0, DISPLAY_W, DISPLAY_H);
 	} while (!keypressed());
 
 	readkey();
@@ -93,7 +93,7 @@
 		sprintf(t, "Name%0i", i);
 		best_name = get_config_string("[scores]", t, "Bob");
 		sprintf(t, "Score%0i", i);
-		score = get_config_int("[scores]", t, 0);
+		score = get_config_int("[scores]", t, 128000/(1<<i));
 
 		textprintf(BackBuffer, DigitFont, 5, i * (text_height(DigitFont) + 3) + 50, color, "%2i.", i + 1);
 		textprintf_right(BackBuffer, DigitFont, DISPLAY_W - 10, i * (text_height(DigitFont) + 3) + 50, color, "%01i", (i == p) ? this_score : score);
@@ -109,17 +109,21 @@
 
 void ViewHighScore() {
 
+#ifndef __unix__
 	push_config_state();
 	set_config_file("data/zasx.hsc");
+#endif
 
 	DrawBG();
 	DrawScore(-1, -1, -1);
 
+#ifndef __unix__
 	pop_config_state();
+#endif
 
 	textprintf_centre(BackBuffer, font, DISPLAY_W / 2, DISPLAY_H - text_height(font), makecol(255, 255, 255), "Press any key to continue");
 
-	stretch_blit(BackBuffer, screen, 0, 0, BackBuffer->w, BackBuffer->h, 0, 0, SCREEN_W, SCREEN_H);
+	blit(BackBuffer, screen, 0, 0, 0, 0, DISPLAY_W, DISPLAY_H);
 
 	while (keypressed()) readkey();
 	readkey();
@@ -210,7 +214,7 @@
 	    text_mode(rtm);
 	    x += w;
 	 }
-	 stretch_blit(BackBuffer, screen, 0, 0, BackBuffer->w, BackBuffer->h, 0, 0, SCREEN_W, SCREEN_H);
+	 blit(BackBuffer, screen, 0, 0, 0, 0, DISPLAY_W, DISPLAY_H);
 	 break;
 
       case MSG_WANTFOCUS:
@@ -289,8 +293,10 @@
 
 	int i, p = -1;
 
+#ifndef __unix__
 	push_config_state();
 	set_config_file("data/zasx.hsc");
+#endif
 
 	for (i = 0; i < 10; i++) {
 		char t[80];
@@ -300,7 +306,7 @@
 		sprintf(t, "Name%0i", i);
 		best_name = get_config_string("[scores]", t, "Bob");
 		sprintf(t, "Score%0i", i);
-		score = get_config_int("[scores]", t, 0);
+		score = get_config_int("[scores]", t, 128000/(1<<i));
 
 		if (this_score > score) {
 			p = i;
@@ -319,7 +325,7 @@
 			sprintf(t, "Name%0i", i);
 			name = get_config_string("[scores]", t, "Bob");
 			sprintf(t, "Score%0i", i);
-			score = get_config_int("[scores]", t, 0);
+			score = get_config_int("[scores]", t, 128000/(1<<i));
 
 			sprintf(t, "Name%0i", i + 1);
 			set_config_string("[scores]", t, name);
@@ -338,7 +344,7 @@
 				{NULL}
 			};
 			memset(name, 0, 80);
-			stretch_blit(BackBuffer, screen, 0, 0, BackBuffer->w, BackBuffer->h, 0, 0, SCREEN_W, SCREEN_H);
+			blit(BackBuffer, screen, 0, 0, 0, 0, DISPLAY_W, DISPLAY_H);
 
 			while (keypressed())
 				readkey();
@@ -356,7 +362,9 @@
 		}
 	}
 
+#ifndef __unix__
 	pop_config_state();
+#endif
 
 	return p;
 }
diff -urN Zasx.org/src/star.c Zasx/src/star.c
--- Zasx.org/src/star.c	2001-08-02 01:38:44.000000000 +0200
+++ Zasx/src/star.c	2006-04-02 20:16:58.000000000 +0200
@@ -148,8 +148,6 @@
 
 
 void clear_stars() {
-	int i = 0;
-
 	while (NumStars)
 		destroy_star(Star[0]);
 
diff -urN Zasx.org/src/unix.c Zasx/src/unix.c
--- Zasx.org/src/unix.c	1970-01-01 01:00:00.000000000 +0100
+++ Zasx/src/unix.c	2006-04-02 20:16:58.000000000 +0200
@@ -0,0 +1,38 @@
+/* Function(s) to find the homedir of a user under Unix */
+#ifdef __unix__
+#include <pwd.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/types.h>
+#if defined(__DECC) && defined(VMS)
+#include <unixlib.h>
+static char *vms_to_unix_buffer = NULL;
+static int convert_vms_to_unix(char *vms_dir_name)
+{
+	vms_to_unix_buffer = vms_dir_name;
+}
+#endif
+
+/* 
+ * Locate user's home directory.
+ */
+char *get_home_dir(void)
+{
+	struct passwd *pw;
+
+	if (!(pw = getpwuid(getuid())))
+	{ 
+		fprintf(stderr, "Who are you? Not found in passwd database!!\n");
+		return NULL;
+	}
+
+#if defined(__DECC) && defined(VMS)
+	/* Convert The OpenVMS Formatted "$HOME" Directory Path Into Unix
+	   Format. */
+	decc$from_vms(pw->pw_dir, convert_vms_to_unix, 1);
+	return vms_to_unix_buffer;
+#else
+	return pw->pw_dir;
+#endif
+}
+#endif /* defined __unix__ */
diff -urN Zasx.org/src/weapon.c Zasx/src/weapon.c
--- Zasx.org/src/weapon.c	2001-08-09 01:13:06.000000000 +0200
+++ Zasx/src/weapon.c	2006-04-02 20:16:58.000000000 +0200
@@ -67,19 +67,6 @@
 }
 
 
-static void strip_leading_whitespace(char *buf) {
-
-
-	char *cur = buf;
-
-	if (!buf)
-		return;
-
-	//sscanf(buf, "%[^\n]", buf);
-
-	return;
-}
-
 static void dup_sample(SAMPLE **dest, SAMPLE *src) {
 
 	SAMPLE *d;
@@ -159,8 +146,6 @@
 		int r, i;
 		float x, y;
 
-		strip_leading_whitespace(buf);
-
 		if (buf[0] == '#')
 			continue;
 


--- NEW FILE zasx.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Zasx
GenericName=Asteroid like game
Comment=Asteroid with powerups!
Exec=zasx
Icon=zasx.png
Terminal=false
StartupNotify=false
Type=Application
Categories=Application;Game;ArcadeGame;
Version=1.30


--- NEW FILE zasx.spec ---
Name:           zasx
Version:        1.30
Release:        1%{?dist}
Summary:        Asteroid like game with powerups
Group:          Amusements/Games
License:        GPL and freely distributable content
URL:            http://www.bob.allegronetwork.com/zasx/index.html
Source0:        http://www.bob.allegronetwork.com/zasx/zasx130s.zip
Source1:        zasx.desktop
Patch0:         zasx-1.30-fixes.patch
Patch1:         zasx-1.30-datadir.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  dumb-devel ImageMagick desktop-file-utils

%description
Shoot the asteroids before they hit your ship and collect power ups to restore
your shields and improve your weapons. The game features single and dualplayer 
mode, joystick, music and sound.


%prep
%setup -q -n Zasx
%patch0 -p1 -z .fix
%patch1 -p1 -z .datadir
%{__sed} -i 's/\r//' copying.txt readme.txt docs/index.html docs/%{name}.css
mv docs html


%build
make %{?_smp_mflags} PREFIX=%{_prefix} \
  CFLAGS="$RPM_OPT_FLAGS -fsigned-char -Wno-deprecated-declarations"
convert -transparent black %{name}.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.txt readme.txt html
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png


%changelog
* Sun Apr  2 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.30-1
- initial Fedora Extras package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zasx/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Apr 2006 19:23:50 -0000	1.1
+++ .cvsignore	3 Apr 2006 19:24:55 -0000	1.2
@@ -0,0 +1 @@
+zasx130s.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zasx/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Apr 2006 19:23:50 -0000	1.1
+++ sources	3 Apr 2006 19:24:55 -0000	1.2
@@ -0,0 +1 @@
+8706050ad5e54b673c2e2a987c581d67  zasx130s.zip



From fedora-extras-commits at redhat.com  Mon Apr  3 19:25:33 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Mon,  3 Apr 2006 12:25:33 -0700
Subject: fedora-security/audit fc4,1.183,1.184 fc5,1.96,1.97
Message-ID: <200604031925.k33JPXXP001083@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1028

Modified Files:
	fc4 fc5 
Log Message:
Note the struts information.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- fc4	31 Mar 2006 14:50:28 -0000	1.183
+++ fc4	3 Apr 2006 19:25:31 -0000	1.184
@@ -4,9 +4,9 @@
 ** are items that need attention
 
 CVE-2006-1550 VULNERABLE (dia) bz#187402
-CVE-2006-1548 ** struts
-CVE-2006-1547 ** struts
-CVE-2006-1546 ** struts
+CVE-2006-1548 VULNERABLE (struts, fixed 1.2.9) bz#187544
+CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) bz#187544
+CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1368 ** kernel
 CVE-2006-1354 VULNERABLE (freeradius) bz#186084
 CVE-2006-1343 ** kernel


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- fc5	31 Mar 2006 14:50:28 -0000	1.96
+++ fc5	3 Apr 2006 19:25:31 -0000	1.97
@@ -3,9 +3,9 @@
 
 ** are items that need attention
 
-CVE-2006-1548 ** struts
-CVE-2006-1547 ** struts
-CVE-2006-1546 ** struts
+CVE-2006-1548 VULNERABLE (struts, fixed 1.2.9) bz#187544
+CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) bz#187544
+CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1368 ** kernel
 CVE-2006-1354 VULNERABLE (freeradius) bz#186084
 CVE-2006-1343 ** kernel



From fedora-extras-commits at redhat.com  Mon Apr  3 19:31:03 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon,  3 Apr 2006 12:31:03 -0700
Subject: rpms/shippy/devel shippy-merged.patch, NONE, 1.1 shippy.spec, 1.1, 
	1.2 shippy-fixes.patch, 1.1, NONE shippy-fullscreen.patch, 1.1,
	NONE shippy-joy.patch, 1.1, NONE shippy-lcdfix.patch, 1.1,
	NONE shippy-warnings.patch, 1.1, NONE
Message-ID: <200604031931.k33JV5tv001163@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	shippy.spec 
Added Files:
	shippy-merged.patch 
Removed Files:
	shippy-fixes.patch shippy-fullscreen.patch shippy-joy.patch 
	shippy-lcdfix.patch shippy-warnings.patch 
Log Message:
* Mon Apr  3 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.3.3.7-unreleased
- Merged all patches into one and put a few parts between #ifdef __unix__
  (I send this upstream for merging).


shippy-merged.patch:

--- NEW FILE shippy-merged.patch ---
Only in shippy-1.3.3.7.orig/data: scores.lst
diff -ur shippy-1.3.3.7.orig/externs.h shippy-1.3.3.7/externs.h
--- shippy-1.3.3.7.orig/externs.h	2004-01-17 21:57:50.000000000 +0100
+++ shippy-1.3.3.7/externs.h	2006-04-01 13:45:54.000000000 +0200
@@ -10,5 +10,9 @@
 extern int done;
 extern int gscale;
 extern volatile int objectsynch;
+extern int start_windowed;
+extern int use_arcade_mode;
+extern int screen_width;
+extern int screen_height;
 
 #endif
diff -ur shippy-1.3.3.7.orig/shipall.c shippy-1.3.3.7/shipall.c
--- shippy-1.3.3.7.orig/shipall.c	2004-03-04 00:52:10.000000000 +0100
+++ shippy-1.3.3.7/shipall.c	2006-04-01 13:45:54.000000000 +0200
@@ -1,3 +1,4 @@
+#include <string.h>
 #include <allegro.h>
 #include <aldumb.h>
 #include "shippy.h"
@@ -9,6 +10,11 @@
 
 volatile int objectsynch = 0;
 
+#ifndef ALLEGRO_DOS
+static int vidmode;
+#endif
+static RGB mypal[256];    
+
 DUH *music=NULL;
 AL_DUH_PLAYER *dp=NULL;
 
@@ -171,7 +177,6 @@
 {
     int GraphicsFlag;
     BITMAP *mytest2;
-    RGB mypal[256];    
     set_color_depth(8);
     bitsperpixel = 8;
 	set_color_conversion(COLORCONV_TOTAL);
@@ -188,18 +193,22 @@
 	
 
 #else
-    GraphicsFlag=set_gfx_mode(GFX_AUTODETECT_WINDOWED, 480, 320, 0, 0);    
+    GraphicsFlag=set_gfx_mode(start_windowed? GFX_AUTODETECT_WINDOWED:
+        GFX_AUTODETECT_FULLSCREEN, screen_width, screen_height, 0, 0);    
     if(GraphicsFlag!=0)
     {
-        GraphicsFlag=set_gfx_mode(GFX_SAFE, 480, 320, 0, 0);
+        GraphicsFlag=set_gfx_mode(GFX_SAFE, screen_width, screen_height, 0, 0);
         if(GraphicsFlag!=0) exit(-1);
+        else vidmode = GFX_SAFE;
     }
+    else
+        vidmode = GFX_AUTODETECT_FULLSCREEN;
 #endif
 
     BackBuffer=create_system_bitmap(240,160);
     Graphics=create_system_bitmap(320,128);
 
-    mytest2 = load_bmp("data/graphics.bmp",mypal);
+    mytest2 = load_bmp(DATADIR "graphics.bmp",mypal);
     if(mytest2==NULL) return;
 	blit(mytest2,Graphics,0,0,0,0,320,128);
 	destroy_bitmap(mytest2);
@@ -215,7 +224,7 @@
     set_palette(mypal);
 }
 
-int SYSTEM_BG(char *bmp)
+void SYSTEM_BG(char *bmp)
 {
     BITMAP *mytest2;
   	mytest2 = load_bmp(bmp,NULL);
@@ -227,12 +236,8 @@
 }
 int SYSTEM_INIT()
 {
-    int AllegroInitFlag;
-    int GraphicsFlag;
-    int width,height;
-    BITMAP *mytest2;
-
-    AllegroInitFlag = allegro_init();
+    if (allegro_init())
+        return -1;
 
     atexit(&dumb_exit);
     dumb_register_stdfiles();
@@ -279,13 +284,13 @@
     return key[scancode];
 }
 
-int SYSTEM_FINISHRENDER()
+void SYSTEM_FINISHRENDER()
 {
 #ifdef ALLEGRO_DOS
     blit(BackBuffer,screen,0,0,40,20,240,160);
 #else
     acquire_screen();
-    stretch_blit(BackBuffer,screen,0,0,240,160,0,0,480,320);
+    stretch_blit(BackBuffer,screen,0,0,240,160,0,0,screen_width,screen_height);
     release_screen();
 #endif
 }
@@ -295,14 +300,13 @@
     return 0;
 }
 
-int SYSTEM_BLIT(int sx, int sy, int x, int y, int szx, int szy)
+void SYSTEM_BLIT(int sx, int sy, int x, int y, int szx, int szy)
 {
     masked_blit(Graphics,BackBuffer,sx,sy,x,y,szx,szy);
 }
 
 void SYSTEM_POLLINPUT()
 {
-    int tx,ty;
     jaction = 0;
     jsecond = 0;
     jdirx = 0;
@@ -310,6 +314,25 @@
 
 
     if(SYSTEM_GETKEY(KEY_ESC)) done = 1;
+
+#ifndef ALLEGRO_DOS
+    if (key[KEY_ENTER] && key[KEY_ALT] && (vidmode != GFX_SAFE))
+    {
+        vidmode = (vidmode == GFX_AUTODETECT_FULLSCREEN)?
+            GFX_AUTODETECT_WINDOWED:GFX_AUTODETECT_FULLSCREEN;
+        if(set_gfx_mode(vidmode, screen_width, screen_height, 0, 0))
+        {
+            vidmode = GFX_SAFE;
+            if(set_gfx_mode(vidmode, screen_width, screen_height, 0, 0))
+            {
+                fprintf(stderr, "FATAL error switching Fullscreen <-> Window\n");
+	        exit(1);
+	    }
+	}
+        set_palette(mypal);
+    }
+#endif
+
     if(waitforkey>0)
     {
         --waitforkey;
@@ -321,8 +344,8 @@
         poll_joystick();
         jaction = joy[0].button[0].b;
         jsecond = joy[0].button[1].b;
-        jdirx = (joy[0].stick[0].axis[0].d1 - joy[0].stick[0].axis[0].d2)*2;
-        jdiry = (joy[0].stick[0].axis[1].d1 - joy[0].stick[0].axis[1].d2);
+        jdirx = joy[0].stick[0].axis[0].pos / 50;
+        jdiry = joy[0].stick[0].axis[1].pos / 65;
     }
     if(jdirx == 0) jdirx=(SYSTEM_GETKEY(KEY_LEFT) - SYSTEM_GETKEY(KEY_RIGHT)) * 2;
     if(jdiry == 0) jdiry=SYSTEM_GETKEY(KEY_UP) - SYSTEM_GETKEY(KEY_DOWN);
@@ -332,12 +355,12 @@
 
 void SYSTEM_IDLE()
 {
-
+    if (objectsynch == 0)
+        rest(1);
 }
 
 int main(int argc, char*argv[])
 {
-	SHIPPY_MAIN();
-
+	return SHIPPY_MAIN(argc, argv);
 }
 END_OF_MAIN()
diff -ur shippy-1.3.3.7.orig/shippy.c shippy-1.3.3.7/shippy.c
--- shippy-1.3.3.7.orig/shippy.c	2004-03-08 06:41:30.000000000 +0100
+++ shippy-1.3.3.7/shippy.c	2006-04-01 13:57:04.000000000 +0200
@@ -4,7 +4,15 @@
 http://ship84.sourceforge.net
 */
 
+#ifdef __unix__
+/* this must be done before the first include of unistd.h for setresgid */
+#define _GNU_SOURCE 
+#include <unistd.h>
+#endif
+#include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
 #include "shippy.h"
 
 #define TEXT_WHITE 0
@@ -98,6 +106,13 @@
 int missedshots = 0;
 int firedshots = 0;
 
+FILE *highscore_fp;
+
+int start_windowed  = 0;
+int use_arcade_mode = 0;
+int screen_width  = 640;
+int screen_height = 480;
+
 int compare(const void *a, const void *b)
 {
     struct HISCORE *test = (struct HISCORE *)a;
@@ -299,10 +314,7 @@
 {
     int increment;
     int adder;
-    int accuracy;
-    int courage;
     int bonus;
-    float floatop;
 
     shots = 0;
     powerupframe = 0;
@@ -590,7 +602,6 @@
     if(ShippyObjects[number].used==0) return;
     int increment;
     int runsim;
-    int tx,ty;
 
     switch(ShippyObjects[number].type)
     {
@@ -656,7 +667,7 @@
                                     if(shots<10)
                                     {
                                         AddObject(BULLET, ShippyObjects[number].x, ShippyObjects[number].y,0,0,0,NULL,0,0);
-                                        audio_play("data/shot.wav");
+                                        audio_play(DATADIR "shot.wav");
                                         ++shots;
                                         ++firedshots;
                                     }
@@ -670,7 +681,7 @@
                                 {
                                     if(shots<6)
                                     {
-                                        audio_play("data/helix.wav");
+                                        audio_play(DATADIR "helix.wav");
                                         AddObject(BULLWAVE, ShippyObjects[number].x-6, ShippyObjects[number].y-8,0,-16,0,NULL,0,0);
                                         AddObject(BULLWAVE, ShippyObjects[number].x+6, ShippyObjects[number].y-8,0,16,0,NULL,0,0);
                                         shots+=2;
@@ -693,7 +704,7 @@
                             if(shots<3)
                             {
                                 AddObject(BULLET, ShippyObjects[number].x, ShippyObjects[number].y,0,0,0,NULL,0,0);
-                                audio_play("data/shot.wav");
+                                audio_play(DATADIR "shot.wav");
                                 ++shots;
                                 ++firedshots;
                             }
@@ -802,7 +813,7 @@
                 --ShippyObjects[number].special;
             }
 
-            if(ShippyObjects[number].x<-7 || ShippyObjects[number].x>247 && ShippyObjects[number].type==ENEMYSHIPPY)
+            if(ShippyObjects[number].x<-7 || (ShippyObjects[number].x>247 && ShippyObjects[number].type==ENEMYSHIPPY))
             {
                 ShippyObjects[number].y+=16;
                 ShippyObjects[number].level=-ShippyObjects[number].level;
@@ -837,7 +848,7 @@
                         }
                         diedlast = 1;
                     
-                        audio_play("data/die.wav");
+                        audio_play(DATADIR "die.wav");
                         ShippyObjects[number].type=EXPLOSION;
                         ShippyObjects[number].special=4;
                     }
@@ -937,7 +948,7 @@
                                                  0);
                                          
                                      }
-                                    audio_play("data/hit.wav");
+                                    audio_play(DATADIR "hit.wav");
                                 break;
 
                                 case ENEMYSHIPPY:
@@ -955,7 +966,7 @@
                                                  0,
                                                  0);
                                      }
-                                    audio_play("data/hit.wav");
+                                    audio_play(DATADIR "hit.wav");
                                      break;
 
 				 case FEZBOMB:
@@ -976,7 +987,7 @@
                                                  0,
                                                  0);
                                      }
-                                    audio_play("data/hit.wav");
+                                    audio_play(DATADIR "hit.wav");
                                     break;
                             
                             }
@@ -1059,7 +1070,7 @@
                         }
 
                         diedlast = 1;                    
-                        audio_play("data/die.wav");
+                        audio_play(DATADIR "die.wav");
                         ShippyObjects[number].type=EXPLOSION;
                         ShippyObjects[number].special=4;
                         return;
@@ -1097,43 +1108,28 @@
 
 void StoreHS()
 {
-    FILE *savehs = NULL;
-    savehs = fopen("data/scores.lst","wb");
-
-    if(savehs==NULL) return;
-
-    fwrite(winners,sizeof(struct HISCORE), 14, savehs);
-    fclose(savehs);
-    return;
-
+    size_t silence_warnings;
+    
+    if(highscore_fp==NULL) return;
 
+    rewind(highscore_fp);
+    silence_warnings = fwrite(winners,sizeof(struct HISCORE), 14, highscore_fp);
 }
 
 
 void RestoreHS()
 {
     int i;    
-    FILE *loadhs = NULL;
-    
-    loadhs = fopen("data/scores.lst","rb");
 
-    if(loadhs!=NULL)
+    if(highscore_fp!=NULL)
     {
-        if(fread(winners,sizeof(struct HISCORE), 14, loadhs)==14)
+        if(fread(winners,sizeof(struct HISCORE), 14, highscore_fp)==14)
         {
-            fclose(loadhs);
             highscore=winners[0].score;
             return;
         }
-        else
-        {
-            fclose(loadhs);
-        }
-    
-    
     }
 
-
     strcpy(winners[0].name,"RAB");
     winners[0].level = 14;
     winners[0].score = 250000;
@@ -1225,17 +1221,17 @@
 
             if(operational==600)
             {
-                SYSTEM_BG("data/splash.bmp");
+                SYSTEM_BG(DATADIR "splash.bmp");
             }
             
             if(operational>0)
             {
                 --operational;
-                if(operational==0) audio_play("data/splash.wav");
+                if(operational==0) audio_play(DATADIR "splash.wav");
             }
             if(operational==120)
             {
-                SYSTEM_BG("data/splash2.bmp");
+                SYSTEM_BG(DATADIR "splash2.bmp");
             }
             if(waitforkey==0)
             {
@@ -1287,13 +1283,13 @@
             }
             
            
-            if(jdirx == -2)
+            if(jdirx <= -1)
             {
                 --currchar;
                 if(currchar<'A') currchar = 'Z';
                 waitforkey=15;
             }
-            if(jdirx == 2)
+            if(jdirx >= 1)
             {
                 ++currchar;
                 if(currchar>'Z') currchar = 'A';
@@ -1339,7 +1335,7 @@
         {
             ShippyObjects[0].lives++;
             extralife *= 2;
-            audio_play("data/fanfare.wav");
+            audio_play(DATADIR "fanfare.wav");
         
         }
         if(leftmonsters>0 && done == 0 && gameover==0)
@@ -1388,7 +1384,7 @@
 		}
 		for(increment=0;increment<14;++increment) winners[increment].last=0;
                 gamestate = INITIALS;
-                audio_music("data/score.xm");
+                audio_music(DATADIR "score.xm");
                 waitforkey=30;
                 operational = 0;
             }
@@ -1401,7 +1397,7 @@
             {
                 NewGame(-1);
                 operational = 1;
-                if(gamestate==TITLE) audio_music("data/title.xm");
+                if(gamestate==TITLE) audio_music(DATADIR "title.xm");
             }
             
             if(done==0 && operational==1)
@@ -1429,7 +1425,7 @@
                     else
                     {
     
-                        audio_music("data/shippy.xm");
+                        audio_music(DATADIR "shippy.xm");
                         gamestate = GAME;
                         operational = 0;
                     }
@@ -1467,7 +1463,7 @@
         {
             ShippyObjects[0].lives++;
             extralife *= 2;
-            audio_play("data/fanfare.wav");
+            audio_play(DATADIR "fanfare.wav");
         
         }
 
@@ -1510,11 +1506,61 @@
     }
 }
 
-void SHIPPY_MAIN()
+static void show_usage(char *name, FILE *f)
 {
-    int increment;
+    fprintf(f,
+        "Usage: %s [-w] [-a] [-h]\n\n"
+        "Options:\n"
+        "-w\tWindowed, start in a window (default fullscreen)\n"
+        "-a\tArcade, use an arcade-ish video mode with scanlines (CRT only!)\n"
+        "-h\tHelp, display this help and exit\n", name);
+}
+
+int SHIPPY_MAIN(int argc, char *argv[])
+{
+    int i;
+#ifdef __unix__
+    gid_t realgid;
+
+    highscore_fp = fopen("/var/lib/games/shippy.hs", "r+");
+    
+    realgid = getgid();
+    if (setresgid(-1, realgid, realgid) != 0) {
+        perror("Could not drop setgid privileges.  Aborting.");
+        return 1;
+    }
+#else
+    highscore_fp = fopen("data/scores.lst","r+b");
+#endif
+    
+    for (i = 1; i < argc; i++)
+    {
+        if (!strcmp(argv[i], "-w"))
+            start_windowed = 1;
+        else if (!strcmp(argv[i], "-a"))
+        {
+            use_arcade_mode = 1;
+            screen_width  = 480;
+            screen_height = 320;
+        }
+        else if (!strcmp(argv[i], "-h") ||
+            !strcmp(argv[i], "-?") ||
+            !strcmp(argv[i], "-help") ||
+            !strcmp(argv[i], "--help"))
+        {
+            show_usage(argv[0], stdout);
+            return 0;
+        }
+        else
+        {
+            fprintf(stderr, "Error: unknown argument: %s\n", argv[i]);
+            show_usage(argv[0], stderr);
+            return 1;
+        }
+    }
+        
     srand(time(0));
-    if(SYSTEM_INIT()!=0) return;
+    if(SYSTEM_INIT()!=0) return 1;
     InitShippy();
     while(done==0)
     {
@@ -1533,9 +1579,9 @@
                 countframes=0;
         	}
 
-            for(increment=0;increment<MAXSHIPPY;++increment)
+            for(i=0;i<MAXSHIPPY;++i)
             {
-                if(gamestate!=INITIALS) RenderShippy(increment);
+                if(gamestate!=INITIALS) RenderShippy(i);
             }
             DrawOverlay();
             SYSTEM_FINISHRENDER();
@@ -1544,6 +1590,7 @@
     }
     StoreHS();
     SYSTEM_CLEAN();
+    return 0;
 }
 
 
Only in shippy-1.3.3.7: shippy.c.orig
Only in shippy-1.3.3.7: shippy.c~
diff -ur shippy-1.3.3.7.orig/shippy.h shippy-1.3.3.7/shippy.h
--- shippy-1.3.3.7.orig/shippy.h	2004-02-03 21:10:00.000000000 +0100
+++ shippy-1.3.3.7/shippy.h	2006-04-01 13:45:54.000000000 +0200
@@ -3,6 +3,10 @@
 
 #include "externs.h"
 
+#ifndef DATADIR
+#define DATADIR "data/"
+#endif
+
 void Start_Audio();
 void audio_start();
 void audio_play(char *wav);
@@ -14,13 +18,13 @@
 void SCRAPPABLE_CLOSE();
 void SYSTEM_CLEANBMP();
 void SYSTEM_SETVID();
-int SYSTEM_BG();
+void SYSTEM_BG();
 int SYSTEM_INIT();
 int SYSTEM_CLEAN();
 int SYSTEM_GETKEY(int scancode);
-int SYSTEM_FINISHRENDER();
+void SYSTEM_FINISHRENDER();
 int SYSTEM_CLEARSCREEN();
-int SYSTEM_BLIT(int sx, int sy, int x, int y, int szx, int szy);
+void SYSTEM_BLIT(int sx, int sy, int x, int y, int szx, int szy);
 void SYSTEM_POLLINPUT();
 void SYSTEM_IDLE();
 int compare(const void *a, const void *b);
@@ -36,7 +40,6 @@
 void RestoreHS();
 void InitShippy();
 void ExecShippy();
-void SHIPPY_MAIN();
-
+int SHIPPY_MAIN(int argc, char *argv[]);
 
 #endif
diff -ur shippy-1.3.3.7.orig/shipsdl.c shippy-1.3.3.7/shipsdl.c
--- shippy-1.3.3.7.orig/shipsdl.c	2004-03-04 00:53:02.000000000 +0100
+++ shippy-1.3.3.7/shipsdl.c	2006-04-01 13:58:59.000000000 +0200
@@ -1,3 +1,5 @@
+#include <string.h>
+#include <stdlib.h>
 #include <SDL/SDL.h>
 #include <SDL/SDL_mixer.h>
 #include "shippy.h"
@@ -5,6 +7,7 @@
 SDL_Surface *screen = NULL;
 SDL_Surface *BackBuffer = NULL;
 SDL_Surface *Graphics = NULL;
+SDL_Joystick *Joystick = NULL;
 Uint8 key[1337];
 
 Uint32 CLEARCOLOR = 0;
@@ -164,9 +167,9 @@
     
 void End_Audio()
 {
+    audio_end();
     Mix_HaltMusic();
     Mix_CloseAudio();
-    audio_end();
 }
 
     
@@ -186,7 +189,11 @@
 
 void SYSTEM_SETVID()
 {
-    screen = SDL_SetVideoMode(480, 320, 8, SDL_SWSURFACE | SDL_HWPALETTE);
+    Uint32 flags = SDL_SWSURFACE | SDL_HWPALETTE | SDL_FULLSCREEN;
+    if (start_windowed)
+        flags &= ~SDL_FULLSCREEN;
+    SDL_ShowCursor(SDL_DISABLE);
+    screen = SDL_SetVideoMode(screen_width, screen_height, 8, flags);
     if ( screen == NULL )
     {
         return;
@@ -194,8 +201,8 @@
 
     SYSTEM_CLEANBMP();
 
-    Graphics = CreateSurfaceFromBitmap("data/graphics.bmp",SDL_SWSURFACE|SDL_SRCCOLORKEY);
-    BackBuffer= CreateSurfaceFromBitmap("data/splash.bmp",SDL_SWSURFACE|SDL_SRCCOLORKEY);
+    Graphics = CreateSurfaceFromBitmap(DATADIR "graphics.bmp",SDL_SWSURFACE|SDL_SRCCOLORKEY);
+    BackBuffer= CreateSurfaceFromBitmap(DATADIR "splash.bmp",SDL_SWSURFACE|SDL_SRCCOLORKEY);
     SDL_SetColors(screen, Graphics->format->palette->colors, 0,Graphics->format->palette->ncolors);
     SDL_SetColorKey(Graphics,SDL_SRCCOLORKEY, SDL_MapRGB(Graphics->format, 255, 0, 255));
     SDL_SetColorKey(BackBuffer,SDL_SRCCOLORKEY, SDL_MapRGB(Graphics->format, 255, 0, 255));
@@ -208,7 +215,7 @@
 int SYSTEM_INIT()
 {
    
-    if((SDL_Init(SDL_INIT_VIDEO|SDL_INIT_AUDIO)==-1))
+    if((SDL_Init(SDL_INIT_VIDEO|SDL_INIT_AUDIO|SDL_INIT_JOYSTICK)==-1))
     { 
         return 1;
     }
@@ -219,6 +226,8 @@
     SDL_WM_SetCaption("Shippy1984 by Ryan Broomfield SDL VERSION", NULL);
 
     audio_start();
+    
+    Joystick = SDL_JoystickOpen(0);
 
     return 0;
 }
@@ -227,6 +236,8 @@
 {
     SYSTEM_CLEANBMP();
     End_Audio();
+    if (Joystick)
+        SDL_JoystickClose(Joystick);
     return 0;
 }
 
@@ -236,7 +247,7 @@
 
 }
 
-int SYSTEM_BG(char *bmp)
+void SYSTEM_BG(char *bmp)
 {
     if(BackBuffer!=NULL) SDL_FreeSurface(BackBuffer);
     BackBuffer= CreateSurfaceFromBitmap(bmp,SDL_SWSURFACE|SDL_SRCCOLORKEY);
@@ -247,38 +258,24 @@
 
 
 /* NEW SYSTEM_FINISHRENDER() BY JONATHAN GILBERT 1-28-2004 */ 
-int SYSTEM_FINISHRENDER()
+void SYSTEM_FINISHRENDER()
 {
-  int x, y, w;
-  Uint8 *in;
-  Uint16 *out;
- 
+  src.x = 0;
+  src.y = 0;
+  src.w = 240;
+  src.h = 160;
+  
+  dest.x = 0;
+  dest.y = 0;
+  dest.w = screen_width;
+  dest.h = screen_height;
+  
   if (SDL_MUSTLOCK(BackBuffer))
     SDL_LockSurface(BackBuffer);
   if (SDL_MUSTLOCK(screen))
     SDL_LockSurface(screen);
- 
-  in = BackBuffer->pixels;
-  out = (Uint16 *)screen->pixels;
- 
-  w = BackBuffer->pitch;
- 
-  for (y=0; y<160; y++)
-  {
-    for (x=0; x<w; x += 2)
-    {
-      Uint32 sample = *(Uint16 *)&in[x];
- 
-      sample = (sample & 0xFF) | (sample >> 8 << 16);
-      sample *= 257;
- 
-      *(Uint32 *)(&out[x]) = sample;
-      *(Uint32 *)(&out[x + w]) = sample;
-    }
- 
-    in += w;
-    out += w + w;
-  }
+
+  SDL_SoftStretch(BackBuffer, &src, screen, &dest);
  
   if (SDL_MUSTLOCK(BackBuffer))
     SDL_UnlockSurface(BackBuffer);
@@ -294,10 +291,12 @@
     if(SDL_FillRect(BackBuffer, NULL, CLEARCOLOR)==-1)
     {
         printf("CLS ERROR! \n");
+        return 1;
     }
+    return 0;
 }
 
-int SYSTEM_BLIT(int sx, int sy, int x, int y, int szx, int szy)
+void SYSTEM_BLIT(int sx, int sy, int x, int y, int szx, int szy)
 {
     src.x = sx;
     src.y = sy;
@@ -316,7 +315,6 @@
 
 void SYSTEM_POLLINPUT()
 {
-    int tx,ty;
     jaction = 0;
     jsecond = 0;
     jdirx = 0;
@@ -324,27 +322,29 @@
 
 
     if(key[SDLK_ESCAPE]) done = 1;
+    if(key[SDLK_RETURN] && key[SDLK_LALT])
+        SDL_WM_ToggleFullScreen(screen);
+    
     if(waitforkey>0)
     {
         --waitforkey;
         return;
     }
 
-/*    if(num_joysticks>0)
-    {
-        poll_joystick();
-        jaction = joy[0].button[0].b;
-        jsecond = joy[0].button[1].b;
-        jdirx = (joy[0].stick[0].axis[0].d1 - joy[0].stick[0].axis[0].d2)*2;
-        jdiry = (joy[0].stick[0].axis[1].d1 - joy[0].stick[0].axis[1].d2);
-    }
-*/
-
     jdirx = 0;
     jdiry = 0;
     jaction = 0;
     jsecond = 0;
 
+    if(Joystick)
+    {
+        SDL_JoystickUpdate();
+        jaction = SDL_JoystickGetButton(Joystick, 0);
+        jsecond = SDL_JoystickGetButton(Joystick, 1);
+        jdirx = SDL_JoystickGetAxis(Joystick, 0) / (50 * 256);
+        jdiry = SDL_JoystickGetAxis(Joystick, 1) / (65 * 256);
+    }
+
     if(jdirx == 0) jdirx=(key[SDLK_RIGHT] - key[SDLK_LEFT]) * 2;
     if(jdiry == 0) jdiry=key[SDLK_DOWN] - key[SDLK_UP];
     if(jaction == 0) jaction = key[SDLK_LCTRL];
@@ -356,6 +356,10 @@
 void SYSTEM_IDLE()
 {
     Uint32 test = SDL_GetTicks();
+
+    if (test < timing)
+        SDL_Delay(1);
+
     while(test>timing)
     {
         timing+=14;
@@ -387,7 +391,5 @@
 
 int main(int argc, char*argv[])
 {
-
-	SHIPPY_MAIN();
-
+	return SHIPPY_MAIN(argc, argv);
 }
Only in shippy-1.3.3.7: shipsdl.c~


Index: shippy.spec
===================================================================
RCS file: /cvs/extras/rpms/shippy/devel/shippy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- shippy.spec	31 Mar 2006 08:18:18 -0000	1.1
+++ shippy.spec	3 Apr 2006 19:31:03 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           shippy
 Version:        1.3.3.7
-Release:        2%{?dist}
+Release:        unreleased(last 2)%{?dist}
 Summary:        Space invaders / Galaxians like game with powerups
 Group:          Amusements/Games
 License:        GPL
@@ -9,11 +9,7 @@
 Source1:        shippy.png
 Source2:        shippy.desktop
 Source3:        shippy.sh
-Patch0:         shippy-fixes.patch
-Patch1:         shippy-warnings.patch
-Patch2:         shippy-fullscreen.patch
-Patch3:         shippy-lcdfix.patch
-Patch4:         shippy-joy.patch
+Patch0:         shippy-merged.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  dumb-devel SDL_mixer-devel desktop-file-utils
 Requires:	%{name}-common = %{version}
@@ -49,11 +45,7 @@
 
 %prep
 %setup -q -c
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+%patch0 -p1 -z .merged
 %{__sed} -i 's/\r//' NOTES.txt LICENSE.txt docs/manual.html
 mv docs html
 #see comment in %%install
@@ -133,6 +125,10 @@
 
 
 %changelog
+* Mon Apr  3 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.3.3.7-unreleased
+- Merged all patches into one and put a few parts between #ifdef __unix__
+  (I send this upstream for merging).
+
 * Thu Mar 30 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.3.3.7-2
 - Fix reversed joy directions in allegro version
 - Improve support for analog joysticks in the allegro version


--- shippy-fixes.patch DELETED ---


--- shippy-fullscreen.patch DELETED ---


--- shippy-joy.patch DELETED ---


--- shippy-lcdfix.patch DELETED ---


--- shippy-warnings.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Apr  3 20:16:39 2006
From: fedora-extras-commits at redhat.com (Mike Bonnet (mikeb))
Date: Mon,  3 Apr 2006 13:16:39 -0700
Subject: krbVmodule krbVmodule.spec.in,1.9,1.10
Message-ID: <200604032016.k33KGduP003372@cvs-int.fedora.redhat.com>

Author: mikeb

Update of /cvs/devel/krbVmodule
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3355

Modified Files:
	krbVmodule.spec.in 
Log Message:
add a %defattr


Index: krbVmodule.spec.in
===================================================================
RCS file: /cvs/devel/krbVmodule/krbVmodule.spec.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- krbVmodule.spec.in	25 Mar 2006 01:02:23 -0000	1.9
+++ krbVmodule.spec.in	3 Apr 2006 20:16:36 -0000	1.10
@@ -37,6 +37,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
+%defattr(-,root,root,-)
 %doc README
 %{_libdir}/python%{pyver}/site-packages/krbVmodule.so
 



From fedora-extras-commits at redhat.com  Mon Apr  3 20:33:29 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon,  3 Apr 2006 13:33:29 -0700
Subject: owners owners.list,1.801,1.802
Message-ID: <200604032033.k33KXVBS003417@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	owners.list 
Log Message:
Add zasx, fix alphabet sort


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.801
retrieving revision 1.802
diff -u -r1.801 -r1.802
--- owners.list	3 Apr 2006 16:45:28 -0000	1.801
+++ owners.list	3 Apr 2006 20:33:29 -0000	1.802
@@ -239,6 +239,7 @@
 Fedora Extras|fedora-rpmdevtools|Fedora RPM Development Tools|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|fedora-usermgmt|Fedora tools for user management|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|feh|Fast command line image viewer using Imlib2|a.kurtz at hardsun.net|extras-qa at fedoraproject.org|
+Fedora Extras|fetchlog|The fetchlog utility displays the last new messages of a logfile|paul at xtdnet.nl|extras-qa at fedoraproject.org|
 Fedora Extras|fftw2|Fast Fourier Transform library|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|fftw|Fast Fourier Transform library|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|fig2ps|Utility for converting xfig pictures to PS/PDF|qspencer at ieee.org|extras-qa at fedoraproject.org|
@@ -649,6 +650,7 @@
 Fedora Extras|libxfcegui4|GTK widgets for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|libxml++|libxml++ is a C++ wrapper for the libxml2 XML parser library|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|libzvt|ZVT - Zed's Virtual Terminal|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|licq|An ICQ clone for online messaging|pvrabec at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|liferea|An RSS/RDF feed reader|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|lighttpd|Lightning fast webserver with light system requirements|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|lincity-ng|City Simulation Game|tcallawa at redhat.com|extras-qa at fedoraproject.org|
@@ -1576,10 +1578,9 @@
 Fedora Extras|yumex|A GUI for Yum|tla at rasmil.dk|extras-qa at fedoraproject.org|
 Fedora Extras|yum-utils|Utilities based around the yum package manager|skvidal at phy.duke.edu|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)|michel.salim at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|zile|Zile Is Lossy Emacs|jeff at ultimateevil.org|extras-qa at fedoraproject.org|
 Fedora Extras|zoo|File archiving utility with compression|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org|
 Fedora Extras|zope|Application server in Python|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|zziplib|Lightweight library to easily extract data from zip files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|licq|An ICQ clone for online messaging|pvrabec at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|fetchlog|The fetchlog utility displays the last new messages of a logfile|paul at xtdnet.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Apr  3 20:37:21 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon,  3 Apr 2006 13:37:21 -0700
Subject: rpms/gtkterm/FC-4 .cvsignore, 1.2, 1.3 gtkterm.desktop, 1.1,
	1.2 gtkterm.spec, 1.6, 1.7 sources, 1.2, 1.3
Message-ID: <200604032037.k33KbNxZ003454@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	.cvsignore gtkterm.desktop gtkterm.spec sources 
Log Message:
* Fri Mar 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.99.5-1
- Taking over as new FE maintainer
- Bump to new upstream 0.99.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkterm/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:31:34 -0000	1.2
+++ .cvsignore	3 Apr 2006 20:37:21 -0000	1.3
@@ -1 +1,2 @@
-gtkterm-0.99.4.tar.gz
+gtkterm-0.99.5.tar.gz
+gtkterm.png


Index: gtkterm.desktop
===================================================================
RCS file: /cvs/extras/rpms/gtkterm/FC-4/gtkterm.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtkterm.desktop	8 Nov 2004 04:31:34 -0000	1.1
+++ gtkterm.desktop	3 Apr 2006 20:37:21 -0000	1.2
@@ -1,7 +1,12 @@
 [Desktop Entry]
+Encoding=UTF-8
 Name=GTKTerm
-Comment=Serial port terminal
+GenericName=Serial port terminalemulator
+Comment=Targeted at developers, with hexview, etc.
 Exec=gtkterm
+Icon=gtkterm.png
 Terminal=false
+StartupNotify=false
 Type=Application
-Categories=Utility;Application;
+Categories=Application;Utility;
+Version=0.99.5


Index: gtkterm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkterm/FC-4/gtkterm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gtkterm.spec	6 Apr 2005 22:12:00 -0000	1.6
+++ gtkterm.spec	3 Apr 2006 20:37:21 -0000	1.7
@@ -1,52 +1,81 @@
 Name:           gtkterm
-Version:        0.99.4
-Release:        4
-
+Version:        0.99.5
+Release:        1%{?dist}
 Summary:        Serial port terminal
-
 Group:          Applications/Communications
 License:        GPL
 URL:            http://www.jls-info.com/julien/linux
-Source0:        http://www.jls-info.com/julien/linux/gtkterm-0.99.4.tar.gz
+Source0:        http://www.jls-info.com/julien/linux/%{name}-%{version}.tar.gz
 Source1:        gtkterm.desktop
+Source2:        gtkterm.png
+Patch0:         gtkterm-0.99.5-fixes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  gtk2-devel gettext bison desktop-file-utils vte-devel zlib-devel ncurses-devel
+BuildRequires:  gtk2-devel gettext bison desktop-file-utils vte-devel
+BuildRequires:  zlib-devel ncurses-devel
 
 %description
 Simple GUI terminal used to communicate with the serial port.
 Similar to minicom or hyperterminal.
 
+
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
 %configure
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
-install -d -m0755 $RPM_BUILD_ROOT/%{_datadir}/applications
-desktop-file-install --vendor fedora \
-        --add-category X-Fedora      \
-        --dir $RPM_BUILD_ROOT/%{_datadir}/applications  \
-%SOURCE1
+
+# below is the desktop file and icon stuff.
+mkdir $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/48x48/apps
+install -p -m 644 %{SOURCE2} \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
 
 %find_lang %{name}
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
-%{_bindir}/*
-%{_mandir}/man1/*
-%{_datadir}/applications/*
+%{_bindir}/%{name}
+%{_mandir}/man1/%{name}.1.gz
+%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+
 
 %changelog
+* Fri Mar 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.99.5-1
+- Taking over as new FE maintainer
+- Bump to new upstream 0.99.5
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkterm/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:31:34 -0000	1.2
+++ sources	3 Apr 2006 20:37:21 -0000	1.3
@@ -1 +1,2 @@
-5539c7e2aaf56bfd551a72552f1ff146  gtkterm-0.99.4.tar.gz
+007ce7810466396b6452dea9c57c5f02  gtkterm-0.99.5.tar.gz
+9e25fa8914f415a1d9f6d60801752b6a  gtkterm.png



From fedora-extras-commits at redhat.com  Mon Apr  3 20:40:35 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon,  3 Apr 2006 13:40:35 -0700
Subject: rpms/gtkterm/FC-4 gtkterm-0.99.5-fixes.patch,NONE,1.1
Message-ID: <200604032040.k33Kebhm003551@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Added Files:
	gtkterm-0.99.5-fixes.patch 
Log Message:
* Fri Mar 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.99.5-1
- Taking over as new FE maintainer
- Bump to new upstream 0.99.5


gtkterm-0.99.5-fixes.patch:

--- NEW FILE gtkterm-0.99.5-fixes.patch ---
--- gtkterm-0.99.5/src/macros.c~	2006-03-31 22:04:21.000000000 +0200
+++ gtkterm-0.99.5/src/macros.c	2006-03-31 22:04:21.000000000 +0200
@@ -59,7 +59,7 @@
   guchar a;
   guint val_read;
   
-  string = macros[(gint)number].action;
+  string = macros[(long)number].action;
   length = strlen(string);
   
   for(i = 0; i < length; i++)
@@ -140,7 +140,7 @@
 	}
     }
 
-  str = g_strdup_printf(_("Macro \"%s\" sent !"), macros[(gint)number].shortcut);
+  str = g_strdup_printf(_("Macro \"%s\" sent !"), macros[(long)number].shortcut);
   Put_temp_message(str, 800);
   g_free(str);
 }
@@ -160,7 +160,7 @@
 
 void add_shortcuts(void)
 {
-  gint i = 0;
+  long i = 0;
   guint acc_key;
   GdkModifierType mod;
 
--- gtkterm-0.99.5/src/fichier.c~	2006-03-31 22:02:49.000000000 +0200
+++ gtkterm-0.99.5/src/fichier.c	2006-03-31 22:02:49.000000000 +0200
@@ -153,7 +153,7 @@
   else
     {
       g_free(str);
-      str = g_strdup_printf(_("Cannot read file %s : %s\n"), NomFichier, strerror_utf8(errno));
+      str = g_strdup_printf(_("Cannot read file %s : %s\n"), NomFichier, strerror(errno));
       show_message(str, MSG_ERR);
     }
   return FALSE;
@@ -202,7 +202,7 @@
 	{
 	  /* Problem while writing, stop file transfer */
 	  g_free(str);
-	  str = g_strdup_printf(_("Cannot write file %s\n"), strerror_utf8(errno));
+	  str = g_strdup_printf(_("Cannot write file %s\n"), strerror(errno));
 	  show_message(str, MSG_ERR);
 	  close_all();
 	  return;
@@ -298,7 +298,7 @@
   if(Fic == NULL)
     {
       g_free(str);
-      str = g_strdup_printf(_("Cannot open file %s : %s\n"), NomFichier, strerror_utf8(errno));
+      str = g_strdup_printf(_("Cannot open file %s : %s\n"), NomFichier, strerror(errno));
       show_message(str, MSG_ERR);
     }
   else



From fedora-extras-commits at redhat.com  Mon Apr  3 21:13:33 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  3 Apr 2006 14:13:33 -0700
Subject: rpms/perl-AnyData - New directory
Message-ID: <200604032113.k33LDZej005750@cvs-int.fedora.redhat.com>

Author: spot

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

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




From fedora-extras-commits at redhat.com  Mon Apr  3 21:13:34 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  3 Apr 2006 14:13:34 -0700
Subject: rpms/perl-AnyData/devel - New directory
Message-ID: <200604032113.k33LDauq005753@cvs-int.fedora.redhat.com>

Author: spot

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

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




From fedora-extras-commits at redhat.com  Mon Apr  3 21:13:46 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  3 Apr 2006 14:13:46 -0700
Subject: rpms/perl-AnyData Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604032113.k33LDm4i005802@cvs-int.fedora.redhat.com>

Author: spot

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

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


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

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

common : CVS/Root
	@cvs 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 Apr  3 21:13:47 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  3 Apr 2006 14:13:47 -0700
Subject: rpms/perl-AnyData/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604032113.k33LDnD8005805@cvs-int.fedora.redhat.com>

Author: spot

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

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


--- 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 Apr  3 21:14:14 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  3 Apr 2006 14:14:14 -0700
Subject: rpms/perl-AnyData import.log,1.1,1.2
Message-ID: <200604032114.k33LEkFY005867@cvs-int.fedora.redhat.com>

Author: spot

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-AnyData/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	3 Apr 2006 21:13:46 -0000	1.1
+++ import.log	3 Apr 2006 21:14:14 -0000	1.2
@@ -0,0 +1 @@
+perl-AnyData-0_10-2:HEAD:perl-AnyData-0.10-2.src.rpm:1144098851



From fedora-extras-commits at redhat.com  Mon Apr  3 21:14:15 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  3 Apr 2006 14:14:15 -0700
Subject: rpms/perl-AnyData/devel perl-AnyData.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604032114.k33LElM0005871@cvs-int.fedora.redhat.com>

Author: spot

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

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


--- NEW FILE perl-AnyData.spec ---
Name:           perl-AnyData
Version:        0.10
Release:        2%{?dist}
Summary:        Easy access to data in many formats
Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/AnyData
Source0:        http://search.cpan.org/CPAN/authors/id/J/JZ/JZUCKER/AnyData-%{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
The AnyData modules provide simple and uniform access to data from
many sources -- perl arrays, local files, remote files retrievable via
http or ftp -- and in many formats including flat files (CSV, Fixed
Length, Tab Delimited, etc), standard format files (Web Logs,
Passwd files, etc.),  structured files (XML, HTML Tables) and binary 
files with parseable headers (mp3s, jpgs, pngs, etc).  

There are two separate modules, each providing a different interface:
AnyData.pm provides a simple tied hash interface and DBD::AnyData
provides a DBI/SQL interface.  You can use either or both depending on
your needs.

%prep
%setup -q -n AnyData-%{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
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/AnyData.pm
%{perl_vendorlib}/AnyData/
%{_mandir}/man3/*.3*


%changelog
* Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.10-2
- minor cleanups

* Sun Jan  8 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.10-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-AnyData/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Apr 2006 21:13:47 -0000	1.1
+++ .cvsignore	3 Apr 2006 21:14:15 -0000	1.2
@@ -0,0 +1 @@
+AnyData-0.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-AnyData/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Apr 2006 21:13:47 -0000	1.1
+++ sources	3 Apr 2006 21:14:15 -0000	1.2
@@ -0,0 +1 @@
+ff9fb4c7d8b99d63a773e66f0ccba788  AnyData-0.10.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr  3 21:17:42 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  3 Apr 2006 14:17:42 -0700
Subject: owners owners.list,1.802,1.803
Message-ID: <200604032117.k33LHid9005936@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	owners.list 
Log Message:

perl-AnyData



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.802
retrieving revision 1.803
diff -u -r1.802 -r1.803
--- owners.list	3 Apr 2006 20:33:29 -0000	1.802
+++ owners.list	3 Apr 2006 21:17:42 -0000	1.803
@@ -825,6 +825,7 @@
 Fedora Extras|pdsh|Parallel remote shell program|woodard at redhat.com|extras-qa at fedoraproject.org|
 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-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|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Apache-Session|Apache::Session Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Apache-Session-Wrapper|A simple wrapper around Apache::Session|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Mon Apr  3 21:52:10 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Mon,  3 Apr 2006 14:52:10 -0700
Subject: fedora-security/audit fc4,1.184,1.185 fc5,1.97,1.98
Message-ID: <200604032152.k33LqAVl006531@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6511

Modified Files:
	fc4 fc5 
Log Message:
Add a freeradius CVE id.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- fc4	3 Apr 2006 19:25:31 -0000	1.184
+++ fc4	3 Apr 2006 21:52:08 -0000	1.185
@@ -105,6 +105,7 @@
 CVE-2006-0019 version (kdelibs, fixed 3.5.1) [since FEDORA-2006-090] was backport since FEDORA-2006-050
 CVE-2005-4746 version (freeradius) we don't build vulnerable bits
 CVE-2005-4745 version (freeradius) we don't build vulnerable bits
+CVE-2005-4744 VULNERABLE (freeradius, fixed 1.0.5) bz#167677
 CVE-2005-4720 VULNERABLE (thunderbird)
 CVE-2005-4720 VULNERABLE (mozilla)
 CVE-2005-4720 VULNERABLE (firefox)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- fc5	3 Apr 2006 19:25:31 -0000	1.97
+++ fc5	3 Apr 2006 21:52:08 -0000	1.98
@@ -107,6 +107,7 @@
 CVE-2006-0019 version (kdelibs, fixed 3.5.1)
 CVE-2005-4746 version (freeradius) we don't build vulnerable bits
 CVE-2005-4745 version (freeradius) we don't build vulnerable bits
+CVE-2005-4744 version (freeradius, fixed 1.0.5)
 CVE-2005-4720 version (thunderbird, fixed 1.5)
 CVE-2005-4720 version (firefox, fixed 1.5)
 CVE-2005-4720 VULNERABLE (mozilla) not fixed upstream plus only DoS



From fedora-extras-commits at redhat.com  Mon Apr  3 23:40:30 2006
From: fedora-extras-commits at redhat.com (Mike Bonnet (mikeb))
Date: Mon,  3 Apr 2006 16:40:30 -0700
Subject: krbVmodule python-krbV.spec.in, NONE, 1.1 Makefile.am, 1.8,
	1.9 configure.in, 1.14, 1.15 krbVmodule.spec.in, 1.10, NONE
Message-ID: <200604032340.k33NeUH6010947@cvs-int.fedora.redhat.com>

Author: mikeb

Update of /cvs/devel/krbVmodule
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10927

Modified Files:
	Makefile.am configure.in 
Added Files:
	python-krbV.spec.in 
Removed Files:
	krbVmodule.spec.in 
Log Message:
further changes to make the package more Extras-friendly


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

Name: python-krbV
Version: @VERSION@
Release: 2%{?dist}
Summary: Python extension module for Kerberos 5

Group: Development/Languages
License: LGPL

Source: python-krbV-%{version}.tar.gz

Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: python-devel
BuildRequires: krb5-devel >= 1.2.2
BuildRequires: /bin/awk

Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
Requires: krb5-libs >= 1.2.2

%description
python-krbV allows python programs to use Kerberos 5 authentication/security.

%prep
%setup -q -n python-krbV-%{version}

%build
export LIBNAME=%{_lib}
%configure
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf $RPM_BUILD_ROOT
%{__mkdir_p} %{python_sitelib}
%makeinstall
%{__rm} -f $RPM_BUILD_ROOT%{python_sitelib}/*.la

%clean
%{__rm} -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README
%{python_sitelib}/krbVmodule.so

%changelog
* Fri Mar 24 2006 Mike Bonnet <mikeb at redhat.com>
- fix typo in error definition
- change the return value of recvauth() from ac to (ac, princ), where princ is the principal sent by sendauth()
- rename the package and reorganize the BuildRequires, to be more Extras-friendly

* Tue Sep 25 2001 Elliot Lee <sopwith at redhat.com>
- Initial version


Index: Makefile.am
===================================================================
RCS file: /cvs/devel/krbVmodule/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.am	14 Jan 2004 17:51:50 -0000	1.8
+++ Makefile.am	3 Apr 2006 23:40:28 -0000	1.9
@@ -13,9 +13,9 @@
 krb5defines.h: $(DEFFILES) gendefines.awk
 	awk -f $(srcdir)/gendefines.awk $(DEFFILES) > $@
 
-EXTRA_DIST=gendefines.awk krbVmodule.spec.in krbV-code-snippets.py
+EXTRA_DIST=gendefines.awk python-krbV.spec.in krbV-code-snippets.py
 BUILT_SOURCES=krb5defines.h
 CLEANFILES=krb5defines.h
 
-dist-hook: krbVmodule.spec
-	cp krbVmodule.spec $(distdir)
+dist-hook: python-krbV.spec
+	cp python-krbV.spec $(distdir)


Index: configure.in
===================================================================
RCS file: /cvs/devel/krbVmodule/configure.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- configure.in	14 Jan 2004 17:51:50 -0000	1.14
+++ configure.in	3 Apr 2006 23:40:28 -0000	1.15
@@ -1,6 +1,6 @@
 AC_INIT
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(krbVmodule, 1.0.11)
+AM_INIT_AUTOMAKE(python-krbV, 1.0.11)
 
 AC_PREFIX_DEFAULT(/usr)
 
@@ -31,5 +31,5 @@
 
 AC_OUTPUT([
 Makefile
-krbVmodule.spec
+python-krbV.spec
 ])


--- krbVmodule.spec.in DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr  4 03:58:38 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon,  3 Apr 2006 20:58:38 -0700
Subject: rpms/perl-Want/devel .cvsignore, 1.3, 1.4 perl-Want.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200604040358.k343we0U019499@cvs-int.fedora.redhat.com>

Author: corsepiu

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

Modified Files:
	.cvsignore perl-Want.spec sources 
Log Message:
* Tue Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.10-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Want/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Jul 2005 05:29:55 -0000	1.3
+++ .cvsignore	4 Apr 2006 03:58:38 -0000	1.4
@@ -1 +1 @@
-Want-0.09.tar.gz
+Want-0.10.tar.gz


Index: perl-Want.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Want/devel/perl-Want.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Want.spec	20 Feb 2006 06:11:00 -0000	1.4
+++ perl-Want.spec	4 Apr 2006 03:58:38 -0000	1.5
@@ -1,6 +1,6 @@
 Name: 		perl-Want
-Version: 	0.09
-Release: 	3%{?dist}
+Version: 	0.10
+Release: 	1%{?dist}
 Summary: 	Perl module implementing a generalisation of wantarray
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -8,7 +8,6 @@
 Source0: 	http://search.cpan.org/CPAN/authors/id/R/RO/ROBIN/Want-%{version}.tar.gz
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	perl
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -46,6 +45,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.10-1
+- Upstream update.
+
 * Mon Feb 20 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-3
 - Rebuild.
 
@@ -54,13 +56,3 @@
 
 * Sat Jul 02 2005 Ralf Corsepius <ralf at links2linux.de> - 0.09-1
 - Upstream update to 0.09.
-
-* Fri Jul 01 2005 Ralf Corsepius <ralf at links2linux.de> - 0.08-3
-- Remove ||: in %%check.
-
-* Fri Jul 01 2005 Ralf Corsepius <ralf at links2linux.de> - 0.08-2
-- Pass OPTIMIZE during generation of Makefile.
-- Use perl instead of %%__perl.
-
-* Fri Jul 01 2005 Ralf Corsepius <ralf at links2linux.de> - 0.08-1
-- FE submission.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Want/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Jul 2005 05:29:55 -0000	1.3
+++ sources	4 Apr 2006 03:58:38 -0000	1.4
@@ -1 +1 @@
-90ab551867c986b748128609f95b3666  Want-0.09.tar.gz
+bc2836bd8fe4bcb6044334d54a08c686  Want-0.10.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr  4 03:59:30 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon,  3 Apr 2006 20:59:30 -0700
Subject: rpms/perl-Want/FC-5 .cvsignore, 1.3, 1.4 perl-Want.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200604040359.k343xWQ4019567@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Want/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19546

Modified Files:
	.cvsignore perl-Want.spec sources 
Log Message:
* Tue Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.10-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Want/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Jul 2005 05:29:55 -0000	1.3
+++ .cvsignore	4 Apr 2006 03:59:30 -0000	1.4
@@ -1 +1 @@
-Want-0.09.tar.gz
+Want-0.10.tar.gz


Index: perl-Want.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Want/FC-5/perl-Want.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Want.spec	20 Feb 2006 06:11:00 -0000	1.4
+++ perl-Want.spec	4 Apr 2006 03:59:30 -0000	1.5
@@ -1,6 +1,6 @@
 Name: 		perl-Want
-Version: 	0.09
-Release: 	3%{?dist}
+Version: 	0.10
+Release: 	1%{?dist}
 Summary: 	Perl module implementing a generalisation of wantarray
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -8,7 +8,6 @@
 Source0: 	http://search.cpan.org/CPAN/authors/id/R/RO/ROBIN/Want-%{version}.tar.gz
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	perl
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -46,6 +45,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.10-1
+- Upstream update.
+
 * Mon Feb 20 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-3
 - Rebuild.
 
@@ -54,13 +56,3 @@
 
 * Sat Jul 02 2005 Ralf Corsepius <ralf at links2linux.de> - 0.09-1
 - Upstream update to 0.09.
-
-* Fri Jul 01 2005 Ralf Corsepius <ralf at links2linux.de> - 0.08-3
-- Remove ||: in %%check.
-
-* Fri Jul 01 2005 Ralf Corsepius <ralf at links2linux.de> - 0.08-2
-- Pass OPTIMIZE during generation of Makefile.
-- Use perl instead of %%__perl.
-
-* Fri Jul 01 2005 Ralf Corsepius <ralf at links2linux.de> - 0.08-1
-- FE submission.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Want/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Jul 2005 05:29:55 -0000	1.3
+++ sources	4 Apr 2006 03:59:30 -0000	1.4
@@ -1 +1 @@
-90ab551867c986b748128609f95b3666  Want-0.09.tar.gz
+bc2836bd8fe4bcb6044334d54a08c686  Want-0.10.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr  4 04:00:23 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon,  3 Apr 2006 21:00:23 -0700
Subject: rpms/perl-Want/FC-4 .cvsignore, 1.3, 1.4 perl-Want.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200604040400.k3440Pb6019644@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Want/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19623

Modified Files:
	.cvsignore perl-Want.spec sources 
Log Message:
* Tue Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.10-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Want/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Jul 2005 05:32:16 -0000	1.3
+++ .cvsignore	4 Apr 2006 04:00:22 -0000	1.4
@@ -1 +1 @@
-Want-0.09.tar.gz
+Want-0.10.tar.gz


Index: perl-Want.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Want/FC-4/perl-Want.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Want.spec	2 Jul 2005 05:32:16 -0000	1.3
+++ perl-Want.spec	4 Apr 2006 04:00:22 -0000	1.4
@@ -1,14 +1,14 @@
-Name: perl-Want
-Version: 0.09
-Release: 1%{?dist}
-Summary: Perl module implementing a generalisation of wantarray
-License: GPL or Artistic
-Group: Development/Libraries
-URL: http://search.cpan.org/dist/Want/
-Source0: http://search.cpan.org/CPAN/authors/id/R/RO/ROBIN/Want-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name: 		perl-Want
+Version: 	0.10
+Release: 	1%{?dist}
+Summary: 	Perl module implementing a generalisation of wantarray
+License: 	GPL or Artistic
+Group: 		Development/Libraries
+URL: 		http://search.cpan.org/dist/Want/
+Source0: 	http://search.cpan.org/CPAN/authors/id/R/RO/ROBIN/Want-%{version}.tar.gz
+BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 This module generalises the mechanism of the wantarray
@@ -19,19 +19,17 @@
 %setup -q -n Want-%{version}
 
 %build
-perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="${RPM_OPT_FLAGS}"
+%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="${RPM_OPT_FLAGS}"
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install \
-    PERL_INSTALL_ROOT=$RPM_BUILD_ROOT \
-    INSTALLARCHLIB=$RPM_BUILD_ROOT%{perl_archlib}
-
-find $RPM_BUILD_ROOT -type f -a \( -name .packlist \
-  -o -name perllocal.pod \
-  -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
+make 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/*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -47,15 +45,14 @@
 %{_mandir}/man3/*
 
 %changelog
-* Sat Jul 02 2005 Ralf Corsepius <ralf at links2linux.de> - 0.09-1
-- Upstream update to 0.09.
+* Tue Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.10-1
+- Upstream update.
 
-* Fri Jul 01 2005 Ralf Corsepius <ralf at links2linux.de> - 0.08-3
-- Remove ||: in %%check.
+* Mon Feb 20 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-3
+- Rebuild.
 
-* Fri Jul 01 2005 Ralf Corsepius <ralf at links2linux.de> - 0.08-2
-- Pass OPTIMIZE during generation of Makefile.
-- Use perl instead of %%__perl.
+* Sat Aug 13 2005 Ralf Corsepius <ralf at links2linux.de> - 0.09-2
+- Streamline with FE spec-template.
 
-* Fri Jul 01 2005 Ralf Corsepius <ralf at links2linux.de> - 0.08-1
-- FE submission.
+* Sat Jul 02 2005 Ralf Corsepius <ralf at links2linux.de> - 0.09-1
+- Upstream update to 0.09.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Want/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Jul 2005 05:32:16 -0000	1.3
+++ sources	4 Apr 2006 04:00:22 -0000	1.4
@@ -1 +1 @@
-90ab551867c986b748128609f95b3666  Want-0.09.tar.gz
+bc2836bd8fe4bcb6044334d54a08c686  Want-0.10.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr  4 04:01:23 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon,  3 Apr 2006 21:01:23 -0700
Subject: rpms/perl-Want/FC-3 .cvsignore, 1.3, 1.4 perl-Want.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200604040401.k3441wHl021678@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Want/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21655

Modified Files:
	.cvsignore perl-Want.spec sources 
Log Message:
* Tue Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.10-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Want/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Jul 2005 05:32:16 -0000	1.3
+++ .cvsignore	4 Apr 2006 04:01:23 -0000	1.4
@@ -1 +1 @@
-Want-0.09.tar.gz
+Want-0.10.tar.gz


Index: perl-Want.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Want/FC-3/perl-Want.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Want.spec	2 Jul 2005 05:32:16 -0000	1.3
+++ perl-Want.spec	4 Apr 2006 04:01:23 -0000	1.4
@@ -1,14 +1,14 @@
-Name: perl-Want
-Version: 0.09
-Release: 1%{?dist}
-Summary: Perl module implementing a generalisation of wantarray
-License: GPL or Artistic
-Group: Development/Libraries
-URL: http://search.cpan.org/dist/Want/
-Source0: http://search.cpan.org/CPAN/authors/id/R/RO/ROBIN/Want-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name: 		perl-Want
+Version: 	0.10
+Release: 	1%{?dist}
+Summary: 	Perl module implementing a generalisation of wantarray
+License: 	GPL or Artistic
+Group: 		Development/Libraries
+URL: 		http://search.cpan.org/dist/Want/
+Source0: 	http://search.cpan.org/CPAN/authors/id/R/RO/ROBIN/Want-%{version}.tar.gz
+BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 This module generalises the mechanism of the wantarray
@@ -19,19 +19,17 @@
 %setup -q -n Want-%{version}
 
 %build
-perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="${RPM_OPT_FLAGS}"
+%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="${RPM_OPT_FLAGS}"
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install \
-    PERL_INSTALL_ROOT=$RPM_BUILD_ROOT \
-    INSTALLARCHLIB=$RPM_BUILD_ROOT%{perl_archlib}
-
-find $RPM_BUILD_ROOT -type f -a \( -name .packlist \
-  -o -name perllocal.pod \
-  -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
+make 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/*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -47,15 +45,14 @@
 %{_mandir}/man3/*
 
 %changelog
-* Sat Jul 02 2005 Ralf Corsepius <ralf at links2linux.de> - 0.09-1
-- Upstream update to 0.09.
+* Tue Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.10-1
+- Upstream update.
 
-* Fri Jul 01 2005 Ralf Corsepius <ralf at links2linux.de> - 0.08-3
-- Remove ||: in %%check.
+* Mon Feb 20 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-3
+- Rebuild.
 
-* Fri Jul 01 2005 Ralf Corsepius <ralf at links2linux.de> - 0.08-2
-- Pass OPTIMIZE during generation of Makefile.
-- Use perl instead of %%__perl.
+* Sat Aug 13 2005 Ralf Corsepius <ralf at links2linux.de> - 0.09-2
+- Streamline with FE spec-template.
 
-* Fri Jul 01 2005 Ralf Corsepius <ralf at links2linux.de> - 0.08-1
-- FE submission.
+* Sat Jul 02 2005 Ralf Corsepius <ralf at links2linux.de> - 0.09-1
+- Upstream update to 0.09.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Want/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Jul 2005 05:32:16 -0000	1.3
+++ sources	4 Apr 2006 04:01:23 -0000	1.4
@@ -1 +1 @@
-90ab551867c986b748128609f95b3666  Want-0.09.tar.gz
+bc2836bd8fe4bcb6044334d54a08c686  Want-0.10.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr  4 06:23:12 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon,  3 Apr 2006 23:23:12 -0700
Subject: rpms/perl-Tree-Simple/devel .cvsignore, 1.2,
	1.3 perl-Tree-Simple.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200604040623.k346NEJf025958@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Tree-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25935

Modified Files:
	.cvsignore perl-Tree-Simple.spec sources 
Log Message:
* Tue Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.16-1
- Upsteam update.
- BR: Scalar::Util >= 1.18.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Tree-Simple/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Aug 2005 01:08:39 -0000	1.2
+++ .cvsignore	4 Apr 2006 06:23:12 -0000	1.3
@@ -1 +1 @@
-Tree-Simple-1.15.tar.gz
+Tree-Simple-1.16.tar.gz


Index: perl-Tree-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Tree-Simple/devel/perl-Tree-Simple.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Tree-Simple.spec	28 Feb 2006 22:41:42 -0000	1.3
+++ perl-Tree-Simple.spec	4 Apr 2006 06:23:12 -0000	1.4
@@ -1,6 +1,6 @@
 Name: 		perl-Tree-Simple
-Version: 	1.15
-Release: 	3%{?dist}
+Version: 	1.16
+Release: 	1%{?dist}
 Summary: 	Tree::Simple Perl module
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -9,6 +9,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: 	noarch
 
+BuildRequires:	perl(Scalar::Util) >= 1.18
 BuildRequires: 	perl(Test::Exception) >= 0.15 
 BuildRequires: 	perl(Test::Pod) >=  1.14
 BuildRequires: 	perl(Test::Pod::Coverage) >= 1.04
@@ -49,6 +50,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.16-1
+- Upsteam update.
+- BR: Scalar::Util >= 1.18.
+
 * Tue Feb 28 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.15-3
 - Rebuild for perl-5.8.8.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Tree-Simple/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Aug 2005 01:08:39 -0000	1.2
+++ sources	4 Apr 2006 06:23:12 -0000	1.3
@@ -1 +1 @@
-f4bb1afd402186952ea0b87ceeb3bc41  Tree-Simple-1.15.tar.gz
+7f003a9af1aea6a9931c3de8fc49b3ab  Tree-Simple-1.16.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr  4 06:24:14 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon,  3 Apr 2006 23:24:14 -0700
Subject: rpms/perl-Tree-Simple/FC-5 .cvsignore, 1.2,
	1.3 perl-Tree-Simple.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200604040624.k346OG7p026029@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Tree-Simple/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26006

Modified Files:
	.cvsignore perl-Tree-Simple.spec sources 
Log Message:
* Tue Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.16-1
- Upsteam update.
- BR: Scalar::Util >= 1.18.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Tree-Simple/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Aug 2005 01:08:39 -0000	1.2
+++ .cvsignore	4 Apr 2006 06:24:14 -0000	1.3
@@ -1 +1 @@
-Tree-Simple-1.15.tar.gz
+Tree-Simple-1.16.tar.gz


Index: perl-Tree-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Tree-Simple/FC-5/perl-Tree-Simple.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Tree-Simple.spec	28 Feb 2006 22:41:42 -0000	1.3
+++ perl-Tree-Simple.spec	4 Apr 2006 06:24:14 -0000	1.4
@@ -1,6 +1,6 @@
 Name: 		perl-Tree-Simple
-Version: 	1.15
-Release: 	3%{?dist}
+Version: 	1.16
+Release: 	1%{?dist}
 Summary: 	Tree::Simple Perl module
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -9,6 +9,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: 	noarch
 
+BuildRequires:	perl(Scalar::Util) >= 1.18
 BuildRequires: 	perl(Test::Exception) >= 0.15 
 BuildRequires: 	perl(Test::Pod) >=  1.14
 BuildRequires: 	perl(Test::Pod::Coverage) >= 1.04
@@ -49,6 +50,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.16-1
+- Upsteam update.
+- BR: Scalar::Util >= 1.18.
+
 * Tue Feb 28 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.15-3
 - Rebuild for perl-5.8.8.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Tree-Simple/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Aug 2005 01:08:39 -0000	1.2
+++ sources	4 Apr 2006 06:24:14 -0000	1.3
@@ -1 +1 @@
-f4bb1afd402186952ea0b87ceeb3bc41  Tree-Simple-1.15.tar.gz
+7f003a9af1aea6a9931c3de8fc49b3ab  Tree-Simple-1.16.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr  4 07:23:28 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  4 Apr 2006 00:23:28 -0700
Subject: rpms/perl-Params-Validate/devel .cvsignore, 1.4,
	1.5 perl-Params-Validate.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <200604040723.k347NUqs028198@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Validate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28177

Modified Files:
	.cvsignore perl-Params-Validate.spec sources 
Log Message:
* Wed Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.81-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Validate/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Feb 2006 05:53:20 -0000	1.4
+++ .cvsignore	4 Apr 2006 07:23:28 -0000	1.5
@@ -1 +1 @@
-Params-Validate-0.80.tar.gz
+Params-Validate-0.81.tar.gz


Index: perl-Params-Validate.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Validate/devel/perl-Params-Validate.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Params-Validate.spec	20 Feb 2006 06:40:04 -0000	1.5
+++ perl-Params-Validate.spec	4 Apr 2006 07:23:28 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: 	Params-Validate Perl module
 Name: 		perl-Params-Validate
-Version: 	0.80
-Release: 	2%{?dist}
+Version: 	0.81
+Release: 	1%{?dist}
 License: 	GPL or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Params-Validate/
@@ -54,6 +54,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.81-1
+- Upstream update.
+
 * Wed Feb 20 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.80-2
 - Rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Validate/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Feb 2006 05:53:20 -0000	1.4
+++ sources	4 Apr 2006 07:23:28 -0000	1.5
@@ -1 +1 @@
-37acde17038290becdef848f566698d6  Params-Validate-0.80.tar.gz
+033d043c4764b800722b9d7442bc4530  Params-Validate-0.81.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr  4 07:28:11 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  4 Apr 2006 00:28:11 -0700
Subject: rpms/perl-Devel-StackTrace/devel .cvsignore, 1.3,
	1.4 perl-Devel-StackTrace.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200604040728.k347SDE4028281@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Devel-StackTrace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28260

Modified Files:
	.cvsignore perl-Devel-StackTrace.spec sources 
Log Message:
* Wed Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.13-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-StackTrace/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Oct 2005 16:22:28 -0000	1.3
+++ .cvsignore	4 Apr 2006 07:28:11 -0000	1.4
@@ -1 +1 @@
-Devel-StackTrace-1.12.tar.gz
+Devel-StackTrace-1.13.tar.gz


Index: perl-Devel-StackTrace.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-StackTrace/devel/perl-Devel-StackTrace.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Devel-StackTrace.spec	28 Feb 2006 23:20:17 -0000	1.4
+++ perl-Devel-StackTrace.spec	4 Apr 2006 07:28:11 -0000	1.5
@@ -1,7 +1,7 @@
 Name:      	perl-Devel-StackTrace
 Summary:   	Perl module implementing stack trace and stack trace frame objects
-Version:	1.12
-Release: 	2%{?dist}
+Version:	1.13
+Release: 	1%{?dist}
 License:   	Artistic or GPL
 Group: 		Development/Libraries
 URL:       	http://search.cpan.org/dist/Devel-StackTrace
@@ -51,20 +51,11 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.13-1
+- Upstream update.
+
 * Wed Mar 01 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.12-2
 - Rebuild for perl-5.8.8.
 
 * Sun Oct 02 2005 Ralf Corsepius <rc040203 at freenet.de> - 1.12-1
 - Upstream update.
-
-* Wed Aug 10 2005 Ralf Corsepius <ralf at links2linux.de> - 1.11-4
-- Spec cleanup.
-
-* Wed Aug 10 2005 Ralf Corsepius <ralf at links2linux.de> - 1.11-3
-- Add %%defattr.
-
-* Wed Aug 10 2005 Ralf Corsepius <ralf at links2linux.de> - 1.11-2
-- FE re-submission.
-
-* Fri Jul 01 2005 Ralf Corsepius <ralf at links2linux.de> - 1.11-1
-- FE submission.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-StackTrace/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Oct 2005 16:22:28 -0000	1.3
+++ sources	4 Apr 2006 07:28:11 -0000	1.4
@@ -1 +1 @@
-1ba3c261e798dbd52517b458c415b6e4  Devel-StackTrace-1.12.tar.gz
+35d85c3f2c91c1de389b13436659551a  Devel-StackTrace-1.13.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr  4 07:29:10 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  4 Apr 2006 00:29:10 -0700
Subject: rpms/perl-Devel-StackTrace/FC-5 .cvsignore, 1.3,
	1.4 perl-Devel-StackTrace.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200604040729.k347TCYE028346@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Devel-StackTrace/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28325

Modified Files:
	.cvsignore perl-Devel-StackTrace.spec sources 
Log Message:
* Wed Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.13-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-StackTrace/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Oct 2005 16:22:28 -0000	1.3
+++ .cvsignore	4 Apr 2006 07:29:09 -0000	1.4
@@ -1 +1 @@
-Devel-StackTrace-1.12.tar.gz
+Devel-StackTrace-1.13.tar.gz


Index: perl-Devel-StackTrace.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-StackTrace/FC-5/perl-Devel-StackTrace.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Devel-StackTrace.spec	28 Feb 2006 23:20:17 -0000	1.4
+++ perl-Devel-StackTrace.spec	4 Apr 2006 07:29:09 -0000	1.5
@@ -1,7 +1,7 @@
 Name:      	perl-Devel-StackTrace
 Summary:   	Perl module implementing stack trace and stack trace frame objects
-Version:	1.12
-Release: 	2%{?dist}
+Version:	1.13
+Release: 	1%{?dist}
 License:   	Artistic or GPL
 Group: 		Development/Libraries
 URL:       	http://search.cpan.org/dist/Devel-StackTrace
@@ -51,20 +51,11 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.13-1
+- Upstream update.
+
 * Wed Mar 01 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.12-2
 - Rebuild for perl-5.8.8.
 
 * Sun Oct 02 2005 Ralf Corsepius <rc040203 at freenet.de> - 1.12-1
 - Upstream update.
-
-* Wed Aug 10 2005 Ralf Corsepius <ralf at links2linux.de> - 1.11-4
-- Spec cleanup.
-
-* Wed Aug 10 2005 Ralf Corsepius <ralf at links2linux.de> - 1.11-3
-- Add %%defattr.
-
-* Wed Aug 10 2005 Ralf Corsepius <ralf at links2linux.de> - 1.11-2
-- FE re-submission.
-
-* Fri Jul 01 2005 Ralf Corsepius <ralf at links2linux.de> - 1.11-1
-- FE submission.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-StackTrace/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Oct 2005 16:22:28 -0000	1.3
+++ sources	4 Apr 2006 07:29:09 -0000	1.4
@@ -1 +1 @@
-1ba3c261e798dbd52517b458c415b6e4  Devel-StackTrace-1.12.tar.gz
+35d85c3f2c91c1de389b13436659551a  Devel-StackTrace-1.13.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr  4 07:31:09 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  4 Apr 2006 00:31:09 -0700
Subject: rpms/perl-Devel-StackTrace/FC-4 .cvsignore, 1.3,
	1.4 perl-Devel-StackTrace.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200604040731.k347VBBO028423@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Devel-StackTrace/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28402

Modified Files:
	.cvsignore perl-Devel-StackTrace.spec sources 
Log Message:
* Wed Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.13-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-StackTrace/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Oct 2005 03:25:57 -0000	1.3
+++ .cvsignore	4 Apr 2006 07:31:08 -0000	1.4
@@ -1 +1 @@
-Devel-StackTrace-1.12.tar.gz
+Devel-StackTrace-1.13.tar.gz


Index: perl-Devel-StackTrace.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-StackTrace/FC-4/perl-Devel-StackTrace.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Devel-StackTrace.spec	6 Oct 2005 03:23:03 -0000	1.3
+++ perl-Devel-StackTrace.spec	4 Apr 2006 07:31:08 -0000	1.4
@@ -1,6 +1,6 @@
 Name:      	perl-Devel-StackTrace
 Summary:   	Perl module implementing stack trace and stack trace frame objects
-Version:	1.12
+Version:	1.13
 Release: 	1%{?dist}
 License:   	Artistic or GPL
 Group: 		Development/Libraries
@@ -51,17 +51,8 @@
 %{_mandir}/man3/*
 
 %changelog
-* Sun Oct 02 2005 Ralf Corsepius <rc040203 at freenet.de> - 1.12-1
+* Wed Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.13-1
 - Upstream update.
 
-* Wed Aug 10 2005 Ralf Corsepius <ralf at links2linux.de> - 1.11-4
-- Spec cleanup.
-
-* Wed Aug 10 2005 Ralf Corsepius <ralf at links2linux.de> - 1.11-3
-- Add %%defattr.
-
-* Wed Aug 10 2005 Ralf Corsepius <ralf at links2linux.de> - 1.11-2
-- FE re-submission.
-
-* Fri Jul 01 2005 Ralf Corsepius <ralf at links2linux.de> - 1.11-1
-- FE submission.
+* Sun Oct 02 2005 Ralf Corsepius <rc040203 at freenet.de> - 1.12-1
+- Upstream update.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-StackTrace/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Oct 2005 03:25:57 -0000	1.3
+++ sources	4 Apr 2006 07:31:09 -0000	1.4
@@ -1 +1 @@
-1ba3c261e798dbd52517b458c415b6e4  Devel-StackTrace-1.12.tar.gz
+35d85c3f2c91c1de389b13436659551a  Devel-StackTrace-1.13.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr  4 07:34:35 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  4 Apr 2006 00:34:35 -0700
Subject: rpms/perl-Devel-StackTrace/FC-3 .cvsignore, 1.2,
	1.3 perl-Devel-StackTrace.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200604040734.k347YbOh028498@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Devel-StackTrace/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28477

Modified Files:
	.cvsignore perl-Devel-StackTrace.spec sources 
Log Message:
* Wed Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.13-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-StackTrace/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Aug 2005 03:28:50 -0000	1.2
+++ .cvsignore	4 Apr 2006 07:34:35 -0000	1.3
@@ -1 +1 @@
-Devel-StackTrace-1.11.tar.gz
+Devel-StackTrace-1.13.tar.gz


Index: perl-Devel-StackTrace.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-StackTrace/FC-3/perl-Devel-StackTrace.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Devel-StackTrace.spec	14 Aug 2005 03:32:06 -0000	1.2
+++ perl-Devel-StackTrace.spec	4 Apr 2006 07:34:35 -0000	1.3
@@ -1,7 +1,7 @@
 Name:      	perl-Devel-StackTrace
 Summary:   	Perl module implementing stack trace and stack trace frame objects
-Version:	1.11
-Release: 	4%{?dist}
+Version:	1.13
+Release: 	1%{?dist}
 License:   	Artistic or GPL
 Group: 		Development/Libraries
 URL:       	http://search.cpan.org/dist/Devel-StackTrace
@@ -51,14 +51,8 @@
 %{_mandir}/man3/*
 
 %changelog
-* Wed Aug 10 2005 Ralf Corsepius <ralf at links2linux.de> - 1.11-4
-- Spec cleanup.
+* Wed Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.13-1
+- Upstream update.
 
-* Wed Aug 10 2005 Ralf Corsepius <ralf at links2linux.de> - 1.11-3
-- Add %%defattr.
-
-* Wed Aug 10 2005 Ralf Corsepius <ralf at links2linux.de> - 1.11-2
-- FE re-submission.
-
-* Fri Jul 01 2005 Ralf Corsepius <ralf at links2linux.de> - 1.11-1
-- FE submission.
+* Sun Oct 02 2005 Ralf Corsepius <rc040203 at freenet.de> - 1.12-1
+- Upstream update.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-StackTrace/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Aug 2005 03:28:50 -0000	1.2
+++ sources	4 Apr 2006 07:34:35 -0000	1.3
@@ -1 +1 @@
-a5d2088a531ceeec82b989c742f9382e  Devel-StackTrace-1.11.tar.gz
+35d85c3f2c91c1de389b13436659551a  Devel-StackTrace-1.13.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr  4 09:20:37 2006
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Tue,  4 Apr 2006 02:20:37 -0700
Subject: rpms/sloccount - New directory
Message-ID: <200604040920.k349Kd0V000417@cvs-int.fedora.redhat.com>

Author: hadess

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

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




From fedora-extras-commits at redhat.com  Tue Apr  4 09:20:38 2006
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Tue,  4 Apr 2006 02:20:38 -0700
Subject: rpms/sloccount/devel - New directory
Message-ID: <200604040920.k349Ke1M000420@cvs-int.fedora.redhat.com>

Author: hadess

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

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




From fedora-extras-commits at redhat.com  Tue Apr  4 09:20:52 2006
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Tue,  4 Apr 2006 02:20:52 -0700
Subject: rpms/sloccount Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604040920.k349KtVx000469@cvs-int.fedora.redhat.com>

Author: hadess

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

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


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

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

common : CVS/Root
	@cvs 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 Apr  4 09:20:53 2006
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Tue,  4 Apr 2006 02:20:53 -0700
Subject: rpms/sloccount/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604040920.k349Ktw6000472@cvs-int.fedora.redhat.com>

Author: hadess

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

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


--- 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 Apr  4 09:21:22 2006
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Tue,  4 Apr 2006 02:21:22 -0700
Subject: rpms/sloccount import.log,1.1,1.2
Message-ID: <200604040921.k349LOVc000533@cvs-int.fedora.redhat.com>

Author: hadess

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/sloccount/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	4 Apr 2006 09:20:52 -0000	1.1
+++ import.log	4 Apr 2006 09:21:22 -0000	1.2
@@ -0,0 +1 @@
+sloccount-2_26-3:HEAD:sloccount-2.26-3.src.rpm:1144142475



From fedora-extras-commits at redhat.com  Tue Apr  4 09:21:23 2006
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Tue,  4 Apr 2006 02:21:23 -0700
Subject: rpms/sloccount/devel sloccount.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604040921.k349LPrZ000538@cvs-int.fedora.redhat.com>

Author: hadess

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

Modified Files:
	.cvsignore sources 
Added Files:
	sloccount.spec 
Log Message:
auto-import sloccount-2.26-3 on branch devel from sloccount-2.26-3.src.rpm


--- NEW FILE sloccount.spec ---
Name: sloccount
Summary: Measures source lines of code (SLOC) in programs
Version: 2.26
Release: 3
License: GPL
Group: Development/Tools
Source: http://www.dwheeler.com/sloccount/sloccount-%{version}.tar.gz
URL: http://www.dwheeler.com/sloccount
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
SLOCCount (pronounced "sloc-count") is a suite of programs for counting
physical source lines of code (SLOC) in potentially large software systems.

SLOCCount can be used to generate reports in different formats for use
by report-generating tools.

%prep
%setup -q

%build
make

%install
rm -rf ${RPM_BUILD_ROOT}
mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1
make install_programs PREFIX=${RPM_BUILD_ROOT}%{_prefix}
make install_man PREFIX=${RPM_BUILD_ROOT}%{_prefix}

%clean
rm -rf ${RPM_BUILD_ROOT}

%files
%defattr(-, root, root)
%doc sloccount.html README ChangeLog COPYING TODO
%{_bindir}/*
%{_mandir}/*/*

%changelog
* Tue Apr 04 2006 - Bastien Nocera <hadess at hadess.net> - 2.26-3
- shorten description, and quieten setup

* Mon Apr 03 2006 - Bastien Nocera <hadess at hadess.net> - 2.26-2
- Update source to match upstream vanilla
  change BuildRoot to match preferred value

* Thu Nov 10 2005 - Bastien Nocera <hadess at hadess.net> - 2.26-1
- First version for Fedora Extras



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sloccount/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Apr 2006 09:20:53 -0000	1.1
+++ .cvsignore	4 Apr 2006 09:21:23 -0000	1.2
@@ -0,0 +1 @@
+sloccount-2.26.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sloccount/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Apr 2006 09:20:53 -0000	1.1
+++ sources	4 Apr 2006 09:21:23 -0000	1.2
@@ -0,0 +1 @@
+09abd6e2a016ebaf7552068a1dba1249  sloccount-2.26.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr  4 09:25:39 2006
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Tue,  4 Apr 2006 02:25:39 -0700
Subject: owners owners.list,1.803,1.804
Message-ID: <200604040925.k349PfOC000609@cvs-int.fedora.redhat.com>

Author: hadess

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

Modified Files:
	owners.list 
Log Message:
- added sloccount



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.803
retrieving revision 1.804
diff -u -r1.803 -r1.804
--- owners.list	3 Apr 2006 21:17:42 -0000	1.803
+++ owners.list	4 Apr 2006 09:25:39 -0000	1.804
@@ -1325,6 +1325,7 @@
 Fedora Extras|sirius|Othello for Gnome|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|skencil|A vector drawing program|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|skkdic|Japanese dictionaries for skk input|petersen at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|sloccount|Measures source lines of code (SLOC) in programs|bnocera at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|smb4k|The SMB/CIFS Share Browser for KDE|mgarski at post.pl|extras-qa at fedoraproject.org|
 Fedora Extras|smbldap-tools|User and group administration tools for Samba/OpenLDAP|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|smeg|Simple menu editor for GNOME|jpmahowald at gmail.com|extras-qa at fedoraproject.org|foolish at guezz.net



From fedora-extras-commits at redhat.com  Tue Apr  4 10:07:10 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Tue,  4 Apr 2006 03:07:10 -0700
Subject: rpms/python-imaging/FC-4 python-imaging-giftrans.patch, 1.2,
	1.3 python-imaging.spec, 1.8, 1.9
Message-ID: <200604041007.k34A7CxZ002799@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/python-imaging/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2777

Modified Files:
	python-imaging.spec 
Added Files:
	python-imaging-giftrans.patch 
Log Message:
* Tue Apr  4 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-3
- Restore gif transparency patch. (bug #187875)


python-imaging-giftrans.patch:

Index: python-imaging-giftrans.patch
===================================================================
RCS file: python-imaging-giftrans.patch
diff -N python-imaging-giftrans.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ python-imaging-giftrans.patch	4 Apr 2006 10:07:10 -0000	1.3
@@ -0,0 +1,17 @@
+See http://bugs.debian.org/159693
+
+diff -Naru Imaging-1.1.4.orig/PIL/GifImagePlugin.py Imaging-1.1.4/PIL/GifImagePlugin.py
+--- Imaging-1.1.4.orig/PIL/GifImagePlugin.py	2003-05-06 23:44:16.000000000 +0300
++++ Imaging-1.1.4/PIL/GifImagePlugin.py	2004-10-09 21:12:12.635957206 +0300
+@@ -346,6 +346,11 @@
+         for i in range(maxcolor):
+             s.append(chr(i) * 3)
+ 
++    if im.info.has_key('transparency'):
++        transparentIndex = im.info['transparency']
++        s.append('!' + chr(0xf9) + chr(4) + chr(1) + chr(0) + chr(0) +
++                 chr(transparentIndex) + chr(0))
++
+     return s
+ 
+ def getdata(im, offset = (0, 0), **params):


Index: python-imaging.spec
===================================================================
RCS file: /cvs/extras/rpms/python-imaging/FC-4/python-imaging.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-imaging.spec	2 Apr 2006 21:59:25 -0000	1.8
+++ python-imaging.spec	4 Apr 2006 10:07:10 -0000	1.9
@@ -5,13 +5,14 @@
 Summary: Python's own image processing library
 Name: python-imaging
 Version: 1.1.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: Distributable
 Group: Development/Languages
 Source0: http://effbot.org/downloads/Imaging-%{version}.tar.gz
 Patch0: %{name}-no-xv.patch
 Patch1: %{name}-lib64.patch
+Patch2: %{name}-giftrans.patch
 URL: http://www.pythonware.com/products/pil/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -50,6 +51,7 @@
 %setup -q -n Imaging-%{version}
 %patch0 -p1
 %patch1 -p0
+%patch2 -p1
 
 # fix the interpreter path for Scripts/*.py
 cd Scripts
@@ -104,6 +106,9 @@
 
 
 %changelog
+* Tue Apr  4 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-3
+- Restore gif transparency patch. (bug #187875)
+
 * Sun Apr  2 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-2
 - Fix bug #185203 (Thanks to Rick L Vinyard Jr)
 



From fedora-extras-commits at redhat.com  Tue Apr  4 10:08:33 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Tue,  4 Apr 2006 03:08:33 -0700
Subject: rpms/python-imaging/FC-5 python-imaging.spec,1.8,1.9
Message-ID: <200604041008.k34A8Zqs002868@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/python-imaging/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2850

Modified Files:
	python-imaging.spec 
Log Message:
* Tue Apr  4 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-3
- Restore gif transparency patch. (bug #187875)



Index: python-imaging.spec
===================================================================
RCS file: /cvs/extras/rpms/python-imaging/FC-5/python-imaging.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-imaging.spec	2 Apr 2006 21:57:26 -0000	1.8
+++ python-imaging.spec	4 Apr 2006 10:08:33 -0000	1.9
@@ -5,13 +5,14 @@
 Summary: Python's own image processing library
 Name: python-imaging
 Version: 1.1.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: Distributable
 Group: Development/Languages
 Source0: http://effbot.org/downloads/Imaging-%{version}.tar.gz
 Patch0: %{name}-no-xv.patch
 Patch1: %{name}-lib64.patch
+Patch2: %{name}-giftrans.patch
 URL: http://www.pythonware.com/products/pil/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -50,6 +51,7 @@
 %setup -q -n Imaging-%{version}
 %patch0 -p1
 %patch1 -p0
+%patch2 -p1
 
 # fix the interpreter path for Scripts/*.py
 cd Scripts
@@ -104,6 +106,9 @@
 
 
 %changelog
+* Tue Apr  4 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-3
+- Restore gif transparency patch. (bug #187875)
+
 * Sun Apr  2 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-2
 - Fix bug #185203 (Thanks to Rick L Vinyard Jr)
 



From fedora-extras-commits at redhat.com  Tue Apr  4 10:27:26 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Tue,  4 Apr 2006 03:27:26 -0700
Subject: rpms/python-imaging/FC-4 python-imaging.spec,1.9,1.10
Message-ID: <200604041027.k34ARSWY003010@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/python-imaging/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2993

Modified Files:
	python-imaging.spec 
Log Message:
sync with FC-5 and devel


Index: python-imaging.spec
===================================================================
RCS file: /cvs/extras/rpms/python-imaging/FC-4/python-imaging.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- python-imaging.spec	4 Apr 2006 10:07:10 -0000	1.9
+++ python-imaging.spec	4 Apr 2006 10:27:26 -0000	1.10
@@ -5,7 +5,7 @@
 Summary: Python's own image processing library
 Name: python-imaging
 Version: 1.1.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: Distributable
 Group: Development/Languages
@@ -106,6 +106,9 @@
 
 
 %changelog
+* Tue Apr  4 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-4
+- Rebuild
+
 * Tue Apr  4 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-3
 - Restore gif transparency patch. (bug #187875)
 



From fedora-extras-commits at redhat.com  Tue Apr  4 10:28:14 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Tue,  4 Apr 2006 03:28:14 -0700
Subject: rpms/python-imaging/FC-5 python-imaging-giftrans.patch, 1.2,
	1.3 python-imaging.spec, 1.9, 1.10
Message-ID: <200604041028.k34ASGIv003044@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/python-imaging/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3022

Modified Files:
	python-imaging.spec 
Added Files:
	python-imaging-giftrans.patch 
Log Message:
* Tue Apr  4 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-4
- Rebuild


python-imaging-giftrans.patch:

Index: python-imaging-giftrans.patch
===================================================================
RCS file: python-imaging-giftrans.patch
diff -N python-imaging-giftrans.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ python-imaging-giftrans.patch	4 Apr 2006 10:28:14 -0000	1.3
@@ -0,0 +1,17 @@
+See http://bugs.debian.org/159693
+
+diff -Naru Imaging-1.1.4.orig/PIL/GifImagePlugin.py Imaging-1.1.4/PIL/GifImagePlugin.py
+--- Imaging-1.1.4.orig/PIL/GifImagePlugin.py	2003-05-06 23:44:16.000000000 +0300
++++ Imaging-1.1.4/PIL/GifImagePlugin.py	2004-10-09 21:12:12.635957206 +0300
+@@ -346,6 +346,11 @@
+         for i in range(maxcolor):
+             s.append(chr(i) * 3)
+ 
++    if im.info.has_key('transparency'):
++        transparentIndex = im.info['transparency']
++        s.append('!' + chr(0xf9) + chr(4) + chr(1) + chr(0) + chr(0) +
++                 chr(transparentIndex) + chr(0))
++
+     return s
+ 
+ def getdata(im, offset = (0, 0), **params):


Index: python-imaging.spec
===================================================================
RCS file: /cvs/extras/rpms/python-imaging/FC-5/python-imaging.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- python-imaging.spec	4 Apr 2006 10:08:33 -0000	1.9
+++ python-imaging.spec	4 Apr 2006 10:28:14 -0000	1.10
@@ -5,7 +5,7 @@
 Summary: Python's own image processing library
 Name: python-imaging
 Version: 1.1.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: Distributable
 Group: Development/Languages
@@ -106,6 +106,9 @@
 
 
 %changelog
+* Tue Apr  4 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-4
+- Rebuild
+
 * Tue Apr  4 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-3
 - Restore gif transparency patch. (bug #187875)
 



From fedora-extras-commits at redhat.com  Tue Apr  4 10:33:30 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Tue,  4 Apr 2006 03:33:30 -0700
Subject: rpms/python-imaging/devel python-imaging-giftrans.patch, 1.2,
	1.3 python-imaging.spec, 1.8, 1.9
Message-ID: <200604041033.k34AXWnJ003127@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/python-imaging/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3105

Modified Files:
	python-imaging.spec 
Added Files:
	python-imaging-giftrans.patch 
Log Message:
* Tue Apr  4 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-4
- Rebuild


python-imaging-giftrans.patch:

Index: python-imaging-giftrans.patch
===================================================================
RCS file: python-imaging-giftrans.patch
diff -N python-imaging-giftrans.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ python-imaging-giftrans.patch	4 Apr 2006 10:33:30 -0000	1.3
@@ -0,0 +1,17 @@
+See http://bugs.debian.org/159693
+
+diff -Naru Imaging-1.1.4.orig/PIL/GifImagePlugin.py Imaging-1.1.4/PIL/GifImagePlugin.py
+--- Imaging-1.1.4.orig/PIL/GifImagePlugin.py	2003-05-06 23:44:16.000000000 +0300
++++ Imaging-1.1.4/PIL/GifImagePlugin.py	2004-10-09 21:12:12.635957206 +0300
+@@ -346,6 +346,11 @@
+         for i in range(maxcolor):
+             s.append(chr(i) * 3)
+ 
++    if im.info.has_key('transparency'):
++        transparentIndex = im.info['transparency']
++        s.append('!' + chr(0xf9) + chr(4) + chr(1) + chr(0) + chr(0) +
++                 chr(transparentIndex) + chr(0))
++
+     return s
+ 
+ def getdata(im, offset = (0, 0), **params):


Index: python-imaging.spec
===================================================================
RCS file: /cvs/extras/rpms/python-imaging/devel/python-imaging.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-imaging.spec	2 Apr 2006 21:44:44 -0000	1.8
+++ python-imaging.spec	4 Apr 2006 10:33:30 -0000	1.9
@@ -5,13 +5,14 @@
 Summary: Python's own image processing library
 Name: python-imaging
 Version: 1.1.5
-Release: 2%{?dist}
+Release: 4%{?dist}
 
 License: Distributable
 Group: Development/Languages
 Source0: http://effbot.org/downloads/Imaging-%{version}.tar.gz
 Patch0: %{name}-no-xv.patch
 Patch1: %{name}-lib64.patch
+Patch2: %{name}-giftrans.patch
 URL: http://www.pythonware.com/products/pil/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -50,6 +51,7 @@
 %setup -q -n Imaging-%{version}
 %patch0 -p1
 %patch1 -p0
+%patch2 -p1
 
 # fix the interpreter path for Scripts/*.py
 cd Scripts
@@ -104,6 +106,12 @@
 
 
 %changelog
+* Tue Apr  4 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-4
+- Rebuild
+
+* Tue Apr  4 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-3
+- Restore gif transparency patch. (bug #187875)
+
 * Sun Apr  2 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-2
 - Fix bug #185203 (Thanks to Rick L Vinyard Jr)
 



From fedora-extras-commits at redhat.com  Tue Apr  4 12:36:50 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Tue,  4 Apr 2006 05:36:50 -0700
Subject: fedora-security/audit fc4,1.185,1.186 fc5,1.98,1.99
Message-ID: <200604041236.k34CaoUQ007905@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7885

Modified Files:
	fc4 fc5 
Log Message:
Add a new(ish) python issue.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- fc4	3 Apr 2006 21:52:08 -0000	1.185
+++ fc4	4 Apr 2006 12:36:47 -0000	1.186
@@ -7,6 +7,7 @@
 CVE-2006-1548 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) bz#187544
+CVE-2006-1542 VULNERABLE (python) bz#169046
 CVE-2006-1368 ** kernel
 CVE-2006-1354 VULNERABLE (freeradius) bz#186084
 CVE-2006-1343 ** kernel


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- fc5	3 Apr 2006 21:52:08 -0000	1.98
+++ fc5	4 Apr 2006 12:36:47 -0000	1.99
@@ -6,6 +6,7 @@
 CVE-2006-1548 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) bz#187544
+CVE-2006-1542 VULNERABLE (python) bz#169046
 CVE-2006-1368 ** kernel
 CVE-2006-1354 VULNERABLE (freeradius) bz#186084
 CVE-2006-1343 ** kernel



From fedora-extras-commits at redhat.com  Tue Apr  4 13:07:51 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Tue,  4 Apr 2006 06:07:51 -0700
Subject: rpms/scim-fcitx/devel scim-fcitx.spec,1.4,1.5
Message-ID: <200604041307.k34D7raV010011@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim-fcitx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9994

Modified Files:
	scim-fcitx.spec 
Log Message:
rebuild without libstdc++so7



Index: scim-fcitx.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-fcitx/devel/scim-fcitx.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- scim-fcitx.spec	2 Mar 2006 07:40:47 -0000	1.4
+++ scim-fcitx.spec	4 Apr 2006 13:07:51 -0000	1.5
@@ -1,8 +1,8 @@
-%define with_libstdc_preview 1 
+%define with_libstdc_preview 0
 
 Name:           scim-fcitx
 Version:        3.1.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        FCITX Input Method Engine for SCIM
 
 Group:          System Environment/Libraries
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Tue Apr  4 2006 Jens Petersen <petersen at redhat.com> - 3.1.1-5
+- rebuild without libstdc++so7
+
 * Thu Mar  2 2006 Jens Petersen <petersen at redhat.com> - 3.1.1-4
 - rebuild for FE5
 



From fedora-extras-commits at redhat.com  Tue Apr  4 13:10:09 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Tue,  4 Apr 2006 06:10:09 -0700
Subject: rpms/scim-input-pad/devel scim-input-pad.spec,1.5,1.6
Message-ID: <200604041310.k34DABue010101@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim-input-pad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10079

Modified Files:
	scim-input-pad.spec 
Log Message:
rebuild without libstdc++so7



Index: scim-input-pad.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-input-pad/devel/scim-input-pad.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- scim-input-pad.spec	13 Feb 2006 06:21:12 -0000	1.5
+++ scim-input-pad.spec	4 Apr 2006 13:10:08 -0000	1.6
@@ -1,8 +1,8 @@
-%define with_libstdc_preview 1 
+%define with_libstdc_preview 0
 
 Name:           scim-input-pad
 Version:        0.1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        On-screen Input Pad for SCIM
 
 Group:          System Environment/Libraries
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Tue Apr  4 2006 Jens Petersen <petersen at redhat.com> - 0.1.1-4
+- rebuild without libstdc++so7
+
 * Mon Feb 13 2006 Jens Petersen <petersen at redhat.com> - 0.1.1-3
 - build conditionally with libstdc++so7 preview library (#166041)
   - add with_libstdc_preview switch and tweak libtool to link against it



From fedora-extras-commits at redhat.com  Tue Apr  4 13:12:52 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Tue,  4 Apr 2006 06:12:52 -0700
Subject: rpms/scim-skk/devel scim-skk.spec,1.11,1.12
Message-ID: <200604041312.k34DCsp3010179@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim-skk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10162

Modified Files:
	scim-skk.spec 
Log Message:
rebuild without libstdc++so7



Index: scim-skk.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/devel/scim-skk.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- scim-skk.spec	13 Feb 2006 06:31:14 -0000	1.11
+++ scim-skk.spec	4 Apr 2006 13:12:52 -0000	1.12
@@ -1,8 +1,8 @@
-%define with_libstdc_preview 1 
+%define with_libstdc_preview 0
 
 Name:		scim-skk
 Version:	0.5.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	SCIM IMEngine module for skk
 
 Group:		System Environment/Libraries
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Tue Apr  4 2006 Jens Petersen <petersen at redhat.com> - 0.5.2-4
+- rebuild without libstdc++so7
+
 * Mon Feb 13 2006 Jens Petersen <petersen at redhat.com> - 0.5.2-3
 - build conditionally with libstdc++so7 preview library (#166041)
   - add with_libstdc_preview switch and tweak libtool to link against it



From fedora-extras-commits at redhat.com  Tue Apr  4 13:15:33 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Tue,  4 Apr 2006 06:15:33 -0700
Subject: rpms/scim-tomoe/devel scim-tomoe.spec,1.9,1.10
Message-ID: <200604041315.k34DFZgh010252@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim-tomoe/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10231

Modified Files:
	scim-tomoe.spec 
Log Message:
rebuild without libstdc++so7



Index: scim-tomoe.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-tomoe/devel/scim-tomoe.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- scim-tomoe.spec	1 Mar 2006 14:41:15 -0000	1.9
+++ scim-tomoe.spec	4 Apr 2006 13:15:33 -0000	1.10
@@ -1,8 +1,8 @@
-%define with_libstdc_preview 1 
+%define with_libstdc_preview 0
 
 Name:           scim-tomoe
 Version:        0.2.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Tomoe module for SCIM for Japanese handwritten input
 
 Group:          System Environment/Libraries
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Tue Apr  4 2006 Jens Petersen <petersen at redhat.com> - 0.2.0-4
+- rebuild without libstdc++so7
+
 * Wed Mar  1 2006 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 0.2-3
 - update to 0.2
 



From fedora-extras-commits at redhat.com  Tue Apr  4 13:43:15 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Tue,  4 Apr 2006 06:43:15 -0700
Subject: kadischi/livecd_generator kadischi.py, 1.8, 1.9 livecd-mkinitrd.sh,
	1.6, 1.7
Message-ID: <200604041343.k34DhjPb010437@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi/livecd_generator
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10402/kadischi/livecd_generator

Modified Files:
	kadischi.py livecd-mkinitrd.sh 
Log Message:
Tighten up some small loose ends, reflect new filesystem option in the manual


Index: kadischi.py
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/kadischi.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kadischi.py	31 Mar 2006 21:03:36 -0000	1.8
+++ kadischi.py	4 Apr 2006 13:43:13 -0000	1.9
@@ -259,7 +259,12 @@
 
 flc_log ('making initrd image')
 
-run ("%s %s %s" % (normalize_path([bindir, 'livecd-mkinitrd.sh']), sysdir, kernel_version), builddir)
+if options.filesystem == 'squashfs':
+    kmods = 'fs/squashfs drivers/block/loop.ko'
+else:
+    kmods = ''
+
+run ("KMODULES='%s' %s %s %s" % (kmods, normalize_path([bindir, 'livecd-mkinitrd.sh']), sysdir, kernel_version), builddir)
 
 # move files 
 


Index: livecd-mkinitrd.sh
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/livecd-mkinitrd.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- livecd-mkinitrd.sh	30 Mar 2006 05:46:06 -0000	1.6
+++ livecd-mkinitrd.sh	4 Apr 2006 13:43:13 -0000	1.7
@@ -23,6 +23,7 @@
 rc=0
 
 IMAGESIZE=10000
+KMODULES="drivers/parport $KMODULES"
 
  . /etc/kadischi/kadischi.conf
 
@@ -256,7 +257,7 @@
 inst $rootdir/etc/modprobe.d/modprobe.conf.dist "$MNTIMAGE/etc/modprobe.d/modprobe.conf.dist"
 inst $rootdir/lib/modules/$kernel/modules.dep "$MNTIMAGE/lib/modules/$kernel/modules.dep"
 
-MODULES=$(findmodules drivers/parport fs/squashfs drivers/block/loop.ko)
+MODULES=$(findmodules $KMODULES)
 for MODULE in $MODULES; do
     instmodule $MODULE
 done



From fedora-extras-commits at redhat.com  Tue Apr  4 13:43:15 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Tue,  4 Apr 2006 06:43:15 -0700
Subject: kadischi/man kadischi.1,1.1,1.2
Message-ID: <200604041343.k34DhkoF010440@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi/man
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10402/kadischi/man

Modified Files:
	kadischi.1 
Log Message:
Tighten up some small loose ends, reflect new filesystem option in the manual


Index: kadischi.1
===================================================================
RCS file: /cvs/devel/kadischi/man/kadischi.1,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kadischi.1	30 Mar 2006 05:51:46 -0000	1.1
+++ kadischi.1	4 Apr 2006 13:43:13 -0000	1.2
@@ -6,7 +6,7 @@
 kadischi - generate a live ISO9660 CDROM image from an RPM repository
 .SH SYNOPSIS
 kadischi [--text|--graphical] [--kickstart=<ks-file>] [-C|--cmdline]
-REPOSITORY [-f] IMAGE
+[--filesystem=<fstype>] REPOSITORY [-f] IMAGE
 .SH DESCRIPTION
 .B kadischi(1)
 generates a live ISO9660 CDROM image from an RPM repository tree by invoking
@@ -29,6 +29,10 @@
 Run strictly in command line mode requiring no user input.
 .IP --cmdline
 Same as -C
+.IP --filesystem
+The filesystem type which should be used for the root filesystem of the LiveCD,
+where fstype is one of 'zisofs' or 'squashfs'.
+The default is zisofs.
 .IP -f
 Overwrite an existing ISO9660 image, if it already exists.
 .SH FILES
@@ -44,9 +48,8 @@
 .BR kadischi.conf(5)
 for more information.
 .SH BUGS
-The module shvarFile is not always imported properly or is not imported
-sometimes at all, resulting in the build directory needing to be
-manually cleaned up.
+Probably many. If you happen to run across one not listed in the
+current bugzilla database you can report it via http://bugzilla.redhat.com
 .SH AVAILABILITY
 Kadischi is available via anonymous CVS:
 .nf



From fedora-extras-commits at redhat.com  Tue Apr  4 17:28:58 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue,  4 Apr 2006 10:28:58 -0700
Subject: rpms/edb/devel .cvsignore, 1.5, 1.6 edb.spec, 1.12, 1.13 sources,
	1.5, 1.6
Message-ID: <200604041729.k34HT0vK024837@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	.cvsignore edb.spec sources 
Log Message:
Buh-bye GTK+ 1.x


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/edb/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Feb 2006 08:12:28 -0000	1.5
+++ .cvsignore	4 Apr 2006 17:28:58 -0000	1.6
@@ -1 +1 @@
-edb-1.0.5.005.tar.gz
+edb-1.0.5.007.tar.gz


Index: edb.spec
===================================================================
RCS file: /cvs/extras/rpms/edb/devel/edb.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- edb.spec	14 Feb 2006 05:00:20 -0000	1.12
+++ edb.spec	4 Apr 2006 17:28:58 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           edb
-Version:        1.0.5.005
+Version:        1.0.5.007
 Release:        1%{?dist}
 
 Summary:        A database convenience library wrapped around BDB
@@ -8,7 +8,7 @@
 URL:            http://enlightenment.org/index.php?id=23
 Source0:        http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  gtk+-devel, ncurses-devel zlib-devel which
+BuildRequires:  ncurses-devel zlib-devel which
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -34,19 +34,11 @@
 %description    ncurses
 edb-ncurses is a frontend for edb that uses ncurses
 
-%package        gtk
-Summary:        GTK+ 1.x frontend for edb
-Group:          Applications/Databases
-Requires:       %{name} = %{version}-%{release}
-
-%description    gtk
-edb-gtk is a frontend for edb that uses GTK+ 1.x
-
 %prep
 %setup -q
 
 %build
-%configure --disable-static
+%configure --disable-static --disable-gtk
 make %{?_smp_mflags}
 
 %install
@@ -79,11 +71,11 @@
 %defattr(-,root,root,-)
 %{_bindir}/edb_vt_ed
 
-%files gtk
-%defattr(-,root,root,-)
-%{_bindir}/edb_gtk_ed
-
 %changelog
+* Tue Apr  4 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5.007-1
+- Upstream update
+- Drop GTK+ 1.x requirement
+
 * Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5.005-1
 - Upstream update
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/edb/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Feb 2006 08:12:28 -0000	1.5
+++ sources	4 Apr 2006 17:28:58 -0000	1.6
@@ -1 +1 @@
-6b6eaa69ea05bf4b4972554f34fd8919  edb-1.0.5.005.tar.gz
+e5d8dcb5995913ae6b7f205e7ac28dbe  edb-1.0.5.007.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr  4 17:38:20 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue,  4 Apr 2006 10:38:20 -0700
Subject: rpms/gdl/devel .cvsignore, 1.3, 1.4 gdl.spec, 1.10, 1.11 sources,
	1.3, 1.4
Message-ID: <200604041738.k34HcMpe024931@cvs-int.fedora.redhat.com>

Author: orion

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

Modified Files:
	.cvsignore gdl.spec sources 
Log Message:
Update to 0.9pre



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gdl/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Nov 2005 18:26:29 -0000	1.3
+++ .cvsignore	4 Apr 2006 17:38:20 -0000	1.4
@@ -1 +1 @@
-gdl-0.8.11.tar.gz
+gdl-0.9pre.tar.gz


Index: gdl.spec
===================================================================
RCS file: /cvs/extras/rpms/gdl/devel/gdl.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gdl.spec	24 Feb 2006 20:10:58 -0000	1.10
+++ gdl.spec	4 Apr 2006 17:38:20 -0000	1.11
@@ -1,12 +1,12 @@
 Name:           gdl
-Version:        0.8.11
-Release:        4%{?dist}
+Version:        0.9
+Release:        0.pre%{?dist}
 Summary:        GNU Data Language
 
 Group:          Applications/Engineering
 License:        GPL
 URL:            http://gnudatalanguage.sourceforge.net/
-Source0:        http://dl.sf.net/gnudata/%{name}-%{version}.tar.gz
+Source0:        http://dl.sf.net/gnudata/%{name}-%{version}pre.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  readline-devel, ncurses-devel
@@ -23,11 +23,11 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}pre
 
 
 %build
-%configure --disable-static --with-fftw \
+%configure --disable-dependency-tracking --disable-static --with-fftw \
            INCLUDES="-I/usr/include/netcdf-3 -I/usr/include/hdf" \
            LIBS="-L%{_libdir}/netcdf-3 -L%{_libdir}/hdf"
 make %{?_smp_mflags}
@@ -49,6 +49,9 @@
 
 
 %changelog
+* Mon Apr  3 2006 - Orion Poplawski <orion at cora.nwra.com> - 0.9-0.pre
+- Update to 0.9pre
+
 * Fri Feb 24 2006 - Orion Poplawski <orion at cora.nwra.com> - 0.8.11-4
 - Add --with-fftw to configure
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gdl/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Nov 2005 18:26:29 -0000	1.3
+++ sources	4 Apr 2006 17:38:20 -0000	1.4
@@ -1 +1 @@
-837365b860889de03483cf84ae15b9b3  gdl-0.8.11.tar.gz
+b05a9eea1bad9fef0b386f16231a4140  gdl-0.9pre.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr  4 17:44:46 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue,  4 Apr 2006 10:44:46 -0700
Subject: rpms/xemacs/FC-5 xemacs-21.4.19-find-paths-pkgdir.patch, NONE,
	1.1 xemacs.spec, 1.21, 1.22 menubar-games.patch, 1.1,
	NONE xemacs-21.4.10-find-paths-pkgdir.patch, 1.1,
	NONE xemacs-21.4.12-find-paths-libexec-lib64.patch, 1.1, NONE
Message-ID: <200604041744.k34Himd8025039@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	xemacs.spec 
Added Files:
	xemacs-21.4.19-find-paths-pkgdir.patch 
Removed Files:
	menubar-games.patch xemacs-21.4.10-find-paths-pkgdir.patch 
	xemacs-21.4.12-find-paths-libexec-lib64.patch 
Log Message:
* Fri Mar 31 2006 Ville Skytt?? <ville.skytta at iki.fi> - 21.4.19-4
- Build with gcc 3.2.x (#183643).
- Don't ship patch backup files.


xemacs-21.4.19-find-paths-pkgdir.patch:

--- NEW FILE xemacs-21.4.19-find-paths-pkgdir.patch ---
--- xemacs-21.4.19/lisp/find-paths.el~	2005-12-28 17:58:54.000000000 +0200
+++ xemacs-21.4.19/lisp/find-paths.el	2006-03-31 00:03:36.000000000 +0300
@@ -103,8 +103,8 @@
   (or
    ;; installed
    (paths-file-readable-directory-p (paths-construct-path (list directory
-								"lib"
-								emacs-program-name)))
+								"share"
+								(construct-emacs-version-name))))
    ;; in-place or windows-nt
    (and
     (paths-file-readable-directory-p (paths-construct-path (list directory "lisp")))
@@ -216,7 +216,7 @@
   (paths-find-emacs-directory roots
 			      (file-name-as-directory
 			       (paths-construct-path (list
-						      "lib"
+						      "share"
 						      emacs-program-name)))
 			      base
 			      envvar default


Index: xemacs.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs/FC-5/xemacs.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xemacs.spec	19 Mar 2006 09:47:24 -0000	1.21
+++ xemacs.spec	4 Apr 2006 17:44:46 -0000	1.22
@@ -3,13 +3,14 @@
 %bcond_without  debug
 %bcond_without  mule
 %bcond_with     stackprot
+%bcond_without  gcc32
 
 %define pkgdir  %{_datadir}/xemacs
 %define exectop %{_libdir}/xemacs-%{version}
 
 Name:           xemacs
 Version:        21.4.19
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -24,10 +25,8 @@
 Source23:       dotxemacs-init.el
 Source24:       default.el
 Patch1:         xemacs-21.4.19-x-paths.patch
-Patch10:        xemacs-21.4.10-find-paths-pkgdir.patch
+Patch10:        xemacs-21.4.19-find-paths-pkgdir.patch
 Patch11:        movemail-mktemp.patch
-Patch14:        menubar-games.patch
-Patch15:        xemacs-21.4.12-find-paths-libexec-lib64.patch
 Patch16:        xemacs-21.4.12-mk-nochk-features.patch
 Patch18:        xemacs-21.4.13-dump-paths-lispdir.patch
 Patch19:        xemacs-21.4.18-utf8-fonts.patch
@@ -64,6 +63,9 @@
 %endif # xaw3d
 %endif # gtk
 BuildRequires:  xmkmf
+%if %{with gcc32}
+BuildRequires:  compat-gcc-32
+%endif
 BuildRequires:  libXau-devel
 # TODO: verify these build deps wrt gtk/xaw3d builds
 BuildRequires:  xorg-x11-xbitmaps
@@ -156,11 +158,9 @@
 # make find-paths.el look in datadir
 %patch10 -p1
 # fix "libexec" on multilib
-%ifarch x86_64 s390x
-%patch15 -p1 -b .lib64
-%endif
+sed -i -e 's/"lib"/"%{_lib}"/' lisp/find-paths.el
 # remove game we shouldn't ship
-%patch14 -p1
+sed -i -e /tetris/d lisp/menubar-items.el
 # make lisp dir and mule-lisp dir be the source lisp dirs (not in datadir)
 %patch18 -p1
 sed -i -e "s|\@srcdir\@|$PWD|" lisp/dump-paths.el
@@ -192,6 +192,13 @@
 CFLAGS="$(echo $CFLAGS | sed -e 's/-fstack-protector\s*//g')"
 CFLAGS="$(echo $CFLAGS | sed -e 's/--param=ssp-buffer-size=[0-9]\+\s*//')"
 %endif
+%if %{with gcc32}
+CFLAGS="$(echo $CFLAGS | sed -e 's/mtune/mcpu/')"
+CFLAGS="$(echo $CFLAGS | sed -e 's/-mcpu=generic//')"
+CFLAGS="$(echo $CFLAGS | sed -e 's/-fstack-protector\s*//g')"
+CFLAGS="$(echo $CFLAGS | sed -e 's/--param=ssp-buffer-size=[0-9]\+\s*//')"
+export CC=gcc32
+%endif
 export CFLAGS
 
 # XEmacs still uses Autoconf 2.13 and doesn't know --sbindir, --sysconfdir,
@@ -455,6 +462,10 @@
 
 
 %changelog
+* Fri Mar 31 2006 Ville Skytt?? <ville.skytta at iki.fi> - 21.4.19-4
+- Build with gcc 3.2.x (#183643).
+- Don't ship patch backup files.
+
 * Sat Mar 18 2006 Ville Skytt?? <ville.skytta at iki.fi> - 21.4.19-3
 - Build without -fstack-protector by default for now (#183643).
 


--- menubar-games.patch DELETED ---


--- xemacs-21.4.10-find-paths-pkgdir.patch DELETED ---


--- xemacs-21.4.12-find-paths-libexec-lib64.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr  4 19:18:07 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Tue,  4 Apr 2006 12:18:07 -0700
Subject: fedora-security/audit fc4,1.186,1.187 fc5,1.99,1.100
Message-ID: <200604041918.k34JI7AX029466@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29446

Modified Files:
	fc4 fc5 
Log Message:
Note a new OOo CVE id.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- fc4	4 Apr 2006 12:36:47 -0000	1.186
+++ fc4	4 Apr 2006 19:18:05 -0000	1.187
@@ -1447,6 +1447,7 @@
 
 older, happened to deal with at same time:
 
+CVE-2002-2210 ignore (openoffice) binary install only (not rpm install)
 CVE-2002-2204 ignore (rpm) by design
 CVE-2002-2196 version (samba, fixed 2.2.5)
 CVE-2002-2185 version (kernel, fixed 2.6.15) [since FEODRA-2006-077]


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- fc5	4 Apr 2006 12:36:47 -0000	1.99
+++ fc5	4 Apr 2006 19:18:05 -0000	1.100
@@ -1443,6 +1443,7 @@
 
 older, happened to deal with at same time:
 
+CVE-2002-2210 ignore (openoffice) binary install only (not rpm install)
 CVE-2002-2204 ignore (rpm) by design
 CVE-2002-2196 version (samba, fixed 2.2.5)
 CVE-2002-2185 version (kernel, fixed 2.6.15)



From fedora-extras-commits at redhat.com  Tue Apr  4 19:39:43 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  4 Apr 2006 12:39:43 -0700
Subject: rpms/k3b-extras/devel k3b-extras.spec,1.2,1.3
Message-ID: <200604041939.k34Jdjd2029601@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	k3b-extras.spec 
Log Message:
* Tue Apr 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.12.14-4
- Conflicts: k3b-extras-nonfree < 0.12.14-2



Index: k3b-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/k3b-extras/devel/k3b-extras.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- k3b-extras.spec	1 Apr 2006 23:57:38 -0000	1.2
+++ k3b-extras.spec	4 Apr 2006 19:39:43 -0000	1.3
@@ -2,7 +2,7 @@
 Name:           k3b-extras
 Summary:        Free codec plugins for k3b
 Version:        0.12.14
-Release:        2%{?dist}
+Release:        4%{?dist}
 
 Group:          Applications/Multimedia
 License:        GPL
@@ -20,6 +20,9 @@
 # It already Requires: libk3b.so.2 libk3bdevice.so.2, isn't that enough?  -- Rex
 Requires:       k3b >= 0.12 
 
+# older versions contained sndfile_decoder
+Conflicts: k3b-extras-nonfree < 0.12.14-2
+
 %description
 Free decoder/encoder plugins for k3b, including:
 musepack decoder (libmpcdec)
@@ -68,6 +71,9 @@
 
 
 %changelog
+* Tue Apr 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.12.14-4
+- Conflicts: k3b-extras-nonfree < 0.12.14-2
+
 * Sat Apr 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.12.14-2
 - drop extraneous BR: taglib-devel, libmusicbrainz-devel
 - Requires: k3b >= 0.12



From fedora-extras-commits at redhat.com  Tue Apr  4 19:49:45 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  4 Apr 2006 12:49:45 -0700
Subject: rpms/k3b-extras/FC-5 k3b-extras.spec,1.2,1.3
Message-ID: <200604041949.k34Jnmkw029680@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	k3b-extras.spec 
Log Message:
* Tue Apr 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.12.14-4
- Conflicts: k3b-extras-nonfree < 0.12.14-2



Index: k3b-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/k3b-extras/FC-5/k3b-extras.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- k3b-extras.spec	1 Apr 2006 23:57:38 -0000	1.2
+++ k3b-extras.spec	4 Apr 2006 19:49:45 -0000	1.3
@@ -2,7 +2,7 @@
 Name:           k3b-extras
 Summary:        Free codec plugins for k3b
 Version:        0.12.14
-Release:        2%{?dist}
+Release:        4%{?dist}
 
 Group:          Applications/Multimedia
 License:        GPL
@@ -20,6 +20,9 @@
 # It already Requires: libk3b.so.2 libk3bdevice.so.2, isn't that enough?  -- Rex
 Requires:       k3b >= 0.12 
 
+# older versions contained sndfile_decoder
+Conflicts: k3b-extras-nonfree < 0.12.14-2
+
 %description
 Free decoder/encoder plugins for k3b, including:
 musepack decoder (libmpcdec)
@@ -68,6 +71,9 @@
 
 
 %changelog
+* Tue Apr 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.12.14-4
+- Conflicts: k3b-extras-nonfree < 0.12.14-2
+
 * Sat Apr 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.12.14-2
 - drop extraneous BR: taglib-devel, libmusicbrainz-devel
 - Requires: k3b >= 0.12



From fedora-extras-commits at redhat.com  Tue Apr  4 19:51:33 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  4 Apr 2006 12:51:33 -0700
Subject: rpms/k3b-extras/FC-4 k3b-extras.spec,1.2,1.3
Message-ID: <200604041951.k34JpZJ6029742@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	k3b-extras.spec 
Log Message:
* Tue Apr 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.12.14-4
- Conflicts: k3b-extras-nonfree < 0.12.14-2



Index: k3b-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/k3b-extras/FC-4/k3b-extras.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- k3b-extras.spec	1 Apr 2006 23:57:38 -0000	1.2
+++ k3b-extras.spec	4 Apr 2006 19:51:33 -0000	1.3
@@ -2,7 +2,7 @@
 Name:           k3b-extras
 Summary:        Free codec plugins for k3b
 Version:        0.12.14
-Release:        2%{?dist}
+Release:        4%{?dist}
 
 Group:          Applications/Multimedia
 License:        GPL
@@ -20,6 +20,9 @@
 # It already Requires: libk3b.so.2 libk3bdevice.so.2, isn't that enough?  -- Rex
 Requires:       k3b >= 0.12 
 
+# older versions contained sndfile_decoder
+Conflicts: k3b-extras-nonfree < 0.12.14-2
+
 %description
 Free decoder/encoder plugins for k3b, including:
 musepack decoder (libmpcdec)
@@ -68,6 +71,9 @@
 
 
 %changelog
+* Tue Apr 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.12.14-4
+- Conflicts: k3b-extras-nonfree < 0.12.14-2
+
 * Sat Apr 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.12.14-2
 - drop extraneous BR: taglib-devel, libmusicbrainz-devel
 - Requires: k3b >= 0.12



From fedora-extras-commits at redhat.com  Tue Apr  4 20:03:39 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Tue,  4 Apr 2006 13:03:39 -0700
Subject: rpms/exim/devel exim-4.61-c-before-d.patch, NONE, 1.1 .cvsignore,
	1.8, 1.9 exim.spec, 1.16, 1.17 sources, 1.8,
	1.9 exim-4.60-mon-overflow.patch, 1.1, NONE
Message-ID: <200604042003.k34K3fqE031844@cvs-int.fedora.redhat.com>

Author: dwmw2

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

Modified Files:
	.cvsignore exim.spec sources 
Added Files:
	exim-4.61-c-before-d.patch 
Removed Files:
	exim-4.60-mon-overflow.patch 
Log Message:
4.61

exim-4.61-c-before-d.patch:

--- NEW FILE exim-4.61-c-before-d.patch ---
Index: src/acl.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/acl.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- src/acl.c	6 Mar 2006 16:05:12 -0000	1.57
+++ src/acl.c	4 Apr 2006 17:05:45 -0000	1.58
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/acl.c,v 1.57 2006/03/06 16:05:12 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/acl.c,v 1.58 2006/04/04 17:05:45 fanf2 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -202,8 +202,8 @@ at the outer level. In the other cases, 
 checking functions. */
 
 static uschar cond_expand_at_top[] = {
-  TRUE,    /* add_header */
   TRUE,    /* acl */
+  TRUE,    /* add_header */
   FALSE,   /* authenticated */
 #ifdef EXPERIMENTAL_BRIGHTMAIL
   TRUE,    /* bmi_optin */
@@ -260,8 +260,8 @@ static uschar cond_expand_at_top[] = {
 /* Flags to identify the modifiers */
 
 static uschar cond_modifiers[] = {
-  TRUE,    /* add_header */
   FALSE,   /* acl */
+  TRUE,    /* add_header */
   FALSE,   /* authenticated */
 #ifdef EXPERIMENTAL_BRIGHTMAIL
   TRUE,    /* bmi_optin */


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/exim/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	29 Nov 2005 11:41:06 -0000	1.8
+++ .cvsignore	4 Apr 2006 20:03:39 -0000	1.9
@@ -1,2 +1,2 @@
 sa-exim-4.2.tar.gz
-exim-4.60.tar.bz2
+exim-4.61.tar.bz2


Index: exim.spec
===================================================================
RCS file: /cvs/extras/rpms/exim/devel/exim.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- exim.spec	23 Mar 2006 12:28:38 -0000	1.16
+++ exim.spec	4 Apr 2006 20:03:39 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: The exim mail transfer agent
 Name: exim
-Version: 4.60
-Release: 5%{?dist}
+Version: 4.61
+Release: 1%{?dist}
 License: GPL
 Url: http://www.exim.org/
 Group: System Environment/Daemons
@@ -25,7 +25,7 @@
 Patch13: exim-4.43-pamconfig.patch
 Patch14: exim-4.50-spamdconf.patch
 Patch15: exim-4.52-dynamic-pcre.patch
-Patch16: exim-4.60-mon-overflow.patch
+Patch16: exim-4.61-c-before-d.patch
 
 Requires: /etc/aliases
 BuildRequires: db4-devel openssl-devel openldap-devel pam-devel
@@ -80,7 +80,7 @@
 %patch13 -p1 -b .pam
 %patch14 -p1 -b .spamd
 %patch15 -p1 -b .pcre
-%patch16 -p1
+%patch16 -p0
 
 %build
 %ifnarch s390 s390x
@@ -289,6 +289,9 @@
 %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO}
 
 %changelog
+* Tue Apr  4 2006 David Woodhouse <dwmw2 at redhat.com> 4.61-1
+- Update to 4.61
+
 * Thu Mar 23 2006 David Woodhouse <dwmw2 at redhat.com> 4.60-5
 - Fix eximon buffer overflow (#186303)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/exim/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	29 Nov 2005 11:41:06 -0000	1.8
+++ sources	4 Apr 2006 20:03:39 -0000	1.9
@@ -1,2 +1,2 @@
 ad76f73c6b3d01caa88078e3e622745a  sa-exim-4.2.tar.gz
-eed3c8fc393cf7ccc9c1079b28516128  exim-4.60.tar.bz2
+f6bbf99a6f63c0f5045a1779e7e810c4  exim-4.61.tar.bz2


--- exim-4.60-mon-overflow.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr  4 20:05:58 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Tue,  4 Apr 2006 13:05:58 -0700
Subject: rpms/exim/FC-5 exim-4.61-c-before-d.patch, NONE, 1.1 .cvsignore, 1.8,
	1.9 exim.spec, 1.16, 1.17 sources, 1.8,
	1.9 exim-4.60-mon-overflow.patch, 1.1, NONE
Message-ID: <200604042006.k34K60Ow031926@cvs-int.fedora.redhat.com>

Author: dwmw2

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

Modified Files:
	.cvsignore exim.spec sources 
Added Files:
	exim-4.61-c-before-d.patch 
Removed Files:
	exim-4.60-mon-overflow.patch 
Log Message:
4.61

exim-4.61-c-before-d.patch:

--- NEW FILE exim-4.61-c-before-d.patch ---
Index: src/acl.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/acl.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- src/acl.c	6 Mar 2006 16:05:12 -0000	1.57
+++ src/acl.c	4 Apr 2006 17:05:45 -0000	1.58
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/acl.c,v 1.57 2006/03/06 16:05:12 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/acl.c,v 1.58 2006/04/04 17:05:45 fanf2 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -202,8 +202,8 @@ at the outer level. In the other cases, 
 checking functions. */
 
 static uschar cond_expand_at_top[] = {
-  TRUE,    /* add_header */
   TRUE,    /* acl */
+  TRUE,    /* add_header */
   FALSE,   /* authenticated */
 #ifdef EXPERIMENTAL_BRIGHTMAIL
   TRUE,    /* bmi_optin */
@@ -260,8 +260,8 @@ static uschar cond_expand_at_top[] = {
 /* Flags to identify the modifiers */
 
 static uschar cond_modifiers[] = {
-  TRUE,    /* add_header */
   FALSE,   /* acl */
+  TRUE,    /* add_header */
   FALSE,   /* authenticated */
 #ifdef EXPERIMENTAL_BRIGHTMAIL
   TRUE,    /* bmi_optin */


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/exim/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	29 Nov 2005 11:41:06 -0000	1.8
+++ .cvsignore	4 Apr 2006 20:05:57 -0000	1.9
@@ -1,2 +1,2 @@
 sa-exim-4.2.tar.gz
-exim-4.60.tar.bz2
+exim-4.61.tar.bz2


Index: exim.spec
===================================================================
RCS file: /cvs/extras/rpms/exim/FC-5/exim.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- exim.spec	23 Mar 2006 12:27:47 -0000	1.16
+++ exim.spec	4 Apr 2006 20:05:57 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: The exim mail transfer agent
 Name: exim
-Version: 4.60
-Release: 5%{?dist}
+Version: 4.61
+Release: 1%{?dist}
 License: GPL
 Url: http://www.exim.org/
 Group: System Environment/Daemons
@@ -25,7 +25,7 @@
 Patch13: exim-4.43-pamconfig.patch
 Patch14: exim-4.50-spamdconf.patch
 Patch15: exim-4.52-dynamic-pcre.patch
-Patch16: exim-4.60-mon-overflow.patch
+Patch16: exim-4.61-c-before-d.patch
 
 Requires: /etc/aliases
 BuildRequires: db4-devel openssl-devel openldap-devel pam-devel
@@ -80,7 +80,7 @@
 %patch13 -p1 -b .pam
 %patch14 -p1 -b .spamd
 %patch15 -p1 -b .pcre
-%patch16 -p1
+%patch16 -p0
 
 %build
 %ifnarch s390 s390x
@@ -289,6 +289,9 @@
 %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO}
 
 %changelog
+* Tue Apr  4 2006 David Woodhouse <dwmw2 at redhat.com> 4.61-1
+- Update to 4.61
+
 * Thu Mar 23 2006 David Woodhouse <dwmw2 at redhat.com> 4.60-5
 - Fix eximon buffer overflow (#186303)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/exim/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	29 Nov 2005 11:41:06 -0000	1.8
+++ sources	4 Apr 2006 20:05:57 -0000	1.9
@@ -1,2 +1,2 @@
 ad76f73c6b3d01caa88078e3e622745a  sa-exim-4.2.tar.gz
-eed3c8fc393cf7ccc9c1079b28516128  exim-4.60.tar.bz2
+f6bbf99a6f63c0f5045a1779e7e810c4  exim-4.61.tar.bz2


--- exim-4.60-mon-overflow.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr  4 20:18:14 2006
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Tue,  4 Apr 2006 13:18:14 -0700
Subject: CVSROOT avail, 1.11, 1.12 config, 1.3, 1.4 loginfo, 1.11,
	1.12 modules, 1.3, 1.4
Message-ID: <200604042018.k34KIEaR032640@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/eclipse/CVSROOT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32617

Modified Files:
	avail config loginfo modules 
Log Message:
misc tweaks


Index: avail
===================================================================
RCS file: /cvs/eclipse/CVSROOT/avail,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- avail	17 Aug 2005 13:56:54 -0000	1.11
+++ avail	4 Apr 2006 20:18:12 -0000	1.12
@@ -13,6 +13,6 @@
 # Lock down the CVSROOT directory so ACLs make sense
 unavail | | CVSROOT
 # Access to all files to policy setters
-avail | notting,sopwith,wtogami,katzj | CVSROOT
+avail | ifoox,notting,sopwith,wtogami,katzj | CVSROOT
 # trusted developers that can add modules
 avail | | CVSROOT/modules


Index: config
===================================================================
RCS file: /cvs/eclipse/CVSROOT/config,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config	13 Jul 2005 15:47:14 -0000	1.3
+++ config	4 Apr 2006 20:18:12 -0000	1.4
@@ -2,7 +2,7 @@
 #SystemAuth=no
 
 # Put CVS lock files in this directory rather than directly in the repository.
-LockDir=/var/lock/cvs/devel
+LockDir=/var/lock/cvs/eclipse
 
 # Set `TopLevelAdmin' to `yes' to create a CVS directory at the top
 # level of the new working directory when using the `cvs checkout'


Index: loginfo
===================================================================
RCS file: /cvs/eclipse/CVSROOT/loginfo,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- loginfo	13 Jul 2005 15:47:14 -0000	1.11
+++ loginfo	4 Apr 2006 20:18:12 -0000	1.12
@@ -26,5 +26,5 @@
 # or
 #DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog
 
-ALL	$CVSROOT/CVSROOT/syncmail %{sVv} cvsextras at fedora.redhat.com
+ALL	$CVSROOT/CVSROOT/syncmail %{sVv} cvseclipse at fedora.redhat.com
 ALL /cvs/extras/CVSROOT/dolog.pl -r /cvs/devel localdelivery at cvs-int.fedora.redhat.com


Index: modules
===================================================================
RCS file: /cvs/eclipse/CVSROOT/modules,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- modules	13 Jul 2005 15:47:38 -0000	1.3
+++ modules	4 Apr 2006 20:18:12 -0000	1.4
@@ -25,4 +25,4 @@
 # can be useful for creating a module that consists of many directories
 # spread out over the entire source repository.
 
-devel .
+eclipse .



From fedora-extras-commits at redhat.com  Tue Apr  4 20:27:21 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Tue,  4 Apr 2006 13:27:21 -0700
Subject: rpms/exim/FC-4 exim-4.61-c-before-d.patch, NONE, 1.1 .cvsignore, 1.6,
	1.7 exim.spec, 1.11, 1.12 sources, 1.7,
	1.8 exim-4.60-mon-overflow.patch, 1.1, NONE
Message-ID: <200604042027.k34KRNKV032693@cvs-int.fedora.redhat.com>

Author: dwmw2

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

Modified Files:
	.cvsignore exim.spec sources 
Added Files:
	exim-4.61-c-before-d.patch 
Removed Files:
	exim-4.60-mon-overflow.patch 
Log Message:
4.61

exim-4.61-c-before-d.patch:

--- NEW FILE exim-4.61-c-before-d.patch ---
Index: src/acl.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/acl.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- src/acl.c	6 Mar 2006 16:05:12 -0000	1.57
+++ src/acl.c	4 Apr 2006 17:05:45 -0000	1.58
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/acl.c,v 1.57 2006/03/06 16:05:12 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/acl.c,v 1.58 2006/04/04 17:05:45 fanf2 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -202,8 +202,8 @@ at the outer level. In the other cases, 
 checking functions. */
 
 static uschar cond_expand_at_top[] = {
-  TRUE,    /* add_header */
   TRUE,    /* acl */
+  TRUE,    /* add_header */
   FALSE,   /* authenticated */
 #ifdef EXPERIMENTAL_BRIGHTMAIL
   TRUE,    /* bmi_optin */
@@ -260,8 +260,8 @@ static uschar cond_expand_at_top[] = {
 /* Flags to identify the modifiers */
 
 static uschar cond_modifiers[] = {
-  TRUE,    /* add_header */
   FALSE,   /* acl */
+  TRUE,    /* add_header */
   FALSE,   /* authenticated */
 #ifdef EXPERIMENTAL_BRIGHTMAIL
   TRUE,    /* bmi_optin */


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/exim/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	5 Oct 2005 10:13:18 -0000	1.6
+++ .cvsignore	4 Apr 2006 20:27:21 -0000	1.7
@@ -1,2 +1,2 @@
 sa-exim-4.2.tar.gz
-exim-4.54.tar.bz2
+exim-4.61.tar.bz2


Index: exim.spec
===================================================================
RCS file: /cvs/extras/rpms/exim/FC-4/exim.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- exim.spec	23 Mar 2006 12:26:42 -0000	1.11
+++ exim.spec	4 Apr 2006 20:27:21 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: The exim mail transfer agent
 Name: exim
-Version: 4.60
-Release: 5%{?dist}
+Version: 4.61
+Release: 1%{?dist}
 License: GPL
 Url: http://www.exim.org/
 Group: System Environment/Daemons
@@ -25,7 +25,7 @@
 Patch13: exim-4.43-pamconfig.patch
 Patch14: exim-4.50-spamdconf.patch
 Patch15: exim-4.52-dynamic-pcre.patch
-Patch16: exim-4.60-mon-overflow.patch
+Patch16: exim-4.61-c-before-d.patch
 
 Requires: /etc/aliases
 BuildRequires: db4-devel openssl-devel openldap-devel pam-devel
@@ -79,7 +79,7 @@
 %patch13 -p1 -b .pam
 %patch14 -p1 -b .spamd
 %patch15 -p1 -b .pcre
-%patch16 -p1
+%patch16 -p0
 
 %build
 %ifnarch s390 s390x
@@ -288,6 +288,9 @@
 %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO}
 
 %changelog
+* Tue Apr  4 2006 David Woodhouse <dwmw2 at redhat.com> 4.61-1
+- Update to 4.61
+
 * Thu Mar 23 2006 David Woodhouse <dwmw2 at redhat.com> 4.60-5
 - Fix eximon buffer overflow (#186303)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/exim/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	19 Mar 2006 11:57:24 -0000	1.7
+++ sources	4 Apr 2006 20:27:21 -0000	1.8
@@ -1,2 +1,2 @@
 ad76f73c6b3d01caa88078e3e622745a  sa-exim-4.2.tar.gz
-eed3c8fc393cf7ccc9c1079b28516128  exim-4.60.tar.bz2
+f6bbf99a6f63c0f5045a1779e7e810c4  exim-4.61.tar.bz2


--- exim-4.60-mon-overflow.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr  4 20:38:45 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Tue,  4 Apr 2006 13:38:45 -0700
Subject: rpms/exim-doc/FC-5 .cvsignore, 1.3, 1.4 exim-doc.spec, 1.2,
	1.3 sources, 1.4, 1.5
Message-ID: <200604042038.k34Kcl9P000307@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/exim-doc/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32754

Modified Files:
	.cvsignore exim-doc.spec sources 
Log Message:
4.61


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/exim-doc/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Nov 2005 11:35:29 -0000	1.3
+++ .cvsignore	4 Apr 2006 20:38:45 -0000	1.4
@@ -1,6 +1,6 @@
 FAQ-html-20050415.tar.bz2
 config.samples-20050415.tar.bz2
-exim-html-4.60.tar.bz2
-exim-pdf-4.60.tar.bz2
-exim-postscript-4.60.tar.bz2
-exim-texinfo-4.60.tar.bz2
+exim-html-4.61.tar.bz2
+exim-pdf-4.61.tar.bz2
+exim-postscript-4.61.tar.bz2
+exim-texinfo-4.61.tar.bz2


Index: exim-doc.spec
===================================================================
RCS file: /cvs/extras/rpms/exim-doc/FC-5/exim-doc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- exim-doc.spec	29 Nov 2005 11:35:29 -0000	1.2
+++ exim-doc.spec	4 Apr 2006 20:38:45 -0000	1.3
@@ -1,6 +1,6 @@
 Summary: Documentation for the exim mail transfer agent
 Name: exim-doc
-Version: 4.60
+Version: 4.61
 Release: 1
 License: GPL
 Url: http://www.exim.org/
@@ -45,6 +45,9 @@
 %doc faq html ps pdf texinfo config.samples
 
 %changelog
+* Tue Apr  4 2006 David Woodhouse <dwmw2 at redhat.com> 4.61-1
+- Update to 4.61
+
 * Tue Nov 29 2005 David Woodhouse <dwmw2 at redhat.com> 4.60-1
 - Update to 4.60
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/exim-doc/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Nov 2005 11:35:29 -0000	1.4
+++ sources	4 Apr 2006 20:38:45 -0000	1.5
@@ -1,6 +1,6 @@
 ecceef7c8d1a352caf6c2992a6f4cb69  FAQ-html-20050415.tar.bz2
 4b93321938a800caa6127c48ad60a42b  config.samples-20050415.tar.bz2
-4c49f68d0b3dbff8f81db3e6b212c961  exim-html-4.60.tar.bz2
-eb2b6536e42e476240686de8c86a40f3  exim-pdf-4.60.tar.bz2
-99b5cd2874f083003ddb8e56dc4ba45d  exim-postscript-4.60.tar.bz2
-ba88e4814472be8de8deed36ec80877a  exim-texinfo-4.60.tar.bz2
+77d042dad6b4ebcb757ec2b02a7761f8  exim-html-4.61.tar.bz2
+5ac27708c9aef892f199e9b769d15300  exim-pdf-4.61.tar.bz2
+84dc0c3154a432bfea2afc59c46000ce  exim-postscript-4.61.tar.bz2
+f86c26fda8871c72892b3ff586677310  exim-texinfo-4.61.tar.bz2



From fedora-extras-commits at redhat.com  Tue Apr  4 20:39:10 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Tue,  4 Apr 2006 13:39:10 -0700
Subject: rpms/exim-doc/FC-5 exim-doc.spec,1.3,1.4
Message-ID: <200604042039.k34KdCXT000328@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/exim-doc/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv311

Modified Files:
	exim-doc.spec 
Log Message:
dist tag


Index: exim-doc.spec
===================================================================
RCS file: /cvs/extras/rpms/exim-doc/FC-5/exim-doc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- exim-doc.spec	4 Apr 2006 20:38:45 -0000	1.3
+++ exim-doc.spec	4 Apr 2006 20:39:10 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Documentation for the exim mail transfer agent
 Name: exim-doc
 Version: 4.61
-Release: 1
+Release: 1%{?dist}
 License: GPL
 Url: http://www.exim.org/
 Group: Documentation



From fedora-extras-commits at redhat.com  Tue Apr  4 20:40:01 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Tue,  4 Apr 2006 13:40:01 -0700
Subject: rpms/exim-doc/devel .cvsignore, 1.3, 1.4 exim-doc.spec, 1.2,
	1.3 sources, 1.4, 1.5
Message-ID: <200604042040.k34Ke34i000386@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/exim-doc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv365

Modified Files:
	.cvsignore exim-doc.spec sources 
Log Message:
4.61


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/exim-doc/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Nov 2005 11:35:29 -0000	1.3
+++ .cvsignore	4 Apr 2006 20:40:01 -0000	1.4
@@ -1,6 +1,6 @@
 FAQ-html-20050415.tar.bz2
 config.samples-20050415.tar.bz2
-exim-html-4.60.tar.bz2
-exim-pdf-4.60.tar.bz2
-exim-postscript-4.60.tar.bz2
-exim-texinfo-4.60.tar.bz2
+exim-html-4.61.tar.bz2
+exim-pdf-4.61.tar.bz2
+exim-postscript-4.61.tar.bz2
+exim-texinfo-4.61.tar.bz2


Index: exim-doc.spec
===================================================================
RCS file: /cvs/extras/rpms/exim-doc/devel/exim-doc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- exim-doc.spec	29 Nov 2005 11:35:29 -0000	1.2
+++ exim-doc.spec	4 Apr 2006 20:40:01 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Documentation for the exim mail transfer agent
 Name: exim-doc
-Version: 4.60
-Release: 1
+Version: 4.61
+Release: 1%{?dist}
 License: GPL
 Url: http://www.exim.org/
 Group: Documentation
@@ -45,6 +45,9 @@
 %doc faq html ps pdf texinfo config.samples
 
 %changelog
+* Tue Apr  4 2006 David Woodhouse <dwmw2 at redhat.com> 4.61-1
+- Update to 4.61
+
 * Tue Nov 29 2005 David Woodhouse <dwmw2 at redhat.com> 4.60-1
 - Update to 4.60
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/exim-doc/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Nov 2005 11:35:29 -0000	1.4
+++ sources	4 Apr 2006 20:40:01 -0000	1.5
@@ -1,6 +1,6 @@
 ecceef7c8d1a352caf6c2992a6f4cb69  FAQ-html-20050415.tar.bz2
 4b93321938a800caa6127c48ad60a42b  config.samples-20050415.tar.bz2
-4c49f68d0b3dbff8f81db3e6b212c961  exim-html-4.60.tar.bz2
-eb2b6536e42e476240686de8c86a40f3  exim-pdf-4.60.tar.bz2
-99b5cd2874f083003ddb8e56dc4ba45d  exim-postscript-4.60.tar.bz2
-ba88e4814472be8de8deed36ec80877a  exim-texinfo-4.60.tar.bz2
+77d042dad6b4ebcb757ec2b02a7761f8  exim-html-4.61.tar.bz2
+5ac27708c9aef892f199e9b769d15300  exim-pdf-4.61.tar.bz2
+84dc0c3154a432bfea2afc59c46000ce  exim-postscript-4.61.tar.bz2
+f86c26fda8871c72892b3ff586677310  exim-texinfo-4.61.tar.bz2



From fedora-extras-commits at redhat.com  Tue Apr  4 20:40:15 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Tue,  4 Apr 2006 13:40:15 -0700
Subject: rpms/exim-doc/FC-4 .cvsignore, 1.2, 1.3 exim-doc.spec, 1.1,
	1.2 sources, 1.3, 1.4
Message-ID: <200604042040.k34KeHXp000447@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/exim-doc/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv426

Modified Files:
	.cvsignore exim-doc.spec sources 
Log Message:
4.61


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/exim-doc/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Apr 2005 03:57:27 -0000	1.2
+++ .cvsignore	4 Apr 2006 20:40:15 -0000	1.3
@@ -1,6 +1,6 @@
 FAQ-html-20050415.tar.bz2
 config.samples-20050415.tar.bz2
-exim-html-4.50.tar.bz2
-exim-pdf-4.50.tar.bz2
-exim-postscript-4.50.tar.bz2
-exim-texinfo-4.50.tar.bz2
+exim-html-4.61.tar.bz2
+exim-pdf-4.61.tar.bz2
+exim-postscript-4.61.tar.bz2
+exim-texinfo-4.61.tar.bz2


Index: exim-doc.spec
===================================================================
RCS file: /cvs/extras/rpms/exim-doc/FC-4/exim-doc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- exim-doc.spec	19 Apr 2005 02:39:21 -0000	1.1
+++ exim-doc.spec	4 Apr 2006 20:40:15 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Documentation for the exim mail transfer agent
 Name: exim-doc
-Version: 4.50
-Release: 1
+Version: 4.61
+Release: 1%{?dist}
 License: GPL
 Url: http://www.exim.org/
 Group: Documentation
@@ -45,5 +45,11 @@
 %doc faq html ps pdf texinfo config.samples
 
 %changelog
+* Tue Apr  4 2006 David Woodhouse <dwmw2 at redhat.com> 4.61-1
+- Update to 4.61
+
+* Tue Nov 29 2005 David Woodhouse <dwmw2 at redhat.com> 4.60-1
+- Update to 4.60
+
 * Tue Feb 22 2005 David Woodhouse <dwmw2 at redhat.com> 4.50-1
 - Move exim-doc into a separate package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/exim-doc/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Apr 2005 03:57:27 -0000	1.3
+++ sources	4 Apr 2006 20:40:15 -0000	1.4
@@ -1,6 +1,6 @@
 ecceef7c8d1a352caf6c2992a6f4cb69  FAQ-html-20050415.tar.bz2
 4b93321938a800caa6127c48ad60a42b  config.samples-20050415.tar.bz2
-cf0fdf161523646716c734135260f5b3  exim-html-4.50.tar.bz2
-edfb7348c849a4981d86dfca41800960  exim-pdf-4.50.tar.bz2
-f34025260098e1f37e9bc3146d6e13c7  exim-postscript-4.50.tar.bz2
-a12993436e9943083e3ce5b76cf96b11  exim-texinfo-4.50.tar.bz2
+77d042dad6b4ebcb757ec2b02a7761f8  exim-html-4.61.tar.bz2
+5ac27708c9aef892f199e9b769d15300  exim-pdf-4.61.tar.bz2
+84dc0c3154a432bfea2afc59c46000ce  exim-postscript-4.61.tar.bz2
+f86c26fda8871c72892b3ff586677310  exim-texinfo-4.61.tar.bz2



From fedora-extras-commits at redhat.com  Fri Apr  7 06:19:07 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu,  6 Apr 2006 23:19:07 -0700
Subject: rpms/nessus-core - New directory
Message-ID: <200604070619.k376J9qx004659@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/nessus-core
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4638/nessus-core

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




From fedora-extras-commits at redhat.com  Fri Apr  7 06:19:08 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu,  6 Apr 2006 23:19:08 -0700
Subject: rpms/nessus-core/devel - New directory
Message-ID: <200604070619.k376JAlR004662@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/nessus-core/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4638/nessus-core/devel

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




From fedora-extras-commits at redhat.com  Fri Apr  7 06:19:30 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu,  6 Apr 2006 23:19:30 -0700
Subject: rpms/nessus-core/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604070619.k376JWAE004719@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/nessus-core/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4683/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module nessus-core


--- 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 Apr  7 06:19:30 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu,  6 Apr 2006 23:19:30 -0700
Subject: rpms/nessus-core Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604070619.k376JWOQ004716@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/nessus-core
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4683

Added Files:
	Makefile import.log 
Log Message:
Setup of module nessus-core


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Apr  7 06:21:25 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu,  6 Apr 2006 23:21:25 -0700
Subject: rpms/nessus-core import.log,1.1,1.2
Message-ID: <200604070621.k376LRs1004866@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/nessus-core
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4819

Modified Files:
	import.log 
Log Message:
auto-import nessus-core-2.2.6-3 on branch devel from nessus-core-2.2.6-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/nessus-core/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Apr 2006 06:19:30 -0000	1.1
+++ import.log	7 Apr 2006 06:21:25 -0000	1.2
@@ -0,0 +1 @@
+nessus-core-2_2_6-3:HEAD:nessus-core-2.2.6-3.src.rpm:1144390874



From fedora-extras-commits at redhat.com  Fri Apr  7 06:21:26 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu,  6 Apr 2006 23:21:26 -0700
Subject: rpms/nessus-core/devel nessus-core-2.2.4.Makefile.patch, NONE,
	1.1 nessus-core-2.2.4.config.h.in.patch, NONE,
	1.1 nessus-core-2.2.4.configure.in.patch, NONE,
	1.1 nessus-core-2.2.4.configure.patch, NONE,
	1.1 nessus-core-2.2.4.gd.patch, NONE,
	1.1 nessus-core-2.2.4.nessus-adduser.in.patch, NONE,
	1.1 nessus-core-2.2.4.nessus-mkcert.patch, NONE,
	1.1 nessus-core-2.2.4.nessus-rmuser.in.patch, NONE,
	1.1 nessus-core-2.2.4.nessus.tmpl.in.patch, NONE,
	1.1 nessus-core-2.2.4.pid.patch, NONE,
	1.1 nessus-core-2.2.4.pki.patch, NONE, 1.1 nessus-core.spec,
	NONE, 1.1 nessus.desktop, NONE, 1.1 nessusd.init, NONE,
	1.1 nessusd.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604070621.k376LS7Y004893@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/nessus-core/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4819/devel

Modified Files:
	.cvsignore sources 
Added Files:
	nessus-core-2.2.4.Makefile.patch 
	nessus-core-2.2.4.config.h.in.patch 
	nessus-core-2.2.4.configure.in.patch 
	nessus-core-2.2.4.configure.patch nessus-core-2.2.4.gd.patch 
	nessus-core-2.2.4.nessus-adduser.in.patch 
	nessus-core-2.2.4.nessus-mkcert.patch 
	nessus-core-2.2.4.nessus-rmuser.in.patch 
	nessus-core-2.2.4.nessus.tmpl.in.patch 
	nessus-core-2.2.4.pid.patch nessus-core-2.2.4.pki.patch 
	nessus-core.spec nessus.desktop nessusd.init nessusd.log 
Log Message:
auto-import nessus-core-2.2.6-3 on branch devel from nessus-core-2.2.6-3.src.rpm

nessus-core-2.2.4.Makefile.patch:

--- NEW FILE nessus-core-2.2.4.Makefile.patch ---
diff -Nrup nessus-core.orig/Makefile nessus-core/Makefile
--- nessus-core.orig/Makefile	2005-03-14 23:33:13.000000000 +0100
+++ nessus-core/Makefile	2005-07-05 19:40:57.000000000 +0200
@@ -34,7 +34,7 @@ install-bin:
 	test -d $(DESTDIR)${localstatedir} || $(INSTALL_DIR) -m 755 $(DESTDIR)${localstatedir}
 	test -d $(DESTDIR)${NESSUSD_STATEDIR} || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR}
 	test -d $(DESTDIR)${NESSUSD_STATEDIR}/users || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR}/users
-	test -d $(DESTDIR)${NESSUSD_STATEDIR}/logs  || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR}/logs
+	test -d $(DESTDIR)${NESSUSD_LOGDIR}  || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_LOGDIR}
 	test -d $(DESTDIR)${NESSUSD_STATEDIR}/tmp || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR}/tmp
 	test -d $(DESTDIR)${NESSUSD_STATEDIR}/jobs  || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR}/jobs
 	test -d $(DESTDIR)${NESSUSD_LOGDIR} || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_LOGDIR}

nessus-core-2.2.4.config.h.in.patch:

--- NEW FILE nessus-core-2.2.4.config.h.in.patch ---
--- nessus-core.orig/include/config.h.in	2004-10-07 16:46:32.000000000 +0200
+++ nessus-core/include/config.h.in	2005-07-03 13:10:59.000000000 +0200
@@ -74,9 +74,9 @@
 #define NESSUSD_LOGS     NESSUSD_LOGDIR
 #define NESSUSD_LOGINS   NESSUSD_STATEDIR "/users"
 #define NESSUSD_JOBS	NESSUSD_STATEDIR  "/jobs"
-#define NESSUSD_CERTS	NESSUSD_STATEDIR "/certs"
+#define NESSUSD_CERTS	NESSUSD_PKIDIR "/certs"
 
-#define NESSUSD_CA	NESSUSD_SHAREDSTATEDIR "/CA"
+#define NESSUSD_CA	NESSUSD_PKIDIR "/CA"
 
 
 

nessus-core-2.2.4.configure.in.patch:

--- NEW FILE nessus-core-2.2.4.configure.in.patch ---
--- nessus-core.orig/configure.in	2005-02-08 02:40:42.000000000 +0100
+++ nessus-core/configure.in	2005-07-03 16:43:12.000000000 +0200
@@ -705,14 +705,16 @@
 dnl Final step : substitute what we want to
 
 NESSUSD_CONFDIR='${sysconfdir}'
-NESSUSD_STATEDIR='${localstatedir}/nessus'
+NESSUSD_STATEDIR='${localstatedir}/lib/nessus'
 NESSUSD_SHAREDSTATEDIR='${sharedstatedir}/nessus'
+NESSUSD_PIDDIR='${localstatedir}/run'
+NESSUSD_PKIDIR='${sysconfdir}/pki/nessus'
 NESSUSD_DATADIR='${sysconfdir}/nessus'
 NESSUSD_LIBDIR='${libdir}/nessus'
-NESSUSD_LOGDIR='${localstatedir}/nessus/logs'
+NESSUSD_LOGDIR='${localstatedir}/log/nessus'
 
 NESSUSD_PLUGINS='${NESSUSD_LIBDIR}/plugins'
-NESSUSD_REPORTS='${NESSUSD_LIBDIR}/reports'
+NESSUSD_REPORTS='${NESSUSD_LOGDIR}/reports'
 
  
 # The following directories are now passed into the compile
@@ -721,11 +723,11 @@
 # everything works okay.
 #
 #AC_DEFINE_UNQUOTED(NESSUSD_CONFDIR,   "${sysconfdir}")
-#AC_DEFINE(NESSUSD_STATEDIR,  "${localstatedir}/nessus'")
+#AC_DEFINE(NESSUSD_STATEDIR,  "${localstatedir}/lib/nessus'")
 #AC_DEFINE(NESSUSD_DATADIR,   "'${sysconfdir}/nessus")
 #AC_DEFINE(NESSUSD_LIBDIR,    "${libdir}/nessus")
 #AC_DEFINE(NESSUSD_PLUGINS,   "${libdir}/nessus/plugins")
-#AC_DEFINE(NESSUSD_REPORTS,   "${libdir}/nessus/reports")
+#AC_DEFINE(NESSUSD_REPORTS,   "${localstatedir}/log/nessus/reports")
 man_nessus_1=doc/nessus.1
 man_nessusd_8=doc/nessusd.8
 
@@ -751,6 +753,8 @@
 AC_SUBST(NESSUSD_CONFDIR)
 AC_SUBST(NESSUSD_STATEDIR)
 AC_SUBST(NESSUSD_SHAREDSTATEDIR)
+AC_SUBST(NESSUSD_PIDDIR)
+AC_SUBST(NESSUSD_PKIDIR)
 AC_SUBST(NESSUSD_DATADIR)
 AC_SUBST(NESSUSD_LIBDIR)
 AC_SUBST(NESSUSD_PLUGINS)

nessus-core-2.2.4.configure.patch:

--- NEW FILE nessus-core-2.2.4.configure.patch ---
--- nessus-core.orig/configure	2005-02-08 02:40:42.000000000 +0100
+++ nessus-core/configure	2005-07-03 16:41:03.000000000 +0200
@@ -5671,14 +5671,16 @@
 
 
 NESSUSD_CONFDIR='${sysconfdir}'
-NESSUSD_STATEDIR='${localstatedir}/nessus'
+NESSUSD_STATEDIR='${localstatedir}/lib/nessus'
 NESSUSD_SHAREDSTATEDIR='${sharedstatedir}/nessus'
+NESSUSD_PIDDIR='${localstatedir}/run'
+NESSUSD_PKIDIR='${sysconfdir}/pki/nessus'
 NESSUSD_DATADIR='${sysconfdir}/nessus'
 NESSUSD_LIBDIR='${libdir}/nessus'
-NESSUSD_LOGDIR='${localstatedir}/nessus/logs'
+NESSUSD_LOGDIR='${localstatedir}/log/nessus'
 
 NESSUSD_PLUGINS='${NESSUSD_LIBDIR}/plugins'
-NESSUSD_REPORTS='${NESSUSD_LIBDIR}/reports'
+NESSUSD_REPORTS='${NESSUSD_LOGDIR}/reports'
 
  
 # The following directories are now passed into the compile
@@ -5687,11 +5689,11 @@
 # everything works okay.
 #
 #AC_DEFINE_UNQUOTED(NESSUSD_CONFDIR,   "${sysconfdir}")
-#AC_DEFINE(NESSUSD_STATEDIR,  "${localstatedir}/nessus'")
+#AC_DEFINE(NESSUSD_STATEDIR,  "${localstatedir}/lib/nessus'")
 #AC_DEFINE(NESSUSD_DATADIR,   "'${sysconfdir}/nessus")
 #AC_DEFINE(NESSUSD_LIBDIR,    "${libdir}/nessus")
 #AC_DEFINE(NESSUSD_PLUGINS,   "${libdir}/nessus/plugins")
-#AC_DEFINE(NESSUSD_REPORTS,   "${libdir}/nessus/reports")
+#AC_DEFINE(NESSUSD_REPORTS,   "${localstatedir}/log/nessus/reports")
 man_nessus_1=doc/nessus.1
 man_nessusd_8=doc/nessusd.8
 
@@ -5967,6 +5969,8 @@
 s%@NESSUSD_CONFDIR@%$NESSUSD_CONFDIR%g
 s%@NESSUSD_STATEDIR@%$NESSUSD_STATEDIR%g
 s%@NESSUSD_SHAREDSTATEDIR@%$NESSUSD_SHAREDSTATEDIR%g
+s%@NESSUSD_PIDDIR@%$NESSUSD_PIDDIR%g
+s%@NESSUSD_PKIDIR@%$NESSUSD_PKIDIR%g
 s%@NESSUSD_DATADIR@%$NESSUSD_DATADIR%g
 s%@NESSUSD_LIBDIR@%$NESSUSD_LIBDIR%g
 s%@NESSUSD_PLUGINS@%$NESSUSD_PLUGINS%g

nessus-core-2.2.4.gd.patch:

--- NEW FILE nessus-core-2.2.4.gd.patch ---
diff -ur nessus-core.orig/nessus/gdchart0.94b/makefile nessus-core/nessus/gdchart0.94b/makefile
--- nessus-core.orig/nessus/gdchart0.94b/makefile	2002-09-10 09:32:55.000000000 +0200
+++ nessus-core/nessus/gdchart0.94b/makefile	2005-07-03 16:04:50.000000000 +0200
@@ -1,27 +1,27 @@
 include ../../nessus.tmpl
 GDC_INCL = .
-GD_INCL  = gd1.3
-GD_LIB   = gd1.3
+GD_INCL  = /usr/include
+GD_LIB   = /usr/lib
 IINCL    = $(CFLAGS) `sh ../cflags`
 
 
 
-all: gdc.o gdchart.o price_conv.o gdc_pie.o $(GD_LIB)/libgd.a
+all: gdc.o gdchart.o price_conv.o gdc_pie.o
 
 # compile the samples
-gdc_samp1: gdc.o gdchart.o price_conv.o gdc_samp1.o $(GD_LIB)/libgd.a
+gdc_samp1: gdc.o gdchart.o price_conv.o gdc_samp1.o
 	$(CC) -o gdc_samp1 gdc.o gdchart.o price_conv.o gdc_samp1.o -L$(GD_LIB) -lgd -lm
 
 gdc_samp1.o: $(GDC_INCL)/gdc.h $(GDC_INCL)/gdchart.h gdc_samp1.c
 	$(CC) $(IINCL) -I$(GDC_INCL) -c gdc_samp1.c
 
-gdc_samp2: gdc.o gdchart.o price_conv.o gdc_samp2.o $(GD_LIB)/libgd.a
+gdc_samp2: gdc.o gdchart.o price_conv.o gdc_samp2.o
 	$(CC) $(IINCL) -o gdc_samp2 gdc.o gdchart.o price_conv.o gdc_samp2.o -L$(GD_LIB) -lgd -lm
 
 gdc_samp2.o: $(GDC_INCL)/gdc.h $(GDC_INCL)/gdchart.h gdc_samp2.c
 	$(CC) $(IINCL) -I$(GDC_INCL) -c gdc_samp2.c
 
-gdc_pie_samp: gdc.o gdc_pie.o price_conv.o gdc_pie_samp.o $(GD_LIB)/libgd.a
+gdc_pie_samp: gdc.o gdc_pie.o price_conv.o gdc_pie_samp.o
 	$(CC) $(IINCL) -o gdc_pie_samp gdc.o gdc_pie.o price_conv.o gdc_pie_samp.o -L$(GD_LIB) -lgd -lm
 
 gdc_pie_samp.o: $(GDC_INCL)/gdc.h $(GDC_INCL)/gdcpie.h gdc_pie_samp.c
@@ -40,11 +40,7 @@
 gdchart.o: $(GDC_INCL)/gdc.h $(GDC_INCL)/gdchart.h gdchart.c
 	$(CC) $(IINCL) -I$(GD_INCL) -I$(GDC_INCL) -c gdchart.c
 
-$(GD_LIB)/libgd.a:
-	cd $(GD_LIB) ; $(MAKE) -f Makefile libgd.a
-
 # --- clean ---
 clean:
 	rm -f *.o gdc_samp1 gdc_samp2 gdc_pie_samp
-	cd $(GD_LIB) ; $(MAKE) -f Makefile clean
 
diff -ur nessus-core.orig/nessus/Makefile nessus-core/nessus/Makefile
--- nessus-core.orig/nessus/Makefile	2003-02-22 14:47:43.000000000 +0100
+++ nessus-core/nessus/Makefile	2005-07-03 16:18:55.000000000 +0200
@@ -1,9 +1,9 @@
 include ../nessus.tmpl
 
 GTKLIBS= $(GTKCONFIG_LIBS) $(GLIBCONFIG_LIBS)
-INCLUDE = ${include} $(GTKCONFIG_CFLAGS) $(GLIBCONFIG_CFLAGS) -Igdchart0.94b -Igdchart0.94b/gd1.3
+INCLUDE = ${include} $(GTKCONFIG_CFLAGS) $(GLIBCONFIG_CFLAGS) -Igdchart0.94b
 LIBS = `$(NESSUSCONFIG) --libs` $(X_LIBS) $(X_CFLAGS) $(GTKLIBS) \
-	$(RUN_LIBS) $(C_R_LIB) gdchart0.94b/gd1.3/libgd.a -lm 
+	$(RUN_LIBS) $(C_R_LIB) -lgd -lm 
 
 NESSUS_INCLUDE=`sh ./cflags`	
 

nessus-core-2.2.4.nessus-adduser.in.patch:

--- NEW FILE nessus-core-2.2.4.nessus-adduser.in.patch ---
--- nessus-core.orig/nessus-adduser.in	2004-12-10 20:40:20.000000000 +0100
+++ nessus-core/nessus-adduser.in	2005-07-03 15:13:23.000000000 +0200
@@ -124,7 +124,7 @@
 do
  echo $Xn "Login : $Xc"
  read login
- if [ -d $localstatedir/nessus/users/$login ];
+ if [ -d $localstatedir/lib/nessus/users/$login ];
  then
    echo "This login already exists. Choose another one"
  else
@@ -250,9 +250,7 @@
 #echo "$login:$password" > $TMPDIR/adduser.$$
 	
 
-chmod 0700 "$localstatedir/nessus/"
-mkdir -p "$localstatedir/nessus/users/$login"
-chmod 0700 "$localstatedir/nessus/users/$login"
+mkdir -m 0700 -p "$localstatedir/lib/nessus/users/$login"
 
 
 
@@ -263,14 +261,12 @@
 # Create the auth. dir, which contains the user rules,
 # password, and plugin acl
 #
-mkdir -p "$localstatedir/nessus/users/$login/auth"
-chmod 0700 "$localstatedir/nessus/users/$login/auth"
+mkdir -m 0700 -p "$localstatedir/lib/nessus/users/$login/auth"
 
 #
 # Create the plugins dir, which contains the user plugins
 #
-mkdir -p "$localstatedir/nessus/users/$login/plugins"
-chmod 0700 "$localstatedir/nessus/users/$login/plugins"
+mkdir -m 0700 -p "$localstatedir/lib/nessus/users/$login/plugins"
 
 
 
@@ -282,17 +278,17 @@
 	}
 	SEED=`(echo $SEED; date; df; ls -l; echo $URANDOM) | $MD5CMD | awk '{print $1}'`
 	H=`echo $Xn $SEED$password$Xc | $MD5CMD | awk '{print $1}'`
-	echo $H $SEED > "$localstatedir/nessus/users/$login/auth/hash"
+	echo $H $SEED > "$localstatedir/lib/nessus/users/$login/auth/hash"
     else
-	echo "$password" > "$localstatedir/nessus/users/$login/auth/password"
+	echo "$password" > "$localstatedir/lib/nessus/users/$login/auth/password"
     fi
 elif [ "$auth" = "cert" ]; then
-	echo "$dn" > "$localstatedir/nessus/users/$login/auth/dname"
+	echo "$dn" > "$localstatedir/lib/nessus/users/$login/auth/dname"
 fi
 
 
 
-cp $TMPDIR/nessus-adduser.$$/rules.$$ "$localstatedir/nessus/users/$login/auth/rules"
+cp $TMPDIR/nessus-adduser.$$/rules.$$ "$localstatedir/lib/nessus/users/$login/auth/rules"
 
 
 

nessus-core-2.2.4.nessus-mkcert.patch:

--- NEW FILE nessus-core-2.2.4.nessus-mkcert.patch ---
--- nessus-core.orig/nessus-mkcert-client.in	2004-12-10 20:40:20.000000000 +0100
+++ nessus-core/nessus-mkcert-client.in	2005-07-03 14:31:27.000000000 +0200
@@ -84,8 +84,8 @@
 
 
 
-NESSUSPRIV="$localstatedir/nessus/CA"
-NESSUSPUB="$sharedstatedir/nessus/CA"
+NESSUSPRIV="@NESSUSD_PKIDIR@/private/CA"
+NESSUSPUB="@NESSUSD_PKIDIR@/CA"
 
 while [ ! -d "$NESSUSPRIV" ]; do
     echo_no_nl "Nessus server 'private' directory: "
@@ -126,7 +126,7 @@
 done
 
 if [ "$R" = "y" ]; then
-    USERSDIR=$localstatedir/nessus/users
+    USERSDIR=$localstatedir/lib/nessus/users
     while [ ! -d "$USERSDIR" ]; do
 	echo "$USERSDIR: not a directory"
 	echo_no_nl "Users directory? "
--- nessus-core.orig/nessus-mkcert.in	2004-12-10 20:40:22.000000000 +0100
+++ nessus-core/nessus-mkcert.in	2005-07-03 15:01:34.000000000 +0200
@@ -92,8 +92,8 @@
    exit 1
 esac
      
-NESSUSPRIV="$localstatedir/nessus/CA"
-NESSUSPUB="$sharedstatedir/nessus/CA"
+NESSUSPRIV="@NESSUSD_PKIDIR@/private/CA"
+NESSUSPUB="@NESSUSD_PKIDIR@/CA"
 if [ ! -d "$NESSUSPRIV" ]; then
     mkdir -p "$NESSUSPRIV"
     chmod 0700 "$NESSUSPRIV"

nessus-core-2.2.4.nessus-rmuser.in.patch:

--- NEW FILE nessus-core-2.2.4.nessus-rmuser.in.patch ---
--- nessus-core.orig/nessus-rmuser.in	2005-03-17 23:09:39.000000000 +0100
+++ nessus-core/nessus-rmuser.in	2005-07-03 14:57:03.000000000 +0200
@@ -55,9 +55,9 @@
 	exit 1
 	}
 
-if [ -d "$localstatedir/nessus/users/$login" ];
+if [ -d "$localstatedir/lib/nessus/users/$login" ];
 then
- rm -rf "$localstatedir/nessus/users/$login"
+ rm -rf "$localstatedir/lib/nessus/users/$login"
  echo "user removed."
 else
  echo "This user does not exist"

nessus-core-2.2.4.nessus.tmpl.in.patch:

--- NEW FILE nessus-core-2.2.4.nessus.tmpl.in.patch ---
--- nessus-core.orig/nessus.tmpl.in	2003-01-21 11:52:47.000000000 +0100
+++ nessus-core/nessus.tmpl.in	2005-07-03 13:37:06.000000000 +0200
@@ -46,6 +46,8 @@
 NESSUSD_CONFDIR=@NESSUSD_CONFDIR@
 NESSUSD_STATEDIR=@NESSUSD_STATEDIR@
 NESSUSD_SHAREDSTATEDIR=@NESSUSD_SHAREDSTATEDIR@
+NESSUSD_PIDDIR=@NESSUSD_PIDDIR@
+NESSUSD_PKIDIR=@NESSUSD_PKIDIR@
 NESSUSD_DATADIR=@NESSUSD_DATADIR@
 NESSUSD_LIBDIR=@NESSUSD_LIBDIR@
 NESSUSD_LOGDIR=@NESSUSD_LOGDIR@
@@ -54,7 +56,7 @@
 NESSUSD_PLUGINS=@NESSUSD_PLUGINS@
 NESSUSD_REPORTS=@NESSUSD_REPORTS@
 
-NESSUS_DIRECTORIES="-DNESSUSD_CONFDIR=\"$(NESSUSD_CONFDIR)\"" "-DNESSUSD_STATEDIR=\"$(NESSUSD_STATEDIR)\"" "-DNESSUSD_DATADIR=\"$(NESSUSD_DATADIR)\"" "-DNESSUSD_LIBDIR=\"${NESSUSD_LIBDIR}\"" "-DNESSUSD_PLUGINS=\"${NESSUSD_PLUGINS}\"" "-DNESSUSD_REPORTS=\"${NESSUSD_REPORTS}\"" -DNESSUSD_SHAREDSTATEDIR=\"${NESSUSD_SHAREDSTATEDIR}\" -DNESSUSD_LOGDIR=\"${NESSUSD_LOGDIR}\"
+NESSUS_DIRECTORIES="-DNESSUSD_CONFDIR=\"$(NESSUSD_CONFDIR)\"" "-DNESSUSD_STATEDIR=\"$(NESSUSD_STATEDIR)\"" "-DNESSUSD_DATADIR=\"$(NESSUSD_DATADIR)\"" "-DNESSUSD_LIBDIR=\"${NESSUSD_LIBDIR}\"" "-DNESSUSD_PLUGINS=\"${NESSUSD_PLUGINS}\"" "-DNESSUSD_REPORTS=\"${NESSUSD_REPORTS}\"" -DNESSUSD_SHAREDSTATEDIR=\"${NESSUSD_SHAREDSTATEDIR}\" -DNESSUSD_LOGDIR=\"${NESSUSD_LOGDIR}\" -DNESSUSD_PIDDIR=\"${NESSUSD_PIDDIR}\" -DNESSUSD_PKIDIR=\"${NESSUSD_PKIDIR}\"
 
 #
 # The server / client modes do not make a lot of sense

nessus-core-2.2.4.pid.patch:

--- NEW FILE nessus-core-2.2.4.pid.patch ---
diff -ur nessus-core.orig/nessusd/utils.c nessus-core/nessusd/utils.c
--- nessus-core.orig/nessusd/utils.c	2005-03-21 23:55:19.000000000 +0100
+++ nessus-core/nessusd/utils.c	2005-07-03 16:30:53.000000000 +0200
@@ -322,8 +322,8 @@
 create_pid_file()
 {
  FILE * f;
- char * fname = malloc(strlen(NESSUSD_STATEDIR) + strlen("/nessusd.pid") + 1);
- strcpy(fname, NESSUSD_STATEDIR);
+ char * fname = malloc(strlen(NESSUSD_PIDDIR) + strlen("/nessusd.pid") + 1);
+ strcpy(fname, NESSUSD_PIDDIR);
  strcat(fname, "/nessusd.pid");
  
  f = fopen(fname, "w");
@@ -341,8 +341,8 @@
 void
 delete_pid_file()
 {
- char * fname = malloc(strlen(NESSUSD_STATEDIR) + strlen("/nessusd.pid") + 1);
- strcpy(fname, NESSUSD_STATEDIR);
+ char * fname = malloc(strlen(NESSUSD_PIDDIR) + strlen("/nessusd.pid") + 1);
+ strcpy(fname, NESSUSD_PIDDIR);
  strcat(fname, "/nessusd.pid");
  unlink(fname);
  free(fname);

nessus-core-2.2.4.pki.patch:

--- NEW FILE nessus-core-2.2.4.pki.patch ---
diff -Naurp nessus-core.orig/nessusd/nessus-check-signature.c nessus-core/nessusd/nessus-check-signature.c
--- nessus-core.orig/nessusd/nessus-check-signature.c	2005-03-16 19:50:43.000000000 +0100
+++ nessus-core/nessusd/nessus-check-signature.c	2005-07-06 15:45:42.000000000 +0200
@@ -36,7 +36,7 @@
 int generate_signature(char * filename)
 {
  RSA * rsa = NULL;
- FILE * fp = fopen(NESSUSD_STATEDIR "/nessus_org.priv.pem", "r");
+ FILE * fp = fopen(NESSUSD_PKIDIR "/nessus_org.priv.pem", "r");
  unsigned char  * result;
  int len;
  int i;
@@ -116,7 +116,7 @@ int verify_signature(char * filename, ch
 {
  unsigned char md[SHA_DIGEST_LENGTH+1];
  RSA * rsa = NULL;
- FILE * fp = fopen(NESSUSD_STATEDIR "/nessus_org.pem", "r");
+ FILE * fp = fopen(NESSUSD_PKIDIR "/nessus_org.pem", "r");
 
  char sig[16384];
  unsigned char bin_sig[8192];
@@ -134,7 +134,7 @@ int verify_signature(char * filename, ch
 
  if ( fp == NULL )
  {
-  fprintf(stderr, "Open %s/nessus_org.pem : %s\n", NESSUSD_STATEDIR, strerror(errno));
+  fprintf(stderr, "Open %s/nessus_org.pem : %s\n", NESSUSD_PKIDIR, strerror(errno));
   return -1;
  }
 


--- NEW FILE nessus-core.spec ---
Name:           nessus-core
Version:        2.2.6
Release:        3%{?dist}
Summary:        Network vulnerability scanner

Group:          Applications/System
License:        GPL
URL:            http://www.nessus.org
Source0:        ftp://ftp.nessus.org/pub/nessus/nessus-2.2.6/src/nessus-core-2.2.6.tar.gz
Source1:        nessusd.init
Source2:        nessusd.log
Source3:        nessus.desktop
# force nessus into fedora dir structure
# and use system gd
# Thanks to Dawid Gajownik for providing these patches =)
Patch0:         nessus-core-2.2.4.Makefile.patch
Patch1:         nessus-core-2.2.4.config.h.in.patch
Patch2:         nessus-core-2.2.4.configure.in.patch
Patch3:         nessus-core-2.2.4.configure.patch
Patch4:         nessus-core-2.2.4.gd.patch
Patch5:         nessus-core-2.2.4.nessus-adduser.in.patch
Patch6:         nessus-core-2.2.4.nessus-mkcert.patch
Patch7:         nessus-core-2.2.4.nessus-rmuser.in.patch
Patch8:         nessus-core-2.2.4.nessus.tmpl.in.patch
Patch9:         nessus-core-2.2.4.pid.patch
Patch10:        nessus-core-2.2.4.pki.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  nessus-libraries-devel
BuildRequires:  libnasl-devel
BuildRequires:  gtk2-devel
BuildRequires:  glib2-devel
BuildRequires:  libICE-devel
BuildRequires:  gd-devel
BuildRequires:  tcp_wrappers
BuildRequires:  desktop-file-utils


%define pkidir %{_sysconfdir}/pki/nessus

%description
Nessus is the world's most popular vulnerability scanner used in over 75,000
organizations world-wide. Many of the world's largest organizations are
realizing significant cost savings by using Nessus to audit business-critical
enterprise devices and applications.

The "Nessus" Project was started by Renaud Deraison in 1998 to provide to the
internet community a free, powerful, up-to-date and easy to use remote
security scanner. Nessus is currently rated among the top products of its type
throughout the security industry and is endorsed by professional information
security organizations such as the SANS Institute.

%package devel
Summary: Header files for plugin development
Group: Development/Libraries

%description devel
%{summary}

%package -n nessus-server
Summary: nessusd is the server part of the nessus client-server model
Group: System Environment/Daemons
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig
Requires(preun): /sbin/service
Requires: nessus-core = %{version}-%{release}

%description -n nessus-server
%{summary}

%package -n nessus-client
Summary: Text client interface for nessusd
Group: Applications/Internet
Requires: nessus-core = %{version}-%{release}

%description -n nessus-client
%{summary}

%package -n nessus-gui
Summary: GTK client interface for nessusd
Group: Applications/Internet
Requires: nessus-core = %{version}-%{release}

%description -n nessus-gui
%{summary}

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

%patch0  -p1
%patch1  -p1
%patch2  -p1
# You cannot compile against system gd, because nessus-text client
# will require X.org X11
%patch3  -p1
%patch4  -p1
%patch5  -p1
%patch6  -p1
%patch7  -p1
%patch8  -p1
%patch9  -p1
%patch10 -p1

%build
# libdir is used by plugins
# smpflags will break builds sometime...
%configure \
	--libdir=%{_localstatedir}/lib \
	--disable-gtk \
	--enable-syslog \
	--enable-tcpwrappers \
	--without-x
make -C nessus

mv -f nessus/nessus nessus-text
make distclean

%configure \
	--libdir=%{_localstatedir}/lib \
	--enable-gtk \
	--enable-syslog \
	--enable-tcpwrappers \
	--with-x
make

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

install -p -m 0755 nessus-text $RPM_BUILD_ROOT/%{_bindir}

install -D -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/nessusd

install -D -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/nessusd
install -D -p -m 644 nessus/xpm/nessus.xpm \
	$RPM_BUILD_ROOT/%{_datadir}/pixmaps/nessus.xpm

desktop-file-install --vendor fedora \
	--dir $RPM_BUILD_ROOT/%{_datadir}/applications\
	%{SOURCE3}

# generate ghost .pem files
mkdir -m 0755 -p $RPM_BUILD_ROOT/%{pkidir}/{private,}/CA
chmod 700 $RPM_BUILD_ROOT/%{pkidir}/private/CA
touch $RPM_BUILD_ROOT/%{pkidir}/private/CA/{cakey,serverkey}.pem
chmod 600 $RPM_BUILD_ROOT/%{pkidir}/private/CA/{cakey,serverkey}.pem
touch $RPM_BUILD_ROOT/%{pkidir}/CA/{cacert,servercert}.pem
chmod 644 $RPM_BUILD_ROOT/%{pkidir}/CA/{cacert,servercert}.pem

# generate ghost config files
touch $RPM_BUILD_ROOT/%{_sysconfdir}/nessus/nessusd.{conf,rules}
chmod 600 $RPM_BUILD_ROOT/%{_sysconfdir}/nessus/nessusd.conf

mkdir -m 0755 $RPM_BUILD_ROOT/%{_localstatedir}/lib/nessus/plugins/.desc

%clean
rm -rf $RPM_BUILD_ROOT

%post -n nessus-server
# This adds the proper /etc/rc*.d links for the script
if [ $1 = 1 ]; then
/sbin/chkconfig --add nessusd
fi

%preun -n nessus-server
if [ $1 = 0 ]; then
        /sbin/service nessusd stop >/dev/null 2>&1
        /sbin/chkconfig --del nessusd
fi

%postun -n nessus-server
if [ "$1" -ge "1" ]; then
        /sbin/service nessusd condrestart >/dev/null 2>&1
fi

%files
%defattr(-,root,root,-)
%doc TODO CHANGES README_SSL doc/*txt doc/WARNING.* nessus/COPYING
%{_bindir}/nessus-mkrand
%{_bindir}/nessus-mkcert-client
%{_mandir}/man1/nessus.1*
%{_mandir}/man1/nessus-mkcert-client.1*
%{_mandir}/man1/nessus-mkrand.1*

%files devel
%defattr(-,root,root,-)
%doc doc/ntp/*
%{_includedir}/nessus/*
%exclude %{_includedir}/nessus/includes.h

%files -n nessus-client
%defattr(-,root,root,-)
%{_bindir}/nessus-text

%files -n nessus-gui
%defattr(-,root,root,-)
%{_bindir}/nessus
%{_datadir}/pixmaps/nessus.xpm
%{_datadir}/applications/*

%files -n nessus-server
%defattr(-,root,root,-)
%{_bindir}/nessus-fetch
%{_sbindir}/nessusd
%{_sbindir}/nessus-mkcert
%{_sbindir}/nessus-adduser
%{_sbindir}/nessus-rmuser
%{_sbindir}/nessus-check-signature
%{_mandir}/man1/nessus-fetch.1*
%{_mandir}/man8/*
%{_initrddir}/nessusd
%dir %{_localstatedir}/log/nessus
%dir %{_sysconfdir}/nessus
%dir %{_sysconfdir}/pki/nessus
%config(noreplace) %{_sysconfdir}/logrotate.d/nessusd
%ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{pkidir}/CA/*
%ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{pkidir}/private/CA/*
%ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{_sysconfdir}/nessus/*

%changelog
* Mon Apr 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
2.2.6-3
- fix description
- create and own log dir
- include copying

* Sun Feb 26 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
2.2.6-2
- fix buildroot
- add source0 url

* Fri Feb 24 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
2.2.6-1
- initial version


--- NEW FILE nessus.desktop ---
[Desktop Entry]
Categories=Application;Security;System;X-Fedora;
Name=Nessus
GenericName=Security scanner
Comment=Nessus client
Exec=nessus
Icon=nessus.xpm
StartupNotify=true
Terminal=false
Type=Application
Encoding=UTF-8


--- NEW FILE nessusd.init ---
#!/bin/sh
#
# nessusd      Starts and stops the Nessus daemon
#
# chkconfig:   - 93 12
# description: Nessus is a security auditing tool
#
# processname: nessusd
# config:      /etc/nessus/nessusd.conf
# pidfile:     /var/run/nessusd.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/nessusd"
prog=nessusd

[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog

lockfile=/var/lock/subsys/$prog

start() {
    echo -n $"Starting $prog: "
    daemon $exec -D
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop() {
    echo -n $"Stopping $prog: "
    killproc $prog
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

restart() {
    stop
    start
}

reload() {
    restart
}

force_reload() {
    restart
}

fdr_status() {
    status $prog
}

case "$1" in
    start|stop|restart|reload)
        $1
        ;;
    force-reload)
        force_reload
        ;;
    status)
        fdr_status
        ;;
    condrestart|try-restart)
  	[ ! -f $lockfile ] || restart
	;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
        exit 2
esac


--- NEW FILE nessusd.log ---
/var/log/nessus/nessusd.messages {
  missingok
  notifempty
  create 0600 root root
  postrotate
      /sbin/service nessusd condrestart 2> /dev/null > /dev/null || true
  endscript
}


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nessus-core/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2006 06:19:30 -0000	1.1
+++ .cvsignore	7 Apr 2006 06:21:26 -0000	1.2
@@ -0,0 +1 @@
+nessus-core-2.2.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nessus-core/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2006 06:19:30 -0000	1.1
+++ sources	7 Apr 2006 06:21:26 -0000	1.2
@@ -0,0 +1 @@
+616dd7727b90df1ac978b5e736c0a960  nessus-core-2.2.6.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr  7 07:07:33 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Fri,  7 Apr 2006 00:07:33 -0700
Subject: fedora-security/audit fc4,1.191,1.192 fc5,1.104,1.105
Message-ID: <200604070707.k3777Xmb007196@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7176

Modified Files:
	fc4 fc5 
Log Message:
Updates based on latest mails



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- fc4	6 Apr 2006 20:45:47 -0000	1.191
+++ fc4	7 Apr 2006 07:07:30 -0000	1.192
@@ -1,11 +1,10 @@
-Up to date CVE as of CVE email 20060330
-Up to date FC4 as of 20060330
-Up to date kernel as of 20060405
+Up to date CVE as of CVE email 20060504
+Up to date FC4 as of 20060504
 
 ** are items that need attention
 
 CVE-2006-1646 ignore (ipsec-tools) KAME racoon, not ipsec-tools racoon
-CVE-2006-1550 VULNERABLE (dia) bz#187402
+CVE-2006-1550 backport (dia) bz#187402 [since FEDORA-2006-261]
 CVE-2006-1548 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) bz#187544


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- fc5	6 Apr 2006 20:45:47 -0000	1.104
+++ fc5	7 Apr 2006 07:07:30 -0000	1.105
@@ -1,6 +1,5 @@
-Up to date CVE as of CVE email 20060330
-Up to date FC5 as of 20060330
-Up to date kernel as of 20060405
+Up to date CVE as of CVE email 20060405
+Up to date FC5 as of 20060405
 
 ** are items that need attention
 
@@ -586,7 +585,7 @@
 CVE-2005-0705 version (ethereal, fixed after 0.10.9)
 CVE-2005-0704 version (ethereal, fixed after 0.10.9)
 CVE-2005-0698 version (ethereal, fixed after 0.10.9)
-CVE-2005-0670 ** hcidump
+CVE-2005-0670 VULNERABLE (hcidump) bz#187946
 CVE-2005-0664 version (libexif, fixed 0.6.12)
 CVE-2005-0654 ignore (gimp, not fixed 2.2) upstream considers harmless
 CVE-2005-0627 version (qt, fixed 3.3.4)



From fedora-extras-commits at redhat.com  Fri Apr  7 09:26:34 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Fri,  7 Apr 2006 02:26:34 -0700
Subject: rpms/pikdev/FC-4 pikdev-0.8.4.ppcbuild, NONE, 1.1 pikdev.spec, 1.6,
	1.7
Message-ID: <200604070926.k379QaAR011593@cvs-int.fedora.redhat.com>

Author: dionysos

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

Modified Files:
	pikdev.spec 
Added Files:
	pikdev-0.8.4.ppcbuild 
Log Message:
Add patch to try to build ppc arch


--- NEW FILE pikdev-0.8.4.ppcbuild ---
--- pikdev/uparport.hh.orig	2005-01-07 22:26:24.000000000 +0100
+++ pikdev/uparport.hh	2006-04-07 11:20:27.000000000 +0200
@@ -18,7 +18,6 @@
 // in RedHat & Mandrake distro, ppdev.h is into /usr/include/linux 
 #include <linux/ppdev.h>   
 #include <sys/time.h>
-#include <sys/io.h> 
 #include <fcntl.h>
 }           
 


Index: pikdev.spec
===================================================================
RCS file: /cvs/extras/rpms/pikdev/FC-4/pikdev.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pikdev.spec	5 Apr 2006 11:17:00 -0000	1.6
+++ pikdev.spec	7 Apr 2006 09:26:34 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		pikdev
 Version:	0.8.4
-Release:	8%{?dist}
+Release:	9%{?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
 
@@ -11,14 +11,13 @@
 Source1:	%{name}.desktop
 Source2:	README.Fedora
 Source3:	LISEZMOI.Fedora
+Patch:		uparport.hh.ppcbuild
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils, kdelibs-devel
 
 Requires:	gputils
 
-ExcludeArch:	ppc
-
 %description
 PiKdev is a simple IDE dedicated to the development of PIC
 based applications under KDE.
@@ -54,6 +53,8 @@
 
 %setup -q
 
+%patch
+
 %{__cp} -p %{SOURCE2} .
 %{__cp} -p %{SOURCE3} .
 
@@ -105,6 +106,9 @@
 %{_datadir}/icons/*
 
 %changelog
+* Fri Apr 07 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-9
+  - Add patch to try to build ppc arch
+  - Contributions of David Woodhouse <dwmw2[AT]redhat[DOT]com>
 * Wed Apr 05 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-8
   - New try to build x86_64 arch for FC-4
   - Unset $QTDIR before sourcing qt.sh



From fedora-extras-commits at redhat.com  Fri Apr  7 09:29:39 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Fri,  7 Apr 2006 02:29:39 -0700
Subject: rpms/pikdev/FC-4 pikdev.spec,1.7,1.8
Message-ID: <200604070929.k379Tf5O011654@cvs-int.fedora.redhat.com>

Author: dionysos

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

Modified Files:
	pikdev.spec 
Log Message:
This is the good spec file


Index: pikdev.spec
===================================================================
RCS file: /cvs/extras/rpms/pikdev/FC-4/pikdev.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pikdev.spec	7 Apr 2006 09:26:34 -0000	1.7
+++ pikdev.spec	7 Apr 2006 09:29:39 -0000	1.8
@@ -11,7 +11,7 @@
 Source1:	%{name}.desktop
 Source2:	README.Fedora
 Source3:	LISEZMOI.Fedora
-Patch:		uparport.hh.ppcbuild
+Patch:		%{name}-%{version}.ppcbuild
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils, kdelibs-devel



From fedora-extras-commits at redhat.com  Fri Apr  7 09:32:02 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Fri,  7 Apr 2006 02:32:02 -0700
Subject: rpms/pikdev/FC-4 pikdev.spec,1.8,1.9
Message-ID: <200604070932.k379W4Vw011688@cvs-int.fedora.redhat.com>

Author: dionysos

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

Modified Files:
	pikdev.spec 
Log Message:
Fix patch name


Index: pikdev.spec
===================================================================
RCS file: /cvs/extras/rpms/pikdev/FC-4/pikdev.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pikdev.spec	7 Apr 2006 09:29:39 -0000	1.8
+++ pikdev.spec	7 Apr 2006 09:32:02 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		pikdev
 Version:	0.8.4
-Release:	9%{?dist}
+Release:	10%{?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
 
@@ -106,6 +106,8 @@
 %{_datadir}/icons/*
 
 %changelog
+* Fri Apr 07 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-10
+  - Fix patch name
 * Fri Apr 07 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-9
   - Add patch to try to build ppc arch
   - Contributions of David Woodhouse <dwmw2[AT]redhat[DOT]com>



From fedora-extras-commits at redhat.com  Fri Apr  7 10:53:07 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Fri,  7 Apr 2006 03:53:07 -0700
Subject: rpms/pikdev/FC-5 pikdev-0.8.4.ppcbuild, NONE, 1.1 pikdev.spec, 1.2,
	1.3
Message-ID: <200604071053.k37Ar9LN014242@cvs-int.fedora.redhat.com>

Author: dionysos

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

Modified Files:
	pikdev.spec 
Added Files:
	pikdev-0.8.4.ppcbuild 
Log Message:
Add patch to try to build ppc arch


--- NEW FILE pikdev-0.8.4.ppcbuild ---
--- pikdev/uparport.hh.orig	2005-01-07 22:26:24.000000000 +0100
+++ pikdev/uparport.hh	2006-04-07 11:20:27.000000000 +0200
@@ -18,7 +18,6 @@
 // in RedHat & Mandrake distro, ppdev.h is into /usr/include/linux 
 #include <linux/ppdev.h>   
 #include <sys/time.h>
-#include <sys/io.h> 
 #include <fcntl.h>
 }           
 


Index: pikdev.spec
===================================================================
RCS file: /cvs/extras/rpms/pikdev/FC-5/pikdev.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pikdev.spec	15 Mar 2006 10:31:35 -0000	1.2
+++ pikdev.spec	7 Apr 2006 10:53:07 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		pikdev
 Version:	0.8.4
-Release:	4%{?dist}
+Release:	10%{?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
 
@@ -11,14 +11,13 @@
 Source1:	%{name}.desktop
 Source2:	README.Fedora
 Source3:	LISEZMOI.Fedora
+Patch:		%{name}-%{version}.ppcbuild
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils, kdelibs-devel
 
 Requires:	gputils
 
-ExcludeArch:	ppc
-
 %description
 PiKdev is a simple IDE dedicated to the development of PIC
 based applications under KDE.
@@ -54,11 +53,16 @@
 
 %setup -q
 
+%patch
+
 %{__cp} -p %{SOURCE2} .
 %{__cp} -p %{SOURCE3} .
 
 %build
 
+unset QTDIR || : ; . /etc/profile.d/qt.sh
+export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
+
 %configure --disable-rpath
 
 rm -rf pkp
@@ -102,6 +106,24 @@
 %{_datadir}/icons/*
 
 %changelog
+* Fri Apr 07 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-10
+  - Fix patch name
+* Fri Apr 07 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-9
+  - Add patch to try to build ppc arch
+  - Contributions of David Woodhouse <dwmw2[AT]redhat[DOT]com>
+* Wed Apr 05 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-8
+  - New try to build x86_64 arch for FC-4
+  - Unset $QTDIR before sourcing qt.sh
+  - Thanks to Rex Dieter <rdieter[AT]math[DOT]unl[DOT]edu>
+    and Michael Schwendt <bugs[DOT]michael[AT]gmx[DOT]net>
+* Thu Mar 23 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-7
+  - No fix. So, remove the previous change
+  - Definitely exclude arch x86_64 for FC-4
+* Thu Mar 23 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-6
+  - $QTDIR is set. So, remove the previous change
+  - Try to fix x86_64 build failure by adding BR qt-devel
+* Wed Mar 15 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-5
+  - Source qt.sh if $QTDIR isn't set. Always Ralf...
 * Wed Mar 15 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-4
   - Exclude temporarily ppc arch because <sys/io.h> don't exist
     in ppc glibc headers
@@ -111,13 +133,13 @@
     Thanks to him.
 * Wed Mar 08 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-3
   - Remove useless BuildRequires qt-devel, xorg-x11-devel for FE5
-  - Package must own %{_datadir}/apps/%{name} directory
+  - Package must own %%{_datadir}/apps/%%{name} directory
 * Tue Jan 31 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-2
   - Don't use the precompiled version of pkp
 * Mon Jan 30 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-1
   - New upstream version
 * Tue Jan 10 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.2-2
-  - Add the %{?dist} macro
+  - Add the %%{?dist} macro
 * Fri Dec 16 2005 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.2-1
   - New version
   - Add french summary and description



From fedora-extras-commits at redhat.com  Fri Apr  7 10:54:20 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Fri,  7 Apr 2006 03:54:20 -0700
Subject: rpms/pikdev/devel pikdev-0.8.4.ppcbuild, NONE, 1.1 pikdev.spec, 1.2,
	1.3
Message-ID: <200604071054.k37AsMEN014305@cvs-int.fedora.redhat.com>

Author: dionysos

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

Modified Files:
	pikdev.spec 
Added Files:
	pikdev-0.8.4.ppcbuild 
Log Message:
Add patch to try to build ppc arch


--- NEW FILE pikdev-0.8.4.ppcbuild ---
--- pikdev/uparport.hh.orig	2005-01-07 22:26:24.000000000 +0100
+++ pikdev/uparport.hh	2006-04-07 11:20:27.000000000 +0200
@@ -18,7 +18,6 @@
 // in RedHat & Mandrake distro, ppdev.h is into /usr/include/linux 
 #include <linux/ppdev.h>   
 #include <sys/time.h>
-#include <sys/io.h> 
 #include <fcntl.h>
 }           
 


Index: pikdev.spec
===================================================================
RCS file: /cvs/extras/rpms/pikdev/devel/pikdev.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pikdev.spec	15 Mar 2006 10:31:35 -0000	1.2
+++ pikdev.spec	7 Apr 2006 10:54:20 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		pikdev
 Version:	0.8.4
-Release:	4%{?dist}
+Release:	10%{?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
 
@@ -11,14 +11,13 @@
 Source1:	%{name}.desktop
 Source2:	README.Fedora
 Source3:	LISEZMOI.Fedora
+Patch:		%{name}-%{version}.ppcbuild
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils, kdelibs-devel
 
 Requires:	gputils
 
-ExcludeArch:	ppc
-
 %description
 PiKdev is a simple IDE dedicated to the development of PIC
 based applications under KDE.
@@ -54,11 +53,16 @@
 
 %setup -q
 
+%patch
+
 %{__cp} -p %{SOURCE2} .
 %{__cp} -p %{SOURCE3} .
 
 %build
 
+unset QTDIR || : ; . /etc/profile.d/qt.sh
+export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
+
 %configure --disable-rpath
 
 rm -rf pkp
@@ -102,6 +106,24 @@
 %{_datadir}/icons/*
 
 %changelog
+* Fri Apr 07 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-10
+  - Fix patch name
+* Fri Apr 07 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-9
+  - Add patch to try to build ppc arch
+  - Contributions of David Woodhouse <dwmw2[AT]redhat[DOT]com>
+* Wed Apr 05 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-8
+  - New try to build x86_64 arch for FC-4
+  - Unset $QTDIR before sourcing qt.sh
+  - Thanks to Rex Dieter <rdieter[AT]math[DOT]unl[DOT]edu>
+    and Michael Schwendt <bugs[DOT]michael[AT]gmx[DOT]net>
+* Thu Mar 23 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-7
+  - No fix. So, remove the previous change
+  - Definitely exclude arch x86_64 for FC-4
+* Thu Mar 23 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-6
+  - $QTDIR is set. So, remove the previous change
+  - Try to fix x86_64 build failure by adding BR qt-devel
+* Wed Mar 15 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-5
+  - Source qt.sh if $QTDIR isn't set. Always Ralf...
 * Wed Mar 15 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-4
   - Exclude temporarily ppc arch because <sys/io.h> don't exist
     in ppc glibc headers
@@ -111,13 +133,13 @@
     Thanks to him.
 * Wed Mar 08 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-3
   - Remove useless BuildRequires qt-devel, xorg-x11-devel for FE5
-  - Package must own %{_datadir}/apps/%{name} directory
+  - Package must own %%{_datadir}/apps/%%{name} directory
 * Tue Jan 31 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-2
   - Don't use the precompiled version of pkp
 * Mon Jan 30 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-1
   - New upstream version
 * Tue Jan 10 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.2-2
-  - Add the %{?dist} macro
+  - Add the %%{?dist} macro
 * Fri Dec 16 2005 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.2-1
   - New version
   - Add french summary and description



From fedora-extras-commits at redhat.com  Fri Apr  7 11:10:54 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  7 Apr 2006 04:10:54 -0700
Subject: rpms/pipenightdreams - New directory
Message-ID: <200604071110.k37BAu8b016844@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

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




From fedora-extras-commits at redhat.com  Fri Apr  7 11:10:55 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  7 Apr 2006 04:10:55 -0700
Subject: rpms/pipenightdreams/devel - New directory
Message-ID: <200604071110.k37BAval016847@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

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




From fedora-extras-commits at redhat.com  Fri Apr  7 11:11:11 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  7 Apr 2006 04:11:11 -0700
Subject: rpms/pipenightdreams Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604071111.k37BBDUD016890@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

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


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

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

common : CVS/Root
	@cvs 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 Apr  7 11:11:13 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  7 Apr 2006 04:11:13 -0700
Subject: rpms/pipenightdreams/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604071111.k37BBFgC016935@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

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


--- 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 Apr  7 11:12:45 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  7 Apr 2006 04:12:45 -0700
Subject: rpms/pipenightdreams import.log,1.1,1.2
Message-ID: <200604071112.k37BCl6Q017019@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	import.log 
Log Message:
auto-import pipenightdreams-0.10.0-1 on branch devel from pipenightdreams-0.10.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pipenightdreams/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Apr 2006 11:11:11 -0000	1.1
+++ import.log	7 Apr 2006 11:12:45 -0000	1.2
@@ -0,0 +1 @@
+pipenightdreams-0_10_0-1:HEAD:pipenightdreams-0.10.0-1.src.rpm:1144408208



From fedora-extras-commits at redhat.com  Fri Apr  7 11:12:46 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  7 Apr 2006 04:12:46 -0700
Subject: rpms/pipenightdreams/devel pipenightdreams-0.10.0-datadir.patch,
	NONE, 1.1 pipenightdreams-0.10.0-gcc41.patch, NONE,
	1.1 pipenightdreams.desktop, NONE, 1.1 pipenightdreams.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604071112.k37BCmWX017028@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	.cvsignore sources 
Added Files:
	pipenightdreams-0.10.0-datadir.patch 
	pipenightdreams-0.10.0-gcc41.patch pipenightdreams.desktop 
	pipenightdreams.spec 
Log Message:
auto-import pipenightdreams-0.10.0-1 on branch devel from pipenightdreams-0.10.0-1.src.rpm

pipenightdreams-0.10.0-datadir.patch:

--- NEW FILE pipenightdreams-0.10.0-datadir.patch ---
--- pipenightdreams-0.10.0/configure.datadir	2006-04-05 19:46:59.000000000 +0200
+++ pipenightdreams-0.10.0/configure	2006-04-05 19:47:18.000000000 +0200
@@ -1613,7 +1613,7 @@
 
 #Thanks to Ingo Ruhnke <grumbel at gmx.de>
 
-	game_datadir="$datadir/games/$PACKAGE"
+	game_datadir="$datadir/$PACKAGE"
 	game_datadir=`(
 		test "x$prefix" = xNONE && prefix=${ac_default_prefix}
 		test "x$exec_prefix" = xNONE && exec_prefix=${prefix}

pipenightdreams-0.10.0-gcc41.patch:

--- NEW FILE pipenightdreams-0.10.0-gcc41.patch ---
diff -ur pipenightdreams-0.10.0.orig/src/eventmanager.cpp pipenightdreams-0.10.0/src/eventmanager.cpp
--- pipenightdreams-0.10.0.orig/src/eventmanager.cpp	2002-01-17 20:56:26.000000000 +0100
+++ pipenightdreams-0.10.0/src/eventmanager.cpp	2006-04-04 21:32:53.000000000 +0200
@@ -40,7 +40,7 @@
   lista_streams->remove(lista_streams->indexOf(s));
 }
 
-void EventManager::pumpEvents(bool wait=false){
+void EventManager::pumpEvents(bool wait){
   SDL_Event event;
   Index * stream;
   bool got=false;
diff -ur pipenightdreams-0.10.0.orig/src/graphic.cpp pipenightdreams-0.10.0/src/graphic.cpp
--- pipenightdreams-0.10.0.orig/src/graphic.cpp	2002-01-17 20:56:29.000000000 +0100
+++ pipenightdreams-0.10.0/src/graphic.cpp	2006-04-04 21:32:34.000000000 +0200
@@ -44,11 +44,11 @@
   if (pixels) free(pixels);
 }
 
-void Graphic::setAlpha(char value=OPAQUE){
+void Graphic::setAlpha(char value){
   SDL_SetAlpha(surface, SDL_SRCALPHA, value);
 }
 
-void Graphic::enableClipping(bool flag=true){
+void Graphic::enableClipping(bool flag){
 
   if (flag){
     SDL_Rect rect;
@@ -68,7 +68,7 @@
   clip_height=height;
 }
 
-void Graphic::flip(Axis a=HAxis){
+void Graphic::flip(Axis a){
   if (surface){
     if (SDL_MUSTLOCK(surface))
       if (SDL_LockSurface(surface)<0) return;
diff -ur pipenightdreams-0.10.0.orig/src/hash.cpp pipenightdreams-0.10.0/src/hash.cpp
--- pipenightdreams-0.10.0.orig/src/hash.cpp	2002-01-17 20:56:30.000000000 +0100
+++ pipenightdreams-0.10.0/src/hash.cpp	2006-04-04 21:32:00.000000000 +0200
@@ -55,10 +55,10 @@
   return(sum % nbuckets);
 }
 
-Hash::Hash(int bs=256){
+Hash::Hash(int bs){
  int i;
  nbuckets=bs;
- lbuckets=new (List *)[nbuckets];
+ lbuckets=new List *[nbuckets];
 
  for (i=0;i<nbuckets;i++)
    lbuckets[i]=new List();
@@ -99,7 +99,7 @@
   return NotAdded;
 }
 
-Hash::Result Hash::remove(Str * str, bool del=false){
+Hash::Result Hash::remove(Str * str, bool del){
   if (str){
     Index * i;
     List * list=lbuckets[function(str)];
@@ -135,7 +135,7 @@
   return NULL;
 }
 
-void Hash::empty(bool del=true){
+void Hash::empty(bool del){
   int i;
   List * list;
   for (i=0;i<nbuckets;i++){
diff -ur pipenightdreams-0.10.0.orig/src/image.cpp pipenightdreams-0.10.0/src/image.cpp
--- pipenightdreams-0.10.0.orig/src/image.cpp	2002-01-17 20:56:32.000000000 +0100
+++ pipenightdreams-0.10.0/src/image.cpp	2006-04-04 21:30:44.000000000 +0200
@@ -19,7 +19,7 @@
 #include "SDL_image.h"
 #include <stdio.h>
 
-Image::Image(Str * filename=NULL):Graphic(){
+Image::Image(Str * filename):Graphic(){
   if (filename) load(filename);
 }
 
diff -ur pipenightdreams-0.10.0.orig/src/list.cpp pipenightdreams-0.10.0/src/list.cpp
--- pipenightdreams-0.10.0.orig/src/list.cpp	2002-01-17 20:56:35.000000000 +0100
+++ pipenightdreams-0.10.0/src/list.cpp	2006-04-04 21:30:27.000000000 +0200
@@ -125,7 +125,7 @@
   return (insert(indexOf(i), obj));
 }
 
-List::Result List::remove(Index * index, bool del=false){
+List::Result List::remove(Index * index, bool del){
   if (isEmpty()) return EmptyList;
   if (!index) return NullIndex;
 
@@ -155,7 +155,7 @@
   return Removed;
 }
 
-void List::empty(bool del=true){
+void List::empty(bool del){
   while (!isEmpty())
     remove(getFirst(), del);
 }
diff -ur pipenightdreams-0.10.0.orig/src/pipe.cpp pipenightdreams-0.10.0/src/pipe.cpp
--- pipenightdreams-0.10.0.orig/src/pipe.cpp	2002-01-21 05:08:13.000000000 +0100
+++ pipenightdreams-0.10.0/src/pipe.cpp	2006-04-04 21:29:23.000000000 +0200
@@ -43,11 +43,11 @@
   return !(full_level>0) && !fixed;
 }
 
-void Pipe::setFixed(bool flag=true){
+void Pipe::setFixed(bool flag){
   fixed=flag;
 }
 
-void Pipe::setBonus(Bonus bonus=NormalBonus){
+void Pipe::setBonus(Bonus bonus){
   this->bonus=bonus;
 }
 
diff -ur pipenightdreams-0.10.0.orig/src/player.h pipenightdreams-0.10.0/src/player.h
--- pipenightdreams-0.10.0.orig/src/player.h	2002-01-17 20:56:40.000000000 +0100
+++ pipenightdreams-0.10.0/src/player.h	2006-04-04 21:29:52.000000000 +0200
@@ -47,8 +47,8 @@
     void setStartRowColumn(int row, int column);
     void setBoard(Board * bd);
 
-    inline void setRestrictionCoef(unsigned int coef);
-    inline void setFixedCoef(unsigned int coef);
+    void setRestrictionCoef(unsigned int coef);
+    void setFixedCoef(unsigned int coef);
 
     void incLives();
     void decLives();
diff -ur pipenightdreams-0.10.0.orig/src/pointer.cpp pipenightdreams-0.10.0/src/pointer.cpp
--- pipenightdreams-0.10.0.orig/src/pointer.cpp	2002-01-17 20:56:41.000000000 +0100
+++ pipenightdreams-0.10.0/src/pointer.cpp	2006-04-04 21:28:25.000000000 +0200
@@ -17,7 +17,7 @@
 
 #include "pointer.h"
 
-Pointer::Pointer(int row=0, int column=0){
+Pointer::Pointer(int row, int column){
   this->row=row;
   this->column=column;
   this->moved_flag=true;
diff -ur pipenightdreams-0.10.0.orig/src/score.cpp pipenightdreams-0.10.0/src/score.cpp
--- pipenightdreams-0.10.0.orig/src/score.cpp	2002-01-17 20:56:42.000000000 +0100
+++ pipenightdreams-0.10.0/src/score.cpp	2006-04-04 21:28:07.000000000 +0200
@@ -18,7 +18,7 @@
 #include "score.h"
 #include <math.h>
 
-Score::Score(int value=0){
+Score::Score(int value){
   this->value=value;
   delta=0;
   changed=true;
diff -ur pipenightdreams-0.10.0.orig/src/str.cpp pipenightdreams-0.10.0/src/str.cpp
--- pipenightdreams-0.10.0.orig/src/str.cpp	2002-01-17 20:56:42.000000000 +0100
+++ pipenightdreams-0.10.0/src/str.cpp	2006-04-04 21:27:43.000000000 +0200
@@ -11,7 +11,7 @@
 
 const char Str::nul = '\0';
 
-Str::Str(const char * string=NULL){
+Str::Str(const char * string){
   s=NULL;
   set(string);
 }
@@ -25,7 +25,7 @@
   if (s) delete[] s;
 }
 
-void Str::set(const char * string=NULL){
+void Str::set(const char * string){
   if (s) delete[] s;
   if (string){
     s=new char[strlen(string)+1];
@@ -71,7 +71,7 @@
   return (strlen(s));
 }
 
-bool Str::isEqual(Str * str, bool case_sensitive = true){
+bool Str::isEqual(Str * str, bool case_sensitive){
   if (case_sensitive){
     return (!strcmp(s, str->s));
   }
--- pipenightdreams-0.10.0/src/pointer.h~	2006-04-04 21:58:38.000000000 +0200
+++ pipenightdreams-0.10.0/src/pointer.h	2006-04-04 21:58:38.000000000 +0200
@@ -43,11 +43,11 @@
 
     friend class Board;
 
-    inline void setRow(int row);
-    inline void setColumn(int column);
-    inline void setRowColumn(int row, int column);
-    inline void setMoved(bool flag);
-    inline bool moved();
+    void setRow(int row);
+    void setColumn(int column);
+    void setRowColumn(int row, int column);
+    void setMoved(bool flag);
+    bool moved();
 
     Str * image_name;
     Image * ima;


--- NEW FILE pipenightdreams.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Pipe Night Dreams
GenericName=Pipe Puzzle Game
Comment=Connect the waterpipes to create a proper pipeline
Exec=pipenightdreams
Icon=pipenightdreams.png
Terminal=false
StartupNotify=false
Type=Application
Categories=Application;Game;
Version=0.10.0


--- NEW FILE pipenightdreams.spec ---
Name:           pipenightdreams
Version:        0.10.0
Release:        1%{?dist}
Summary:        Connect the waterpipes to create a proper pipeline
Group:          Amusements/Games
License:        GPL
URL:            http://www.libsdl.org/projects/pipenightdreams/
Source0:        http://www.libsdl.org/projects/pipenightdreams/packages/pipenightdreams-0.10.0.tar.gz
Source1:        %{name}.desktop
Patch0:         pipenightdreams-0.10.0-gcc41.patch
Patch1:         pipenightdreams-0.10.0-datadir.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  SDL_image-devel desktop-file-utils

%description
PipeNightDreams is a game similar to the classic PipeDream. It has 25 levels
with increasing difficulty, and you can create your own by just editing
text files. It has a lot of cool graphics, score, lives, required pipes
per level and an easy and fast interface.


%prep
%setup -q
%patch0 -p1 -z .gcc41
%patch1 -p1 -z .gcc41


%build
%configure
make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS -I/usr/include/SDL"


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

# fix up the broken datadir install (its this or patch a zillion makefiles)
mv $RPM_BUILD_ROOT%{_datadir}/games/%{name} $RPM_BUILD_ROOT%{_datadir}
rmdir $RPM_BUILD_ROOT%{_datadir}/games

# 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/64x64/apps
install -p -m 644 images/pipes_space/horizontal.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/%{name}.png


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files
%defattr(-,root,root,-)
%doc README TODO COPYING ChangeLog
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_mandir}/man6/pipenightdreams.6.gz
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/64x64/apps/%{name}.png


%changelog
* Wed Apr  5 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.0-1
- initial Fedora Extras package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pipenightdreams/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2006 11:11:13 -0000	1.1
+++ .cvsignore	7 Apr 2006 11:12:45 -0000	1.2
@@ -0,0 +1 @@
+pipenightdreams-0.10.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pipenightdreams/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2006 11:11:13 -0000	1.1
+++ sources	7 Apr 2006 11:12:45 -0000	1.2
@@ -0,0 +1 @@
+f22f23649852f54cca43de775e691de6  pipenightdreams-0.10.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr  7 11:21:44 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  7 Apr 2006 04:21:44 -0700
Subject: owners owners.list,1.806,1.807
Message-ID: <200604071121.k37BLkSf017173@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	owners.list 
Log Message:
add pipenightdreams


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.806
retrieving revision 1.807
diff -u -r1.806 -r1.807
--- owners.list	6 Apr 2006 18:29:19 -0000	1.806
+++ owners.list	7 Apr 2006 11:21:43 -0000	1.807
@@ -1133,6 +1133,7 @@
 Fedora Extras|physfs|Library to provide abstract access to various archives|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|pikdev|IDE for development of PICmicro based application (under Linux/KDE)|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
 Fedora Extras|pinentry|Collection of simple PIN or passphrase entry dialogs|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|pipenightdreams|Connect the waterpipes to create a proper pipeline|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|pitivi|Non-linear video editor|redhat at flyn.org|extras-qa at fedoraproject.org|
 Fedora Extras|plague|Distributed build system for RPMs|dcbw at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|planet|Flexible RDF/RSS/Atom feed aggregator|rich at phekda.gotadsl.co.uk|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Apr  7 11:31:26 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  7 Apr 2006 04:31:26 -0700
Subject: comps comps-fe5.xml.in,1.33,1.34
Message-ID: <200604071131.k37BVSfw017912@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	comps-fe5.xml.in 
Log Message:
add raidem,zasx to games


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- comps-fe5.xml.in	3 Apr 2006 18:39:40 -0000	1.33
+++ comps-fe5.xml.in	7 Apr 2006 11:31:26 -0000	1.34
@@ -231,6 +231,7 @@
         <packagereq type="optional">ppracer</packagereq>
         <packagereq type="optional">qascade</packagereq>
         <packagereq type="optional">qqo</packagereq>
+        <packagereq type="optional">raidem</packagereq>
         <packagereq type="optional">rocksndiamonds</packagereq>
         <packagereq type="optional">rogue</packagereq>
         <packagereq type="optional">scorched3d</packagereq>
@@ -250,6 +251,7 @@
         <packagereq type="optional">xpilot-ng</packagereq>
         <packagereq type="optional">xplanet</packagereq>
         <packagereq type="optional">xscorch</packagereq>
+        <packagereq type="optional">zasx</packagereq>
     </packagelist>
   </group>
 



From fedora-extras-commits at redhat.com  Fri Apr  7 13:36:22 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Fri,  7 Apr 2006 06:36:22 -0700
Subject: rpms/i8kutils/FC-5 i8kutils.spec,1.9,1.10
Message-ID: <200604071336.k37DaP7h000944@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	i8kutils.spec 
Log Message:
Requires tk (#188199) and sync all FC-4+ branches.



Index: i8kutils.spec
===================================================================
RCS file: /cvs/extras/rpms/i8kutils/FC-5/i8kutils.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- i8kutils.spec	14 Mar 2006 11:04:10 -0000	1.9
+++ i8kutils.spec	7 Apr 2006 13:36:22 -0000	1.10
@@ -4,7 +4,7 @@
 Summary: Dell laptop (Inspiron 8000 and others) SMM BIOS support tools
 Name: i8kutils
 Version: 1.25
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: System Environment/Base
 URL: http://people.debian.org/~dz/i8k/
@@ -12,7 +12,7 @@
 Source1: http://www.coding-zone.com/i8krellm-%{gkrellmpluginver}.tar.gz
 Source2: i8kbuttons.init
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: alsa-utils, gkrellm >= 2.0.0
+Requires: alsa-utils, gkrellm >= 2.0.0, tk
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig, /sbin/service
 BuildRequires: gkrellm-devel >= 2.0.0
@@ -53,7 +53,7 @@
     %{__cp} -a i8krellm.so %{buildroot}%{_libdir}/gkrellm2/plugins/
 popd
 
-%{__install} -D -m 755 %{SOURCE2} \
+%{__install} -D -m 0755 %{SOURCE2} \
     %{buildroot}%{_sysconfdir}/rc.d/init.d/i8kbuttons
 
 
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Fri Apr  7 2006 Matthias Saou <http://freshrpms.net/> 1.25-6
+- Add tk requirement, since the included i8kmon utility requires it.
+
 * Tue Mar 14 2006 Matthias Saou <http://freshrpms.net/> 1.25-6
 - FC5 rebuild.
 - Silence possible kernel module insertion error in the init script.



From fedora-extras-commits at redhat.com  Fri Apr  7 13:36:23 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Fri,  7 Apr 2006 06:36:23 -0700
Subject: rpms/i8kutils/devel i8kutils.spec,1.9,1.10
Message-ID: <200604071336.k37DaPe0000948@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	i8kutils.spec 
Log Message:
Requires tk (#188199) and sync all FC-4+ branches.



Index: i8kutils.spec
===================================================================
RCS file: /cvs/extras/rpms/i8kutils/devel/i8kutils.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- i8kutils.spec	14 Mar 2006 11:04:10 -0000	1.9
+++ i8kutils.spec	7 Apr 2006 13:36:23 -0000	1.10
@@ -4,7 +4,7 @@
 Summary: Dell laptop (Inspiron 8000 and others) SMM BIOS support tools
 Name: i8kutils
 Version: 1.25
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: System Environment/Base
 URL: http://people.debian.org/~dz/i8k/
@@ -12,7 +12,7 @@
 Source1: http://www.coding-zone.com/i8krellm-%{gkrellmpluginver}.tar.gz
 Source2: i8kbuttons.init
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: alsa-utils, gkrellm >= 2.0.0
+Requires: alsa-utils, gkrellm >= 2.0.0, tk
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig, /sbin/service
 BuildRequires: gkrellm-devel >= 2.0.0
@@ -53,7 +53,7 @@
     %{__cp} -a i8krellm.so %{buildroot}%{_libdir}/gkrellm2/plugins/
 popd
 
-%{__install} -D -m 755 %{SOURCE2} \
+%{__install} -D -m 0755 %{SOURCE2} \
     %{buildroot}%{_sysconfdir}/rc.d/init.d/i8kbuttons
 
 
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Fri Apr  7 2006 Matthias Saou <http://freshrpms.net/> 1.25-6
+- Add tk requirement, since the included i8kmon utility requires it.
+
 * Tue Mar 14 2006 Matthias Saou <http://freshrpms.net/> 1.25-6
 - FC5 rebuild.
 - Silence possible kernel module insertion error in the init script.



From fedora-extras-commits at redhat.com  Fri Apr  7 13:36:22 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Fri,  7 Apr 2006 06:36:22 -0700
Subject: rpms/i8kutils/FC-4 i8kbuttons.init,1.4,1.5 i8kutils.spec,1.7,1.8
Message-ID: <200604071336.k37Dasak000953@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	i8kbuttons.init i8kutils.spec 
Log Message:
Requires tk (#188199) and sync all FC-4+ branches.



Index: i8kbuttons.init
===================================================================
RCS file: /cvs/extras/rpms/i8kutils/FC-4/i8kbuttons.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- i8kbuttons.init	16 Aug 2005 12:42:33 -0000	1.4
+++ i8kbuttons.init	7 Apr 2006 13:36:21 -0000	1.5
@@ -1,16 +1,16 @@
 #!/bin/bash
 #
-# i8kbuttons       Make the multimedia buttons (volume up/down, mute)
-#                  on dell inspiron work
+# i8kbuttons   Make the multimedia buttons (volume up/down, mute) on Dell
+#              Inspiron laptops work
 #
 # chkconfig: 2345 10 90
-# description: Make the multimedia buttons (volume up/down, mute) on dell
-#              inspiron work
+# description: Make the multimedia buttons (volume up/down, mute) on Dell \
+#              Inspiron laptops work
 #
 # ChangeLog: 2003/9/9 Jeremy Brand <jeremy at nirvani.net>
 # - Amount of 8 was quite dynamic, changed to 4.
 # - Also added PCM changes in addition to master volume.
-# 
+#
 
 # Source function library.
 . /etc/init.d/functions
@@ -23,26 +23,26 @@
 # See how we were called.
 case "$1" in
   start)
-        echo -n $"Starting $prog: "
-	/sbin/modprobe i8k force=1
+	echo -n $"Starting $prog: "
+	/sbin/modprobe i8k force=1 &>/dev/null
 	if pidofproc $prog &>/dev/null; then
 		echo_failure
 		RETVAL=1
 	else
 		$prog --up "$amixer -q set Master $amount+" --down "$amixer -q set Master $amount-" --mute "$amixer -q set Master 0" &
 		echo_success
-	    	touch /var/lock/subsys/$prog
+		touch /var/lock/subsys/$prog
 		RETVAL=0
 	fi
 	echo
-        ;;
+	;;
   stop)
-        echo -n $"Shutting down $prog: "
+	echo -n $"Shutting down $prog: "
 	killproc $prog
 	RETVAL=$?
-        echo
-        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
-        ;;
+	echo
+	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
+	;;
   status)
 	status $prog
 	RETVAL=$?
@@ -53,8 +53,8 @@
 	RETVAL=$?
 	;;
   *)
-        echo $"Usage: $0 {start|stop|restart|reload|status}"
-        exit 1
+	echo $"Usage: $0 {start|stop|restart|reload|status}"
+	exit 1
 esac
 
 exit $RETVAL


Index: i8kutils.spec
===================================================================
RCS file: /cvs/extras/rpms/i8kutils/FC-4/i8kutils.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- i8kutils.spec	16 Aug 2005 12:42:33 -0000	1.7
+++ i8kutils.spec	7 Apr 2006 13:36:21 -0000	1.8
@@ -1,9 +1,10 @@
+# http://www.coding-zone.com/?page=i8krellm
 %define gkrellmpluginver 2.5
 
 Summary: Dell laptop (Inspiron 8000 and others) SMM BIOS support tools
 Name: i8kutils
 Version: 1.25
-Release: 4%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: System Environment/Base
 URL: http://people.debian.org/~dz/i8k/
@@ -11,7 +12,7 @@
 Source1: http://www.coding-zone.com/i8krellm-%{gkrellmpluginver}.tar.gz
 Source2: i8kbuttons.init
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: alsa-utils, gkrellm >= 2.0.0
+Requires: alsa-utils, gkrellm >= 2.0.0, tk
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig, /sbin/service
 BuildRequires: gkrellm-devel >= 2.0.0
@@ -52,7 +53,7 @@
     %{__cp} -a i8krellm.so %{buildroot}%{_libdir}/gkrellm2/plugins/
 popd
 
-%{__install} -D -m 755 %{SOURCE2} \
+%{__install} -D -m 0755 %{SOURCE2} \
     %{buildroot}%{_sysconfdir}/rc.d/init.d/i8kbuttons
 
 
@@ -82,6 +83,16 @@
 
 
 %changelog
+* Fri Apr  7 2006 Matthias Saou <http://freshrpms.net/> 1.25-6
+- Add tk requirement, since the included i8kmon utility requires it.
+
+* Tue Mar 14 2006 Matthias Saou <http://freshrpms.net/> 1.25-6
+- FC5 rebuild.
+- Silence possible kernel module insertion error in the init script.
+
+* Thu Feb  9 2006 Matthias Saou <http://freshrpms.net/> 1.25-5
+- Rebuild for new gcc/glibc.
+
 * Tue Aug 16 2005 Matthias Saou <http://freshrpms.net/> 1.25-4
 - Fix init script to use amixer instead of no longer provided aumix (#165555).
 - Fix init script to not use obsolete initlog anymore.



From fedora-extras-commits at redhat.com  Fri Apr  7 14:11:26 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 07:11:26 -0700
Subject: comps comps-fe5.xml,1.3,1.4 comps-fe5.xml.in,1.34,1.35
Message-ID: <200604071411.k37EBSd5003422@cvs-int.fedora.redhat.com>

Author: spot

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

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

Rename git-core to git in comps



Index: comps-fe5.xml
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- comps-fe5.xml	13 Mar 2006 18:33:21 -0000	1.3
+++ comps-fe5.xml	7 Apr 2006 14:11:26 -0000	1.4
@@ -40,7 +40,7 @@
         <packagereq type="optional">fpc</packagereq>
         <packagereq type="optional">gforth</packagereq>
         <packagereq type="optional">ghc</packagereq>
-        <packagereq type="optional">git-core</packagereq>
+        <packagereq type="optional">git</packagereq>
         <packagereq type="optional">lincvs</packagereq>
         <packagereq type="optional">lua</packagereq>
         <packagereq type="optional">mach</packagereq>
@@ -785,4 +785,4 @@
       <groupid>network-server</groupid>
     </grouplist>
   </category>
-</comps>
\ No newline at end of file
+</comps>


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- comps-fe5.xml.in	7 Apr 2006 11:31:26 -0000	1.34
+++ comps-fe5.xml.in	7 Apr 2006 14:11:26 -0000	1.35
@@ -40,7 +40,7 @@
         <packagereq type="optional">fpc</packagereq>
         <packagereq type="optional">gforth</packagereq>
         <packagereq type="optional">ghc</packagereq>
-        <packagereq type="optional">git-core</packagereq>
+        <packagereq type="optional">git</packagereq>
         <packagereq type="optional">highlight</packagereq>
         <packagereq type="optional">lincvs</packagereq>
         <packagereq type="optional">lua</packagereq>



From fedora-extras-commits at redhat.com  Fri Apr  7 14:23:48 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Fri,  7 Apr 2006 07:23:48 -0700
Subject: fedora-security/audit fc4,1.192,1.193 fc5,1.105,1.106
Message-ID: <200604071423.k37ENmtw004817@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4466

Modified Files:
	fc4 fc5 
Log Message:
Add a note about a sysklogd issue.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- fc4	7 Apr 2006 07:07:30 -0000	1.192
+++ fc4	7 Apr 2006 14:23:46 -0000	1.193
@@ -4,6 +4,7 @@
 ** are items that need attention
 
 CVE-2006-1646 ignore (ipsec-tools) KAME racoon, not ipsec-tools racoon
+CVE-2006-1624 ignore (sysklogd) Silly configuration is not a security issue
 CVE-2006-1550 backport (dia) bz#187402 [since FEDORA-2006-261]
 CVE-2006-1548 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) bz#187544


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- fc5	7 Apr 2006 07:07:30 -0000	1.105
+++ fc5	7 Apr 2006 14:23:46 -0000	1.106
@@ -4,6 +4,7 @@
 ** are items that need attention
 
 CVE-2006-1646 ignore (ipsec-tools) KAME racoon, not ipsec-tools racoon
+CVE-2006-1624 ignore (sysklogd) Silly configuration is not a security issue
 CVE-2006-1548 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) bz#187544



From fedora-extras-commits at redhat.com  Fri Apr  7 14:53:34 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 07:53:34 -0700
Subject: rpms/perl-Template-Toolkit/FC-5 perl-Template-Toolkit.spec,1.3,1.4
Message-ID: <200604071453.k37Era0E005007@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Template-Toolkit/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4943/FC-5

Modified Files:
	perl-Template-Toolkit.spec 
Log Message:

Resolve BZ 173756



Index: perl-Template-Toolkit.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Template-Toolkit/FC-5/perl-Template-Toolkit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Template-Toolkit.spec	28 Feb 2006 23:42:16 -0000	1.3
+++ perl-Template-Toolkit.spec	7 Apr 2006 14:53:34 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Template-Toolkit
 Version:        2.14
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Template processing system
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -51,7 +51,7 @@
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor \
-  TT_PREFIX=%{_datadir}/tt2 TT_DBI=n TT_ACCEPT=y
+  TT_PREFIX=$RPM_BUILD_ROOT%{_datadir}/tt2 TT_DBI=n TT_ACCEPT=y
 make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
 
 %install
@@ -94,6 +94,9 @@
 %{_datadir}/tt2/examples
 
 %changelog
+* Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.14-7
+- use proper TT_PREFIX setting everywhere, resolve bug 173756
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.14-6
 - bump for FC-5
 



From fedora-extras-commits at redhat.com  Fri Apr  7 14:53:35 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 07:53:35 -0700
Subject: rpms/perl-Template-Toolkit/devel perl-Template-Toolkit.spec, 1.3,
	1.4
Message-ID: <200604071453.k37ErbYj005011@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Template-Toolkit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4943/devel

Modified Files:
	perl-Template-Toolkit.spec 
Log Message:

Resolve BZ 173756



Index: perl-Template-Toolkit.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Template-Toolkit/devel/perl-Template-Toolkit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Template-Toolkit.spec	28 Feb 2006 23:42:16 -0000	1.3
+++ perl-Template-Toolkit.spec	7 Apr 2006 14:53:35 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Template-Toolkit
 Version:        2.14
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Template processing system
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -51,7 +51,7 @@
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor \
-  TT_PREFIX=%{_datadir}/tt2 TT_DBI=n TT_ACCEPT=y
+  TT_PREFIX=$RPM_BUILD_ROOT%{_datadir}/tt2 TT_DBI=n TT_ACCEPT=y
 make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
 
 %install
@@ -94,6 +94,9 @@
 %{_datadir}/tt2/examples
 
 %changelog
+* Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.14-7
+- use proper TT_PREFIX setting everywhere, resolve bug 173756
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.14-6
 - bump for FC-5
 



From fedora-extras-commits at redhat.com  Fri Apr  7 14:53:34 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 07:53:34 -0700
Subject: rpms/perl-Template-Toolkit/FC-4 perl-Template-Toolkit.spec,1.3,1.4
Message-ID: <200604071453.k37EraLM005003@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Template-Toolkit/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4943/FC-4

Modified Files:
	perl-Template-Toolkit.spec 
Log Message:

Resolve BZ 173756



Index: perl-Template-Toolkit.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Template-Toolkit/FC-4/perl-Template-Toolkit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Template-Toolkit.spec	28 Feb 2006 23:42:11 -0000	1.3
+++ perl-Template-Toolkit.spec	7 Apr 2006 14:53:34 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Template-Toolkit
 Version:        2.14
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Template processing system
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -51,7 +51,7 @@
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor \
-  TT_PREFIX=%{_datadir}/tt2 TT_DBI=n TT_ACCEPT=y
+  TT_PREFIX=$RPM_BUILD_ROOT%{_datadir}/tt2 TT_DBI=n TT_ACCEPT=y
 make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
 
 %install
@@ -94,6 +94,9 @@
 %{_datadir}/tt2/examples
 
 %changelog
+* Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.14-7
+- use proper TT_PREFIX setting everywhere, resolve bug 173756
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.14-6
 - bump for FC-5
 



From fedora-extras-commits at redhat.com  Fri Apr  7 14:53:33 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 07:53:33 -0700
Subject: rpms/perl-Template-Toolkit/FC-3 perl-Template-Toolkit.spec,1.3,1.4
Message-ID: <200604071454.k37Es5lE005014@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Template-Toolkit/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4943/FC-3

Modified Files:
	perl-Template-Toolkit.spec 
Log Message:

Resolve BZ 173756



Index: perl-Template-Toolkit.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Template-Toolkit/FC-3/perl-Template-Toolkit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Template-Toolkit.spec	28 Feb 2006 23:42:05 -0000	1.3
+++ perl-Template-Toolkit.spec	7 Apr 2006 14:53:33 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Template-Toolkit
 Version:        2.14
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Template processing system
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -51,7 +51,7 @@
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor \
-  TT_PREFIX=%{_datadir}/tt2 TT_DBI=n TT_ACCEPT=y
+  TT_PREFIX=$RPM_BUILD_ROOT%{_datadir}/tt2 TT_DBI=n TT_ACCEPT=y
 make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
 
 %install
@@ -94,6 +94,9 @@
 %{_datadir}/tt2/examples
 
 %changelog
+* Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.14-7
+- use proper TT_PREFIX setting everywhere, resolve bug 173756
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.14-6
 - bump for FC-5
 



From fedora-extras-commits at redhat.com  Fri Apr  7 15:04:50 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Fri,  7 Apr 2006 08:04:50 -0700
Subject: rpms/exim/FC-5 exim-4.61-ldap-deprecated.patch, NONE, 1.1 exim.spec,
	1.17, 1.18
Message-ID: <200604071504.k37F4qYK007253@cvs-int.fedora.redhat.com>

Author: dwmw2

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

Modified Files:
	exim.spec 
Added Files:
	exim-4.61-ldap-deprecated.patch 
Log Message:
fix ldap build

exim-4.61-ldap-deprecated.patch:

--- NEW FILE exim-4.61-ldap-deprecated.patch ---
--- exim-4.61/src/lookups/ldap.c.orig	2006-04-07 16:02:48.000000000 +0100
+++ exim-4.61/src/lookups/ldap.c	2006-04-07 16:02:00.000000000 +0100
@@ -33,6 +33,7 @@ static void dummy(int x) { dummy(x-1); }
 
 /* Include LDAP headers */
 
+#define LDAP_DEPRECATED 1
 #include <lber.h>
 #include <ldap.h>
 


Index: exim.spec
===================================================================
RCS file: /cvs/extras/rpms/exim/FC-5/exim.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- exim.spec	4 Apr 2006 20:05:57 -0000	1.17
+++ exim.spec	7 Apr 2006 15:04:50 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: The exim mail transfer agent
 Name: exim
 Version: 4.61
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Url: http://www.exim.org/
 Group: System Environment/Daemons
@@ -26,6 +26,7 @@
 Patch14: exim-4.50-spamdconf.patch
 Patch15: exim-4.52-dynamic-pcre.patch
 Patch16: exim-4.61-c-before-d.patch
+Patch17: exim-4.61-ldap-deprecated.patch
 
 Requires: /etc/aliases
 BuildRequires: db4-devel openssl-devel openldap-devel pam-devel
@@ -81,6 +82,7 @@
 %patch14 -p1 -b .spamd
 %patch15 -p1 -b .pcre
 %patch16 -p0
+%patch17 -p1 -b .ldap
 
 %build
 %ifnarch s390 s390x
@@ -289,6 +291,9 @@
 %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO}
 
 %changelog
+* Fri Apr  7 2006 David Woodhouse <dwmw2 at redhat.com> 4.61-2
+- Define LDAP_DEPRECATED to ensure ldap functions are all declared.
+
 * Tue Apr  4 2006 David Woodhouse <dwmw2 at redhat.com> 4.61-1
 - Update to 4.61
 



From fedora-extras-commits at redhat.com  Fri Apr  7 15:05:18 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Fri,  7 Apr 2006 08:05:18 -0700
Subject: rpms/exim/devel exim-4.61-ldap-deprecated.patch, NONE, 1.1 exim.spec,
	1.17, 1.18
Message-ID: <200604071505.k37F5KsE007280@cvs-int.fedora.redhat.com>

Author: dwmw2

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

Modified Files:
	exim.spec 
Added Files:
	exim-4.61-ldap-deprecated.patch 
Log Message:
fix ldap build

exim-4.61-ldap-deprecated.patch:

--- NEW FILE exim-4.61-ldap-deprecated.patch ---
--- exim-4.61/src/lookups/ldap.c.orig	2006-04-07 16:02:48.000000000 +0100
+++ exim-4.61/src/lookups/ldap.c	2006-04-07 16:02:00.000000000 +0100
@@ -33,6 +33,7 @@ static void dummy(int x) { dummy(x-1); }
 
 /* Include LDAP headers */
 
+#define LDAP_DEPRECATED 1
 #include <lber.h>
 #include <ldap.h>
 


Index: exim.spec
===================================================================
RCS file: /cvs/extras/rpms/exim/devel/exim.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- exim.spec	4 Apr 2006 20:03:39 -0000	1.17
+++ exim.spec	7 Apr 2006 15:05:18 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: The exim mail transfer agent
 Name: exim
 Version: 4.61
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Url: http://www.exim.org/
 Group: System Environment/Daemons
@@ -26,6 +26,7 @@
 Patch14: exim-4.50-spamdconf.patch
 Patch15: exim-4.52-dynamic-pcre.patch
 Patch16: exim-4.61-c-before-d.patch
+Patch17: exim-4.61-ldap-deprecated.patch
 
 Requires: /etc/aliases
 BuildRequires: db4-devel openssl-devel openldap-devel pam-devel
@@ -81,6 +82,7 @@
 %patch14 -p1 -b .spamd
 %patch15 -p1 -b .pcre
 %patch16 -p0
+%patch17 -p1 -b .ldap
 
 %build
 %ifnarch s390 s390x
@@ -289,6 +291,9 @@
 %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO}
 
 %changelog
+* Fri Apr  7 2006 David Woodhouse <dwmw2 at redhat.com> 4.61-2
+- Define LDAP_DEPRECATED to ensure ldap functions are all declared.
+
 * Tue Apr  4 2006 David Woodhouse <dwmw2 at redhat.com> 4.61-1
 - Update to 4.61
 



From fedora-extras-commits at redhat.com  Fri Apr  7 15:19:42 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 08:19:42 -0700
Subject: rpms/xsupplicant/FC-4 sources, 1.6,
	1.7 xsupplicant-1.2.3-fixincludes.patch, 1.1,
	1.2 xsupplicant.spec, 1.16, 1.17
Message-ID: <200604071519.k37FJi1Y007461@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	sources xsupplicant-1.2.3-fixincludes.patch xsupplicant.spec 
Log Message:

bump to 1.2.4



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Mar 2006 02:11:38 -0000	1.6
+++ sources	7 Apr 2006 15:19:41 -0000	1.7
@@ -1 +1 @@
-f583f13d5bb91f98dab106d3610a677f  xsupplicant-1.2.3.tar.gz
+45c5bc08ae38152ba892a0923e0399cb  xsupplicant-1.2.4.tar.gz

xsupplicant-1.2.3-fixincludes.patch:

Index: xsupplicant-1.2.3-fixincludes.patch
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-4/xsupplicant-1.2.3-fixincludes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xsupplicant-1.2.3-fixincludes.patch	1 Mar 2006 02:13:49 -0000	1.1
+++ xsupplicant-1.2.3-fixincludes.patch	7 Apr 2006 15:19:41 -0000	1.2
@@ -53,13 +53,3 @@
  #include <stdlib.h>
  #include <string.h>
  #include <unistd.h>
---- xsupplicant-1.2.3/lib/libxsupconfcheck/Makefile.am.BAD	2006-02-28 20:00:00.000000000 -0600
-+++ xsupplicant-1.2.3/lib/libxsupconfcheck/Makefile.am	2006-02-28 20:00:13.000000000 -0600
-@@ -1,6 +1,6 @@
- AUTOMAKE_OPTIONS=foreign no-dependencies
- 
--INCLUDES                = -I ${top_srcdir}/src
-+INCLUDES                = -I ${top_srcdir}/src -I ${top_srcdir}/lib/libxsupconfig
- include_HEADERS         = xsupconfcheck.h
- lib_LIBRARIES           = libxsupconfcheck.a
- libxsupconfcheck_a_SOURCES = xsupconfcheck.c


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-4/xsupplicant.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xsupplicant.spec	1 Mar 2006 02:15:46 -0000	1.16
+++ xsupplicant.spec	7 Apr 2006 15:19:41 -0000	1.17
@@ -1,7 +1,7 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
-Version:	1.2.3
-Release:	2%{?dist}
+Version:	1.2.4
+Release:	1%{?dist}
 License:	GPL
 Group:		System Environment/Base
 URL:		http://www.open1x.org/
@@ -76,6 +76,9 @@
 %{_libdir}/libxsup*.a
 
 %changelog
+* Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.4-1
+- bump to 1.2.4
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.3-2
 - whoops. missed a file.
 



From fedora-extras-commits at redhat.com  Fri Apr  7 15:19:42 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 08:19:42 -0700
Subject: rpms/xsupplicant/FC-5 sources, 1.6,
	1.7 xsupplicant-1.2.3-fixincludes.patch, 1.1,
	1.2 xsupplicant.spec, 1.17, 1.18
Message-ID: <200604071519.k37FJifm007470@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	sources xsupplicant-1.2.3-fixincludes.patch xsupplicant.spec 
Log Message:

bump to 1.2.4



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Mar 2006 02:11:46 -0000	1.6
+++ sources	7 Apr 2006 15:19:42 -0000	1.7
@@ -1 +1 @@
-f583f13d5bb91f98dab106d3610a677f  xsupplicant-1.2.3.tar.gz
+45c5bc08ae38152ba892a0923e0399cb  xsupplicant-1.2.4.tar.gz

xsupplicant-1.2.3-fixincludes.patch:

Index: xsupplicant-1.2.3-fixincludes.patch
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-5/xsupplicant-1.2.3-fixincludes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xsupplicant-1.2.3-fixincludes.patch	1 Mar 2006 02:11:46 -0000	1.1
+++ xsupplicant-1.2.3-fixincludes.patch	7 Apr 2006 15:19:42 -0000	1.2
@@ -53,13 +53,3 @@
  #include <stdlib.h>
  #include <string.h>
  #include <unistd.h>
---- xsupplicant-1.2.3/lib/libxsupconfcheck/Makefile.am.BAD	2006-02-28 20:00:00.000000000 -0600
-+++ xsupplicant-1.2.3/lib/libxsupconfcheck/Makefile.am	2006-02-28 20:00:13.000000000 -0600
-@@ -1,6 +1,6 @@
- AUTOMAKE_OPTIONS=foreign no-dependencies
- 
--INCLUDES                = -I ${top_srcdir}/src
-+INCLUDES                = -I ${top_srcdir}/src -I ${top_srcdir}/lib/libxsupconfig
- include_HEADERS         = xsupconfcheck.h
- lib_LIBRARIES           = libxsupconfcheck.a
- libxsupconfcheck_a_SOURCES = xsupconfcheck.c


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-5/xsupplicant.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xsupplicant.spec	1 Mar 2006 02:16:06 -0000	1.17
+++ xsupplicant.spec	7 Apr 2006 15:19:42 -0000	1.18
@@ -1,7 +1,7 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
-Version:	1.2.3
-Release:	2%{?dist}
+Version:	1.2.4
+Release:	1%{?dist}
 License:	GPL
 Group:		System Environment/Base
 URL:		http://www.open1x.org/
@@ -76,6 +76,9 @@
 %{_libdir}/libxsup*.a
 
 %changelog
+* Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.4-1
+- bump to 1.2.4
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.3-2
 - whoops. missed a file.
 



From fedora-extras-commits at redhat.com  Fri Apr  7 15:19:43 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 08:19:43 -0700
Subject: rpms/xsupplicant/devel .cvsignore, 1.4, 1.5 sources, 1.6,
	1.7 xsupplicant-1.2.3-fixincludes.patch, 1.1,
	1.2 xsupplicant.spec, 1.17, 1.18
Message-ID: <200604071519.k37FJjwQ007480@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	.cvsignore sources xsupplicant-1.2.3-fixincludes.patch 
	xsupplicant.spec 
Log Message:

bump to 1.2.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Mar 2006 02:11:46 -0000	1.4
+++ .cvsignore	7 Apr 2006 15:19:43 -0000	1.5
@@ -1,3 +1,4 @@
 xsupplicant-1.2.tar.gz
 xsupplicant-1.2.2.tar.gz
 xsupplicant-1.2.3.tar.gz
+xsupplicant-1.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Mar 2006 02:11:46 -0000	1.6
+++ sources	7 Apr 2006 15:19:43 -0000	1.7
@@ -1 +1 @@
-f583f13d5bb91f98dab106d3610a677f  xsupplicant-1.2.3.tar.gz
+45c5bc08ae38152ba892a0923e0399cb  xsupplicant-1.2.4.tar.gz

xsupplicant-1.2.3-fixincludes.patch:

Index: xsupplicant-1.2.3-fixincludes.patch
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/devel/xsupplicant-1.2.3-fixincludes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xsupplicant-1.2.3-fixincludes.patch	1 Mar 2006 02:11:46 -0000	1.1
+++ xsupplicant-1.2.3-fixincludes.patch	7 Apr 2006 15:19:43 -0000	1.2
@@ -53,13 +53,3 @@
  #include <stdlib.h>
  #include <string.h>
  #include <unistd.h>
---- xsupplicant-1.2.3/lib/libxsupconfcheck/Makefile.am.BAD	2006-02-28 20:00:00.000000000 -0600
-+++ xsupplicant-1.2.3/lib/libxsupconfcheck/Makefile.am	2006-02-28 20:00:13.000000000 -0600
-@@ -1,6 +1,6 @@
- AUTOMAKE_OPTIONS=foreign no-dependencies
- 
--INCLUDES                = -I ${top_srcdir}/src
-+INCLUDES                = -I ${top_srcdir}/src -I ${top_srcdir}/lib/libxsupconfig
- include_HEADERS         = xsupconfcheck.h
- lib_LIBRARIES           = libxsupconfcheck.a
- libxsupconfcheck_a_SOURCES = xsupconfcheck.c


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/devel/xsupplicant.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xsupplicant.spec	1 Mar 2006 02:16:06 -0000	1.17
+++ xsupplicant.spec	7 Apr 2006 15:19:43 -0000	1.18
@@ -1,7 +1,7 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
-Version:	1.2.3
-Release:	2%{?dist}
+Version:	1.2.4
+Release:	1%{?dist}
 License:	GPL
 Group:		System Environment/Base
 URL:		http://www.open1x.org/
@@ -76,6 +76,9 @@
 %{_libdir}/libxsup*.a
 
 %changelog
+* Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.4-1
+- bump to 1.2.4
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.3-2
 - whoops. missed a file.
 



From fedora-extras-commits at redhat.com  Fri Apr  7 15:19:41 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 08:19:41 -0700
Subject: rpms/xsupplicant/FC-3 sources,1.5,1.6
Message-ID: <200604071520.k37FKDxb007483@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xsupplicant/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7389/FC-3

Modified Files:
	sources 
Log Message:

bump to 1.2.4



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Oct 2005 14:20:16 -0000	1.5
+++ sources	7 Apr 2006 15:19:41 -0000	1.6
@@ -1 +1 @@
-0e9aaf83a11f8eaff7c6564a53c25d8e  xsupplicant-1.2.2.tar.gz
+45c5bc08ae38152ba892a0923e0399cb  xsupplicant-1.2.4.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr  7 15:36:56 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  7 Apr 2006 08:36:56 -0700
Subject: rpms/pipenightdreams/devel pipenightdreams-0.10.0-sanitize.patch,
	NONE, 1.1 pipenightdreams.spec, 1.1, 1.2
Message-ID: <200604071536.k37Faw81008238@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	pipenightdreams.spec 
Added Files:
	pipenightdreams-0.10.0-sanitize.patch 
Log Message:
* Fri Apr  7 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.0-2
- Remove use of a trademarked term from %description, manpage and docs


pipenightdreams-0.10.0-sanitize.patch:

--- NEW FILE pipenightdreams-0.10.0-sanitize.patch ---
diff -ur pipenightdreams-0.10.0.orig/README pipenightdreams-0.10.0/README
--- pipenightdreams-0.10.0.orig/README	2001-10-12 22:02:34.000000000 +0200
+++ pipenightdreams-0.10.0/README	2006-04-07 17:15:52.000000000 +0200
@@ -9,7 +9,7 @@
               http:://www.libsdl.org/projects/pipenightdreams
 
 
-This game is a pseudo-clon of an old game called PipeDream. I say pseudo-clon
+This game is a pseudo-clon of an old pipeline arcade game. I say pseudo-clon
 because I don't have the original one so I've been working just with the facts
 I remember. I've written it in my spare time during the last twelve months (as you
 can see my spare time is not much).
diff -ur pipenightdreams-0.10.0.orig/man/pipenightdreams.6 pipenightdreams-0.10.0/man/pipenightdreams.6
--- pipenightdreams-0.10.0.orig/man/pipenightdreams.6	2002-03-23 22:17:05.000000000 +0100
+++ pipenightdreams-0.10.0/man/pipenightdreams.6	2006-04-07 17:30:39.000000000 +0200
@@ -6,23 +6,19 @@
 
 .SH SYNOPSIS 
 
-\fB pipenightdreams\fP [\--datadir <DATADIR>] [\--fullscreen]
+\fBpipenightdreams\fP [\--datadir <DATADIR>] [\--fullscreen]
 
 .SH DESCRIPTION
 
-\fB pipenightdreams\fP is a PipeDream style game. The objetive of the game is to carry
-liquid from some point to the exit using different kinds of pipes. On each level
-there is a minimum number of required pipes that should be at least reached for it
+\fBpipenightdreams\fP is a puzzle-game where the objective is to carry liquid
+from some point to the exit using different kinds of pipes. On each level there
+is a minimum number of required pipes that should be at least reached for it
 to be completed.
 
 The score is increased by using as many pipes as possible an by collecting various bonus
 tokens making the liquid pass through their pipes. There are also life bonus and,
 hopefully soon, "freeze tokens".
 
-The game is not exactly a copy of PipeDream. It's based only on the facts
-I remember and on many other things which have been added, or changed hoping for making
-it better.
-
 .SS KEYS
 The game is entirely played using the keyboard and the key layout is as follows:
 .IP SPACE
@@ -49,9 +45,7 @@
 
 .SH OPTIONS
 \fB --datadir <CUSTOM DATA DIR> \fP is used when
-the data directory is not the default one (\fB /usr/share/games/pipenightdreams\fP
-if installed from a rpm package and \fB /usr/local/share/games/pipenightdreams\fP
-when installed by compiling the source package).
+the data directory is not the default one (\fB/usr/share/pipenightdreams\fP).
 
 \fB --fullscreen \fP switchs to fullscreen mode.
 


Index: pipenightdreams.spec
===================================================================
RCS file: /cvs/extras/rpms/pipenightdreams/devel/pipenightdreams.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pipenightdreams.spec	7 Apr 2006 11:12:45 -0000	1.1
+++ pipenightdreams.spec	7 Apr 2006 15:36:56 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           pipenightdreams
 Version:        0.10.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Connect the waterpipes to create a proper pipeline
 Group:          Amusements/Games
 License:        GPL
@@ -9,20 +9,23 @@
 Source1:        %{name}.desktop
 Patch0:         pipenightdreams-0.10.0-gcc41.patch
 Patch1:         pipenightdreams-0.10.0-datadir.patch
+Patch2:         pipenightdreams-0.10.0-sanitize.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL_image-devel desktop-file-utils
 
 %description
-PipeNightDreams is a game similar to the classic PipeDream. It has 25 levels
-with increasing difficulty, and you can create your own by just editing
-text files. It has a lot of cool graphics, score, lives, required pipes
-per level and an easy and fast interface.
+PipeNightDreams is a puzzle-game where you must race against the clock to
+connect the waterpipes to create a proper pipeline before the water starts
+flowing. It has 25 levels with increasing difficulty, and you can create
+your own by just editing text files. It has a lot of cool graphics, score,
+lives, required pipes per level and an easy and fast interface.
 
 
 %prep
 %setup -q
 %patch0 -p1 -z .gcc41
-%patch1 -p1 -z .gcc41
+%patch1 -p1 -z .datadir
+%patch2 -p1 -z .sanitize
 
 
 %build
@@ -77,5 +80,8 @@
 
 
 %changelog
+* Fri Apr  7 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.0-2
+- Remove use of a trademarked term from %%description, manpage and docs
+
 * Wed Apr  5 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.0-1
 - initial Fedora Extras package



From fedora-extras-commits at redhat.com  Fri Apr  7 16:50:59 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri,  7 Apr 2006 09:50:59 -0700
Subject: rpms/svn2cl - New directory
Message-ID: <200604071651.k37Gp1aw010720@cvs-int.fedora.redhat.com>

Author: scop

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

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




From fedora-extras-commits at redhat.com  Fri Apr  7 16:51:00 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri,  7 Apr 2006 09:51:00 -0700
Subject: rpms/svn2cl/devel - New directory
Message-ID: <200604071651.k37Gp2Lr010723@cvs-int.fedora.redhat.com>

Author: scop

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

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




From fedora-extras-commits at redhat.com  Fri Apr  7 16:51:15 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri,  7 Apr 2006 09:51:15 -0700
Subject: rpms/svn2cl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604071651.k37GpHFN010775@cvs-int.fedora.redhat.com>

Author: scop

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

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


--- 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 Apr  7 16:51:15 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri,  7 Apr 2006 09:51:15 -0700
Subject: rpms/svn2cl Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604071651.k37GpHed010772@cvs-int.fedora.redhat.com>

Author: scop

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

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


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

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

common : CVS/Root
	@cvs 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 Apr  7 16:51:43 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri,  7 Apr 2006 09:51:43 -0700
Subject: rpms/svn2cl import.log,1.1,1.2
Message-ID: <200604071651.k37Gpjx8010836@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	import.log 
Log Message:
auto-import svn2cl-0.6-0.1 on branch devel from svn2cl-0.6-0.1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/svn2cl/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Apr 2006 16:51:14 -0000	1.1
+++ import.log	7 Apr 2006 16:51:43 -0000	1.2
@@ -0,0 +1 @@
+svn2cl-0_6-0_1:HEAD:svn2cl-0.6-0.1.src.rpm:1144428695



From fedora-extras-commits at redhat.com  Fri Apr  7 16:51:43 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri,  7 Apr 2006 09:51:43 -0700
Subject: rpms/svn2cl/devel svn2cl.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604071651.k37GpjlM010841@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	.cvsignore sources 
Added Files:
	svn2cl.spec 
Log Message:
auto-import svn2cl-0.6-0.1 on branch devel from svn2cl-0.6-0.1.src.rpm


--- NEW FILE svn2cl.spec ---
Name:           svn2cl
Version:        0.6
Release:        0.1%{?dist}
Summary:        Create a ChangeLog from a Subversion log

Group:          Development/Tools
License:        BSD
URL:            http://ch.tudelft.nl/~arthur/svn2cl/
Source0:        http://ch.tudelft.nl/~arthur/svn2cl/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
Requires:       libxslt
Requires:       subversion

%description
svn2cl is a simple xsl transformation and shellscript wrapper for
generating a classic GNU-style ChangeLog from a subversion repository
log.  It is made from several changelog-like scripts using common xslt
constructs found in different places.


%prep
%setup -q
sed -i -e 's|^XSL="$dir/|XSL="%{_datadir}/svn2cl/|' svn2cl.sh


%install
rm -rf $RPM_BUILD_ROOT
install -Dpm 755 svn2cl.sh $RPM_BUILD_ROOT%{_bindir}/svn2cl
install -dm 755 $RPM_BUILD_ROOT%{_datadir}/svn2cl
install -pm 644 *.xsl $RPM_BUILD_ROOT%{_datadir}/svn2cl
install -Dpm 644 svn2cl.1 $RPM_BUILD_ROOT%{_mandir}/man1/svn2cl.1


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog NEWS README TODO authors.xml svn2html.css
%{_bindir}/svn2cl
%{_datadir}/svn2cl/
%{_mandir}/man1/svn2cl.1*


%changelog
* Thu Mar 23 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.6-0.1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/svn2cl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2006 16:51:15 -0000	1.1
+++ .cvsignore	7 Apr 2006 16:51:43 -0000	1.2
@@ -0,0 +1 @@
+svn2cl-0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/svn2cl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2006 16:51:15 -0000	1.1
+++ sources	7 Apr 2006 16:51:43 -0000	1.2
@@ -0,0 +1 @@
+2458aeed899959f0c79319acd49c8e86  svn2cl-0.6.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr  7 16:53:36 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri,  7 Apr 2006 09:53:36 -0700
Subject: rpms/svn2cl/devel svn2cl.spec,1.1,1.2
Message-ID: <200604071653.k37GrciY010900@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	svn2cl.spec 
Log Message:
* Fri Apr  7 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.6-1
- First FE build (#186632).



Index: svn2cl.spec
===================================================================
RCS file: /cvs/extras/rpms/svn2cl/devel/svn2cl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- svn2cl.spec	7 Apr 2006 16:51:43 -0000	1.1
+++ svn2cl.spec	7 Apr 2006 16:53:36 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           svn2cl
 Version:        0.6
-Release:        0.1%{?dist}
+Release:        1%{?dist}
 Summary:        Create a ChangeLog from a Subversion log
 
 Group:          Development/Tools
@@ -46,5 +46,8 @@
 
 
 %changelog
+* Fri Apr  7 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.6-1
+- First FE build (#186632).
+
 * Thu Mar 23 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.6-0.1
 - First build.



From fedora-extras-commits at redhat.com  Fri Apr  7 16:58:51 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri,  7 Apr 2006 09:58:51 -0700
Subject: owners owners.list,1.807,1.808
Message-ID: <200604071658.k37GwrAQ010991@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	owners.list 
Log Message:
Add svn2cl (#186632).


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.807
retrieving revision 1.808
diff -u -r1.807 -r1.808
--- owners.list	7 Apr 2006 11:21:43 -0000	1.807
+++ owners.list	7 Apr 2006 16:58:51 -0000	1.808
@@ -1359,6 +1359,7 @@
 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|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|swatch|A tool for actively monitoring log files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|sweep|An audio editor and live playback tool|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|sword|Free Bible Software Project|mpeters at mac.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Apr  7 17:39:28 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri,  7 Apr 2006 10:39:28 -0700
Subject: rpms/apt/devel .cvsignore, 1.6, 1.7 apt.spec, 1.21, 1.22 sources,
	1.6, 1.7
Message-ID: <200604071739.k37HdUPI013429@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	.cvsignore apt.spec sources 
Log Message:
* Fri Apr  7 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.15lorg3-0.2.pre4
- 0.5.15lorg3-pre4.

* Fri Mar 24 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.15lorg3-0.2.pre3
- 0.5.15lorg3-pre3.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	23 Mar 2006 06:33:58 -0000	1.6
+++ .cvsignore	7 Apr 2006 17:39:27 -0000	1.7
@@ -1 +1 @@
-apt-0.5.15lorg3-pre2.tar.bz2
+apt-0.5.15lorg3-pre4.tar.bz2


Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- apt.spec	23 Mar 2006 06:33:58 -0000	1.21
+++ apt.spec	7 Apr 2006 17:39:27 -0000	1.22
@@ -6,12 +6,12 @@
 Summary:        Debian's Advanced Packaging Tool with RPM support
 Name:           apt
 Version:        0.5.15lorg3
-Release:        0.2.pre2%{?dist}
+Release:        0.2.pre4%{?dist}
 Group:          System Environment/Base
-URL:            https://moin.conectiva.com.br/AptRpm
+URL:            http://laiskiainen.org/
 License:        GPL
 
-Source0:        http://laiskiainen.org/apt/testing/%{name}-%{version}-pre2.tar.bz2
+Source0:        http://laiskiainen.org/apt/testing/%{name}-%{version}-pre4.tar.bz2
 
 # user editable template configs
 Source1:        apt.conf
@@ -126,7 +126,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-pre2
+%setup -q -n %{name}-%{version}-pre4
 
 # fix docs to reference correct paths
 perl -pi -e \
@@ -311,6 +311,12 @@
 
 
 %changelog
+* Fri Apr  7 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.15lorg3-0.2.pre4
+- 0.5.15lorg3-pre4.
+
+* Fri Mar 24 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.15lorg3-0.2.pre3
+- 0.5.15lorg3-pre3.
+
 * Wed Mar 22 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.15lorg3-0.2.pre2
 - Don't ship our copies of GPG keys, use ones in /etc/pki/rpm-gpg instead.
 - Don't import the "Old RHL key" by default.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Mar 2006 06:33:58 -0000	1.6
+++ sources	7 Apr 2006 17:39:27 -0000	1.7
@@ -1 +1 @@
-530456d62eb62d980ebb0d057260a7f1  apt-0.5.15lorg3-pre2.tar.bz2
+8c46b74a7e844c7e40017bdad59cee6c  apt-0.5.15lorg3-pre4.tar.bz2



From fedora-extras-commits at redhat.com  Fri Apr  7 18:11:28 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 11:11:28 -0700
Subject: rpms/perl-Template-Toolkit/FC-4 perl-Template-Toolkit.spec,1.4,1.5
Message-ID: <200604071811.k37IBUCI015786@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Template-Toolkit/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15726/FC-4

Modified Files:
	perl-Template-Toolkit.spec 
Log Message:

Really fix 173756



Index: perl-Template-Toolkit.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Template-Toolkit/FC-4/perl-Template-Toolkit.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Template-Toolkit.spec	7 Apr 2006 14:53:34 -0000	1.4
+++ perl-Template-Toolkit.spec	7 Apr 2006 18:11:28 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Template-Toolkit
 Version:        2.14
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Template processing system
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -68,6 +68,9 @@
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 mkdir _docs ; mv $RPM_BUILD_ROOT%{_datadir}/tt2/docs _docs
+# Nuke buildroot where it hides
+sed -i "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT%{_datadir}/tt2/examples/ttree.cfg
+sed -i "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT%{perl_vendorarch}/Template/Config.pm
 
 %check
 make test
@@ -94,6 +97,9 @@
 %{_datadir}/tt2/examples
 
 %changelog
+* Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.14-8
+- really resolve bug 173756
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.14-7
 - use proper TT_PREFIX setting everywhere, resolve bug 173756
 



From fedora-extras-commits at redhat.com  Fri Apr  7 18:11:29 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 11:11:29 -0700
Subject: rpms/perl-Template-Toolkit/FC-5 perl-Template-Toolkit.spec,1.4,1.5
Message-ID: <200604071811.k37IBVJ2015788@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Template-Toolkit/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15726/FC-5

Modified Files:
	perl-Template-Toolkit.spec 
Log Message:

Really fix 173756



Index: perl-Template-Toolkit.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Template-Toolkit/FC-5/perl-Template-Toolkit.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Template-Toolkit.spec	7 Apr 2006 14:53:34 -0000	1.4
+++ perl-Template-Toolkit.spec	7 Apr 2006 18:11:29 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Template-Toolkit
 Version:        2.14
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Template processing system
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -68,6 +68,9 @@
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 mkdir _docs ; mv $RPM_BUILD_ROOT%{_datadir}/tt2/docs _docs
+# Nuke buildroot where it hides
+sed -i "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT%{_datadir}/tt2/examples/ttree.cfg
+sed -i "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT%{perl_vendorarch}/Template/Config.pm
 
 %check
 make test
@@ -94,6 +97,9 @@
 %{_datadir}/tt2/examples
 
 %changelog
+* Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.14-8
+- really resolve bug 173756
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.14-7
 - use proper TT_PREFIX setting everywhere, resolve bug 173756
 



From fedora-extras-commits at redhat.com  Fri Apr  7 18:11:30 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 11:11:30 -0700
Subject: rpms/perl-Template-Toolkit/devel perl-Template-Toolkit.spec, 1.4,
	1.5
Message-ID: <200604071811.k37IBWU9015792@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Template-Toolkit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15726/devel

Modified Files:
	perl-Template-Toolkit.spec 
Log Message:

Really fix 173756



Index: perl-Template-Toolkit.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Template-Toolkit/devel/perl-Template-Toolkit.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Template-Toolkit.spec	7 Apr 2006 14:53:35 -0000	1.4
+++ perl-Template-Toolkit.spec	7 Apr 2006 18:11:30 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Template-Toolkit
 Version:        2.14
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Template processing system
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -68,6 +68,9 @@
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 mkdir _docs ; mv $RPM_BUILD_ROOT%{_datadir}/tt2/docs _docs
+# Nuke buildroot where it hides
+sed -i "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT%{_datadir}/tt2/examples/ttree.cfg
+sed -i "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT%{perl_vendorarch}/Template/Config.pm
 
 %check
 make test
@@ -94,6 +97,9 @@
 %{_datadir}/tt2/examples
 
 %changelog
+* Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.14-8
+- really resolve bug 173756
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.14-7
 - use proper TT_PREFIX setting everywhere, resolve bug 173756
 



From fedora-extras-commits at redhat.com  Fri Apr  7 18:11:28 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 11:11:28 -0700
Subject: rpms/perl-Template-Toolkit/FC-3 perl-Template-Toolkit.spec,1.4,1.5
Message-ID: <200604071812.k37IC0cL015797@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Template-Toolkit/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15726/FC-3

Modified Files:
	perl-Template-Toolkit.spec 
Log Message:

Really fix 173756



Index: perl-Template-Toolkit.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Template-Toolkit/FC-3/perl-Template-Toolkit.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Template-Toolkit.spec	7 Apr 2006 14:53:33 -0000	1.4
+++ perl-Template-Toolkit.spec	7 Apr 2006 18:11:27 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Template-Toolkit
 Version:        2.14
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Template processing system
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -68,6 +68,10 @@
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 mkdir _docs ; mv $RPM_BUILD_ROOT%{_datadir}/tt2/docs _docs
+# Nuke buildroot where it hides
+sed -i "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT%{_datadir}/tt2/examples/ttree.cfg
+sed -i "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT%{perl_vendorarch}/Template/Config.pm
+
 
 %check
 make test
@@ -94,6 +98,9 @@
 %{_datadir}/tt2/examples
 
 %changelog
+* Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.14-8
+- really resolve bug 173756
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.14-7
 - use proper TT_PREFIX setting everywhere, resolve bug 173756
 



From fedora-extras-commits at redhat.com  Fri Apr  7 18:27:32 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 11:27:32 -0700
Subject: rpms/blacs/devel blacs.spec,1.16,1.17
Message-ID: <200604071827.k37IRYdV016039@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	blacs.spec 
Log Message:

Resolve lam BR, fix bz 181775



Index: blacs.spec
===================================================================
RCS file: /cvs/extras/rpms/blacs/devel/blacs.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- blacs.spec	28 Feb 2006 21:22:29 -0000	1.16
+++ blacs.spec	7 Apr 2006 18:27:31 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -19,8 +19,8 @@
 # Lam before 7.1.1-5 is missing:
 # -shared library support
 # -fPIC compilation flag
-BuildRequires: lapack, blas, lam >= 7.1.1-5
-Requires: lapack, blas, lam >= 7.1.1-5
+BuildRequires: lapack, blas, lam >= 2:7.1.1-5
+Requires: lapack, blas, lam >= 2:7.1.1-5
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0: blacs-shared.patch
 
@@ -109,6 +109,9 @@
 %{_libdir}/libmpiblacs*.so
 
 %changelog
+* Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-20
+- fix lam BR
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-19
 - fix broken bits in shared lib (no -fstack-protector for us)
 



From fedora-extras-commits at redhat.com  Fri Apr  7 18:27:25 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 11:27:25 -0700
Subject: rpms/blacs/FC-3 blacs.spec,1.16,1.17
Message-ID: <200604071827.k37IRvFv016042@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/blacs/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15977/FC-3

Modified Files:
	blacs.spec 
Log Message:

Resolve lam BR, fix bz 181775



Index: blacs.spec
===================================================================
RCS file: /cvs/extras/rpms/blacs/FC-3/blacs.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- blacs.spec	28 Feb 2006 21:22:17 -0000	1.16
+++ blacs.spec	7 Apr 2006 18:27:24 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -19,8 +19,8 @@
 # Lam before 7.1.1-5 is missing:
 # -shared library support
 # -fPIC compilation flag
-BuildRequires: lapack, blas, lam >= 7.1.1-5
-Requires: lapack, blas, lam >= 7.1.1-5
+BuildRequires: lapack, blas, lam >= 2:7.1.1-5
+Requires: lapack, blas, lam >= 2:7.1.1-5
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0: blacs-shared.patch
 
@@ -109,6 +109,9 @@
 %{_libdir}/libmpiblacs*.so
 
 %changelog
+* Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-20
+- fix lam BR
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-19
 - fix broken bits in shared lib (no -fstack-protector for us)
 



From fedora-extras-commits at redhat.com  Fri Apr  7 18:27:25 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 11:27:25 -0700
Subject: rpms/blacs/FC-4 blacs.spec,1.16,1.17
Message-ID: <200604071827.k37IRvTr016045@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	blacs.spec 
Log Message:

Resolve lam BR, fix bz 181775



Index: blacs.spec
===================================================================
RCS file: /cvs/extras/rpms/blacs/FC-4/blacs.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- blacs.spec	28 Feb 2006 21:22:23 -0000	1.16
+++ blacs.spec	7 Apr 2006 18:27:25 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -19,8 +19,8 @@
 # Lam before 7.1.1-5 is missing:
 # -shared library support
 # -fPIC compilation flag
-BuildRequires: lapack, blas, lam >= 7.1.1-5
-Requires: lapack, blas, lam >= 7.1.1-5
+BuildRequires: lapack, blas, lam >= 2:7.1.1-5
+Requires: lapack, blas, lam >= 2:7.1.1-5
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0: blacs-shared.patch
 
@@ -109,6 +109,9 @@
 %{_libdir}/libmpiblacs*.so
 
 %changelog
+* Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-20
+- fix lam BR
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-19
 - fix broken bits in shared lib (no -fstack-protector for us)
 



From fedora-extras-commits at redhat.com  Fri Apr  7 18:27:26 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 11:27:26 -0700
Subject: rpms/blacs/FC-5 blacs.spec,1.16,1.17
Message-ID: <200604071828.k37IRwEN016048@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	blacs.spec 
Log Message:

Resolve lam BR, fix bz 181775



Index: blacs.spec
===================================================================
RCS file: /cvs/extras/rpms/blacs/FC-5/blacs.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- blacs.spec	28 Feb 2006 21:22:29 -0000	1.16
+++ blacs.spec	7 Apr 2006 18:27:26 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -19,8 +19,8 @@
 # Lam before 7.1.1-5 is missing:
 # -shared library support
 # -fPIC compilation flag
-BuildRequires: lapack, blas, lam >= 7.1.1-5
-Requires: lapack, blas, lam >= 7.1.1-5
+BuildRequires: lapack, blas, lam >= 2:7.1.1-5
+Requires: lapack, blas, lam >= 2:7.1.1-5
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0: blacs-shared.patch
 
@@ -109,6 +109,9 @@
 %{_libdir}/libmpiblacs*.so
 
 %changelog
+* Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-20
+- fix lam BR
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-19
 - fix broken bits in shared lib (no -fstack-protector for us)
 



From fedora-extras-commits at redhat.com  Fri Apr  7 18:53:22 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 11:53:22 -0700
Subject: rpms/blacs/devel Bmake.inc, 1.3, 1.4 Bmake.inc.64bit, 1.3,
	1.4 blacs.spec, 1.17, 1.18
Message-ID: <200604071853.k37IrOnN016583@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	Bmake.inc Bmake.inc.64bit blacs.spec 
Log Message:

Fix lam includes



Index: Bmake.inc
===================================================================
RCS file: /cvs/extras/rpms/blacs/devel/Bmake.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Bmake.inc	29 Jul 2005 22:08:23 -0000	1.3
+++ Bmake.inc	7 Apr 2006 18:53:22 -0000	1.4
@@ -55,7 +55,7 @@
 #  -------------------------------------
    MPIdir = /usr
    MPILIBdir = $(MPIdir)/lib
-   MPIINCdir = $(MPIdir)/include
+   MPIINCdir = $(MPIdir)/include/lam
    MPILIB = -lmpi
    LAMLIBS = -llam -llamf77mpi
    EXTRALIBS = -ldl -lpthread -lutil


Index: Bmake.inc.64bit
===================================================================
RCS file: /cvs/extras/rpms/blacs/devel/Bmake.inc.64bit,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Bmake.inc.64bit	29 Jul 2005 22:08:23 -0000	1.3
+++ Bmake.inc.64bit	7 Apr 2006 18:53:22 -0000	1.4
@@ -55,7 +55,7 @@
 #  -------------------------------------
    MPIdir = /usr
    MPILIBdir = $(MPIdir)/lib64
-   MPIINCdir = $(MPIdir)/include
+   MPIINCdir = $(MPIdir)/include/lam
    MPILIB = -lmpi
    LAMLIBS = -llam -llamf77mpi
    EXTRALIBS = -ldl -lpthread -lutil


Index: blacs.spec
===================================================================
RCS file: /cvs/extras/rpms/blacs/devel/blacs.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- blacs.spec	7 Apr 2006 18:27:31 -0000	1.17
+++ blacs.spec	7 Apr 2006 18:53:22 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -109,6 +109,9 @@
 %{_libdir}/libmpiblacs*.so
 
 %changelog
+* Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-21
+- FC-5+ needs includedir/lam
+
 * Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-20
 - fix lam BR
 



From fedora-extras-commits at redhat.com  Fri Apr  7 18:53:15 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 11:53:15 -0700
Subject: rpms/blacs/FC-4 blacs.spec,1.17,1.18
Message-ID: <200604071853.k37Irl4P016588@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	blacs.spec 
Log Message:

Fix lam includes



Index: blacs.spec
===================================================================
RCS file: /cvs/extras/rpms/blacs/FC-4/blacs.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- blacs.spec	7 Apr 2006 18:27:25 -0000	1.17
+++ blacs.spec	7 Apr 2006 18:53:15 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -109,6 +109,9 @@
 %{_libdir}/libmpiblacs*.so
 
 %changelog
+* Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-21
+- FC-5+ needs includedir/lam
+
 * Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-20
 - fix lam BR
 



From fedora-extras-commits at redhat.com  Fri Apr  7 18:53:16 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 11:53:16 -0700
Subject: rpms/blacs/FC-5 Bmake.inc, 1.3, 1.4 Bmake.inc.64bit, 1.3,
	1.4 blacs.spec, 1.17, 1.18
Message-ID: <200604071853.k37IrmP5016595@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	Bmake.inc Bmake.inc.64bit blacs.spec 
Log Message:

Fix lam includes



Index: Bmake.inc
===================================================================
RCS file: /cvs/extras/rpms/blacs/FC-5/Bmake.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Bmake.inc	29 Jul 2005 22:08:23 -0000	1.3
+++ Bmake.inc	7 Apr 2006 18:53:16 -0000	1.4
@@ -55,7 +55,7 @@
 #  -------------------------------------
    MPIdir = /usr
    MPILIBdir = $(MPIdir)/lib
-   MPIINCdir = $(MPIdir)/include
+   MPIINCdir = $(MPIdir)/include/lam
    MPILIB = -lmpi
    LAMLIBS = -llam -llamf77mpi
    EXTRALIBS = -ldl -lpthread -lutil


Index: Bmake.inc.64bit
===================================================================
RCS file: /cvs/extras/rpms/blacs/FC-5/Bmake.inc.64bit,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Bmake.inc.64bit	29 Jul 2005 22:08:23 -0000	1.3
+++ Bmake.inc.64bit	7 Apr 2006 18:53:16 -0000	1.4
@@ -55,7 +55,7 @@
 #  -------------------------------------
    MPIdir = /usr
    MPILIBdir = $(MPIdir)/lib64
-   MPIINCdir = $(MPIdir)/include
+   MPIINCdir = $(MPIdir)/include/lam
    MPILIB = -lmpi
    LAMLIBS = -llam -llamf77mpi
    EXTRALIBS = -ldl -lpthread -lutil


Index: blacs.spec
===================================================================
RCS file: /cvs/extras/rpms/blacs/FC-5/blacs.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- blacs.spec	7 Apr 2006 18:27:26 -0000	1.17
+++ blacs.spec	7 Apr 2006 18:53:16 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -109,6 +109,9 @@
 %{_libdir}/libmpiblacs*.so
 
 %changelog
+* Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-21
+- FC-5+ needs includedir/lam
+
 * Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-20
 - fix lam BR
 



From fedora-extras-commits at redhat.com  Fri Apr  7 18:53:15 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 11:53:15 -0700
Subject: rpms/blacs/FC-3 blacs.spec,1.17,1.18
Message-ID: <200604071853.k37IrlJW016587@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/blacs/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16515/FC-3

Modified Files:
	blacs.spec 
Log Message:

Fix lam includes



Index: blacs.spec
===================================================================
RCS file: /cvs/extras/rpms/blacs/FC-3/blacs.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- blacs.spec	7 Apr 2006 18:27:24 -0000	1.17
+++ blacs.spec	7 Apr 2006 18:53:15 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -109,6 +109,9 @@
 %{_libdir}/libmpiblacs*.so
 
 %changelog
+* Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-21
+- FC-5+ needs includedir/lam
+
 * Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-20
 - fix lam BR
 



From fedora-extras-commits at redhat.com  Fri Apr  7 18:57:58 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 11:57:58 -0700
Subject: rpms/blacs/FC-5 Bmake.inc,1.4,1.5 Bmake.inc.64bit,1.4,1.5
Message-ID: <200604071858.k37Iw0Yp016651@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	Bmake.inc Bmake.inc.64bit 
Log Message:

lib fix



Index: Bmake.inc
===================================================================
RCS file: /cvs/extras/rpms/blacs/FC-5/Bmake.inc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Bmake.inc	7 Apr 2006 18:53:16 -0000	1.4
+++ Bmake.inc	7 Apr 2006 18:57:58 -0000	1.5
@@ -54,7 +54,7 @@
 #  Name and location of the MPI library.
 #  -------------------------------------
    MPIdir = /usr
-   MPILIBdir = $(MPIdir)/lib
+   MPILIBdir = $(MPIdir)/lib/lam
    MPIINCdir = $(MPIdir)/include/lam
    MPILIB = -lmpi
    LAMLIBS = -llam -llamf77mpi


Index: Bmake.inc.64bit
===================================================================
RCS file: /cvs/extras/rpms/blacs/FC-5/Bmake.inc.64bit,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Bmake.inc.64bit	7 Apr 2006 18:53:16 -0000	1.4
+++ Bmake.inc.64bit	7 Apr 2006 18:57:58 -0000	1.5
@@ -54,7 +54,7 @@
 #  Name and location of the MPI library.
 #  -------------------------------------
    MPIdir = /usr
-   MPILIBdir = $(MPIdir)/lib64
+   MPILIBdir = $(MPIdir)/lib64/lam
    MPIINCdir = $(MPIdir)/include/lam
    MPILIB = -lmpi
    LAMLIBS = -llam -llamf77mpi



From fedora-extras-commits at redhat.com  Fri Apr  7 18:57:59 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 11:57:59 -0700
Subject: rpms/blacs/devel Bmake.inc,1.4,1.5 Bmake.inc.64bit,1.4,1.5
Message-ID: <200604071858.k37Iw1kJ016656@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	Bmake.inc Bmake.inc.64bit 
Log Message:

lib fix



Index: Bmake.inc
===================================================================
RCS file: /cvs/extras/rpms/blacs/devel/Bmake.inc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Bmake.inc	7 Apr 2006 18:53:22 -0000	1.4
+++ Bmake.inc	7 Apr 2006 18:57:59 -0000	1.5
@@ -54,7 +54,7 @@
 #  Name and location of the MPI library.
 #  -------------------------------------
    MPIdir = /usr
-   MPILIBdir = $(MPIdir)/lib
+   MPILIBdir = $(MPIdir)/lib/lam
    MPIINCdir = $(MPIdir)/include/lam
    MPILIB = -lmpi
    LAMLIBS = -llam -llamf77mpi


Index: Bmake.inc.64bit
===================================================================
RCS file: /cvs/extras/rpms/blacs/devel/Bmake.inc.64bit,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Bmake.inc.64bit	7 Apr 2006 18:53:22 -0000	1.4
+++ Bmake.inc.64bit	7 Apr 2006 18:57:59 -0000	1.5
@@ -54,7 +54,7 @@
 #  Name and location of the MPI library.
 #  -------------------------------------
    MPIdir = /usr
-   MPILIBdir = $(MPIdir)/lib64
+   MPILIBdir = $(MPIdir)/lib64/lam
    MPIINCdir = $(MPIdir)/include/lam
    MPILIB = -lmpi
    LAMLIBS = -llam -llamf77mpi



From fedora-extras-commits at redhat.com  Fri Apr  7 19:37:22 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 12:37:22 -0700
Subject: rpms/blacs/devel Bmake.inc, 1.5, 1.6 Bmake.inc.64bit, 1.5,
	1.6 blacs.spec, 1.18, 1.19
Message-ID: <200604071937.k37JbOLu020550@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	Bmake.inc Bmake.inc.64bit blacs.spec 
Log Message:

Fix FC5+ lam libs



Index: Bmake.inc
===================================================================
RCS file: /cvs/extras/rpms/blacs/devel/Bmake.inc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Bmake.inc	7 Apr 2006 18:57:59 -0000	1.5
+++ Bmake.inc	7 Apr 2006 19:37:22 -0000	1.6
@@ -63,7 +63,7 @@
 #  -------------------------------------
 #  All libraries required by the tester.
 #  -------------------------------------
-   BTLIBS = -L$(BLACSdir) $(BLACSFINITSL) $(BLACSLIBSL) $(BLACSCINITSL) $(MPILIB) $(LAMLIBS) $(EXTRALIBS)
+   BTLIBS = -L$(BLACSdir) $(BLACSFINITSL) $(BLACSLIBSL) $(BLACSCINITSL) -L$(MPILIBdir) $(MPILIB) $(LAMLIBS) $(EXTRALIBS)
 
 #  ----------------------------------------------------------------
 #  The directory to put the installation help routines' executables


Index: Bmake.inc.64bit
===================================================================
RCS file: /cvs/extras/rpms/blacs/devel/Bmake.inc.64bit,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Bmake.inc.64bit	7 Apr 2006 18:57:59 -0000	1.5
+++ Bmake.inc.64bit	7 Apr 2006 19:37:22 -0000	1.6
@@ -63,7 +63,7 @@
 #  -------------------------------------
 #  All libraries required by the tester.
 #  -------------------------------------
-   BTLIBS = -L$(BLACSdir) $(BLACSFINITSL) $(BLACSLIBSL) $(BLACSCINITSL) $(MPILIB) $(LAMLIBS) $(EXTRALIBS)
+   BTLIBS = -L$(BLACSdir) $(BLACSFINITSL) $(BLACSLIBSL) $(BLACSCINITSL) -L$(MPILIBdir) $(MPILIB) $(LAMLIBS) $(EXTRALIBS)
 
 #  ----------------------------------------------------------------
 #  The directory to put the installation help routines' executables


Index: blacs.spec
===================================================================
RCS file: /cvs/extras/rpms/blacs/devel/blacs.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- blacs.spec	7 Apr 2006 18:53:22 -0000	1.18
+++ blacs.spec	7 Apr 2006 19:37:22 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -109,6 +109,9 @@
 %{_libdir}/libmpiblacs*.so
 
 %changelog
+* Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-22
+- FC-5+ also needs -L libdir/lam
+
 * Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-21
 - FC-5+ needs includedir/lam
 



From fedora-extras-commits at redhat.com  Fri Apr  7 19:37:15 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 12:37:15 -0700
Subject: rpms/blacs/FC-3 blacs.spec,1.18,1.19
Message-ID: <200604071937.k37JblTJ020650@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/blacs/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20308/FC-3

Modified Files:
	blacs.spec 
Log Message:

Fix FC5+ lam libs



Index: blacs.spec
===================================================================
RCS file: /cvs/extras/rpms/blacs/FC-3/blacs.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- blacs.spec	7 Apr 2006 18:53:15 -0000	1.18
+++ blacs.spec	7 Apr 2006 19:37:15 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -109,6 +109,9 @@
 %{_libdir}/libmpiblacs*.so
 
 %changelog
+* Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-22
+- FC-5+ also needs -L libdir/lam
+
 * Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-21
 - FC-5+ needs includedir/lam
 



From fedora-extras-commits at redhat.com  Fri Apr  7 19:37:16 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 12:37:16 -0700
Subject: rpms/blacs/FC-4 blacs.spec,1.18,1.19
Message-ID: <200604071937.k37JbmdW020655@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	blacs.spec 
Log Message:

Fix FC5+ lam libs



Index: blacs.spec
===================================================================
RCS file: /cvs/extras/rpms/blacs/FC-4/blacs.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- blacs.spec	7 Apr 2006 18:53:15 -0000	1.18
+++ blacs.spec	7 Apr 2006 19:37:16 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -109,6 +109,9 @@
 %{_libdir}/libmpiblacs*.so
 
 %changelog
+* Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-22
+- FC-5+ also needs -L libdir/lam
+
 * Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-21
 - FC-5+ needs includedir/lam
 



From fedora-extras-commits at redhat.com  Fri Apr  7 19:37:16 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 12:37:16 -0700
Subject: rpms/blacs/FC-5 Bmake.inc, 1.5, 1.6 Bmake.inc.64bit, 1.5,
	1.6 blacs.spec, 1.18, 1.19
Message-ID: <200604071937.k37Jbmpn020662@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	Bmake.inc Bmake.inc.64bit blacs.spec 
Log Message:

Fix FC5+ lam libs



Index: Bmake.inc
===================================================================
RCS file: /cvs/extras/rpms/blacs/FC-5/Bmake.inc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Bmake.inc	7 Apr 2006 18:57:58 -0000	1.5
+++ Bmake.inc	7 Apr 2006 19:37:16 -0000	1.6
@@ -63,7 +63,7 @@
 #  -------------------------------------
 #  All libraries required by the tester.
 #  -------------------------------------
-   BTLIBS = -L$(BLACSdir) $(BLACSFINITSL) $(BLACSLIBSL) $(BLACSCINITSL) $(MPILIB) $(LAMLIBS) $(EXTRALIBS)
+   BTLIBS = -L$(BLACSdir) $(BLACSFINITSL) $(BLACSLIBSL) $(BLACSCINITSL) -L$(MPILIBdir) $(MPILIB) $(LAMLIBS) $(EXTRALIBS)
 
 #  ----------------------------------------------------------------
 #  The directory to put the installation help routines' executables


Index: Bmake.inc.64bit
===================================================================
RCS file: /cvs/extras/rpms/blacs/FC-5/Bmake.inc.64bit,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Bmake.inc.64bit	7 Apr 2006 18:57:58 -0000	1.5
+++ Bmake.inc.64bit	7 Apr 2006 19:37:16 -0000	1.6
@@ -63,7 +63,7 @@
 #  -------------------------------------
 #  All libraries required by the tester.
 #  -------------------------------------
-   BTLIBS = -L$(BLACSdir) $(BLACSFINITSL) $(BLACSLIBSL) $(BLACSCINITSL) $(MPILIB) $(LAMLIBS) $(EXTRALIBS)
+   BTLIBS = -L$(BLACSdir) $(BLACSFINITSL) $(BLACSLIBSL) $(BLACSCINITSL) -L$(MPILIBdir) $(MPILIB) $(LAMLIBS) $(EXTRALIBS)
 
 #  ----------------------------------------------------------------
 #  The directory to put the installation help routines' executables


Index: blacs.spec
===================================================================
RCS file: /cvs/extras/rpms/blacs/FC-5/blacs.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- blacs.spec	7 Apr 2006 18:53:16 -0000	1.18
+++ blacs.spec	7 Apr 2006 19:37:16 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -109,6 +109,9 @@
 %{_libdir}/libmpiblacs*.so
 
 %changelog
+* Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-22
+- FC-5+ also needs -L libdir/lam
+
 * Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-21
 - FC-5+ needs includedir/lam
 



From fedora-extras-commits at redhat.com  Fri Apr  7 20:56:18 2006
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Fri,  7 Apr 2006 13:56:18 -0700
Subject: rpms/perl-Imager/FC-4 .cvsignore, 1.3, 1.4 perl-Imager.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200604072056.k37KuK0Y023342@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/perl-Imager/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23321

Modified Files:
	.cvsignore perl-Imager.spec sources 
Log Message:
Updated to 0.50


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Imager/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Feb 2006 12:05:31 -0000	1.3
+++ .cvsignore	7 Apr 2006 20:56:17 -0000	1.4
@@ -1 +1 @@
-Imager-0.47.tar.gz
+Imager-0.50.tar.gz


Index: perl-Imager.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Imager/FC-4/perl-Imager.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Imager.spec	28 Feb 2006 12:05:33 -0000	1.2
+++ perl-Imager.spec	7 Apr 2006 20:56:17 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-Imager
-Version:        0.47
+Version:        0.50
 Release:        1%{?dist}
 Summary:        Imager - Perl extension for Generating 24 bit Images
 
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Fri Apr 07 2006 Gavin Henry <ghenry[AT]suretecsystems.com> - 0.50-1
+- Updated version for security fix
+
 * Tue Feb 28 2006 Gavin Henry <ghenry[AT]suretecsystems.com> - 0.47-1
 - Updated version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Imager/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Feb 2006 12:05:33 -0000	1.3
+++ sources	7 Apr 2006 20:56:17 -0000	1.4
@@ -1 +1 @@
-45e46bcf5cabdf5d7d0820226274b565  Imager-0.47.tar.gz
+19cfffe047909599226f76694155f996  Imager-0.50.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr  7 20:57:57 2006
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Fri,  7 Apr 2006 13:57:57 -0700
Subject: rpms/perl-Imager/FC-5 .cvsignore, 1.3, 1.4 perl-Imager.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200604072057.k37Kvx5x023413@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/perl-Imager/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23392

Modified Files:
	.cvsignore perl-Imager.spec sources 
Log Message:
Updated to 0.50


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Imager/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Feb 2006 12:03:03 -0000	1.3
+++ .cvsignore	7 Apr 2006 20:57:57 -0000	1.4
@@ -1 +1 @@
-Imager-0.47.tar.gz
+Imager-0.50.tar.gz


Index: perl-Imager.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Imager/FC-5/perl-Imager.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Imager.spec	28 Feb 2006 12:03:03 -0000	1.2
+++ perl-Imager.spec	7 Apr 2006 20:57:57 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-Imager
-Version:        0.47
+Version:        0.50
 Release:        1%{?dist}
 Summary:        Imager - Perl extension for Generating 24 bit Images
 
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Fri Apr 07 2006 Gavin Henry <ghenry[AT]suretecsystems.com> - 0.50-1
+- Updated version for security fix
+
 * Tue Feb 28 2006 Gavin Henry <ghenry[AT]suretecsystems.com> - 0.47-1
 - Updated version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Imager/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Feb 2006 12:03:03 -0000	1.3
+++ sources	7 Apr 2006 20:57:57 -0000	1.4
@@ -1 +1 @@
-45e46bcf5cabdf5d7d0820226274b565  Imager-0.47.tar.gz
+19cfffe047909599226f76694155f996  Imager-0.50.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr  7 20:59:45 2006
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Fri,  7 Apr 2006 13:59:45 -0700
Subject: rpms/perl-Imager/devel .cvsignore, 1.3, 1.4 perl-Imager.spec, 1.2, 
	1.3 sources, 1.3, 1.4
Message-ID: <200604072059.k37KxlAO023489@cvs-int.fedora.redhat.com>

Author: ghenry

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

Modified Files:
	.cvsignore perl-Imager.spec sources 
Log Message:
Updated to 0.50


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Imager/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Feb 2006 12:03:03 -0000	1.3
+++ .cvsignore	7 Apr 2006 20:59:45 -0000	1.4
@@ -1 +1 @@
-Imager-0.47.tar.gz
+Imager-0.50.tar.gz


Index: perl-Imager.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Imager/devel/perl-Imager.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Imager.spec	28 Feb 2006 12:03:03 -0000	1.2
+++ perl-Imager.spec	7 Apr 2006 20:59:45 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-Imager
-Version:        0.47
+Version:        0.50
 Release:        1%{?dist}
 Summary:        Imager - Perl extension for Generating 24 bit Images
 
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Fri Apr 07 2006 Gavin Henry <ghenry[AT]suretecsystems.com> - 0.50-1
+- Updated version for security fix
+
 * Tue Feb 28 2006 Gavin Henry <ghenry[AT]suretecsystems.com> - 0.47-1
 - Updated version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Imager/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Feb 2006 12:03:03 -0000	1.3
+++ sources	7 Apr 2006 20:59:45 -0000	1.4
@@ -1 +1 @@
-45e46bcf5cabdf5d7d0820226274b565  Imager-0.47.tar.gz
+19cfffe047909599226f76694155f996  Imager-0.50.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr  7 23:40:43 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri,  7 Apr 2006 16:40:43 -0700
Subject: rpms/celestia/devel .cvsignore, 1.5, 1.6 celestia.spec, 1.14,
	1.15 sources, 1.5, 1.6
Message-ID: <200604072340.k37NejjV030433@cvs-int.fedora.redhat.com>

Author: steve

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

Modified Files:
	.cvsignore celestia.spec sources 
Log Message:
Update to 1.4.1.
Use "pkg-config --libs gtkglext-x11-1.0 libgnomeui-2.0" instead of
"pkg-config --libs gtk+-2.0".



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/celestia/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Feb 2006 18:59:50 -0000	1.5
+++ .cvsignore	7 Apr 2006 23:40:43 -0000	1.6
@@ -1 +1 @@
-celestia-1.4.0.20060210cvs.tar.gz
+celestia-1.4.1.tar.gz


Index: celestia.spec
===================================================================
RCS file: /cvs/extras/rpms/celestia/devel/celestia.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- celestia.spec	11 Feb 2006 18:59:50 -0000	1.14
+++ celestia.spec	7 Apr 2006 23:40:43 -0000	1.15
@@ -1,13 +1,10 @@
 Name:           celestia
-Version:        1.4.0.20060210cvs
+Version:        1.4.1
 Release:        1%{?dist}
-
 Summary:        OpenGL real-time visual space simulation
-
 Group:          Amusements/Graphics
 License:        GPL
-#Source0:        http://dl.sf.net/celestia/celestia-%{version}.tar.gz
-Source0:        celestia-%{version}.tar.gz
+Source0:        http://dl.sf.net/celestia/celestia-%{version}.tar.gz
 Source3:        celestia.desktop
 Patch0:         celestia-1.4.0-compile.patch
 URL:            http://www.shatters.net/celestia/
@@ -22,9 +19,6 @@
 BuildRequires:  libGLU-devel
 BuildRequires:  libXt-devel
 BuildRequires:  libXmu-devel
-# For the CVS snapshot.
-BuildRequires:  gettext-devel
-
 Requires(post): GConf2
 Requires(preun): GConf2
 
@@ -47,9 +41,7 @@
 %patch0 -p0
 
 %build
-make -f Makefile.cvs
-
-export GTK_LIBS="$( pkg-config --libs gtk+-2.0 ) -lpangox-1.0"
+export GTK_LIBS="$( pkg-config --libs gtkglext-x11-1.0 libgnomeui-2.0 )"
 %configure --with-gnome
 make %{?_smp_mflags}
 
@@ -108,6 +100,11 @@
 
 
 %changelog
+* Tue Mar 28 2006 Steven Pritchard <steve at kspei.com> 1.4.1-1
+- Update to 1.4.1
+- Use "pkg-config --libs gtkglext-x11-1.0 libgnomeui-2.0" instead of
+  "pkg-config --libs gtk+-2.0"
+
 * Fri Feb 10 2006 Steven Pritchard <steve at kspei.com> 1.4.0.20060210cvs-1
 - Update to today's CVS snapshot
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/celestia/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Feb 2006 18:59:50 -0000	1.5
+++ sources	7 Apr 2006 23:40:43 -0000	1.6
@@ -1 +1 @@
-3ce623baf6113ddf6425f0ab31b2dd37  celestia-1.4.0.20060210cvs.tar.gz
+be1d36fc97a13b9a276249dbc0efac41  celestia-1.4.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  8 00:05:31 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri,  7 Apr 2006 17:05:31 -0700
Subject: rpms/perl-Kwiki-RecentChanges/devel .cvsignore, 1.2,
	1.3 perl-Kwiki-RecentChanges.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200604080005.k3805X95032562@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Kwiki-RecentChanges/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32541

Modified Files:
	.cvsignore perl-Kwiki-RecentChanges.spec sources 
Log Message:
Upgrade to 0.14.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Kwiki-RecentChanges/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Mar 2006 23:27:03 -0000	1.2
+++ .cvsignore	8 Apr 2006 00:05:30 -0000	1.3
@@ -1 +1 @@
-Kwiki-RecentChanges-0.13.tar.gz
+Kwiki-RecentChanges-0.14.tar.gz


Index: perl-Kwiki-RecentChanges.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Kwiki-RecentChanges/devel/perl-Kwiki-RecentChanges.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Kwiki-RecentChanges.spec	11 Mar 2006 00:10:45 -0000	1.2
+++ perl-Kwiki-RecentChanges.spec	8 Apr 2006 00:05:30 -0000	1.3
@@ -1,11 +1,11 @@
 Name:           perl-Kwiki-RecentChanges
-Version:        0.13
-Release:        3%{?dist}
+Version:        0.14
+Release:        1%{?dist}
 Summary:        Kwiki Recent Changes plugin
 License:        GPL or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Kwiki-RecentChanges/
-Source0:        http://www.cpan.org/authors/id/I/IN/INGY/Kwiki-RecentChanges-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/G/GU/GUGOD/Kwiki-RecentChanges-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(Kwiki) >= 0.37
@@ -52,6 +52,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Apr 07 2006 Steven Pritchard <steve at kspei.com> 0.14-1
+- Upgrade to 0.14.
+
 * Fri Mar 10 2006 Steven Pritchard <steve at kspei.com> 0.13-3
 - Cleanup.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Kwiki-RecentChanges/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Mar 2006 23:27:03 -0000	1.2
+++ sources	8 Apr 2006 00:05:30 -0000	1.3
@@ -1 +1 @@
-393c2a606b3574b775c2ce5b23fc7b8d  Kwiki-RecentChanges-0.13.tar.gz
+5c1978bffd0412d573f382e9355f7202  Kwiki-RecentChanges-0.14.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  8 00:30:24 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Fri,  7 Apr 2006 17:30:24 -0700
Subject: rpms/cgi-util - New directory
Message-ID: <200604080030.k380UQ1f032701@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/cgi-util
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32675/cgi-util

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




From fedora-extras-commits at redhat.com  Sat Apr  8 00:30:25 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Fri,  7 Apr 2006 17:30:25 -0700
Subject: rpms/cgi-util/devel - New directory
Message-ID: <200604080030.k380URKb032704@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/cgi-util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32675/cgi-util/devel

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




From fedora-extras-commits at redhat.com  Sat Apr  8 00:30:34 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Fri,  7 Apr 2006 17:30:34 -0700
Subject: rpms/cgi-util Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604080030.k380Uap0032753@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/cgi-util
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32720

Added Files:
	Makefile import.log 
Log Message:
Setup of module cgi-util


--- NEW FILE Makefile ---
# Top level Makefile for module cgi-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  Sat Apr  8 00:30:35 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Fri,  7 Apr 2006 17:30:35 -0700
Subject: rpms/cgi-util/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604080030.k380UbF8032756@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/cgi-util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32720/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cgi-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  Sat Apr  8 00:31:39 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Fri,  7 Apr 2006 17:31:39 -0700
Subject: rpms/cgi-util import.log,1.1,1.2
Message-ID: <200604080032.k380WBLs000358@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/cgi-util
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv321

Modified Files:
	import.log 
Log Message:
auto-import cgi-util-2.2.1-7 on branch devel from cgi-util-2.2.1-7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/cgi-util/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Apr 2006 00:30:34 -0000	1.1
+++ import.log	8 Apr 2006 00:31:39 -0000	1.2
@@ -0,0 +1 @@
+cgi-util-2_2_1-7:HEAD:cgi-util-2.2.1-7.src.rpm:1144456258



From fedora-extras-commits at redhat.com  Sat Apr  8 00:31:40 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Fri,  7 Apr 2006 17:31:40 -0700
Subject: rpms/cgi-util/devel cgi-util-2.2.1-autotools.patch, NONE,
	1.1 cgi-util.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604080032.k380WCQw000362@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/cgi-util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv321/devel

Modified Files:
	.cvsignore sources 
Added Files:
	cgi-util-2.2.1-autotools.patch cgi-util.spec 
Log Message:
auto-import cgi-util-2.2.1-7 on branch devel from cgi-util-2.2.1-7.src.rpm

cgi-util-2.2.1-autotools.patch:

--- NEW FILE cgi-util-2.2.1-autotools.patch ---
diff -u --recursive --new-file cgi-util-2.2.1-vanilla/aclocal.m4 cgi-util-2.2.1/aclocal.m4
--- cgi-util-2.2.1-vanilla/aclocal.m4	1969-12-31 18:00:00.000000000 -0600
+++ cgi-util-2.2.1/aclocal.m4	2006-03-09 17:17:45.000000000 -0600
@@ -0,0 +1,7043 @@
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005  Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+
+# serial 47 AC_PROG_LIBTOOL
+
+
+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+# -----------------------------------------------------------
+# If this macro is not defined by Autoconf, define it here.
+m4_ifdef([AC_PROVIDE_IFELSE],
+         [],
+         [m4_define([AC_PROVIDE_IFELSE],
+	         [m4_ifdef([AC_PROVIDE_$1],
+		           [$2], [$3])])])
+
+
+# AC_PROG_LIBTOOL
+# ---------------
+AC_DEFUN([AC_PROG_LIBTOOL],
+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
+  AC_PROVIDE_IFELSE([AC_PROG_CXX],
+    [AC_LIBTOOL_CXX],
+    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
+  ])])
+dnl And a similar setup for Fortran 77 support
+  AC_PROVIDE_IFELSE([AC_PROG_F77],
+    [AC_LIBTOOL_F77],
+    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
+])])
+
+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
+  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+    [AC_LIBTOOL_GCJ],
+    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+      [AC_LIBTOOL_GCJ],
+      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
+	[AC_LIBTOOL_GCJ],
+      [ifdef([AC_PROG_GCJ],
+	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+       ifdef([A][M_PROG_GCJ],
+	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+       ifdef([LT_AC_PROG_GCJ],
+	     [define([LT_AC_PROG_GCJ],
+		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
+])])# AC_PROG_LIBTOOL
+
+
+# _AC_PROG_LIBTOOL
+# ----------------
+AC_DEFUN([_AC_PROG_LIBTOOL],
+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+# Prevent multiple expansion
+define([AC_PROG_LIBTOOL], [])
+])# _AC_PROG_LIBTOOL
+
+
+# AC_LIBTOOL_SETUP
+# ----------------
+AC_DEFUN([AC_LIBTOOL_SETUP],
+[AC_PREREQ(2.50)dnl
+AC_REQUIRE([AC_ENABLE_SHARED])dnl
+AC_REQUIRE([AC_ENABLE_STATIC])dnl
+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_LD])dnl
+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+AC_REQUIRE([AC_PROG_NM])dnl
+
+AC_REQUIRE([AC_PROG_LN_S])dnl
+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+AC_REQUIRE([AC_OBJEXT])dnl
+AC_REQUIRE([AC_EXEEXT])dnl
+dnl
+
+AC_LIBTOOL_SYS_MAX_CMD_LEN
+AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+AC_LIBTOOL_OBJDIR
+
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+_LT_AC_PROG_ECHO_BACKSLASH
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='sed -e 1s/^X//'
+[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+
+# Same as above, but do not quote variable references.
+[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+# Constants:
+rm="rm -f"
+
+# Global variables:
+default_ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+ltmain="$ac_aux_dir/ltmain.sh"
+ofile="$default_ofile"
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+AC_CHECK_TOOL(AR, ar, false)
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+AC_CHECK_TOOL(STRIP, strip, :)
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+test -z "$AS" && AS=as
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+test -z "$LD" && LD=ld
+test -z "$LN_S" && LN_S="ln -s"
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+test -z "$NM" && NM=nm
+test -z "$SED" && SED=sed
+test -z "$OBJDUMP" && OBJDUMP=objdump
+test -z "$RANLIB" && RANLIB=:
+test -z "$STRIP" && STRIP=:
+test -z "$ac_objext" && ac_objext=o
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+    ;;
+  *)
+    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+fi
+
+_LT_CC_BASENAME([$compiler])
+
[...42037 lines suppressed...]
-
-      However, if it cannot open the file, rather than return with an
-      error code, this function sends HTML text out stating that it can't
-      open the file, including the C "strerror()" description of the error.
-      It then aborts your CGI by calling "exit(0);".
-
-      Since most of the time you will be including HTML files which are
-      under your control (ie, they are part of the CGI package you are
-      creating), you will most often wish to use this function, since it
-      is simpler than "cgi_dump_no_abort()" and your HTML files should
-      always be available to your CGI.
-
-    void cgi_error(char * reason)
-    -----------------------------
-      This function displays an HTML error message, starting with the word
-      "Error" as a level one header ("<h1>") and followed by the string you
-      provide (the actual reason an error occured).
-
-      This function then calls "exit(0);" to abort your CGI.
-
-    int cgi_goodemailaddress(char * addr)
-    -------------------------------------
-      This function does its best to make sure that a string contains
-      a valid-looking e-mail address.  (This is useful for when you
-      get users who fill out a form and refuse to enter their e-mail
-      address, or they don't understand what their own e-mail address is.
-      For example, someone with the address "abc at aol.com" might think
-      their address is "abc" or "abc at aol" or "abc.aol.col" or even
-      "http://abc at aol.com".  A good rule: never trust users.)
-
-      A valid e-mail address is in the form:
-
-        text at text.text[.text...]
-
-      In other words, alphanumeric characters ("a-z", "A-Z", "0-9"),
-      'dashes' ("-"), underscores ("_") and 'dots' ("."), with exactly one
-      'at' ("@") in the middle, and at least one 'dot' appearing after
-      the 'at.'  'Dots' and 'ats' are not allowed at the beginning or
-      end of the string.
-
-      "cgi_goodemailaddress" returns a "1" if the address appears to be
-      in the right format (this does NOT necessarily mean it is a VALID
-      address), or "0" if it is not.
-
-    char * cgi_strerror(int err)
-    ----------------------------
-      Like C's "strerror()" function which returns the text equivalent of
-      an "errno" error code, this function returns the text equivalent of
-      one of cgi-util's "cgi_errno" error code.
-
-
-ERROR CODES
------------
-  The many error codes that cgi-util will set "cgi_errno" to are described
-  above, but here's a reference:
-
-    CGIERR_NONE
-    -----------
-      No error occured
-
-    CGIERR_NOT_INTEGER
-    ------------------
-      The field looked-up by cgi_getentryint() did not exist, or its
-      value was not an integer.
-
-    CGIERR_NOT_DOUBLE
-    -----------------
-      The field looked-up by cgi_getentrydouble() did not exist, or its
-      value was not a double.
-
-    CGIERR_NOT_BOOL
-    ---------------
-      The field looked-up by cgi_getentrybool() did not exist, or its
-      value was not "yes", "on", "no" or "off".
-
-    CGIERR_UNKNOWN_METHOD
-    ---------------------
-      The "REQUEST_METHOD" environment variable was not set to
-      "POST" or "GET" (the two understood by cgi-util).
-
-    CGIERR_INCORRECT_TYPE
-    ---------------------
-      The "CONTENT_TYPE" environment variable was not set to
-      "application/x-www-form-urlencoded".
-
-    CGIERR_BAD_CONTENT_LENGTH
-    -------------------------
-      The "CONTENT_LENGTH" environment variable was not set to
-      an integer value.
-
-    CGIERR_CONTENT_LENGTH_DISCREPANCY
-    ---------------------------------
-      The "CONTENT_LENGTH" environment variable was set to a value
-      different from the actual size of data received by cgi_init().
-
-    CGIERR_CANT_OPEN
-    ----------------
-      The cgi_dump_no_abort() function could not open the file
-      specified.  (Check C's "errno" value for the exact reason.)
-
-    CGIERR_OUT_OF_MEMORY
-    --------------------
-      Space could not be allocated for the data being received by
-      cgi_init().
-
-
-THE TEST PROGRAMS
------------------
-  To understand the test program, first open the "test.html" or
-  "filetest.html" HTML file in a web browser.  (You need to open it via the
-  HTTP protocol, not simply opening it as a file!)
-
-  With "test.html", you'll notice the following on the page:
-
-    * A type-in field labelled "Name?"
-    * A type-in field labelled "Age?"
-    * A pull-down menu labelled "Sex?"
-    * A submit button labelled "Ok"
-
-  I won't go into the details of creating a form here, since there are
-  many, many places where you can learn this.  (If you look at the source
-  of "test.html", you'll see some comments which explain what is going on.)
-
-  When you fill out the form and click the "Ok" submit button, the CGI
-  will be invoked and you'll see something similar to:
-
-    Hello.
-    name=john doe
-    age=55
-    sex=Male
-    Goodbye!
-
-  As you can see, the input you place into the form is echoed back to you
-  by this CGI.  To see how this is done, simply look at the source code:
-  "test.c"!
-
-
-  With "filetest.html", you'll see a simpler form:
-
-    * A type-in filed labelled "Name?"
-    * A file browse field labelled "File?" (typically these fields appear as
-      a type-in form with a "Browse" button next to it)
-    * A sumbit button labelled "Ok"
-
-  Select a file from your local filesystem (type it into the type-in field
-  or use the "Browse" button, for example), and then submit the form.
-  The CGI will be invoked and you'll see something similar to:
-
-    Hello.
-    name=john doe
-    filename=foo.bar
-    This file is 10234 bytes long.
-    Goodbye!
-
-  As you can see, the file you uploaded using the form has been processed,
-  and the size of the file (in bytes) is displayed by the CGI.  See
-  "filetest.c" to see how this CGI works.
-
-
-THE END
--------
-  Hopefully this library will come in useful.  If you have questions or
-  comments, please direct them to me:
-
-    bill at newbreedsoftware.com
-
-
-THANKS FOR USING cgi-util!
-
-End of README.txt
diff -u --recursive --new-file cgi-util-2.2.1-vanilla/TODO cgi-util-2.2.1/TODO
--- cgi-util-2.2.1-vanilla/TODO	1969-12-31 18:00:00.000000000 -0600
+++ cgi-util-2.2.1/TODO	2006-03-09 17:17:46.000000000 -0600
@@ -0,0 +1,11 @@
+TODO.txt for cgi-util
+
+* Fix file upload.
+* Handle shell invoked CGI's again.
+* Handle grabbing multiple values from a singularly-named set of fields.
+  (ie, checkboxes and multiple select fields)
+* Create cgi-util 1.x backwards-compatible API.
+* Handle multiple file upload (maybe).
+* Better tutorials (eg, more info. on using cookies!)
+
+End of TODO.txt
diff -u --recursive --new-file cgi-util-2.2.1-vanilla/TODO.txt cgi-util-2.2.1/TODO.txt
--- cgi-util-2.2.1-vanilla/TODO.txt	2000-11-01 17:36:33.000000000 -0600
+++ cgi-util-2.2.1/TODO.txt	1969-12-31 18:00:00.000000000 -0600
@@ -1,11 +0,0 @@
-TODO.txt for cgi-util
-
-* Fix file upload.
-* Handle shell invoked CGI's again.
-* Handle grabbing multiple values from a singularly-named set of fields.
-  (ie, checkboxes and multiple select fields)
-* Create cgi-util 1.x backwards-compatible API.
-* Handle multiple file upload (maybe).
-* Better tutorials (eg, more info. on using cookies!)
-
-End of TODO.txt


--- NEW FILE cgi-util.spec ---
Summary: A C library for creating Common Gateway Interface ("CGI") programs
Name: cgi-util
Version: 2.2.1
Release: 7
License: LGPL
Group: System Environment/Libraries
Source: ftp://ftp.billsgames.com/unix/www/%name/%{name}-%{version}.tar.gz
Patch0: cgi-util-2.2.1-autotools.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: http://www.newbreedsoftware.com/cgi-util/

%description
cgi-util is a library which provides a set of C functions you can
use to create Common Gateway Interface ("CGI") programs.  Simply call
cgi-util's initialization function and send HTML (or any other kind of
data) out from your program and to the user's web browser.

%package devel
Summary: Files needed to develop applications using cgi-util
Group: Development/Libraries
Requires: cgi-util = %{version}-%{release}

%description devel
This package provides the libraries, include files, and other resources
needed for developing applications using the cgi-util library.

%prep
%setup
%patch0 -p1
chmod +x configure

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
%makeinstall
rm -f ${RPM_BUILD_ROOT}/%{_libdir}/libcgi-util.la
rm -f ${RPM_BUILD_ROOT}/%{_bindir}/*.cgi

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-, root, root)
%{_libdir}/lib*.so.*
%doc ChangeLog COPYING INSTALL TODO test.cgi filetest.cgi test.html filetest.html

%files devel
%{_libdir}/lib*.so
%{_includedir}/cgi-util.h
%doc README test.c filetest.c

%changelog
* Tue Apr 04 2006 W. Michael Petullo <mike[@]flyn.org> - 2.2.1-7
   - Remove *.cgi from bindir.

* Thu Mar 09 2006 W. Michael Petullo <mike[@]flyn.org> - 2.2.1-6
   - Move test.cgi and filetest.cgi to %doc.
   - Move README to -devel %doc and add test.c and filetest.c.
   - Pass --disable-static to configure.

* Thu Feb 23 2006 W. Michael Petullo <mike[@]flyn.org> - 2.2.1-5
   - Remove Werror from Makefile.in.
   - Remove --gnu from autotools options.
   - Revert patch that renames, for example, README.txt to README
     as this is required for automake.

* Wed Feb 22 2006 W. Michael Petullo <mike[@]flyn.org> - 2.2.1-4
   - Turn off -Werror.

* Tue Feb 21 2006 W. Michael Petullo <mike[@]flyn.org> - 2.2.1-3
   - Simplify project descriptions.
   - Do not change filenames in autotools patch.

* Tue Dec 13 2005 W. Michael Petullo <mike[@]flyn.org> - 2.2.1-2
   - Split out -devel package.

* Wed Nov 30 2005 W. Michael Petullo <mike[@]flyn.org> - 2.2.1-1
   - Initial RPM.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cgi-util/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Apr 2006 00:30:34 -0000	1.1
+++ .cvsignore	8 Apr 2006 00:31:40 -0000	1.2
@@ -0,0 +1 @@
+cgi-util-2.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cgi-util/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Apr 2006 00:30:34 -0000	1.1
+++ sources	8 Apr 2006 00:31:40 -0000	1.2
@@ -0,0 +1 @@
+f48531a2b24b880ed6a87c801a8643fc  cgi-util-2.2.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  8 00:37:07 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Fri,  7 Apr 2006 17:37:07 -0700
Subject: owners owners.list,1.808,1.809
Message-ID: <200604080037.k380b9OA000421@cvs-int.fedora.redhat.com>

Author: mikep

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

Modified Files:
	owners.list 
Log Message:
Add enter for cgi-util.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.808
retrieving revision 1.809
diff -u -r1.808 -r1.809
--- owners.list	7 Apr 2006 16:58:51 -0000	1.808
+++ owners.list	8 Apr 2006 00:37:07 -0000	1.809
@@ -120,6 +120,7 @@
 Fedora Extras|cfitsio|Library for manipulating FITS data files|matt at truch.net|extras-qa at fedoraproject.org|
 Fedora Extras|cfs|An userspace crypto-filesystem|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|cfv|A checksum creation and verification utility|a.kurtz at hardsun.net|extras-qa at fedoraproject.org|
+Fedora Extras|cgi-util|A C library for creating Common Gateway Interface ("CGI") programs|redhat at flyn.org|extras-qa at fedoraproject.org|
 Fedora Extras|cgoban|X board for playing go|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|charis-fonts|Charis SIL fonts|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|check|A unit test framework for C|tcallawa at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Apr  8 01:03:06 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri,  7 Apr 2006 18:03:06 -0700
Subject: rpms/celestia/FC-5 .cvsignore, 1.5, 1.6 celestia.spec, 1.14,
	1.15 sources, 1.5, 1.6
Message-ID: <200604080103.k3813874002530@cvs-int.fedora.redhat.com>

Author: steve

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/celestia/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Feb 2006 18:59:50 -0000	1.5
+++ .cvsignore	8 Apr 2006 01:03:06 -0000	1.6
@@ -1 +1 @@
-celestia-1.4.0.20060210cvs.tar.gz
+celestia-1.4.1.tar.gz


Index: celestia.spec
===================================================================
RCS file: /cvs/extras/rpms/celestia/FC-5/celestia.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- celestia.spec	11 Feb 2006 18:59:50 -0000	1.14
+++ celestia.spec	8 Apr 2006 01:03:06 -0000	1.15
@@ -1,13 +1,10 @@
 Name:           celestia
-Version:        1.4.0.20060210cvs
+Version:        1.4.1
 Release:        1%{?dist}
-
 Summary:        OpenGL real-time visual space simulation
-
 Group:          Amusements/Graphics
 License:        GPL
-#Source0:        http://dl.sf.net/celestia/celestia-%{version}.tar.gz
-Source0:        celestia-%{version}.tar.gz
+Source0:        http://dl.sf.net/celestia/celestia-%{version}.tar.gz
 Source3:        celestia.desktop
 Patch0:         celestia-1.4.0-compile.patch
 URL:            http://www.shatters.net/celestia/
@@ -22,9 +19,6 @@
 BuildRequires:  libGLU-devel
 BuildRequires:  libXt-devel
 BuildRequires:  libXmu-devel
-# For the CVS snapshot.
-BuildRequires:  gettext-devel
-
 Requires(post): GConf2
 Requires(preun): GConf2
 
@@ -47,9 +41,7 @@
 %patch0 -p0
 
 %build
-make -f Makefile.cvs
-
-export GTK_LIBS="$( pkg-config --libs gtk+-2.0 ) -lpangox-1.0"
+export GTK_LIBS="$( pkg-config --libs gtkglext-x11-1.0 libgnomeui-2.0 )"
 %configure --with-gnome
 make %{?_smp_mflags}
 
@@ -108,6 +100,11 @@
 
 
 %changelog
+* Tue Mar 28 2006 Steven Pritchard <steve at kspei.com> 1.4.1-1
+- Update to 1.4.1
+- Use "pkg-config --libs gtkglext-x11-1.0 libgnomeui-2.0" instead of
+  "pkg-config --libs gtk+-2.0"
+
 * Fri Feb 10 2006 Steven Pritchard <steve at kspei.com> 1.4.0.20060210cvs-1
 - Update to today's CVS snapshot
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/celestia/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Feb 2006 18:59:50 -0000	1.5
+++ sources	8 Apr 2006 01:03:06 -0000	1.6
@@ -1 +1 @@
-3ce623baf6113ddf6425f0ab31b2dd37  celestia-1.4.0.20060210cvs.tar.gz
+be1d36fc97a13b9a276249dbc0efac41  celestia-1.4.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  8 04:04:30 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Fri,  7 Apr 2006 21:04:30 -0700
Subject: rpms/fortune-firefly/FC-4 firefly, 1.5, 1.6 fortune-firefly.spec,
	1.5, 1.6
Message-ID: <200604080404.k3844WiV009071@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/fortune-firefly/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9018/FC-4

Modified Files:
	firefly fortune-firefly.spec 
Log Message:
Latest bugfixes.




Index: firefly
===================================================================
RCS file: /cvs/extras/rpms/fortune-firefly/FC-4/firefly,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- firefly	8 Jan 2006 21:11:21 -0000	1.5
+++ firefly	8 Apr 2006 04:04:30 -0000	1.6
@@ -1588,8 +1588,7 @@
 Wash: (gags)
 
 Jayne: "All the protien, vitamins and carbs of you grandma's best 
-turkey dinner... plus 15				--Episode #7, "Jaynestown"
-% alcohol." 
+turkey dinner... plus 15 percent alcohol.
 				--Episode #7, "Jaynestown"
 %
 Contact: "Last week, the factory foreman and his prod crew heard he was


Index: fortune-firefly.spec
===================================================================
RCS file: /cvs/extras/rpms/fortune-firefly/FC-4/fortune-firefly.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fortune-firefly.spec	8 Jan 2006 21:11:21 -0000	1.5
+++ fortune-firefly.spec	8 Apr 2006 04:04:30 -0000	1.6
@@ -1,5 +1,5 @@
 Name:		fortune-firefly
-Version:	2.1.0
+Version:	2.1.1
 Release:        1%{?dist}
 Summary:	Quotes from the TV series "Firefly"
 
@@ -49,6 +49,9 @@
 
 %changelog
 
+* Fri Apr 07 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.1
+- Manually merged in some fixes from Robert Mohr (mohr.42 at osu.edu)
+
 * Mon Jan 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.0
 - Incorporated some great organization and labeling by John Bianchi (John.Bianchi at usa.net)
 - Added quotes from unfilmed episode, "Dead or Alive"



From fedora-extras-commits at redhat.com  Sat Apr  8 04:04:31 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Fri,  7 Apr 2006 21:04:31 -0700
Subject: rpms/fortune-firefly/devel firefly, 1.6, 1.7 fortune-firefly.spec,
	1.8, 1.9
Message-ID: <200604080404.k3844XFe009076@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/fortune-firefly/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9018/devel

Modified Files:
	firefly fortune-firefly.spec 
Log Message:
Latest bugfixes.




Index: firefly
===================================================================
RCS file: /cvs/extras/rpms/fortune-firefly/devel/firefly,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- firefly	8 Jan 2006 21:11:28 -0000	1.6
+++ firefly	8 Apr 2006 04:04:31 -0000	1.7
@@ -36,6 +36,8 @@
 Mal: "I don't believe there's a power in the 'verse that can stop Kaylee
 from being cheerful." (he smiles at her, never stopping working) "Sometimes
 you just wanna duct tape her mouth and dump her in the hold for a month."
+
+Kaylee: (kisses Mal) "I love my captain."
 				--Episode #1, "Serenity"
 %
 Zoe: "Something ain't right."
@@ -95,7 +97,7 @@
 Zoe: "Oh yeah, this is going to go great."
 				--Episode #1, "Serenity"
 %
-Mal: "If anyone gets nosy, just...you know... shoot 'em. "
+Mal: "If anyone gets nosy, just...you know... shoot 'em."
 
 Zoe: "Shoot 'em?"
 
@@ -185,7 +187,7 @@
 
 Jayne: "You're coming through good and loud."
 
-Mal: " 'Cause I'm standing right here."
+Mal: "'Cause I'm standing right here."
 				--Episode #1, "Serenity"
 %
 Zoe: "Don't think its a good spot sir, she still has the advantage over us."
@@ -259,8 +261,7 @@
 Jayne: "Hey, I didn't fight in no war. Best of luck, though."
 				--Episode #2, "The Train Job"
 %
-Mal: 
-(into com) "Wash, we've got some local color happening. Your grand
+Mal: (into com) "Wash, we've got some local color happening. Your grand
 entrance would not go amiss right now."
 				--Episode #2, "The Train Job"
 %
@@ -452,7 +453,7 @@
 Zoe: "I... I was weak."
 				--Episode #2, "The Train Job"
 %
-Sherrif: "His story had kind of an odor to it."
+Sheriff: "His story had kind of an odor to it."
 
 Inara: "Yes. It's not the only thing about him that does."
 				--Episode #2, "The Train Job"
@@ -462,7 +463,7 @@
 Jayne: "I was aiming for his head."
 				--Episode #2, "The Train Job"
 %
-Sherrif: "You were truthful back in town -- these are tough times. A man can get
+Sheriff: "You were truthful back in town -- these are tough times. A man can get
 a job, he might not look too close at what that job is. But a man learns all
 the details of a situation like ours.... well, then he has a choice. "
 
@@ -573,7 +574,7 @@
 				--Episode #3, "Bushwacked"
 %
 Jayne: "You saved his gorram life, he still takes the cargo. Hwoon dahn."
-[Hwoon dahn = "jerk"] 
+[jerk] 
 
 Mal: "He had to.... Couldn't let us profit. Wouldn't be civilized." 
 				--Episode #3, "Bushwacked"
@@ -713,6 +714,26 @@
 Kaylee: "Well, how can we be sure, unless we question it?"
 				--Episode #4, "Shindig"
 %
+Kaylee: "I'm not saying the 80-04's hard to repair, it just ain't worth it."
+
+Older Farmer: "It's a fine machine, you just keep it tuned."
+
+Kaylee: "Tsai boo shr." [That's not it.] "The extenders ain't braced."
+
+Murphy: "I've been telling him to buy the 80-10 for years."
+
+Kaylee: "Those 'tenders snap off, don't matter how good the engine's
+cycling."
+
+Younger Farmer: "Miss Kaylee, I wonder if I could request the honor of...."
+
+Murphy: (interrupting) "Wait a minute. Let her talk. She's talking. Dance
+later."
+
+Kaylee: "By the way, the 80-10's the same machine, they just changed the
+plating and hope no one noticed."
+				--Episode #4, "Shindig"
+%
 Zoe: (sighs) "I thought you wanted to spend more time off ship this visit."
 
 Wash: "I don't know.  Out there it seems like all fancy parties. I like our 
@@ -868,9 +889,9 @@
 Mal: "See how I'm not punching him? I think I've grown."
 				--Episode #4, "Shindig"
 %
-Atherton: "Well, get ready to starve! I'll see to it you never work again.
+Atherton: "Well, get ready to starve! I'll see to it you never work again."
 
-Inara: Actually, that's not how it works. You see, you've earned yourself a
+Inara: "Actually, that's not how it works. You see, you've earned yourself a
 black mark in the client registry. No Companion is going to contact with you
 ever again."
 
@@ -1168,15 +1189,15 @@
 Bandit #1: "And I think maybe you're gonna give me a little one-on-one
 time with the missus." 
 
-(Husband) Jayne: "Oh, I think you might wanna reconsider that last part.
+Jayne/Husband: "Oh, I think you might wanna reconsider that last part.
 See, I married me a powerful ugly creature." 
 
-(Wife) Mal: "How can you say that? How can you shame me in front of new
+Mal/Wife: "How can you say that? How can you shame me in front of new
 people?" 
 
-(Husband) Jayne: "If I could make you purtier, I would." 
+Jayne/Husband: "If I could make you purtier, I would." 
 
-(Wife) Mal: "You are not the man I met a year ago." 
+Mal/Wife: "You are not the man I met a year ago." 
 				--Episode #6, "Our Mrs Reynolds"
 %
 Mal: "Now think real hard. You been bird-dogging this township a while now.
@@ -1588,8 +1609,7 @@
 Wash: (gags)
 
 Jayne: "All the protien, vitamins and carbs of you grandma's best 
-turkey dinner... plus 15				--Episode #7, "Jaynestown"
-% alcohol." 
+turkey dinner... plus 15 percent alcohol.
 				--Episode #7, "Jaynestown"
 %
 Contact: "Last week, the factory foreman and his prod crew heard he was
@@ -1764,7 +1784,7 @@
 
 Mal: "Freedom, that's what."
 
-Zoe: "I meant, what's that?"
+Zoe: (pointing) "I meant, what's that?"
 
 Mal: "Oh. Yeah, just step around that. I think something must have been living
 in here."
@@ -1994,9 +2014,9 @@
 %
 Mal: "Pupils were fixed and dilapidated-"
 
-Simon: "Dialated-"
+Simon: "Dilated-"
 
-Mal: "Dialated! Dialated! Ching-wao tsao duh liou mahng!" [Frog-humping sonofabitch]
+Mal: "Dilated! Dilated! Ching-wao tsao duh liou mahng!" [Frog-humping sonofabitch]
 				--Episode #9, "Ariel"
 %
 Jayne: "Hell, I don't know.  If I'd wanted schooling, I'd have gone to school."
@@ -2115,7 +2135,7 @@
 
 Jayne: "What?  I got pinched!"
 
-Mal: "What is what happens when you call the Feds."
+Mal: "Which is what happens when you call the Feds."
 				--Episode #9, "Ariel"
 %
 Mal: "You know, I hear tell they used to keelhaul traitors back in the day. 
@@ -2204,9 +2224,9 @@
 Wash: "I am a large, semi-muscular man. I can take it. Don't hide behind Mal
 because you know he'll shoot it down!"
 
-Zoe: "Right. Becaue what this marriage needs is one more shouting match.
+Zoe: "Right. Becaue what this marriage needs is one more shouting match."
 
-Wash: No, what this marriage needs is one less husband. Right now it's kind of
+Wash: "No, what this marriage needs is one less husband. Right now it's kind of
 crowded."
 				--Episode #10, "War Stories"
 %
@@ -2588,7 +2608,7 @@
 Zoe: "Well, at least they covered 'Dropping your weapon so you can eat beans
 and get yourself shot'."
 
-Tracey: "Yea, I got a badge in that."
+Tracey: "Yeah, I got a badge in that."
 				--Episode #12, "The Message"
 %
 Mal: "Vitelli's out of it. That bumblebee laid down arms at the first sign
@@ -2708,9 +2728,11 @@
 
 Wash: "Were I unwed, I would take you in a manly fashion."
 
-Kaylee: " 'Cause I'm pretty?"
+Kaylee: "'Cause I'm pretty?"
+
+Wash: "'Cause you're pretty."
 
-Wash: " 'Cause you're pretty."
+Kaylee: "Thank you.  That was very restorative."
 				--Episode #13, "Heart of Gold"
 %
 Mal: "Inara, think you could stoop to being on my arm?"
@@ -3362,7 +3384,7 @@
 Mostly if i'm gettin' paid."
 				--"Serenity"
 %
-Kaylee (to Simon, as he leaves): "Don't ride in antyhing with a Capissen 38 
+Kaylee (to Simon, as he leaves): "Don't ride in kanything with a Capissen 38 
 engine, they fall right out of the sky!"
 				--"Serenity"
 %


Index: fortune-firefly.spec
===================================================================
RCS file: /cvs/extras/rpms/fortune-firefly/devel/fortune-firefly.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fortune-firefly.spec	8 Jan 2006 21:11:28 -0000	1.8
+++ fortune-firefly.spec	8 Apr 2006 04:04:31 -0000	1.9
@@ -1,5 +1,5 @@
 Name:		fortune-firefly
-Version:	2.1.0
+Version:	2.1.1
 Release:        1%{?dist}
 Summary:	Quotes from the TV series "Firefly"
 
@@ -49,6 +49,9 @@
 
 %changelog
 
+* Fri Apr 07 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.1
+- Manually merged in some fixes from Robert Mohr (mohr.42 at osu.edu)
+
 * Mon Jan 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.0
 - Incorporated some great organization and labeling by John Bianchi (John.Bianchi at usa.net)
 - Added quotes from unfilmed episode, "Dead or Alive"



From fedora-extras-commits at redhat.com  Sat Apr  8 04:04:29 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Fri,  7 Apr 2006 21:04:29 -0700
Subject: rpms/fortune-firefly/FC-3 firefly, 1.5, 1.6 fortune-firefly.spec,
	1.4, 1.5
Message-ID: <200604080405.k38451qf009080@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/fortune-firefly/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9018/FC-3

Modified Files:
	firefly fortune-firefly.spec 
Log Message:
Latest bugfixes.




Index: firefly
===================================================================
RCS file: /cvs/extras/rpms/fortune-firefly/FC-3/firefly,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- firefly	8 Jan 2006 21:10:57 -0000	1.5
+++ firefly	8 Apr 2006 04:04:29 -0000	1.6
@@ -1588,8 +1588,7 @@
 Wash: (gags)
 
 Jayne: "All the protien, vitamins and carbs of you grandma's best 
-turkey dinner... plus 15				--Episode #7, "Jaynestown"
-% alcohol." 
+turkey dinner... plus 15 percent alcohol.
 				--Episode #7, "Jaynestown"
 %
 Contact: "Last week, the factory foreman and his prod crew heard he was


Index: fortune-firefly.spec
===================================================================
RCS file: /cvs/extras/rpms/fortune-firefly/FC-3/fortune-firefly.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fortune-firefly.spec	8 Jan 2006 21:10:57 -0000	1.4
+++ fortune-firefly.spec	8 Apr 2006 04:04:29 -0000	1.5
@@ -1,5 +1,5 @@
 Name:		fortune-firefly
-Version:	2.1.0
+Version:	2.1.1
 Release:        1%{?dist}
 Summary:	Quotes from the TV series "Firefly"
 
@@ -49,6 +49,9 @@
 
 %changelog
 
+* Fri Apr 07 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.1
+- Manually merged in some fixes from Robert Mohr (mohr.42 at osu.edu)
+
 * Mon Jan 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.0
 - Incorporated some great organization and labeling by John Bianchi (John.Bianchi at usa.net)
 - Added quotes from unfilmed episode, "Dead or Alive"



From fedora-extras-commits at redhat.com  Sat Apr  8 07:03:11 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sat,  8 Apr 2006 00:03:11 -0700
Subject: rpms/xmms-cdread/devel xmms-cdread.spec,1.10,1.11
Message-ID: <200604080703.k3873DeI015510@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/xmms-cdread/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15493

Modified Files:
	xmms-cdread.spec 
Log Message:
* Sat Apr  8 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.14-10
- changed Requires xmms -> xmms-libs



Index: xmms-cdread.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-cdread/devel/xmms-cdread.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xmms-cdread.spec	5 Mar 2006 10:00:28 -0000	1.10
+++ xmms-cdread.spec	8 Apr 2006 07:03:11 -0000	1.11
@@ -3,14 +3,14 @@
 Summary:	Digital audio CD input plugin for XMMS
 Name:		xmms-cdread
 Version:	0.14
-Release:        9%{?dist}
+Release:        10%{?dist}
 License:	GPL
 Group:		Applications/Multimedia
 URL:		http://www.xmms.org/
 Source:		ftp://ftp.stack.nl/pub/users/willem/xmms-cdread-0.14a.tar.gz
 Patch1:		xmms-cdread-shuffle.patch
 Patch2:		xmms-cdread-x86_64.patch
-Requires:	xmms = %xmmsdep
+Requires:	xmms-libs
 BuildRequires:	gtk+-devel glib-devel xmms-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -47,6 +47,9 @@
 %exclude %{xmmsinputdir}/libcdread.la
 
 %changelog
+* Sat Apr  8 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.14-10
+- changed Requires xmms -> xmms-libs
+
 * Sun Mar  5 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.14-9
 - x86_64 fixes 
 
@@ -55,7 +58,7 @@
 - added dist after release
 
 * Wed Mar  1 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.14-7
-- Rebuild for Fedora Extras 5
+- rebuild for Fedora Extras 5
 
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 0.14-6.a
 - rebuild on all arches



From fedora-extras-commits at redhat.com  Sat Apr  8 08:15:53 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat,  8 Apr 2006 01:15:53 -0700
Subject: owners owners.list,1.809,1.810
Message-ID: <200604080815.k388FtBb017704@cvs-int.fedora.redhat.com>

Author: awjb

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

Modified Files:
	owners.list 
Log Message:
- add nessus-core



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.809
retrieving revision 1.810
diff -u -r1.809 -r1.810
--- owners.list	8 Apr 2006 00:37:07 -0000	1.809
+++ owners.list	8 Apr 2006 08:15:53 -0000	1.810
@@ -748,6 +748,7 @@
 Fedora Extras|nco|Suite of programs for manipulating NetCDF/HDF4 files|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|ncview|A visual browser for netCDF format files|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|nedit|A GUI text editor for systems with X and Motif|jnovy at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|nessus-core|Network vulnerability scanner|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|nessus-libraries|Support libraries for nessus|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|net6|A TCP protocol abstraction for library C++|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|netcdf|Libraries for the Unidata network Common Data Form (NetCDF v3)|ed at eh3.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Apr  8 09:18:04 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat,  8 Apr 2006 02:18:04 -0700
Subject: rpms/gnumeric/devel gnumeric.spec,1.16,1.17
Message-ID: <200604080918.k389I6o9019861@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	gnumeric.spec 
Log Message:
* Sat Apr  8 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.2-3
- drop bogus mc stuff (bz 169332)



Index: gnumeric.spec
===================================================================
RCS file: /cvs/extras/rpms/gnumeric/devel/gnumeric.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gnumeric.spec	21 Mar 2006 19:35:35 -0000	1.16
+++ gnumeric.spec	8 Apr 2006 09:18:04 -0000	1.17
@@ -1,7 +1,7 @@
-Summary:          A spreadsheet program for GNOME.
+Summary:          Spreadsheet program for GNOME
 Name:             gnumeric
 Version:          1.6.2
-Release:          2%{?dist}
+Release:          3%{?dist}
 Epoch:            1
 License:          GPL
 Group:            Applications/Productivity
@@ -96,6 +96,9 @@
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/libspreadsheet.la
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/gnumeric/%{version}/plugins/*/*.la
 
+#remove bogus mc stuff
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/mc
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -152,7 +155,6 @@
 %dir %{_datadir}/gnumeric/%{version}
 %{_datadir}/gnumeric/%{version}/*
 %{_datadir}/mime-info
-%{_datadir}/mc
 %{_datadir}/applications/*
 %{_datadir}/omf
 %{_mandir}/man1/*
@@ -164,6 +166,9 @@
 
 
 %changelog
+* Sat Apr  8 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.2-3
+- drop bogus mc stuff (bz 169332)
+
 * Tue Mar 21 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.2-2
 - rebuild for new libgsf
 



From fedora-extras-commits at redhat.com  Sat Apr  8 09:21:12 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat,  8 Apr 2006 02:21:12 -0700
Subject: rpms/gnumeric/FC-5 gnumeric.spec,1.15,1.16
Message-ID: <200604080921.k389LEBw019926@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	gnumeric.spec 
Log Message:
* Sat Apr  8 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.2-3
- drop bogus mc stuff (bz 169332)



Index: gnumeric.spec
===================================================================
RCS file: /cvs/extras/rpms/gnumeric/FC-5/gnumeric.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gnumeric.spec	17 Feb 2006 00:25:39 -0000	1.15
+++ gnumeric.spec	8 Apr 2006 09:21:12 -0000	1.16
@@ -1,7 +1,7 @@
-Summary:          A spreadsheet program for GNOME.
+Summary:          Spreadsheet program for GNOME
 Name:             gnumeric
 Version:          1.6.2
-Release:          1%{?dist}
+Release:          3%{?dist}
 Epoch:            1
 License:          GPL
 Group:            Applications/Productivity
@@ -96,6 +96,9 @@
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/libspreadsheet.la
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/gnumeric/%{version}/plugins/*/*.la
 
+#remove bogus mc stuff
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/mc
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -152,7 +155,6 @@
 %dir %{_datadir}/gnumeric/%{version}
 %{_datadir}/gnumeric/%{version}/*
 %{_datadir}/mime-info
-%{_datadir}/mc
 %{_datadir}/applications/*
 %{_datadir}/omf
 %{_mandir}/man1/*
@@ -164,6 +166,12 @@
 
 
 %changelog
+* Sat Apr  8 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.2-3
+- drop bogus mc stuff (bz 169332)
+
+* Tue Mar 21 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.2-2
+- rebuild for new libgsf
+
 * Thu Feb 16 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.2-1
 - New upstream version
 - Rebuild for new gcc4.1 and glibc



From fedora-extras-commits at redhat.com  Sat Apr  8 09:54:26 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  8 Apr 2006 02:54:26 -0700
Subject: rpms/xmms-sid/devel xmms-sid.spec,1.9,1.10
Message-ID: <200604080954.k389sSQV020021@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/xmms-sid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20004

Modified Files:
	xmms-sid.spec 
Log Message:
* Sat Apr  8 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.8.0-0.2.beta15
- remove explicit dep on "xmms" and rely on soname dep



Index: xmms-sid.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-sid/devel/xmms-sid.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xmms-sid.spec	18 Feb 2006 16:25:14 -0000	1.9
+++ xmms-sid.spec	8 Apr 2006 09:54:25 -0000	1.10
@@ -3,14 +3,13 @@
 Summary: SIDPlay input plugin for X MultiMedia System (XMMS)
 Name: xmms-sid
 Version: 0.8.0
-Release: 0.1.beta15%{?dist}
+Release: 0.2.beta15%{?dist}
 URL: http://www.tnsp.org/xmms-sid.php
 License: GPL
 Group: Applications/Multimedia
 Source0: http://www.tnsp.org/xs-files/%{name}-0.8.0beta15.tar.bz2
 Source1: http://www.tnsp.org/xs-files/%{name}-0.8.0beta15.tar.bz2.asc
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: xmms
 BuildRequires: xmms-devel libsidplay-devel
 BuildRequires: glib-devel gtk+-devel
 
@@ -53,6 +52,9 @@
 
 
 %changelog
+* Sat Apr  8 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.8.0-0.2.beta15
+- remove explicit dep on "xmms" and rely on soname dep
+
 * Sat Feb 18 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.8.0-0.1.beta15
 - upgrade to 0.8.0beta15 which upstream has declared as stable
 



From fedora-extras-commits at redhat.com  Sat Apr  8 09:58:00 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat,  8 Apr 2006 02:58:00 -0700
Subject: rpms/qca/devel qca.spec,1.5,1.6
Message-ID: <200604080958.k389w2U7020129@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	qca.spec 
Log Message:
disable stripping (bug 186648)


Index: qca.spec
===================================================================
RCS file: /cvs/extras/rpms/qca/devel/qca.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qca.spec	21 Feb 2006 18:42:18 -0000	1.5
+++ qca.spec	8 Apr 2006 09:57:59 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           qca
 Version:        1.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 
 Summary:        Qt Cryptographic Architecture
 
@@ -40,6 +40,7 @@
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
 ./configure --prefix=%{_prefix} --qtdir=$QTDIR
+sed -i -e /strip/d Makefile
 make %{?_smp_mflags}
 
 
@@ -68,6 +69,9 @@
 
 
 %changelog
+* Sat Apr 08 2006 Aurelien Bompard <gauret[AT]free.fr> 1.0-7
+- disable stripping (bug 186648)
+
 * Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 1.0-6
 - rebuild for FC5
 



From fedora-extras-commits at redhat.com  Sat Apr  8 09:57:53 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat,  8 Apr 2006 02:57:53 -0700
Subject: rpms/qca/FC-4 qca.spec,1.4,1.5
Message-ID: <200604080958.k389wP90020132@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	qca.spec 
Log Message:
disable stripping (bug 186648)


Index: qca.spec
===================================================================
RCS file: /cvs/extras/rpms/qca/FC-4/qca.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qca.spec	22 May 2005 23:43:51 -0000	1.4
+++ qca.spec	8 Apr 2006 09:57:53 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           qca
 Version:        1.0
-Release: 5
+Release:        7%{?dist}
 
 Summary:        Qt Cryptographic Architecture
 
@@ -40,6 +40,7 @@
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
 ./configure --prefix=%{_prefix} --qtdir=$QTDIR
+sed -i -e /strip/d Makefile
 make %{?_smp_mflags}
 
 
@@ -68,6 +69,12 @@
 
 
 %changelog
+* Sat Apr 08 2006 Aurelien Bompard <gauret[AT]free.fr> 1.0-7
+- disable stripping (bug 186648)
+
+* Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 1.0-6
+- rebuild for FC5
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.0-5
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Sat Apr  8 09:57:54 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat,  8 Apr 2006 02:57:54 -0700
Subject: rpms/qca/FC-5 qca.spec,1.5,1.6
Message-ID: <200604080958.k389wQ5X020135@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	qca.spec 
Log Message:
disable stripping (bug 186648)


Index: qca.spec
===================================================================
RCS file: /cvs/extras/rpms/qca/FC-5/qca.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qca.spec	21 Feb 2006 18:42:18 -0000	1.5
+++ qca.spec	8 Apr 2006 09:57:54 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           qca
 Version:        1.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 
 Summary:        Qt Cryptographic Architecture
 
@@ -40,6 +40,7 @@
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
 ./configure --prefix=%{_prefix} --qtdir=$QTDIR
+sed -i -e /strip/d Makefile
 make %{?_smp_mflags}
 
 
@@ -68,6 +69,9 @@
 
 
 %changelog
+* Sat Apr 08 2006 Aurelien Bompard <gauret[AT]free.fr> 1.0-7
+- disable stripping (bug 186648)
+
 * Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 1.0-6
 - rebuild for FC5
 



From fedora-extras-commits at redhat.com  Sat Apr  8 21:12:41 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat,  8 Apr 2006 14:12:41 -0700
Subject: owners owners.list,1.810,1.811
Message-ID: <200604082112.k38LChxJ014480@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	owners.list 
Log Message:
add perl-Text-CHM


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.810
retrieving revision 1.811
diff -u -r1.810 -r1.811
--- owners.list	8 Apr 2006 08:15:53 -0000	1.810
+++ owners.list	8 Apr 2006 21:12:40 -0000	1.811
@@ -1072,6 +1072,7 @@
 Fedora Extras|perl-Test-WWW-Mechanize|Testing-specific WWW::Mechanize subclass|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-TeX-Hyphen|Hyphenate words using TeX's patterns|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Autoformat|Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Text-CHM|Perl extension for handling MS Compiled HtmlHelp Files|pertusus at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-CSV_XS|Comma-separated values manipulation routines|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Diff|Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Glob|Perl module to match globbing patterns against text|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Sat Apr  8 21:54:37 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat,  8 Apr 2006 14:54:37 -0700
Subject: rpms/gnochm - New directory
Message-ID: <200604082154.k38Lsd54014699@cvs-int.fedora.redhat.com>

Author: pertusus

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

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




From fedora-extras-commits at redhat.com  Sat Apr  8 21:54:38 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat,  8 Apr 2006 14:54:38 -0700
Subject: rpms/gnochm/devel - New directory
Message-ID: <200604082154.k38Lse1f014702@cvs-int.fedora.redhat.com>

Author: pertusus

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

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




From fedora-extras-commits at redhat.com  Sat Apr  8 21:54:58 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat,  8 Apr 2006 14:54:58 -0700
Subject: rpms/gnochm Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604082155.k38Lt0iO014756@cvs-int.fedora.redhat.com>

Author: pertusus

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

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


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

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

common : CVS/Root
	@cvs 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 Apr  8 21:54:58 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat,  8 Apr 2006 14:54:58 -0700
Subject: rpms/gnochm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604082155.k38Lt0Wr014759@cvs-int.fedora.redhat.com>

Author: pertusus

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

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


--- 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 Apr  8 21:55:34 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat,  8 Apr 2006 14:55:34 -0700
Subject: rpms/gnochm import.log,1.1,1.2
Message-ID: <200604082156.k38Lu6WU014823@cvs-int.fedora.redhat.com>

Author: pertusus

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnochm/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Apr 2006 21:54:58 -0000	1.1
+++ import.log	8 Apr 2006 21:55:34 -0000	1.2
@@ -0,0 +1 @@
+gnochm-0_9_7-2:HEAD:gnochm-0.9.7-2.src.rpm:1144533320



From fedora-extras-commits at redhat.com  Sat Apr  8 21:55:35 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat,  8 Apr 2006 14:55:35 -0700
Subject: rpms/gnochm/devel gnochm.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604082156.k38Lu7si014827@cvs-int.fedora.redhat.com>

Author: pertusus

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

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


--- NEW FILE gnochm.spec ---
Name:           gnochm
Version:        0.9.7
Release:        2%{?dist}
Summary:        CHM file viewer

Group:          Applications/Publishing
License:        GPL
URL:            http://gnochm.sourceforge.net/
Source0:        http://dl.sf.net/gnochm/gnochm-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  gettext
Requires:       python-chm

Requires(pre): GConf2
Requires(post): GConf2
Requires(preun): GConf2
BuildRequires:  scrollkeeper
Requires(post): scrollkeeper
Requires(postun): scrollkeeper
BuildRequires: desktop-file-utils

%description
A CHM file viewer for Gnome. Features are:
  
  * Full text search
  * Bookmarks
  * Support for external ms-its links
  * Configurable support for http links 
  * Internationalisation
  * Displays HTML page source


%prep
%setup -q
iconv -f ISO8859-1 -t UTF8 < data/gnochm.1.it > gnochm.1.it.new && mv -f gnochm.1.it.new data/gnochm.1.it

%build
%configure --disable-mime-update
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --vendor fedora                            \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
        --add-category X-Fedora                                 \
        --delete-original                                       \
        $RPM_BUILD_ROOT%{_datadir}/applications/gnochm.desktop

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%pre
if [ "$1" -gt 1 ]; then
    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
    gconftool-2 --makefile-uninstall-rule \
      %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
    # If the schema file has ever been renamed::
    #gconftool-2 --makefile-uninstall-rule \
    #  %{_sysconfdir}/gconf/schemas/[OLDNAME].schemas > /dev/null || :
    killall -HUP gconfd-2 || :
fi

%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 || :

scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :

update-mime-database %{_datadir}/mime &> /dev/null || :

%preun
if [ "$1" -eq 0 ]; then
    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
    gconftool-2 --makefile-uninstall-rule \
      %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
    killall -HUP gconfd-2 || :
fi

%postun
scrollkeeper-update -q || :

update-mime-database %{_datadir}/mime &> /dev/null || :

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README
%config %{_sysconfdir}/gconf/schemas/*.schemas
%{_bindir}/gnochm
%{_datadir}/gnochm/
%{_datadir}/gnome/help/gnochm/
%{_datadir}/application-registry/gnochm.*
%{_datadir}/applications/fedora-gnochm.desktop
%{_datadir}/mime/packages/gnochm.xml
%{_mandir}/man*/gnochm.1*
%{_mandir}/*/man*/gnochm.1*
%{_datadir}/mime-info/gnochm.*
%{_datadir}/omf/gnochm/
%{_datadir}/pixmaps/chmfile.png
%{_datadir}/pixmaps/gnochm*.png

%changelog
* Sun Mar 12 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-2
- Fedora Extras submission, loosely based on Dag.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnochm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Apr 2006 21:54:58 -0000	1.1
+++ .cvsignore	8 Apr 2006 21:55:34 -0000	1.2
@@ -0,0 +1 @@
+gnochm-0.9.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnochm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Apr 2006 21:54:58 -0000	1.1
+++ sources	8 Apr 2006 21:55:34 -0000	1.2
@@ -0,0 +1 @@
+799cd06cc44f2380266b2172277ce217  gnochm-0.9.7.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  8 23:44:48 2006
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Sat,  8 Apr 2006 16:44:48 -0700
Subject: owners owners.list,1.811,1.812
Message-ID: <200604082344.k38Nio2u019254@cvs-int.fedora.redhat.com>

Author: ryo

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

Modified Files:
	owners.list 
Log Message:
add libtomoe-gtk



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.811
retrieving revision 1.812
diff -u -r1.811 -r1.812
--- owners.list	8 Apr 2006 21:12:40 -0000	1.811
+++ owners.list	8 Apr 2006 23:44:47 -0000	1.812
@@ -640,6 +640,7 @@
 Fedora Extras|libtabe|Chinese lexicons library for xcin-2.5.3|llch at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|libtar|Tar file manipulation API|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|libtasn1|This is the ASN.1 library used in GNUTLS.|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
+Fedora Extras|libtomoe-gtk|Gtk library for tomoe Japanese handwritten input|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|libtorrent|BitTorrent library with a focus on high performance & good code|chabotc at xs4all.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libtranslate|Natural language translation library|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|libtunepimp|A library for creating MusicBrainz enabled tagging applications|rdieter at math.unl.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Apr  9 01:39:12 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat,  8 Apr 2006 18:39:12 -0700
Subject: rpms/celestia/FC-4 celestia-1.4.0-compile.patch, NONE,
	1.1 .cvsignore, 1.4, 1.5 celestia.spec, 1.9, 1.10 sources, 1.4, 1.5
Message-ID: <200604090139.k391dE8D023514@cvs-int.fedora.redhat.com>

Author: steve

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

Modified Files:
	.cvsignore celestia.spec sources 
Added Files:
	celestia-1.4.0-compile.patch 
Log Message:
Sync with devel branch (mostly).

celestia-1.4.0-compile.patch:

--- NEW FILE celestia-1.4.0-compile.patch ---
--- src/celengine/star.h.orig	2005-12-06 11:30:23.000000000 -0600
+++ src/celengine/star.h	2006-02-10 15:21:49.000000000 -0600
@@ -30,7 +30,7 @@
     // orbits and StarDetails objects.  Currently, it's assumed that they
     // have lifetimes that continue until program termination.
  public:
-    StarDetails::StarDetails();
+    StarDetails();
 
     inline float getRadius() const;
     inline float getTemperature() const;
--- src/celengine/command.h.orig	2004-12-22 16:07:15.000000000 -0600
+++ src/celengine/command.h	2006-02-10 18:46:25.000000000 -0600
@@ -94,10 +94,10 @@
 class CommandGotoLongLat : public InstantaneousCommand
 {
  public:
-    CommandGotoLongLat::CommandGotoLongLat(double t,
-                                           double dist,
-                                           float _longitude, float _latitude,
-                                           Vec3f _up);
+    CommandGotoLongLat(double t,
+                       double dist,
+                       float _longitude, float _latitude,
+                       Vec3f _up);
     ~CommandGotoLongLat();
     void process(ExecutionEnvironment&);
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/celestia/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Dec 2005 23:51:51 -0000	1.4
+++ .cvsignore	9 Apr 2006 01:39:12 -0000	1.5
@@ -1 +1 @@
-celestia-1.4.0.tar.gz
+celestia-1.4.1.tar.gz


Index: celestia.spec
===================================================================
RCS file: /cvs/extras/rpms/celestia/FC-4/celestia.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- celestia.spec	26 Dec 2005 23:51:51 -0000	1.9
+++ celestia.spec	9 Apr 2006 01:39:12 -0000	1.10
@@ -1,13 +1,12 @@
 Name:           celestia
-Version:        1.4.0
-Release:        1%{?dist}
-
+Version:        1.4.1
+Release:        0.1%{?dist}
 Summary:        OpenGL real-time visual space simulation
-
 Group:          Amusements/Graphics
 License:        GPL
 Source0:        http://dl.sf.net/celestia/celestia-%{version}.tar.gz
 Source3:        celestia.desktop
+Patch0:         celestia-1.4.0-compile.patch
 URL:            http://www.shatters.net/celestia/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -17,7 +16,7 @@
 BuildRequires:  libpng-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  desktop-file-utils
-BuildRequires:  libGL-devel
+BuildRequires:  libGLU-devel
 Requires(post): GConf2
 Requires(preun): GConf2
 
@@ -37,9 +36,10 @@
 
 %prep
 %setup -q
-
+%patch0 -p0
 
 %build
+export GTK_LIBS="$( pkg-config --libs gtkglext-x11-1.0 libgnomeui-2.0 )"
 %configure --with-gnome
 make %{?_smp_mflags}
 
@@ -55,7 +55,7 @@
   $RPM_BUILD_ROOT%{_datadir}/pixmaps/celestia.png
 rm $RPM_BUILD_ROOT%{_datadir}/celestia/{controls.txt,COPYING}
 ln -s ../doc/%{name}-%{version}/controls.txt $RPM_BUILD_ROOT%{_datadir}/%{name}/
-rm -r $RPM_BUILD_ROOT%{_datadir}/celestia/manual
+#rm -r $RPM_BUILD_ROOT%{_datadir}/celestia/manual
 
 rm $RPM_BUILD_ROOT%{_datadir}/applications/celestia.desktop
 
@@ -87,7 +87,9 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO controls.txt manual/*.html manual/*.css
+%doc AUTHORS ChangeLog COPYING README TODO controls.txt
+# Seem to have gone away in post-1.4.0 CVS...
+#%doc manual/*.html manual/*.css
 %{_bindir}/*
 %{_sysconfdir}/gconf/schemas/*
 %{_datadir}/applications/*%{name}.desktop
@@ -96,6 +98,9 @@
 
 
 %changelog
+* Sat Apr 08 2006 Steven Pritchard <steve at kspei.com> 1.4.1-0.1
+- Sync with devel branch (mostly)
+
 * Mon Dec 26 2005 Steven Pritchard <steve at kspei.com> 1.4.0-1
 - Update to 1.4.0
 - Remove celestia-1.3.2-compile.patch (seems to be applied upstream)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/celestia/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Dec 2005 23:51:51 -0000	1.4
+++ sources	9 Apr 2006 01:39:12 -0000	1.5
@@ -1 +1 @@
-d4bd0029af87fdd9cb4a0828cf62a025  celestia-1.4.0.tar.gz
+be1d36fc97a13b9a276249dbc0efac41  celestia-1.4.1.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr  9 03:05:12 2006
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Sat,  8 Apr 2006 20:05:12 -0700
Subject: rpms/ratpoison - New directory
Message-ID: <200604090305.k3935E1x027778@cvs-int.fedora.redhat.com>

Author: jwb

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

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




From fedora-extras-commits at redhat.com  Sun Apr  9 03:05:12 2006
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Sat,  8 Apr 2006 20:05:12 -0700
Subject: rpms/ratpoison/devel - New directory
Message-ID: <200604090305.k3935Ewm027781@cvs-int.fedora.redhat.com>

Author: jwb

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

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




From fedora-extras-commits at redhat.com  Sun Apr  9 03:05:21 2006
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Sat,  8 Apr 2006 20:05:21 -0700
Subject: rpms/ratpoison Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604090305.k3935Nmj027831@cvs-int.fedora.redhat.com>

Author: jwb

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

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


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

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

common : CVS/Root
	@cvs 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 Apr  9 03:05:21 2006
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Sat,  8 Apr 2006 20:05:21 -0700
Subject: rpms/ratpoison/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604090305.k3935NNL027834@cvs-int.fedora.redhat.com>

Author: jwb

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

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


--- 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 Apr  9 03:05:46 2006
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Sat,  8 Apr 2006 20:05:46 -0700
Subject: rpms/ratpoison import.log,1.1,1.2
Message-ID: <200604090306.k3936Ix1027902@cvs-int.fedora.redhat.com>

Author: jwb

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ratpoison/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Apr 2006 03:05:21 -0000	1.1
+++ import.log	9 Apr 2006 03:05:46 -0000	1.2
@@ -0,0 +1 @@
+ratpoison-1_4_0-3:HEAD:ratpoison-1.4.0-3.src.rpm:1144552011



From fedora-extras-commits at redhat.com  Sun Apr  9 03:05:47 2006
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Sat,  8 Apr 2006 20:05:47 -0700
Subject: rpms/ratpoison/devel ratpoison.desktop, NONE, 1.1 ratpoison.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604090306.k3936Jhe027906@cvs-int.fedora.redhat.com>

Author: jwb

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

Modified Files:
	.cvsignore sources 
Added Files:
	ratpoison.desktop ratpoison.spec 
Log Message:
auto-import ratpoison-1.4.0-3 on branch devel from ratpoison-1.4.0-3.src.rpm


--- NEW FILE ratpoison.desktop ---
[Desktop Entry]
Encoding=UTF-8
Type=XSession
Exec=ratpoison
TryExec=ratpoison
Name=Ratpoison
Comment=A minimal Window Manager with no mouse support.


--- NEW FILE ratpoison.spec ---
%define xsessiondir %{_datadir}/xsessions

Name:           ratpoison
Version:        1.4.0
Release:        3%{?dist}
Summary:        Minimalistic window manager
Group:          Applications/Productivity
License:        GPL
URL:            http://www.nongnu.org/ratpoison/
Source0:        http://savannah.nongnu.org/download/ratpoison/%{name}-%{version}.tar.gz
Source1:	%{name}.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if "%fedora" <= "4" 
BuildRequires:  xorg-x11-devel, readline-devel
%else
BuildRequires: libX11-devel, readline-devel, libXtst-devel
%endif
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info

%description
Ratpoison is a simple window manager that relies solely on keyboard input as
opposed to keyboard and mouse input.

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf ${RPM_BUILD_ROOT}
make install DESTDIR=${RPM_BUILD_ROOT}
mkdir -p ${RPM_BUILD_ROOT}%{xsessiondir}
install -m 755 %{SOURCE1} ${RPM_BUILD_ROOT}%{xsessiondir}/
rm -f ${RPM_BUILD_ROOT}/%{_infodir}/dir
chmod 755 ${RPM_BUILD_ROOT}/%{_datadir}/ratpoison/allwindows.sh
chmod 755 ${RPM_BUILD_ROOT}/%{_datadir}/ratpoison/clickframe.pl
chmod 755 ${RPM_BUILD_ROOT}/%{_datadir}/ratpoison/genrpbindings
chmod 755 ${RPM_BUILD_ROOT}/%{_datadir}/ratpoison/rpshowall.sh
chmod 755 ${RPM_BUILD_ROOT}/%{_datadir}/ratpoison/rpws
chmod 755 ${RPM_BUILD_ROOT}/%{_datadir}/ratpoison/split.sh

%clean
rm -rf $RPM_BUILD_ROOT

%post
/sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir || :

%preun
if [ $1 = 0 ] ; then
    /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
fi

%files
%defattr(-,root,root,-)
%{_bindir}/ratpoison
%{_bindir}/rpws
%doc %{_datadir}/doc/ratpoison/
%{_infodir}/ratpoison.info.gz
%{_mandir}/man1/ratpoison.1.gz
%{_datadir}/ratpoison/
%{_datadir}/xsessions/ratpoison.desktop

%changelog
* Sat Apr  8 2006 John Berninger <johnw at berningeronline dot net> - 1.4.0-3
- Permissions fixes

* Sat Apr  8 2006 John Berninger <johnw at berningeronline dot net> - 1.4.0-2
- install-info fixup
- BuildRequires fixup

* Fri Apr  7 2006 John Berninger <johnw at berningeronline dot net> - 1.4.0-1
- Bumped to 1.4.0-1 from 1.3.0-2
- Conditional BuildRequires for FC4-- versus FC5++
- Various fixes per bugzilla review

* Mon Mar 13 2006 John Berninger <johnw at berningeronline dot net> - 1.3.0-2
- Added ratpoison.desktop file

* Sun Feb 19 2006 John Berninger <johnw at berningeronline dot net> - 1.3.0-1
- Initial specfile build for FE(4)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ratpoison/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2006 03:05:21 -0000	1.1
+++ .cvsignore	9 Apr 2006 03:05:46 -0000	1.2
@@ -0,0 +1 @@
+ratpoison-1.4.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ratpoison/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2006 03:05:21 -0000	1.1
+++ sources	9 Apr 2006 03:05:46 -0000	1.2
@@ -0,0 +1 @@
+358abef81387f2d554f4a397dee968b1  ratpoison-1.4.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr  9 03:08:02 2006
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Sat,  8 Apr 2006 20:08:02 -0700
Subject: owners owners.list,1.812,1.813
Message-ID: <200604090308.k3938422027960@cvs-int.fedora.redhat.com>

Author: jwb

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

Modified Files:
	owners.list 
Log Message:
Adding ratpoison package



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.812
retrieving revision 1.813
diff -u -r1.812 -r1.813
--- owners.list	8 Apr 2006 23:44:47 -0000	1.812
+++ owners.list	9 Apr 2006 03:08:02 -0000	1.813
@@ -1250,6 +1250,7 @@
 Fedora Extras|quilt|Patch management tool|jwboyer at jdub.homelinux.org|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|raidem|2d top-down shoot'em up|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
+Fedora Extras|ratpoison|Simplified window manager with no mouse support|jwb at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|rblcheck|A command-line interface to RBL-style listings|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
 Fedora Extras|rbldnsd|Small, fast daemon to serve DNSBLs|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|rdiff-backup|Convenient and transparent local/remote incremental mirror/backup|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Apr  9 05:10:55 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat,  8 Apr 2006 22:10:55 -0700
Subject: rpms/lucidlife/FC-4 lucidlife.spec,1.6,1.7
Message-ID: <200604090510.k395Avlm006468@cvs-int.fedora.redhat.com>

Author: pgordon

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

Modified Files:
	lucidlife.spec 
Log Message:

Use desktop-file-install's "--delete-original" option instead of doing it
manually.




Index: lucidlife.spec
===================================================================
RCS file: /cvs/extras/rpms/lucidlife/FC-4/lucidlife.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lucidlife.spec	29 Mar 2006 06:18:33 -0000	1.6
+++ lucidlife.spec	9 Apr 2006 05:10:55 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           lucidlife
 Version:        0.9
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A Conway's Life simulator
 
 Group:          Amusements/Games
@@ -41,8 +41,8 @@
 desktop-file-install --vendor fedora	\
 	--dir %{buildroot}%{_datadir}/applications	\
 	--add-category X-Fedora	\
+	--delete-original	\
 	%{buildroot}%{_datadir}/applications/lucidlife.desktop
-rm -f %{buildroot}%{_datadir}/applications/lucidlife.desktop
 
 %clean
 rm -rf %{buildroot}
@@ -59,6 +59,10 @@
 
 
 %changelog
+* Sat Apr 8 2006 Peter Gordon <peter at thecodergeek.com> - 0.9-6
+- Use desktop-file-install's "--delete-original" option instead pf doing
+  it manually.
+
 * Tue Mar 28 2006 Peter Gordon <peter at thecodergeek.com> - 0.9-5
 - Add patch to put the documentation and %%doc stuff in the same directory.
 



From fedora-extras-commits at redhat.com  Sun Apr  9 05:10:56 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat,  8 Apr 2006 22:10:56 -0700
Subject: rpms/lucidlife/FC-5 lucidlife.spec,1.7,1.8
Message-ID: <200604090510.k395AwuJ006476@cvs-int.fedora.redhat.com>

Author: pgordon

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

Modified Files:
	lucidlife.spec 
Log Message:

Use desktop-file-install's "--delete-original" option instead of doing it
manually.




Index: lucidlife.spec
===================================================================
RCS file: /cvs/extras/rpms/lucidlife/FC-5/lucidlife.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- lucidlife.spec	29 Mar 2006 06:18:33 -0000	1.7
+++ lucidlife.spec	9 Apr 2006 05:10:56 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           lucidlife
 Version:        0.9
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A Conway's Life simulator
 
 Group:          Amusements/Games
@@ -41,8 +41,8 @@
 desktop-file-install --vendor fedora	\
 	--dir %{buildroot}%{_datadir}/applications	\
 	--add-category X-Fedora	\
+	--delete-original	\
 	%{buildroot}%{_datadir}/applications/lucidlife.desktop
-rm -f %{buildroot}%{_datadir}/applications/lucidlife.desktop
  
 
 %clean
@@ -60,6 +60,10 @@
 
 
 %changelog
+* Sat Apr 8 2006 Peter Gordon <peter at thecodergeek.com> - 0.9-7
+- Use desktop-file-install's "--delete-original" option instead pf doing
+  it manually.
+
 * Tue Mar 28 2006 Peter Gordon <peter at thecodergeek.com> - 0.9-6
 - Add patch to put the documentation and %%doc stuff in the same directory.
 



From fedora-extras-commits at redhat.com  Sun Apr  9 05:10:56 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat,  8 Apr 2006 22:10:56 -0700
Subject: rpms/lucidlife/devel lucidlife.spec,1.8,1.9
Message-ID: <200604090510.k395Awj2006480@cvs-int.fedora.redhat.com>

Author: pgordon

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

Modified Files:
	lucidlife.spec 
Log Message:

Use desktop-file-install's "--delete-original" option instead of doing it
manually.




Index: lucidlife.spec
===================================================================
RCS file: /cvs/extras/rpms/lucidlife/devel/lucidlife.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- lucidlife.spec	29 Mar 2006 06:18:33 -0000	1.8
+++ lucidlife.spec	9 Apr 2006 05:10:56 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           lucidlife
 Version:        0.9
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A Conway's Life simulator
 
 Group:          Amusements/Games
@@ -41,8 +41,8 @@
 desktop-file-install --vendor fedora	\
 	--dir %{buildroot}%{_datadir}/applications	\
 	--add-category X-Fedora	\
+	--delete-original	\
 	%{buildroot}%{_datadir}/applications/lucidlife.desktop
-rm -f %{buildroot}%{_datadir}/applications/lucidlife.desktop
  
 
 %clean
@@ -60,6 +60,10 @@
 
 
 %changelog
+* Sat Apr 8 2006 Peter Gordon <peter at thecodergeek.com> - 0.9-8
+- Use desktop-file-install's "--delete-original" option instead pf doing
+  it manually.
+
 * Tue Mar 28 2006 Peter Gordon <peter at thecodergeek.com> - 0.9-7
 - Add patch to put the documentation and %%doc stuff in the same directory.
 



From fedora-extras-commits at redhat.com  Sun Apr  9 05:13:24 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat,  8 Apr 2006 22:13:24 -0700
Subject: rpms/lucidlife/FC-4 lucidlife.spec,1.7,1.8
Message-ID: <200604090513.k395DQGT006916@cvs-int.fedora.redhat.com>

Author: pgordon

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

Modified Files:
	lucidlife.spec 
Log Message:

Fix a minor spelling issue in my previous commit. 




Index: lucidlife.spec
===================================================================
RCS file: /cvs/extras/rpms/lucidlife/FC-4/lucidlife.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- lucidlife.spec	9 Apr 2006 05:10:55 -0000	1.7
+++ lucidlife.spec	9 Apr 2006 05:13:23 -0000	1.8
@@ -60,7 +60,7 @@
 
 %changelog
 * Sat Apr 8 2006 Peter Gordon <peter at thecodergeek.com> - 0.9-6
-- Use desktop-file-install's "--delete-original" option instead pf doing
+- Use desktop-file-install's "--delete-original" option instead of doing
   it manually.
 
 * Tue Mar 28 2006 Peter Gordon <peter at thecodergeek.com> - 0.9-5



From fedora-extras-commits at redhat.com  Sun Apr  9 05:13:24 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat,  8 Apr 2006 22:13:24 -0700
Subject: rpms/lucidlife/FC-5 lucidlife.spec,1.8,1.9
Message-ID: <200604090513.k395DQhu006921@cvs-int.fedora.redhat.com>

Author: pgordon

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

Modified Files:
	lucidlife.spec 
Log Message:

Fix a minor spelling issue in my previous commit. 




Index: lucidlife.spec
===================================================================
RCS file: /cvs/extras/rpms/lucidlife/FC-5/lucidlife.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- lucidlife.spec	9 Apr 2006 05:10:56 -0000	1.8
+++ lucidlife.spec	9 Apr 2006 05:13:24 -0000	1.9
@@ -61,7 +61,7 @@
 
 %changelog
 * Sat Apr 8 2006 Peter Gordon <peter at thecodergeek.com> - 0.9-7
-- Use desktop-file-install's "--delete-original" option instead pf doing
+- Use desktop-file-install's "--delete-original" option instead of doing
   it manually.
 
 * Tue Mar 28 2006 Peter Gordon <peter at thecodergeek.com> - 0.9-6



From fedora-extras-commits at redhat.com  Sun Apr  9 05:13:25 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat,  8 Apr 2006 22:13:25 -0700
Subject: rpms/lucidlife/devel lucidlife.spec,1.9,1.10
Message-ID: <200604090513.k395DR1i006928@cvs-int.fedora.redhat.com>

Author: pgordon

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

Modified Files:
	lucidlife.spec 
Log Message:

Fix a minor spelling issue in my previous commit. 




Index: lucidlife.spec
===================================================================
RCS file: /cvs/extras/rpms/lucidlife/devel/lucidlife.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- lucidlife.spec	9 Apr 2006 05:10:56 -0000	1.9
+++ lucidlife.spec	9 Apr 2006 05:13:25 -0000	1.10
@@ -61,7 +61,7 @@
 
 %changelog
 * Sat Apr 8 2006 Peter Gordon <peter at thecodergeek.com> - 0.9-8
-- Use desktop-file-install's "--delete-original" option instead pf doing
+- Use desktop-file-install's "--delete-original" option instead of doing
   it manually.
 
 * Tue Mar 28 2006 Peter Gordon <peter at thecodergeek.com> - 0.9-7



From fedora-extras-commits at redhat.com  Sun Apr  9 07:26:15 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun,  9 Apr 2006 00:26:15 -0700
Subject: rpms/pipenightdreams/FC-5 pipenightdreams-0.10.0-sanitize.patch,
	NONE, 1.1 pipenightdreams.spec, 1.1, 1.2
Message-ID: <200604090726.k397QHoT020412@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	pipenightdreams.spec 
Added Files:
	pipenightdreams-0.10.0-sanitize.patch 
Log Message:
* Fri Apr  7 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.0-2
- Remove use of a trademarked term from %description, manpage and docs


pipenightdreams-0.10.0-sanitize.patch:

--- NEW FILE pipenightdreams-0.10.0-sanitize.patch ---
diff -ur pipenightdreams-0.10.0.orig/README pipenightdreams-0.10.0/README
--- pipenightdreams-0.10.0.orig/README	2001-10-12 22:02:34.000000000 +0200
+++ pipenightdreams-0.10.0/README	2006-04-07 17:15:52.000000000 +0200
@@ -9,7 +9,7 @@
               http:://www.libsdl.org/projects/pipenightdreams
 
 
-This game is a pseudo-clon of an old game called PipeDream. I say pseudo-clon
+This game is a pseudo-clon of an old pipeline arcade game. I say pseudo-clon
 because I don't have the original one so I've been working just with the facts
 I remember. I've written it in my spare time during the last twelve months (as you
 can see my spare time is not much).
diff -ur pipenightdreams-0.10.0.orig/man/pipenightdreams.6 pipenightdreams-0.10.0/man/pipenightdreams.6
--- pipenightdreams-0.10.0.orig/man/pipenightdreams.6	2002-03-23 22:17:05.000000000 +0100
+++ pipenightdreams-0.10.0/man/pipenightdreams.6	2006-04-07 17:30:39.000000000 +0200
@@ -6,23 +6,19 @@
 
 .SH SYNOPSIS 
 
-\fB pipenightdreams\fP [\--datadir <DATADIR>] [\--fullscreen]
+\fBpipenightdreams\fP [\--datadir <DATADIR>] [\--fullscreen]
 
 .SH DESCRIPTION
 
-\fB pipenightdreams\fP is a PipeDream style game. The objetive of the game is to carry
-liquid from some point to the exit using different kinds of pipes. On each level
-there is a minimum number of required pipes that should be at least reached for it
+\fBpipenightdreams\fP is a puzzle-game where the objective is to carry liquid
+from some point to the exit using different kinds of pipes. On each level there
+is a minimum number of required pipes that should be at least reached for it
 to be completed.
 
 The score is increased by using as many pipes as possible an by collecting various bonus
 tokens making the liquid pass through their pipes. There are also life bonus and,
 hopefully soon, "freeze tokens".
 
-The game is not exactly a copy of PipeDream. It's based only on the facts
-I remember and on many other things which have been added, or changed hoping for making
-it better.
-
 .SS KEYS
 The game is entirely played using the keyboard and the key layout is as follows:
 .IP SPACE
@@ -49,9 +45,7 @@
 
 .SH OPTIONS
 \fB --datadir <CUSTOM DATA DIR> \fP is used when
-the data directory is not the default one (\fB /usr/share/games/pipenightdreams\fP
-if installed from a rpm package and \fB /usr/local/share/games/pipenightdreams\fP
-when installed by compiling the source package).
+the data directory is not the default one (\fB/usr/share/pipenightdreams\fP).
 
 \fB --fullscreen \fP switchs to fullscreen mode.
 


Index: pipenightdreams.spec
===================================================================
RCS file: /cvs/extras/rpms/pipenightdreams/FC-5/pipenightdreams.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pipenightdreams.spec	7 Apr 2006 11:12:45 -0000	1.1
+++ pipenightdreams.spec	9 Apr 2006 07:26:15 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           pipenightdreams
 Version:        0.10.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Connect the waterpipes to create a proper pipeline
 Group:          Amusements/Games
 License:        GPL
@@ -9,20 +9,23 @@
 Source1:        %{name}.desktop
 Patch0:         pipenightdreams-0.10.0-gcc41.patch
 Patch1:         pipenightdreams-0.10.0-datadir.patch
+Patch2:         pipenightdreams-0.10.0-sanitize.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL_image-devel desktop-file-utils
 
 %description
-PipeNightDreams is a game similar to the classic PipeDream. It has 25 levels
-with increasing difficulty, and you can create your own by just editing
-text files. It has a lot of cool graphics, score, lives, required pipes
-per level and an easy and fast interface.
+PipeNightDreams is a puzzle-game where you must race against the clock to
+connect the waterpipes to create a proper pipeline before the water starts
+flowing. It has 25 levels with increasing difficulty, and you can create
+your own by just editing text files. It has a lot of cool graphics, score,
+lives, required pipes per level and an easy and fast interface.
 
 
 %prep
 %setup -q
 %patch0 -p1 -z .gcc41
-%patch1 -p1 -z .gcc41
+%patch1 -p1 -z .datadir
+%patch2 -p1 -z .sanitize
 
 
 %build
@@ -77,5 +80,8 @@
 
 
 %changelog
+* Fri Apr  7 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.0-2
+- Remove use of a trademarked term from %%description, manpage and docs
+
 * Wed Apr  5 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.0-1
 - initial Fedora Extras package



From fedora-extras-commits at redhat.com  Sun Apr  9 07:26:52 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun,  9 Apr 2006 00:26:52 -0700
Subject: rpms/pipenightdreams/FC-4 pipenightdreams-0.10.0-sanitize.patch,
	NONE, 1.1 pipenightdreams.spec, 1.1, 1.2
Message-ID: <200604090726.k397Qs5j020481@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	pipenightdreams.spec 
Added Files:
	pipenightdreams-0.10.0-sanitize.patch 
Log Message:
* Fri Apr  7 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.0-2
- Remove use of a trademarked term from %description, manpage and docs


pipenightdreams-0.10.0-sanitize.patch:

--- NEW FILE pipenightdreams-0.10.0-sanitize.patch ---
diff -ur pipenightdreams-0.10.0.orig/README pipenightdreams-0.10.0/README
--- pipenightdreams-0.10.0.orig/README	2001-10-12 22:02:34.000000000 +0200
+++ pipenightdreams-0.10.0/README	2006-04-07 17:15:52.000000000 +0200
@@ -9,7 +9,7 @@
               http:://www.libsdl.org/projects/pipenightdreams
 
 
-This game is a pseudo-clon of an old game called PipeDream. I say pseudo-clon
+This game is a pseudo-clon of an old pipeline arcade game. I say pseudo-clon
 because I don't have the original one so I've been working just with the facts
 I remember. I've written it in my spare time during the last twelve months (as you
 can see my spare time is not much).
diff -ur pipenightdreams-0.10.0.orig/man/pipenightdreams.6 pipenightdreams-0.10.0/man/pipenightdreams.6
--- pipenightdreams-0.10.0.orig/man/pipenightdreams.6	2002-03-23 22:17:05.000000000 +0100
+++ pipenightdreams-0.10.0/man/pipenightdreams.6	2006-04-07 17:30:39.000000000 +0200
@@ -6,23 +6,19 @@
 
 .SH SYNOPSIS 
 
-\fB pipenightdreams\fP [\--datadir <DATADIR>] [\--fullscreen]
+\fBpipenightdreams\fP [\--datadir <DATADIR>] [\--fullscreen]
 
 .SH DESCRIPTION
 
-\fB pipenightdreams\fP is a PipeDream style game. The objetive of the game is to carry
-liquid from some point to the exit using different kinds of pipes. On each level
-there is a minimum number of required pipes that should be at least reached for it
+\fBpipenightdreams\fP is a puzzle-game where the objective is to carry liquid
+from some point to the exit using different kinds of pipes. On each level there
+is a minimum number of required pipes that should be at least reached for it
 to be completed.
 
 The score is increased by using as many pipes as possible an by collecting various bonus
 tokens making the liquid pass through their pipes. There are also life bonus and,
 hopefully soon, "freeze tokens".
 
-The game is not exactly a copy of PipeDream. It's based only on the facts
-I remember and on many other things which have been added, or changed hoping for making
-it better.
-
 .SS KEYS
 The game is entirely played using the keyboard and the key layout is as follows:
 .IP SPACE
@@ -49,9 +45,7 @@
 
 .SH OPTIONS
 \fB --datadir <CUSTOM DATA DIR> \fP is used when
-the data directory is not the default one (\fB /usr/share/games/pipenightdreams\fP
-if installed from a rpm package and \fB /usr/local/share/games/pipenightdreams\fP
-when installed by compiling the source package).
+the data directory is not the default one (\fB/usr/share/pipenightdreams\fP).
 
 \fB --fullscreen \fP switchs to fullscreen mode.
 


Index: pipenightdreams.spec
===================================================================
RCS file: /cvs/extras/rpms/pipenightdreams/FC-4/pipenightdreams.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pipenightdreams.spec	7 Apr 2006 11:12:45 -0000	1.1
+++ pipenightdreams.spec	9 Apr 2006 07:26:52 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           pipenightdreams
 Version:        0.10.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Connect the waterpipes to create a proper pipeline
 Group:          Amusements/Games
 License:        GPL
@@ -9,20 +9,23 @@
 Source1:        %{name}.desktop
 Patch0:         pipenightdreams-0.10.0-gcc41.patch
 Patch1:         pipenightdreams-0.10.0-datadir.patch
+Patch2:         pipenightdreams-0.10.0-sanitize.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL_image-devel desktop-file-utils
 
 %description
-PipeNightDreams is a game similar to the classic PipeDream. It has 25 levels
-with increasing difficulty, and you can create your own by just editing
-text files. It has a lot of cool graphics, score, lives, required pipes
-per level and an easy and fast interface.
+PipeNightDreams is a puzzle-game where you must race against the clock to
+connect the waterpipes to create a proper pipeline before the water starts
+flowing. It has 25 levels with increasing difficulty, and you can create
+your own by just editing text files. It has a lot of cool graphics, score,
+lives, required pipes per level and an easy and fast interface.
 
 
 %prep
 %setup -q
 %patch0 -p1 -z .gcc41
-%patch1 -p1 -z .gcc41
+%patch1 -p1 -z .datadir
+%patch2 -p1 -z .sanitize
 
 
 %build
@@ -77,5 +80,8 @@
 
 
 %changelog
+* Fri Apr  7 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.0-2
+- Remove use of a trademarked term from %%description, manpage and docs
+
 * Wed Apr  5 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.0-1
 - initial Fedora Extras package



From fedora-extras-commits at redhat.com  Sun Apr  9 07:28:28 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun,  9 Apr 2006 00:28:28 -0700
Subject: comps comps-fe5.xml.in,1.35,1.36
Message-ID: <200604090728.k397SUoc020542@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	comps-fe5.xml.in 
Log Message:
add pipenightdreams


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- comps-fe5.xml.in	7 Apr 2006 14:11:26 -0000	1.35
+++ comps-fe5.xml.in	9 Apr 2006 07:28:28 -0000	1.36
@@ -227,6 +227,7 @@
         <packagereq type="optional">nexuiz</packagereq>
         <packagereq type="optional">njam</packagereq>
         <packagereq type="optional">overgod</packagereq>
+        <packagereq type="optional">pipenightdreams</packagereq>
         <packagereq type="optional">powermanga</packagereq>
         <packagereq type="optional">ppracer</packagereq>
         <packagereq type="optional">qascade</packagereq>



From fedora-extras-commits at redhat.com  Sun Apr  9 07:29:33 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun,  9 Apr 2006 00:29:33 -0700
Subject: rpms/crystal-stacker - New directory
Message-ID: <200604090729.k397TZMf020612@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/crystal-stacker
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20591/crystal-stacker

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




From fedora-extras-commits at redhat.com  Sun Apr  9 07:29:34 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun,  9 Apr 2006 00:29:34 -0700
Subject: rpms/crystal-stacker/devel - New directory
Message-ID: <200604090729.k397TaCf020615@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/crystal-stacker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20591/crystal-stacker/devel

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




From fedora-extras-commits at redhat.com  Sun Apr  9 07:29:52 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun,  9 Apr 2006 00:29:52 -0700
Subject: rpms/crystal-stacker Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604090729.k397TsVB020669@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/crystal-stacker
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20636

Added Files:
	Makefile import.log 
Log Message:
Setup of module crystal-stacker


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

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

common : CVS/Root
	@cvs 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 Apr  9 07:29:53 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun,  9 Apr 2006 00:29:53 -0700
Subject: rpms/crystal-stacker/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604090729.k397TtLD020672@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/crystal-stacker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20636/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module crystal-stacker


--- 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 Apr  9 07:30:54 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun,  9 Apr 2006 00:30:54 -0700
Subject: rpms/crystal-stacker/devel crystal-stacker-1.5-fixes.patch, NONE,
	1.1 crystal-stacker-theme-editor.desktop, NONE,
	1.1 crystal-stacker.desktop, NONE, 1.1 crystal-stacker.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604090731.k397VQuY020762@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/crystal-stacker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20718/devel

Modified Files:
	.cvsignore sources 
Added Files:
	crystal-stacker-1.5-fixes.patch 
	crystal-stacker-theme-editor.desktop crystal-stacker.desktop 
	crystal-stacker.spec 
Log Message:
auto-import crystal-stacker-1.5-0.pre.2 on branch devel from crystal-stacker-1.5-0.pre.2.src.rpm

crystal-stacker-1.5-fixes.patch:

--- NEW FILE crystal-stacker-1.5-fixes.patch ---
--- crystal-stacker-1.5/cs/source/Makefile.unix.fixes	2006-03-21 19:07:56.000000000 +0100
+++ crystal-stacker-1.5/cs/source/Makefile.unix	2006-04-07 00:25:54.000000000 +0200
@@ -1,6 +1,6 @@
-PREFIX  = /home/opt
+PREFIX  = /usr/local
 DATADIR = $(PREFIX)/share/$(TARGET)
-CFLAGS  = -g -Wall  -Wno-deprecated-declarations -O2 
+CFLAGS  = -g -Wall -O2 -fsigned-char
 LDFLAGS = `allegro-config --libs` -laldmb -ldumb
 DEFINES = -DDATADIR=\"$(DATADIR)/\"
 OBJS    =    animate.o  misc.o   cs2bd.o     cs2ns.o    game.o      keys.o   \
@@ -21,9 +21,9 @@
 	mkdir -p $(PREFIX)/bin
 	install -p -m 755 $(TARGET) $(PREFIX)/bin
 	mkdir -p $(DATADIR)
-	install -p -m 644 ../../distro/cs.dat $(DATADIR)
-	install -p -m 644 ../../distro/cs.cth $(DATADIR)
-	install -p -m 644 ../../distro/cs.xm $(DATADIR)
+	install -p -m 644 ../cs.dat $(DATADIR)
+	install -p -m 644 ../cs.cth $(DATADIR)
+	install -p -m 644 ../cs.xm $(DATADIR)
 	
 clean:
 	rm -f $(OBJS) $(TARGET) *~
--- crystal-stacker-1.5/cs/source/t3ssal.c.fixes	2006-03-24 20:24:54.000000000 +0100
+++ crystal-stacker-1.5/cs/source/t3ssal.c	2006-04-07 00:25:54.000000000 +0200
@@ -7,13 +7,12 @@
 #define __USE_GNU
 #include <allegro.h>
 #include <aldumb.h> 
-#include <unistd.h>
-#ifndef ALLEGRO_WINDOWS
-	#include <pthread.h>
-#endif
 #include "t3ssal.h"
 #include "mywav.h"
-
+#ifdef T3SS_PTHREADS
+#include <unistd.h>
+#include <pthread.h>
+#endif
 
 
 int t3ss_effects_channels =  4; // how many channels for sound effects
@@ -31,14 +30,12 @@
 int t3ss_music_pattern =     0;
 
 /* dumb / mod(music) playing related vars */
-static char t3ss_mod_fn[128];
 static DUH *t3ss_duh = NULL;
 static AL_DUH_PLAYER *t3ss_duh_player = NULL;
-static DUH_SIGRENDERER * t3ss_sigrenderer = NULL;
 
-#ifndef ALLEGRO_WINDOWS
-	static pthread_t t3ss_duh_player_thread;
-	static pthread_mutex_t t3ss_duh_player_mutex;
+#ifdef T3SS_PTHREADS
+static pthread_t t3ss_duh_player_thread;
+static pthread_mutex_t t3ss_duh_player_mutex;
 #endif
 
 
@@ -63,9 +60,9 @@
 
         /* init dumb */
         dumb_register_packfiles();
-        #ifndef ALLEGRO_WINDOWS
-        	pthread_mutex_init(&t3ss_duh_player_mutex, NULL);
-        #endif
+#ifdef T3SS_PTHREADS
+        pthread_mutex_init(&t3ss_duh_player_mutex, NULL);
+#endif
         
         t3ss_initialized = 1;
     }
@@ -109,16 +106,6 @@
 void t3ss_enable_music(void)
 {
     t3ss_music_on = 1;
-    if (t3ss_duh) {
-	    #ifndef ALLEGRO_WINDOWS
-        	pthread_mutex_lock(&t3ss_duh_player_mutex);
-        #endif
-        al_resume_duh(t3ss_duh_player);
-        #ifndef ALLEGRO_WINDOWS
-	        pthread_mutex_unlock(&t3ss_duh_player_mutex);
-	    #endif
-        t3ss_music_playing = 1;
-    }
 }
 
 void t3ss_disable_effects(void)
@@ -128,26 +115,21 @@
 
 void t3ss_disable_music(void)
 {
+    if (t3ss_duh_player)
+        t3ss_stop_mod();
     t3ss_music_on = 0;
-    if (t3ss_duh) {
-	    #ifndef ALLEGRO_WINDOWS
-        	pthread_mutex_lock(&t3ss_duh_player_mutex);
-        #endif
-        al_pause_duh(t3ss_duh_player);
-	    #ifndef ALLEGRO_WINDOWS
-	        pthread_mutex_unlock(&t3ss_duh_player_mutex);
-	    #endif
-        t3ss_music_playing = 0;
-    }
 }
 
-#ifndef ALLEGRO_WINDOWS
+
+#ifdef T3SS_PTHREADS
 static void *t3ss_duh_player_thread_function(void *arg)
 {
     while(1)
     {
         pthread_mutex_lock(&t3ss_duh_player_mutex);
-        al_poll_duh(t3ss_duh_player);
+        /* this may be nuked if things fail in t3ss_set_music_pattern */
+        if (t3ss_duh_player)
+            al_poll_duh(t3ss_duh_player);
         pthread_mutex_unlock(&t3ss_duh_player_mutex);
         pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
         usleep(10000);
@@ -162,10 +144,10 @@
     DUMB_IT_SIGDATA *sigdata;
     DUH_SIGRENDERER *renderer;
     
-    if (!t3ss_initialized)
+    if (!t3ss_initialized || !t3ss_music_on)
         return 0;
         
-    if (t3ss_duh)
+    if (t3ss_duh_player)
         t3ss_stop_mod();
     
     t3ss_duh = dumb_load_xm_quick(fn);
@@ -191,7 +173,7 @@
     }
 
     t3ss_duh_player = al_duh_encapsulate_sigrenderer(renderer,
-        t3ss_music_volume/100.0f, 2048, t3ss_freq);
+        t3ss_music_volume/100.0f, 4096, t3ss_freq);
     if (!t3ss_duh_player)
     {
         duh_end_sigrenderer(renderer);
@@ -199,24 +181,19 @@
         t3ss_duh = NULL;
         return 0;
     }
-    
-    if (!t3ss_music_on)
-        al_pause_duh(t3ss_duh_player);
-    
-	#ifndef ALLEGRO_WINDOWS
+        
+#ifdef T3SS_PTHREADS
     if (pthread_create(&t3ss_duh_player_thread, NULL,
             t3ss_duh_player_thread_function, NULL))
     {
         al_stop_duh(t3ss_duh_player);
-        unload_duh(t3ss_duh);
         t3ss_duh_player = NULL;
+        unload_duh(t3ss_duh);
         t3ss_duh = NULL;
         return 0;
     }
-	#endif
+#endif
 
-    if (fn != t3ss_mod_fn)
-        snprintf(t3ss_mod_fn, sizeof(t3ss_mod_fn), "%s", fn);
     t3ss_music_playing = 1;
     return 1;
 }
@@ -225,35 +202,36 @@
 /* stop sound playback */
 void t3ss_stop_mod(void)
 {
-    if (t3ss_duh)
+    if (t3ss_duh_player)
     {
         /* stop the player thread */
-        #ifndef ALLEGRO_WINDOWS
+#ifdef T3SS_PTHREADS
         pthread_cancel(t3ss_duh_player_thread);
         pthread_join(t3ss_duh_player_thread, NULL);
-        #endif
+#endif
         /* and clean up everything */
         al_stop_duh(t3ss_duh_player);
-        unload_duh(t3ss_duh);
         t3ss_duh_player = NULL;
+        unload_duh(t3ss_duh);
         t3ss_duh = NULL;
         t3ss_music_playing = 0;
     }
 }
 
+
 /* set the music volume */
 void t3ss_set_music_volume(int volume)
 {
     t3ss_music_volume = volume;
-    if (t3ss_duh)
+    if (t3ss_duh_player)
     {
-	    #ifndef ALLEGRO_WINDOWS
-        	pthread_mutex_lock(&t3ss_duh_player_mutex);
-        #endif
+#ifdef T3SS_PTHREADS
+        pthread_mutex_lock(&t3ss_duh_player_mutex);
+#endif
         al_duh_set_volume(t3ss_duh_player, t3ss_music_volume/100.0f);
-	    #ifndef ALLEGRO_WINDOWS
-	        pthread_mutex_unlock(&t3ss_duh_player_mutex);
-	    #endif
+#ifdef T3SS_PTHREADS
+        pthread_mutex_unlock(&t3ss_duh_player_mutex);
+#endif
     }
 }
 
@@ -269,13 +247,39 @@
 void t3ss_set_music_pattern(int patnum)
 {
     t3ss_music_pattern = patnum;
-    if (t3ss_duh)
+    if (t3ss_duh_player)
     {
-		al_stop_duh(t3ss_duh_player);
-		t3ss_sigrenderer = dumb_it_start_at_order(t3ss_duh, 2, patnum);
-		t3ss_duh_player = al_duh_encapsulate_sigrenderer(t3ss_sigrenderer, 1.0, 4096, 22050);
-		t3ss_set_music_volume(t3ss_music_volume);
-	}
+        DUH_SIGRENDERER *renderer;
+        if (t3ss_music_pattern >= t3ss_num_patterns)
+            t3ss_music_pattern = 0;
+#ifdef T3SS_PTHREADS
+        pthread_mutex_lock(&t3ss_duh_player_mutex);
+#endif
+        al_stop_duh(t3ss_duh_player);
+        t3ss_duh_player = NULL;
+
+        renderer = dumb_it_start_at_order(t3ss_duh, 2, t3ss_music_pattern);
+        if (renderer)
+            t3ss_duh_player = al_duh_encapsulate_sigrenderer(renderer,
+                t3ss_music_volume/100.0f, 4096, t3ss_freq);
+
+        if (!t3ss_duh_player)
+        {
+            if (renderer)
+                duh_end_sigrenderer(renderer);
+            unload_duh(t3ss_duh);
+            t3ss_duh = NULL;
+        }
+#ifdef T3SS_PTHREADS
+        pthread_mutex_unlock(&t3ss_duh_player_mutex);
+        /* stop the player thread? */
+        if (!t3ss_duh_player)
+        {
+            pthread_cancel(t3ss_duh_player_thread);
+            pthread_join(t3ss_duh_player_thread, NULL);
+        }
+#endif
+    }
 }
 
 
@@ -413,24 +417,40 @@
 
 void t3ss_pause_music(void)
 {
-	if(t3ss_duh_player)
-	{
-		al_pause_duh(t3ss_duh_player);
-	}
+    if(t3ss_duh_player)
+    {
+#ifdef T3SS_PTHREADS
+        pthread_mutex_lock(&t3ss_duh_player_mutex);
+#endif
+        al_pause_duh(t3ss_duh_player);
+#ifdef T3SS_PTHREADS
+        pthread_mutex_unlock(&t3ss_duh_player_mutex);
+#endif
+        t3ss_music_playing = 0;
+    }
 }
 
 void t3ss_resume_music(void)
 {
-	if(t3ss_duh_player)
-	{
-		al_resume_duh(t3ss_duh_player);
-	}
+    if (t3ss_duh_player)
+    {
+#ifdef T3SS_PTHREADS
+        pthread_mutex_lock(&t3ss_duh_player_mutex);
+#endif
+        al_resume_duh(t3ss_duh_player);
+#ifdef T3SS_PTHREADS
+        pthread_mutex_unlock(&t3ss_duh_player_mutex);
+#endif
+        t3ss_music_playing = 1;
+    }
 }
 
+#ifndef T3SS_PTHREADS
 void t3ss_poll(void)
 {
-	if(t3ss_duh_player && t3ss_duh)
-	{
-		al_poll_duh(t3ss_duh_player);
-	}
+    if(t3ss_duh_player)
+    {
+        al_poll_duh(t3ss_duh_player);
+    }
 }
+#endif
--- crystal-stacker-1.5/cs/source/cs.c.fixes	2006-03-24 19:41:48.000000000 +0100
+++ crystal-stacker-1.5/cs/source/cs.c	2006-04-07 00:25:54.000000000 +0200
@@ -127,7 +127,6 @@
 /* handle graphics mode switching */
 void cs_gfx_mode(int w, int h, PALETTE mpal)
 {
-    int rrate;
     int dw, dh;
 
     /* don't think this works */
@@ -207,7 +206,6 @@
 /* same as above, but sets the mode every time instead of by necessity */
 void cs_gfx_mode_force(int w, int h, PALETTE mpal)
 {
-    int rrate;
     int dw, dh;
 
     /* don't think this works */
--- crystal-stacker-1.5/cs/source/menu.c.fixes	2006-04-07 10:25:04.000000000 +0200
+++ crystal-stacker-1.5/cs/source/menu.c	2006-04-07 10:26:00.000000000 +0200
@@ -1441,9 +1441,13 @@
 /* select a new theme */
 void select_theme(void)
 {
-	t3ss_pause_music();
+#ifndef T3SS_PTHREADS
+    t3ss_pause_music();
+#endif	
     file_select_ex("Select theme file...", cs_options.theme_name, "CTH", 256, 320, 240);
-	t3ss_resume_music();
+#ifndef T3SS_PTHREADS
+    t3ss_resume_music();
+#endif
     update_theme_filenames(cs_options.theme_name);
     update_menu_screen();
     while((key[KEY_ESC] || key[KEY_ENTER] || key[KEY_SPACE]));
--- crystal-stacker-1.5/cs/source/t3ssal.h.fixes	2001-07-18 04:55:56.000000000 +0200
+++ crystal-stacker-1.5/cs/source/t3ssal.h	2006-04-07 00:25:54.000000000 +0200
@@ -7,6 +7,11 @@
 extern "C" {
 #endif
 
+/* Do we want to use pthreads? */
+#if !defined(ALLEGRO_WINDOWS) && !defined(T3SS_PTHREADS)
+#define T3SS_PTHREADS
+#endif
+
 #define I_NULL -1 /* provide NULL value for signed integers */
 #define MSAMPLE SAMPLE
 
@@ -39,6 +44,14 @@
 void t3ss_play_sound_ex(MSAMPLE * sp, int chan, int vol, int pan, int freq);
 void t3ss_play_sound_reserved(MSAMPLE * sp, int chan, int pan, int freq);
 int t3ss_place_sound(int x, int width);
+void t3ss_pause_music(void);
+void t3ss_resume_music(void);
+
+#ifdef T3SS_PTHREADS
+#define t3ss_poll()
+#else
+void t3ss_poll(void);
+#endif
 
 #ifdef __cplusplus
 }
--- crystal-stacker-1.5/cs/readme.txt.fixes	2006-03-24 19:02:38.000000000 +0100
+++ crystal-stacker-1.5/cs/readme.txt	2006-04-07 10:27:16.000000000 +0200
@@ -6,6 +6,7 @@
 Please see the "Contacting Us" section of this document if you need to contact
 us for any reason.
 
+
 Disclaimer
 ----------
 
--- crystal-stacker-1.5/ce/source/Makefile.unix.fixes	2006-03-21 19:07:56.000000000 +0100
+++ crystal-stacker-1.5/ce/source/Makefile.unix	2006-04-07 00:25:54.000000000 +0200
@@ -1,6 +1,6 @@
-PREFIX  = /home/opt
+PREFIX  = /usr/local
 DATADIR = $(PREFIX)/share/crystal-stacker
-CFLAGS  = -g -Wall -Wno-deprecated-declarations -Wno-char-subscripts -O2
+CFLAGS  = -g -Wall -Wno-char-subscripts -O2 -fsigned-char
 LDFLAGS = `allegro-config --libs`
 DEFINES = -DDATADIR=\"$(DATADIR)/\"
 OBJS    = gui.o gtools.o itools.o theme.o font.o palette.o settings.o \
@@ -17,7 +17,7 @@
 	mkdir -p $(PREFIX)/bin
 	install -p -m 755 $(TARGET) $(PREFIX)/bin
 	mkdir -p $(DATADIR)
-	install -p -m 644 ../../distro/ce.dat $(DATADIR)
+	install -p -m 644 ../ce.dat $(DATADIR)
 	
 clean:
 	rm -f $(OBJS) $(TARGET) *~
--- crystal-stacker-1.5/ce/ce.txt.fixes	2002-01-09 02:02:36.000000000 +0100
+++ crystal-stacker-1.5/ce/ce.txt	2006-04-07 10:27:18.000000000 +0200
@@ -1,11 +1,10 @@
-Crystal Edit (c) 2001 NewCreature Design
+Crystal Edit (c) 2006 NewCreature Design
 ----------------------------------------
 
-
-Crystal Edit is freeware. This means you can pass copies around freely as long
-as no money is to be made from it. If you'd like to include Crystal Edit on
-your freeware/shareware CD, you should contact us via e-mail at the address in
-the "Contacting Us" section of this document to make sure it's okay.
+Crystal Edit is freeware. This means you can pass copies around freely
+provided you include this document in it's original form in your distribution.
+Please see the "Contacting Us" section of this document if you need to contact
+us for any reason.
 
 
 Disclaimer
--- /dev/null	2006-04-07 10:13:42.899697500 +0200
+++ crystal-stacker-1.5/ce/ce-license-change.txt	2006-04-07 10:27:49.000000000 +0200
@@ -0,0 +1,122 @@
+On my (Hans de Goede <j.w.r.degoede at hhs.nl>) request Todd Cope has changed
+the license text for crystal-stacker. However he forgot to change the
+license text (which used to be identical) for the cs theme-editor ce.
+
+The license part of ce.txt has been modified by my to once again match that
+of cs (as found in cs/readme.txt). This was done with permission of Todd:
+
+
+Message-ID: <44339CF1.60204 at hhs.nl>
+Date: Wed, 05 Apr 2006 12:33:21 +0200
+From: Hans de Goede <j.w.r.degoede at hhs.nl>
+User-Agent: Thunderbird 1.5 (X11/20060210)
+MIME-Version: 1.0
+To:  todd at t3-i.com
+Subject: Re: Crsytal Stacker License Clarification needed
+References: <20060404203453.c1bf2b7c2c1de069cff39b794cd5d62e.ff21a1ecfd.wbe at email.secureserver.net>
+In-Reply-To: <20060404203453.c1bf2b7c2c1de069cff39b794cd5d62e.ff21a1ecfd.wbe at email.secureserver.net>
+Content-Type: text/plain; charset=ISO-8859-1; format=flowed
+Content-Transfer-Encoding: 7bit
+
+todd at t3-i.com wrote:
+> Hi there,
+> 
+> Sorry it's taking so long. I've been really busy.
+
+No problem! And many thanks for al the great work on a great game!
+
+> I have uploaded the
+> latest source package with the updated license information and all the
+> fixes you made. I changed the layout of the archive because I didn't
+> like the way the old layout was. Now when you compile the executables
+> they are placed in the "ce" and "cs" folders along with the game data.
+> Just thought I would inform you in case your makefile needs to be
+> updated to reflect this change. Here's the link:
+> 
+> http://ncdgames.t3-i.com/cs15src.zip
+> 
+> I will await word from you before officially releasing this source
+> package to the public that way if you have any more changes to submit I
+> can apply them. If you have things working the way you want and
+> everything looks good in the licensing and such you can go ahead and
+> release your FC version. I'm in the process of moving so I might not be
+> able to get back with you for a while.
+> 
+
+I've looked through the new source and I've got a number of remarks:
+
+1) you seem to have forgotten to update ce/ce.txt the license there 
+still reads:
+"Crystal Edit is freeware. This means you can pass copies around freely
+  as long as no money is to be made from it. If you'd like to include
+  Crystal Edit on your freeware/shareware CD, you should contact us via
+  e-mail at the address in the "Contacting Us" section of this document
+  to make sure it's okay."
+
+Where as in cs/readme.txt (which used to be distro/readme.txt) where you 
+had the exact same text you changed it to:
+"Crystal Stacker is freeware. This means you can pass copies around 
+freely provided you include this document in it's original form in your 
+distribution."
+
+I assume you wanted / meant todo the same change for ce? If you did mean 
+to make this change please let me know I understand if you don't have 
+the time todo a new release now, but without atleast a mail from you 
+saying that this is indeed what you wanted I still cannot distribute cs 
+:| (or atleast not ce).
+
+Many thanks for the license change BTW, the new license is good.
+
+2) Some remarks regarding the new t3ssal.c:
+
+---
+
+The rest of the mail has been deleted because of non relevance
+
+---
+
+Return-Path: <todd at t3-i.com>
+Received: from koko.hhs.nl ([145.52.2.16] verified)
+  by hhs.nl (CommuniGate Pro SMTP 4.3.6)
+  with ESMTP id 46263002 for j.w.r.degoede at hhs.nl; Wed, 05 Apr 2006 23:34:57 +0200
+Received: from exim by koko.hhs.nl with spam-scanned (Exim 4.41)
+	id 1FRFeS-0003oO-Ag
+	for j.w.r.degoede at hhs.nl; Wed, 05 Apr 2006 23:34:57 +0200
+X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on koko.hhs.nl
+X-Spam-Level: 
+X-Spam-Status: No, score=-1.4 required=5.0 tests=AWL,BAYES_00,NO_REAL_NAME 
+	autolearn=no version=3.1.0
+Received: from exim (helo=koko)
+	by koko.hhs.nl with local-smtp (Exim 4.41)
+	id 1FRFeS-0003oL-6o
+	for j.w.r.degoede at hhs.nl; Wed, 05 Apr 2006 23:34:56 +0200
+Received: from [68.178.232.2] (port=36111 helo=smtpout11-02.prod.mesa1.secureserver.net)
+	by koko.hhs.nl with smtp (Exim 4.41)
+	id 1FRFeR-0003oG-Ml
+	for j.w.r.degoede at hhs.nl; Wed, 05 Apr 2006 23:34:56 +0200
+Received: (qmail 21425 invoked from network); 5 Apr 2006 21:34:54 -0000
+Received: from unknown (HELO gem-wbe05.mesa1.secureserver.net) (64.202.189.37)
+  by smtpout11-02.prod.mesa1.secureserver.net with SMTP; 5 Apr 2006 21:34:54 -0000
+Received: (qmail 596 invoked by uid 99); 5 Apr 2006 21:34:53 -0000
+Date: Wed, 05 Apr 2006 14:34:53 -0700
+From: todd at t3-i.com
+Subject: RE: Crsytal Stacker License Clarification needed
+To: Hans de Goede <j.w.r.degoede at hhs.nl>
+Message-ID: <20060405143453.c1bf2b7c2c1de069cff39b794cd5d62e.f78207bcfb.wbe at email.secureserver.net>
+MIME-Version: 1.0
+Content-Type: TEXT/plain; CHARSET=US-ASCII
+User-Agent: Web-Based Email 4.0.17
+X-Originating-IP: 66.190.177.177
+X-Anti-Virus: Kaspersky Anti-Virus for MailServers 5.5.2/RELEASE, bases: 05042006 #175178, status: clean
+
+1) you seem to have forgotten to update ce/ce.txt the license there 
+> still reads:...
+
+Yeah, I forgot about that file. I wanted it to have the same license as
+CS.
+
+2) Some remarks regarding the new t3ssal.c:...
+
+---
+
+Once again the rest of the mail has been deleted because of non relevance.


--- NEW FILE crystal-stacker-theme-editor.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Crystal Stacker Theme Editor
GenericName=Themes editor for Crystal Stacker
Comment=Create new Themes for Crystal Stacker
Exec=crystal-stacker-theme-editor
Icon=crystal-stacker-theme-editor.png
Terminal=false
StartupNotify=false
Type=Application
Categories=Application;Game;
Version=1.5


--- NEW FILE crystal-stacker.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Crystal Stacker
GenericName=Falling blocks 3 in a row
Comment=Match 3 or more crystals of the same color in a row
Exec=crystal-stacker
Icon=crystal-stacker.png
Terminal=false
StartupNotify=false
Type=Application
Categories=Application;Game;
Version=1.5


--- NEW FILE crystal-stacker.spec ---
Name:           crystal-stacker
Version:        1.5
Release:        0.pre.2%{?dist}
Summary:        Falling blocks, match 3 or more of the same color crystals
Group:          Amusements/Games
License:        Freeware
URL:            http://www.t3-i.com/cstacker.htm
Source0:        http://www.t3-i.com/ncdgames/cs15src.zip
Source1:	%{name}.desktop
Source2:	%{name}-theme-editor.desktop
Patch0:         crystal-stacker-1.5-fixes.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  allegro-devel dumb-devel ImageMagick desktop-file-utils

%description
If you've played Columns then you know what Crystal Stacker is all about. Match
3 or more of the same color crystals either horizontally, vertically, or dia-
gonally to destroy them. For every 45 crystals you destroy, the level increases
and the crystals fall faster. The higher the level, the more points you are   
awarded for destroying crystals.


%package theme-editor
Summary:	Themes editor for Crystal Stacker
Group:		Amusements/Games
Requires:	%{name} = %{version}

%description theme-editor
Create new Themes for Crystal Stacker


%prep
%setup -q -c
%patch0 -p1 -z .fixes
%{__sed} -i 's/\r//' ce/*.txt cs/*.txt


%build
pushd cs/source
make %{?_smp_mflags} -f Makefile.unix PREFIX=%{_prefix} \
  CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
popd

pushd ce/source
make %{?_smp_mflags} -f Makefile.unix PREFIX=%{_prefix} \
  CFLAGS="$RPM_OPT_FLAGS -fsigned-char -Wno-char-subscripts"
popd

convert cs/cs.ico %{name}.png
convert ce/ce.ico %{name}-theme-editor.png


%install
rm -rf $RPM_BUILD_ROOT
pushd cs/source
make -f Makefile.unix install PREFIX=$RPM_BUILD_ROOT%{_prefix}
popd

pushd ce/source
make -f Makefile.unix install PREFIX=$RPM_BUILD_ROOT%{_prefix}
popd

# 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}
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 %{name}.png %{name}-theme-editor.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

%post theme-editor
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 theme-editor
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 cs/*.txt
%{_bindir}/crystal-stacker
%dir %{_datadir}/crystal-stacker
%{_datadir}/crystal-stacker/cs.*
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png

%files theme-editor
%defattr(-,root,root,-)
%doc ce/*.txt
%{_bindir}/crystal-stacker-theme-editor
%{_datadir}/crystal-stacker/ce.dat
%{_datadir}/applications/fedora-%{name}-theme-editor.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}-theme-editor.png


%changelog
* Fri Apr  8 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.5-0.pre.2
- Updated Patch0 to not unnescesarry pause the music when selecting
  a new theme and using pthreads to play the music.

* Thu Apr  7 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.5-0.pre.1
- Initial Fedora Extras package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/crystal-stacker/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2006 07:29:53 -0000	1.1
+++ .cvsignore	9 Apr 2006 07:30:54 -0000	1.2
@@ -0,0 +1 @@
+cs15src.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/crystal-stacker/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2006 07:29:53 -0000	1.1
+++ sources	9 Apr 2006 07:30:54 -0000	1.2
@@ -0,0 +1 @@
+d961dfdc859267b2763f4b585a732f3e  cs15src.zip



From fedora-extras-commits at redhat.com  Sun Apr  9 07:30:53 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun,  9 Apr 2006 00:30:53 -0700
Subject: rpms/crystal-stacker import.log,1.1,1.2
Message-ID: <200604090731.k397VP5L020758@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/crystal-stacker
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20718

Modified Files:
	import.log 
Log Message:
auto-import crystal-stacker-1.5-0.pre.2 on branch devel from crystal-stacker-1.5-0.pre.2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/crystal-stacker/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Apr 2006 07:29:52 -0000	1.1
+++ import.log	9 Apr 2006 07:30:53 -0000	1.2
@@ -0,0 +1 @@
+crystal-stacker-1_5-0_pre_2:HEAD:crystal-stacker-1.5-0.pre.2.src.rpm:1144567703



From fedora-extras-commits at redhat.com  Sun Apr  9 07:32:11 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun,  9 Apr 2006 00:32:11 -0700
Subject: owners owners.list,1.813,1.814
Message-ID: <200604090732.k397WDqK020812@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	owners.list 
Log Message:
add crystal-stacker


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.813
retrieving revision 1.814
diff -u -r1.813 -r1.814
--- owners.list	9 Apr 2006 03:08:02 -0000	1.813
+++ owners.list	9 Apr 2006 07:32:11 -0000	1.814
@@ -155,6 +155,7 @@
 Fedora Extras|cproto|Generates function prototypes and variable declarations from C code|jnovy at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|crack|Password cracker|Christian.Iseli at licr.org|extras-qa at fedoraproject.org|
 Fedora Extras|cryptplug|Cryptography plugin for mutt & kmail|dennis at ausil.us|extras-qa at fedoraproject.org|
+Fedora Extras|crystal-stacker|Falling blocks, match 3 or more of the same color crystals|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|csmash|3D tabletennis game|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|ctrlproxy|IRC server with multiserver support|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|cvs2cl|Utility which generates ChangeLogs from CVS working copies|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Apr  9 08:47:38 2006
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Sun,  9 Apr 2006 01:47:38 -0700
Subject: rpms/subversion-api-docs - New directory
Message-ID: <200604090847.k398le0U023717@cvs-int.fedora.redhat.com>

Author: bojan

Update of /cvs/extras/rpms/subversion-api-docs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23696/subversion-api-docs

Log Message:
Directory /cvs/extras/rpms/subversion-api-docs added to the repository




From fedora-extras-commits at redhat.com  Sun Apr  9 08:47:38 2006
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Sun,  9 Apr 2006 01:47:38 -0700
Subject: rpms/subversion-api-docs/devel - New directory
Message-ID: <200604090847.k398leDT023720@cvs-int.fedora.redhat.com>

Author: bojan

Update of /cvs/extras/rpms/subversion-api-docs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23696/subversion-api-docs/devel

Log Message:
Directory /cvs/extras/rpms/subversion-api-docs/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Apr  9 08:48:09 2006
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Sun,  9 Apr 2006 01:48:09 -0700
Subject: rpms/subversion-api-docs Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604090848.k398mBHd023774@cvs-int.fedora.redhat.com>

Author: bojan

Update of /cvs/extras/rpms/subversion-api-docs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23741

Added Files:
	Makefile import.log 
Log Message:
Setup of module subversion-api-docs


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

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

common : CVS/Root
	@cvs 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 Apr  9 08:48:10 2006
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Sun,  9 Apr 2006 01:48:10 -0700
Subject: rpms/subversion-api-docs/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604090848.k398mCp1023777@cvs-int.fedora.redhat.com>

Author: bojan

Update of /cvs/extras/rpms/subversion-api-docs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23741/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module subversion-api-docs


--- 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 Apr  9 08:49:09 2006
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Sun,  9 Apr 2006 01:49:09 -0700
Subject: rpms/subversion-api-docs import.log,1.1,1.2
Message-ID: <200604090849.k398nBMM023841@cvs-int.fedora.redhat.com>

Author: bojan

Update of /cvs/extras/rpms/subversion-api-docs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23808

Modified Files:
	import.log 
Log Message:
auto-import subversion-api-docs-1.3.0-1 on branch devel from subversion-api-docs-1.3.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/subversion-api-docs/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Apr 2006 08:48:09 -0000	1.1
+++ import.log	9 Apr 2006 08:49:09 -0000	1.2
@@ -0,0 +1 @@
+subversion-api-docs-1_3_0-1:HEAD:subversion-api-docs-1.3.0-1.src.rpm:1144572531



From fedora-extras-commits at redhat.com  Sun Apr  9 08:49:10 2006
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Sun,  9 Apr 2006 01:49:10 -0700
Subject: rpms/subversion-api-docs/devel COPYING, NONE, 1.1 doxygen.conf, NONE,
	1.1 subversion-api-docs.spec, NONE, 1.1
Message-ID: <200604090849.k398nC4P023844@cvs-int.fedora.redhat.com>

Author: bojan

Update of /cvs/extras/rpms/subversion-api-docs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23808/devel

Added Files:
	COPYING doxygen.conf subversion-api-docs.spec 
Log Message:
auto-import subversion-api-docs-1.3.0-1 on branch devel from subversion-api-docs-1.3.0-1.src.rpm


--- NEW FILE COPYING ---
This license applies to all portions of Subversion which are not
externally-maintained libraries (e.g. apr/, apr-util/, and neon/).
Such libraries have their own licenses; we recommend you read them, as
their terms may differ from the terms below.

This is version 1 of this license.  It is also available online at
http://subversion.tigris.org/license-1.html.  If newer versions of
this license are posted there (the same URL, but with the version
number incremented: .../license-2.html, .../license-3.html, and so
on), you may use a newer version instead, at your option.

====================================================================
Copyright (c) 2000-2004 CollabNet.  All rights reserved.

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

1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.

3. The end-user documentation included with the redistribution, if
any, must include the following acknowledgment: "This product includes
software developed by CollabNet (http://www.Collab.Net/)."
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.

4. The hosted project names must not be used to endorse or promote
products derived from this software without prior written
permission. For written permission, please contact info at collab.net.

5. Products derived from this software may not use the "Tigris" name
nor may "Tigris" appear in their names without prior written
permission of CollabNet.

THIS SOFTWARE IS PROVIDED ``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 COLLABNET 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 CollabNet.



--- NEW FILE doxygen.conf ---
# Doxyfile 1.4.1

# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project
#
# All text after a hash (#) is considered a comment and will be ignored
# The format is:
#       TAG = value [value, ...]
# For lists items can also be appended using:
#       TAG += value [value, ...]
# Values that contain spaces should be placed between quotes (" ")

#---------------------------------------------------------------------------
# Project related configuration options
#---------------------------------------------------------------------------

# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
# by quotes) that should identify the project.

PROJECT_NAME           = Subversion

# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
# This could be handy for archiving the generated documentation or 
# if some version control system is used.

PROJECT_NUMBER         = 

# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
# base path where the generated documentation will be put. 
# If a relative path is entered, it will be relative to the location 
# where doxygen was started. If left blank the current directory will be used.

OUTPUT_DIRECTORY       = doc/doxygen

# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
# 4096 sub-directories (in 2 levels) under the output directory of each output 
# format and will distribute the generated files over these directories. 
# Enabling this option can be useful when feeding doxygen a huge amount of 
# source files, where putting all generated files in the same directory would 
# otherwise cause performance problems for the file system.

CREATE_SUBDIRS         = NO

# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
# documentation generated by doxygen is written. Doxygen will use this 
# information to generate all constant output in the proper language. 
# The default language is English, other supported languages are: 
# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, 
# Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese, 
# Japanese-en (Japanese with English messages), Korean, Korean-en, Norwegian, 
# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, 
# Swedish, and Ukrainian.

OUTPUT_LANGUAGE        = English

# This tag can be used to specify the encoding used in the generated output. 
# The encoding is not always determined by the language that is chosen, 
# but also whether or not the output is meant for Windows or non-Windows users. 
# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES 
# forces the Windows encoding (this is the default for the Windows binary), 
# whereas setting the tag to NO uses a Unix-style encoding (the default for 
# all platforms other than Windows).

USE_WINDOWS_ENCODING   = YES

# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
# include brief member descriptions after the members that are listed in 
# the file and class documentation (similar to JavaDoc). 
# Set to NO to disable this.

BRIEF_MEMBER_DESC      = YES

# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
# the brief description of a member or function before the detailed description. 
# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
# brief descriptions will be completely suppressed.

REPEAT_BRIEF           = YES

# This tag implements a quasi-intelligent brief description abbreviator 
# that is used to form the text in various listings. Each string 
# in this list, if found as the leading text of the brief description, will be 
# stripped from the text and the result after processing the whole list, is 
# used as the annotated text. Otherwise, the brief description is used as-is. 
# If left blank, the following values are used ("$name" is automatically 
# replaced with the name of the entity): "The $name class" "The $name widget" 
# "The $name file" "is" "provides" "specifies" "contains" 
# "represents" "a" "an" "the"

ABBREVIATE_BRIEF       = 

# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
# Doxygen will generate a detailed section even if there is only a brief 
# description.

ALWAYS_DETAILED_SEC    = NO

# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
# inherited members of a class in the documentation of that class as if those 
# members were ordinary class members. Constructors, destructors and assignment 
# operators of the base classes will not be shown.

INLINE_INHERITED_MEMB  = NO

# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
# path before files name in the file list and in the header files. If set 
# to NO the shortest path that makes the file name unique will be used.

FULL_PATH_NAMES        = NO

# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
# can be used to strip a user-defined part of the path. Stripping is 
# only done if one of the specified strings matches the left-hand part of 
# the path. The tag can be used to show relative paths in the file list. 
# If left blank the directory from which doxygen is run is used as the 
# path to strip.

STRIP_FROM_PATH        = 

# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
# the path mentioned in the documentation of a class, which tells 
# the reader which header file to include in order to use a class. 
# If left blank only the name of the header file containing the class 
# definition is used. Otherwise one should specify the include paths that 
# are normally passed to the compiler using the -I flag.

STRIP_FROM_INC_PATH    = 

# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
# (but less readable) file names. This can be useful is your file systems 
# doesn't support long names like on DOS, Mac, or CD-ROM.

SHORT_NAMES            = NO

# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
# will interpret the first line (until the first dot) of a JavaDoc-style 
# comment as the brief description. If set to NO, the JavaDoc 
# comments will behave just like the Qt-style comments (thus requiring an 
# explicit @brief command for a brief description.

JAVADOC_AUTOBRIEF      = YES

# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
# comments) as a brief description. This used to be the default behaviour. 
# The new default is to treat a multi-line C++ comment block as a detailed 
# description. Set this tag to YES if you prefer the old behaviour instead.

MULTILINE_CPP_IS_BRIEF = NO

# If the DETAILS_AT_TOP tag is set to YES then Doxygen 
# will output the detailed description near the top, like JavaDoc.
# If set to NO, the detailed description appears after the member 
# documentation.

DETAILS_AT_TOP         = NO

# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
# member inherits the documentation from any documented member that it 
# re-implements.

INHERIT_DOCS           = YES

# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
# tag is set to YES, then doxygen will reuse the documentation of the first 
# member in the group (if any) for the other members of the group. By default 
# all members of a group must be documented explicitly.

DISTRIBUTE_GROUP_DOC   = NO

# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
# Doxygen uses this value to replace tabs by spaces in code fragments.

TAB_SIZE               = 8

# This tag can be used to specify a number of aliases that acts 
# as commands in the documentation. An alias has the form "name=value". 
# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
# put the command \sideeffect (or @sideeffect) in the documentation, which 
# will result in a user-defined paragraph with heading "Side Effects:". 
# You can put \n's in the value part of an alias to insert newlines.

ALIASES                = "copyright=@if copyrights" \
                         endcopyright=@endif

# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
# sources only. Doxygen will then generate output that is more tailored for C. 
# For instance, some of the names that are used will be different. The list 
# of all members will be omitted, etc.

OPTIMIZE_OUTPUT_FOR_C  = YES

# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources 
# only. Doxygen will then generate output that is more tailored for Java. 
# For instance, namespaces will be presented as packages, qualified scopes 
# will look different, etc.

OPTIMIZE_OUTPUT_JAVA   = NO

# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
# the same type (for instance a group of public functions) to be put as a 
# subgroup of that type (e.g. under the Public Functions section). Set it to 
# NO to prevent subgrouping. Alternatively, this can be done per class using 
# the \nosubgrouping command.

SUBGROUPING            = YES

#---------------------------------------------------------------------------
# Build related configuration options
#---------------------------------------------------------------------------

# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
# documentation are documented, even if no documentation was available. 
# Private class members and static file members will be hidden unless 
# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES

EXTRACT_ALL            = NO

# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
# will be included in the documentation.

EXTRACT_PRIVATE        = NO

# If the EXTRACT_STATIC tag is set to YES all static members of a file 
# will be included in the documentation.

EXTRACT_STATIC         = NO

# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
# defined locally in source files will be included in the documentation. 
# If set to NO only classes defined in header files are included.

EXTRACT_LOCAL_CLASSES  = YES

# This flag is only useful for Objective-C code. When set to YES local 
# methods, which are defined in the implementation section but not in 
# the interface are included in the documentation. 
# If set to NO (the default) only methods in the interface are included.

EXTRACT_LOCAL_METHODS  = NO

# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
# undocumented members of documented classes, files or namespaces. 
# If set to NO (the default) these members will be included in the 
# various overviews, but no documentation section is generated. 
# This option has no effect if EXTRACT_ALL is enabled.

HIDE_UNDOC_MEMBERS     = NO

# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
# undocumented classes that are normally visible in the class hierarchy. 
# If set to NO (the default) these classes will be included in the various 
# overviews. This option has no effect if EXTRACT_ALL is enabled.

HIDE_UNDOC_CLASSES     = NO

# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
# friend (class|struct|union) declarations. 
# If set to NO (the default) these declarations will be included in the 
# documentation.

HIDE_FRIEND_COMPOUNDS  = NO

# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
# documentation blocks found inside the body of a function. 
# If set to NO (the default) these blocks will be appended to the 
# function's detailed documentation block.

HIDE_IN_BODY_DOCS      = NO

# The INTERNAL_DOCS tag determines if documentation 
# that is typed after a \internal command is included. If the tag is set 
# to NO (the default) then the documentation will be excluded. 
# Set it to YES to include the internal documentation.

INTERNAL_DOCS          = NO

# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
# file names in lower-case letters. If set to YES upper-case letters are also 
# allowed. This is useful if you have classes or files whose names only differ 
# in case and if your file system supports case sensitive file names. Windows 
# and Mac users are advised to set this option to NO.

CASE_SENSE_NAMES       = YES

# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
# will show members with their full class and namespace scopes in the 
# documentation. If set to YES the scope will be hidden.

HIDE_SCOPE_NAMES       = NO

# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
# will put a list of the files that are included by a file in the documentation 
# of that file.

SHOW_INCLUDE_FILES     = YES

# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
# is inserted in the documentation for inline members.

INLINE_INFO            = YES

# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
# will sort the (detailed) documentation of file and class members 
# alphabetically by member name. If set to NO the members will appear in 
# declaration order.

SORT_MEMBER_DOCS       = YES

# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
# brief documentation of file, namespace and class members alphabetically 
# by member name. If set to NO (the default) the members will appear in 
# declaration order.

SORT_BRIEF_DOCS        = NO

# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
# sorted by fully-qualified names, including namespaces. If set to 
# NO (the default), the class list will be sorted only by class name, 
# not including the namespace part. 
# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
# Note: This option applies only to the class list, not to the 
# alphabetical list.

SORT_BY_SCOPE_NAME     = NO

# The GENERATE_TODOLIST tag can be used to enable (YES) or 
# disable (NO) the todo list. This list is created by putting \todo 
# commands in the documentation.

GENERATE_TODOLIST      = YES

# The GENERATE_TESTLIST tag can be used to enable (YES) or 
# disable (NO) the test list. This list is created by putting \test 
# commands in the documentation.

GENERATE_TESTLIST      = YES

# The GENERATE_BUGLIST tag can be used to enable (YES) or 
# disable (NO) the bug list. This list is created by putting \bug 
# commands in the documentation.

GENERATE_BUGLIST       = YES

# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
# disable (NO) the deprecated list. This list is created by putting 
# \deprecated commands in the documentation.

GENERATE_DEPRECATEDLIST= YES

# The ENABLED_SECTIONS tag can be used to enable conditional 
# documentation sections, marked by \if sectionname ... \endif.

ENABLED_SECTIONS       = 

# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
# the initial value of a variable or define consists of for it to appear in 
# the documentation. If the initializer consists of more lines than specified 
# here it will be hidden. Use a value of 0 to hide initializers completely. 
# The appearance of the initializer of individual variables and defines in the 
# documentation can be controlled using \showinitializer or \hideinitializer 
# command in the documentation regardless of this setting.

MAX_INITIALIZER_LINES  = 30

# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
# at the bottom of the documentation of classes and structs. If set to YES the 
# list will mention the files that were used to generate the documentation.

SHOW_USED_FILES        = YES

# If the sources in your project are distributed over multiple directories 
# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
# in the documentation.

SHOW_DIRECTORIES       = YES

# 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 
# version control system). Doxygen will invoke the program by executing (via 
# popen()) the command <command> <input-file>, where <command> is the value of 
# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
# provided by doxygen. Whatever the progam writes to standard output 
# is used as the file version. See the manual for examples.

FILE_VERSION_FILTER    = 

#---------------------------------------------------------------------------
# configuration options related to warning and progress messages
#---------------------------------------------------------------------------

# The QUIET tag can be used to turn on/off the messages that are generated 
# by doxygen. Possible values are YES and NO. If left blank NO is used.

QUIET                  = NO

# The WARNINGS tag can be used to turn on/off the warning messages that are 
# generated by doxygen. Possible values are YES and NO. If left blank 
# NO is used.

WARNINGS               = YES

# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
# automatically be disabled.

WARN_IF_UNDOCUMENTED   = YES

# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
# potential errors in the documentation, such as not documenting some 
# parameters in a documented function, or documenting parameters that 
# don't exist or using markup commands wrongly.

WARN_IF_DOC_ERROR      = YES

# This WARN_NO_PARAMDOC option can be abled to get warnings for 
# functions that are documented, but have no documentation for their parameters 
# or return value. If set to NO (the default) doxygen will only warn about 
# wrong or incomplete parameter documentation, but not about the absence of 
# documentation.

WARN_NO_PARAMDOC       = NO

# The WARN_FORMAT tag determines the format of the warning messages that 
# doxygen can produce. The string should contain the $file, $line, and $text 
# tags, which will be replaced by the file and line number from which the 
# warning originated and the warning text. Optionally the format may contain 
# $version, which will be replaced by the version of the file (if it could 
# be obtained via FILE_VERSION_FILTER)

WARN_FORMAT            = "$file:$line: $text"

# The WARN_LOGFILE tag can be used to specify a file to which warning 
# and error messages should be written. If left blank the output is written 
# to stderr.

WARN_LOGFILE           = 

#---------------------------------------------------------------------------
# configuration options related to the input files
#---------------------------------------------------------------------------

# The INPUT tag can be used to specify the files and/or directories that contain 
# documented source files. You may enter file names like "myfile.cpp" or 
# directories like "/usr/src/myproject". Separate the files or directories 
# with spaces.

INPUT                  = subversion/include

# If the value of the INPUT tag contains directories, you can use the 
# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
# and *.h) to filter out the source-files in the directories. If left 
# blank the following patterns are tested: 
# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm

FILE_PATTERNS          = *.h

# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
# should be searched for input files as well. Possible values are YES and NO. 
# If left blank NO is used.

RECURSIVE              = NO

# The EXCLUDE tag can be used to specify files and/or directories that should 
# excluded from the INPUT source files. This way you can easily exclude a 
# subdirectory from a directory tree whose root is specified with the INPUT tag.

EXCLUDE                = 

# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
# directories that are symbolic links (a Unix filesystem feature) are excluded 
# from the input.

EXCLUDE_SYMLINKS       = NO

# If the value of the INPUT tag contains directories, you can use the 
# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
# certain files from those directories.

EXCLUDE_PATTERNS       = 

# The EXAMPLE_PATH tag can be used to specify one or more files or 
# directories that contain example code fragments that are included (see 
# the \include command).

EXAMPLE_PATH           = 

# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
# and *.h) to filter out the source-files in the directories. If left 
# blank all files are included.

EXAMPLE_PATTERNS       = 

# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
# searched for input files to be used with the \include or \dontinclude 
# commands irrespective of the value of the RECURSIVE tag. 
# Possible values are YES and NO. If left blank NO is used.

EXAMPLE_RECURSIVE      = NO

# The IMAGE_PATH tag can be used to specify one or more files or 
# directories that contain image that are included in the documentation (see 
# the \image command).

IMAGE_PATH             = 

# The INPUT_FILTER tag can be used to specify a program that doxygen should 
# invoke to filter for each input file. Doxygen will invoke the filter program 
# by executing (via popen()) the command <filter> <input-file>, where <filter> 
# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
# input file. Doxygen will then use the output that the filter program writes 
# to standard output.  If FILTER_PATTERNS is specified, this tag will be 
# ignored.

INPUT_FILTER           = 

# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
# basis.  Doxygen will compare the file name with each pattern and apply the 
# filter if there is a match.  The filters are a list of the form: 
# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER 
# is applied to all files.

FILTER_PATTERNS        = 

# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
# INPUT_FILTER) will be used to filter the input files when producing source 
# files to browse (i.e. when SOURCE_BROWSER is set to YES).

FILTER_SOURCE_FILES    = NO

#---------------------------------------------------------------------------
# configuration options related to source browsing
#---------------------------------------------------------------------------

# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
# be generated. Documented entities will be cross-referenced with these sources. 
# Note: To get rid of all source code in the generated output, make sure also 
# VERBATIM_HEADERS is set to NO.

SOURCE_BROWSER         = YES

# Setting the INLINE_SOURCES tag to YES will include the body 
# of functions and classes directly in the documentation.

INLINE_SOURCES         = NO

# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
# doxygen to hide any special comment blocks from generated source code 
# fragments. Normal C and C++ comments will always remain visible.

STRIP_CODE_COMMENTS    = NO

# If the REFERENCED_BY_RELATION tag is set to YES (the default) 
# then for each documented function all documented 
# functions referencing it will be listed.

REFERENCED_BY_RELATION = YES

# If the REFERENCES_RELATION tag is set to YES (the default) 
# then for each documented function all documented entities 
# called/used by that function will be listed.

REFERENCES_RELATION    = YES

# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
# will generate a verbatim copy of the header file for each class for 
# which an include is specified. Set to NO to disable this.

VERBATIM_HEADERS       = YES

#---------------------------------------------------------------------------
# configuration options related to the alphabetical class index
#---------------------------------------------------------------------------

# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
# of all compounds will be generated. Enable this if the project 
# contains a lot of classes, structs, unions or interfaces.

ALPHABETICAL_INDEX     = NO

# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
# in which this list will be split (can be a number in the range [1..20])

COLS_IN_ALPHA_INDEX    = 5

# In case all classes in a project start with a common prefix, all 
# classes will be put under the same header in the alphabetical index. 
# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
# should be ignored while generating the index headers.

IGNORE_PREFIX          = 

#---------------------------------------------------------------------------
# configuration options related to the HTML output
#---------------------------------------------------------------------------

# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
# generate HTML output.

GENERATE_HTML          = YES

# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
# put in front of it. If left blank `html' will be used as the default path.

HTML_OUTPUT            = html

# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
# doxygen will generate files with .html extension.

HTML_FILE_EXTENSION    = .html

# The HTML_HEADER tag can be used to specify a personal HTML header for 
# each generated HTML page. If it is left blank doxygen will generate a 
# standard header.

HTML_HEADER            = 

# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
# each generated HTML page. If it is left blank doxygen will generate a 
# standard footer.

HTML_FOOTER            = 

# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
# style sheet that is used by each HTML page. It can be used to 
# fine-tune the look of the HTML output. If the tag is left blank doxygen 
# will generate a default style sheet. Note that doxygen will try to copy 
# the style sheet file to the HTML output directory, so don't put your own 
# stylesheet in the HTML output directory as well, or it will be erased!

HTML_STYLESHEET        = 

# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
# files or namespaces will be aligned in HTML using tables. If set to 
# NO a bullet list will be used.

HTML_ALIGN_MEMBERS     = YES

# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
# will be generated that can be used as input for tools like the 
# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) 
# of the generated HTML documentation.

GENERATE_HTMLHELP      = NO

# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
# be used to specify the file name of the resulting .chm file. You 
# can add a path in front of the file if the result should not be 
# written to the html output directory.

CHM_FILE               = 

# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
# be used to specify the location (absolute path including file name) of 
# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
# the HTML help compiler on the generated index.hhp.

HHC_LOCATION           = 

# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
# controls if a separate .chi index file is generated (YES) or that 
# it should be included in the master .chm file (NO).

GENERATE_CHI           = NO

# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
# controls whether a binary table of contents is generated (YES) or a 
# normal table of contents (NO) in the .chm file.

BINARY_TOC             = NO

# The TOC_EXPAND flag can be set to YES to add extra items for group members 
# to the contents of the HTML help documentation and to the tree view.

TOC_EXPAND             = NO

# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
# top of each HTML page. The value NO (the default) enables the index and 
# the value YES disables it.

DISABLE_INDEX          = NO

# This tag can be used to set the number of enum values (range [1..20]) 
# that doxygen will group on one line in the generated HTML documentation.

ENUM_VALUES_PER_LINE   = 1

# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
# generated containing a tree-like index structure (just like the one that 
# is generated for HTML Help). For this to work a browser that supports 
# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
# probably better off using the HTML help feature.

GENERATE_TREEVIEW      = NO

# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
# used to set the initial width (in pixels) of the frame in which the tree 
# is shown.

TREEVIEW_WIDTH         = 250

#---------------------------------------------------------------------------
# configuration options related to the LaTeX output
#---------------------------------------------------------------------------

# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
# generate Latex output.

GENERATE_LATEX         = NO

# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
# put in front of it. If left blank `latex' will be used as the default path.

LATEX_OUTPUT           = latex

# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
# invoked. If left blank `latex' will be used as the default command name.

LATEX_CMD_NAME         = latex

# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
# generate index for LaTeX. If left blank `makeindex' will be used as the 
# default command name.

MAKEINDEX_CMD_NAME     = makeindex

# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
# LaTeX documents. This may be useful for small projects and may help to 
# save some trees in general.

COMPACT_LATEX          = NO

# The PAPER_TYPE tag can be used to set the paper type that is used 
# by the printer. Possible values are: a4, a4wide, letter, legal and 
# executive. If left blank a4wide will be used.

PAPER_TYPE             = a4wide

# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
# packages that should be included in the LaTeX output.

EXTRA_PACKAGES         = 

# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
# the generated latex document. The header should contain everything until 
# the first chapter. If it is left blank doxygen will generate a 
# standard header. Notice: only use this tag if you know what you are doing!

LATEX_HEADER           = 

# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
# contain links (just like the HTML output) instead of page references 
# This makes the output suitable for online browsing using a pdf viewer.

PDF_HYPERLINKS         = NO

# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
# plain latex in the generated Makefile. Set this option to YES to get a 
# higher quality PDF documentation.

USE_PDFLATEX           = NO

# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
# command to the generated LaTeX files. This will instruct LaTeX to keep 
# running if errors occur, instead of asking the user for help. 
# This option is also used when generating formulas in HTML.

LATEX_BATCHMODE        = NO

# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
# include the index chapters (such as File Index, Compound Index, etc.) 
# in the output.

LATEX_HIDE_INDICES     = NO

#---------------------------------------------------------------------------
# configuration options related to the RTF output
#---------------------------------------------------------------------------

# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
# The RTF output is optimized for Word 97 and may not look very pretty with 
# other RTF readers or editors.

GENERATE_RTF           = NO

# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
# put in front of it. If left blank `rtf' will be used as the default path.

RTF_OUTPUT             = rtf

# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
# RTF documents. This may be useful for small projects and may help to 
# save some trees in general.

COMPACT_RTF            = NO

# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
# will contain hyperlink fields. The RTF file will 
# contain links (just like the HTML output) instead of page references. 
# This makes the output suitable for online browsing using WORD or other 
# programs which support those fields. 
# Note: wordpad (write) and others do not support links.

RTF_HYPERLINKS         = NO

# Load stylesheet definitions from file. Syntax is similar to doxygen's 
# config file, i.e. a series of assignments. You only have to provide 
# replacements, missing definitions are set to their default value.

RTF_STYLESHEET_FILE    = 

# Set optional variables used in the generation of an rtf document. 
# Syntax is similar to doxygen's config file.

RTF_EXTENSIONS_FILE    = 

#---------------------------------------------------------------------------
# configuration options related to the man page output
#---------------------------------------------------------------------------

# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
# generate man pages

GENERATE_MAN           = NO

# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
# put in front of it. If left blank `man' will be used as the default path.

MAN_OUTPUT             = man

# The MAN_EXTENSION tag determines the extension that is added to 
# the generated man pages (default is the subroutine's section .3)

MAN_EXTENSION          = .3

# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
# then it will generate one additional man file for each entity 
# documented in the real man page(s). These additional files 
# only source the real man page, but without them the man command 
# would be unable to find the correct page. The default is NO.

MAN_LINKS              = NO

#---------------------------------------------------------------------------
# configuration options related to the XML output
#---------------------------------------------------------------------------

# If the GENERATE_XML tag is set to YES Doxygen will 
# generate an XML file that captures the structure of 
# the code including all documentation.

GENERATE_XML           = NO

# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
# put in front of it. If left blank `xml' will be used as the default path.

XML_OUTPUT             = xml

# The XML_SCHEMA tag can be used to specify an XML schema, 
# which can be used by a validating XML parser to check the 
# syntax of the XML files.

XML_SCHEMA             = 

# The XML_DTD tag can be used to specify an XML DTD, 
# which can be used by a validating XML parser to check the 
# syntax of the XML files.

XML_DTD                = 

# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
# dump the program listings (including syntax highlighting 
# and cross-referencing information) to the XML output. Note that 
# enabling this will significantly increase the size of the XML output.

XML_PROGRAMLISTING     = YES

#---------------------------------------------------------------------------
# configuration options for the AutoGen Definitions output
#---------------------------------------------------------------------------

# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
# generate an AutoGen Definitions (see autogen.sf.net) file 
# that captures the structure of the code including all 
# documentation. Note that this feature is still experimental 
# and incomplete at the moment.

GENERATE_AUTOGEN_DEF   = NO

#---------------------------------------------------------------------------
# configuration options related to the Perl module output
#---------------------------------------------------------------------------

# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
# generate a Perl module file that captures the structure of 
# the code including all documentation. Note that this 
# feature is still experimental and incomplete at the 
# moment.

GENERATE_PERLMOD       = NO

# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
# to generate PDF and DVI output from the Perl module output.

PERLMOD_LATEX          = NO

# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
# nicely formatted so it can be parsed by a human reader.  This is useful 
# if you want to understand what is going on.  On the other hand, if this 
# tag is set to NO the size of the Perl module output will be much smaller 
# and Perl will parse it just the same.

PERLMOD_PRETTY         = YES

# The names of the make variables in the generated doxyrules.make file 
# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
# This is useful so different doxyrules.make files included by the same 
# Makefile don't overwrite each other's variables.

PERLMOD_MAKEVAR_PREFIX = 

#---------------------------------------------------------------------------
# Configuration options related to the preprocessor   
#---------------------------------------------------------------------------

# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
# evaluate all C-preprocessor directives found in the sources and include 
# files.

ENABLE_PREPROCESSING   = YES

# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
# names in the source code. If set to NO (the default) only conditional 
# compilation will be performed. Macro expansion can be done in a controlled 
# way by setting EXPAND_ONLY_PREDEF to YES.

MACRO_EXPANSION        = YES

# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
# then the macro expansion is limited to the macros specified with the 
# PREDEFINED and EXPAND_AS_PREDEFINED tags.

EXPAND_ONLY_PREDEF     = NO

# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
# in the INCLUDE_PATH (see below) will be search if a #include is found.

SEARCH_INCLUDES        = YES

# The INCLUDE_PATH tag can be used to specify one or more directories that 
# contain include files that are not input files but should be processed by 
# the preprocessor.

INCLUDE_PATH           = 

# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
# patterns (like *.h and *.hpp) to filter out the header-files in the 
# directories. If left blank, the patterns specified with FILE_PATTERNS will 
# be used.

INCLUDE_FILE_PATTERNS  = 

# The PREDEFINED tag can be used to specify one or more macro names that 
# are defined before the preprocessor is started (similar to the -D option of 
# gcc). The argument of the tag is a list of macros of the form: name 
# or name=definition (no spaces). If the definition and the = are 
# omitted =1 is assumed. To prevent a macro definition from being 
# undefined via #undef or recursively expanded use the := operator 
# instead of the = operator.

PREDEFINED             = DOXYGEN \
                         DOXYGEN_SHOULD_SKIP_THIS \
                         __attribute__(x)= \
                         "SVN_ERROR_START=typedef enum svn_errno_t { \
                         SVN_WARNING = APR_OS_START_USERERR + 1," \
                         "SVN_ERRDEF(num,offset,str)=/** str */ num = offset," \
                         "SVN_ERROR_END=SVN_ERR_LAST } svn_errno_t;"


# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
# this tag can be used to specify a list of macro names that should be expanded. 
# The macro definition that is found in the sources will be used. 
# Use the PREDEFINED tag if you want to use a different macro definition.

EXPAND_AS_DEFINED      = 

# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
# doxygen's preprocessor will remove all function-like macros that are alone 
# on a line, have an all uppercase name, and do not end with a semicolon. Such 
# function macros are typically used for boiler-plate code, and will confuse 
# the parser if not removed.

SKIP_FUNCTION_MACROS   = YES

#---------------------------------------------------------------------------
# Configuration::additions related to external references   
#---------------------------------------------------------------------------

# The TAGFILES option can be used to specify one or more tagfiles. 
# Optionally an initial location of the external documentation 
# can be added for each tagfile. The format of a tag file without 
# this location is as follows: 
#   TAGFILES = file1 file2 ... 
# Adding location for the tag files is done as follows: 
#   TAGFILES = file1=loc1 "file2 = loc2" ... 
# where "loc1" and "loc2" can be relative or absolute paths or 
# URLs. If a location is present for each tag, the installdox tool 
# does not have to be run to correct the links.
# Note that each tag file must have a unique name
# (where the name does NOT include the path)
# If a tag file is not located in the directory in which doxygen 
# is run, you must also specify the path to the tagfile here.

TAGFILES               = 

# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
# a tag file that is based on the input files it reads.

GENERATE_TAGFILE       = 

# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
# in the class index. If set to NO only the inherited external classes 
# will be listed.

ALLEXTERNALS           = NO

# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
# in the modules index. If set to NO, only the current project's groups will 
# be listed.

EXTERNAL_GROUPS        = YES

# The PERL_PATH should be the absolute path and name of the perl script 
# interpreter (i.e. the result of `which perl').

PERL_PATH              = /usr/bin/perl

#---------------------------------------------------------------------------
# Configuration options related to the dot tool   
#---------------------------------------------------------------------------

# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
# or super classes. Setting the tag to NO turns the diagrams off. Note that 
# this option is superseded by the HAVE_DOT option below. This is only a 
# fallback. It is recommended to install and use dot, since it yields more 
# powerful graphs.

CLASS_DIAGRAMS         = YES

# If set to YES, the inheritance and collaboration graphs will hide 
# inheritance and usage relations if the target is undocumented 
# or is not a class.

HIDE_UNDOC_RELATIONS   = YES

# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
# available from the path. This tool is part of Graphviz, a graph visualization 
# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
# have no effect if this option is set to NO (the default)

HAVE_DOT               = NO

# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
# will generate a graph for each documented class showing the direct and 
# indirect inheritance relations. Setting this tag to YES will force the 
# the CLASS_DIAGRAMS tag to NO.

CLASS_GRAPH            = YES

# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
# will generate a graph for each documented class showing the direct and 
# indirect implementation dependencies (inheritance, containment, and 
# class references variables) of the class with other documented classes.

COLLABORATION_GRAPH    = YES

# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen 
# will generate a graph for groups, showing the direct groups dependencies

GROUP_GRAPHS           = YES

# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
# collaboration diagrams in a style similar to the OMG's Unified Modeling 
# Language.

UML_LOOK               = NO

# If set to YES, the inheritance and collaboration graphs will show the 
# relations between templates and their instances.

TEMPLATE_RELATIONS     = YES

# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
# tags are set to YES then doxygen will generate a graph for each documented 
# file showing the direct and indirect include dependencies of the file with 
# other documented files.

INCLUDE_GRAPH          = YES

# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
# documented header file showing the documented files that directly or 
# indirectly include this file.

INCLUDED_BY_GRAPH      = YES

# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will 
# generate a call dependency graph for every global function or class method. 
# Note that enabling this option will significantly increase the time of a run. 
# So in most cases it will be better to enable call graphs for selected 
# functions only using the \callgraph command.

CALL_GRAPH             = NO

# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
# will graphical hierarchy of all classes instead of a textual one.

GRAPHICAL_HIERARCHY    = YES

# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES 
# then doxygen will show the dependencies a directory has on other directories 
# in a graphical way. The dependency relations are determined by the #include
# relations between the files in the directories.

DIRECTORY_GRAPH        = YES

# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
# generated by dot. Possible values are png, jpg, or gif
# If left blank png will be used.

DOT_IMAGE_FORMAT       = png

# The tag DOT_PATH can be used to specify the path where the dot tool can be 
# found. If left blank, it is assumed the dot tool can be found in the path.

DOT_PATH               = 

# The DOTFILE_DIRS tag can be used to specify one or more directories that 
# contain dot files that are included in the documentation (see the 
# \dotfile command).

DOTFILE_DIRS           = 

# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width 
# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
# this value, doxygen will try to truncate the graph, so that it fits within 
# the specified constraint. Beware that most browsers cannot cope with very 
# large images.

MAX_DOT_GRAPH_WIDTH    = 1024

# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height 
# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
# this value, doxygen will try to truncate the graph, so that it fits within 
# the specified constraint. Beware that most browsers cannot cope with very 
# large images.

MAX_DOT_GRAPH_HEIGHT   = 1024

# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
# graphs generated by dot. A depth value of 3 means that only nodes reachable 
# from the root by following a path via at most 3 edges will be shown. Nodes 
# that lay further from the root node will be omitted. Note that setting this 
# option to 1 or 2 may greatly reduce the computation time needed for large 
# code bases. Also note that a graph may be further truncated if the graph's 
# image dimensions are not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH 
# and MAX_DOT_GRAPH_HEIGHT). If 0 is used for the depth value (the default), 
# the graph is not depth-constrained.

MAX_DOT_GRAPH_DEPTH    = 0

# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
# background. This is disabled by default, which results in a white background. 
# Warning: Depending on the platform used, enabling this option may lead to 
# badly anti-aliased labels on the edges of a graph (i.e. they become hard to 
# read).

DOT_TRANSPARENT        = NO

# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output 
# files in one run (i.e. multiple -o and -T options on the command line). This 
# makes dot run faster, but since only newer versions of dot (>1.8.10) 
# support this, this feature is disabled by default.

DOT_MULTI_TARGETS      = NO

# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
# generate a legend page explaining the meaning of the various boxes and 
# arrows in the dot generated graphs.

GENERATE_LEGEND        = YES

# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
# remove the intermediate dot files that are used to generate 
# the various graphs.

DOT_CLEANUP            = YES

#---------------------------------------------------------------------------
# Configuration::additions related to the search engine   
#---------------------------------------------------------------------------

# The SEARCHENGINE tag specifies whether or not a search engine should be 
# used. If set to NO the values of all tags below this one will be ignored.

SEARCHENGINE           = NO


--- NEW FILE subversion-api-docs.spec ---
Name:		subversion-api-docs
Version:	1.3.0
Release:	1%{?dist}
Summary:	Subversion API documentation

Group:		Development/Tools
License:	BSD
URL:		http://subversion.tigris.org/
Source0:        http://svn.collab.net/repos/svn/tags/%{version}/doc/doxygen.conf
Source1:        http://svn.collab.net/repos/svn/tags/%{version}/COPYING
BuildRequires:	subversion-devel = %{version}, doxygen
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch

Requires:	subversion-devel >= %{version}

%description
Subversion is a concurrent version control system which enables one or more
users to collaborate in developing and maintaining a hierarchy of files and
directories while keeping a history of all changes. This package provides
Subversion API documentation for developers.

%prep
rm -rf %{name}-%{version}
mkdir -p %{name}-%{version}
cd %{name}-%{version}
cp %{SOURCE0} doxygen.conf

%build
cd %{name}-%{version}
sed -e 's,\(INPUT *= *\).*$,\1%{_includedir}/subversion-1', \
    -e 's,\(OUTPUT_DIRECTORY *= *\).*$,\1docs,' \
    -e 's,\(GENERATE_TAGFILE *= *\).*$,\1docs/svn.tag,' \
doxygen.conf | doxygen -

%install
cd %{name}-%{version}
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_docdir}/subversion-%{version}/api-docs 
install -m 644 docs/svn.tag $RPM_BUILD_ROOT%{_docdir}/subversion-%{version}/api-docs
install -m 644 docs/html/* $RPM_BUILD_ROOT%{_docdir}/subversion-%{version}/api-docs
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_docdir}/subversion-%{version}/api-docs

%clean
rm -rf %{name}-%{version}
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc %dir %{_docdir}/subversion-%{version}
%doc %dir %{_docdir}/subversion-%{version}/api-docs
%doc %{_docdir}/subversion-%{version}/api-docs/*

%changelog
* Wed Jan 11 2006 Bojan Smojver <bojan at rexursive.com> 1.3.0-1
- initial package



From fedora-extras-commits at redhat.com  Sun Apr  9 08:55:23 2006
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Sun,  9 Apr 2006 01:55:23 -0700
Subject: owners owners.list,1.814,1.815
Message-ID: <200604090855.k398tPd9023906@cvs-int.fedora.redhat.com>

Author: bojan

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

Modified Files:
	owners.list 
Log Message:
Add subversion-api-docs package to the list.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.814
retrieving revision 1.815
diff -u -r1.814 -r1.815
--- owners.list	9 Apr 2006 07:32:11 -0000	1.814
+++ owners.list	9 Apr 2006 08:55:22 -0000	1.815
@@ -1361,6 +1361,7 @@
 Fedora Extras|straw|GNOME desktop news aggregator|byte at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|streamtuner|A stream directory browser|endur at bennewitz.com|extras-qa at fedoraproject.org|
 Fedora Extras|stripesnoop|Magnetic Stripe Reader|tcallawa at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|subversion-api-docs|Subversion API documentation|bojan at rexursive.com|extras-qa at fedoraproject.org|
 Fedora Extras|suck|Suck - download news from remote NNTP server|Jochen at herr-schmitt.de|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|



From fedora-extras-commits at redhat.com  Sun Apr  9 09:29:28 2006
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Sun,  9 Apr 2006 02:29:28 -0700
Subject: rpms/subversion-api-docs/devel subversion-api-docs.spec,1.1,1.2
Message-ID: <200604090929.k399TUiU026025@cvs-int.fedora.redhat.com>

Author: bojan

Update of /cvs/extras/rpms/subversion-api-docs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26008/devel

Modified Files:
	subversion-api-docs.spec 
Log Message:
Bump up to 1.3.1.



Index: subversion-api-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion-api-docs/devel/subversion-api-docs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- subversion-api-docs.spec	9 Apr 2006 08:49:09 -0000	1.1
+++ subversion-api-docs.spec	9 Apr 2006 09:29:28 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		subversion-api-docs
-Version:	1.3.0
+Version:	1.3.1
 Release:	1%{?dist}
 Summary:	Subversion API documentation
 
@@ -52,5 +52,8 @@
 %doc %{_docdir}/subversion-%{version}/api-docs/*
 
 %changelog
+* Sun Apr 09 2006 Bojan Smojver <bojan at rexursive.com> 1.3.1-1
+- bump up to 1.3.1
+
 * Wed Jan 11 2006 Bojan Smojver <bojan at rexursive.com> 1.3.0-1
 - initial package



From fedora-extras-commits at redhat.com  Sun Apr  9 09:39:55 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun,  9 Apr 2006 02:39:55 -0700
Subject: extras-buildsys/utils extras-sign-move.py,1.8,1.9
Message-ID: <200604090939.k399dtfu026092@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26074

Modified Files:
	extras-sign-move.py 
Log Message:
Copy lcms.i386 to x86_64 for wine-cms.


Index: extras-sign-move.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/extras-sign-move.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- extras-sign-move.py	19 Mar 2006 22:42:27 -0000	1.8
+++ extras-sign-move.py	9 Apr 2006 09:39:53 -0000	1.9
@@ -53,6 +53,9 @@
              'wine-nas.i386': ['x86_64'],
              'wine-tools.i386': ['x86_64'],
              'wine-twain.i386': ['x86_64'],
+             # lcms for wine-cms in FE-3 and FE-4
+             'lcms.i386': ['x86_64'],
+             'lcms-debuginfo.i386': ['x86_64'],
              }
 ts = rpmUtils.transaction.initReadOnlyTransaction()
 



From fedora-extras-commits at redhat.com  Sun Apr  9 10:10:45 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Sun,  9 Apr 2006 03:10:45 -0700
Subject: rpms/mach/FC-5 .cvsignore, 1.3, 1.4 mach.spec, 1.6, 1.7 sources, 1.3,
	1.4
Message-ID: <200604091010.k39AAlsm028238@cvs-int.fedora.redhat.com>

Author: thomasvs

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

Modified Files:
	.cvsignore mach.spec sources 
Log Message:
new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mach/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 Nov 2005 19:11:37 -0000	1.3
+++ .cvsignore	9 Apr 2006 10:10:45 -0000	1.4
@@ -1 +1 @@
-mach-0.4.8.tar.bz2
+mach-0.4.9.tar.bz2


Index: mach.spec
===================================================================
RCS file: /cvs/extras/rpms/mach/FC-5/mach.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mach.spec	25 Nov 2005 19:11:37 -0000	1.6
+++ mach.spec	9 Apr 2006 10:10:45 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           mach
-Version:        0.4.8
+Version:        0.4.9
 Release:        1%{?dist}
 Summary:        make a chroot
 
@@ -82,7 +82,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING README AUTHORS BUGS TODO FORGETMENOT RELEASE
+%doc ChangeLog COPYING README AUTHORS BUGS TODO FORGETMENOT RELEASE mach.doap
 %dir %{_sysconfdir}/mach
 %config %{_sysconfdir}/mach/conf
 %config(noreplace) %{_sysconfdir}/mach/location
@@ -97,8 +97,12 @@
 %attr(04750,root,mach) %{_sbindir}/mach-helper
 
 %changelog
+* Sun Apr 09 2006 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.4.9-1
+- new release
+
 * Fri Nov 25 2005 Thomas Vander Stichele <thomas at apestaart dot org>
-- 0.4.8
+- 0.4.8-1
 - new release
 
 * Mon Aug  9 2004 Ville Skytt?? <ville.skytta at iki.fi>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mach/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Nov 2005 19:11:37 -0000	1.3
+++ sources	9 Apr 2006 10:10:45 -0000	1.4
@@ -1 +1 @@
-3fc32634295ea1cb859d67b5df8e0e65  mach-0.4.8.tar.bz2
+5216b92764580bfa79a5852f9384533b  mach-0.4.9.tar.bz2



From fedora-extras-commits at redhat.com  Sun Apr  9 10:11:32 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Sun,  9 Apr 2006 03:11:32 -0700
Subject: rpms/mach/devel mach.spec,1.6,1.7 sources,1.3,1.4
Message-ID: <200604091011.k39ABYGh028300@cvs-int.fedora.redhat.com>

Author: thomasvs

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

Modified Files:
	mach.spec sources 
Log Message:
new release


Index: mach.spec
===================================================================
RCS file: /cvs/extras/rpms/mach/devel/mach.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mach.spec	25 Nov 2005 19:11:37 -0000	1.6
+++ mach.spec	9 Apr 2006 10:11:32 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           mach
-Version:        0.4.8
+Version:        0.4.9
 Release:        1%{?dist}
 Summary:        make a chroot
 
@@ -82,7 +82,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING README AUTHORS BUGS TODO FORGETMENOT RELEASE
+%doc ChangeLog COPYING README AUTHORS BUGS TODO FORGETMENOT RELEASE mach.doap
 %dir %{_sysconfdir}/mach
 %config %{_sysconfdir}/mach/conf
 %config(noreplace) %{_sysconfdir}/mach/location
@@ -97,8 +97,12 @@
 %attr(04750,root,mach) %{_sbindir}/mach-helper
 
 %changelog
+* Sun Apr 09 2006 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.4.9-1
+- new release
+
 * Fri Nov 25 2005 Thomas Vander Stichele <thomas at apestaart dot org>
-- 0.4.8
+- 0.4.8-1
 - new release
 
 * Mon Aug  9 2004 Ville Skytt?? <ville.skytta at iki.fi>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mach/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Nov 2005 19:11:37 -0000	1.3
+++ sources	9 Apr 2006 10:11:32 -0000	1.4
@@ -1 +1 @@
-3fc32634295ea1cb859d67b5df8e0e65  mach-0.4.8.tar.bz2
+5216b92764580bfa79a5852f9384533b  mach-0.4.9.tar.bz2



From fedora-extras-commits at redhat.com  Sun Apr  9 10:12:09 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Sun,  9 Apr 2006 03:12:09 -0700
Subject: rpms/mach/FC-4 mach.spec,1.8,1.9 sources,1.4,1.5
Message-ID: <200604091012.k39ACBHD028366@cvs-int.fedora.redhat.com>

Author: thomasvs

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

Modified Files:
	mach.spec sources 
Log Message:
new release


Index: mach.spec
===================================================================
RCS file: /cvs/extras/rpms/mach/FC-4/mach.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mach.spec	25 Nov 2005 19:47:50 -0000	1.8
+++ mach.spec	9 Apr 2006 10:12:08 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           mach
-Version:        0.4.8
+Version:        0.4.9
 Release:        1%{?dist}
 Summary:        make a chroot
 
@@ -82,7 +82,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING README AUTHORS BUGS TODO FORGETMENOT RELEASE
+%doc ChangeLog COPYING README AUTHORS BUGS TODO FORGETMENOT RELEASE mach.doap
 %dir %{_sysconfdir}/mach
 %config %{_sysconfdir}/mach/conf
 %config(noreplace) %{_sysconfdir}/mach/location
@@ -97,8 +97,12 @@
 %attr(04750,root,mach) %{_sbindir}/mach-helper
 
 %changelog
+* Sun Apr 09 2006 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.4.9-1
+- new release
+
 * Fri Nov 25 2005 Thomas Vander Stichele <thomas at apestaart dot org>
-- 0.4.8
+- 0.4.8-1
 - new release
 
 * Mon Aug  9 2004 Ville Skytt?? <ville.skytta at iki.fi>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mach/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	25 Nov 2005 19:47:50 -0000	1.4
+++ sources	9 Apr 2006 10:12:08 -0000	1.5
@@ -1 +1 @@
-3fc32634295ea1cb859d67b5df8e0e65  mach-0.4.8.tar.bz2
+5216b92764580bfa79a5852f9384533b  mach-0.4.9.tar.bz2



From fedora-extras-commits at redhat.com  Sun Apr  9 10:12:37 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Sun,  9 Apr 2006 03:12:37 -0700
Subject: rpms/mach/FC-3 mach.spec,1.4,1.5 sources,1.2,1.3
Message-ID: <200604091012.k39ACdiE028427@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/mach/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28408

Modified Files:
	mach.spec sources 
Log Message:
new release


Index: mach.spec
===================================================================
RCS file: /cvs/extras/rpms/mach/FC-3/mach.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mach.spec	26 Nov 2004 13:22:50 -0000	1.4
+++ mach.spec	9 Apr 2006 10:12:37 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           mach
-Version:        0.4.5
-Release:        0.fdr.1.1
+Version:        0.4.9
+Release:        1%{?dist}
 Summary:        make a chroot
 
 Group:          Applications/System
@@ -11,19 +11,23 @@
 
 Requires:	python
 Requires:	rpm
+Requires:	rpm-build
 Requires:	rpm-python
-Requires:	apt
+Requires:	yum
+Requires:	createrepo
 Requires:	sed
 Requires:	cpio
 
 BuildRequires:	python
+BuildRequires:	gcc-c++
+BuildRequires:	libselinux-devel
 
 %{!?builduser:  %define builduser  machbuild}
 %{!?buildgroup: %define buildgroup machbuild}
 
 %description
 mach makes a chroot.
-Using apt-get and a suid binary, it manages to install clean chroot
+Using yum or apt-get and a suid binary, it manages to install clean chroot
 environments based on the original packages for that distribution.
 
 The clean root can be used to run jail roots, to create image files, or
@@ -34,19 +38,13 @@
 Thomas Vander Stichele (thomas (at) apestaart (dot) org)
 
 %prep
-echo "
---------------------------------------------------------------
-Update needed. The changes in mach-0.4.6-0.fdr.1.2.src.rpm
-would be insufficient for FC3.
---------------------------------------------------------------" > /dev/null
-exit 1
 %setup -q
 
 %build
 %configure \
 	--enable-builduser=%{builduser} \
 	--enable-buildgroup=%{buildgroup} \
-	--with-flavor=fedora-stable
+	--with-flavor=extras
 make
 
 %install
@@ -59,13 +57,13 @@
 install -d -m 775 $RPM_BUILD_ROOT%{_localstatedir}/cache/mach/packages
 install -d -m 775 $RPM_BUILD_ROOT%{_localstatedir}/cache/mach/archives
 
+find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \;
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-# create user and group mach
-/usr/sbin/useradd -c "mach user" \
-	-r -m mach -d %{_localstatedir}/lib/mach > /dev/null 2>&1 || :
+groupadd -r mach >/dev/null 2>&1 || :
 
 %preun
 if [ "$1" == 0 ];
@@ -73,7 +71,7 @@
   # last removal
   # be a good boy and clean out the dirs we filled with junk
   rm -rf %{_localstatedir}/lib/mach/states/*
-  umount %{_localstatedir}/lib/mach/roots/*/proc > /dev/null 2>%1 || :
+  umount %{_localstatedir}/lib/mach/roots/*/proc > /dev/null 2>&1 || :
   rm -rf %{_localstatedir}/lib/mach/roots/*
   rm -rf %{_localstatedir}/cache/mach/* > /dev/null 2>&1 || :
   rmdir %{_localstatedir}/lib/mach/states > /dev/null 2>&1 || :
@@ -82,31 +80,44 @@
   rm -rf %{_localstatedir}/tmp/mach > /dev/null 2>&1 || :
 fi
 
-%postun
-if [ "$1" == 0 ];
-then
-  # last removal
-  userdel mach > /dev/null 2>&1 || : 
-  groupdel mach > /dev/null 2>&1 || :
-fi
-
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING README AUTHORS BUGS TODO FORGETMENOT RELEASE
+%doc ChangeLog COPYING README AUTHORS BUGS TODO FORGETMENOT RELEASE mach.doap
 %dir %{_sysconfdir}/mach
 %config %{_sysconfdir}/mach/conf
-%config %{_sysconfdir}/mach/location
+%config(noreplace) %{_sysconfdir}/mach/location
 %config %{_sysconfdir}/mach/dist.d
-%attr(2775,mach,mach) %dir %{_localstatedir}/lib/mach
-%attr(2775,mach,mach) %dir %{_localstatedir}/lib/mach/states
-%attr(2775,mach,mach) %dir %{_localstatedir}/lib/mach/roots
-%ghost %attr(2775,mach,mach) %dir %{_localstatedir}/tmp/mach
-%attr(2775,mach,mach) %dir %{_localstatedir}/cache/mach/packages
-%attr(2775,mach,mach) %dir %{_localstatedir}/cache/mach/archives
+%attr(2775,root,mach) %dir %{_localstatedir}/lib/mach
+%attr(2775,root,mach) %dir %{_localstatedir}/lib/mach/states
+%attr(2775,root,mach) %dir %{_localstatedir}/lib/mach/roots
+%ghost %attr(2775,root,mach) %dir %{_localstatedir}/tmp/mach
+%attr(2775,root,mach) %{_localstatedir}/cache/mach
 %{_bindir}/mach
+%{_libdir}/libselinux-mach.*
 %attr(04750,root,mach) %{_sbindir}/mach-helper
 
 %changelog
+* Sun Apr 09 2006 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.4.9-1
+- new release
+
+* Fri Nov 25 2005 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.4.8-1
+- new release
+
+* Mon Aug  9 2004 Ville Skytt?? <ville.skytta at iki.fi>
+- Create only the "mach" group, and do not remove it on erase.  The
+  "mach" user is not really needed for anything.
+
+* Sun Jun  6 2004 Ville Skytt?? <ville.skytta at iki.fi>
+- Properly redirect STDERR from umount to /dev/null at erase time.
+
+* Wed Apr 14 2004 Ville Skytt?? <ville.skytta at iki.fi>
+- Own %%{_localstatedir}/mach, thanks to John Dalbec for the catch.
+
+* Thu Apr  8 2004 Ville Skytt?? <ville.skytta at iki.fi>
+- Require apt >= 0.5.5cnc2 due to internal use of the "rpm-dir" index type.
+
 * Tue Mar 16 2004 Thomas Vander Stichele <thomas at apestaart dot org>
 - package dist.d and location
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mach/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:50:34 -0000	1.2
+++ sources	9 Apr 2006 10:12:37 -0000	1.3
@@ -1 +1 @@
-5faad3c80423ee11ede5924c32331176  mach-0.4.5.tar.bz2
+5216b92764580bfa79a5852f9384533b  mach-0.4.9.tar.bz2



From fedora-extras-commits at redhat.com  Sun Apr  9 11:28:19 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Sun,  9 Apr 2006 04:28:19 -0700
Subject: owners owners.list,1.815,1.816
Message-ID: <200604091128.k39BSLvB030917@cvs-int.fedora.redhat.com>

Author: pghmcfc

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

Modified Files:
	owners.list 
Log Message:
Take ownership of:
* perl-Convert-BinHex
* perl-IO-stringy
* perl-MailTools
* perl-MIME-tools



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.815
retrieving revision 1.816
diff -u -r1.815 -r1.816
--- owners.list	9 Apr 2006 08:55:22 -0000	1.815
+++ owners.list	9 Apr 2006 11:28:19 -0000	1.816
@@ -884,7 +884,7 @@
 Fedora Extras|perl-Config-Record|Perl module for Configuration file access|dgregor at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Config-Tiny|Perl module for reading and writing .ini style configuration files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Convert-ASCII-Armour|Convert::ASCII::Armour Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Convert-BinHex|Macintosh BinHex extractor library for Perl|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Convert-BinHex|Macintosh BinHex extractor library for Perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Convert-PEM|Convert::PEM Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Convert-TNEF|Perl module to read TNEF files|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Convert-UUlib|A perl interface to the uulib library|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -969,7 +969,7 @@
 Fedora Extras|perl-IO-Multiplex|Manage IO on many file handles|lmb at biosci.ki.se|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-Socket-SSL|Perl library for transparent SSL|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-String|Emulate file interface for in-core strings|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-IO-stringy|I/O on in-core objects like strings and arrays|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-IO-stringy|I/O on in-core objects like strings and arrays|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-Tty|Perl interface to pseudo tty's|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-Zlib|For bugs related to the perl-IO-Zlib component|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IPC-Run|Perl module for interacting with child processes|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1003,10 +1003,10 @@
 Fedora Extras|perl-Mail-Sender|Module for sending mails with attachments through an SMTP server|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Mail-Sendmail|Simple platform independent mailer for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Mail-SPF-Query|Mail::SPF::Query determines the legitimacy of an SMTP client IP|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-MailTools|MailTools module for Perl|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-MailTools|MailTools module for Perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Math-GMP|High speed arbitrary size integer math|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MIME-Lite|MIME-Lite - low-calorie MIME generator|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-MIME-tools|Modules for parsing and creating MIME entities in Perl|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-MIME-tools|Modules for parsing and creating MIME entities in Perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MIME-Types|MIME types module for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MLDBM|Store multi-level hash structure in single level tied hash|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Build|Perl module for building and installing Perl modules|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Sun Apr  9 11:52:48 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun,  9 Apr 2006 04:52:48 -0700
Subject: owners owners.list,1.816,1.817
Message-ID: <200604091152.k39BqoYA030973@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	owners.list 
Log Message:
add gnochm


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.816
retrieving revision 1.817
diff -u -r1.816 -r1.817
--- owners.list	9 Apr 2006 11:28:19 -0000	1.816
+++ owners.list	9 Apr 2006 11:52:48 -0000	1.817
@@ -347,6 +347,7 @@
 Fedora Extras|gmime|GMime library -- creation and parsing of MIME-messages|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|gmpc|GNOME frontend for the MPD|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|gnet2|A simple network library built upon glib|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
+Fedora Extras|gnochm|CHM file viewer|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|gnofract4d|Gnofract 4D is a Gnome-based program to draw fractals|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnokii|Mobile phone management program|triad at df.lth.se|extras-qa at fedoraproject.org|
 Fedora Extras|gnomad2|Manager for digital audio players|triad at df.lth.se|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Apr  9 15:23:32 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun,  9 Apr 2006 08:23:32 -0700
Subject: rpms/apt/devel .cvsignore, 1.7, 1.8 apt.spec, 1.22, 1.23 sources,
	1.7, 1.8
Message-ID: <200604091523.k39FNYIF007022@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	.cvsignore apt.spec sources 
Log Message:
* Sun Apr  9 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.15lorg3-0.3.rc1
- 0.5.15lorg3-rc1.
- Trim pre-2005 changelog entries.

* Sun Apr 09 2006 Panu Matilainen <pmatilai at laiskianen.org>
- use /var/lib/apt instead of obsolete /var/state/apt
- support FC4 as well



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	7 Apr 2006 17:39:27 -0000	1.7
+++ .cvsignore	9 Apr 2006 15:23:31 -0000	1.8
@@ -1 +1 @@
-apt-0.5.15lorg3-pre4.tar.bz2
+apt-0.5.15lorg3-rc1.tar.bz2


Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- apt.spec	7 Apr 2006 17:39:27 -0000	1.22
+++ apt.spec	9 Apr 2006 15:23:32 -0000	1.23
@@ -6,12 +6,12 @@
 Summary:        Debian's Advanced Packaging Tool with RPM support
 Name:           apt
 Version:        0.5.15lorg3
-Release:        0.2.pre4%{?dist}
+Release:        0.3.rc1%{?dist}
 Group:          System Environment/Base
 URL:            http://laiskiainen.org/
 License:        GPL
 
-Source0:        http://laiskiainen.org/apt/testing/%{name}-%{version}-pre4.tar.bz2
+Source0:        http://laiskiainen.org/apt/testing/%{name}-%{version}-rc1.tar.bz2
 
 # user editable template configs
 Source1:        apt.conf
@@ -70,7 +70,7 @@
 Requires:       bzip2
 # wget needed by the mirror-selector script
 Requires:       wget
-Requires:       fedora-release >= 5
+Requires:       fedora-release >= 4
 Requires(post): chkconfig
 Requires(post): ldconfig
 Requires(preun): chkconfig
@@ -126,7 +126,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-pre4
+%setup -q -n %{name}-%{version}-rc1
 
 # fix docs to reference correct paths
 perl -pi -e \
@@ -165,7 +165,7 @@
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/apt/archives/partial
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/apt/genpkglist
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/apt/gensrclist
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/state/apt/lists/partial
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/apt/lists/partial
 
 # The config files
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt
@@ -284,7 +284,7 @@
 %{_datadir}/apt/scripts/preserve-conf.lua
 %{_datadir}/apt/scripts/upgradevirt.lua
 %{_localstatedir}/cache/apt/
-%{_localstatedir}/state/apt/
+%{_localstatedir}/lib/apt/
 %{_mandir}/man[58]/*.[58]*
 
 %files devel
@@ -311,6 +311,14 @@
 
 
 %changelog
+* Sun Apr  9 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.15lorg3-0.3.rc1
+- 0.5.15lorg3-rc1.
+- Trim pre-2005 changelog entries.
+
+* Sun Apr 09 2006 Panu Matilainen <pmatilai at laiskianen.org>
+- use /var/lib/apt instead of obsolete /var/state/apt
+- support FC4 as well
+
 * Fri Apr  7 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.15lorg3-0.2.pre4
 - 0.5.15lorg3-pre4.
 
@@ -388,474 +396,3 @@
 - "Revert" rpmpriorities and libselinux build-dep stuff to Panu's version.
 - Add experimental auto-generation of rpmpriorities, but don't use it yet.
 - Fix up mirror-select.conf creation.
-
-* Wed Nov 10 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 0.5.15cnc6-11
-- TODO: Somebody with access to www.fedora.us would need to update
-  Source151 (mirror-select.conf) and update it for FC3.
-- Only make this build for FC3 (fix installation of rpmpriorities file
-  and fixed the inaccurate conditional BR libselinux-devel which could
-  be made unconditional).
-
-* Tue Nov 09 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.19.r362
-- add rpmpriorities for fc3
-
-* Tue Sep 14 2004 Panu Matilainen <pmatilai at welho.com>
-- don't check rpm's sublevel for selinux-devel requirement
-
-* Wed Aug 18 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.18.r362
-- revision r362
-- add rpmpriorities file for rawhide
-
-* Sat Aug 14 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.18.r361
-- update to revision r361
-- automated updates from cron are now configurable through /etc/sysconfig/apt
-- provide apt-mirrorselect so repo-configs can depend on it
-- preliminary fixes for x86_64:
-  - put scripts to /usr/share/apt/scripts instead of /usr/lib
-  - build python bindings with -fPIC
-
-* Thu Aug 12 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.17.r360
-- update to revision r360
-- revert back to print() in upgradevirt kernel-module-warning (see #1524/c18)
-
-* Wed Aug 11 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.17.r358
-- update to revision r358
-
-* Tue Jul 13 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.17.r355
-- update to revision r355 for native SELinux support
-
-* Fri Jul 9 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.16.r354
-- fix a typo in apt.cron
-
-* Fri Jul 9 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.15.r354
-- don't run kernel-module magic if no kernel was installed in (dist-)upgrade
-- improve description a bit
-- update to svn r354 (improved virtual package handling in apt-cache)
-
-* Mon Jul 5 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.14.r353
-- add optional script to automatically update from cron
-- use updated gpg checker (with progress reporting) from contrib
-- add new subpackage for groupinstall (to avoid dependening on comps and rhpl
-  for core apt)
-- update to revision 353 from upstream for various bugfixes and enhancements,
-  drop merged patches
-- remove NOISY=1 from make, hasn't done anything in ages..
-
-* Thu Jun 17 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.13
-- fix grubby handling wrt non-UP kernels
-- never change default kernel if the current default is non-linux system
-- include upstream patch to allow setting custom md5cache path for genbasedir
-
-* Tue Jun 15 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.12
-- don't fiddle with grubby unless a new kernel was actually installed
-- include kernel-sourcecode in allow-duplicated
-- include rpmpriorities for fc2 final
-
-* Fri May 14 2004 Panu Matilainen <pmatilai at welho.com>
-- use rpm's ordering algorithm, not apt's internal
-
-* Mon May 10 2004 Panu Matilainen <pmatilai at welho.com>
-- remove ash from rpmpriorities (#1562)
-- updated version of upgradevirt.lua (#1514)
-
-* Tue May 04 2004 Panu Matilainen <pmatilai at welho.com>
-- set APT::Cache::AllNames to false to make "apt-cache pkgnames" less scary
-
-* Thu Apr 29 2004 Panu Matilainen <pmatilai at welho.com>
-- check for rpm 4.3.1
-
-* Fri Apr 09 2004 Panu Matilainen <pmatilai at welho.com>
-- remove kernel from rpmpriorities, allow-duplicated packages don't work
-  nicely with any higher than standard priority which is the default anyway
-
-* Fri Apr 09 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.11
-- revert the ctrl-c workaroound, the "cure" is worse than the disease
-
-* Thu Apr 08 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.10
-- take readonly rpmdb lock initially, not exclusive
-
-* Thu Apr 08 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.9
-- patch from upstream to plug segfault if ctrl-c'ing while downloading
-- apt isn't multilib-safe, exclude arch x86_64 (bug #1464)
-
-* Tue Apr 06 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.8
-- fix build-dep issue reported in #1429
-
-* Mon Apr 05 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.7
-- don't run gpg-import at all as a normal user
-
-* Mon Apr 05 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.6
-- don't fail in gpg-checker if directory / files don't exist
-- don't spit out spurious error messages if importing fails (#1398)
-- allow turning off the gpg-import via true/false configuration item
-- explicitly list GPG-Check and GPG-Import config options in default.conf
-- generate mirror-select.conf based on FC release automatically
-- buildrequires fedora-release for version detection
-- rename Upgrade-Kernel -> Upgrade-Virtual in sample apt.conf
-
-* Sat Apr 03 2004 Warren Togami <wtogami at redhat.com> 0.5.15cnc6-0.fdr.5
-- Ville's docbook building fix
-
-* Tue Mar 30 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.4
-- add upgrade-virtual=true back to default.conf
-- updated version of upgradevirt.lua, fixed kernel-module package handling
-
-* Mon Mar 29 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.3
-- remember to include upgradevirt.lua..
-
-* Mon Mar 29 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.2
-- allow-duplicated lua script was getting incorrectly copied to scripts/
-- fix some permissions of source files to make rpmlint happy
-- don't copy source53 twice
-- in gpg-import check that the file is called gpg-pubkey* and ignore others
-
-* Sun Mar 28 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.1
-- move back to upgradevirt.lua, allow-duplicated from contrib doesn't like
-  RH kernel packages
-- remember to set kernel::module-prefix in default.conf
-- add upgradevirt.lua to all the necessary new slot
-- move kernel from Essential priority to Important in rpmpriorities, allow-
-  duplicated packages don't behave well with Essential priority
-
-* Mon Mar 22 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.1
-- update to 0.5.15cnc6
-- fix the source url
-
-* Sat Mar 20 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.0.r309.1
-- update to revision r309 snapshot
-- remove patches merged upstream
-- drop upgradevirt.lua, use allow-duplicated from contrib instead
-- updated gpg-checker scripts (fix #1398)
-- updated mirror-select scripts
-
-* Sun Feb 29 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.10
-- re-add promoteepoch patch, it got accidentally left out of the upstream-patch
-
-* Wed Feb 25 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.9
-- Change the comments mirror-select writes as requested in #1180
-
-* Fri Feb 13 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.8
-- Pull patch for revs 266-274 from upstream, containing various important
-  fixes (epoch handling, build system related etc)
-
-* Thu Feb 09 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.7
-- Fix build on FC2-test1 (conditional libselinux-devel buildreq)
-
-* Mon Feb 09 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.6
-- automatically handle fedora.us style kernel-module packages with kernel
-  updates
-- don't run mirror-selector if quiet mode set (== non-interactive)
-- don't trash sources.list on upgrade, only if user chooses to do so
-
-* Wed Feb 04 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.5
-- don't break sources.list on upgrade from %%post
-
-* Wed Jan 28 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.4
-- updated mirror-selector:
-  * write to /etc/apt/sources.list.d/mirror-select.list, not main sources.list
-  * some cosmetic improvements
-- move main sources.list out of the way on first upgrade to force user to
-  choose a mirror
-
-* Tue Jan 27 2004 Panu Matilainen <pmatilai at welho.com>
-- Always initialize rpm transaction rootdir (hope to fix #1238)
-
-* Mon Jan 19 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.3
-- make rpm manifest usage configurable per Enricos request (patch 4)
-- use mirror lists on fedora.us
-- include Fedora Legacy gpg key
-
-* Tue Jan 06 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.2
-- make newly installed kernel default by default
-- clean up old cruft (sources.list editing etc)
-- stricter python dependency for apt-python
-- set all files in contrib non-executable, not just *.py
-- fix couple of buglets in mirror-select.lua
-
-* Sat Dec 27 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.1
-- don't fail from mirror-select if /proc isn't mounted
-
-* Sat Dec 27 2003 Panu Matilainen <pmatilai at welho.com>
-- don't create unneeded duplicate provides for virtualized packages (patch 3)
-
-* Fri Dec 26 2003 Panu Matilainen <pmatilai at welho.com>
-- add missing dependency on wget for mirror-selector
-
-* Wed Dec 24 2003 Panu Matilainen <pmatilai at welho.com>
-- update to 0.5.15cnc5
-- drop patches merged upstream
-
-* Tue Dec 23 2003 Panu Matilainen <pmatilai at welho.com>
-- remove extraneous mirror-select configs from default.conf
-- updated mirror-select script
-
-* Fri Dec 12 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc4-0.fdr.4
-- replace kernel-upgrade.lua with a more generic script which automatically
-  upgrades all virtualized (usually allow-duplicated) packages
-
-* Wed Dec 10 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc4-0.fdr.3
-- add missing gettext build dependency
-
-* Mon Dec 08 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc4-0.fdr.2
-- updated mirror-selector:
-  * download mirrorlist off the net
-  * support several mirror lists
-  * separate steps for choosing repositories and mirrors
-- revert gensrclist change breaking older apts
-
-* Wed Dec 03 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc4-0.fdr.1
-- update to 0.5.15cnc4
-- drop obsolete "oldpkg" patch
-- drop patches merged upstream
-- remove default-release setting, causes unnecessary confusion among users
-- remove reduntant stuff from fedora.conf, rename to default.conf
-- no default repositories included
-- add old RHL GPG key back, a few FC packages appear to be signed by it still
-
-* Tue Dec 02 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc3-0.fdr.5
-- fix default config wrt Lua scripts (various slot-names changed in cnc3)
-- better handling of default config in lua-scripts
-- turn kernel upgrading on by default in fedora.conf
-
-* Mon Dec 01 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc3-0.fdr.4
-- don't drag in dependency on external lua
-
-* Mon Dec 01 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc3-0.fdr.3
-- much improved mirror-selector script
-- add various important upstream fixes (patches 6-8)
-- add kernel*unsupported-modules to fedora.conf for 2.6 kernels
-
-* Tue Nov 25 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc3-0.fdr.2
-- trim rpmpriorities a bit
-- add a "first-time druid" script to prompt user for nearest mirror
-- no default fedora sources.list entry at all
-- use sluglug.ucsc.edu mirror for macromedia instead of mplug.org
-
-* Mon Nov 24 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc3-0.fdr.1
-- update to official 0.5.15cnc3
-- move old apt.conf out of the way on upgrade to new-style config
-- saner error messages in gpg-checker.lua
-
-* Mon Nov 24 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc2-0.fdr.2.r224.1
-- oops, some local cruft got included in previous version
-
-* Mon Nov 24 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc2-0.fdr.2.r224
-- update to revision 224
-
-* Sat Nov 22 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc2-0.fdr.2.r213
-- update to revision 213
-
-* Fri Nov 21 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc2-0.fdr.2.r210
-- snapshot of revision 210 from svn repo
-- default to internal package manager (== rpmlib)
-- remove old rpmlib-patch related logic from spec
-- move default configs to sources.list.d, apt.conf.d and vendors.list.d,
-  leaving the apt.conf and sources.list for user localizations
-
-* Wed Nov 12 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc2-0.fdr.1
-- update rpmlib patch to -7 which has more sensible error reporting
-
-* Wed Nov 12 2003 Panu Matilainen <pmatilai at welho.com>
-- update to 0.5.15cnc2
-- remove patches 6-9, they're merged upstream now
-- use fedora-style buildroot
-- drop the ugly apt.conf tweaking from post, wont fix everything anyway
-  if upgrading from old RHL's.
-- add URL to spec (wake up QA, been missing all this time and nobody noticed :)
-- remove rpm version checking, not needed anymore
-
-* Tue Nov 11 2003 Panu Matilainen <pmatilai at welho.com>
-- drop the build-dep patches altogether, they're .. umm, borked
-
-* Tue Nov 11 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc1-0.fdr.3
-- stricter python dependency on -python
-- remove out-of-date mirror list from sources.list, add pointer to
-  official mirror list URL
-- drop all rawhide and test keys - we don't want those automatically imported
-
-* Mon Nov 10 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc1-0.fdr.2
-- add patch 11 from Gustavo to fix package pinning
-
-* Sat Nov 08 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc1-0.fdr.1
-- update to 0.5.15cnc1
-- back to 0.fdr.x releases...
-- redhat -> fedora fixes in rpmpriorities.1
-
-* Fri Nov 07 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc7-1
-- update to cnc7
-- drop patches 9 + 10 for now (re-evaluation needed)
-- Fedora-keys added, old RH keys removed
-
-* Sun Nov 02 2003 Panu Matilainen <pmatilai at welho.com>
-- update rpmlib patch to allow compiling against rpm-4.2.1
-- scrap old RHL version checking + deps
-- buildroot -> RPM_BUILD_ROOT
-- fix source lists for new repository layout
-
-* Thu Oct 23 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc6-0.fdr.11
-- add rpmpriorities for 0.95, drop 0.93
-
-* Thu Oct 16 2003 Panu Matilainen <pmatilai at welho.com>
-- update rpmlib patch to rev -5 (which actually works again :)
-
-* Wed Oct 01 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc6-0.fdr.10
-- include rpmpriorities for 0.94
-- more fixes for #667 (handle builddeps on versioned provides)
-
-* Tue Sep 30 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc6-0.fdr.9
-- add patch 10 to support build dependencies on files (#682)
-- add new rawhide gpg key (#696)
-- add distrel mangling for Fedora Core
-
-* Wed Sep 03 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc6-0.fdr.8
-- add patch 9 to support build dependencies on virtual packages (#667)
-- config(noreplace) for /etc/apt/rpmpriorities (#629)
-- better reporting of signature problems in gpg-checker.lua
-
-* Fri Aug 29 2003 Panu Matilainen <pmatilai at welho.com>
-- add contrib stuff as docs
-- add bzip2 dependency (#629)
-
-* Tue Aug 19 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc6-0.fdr.7
-- use apterror() instead of exit in gpg-checker.lua to allow smoother
-  operation with synaptic
-- support pkg=ver syntax for virtual packages (patch 8)
-- strict version-release dependency in apt-python
-- when built with --with rpmlib add .rpmlib to release string
-
-* Tue Aug 19 2003 Panu Matilainen <pmatilai at welho.com>
-- fix #558, #611
-
-* Mon Jul 21 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc6-0.fdr.6
-- fix build on RH 9.0.93
-- detect rpm-related buildreqs from rpm version, not distro version
-- some spec rearrangements
-- comment the patches
-
-* Sat Jul 19 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc6-0.fdr.5
-- use -p option with install
-- add beecrypt-devel buildreq for rpm-4.2.1
-
-* Mon Jul 14 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc6-0.fdr.4
-- fix typos in gpg-checker script
-
-* Mon Jul 07 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc6-0.fdr.3
-- fix apt.conf for gpg checking with lua in post
-
-* Fri Jun 13 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc6-0.fdr.2
-- add patch to allow build against rpm-4.2.1
-- add --with rpmlib build option
-
-* Thu Jun 12 2003 Panu Matilainen <pmatilai at welho.com>
-- EXPERIMENTAL patch to make apt use only rpmlib
-
-* Tue Jun 10 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc6-0.fdr.1
-- update to 0.5.5cnc6
-- drop patches merged upstream
-
-* Tue Jun 10 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc5-0.fdr.9
-- patch from upstream to fix a security problem where lua-scripts can get
-  accidentally executed from cwd
-
-* Mon Jun 09 2003 Panu Matilainen <pmatilai at welho.com>
-- apt doesn't like build deps on versioned virtual provides -> only RH7.3
-  package buildrequires python2-devel, newer ones have python-devel
-
-* Thu Jun 05 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc5-0.fdr.8
-- fix the proxy template format in apt.conf
-- fix hang when reading package lists on duplicate packages
-
-* Thu May 22 2003 Panu Matilainen <pmatilai at welho.com>
-- automatically handle installing older allowdup pkgs with new rpms
-
-* Mon May 19 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc5-0.fdr.7
-- fix thinkos/typos in gpg-checker + config
-
-* Mon May 19 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc5-0.fdr.6
-- import some of the changes in #149:
-  - detect distrel, rhrel automatically
-  - rename GPG keys to their rpmdb names for easier checking
-  - use install instead of cp
-- use Lua GPG-sigchecker, split importing them to another script
-- include kernel-upgrade and preserve-conf Lua-scripts
-- move lua scripts from /etc/apt to /usr/lib/apt (upstream change in svn tree)
-- list explicitly binaries so we know if something fails
-- fix #259
-- add missing ncurses-devel buildreq (for apt-shell)
-
-* Sat May 03 2003 Panu Matilainen <pmatilai at welho.com>
-- add missing libelf-devel buildreq for RH8.0 (#254)
-- add missing readline-devel buildreq (for apt-shell)
-
-* Thu Apr 24 2003 Panu Matilainen <pmatilai at welho.com>
-- add /etc/apt/scripts directory (for Lua scripts)
-
-* Tue Apr 22 2003 Warren Togami <warren at togami.com> 0.5.5cnc5-0.fdr.5
-- Bug #172 comment #18 apt.conf proxy syntax
-
-* Tue Apr 22 2003 Warren Togami <warren at togami.com> 0.5.5cnc5-0.fdr.4
-- elfutils-devel exists only in RH9
-
-* Tue Apr 22 2003 Warren Togami <warren at togami.com> 0.5.5cnc5-0.fdr.3
-- Patch epoch comparison behavior, rpmvercmp.warren.patch
-  http://www.fedora.us/pipermail/fedora-devel/2003-April/001043.html
-
-* Thu Apr 17 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc5-0.fdr.2
-- add missing buildreq elfutils-devel
-- rpmpriorities for non %{distrel} wasn't getting included in src.rpm
-
-* Wed Apr 16 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc5-0.fdr.1
-- patch to speed up apt startup and genbasedir
-- drop "counting sheep" patch, not needed anymore
-- include current mirrors in sources.list
-- autodetect RH version
-
-* Tue Apr 15 2003 Panu Matilainen <pmatilai at welho.com>
-- update to official 0.5.5cnc5
-- use g++ not gcc to build python bindings
-- more selected merging from #149
-- include Fedora GPG fingerprint in vendors.list "just in case"
-
-* Mon Apr 14 2003 Panu Matilainen <pmatilai at welho.com>
-- update to newer snapshot (new make system, lua interface ...)
-- rearrange spec accordingly, use %find_lang etc
-- drop unneeded patches (filedeps..)
-- only look at .list files in sources.list.d
-- merge selected patches by Rex Dieter / #149
-- include French mirror in sources.list (commented out)
-
-* Mon Apr 07 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc4.1-0.fdr.7
-- optional patch to ignore signals while rpmdb lock is held to avoid stale locks
-- add epoch to requires =, >= too
-
-* Thu Apr 03 2003 Panu Matilainen <pmatilai at welho.com>
-- fix segfault if rpm-dir index is a broken symlink
-- rpmpriorities generated from comps.xml
-- dont tag the various keys as %dir :-/
-
-* Mon Mar 31 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc4.1-0.fdr.5
-- add Ville's suggested fixes from #12 (doc paths, stricter regexps in apt.conf)
-
-* Mon Mar 31 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc4.1-0.fdr.4
-- use 7.x instead of 7.3 in macromedia repository
-- add Epoch 0
-- add patch from svn for massive file dependency breakage on certain situations
-- add patch4 to tell something is happening when apt is counting packages
-  on startup
-
-* Fri Mar 27 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc4.1-0.fdr.3
-- dont bother building translations since we're not installing them anyway
-  which fixes build on RH7.x (7.3 at least)
-
-* Thu Mar 27 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc4.1.0.fdr.2
-- add macromedia.list
-- import GPG keys on first run, not from %post
-- require gnupg (needed with authenticated repositories)
-
-* Tue Mar 25 2003 Panu Matilainen <pmatilai at welho.com>
-- import GPG keys from %post
-- drop the -kernel$ entries from apt.conf
-- add Default-Release = stable to apt.conf
-
-* Sat Mar 23 2003 Panu Matilainen <pmatilai at welho.com>
-- Initial Fedora packaging (reset changelog)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	7 Apr 2006 17:39:27 -0000	1.7
+++ sources	9 Apr 2006 15:23:32 -0000	1.8
@@ -1 +1 @@
-8c46b74a7e844c7e40017bdad59cee6c  apt-0.5.15lorg3-pre4.tar.bz2
+d0f4b875b7d65c5a8b6563cf854a6247  apt-0.5.15lorg3-rc1.tar.bz2



From fedora-extras-commits at redhat.com  Sun Apr  9 15:30:30 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun,  9 Apr 2006 08:30:30 -0700
Subject: rpms/awstats/FC-5 awstats.spec,1.10,1.11
Message-ID: <200604091530.k39FUWpc007109@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	awstats.spec 
Log Message:
selinux support


Index: awstats.spec
===================================================================
RCS file: /cvs/extras/rpms/awstats/FC-5/awstats.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- awstats.spec	23 Feb 2006 10:17:11 -0000	1.10
+++ awstats.spec	9 Apr 2006 15:30:30 -0000	1.11
@@ -1,6 +1,6 @@
 Name:       awstats
 Version:    6.5
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    Advanced Web Statistics
 License:    GPL
 Group:      Applications/Internet
@@ -13,6 +13,7 @@
 Requires:   perl
 Requires(post): perl
 Requires(postun): /sbin/service
+Requires(pre):  policycoreutils
 
 %description
 Advanced Web Statistics is a powerful and featureful tool that generates
@@ -112,6 +113,14 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
+%pre
+# Set SELinux types
+semanage fcontext -a -t httpd_sys_script_exec_t \
+    '/usr/share/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || :
+semanage fcontext -a -t httpd_sys_script_rw_t '/var/lib/awstats(/.*)?' 2>/dev/null || :
+
+
 %post
 if [ $1 -eq 1 ]; then
   if [ ! -f %{_sysconfdir}/%{name}/%{name}.`hostname`.conf ]; then
@@ -122,10 +131,15 @@
   fi
 fi
 
+
 %postun
 if [ $1 -ne 0 ]; then
   /sbin/service httpd condrestart >/dev/null 2>&1
 fi
+if [ $1 -eq 0 ]; then
+  semanage fcontext -d -t httpd_sys_script_exec_t \
+    '/usr/share/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || :
+fi
 
 
 %files
@@ -151,6 +165,9 @@
 %{_datadir}/%{name}/wwwroot/js
 
 %changelog
+* 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
+
 * Thu Feb 23 2006 Aurelien Bompard <gauret[AT]free.fr> 6.5-2
 - rebuild for FC5
 



From fedora-extras-commits at redhat.com  Sun Apr  9 15:30:31 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun,  9 Apr 2006 08:30:31 -0700
Subject: rpms/awstats/devel awstats.spec,1.10,1.11
Message-ID: <200604091530.k39FUX8E007113@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	awstats.spec 
Log Message:
selinux support


Index: awstats.spec
===================================================================
RCS file: /cvs/extras/rpms/awstats/devel/awstats.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- awstats.spec	23 Feb 2006 10:17:11 -0000	1.10
+++ awstats.spec	9 Apr 2006 15:30:31 -0000	1.11
@@ -1,6 +1,6 @@
 Name:       awstats
 Version:    6.5
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    Advanced Web Statistics
 License:    GPL
 Group:      Applications/Internet
@@ -13,6 +13,7 @@
 Requires:   perl
 Requires(post): perl
 Requires(postun): /sbin/service
+Requires(pre):  policycoreutils
 
 %description
 Advanced Web Statistics is a powerful and featureful tool that generates
@@ -112,6 +113,14 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
+%pre
+# Set SELinux types
+semanage fcontext -a -t httpd_sys_script_exec_t \
+    '/usr/share/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || :
+semanage fcontext -a -t httpd_sys_script_rw_t '/var/lib/awstats(/.*)?' 2>/dev/null || :
+
+
 %post
 if [ $1 -eq 1 ]; then
   if [ ! -f %{_sysconfdir}/%{name}/%{name}.`hostname`.conf ]; then
@@ -122,10 +131,15 @@
   fi
 fi
 
+
 %postun
 if [ $1 -ne 0 ]; then
   /sbin/service httpd condrestart >/dev/null 2>&1
 fi
+if [ $1 -eq 0 ]; then
+  semanage fcontext -d -t httpd_sys_script_exec_t \
+    '/usr/share/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || :
+fi
 
 
 %files
@@ -151,6 +165,9 @@
 %{_datadir}/%{name}/wwwroot/js
 
 %changelog
+* 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
+
 * Thu Feb 23 2006 Aurelien Bompard <gauret[AT]free.fr> 6.5-2
 - rebuild for FC5
 



From fedora-extras-commits at redhat.com  Sun Apr  9 15:39:17 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun,  9 Apr 2006 08:39:17 -0700
Subject: rpms/pure-ftpd/FC-5 pure-ftpd-1.0.21-config.patch, 1.1,
	1.2 pure-ftpd.spec, 1.7, 1.8
Message-ID: <200604091539.k39FdJEE007179@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/pure-ftpd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7142/FC-5

Modified Files:
	pure-ftpd-1.0.21-config.patch pure-ftpd.spec 
Log Message:
fix mysql socket location (bug 188426)

pure-ftpd-1.0.21-config.patch:

Index: pure-ftpd-1.0.21-config.patch
===================================================================
RCS file: /cvs/extras/rpms/pure-ftpd/FC-5/pure-ftpd-1.0.21-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pure-ftpd-1.0.21-config.patch	21 Feb 2006 18:57:46 -0000	1.1
+++ pure-ftpd-1.0.21-config.patch	9 Apr 2006 15:39:17 -0000	1.2
@@ -1,5 +1,5 @@
 --- ./configuration-file/pure-ftpd.conf.in.config	2006-02-15 14:15:47.000000000 +0100
-+++ ./configuration-file/pure-ftpd.conf.in	2006-02-21 19:50:18.000000000 +0100
++++ ./configuration-file/pure-ftpd.conf.in	2006-04-09 17:31:03.000000000 +0200
 @@ -9,7 +9,7 @@
  # instead of command-line options, please run the
  # following command :
@@ -89,3 +89,14 @@
  
  
  
+--- ./pureftpd-mysql.conf.config	2006-04-09 17:33:04.000000000 +0200
++++ ./pureftpd-mysql.conf	2006-04-09 17:33:27.000000000 +0200
+@@ -19,7 +19,7 @@
+ 
+ # Optional : define the location of mysql.sock if the server runs on this host.
+ 
+-MYSQLSocket     /tmp/mysql.sock
++MYSQLSocket     /var/lib/mysql/mysql.sock
+ 
+ 
+ # Mandatory : user to bind the server as.


Index: pure-ftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/pure-ftpd/FC-5/pure-ftpd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pure-ftpd.spec	22 Feb 2006 10:35:42 -0000	1.7
+++ pure-ftpd.spec	9 Apr 2006 15:39:17 -0000	1.8
@@ -1,6 +1,6 @@
 Name:       pure-ftpd
 Version:    1.0.21
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    Lightweight, fast and secure FTP server
 
 Group:      System Environment/Daemons
@@ -178,6 +178,9 @@
 
 
 %changelog
+* Sun Apr 09 2006 Aurelien Bompard <gauret[AT]free.fr> 1.0.21-3
+- fix mysql socket location (bug 188426)
+
 * Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 1.0.21-2
 - build option rendezvous has been renamed to bonjour
 - add --with-cork



From fedora-extras-commits at redhat.com  Sun Apr  9 15:39:18 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun,  9 Apr 2006 08:39:18 -0700
Subject: rpms/pure-ftpd/devel pure-ftpd-1.0.21-config.patch, 1.1,
	1.2 pure-ftpd.spec, 1.7, 1.8
Message-ID: <200604091539.k39FdKoB007187@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/pure-ftpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7142/devel

Modified Files:
	pure-ftpd-1.0.21-config.patch pure-ftpd.spec 
Log Message:
fix mysql socket location (bug 188426)

pure-ftpd-1.0.21-config.patch:

Index: pure-ftpd-1.0.21-config.patch
===================================================================
RCS file: /cvs/extras/rpms/pure-ftpd/devel/pure-ftpd-1.0.21-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pure-ftpd-1.0.21-config.patch	21 Feb 2006 18:57:46 -0000	1.1
+++ pure-ftpd-1.0.21-config.patch	9 Apr 2006 15:39:18 -0000	1.2
@@ -1,5 +1,5 @@
 --- ./configuration-file/pure-ftpd.conf.in.config	2006-02-15 14:15:47.000000000 +0100
-+++ ./configuration-file/pure-ftpd.conf.in	2006-02-21 19:50:18.000000000 +0100
++++ ./configuration-file/pure-ftpd.conf.in	2006-04-09 17:31:03.000000000 +0200
 @@ -9,7 +9,7 @@
  # instead of command-line options, please run the
  # following command :
@@ -89,3 +89,14 @@
  
  
  
+--- ./pureftpd-mysql.conf.config	2006-04-09 17:33:04.000000000 +0200
++++ ./pureftpd-mysql.conf	2006-04-09 17:33:27.000000000 +0200
+@@ -19,7 +19,7 @@
+ 
+ # Optional : define the location of mysql.sock if the server runs on this host.
+ 
+-MYSQLSocket     /tmp/mysql.sock
++MYSQLSocket     /var/lib/mysql/mysql.sock
+ 
+ 
+ # Mandatory : user to bind the server as.


Index: pure-ftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/pure-ftpd/devel/pure-ftpd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pure-ftpd.spec	22 Feb 2006 10:35:42 -0000	1.7
+++ pure-ftpd.spec	9 Apr 2006 15:39:18 -0000	1.8
@@ -1,6 +1,6 @@
 Name:       pure-ftpd
 Version:    1.0.21
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    Lightweight, fast and secure FTP server
 
 Group:      System Environment/Daemons
@@ -178,6 +178,9 @@
 
 
 %changelog
+* Sun Apr 09 2006 Aurelien Bompard <gauret[AT]free.fr> 1.0.21-3
+- fix mysql socket location (bug 188426)
+
 * Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 1.0.21-2
 - build option rendezvous has been renamed to bonjour
 - add --with-cork



From fedora-extras-commits at redhat.com  Sun Apr  9 17:15:20 2006
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Sun,  9 Apr 2006 10:15:20 -0700
Subject: rpms/ratpoison/devel ratpoison.spec,1.1,1.2
Message-ID: <200604091715.k39HFMLm011482@cvs-int.fedora.redhat.com>

Author: jwb

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

Modified Files:
	ratpoison.spec 
Log Message:
Fix up BuildRequires for devel



Index: ratpoison.spec
===================================================================
RCS file: /cvs/extras/rpms/ratpoison/devel/ratpoison.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ratpoison.spec	9 Apr 2006 03:05:46 -0000	1.1
+++ ratpoison.spec	9 Apr 2006 17:15:20 -0000	1.2
@@ -13,7 +13,7 @@
 %if "%fedora" <= "4" 
 BuildRequires:  xorg-x11-devel, readline-devel
 %else
-BuildRequires: libX11-devel, readline-devel, libXtst-devel
+BuildRequires: libX11-devel, readline-devel, xorg-x11-proto-devel
 %endif
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info



From fedora-extras-commits at redhat.com  Sun Apr  9 17:55:29 2006
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Sun,  9 Apr 2006 10:55:29 -0700
Subject: rpms/ratpoison/devel ratpoison.spec,1.2,1.3
Message-ID: <200604091755.k39HtVql011706@cvs-int.fedora.redhat.com>

Author: jwb

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

Modified Files:
	ratpoison.spec 
Log Message:
BuildRequires, take two.



Index: ratpoison.spec
===================================================================
RCS file: /cvs/extras/rpms/ratpoison/devel/ratpoison.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ratpoison.spec	9 Apr 2006 17:15:20 -0000	1.2
+++ ratpoison.spec	9 Apr 2006 17:55:29 -0000	1.3
@@ -10,10 +10,10 @@
 Source0:        http://savannah.nongnu.org/download/ratpoison/%{name}-%{version}.tar.gz
 Source1:	%{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if "%fedora" <= "4" 
+%if %{fedora} <= 4 
 BuildRequires:  xorg-x11-devel, readline-devel
 %else
-BuildRequires: libX11-devel, readline-devel, xorg-x11-proto-devel
+BuildRequires: libX11-devel, readline-devel, libXtst-devel
 %endif
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info



From fedora-extras-commits at redhat.com  Sun Apr  9 19:04:14 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Sun,  9 Apr 2006 12:04:14 -0700
Subject: rpms/emacs-auctex/FC-4 .cvsignore, 1.3, 1.4 emacs-auctex.spec, 1.4, 
	1.5 sources, 1.3, 1.4
Message-ID: <200604091904.k39J4kqY017562@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/emacs-auctex/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17507/FC-4

Modified Files:
	.cvsignore emacs-auctex.spec sources 
Log Message:
new upstream 11.82 and fix two duplicated files



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/emacs-auctex/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Oct 2005 01:53:37 -0000	1.3
+++ .cvsignore	9 Apr 2006 19:04:14 -0000	1.4
@@ -1 +1 @@
-auctex-11.81.tar.gz
+auctex-11.82.tar.gz


Index: emacs-auctex.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-auctex/FC-4/emacs-auctex.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- emacs-auctex.spec	1 Oct 2005 01:53:37 -0000	1.4
+++ emacs-auctex.spec	9 Apr 2006 19:04:14 -0000	1.5
@@ -3,7 +3,7 @@
 
 Summary: 	Enhanced TeX modes for Emacsen
 Name: 		emacs-auctex
-Version: 	11.81
+Version: 	11.82
 Release: 	1%{?dist}
 License: 	GPL
 Group: 		Applications/Editors
@@ -81,13 +81,16 @@
 %doc doc/tex-ref.pdf
 %doc %{_infodir}/*.info*
 %exclude %{_infodir}/dir
-%{_datadir}/emacs/site-lisp/site-start.d
-%{_datadir}/emacs/site-lisp/site-start.d/auctex.el
+%{startupdir}
+# %{_datadir}/emacs/site-lisp/site-start.d/auctex.el
 %{_datadir}/emacs/site-lisp/auctex
-%{startupfile}
+# %{startupfile}
 %{_datadir}/emacs/site-lisp/tex-site.el
 
 %changelog
+* Sun Apr  9 2006 Ed Hill <ed at eh3.com> - 11.82-1
+- update to 11.82
+
 * Fri Sep 30 2005 Ed Hill <ed at eh3.com> - 11.81-1
 - update to 11.81
 - disable preview for now since it needs some packaging work


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/emacs-auctex/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Oct 2005 01:53:37 -0000	1.3
+++ sources	9 Apr 2006 19:04:14 -0000	1.4
@@ -1 +1 @@
-ba1d7d3254a4d690c23ad914516710aa  auctex-11.81.tar.gz
+a18d6ac70b332f47386980f0c4df62e6  auctex-11.82.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr  9 19:04:16 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Sun,  9 Apr 2006 12:04:16 -0700
Subject: rpms/emacs-auctex/devel emacs-auctex.spec,1.5,1.6
Message-ID: <200604091904.k39J4mK8017566@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/emacs-auctex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17507/devel

Modified Files:
	emacs-auctex.spec 
Log Message:
new upstream 11.82 and fix two duplicated files



Index: emacs-auctex.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-auctex/devel/emacs-auctex.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- emacs-auctex.spec	1 Oct 2005 02:02:43 -0000	1.5
+++ emacs-auctex.spec	9 Apr 2006 19:04:16 -0000	1.6
@@ -3,8 +3,8 @@
 
 Summary: 	Enhanced TeX modes for Emacsen
 Name: 		emacs-auctex
-Version: 	11.81
-Release: 	2%{?dist}
+Version: 	11.82
+Release: 	1%{?dist}
 License: 	GPL
 Group: 		Applications/Editors
 URL: 		http://www.gnu.org/software/auctex/
@@ -81,13 +81,16 @@
 %doc doc/tex-ref.pdf
 %doc %{_infodir}/*.info*
 %exclude %{_infodir}/dir
-%{_datadir}/emacs/site-lisp/site-start.d
-%{_datadir}/emacs/site-lisp/site-start.d/auctex.el
+%{startupdir}
+# %{_datadir}/emacs/site-lisp/site-start.d/auctex.el
 %{_datadir}/emacs/site-lisp/auctex
-%{startupfile}
+# %{startupfile}
 %{_datadir}/emacs/site-lisp/tex-site.el
 
 %changelog
+* Sun Apr  9 2006 Ed Hill <ed at eh3.com> - 11.82-1
+- update to 11.82
+
 * Fri Sep 30 2005 Ed Hill <ed at eh3.com> - 11.81-2
 - fix stupid tagging mistake
 



From fedora-extras-commits at redhat.com  Sun Apr  9 19:04:15 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Sun,  9 Apr 2006 12:04:15 -0700
Subject: rpms/emacs-auctex/FC-5 emacs-auctex.spec,1.5,1.6
Message-ID: <200604091904.k39J4lSL017565@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/emacs-auctex/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17507/FC-5

Modified Files:
	emacs-auctex.spec 
Log Message:
new upstream 11.82 and fix two duplicated files



Index: emacs-auctex.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-auctex/FC-5/emacs-auctex.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- emacs-auctex.spec	1 Oct 2005 02:02:43 -0000	1.5
+++ emacs-auctex.spec	9 Apr 2006 19:04:15 -0000	1.6
@@ -3,8 +3,8 @@
 
 Summary: 	Enhanced TeX modes for Emacsen
 Name: 		emacs-auctex
-Version: 	11.81
-Release: 	2%{?dist}
+Version: 	11.82
+Release: 	1%{?dist}
 License: 	GPL
 Group: 		Applications/Editors
 URL: 		http://www.gnu.org/software/auctex/
@@ -81,13 +81,16 @@
 %doc doc/tex-ref.pdf
 %doc %{_infodir}/*.info*
 %exclude %{_infodir}/dir
-%{_datadir}/emacs/site-lisp/site-start.d
-%{_datadir}/emacs/site-lisp/site-start.d/auctex.el
+%{startupdir}
+# %{_datadir}/emacs/site-lisp/site-start.d/auctex.el
 %{_datadir}/emacs/site-lisp/auctex
-%{startupfile}
+# %{startupfile}
 %{_datadir}/emacs/site-lisp/tex-site.el
 
 %changelog
+* Sun Apr  9 2006 Ed Hill <ed at eh3.com> - 11.82-1
+- update to 11.82
+
 * Fri Sep 30 2005 Ed Hill <ed at eh3.com> - 11.81-2
 - fix stupid tagging mistake
 



From fedora-extras-commits at redhat.com  Sun Apr  9 19:13:58 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Sun,  9 Apr 2006 12:13:58 -0700
Subject: rpms/emacs-auctex/FC-5 .cvsignore, 1.3, 1.4 emacs-auctex.spec, 1.6, 
	1.7 sources, 1.3, 1.4
Message-ID: <200604091914.k39JE0QU017761@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/emacs-auctex/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17724/FC-5

Modified Files:
	.cvsignore emacs-auctex.spec sources 
Log Message:
fix silly new-sources omission



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/emacs-auctex/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Oct 2005 01:58:53 -0000	1.3
+++ .cvsignore	9 Apr 2006 19:13:58 -0000	1.4
@@ -1 +1 @@
-auctex-11.81.tar.gz
+auctex-11.82.tar.gz


Index: emacs-auctex.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-auctex/FC-5/emacs-auctex.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- emacs-auctex.spec	9 Apr 2006 19:04:15 -0000	1.6
+++ emacs-auctex.spec	9 Apr 2006 19:13:58 -0000	1.7
@@ -4,7 +4,7 @@
 Summary: 	Enhanced TeX modes for Emacsen
 Name: 		emacs-auctex
 Version: 	11.82
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License: 	GPL
 Group: 		Applications/Editors
 URL: 		http://www.gnu.org/software/auctex/
@@ -88,6 +88,9 @@
 %{_datadir}/emacs/site-lisp/tex-site.el
 
 %changelog
+* Sun Apr  9 2006 Ed Hill <ed at eh3.com> - 11.82-2
+- rebuild
+
 * Sun Apr  9 2006 Ed Hill <ed at eh3.com> - 11.82-1
 - update to 11.82
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/emacs-auctex/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Oct 2005 01:58:53 -0000	1.3
+++ sources	9 Apr 2006 19:13:58 -0000	1.4
@@ -1 +1 @@
-ba1d7d3254a4d690c23ad914516710aa  auctex-11.81.tar.gz
+a18d6ac70b332f47386980f0c4df62e6  auctex-11.82.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr  9 19:13:59 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Sun,  9 Apr 2006 12:13:59 -0700
Subject: rpms/emacs-auctex/devel .cvsignore, 1.3, 1.4 emacs-auctex.spec, 1.6,
	1.7 sources, 1.3, 1.4
Message-ID: <200604091914.k39JE1f7017767@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/emacs-auctex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17724/devel

Modified Files:
	.cvsignore emacs-auctex.spec sources 
Log Message:
fix silly new-sources omission



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/emacs-auctex/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Oct 2005 01:58:53 -0000	1.3
+++ .cvsignore	9 Apr 2006 19:13:59 -0000	1.4
@@ -1 +1 @@
-auctex-11.81.tar.gz
+auctex-11.82.tar.gz


Index: emacs-auctex.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-auctex/devel/emacs-auctex.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- emacs-auctex.spec	9 Apr 2006 19:04:16 -0000	1.6
+++ emacs-auctex.spec	9 Apr 2006 19:13:59 -0000	1.7
@@ -4,7 +4,7 @@
 Summary: 	Enhanced TeX modes for Emacsen
 Name: 		emacs-auctex
 Version: 	11.82
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License: 	GPL
 Group: 		Applications/Editors
 URL: 		http://www.gnu.org/software/auctex/
@@ -88,6 +88,9 @@
 %{_datadir}/emacs/site-lisp/tex-site.el
 
 %changelog
+* Sun Apr  9 2006 Ed Hill <ed at eh3.com> - 11.82-2
+- rebuild
+
 * Sun Apr  9 2006 Ed Hill <ed at eh3.com> - 11.82-1
 - update to 11.82
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/emacs-auctex/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Oct 2005 01:58:53 -0000	1.3
+++ sources	9 Apr 2006 19:13:59 -0000	1.4
@@ -1 +1 @@
-ba1d7d3254a4d690c23ad914516710aa  auctex-11.81.tar.gz
+a18d6ac70b332f47386980f0c4df62e6  auctex-11.82.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr  9 22:10:46 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun,  9 Apr 2006 15:10:46 -0700
Subject: rpms/clamav/FC-3 sources,1.12,1.13 clamav.spec,1.20,1.21
Message-ID: <200604092210.k39MAmIb027066@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27047/FC-3

Modified Files:
	sources clamav.spec 
Log Message:
updated to 0.88.1 (SECURITY)



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-3/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	9 Jan 2006 23:26:40 -0000	1.12
+++ sources	9 Apr 2006 22:10:45 -0000	1.13
@@ -1,2 +1,2 @@
-5d23205673c32e2b1b6db95000e6da74  clamav-0.88.tar.gz
-12816c52cf4434f861c1c7faa196361a  clamav-0.88.tar.gz.sig
+9fe8c47037051e350077513dd94fb76a  clamav-0.88.1.tar.gz
+bc06324bf070679854689235df5042d8  clamav-0.88.1.tar.gz.sig


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-3/clamav.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- clamav.spec	9 Jan 2006 23:26:40 -0000	1.20
+++ clamav.spec	9 Apr 2006 22:10:45 -0000	1.21
@@ -21,7 +21,7 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.88
+Version:	0.88.1
 Release:	%release_func 1
 
 License:	GPL
@@ -426,6 +426,9 @@
 %endif	# _without_milter
 
 %changelog
+* Mon Apr 10 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88.1-1
+- updated to 0.88.1 (SECURITY)
+
 * Tue Jan 10 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88-1
 - updated to 0.88
 - added pseudo-versions for the 'init(...)' provides as a first step



From fedora-extras-commits at redhat.com  Sun Apr  9 23:03:48 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  9 Apr 2006 16:03:48 -0700
Subject: rpms/perl-DBD-AnyData/devel - New directory
Message-ID: <200604092303.k39N3p96029401@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-DBD-AnyData/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29374/perl-DBD-AnyData/devel

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




From fedora-extras-commits at redhat.com  Sun Apr  9 23:03:47 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  9 Apr 2006 16:03:47 -0700
Subject: rpms/perl-DBD-AnyData - New directory
Message-ID: <200604092303.k39N3n4r029395@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-DBD-AnyData
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29374/perl-DBD-AnyData

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




From fedora-extras-commits at redhat.com  Sun Apr  9 23:04:02 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  9 Apr 2006 16:04:02 -0700
Subject: rpms/perl-DBD-AnyData Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604092304.k39N44s1029447@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-DBD-AnyData
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29419

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


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

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

common : CVS/Root
	@cvs 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 Apr  9 23:04:04 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  9 Apr 2006 16:04:04 -0700
Subject: rpms/perl-DBD-AnyData/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604092304.k39N46lH029453@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-DBD-AnyData/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29419/devel

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


--- 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 Apr  9 23:04:33 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  9 Apr 2006 16:04:33 -0700
Subject: rpms/perl-DBD-AnyData/devel perl-DBD-AnyData.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604092304.k39N4ZRp029522@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-DBD-AnyData/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29487/devel

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


--- NEW FILE perl-DBD-AnyData.spec ---
Name:           perl-DBD-AnyData
Version:        0.08
Release:        2%{?dist}
Summary:        DBI access to XML, CSV and other formats 
Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/DBD-AnyData
Source0:        http://search.cpan.org/CPAN/authors/id/J/JZ/JZUCKER/DBD-AnyData-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:	perl(DBI), perl(SQL::Statement), perl(DBD::File), perl(AnyData)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The DBD::AnyData module provides a DBI (Perl Database Interface) and SQL 
(Structured Query Language) interface to data in many formats and from many 
sources.

%prep
%setup -q -n DBD-AnyData-%{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
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/DBD/*
%{_mandir}/man3/*.3*


%changelog
* Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.08-2
- minor cleanups

* Fri Jan  6 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.08-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-AnyData/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2006 23:04:03 -0000	1.1
+++ .cvsignore	9 Apr 2006 23:04:32 -0000	1.2
@@ -0,0 +1 @@
+DBD-AnyData-0.08.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-AnyData/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2006 23:04:03 -0000	1.1
+++ sources	9 Apr 2006 23:04:32 -0000	1.2
@@ -0,0 +1 @@
+3434afdade1e2c9d79e85eca4bd8df17  DBD-AnyData-0.08.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr  9 23:04:31 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  9 Apr 2006 16:04:31 -0700
Subject: rpms/perl-DBD-AnyData import.log,1.1,1.2
Message-ID: <200604092305.k39N537W029532@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-DBD-AnyData
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29487

Modified Files:
	import.log 
Log Message:
auto-import perl-DBD-AnyData-0.08-2 on branch devel from perl-DBD-AnyData-0.08-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-AnyData/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Apr 2006 23:04:02 -0000	1.1
+++ import.log	9 Apr 2006 23:04:31 -0000	1.2
@@ -0,0 +1 @@
+perl-DBD-AnyData-0_08-2:HEAD:perl-DBD-AnyData-0.08-2.src.rpm:1144623864



From fedora-extras-commits at redhat.com  Sun Apr  9 23:06:58 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  9 Apr 2006 16:06:58 -0700
Subject: owners owners.list,1.817,1.818
Message-ID: <200604092307.k39N706Q029602@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	owners.list 
Log Message:

perl-DBD-AnyData



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.817
retrieving revision 1.818
diff -u -r1.817 -r1.818
--- owners.list	9 Apr 2006 11:52:48 -0000	1.817
+++ owners.list	9 Apr 2006 23:06:58 -0000	1.818
@@ -903,6 +903,7 @@
 Fedora Extras|perl-Date-Pcalc|Gregorian calendar date calculations|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Date-Simple|Simple date object for perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DateTime|DateTime Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-DBD-AnyData|DBI access to XML, CSV and other formats|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBD-CSV|DBI driver for CSV files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBD-SQLite2|Self Contained RDBMS in a DBI Driver (sqlite 2.x)|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBD-SQLite|Self Contained RDBMS in a DBI Driver|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Sun Apr  9 23:09:27 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  9 Apr 2006 16:09:27 -0700
Subject: owners owners.list,1.818,1.819
Message-ID: <200604092309.k39N9TWu029630@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	owners.list 
Log Message:

perl-SQL-AbstractLimit



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.818
retrieving revision 1.819
diff -u -r1.818 -r1.819
--- owners.list	9 Apr 2006 23:06:58 -0000	1.818
+++ owners.list	9 Apr 2006 23:09:27 -0000	1.819
@@ -1052,6 +1052,7 @@
 Fedora Extras|perl-Spoon|Spoon Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 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-AbstractLimit|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.comPortable LIMIT Emulation
 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-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



From fedora-extras-commits at redhat.com  Sun Apr  9 23:10:30 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  9 Apr 2006 16:10:30 -0700
Subject: rpms/perl-SQL-Abstract-Limit - New directory
Message-ID: <200604092310.k39NAWUA029728@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-SQL-Abstract-Limit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29685/perl-SQL-Abstract-Limit

Log Message:
Directory /cvs/extras/rpms/perl-SQL-Abstract-Limit added to the repository




From fedora-extras-commits at redhat.com  Sun Apr  9 23:10:30 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  9 Apr 2006 16:10:30 -0700
Subject: rpms/perl-SQL-Abstract-Limit/devel - New directory
Message-ID: <200604092310.k39NAWxR029731@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-SQL-Abstract-Limit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29685/perl-SQL-Abstract-Limit/devel

Log Message:
Directory /cvs/extras/rpms/perl-SQL-Abstract-Limit/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Apr  9 23:10:36 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  9 Apr 2006 16:10:36 -0700
Subject: rpms/nethack-vultures/FC-4 nethack-vultures-1.10.1-config.patch, 1.1,
	1.2 nethack-vultures-1.10.1-optflags.patch, 1.1,
	1.2 nethack-vultures-1.11.0-config.patch, 1.1,
	1.2 nethack-vultures-1.11.0-optflags.patch, 1.3,
	1.4 nethack-vultures.spec, 1.19, 1.20
Message-ID: <200604092310.k39NAds9029798@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-serv29672/FC-4

Modified Files:
	nethack-vultures-1.10.1-config.patch 
	nethack-vultures-1.10.1-optflags.patch 
	nethack-vultures-1.11.0-config.patch 
	nethack-vultures-1.11.0-optflags.patch nethack-vultures.spec 
Log Message:
Upgraded to 2.0



nethack-vultures-1.10.1-config.patch:

Index: nethack-vultures-1.10.1-config.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures-1.10.1-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nethack-vultures-1.10.1-config.patch	22 Nov 2005 02:16:56 -0000	1.1
+++ nethack-vultures-1.10.1-config.patch	9 Apr 2006 23:10:36 -0000	1.2
@@ -1,5 +1,5 @@
---- vultures-1.10.1/nethack/include/config.h~	2005-11-11 10:47:33.000000000 +0200
-+++ vultures-1.10.1/nethack/include/config.h	2005-11-15 21:44:26.000000000 +0200
+--- vultures-2.0.0/nethack/include/config.h~	2005-11-11 10:47:33.000000000 +0200
++++ vultures-2.0.0/nethack/include/config.h	2005-11-15 21:44:26.000000000 +0200
 @@ -150,10 +150,10 @@
  
  #ifndef WIZARD		/* allow for compile-time or Makefile changes */
@@ -60,8 +60,8 @@
  
  /*
   * Section 5:  EXPERIMENTAL STUFF
---- vultures-1.10.1/nethack/include/unixconf.h~	2005-11-11 10:47:32.000000000 +0200
-+++ vultures-1.10.1/nethack/include/unixconf.h	2005-11-15 21:45:42.000000000 +0200
+--- vultures-2.0.0/nethack/include/unixconf.h~	2005-11-11 10:47:32.000000000 +0200
++++ vultures-2.0.0/nethack/include/unixconf.h	2005-11-15 21:45:42.000000000 +0200
 @@ -37,7 +37,7 @@
  #define NETWORK		/* if running on a networked system */
  			/* e.g. Suns sharing a playground through NFS */
@@ -89,8 +89,8 @@
  #endif
  
  #define FCMASK	0660	/* file creation mask */
---- vultures-1.10.1/slashem/include/config.h~	2005-11-11 10:47:39.000000000 +0200
-+++ vultures-1.10.1/slashem/include/config.h	2005-11-15 21:46:27.000000000 +0200
+--- vultures-2.0.0/slashem/include/config.h~	2005-11-11 10:47:39.000000000 +0200
++++ vultures-2.0.0/slashem/include/config.h	2005-11-15 21:46:27.000000000 +0200
 @@ -206,10 +206,10 @@
  
  #ifndef WIZARD		/* allow for compile-time or Makefile changes */
@@ -160,8 +160,8 @@
  /* #define BORG */            /* Works only under DOS */
  /* #define KEEP_SAVE */       /* Keep savefiles after Restore (wac at intergate.bc.ca)*/
  /* #define CHARON */	/* Charon's boat, enables Cerebus - not implemented */
---- vultures-1.10.1/slashem/include/unixconf.h~	2005-11-11 10:47:39.000000000 +0200
-+++ vultures-1.10.1/slashem/include/unixconf.h	2005-11-15 21:46:58.000000000 +0200
+--- vultures-2.0.0/slashem/include/unixconf.h~	2005-11-11 10:47:39.000000000 +0200
++++ vultures-2.0.0/slashem/include/unixconf.h	2005-11-15 21:46:58.000000000 +0200
 @@ -38,7 +38,7 @@
  #define NETWORK		/* if running on a networked system */
  			/* e.g. Suns sharing a playground through NFS */

nethack-vultures-1.10.1-optflags.patch:

Index: nethack-vultures-1.10.1-optflags.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures-1.10.1-optflags.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nethack-vultures-1.10.1-optflags.patch	22 Nov 2005 02:16:56 -0000	1.1
+++ nethack-vultures-1.10.1-optflags.patch	9 Apr 2006 23:10:36 -0000	1.2
@@ -1,5 +1,5 @@
---- vultures-1.10.1/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.10.1/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
+--- vultures-2.0.0/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-2.0.0/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
 @@ -164,7 +164,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -9,8 +9,8 @@
  LFLAGS = 
  
  # The Qt and Be window systems are written in C++, while the rest of
---- vultures-1.10.1/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.10.1/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
+--- vultures-2.0.0/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-2.0.0/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -20,8 +20,8 @@
  LFLAGS =
  
  LIBS =
---- vultures-1.10.1/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.10.1/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
+--- vultures-2.0.0/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-2.0.0/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
 @@ -157,7 +157,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -31,8 +31,8 @@
  LFLAGS =
  
  # Only used for the Gnome interface.
---- vultures-1.10.1/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.10.1/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
+--- vultures-2.0.0/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-2.0.0/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include

nethack-vultures-1.11.0-config.patch:

Index: nethack-vultures-1.11.0-config.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures-1.11.0-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nethack-vultures-1.11.0-config.patch	15 Dec 2005 22:38:32 -0000	1.1
+++ nethack-vultures-1.11.0-config.patch	9 Apr 2006 23:10:36 -0000	1.2
@@ -1,5 +1,5 @@
---- vultures-1.11.0/nethack/include/config.h~	2005-11-11 10:47:33.000000000 +0200
-+++ vultures-1.11.0/nethack/include/config.h	2005-11-15 21:44:26.000000000 +0200
+--- vultures-2.0.0/nethack/include/config.h~	2005-11-11 10:47:33.000000000 +0200
++++ vultures-2.0.0/nethack/include/config.h	2005-11-15 21:44:26.000000000 +0200
 @@ -150,10 +150,10 @@
  
  #ifndef WIZARD		/* allow for compile-time or Makefile changes */
@@ -60,8 +60,8 @@
  
  /*
   * Section 5:  EXPERIMENTAL STUFF
---- vultures-1.11.0/nethack/include/unixconf.h~	2005-11-11 10:47:32.000000000 +0200
-+++ vultures-1.11.0/nethack/include/unixconf.h	2005-11-15 21:45:42.000000000 +0200
+--- vultures-2.0.0/nethack/include/unixconf.h~	2005-11-11 10:47:32.000000000 +0200
++++ vultures-2.0.0/nethack/include/unixconf.h	2005-11-15 21:45:42.000000000 +0200
 @@ -37,7 +37,7 @@
  #define NETWORK		/* if running on a networked system */
  			/* e.g. Suns sharing a playground through NFS */
@@ -89,8 +89,8 @@
  #endif
  
  #define FCMASK	0660	/* file creation mask */
---- vultures-1.11.0/slashem/include/config.h~	2005-11-11 10:47:39.000000000 +0200
-+++ vultures-1.11.0/slashem/include/config.h	2005-11-15 21:46:27.000000000 +0200
+--- vultures-2.0.0/slashem/include/config.h~	2005-11-11 10:47:39.000000000 +0200
++++ vultures-2.0.0/slashem/include/config.h	2005-11-15 21:46:27.000000000 +0200
 @@ -206,10 +206,10 @@
  
  #ifndef WIZARD		/* allow for compile-time or Makefile changes */
@@ -160,8 +160,8 @@
  /* #define BORG */            /* Works only under DOS */
  /* #define KEEP_SAVE */       /* Keep savefiles after Restore (wac at intergate.bc.ca)*/
  /* #define CHARON */	/* Charon's boat, enables Cerebus - not implemented */
---- vultures-1.11.0/slashem/include/unixconf.h~	2005-11-11 10:47:39.000000000 +0200
-+++ vultures-1.11.0/slashem/include/unixconf.h	2005-11-15 21:46:58.000000000 +0200
+--- vultures-2.0.0/slashem/include/unixconf.h~	2005-11-11 10:47:39.000000000 +0200
++++ vultures-2.0.0/slashem/include/unixconf.h	2005-11-15 21:46:58.000000000 +0200
 @@ -38,7 +38,7 @@
  #define NETWORK		/* if running on a networked system */
  			/* e.g. Suns sharing a playground through NFS */

nethack-vultures-1.11.0-optflags.patch:

Index: nethack-vultures-1.11.0-optflags.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures-1.11.0-optflags.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nethack-vultures-1.11.0-optflags.patch	15 Dec 2005 20:47:02 -0000	1.3
+++ nethack-vultures-1.11.0-optflags.patch	9 Apr 2006 23:10:36 -0000	1.4
@@ -1,16 +1,16 @@
---- vultures-1.11.0/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.11.0/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
-@@ -153,7 +153,7 @@
- 
- # VULTURESCFLAGS will be passed to the sub-makefile for vultures
+--- vultures-2.0.0/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-2.0.0/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
+@@ -161,7 +161,7 @@
+ 	SDLMAIN = -lSDLmain
+ endif
  VULTURESCFLAGS = -Wall -g
--CFLAGS = -g -I../include -I ../win/vultures
-+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures/
+-CFLAGS = -g -I../include -I ../win/vultures $(shell $(SDL_CONFIG) --cflags)
++CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures/  $(shell $(SDL_CONFIG) --cflags)
  LFLAGS = 
  
  # The Qt and Be window systems are written in C++, while the rest of
---- vultures-1.11.0/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.11.0/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
+--- vultures-2.0.0/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-2.0.0/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -20,19 +20,19 @@
  LFLAGS =
  
  LIBS =
---- vultures-1.11.0/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.11.0/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
-@@ -147,7 +157,7 @@
-
- # VULTURESCFLAGS will be passed to the sub-makefile for vultures
- VULTURESCFLAGS = -g -O -Wall
--CFLAGS = -g -O -I../include -I../win/vultures
-+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures
+--- vultures-2.0.0/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-2.0.0/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
+@@ -155,7 +155,7 @@
+         SDLMAIN = -lSDLmain
+ endif
+ VULTURESCFLAGS = -Wall -O -g
+-CFLAGS = -g -O -I../include -I ../win/vultures $(shell $(SDL_CONFIG) --cflags)
++CFLAGS = $(RPM_OPT_FLAGS) -I../include -I ../win/vultures $(shell $(SDL_CONFIG) --cflags)
  LFLAGS =
  
  # Only used for the Gnome interface.
---- vultures-1.11.0/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.11.0/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
+--- vultures-2.0.0/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-2.0.0/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- nethack-vultures.spec	2 Feb 2006 17:30:31 -0000	1.19
+++ nethack-vultures.spec	9 Apr 2006 23:10:36 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
-Version:        1.11.2
-Release:        4%{?dist}
+Version:        2.0.0
+Release:        1%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -13,8 +13,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
-BuildRequires:  SDL_mixer-devel
+BuildRequires:  SDL_mixer-devel >= 1.2.6
 BuildRequires:  SDL_image-devel
+BuildRequires:  SDL_ttf-devel
 BuildRequires:  libpng-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  byacc
@@ -164,6 +165,9 @@
 
 
 %changelog
+* Sat Apr 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-1
+- Upgraded to 2.0.0
+
 * Sun Feb 02 2006 Frank Arnold <frank at scirocco-5v-turbo.de> - 1.11.2-4
 - Got a working plague build by working around util-linux bug #176441.
 



From fedora-extras-commits at redhat.com  Sun Apr  9 23:10:37 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  9 Apr 2006 16:10:37 -0700
Subject: rpms/nethack-vultures/devel .cvsignore, 1.6,
	1.7 nethack-vultures-1.10.1-config.patch, 1.1,
	1.2 nethack-vultures-1.10.1-optflags.patch, 1.1,
	1.2 nethack-vultures-1.11.0-config.patch, 1.1,
	1.2 nethack-vultures-1.11.0-optflags.patch, 1.3,
	1.4 nethack-vultures.spec, 1.20, 1.21 sources, 1.5, 1.6
Message-ID: <200604092310.k39NAeGc029822@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29672/devel

Modified Files:
	.cvsignore nethack-vultures-1.10.1-config.patch 
	nethack-vultures-1.10.1-optflags.patch 
	nethack-vultures-1.11.0-config.patch 
	nethack-vultures-1.11.0-optflags.patch nethack-vultures.spec 
	sources 
Log Message:
Upgraded to 2.0




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 Jan 2006 04:36:31 -0000	1.6
+++ .cvsignore	9 Apr 2006 23:10:37 -0000	1.7
@@ -1 +0,0 @@
-vultures-1.11.2-full.tar.bz2

nethack-vultures-1.10.1-config.patch:

Index: nethack-vultures-1.10.1-config.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures-1.10.1-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nethack-vultures-1.10.1-config.patch	22 Nov 2005 02:16:56 -0000	1.1
+++ nethack-vultures-1.10.1-config.patch	9 Apr 2006 23:10:37 -0000	1.2
@@ -1,5 +1,5 @@
---- vultures-1.10.1/nethack/include/config.h~	2005-11-11 10:47:33.000000000 +0200
-+++ vultures-1.10.1/nethack/include/config.h	2005-11-15 21:44:26.000000000 +0200
+--- vultures-2.0.0/nethack/include/config.h~	2005-11-11 10:47:33.000000000 +0200
++++ vultures-2.0.0/nethack/include/config.h	2005-11-15 21:44:26.000000000 +0200
 @@ -150,10 +150,10 @@
  
  #ifndef WIZARD		/* allow for compile-time or Makefile changes */
@@ -60,8 +60,8 @@
  
  /*
   * Section 5:  EXPERIMENTAL STUFF
---- vultures-1.10.1/nethack/include/unixconf.h~	2005-11-11 10:47:32.000000000 +0200
-+++ vultures-1.10.1/nethack/include/unixconf.h	2005-11-15 21:45:42.000000000 +0200
+--- vultures-2.0.0/nethack/include/unixconf.h~	2005-11-11 10:47:32.000000000 +0200
++++ vultures-2.0.0/nethack/include/unixconf.h	2005-11-15 21:45:42.000000000 +0200
 @@ -37,7 +37,7 @@
  #define NETWORK		/* if running on a networked system */
  			/* e.g. Suns sharing a playground through NFS */
@@ -89,8 +89,8 @@
  #endif
  
  #define FCMASK	0660	/* file creation mask */
---- vultures-1.10.1/slashem/include/config.h~	2005-11-11 10:47:39.000000000 +0200
-+++ vultures-1.10.1/slashem/include/config.h	2005-11-15 21:46:27.000000000 +0200
+--- vultures-2.0.0/slashem/include/config.h~	2005-11-11 10:47:39.000000000 +0200
++++ vultures-2.0.0/slashem/include/config.h	2005-11-15 21:46:27.000000000 +0200
 @@ -206,10 +206,10 @@
  
  #ifndef WIZARD		/* allow for compile-time or Makefile changes */
@@ -160,8 +160,8 @@
  /* #define BORG */            /* Works only under DOS */
  /* #define KEEP_SAVE */       /* Keep savefiles after Restore (wac at intergate.bc.ca)*/
  /* #define CHARON */	/* Charon's boat, enables Cerebus - not implemented */
---- vultures-1.10.1/slashem/include/unixconf.h~	2005-11-11 10:47:39.000000000 +0200
-+++ vultures-1.10.1/slashem/include/unixconf.h	2005-11-15 21:46:58.000000000 +0200
+--- vultures-2.0.0/slashem/include/unixconf.h~	2005-11-11 10:47:39.000000000 +0200
++++ vultures-2.0.0/slashem/include/unixconf.h	2005-11-15 21:46:58.000000000 +0200
 @@ -38,7 +38,7 @@
  #define NETWORK		/* if running on a networked system */
  			/* e.g. Suns sharing a playground through NFS */

nethack-vultures-1.10.1-optflags.patch:

Index: nethack-vultures-1.10.1-optflags.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures-1.10.1-optflags.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nethack-vultures-1.10.1-optflags.patch	22 Nov 2005 02:16:56 -0000	1.1
+++ nethack-vultures-1.10.1-optflags.patch	9 Apr 2006 23:10:37 -0000	1.2
@@ -1,5 +1,5 @@
---- vultures-1.10.1/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.10.1/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
+--- vultures-2.0.0/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-2.0.0/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
 @@ -164,7 +164,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -9,8 +9,8 @@
  LFLAGS = 
  
  # The Qt and Be window systems are written in C++, while the rest of
---- vultures-1.10.1/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.10.1/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
+--- vultures-2.0.0/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-2.0.0/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -20,8 +20,8 @@
  LFLAGS =
  
  LIBS =
---- vultures-1.10.1/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.10.1/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
+--- vultures-2.0.0/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-2.0.0/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
 @@ -157,7 +157,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -31,8 +31,8 @@
  LFLAGS =
  
  # Only used for the Gnome interface.
---- vultures-1.10.1/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.10.1/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
+--- vultures-2.0.0/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-2.0.0/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include

nethack-vultures-1.11.0-config.patch:

Index: nethack-vultures-1.11.0-config.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures-1.11.0-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nethack-vultures-1.11.0-config.patch	15 Dec 2005 22:38:37 -0000	1.1
+++ nethack-vultures-1.11.0-config.patch	9 Apr 2006 23:10:37 -0000	1.2
@@ -1,5 +1,5 @@
---- vultures-1.11.0/nethack/include/config.h~	2005-11-11 10:47:33.000000000 +0200
-+++ vultures-1.11.0/nethack/include/config.h	2005-11-15 21:44:26.000000000 +0200
+--- vultures-2.0.0/nethack/include/config.h~	2005-11-11 10:47:33.000000000 +0200
++++ vultures-2.0.0/nethack/include/config.h	2005-11-15 21:44:26.000000000 +0200
 @@ -150,10 +150,10 @@
  
  #ifndef WIZARD		/* allow for compile-time or Makefile changes */
@@ -60,8 +60,8 @@
  
  /*
   * Section 5:  EXPERIMENTAL STUFF
---- vultures-1.11.0/nethack/include/unixconf.h~	2005-11-11 10:47:32.000000000 +0200
-+++ vultures-1.11.0/nethack/include/unixconf.h	2005-11-15 21:45:42.000000000 +0200
+--- vultures-2.0.0/nethack/include/unixconf.h~	2005-11-11 10:47:32.000000000 +0200
++++ vultures-2.0.0/nethack/include/unixconf.h	2005-11-15 21:45:42.000000000 +0200
 @@ -37,7 +37,7 @@
  #define NETWORK		/* if running on a networked system */
  			/* e.g. Suns sharing a playground through NFS */
@@ -89,8 +89,8 @@
  #endif
  
  #define FCMASK	0660	/* file creation mask */
---- vultures-1.11.0/slashem/include/config.h~	2005-11-11 10:47:39.000000000 +0200
-+++ vultures-1.11.0/slashem/include/config.h	2005-11-15 21:46:27.000000000 +0200
+--- vultures-2.0.0/slashem/include/config.h~	2005-11-11 10:47:39.000000000 +0200
++++ vultures-2.0.0/slashem/include/config.h	2005-11-15 21:46:27.000000000 +0200
 @@ -206,10 +206,10 @@
  
  #ifndef WIZARD		/* allow for compile-time or Makefile changes */
@@ -160,8 +160,8 @@
  /* #define BORG */            /* Works only under DOS */
  /* #define KEEP_SAVE */       /* Keep savefiles after Restore (wac at intergate.bc.ca)*/
  /* #define CHARON */	/* Charon's boat, enables Cerebus - not implemented */
---- vultures-1.11.0/slashem/include/unixconf.h~	2005-11-11 10:47:39.000000000 +0200
-+++ vultures-1.11.0/slashem/include/unixconf.h	2005-11-15 21:46:58.000000000 +0200
+--- vultures-2.0.0/slashem/include/unixconf.h~	2005-11-11 10:47:39.000000000 +0200
++++ vultures-2.0.0/slashem/include/unixconf.h	2005-11-15 21:46:58.000000000 +0200
 @@ -38,7 +38,7 @@
  #define NETWORK		/* if running on a networked system */
  			/* e.g. Suns sharing a playground through NFS */

nethack-vultures-1.11.0-optflags.patch:

Index: nethack-vultures-1.11.0-optflags.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures-1.11.0-optflags.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nethack-vultures-1.11.0-optflags.patch	15 Dec 2005 20:47:07 -0000	1.3
+++ nethack-vultures-1.11.0-optflags.patch	9 Apr 2006 23:10:37 -0000	1.4
@@ -1,16 +1,16 @@
---- vultures-1.11.0/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.11.0/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
-@@ -153,7 +153,7 @@
- 
- # VULTURESCFLAGS will be passed to the sub-makefile for vultures
+--- vultures-2.0.0/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-2.0.0/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
+@@ -161,7 +161,7 @@
+ 	SDLMAIN = -lSDLmain
+ endif
  VULTURESCFLAGS = -Wall -g
--CFLAGS = -g -I../include -I ../win/vultures
-+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures/
+-CFLAGS = -g -I../include -I ../win/vultures $(shell $(SDL_CONFIG) --cflags)
++CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures/  $(shell $(SDL_CONFIG) --cflags)
  LFLAGS = 
  
  # The Qt and Be window systems are written in C++, while the rest of
---- vultures-1.11.0/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.11.0/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
+--- vultures-2.0.0/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-2.0.0/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -20,19 +20,19 @@
  LFLAGS =
  
  LIBS =
---- vultures-1.11.0/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.11.0/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
-@@ -147,7 +157,7 @@
-
- # VULTURESCFLAGS will be passed to the sub-makefile for vultures
- VULTURESCFLAGS = -g -O -Wall
--CFLAGS = -g -O -I../include -I../win/vultures
-+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures
+--- vultures-2.0.0/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-2.0.0/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
+@@ -155,7 +155,7 @@
+         SDLMAIN = -lSDLmain
+ endif
+ VULTURESCFLAGS = -Wall -O -g
+-CFLAGS = -g -O -I../include -I ../win/vultures $(shell $(SDL_CONFIG) --cflags)
++CFLAGS = $(RPM_OPT_FLAGS) -I../include -I ../win/vultures $(shell $(SDL_CONFIG) --cflags)
  LFLAGS =
  
  # Only used for the Gnome interface.
---- vultures-1.11.0/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.11.0/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
+--- vultures-2.0.0/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-2.0.0/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- nethack-vultures.spec	2 Mar 2006 01:19:46 -0000	1.20
+++ nethack-vultures.spec	9 Apr 2006 23:10:37 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
-Version:        1.11.2
-Release:        5%{?dist}
+Version:        2.0.0
+Release:        1%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -13,8 +13,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
-BuildRequires:  SDL_mixer-devel
+BuildRequires:  SDL_mixer-devel >= 1.2.6
 BuildRequires:  SDL_image-devel
+BuildRequires:  SDL_ttf-devel
 BuildRequires:  libpng-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  byacc
@@ -164,6 +165,9 @@
 
 
 %changelog
+* Sat Apr 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-1
+- Upgraded to 2.0.0
+
 * Sun Mar 01 2006 Karen Pease <meme at daughtersoftiresias.org> - 1.11.2-5
 - Rebuilt for FC5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Jan 2006 04:36:31 -0000	1.5
+++ sources	9 Apr 2006 23:10:37 -0000	1.6
@@ -1 +0,0 @@
-2de11c2fdb1c2eaffbb5738e3babba7f  vultures-1.11.2-full.tar.bz2



From fedora-extras-commits at redhat.com  Sun Apr  9 23:10:46 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  9 Apr 2006 16:10:46 -0700
Subject: rpms/perl-SQL-Abstract-Limit Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604092310.k39NAmKc029867@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-SQL-Abstract-Limit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29834

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-SQL-Abstract-Limit


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

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

common : CVS/Root
	@cvs 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 Apr  9 23:10:47 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  9 Apr 2006 16:10:47 -0700
Subject: rpms/perl-SQL-Abstract-Limit/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200604092310.k39NAnAp029870@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-SQL-Abstract-Limit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29834/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-SQL-Abstract-Limit


--- 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 Apr  9 23:10:31 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  9 Apr 2006 16:10:31 -0700
Subject: rpms/nethack-vultures/FC-3 nethack-vultures-1.10.1-clawguide.patch, 
	1.1, 1.2 nethack-vultures-1.10.1-config.patch, 1.1,
	1.2 nethack-vultures-1.10.1-optflags.patch, 1.1,
	1.2 nethack-vultures-1.11.0-config.patch, 1.1,
	1.2 nethack-vultures-1.11.0-optflags.patch, 1.3,
	1.4 nethack-vultures.spec, 1.17, 1.18
Message-ID: <200604092311.k39NB31s029910@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-serv29672/FC-3

Modified Files:
	nethack-vultures-1.10.1-clawguide.patch 
	nethack-vultures-1.10.1-config.patch 
	nethack-vultures-1.10.1-optflags.patch 
	nethack-vultures-1.11.0-config.patch 
	nethack-vultures-1.11.0-optflags.patch nethack-vultures.spec 
Log Message:
Upgraded to 2.0



nethack-vultures-1.10.1-clawguide.patch:

Index: nethack-vultures-1.10.1-clawguide.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures-1.10.1-clawguide.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nethack-vultures-1.10.1-clawguide.patch	22 Nov 2005 02:16:56 -0000	1.1
+++ nethack-vultures-1.10.1-clawguide.patch	9 Apr 2006 23:10:31 -0000	1.2
@@ -5,7 +5,7 @@
  # GUIDECMD = type Guidebook.txt
  # The following work better with groff-1.18, eg on Linux
 -# GUIDECMD = tbl tmac.n Guidebook.mn | nroff -c -Tascii | $(COLCMD)
-+GUIDECMD = tbl tmac.n Guidebook.mn | nroff -c -Tascii | $(COLCMD)
++GUIDECMD = tbl tmac.n Guidebook.mn | nroff -c -Tascii | $(COLCMD) | cat
  # GUIDECMD = tbl tmac.n Guidebook.mn | groff -Wall -mtty-char -Tascii -P-u -P-b 
 -GUIDECMD = tbl tmac.n Guidebook.mn | nroff | $(COLCMD)
 +# GUIDECMD = tbl tmac.n Guidebook.mn | nroff | $(COLCMD)

nethack-vultures-1.10.1-config.patch:

Index: nethack-vultures-1.10.1-config.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures-1.10.1-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nethack-vultures-1.10.1-config.patch	22 Nov 2005 02:16:56 -0000	1.1
+++ nethack-vultures-1.10.1-config.patch	9 Apr 2006 23:10:31 -0000	1.2
@@ -1,5 +1,5 @@
---- vultures-1.10.1/nethack/include/config.h~	2005-11-11 10:47:33.000000000 +0200
-+++ vultures-1.10.1/nethack/include/config.h	2005-11-15 21:44:26.000000000 +0200
+--- vultures-2.0.0/nethack/include/config.h~	2005-11-11 10:47:33.000000000 +0200
++++ vultures-2.0.0/nethack/include/config.h	2005-11-15 21:44:26.000000000 +0200
 @@ -150,10 +150,10 @@
  
  #ifndef WIZARD		/* allow for compile-time or Makefile changes */
@@ -60,8 +60,8 @@
  
  /*
   * Section 5:  EXPERIMENTAL STUFF
---- vultures-1.10.1/nethack/include/unixconf.h~	2005-11-11 10:47:32.000000000 +0200
-+++ vultures-1.10.1/nethack/include/unixconf.h	2005-11-15 21:45:42.000000000 +0200
+--- vultures-2.0.0/nethack/include/unixconf.h~	2005-11-11 10:47:32.000000000 +0200
++++ vultures-2.0.0/nethack/include/unixconf.h	2005-11-15 21:45:42.000000000 +0200
 @@ -37,7 +37,7 @@
  #define NETWORK		/* if running on a networked system */
  			/* e.g. Suns sharing a playground through NFS */
@@ -89,8 +89,8 @@
  #endif
  
  #define FCMASK	0660	/* file creation mask */
---- vultures-1.10.1/slashem/include/config.h~	2005-11-11 10:47:39.000000000 +0200
-+++ vultures-1.10.1/slashem/include/config.h	2005-11-15 21:46:27.000000000 +0200
+--- vultures-2.0.0/slashem/include/config.h~	2005-11-11 10:47:39.000000000 +0200
++++ vultures-2.0.0/slashem/include/config.h	2005-11-15 21:46:27.000000000 +0200
 @@ -206,10 +206,10 @@
  
  #ifndef WIZARD		/* allow for compile-time or Makefile changes */
@@ -160,8 +160,8 @@
  /* #define BORG */            /* Works only under DOS */
  /* #define KEEP_SAVE */       /* Keep savefiles after Restore (wac at intergate.bc.ca)*/
  /* #define CHARON */	/* Charon's boat, enables Cerebus - not implemented */
---- vultures-1.10.1/slashem/include/unixconf.h~	2005-11-11 10:47:39.000000000 +0200
-+++ vultures-1.10.1/slashem/include/unixconf.h	2005-11-15 21:46:58.000000000 +0200
+--- vultures-2.0.0/slashem/include/unixconf.h~	2005-11-11 10:47:39.000000000 +0200
++++ vultures-2.0.0/slashem/include/unixconf.h	2005-11-15 21:46:58.000000000 +0200
 @@ -38,7 +38,7 @@
  #define NETWORK		/* if running on a networked system */
  			/* e.g. Suns sharing a playground through NFS */

nethack-vultures-1.10.1-optflags.patch:

Index: nethack-vultures-1.10.1-optflags.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures-1.10.1-optflags.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nethack-vultures-1.10.1-optflags.patch	22 Nov 2005 02:16:56 -0000	1.1
+++ nethack-vultures-1.10.1-optflags.patch	9 Apr 2006 23:10:31 -0000	1.2
@@ -1,5 +1,5 @@
---- vultures-1.10.1/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.10.1/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
+--- vultures-2.0.0/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-2.0.0/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
 @@ -164,7 +164,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -9,8 +9,8 @@
  LFLAGS = 
  
  # The Qt and Be window systems are written in C++, while the rest of
---- vultures-1.10.1/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.10.1/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
+--- vultures-2.0.0/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-2.0.0/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -20,8 +20,8 @@
  LFLAGS =
  
  LIBS =
---- vultures-1.10.1/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.10.1/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
+--- vultures-2.0.0/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-2.0.0/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
 @@ -157,7 +157,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -31,8 +31,8 @@
  LFLAGS =
  
  # Only used for the Gnome interface.
---- vultures-1.10.1/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.10.1/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
+--- vultures-2.0.0/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-2.0.0/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include

nethack-vultures-1.11.0-config.patch:

Index: nethack-vultures-1.11.0-config.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures-1.11.0-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nethack-vultures-1.11.0-config.patch	15 Dec 2005 22:38:26 -0000	1.1
+++ nethack-vultures-1.11.0-config.patch	9 Apr 2006 23:10:31 -0000	1.2
@@ -1,5 +1,5 @@
---- vultures-1.11.0/nethack/include/config.h~	2005-11-11 10:47:33.000000000 +0200
-+++ vultures-1.11.0/nethack/include/config.h	2005-11-15 21:44:26.000000000 +0200
+--- vultures-2.0.0/nethack/include/config.h~	2005-11-11 10:47:33.000000000 +0200
++++ vultures-2.0.0/nethack/include/config.h	2005-11-15 21:44:26.000000000 +0200
 @@ -150,10 +150,10 @@
  
  #ifndef WIZARD		/* allow for compile-time or Makefile changes */
@@ -60,8 +60,8 @@
  
  /*
   * Section 5:  EXPERIMENTAL STUFF
---- vultures-1.11.0/nethack/include/unixconf.h~	2005-11-11 10:47:32.000000000 +0200
-+++ vultures-1.11.0/nethack/include/unixconf.h	2005-11-15 21:45:42.000000000 +0200
+--- vultures-2.0.0/nethack/include/unixconf.h~	2005-11-11 10:47:32.000000000 +0200
++++ vultures-2.0.0/nethack/include/unixconf.h	2005-11-15 21:45:42.000000000 +0200
 @@ -37,7 +37,7 @@
  #define NETWORK		/* if running on a networked system */
  			/* e.g. Suns sharing a playground through NFS */
@@ -89,8 +89,8 @@
  #endif
  
  #define FCMASK	0660	/* file creation mask */
---- vultures-1.11.0/slashem/include/config.h~	2005-11-11 10:47:39.000000000 +0200
-+++ vultures-1.11.0/slashem/include/config.h	2005-11-15 21:46:27.000000000 +0200
+--- vultures-2.0.0/slashem/include/config.h~	2005-11-11 10:47:39.000000000 +0200
++++ vultures-2.0.0/slashem/include/config.h	2005-11-15 21:46:27.000000000 +0200
 @@ -206,10 +206,10 @@
  
  #ifndef WIZARD		/* allow for compile-time or Makefile changes */
@@ -160,8 +160,8 @@
  /* #define BORG */            /* Works only under DOS */
  /* #define KEEP_SAVE */       /* Keep savefiles after Restore (wac at intergate.bc.ca)*/
  /* #define CHARON */	/* Charon's boat, enables Cerebus - not implemented */
---- vultures-1.11.0/slashem/include/unixconf.h~	2005-11-11 10:47:39.000000000 +0200
-+++ vultures-1.11.0/slashem/include/unixconf.h	2005-11-15 21:46:58.000000000 +0200
+--- vultures-2.0.0/slashem/include/unixconf.h~	2005-11-11 10:47:39.000000000 +0200
++++ vultures-2.0.0/slashem/include/unixconf.h	2005-11-15 21:46:58.000000000 +0200
 @@ -38,7 +38,7 @@
  #define NETWORK		/* if running on a networked system */
  			/* e.g. Suns sharing a playground through NFS */

nethack-vultures-1.11.0-optflags.patch:

Index: nethack-vultures-1.11.0-optflags.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures-1.11.0-optflags.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nethack-vultures-1.11.0-optflags.patch	15 Dec 2005 20:46:56 -0000	1.3
+++ nethack-vultures-1.11.0-optflags.patch	9 Apr 2006 23:10:31 -0000	1.4
@@ -1,16 +1,16 @@
---- vultures-1.11.0/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.11.0/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
-@@ -153,7 +153,7 @@
- 
- # VULTURESCFLAGS will be passed to the sub-makefile for vultures
+--- vultures-2.0.0/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-2.0.0/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
+@@ -161,7 +161,7 @@
+ 	SDLMAIN = -lSDLmain
+ endif
  VULTURESCFLAGS = -Wall -g
--CFLAGS = -g -I../include -I ../win/vultures
-+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures/
+-CFLAGS = -g -I../include -I ../win/vultures $(shell $(SDL_CONFIG) --cflags)
++CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures/  $(shell $(SDL_CONFIG) --cflags)
  LFLAGS = 
  
  # The Qt and Be window systems are written in C++, while the rest of
---- vultures-1.11.0/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.11.0/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
+--- vultures-2.0.0/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-2.0.0/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -20,19 +20,19 @@
  LFLAGS =
  
  LIBS =
---- vultures-1.11.0/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.11.0/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
-@@ -147,7 +157,7 @@
-
- # VULTURESCFLAGS will be passed to the sub-makefile for vultures
- VULTURESCFLAGS = -g -O -Wall
--CFLAGS = -g -O -I../include -I../win/vultures
-+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures
+--- vultures-2.0.0/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-2.0.0/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
+@@ -155,7 +155,7 @@
+         SDLMAIN = -lSDLmain
+ endif
+ VULTURESCFLAGS = -Wall -O -g
+-CFLAGS = -g -O -I../include -I ../win/vultures $(shell $(SDL_CONFIG) --cflags)
++CFLAGS = $(RPM_OPT_FLAGS) -I../include -I ../win/vultures $(shell $(SDL_CONFIG) --cflags)
  LFLAGS =
  
  # Only used for the Gnome interface.
---- vultures-1.11.0/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.11.0/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
+--- vultures-2.0.0/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-2.0.0/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- nethack-vultures.spec	8 Jan 2006 16:31:53 -0000	1.17
+++ nethack-vultures.spec	9 Apr 2006 23:10:31 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
-Version:        1.11.2
-Release:        3%{?dist}
+Version:        2.0.0
+Release:        1%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -13,8 +13,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
-BuildRequires:  SDL_mixer-devel
+BuildRequires:  SDL_mixer-devel >= 1.2.6
 BuildRequires:  SDL_image-devel
+BuildRequires:  SDL_ttf-devel
 BuildRequires:  libpng-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  byacc
@@ -163,6 +164,9 @@
 
 
 %changelog
+* Sat Apr 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-1
+- Upgraded to 2.0.0
+
 * Sun Jan 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 1.11.2-3
 - Upped revision for consistancy with FC-4 and devel builds.
 



From fedora-extras-commits at redhat.com  Sun Apr  9 23:11:07 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  9 Apr 2006 16:11:07 -0700
Subject: rpms/perl-SQL-Abstract-Limit/devel perl-SQL-Abstract-Limit.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604092311.k39NB9BK029956@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-SQL-Abstract-Limit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29918/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-SQL-Abstract-Limit.spec 
Log Message:
auto-import perl-SQL-Abstract-Limit-0.12-2 on branch devel from perl-SQL-Abstract-Limit-0.12-2.src.rpm


--- NEW FILE perl-SQL-Abstract-Limit.spec ---
Name:           perl-SQL-Abstract-Limit
Version:        0.12
Release:        2%{?dist}
Summary:        Portable LIMIT Emulation
Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/SQL-Abstract-Limit
Source0:        http://search.cpan.org/CPAN/authors/id/D/DA/DAVEBAIRD/SQL-Abstract-Limit-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:	perl(SQL::Abstract) >= 1.2, perl(Test::Exception)
BuildRequires:	perl(Class::DBI), perl(DBD::AnyData)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Portable SQL LIMIT emulation, with support for multiple dialects and syntax 
models.

%prep
%setup -q -n SQL-Abstract-Limit-%{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
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/SQL
%{_mandir}/man3/*.3*

%changelog
* Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.12-2
- minor cleanups

* Fri Jan  6 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.12-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Abstract-Limit/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2006 23:10:47 -0000	1.1
+++ .cvsignore	9 Apr 2006 23:11:07 -0000	1.2
@@ -0,0 +1 @@
+SQL-Abstract-Limit-0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Abstract-Limit/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2006 23:10:47 -0000	1.1
+++ sources	9 Apr 2006 23:11:07 -0000	1.2
@@ -0,0 +1 @@
+127285b0a59f2a671fd4c411371d4877  SQL-Abstract-Limit-0.12.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr  9 23:11:06 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  9 Apr 2006 16:11:06 -0700
Subject: rpms/perl-SQL-Abstract-Limit import.log,1.1,1.2
Message-ID: <200604092311.k39NB81m029951@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-SQL-Abstract-Limit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29918

Modified Files:
	import.log 
Log Message:
auto-import perl-SQL-Abstract-Limit-0.12-2 on branch devel from perl-SQL-Abstract-Limit-0.12-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Abstract-Limit/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Apr 2006 23:10:46 -0000	1.1
+++ import.log	9 Apr 2006 23:11:06 -0000	1.2
@@ -0,0 +1 @@
+perl-SQL-Abstract-Limit-0_12-2:HEAD:perl-SQL-Abstract-Limit-0.12-2.src.rpm:1144624261



From fedora-extras-commits at redhat.com  Sun Apr  9 23:11:45 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  9 Apr 2006 16:11:45 -0700
Subject: owners owners.list,1.819,1.820
Message-ID: <200604092311.k39NBlBx030010@cvs-int.fedora.redhat.com>

Author: spot

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

Modified Files:
	owners.list 
Log Message:

typo



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.819
retrieving revision 1.820
diff -u -r1.819 -r1.820
--- owners.list	9 Apr 2006 23:09:27 -0000	1.819
+++ owners.list	9 Apr 2006 23:11:45 -0000	1.820
@@ -1052,7 +1052,7 @@
 Fedora Extras|perl-Spoon|Spoon Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 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-AbstractLimit|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.comPortable LIMIT Emulation
+Fedora Extras|perl-SQL-Abstract-Limit|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.comPortable LIMIT Emulation
 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-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



From fedora-extras-commits at redhat.com  Sun Apr  9 23:14:01 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  9 Apr 2006 16:14:01 -0700
Subject: rpms/fortune-firefly/FC-5 firefly, 1.6, 1.7 fortune-firefly.spec,
	1.8, 1.9
Message-ID: <200604092314.k39NE3l1030664@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/fortune-firefly/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30630/FC-5

Modified Files:
	firefly fortune-firefly.spec 
Log Message:
Updated FC-5.




Index: firefly
===================================================================
RCS file: /cvs/extras/rpms/fortune-firefly/FC-5/firefly,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- firefly	8 Jan 2006 21:11:28 -0000	1.6
+++ firefly	9 Apr 2006 23:14:01 -0000	1.7
@@ -1588,8 +1588,7 @@
 Wash: (gags)
 
 Jayne: "All the protien, vitamins and carbs of you grandma's best 
-turkey dinner... plus 15				--Episode #7, "Jaynestown"
-% alcohol." 
+turkey dinner... plus 15 percent alcohol.
 				--Episode #7, "Jaynestown"
 %
 Contact: "Last week, the factory foreman and his prod crew heard he was


Index: fortune-firefly.spec
===================================================================
RCS file: /cvs/extras/rpms/fortune-firefly/FC-5/fortune-firefly.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fortune-firefly.spec	8 Jan 2006 21:11:28 -0000	1.8
+++ fortune-firefly.spec	9 Apr 2006 23:14:01 -0000	1.9
@@ -1,5 +1,5 @@
 Name:		fortune-firefly
-Version:	2.1.0
+Version:	2.1.1
 Release:        1%{?dist}
 Summary:	Quotes from the TV series "Firefly"
 
@@ -49,6 +49,9 @@
 
 %changelog
 
+* Fri Apr 07 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.1
+- Manually merged in some fixes from Robert Mohr (mohr.42 at osu.edu)
+
 * Mon Jan 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.0
 - Incorporated some great organization and labeling by John Bianchi (John.Bianchi at usa.net)
 - Added quotes from unfilmed episode, "Dead or Alive"



From fedora-extras-commits at redhat.com  Sun Apr  9 23:15:06 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  9 Apr 2006 16:15:06 -0700
Subject: rpms/fortune-firefly/FC-5 fortune-firefly.spec,1.9,1.10
Message-ID: <200604092315.k39NF8tO030841@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/fortune-firefly/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30822

Modified Files:
	fortune-firefly.spec 
Log Message:
Upped the revision to make it work right.




Index: fortune-firefly.spec
===================================================================
RCS file: /cvs/extras/rpms/fortune-firefly/FC-5/fortune-firefly.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fortune-firefly.spec	9 Apr 2006 23:14:01 -0000	1.9
+++ fortune-firefly.spec	9 Apr 2006 23:15:06 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		fortune-firefly
 Version:	2.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:	Quotes from the TV series "Firefly"
 
 Group:		Amusements/Games



From fedora-extras-commits at redhat.com  Sun Apr  9 23:16:16 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  9 Apr 2006 16:16:16 -0700
Subject: rpms/fortune-firefly/FC-5 fortune-firefly.spec,1.10,1.11
Message-ID: <200604092316.k39NGI6G030866@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/fortune-firefly/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30847

Modified Files:
	fortune-firefly.spec 
Log Message:
Upped the revision to make tag




Index: fortune-firefly.spec
===================================================================
RCS file: /cvs/extras/rpms/fortune-firefly/FC-5/fortune-firefly.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fortune-firefly.spec	9 Apr 2006 23:15:06 -0000	1.10
+++ fortune-firefly.spec	9 Apr 2006 23:16:16 -0000	1.11
@@ -49,6 +49,9 @@
 
 %changelog
 
+* Sun Apr 09 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.1.2
+- Upped the revision to make tag
+
 * Fri Apr 07 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.1
 - Manually merged in some fixes from Robert Mohr (mohr.42 at osu.edu)
 



From fedora-extras-commits at redhat.com  Sun Apr  9 23:17:56 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  9 Apr 2006 16:17:56 -0700
Subject: rpms/nethack-vultures/FC-5 nethack-vultures-1.10.1-config.patch, 1.1,
	1.2 nethack-vultures-1.10.1-optflags.patch, 1.1,
	1.2 nethack-vultures-1.11.0-config.patch, 1.1,
	1.2 nethack-vultures-1.11.0-optflags.patch, 1.3,
	1.4 nethack-vultures.spec, 1.20, 1.21
Message-ID: <200604092317.k39NHxPa030952@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-serv30915

Modified Files:
	nethack-vultures-1.10.1-config.patch 
	nethack-vultures-1.10.1-optflags.patch 
	nethack-vultures-1.11.0-config.patch 
	nethack-vultures-1.11.0-optflags.patch nethack-vultures.spec 
Log Message:
Updated to 2.0.0



nethack-vultures-1.10.1-config.patch:

Index: nethack-vultures-1.10.1-config.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-5/nethack-vultures-1.10.1-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nethack-vultures-1.10.1-config.patch	22 Nov 2005 02:16:56 -0000	1.1
+++ nethack-vultures-1.10.1-config.patch	9 Apr 2006 23:17:56 -0000	1.2
@@ -1,5 +1,5 @@
---- vultures-1.10.1/nethack/include/config.h~	2005-11-11 10:47:33.000000000 +0200
-+++ vultures-1.10.1/nethack/include/config.h	2005-11-15 21:44:26.000000000 +0200
+--- vultures-2.0.0/nethack/include/config.h~	2005-11-11 10:47:33.000000000 +0200
++++ vultures-2.0.0/nethack/include/config.h	2005-11-15 21:44:26.000000000 +0200
 @@ -150,10 +150,10 @@
  
  #ifndef WIZARD		/* allow for compile-time or Makefile changes */
@@ -60,8 +60,8 @@
  
  /*
   * Section 5:  EXPERIMENTAL STUFF
---- vultures-1.10.1/nethack/include/unixconf.h~	2005-11-11 10:47:32.000000000 +0200
-+++ vultures-1.10.1/nethack/include/unixconf.h	2005-11-15 21:45:42.000000000 +0200
+--- vultures-2.0.0/nethack/include/unixconf.h~	2005-11-11 10:47:32.000000000 +0200
++++ vultures-2.0.0/nethack/include/unixconf.h	2005-11-15 21:45:42.000000000 +0200
 @@ -37,7 +37,7 @@
  #define NETWORK		/* if running on a networked system */
  			/* e.g. Suns sharing a playground through NFS */
@@ -89,8 +89,8 @@
  #endif
  
  #define FCMASK	0660	/* file creation mask */
---- vultures-1.10.1/slashem/include/config.h~	2005-11-11 10:47:39.000000000 +0200
-+++ vultures-1.10.1/slashem/include/config.h	2005-11-15 21:46:27.000000000 +0200
+--- vultures-2.0.0/slashem/include/config.h~	2005-11-11 10:47:39.000000000 +0200
++++ vultures-2.0.0/slashem/include/config.h	2005-11-15 21:46:27.000000000 +0200
 @@ -206,10 +206,10 @@
  
  #ifndef WIZARD		/* allow for compile-time or Makefile changes */
@@ -160,8 +160,8 @@
  /* #define BORG */            /* Works only under DOS */
  /* #define KEEP_SAVE */       /* Keep savefiles after Restore (wac at intergate.bc.ca)*/
  /* #define CHARON */	/* Charon's boat, enables Cerebus - not implemented */
---- vultures-1.10.1/slashem/include/unixconf.h~	2005-11-11 10:47:39.000000000 +0200
-+++ vultures-1.10.1/slashem/include/unixconf.h	2005-11-15 21:46:58.000000000 +0200
+--- vultures-2.0.0/slashem/include/unixconf.h~	2005-11-11 10:47:39.000000000 +0200
++++ vultures-2.0.0/slashem/include/unixconf.h	2005-11-15 21:46:58.000000000 +0200
 @@ -38,7 +38,7 @@
  #define NETWORK		/* if running on a networked system */
  			/* e.g. Suns sharing a playground through NFS */

nethack-vultures-1.10.1-optflags.patch:

Index: nethack-vultures-1.10.1-optflags.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-5/nethack-vultures-1.10.1-optflags.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nethack-vultures-1.10.1-optflags.patch	22 Nov 2005 02:16:56 -0000	1.1
+++ nethack-vultures-1.10.1-optflags.patch	9 Apr 2006 23:17:56 -0000	1.2
@@ -1,5 +1,5 @@
---- vultures-1.10.1/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.10.1/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
+--- vultures-2.0.0/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-2.0.0/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
 @@ -164,7 +164,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -9,8 +9,8 @@
  LFLAGS = 
  
  # The Qt and Be window systems are written in C++, while the rest of
---- vultures-1.10.1/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.10.1/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
+--- vultures-2.0.0/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-2.0.0/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -20,8 +20,8 @@
  LFLAGS =
  
  LIBS =
---- vultures-1.10.1/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.10.1/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
+--- vultures-2.0.0/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-2.0.0/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
 @@ -157,7 +157,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -31,8 +31,8 @@
  LFLAGS =
  
  # Only used for the Gnome interface.
---- vultures-1.10.1/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.10.1/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
+--- vultures-2.0.0/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-2.0.0/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include

nethack-vultures-1.11.0-config.patch:

Index: nethack-vultures-1.11.0-config.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-5/nethack-vultures-1.11.0-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nethack-vultures-1.11.0-config.patch	15 Dec 2005 22:38:37 -0000	1.1
+++ nethack-vultures-1.11.0-config.patch	9 Apr 2006 23:17:56 -0000	1.2
@@ -1,5 +1,5 @@
---- vultures-1.11.0/nethack/include/config.h~	2005-11-11 10:47:33.000000000 +0200
-+++ vultures-1.11.0/nethack/include/config.h	2005-11-15 21:44:26.000000000 +0200
+--- vultures-2.0.0/nethack/include/config.h~	2005-11-11 10:47:33.000000000 +0200
++++ vultures-2.0.0/nethack/include/config.h	2005-11-15 21:44:26.000000000 +0200
 @@ -150,10 +150,10 @@
  
  #ifndef WIZARD		/* allow for compile-time or Makefile changes */
@@ -60,8 +60,8 @@
  
  /*
   * Section 5:  EXPERIMENTAL STUFF
---- vultures-1.11.0/nethack/include/unixconf.h~	2005-11-11 10:47:32.000000000 +0200
-+++ vultures-1.11.0/nethack/include/unixconf.h	2005-11-15 21:45:42.000000000 +0200
+--- vultures-2.0.0/nethack/include/unixconf.h~	2005-11-11 10:47:32.000000000 +0200
++++ vultures-2.0.0/nethack/include/unixconf.h	2005-11-15 21:45:42.000000000 +0200
 @@ -37,7 +37,7 @@
  #define NETWORK		/* if running on a networked system */
  			/* e.g. Suns sharing a playground through NFS */
@@ -89,8 +89,8 @@
  #endif
  
  #define FCMASK	0660	/* file creation mask */
---- vultures-1.11.0/slashem/include/config.h~	2005-11-11 10:47:39.000000000 +0200
-+++ vultures-1.11.0/slashem/include/config.h	2005-11-15 21:46:27.000000000 +0200
+--- vultures-2.0.0/slashem/include/config.h~	2005-11-11 10:47:39.000000000 +0200
++++ vultures-2.0.0/slashem/include/config.h	2005-11-15 21:46:27.000000000 +0200
 @@ -206,10 +206,10 @@
  
  #ifndef WIZARD		/* allow for compile-time or Makefile changes */
@@ -160,8 +160,8 @@
  /* #define BORG */            /* Works only under DOS */
  /* #define KEEP_SAVE */       /* Keep savefiles after Restore (wac at intergate.bc.ca)*/
  /* #define CHARON */	/* Charon's boat, enables Cerebus - not implemented */
---- vultures-1.11.0/slashem/include/unixconf.h~	2005-11-11 10:47:39.000000000 +0200
-+++ vultures-1.11.0/slashem/include/unixconf.h	2005-11-15 21:46:58.000000000 +0200
+--- vultures-2.0.0/slashem/include/unixconf.h~	2005-11-11 10:47:39.000000000 +0200
++++ vultures-2.0.0/slashem/include/unixconf.h	2005-11-15 21:46:58.000000000 +0200
 @@ -38,7 +38,7 @@
  #define NETWORK		/* if running on a networked system */
  			/* e.g. Suns sharing a playground through NFS */

nethack-vultures-1.11.0-optflags.patch:

Index: nethack-vultures-1.11.0-optflags.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-5/nethack-vultures-1.11.0-optflags.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nethack-vultures-1.11.0-optflags.patch	15 Dec 2005 20:47:07 -0000	1.3
+++ nethack-vultures-1.11.0-optflags.patch	9 Apr 2006 23:17:56 -0000	1.4
@@ -1,16 +1,16 @@
---- vultures-1.11.0/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.11.0/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
-@@ -153,7 +153,7 @@
- 
- # VULTURESCFLAGS will be passed to the sub-makefile for vultures
+--- vultures-2.0.0/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-2.0.0/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
+@@ -161,7 +161,7 @@
+ 	SDLMAIN = -lSDLmain
+ endif
  VULTURESCFLAGS = -Wall -g
--CFLAGS = -g -I../include -I ../win/vultures
-+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures/
+-CFLAGS = -g -I../include -I ../win/vultures $(shell $(SDL_CONFIG) --cflags)
++CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures/  $(shell $(SDL_CONFIG) --cflags)
  LFLAGS = 
  
  # The Qt and Be window systems are written in C++, while the rest of
---- vultures-1.11.0/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.11.0/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
+--- vultures-2.0.0/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-2.0.0/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -20,19 +20,19 @@
  LFLAGS =
  
  LIBS =
---- vultures-1.11.0/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.11.0/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
-@@ -147,7 +157,7 @@
-
- # VULTURESCFLAGS will be passed to the sub-makefile for vultures
- VULTURESCFLAGS = -g -O -Wall
--CFLAGS = -g -O -I../include -I../win/vultures
-+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures
+--- vultures-2.0.0/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-2.0.0/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
+@@ -155,7 +155,7 @@
+         SDLMAIN = -lSDLmain
+ endif
+ VULTURESCFLAGS = -Wall -O -g
+-CFLAGS = -g -O -I../include -I ../win/vultures $(shell $(SDL_CONFIG) --cflags)
++CFLAGS = $(RPM_OPT_FLAGS) -I../include -I ../win/vultures $(shell $(SDL_CONFIG) --cflags)
  LFLAGS =
  
  # Only used for the Gnome interface.
---- vultures-1.11.0/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.11.0/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
+--- vultures-2.0.0/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-2.0.0/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-5/nethack-vultures.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- nethack-vultures.spec	2 Mar 2006 01:19:46 -0000	1.20
+++ nethack-vultures.spec	9 Apr 2006 23:17:56 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
-Version:        1.11.2
-Release:        5%{?dist}
+Version:        2.0.0
+Release:        1%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -13,8 +13,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
-BuildRequires:  SDL_mixer-devel
+BuildRequires:  SDL_mixer-devel >= 1.2.6
 BuildRequires:  SDL_image-devel
+BuildRequires:  SDL_ttf-devel
 BuildRequires:  libpng-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  byacc
@@ -164,6 +165,9 @@
 
 
 %changelog
+* Sat Apr 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-1
+- Upgraded to 2.0.0
+
 * Sun Mar 01 2006 Karen Pease <meme at daughtersoftiresias.org> - 1.11.2-5
 - Rebuilt for FC5
 



From fedora-extras-commits at redhat.com  Mon Apr 10 00:21:33 2006
From: fedora-extras-commits at redhat.com (Zing Zing Shishak (shishz))
Date: Sun,  9 Apr 2006 17:21:33 -0700
Subject: rpms/mmv/FC-5 mmv.spec,1.4,1.5
Message-ID: <200604100021.k3A0LZDG000930@cvs-int.fedora.redhat.com>

Author: shishz

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

Modified Files:
	mmv.spec 
Log Message:
* Sun Apr  9 2006 Zing <shishz at hotpop.com> - 1.01b-6
- fix permissions on doc files



Index: mmv.spec
===================================================================
RCS file: /cvs/extras/rpms/mmv/FC-5/mmv.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mmv.spec	14 Feb 2006 01:19:57 -0000	1.4
+++ mmv.spec	10 Apr 2006 00:21:33 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		mmv
 Version:	1.01b
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Move/copy/append/link multiple files
 
 Group:          Applications/File
@@ -49,8 +49,10 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
+%defattr(0644,root,root,-)
+%doc copyright changelog
 %defattr(-,root,root,-)
-%doc ANNOUNCE ARTICLE READ.ME copyright changelog
+%doc ANNOUNCE ARTICLE READ.ME
 %{_bindir}/mmv
 %{_bindir}/mcp
 %{_bindir}/mad
@@ -58,6 +60,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Apr  9 2006 Zing <shishz at hotpop.com> - 1.01b-6
+- fix permissions on doc files
+
 * Mon Feb 13 2006 Zing <shishz at hotpop.com> - 1.01b-5
 - sync with debian mmv_1.01b-14
 - symlink man page for mcp/mad/mln



From fedora-extras-commits at redhat.com  Mon Apr 10 00:23:57 2006
From: fedora-extras-commits at redhat.com (Zing Zing Shishak (shishz))
Date: Sun,  9 Apr 2006 17:23:57 -0700
Subject: rpms/mmv/FC-4 mmv-1.01b-debian-14.patch,NONE,1.1 mmv.spec,1.3,1.4
Message-ID: <200604100023.k3A0NxAN001025@cvs-int.fedora.redhat.com>

Author: shishz

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

Modified Files:
	mmv.spec 
Added Files:
	mmv-1.01b-debian-14.patch 
Log Message:
* Sun Apr  9 2006 Zing <shishz at hotpop.com> - 1.01b-4
- fix permissions on doc files
- sync with debian mmv_1.01b-14
- symlink man page for mcp/mad/mln


mmv-1.01b-debian-14.patch:

--- NEW FILE mmv-1.01b-debian-14.patch ---
--- mmv-1.01b.orig/mmv.c.orig	2006-02-13 19:07:32.000000000 -0500
+++ mmv-1.01b.orig/mmv.c	2006-02-13 19:11:34.000000000 -0500
@@ -439,7 +439,9 @@
 static int badreps = 0, paterr = 0, direrr, failed = 0, gotsig = 0, repbad;
 static FILE *outfile;
 
+#ifdef IS_MSDOS
 static char IDF[] = "$$mmvdid.";
+#endif
 static char TEMP[] = "$$mmvtmp.";
 static char TOOLONG[] = "(too long)";
 static char EMPTY[] = "(empty)";
@@ -457,12 +459,12 @@
 char fullrep[MAXPATH + 1];
 static char *(start[MAXWILD]);
 static int len[MAXWILD];
-static char hasdot[MAXWILD];
 static REP mistake;
 #define MISTAKE (&mistake)
 
 #ifdef IS_MSDOS
 
+static char hasdot[MAXWILD];
 static int olddevflag, curdisk, maxdisk;
 static struct {
 	char ph_banner[30];
@@ -627,7 +629,7 @@
 		}
 
 endargs:
-	if (op == DFLT)
+	if (op == DFLT) {
 		if (strcmp(cmdname, MOVENAME) == 0)
 			op = XMOVE;
 		else if (strcmp(cmdname, COPYNAME) == 0)
@@ -638,6 +640,8 @@
 			op = HARDLINK;
 		else
 			op = DFLTOP;
+	}
+	
 	if (
 		op & DIRMOVE &&
 #ifdef IS_MSDOS
@@ -784,7 +788,7 @@
 static int parsepat()
 {
 	char *p, *lastname, c;
-	int totwilds, instage, x, havedot;
+	int totwilds, instage, x;
 	static char TRAILESC[] = "%s -> %s : trailing %c is superfluous.\n";
 
 	lastname = from;
@@ -1047,7 +1051,7 @@
 	DIRINFO *di;
 	HANDLE *h, *hto;
 	int prelen, litlen, nfils, i, k, flags, try;
-	FILEINFO **pf, *fdel;
+	FILEINFO **pf, *fdel = NULL;
 	char *nto, *firstesc;
 	REP *p;
 	int wantdirs, ret = 1, laststage = (stage + 1 == nstages);
@@ -1177,11 +1181,12 @@
 	if (*p == '.' || (!matchall && ffrom->fi_attrib & (FA_HIDDEN | FA_SYSTEM)))
 		return(strcmp(pat, p) == 0);
 #else
-	if (*p == '.')
+	if (*p == '.') {
 		if (p[1] == '\0' || (p[1] == '.' && p[2] == '\0'))
 			return(strcmp(pat, p) == 0);
 		else if (!matchall && *pat != '.')
 			return(0);
+	}
 #endif
 	return(-1);
 }
@@ -1317,7 +1322,7 @@
 {
 	char tpath[MAXPATH + 1];
 	char *pathend;
-	FILEINFO *fdel;
+	FILEINFO *fdel = NULL;
 	int hlen, tlen;
 
 	if (op & DIRMOVE) {
@@ -1410,7 +1415,9 @@
 static int badname(s)
 	char *s;
 {
+#ifdef IS_MSDOS
 	char *ext;
+#endif
 
 	return (
 #ifdef IS_MSDOS
@@ -1720,20 +1727,19 @@
 	struct stat dstat;
 	DIRID d;
 	DEVID v;
-	DIRINFO **newdirs, *di;
-	int nfils;
-	FILEINFO **fils;
+	DIRINFO *di = NULL;
 	char *myp, *lastslash = NULL;
 	int sticky;
 	HANDLE *h;
 
-	if (hsearch(p, which, &h))
+	if (hsearch(p, which, &h)) {
 		if (h->h_di == NULL) {
 			direrr = h->h_err;
 			return(NULL);
 		}
 		else
 			return(h);
+	}
 
 	if (*p == '\0')
 		myp = ".";
@@ -1904,7 +1910,10 @@
 	char *pat, *s, **start1;
 	int *len1;
 {
-	char c, *olds;
+	char c;
+#ifdef IS_MSDOS
+	char *olds;
+#endif
 
 	*start1 = 0;
 	for(;;)
@@ -2381,9 +2390,9 @@
 static void doreps()
 {
 	char *fstart;
-	int k, printaliased = 0, alias;
+	int k, printaliased = 0, alias = 0;
 	REP *first, *p;
-	long aliaslen;
+	long aliaslen = 0l;
 
 #ifdef IS_MSDOS
 	ctrlbrk(breakrep);
@@ -2401,11 +2410,12 @@
 			}
 			strcpy(fullrep, p->r_hto->h_name);
 			strcat(fullrep, p->r_nto);
-			if (!noex && (p->r_flags & R_ISCYCLE))
+			if (!noex && (p->r_flags & R_ISCYCLE)) {
 				if (op & APPEND)
 					aliaslen = appendalias(first, p, &printaliased);
 				else
 					alias = movealias(first, p, &printaliased);
+			}
 			strcpy(pathbuf, p->r_hfrom->h_name);
 			fstart = pathbuf + strlen(pathbuf);
 			if ((p->r_flags & R_ISALIASED) && !(op & APPEND))
@@ -2464,7 +2474,7 @@
 	REP *first, *p;
 	int *pprintaliased;
 {
-	long ret;
+	long ret = 0l;
 
 #ifdef IS_MSDOS
 	int fd;
@@ -2631,9 +2641,10 @@
 	FILEINFO *ff;
 	off_t len;
 {
-	char buf[BUFSIZE], c;
+	char buf[BUFSIZE];
 	int f, t, k, mode, perm;
 #ifdef IS_MSDOS
+        char c;
 	struct ftime tim;
 #else
 #ifdef IS_SYSV


Index: mmv.spec
===================================================================
RCS file: /cvs/extras/rpms/mmv/FC-4/mmv.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mmv.spec	1 Oct 2005 23:13:47 -0000	1.3
+++ mmv.spec	10 Apr 2006 00:23:57 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		mmv
 Version:	1.01b
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Move/copy/append/link multiple files
 
 Group:          Applications/File
@@ -11,6 +11,7 @@
 Source2:	changelog
 Patch0:		mmv-1.01b-debian.patch
 Patch1:		mmv-1.01b-makefile.patch
+Patch2:		mmv-1.01b-debian-14.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -27,6 +28,7 @@
 %setup -q -n mmv-1.01b.orig
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 cp -p %{SOURCE1} . 
 cp -p %{SOURCE2} .
 
@@ -39,13 +41,18 @@
 ln -s mmv $RPM_BUILD_ROOT/%{_bindir}/mcp
 ln -s mmv $RPM_BUILD_ROOT/%{_bindir}/mad
 ln -s mmv $RPM_BUILD_ROOT/%{_bindir}/mln
+ln -s mmv.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/mcp.1.gz
+ln -s mmv.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/mad.1.gz
+ln -s mmv.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/mln.1.gz
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
+%defattr(0644,root,root,-)
+%doc copyright changelog
 %defattr(-,root,root,-)
-%doc ANNOUNCE ARTICLE READ.ME copyright changelog
+%doc ANNOUNCE ARTICLE READ.ME
 %{_bindir}/mmv
 %{_bindir}/mcp
 %{_bindir}/mad
@@ -53,6 +60,11 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Apr  9 2006 Zing <shishz at hotpop.com> - 1.01b-4
+- fix permissions on doc files
+- sync with debian mmv_1.01b-14
+- symlink man page for mcp/mad/mln
+
 * Sat Oct  1 2005 Zing <shishz at hotpop.com> - 1.01b-3
 - cleanup changelog
 - use dist tag



From fedora-extras-commits at redhat.com  Mon Apr 10 00:24:53 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  9 Apr 2006 17:24:53 -0700
Subject: rpms/perl-Class-DBI-AbstractSearch/FC-4
	perl-Class-DBI-AbstractSearch.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200604100025.k3A0PPDW001210@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-AbstractSearch/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1085/FC-4

Modified Files:
	perl-Class-DBI-AbstractSearch.spec sources 
Log Message:

Bump to 0.07



Index: perl-Class-DBI-AbstractSearch.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-AbstractSearch/FC-4/perl-Class-DBI-AbstractSearch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-AbstractSearch.spec	8 Sep 2005 15:15:23 -0000	1.1
+++ perl-Class-DBI-AbstractSearch.spec	10 Apr 2006 00:24:52 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-AbstractSearch
-Version:        0.05
-Release:        3%{?dist}
+Version:        0.07
+Release:        1%{?dist}
 Summary:        Abstract Class::DBI's SQL with SQL::Abstract
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -10,6 +10,7 @@
 
 BuildArch:      noarch
 BuildRequires:	perl(Class::DBI), perl(DBD::SQLite), perl(SQL::Abstract)
+BuildRequires:	perl(SQL::Abstract::Limit)
 Requires:  perl(Class::DBI)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -46,6 +47,9 @@
 
 
 %changelog
+* Fri Jan  6 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.07-1
+- bump to 0.07
+
 * Tue Sep  6 2005 Paul Howarth <paul at city-fan.org> 0.05-3
 - remove redundant BR: perl
 - honor %%{?_smp_mflags}


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-AbstractSearch/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Sep 2005 15:15:23 -0000	1.2
+++ sources	10 Apr 2006 00:24:52 -0000	1.3
@@ -1 +1 @@
-34e35114a22f1281f86c57a4ae54c62e  Class-DBI-AbstractSearch-0.05.tar.gz
+d40e7301201135fe0246251097132a54  Class-DBI-AbstractSearch-0.07.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 00:24:53 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  9 Apr 2006 17:24:53 -0700
Subject: rpms/perl-Class-DBI-AbstractSearch/FC-5
	perl-Class-DBI-AbstractSearch.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200604100025.k3A0PPto001214@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-AbstractSearch/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1085/FC-5

Modified Files:
	perl-Class-DBI-AbstractSearch.spec sources 
Log Message:

Bump to 0.07



Index: perl-Class-DBI-AbstractSearch.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-AbstractSearch/FC-5/perl-Class-DBI-AbstractSearch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-AbstractSearch.spec	8 Sep 2005 15:15:23 -0000	1.1
+++ perl-Class-DBI-AbstractSearch.spec	10 Apr 2006 00:24:53 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-AbstractSearch
-Version:        0.05
-Release:        3%{?dist}
+Version:        0.07
+Release:        1%{?dist}
 Summary:        Abstract Class::DBI's SQL with SQL::Abstract
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -10,6 +10,7 @@
 
 BuildArch:      noarch
 BuildRequires:	perl(Class::DBI), perl(DBD::SQLite), perl(SQL::Abstract)
+BuildRequires:	perl(SQL::Abstract::Limit)
 Requires:  perl(Class::DBI)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -46,6 +47,9 @@
 
 
 %changelog
+* Fri Jan  6 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.07-1
+- bump to 0.07
+
 * Tue Sep  6 2005 Paul Howarth <paul at city-fan.org> 0.05-3
 - remove redundant BR: perl
 - honor %%{?_smp_mflags}


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-AbstractSearch/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Sep 2005 15:15:23 -0000	1.2
+++ sources	10 Apr 2006 00:24:53 -0000	1.3
@@ -1 +1 @@
-34e35114a22f1281f86c57a4ae54c62e  Class-DBI-AbstractSearch-0.05.tar.gz
+d40e7301201135fe0246251097132a54  Class-DBI-AbstractSearch-0.07.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 00:24:54 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  9 Apr 2006 17:24:54 -0700
Subject: rpms/perl-Class-DBI-AbstractSearch/devel .cvsignore, 1.2,
	1.3 perl-Class-DBI-AbstractSearch.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200604100025.k3A0PQ1i001219@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-AbstractSearch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1085/devel

Modified Files:
	.cvsignore perl-Class-DBI-AbstractSearch.spec sources 
Log Message:

Bump to 0.07



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-AbstractSearch/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Sep 2005 15:15:23 -0000	1.2
+++ .cvsignore	10 Apr 2006 00:24:54 -0000	1.3
@@ -1 +1,2 @@
 Class-DBI-AbstractSearch-0.05.tar.gz
+Class-DBI-AbstractSearch-0.07.tar.gz


Index: perl-Class-DBI-AbstractSearch.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-AbstractSearch/devel/perl-Class-DBI-AbstractSearch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-AbstractSearch.spec	8 Sep 2005 15:15:23 -0000	1.1
+++ perl-Class-DBI-AbstractSearch.spec	10 Apr 2006 00:24:54 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-AbstractSearch
-Version:        0.05
-Release:        3%{?dist}
+Version:        0.07
+Release:        1%{?dist}
 Summary:        Abstract Class::DBI's SQL with SQL::Abstract
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -10,6 +10,7 @@
 
 BuildArch:      noarch
 BuildRequires:	perl(Class::DBI), perl(DBD::SQLite), perl(SQL::Abstract)
+BuildRequires:	perl(SQL::Abstract::Limit)
 Requires:  perl(Class::DBI)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -46,6 +47,9 @@
 
 
 %changelog
+* Fri Jan  6 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.07-1
+- bump to 0.07
+
 * Tue Sep  6 2005 Paul Howarth <paul at city-fan.org> 0.05-3
 - remove redundant BR: perl
 - honor %%{?_smp_mflags}


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-AbstractSearch/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Sep 2005 15:15:23 -0000	1.2
+++ sources	10 Apr 2006 00:24:54 -0000	1.3
@@ -1 +1 @@
-34e35114a22f1281f86c57a4ae54c62e  Class-DBI-AbstractSearch-0.05.tar.gz
+d40e7301201135fe0246251097132a54  Class-DBI-AbstractSearch-0.07.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 00:25:15 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  9 Apr 2006 17:25:15 -0700
Subject: rpms/nethack-vultures/FC-3 .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <200604100025.k3A0PllW001228@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-serv1148/FC-3

Modified Files:
	.cvsignore sources 
Log Message:
Committing modified source files.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Jan 2006 04:36:18 -0000	1.5
+++ .cvsignore	10 Apr 2006 00:25:15 -0000	1.6
@@ -1 +1 @@
-vultures-1.11.2-full.tar.bz2
+vultures-2.0.0-full.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Jan 2006 04:36:18 -0000	1.5
+++ sources	10 Apr 2006 00:25:15 -0000	1.6
@@ -1 +1 @@
-2de11c2fdb1c2eaffbb5738e3babba7f  vultures-1.11.2-full.tar.bz2
+556863034d868dfebbbad6b7fbaec4f9  vultures-2.0.0-full.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 10 00:25:15 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  9 Apr 2006 17:25:15 -0700
Subject: rpms/nethack-vultures/FC-4 .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <200604100025.k3A0PmpE001232@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-serv1148/FC-4

Modified Files:
	.cvsignore sources 
Log Message:
Committing modified source files.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Jan 2006 04:36:25 -0000	1.5
+++ .cvsignore	10 Apr 2006 00:25:15 -0000	1.6
@@ -1 +1 @@
-vultures-1.11.2-full.tar.bz2
+vultures-2.0.0-full.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Jan 2006 04:36:25 -0000	1.5
+++ sources	10 Apr 2006 00:25:15 -0000	1.6
@@ -1 +1 @@
-2de11c2fdb1c2eaffbb5738e3babba7f  vultures-1.11.2-full.tar.bz2
+556863034d868dfebbbad6b7fbaec4f9  vultures-2.0.0-full.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 10 00:25:21 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  9 Apr 2006 17:25:21 -0700
Subject: rpms/nethack-vultures/FC-5 .cvsignore,1.6,1.7 sources,1.5,1.6
Message-ID: <200604100025.k3A0PrwT001236@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-serv1148/FC-5

Modified Files:
	.cvsignore sources 
Log Message:
Committing modified source files.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 Jan 2006 04:36:31 -0000	1.6
+++ .cvsignore	10 Apr 2006 00:25:21 -0000	1.7
@@ -1 +1 @@
-vultures-1.11.2-full.tar.bz2
+vultures-2.0.0-full.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Jan 2006 04:36:31 -0000	1.5
+++ sources	10 Apr 2006 00:25:21 -0000	1.6
@@ -1 +1 @@
-2de11c2fdb1c2eaffbb5738e3babba7f  vultures-1.11.2-full.tar.bz2
+556863034d868dfebbbad6b7fbaec4f9  vultures-2.0.0-full.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 10 00:25:22 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  9 Apr 2006 17:25:22 -0700
Subject: rpms/nethack-vultures/devel .cvsignore,1.7,1.8 sources,1.6,1.7
Message-ID: <200604100025.k3A0PsgB001241@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1148/devel

Modified Files:
	.cvsignore sources 
Log Message:
Committing modified source files.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	9 Apr 2006 23:10:37 -0000	1.7
+++ .cvsignore	10 Apr 2006 00:25:22 -0000	1.8
@@ -0,0 +1 @@
+vultures-2.0.0-full.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Apr 2006 23:10:37 -0000	1.6
+++ sources	10 Apr 2006 00:25:22 -0000	1.7
@@ -0,0 +1 @@
+556863034d868dfebbbad6b7fbaec4f9  vultures-2.0.0-full.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 10 00:35:02 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  9 Apr 2006 17:35:02 -0700
Subject: rpms/nethack-vultures/FC-3 nethack-vultures.spec,1.18,1.19
Message-ID: <200604100035.k3A0ZYSW001510@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-serv1436/FC-3

Modified Files:
	nethack-vultures.spec 
Log Message:
Upped the release to try and get the plague server to use the right
tarball.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- nethack-vultures.spec	9 Apr 2006 23:10:31 -0000	1.18
+++ nethack-vultures.spec	10 Apr 2006 00:35:01 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        2.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -164,6 +164,9 @@
 
 
 %changelog
+* Sat Apr 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-2
+- Upped the release to try and make the plague server use the right source tarball.
+
 * Sat Apr 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-1
 - Upgraded to 2.0.0
 



From fedora-extras-commits at redhat.com  Mon Apr 10 00:35:02 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  9 Apr 2006 17:35:02 -0700
Subject: rpms/nethack-vultures/FC-4 nethack-vultures.spec,1.20,1.21
Message-ID: <200604100035.k3A0ZYIU001513@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-serv1436/FC-4

Modified Files:
	nethack-vultures.spec 
Log Message:
Upped the release to try and get the plague server to use the right
tarball.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- nethack-vultures.spec	9 Apr 2006 23:10:36 -0000	1.20
+++ nethack-vultures.spec	10 Apr 2006 00:35:02 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        2.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -165,6 +165,9 @@
 
 
 %changelog
+* Sat Apr 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-2
+- Upped the release to try and make the plague server use the right source tarball.
+
 * Sat Apr 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-1
 - Upgraded to 2.0.0
 



From fedora-extras-commits at redhat.com  Mon Apr 10 00:35:08 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  9 Apr 2006 17:35:08 -0700
Subject: rpms/nethack-vultures/FC-5 nethack-vultures.spec,1.21,1.22
Message-ID: <200604100035.k3A0ZexP001516@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-serv1436/FC-5

Modified Files:
	nethack-vultures.spec 
Log Message:
Upped the release to try and get the plague server to use the right
tarball.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-5/nethack-vultures.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- nethack-vultures.spec	9 Apr 2006 23:17:56 -0000	1.21
+++ nethack-vultures.spec	10 Apr 2006 00:35:08 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        2.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -165,6 +165,9 @@
 
 
 %changelog
+* Sat Apr 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-2
+- Upped the release to try and make the plague server use the right source tarball.
+
 * Sat Apr 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-1
 - Upgraded to 2.0.0
 



From fedora-extras-commits at redhat.com  Mon Apr 10 00:35:09 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  9 Apr 2006 17:35:09 -0700
Subject: rpms/nethack-vultures/devel nethack-vultures.spec,1.21,1.22
Message-ID: <200604100035.k3A0ZfLX001519@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1436/devel

Modified Files:
	nethack-vultures.spec 
Log Message:
Upped the release to try and get the plague server to use the right
tarball.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- nethack-vultures.spec	9 Apr 2006 23:10:37 -0000	1.21
+++ nethack-vultures.spec	10 Apr 2006 00:35:08 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        2.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -165,6 +165,9 @@
 
 
 %changelog
+* Sat Apr 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-2
+- Upped the release to try and make the plague server use the right source tarball.
+
 * Sat Apr 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-1
 - Upgraded to 2.0.0
 



From fedora-extras-commits at redhat.com  Mon Apr 10 03:25:53 2006
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Sun,  9 Apr 2006 20:25:53 -0700
Subject: owners owners.list,1.820,1.821
Message-ID: <200604100325.k3A3PtOE008259@cvs-int.fedora.redhat.com>

Author: roland

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

Modified Files:
	owners.list 
Log Message:
Add lcov package.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.820
retrieving revision 1.821
diff -u -r1.820 -r1.821
--- owners.list	9 Apr 2006 23:11:45 -0000	1.820
+++ owners.list	10 Apr 2006 03:25:53 -0000	1.821
@@ -548,6 +548,7 @@
 Fedora Extras|lapack|The LAPACK libraries for numerical linear algebra.|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|lcdf-typetools|Tools for manipulating Postscript fonts|mpeters at mac.com|extras-qa at fedoraproject.org|
 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|roland at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|ldns|Lowlevel DNS(SEC) library with API|paul at xtdnet.nl|extras-qa at fedoraproject.org|
 Fedora Extras|leafnode|A leafsite NNTP server|davidhart at tqmcube.com|extras-qa at fedoraproject.org|
 Fedora Extras|leafpad|GTK+ based simple text editor|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Apr 10 05:22:13 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun,  9 Apr 2006 22:22:13 -0700
Subject: rpms/crystal-stacker-themes - New directory
Message-ID: <200604100522.k3A5MFvI012555@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/crystal-stacker-themes
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12534/crystal-stacker-themes

Log Message:
Directory /cvs/extras/rpms/crystal-stacker-themes added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 10 05:22:14 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun,  9 Apr 2006 22:22:14 -0700
Subject: rpms/crystal-stacker-themes/devel - New directory
Message-ID: <200604100522.k3A5MGmP012558@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/crystal-stacker-themes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12534/crystal-stacker-themes/devel

Log Message:
Directory /cvs/extras/rpms/crystal-stacker-themes/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 10 05:22:32 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun,  9 Apr 2006 22:22:32 -0700
Subject: rpms/crystal-stacker-themes Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604100522.k3A5MYVt012607@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/crystal-stacker-themes
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12579

Added Files:
	Makefile import.log 
Log Message:
Setup of module crystal-stacker-themes


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

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

common : CVS/Root
	@cvs 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 Apr 10 05:22:33 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun,  9 Apr 2006 22:22:33 -0700
Subject: rpms/crystal-stacker-themes/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200604100522.k3A5MZFk012610@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/crystal-stacker-themes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12579/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module crystal-stacker-themes


--- 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 Apr 10 05:23:47 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun,  9 Apr 2006 22:23:47 -0700
Subject: rpms/crystal-stacker-themes import.log,1.1,1.2
Message-ID: <200604100523.k3A5NnYq012702@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/crystal-stacker-themes
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12667

Modified Files:
	import.log 
Log Message:
auto-import crystal-stacker-themes-1.0-1 on branch devel from crystal-stacker-themes-1.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/crystal-stacker-themes/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Apr 2006 05:22:32 -0000	1.1
+++ import.log	10 Apr 2006 05:23:47 -0000	1.2
@@ -0,0 +1 @@
+crystal-stacker-themes-1_0-1:HEAD:crystal-stacker-themes-1.0-1.src.rpm:1144646480



From fedora-extras-commits at redhat.com  Mon Apr 10 05:23:47 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun,  9 Apr 2006 22:23:47 -0700
Subject: rpms/crystal-stacker-themes/devel crystal-stacker-theme-license.txt,
	NONE, 1.1 crystal-stacker-themes.spec, NONE, 1.1 cs-readme.txt,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604100523.k3A5NnYq012707@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/crystal-stacker-themes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12667/devel

Modified Files:
	.cvsignore sources 
Added Files:
	crystal-stacker-theme-license.txt crystal-stacker-themes.spec 
	cs-readme.txt 
Log Message:
auto-import crystal-stacker-themes-1.0-1 on branch devel from crystal-stacker-themes-1.0-1.src.rpm


--- NEW FILE crystal-stacker-theme-license.txt ---
The theme files available for crystal stacker do not come with any license
of their own. Therefor I (Hans de Goede <j.w.r.degoede at hhs.nl>) have asked
the Author and Copyright holder (Todd Cope) of crystal stacker who are the
Authors and Copyright holders of the themes.

It turns out that he (Todd Cope) is the Author and Copyright holder of all
themes but 2 and he has given permission to distribute his themes under the
same license as crystal stacker.

For the other 2 themes Travis Cope is the Author and Copyright holder and he
too has given permission to distribute his themes under the    
same license as crystal stacker.

The crystal stacker license can be found at the top of crystal stackers
readme, included in this package as cs-readme.txt

Below is a copy of the mail exchange between me (Hans de Goede
<j.w.r.degoede at hhs.nl>), Todd Cope and Travis Cope including the permission
notices:

Return-Path: <todd at t3-i.com>
Received: from koko.hhs.nl ([145.52.2.16] verified)
  by hhs.nl (CommuniGate Pro SMTP 4.3.6)
  with ESMTP id 45919533 for j.w.r.degoede at hhs.nl; Fri, 24 Mar 2006 23:21:49 +0100
Received: from exim by koko.hhs.nl with spam-scanned (Exim 4.41)
	id 1FMufF-0004Va-EH
	for j.w.r.degoede at hhs.nl; Fri, 24 Mar 2006 23:21:49 +0100
X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on koko.hhs.nl
X-Spam-Level: 
X-Spam-Status: No, score=-1.6 required=5.0 tests=BAYES_00,NO_REAL_NAME 
	autolearn=no version=3.1.0
Received: from exim (helo=koko)
	by koko.hhs.nl with local-smtp (Exim 4.41)
	id 1FMufF-0004VX-AU
	for j.w.r.degoede at hhs.nl; Fri, 24 Mar 2006 23:21:49 +0100
Received: from [68.178.232.4] (port=54779 helo=smtpout12-02.prod.mesa1.secureserver.net)
	by koko.hhs.nl with smtp (Exim 4.41)
	id 1FMufE-0004VS-Ov
	for j.w.r.degoede at hhs.nl; Fri, 24 Mar 2006 23:21:49 +0100
Received: (qmail 19361 invoked from network); 24 Mar 2006 22:21:47 -0000
Received: from unknown (HELO gem-wbe03.mesa1.secureserver.net) (64.202.189.35)
  by smtpout12-02.prod.mesa1.secureserver.net with SMTP; 24 Mar 2006 22:21:47 -0000
Received: (qmail 24606 invoked by uid 99); 24 Mar 2006 22:21:47 -0000
Date: Fri, 24 Mar 2006 15:21:47 -0700
From: todd at t3-i.com
Subject: RE: Crsytal Stacker License Clarification needed
To: Hans de Goede <j.w.r.degoede at hhs.nl>
Message-ID: <20060324152147.c1bf2b7c2c1de069cff39b794cd5d62e.8dd40e2b74.wbe at email.email.secureserver.net>
MIME-Version: 1.0
Content-Type: TEXT/plain; CHARSET=US-ASCII
X-Originating-IP: 66.190.177.177
X-Anti-Virus: Kaspersky Anti-Virus for MailServers 5.5.2/RELEASE, bases: 24032006 #172764, status: clean

I will add a polling function to t3ssal. I need to check the code to
make sure there are no blocking situations that would cause the music
to stutter. I also need to fix t3ss_set_music_pattern to actually skip
to the correct pattern in the music as this is used by some of the
themes.

About the themes, all of them are made by me with the exception of "Food
Stacker" and "Matrix" which are made by Travis Cope. They fall under the
same license as the game and you can even include them in the Linux
package if you want. Speaking of license, I've been looking at those
licenses but I can't decide on one. I'm going to rewrite my license,
however, to clarify the issues you raised.

Thanks for all the work you've put in. I will e-mail you when I have
everything done. Also, if you haven't done so already, I'm going to add
you to the credits for the Linux port.

Thanks,

Todd Cope

> -------- Original Message --------
> Subject: Re: Crsytal Stacker License Clarification needed
> From: Hans de Goede <j.w.r.degoede at hhs.nl>
> Date: Wed, March 22, 2006 1:13 am
> To: todd at t3-i.com
> 

---

The rest of the mail has been deleted because of non relevance

---

Message-ID: <4435990F.4070400 at hhs.nl>
Date: Fri, 07 Apr 2006 00:41:19 +0200
From: Hans de Goede <j.w.r.degoede at hhs.nl>
User-Agent: Thunderbird 1.5 (X11/20060313)
MIME-Version: 1.0
To:  enden at t3-i.com
Subject: Crystal Stacker Themes
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit

Hi David,

First a short intro: I've been working lately with Todd on the Linux 
port of crystal stacker. I'm currently in the process of packaging it 
for inclusion into Fedora a well known linux distribution.

I would also like to create a package with all themes in it, including 
yours. Todd has sais that his themes are under the same license as CS 
itself and that that probably applied to your themes to, but that to be 
certain I should ask you, so here I am: What is the license under which 
your themes may be distributed?

Thanks & Regards,

Hans

---

Return-Path: <enden at t3-i.com>
Received: from koko.hhs.nl ([145.52.2.16] verified)
  by hhs.nl (CommuniGate Pro SMTP 4.3.6)
  with ESMTP id 46326822 for j.w.r.degoede at hhs.nl; Fri, 07 Apr 2006 23:01:53 +0200
Received: from exim by koko.hhs.nl with spam-scanned (Exim 4.41)
	id 1FRy5X-0002Pz-ID
	for j.w.r.degoede at hhs.nl; Fri, 07 Apr 2006 23:01:53 +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.41)
	id 1FRy5X-0002Pq-C7
	for j.w.r.degoede at hhs.nl; Fri, 07 Apr 2006 23:01:51 +0200
Received: from [68.178.232.10] (port=40819 helo=smtpout15-02.prod.mesa1.secureserver.net)
	by koko.hhs.nl with smtp (Exim 4.41)
	id 1FRy5W-0002PY-Rx
	for j.w.r.degoede at hhs.nl; Fri, 07 Apr 2006 23:01:51 +0200
Received: (qmail 30428 invoked from network); 7 Apr 2006 21:01:49 -0000
Received: from unknown (HELO webmail10.mesa1.secureserver.net) (64.202.189.47)
  by smtpout15-02.prod.mesa1.secureserver.net with SMTP; 7 Apr 2006 21:01:49 -0000
Received: (qmail 22348 invoked by uid 99); 7 Apr 2006 21:01:49 -0000
Date: Fri, 07 Apr 2006 14:01:49 -0700
From: Travis Cope <enden at t3-i.com>
Subject: RE: Crystal Stacker Themes
To: Hans de Goede <j.w.r.degoede at hhs.nl>
Message-ID: <20060407140149.e23bf89adcf3efedfb931dbdea8a905d.bdfe31ab1e.wbe at email.secureserver.net>
MIME-Version: 1.0
Content-Type: TEXT/plain; CHARSET=US-ASCII
User-Agent: Web-Based Email 4.0.19
X-Originating-IP: 65.114.125.11
X-Anti-Virus: Kaspersky Anti-Virus for MailServers 5.5.2/RELEASE, bases: 07042006 #175560, status: clean

The themes I made for Crystal Stacker are under the same license as the game.  I never really sat down and thought about the licensing, etc., I just kind of assumed it would use whatever Todd was using for Crystal Stacker.

Have a good day
-Travis



--- NEW FILE crystal-stacker-themes.spec ---
Name:           crystal-stacker-themes
Version:        1.0
Release:        1%{?dist}
Summary:        Themes for the Crystal Stacker game
Group:          Amusements/Games
License:        Freeware
URL:            http://www.t3-i.com/cstacker.htm
Source0:        http://ncdgames.t3-i.com/csdream.zip
Source1:        http://ncdgames.t3-i.com/csfood.zip
Source2:        http://ncdgames.t3-i.com/csgems.zip
Source3:        http://ncdgames.t3-i.com/cslcd.zip
Source4:        http://ncdgames.t3-i.com/csmatrix.zip
Source5:        http://ncdgames.t3-i.com/csoldcs.zip
Source6:        http://ncdgames.t3-i.com/csstone.zip
Source7:        crystal-stacker-theme-license.txt
Source8:        cs-readme.txt
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       crystal-stacker

%description
7 new / extra themes for the Crystal Stacker game.


%prep
%setup -q -c -a5 -a6
# don't pass these to %setup, their filenames must be forced to lowercase
unzip -qqLL %{SOURCE1}
unzip -qqLL %{SOURCE2}
unzip -qqLL %{SOURCE3}
unzip -qqLL %{SOURCE4}
# put these somewhere were %%doc can find them
cp -a %{SOURCE7} %{SOURCE8} .


%build
# nothing to build datafiles only


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/crystal-stacker
install -p -m 644 *.xm *.cth $RPM_BUILD_ROOT%{_datadir}/crystal-stacker


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc crystal-stacker-theme-license.txt cs-readme.txt
%{_datadir}/crystal-stacker/*.xm
%{_datadir}/crystal-stacker/*.cth


%changelog
* Sun Apr  9 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-1
- initial Fedora Extras package


--- NEW FILE cs-readme.txt ---
Crystal Stacker (c) 2006 NewCreature Design
-------------------------------------------

Crystal Stacker is freeware. This means you can pass copies around freely
provided you include this document in it's original form in your distribution.
Please see the "Contacting Us" section of this document if you need to contact
us for any reason.


Disclaimer
----------

NewCreature Design makes no guarantees regarding the Crystal Stacker software.
We are not responsible for damages caused by it, though the software is not
known to cause any problems. If you have trouble with the software, see the
"Contacting Us" section of this document.


Description
-----------

If you've played Columns then you know what Crystal Stacker is all about. Match
3 or more of the same color crystals either horizontally, vertically, or dia-
gonally to destroy them. For every 45 crystals you destroy, the level increases
and the crystals fall faster. The higher the level, the more points you are
awarded for destroying crystals.


System Requirements
-------------------

A 486 or higher PC.
VGA or better graphics card.


===============================================================================


How To Play
-----------

When the game starts, you have an empty board and a stack of crytals falling
from the top. Your job is to keep the board as empty as possible by creating
runs. A run is where the board contains 3 or more of the same color crystal
connected either horizontally, vertically, or diagonally. When you create runs
those crystals are destroyed and you play on. Once you run out of room for the
falling stack of crystals you top out and the game ends.


Combos
------

A combo occurs when crystals are destroyed and more runs are created as a
result. When a combo occurs a message will scroll in the message bar indicating
the size of the combo. The larger the combo, the more points you are awarded.


Wild Cards
----------

A wild card is a crystal that will match any color. In tight situations where
you don't have time to think, these can be very valuable.

You can distinguish a wild card from the other crystals because its color
changes continually.


Bombs
-----

A bomb is a special stack of crystals that specializes in removing a certain
color from the board. All crystals the same color as the crystal the bomb lands
on will be removed from the board. Landing on a wild card will cause all
crystals to be removed. If the bomb doesn't land on a crystal, it will become
randomly colored crystals.

Bombs have the appearance of a bright flashing stack of crystals.


===============================================================================


Game Modes
----------

Crystal Stacker offers a number of game modes for 1 or 2 players, each with a
different objective. 1 Player mode scores are stored in a table which can be
viewed from the main menu.

2 player modes can either be played in normal or battle mode. These modes are
essentially the same, but battle mode allows attacks, which add indestructible
blocks to the opposing players board. In order to attack the other player you
have to destroy at least 7 crystals at once. An attack can add up to 3 rows of
solid blocks at a time.


1 Player - Classic
------------------

This mode plays like classic Columns. Just try to get the high score.


1 Player - Destroyer
--------------------

You must destroy a set number of crystals to try to beat the best time.


1 Player - Frenzy
-----------------

This mode is like classic mode, except you have a time limit.


2 Player - Top Score
--------------------

Play until both players top out. The player with the highest score at the end
wins.


2 Player - Last Out
-------------------

The last surviving player wins.


2 Player - Destroyer
--------------------

The first player to destroy the specified number of crystals wins.


===============================================================================


Themes
------

Themes are used to give a new look to the game. They can be loaded from the
options menu. New themes can be downloaded from our web site or you can create
new themes with the editor.


Command Line Arguments
----------------------

-v             Display the current version number

-nosound       Disable sound support


Contacting Us
-------------

If you have general questions about our programs or anything else you can
contact us via e-mail. Please report any bugs you find in our software as well.
Visit our web sites for the latest updates and releases.


E-mail Address
--------------

todd at t3-i.com


Web Address
-----------

http://www.t3-i.com

Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/crystal-stacker-themes/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Apr 2006 05:22:33 -0000	1.1
+++ .cvsignore	10 Apr 2006 05:23:47 -0000	1.2
@@ -0,0 +1,7 @@
+csdream.zip
+csfood.zip
+csgems.zip
+cslcd.zip
+csmatrix.zip
+csoldcs.zip
+csstone.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/crystal-stacker-themes/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Apr 2006 05:22:33 -0000	1.1
+++ sources	10 Apr 2006 05:23:47 -0000	1.2
@@ -0,0 +1,7 @@
+de59b772b4683cd09b2302c1fa638b46  csdream.zip
+5273a28db94d61eedfa3c0bf65c2f107  csfood.zip
+a7534dec94cd5d141c77df4ea5a6d19d  csgems.zip
+f84b75c649eb1c2c88cc90fa2d4b1c99  cslcd.zip
+bac5ea214401a9dcbb1ffb8ef390702c  csmatrix.zip
+27fdacb7b28336547b1c7eee5fcdc06a  csoldcs.zip
+9ea8e39a439c927f7bb29046a6639ba2  csstone.zip



From fedora-extras-commits at redhat.com  Mon Apr 10 05:28:13 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun,  9 Apr 2006 22:28:13 -0700
Subject: owners owners.list,1.821,1.822
Message-ID: <200604100528.k3A5SFK9012799@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	owners.list 
Log Message:
add crystal-stacker-themes


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.821
retrieving revision 1.822
diff -u -r1.821 -r1.822
--- owners.list	10 Apr 2006 03:25:53 -0000	1.821
+++ owners.list	10 Apr 2006 05:28:13 -0000	1.822
@@ -156,6 +156,7 @@
 Fedora Extras|crack|Password cracker|Christian.Iseli at licr.org|extras-qa at fedoraproject.org|
 Fedora Extras|cryptplug|Cryptography plugin for mutt & kmail|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|crystal-stacker|Falling blocks, match 3 or more of the same color crystals|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
+Fedora Extras|crystal-stacker-themes|Themes for the Crystal Stacker game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|csmash|3D tabletennis game|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|ctrlproxy|IRC server with multiserver support|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|cvs2cl|Utility which generates ChangeLogs from CVS working copies|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Apr 10 06:43:36 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun,  9 Apr 2006 23:43:36 -0700
Subject: owners owners.list,1.822,1.823
Message-ID: <200604100643.k3A6hcpi015155@cvs-int.fedora.redhat.com>

Author: mschwendt

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

Modified Files:
	owners.list 
Log Message:
fix perl-SQL-Abstract-Limit entry


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.822
retrieving revision 1.823
diff -u -r1.822 -r1.823
--- owners.list	10 Apr 2006 05:28:13 -0000	1.822
+++ owners.list	10 Apr 2006 06:43:36 -0000	1.823
@@ -1054,7 +1054,7 @@
 Fedora Extras|perl-Spoon|Spoon Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 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|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.comPortable LIMIT Emulation
+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-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-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



From fedora-extras-commits at redhat.com  Mon Apr 10 08:10:30 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon, 10 Apr 2006 01:10:30 -0700
Subject: fedora-security/audit fc4,1.193,1.194 fc5,1.106,1.107
Message-ID: <200604100810.k3A8AUpn019414@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19394

Modified Files:
	fc4 fc5 
Log Message:
Bring up to date with weekend



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- fc4	7 Apr 2006 14:23:46 -0000	1.193
+++ fc4	10 Apr 2006 08:10:27 -0000	1.194
@@ -1,5 +1,5 @@
-Up to date CVE as of CVE email 20060504
-Up to date FC4 as of 20060504
+Up to date CVE as of CVE email 20060509
+Up to date FC4 as of 20060509
 
 ** are items that need attention
 
@@ -23,6 +23,7 @@
 CVE-2006-1066 version (kernel, fixed 2.6.16) [since FEDORA-2006-245]
 CVE-2006-1061 version (curl, 7.15.0 - 7.15.2 only)
 CVE-2006-1059 version (samba)
+CVE-2006-1058 VULNERABLE (busybox) bz#187386
 CVE-2006-1052 version (kernel, fixed 2.6.16) patch-2.6.16-rc6 [since FEDORA-2006-245]
 CVE-2006-1045 VULNERABLE (thunderbird)
 CVE-2006-1015 ignore (php) safe mode isn't safe
@@ -765,6 +766,7 @@
 CVE-2005-0004 version (mysql, fixed 4.1.10)
 CVE-2005-0003 version (kernel, fixed 2.6.10)
 CVE-2005-0001 version (kernel, fixed 2.6.10)
+CVE-2004-2655 version (xscreensaver)
 CVE-2004-2654 version (squid, fixed 2.6STABLE6)
 CVE-2004-2607 version (kernel, fixed 2.6.5)
 CVE-2004-2589 version (gaim, fixed 0.82)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- fc5	7 Apr 2006 14:23:46 -0000	1.106
+++ fc5	10 Apr 2006 08:10:27 -0000	1.107
@@ -1,5 +1,5 @@
-Up to date CVE as of CVE email 20060405
-Up to date FC5 as of 20060405
+Up to date CVE as of CVE email 20060409
+Up to date FC5 as of 20060409
 
 ** are items that need attention
 
@@ -24,6 +24,7 @@
 CVE-2006-1066 version (kernel, fixed 2.6.16) [since FEDORA-2006-233]
 CVE-2006-1061 backport (curl, fixed 7.15.3) [since FEDORA-2006-189]
 CVE-2006-1059 version (samba, fixed 3.0.22 at least) bz#187170 [since FEDORA-2006-259]
+CVE-2006-1058 VULNERABLE (busybox) bz#187386
 CVE-2006-1052 version (kernel, fixed 2.6.16) patch-2.6.16-rc6 [since FEDORA-2006-233]
 CVE-2006-1045 VULNERABLE (thunderbird)
 CVE-2006-1015 ignore (php) safe mode isn't safe
@@ -764,6 +765,7 @@
 CVE-2005-0004 version (mysql, fixed 4.1.10)
 CVE-2005-0003 version (kernel, fixed 2.6.10)
 CVE-2005-0001 version (kernel, fixed 2.6.10)
+CVE-2004-2655 version (xscreensaver)
 CVE-2004-2654 version (squid, fixed 2.6STABLE6)
 CVE-2004-2607 version (kernel, fixed 2.6.5)
 CVE-2004-2589 version (gaim, fixed 0.82)



From fedora-extras-commits at redhat.com  Mon Apr 10 09:07:06 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 10 Apr 2006 02:07:06 -0700
Subject: rpms/adime/devel adime.spec,1.1,1.2
Message-ID: <200604100907.k3A978iS021559@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Modified Files:
	adime.spec 
Log Message:
move install-info reqs to devel subpackage


Index: adime.spec
===================================================================
RCS file: /cvs/extras/rpms/adime/devel/adime.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- adime.spec	13 Mar 2006 20:17:07 -0000	1.1
+++ adime.spec	10 Apr 2006 09:07:06 -0000	1.2
@@ -2,7 +2,6 @@
 Version:        2.2.1
 Release:        3%{?dist}
 Summary:        Allegro Dialogs Made Easy
-
 Group:          System Environment/Libraries
 License:        zlib License
 URL:            http://adime.sourceforge.net/
@@ -10,8 +9,6 @@
 Patch0:         adime-2.2.1-so-fixes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  allegro-devel texinfo
-Requires(post): /sbin/install-info
-Requires(preun): /sbin/install-info
 
 %description
 Adime is a portable add-on library for Allegro with functions for generating
@@ -25,6 +22,8 @@
 Group: Development/Libraries
 Requires: %{name} = %{version}
 Requires: allegro-devel
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
 
 %description devel
 The developmental files that must be installed in order to compile



From fedora-extras-commits at redhat.com  Mon Apr 10 10:35:13 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Mon, 10 Apr 2006 03:35:13 -0700
Subject: owners owners.list,1.823,1.824
Message-ID: <200604101035.k3AAZFVm023835@cvs-int.fedora.redhat.com>

Author: pfj

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

Modified Files:
	owners.list 
Log Message:

 	owners.list 



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.823
retrieving revision 1.824
diff -u -r1.823 -r1.824
--- owners.list	10 Apr 2006 06:43:36 -0000	1.823
+++ owners.list	10 Apr 2006 10:35:13 -0000	1.824
@@ -284,6 +284,7 @@
 Fedora Extras|fuse|File System in Userspace|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
 Fedora Extras|fuse-encfs|Encrypted pass-thru filesystem in userspace|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
 Fedora Extras|fuse-sshfs|FUSE-Filesystem to access remote filesystems via SSH|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
+Fedora Extras|fuse-emulator|A Sinclair ZX Spectrum emulator|paul at all-the-johnsons.co.uk|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|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
@@ -470,6 +471,7 @@
 Fedora Extras|ifplugd|Detect and take action when an ethernet cable is unplugged|aaron.bennett at olin.edu|extras-qa at fedoraproject.org|
 Fedora Extras|iftop|Command line tool that displays bandwidth usage on an interface|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|iiimf-le-simplehangul|Romanized Korean Hangul language engine for IIIMF|wtogami at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|ikvm|A Java compatibility layer for Mono|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|imlib2|A graphic library for file loading, saving, rendering, and manipulation|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|inadyn|A Dynamic DNS Client|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|inkscape|A vector-based drawing program using SVG|denis at poolshark.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Apr 10 10:40:41 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Mon, 10 Apr 2006 03:40:41 -0700
Subject: rpms/gdeskcal import.log,1.4,1.5
Message-ID: <200604101040.k3AAehMZ023892@cvs-int.fedora.redhat.com>

Author: pfj

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

Modified Files:
	import.log 
Log Message:
auto-import gdeskcal-0.57.1-5 on branch devel from gdeskcal-0.57.1-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	8 Nov 2004 04:22:59 -0000	1.4
+++ import.log	10 Apr 2006 10:40:41 -0000	1.5
@@ -1,3 +1,4 @@
 gdeskcal-0_55-0_fdr_1_rh90:HEAD:gdeskcal-0.55-0.fdr.1.rh90.src.rpm:1099887757
 gdeskcal-0_57_1-0_fdr_2_1:HEAD:gdeskcal-0.57.1-0.fdr.2.1.src.rpm:1099887763
 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



From fedora-extras-commits at redhat.com  Mon Apr 10 10:40:41 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Mon, 10 Apr 2006 03:40:41 -0700
Subject: rpms/gdeskcal/devel gdeskcal.spec,1.8,1.9
Message-ID: <200604101040.k3AAehnN023896@cvs-int.fedora.redhat.com>

Author: pfj

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

Modified Files:
	gdeskcal.spec 
Log Message:
auto-import gdeskcal-0.57.1-5 on branch devel from gdeskcal-0.57.1-5.src.rpm


Index: gdeskcal.spec
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/devel/gdeskcal.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gdeskcal.spec	2 Mar 2006 21:29:10 -0000	1.8
+++ gdeskcal.spec	10 Apr 2006 10:40:41 -0000	1.9
@@ -1,9 +1,7 @@
 Name:           gdeskcal
 Version:        0.57.1
-Release:        4
-
+Release:        5%{?dist}
 Summary:        Eye-candy calendar for your desktop
-
 Group:          User Interface/Desktops
 License:        GPL
 URL:            http://www.pycage.de/software_gdeskcal.html
@@ -26,22 +24,13 @@
 
 
 %prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
-
 %setup -q -n gDeskCal-%{version}
 
-
 %build
 
 
 %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}/
@@ -72,6 +61,10 @@
 
 
 %changelog
+* Fri Apr 7 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.5.7.1-5
+- rebuilt
+- minor spec changes
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 



From fedora-extras-commits at redhat.com  Mon Apr 10 10:42:39 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Mon, 10 Apr 2006 03:42:39 -0700
Subject: rpms/gdeskcal import.log,1.5,1.6
Message-ID: <200604101042.k3AAgfN8023990@cvs-int.fedora.redhat.com>

Author: pfj

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

Modified Files:
	import.log 
Log Message:
auto-import gdeskcal-0.57.1-5 on branch FC-5 from gdeskcal-0.57.1-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	10 Apr 2006 10:40:41 -0000	1.5
+++ import.log	10 Apr 2006 10:42:39 -0000	1.6
@@ -2,3 +2,4 @@
 gdeskcal-0_57_1-0_fdr_2_1:HEAD:gdeskcal-0.57.1-0.fdr.2.1.src.rpm:1099887763
 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



From fedora-extras-commits at redhat.com  Mon Apr 10 10:42:40 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Mon, 10 Apr 2006 03:42:40 -0700
Subject: rpms/gdeskcal/FC-5 gdeskcal.spec,1.8,1.9
Message-ID: <200604101042.k3AAggm3023994@cvs-int.fedora.redhat.com>

Author: pfj

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

Modified Files:
	gdeskcal.spec 
Log Message:
auto-import gdeskcal-0.57.1-5 on branch FC-5 from gdeskcal-0.57.1-5.src.rpm


Index: gdeskcal.spec
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/FC-5/gdeskcal.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gdeskcal.spec	2 Mar 2006 21:29:10 -0000	1.8
+++ gdeskcal.spec	10 Apr 2006 10:42:40 -0000	1.9
@@ -1,9 +1,7 @@
 Name:           gdeskcal
 Version:        0.57.1
-Release:        4
-
+Release:        5%{?dist}
 Summary:        Eye-candy calendar for your desktop
-
 Group:          User Interface/Desktops
 License:        GPL
 URL:            http://www.pycage.de/software_gdeskcal.html
@@ -26,22 +24,13 @@
 
 
 %prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
-
 %setup -q -n gDeskCal-%{version}
 
-
 %build
 
 
 %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}/
@@ -72,6 +61,10 @@
 
 
 %changelog
+* Fri Apr 7 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.5.7.1-5
+- rebuilt
+- minor spec changes
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 



From fedora-extras-commits at redhat.com  Mon Apr 10 10:45:11 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Mon, 10 Apr 2006 03:45:11 -0700
Subject: owners owners.list,1.824,1.825
Message-ID: <200604101045.k3AAjEMt024153@cvs-int.fedora.redhat.com>

Author: pfj

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

Modified Files:
	owners.list 
Log Message:

	owners.list 



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.824
retrieving revision 1.825
diff -u -r1.824 -r1.825
--- owners.list	10 Apr 2006 10:35:13 -0000	1.824
+++ owners.list	10 Apr 2006 10:45:11 -0000	1.825
@@ -306,7 +306,7 @@
 Fedora Extras|gcombust|Powerful GTK+ front-end for mkisofs and cdrecord|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 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|gdeskcal|Eye-candy calendar for your desktop.|extras-orphan at fedoraproject.org|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|luya256 at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdl|GNU Data Language|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdome2|DOM level 2 library for accessing XML files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Apr 10 11:18:35 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Mon, 10 Apr 2006 04:18:35 -0700
Subject: rpms/gonvert/FC-5 gonvert.glade, NONE, 1.1 .cvsignore, 1.5,
	1.6 gonvert.spec, 1.7, 1.8 sources, 1.5, 1.6
Message-ID: <200604101119.k3ABJ8cS026711@cvs-int.fedora.redhat.com>

Author: pfj

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

Modified Files:
	.cvsignore gonvert.spec sources 
Added Files:
	gonvert.glade 
Log Message:
auto-import gonvert-0.2.15-1 on branch FC-5 from gonvert-0.2.15-1.src.rpm


--- NEW FILE gonvert.glade ---
<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">

<glade-interface>

<widget class="GtkWindow" id="app1">
  <property name="visible">True</property>
  <property name="title" translatable="yes">window1</property>
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
  <property name="window_position">GTK_WIN_POS_NONE</property>
  <property name="modal">False</property>
  <property name="resizable">True</property>
  <property name="destroy_with_parent">False</property>
  <property name="decorated">True</property>
  <property name="skip_taskbar_hint">False</property>
  <property name="skip_pager_hint">False</property>
  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
  <signal name="destroy" handler="on_app1_destroy"/>
  <signal name="size_allocate" handler="on_app1_size_allocate" last_modification_time="Sat, 03 Jul 2004 00:43:38 GMT"/>

  <child>
    <widget class="GtkVBox" id="vbox2">
      <property name="visible">True</property>
      <property name="homogeneous">False</property>
      <property name="spacing">0</property>

      <child>
	<widget class="GtkMenuBar" id="menubar1">
	  <property name="visible">True</property>

	  <child>
	    <widget class="GtkMenuItem" id="file1">
	      <property name="visible">True</property>
	      <property name="label" translatable="yes">_File</property>
	      <property name="use_underline">True</property>

	      <child>
		<widget class="GtkMenu" id="file1_menu">

		  <child>
		    <widget class="GtkMenuItem" id="exit1">
		      <property name="visible">True</property>
		      <property name="label" translatable="yes">_Exit</property>
		      <property name="use_underline">True</property>
		      <signal name="activate" handler="on_exit1_activate"/>
		      <accelerator key="q" modifiers="GDK_CONTROL_MASK" signal="activate"/>
		    </widget>
		  </child>
		</widget>
	      </child>
	    </widget>
	  </child>

	  <child>
	    <widget class="GtkMenuItem" id="tools1">
	      <property name="visible">True</property>
	      <property name="label" translatable="yes">_Tools</property>
	      <property name="use_underline">True</property>

	      <child>
		<widget class="GtkMenu" id="tools1_menu">

		  <child>
		    <widget class="GtkCheckMenuItem" id="edit_shortlist1">
		      <property name="visible">True</property>
		      <property name="tooltip" translatable="yes">Show shortlist selections</property>
		      <property name="label" translatable="yes">_Edit shortlist</property>
		      <property name="use_underline">True</property>
		      <property name="active">False</property>
		      <signal name="activate" handler="on_edit_shortlist1_activate" last_modification_time="Fri, 27 May 2005 01:07:57 GMT"/>
		    </widget>
		  </child>

		  <child>
		    <widget class="GtkMenuItem" id="clear_selections1">
		      <property name="visible">True</property>
		      <property name="tooltip" translatable="yes">Clear saved selections</property>
		      <property name="label" translatable="yes">_Clear selections</property>
		      <property name="use_underline">True</property>
		      <signal name="activate" handler="on_clear_selections1_activate" last_modification_time="Sun, 20 Jun 2004 15:41:04 GMT"/>
		    </widget>
		  </child>

		  <child>
		    <widget class="GtkMenuItem" id="write_units1">
		      <property name="visible">True</property>
		      <property name="tooltip" translatable="yes">Writes all categories and units to STDOUT</property>
		      <property name="label" translatable="yes">_Write Units</property>
		      <property name="use_underline">True</property>
		      <signal name="activate" handler="on_write_units1_activate"/>
		    </widget>
		  </child>
		</widget>
	      </child>
	    </widget>
	  </child>

	  <child>
	    <widget class="GtkMenuItem" id="help1">
	      <property name="visible">True</property>
	      <property name="label" translatable="yes">_Help</property>
	      <property name="use_underline">True</property>

	      <child>
		<widget class="GtkMenu" id="help1_menu">

		  <child>
		    <widget class="GtkMenuItem" id="about1">
		      <property name="visible">True</property>
		      <property name="label" translatable="yes">_About</property>
		      <property name="use_underline">True</property>
		      <signal name="activate" handler="on_about1_activate"/>
		    </widget>
		  </child>
		</widget>
	      </child>
	    </widget>
	  </child>
	</widget>
	<packing>
	  <property name="padding">0</property>
	  <property name="expand">False</property>
	  <property name="fill">False</property>
	</packing>
      </child>

      <child>
	<widget class="GtkHPaned" id="hpaned1">
	  <property name="visible">True</property>
	  <property name="can_focus">True</property>
	  <property name="position">0</property>

	  <child>
	    <widget class="GtkScrolledWindow" id="scrolledwindow4">
	      <property name="width_request">223</property>
	      <property name="visible">True</property>
	      <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
	      <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
	      <property name="shadow_type">GTK_SHADOW_IN</property>
	      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>

	      <child>
		<widget class="GtkTreeView" id="cat_clist">
		  <property name="width_request">200</property>
		  <property name="visible">True</property>
		  <property name="can_focus">True</property>
		  <property name="headers_visible">False</property>
		  <property name="rules_hint">False</property>
		  <property name="reorderable">False</property>
		  <property name="enable_search">True</property>
		  <signal name="cursor_changed" handler="on_cat_clist_select_row" last_modification_time="Wed, 19 Feb 2003 00:08:35 GMT"/>
		</widget>
	      </child>
	    </widget>
	    <packing>
	      <property name="shrink">False</property>
	      <property name="resize">False</property>
	    </packing>
	  </child>

	  <child>
	    <widget class="GtkVBox" id="vbox1">
	      <property name="visible">True</property>
	      <property name="homogeneous">False</property>
	      <property name="spacing">0</property>

	      <child>
		<widget class="GtkHBox" id="hbox1">
		  <property name="visible">True</property>
		  <property name="homogeneous">False</property>
		  <property name="spacing">0</property>

		  <child>
		    <widget class="GtkEntry" id="entry1">
		      <property name="visible">True</property>
		      <property name="editable">False</property>
		      <property name="visibility">True</property>
		      <property name="max_length">0</property>
		      <property name="text" translatable="yes"></property>
		      <property name="has_frame">True</property>
		      <property name="invisible_char">*</property>
		      <property name="activates_default">False</property>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">True</property>
		      <property name="fill">True</property>
		    </packing>
		  </child>

		  <child>
		    <widget class="GtkEntry" id="entry2">
		      <property name="visible">True</property>
		      <property name="can_focus">True</property>
		      <property name="editable">True</property>
		      <property name="visibility">True</property>
		      <property name="max_length">0</property>
		      <property name="text" translatable="yes"></property>
		      <property name="has_frame">True</property>
		      <property name="invisible_char">*</property>
		      <property name="activates_default">False</property>
		      <signal name="changed" handler="on_entry2_changed"/>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">True</property>
		      <property name="fill">True</property>
		    </packing>
		  </child>

		  <child>
		    <widget class="GtkLabel" id="label1">
		      <property name="width_request">60</property>
		      <property name="visible">True</property>
		      <property name="label" translatable="yes"></property>
		      <property name="use_underline">False</property>
		      <property name="use_markup">False</property>
		      <property name="justify">GTK_JUSTIFY_LEFT</property>
		      <property name="wrap">False</property>
		      <property name="selectable">False</property>
		      <property name="xalign">0.10000000149</property>
		      <property name="yalign">0.5</property>
		      <property name="xpad">0</property>
		      <property name="ypad">0</property>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">False</property>
		      <property name="fill">False</property>
		    </packing>
		  </child>
		</widget>
		<packing>
		  <property name="padding">0</property>
		  <property name="expand">False</property>
		  <property name="fill">True</property>
		</packing>
	      </child>

	      <child>
		<widget class="GtkHBox" id="hbox2">
		  <property name="visible">True</property>
		  <property name="homogeneous">False</property>
		  <property name="spacing">0</property>

		  <child>
		    <widget class="GtkEntry" id="entry3">
		      <property name="visible">True</property>
		      <property name="editable">False</property>
		      <property name="visibility">True</property>
		      <property name="max_length">0</property>
		      <property name="text" translatable="yes"></property>
		      <property name="has_frame">True</property>
		      <property name="invisible_char">*</property>
		      <property name="activates_default">False</property>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">True</property>
		      <property name="fill">True</property>
		    </packing>
		  </child>

		  <child>
		    <widget class="GtkEntry" id="entry4">
		      <property name="visible">True</property>
		      <property name="can_focus">True</property>
		      <property name="editable">True</property>
		      <property name="visibility">True</property>
		      <property name="max_length">0</property>
		      <property name="text" translatable="yes"></property>
		      <property name="has_frame">True</property>
		      <property name="invisible_char">*</property>
		      <property name="activates_default">False</property>
		      <signal name="changed" handler="on_entry4_changed"/>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">True</property>
		      <property name="fill">True</property>
		    </packing>
		  </child>

		  <child>
		    <widget class="GtkLabel" id="label2">
		      <property name="width_request">60</property>
		      <property name="visible">True</property>
		      <property name="label" translatable="yes"></property>
		      <property name="use_underline">False</property>
		      <property name="use_markup">False</property>
		      <property name="justify">GTK_JUSTIFY_LEFT</property>
		      <property name="wrap">False</property>
		      <property name="selectable">False</property>
		      <property name="xalign">0.10000000149</property>
		      <property name="yalign">0.5</property>
		      <property name="xpad">0</property>
		      <property name="ypad">0</property>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">False</property>
		      <property name="fill">False</property>
		    </packing>
		  </child>
		</widget>
		<packing>
		  <property name="padding">0</property>
		  <property name="expand">False</property>
		  <property name="fill">True</property>
		</packing>
	      </child>

	      <child>
		<widget class="GtkVPaned" id="vpaned1">
		  <property name="visible">True</property>

		  <child>
		    <widget class="GtkScrolledWindow" id="scrolledwindow1">
		      <property name="height_request">300</property>
		      <property name="visible">True</property>
		      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
		      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
		      <property name="shadow_type">GTK_SHADOW_IN</property>
		      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>

		      <child>
			<widget class="GtkTreeView" id="clist1">
			  <property name="visible">True</property>
			  <property name="can_focus">True</property>
			  <property name="headers_visible">True</property>
			  <property name="rules_hint">False</property>
			  <property name="reorderable">False</property>
			  <property name="enable_search">True</property>
			  <signal name="button_release_event" handler="on_clist1_button_released" last_modification_time="Thu, 24 Jun 2004 01:11:55 GMT"/>
			  <signal name="cursor_changed" handler="on_clist1_cursor_changed" last_modification_time="Thu, 24 Jun 2004 01:11:42 GMT"/>
			</widget>
		      </child>
		    </widget>
		    <packing>
		      <property name="shrink">False</property>
		      <property name="resize">True</property>
		    </packing>
		  </child>

		  <child>
		    <widget class="GtkScrolledWindow" id="scrolledwindow3">
		      <property name="visible">True</property>
		      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
		      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
		      <property name="shadow_type">GTK_SHADOW_IN</property>
		      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>

		      <child>
			<widget class="GtkTextView" id="text1">
			  <property name="visible">True</property>
			  <property name="can_focus">True</property>
			  <property name="editable">False</property>
			  <property name="overwrite">False</property>
			  <property name="accepts_tab">True</property>
			  <property name="justification">GTK_JUSTIFY_LEFT</property>
			  <property name="wrap_mode">GTK_WRAP_WORD</property>
			  <property name="cursor_visible">True</property>
			  <property name="pixels_above_lines">0</property>
			  <property name="pixels_below_lines">0</property>
			  <property name="pixels_inside_wrap">0</property>
			  <property name="left_margin">0</property>
			  <property name="right_margin">0</property>
			  <property name="indent">0</property>
			  <property name="text" translatable="yes"></property>
			</widget>
		      </child>
		    </widget>
		    <packing>
		      <property name="shrink">False</property>
		      <property name="resize">False</property>
		    </packing>
		  </child>
		</widget>
		<packing>
		  <property name="padding">0</property>
		  <property name="expand">True</property>
		  <property name="fill">True</property>
		</packing>
	      </child>

	      <child>
		<widget class="GtkHBox" id="hbox3">
		  <property name="visible">True</property>
		  <property name="homogeneous">False</property>
		  <property name="spacing">0</property>

		  <child>
		    <widget class="GtkEntry" id="find_entry">
		      <property name="visible">True</property>
		      <property name="tooltip" translatable="yes">Enter unit to find here</property>
		      <property name="can_focus">True</property>
		      <property name="editable">True</property>
		      <property name="visibility">True</property>
		      <property name="max_length">0</property>
		      <property name="text" translatable="yes"></property>
		      <property name="has_frame">True</property>
		      <property name="invisible_char">*</property>
		      <property name="activates_default">False</property>
		      <signal name="key_press_event" handler="on_find_entry_key_press_event"/>
		      <signal name="changed" handler="on_find_entry_changed"/>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">False</property>
		      <property name="fill">True</property>
		    </packing>
		  </child>

		  <child>
		    <widget class="GtkButton" id="find_button">
		      <property name="visible">True</property>
		      <property name="can_focus">True</property>
		      <property name="label" translatable="yes">Find</property>
		      <property name="use_underline">True</property>
		      <property name="relief">GTK_RELIEF_NORMAL</property>
		      <property name="focus_on_click">True</property>
		      <signal name="clicked" handler="on_find_button_clicked"/>
		      <accelerator key="F6" modifiers="0" signal="clicked"/>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">False</property>
		      <property name="fill">False</property>
		    </packing>
		  </child>

		  <child>
		    <widget class="GtkLabel" id="find_label">
		      <property name="visible">True</property>
		      <property name="label" translatable="yes">Press to find text.</property>
		      <property name="use_underline">False</property>
		      <property name="use_markup">False</property>
		      <property name="justify">GTK_JUSTIFY_CENTER</property>
		      <property name="wrap">False</property>
		      <property name="selectable">False</property>
		      <property name="xalign">0.5</property>
		      <property name="yalign">0.5</property>
		      <property name="xpad">0</property>
		      <property name="ypad">0</property>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">False</property>
		      <property name="fill">False</property>
		    </packing>
		  </child>

		  <child>
		    <widget class="GtkVSeparator" id="vseparator1">
		      <property name="visible">True</property>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">False</property>
		      <property name="fill">False</property>
		    </packing>
		  </child>

		  <child>
		    <widget class="GtkCheckButton" id="shortlistcheck">
		      <property name="visible">True</property>
		      <property name="can_focus">True</property>
		      <property name="label" translatable="yes">Shortlist</property>
		      <property name="use_underline">True</property>
		      <property name="relief">GTK_RELIEF_NORMAL</property>
		      <property name="focus_on_click">True</property>
		      <property name="active">False</property>
		      <property name="inconsistent">False</property>
		      <property name="draw_indicator">True</property>
		      <signal name="toggled" handler="on_shortlistcheck_toggled" last_modification_time="Wed, 18 May 2005 23:00:18 GMT"/>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">False</property>
		      <property name="fill">False</property>
		      <property name="pack_type">GTK_PACK_END</property>
		    </packing>
		  </child>
		</widget>
		<packing>
		  <property name="padding">0</property>
		  <property name="expand">False</property>
		  <property name="fill">False</property>
		</packing>
	      </child>
	    </widget>
	    <packing>
	      <property name="shrink">False</property>
	      <property name="resize">True</property>
	    </packing>
	  </child>
	</widget>
	<packing>
	  <property name="padding">0</property>
	  <property name="expand">True</property>
	  <property name="fill">True</property>
	</packing>
      </child>
    </widget>
  </child>
</widget>

<widget class="GtkDialog" id="about_box">
  <property name="title" translatable="yes">About</property>
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
  <property name="window_position">GTK_WIN_POS_NONE</property>
  <property name="modal">False</property>
  <property name="resizable">False</property>
  <property name="destroy_with_parent">False</property>
  <property name="decorated">True</property>
  <property name="skip_taskbar_hint">False</property>
  <property name="skip_pager_hint">False</property>
  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
  <property name="has_separator">True</property>
  <signal name="delete_event" handler="on_about_close_clicked" last_modification_time="Mon, 28 Jun 2004 23:42:53 GMT"/>

  <child internal-child="vbox">
    <widget class="GtkVBox" id="dialog-vbox1">
      <property name="visible">True</property>
      <property name="homogeneous">False</property>
      <property name="spacing">0</property>

      <child internal-child="action_area">
	<widget class="GtkHButtonBox" id="dialog-action_area1">
	  <property name="visible">True</property>
	  <property name="layout_style">GTK_BUTTONBOX_END</property>

	  <child>
	    <widget class="GtkButton" id="about_close">
	      <property name="visible">True</property>
	      <property name="can_default">True</property>
	      <property name="can_focus">True</property>
	      <property name="label">gtk-close</property>
	      <property name="use_stock">True</property>
	      <property name="relief">GTK_RELIEF_NORMAL</property>
	      <property name="focus_on_click">True</property>
	      <property name="response_id">-7</property>
	      <signal name="clicked" handler="on_about_close_clicked" last_modification_time="Sat, 22 Feb 2003 14:35:51 GMT"/>
	      <accelerator key="Escape" modifiers="0" signal="clicked"/>
	    </widget>
	  </child>
	</widget>
	<packing>
	  <property name="padding">0</property>
	  <property name="expand">False</property>
	  <property name="fill">True</property>
	  <property name="pack_type">GTK_PACK_END</property>
	</packing>
      </child>

      <child>
	<widget class="GtkImage" id="about_image">
	  <property name="visible">True</property>
	  <property name="xalign">0.5</property>
	  <property name="yalign">0.5</property>
	  <property name="xpad">0</property>
	  <property name="ypad">0</property>
	</widget>
	<packing>
	  <property name="padding">0</property>
	  <property name="expand">True</property>
	  <property name="fill">True</property>
	</packing>
      </child>

      <child>
	<widget class="GtkTable" id="table1">
	  <property name="visible">True</property>
	  <property name="n_rows">3</property>
	  <property name="n_columns">2</property>
	  <property name="homogeneous">False</property>
	  <property name="row_spacing">0</property>
	  <property name="column_spacing">0</property>

	  <child>
	    <widget class="GtkLabel" id="label7">
	      <property name="visible">True</property>
	      <property name="label" translatable="yes">Version:</property>
	      <property name="use_underline">False</property>
	      <property name="use_markup">False</property>
	      <property name="justify">GTK_JUSTIFY_LEFT</property>
	      <property name="wrap">False</property>
	      <property name="selectable">False</property>
	      <property name="xalign">1</property>
	      <property name="yalign">0.5</property>
	      <property name="xpad">0</property>
	      <property name="ypad">0</property>
	    </widget>
	    <packing>
	      <property name="left_attach">0</property>
	      <property name="right_attach">1</property>
	      <property name="top_attach">0</property>
	      <property name="bottom_attach">1</property>
	      <property name="x_options">fill</property>
	      <property name="y_options"></property>
	    </packing>
	  </child>

	  <child>
	    <widget class="GtkEntry" id="versionlabel">
	      <property name="visible">True</property>
	      <property name="can_focus">True</property>
	      <property name="editable">False</property>
	      <property name="visibility">True</property>
	      <property name="max_length">0</property>
	      <property name="text" translatable="yes">x.x.x</property>
	      <property name="has_frame">True</property>
	      <property name="invisible_char">*</property>
	      <property name="activates_default">False</property>
	    </widget>
	    <packing>
	      <property name="left_attach">1</property>
	      <property name="right_attach">2</property>
	      <property name="top_attach">0</property>
	      <property name="bottom_attach">1</property>
	      <property name="y_options"></property>
	    </packing>
	  </child>

	  <child>
	    <widget class="GtkLabel" id="label5">
	      <property name="visible">True</property>
	      <property name="label" translatable="yes">Website:</property>
	      <property name="use_underline">False</property>
	      <property name="use_markup">False</property>
	      <property name="justify">GTK_JUSTIFY_LEFT</property>
	      <property name="wrap">False</property>
	      <property name="selectable">False</property>
	      <property name="xalign">1</property>
	      <property name="yalign">0.5</property>
	      <property name="xpad">0</property>
	      <property name="ypad">0</property>
	    </widget>
	    <packing>
	      <property name="left_attach">0</property>
	      <property name="right_attach">1</property>
	      <property name="top_attach">1</property>
	      <property name="bottom_attach">2</property>
	      <property name="x_options">fill</property>
	      <property name="y_options"></property>
	    </packing>
	  </child>

	  <child>
	    <widget class="GtkEntry" id="entry6">
	      <property name="width_request">363</property>
	      <property name="visible">True</property>
	      <property name="can_focus">True</property>
	      <property name="editable">False</property>
	      <property name="visibility">True</property>
	      <property name="max_length">0</property>
	      <property name="text" translatable="yes">http://unihedron.com/projects/gonvert/gonvert.php</property>
	      <property name="has_frame">True</property>
	      <property name="invisible_char">*</property>
	      <property name="activates_default">False</property>
	    </widget>
	    <packing>
	      <property name="left_attach">1</property>
	      <property name="right_attach">2</property>
	      <property name="top_attach">1</property>
	      <property name="bottom_attach">2</property>
	      <property name="y_options"></property>
	    </packing>
	  </child>

	  <child>
	    <widget class="GtkLabel" id="label6">
	      <property name="visible">True</property>
	      <property name="label" translatable="yes">Author:</property>
	      <property name="use_underline">False</property>
	      <property name="use_markup">False</property>
	      <property name="justify">GTK_JUSTIFY_LEFT</property>
	      <property name="wrap">False</property>
	      <property name="selectable">False</property>
	      <property name="xalign">1</property>
	      <property name="yalign">0.5</property>
	      <property name="xpad">0</property>
	      <property name="ypad">0</property>
	    </widget>
	    <packing>
	      <property name="left_attach">0</property>
	      <property name="right_attach">1</property>
	      <property name="top_attach">2</property>
	      <property name="bottom_attach">3</property>
	      <property name="x_options">fill</property>
	      <property name="y_options"></property>
	    </packing>
	  </child>

	  <child>
	    <widget class="GtkEntry" id="entry7">
	      <property name="visible">True</property>
	      <property name="can_focus">True</property>
	      <property name="editable">False</property>
	      <property name="visibility">True</property>
	      <property name="max_length">0</property>
	      <property name="text" translatable="yes">Anthony Tekatch    anthony at unihedron.com</property>
	      <property name="has_frame">True</property>
	      <property name="invisible_char">*</property>
	      <property name="activates_default">False</property>
	    </widget>
	    <packing>
	      <property name="left_attach">1</property>
	      <property name="right_attach">2</property>
	      <property name="top_attach">2</property>
	      <property name="bottom_attach">3</property>
	      <property name="y_options"></property>
	    </packing>
	  </child>
	</widget>
	<packing>
	  <property name="padding">0</property>
	  <property name="expand">True</property>
	  <property name="fill">True</property>
	</packing>
      </child>
    </widget>
  </child>
</widget>

<widget class="GtkDialog" id="msgbox">
  <property name="title" translatable="yes">message box</property>
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
  <property name="window_position">GTK_WIN_POS_NONE</property>
  <property name="modal">False</property>
  <property name="resizable">True</property>
  <property name="destroy_with_parent">False</property>
  <property name="decorated">True</property>
  <property name="skip_taskbar_hint">False</property>
  <property name="skip_pager_hint">False</property>
  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
  <property name="has_separator">True</property>

  <child internal-child="vbox">
    <widget class="GtkVBox" id="dialog-vbox2">
      <property name="visible">True</property>
      <property name="homogeneous">False</property>
      <property name="spacing">0</property>

      <child internal-child="action_area">
	<widget class="GtkHButtonBox" id="dialog-action_area2">
	  <property name="visible">True</property>
	  <property name="layout_style">GTK_BUTTONBOX_END</property>

	  <child>
	    <widget class="GtkButton" id="okbutton1">
	      <property name="visible">True</property>
	      <property name="can_default">True</property>
	      <property name="can_focus">True</property>
	      <property name="label">gtk-ok</property>
	      <property name="use_stock">True</property>
	      <property name="relief">GTK_RELIEF_NORMAL</property>
	      <property name="focus_on_click">True</property>
	      <property name="response_id">-5</property>
	      <signal name="clicked" handler="on_messagebox_ok_clicked" last_modification_time="Mon, 24 Feb 2003 03:40:09 GMT"/>
	      <accelerator key="Escape" modifiers="0" signal="clicked"/>
	    </widget>
	  </child>
	</widget>
	<packing>
	  <property name="padding">0</property>
	  <property name="expand">False</property>
	  <property name="fill">True</property>
	  <property name="pack_type">GTK_PACK_END</property>
	</packing>
      </child>

      <child>
	<widget class="GtkScrolledWindow" id="scrolledwindow6">
	  <property name="width_request">300</property>
	  <property name="visible">True</property>
	  <property name="can_focus">True</property>
	  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
	  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
	  <property name="shadow_type">GTK_SHADOW_NONE</property>
	  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>

	  <child>
	    <widget class="GtkTextView" id="msgboxtext">
	      <property name="visible">True</property>
	      <property name="can_focus">True</property>
	      <property name="editable">False</property>
	      <property name="overwrite">False</property>
	      <property name="accepts_tab">True</property>
	      <property name="justification">GTK_JUSTIFY_LEFT</property>
	      <property name="wrap_mode">GTK_WRAP_WORD</property>
	      <property name="cursor_visible">False</property>
	      <property name="pixels_above_lines">0</property>
	      <property name="pixels_below_lines">0</property>
	      <property name="pixels_inside_wrap">0</property>
	      <property name="left_margin">0</property>
	      <property name="right_margin">0</property>
	      <property name="indent">0</property>
	      <property name="text" translatable="yes"></property>
	    </widget>
	  </child>
	</widget>
	<packing>
	  <property name="padding">0</property>
	  <property name="expand">True</property>
	  <property name="fill">True</property>
	</packing>
      </child>
    </widget>
  </child>
</widget>

</glade-interface>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gonvert/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Nov 2004 18:35:05 -0000	1.5
+++ .cvsignore	10 Apr 2006 11:18:35 -0000	1.6
@@ -1 +1 @@
-gonvert-0.2.11.tar.gz
+gonvert-0.2.15.tar.gz


Index: gonvert.spec
===================================================================
RCS file: /cvs/extras/rpms/gonvert/FC-5/gonvert.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gonvert.spec	2 Mar 2006 21:30:03 -0000	1.7
+++ gonvert.spec	10 Apr 2006 11:18:35 -0000	1.8
@@ -1,13 +1,12 @@
 Name:           gonvert
-Version:        0.2.11
-Release:        2
-
+Version:        0.2.15
+Release:        1%{?dist}
 Summary:        Units conversion utility
-
 Group:          Applications/Engineering
 License:        GPL
 URL:            http://unihedron.com/projects/gonvert/gonvert.php
-Source0:        http://www.unihedron.com/projects/gonvert/downloads/gonvert-0.2.11.tar.gz
+Source0:        http://www.unihedron.com/projects/gonvert/downloads/%{name}-%{version}.tar.gz
+Source1:	gonvert.glade
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -25,13 +24,6 @@
 
 
 %prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
-
 %setup -q
 
 
@@ -41,18 +33,26 @@
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-%makeinstall
 
+mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
+mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/python2.4/site-packages/share/gonvert
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/gonvert
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/doc/gonvert
+
+install -m0755 %{SOURCE1} ${RPM_BUILD_ROOT}%{_libdir}/python2.4/site-packages/share/gonvert
+install -m0644 pixmaps/gonvert.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/gonvert.png
+install -m0644 pixmaps/gonvert_picture.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/gonvert_picture.png
+install -m0755 gonvert ${RPM_BUILD_ROOT}%{_bindir}/gonvert
+cp doc/* ${RPM_BUILD_ROOT}%{_datadir}/doc/gonvert
 chmod 0644 doc/*
 rm -rf ${RPM_BUILD_ROOT}%{_prefix}/doc
-
 rm -rf ${RPM_BUILD_ROOT}%{_datadir}/gnome
 desktop-file-install --vendor fedora                    \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications       \
   --add-category X-Fedora                               \
   gonvert.desktop
 
-
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -60,14 +60,20 @@
 %files
 %defattr(-,root,root,-)
 %doc doc/CHANGELOG doc/COPYING doc/FAQ doc/THANKS doc/TODO
-%{_bindir}/*
+%{_bindir}/gonvert
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/gonvert
-%{_datadir}/pixmaps/*
+%{_datadir}/pixmaps/gonvert.png
+%{_datadir}/pixmaps/gonvert_picture.png
+%{_libdir}/python2.4/site-packages/share/gonvert/gonvert.glade
 %exclude %{_docdir}/gonvert
 
 
 %changelog
+* Fri Apr 7 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.2.15-1
+- Bump to 0.2.15
+- spec file altered
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gonvert/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Nov 2004 18:35:05 -0000	1.5
+++ sources	10 Apr 2006 11:18:35 -0000	1.6
@@ -1 +1 @@
-82e9f6d52214ae37999634d818098ae0  gonvert-0.2.11.tar.gz
+f8e184cc1a77c790fcb404f3f17bebea  gonvert-0.2.15.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 11:18:35 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Mon, 10 Apr 2006 04:18:35 -0700
Subject: rpms/gonvert import.log,1.4,1.5
Message-ID: <200604101119.k3ABJ7oj026706@cvs-int.fedora.redhat.com>

Author: pfj

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

Modified Files:
	import.log 
Log Message:
auto-import gonvert-0.2.15-1 on branch FC-5 from gonvert-0.2.15-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gonvert/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	8 Nov 2004 04:30:10 -0000	1.4
+++ import.log	10 Apr 2006 11:18:34 -0000	1.5
@@ -1,3 +1,4 @@
 gonvert-0_1_6-0_fdr_2_rh90:HEAD:gonvert-0.1.6-0.fdr.2.rh90.src.rpm:1099888198
 gonvert-0_1_9-0_fdr_1_1:HEAD:gonvert-0.1.9-0.fdr.1.1.src.rpm:1099888204
 gonvert-0_2_10-0_fdr_1_2:HEAD:gonvert-0.2.10-0.fdr.1.2.src.rpm:1099888210
+gonvert-0_2_15-1:FC-5:gonvert-0.2.15-1.src.rpm:1144667901



From fedora-extras-commits at redhat.com  Mon Apr 10 11:20:16 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Mon, 10 Apr 2006 04:20:16 -0700
Subject: rpms/gonvert import.log,1.5,1.6
Message-ID: <200604101120.k3ABKICt026811@cvs-int.fedora.redhat.com>

Author: pfj

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

Modified Files:
	import.log 
Log Message:
auto-import gonvert-0.2.15-1 on branch devel from gonvert-0.2.15-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gonvert/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	10 Apr 2006 11:18:34 -0000	1.5
+++ import.log	10 Apr 2006 11:20:16 -0000	1.6
@@ -2,3 +2,4 @@
 gonvert-0_1_9-0_fdr_1_1:HEAD:gonvert-0.1.9-0.fdr.1.1.src.rpm:1099888204
 gonvert-0_2_10-0_fdr_1_2:HEAD:gonvert-0.2.10-0.fdr.1.2.src.rpm:1099888210
 gonvert-0_2_15-1:FC-5:gonvert-0.2.15-1.src.rpm:1144667901
+gonvert-0_2_15-1:HEAD:gonvert-0.2.15-1.src.rpm:1144668002



From fedora-extras-commits at redhat.com  Mon Apr 10 11:20:17 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Mon, 10 Apr 2006 04:20:17 -0700
Subject: rpms/gonvert/devel gonvert.glade, NONE, 1.1 .cvsignore, 1.5,
	1.6 gonvert.spec, 1.7, 1.8 sources, 1.5, 1.6
Message-ID: <200604101120.k3ABKJLY026817@cvs-int.fedora.redhat.com>

Author: pfj

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

Modified Files:
	.cvsignore gonvert.spec sources 
Added Files:
	gonvert.glade 
Log Message:
auto-import gonvert-0.2.15-1 on branch devel from gonvert-0.2.15-1.src.rpm


--- NEW FILE gonvert.glade ---
<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">

<glade-interface>

<widget class="GtkWindow" id="app1">
  <property name="visible">True</property>
  <property name="title" translatable="yes">window1</property>
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
  <property name="window_position">GTK_WIN_POS_NONE</property>
  <property name="modal">False</property>
  <property name="resizable">True</property>
  <property name="destroy_with_parent">False</property>
  <property name="decorated">True</property>
  <property name="skip_taskbar_hint">False</property>
  <property name="skip_pager_hint">False</property>
  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
  <signal name="destroy" handler="on_app1_destroy"/>
  <signal name="size_allocate" handler="on_app1_size_allocate" last_modification_time="Sat, 03 Jul 2004 00:43:38 GMT"/>

  <child>
    <widget class="GtkVBox" id="vbox2">
      <property name="visible">True</property>
      <property name="homogeneous">False</property>
      <property name="spacing">0</property>

      <child>
	<widget class="GtkMenuBar" id="menubar1">
	  <property name="visible">True</property>

	  <child>
	    <widget class="GtkMenuItem" id="file1">
	      <property name="visible">True</property>
	      <property name="label" translatable="yes">_File</property>
	      <property name="use_underline">True</property>

	      <child>
		<widget class="GtkMenu" id="file1_menu">

		  <child>
		    <widget class="GtkMenuItem" id="exit1">
		      <property name="visible">True</property>
		      <property name="label" translatable="yes">_Exit</property>
		      <property name="use_underline">True</property>
		      <signal name="activate" handler="on_exit1_activate"/>
		      <accelerator key="q" modifiers="GDK_CONTROL_MASK" signal="activate"/>
		    </widget>
		  </child>
		</widget>
	      </child>
	    </widget>
	  </child>

	  <child>
	    <widget class="GtkMenuItem" id="tools1">
	      <property name="visible">True</property>
	      <property name="label" translatable="yes">_Tools</property>
	      <property name="use_underline">True</property>

	      <child>
		<widget class="GtkMenu" id="tools1_menu">

		  <child>
		    <widget class="GtkCheckMenuItem" id="edit_shortlist1">
		      <property name="visible">True</property>
		      <property name="tooltip" translatable="yes">Show shortlist selections</property>
		      <property name="label" translatable="yes">_Edit shortlist</property>
		      <property name="use_underline">True</property>
		      <property name="active">False</property>
		      <signal name="activate" handler="on_edit_shortlist1_activate" last_modification_time="Fri, 27 May 2005 01:07:57 GMT"/>
		    </widget>
		  </child>

		  <child>
		    <widget class="GtkMenuItem" id="clear_selections1">
		      <property name="visible">True</property>
		      <property name="tooltip" translatable="yes">Clear saved selections</property>
		      <property name="label" translatable="yes">_Clear selections</property>
		      <property name="use_underline">True</property>
		      <signal name="activate" handler="on_clear_selections1_activate" last_modification_time="Sun, 20 Jun 2004 15:41:04 GMT"/>
		    </widget>
		  </child>

		  <child>
		    <widget class="GtkMenuItem" id="write_units1">
		      <property name="visible">True</property>
		      <property name="tooltip" translatable="yes">Writes all categories and units to STDOUT</property>
		      <property name="label" translatable="yes">_Write Units</property>
		      <property name="use_underline">True</property>
		      <signal name="activate" handler="on_write_units1_activate"/>
		    </widget>
		  </child>
		</widget>
	      </child>
	    </widget>
	  </child>

	  <child>
	    <widget class="GtkMenuItem" id="help1">
	      <property name="visible">True</property>
	      <property name="label" translatable="yes">_Help</property>
	      <property name="use_underline">True</property>

	      <child>
		<widget class="GtkMenu" id="help1_menu">

		  <child>
		    <widget class="GtkMenuItem" id="about1">
		      <property name="visible">True</property>
		      <property name="label" translatable="yes">_About</property>
		      <property name="use_underline">True</property>
		      <signal name="activate" handler="on_about1_activate"/>
		    </widget>
		  </child>
		</widget>
	      </child>
	    </widget>
	  </child>
	</widget>
	<packing>
	  <property name="padding">0</property>
	  <property name="expand">False</property>
	  <property name="fill">False</property>
	</packing>
      </child>

      <child>
	<widget class="GtkHPaned" id="hpaned1">
	  <property name="visible">True</property>
	  <property name="can_focus">True</property>
	  <property name="position">0</property>

	  <child>
	    <widget class="GtkScrolledWindow" id="scrolledwindow4">
	      <property name="width_request">223</property>
	      <property name="visible">True</property>
	      <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
	      <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
	      <property name="shadow_type">GTK_SHADOW_IN</property>
	      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>

	      <child>
		<widget class="GtkTreeView" id="cat_clist">
		  <property name="width_request">200</property>
		  <property name="visible">True</property>
		  <property name="can_focus">True</property>
		  <property name="headers_visible">False</property>
		  <property name="rules_hint">False</property>
		  <property name="reorderable">False</property>
		  <property name="enable_search">True</property>
		  <signal name="cursor_changed" handler="on_cat_clist_select_row" last_modification_time="Wed, 19 Feb 2003 00:08:35 GMT"/>
		</widget>
	      </child>
	    </widget>
	    <packing>
	      <property name="shrink">False</property>
	      <property name="resize">False</property>
	    </packing>
	  </child>

	  <child>
	    <widget class="GtkVBox" id="vbox1">
	      <property name="visible">True</property>
	      <property name="homogeneous">False</property>
	      <property name="spacing">0</property>

	      <child>
		<widget class="GtkHBox" id="hbox1">
		  <property name="visible">True</property>
		  <property name="homogeneous">False</property>
		  <property name="spacing">0</property>

		  <child>
		    <widget class="GtkEntry" id="entry1">
		      <property name="visible">True</property>
		      <property name="editable">False</property>
		      <property name="visibility">True</property>
		      <property name="max_length">0</property>
		      <property name="text" translatable="yes"></property>
		      <property name="has_frame">True</property>
		      <property name="invisible_char">*</property>
		      <property name="activates_default">False</property>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">True</property>
		      <property name="fill">True</property>
		    </packing>
		  </child>

		  <child>
		    <widget class="GtkEntry" id="entry2">
		      <property name="visible">True</property>
		      <property name="can_focus">True</property>
		      <property name="editable">True</property>
		      <property name="visibility">True</property>
		      <property name="max_length">0</property>
		      <property name="text" translatable="yes"></property>
		      <property name="has_frame">True</property>
		      <property name="invisible_char">*</property>
		      <property name="activates_default">False</property>
		      <signal name="changed" handler="on_entry2_changed"/>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">True</property>
		      <property name="fill">True</property>
		    </packing>
		  </child>

		  <child>
		    <widget class="GtkLabel" id="label1">
		      <property name="width_request">60</property>
		      <property name="visible">True</property>
		      <property name="label" translatable="yes"></property>
		      <property name="use_underline">False</property>
		      <property name="use_markup">False</property>
		      <property name="justify">GTK_JUSTIFY_LEFT</property>
		      <property name="wrap">False</property>
		      <property name="selectable">False</property>
		      <property name="xalign">0.10000000149</property>
		      <property name="yalign">0.5</property>
		      <property name="xpad">0</property>
		      <property name="ypad">0</property>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">False</property>
		      <property name="fill">False</property>
		    </packing>
		  </child>
		</widget>
		<packing>
		  <property name="padding">0</property>
		  <property name="expand">False</property>
		  <property name="fill">True</property>
		</packing>
	      </child>

	      <child>
		<widget class="GtkHBox" id="hbox2">
		  <property name="visible">True</property>
		  <property name="homogeneous">False</property>
		  <property name="spacing">0</property>

		  <child>
		    <widget class="GtkEntry" id="entry3">
		      <property name="visible">True</property>
		      <property name="editable">False</property>
		      <property name="visibility">True</property>
		      <property name="max_length">0</property>
		      <property name="text" translatable="yes"></property>
		      <property name="has_frame">True</property>
		      <property name="invisible_char">*</property>
		      <property name="activates_default">False</property>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">True</property>
		      <property name="fill">True</property>
		    </packing>
		  </child>

		  <child>
		    <widget class="GtkEntry" id="entry4">
		      <property name="visible">True</property>
		      <property name="can_focus">True</property>
		      <property name="editable">True</property>
		      <property name="visibility">True</property>
		      <property name="max_length">0</property>
		      <property name="text" translatable="yes"></property>
		      <property name="has_frame">True</property>
		      <property name="invisible_char">*</property>
		      <property name="activates_default">False</property>
		      <signal name="changed" handler="on_entry4_changed"/>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">True</property>
		      <property name="fill">True</property>
		    </packing>
		  </child>

		  <child>
		    <widget class="GtkLabel" id="label2">
		      <property name="width_request">60</property>
		      <property name="visible">True</property>
		      <property name="label" translatable="yes"></property>
		      <property name="use_underline">False</property>
		      <property name="use_markup">False</property>
		      <property name="justify">GTK_JUSTIFY_LEFT</property>
		      <property name="wrap">False</property>
		      <property name="selectable">False</property>
		      <property name="xalign">0.10000000149</property>
		      <property name="yalign">0.5</property>
		      <property name="xpad">0</property>
		      <property name="ypad">0</property>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">False</property>
		      <property name="fill">False</property>
		    </packing>
		  </child>
		</widget>
		<packing>
		  <property name="padding">0</property>
		  <property name="expand">False</property>
		  <property name="fill">True</property>
		</packing>
	      </child>

	      <child>
		<widget class="GtkVPaned" id="vpaned1">
		  <property name="visible">True</property>

		  <child>
		    <widget class="GtkScrolledWindow" id="scrolledwindow1">
		      <property name="height_request">300</property>
		      <property name="visible">True</property>
		      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
		      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
		      <property name="shadow_type">GTK_SHADOW_IN</property>
		      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>

		      <child>
			<widget class="GtkTreeView" id="clist1">
			  <property name="visible">True</property>
			  <property name="can_focus">True</property>
			  <property name="headers_visible">True</property>
			  <property name="rules_hint">False</property>
			  <property name="reorderable">False</property>
			  <property name="enable_search">True</property>
			  <signal name="button_release_event" handler="on_clist1_button_released" last_modification_time="Thu, 24 Jun 2004 01:11:55 GMT"/>
			  <signal name="cursor_changed" handler="on_clist1_cursor_changed" last_modification_time="Thu, 24 Jun 2004 01:11:42 GMT"/>
			</widget>
		      </child>
		    </widget>
		    <packing>
		      <property name="shrink">False</property>
		      <property name="resize">True</property>
		    </packing>
		  </child>

		  <child>
		    <widget class="GtkScrolledWindow" id="scrolledwindow3">
		      <property name="visible">True</property>
		      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
		      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
		      <property name="shadow_type">GTK_SHADOW_IN</property>
		      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>

		      <child>
			<widget class="GtkTextView" id="text1">
			  <property name="visible">True</property>
			  <property name="can_focus">True</property>
			  <property name="editable">False</property>
			  <property name="overwrite">False</property>
			  <property name="accepts_tab">True</property>
			  <property name="justification">GTK_JUSTIFY_LEFT</property>
			  <property name="wrap_mode">GTK_WRAP_WORD</property>
			  <property name="cursor_visible">True</property>
			  <property name="pixels_above_lines">0</property>
			  <property name="pixels_below_lines">0</property>
			  <property name="pixels_inside_wrap">0</property>
			  <property name="left_margin">0</property>
			  <property name="right_margin">0</property>
			  <property name="indent">0</property>
			  <property name="text" translatable="yes"></property>
			</widget>
		      </child>
		    </widget>
		    <packing>
		      <property name="shrink">False</property>
		      <property name="resize">False</property>
		    </packing>
		  </child>
		</widget>
		<packing>
		  <property name="padding">0</property>
		  <property name="expand">True</property>
		  <property name="fill">True</property>
		</packing>
	      </child>

	      <child>
		<widget class="GtkHBox" id="hbox3">
		  <property name="visible">True</property>
		  <property name="homogeneous">False</property>
		  <property name="spacing">0</property>

		  <child>
		    <widget class="GtkEntry" id="find_entry">
		      <property name="visible">True</property>
		      <property name="tooltip" translatable="yes">Enter unit to find here</property>
		      <property name="can_focus">True</property>
		      <property name="editable">True</property>
		      <property name="visibility">True</property>
		      <property name="max_length">0</property>
		      <property name="text" translatable="yes"></property>
		      <property name="has_frame">True</property>
		      <property name="invisible_char">*</property>
		      <property name="activates_default">False</property>
		      <signal name="key_press_event" handler="on_find_entry_key_press_event"/>
		      <signal name="changed" handler="on_find_entry_changed"/>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">False</property>
		      <property name="fill">True</property>
		    </packing>
		  </child>

		  <child>
		    <widget class="GtkButton" id="find_button">
		      <property name="visible">True</property>
		      <property name="can_focus">True</property>
		      <property name="label" translatable="yes">Find</property>
		      <property name="use_underline">True</property>
		      <property name="relief">GTK_RELIEF_NORMAL</property>
		      <property name="focus_on_click">True</property>
		      <signal name="clicked" handler="on_find_button_clicked"/>
		      <accelerator key="F6" modifiers="0" signal="clicked"/>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">False</property>
		      <property name="fill">False</property>
		    </packing>
		  </child>

		  <child>
		    <widget class="GtkLabel" id="find_label">
		      <property name="visible">True</property>
		      <property name="label" translatable="yes">Press to find text.</property>
		      <property name="use_underline">False</property>
		      <property name="use_markup">False</property>
		      <property name="justify">GTK_JUSTIFY_CENTER</property>
		      <property name="wrap">False</property>
		      <property name="selectable">False</property>
		      <property name="xalign">0.5</property>
		      <property name="yalign">0.5</property>
		      <property name="xpad">0</property>
		      <property name="ypad">0</property>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">False</property>
		      <property name="fill">False</property>
		    </packing>
		  </child>

		  <child>
		    <widget class="GtkVSeparator" id="vseparator1">
		      <property name="visible">True</property>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">False</property>
		      <property name="fill">False</property>
		    </packing>
		  </child>

		  <child>
		    <widget class="GtkCheckButton" id="shortlistcheck">
		      <property name="visible">True</property>
		      <property name="can_focus">True</property>
		      <property name="label" translatable="yes">Shortlist</property>
		      <property name="use_underline">True</property>
		      <property name="relief">GTK_RELIEF_NORMAL</property>
		      <property name="focus_on_click">True</property>
		      <property name="active">False</property>
		      <property name="inconsistent">False</property>
		      <property name="draw_indicator">True</property>
		      <signal name="toggled" handler="on_shortlistcheck_toggled" last_modification_time="Wed, 18 May 2005 23:00:18 GMT"/>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">False</property>
		      <property name="fill">False</property>
		      <property name="pack_type">GTK_PACK_END</property>
		    </packing>
		  </child>
		</widget>
		<packing>
		  <property name="padding">0</property>
		  <property name="expand">False</property>
		  <property name="fill">False</property>
		</packing>
	      </child>
	    </widget>
	    <packing>
	      <property name="shrink">False</property>
	      <property name="resize">True</property>
	    </packing>
	  </child>
	</widget>
	<packing>
	  <property name="padding">0</property>
	  <property name="expand">True</property>
	  <property name="fill">True</property>
	</packing>
      </child>
    </widget>
  </child>
</widget>

<widget class="GtkDialog" id="about_box">
  <property name="title" translatable="yes">About</property>
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
  <property name="window_position">GTK_WIN_POS_NONE</property>
  <property name="modal">False</property>
  <property name="resizable">False</property>
  <property name="destroy_with_parent">False</property>
  <property name="decorated">True</property>
  <property name="skip_taskbar_hint">False</property>
  <property name="skip_pager_hint">False</property>
  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
  <property name="has_separator">True</property>
  <signal name="delete_event" handler="on_about_close_clicked" last_modification_time="Mon, 28 Jun 2004 23:42:53 GMT"/>

  <child internal-child="vbox">
    <widget class="GtkVBox" id="dialog-vbox1">
      <property name="visible">True</property>
      <property name="homogeneous">False</property>
      <property name="spacing">0</property>

      <child internal-child="action_area">
	<widget class="GtkHButtonBox" id="dialog-action_area1">
	  <property name="visible">True</property>
	  <property name="layout_style">GTK_BUTTONBOX_END</property>

	  <child>
	    <widget class="GtkButton" id="about_close">
	      <property name="visible">True</property>
	      <property name="can_default">True</property>
	      <property name="can_focus">True</property>
	      <property name="label">gtk-close</property>
	      <property name="use_stock">True</property>
	      <property name="relief">GTK_RELIEF_NORMAL</property>
	      <property name="focus_on_click">True</property>
	      <property name="response_id">-7</property>
	      <signal name="clicked" handler="on_about_close_clicked" last_modification_time="Sat, 22 Feb 2003 14:35:51 GMT"/>
	      <accelerator key="Escape" modifiers="0" signal="clicked"/>
	    </widget>
	  </child>
	</widget>
	<packing>
	  <property name="padding">0</property>
	  <property name="expand">False</property>
	  <property name="fill">True</property>
	  <property name="pack_type">GTK_PACK_END</property>
	</packing>
      </child>

      <child>
	<widget class="GtkImage" id="about_image">
	  <property name="visible">True</property>
	  <property name="xalign">0.5</property>
	  <property name="yalign">0.5</property>
	  <property name="xpad">0</property>
	  <property name="ypad">0</property>
	</widget>
	<packing>
	  <property name="padding">0</property>
	  <property name="expand">True</property>
	  <property name="fill">True</property>
	</packing>
      </child>

      <child>
	<widget class="GtkTable" id="table1">
	  <property name="visible">True</property>
	  <property name="n_rows">3</property>
	  <property name="n_columns">2</property>
	  <property name="homogeneous">False</property>
	  <property name="row_spacing">0</property>
	  <property name="column_spacing">0</property>

	  <child>
	    <widget class="GtkLabel" id="label7">
	      <property name="visible">True</property>
	      <property name="label" translatable="yes">Version:</property>
	      <property name="use_underline">False</property>
	      <property name="use_markup">False</property>
	      <property name="justify">GTK_JUSTIFY_LEFT</property>
	      <property name="wrap">False</property>
	      <property name="selectable">False</property>
	      <property name="xalign">1</property>
	      <property name="yalign">0.5</property>
	      <property name="xpad">0</property>
	      <property name="ypad">0</property>
	    </widget>
	    <packing>
	      <property name="left_attach">0</property>
	      <property name="right_attach">1</property>
	      <property name="top_attach">0</property>
	      <property name="bottom_attach">1</property>
	      <property name="x_options">fill</property>
	      <property name="y_options"></property>
	    </packing>
	  </child>

	  <child>
	    <widget class="GtkEntry" id="versionlabel">
	      <property name="visible">True</property>
	      <property name="can_focus">True</property>
	      <property name="editable">False</property>
	      <property name="visibility">True</property>
	      <property name="max_length">0</property>
	      <property name="text" translatable="yes">x.x.x</property>
	      <property name="has_frame">True</property>
	      <property name="invisible_char">*</property>
	      <property name="activates_default">False</property>
	    </widget>
	    <packing>
	      <property name="left_attach">1</property>
	      <property name="right_attach">2</property>
	      <property name="top_attach">0</property>
	      <property name="bottom_attach">1</property>
	      <property name="y_options"></property>
	    </packing>
	  </child>

	  <child>
	    <widget class="GtkLabel" id="label5">
	      <property name="visible">True</property>
	      <property name="label" translatable="yes">Website:</property>
	      <property name="use_underline">False</property>
	      <property name="use_markup">False</property>
	      <property name="justify">GTK_JUSTIFY_LEFT</property>
	      <property name="wrap">False</property>
	      <property name="selectable">False</property>
	      <property name="xalign">1</property>
	      <property name="yalign">0.5</property>
	      <property name="xpad">0</property>
	      <property name="ypad">0</property>
	    </widget>
	    <packing>
	      <property name="left_attach">0</property>
	      <property name="right_attach">1</property>
	      <property name="top_attach">1</property>
	      <property name="bottom_attach">2</property>
	      <property name="x_options">fill</property>
	      <property name="y_options"></property>
	    </packing>
	  </child>

	  <child>
	    <widget class="GtkEntry" id="entry6">
	      <property name="width_request">363</property>
	      <property name="visible">True</property>
	      <property name="can_focus">True</property>
	      <property name="editable">False</property>
	      <property name="visibility">True</property>
	      <property name="max_length">0</property>
	      <property name="text" translatable="yes">http://unihedron.com/projects/gonvert/gonvert.php</property>
	      <property name="has_frame">True</property>
	      <property name="invisible_char">*</property>
	      <property name="activates_default">False</property>
	    </widget>
	    <packing>
	      <property name="left_attach">1</property>
	      <property name="right_attach">2</property>
	      <property name="top_attach">1</property>
	      <property name="bottom_attach">2</property>
	      <property name="y_options"></property>
	    </packing>
	  </child>

	  <child>
	    <widget class="GtkLabel" id="label6">
	      <property name="visible">True</property>
	      <property name="label" translatable="yes">Author:</property>
	      <property name="use_underline">False</property>
	      <property name="use_markup">False</property>
	      <property name="justify">GTK_JUSTIFY_LEFT</property>
	      <property name="wrap">False</property>
	      <property name="selectable">False</property>
	      <property name="xalign">1</property>
	      <property name="yalign">0.5</property>
	      <property name="xpad">0</property>
	      <property name="ypad">0</property>
	    </widget>
	    <packing>
	      <property name="left_attach">0</property>
	      <property name="right_attach">1</property>
	      <property name="top_attach">2</property>
	      <property name="bottom_attach">3</property>
	      <property name="x_options">fill</property>
	      <property name="y_options"></property>
	    </packing>
	  </child>

	  <child>
	    <widget class="GtkEntry" id="entry7">
	      <property name="visible">True</property>
	      <property name="can_focus">True</property>
	      <property name="editable">False</property>
	      <property name="visibility">True</property>
	      <property name="max_length">0</property>
	      <property name="text" translatable="yes">Anthony Tekatch    anthony at unihedron.com</property>
	      <property name="has_frame">True</property>
	      <property name="invisible_char">*</property>
	      <property name="activates_default">False</property>
	    </widget>
	    <packing>
	      <property name="left_attach">1</property>
	      <property name="right_attach">2</property>
	      <property name="top_attach">2</property>
	      <property name="bottom_attach">3</property>
	      <property name="y_options"></property>
	    </packing>
	  </child>
	</widget>
	<packing>
	  <property name="padding">0</property>
	  <property name="expand">True</property>
	  <property name="fill">True</property>
	</packing>
      </child>
    </widget>
  </child>
</widget>

<widget class="GtkDialog" id="msgbox">
  <property name="title" translatable="yes">message box</property>
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
  <property name="window_position">GTK_WIN_POS_NONE</property>
  <property name="modal">False</property>
  <property name="resizable">True</property>
  <property name="destroy_with_parent">False</property>
  <property name="decorated">True</property>
  <property name="skip_taskbar_hint">False</property>
  <property name="skip_pager_hint">False</property>
  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
  <property name="has_separator">True</property>

  <child internal-child="vbox">
    <widget class="GtkVBox" id="dialog-vbox2">
      <property name="visible">True</property>
      <property name="homogeneous">False</property>
      <property name="spacing">0</property>

      <child internal-child="action_area">
	<widget class="GtkHButtonBox" id="dialog-action_area2">
	  <property name="visible">True</property>
	  <property name="layout_style">GTK_BUTTONBOX_END</property>

	  <child>
	    <widget class="GtkButton" id="okbutton1">
	      <property name="visible">True</property>
	      <property name="can_default">True</property>
	      <property name="can_focus">True</property>
	      <property name="label">gtk-ok</property>
	      <property name="use_stock">True</property>
	      <property name="relief">GTK_RELIEF_NORMAL</property>
	      <property name="focus_on_click">True</property>
	      <property name="response_id">-5</property>
	      <signal name="clicked" handler="on_messagebox_ok_clicked" last_modification_time="Mon, 24 Feb 2003 03:40:09 GMT"/>
	      <accelerator key="Escape" modifiers="0" signal="clicked"/>
	    </widget>
	  </child>
	</widget>
	<packing>
	  <property name="padding">0</property>
	  <property name="expand">False</property>
	  <property name="fill">True</property>
	  <property name="pack_type">GTK_PACK_END</property>
	</packing>
      </child>

      <child>
	<widget class="GtkScrolledWindow" id="scrolledwindow6">
	  <property name="width_request">300</property>
	  <property name="visible">True</property>
	  <property name="can_focus">True</property>
	  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
	  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
	  <property name="shadow_type">GTK_SHADOW_NONE</property>
	  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>

	  <child>
	    <widget class="GtkTextView" id="msgboxtext">
	      <property name="visible">True</property>
	      <property name="can_focus">True</property>
	      <property name="editable">False</property>
	      <property name="overwrite">False</property>
	      <property name="accepts_tab">True</property>
	      <property name="justification">GTK_JUSTIFY_LEFT</property>
	      <property name="wrap_mode">GTK_WRAP_WORD</property>
	      <property name="cursor_visible">False</property>
	      <property name="pixels_above_lines">0</property>
	      <property name="pixels_below_lines">0</property>
	      <property name="pixels_inside_wrap">0</property>
	      <property name="left_margin">0</property>
	      <property name="right_margin">0</property>
	      <property name="indent">0</property>
	      <property name="text" translatable="yes"></property>
	    </widget>
	  </child>
	</widget>
	<packing>
	  <property name="padding">0</property>
	  <property name="expand">True</property>
	  <property name="fill">True</property>
	</packing>
      </child>
    </widget>
  </child>
</widget>

</glade-interface>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gonvert/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Nov 2004 18:35:05 -0000	1.5
+++ .cvsignore	10 Apr 2006 11:20:17 -0000	1.6
@@ -1 +1 @@
-gonvert-0.2.11.tar.gz
+gonvert-0.2.15.tar.gz


Index: gonvert.spec
===================================================================
RCS file: /cvs/extras/rpms/gonvert/devel/gonvert.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gonvert.spec	2 Mar 2006 21:30:03 -0000	1.7
+++ gonvert.spec	10 Apr 2006 11:20:17 -0000	1.8
@@ -1,13 +1,12 @@
 Name:           gonvert
-Version:        0.2.11
-Release:        2
-
+Version:        0.2.15
+Release:        1%{?dist}
 Summary:        Units conversion utility
-
 Group:          Applications/Engineering
 License:        GPL
 URL:            http://unihedron.com/projects/gonvert/gonvert.php
-Source0:        http://www.unihedron.com/projects/gonvert/downloads/gonvert-0.2.11.tar.gz
+Source0:        http://www.unihedron.com/projects/gonvert/downloads/%{name}-%{version}.tar.gz
+Source1:	gonvert.glade
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -25,13 +24,6 @@
 
 
 %prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
-
 %setup -q
 
 
@@ -41,18 +33,26 @@
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-%makeinstall
 
+mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
+mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/python2.4/site-packages/share/gonvert
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/gonvert
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/doc/gonvert
+
+install -m0755 %{SOURCE1} ${RPM_BUILD_ROOT}%{_libdir}/python2.4/site-packages/share/gonvert
+install -m0644 pixmaps/gonvert.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/gonvert.png
+install -m0644 pixmaps/gonvert_picture.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/gonvert_picture.png
+install -m0755 gonvert ${RPM_BUILD_ROOT}%{_bindir}/gonvert
+cp doc/* ${RPM_BUILD_ROOT}%{_datadir}/doc/gonvert
 chmod 0644 doc/*
 rm -rf ${RPM_BUILD_ROOT}%{_prefix}/doc
-
 rm -rf ${RPM_BUILD_ROOT}%{_datadir}/gnome
 desktop-file-install --vendor fedora                    \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications       \
   --add-category X-Fedora                               \
   gonvert.desktop
 
-
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -60,14 +60,20 @@
 %files
 %defattr(-,root,root,-)
 %doc doc/CHANGELOG doc/COPYING doc/FAQ doc/THANKS doc/TODO
-%{_bindir}/*
+%{_bindir}/gonvert
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/gonvert
-%{_datadir}/pixmaps/*
+%{_datadir}/pixmaps/gonvert.png
+%{_datadir}/pixmaps/gonvert_picture.png
+%{_libdir}/python2.4/site-packages/share/gonvert/gonvert.glade
 %exclude %{_docdir}/gonvert
 
 
 %changelog
+* Fri Apr 7 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.2.15-1
+- Bump to 0.2.15
+- spec file altered
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gonvert/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Nov 2004 18:35:05 -0000	1.5
+++ sources	10 Apr 2006 11:20:17 -0000	1.6
@@ -1 +1 @@
-82e9f6d52214ae37999634d818098ae0  gonvert-0.2.11.tar.gz
+f8e184cc1a77c790fcb404f3f17bebea  gonvert-0.2.15.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 12:07:40 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 10 Apr 2006 05:07:40 -0700
Subject: rpms/d4x/devel .cvsignore, 1.7, 1.8 d4x.spec, 1.11, 1.12 sources,
	1.7, 1.8
Message-ID: <200604101207.k3AC7gJS030686@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	.cvsignore d4x.spec sources 
Log Message:
Update to 2.5.7.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/d4x/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	2 Nov 2005 13:11:56 -0000	1.7
+++ .cvsignore	10 Apr 2006 12:07:40 -0000	1.8
@@ -1 +1 @@
-d4x-2.5.6.tar.gz
+d4x-2.5.7.tar.bz2


Index: d4x.spec
===================================================================
RCS file: /cvs/extras/rpms/d4x/devel/d4x.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- d4x.spec	14 Mar 2006 16:30:39 -0000	1.11
+++ d4x.spec	10 Apr 2006 12:07:40 -0000	1.12
@@ -3,15 +3,15 @@
 
 Summary: Downloader for X that supports resuming and many other features
 Name: d4x
-Version: 2.5.6
-Release: 2%{?pre:.%{pre}}%{?dist}
+Version: 2.5.7
+Release: 1%{?pre:.%{pre}}%{?dist}
 Group: Applications/Internet
 License: Artistic
 URL: http://www.krasu.ru/soft/chuchelo/
-Source: http://www.krasu.ru/soft/chuchelo/files/d4x-%{version}%{?pre}%{?final}.tar.gz
+Source: http://d4x.krasu.ru/files/d4x-%{version}%{?pre}%{?final}.tar.bz2
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gtk2-devel, glib2-devel >= 2.4.0, gcc-c++, libstdc++-devel
-BuildRequires: libao-devel, esound-devel, desktop-file-utils, openssl-devel
+BuildRequires: libao-devel, desktop-file-utils, openssl-devel, boost-devel
 # Use modular X for FC5+ and non-Fedora
 %if %{!?fedora:5}%{?fedora} >= 5
 BuildRequires: libXt-devel
@@ -30,7 +30,7 @@
 %setup -n %{name}-%{version}%{?pre}%{?final}
 
 %build
-%configure
+%configure --enable-libao
 %{__make} %{?_smp_mflags}
 
 
@@ -70,6 +70,12 @@
 
 
 %changelog
+* Mon Apr 10 2006 Matthias Saou <http://freshrpms.net/> 2.5.7-1
+- Update to 2.5.7.
+- Update source URL and s/gz/bz2/ again.
+- Add new bost-devel build requirement.
+- Enable libao instead of esd and oss.
+
 * Tue Mar 14 2006 Matthias Saou <http://freshrpms.net/> 2.5.6-2
 - FC5 rebuild... the build error that kept this rebuild pending was only X
   not being detected by configure (libXt-devel missing) that was not making


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/d4x/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 Nov 2005 13:11:56 -0000	1.7
+++ sources	10 Apr 2006 12:07:40 -0000	1.8
@@ -1 +1 @@
-2cbaf9d4f466ba48d2ecb73518c76c78  d4x-2.5.6.tar.gz
+16e27032bf1d3396b93453afde3266dd  d4x-2.5.7.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 10 12:27:38 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 10 Apr 2006 05:27:38 -0700
Subject: rpms/d4x/FC-4 .cvsignore,1.6,1.7 d4x.spec,1.9,1.10 sources,1.6,1.7
Message-ID: <200604101227.k3ACReYv030928@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	.cvsignore d4x.spec sources 
Log Message:
Update to 2.5.7.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/d4x/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Nov 2005 13:11:51 -0000	1.6
+++ .cvsignore	10 Apr 2006 12:27:38 -0000	1.7
@@ -1 +1 @@
-d4x-2.5.6.tar.gz
+d4x-2.5.7.tar.bz2


Index: d4x.spec
===================================================================
RCS file: /cvs/extras/rpms/d4x/FC-4/d4x.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- d4x.spec	2 Nov 2005 13:11:51 -0000	1.9
+++ d4x.spec	10 Apr 2006 12:27:38 -0000	1.10
@@ -3,15 +3,19 @@
 
 Summary: Downloader for X that supports resuming and many other features
 Name: d4x
-Version: 2.5.6
+Version: 2.5.7
 Release: 1%{?pre:.%{pre}}%{?dist}
 Group: Applications/Internet
 License: Artistic
 URL: http://www.krasu.ru/soft/chuchelo/
-Source: http://www.krasu.ru/soft/chuchelo/files/d4x-%{version}%{?pre}%{?final}.tar.gz
+Source: http://d4x.krasu.ru/files/d4x-%{version}%{?pre}%{?final}.tar.bz2
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gtk2-devel, glib2-devel >= 2.4.0, gcc-c++, libstdc++-devel
-BuildRequires: libao-devel, esound-devel, desktop-file-utils, openssl-devel
+BuildRequires: libao-devel, desktop-file-utils, openssl-devel, boost-devel
+# Use modular X for FC5+ and non-Fedora
+%if %{!?fedora:5}%{?fedora} >= 5
+BuildRequires: libXt-devel
+%endif
 
 %description
 This program lets you download files from the internet using either the ftp
@@ -26,7 +30,7 @@
 %setup -n %{name}-%{version}%{?pre}%{?final}
 
 %build
-%configure
+%configure --enable-libao
 %{__make} %{?_smp_mflags}
 
 
@@ -66,6 +70,17 @@
 
 
 %changelog
+* Mon Apr 10 2006 Matthias Saou <http://freshrpms.net/> 2.5.7-1
+- Update to 2.5.7.
+- Update source URL and s/gz/bz2/ again.
+- Add new bost-devel build requirement.
+- Enable libao instead of esd and oss.
+
+* Tue Mar 14 2006 Matthias Saou <http://freshrpms.net/> 2.5.6-2
+- FC5 rebuild... the build error that kept this rebuild pending was only X
+  not being detected by configure (libXt-devel missing) that was not making
+  configure exit... because make then failed miserably.
+
 * Wed Nov  2 2005 Matthias Saou <http://freshrpms.net/> 2.5.6-1
 - Update to 2.5.6.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/d4x/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Nov 2005 13:11:51 -0000	1.6
+++ sources	10 Apr 2006 12:27:38 -0000	1.7
@@ -1 +1 @@
-2cbaf9d4f466ba48d2ecb73518c76c78  d4x-2.5.6.tar.gz
+16e27032bf1d3396b93453afde3266dd  d4x-2.5.7.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 10 12:27:39 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 10 Apr 2006 05:27:39 -0700
Subject: rpms/d4x/FC-5 .cvsignore, 1.7, 1.8 d4x.spec, 1.11, 1.12 sources, 1.7,
	1.8
Message-ID: <200604101227.k3ACRfOq030934@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	.cvsignore d4x.spec sources 
Log Message:
Update to 2.5.7.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/d4x/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	2 Nov 2005 13:11:56 -0000	1.7
+++ .cvsignore	10 Apr 2006 12:27:39 -0000	1.8
@@ -1 +1 @@
-d4x-2.5.6.tar.gz
+d4x-2.5.7.tar.bz2


Index: d4x.spec
===================================================================
RCS file: /cvs/extras/rpms/d4x/FC-5/d4x.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- d4x.spec	14 Mar 2006 16:30:39 -0000	1.11
+++ d4x.spec	10 Apr 2006 12:27:39 -0000	1.12
@@ -3,15 +3,15 @@
 
 Summary: Downloader for X that supports resuming and many other features
 Name: d4x
-Version: 2.5.6
-Release: 2%{?pre:.%{pre}}%{?dist}
+Version: 2.5.7
+Release: 1%{?pre:.%{pre}}%{?dist}
 Group: Applications/Internet
 License: Artistic
 URL: http://www.krasu.ru/soft/chuchelo/
-Source: http://www.krasu.ru/soft/chuchelo/files/d4x-%{version}%{?pre}%{?final}.tar.gz
+Source: http://d4x.krasu.ru/files/d4x-%{version}%{?pre}%{?final}.tar.bz2
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gtk2-devel, glib2-devel >= 2.4.0, gcc-c++, libstdc++-devel
-BuildRequires: libao-devel, esound-devel, desktop-file-utils, openssl-devel
+BuildRequires: libao-devel, desktop-file-utils, openssl-devel, boost-devel
 # Use modular X for FC5+ and non-Fedora
 %if %{!?fedora:5}%{?fedora} >= 5
 BuildRequires: libXt-devel
@@ -30,7 +30,7 @@
 %setup -n %{name}-%{version}%{?pre}%{?final}
 
 %build
-%configure
+%configure --enable-libao
 %{__make} %{?_smp_mflags}
 
 
@@ -70,6 +70,12 @@
 
 
 %changelog
+* Mon Apr 10 2006 Matthias Saou <http://freshrpms.net/> 2.5.7-1
+- Update to 2.5.7.
+- Update source URL and s/gz/bz2/ again.
+- Add new bost-devel build requirement.
+- Enable libao instead of esd and oss.
+
 * Tue Mar 14 2006 Matthias Saou <http://freshrpms.net/> 2.5.6-2
 - FC5 rebuild... the build error that kept this rebuild pending was only X
   not being detected by configure (libXt-devel missing) that was not making


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/d4x/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 Nov 2005 13:11:56 -0000	1.7
+++ sources	10 Apr 2006 12:27:39 -0000	1.8
@@ -1 +1 @@
-2cbaf9d4f466ba48d2ecb73518c76c78  d4x-2.5.6.tar.gz
+16e27032bf1d3396b93453afde3266dd  d4x-2.5.7.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 10 14:27:26 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Mon, 10 Apr 2006 07:27:26 -0700
Subject: fedora-security/audit fc4,1.194,1.195 fc5,1.107,1.108
Message-ID: <200604101427.k3AERQxh003066@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3046

Modified Files:
	fc4 fc5 
Log Message:
Add a new PHP cve id.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- fc4	10 Apr 2006 08:10:27 -0000	1.194
+++ fc4	10 Apr 2006 14:27:23 -0000	1.195
@@ -28,6 +28,7 @@
 CVE-2006-1045 VULNERABLE (thunderbird)
 CVE-2006-1015 ignore (php) safe mode isn't safe
 CVE-2006-1014 ignore (php) safe mode isn't safe
+CVE-2006-0996 VULNERABLE (php) bz#187511
 CVE-2006-0903 VULNERABLE (mysql) bz#183261
 CVE-2006-0884 ** thunderbird
 CVE-2006-0836 version (thunderbird, 1.5 only)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- fc5	10 Apr 2006 08:10:27 -0000	1.107
+++ fc5	10 Apr 2006 14:27:23 -0000	1.108
@@ -29,6 +29,7 @@
 CVE-2006-1045 VULNERABLE (thunderbird)
 CVE-2006-1015 ignore (php) safe mode isn't safe
 CVE-2006-1014 ignore (php) safe mode isn't safe
+CVE-2006-0996 VULNERABLE (php) bz#187511
 CVE-2006-0903 VULNERABLE (mysql) low/not upstream yet
 CVE-2006-0884 VULNERABLE (thunderbird)
 CVE-2006-0836 VULNERABLE (thunderbird)



From fedora-extras-commits at redhat.com  Mon Apr 10 14:44:05 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 10 Apr 2006 07:44:05 -0700
Subject: rpms/Macaulay2/devel Macaulay2.spec,1.11,1.12
Message-ID: <200604101444.k3AEi7Ho003158@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	Macaulay2.spec 
Log Message:
* Mon Apr 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.2-22
- fix icon location (#188384)



Index: Macaulay2.spec
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/devel/Macaulay2.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Macaulay2.spec	31 Mar 2006 13:00:38 -0000	1.11
+++ Macaulay2.spec	10 Apr 2006 14:44:05 -0000	1.12
@@ -6,7 +6,7 @@
 Summary: System for algebraic geometry and commutative algebra
 Name:    Macaulay2
 Version: 0.9.2
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: GPL
 Group:   Applications/Engineering
 URL:     http://www.math.uiuc.edu/Macaulay2/
@@ -93,7 +93,7 @@
 
 # app img
 install -p -m644 -D %{SOURCE1} \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/apps/32x32/Macaulay2.png
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/Macaulay2.png
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install \
@@ -154,6 +154,9 @@
 
 
 %changelog
+* Mon Apr 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.2-22
+- fix icon location (#188384)
+
 * Thu Mar 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.2-21
 - *really* disable %%check (fails on fc5+ anyway) 
 



From fedora-extras-commits at redhat.com  Mon Apr 10 14:46:05 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Mon, 10 Apr 2006 07:46:05 -0700
Subject: rpms/nethack-vultures/devel nethack-vultures.spec,1.22,1.23
Message-ID: <200604101446.k3AEk7wN003673@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3470/devel

Modified Files:
	nethack-vultures.spec 
Log Message:
Added extra fonts




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- nethack-vultures.spec	10 Apr 2006 00:35:08 -0000	1.22
+++ nethack-vultures.spec	10 Apr 2006 14:46:05 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        2.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -137,6 +137,7 @@
 %{_prefix}/games/vultureseye/music/
 %{_prefix}/games/vultureseye/nhdat
 %{_prefix}/games/vultureseye/sound/
+%{_prefix}/games/vultureseye/fonts/
 %attr(2755,root,games) %{_prefix}/games/vultureseye/vultureseye
 %dir %{_prefix}/games/vulturesclaw/
 %{_prefix}/games/vulturesclaw/config/
@@ -147,6 +148,7 @@
 %{_prefix}/games/vulturesclaw/music/
 %{_prefix}/games/vulturesclaw/nh*share
 %{_prefix}/games/vulturesclaw/sound/
+%{_prefix}/games/vulturesclaw/fonts/
 %attr(2755,root,games) %{_prefix}/games/vulturesclaw/vulturesclaw
 %{_datadir}/applications/*vultures*.desktop
 %{_datadir}/icons/hicolor/48x48/apps/vultures*.png
@@ -165,7 +167,10 @@
 
 
 %changelog
-* Sat Apr 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-2
+* Sun Apr 09 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-3
+- Packaged extra fonts
+
+* Sun Apr 09 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-2
 - Upped the release to try and make the plague server use the right source tarball.
 
 * Sat Apr 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-1



From fedora-extras-commits at redhat.com  Mon Apr 10 14:45:58 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Mon, 10 Apr 2006 07:45:58 -0700
Subject: rpms/nethack-vultures/FC-3 nethack-vultures.spec,1.19,1.20
Message-ID: <200604101446.k3AEkU4k003830@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-serv3470/FC-3

Modified Files:
	nethack-vultures.spec 
Log Message:
Added extra fonts




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- nethack-vultures.spec	10 Apr 2006 00:35:01 -0000	1.19
+++ nethack-vultures.spec	10 Apr 2006 14:45:58 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        2.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -13,7 +13,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
-BuildRequires:  SDL_mixer-devel >= 1.2.6
+BuildRequires:  SDL_mixer-devel
 BuildRequires:  SDL_image-devel
 BuildRequires:  SDL_ttf-devel
 BuildRequires:  libpng-devel
@@ -136,6 +136,7 @@
 %{_prefix}/games/vultureseye/music/
 %{_prefix}/games/vultureseye/nhdat
 %{_prefix}/games/vultureseye/sound/
+%{_prefix}/games/vultureseye/fonts/
 %attr(2755,root,games) %{_prefix}/games/vultureseye/vultureseye
 %dir %{_prefix}/games/vulturesclaw/
 %{_prefix}/games/vulturesclaw/config/
@@ -146,6 +147,7 @@
 %{_prefix}/games/vulturesclaw/music/
 %{_prefix}/games/vulturesclaw/nh*share
 %{_prefix}/games/vulturesclaw/sound/
+%{_prefix}/games/vulturesclaw/fonts/
 %attr(2755,root,games) %{_prefix}/games/vulturesclaw/vulturesclaw
 %{_datadir}/applications/*vultures*.desktop
 %{_datadir}/icons/hicolor/48x48/apps/vultures*.png
@@ -164,7 +166,10 @@
 
 
 %changelog
-* Sat Apr 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-2
+* Sun Apr 09 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-3
+- Packaged extra fonts
+
+* Sun Apr 09 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-2
 - Upped the release to try and make the plague server use the right source tarball.
 
 * Sat Apr 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-1



From fedora-extras-commits at redhat.com  Mon Apr 10 14:46:00 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Mon, 10 Apr 2006 07:46:00 -0700
Subject: rpms/nethack-vultures/FC-5 nethack-vultures.spec,1.22,1.23
Message-ID: <200604101446.k3AEkW02003834@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-serv3470/FC-5

Modified Files:
	nethack-vultures.spec 
Log Message:
Added extra fonts




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-5/nethack-vultures.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- nethack-vultures.spec	10 Apr 2006 00:35:08 -0000	1.22
+++ nethack-vultures.spec	10 Apr 2006 14:45:59 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        2.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -137,6 +137,7 @@
 %{_prefix}/games/vultureseye/music/
 %{_prefix}/games/vultureseye/nhdat
 %{_prefix}/games/vultureseye/sound/
+%{_prefix}/games/vultureseye/fonts/
 %attr(2755,root,games) %{_prefix}/games/vultureseye/vultureseye
 %dir %{_prefix}/games/vulturesclaw/
 %{_prefix}/games/vulturesclaw/config/
@@ -147,6 +148,7 @@
 %{_prefix}/games/vulturesclaw/music/
 %{_prefix}/games/vulturesclaw/nh*share
 %{_prefix}/games/vulturesclaw/sound/
+%{_prefix}/games/vulturesclaw/fonts/
 %attr(2755,root,games) %{_prefix}/games/vulturesclaw/vulturesclaw
 %{_datadir}/applications/*vultures*.desktop
 %{_datadir}/icons/hicolor/48x48/apps/vultures*.png
@@ -165,7 +167,10 @@
 
 
 %changelog
-* Sat Apr 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-2
+* Sun Apr 09 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-3
+- Packaged extra fonts
+
+* Sun Apr 09 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-2
 - Upped the release to try and make the plague server use the right source tarball.
 
 * Sat Apr 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-1



From fedora-extras-commits at redhat.com  Mon Apr 10 14:45:59 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Mon, 10 Apr 2006 07:45:59 -0700
Subject: rpms/nethack-vultures/FC-4 nethack-vultures.spec,1.21,1.22
Message-ID: <200604101446.k3AEkV6b003833@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-serv3470/FC-4

Modified Files:
	nethack-vultures.spec 
Log Message:
Added extra fonts




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- nethack-vultures.spec	10 Apr 2006 00:35:02 -0000	1.21
+++ nethack-vultures.spec	10 Apr 2006 14:45:59 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        2.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -137,6 +137,7 @@
 %{_prefix}/games/vultureseye/music/
 %{_prefix}/games/vultureseye/nhdat
 %{_prefix}/games/vultureseye/sound/
+%{_prefix}/games/vultureseye/fonts/
 %attr(2755,root,games) %{_prefix}/games/vultureseye/vultureseye
 %dir %{_prefix}/games/vulturesclaw/
 %{_prefix}/games/vulturesclaw/config/
@@ -147,6 +148,7 @@
 %{_prefix}/games/vulturesclaw/music/
 %{_prefix}/games/vulturesclaw/nh*share
 %{_prefix}/games/vulturesclaw/sound/
+%{_prefix}/games/vulturesclaw/fonts/
 %attr(2755,root,games) %{_prefix}/games/vulturesclaw/vulturesclaw
 %{_datadir}/applications/*vultures*.desktop
 %{_datadir}/icons/hicolor/48x48/apps/vultures*.png
@@ -165,7 +167,10 @@
 
 
 %changelog
-* Sat Apr 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-2
+* Sun Apr 09 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-3
+- Packaged extra fonts
+
+* Sun Apr 09 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-2
 - Upped the release to try and make the plague server use the right source tarball.
 
 * Sat Apr 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-1



From fedora-extras-commits at redhat.com  Mon Apr 10 14:51:22 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon, 10 Apr 2006 07:51:22 -0700
Subject: rpms/yadex - New directory
Message-ID: <200604101451.k3AEpOqZ003943@cvs-int.fedora.redhat.com>

Author: wart

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

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




From fedora-extras-commits at redhat.com  Mon Apr 10 14:51:23 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon, 10 Apr 2006 07:51:23 -0700
Subject: rpms/yadex/devel - New directory
Message-ID: <200604101451.k3AEpPPu003946@cvs-int.fedora.redhat.com>

Author: wart

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

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




From fedora-extras-commits at redhat.com  Mon Apr 10 14:51:36 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon, 10 Apr 2006 07:51:36 -0700
Subject: rpms/yadex Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604101451.k3AEpcKZ004022@cvs-int.fedora.redhat.com>

Author: wart

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

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


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

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

common : CVS/Root
	@cvs 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 Apr 10 14:51:37 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon, 10 Apr 2006 07:51:37 -0700
Subject: rpms/yadex/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200604101451.k3AEpdDB004025@cvs-int.fedora.redhat.com>

Author: wart

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

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


--- 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 Apr 10 14:52:26 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon, 10 Apr 2006 07:52:26 -0700
Subject: rpms/yadex import.log,1.1,1.2
Message-ID: <200604101452.k3AEqSn8004164@cvs-int.fedora.redhat.com>

Author: wart

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/yadex/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Apr 2006 14:51:36 -0000	1.1
+++ import.log	10 Apr 2006 14:52:26 -0000	1.2
@@ -0,0 +1 @@
+yadex-1_7_0-3:HEAD:yadex-1.7.0-3.src.rpm:1144680736



From fedora-extras-commits at redhat.com  Mon Apr 10 14:52:27 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon, 10 Apr 2006 07:52:27 -0700
Subject: rpms/yadex/devel Yadex_170_ALL.diff, NONE, 1.1 Yadex_170_Hexen.diff,
	NONE, 1.1 yadex-1.7.0-64bit.patch, NONE,
	1.1 yadex-1.7.0-datadir.patch, NONE,
	1.1 yadex-1.7.0-destdir.patch, NONE, 1.1 yadex-1.7.0-gcc41.patch,
	NONE, 1.1 yadex.desktop, NONE, 1.1 yadex.png, NONE,
	1.1 yadex.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604101452.k3AEqTcj004181@cvs-int.fedora.redhat.com>

Author: wart

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

Modified Files:
	.cvsignore sources 
Added Files:
	Yadex_170_ALL.diff Yadex_170_Hexen.diff 
	yadex-1.7.0-64bit.patch yadex-1.7.0-datadir.patch 
	yadex-1.7.0-destdir.patch yadex-1.7.0-gcc41.patch 
	yadex.desktop yadex.png yadex.spec 
Log Message:
auto-import yadex-1.7.0-3 on branch devel from yadex-1.7.0-3.src.rpm

Yadex_170_ALL.diff:

--- NEW FILE Yadex_170_ALL.diff ---
diff -u -r -N yadex-1.7.0/atclib/al_adigits.c yadex-1.7.0-all/atclib/al_adigits.c
--- yadex-1.7.0/atclib/al_adigits.c	1999-08-02 00:52:00.000000000 +1000
+++ yadex-1.7.0-all/atclib/al_adigits.c	2005-01-10 14:30:53.000000000 +1100
@@ -29,5 +29,11 @@
 #include "atclib.h"
 
 
-const char al_adigits[36] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+const char al_adigits[36] =
+{
+'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
+'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
+'U', 'V', 'W', 'X', 'Y', 'Z'
+};
 
diff -u -r -N yadex-1.7.0/docsrc/index.html yadex-1.7.0-all/docsrc/index.html
--- yadex-1.7.0/docsrc/index.html	2002-05-09 23:36:06.000000000 +1000
+++ yadex-1.7.0-all/docsrc/index.html	2005-01-10 14:30:53.000000000 +1100
@@ -34,6 +34,7 @@
 
 <ul>
 <li><a href="palette.html">Palette viewer</a>
+<li><a href="preview.html">3D Level Preview</a>
 <li><a href="advanced.html">Advanced user's guide</a>
 <li><a href="../TODO"><code>TODO</code></a>
 <li><a href="yadex.6">The man page for Yadex</a>
diff -u -r -N yadex-1.7.0/docsrc/preview.html yadex-1.7.0-all/docsrc/preview.html
--- yadex-1.7.0/docsrc/preview.html	1970-01-01 10:00:00.000000000 +1000
+++ yadex-1.7.0-all/docsrc/preview.html	2005-01-10 14:34:20.000000000 +1100
@@ -0,0 +1,108 @@
+<html>
+<head>
+<title>Yadex 3D level preview</title>
+</head>
+<body>
+
+<div align="center">
+<img src="logo_small.png" alt="Fancy logo">
+<br>Yadex $VERSION ($SOURCE_DATE)
+<h1>3D Level Preview</h1>
+</div>
+<br>
+<br>
+<br>
+
+	<h2>What's it for</h2>
+
+<p>The 3D level preview function lets you get a rough idea of what
+your level looks like, quickly, without all the hassle of saving,
+building nodes and starting DOOM. It is activated by pressing the
+`R' key while editing a level, and draws the player's view that
+you would see within DOOM (with some limitations). While the
+rendering window is up, you can move around the level using the
+cursor keys and toggle things like texturing and sprites on/off.
+
+	<h2>Key bindings</h2>
+
+<dl>
+<dt>[<kbd>Left</kbd>]
+<br>[<kbd>Right</kbd>]
+<dd>Turn the view left or right. Use the SHIFT key to
+turn a greater amount.
+
+<dt>[<kbd>Up</kbd>]
+<br>[<kbd>Down</kbd>]
+<dd>Move the view forward or back. Use the SHIFT key to
+move a greater distance.
+
+<dt>[<kbd>n</kbd>]
+<br>[<kbd>m</kbd>]
+<dd>Move the view sideways left or right (strafing). Uppercase `N'
+and `M' (i.e. with the SHIFT key) will move a greater distance.
+
+<dt>[<kbd>c</kbd>]
+<br>[<kbd>d</kbd>]
+<dd>Move the view upwards or downwards (flying). Uppercase `C' and
+`D' (i.e. with the SHIFT key) will move a greater distance. Note
+that you cannot move up or down when "walking" mode is enabled.
+
+<dt>[<kbd>t</kbd>]
+<dd>Toggle texture mapping. When disabled (the default), all walls,
+ceilings and floors are drawn with solid (somewhat random) colours.
+
+<dt>[<kbd>s</kbd>]
+<dd>Toggle sprites.
+
+<dt>[<kbd>w</kbd>]
+<dd>Toggle walking mode. When enabled, the view height is always
+above the current floor. For example, if you move forward over a
+cliff, the view will drop down.  When disabled (the default), you can
+fly about the level at any height.
+
+<dt>[<kbd>Esc</kbd>]
+<br>[<kbd>q</kbd>]
+<dd>Exit the 3D level preview. The current viewing state (position,
+direction, etc) are remembered, and will be used next time the 3D
+preview is activated (unless the player object has been moved, or a
+different level was loaded).
+
+</dl>
+
+	<h2>Features</h2>
+
+<ul>
+<li>No BSP (nodes) required !
+<li>Textures and flats are drawn exactly like DOOM, including X/Y
+offsets and upper/lower unpegging flags.
+<li>Sky is handled just like in DOOM (but drawn in solid blue).
+</ul>
+
+	<h2>Limitations</h2>
+
+<ul>
+<li>No lighting, the level appears full-bright all the time.
+<li>No mid-masked textures (rails, gratings) are drawn.
+<li>Thing sprites (especially monsters) are always drawn facing
+you, even when their direction is away from you.
+<li>Sprite positioning may be inaccurate, because their X and
+Y offsets are not honoured.
+<li>Things that are supposed to hang from the ceiling
+(hanging body parts, chandeliers, etc) will appear on the floor.
+<li>There are some glitches in the current renderer, which look like
+"slimetrails" (vertical lines).
+</ul>
+
+	<h2>Caveats</h2>
+
+One last thing. The 3D preview function can use a huge amount of
+memory when texturing and sprites are both enabled (and a large amount
+even when texturing and sprites are both disabled). If your computer
+has a very low amount of memory (e.g. less than 16 MB), then Yadex may
+crash with an out of memory error. I think you are unlikely to hit
+this problem, but if in doubt, save your work first.
+
+
+<p><hr>AJA $SELF_DATE
+</body>
+</html>
diff -u -r -N yadex-1.7.0/GNUmakefile yadex-1.7.0-all/GNUmakefile
--- yadex-1.7.0/GNUmakefile	2003-12-29 04:23:56.000000000 +1100
+++ yadex-1.7.0-all/GNUmakefile	2005-01-10 14:30:53.000000000 +1100
@@ -160,6 +160,7 @@
 	s_swapf		s_vertices	sanity		scrnshot	\
 	selbox		selectn		selpath		selrect		\
 	serialnum	spritdir	sticker		swapmem		\
+ 	r_render	r_images					\
 	t_centre	t_flags		t_prop		t_spin		\
 	textures	things		trace		v_centre	\
 	v_merge		v_polyg		vectext		verbmsg		\
@@ -237,6 +238,7 @@
 	docsrc/legal.html		\
 	docsrc/packagers_guide.html	\
 	docsrc/palette.html		\
+	docsrc/preview.html		\
 	docsrc/reporting.html		\
 	docsrc/tips.html		\
 	docsrc/trivia.html		\
@@ -609,8 +611,9 @@
 #
 ########################################################################
 
-# If Makefile.config doesn't exist, give a hint...
+# If Makefile.config or config.h don't exist, give a hint...
 $(OBJDIR)/Makefile.config:
+$(OBJDIR)/config.h:
 	@echo "Sorry guv'nor, but... did you run ./configure ?" >&2
 	@false
 
@@ -637,7 +640,7 @@
 # Note: the modules of Atclib are not scanned as they all
 # depend on $(HEADERS_ATCLIB) and nothing else.
 
-yadex.dep: $(SRC_NON_GEN)
+yadex.dep: $(SRC_NON_GEN) src/config.h
 	@echo "Generating $@"
 	@makedepend -f- -Y -Iatclib $(SRC_NON_GEN) 2>/dev/null	\
 		| awk 'sub (/^src/, "") == 1 {				\
diff -u -r -N yadex-1.7.0/src/editloop.cc yadex-1.7.0-all/src/editloop.cc
--- yadex-1.7.0/src/editloop.cc	2003-07-05 21:12:32.000000000 +1000
+++ yadex-1.7.0-all/src/editloop.cc	2005-01-10 14:30:53.000000000 +1100
@@ -70,6 +70,7 @@
 #include "x_exchng.h"
 #include "x_hover.h"
 #include "xref.h"
+#include "r_render.h"
 
 #ifdef Y_X11
 #include <X11/Xlib.h>
@@ -304,8 +305,8 @@
 
 e.mb_menu[MBM_EDIT] = new Menu (NULL,
    "~Copy object(s)",          'o',    0,
-   "~Add object",              YK_INS, 0,
-   "~Delete object(s)",        YK_DEL, 0,
+   "~Add object",              'I', 0,
+   "~Delete object(s)",        '\b', 0,
    "~Exchange object numbers", 24,     0,
    "~Preferences...",          YK_F5,  0,
[...2426 lines suppressed...]
+   {
+      int model = super_find_sector_model (ld_side1, ld_side2);
+      InsertObject (OBJ_SECTORS, model, 0, 0);
+      new_sec = NumSectors - 1;
+   }
+   
+   for (line=0; line < NumLineDefs; line++)
+   {
+      if (ld_side1.get (line))
+         super_set_sector_on_side (line, LineDefs[line].sidedef1,
+            LineDefs[line].sidedef2, 1, new_sec);
+
+      else if (ld_side2.get (line))
+         super_set_sector_on_side (line, LineDefs[line].sidedef2,
+            LineDefs[line].sidedef1, 2, new_sec);
+   }
+}
+
 /* end of file */
diff -u -r -N yadex-1.7.0/src/s_prop.cc yadex-1.7.0-all/src/s_prop.cc
--- yadex-1.7.0/src/s_prop.cc	2003-03-28 23:37:32.000000000 +1100
+++ yadex-1.7.0-all/src/s_prop.cc	2005-01-10 14:30:53.000000000 +1100
@@ -259,4 +259,67 @@
   }
 }
 
+/*
+ * 	InputSectorType
+ * 	Let the user select a sector type number and return it
+ * 	Returns 0 if OK, <>0 if cancelled
+ */
+int InputSectorType (int x0, int y0, int *number)
+{
+  int	val;
+  val = 0;
+  *number = 0;
+  Menu_data_st menudata (stdef);
+	if (DisplayMenuList (x0 , y0, "Select type", menudata, &val)
+	  < 0)
+	  return 1;
+  // KLUDGE last element of stdef means "enter value"
+  if (val == al_lcount (stdef) - 1)
+  	{
+	  val = InputIntegerValue (x0 + 84,
+	    y0 + BOX_BORDER + (3 + val) * FONTH,
+	    -32768, 32767, 0);
+	  if (val == IIV_CANCEL)  // [Esc]
+	    return 1;
+	}
+	else
+	{
+	  if (al_lseek (stdef, val, SEEK_SET))
+	    fatal_error ("%s SP1 (%s)\n",
+	      msg_unexpected, al_astrerror (al_aerrno));
+	  val = CUR_STDEF->number;
+	}
+  if (val < 0) return 1;  //unsuccessful
+  *number = val;
+  return 0;               //successful
+}
+
+/*
+ *   TransferSectorProperties
+ *
+ *   -AJA- 2001-05-27
+ */
+void TransferSectorProperties (int src_sector, SelPtr sectors)
+{
+   SelPtr cur;
+
+   for (cur=sectors; cur; cur=cur->next)
+   {
+      if (! is_obj(cur->objnum))
+         continue;
+
+      strncpy (Sectors[cur->objnum].floort, Sectors[src_sector].floort,
+            WAD_FLAT_NAME);
+      strncpy (Sectors[cur->objnum].ceilt, Sectors[src_sector].ceilt,
+            WAD_FLAT_NAME);
+
+      Sectors[cur->objnum].floorh  = Sectors[src_sector].floorh;
+      Sectors[cur->objnum].ceilh   = Sectors[src_sector].ceilh;
+      Sectors[cur->objnum].light   = Sectors[src_sector].light;
+      Sectors[cur->objnum].special = Sectors[src_sector].special;
+      Sectors[cur->objnum].tag     = Sectors[src_sector].tag;
+
+      MadeChanges = 1;
+   }
+}
 
diff -u -r -N yadex-1.7.0/src/s_split.cc yadex-1.7.0-all/src/s_split.cc
--- yadex-1.7.0/src/s_split.cc	2003-03-28 23:37:32.000000000 +1100
+++ yadex-1.7.0-all/src/s_split.cc	2005-01-10 14:30:53.000000000 +1100
@@ -36,6 +36,7 @@
 #include "s_linedefs.h"
 #include "selectn.h"
 #include "x_hover.h"
+#include "entry.h"
 
 
 /*
diff -u -r -N yadex-1.7.0/src/t_prop.cc yadex-1.7.0-all/src/t_prop.cc
--- yadex-1.7.0/src/t_prop.cc	2003-03-28 23:37:32.000000000 +1100
+++ yadex-1.7.0-all/src/t_prop.cc	2005-01-10 14:30:53.000000000 +1100
@@ -36,16 +36,17 @@
 #include "gfx.h"
 #include "levels.h"
 #include "oldmenus.h"
+#include "objid.h"
+#include "objects.h"
 #include "selectn.h"
 #include "things.h"
 
-
 /*
  *	Private functions prototypes
  */
-static int InputThingType (int x0, int y0, int *number);
 static const char *PrintThinggroup (void *ptr);
 static const char *PrintThingdef (void *ptr);
+int InputThingType (int x0, int y0, int *number);
 
 
 /*
@@ -250,7 +251,7 @@
  *	Let the user select a thing number and return it.
  *	Returns 0 if OK, <>0 if cancelled
  */
-static int InputThingType (int x0, int y0, int *number)
+int InputThingType (int x0, int y0, int *number)
 {
 int         r;
 int         tgno = 0;
@@ -331,4 +332,30 @@
 }
 
 
+/*
+ *   TransferThingProperties
+ *
+ *   -AJA- 2001-05-27
+ */
+void TransferThingProperties (int src_thing, SelPtr things)
+{
+   SelPtr cur;
+
+   for (cur=things; cur; cur=cur->next)
+   {
+      if (! is_obj(cur->objnum))
+         continue;
+
+      Things[cur->objnum].angle = Things[src_thing].angle;
+      Things[cur->objnum].type  = Things[src_thing].type;
+      Things[cur->objnum].when  = Things[src_thing].when;
+
+      MadeChanges = 1;
+
+      things_types++;
+      things_angles++;
+   }
+}
+
+
 /* end of file */
diff -u -r -N yadex-1.7.0/src/yadex.h yadex-1.7.0-all/src/yadex.h
--- yadex-1.7.0/src/yadex.h	2003-12-15 11:37:45.000000000 +1100
+++ yadex-1.7.0-all/src/yadex.h	2005-01-10 14:30:53.000000000 +1100
@@ -479,6 +479,7 @@
 
 // l_prop.cc (previously in editobj.cc)
 void LinedefProperties (int x0, int y0, SelPtr obj);
+void TransferLinedefProperties (int src_linedef, SelPtr linedefs);
 
 // l_unlink.cc
 void unlink_sidedef (SelPtr linedefs, int side1, int side2);
@@ -541,13 +542,16 @@
 void DistributeSectorCeilings (SelPtr); /* SWAP! */
 void RaiseOrLowerSectors (SelPtr obj);
 void BrightenOrDarkenSectors (SelPtr obj);
+void SuperSectorSelector (int map_x, int map_y, int new_sec);
 
 // s_prop.cc (previously in editobj.cc)
 void SectorProperties (int x0, int y0, SelPtr obj);
+void TransferSectorProperties (int src_sector, SelPtr sectors);
 
 // s_split.cc (previously in objects.cc)
 void SplitSector (int, int); /* SWAP! */
 void SplitLineDefsAndSector (int, int); /* SWAP! */
+void MultiSplitLineDefsAndSector (int, int); /* SWAP! */
 
 // swapmem.cc
 void InitSwap (void);
@@ -560,6 +564,7 @@
 // selrect.cc
 // t_prop.c (previously in editobj.c)
 void ThingProperties (int x0, int y0, SelPtr obj);
+void TransferThingProperties (int src_thing, SelPtr things);
 
 // v_merge.cc
 void DeleteVerticesJoinLineDefs (SelPtr ); /* SWAP! */

Yadex_170_Hexen.diff:

--- NEW FILE Yadex_170_Hexen.diff ---
diff -N -p -r -u yadex-1.7.0-orig/src/editloop.cc yadex-1.7.0/src/editloop.cc
--- yadex-1.7.0-orig/src/editloop.cc	Tue Oct 19 20:53:55 2004
+++ yadex-1.7.0/src/editloop.cc	Wed Oct 20 00:54:28 2004
@@ -43,6 +43,7 @@ Place, Suite 330, Boston, MA 02111-1307,
 #include "entry.h"
 #include "entry2.h"
 #include "events.h"
+#include "game.h"
 #include "gfx.h"
 #include "gfx2.h"	// show_character_set() show_pcolours()
 #include "gfx3.h"
@@ -94,6 +95,7 @@ static int menubar_out_y1;	/* FIXME */
 
 /* prototypes of private functions */
 static int SortLevels (const void *item1, const void *item2);
+static char *GetBehaviorFileName (const char *levelname);
 
 /*
  *	SelectLevel
@@ -303,15 +305,28 @@ e.mb_menu[MBM_FILE] = new Menu (NULL,
    "~Quit",       'q',   0,
    NULL);
 
-e.mb_menu[MBM_EDIT] = new Menu (NULL,
-   "~Copy object(s)",          'o',    0,
-   "~Add object",              YK_INS, 0,
-   "~Delete object(s)",        YK_DEL, 0,
-   "~Exchange object numbers", 24,     0,
-   "~Preferences...",          YK_F5,  0,
-   "~Snap to grid",            'y',    MIF_VTICK, &e.grid_snap,		     0,
-   "~Lock grid step",          'z',    MIF_VTICK, &e.grid_step_locked,	     0,
-   NULL);
+
+if (yg_level_format == YGLF_HEXEN)
+   e.mb_menu[MBM_EDIT] = new Menu (NULL,
+     "~Copy object(s)",          'o',    0,
+      "~Add object",              YK_INS, 0,
+      "~Delete object(s)",        YK_DEL, 0,
+      "~Exchange object numbers", 24,     0,
+      "~Preferences...",          YK_F5,  0,
+      "~Snap to grid",            'y',    MIF_VTICK, &e.grid_snap,		     0,
+      "~Lock grid step",          'z',    MIF_VTICK, &e.grid_step_locked,	     0,
+      "Load ~BEHAVIOR lump",      'b',    0,
+      NULL);
+else
+   e.mb_menu[MBM_EDIT] = new Menu (NULL,
+      "~Copy object(s)",          'o',    0,
+      "~Add object",              YK_INS, 0,
+      "~Delete object(s)",        YK_DEL, 0,
+      "~Exchange object numbers", 24,     0,
+      "~Preferences...",          YK_F5,  0,
+      "~Snap to grid",            'y',    MIF_VTICK, &e.grid_snap,		     0,
+      "~Lock grid step",          'z',    MIF_VTICK, &e.grid_step_locked,	     0,
+      NULL);
 
 // If you change the order of modes here, don't forget
 // to modify the <modes> array.
@@ -2357,6 +2372,30 @@ cancel_save_as:
 	 RedrawMap = 1;
 	 }
 
+      // Load BEHAVIOR lump (JL)
+      else if (is.key == 'b')
+         {
+         char *acsfile;
+         const char *acsname;
+         if (levelname)
+            acsname = levelname;
+         else
+            acsname = "behavior";
+         acsfile = GetBehaviorFileName (acsname);
+         FILE* f = fopen(acsfile, "rb");
+         if (f)
+            {
+            FreeFarMemory(Behavior);
+            fseek(f, 0, SEEK_END);
+            BehaviorSize = ftell(f);
+            Behavior = (u8*)GetFarMemory(BehaviorSize);
+            fseek(f, 0, SEEK_SET);
+            fread(Behavior, BehaviorSize, 1, f);
+            fclose(f);
+            }
+         RedrawMap = 1;
+      }
+
       /* user likes music */
       else if (is.key)
 	 {
@@ -2504,6 +2543,34 @@ static int zoom_fit (edit_t& e)
     return 1;
   CenterMapAroundCoords ((MapMinX + MapMaxX) / 2, (MapMinY + MapMaxY) / 2);
   return 0;
+}
+
+/*
+   get the name of the BEHAVIOR lump file (returns NULL on Esc)
+*/
+
+static char *GetBehaviorFileName (const char *levelname)
+{
+#define BUFSZ 79
+  char *outfile = (char *) GetMemory (BUFSZ + 1);
+
+  /* get the file name */
+  // If no name, find a default one
+  if (! levelname)
+  {
+    levelname = "behavior";
+  }
+
+  al_scpslower (outfile, levelname, BUFSZ);
+  al_saps (outfile, ".o", BUFSZ);
+  InputFileName (-1, -1, "Name of the BEHAVIOR script file:", BUFSZ, outfile);
+  /* escape */
+  if (outfile[0] == '\0')
+  {
+    FreeMemory (outfile);
+    return 0;
+  }
+  return outfile;
 }
 
 
diff -N -p -r -u yadex-1.7.0-orig/src/l_prop.cc yadex-1.7.0/src/l_prop.cc
--- yadex-1.7.0-orig/src/l_prop.cc	Tue Oct 19 20:53:55 2004
+++ yadex-1.7.0/src/l_prop.cc	Tue Oct 19 23:16:01 2004
@@ -111,7 +111,7 @@ static const char *PrintLdtgroup (void *
 
 void LinedefProperties (int x0, int y0, SelPtr obj)
 {
-  char  *menustr[8];
+  char  *menustr[12];
   char   texname[WAD_TEX_NAME + 1];
   int    n, val;
   SelPtr cur, sdlist;
@@ -132,9 +132,9 @@ void LinedefProperties (int x0, int y0, 
   switch (val)
   {
     case 1:
-      for (n = 0; n < 8; n++)
+      for (n = 0; n < 12; n++)
 	menustr[n] = (char *) GetMemory (60);
-      sprintf (menustr[7], "Edit linedef #%d", obj->objnum);
+      sprintf (menustr[11], "Edit linedef #%d", obj->objnum);
       sprintf (menustr[0], "Change flags            (Current: %d)",
 	LineDefs[obj->objnum].flags);
       sprintf (menustr[1], "Change type             (Current: %d)",
@@ -149,7 +149,16 @@ void LinedefProperties (int x0, int y0, 
 	LineDefs[obj->objnum].sidedef1);
       sprintf (menustr[6], "Change 2nd sidedef ref. (Current: #%d)",
 	LineDefs[obj->objnum].sidedef2);
-      val = vDisplayMenu (x0 + 42, subwin_y0, menustr[7],
+      sprintf (menustr[7], "Change special arg2     (Current: %d)",
+	LineDefs[obj->objnum].arg2);
+      sprintf (menustr[8], "Change special arg3     (Current: %d)",
+	LineDefs[obj->objnum].arg3);
+      sprintf (menustr[9], "Change special arg4     (Current: %d)",
+	LineDefs[obj->objnum].arg4);
+      sprintf (menustr[10], "Change special arg5     (Current: %d)",
+	LineDefs[obj->objnum].arg5);
+      if (yg_level_format == YGLF_HEXEN)
+         val = vDisplayMenu (x0 + 42, subwin_y0, menustr[11],
 	menustr[0], YK_, 0,
 	menustr[1], YK_, 0,
 	menustr[2], YK_, 0,
@@ -157,8 +166,22 @@ void LinedefProperties (int x0, int y0, 
 	menustr[4], YK_, 0,
 	menustr[5], YK_, 0,
 	menustr[6], YK_, 0,
+	menustr[7], YK_, 0,
+	menustr[8], YK_, 0,
+	menustr[9], YK_, 0,
+	menustr[10], YK_, 0,
 	NULL);
-      for (n = 0; n < 8; n++)
+	  else
+         val = vDisplayMenu (x0 + 42, subwin_y0, menustr[11],
+	menustr[0], YK_, 0,
+	menustr[1], YK_, 0,
+	menustr[2], YK_, 0,
+	menustr[3], YK_, 0,
+	menustr[4], YK_, 0,
+	menustr[5], YK_, 0,
+	menustr[6], YK_, 0,
+	NULL);
+      for (n = 0; n < 12; n++)
 	FreeMemory (menustr[n]);
       subsubwin_y0 = subwin_y0 + BOX_BORDER + (2 + val) * FONTH;
       switch (val)
@@ -267,6 +290,50 @@ void LinedefProperties (int x0, int y0, 
 	      LineDefs[cur->objnum].sidedef2 = val;
 	    MadeChanges = 1;
 	    MadeMapChanges = 1;
+	  }
+	  break;
+
+	case 8:
+	  val = InputIntegerValue (x0 + 84, subsubwin_y0,
+	    0, 255, LineDefs[obj->objnum].arg2);
+	  if (val != IIV_CANCEL)  // Not [esc]
+	  {
+	    for (cur = obj; cur; cur = cur->next)
+	      LineDefs[cur->objnum].arg2 = val;
+	    MadeChanges = 1;
+	  }
+	  break;
+
+	case 9:
+	  val = InputIntegerValue (x0 + 84, subsubwin_y0,
+	    0, 255, LineDefs[obj->objnum].arg3);
+	  if (val != IIV_CANCEL)  // Not [esc]
+	  {
+	    for (cur = obj; cur; cur = cur->next)
+	      LineDefs[cur->objnum].arg3 = val;
+	    MadeChanges = 1;
+	  }
+	  break;
+
+	case 10:
+	  val = InputIntegerValue (x0 + 84, subsubwin_y0,
+	    0, 255, LineDefs[obj->objnum].arg4);
+	  if (val != IIV_CANCEL)  // Not [esc]
+	  {
+	    for (cur = obj; cur; cur = cur->next)
+	      LineDefs[cur->objnum].arg4 = val;
+	    MadeChanges = 1;
+	  }
+	  break;
+
+	case 11:
+	  val = InputIntegerValue (x0 + 84, subsubwin_y0,
+	    0, 255, LineDefs[obj->objnum].arg5);
+	  if (val != IIV_CANCEL)  // Not [esc]
+	  {
+	    for (cur = obj; cur; cur = cur->next)
+	      LineDefs[cur->objnum].arg5 = val;
+	    MadeChanges = 1;
 	  }
 	  break;
      }
diff -N -p -r -u yadex-1.7.0-orig/src/levels.cc yadex-1.7.0/src/levels.cc
--- yadex-1.7.0-orig/src/levels.cc	Tue Oct 19 20:53:55 2004
+++ yadex-1.7.0/src/levels.cc	Wed Oct 20 00:04:05 2004
@@ -58,6 +58,8 @@ int NumVertices;		/* number of vertexes 
 VPtr Vertices;			/* vertex data */
 int NumSectors;			/* number of sectors */
 SPtr Sectors;			/* sectors data */
+u8* Behavior;
+int BehaviorSize;
 
 // FIXME should be somewhere else
 int NumWTexture;		/* number of wall textures */
@@ -95,6 +97,10 @@ y_file_name_t Level_file_name_saved;  /*
 				   the Level has never been saved yet,
 				   an empty string. */
 
+static u8 DefaultBehavior[16] = {
+	'A', 'C', 'S', 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
+
 void EmptyLevelData (const char *levelname)
 {
 Things = 0;
@@ -109,6 +115,12 @@ Sectors = 0;
 NumSectors = 0;
 Vertices = 0;
 NumVertices = 0;
+if (yg_level_format == YGLF_HEXEN)
+   {
+      BehaviorSize = sizeof(DefaultBehavior);
+      Behavior = (u8*) GetFarMemory ((unsigned long) BehaviorSize );
+      memcpy(Behavior, DefaultBehavior, BehaviorSize);
+   }
 }
 
 
@@ -199,7 +211,7 @@ else
    {
    offset = dir->dir.start;
    length = dir->dir.size;
-   if (MainWad == Iwad4)  // Hexen mode
+   if (yg_level_format == YGLF_HEXEN)  // Hexen mode
       {
       NumThings = (int) (length / WAD_HEXEN_THING_BYTES);
       if ((i32) (NumThings * WAD_HEXEN_THING_BYTES) != length)
@@ -234,18 +246,23 @@ if (NumThings > 0)
       rc = 1;
       goto byebye;
       }
-   if (MainWad == Iwad4)		// Hexen mode
+   if (yg_level_format == YGLF_HEXEN)		// Hexen mode
       for (long n = 0; n < NumThings; n++)
 	 {
          u8 dummy2[6];
-	 wf->read_i16   ();					// Tid
+	 wf->read_i16   (&Things[n].tid  );
 	 wf->read_i16   (&Things[n].xpos );
 	 wf->read_i16   (&Things[n].ypos );
-	 wf->read_i16   ();					// Height
+	 wf->read_i16   (&Things[n].height);
 	 wf->read_i16   (&Things[n].angle);
 	 wf->read_i16   (&Things[n].type );
 	 wf->read_i16   (&Things[n].when );
-         wf->read_bytes (dummy2, sizeof dummy2);
+	 wf->read_u8    (Things[n].special);
+	 wf->read_u8    (Things[n].arg1  );
+	 wf->read_u8    (Things[n].arg2  );
+	 wf->read_u8    (Things[n].arg3  );
+	 wf->read_u8    (Things[n].arg4  );
+	 wf->read_u8    (Things[n].arg5  );
 	 if (wf->error ())
 	    {
 	    err ("%s: error reading thing #%ld", lump_name, n);
@@ -283,7 +300,7 @@ if (yg_level_format != YGLF_ALPHA)
       NumLineDefs = 0;
    else
       {
-      if (MainWad == Iwad4)  // Hexen mode
+      if (yg_level_format == YGLF_HEXEN)  // Hexen mode
 	 {
 	 NumLineDefs = (int) (dir->dir.size / WAD_HEXEN_LINEDEF_BYTES);
 	 if ((i32) (NumLineDefs * WAD_HEXEN_LINEDEF_BYTES) != dir->dir.size)
@@ -310,7 +327,7 @@ if (yg_level_format != YGLF_ALPHA)
 	 rc = 1;
 	 goto byebye;
 	 }
-      if (MainWad == Iwad4)  // Hexen mode
+      if (yg_level_format == YGLF_HEXEN)  // Hexen mode
 	 for (long n = 0; n < NumLineDefs; n++)
 	    {
 	    u8 dummy[6];
@@ -322,6 +339,10 @@ if (yg_level_format != YGLF_ALPHA)
 	    wf->read_i16   (&LineDefs[n].sidedef2);
 	    LineDefs[n].type = dummy[0];
 	    LineDefs[n].tag  = dummy[1];  // arg1 often contains a tag
+		LineDefs[n].arg2 = dummy[2];
+		LineDefs[n].arg3 = dummy[3];
+		LineDefs[n].arg4 = dummy[4];
+		LineDefs[n].arg5 = dummy[5];
 	    if (wf->error ())
 	       {
 	       err ("%s: error reading linedef #%ld", lump_name, n);
@@ -907,6 +928,37 @@ else  // Doom alpha--a wholly different 
    }
 }
 
+// Read BEHAVIOR
+if (yg_level_format == YGLF_HEXEN)
+{
+const char *lump_name = "BEHAVIOR";
+verbmsg (" behavior\n");
+dir = FindMasterDir (Level, lump_name);
+if (dir)
+   {
+   BehaviorSize = (int)dir->dir.size;
+   if (BehaviorSize > 0)
+      {
+      Behavior = (u8*) GetFarMemory ((unsigned long) BehaviorSize );
+      const Wad_file *wf = dir->wadfile;
+      wf->seek (dir->dir.start);
+      if (wf->error ())
+         {
+         err ("%s: seek error", lump_name);
+         rc = 1;
+         goto byebye;
+         }
+      wf->read_bytes (Behavior, BehaviorSize);
+      if (wf->error ())
+         {
+         err ("%s: error behavior lump", lump_name);
+         rc = 1;
+         goto byebye;
+         }
+      }
+   }
+}
+
 /* Sanity checking on sidedefs: the sector must exist. I don't
    make this a fatal error, though, because it's not exceptional
    to find wads with unused sidedefs with a sector# of -1. Well
@@ -1011,16 +1063,10 @@ int SaveLevelData (const char *outfile, 
 FILE   *file;
 MDirPtr dir;
 int     n;
-long	lump_offset[WAD_LL__];
-size_t	lump_size[WAD_LL__];
+long	lump_offset[WAD_LL__MAX];
+size_t	lump_size[WAD_LL__MAX];
 wad_level_lump_no_t l;
 
-if (yg_level_format == YGLF_HEXEN || ! strcmp (Game, "hexen"))
-   {
-   Notify (-1, -1, "I refuse to save. Hexen mode is still",
-                   "too badly broken. You would lose data.");
-   return 1;
-   }
 if (! level_name || ! levelname2levelno (level_name))
    {
    nf_bug ("SaveLevelData: bad level_name \"%s\", using \"E1M1\" instead.",
@@ -1047,9 +1093,15 @@ bool reuse_nodes = Level
   && ! MadeMapChanges
   && yg_level_format != YGLF_ALPHA;
 
+int NumLumps;
+if (yg_level_format == YGLF_HEXEN)
+   NumLumps = WAD_LL__HEXEN;
+else
+   NumLumps = WAD_LL__DOOM;
+
 // Write the pwad header
 WriteBytes (file, "PWAD", 4);		// Pwad file
-file_write_i32 (file, WAD_LL__);	// Number of entries = 11
+file_write_i32 (file, NumLumps);	// Number of entries = 11
 file_write_i32 (file, 0);		// Fix this up later
 if (Level)
    dir = Level->next;
@@ -1067,11 +1119,30 @@ lump_offset[l] = ftell (file);
 ObjectsNeeded (OBJ_THINGS, 0);
 for (n = 0; n < NumThings; n++)
    {
-   file_write_i16 (file, Things[n].xpos );
-   file_write_i16 (file, Things[n].ypos );
-   file_write_i16 (file, Things[n].angle);
-   file_write_i16 (file, Things[n].type );
-   file_write_i16 (file, Things[n].when );
+   if (yg_level_format == YGLF_HEXEN)
+      {
+      file_write_i16 (file, Things[n].tid  );
+      file_write_i16 (file, Things[n].xpos );
+      file_write_i16 (file, Things[n].ypos );
+      file_write_i16 (file, Things[n].height);
+      file_write_i16 (file, Things[n].angle);
+      file_write_i16 (file, Things[n].type );
+      file_write_i16 (file, Things[n].when );
+      WriteBytes     (file, &Things[n].special, 1);
+      WriteBytes     (file, &Things[n].arg1, 1 );
+      WriteBytes     (file, &Things[n].arg2, 1 );
+      WriteBytes     (file, &Things[n].arg3, 1 );
+      WriteBytes     (file, &Things[n].arg4, 1 );
+      WriteBytes     (file, &Things[n].arg5, 1 );
+	  }
+   else
+      {
+      file_write_i16 (file, Things[n].xpos );
+      file_write_i16 (file, Things[n].ypos );
+      file_write_i16 (file, Things[n].angle);
+      file_write_i16 (file, Things[n].type );
+      file_write_i16 (file, Things[n].when );
+      }
    }
 lump_size[l] = ftell (file) - lump_offset[l];
 if (Level)
@@ -1083,13 +1154,32 @@ lump_offset[WAD_LL_LINEDEFS] = ftell (fi
 ObjectsNeeded (OBJ_LINEDEFS, 0);
 for (n = 0; n < NumLineDefs; n++)
    {
-   file_write_i16 (file, LineDefs[n].start   );
-   file_write_i16 (file, LineDefs[n].end     );
-   file_write_i16 (file, LineDefs[n].flags   );
-   file_write_i16 (file, LineDefs[n].type    );
-   file_write_i16 (file, LineDefs[n].tag     );
-   file_write_i16 (file, LineDefs[n].sidedef1);
-   file_write_i16 (file, LineDefs[n].sidedef2);
+   if (yg_level_format == YGLF_HEXEN)
+      {
+      u8 dummy[6];
+      dummy[0] = LineDefs[n].type;
+      dummy[1] = LineDefs[n].tag;
+      dummy[2] = LineDefs[n].arg2;
+      dummy[3] = LineDefs[n].arg3;
+      dummy[4] = LineDefs[n].arg4;
+      dummy[5] = LineDefs[n].arg5;
+      file_write_i16 (file, LineDefs[n].start   );
+      file_write_i16 (file, LineDefs[n].end     );
+      file_write_i16 (file, LineDefs[n].flags   );
+      WriteBytes     (file, dummy, 6);
+      file_write_i16 (file, LineDefs[n].sidedef1);
+      file_write_i16 (file, LineDefs[n].sidedef2);
+	  }
+   else
+      {
+      file_write_i16 (file, LineDefs[n].start   );
+      file_write_i16 (file, LineDefs[n].end     );
+      file_write_i16 (file, LineDefs[n].flags   );
+      file_write_i16 (file, LineDefs[n].type    );
+      file_write_i16 (file, LineDefs[n].tag     );
+      file_write_i16 (file, LineDefs[n].sidedef1);
+      file_write_i16 (file, LineDefs[n].sidedef2);
+	  }
    }
 lump_size[l] = ftell (file) - lump_offset[l];
 if (Level)
@@ -1221,9 +1311,21 @@ lump_size[l] = ftell (file) - lump_offse
 if (Level)
    dir = dir->next;
 
+ 
+// Write the BEHAVIOR lump
+if (yg_level_format == YGLF_HEXEN)
+{
+   l = WAD_LL_BEHAVIOR;
+   lump_offset[l] = ftell (file);
+   WriteBytes(file, Behavior, BehaviorSize);
+   lump_size[l] = BehaviorSize;
+   if (Level)
+      dir = dir->next;
+}
+
 // Write the actual directory
 long dir_offset = ftell (file);
-for (int L = 0; L < (int) WAD_LL__; L++)
+for (int L = 0; L < (int) NumLumps; L++)
    {
    file_write_i32 (file, lump_offset[L]);
    file_write_i32 (file, lump_size[L]);
diff -N -p -r -u yadex-1.7.0-orig/src/levels.h yadex-1.7.0/src/levels.h
--- yadex-1.7.0-orig/src/levels.h	Tue Oct 19 20:53:55 2004
+++ yadex-1.7.0/src/levels.h	Tue Oct 19 22:22:49 2004
@@ -28,6 +28,8 @@ extern VPtr  Vertices;		/* vertices data
 extern int   NumSegs;		/* number of segments */
 extern int   NumSectors;	/* number of sectors */
 extern SPtr  Sectors;		/* sectors data */
+extern u8*   Behavior;
+extern int   BehaviorSize;
 
 // FIXME should be somewhere else
 extern int   NumWTexture;	/* number of wall textures */
diff -N -p -r -u yadex-1.7.0-orig/src/objects.cc yadex-1.7.0/src/objects.cc
--- yadex-1.7.0-orig/src/objects.cc	Tue Oct 19 20:53:55 2004
+++ yadex-1.7.0/src/objects.cc	Tue Oct 19 23:53:42 2004
@@ -465,12 +465,28 @@ switch (objtype)
 	 Things[last].type  = Things[copyfrom].type;
 	 Things[last].angle = Things[copyfrom].angle;
 	 Things[last].when  = Things[copyfrom].when;
+	 Things[last].tid   = Things[copyfrom].tid;
+	 Things[last].height = Things[copyfrom].height;
+	 Things[last].special = Things[copyfrom].special;
+	 Things[last].arg1  = Things[copyfrom].arg1;
+	 Things[last].arg2  = Things[copyfrom].arg2;
+	 Things[last].arg3  = Things[copyfrom].arg3;
+	 Things[last].arg4  = Things[copyfrom].arg4;
+	 Things[last].arg5  = Things[copyfrom].arg5;
 	 }
       else
 	 {
 	 Things[last].type = default_thing;
 	 Things[last].angle = 0;
 	 Things[last].when  = 0x07;
+	 Things[last].tid   = 0;
+	 Things[last].height = 0;
+	 Things[last].special = 0;
+	 Things[last].arg1  = 0;
+	 Things[last].arg2  = 0;
+	 Things[last].arg3  = 0;
+	 Things[last].arg4  = 0;
+	 Things[last].arg5  = 0;
 	 }
       break;
 
@@ -508,6 +524,10 @@ switch (objtype)
 	 LineDefs[last].flags = LineDefs[copyfrom].flags;
 	 LineDefs[last].type  = LineDefs[copyfrom].type;
 	 LineDefs[last].tag   = LineDefs[copyfrom].tag;
+	 LineDefs[last].arg2  = LineDefs[copyfrom].arg2;
+	 LineDefs[last].arg3  = LineDefs[copyfrom].arg3;
+	 LineDefs[last].arg4  = LineDefs[copyfrom].arg4;
+	 LineDefs[last].arg5  = LineDefs[copyfrom].arg5;
 	 }
       else
 	 {
@@ -516,6 +536,10 @@ switch (objtype)
 	 LineDefs[last].flags = 1;
 	 LineDefs[last].type  = 0;
 	 LineDefs[last].tag   = 0;
+	 LineDefs[last].arg2  = 0;
+	 LineDefs[last].arg3  = 0;
+	 LineDefs[last].arg4  = 0;
+	 LineDefs[last].arg5  = 0;
 	 }
       LineDefs[last].sidedef1 = OBJ_NO_NONE;
       LineDefs[last].sidedef2 = OBJ_NO_NONE;
diff -N -p -r -u yadex-1.7.0-orig/src/sanity.cc yadex-1.7.0/src/sanity.cc
--- yadex-1.7.0-orig/src/sanity.cc	Tue Oct 19 20:53:55 2004
+++ yadex-1.7.0/src/sanity.cc	Tue Oct 19 22:11:08 2004
@@ -67,10 +67,10 @@ void check_types ()
   assert_size (i16, 2);
   assert_size (u32, 4);
   assert_size (i32, 4);
-  assert_size (struct LineDef, 14);
+  assert_size (struct LineDef, 18);
   assert_size (struct Sector,  26);
   assert_size (struct SideDef, 30);
-  assert_size (struct Thing,   10);
+  assert_size (struct Thing,   20);
   assert_size (struct Vertex,   4);
   assert_wrap (u8,          255,           0);
   assert_wrap (i8,          127,        -128);
diff -N -p -r -u yadex-1.7.0-orig/src/t_prop.cc yadex-1.7.0/src/t_prop.cc
--- yadex-1.7.0-orig/src/t_prop.cc	Tue Oct 19 20:53:55 2004
+++ yadex-1.7.0/src/t_prop.cc	Tue Oct 19 23:43:46 2004
@@ -45,6 +45,7 @@ Place, Suite 330, Boston, MA 02111-1307,
 static const char *PrintThinggroup (void *ptr);
 static const char *PrintThingdef (void *ptr);
 int InputThingType (int x0, int y0, int *number);
+int InputLinedefType (int x0, int y0, int *number);
 
 
 /*
@@ -59,9 +60,9 @@ int    n, val;
 SelPtr cur;
 int    subwin_y0;
 
-for (n = 0; n < 6; n++)
+for (n = 0; n < 14; n++)
    menustr[n] = (char *) GetMemory (60);
-sprintf (menustr[5], "Edit thing #%d", obj->objnum);
+sprintf (menustr[13], "Edit thing #%d", obj->objnum);
 sprintf (menustr[0], "Change type          (Current: %s)",
          get_thing_name (Things[obj->objnum].type));
 sprintf (menustr[1], "Change angle         (Current: %s)",
@@ -72,14 +73,47 @@ sprintf (menustr[3], "Change X position 
          Things[obj->objnum].xpos);
 sprintf (menustr[4], "Change Y position    (Current: %d)",
          Things[obj->objnum].ypos);
-val = vDisplayMenu (x0, y0, menustr[5],
+sprintf (menustr[5], "Change Z position    (Current: %d)",
+         Things[obj->objnum].height);
+sprintf (menustr[6], "Change TID           (Current: %d)",
+         Things[obj->objnum].tid);
+sprintf (menustr[7], "Change special       (Current: %d)",
+         Things[obj->objnum].special);
+sprintf (menustr[8], "Change arg1          (Current: %d)",
+         Things[obj->objnum].arg1);
+sprintf (menustr[9], "Change arg2          (Current: %d)",
+         Things[obj->objnum].arg2);
+sprintf (menustr[10], "Change arg3          (Current: %d)",
+         Things[obj->objnum].arg3);
+sprintf (menustr[11], "Change arg4          (Current: %d)",
+         Things[obj->objnum].arg4);
+sprintf (menustr[12], "Change arg5          (Current: %d)",
+         Things[obj->objnum].arg5);
+if (yg_level_format == YGLF_HEXEN)		// Hexen mode
+val = vDisplayMenu (x0, y0, menustr[13],
    menustr[0], YK_, 0,
    menustr[1], YK_, 0,
    menustr[2], YK_, 0,
    menustr[3], YK_, 0,
    menustr[4], YK_, 0,
+   menustr[5], YK_, 0,
+   menustr[6], YK_, 0,
+   menustr[7], YK_, 0,
+   menustr[8], YK_, 0,
+   menustr[9], YK_, 0,
+   menustr[10], YK_, 0,
+   menustr[11], YK_, 0,
+   menustr[12], YK_, 0,
    NULL);
-for (n = 0; n < 6; n++)
+else
+val = vDisplayMenu (x0, y0, menustr[13],
+   menustr[0], YK_, 0,
+   menustr[1], YK_, 0,
+   menustr[2], YK_, 0,
+   menustr[3], YK_, 0,
+   menustr[4], YK_, 0,
+   NULL);
+for (n = 0; n < 14; n++)
    FreeMemory (menustr[n]);
 subwin_y0 = y0 + BOX_BORDER + (2 + val) * FONTH;
 switch (val)
@@ -237,6 +271,93 @@ switch (val)
 	n = val - Things[obj->objnum].ypos;
 	for (cur = obj; cur; cur = cur->next)
 	   Things[cur->objnum].ypos += n;
+	MadeChanges = 1;
+        }
+     break;
+
+  case 6:
+     val = InputIntegerValue (x0 + 42, subwin_y0, -32768, 32767,
+                              Things[obj->objnum].height);
+     if (val != IIV_CANCEL)
+        {
+	n = val - Things[obj->objnum].height;
+	for (cur = obj; cur; cur = cur->next)
+	   Things[cur->objnum].height += n;
+	MadeChanges = 1;
+        }
+     break;
+
+  case 7:
+     val = InputIntegerValue (x0 + 42, subwin_y0, -32768, 32767,
+                              Things[obj->objnum].tid);
+     if (val != IIV_CANCEL)
+        {
+	for (cur = obj; cur; cur = cur->next)
+	   Things[cur->objnum].tid = val;
+	MadeChanges = 1;
+        }
+     break;
+
+  case 8:
+     if (! InputLinedefType (x0 + 42, subwin_y0, &val))
+        {
+	for (cur = obj; cur; cur = cur->next)
+	   Things[cur->objnum].special = val;
+	MadeChanges = 1;
+        }
+     break;
+
+  case 9:
+     val = InputIntegerValue (x0 + 42, subwin_y0, 0, 255,
+                              Things[obj->objnum].arg1);
+     if (val != IIV_CANCEL)
+        {
+	for (cur = obj; cur; cur = cur->next)
+	   Things[cur->objnum].arg1 = val;
+	MadeChanges = 1;
+        }
+     break;
+
+  case 10:
+     val = InputIntegerValue (x0 + 42, subwin_y0, 0, 255,
+                              Things[obj->objnum].arg2);
+     if (val != IIV_CANCEL)
+        {
+	for (cur = obj; cur; cur = cur->next)
+	   Things[cur->objnum].arg2 = val;
+	MadeChanges = 1;
+        }
+     break;
+
+  case 11:
+     val = InputIntegerValue (x0 + 42, subwin_y0, 0, 255,
+                              Things[obj->objnum].arg3);
+     if (val != IIV_CANCEL)
+        {
+	for (cur = obj; cur; cur = cur->next)
+	   Things[cur->objnum].arg3 = val;
+	MadeChanges = 1;
+        }
+     break;
+
+  case 12:
+     val = InputIntegerValue (x0 + 42, subwin_y0, 0, 255,
+                              Things[obj->objnum].arg4);
+     if (val != IIV_CANCEL)
+        {
+	for (cur = obj; cur; cur = cur->next)
+	   Things[cur->objnum].arg4 = val;
+	MadeChanges = 1;
+        }
+     break;
+
+  case 13:
+     val = InputIntegerValue (x0 + 42, subwin_y0, 0, 255,
+                              Things[obj->objnum].arg5);
+     if (val != IIV_CANCEL)
+        {
+	for (cur = obj; cur; cur = cur->next)
+	   Things[cur->objnum].arg5 = val;
 	MadeChanges = 1;
         }
      break;
diff -N -p -r -u yadex-1.7.0-orig/src/wstructs.h yadex-1.7.0/src/wstructs.h
--- yadex-1.7.0-orig/src/wstructs.h	Tue Oct 19 20:53:55 2004
+++ yadex-1.7.0/src/wstructs.h	Tue Oct 19 22:45:16 2004
@@ -84,14 +84,30 @@ typedef i16 wad_tangle_t;
 typedef i16 wad_tflags_t;
 struct Thing
 {
+  i16              tid;
   wad_coord_t      xpos;		// FIXME rename to "x"
   wad_coord_t      ypos;		// FIXME rename to "y"
+  wad_z_t          height;
   wad_tangle_t     angle;
   wad_ttype_t      type;
   wad_tflags_t     when;		// FIXME rename to "flags"
+  u8               special;
+  u8               arg1;
+  u8               arg2;
+  u8               arg3;
+  u8               arg4;
+  u8               arg5;
 };
 typedef struct
 {
+  wad_coord_t      xpos;		// FIXME rename to "x"
+  wad_coord_t      ypos;		// FIXME rename to "y"
+  wad_tangle_t     angle;
+  wad_ttype_t      type;
+  wad_tflags_t     when;		// FIXME rename to "flags"
+} wad_doom_thing_t;
+typedef struct
+{
   i16              tid;
   wad_coord_t      x;
   wad_coord_t      y;
@@ -121,11 +137,25 @@ struct LineDef
   wad_ldflags_t flags;
   wad_ldtype_t  type;
   wad_tag_t     tag;
+  u8            arg2;
+  u8            arg3;
+  u8            arg4;
+  u8            arg5;
   wad_sdn_t     sidedef1;		// # of first (right) sidedef
   wad_sdn_t     sidedef2;		// # of second (left) sidedef or 0xffff
 };
 typedef struct
 {
+  wad_vn_t      start;			// # of start vertex
+  wad_vn_t      end;			// # of end vertex
+  wad_ldflags_t flags;
+  wad_ldtype_t  type;
+  wad_tag_t     tag;
+  wad_sdn_t     sidedef1;		// # of first (right) sidedef
+  wad_sdn_t     sidedef2;		// # of second (left) sidedef or 0xffff
+} wad_doom_linedef_t;
+typedef struct
+{
   wad_vn_t      start;
   wad_vn_t      end;
   wad_ldflags_t flags;
@@ -197,8 +227,11 @@ typedef enum
   WAD_LL_SECTORS,
   WAD_LL_REJECT,
   WAD_LL_BLOCKMAP,
-		      // Hexen has a BEHAVIOR lump here
-  WAD_LL__
+  WAD_LL_BEHAVIOR,
+
+  WAD_LL__MAX,
+  WAD_LL__HEXEN = WAD_LL__MAX,
+  WAD_LL__DOOM = WAD_LL_BEHAVIOR
 } wad_level_lump_no_t;
 
 typedef struct
@@ -207,7 +240,7 @@ typedef struct
   size_t item_size;
 } wad_level_lump_def_t;
 
-const wad_level_lump_def_t wad_level_lump[WAD_LL__] =
+const wad_level_lump_def_t wad_level_lump[WAD_LL__MAX] =
 {
   { 0,          0                 },  // Label -- no fixed name
   { "THINGS",   WAD_THING_BYTES   },
@@ -219,8 +252,8 @@ const wad_level_lump_def_t wad_level_lum
   { "NODES",    0                 },
   { "SECTORS",  WAD_SECTOR_BYTES  },
   { "REJECT",   0                 },
-  { "BLOCKMAP", 0                 }
-				      // Hexen has a BEHAVIOR lump here
+  { "BLOCKMAP", 0                 },
+  { "BEHAVIOR", 0                 }
 };
 
 
--- yadex-1.7.0-orig/ygd/hexen.ygd	Tue Oct 19 20:53:55 2004
+++ yadex-1.7.0/ygd/hexen.ygd	Wed Oct 20 23:55:14 2004
@@ -108,6 +108,7 @@ ldt 100 x "?? Scroll left"   "??  Scroll
 ldt 101 x "?? Scroll right"  "??  Scroll_Texture_Right"
 ldt 102 x "?? Scroll up"     "??  Scroll_Texture_Up"
 ldt 103 x "?? Scroll down"   "??  Scroll_Texture_Down"
+ldt 109 L "?? Force lightng" "??  Light_ForceLightning"
 ldt 110 L "?? Raise light"   "??  Light_RaiseByValue"
 ldt 111 L "?? Lower light"   "??  Light_LowerByValue"
 ldt 112 L "?? Set light"     "??  Light_ChangeToValue"
@@ -136,25 +137,12 @@ ldt 140 x "?? Change sound"  "??  Sector
 #
 
 st   0 "  Normal"       "Normal"
-st   1 "  Phased light" "light phased"           # FIXME
-st   2 "  Light start"  "lightsequencestart"     # FIXME
-st   3 "  Light specl1" "lightsequencespecial1"  # FIXME
-st   4 "  Light specl2" "lightsequencespecial2"  # FIXME
-st   9 "  Secret"       "Sector counts toward secret count"
+st   1 "  Phased light" "light phased"
+st   2 "  Light start"  "lightsequencestart"
+st   3 "  Light specl1" "lightsequencespecial1"
+st   4 "  Light specl2" "lightsequencespecial2"
 st  26 "  Stairs1"      "Stairs special 1"
 st  27 "  Stairs2"      "Stairs special 2"
-st  40 "  Wind east 1"  "Wind east force 1"
-st  41 "  Wind east 2"  "Wind east force 2"
-st  42 "  Wind east 3"  "Wind east force 3"
-st  43 "  Wind north 1" "Wind north force 1"
-st  44 "  Wind north 2" "Wind north force 2"
-st  45 "  Wind north 3" "Wind north force 3"
-st  46 "  Wind south 1" "Wind south force 1"
-st  47 "  Wind south 2" "Wind south force 2"
-st  48 "  Wind south 3" "Wind south force 3"
-st  49 "  Wind west 1"  "Wind west force 1"
-st  50 "  Wind west 2"  "Wind west force 2"
-st  51 "  Wind west 3"  "Wind west force 3"
 st 198 "  Lightning 64" "Indoor lightning, +64 units"
 st 199 "  Lightning 32" "Indoor lightning, +32 units"
 st 200 "  Sky2"         "Use MAPINFO sky2"
@@ -191,17 +179,21 @@ st 224 "  Scroll SW F"  "Scroll southwes
 thinggroup p rgb:4/f/4 "Player"
 thinggroup m rgb:f/0/0 "Monster"
 thinggroup w rgb:f/a/0 "Weapon"
-thinggroup a rgb:8/5/0 "Ammunition"
+thinggroup a rgb:8/5/0 "Mana"
 thinggroup h rgb:2/8/0 "Health & armour"
+thinggroup A rgb:2/8/0 "Artifacts"
+thinggroup q rgb:2/8/0 "Quest items"
 thinggroup b rgb:2/8/0 "Misc. bonus"
 thinggroup k rgb:f/0/f "Key"
 thinggroup P rgb:6/6/c "Plants"
+thinggroup t rgb:6/6/c "Stalagm. & stalact."
+thinggroup g rgb:6/6/c "Gargoyle statues"
+thinggroup T rgb:6/6/c "Table stuff"
+thinggroup D rgb:6/6/c "Dungeon stuff"
 thinggroup d rgb:6/6/c "Misc. decoration"
 thinggroup l rgb:6/6/c "Light source"
-#thinggroup g rgb:6/6/c "Gory decoration"
-#thinggroup c rgb:6/6/c "Corpse"
-thinggroup e rgb:0/b/d "Environment sound"
-thinggroup s rgb:0/b/d "Ambient sound"
+thinggroup s rgb:0/b/d "Sound"
+thinggroup S rgb:0/b/d "Special"
 
 #
 #	Definition of things
@@ -210,56 +202,268 @@ thinggroup s rgb:0/b/d "Ambient sound"
 #	<desc> must not exceed 19 characters.
 #
 
-thing     1 p -   16 "Player 1 start"		PLAY
-thing     2 p -   16 "Player 2 start"		PLAY
-thing     3 p -   16 "Player 3 start"		PLAY
-thing     4 p -   16 "Player 4 start"		PLAY
+thing     1 p -   16 "Player 1 start *"		PLAY
+thing     2 p -   16 "Player 2 start *"		PLAY
+thing     3 p -   16 "Player 3 start *"		PLAY
+thing     4 p -   16 "Player 4 start *"		PLAY
 thing    11 p -   16 "Deathmatch start"		PLAYF1
 thing    14 p -   16 "Teleport exit"		TELE
+thing  9100 p -   16 "Player 5 start *"		PLAY
+thing  9101 p -   16 "Player 6 start *"		PLAY
+thing  9102 p -   16 "Player 7 start *"		PLAY
+thing  9103 p -   16 "Player 8 start *"		PLAY
 
-thing    31 m -   32 "Demon"			DEMN
+thing    31 m -   32 "Chaos serpent"		DEMN
+thing    34 m -   40 "Reiver"			WRTH
 thing   107 m -   20 "Centaur"			CENT
+thing   114 m -   44 "Dark bishop"		BISH
 thing   115 m -   20 "Centaur leader"		CENTF
-thing   120 m -   17 "Serpent leader"		SSPTK	# Not too sure...
-thing   121 m -   17 "Serpent"			SSDV	# Not too sure...
-thing  8020 m -   22 "Ice guy"			ICEY
+thing   120 m -   17 "Stalker leader"		SSPTK
+thing   121 m -   17 "Stalker"			SSDV
+thing   254 m -   40 "Death wyvern *"		DRAG
+thing  8020 m -   22 "Wendigo"			ICEY
+thing  8080 m -   64 "Chaos serpent (gas)"	DEM2
+thing 10011 m -   40 "Reiver leader"		WRTH
 thing 10030 m -   25 "Ettin"			ETTN
-thing 10060 m -   20 "Fire demon"		FDMN
-
-thing    10 w -   17 "Serpent staff"		WCSS   # Cleric
-thing    53 w -   17 "Frost chards"		WMCS   # Mage
-thing  8010 w -   17 "Timon's axe"		WFAX   # Fighter
+thing 10060 m -   20 "Fire gargoyle"		FDMN
+thing 10080 m -   80 "Heresiarch"		SORC
+thing 10100 m -   32 "Zedek (fighter)"		PLAYA8
+thing 10101 m -   32 "Traductus (cleric)"	CLERA8
+thing 10102 m -   32 "Menelkir (mage)"		MAGEA8
+thing 10200 m -   20 "Korax"			KORX
+
+thing    10 w -   17 "Serpent staff"		WCSS
+thing    12 w -   20 "Quietus blade"		WFR1
+thing    13 w -   20 "Quietus guard"		WFR2
+thing    16 w -   20 "Quietus hilt"		WFR3
+thing    18 w -   20 "Wraithverge head"		WCH1
+thing    19 w -   20 "Wraithverge center"	WCH2
+thing    20 w -   20 "Wraithverge grip"		WCH3
+thing    21 w -   20 "Bloodscourge head"	WMS1
+thing    22 w -   20 "Bloodscourge center"	WMS2
+thing    23 w -   20 "Bloodscourge grip"	WMS3
+thing    53 w -   17 "Frost chards"		WMCS
+thing   123 w -   10 "Hammer of retributn"	WFHM
+thing  8009 w -   10 "Firestorm"		WCFM
+thing  8010 w -   17 "Timon's axe"		WFAX
+thing  8040 w -   20 "Arc of death"		WMLG
 
 thing   122 a -   17 "Blue manna"		MAN1
 thing   124 a -   17 "Green manna"		MAN2
 thing  8004 a -   17 "Combined manna"		MAN3
 
 thing    81 h -   17 "Crystal vial"		PTN1
-thing    82 h -   17 "Quartz flask"		PTN2
-thing  8000 h -   17 "Flechette"		PSBG
+thing  8005 h -   10 "Mesh armor"		ARM1
+thing  8006 h -   20 "Falcon shield"		ARM2
 thing  8007 h -   17 "Platinum helmet"		ARM3
+thing  8008 h -   20 "Amulet of warding"	ARM4
 
-thing   314 k -   17 "Stone (?) key"		KEY7
+thing    30 A -   20 "Porkalator"		ARTIPORK
+thing    32 A -   20 "Mystic urn"		ARTISPHL
+thing    33 A -   20 "Torch"			ARTITRCH
+thing    36 A -   20 "Chaos device"		ARTIATLP
+thing    82 A -   17 "Quartz flask"		PTN2
+thing    83 A -   20 "Wings of wrath"		SOAR
+thing    84 A -   20 "Icon of defender"		INVU
+thing    86 A -   15 "Dark servant"		ARTISUMN
+thing  8000 A -   17 "Flechette"		PSBG
+thing  8002 A -   20 "Boots of speed"		ARTISPED
+thing  8003 A -   20 "Krater of might"		ARTIBMAN
+thing  8041 A -   20 "Dragonskin bracers"	ARTIBRAC
+thing 10040 A -   20 "Banishment device"	ARTITELO
+thing 10110 A -   20 "Disc of repulsion"	ARTIBLST
+thing 10120 A -   20 "Mystic ambient inc"	ARTIHRAD
+
+thing  9002 q -   20 "Yorick's skull"		ARTISKLL
+thing  9003 q -   20 "Heart of D'Sparil"	ARTIBGEM
+thing  9004 q -   20 "Ruby planet"		ARTIGEMR
+thing  9005 q -   20 "Emerald planet 1"		ARTIGEMG
+thing  9006 q -   20 "Sapphire planet 1"	ARTIGEMB
+thing  9007 q -   20 "Daemon codex"		ABK1
+thing  9008 q -   20 "Liber oscura"		ABK2
+thing  9009 q -   20 "Emerald planet 2"		ARTIGMG2
+thing  9010 q -   20 "Sapphire planet 2"	ARTIGMB2
+thing  9014 q -   20 "Flame mask"		ARTISKL2
+thing  9015 q -   20 "Glaive seal"		ARTIFWEP
+thing  9016 q -   20 "Holy relic"		ARTICWEP
+thing  9017 q -   20 "Sigil of the Magus"	ARTIMWEP
+thing  9018 q -   20 "Clock gear 1"		ARTIGEAR
+thing  9019 q -   20 "Clock gear 2"		ARTIGER2
+thing  9020 q -   20 "Clock gear 3"		ARTIGER3
+thing  9021 q -   20 "Clock gear 4"		ARTIGER4
+
+thing  8030 k -   10 "Steel key"		KEY1
+thing  8031 k -   10 "Cave key"			KEY2
+thing  8032 k -   10 "Axe key"			KEY3
+thing  8033 k -   10 "Fire key"			KEY4
+thing  8034 k -   10 "Emerald key"		KEY5
+thing  8035 k -   10 "Dungeon key"		KEY6
+thing  8036 k -   10 "Silver key"		KEY7
+thing  8037 k -   10 "Rusted key"		KEY8
+thing  8038 k -   10 "Horn key"			KEY9
+thing  8039 k -   10 "Swamp key"		KEYA
+thing  8200 k -   10 "Castle key"		KEYB
 
+thing    24 P -   20 "Tree trunk (brown)"	TRE1
+thing    25 P -   20 "Tree trunk (brownD)"	TRE1
 thing    26 P -   17 "Swamp tree tall"		TRE2
 thing    27 P -   17 "Swamp tree short"		TRE3
+thing    28 P -   20 "Tree stump (splint)"	STM1
+thing    29 P -   20 "Tree stump"		STM2
+thing    39 P -   20 "Mushroom (large, L)"	MSH1
+thing    40 P -   20 "Mushroom (large, R)"	MSH2
+thing    41 P -   20 "Mushroom (med, L)"	MSH3
+thing    42 P -   20 "Mushroom (small, R)"	MSH4
+thing    44 P -   20 "Mushroom (small)"		MSH5
+thing    45 P -   20 "Mushroom (small, F)"	MSH6
+thing    46 P -   20 "Mushroom (small, B)"	MSH7
+thing    47 P -   20 "Mushroom (small, M)"	MSH8
+thing    60 P -   20 "Vine"			TRE3
 thing    78 P -   17 "Tree leaning right"	TRE4
 thing    79 P -   17 "Tree leaning left"	TRE5
 thing    80 P -   17 "Gnarled tree right"	TRE6
 thing    87 P -   17 "Gnarled tree left"	TRE7
+thing   113 P -   10 "Blowing leaves"		LEF1
 thing  8062 P -   17 "Dead tree"		TRDT
 thing  8068 P -   17 "Conic tree"		XMAS
-
-thing    48 d -   17 "Stalactite+gmite"		SGMP
-thing    72 d -   17 "Statue"			STT2
-thing    74 d -   17 "Short statue"		STT4
+thing  8101 P -   20 "Shrub (small)"		SHB1
+thing  8102 P -   20 "Shrub (large)"		SHB2
+thing  8103 P -   20 "Bucket (hanging)"		BCKT
+thing  8104 P -   20 "Mushroom (explodng)"	SHRM
+
+thing    48 t -   17 "Stalactite+gmite"		SGMP
+thing    49 t -   20 "Stalagmite (large)"	SGM1
+thing    50 t -   20 "Stalagmite (medium)"	SGM2
+thing    51 t -   20 "Stalagmite (small)"	SGM3
+thing    52 t -   20 "Stalactite (large)"	SLC1
+thing    56 t -   20 "Stalactite (medium)"	SLC2
+thing    57 t -   20 "Stalactite (small)"	SLC3
+thing    89 t -   20 "Ice stalactite(lrg)"	ICT1
+thing    90 t -   20 "Ice stalactite(med)"	ICT2
+thing    91 t -   20 "Ice stalactite(sml)"	ICT3
+thing    92 t -   20 "Ice stalactite(tny)"	ICT4
+thing    93 t -   20 "Ice stalagmite(lrg)"	ICM1
+thing    94 t -   20 "Ice stalagmite(med)"	ICM2
+thing    95 t -   20 "Ice stalagmite(sml)"	ICM3
+thing    96 t -   20 "Ice stalagmite(tny)"	ICM4
+
+thing     5 g -   20 "Gargoyle statue w/s"	STTW
+thing    72 g -   17 "Stone gargoyle tall"	STT2
+thing    73 g -   20 "Ice gargoyle tall"	STT3
+thing    74 g -   17 "Stone gargoyle shrt"	STT4
+thing    76 g -   20 "Ice gargoyle short"	STT5
+thing  8044 g -   20 "Wooden gargoyle tal"	GAR1
+thing  8045 g -   20 "Fire gargoyle tall"	GAR2
+thing  8046 g -   20 "Red gargoyle tall"	GAR3
+thing  8047 g -   20 "Wooden gargoyle tal"	GAR4
+thing  8048 g -   20 "Metal gargoyle tall"	GAR5
+thing  8049 g -   20 "Fire gargoyle short"	GAR6
+thing  8050 g -   20 "Red gargoyle short"	GAR7
+thing  8051 g -   20 "Wooden gargoyle srt"	GAR8
+thing  8052 g -   20 "Metal gargoyle shrt"	GAR9
+thing  9011 g -   20 "Gargoyle statue"		STWN
+
+thing  8500 T -   20 "Stein (tall)"		TST1
+thing  8501 T -   20 "Stein (short)"		TST2
+thing  8502 T -   20 "Candle w/spider web"	TST3
+thing  8503 T -   20 "Candle (short)"		TST4
+thing  8504 T -   20 "Candle (tall)"		TST5
+thing  8505 T -   20 "Goblet (spilled)"		TST6
+thing  8506 T -   20 "Goblet (tall)"		TST7
+thing  8507 T -   20 "Goblet (short)"		TST8
+thing  8508 T -   20 "Goblet w/silver bnd"	TST9
+thing  8509 T -   20 "Meat cleaver"		TST0
+
+thing    61 D -   20 "Corpse impaled"		CPS1
+thing    62 D -   20 "Corpse sleeping"		CPS2
+thing    71 D -   20 "Corpse hung legs"		CPS3
+thing   108 D -   20 "Corpse hung"		CPS4
+thing   109 D -   20 "Corpse bleeding"		CPS5
+thing   110 D -   20 "Corpse chained"		CPS6
+thing   111 D -   10 "Pool of blood"		BDPL
+thing  8067 D -   20 "Iron maiden"		IRON
+thing  8071 D -   20 "Chain (short)"		CHNS
+thing  8072 D -   20 "Chain (long)"		CHNSB0
+thing  8073 D -   20 "Chain heart on hook"	CHNSC0
+thing  8074 D -   20 "Chain w/large hook"	CHNSD0
+thing  8075 D -   20 "Chain w/small hook"	CHNSE0
+thing  8076 D -   20 "Chain w/spiked ball"	CHNSF0
+thing  8077 D -   20 "Chain skull on hook"	CHNSG0
+
+thing     6 d -   20 "Rock w/moss (tiny)"	RCK1
+thing     7 d -   20 "Rock w/moss (small)"	RCK2
+thing     9 d -   20 "Rock w/moss (medium)"	RCK3
+thing    15 d -   20 "Rock w/moss (large)"	RCK4
+thing    37 d -   20 "Stump w/moss (short)"	STM3
+thing    38 d -   20 "Stump w/moss (tall)"	STM4
+thing    58 d -   20 "Moss (three strands)"	MSS1
+thing    59 d -   20 "Moss (one strand)"	MSS2
+thing    63 d -   20 "Tombstone (R.I.P.)"	TMS1
+thing    64 d -   20 "Tombstone (Shane)"	TMS2
+thing    65 d -   20 "Tombstone (large cross)"	TMS3
+thing    66 d -   20 "Tombstone (Brian R.)"	TMS4
+thing    67 d -   20 "Tombstone (circular cross)"	TMS5
+thing    68 d -   20 "Tombstone (small cross on pedestal)"	TMS6
+thing    69 d -   20 "Tombstone (Brian P.)"	TMS7
 thing    77 d -   17 "Banner"			BNR1
-
-thing    54 l -   17 "Torch"			WLTR
-thing  8061 l -   17 "FIXME"			BRTR
-
-thing   314 e -   17 "Bogus sound"
-
-thing   314 s -   17 "Bogus sound"
-
-
+thing    88 d -   20 "Log"			LOGG
+thing    97 d -   20 "Rock formation (large, brown)"	RKBL
+thing    98 d -   20 "Rock formation (small, brown)"	RKBS
+thing    99 d -   20 "Rock formation (small, gray)"	RKBK
+thing   100 d -   20 "Rubble (large)"		RBL1
+thing   101 d -   20 "Rubble (small)"		RBL2
+thing   102 d -   20 "Rubble (medium)"		RBL3
+thing   103 d -   20 "Vase on pedestal"		VASE
+thing   104 d -   20 "Pot (tall, skinny) *"	POT1
+thing   105 d -   20 "Pot (medium, skinny) *"	POT2
+thing   106 d -   20 "Pot (short, chipped) *"	POT3
+thing   140 d -   20 "Sparkling red smoke"	TSMK
+thing  8064 d -   20 "Suit of armor *"		SUIT
+thing  8065 d -   40 "Bell"			BBLL
+thing  8100 d -   20 "Barrel"			BARL
+thing  9012 d -   20 "Pedestal"			GMPD
+thing 10001 d -   20 "Fog (small) *"		FOGS
+thing 10002 d -   20 "Fog (medium) *"		FOGM
+thing 10003 d -   20 "Fog (large) *"		FOGL
+thing 10090 d -   20 "Spike (down)"		TSPKC0
+thing 10091 d -   20 "Spike (up)"		TSPK
+
+thing    17 l -   20 "Chandelier w/flame"	CDLR
+thing    54 l -   17 "Wall torch w/flame"	WLTR
+thing    55 l -   20 "Wall torch"		WLTRI0
+thing   116 l -   10 "Brazier w/flame"		TWTR
+thing   117 l -   10 "Brazier"			TWTRI0
+thing   119 l -   20 "Candles"			CNDL
+thing  8042 l -   20 "Minotaur statue f"	FBUL
+thing  8043 l -   20 "Minotaur statue"		FBULH0
+thing  8060 l -   20 "Fire skull"		FSKL
+thing  8061 l -   17 "Brazier w/flame sm"	BRTR
+thing  8063 l -   20 "Chandelier"		CDLRD0
+thing  8066 l -   20 "Candle (blue)"		CAND
+thing  8069 l -   20 "Cauldron (w/flame)"	CDRNB0
+thing  8070 l -   20 "Cauldron"			CDRN
+thing 10500 l -   20 "Flame (small, t) *"	FFSM
+thing 10501 l -   20 "Flame (small, cnt)"	FFSMC0
+thing 10502 l -   20 "Flame (large, t) *"	FFLG
+thing 10503 l -   20 "Flame (large, cnt)"	FFLGF0
+
+thing  1400 s -   20 "Stone"			TELE
+thing  1401 s -   20 "Heavy"			TELE
+thing  1402 s -   20 "Metal"			TELE
+thing  1403 s -   20 "Creak"			TELE
+thing  1404 s -   20 "Silent"			TELE
+thing  1405 s -   20 "Lava"			TELE
+thing  1406 s -   20 "Water"			TELE
+thing  1407 s -   20 "Ice"			TELE
+thing  1408 s -   20 "Earth crack"		TELE
+thing  1409 s -   20 "Metal2"			TELE
+thing  1410 s -   20 "Wind blowing"		TELE
+
+thing   118 S -   10 "Magic step"		TLGL
+thing  3000 S -   20 "Polyobject anchor"	ICPRD0
+thing  3001 S -   20 "Start spot"		SBFXH0
+thing  3002 S -   20 "Start spot w/crush"	SBFXC0
+thing  9001 S -   10 "Map spot *"		TELEC0
+thing  9013 S -   10 "Map spot w/gravity"	TELED0
+thing 10000 S -   20 "Spawn fog *"		SPIRK0
+thing 10225 S -   20 "Spawn bat *"		ABATC3C7

yadex-1.7.0-64bit.patch:

--- NEW FILE yadex-1.7.0-64bit.patch ---
diff -Naur yadex-1.7.0/GNUmakefile yadex-1.7.0.new/GNUmakefile
--- yadex-1.7.0/GNUmakefile	2006-03-16 20:33:36.000000000 -0800
+++ yadex-1.7.0.new/GNUmakefile	2006-03-16 18:37:50.000000000 -0800
@@ -53,6 +53,7 @@
 
 # Which OS ?
 OS := $(shell uname -s | tr A-Z a-z)
+ARCH := $(shell uname -i | tr A-Z a-z)
 
 # Where your X11 libraries and headers reside.
 # Current rule:
@@ -67,7 +68,11 @@
     X11LIBDIR     = /usr/openwin/lib
     X11INCLUDEDIR = /usr/openwin/include
   else
-    X11LIBDIR     = /usr/X11R6/lib
+    ifeq ($(findstring $(ARCH), x86_64), $(ARCH))
+        X11LIBDIR     = /usr/X11R6/lib64
+    else
+        X11LIBDIR     = /usr/X11R6/lib
+    endif
     X11INCLUDEDIR = /usr/X11R6/include
   endif
 endif
diff -Naur yadex-1.7.0/src/levels.cc yadex-1.7.0.new/src/levels.cc
--- yadex-1.7.0/src/levels.cc	2003-03-28 04:37:32.000000000 -0800
+++ yadex-1.7.0.new/src/levels.cc	2006-03-16 20:38:01.000000000 -0800
@@ -1387,7 +1387,7 @@
       }
    NumWTexture = (int) val + 1;
    /* read in the offsets for texture1 names */
-   offsets = (i32 *) GetMemory ((long) NumWTexture * 4);
+   offsets = (i32 *) GetMemory ((long) NumWTexture * (sizeof(i32)));
    wf->read_i32 (offsets + 1, NumWTexture - 1);
    if (wf->error ())
       {
@@ -1445,7 +1445,7 @@
       }
       NumWTexture = (int) val + 1;
       /* read in the offsets for texture1 names */
-      offsets = (i32 *) GetMemory ((long) NumWTexture * 4);
+      offsets = (i32 *) GetMemory ((long) NumWTexture * sizeof(i32));
       wf->read_i32 (offsets + 1, NumWTexture - 1);
       {
 	// FIXME
@@ -1489,7 +1489,7 @@
 	// FIXME
       }
       /* read in the offsets for texture2 names */
-      offsets = (i32 *) GetMemory ((long) val * 4);
+      offsets = (i32 *) GetMemory ((long) val * sizeof(i32));
       wf->read_i32 (offsets, val);
       if (wf->error ())
       {
diff -Naur yadex-1.7.0/src/pic2img.cc yadex-1.7.0.new/src/pic2img.cc
--- yadex-1.7.0/src/pic2img.cc	2003-03-28 04:37:32.000000000 -0800
+++ yadex-1.7.0.new/src/pic2img.cc	2006-03-16 20:30:40.000000000 -0800
@@ -192,7 +192,7 @@
 
 ColumnData    = (u8 *) GetMemory (TEX_COLUMNBUFFERSIZE);
 /* FIXME DOS and pic_width_ > 16000 */
-NeededOffsets = (i32 *) GetMemory ((long) pic_width_ * 4);
+NeededOffsets = (i32 *) GetMemory ((long) pic_width_ * (sizeof(i32)));
 
 if (long_offsets)
    dir->wadfile->read_i32 (NeededOffsets, pic_width_);
diff -Naur yadex-1.7.0/src/r_images.cc yadex-1.7.0.new/src/r_images.cc
--- yadex-1.7.0/src/r_images.cc	2006-03-16 20:33:12.000000000 -0800
+++ yadex-1.7.0.new/src/r_images.cc	2006-03-16 20:39:17.000000000 -0800
@@ -182,7 +182,7 @@
       dir->wadfile->seek (dir->dir.start);
       dir->wadfile->read_i32 (&numtex);
       /* read in the offsets for texture1 names and info. */
-      offsets = (i32 *) GetMemory ((long) numtex * 4);
+      offsets = (i32 *) GetMemory ((long) numtex * sizeof(i32));
       dir->wadfile->read_i32 (offsets, numtex);
       for (n = 0; n < numtex && !texofs; n++)
          {
@@ -205,7 +205,7 @@
       dir->wadfile->seek (dir->dir.start);
       dir->wadfile->read_i32 (&numtex);
       /* read in the offsets for texture1 names and info. */
-      offsets = (i32 *) GetMemory ((long) numtex * 4);
+      offsets = (i32 *) GetMemory ((long) numtex * sizeof(i32));
       dir->wadfile->read_i32 (offsets, numtex);
       for (n = 0; n < numtex && !texofs; n++)
          {
@@ -225,7 +225,7 @@
          dir->wadfile->seek (dir->dir.start);
          dir->wadfile->read_i32 (&numtex);
          /* read in the offsets for texture2 names */
-         offsets = (i32 *) GetMemory ((long) numtex * 4);
+         offsets = (i32 *) GetMemory ((long) numtex * sizeof(i32));
          dir->wadfile->read_i32 (offsets, numtex);
          for (n = 0; n < numtex && !texofs; n++)
             {
diff -Naur yadex-1.7.0/src/textures.cc yadex-1.7.0.new/src/textures.cc
--- yadex-1.7.0/src/textures.cc	2003-04-24 13:50:36.000000000 -0700
+++ yadex-1.7.0.new/src/textures.cc	2006-03-16 20:38:44.000000000 -0800
@@ -177,7 +177,7 @@
 	 goto textures_done;
 	 }
       // Read in the offsets for texture1 names and info
-      offsets = (i32 *) GetMemory ((long) numtex * 4);
+      offsets = (i32 *) GetMemory ((long) numtex * sizeof(i32));
       wf->read_i32 (offsets, numtex);
       if (wf->error ())
 	 {
@@ -233,7 +233,7 @@
 	 goto texture1_done;
 	 }
       // Read in the offsets for texture1 names and info
-      offsets = (i32 *) GetMemory ((long) numtex * 4);
+      offsets = (i32 *) GetMemory ((long) numtex * sizeof(i32));
       wf->read_i32 (offsets, numtex);
       if (wf->error ())
 	 {
@@ -286,7 +286,7 @@
 	    goto texture2_done;
 	    }
 	 // Read in the offsets for TEXTURE2 names
-	 offsets = (i32 *) GetMemory ((long) numtex * 4);
+	 offsets = (i32 *) GetMemory ((long) numtex * sizeof(i32));
 	 wf->read_i32 (offsets, numtex);
 	 if (wf->error ())
 	    {
@@ -514,7 +514,7 @@
       dir->wadfile->seek (dir->dir.start);
       dir->wadfile->read_i32 (&numtex);
       // Read in the offsets for texture1 names and info
-      offsets = (i32 *) GetMemory ((long) numtex * 4);
+      offsets = (i32 *) GetMemory ((long) numtex * sizeof(i32));
       dir->wadfile->read_i32 (offsets, numtex);
       for (n = 0; n < numtex && !texofs; n++)
 	 {
@@ -534,7 +534,7 @@
 	 dir->wadfile->seek (dir->dir.start);
 	 dir->wadfile->read_i32 (&numtex);
 	 // Read in the offsets for texture2 names
-	 offsets = (i32 *) GetMemory ((long) numtex * 4);
+	 offsets = (i32 *) GetMemory ((long) numtex * sizeof(i32));
 	 dir->wadfile->read_i32 (offsets);
 	 for (n = 0; n < numtex && !texofs; n++)
 	    {
diff -Naur yadex-1.7.0/src/yadex.h yadex-1.7.0.new/src/yadex.h
--- yadex-1.7.0/src/yadex.h	2006-03-16 20:33:12.000000000 -0800
+++ yadex-1.7.0.new/src/yadex.h	2006-03-16 20:29:15.000000000 -0800
@@ -98,11 +98,11 @@
 #define F_I16_D "hd"
 #define F_I16_H "hX"
 
-typedef unsigned long  u32;
+typedef unsigned int  u32;
 #define F_U32_D "lu"
 #define F_U32_H "lX"
 
-typedef signed   long  i32;
+typedef signed   int  i32;
 #define F_I32_D "ld"
 #define F_I32_H "lX"
 

yadex-1.7.0-datadir.patch:

--- NEW FILE yadex-1.7.0-datadir.patch ---
diff -Naur yadex-1.7.0/configure yadex-1.7.0.new/configure
--- yadex-1.7.0/configure	2006-03-16 18:49:20.000000000 -0800
+++ yadex-1.7.0.new/configure	2006-03-16 16:36:21.000000000 -0800
@@ -408,16 +408,16 @@
   ETCDIR=/etc/$APPNAME/%v
   ETCDIRNV=/etc/$APPNAME
   MANDIR=/usr/share/man
-  SHAREDIR=/usr/share/games/$APPNAME/%v
-  SHAREDIRNV=/usr/share/games/$APPNAME
+  SHAREDIR=/usr/share/$APPNAME/%v
+  SHAREDIRNV=/usr/share/$APPNAME
 elif expr "$PREFIX" : '//*usr//*local/*$' >/dev/null
 then
   BINDIR=/usr/local/bin		# FHS-ly correct is /usr/local/games
   ETCDIR=/etc/$APPNAME/%v
   ETCDIRNV=/etc/$APPNAME
   MANDIR=/usr/local/man
-  SHAREDIR=/usr/local/share/games/$APPNAME/%v
-  SHAREDIRNV=/usr/local/share/games/$APPNAME
+  SHAREDIR=/usr/local/share/$APPNAME/%v
+  SHAREDIRNV=/usr/local/share/$APPNAME
 elif expr "$PREFIX" : '//*opt/*$' >/dev/null
 then
   echo '/opt ? Surely you mean /opt/something, Mr. Feynman !' 1>&2
diff -Naur yadex-1.7.0/yadex.cfg yadex-1.7.0.new/yadex.cfg
--- yadex-1.7.0/yadex.cfg	2006-03-16 18:49:20.000000000 -0800
+++ yadex-1.7.0.new/yadex.cfg	2006-03-16 18:49:43.000000000 -0800
@@ -20,16 +20,17 @@
 #  9 doompr   Doom press release pre-beta (/pub/idgames/historic/doomprbt.zip)
 # 10 strife10 Strife 1.0 (demo or commercial)
 
-  iwad1  = /usr/local/share/games/doom/doom.wad
-  iwad2  = /usr/local/share/games/doom2/doom2.wad
-  iwad3  = /usr/local/share/games/heretic/heretic.wad
-  iwad4  = /usr/local/share/games/hexen/hexen.wad
-  iwad5  = /usr/local/share/games/strife/strife1.wad
-  iwad6  = /usr/local/share/games/doom02/doom.wad
-  iwad7  = /usr/local/share/games/doom04/doom.wad
-  iwad8  = /usr/local/share/games/doom05/doom.wad
-  iwad9  = /usr/local/share/games/doompr/doompres.wad
-  iwad10 = /usr/local/share/games/strife10/strife1.wad
+  iwad1  = /usr/share/doom/doom.wad
+#  iwad2  = /usr/share/doom/doom2.wad
+  iwad2  = /usr/share/doom/freedoom.wad
+  iwad3  = /usr/share/doom/heretic.wad
+  iwad4  = /usr/share/doom/hexen.wad
+  iwad5  = /usr/share/doom/strife1.wad
+  iwad6  = /usr/share/doom/doom.wad
+  iwad7  = /usr/share/doom/doom.wad
+  iwad8  = /usr/share/doom/doom.wad
+  iwad9  = /usr/share/doom/doompres.wad
+  iwad10 = /usr/share/doom/strife1.wad
 
 # Name of the patch wads you want to load. None by default.
 

yadex-1.7.0-destdir.patch:

--- NEW FILE yadex-1.7.0-destdir.patch ---
diff -Naur yadex-1.7.0/GNUmakefile yadex-1.7.0.new/GNUmakefile
--- yadex-1.7.0/GNUmakefile	2006-03-16 16:08:10.000000000 -0800
+++ yadex-1.7.0.new/GNUmakefile	2006-03-16 16:11:32.000000000 -0800
@@ -392,19 +392,19 @@
 
 .PHONY: install
 install: $(OBJDIR)/install
-	@scripts/mkinstalldirs $(BINDIR)
-	@scripts/mkinstalldirs $(ETCDIR)
-	@scripts/mkinstalldirs $(MANDIR)
-	@scripts/mkinstalldirs $(MANDIR)/man6
-	@scripts/mkinstalldirs $(SHAREDIR)
-	$(OBJDIR)/install -m 755 $(OBJDIR)/yadex $(BINDIR)/yadex-$(VERSION)
-	rm -f $(BINDIR)/yadex
-	ln -s yadex-$(VERSION) $(BINDIR)/yadex
-	$(OBJDIR)/install -m 644 doc/yadex.6 $(MANDIR)/man6/yadex-$(VERSION).6
-	rm -f $(MANDIR)/man6/yadex.6
-	ln -s yadex-$(VERSION).6 $(MANDIR)/man6/yadex.6
-	$(OBJDIR)/install -m 644 -d $(SHAREDIR) $(YGD)
-	$(OBJDIR)/install -m 644 -d $(ETCDIR) yadex.cfg
+	@scripts/mkinstalldirs $(DESTDIR)$(BINDIR)
+	@scripts/mkinstalldirs $(DESTDIR)$(ETCDIR)
+	@scripts/mkinstalldirs $(DESTDIR)$(MANDIR)
+	@scripts/mkinstalldirs $(DESTDIR)$(MANDIR)/man6
+	@scripts/mkinstalldirs $(DESTDIR)$(SHAREDIR)
+	$(OBJDIR)/install -m 755 $(OBJDIR)/yadex $(DESTDIR)$(BINDIR)/yadex-$(VERSION)
+	rm -f $(DESTDIR)$(BINDIR)/yadex
+	ln -s yadex-$(VERSION) $(DESTDIR)$(BINDIR)/yadex
+	$(OBJDIR)/install -m 644 doc/yadex.6 $(DESTDIR)$(MANDIR)/man6/yadex-$(VERSION).6
+	rm -f $(DESTDIR)$(MANDIR)/man6/yadex.6
+	ln -s yadex-$(VERSION).6 $(DESTDIR)$(MANDIR)/man6/yadex.6
+	$(OBJDIR)/install -m 644 -d $(DESTDIR)$(SHAREDIR) $(YGD)
+	$(OBJDIR)/install -m 644 -d $(DESTDIR)$(ETCDIR) yadex.cfg
 	@echo "---------------------------------------------------------------"
 	@echo "  Yadex is now installed."
 	@echo

yadex-1.7.0-gcc41.patch:

--- NEW FILE yadex-1.7.0-gcc41.patch ---
--- yadex-1.7.0/src/wadlist.cc~	2006-03-17 11:53:10.000000000 +0100
+++ yadex-1.7.0/src/wadlist.cc	2006-03-17 11:57:06.000000000 +0100
@@ -52,6 +52,7 @@
 
 Wad_list_priv::Wad_list_priv ()
 {
+  iter = list.begin ();
   rewound = true;
 }
 
@@ -80,6 +81,7 @@
  */
 void Wad_list::rewind () const
 {
+  priv->iter = priv->list.begin ();
   priv->rewound = true;
 }
 
@@ -98,10 +100,7 @@
 bool Wad_list::get (Wad_file *& wf)
 {
   if (priv->rewound)
-  {
-    priv->iter = priv->list.begin ();
     priv->rewound = false;
-  }
   else
     ++priv->iter;
 
@@ -119,10 +118,7 @@
 bool Wad_list::get (const Wad_file *& wf) const
 {
   if (priv->rewound)
-  {
-    priv->iter = priv->list.begin ();
     priv->rewound = false;
-  }
   else
     ++priv->iter;
 
@@ -157,26 +153,12 @@
  */
 void Wad_list::del ()
 {
-  list_t::iterator i;
-
-  if (priv->rewound)
-  {
-    i = priv->list.begin ();
-  }
-  else
-  {
-    i = priv->iter;
-  }
-  if (i == priv->list.end ())
+  if (priv->iter == priv->list.end ())
   {
     nf_bug ("Wad_list::del: attempt to delete last item");
     return;
   }
-  priv->iter = priv->list.erase (i);
+  priv->iter = priv->list.erase (priv->iter);
   if (priv->iter == priv->list.begin ())
-  {
-    priv->iter = 0;			// Catch bugs
     priv->rewound = true;
-  }
 }
-


--- NEW FILE yadex.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Yadex
GenericName=Doom level editor
Comment=Doom level editor
Exec=yadex -i2 /usr/share/doom/freedoom.wad
Icon=yadex.png
Terminal=true
Type=Application
Categories=Application;GUIDesigner;Graphics;
Version=1.7.0


--- NEW FILE yadex.spec ---
Name:           yadex
Version:        1.7.0
Release:        3%{?dist}
Summary:        Doom level editor

Group:          Amusements/Graphics
License:        GPL
URL:            http://www.teaser.fr/~amajorel/yadex
Source0:        http://www.teaser.fr/~amajorel/yadex/yadex-1.7.0.tar.gz
Source1:        yadex.desktop
Source2:        yadex.png
Patch0:         http://glbsp.sourceforge.net/yadex/Yadex_170_ALL.diff
Patch1:         http://glbsp.sourceforge.net/yadex/Yadex_170_Hexen.diff
Patch2:         yadex-1.7.0-64bit.patch
Patch3:         yadex-1.7.0-destdir.patch
Patch4:         yadex-1.7.0-datadir.patch
Patch5:         yadex-1.7.0-gcc41.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  desktop-file-utils
BuildRequires:  xorg-x11-devel
# For FC-5's modular xorg
#BuildRequires:  libX11-devel
# Yadex needs an iwad to run.  freedoom provides a free iwad that we can use.
Requires:       freedoom

%description
Yadex is a Doom level (wad) editor for Unix systems running X, including Linux.
It supports Doom alpha, Doom beta, Doom, Ultimate Doom, Final Doom, Doom II,
Heretic and also, in a more or less limited way, Hexen and Strife.

Yadex is descended from DEU 5.21. Therefore, as you might expect, it's a rather
low-level editor that requires you to take care of a lot of detail but on the
flip side allows you to control very precisely what you are doing. In addition,
it has many advanced functions that DEU didn't have, to make certain
tedious tasks easy.


%prep
%setup -q
%patch0 -p1
# Omitted. Patch fails to apply. Used for Hexen maps only. Needs investigation.
#%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1


%build
# Don't use %%configure because this is not an autotools-generated
# configure script and will choke on some of the default configure switches.
./configure --prefix=%{_prefix}
make CXXFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}


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

# Remove the duplicate man pages
rm -f $RPM_BUILD_ROOT%{_mandir}/man6/%{name}*
iconv --from=ISO-8859-1 --to=UTF-8 docsrc/%{name}.6 > docsrc/%{name}.6.new
install -p -m644 docsrc/%{name}.6.new $RPM_BUILD_ROOT/%{_mandir}/man6/

# .desktop file integration
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/
install -p -m 644 %{SOURCE2} $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,-)
%{_bindir}/%{name}
%{_bindir}/%{name}-%{version}
%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/%{version}/%{name}.cfg
%{_datadir}/%{name}
%{_mandir}/man6/*
%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/48x48/apps/yadex.png
%doc COPYING COPYING.LIB doc/*.html docsrc/*.png


%changelog
* Fri Mar 17 2006 Wart <wart at kobold.org> 1.7.0-3
- Added patch for gcc 4.1

* Thu Mar 16 2006 Wart <wart at kobold.org> 1.7.0-2
- Added .desktop file

* Thu Mar 16 2006 Wart <wart at kobold.org> 1.7.0-1
- Initial submission to Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yadex/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Apr 2006 14:51:37 -0000	1.1
+++ .cvsignore	10 Apr 2006 14:52:26 -0000	1.2
@@ -0,0 +1 @@
+yadex-1.7.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yadex/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Apr 2006 14:51:37 -0000	1.1
+++ sources	10 Apr 2006 14:52:26 -0000	1.2
@@ -0,0 +1 @@
+d341abe066525394082edfd520af86ae  yadex-1.7.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 15:16:15 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 10 Apr 2006 08:16:15 -0700
Subject: rpms/Macaulay2/FC-5 Macaulay2.spec,1.13,1.14
Message-ID: <200604101516.k3AFGHEh006522@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	Macaulay2.spec 
Log Message:
* Mon Apr 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.2-22
- fix icon location (#188384)



Index: Macaulay2.spec
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/FC-5/Macaulay2.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Macaulay2.spec	30 Mar 2006 21:41:20 -0000	1.13
+++ Macaulay2.spec	10 Apr 2006 15:16:14 -0000	1.14
@@ -6,7 +6,7 @@
 Summary: System for algebraic geometry and commutative algebra
 Name:    Macaulay2
 Version: 0.9.2
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: GPL
 Group:   Applications/Engineering
 URL:     http://www.math.uiuc.edu/Macaulay2/
@@ -93,7 +93,7 @@
 
 # app img
 install -p -m644 -D %{SOURCE1} \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/apps/32x32/Macaulay2.png
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/Macaulay2.png
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install \
@@ -154,6 +154,9 @@
 
 
 %changelog
+* Mon Apr 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.2-22
+- fix icon location (#188384)
+
 * Thu Mar 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.2-21
 - *really* disable %%check (fails on fc5+ anyway) 
 



From fedora-extras-commits at redhat.com  Mon Apr 10 15:35:57 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon, 10 Apr 2006 08:35:57 -0700
Subject: rpms/yadex/devel yadex.spec,1.1,1.2
Message-ID: <200604101535.k3AFZxuS006653@cvs-int.fedora.redhat.com>

Author: wart

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

Modified Files:
	yadex.spec 
Log Message:
Update BR: for modular x.org




Index: yadex.spec
===================================================================
RCS file: /cvs/extras/rpms/yadex/devel/yadex.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- yadex.spec	10 Apr 2006 14:52:26 -0000	1.1
+++ yadex.spec	10 Apr 2006 15:35:56 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           yadex
 Version:        1.7.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Doom level editor
 
 Group:          Amusements/Graphics
@@ -18,9 +18,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
-BuildRequires:  xorg-x11-devel
+#BuildRequires:  xorg-x11-devel
 # For FC-5's modular xorg
-#BuildRequires:  libX11-devel
+BuildRequires:  libX11-devel
 # Yadex needs an iwad to run.  freedoom provides a free iwad that we can use.
 Requires:       freedoom
 
@@ -101,6 +101,9 @@
 
 
 %changelog
+* Mon Apr 10 2006 Wart <wart at kobold.org> 1.7.0-4
+- Update for modular x.org
+
 * Fri Mar 17 2006 Wart <wart at kobold.org> 1.7.0-3
 - Added patch for gcc 4.1
 



From fedora-extras-commits at redhat.com  Mon Apr 10 15:55:52 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Mon, 10 Apr 2006 08:55:52 -0700
Subject: rpms/gnome-sudoku/FC-5 gnome-sudoku.spec,1.4,1.5
Message-ID: <200604101555.k3AFtsTX006873@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/gnome-sudoku/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6824/FC-5

Modified Files:
	gnome-sudoku.spec 
Log Message:
Fix boolean problem in spec file (#188484); will not rebuild for now


Index: gnome-sudoku.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/FC-5/gnome-sudoku.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-sudoku.spec	25 Jan 2006 05:54:35 -0000	1.4
+++ gnome-sudoku.spec	10 Apr 2006 15:55:52 -0000	1.5
@@ -3,14 +3,14 @@
 
 Name:           gnome-sudoku
 Version:        0.4.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        GNOME based Sudoku, a logic puzzle game
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://gnome-sudoku.sourceforge.net
 Source0:        http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-%if %{fedora} <= 4
+%if "%{fedora}" <= "4"
 Patch0:		gnome-sudoku-0.4.0-pygtk2-nofs.patch
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,7 +31,7 @@
 
 %prep
 %setup -q
-%if %{fedora} <= 4
+%if "%{fedora}" <= "4"
 %patch0 -p1
 %endif
 # Fix one hardcoding instance
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Mon Apr 10 2006 Paul W. Frields <stickster at gmail.com> - 0.4.0-6
+- Correct for boolean problem in spec
+
 * Tue Jan 24 2006 Paul W. Frields <stickster at gmail.com> - 0.4.0-5
 - Fix missing Requires: gnome-python2-canvas
 - Enable conditional to synchronize spec



From fedora-extras-commits at redhat.com  Mon Apr 10 15:55:53 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Mon, 10 Apr 2006 08:55:53 -0700
Subject: rpms/gnome-sudoku/devel gnome-sudoku.spec,1.4,1.5
Message-ID: <200604101555.k3AFttMt006877@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/gnome-sudoku/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6824/devel

Modified Files:
	gnome-sudoku.spec 
Log Message:
Fix boolean problem in spec file (#188484); will not rebuild for now


Index: gnome-sudoku.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/devel/gnome-sudoku.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-sudoku.spec	25 Jan 2006 05:54:35 -0000	1.4
+++ gnome-sudoku.spec	10 Apr 2006 15:55:53 -0000	1.5
@@ -3,14 +3,14 @@
 
 Name:           gnome-sudoku
 Version:        0.4.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        GNOME based Sudoku, a logic puzzle game
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://gnome-sudoku.sourceforge.net
 Source0:        http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-%if %{fedora} <= 4
+%if "%{fedora}" <= "4"
 Patch0:		gnome-sudoku-0.4.0-pygtk2-nofs.patch
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,7 +31,7 @@
 
 %prep
 %setup -q
-%if %{fedora} <= 4
+%if "%{fedora}" <= "4"
 %patch0 -p1
 %endif
 # Fix one hardcoding instance
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Mon Apr 10 2006 Paul W. Frields <stickster at gmail.com> - 0.4.0-6
+- Correct for boolean problem in spec
+
 * Tue Jan 24 2006 Paul W. Frields <stickster at gmail.com> - 0.4.0-5
 - Fix missing Requires: gnome-python2-canvas
 - Enable conditional to synchronize spec



From fedora-extras-commits at redhat.com  Mon Apr 10 15:55:52 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Mon, 10 Apr 2006 08:55:52 -0700
Subject: rpms/gnome-sudoku/FC-4 gnome-sudoku.spec,1.6,1.7
Message-ID: <200604101555.k3AFtsMV006869@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/gnome-sudoku/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6824/FC-4

Modified Files:
	gnome-sudoku.spec 
Log Message:
Fix boolean problem in spec file (#188484); will not rebuild for now


Index: gnome-sudoku.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/FC-4/gnome-sudoku.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnome-sudoku.spec	25 Jan 2006 05:53:42 -0000	1.6
+++ gnome-sudoku.spec	10 Apr 2006 15:55:51 -0000	1.7
@@ -3,14 +3,14 @@
 
 Name:           gnome-sudoku
 Version:        0.4.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        GNOME based Sudoku, a logic puzzle game
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://gnome-sudoku.sourceforge.net
 Source0:        http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-%if %{fedora} <= 4
+%if "%{fedora}" <= "4"
 Patch0:		gnome-sudoku-0.4.0-pygtk2-nofs.patch
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,7 +31,7 @@
 
 %prep
 %setup -q
-%if %{fedora} <= 4
+%if "%{fedora}" <= "4"
 %patch0 -p1
 %endif
 # Fix one hardcoding instance
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Mon Apr 10 2006 Paul W. Frields <stickster at gmail.com> - 0.4.0-6
+- Correct for boolean problem in spec
+
 * Tue Jan 24 2006 Paul W. Frields <stickster at gmail.com> - 0.4.0-5
 - Fix missing Requires: gnome-python2-canvas
 - Enable conditional to synchronize spec



From fedora-extras-commits at redhat.com  Mon Apr 10 16:12:39 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Mon, 10 Apr 2006 09:12:39 -0700
Subject: fedora-security/audit fc4,1.195,1.196 fc5,1.108,1.109
Message-ID: <200604101612.k3AGCdgt009239@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9219/audit

Modified Files:
	fc4 fc5 
Log Message:
Add CVE-2006-1522



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- fc4	10 Apr 2006 14:27:23 -0000	1.195
+++ fc4	10 Apr 2006 16:12:36 -0000	1.196
@@ -10,6 +10,7 @@
 CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1542 VULNERABLE (python) bz#169046
+CVE-2006-1522 VULNERABLE (kernel)
 CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-245]
 CVE-2006-1354 VULNERABLE (freeradius) bz#186084
 CVE-2006-1343 VULNERABLE (kernel)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- fc5	10 Apr 2006 14:27:23 -0000	1.108
+++ fc5	10 Apr 2006 16:12:36 -0000	1.109
@@ -9,6 +9,7 @@
 CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1542 VULNERABLE (python) bz#169046
+CVE-2006-1522 VULNERABLE (kernel)
 CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-233]
 CVE-2006-1354 VULNERABLE (freeradius) bz#186084
 CVE-2006-1343 VULNERABLE (kernel)



From fedora-extras-commits at redhat.com  Mon Apr 10 16:34:29 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon, 10 Apr 2006 09:34:29 -0700
Subject: rpms/yadex/FC-4 yadex.spec,1.2,1.3
Message-ID: <200604101634.k3AGYVu6009362@cvs-int.fedora.redhat.com>

Author: wart

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

Modified Files:
	yadex.spec 
Log Message:
Revert BR: to back out modular x.org changes.




Index: yadex.spec
===================================================================
RCS file: /cvs/extras/rpms/yadex/FC-4/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	10 Apr 2006 16:34:29 -0000	1.3
@@ -18,9 +18,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
-#BuildRequires:  xorg-x11-devel
+BuildRequires:  xorg-x11-devel
 # For FC-5's modular xorg
-BuildRequires:  libX11-devel
+#BuildRequires:  libX11-devel
 # Yadex needs an iwad to run.  freedoom provides a free iwad that we can use.
 Requires:       freedoom
 
@@ -102,7 +102,7 @@
 
 %changelog
 * Mon Apr 10 2006 Wart <wart at kobold.org> 1.7.0-4
-- Update for modular x.org
+- Revert BR: to back out modular x.org changes.
 
 * Fri Mar 17 2006 Wart <wart at kobold.org> 1.7.0-3
 - Added patch for gcc 4.1



From fedora-extras-commits at redhat.com  Mon Apr 10 16:43:46 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon, 10 Apr 2006 09:43:46 -0700
Subject: owners owners.list,1.825,1.826
Message-ID: <200604101643.k3AGhmIL009453@cvs-int.fedora.redhat.com>

Author: chrisw

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

Modified Files:
	owners.list 
Log Message:
Rename git-core to git



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.825
retrieving revision 1.826
diff -u -r1.825 -r1.826
--- owners.list	10 Apr 2006 10:45:11 -0000	1.825
+++ owners.list	10 Apr 2006 16:43:45 -0000	1.826
@@ -133,7 +133,7 @@
 Fedora Extras|cln|Class Library for Numbers|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|cmake|Cross-platform make system|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|cmucl|CMU Common Lisp|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
-Fedora Extras|cogito|Cogito SCM based on git-core|chrisw at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|cogito|Cogito SCM based on git|chrisw at redhat.com|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|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|
@@ -327,7 +327,7 @@
 Fedora Extras|gift|Daemon for communicating with filesharing protocols|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|gift-openft|Openft plugin for giFT|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|ginac|C++ library for symbolic calculation|qspencer at ieee.org|extras-qa at fedoraproject.org|
-Fedora Extras|git-core|A distributed SCM|chrisw at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|git|A distributed SCM|chrisw at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|gjots2|Simple jotter application for your desktop - an outline processor|rvokal at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-aclock|Analog clock plugin for GKrellM|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-freq|CPU frequency display plugin for GKrellM|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Apr 10 16:47:49 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon, 10 Apr 2006 09:47:49 -0700
Subject: rpms/git/devel Makefile,1.1,1.2
Message-ID: <200604101647.k3AGlpv6009496@cvs-int.fedora.redhat.com>

Author: chrisw

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

Modified Files:
	Makefile 
Log Message:
rename git-core to git


Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/git/devel/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	30 Aug 2005 00:36:41 -0000	1.1
+++ Makefile	10 Apr 2006 16:47:48 -0000	1.2
@@ -1,6 +1,6 @@
-# Makefile for source rpm: git-core
+# Makefile for source rpm: git
 # $Id$
-NAME := git-core
+NAME := git
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common



From fedora-extras-commits at redhat.com  Mon Apr 10 16:48:26 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon, 10 Apr 2006 09:48:26 -0700
Subject: rpms/git/devel .cvsignore, 1.23, 1.24 git.spec, 1.11, 1.12 sources, 
	1.23, 1.24
Message-ID: <200604101648.k3AGmSBn009528@cvs-int.fedora.redhat.com>

Author: chrisw

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

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.2.6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	5 Apr 2006 23:25:25 -0000	1.23
+++ .cvsignore	10 Apr 2006 16:48:25 -0000	1.24
@@ -1 +1 @@
-git-1.2.5.tar.gz
+git-1.2.6.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/devel/git.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- git.spec	5 Apr 2006 23:25:25 -0000	1.11
+++ git.spec	10 Apr 2006 16:48:25 -0000	1.12
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.2.5
+Version: 	1.2.6
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Mon Apr 10 2006 Chris Wright <chrisw at redhat.com> 1.2.6-1
+- git-1.2.6
+
 * Wed Apr 5 2006 Chris Wright <chrisw at redhat.com> 1.2.5-1
 - git-1.2.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	5 Apr 2006 23:25:25 -0000	1.23
+++ sources	10 Apr 2006 16:48:25 -0000	1.24
@@ -1 +1 @@
-30b4c8b1765636f3c0f9f7d69e8b286c  git-1.2.5.tar.gz
+f10a13074e849ff8670f5dba07bfe5c1  git-1.2.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 16:50:18 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon, 10 Apr 2006 09:50:18 -0700
Subject: rpms/git/FC-5 Makefile,1.1,1.2
Message-ID: <200604101650.k3AGoKs9009589@cvs-int.fedora.redhat.com>

Author: chrisw

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

Modified Files:
	Makefile 
Log Message:
rename git-core to git


Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/git/FC-5/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	30 Aug 2005 00:36:41 -0000	1.1
+++ Makefile	10 Apr 2006 16:50:17 -0000	1.2
@@ -1,6 +1,6 @@
-# Makefile for source rpm: git-core
+# Makefile for source rpm: git
 # $Id$
-NAME := git-core
+NAME := git
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common



From fedora-extras-commits at redhat.com  Mon Apr 10 16:50:46 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon, 10 Apr 2006 09:50:46 -0700
Subject: rpms/git/FC-5 .cvsignore, 1.23, 1.24 git.spec, 1.11, 1.12 sources, 
	1.23, 1.24
Message-ID: <200604101650.k3AGomSw009635@cvs-int.fedora.redhat.com>

Author: chrisw

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

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.2.6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/FC-5/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	5 Apr 2006 23:26:47 -0000	1.23
+++ .cvsignore	10 Apr 2006 16:50:46 -0000	1.24
@@ -1 +1 @@
-git-1.2.5.tar.gz
+git-1.2.6.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/FC-5/git.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- git.spec	5 Apr 2006 23:26:47 -0000	1.11
+++ git.spec	10 Apr 2006 16:50:46 -0000	1.12
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.2.5
+Version: 	1.2.6
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Mon Apr 10 2006 Chris Wright <chrisw at redhat.com> 1.2.6-1
+- git-1.2.6
+
 * Wed Apr 5 2006 Chris Wright <chrisw at redhat.com> 1.2.5-1
 - git-1.2.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/FC-5/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	5 Apr 2006 23:26:47 -0000	1.23
+++ sources	10 Apr 2006 16:50:46 -0000	1.24
@@ -1 +1 @@
-30b4c8b1765636f3c0f9f7d69e8b286c  git-1.2.5.tar.gz
+f10a13074e849ff8670f5dba07bfe5c1  git-1.2.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 16:51:13 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon, 10 Apr 2006 09:51:13 -0700
Subject: rpms/git/FC-4 Makefile,1.1,1.2
Message-ID: <200604101651.k3AGpFA7009696@cvs-int.fedora.redhat.com>

Author: chrisw

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

Modified Files:
	Makefile 
Log Message:
rename git-core to git


Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/git/FC-4/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	30 Aug 2005 00:36:41 -0000	1.1
+++ Makefile	10 Apr 2006 16:51:13 -0000	1.2
@@ -1,6 +1,6 @@
-# Makefile for source rpm: git-core
+# Makefile for source rpm: git
 # $Id$
-NAME := git-core
+NAME := git
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common



From fedora-extras-commits at redhat.com  Mon Apr 10 16:51:39 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon, 10 Apr 2006 09:51:39 -0700
Subject: rpms/git/FC-4 .cvsignore, 1.23, 1.24 git.spec, 1.11, 1.12 sources, 
	1.23, 1.24
Message-ID: <200604101651.k3AGpfIs009739@cvs-int.fedora.redhat.com>

Author: chrisw

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

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.2.6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/FC-4/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	5 Apr 2006 23:27:32 -0000	1.23
+++ .cvsignore	10 Apr 2006 16:51:39 -0000	1.24
@@ -1 +1 @@
-git-1.2.5.tar.gz
+git-1.2.6.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/FC-4/git.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- git.spec	5 Apr 2006 23:27:32 -0000	1.11
+++ git.spec	10 Apr 2006 16:51:39 -0000	1.12
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.2.5
+Version: 	1.2.6
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Mon Apr 10 2006 Chris Wright <chrisw at redhat.com> 1.2.6-1
+- git-1.2.6
+
 * Wed Apr 5 2006 Chris Wright <chrisw at redhat.com> 1.2.5-1
 - git-1.2.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/FC-4/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	5 Apr 2006 23:27:32 -0000	1.23
+++ sources	10 Apr 2006 16:51:39 -0000	1.24
@@ -1 +1 @@
-30b4c8b1765636f3c0f9f7d69e8b286c  git-1.2.5.tar.gz
+f10a13074e849ff8670f5dba07bfe5c1  git-1.2.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 16:52:46 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon, 10 Apr 2006 09:52:46 -0700
Subject: rpms/git/FC-3 Makefile,1.1,1.2
Message-ID: <200604101652.k3AGqmKG009805@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9788

Modified Files:
	Makefile 
Log Message:
rename git-core to git


Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/git/FC-3/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	30 Aug 2005 00:36:41 -0000	1.1
+++ Makefile	10 Apr 2006 16:52:46 -0000	1.2
@@ -1,6 +1,6 @@
-# Makefile for source rpm: git-core
+# Makefile for source rpm: git
 # $Id$
-NAME := git-core
+NAME := git
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common



From fedora-extras-commits at redhat.com  Mon Apr 10 16:53:11 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon, 10 Apr 2006 09:53:11 -0700
Subject: rpms/git/FC-3 .cvsignore, 1.23, 1.24 git.spec, 1.11, 1.12 sources, 
	1.23, 1.24
Message-ID: <200604101653.k3AGrDtk009843@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9822

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.2.6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/FC-3/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	5 Apr 2006 23:28:25 -0000	1.23
+++ .cvsignore	10 Apr 2006 16:53:10 -0000	1.24
@@ -1 +1 @@
-git-1.2.5.tar.gz
+git-1.2.6.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/FC-3/git.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- git.spec	5 Apr 2006 23:28:25 -0000	1.11
+++ git.spec	10 Apr 2006 16:53:10 -0000	1.12
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.2.5
+Version: 	1.2.6
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Mon Apr 10 2006 Chris Wright <chrisw at redhat.com> 1.2.6-1
+- git-1.2.6
+
 * Wed Apr 5 2006 Chris Wright <chrisw at redhat.com> 1.2.5-1
 - git-1.2.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/FC-3/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	5 Apr 2006 23:28:25 -0000	1.23
+++ sources	10 Apr 2006 16:53:10 -0000	1.24
@@ -1 +1 @@
-30b4c8b1765636f3c0f9f7d69e8b286c  git-1.2.5.tar.gz
+f10a13074e849ff8670f5dba07bfe5c1  git-1.2.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 17:04:16 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon, 10 Apr 2006 10:04:16 -0700
Subject: rpms/cogito/devel .cvsignore, 1.8, 1.9 cogito.spec, 1.11,
	1.12 sources, 1.8, 1.9
Message-ID: <200604101704.k3AH4Ipq011966@cvs-int.fedora.redhat.com>

Author: chrisw

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

Modified Files:
	.cvsignore cogito.spec sources 
Log Message:
Update cogito to 0.17.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cogito/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	29 Mar 2006 19:34:04 -0000	1.8
+++ .cvsignore	10 Apr 2006 17:04:16 -0000	1.9
@@ -1 +1 @@
-cogito-0.17.1.tar.gz
+cogito-0.17.2.tar.gz


Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/devel/cogito.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cogito.spec	30 Mar 2006 23:48:02 -0000	1.11
+++ cogito.spec	10 Apr 2006 17:04:16 -0000	1.12
@@ -1,6 +1,6 @@
 Name: 		cogito
-Version: 	0.17.1
-Release: 	2%{?dist}
+Version: 	0.17.2
+Release: 	1%{?dist}
 Summary:  	The Cogito Version Control System
 License: 	GPL
 Group: 		Development/Tools
@@ -11,8 +11,6 @@
 BuildRequires: 	asciidoc, xmlto
 BuildArch:	noarch
 
-Patch1: cg-admin-rewritehist-fix.patch
-
 %description
 Cogito is a version control system layered on top of the git tree history
 storage system. It aims at seamless user interface and ease of use, providing
@@ -21,7 +19,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 
@@ -47,6 +44,9 @@
 %doc README COPYING Documentation/tutorial-script
 
 %changelog
+* Mon Apr 10 2006 Chris Wright <chrisw at redhat.com> 0.17.2-1
+- 0.17.2
+
 * Thu Mar 30 2006 Chris Wright <chrisw at redhat.com> 0.17.1-2
 - cg-admin-rewritehist fix
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cogito/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	29 Mar 2006 19:34:04 -0000	1.8
+++ sources	10 Apr 2006 17:04:16 -0000	1.9
@@ -1 +1 @@
-2c79629440ab0b652ebfcc1d4bae0122  cogito-0.17.1.tar.gz
+8e41b7b63319e4641f08645c59e20627  cogito-0.17.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 17:05:03 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon, 10 Apr 2006 10:05:03 -0700
Subject: rpms/cogito/FC-5 .cvsignore, 1.8, 1.9 cogito.spec, 1.11,
	1.12 sources, 1.8, 1.9
Message-ID: <200604101705.k3AH559H012057@cvs-int.fedora.redhat.com>

Author: chrisw

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

Modified Files:
	.cvsignore cogito.spec sources 
Log Message:
Update cogito to 0.17.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	29 Mar 2006 19:35:49 -0000	1.8
+++ .cvsignore	10 Apr 2006 17:05:03 -0000	1.9
@@ -1 +1 @@
-cogito-0.17.1.tar.gz
+cogito-0.17.2.tar.gz


Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-5/cogito.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cogito.spec	30 Mar 2006 23:49:10 -0000	1.11
+++ cogito.spec	10 Apr 2006 17:05:03 -0000	1.12
@@ -1,6 +1,6 @@
 Name: 		cogito
-Version: 	0.17.1
-Release: 	2%{?dist}
+Version: 	0.17.2
+Release: 	1%{?dist}
 Summary:  	The Cogito Version Control System
 License: 	GPL
 Group: 		Development/Tools
@@ -11,8 +11,6 @@
 BuildRequires: 	asciidoc, xmlto
 BuildArch:	noarch
 
-Patch1: cg-admin-rewritehist-fix.patch
-
 %description
 Cogito is a version control system layered on top of the git tree history
 storage system. It aims at seamless user interface and ease of use, providing
@@ -21,7 +19,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 
@@ -47,6 +44,9 @@
 %doc README COPYING Documentation/tutorial-script
 
 %changelog
+* Mon Apr 10 2006 Chris Wright <chrisw at redhat.com> 0.17.2-1
+- 0.17.2
+
 * Thu Mar 30 2006 Chris Wright <chrisw at redhat.com> 0.17.1-2
 - cg-admin-rewritehist fix
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	29 Mar 2006 19:35:49 -0000	1.8
+++ sources	10 Apr 2006 17:05:03 -0000	1.9
@@ -1 +1 @@
-2c79629440ab0b652ebfcc1d4bae0122  cogito-0.17.1.tar.gz
+8e41b7b63319e4641f08645c59e20627  cogito-0.17.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 17:05:39 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon, 10 Apr 2006 10:05:39 -0700
Subject: rpms/cogito/FC-4 .cvsignore, 1.8, 1.9 cogito.spec, 1.10,
	1.11 sources, 1.8, 1.9
Message-ID: <200604101705.k3AH5fFp012141@cvs-int.fedora.redhat.com>

Author: chrisw

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

Modified Files:
	.cvsignore cogito.spec sources 
Log Message:
Update cogito to 0.17.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	29 Mar 2006 19:36:46 -0000	1.8
+++ .cvsignore	10 Apr 2006 17:05:39 -0000	1.9
@@ -1 +1 @@
-cogito-0.17.1.tar.gz
+cogito-0.17.2.tar.gz


Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-4/cogito.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cogito.spec	30 Mar 2006 23:51:26 -0000	1.10
+++ cogito.spec	10 Apr 2006 17:05:39 -0000	1.11
@@ -1,6 +1,6 @@
 Name: 		cogito
-Version: 	0.17.1
-Release: 	2%{?dist}
+Version: 	0.17.2
+Release: 	1%{?dist}
 Summary:  	The Cogito Version Control System
 License: 	GPL
 Group: 		Development/Tools
@@ -11,8 +11,6 @@
 BuildRequires: 	asciidoc, xmlto
 BuildArch:	noarch
 
-Patch1: cg-admin-rewritehist-fix.patch
-
 %description
 Cogito is a version control system layered on top of the git tree history
 storage system. It aims at seamless user interface and ease of use, providing
@@ -21,7 +19,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 
@@ -47,6 +44,9 @@
 %doc README COPYING Documentation/tutorial-script
 
 %changelog
+* Mon Apr 10 2006 Chris Wright <chrisw at redhat.com> 0.17.2-1
+- 0.17.2
+
 * Thu Mar 30 2006 Chris Wright <chrisw at redhat.com> 0.17.1-2
 - cg-admin-rewritehist fix
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	29 Mar 2006 19:36:46 -0000	1.8
+++ sources	10 Apr 2006 17:05:39 -0000	1.9
@@ -1 +1 @@
-2c79629440ab0b652ebfcc1d4bae0122  cogito-0.17.1.tar.gz
+8e41b7b63319e4641f08645c59e20627  cogito-0.17.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 17:06:15 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon, 10 Apr 2006 10:06:15 -0700
Subject: rpms/cogito/FC-3 .cvsignore, 1.8, 1.9 cogito.spec, 1.10,
	1.11 sources, 1.8, 1.9
Message-ID: <200604101706.k3AH6Htm012219@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12196

Modified Files:
	.cvsignore cogito.spec sources 
Log Message:
Update cogito to 0.17.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-3/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	29 Mar 2006 19:37:52 -0000	1.8
+++ .cvsignore	10 Apr 2006 17:06:15 -0000	1.9
@@ -1 +1 @@
-cogito-0.17.1.tar.gz
+cogito-0.17.2.tar.gz


Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-3/cogito.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cogito.spec	30 Mar 2006 23:52:19 -0000	1.10
+++ cogito.spec	10 Apr 2006 17:06:15 -0000	1.11
@@ -1,6 +1,6 @@
 Name: 		cogito
-Version: 	0.17.1
-Release: 	2%{?dist}
+Version: 	0.17.2
+Release: 	1%{?dist}
 Summary:  	The Cogito Version Control System
 License: 	GPL
 Group: 		Development/Tools
@@ -11,8 +11,6 @@
 BuildRequires: 	asciidoc, xmlto
 BuildArch:	noarch
 
-Patch1: cg-admin-rewritehist-fix.patch
-
 %description
 Cogito is a version control system layered on top of the git tree history
 storage system. It aims at seamless user interface and ease of use, providing
@@ -21,7 +19,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 
@@ -47,6 +44,9 @@
 %doc README COPYING Documentation/tutorial-script
 
 %changelog
+* Mon Apr 10 2006 Chris Wright <chrisw at redhat.com> 0.17.2-1
+- 0.17.2
+
 * Thu Mar 30 2006 Chris Wright <chrisw at redhat.com> 0.17.1-2
 - cg-admin-rewritehist fix
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-3/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	29 Mar 2006 19:37:52 -0000	1.8
+++ sources	10 Apr 2006 17:06:15 -0000	1.9
@@ -1 +1 @@
-2c79629440ab0b652ebfcc1d4bae0122  cogito-0.17.1.tar.gz
+8e41b7b63319e4641f08645c59e20627  cogito-0.17.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 17:09:58 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Mon, 10 Apr 2006 10:09:58 -0700
Subject: rpms/gnome-sudoku/FC-4 gnome-sudoku.spec,1.7,1.8
Message-ID: <200604101710.k3AHAUeT012325@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/gnome-sudoku/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12267/FC-4

Modified Files:
	gnome-sudoku.spec 
Log Message:
Make SRPM more portable


Index: gnome-sudoku.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/FC-4/gnome-sudoku.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gnome-sudoku.spec	10 Apr 2006 15:55:51 -0000	1.7
+++ gnome-sudoku.spec	10 Apr 2006 17:09:58 -0000	1.8
@@ -10,9 +10,7 @@
 License:        GPL
 URL:            http://gnome-sudoku.sourceforge.net
 Source0:        http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-%if "%{fedora}" <= "4"
 Patch0:		gnome-sudoku-0.4.0-pygtk2-nofs.patch
-%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch



From fedora-extras-commits at redhat.com  Mon Apr 10 17:10:00 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Mon, 10 Apr 2006 10:10:00 -0700
Subject: rpms/gnome-sudoku/devel gnome-sudoku-0.4.0-pygtk2-nofs.patch, NONE, 
	1.1 gnome-sudoku.spec, 1.5, 1.6
Message-ID: <200604101710.k3AHAWls012331@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/gnome-sudoku/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12267/devel

Modified Files:
	gnome-sudoku.spec 
Added Files:
	gnome-sudoku-0.4.0-pygtk2-nofs.patch 
Log Message:
Make SRPM more portable

gnome-sudoku-0.4.0-pygtk2-nofs.patch:

--- NEW FILE gnome-sudoku-0.4.0-pygtk2-nofs.patch ---
diff -uNr gnome-sudoku-0.4.0-original/src/lib/gnome_sudoku.py gnome-sudoku-0.4.0/src/lib/gnome_sudoku.py
--- gnome-sudoku-0.4.0-original/src/lib/gnome_sudoku.py	2005-12-16 13:03:38.000000000 -0500
+++ gnome-sudoku-0.4.0/src/lib/gnome_sudoku.py	2005-12-16 13:04:28.000000000 -0500
@@ -168,7 +168,7 @@
             ('ZoomOut',gtk.STOCK_ZOOM_OUT,'_Decrease size',
              '<Control>minus','Decrease the size of numbers and squares.',
              self.zoom_out_cb),
-            ('FullScreen',gtk.STOCK_FULLSCREEN,None,
+            ('FullScreen',None,'_Full screen',
              'F11',None,self.full_screen_cb),
             ('PuzzleInfo',gtk.STOCK_ABOUT,'Puzzle _Statistics',
              None,'Show statistics about current puzzle',


Index: gnome-sudoku.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/devel/gnome-sudoku.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-sudoku.spec	10 Apr 2006 15:55:53 -0000	1.5
+++ gnome-sudoku.spec	10 Apr 2006 17:10:00 -0000	1.6
@@ -10,9 +10,7 @@
 License:        GPL
 URL:            http://gnome-sudoku.sourceforge.net
 Source0:        http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-%if "%{fedora}" <= "4"
 Patch0:		gnome-sudoku-0.4.0-pygtk2-nofs.patch
-%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch



From fedora-extras-commits at redhat.com  Mon Apr 10 17:09:59 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Mon, 10 Apr 2006 10:09:59 -0700
Subject: rpms/gnome-sudoku/FC-5 gnome-sudoku-0.4.0-pygtk2-nofs.patch, NONE, 
	1.1 gnome-sudoku.spec, 1.5, 1.6
Message-ID: <200604101710.k3AHAVqc012328@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/gnome-sudoku/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12267/FC-5

Modified Files:
	gnome-sudoku.spec 
Added Files:
	gnome-sudoku-0.4.0-pygtk2-nofs.patch 
Log Message:
Make SRPM more portable

gnome-sudoku-0.4.0-pygtk2-nofs.patch:

--- NEW FILE gnome-sudoku-0.4.0-pygtk2-nofs.patch ---
diff -uNr gnome-sudoku-0.4.0-original/src/lib/gnome_sudoku.py gnome-sudoku-0.4.0/src/lib/gnome_sudoku.py
--- gnome-sudoku-0.4.0-original/src/lib/gnome_sudoku.py	2005-12-16 13:03:38.000000000 -0500
+++ gnome-sudoku-0.4.0/src/lib/gnome_sudoku.py	2005-12-16 13:04:28.000000000 -0500
@@ -168,7 +168,7 @@
             ('ZoomOut',gtk.STOCK_ZOOM_OUT,'_Decrease size',
              '<Control>minus','Decrease the size of numbers and squares.',
              self.zoom_out_cb),
-            ('FullScreen',gtk.STOCK_FULLSCREEN,None,
+            ('FullScreen',None,'_Full screen',
              'F11',None,self.full_screen_cb),
             ('PuzzleInfo',gtk.STOCK_ABOUT,'Puzzle _Statistics',
              None,'Show statistics about current puzzle',


Index: gnome-sudoku.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/FC-5/gnome-sudoku.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-sudoku.spec	10 Apr 2006 15:55:52 -0000	1.5
+++ gnome-sudoku.spec	10 Apr 2006 17:09:59 -0000	1.6
@@ -10,9 +10,7 @@
 License:        GPL
 URL:            http://gnome-sudoku.sourceforge.net
 Source0:        http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-%if "%{fedora}" <= "4"
 Patch0:		gnome-sudoku-0.4.0-pygtk2-nofs.patch
-%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch



From fedora-extras-commits at redhat.com  Mon Apr 10 17:20:08 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Mon, 10 Apr 2006 10:20:08 -0700
Subject: rpms/smart - New directory
Message-ID: <200604101720.k3AHKAJV012664@cvs-int.fedora.redhat.com>

Author: athimm

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

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




From fedora-extras-commits at redhat.com  Mon Apr 10 17:20:09 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Mon, 10 Apr 2006 10:20:09 -0700
Subject: rpms/smart/devel - New directory
Message-ID: <200604101720.k3AHKBVl012667@cvs-int.fedora.redhat.com>

Author: athimm

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

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




From fedora-extras-commits at redhat.com  Mon Apr 10 17:20:27 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 10 Apr 2006 10:20:27 -0700
Subject: rpms/apt/devel apt.spec,1.23,1.24
Message-ID: <200604101720.k3AHKT1H012699@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	apt.spec 
Log Message:
* Mon Apr 10 2006 Ville Skytt?? <ville.skytta at iki.fi>
- Remove mirror select remainders (thanks to Panu).



Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- apt.spec	9 Apr 2006 15:23:32 -0000	1.23
+++ apt.spec	10 Apr 2006 17:20:27 -0000	1.24
@@ -68,13 +68,10 @@
 BuildRequires:  pkgconfig
 Requires:       gnupg
 Requires:       bzip2
-# wget needed by the mirror-selector script
-Requires:       wget
 Requires:       fedora-release >= 4
 Requires(post): chkconfig
 Requires(post): ldconfig
 Requires(preun): chkconfig
-Provides:       apt-mirrorselect
 %if 0%{!?_with_groupinstall:1}
 Obsoletes:      %{name}-groupinstall < %{version}-%{release}
 %endif
@@ -311,6 +308,9 @@
 
 
 %changelog
+* Mon Apr 10 2006 Ville Skytt?? <ville.skytta at iki.fi>
+- Remove mirror select remainders (thanks to Panu).
+
 * Sun Apr  9 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.15lorg3-0.3.rc1
 - 0.5.15lorg3-rc1.
 - Trim pre-2005 changelog entries.



From fedora-extras-commits at redhat.com  Mon Apr 10 17:20:35 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Mon, 10 Apr 2006 10:20:35 -0700
Subject: rpms/smart Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604101720.k3AHKb58012735@cvs-int.fedora.redhat.com>

Author: athimm

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

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


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

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

common : CVS/Root
	@cvs 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 Apr 10 17:20:36 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Mon, 10 Apr 2006 10:20:36 -0700
Subject: rpms/smart/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200604101720.k3AHKcJA012738@cvs-int.fedora.redhat.com>

Author: athimm

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

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


--- 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 Apr 10 17:22:46 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Mon, 10 Apr 2006 10:22:46 -0700
Subject: rpms/smart import.log,1.1,1.2
Message-ID: <200604101722.k3AHMmdY012879@cvs-int.fedora.redhat.com>

Author: athimm

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

Modified Files:
	import.log 
Log Message:
auto-import smart-0.41-29 on branch devel from smart-0.41-29.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/smart/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Apr 2006 17:20:35 -0000	1.1
+++ import.log	10 Apr 2006 17:22:46 -0000	1.2
@@ -0,0 +1 @@
+smart-0_41-29:HEAD:smart-0.41-29.src.rpm:1144689754



From fedora-extras-commits at redhat.com  Mon Apr 10 17:22:47 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Mon, 10 Apr 2006 10:22:47 -0700
Subject: rpms/smart/devel distro.py, NONE, 1.1 smart-0.28-mxddcl.patch, NONE,
	1.1 smart-0.41-emptydesc.patch, NONE, 1.1 smart.console, NONE,
	1.1 smart.desktop, NONE, 1.1 smart.pam, NONE, 1.1 smart.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604101722.k3AHMnEF012888@cvs-int.fedora.redhat.com>

Author: athimm

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

Modified Files:
	.cvsignore sources 
Added Files:
	distro.py smart-0.28-mxddcl.patch smart-0.41-emptydesc.patch 
	smart.console smart.desktop smart.pam smart.spec 
Log Message:
auto-import smart-0.41-29 on branch devel from smart-0.41-29.src.rpm


--- NEW FILE distro.py ---
if not sysconf.getReadOnly():
    if not sysconf.has("channels"):
        sysconf.set(("channels", "rpm-db"),
                    {"alias": "rpm-db",
                     "type": "rpm-sys",
                     "name": "RPM Database"})

    for flavour in ("", "-smp", "-bigmem", "-hugemem", "-largesmp", "-xen0", "-xenU", "-kdump"):
        pkgconf.setFlag("multi-version", "kernel%s" % flavour)
        pkgconf.setFlag("multi-version", "kernel%s-unsupported" % flavour)
        pkgconf.setFlag("multi-version", "kernel%s-devel" % flavour)
        for clustergfs in ("GFS", "cman", "dlm", "gnbd"):
             pkgconf.setFlag("multi-version", "%s-kernel%s" % (clustergfs, flavour))
        pkgconf.setFlag("multi-version", "kernel-suspend2%s" % flavour)
        pkgconf.setFlag("multi-version", "kernel-suspend2%s-unsupported" % flavour)
        pkgconf.setFlag("multi-version", "kernel-suspend2%s-devel" % flavour)
        for clustergfs in ("GFS", "cman", "dlm", "gnbd"):
             pkgconf.setFlag("multi-version", "%s-kernel-suspend2%s" % (clustergfs, flavour))
    pkgconf.setFlag("multi-version", "kernel-source")
    pkgconf.setFlag("multi-version", "kernel-sourcecode")

import os
import os.path

DISTRODIR = "/etc/smart/distro.d"

if os.path.isdir(DISTRODIR):
    for f in map(lambda x: os.path.join(DISTRODIR, x), os.listdir(DISTRODIR)):
        if f.endswith(".py") and os.path.isfile(f):
            execfile(f, {"ctrl": ctrl, "iface": iface, "sysconf": sysconf,
                         "pkgconf": pkgconf, "hooks": hooks})

smart-0.28-mxddcl.patch:

--- NEW FILE smart-0.28-mxddcl.patch ---
--- smart-0.28/smart/ccache.c~	2004-12-06 20:50:02.000000000 +0100
+++ smart-0.28/smart/ccache.c	2004-12-18 04:31:53.201002760 +0100
@@ -1105,6 +1105,8 @@
 
     CacheObject *cache;
 
+    int found;
+
     if (!self->_cache) {
         PyErr_SetString(PyExc_TypeError, "Cache not set");
         return NULL;
@@ -1346,7 +1348,7 @@
     }
 
     /* found = False */
-    int found = 0;
+    found = 0;
     /* lst = cache._objmap.get(pkgargs) */
     lst = PyDict_GetItem(cache->_objmap, pkgargs);
     /* if lst is not None: */
@@ -1541,8 +1543,9 @@
     PyObject *state = PyDict_New();
     PyObject *self__stateversion__;
     PyMemberDef *members = Loader_Type.tp_members;
+    int i;
     if (!state) return NULL;
-    int i = 0;
+    i = 0;
     PyErr_Clear();
     while (members[i].name) {
         PyObject *obj = PyMember_GetOne((char *)self, &members[i]);
@@ -1567,6 +1570,7 @@
     PyMemberDef *members = Loader_Type.tp_members;
     PyObject *self__stateversion__;
     PyObject *__stateversion__;
+    PyObject *dict;
     if (!PyDict_Check(state)) {
         PyErr_SetString(StateVersionError, "");
         return NULL;
@@ -1581,7 +1585,7 @@
         return NULL;
     }
     Py_DECREF(self__stateversion__);
-    PyObject *dict = PyObject_GetAttrString((PyObject *)self, "__dict__");
+    dict = PyObject_GetAttrString((PyObject *)self, "__dict__");
     if (dict) {
         PyObject *keys = PyDict_Keys(state);
         int i, ilen;
@@ -1842,6 +1846,7 @@
     /* for loader in loaders: */
     ilen = PyList_GET_SIZE(self->_loaders);
     for (i = 0; i != ilen; i++) {
+        int j, jlen;
         LoaderObject *loader =
                         (LoaderObject *)PyList_GET_ITEM(self->_loaders, i);
         if (!PyObject_IsInstance((PyObject *)loader,
@@ -1852,7 +1857,6 @@
         }
 
         /* for pkg in loader._packages: */
-        int j, jlen;
         jlen = PyList_GET_SIZE(loader->_packages);
         for (j = 0; j != jlen; j++) {
             PackageObject *pkg = (PackageObject *)

smart-0.41-emptydesc.patch:

--- NEW FILE smart-0.41-emptydesc.patch ---
Index: smart/backends/rpm/metadata.py
===================================================================
--- smart/backends/rpm/metadata.py	(revision 689)
+++ smart/backends/rpm/metadata.py	(revision 690)
@@ -178,10 +178,12 @@
                                   (elem.get("ver"), elem.get("rel"))
 
                 elif tag == SUMMARY:
-                    info["summary"] = elem.text
+                    if elem.text:
+                        info["summary"] = elem.text
 
                 elif tag == DESCRIPTION:
-                    info["description"] = elem.text
+                    if elem.text:
+                        info["description"] = elem.text
 
                 elif tag == SIZE:
                     info["size"] = int(elem.get("package"))
@@ -196,7 +198,8 @@
                     info["location"] = elem.get("href")
 
                 elif tag == GROUP:
-                    info["group"] = elem.text
+                    if elem.text:
+                        info["group"] = elem.text
 
                 elif tag == FILE:
                     filedict[elem.text] = True


--- NEW FILE smart.console ---
USER=root
PROGRAM=/usr/bin/smart
SESSION=true


--- NEW FILE smart.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Smart Package Manager
Name[pt_BR]=Gerenciador de Pacotes Smart
Comment=Next generation package handling tool
Comment[pt_BR]=Gerenciador de pacotes de pr??xima gera????o
Icon=smart.png
Exec=smart-root --gui
Type=Application
Terminal=false
StartupNotify=true
Categories=Application;System;
X-Desktop-File-Install-Version=0.2


--- NEW FILE smart.pam ---
#%PAM-1.0
auth       sufficient	pam_rootok.so
auth       sufficient	pam_timestamp.so
auth       required	pam_stack.so service=system-auth
session    required	pam_permit.so
session    optional	pam_timestamp.so
session    optional	pam_xauth.so
account    required	pam_permit.so


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

Summary: Next generation package handling tool
Name: smart
Version: 0.41%{?dist}
Release: 29
License: GPL
Group: Applications/System
URL: http://labix.org/smart/
Source0: http://labix.org/download/smart/%{name}-%{version}.tar.bz2
Source1: smart.console
Source2: smart.pam
Source3: smart.desktop
Source4: distro.py
Patch0: smart-0.28-mxddcl.patch
Patch1: smart-0.41-emptydesc.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: python-devel >= 2.3
BuildRequires: desktop-file-utils
Requires: python-abi = %(python -c "import sys ; print sys.version[:3]")
Requires: rpm-python >= 4.4
Requires: fedora-package-config-smart

%description
Smart Package Manager is a next generation package handling tool.

%package update
Summary: Allows execution of 'smart update' by normal users (suid)
Group: Applications/System
Requires: smart = %{version}-%{release}

%description update
Allows execution of 'smart update' by normal users through a
special suid command.

%package gui
Summary: Graphical user interface for the smart package manager
Group: Applications/System
Requires: smart = %{version}-%{release}
Requires: pygtk2 >= 2.4
Requires: usermode

%description gui
Graphical user interface for the smart package manager.

%prep
%setup -q
%patch0 -p1 -b .mxddcl
%patch1 -p0 -b .emptydesc

# /usr/lib is hardcoded 
perl -pi -e's,/usr/lib/,%{_libdir}/,' smart/const.py

%build
CFLAGS="%{optflags}"
export CFLAGS
python setup.py build

make -C contrib/smart-update

%install
rm -rf %{buildroot}
python setup.py install -O1 --root=%{buildroot}

mkdir -p %{buildroot}%{_libdir}/smart/plugins
mkdir -p %{buildroot}%{_sysconfdir}/smart/channels
mkdir -p %{buildroot}%{_localstatedir}/lib/smart{/packages,/channels}

# usermode support
ln -sf consolehelper %{buildroot}%{_bindir}/smart-root

mkdir -p %{buildroot}/etc/security/console.apps
mkdir -p %{buildroot}/etc/pam.d
install -p -m 644 %{SOURCE1} %{buildroot}/etc/security/console.apps/smart-root
install -p -m 644 %{SOURCE2} %{buildroot}/etc/pam.d/smart-root

# smart-update
install -p contrib/smart-update/smart-update %{buildroot}%{_bindir}

mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install --vendor fedora                            \
        --dir %{buildroot}%{_datadir}/applications              \
        --add-category X-Fedora                                 \
        %{SOURCE3}

mkdir -p  %{buildroot}%{_datadir}/pixmaps
install -p -m 644 smart/interfaces/images/smart.png \
    %{buildroot}%{_datadir}/pixmaps/smart.png

# distro.py and distro.d support
install -p -m 644 %{SOURCE4} %{buildroot}%{_libdir}/smart/
mkdir -p %{buildroot}%{_sysconfdir}/smart/distro.d

%find_lang %{name}

# Create a list w/o smart/interfaces/gtk to avoid warbing of duplicate
# in the %files section (otherwise including all and %excluding works,
# too

echo "%%defattr(-,root,root,-)" > %{name}.fileslist
find %{buildroot}%{python_sitearch}/smart -type d \
  | grep -v %{python_sitearch}/smart/interfaces/gtk \
  | sed -e's,%{buildroot},%%dir ,' \
  >> %{name}.fileslist
find %{buildroot}%{python_sitearch}/smart \! -type d \! -name \*.pyo \
  | grep -v %{python_sitearch}/smart/interfaces/gtk \
  | sed -e's,%{buildroot},,' \
  >> %{name}.fileslist
find %{buildroot}%{python_sitearch}/smart -name \*.pyo \
  | grep -v %{python_sitearch}/smart/interfaces/gtk \
  | sed -e's,%{buildroot},%%ghost ,' \
  >> %{name}.fileslist

# %files does not take two -f arguments
cat %{name}.lang >> %{name}.fileslist

%clean
rm -rf %{buildroot}

%files -f %{name}.fileslist
%defattr(-,root,root,-)
%doc HACKING README LICENSE TODO IDEAS
%{_bindir}/smart
%{_libdir}/smart
%{_sysconfdir}/smart
%{_localstatedir}/lib/smart

%files update
%defattr(-,root,root,-)
%{_bindir}/smart-update

%files gui
%defattr(-,root,root,-)
%dir %{python_sitearch}/smart/interfaces/gtk
%{python_sitearch}/smart/interfaces/gtk/*.py
%{python_sitearch}/smart/interfaces/gtk/*.pyc
%ghost %{python_sitearch}/smart/interfaces/gtk/*.pyo
%{_datadir}/applications/*-smart.desktop
%{_datadir}/pixmaps/smart.png

%{_bindir}/smart-root
%config %{_sysconfdir}/security/console.apps/smart-root
%config %{_sysconfdir}/pam.d/smart-root

%changelog
* Mon Apr 10 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41-29
- Fix typos in distro.py, there were %% missing.
- /usr/bin/smart-root should had been %%{_bindir}/smart-root ...
- Make dependent on fedora-package-config-smart.

* Sun Apr  2 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41-28
- Move usermode support to the gui package.
- Add cluster/gfs *-kernel variants.

* Fri Mar 31 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41-27
- Sync with specfile from Ville Skytt?? <ville.skytta at iki.fi>
- Add empty-description patch (upstream issue 64).
- Update multi-version to include more kernel-* variants.
- Add distro.d support.
- Make owner of %%{_sysconfdir}/smart and %%{_localstatedir}/lib/smart{,/packages,/channels}.

* Wed Dec 21 2005 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41-26
- Update to 0.41.

* Tue Dec 13 2005 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.40-23
- Adapted to Fedora Extras guidelines for submission.

* Sun Oct  9 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
- Update to 0.40.

* Thu Sep 15 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
- Update to 0.39.

* Fri Aug 19 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
- Update to 0.37.

* Sat Jun 18 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
- Update to 0.35.

* Fri Jun 10 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
- Update to 0.35.

* Fri Apr  1 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
- Update to 0.30.2.

* Fri Mar 25 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
- Update to 0.30.

* Wed Mar 16 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
- Update to 0.29.2.

* Sat Mar  5 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
- Update to 0.29.1.

* Wed Dec 29 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
- Merge smart and smart-gui src.rpm back together again.
  (all dependencies resolved for all supported platforms)

* Mon Dec 13 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
- Split out smart-gui and ksmarttray to manage build dependencies better.

* Wed Dec  8 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
- Update to 0.28.

* Sun Dec  5 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
- Update to 0.27.1

* Fri Dec  3 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
- Initial specfile from Guilherme Manika <guilherme at zorked.net>.
- Some reordering and cleanups.
- Remove binary rpmmodule.so lib.
- Split the gui into a separate package, so the non-gui packages have
  lower requirements.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smart/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Apr 2006 17:20:36 -0000	1.1
+++ .cvsignore	10 Apr 2006 17:22:47 -0000	1.2
@@ -0,0 +1 @@
+smart-0.41.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smart/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Apr 2006 17:20:36 -0000	1.1
+++ sources	10 Apr 2006 17:22:47 -0000	1.2
@@ -0,0 +1 @@
+1460dfbfe7f739ac718525c71f46b5fc  smart-0.41.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 10 17:31:33 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 10 Apr 2006 10:31:33 -0700
Subject: rpms/maxima/FC-5 .cvsignore, 1.4, 1.5 maxima.spec, 1.20,
	1.21 sources, 1.4, 1.5
Message-ID: <200604101731.k3AHVZ5d013071@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore maxima.spec sources 
Log Message:
* Wed Apr 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-1
- 5.9.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 Oct 2005 12:40:34 -0000	1.4
+++ .cvsignore	10 Apr 2006 17:31:33 -0000	1.5
@@ -1,3 +1,3 @@
-maxima-5.9.2.tar.gz
 maximabook-19-Sept-2004.pdf
 macref.pdf
+maxima-5.9.3.tar.gz


Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-5/maxima.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- maxima.spec	30 Mar 2006 19:53:18 -0000	1.20
+++ maxima.spec	10 Apr 2006 17:31:33 -0000	1.21
@@ -1,9 +1,9 @@
 
 Summary: Symbolic Computation Program
 Name: 	 maxima
-Version: 5.9.2
+Version: 5.9.3
 
-Release: 13%{?dist}
+Release: 1%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -18,13 +18,11 @@
 %define _with_default_lisp --with-default-lisp=clisp
 
 %ifarch %{ix86}
-# cmucl review (done): http://bugzilla.redhat.com/bugzilla/166796
 %define _enable_cmucl --enable-cmucl
 %endif
 
 %ifarch %{ix86} x86_64
 %define _enable_clisp --enable-clisp 
-# gcl *was* not available for fc5/devel: http://bugzilla.redhat.com/bugzilla/177026
 %define _enable_gcl --enable-gcl 
 %define _enable_sbcl --enable-sbcl 
 %endif
@@ -71,7 +69,6 @@
 BuildRequires: desktop-file-utils
 # /usr/bin/wish
 BuildRequires: tk
-BuildRequires: automake
 
 Requires: %{name}-runtime = %{version}
 Requires: gnuplot
@@ -147,7 +144,7 @@
 %package runtime-sbcl
 Summary: Maxima compiled with SBCL 
 Group:   Applications/Engineering
-BuildRequires: sbcl >= 0.9.11
+BuildRequires: sbcl 
 # maxima requires the *same* version it was built against
 # this hack should work, even in mock (-: -- Rex
 %global sbcl_ver %(sbcl --version 2>/dev/null | cut -d' ' -f2)
@@ -185,13 +182,10 @@
 # remove CVS crud
 find -name CVS -type d | xargs rm -r
 
-%if "%{?_enable_sbcl:1}" == "1"
-%patch3 -p1 -b .sbcl-disable-debugger
-# seems to be needed only if --enable-sbcl
-aclocal
-automake --add-missing --copy
-autoconf
-%endif
+#patch3 -p1 -b .sbcl-disable-debugger
+#aclocal
+#automake --add-missing --copy
+#autoconf
 
 
 %build
@@ -362,6 +356,9 @@
 
 
 %changelog
+* Wed Apr 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-1
+- 5.9.3
+
 * Thu Mar 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-13
 - respin for sbcl-0.9.11
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	18 Oct 2005 12:40:34 -0000	1.4
+++ sources	10 Apr 2006 17:31:33 -0000	1.5
@@ -1,3 +1,3 @@
-dff996cd5c2c0c871977a26e6fb001f3  maxima-5.9.2.tar.gz
 9faa5a513de43b5e7384216a8783f620  maximabook-19-Sept-2004.pdf
 c101a1ce604d31b02bbc2f37cced280d  macref.pdf
+e6388632d91722bb0607914bdabc72f6  maxima-5.9.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 17:32:12 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 10 Apr 2006 10:32:12 -0700
Subject: rpms/maxima/FC-4 .cvsignore, 1.4, 1.5 maxima.spec, 1.18,
	1.19 sources, 1.4, 1.5
Message-ID: <200604101732.k3AHWEPA013136@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore maxima.spec sources 
Log Message:
* Wed Apr 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-1
- 5.9.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 Oct 2005 12:40:33 -0000	1.4
+++ .cvsignore	10 Apr 2006 17:32:12 -0000	1.5
@@ -1,3 +1,3 @@
-maxima-5.9.2.tar.gz
 maximabook-19-Sept-2004.pdf
 macref.pdf
+maxima-5.9.3.tar.gz


Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-4/maxima.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- maxima.spec	30 Mar 2006 20:48:19 -0000	1.18
+++ maxima.spec	10 Apr 2006 17:32:12 -0000	1.19
@@ -1,9 +1,9 @@
 
 Summary: Symbolic Computation Program
 Name: 	 maxima
-Version: 5.9.2
+Version: 5.9.3
 
-Release: 13%{?dist}
+Release: 1%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -18,13 +18,11 @@
 %define _with_default_lisp --with-default-lisp=clisp
 
 %ifarch %{ix86}
-# cmucl review (done): http://bugzilla.redhat.com/bugzilla/166796
 %define _enable_cmucl --enable-cmucl
 %endif
 
 %ifarch %{ix86} x86_64
 %define _enable_clisp --enable-clisp 
-# gcl *was* not available for fc5/devel: http://bugzilla.redhat.com/bugzilla/177026
 %define _enable_gcl --enable-gcl 
 %define _enable_sbcl --enable-sbcl 
 %endif
@@ -71,7 +69,6 @@
 BuildRequires: desktop-file-utils
 # /usr/bin/wish
 BuildRequires: tk
-BuildRequires: automake
 
 Requires: %{name}-runtime = %{version}
 Requires: gnuplot
@@ -147,7 +144,7 @@
 %package runtime-sbcl
 Summary: Maxima compiled with SBCL 
 Group:   Applications/Engineering
-BuildRequires: sbcl >= 0.9.11
+BuildRequires: sbcl 
 # maxima requires the *same* version it was built against
 # this hack should work, even in mock (-: -- Rex
 %global sbcl_ver %(sbcl --version 2>/dev/null | cut -d' ' -f2)
@@ -185,13 +182,10 @@
 # remove CVS crud
 find -name CVS -type d | xargs rm -r
 
-%if "%{?_enable_sbcl:1}" == "1"
-%patch3 -p1 -b .sbcl-disable-debugger
-# seems to be needed only if --enable-sbcl
-aclocal
-automake --add-missing --copy
-autoconf
-%endif
+#patch3 -p1 -b .sbcl-disable-debugger
+#aclocal
+#automake --add-missing --copy
+#autoconf
 
 
 %build
@@ -362,6 +356,9 @@
 
 
 %changelog
+* Wed Apr 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-1
+- 5.9.3
+
 * Thu Mar 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-13
 - respin for sbcl-0.9.11
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	18 Oct 2005 12:40:33 -0000	1.4
+++ sources	10 Apr 2006 17:32:12 -0000	1.5
@@ -1,3 +1,3 @@
-dff996cd5c2c0c871977a26e6fb001f3  maxima-5.9.2.tar.gz
 9faa5a513de43b5e7384216a8783f620  maximabook-19-Sept-2004.pdf
 c101a1ce604d31b02bbc2f37cced280d  macref.pdf
+e6388632d91722bb0607914bdabc72f6  maxima-5.9.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 17:40:30 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Mon, 10 Apr 2006 10:40:30 -0700
Subject: rpms/link-grammar/devel .cvsignore, 1.2, 1.3 link-grammar.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200604101740.k3AHeWL5013243@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/link-grammar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13217

Modified Files:
	.cvsignore link-grammar.spec sources 
Log Message:
New upstream version




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Aug 2005 13:45:41 -0000	1.2
+++ .cvsignore	10 Apr 2006 17:40:30 -0000	1.3
@@ -1 +1 @@
-link-grammar-4.1.3.tar.gz
+link-grammar.spec


Index: link-grammar.spec
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/devel/link-grammar.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- link-grammar.spec	15 Feb 2006 09:41:06 -0000	1.2
+++ link-grammar.spec	10 Apr 2006 17:40:30 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: A Grammar Checking library
 Name: link-grammar
-Version: 4.1.3
-Release: 4%{?dist}
+Version: 4.2.1
+Release: 1%{?dist}
 Group: System Environment/Libraries
 License: BSD-style 
 Source: http://www.abisource.com/downloads/link-grammar/%{version}/link-grammar-%{version}.tar.gz
@@ -55,6 +55,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 4.2.1-1
+- New upstream version
+
 * Wed Feb 15 2006 Marc Maurer <uwog at abisource.com> 4.1.3-4
 - Rebuild for Fedora Extras 5
 - Use %%{?dist} in the release name


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Aug 2005 13:45:41 -0000	1.2
+++ sources	10 Apr 2006 17:40:30 -0000	1.3
@@ -1 +1 @@
-5edbeab4b9e3f61b343e68206708703e  link-grammar-4.1.3.tar.gz
+9c0e86d3e44091fc76256034154cfd58  link-grammar.spec



From fedora-extras-commits at redhat.com  Mon Apr 10 17:41:01 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Mon, 10 Apr 2006 10:41:01 -0700
Subject: rpms/docbook2X/devel .cvsignore, 1.2, 1.3 docbook2X.spec, 1.2,
	1.3 sources, 1.2, 1.3 docbook2X-vendor_perl.diff, 1.1, NONE
Message-ID: <200604101741.k3AHf3ZM013309@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	.cvsignore docbook2X.spec sources 
Removed Files:
	docbook2X-vendor_perl.diff 
Log Message:
* Fri Feb 17 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.8.6-1
- update to 0.8.6
- drop patch as SGMLSpl.pm is included in the scripts, not distributed
- BR perl-XML-SAX (close 188481)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/docbook2X/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Feb 2006 21:00:11 -0000	1.2
+++ .cvsignore	10 Apr 2006 17:41:01 -0000	1.3
@@ -1 +1 @@
-docbook2X-0.8.5.tar.gz
+docbook2X-0.8.6.tar.gz


Index: docbook2X.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook2X/devel/docbook2X.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- docbook2X.spec	17 Feb 2006 22:41:35 -0000	1.2
+++ docbook2X.spec	10 Apr 2006 17:41:01 -0000	1.3
@@ -1,18 +1,19 @@
 Name:           docbook2X
-Version:        0.8.5
-Release:        2%{?dist}
+Version:        0.8.6
+Release:        1%{?dist}
 Summary:        Convert docbook into man and Texinfo
 
 Group:          Applications/Text
 License:        BSD
 URL:            http://docbook2x.sourceforge.net/
-Source0:        http://heanet.dl.sourceforge.net/sourceforge/docbook2x/docbook2X-%{version}.tar.gz
+Source0:        http://dl.sourceforge.net/sourceforge/docbook2x/docbook2X-%{version}.tar.gz
 
 # modify Makefile.in to replace make install_perl by make install_vendor
-Patch0:         docbook2X-vendor_perl.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxslt openjade
+# required by the perl -c calls during build
+BuildRequires:  perl-XML-SAX
 # rpmlint isn't happy with libxslt, but we need xsltproc
 Requires:       libxslt openjade texinfo
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -26,7 +27,6 @@
 
 %prep
 %setup -q
-%patch
 
 %build
 # to avoid clashing with docbook2* from docbook-utils
@@ -71,10 +71,14 @@
 %{_datadir}/docbook2X/
 %{_mandir}/man1/*
 %{_infodir}/docbook2*
-%{perl_vendorlib}/*
 
 
 %changelog
+* Fri Feb 17 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.8.6-1
+- update to 0.8.6
+- drop patch as SGMLSpl.pm is included in the scripts, not distributed
+- BR perl-XML-SAX (close 188481)
+
 * Fri Feb 17 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.8.5-2
 - rebuild for fc5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/docbook2X/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Feb 2006 21:00:11 -0000	1.2
+++ sources	10 Apr 2006 17:41:01 -0000	1.3
@@ -1 +1 @@
-05d549646ac11caba6c7f1e07ced33e3  docbook2X-0.8.5.tar.gz
+fd5efad56674cfb22ea4831845c3c937  docbook2X-0.8.6.tar.gz


--- docbook2X-vendor_perl.diff DELETED ---



From fedora-extras-commits at redhat.com  Mon Apr 10 17:44:12 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Mon, 10 Apr 2006 10:44:12 -0700
Subject: rpms/fedora-package-config-smart - New directory
Message-ID: <200604101744.k3AHiEfG013427@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fedora-package-config-smart
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13406/fedora-package-config-smart

Log Message:
Directory /cvs/extras/rpms/fedora-package-config-smart added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 10 17:44:12 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Mon, 10 Apr 2006 10:44:12 -0700
Subject: rpms/fedora-package-config-smart/devel - New directory
Message-ID: <200604101744.k3AHiEJE013430@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-serv13406/fedora-package-config-smart/devel

Log Message:
Directory /cvs/extras/rpms/fedora-package-config-smart/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 10 17:44:44 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Mon, 10 Apr 2006 10:44:44 -0700
Subject: rpms/fedora-package-config-smart/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200604101744.k3AHikoZ013494@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-serv13458/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module fedora-package-config-smart


--- 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 Apr 10 17:44:43 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Mon, 10 Apr 2006 10:44:43 -0700
Subject: rpms/fedora-package-config-smart Makefile, NONE, 1.1 import.log,
	NONE, 1.1
Message-ID: <200604101744.k3AHijcn013491@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fedora-package-config-smart
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13458

Added Files:
	Makefile import.log 
Log Message:
Setup of module fedora-package-config-smart


--- NEW FILE Makefile ---
# Top level Makefile for module fedora-package-config-smart
all : CVS/Root common-update
	@cvs update

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

common : CVS/Root
	@cvs 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 Apr 10 17:45:22 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Mon, 10 Apr 2006 10:45:22 -0700
Subject: rpms/fedora-package-config-smart import.log,1.1,1.2
Message-ID: <200604101745.k3AHjO6q013557@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fedora-package-config-smart
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13524

Modified Files:
	import.log 
Log Message:
auto-import fedora-package-config-smart-5-4 on branch devel from fedora-package-config-smart-5-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-smart/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Apr 2006 17:44:43 -0000	1.1
+++ import.log	10 Apr 2006 17:45:22 -0000	1.2
@@ -0,0 +1 @@
+fedora-package-config-smart-5-4:HEAD:fedora-package-config-smart-5-4.src.rpm:1144691111



From fedora-extras-commits at redhat.com  Mon Apr 10 17:45:23 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Mon, 10 Apr 2006 10:45:23 -0700
Subject: rpms/fedora-package-config-smart/devel
	fedora-package-config-smart.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604101745.k3AHjPgR013562@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-serv13524/devel

Modified Files:
	.cvsignore sources 
Added Files:
	fedora-package-config-smart.spec 
Log Message:
auto-import fedora-package-config-smart-5-4 on branch devel from fedora-package-config-smart-5-4.src.rpm


--- NEW FILE fedora-package-config-smart.spec ---
Summary: Configuration files for the smart package manager
Name: fedora-package-config-smart
Version: 5
Release: 4
License: GPL
Group: System Environment/Base
URL: http://fedora.redhat.com/
Source0: %{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot

%description
This package contains configuration files for smart.

%prep
%setup -q
# place the proper arch in the folders
for filein in *.channel.in; do
  file=`echo $filein | sed -e's,\.in$,,'`
  sed -e's, at ARCH@,%{_target_cpu},g' < $filein > $file
done

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_sysconfdir}/smart/channels
install -p -m 0644 *.channel %{buildroot}%{_sysconfdir}/smart/channels

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%dir %{_sysconfdir}/smart
%dir %{_sysconfdir}/smart/channels
%config(noreplace) %{_sysconfdir}/smart/channels/*.channel

%changelog
* Sat Apr  1 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 5-4
- Update to Fedora Core 5.

* Tue Dec 13 2005 Axel Thimm <Axel.Thimm at ATrpms.net> - 4-3
- changed name to fedora-package-config-smart
- Modify to only include what fedora-release includes for yum.

* Thu Jul 14 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
- Merge srpms of atrpms-package-config and medley-package-config.

* Sat Jun 18 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
- Add el3/el4/fc4 repos.

* Fri Dec 17 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
- Add smart support.

* Tue Nov 16 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
- Split yum config files for yum 2.0.x and yum >= 2.1.x.

* Tue Nov  9 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
- Add fc3 support.

* Tue Sep 28 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
- Add fedoralegacy repo for FC1.
- Prapare commented entries for fedoralegacy repo for FC2.

* Fri Sep  3 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
- Rename apt.physik.fu-berlin.de to apt.atrpms.net

* Tue Aug 17 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
- Change main dries repo to lower load on studentenweb.org.

* Thu Jul 29 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
- Fork ATrpms-only package, former atrpms-package-config
  package has been renamed to medley-package.config.

* Sat Jul 24 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
- Fix nr entries for production.
- Add freshrpms' x86_64 entries.

* Fri May 28 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
- Add RPM::Order "true" to apt.conf.

* Mon May 24 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
- Added back Gstreamer, now we know where it went to.
- New fc2 list officially published.

* Thu May  6 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
- Add fedoralegacy repos where appropriate.

* Fri Apr  2 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
- Remove nonfree sections of BIOrpms, as these were accidentially activated.

* Mon Mar 15 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
- Change in Matt's repo structure.

* Thu Mar 11 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
- Interrepo problems with Dag's obsoletes.

* Fri Mar  5 2004 Axel Thimm <Axel.Thimm at physik.fu-berlin.de>
- Split off package from atrpms package (check there for prior logs).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-smart/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Apr 2006 17:44:44 -0000	1.1
+++ .cvsignore	10 Apr 2006 17:45:23 -0000	1.2
@@ -0,0 +1 @@
+fedora-package-config-smart-5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-smart/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Apr 2006 17:44:44 -0000	1.1
+++ sources	10 Apr 2006 17:45:23 -0000	1.2
@@ -0,0 +1 @@
+5992a399b473b042ab25e2f39cbb4992  fedora-package-config-smart-5.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 10 17:46:26 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Mon, 10 Apr 2006 10:46:26 -0700
Subject: rpms/link-grammar/devel .cvsignore, 1.3, 1.4 link-grammar.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200604101746.k3AHkSrQ013619@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/link-grammar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13598

Modified Files:
	.cvsignore link-grammar.spec sources 
Log Message:
rebuild with proper source




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Apr 2006 17:40:30 -0000	1.3
+++ .cvsignore	10 Apr 2006 17:46:26 -0000	1.4
@@ -1 +1 @@
-link-grammar.spec
+link-grammar-4.2.1.tar.gz


Index: link-grammar.spec
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/devel/link-grammar.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- link-grammar.spec	10 Apr 2006 17:40:30 -0000	1.3
+++ link-grammar.spec	10 Apr 2006 17:46:26 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: A Grammar Checking library
 Name: link-grammar
 Version: 4.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Libraries
 License: BSD-style 
 Source: http://www.abisource.com/downloads/link-grammar/%{version}/link-grammar-%{version}.tar.gz
@@ -55,6 +55,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 4.2.1-2
+- Rebuild
+
 * Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 4.2.1-1
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Apr 2006 17:40:30 -0000	1.3
+++ sources	10 Apr 2006 17:46:26 -0000	1.4
@@ -1 +1 @@
-9c0e86d3e44091fc76256034154cfd58  link-grammar.spec
+c4de497b11a2eeaa93ac19f08c710f23  link-grammar-4.2.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 17:48:19 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Mon, 10 Apr 2006 10:48:19 -0700
Subject: rpms/link-grammar/FC-5 .cvsignore, 1.2, 1.3 link-grammar.spec, 1.2, 
	1.3 sources, 1.2, 1.3
Message-ID: <200604101748.k3AHmL1g013698@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/link-grammar/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13677

Modified Files:
	.cvsignore link-grammar.spec sources 
Log Message:
New upstream version




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Aug 2005 13:45:41 -0000	1.2
+++ .cvsignore	10 Apr 2006 17:48:19 -0000	1.3
@@ -1 +1 @@
-link-grammar-4.1.3.tar.gz
+link-grammar-4.2.1.tar.gz


Index: link-grammar.spec
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/FC-5/link-grammar.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- link-grammar.spec	15 Feb 2006 09:41:06 -0000	1.2
+++ link-grammar.spec	10 Apr 2006 17:48:19 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: A Grammar Checking library
 Name: link-grammar
-Version: 4.1.3
-Release: 4%{?dist}
+Version: 4.2.1
+Release: 1%{?dist}
 Group: System Environment/Libraries
 License: BSD-style 
 Source: http://www.abisource.com/downloads/link-grammar/%{version}/link-grammar-%{version}.tar.gz
@@ -55,6 +55,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 4.2.1-1
+- New upstream version
+
 * Wed Feb 15 2006 Marc Maurer <uwog at abisource.com> 4.1.3-4
 - Rebuild for Fedora Extras 5
 - Use %%{?dist} in the release name


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Aug 2005 13:45:41 -0000	1.2
+++ sources	10 Apr 2006 17:48:19 -0000	1.3
@@ -1 +1 @@
-5edbeab4b9e3f61b343e68206708703e  link-grammar-4.1.3.tar.gz
+c4de497b11a2eeaa93ac19f08c710f23  link-grammar-4.2.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 17:50:26 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Mon, 10 Apr 2006 10:50:26 -0700
Subject: rpms/link-grammar/FC-4 .cvsignore, 1.2, 1.3 link-grammar.spec, 1.5, 
	1.6 sources, 1.2, 1.3
Message-ID: <200604101750.k3AHoSiw013766@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/link-grammar/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13745

Modified Files:
	.cvsignore link-grammar.spec sources 
Log Message:
New upstream version




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Aug 2005 13:45:41 -0000	1.2
+++ .cvsignore	10 Apr 2006 17:50:26 -0000	1.3
@@ -1 +1 @@
-link-grammar-4.1.3.tar.gz
+link-grammar-4.2.1.tar.gz


Index: link-grammar.spec
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/FC-4/link-grammar.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- link-grammar.spec	2 Oct 2005 18:12:05 -0000	1.5
+++ link-grammar.spec	10 Apr 2006 17:50:26 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: A Grammar Checking library
 Name: link-grammar
-Version: 4.1.3
-Release: 4%{?dist}
+Version: 4.2.1
+Release: 1%{?dist}
 Group: System Environment/Libraries
 License: BSD-style 
 Source: http://www.abisource.com/downloads/link-grammar/%{version}/link-grammar-%{version}.tar.gz
@@ -55,6 +55,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 4.2.1-1.fc4
+- New upstream version
+
 * Sun Oct 2 2005 Marc Maurer <uwog at abisource.com> - 4.1.3-4.fc4
 - Add slashes to directory paths (cosmetic update)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Aug 2005 13:45:41 -0000	1.2
+++ sources	10 Apr 2006 17:50:26 -0000	1.3
@@ -1 +1 @@
-5edbeab4b9e3f61b343e68206708703e  link-grammar-4.1.3.tar.gz
+c4de497b11a2eeaa93ac19f08c710f23  link-grammar-4.2.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 17:58:09 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Mon, 10 Apr 2006 10:58:09 -0700
Subject: rpms/link-grammar/FC-3 .cvsignore, 1.2, 1.3 link-grammar.spec, 1.2, 
	1.3 sources, 1.2, 1.3
Message-ID: <200604101758.k3AHwBwO013835@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/link-grammar/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13814

Modified Files:
	.cvsignore link-grammar.spec sources 
Log Message:
New upstream version




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Aug 2005 13:45:41 -0000	1.2
+++ .cvsignore	10 Apr 2006 17:58:09 -0000	1.3
@@ -1 +1 @@
-link-grammar-4.1.3.tar.gz
+link-grammar-4.2.1.tar.gz


Index: link-grammar.spec
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/FC-3/link-grammar.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- link-grammar.spec	2 Oct 2005 18:06:52 -0000	1.2
+++ link-grammar.spec	10 Apr 2006 17:58:09 -0000	1.3
@@ -1,6 +1,6 @@
 Summary: A Grammar Checking library
 Name: link-grammar
-Version: 4.1.3
+Version: 4.2.1
 Release: 1%{?dist}
 Group: System Environment/Libraries
 License: BSD-style 
@@ -55,5 +55,8 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 4.2.1-1.fc3
+- New upstream version
+
 * Sun Oct 2 2005 Marc Maurer <uwog at abisource.com> - 4.1.3-1.fc3
 - Initial release for FC3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Aug 2005 13:45:41 -0000	1.2
+++ sources	10 Apr 2006 17:58:09 -0000	1.3
@@ -1 +1 @@
-5edbeab4b9e3f61b343e68206708703e  link-grammar-4.1.3.tar.gz
+c4de497b11a2eeaa93ac19f08c710f23  link-grammar-4.2.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 18:04:39 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Mon, 10 Apr 2006 11:04:39 -0700
Subject: rpms/docbook2X/FC-4 .cvsignore, 1.2, 1.3 docbook2X.spec, 1.2,
	1.3 sources, 1.2, 1.3 docbook2X-vendor_perl.diff, 1.1, NONE
Message-ID: <200604101804.k3AI4frZ015983@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	.cvsignore docbook2X.spec sources 
Removed Files:
	docbook2X-vendor_perl.diff 
Log Message:
* Fri Feb 17 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.8.6-1
- update to 0.8.6
- drop patch as SGMLSpl.pm is included in the scripts, not distributed
- BR perl-XML-SAX (close 188481)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/docbook2X/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Feb 2006 21:00:11 -0000	1.2
+++ .cvsignore	10 Apr 2006 18:04:39 -0000	1.3
@@ -1 +1 @@
-docbook2X-0.8.5.tar.gz
+docbook2X-0.8.6.tar.gz


Index: docbook2X.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook2X/FC-4/docbook2X.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- docbook2X.spec	12 Feb 2006 08:52:30 -0000	1.2
+++ docbook2X.spec	10 Apr 2006 18:04:39 -0000	1.3
@@ -1,18 +1,19 @@
 Name:           docbook2X
-Version:        0.8.5
-Release:        1%{?dist}.1
+Version:        0.8.6
+Release:        1%{?dist}
 Summary:        Convert docbook into man and Texinfo
 
 Group:          Applications/Text
 License:        BSD
 URL:            http://docbook2x.sourceforge.net/
-Source0:        http://heanet.dl.sourceforge.net/sourceforge/docbook2x/docbook2X-%{version}.tar.gz
+Source0:        http://dl.sourceforge.net/sourceforge/docbook2x/docbook2X-%{version}.tar.gz
 
 # modify Makefile.in to replace make install_perl by make install_vendor
-Patch0:         docbook2X-vendor_perl.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxslt openjade
+# required by the perl -c calls during build
+BuildRequires:  perl-XML-SAX
 # rpmlint isn't happy with libxslt, but we need xsltproc
 Requires:       libxslt openjade texinfo
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -26,7 +27,6 @@
 
 %prep
 %setup -q
-%patch
 
 %build
 # to avoid clashing with docbook2* from docbook-utils
@@ -71,9 +71,13 @@
 %{_datadir}/docbook2X/
 %{_mandir}/man1/*
 %{_infodir}/docbook2*
-%{perl_vendorlib}/*
 
 
 %changelog
-* Fri Feb  3 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.8.5-1.1
+* Fri Feb 17 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.8.6-1
+- update to 0.8.6
+- drop patch as SGMLSpl.pm is included in the scripts, not distributed
+- BR perl-XML-SAX (close 188481)
+
+* Fri Feb  3 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.8.5-1
 - FE submission


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/docbook2X/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Feb 2006 21:00:11 -0000	1.2
+++ sources	10 Apr 2006 18:04:39 -0000	1.3
@@ -1 +1 @@
-05d549646ac11caba6c7f1e07ced33e3  docbook2X-0.8.5.tar.gz
+fd5efad56674cfb22ea4831845c3c937  docbook2X-0.8.6.tar.gz


--- docbook2X-vendor_perl.diff DELETED ---



From fedora-extras-commits at redhat.com  Mon Apr 10 18:04:40 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Mon, 10 Apr 2006 11:04:40 -0700
Subject: rpms/docbook2X/FC-5 .cvsignore, 1.2, 1.3 docbook2X.spec, 1.2,
	1.3 sources, 1.2, 1.3 docbook2X-vendor_perl.diff, 1.1, NONE
Message-ID: <200604101804.k3AI4gR2015989@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	.cvsignore docbook2X.spec sources 
Removed Files:
	docbook2X-vendor_perl.diff 
Log Message:
* Fri Feb 17 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.8.6-1
- update to 0.8.6
- drop patch as SGMLSpl.pm is included in the scripts, not distributed
- BR perl-XML-SAX (close 188481)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/docbook2X/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Feb 2006 21:00:11 -0000	1.2
+++ .cvsignore	10 Apr 2006 18:04:40 -0000	1.3
@@ -1 +1 @@
-docbook2X-0.8.5.tar.gz
+docbook2X-0.8.6.tar.gz


Index: docbook2X.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook2X/FC-5/docbook2X.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- docbook2X.spec	17 Feb 2006 22:41:35 -0000	1.2
+++ docbook2X.spec	10 Apr 2006 18:04:40 -0000	1.3
@@ -1,18 +1,19 @@
 Name:           docbook2X
-Version:        0.8.5
-Release:        2%{?dist}
+Version:        0.8.6
+Release:        1%{?dist}
 Summary:        Convert docbook into man and Texinfo
 
 Group:          Applications/Text
 License:        BSD
 URL:            http://docbook2x.sourceforge.net/
-Source0:        http://heanet.dl.sourceforge.net/sourceforge/docbook2x/docbook2X-%{version}.tar.gz
+Source0:        http://dl.sourceforge.net/sourceforge/docbook2x/docbook2X-%{version}.tar.gz
 
 # modify Makefile.in to replace make install_perl by make install_vendor
-Patch0:         docbook2X-vendor_perl.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxslt openjade
+# required by the perl -c calls during build
+BuildRequires:  perl-XML-SAX
 # rpmlint isn't happy with libxslt, but we need xsltproc
 Requires:       libxslt openjade texinfo
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -26,7 +27,6 @@
 
 %prep
 %setup -q
-%patch
 
 %build
 # to avoid clashing with docbook2* from docbook-utils
@@ -71,12 +71,13 @@
 %{_datadir}/docbook2X/
 %{_mandir}/man1/*
 %{_infodir}/docbook2*
-%{perl_vendorlib}/*
 
 
 %changelog
-* Fri Feb 17 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.8.5-2
-- rebuild for fc5
+* Fri Feb 17 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.8.6-1
+- update to 0.8.6
+- drop patch as SGMLSpl.pm is included in the scripts, not distributed
+- BR perl-XML-SAX (close 188481)
 
 * Fri Feb  3 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.8.5-1
 - FE submission


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/docbook2X/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Feb 2006 21:00:11 -0000	1.2
+++ sources	10 Apr 2006 18:04:40 -0000	1.3
@@ -1 +1 @@
-05d549646ac11caba6c7f1e07ced33e3  docbook2X-0.8.5.tar.gz
+fd5efad56674cfb22ea4831845c3c937  docbook2X-0.8.6.tar.gz


--- docbook2X-vendor_perl.diff DELETED ---



From fedora-extras-commits at redhat.com  Mon Apr 10 18:04:38 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Mon, 10 Apr 2006 11:04:38 -0700
Subject: rpms/docbook2X/FC-3 .cvsignore, 1.2, 1.3 docbook2X.spec, 1.2,
	1.3 sources, 1.2, 1.3 docbook2X-vendor_perl.diff, 1.1, NONE
Message-ID: <200604101804.k3AI4eHU015979@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/docbook2X/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15926/FC-3

Modified Files:
	.cvsignore docbook2X.spec sources 
Removed Files:
	docbook2X-vendor_perl.diff 
Log Message:
* Fri Feb 17 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.8.6-1
- update to 0.8.6
- drop patch as SGMLSpl.pm is included in the scripts, not distributed
- BR perl-XML-SAX (close 188481)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/docbook2X/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Feb 2006 21:00:11 -0000	1.2
+++ .cvsignore	10 Apr 2006 18:04:38 -0000	1.3
@@ -1 +1 @@
-docbook2X-0.8.5.tar.gz
+docbook2X-0.8.6.tar.gz


Index: docbook2X.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook2X/FC-3/docbook2X.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- docbook2X.spec	17 Feb 2006 22:41:35 -0000	1.2
+++ docbook2X.spec	10 Apr 2006 18:04:38 -0000	1.3
@@ -1,18 +1,19 @@
 Name:           docbook2X
-Version:        0.8.5
-Release:        2%{?dist}
+Version:        0.8.6
+Release:        1%{?dist}
 Summary:        Convert docbook into man and Texinfo
 
 Group:          Applications/Text
 License:        BSD
 URL:            http://docbook2x.sourceforge.net/
-Source0:        http://heanet.dl.sourceforge.net/sourceforge/docbook2x/docbook2X-%{version}.tar.gz
+Source0:        http://dl.sourceforge.net/sourceforge/docbook2x/docbook2X-%{version}.tar.gz
 
 # modify Makefile.in to replace make install_perl by make install_vendor
-Patch0:         docbook2X-vendor_perl.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxslt openjade
+# required by the perl -c calls during build
+BuildRequires:  perl-XML-SAX
 # rpmlint isn't happy with libxslt, but we need xsltproc
 Requires:       libxslt openjade texinfo
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -26,7 +27,6 @@
 
 %prep
 %setup -q
-%patch
 
 %build
 # to avoid clashing with docbook2* from docbook-utils
@@ -71,12 +71,13 @@
 %{_datadir}/docbook2X/
 %{_mandir}/man1/*
 %{_infodir}/docbook2*
-%{perl_vendorlib}/*
 
 
 %changelog
-* Fri Feb 17 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.8.5-2
-- rebuild for fc5
+* Fri Feb 17 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.8.6-1
+- update to 0.8.6
+- drop patch as SGMLSpl.pm is included in the scripts, not distributed
+- BR perl-XML-SAX (close 188481)
 
 * Fri Feb  3 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.8.5-1
 - FE submission


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/docbook2X/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Feb 2006 21:00:11 -0000	1.2
+++ sources	10 Apr 2006 18:04:38 -0000	1.3
@@ -1 +1 @@
-05d549646ac11caba6c7f1e07ced33e3  docbook2X-0.8.5.tar.gz
+fd5efad56674cfb22ea4831845c3c937  docbook2X-0.8.6.tar.gz


--- docbook2X-vendor_perl.diff DELETED ---



From fedora-extras-commits at redhat.com  Mon Apr 10 18:09:28 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 11:09:28 -0700
Subject: rpms/perl-Test-Tester/devel - New directory
Message-ID: <200604101809.k3AI9UXn016214@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-Tester/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16190/perl-Test-Tester/devel

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




From fedora-extras-commits at redhat.com  Mon Apr 10 18:09:27 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 11:09:27 -0700
Subject: rpms/perl-Test-Tester - New directory
Message-ID: <200604101809.k3AI9TvF016211@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-Tester
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16190/perl-Test-Tester

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




From fedora-extras-commits at redhat.com  Mon Apr 10 18:09:44 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 11:09:44 -0700
Subject: rpms/perl-Test-Tester Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604101809.k3AI9kPL016268@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-Tester
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16235

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


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Test-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  Mon Apr 10 18:09:44 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 11:09:44 -0700
Subject: rpms/perl-Test-Tester/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604101809.k3AI9kLo016271@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-Tester/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16235/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Test-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  Mon Apr 10 18:10:06 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 11:10:06 -0700
Subject: rpms/perl-Test-Tester import.log,1.1,1.2
Message-ID: <200604101810.k3AIA8rk016337@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-Tester
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16304a

Modified Files:
	import.log 
Log Message:
auto-import perl-Test-Tester-0.103-1 on branch devel from perl-Test-Tester-0.103-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Tester/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Apr 2006 18:09:44 -0000	1.1
+++ import.log	10 Apr 2006 18:10:06 -0000	1.2
@@ -0,0 +1 @@
+perl-Test-Tester-0_103-1:HEAD:perl-Test-Tester-0.103-1.src.rpm:1144692600



From fedora-extras-commits at redhat.com  Mon Apr 10 18:10:07 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 11:10:07 -0700
Subject: rpms/perl-Test-Tester/devel perl-Test-Tester.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604101810.k3AIA9em016344@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-Tester/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16304a/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Test-Tester.spec 
Log Message:
auto-import perl-Test-Tester-0.103-1 on branch devel from perl-Test-Tester-0.103-1.src.rpm


--- NEW FILE perl-Test-Tester.spec ---
Name:           perl-Test-Tester
Version:        0.103
Release:        1%{?dist}
Summary:        Ease testing test modules built with Test::Builder
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Test-Tester/
Source0:        http://www.cpan.org/authors/id/F/FD/FDALY/Test-Tester-%{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
If you have written a test module based on Test::Builder then Test::Tester
allows you to test it with the minimum of effort.

%prep
%setup -q -n Test-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+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc ARTISTIC CHANGES README TODO
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Apr 08 2006 Steven Pritchard <steve at kspei.com> 0.103-1
- Specfile autogenerated by cpanspec 1.64.
- Fix License.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Tester/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Apr 2006 18:09:44 -0000	1.1
+++ .cvsignore	10 Apr 2006 18:10:07 -0000	1.2
@@ -0,0 +1 @@
+Test-Tester-0.103.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Tester/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Apr 2006 18:09:44 -0000	1.1
+++ sources	10 Apr 2006 18:10:07 -0000	1.2
@@ -0,0 +1 @@
+31d58158d2a6cdb7ad9d9fe3e0aed86e  Test-Tester-0.103.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 18:14:32 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 11:14:32 -0700
Subject: rpms/perl-Test-NoWarnings - New directory
Message-ID: <200604101814.k3AIEYir016461@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-NoWarnings
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16435/perl-Test-NoWarnings

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




From fedora-extras-commits at redhat.com  Mon Apr 10 18:14:33 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 11:14:33 -0700
Subject: rpms/perl-Test-NoWarnings/devel - New directory
Message-ID: <200604101814.k3AIEZoq016464@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-NoWarnings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16435/perl-Test-NoWarnings/devel

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




From fedora-extras-commits at redhat.com  Mon Apr 10 18:14:46 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 11:14:46 -0700
Subject: rpms/perl-Test-NoWarnings Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604101814.k3AIEmBZ016514@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-NoWarnings
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16481

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


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

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

common : CVS/Root
	@cvs 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 Apr 10 18:14:46 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 11:14:46 -0700
Subject: rpms/perl-Test-NoWarnings/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604101814.k3AIEmtC016517@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-NoWarnings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16481/devel

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


--- 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 Apr 10 18:15:12 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 11:15:12 -0700
Subject: rpms/perl-Test-NoWarnings import.log,1.1,1.2
Message-ID: <200604101815.k3AIFiYq016583@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-NoWarnings
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16549

Modified Files:
	import.log 
Log Message:
auto-import perl-Test-NoWarnings-0.082-1 on branch devel from perl-Test-NoWarnings-0.082-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-NoWarnings/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Apr 2006 18:14:46 -0000	1.1
+++ import.log	10 Apr 2006 18:15:12 -0000	1.2
@@ -0,0 +1 @@
+perl-Test-NoWarnings-0_082-1:HEAD:perl-Test-NoWarnings-0.082-1.src.rpm:1144692901



From fedora-extras-commits at redhat.com  Mon Apr 10 18:15:13 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 11:15:13 -0700
Subject: rpms/perl-Test-NoWarnings/devel perl-Test-NoWarnings.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604101815.k3AIFjMt016587@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-NoWarnings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16549/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Test-NoWarnings.spec 
Log Message:
auto-import perl-Test-NoWarnings-0.082-1 on branch devel from perl-Test-NoWarnings-0.082-1.src.rpm


--- NEW FILE perl-Test-NoWarnings.spec ---
Name:           perl-Test-NoWarnings
Version:        0.082
Release:        1%{?dist}
Summary:        Make sure you didn't emit any warnings while testing
License:        LGPL
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Test-NoWarnings/
Source0:        http://www.cpan.org/authors/id/F/FD/FDALY/Test-NoWarnings-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Test::Tester) >= 0.103
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
In general, your tests shouldn't produce warnings. This modules causes any
warnings to be captured and stored. It automatically adds an extra test
that will run when your script ends to check that there were no warnings.
If there were any warings, the test will give a "not ok" and diagnostics of
where, when and what the warning was, including a stack trace of what was
going on when the it occurred.

%prep
%setup -q -n Test-NoWarnings-%{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+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES LGPL README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Apr 08 2006 Steven Pritchard <steve at kspei.com> 0.082-1
- Specfile autogenerated by cpanspec 1.64.
- Fix License.
- Drop explicit dependency on perl(Test::Tester).  (Seems to be bogus.)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-NoWarnings/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Apr 2006 18:14:46 -0000	1.1
+++ .cvsignore	10 Apr 2006 18:15:13 -0000	1.2
@@ -0,0 +1 @@
+Test-NoWarnings-0.082.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-NoWarnings/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Apr 2006 18:14:46 -0000	1.1
+++ sources	10 Apr 2006 18:15:13 -0000	1.2
@@ -0,0 +1 @@
+702143eab77ffc335a08beccac47dca4  Test-NoWarnings-0.082.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 18:19:14 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 10 Apr 2006 11:19:14 -0700
Subject: rpms/denyhosts/devel denyhosts-2.4-setup.patch, NONE, 1.1 .cvsignore,
	1.18, 1.19 denyhosts.spec, 1.35, 1.36 sources, 1.18,
	1.19 denyhosts-2.3-setup.patch, 1.1, NONE
Message-ID: <200604101819.k3AIJGY8016669@cvs-int.fedora.redhat.com>

Author: tibbs

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

Modified Files:
	.cvsignore denyhosts.spec sources 
Added Files:
	denyhosts-2.4-setup.patch 
Removed Files:
	denyhosts-2.3-setup.patch 
Log Message:
* Mon Apr 10 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.4b-1
- Update to 2.4b.


denyhosts-2.4-setup.patch:

--- NEW FILE denyhosts-2.4-setup.patch ---
--- setup.py.setup	2006-04-04 18:53:02.000000000 -0500
+++ setup.py	2006-04-10 13:15:09.712246771 -0500
@@ -23,14 +23,10 @@
       scripts=['denyhosts.py'],
       package_dir={'DenyHosts': 'DenyHosts'},
       packages=["DenyHosts"],
-      data_files=[(libpath, glob("denyhosts.cfg-dist")),
-                  (libpath, glob("setup.py")),
-                  (libpath, glob("daemon-control-dist")),
-                  (libpath, glob("CHANGELOG.txt")),
-                  (libpath, glob("README.txt")),
+      data_files=[
                   (scriptspath, glob("scripts/*")),
                   (pluginspath, glob("plugins/*")),
-                  (libpath, glob("LICENSE.txt"))],
+                  ],
       license="GPL v2",
       ##extra_path='denyhosts',
       long_description="""


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	5 Apr 2006 04:32:50 -0000	1.18
+++ .cvsignore	10 Apr 2006 18:19:13 -0000	1.19
@@ -1 +1 @@
-DenyHosts-2.3.tar.gz
+DenyHosts-2.4b.tar.gz


Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- denyhosts.spec	6 Apr 2006 15:28:41 -0000	1.35
+++ denyhosts.spec	10 Apr 2006 18:19:13 -0000	1.36
@@ -1,6 +1,6 @@
 Name:           denyhosts
-Version:        2.3
-Release:	2%{?dist}
+Version:        2.4b
+Release:	1%{?dist}
 Summary:        A script to help thwart ssh server attacks
 
 Group:          Applications/System
@@ -14,7 +14,7 @@
 Source5:	denyhosts.logrotate
 Source6:	README.fedora
 Patch0:		denyhosts-2.3-config.patch
-Patch1:		denyhosts-2.3-setup.patch
+Patch1:		denyhosts-2.4-setup.patch
 Patch2:		denyhosts-2.2-daemon-control.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
@@ -150,6 +150,9 @@
 
 
 %changelog
+* Mon Apr 10 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.4b-1
+- Update to 2.4b.
+
 * Thu Apr  6 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.3-2
 - Fix uncommented MacOS X SECURE_LOG config setting.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	5 Apr 2006 04:32:50 -0000	1.18
+++ sources	10 Apr 2006 18:19:13 -0000	1.19
@@ -1 +1 @@
-a175dec03a67aff65c5471105d5a2786  DenyHosts-2.3.tar.gz
+c60df73b29baeadffbbb1ef8f130dd8d  DenyHosts-2.4b.tar.gz


--- denyhosts-2.3-setup.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Apr 10 18:22:23 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 11:22:23 -0700
Subject: rpms/perl-Test-Deep/devel - New directory
Message-ID: <200604101822.k3AIMQRg016787@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-Deep/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16763/perl-Test-Deep/devel

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




From fedora-extras-commits at redhat.com  Mon Apr 10 18:22:23 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 11:22:23 -0700
Subject: rpms/perl-Test-Deep - New directory
Message-ID: <200604101822.k3AIMPSk016784@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-Deep
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16763/perl-Test-Deep

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




From fedora-extras-commits at redhat.com  Mon Apr 10 18:22:39 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 11:22:39 -0700
Subject: rpms/perl-Test-Deep Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604101822.k3AIMflP016836@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-Deep
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16808

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


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

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

common : CVS/Root
	@cvs 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 Apr 10 18:22:39 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 11:22:39 -0700
Subject: rpms/perl-Test-Deep/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604101822.k3AIMfPo016839@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-Deep/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16808/devel

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


--- 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 Apr 10 18:23:07 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 11:23:07 -0700
Subject: rpms/perl-Test-Deep import.log,1.1,1.2
Message-ID: <200604101823.k3AIN9mZ016905@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-Deep
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16872

Modified Files:
	import.log 
Log Message:
auto-import perl-Test-Deep-0.093-1 on branch devel from perl-Test-Deep-0.093-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Deep/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Apr 2006 18:22:39 -0000	1.1
+++ import.log	10 Apr 2006 18:23:06 -0000	1.2
@@ -0,0 +1 @@
+perl-Test-Deep-0_093-1:HEAD:perl-Test-Deep-0.093-1.src.rpm:1144693379



From fedora-extras-commits at redhat.com  Mon Apr 10 18:23:07 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 11:23:07 -0700
Subject: rpms/perl-Test-Deep/devel perl-Test-Deep.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604101823.k3AIN9AM016910@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-Deep/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16872/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Test-Deep.spec 
Log Message:
auto-import perl-Test-Deep-0.093-1 on branch devel from perl-Test-Deep-0.093-1.src.rpm


--- NEW FILE perl-Test-Deep.spec ---
Name:           perl-Test-Deep
Version:        0.093
Release:        1%{?dist}
Summary:        Extremely flexible deep comparison
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Test-Deep/
Source0:        http://www.cpan.org/authors/id/F/FD/FDALY/Test-Deep-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Test::NoWarnings) >= 0.02
BuildRequires:  perl(Test::Tester) >= 0.04
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Test::Deep gives you very flexible ways to check that the result you
got is the result you were expecting. At it's simplest it compares two
structures by going through each level, ensuring that the values
match, that arrays and hashes have the same elements and that
references are blessed into the correct class. It also handles
circular data structures without getting caught in an infinite loop.

%prep
%setup -q -n Test-Deep-%{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+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES README TODO
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Apr 08 2006 Steven Pritchard <steve at kspei.com> 0.093-1
- Specfile autogenerated by cpanspec 1.64.
- Improve description.
- Fix License.
- Remove explicit dependency on Test::Tester and Test::NoWarnings.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Deep/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Apr 2006 18:22:39 -0000	1.1
+++ .cvsignore	10 Apr 2006 18:23:07 -0000	1.2
@@ -0,0 +1 @@
+Test-Deep-0.093.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Deep/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Apr 2006 18:22:39 -0000	1.1
+++ sources	10 Apr 2006 18:23:07 -0000	1.2
@@ -0,0 +1 @@
+b47659e09457a72157d3db5b5be62f75  Test-Deep-0.093.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 18:23:19 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 11:23:19 -0700
Subject: owners owners.list,1.826,1.827
Message-ID: <200604101823.k3AINLJQ016961@cvs-int.fedora.redhat.com>

Author: steve

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

Modified Files:
	owners.list 
Log Message:
Add perl-Test-Tester, perl-Test-NoWarnings, and perl-Test-Deep.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.826
retrieving revision 1.827
diff -u -r1.826 -r1.827
--- owners.list	10 Apr 2006 16:43:45 -0000	1.826
+++ owners.list	10 Apr 2006 18:23:19 -0000	1.827
@@ -1067,6 +1067,7 @@
 Fedora Extras|perl-Template-Toolkit|Template processing system|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Builder-Tester|For bugs related to the perl-Test-Builder-Tester component|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-ClassAPI|Provides basic first-pass API testing for large class trees|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Test-Deep|Extremely flexible deep comparison|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Exception|Library of test functions for exception based Perl code|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Inline|Test::Inline Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-LongString|Perl module to test long strings|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1074,9 +1075,11 @@
 Fedora Extras|perl-Test-Memory-Cycle|Check for memory leaks and circular memory references|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-MockModule|Override subroutines in a module for unit testing|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-MockObject|Perl extension for emulating troublesome interfaces|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Test-NoWarnings|Make sure you didn't emit any warnings while testing|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Pod-Coverage|POD documentation coverage checker|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Pod|Perl module for checking for POD errors in files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Taint|Tools to test taintedness|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Test-Tester|Ease testing test modules built with Test::Builder|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Warn|Perl extension to test methods for warnings|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-WWW-Mechanize|Testing-specific WWW::Mechanize subclass|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-TeX-Hyphen|Hyphenate words using TeX's patterns|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Mon Apr 10 19:18:41 2006
From: fedora-extras-commits at redhat.com (Zing Zing Shishak (shishz))
Date: Mon, 10 Apr 2006 12:18:41 -0700
Subject: rpms/mmv/devel mmv.spec,1.5,1.6
Message-ID: <200604101918.k3AJIh3P020035@cvs-int.fedora.redhat.com>

Author: shishz

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

Modified Files:
	mmv.spec 
Log Message:
* Mon Apr 10 2006 Zing <shishz at hotpop.com> - 1.01b-7
- ok, now fix busted perms on doc directory



Index: mmv.spec
===================================================================
RCS file: /cvs/extras/rpms/mmv/devel/mmv.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mmv.spec	21 Mar 2006 02:07:55 -0000	1.5
+++ mmv.spec	10 Apr 2006 19:18:41 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		mmv
 Version:	1.01b
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Move/copy/append/link multiple files
 
 Group:          Applications/File
@@ -49,7 +49,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(0644,root,root,-)
+%defattr(0644,root,root,0755)
 %doc copyright changelog
 %defattr(-,root,root,-)
 %doc ANNOUNCE ARTICLE READ.ME
@@ -60,6 +60,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Apr 10 2006 Zing <shishz at hotpop.com> - 1.01b-7
+- ok, now fix busted perms on doc directory
+
 * Mon Mar 20 2006 Zing <shishz at hotpop.com> - 1.01b-6
 - fix permissions on doc files
 



From fedora-extras-commits at redhat.com  Mon Apr 10 19:20:25 2006
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 10 Apr 2006 12:20:25 -0700
Subject: rpms/mercurial/devel .cvsignore, 1.6, 1.7 mercurial.spec, 1.8,
	1.9 sources, 1.6, 1.7
Message-ID: <200604101920.k3AJKRmY020085@cvs-int.fedora.redhat.com>

Author: katzj

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

Modified Files:
	.cvsignore mercurial.spec sources 
Log Message:
* Mon Apr 10 2006 Jeremy Katz <katzj at redhat.com> - 0.8.1-1
- update to 0.8.1
- add man pages (#188144)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mercurial/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	30 Jan 2006 16:54:55 -0000	1.6
+++ .cvsignore	10 Apr 2006 19:20:25 -0000	1.7
@@ -1 +1 @@
-mercurial-0.8.tar.gz
+mercurial-0.8.1.tar.gz


Index: mercurial.spec
===================================================================
RCS file: /cvs/extras/rpms/mercurial/devel/mercurial.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mercurial.spec	17 Mar 2006 07:02:33 -0000	1.8
+++ mercurial.spec	10 Apr 2006 19:20:25 -0000	1.9
@@ -1,13 +1,13 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
-Version: 0.8
-Release: 3%{?dist}
+Version: 0.8.1
+Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
 Source0: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: python-devel
+BuildRequires: python-devel asciidoc xmlto
 
 %description
 Mercurial is a fast, lightweight source control management system designed 
@@ -19,10 +19,19 @@
 %build
 python ./setup.py build
 
+# not built by default.  kind of lame
+pushd doc ; make man ; popd
+
 %install
 rm -rf $RPM_BUILD_ROOT
 python ./setup.py install -O1 --root=$RPM_BUILD_ROOT --record=%{name}.files
 
+# and we have to install the man pages
+mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 $RPM_BUILD_ROOT/%{_mandir}/man5
+install -m 0644 doc/hg.1 $RPM_BUILD_ROOT/%{_mandir}/man1/hg.1
+install -m 0644 doc/hgmerge.1 $RPM_BUILD_ROOT/%{_mandir}/man1/hgmerge.1
+install -m 0644 doc/hgrc.5 $RPM_BUILD_ROOT/%{_mandir}/man5/hgrc.5
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -31,9 +40,14 @@
 %files -f %{name}.files
 %defattr(-,root,root,-)
 %doc CONTRIBUTORS README doc/hg.1.txt doc/hgmerge.1.txt doc/hgrc.5.txt
+%{_mandir}/man*/*
 
 
 %changelog
+* Mon Apr 10 2006 Jeremy Katz <katzj at redhat.com> - 0.8.1-1
+- update to 0.8.1
+- add man pages (#188144)
+
 * Fri Mar 17 2006 Jeremy Katz <katzj at redhat.com> - 0.8-3
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mercurial/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	30 Jan 2006 16:54:55 -0000	1.6
+++ sources	10 Apr 2006 19:20:25 -0000	1.7
@@ -1 +1 @@
-4d418e96dd232d804799fca3458ba2b6  mercurial-0.8.tar.gz
+ffa37810cf9c48608f5172a622bef2f5  mercurial-0.8.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 19:20:57 2006
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 10 Apr 2006 12:20:57 -0700
Subject: rpms/mercurial/FC-5 mercurial.spec,1.8,1.9 sources,1.6,1.7
Message-ID: <200604101920.k3AJKxEl020192@cvs-int.fedora.redhat.com>

Author: katzj

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

Modified Files:
	mercurial.spec sources 
Log Message:
* Mon Apr 10 2006 Jeremy Katz <katzj at redhat.com> - 0.8.1-1
- update to 0.8.1
- add man pages (#188144)



Index: mercurial.spec
===================================================================
RCS file: /cvs/extras/rpms/mercurial/FC-5/mercurial.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mercurial.spec	17 Mar 2006 06:48:05 -0000	1.8
+++ mercurial.spec	10 Apr 2006 19:20:57 -0000	1.9
@@ -1,13 +1,13 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
-Version: 0.8
-Release: 3%{?dist}
+Version: 0.8.1
+Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
 Source0: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: python-devel
+BuildRequires: python-devel asciidoc xmlto
 
 %description
 Mercurial is a fast, lightweight source control management system designed 
@@ -19,10 +19,19 @@
 %build
 python ./setup.py build
 
+# not built by default.  kind of lame
+pushd doc ; make man ; popd
+
 %install
 rm -rf $RPM_BUILD_ROOT
 python ./setup.py install -O1 --root=$RPM_BUILD_ROOT --record=%{name}.files
 
+# and we have to install the man pages
+mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 $RPM_BUILD_ROOT/%{_mandir}/man5
+install -m 0644 doc/hg.1 $RPM_BUILD_ROOT/%{_mandir}/man1/hg.1
+install -m 0644 doc/hgmerge.1 $RPM_BUILD_ROOT/%{_mandir}/man1/hgmerge.1
+install -m 0644 doc/hgrc.5 $RPM_BUILD_ROOT/%{_mandir}/man5/hgrc.5
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -31,9 +40,14 @@
 %files -f %{name}.files
 %defattr(-,root,root,-)
 %doc CONTRIBUTORS README doc/hg.1.txt doc/hgmerge.1.txt doc/hgrc.5.txt
+%{_mandir}/man*/*
 
 
 %changelog
+* Mon Apr 10 2006 Jeremy Katz <katzj at redhat.com> - 0.8.1-1
+- update to 0.8.1
+- add man pages (#188144)
+
 * Fri Mar 17 2006 Jeremy Katz <katzj at redhat.com> - 0.8-3
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mercurial/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	30 Jan 2006 16:54:55 -0000	1.6
+++ sources	10 Apr 2006 19:20:57 -0000	1.7
@@ -1 +1 @@
-4d418e96dd232d804799fca3458ba2b6  mercurial-0.8.tar.gz
+ffa37810cf9c48608f5172a622bef2f5  mercurial-0.8.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 19:21:11 2006
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 10 Apr 2006 12:21:11 -0700
Subject: rpms/mercurial/FC-4 mercurial.spec,1.5,1.6 sources,1.6,1.7
Message-ID: <200604101921.k3AJLD5C020255@cvs-int.fedora.redhat.com>

Author: katzj

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

Modified Files:
	mercurial.spec sources 
Log Message:
* Mon Apr 10 2006 Jeremy Katz <katzj at redhat.com> - 0.8.1-1
- update to 0.8.1
- add man pages (#188144)



Index: mercurial.spec
===================================================================
RCS file: /cvs/extras/rpms/mercurial/FC-4/mercurial.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mercurial.spec	30 Jan 2006 16:56:30 -0000	1.5
+++ mercurial.spec	10 Apr 2006 19:21:11 -0000	1.6
@@ -1,13 +1,13 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
-Version: 0.8
+Version: 0.8.1
 Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
 Source0: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: python-devel
+BuildRequires: python-devel asciidoc xmlto
 
 %description
 Mercurial is a fast, lightweight source control management system designed 
@@ -19,10 +19,19 @@
 %build
 python ./setup.py build
 
+# not built by default.  kind of lame
+pushd doc ; make man ; popd
+
 %install
 rm -rf $RPM_BUILD_ROOT
 python ./setup.py install -O1 --root=$RPM_BUILD_ROOT --record=%{name}.files
 
+# and we have to install the man pages
+mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 $RPM_BUILD_ROOT/%{_mandir}/man5
+install -m 0644 doc/hg.1 $RPM_BUILD_ROOT/%{_mandir}/man1/hg.1
+install -m 0644 doc/hgmerge.1 $RPM_BUILD_ROOT/%{_mandir}/man1/hgmerge.1
+install -m 0644 doc/hgrc.5 $RPM_BUILD_ROOT/%{_mandir}/man5/hgrc.5
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -31,9 +40,20 @@
 %files -f %{name}.files
 %defattr(-,root,root,-)
 %doc CONTRIBUTORS README doc/hg.1.txt doc/hgmerge.1.txt doc/hgrc.5.txt
+%{_mandir}/man*/*
 
 
 %changelog
+* Mon Apr 10 2006 Jeremy Katz <katzj at redhat.com> - 0.8.1-1
+- update to 0.8.1
+- add man pages (#188144)
+
+* Fri Mar 17 2006 Jeremy Katz <katzj at redhat.com> - 0.8-3
+- rebuild
+
+* Fri Feb 17 2006 Jeremy Katz <katzj at redhat.com> - 0.8-2
+- rebuild
+
 * Mon Jan 30 2006 Jeremy Katz <katzj at redhat.com> - 0.8-1
 - update to 0.8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mercurial/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	30 Jan 2006 16:56:30 -0000	1.6
+++ sources	10 Apr 2006 19:21:11 -0000	1.7
@@ -1 +1 @@
-4d418e96dd232d804799fca3458ba2b6  mercurial-0.8.tar.gz
+ffa37810cf9c48608f5172a622bef2f5  mercurial-0.8.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 19:23:25 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Mon, 10 Apr 2006 12:23:25 -0700
Subject: rpms/conserver - New directory
Message-ID: <200604101923.k3AJNRTV020384@cvs-int.fedora.redhat.com>

Author: jima

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

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




From fedora-extras-commits at redhat.com  Mon Apr 10 19:23:26 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Mon, 10 Apr 2006 12:23:26 -0700
Subject: rpms/conserver/devel - New directory
Message-ID: <200604101923.k3AJNSCO020387@cvs-int.fedora.redhat.com>

Author: jima

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

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




From fedora-extras-commits at redhat.com  Mon Apr 10 19:23:46 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Mon, 10 Apr 2006 12:23:46 -0700
Subject: rpms/conserver Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604101923.k3AJNmBn020436@cvs-int.fedora.redhat.com>

Author: jima

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

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


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

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

common : CVS/Root
	@cvs 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 Apr 10 19:23:47 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Mon, 10 Apr 2006 12:23:47 -0700
Subject: rpms/conserver/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604101923.k3AJNno5020439@cvs-int.fedora.redhat.com>

Author: jima

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

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


--- 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 Apr 10 19:25:15 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Mon, 10 Apr 2006 12:25:15 -0700
Subject: rpms/conserver/devel conserver-8.1.14-initscript.patch, NONE,
	1.1 conserver-8.1.14-no-exampledir.patch, NONE,
	1.1 conserver.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604101925.k3AJPHhD020524@cvs-int.fedora.redhat.com>

Author: jima

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

Modified Files:
	.cvsignore sources 
Added Files:
	conserver-8.1.14-initscript.patch 
	conserver-8.1.14-no-exampledir.patch conserver.spec 
Log Message:
auto-import conserver-8.1.14-1 on branch devel from conserver-8.1.14-1.src.rpm

conserver-8.1.14-initscript.patch:

--- NEW FILE conserver-8.1.14-initscript.patch ---
diff -urN conserver-8.1.14/contrib/redhat-rpm/conserver.init conserver-8.1.14-patched/contrib/redhat-rpm/conserver.init
--- conserver-8.1.14/contrib/redhat-rpm/conserver.init	2003-02-27 20:06:50.000000000 -0600
+++ conserver-8.1.14-patched/contrib/redhat-rpm/conserver.init	2006-04-07 13:52:23.000000000 -0500
@@ -2,7 +2,7 @@
 #
 # conserver -- serial-port console daemon
 #
-# chkconfig: 2345 92 08
+# chkconfig: - 92 08
 # description: conserver is a serial-port console daemon
 # config: /etc/conserver.cf
 #
@@ -19,32 +19,49 @@
 # make sure conserver is installed and executable
 [ -x /usr/sbin/conserver  ] || exit 1
 
+start()
+{
+	echo -n "Starting conserver: "
+	daemon conserver -d
+	RETVAL=$?
+	[ "$RETVAL" = 0 ] && touch /var/lock/subsys/conserver
+	echo
+}
+
+stop()
+{
+	echo -n "Shutting down conserver: "
+	killproc conserver
+	RETVAL=$?
+	[ "$RETVAL" = 0 ] && rm -f /var/lock/subsys/conserver
+	echo
+}
 
 # See how we were called.
 case "$1" in
   start)
-    echo -n "Starting conserver: "
-    daemon conserver -d
-    echo
-    touch /var/lock/subsys/conserver
+    start
     ;;
   stop)
-    echo -n "Shutting down conserver: "
-    killproc conserver
-    echo
-    rm -f /var/lock/subsys/conserver
+    stop
     ;;
   status)
     status conserver
+    RETVAL=$?
     ;;
   restart)
-    echo -n "Restarting conserver: "
+    stop
+    start
+    ;;
+  reload)
+    echo -n "Reloading conserver: "
     killproc conserver -HUP
+    RETVAL=$?
     echo
     ;;
   *)
-    echo "Usage: conserver {start|stop|restart|status}"
-    exit 1
+    echo "Usage: conserver {start|stop|restart|reload|status}"
+    RETVAL=1
 esac
 
-exit 0
+exit $RETVAL

conserver-8.1.14-no-exampledir.patch:

--- NEW FILE conserver-8.1.14-no-exampledir.patch ---
diff -urN conserver-8.1.14/conserver/Makefile.in conserver-8.1.14-patched/conserver/Makefile.in
--- conserver-8.1.14/conserver/Makefile.in	2005-06-06 10:03:06.000000000 -0500
+++ conserver-8.1.14-patched/conserver/Makefile.in	2006-04-07 12:56:44.000000000 -0500
@@ -9,7 +9,6 @@
 datadir = @datadir@
 libdir = @libdir@
 pkglibdir = $(libdir)/conserver
-exampledir = $(datadir)/examples/conserver
 
 ### Installation programs and flags
 INSTALL = @INSTALL@
@@ -63,8 +62,6 @@
 	$(INSTALL_PROGRAM) conserver $(DESTDIR)$(sbindir)
 	$(MKDIR) $(DESTDIR)$(mandir)/man8
 	$(INSTALL) conserver.man $(DESTDIR)$(mandir)/man8/conserver.8
-	$(MKDIR) $(DESTDIR)$(exampledir)
-	$(INSTALL) conserver.rc $(DESTDIR)$(exampledir)
 	$(MKDIR) $(DESTDIR)$(pkglibdir)
 	$(INSTALL) convert $(DESTDIR)$(pkglibdir)/convert
 
diff -urN conserver-8.1.14/conserver.cf/Makefile.in conserver-8.1.14-patched/conserver.cf/Makefile.in
--- conserver-8.1.14/conserver.cf/Makefile.in	2004-02-09 18:32:28.000000000 -0600
+++ conserver-8.1.14-patched/conserver.cf/Makefile.in	2006-04-07 12:57:07.000000000 -0500
@@ -4,7 +4,6 @@
 mandir = @mandir@
 sysconfdir = @sysconfdir@
 datadir = @datadir@
-exampledir = $(datadir)/examples/conserver
 
 ### Installation programs and flags
 INSTALL = @INSTALL@
@@ -26,8 +25,5 @@
 	$(MKDIR) $(DESTDIR)$(mandir)/man5
 	$(INSTALL) conserver.cf.man $(DESTDIR)$(mandir)/man5/conserver.cf.5
 	$(INSTALL) conserver.passwd.man $(DESTDIR)$(mandir)/man5/conserver.passwd.5
-	$(MKDIR) $(DESTDIR)$(exampledir)
-	$(INSTALL) -m 0644 conserver.cf $(DESTDIR)$(exampledir)
-	$(INSTALL) -m 0644 conserver.passwd $(DESTDIR)$(exampledir)
 
 .PHONY: clean distclean install


--- NEW FILE conserver.spec ---
Name:           conserver
Version:        8.1.14
Release:        1%{?dist}
Summary:        Serial console server daemon/client

Group:          System Environment/Daemons
License:        Distributable
URL:            http://www.conserver.com/
Source0:        http://www.conserver.com/%{name}-%{version}.tar.gz
Patch0:        http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-no-exampledir.patch
Patch1:        http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-initscript.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  pam-devel, openssl-devel, tcp_wrappers
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig
Requires(preun): /sbin/service

%description
Conserver is an application that allows multiple users to watch a serial 
console at the same time.  It can log the data, allows users to take 
write-access of a console (one at a time), and has a variety of bells 
and whistles to accentuate that basic functionality.

%prep
%setup -q
%patch0 -p1
%patch1 -p1


%build
# we don't want to install the solaris conserver.rc file
f="conserver/Makefile.in"
%{__mv} $f $f.orig
%{__sed} -e 's/^.*conserver\.rc.*$//' < $f.orig > $f

%configure --with-uds \
	--with-libwrap \
	--with-openssl \
	--with-pam

make %{?_smp_mflags}


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

# put commented copies of the sample configure files in the
# system configuration directory
%{__mkdir_p} $RPM_BUILD_ROOT/%{_sysconfdir}
%{__sed} -e 's/^/#/' \
  < conserver.cf/conserver.cf \
  > $RPM_BUILD_ROOT/%{_sysconfdir}/conserver.cf
%{__sed} -e 's/^/#/' \
  < conserver.cf/conserver.passwd \
  > $RPM_BUILD_ROOT/%{_sysconfdir}/conserver.passwd

# install copy of init script
%{__mkdir_p} $RPM_BUILD_ROOT/%{_initrddir}
%{__cp} contrib/redhat-rpm/conserver.init $RPM_BUILD_ROOT/%{_initrddir}/conserver


%clean
rm -rf $RPM_BUILD_ROOT

%post
if [ -x %{_initrddir}/conserver ]; then
  /sbin/chkconfig --add conserver
fi
# make sure /etc/services has a conserver entry
if ! egrep '\<conserver\>' /etc/services > /dev/null 2>&1 ; then
  echo "console		 782/tcp	conserver" >> /etc/services
fi


%preun
if [ "$1" = 0 ]; then
  if [ -x %{_initrddir}/conserver ]; then
    %{_initrddir}/conserver stop > /dev/null 2>&1
    /sbin/chkconfig --del conserver
  fi
fi


%files
%defattr(-,root,root,-)
%doc CHANGES FAQ LICENSE INSTALL README conserver.cf/samples/ conserver.cf/conserver.cf conserver.cf/conserver.passwd
%config(noreplace) %{_sysconfdir}/conserver.*
%{_initrddir}/conserver
%{_bindir}/console
%{_libdir}/conserver
%{_mandir}/man1/console.1.gz
%{_mandir}/man5/conserver.cf.5.gz
%{_mandir}/man5/conserver.passwd.5.gz
%{_mandir}/man8/conserver.8.gz
%{_sbindir}/conserver

%changelog
* Mon Apr 10 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 8.1.14-1
- Figures, two days after my initial Fedora Extras RPM, a new release...

* Fri Apr 07 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 8.1.13-1
- Initial Fedora Extras RPM
- Added patch to disable /usr/share/examples/conserver -- non-standard
- Added patch to correct poorly written initscript
- Cleaned up what goes in /usr/share/doc/conserver-8.1.13/ (sloppy)
- Other .spec cleanups with lots of help from Dennis Gilmore (thanks!)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/conserver/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Apr 2006 19:23:47 -0000	1.1
+++ .cvsignore	10 Apr 2006 19:25:15 -0000	1.2
@@ -0,0 +1 @@
+conserver-8.1.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/conserver/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Apr 2006 19:23:47 -0000	1.1
+++ sources	10 Apr 2006 19:25:15 -0000	1.2
@@ -0,0 +1 @@
+f7825728e5af8992ed4a99fb560a3df8  conserver-8.1.14.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 19:25:14 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Mon, 10 Apr 2006 12:25:14 -0700
Subject: rpms/conserver import.log,1.1,1.2
Message-ID: <200604101925.k3AJPGXH020515@cvs-int.fedora.redhat.com>

Author: jima

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

Modified Files:
	import.log 
Log Message:
auto-import conserver-8.1.14-1 on branch devel from conserver-8.1.14-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/conserver/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Apr 2006 19:23:46 -0000	1.1
+++ import.log	10 Apr 2006 19:25:14 -0000	1.2
@@ -0,0 +1 @@
+conserver-8_1_14-1:HEAD:conserver-8.1.14-1.src.rpm:1144697077



From fedora-extras-commits at redhat.com  Mon Apr 10 19:28:34 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Mon, 10 Apr 2006 12:28:34 -0700
Subject: owners owners.list,1.827,1.828
Message-ID: <200604101928.k3AJSaLT020596@cvs-int.fedora.redhat.com>

Author: jima

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

Modified Files:
	owners.list 
Log Message:

Adding conserver



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.827
retrieving revision 1.828
diff -u -r1.827 -r1.828
--- owners.list	10 Apr 2006 18:23:19 -0000	1.827
+++ owners.list	10 Apr 2006 19:28:34 -0000	1.828
@@ -146,6 +146,7 @@
 Fedora Extras|cone|CONE mail reader|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|configure-thinkpad|Graphical ThinkPad configuration utility|jcarpenter at condell.org|extras-qa at fedoraproject.org|
 Fedora Extras|conglomerate|Extensible XML Editor|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
+Fedora Extras|conserver|Serial console server daemon/client|jima at auroralinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|contact-lookup-applet|Applet which allows you to search your Evolution address book|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 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|



From fedora-extras-commits at redhat.com  Mon Apr 10 19:30:33 2006
From: fedora-extras-commits at redhat.com (Zing Zing Shishak (shishz))
Date: Mon, 10 Apr 2006 12:30:33 -0700
Subject: rpms/mmv/FC-5 mmv.spec,1.5,1.6
Message-ID: <200604101930.k3AJUZA7020633@cvs-int.fedora.redhat.com>

Author: shishz

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

Modified Files:
	mmv.spec 
Log Message:
* Mon Apr 10 2006 Zing <shishz at hotpop.com> - 1.01b-7
- ok, now fix busted perms on doc directory



Index: mmv.spec
===================================================================
RCS file: /cvs/extras/rpms/mmv/FC-5/mmv.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mmv.spec	10 Apr 2006 00:21:33 -0000	1.5
+++ mmv.spec	10 Apr 2006 19:30:33 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		mmv
 Version:	1.01b
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Move/copy/append/link multiple files
 
 Group:          Applications/File
@@ -49,7 +49,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(0644,root,root,-)
+%defattr(0644,root,root,0755)
 %doc copyright changelog
 %defattr(-,root,root,-)
 %doc ANNOUNCE ARTICLE READ.ME
@@ -60,6 +60,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Apr 10 2006 Zing <shishz at hotpop.com> - 1.01b-7
+- ok, now fix busted perms on doc directory
+
 * Sun Apr  9 2006 Zing <shishz at hotpop.com> - 1.01b-6
 - fix permissions on doc files
 



From fedora-extras-commits at redhat.com  Mon Apr 10 19:32:05 2006
From: fedora-extras-commits at redhat.com (Zing Zing Shishak (shishz))
Date: Mon, 10 Apr 2006 12:32:05 -0700
Subject: rpms/mmv/FC-4 mmv.spec,1.4,1.5
Message-ID: <200604101932.k3AJW743020690@cvs-int.fedora.redhat.com>

Author: shishz

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

Modified Files:
	mmv.spec 
Log Message:
* Mon Apr 10 2006 Zing <shishz at hotpop.com> - 1.01b-5
- ok, now fix busted perms on doc directory



Index: mmv.spec
===================================================================
RCS file: /cvs/extras/rpms/mmv/FC-4/mmv.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mmv.spec	10 Apr 2006 00:23:57 -0000	1.4
+++ mmv.spec	10 Apr 2006 19:32:05 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		mmv
 Version:	1.01b
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Move/copy/append/link multiple files
 
 Group:          Applications/File
@@ -49,7 +49,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(0644,root,root,-)
+%defattr(0644,root,root,0755)
 %doc copyright changelog
 %defattr(-,root,root,-)
 %doc ANNOUNCE ARTICLE READ.ME
@@ -60,6 +60,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Apr 10 2006 Zing <shishz at hotpop.com> - 1.01b-5
+- ok, now fix busted perms on doc directory
+
 * Sun Apr  9 2006 Zing <shishz at hotpop.com> - 1.01b-4
 - fix permissions on doc files
 - sync with debian mmv_1.01b-14



From fedora-extras-commits at redhat.com  Mon Apr 10 19:36:45 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 10 Apr 2006 12:36:45 -0700
Subject: rpms/denyhosts/FC-5 denyhosts-2.4-setup.patch, NONE,
	1.1 denyhosts.spec, 1.29, 1.30 sources, 1.18,
	1.19 denyhosts-2.3-setup.patch, 1.1, NONE
Message-ID: <200604101936.k3AJalTw020946@cvs-int.fedora.redhat.com>

Author: tibbs

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

Modified Files:
	denyhosts.spec sources 
Added Files:
	denyhosts-2.4-setup.patch 
Removed Files:
	denyhosts-2.3-setup.patch 
Log Message:
* Mon Apr 10 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.4b-1
- Update to 2.4b.


denyhosts-2.4-setup.patch:

--- NEW FILE denyhosts-2.4-setup.patch ---
--- setup.py.setup	2006-04-04 18:53:02.000000000 -0500
+++ setup.py	2006-04-10 13:15:09.712246771 -0500
@@ -23,14 +23,10 @@
       scripts=['denyhosts.py'],
       package_dir={'DenyHosts': 'DenyHosts'},
       packages=["DenyHosts"],
-      data_files=[(libpath, glob("denyhosts.cfg-dist")),
-                  (libpath, glob("setup.py")),
-                  (libpath, glob("daemon-control-dist")),
-                  (libpath, glob("CHANGELOG.txt")),
-                  (libpath, glob("README.txt")),
+      data_files=[
                   (scriptspath, glob("scripts/*")),
                   (pluginspath, glob("plugins/*")),
-                  (libpath, glob("LICENSE.txt"))],
+                  ],
       license="GPL v2",
       ##extra_path='denyhosts',
       long_description="""


Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/FC-5/denyhosts.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- denyhosts.spec	6 Apr 2006 15:27:55 -0000	1.29
+++ denyhosts.spec	10 Apr 2006 19:36:45 -0000	1.30
@@ -1,6 +1,6 @@
 Name:           denyhosts
-Version:        2.3
-Release:	2%{?dist}
+Version:        2.4b
+Release:	1%{?dist}
 Summary:        A script to help thwart ssh server attacks
 
 Group:          Applications/System
@@ -14,7 +14,7 @@
 Source5:	denyhosts.logrotate
 Source6:	README.fedora
 Patch0:		denyhosts-2.3-config.patch
-Patch1:		denyhosts-2.3-setup.patch
+Patch1:		denyhosts-2.4-setup.patch
 Patch2:		denyhosts-2.2-daemon-control.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
@@ -150,6 +150,9 @@
 
 
 %changelog
+* Mon Apr 10 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.4b-1
+- Update to 2.4b.
+
 * Thu Apr  6 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.3-2
 - Fix uncommented MacOS X SECURE_LOG config setting.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/FC-5/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	5 Apr 2006 04:50:11 -0000	1.18
+++ sources	10 Apr 2006 19:36:45 -0000	1.19
@@ -1 +1 @@
-a175dec03a67aff65c5471105d5a2786  DenyHosts-2.3.tar.gz
+c60df73b29baeadffbbb1ef8f130dd8d  DenyHosts-2.4b.tar.gz


--- denyhosts-2.3-setup.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Apr 10 19:38:29 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 10 Apr 2006 12:38:29 -0700
Subject: rpms/denyhosts/FC-4 denyhosts-2.4-setup.patch, NONE,
	1.1 denyhosts.spec, 1.12, 1.13 sources, 1.11,
	1.12 denyhosts-2.3-setup.patch, 1.1, NONE
Message-ID: <200604101938.k3AJcVSF021027@cvs-int.fedora.redhat.com>

Author: tibbs

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

Modified Files:
	denyhosts.spec sources 
Added Files:
	denyhosts-2.4-setup.patch 
Removed Files:
	denyhosts-2.3-setup.patch 
Log Message:
* Mon Apr 10 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.4b-1
- Update to 2.4b.


denyhosts-2.4-setup.patch:

--- NEW FILE denyhosts-2.4-setup.patch ---
--- setup.py.setup	2006-04-04 18:53:02.000000000 -0500
+++ setup.py	2006-04-10 13:15:09.712246771 -0500
@@ -23,14 +23,10 @@
       scripts=['denyhosts.py'],
       package_dir={'DenyHosts': 'DenyHosts'},
       packages=["DenyHosts"],
-      data_files=[(libpath, glob("denyhosts.cfg-dist")),
-                  (libpath, glob("setup.py")),
-                  (libpath, glob("daemon-control-dist")),
-                  (libpath, glob("CHANGELOG.txt")),
-                  (libpath, glob("README.txt")),
+      data_files=[
                   (scriptspath, glob("scripts/*")),
                   (pluginspath, glob("plugins/*")),
-                  (libpath, glob("LICENSE.txt"))],
+                  ],
       license="GPL v2",
       ##extra_path='denyhosts',
       long_description="""


Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/FC-4/denyhosts.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- denyhosts.spec	6 Apr 2006 15:29:53 -0000	1.12
+++ denyhosts.spec	10 Apr 2006 19:38:29 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           denyhosts
-Version:        2.3
-Release:	2%{?dist}
+Version:        2.4b
+Release:	1%{?dist}
 Summary:        A script to help thwart ssh server attacks
 
 Group:          Applications/System
@@ -14,7 +14,7 @@
 Source5:	denyhosts.logrotate
 Source6:	README.fedora
 Patch0:		denyhosts-2.3-config.patch
-Patch1:		denyhosts-2.3-setup.patch
+Patch1:		denyhosts-2.4-setup.patch
 Patch2:		denyhosts-2.2-daemon-control.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
@@ -150,6 +150,9 @@
 
 
 %changelog
+* Mon Apr 10 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.4b-1
+- Update to 2.4b.
+
 * Thu Apr  6 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.3-2
 - Fix uncommented MacOS X SECURE_LOG config setting.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/FC-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	5 Apr 2006 04:53:52 -0000	1.11
+++ sources	10 Apr 2006 19:38:29 -0000	1.12
@@ -1 +1 @@
-a175dec03a67aff65c5471105d5a2786  DenyHosts-2.3.tar.gz
+c60df73b29baeadffbbb1ef8f130dd8d  DenyHosts-2.4b.tar.gz


--- denyhosts-2.3-setup.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Apr 10 19:40:20 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 10 Apr 2006 12:40:20 -0700
Subject: rpms/denyhosts/FC-3 denyhosts-2.4-setup.patch, NONE,
	1.1 denyhosts.spec, 1.12, 1.13 sources, 1.11,
	1.12 denyhosts-2.3-setup.patch, 1.1, NONE
Message-ID: <200604101940.k3AJeMjd021113@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/denyhosts/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21091

Modified Files:
	denyhosts.spec sources 
Added Files:
	denyhosts-2.4-setup.patch 
Removed Files:
	denyhosts-2.3-setup.patch 
Log Message:
* Mon Apr 10 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.4b-1
- Update to 2.4b.


denyhosts-2.4-setup.patch:

--- NEW FILE denyhosts-2.4-setup.patch ---
--- setup.py.setup	2006-04-04 18:53:02.000000000 -0500
+++ setup.py	2006-04-10 13:15:09.712246771 -0500
@@ -23,14 +23,10 @@
       scripts=['denyhosts.py'],
       package_dir={'DenyHosts': 'DenyHosts'},
       packages=["DenyHosts"],
-      data_files=[(libpath, glob("denyhosts.cfg-dist")),
-                  (libpath, glob("setup.py")),
-                  (libpath, glob("daemon-control-dist")),
-                  (libpath, glob("CHANGELOG.txt")),
-                  (libpath, glob("README.txt")),
+      data_files=[
                   (scriptspath, glob("scripts/*")),
                   (pluginspath, glob("plugins/*")),
-                  (libpath, glob("LICENSE.txt"))],
+                  ],
       license="GPL v2",
       ##extra_path='denyhosts',
       long_description="""


Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/FC-3/denyhosts.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- denyhosts.spec	6 Apr 2006 15:31:15 -0000	1.12
+++ denyhosts.spec	10 Apr 2006 19:40:20 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           denyhosts
-Version:        2.3
-Release:	2%{?dist}
+Version:        2.4b
+Release:	1%{?dist}
 Summary:        A script to help thwart ssh server attacks
 
 Group:          Applications/System
@@ -14,7 +14,7 @@
 Source5:	denyhosts.logrotate
 Source6:	README.fedora
 Patch0:		denyhosts-2.3-config.patch
-Patch1:		denyhosts-2.3-setup.patch
+Patch1:		denyhosts-2.4-setup.patch
 Patch2:		denyhosts-2.2-daemon-control.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
@@ -150,6 +150,9 @@
 
 
 %changelog
+* Mon Apr 10 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.4b-1
+- Update to 2.4b.
+
 * Thu Apr  6 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.3-2
 - Fix uncommented MacOS X SECURE_LOG config setting.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/FC-3/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	5 Apr 2006 04:55:18 -0000	1.11
+++ sources	10 Apr 2006 19:40:20 -0000	1.12
@@ -1 +1 @@
-a175dec03a67aff65c5471105d5a2786  DenyHosts-2.3.tar.gz
+c60df73b29baeadffbbb1ef8f130dd8d  DenyHosts-2.4b.tar.gz


--- denyhosts-2.3-setup.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Apr 10 20:02:55 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 10 Apr 2006 13:02:55 -0700
Subject: owners owners.list,1.828,1.829
Message-ID: <200604102002.k3AK2vZi023340@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	owners.list 
Log Message:
Auto-Cc upstream on ccid, pcsc-lite, pcsc-perl and pcsc-tools.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.828
retrieving revision 1.829
diff -u -r1.828 -r1.829
--- owners.list	10 Apr 2006 19:28:34 -0000	1.828
+++ owners.list	10 Apr 2006 20:02:55 -0000	1.829
@@ -108,7 +108,7 @@
 Fedora Extras|c-ares|A library that performs asynchronous DNS operations|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|ccache|Compiler cache|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|CCfits|A C++ interface for cfitsio|spr at astrax.fis.ucm.es|extras-qa at fedoraproject.org|
-Fedora Extras|ccid|Generic USB CCID smart card reader driver|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|ccid|Generic USB CCID smart card reader driver|ville.skytta at iki.fi|extras-qa at fedoraproject.org|ludovic.rousseau at gmail.com
 Fedora Extras|cd-discid|utility to get CDDB discid information|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|cdiff|Diff readability enhancer for color terminals|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|cdlabelgen|Generates frontcards and traycards for inserting in CD jewelcases.|harald at redhat.com|extras-qa at fedoraproject.org|
@@ -827,9 +827,9 @@
 Fedora Extras|paps|Plain Text to PostScript(TM) converter|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|parchive|Parity archive command line client|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|pbzip2|Parallel implementation of the bzip2 block-sorting file compressor|jeff.gilchrist at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|pcsc-lite|PC/SC Lite smart card framework and applications|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|pcsc-perl|Perl interface to the PC/SC smart card library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|pcsc-tools|Tools to be used with smart cards and PC/SC|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|pcsc-lite|PC/SC Lite smart card framework and applications|ville.skytta at iki.fi|extras-qa at fedoraproject.org|ludovic.rousseau at gmail.com
+Fedora Extras|pcsc-perl|Perl interface to the PC/SC smart card library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com,ludovic.rousseau at gmail.com
+Fedora Extras|pcsc-tools|Tools to be used with smart cards and PC/SC|ville.skytta at iki.fi|extras-qa at fedoraproject.org|ludovic.rousseau at gmail.com
 Fedora Extras|pdfjam|Utilities for join, rotate and align PDFs|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 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|



From fedora-extras-commits at redhat.com  Mon Apr 10 20:25:41 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 13:25:41 -0700
Subject: rpms/perl-Test-NoWarnings/FC-5 perl-Test-NoWarnings.spec,1.1,1.2
Message-ID: <200604102025.k3AKPh7t024916@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-NoWarnings/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24869/FC-5

Modified Files:
	perl-Test-NoWarnings.spec 
Log Message:
Fix typo.


Index: perl-Test-NoWarnings.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-NoWarnings/FC-5/perl-Test-NoWarnings.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Test-NoWarnings.spec	10 Apr 2006 18:15:13 -0000	1.1
+++ perl-Test-NoWarnings.spec	10 Apr 2006 20:25:41 -0000	1.2
@@ -12,7 +12,7 @@
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
-In general, your tests shouldn't produce warnings. This modules causes any
+In general, your tests shouldn't produce warnings. This module causes any
 warnings to be captured and stored. It automatically adds an extra test
 that will run when your script ends to check that there were no warnings.
 If there were any warings, the test will give a "not ok" and diagnostics of



From fedora-extras-commits at redhat.com  Mon Apr 10 20:25:42 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 13:25:42 -0700
Subject: rpms/perl-Test-NoWarnings/devel perl-Test-NoWarnings.spec,1.1,1.2
Message-ID: <200604102025.k3AKPiFs024920@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-NoWarnings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24869/devel

Modified Files:
	perl-Test-NoWarnings.spec 
Log Message:
Fix typo.


Index: perl-Test-NoWarnings.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-NoWarnings/devel/perl-Test-NoWarnings.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Test-NoWarnings.spec	10 Apr 2006 18:15:13 -0000	1.1
+++ perl-Test-NoWarnings.spec	10 Apr 2006 20:25:41 -0000	1.2
@@ -12,7 +12,7 @@
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
-In general, your tests shouldn't produce warnings. This modules causes any
+In general, your tests shouldn't produce warnings. This module causes any
 warnings to be captured and stored. It automatically adds an extra test
 that will run when your script ends to check that there were no warnings.
 If there were any warings, the test will give a "not ok" and diagnostics of



From fedora-extras-commits at redhat.com  Mon Apr 10 20:25:40 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 13:25:40 -0700
Subject: rpms/perl-Test-NoWarnings/FC-4 perl-Test-NoWarnings.spec,1.1,1.2
Message-ID: <200604102025.k3AKPgt6024914@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-NoWarnings/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24869/FC-4

Modified Files:
	perl-Test-NoWarnings.spec 
Log Message:
Fix typo.


Index: perl-Test-NoWarnings.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-NoWarnings/FC-4/perl-Test-NoWarnings.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Test-NoWarnings.spec	10 Apr 2006 18:15:13 -0000	1.1
+++ perl-Test-NoWarnings.spec	10 Apr 2006 20:25:40 -0000	1.2
@@ -12,7 +12,7 @@
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
-In general, your tests shouldn't produce warnings. This modules causes any
+In general, your tests shouldn't produce warnings. This module causes any
 warnings to be captured and stored. It automatically adds an extra test
 that will run when your script ends to check that there were no warnings.
 If there were any warings, the test will give a "not ok" and diagnostics of



From fedora-extras-commits at redhat.com  Mon Apr 10 20:46:06 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Mon, 10 Apr 2006 13:46:06 -0700
Subject: owners owners.list,1.829,1.830
Message-ID: <200604102046.k3AKk8Br025120@cvs-int.fedora.redhat.com>

Author: kengert

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

Modified Files:
	owners.list 
Log Message:
Adding seamonkey



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.829
retrieving revision 1.830
diff -u -r1.829 -r1.830
--- owners.list	10 Apr 2006 20:02:55 -0000	1.829
+++ owners.list	10 Apr 2006 20:46:05 -0000	1.830
@@ -1333,6 +1333,7 @@
 Fedora Extras|SDL_net|SDL portable network library|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|SDL_ttf|Simple DirectMedia Layer - Sample TrueType Font Library|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|seahorse|GNOME2 interface for gnupg|skvidal at phy.duke.edu|extras-qa at fedoraproject.org|
+Fedora Extras|seamonkey|Web browser, e-mail, news, IRC client, HTML editor|kengert 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|shapelib|API in "C" for Shapefile handling|mccann0011 at hotmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|shippy|Space invaders / Galaxians like game with powerups|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Apr 10 21:06:03 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Mon, 10 Apr 2006 14:06:03 -0700
Subject: rpms/enchant/FC-5 enchant.spec,1.9,1.10
Message-ID: <200604102106.k3AL651m027280@cvs-int.fedora.redhat.com>

Author: uwog

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

Modified Files:
	enchant.spec 
Log Message:
Packages all installed files




Index: enchant.spec
===================================================================
RCS file: /cvs/extras/rpms/enchant/FC-5/enchant.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- enchant.spec	14 Feb 2006 18:05:47 -0000	1.9
+++ enchant.spec	10 Apr 2006 21:06:03 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: An Enchanting Spell Checking Library
 Name: enchant
 Version: 1.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 Group: System Environment/Libraries
 License: LGPL
@@ -44,6 +44,7 @@
 %dir %{_libdir}/enchant
 %{_libdir}/enchant/lib*.so*
 %{_mandir}/man1/enchant.1.gz
+%{_datadir}/enchant
 
 %files devel
 %defattr(-,root,root)
@@ -61,6 +62,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 1:1.2.2-3.fc5
+- Package the data dir as well (bug 188516)
+
 * Tue Feb 14 2006 Marc Maurer <uwog at abisource.com> 1:1.2.2-2.fc5
 - Rebuild for Fedora Extras 5
 



From fedora-extras-commits at redhat.com  Mon Apr 10 21:21:38 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Mon, 10 Apr 2006 14:21:38 -0700
Subject: rpms/enchant/devel enchant.spec,1.9,1.10
Message-ID: <200604102121.k3ALLePo027424@cvs-int.fedora.redhat.com>

Author: uwog

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

Modified Files:
	enchant.spec 
Log Message:
Bug 188516, new upstream version, hspell support




Index: enchant.spec
===================================================================
RCS file: /cvs/extras/rpms/enchant/devel/enchant.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- enchant.spec	14 Feb 2006 18:05:47 -0000	1.9
+++ enchant.spec	10 Apr 2006 21:21:38 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: An Enchanting Spell Checking Library
 Name: enchant
-Version: 1.2.2
-Release: 2%{?dist}
+Version: 1.2.5
+Release: 1%{?dist}
 Epoch: 1
 Group: System Environment/Libraries
 License: LGPL
@@ -9,6 +9,7 @@
 URL: http://www.abisource.com/
 BuildRequires: glib2-devel >= 2.0.0
 BuildRequires: aspell-devel
+BuildRequires: hspell-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -44,6 +45,7 @@
 %dir %{_libdir}/enchant
 %{_libdir}/enchant/lib*.so*
 %{_mandir}/man1/enchant.1.gz
+%{_datadir}/enchant
 
 %files devel
 %defattr(-,root,root)
@@ -61,6 +63,11 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 1:1.2.5-1.fc6
+- Package the data dir as well (bug 188516)
+- New upstream version
+- Add hspell requirement/support
+
 * Tue Feb 14 2006 Marc Maurer <uwog at abisource.com> 1:1.2.2-2.fc5
 - Rebuild for Fedora Extras 5
 



From fedora-extras-commits at redhat.com  Mon Apr 10 21:23:52 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Mon, 10 Apr 2006 14:23:52 -0700
Subject: rpms/enchant/devel .cvsignore, 1.7, 1.8 enchant.spec, 1.10,
	1.11 sources, 1.7, 1.8
Message-ID: <200604102123.k3ALNswG027493@cvs-int.fedora.redhat.com>

Author: uwog

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

Modified Files:
	.cvsignore enchant.spec sources 
Log Message:
rebuild




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/enchant/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	5 Feb 2006 21:32:46 -0000	1.7
+++ .cvsignore	10 Apr 2006 21:23:52 -0000	1.8
@@ -1 +1 @@
-enchant-1.2.2.tar.gz
+enchant-1.2.5.tar.gz


Index: enchant.spec
===================================================================
RCS file: /cvs/extras/rpms/enchant/devel/enchant.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- enchant.spec	10 Apr 2006 21:21:38 -0000	1.10
+++ enchant.spec	10 Apr 2006 21:23:52 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: An Enchanting Spell Checking Library
 Name: enchant
 Version: 1.2.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 Group: System Environment/Libraries
 License: LGPL
@@ -63,6 +63,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 1:1.2.5-2.fc6
+- Rebuild
+
 * Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 1:1.2.5-1.fc6
 - Package the data dir as well (bug 188516)
 - New upstream version


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/enchant/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	5 Feb 2006 21:32:46 -0000	1.7
+++ sources	10 Apr 2006 21:23:52 -0000	1.8
@@ -1 +1 @@
-ee7f8261bc607015633206f710671239  enchant-1.2.2.tar.gz
+e64ec808ed2cb687c242ebb835faeb61  enchant-1.2.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 21:34:56 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Mon, 10 Apr 2006 14:34:56 -0700
Subject: rpms/moodss/devel .cvsignore,1.8,1.9 sources,1.9,1.10
Message-ID: <200604102134.k3ALYw0D027567@cvs-int.fedora.redhat.com>

Author: jfontain

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

Modified Files:
	.cvsignore sources 
Log Message:
21.2 upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	7 Mar 2006 02:27:24 -0000	1.8
+++ .cvsignore	10 Apr 2006 21:34:56 -0000	1.9
@@ -1,2 +1,3 @@
 moodss-21.0.tar.bz2
 moodss-21.1.tar.bz2
+moodss-21.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	7 Mar 2006 02:27:24 -0000	1.9
+++ sources	10 Apr 2006 21:34:56 -0000	1.10
@@ -1,2 +1,3 @@
 1366c31bfbda443103dcd7f53e10e3a8  moodss-21.0.tar.bz2
 f4563adcfe077b0c9716f7bf86ac94e0  moodss-21.1.tar.bz2
+8e48defc0f98a1346292d31ab9d226c2  moodss-21.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 10 21:37:06 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Mon, 10 Apr 2006 14:37:06 -0700
Subject: rpms/moomps/devel .cvsignore,1.7,1.8 sources,1.7,1.8
Message-ID: <200604102137.k3ALb8VN027611@cvs-int.fedora.redhat.com>

Author: jfontain

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

Modified Files:
	.cvsignore sources 
Log Message:
5.6 upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moomps/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	7 Mar 2006 02:37:09 -0000	1.7
+++ .cvsignore	10 Apr 2006 21:37:06 -0000	1.8
@@ -1,2 +1,3 @@
 moomps-5.4.tar.bz2
 moomps-5.5.tar.bz2
+moomps-5.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moomps/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	7 Mar 2006 02:37:09 -0000	1.7
+++ sources	10 Apr 2006 21:37:06 -0000	1.8
@@ -1,2 +1,3 @@
 37045d89b50a78f5f6f445cc4d897c62  moomps-5.4.tar.bz2
 249a456d2db2dbc5ed95f31d926d063d  moomps-5.5.tar.bz2
+f2cf3e281df6e004889672dc11b1d505  moomps-5.6.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 10 21:38:44 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Mon, 10 Apr 2006 14:38:44 -0700
Subject: rpms/enchant/FC-5 enchant.spec,1.10,1.11
Message-ID: <200604102138.k3ALckEM027639@cvs-int.fedora.redhat.com>

Author: uwog

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

Modified Files:
	enchant.spec 
Log Message:
New upstream version / add hspell support




Index: enchant.spec
===================================================================
RCS file: /cvs/extras/rpms/enchant/FC-5/enchant.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- enchant.spec	10 Apr 2006 21:06:03 -0000	1.10
+++ enchant.spec	10 Apr 2006 21:38:44 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: An Enchanting Spell Checking Library
 Name: enchant
-Version: 1.2.2
-Release: 3%{?dist}
+Version: 1.2.5
+Release: 1%{?dist}
 Epoch: 1
 Group: System Environment/Libraries
 License: LGPL
@@ -62,6 +62,10 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 1:1.2.5-1.fc5
+- New upstream version
+- Add hspell requirement/support
+
 * Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 1:1.2.2-3.fc5
 - Package the data dir as well (bug 188516)
 



From fedora-extras-commits at redhat.com  Mon Apr 10 21:39:17 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Mon, 10 Apr 2006 14:39:17 -0700
Subject: rpms/enchant/FC-5 .cvsignore,1.7,1.8 sources,1.7,1.8
Message-ID: <200604102139.k3ALdJC4027671@cvs-int.fedora.redhat.com>

Author: uwog

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

Modified Files:
	.cvsignore sources 
Log Message:
New upstream version




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/enchant/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	5 Feb 2006 21:32:46 -0000	1.7
+++ .cvsignore	10 Apr 2006 21:39:17 -0000	1.8
@@ -1 +1 @@
-enchant-1.2.2.tar.gz
+enchant-1.2.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/enchant/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	5 Feb 2006 21:32:46 -0000	1.7
+++ sources	10 Apr 2006 21:39:17 -0000	1.8
@@ -1 +1 @@
-ee7f8261bc607015633206f710671239  enchant-1.2.2.tar.gz
+e64ec808ed2cb687c242ebb835faeb61  enchant-1.2.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 21:40:55 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Mon, 10 Apr 2006 14:40:55 -0700
Subject: rpms/seamonkey - New directory
Message-ID: <200604102140.k3ALevwW027780@cvs-int.fedora.redhat.com>

Author: kengert

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

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




From fedora-extras-commits at redhat.com  Mon Apr 10 21:40:55 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Mon, 10 Apr 2006 14:40:55 -0700
Subject: rpms/seamonkey/devel - New directory
Message-ID: <200604102140.k3ALevDt027783@cvs-int.fedora.redhat.com>

Author: kengert

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

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




From fedora-extras-commits at redhat.com  Mon Apr 10 21:41:14 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Mon, 10 Apr 2006 14:41:14 -0700
Subject: rpms/seamonkey Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604102141.k3ALfGPa027832@cvs-int.fedora.redhat.com>

Author: kengert

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

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


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

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

common : CVS/Root
	@cvs 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 Apr 10 21:41:15 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Mon, 10 Apr 2006 14:41:15 -0700
Subject: rpms/seamonkey/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604102141.k3ALfHLO027835@cvs-int.fedora.redhat.com>

Author: kengert

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

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


--- 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 Apr 10 21:43:15 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Mon, 10 Apr 2006 14:43:15 -0700
Subject: rpms/enchant/FC-5 enchant.spec,1.11,1.12
Message-ID: <200604102143.k3ALhHdG027959@cvs-int.fedora.redhat.com>

Author: uwog

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

Modified Files:
	enchant.spec 
Log Message:
Really add hspell support :X




Index: enchant.spec
===================================================================
RCS file: /cvs/extras/rpms/enchant/FC-5/enchant.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- enchant.spec	10 Apr 2006 21:38:44 -0000	1.11
+++ enchant.spec	10 Apr 2006 21:43:15 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: An Enchanting Spell Checking Library
 Name: enchant
 Version: 1.2.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 Group: System Environment/Libraries
 License: LGPL
@@ -9,6 +9,7 @@
 URL: http://www.abisource.com/
 BuildRequires: glib2-devel >= 2.0.0
 BuildRequires: aspell-devel
+BuildRequires: hspell-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -62,6 +63,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 1:1.2.5-2.fc5
+- Really add hspell support :X
+
 * Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 1:1.2.5-1.fc5
 - New upstream version
 - Add hspell requirement/support



From fedora-extras-commits at redhat.com  Mon Apr 10 21:43:55 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Mon, 10 Apr 2006 14:43:55 -0700
Subject: rpms/moodss/devel moodss.spec,1.21,1.22
Message-ID: <200604102143.k3ALhvLd028051@cvs-int.fedora.redhat.com>

Author: jfontain

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

Modified Files:
	moodss.spec 
Log Message:
21.2 upstream release.



Index: moodss.spec
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/moodss.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- moodss.spec	7 Mar 2006 02:27:24 -0000	1.21
+++ moodss.spec	10 Apr 2006 21:43:55 -0000	1.22
@@ -1,10 +1,10 @@
 Name: moodss
-Version: 21.1
+Version: 21.2
 Release: 1%{?dist}
 Summary: Powerful modular monitoring graphical application
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moodss-21.1.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moodss-21.2.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
+* Sat Mar 18 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.2-1
+- 21.2 upstream release
+
 * Mon Feb 27 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.1-1
 - 21.1 upstream release
 



From fedora-extras-commits at redhat.com  Mon Apr 10 21:51:17 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Mon, 10 Apr 2006 14:51:17 -0700
Subject: rpms/moodss/FC-5 .cvsignore, 1.8, 1.9 moodss.spec, 1.21,
	1.22 sources, 1.9, 1.10
Message-ID: <200604102151.k3ALpJa6028198@cvs-int.fedora.redhat.com>

Author: jfontain

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

Modified Files:
	.cvsignore moodss.spec sources 
Log Message:
21.2 upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	7 Mar 2006 02:27:24 -0000	1.8
+++ .cvsignore	10 Apr 2006 21:51:17 -0000	1.9
@@ -1,2 +1,3 @@
 moodss-21.0.tar.bz2
 moodss-21.1.tar.bz2
+moodss-21.2.tar.bz2


Index: moodss.spec
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-5/moodss.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- moodss.spec	7 Mar 2006 02:27:24 -0000	1.21
+++ moodss.spec	10 Apr 2006 21:51:17 -0000	1.22
@@ -1,10 +1,10 @@
 Name: moodss
-Version: 21.1
+Version: 21.2
 Release: 1%{?dist}
 Summary: Powerful modular monitoring graphical application
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moodss-21.1.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moodss-21.2.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
+* Sat Mar 18 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.2-1
+- 21.2 upstream release
+
 * Mon Feb 27 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.1-1
 - 21.1 upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	7 Mar 2006 02:27:24 -0000	1.9
+++ sources	10 Apr 2006 21:51:17 -0000	1.10
@@ -1,2 +1,3 @@
 1366c31bfbda443103dcd7f53e10e3a8  moodss-21.0.tar.bz2
 f4563adcfe077b0c9716f7bf86ac94e0  moodss-21.1.tar.bz2
+8e48defc0f98a1346292d31ab9d226c2  moodss-21.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 10 21:53:46 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Mon, 10 Apr 2006 14:53:46 -0700
Subject: rpms/moodss/FC-4 .cvsignore, 1.9, 1.10 moodss.spec, 1.20,
	1.21 sources, 1.9, 1.10
Message-ID: <200604102153.k3ALrmYu028277@cvs-int.fedora.redhat.com>

Author: jfontain

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

Modified Files:
	.cvsignore moodss.spec sources 
Log Message:
21.2 upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-4/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	7 Mar 2006 02:48:25 -0000	1.9
+++ .cvsignore	10 Apr 2006 21:53:46 -0000	1.10
@@ -1,2 +1,3 @@
 moodss-21.0.tar.bz2
 moodss-21.1.tar.bz2
+moodss-21.2.tar.bz2


Index: moodss.spec
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-4/moodss.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- moodss.spec	7 Mar 2006 02:48:25 -0000	1.20
+++ moodss.spec	10 Apr 2006 21:53:46 -0000	1.21
@@ -1,10 +1,10 @@
 Name: moodss
-Version: 21.1
+Version: 21.2
 Release: 1%{?dist}
 Summary: Powerful modular monitoring graphical application
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moodss-21.1.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moodss-21.2.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl-devel >= 8.4.8
@@ -57,9 +57,15 @@
 
 
 %changelog
+* Sat Mar 18 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.2-1
+- 21.2 upstream release
+
 * Mon Feb 27 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.1-1
 - 21.1 upstream release
 
+* Wed Feb 15 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.0-2
+- rebuild for Fedora Extras 5
+
 * Fri Nov 11 2005 Jean-Luc Fontaine <jfontain at free.fr> 21.0-1
 - 21.0 upstream release
 - added R dependency


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	7 Mar 2006 02:48:25 -0000	1.9
+++ sources	10 Apr 2006 21:53:46 -0000	1.10
@@ -1,2 +1,3 @@
 1366c31bfbda443103dcd7f53e10e3a8  moodss-21.0.tar.bz2
 f4563adcfe077b0c9716f7bf86ac94e0  moodss-21.1.tar.bz2
+8e48defc0f98a1346292d31ab9d226c2  moodss-21.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 10 21:58:25 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Mon, 10 Apr 2006 14:58:25 -0700
Subject: rpms/seamonkey import.log,1.1,1.2
Message-ID: <200604102158.k3ALwRs0028396@cvs-int.fedora.redhat.com>

Author: kengert

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

Modified Files:
	import.log 
Log Message:
auto-import seamonkey-1.0-9 on branch devel from seamonkey-1.0-9.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Apr 2006 21:41:14 -0000	1.1
+++ import.log	10 Apr 2006 21:58:25 -0000	1.2
@@ -0,0 +1 @@
+seamonkey-1_0-9:HEAD:seamonkey-1.0-9.src.rpm:1144706280



From fedora-extras-commits at redhat.com  Mon Apr 10 21:58:25 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Mon, 10 Apr 2006 14:58:25 -0700
Subject: rpms/seamonkey/devel find-external-requires, NONE,
	1.1 firefox-0.7.3-default-plugin-less-annoying.patch, NONE,
	1.1 firefox-0.7.3-psfonts.patch, NONE,
	1.1 firefox-1.0-prdtoa.patch, NONE,
	1.1 firefox-1.1-nss-system-nspr.patch, NONE,
	1.1 firefox-1.1-uriloader.patch, NONE,
	1.1 firefox-1.5-with-system-nss.patch, NONE,
	1.1 firefox-1.5.0.1-dumpstack.patch, NONE,
	1.1 mozilla-1.4.1-ppc64.patch, NONE,
	1.1 mozilla-1.7.3-gnome-vfs-default-app.patch, NONE,
	1.1 mozilla-1.7.5-g-application-name.patch, NONE,
	1.1 mozilla-nspr-packages.patch, NONE,
	1.1 mozilla-psm-exclude-list, NONE,
	1.1 mozilla-xpcom-exclude-list, NONE, 1.1 pango-cairo.patch,
	NONE, 1.1 seamonkey-cairo-bug5136.patch, NONE,
	1.1 seamonkey-configure.patch, NONE,
	1.1 seamonkey-disable-visibility.patch, NONE,
	1.1 seamonkey-fedora-default-bookmarks.html, NONE,
	1.1 seamonkey-fedora-default-prefs.js, NONE,
	1.1 seamonkey-fedora-home-page.patch, NONE,
	1.1 seamonkey-icon.png, NONE, 1.1 seamonkey-mail-icon.png, NONE,
	1.1 seamonkey-mail.desktop, NONE, 1.1 seamonkey-make-package.pl,
	NONE, 1.1 seamonkey-mozconfig, NONE, 1.1 seamonkey.desktop, NONE,
	1.1 seamonkey.sh.in, NONE, 1.1 seamonkey.spec, NONE,
	1.1 thunderbird-0.7.3-gnome-uriloader.patch, NONE,
	1.1 thunderbird-1.5-bug304720.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604102158.k3ALwSoh028437@cvs-int.fedora.redhat.com>

Author: kengert

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

Modified Files:
	.cvsignore sources 
Added Files:
	find-external-requires 
	firefox-0.7.3-default-plugin-less-annoying.patch 
	firefox-0.7.3-psfonts.patch firefox-1.0-prdtoa.patch 
	firefox-1.1-nss-system-nspr.patch firefox-1.1-uriloader.patch 
	firefox-1.5-with-system-nss.patch 
	firefox-1.5.0.1-dumpstack.patch mozilla-1.4.1-ppc64.patch 
	mozilla-1.7.3-gnome-vfs-default-app.patch 
	mozilla-1.7.5-g-application-name.patch 
	mozilla-nspr-packages.patch mozilla-psm-exclude-list 
	mozilla-xpcom-exclude-list pango-cairo.patch 
	seamonkey-cairo-bug5136.patch seamonkey-configure.patch 
	seamonkey-disable-visibility.patch 
	seamonkey-fedora-default-bookmarks.html 
	seamonkey-fedora-default-prefs.js 
	seamonkey-fedora-home-page.patch seamonkey-icon.png 
	seamonkey-mail-icon.png seamonkey-mail.desktop 
	seamonkey-make-package.pl seamonkey-mozconfig 
	seamonkey.desktop seamonkey.sh.in seamonkey.spec 
	thunderbird-0.7.3-gnome-uriloader.patch 
	thunderbird-1.5-bug304720.patch 
Log Message:
auto-import seamonkey-1.0-9 on branch devel from seamonkey-1.0-9.src.rpm


--- NEW FILE find-external-requires ---
#!/bin/sh

# Finds requirements provided outside of the current file set

filelist=`sed "s/[]['\"*?{}]/\\\\\&/g"`

provides=`echo $filelist | /usr/lib/rpm/find-provides`

{
for f in $filelist ; do
	echo $f | /usr/lib/rpm/find-requires | while read req ; do
		found=0
		for p in $provides ; do
			if [ "$req" = "$p" ]; then
				found=1
			fi
		done
		if [ "$found" = "0" ]; then
			echo $req
		fi
	done
done
} | sort -u
firefox-0.7.3-default-plugin-less-annoying.patch:

--- NEW FILE firefox-0.7.3-default-plugin-less-annoying.patch ---
--- mozilla/modules/plugin/samples/default/unix/npshell.c.foo	Tue May  7 14:18:45 2002
+++ mozilla/modules/plugin/samples/default/unix/npshell.c	Tue May  7 14:49:55 2002
@@ -224,7 +224,7 @@
       This->depth = ws_info->depth;
       This->colormap = ws_info->colormap;
       makePixmap(This);
-      makeWidget(This);
+      /* makeWidget(This); */
     }
     return NPERR_NO_ERROR;
 }
--- mozilla/modules/plugin/samples/default/unix/nullplugin.c.foo	Tue May  7 14:18:45 2002
+++ mozilla/modules/plugin/samples/default/unix/nullplugin.c	Tue May  7 14:48:33 2002
@@ -70,6 +70,8 @@
 
     gtk_object_remove_data(GTK_OBJECT(button), DIALOGID);
 
+#if 0
+
     if (This->pluginsFileUrl != NULL)
     {
         /* Get the JavaScript command string */
@@ -110,6 +112,7 @@
             NPN_MemFree(url);
         }
     }
+#endif
     destroyWidget(This);
 }
 
@@ -265,14 +268,14 @@
                    GTK_DIALOG(dialogWindow)->action_area);
     gtk_object_set_data(GTK_OBJECT(okButton), DIALOGID, dialogWindow);
 
-    cancelButton= AddWidget(gtk_button_new_with_label (CANCEL_BUTTON), 
-                   GTK_DIALOG(dialogWindow)->action_area);
+    /*    cancelButton= AddWidget(gtk_button_new_with_label (CANCEL_BUTTON), 
+          GTK_DIALOG(dialogWindow)->action_area); */
 
     gtk_signal_connect (GTK_OBJECT(okButton),  "clicked",
                         GTK_SIGNAL_FUNC(DialogOKClicked), This);
 
-    gtk_signal_connect (GTK_OBJECT(cancelButton),  "clicked",
-                        GTK_SIGNAL_FUNC(DialogCancelClicked), This);
+    /*    gtk_signal_connect (GTK_OBJECT(cancelButton),  "clicked",
+          GTK_SIGNAL_FUNC(DialogCancelClicked), This); */
 
     /* hookup to when the dialog is destroyed */
     gtk_signal_connect(GTK_OBJECT(dialogWindow), "destroy",
--- mozilla/modules/plugin/samples/default/unix/nullplugin.h.foo	Tue May  7 14:46:48 2002
+++ mozilla/modules/plugin/samples/default/unix/nullplugin.h	Tue May  7 14:47:08 2002
@@ -53,9 +53,7 @@
 #define JVM_MINETYPE        "application/x-java-vm"
 #define MESSAGE "\
 This page contains information of a type (%s) that can\n\
-only be viewed with the appropriate Plug-in.\n\
-\n\
-Click OK to download Plugin."
+only be viewed with the appropriate Plug-in."
 
 #define GET 1
 #define REFRESH 2

firefox-0.7.3-psfonts.patch:

--- NEW FILE firefox-0.7.3-psfonts.patch ---
--- mozilla/modules/libpref/src/init/all.js.foo	2004-06-18 13:16:32.000000000 -0400
+++ mozilla/modules/libpref/src/init/all.js	2004-06-18 13:17:28.000000000 -0400
@@ -1776,8 +1776,10 @@
 pref("print.postscript.nativefont.ar",             "");
 pref("print.postscript.nativefont.el",             "");
 pref("print.postscript.nativefont.he",             "");
-pref("print.postscript.nativefont.ja",             "");
-pref("print.postscript.nativefont.ko",             "");
+pref("print.postscript.nativecode.ja",             "euc-jp");
+pref("print.postscript.nativefont.ja",             "Ryumin-Light-EUC-H");
+pref("print.postscript.nativecode.ko",             "euc-kr");
+pref("print.postscript.nativefont.ko",             "Baekmuk-Gulim-KSC-EUC-H");
 pref("print.postscript.nativefont.th",             "");
 pref("print.postscript.nativefont.tr",             "");
 pref("print.postscript.nativefont.x-baltic",       "");
@@ -1786,8 +1788,10 @@
 pref("print.postscript.nativefont.x-unicode",      "");
 pref("print.postscript.nativefont.x-user-def",     "");
 pref("print.postscript.nativefont.x-western",      "");
-pref("print.postscript.nativefont.zh-CN",          "");
-pref("print.postscript.nativefont.zh-TW",          "");
+pref("print.postscript.nativecode.zh-CN", "gb18030");
+pref("print.postscript.nativefont.zh-CN", "MSungGBK-Light-GBK2K-H");
+pref("print.postscript.nativecode.zh-TW", "big5");
+pref("print.postscript.nativefont.zh-TW", "ShanHeiSun-Light-B5-H");
 pref("print.postscript.nativefont.zh-HK",          "");
 
 # XP_UNIX

firefox-1.0-prdtoa.patch:

--- NEW FILE firefox-1.0-prdtoa.patch ---
Index: nsprpub/pr/src/misc/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/nsprpub/pr/src/misc/Makefile.in,v
retrieving revision 1.15.2.2
diff -u -r1.15.2.2 Makefile.in
--- nsprpub/pr/src/misc/Makefile.in	6 Jun 2003 03:09:17 -0000	1.15.2.2
+++ nsprpub/pr/src/misc/Makefile.in	19 Nov 2004 00:58:35 -0000
@@ -82,6 +82,15 @@
 
 include $(topsrcdir)/config/rules.mk
 
+ifneq (,$(filter Linuxs390 Linuxs390x,$(OS_ARCH)$(OS_TEST)))
+
+NONOPT_CFLAGS=$(filter-out -O%, $(CFLAGS))
+
+$(OBJDIR)/prdtoa.$(OBJ_SUFFIX): prdtoa.c
+	@$(MAKE_OBJDIR)
+	$(CC) -o $@ -c $(NONOPT_CFLAGS) -ffloat-store $<
+endif
+
 # Prevent floating point errors caused by MSVC 6.0 Processor Pack
 # optimizations (bug 207421).  This disables optimizations that
 # could change the precision of floating-point calculations for

firefox-1.1-nss-system-nspr.patch:

--- NEW FILE firefox-1.1-nss-system-nspr.patch ---
Index: mozilla/security/coreconf/location.mk
===================================================================
RCS file: /cvsroot/mozilla/security/coreconf/location.mk,v
retrieving revision 1.9
diff -u -r1.9 location.mk
--- mozilla/security/coreconf/location.mk	25 Apr 2004 15:02:17 -0000	1.9
+++ mozilla/security/coreconf/location.mk	11 Apr 2005 20:21:57 -0000
@@ -61,6 +61,8 @@
 
 DIST          = $(SOURCE_PREFIX)/$(PLATFORM)
 
+NSPR_LIBDIR   = $(DIST)/lib
+
 ifdef BUILD_DEBUG_GC
     DEFINES += -DDEBUG_GC
 endif
Index: mozilla/security/manager/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/security/manager/Makefile.in,v
retrieving revision 1.56
diff -u -r1.56 Makefile.in
--- mozilla/security/manager/Makefile.in	14 Mar 2005 10:00:58 -0000	1.56
+++ mozilla/security/manager/Makefile.in	11 Apr 2005 20:21:57 -0000
@@ -76,12 +76,23 @@
 endif
 endif
 
+ABS_DIST := $(shell cd $(DIST) && pwd)
+ifeq ($(OS_ARCH),WINNT)
+ABS_DIST := $(shell cygpath -w $(ABS_DIST) | sed -e 's|\\\\|/|g')
+endif
+NSPR_LIBDIR = $(firstword $(filter -L%,$(NSPR_LIBS)))
+ifneq (,$(strip $(NSPR_LIBDIR)))
+NSPR_LIBDIR := $(subst -L,,$(subst -L$(DIST),-L$(ABS_DIST),$(NSPR_LIBDIR)))
+else
+NSPR_LIBDIR = $(ABS_DIST)/lib
+endif
 # NSS makefiles are not safe for parallel execution.
 DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1
 DEFAULT_GMAKE_FLAGS += CC="$(CC)"
-DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="-I$(MOZ_BUILD_ROOT)/dist/include/nspr -I$(MOZ_BUILD_ROOT)/dist/include/dbm"
-DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(MOZ_BUILD_ROOT)/dist
-DEFAULT_GMAKE_FLAGS += DIST=$(MOZ_BUILD_ROOT)/dist
+DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="$(subst -I$(DIST),-I$(ABS_DIST),$(NSPR_CFLAGS) -I$(DIST)/include/dbm)"
+DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(ABS_DIST)
+DEFAULT_GMAKE_FLAGS += DIST=$(ABS_DIST)
+DEFAULT_GMAKE_FLAGS += NSPR_LIBDIR=$(NSPR_LIBDIR)
 DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1
 DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1
 ABS_topsrcdir   := $(shell cd $(topsrcdir); pwd)
Index: mozilla/security/nss/lib/ckfw/builtins/Makefile
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/builtins/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- mozilla/security/nss/lib/ckfw/builtins/Makefile	20 Jan 2005 02:25:46 -0000	1.14
+++ mozilla/security/nss/lib/ckfw/builtins/Makefile	11 Apr 2005 20:21:57 -0000
@@ -53,23 +53,23 @@
 # This is merely an expedient hack and not the right solution.
 ifdef NS_USE_GCC
 EXTRA_LIBS += \
-	-L$(DIST)/lib \
+	-L$(NSPR_LIBDIR) \
 	-lplc4 \
 	-lplds4 \
 	-lnspr4 \
 	$(NULL)
 else
 EXTRA_LIBS += \
-	$(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4_s.lib \
-	$(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4_s.lib \
+	$(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plc4_s.lib \
+	$(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plds4_s.lib \
 	$(NULL)
 endif
 
 else
 
 EXTRA_LIBS += \
-	$(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
-	$(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
+	$(NSPR_LIBDIR)/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
+	$(NSPR_LIBDIR)/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
 	$(NULL)
 
 endif
Index: mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile	25 Apr 2004 15:03:08 -0000	1.18
+++ mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile	11 Apr 2005 20:21:57 -0000
@@ -63,7 +63,7 @@
 	$(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
 	$(CRYPTO_LIB) \
 	$(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \
-	-L$(DIST)/lib \
+	-L$(NSPR_LIBDIR) \
 	-lplc4 \
 	-lplds4 \
 	-lnspr4 \
@@ -76,8 +76,8 @@
 	$(DIST)/lib/softokn.lib \
 	$(CRYPTO_LIB) \
 	$(DIST)/lib/secutil.lib \
-	$(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4_s.lib \
-	$(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4_s.lib \
+	$(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plc4_s.lib \
+	$(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plds4_s.lib \
 	wsock32.lib \
 	winmm.lib \
 	$(NULL)
@@ -98,8 +98,8 @@
 	$(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
 	$(CRYPTO_LIB) \
 	$(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \
-	$(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
-	$(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
+	$(NSPR_LIBDIR)/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
+	$(NSPR_LIBDIR)/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
 	$(NULL)
 
 endif

firefox-1.1-uriloader.patch:

--- NEW FILE firefox-1.1-uriloader.patch ---
Index: uriloader/exthandler/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/uriloader/exthandler/Makefile.in,v
retrieving revision 1.60
diff -d -u -p -r1.60 Makefile.in
--- uriloader/exthandler/Makefile.in	2 May 2005 16:30:03 -0000	1.60
+++ uriloader/exthandler/Makefile.in	21 Jul 2005 03:07:39 -0000
@@ -102,7 +102,7 @@ endif
 LOCAL_INCLUDES = -I$(srcdir)
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-OSHELPER	+= nsGNOMERegistry.cpp
+OSHELPER	+= nsMIMEInfoUnix.cpp nsGNOMERegistry.cpp
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
Index: uriloader/exthandler/unix/nsGNOMERegistry.cpp
===================================================================
RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsGNOMERegistry.cpp,v
retrieving revision 1.10
diff -d -u -p -r1.10 nsGNOMERegistry.cpp
--- uriloader/exthandler/unix/nsGNOMERegistry.cpp	16 Oct 2004 13:46:17 -0000	1.10
+++ uriloader/exthandler/unix/nsGNOMERegistry.cpp	21 Jul 2005 03:07:40 -0000
@@ -42,7 +42,7 @@
 #include "nsString.h"
 #include "nsIComponentManager.h"
 #include "nsILocalFile.h"
-#include "nsMIMEInfoImpl.h"
+#include "nsMIMEInfoUnix.h"
 #include "nsAutoPtr.h"
 
 #include <glib.h>
@@ -56,12 +56,12 @@ typedef struct _GConfClient GConfClient;
 typedef struct _GnomeProgram GnomeProgram;
 typedef struct _GnomeModuleInfo GnomeModuleInfo;
 
-typedef struct {
+struct GnomeVFSMimeApplication {
   char *id;
   char *name;
   char *command;
   /* there is more here, but we don't need it */
-} GnomeVFSMimeApplication;
+};
 
 typedef GConfClient * (*_gconf_client_get_default_fn)();
 typedef gchar * (*_gconf_client_get_string_fn)(GConfClient *,
@@ -264,7 +264,7 @@ nsGNOMERegistry::GetAppDescForScheme(con
 }
 
 
-/* static */ already_AddRefed<nsMIMEInfoBase>
+/* static */ already_AddRefed<nsMIMEInfoUnix>
 nsGNOMERegistry::GetFromExtension(const char *aFileExt)
 {
   if (!gconfLib)
@@ -286,7 +286,7 @@ nsGNOMERegistry::GetFromExtension(const 
   return GetFromType(mimeType);
 }
 
-/* static */ already_AddRefed<nsMIMEInfoBase>
+/* static */ already_AddRefed<nsMIMEInfoUnix>
 nsGNOMERegistry::GetFromType(const char *aMIMEType)
 {
   if (!gconfLib)
@@ -296,9 +296,11 @@ nsGNOMERegistry::GetFromType(const char 
   if (!handlerApp)
     return nsnull;
 
-  nsRefPtr<nsMIMEInfoImpl> mimeInfo = new nsMIMEInfoImpl(aMIMEType);
+  nsRefPtr<nsMIMEInfoUnix> mimeInfo = new nsMIMEInfoUnix(aMIMEType);
   NS_ENSURE_TRUE(mimeInfo, nsnull);
 
+  mimeInfo->SetDefaultGnomeVFSMimeApplication(handlerApp);
+
   // Get the list of extensions and append then to the mimeInfo.
   GList *extensions = _gnome_vfs_mime_get_extensions_list(aMIMEType);
   for (GList *extension = extensions; extension; extension = extension->next)
@@ -320,11 +322,21 @@ nsGNOMERegistry::GetFromType(const char 
     return nsnull;
   }
 
-  gchar *commandPath = g_find_program_in_path(nativeCommand);
+  gchar **argv;
+  gboolean res = g_shell_parse_argv(nativeCommand, NULL, &argv, NULL);
+  if (!res) {
+    NS_ERROR("Could not convert helper app command to filesystem encoding");
+    _gnome_vfs_mime_application_free(handlerApp);
+    return nsnull;
+  }
+
+  gchar *commandPath = g_find_program_in_path(argv[0]);
 
   g_free(nativeCommand);
+  g_strfreev(argv);
 
   if (!commandPath) {
+    NS_WARNING("could not find command in path");
     _gnome_vfs_mime_application_free(handlerApp);
     return nsnull;
   }
@@ -342,7 +354,7 @@ nsGNOMERegistry::GetFromType(const char 
 
   _gnome_vfs_mime_application_free(handlerApp);
 
-  nsMIMEInfoBase* retval;
+  nsMIMEInfoUnix* retval;
   NS_ADDREF((retval = mimeInfo));
   return retval;
 }
Index: uriloader/exthandler/unix/nsGNOMERegistry.h
===================================================================
RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsGNOMERegistry.h,v
retrieving revision 1.3
diff -d -u -p -r1.3 nsGNOMERegistry.h
--- uriloader/exthandler/unix/nsGNOMERegistry.h	16 Oct 2004 13:46:17 -0000	1.3
+++ uriloader/exthandler/unix/nsGNOMERegistry.h	21 Jul 2005 03:07:40 -0000
@@ -35,10 +35,13 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#ifndef nsGNOMERegistry_h__
+#define nsGNOMERegistry_h__
+
 #include "nsIURI.h"
 #include "nsCOMPtr.h"
 
-class nsMIMEInfoBase;
+class nsMIMEInfoUnix;
 
 class nsGNOMERegistry
 {
@@ -52,7 +55,9 @@ class nsGNOMERegistry
   static void GetAppDescForScheme(const nsACString& aScheme,
                                   nsAString& aDesc);
 
-  static already_AddRefed<nsMIMEInfoBase> GetFromExtension(const char *aFileExt);
+  static already_AddRefed<nsMIMEInfoUnix> GetFromExtension(const char *aFileExt);
 
-  static already_AddRefed<nsMIMEInfoBase> GetFromType(const char *aMIMEType);
+  static already_AddRefed<nsMIMEInfoUnix> GetFromType(const char *aMIMEType);
 };
+
+#endif // nsGNOMERegistry_h__
Index: uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
===================================================================
RCS file: uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
diff -N uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ uriloader/exthandler/unix/nsMIMEInfoUnix.cpp	21 Jul 2005 03:07:40 -0000
@@ -0,0 +1,196 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org Code.
+ *
+ * The Initial Developer of the Original Code is
+ * Red Hat, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2005
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Christopher Aillon <caillon at redhat.com> (Original author)
+ *
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsMIMEInfoUnix.h"
+#include "prlink.h"
+#include "prmem.h"
+#include <glib.h>
+#include <glib-object.h>
+
+static PRLibrary *gnomeLib;
+static PRLibrary *vfsLib;
+
+typedef struct _GnomeProgram GnomeProgram;
+typedef struct _GnomeModuleInfo GnomeModuleInfo;
+
+typedef enum {
+  GNOME_VFS_OK // there's more but we don't care about them.
+} GnomeVFSResult;
+
+typedef GnomeVFSResult (*_gnome_vfs_mime_application_launch_fn)
+                              (GnomeVFSMimeApplication *app,
+                               GList *uris);
+typedef void (*_gnome_vfs_mime_application_free_fn)(GnomeVFSMimeApplication *);
+typedef GnomeVFSMimeApplication * (*_gnome_vfs_mime_application_copy_fn)(GnomeVFSMimeApplication *);
+typedef GnomeProgram * (*_gnome_program_init_fn)(const char *, const char *,
+						 const GnomeModuleInfo *, int,
+						 char **, const char *, ...);
+typedef const char * (*_gnome_vfs_mime_application_get_name_fn)(GnomeVFSMimeApplication *);
+typedef const GnomeModuleInfo * (*_libgnome_module_info_get_fn)();
+typedef GnomeProgram * (*_gnome_program_get_fn)();
+typedef char * (*_gnome_vfs_make_uri_from_input_fn)(const char *);
+
+#define DECL_FUNC_PTR(func) static _##func##_fn _##func
+
+DECL_FUNC_PTR(gnome_vfs_mime_application_launch);
+DECL_FUNC_PTR(gnome_vfs_mime_application_free);
+DECL_FUNC_PTR(gnome_vfs_mime_application_copy);
+DECL_FUNC_PTR(gnome_vfs_mime_application_get_name);
+DECL_FUNC_PTR(gnome_program_init);
+DECL_FUNC_PTR(gnome_program_get);
+DECL_FUNC_PTR(libgnome_module_info_get);
+DECL_FUNC_PTR(gnome_vfs_make_uri_from_input);
+
+static PRLibrary *
+LoadVersionedLibrary(const char* libName, const char* libVersion)
+{
+  char *platformLibName = PR_GetLibraryName(nsnull, libName);
+  nsCAutoString versionLibName(platformLibName);
+  versionLibName.Append(libVersion);
+  PR_Free(platformLibName);
+  return PR_LoadLibrary(versionLibName.get());
+}
+
+static void
+Cleanup()
+{
+  // Unload all libraries
+  if (gnomeLib)
+    PR_UnloadLibrary(gnomeLib);
+  if (vfsLib)
+    PR_UnloadLibrary(vfsLib);
+
+  gnomeLib = vfsLib = nsnull;
+}
+
+static void
+InitGnomeVFS()
+{
+  static PRBool initialized = PR_FALSE;
+
+  if (initialized)
+    return;
+
+  #define ENSURE_LIB(lib) \
+    PR_BEGIN_MACRO \
+    if (!lib) { \
+      Cleanup(); \
+      return; \
+    } \
+    PR_END_MACRO
+
+  #define GET_LIB_FUNCTION(lib, func, failure) \
+    PR_BEGIN_MACRO \
+    _##func = (_##func##_fn) PR_FindFunctionSymbol(lib##Lib, #func); \
+    if (!_##func) { \
+      failure; \
+    } \
+    PR_END_MACRO
+
+  // Attempt to open libgnome
+  gnomeLib = LoadVersionedLibrary("gnome-2", ".0");
+  ENSURE_LIB(gnomeLib);
+
+  GET_LIB_FUNCTION(gnome, gnome_program_init, return Cleanup());
+  GET_LIB_FUNCTION(gnome, libgnome_module_info_get, return Cleanup());
+  GET_LIB_FUNCTION(gnome, gnome_program_get, return Cleanup());
+
+  // Attempt to open libgnomevfs
+  vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0");
+  ENSURE_LIB(vfsLib);
+
+  GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_launch, /* do nothing */);
+  GET_LIB_FUNCTION(vfs, gnome_vfs_make_uri_from_input, return Cleanup());
+  GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_get_name, return Cleanup());
+  GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_free, return Cleanup());
+  GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_copy, return Cleanup());
+
+  // Initialize GNOME, if it's not already initialized.  It's not
+  // necessary to tell GNOME about our actual command line arguments.
+
+  if (!_gnome_program_get()) {
+    char *argv[1] = { "gecko" };
+    _gnome_program_init("Gecko", "1.0", _libgnome_module_info_get(),
+                        1, argv, NULL);
+  }
+
+  // Note: after GNOME has been initialized, do not ever unload these
+  // libraries.  They register atexit handlers, so if they are unloaded, we'll
+  // crash on exit.  
+}
+
+void
+nsMIMEInfoUnix::SetDefaultGnomeVFSMimeApplication(GnomeVFSMimeApplication* app)
+{
+  if (_gnome_vfs_mime_application_copy && _gnome_vfs_mime_application_free) {
+    mDefaultVFSApplication = _gnome_vfs_mime_application_copy(app);
+
+    mPreferredAction = nsIMIMEInfo::useSystemDefault;
+
+    const gchar * name = _gnome_vfs_mime_application_get_name(mDefaultVFSApplication);
+    if (name) 
+      mDefaultAppDescription = NS_ConvertUTF8toUCS2(name);
+  }
+}
+
+nsMIMEInfoUnix::~nsMIMEInfoUnix()
+{
+  if (mDefaultVFSApplication)
+    _gnome_vfs_mime_application_free(mDefaultVFSApplication);
+}
+
+nsresult
+nsMIMEInfoUnix::LaunchDefaultWithFile(nsIFile* aFile)
+{
+  NS_ENSURE_ARG_POINTER(aFile);
+
+  InitGnomeVFS();
+
+  if (_gnome_vfs_mime_application_launch && mDefaultVFSApplication) {
+    nsCAutoString nativePath;
+    aFile->GetNativePath(nativePath);
+
+    gchar *uri = _gnome_vfs_make_uri_from_input(nativePath.get());
+
+    GList *uris = NULL;
+    uris = g_list_append(uris, uri);
+
+    GnomeVFSResult result = _gnome_vfs_mime_application_launch(mDefaultVFSApplication, uris);
+
+    g_free(uri);
+    g_list_free(uris);
+
+    if (result != GNOME_VFS_OK)
+      return NS_ERROR_FAILURE;
+
+    return NS_OK;
+  }
+
+  if (!mDefaultApplication)
+    return NS_ERROR_FILE_NOT_FOUND;
+
+  return LaunchWithIProcess(mDefaultApplication, aFile);
+}
Index: uriloader/exthandler/unix/nsMIMEInfoUnix.h
===================================================================
RCS file: uriloader/exthandler/unix/nsMIMEInfoUnix.h
diff -N uriloader/exthandler/unix/nsMIMEInfoUnix.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ uriloader/exthandler/unix/nsMIMEInfoUnix.h	21 Jul 2005 03:07:40 -0000
@@ -0,0 +1,50 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org Code.
+ *
+ * The Initial Developer of the Original Code is
+ * Red Hat, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2005
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Christopher Aillon <caillon at redhat.com> (Original author)
+ *
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef nsMimeInfoUnix_h__
+#define nsMimeInfoUnix_h__
+
+#include "nsMIMEInfoImpl.h"
+
+struct GnomeVFSMimeApplication;
+
+class nsMIMEInfoUnix : public nsMIMEInfoImpl
+{
+public:
+  nsMIMEInfoUnix(const char* aType = "") : nsMIMEInfoImpl(aType), mDefaultVFSApplication(nsnull) {}
+  nsMIMEInfoUnix(const nsACString& aMIMEType) : nsMIMEInfoImpl(aMIMEType) {};
+
+  virtual ~nsMIMEInfoUnix();
+
+  void SetDefaultGnomeVFSMimeApplication(GnomeVFSMimeApplication *app);
+
+protected:
+  virtual NS_HIDDEN_(nsresult) LaunchDefaultWithFile(nsIFile* aFile);
+
+  GnomeVFSMimeApplication *mDefaultVFSApplication;
+};
+ 
+#endif // nsMimeInfoUnix_h__
Index: uriloader/exthandler/unix/nsOSHelperAppService.cpp
===================================================================
RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp,v
retrieving revision 1.58
diff -d -u -p -r1.58 nsOSHelperAppService.cpp
--- uriloader/exthandler/unix/nsOSHelperAppService.cpp	25 Oct 2004 07:46:01 -0000	1.58
+++ uriloader/exthandler/unix/nsOSHelperAppService.cpp	21 Jul 2005 03:07:40 -0000
@@ -44,6 +44,7 @@
 #include "nsOSHelperAppService.h"
 #ifdef MOZ_WIDGET_GTK2
 #include "nsGNOMERegistry.h"
+#include "nsMIMEInfoUnix.h"
 #endif
 #include "nsISupports.h"
 #include "nsString.h"
@@ -1486,6 +1487,17 @@ nsOSHelperAppService::GetFromType(const 
   
   LOG(("Here we do a mimetype lookup for '%s'\n", aMIMEType.get()));
 
+#ifdef MOZ_WIDGET_GTK2
+  // Look in GNOME registry first since it is the preferred method in GNOME,
+  // should trump the mailcap entry
+  LOG(("Looking in GNOME registry\n"));
+  nsMIMEInfoBase *gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType.get()).get();
+  if (gnomeInfo) {
+    LOG(("Got MIMEInfo from GNOME registry\n"));
+    return gnomeInfo;
+  }
+#endif
+
   // extract the major and minor types
   NS_ConvertASCIItoUTF16 mimeType(aMIMEType);
   nsAString::const_iterator start_iter, end_iter,
@@ -1522,21 +1534,6 @@ nsOSHelperAppService::GetFromType(const 
                                 mozillaFlags,
                                 PR_TRUE);
 
-  
-  if (handler.IsEmpty() && extensions.IsEmpty() &&
-      mailcap_description.IsEmpty() && mime_types_description.IsEmpty()) {
-    // No useful data yet
-    
-#ifdef MOZ_WIDGET_GTK2
-    LOG(("Looking in GNOME registry\n"));
-    nsMIMEInfoBase *gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType.get()).get();
-    if (gnomeInfo) {
-      LOG(("Got MIMEInfo from GNOME registry\n"));
-      return gnomeInfo;
-    }
-#endif
-  }
-
   if (handler.IsEmpty() && mailcap_description.IsEmpty()) {
     DoLookUpHandlerAndDescription(majorType,
                                   minorType,

firefox-1.5-with-system-nss.patch:

--- NEW FILE firefox-1.5-with-system-nss.patch ---
Index: mozilla/configure.in
===================================================================
RCS file: /cvsroot/mozilla/configure.in,v
retrieving revision 1.1503.2.15
diff -u -r1.1503.2.15 configure.in
--- mozilla/configure.in	4 Oct 2005 05:53:49 -0000	1.1503.2.15
+++ mozilla/configure.in	15 Dec 2005 05:40:40 -0000
@@ -86,6 +86,7 @@
 MOZPNG=10207
 MOZZLIB=1.2.3
 NSPR_VERSION=4
+NSS_VERSION=3
 
 dnl Set the minimum version of toolkit libs used by mozilla
 dnl ========================================================
@@ -3472,6 +3473,19 @@
     fi
 fi
 
+dnl ========================================================
+dnl = If NSS was not detected in the system, 
+dnl = use the one in the source tree (mozilla/security/nss)
+dnl ========================================================
+
+MOZ_ARG_WITH_BOOL(system-nss,
+[  --with-system-nss      Use system installed NSS],
+    _USE_SYSTEM_NSS=1 )
+
+if test -n "$_USE_SYSTEM_NSS"; then
+    AM_PATH_NSS(3.0.0, [MOZ_NATIVE_NSS=1], [MOZ_NATIVE_NSS=])
+fi
+
 if test -z "$SKIP_LIBRARY_CHECKS"; then
 dnl system JPEG support
 dnl ========================================================
@@ -6698,6 +6712,10 @@
 AC_SUBST(NSPR_LIBS)
 AC_SUBST(MOZ_NATIVE_NSPR)
 
+AC_SUBST(NSS_CFLAGS)
+AC_SUBST(NSS_LIBS)
+AC_SUBST(MOZ_NATIVE_NSS)
+
 AC_SUBST(CFLAGS)
 AC_SUBST(CXXFLAGS)
 AC_SUBST(CPPFLAGS)
Index: mozilla/configure
===================================================================
RCS file: /cvsroot/mozilla/configure,v
retrieving revision 1.1492.2.17
diff -u -r1.1492.2.17 configure
--- mozilla/configure	4 Oct 2005 06:01:48 -0000	1.1492.2.17
+++ mozilla/configure	15 Dec 2005 05:40:53 -0000
@@ -44,6 +44,13 @@
   --with-nspr-exec-prefix=PFX
                           Exec prefix where NSPR is installed"
 ac_help="$ac_help
+  --with-system-nss      Use system installed NSS"
+ac_help="$ac_help
+  --with-nss-prefix=PFX  Prefix where NSS is installed"
+ac_help="$ac_help
+  --with-nss-exec-prefix=PFX
+                          Exec prefix where NSS is installed"
+ac_help="$ac_help
   --with-system-jpeg[=PFX]
                           Use system libjpeg [installed at prefix PFX]"
 ac_help="$ac_help
@@ -1020,6 +1027,7 @@
 MOZPNG=10207
 MOZZLIB=1.2.3
 NSPR_VERSION=4
+NSS_VERSION=3
 
 GLIB_VERSION=1.2.0
 GTK_VERSION=1.2.0
@@ -11300,6 +11308,123 @@
     fi
 fi
 
+
+# Check whether --with-system-nss or --without-system-nss was given.
+if test "${with_system_nss+set}" = set; then
+  withval="$with_system_nss"
+  if test "$withval" = "yes"; then
+    _USE_SYSTEM_NSS=1 
+  elif test "$withval" = "no"; then
+    :
+  else
+    { echo "configure: error: Option, system-nss, does not take an argument ($withval)." 1>&2; exit 1; }
+  fi
+fi
+
+
+if test -n "$_USE_SYSTEM_NSS"; then
+    
+# Check whether --with-nss-prefix or --without-nss-prefix was given.
+if test "${with_nss_prefix+set}" = set; then
+  withval="$with_nss_prefix"
+  nss_config_prefix="$withval"
+else
+  nss_config_prefix=""
+fi
+
+
+# Check whether --with-nss-exec-prefix or --without-nss-exec-prefix was given.
+if test "${with_nss_exec_prefix+set}" = set; then
+  withval="$with_nss_exec_prefix"
+  nss_config_exec_prefix="$withval"
+else
+  nss_config_exec_prefix=""
+fi
+
+
+	if test -n "$nss_config_exec_prefix"; then
+		nss_config_args="$nss_config_args --exec-prefix=$nss_config_exec_prefix"
+		if test -z "$NSS_CONFIG"; then
+			NSS_CONFIG=$nss_config_exec_prefix/bin/nss-config
+		fi
+	fi
+	if test -n "$nss_config_prefix"; then
+		nss_config_args="$nss_config_args --prefix=$nss_config_prefix"
+		if test -z "$NSS_CONFIG"; then
+			NSS_CONFIG=$nss_config_prefix/bin/nss-config
+		fi
+	fi
+
+	unset ac_cv_path_NSS_CONFIG
+	# Extract the first word of "nss-config", so it can be a program name with args.
+set dummy nss-config; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:11363: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_NSS_CONFIG'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$NSS_CONFIG" in
+  /*)
+  ac_cv_path_NSS_CONFIG="$NSS_CONFIG" # Let the user override the test with a path.
+  ;;
+  ?:/*)			 
+  ac_cv_path_NSS_CONFIG="$NSS_CONFIG" # Let the user override the test with a dos path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_NSS_CONFIG="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_NSS_CONFIG" && ac_cv_path_NSS_CONFIG="no"
+  ;;
+esac
+fi
+NSS_CONFIG="$ac_cv_path_NSS_CONFIG"
+if test -n "$NSS_CONFIG"; then
+  echo "$ac_t""$NSS_CONFIG" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+	min_nss_version=3.0.0
+	echo $ac_n "checking for NSS - version >= $min_nss_version (skipping)""... $ac_c" 1>&6
+echo "configure:11398: checking for NSS - version >= $min_nss_version (skipping)" >&5
+
+	no_nss=""
+	if test "$NSS_CONFIG" = "no"; then
+		no_nss="yes"
+	else
+		NSS_CFLAGS=`$NSS_CONFIG $nss_config_args --cflags`
+		NSS_LIBS=`$NSS_CONFIG $nss_config_args --libs`
+
+				nss_config_major_version=`$NSS_CONFIG $nss_config_args --version | \
+			sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+		nss_config_minor_version=`$NSS_CONFIG $nss_config_args --version | \
+			sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
+		nss_config_micro_version=`$NSS_CONFIG $nss_config_args --version | \
+			sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
+	fi
+
+	if test -z "$no_nss"; then
+		echo "$ac_t""yes" 1>&6
+		MOZ_NATIVE_NSS=1     
+	else
+		echo "$ac_t""no" 1>&6
+	fi
+
+
+	
+	
+
+
+fi
+
 if test -z "$SKIP_LIBRARY_CHECKS"; then
 # Check whether --with-system-jpeg or --without-system-jpeg was given.
 if test "${with_system_jpeg+set}" = set; then
@@ -19473,6 +19602,9 @@
 s%@NSPR_CONFIG@%$NSPR_CONFIG%g
 s%@NSPR_CFLAGS@%$NSPR_CFLAGS%g
 s%@NSPR_LIBS@%$NSPR_LIBS%g
+s%@NSS_CONFIG@%$NSS_CONFIG%g
+s%@NSS_CFLAGS@%$NSS_CFLAGS%g
+s%@NSS_LIBS@%$NSS_LIBS%g
 s%@GTK_CONFIG@%$GTK_CONFIG%g
 s%@GTK_CFLAGS@%$GTK_CFLAGS%g
 s%@GTK_LIBS@%$GTK_LIBS%g
@@ -19753,6 +19885,7 @@
 s%@MOZ_PNG_CFLAGS@%$MOZ_PNG_CFLAGS%g
 s%@MOZ_PNG_LIBS@%$MOZ_PNG_LIBS%g
 s%@MOZ_NATIVE_NSPR@%$MOZ_NATIVE_NSPR%g
+s%@MOZ_NATIVE_NSS@%$MOZ_NATIVE_NSS%g
 s%@COMPILE_CFLAGS@%$COMPILE_CFLAGS%g
 s%@COMPILE_CXXFLAGS@%$COMPILE_CXXFLAGS%g
 s%@CROSS_COMPILE@%$CROSS_COMPILE%g
Index: mozilla/aclocal.m4
===================================================================
RCS file: /cvsroot/mozilla/aclocal.m4,v
retrieving revision 1.14
diff -u -r1.14 aclocal.m4
--- mozilla/aclocal.m4	13 May 2004 03:12:47 -0000	1.14
+++ mozilla/aclocal.m4	15 Dec 2005 05:40:53 -0000
@@ -8,6 +8,7 @@
 builtin(include, build/autoconf/libIDL.m4)dnl
 builtin(include, build/autoconf/libIDL-2.m4)dnl
 builtin(include, build/autoconf/nspr.m4)dnl
+builtin(include, build/autoconf/nss.m4)dnl
 builtin(include, build/autoconf/libart.m4)dnl
 builtin(include, build/autoconf/pkg.m4)dnl
 builtin(include, build/autoconf/freetype2.m4)dnl
Index: mozilla/config/autoconf.mk.in
===================================================================
RCS file: /cvsroot/mozilla/config/autoconf.mk.in,v
retrieving revision 3.363.2.1
diff -u -r3.363.2.1 autoconf.mk.in
--- mozilla/config/autoconf.mk.in	17 Aug 2005 17:17:17 -0000	3.363.2.1
+++ mozilla/config/autoconf.mk.in	15 Dec 2005 05:40:53 -0000
@@ -229,6 +229,7 @@
 MOZ_INSURE_EXCLUDE_DIRS = @MOZ_INSURE_EXCLUDE_DIRS@
 
 MOZ_NATIVE_NSPR = @MOZ_NATIVE_NSPR@
+MOZ_NATIVE_NSS = @MOZ_NATIVE_NSS@
 
 CROSS_COMPILE   = @CROSS_COMPILE@
 
@@ -384,6 +385,48 @@
 NSPR_CFLAGS	= @NSPR_CFLAGS@
 NSPR_LIBS	= @NSPR_LIBS@
 
+NSS_CONFIG	= @NSS_CONFIG@
+NSS_CFLAGS	= @NSS_CFLAGS@
+NSS_LIBS	= @NSS_LIBS@
+
+ifdef MOZ_NATIVE_NSS
+NSS_DEP_LIBS	= \
+	$(NULL)
+NSS_LIBS += \
+	-lcrmf \
+	$(NULL)
+else
+NSS_DEP_LIBS	= \
+	$(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \
+	$(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \
+	$(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \
+	$(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \
+	$(NULL)
+NSS_LIBS = \
+	$(LIBS_DIR) \
+	$(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
+	-lsmime3 \
+	-lssl3 \
+	-lnss3 \
+	-lsoftokn3 \
+	$(NULL)
+endif
+
+ifneq (,$(filter OS2 WINNT WINCE, $(OS_ARCH)))
+ifndef GNU_CC
+ifndef MOZ_NATIVE_NSS
+NSS_LIBS	= \
+	$(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)smime3.$(IMPORT_LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)ssl3.$(IMPORT_LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)nss3.$(IMPORT_LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)softokn3.$(IMPORT_LIB_SUFFIX) \
+	$(NULL)
+endif
+endif
+endif
+
 LDAP_CFLAGS	= @LDAP_CFLAGS@
 LDAP_LIBS	= @LDAP_LIBS@
 XPCOM_GLUE_LDOPTS = @XPCOM_GLUE_LDOPTS@
Index: mozilla/config/config.mk
===================================================================
RCS file: /cvsroot/mozilla/config/config.mk,v
retrieving revision 3.337
diff -u -r3.337 config.mk
--- mozilla/config/config.mk	28 Jul 2005 19:48:11 -0000	3.337
+++ mozilla/config/config.mk	15 Dec 2005 05:40:54 -0000
@@ -138,39 +138,6 @@
 FINAL_LINK_COMPS = $(DEPTH)/config/final-link-comps
 FINAL_LINK_COMP_NAMES = $(DEPTH)/config/final-link-comp-names
 
-# 
-# NSS libs needed for final link in static build
-# 
-
-NSS_LIBS	= \
-	$(LIBS_DIR) \
-	$(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
-	-lsmime3 \
-	-lssl3 \
-	-lnss3 \
-	-lsoftokn3 \
-	$(NULL)
-
-ifneq (,$(filter OS2 WINNT WINCE, $(OS_ARCH)))
-ifndef GNU_CC
-NSS_LIBS	= \
-	$(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
-	$(DIST)/lib/$(LIB_PREFIX)smime3.$(IMPORT_LIB_SUFFIX) \
-	$(DIST)/lib/$(LIB_PREFIX)ssl3.$(IMPORT_LIB_SUFFIX) \
-	$(DIST)/lib/$(LIB_PREFIX)nss3.$(IMPORT_LIB_SUFFIX) \
-	$(DIST)/lib/$(LIB_PREFIX)softokn3.$(IMPORT_LIB_SUFFIX) \
-	$(NULL)
-endif
-endif
-
-NSS_DEP_LIBS	= \
-	$(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
-	$(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \
-	$(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \
-	$(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \
-	$(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \
-	$(NULL)
-
 MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX)
 MOZ_REGISTRY_LIBS          = $(DIST)/lib/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX)
 MOZ_WIDGET_SUPPORT_LIBS    = $(DIST)/lib/$(LIB_PREFIX)widgetsupport_s.$(LIB_SUFFIX)
Index: mozilla/build/autoconf/nss.m4
===================================================================
RCS file: mozilla/build/autoconf/nss.m4
diff -N mozilla/build/autoconf/nss.m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ mozilla/build/autoconf/nss.m4	15 Dec 2005 05:40:54 -0000
@@ -0,0 +1,67 @@
+# -*- tab-width: 4; -*-
+# Configure paths for NSS
+# Public domain - Chris Seawood <cls at seawood.org> 2001-04-05
+# Based upon gtk.m4 (also PD) by Owen Taylor
+
+dnl AM_PATH_NSS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl Test for NSS, and define NSS_CFLAGS and NSS_LIBS
+AC_DEFUN(AM_PATH_NSS,
+[dnl
+
+AC_ARG_WITH(nss-prefix,
+	[  --with-nss-prefix=PFX  Prefix where NSS is installed],
+	nss_config_prefix="$withval",
+	nss_config_prefix="")
+
+AC_ARG_WITH(nss-exec-prefix,
+	[  --with-nss-exec-prefix=PFX
+                          Exec prefix where NSS is installed],
+	nss_config_exec_prefix="$withval",
+	nss_config_exec_prefix="")
+
+	if test -n "$nss_config_exec_prefix"; then
+		nss_config_args="$nss_config_args --exec-prefix=$nss_config_exec_prefix"
+		if test -z "$NSS_CONFIG"; then
+			NSS_CONFIG=$nss_config_exec_prefix/bin/nss-config
+		fi
+	fi
+	if test -n "$nss_config_prefix"; then
+		nss_config_args="$nss_config_args --prefix=$nss_config_prefix"
+		if test -z "$NSS_CONFIG"; then
+			NSS_CONFIG=$nss_config_prefix/bin/nss-config
+		fi
+	fi
+
+	unset ac_cv_path_NSS_CONFIG
+	AC_PATH_PROG(NSS_CONFIG, nss-config, no)
+	min_nss_version=ifelse([$1], ,3.0.0,$1)
+	AC_MSG_CHECKING(for NSS - version >= $min_nss_version (skipping))
+
+	no_nss=""
+	if test "$NSS_CONFIG" = "no"; then
+		no_nss="yes"
+	else
+		NSS_CFLAGS=`$NSS_CONFIG $nss_config_args --cflags`
+		NSS_LIBS=`$NSS_CONFIG $nss_config_args --libs`
+
+		dnl Skip version check for now
+		nss_config_major_version=`$NSS_CONFIG $nss_config_args --version | \
+			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+		nss_config_minor_version=`$NSS_CONFIG $nss_config_args --version | \
+			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+		nss_config_micro_version=`$NSS_CONFIG $nss_config_args --version | \
+			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+	fi
+
+	if test -z "$no_nss"; then
+		AC_MSG_RESULT(yes)
+		ifelse([$2], , :, [$2])     
+	else
+		AC_MSG_RESULT(no)
+	fi
+
+
+	AC_SUBST(NSS_CFLAGS)
+	AC_SUBST(NSS_LIBS)
+
+])
Index: mozilla/security/manager/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/security/manager/Makefile.in,v
retrieving revision 1.57
diff -u -r1.57 Makefile.in
--- mozilla/security/manager/Makefile.in	2 Jun 2005 02:03:05 -0000	1.57
+++ mozilla/security/manager/Makefile.in	15 Dec 2005 05:40:54 -0000
@@ -46,6 +46,8 @@
 MODULE = psm
 
 PACKAGE_FILE = psm.pkg
+
+ifndef MOZ_NATIVE_NSS
 PACKAGE_VARS += \
 	NSS3_LIB \
 	SMIME3_LIB \
@@ -57,6 +59,7 @@
 	$(NULL)
 
 LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
+endif
 
 NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
 SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
@@ -147,6 +150,7 @@
 export:: .nss.cleaned
 
 .nss.cleaned: .nss.checkout
+ifndef MOZ_NATIVE_NSS
 	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
 	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
 ifndef SKIP_CHK
@@ -154,9 +158,12 @@
 	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
 endif
 	touch $@
+endif
 
 .nss.checkout:
+ifndef MOZ_NATIVE_NSS
 	touch $(srcdir)/$@
+endif
 
 dependclean export packages chrome::
 	$(MAKE) -C boot $@
@@ -167,12 +174,15 @@
 endif
 
 libs::
+ifndef MOZ_NATIVE_NSS
 	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
+endif
 ifeq ($(OS_ARCH),WINNT)
 	cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
 else
 	cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
 endif
+ifndef MOZ_NATIVE_NSS
 	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
 ifndef SKIP_CHK
 	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
@@ -210,6 +220,7 @@
 	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin
 endif
 endif
+endif
 	$(MAKE) -C boot $@
 	$(MAKE) -C ssl $@
 	$(MAKE) -C locales $@
@@ -218,6 +229,7 @@
 endif
 
 install::
+ifndef MOZ_NATIVE_NSS
 	$(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir)
 ifndef SKIP_CHK
 	$(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
@@ -232,6 +244,7 @@
 	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir)
 	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir)
 endif
+endif
 	$(MAKE) -C boot $@
 	$(MAKE) -C ssl $@
 	$(MAKE) -C locales $@
@@ -246,15 +259,18 @@
 ifdef MOZ_XUL
 	$(MAKE) -C pki $@
 endif
+ifndef MOZ_NATIVE_NSS
 	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
 	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
 ifndef SKIP_CHK
 	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
 	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
 endif
+endif
 
 echo-requires-recursive::
 	$(MAKE) -C boot $@
 	$(MAKE) -C ssl $@
 	$(MAKE) -C pki $@
 	$(MAKE) -C locales $@
+
Index: mozilla/security/manager/ssl/src/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/security/manager/ssl/src/Makefile.in,v
retrieving revision 1.67
diff -u -r1.67 Makefile.in
--- mozilla/security/manager/ssl/src/Makefile.in	3 Aug 2005 05:24:18 -0000	1.67
+++ mozilla/security/manager/ssl/src/Makefile.in	15 Dec 2005 05:40:56 -0000
@@ -123,8 +123,13 @@
 
 # Use local includes because they are inserted before INCLUDES
 # so that Mozilla's nss.h is used, not glibc's
+ifdef MOZ_NATIVE_NSS
+LOCAL_INCLUDES += $(NSS_CFLAGS) \
+                  $(NULL)
+else
 LOCAL_INCLUDES += -I$(DIST)/public/nss \
                   $(NULL)
+endif
 
 EXTRA_DSO_LDOPTS += \
 		$(MOZ_UNICHARUTIL_LIBS) \
Index: mozilla/security/manager/ssl/src/nsNSSComponent.cpp
===================================================================
RCS file: /cvsroot/mozilla/security/manager/ssl/src/nsNSSComponent.cpp,v
retrieving revision 1.126.2.1
diff -u -r1.126.2.1 nsNSSComponent.cpp
--- mozilla/security/manager/ssl/src/nsNSSComponent.cpp	26 Aug 2005 06:41:50 -0000	1.126.2.1
+++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp	15 Dec 2005 05:41:00 -0000
@@ -488,14 +488,6 @@
 }
 
 
-#ifdef XP_MAC
-#ifdef DEBUG
-#define LOADABLE_CERTS_MODULE NS_LITERAL_CSTRING("NSSckbiDebug.shlb")
-#else
-#define LOADABLE_CERTS_MODULE NS_LITERAL_CSTRING("NSSckbi.shlb")
-#endif /*DEBUG*/ 
-#endif /*XP_MAC*/
-
 static void setOCSPOptions(nsIPrefBranch * pref);
 
 NS_IMETHODIMP
@@ -689,40 +681,40 @@
 
     const char *possible_ckbi_locations[] = {
       NS_GRE_DIR,
-      NS_XPCOM_CURRENT_PROCESS_DIR
+      NS_XPCOM_CURRENT_PROCESS_DIR,
+      0
     };
-    
+
     for (size_t il = 0; il < sizeof(possible_ckbi_locations)/sizeof(const char*); ++il) {
       nsCOMPtr<nsILocalFile> mozFile;
-      directoryService->Get( possible_ckbi_locations[il],
-                             NS_GET_IID(nsILocalFile), 
-                             getter_AddRefs(mozFile));
+      char *fullModuleName = nsnull;
+
+      if (!possible_ckbi_locations[il])
+      {
+        fullModuleName = PR_GetLibraryName(nsnull, "nssckbi");
+      }
+      else
+      {
+        directoryService->Get( possible_ckbi_locations[il],
+                               NS_GET_IID(nsILocalFile), 
+                               getter_AddRefs(mozFile));
     
-      if (!mozFile) {
-        continue;
+        if (!mozFile) {
+          continue;
+        }
+
+        nsCAutoString processDir;
+        mozFile->GetNativePath(processDir);
+        fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi");
       }
 
-      char *fullModuleName = nsnull;
-#ifdef XP_MAC
-      nsCAutoString nativePath;
-      mozFile->AppendNative(NS_LITERAL_CSTRING("Essential Files"));
-      mozFile->AppendNative(LOADABLE_CERTS_MODULE);
-      mozFile->GetNativePath(nativePath);    
-      fullModuleName = (char *) nativePath.get();
-#else
-      nsCAutoString processDir;
-      mozFile->GetNativePath(processDir);
-      fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi");
-#endif
       /* If a module exists with the same name, delete it. */
       NS_ConvertUCS2toUTF8 modNameUTF8(modName);
       int modType;
       SECMOD_DeleteModule(NS_CONST_CAST(char*, modNameUTF8.get()), &modType);
       SECStatus rv_add = 
         SECMOD_AddNewModule(NS_CONST_CAST(char*, modNameUTF8.get()), fullModuleName, 0, 0);
-#ifndef XP_MAC
-      PR_Free(fullModuleName); // allocated by NSPR
-#endif
+      PR_FreeLibraryName(fullModuleName); // allocated by NSPR
       if (SECSuccess == rv_add) {
         // found a module, no need to try other directories
         break;

firefox-1.5.0.1-dumpstack.patch:

--- NEW FILE firefox-1.5.0.1-dumpstack.patch ---
Index: mozilla/xpcom/base/nsStackFrameUnix.cpp
===================================================================
RCS file: /cvsroot/mozilla/xpcom/base/nsStackFrameUnix.cpp,v
retrieving revision 1.12
diff -d -u -p -r1.12 nsStackFrameUnix.cpp
--- mozilla/xpcom/base/nsStackFrameUnix.cpp	18 Apr 2004 14:18:12 -0000	1.12
+++ mozilla/xpcom/base/nsStackFrameUnix.cpp	2 Feb 2006 05:29:00 -0000
@@ -90,6 +90,9 @@ void DemangleSymbol(const char * aSymbol
 
 void DumpStackToFile(FILE* aStream)
 {
+  fprintf(aStream, "Stacktrace disabled for now.\n"
+                   "See https://bugzilla.mozilla.org/show_bug.cgi?id=323853\n");
+#if 0
   jmp_buf jb;
   setjmp(jb);
 
@@ -138,6 +141,7 @@ void DumpStackToFile(FILE* aStream)
               symbol, off, info.dli_fname, foff);
     }
   }
+#endif
 }
 
 #elif defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386))

mozilla-1.4.1-ppc64.patch:

--- NEW FILE mozilla-1.4.1-ppc64.patch ---
--- mozilla/security/coreconf/Linux.mk.foo	2003-10-01 13:06:30.000000000 -0400
+++ mozilla/security/coreconf/Linux.mk	2003-10-01 13:07:22.000000000 -0400
@@ -53,7 +53,11 @@
 ifeq ($(OS_TEST),m68k)
 	OS_REL_CFLAGS	= -DLINUX1_2 -D_XOPEN_SOURCE
 	CPU_ARCH	= m68k
-else		
+else
+ifeq ($(OS_TEST),ppc64)
+	OS_REL_CFLAGS	= -DLINUX1_2 -D_XOPEN_SOURCE
+	CPU_ARCH	= ppc64
+else
 ifeq ($(OS_TEST),ppc)
 	OS_REL_CFLAGS	= -DLINUX1_2 -D_XOPEN_SOURCE
 	CPU_ARCH	= ppc
@@ -112,6 +116,7 @@
 endif
 endif
 endif
+endif
 
 
 LIBC_TAG		= _glibc

mozilla-1.7.3-gnome-vfs-default-app.patch:

--- NEW FILE mozilla-1.7.3-gnome-vfs-default-app.patch ---
--- mozilla/uriloader/exthandler/unix/nsGNOMERegistry.cpp.foo	2004-03-06 09:41:00.000000000 -0500
+++ mozilla/uriloader/exthandler/unix/nsGNOMERegistry.cpp	2004-10-18 18:55:55.000000000 -0400
@@ -283,6 +283,11 @@
 
   gchar *nativeCommand = g_filename_from_utf8(handlerApp->command,
                                               -1, NULL, NULL, NULL);
+
+  // Some versions of the mime stuff will add whitespace to the end or
+  // beginning of the command
+  nativeCommand = g_strstrip(nativeCommand);
+
   if (!nativeCommand) {
     NS_ERROR("Could not convert helper app command to filesystem encoding");
     _gnome_vfs_mime_application_free(handlerApp);

mozilla-1.7.5-g-application-name.patch:

--- NEW FILE mozilla-1.7.5-g-application-name.patch ---
Index: xpfe/bootstrap/nsAppRunner.cpp
===================================================================
RCS file: /cvsroot/mozilla/xpfe/bootstrap/nsAppRunner.cpp,v
retrieving revision 1.428
diff -d -u -p -r1.428 nsAppRunner.cpp
--- xpfe/bootstrap/nsAppRunner.cpp	20 Dec 2004 21:53:33 -0000	1.428
+++ xpfe/bootstrap/nsAppRunner.cpp	5 Mar 2005 08:39:12 -0000
@@ -1612,6 +1612,11 @@ static PRBool GetWantSplashScreen(int ar
   return dosplash;
 }
 
+#ifdef MOZ_WIDGET_GTK2
+#include "prlink.h"
+typedef void (*_g_set_application_name_fn)(const gchar *application_name);
+#endif
+
 int main(int argc, char* argv[])
 {
   NS_TIMELINE_MARK("enter main");
@@ -1712,6 +1717,19 @@ int main(int argc, char* argv[])
 #endif
   gtk_init(&argc, &argv);
 
+#if defined(MOZ_WIDGET_GTK2)
+  // g_set_application_name () is only defined in glib2.2 and higher.
+  PRLibrary *glib2;
+  _g_set_application_name_fn _g_set_application_name =
+      (_g_set_application_name_fn)PR_FindFunctionSymbolAndLibrary("g_set_application_name", &glib2);
+  if (_g_set_application_name) {
+    _g_set_application_name("seamonkey"); /* MOZ_APP_NAME */
+  }
+  if (glib2) {
+    PR_UnloadLibrary(glib2);
+  }
+#endif
+
   gtk_widget_set_default_visual(gdk_rgb_get_visual());
   gtk_widget_set_default_colormap(gdk_rgb_get_cmap());
 #endif /* MOZ_WIDGET_GTK || MOZ_WIDGET_GTK2 */

mozilla-nspr-packages.patch:

--- NEW FILE mozilla-nspr-packages.patch ---
--- mozilla/xpinstall/packager/packages-unix.smp5	2005-12-22 16:29:39.000000000 +0100
+++ mozilla/xpinstall/packager/packages-unix	2006-01-21 09:03:04.000000000 +0100
@@ -45,9 +45,6 @@
 
 [xpcom]
 bin/libmozjs.so
-bin/libnspr4.so
-bin/libplc4.so
-bin/libplds4.so
 bin/cpu/sparcv8plus/libnspr_flt4.so
 bin/libxpcom.so
 bin/libxpcom_core.so
@@ -463,18 +460,13 @@
 bin/components/talkback/*
 
 [psm]
-bin/libnssckbi.so
 bin/components/libpipboot.so
 bin/components/pipboot.xpt
 bin/components/libpipnss.so
 bin/components/pipnss.xpt
 bin/components/libpippki.so
 bin/components/pippki.xpt
-bin/libnss3.so
-bin/libsmime3.so
 bin/libsoftokn3.chk
-bin/libsoftokn3.so
-bin/libssl3.so
 bin/chrome/pipnss.jar
 bin/chrome/pippki.jar
 ; These are required for solaris 32-bit builds
@@ -499,5 +491,17 @@
 bin/components/spellchecker.xpt
 bin/components/myspell/*
 
+[nspr]
+bin/libnspr4.so
+bin/libplc4.so
+bin/libplds4.so
+
+[nss]
+bin/libnssckbi.so
+bin/libnss3.so
+bin/libsmime3.so
+bin/libsoftokn3.so
+bin/libssl3.so
+
 [reporter]
 bin/chrome/reporter.jar


--- NEW FILE mozilla-psm-exclude-list ---
libnss3.so
libsmime3.so
libsoftokn3.so
libssl3.so


--- NEW FILE mozilla-xpcom-exclude-list ---
libnspr4.so
libplc4.so
libplds4.so

pango-cairo.patch:

--- NEW FILE pango-cairo.patch ---
Index: config/autoconf.mk.in
===================================================================
RCS file: /cvsroot/mozilla/config/autoconf.mk.in,v
retrieving revision 3.363.2.1
diff -u -p -6 -r3.363.2.1 autoconf.mk.in
--- config/autoconf.mk.in	17 Aug 2005 17:17:17 -0000	3.363.2.1
+++ config/autoconf.mk.in	27 Aug 2005 19:57:29 -0000
@@ -456,12 +456,13 @@ MOZ_XFT_CFLAGS		= @MOZ_XFT_CFLAGS@
 MOZ_XFT_LIBS		= @MOZ_XFT_LIBS@
 MOZ_ENABLE_COREXFONTS	= @MOZ_ENABLE_COREXFONTS@
 
 MOZ_ENABLE_PANGO        = @MOZ_ENABLE_PANGO@
 MOZ_PANGO_CFLAGS        = @MOZ_PANGO_CFLAGS@
 MOZ_PANGO_LIBS          = @MOZ_PANGO_LIBS@
+MOZ_PANGOCAIRO          = @MOZ_PANGOCAIRO@
 
 MOZ_EXTRA_X11CONVERTERS	= @MOZ_EXTRA_X11CONVERTERS@
 
 MOZ_ENABLE_XINERAMA	= @MOZ_ENABLE_XINERAMA@
 MOZ_XINERAMA_LIBS	= @MOZ_XINERAMA_LIBS@
 
Index: gfx/src/gtk/mozilla-decoder.cpp
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/gtk/mozilla-decoder.cpp,v
retrieving revision 1.3
diff -u -p -6 -r1.3 mozilla-decoder.cpp
--- gfx/src/gtk/mozilla-decoder.cpp	7 Nov 2004 23:59:23 -0000	1.3
+++ gfx/src/gtk/mozilla-decoder.cpp	27 Aug 2005 19:57:49 -0000
@@ -37,13 +37,17 @@
  * ***** END LICENSE BLOCK ***** */
 
 #define PANGO_ENABLE_BACKEND
 #define PANGO_ENABLE_ENGINE
 
 #include "mozilla-decoder.h"
+#ifdef MOZ_PANGOCAIRO
+#include <pango/pangocairo.h>
+#else
 #include <pango/pangoxft.h>
+#endif
 #include <pango/pangofc-fontmap.h>
 #include <pango/pangofc-font.h>
 #include <gdk/gdkx.h>
 
 #include "nsString.h"
 #include "nsIPersistentProperties2.h"
@@ -205,13 +209,17 @@ mozilla_decoders_init(void)
         }
         else {
             printf("unknown suffix used for mapping\n");
         }
     }
 
+#ifdef MOZ_PANGOCAIRO
+    pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_cairo_font_map_get_default()),
+#else
     pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_xft_get_font_map(GDK_DISPLAY(),gdk_x11_get_default_screen())),
+#endif
                                             mozilla_find_decoder,
                                             NULL,
                                             NULL);
 
     initialized = PR_TRUE;
 
Index: configure.in
===================================================================
RCS file: /cvsroot/mozilla/configure.in,v
retrieving revision 1.1503.2.6
diff -u -p -6 -r1.1503.2.6 configure.in
--- configure.in	25 Aug 2005 19:05:34 -0000	1.1503.2.6
+++ configure.in	29 Aug 2005 08:03:32 -0000
@@ -3707,14 +3707,14 @@ gtk)
     ;;
 
 gtk2)
     MOZ_ENABLE_GTK2=1
     MOZ_ENABLE_XREMOTE=1
     MOZ_ENABLE_COREXFONTS=${MOZ_ENABLE_COREXFONTS-}
-    TK_CFLAGS='$(MOZ_GTK2_CFLAGS)'
-    TK_LIBS='$(MOZ_GTK2_LIBS)'
+    TK_CFLAGS='$(MOZ_GTK2_CFLAGS) $(MOZ_PANGO_CFLAGS)'
+    TK_LIBS='$(MOZ_GTK2_LIBS) $(MOZ_PANGO_LIBS)'
     AC_DEFINE(MOZ_WIDGET_GTK2)
     ;;
 
 xlib)
 	MOZ_ENABLE_XLIB=1
     if test "$_HAVE_FREETYPE2"; then
@@ -4277,33 +4277,44 @@ if test "$MOZ_ENABLE_XFT" && test "$MOZ_
 fi
 
 if test "$MOZ_ENABLE_XFT"
 then
     AC_DEFINE(MOZ_ENABLE_XFT)
     PKG_CHECK_MODULES(MOZ_XFT, xft)
-    PKG_CHECK_MODULES(_PANGOCHK, pango >= 1.1.0)
+    PKG_CHECK_MODULES(MOZ_PANGO, pangoxft >= 1.1.0 pangox)
 fi
 
 AC_SUBST(MOZ_ENABLE_XFT)
 AC_SUBST(MOZ_XFT_CFLAGS)
 AC_SUBST(MOZ_XFT_LIBS)
+AC_SUBST(MOZ_PANGO_CFLAGS)
+AC_SUBST(MOZ_PANGO_LIBS)
 
 dnl ========================================================
 dnl = pango font rendering
 dnl ========================================================
 MOZ_ARG_ENABLE_BOOL(pango,
 [  --enable-pango          Enable Pango font rendering support],
     MOZ_ENABLE_PANGO=1,
     MOZ_ENABLE_PANGO=)
 
 if test "$MOZ_ENABLE_PANGO"
 then
     AC_DEFINE(MOZ_ENABLE_PANGO)
-    PKG_CHECK_MODULES(MOZ_PANGO, pango >= 1.6.0 pangoft2 >= 1.6.0)
+    PKG_CHECK_MODULES(MOZ_PANGO, pangoxft >= 1.6.0)
+    PKG_CHECK_MODULES(PANGOCAIRO_CHK, pangocairo >= 1.10.0,
+    [ 
+      MOZ_PANGOCAIRO=1
+      AC_DEFINE(MOZ_PANGOCAIRO)
+      MOZ_PANGO_CFLAGS="$PANGOCAIRO_CHK_CFLAGS $MOZ_PANGO_CFLAGS"
+      MOZ_PANGO_LIBS="$PANGOCAIRO_CHK_LIBS $MOZ_PANGO_LIBS"
+    ],
+    [:])
 
     AC_SUBST(MOZ_ENABLE_PANGO)
+    AC_SUBST(MOZ_PANGOCAIRO)
     AC_SUBST(MOZ_PANGO_CFLAGS)
     AC_SUBST(MOZ_PANGO_LIBS)
 fi
 
 dnl ========================================================
 dnl = x11 core font support (default and ability to enable depend on toolkit)

seamonkey-cairo-bug5136.patch:

--- NEW FILE seamonkey-cairo-bug5136.patch ---
Index: mozilla/gfx/cairo/libpixman/src/pixman-remap.h
===================================================================
RCS file: /cvsroot/mozilla/gfx/cairo/libpixman/src/pixman-remap.h,v
retrieving revision 1.1.6.2
diff -u -p -r1.1.6.2 pixman-remap.h
--- mozilla/gfx/cairo/libpixman/src/pixman-remap.h	27 Sep 2005 23:09:03 -0000	1.1.6.2
+++ mozilla/gfx/cairo/libpixman/src/pixman-remap.h	21 Nov 2005 02:35:24 -0000
@@ -1,9 +1,7 @@
 #define pixman_add_trapezoids _cairo_pixman_add_trapezoids
-#define INT_pixman_color_to_pixel _cairo_pixman_color_to_pixel
 #define pixman_color_to_pixel _cairo_pixman_color_to_pixel
 #define composeFunctions _cairo_pixman_compose_functions
 #define fbComposeSetupMMX _cairo_pixman_compose_setup_mmx
-#define INT_pixman_composite _cairo_pixman_composite
 #define pixman_composite _cairo_pixman_composite
 #define fbCompositeCopyAreammx _cairo_pixman_composite_copy_area_mmx
 #define fbCompositeSolidMask_nx8888x0565Cmmx _cairo_pixman_composite_solid_mask_nx8888x0565Cmmx


seamonkey-configure.patch:

--- NEW FILE seamonkey-configure.patch ---
--- mozilla/configure.ac213	2006-02-10 09:14:59.000000000 +0100
+++ mozilla/configure	2006-02-10 09:15:01.000000000 +0100
@@ -941,7 +941,7 @@
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:938: checking host system type" >&5
+echo "configure:945: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -962,7 +962,7 @@
 echo "$ac_t""$host" 1>&6
 
 echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:959: checking target system type" >&5
+echo "configure:966: checking target system type" >&5
 
 target_alias=$target
 case "$target_alias" in
@@ -980,7 +980,7 @@
 echo "$ac_t""$target" 1>&6
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:977: checking build system type" >&5
+echo "configure:984: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -1050,12 +1050,12 @@
 LIBGNOME_VERSION=2.0
 
 MISSING_X=
-for ac_prog in mawk gawk nawk awk
+for ac_prog in gawk mawk nawk awk
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1051: checking for $ac_word" >&5
+echo "configure:1059: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1153,7 +1153,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1149: checking for $ac_word" >&5
+echo "configure:1157: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_NSINSTALL_BIN'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1226,13 +1226,13 @@
     _SAVE_LDFLAGS="$LDFLAGS"
 
     echo $ac_n "checking for host c compiler""... $ac_c" 1>&6
-echo "configure:1222: checking for host c compiler" >&5
+echo "configure:1230: checking for host c compiler" >&5
     for ac_prog in $HOST_CC gcc cc /usr/ucb/cc cl icc
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1228: checking for $ac_word" >&5
+echo "configure:1236: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_HOST_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1267,13 +1267,13 @@
     fi
     echo "$ac_t""$HOST_CC" 1>&6
     echo $ac_n "checking for host c++ compiler""... $ac_c" 1>&6
-echo "configure:1263: checking for host c++ compiler" >&5
+echo "configure:1271: checking for host c++ compiler" >&5
     for ac_prog in $HOST_CXX $CCC c++ g++ gcc CC cxx cc++ cl icc
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1269: checking for $ac_word" >&5
+echo "configure:1277: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_HOST_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1322,7 +1322,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1318: checking for $ac_word" >&5
+echo "configure:1326: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_HOST_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1357,7 +1357,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1353: checking for $ac_word" >&5
+echo "configure:1361: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_HOST_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1392,16 +1392,16 @@
     LDFLAGS="$HOST_LDFLAGS"
 
     echo $ac_n "checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1388: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5
+echo "configure:1396: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5
     cat > conftest.$ac_ext <<EOF
-#line 1390 "configure"
+#line 1398 "configure"
 #include "confdefs.h"
 
 int main() {
 return(0);
 ; return 0; }
 EOF
-if { (eval echo configure:1397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_prog_hostcc_works=1 echo "$ac_t""yes" 1>&6
 else
@@ -1416,16 +1416,16 @@
     CFLAGS="$HOST_CXXFLAGS"
 
     echo $ac_n "checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1412: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5
+echo "configure:1420: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5
     cat > conftest.$ac_ext <<EOF
-#line 1414 "configure"
+#line 1422 "configure"
 #include "confdefs.h"
 
 int main() {
 return(0);
 ; return 0; }
 EOF
-if { (eval echo configure:1421: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1429: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_prog_hostcxx_works=1 echo "$ac_t""yes" 1>&6
 else
@@ -1445,7 +1445,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1441: checking for $ac_word" >&5
+echo "configure:1449: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1479,7 +1479,7 @@
     # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1475: checking for $ac_word" >&5
+echo "configure:1483: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1509,7 +1509,7 @@
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1505: checking for $ac_word" >&5
+echo "configure:1513: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1560,7 +1560,7 @@
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1556: checking for $ac_word" >&5
+echo "configure:1564: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1592,7 +1592,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1588: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1596: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1603,12 +1603,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 1599 "configure"
+#line 1607 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
[...5344 lines suppressed...]
+if { (eval echo configure:18458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -18292,7 +18481,7 @@
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:18171: checking stack direction for C alloca" >&5
+echo "configure:18485: checking stack direction for C alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -18300,7 +18489,7 @@
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 18179 "configure"
+#line 18493 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -18319,7 +18508,7 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:18198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:18512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
 else
@@ -18368,17 +18557,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:18247: checking for $ac_hdr" >&5
+echo "configure:18561: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 18252 "configure"
+#line 18566 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:18257: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:18571: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -18458,7 +18647,7 @@
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:18337: checking for $ac_word" >&5
+echo "configure:18651: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -18502,19 +18691,19 @@
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
         echo $ac_n "checking for cairo >= $CAIRO_VERSION""... $ac_c" 1>&6
-echo "configure:18381: checking for cairo >= $CAIRO_VERSION" >&5
+echo "configure:18695: checking for cairo >= $CAIRO_VERSION" >&5
 
         if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION" ; then
             echo "$ac_t""yes" 1>&6
             succeeded=yes
 
             echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6
-echo "configure:18388: checking CAIRO_CFLAGS" >&5
+echo "configure:18702: checking CAIRO_CFLAGS" >&5
             CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION"`
             echo "$ac_t""$CAIRO_CFLAGS" 1>&6
 
             echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6
-echo "configure:18393: checking CAIRO_LIBS" >&5
+echo "configure:18707: checking CAIRO_LIBS" >&5
             ## don't use --libs since that can do evil things like add
             ## -Wl,--export-dynamic
             CAIRO_LIBS="`$PKG_CONFIG --libs-only-L \"cairo >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo >= $CAIRO_VERSION\"`"
@@ -18579,7 +18768,7 @@
         # Extract the first word of "python", so it can be a program name with args.
 set dummy python; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:18458: checking for $ac_word" >&5
+echo "configure:18772: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -18840,14 +19029,14 @@
 cross_compiling=$ac_cv_prog_cc_cross
 
     cat > conftest.$ac_ext <<EOF
-#line 18719 "configure"
+#line 19033 "configure"
 #include "confdefs.h"
 #include <gmodule.h>
 int main() {
  int x = 1; x++; 
 ; return 0; }
 EOF
-if { (eval echo configure:18726: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:19040: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -19113,6 +19302,10 @@
 
 
 
+
+
+
+
 cat >> confdefs.h <<EOF
 #define MOZ_DLL_SUFFIX "$DLL_SUFFIX"
 EOF
@@ -19140,7 +19333,7 @@
                 _SAVE_CFLAGS=$CFLAGS
     CFLAGS="$CFLAGS $XCFLAGS"
     cat > conftest.$ac_ext <<EOF
-#line 19019 "configure"
+#line 19337 "configure"
 #include "confdefs.h"
 
         #include <stdio.h>
@@ -19156,7 +19349,7 @@
     
 ; return 0; }
 EOF
-if { (eval echo configure:19035: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:19353: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -19373,15 +19566,34 @@
 # Transform confdefs.h into DEFS.
 # Protect against shell expansion while executing Makefile rules.
 # Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
+#
+# If the first sed substitution is executed (which looks for macros that
+# take arguments), then we branch to the quote section.  Otherwise,
+# look for a macro that doesn't take arguments.
+cat >confdef2opt.sed <<\_ACEOF
+t clear
+: clear
+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	(][^ 	(]*([^)]*)\)[ 	]*\(.*\),-D\1=\2,g
+t quote
+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	][^ 	]*\)[ 	]*\(.*\),-D\1=\2,g
+t quote
+d
+: quote
+s,[ 	`~#$^&*(){}\\|;'"<>?],\\&,g
+s,\[,\\&,g
+s,\],\\&,g
+s,\$,$$,g
+p
+_ACEOF
+# We use echo to avoid assuming a particular line-breaking character.
+# The extra dot is to prevent the shell from consuming trailing
+# line-breaks from the sub-command output.  A line-break within
+# single-quotes doesn't work because, if this script is created in a
+# platform that uses two characters for line-breaks (e.g., DOS), tr
+# would break.
+ac_LF_and_DOT=`echo; echo .`
+DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
+rm -f confdef2opt.sed
 
 MOZ_DEFINES=$DEFS
 
@@ -19663,12 +19875,13 @@
 s%@MOZ_ENABLE_FREETYPE2@%$MOZ_ENABLE_FREETYPE2%g
 s%@MOZ_XFT_CFLAGS@%$MOZ_XFT_CFLAGS%g
 s%@MOZ_XFT_LIBS@%$MOZ_XFT_LIBS%g
-s%@_PANGOCHK_CFLAGS@%$_PANGOCHK_CFLAGS%g
-s%@_PANGOCHK_LIBS@%$_PANGOCHK_LIBS%g
-s%@MOZ_ENABLE_XFT@%$MOZ_ENABLE_XFT%g
 s%@MOZ_PANGO_CFLAGS@%$MOZ_PANGO_CFLAGS%g
 s%@MOZ_PANGO_LIBS@%$MOZ_PANGO_LIBS%g
+s%@MOZ_ENABLE_XFT@%$MOZ_ENABLE_XFT%g
+s%@PANGOCAIRO_CHK_CFLAGS@%$PANGOCAIRO_CHK_CFLAGS%g
+s%@PANGOCAIRO_CHK_LIBS@%$PANGOCAIRO_CHK_LIBS%g
 s%@MOZ_ENABLE_PANGO@%$MOZ_ENABLE_PANGO%g
+s%@MOZ_PANGOCAIRO@%$MOZ_PANGOCAIRO%g
 s%@MOZ_ENABLE_COREXFONTS@%$MOZ_ENABLE_COREXFONTS%g
 s%@MOZ_GNOMEVFS_CFLAGS@%$MOZ_GNOMEVFS_CFLAGS%g
 s%@MOZ_GNOMEVFS_LIBS@%$MOZ_GNOMEVFS_LIBS%g

seamonkey-disable-visibility.patch:

--- NEW FILE seamonkey-disable-visibility.patch ---
Index: mozilla/configure.in
===================================================================
RCS file: /cvsroot/mozilla/configure.in,v
retrieving revision 1.1503.2.15.2.3
diff -u -r1.1503.2.15.2.3 configure.in
--- mozilla/configure.in	10 Jan 2006 03:11:42 -0000	1.1503.2.15.2.3
+++ mozilla/configure.in	21 Jan 2006 09:00:24 -0000
@@ -2383,7 +2383,7 @@
 dnl Check for .hidden assembler directive and visibility attribute.
 dnl Borrowed from glibc configure.in
 dnl ===============================================================
-if test "$GNU_CC"; then
+if /bin/false; then
   AC_CACHE_CHECK(for visibility(hidden) attribute,
                  ac_cv_visibility_hidden,
                  [cat > conftest.c <<EOF


--- NEW FILE seamonkey-fedora-default-bookmarks.html ---
<!DOCTYPE NETSCAPE-Bookmark-file-1>
<!-- This is an automatically generated file.
     It will be read and overwritten.
     DO NOT EDIT! -->
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
<TITLE>Bookmarks</TITLE>
<H1 LAST_MODIFIED="1130967916">Bookmarks</H1>

<DL><p>
    <DT><H3 ADD_DATE="961112773" LAST_MODIFIED="1130967903" PERSONAL_TOOLBAR_FOLDER="true" ID="NC:PersonalToolbarFolder">Personal Toolbar Folder</H3>
    <DL><p>
        <DT><A HREF="http://fedoraproject.org/" ADD_DATE="1130967459" LAST_MODIFIED="1130967615" LAST_CHARSET="UTF-8" ID="rdf:#$x80oc3">Fedora Project Portal</A>
        <DT><A HREF="http://fedora.redhat.com/docs/release-notes/" ADD_DATE="1130967140" LAST_VISIT="1130968088" ICON="data:image/x-icon;base64,AAABAAIAEBAQAAAAAAAoAQAAJgAAACAgEAAAAAAA6AIAAE4BAAAoAAAAEAAAACAAAAABAAQAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wCne2YAbjMWAOy/qgDHmoUAhl5KAMrFwgDu6eYAtot2ANKolACtlYkAlmpUAFsqEgDMurAA4rWgAAAAAAAAAAAACVVVqqr/REAJMzPdMzMzQAkzIY0zMzNACTNhEzMzM/ACMzEW0zMz8AIzNxvTMzOgAjM+Ht3dM/ACMzkREb0zoAwzPBF3ozOgAjMzEW3d01AMMzOBERjTUAwzM+ERETNQDDMzMzMzM1AMzMLCKSmZUAAAAAAAAAAAgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAEAACgAAAAgAAAAQAAAAAEABAAAAAAAgAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////AICAgABuMxYA57qlAMCXhADn39sAmGxXAHxKMgDWysMAsIRvANOmkQBXKhQAzbuyAN+ynQDuwa0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAApVVbW1u7vr7u5ERP//8AAFpaVVW1tbvr7u5ORPT/AAClMzMzM8zDMzMzMzMz/wAAWjMzMzzMzDMzMzMzM/8AAKUzMzkRHcwzMzMzMzNPAACqMzMyERnMMzMzMzMzRAAApTMzOhERzDMzMzMzM08AAKozMzgREYwzMzMzMzNEAACqMzMzYRF8wzMzMzMz5AAAqjMzM5ERXMMzMzMzM+4AAKozM!
 zNREZzDMzMzMzPkAACnMzMzoRFszDMzMzMz7gAAejMzM4ERGMzMzDMzM+4AAKczMzMxERjMzMzDMzPrAAB6MzMzORERERGcwzMzvgAApzMzMzsRERERHDMzM7sAAHozMzM1ERERERczMzO+AAB3MzMzOBERVVVYMzMzuwAAejMzMzMREYzDMzMzM7sAAHczMzMzYRGszMzMzDO7AAB3MzMzM9ERaZmZmswzWwAAdzMzMzNRERERER3MM7UAAHczMzMzcRERERERMzNbAAB3MzMzM4ERERERETMzVQAAdzMzMzMzMzMzMzMzM1UAAHczMzMzMzMzMzMzMzNVAAB3d3d6enqqqqqlpaVVVQAAd3d3d3d3p6enqqqqWlUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAQ==" LAST_CHARSET="UTF-8" ID="rdf:#$v80oc3">Latest Release Notes</A>
        <DT><H3 ADD_DATE="1130967903" LAST_MODIFIED="1130967916" ID="rdf:#$A80oc3">Fedora Community</H3>
        <DL><p>
            <DT><A HREF="http://fedoranews.org/mediawiki/index.php/Main_Page" ADD_DATE="1130967815" LAST_CHARSET="UTF-8" ID="rdf:#$y80oc3">Fedora Weekly News</A>
            <DT><A HREF="http://forum.fedoraforum.org/" ADD_DATE="1130967896" LAST_MODIFIED="1130968100" LAST_CHARSET="ISO-8859-1" ID="rdf:#$z80oc3">Fedora Forum.org</A>
        </DL><p>
        <DT><A HREF="http://www.redhat.com/magazine/" ADD_DATE="1130967439" LAST_CHARSET="ISO-8859-1" ID="rdf:#$w80oc3">Red Hat Magazine</A>
    </DL><p>
</DL><p>


--- NEW FILE seamonkey-fedora-default-prefs.js ---
pref("browser.display.use_system_colors",   true);
pref("general.smoothScroll",                true);
pref("general.useragent.vendor", "Fedora");
pref("general.useragent.vendorSub", "SEAMONKEY_RPM_VR");

seamonkey-fedora-home-page.patch:

--- NEW FILE seamonkey-fedora-home-page.patch ---
--- mozilla/xpfe/browser/resources/locale/en-US/region.properties.smp4	2005-12-05 13:43:59.000000000 +0100
+++ mozilla/xpfe/browser/resources/locale/en-US/region.properties	2006-01-21 08:58:49.000000000 +0100
@@ -1,5 +1,5 @@
 # navigator.properties
-homePageDefault=http://www.mozilla.org/
+homePageDefault=file:///usr/share/doc/HTML/index.html
 shopKeyword=keyword:shop [Product]
 quoteKeyword=keyword:quote [Enter symbol here]
 localKeyword=keyword:zip [Your zip code]
@@ -11,7 +11,7 @@
 #
 # all.js
 #
-browser.startup.homepage=http://www.mozilla.org/projects/seamonkey/start/
+browser.startup.homepage=file:///usr/share/doc/HTML/index.html
 browser.throbber.url=http://www.mozilla.org/projects/seamonkey/
 browser.search.defaulturl=http://www.google.com/search?q=
 general.useragent.contentlocale=US
@@ -21,4 +21,4 @@
 
 #config.js
 #
-startup.homepage_override_url=http://www.mozilla.org/projects/seamonkey/start/
+startup.homepage_override_url=file:///usr/share/doc/HTML/index.html


--- NEW FILE seamonkey-mail.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Seamonkey Mail
Comment=Read Mail with Seamonkey
Exec=/usr/bin/seamonkey -mail
Icon=seamonkey-mail-icon
Terminal=0
Type=Application
Categories=X-Red-Hat-Extra;Application;Network;


--- NEW FILE seamonkey-make-package.pl ---
#!/usr/bin/perl -w
# 
# The contents of this file are subject to the Mozilla Public
# License Version 1.1 (the "License"); you may not use this file
# except in compliance with the License. You may obtain a copy of
# the License at http://www.mozilla.org/MPL/
# 
# Software distributed under the License is distributed on an "AS
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
# implied. See the License for the specific language governing
# rights and limitations under the License.
# 
# The Original Code is mozilla.org code.
# 
# The Initial Developer of the Original Code is Christopher Blizzard.
# Portions created by Christopher Blizzard are Copyright (C)
# Christopher Blizzard.  All Rights Reserved.
#
# Contributor(s):

# This script will read one of the mozilla packages- file on unix and
# copy it to a target directory.  It's for unix only and is really
# designed for use in building rpms or other packages.

use Getopt::Long;
use File::Find;

use strict;

# global vars
my $install_dir  = "";
my $install_root = "";
my $package_name = "";
my $package_file = "";
my $output_file  = "";
my $exclude_file = "";
my $retval;

# std return val

$retval = GetOptions('install-dir=s',  \$install_dir,
		     'install-root=s', \$install_root,
		     'package=s',      \$package_name,
		     'package-file=s', \$package_file,
		     'output-file=s',  \$output_file,
                     'exclude-file=s', \$exclude_file);

# make sure that all of the values are specific on the command line
if (!$retval || !$install_dir || !$install_root || !$package_name || 
    !$package_file || !$output_file) {
    print_usage();
    exit 1;
}

# try to open the packages file

open (PACKAGE_FILE, $package_file) || die("$0: Failed to open file $package_file for reading.");

print "chdir to $install_dir\n";
chdir($install_dir);

my @file_list;
my @exclude_list;
my @final_file_list;
my $reading_package = 0;

LINE: while (<PACKAGE_FILE>) {
    s/\;.*//;			# it's a comment, kill it.
    s/^\s+//;			# nuke leading whitespace
    s/\s+$//;			# nuke trailing whitespace
    
    # it's a blank line, skip it.
    if (/^$/) {
	next LINE;
    }

    # it's a new component
    if (/^\[/) {
	my $this_package;
	( $this_package ) = /^\[(.+)\]$/;
	if ($this_package eq $package_name) {
	    $reading_package = 1;
	}
	else {
	    $reading_package = 0;
	}
	next LINE;
    }

    # read this line
    if ($reading_package) {
	# see if it's a deletion
	if (/^-/) {
	    my $this_file;
	    ( $this_file ) = /^-(.+)$/;
	    push (@exclude_list, $this_file);
	}
	else {
	    push (@file_list, $_);
	}
    }
}

close PACKAGE_FILE;

# check if we have an exclude file

if ($exclude_file) {
    print "reading exclude file $exclude_file\n";

    open (EXCLUDE_FILE, $exclude_file) || die("$0: Failed to open exclude file $exclude_file for reading.");

    while (<EXCLUDE_FILE>) {
	chomp;
	print "Ignoring $_\n";
	push (@exclude_list, $_);
    }

    close EXCLUDE_FILE;
}

# Expand our file list

expand_file_list(\@file_list, \@exclude_list, \@final_file_list);

print "final file list\n";
foreach (@final_file_list) {
    print $_ . "\n";
}

open (OUTPUT_FILE, ">>$output_file") || die("Failed to open output file\n");
foreach (@final_file_list) {
    # strip off the bin/
    s/^bin\///;

    if ( ! -f $_ ) {
	print("Skipping $_ because it doesn't exist\n");
    }
    else {
	print ("Adding $_\n");
	print (OUTPUT_FILE $install_root . "/" . $_ . "\n");
    }
}
close OUTPUT_FILE;

#print "\nexlude list\n";
#foreach (@exclude_list) {
#    print $_ . "\n";
#}

# this function expands a list of files

sub expand_file_list {
    my $file_list_ref = shift;
    my $exclude_list_ref = shift;
    my $final_file_list_ref = shift;
    my $this_file;
    foreach $this_file (@{$file_list_ref}) {
	# strip off the bin/
	$this_file =~ s/^bin\///;

	# is it a wild card?
	if ($this_file =~ /\*/) {
	    print "Wild card $this_file\n";
	    # expand that wild card, removing anything in the exclude
	    # list
	    my @temp_list;
	    printf ("Expanding $this_file\n");
	    @temp_list = glob($this_file);
	    foreach $this_file (@temp_list) {
		if (!in_exclude_list($this_file, $exclude_list_ref)) {
		    push (@{$final_file_list_ref}, $this_file);
		}
	    }
	}
	else {
	    if (!in_exclude_list($this_file, $exclude_list_ref)) {
		push (@{$final_file_list_ref}, $this_file);
	    }
	}
    }
}

# is this file in the exlude list?

sub in_exclude_list {
    my $file = shift;
    my $exclude_list_ref = shift;
    my $this_file;
    foreach $this_file (@{$exclude_list_ref}) {
	if ($file eq $this_file) {
	    return 1;
	}
    }
    return 0;
}

# print out a usage message

sub print_usage {
    print ("$0: --install-dir dir --install-root dir --package name --package-file file --output-file file\n");
    print ("\t install-dir is the directory where the files are installed.\n");
    print ("\t install-root is the directory that should prefix files in the package file.\n");
    print ("\t package is the name of the package to list\n");
    print ("\t package-file is the file that contains the list of packages\n");
    print ("\t output-file is the file which will contain the list of files\n");
}


--- NEW FILE seamonkey-mozconfig ---
ac_add_options --with-system-nspr
ac_add_options --with-system-nss
ac_add_options --with-system-jpeg
ac_add_options --with-system-zlib
ac_add_options --with-system-png
ac_add_options --with-pthreads
ac_add_options --disable-tests
ac_add_options --disable-debug
ac_add_options --disable-installer
ac_add_options --enable-optimize="$RPM_OPT_FLAGS"
ac_add_options --enable-xinerama
ac_add_options --enable-default-toolkit=gtk2
ac_add_options --disable-xprint
ac_add_options --disable-strip
ac_add_options --enable-pango
#ac_add_options --enable-system-cairo
ac_add_options --enable-svg
ac_add_options --enable-canvas
ac_add_options --enable-extensions=default,irc
ac_add_options --enable-application=suite
ac_add_options --enable-crypto

export BUILD_OFFICIAL=1
export MOZILLA_OFFICIAL=1
mk_add_options BUILD_OFFICIAL=1
mk_add_options MOZILLA_OFFICIAL=1


--- NEW FILE seamonkey.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Seamonkey Web Browser
Comment=Browse the web with Seamonkey
Exec=seamonkey %u
Icon=seamonkey-icon
Terminal=0
Type=Application
MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;
Categories=Network;Application;X-Fedora;
X-Desktop-File-Install-Version=0.10



--- NEW FILE seamonkey.sh.in ---
#!/bin/sh
#
# The contents of this file are subject to the Netscape Public
# License Version 1.1 (the "License"); you may not use this file
# except in compliance with the License. You may obtain a copy of
# the License at http://www.mozilla.org/NPL/
#
# Software distributed under the License is distributed on an "AS
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
# implied. See the License for the specific language governing
# rights and limitations under the License.
#
# The Original Code is mozilla.org code.
#
# The Initial Developer of the Original Code is Netscape
# Communications Corporation.  Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All
# Rights Reserved.
#
# Contributor(s): 
#

## 
## Usage:
##
## $ mozilla
##
## This script is meant to run a mozilla program from the mozilla
## rpm installation.
##
## The script will setup all the environment voodoo needed to make
## mozilla work.

cmdname=`basename $0`

## don't leave any core files around
ulimit -c 0

##
## Variables
##
MOZ_DIST_BIN="LIBDIR/seamonkey-MOZILLA_VERSION"
MOZ_PROGRAM="LIBDIR/seamonkey-MOZILLA_VERSION/seamonkey-bin"
MOZ_CLIENT_PROGRAM="LIBDIR/seamonkey-MOZILLA_VERSION/mozilla-xremote-client -a seamonkey"

##
## Set MOZILLA_FIVE_HOME
##
MOZILLA_FIVE_HOME="LIBDIR/seamonkey-MOZILLA_VERSION"

export MOZILLA_FIVE_HOME

##
## Set LD_LIBRARY_PATH
##
if [ "$LD_LIBRARY_PATH" ]
then
  LD_LIBRARY_PATH=LIBDIR/seamonkey-MOZILLA_VERSION:LIBDIR/seamonkey-MOZILLA_VERSION/plugins:$LD_LIBRARY_PATH
else
  LD_LIBRARY_PATH=LIBDIR/seamonkey-MOZILLA_VERSION:LIBDIR/seamonkey-MOZILLA_VERSION/plugins
fi

export LD_LIBRARY_PATH

##
## Make sure that we set the plugin path for backwards compatibility
##
if [ "$MOZ_PLUGIN_PATH" ]
then
  MOZ_PLUGIN_PATH=$MOZ_PLUGIN_PATH:LIBDIR/mozilla/plugins:LIBDIR/seamonkey-MOZILLA_VERSION/plugins
else
  MOZ_PLUGIN_PATH=LIBDIR/mozilla/plugins:LIBDIR/seamonkey-MOZILLA_VERSION/plugins
fi
export MOZ_PLUGIN_PATH

##
## Set MOZ_ENABLE_PANGO is no longer used because Pango is enabled by default
## you may use MOZ_DISABLE_PANGO=1 to force disabling of pango
##
#MOZ_DISABLE_PANGO=1
#export MOZ_DISABLE_PANGO

function check_running() {
    $MOZ_CLIENT_PROGRAM 'ping()' 2>/dev/null >/dev/null
    RETURN_VAL=$?
    if [ "$RETURN_VAL" -eq "2" ]; then
      echo 0
      return 0
    else
      echo 1
      return 1
    fi
}

function open_mail() {
    if [ "${ALREADY_RUNNING}" -eq "1" ]; then
      exec $MOZ_CLIENT_PROGRAM 'xfeDoCommand(openInbox)' \
        2>/dev/null >/dev/null
    else
      exec $MOZ_PROGRAM $*
    fi
}

function open_compose() {
    if [ "${ALREADY_RUNNING}" -eq "1" ]; then
      exec $MOZ_CLIENT_PROGRAM 'xfeDoCommand(composeMessage)' \
        2>/dev/null >/dev/null
    else
      exec $MOZ_PROGRAM $*
    fi
}

# OK, here's where all the real work gets done

# check to see if there's an already running instance or not
ALREADY_RUNNING=`check_running`

# If there is no command line argument at all then try to open a new
# window in an already running instance.
if [ "${ALREADY_RUNNING}" -eq "1" ] && [ -z "$1" ]; then
  exec $MOZ_CLIENT_PROGRAM "xfeDoCommand(openBrowser)" 2>/dev/null >/dev/null
fi

# check system locale
MOZARGS=
MOZLOCALE=`echo $LANG | sed "s|_\([^.]*\).*|-\1|g"`
[ -f $MOZILLA_FIVE_HOME/chrome/$MOZLOCALE.jar ] && MOZARGS="-UILocale $MOZLOCALE"


# if there's no command line argument and there's not a running
# instance then just fire up a new copy of the browser
if [ -z "$1" ]; then
  exec $MOZ_PROGRAM $MOZARGS 2>/dev/null >/dev/null
fi

unset RETURN_VAL

# If there's a command line argument but it doesn't begin with a -
# it's probably a url.  Try to send it to a running instance.

USE_EXIST=0
opt="$1"
case "$opt" in
  -mail)
      open_mail ${1+"$@"}
      ;;
  -compose)
      open_compose ${1+"$@"}
      ;;
  -*) ;;
  *) USE_EXIST=1 ;;
esac

if [ "${USE_EXIST}" -eq "1" ] && [ "${ALREADY_RUNNING}" -eq "1" ]; then
  # check to make sure that the command contains at least a :/ in it.
  echo $opt | grep -e ':/' 2>/dev/null > /dev/null
  RETURN_VAL=$?
  if [ "$RETURN_VAL" -eq "1" ]; then
    # if it doesn't begin with a '/' and it exists when the pwd is
    # prepended to it then append the full path
    echo $opt | grep -e '^/' 2>/dev/null > /dev/null
    if [ "${RETURN_VAL}" -ne "0" ] && [ -e "`pwd`/$opt" ]; then
      opt="`pwd`/$opt"
    fi
    exec $MOZ_CLIENT_PROGRAM "openurl($opt)" 2>/dev/null >/dev/null
  fi
  # just pass it off if it looks like a url
  exec $MOZ_CLIENT_PROGRAM "openurl($opt,new-window)" 2>/dev/null >/dev/null
fi

exec $MOZ_PROGRAM $MOZARGS ${1+"$@"}


--- NEW FILE seamonkey.spec ---
%define desktop_file_utils_version 0.9
%define nspr_version 4.6
%define nss_version 3.11
%define pango_version 1.6.0

%define _unpackaged_files_terminate_build 0
%define builddir %{_builddir}/mozilla
%define mozdir %{_libdir}/seamonkey-%{version}

Name:           seamonkey
Summary:        Web browser, e-mail, news, IRC client, HTML editor
Version:        1.0
Release:        9%{?dist}
URL:            http://www.mozilla.org/projects/seamonkey/
License:        MPL
Group:          Applications/Internet

Source0:        seamonkey-%{version}.source.tar.bz2
Source1:        seamonkey.sh.in
Source2:        seamonkey-icon.png
Source4:        seamonkey.desktop
Source7:        seamonkey-make-package.pl
Source10:       seamonkey-mozconfig
Source12:       seamonkey-mail.desktop
Source13:       seamonkey-mail-icon.png
Source17:       mozilla-psm-exclude-list
Source18:       mozilla-xpcom-exclude-list
Source19:       seamonkey-fedora-default-bookmarks.html
Source20:       seamonkey-fedora-default-prefs.js
Source100:      find-external-requires

Patch1:         firefox-1.0-prdtoa.patch
Patch3:         firefox-1.1-nss-system-nspr.patch
Patch4:         firefox-1.5-with-system-nss.patch
Patch5:         seamonkey-disable-visibility.patch
Patch6:         firefox-1.5.0.1-dumpstack.patch
Patch21:        firefox-0.7.3-default-plugin-less-annoying.patch
Patch22:        firefox-0.7.3-psfonts.patch
Patch42:        firefox-1.1-uriloader.patch
Patch82:        pango-cairo.patch
Patch83:        seamonkey-cairo-bug5136.patch
Patch101:       thunderbird-0.7.3-gnome-uriloader.patch
Patch102:       thunderbird-1.5-bug304720.patch
Patch220:       seamonkey-fedora-home-page.patch
Patch225:       mozilla-nspr-packages.patch
Patch227:       mozilla-1.4.1-ppc64.patch
Patch301:       mozilla-1.7.3-gnome-vfs-default-app.patch
Patch304:       mozilla-1.7.5-g-application-name.patch
Patch999:       seamonkey-configure.patch

Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  libpng-devel
BuildRequires:  libjpeg-devel
BuildRequires:  zlib-devel
BuildRequires:  zip
BuildRequires:  perl
BuildRequires:  libIDL-devel
BuildRequires:  glib2-devel
BuildRequires:  gtk2-devel
BuildRequires:  pango-devel >= %{pango_version}
BuildRequires:  nspr-devel >= %{nspr_version}
BuildRequires:  nss-devel >= %{nss_version}
Prereq:         fileutils perl
Prereq:         /usr/bin/killall
PreReq:         desktop-file-utils >= %{desktop_file_utils_version}

AutoProv: 0
%define _use_internal_dependency_generator 0
%define __find_requires %{SOURCE100}


%description
SeaMonkey is an all-in-one Internet application suite. It includes 
a browser, mail/news client, IRC client, JavaScript debugger, and 
a tool to inspect the DOM for web pages. It is derived from the 
application formerly known as Mozilla Application Suite.
 

%prep

%setup -q -n mozilla
%patch1  -p0
%patch3  -p1
%patch4  -p1

# Pragma visibility is broken on most platforms for some reason.
# It works on i386 so leave it alone there.  Disable elsewhere.
# See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20297
%ifnarch i386
%patch5  -p1
%endif

%patch6 -p1
%patch21 -p1
%patch22 -p1
%patch42 -p0
%patch82 -p0
%patch83 -p1
%patch101 -p1 -b .gnome-uriloader
%patch102 -p1
%patch220 -p1
%patch225 -p1
%patch227 -p1
%patch301 -p1
%patch304 -p0
%patch999 -p1

%{__rm} -f .mozconfig
%{__cp} %{SOURCE10} .mozconfig

# set up our default bookmarks
%{__cp} %{SOURCE19} $RPM_BUILD_DIR/mozilla/profile/defaults/bookmarks.html


%build

XCFLAGS=-g \
CFLAGS=-g \
%ifarch ia64 ppc
CXXFLAGS="-fno-inline -g" \
%else
CXXFLAGS=-g \
%endif
BUILD_OFFICIAL=1 MOZILLA_OFFICIAL=1 \
./configure --prefix=%{_prefix} --libdir=%{_libdir} \
--with-default-mozilla-five-home=%{mozdir} \
--mandir=%{_mandir}

BUILD_OFFICIAL=1 MOZILLA_OFFICIAL=1 make export
BUILD_OFFICIAL=1 MOZILLA_OFFICIAL=1 make %{?_smp_mflags} libs


%install
%{__rm} -rf $RPM_BUILD_ROOT

BUILD_OFFICIAL=1 MOZILLA_OFFICIAL=1 \
	DESTDIR=$RPM_BUILD_ROOT \
	make install

# create a list of all of the different package and the files that
# will hold them

%{__rm} -f %{builddir}/seamonkey.list

echo %defattr\(-,root,root\) > %{builddir}/seamonkey.list

# we don't want to ship mozilla's default sidebar components
%{__rm} -f $RPM_BUILD_ROOT/%{mozdir}/searchplugins/bugzilla.gif
%{__rm} -f $RPM_BUILD_ROOT/%{mozdir}/searchplugins/bugzilla.src
%{__rm} -f $RPM_BUILD_ROOT/%{mozdir}/searchplugins/dmoz.gif
%{__rm} -f $RPM_BUILD_ROOT/%{mozdir}/searchplugins/dmoz.src
%{__rm} -f $RPM_BUILD_ROOT/%{mozdir}/searchplugins/lxrmozilla.gif
%{__rm} -f $RPM_BUILD_ROOT/%{mozdir}/searchplugins/lxrmozilla.src
%{__rm} -f $RPM_BUILD_ROOT/%{mozdir}/searchplugins/mozilla.gif
%{__rm} -f $RPM_BUILD_ROOT/%{mozdir}/searchplugins/mozilla.src

# build all of the default browser components
# base Seamonkey package (seamonkey.list)
%{SOURCE7} --package langenus --output-file %{builddir}/seamonkey.list \
    --package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
    --install-dir $RPM_BUILD_ROOT/%{mozdir} \
    --install-root %{mozdir}

%{SOURCE7} --package regus --output-file %{builddir}/seamonkey.list \
    --package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
    --install-dir $RPM_BUILD_ROOT/%{mozdir} \
    --install-root %{mozdir}

%{SOURCE7} --package deflenus --output-file %{builddir}/seamonkey.list \
    --package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
    --install-dir $RPM_BUILD_ROOT/%{mozdir} \
    --install-root %{mozdir}

%{SOURCE7} --package xpcom --output-file %{builddir}/seamonkey.list \
    --package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
    --install-dir $RPM_BUILD_ROOT/%{mozdir} \
    --install-root %{mozdir} \
    --exclude-file=%{SOURCE18}

%{SOURCE7} --package browser --output-file %{builddir}/seamonkey.list \
    --package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
    --install-dir $RPM_BUILD_ROOT/%{mozdir} \
    --install-root %{mozdir}

%{SOURCE7} --package spellcheck --output-file %{builddir}/seamonkey.list \
    --package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
    --install-dir $RPM_BUILD_ROOT/%{mozdir} \
    --install-root %{mozdir}

%{SOURCE7} --package psm --output-file %{builddir}/seamonkey.list \
    --package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
    --install-dir $RPM_BUILD_ROOT/%{mozdir} \
    --install-root %{mozdir} \
    --exclude-file=%{SOURCE17}

%{SOURCE7} --package mail --output-file %{builddir}/seamonkey.list \
    --package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
    --install-dir $RPM_BUILD_ROOT/%{mozdir} \
    --install-root %{mozdir}

%{SOURCE7} --package chatzilla --output-file %{builddir}/seamonkey.list \
    --package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
    --install-dir $RPM_BUILD_ROOT/%{mozdir} \
    --install-root %{mozdir}

%{SOURCE7} --package venkman --output-file %{builddir}/seamonkey.list \
    --package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
    --install-dir $RPM_BUILD_ROOT/%{mozdir} \
    --install-root %{mozdir}

%{SOURCE7} --package inspector --output-file %{builddir}/seamonkey.list \
    --package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
    --install-dir $RPM_BUILD_ROOT/%{mozdir} \
    --install-root %{mozdir}

# build our initial component and chrome registry

pushd `pwd`
  cd $RPM_BUILD_ROOT/%{mozdir}

  # save a copy of the default installed-chrome.txt file before we
  # muck with it
  mkdir chrome/lang
  cp chrome/installed-chrome.txt chrome/lang/

  # set up the default skin and locale to trigger the generation of
  # the user-locales and users-skins.rdf
  echo "skin,install,select,classic/1.0" >> chrome/installed-chrome.txt
  echo "locale,install,select,en-US" >> chrome/installed-chrome.txt

  # save the defaults in a file that will be used later to rebuild the
  # installed-chrome.txt file
  echo "skin,install,select,classic/1.0" >> chrome/lang/default.txt
  echo "locale,install,select,en-US" >> chrome/lang/default.txt

  # set up the chrome rdf files
  LD_LIBRARY_PATH=`pwd`:`pwd`/.. MOZILLA_FIVE_HOME=`pwd` MOZ_DISABLE_GNOME=1 ./regchrome

  # fix permissions of the chrome directories
  /usr/bin/find . -type d -perm 0700 -exec chmod 755 {} \; || :

  # We don't want JS files to be executable
  /usr/bin/find . -type f -name \*.js -exec chmod 644 {} \; || :
popd

# set up our desktop files
%{__mkdir_p} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/

# install desktop files in correct directory
%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/applications/
desktop-file-install --vendor mozilla \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
    --add-category X-Fedora \
    --add-category Application \
    --add-category Network \
    %{SOURCE4}
desktop-file-install --vendor mozilla \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
    --add-category X-Fedora \
    --add-category Application \
    --add-category Network \
    %{SOURCE12}

install -c -m 644 %{SOURCE2} %{SOURCE13} \
  $RPM_BUILD_ROOT/%{_datadir}/pixmaps/

if [ ! -d $RPM_BUILD_ROOT/%{mozdir}/plugins/ ]; then
  mkdir -m 755 $RPM_BUILD_ROOT/%{mozdir}/plugins
fi

# install our seamonkey.sh file
cat %{SOURCE1} | sed -e 's/MOZILLA_VERSION/%{version}/g' \
		     -e 's,LIBDIR,%{_libdir},g' > \
  $RPM_BUILD_ROOT/usr/bin/seamonkey

chmod 755 $RPM_BUILD_ROOT/usr/bin/seamonkey

# set up our default preferences
%{__cat} %{SOURCE20} | %{__sed} -e 's,SEAMONKEY_RPM_VR,%{version}-%{release},g' > \
        $RPM_BUILD_ROOT/fc-default-prefs
%{__cp} $RPM_BUILD_ROOT/fc-default-prefs $RPM_BUILD_ROOT/%{mozdir}/defaults/pref/all-fedora.js
%{__rm} $RPM_BUILD_ROOT/fc-default-prefs

# we use /usr/lib/mozilla/plugins which is the version-independent
# place that plugins can be installed
%{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/mozilla/plugins

# ghost files
touch $RPM_BUILD_ROOT%{mozdir}/chrome/chrome.rdf
for overlay in {"browser","communicator","cookie","editor","global","inspector","messenger","navigator"}; do
   %{__mkdir_p} $RPM_BUILD_ROOT%{mozdir}/chrome/overlayinfo/$overlay/content
  touch $RPM_BUILD_ROOT%{mozdir}/chrome/overlayinfo/$overlay/content/overlays.rdf
done
for overlay in {"browser","global"}; do
   %{__mkdir_p} $RPM_BUILD_ROOT%{mozdir}/chrome/overlayinfo/$overlay/skin
  touch $RPM_BUILD_ROOT%{mozdir}/chrome/overlayinfo/$overlay/skin/stylesheets.rdf
done
touch $RPM_BUILD_ROOT%{mozdir}/chrome/chrome.rdf
%{__mkdir_p} $RPM_BUILD_ROOT%{mozdir}/components/myspell


%clean
%{__rm} -rf $RPM_BUILD_ROOT


%post
update-desktop-database %{_datadir}/applications


%postun
update-desktop-database %{_datadir}/applications


%files -f seamonkey.list
%defattr(-,root,root)
%{_bindir}/seamonkey
%{_datadir}/pixmaps/seamonkey-icon.png
%{_datadir}/pixmaps/seamonkey-mail-icon.png

%verify (not md5 mtime size) %{mozdir}/components/compreg.dat
%verify (not md5 mtime size) %{mozdir}/components/xpti.dat

%{_mandir}/man1/seamonkey.1.gz

%dir %{_libdir}/mozilla/plugins

%dir %{mozdir}
%dir %{mozdir}/init.d
%dir %{mozdir}/defaults/pref
%dir %{mozdir}/defaults/profile
%dir %{mozdir}/defaults/profile/US
%dir %{mozdir}/defaults/wallet
%dir %{mozdir}/defaults/autoconfig
%dir %{mozdir}/defaults/messenger/US
%dir %{mozdir}/defaults/messenger
%dir %{mozdir}/defaults

%dir %{mozdir}/chrome/icons/default
%dir %{mozdir}/chrome/icons
%dir %{mozdir}/chrome/lang
%dir %{mozdir}/chrome

%dir %{mozdir}/res/dtd
%dir %{mozdir}/res/fonts
%dir %{mozdir}/res

%dir %{mozdir}/components/myspell
%dir %{mozdir}/components
%dir %{mozdir}/searchplugins

%dir %{mozdir}/plugins
%dir %{mozdir}/res/html
%dir %{mozdir}/res/samples
%dir %{mozdir}/res/entityTables

%verify (not md5 mtime size) %{mozdir}/chrome/installed-chrome.txt
%{mozdir}/chrome/lang/installed-chrome.txt
%{mozdir}/chrome/lang/default.txt

%{mozdir}/defaults/pref/all-fedora.js


%ghost %{mozdir}/chrome/chrome.rdf
%ghost %{mozdir}/chrome/overlays.rdf
%ghost %{mozdir}/chrome/stylesheets.rdf


%ghost %{mozdir}/chrome/overlayinfo/browser/skin/stylesheets.rdf
%ghost %{mozdir}/chrome/overlayinfo/global/skin/stylesheets.rdf

%ghost %{mozdir}/chrome/overlayinfo/browser/content/overlays.rdf
%ghost %{mozdir}/chrome/overlayinfo/communicator/content/overlays.rdf
%ghost %{mozdir}/chrome/overlayinfo/global/content/overlays.rdf
%ghost %{mozdir}/chrome/overlayinfo/editor/content/overlays.rdf
%ghost %{mozdir}/chrome/overlayinfo/navigator/content/overlays.rdf
%ghost %{mozdir}/chrome/overlayinfo/cookie/content/overlays.rdf

%ghost %{mozdir}/chrome/overlayinfo/messenger/content/overlays.rdf
%ghost %{mozdir}/chrome/overlayinfo/inspector/content/overlays.rdf

%dir %{mozdir}/chrome/overlayinfo/browser/content
%dir %{mozdir}/chrome/overlayinfo/browser/skin
%dir %{mozdir}/chrome/overlayinfo/browser
%dir %{mozdir}/chrome/overlayinfo/global/content
%dir %{mozdir}/chrome/overlayinfo/global/skin
%dir %{mozdir}/chrome/overlayinfo/global
%dir %{mozdir}/chrome/overlayinfo/communicator/content
%dir %{mozdir}/chrome/overlayinfo/communicator
%dir %{mozdir}/chrome/overlayinfo/editor/content
%dir %{mozdir}/chrome/overlayinfo/editor
%dir %{mozdir}/chrome/overlayinfo/navigator/content
%dir %{mozdir}/chrome/overlayinfo/navigator
%dir %{mozdir}/chrome/overlayinfo/cookie/content
%dir %{mozdir}/chrome/overlayinfo/cookie

%dir %{mozdir}/chrome/overlayinfo/messenger/content
%dir %{mozdir}/chrome/overlayinfo/messenger

%dir %{mozdir}/chrome/overlayinfo/inspector/content
%dir %{mozdir}/chrome/overlayinfo/inspector

%dir %{mozdir}/chrome/overlayinfo
%dir %{mozdir}/greprefs

%{_datadir}/applications/mozilla-%{name}.desktop
%{_datadir}/applications/mozilla-%{name}-mail.desktop


%changelog
* Mon Apr 10 2006 Kai Engert <kengert at redhat.com> 1.0-9
- Added dist suffix to release
* Fri Mar 17 2006 Kai Engert <kengert at redhat.com> 1.0-8
- Changed license to MPL
* Tue Mar 14 2006 Kai Engert <kengert at redhat.com> 1.0-7
- updated %files section, removed %preun,
- removed explicit nspr/nss requires
* Thu Mar 02 2006 Kai Engert <kengert at redhat.com> 1.0-6
- Use a single package for all included applications.
- Make sure installed JavaScript files are not executable.
- Disable AutoProv, use find-external-requires.
* Fri Feb 10 2006 Kai Engert <kengert at redhat.com> 1.0-4
- Addressed several review comments, see bugzilla.redhat.com #179802.
* Sat Jan 28 2006 Kai Engert <kengert at redhat.com> 1.0-1
- Initial version based on Seamonkey 1.0, using a combination of patches 
  from Mozilla 1.7.x, Firefox 1.5 and Thunderbird 1.5 RPM packages.

thunderbird-0.7.3-gnome-uriloader.patch:

--- NEW FILE thunderbird-0.7.3-gnome-uriloader.patch ---
--- mozilla/uriloader/exthandler/unix/nsGNOMERegistry.cpp.foo	2004-01-05 18:38:48.000000000 -0500
+++ mozilla/uriloader/exthandler/unix/nsGNOMERegistry.cpp	2004-01-05 19:14:51.000000000 -0500
@@ -39,6 +39,7 @@
 #include "nsGNOMERegistry.h"
 #include "prlink.h"
 #include "prmem.h"
+#include "prenv.h"
 #include "nsString.h"
 #include "nsIComponentManager.h"
 #include "nsILocalFile.h"
@@ -137,6 +138,10 @@
     } \
     PR_END_MACRO
 
+  // Don't even use this code if an env var is set
+  if (PR_GetEnv("MOZ_DISABLE_GNOME"))
+    return;
+
   // Attempt to open libgconf
   gconfLib = LoadVersionedLibrary("gconf-2", ".4");
   ENSURE_LIB(gconfLib);

thunderbird-1.5-bug304720.patch:

--- NEW FILE thunderbird-1.5-bug304720.patch ---
Index: mozilla/editor/txtsvc/src/nsTextServicesDocument.cpp
===================================================================
RCS file: /cvsroot/mozilla/editor/txtsvc/src/nsTextServicesDocument.cpp,v
retrieving revision 1.59
diff -u -w -r1.59 nsTextServicesDocument.cpp
--- mozilla/editor/txtsvc/src/nsTextServicesDocument.cpp	22 Aug 2005 03:00:03 -0000	1.59
+++ mozilla/editor/txtsvc/src/nsTextServicesDocument.cpp	21 Nov 2005 23:37:13 -0000
@@ -2494,6 +2494,8 @@
 nsresult
 nsTextServicesDocument::DeleteNode(nsIDOMNode *aChild)
 {
+  NS_ENSURE_TRUE(mIterator, NS_ERROR_FAILURE);
+
   //**** KDEBUG ****
   // printf("** DeleteNode: 0x%.8x\n", aChild);
   // fflush(stdout);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Apr 2006 21:41:15 -0000	1.1
+++ .cvsignore	10 Apr 2006 21:58:25 -0000	1.2
@@ -0,0 +1 @@
+seamonkey-1.0.source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Apr 2006 21:41:15 -0000	1.1
+++ sources	10 Apr 2006 21:58:25 -0000	1.2
@@ -0,0 +1 @@
+e4f2edc5b2248d090303c70f5b28f210  seamonkey-1.0.source.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 10 22:01:52 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Mon, 10 Apr 2006 15:01:52 -0700
Subject: rpms/enchant/FC-4 .cvsignore, 1.7, 1.8 enchant.spec, 1.8,
	1.9 sources, 1.7, 1.8
Message-ID: <200604102202.k3AM2SsY030542@cvs-int.fedora.redhat.com>

Author: uwog

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

Modified Files:
	.cvsignore enchant.spec sources 
Log Message:
- New upstream version
- Add hspell requirement/support
- Package the data dir as well (bug 188516)




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/enchant/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	5 Feb 2006 21:35:42 -0000	1.7
+++ .cvsignore	10 Apr 2006 22:01:52 -0000	1.8
@@ -1 +1 @@
-enchant-1.2.2.tar.gz
+enchant-1.2.5.tar.gz


Index: enchant.spec
===================================================================
RCS file: /cvs/extras/rpms/enchant/FC-4/enchant.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- enchant.spec	5 Feb 2006 21:35:42 -0000	1.8
+++ enchant.spec	10 Apr 2006 22:01:52 -0000	1.9
@@ -1,6 +1,6 @@
 Summary: An Enchanting Spell Checking Library
 Name: enchant
-Version: 1.2.2
+Version: 1.2.5
 Release: 1%{?dist}
 Epoch: 1
 Group: System Environment/Libraries
@@ -9,6 +9,7 @@
 URL: http://www.abisource.com/
 BuildRequires: glib2-devel >= 2.0.0
 BuildRequires: aspell-devel
+BuildRequires: hspell-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -44,6 +45,7 @@
 %dir %{_libdir}/enchant
 %{_libdir}/enchant/lib*.so*
 %{_mandir}/man1/enchant.1.gz
+%{_datadir}/enchant
 
 %files devel
 %defattr(-,root,root)
@@ -61,6 +63,11 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 1:1.2.5-1.fc4
+- New upstream version
+- Add hspell requirement/support
+- Package the data dir as well (bug 188516)
+
 * Sun Feb 05 2006 Marc Maurer <uwog at abisource.com> 1:1.2.2-1.fc4
 - Update to 1.2.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/enchant/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	5 Feb 2006 21:35:42 -0000	1.7
+++ sources	10 Apr 2006 22:01:52 -0000	1.8
@@ -1 +1 @@
-ee7f8261bc607015633206f710671239  enchant-1.2.2.tar.gz
+e64ec808ed2cb687c242ebb835faeb61  enchant-1.2.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 22:02:48 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Mon, 10 Apr 2006 15:02:48 -0700
Subject: rpms/moomps/devel moomps.spec,1.11,1.12
Message-ID: <200604102202.k3AM2ocw030572@cvs-int.fedora.redhat.com>

Author: jfontain

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

Modified Files:
	moomps.spec 
Log Message:
5.6 upstream release.



Index: moomps.spec
===================================================================
RCS file: /cvs/extras/rpms/moomps/devel/moomps.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- moomps.spec	7 Mar 2006 02:40:37 -0000	1.11
+++ moomps.spec	10 Apr 2006 22:02:47 -0000	1.12
@@ -1,10 +1,10 @@
 Name: moomps
-Version: 5.5
+Version: 5.6
 Release: 1%{?dist}
 Summary: Powerful modular monitoring service
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moomps-5.5.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moomps-5.6.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildArchitectures: noarch
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
@@ -13,7 +13,7 @@
 Requires(preun): /sbin/chkconfig, /sbin/service
 Requires(post): /sbin/chkconfig
 Requires(postun): /sbin/service
-Requires: moodss >= 21.1, tclx >= 8.3
+Requires: moodss >= 21.2, tclx >= 8.3
 
 %description
 moomps (Modular Object Oriented Multi-Purpose Service) is a modular
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Sat Mar 18 2006 Jean-Luc Fontaine <jfontain at free.fr> 5.6-1
+- 5.6 upstream release
+
 * Mon Mar 6 2006 Jean-Luc Fontaine <jfontain at free.fr> 5.5-1
 - 5.5 upstream release
 - in post installation stage, fix moodss modules path



From fedora-extras-commits at redhat.com  Mon Apr 10 22:05:25 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Mon, 10 Apr 2006 15:05:25 -0700
Subject: rpms/moomps/FC-5 .cvsignore, 1.7, 1.8 moomps.spec, 1.11,
	1.12 sources, 1.7, 1.8
Message-ID: <200604102205.k3AM5RIJ030754@cvs-int.fedora.redhat.com>

Author: jfontain

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

Modified Files:
	.cvsignore moomps.spec sources 
Log Message:
5.6 upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	7 Mar 2006 02:37:09 -0000	1.7
+++ .cvsignore	10 Apr 2006 22:05:25 -0000	1.8
@@ -1,2 +1,3 @@
 moomps-5.4.tar.bz2
 moomps-5.5.tar.bz2
+moomps-5.6.tar.bz2


Index: moomps.spec
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-5/moomps.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- moomps.spec	7 Mar 2006 02:40:37 -0000	1.11
+++ moomps.spec	10 Apr 2006 22:05:25 -0000	1.12
@@ -1,10 +1,10 @@
 Name: moomps
-Version: 5.5
+Version: 5.6
 Release: 1%{?dist}
 Summary: Powerful modular monitoring service
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moomps-5.5.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moomps-5.6.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildArchitectures: noarch
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
@@ -13,7 +13,7 @@
 Requires(preun): /sbin/chkconfig, /sbin/service
 Requires(post): /sbin/chkconfig
 Requires(postun): /sbin/service
-Requires: moodss >= 21.1, tclx >= 8.3
+Requires: moodss >= 21.2, tclx >= 8.3
 
 %description
 moomps (Modular Object Oriented Multi-Purpose Service) is a modular
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Sat Mar 18 2006 Jean-Luc Fontaine <jfontain at free.fr> 5.6-1
+- 5.6 upstream release
+
 * Mon Mar 6 2006 Jean-Luc Fontaine <jfontain at free.fr> 5.5-1
 - 5.5 upstream release
 - in post installation stage, fix moodss modules path


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	7 Mar 2006 02:37:09 -0000	1.7
+++ sources	10 Apr 2006 22:05:25 -0000	1.8
@@ -1,2 +1,3 @@
 37045d89b50a78f5f6f445cc4d897c62  moomps-5.4.tar.bz2
 249a456d2db2dbc5ed95f31d926d063d  moomps-5.5.tar.bz2
+f2cf3e281df6e004889672dc11b1d505  moomps-5.6.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 10 22:07:48 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Mon, 10 Apr 2006 15:07:48 -0700
Subject: rpms/moomps/FC-4 .cvsignore, 1.7, 1.8 moomps.spec, 1.9, 1.10 sources,
	1.7, 1.8
Message-ID: <200604102207.k3AM7oht030866@cvs-int.fedora.redhat.com>

Author: jfontain

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

Modified Files:
	.cvsignore moomps.spec sources 
Log Message:
5.6 upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	7 Mar 2006 02:55:30 -0000	1.7
+++ .cvsignore	10 Apr 2006 22:07:48 -0000	1.8
@@ -1,2 +1,3 @@
 moomps-5.4.tar.bz2
 moomps-5.5.tar.bz2
+moomps-5.6.tar.bz2


Index: moomps.spec
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-4/moomps.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- moomps.spec	7 Mar 2006 02:55:30 -0000	1.9
+++ moomps.spec	10 Apr 2006 22:07:48 -0000	1.10
@@ -1,10 +1,10 @@
 Name: moomps
-Version: 5.5
+Version: 5.6
 Release: 1%{?dist}
 Summary: Powerful modular monitoring service
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moomps-5.5.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moomps-5.6.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildArchitectures: noarch
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
@@ -13,7 +13,7 @@
 Requires(preun): /sbin/chkconfig, /sbin/service
 Requires(post): /sbin/chkconfig
 Requires(postun): /sbin/service
-Requires: moodss >= 21.1, tclx >= 8.3
+Requires: moodss >= 21.2, tclx >= 8.3
 
 %description
 moomps (Modular Object Oriented Multi-Purpose Service) is a modular
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Sat Mar 18 2006 Jean-Luc Fontaine <jfontain at free.fr> 5.6-1
+- 5.6 upstream release
+
 * Mon Mar 6 2006 Jean-Luc Fontaine <jfontain at free.fr> 5.5-1
 - 5.5 upstream release
 - in post installation stage, fix moodss modules path


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	7 Mar 2006 02:55:30 -0000	1.7
+++ sources	10 Apr 2006 22:07:48 -0000	1.8
@@ -1,2 +1,3 @@
 37045d89b50a78f5f6f445cc4d897c62  moomps-5.4.tar.bz2
 249a456d2db2dbc5ed95f31d926d063d  moomps-5.5.tar.bz2
+f2cf3e281df6e004889672dc11b1d505  moomps-5.6.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 10 22:20:06 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Mon, 10 Apr 2006 15:20:06 -0700
Subject: rpms/enchant/FC-3 .cvsignore, 1.6, 1.7 enchant.spec, 1.7,
	1.8 sources, 1.6, 1.7
Message-ID: <200604102220.k3AMK85b030977@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/enchant/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30956

Modified Files:
	.cvsignore enchant.spec sources 
Log Message:
- New upstream version
- Add hspell requirement/support
- Package the data dir as well (bug 188516)




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/enchant/FC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	5 Feb 2006 21:38:57 -0000	1.6
+++ .cvsignore	10 Apr 2006 22:20:05 -0000	1.7
@@ -1 +1 @@
-enchant-1.2.2.tar.gz
+enchant-1.2.5.tar.gz


Index: enchant.spec
===================================================================
RCS file: /cvs/extras/rpms/enchant/FC-3/enchant.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- enchant.spec	5 Feb 2006 21:38:57 -0000	1.7
+++ enchant.spec	10 Apr 2006 22:20:05 -0000	1.8
@@ -1,6 +1,6 @@
 Summary: An Enchanting Spell Checking Library
 Name: enchant
-Version: 1.2.2
+Version: 1.2.5
 Release: 1%{?dist}
 Epoch: 1
 Group: System Environment/Libraries
@@ -9,6 +9,7 @@
 URL: http://www.abisource.com/
 BuildRequires: glib2-devel >= 2.0.0
 BuildRequires: aspell-devel
+BuildRequires: hspell-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -44,6 +45,7 @@
 %dir %{_libdir}/enchant
 %{_libdir}/enchant/lib*.so*
 %{_mandir}/man1/enchant.1.gz
+%{_datadir}/enchant
 
 %files devel
 %defattr(-,root,root)
@@ -61,6 +63,11 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 1:1.2.5-1.fc3
+- New upstream version
+- Add hspell requirement/support
+- Package the data dir as well (bug 188516)
+
 * Sun Feb 05 2006 Marc Maurer <uwog at abisource.com> 1:1.2.2-1.fc3
 - Update to 1.2.2
 - Drop redundant glib require


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/enchant/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	5 Feb 2006 21:38:57 -0000	1.6
+++ sources	10 Apr 2006 22:20:05 -0000	1.7
@@ -1 +1 @@
-ee7f8261bc607015633206f710671239  enchant-1.2.2.tar.gz
+e64ec808ed2cb687c242ebb835faeb61  enchant-1.2.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 22:53:34 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Mon, 10 Apr 2006 15:53:34 -0700
Subject: kadischi/livecd_generator kadischi.py,1.9,1.10
Message-ID: <200604102253.k3AMrY0v031509@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi/livecd_generator
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31479/kadischi/livecd_generator

Modified Files:
	kadischi.py 
Log Message:
Alleviate dependance on lokkit, allow user configuration.


Index: kadischi.py
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/kadischi.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kadischi.py	4 Apr 2006 13:43:13 -0000	1.9
+++ kadischi.py	10 Apr 2006 22:53:32 -0000	1.10
@@ -253,7 +253,7 @@
 
 for script in scripts:
     flc_log ('%s' % script)
-    run ("%s %s" % (script, sysdir), builddir)
+    run ("%s %s %s" % (script, sysdir, anaconda_args), builddir)
 
 # make initrd image
 



From fedora-extras-commits at redhat.com  Mon Apr 10 22:53:34 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Mon, 10 Apr 2006 15:53:34 -0700
Subject: kadischi/post_install_scripts 04userconfig.py, NONE, 1.1 Makefile.am,
	1.2, 1.3 04auth.sh, 1.3, NONE
Message-ID: <200604102253.k3AMrYGH031515@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi/post_install_scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31479/kadischi/post_install_scripts

Modified Files:
	Makefile.am 
Added Files:
	04userconfig.py 
Removed Files:
	04auth.sh 
Log Message:
Alleviate dependance on lokkit, allow user configuration.


--- NEW FILE 04userconfig.py ---
#!/usr/bin/python -tt
#
# Chroot, run some configuration for non kickstart and cmdline methods.

import os
import sys
import string
from functions import run
from functions import flc_log

sysdir = sys.argv[1]

try:
    anaconda_args = sys.argv[2:]
except IndexError:
    anaconda_args = None

config_done = False

if os.path.isfile("/usr/sbin/authconfig"):
    run("chroot %s %s" % (sysdir, "/usr/sbin/authconfig --kickstart --nostart --enableshadow --enablemd5 --disablecache --disablenis --disableldap --disableldapauth --disableldaptls --disablekrb5 --disablehesiod --disablesmbauth"))

while config_done == False:
    if anaconda_args != None:
        for args in anaconda_args:
            if args.startswith("--kickstart") or args.startswith("--cmdline") or args.startswith("-C"):
                flc_log("Skipping interactive user configuration..")
                config_done = True
                sys.exit(0)
            else:
                if os.path.isfile("/usr/sbin/lokkit") and os.path.isfile("/usr/sbin/ntsysv"):
                    flc_log("Taking you to interactive user configuration..")
                    run("chroot %s %s" % (sysdir, "/usr/sbin/lokkit"))
                    run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv"))
                    config_done = True   
    else:
        if os.path.isfile("/usr/sbin/lokkit") and os.path.isfile("/usr/sbin/ntsysv"):
            flc_log("Taking you to interactive user configuration..")
            run("chroot %s %s" % (sysdir, "/usr/sbin/lokkit"))
            run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv"))
            config_done = True


Index: Makefile.am
===================================================================
RCS file: /cvs/devel/kadischi/post_install_scripts/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am	17 Mar 2006 22:42:27 -0000	1.2
+++ Makefile.am	10 Apr 2006 22:53:32 -0000	1.3
@@ -1,5 +1,5 @@
-PYTHON_FILES = 03fstab.py 05fsclean.py 06sysconfig.py
-BASH_FILES = 01prelink.sh 02install.sh 04auth.sh
+PYTHON_FILES = 03fstab.py 04userconfig.py 05fsclean.py 06sysconfig.py
+BASH_FILES = 01prelink.sh 02install.sh
 
 pisdir = $(pkgdatadir)/post_install_scripts
 pis_SCRIPTS = $(PYTHON_FILES) $(BASH_FILES)


--- 04auth.sh DELETED ---



From fedora-extras-commits at redhat.com  Mon Apr 10 23:22:23 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Mon, 10 Apr 2006 16:22:23 -0700
Subject: kadischi kadischi.spec,NONE,1.1
Message-ID: <200604102322.k3ANMNaA001187@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1159/kadischi

Added Files:
	kadischi.spec 
Log Message:
Addition of kadischi.spec file


--- NEW FILE kadischi.spec ---
%define		alphatag	%(date +%%Y%%m%%d)cvs

Name:           kadischi
Version:        0.1
Release:        6.%{alphatag}
Summary:        LiveCD generation utility 

Group:          Applications/System
License:        GPL
URL:            http://fedoraproject.org/wiki/Kadischi
Source0:        kadischi.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  kudzu-devel glib2-devel intltool autoconf automake
Requires:       python anaconda busybox-anaconda syslinux mkisofs zisofs-tools squashfs-tools e2fsprogs
AutoReqProv:    off

%description
Kadischi is a LiveCD generation tool for Fedora Core systems.
Live media made with Kadischi can be written to a CD or DVD
and run without any prior installation of Fedora Core.

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


%build
glib-gettextize --copy --force
intltoolize --copy -f --automake
aclocal -I .
autoconf
automake --add-missing --copy
%configure
make %{?_smp_mflags}


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


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc
%dir %{_datadir}/%{name}
%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/buildstamp
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
%{_bindir}/%{name}
%{_datadir}/%{name}/*.sh
%{_datadir}/%{name}/*.py
%{_datadir}/%{name}/lib/*.py
%{_datadir}/%{name}/post_install_scripts/*.sh
%{_datadir}/%{name}/post_install_scripts/*.py
%{_datadir}/%{name}/initrd/find-live-cd
%{_datadir}/%{name}/initrd/livecd-linuxrc
%{_datadir}/%{name}/ks_examples/minimal-livecd.cfg
%{_datadir}/%{name}/patches/*.patch
%{_datadir}/%{name}/install/readonly-root
%{_datadir}/%{name}/install/rc.readonly-livecd
%{_datadir}/%{name}/install/readonly-halt
%{_datadir}/%{name}/install/scanswap
%{_datadir}/%{name}/bootsplash/*.msg
%{_datadir}/%{name}/bootsplash/splash.lss
%{_datadir}/%{name}/bootsplash/memtest
%{_mandir}/man1/%{name}.1.gz
%{_mandir}/man5/%{name}.conf.5.gz
%ghost %{_datadir}/%{name}/*.pyc
%ghost %{_datadir}/%{name}/*.pyo
%ghost %{_datadir}/%{name}/lib/*.pyc
%ghost %{_datadir}/%{name}/lib/*.pyo
%ghost %{_datadir}/%{name}/post_install_scripts/*.pyc
%ghost %{_datadir}/%{name}/post_install_scripts/*.pyo

%changelog
* Mon Apr 10 2006 Jasper Hartline <jasperhartline at adelphia.net>
- Rewrote .spec file to conform to standards
- Contributors: Toshio Kuratomi <toshio at tiki-lounge.com>
                Chitlesh Goorah <chitlesh at fedoraproject.org>
                Rudolf Kastl <che666 at gmail.com>



From fedora-extras-commits at redhat.com  Mon Apr 10 23:22:23 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Mon, 10 Apr 2006 16:22:23 -0700
Subject: kadischi/man Makefile.am,1.1,1.2
Message-ID: <200604102322.k3ANMNKi001193@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi/man
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1159/kadischi/man

Modified Files:
	Makefile.am 
Log Message:
Addition of kadischi.spec file


Index: Makefile.am
===================================================================
RCS file: /cvs/devel/kadischi/man/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am	30 Mar 2006 05:51:46 -0000	1.1
+++ Makefile.am	10 Apr 2006 23:22:21 -0000	1.2
@@ -2,6 +2,7 @@
 man_DOC = kadischi.1 kadischi.conf.5
 
 install-data-hook:
+	mkdir -p $(DESTDIR)$(mandir)/{man1,man5}
 	install -m644 kadischi.1 $(DESTDIR)$(mandir)/man1/kadischi.1
 	install -m644 kadischi.conf.5 $(DESTDIR)$(mandir)/man5/kadischi.conf.5
 



From fedora-extras-commits at redhat.com  Mon Apr 10 23:35:23 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Mon, 10 Apr 2006 16:35:23 -0700
Subject: rpms/abiword/FC-5 abiword-2.4.4-desktop.patch, NONE, 1.1 .cvsignore,
	1.13, 1.14 abiword.spec, 1.32, 1.33 sources, 1.13,
	1.14 abiword-2.4.2-desktop.patch, 1.1,
	NONE abiword-2.4.2-macros.patch, 1.1, NONE
Message-ID: <200604102335.k3ANZP1A001250@cvs-int.fedora.redhat.com>

Author: uwog

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

Modified Files:
	.cvsignore abiword.spec sources 
Added Files:
	abiword-2.4.4-desktop.patch 
Removed Files:
	abiword-2.4.2-desktop.patch abiword-2.4.2-macros.patch 
Log Message:
New upstream version



abiword-2.4.4-desktop.patch:

--- NEW FILE abiword-2.4.4-desktop.patch ---
diff -r -u abiword-2.4.4.orig/abi/abiword.desktop abiword-2.4.4/abi/abiword.desktop
--- abiword-2.4.4.orig/abi/abiword.desktop	2006-04-03 14:14:01.000000000 +0200
+++ abiword-2.4.4/abi/abiword.desktop	2006-04-11 00:12:19.000000000 +0200
@@ -7,7 +7,7 @@
 StartupNotify=true
 Encoding=UTF-8
 X-Desktop-File-Install-Version=0.9
-MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;
+MimeType=application/msword;application/vnd.sun.xml.writer;application/vnd.wordperfect;application/x-abiword;text/x-abiword;text/x-xml-abiword;application/rtf;text/plain;application/xhtml+xml;text/html;text/vnd.wap.wml;application/vnd.plain;application/vnd.stardivision.writer;application/x-mif;application/x-kword;application/x-applix-word;application/x-mswrite;application/vnd.oasis.opendocument.text;
 Name=AbiWord
 GenericName=Word Processor
 Comment=AbiWord Word Processor


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-5/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	5 Jan 2006 14:57:02 -0000	1.13
+++ .cvsignore	10 Apr 2006 23:35:23 -0000	1.14
@@ -1 +1 @@
-abiword-2.4.2.tar.bz2
+abiword-2.4.4.tar.bz2


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-5/abiword.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- abiword.spec	8 Mar 2006 22:43:40 -0000	1.32
+++ abiword.spec	10 Apr 2006 23:35:23 -0000	1.33
@@ -2,8 +2,8 @@
 
 Summary: The AbiWord word processor
 Name: abiword
-Version: 2.4.2
-Release: 7%{?dist}
+Version: 2.4.4
+Release: 1%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -30,7 +30,7 @@
 BuildRequires: librsvg2-devel
 BuildRequires: libwmf-devel
 BuildRequires: aiksaurus-gtk-devel >= 1.2.1
-BuildRequires: link-grammar-devel >= 4.1.3
+BuildRequires: link-grammar-devel >= 4.2.1
 BuildRequires: gtkmathview-devel >= 0.7.5
 BuildRequires: libgsf-devel >= 1.12.1
 
@@ -41,8 +41,7 @@
 URL: http://www.abisource.com/
 
 Patch0: abiword-2.0.9-windowshelppaths.patch
-Patch1: abiword-2.4.2-desktop.patch
-Patch2: abiword-2.4.2-macros.patch
+Patch1: abiword-2.4.4-desktop.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. The goal is to make
@@ -52,7 +51,6 @@
 %setup -q 
 %patch0 -p1 -b .windowshelppaths
 %patch1 -p1 -b .desktop
-%patch2 -p1 -b .macros
 
 %build
 cd abi
@@ -134,6 +132,10 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.4-1.fc5
+- New upstream version
+- Remove the macro patch and update the desktop patch
+
 * Wed Mar 08 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.2-7.fc5
 - Disable the collaboration plugin; it is not working in 2.4.x
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	5 Jan 2006 14:57:02 -0000	1.13
+++ sources	10 Apr 2006 23:35:23 -0000	1.14
@@ -1 +1 @@
-935f1218eab7ff96b7a23cfeba4e76d1  abiword-2.4.2.tar.bz2
+69dd69179b861a41613291afd10af9ab  abiword-2.4.4.tar.bz2


--- abiword-2.4.2-desktop.patch DELETED ---


--- abiword-2.4.2-macros.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 11 00:01:24 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon, 10 Apr 2006 17:01:24 -0700
Subject: owners owners.list,1.830,1.831
Message-ID: <200604110001.k3B01uQ1003397@cvs-int.fedora.redhat.com>

Author: wart

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

Modified Files:
	owners.list 
Log Message:
Added yadex, a doom level editor




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.830
retrieving revision 1.831
diff -u -r1.830 -r1.831
--- owners.list	10 Apr 2006 20:46:05 -0000	1.830
+++ owners.list	11 Apr 2006 00:01:23 -0000	1.831
@@ -1595,6 +1595,7 @@
 Fedora Extras|xsupplicant|Open Source Implementation of IEEE 802.1x|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|xtide|A program for calculating tide all over the world|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|xvattr|Utility for getting and setting Xv attributes|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|yadex|A DOOM level editor|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|yakuake|A Quake-like terminal application|dreadyman at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|yap|High-performance Prolog Compiler|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|yasm|Complete rewrite of the NASM assembler|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Apr 11 00:44:24 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Mon, 10 Apr 2006 17:44:24 -0700
Subject: rpms/seamonkey/devel seamonkey.spec,1.1,1.2
Message-ID: <200604110044.k3B0iQE8003645@cvs-int.fedora.redhat.com>

Author: kengert

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

Modified Files:
	seamonkey.spec 
Log Message:
* Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-10
- Added libXt-devel BuildRequires



Index: seamonkey.spec
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/devel/seamonkey.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- seamonkey.spec	10 Apr 2006 21:58:25 -0000	1.1
+++ seamonkey.spec	11 Apr 2006 00:44:24 -0000	1.2
@@ -10,7 +10,7 @@
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
 Version:        1.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPL
 Group:          Applications/Internet
@@ -57,6 +57,7 @@
 BuildRequires:  libIDL-devel
 BuildRequires:  glib2-devel
 BuildRequires:  gtk2-devel
+BuildRequires:  libXt-devel
 BuildRequires:  pango-devel >= %{pango_version}
 BuildRequires:  nspr-devel >= %{nspr_version}
 BuildRequires:  nss-devel >= %{nss_version}
@@ -407,6 +408,8 @@
 
 
 %changelog
+* Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-10
+- Added libXt-devel BuildRequires
 * Mon Apr 10 2006 Kai Engert <kengert at redhat.com> 1.0-9
 - Added dist suffix to release
 * Fri Mar 17 2006 Kai Engert <kengert at redhat.com> 1.0-8



From fedora-extras-commits at redhat.com  Tue Apr 11 01:50:23 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon, 10 Apr 2006 18:50:23 -0700
Subject: rpms/rogue/devel rogue-5.4-setgid.patch, NONE, 1.1 rogue.png, 1.1, 
	1.2 rogue.spec, 1.3, 1.4
Message-ID: <200604110150.k3B1oP5b005833@cvs-int.fedora.redhat.com>

Author: wart

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

Modified Files:
	rogue.png rogue.spec 
Added Files:
	rogue-5.4-setgid.patch 
Log Message:
Better setuid/setgid handling (BZ #187392)
Resize desktop icon to match directory name



rogue-5.4-setgid.patch:

--- NEW FILE rogue-5.4-setgid.patch ---
diff -Naur --exclude '*.swp' rogue/extern.c rogue.new/extern.c
--- rogue/extern.c	2006-01-03 16:17:29.000000000 -0800
+++ rogue.new/extern.c	2006-03-30 13:24:12.000000000 -0800
@@ -111,7 +111,7 @@
 };
 
 int count = 0;				/* Number of times to repeat command */
-int fd;					/* File descriptor for score file */
+FILE *scoreboard = (FILE *)NULL;	/* File descriptor for score file */
 int food_left;				/* Amount of food in hero's stomach */
 int lastscore = -1;			/* Score before this turn */
 int no_command = 0;			/* Number of turns asleep */
diff -Naur --exclude '*.swp' rogue/extern.h rogue.new/extern.h
--- rogue/extern.h	2006-03-19 11:22:14.000000000 -0800
+++ rogue.new/extern.h	2006-03-30 13:24:22.000000000 -0800
@@ -50,7 +50,7 @@
 
 extern char	fruit[], orig_dsusp, prbuf[], whoami[];
 
-extern int	fd;
+extern FILE     *scoreboard;
 
 #ifdef TIOCGLTC
 extern struct ltchars	ltc;
diff -Naur --exclude '*.swp' rogue/mach_dep.c rogue.new/mach_dep.c
--- rogue/mach_dep.c	2006-01-30 08:36:21.000000000 -0800
+++ rogue.new/mach_dep.c	2006-04-01 19:26:15.000000000 -0800
@@ -45,7 +45,9 @@
 #include <sys/stat.h>
 #include <limits.h>
 
+#include <unistd.h>
 #include <fcntl.h>
+#include <errno.h>
 
 static char scorefile[PATH_MAX] = "rogue54.scr";
 static char lockfile[PATH_MAX] = "rogue54.lck";
@@ -99,22 +101,41 @@
 {
     char *homedir = md_getroguedir();
 
+    /*
+     * We drop setgid privileges after opening the score file, so subsequent
+     * open()'s will fail.  Just reuse the earlier filehandle.
+     */
+    if (scoreboard != NULL) {
+        rewind(scoreboard);
+        return;
+    }
+
     if (homedir == NULL)
         homedir = "";
 
 #ifdef SCOREFILE
-    strcpy(scorefile, homedir);
-    if (*scorefile)
-        strcat(scorefile,"/");
-    strcat(scorefile, "rogue54.scr");
-    strcpy(lockfile, homedir);
-    if (*lockfile)
-        strcat(lockfile, "/");
-    strcat(lockfile, "rogue54.lck");
-    fd = open(scorefile, O_RDWR | O_CREAT, 0666);
+    if (*homedir) {
+        snprintf(scorefile, PATH_MAX, "%s/rogue54.scr", homedir);
+    } else {
+        strcpy(scorefile, "rogue54.scr");
+    }
+
+    if (*homedir) {
+        snprintf(lockfile, PATH_MAX, "%s/rogue54.lck", homedir);
+    } else {
+        strcpy(scorefile, "rogue54.lck");
+    }
+    scoreboard = fopen(scorefile, "r+");
+    if (scoreboard == NULL) {
+        fprintf(stderr, "Could not open %s for writing: %s\n", scorefile, strerror(errno));
+        fflush(stderr);
+    }
 #else
-    fd = -1;
+    scoreboard = NULL;
 #endif
+    /*
+     * Drop setuid/setgid after opening the scoreboard file.
+     */
     md_normaluser();
 }
 
diff -Naur --exclude '*.swp' rogue/main.c rogue.new/main.c
--- rogue/main.c	2006-01-29 16:11:32.000000000 -0800
+++ rogue.new/main.c	2006-03-30 13:40:16.000000000 -0800
@@ -24,6 +24,13 @@
     char *env;
     int lowtime;
 
+    /*
+     * Open the scoreboard file and drop setuid/setgid privileges immediately.
+     * open_score() calls md_normaluser() to drop privileges, so we don't have
+     * to do it here explicitly.
+     */
+    open_score();
+
     md_init();
 
 #ifndef DUMP
@@ -89,7 +96,6 @@
     /*
      * check for print-score option
      */
-    open_score();
     if (argc == 2)
 	if (strcmp(argv[1], "-s") == 0)
 	{
diff -Naur --exclude '*.swp' rogue/mdport.c rogue.new/mdport.c
--- rogue/mdport.c	2006-01-29 18:24:39.000000000 -0800
+++ rogue.new/mdport.c	2006-04-01 19:26:16.000000000 -0800
@@ -193,8 +193,17 @@
 md_normaluser()
 {
 #ifndef _WIN32
-    setuid(getuid());
-    setgid(getgid());
+    gid_t realgid = getgid();
+    uid_t realuid = getuid();
+
+    if (setresgid(-1, realgid, realgid) != 0) {
+        perror("Could not drop setgid privileges.  Aborting.");
+        exit(1);
+    }
+    if (setresuid(-1, realuid, realuid) != 0) {
+        perror("Could not drop setuid privileges.  Aborting.");
+        exit(1);
+    }
 #endif
 }
 
@@ -397,22 +406,31 @@
 char *
 md_getroguedir()
 {
-    static char path[1024];
+    static char path[PATH_MAX];
     char *end,*home;
 
     if ( (home = getenv("ROGUEHOME")) != NULL)
     {
         if (*home)
         {
-            strncpy(path, home, PATH_MAX - 20);
-
-            end = &path[strlen(path)-1];
-
-            while( (end >= path) && ((*end == '/') || (*end == '\\')))
-                *end-- = '\0';
-
-            if (directory_exists(path))
-                return(path);
+            if (strlen(home) > PATH_MAX-20) {
+                fprintf(stderr, "ROGUEHOME path is too long.  Ignoring.\n");
+            } else {
+                strncpy(path, home, PATH_MAX-20);
+                /* Ensure that we have a terminating NULL character.
+                 */
+                path[PATH_MAX-1] = (char)NULL;
+    
+                end = &path[strlen(path)-1];
+    
+                /* Strip off any trailing path separators from the path.
+                 */
+                while( (end >= path) && ((*end == '/') || (*end == '\\')))
+                    *end-- = '\0';
+    
+                if (directory_exists(path))
+                    return(path);
+            }
         }
     }
 
diff -Naur --exclude '*.swp' rogue/rip.c rogue.new/rip.c
--- rogue/rip.c	2006-01-03 16:17:29.000000000 -0800
+++ rogue.new/rip.c	2006-03-30 13:32:17.000000000 -0800
@@ -60,7 +60,6 @@
     int i;
     SCORE *sc2;
     SCORE *top_ten, *endp;
-    FILE *outf;
 # ifdef MASTER
     int prflags = 0;
 # endif
@@ -96,11 +95,7 @@
 	    delwin(hw);
     }
 
-    if (fd >= 0)
-	outf = (FILE *)fdopen(fd, "w");
-    else
-	return;
-
+    open_score();
     top_ten = (SCORE *) malloc(numscores * sizeof (SCORE));
     endp = &top_ten[numscores];
     for (scp = top_ten; scp < endp; scp++)
@@ -123,11 +118,9 @@
 	else if (strcmp(prbuf, "edit") == 0)
 	    prflags = 2;
 #endif
-    rd_score(top_ten, fd);
-    fclose(outf);
-    close(fd);
-    open_score(0);
-    outf = (FILE *) fdopen(fd, "w");
+    open_score();
+    rd_score(top_ten, scoreboard);
+    open_score();
     /*
      * Insert her in list if need be
      */
@@ -222,7 +215,7 @@
 	else
 	    break;
     }
-    fseek(outf, 0L, SEEK_SET);
+    fseek(scoreboard, 0L, SEEK_SET);
     /*
      * Update the list file
      */
@@ -231,12 +224,11 @@
 	if (lock_sc())
 	{
 	    fp = signal(SIGINT, SIG_IGN);
-	    wr_score(top_ten, outf);
+	    wr_score(top_ten, scoreboard);
 	    unlock_sc();
 	    signal(SIGINT, fp);
 	}
     }
-    fclose(outf);
 }
 
 /*
diff -Naur --exclude '*.swp' rogue/save.c rogue.new/save.c
--- rogue/save.c	2006-01-30 08:05:35.000000000 -0800
+++ rogue.new/save.c	2006-03-30 13:33:45.000000000 -0800
@@ -335,7 +335,40 @@
 
 /*
  * encread:
- *	Perform an encrypted read
+ *	Perform an encrypted read from a FILE stream
+ */
+size_t
+encread_fromstream(char *start, size_t size, FILE *inf)
+{
+    char *e1, *e2, fb;
+    int temp, read_size;
+    extern char statlist[];
+
+    fb = frob;
+
+    if ((read_size = fread(start, size, 1, inf)) == 0 || read_size == -1)
+	return(read_size);
+
+    e1 = encstr;
+    e2 = statlist;
+
+    while (size--)
+    {
+	*start++ ^= *e1 ^ *e2 ^ fb;
+	temp = *e1++;
+	fb += temp * *e2++;
+	if (*e1 == '\0')
+	    e1 = encstr;
+	if (*e2 == '\0')
+	    e2 = statlist;
+    }
+
+    return(read_size);
+}
+
+/*
+ * encread
+ *	Perform an encrypted read from a file descriptor
  */
 size_t
 encread(char *start, size_t size, int inf)
@@ -371,14 +404,14 @@
  * read_scrore
  *	Read in the score file
  */
-rd_score(SCORE *top_ten, int fd)
+rd_score(SCORE *top_ten, FILE *fd)
 {
     unsigned int i;
 
     for(i = 0; i < numscores; i++)
     {
-        encread(top_ten[i].sc_name, MAXSTR, fd);
-        encread(scoreline, 100, fd);
+        encread_fromstream(top_ten[i].sc_name, MAXSTR, fd);
+        encread_fromstream(scoreline, 100, fd);
         sscanf(scoreline, " %u %hu %u %hu %hu %lx \n",
             &top_ten[i].sc_uid, &top_ten[i].sc_score,
             &top_ten[i].sc_flags, &top_ten[i].sc_monster,
diff -Naur --exclude '*.swp' rogue/state.c rogue.new/state.c
--- rogue/state.c	2006-01-03 16:17:29.000000000 -0800
+++ rogue.new/state.c	2006-03-30 13:09:46.000000000 -0800
@@ -2138,7 +2138,8 @@
     rs_write_int(savef, no_food);
     rs_write_ints(savef,a_class,MAXARMORS);
     rs_write_int(savef, count);
-    rs_write_int(savef, fd);
+    // Don't bother saving the file descriptor anymore.
+    rs_write_int(savef, -1);
     rs_write_int(savef, food_left);
     rs_write_int(savef, lastscore);
     rs_write_int(savef, no_command);
@@ -2275,7 +2276,8 @@
     rs_read_int(inf, &no_food);
     rs_read_ints(inf,a_class,MAXARMORS);
     rs_read_int(inf, &count);
-    rs_read_int(inf, &fd);
+    // Read the file descriptor, but ignore it.
+    rs_read_int(inf, &junk3);
     rs_read_int(inf, &food_left);
     rs_read_int(inf, &lastscore);
     rs_read_int(inf, &no_command);


Index: rogue.spec
===================================================================
RCS file: /cvs/extras/rpms/rogue/devel/rogue.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rogue.spec	13 Mar 2006 19:45:45 -0000	1.3
+++ rogue.spec	11 Apr 2006 01:50:23 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           rogue
 Version:        5.4.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        The original graphical adventure game
 
 Group:          Amusements/Games
@@ -11,6 +11,7 @@
 Source2:        rogue.png
 Patch0:         rogue-rpmopts.patch
 Patch1:         rogue-includes.patch
+Patch2:         rogue-5.4-setgid.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -24,6 +25,7 @@
 %setup -q -c -n %{name}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 %{__sed} -i 's/\r//' rogue54.html
 %{__sed} -i 's/\r//' readme54.html
 chmod a-x *.c *.h
@@ -76,6 +78,10 @@
 
 
 %changelog
+* Thu Mar 30 2006 Wart <wart at kobold.org> 5.4.2-4
+- Better setuid/setgid handling (BZ #187392)
+- Resize desktop icon to match directory name
+
 * Mon Mar 13 2006 Wart <wart at kobold.org> 5.4.2-3
 - Added icon for .desktop file.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 02:02:20 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon, 10 Apr 2006 19:02:20 -0700
Subject: rpms/rogue/FC-5 rogue.png,1.1,1.2 rogue.spec,1.3,1.4
Message-ID: <200604110202.k3B22rip007918@cvs-int.fedora.redhat.com>

Author: wart

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

Modified Files:
	rogue.png rogue.spec 
Log Message:
Better setuid/setgid handling (BZ #187392)
Resize desktop icon to match directory name




Index: rogue.spec
===================================================================
RCS file: /cvs/extras/rpms/rogue/FC-5/rogue.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rogue.spec	13 Mar 2006 19:45:45 -0000	1.3
+++ rogue.spec	11 Apr 2006 02:02:20 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           rogue
 Version:        5.4.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        The original graphical adventure game
 
 Group:          Amusements/Games
@@ -11,6 +11,7 @@
 Source2:        rogue.png
 Patch0:         rogue-rpmopts.patch
 Patch1:         rogue-includes.patch
+Patch2:         rogue-5.4-setgid.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -24,6 +25,7 @@
 %setup -q -c -n %{name}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 %{__sed} -i 's/\r//' rogue54.html
 %{__sed} -i 's/\r//' readme54.html
 chmod a-x *.c *.h
@@ -76,6 +78,10 @@
 
 
 %changelog
+* Thu Mar 30 2006 Wart <wart at kobold.org> 5.4.2-4
+- Better setuid/setgid handling (BZ #187392)
+- Resize desktop icon to match directory name
+
 * Mon Mar 13 2006 Wart <wart at kobold.org> 5.4.2-3
 - Added icon for .desktop file.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 02:04:46 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon, 10 Apr 2006 19:04:46 -0700
Subject: rpms/rogue/FC-5 rogue-5.4-setgid.patch,NONE,1.1
Message-ID: <200604110204.k3B24mq2007982@cvs-int.fedora.redhat.com>

Author: wart

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

Added Files:
	rogue-5.4-setgid.patch 
Log Message:
Better setuid/setgid handling (BZ #187392)



rogue-5.4-setgid.patch:

--- NEW FILE rogue-5.4-setgid.patch ---
diff -Naur --exclude '*.swp' rogue/extern.c rogue.new/extern.c
--- rogue/extern.c	2006-01-03 16:17:29.000000000 -0800
+++ rogue.new/extern.c	2006-03-30 13:24:12.000000000 -0800
@@ -111,7 +111,7 @@
 };
 
 int count = 0;				/* Number of times to repeat command */
-int fd;					/* File descriptor for score file */
+FILE *scoreboard = (FILE *)NULL;	/* File descriptor for score file */
 int food_left;				/* Amount of food in hero's stomach */
 int lastscore = -1;			/* Score before this turn */
 int no_command = 0;			/* Number of turns asleep */
diff -Naur --exclude '*.swp' rogue/extern.h rogue.new/extern.h
--- rogue/extern.h	2006-03-19 11:22:14.000000000 -0800
+++ rogue.new/extern.h	2006-03-30 13:24:22.000000000 -0800
@@ -50,7 +50,7 @@
 
 extern char	fruit[], orig_dsusp, prbuf[], whoami[];
 
-extern int	fd;
+extern FILE     *scoreboard;
 
 #ifdef TIOCGLTC
 extern struct ltchars	ltc;
diff -Naur --exclude '*.swp' rogue/mach_dep.c rogue.new/mach_dep.c
--- rogue/mach_dep.c	2006-01-30 08:36:21.000000000 -0800
+++ rogue.new/mach_dep.c	2006-04-01 19:26:15.000000000 -0800
@@ -45,7 +45,9 @@
 #include <sys/stat.h>
 #include <limits.h>
 
+#include <unistd.h>
 #include <fcntl.h>
+#include <errno.h>
 
 static char scorefile[PATH_MAX] = "rogue54.scr";
 static char lockfile[PATH_MAX] = "rogue54.lck";
@@ -99,22 +101,41 @@
 {
     char *homedir = md_getroguedir();
 
+    /*
+     * We drop setgid privileges after opening the score file, so subsequent
+     * open()'s will fail.  Just reuse the earlier filehandle.
+     */
+    if (scoreboard != NULL) {
+        rewind(scoreboard);
+        return;
+    }
+
     if (homedir == NULL)
         homedir = "";
 
 #ifdef SCOREFILE
-    strcpy(scorefile, homedir);
-    if (*scorefile)
-        strcat(scorefile,"/");
-    strcat(scorefile, "rogue54.scr");
-    strcpy(lockfile, homedir);
-    if (*lockfile)
-        strcat(lockfile, "/");
-    strcat(lockfile, "rogue54.lck");
-    fd = open(scorefile, O_RDWR | O_CREAT, 0666);
+    if (*homedir) {
+        snprintf(scorefile, PATH_MAX, "%s/rogue54.scr", homedir);
+    } else {
+        strcpy(scorefile, "rogue54.scr");
+    }
+
+    if (*homedir) {
+        snprintf(lockfile, PATH_MAX, "%s/rogue54.lck", homedir);
+    } else {
+        strcpy(scorefile, "rogue54.lck");
+    }
+    scoreboard = fopen(scorefile, "r+");
+    if (scoreboard == NULL) {
+        fprintf(stderr, "Could not open %s for writing: %s\n", scorefile, strerror(errno));
+        fflush(stderr);
+    }
 #else
-    fd = -1;
+    scoreboard = NULL;
 #endif
+    /*
+     * Drop setuid/setgid after opening the scoreboard file.
+     */
     md_normaluser();
 }
 
diff -Naur --exclude '*.swp' rogue/main.c rogue.new/main.c
--- rogue/main.c	2006-01-29 16:11:32.000000000 -0800
+++ rogue.new/main.c	2006-03-30 13:40:16.000000000 -0800
@@ -24,6 +24,13 @@
     char *env;
     int lowtime;
 
+    /*
+     * Open the scoreboard file and drop setuid/setgid privileges immediately.
+     * open_score() calls md_normaluser() to drop privileges, so we don't have
+     * to do it here explicitly.
+     */
+    open_score();
+
     md_init();
 
 #ifndef DUMP
@@ -89,7 +96,6 @@
     /*
      * check for print-score option
      */
-    open_score();
     if (argc == 2)
 	if (strcmp(argv[1], "-s") == 0)
 	{
diff -Naur --exclude '*.swp' rogue/mdport.c rogue.new/mdport.c
--- rogue/mdport.c	2006-01-29 18:24:39.000000000 -0800
+++ rogue.new/mdport.c	2006-04-01 19:26:16.000000000 -0800
@@ -193,8 +193,17 @@
 md_normaluser()
 {
 #ifndef _WIN32
-    setuid(getuid());
-    setgid(getgid());
+    gid_t realgid = getgid();
+    uid_t realuid = getuid();
+
+    if (setresgid(-1, realgid, realgid) != 0) {
+        perror("Could not drop setgid privileges.  Aborting.");
+        exit(1);
+    }
+    if (setresuid(-1, realuid, realuid) != 0) {
+        perror("Could not drop setuid privileges.  Aborting.");
+        exit(1);
+    }
 #endif
 }
 
@@ -397,22 +406,31 @@
 char *
 md_getroguedir()
 {
-    static char path[1024];
+    static char path[PATH_MAX];
     char *end,*home;
 
     if ( (home = getenv("ROGUEHOME")) != NULL)
     {
         if (*home)
         {
-            strncpy(path, home, PATH_MAX - 20);
-
-            end = &path[strlen(path)-1];
-
-            while( (end >= path) && ((*end == '/') || (*end == '\\')))
-                *end-- = '\0';
-
-            if (directory_exists(path))
-                return(path);
+            if (strlen(home) > PATH_MAX-20) {
+                fprintf(stderr, "ROGUEHOME path is too long.  Ignoring.\n");
+            } else {
+                strncpy(path, home, PATH_MAX-20);
+                /* Ensure that we have a terminating NULL character.
+                 */
+                path[PATH_MAX-1] = (char)NULL;
+    
+                end = &path[strlen(path)-1];
+    
+                /* Strip off any trailing path separators from the path.
+                 */
+                while( (end >= path) && ((*end == '/') || (*end == '\\')))
+                    *end-- = '\0';
+    
+                if (directory_exists(path))
+                    return(path);
+            }
         }
     }
 
diff -Naur --exclude '*.swp' rogue/rip.c rogue.new/rip.c
--- rogue/rip.c	2006-01-03 16:17:29.000000000 -0800
+++ rogue.new/rip.c	2006-03-30 13:32:17.000000000 -0800
@@ -60,7 +60,6 @@
     int i;
     SCORE *sc2;
     SCORE *top_ten, *endp;
-    FILE *outf;
 # ifdef MASTER
     int prflags = 0;
 # endif
@@ -96,11 +95,7 @@
 	    delwin(hw);
     }
 
-    if (fd >= 0)
-	outf = (FILE *)fdopen(fd, "w");
-    else
-	return;
-
+    open_score();
     top_ten = (SCORE *) malloc(numscores * sizeof (SCORE));
     endp = &top_ten[numscores];
     for (scp = top_ten; scp < endp; scp++)
@@ -123,11 +118,9 @@
 	else if (strcmp(prbuf, "edit") == 0)
 	    prflags = 2;
 #endif
-    rd_score(top_ten, fd);
-    fclose(outf);
-    close(fd);
-    open_score(0);
-    outf = (FILE *) fdopen(fd, "w");
+    open_score();
+    rd_score(top_ten, scoreboard);
+    open_score();
     /*
      * Insert her in list if need be
      */
@@ -222,7 +215,7 @@
 	else
 	    break;
     }
-    fseek(outf, 0L, SEEK_SET);
+    fseek(scoreboard, 0L, SEEK_SET);
     /*
      * Update the list file
      */
@@ -231,12 +224,11 @@
 	if (lock_sc())
 	{
 	    fp = signal(SIGINT, SIG_IGN);
-	    wr_score(top_ten, outf);
+	    wr_score(top_ten, scoreboard);
 	    unlock_sc();
 	    signal(SIGINT, fp);
 	}
     }
-    fclose(outf);
 }
 
 /*
diff -Naur --exclude '*.swp' rogue/save.c rogue.new/save.c
--- rogue/save.c	2006-01-30 08:05:35.000000000 -0800
+++ rogue.new/save.c	2006-03-30 13:33:45.000000000 -0800
@@ -335,7 +335,40 @@
 
 /*
  * encread:
- *	Perform an encrypted read
+ *	Perform an encrypted read from a FILE stream
+ */
+size_t
+encread_fromstream(char *start, size_t size, FILE *inf)
+{
+    char *e1, *e2, fb;
+    int temp, read_size;
+    extern char statlist[];
+
+    fb = frob;
+
+    if ((read_size = fread(start, size, 1, inf)) == 0 || read_size == -1)
+	return(read_size);
+
+    e1 = encstr;
+    e2 = statlist;
+
+    while (size--)
+    {
+	*start++ ^= *e1 ^ *e2 ^ fb;
+	temp = *e1++;
+	fb += temp * *e2++;
+	if (*e1 == '\0')
+	    e1 = encstr;
+	if (*e2 == '\0')
+	    e2 = statlist;
+    }
+
+    return(read_size);
+}
+
+/*
+ * encread
+ *	Perform an encrypted read from a file descriptor
  */
 size_t
 encread(char *start, size_t size, int inf)
@@ -371,14 +404,14 @@
  * read_scrore
  *	Read in the score file
  */
-rd_score(SCORE *top_ten, int fd)
+rd_score(SCORE *top_ten, FILE *fd)
 {
     unsigned int i;
 
     for(i = 0; i < numscores; i++)
     {
-        encread(top_ten[i].sc_name, MAXSTR, fd);
-        encread(scoreline, 100, fd);
+        encread_fromstream(top_ten[i].sc_name, MAXSTR, fd);
+        encread_fromstream(scoreline, 100, fd);
         sscanf(scoreline, " %u %hu %u %hu %hu %lx \n",
             &top_ten[i].sc_uid, &top_ten[i].sc_score,
             &top_ten[i].sc_flags, &top_ten[i].sc_monster,
diff -Naur --exclude '*.swp' rogue/state.c rogue.new/state.c
--- rogue/state.c	2006-01-03 16:17:29.000000000 -0800
+++ rogue.new/state.c	2006-03-30 13:09:46.000000000 -0800
@@ -2138,7 +2138,8 @@
     rs_write_int(savef, no_food);
     rs_write_ints(savef,a_class,MAXARMORS);
     rs_write_int(savef, count);
-    rs_write_int(savef, fd);
+    // Don't bother saving the file descriptor anymore.
+    rs_write_int(savef, -1);
     rs_write_int(savef, food_left);
     rs_write_int(savef, lastscore);
     rs_write_int(savef, no_command);
@@ -2275,7 +2276,8 @@
     rs_read_int(inf, &no_food);
     rs_read_ints(inf,a_class,MAXARMORS);
     rs_read_int(inf, &count);
-    rs_read_int(inf, &fd);
+    // Read the file descriptor, but ignore it.
+    rs_read_int(inf, &junk3);
     rs_read_int(inf, &food_left);
     rs_read_int(inf, &lastscore);
     rs_read_int(inf, &no_command);



From fedora-extras-commits at redhat.com  Tue Apr 11 02:05:20 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon, 10 Apr 2006 19:05:20 -0700
Subject: rpms/rogue/FC-4 rogue-5.4-setgid.patch,NONE,1.1 rogue.spec,1.3,1.4
Message-ID: <200604110205.k3B25Mcq008014@cvs-int.fedora.redhat.com>

Author: wart

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

Modified Files:
	rogue.spec 
Added Files:
	rogue-5.4-setgid.patch 
Log Message:
Better setuid/setgid handling (BZ #187392)
Resize desktop icon to match directory name



rogue-5.4-setgid.patch:

--- NEW FILE rogue-5.4-setgid.patch ---
diff -Naur --exclude '*.swp' rogue/extern.c rogue.new/extern.c
--- rogue/extern.c	2006-01-03 16:17:29.000000000 -0800
+++ rogue.new/extern.c	2006-03-30 13:24:12.000000000 -0800
@@ -111,7 +111,7 @@
 };
 
 int count = 0;				/* Number of times to repeat command */
-int fd;					/* File descriptor for score file */
+FILE *scoreboard = (FILE *)NULL;	/* File descriptor for score file */
 int food_left;				/* Amount of food in hero's stomach */
 int lastscore = -1;			/* Score before this turn */
 int no_command = 0;			/* Number of turns asleep */
diff -Naur --exclude '*.swp' rogue/extern.h rogue.new/extern.h
--- rogue/extern.h	2006-03-19 11:22:14.000000000 -0800
+++ rogue.new/extern.h	2006-03-30 13:24:22.000000000 -0800
@@ -50,7 +50,7 @@
 
 extern char	fruit[], orig_dsusp, prbuf[], whoami[];
 
-extern int	fd;
+extern FILE     *scoreboard;
 
 #ifdef TIOCGLTC
 extern struct ltchars	ltc;
diff -Naur --exclude '*.swp' rogue/mach_dep.c rogue.new/mach_dep.c
--- rogue/mach_dep.c	2006-01-30 08:36:21.000000000 -0800
+++ rogue.new/mach_dep.c	2006-04-01 19:26:15.000000000 -0800
@@ -45,7 +45,9 @@
 #include <sys/stat.h>
 #include <limits.h>
 
+#include <unistd.h>
 #include <fcntl.h>
+#include <errno.h>
 
 static char scorefile[PATH_MAX] = "rogue54.scr";
 static char lockfile[PATH_MAX] = "rogue54.lck";
@@ -99,22 +101,41 @@
 {
     char *homedir = md_getroguedir();
 
+    /*
+     * We drop setgid privileges after opening the score file, so subsequent
+     * open()'s will fail.  Just reuse the earlier filehandle.
+     */
+    if (scoreboard != NULL) {
+        rewind(scoreboard);
+        return;
+    }
+
     if (homedir == NULL)
         homedir = "";
 
 #ifdef SCOREFILE
-    strcpy(scorefile, homedir);
-    if (*scorefile)
-        strcat(scorefile,"/");
-    strcat(scorefile, "rogue54.scr");
-    strcpy(lockfile, homedir);
-    if (*lockfile)
-        strcat(lockfile, "/");
-    strcat(lockfile, "rogue54.lck");
-    fd = open(scorefile, O_RDWR | O_CREAT, 0666);
+    if (*homedir) {
+        snprintf(scorefile, PATH_MAX, "%s/rogue54.scr", homedir);
+    } else {
+        strcpy(scorefile, "rogue54.scr");
+    }
+
+    if (*homedir) {
+        snprintf(lockfile, PATH_MAX, "%s/rogue54.lck", homedir);
+    } else {
+        strcpy(scorefile, "rogue54.lck");
+    }
+    scoreboard = fopen(scorefile, "r+");
+    if (scoreboard == NULL) {
+        fprintf(stderr, "Could not open %s for writing: %s\n", scorefile, strerror(errno));
+        fflush(stderr);
+    }
 #else
-    fd = -1;
+    scoreboard = NULL;
 #endif
+    /*
+     * Drop setuid/setgid after opening the scoreboard file.
+     */
     md_normaluser();
 }
 
diff -Naur --exclude '*.swp' rogue/main.c rogue.new/main.c
--- rogue/main.c	2006-01-29 16:11:32.000000000 -0800
+++ rogue.new/main.c	2006-03-30 13:40:16.000000000 -0800
@@ -24,6 +24,13 @@
     char *env;
     int lowtime;
 
+    /*
+     * Open the scoreboard file and drop setuid/setgid privileges immediately.
+     * open_score() calls md_normaluser() to drop privileges, so we don't have
+     * to do it here explicitly.
+     */
+    open_score();
+
     md_init();
 
 #ifndef DUMP
@@ -89,7 +96,6 @@
     /*
      * check for print-score option
      */
-    open_score();
     if (argc == 2)
 	if (strcmp(argv[1], "-s") == 0)
 	{
diff -Naur --exclude '*.swp' rogue/mdport.c rogue.new/mdport.c
--- rogue/mdport.c	2006-01-29 18:24:39.000000000 -0800
+++ rogue.new/mdport.c	2006-04-01 19:26:16.000000000 -0800
@@ -193,8 +193,17 @@
 md_normaluser()
 {
 #ifndef _WIN32
-    setuid(getuid());
-    setgid(getgid());
+    gid_t realgid = getgid();
+    uid_t realuid = getuid();
+
+    if (setresgid(-1, realgid, realgid) != 0) {
+        perror("Could not drop setgid privileges.  Aborting.");
+        exit(1);
+    }
+    if (setresuid(-1, realuid, realuid) != 0) {
+        perror("Could not drop setuid privileges.  Aborting.");
+        exit(1);
+    }
 #endif
 }
 
@@ -397,22 +406,31 @@
 char *
 md_getroguedir()
 {
-    static char path[1024];
+    static char path[PATH_MAX];
     char *end,*home;
 
     if ( (home = getenv("ROGUEHOME")) != NULL)
     {
         if (*home)
         {
-            strncpy(path, home, PATH_MAX - 20);
-
-            end = &path[strlen(path)-1];
-
-            while( (end >= path) && ((*end == '/') || (*end == '\\')))
-                *end-- = '\0';
-
-            if (directory_exists(path))
-                return(path);
+            if (strlen(home) > PATH_MAX-20) {
+                fprintf(stderr, "ROGUEHOME path is too long.  Ignoring.\n");
+            } else {
+                strncpy(path, home, PATH_MAX-20);
+                /* Ensure that we have a terminating NULL character.
+                 */
+                path[PATH_MAX-1] = (char)NULL;
+    
+                end = &path[strlen(path)-1];
+    
+                /* Strip off any trailing path separators from the path.
+                 */
+                while( (end >= path) && ((*end == '/') || (*end == '\\')))
+                    *end-- = '\0';
+    
+                if (directory_exists(path))
+                    return(path);
+            }
         }
     }
 
diff -Naur --exclude '*.swp' rogue/rip.c rogue.new/rip.c
--- rogue/rip.c	2006-01-03 16:17:29.000000000 -0800
+++ rogue.new/rip.c	2006-03-30 13:32:17.000000000 -0800
@@ -60,7 +60,6 @@
     int i;
     SCORE *sc2;
     SCORE *top_ten, *endp;
-    FILE *outf;
 # ifdef MASTER
     int prflags = 0;
 # endif
@@ -96,11 +95,7 @@
 	    delwin(hw);
     }
 
-    if (fd >= 0)
-	outf = (FILE *)fdopen(fd, "w");
-    else
-	return;
-
+    open_score();
     top_ten = (SCORE *) malloc(numscores * sizeof (SCORE));
     endp = &top_ten[numscores];
     for (scp = top_ten; scp < endp; scp++)
@@ -123,11 +118,9 @@
 	else if (strcmp(prbuf, "edit") == 0)
 	    prflags = 2;
 #endif
-    rd_score(top_ten, fd);
-    fclose(outf);
-    close(fd);
-    open_score(0);
-    outf = (FILE *) fdopen(fd, "w");
+    open_score();
+    rd_score(top_ten, scoreboard);
+    open_score();
     /*
      * Insert her in list if need be
      */
@@ -222,7 +215,7 @@
 	else
 	    break;
     }
-    fseek(outf, 0L, SEEK_SET);
+    fseek(scoreboard, 0L, SEEK_SET);
     /*
      * Update the list file
      */
@@ -231,12 +224,11 @@
 	if (lock_sc())
 	{
 	    fp = signal(SIGINT, SIG_IGN);
-	    wr_score(top_ten, outf);
+	    wr_score(top_ten, scoreboard);
 	    unlock_sc();
 	    signal(SIGINT, fp);
 	}
     }
-    fclose(outf);
 }
 
 /*
diff -Naur --exclude '*.swp' rogue/save.c rogue.new/save.c
--- rogue/save.c	2006-01-30 08:05:35.000000000 -0800
+++ rogue.new/save.c	2006-03-30 13:33:45.000000000 -0800
@@ -335,7 +335,40 @@
 
 /*
  * encread:
- *	Perform an encrypted read
+ *	Perform an encrypted read from a FILE stream
+ */
+size_t
+encread_fromstream(char *start, size_t size, FILE *inf)
+{
+    char *e1, *e2, fb;
+    int temp, read_size;
+    extern char statlist[];
+
+    fb = frob;
+
+    if ((read_size = fread(start, size, 1, inf)) == 0 || read_size == -1)
+	return(read_size);
+
+    e1 = encstr;
+    e2 = statlist;
+
+    while (size--)
+    {
+	*start++ ^= *e1 ^ *e2 ^ fb;
+	temp = *e1++;
+	fb += temp * *e2++;
+	if (*e1 == '\0')
+	    e1 = encstr;
+	if (*e2 == '\0')
+	    e2 = statlist;
+    }
+
+    return(read_size);
+}
+
+/*
+ * encread
+ *	Perform an encrypted read from a file descriptor
  */
 size_t
 encread(char *start, size_t size, int inf)
@@ -371,14 +404,14 @@
  * read_scrore
  *	Read in the score file
  */
-rd_score(SCORE *top_ten, int fd)
+rd_score(SCORE *top_ten, FILE *fd)
 {
     unsigned int i;
 
     for(i = 0; i < numscores; i++)
     {
-        encread(top_ten[i].sc_name, MAXSTR, fd);
-        encread(scoreline, 100, fd);
+        encread_fromstream(top_ten[i].sc_name, MAXSTR, fd);
+        encread_fromstream(scoreline, 100, fd);
         sscanf(scoreline, " %u %hu %u %hu %hu %lx \n",
             &top_ten[i].sc_uid, &top_ten[i].sc_score,
             &top_ten[i].sc_flags, &top_ten[i].sc_monster,
diff -Naur --exclude '*.swp' rogue/state.c rogue.new/state.c
--- rogue/state.c	2006-01-03 16:17:29.000000000 -0800
+++ rogue.new/state.c	2006-03-30 13:09:46.000000000 -0800
@@ -2138,7 +2138,8 @@
     rs_write_int(savef, no_food);
     rs_write_ints(savef,a_class,MAXARMORS);
     rs_write_int(savef, count);
-    rs_write_int(savef, fd);
+    // Don't bother saving the file descriptor anymore.
+    rs_write_int(savef, -1);
     rs_write_int(savef, food_left);
     rs_write_int(savef, lastscore);
     rs_write_int(savef, no_command);
@@ -2275,7 +2276,8 @@
     rs_read_int(inf, &no_food);
     rs_read_ints(inf,a_class,MAXARMORS);
     rs_read_int(inf, &count);
-    rs_read_int(inf, &fd);
+    // Read the file descriptor, but ignore it.
+    rs_read_int(inf, &junk3);
     rs_read_int(inf, &food_left);
     rs_read_int(inf, &lastscore);
     rs_read_int(inf, &no_command);


Index: rogue.spec
===================================================================
RCS file: /cvs/extras/rpms/rogue/FC-4/rogue.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rogue.spec	13 Mar 2006 19:45:45 -0000	1.3
+++ rogue.spec	11 Apr 2006 02:05:19 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           rogue
 Version:        5.4.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        The original graphical adventure game
 
 Group:          Amusements/Games
@@ -11,6 +11,7 @@
 Source2:        rogue.png
 Patch0:         rogue-rpmopts.patch
 Patch1:         rogue-includes.patch
+Patch2:         rogue-5.4-setgid.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -24,6 +25,7 @@
 %setup -q -c -n %{name}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 %{__sed} -i 's/\r//' rogue54.html
 %{__sed} -i 's/\r//' readme54.html
 chmod a-x *.c *.h
@@ -76,6 +78,10 @@
 
 
 %changelog
+* Thu Mar 30 2006 Wart <wart at kobold.org> 5.4.2-4
+- Better setuid/setgid handling (BZ #187392)
+- Resize desktop icon to match directory name
+
 * Mon Mar 13 2006 Wart <wart at kobold.org> 5.4.2-3
 - Added icon for .desktop file.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 02:15:50 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Mon, 10 Apr 2006 19:15:50 -0700
Subject: fedora-security/audit fc4,1.196,1.197 fc5,1.109,1.110
Message-ID: <200604110215.k3B2Fo5G008733@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8713

Modified Files:
	fc4 fc5 
Log Message:
Add some php CVE ids.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- fc4	10 Apr 2006 16:12:36 -0000	1.196
+++ fc4	11 Apr 2006 02:15:48 -0000	1.197
@@ -5,12 +5,15 @@
 
 CVE-2006-1646 ignore (ipsec-tools) KAME racoon, not ipsec-tools racoon
 CVE-2006-1624 ignore (sysklogd) Silly configuration is not a security issue
+CVE-2006-1608 ignore (php) safe mode isn't safe
 CVE-2006-1550 backport (dia) bz#187402 [since FEDORA-2006-261]
+CVE-2006-1549 ignore (php) this is not a security issue
 CVE-2006-1548 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1542 VULNERABLE (python) bz#169046
 CVE-2006-1522 VULNERABLE (kernel)
+CVE-2006-1494 VULNERABLE (php)
 CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-245]
 CVE-2006-1354 VULNERABLE (freeradius) bz#186084
 CVE-2006-1343 VULNERABLE (kernel)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- fc5	10 Apr 2006 16:12:36 -0000	1.109
+++ fc5	11 Apr 2006 02:15:48 -0000	1.110
@@ -5,11 +5,14 @@
 
 CVE-2006-1646 ignore (ipsec-tools) KAME racoon, not ipsec-tools racoon
 CVE-2006-1624 ignore (sysklogd) Silly configuration is not a security issue
+CVE-2006-1608 ignore (php) safe mode isn't safe
+CVE-2006-1549 ignore (php) this is not a security issue
 CVE-2006-1548 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1542 VULNERABLE (python) bz#169046
 CVE-2006-1522 VULNERABLE (kernel)
+CVE-2006-1494 VULNERABLE (php)
 CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-233]
 CVE-2006-1354 VULNERABLE (freeradius) bz#186084
 CVE-2006-1343 VULNERABLE (kernel)



From fedora-extras-commits at redhat.com  Tue Apr 11 03:11:24 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 10 Apr 2006 20:11:24 -0700
Subject: rpms/nethack/devel nethack.spec,1.13,1.14
Message-ID: <200604110311.k3B3BQVi010851@cvs-int.fedora.redhat.com>

Author: lmacken

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

Modified Files:
	nethack.spec 
Log Message:
* Mon Apr 10 2006 Luke Macken <lmacken at redhat.com> 3.4.3-10
- Remove $RPM_BUILD_ROOT from %post (Bug #188008)




Index: nethack.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack/devel/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	11 Apr 2006 03:11:24 -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
@@ -134,6 +134,9 @@
 
 
 %changelog
+* Mon Apr 10 2006 Luke Macken <lmacken at redhat.com> 3.4.3-10
+- 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  Tue Apr 11 06:14:30 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 10 Apr 2006 23:14:30 -0700
Subject: rpms/gwenview/FC-5 gwenview.spec,1.14,1.15
Message-ID: <200604110614.k3B6EWb1022735@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	gwenview.spec 
Log Message:
- fix build outside the buildsystem (bug 188486)


Index: gwenview.spec
===================================================================
RCS file: /cvs/extras/rpms/gwenview/FC-5/gwenview.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gwenview.spec	21 Feb 2006 17:15:55 -0000	1.14
+++ gwenview.spec	11 Apr 2006 06:14:30 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           gwenview
 Version:        1.3.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Simple image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -13,7 +13,7 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  libkipi-devel
 BuildRequires:  gettext
-%if %{fedora} >= 5
+%if "%{fedora}" >= "5"
 BuildRequires:  libXt-devel
 %endif
 
@@ -95,6 +95,9 @@
 
 
 %changelog
+* Tue Apr 11 2006 Aurelien Bompard <gauret[AT]free.fr> 1.3.1-5
+- fix build outside the buildsystem (bug 188486)
+
 * Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 1.3.1-4
 - rebuild for fc5
 



From fedora-extras-commits at redhat.com  Tue Apr 11 06:14:31 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 10 Apr 2006 23:14:31 -0700
Subject: rpms/gwenview/devel gwenview.spec,1.14,1.15
Message-ID: <200604110614.k3B6EXKA022739@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	gwenview.spec 
Log Message:
- fix build outside the buildsystem (bug 188486)


Index: gwenview.spec
===================================================================
RCS file: /cvs/extras/rpms/gwenview/devel/gwenview.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gwenview.spec	21 Feb 2006 17:15:55 -0000	1.14
+++ gwenview.spec	11 Apr 2006 06:14:31 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           gwenview
 Version:        1.3.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Simple image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -13,7 +13,7 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  libkipi-devel
 BuildRequires:  gettext
-%if %{fedora} >= 5
+%if "%{fedora}" >= "5"
 BuildRequires:  libXt-devel
 %endif
 
@@ -95,6 +95,9 @@
 
 
 %changelog
+* Tue Apr 11 2006 Aurelien Bompard <gauret[AT]free.fr> 1.3.1-5
+- fix build outside the buildsystem (bug 188486)
+
 * Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 1.3.1-4
 - rebuild for fc5
 



From fedora-extras-commits at redhat.com  Tue Apr 11 06:17:02 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 10 Apr 2006 23:17:02 -0700
Subject: rpms/colorscheme/FC-5 .cvsignore, 1.6, 1.7 colorscheme.spec, 1.8,
	1.9 sources, 1.6, 1.7
Message-ID: <200604110617.k3B6H4pV022798@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	.cvsignore colorscheme.spec sources 
Log Message:
- update to 0.3.91
- fix build outside the buildsystem (bug 188480)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/colorscheme/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	23 Nov 2005 19:15:54 -0000	1.6
+++ .cvsignore	11 Apr 2006 06:17:02 -0000	1.7
@@ -1 +1 @@
-colorscheme-0.3.tar.bz2
+colorscheme-0.3.91.tar.bz2


Index: colorscheme.spec
===================================================================
RCS file: /cvs/extras/rpms/colorscheme/FC-5/colorscheme.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- colorscheme.spec	21 Feb 2006 17:08:02 -0000	1.8
+++ colorscheme.spec	11 Apr 2006 06:17:02 -0000	1.9
@@ -1,17 +1,18 @@
 Name:           colorscheme
-Version:        0.3
-Release:        3%{?dist}
+Version:        0.3.91
+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/0.3/colorscheme-0.3.tar.bz2
+Source0:        http://download.gna.org/colorscheme/releases/colorscheme-0.3.91.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# see http://home.gna.org/colorscheme/downloads.shtml for buildreqs
 BuildRequires:  gtkmm24-devel >= 2.5, libgnomeui-devel >= 2.0, desktop-file-utils
-BuildRequires:  cppunit-devel, gnome-vfsmm26-devel, boost-devel
-%if %{fedora} >= 5
+BuildRequires:  cppunit-devel, gnome-vfsmm26-devel, boost-devel, gconfmm26-devel
+%if "%{fedora}" >= "5"
 BuildRequires:  libSM-devel
 %endif
 
@@ -65,6 +66,10 @@
 
 
 %changelog
+* Tue Apr 11 2006 Aurelien Bompard <gauret[AT]free.fr> 0.3.91-1
+- update to 0.3.91
+- fix build outside the buildsystem (bug 188480)
+
 * Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 0.3-3
 - rebuild for fc5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/colorscheme/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Nov 2005 19:15:54 -0000	1.6
+++ sources	11 Apr 2006 06:17:02 -0000	1.7
@@ -1 +1 @@
-fef79d6a6a718f5a2c34a49d56b0367a  colorscheme-0.3.tar.bz2
+6474ecbc372b5bfaf15b0083a48102e3  colorscheme-0.3.91.tar.bz2



From fedora-extras-commits at redhat.com  Tue Apr 11 06:17:03 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 10 Apr 2006 23:17:03 -0700
Subject: rpms/colorscheme/devel .cvsignore, 1.6, 1.7 colorscheme.spec, 1.8, 
	1.9 sources, 1.6, 1.7
Message-ID: <200604110617.k3B6H54D022804@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	.cvsignore colorscheme.spec sources 
Log Message:
- update to 0.3.91
- fix build outside the buildsystem (bug 188480)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/colorscheme/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	23 Nov 2005 19:15:54 -0000	1.6
+++ .cvsignore	11 Apr 2006 06:17:03 -0000	1.7
@@ -1 +1 @@
-colorscheme-0.3.tar.bz2
+colorscheme-0.3.91.tar.bz2


Index: colorscheme.spec
===================================================================
RCS file: /cvs/extras/rpms/colorscheme/devel/colorscheme.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- colorscheme.spec	21 Feb 2006 17:08:02 -0000	1.8
+++ colorscheme.spec	11 Apr 2006 06:17:03 -0000	1.9
@@ -1,17 +1,18 @@
 Name:           colorscheme
-Version:        0.3
-Release:        3%{?dist}
+Version:        0.3.91
+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/0.3/colorscheme-0.3.tar.bz2
+Source0:        http://download.gna.org/colorscheme/releases/colorscheme-0.3.91.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# see http://home.gna.org/colorscheme/downloads.shtml for buildreqs
 BuildRequires:  gtkmm24-devel >= 2.5, libgnomeui-devel >= 2.0, desktop-file-utils
-BuildRequires:  cppunit-devel, gnome-vfsmm26-devel, boost-devel
-%if %{fedora} >= 5
+BuildRequires:  cppunit-devel, gnome-vfsmm26-devel, boost-devel, gconfmm26-devel
+%if "%{fedora}" >= "5"
 BuildRequires:  libSM-devel
 %endif
 
@@ -65,6 +66,10 @@
 
 
 %changelog
+* Tue Apr 11 2006 Aurelien Bompard <gauret[AT]free.fr> 0.3.91-1
+- update to 0.3.91
+- fix build outside the buildsystem (bug 188480)
+
 * Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 0.3-3
 - rebuild for fc5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/colorscheme/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Nov 2005 19:15:54 -0000	1.6
+++ sources	11 Apr 2006 06:17:03 -0000	1.7
@@ -1 +1 @@
-fef79d6a6a718f5a2c34a49d56b0367a  colorscheme-0.3.tar.bz2
+6474ecbc372b5bfaf15b0083a48102e3  colorscheme-0.3.91.tar.bz2



From fedora-extras-commits at redhat.com  Tue Apr 11 06:21:45 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 10 Apr 2006 23:21:45 -0700
Subject: rpms/rpmlint/devel rpmlint-0.76-debuginfo.patch, NONE,
	1.1 rpmlint-0.76-disttag.patch, NONE, 1.1 .cvsignore, 1.11,
	1.12 rpmlint-fedora-config, 1.11, 1.12 rpmlint.spec, 1.22,
	1.23 sources, 1.11, 1.12 rpmlint-0.71-disttag.patch, 1.1,
	NONE rpmlint-0.71-doc-exec.patch, 1.1,
	NONE rpmlint-0.71-la-exec.patch, 1.1,
	NONE rpmlint-0.71-prereq.patch, 1.1,
	NONE rpmlint-0.75-develdep.patch, 1.1, NONE
Message-ID: <200604110621.k3B6Ll4P022988@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	.cvsignore rpmlint-fedora-config rpmlint.spec sources 
Added Files:
	rpmlint-0.76-debuginfo.patch rpmlint-0.76-disttag.patch 
Removed Files:
	rpmlint-0.71-disttag.patch rpmlint-0.71-doc-exec.patch 
	rpmlint-0.71-la-exec.patch rpmlint-0.71-prereq.patch 
	rpmlint-0.75-develdep.patch 
Log Message:
* Tue Apr 11 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.76-1
- 0.76.

* Mon Mar 27 2006 Ville Skytt?? <ville.skytta at iki.fi>
- Don't pass -T to objdump for *.debug files (#185227).
- lib64 library path fixes (#185228).

* Wed Mar 15 2006 Ville Skytt?? <ville.skytta at iki.fi>
- Accept zlib License (#185501).

* Tue Feb 28 2006 Ville Skytt?? <ville.skytta at iki.fi>
- Accept Ruby License (#183384) and SIL Open Font License (#176405).


rpmlint-0.76-debuginfo.patch:

--- NEW FILE rpmlint-0.76-debuginfo.patch ---
Index: FilesCheck.py
===================================================================
--- FilesCheck.py	(revision 1144)
+++ FilesCheck.py	(working copy)
@@ -158,7 +158,7 @@
 includefile_regex=re.compile('\.(c|h|a|cmi)$')
 buildconfigfile_regex=re.compile('(\.pc|/bin/.+-config)$')
 sofile_regex=re.compile('/lib(64)?/[^/]+\.so$')
-devel_regex=re.compile('-(devel|source)$')
+devel_regex=re.compile('-(debug(info)?|devel|source)$')
 lib_regex=re.compile('lib(64)?/lib[^/]*\.so\..*')
 ldconfig_regex=re.compile('^[^#]*ldconfig', re.MULTILINE)
 depmod_regex=re.compile('^[^#]*depmod', re.MULTILINE)

rpmlint-0.76-disttag.patch:

--- NEW FILE rpmlint-0.76-disttag.patch ---
--- TagsCheck.py~	2006-04-05 19:21:45.000000000 +0300
+++ TagsCheck.py	2006-04-08 23:04:04.000000000 +0300
@@ -342,2 +342,3 @@
 changelog_version_regex=re.compile('[^>]([^ >]+)\s*$')
+fedora_disttag_regex=re.compile('\.(fc|rhe?l)\d+$')
 release_ext=Config.getOption('ReleaseExtension')
@@ -556,3 +557,3 @@
                             expected=str(epoch) + ':' + expected
-                        if expected != ret.group(1):
+                        if ret.group(1) not in (expected, fedora_disttag_regex.sub('', expected)):
                             printWarning(pkg, 'incoherent-version-in-changelog', ret.group(1), expected)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	12 Feb 2006 20:31:35 -0000	1.11
+++ .cvsignore	11 Apr 2006 06:21:45 -0000	1.12
@@ -1 +1 @@
-rpmlint-0.75.tar.bz2
+rpmlint-0.76.tar.bz2


Index: rpmlint-fedora-config
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint-fedora-config,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rpmlint-fedora-config	17 Jan 2006 20:33:54 -0000	1.11
+++ rpmlint-fedora-config	11 Apr 2006 06:21:45 -0000	1.12
@@ -4,9 +4,6 @@
 
 from Config import *
 
-setOption("ReleaseExtension", '')
-setOption("ValidBuildHost", ".*")
-setOption("Packager", ".*")
 setOption("UseVersionInChangeLog", 1)
 setOption("UseBzip2", 0)
 setOption("UseDefaultRunlevels", 0)
@@ -65,8 +62,11 @@
     "Public Domain",
     "Python Software Foundation License",
     "QPL",
+    "Ruby License",
     "Sun Public License",
+    "SIL Open Font License",
     "W3C Software License",
+    "zlib License",
     "Zope Public License",
 ))
 setOption("ValidShells", (
@@ -82,22 +82,23 @@
 ))
 
 # Output filters
-addFilter("W: .* source-or-patch-not-[bg]zipped .*")
-addFilter("E: .* lib-package-without-%mklibname")
-addFilter("E: .* no-dependency-on (perl|python)-base.*")
-addFilter("E: .* no-dependency-on locales-.*")
-addFilter("W: .* (python|perl5)-naming-policy-not-applied.*")
-addFilter("W: .* invalid-(distribution|vendor) .*")
-addFilter("E: .* no-(packager-tag|signature)")
-addFilter("E: .* incoherent-version-in-name.*")
-addFilter("E: .* invalid-build-requires .*")
-addFilter("W: .* ghost-files-without-postin")
-addFilter("W: .* postin-without-ghost-file-creation .*")
-addFilter("W: .* no-major-in-name .*")
-addFilter("W: .* no-provides .*")
-addFilter("E: .* executable-in-library-package .*")
-addFilter("E: .* non-versioned-file-in-library-package .*")
-addFilter("E: .* requires-on-release .*")
-addFilter("W: .* jar-not-indexed .*")
-addFilter("E: .* invalid-(lc-messages|locale-man)-dir .*")
-addFilter("E: .* outside-libdir-files .*")
+addFilter("source-or-patch-not-[bg]zipped")
+addFilter("%mklibname")
+addFilter("no-dependency-on (perl|python)-base")
+addFilter("no-dependency-on locales-")
+addFilter("(python|perl5)-naming-policy-not-applied")
+addFilter("no-(packager-tag|signature)")
+addFilter("incoherent-version-in-name")
+addFilter("invalid-build-requires")
+addFilter("ghost-files-without-postin")
+addFilter("postin-without-ghost-file-creation")
+addFilter("no-major-in-name")
+addFilter("no-provides")
+addFilter("executable-in-library-package")
+addFilter("non-versioned-file-in-library-package")
+addFilter("requires-on-release")
+addFilter("jar-not-indexed")
+addFilter("invalid-(lc-messages|locale-man)-dir")
+addFilter("outside-libdir-files")
+addFilter('-debuginfo no-documentation')
+addFilter('-debuginfo [^ ]+ /usr/lib/debug/')


Index: rpmlint.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- rpmlint.spec	17 Feb 2006 23:06:36 -0000	1.22
+++ rpmlint.spec	11 Apr 2006 06:21:45 -0000	1.23
@@ -1,19 +1,19 @@
+# TODO:
+# - don't override upstream default valid groups, just add "Development/Debug"
+# - switch to upstream valid license list?
+
 Name:           rpmlint
-Version:        0.75
+Version:        0.76
 Release:        1%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
 License:        GPL
-URL:            http://people.mandriva.com/~flepied/projects/rpmlint/
-#Source0:        http://people.mandriva.com/~flepied/projects/rpmlint/dist/%{name}-%{version}.tar.bz2
-Source0:        http://www.zarb.org/~misc/%{name}-%{version}.tar.bz2
+URL:            http://rpmlint.zarb.org/
+Source0:        http://rpmlint.zarb.org/download/%{name}-%{version}.tar.bz2
 Source1:        %{name}-fedora-config
-Patch0:         %{name}-0.71-disttag.patch
-Patch1:         %{name}-0.75-develdep.patch
-Patch2:         %{name}-0.71-prereq.patch
-Patch3:         %{name}-0.71-la-exec.patch
-Patch4:         %{name}-0.71-doc-exec.patch
+Patch0:         %{name}-0.76-disttag.patch
+Patch1:         %{name}-0.76-debuginfo.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -34,14 +34,8 @@
 %setup -q
 %patch0
 %patch1
-%patch2
-%patch3
-%patch4
 sed -i -e 's|/etc/httpd/webapps\.d|%{_sysconfdir}/httpd/conf.d|' \
   FilesCheck.py I18NCheck.py
-for f in AUTHORS ChangeLog ; do
-  iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
-done
 
 
 %build
@@ -50,15 +44,16 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_datadir}/rpmlint/check-install.py*
-install -Dpm 644 rpmlint.bash-completion \
-  $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/rpmlint
-install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config
+make install DESTDIR=$RPM_BUILD_ROOT ETCDIR=%{_sysconfdir} MANDIR=%{_mandir} \
+  LIBDIR=%{_datadir}/rpmlint BINDIR=%{_bindir}
+echo "# Add local rpmlint configuration here." \
+  > $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config
+install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/rpmlint/config
 
 # Take care of files that may be generated later.
-touch $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config{c,o}
+touch $RPM_BUILD_ROOT{%{_datadir},%{_sysconfdir}}/rpmlint/config{c,o}
 echo '%ghost %{_sysconfdir}/rpmlint/config?' > %{name}-%{version}-files.list
+echo '%ghost %{_datadir}/rpmlint/config?' >> %{name}-%{version}-files.list
 for f in `find $RPM_BUILD_ROOT%{_datadir}/rpmlint -type f -name "*.py"` ; do
   f=`echo "$f" | sed "s|^$RPM_BUILD_ROOT||"`
   echo "$f" >> %{name}-%{version}-files.list
@@ -82,13 +77,28 @@
 %doc AUTHORS COPYING ChangeLog README
 %dir %{_sysconfdir}/rpmlint/
 %config(noreplace) %{_sysconfdir}/rpmlint/config
+%{_sysconfdir}/bash_completion.d/
 %{_bindir}/rpmdiff
 %{_bindir}/rpmlint
 %dir %{_datadir}/rpmlint/
-%{_sysconfdir}/bash_completion.d/
+%{_datadir}/rpmlint/config
+%{_mandir}/man1/rpmlint.1*
 
 
 %changelog
+* Tue Apr 11 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.76-1
+- 0.76.
+
+* Mon Mar 27 2006 Ville Skytt?? <ville.skytta at iki.fi>
+- Don't pass -T to objdump for *.debug files (#185227).
+- lib64 library path fixes (#185228).
+
+* Wed Mar 15 2006 Ville Skytt?? <ville.skytta at iki.fi>
+- Accept zlib License (#185501).
+
+* Tue Feb 28 2006 Ville Skytt?? <ville.skytta at iki.fi>
+- Accept Ruby License (#183384) and SIL Open Font License (#176405).
+
 * Sat Feb 18 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.75-1
 - 0.75 + -devel Epoch version check patch from CVS.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	12 Feb 2006 20:31:35 -0000	1.11
+++ sources	11 Apr 2006 06:21:45 -0000	1.12
@@ -1 +1 @@
-22a7657bb976ee2b1df851bc3976f70a  rpmlint-0.75.tar.bz2
+f93d1e1d8adde6b97ddbda46e12169ab  rpmlint-0.76.tar.bz2


--- rpmlint-0.71-disttag.patch DELETED ---


--- rpmlint-0.71-doc-exec.patch DELETED ---


--- rpmlint-0.71-la-exec.patch DELETED ---


--- rpmlint-0.71-prereq.patch DELETED ---


--- rpmlint-0.75-develdep.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 11 06:21:39 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 10 Apr 2006 23:21:39 -0700
Subject: rpms/rpmlint/FC-5 rpmlint-0.76-debuginfo.patch, NONE,
	1.1 rpmlint-0.76-disttag.patch, NONE, 1.1 .cvsignore, 1.11,
	1.12 rpmlint-fedora-config, 1.11, 1.12 rpmlint.spec, 1.22,
	1.23 sources, 1.11, 1.12 rpmlint-0.71-disttag.patch, 1.1,
	NONE rpmlint-0.71-doc-exec.patch, 1.1,
	NONE rpmlint-0.71-la-exec.patch, 1.1,
	NONE rpmlint-0.71-prereq.patch, 1.1,
	NONE rpmlint-0.75-develdep.patch, 1.1, NONE
Message-ID: <200604110622.k3B6MBNh023013@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	.cvsignore rpmlint-fedora-config rpmlint.spec sources 
Added Files:
	rpmlint-0.76-debuginfo.patch rpmlint-0.76-disttag.patch 
Removed Files:
	rpmlint-0.71-disttag.patch rpmlint-0.71-doc-exec.patch 
	rpmlint-0.71-la-exec.patch rpmlint-0.71-prereq.patch 
	rpmlint-0.75-develdep.patch 
Log Message:
* Tue Apr 11 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.76-1
- 0.76.

* Mon Mar 27 2006 Ville Skytt?? <ville.skytta at iki.fi>
- Don't pass -T to objdump for *.debug files (#185227).
- lib64 library path fixes (#185228).

* Wed Mar 15 2006 Ville Skytt?? <ville.skytta at iki.fi>
- Accept zlib License (#185501).

* Tue Feb 28 2006 Ville Skytt?? <ville.skytta at iki.fi>
- Accept Ruby License (#183384) and SIL Open Font License (#176405).


rpmlint-0.76-debuginfo.patch:

--- NEW FILE rpmlint-0.76-debuginfo.patch ---
Index: FilesCheck.py
===================================================================
--- FilesCheck.py	(revision 1144)
+++ FilesCheck.py	(working copy)
@@ -158,7 +158,7 @@
 includefile_regex=re.compile('\.(c|h|a|cmi)$')
 buildconfigfile_regex=re.compile('(\.pc|/bin/.+-config)$')
 sofile_regex=re.compile('/lib(64)?/[^/]+\.so$')
-devel_regex=re.compile('-(devel|source)$')
+devel_regex=re.compile('-(debug(info)?|devel|source)$')
 lib_regex=re.compile('lib(64)?/lib[^/]*\.so\..*')
 ldconfig_regex=re.compile('^[^#]*ldconfig', re.MULTILINE)
 depmod_regex=re.compile('^[^#]*depmod', re.MULTILINE)

rpmlint-0.76-disttag.patch:

--- NEW FILE rpmlint-0.76-disttag.patch ---
--- TagsCheck.py~	2006-04-05 19:21:45.000000000 +0300
+++ TagsCheck.py	2006-04-08 23:04:04.000000000 +0300
@@ -342,2 +342,3 @@
 changelog_version_regex=re.compile('[^>]([^ >]+)\s*$')
+fedora_disttag_regex=re.compile('\.(fc|rhe?l)\d+$')
 release_ext=Config.getOption('ReleaseExtension')
@@ -556,3 +557,3 @@
                             expected=str(epoch) + ':' + expected
-                        if expected != ret.group(1):
+                        if ret.group(1) not in (expected, fedora_disttag_regex.sub('', expected)):
                             printWarning(pkg, 'incoherent-version-in-changelog', ret.group(1), expected)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	12 Feb 2006 20:31:35 -0000	1.11
+++ .cvsignore	11 Apr 2006 06:21:39 -0000	1.12
@@ -1 +1 @@
-rpmlint-0.75.tar.bz2
+rpmlint-0.76.tar.bz2


Index: rpmlint-fedora-config
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-5/rpmlint-fedora-config,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rpmlint-fedora-config	17 Jan 2006 20:33:54 -0000	1.11
+++ rpmlint-fedora-config	11 Apr 2006 06:21:39 -0000	1.12
@@ -4,9 +4,6 @@
 
 from Config import *
 
-setOption("ReleaseExtension", '')
-setOption("ValidBuildHost", ".*")
-setOption("Packager", ".*")
 setOption("UseVersionInChangeLog", 1)
 setOption("UseBzip2", 0)
 setOption("UseDefaultRunlevels", 0)
@@ -65,8 +62,11 @@
     "Public Domain",
     "Python Software Foundation License",
     "QPL",
+    "Ruby License",
     "Sun Public License",
+    "SIL Open Font License",
     "W3C Software License",
+    "zlib License",
     "Zope Public License",
 ))
 setOption("ValidShells", (
@@ -82,22 +82,23 @@
 ))
 
 # Output filters
-addFilter("W: .* source-or-patch-not-[bg]zipped .*")
-addFilter("E: .* lib-package-without-%mklibname")
-addFilter("E: .* no-dependency-on (perl|python)-base.*")
-addFilter("E: .* no-dependency-on locales-.*")
-addFilter("W: .* (python|perl5)-naming-policy-not-applied.*")
-addFilter("W: .* invalid-(distribution|vendor) .*")
-addFilter("E: .* no-(packager-tag|signature)")
-addFilter("E: .* incoherent-version-in-name.*")
-addFilter("E: .* invalid-build-requires .*")
-addFilter("W: .* ghost-files-without-postin")
-addFilter("W: .* postin-without-ghost-file-creation .*")
-addFilter("W: .* no-major-in-name .*")
-addFilter("W: .* no-provides .*")
-addFilter("E: .* executable-in-library-package .*")
-addFilter("E: .* non-versioned-file-in-library-package .*")
-addFilter("E: .* requires-on-release .*")
-addFilter("W: .* jar-not-indexed .*")
-addFilter("E: .* invalid-(lc-messages|locale-man)-dir .*")
-addFilter("E: .* outside-libdir-files .*")
+addFilter("source-or-patch-not-[bg]zipped")
+addFilter("%mklibname")
+addFilter("no-dependency-on (perl|python)-base")
+addFilter("no-dependency-on locales-")
+addFilter("(python|perl5)-naming-policy-not-applied")
+addFilter("no-(packager-tag|signature)")
+addFilter("incoherent-version-in-name")
+addFilter("invalid-build-requires")
+addFilter("ghost-files-without-postin")
+addFilter("postin-without-ghost-file-creation")
+addFilter("no-major-in-name")
+addFilter("no-provides")
+addFilter("executable-in-library-package")
+addFilter("non-versioned-file-in-library-package")
+addFilter("requires-on-release")
+addFilter("jar-not-indexed")
+addFilter("invalid-(lc-messages|locale-man)-dir")
+addFilter("outside-libdir-files")
+addFilter('-debuginfo no-documentation')
+addFilter('-debuginfo [^ ]+ /usr/lib/debug/')


Index: rpmlint.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-5/rpmlint.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- rpmlint.spec	17 Feb 2006 23:06:36 -0000	1.22
+++ rpmlint.spec	11 Apr 2006 06:21:39 -0000	1.23
@@ -1,19 +1,19 @@
+# TODO:
+# - don't override upstream default valid groups, just add "Development/Debug"
+# - switch to upstream valid license list?
+
 Name:           rpmlint
-Version:        0.75
+Version:        0.76
 Release:        1%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
 License:        GPL
-URL:            http://people.mandriva.com/~flepied/projects/rpmlint/
-#Source0:        http://people.mandriva.com/~flepied/projects/rpmlint/dist/%{name}-%{version}.tar.bz2
-Source0:        http://www.zarb.org/~misc/%{name}-%{version}.tar.bz2
+URL:            http://rpmlint.zarb.org/
+Source0:        http://rpmlint.zarb.org/download/%{name}-%{version}.tar.bz2
 Source1:        %{name}-fedora-config
-Patch0:         %{name}-0.71-disttag.patch
-Patch1:         %{name}-0.75-develdep.patch
-Patch2:         %{name}-0.71-prereq.patch
-Patch3:         %{name}-0.71-la-exec.patch
-Patch4:         %{name}-0.71-doc-exec.patch
+Patch0:         %{name}-0.76-disttag.patch
+Patch1:         %{name}-0.76-debuginfo.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -34,14 +34,8 @@
 %setup -q
 %patch0
 %patch1
-%patch2
-%patch3
-%patch4
 sed -i -e 's|/etc/httpd/webapps\.d|%{_sysconfdir}/httpd/conf.d|' \
   FilesCheck.py I18NCheck.py
-for f in AUTHORS ChangeLog ; do
-  iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
-done
 
 
 %build
@@ -50,15 +44,16 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_datadir}/rpmlint/check-install.py*
-install -Dpm 644 rpmlint.bash-completion \
-  $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/rpmlint
-install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config
+make install DESTDIR=$RPM_BUILD_ROOT ETCDIR=%{_sysconfdir} MANDIR=%{_mandir} \
+  LIBDIR=%{_datadir}/rpmlint BINDIR=%{_bindir}
+echo "# Add local rpmlint configuration here." \
+  > $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config
+install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/rpmlint/config
 
 # Take care of files that may be generated later.
-touch $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config{c,o}
+touch $RPM_BUILD_ROOT{%{_datadir},%{_sysconfdir}}/rpmlint/config{c,o}
 echo '%ghost %{_sysconfdir}/rpmlint/config?' > %{name}-%{version}-files.list
+echo '%ghost %{_datadir}/rpmlint/config?' >> %{name}-%{version}-files.list
 for f in `find $RPM_BUILD_ROOT%{_datadir}/rpmlint -type f -name "*.py"` ; do
   f=`echo "$f" | sed "s|^$RPM_BUILD_ROOT||"`
   echo "$f" >> %{name}-%{version}-files.list
@@ -82,13 +77,28 @@
 %doc AUTHORS COPYING ChangeLog README
 %dir %{_sysconfdir}/rpmlint/
 %config(noreplace) %{_sysconfdir}/rpmlint/config
+%{_sysconfdir}/bash_completion.d/
 %{_bindir}/rpmdiff
 %{_bindir}/rpmlint
 %dir %{_datadir}/rpmlint/
-%{_sysconfdir}/bash_completion.d/
+%{_datadir}/rpmlint/config
+%{_mandir}/man1/rpmlint.1*
 
 
 %changelog
+* Tue Apr 11 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.76-1
+- 0.76.
+
+* Mon Mar 27 2006 Ville Skytt?? <ville.skytta at iki.fi>
+- Don't pass -T to objdump for *.debug files (#185227).
+- lib64 library path fixes (#185228).
+
+* Wed Mar 15 2006 Ville Skytt?? <ville.skytta at iki.fi>
+- Accept zlib License (#185501).
+
+* Tue Feb 28 2006 Ville Skytt?? <ville.skytta at iki.fi>
+- Accept Ruby License (#183384) and SIL Open Font License (#176405).
+
 * Sat Feb 18 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.75-1
 - 0.75 + -devel Epoch version check patch from CVS.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	12 Feb 2006 20:31:35 -0000	1.11
+++ sources	11 Apr 2006 06:21:39 -0000	1.12
@@ -1 +1 @@
-22a7657bb976ee2b1df851bc3976f70a  rpmlint-0.75.tar.bz2
+f93d1e1d8adde6b97ddbda46e12169ab  rpmlint-0.76.tar.bz2


--- rpmlint-0.71-disttag.patch DELETED ---


--- rpmlint-0.71-doc-exec.patch DELETED ---


--- rpmlint-0.71-la-exec.patch DELETED ---


--- rpmlint-0.71-prereq.patch DELETED ---


--- rpmlint-0.75-develdep.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 11 06:21:38 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 10 Apr 2006 23:21:38 -0700
Subject: rpms/rpmlint/FC-4 rpmlint-0.76-debuginfo.patch, NONE,
	1.1 rpmlint-0.76-disttag.patch, NONE, 1.1 .cvsignore, 1.10,
	1.11 rpmlint-fedora-config, 1.9, 1.10 rpmlint.spec, 1.17,
	1.18 sources, 1.10, 1.11 rpmlint-0.71-disttag.patch, 1.1,
	NONE rpmlint-0.71-doc-exec.patch, 1.1,
	NONE rpmlint-0.71-la-exec.patch, 1.1,
	NONE rpmlint-0.71-prereq.patch, 1.1,
	NONE rpmlint-0.75-develdep.patch, 1.1, NONE
Message-ID: <200604110622.k3B6MAKJ023007@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	.cvsignore rpmlint-fedora-config rpmlint.spec sources 
Added Files:
	rpmlint-0.76-debuginfo.patch rpmlint-0.76-disttag.patch 
Removed Files:
	rpmlint-0.71-disttag.patch rpmlint-0.71-doc-exec.patch 
	rpmlint-0.71-la-exec.patch rpmlint-0.71-prereq.patch 
	rpmlint-0.75-develdep.patch 
Log Message:
* Tue Apr 11 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.76-1
- 0.76.

* Mon Mar 27 2006 Ville Skytt?? <ville.skytta at iki.fi>
- Don't pass -T to objdump for *.debug files (#185227).
- lib64 library path fixes (#185228).

* Wed Mar 15 2006 Ville Skytt?? <ville.skytta at iki.fi>
- Accept zlib License (#185501).

* Tue Feb 28 2006 Ville Skytt?? <ville.skytta at iki.fi>
- Accept Ruby License (#183384) and SIL Open Font License (#176405).


rpmlint-0.76-debuginfo.patch:

--- NEW FILE rpmlint-0.76-debuginfo.patch ---
Index: FilesCheck.py
===================================================================
--- FilesCheck.py	(revision 1144)
+++ FilesCheck.py	(working copy)
@@ -158,7 +158,7 @@
 includefile_regex=re.compile('\.(c|h|a|cmi)$')
 buildconfigfile_regex=re.compile('(\.pc|/bin/.+-config)$')
 sofile_regex=re.compile('/lib(64)?/[^/]+\.so$')
-devel_regex=re.compile('-(devel|source)$')
+devel_regex=re.compile('-(debug(info)?|devel|source)$')
 lib_regex=re.compile('lib(64)?/lib[^/]*\.so\..*')
 ldconfig_regex=re.compile('^[^#]*ldconfig', re.MULTILINE)
 depmod_regex=re.compile('^[^#]*depmod', re.MULTILINE)

rpmlint-0.76-disttag.patch:

--- NEW FILE rpmlint-0.76-disttag.patch ---
--- TagsCheck.py~	2006-04-05 19:21:45.000000000 +0300
+++ TagsCheck.py	2006-04-08 23:04:04.000000000 +0300
@@ -342,2 +342,3 @@
 changelog_version_regex=re.compile('[^>]([^ >]+)\s*$')
+fedora_disttag_regex=re.compile('\.(fc|rhe?l)\d+$')
 release_ext=Config.getOption('ReleaseExtension')
@@ -556,3 +557,3 @@
                             expected=str(epoch) + ':' + expected
-                        if expected != ret.group(1):
+                        if ret.group(1) not in (expected, fedora_disttag_regex.sub('', expected)):
                             printWarning(pkg, 'incoherent-version-in-changelog', ret.group(1), expected)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	18 Feb 2006 13:17:19 -0000	1.10
+++ .cvsignore	11 Apr 2006 06:21:38 -0000	1.11
@@ -1 +1 @@
-rpmlint-0.75.tar.bz2
+rpmlint-0.76.tar.bz2


Index: rpmlint-fedora-config
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-4/rpmlint-fedora-config,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rpmlint-fedora-config	18 Feb 2006 13:17:19 -0000	1.9
+++ rpmlint-fedora-config	11 Apr 2006 06:21:38 -0000	1.10
@@ -4,9 +4,6 @@
 
 from Config import *
 
-setOption("ReleaseExtension", '')
-setOption("ValidBuildHost", ".*")
-setOption("Packager", ".*")
 setOption("UseVersionInChangeLog", 1)
 setOption("UseBzip2", 0)
 setOption("UseDefaultRunlevels", 0)
@@ -65,8 +62,11 @@
     "Public Domain",
     "Python Software Foundation License",
     "QPL",
+    "Ruby License",
     "Sun Public License",
+    "SIL Open Font License",
     "W3C Software License",
+    "zlib License",
     "Zope Public License",
 ))
 setOption("ValidShells", (
@@ -82,22 +82,23 @@
 ))
 
 # Output filters
-addFilter("W: .* source-or-patch-not-[bg]zipped .*")
-addFilter("E: .* lib-package-without-%mklibname")
-addFilter("E: .* no-dependency-on (perl|python)-base.*")
-addFilter("E: .* no-dependency-on locales-.*")
-addFilter("W: .* (python|perl5)-naming-policy-not-applied.*")
-addFilter("W: .* invalid-(distribution|vendor) .*")
-addFilter("E: .* no-(packager-tag|signature)")
-addFilter("E: .* incoherent-version-in-name.*")
-addFilter("E: .* invalid-build-requires .*")
-addFilter("W: .* ghost-files-without-postin")
-addFilter("W: .* postin-without-ghost-file-creation .*")
-addFilter("W: .* no-major-in-name .*")
-addFilter("W: .* no-provides .*")
-addFilter("E: .* executable-in-library-package .*")
-addFilter("E: .* non-versioned-file-in-library-package .*")
-addFilter("E: .* requires-on-release .*")
-addFilter("W: .* jar-not-indexed .*")
-addFilter("E: .* invalid-(lc-messages|locale-man)-dir .*")
-addFilter("E: .* outside-libdir-files .*")
+addFilter("source-or-patch-not-[bg]zipped")
+addFilter("%mklibname")
+addFilter("no-dependency-on (perl|python)-base")
+addFilter("no-dependency-on locales-")
+addFilter("(python|perl5)-naming-policy-not-applied")
+addFilter("no-(packager-tag|signature)")
+addFilter("incoherent-version-in-name")
+addFilter("invalid-build-requires")
+addFilter("ghost-files-without-postin")
+addFilter("postin-without-ghost-file-creation")
+addFilter("no-major-in-name")
+addFilter("no-provides")
+addFilter("executable-in-library-package")
+addFilter("non-versioned-file-in-library-package")
+addFilter("requires-on-release")
+addFilter("jar-not-indexed")
+addFilter("invalid-(lc-messages|locale-man)-dir")
+addFilter("outside-libdir-files")
+addFilter('-debuginfo no-documentation')
+addFilter('-debuginfo [^ ]+ /usr/lib/debug/')


Index: rpmlint.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-4/rpmlint.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rpmlint.spec	18 Feb 2006 13:17:19 -0000	1.17
+++ rpmlint.spec	11 Apr 2006 06:21:38 -0000	1.18
@@ -1,19 +1,19 @@
+# TODO:
+# - don't override upstream default valid groups, just add "Development/Debug"
+# - switch to upstream valid license list?
+
 Name:           rpmlint
-Version:        0.75
+Version:        0.76
 Release:        1%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
 License:        GPL
-URL:            http://people.mandriva.com/~flepied/projects/rpmlint/
-#Source0:        http://people.mandriva.com/~flepied/projects/rpmlint/dist/%{name}-%{version}.tar.bz2
-Source0:        http://www.zarb.org/~misc/%{name}-%{version}.tar.bz2
+URL:            http://rpmlint.zarb.org/
+Source0:        http://rpmlint.zarb.org/download/%{name}-%{version}.tar.bz2
 Source1:        %{name}-fedora-config
-Patch0:         %{name}-0.71-disttag.patch
-Patch1:         %{name}-0.75-develdep.patch
-Patch2:         %{name}-0.71-prereq.patch
-Patch3:         %{name}-0.71-la-exec.patch
-Patch4:         %{name}-0.71-doc-exec.patch
+Patch0:         %{name}-0.76-disttag.patch
+Patch1:         %{name}-0.76-debuginfo.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -34,14 +34,8 @@
 %setup -q
 %patch0
 %patch1
-%patch2
-%patch3
-%patch4
 sed -i -e 's|/etc/httpd/webapps\.d|%{_sysconfdir}/httpd/conf.d|' \
   FilesCheck.py I18NCheck.py
-for f in AUTHORS ChangeLog ; do
-  iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
-done
 
 
 %build
@@ -50,15 +44,16 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_datadir}/rpmlint/check-install.py*
-install -Dpm 644 rpmlint.bash-completion \
-  $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/rpmlint
-install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config
+make install DESTDIR=$RPM_BUILD_ROOT ETCDIR=%{_sysconfdir} MANDIR=%{_mandir} \
+  LIBDIR=%{_datadir}/rpmlint BINDIR=%{_bindir}
+echo "# Add local rpmlint configuration here." \
+  > $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config
+install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/rpmlint/config
 
 # Take care of files that may be generated later.
-touch $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config{c,o}
+touch $RPM_BUILD_ROOT{%{_datadir},%{_sysconfdir}}/rpmlint/config{c,o}
 echo '%ghost %{_sysconfdir}/rpmlint/config?' > %{name}-%{version}-files.list
+echo '%ghost %{_datadir}/rpmlint/config?' >> %{name}-%{version}-files.list
 for f in `find $RPM_BUILD_ROOT%{_datadir}/rpmlint -type f -name "*.py"` ; do
   f=`echo "$f" | sed "s|^$RPM_BUILD_ROOT||"`
   echo "$f" >> %{name}-%{version}-files.list
@@ -82,13 +77,28 @@
 %doc AUTHORS COPYING ChangeLog README
 %dir %{_sysconfdir}/rpmlint/
 %config(noreplace) %{_sysconfdir}/rpmlint/config
+%{_sysconfdir}/bash_completion.d/
 %{_bindir}/rpmdiff
 %{_bindir}/rpmlint
 %dir %{_datadir}/rpmlint/
-%{_sysconfdir}/bash_completion.d/
+%{_datadir}/rpmlint/config
+%{_mandir}/man1/rpmlint.1*
 
 
 %changelog
+* Tue Apr 11 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.76-1
+- 0.76.
+
+* Mon Mar 27 2006 Ville Skytt?? <ville.skytta at iki.fi>
+- Don't pass -T to objdump for *.debug files (#185227).
+- lib64 library path fixes (#185228).
+
+* Wed Mar 15 2006 Ville Skytt?? <ville.skytta at iki.fi>
+- Accept zlib License (#185501).
+
+* Tue Feb 28 2006 Ville Skytt?? <ville.skytta at iki.fi>
+- Accept Ruby License (#183384) and SIL Open Font License (#176405).
+
 * Sat Feb 18 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.75-1
 - 0.75 + -devel Epoch version check patch from CVS.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	18 Feb 2006 13:17:19 -0000	1.10
+++ sources	11 Apr 2006 06:21:38 -0000	1.11
@@ -1 +1 @@
-22a7657bb976ee2b1df851bc3976f70a  rpmlint-0.75.tar.bz2
+f93d1e1d8adde6b97ddbda46e12169ab  rpmlint-0.76.tar.bz2


--- rpmlint-0.71-disttag.patch DELETED ---


--- rpmlint-0.71-doc-exec.patch DELETED ---


--- rpmlint-0.71-la-exec.patch DELETED ---


--- rpmlint-0.71-prereq.patch DELETED ---


--- rpmlint-0.75-develdep.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 11 07:56:19 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Tue, 11 Apr 2006 00:56:19 -0700
Subject: rpms/abiword/devel abiword-2.4.4-desktop.patch, NONE, 1.1 .cvsignore,
	1.13, 1.14 abiword.spec, 1.33, 1.34 sources, 1.13,
	1.14 abiword-2.4.2-macros.patch, 1.1, NONE
Message-ID: <200604110756.k3B7uLFn025406@cvs-int.fedora.redhat.com>

Author: uwog

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

Modified Files:
	.cvsignore abiword.spec sources 
Added Files:
	abiword-2.4.4-desktop.patch 
Removed Files:
	abiword-2.4.2-macros.patch 
Log Message:
New upstream version



abiword-2.4.4-desktop.patch:

--- NEW FILE abiword-2.4.4-desktop.patch ---
diff -r -u abiword-2.4.4.orig/abi/abiword.desktop abiword-2.4.4/abi/abiword.desktop
--- abiword-2.4.4.orig/abi/abiword.desktop	2006-04-03 14:14:01.000000000 +0200
+++ abiword-2.4.4/abi/abiword.desktop	2006-04-11 00:12:19.000000000 +0200
@@ -7,7 +7,7 @@
 StartupNotify=true
 Encoding=UTF-8
 X-Desktop-File-Install-Version=0.9
-MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;
+MimeType=application/msword;application/vnd.sun.xml.writer;application/vnd.wordperfect;application/x-abiword;text/x-abiword;text/x-xml-abiword;application/rtf;text/plain;application/xhtml+xml;text/html;text/vnd.wap.wml;application/vnd.plain;application/vnd.stardivision.writer;application/x-mif;application/x-kword;application/x-applix-word;application/x-mswrite;application/vnd.oasis.opendocument.text;
 Name=AbiWord
 GenericName=Word Processor
 Comment=AbiWord Word Processor


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	5 Jan 2006 14:57:02 -0000	1.13
+++ .cvsignore	11 Apr 2006 07:56:19 -0000	1.14
@@ -1 +1 @@
-abiword-2.4.2.tar.bz2
+abiword-2.4.4.tar.bz2


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- abiword.spec	29 Mar 2006 11:17:06 -0000	1.33
+++ abiword.spec	11 Apr 2006 07:56:19 -0000	1.34
@@ -2,8 +2,8 @@
 
 Summary: The AbiWord word processor
 Name: abiword
-Version: 2.4.2
-Release: 8%{?dist}
+Version: 2.4.4
+Release: 1%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -30,7 +30,7 @@
 BuildRequires: librsvg2-devel
 BuildRequires: libwmf-devel
 BuildRequires: aiksaurus-gtk-devel >= 1.2.1
-BuildRequires: link-grammar-devel >= 4.1.3
+BuildRequires: link-grammar-devel >= 4.2.1
 BuildRequires: gtkmathview-devel >= 0.7.5
 BuildRequires: libgsf-devel >= 1.12.1
 
@@ -41,8 +41,7 @@
 URL: http://www.abisource.com/
 
 Patch0: abiword-2.0.9-windowshelppaths.patch
-Patch1: abiword-2.4.2-desktop.patch
-Patch2: abiword-2.4.2-macros.patch
+Patch1: abiword-2.4.4-desktop.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. The goal is to make
@@ -52,7 +51,6 @@
 %setup -q 
 %patch0 -p1 -b .windowshelppaths
 %patch1 -p1 -b .desktop
-%patch2 -p1 -b .macros
 
 %build
 cd abi
@@ -134,6 +132,10 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Tue Apr 11 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.4-1.fc6
+- New upstream version
+- Remove the macro patch and update the desktop patch
+
 * Wed Mar 29 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.2-8.fc6
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	5 Jan 2006 14:57:02 -0000	1.13
+++ sources	11 Apr 2006 07:56:19 -0000	1.14
@@ -1 +1 @@
-935f1218eab7ff96b7a23cfeba4e76d1  abiword-2.4.2.tar.bz2
+69dd69179b861a41613291afd10af9ab  abiword-2.4.4.tar.bz2


--- abiword-2.4.2-macros.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 11 08:00:53 2006
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Tue, 11 Apr 2006 01:00:53 -0700
Subject: mock/etc fedora-1-i386-core.cfg, 1.1, 1.2 fedora-2-i386-core.cfg,
	1.1, 1.2 fedora-3-i386-core.cfg, 1.3,
	1.4 fedora-3-x86_64-core.cfg, 1.3, 1.4 fedora-4-i386-core.cfg,
	1.3, 1.4 fedora-4-ppc-core.cfg, 1.4,
	1.5 fedora-4-x86_64-core.cfg, 1.3, 1.4 fedora-5-i386-core.cfg,
	1.2, 1.3 fedora-5-ppc-core.cfg, 1.3,
	1.4 fedora-5-x86_64-core.cfg, 1.2, 1.3 redhat-73-i386.cfg, 1.1,
	1.2 redhat-9-i386.cfg, 1.1, 1.2
Message-ID: <200604110800.k3B80rjT025495@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/fedora/mock/etc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25462

Modified Files:
	fedora-1-i386-core.cfg fedora-2-i386-core.cfg 
	fedora-3-i386-core.cfg fedora-3-x86_64-core.cfg 
	fedora-4-i386-core.cfg fedora-4-ppc-core.cfg 
	fedora-4-x86_64-core.cfg fedora-5-i386-core.cfg 
	fedora-5-ppc-core.cfg fedora-5-x86_64-core.cfg 
	redhat-73-i386.cfg redhat-9-i386.cfg 
Log Message:

modify all config files for chroot_dep_package option
default package name to buildsys-build



Index: fedora-1-i386-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-1-i386-core.cfg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-1-i386-core.cfg	21 Aug 2005 16:29:33 -0000	1.1
+++ fedora-1-i386-core.cfg	11 Apr 2006 08:00:51 -0000	1.2
@@ -9,7 +9,7 @@
 config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
 config_opts['yum'] = '/usr/sbin/mock-helper yum'
 config_opts['runuser'] = '/bin/su'
-config_opts['buildgroup'] = 'build'
+config_opts['chroot_dep_package'] = 'buildsys-build'
 config_opts['chrootuser'] = 'mockbuild'
 config_opts['chrootgroup'] = 'mockbuild'
 config_opts['chrootuid'] = os.geteuid()
@@ -42,6 +42,6 @@
 
 [groups]
 name=groups
-baseurl=http://fedoraproject.org/buildgroups/1/i386/
+baseurl=http://fedoraproject.org/chroot_dep_packages/1/i386/
 
 """


Index: fedora-2-i386-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-2-i386-core.cfg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-2-i386-core.cfg	21 Aug 2005 16:29:33 -0000	1.1
+++ fedora-2-i386-core.cfg	11 Apr 2006 08:00:51 -0000	1.2
@@ -9,7 +9,7 @@
 config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
 config_opts['yum'] = '/usr/sbin/mock-helper yum'
 config_opts['runuser'] = '/bin/su'
-config_opts['buildgroup'] = 'build'
+config_opts['chroot_dep_package'] = 'buildsys-build'
 config_opts['chrootuser'] = 'mockbuild'
 config_opts['chrootgroup'] = 'mockbuild'
 config_opts['chrootuid'] = os.geteuid()
@@ -42,6 +42,6 @@
 
 [groups]
 name=groups
-baseurl=http://fedoraproject.org/buildgroups/2/i386/
+baseurl=http://fedoraproject.org/chroot_dep_packages/2/i386/
 
 """


Index: fedora-3-i386-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-3-i386-core.cfg,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-3-i386-core.cfg	28 Jul 2005 14:02:59 -0000	1.3
+++ fedora-3-i386-core.cfg	11 Apr 2006 08:00:51 -0000	1.4
@@ -9,7 +9,7 @@
 config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
 config_opts['yum'] = '/usr/sbin/mock-helper yum'
 config_opts['runuser'] = '/sbin/runuser'
-config_opts['buildgroup'] = 'build'
+config_opts['chroot_dep_package'] = 'buildsys-build'
 config_opts['chrootuser'] = 'mockbuild'
 config_opts['chrootgroup'] = 'mockbuild'
 config_opts['chrootuid'] = os.geteuid()
@@ -42,7 +42,7 @@
 
 [groups]
 name=groups
-baseurl=http://fedoraproject.org/buildgroups/3/i386/
+baseurl=http://fedoraproject.org/chroot_dep_packages/3/i386/
 
 [extras]
 name=extras


Index: fedora-3-x86_64-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-3-x86_64-core.cfg,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-3-x86_64-core.cfg	28 Jul 2005 14:02:59 -0000	1.3
+++ fedora-3-x86_64-core.cfg	11 Apr 2006 08:00:51 -0000	1.4
@@ -9,7 +9,7 @@
 config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
 config_opts['yum'] = '/usr/sbin/mock-helper yum'
 config_opts['runuser'] = '/sbin/runuser'
-config_opts['buildgroup'] = 'build'
+config_opts['chroot_dep_package'] = 'buildsys-build'
 config_opts['chrootuser'] = 'mockbuild'
 config_opts['chrootgroup'] = 'mockbuild'
 config_opts['chrootuid'] = os.geteuid()
@@ -43,7 +43,7 @@
 
 [groups]
 name=groups
-baseurl=http://fedoraproject.org/buildgroups/3/x86_64/
+baseurl=http://fedoraproject.org/chroot_dep_packages/3/x86_64/
 
 [extras]
 name=extras


Index: fedora-4-i386-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-4-i386-core.cfg,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-4-i386-core.cfg	28 Jul 2005 14:02:59 -0000	1.3
+++ fedora-4-i386-core.cfg	11 Apr 2006 08:00:51 -0000	1.4
@@ -10,7 +10,7 @@
 config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
 config_opts['yum'] = '/usr/sbin/mock-helper yum'
 config_opts['runuser'] = '/sbin/runuser'
-config_opts['buildgroup'] = 'build'
+config_opts['chroot_dep_package'] = 'buildsys-build'
 config_opts['chrootuser'] = 'mockbuild'
 config_opts['chrootgroup'] = 'mockbuild'
 config_opts['chrootuid'] = os.geteuid()
@@ -45,7 +45,7 @@
 
 [groups]
 name=groups
-baseurl=http://fedoraproject.org/buildgroups/4/i386/
+baseurl=http://fedoraproject.org/chroot_dep_packages/4/i386/
 
 [extras]
 name=extras


Index: fedora-4-ppc-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-4-ppc-core.cfg,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedora-4-ppc-core.cfg	29 Jul 2005 05:11:13 -0000	1.4
+++ fedora-4-ppc-core.cfg	11 Apr 2006 08:00:51 -0000	1.5
@@ -9,7 +9,7 @@
 config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
 config_opts['yum'] = '/usr/sbin/mock-helper yum'
 config_opts['runuser'] = '/sbin/runuser'
-config_opts['buildgroup'] = 'build'
+config_opts['chroot_dep_package'] = 'buildsys-build'
 config_opts['chrootuser'] = 'mockbuild'
 config_opts['chrootgroup'] = 'mockbuild'
 config_opts['chrootuid'] = os.geteuid()
@@ -44,7 +44,7 @@
 
 [groups]
 name=groups
-baseurl=http://fedoraproject.org/buildgroups/4/ppc/
+baseurl=http://fedoraproject.org/chroot_dep_packages/4/ppc/
 
 [extras]
 name=extras


Index: fedora-4-x86_64-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-4-x86_64-core.cfg,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-4-x86_64-core.cfg	28 Jul 2005 14:02:59 -0000	1.3
+++ fedora-4-x86_64-core.cfg	11 Apr 2006 08:00:51 -0000	1.4
@@ -10,7 +10,7 @@
 config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
 config_opts['yum'] = '/usr/sbin/mock-helper yum'
 config_opts['runuser'] = '/sbin/runuser'
-config_opts['buildgroup'] = 'build'
+config_opts['chroot_dep_package'] = 'buildsys-build'
 config_opts['chrootuser'] = 'mockbuild'
 config_opts['chrootgroup'] = 'mockbuild'
 config_opts['chrootuid'] = os.geteuid()
@@ -46,7 +46,7 @@
 
 [groups]
 name=groups
-baseurl=http://fedoraproject.org/buildgroups/4/x86_64/
+baseurl=http://fedoraproject.org/chroot_dep_packages/4/x86_64/
 
 [extras]
 name=extras


Index: fedora-5-i386-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-5-i386-core.cfg,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-5-i386-core.cfg	28 Jul 2005 14:02:59 -0000	1.2
+++ fedora-5-i386-core.cfg	11 Apr 2006 08:00:51 -0000	1.3
@@ -10,7 +10,7 @@
 config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
 config_opts['yum'] = '/usr/sbin/mock-helper yum'
 config_opts['runuser'] = '/sbin/runuser'
-config_opts['buildgroup'] = 'build'
+config_opts['chroot_dep_package'] = 'buildsys-build'
 config_opts['chrootuser'] = 'mockbuild'
 config_opts['chrootgroup'] = 'mockbuild'
 config_opts['chrootuid'] = os.geteuid()
@@ -39,7 +39,7 @@
 
 [groups]
 name=groups
-baseurl=http://fedoraproject.org/buildgroups/development/i386/
+baseurl=http://fedoraproject.org/chroot_dep_packages/development/i386/
 
 [extras]
 name=extras


Index: fedora-5-ppc-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-5-ppc-core.cfg,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-5-ppc-core.cfg	29 Jul 2005 05:11:13 -0000	1.3
+++ fedora-5-ppc-core.cfg	11 Apr 2006 08:00:51 -0000	1.4
@@ -9,7 +9,7 @@
 config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
 config_opts['yum'] = '/usr/sbin/mock-helper yum'
 config_opts['runuser'] = '/sbin/runuser'
-config_opts['buildgroup'] = 'build'
+config_opts['chroot_dep_package'] = 'buildsys-build'
 config_opts['chrootuser'] = 'mockbuild'
 config_opts['chrootgroup'] = 'mockbuild'
 config_opts['chrootuid'] = os.geteuid()
@@ -39,7 +39,7 @@
 
 [groups]
 name=groups
-baseurl=http://fedoraproject.org/buildgroups/development/ppc/
+baseurl=http://fedoraproject.org/chroot_dep_packages/development/ppc/
 
 [extras]
 name=extras


Index: fedora-5-x86_64-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-5-x86_64-core.cfg,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-5-x86_64-core.cfg	28 Jul 2005 14:02:59 -0000	1.2
+++ fedora-5-x86_64-core.cfg	11 Apr 2006 08:00:51 -0000	1.3
@@ -10,7 +10,7 @@
 config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
 config_opts['yum'] = '/usr/sbin/mock-helper yum'
 config_opts['runuser'] = '/sbin/runuser'
-config_opts['buildgroup'] = 'build'
+config_opts['chroot_dep_package'] = 'buildsys-build'
 config_opts['chrootuser'] = 'mockbuild'
 config_opts['chrootgroup'] = 'mockbuild'
 config_opts['chrootuid'] = os.geteuid()
@@ -40,7 +40,7 @@
 
 [groups]
 name=groups
-baseurl=http://fedoraproject.org/buildgroups/development/x86_64/
+baseurl=http://fedoraproject.org/chroot_dep_packages/development/x86_64/
 
 [extras]
 name=extras


Index: redhat-73-i386.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/redhat-73-i386.cfg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- redhat-73-i386.cfg	21 Aug 2005 16:29:33 -0000	1.1
+++ redhat-73-i386.cfg	11 Apr 2006 08:00:51 -0000	1.2
@@ -9,7 +9,7 @@
 config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
 config_opts['yum'] = '/usr/sbin/mock-helper yum'
 config_opts['runuser'] = '/bin/su'
-config_opts['buildgroup'] = 'build'
+config_opts['chroot_dep_package'] = 'buildsys-build'
 config_opts['chrootuser'] = 'mockbuild'
 config_opts['chrootgroup'] = 'mockbuild'
 config_opts['chrootuid'] = os.geteuid()
@@ -42,6 +42,6 @@
 
 [groups]
 name=groups
-baseurl=http://fedoraproject.org/buildgroups/rh73/i386/
+baseurl=http://fedoraproject.org/chroot_dep_packages/rh73/i386/
 
 """


Index: redhat-9-i386.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/redhat-9-i386.cfg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- redhat-9-i386.cfg	21 Aug 2005 16:29:33 -0000	1.1
+++ redhat-9-i386.cfg	11 Apr 2006 08:00:51 -0000	1.2
@@ -9,7 +9,7 @@
 config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
 config_opts['yum'] = '/usr/sbin/mock-helper yum'
 config_opts['runuser'] = '/bin/su'
-config_opts['buildgroup'] = 'build'
+config_opts['chroot_dep_package'] = 'buildsys-build'
 config_opts['chrootuser'] = 'mockbuild'
 config_opts['chrootgroup'] = 'mockbuild'
 config_opts['chrootuid'] = os.geteuid()
@@ -42,6 +42,6 @@
 
 [groups]
 name=groups
-baseurl=http://fedoraproject.org/buildgroups/rh9/i386/
+baseurl=http://fedoraproject.org/chroot_dep_packages/rh9/i386/
 
 """



From fedora-extras-commits at redhat.com  Tue Apr 11 08:01:38 2006
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Tue, 11 Apr 2006 01:01:38 -0700
Subject: mock mock.py,1.39,1.40
Message-ID: <200604110801.k3B81ceU027528@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/fedora/mock
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25508

Modified Files:
	mock.py 
Log Message:

remove the 'groupinstall' need to use a buildsys dependency-only package
iterate version to 0.5
more patches to go in, though



Index: mock.py
===================================================================
RCS file: /cvs/fedora/mock/mock.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- mock.py	29 Mar 2006 06:23:21 -0000	1.39
+++ mock.py	11 Apr 2006 08:01:31 -0000	1.40
@@ -28,7 +28,7 @@
 
 from optparse import OptionParser
 
-__VERSION__ = '0.4'
+__VERSION__ = '0.5'
 
 def error(msg):
     print >> sys.stderr, msg
@@ -209,7 +209,7 @@
         
         self._prep_install()
         if self.config['clean']:
-            cmd = 'groupinstall %s' % self.config['buildgroup']
+            cmd = 'install %s' % self.config['chroot_dep_package']
         else:
             cmd = 'update'
 
@@ -694,7 +694,7 @@
     config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
     config_opts['yum'] = '/usr/sbin/mock-helper yum'
     config_opts['runuser'] = '/sbin/runuser'
-    config_opts['buildgroup'] = 'build'
+    config_opts['chroot_dep_package'] = 'buildsys-build'
     config_opts['chrootuser'] = 'mockbuild'
     config_opts['chrootgroup'] = 'mockbuild'
     config_opts['chrootuid'] = 500



From fedora-extras-commits at redhat.com  Tue Apr 11 08:26:24 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Tue, 11 Apr 2006 01:26:24 -0700
Subject: kadischi/livecd_generator create-iso.sh, 1.2, 1.3 kadischi.py, 1.10,
	1.11 livecd-mkinitrd.sh, 1.7, 1.8
Message-ID: <200604110826.k3B8QOnn027698@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi/livecd_generator
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27635/kadischi/livecd_generator

Modified Files:
	create-iso.sh kadischi.py livecd-mkinitrd.sh 
Log Message:
Use SquashFS exclusively, major tidying of kadischi.py


Index: create-iso.sh
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/create-iso.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- create-iso.sh	30 Mar 2006 04:29:22 -0000	1.2
+++ create-iso.sh	11 Apr 2006 08:26:22 -0000	1.3
@@ -3,4 +3,4 @@
 sysdir=$1
 isoimage=$2
 
-mkisofs -quiet $MKISOFSOPTION -R -o $isoimage -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table $sysdir
+mkisofs -quiet -R -o $isoimage -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table $sysdir


Index: kadischi.py
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/kadischi.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kadischi.py	10 Apr 2006 22:53:32 -0000	1.10
+++ kadischi.py	11 Apr 2006 08:26:22 -0000	1.11
@@ -21,35 +21,27 @@
 product_path = ''
 kernel_version = ''
 
-# OK, we`re starting
 
+# OK, we`re starting
 flc_log ('Starting kadischi...')
 
-# setup dirs
 
+# setup dirs
 bindir = sys.path [0]
 confdir = normalize_path(['/etc/kadischi'])
 
-# process command line options
 
+# process command line options
 usage = 'usage: %prog [options] <path-to-the-repository> <destination-iso-image-file>\n\npath-to-the-repository can be a path on the local file system (without any prefixes) but can also be a path to a http, ftp or some other type of repository. For details, consult the documentation at http://fedoraproject.org/wiki/Kadischi/Documentation'
 version = '%prog ' + version
 parser = optparse.OptionParser (usage=usage, version=version)
-
 parser.add_option ("-f", "--force", dest="force", action="store_true", default=False, help="overwrite destination iso image file, if such exists.")
-
 parser.add_option ("-C", "--cmdline", dest="cmdline", action="store_true", default=False, help="run anaconda in command line mode (runs without interface, but requires complete kickstart file)")
-
 parser.add_option ("-T", "--text", dest="text", action="store_true", default=False, help="run anaconda in TUI mode")
-
 parser.add_option ("", "--graphical", dest="graphical", action="store_true", default=False, help="run anaconda in GUI mode")
-
 parser.add_option ("", "--kickstart", dest="ksfile", help="supply anaconda with kickstart file")
-
 parser.add_option ("", "--buildstamp", dest="buildstamp", help="buildstamp file (if not set, using the default buildstamp from the config directory)")
 
-parser.add_option ("", "--filesystem", dest="filesystem", help="set the filesystem to use on the iso to either zisofs[default] or squashfs.")
-
 flc_log ('Parsing command line arguments')
 (options, args) = parser.parse_args ()
 
@@ -63,8 +55,8 @@
 else:
     buildstamp = normalize_path ([confdir, 'buildstamp'])
 
-# set display mode
 
+# set display mode
 display_mode = ''
 
 if options.graphical:
@@ -76,10 +68,9 @@
 
 anaconda_args = display_mode + anaconda_args
 
-### check if everything looks OK
 
+### check if everything looks OK
 # checking arguments
-
 if len (args) < 2:
     flc_log ('Not enough arguments.\n')
     parser.parse_args (['-h'])
@@ -91,22 +82,22 @@
 method = args [0]
 isoimage = normalize_path ([args [1]])
 
-# checking UID - must be root
 
+# checking UID - must be root
 flc_log ('Checking UID')
 
 if os.getuid () != 0:
     flc_log ('You have to be root to run this application. Please restart with root permissions.\n')
     sys.exit (1)
 
-# check if we can open buildstamp file
 
+# check if we can open buildstamp file
 if not os.access(buildstamp, os.R_OK):
     flc_log ('Can`t open buildstamp file %s. ' % buildstamp)
     sys.exit (1)
 
-# loading productPath from buildstamp
 
+# loading productPath from buildstamp
 flc_log ('Using buildstamp file %s. ' % buildstamp)
 
 f = open(buildstamp, "r")
@@ -118,8 +109,8 @@
     flc_log ('Product path can`t be found in buildstamp file %s (Product path should be on the 4th line of the file)' % buildstamp)
     sys.exit (1)
 
-# validating the repository
 
+# validating the repository
 flc_log ('Now we are going to try to validate your repository (for now, only http, ftp and local repositories can be checked)')
 
 valid = True
@@ -137,13 +128,13 @@
     flc_log ('Repository validation failed. Aborting execution.')
     sys.exit (1)
 
-# format method string the way anaconda likes it
 
+# format method string the way anaconda likes it
 if method.find (':') == -1:
     method = 'nfs:/' + method
 
-# checking if everything is OK with destination (iso image) file
 
+# checking if everything is OK with destination (iso image) file
 if os.path.isfile (isoimage):
     flc_log ('File %s already exists. ' % isoimage)
     if force:
@@ -154,18 +145,10 @@
 elif not os.path.isdir (os.path.dirname (isoimage)):
     os.makedirs (os.path.dirname (isoimage))
 
-# check for installed rpms
 
+# check for installed rpms
 flc_log ('Checking required packages')
-
-# Set required filesystem_tools to something appropriate depending on what is chosen
-if options.filesystem == 'squashfs':
-   filesystem_tools = 'squashfs-tools'
-else:
-   filesystem_tools = 'zisofs-tools'
-
-required_rpms = ('anaconda', 'busybox-anaconda', 'mkisofs', 'syslinux', 'e2fsprogs', filesystem_tools)
-
+required_rpms = ('anaconda', 'busybox-anaconda', 'mkisofs', 'syslinux', 'e2fsprogs', 'squashfs-tools')
 missing_rpms = check_installed_rpms ('/', required_rpms, False)
 
 if len (missing_rpms) != 0:
@@ -175,16 +158,16 @@
     flc_log ('are missing. Aborting execution.')
     sys.exit (1)
 
-# check for the config file
 
+# check for the config file
 flc_log ('Looking for config file')
 
 if not os.path.isfile (normalize_path([confdir, 'kadischi.conf'])):
     flc_log ('Can`t find config file %s.' % normalize_path([confdir, 'kadischi.conf']))
     sys.exit (1)
 
-# load config file options
 
+# load config file options
 flc_log ('Loading config file options')
 
 buildconf = shvarFile (normalize_path([confdir, 'kadischi.conf']), True)
@@ -198,21 +181,18 @@
     flc_log ('No build dir defined. Please, edit config file option BUILDDIR.')
     sys.exit(1)
 
-# prepare dirs
 
+# prepare dirs
 buildsubdir = 'livecd-build_no' + buildnum
 builddir = normalize_path ([builddir, buildsubdir])
-
 sysdir = normalize_path([builddir, 'system'])
 csysdir = normalize_path([builddir, 'compressed'])
-
 os.makedirs (sysdir)
-
 # we shouldn`t create csysdir because mkzftree wants to create it by it self
 # os.makedirs (csysdir)
 
-# Moving the buildstamp file to /tmp/product/.buildstamp so anaconda can find it
 
+# Moving the buildstamp file to /tmp/product/.buildstamp so anaconda can find it
 if not os.path.exists ('/tmp/product'):
     os.makedirs ('/tmp/product')
 elif not os.path.isdir ('/tmp/product'):
@@ -225,22 +205,19 @@
 
 shutil.copy2 (buildstamp, '/tmp/product/.buildstamp')
 
-# run anaconda
 
+# run anaconda
 flc_log ('\n  ***  running anaconda  ***  \n')
-
 run ("anaconda %s --rootpath=%s --method=%s" % (anaconda_args, sysdir, method), builddir)
-
 flc_log ('\n  ***  anaconda has finished the job ***  \n')
 
-# now`s the time to pickup kernel version cause when we move files arround, it will be late
 
+# now`s the time to pickup kernel version cause when we move files arround, it will be late
 kernel_version = get_kernel_version (sysdir)
 
-# run post_install_scripts
 
+# run post_install_scripts
 flc_log ('running post installation scripts')
-
 scripts = []
 
 for root, dirs, files in os.walk (normalize_path([bindir, 'post_install_scripts'])):
@@ -255,70 +232,50 @@
     flc_log ('%s' % script)
     run ("%s %s %s" % (script, sysdir, anaconda_args), builddir)
 
-# make initrd image
 
+# make initrd image
 flc_log ('making initrd image')
+run ("%s %s %s" % (normalize_path([bindir, 'livecd-mkinitrd.sh']), sysdir, kernel_version), builddir)
 
-if options.filesystem == 'squashfs':
-    kmods = 'fs/squashfs drivers/block/loop.ko'
-else:
-    kmods = ''
-
-run ("KMODULES='%s' %s %s %s" % (kmods, normalize_path([bindir, 'livecd-mkinitrd.sh']), sysdir, kernel_version), builddir)
 
 # move files 
-
 flc_log ('moving files that should be on tmpfs')
-
 run ("%s %s" % (normalize_path([bindir, 'movefiles.py']), sysdir), builddir)
 
-# compress the tree
 
+# compress the tree
 flc_log ('compressing the tree (order a pizza `cause this will take a while)')
+# kadischi.sqsh is a file that we mount loopback. So we need to create supporting
+# files and directories outside of the compressed tree.
+os.makedirs (os.path.join(csysdir, 'boot/isolinux'))
+os.makedirs (normalize_path([csysdir, '/livecd']))
+touch = file(normalize_path([csysdir, '.livecd']), 'w')
+touch.close()
+# Make the SquashFS image
+run("mksquashfs %s %s" % (sysdir, normalize_path([csysdir, 'kadischi.sqsh'])))
 
-if options.filesystem == 'squashfs':
-    # zisofs has a tree which can be seen; squashfs is a file that we mount
-    # loopback.  So we need to create supporting files and directories
-    # separately.
-    os.makedirs (os.path.join(csysdir, 'boot/isolinux'))
-    os.makedirs(normalize_path([csysdir, '/livecd']))
-    touch = file(normalize_path([csysdir, '.livecd']), 'w')
-    touch.close()
-    # compress a squashfs tree
-    run("mksquashfs %s %s" % (sysdir, normalize_path([csysdir, 'kadischi.sqsh'])))
-else:
-    # compress a zisofs tree
-    run ("mkzftree -z 3 %s %s" % (sysdir, csysdir), builddir)
 
 # install boot & conf files in compressed tree (they shoudn`t be compressed)
-
 flc_log ('installing boot & config files in compressed tree')
-
 run ("%s %s %s %s" % (normalize_path([bindir, 'install-boot.sh']), sysdir, csysdir, kernel_version), builddir)
-
 run ("cp -f %s %s" % (normalize_path([sysdir, '/livecd/kadischi.tar.gz']), normalize_path([csysdir, '/livecd/kadischi.tar.gz'])), builddir)
 
-# delete sysdir - we don`t need it anymore
 
+# delete sysdir - we don`t need it anymore
 flc_log ('removing uncompressed tree')
-
 clean_directory (sysdir)
 
-# create iso image
 
+# create iso image
 flc_log ('creating iso image %s' % isoimage)
+run ("%s %s %s" % (normalize_path([bindir, 'create-iso.sh']), csysdir, isoimage), builddir)
 
-if options.filesystem == 'squashfs':
-    mkisoflags=''
-else:
-    mkisoflags='MKISOFSOPTION=-z '
-run ("%s%s %s %s" % (mkisoflags, normalize_path([bindir, 'create-iso.sh']), csysdir, isoimage), builddir)
 
 # delete builddir
-
 flc_log ('removing builddir')
-
 cleanup (builddir)
 
+
+# Done!
 flc_log ('Finished.')
 sys.exit (0)


Index: livecd-mkinitrd.sh
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/livecd-mkinitrd.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- livecd-mkinitrd.sh	4 Apr 2006 13:43:13 -0000	1.7
+++ livecd-mkinitrd.sh	11 Apr 2006 08:26:22 -0000	1.8
@@ -23,7 +23,6 @@
 rc=0
 
 IMAGESIZE=10000
-KMODULES="drivers/parport $KMODULES"
 
  . /etc/kadischi/kadischi.conf
 
@@ -257,7 +256,7 @@
 inst $rootdir/etc/modprobe.d/modprobe.conf.dist "$MNTIMAGE/etc/modprobe.d/modprobe.conf.dist"
 inst $rootdir/lib/modules/$kernel/modules.dep "$MNTIMAGE/lib/modules/$kernel/modules.dep"
 
-MODULES=$(findmodules $KMODULES)
+MODULES=$(findmodules drivers/parport drivers/block/loop.ko fs/squashfs)
 for MODULE in $MODULES; do
     instmodule $MODULE
 done



From fedora-extras-commits at redhat.com  Tue Apr 11 08:26:24 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Tue, 11 Apr 2006 01:26:24 -0700
Subject: kadischi/man kadischi.1,1.2,1.3
Message-ID: <200604110826.k3B8QOE8027704@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi/man
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27635/kadischi/man

Modified Files:
	kadischi.1 
Log Message:
Use SquashFS exclusively, major tidying of kadischi.py


Index: kadischi.1
===================================================================
RCS file: /cvs/devel/kadischi/man/kadischi.1,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kadischi.1	4 Apr 2006 13:43:13 -0000	1.2
+++ kadischi.1	11 Apr 2006 08:26:22 -0000	1.3
@@ -6,13 +6,13 @@
 kadischi - generate a live ISO9660 CDROM image from an RPM repository
 .SH SYNOPSIS
 kadischi [--text|--graphical] [--kickstart=<ks-file>] [-C|--cmdline]
-[--filesystem=<fstype>] REPOSITORY [-f] IMAGE
+REPOSITORY [-f] IMAGE
 .SH DESCRIPTION
 .B kadischi(1)
 generates a live ISO9660 CDROM image from an RPM repository tree by invoking
 anaconda passing it the correct options and installing to the build
 directory specified. Kadischi will invoke 
-.BR mkzftree(1)
+.BR mksquashfs(1)
 and
 .BR mkisofs(1)
 to produce an image that can be written to a CD or DVD ROM.
@@ -29,10 +29,6 @@
 Run strictly in command line mode requiring no user input.
 .IP --cmdline
 Same as -C
-.IP --filesystem
-The filesystem type which should be used for the root filesystem of the LiveCD,
-where fstype is one of 'zisofs' or 'squashfs'.
-The default is zisofs.
 .IP -f
 Overwrite an existing ISO9660 image, if it already exists.
 .SH FILES
@@ -65,7 +61,7 @@
 .RS
 Chitlesh Goorah <chitlesh at fedoraproject.org>
 .SH "SEE ALSO"
-.BR mkzftree(1),
+.BR mksquashfs(1),
 .BR mkisofs(1),
 .BR busybox(1),
 .BR anaconda(1)



From fedora-extras-commits at redhat.com  Tue Apr 11 08:26:18 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Tue, 11 Apr 2006 01:26:18 -0700
Subject: kadischi kadischi.spec,1.1,1.2
Message-ID: <200604110826.k3B8Qm8t027707@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27635/kadischi

Modified Files:
	kadischi.spec 
Log Message:
Use SquashFS exclusively, major tidying of kadischi.py


Index: kadischi.spec
===================================================================
RCS file: /cvs/devel/kadischi/kadischi.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kadischi.spec	10 Apr 2006 23:22:21 -0000	1.1
+++ kadischi.spec	11 Apr 2006 08:26:16 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           kadischi
 Version:        0.1
-Release:        6.%{alphatag}
+Release:        7.%{alphatag}
 Summary:        LiveCD generation utility 
 
 Group:          Applications/System
@@ -12,7 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kudzu-devel glib2-devel intltool autoconf automake
-Requires:       python anaconda busybox-anaconda syslinux mkisofs zisofs-tools squashfs-tools e2fsprogs
+Requires:       python anaconda busybox-anaconda syslinux mkisofs squashfs-tools e2fsprogs
 AutoReqProv:    off
 
 %description
@@ -40,7 +40,7 @@
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
@@ -77,6 +77,11 @@
 %ghost %{_datadir}/%{name}/post_install_scripts/*.pyo
 
 %changelog
+* Tue Apr 11 2006 Jasper Hartline <jasperhartline at adelphia.net>
+- Drop filesystem option and use SquashFS exclusively
+- Contributor: Toshio Kuratomi <toshio at tiki-lounge.com>
+
+
 * Mon Apr 10 2006 Jasper Hartline <jasperhartline at adelphia.net>
 - Rewrote .spec file to conform to standards
 - Contributors: Toshio Kuratomi <toshio at tiki-lounge.com>



From fedora-extras-commits at redhat.com  Tue Apr 11 08:26:18 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Tue, 11 Apr 2006 01:26:18 -0700
Subject: kadischi/linuxrc livecd-linuxrc,1.3,1.4
Message-ID: <200604110826.k3B8QmfK027710@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi/linuxrc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27635/kadischi/linuxrc

Modified Files:
	livecd-linuxrc 
Log Message:
Use SquashFS exclusively, major tidying of kadischi.py


Index: livecd-linuxrc
===================================================================
RCS file: /cvs/devel/kadischi/linuxrc/livecd-linuxrc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- livecd-linuxrc	30 Mar 2006 10:13:12 -0000	1.3
+++ livecd-linuxrc	11 Apr 2006 08:26:16 -0000	1.4
@@ -17,15 +17,10 @@
 # Make kernel don't mount root fs
 echo 0x100 > /proc/sys/kernel/real-root-dev
 
-# Check for squashfs file
-if [ -f /cdrom/kadischi.sqsh ]; then
-    echo "Mounting squashfs filesystem"
-    modprobe loop
-    modprobe squashfs
-    mount -t squashfs -o loop /cdrom/kadischi.sqsh /sysroot
-else
-    mount -o bind /cdrom /sysroot
-fi
+echo "Mounting root filesystem"
+modprobe loop
+modprobe squashfs
+mount -t squashfs -oloop,ro /cdrom/kadischi.sqsh /sysroot
 
 echo "Doing the pivot_root"
 cd /sysroot



From fedora-extras-commits at redhat.com  Tue Apr 11 08:35:53 2006
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Tue, 11 Apr 2006 01:35:53 -0700
Subject: mock mock.spec,1.14,1.15
Message-ID: <200604110835.k3B8ZrqU027736@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/fedora/mock
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27718

Modified Files:
	mock.spec 
Log Message:

update spec file a bit



Index: mock.spec
===================================================================
RCS file: /cvs/fedora/mock/mock.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mock.spec	27 Dec 2005 18:30:26 -0000	1.14
+++ mock.spec	11 Apr 2006 08:35:50 -0000	1.15
@@ -1,6 +1,6 @@
 Summary: Builds packages inside chroots
 Name: mock
-Version: 0.4
+Version: 0.5
 Release: 1
 License: GPL
 Group: Development/Tools
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Tue Apr 11 2006 Seth Vidal <skvidal at linux.duke.edu>
+- specfile version iterate
+
 * Tue Dec 27 2005 Seth Vidal <skvidal at phy.duke.edu>
 - add patch from Andreas Thienemann - adds man page
 



From fedora-extras-commits at redhat.com  Tue Apr 11 10:01:59 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Tue, 11 Apr 2006 03:01:59 -0700
Subject: rpms/abiword/FC-4 abiword-2.4.4-desktop.patch, NONE, 1.1 .cvsignore,
	1.10, 1.11 abiword.spec, 1.21, 1.22 sources, 1.10,
	1.11 abiword-2.4.2-desktop.patch, 1.1,
	NONE abiword-2.4.2-macros.patch, 1.1, NONE
Message-ID: <200604111002.k3BA2WRn032100@cvs-int.fedora.redhat.com>

Author: uwog

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

Modified Files:
	.cvsignore abiword.spec sources 
Added Files:
	abiword-2.4.4-desktop.patch 
Removed Files:
	abiword-2.4.2-desktop.patch abiword-2.4.2-macros.patch 
Log Message:
New upstream version



abiword-2.4.4-desktop.patch:

--- NEW FILE abiword-2.4.4-desktop.patch ---
diff -r -u abiword-2.4.4.orig/abi/abiword.desktop abiword-2.4.4/abi/abiword.desktop
--- abiword-2.4.4.orig/abi/abiword.desktop	2006-04-03 14:14:01.000000000 +0200
+++ abiword-2.4.4/abi/abiword.desktop	2006-04-11 00:12:19.000000000 +0200
@@ -7,7 +7,7 @@
 StartupNotify=true
 Encoding=UTF-8
 X-Desktop-File-Install-Version=0.9
-MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;
+MimeType=application/msword;application/vnd.sun.xml.writer;application/vnd.wordperfect;application/x-abiword;text/x-abiword;text/x-xml-abiword;application/rtf;text/plain;application/xhtml+xml;text/html;text/vnd.wap.wml;application/vnd.plain;application/vnd.stardivision.writer;application/x-mif;application/x-kword;application/x-applix-word;application/x-mswrite;application/vnd.oasis.opendocument.text;
 Name=AbiWord
 GenericName=Word Processor
 Comment=AbiWord Word Processor


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	5 Jan 2006 15:29:38 -0000	1.10
+++ .cvsignore	11 Apr 2006 10:01:59 -0000	1.11
@@ -1 +1 @@
-abiword-2.4.2.tar.bz2
+abiword-2.4.4.tar.bz2


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-4/abiword.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- abiword.spec	5 Feb 2006 16:34:49 -0000	1.21
+++ abiword.spec	11 Apr 2006 10:01:59 -0000	1.22
@@ -2,8 +2,8 @@
 
 Summary: The AbiWord word processor
 Name: abiword
-Version: 2.4.2
-Release: 2%{?dist}
+Version: 2.4.4
+Release: 1%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -30,7 +30,7 @@
 BuildRequires: librsvg2-devel
 BuildRequires: libwmf-devel
 BuildRequires: aiksaurus-gtk-devel >= 1.2.1
-BuildRequires: link-grammar-devel >= 4.1.3
+BuildRequires: link-grammar-devel >= 4.2.1
 BuildRequires: gtkmathview-devel >= 0.7.5
 BuildRequires: libgsf-devel >= 1.11.1
 
@@ -41,8 +41,7 @@
 URL: http://www.abisource.com/
 
 Patch0: abiword-2.0.9-windowshelppaths.patch
-Patch1: abiword-2.4.2-desktop.patch
-Patch2: abiword-2.4.2-macros.patch
+Patch1: abiword-2.4.4-desktop.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. The goal is to make
@@ -52,7 +51,6 @@
 %setup -q 
 %patch0 -p1 -b .windowshelppaths
 %patch1 -p1 -b .desktop
-%patch2 -p1 -b .macros
 
 %build
 cd abi
@@ -136,6 +134,10 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.4-1.fc4
+- New upstream version
+- Remove the macro patch and update the desktop patch
+
 * Sun Feb 05 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.2-2.fc4
 - Remove redundant requires
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	5 Jan 2006 15:29:38 -0000	1.10
+++ sources	11 Apr 2006 10:01:59 -0000	1.11
@@ -1 +1 @@
-935f1218eab7ff96b7a23cfeba4e76d1  abiword-2.4.2.tar.bz2
+69dd69179b861a41613291afd10af9ab  abiword-2.4.4.tar.bz2


--- abiword-2.4.2-desktop.patch DELETED ---


--- abiword-2.4.2-macros.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 11 10:25:26 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Tue, 11 Apr 2006 03:25:26 -0700
Subject: rpms/smart/FC-4 smart.spec,1.1,1.2
Message-ID: <200604111025.k3BAPSUc032523@cvs-int.fedora.redhat.com>

Author: athimm

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

Modified Files:
	smart.spec 
Log Message:
Fix disttag.


Index: smart.spec
===================================================================
RCS file: /cvs/extras/rpms/smart/FC-4/smart.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smart.spec	10 Apr 2006 17:22:47 -0000	1.1
+++ smart.spec	11 Apr 2006 10:25:26 -0000	1.2
@@ -2,8 +2,8 @@
 
 Summary: Next generation package handling tool
 Name: smart
-Version: 0.41%{?dist}
-Release: 29
+Version: 0.41
+Release: 30%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://labix.org/smart/
@@ -143,6 +143,9 @@
 %config %{_sysconfdir}/pam.d/smart-root
 
 %changelog
+* Tue Apr 11 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41
+- Move the disttag to the Release: tag.
+
 * Mon Apr 10 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41-29
 - Fix typos in distro.py, there were %% missing.
 - /usr/bin/smart-root should had been %%{_bindir}/smart-root ...



From fedora-extras-commits at redhat.com  Tue Apr 11 10:25:27 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Tue, 11 Apr 2006 03:25:27 -0700
Subject: rpms/smart/FC-5 smart.spec,1.1,1.2
Message-ID: <200604111025.k3BAPTNh032528@cvs-int.fedora.redhat.com>

Author: athimm

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

Modified Files:
	smart.spec 
Log Message:
Fix disttag.


Index: smart.spec
===================================================================
RCS file: /cvs/extras/rpms/smart/FC-5/smart.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smart.spec	10 Apr 2006 17:22:47 -0000	1.1
+++ smart.spec	11 Apr 2006 10:25:27 -0000	1.2
@@ -2,8 +2,8 @@
 
 Summary: Next generation package handling tool
 Name: smart
-Version: 0.41%{?dist}
-Release: 29
+Version: 0.41
+Release: 30%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://labix.org/smart/
@@ -143,6 +143,9 @@
 %config %{_sysconfdir}/pam.d/smart-root
 
 %changelog
+* Tue Apr 11 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41
+- Move the disttag to the Release: tag.
+
 * Mon Apr 10 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41-29
 - Fix typos in distro.py, there were %% missing.
 - /usr/bin/smart-root should had been %%{_bindir}/smart-root ...



From fedora-extras-commits at redhat.com  Tue Apr 11 10:25:27 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Tue, 11 Apr 2006 03:25:27 -0700
Subject: rpms/smart/devel smart.spec,1.1,1.2
Message-ID: <200604111025.k3BAPTjg032533@cvs-int.fedora.redhat.com>

Author: athimm

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

Modified Files:
	smart.spec 
Log Message:
Fix disttag.


Index: smart.spec
===================================================================
RCS file: /cvs/extras/rpms/smart/devel/smart.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smart.spec	10 Apr 2006 17:22:47 -0000	1.1
+++ smart.spec	11 Apr 2006 10:25:27 -0000	1.2
@@ -2,8 +2,8 @@
 
 Summary: Next generation package handling tool
 Name: smart
-Version: 0.41%{?dist}
-Release: 29
+Version: 0.41
+Release: 30%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://labix.org/smart/
@@ -143,6 +143,9 @@
 %config %{_sysconfdir}/pam.d/smart-root
 
 %changelog
+* Tue Apr 11 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41
+- Move the disttag to the Release: tag.
+
 * Mon Apr 10 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41-29
 - Fix typos in distro.py, there were %% missing.
 - /usr/bin/smart-root should had been %%{_bindir}/smart-root ...



From fedora-extras-commits at redhat.com  Tue Apr 11 10:26:39 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Tue, 11 Apr 2006 03:26:39 -0700
Subject: fedora-security/audit fc4,1.197,1.198 fc5,1.110,1.111
Message-ID: <200604111026.k3BAQdA4032672@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32537/audit

Modified Files:
	fc4 fc5 
Log Message:
Add CVE-2006-1055



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- fc4	11 Apr 2006 02:15:48 -0000	1.197
+++ fc4	11 Apr 2006 10:26:37 -0000	1.198
@@ -28,6 +28,7 @@
 CVE-2006-1061 version (curl, 7.15.0 - 7.15.2 only)
 CVE-2006-1059 version (samba)
 CVE-2006-1058 VULNERABLE (busybox) bz#187386
+CVE-2006-1055 VULNERABLE (kernel, fixed 2.6.17-rc1)
 CVE-2006-1052 version (kernel, fixed 2.6.16) patch-2.6.16-rc6 [since FEDORA-2006-245]
 CVE-2006-1045 VULNERABLE (thunderbird)
 CVE-2006-1015 ignore (php) safe mode isn't safe


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- fc5	11 Apr 2006 02:15:48 -0000	1.110
+++ fc5	11 Apr 2006 10:26:37 -0000	1.111
@@ -29,6 +29,7 @@
 CVE-2006-1061 backport (curl, fixed 7.15.3) [since FEDORA-2006-189]
 CVE-2006-1059 version (samba, fixed 3.0.22 at least) bz#187170 [since FEDORA-2006-259]
 CVE-2006-1058 VULNERABLE (busybox) bz#187386
+CVE-2006-1055 VULNERABLE (kernel, fixed 2.6.17-rc1)
 CVE-2006-1052 version (kernel, fixed 2.6.16) patch-2.6.16-rc6 [since FEDORA-2006-233]
 CVE-2006-1045 VULNERABLE (thunderbird)
 CVE-2006-1015 ignore (php) safe mode isn't safe



From fedora-extras-commits at redhat.com  Tue Apr 11 10:30:37 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Tue, 11 Apr 2006 03:30:37 -0700
Subject: rpms/pikdev/devel .cvsignore, 1.2, 1.3 pikdev.spec, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <200604111030.k3BAUd3T000436@cvs-int.fedora.redhat.com>

Author: dionysos

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

Modified Files:
	.cvsignore pikdev.spec sources 
Log Message:
New upstream version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pikdev/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Mar 2006 08:26:13 -0000	1.2
+++ .cvsignore	11 Apr 2006 10:30:37 -0000	1.3
@@ -1 +1 @@
-pikdev-0.8.4.tar.gz
+pikdev-0.9.1-4.tar.gz


Index: pikdev.spec
===================================================================
RCS file: /cvs/extras/rpms/pikdev/devel/pikdev.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pikdev.spec	7 Apr 2006 10:54:20 -0000	1.3
+++ pikdev.spec	11 Apr 2006 10:30:37 -0000	1.4
@@ -1,17 +1,16 @@
 Name:		pikdev
-Version:	0.8.4
-Release:	10%{?dist}
+Version:	0.9.1
+Release:	1%{?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
 
 Group:		Development/Tools
 License:	GPL
 Url:		http://pikdev.free.fr
-Source0:	http://pikdev.free.fr/%{name}-%{version}.tar.gz
+Source0:	http://pikdev.free.fr/%{name}-%{version}-4.tar.gz
 Source1:	%{name}.desktop
 Source2:	README.Fedora
 Source3:	LISEZMOI.Fedora
-Patch:		%{name}-%{version}.ppcbuild
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils, kdelibs-devel
@@ -53,35 +52,32 @@
 
 %setup -q
 
-%patch
-
 %{__cp} -p %{SOURCE2} .
 %{__cp} -p %{SOURCE3} .
 
 %build
 
+# Needed for FC-4 x86_64 arch
+# See bug #169132
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
 %configure --disable-rpath
 
-rm -rf pkp
-cd pikdev
+cd src
 make -f Makefile.pkp \
 CCPP=g++ \
 LINK=g++ \
-CCPPOPT="$RPM_OPT_FLAGS -DPKP_VERSION=0.8.4" \
+CCPPOPT="$RPM_OPT_FLAGS -DPKP_VERSION=0.9.1" \
 LIBS=
 cd ..
-cp pikdev/pkp .
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
-chmod +x $RPM_BUILD_ROOT%{_bindir}/pkp
-rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Development/%{name}.desktop
+%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/%{name}.desktop
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
@@ -94,18 +90,21 @@
 %find_lang %{name}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-, root, root)
-%doc LICENSE README.Fedora LISEZMOI.Fedora
+%doc AUTHORS COPYING README.Fedora LISEZMOI.Fedora
 %{_bindir}/*
 %{_datadir}/applications/*
 %{_datadir}/apps/%{name}/
 %{_datadir}/apps/katepart/syntax/*
+%{_datadir}/doc/HTML/en/%{name}/
 %{_datadir}/icons/*
 
 %changelog
+* Tue Apr 11 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.9.1-1
+  - New upstream version
 * Fri Apr 07 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-10
   - Fix patch name
 * Fri Apr 07 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-9


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pikdev/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Mar 2006 08:26:13 -0000	1.2
+++ sources	11 Apr 2006 10:30:37 -0000	1.3
@@ -1 +1 @@
-95c6cf21241134ed684373b8176f6ea1  pikdev-0.8.4.tar.gz
+5cee6cd6c4e322efc8013bb1e7729b13  pikdev-0.9.1-4.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 10:30:36 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Tue, 11 Apr 2006 03:30:36 -0700
Subject: rpms/pikdev/FC-4 .cvsignore, 1.2, 1.3 pikdev.spec, 1.9, 1.10 sources,
	1.2, 1.3
Message-ID: <200604111030.k3BAUcNk000424@cvs-int.fedora.redhat.com>

Author: dionysos

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

Modified Files:
	.cvsignore pikdev.spec sources 
Log Message:
New upstream version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pikdev/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Mar 2006 08:26:13 -0000	1.2
+++ .cvsignore	11 Apr 2006 10:30:35 -0000	1.3
@@ -1 +1 @@
-pikdev-0.8.4.tar.gz
+pikdev-0.9.1-4.tar.gz


Index: pikdev.spec
===================================================================
RCS file: /cvs/extras/rpms/pikdev/FC-4/pikdev.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pikdev.spec	7 Apr 2006 09:32:02 -0000	1.9
+++ pikdev.spec	11 Apr 2006 10:30:35 -0000	1.10
@@ -1,17 +1,16 @@
 Name:		pikdev
-Version:	0.8.4
-Release:	10%{?dist}
+Version:	0.9.1
+Release:	1%{?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
 
 Group:		Development/Tools
 License:	GPL
 Url:		http://pikdev.free.fr
-Source0:	http://pikdev.free.fr/%{name}-%{version}.tar.gz
+Source0:	http://pikdev.free.fr/%{name}-%{version}-4.tar.gz
 Source1:	%{name}.desktop
 Source2:	README.Fedora
 Source3:	LISEZMOI.Fedora
-Patch:		%{name}-%{version}.ppcbuild
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils, kdelibs-devel
@@ -53,35 +52,32 @@
 
 %setup -q
 
-%patch
-
 %{__cp} -p %{SOURCE2} .
 %{__cp} -p %{SOURCE3} .
 
 %build
 
+# Needed for FC-4 x86_64 arch
+# See bug #169132
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
 %configure --disable-rpath
 
-rm -rf pkp
-cd pikdev
+cd src
 make -f Makefile.pkp \
 CCPP=g++ \
 LINK=g++ \
-CCPPOPT="$RPM_OPT_FLAGS -DPKP_VERSION=0.8.4" \
+CCPPOPT="$RPM_OPT_FLAGS -DPKP_VERSION=0.9.1" \
 LIBS=
 cd ..
-cp pikdev/pkp .
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
-chmod +x $RPM_BUILD_ROOT%{_bindir}/pkp
-rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Development/%{name}.desktop
+%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/%{name}.desktop
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
@@ -94,18 +90,21 @@
 %find_lang %{name}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-, root, root)
-%doc LICENSE README.Fedora LISEZMOI.Fedora
+%doc AUTHORS COPYING README.Fedora LISEZMOI.Fedora
 %{_bindir}/*
 %{_datadir}/applications/*
 %{_datadir}/apps/%{name}/
 %{_datadir}/apps/katepart/syntax/*
+%{_datadir}/doc/HTML/en/%{name}/
 %{_datadir}/icons/*
 
 %changelog
+* Tue Apr 11 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.9.1-1
+  - New upstream version
 * Fri Apr 07 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-10
   - Fix patch name
 * Fri Apr 07 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-9


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pikdev/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Mar 2006 08:26:13 -0000	1.2
+++ sources	11 Apr 2006 10:30:35 -0000	1.3
@@ -1 +1 @@
-95c6cf21241134ed684373b8176f6ea1  pikdev-0.8.4.tar.gz
+5cee6cd6c4e322efc8013bb1e7729b13  pikdev-0.9.1-4.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 10:30:36 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Tue, 11 Apr 2006 03:30:36 -0700
Subject: rpms/pikdev/FC-5 .cvsignore, 1.2, 1.3 pikdev.spec, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <200604111030.k3BAUcGT000430@cvs-int.fedora.redhat.com>

Author: dionysos

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

Modified Files:
	.cvsignore pikdev.spec sources 
Log Message:
New upstream version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pikdev/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Mar 2006 08:26:13 -0000	1.2
+++ .cvsignore	11 Apr 2006 10:30:36 -0000	1.3
@@ -1 +1 @@
-pikdev-0.8.4.tar.gz
+pikdev-0.9.1-4.tar.gz


Index: pikdev.spec
===================================================================
RCS file: /cvs/extras/rpms/pikdev/FC-5/pikdev.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pikdev.spec	7 Apr 2006 10:53:07 -0000	1.3
+++ pikdev.spec	11 Apr 2006 10:30:36 -0000	1.4
@@ -1,17 +1,16 @@
 Name:		pikdev
-Version:	0.8.4
-Release:	10%{?dist}
+Version:	0.9.1
+Release:	1%{?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
 
 Group:		Development/Tools
 License:	GPL
 Url:		http://pikdev.free.fr
-Source0:	http://pikdev.free.fr/%{name}-%{version}.tar.gz
+Source0:	http://pikdev.free.fr/%{name}-%{version}-4.tar.gz
 Source1:	%{name}.desktop
 Source2:	README.Fedora
 Source3:	LISEZMOI.Fedora
-Patch:		%{name}-%{version}.ppcbuild
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils, kdelibs-devel
@@ -53,35 +52,32 @@
 
 %setup -q
 
-%patch
-
 %{__cp} -p %{SOURCE2} .
 %{__cp} -p %{SOURCE3} .
 
 %build
 
+# Needed for FC-4 x86_64 arch
+# See bug #169132
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
 %configure --disable-rpath
 
-rm -rf pkp
-cd pikdev
+cd src
 make -f Makefile.pkp \
 CCPP=g++ \
 LINK=g++ \
-CCPPOPT="$RPM_OPT_FLAGS -DPKP_VERSION=0.8.4" \
+CCPPOPT="$RPM_OPT_FLAGS -DPKP_VERSION=0.9.1" \
 LIBS=
 cd ..
-cp pikdev/pkp .
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
-chmod +x $RPM_BUILD_ROOT%{_bindir}/pkp
-rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Development/%{name}.desktop
+%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/%{name}.desktop
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
@@ -94,18 +90,21 @@
 %find_lang %{name}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-, root, root)
-%doc LICENSE README.Fedora LISEZMOI.Fedora
+%doc AUTHORS COPYING README.Fedora LISEZMOI.Fedora
 %{_bindir}/*
 %{_datadir}/applications/*
 %{_datadir}/apps/%{name}/
 %{_datadir}/apps/katepart/syntax/*
+%{_datadir}/doc/HTML/en/%{name}/
 %{_datadir}/icons/*
 
 %changelog
+* Tue Apr 11 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.9.1-1
+  - New upstream version
 * Fri Apr 07 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-10
   - Fix patch name
 * Fri Apr 07 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-9


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pikdev/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Mar 2006 08:26:13 -0000	1.2
+++ sources	11 Apr 2006 10:30:36 -0000	1.3
@@ -1 +1 @@
-95c6cf21241134ed684373b8176f6ea1  pikdev-0.8.4.tar.gz
+5cee6cd6c4e322efc8013bb1e7729b13  pikdev-0.9.1-4.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 10:31:23 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Tue, 11 Apr 2006 03:31:23 -0700
Subject: rpms/abiword/FC-3 abiword-2.4.4-desktop.patch, NONE, 1.1 .cvsignore,
	1.13, 1.14 abiword.spec, 1.33, 1.34 sources, 1.13,
	1.14 abiword-2.4.2-desktop.patch, 1.1,
	NONE abiword-2.4.2-macros.patch, 1.1, NONE
Message-ID: <200604111031.k3BAVPmY000505@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/abiword/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv477

Modified Files:
	.cvsignore abiword.spec sources 
Added Files:
	abiword-2.4.4-desktop.patch 
Removed Files:
	abiword-2.4.2-desktop.patch abiword-2.4.2-macros.patch 
Log Message:
New upstream version



abiword-2.4.4-desktop.patch:

--- NEW FILE abiword-2.4.4-desktop.patch ---
diff -r -u abiword-2.4.4.orig/abi/abiword.desktop abiword-2.4.4/abi/abiword.desktop
--- abiword-2.4.4.orig/abi/abiword.desktop	2006-04-03 14:14:01.000000000 +0200
+++ abiword-2.4.4/abi/abiword.desktop	2006-04-11 00:12:19.000000000 +0200
@@ -7,7 +7,7 @@
 StartupNotify=true
 Encoding=UTF-8
 X-Desktop-File-Install-Version=0.9
-MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;
+MimeType=application/msword;application/vnd.sun.xml.writer;application/vnd.wordperfect;application/x-abiword;text/x-abiword;text/x-xml-abiword;application/rtf;text/plain;application/xhtml+xml;text/html;text/vnd.wap.wml;application/vnd.plain;application/vnd.stardivision.writer;application/x-mif;application/x-kword;application/x-applix-word;application/x-mswrite;application/vnd.oasis.opendocument.text;
 Name=AbiWord
 GenericName=Word Processor
 Comment=AbiWord Word Processor


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-3/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	5 Jan 2006 15:53:23 -0000	1.13
+++ .cvsignore	11 Apr 2006 10:31:23 -0000	1.14
@@ -1 +1 @@
-abiword-2.4.2.tar.bz2
+abiword-2.4.4.tar.bz2


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-3/abiword.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- abiword.spec	5 Feb 2006 16:33:04 -0000	1.33
+++ abiword.spec	11 Apr 2006 10:31:23 -0000	1.34
@@ -2,8 +2,8 @@
 
 Summary: The AbiWord word processor
 Name: abiword
-Version: 2.4.2
-Release: 2%{?dist}
+Version: 2.4.4
+Release: 1%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -29,7 +29,7 @@
 BuildRequires: librsvg2-devel
 BuildRequires: libwmf-devel
 BuildRequires: aiksaurus-gtk-devel >= 1.2.1
-BuildRequires: link-grammar-devel >= 4.1.3
+BuildRequires: link-grammar-devel >= 4.2.1
 BuildRequires: gtkmathview-devel >= 0.7.5
 BuildRequires: libgsf-devel >= 1.10.1
 
@@ -40,9 +40,8 @@
 URL: http://www.abisource.com/
 
 Patch0: abiword-2.0.9-windowshelppaths.patch
-Patch1: abiword-2.4.2-desktop.patch
+Patch1: abiword-2.4.4-desktop.patch
 Patch2: abiword-2.4.2-gsf.patch
-Patch3: abiword-2.4.2-macros.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. The goal is to make
@@ -53,7 +52,6 @@
 %patch0 -p1 -b .windowshelppaths
 %patch1 -p1 -b .desktop
 %patch2 -p1 -b .gsf
-%patch3 -p1 -b .macros
 
 %build
 cd abi
@@ -137,6 +135,10 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Tue Apr 11 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.4-1.fc3
+- New upstream version
+- Remove the macro patch and update the desktop patch
+
 * Sun Feb 05 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.2-2.fc3
 - Remove redundant requires
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-3/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	5 Jan 2006 15:53:23 -0000	1.13
+++ sources	11 Apr 2006 10:31:23 -0000	1.14
@@ -1 +1 @@
-935f1218eab7ff96b7a23cfeba4e76d1  abiword-2.4.2.tar.bz2
+69dd69179b861a41613291afd10af9ab  abiword-2.4.4.tar.bz2


--- abiword-2.4.2-desktop.patch DELETED ---


--- abiword-2.4.2-macros.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 11 10:31:39 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Tue, 11 Apr 2006 03:31:39 -0700
Subject: owners owners.list,1.831,1.832
Message-ID: <200604111031.k3BAVfFA000524@cvs-int.fedora.redhat.com>

Author: athimm

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

Modified Files:
	owners.list 
Log Message:
Added smart and fedora-package-config-smart


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.831
retrieving revision 1.832
diff -u -r1.831 -r1.832
--- owners.list	11 Apr 2006 00:01:23 -0000	1.831
+++ owners.list	11 Apr 2006 10:31:39 -0000	1.832
@@ -242,6 +242,7 @@
 Fedora Extras|fbida|FrameBuffer Imageviewer|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|fdupes|Identifies and optionally deletes duplicate files|simonb at thoughtpolice.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|fedora-rpmdevtools|Fedora RPM Development Tools|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|fedora-package-config-smart|Configuration files for the smart package manager|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|
 Fedora Extras|fedora-usermgmt|Fedora tools for user management|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|feh|Fast command line image viewer using Imlib2|a.kurtz at hardsun.net|extras-qa at fedoraproject.org|
 Fedora Extras|fetchlog|The fetchlog utility displays the last new messages of a logfile|paul at xtdnet.nl|extras-qa at fedoraproject.org|
@@ -1346,6 +1347,7 @@
 Fedora Extras|skencil|A vector drawing program|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|skkdic|Japanese dictionaries for skk input|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|sloccount|Measures source lines of code (SLOC) in programs|bnocera at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|smart|Next generation package handling tool|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|
 Fedora Extras|smb4k|The SMB/CIFS Share Browser for KDE|mgarski at post.pl|extras-qa at fedoraproject.org|
 Fedora Extras|smbldap-tools|User and group administration tools for Samba/OpenLDAP|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|smeg|Simple menu editor for GNOME|jpmahowald at gmail.com|extras-qa at fedoraproject.org|foolish at guezz.net



From fedora-extras-commits at redhat.com  Tue Apr 11 10:42:57 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Tue, 11 Apr 2006 03:42:57 -0700
Subject: rpms/mod_security/devel .cvsignore, 1.4, 1.5 mod_security.spec, 1.12,
	1.13 sources, 1.5, 1.6
Message-ID: <200604111042.k3BAgxts000752@cvs-int.fedora.redhat.com>

Author: mfleming

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

Modified Files:
	.cvsignore mod_security.spec sources 
Log Message:
* Tue Apr 11 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.3-1
- New upstream release
- Trivial spec tweaks



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_security/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 Jan 2006 02:14:08 -0000	1.4
+++ .cvsignore	11 Apr 2006 10:42:57 -0000	1.5
@@ -1 +1 @@
-modsecurity-apache-1.9.2.tar.gz
+modsecurity-apache_1.9.3.tar.gz


Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/devel/mod_security.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mod_security.spec	28 Feb 2006 22:45:34 -0000	1.12
+++ mod_security.spec	11 Apr 2006 10:42:57 -0000	1.13
@@ -1,11 +1,11 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 1.9.2
-Release: 3%{?dist}
+Version: 1.9.3
+Release: 1%{?dist}
 License: GPL
 URL: http://www.modsecurity.org/
 Group: System Environment/Daemons
-Source: http://www.modsecurity.org/download/modsecurity-apache-%{version}.tar.gz
+Source: http://www.modsecurity.org/download/modsecurity-apache_%{version}.tar.gz
 Source1: mod_security.conf
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: httpd  httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat %{_includedir}/httpd/.mmn || echo missing)
@@ -18,7 +18,7 @@
 
 %prep
 
-%setup -q -n modsecurity-apache-%{version}
+%setup -q -n modsecurity-apache_%{version}
 
 %build
 /usr/sbin/apxs -Wc,"%{optflags}" -c apache2/mod_security.c
@@ -37,9 +37,13 @@
 %defattr (-,root,root)
 %doc CHANGES LICENSE INSTALL README httpd* util doc
 %{_libdir}/httpd/modules/mod_security.so
-%config(noreplace) /etc/httpd/conf.d/mod_security.conf
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_security.conf
 
 %changelog
+* Tue Apr 11 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.3-1
+- New upstream release
+- Trivial spec tweaks
+
 * Wed Mar 1 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.2-3
 - Bump for FC5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_security/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	18 Jan 2006 02:14:08 -0000	1.5
+++ sources	11 Apr 2006 10:42:57 -0000	1.6
@@ -1 +1 @@
-c28b66f02adb1ddb2d0885483f6f8e0e  modsecurity-apache-1.9.2.tar.gz
+cd5585488e2499c4218a4b13419c3065  modsecurity-apache_1.9.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 11:00:33 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Tue, 11 Apr 2006 04:00:33 -0700
Subject: rpms/mod_security/FC-5 .cvsignore, 1.4, 1.5 mod_security.spec, 1.13,
	1.14 sources, 1.5, 1.6
Message-ID: <200604111100.k3BB0ZQi000864@cvs-int.fedora.redhat.com>

Author: mfleming

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

Modified Files:
	.cvsignore mod_security.spec sources 
Log Message:
* Tue Apr 11 2006 Michael Fleming <mfleming+rpm at enlartenment.com>  1.9.3-1
- New upstream release
- Trivial spec tweaks



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 Jan 2006 02:14:08 -0000	1.4
+++ .cvsignore	11 Apr 2006 11:00:32 -0000	1.5
@@ -1 +1 @@
-modsecurity-apache-1.9.2.tar.gz
+modsecurity-apache_1.9.3.tar.gz


Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-5/mod_security.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mod_security.spec	17 Mar 2006 23:35:58 -0000	1.13
+++ mod_security.spec	11 Apr 2006 11:00:32 -0000	1.14
@@ -1,11 +1,11 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 1.9.2
-Release: 4%{?dist}
+Version: 1.9.3
+Release: 1%{?dist}
 License: GPL
 URL: http://www.modsecurity.org/
 Group: System Environment/Daemons
-Source: http://www.modsecurity.org/download/modsecurity-apache-%{version}.tar.gz
+Source: http://www.modsecurity.org/download/modsecurity-apache_%{version}.tar.gz
 Source1: mod_security.conf
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: httpd  httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat %{_includedir}/httpd/.mmn || echo missing)
@@ -18,7 +18,7 @@
 
 %prep
 
-%setup -q -n modsecurity-apache-%{version}
+%setup -q -n modsecurity-apache_%{version}
 
 %build
 /usr/sbin/apxs -Wc,"%{optflags}" -c apache2/mod_security.c
@@ -37,9 +37,13 @@
 %defattr (-,root,root)
 %doc CHANGES LICENSE INSTALL README httpd* util doc
 %{_libdir}/httpd/modules/mod_security.so
-%config(noreplace) /etc/httpd/conf.d/mod_security.conf
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_security.conf
 
 %changelog
+* Tue Apr 11 2006 Michael Fleming <mfleming+rpm at enlartenment.com>  1.9.3-1
+- New upstream release
+- Trivial spec tweaks
+
 * Sat Mar 18 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.2-4
 - Bump for FC5 final
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	18 Jan 2006 02:14:08 -0000	1.5
+++ sources	11 Apr 2006 11:00:32 -0000	1.6
@@ -1 +1 @@
-c28b66f02adb1ddb2d0885483f6f8e0e  modsecurity-apache-1.9.2.tar.gz
+cd5585488e2499c4218a4b13419c3065  modsecurity-apache_1.9.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 11:03:32 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Tue, 11 Apr 2006 04:03:32 -0700
Subject: fedora-security/audit README,1.3,1.4
Message-ID: <200604111103.k3BB3WLU003107@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3083

Modified Files:
	README 
Log Message:
Include a bit about FC5



Index: README
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/README,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- README	11 Jul 2005 16:40:28 -0000	1.3
+++ README	11 Apr 2006 11:03:30 -0000	1.4
@@ -5,17 +5,17 @@
 A. Each time Mitre sends out a CVE update
 
         1. Look though the list for anything that might affect
-        a FC4 package
+        a FC4 or FC5 package
 
-        2. Add the CVE names to the FC4 file
+        2. Add the CVE names to the FC4 and/or FC5 file
 
-B. Is FC4 affected by the CVE name
+B. Are FC4 or FC5 affected by the CVE name
 
         1. Did we ship an upstream version that wasn't affected?
 
         2. Did we ship a backported patch?
 
-C. Each time a FC4 update comes out
+C. Each time a FC update comes out
 
         1. Did the package move to a new upstream version?  if so
         are there any flaws listed for that package as "backported"?



From fedora-extras-commits at redhat.com  Tue Apr 11 11:03:44 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Tue, 11 Apr 2006 04:03:44 -0700
Subject: rpms/mod_security/FC-4 .cvsignore, 1.5, 1.6 mod_security.spec, 1.6, 
	1.7 sources, 1.5, 1.6
Message-ID: <200604111103.k3BB3kfL003134@cvs-int.fedora.redhat.com>

Author: mfleming

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

Modified Files:
	.cvsignore mod_security.spec sources 
Log Message:
* Tue Apr 11 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.3-1
- New upstream release
- Trivial spec tweaks



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	18 Jan 2006 03:08:08 -0000	1.5
+++ .cvsignore	11 Apr 2006 11:03:43 -0000	1.6
@@ -1 +1 @@
-modsecurity-apache-1.9.2.tar.gz
+modsecurity-apache_1.9.3.tar.gz


Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-4/mod_security.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mod_security.spec	18 Jan 2006 03:08:08 -0000	1.6
+++ mod_security.spec	11 Apr 2006 11:03:43 -0000	1.7
@@ -1,11 +1,11 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 1.9.2
+Version: 1.9.3
 Release: 1%{?dist}
 License: GPL
 URL: http://www.modsecurity.org/
 Group: System Environment/Daemons
-Source: http://www.modsecurity.org/download/modsecurity-apache-%{version}.tar.gz
+Source: http://www.modsecurity.org/download/modsecurity-apache_%{version}.tar.gz
 Source1: mod_security.conf
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: httpd  httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat %{_includedir}/httpd/.mmn || echo missing)
@@ -18,7 +18,7 @@
 
 %prep
 
-%setup -q -n modsecurity-apache-%{version}
+%setup -q -n modsecurity-apache_%{version}
 
 %build
 /usr/sbin/apxs -Wc,"%{optflags}" -c apache2/mod_security.c
@@ -37,9 +37,13 @@
 %defattr (-,root,root)
 %doc CHANGES LICENSE INSTALL README httpd* util doc
 %{_libdir}/httpd/modules/mod_security.so
-%config(noreplace) /etc/httpd/conf.d/mod_security.conf
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_security.conf
 
 %changelog
+* Tue Apr 11 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.3-1
+- New upstream release
+- Trivial spec tweaks
+
 * Wed Jan 18 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.2-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	18 Jan 2006 03:08:08 -0000	1.5
+++ sources	11 Apr 2006 11:03:43 -0000	1.6
@@ -1 +1 @@
-c28b66f02adb1ddb2d0885483f6f8e0e  modsecurity-apache-1.9.2.tar.gz
+cd5585488e2499c4218a4b13419c3065  modsecurity-apache_1.9.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 11:07:14 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:07:14 -0700
Subject: rpms/xfce4-clipman-plugin/devel xfce4-clipman-plugin.spec,1.2,1.3
Message-ID: <200604111107.k3BB7GII003201@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-serv3183

Modified Files:
	xfce4-clipman-plugin.spec 
Log Message:
require xfce4-panel.


Index: xfce4-clipman-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-clipman-plugin/devel/xfce4-clipman-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-clipman-plugin.spec	15 Feb 2006 22:12:56 -0000	1.2
+++ xfce4-clipman-plugin.spec	11 Apr 2006 11:07:14 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-clipman-plugin
 Version:	0.4.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Clipboard manager plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 This is a simple cliboard history for Xfce panel. It includes a "Clear 
@@ -36,6 +37,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-6
+- Require xfce4-panel.
+
 * Wed Feb 15 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:07:48 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:07:48 -0700
Subject: rpms/xfce4-clipman-plugin/FC-5 xfce4-clipman-plugin.spec,1.2,1.3
Message-ID: <200604111107.k3BB7ojA003678@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-clipman-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3448

Modified Files:
	xfce4-clipman-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-clipman-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-clipman-plugin/FC-5/xfce4-clipman-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-clipman-plugin.spec	15 Feb 2006 22:12:56 -0000	1.2
+++ xfce4-clipman-plugin.spec	11 Apr 2006 11:07:48 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-clipman-plugin
 Version:	0.4.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Clipboard manager plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 This is a simple cliboard history for Xfce panel. It includes a "Clear 
@@ -36,6 +37,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-6
+- Require xfce4-panel.
+
 * Wed Feb 15 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:08:27 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:08:27 -0700
Subject: rpms/xfce4-clipman-plugin/FC-4 xfce4-clipman-plugin.spec,1.1,1.2
Message-ID: <200604111108.k3BB8TAm005457@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-clipman-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5440

Modified Files:
	xfce4-clipman-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-clipman-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-clipman-plugin/FC-4/xfce4-clipman-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-clipman-plugin.spec	16 Dec 2005 04:32:10 -0000	1.1
+++ xfce4-clipman-plugin.spec	11 Apr 2006 11:08:27 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-clipman-plugin
 Version:	0.4.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Clipboard manager plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 This is a simple cliboard history for Xfce panel. It includes a "Clear 
@@ -36,6 +37,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 11:09:18 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:09:18 -0700
Subject: rpms/xfce4-cpugraph-plugin/devel xfce4-cpugraph-plugin.spec, 1.3,
	1.4
Message-ID: <200604111109.k3BB9KEI005487@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-serv5470

Modified Files:
	xfce4-cpugraph-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-cpugraph-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-cpugraph-plugin/devel/xfce4-cpugraph-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-cpugraph-plugin.spec	16 Feb 2006 15:46:27 -0000	1.3
+++ xfce4-cpugraph-plugin.spec	11 Apr 2006 11:09:18 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		xfce4-cpugraph-plugin
 Version:	0.2.2
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	CPU monitor for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A CPU monitor plugin for the Xfce panel. It offers multiple display modes 
@@ -37,6 +38,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.2.2-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.2.2-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:10:10 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:10:10 -0700
Subject: rpms/xfce4-cpugraph-plugin/FC-4 xfce4-cpugraph-plugin.spec,1.1,1.2
Message-ID: <200604111110.k3BBACbX005554@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-cpugraph-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5502

Modified Files:
	xfce4-cpugraph-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-cpugraph-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-cpugraph-plugin/FC-4/xfce4-cpugraph-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-cpugraph-plugin.spec	9 Dec 2005 22:52:48 -0000	1.1
+++ xfce4-cpugraph-plugin.spec	11 Apr 2006 11:10:09 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-cpugraph-plugin
 Version:	0.2.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	CPU monitor for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A CPU monitor plugin for the Xfce panel. It offers multiple display modes 
@@ -37,6 +38,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.2.2-5
+- Require xfce4-panel.
+
 * Mon Nov 28 2005 Christoph Wickert <fedora wickert at arcor de> - 0.2.2-4
 - Rebuild with new source because of md5sum mismatch.
 - Add libxfcegui4-devel BuildReqs.



From fedora-extras-commits at redhat.com  Tue Apr 11 11:11:08 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:11:08 -0700
Subject: rpms/xfce4-datetime-plugin/devel xfce4-datetime-plugin.spec, 1.3,
	1.4
Message-ID: <200604111111.k3BBBArF005583@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-serv5566

Modified Files:
	xfce4-datetime-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-datetime-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-datetime-plugin/devel/xfce4-datetime-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-datetime-plugin.spec	16 Feb 2006 15:52:21 -0000	1.3
+++ xfce4-datetime-plugin.spec	11 Apr 2006 11:11:08 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		xfce4-datetime-plugin
 Version:	0.3.1
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Date/time plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel  >= 4.2
 BuildRequires:	libxml2-devel, gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 An alternative clock plugin for the Xfce panel. A calendar appears when you 
@@ -38,6 +39,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* 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.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:11:43 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:11:43 -0700
Subject: rpms/xfce4-datetime-plugin/FC-5 xfce4-datetime-plugin.spec,1.3,1.4
Message-ID: <200604111111.k3BBBjE1005615@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-datetime-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5598

Modified Files:
	xfce4-datetime-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-datetime-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-datetime-plugin/FC-5/xfce4-datetime-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-datetime-plugin.spec	16 Feb 2006 15:52:21 -0000	1.3
+++ xfce4-datetime-plugin.spec	11 Apr 2006 11:11:43 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		xfce4-datetime-plugin
 Version:	0.3.1
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Date/time plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel  >= 4.2
 BuildRequires:	libxml2-devel, gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 An alternative clock plugin for the Xfce panel. A calendar appears when you 
@@ -38,6 +39,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* 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.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:12:08 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:12:08 -0700
Subject: rpms/xfce4-datetime-plugin/FC-4 xfce4-datetime-plugin.spec,1.2,1.3
Message-ID: <200604111112.k3BBCAMK005643@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-datetime-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5626

Modified Files:
	xfce4-datetime-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-datetime-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-datetime-plugin/FC-4/xfce4-datetime-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-datetime-plugin.spec	9 Dec 2005 23:00:51 -0000	1.2
+++ xfce4-datetime-plugin.spec	11 Apr 2006 11:12:08 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-datetime-plugin
 Version:	0.3.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Date/time plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel  >= 4.2
 BuildRequires:	libxml2-devel, gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 An alternative clock plugin for the Xfce panel. A calendar appears when you 
@@ -38,6 +39,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-6
+- Require xfce4-panel.
+
 * Tue Nov 29 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-5
 - Add libxfcegui4-devel BuildReqs.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:12:43 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:12:43 -0700
Subject: rpms/xfce4-diskperf-plugin/devel xfce4-diskperf-plugin.spec, 1.3,
	1.4
Message-ID: <200604111112.k3BBCjdT005672@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-serv5655

Modified Files:
	xfce4-diskperf-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-diskperf-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-diskperf-plugin/devel/xfce4-diskperf-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-diskperf-plugin.spec	16 Feb 2006 16:10:21 -0000	1.3
+++ xfce4-diskperf-plugin.spec	11 Apr 2006 11:12:42 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		xfce4-diskperf-plugin
 Version:	1.5
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Disk performance plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 The DiskPerf plugin displays disk/partition performance (bytes transfered per
@@ -36,6 +37,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 1.5-6
+- Require xfce4-panel.
+
 * Wed Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 1.5-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:17:23 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:17:23 -0700
Subject: rpms/xfce4-diskperf-plugin/FC-5 xfce4-diskperf-plugin.spec,1.3,1.4
Message-ID: <200604111117.k3BBHPH3005725@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-diskperf-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5708

Modified Files:
	xfce4-diskperf-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-diskperf-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-diskperf-plugin/FC-5/xfce4-diskperf-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-diskperf-plugin.spec	16 Feb 2006 16:10:21 -0000	1.3
+++ xfce4-diskperf-plugin.spec	11 Apr 2006 11:17:23 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		xfce4-diskperf-plugin
 Version:	1.5
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Disk performance plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 The DiskPerf plugin displays disk/partition performance (bytes transfered per
@@ -36,6 +37,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 1.5-6
+- Require xfce4-panel.
+
 * Wed Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 1.5-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:18:16 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:18:16 -0700
Subject: rpms/xfce4-diskperf-plugin/FC-4 xfce4-diskperf-plugin.spec,1.1,1.2
Message-ID: <200604111118.k3BBIIjU005760@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-diskperf-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5741

Modified Files:
	xfce4-diskperf-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-diskperf-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-diskperf-plugin/FC-4/xfce4-diskperf-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-diskperf-plugin.spec	28 Jan 2006 00:21:04 -0000	1.1
+++ xfce4-diskperf-plugin.spec	11 Apr 2006 11:18:16 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-diskperf-plugin
 Version:	1.5
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Disk performance plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 The DiskPerf plugin displays disk/partition performance (bytes transfered per
@@ -36,6 +37,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 1.5-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 1.5-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 11:19:09 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:19:09 -0700
Subject: rpms/xfce4-fsguard-plugin/devel xfce4-fsguard-plugin.spec,1.2,1.3
Message-ID: <200604111119.k3BBJBGW005789@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-serv5772

Modified Files:
	xfce4-fsguard-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-fsguard-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-fsguard-plugin/devel/xfce4-fsguard-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-fsguard-plugin.spec	16 Feb 2006 16:14:40 -0000	1.2
+++ xfce4-fsguard-plugin.spec	11 Apr 2006 11:19:09 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-fsguard-plugin
 Version:	0.2.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Filesystem-Guard plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 A little Xfce plugin, which checks the free space on the chosen mountpoint 
@@ -40,6 +41,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.2.1-4
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.2.1-3
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:19:36 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:19:36 -0700
Subject: rpms/xfce4-fsguard-plugin/FC-5 xfce4-fsguard-plugin.spec,1.2,1.3
Message-ID: <200604111119.k3BBJcRK005817@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-fsguard-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5800

Modified Files:
	xfce4-fsguard-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-fsguard-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-fsguard-plugin/FC-5/xfce4-fsguard-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-fsguard-plugin.spec	16 Feb 2006 16:14:40 -0000	1.2
+++ xfce4-fsguard-plugin.spec	11 Apr 2006 11:19:36 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-fsguard-plugin
 Version:	0.2.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Filesystem-Guard plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 A little Xfce plugin, which checks the free space on the chosen mountpoint 
@@ -40,6 +41,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.2.1-4
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.2.1-3
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:20:00 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:20:00 -0700
Subject: rpms/xfce4-fsguard-plugin/FC-4 xfce4-fsguard-plugin.spec,1.1,1.2
Message-ID: <200604111120.k3BBK2fc005846@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-fsguard-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5828

Modified Files:
	xfce4-fsguard-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-fsguard-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-fsguard-plugin/FC-4/xfce4-fsguard-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-fsguard-plugin.spec	22 Jan 2006 23:36:42 -0000	1.1
+++ xfce4-fsguard-plugin.spec	11 Apr 2006 11:19:59 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-fsguard-plugin
 Version:	0.2.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Filesystem-Guard plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 A little Xfce plugin, which checks the free space on the chosen mountpoint 
@@ -40,6 +41,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.2.1-3
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.2.1-2
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 11:20:36 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:20:36 -0700
Subject: rpms/xfce4-genmon-plugin/devel xfce4-genmon-plugin.spec,1.2,1.3
Message-ID: <200604111120.k3BBKcUM005876@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-serv5859

Modified Files:
	xfce4-genmon-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-genmon-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-genmon-plugin/devel/xfce4-genmon-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-genmon-plugin.spec	16 Feb 2006 16:27:23 -0000	1.2
+++ xfce4-genmon-plugin.spec	11 Apr 2006 11:20:36 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-genmon-plugin
 Version:	1.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Generic monitor plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 The GenMon plugin cyclically spawns the indicated script/program,
@@ -36,6 +37,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 1.1-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 1.1-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:21:34 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:21:34 -0700
Subject: rpms/xfce4-genmon-plugin/FC-5 xfce4-genmon-plugin.spec,1.2,1.3
Message-ID: <200604111121.k3BBLaYG005909@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-genmon-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5892

Modified Files:
	xfce4-genmon-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-genmon-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-genmon-plugin/FC-5/xfce4-genmon-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-genmon-plugin.spec	16 Feb 2006 16:27:23 -0000	1.2
+++ xfce4-genmon-plugin.spec	11 Apr 2006 11:21:34 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-genmon-plugin
 Version:	1.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Generic monitor plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 The GenMon plugin cyclically spawns the indicated script/program,
@@ -36,6 +37,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 1.1-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 1.1-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:22:13 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:22:13 -0700
Subject: rpms/xfce4-genmon-plugin/FC-4 xfce4-genmon-plugin.spec,1.1,1.2
Message-ID: <200604111122.k3BBMF5n005937@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-genmon-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5920

Modified Files:
	xfce4-genmon-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-genmon-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-genmon-plugin/FC-4/xfce4-genmon-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-genmon-plugin.spec	9 Dec 2005 22:38:04 -0000	1.1
+++ xfce4-genmon-plugin.spec	11 Apr 2006 11:22:13 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-genmon-plugin
 Version:	1.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Generic monitor plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 The GenMon plugin cyclically spawns the indicated script/program,
@@ -36,6 +37,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 1.1-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 1.1-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 11:22:42 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:22:42 -0700
Subject: rpms/xfce4-minicmd-plugin/devel xfce4-minicmd-plugin.spec,1.2,1.3
Message-ID: <200604111122.k3BBMiIE005970@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-serv5951

Modified Files:
	xfce4-minicmd-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-minicmd-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-minicmd-plugin/devel/xfce4-minicmd-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-minicmd-plugin.spec	16 Feb 2006 16:37:53 -0000	1.2
+++ xfce4-minicmd-plugin.spec	11 Apr 2006 11:22:42 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-minicmd-plugin
 Version:	0.3.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Mini command-line plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A mini command-line plugin for the Xfce panel. You can execute programs by 
@@ -38,6 +39,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:23:10 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:23:10 -0700
Subject: rpms/xfce4-minicmd-plugin/FC-5 xfce4-minicmd-plugin.spec,1.2,1.3
Message-ID: <200604111123.k3BBNCc1006012@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-minicmd-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5993

Modified Files:
	xfce4-minicmd-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-minicmd-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-minicmd-plugin/FC-5/xfce4-minicmd-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-minicmd-plugin.spec	16 Feb 2006 16:37:53 -0000	1.2
+++ xfce4-minicmd-plugin.spec	11 Apr 2006 11:23:09 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-minicmd-plugin
 Version:	0.3.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Mini command-line plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A mini command-line plugin for the Xfce panel. You can execute programs by 
@@ -38,6 +39,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:23:50 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:23:50 -0700
Subject: rpms/xfce4-minicmd-plugin/FC-4 xfce4-minicmd-plugin.spec,1.1,1.2
Message-ID: <200604111123.k3BBNqd9006051@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-minicmd-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6032

Modified Files:
	xfce4-minicmd-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-minicmd-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-minicmd-plugin/FC-4/xfce4-minicmd-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-minicmd-plugin.spec	15 Dec 2005 03:53:18 -0000	1.1
+++ xfce4-minicmd-plugin.spec	11 Apr 2006 11:23:50 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-minicmd-plugin
 Version:	0.3.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Mini command-line plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A mini command-line plugin for the Xfce panel. You can execute programs by 
@@ -38,6 +39,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 11:24:35 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:24:35 -0700
Subject: rpms/xfce4-modemlights-plugin/devel xfce4-modemlights-plugin.spec,
	1.5, 1.6
Message-ID: <200604111124.k3BBObiS006083@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-serv6066

Modified Files:
	xfce4-modemlights-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-modemlights-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-modemlights-plugin/devel/xfce4-modemlights-plugin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xfce4-modemlights-plugin.spec	16 Feb 2006 16:42:00 -0000	1.5
+++ xfce4-modemlights-plugin.spec	11 Apr 2006 11:24:35 -0000	1.6
@@ -1,6 +1,6 @@
 Name: 		xfce4-modemlights-plugin
 Version: 	0.1.1
-Release: 	6%{?dist}
+Release: 	7%{?dist}
 Summary: 	Modemlights for the XFCE panel
 
 Group: 		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	libXt-devel
+Requires:	xfce4-panel >= 4.2
 
 %description
 A Xfce4 panel applet intended to simplify establishing a ppp connection via 
@@ -39,6 +40,9 @@
 %{_datadir}/xfce4/*
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.1.1-7
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.1.1-6
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:24:56 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:24:56 -0700
Subject: rpms/xfce4-modemlights-plugin/FC-5 xfce4-modemlights-plugin.spec,
	1.5, 1.6
Message-ID: <200604111124.k3BBOw3n006111@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-modemlights-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6094

Modified Files:
	xfce4-modemlights-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-modemlights-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-modemlights-plugin/FC-5/xfce4-modemlights-plugin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xfce4-modemlights-plugin.spec	16 Feb 2006 16:42:00 -0000	1.5
+++ xfce4-modemlights-plugin.spec	11 Apr 2006 11:24:56 -0000	1.6
@@ -1,6 +1,6 @@
 Name: 		xfce4-modemlights-plugin
 Version: 	0.1.1
-Release: 	6%{?dist}
+Release: 	7%{?dist}
 Summary: 	Modemlights for the XFCE panel
 
 Group: 		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	libXt-devel
+Requires:	xfce4-panel >= 4.2
 
 %description
 A Xfce4 panel applet intended to simplify establishing a ppp connection via 
@@ -39,6 +40,9 @@
 %{_datadir}/xfce4/*
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.1.1-7
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.1.1-6
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:25:20 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:25:20 -0700
Subject: rpms/xfce4-modemlights-plugin/FC-4 xfce4-modemlights-plugin.spec,
	1.1, 1.2
Message-ID: <200604111125.k3BBPMsm006139@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-modemlights-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6122

Modified Files:
	xfce4-modemlights-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-modemlights-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-modemlights-plugin/FC-4/xfce4-modemlights-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-modemlights-plugin.spec	15 Dec 2005 03:49:55 -0000	1.1
+++ xfce4-modemlights-plugin.spec	11 Apr 2006 11:25:20 -0000	1.2
@@ -1,6 +1,6 @@
 Name: 		xfce4-modemlights-plugin
 Version: 	0.1.1
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Summary: 	Modemlights for the XFCE panel
 
 Group: 		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A Xfce4 panel applet intended to simplify establishing a ppp connection via 
@@ -38,6 +39,9 @@
 %{_datadir}/xfce4/*
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.1.1-4
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.1.1-3
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 11:25:54 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:25:54 -0700
Subject: rpms/xfce4-mount-plugin/devel xfce4-mount-plugin.spec,1.3,1.4
Message-ID: <200604111125.k3BBPuXr006168@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-serv6150

Modified Files:
	xfce4-mount-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-mount-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mount-plugin/devel/xfce4-mount-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-mount-plugin.spec	16 Feb 2006 16:44:29 -0000	1.3
+++ xfce4-mount-plugin.spec	11 Apr 2006 11:25:54 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		xfce4-mount-plugin
 Version:	0.3.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Mount/unmount utility for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 Mount and unmount filesystems from the Xfce panel.
@@ -36,6 +37,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-3
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-2
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:26:18 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:26:18 -0700
Subject: rpms/xfce4-mount-plugin/FC-5 xfce4-mount-plugin.spec,1.3,1.4
Message-ID: <200604111126.k3BBQKqe006202@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-mount-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6185

Modified Files:
	xfce4-mount-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-mount-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mount-plugin/FC-5/xfce4-mount-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-mount-plugin.spec	16 Feb 2006 16:44:29 -0000	1.3
+++ xfce4-mount-plugin.spec	11 Apr 2006 11:26:18 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		xfce4-mount-plugin
 Version:	0.3.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Mount/unmount utility for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 Mount and unmount filesystems from the Xfce panel.
@@ -36,6 +37,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-3
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-2
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:26:41 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:26:41 -0700
Subject: rpms/xfce4-mount-plugin/FC-4 xfce4-mount-plugin.spec,1.2,1.3
Message-ID: <200604111126.k3BBQhO5006234@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-mount-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6215

Modified Files:
	xfce4-mount-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-mount-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mount-plugin/FC-4/xfce4-mount-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-mount-plugin.spec	21 Jan 2006 22:24:09 -0000	1.2
+++ xfce4-mount-plugin.spec	11 Apr 2006 11:26:41 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-mount-plugin
 Version:	0.3.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Mount/unmount utility for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 Mount and unmount filesystems from the Xfce panel.
@@ -36,6 +37,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-2
+- Require xfce4-panel.
+
 * Sat Jan 21 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-1
 - Updat to 0.3.3.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:27:11 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:27:11 -0700
Subject: rpms/xfce4-netload-plugin/devel xfce4-netload-plugin.spec,1.3,1.4
Message-ID: <200604111127.k3BBRD1X006266@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-serv6249

Modified Files:
	xfce4-netload-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-netload-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-netload-plugin/devel/xfce4-netload-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-netload-plugin.spec	18 Feb 2006 22:29:49 -0000	1.3
+++ xfce4-netload-plugin.spec	11 Apr 2006 11:27:11 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		xfce4-netload-plugin
 Version:	0.3.3
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Network-load monitor for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -12,6 +12,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 A network-load monitor plugin for the Xfce panel.
@@ -39,6 +40,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-6
+- Require xfce4-panel.
+
 * Sat Feb 18 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-5
 - Rebuild for Fedora Extras 5.
 - Modify bufsize-patch.



From fedora-extras-commits at redhat.com  Tue Apr 11 11:27:35 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:27:35 -0700
Subject: rpms/xfce4-netload-plugin/FC-5 xfce4-netload-plugin.spec,1.3,1.4
Message-ID: <200604111127.k3BBRbat006294@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-netload-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6277

Modified Files:
	xfce4-netload-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-netload-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-netload-plugin/FC-5/xfce4-netload-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-netload-plugin.spec	18 Feb 2006 22:29:49 -0000	1.3
+++ xfce4-netload-plugin.spec	11 Apr 2006 11:27:34 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		xfce4-netload-plugin
 Version:	0.3.3
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Network-load monitor for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -12,6 +12,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 A network-load monitor plugin for the Xfce panel.
@@ -39,6 +40,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-6
+- Require xfce4-panel.
+
 * Sat Feb 18 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-5
 - Rebuild for Fedora Extras 5.
 - Modify bufsize-patch.



From fedora-extras-commits at redhat.com  Tue Apr 11 11:32:18 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:32:18 -0700
Subject: rpms/xfce4-netload-plugin/FC-4 xfce4-netload-plugin-bufsize.patch,
	1.1, 1.2 xfce4-netload-plugin.spec, 1.2, 1.3
Message-ID: <200604111132.k3BBWKS6006356@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-netload-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6334

Modified Files:
	xfce4-netload-plugin-bufsize.patch xfce4-netload-plugin.spec 
Log Message:
require xfce4-panel & update bufsize-patch

xfce4-netload-plugin-bufsize.patch:

Index: xfce4-netload-plugin-bufsize.patch
===================================================================
RCS file: /cvs/extras/rpms/xfce4-netload-plugin/FC-4/xfce4-netload-plugin-bufsize.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-netload-plugin-bufsize.patch	3 Feb 2006 20:14:03 -0000	1.1
+++ xfce4-netload-plugin-bufsize.patch	11 Apr 2006 11:32:17 -0000	1.2
@@ -1,17 +1,11 @@
---- panel-plugin/wormulon/linux.c.orig	2006-02-03 20:48:17.000000000 +0100
-+++ panel-plugin/wormulon/linux.c	2005-08-01 00:56:38.000000000 +0200
-@@ -101,11 +101,11 @@
- 
-     /* do not parse the first two lines as they only contain static garbage */
-     fseek(proc_net_dev, 0, SEEK_SET);
--    fgets(buffer, BUFSIZ-1, proc_net_dev);
--    fgets(buffer, BUFSIZ-1, proc_net_dev);
-+    fgets(buffer, BUFSIZE-1, proc_net_dev);
-+    fgets(buffer, BUFSIZE-1, proc_net_dev);
- 
-     interfacefound = 0;
--    while (fgets(buffer, BUFSIZ-1, proc_net_dev) != NULL)
-+    while (fgets(buffer, BUFSIZE-1, proc_net_dev) != NULL)
-     {
-         /* find the device name and substitute ':' with '\0' */
-         ptr = buffer;
+--- panel-plugin/wormulon/linux.c.orig	2005-08-01 00:56:38.000000000 +0200
++++ panel-plugin/wormulon/linux.c	2006-02-04 13:20:14.000000000 +0100
+@@ -81,7 +81,7 @@
+      * performance difference is _very_ minimal. But I don't think that it's a good
+      * idea to keep the file open for a very long time for _each_ plugin instance.
+      */
+-    char buffer[BUFSIZE];
++    char buffer[BUFSIZ];
+     char *ptr;
+     char *devname;
+     int dump;


Index: xfce4-netload-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-netload-plugin/FC-4/xfce4-netload-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-netload-plugin.spec	3 Feb 2006 20:14:03 -0000	1.2
+++ xfce4-netload-plugin.spec	11 Apr 2006 11:32:17 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-netload-plugin
 Version:	0.3.3
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Network-load monitor for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -12,6 +12,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 A network-load monitor plugin for the Xfce panel.
@@ -39,6 +40,10 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-5
+- Require xfce4-panel.
+- Modify bufsize-patch.
+
 * Thu Feb 02 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-4
 - Add bufsize-patch (#179686)
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:32:52 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:32:52 -0700
Subject: rpms/xfce4-notes-plugin/devel xfce4-notes-plugin.spec,1.2,1.3
Message-ID: <200604111132.k3BBWsvZ006391@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-serv6371

Modified Files:
	xfce4-notes-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-notes-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-notes-plugin/devel/xfce4-notes-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-notes-plugin.spec	16 Feb 2006 17:18:21 -0000	1.2
+++ xfce4-notes-plugin.spec	11 Apr 2006 11:32:51 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-notes-plugin
 Version:	0.11.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Notes plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 This plugin provides sticky notes for your desktop. You can create a note by 
@@ -39,6 +40,9 @@
 %{_datadir}/xfce4/*
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.11.1-4
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.11.1-3
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:33:17 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:33:17 -0700
Subject: rpms/xfce4-notes-plugin/FC-5 xfce4-notes-plugin.spec,1.2,1.3
Message-ID: <200604111133.k3BBXJtm006423@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-notes-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6406

Modified Files:
	xfce4-notes-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-notes-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-notes-plugin/FC-5/xfce4-notes-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-notes-plugin.spec	16 Feb 2006 17:18:21 -0000	1.2
+++ xfce4-notes-plugin.spec	11 Apr 2006 11:33:17 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-notes-plugin
 Version:	0.11.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Notes plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 This plugin provides sticky notes for your desktop. You can create a note by 
@@ -39,6 +40,9 @@
 %{_datadir}/xfce4/*
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.11.1-4
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.11.1-3
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:33:42 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:33:42 -0700
Subject: rpms/xfce4-notes-plugin/FC-4 xfce4-notes-plugin.spec,1.1,1.2
Message-ID: <200604111133.k3BBXiAK006453@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-notes-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6436

Modified Files:
	xfce4-notes-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-notes-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-notes-plugin/FC-4/xfce4-notes-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-notes-plugin.spec	15 Dec 2005 03:46:11 -0000	1.1
+++ xfce4-notes-plugin.spec	11 Apr 2006 11:33:42 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-notes-plugin
 Version:	0.11.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Notes plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 This plugin provides sticky notes for your desktop. You can create a note by 
@@ -39,6 +40,9 @@
 %{_datadir}/xfce4/*
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.11.1-3
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.11.1-2
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 11:34:11 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:34:11 -0700
Subject: rpms/xfce4-quicklauncher-plugin/devel
	xfce4-quicklauncher-plugin.spec, 1.2, 1.3
Message-ID: <200604111134.k3BBYDe6006481@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-serv6464

Modified Files:
	xfce4-quicklauncher-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-quicklauncher-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-quicklauncher-plugin/devel/xfce4-quicklauncher-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-quicklauncher-plugin.spec	16 Feb 2006 17:38:06 -0000	1.2
+++ xfce4-quicklauncher-plugin.spec	11 Apr 2006 11:34:11 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-quicklauncher-plugin
 Version:	0.81
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Quicklauncher plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 This plugin allows you to have lots of launchers in the Xfce panel, displaying 
@@ -40,6 +41,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.81-4
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.81-3
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:34:54 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:34:54 -0700
Subject: rpms/xfce4-quicklauncher-plugin/FC-5
	xfce4-quicklauncher-plugin.spec, 1.2, 1.3
Message-ID: <200604111134.k3BBYuUD006509@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-quicklauncher-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6492

Modified Files:
	xfce4-quicklauncher-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-quicklauncher-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-quicklauncher-plugin/FC-5/xfce4-quicklauncher-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-quicklauncher-plugin.spec	16 Feb 2006 17:38:06 -0000	1.2
+++ xfce4-quicklauncher-plugin.spec	11 Apr 2006 11:34:54 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-quicklauncher-plugin
 Version:	0.81
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Quicklauncher plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 This plugin allows you to have lots of launchers in the Xfce panel, displaying 
@@ -40,6 +41,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.81-4
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.81-3
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:35:27 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:35:27 -0700
Subject: rpms/xfce4-quicklauncher-plugin/FC-4
	xfce4-quicklauncher-plugin.spec, 1.1, 1.2
Message-ID: <200604111135.k3BBZTUP006537@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-quicklauncher-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6520

Modified Files:
	xfce4-quicklauncher-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-quicklauncher-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-quicklauncher-plugin/FC-4/xfce4-quicklauncher-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-quicklauncher-plugin.spec	27 Jan 2006 17:57:59 -0000	1.1
+++ xfce4-quicklauncher-plugin.spec	11 Apr 2006 11:35:26 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-quicklauncher-plugin
 Version:	0.81
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Quicklauncher plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 This plugin allows you to have lots of launchers in the Xfce panel, displaying 
@@ -40,6 +41,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.81-3
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.81-2
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 11:36:00 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:36:00 -0700
Subject: rpms/xfce4-screenshooter-plugin/devel
	xfce4-screenshooter-plugin.spec, 1.2, 1.3
Message-ID: <200604111136.k3BBa20e006569@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-serv6552

Modified Files:
	xfce4-screenshooter-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-screenshooter-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-screenshooter-plugin/devel/xfce4-screenshooter-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-screenshooter-plugin.spec	16 Feb 2006 17:40:28 -0000	1.2
+++ xfce4-screenshooter-plugin.spec	11 Apr 2006 11:36:00 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-screenshooter-plugin
 Version:	0.0.8
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Screenshot utility for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 The Screenshooter plugin allows you to take screenshots from the Xfce panel.
@@ -35,6 +36,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.0.8-3
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.0.8-2
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:36:30 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:36:30 -0700
Subject: rpms/xfce4-screenshooter-plugin/FC-5
	xfce4-screenshooter-plugin.spec, 1.2, 1.3
Message-ID: <200604111136.k3BBaWBn006601@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-screenshooter-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6584

Modified Files:
	xfce4-screenshooter-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-screenshooter-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-screenshooter-plugin/FC-5/xfce4-screenshooter-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-screenshooter-plugin.spec	16 Feb 2006 17:40:28 -0000	1.2
+++ xfce4-screenshooter-plugin.spec	11 Apr 2006 11:36:30 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-screenshooter-plugin
 Version:	0.0.8
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Screenshot utility for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 The Screenshooter plugin allows you to take screenshots from the Xfce panel.
@@ -35,6 +36,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.0.8-3
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.0.8-2
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:36:54 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:36:54 -0700
Subject: rpms/xfce4-screenshooter-plugin/FC-4
	xfce4-screenshooter-plugin.spec, 1.1, 1.2
Message-ID: <200604111136.k3BBauW1006633@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-screenshooter-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6616

Modified Files:
	xfce4-screenshooter-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-screenshooter-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-screenshooter-plugin/FC-4/xfce4-screenshooter-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-screenshooter-plugin.spec	29 Jan 2006 23:57:30 -0000	1.1
+++ xfce4-screenshooter-plugin.spec	11 Apr 2006 11:36:53 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-screenshooter-plugin
 Version:	0.0.8
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Screenshot utility for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 The Screenshooter plugin allows you to take screenshots from the Xfce panel.
@@ -35,5 +36,8 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.0.8-2
+- Require xfce4-panel.
+
 * Sat Jan 21 2006 Christoph Wickert <fedora wickert at arcor de> - 0.0.8-1
 - Initial Fedora Extras version.



From fedora-extras-commits at redhat.com  Tue Apr 11 11:37:27 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:37:27 -0700
Subject: rpms/xfce4-sensors-plugin/devel xfce4-sensors-plugin.spec,1.3,1.4
Message-ID: <200604111137.k3BBbTNc006664@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-serv6647

Modified Files:
	xfce4-sensors-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-sensors-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-sensors-plugin/devel/xfce4-sensors-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-sensors-plugin.spec	18 Feb 2006 22:19:53 -0000	1.3
+++ xfce4-sensors-plugin.spec	11 Apr 2006 11:37:27 -0000	1.4
@@ -1,6 +1,6 @@
 Name: 		xfce4-sensors-plugin
 Version: 	0.7.0
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 Summary: 	Sensors plugin for the Xfce panel
 
 Group: 		User Interface/Desktops
@@ -11,7 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext, lm_sensors-devel >= 2.8
-Requires:	lm_sensors >= 2.8
+Requires:	xfce4-panel >= 4.2, lm_sensors >= 2.8
 ExcludeArch:	ppc
 
 %description
@@ -39,6 +39,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.7.0-5
+- Require xfce4-panel.
+
 * Sat Feb 18 2006 Christoph Wickert <fedora wickert at arcor de> - 0.7.0-4
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:37:50 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:37:50 -0700
Subject: rpms/xfce4-sensors-plugin/FC-5 xfce4-sensors-plugin.spec,1.3,1.4
Message-ID: <200604111137.k3BBbqvq006692@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-sensors-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6675

Modified Files:
	xfce4-sensors-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-sensors-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-sensors-plugin/FC-5/xfce4-sensors-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-sensors-plugin.spec	18 Feb 2006 22:19:53 -0000	1.3
+++ xfce4-sensors-plugin.spec	11 Apr 2006 11:37:50 -0000	1.4
@@ -1,6 +1,6 @@
 Name: 		xfce4-sensors-plugin
 Version: 	0.7.0
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 Summary: 	Sensors plugin for the Xfce panel
 
 Group: 		User Interface/Desktops
@@ -11,7 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext, lm_sensors-devel >= 2.8
-Requires:	lm_sensors >= 2.8
+Requires:	xfce4-panel >= 4.2, lm_sensors >= 2.8
 ExcludeArch:	ppc
 
 %description
@@ -39,6 +39,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.7.0-5
+- Require xfce4-panel.
+
 * Sat Feb 18 2006 Christoph Wickert <fedora wickert at arcor de> - 0.7.0-4
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:38:12 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:38:12 -0700
Subject: rpms/xfce4-sensors-plugin/FC-4 xfce4-sensors-plugin.spec,1.2,1.3
Message-ID: <200604111138.k3BBcEjt006728@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-sensors-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6709

Modified Files:
	xfce4-sensors-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-sensors-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-sensors-plugin/FC-4/xfce4-sensors-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-sensors-plugin.spec	22 Jan 2006 20:24:01 -0000	1.2
+++ xfce4-sensors-plugin.spec	11 Apr 2006 11:38:11 -0000	1.3
@@ -1,6 +1,6 @@
 Name: 		xfce4-sensors-plugin
 Version: 	0.7.0
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Summary: 	Sensors plugin for the Xfce panel
 
 Group: 		User Interface/Desktops
@@ -11,7 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext, lm_sensors-devel >= 2.8
-Requires:	lm_sensors >= 2.8
+Requires:	xfce4-panel >= 4.2, lm_sensors >= 2.8
 ExcludeArch:	ppc
 
 %description
@@ -39,6 +39,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.7.0-4
+- Require xfce4-panel.
+
 * Sun Jan 22 2006 Christoph Wickert <fedora wickert at arcor de> - 0.7.0-3
 - ExcludeArch ppc.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:39:04 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:39:04 -0700
Subject: rpms/xfce4-showdesktop-plugin/devel xfce4-showdesktop-plugin.spec,
	1.2, 1.3
Message-ID: <200604111139.k3BBd6J9006767@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-serv6750

Modified Files:
	xfce4-showdesktop-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-showdesktop-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-showdesktop-plugin/devel/xfce4-showdesktop-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-showdesktop-plugin.spec	16 Feb 2006 17:45:01 -0000	1.2
+++ xfce4-showdesktop-plugin.spec	11 Apr 2006 11:39:04 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-showdesktop-plugin
 Version:	0.4.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Show-Desktop plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:  gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 This is a little Xfce plugin, to minimize and unminimize all windows on the
@@ -39,6 +40,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.0-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.0-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:39:27 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:39:27 -0700
Subject: rpms/xfce4-showdesktop-plugin/FC-5 xfce4-showdesktop-plugin.spec,
	1.2, 1.3
Message-ID: <200604111139.k3BBdTdw006795@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-showdesktop-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6778

Modified Files:
	xfce4-showdesktop-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-showdesktop-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-showdesktop-plugin/FC-5/xfce4-showdesktop-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-showdesktop-plugin.spec	16 Feb 2006 17:45:01 -0000	1.2
+++ xfce4-showdesktop-plugin.spec	11 Apr 2006 11:39:27 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-showdesktop-plugin
 Version:	0.4.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Show-Desktop plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:  gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 This is a little Xfce plugin, to minimize and unminimize all windows on the
@@ -39,6 +40,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.0-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.0-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:39:53 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:39:53 -0700
Subject: rpms/xfce4-showdesktop-plugin/FC-4 xfce4-showdesktop-plugin.spec,
	1.1, 1.2
Message-ID: <200604111139.k3BBdtTo006823@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-showdesktop-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6806

Modified Files:
	xfce4-showdesktop-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-showdesktop-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-showdesktop-plugin/FC-4/xfce4-showdesktop-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-showdesktop-plugin.spec	15 Dec 2005 03:17:47 -0000	1.1
+++ xfce4-showdesktop-plugin.spec	11 Apr 2006 11:39:53 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-showdesktop-plugin
 Version:	0.4.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Show-Desktop plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:  gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 This is a little Xfce plugin, to minimize and unminimize all windows on the
@@ -39,6 +40,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.0-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.4.0-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 11:40:24 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:40:24 -0700
Subject: rpms/xfce4-systemload-plugin/devel xfce4-systemload-plugin.spec, 1.2,
	1.3
Message-ID: <200604111140.k3BBeQ29006852@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-serv6835

Modified Files:
	xfce4-systemload-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-systemload-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-systemload-plugin/devel/xfce4-systemload-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-systemload-plugin.spec	16 Feb 2006 17:47:51 -0000	1.2
+++ xfce4-systemload-plugin.spec	11 Apr 2006 11:40:24 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-systemload-plugin
 Version:	0.3.6
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Systemload monitor for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 A system-load monitor plugin for the Xfce panel. It displays the current CPU 
@@ -38,6 +39,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.6-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.6-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:40:46 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:40:46 -0700
Subject: rpms/xfce4-systemload-plugin/FC-5 xfce4-systemload-plugin.spec, 1.2,
	1.3
Message-ID: <200604111140.k3BBem1O006881@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-systemload-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6864

Modified Files:
	xfce4-systemload-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-systemload-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-systemload-plugin/FC-5/xfce4-systemload-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-systemload-plugin.spec	16 Feb 2006 17:47:51 -0000	1.2
+++ xfce4-systemload-plugin.spec	11 Apr 2006 11:40:46 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-systemload-plugin
 Version:	0.3.6
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Systemload monitor for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 A system-load monitor plugin for the Xfce panel. It displays the current CPU 
@@ -38,6 +39,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.6-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:41:24 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:41:24 -0700
Subject: rpms/xfce4-systemload-plugin/FC-4 xfce4-systemload-plugin.spec, 1.1,
	1.2
Message-ID: <200604111141.k3BBfQXa006913@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-systemload-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6896

Modified Files:
	xfce4-systemload-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-systemload-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-systemload-plugin/FC-4/xfce4-systemload-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-systemload-plugin.spec	16 Dec 2005 22:34:40 -0000	1.1
+++ xfce4-systemload-plugin.spec	11 Apr 2006 11:41:24 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-systemload-plugin
 Version:	0.3.6
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Systemload monitor for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 A system-load monitor plugin for the Xfce panel. It displays the current CPU 
@@ -38,6 +39,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.6-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.6-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 11:42:10 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:42:10 -0700
Subject: rpms/xfce4-taskbar-plugin/devel xfce4-taskbar-plugin.spec,1.2,1.3
Message-ID: <200604111142.k3BBgCiY006942@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-serv6925

Modified Files:
	xfce4-taskbar-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-taskbar-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-taskbar-plugin/devel/xfce4-taskbar-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-taskbar-plugin.spec	16 Feb 2006 17:50:12 -0000	1.2
+++ xfce4-taskbar-plugin.spec	11 Apr 2006 11:42:10 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-taskbar-plugin
 Version:	0.2.2
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Tasklist plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A tasklist plugin for the Xfce panel. The size of the taskbar can be changed 
@@ -37,6 +38,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.2.2-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.2.2-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:42:33 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:42:33 -0700
Subject: rpms/xfce4-taskbar-plugin/FC-5 xfce4-taskbar-plugin.spec,1.2,1.3
Message-ID: <200604111142.k3BBgZcO006970@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-taskbar-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6953

Modified Files:
	xfce4-taskbar-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-taskbar-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-taskbar-plugin/FC-5/xfce4-taskbar-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-taskbar-plugin.spec	16 Feb 2006 17:50:12 -0000	1.2
+++ xfce4-taskbar-plugin.spec	11 Apr 2006 11:42:32 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-taskbar-plugin
 Version:	0.2.2
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Tasklist plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A tasklist plugin for the Xfce panel. The size of the taskbar can be changed 
@@ -37,6 +38,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.2.2-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.2.2-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:42:58 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:42:58 -0700
Subject: rpms/xfce4-taskbar-plugin/FC-4 xfce4-taskbar-plugin.spec,1.1,1.2
Message-ID: <200604111143.k3BBh0LN006998@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-taskbar-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6981

Modified Files:
	xfce4-taskbar-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-taskbar-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-taskbar-plugin/FC-4/xfce4-taskbar-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-taskbar-plugin.spec	15 Dec 2005 03:21:10 -0000	1.1
+++ xfce4-taskbar-plugin.spec	11 Apr 2006 11:42:58 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-taskbar-plugin
 Version:	0.2.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Tasklist plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A tasklist plugin for the Xfce panel. The size of the taskbar can be changed 
@@ -37,6 +38,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.2.2-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.2.2-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 11:43:52 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:43:52 -0700
Subject: rpms/xfce4-wavelan-plugin/devel xfce4-wavelan-plugin.spec,1.2,1.3
Message-ID: <200604111143.k3BBhs4O007030@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-serv7013

Modified Files:
	xfce4-wavelan-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-wavelan-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-wavelan-plugin/devel/xfce4-wavelan-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-wavelan-plugin.spec	16 Feb 2006 18:05:24 -0000	1.2
+++ xfce4-wavelan-plugin.spec	11 Apr 2006 11:43:52 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-wavelan-plugin
 Version:	0.4.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	WaveLAN plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A plugin for the Xfce panel that monitors a wireless LAN interface. It 
@@ -36,6 +37,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:44:15 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:44:15 -0700
Subject: rpms/xfce4-wavelan-plugin/FC-5 xfce4-wavelan-plugin.spec,1.2,1.3
Message-ID: <200604111144.k3BBiHHn007058@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-wavelan-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7041

Modified Files:
	xfce4-wavelan-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-wavelan-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-wavelan-plugin/FC-5/xfce4-wavelan-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-wavelan-plugin.spec	16 Feb 2006 18:05:24 -0000	1.2
+++ xfce4-wavelan-plugin.spec	11 Apr 2006 11:44:15 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-wavelan-plugin
 Version:	0.4.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	WaveLAN plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A plugin for the Xfce panel that monitors a wireless LAN interface. It 
@@ -36,6 +37,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:44:39 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:44:39 -0700
Subject: rpms/xfce4-wavelan-plugin/FC-4 xfce4-wavelan-plugin.spec,1.1,1.2
Message-ID: <200604111144.k3BBifJY007086@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-wavelan-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7069

Modified Files:
	xfce4-wavelan-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-wavelan-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-wavelan-plugin/FC-4/xfce4-wavelan-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-wavelan-plugin.spec	15 Dec 2005 04:40:53 -0000	1.1
+++ xfce4-wavelan-plugin.spec	11 Apr 2006 11:44:39 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-wavelan-plugin
 Version:	0.4.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	WaveLAN plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A plugin for the Xfce panel that monitors a wireless LAN interface. It 
@@ -36,6 +37,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 11:46:40 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:46:40 -0700
Subject: rpms/xfce4-weather-plugin/devel xfce4-weather-plugin.spec,1.2,1.3
Message-ID: <200604111146.k3BBkgaB007139@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-serv7122

Modified Files:
	xfce4-weather-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-weather-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-weather-plugin/devel/xfce4-weather-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-weather-plugin.spec	16 Feb 2006 18:12:09 -0000	1.2
+++ xfce4-weather-plugin.spec	11 Apr 2006 11:46:40 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-weather-plugin
 Version:	0.4.9
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Weather plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A weather plugin for the Xfce panel. It shows the current temperature and 
@@ -38,6 +39,9 @@
 %{_datadir}/xfce4/*
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.9-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.9-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:47:11 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Tue, 11 Apr 2006 04:47:11 -0700
Subject: rpms/fedora-package-config-smart/FC-4 .cvsignore, 1.2,
	1.3 fedora-package-config-smart.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200604111147.k3BBlDth007178@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-serv7155

Modified Files:
	.cvsignore fedora-package-config-smart.spec sources 
Log Message:
Modify package for FC4.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-smart/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Apr 2006 17:45:23 -0000	1.2
+++ .cvsignore	11 Apr 2006 11:47:11 -0000	1.3
@@ -1 +1 @@
-fedora-package-config-smart-5.tar.bz2
+fedora-package-config-smart-4.tar.bz2


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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-package-config-smart.spec	10 Apr 2006 17:45:23 -0000	1.1
+++ fedora-package-config-smart.spec	11 Apr 2006 11:47:11 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Configuration files for the smart package manager
 Name: fedora-package-config-smart
-Version: 5
-Release: 4
+Version: 4
+Release: 3
 License: GPL
 Group: System Environment/Base
 URL: http://fedora.redhat.com/
@@ -35,9 +35,6 @@
 %config(noreplace) %{_sysconfdir}/smart/channels/*.channel
 
 %changelog
-* Sat Apr  1 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 5-4
-- Update to Fedora Core 5.
-
 * Tue Dec 13 2005 Axel Thimm <Axel.Thimm at ATrpms.net> - 4-3
 - changed name to fedora-package-config-smart
 - Modify to only include what fedora-release includes for yum.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-smart/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Apr 2006 17:45:23 -0000	1.2
+++ sources	11 Apr 2006 11:47:11 -0000	1.3
@@ -1 +1 @@
-5992a399b473b042ab25e2f39cbb4992  fedora-package-config-smart-5.tar.bz2
+0623cece6bf5084642c5e154c29867aa  fedora-package-config-smart-4.tar.bz2



From fedora-extras-commits at redhat.com  Tue Apr 11 11:47:15 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:47:15 -0700
Subject: rpms/xfce4-weather-plugin/FC-5 xfce4-weather-plugin.spec,1.2,1.3
Message-ID: <200604111147.k3BBlHgX007203@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-weather-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7182

Modified Files:
	xfce4-weather-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-weather-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-weather-plugin/FC-5/xfce4-weather-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-weather-plugin.spec	16 Feb 2006 18:12:09 -0000	1.2
+++ xfce4-weather-plugin.spec	11 Apr 2006 11:47:15 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-weather-plugin
 Version:	0.4.9
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Weather plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A weather plugin for the Xfce panel. It shows the current temperature and 
@@ -38,6 +39,9 @@
 %{_datadir}/xfce4/*
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.9-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.9-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:47:34 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:47:34 -0700
Subject: rpms/xfce4-weather-plugin/FC-4 xfce4-weather-plugin.spec,1.1,1.2
Message-ID: <200604111147.k3BBlaYs007271@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-weather-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7252

Modified Files:
	xfce4-weather-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-weather-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-weather-plugin/FC-4/xfce4-weather-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-weather-plugin.spec	9 Dec 2005 22:42:43 -0000	1.1
+++ xfce4-weather-plugin.spec	11 Apr 2006 11:47:34 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-weather-plugin
 Version:	0.4.9
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Weather plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A weather plugin for the Xfce panel. It shows the current temperature and 
@@ -38,6 +39,9 @@
 %{_datadir}/xfce4/*
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.9-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.4.9-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 11:48:04 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:48:04 -0700
Subject: rpms/xfce4-websearch-plugin/devel xfce4-websearch-plugin.spec, 1.2, 
	1.3
Message-ID: <200604111148.k3BBm6KD007308@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-serv7291

Modified Files:
	xfce4-websearch-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-websearch-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-websearch-plugin/devel/xfce4-websearch-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-websearch-plugin.spec	16 Feb 2006 18:16:32 -0000	1.2
+++ xfce4-websearch-plugin.spec	11 Apr 2006 11:48:04 -0000	1.3
@@ -1,6 +1,6 @@
 Name: 		xfce4-websearch-plugin
 Version: 	0.1.0
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Summary: 	Websearch plugin from the XFCE panel
 
 Group: 		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildREquires:  gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 Access searchengines from the XFCE panel.
@@ -37,6 +38,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:48:35 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:48:35 -0700
Subject: rpms/xfce4-websearch-plugin/FC-5 xfce4-websearch-plugin.spec, 1.2,
	1.3
Message-ID: <200604111148.k3BBmbZO007336@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-websearch-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7319

Modified Files:
	xfce4-websearch-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-websearch-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-websearch-plugin/FC-5/xfce4-websearch-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-websearch-plugin.spec	16 Feb 2006 18:16:32 -0000	1.2
+++ xfce4-websearch-plugin.spec	11 Apr 2006 11:48:34 -0000	1.3
@@ -1,6 +1,6 @@
 Name: 		xfce4-websearch-plugin
 Version: 	0.1.0
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Summary: 	Websearch plugin from the XFCE panel
 
 Group: 		User Interface/Desktops
@@ -10,7 +10,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-BuildREquires:  gettext
+BuildRequires:  gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 Access searchengines from the XFCE panel.
@@ -37,6 +38,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:49:25 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:49:25 -0700
Subject: rpms/xfce4-websearch-plugin/FC-4 xfce4-websearch-plugin.spec, 1.1,
	1.2
Message-ID: <200604111149.k3BBnRKH007374@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-websearch-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7357

Modified Files:
	xfce4-websearch-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-websearch-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-websearch-plugin/FC-4/xfce4-websearch-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-websearch-plugin.spec	21 Jan 2006 20:42:55 -0000	1.1
+++ xfce4-websearch-plugin.spec	11 Apr 2006 11:49:25 -0000	1.2
@@ -1,6 +1,6 @@
 Name: 		xfce4-websearch-plugin
 Version: 	0.1.0
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 Summary: 	Websearch plugin from the XFCE panel
 
 Group: 		User Interface/Desktops
@@ -10,7 +10,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-BuildREquires:  gettext
+BuildRequires:  gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 Access searchengines from the XFCE panel.
@@ -37,6 +38,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 11:50:14 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:50:14 -0700
Subject: rpms/xfce4-websearch-plugin/devel xfce4-websearch-plugin.spec, 1.3, 
	1.4
Message-ID: <200604111150.k3BBoGWS007429@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-serv7412

Modified Files:
	xfce4-websearch-plugin.spec 
Log Message:
fix typo


Index: xfce4-websearch-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-websearch-plugin/devel/xfce4-websearch-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-websearch-plugin.spec	11 Apr 2006 11:48:04 -0000	1.3
+++ xfce4-websearch-plugin.spec	11 Apr 2006 11:50:13 -0000	1.4
@@ -10,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-BuildREquires:  gettext
+BuildRequires:  gettext
 Requires:	xfce4-panel >= 4.2
 
 %description



From fedora-extras-commits at redhat.com  Tue Apr 11 11:50:49 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:50:49 -0700
Subject: rpms/xfce4-windowlist-plugin/devel xfce4-windowlist-plugin.spec, 1.2,
	1.3
Message-ID: <200604111150.k3BBoprb007468@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-serv7451

Modified Files:
	xfce4-windowlist-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-windowlist-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-windowlist-plugin/devel/xfce4-windowlist-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-windowlist-plugin.spec	16 Feb 2006 18:18:53 -0000	1.2
+++ xfce4-windowlist-plugin.spec	11 Apr 2006 11:50:48 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-windowlist-plugin
 Version:	0.1.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Windowlist plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 Windowlist plugin for the Xfce panel. The menubutton shows the icon of the 
@@ -37,6 +38,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:51:08 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:51:08 -0700
Subject: rpms/xfce4-windowlist-plugin/FC-5 xfce4-windowlist-plugin.spec, 1.2,
	1.3
Message-ID: <200604111151.k3BBpAY3007501@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-windowlist-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7484

Modified Files:
	xfce4-windowlist-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-windowlist-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-windowlist-plugin/FC-5/xfce4-windowlist-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-windowlist-plugin.spec	16 Feb 2006 18:18:53 -0000	1.2
+++ xfce4-windowlist-plugin.spec	11 Apr 2006 11:51:08 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-windowlist-plugin
 Version:	0.1.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Windowlist plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 Windowlist plugin for the Xfce panel. The menubutton shows the icon of the 
@@ -37,6 +38,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:51:18 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 11 Apr 2006 04:51:18 -0700
Subject: rpms/xdesktopwaves/FC-5 xdesktopwaves.spec,1.4,1.5
Message-ID: <200604111151.k3BBpKDr007529@cvs-int.fedora.redhat.com>

Author: adrian

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

Modified Files:
	xdesktopwaves.spec 
Log Message:
* Tue Apr 11 2006 Adrian Reber <adrian at lisas.de> - 1.3-5
- rebuilt for modular X



Index: xdesktopwaves.spec
===================================================================
RCS file: /cvs/extras/rpms/xdesktopwaves/FC-5/xdesktopwaves.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xdesktopwaves.spec	10 May 2005 06:36:00 -0000	1.4
+++ xdesktopwaves.spec	11 Apr 2006 11:51:18 -0000	1.5
@@ -1,6 +1,6 @@
 Name:          xdesktopwaves
 Version:       1.3
-Release:       4%{?dist}
+Release:       5%{?dist}
 
 Summary:       Simulation of water waves on the X Window System desktop
 License:       GPL
@@ -8,7 +8,7 @@
 URL:           http://xdesktopwaves.sf.net/
 Source:        http://dl.sf.net/xdesktopwaves/xdesktopwaves-1.3.tar.gz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: xorg-x11-devel, desktop-file-utils
+BuildRequires: libX11-devel, desktop-file-utils
 
 %description
 xdesktopwaves is a cellular automata setting the background of your X
@@ -21,8 +21,7 @@
 %{__sed} -i -e "s,-s,," Makefile
 
 %build
-%{__make} CFLAGS="$RPM_OPT_FLAGS -I/usr/X11R6/include" \
-    LFLAGS="-L/usr/X11R6/%{_lib}" %{?_smp_mflags}
+%{__make} CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -62,6 +61,9 @@
 %{_datadir}/pixmaps/%{name}.xpm
 
 %changelog
+* Tue Apr 11 2006 Adrian Reber <adrian at lisas.de> - 1.3-5
+- rebuilt for modular X
+
 * Tue May 10 2005 Adrian Reber <adrian at lisas.de> - 1.3-4
 - remove stripping from Makefile so that the
   debuginfo subpackage gets build



From fedora-extras-commits at redhat.com  Tue Apr 11 11:51:35 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:51:35 -0700
Subject: rpms/xfce4-windowlist-plugin/FC-4 xfce4-windowlist-plugin.spec, 1.1,
	1.2
Message-ID: <200604111151.k3BBpbeu007554@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-windowlist-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7537

Modified Files:
	xfce4-windowlist-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-windowlist-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-windowlist-plugin/FC-4/xfce4-windowlist-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-windowlist-plugin.spec	9 Dec 2005 22:23:35 -0000	1.1
+++ xfce4-windowlist-plugin.spec	11 Apr 2006 11:51:35 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-windowlist-plugin
 Version:	0.1.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Windowlist plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 Windowlist plugin for the Xfce panel. The menubutton shows the icon of the 
@@ -37,6 +38,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 11:52:04 2006
From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec))
Date: Tue, 11 Apr 2006 04:52:04 -0700
Subject: rpms/licq/devel licq.spec,1.6,1.7
Message-ID: <200604111152.k3BBq681007582@cvs-int.fedora.redhat.com>

Author: pvrabec

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

Modified Files:
	licq.spec 
Log Message:
fix auto away,  it requires libXScrnSaver-devel



Index: licq.spec
===================================================================
RCS file: /cvs/extras/rpms/licq/devel/licq.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- licq.spec	3 Mar 2006 14:58:20 -0000	1.6
+++ licq.spec	11 Apr 2006 11:52:04 -0000	1.7
@@ -1,6 +1,6 @@
 Name: licq
 Version: 1.3.2
-Release: 6
+Release: 7
 License: GPL
 Source: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.bz2
 URL: http://www.licq.org/
@@ -11,6 +11,7 @@
 BuildRequires: gpgme-devel libgpg-error-devel 
 BuildRequires: openssl-devel
 BuildRequires: desktop-file-utils
+BuildRequires: libXScrnSaver-devel
 Patch1: licq-1.3.2-gcc-4_1-patch
 Patch2: licq-1.3.2-libdir.patch
 
@@ -159,6 +160,9 @@
 %doc plugins/osd*/{AUTHORS,TODO,README,changelog}
 
 %changelog
+* Mon Apr 11 2006 Peter Vrabec <pvrabec at redhat.com> 1.3.2-7
+- fix auto away,  it requires libXScrnSaver-devel
+
 * Fri Mar 03 2006 Peter Vrabec <pvrabec at redhat.com> 1.3.2-6
 - use correct lib-path for plugins on x86-64 (#182733)
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:52:16 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:52:16 -0700
Subject: rpms/xfce4-xkb-plugin/devel xfce4-xkb-plugin.spec,1.6,1.7
Message-ID: <200604111152.k3BBqIrO007605@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-serv7588

Modified Files:
	xfce4-xkb-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-xkb-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/devel/xfce4-xkb-plugin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xfce4-xkb-plugin.spec	31 Mar 2006 21:57:54 -0000	1.6
+++ xfce4-xkb-plugin.spec	11 Apr 2006 11:52:15 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		xfce4-xkb-plugin
 Version:	0.3.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	XKB layout switcher for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -14,6 +14,7 @@
 %if "%{?fedora}" > "4"
 BuildRequires:  libXext-devel, libXpm-devel
 %endif
+Requires:	xfce4-panel >= 4.2
 
 %description
 Xfce XKB layout switch plugin for the Xfce panel. It displays the current 
@@ -46,6 +47,9 @@
 %{_datadir}/xfce4/xkb/flags/*.png
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.5-2
+- Require xfce4-panel.
+
 * Fri Mar 31 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.5-1
 - Update to 0.3.5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:52:36 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:52:36 -0700
Subject: rpms/xfce4-xkb-plugin/FC-5 xfce4-xkb-plugin.spec,1.6,1.7
Message-ID: <200604111152.k3BBqc8s007638@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xkb-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7621

Modified Files:
	xfce4-xkb-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-xkb-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/FC-5/xfce4-xkb-plugin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xfce4-xkb-plugin.spec	31 Mar 2006 22:01:47 -0000	1.6
+++ xfce4-xkb-plugin.spec	11 Apr 2006 11:52:36 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		xfce4-xkb-plugin
 Version:	0.3.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	XKB layout switcher for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -14,6 +14,7 @@
 %if "%{?fedora}" > "4"
 BuildRequires:  libXext-devel, libXpm-devel
 %endif
+Requires:	xfce4-panel >= 4.2
 
 %description
 Xfce XKB layout switch plugin for the Xfce panel. It displays the current 
@@ -46,6 +47,9 @@
 %{_datadir}/xfce4/xkb/flags/*.png
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.5-2
+- Require xfce4-panel.
+
 * Fri Mar 31 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.5-1
 - Update to 0.3.5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:52:56 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:52:56 -0700
Subject: rpms/xfce4-xkb-plugin/FC-4 xfce4-xkb-plugin.spec,1.4,1.5
Message-ID: <200604111152.k3BBqwCO007670@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xkb-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7653

Modified Files:
	xfce4-xkb-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-xkb-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/FC-4/xfce4-xkb-plugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfce4-xkb-plugin.spec	31 Mar 2006 22:08:27 -0000	1.4
+++ xfce4-xkb-plugin.spec	11 Apr 2006 11:52:56 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		xfce4-xkb-plugin
 Version:	0.3.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	XKB layout switcher for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -14,6 +14,7 @@
 %if "%{?fedora}" > "4"
 BuildRequires:  libXext-devel, libXpm-devel
 %endif
+Requires:	xfce4-panel >= 4.2
 
 %description
 Xfce XKB layout switch plugin for the Xfce panel. It displays the current 
@@ -46,6 +47,9 @@
 %{_datadir}/xfce4/xkb/flags/*.png
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.5-2
+- Require xfce4-panel.
+
 * Fri Mar 31 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.5-1
 - Update to 0.3.5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:54:35 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:54:35 -0700
Subject: rpms/xfce4-xmms-plugin/devel xfce4-xmms-plugin.spec,1.2,1.3
Message-ID: <200604111154.k3BBsbff007737@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-serv7720

Modified Files:
	xfce4-xmms-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-xmms-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xmms-plugin/devel/xfce4-xmms-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-xmms-plugin.spec	16 Feb 2006 18:50:10 -0000	1.2
+++ xfce4-xmms-plugin.spec	11 Apr 2006 11:54:35 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-xmms-plugin
 Version:	0.3.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	XMMS plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,8 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext, xmms-devel >= 1.2
-Requires:	xmms >= 1.2
-
+Requires:	xfce4-panel >= 4.2, xmms >= 1.2
 
 %description
 Control XMMS from the Xfce panel.
@@ -40,6 +39,9 @@
 %{_datadir}/xfce4/*
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:55:28 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:55:28 -0700
Subject: rpms/xfce4-xmms-plugin/FC-5 xfce4-xmms-plugin.spec,1.2,1.3
Message-ID: <200604111155.k3BBtU6L007775@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xmms-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7755

Modified Files:
	xfce4-xmms-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-xmms-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xmms-plugin/FC-5/xfce4-xmms-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-xmms-plugin.spec	16 Feb 2006 18:50:10 -0000	1.2
+++ xfce4-xmms-plugin.spec	11 Apr 2006 11:55:27 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-xmms-plugin
 Version:	0.3.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	XMMS plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,8 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext, xmms-devel >= 1.2
-Requires:	xmms >= 1.2
-
+Requires:	xfce4-panel >= 4.2, xmms >= 1.2
 
 %description
 Control XMMS from the Xfce panel.
@@ -40,6 +39,9 @@
 %{_datadir}/xfce4/*
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:56:30 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:56:30 -0700
Subject: rpms/xfce4-xmms-plugin/FC-4 xfce4-xmms-plugin.spec,1.1,1.2
Message-ID: <200604111156.k3BBuWeY007805@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xmms-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7788

Modified Files:
	xfce4-xmms-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-xmms-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xmms-plugin/FC-4/xfce4-xmms-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-xmms-plugin.spec	9 Dec 2005 22:48:01 -0000	1.1
+++ xfce4-xmms-plugin.spec	11 Apr 2006 11:56:30 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-xmms-plugin
 Version:	0.3.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	XMMS plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,8 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext, xmms-devel >= 1.2
-Requires:	xmms >= 1.2
-
+Requires:	xfce4-panel >= 4.2, xmms >= 1.2
 
 %description
 Control XMMS from the Xfce panel.
@@ -40,6 +39,9 @@
 %{_datadir}/xfce4/*
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 12:26:31 2006
From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec))
Date: Tue, 11 Apr 2006 05:26:31 -0700
Subject: rpms/licq/FC-5 licq.spec,1.6,1.7
Message-ID: <200604111226.k3BCQXkv010032@cvs-int.fedora.redhat.com>

Author: pvrabec

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

Modified Files:
	licq.spec 
Log Message:
fix auto away,  it requires libXScrnSaver-devel



Index: licq.spec
===================================================================
RCS file: /cvs/extras/rpms/licq/FC-5/licq.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- licq.spec	3 Mar 2006 14:58:20 -0000	1.6
+++ licq.spec	11 Apr 2006 12:26:31 -0000	1.7
@@ -1,6 +1,6 @@
 Name: licq
 Version: 1.3.2
-Release: 6
+Release: 7.FC5
 License: GPL
 Source: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.bz2
 URL: http://www.licq.org/
@@ -11,6 +11,7 @@
 BuildRequires: gpgme-devel libgpg-error-devel 
 BuildRequires: openssl-devel
 BuildRequires: desktop-file-utils
+BuildRequires: libXScrnSaver-devel
 Patch1: licq-1.3.2-gcc-4_1-patch
 Patch2: licq-1.3.2-libdir.patch
 
@@ -159,6 +160,9 @@
 %doc plugins/osd*/{AUTHORS,TODO,README,changelog}
 
 %changelog
+* Mon Apr 11 2006 Peter Vrabec <pvrabec at redhat.com> 1.3.2-7.FC5
+- fix auto away,  it requires libXScrnSaver-devel
+
 * Fri Mar 03 2006 Peter Vrabec <pvrabec at redhat.com> 1.3.2-6
 - use correct lib-path for plugins on x86-64 (#182733)
 



From fedora-extras-commits at redhat.com  Tue Apr 11 13:05:08 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 11 Apr 2006 06:05:08 -0700
Subject: owners owners.list,1.832,1.833
Message-ID: <200604111305.k3BD5Alr012230@cvs-int.fedora.redhat.com>

Author: jcollie

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

Modified Files:
	owners.list 
Log Message:
Adding JThread.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.832
retrieving revision 1.833
diff -u -r1.832 -r1.833
--- owners.list	11 Apr 2006 10:31:39 -0000	1.832
+++ owners.list	11 Apr 2006 13:05:08 -0000	1.833
@@ -504,6 +504,7 @@
 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|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|jpgraph|An OO graph drawing class library for PHP|gauret at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|jthread|JThread provides classes to make use of threads easy on different platforms|jeff at ollie.clive.ia.us|extras-qa at fedoraproject.org|
 Fedora Extras|js|JavaScript interpreter|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|juk|Jukebox and music manager for KDE|nomis80 at nomis80.org|extras-qa at fedoraproject.org|
 Fedora Extras|k3b-extras|Free codec plugins for k3b|rdieter at math.unl.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Apr 11 13:59:21 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Tue, 11 Apr 2006 06:59:21 -0700
Subject: rpms/seamonkey/devel seamonkey.spec,1.2,1.3
Message-ID: <200604111359.k3BDxNUm012413@cvs-int.fedora.redhat.com>

Author: kengert

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

Modified Files:
	seamonkey.spec 
Log Message:
* Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-11
- Fix PreReq statements



Index: seamonkey.spec
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/devel/seamonkey.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- seamonkey.spec	11 Apr 2006 00:44:24 -0000	1.2
+++ seamonkey.spec	11 Apr 2006 13:59:21 -0000	1.3
@@ -10,7 +10,7 @@
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
 Version:        1.0
-Release:        10%{?dist}
+Release:        11%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPL
 Group:          Applications/Internet
@@ -61,8 +61,8 @@
 BuildRequires:  pango-devel >= %{pango_version}
 BuildRequires:  nspr-devel >= %{nspr_version}
 BuildRequires:  nss-devel >= %{nss_version}
-Prereq:         fileutils perl
-Prereq:         /usr/bin/killall
+BuildRequires:  fileutils
+BuildRequires:  desktop-file-utils >= %{desktop_file_utils_version}
 PreReq:         desktop-file-utils >= %{desktop_file_utils_version}
 
 AutoProv: 0
@@ -408,6 +408,8 @@
 
 
 %changelog
+* Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-11
+- Fix PreReq statements
 * Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-10
 - Added libXt-devel BuildRequires
 * Mon Apr 10 2006 Kai Engert <kengert at redhat.com> 1.0-9



From fedora-extras-commits at redhat.com  Tue Apr 11 14:35:26 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 11 Apr 2006 07:35:26 -0700
Subject: rpms/lyx/devel .cvsignore, 1.10, 1.11 lyx.spec, 1.31, 1.32 sources, 
	1.11, 1.12
Message-ID: <200604111435.k3BEZSqn014703@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore lyx.spec sources 
Log Message:
* Tue Apr 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.1-1
- 1.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	8 Mar 2006 19:45:52 -0000	1.10
+++ .cvsignore	11 Apr 2006 14:35:26 -0000	1.11
@@ -1,2 +1,3 @@
 lyx-1.4.0.tar.bz2
 beamer.layout
+lyx-1.4.1.tar.bz2


Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- lyx.spec	30 Mar 2006 18:42:06 -0000	1.31
+++ lyx.spec	11 Apr 2006 14:35:26 -0000	1.32
@@ -1,8 +1,8 @@
 
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
-Version: 1.4.0
-Release: 5%{?dist}
+Version: 1.4.1
+Release: 1%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -12,6 +12,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 Patch1: lyx-1.4.0-helpers.patch
+Patch2: lyx-1.4.0-boost.patch
 
 # app-wrapper for various frontends
 Source10: lyx.sh
@@ -38,6 +39,7 @@
 BuildRequires: zlib-devel
 BuildRequires: tetex-latex
 BuildRequires: tetex-fonts
+%{?_without_included_boost:BuildRequires: boost-devel >= 1.33.0}
 
 # For texhash
 Requires(post): tetex-fonts
@@ -91,6 +93,7 @@
 %setup -q -n %{name}-%{version}%{?beta}
 
 %patch1 -p1 -b .helpers
+%{?_without_included_boost:%patch2 -p1 -b .boost}
 
 
 %build
@@ -111,6 +114,7 @@
   --enable-optimization="%{optflags}" \
   --with-aiksaurus \
   --with-aspell \
+  %{?_without_included_boost} \
   --without-warnings --disable-dependency-tracking \
   --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks 
 
@@ -195,6 +199,9 @@
 
 
 %changelog
+* Tue Apr 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.1-1
+- 1.4.1
+
 * Thu Mar 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-5
 - %%trigger ImageMagick (#186319)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	8 Mar 2006 19:45:52 -0000	1.11
+++ sources	11 Apr 2006 14:35:26 -0000	1.12
@@ -1,2 +1,2 @@
-5ab37471339ff7dbc8f0c43282746cb0  lyx-1.4.0.tar.bz2
 c906271900a0627d3df2a38ad962a285  beamer.layout
+368696695a05e428773626e3b0f8ae74  lyx-1.4.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Apr 11 14:38:05 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 11 Apr 2006 07:38:05 -0700
Subject: rpms/lyx/devel .cvsignore,1.11,1.12
Message-ID: <200604111438.k3BEc7SE014764@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore 
Log Message:
drop old bits from here too



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	11 Apr 2006 14:35:26 -0000	1.11
+++ .cvsignore	11 Apr 2006 14:38:05 -0000	1.12
@@ -1,3 +1,2 @@
-lyx-1.4.0.tar.bz2
 beamer.layout
 lyx-1.4.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Apr 11 14:39:14 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 11 Apr 2006 07:39:14 -0700
Subject: rpms/lyx/devel lyx-1.4.0-boost.patch,1.2,1.3
Message-ID: <200604111439.k3BEdHVb014800@cvs-int.fedora.redhat.com>

Author: rdieter

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

Added Files:
	lyx-1.4.0-boost.patch 
Log Message:
import


lyx-1.4.0-boost.patch:

Index: lyx-1.4.0-boost.patch
===================================================================
RCS file: lyx-1.4.0-boost.patch
diff -N lyx-1.4.0-boost.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lyx-1.4.0-boost.patch	11 Apr 2006 14:39:14 -0000	1.3
@@ -0,0 +1,65 @@
+--- lyx-1.4.0pre5/src/frontends/controllers/biblio.C.boost	2005-03-21 08:31:22.000000000 -0600
++++ lyx-1.4.0pre5/src/frontends/controllers/biblio.C	2006-02-14 08:59:29.000000000 -0600
+@@ -20,6 +20,7 @@
+ #include "support/lstrings.h"
+ 
+ #include <boost/regex.hpp>
++#include <boost/cregex.hpp>
+ 
+ #include <algorithm>
+ #include <sstream>
+--- lyx-1.4.0pre5/src/support/pch.h.boost	2005-04-26 05:30:24.000000000 -0500
++++ lyx-1.4.0pre5/src/support/pch.h	2006-02-14 08:55:14.000000000 -0600
+@@ -10,7 +10,12 @@
+ #include <boost/shared_ptr.hpp>
+ #include <boost/signal.hpp>
+ #include <boost/signals/trackable.hpp>
++#include <boost/version.hpp>
++#if (BOOST_VERSION >= 103300)
++#include <boost/test/utils/nullstream.hpp>
++#else
+ #include <boost/test/detail/nullstream.hpp>
++#endif
+ #include <boost/tokenizer.hpp>
+ #include <boost/utility.hpp>
+ 
+--- lyx-1.4.0pre5/src/support/filetools.C.boost	2005-09-07 04:44:58.000000000 -0500
++++ lyx-1.4.0pre5/src/support/filetools.C	2006-02-14 08:55:14.000000000 -0600
+@@ -39,6 +39,7 @@
+ #include <boost/assert.hpp>
+ #include <boost/filesystem/operations.hpp>
+ #include <boost/regex.hpp>
++#include <boost/cregex.hpp>
+ 
+ #include <fcntl.h>
+ 
+--- lyx-1.4.0pre5/src/support/debugstream.h.boost	2004-05-20 04:35:30.000000000 -0500
++++ lyx-1.4.0pre5/src/support/debugstream.h	2006-02-14 08:55:14.000000000 -0600
+@@ -14,7 +14,12 @@
+ 
+ #include <iostream>
+ 
++#include <boost/version.hpp>
++#if (BOOST_VERSION >= 103300)
++#include <boost/test/utils/nullstream.hpp>
++#else
+ #include <boost/test/detail/nullstream.hpp>
++#endif
+ 
+ #ifdef DEBUG
+ # define TEMPORARY_DEBUG_MACRO DEBUG
+--- lyx-1.4.0pre5/src/pch.h.boost	2005-04-26 05:30:24.000000000 -0500
++++ lyx-1.4.0pre5/src/pch.h	2006-02-14 08:55:14.000000000 -0600
+@@ -17,7 +17,12 @@
+ #include <boost/signals/connection.hpp>
+ #include <boost/signal.hpp>
+ #include <boost/signals/trackable.hpp>
++#include <boost/version.hpp>
++#if (BOOST_VERSION >= 103300)
++#include <boost/test/utils/nullstream.hpp>
++#else
+ #include <boost/test/detail/nullstream.hpp>
++#endif
+ #include <boost/tokenizer.hpp>
+ #include <boost/tuple/tuple.hpp>
+ #include <boost/utility.hpp>



From fedora-extras-commits at redhat.com  Tue Apr 11 14:40:06 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 11 Apr 2006 07:40:06 -0700
Subject: rpms/lyx/devel lyx.spec,1.32,1.33
Message-ID: <200604111440.k3BEe8OL014823@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	lyx.spec 
Log Message:
Release++, for missing bits



Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- lyx.spec	11 Apr 2006 14:35:26 -0000	1.32
+++ lyx.spec	11 Apr 2006 14:40:06 -0000	1.33
@@ -2,7 +2,7 @@
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -199,7 +199,7 @@
 
 
 %changelog
-* Tue Apr 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.1-1
+* Tue Apr 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.1-2
 - 1.4.1
 
 * Thu Mar 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-5



From fedora-extras-commits at redhat.com  Tue Apr 11 14:42:36 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 11 Apr 2006 07:42:36 -0700
Subject: rpms/lyx/FC-5 lyx-1.4.0-boost.patch, 1.2, 1.3 .cvsignore, 1.10,
	1.11 lyx.spec, 1.31, 1.32 sources, 1.11, 1.12
Message-ID: <200604111442.k3BEgcSR014900@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore lyx.spec sources 
Added Files:
	lyx-1.4.0-boost.patch 
Log Message:
* Tue Apr 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.1-2
- 1.4.1


lyx-1.4.0-boost.patch:

Index: lyx-1.4.0-boost.patch
===================================================================
RCS file: lyx-1.4.0-boost.patch
diff -N lyx-1.4.0-boost.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lyx-1.4.0-boost.patch	11 Apr 2006 14:42:36 -0000	1.3
@@ -0,0 +1,65 @@
+--- lyx-1.4.0pre5/src/frontends/controllers/biblio.C.boost	2005-03-21 08:31:22.000000000 -0600
++++ lyx-1.4.0pre5/src/frontends/controllers/biblio.C	2006-02-14 08:59:29.000000000 -0600
+@@ -20,6 +20,7 @@
+ #include "support/lstrings.h"
+ 
+ #include <boost/regex.hpp>
++#include <boost/cregex.hpp>
+ 
+ #include <algorithm>
+ #include <sstream>
+--- lyx-1.4.0pre5/src/support/pch.h.boost	2005-04-26 05:30:24.000000000 -0500
++++ lyx-1.4.0pre5/src/support/pch.h	2006-02-14 08:55:14.000000000 -0600
+@@ -10,7 +10,12 @@
+ #include <boost/shared_ptr.hpp>
+ #include <boost/signal.hpp>
+ #include <boost/signals/trackable.hpp>
++#include <boost/version.hpp>
++#if (BOOST_VERSION >= 103300)
++#include <boost/test/utils/nullstream.hpp>
++#else
+ #include <boost/test/detail/nullstream.hpp>
++#endif
+ #include <boost/tokenizer.hpp>
+ #include <boost/utility.hpp>
+ 
+--- lyx-1.4.0pre5/src/support/filetools.C.boost	2005-09-07 04:44:58.000000000 -0500
++++ lyx-1.4.0pre5/src/support/filetools.C	2006-02-14 08:55:14.000000000 -0600
+@@ -39,6 +39,7 @@
+ #include <boost/assert.hpp>
+ #include <boost/filesystem/operations.hpp>
+ #include <boost/regex.hpp>
++#include <boost/cregex.hpp>
+ 
+ #include <fcntl.h>
+ 
+--- lyx-1.4.0pre5/src/support/debugstream.h.boost	2004-05-20 04:35:30.000000000 -0500
++++ lyx-1.4.0pre5/src/support/debugstream.h	2006-02-14 08:55:14.000000000 -0600
+@@ -14,7 +14,12 @@
+ 
+ #include <iostream>
+ 
++#include <boost/version.hpp>
++#if (BOOST_VERSION >= 103300)
++#include <boost/test/utils/nullstream.hpp>
++#else
+ #include <boost/test/detail/nullstream.hpp>
++#endif
+ 
+ #ifdef DEBUG
+ # define TEMPORARY_DEBUG_MACRO DEBUG
+--- lyx-1.4.0pre5/src/pch.h.boost	2005-04-26 05:30:24.000000000 -0500
++++ lyx-1.4.0pre5/src/pch.h	2006-02-14 08:55:14.000000000 -0600
+@@ -17,7 +17,12 @@
+ #include <boost/signals/connection.hpp>
+ #include <boost/signal.hpp>
+ #include <boost/signals/trackable.hpp>
++#include <boost/version.hpp>
++#if (BOOST_VERSION >= 103300)
++#include <boost/test/utils/nullstream.hpp>
++#else
+ #include <boost/test/detail/nullstream.hpp>
++#endif
+ #include <boost/tokenizer.hpp>
+ #include <boost/tuple/tuple.hpp>
+ #include <boost/utility.hpp>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	8 Mar 2006 19:45:52 -0000	1.10
+++ .cvsignore	11 Apr 2006 14:42:36 -0000	1.11
@@ -1,2 +1,2 @@
-lyx-1.4.0.tar.bz2
 beamer.layout
+lyx-1.4.1.tar.bz2


Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-5/lyx.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- lyx.spec	30 Mar 2006 18:47:02 -0000	1.31
+++ lyx.spec	11 Apr 2006 14:42:36 -0000	1.32
@@ -1,8 +1,8 @@
 
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
-Version: 1.4.0
-Release: 5%{?dist}
+Version: 1.4.1
+Release: 2%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -12,6 +12,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 Patch1: lyx-1.4.0-helpers.patch
+Patch2: lyx-1.4.0-boost.patch
 
 # app-wrapper for various frontends
 Source10: lyx.sh
@@ -38,6 +39,7 @@
 BuildRequires: zlib-devel
 BuildRequires: tetex-latex
 BuildRequires: tetex-fonts
+%{?_without_included_boost:BuildRequires: boost-devel >= 1.33.0}
 
 # For texhash
 Requires(post): tetex-fonts
@@ -91,6 +93,7 @@
 %setup -q -n %{name}-%{version}%{?beta}
 
 %patch1 -p1 -b .helpers
+%{?_without_included_boost:%patch2 -p1 -b .boost}
 
 
 %build
@@ -111,6 +114,7 @@
   --enable-optimization="%{optflags}" \
   --with-aiksaurus \
   --with-aspell \
+  %{?_without_included_boost} \
   --without-warnings --disable-dependency-tracking \
   --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks 
 
@@ -195,6 +199,9 @@
 
 
 %changelog
+* Tue Apr 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.1-2
+- 1.4.1
+
 * Thu Mar 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-5
 - %%trigger ImageMagick (#186319)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	8 Mar 2006 19:45:52 -0000	1.11
+++ sources	11 Apr 2006 14:42:36 -0000	1.12
@@ -1,2 +1,2 @@
-5ab37471339ff7dbc8f0c43282746cb0  lyx-1.4.0.tar.bz2
 c906271900a0627d3df2a38ad962a285  beamer.layout
+368696695a05e428773626e3b0f8ae74  lyx-1.4.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Apr 11 14:57:09 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Tue, 11 Apr 2006 07:57:09 -0700
Subject: rpms/seamonkey/FC-5 seamonkey.spec,1.1,1.2
Message-ID: <200604111457.k3BEvBTx015052@cvs-int.fedora.redhat.com>

Author: kengert

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

Modified Files:
	seamonkey.spec 
Log Message:
* Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-11
- Fix PreReq statements
* Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-10
- Added libXt-devel BuildRequires



Index: seamonkey.spec
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/FC-5/seamonkey.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- seamonkey.spec	10 Apr 2006 21:58:25 -0000	1.1
+++ seamonkey.spec	11 Apr 2006 14:57:09 -0000	1.2
@@ -10,7 +10,7 @@
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
 Version:        1.0
-Release:        9%{?dist}
+Release:        11%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPL
 Group:          Applications/Internet
@@ -57,11 +57,12 @@
 BuildRequires:  libIDL-devel
 BuildRequires:  glib2-devel
 BuildRequires:  gtk2-devel
+BuildRequires:  libXt-devel
 BuildRequires:  pango-devel >= %{pango_version}
 BuildRequires:  nspr-devel >= %{nspr_version}
 BuildRequires:  nss-devel >= %{nss_version}
-Prereq:         fileutils perl
-Prereq:         /usr/bin/killall
+BuildRequires:  fileutils
+BuildRequires:  desktop-file-utils >= %{desktop_file_utils_version}
 PreReq:         desktop-file-utils >= %{desktop_file_utils_version}
 
 AutoProv: 0
@@ -407,6 +408,10 @@
 
 
 %changelog
+* Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-11
+- Fix PreReq statements
+* Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-10
+- Added libXt-devel BuildRequires
 * Mon Apr 10 2006 Kai Engert <kengert at redhat.com> 1.0-9
 - Added dist suffix to release
 * Fri Mar 17 2006 Kai Engert <kengert at redhat.com> 1.0-8



From fedora-extras-commits at redhat.com  Tue Apr 11 14:57:49 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Tue, 11 Apr 2006 07:57:49 -0700
Subject: rpms/seamonkey/FC-4 seamonkey.spec,1.1,1.2
Message-ID: <200604111457.k3BEvpKF015090@cvs-int.fedora.redhat.com>

Author: kengert

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

Modified Files:
	seamonkey.spec 
Log Message:
* Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-11
- Fix PreReq statements
* Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-10
- Added libXt-devel BuildRequires



Index: seamonkey.spec
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/FC-4/seamonkey.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- seamonkey.spec	10 Apr 2006 21:58:25 -0000	1.1
+++ seamonkey.spec	11 Apr 2006 14:57:49 -0000	1.2
@@ -10,7 +10,7 @@
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
 Version:        1.0
-Release:        9%{?dist}
+Release:        11%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPL
 Group:          Applications/Internet
@@ -57,11 +57,12 @@
 BuildRequires:  libIDL-devel
 BuildRequires:  glib2-devel
 BuildRequires:  gtk2-devel
+BuildRequires:  libXt-devel
 BuildRequires:  pango-devel >= %{pango_version}
 BuildRequires:  nspr-devel >= %{nspr_version}
 BuildRequires:  nss-devel >= %{nss_version}
-Prereq:         fileutils perl
-Prereq:         /usr/bin/killall
+BuildRequires:  fileutils
+BuildRequires:  desktop-file-utils >= %{desktop_file_utils_version}
 PreReq:         desktop-file-utils >= %{desktop_file_utils_version}
 
 AutoProv: 0
@@ -407,6 +408,10 @@
 
 
 %changelog
+* Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-11
+- Fix PreReq statements
+* Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-10
+- Added libXt-devel BuildRequires
 * Mon Apr 10 2006 Kai Engert <kengert at redhat.com> 1.0-9
 - Added dist suffix to release
 * Fri Mar 17 2006 Kai Engert <kengert at redhat.com> 1.0-8



From fedora-extras-commits at redhat.com  Tue Apr 11 15:03:39 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 11 Apr 2006 08:03:39 -0700
Subject: rpms/gnome-translate/devel gnome-translate.spec,1.6,1.7
Message-ID: <200604111503.k3BF3fLK017200@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gnome-translate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17183

Modified Files:
	gnome-translate.spec 
Log Message:



Index: gnome-translate.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-translate/devel/gnome-translate.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnome-translate.spec	15 Feb 2006 12:19:02 -0000	1.6
+++ gnome-translate.spec	11 Apr 2006 15:03:39 -0000	1.7
@@ -1,7 +1,7 @@
 Name: gnome-translate
 Summary: GNOME interface to libtranslate -- Natural language translator
 Version: 0.99
-Release: 6%{?dist}
+Release: 7%{?dist}
 Group: User Interface/Desktops
 License: GPL 
 URL: http://www.nongnu.org/libtranslate/gnome-translate
@@ -43,6 +43,8 @@
 
 %build
 
+export LDFLAGS="-Wl,--export-dynamic"
+
 %configure
 make %{?_smp_mflags}
 
@@ -122,6 +124,10 @@
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
+* Tue Apr 11 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.99-7
+- use "export-dynamic" for the linker, as it is recommended
+  by upstream (Solves #188491)
+
 * Wed Feb 15 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.99-6
 - rebuild for FC5
 



From fedora-extras-commits at redhat.com  Tue Apr 11 15:05:30 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 11 Apr 2006 08:05:30 -0700
Subject: rpms/gnome-translate/FC-5 gnome-translate.spec,1.6,1.7
Message-ID: <200604111505.k3BF5WSt017263@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gnome-translate/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17246

Modified Files:
	gnome-translate.spec 
Log Message:



Index: gnome-translate.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-translate/FC-5/gnome-translate.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnome-translate.spec	15 Feb 2006 12:19:02 -0000	1.6
+++ gnome-translate.spec	11 Apr 2006 15:05:30 -0000	1.7
@@ -1,7 +1,7 @@
 Name: gnome-translate
 Summary: GNOME interface to libtranslate -- Natural language translator
 Version: 0.99
-Release: 6%{?dist}
+Release: 7%{?dist}
 Group: User Interface/Desktops
 License: GPL 
 URL: http://www.nongnu.org/libtranslate/gnome-translate
@@ -43,6 +43,8 @@
 
 %build
 
+export LDFLAGS="-Wl,--export-dynamic"
+
 %configure
 make %{?_smp_mflags}
 
@@ -122,6 +124,10 @@
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
+* Tue Apr 11 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.99-7
+- use "export-dynamic" for the linker, as it is recommended
+  by upstream (Solves #188491)
+
 * Wed Feb 15 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.99-6
 - rebuild for FC5
 



From fedora-extras-commits at redhat.com  Tue Apr 11 15:38:49 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 11 Apr 2006 08:38:49 -0700
Subject: rpms/powermanga/devel .cvsignore, 1.2, 1.3 powermanga.spec, 1.11,
	1.12 sources, 1.2, 1.3 powermanga-64bit.patch, 1.1, NONE
Message-ID: <200604111538.k3BFcpPZ017534@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	.cvsignore powermanga.spec sources 
Removed Files:
	powermanga-64bit.patch 
Log Message:
Update to 0.80.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/powermanga/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Nov 2004 02:49:43 -0000	1.2
+++ .cvsignore	11 Apr 2006 15:38:49 -0000	1.3
@@ -1 +1 @@
-powermanga-0.79.tgz
+powermanga-0.80.tgz


Index: powermanga.spec
===================================================================
RCS file: /cvs/extras/rpms/powermanga/devel/powermanga.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- powermanga.spec	6 Mar 2006 16:23:01 -0000	1.11
+++ powermanga.spec	11 Apr 2006 15:38:49 -0000	1.12
@@ -1,18 +1,17 @@
 Summary: Arcade 2D shoot-them-up game
 Name: powermanga
-Version: 0.79
-Release: 8%{?dist}
+Version: 0.80
+Release: 1%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://linux.tlk.fr/games/Powermanga/
 Source0: http://linux.tlk.fr/games/Powermanga/download/powermanga-%{version}.tgz
 Source1: powermanga.png
-Patch0: powermanga-64bit.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: SDL-devel, SDL_mixer-devel, desktop-file-utils
+BuildRequires: SDL-devel, SDL_mixer-devel, zlib-devel, desktop-file-utils
 # Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora
 %if %{!?fedora:5}%{?fedora} >= 5
-BuildRequires: libXxf86dga-devel, libXxf86vm-devel
+BuildRequires: libXt-devel, libXxf86dga-devel, libXxf86vm-devel
 %endif
 
 %description
@@ -22,7 +21,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .64bit
 
 %{__cat} > %{name}.desktop << EOF
 [Desktop Entry]
@@ -44,7 +42,7 @@
 
 %build
 %configure
-%{__make} %{?_smp_mflags} CXXFLAGS="%{optflags}"
+%{__make} %{?_smp_mflags} CXXFLAGS="%{optflags} `sdl-config --cflags`"
 
 
 %install
@@ -54,7 +52,7 @@
 # Install wrapper script
 %{__install} -D -m 0755 %{name}.sh %{buildroot}%{_bindir}/powermanga
 
-# Allow stripping, g+s will be set in %%files
+# Allow stripping, g+s will be set back in %%files
 %{__chmod} g-s %{buildroot}%{_prefix}/games/powermanga
 
 # Fix location of the man page
@@ -63,13 +61,14 @@
         %{buildroot}%{_mandir}/man6/
 
 # Install pixmap for the menu entry
-%{__install} -D -m 0644 %{SOURCE1} \
+%{__install} -D -p -m 0644 %{SOURCE1} \
     %{buildroot}%{_datadir}/pixmaps/powermanga.png
 
 # Install menu entry
 %{__mkdir_p} %{buildroot}%{_datadir}/applications
 desktop-file-install \
     --vendor fedora \
+    --add-category X-Fedora \
     --dir %{buildroot}%{_datadir}/applications \
     %{name}.desktop
 
@@ -93,6 +92,12 @@
 
 
 %changelog
+* Tue Apr 11 2006 Matthias Saou <http://freshrpms.net/> 0.80-1
+- Update to 0.80, fixes crash at level 35 boss (#184076, Hugo Cisneiros).
+- Add new zlib-devel build requirement.
+- Add `sdl-config --cflags` to CXXFLAGS, otherwise SDL_mixer.h isn't found.
+- Add missing libXt-devel build requirement to get modular X detected.
+
 * Mon Mar  6 2006 Matthias Saou <http://freshrpms.net/> 0.79-8
 - FC5 rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/powermanga/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Nov 2004 02:49:43 -0000	1.2
+++ sources	11 Apr 2006 15:38:49 -0000	1.3
@@ -1 +1 @@
-3a4f00658496921b7327413ac476c1b7  powermanga-0.79.tgz
+8f6e8755ac88108f2f9bb4cd6feae489  powermanga-0.80.tgz


--- powermanga-64bit.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 11 15:40:11 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 11 Apr 2006 08:40:11 -0700
Subject: rpms/ntl - New directory
Message-ID: <200604111540.k3BFeDPV017657@cvs-int.fedora.redhat.com>

Author: rdieter

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

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




From fedora-extras-commits at redhat.com  Tue Apr 11 15:40:12 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 11 Apr 2006 08:40:12 -0700
Subject: rpms/ntl/devel - New directory
Message-ID: <200604111540.k3BFeE4l017660@cvs-int.fedora.redhat.com>

Author: rdieter

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

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




From fedora-extras-commits at redhat.com  Tue Apr 11 15:40:20 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 11 Apr 2006 08:40:20 -0700
Subject: rpms/ntl Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604111540.k3BFeMIN017704@cvs-int.fedora.redhat.com>

Author: rdieter

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

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


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

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

common : CVS/Root
	@cvs 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 Apr 11 15:40:21 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 11 Apr 2006 08:40:21 -0700
Subject: rpms/ntl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604111540.k3BFeNa9017707@cvs-int.fedora.redhat.com>

Author: rdieter

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

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


--- 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 Apr 11 15:40:40 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 11 Apr 2006 08:40:40 -0700
Subject: rpms/ntl import.log,1.1,1.2
Message-ID: <200604111540.k3BFeghH017773@cvs-int.fedora.redhat.com>

Author: rdieter

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ntl/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Apr 2006 15:40:20 -0000	1.1
+++ import.log	11 Apr 2006 15:40:40 -0000	1.2
@@ -0,0 +1 @@
+ntl-5_4-2:HEAD:ntl-5.4-2.src.rpm:1144770037



From fedora-extras-commits at redhat.com  Tue Apr 11 15:40:41 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 11 Apr 2006 08:40:41 -0700
Subject: rpms/ntl/devel ntl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2
Message-ID: <200604111540.k3BFehoU017778@cvs-int.fedora.redhat.com>

Author: rdieter

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

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


--- NEW FILE ntl.spec ---

Summary: High-performance algorithms for vectors, matrices, and polynomials 
Name:    ntl 
Version: 5.4 
Release: 2%{?dist}

# See doc/copying.txt
License: GPL
URL:     http://shoup.net/ntl/ 
Source:	 http://shoup.net/ntl/ntl-%{version}.tar.gz
Group:   System Environment/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: gmp-devel

# includes no debuginfo'able bits, disable
%define debug_package %{nil}

%description
NTL is a high-performance, portable C++ library providing data structures
and algorithms for arbitrary length integers; for vectors, matrices, and
polynomials over the integers and over finite fields; and for arbitrary
precision floating point arithmetic.

NTL provides high quality implementations of state-of-the-art algorithms for:
* arbitrary length integer arithmetic and arbitrary precision floating point
  arithmetic;
* polynomial arithmetic over the integers and finite fields including basic
  arithmetic, polynomial factorization, irreducibility testing, computation
  of minimal polynomials, traces, norms, and more;
* lattice basis reduction, including very robust and fast implementations of
  Schnorr-Euchner, block Korkin-Zolotarev reduction, and the new 
  Schnorr-Horner pruning heuristic for block Korkin-Zolotarev;
* basic linear algebra over the integers, finite fields, and arbitrary
  precision floating point numbers. 

%package devel
Summary: High-performance algorithms for vectors, matrices, and polynomials 
Group:   Development/Libraries
%description devel
NTL is a high-performance, portable C++ library providing data structures
and algorithms for arbitrary length integers; for vectors, matrices, and
polynomials over the integers and over finite fields; and for arbitrary
precision floating point arithmetic.

NTL provides high quality implementations of state-of-the-art algorithms for:
* arbitrary length integer arithmetic and arbitrary precision floating point
  arithmetic;
* polynomial arithmetic over the integers and finite fields including basic
  arithmetic, polynomial factorization, irreducibility testing, computation
  of minimal polynomials, traces, norms, and more;
* lattice basis reduction, including very robust and fast implementations of
  Schnorr-Euchner, block Korkin-Zolotarev reduction, and the new
  Schnorr-Horner pruning heuristic for block Korkin-Zolotarev;
* basic linear algebra over the integers, finite fields, and arbitrary
  precision floating point numbers.


%prep
%setup -q 


%build
cd src
./configure \
  CC="%{__cc}" \
  CXX="%{__cxx}" \
  CFLAGS="%{optflags}" \
  CXXFLAGS="%{optflags}" \
  PREFIX=%{_prefix} \
  DOCDIR=%{_docdir} \
  INCLUDEDIR=%{_includedir} \
  LIBDIR=%{_libdir} \
  NTL_GMP_LIP=on
cd -

# not smp-safe
make -C src 


%check ||:
# skip by default, takes a *long, long, long* (days?) time -- Rex
%{?_with_check:make -C src check}


%install
rm -rf $RPM_BUILD_ROOT

make -C src install \
  PREFIX=$RPM_BUILD_ROOT%{_prefix} \
  DOCDIR=$RPM_BUILD_ROOT%{_docdir} \
  INCLUDEDIR=$RPM_BUILD_ROOT%{_includedir} \
  LIBDIR=$RPM_BUILD_ROOT%{_libdir} 

# Unpackaged files
rm -rf $RPM_BUILD_ROOT%{_docdir}/NTL


%clean
rm -rf $RPM_BUILD_ROOT


%files devel
%defattr(-,root,root,-)
%doc README 
%doc doc/*
%{_includedir}/*
%{_libdir}/lib*.a


%changelog
* Tue Apr 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.4-2
- Capitalize %%summary
- disable -debuginfo, includes no debuginfo'able bits 

* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.4-1
- 5.4 (first try)




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ntl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Apr 2006 15:40:21 -0000	1.1
+++ .cvsignore	11 Apr 2006 15:40:41 -0000	1.2
@@ -0,0 +1 @@
+ntl-5.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ntl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Apr 2006 15:40:21 -0000	1.1
+++ sources	11 Apr 2006 15:40:41 -0000	1.2
@@ -0,0 +1 @@
+1d2a683ecbc12cdf03bf92dbc97c0dd4  ntl-5.4.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 15:42:41 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 11 Apr 2006 08:42:41 -0700
Subject: owners owners.list,1.833,1.834
Message-ID: <200604111542.k3BFgh0u017837@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.833
retrieving revision 1.834
diff -u -r1.833 -r1.834
--- owners.list	11 Apr 2006 13:05:08 -0000	1.833
+++ owners.list	11 Apr 2006 15:42:41 -0000	1.834
@@ -786,6 +786,7 @@
 Fedora Extras|notecase|A hierarchical note manager|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|notemeister|Notemeister is a small, simple note organizer made for the GNOME2 desktop|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|nsd|NSD is a complete implementation of an authoritative DNS name server|paul at xtdnet.nl|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|numlockx|NumLockX turns on NumLock after starting X|jpmahowald at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|numpy|A fast multidimensional array facility for Python|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|nuttcp|A network performance measurement tool intended for use by network and system managers|rvokal at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Apr 11 15:46:42 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Tue, 11 Apr 2006 08:46:42 -0700
Subject: rpms/gmpc/devel gmpc.spec,1.5,1.6
Message-ID: <200604111546.k3BFkiAb017957@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	gmpc.spec 
Log Message:
fix bug 186450


Index: gmpc.spec
===================================================================
RCS file: /cvs/extras/rpms/gmpc/devel/gmpc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gmpc.spec	22 Feb 2006 16:33:07 -0000	1.5
+++ gmpc.spec	11 Apr 2006 15:46:42 -0000	1.6
@@ -1,7 +1,7 @@
 Name:           gmpc
 Summary:        GNOME frontend for the MPD
 Version:        0.11.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 License:        GPL
 Group:          Applications/Multimedia
@@ -29,7 +29,7 @@
 
 %build
 %configure
-make %{?_smp_mflags}
+make %{?_smp_mflags} LDFLAGS=-Wl,--export-dynamic
 
 
 %install
@@ -71,6 +71,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Thu Mar 23 2006 Jonathan Dieter <jdieter99[AT]gmx.net> 0.11.2-4
+- fix dynamic linking bug
+
 * Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 0.11.2-3
 - rebuild for FC5
 



From fedora-extras-commits at redhat.com  Tue Apr 11 15:46:41 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Tue, 11 Apr 2006 08:46:41 -0700
Subject: rpms/gmpc/FC-5 gmpc.spec,1.5,1.6
Message-ID: <200604111546.k3BFkhOE017953@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	gmpc.spec 
Log Message:
fix bug 186450


Index: gmpc.spec
===================================================================
RCS file: /cvs/extras/rpms/gmpc/FC-5/gmpc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gmpc.spec	22 Feb 2006 16:33:07 -0000	1.5
+++ gmpc.spec	11 Apr 2006 15:46:41 -0000	1.6
@@ -1,7 +1,7 @@
 Name:           gmpc
 Summary:        GNOME frontend for the MPD
 Version:        0.11.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 License:        GPL
 Group:          Applications/Multimedia
@@ -29,7 +29,7 @@
 
 %build
 %configure
-make %{?_smp_mflags}
+make %{?_smp_mflags} LDFLAGS=-Wl,--export-dynamic
 
 
 %install
@@ -71,6 +71,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Thu Mar 23 2006 Jonathan Dieter <jdieter99[AT]gmx.net> 0.11.2-4
+- fix dynamic linking bug
+
 * Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 0.11.2-3
 - rebuild for FC5
 



From fedora-extras-commits at redhat.com  Tue Apr 11 15:53:34 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 11 Apr 2006 08:53:34 -0700
Subject: rpms/lyx/FC-4 lyx-1.4.0-boost.patch, NONE, 1.1 .cvsignore, 1.4,
	1.5 lyx.spec, 1.18, 1.19 sources, 1.6, 1.7
Message-ID: <200604111553.k3BFrav8018190@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore lyx.spec sources 
Added Files:
	lyx-1.4.0-boost.patch 
Log Message:
* Tue Apr 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.1-2
- 1.4.1


lyx-1.4.0-boost.patch:

--- NEW FILE lyx-1.4.0-boost.patch ---
--- lyx-1.4.0pre5/src/frontends/controllers/biblio.C.boost	2005-03-21 08:31:22.000000000 -0600
+++ lyx-1.4.0pre5/src/frontends/controllers/biblio.C	2006-02-14 08:59:29.000000000 -0600
@@ -20,6 +20,7 @@
 #include "support/lstrings.h"
 
 #include <boost/regex.hpp>
+#include <boost/cregex.hpp>
 
 #include <algorithm>
 #include <sstream>
--- lyx-1.4.0pre5/src/support/pch.h.boost	2005-04-26 05:30:24.000000000 -0500
+++ lyx-1.4.0pre5/src/support/pch.h	2006-02-14 08:55:14.000000000 -0600
@@ -10,7 +10,12 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/signal.hpp>
 #include <boost/signals/trackable.hpp>
+#include <boost/version.hpp>
+#if (BOOST_VERSION >= 103300)
+#include <boost/test/utils/nullstream.hpp>
+#else
 #include <boost/test/detail/nullstream.hpp>
+#endif
 #include <boost/tokenizer.hpp>
 #include <boost/utility.hpp>
 
--- lyx-1.4.0pre5/src/support/filetools.C.boost	2005-09-07 04:44:58.000000000 -0500
+++ lyx-1.4.0pre5/src/support/filetools.C	2006-02-14 08:55:14.000000000 -0600
@@ -39,6 +39,7 @@
 #include <boost/assert.hpp>
 #include <boost/filesystem/operations.hpp>
 #include <boost/regex.hpp>
+#include <boost/cregex.hpp>
 
 #include <fcntl.h>
 
--- lyx-1.4.0pre5/src/support/debugstream.h.boost	2004-05-20 04:35:30.000000000 -0500
+++ lyx-1.4.0pre5/src/support/debugstream.h	2006-02-14 08:55:14.000000000 -0600
@@ -14,7 +14,12 @@
 
 #include <iostream>
 
+#include <boost/version.hpp>
+#if (BOOST_VERSION >= 103300)
+#include <boost/test/utils/nullstream.hpp>
+#else
 #include <boost/test/detail/nullstream.hpp>
+#endif
 
 #ifdef DEBUG
 # define TEMPORARY_DEBUG_MACRO DEBUG
--- lyx-1.4.0pre5/src/pch.h.boost	2005-04-26 05:30:24.000000000 -0500
+++ lyx-1.4.0pre5/src/pch.h	2006-02-14 08:55:14.000000000 -0600
@@ -17,7 +17,12 @@
 #include <boost/signals/connection.hpp>
 #include <boost/signal.hpp>
 #include <boost/signals/trackable.hpp>
+#include <boost/version.hpp>
+#if (BOOST_VERSION >= 103300)
+#include <boost/test/utils/nullstream.hpp>
+#else
 #include <boost/test/detail/nullstream.hpp>
+#endif
 #include <boost/tokenizer.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <boost/utility.hpp>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Mar 2006 18:51:26 -0000	1.4
+++ .cvsignore	11 Apr 2006 15:53:34 -0000	1.5
@@ -1,2 +1,2 @@
-lyx-1.4.0.tar.bz2
 beamer.layout
+lyx-1.4.1.tar.bz2


Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-4/lyx.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- lyx.spec	30 Mar 2006 19:17:52 -0000	1.18
+++ lyx.spec	11 Apr 2006 15:53:34 -0000	1.19
@@ -1,8 +1,8 @@
 
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
-Version: 1.4.0
-Release: 5%{?dist}
+Version: 1.4.1
+Release: 2%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -12,6 +12,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 Patch1: lyx-1.4.0-helpers.patch
+Patch2: lyx-1.4.0-boost.patch
 
 # app-wrapper for various frontends
 Source10: lyx.sh
@@ -38,6 +39,7 @@
 BuildRequires: zlib-devel
 BuildRequires: tetex-latex
 BuildRequires: tetex-fonts
+%{?_without_included_boost:BuildRequires: boost-devel >= 1.33.0}
 
 # For texhash
 Requires(post): tetex-fonts
@@ -91,6 +93,7 @@
 %setup -q -n %{name}-%{version}%{?beta}
 
 %patch1 -p1 -b .helpers
+%{?_without_included_boost:%patch2 -p1 -b .boost}
 
 
 %build
@@ -111,6 +114,7 @@
   --enable-optimization="%{optflags}" \
   --with-aiksaurus \
   --with-aspell \
+  %{?_without_included_boost} \
   --without-warnings --disable-dependency-tracking \
   --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks 
 
@@ -195,6 +199,9 @@
 
 
 %changelog
+* Tue Apr 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.1-2
+- 1.4.1
+
 * Thu Mar 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-5
 - %%trigger ImageMagick (#186319)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	10 Mar 2006 18:51:26 -0000	1.6
+++ sources	11 Apr 2006 15:53:34 -0000	1.7
@@ -1,2 +1,2 @@
-5ab37471339ff7dbc8f0c43282746cb0  lyx-1.4.0.tar.bz2
 c906271900a0627d3df2a38ad962a285  beamer.layout
+368696695a05e428773626e3b0f8ae74  lyx-1.4.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Apr 11 15:54:10 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 11 Apr 2006 08:54:10 -0700
Subject: rpms/perl-Apache-Session/devel .cvsignore, 1.2,
	1.3 perl-Apache-Session.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200604111554.k3BFsC41018257@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Apache-Session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18234

Modified Files:
	.cvsignore perl-Apache-Session.spec sources 
Log Message:
Update to 1.80.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-Session/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Sep 2005 16:18:43 -0000	1.2
+++ .cvsignore	11 Apr 2006 15:54:10 -0000	1.3
@@ -1 +1 @@
-Apache-Session-1.6.tar.gz
+Apache-Session-1.80.tar.gz


Index: perl-Apache-Session.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-Session/devel/perl-Apache-Session.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Apache-Session.spec	13 Sep 2005 16:18:43 -0000	1.1
+++ perl-Apache-Session.spec	11 Apr 2006 15:54:10 -0000	1.2
@@ -1,23 +1,25 @@
 Name:           perl-Apache-Session
-Version:        1.6
-Release:        2%{?dist}
-Summary:        Apache::Session Perl module
+Version:        1.80
+Release:        1%{?dist}
+Summary:        Persistence framework for session data
 License:        Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Apache-Session/
-Source0:        http://www.cpan.org/modules/by-module/Apache/Apache-Session-1.6.tar.gz
+Source0:        http://www.cpan.org/authors/id/C/CW/CWEST/Apache-Session-%{version}.tar.gz
 # https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=118577, from Chris Grau
 Patch0:         Apache-Session-mp2.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(DBI)
+BuildRequires:  perl(Test::Deep) >= 0.082
+BuildRequires:  perl(Test::Exception) >= 0.15
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
-These modules provide persistent storage for arbitrary data, in arbitrary
-backing stores.  The details of interacting with the backing store are
-abstracted to make all backing stores behave alike.  The programmer simply
-interacts with a tied hash.
+Apache::Session is a persistence framework which is particularly useful for
+tracking session data between httpd requests. Apache::Session is designed
+to work with Apache and mod_perl, but it should work under CGI and other
+web servers, and it also works outside of a web server altogether.
 
 %prep
 %setup -q -n Apache-Session-%{version}
@@ -37,8 +39,6 @@
 
 chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*
 
-perldoc -t perlartistic > Artistic
-
 %check
 make test
 
@@ -47,11 +47,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES README TODO Artistic
+%doc CHANGES README TODO
 %{perl_vendorlib}/Apache
 %{_mandir}/man3/Apache*
 
 %changelog
+* Tue Apr 11 2006 Steven Pritchard <steve at kspei.com> 1.80-1
+- Update to 1.80.
+- Spec cleanup.
+
 * Thu Sep 08 2005 Steven Pritchard <steve at kspei.com> 1.6-2
 - Add patch for mod_perl2 compatibility from Chris Grau (#167753, comment #3).
 - Re-enable "make test".


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-Session/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Sep 2005 16:18:43 -0000	1.2
+++ sources	11 Apr 2006 15:54:10 -0000	1.3
@@ -1 +1 @@
-3a373102e3ba49f93a76994c6599e1ff  Apache-Session-1.6.tar.gz
+fbb26cc28250127efc24b9e745b934f3  Apache-Session-1.80.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 15:58:42 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 11 Apr 2006 08:58:42 -0700
Subject: rpms/powermanga/FC-5 .cvsignore, 1.2, 1.3 powermanga.spec, 1.11,
	1.12 sources, 1.2, 1.3 powermanga-64bit.patch, 1.1, NONE
Message-ID: <200604111558.k3BFwiFO018340@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	.cvsignore powermanga.spec sources 
Removed Files:
	powermanga-64bit.patch 
Log Message:
Update to 0.80.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/powermanga/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Nov 2004 02:49:43 -0000	1.2
+++ .cvsignore	11 Apr 2006 15:58:42 -0000	1.3
@@ -1 +1 @@
-powermanga-0.79.tgz
+powermanga-0.80.tgz


Index: powermanga.spec
===================================================================
RCS file: /cvs/extras/rpms/powermanga/FC-5/powermanga.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- powermanga.spec	6 Mar 2006 16:23:01 -0000	1.11
+++ powermanga.spec	11 Apr 2006 15:58:42 -0000	1.12
@@ -1,18 +1,17 @@
 Summary: Arcade 2D shoot-them-up game
 Name: powermanga
-Version: 0.79
-Release: 8%{?dist}
+Version: 0.80
+Release: 1%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://linux.tlk.fr/games/Powermanga/
 Source0: http://linux.tlk.fr/games/Powermanga/download/powermanga-%{version}.tgz
 Source1: powermanga.png
-Patch0: powermanga-64bit.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: SDL-devel, SDL_mixer-devel, desktop-file-utils
+BuildRequires: SDL-devel, SDL_mixer-devel, zlib-devel, desktop-file-utils
 # Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora
 %if %{!?fedora:5}%{?fedora} >= 5
-BuildRequires: libXxf86dga-devel, libXxf86vm-devel
+BuildRequires: libXt-devel, libXxf86dga-devel, libXxf86vm-devel
 %endif
 
 %description
@@ -22,7 +21,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .64bit
 
 %{__cat} > %{name}.desktop << EOF
 [Desktop Entry]
@@ -44,7 +42,7 @@
 
 %build
 %configure
-%{__make} %{?_smp_mflags} CXXFLAGS="%{optflags}"
+%{__make} %{?_smp_mflags} CXXFLAGS="%{optflags} `sdl-config --cflags`"
 
 
 %install
@@ -54,7 +52,7 @@
 # Install wrapper script
 %{__install} -D -m 0755 %{name}.sh %{buildroot}%{_bindir}/powermanga
 
-# Allow stripping, g+s will be set in %%files
+# Allow stripping, g+s will be set back in %%files
 %{__chmod} g-s %{buildroot}%{_prefix}/games/powermanga
 
 # Fix location of the man page
@@ -63,13 +61,14 @@
         %{buildroot}%{_mandir}/man6/
 
 # Install pixmap for the menu entry
-%{__install} -D -m 0644 %{SOURCE1} \
+%{__install} -D -p -m 0644 %{SOURCE1} \
     %{buildroot}%{_datadir}/pixmaps/powermanga.png
 
 # Install menu entry
 %{__mkdir_p} %{buildroot}%{_datadir}/applications
 desktop-file-install \
     --vendor fedora \
+    --add-category X-Fedora \
     --dir %{buildroot}%{_datadir}/applications \
     %{name}.desktop
 
@@ -93,6 +92,12 @@
 
 
 %changelog
+* Tue Apr 11 2006 Matthias Saou <http://freshrpms.net/> 0.80-1
+- Update to 0.80, fixes crash at level 35 boss (#184076, Hugo Cisneiros).
+- Add new zlib-devel build requirement.
+- Add `sdl-config --cflags` to CXXFLAGS, otherwise SDL_mixer.h isn't found.
+- Add missing libXt-devel build requirement to get modular X detected.
+
 * Mon Mar  6 2006 Matthias Saou <http://freshrpms.net/> 0.79-8
 - FC5 rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/powermanga/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Nov 2004 02:49:43 -0000	1.2
+++ sources	11 Apr 2006 15:58:42 -0000	1.3
@@ -1 +1 @@
-3a4f00658496921b7327413ac476c1b7  powermanga-0.79.tgz
+8f6e8755ac88108f2f9bb4cd6feae489  powermanga-0.80.tgz


--- powermanga-64bit.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 11 16:14:24 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 11 Apr 2006 09:14:24 -0700
Subject: rpms/powermanga/FC-4 .cvsignore, 1.2, 1.3 powermanga.spec, 1.8,
	1.9 sources, 1.2, 1.3 powermanga-64bit.patch, 1.1, NONE
Message-ID: <200604111614.k3BGEQR7020484@cvs-int.fedora.redhat.com>

Author: thias

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

Modified Files:
	.cvsignore powermanga.spec sources 
Removed Files:
	powermanga-64bit.patch 
Log Message:
Update to 0.80.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/powermanga/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Nov 2004 02:49:43 -0000	1.2
+++ .cvsignore	11 Apr 2006 16:14:24 -0000	1.3
@@ -1 +1 @@
-powermanga-0.79.tgz
+powermanga-0.80.tgz


Index: powermanga.spec
===================================================================
RCS file: /cvs/extras/rpms/powermanga/FC-4/powermanga.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- powermanga.spec	7 Nov 2005 12:07:58 -0000	1.8
+++ powermanga.spec	11 Apr 2006 16:14:24 -0000	1.9
@@ -1,15 +1,18 @@
 Summary: Arcade 2D shoot-them-up game
 Name: powermanga
-Version: 0.79
-Release: 6%{?dist}
+Version: 0.80
+Release: 1%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://linux.tlk.fr/games/Powermanga/
 Source0: http://linux.tlk.fr/games/Powermanga/download/powermanga-%{version}.tgz
 Source1: powermanga.png
-Patch0: powermanga-64bit.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: SDL-devel, SDL_mixer-devel, desktop-file-utils
+BuildRequires: SDL-devel, SDL_mixer-devel, zlib-devel, desktop-file-utils
+# Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora
+%if %{!?fedora:5}%{?fedora} >= 5
+BuildRequires: libXt-devel, libXxf86dga-devel, libXxf86vm-devel
+%endif
 
 %description
 Powermanga is an arcade 2D shoot-them-up game with 41 levels and more than
@@ -18,7 +21,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .64bit
 
 %{__cat} > %{name}.desktop << EOF
 [Desktop Entry]
@@ -40,7 +42,7 @@
 
 %build
 %configure
-%{__make} %{?_smp_mflags} CXXFLAGS="%{optflags}"
+%{__make} %{?_smp_mflags} CXXFLAGS="%{optflags} `sdl-config --cflags`"
 
 
 %install
@@ -50,7 +52,7 @@
 # Install wrapper script
 %{__install} -D -m 0755 %{name}.sh %{buildroot}%{_bindir}/powermanga
 
-# Allow stripping, g+s will be set in %%files
+# Allow stripping, g+s will be set back in %%files
 %{__chmod} g-s %{buildroot}%{_prefix}/games/powermanga
 
 # Fix location of the man page
@@ -59,13 +61,14 @@
         %{buildroot}%{_mandir}/man6/
 
 # Install pixmap for the menu entry
-%{__install} -D -m 0644 %{SOURCE1} \
+%{__install} -D -p -m 0644 %{SOURCE1} \
     %{buildroot}%{_datadir}/pixmaps/powermanga.png
 
 # Install menu entry
 %{__mkdir_p} %{buildroot}%{_datadir}/applications
 desktop-file-install \
     --vendor fedora \
+    --add-category X-Fedora \
     --dir %{buildroot}%{_datadir}/applications \
     %{name}.desktop
 
@@ -89,6 +92,18 @@
 
 
 %changelog
+* Tue Apr 11 2006 Matthias Saou <http://freshrpms.net/> 0.80-1
+- Update to 0.80, fixes crash at level 35 boss (#184076, Hugo Cisneiros).
+- Add new zlib-devel build requirement.
+- Add `sdl-config --cflags` to CXXFLAGS, otherwise SDL_mixer.h isn't found.
+- Add missing libXt-devel build requirement to get modular X detected.
+
+* Mon Mar  6 2006 Matthias Saou <http://freshrpms.net/> 0.79-8
+- FC5 rebuild.
+
+* Thu Feb  9 2006 Matthias Saou <http://freshrpms.net/> 0.79-7
+- Rebuild for new gcc/glibc and modular X.
+
 * Mon Nov  7 2005 Matthias Saou <http://freshrpms.net/> 0.79-6
 - Fix stripping (when g+s is set, it doesn't happen) and add wrapper script in
   $PATH (#165313, Ville Skytt??).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/powermanga/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Nov 2004 02:49:43 -0000	1.2
+++ sources	11 Apr 2006 16:14:24 -0000	1.3
@@ -1 +1 @@
-3a4f00658496921b7327413ac476c1b7  powermanga-0.79.tgz
+8f6e8755ac88108f2f9bb4cd6feae489  powermanga-0.80.tgz


--- powermanga-64bit.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 11 16:16:28 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Tue, 11 Apr 2006 09:16:28 -0700
Subject: kadischi kadischi.spec,1.2,1.3
Message-ID: <200604111616.k3BGGSwA020569@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20540/kadischi

Modified Files:
	kadischi.spec 
Log Message:
Handle UP and SMP kernels on non-similar hosts


Index: kadischi.spec
===================================================================
RCS file: /cvs/devel/kadischi/kadischi.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kadischi.spec	11 Apr 2006 08:26:16 -0000	1.2
+++ kadischi.spec	11 Apr 2006 16:16:26 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           kadischi
 Version:        0.1
-Release:        7.%{alphatag}
+Release:        8.%{alphatag}
 Summary:        LiveCD generation utility 
 
 Group:          Applications/System
@@ -78,6 +78,7 @@
 
 %changelog
 * Tue Apr 11 2006 Jasper Hartline <jasperhartline at adelphia.net>
+- Handle UP and SMP kernels on SMP and UP hosts
 - Drop filesystem option and use SquashFS exclusively
 - Contributor: Toshio Kuratomi <toshio at tiki-lounge.com>
 



From fedora-extras-commits at redhat.com  Tue Apr 11 16:16:28 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Tue, 11 Apr 2006 09:16:28 -0700
Subject: kadischi/lib functions.py,1.6,1.7
Message-ID: <200604111616.k3BGGS8h020575@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi/lib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20540/kadischi/lib

Modified Files:
	functions.py 
Log Message:
Handle UP and SMP kernels on non-similar hosts


Index: functions.py
===================================================================
RCS file: /cvs/devel/kadischi/lib/functions.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- functions.py	31 Mar 2006 21:03:36 -0000	1.6
+++ functions.py	11 Apr 2006 16:16:26 -0000	1.7
@@ -78,6 +78,10 @@
             for mi in ts.dbMatch ('name', 'kernel-smp'):
                 kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'smp'
                 clear_rpm_db_files (rootdir)
+            if kernel_version == None:
+                for mi in ts.dbMatch ('name', 'kernel'):
+                    kernel_version = "%s-%s" % (mi['version'], mi['release'])
+                    clear_rpm_db_files (rootdir)
         else:
             for mi in ts.dbMatch ('name', 'kernel-xen0'):
                 kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'xen0'
@@ -85,6 +89,10 @@
             for mi in ts.dbMatch ('name', 'kernel'):
                 kernel_version = "%s-%s" % (mi['version'], mi['release'])
                 clear_rpm_db_files (rootdir)
+            if kernel_version == None:
+                for mi in ts.dbMatch ('name', 'kernel-smp'):
+                    kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'smp'
+                    clear_rpm_db_files (rootdir)
     return kernel_version
 
 def clean_directory (dir, remove_when_done=True, keep_child_directories=False):



From fedora-extras-commits at redhat.com  Tue Apr 11 16:34:40 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 11 Apr 2006 09:34:40 -0700
Subject: rpms/powermanga/FC-3 .cvsignore, 1.2, 1.3 powermanga.spec, 1.4,
	1.5 sources, 1.2, 1.3 powermanga-64bit.patch, 1.1, NONE
Message-ID: <200604111634.k3BGYgq1020623@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/powermanga/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20602

Modified Files:
	.cvsignore powermanga.spec sources 
Removed Files:
	powermanga-64bit.patch 
Log Message:
Update to 0.80.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/powermanga/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Nov 2004 02:49:43 -0000	1.2
+++ .cvsignore	11 Apr 2006 16:34:40 -0000	1.3
@@ -1 +1 @@
-powermanga-0.79.tgz
+powermanga-0.80.tgz


Index: powermanga.spec
===================================================================
RCS file: /cvs/extras/rpms/powermanga/FC-3/powermanga.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- powermanga.spec	7 Nov 2005 12:07:49 -0000	1.4
+++ powermanga.spec	11 Apr 2006 16:34:40 -0000	1.5
@@ -1,15 +1,18 @@
 Summary: Arcade 2D shoot-them-up game
 Name: powermanga
-Version: 0.79
-Release: 6%{?dist}
+Version: 0.80
+Release: 1%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://linux.tlk.fr/games/Powermanga/
 Source0: http://linux.tlk.fr/games/Powermanga/download/powermanga-%{version}.tgz
 Source1: powermanga.png
-Patch0: powermanga-64bit.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: SDL-devel, SDL_mixer-devel, desktop-file-utils
+BuildRequires: SDL-devel, SDL_mixer-devel, zlib-devel, desktop-file-utils
+# Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora
+%if %{!?fedora:5}%{?fedora} >= 5
+BuildRequires: libXt-devel, libXxf86dga-devel, libXxf86vm-devel
+%endif
 
 %description
 Powermanga is an arcade 2D shoot-them-up game with 41 levels and more than
@@ -18,7 +21,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .64bit
 
 %{__cat} > %{name}.desktop << EOF
 [Desktop Entry]
@@ -40,7 +42,7 @@
 
 %build
 %configure
-%{__make} %{?_smp_mflags} CXXFLAGS="%{optflags}"
+%{__make} %{?_smp_mflags} CXXFLAGS="%{optflags} `sdl-config --cflags`"
 
 
 %install
@@ -50,7 +52,7 @@
 # Install wrapper script
 %{__install} -D -m 0755 %{name}.sh %{buildroot}%{_bindir}/powermanga
 
-# Allow stripping, g+s will be set in %%files
+# Allow stripping, g+s will be set back in %%files
 %{__chmod} g-s %{buildroot}%{_prefix}/games/powermanga
 
 # Fix location of the man page
@@ -59,13 +61,14 @@
         %{buildroot}%{_mandir}/man6/
 
 # Install pixmap for the menu entry
-%{__install} -D -m 0644 %{SOURCE1} \
+%{__install} -D -p -m 0644 %{SOURCE1} \
     %{buildroot}%{_datadir}/pixmaps/powermanga.png
 
 # Install menu entry
 %{__mkdir_p} %{buildroot}%{_datadir}/applications
 desktop-file-install \
     --vendor fedora \
+    --add-category X-Fedora \
     --dir %{buildroot}%{_datadir}/applications \
     %{name}.desktop
 
@@ -89,6 +92,18 @@
 
 
 %changelog
+* Tue Apr 11 2006 Matthias Saou <http://freshrpms.net/> 0.80-1
+- Update to 0.80, fixes crash at level 35 boss (#184076, Hugo Cisneiros).
+- Add new zlib-devel build requirement.
+- Add `sdl-config --cflags` to CXXFLAGS, otherwise SDL_mixer.h isn't found.
+- Add missing libXt-devel build requirement to get modular X detected.
+
+* Mon Mar  6 2006 Matthias Saou <http://freshrpms.net/> 0.79-8
+- FC5 rebuild.
+
+* Thu Feb  9 2006 Matthias Saou <http://freshrpms.net/> 0.79-7
+- Rebuild for new gcc/glibc and modular X.
+
 * Mon Nov  7 2005 Matthias Saou <http://freshrpms.net/> 0.79-6
 - Fix stripping (when g+s is set, it doesn't happen) and add wrapper script in
   $PATH (#165313, Ville Skytt??).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/powermanga/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Nov 2004 02:49:43 -0000	1.2
+++ sources	11 Apr 2006 16:34:40 -0000	1.3
@@ -1 +1 @@
-3a4f00658496921b7327413ac476c1b7  powermanga-0.79.tgz
+8f6e8755ac88108f2f9bb4cd6feae489  powermanga-0.80.tgz


--- powermanga-64bit.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 11 16:36:03 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Tue, 11 Apr 2006 09:36:03 -0700
Subject: fedora-security/audit fc4,1.198,1.199 fc5,1.111,1.112
Message-ID: <200604111636.k3BGa3F0020687@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20667/audit

Modified Files:
	fc4 fc5 
Log Message:
Update CVE-2006-1522



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- fc4	11 Apr 2006 10:26:37 -0000	1.198
+++ fc4	11 Apr 2006 16:36:01 -0000	1.199
@@ -12,7 +12,7 @@
 CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1542 VULNERABLE (python) bz#169046
-CVE-2006-1522 VULNERABLE (kernel)
+CVE-2006-1522 VULNERABLE (kernel, fixed 2.6.16.3)
 CVE-2006-1494 VULNERABLE (php)
 CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-245]
 CVE-2006-1354 VULNERABLE (freeradius) bz#186084


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- fc5	11 Apr 2006 10:26:37 -0000	1.111
+++ fc5	11 Apr 2006 16:36:01 -0000	1.112
@@ -11,7 +11,7 @@
 CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1542 VULNERABLE (python) bz#169046
-CVE-2006-1522 VULNERABLE (kernel)
+CVE-2006-1522 VULNERABLE (kernel, fixed 2.6.16.3)
 CVE-2006-1494 VULNERABLE (php)
 CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-233]
 CVE-2006-1354 VULNERABLE (freeradius) bz#186084



From fedora-extras-commits at redhat.com  Tue Apr 11 16:43:01 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 11 Apr 2006 09:43:01 -0700
Subject: rpms/php-eaccelerator/devel
	eaccelerator-0.9.5-beta2-64bit_cast_warning.patch, NONE,
	1.1 eaccelerator-0.9.5-beta2-compile.patch, NONE, 1.1 .cvsignore,
	1.5, 1.6 php-eaccelerator.spec, 1.10, 1.11 sources, 1.5, 1.6
Message-ID: <200604111643.k3BGh32b020749@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/php-eaccelerator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20722

Modified Files:
	.cvsignore php-eaccelerator.spec sources 
Added Files:
	eaccelerator-0.9.5-beta2-64bit_cast_warning.patch 
	eaccelerator-0.9.5-beta2-compile.patch 
Log Message:
Update to 0.9.5-beta2.


eaccelerator-0.9.5-beta2-64bit_cast_warning.patch:

--- NEW FILE eaccelerator-0.9.5-beta2-64bit_cast_warning.patch ---
Index: opcodes.h
===================================================================
--- opcodes.h	(revision 202)
+++ opcodes.h	(working copy)
@@ -85,7 +85,7 @@
 #define OPS_STD       EXT_STD | OP1_STD | OP2_STD | RES_STD
 
 #ifdef ZEND_ENGINE_2
-#  define VAR_NUM(var) ((unsigned int)(((temp_variable *)(var))-((temp_variable *)NULL)))
+#  define VAR_NUM(var) ((unsigned int)(((temp_variable *)((intptr_t) var))-((temp_variable *)NULL)))
 #  define VAR_VAL(var) ((unsigned int)((var)*sizeof(temp_variable)))
 #else
 #  define VAR_NUM(var) ((unsigned int)(var))
Index: loader.c
===================================================================
--- loader.c	(revision 202)
+++ loader.c	(working copy)
@@ -86,7 +86,7 @@
     zend_bailout();
   }
 #ifdef ZEND_ENGINE_2
-  return (unsigned int)(((temp_variable*)NULL) + var);
+  return (unsigned int)((intptr_t) ((temp_variable*)NULL) + var);
 #else
   return var;
 #endif

eaccelerator-0.9.5-beta2-compile.patch:

--- NEW FILE eaccelerator-0.9.5-beta2-compile.patch ---
Index: optimize.c
===================================================================
--- optimize.c	(revision 199)
+++ optimize.c	(working copy)
@@ -1499,23 +1499,26 @@
   if (!EAG(encoder) ||
       (name_len == sizeof("false")-1 && strcmp(name,"false") == 0) ||
       (name_len == sizeof("true")-1 && strcmp(name,"true") == 0)) {
-    zend_constant *c;
+    union {
+      zend_constant *v;
+      void *ptr;
+    } c;
     int retval;
     char *lookup_name = do_alloca(name_len+1);
     memcpy(lookup_name, name, name_len);
     lookup_name[name_len] = '\0';
 
-    if (zend_hash_find(EG(zend_constants), lookup_name, name_len+1, (void **) &c)==SUCCESS) {
-      *result = c;
+    if (zend_hash_find(EG(zend_constants), lookup_name, name_len+1, &c.ptr)==SUCCESS) {
+      *result = c.v;
       retval=1;
     } else {
       zend_str_tolower(lookup_name, name_len);
 
-      if (zend_hash_find(EG(zend_constants), lookup_name, name_len+1, (void **) &c)==SUCCESS) {
-        if ((c->flags & CONST_CS) && (memcmp(c->name, name, name_len)!=0)) {
+      if (zend_hash_find(EG(zend_constants), lookup_name, name_len+1, &c.ptr)==SUCCESS) {
+        if ((c.v->flags & CONST_CS) && (memcmp(c.v->name, name, name_len)!=0)) {
           retval=0;
         } else {
-          *result = c;
+          *result = c.v;
           retval=1;
         }
       } else {
@@ -2543,52 +2546,49 @@
 #endif
             IS_DEFINED(op->op1)) {
           zend_op *x = DEFINED_OP(op->op1);
-          if ((x->opcode == ZEND_FETCH_W || x->opcode == ZEND_FETCH_RW) &&
-              x->op1.op_type == IS_CONST &&
-              x->op1.u.constant.type == IS_STRING) {
+          if ((x->opcode == ZEND_FETCH_W || x->opcode == ZEND_FETCH_RW) && 
+              x->op1.op_type == IS_CONST && x->op1.u.constant.type == IS_STRING) {
+            union {
+              zend_op *v;
+              void *ptr;
+            } op_copy;
             char *s = emalloc(x->op1.u.constant.value.str.len+2);
+            op_copy.v = op;
             memcpy(s,x->op1.u.constant.value.str.val,x->op1.u.constant.value.str.len);
             s[x->op1.u.constant.value.str.len] = (char)FETCH_TYPE(x);
             s[x->op1.u.constant.value.str.len+1] = '\0';
-            zend_hash_update(&assigns,
-                             s, x->op1.u.constant.value.str.len+2,
-                             (void**)&op, sizeof(void*), NULL);
+            zend_hash_update(&assigns, s, x->op1.u.constant.value.str.len+2, &op_copy.ptr, 
+                sizeof(void*), NULL);
             efree(s);
           }
         }
-      } else if ((op->opcode == ZEND_FETCH_R ||
-                  op->opcode == ZEND_FETCH_IS) &&
-                 !global[VAR_NUM(op->result.u.var)] &&
-                 op->op1.op_type == IS_CONST &&
-                 op->op1.u.constant.type == IS_STRING) {
-        zend_op *x;
+      } else if ((op->opcode == ZEND_FETCH_R || op->opcode == ZEND_FETCH_IS) && 
+          !global[VAR_NUM(op->result.u.var)] && op->op1.op_type == IS_CONST &&
+          op->op1.u.constant.type == IS_STRING) {
+        union {
+          zend_op *v;
+          void *ptr;
+        } x;
         char *s = emalloc(op->op1.u.constant.value.str.len+2);
         memcpy(s,op->op1.u.constant.value.str.val,op->op1.u.constant.value.str.len);
         s[op->op1.u.constant.value.str.len] = (char)FETCH_TYPE(op);
         s[op->op1.u.constant.value.str.len+1] = '\0';
 
-        if (zend_hash_find(&assigns,
-                           s, op->op1.u.constant.value.str.len+2,
-                           (void**)&x) == SUCCESS) {
-          x = *(zend_op**)x;
-/*
-          if (x->opcode == ZEND_ASSIGN && x->op2.op_type == IS_CONST) {
-            zend_printf("possible const propogation in %s:%s (%s,%u:%u)<br>\n",op_array->filename, op_array->function_name, op->op1.u.constant.value.str.val, x-op_array->opcodes, op-op_array->opcodes);
-          }
-*/
-          memcpy(&x->result, &op->result, sizeof(op->result));
-          x->result.u.EA.type = 0;
-          SET_DEFINED(x);
-          zend_hash_del(&assigns,
-                        s, op->op1.u.constant.value.str.len+2);
+        if (zend_hash_find(&assigns, s, op->op1.u.constant.value.str.len+2, 
+              &x.ptr) == SUCCESS) {
+          x.v = *(zend_op**)x.v;
+          memcpy(&x.v->result, &op->result, sizeof(op->result));
+          x.v->result.u.EA.type = 0;
+          SET_DEFINED(x.v);
+          zend_hash_del(&assigns, s, op->op1.u.constant.value.str.len+2);
           STR_FREE(op->op1.u.constant.value.str.val);
           SET_TO_NOP(op);
         }
         efree(s);
       } else if (op->opcode == ZEND_FETCH_DIM_R &&
-                 op->extended_value != ZEND_FETCH_ADD_LOCK &&
-                 op->op1.op_type == IS_VAR &&
-                 IS_DEFINED(op->op1)) {
+          op->extended_value != ZEND_FETCH_ADD_LOCK &&
+          op->op1.op_type == IS_VAR &&
+          IS_DEFINED(op->op1)) {
         zend_op *x = DEFINED_OP(op->op1);
         while ((x->opcode == ZEND_ASSIGN_REF ||
                 x->opcode == ZEND_ASSIGN ||
@@ -2609,32 +2609,35 @@
                 IS_DEFINED(x->op1)) {
           x = DEFINED_OP(x->op1);
         }
-        if ((x->opcode == ZEND_FETCH_R ||
-             x->opcode == ZEND_FETCH_W ||
-             x->opcode == ZEND_FETCH_RW) &&
-             x->op1.op_type == IS_CONST &&
-             x->op1.u.constant.type == IS_STRING) {
-          zend_op *y;
+        if ((x->opcode == ZEND_FETCH_R || x->opcode == ZEND_FETCH_W || 
+              x->opcode == ZEND_FETCH_RW) && x->op1.op_type == IS_CONST && 
+            x->op1.u.constant.type == IS_STRING) {
+          union {
+            zend_op *v;
+            void *ptr;
+          } y;
+          union {
+            zend_op *v;
+            void *ptr;
+          } op_copy;
           char *s = emalloc(x->op1.u.constant.value.str.len+2);
+          op_copy.v = op;
           memcpy(s,x->op1.u.constant.value.str.val,x->op1.u.constant.value.str.len);
           s[x->op1.u.constant.value.str.len] = (char)FETCH_TYPE(x);
           s[x->op1.u.constant.value.str.len+1] = '\0';
-          if (zend_hash_find(&fetch_dim,
-                             s, x->op1.u.constant.value.str.len+2,
-                             (void**)&y) == SUCCESS) {
-            y = *(zend_op**)y;
-            y->extended_value = ZEND_FETCH_ADD_LOCK;
-            zend_hash_update(&fetch_dim,
-                             s, x->op1.u.constant.value.str.len+2,
-                             (void**)&op, sizeof(void*), NULL);
+          if (zend_hash_find(&fetch_dim, s, x->op1.u.constant.value.str.len+2, 
+                &y.ptr) == SUCCESS) {
+            y.v = *(zend_op**)y.v;
+            y.v->extended_value = ZEND_FETCH_ADD_LOCK;
+            zend_hash_update(&fetch_dim, s, x->op1.u.constant.value.str.len+2, 
+                &op_copy.ptr, sizeof(void*), NULL);
             SET_UNDEFINED(x->result);
             STR_FREE(x->op1.u.constant.value.str.val);
             SET_TO_NOP(x);
-            memcpy(&op->op1,&y->op1,sizeof(op->op1));
+            memcpy(&op->op1, &y.v->op1, sizeof(op->op1));
           } else {
-            zend_hash_update(&fetch_dim,
-                             s, x->op1.u.constant.value.str.len+2,
-                             (void**)&op, sizeof(void*), NULL);
+            zend_hash_update(&fetch_dim, s, x->op1.u.constant.value.str.len+2, 
+                &op_copy.ptr, sizeof(void*), NULL);
           }
           efree(s);
         }
@@ -3170,7 +3173,9 @@
 void reassign_registers(zend_op_array *op_array, BB* p, char *global) {
   zend_uint i;
   zend_uint n = 0;
+#ifndef ZEND_ENGINE_2
   int uses_globals = 0;
+#endif
   int* assigned = do_alloca(op_array->T * sizeof(int));
   char* reg_pool = do_alloca(op_array->T * sizeof(char));
   char* used     = do_alloca(op_array->T * sizeof(char));
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 199)
+++ Makefile.in	(working copy)
@@ -2,6 +2,6 @@
 LTLIBRARY_SOURCES     = eaccelerator.c optimize.c encoder.c loader.c opcodes.c content.c mm.c session.c shm.c debug.c cache.c ea_restore.c ea_store.c ea_info.c ea_dasm.c
 LTLIBRARY_SHARED_NAME = eaccelerator.la
 
-EXTRA_CFLAGS = -O2
+EXTRA_CFLAGS = -O2 -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=generic -fasynchronous-unwind-tables
 
 include $(top_srcdir)/build/dynlib.mk
Index: loader.c
===================================================================
--- loader.c	(revision 199)
+++ loader.c	(working copy)
@@ -212,6 +212,7 @@
   }
 }
 
+#ifndef ZEND_ENGINE_2
 static unsigned char* decode_pstr(char** p, unsigned int* l) {
   unsigned char c = decode(p, l);
   if (c == 0) {
@@ -229,6 +230,7 @@
     return str;
   }
 }
+#endif
 
 static double decode_double(char** p, unsigned int* l) {
   unsigned char sign;
@@ -250,7 +252,6 @@
 typedef void* (*decode_bucket_t)(void* to, char**, unsigned int* TSRMLS_DC);
 
 #define decode_zval_hash(to, p, l) decode_hash(to, sizeof(zval*), (decode_bucket_t)decode_zval_ptr, p, l TSRMLS_CC)
-#define decode_zval_hash_noref(to, p, l) decode_hash(to, sizeof(zval*), (decode_bucket_t)decode_zval_ptr_noref, p, l TSRMLS_CC)
 
 static HashTable* decode_hash(HashTable* to, int size, decode_bucket_t decode_bucket, char**p, unsigned int* l TSRMLS_DC);
 static zval* decode_zval_ptr(zval* to, char** p, unsigned int* l TSRMLS_DC);
@@ -315,6 +316,8 @@
   return to;
 }
 
+#ifndef ZEND_ENGINE_2
+#define decode_zval_hash_noref(to, p, l) decode_hash(to, sizeof(zval*), (decode_bucket_t)decode_zval_ptr_noref, p, l TSRMLS_CC)
 static zval* decode_zval_ptr_noref(zval* to, char** p, unsigned int* l TSRMLS_DC) {
   if (to == NULL) {
     ALLOC_ZVAL(to);
@@ -324,6 +327,7 @@
   to->refcount = 1;
   return to;
 }
+#endif
 
 static void decode_znode(znode* to, unsigned int vars_count, char** p, unsigned int* l TSRMLS_DC) {
   to->op_type = decode(p, l);
@@ -615,14 +619,19 @@
 	to->scope            = EAG(class_entry);
 	to->fn_flags         = decode32(p, l);
 	scope_name = decode_lstr((unsigned int*)&scope_name_len, p, l);
-	if (to->scope == NULL && scope_name != NULL) {
-		if (zend_hash_find(CG(class_table), (void *)scope_name, 
-                    scope_name_len, (void **)&to->scope) == SUCCESS) {
-			to->scope = *(zend_class_entry**)to->scope;
-		} else {
-            to->scope = NULL;
-        }
-	}
+    if (to->scope == NULL && scope_name != NULL) {
+      union {
+        zend_class_entry *v;
+        void *ptr;
+      } scope;
+      scope.v = to->scope;
+      if (zend_hash_find(CG(class_table), (void *)scope_name, 
+            scope_name_len, &scope.ptr) == SUCCESS) {
+        to->scope = *(zend_class_entry**)to->scope;
+      } else {
+        to->scope = NULL;
+      }
+    }
 #endif
   if (to->type == ZEND_INTERNAL_FUNCTION) {
     return to;
Index: mm.c
===================================================================
--- mm.c	(revision 199)
+++ mm.c	(working copy)
@@ -157,6 +157,7 @@
 
 #undef MM_SHM_CAN_ATTACH
 
+#if defined(MM_SEM_POSIX) || defined(MM_SEM_FCNTL) || defined(MM_SEM_FLOCK) || defined(MM_SEM_WIN32) || defined(MM_SHM_MMAP_POSIX) || defined(MM_SHM_MMAP_FILE)
 static int strxcat(char* dst, const char* src, int size) {
   int dst_len = strlen(dst);
   int src_len = strlen(src);
@@ -169,6 +170,7 @@
     return 0;
   }
 }
+#endif
 
 #if defined(MM_SEM_SPINLOCK)
 
@@ -191,9 +193,11 @@
   spinlock_t spinlock;
 } mm_mutex;
 
+/* not used 
 static int mm_attach_lock(const char* key, mm_mutex* lock) {
   return 1;
 }
+*/
 
 static int mm_init_lock(const char* key, mm_mutex* lock) {
   spinlock_init(&lock->spinlock);
Index: ea_restore.c
===================================================================
--- ea_restore.c	(revision 199)
+++ ea_restore.c	(working copy)
@@ -465,7 +465,10 @@
 zend_op_array *restore_op_array(zend_op_array * to,
 								eaccelerator_op_array * from TSRMLS_DC)
 {
-	zend_function *function;
+    union {
+    	zend_function *v;
+        void *ptr;
+    } function;
 #ifdef ZEND_ENGINE_2
 	int fname_len = 0;
 	char *fname_lc = NULL;
@@ -529,8 +532,13 @@
 	 * am I right here ? ;-(
 	 */
 	if (from->scope_name != NULL) {
+        union {
+            zend_class_entry *v;
+            void *ptr;
+        } scope;
 		char *from_scope_lc = zend_str_tolower_dup(from->scope_name, from->scope_name_len);
-		if (zend_hash_find (CG(class_table), (void *) from_scope_lc, from->scope_name_len + 1, (void **) &to->scope) != SUCCESS) {
+        scope.v = to->scope;
+		if (zend_hash_find (CG(class_table), (void *) from_scope_lc, from->scope_name_len + 1, &scope.ptr) != SUCCESS) {
 			DBG(ea_debug_pad, (EA_DEBUG TSRMLS_CC));
 			DBG(ea_debug_printf, (EA_DEBUG, "[%d]                   can't find '%s' in class_table. use EAG(class_entry).\n", getpid(), from->scope_name));
 			to->scope = EAG(class_entry);
@@ -548,11 +556,11 @@
 			for (p = EAG(class_entry)->parent; p; p = p->parent) {
 				DBG(ea_debug_pad, (EA_DEBUG TSRMLS_CC));
 				DBG(ea_debug_printf, (EA_DEBUG, "[%d]                   checking parent '%s' have '%s'\n", getpid(), p->name, fname_lc));
-				if (zend_hash_find(&p->function_table, fname_lc, fname_len + 1, (void **) &function) == SUCCESS) {
+				if (zend_hash_find(&p->function_table, fname_lc, fname_len + 1, &function.ptr) == SUCCESS) {
 					DBG(ea_debug_pad, (EA_DEBUG TSRMLS_CC));
 					DBG(ea_debug_printf, (EA_DEBUG, "[%d]                                   '%s' has '%s' of scope '%s'\n", 
-                            getpid(), p->name, fname_lc, function->common.scope->name));
-					to->scope = function->common.scope;
+                            getpid(), p->name, fname_lc, function.v->common.scope->name));
+					to->scope = function.v->common.scope;
 					break;
 				}
 			}
@@ -582,10 +590,10 @@
 #else
                 to->function_name, strlen(to->function_name) + 1,
 #endif
-				(void **) &function) == SUCCESS && function->type == ZEND_INTERNAL_FUNCTION) {
+				&function.ptr) == SUCCESS && function.v->type == ZEND_INTERNAL_FUNCTION) {
 			DBG(ea_debug_pad, (EA_DEBUG TSRMLS_CC));
 			DBG(ea_debug_printf, (EA_DEBUG, "[%d]                                       found in function table\n", getpid()));
-			((zend_internal_function *) (to))->handler = ((zend_internal_function *) function)->handler;
+			((zend_internal_function *) (to))->handler = ((zend_internal_function *) function.v)->handler;
 		} else {
 			/* FIXME. I don't know how to fix handler.
 			 * TODO: must solve this somehow, to avoid returning damaged structure...
@@ -805,7 +813,6 @@
 									  eaccelerator_class_entry * from TSRMLS_DC)
 {
 	zend_class_entry *old;
-	zend_function *f = NULL;
 
 	DBG(ea_debug_pad, (EA_DEBUG TSRMLS_CC));
 	DBG(ea_debug_printf, (EA_DEBUG, "[%d] restore_class_entry: %s\n", getpid(), from->name ? from->name : "(top)"));
Index: ea_dasm.c
===================================================================
--- ea_dasm.c	(revision 199)
+++ ea_dasm.c	(working copy)
@@ -269,7 +269,7 @@
                 } else if (opline->extended_value == ZEND_ISEMPTY) {
                     snprintf(buf, sizeof(buf), "ZEND_ISEMPTY");
                 } else {
-                    snprintf(buf, sizeof(buf), "");
+					buf[0] = '\0';
                 }
 #ifdef ZEND_ENGINE_2
             } else if ((op->ops & EXT_MASK) == EXT_ASSIGN) {
@@ -278,7 +278,7 @@
                 } else if (opline->extended_value == ZEND_ASSIGN_DIM) {
                     snprintf(buf, sizeof(buf), "ZEND_ASSIGN_DIM");
                 } else {
-                    snprintf(buf, sizeof(buf), "");
+					buf[0] = '\0';
                 }
 #ifndef ZEND_ENGINE_2_1
             } else if (opline->opcode == ZEND_UNSET_DIM_OBJ) {
@@ -287,14 +287,14 @@
                 } else if (opline->extended_value == ZEND_UNSET_OBJ) {
                     snprintf(buf, sizeof(buf), "ZEND_UNSET_OBJ");
                 } else {
-                    snprintf(buf, sizeof(buf), "");
+					buf[0] = '\0';
                 }
 #endif
 #endif
             } else if (opline->extended_value != 0) {
                 snprintf(buf, sizeof(buf), "%ld", opline->extended_value);
             } else {
-                snprintf(buf, sizeof(buf), "");
+				buf[0] = '\0';
             }
             add_assoc_string(el, "extended_value", buf, 1);
 
@@ -314,7 +314,7 @@
                 snprintf(buf, sizeof(buf), "$class%u", VAR_NUM(opline->op1.u.var));
             } else if ((op->ops & OP1_MASK) == OP1_UCLASS) {
                 if (opline->op1.op_type == IS_UNUSED) {
-                    snprintf(buf, sizeof(buf), "");
+					buf[0] = '\0';
                 } else {
                     snprintf(buf, sizeof(buf), "$class%u", VAR_NUM(opline->op1.u.var));
                 }
@@ -328,6 +328,7 @@
                         if (offset >= op_array->last_brk_cont) {
                             goto brk_failed;
                         }
+						jmp_to = &op_array->brk_cont_array[offset];
                         offset = jmp_to->parent;
                     } while (--level > 0);
                     snprintf(buf, sizeof(buf), "opline(%d)", jmp_to->brk);
@@ -367,7 +368,7 @@
                 } else if (opline->op1.op_type == IS_VAR) {
                     snprintf(buf, sizeof(buf), "$var%u", VAR_NUM(opline->op1.u.var));
                 } else if (opline->op1.op_type == IS_UNUSED) {
-                    snprintf(buf, sizeof(buf), "");
+					buf[0] = '\0';
                 } else {
                     snprintf(buf, sizeof(buf), "UNKNOWN NODE %d", opline->op1.op_type);
                 }
@@ -415,7 +416,7 @@
 				} else if (opline->op2.u.constant.value.lval == ZEND_REQUIRE_ONCE) {
 					snprintf(buf, sizeof(buf), "ZEND_REQUIRE_ONCE");
 				} else {
-                    snprintf(buf, sizeof(buf), "");
+					buf[0] = '\0';
 				}
 			} else if ((op->ops & OP2_MASK) == OP2_ARG) {
 			    snprintf(buf, sizeof(buf), "arg(%u)", opline->op2.u.opline_num);
@@ -425,7 +426,7 @@
 				} else if (opline->op2.u.constant.value.lval == ZEND_ISEMPTY) {
 					snprintf(buf, sizeof(buf), "ZEND_ISEMPTY");
 				} else {
-					snprintf(buf, sizeof(buf), "");
+					buf[0] = '\0';
 				}
 			} else {
                 if (opline->op2.op_type == IS_CONST) {
@@ -436,7 +437,7 @@
 				} else if (opline->op2.op_type == IS_VAR) {
 					snprintf(buf, sizeof(buf), "$var%u", VAR_NUM(opline->op2.u.var));
 				} else if (opline->op2.op_type == IS_UNUSED) {
-					snprintf(buf, sizeof(buf), "");
+					buf[0] = '\0';
 				} else {
 					snprintf(buf, sizeof(buf), "UNKNOWN NODE %d", opline->op2.op_type);
 				}
@@ -466,7 +467,7 @@
     						snprintf(buf, sizeof(buf), "$var%u", VAR_NUM(opline->result.u.var));
                         }
     				} else if (opline->result.op_type == IS_UNUSED) {
-                        snprintf(buf, sizeof(buf), "");
+						buf[0] = '\0';
     				} else {
     					snprintf(buf, sizeof(buf), "UNKNOWN NODE %d", opline->result.op_type);
     				}
@@ -485,7 +486,7 @@
     				}
     				break;
     			case RES_UNUSED:
-                    snprintf(buf, sizeof(buf), "");
+					buf[0] = '\0';
     				break;
     			default:
     				snprintf(buf, sizeof(buf), "UNKNOWN NODE %d", opline->result.op_type);
Index: ea_store.c
===================================================================
--- ea_store.c	(revision 199)
+++ ea_store.c	(working copy)
@@ -85,11 +85,14 @@
 #endif
 }
 
+
 /* Calculate the size of a point to a class entry */
+/* not used
 static void calc_class_entry_ptr(zend_class_entry ** from TSRMLS_DC)
 {
 	calc_class_entry(*from TSRMLS_CC);
 }
+*/
 #endif
 
 /* Calculate the size of an HashTable */
@@ -780,31 +783,37 @@
 {
 	zend_class_entry *from = from_ce;
 	zend_class_entry *parent = from->parent;
-	zend_property_info *pinfo, *cinfo = NULL;
-	zval **pprop = NULL;
-	zval **cprop = p->pData;
+    union {
+        zend_property_info *v;
+        void *ptr;
+    } pinfo, cinfo;
+    union {
+    	zval **v;
+        void *ptr;
+    } pprop, cprop;
 	char *mname, *cname = NULL;
 
+    cprop.v = p->pData;
 	/* Check if this is a parent class. If so, copy unconditionally */
 	if (parent) {
 		/* unpack the \0classname\0membername\0 style property name to seperate vars */
 		zend_unmangle_property_name(p->arKey, &cname, &mname);
 	
 		/* lookup the member's info in parent and child */
-		if((zend_hash_find(&parent->properties_info, mname, strlen(mname)+1, (void**)&pinfo) == SUCCESS) &&
-			(zend_hash_find(&from->properties_info, mname, strlen(mname)+1, (void**)&cinfo) == SUCCESS)) {
+		if((zend_hash_find(&parent->properties_info, mname, strlen(mname)+1, &pinfo.ptr) == SUCCESS) &&
+			(zend_hash_find(&from->properties_info, mname, strlen(mname)+1, &cinfo.ptr) == SUCCESS)) {
 			/* don't copy this static property if protected in parent and static public in child.
 			   inheritance will handle this properly on restore */
-			if(cinfo->flags & ZEND_ACC_STATIC && (pinfo->flags & ZEND_ACC_PROTECTED && cinfo->flags & ZEND_ACC_PUBLIC)) {
+			if(cinfo.v->flags & ZEND_ACC_STATIC && (pinfo.v->flags & ZEND_ACC_PROTECTED && cinfo.v->flags & ZEND_ACC_PUBLIC)) {
 				return ZEND_HASH_APPLY_REMOVE;
 			}
 			/* If the static member points to the same value in parent and child, remove for proper inheritance during restore */
 #  ifdef ZEND_ENGINE_2_1
-			if(zend_hash_quick_find(&parent->default_static_members, p->arKey, p->nKeyLength, p->h, (void**)&pprop) == SUCCESS) {
+			if(zend_hash_quick_find(&parent->default_static_members, p->arKey, p->nKeyLength, p->h, &pprop.ptr) == SUCCESS) {
 #  else
-			if(zend_hash_quick_find(parent->static_members, p->arKey, p->nKeyLength, p->h, (void**)&pprop) == SUCCESS) {
+			if(zend_hash_quick_find(parent->static_members, p->arKey, p->nKeyLength, p->h, &pprop.ptr) == SUCCESS) {
 #  endif
-				if(*pprop == *cprop) {
+				if(*pprop.v == *cprop.v) {
 					return ZEND_HASH_APPLY_REMOVE;
 				}
 			}
Index: cache.c
===================================================================
--- cache.c	(revision 199)
+++ cache.c	(working copy)
@@ -278,7 +278,8 @@
                 q->next = q;
                 hdr.crc32 = eaccelerator_crc32((const char *) q, q->size);
                 if (write(f, &hdr, sizeof(hdr)) == sizeof(hdr)) {
-                    write(f, q, q->size);
+                    ssize_t result = 0;
+                    result = write(f, q, q->size);
                     EACCELERATOR_FLOCK(f, LOCK_UN);
                     close(f);
                     ret = 1;
@@ -596,7 +597,7 @@
 {
     unsigned int i, xlen;
     zval *list;
-    char *xkey;
+    char *xkey = "";
     mm_user_cache_entry *p;
     time_t t = time(0);
 
Index: content.c
===================================================================
--- content.c	(revision 199)
+++ content.c	(working copy)
@@ -121,16 +121,19 @@
 
 static int eaccelerator_is_not_modified(zval* return_value TSRMLS_DC) {
   char  etag[256];
-  zval  **server_vars, **match;
+  union {
+    zval **v;
+    void *ptr;
+  } server_vars, match;
 
   if (!SG(headers_sent)) {
     sprintf(etag,"ETag: eaccelerator-%u",eaccelerator_crc32(Z_STRVAL_P(return_value),Z_STRLEN_P(return_value)));
     sapi_add_header(etag, strlen(etag), 1);
-    if (zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void **) &server_vars) == SUCCESS &&
-        Z_TYPE_PP(server_vars) == IS_ARRAY &&
-        zend_hash_find(Z_ARRVAL_PP(server_vars), "HTTP_IF_NONE_MATCH", sizeof("HTTP_IF_NONE_MATCH"), (void **) &match)==SUCCESS &&
-        Z_TYPE_PP(match) == IS_STRING) {
-      if (strcmp(etag+6,Z_STRVAL_PP(match)) == 0 &&
+    if (zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), &server_vars.ptr) == SUCCESS &&
+        Z_TYPE_PP(server_vars.v) == IS_ARRAY &&
+        zend_hash_find(Z_ARRVAL_PP(server_vars.v), "HTTP_IF_NONE_MATCH", sizeof("HTTP_IF_NONE_MATCH"), &match.ptr)==SUCCESS &&
+        Z_TYPE_PP(match.v) == IS_STRING) {
+      if (strcmp(etag+6,Z_STRVAL_PP(match.v)) == 0 &&
           sapi_add_header("HTTP/1.0 304", sizeof("HTTP/1.0 304") - 1, 1) == SUCCESS &&
           sapi_add_header("Status: 304 Not Modified", sizeof("Status: 304 Not Modified") - 1, 1) == SUCCESS) {
         zval_dtor(return_value);
@@ -183,17 +186,19 @@
 static int eaccelerator_get_page(const char* key, int key_len, zval* return_value TSRMLS_DC) {
   int   ret = 0;
   zval cache_array;
-  zval **headers;
-  zval **content;
+  union {
+    zval **v;
+    void *ptr;
+  } headers, content;
   if (eaccelerator_get(key, key_len, &cache_array, eaccelerator_content_cache_place TSRMLS_CC)) {
     if (Z_TYPE(cache_array) == IS_ARRAY) {
-      if (zend_hash_find(Z_ARRVAL(cache_array),"content",sizeof("content"),(void**)&content) == SUCCESS &&
-         Z_TYPE_PP(content) == IS_STRING) {
-        if (zend_hash_find(Z_ARRVAL(cache_array),"headers",sizeof("headers"),(void**)&headers) == SUCCESS &&
-           Z_TYPE_PP(headers) == IS_ARRAY) {
-          zend_hash_apply(Z_ARRVAL_PP(headers), (apply_func_t)eaccelerator_send_header TSRMLS_CC);
+      if (zend_hash_find(Z_ARRVAL(cache_array),"content",sizeof("content"),&content.ptr) == SUCCESS &&
+         Z_TYPE_PP(content.v) == IS_STRING) {
+        if (zend_hash_find(Z_ARRVAL(cache_array),"headers",sizeof("headers"),&headers.ptr) == SUCCESS &&
+           Z_TYPE_PP(headers.v) == IS_ARRAY) {
+          zend_hash_apply(Z_ARRVAL_PP(headers.v), (apply_func_t)eaccelerator_send_header TSRMLS_CC);
         }
-        memcpy(return_value,*content, sizeof(zval));
+        memcpy(return_value,*content.v, sizeof(zval));
         zval_copy_ctor(return_value);
         ret = 1;
       }
@@ -204,15 +209,18 @@
 }
 
 static void eaccelerator_compress(char* key, int key_len, zval* return_value, time_t ttl TSRMLS_DC) {
-  zval  **server_vars, **encoding;
+  union {
+    zval **v;
+    void *ptr;
+  } server_vars, encoding;
 
   if (EAG(compression_enabled) &&
       EAG(compress_content) &&
       !SG(headers_sent) &&
-      zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void **) &server_vars) == SUCCESS &&
-      Z_TYPE_PP(server_vars) == IS_ARRAY &&
-      zend_hash_find(Z_ARRVAL_PP(server_vars), "HTTP_ACCEPT_ENCODING", sizeof("HTTP_ACCEPT_ENCODING"), (void **) &encoding)==SUCCESS &&
-      Z_TYPE_PP(encoding) == IS_STRING &&
+      zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), &server_vars.ptr) == SUCCESS &&
+      Z_TYPE_PP(server_vars.v) == IS_ARRAY &&
+      zend_hash_find(Z_ARRVAL_PP(server_vars.v), "HTTP_ACCEPT_ENCODING", sizeof("HTTP_ACCEPT_ENCODING"), &encoding.ptr)==SUCCESS &&
+      Z_TYPE_PP(encoding.v) == IS_STRING &&
       Z_TYPE_P(return_value) == IS_STRING &&
       Z_STRLEN_P(return_value) >= EACCELERATOR_COMPRESS_MIN) {
     char* zkey = NULL;
@@ -234,7 +242,7 @@
       p = p->next;
     }
 
-    if (strstr(Z_STRVAL_PP(encoding),"x-gzip")) {
+    if (strstr(Z_STRVAL_PP(encoding.v),"x-gzip")) {
       zkey_len = sizeof("gzip_") + key_len - 1;
       zkey = emalloc(zkey_len+1);
       memcpy(zkey,"gzip_",sizeof("gzip_")-1);
@@ -243,7 +251,7 @@
       enc = "Content-Encoding: x-gzip";
       params[0] = return_value;
       gzip = 1;
-    } else if (strstr(Z_STRVAL_PP(encoding),"gzip")) {
+    } else if (strstr(Z_STRVAL_PP(encoding.v),"gzip")) {
       zkey_len = sizeof("gzip_") + key_len - 1;
       zkey = emalloc(zkey_len+1);
       memcpy(zkey,"gzip_",sizeof("gzip_")-1);
@@ -252,7 +260,7 @@
       enc = "Content-Encoding: gzip";
       params[0] = return_value;
       gzip = 1;
-    } else if (strstr(Z_STRVAL_PP(encoding),"deflate")) {
+    } else if (strstr(Z_STRVAL_PP(encoding.v),"deflate")) {
       zkey_len = sizeof("deflate_") + key_len - 1;
       zkey = emalloc(zkey_len+1);
       memcpy(zkey,"deflate_",sizeof("deflate_")-1);
@@ -379,7 +387,10 @@
   char* key;
   int   key_len;
   long  ttl = 0;
-  zval  **server_vars, **encoding;
+  union {
+    zval **v;
+    void *ptr;
+  } server_vars, encoding;
 
   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
                           "s|l", &key, &key_len, &ttl) == FAILURE) {
@@ -394,26 +405,26 @@
   if (EAG(compression_enabled) &&
       EAG(compress_content) &&
       !SG(headers_sent) &&
-      zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void **) &server_vars) == SUCCESS &&
-      Z_TYPE_PP(server_vars) == IS_ARRAY &&
-      zend_hash_find(Z_ARRVAL_PP(server_vars), "HTTP_ACCEPT_ENCODING", sizeof("HTTP_ACCEPT_ENCODING"), (void **) &encoding)==SUCCESS &&
-      Z_TYPE_PP(encoding) == IS_STRING) {
+      zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), &server_vars.ptr) == SUCCESS &&
+      Z_TYPE_PP(server_vars.v) == IS_ARRAY &&
+      zend_hash_find(Z_ARRVAL_PP(server_vars.v), "HTTP_ACCEPT_ENCODING", sizeof("HTTP_ACCEPT_ENCODING"), &encoding.ptr)==SUCCESS &&
+      Z_TYPE_PP(encoding.v) == IS_STRING) {
     char* zkey = NULL;
     char* enc = NULL;
     int   zkey_len = 0;
-    if (strstr(Z_STRVAL_PP(encoding),"x-gzip")) {
+    if (strstr(Z_STRVAL_PP(encoding.v),"x-gzip")) {
       zkey_len = sizeof("gzip_") + key_len - 1;
       zkey = emalloc(zkey_len+1);
       memcpy(zkey,"gzip_",sizeof("gzip_")-1);
       memcpy(zkey+sizeof("gzip_")-1,key,key_len+1);
       enc = "Content-Encoding: x-gzip";
-    } else if (strstr(Z_STRVAL_PP(encoding),"gzip")) {
+    } else if (strstr(Z_STRVAL_PP(encoding.v),"gzip")) {
       zkey_len = sizeof("gzip_") + key_len - 1;
       zkey = emalloc(zkey_len+1);
       memcpy(zkey,"gzip_",sizeof("gzip_")-1);
       memcpy(zkey+sizeof("gzip_")-1,key,key_len+1);
       enc = "Content-Encoding: gzip";
-    } else if (strstr(Z_STRVAL_PP(encoding),"deflate")) {
+    } else if (strstr(Z_STRVAL_PP(encoding.v),"deflate")) {
       zkey_len = sizeof("deflate_") + key_len - 1;
       zkey = emalloc(zkey_len+1);
       memcpy(zkey,"deflate_",sizeof("deflate_")-1);
Index: encoder.c
===================================================================
--- encoder.c	(revision 199)
+++ encoder.c	(working copy)
@@ -249,26 +249,27 @@
       }
       allow = 1;
     } else if (allow && ch == '_') {
+      size_t result = 0;
       label[0] = ch = fgetc(yyin);
       if (ch == EOF) {break;}
       if (ch == '_') {
         label[1] = ch = fgetc(yyin);
-        if (ch == EOF) {fwrite(label,1,1,yyout); break;}
+        if (ch == EOF) {result = fwrite(label,1,1,yyout); break;}
         if (IEQ('f')) {
           label[2] = ch = fgetc(yyin);
-          if (ch == EOF) {fwrite(label,2,1,yyout); break;}
+          if (ch == EOF) {result = fwrite(label,2,1,yyout); break;}
           if (IEQ('i')) {
             label[3] = ch = fgetc(yyin);
-            if (ch == EOF) {fwrite(label,3,1,yyout); break;}
+            if (ch == EOF) {result = fwrite(label,3,1,yyout); break;}
             if (IEQ('l')) {
               label[4] = ch = fgetc(yyin);
-              if (ch == EOF) {fwrite(label,4,1,yyout); break;}
+              if (ch == EOF) {result = fwrite(label,4,1,yyout); break;}
               if (IEQ('e')) {
                 label[5] = ch = fgetc(yyin);
-                if (ch == EOF) {fwrite(label,5,1,yyout); break;}
+                if (ch == EOF) {result = fwrite(label,5,1,yyout); break;}
                 if (ch == '_') {
                   label[6] = ch = fgetc(yyin);
-                  if (ch == EOF) {fwrite(label,6,1,yyout); break;}
+                  if (ch == EOF) {result = fwrite(label,6,1,yyout); break;}
                   if (ch == '_') {
                     ch = fgetc(yyin);
                     repeat = 1;
@@ -277,40 +278,40 @@
                         (ch >= '0' && ch <= '9') ||
                         (ch >= '\x7f' && ch <= '\xff') ||
                         ch == '_') {
-                      fwrite(label,7,1,yyout);
+                      result = fwrite(label,7,1,yyout);
                     } else {
                       fputs("eaccelerator_loader_file()",yyout);
                     }
                   } else {
-                    fwrite(label,7,1,yyout);
+                    result = fwrite(label,7,1,yyout);
                   }
                 } else {
-                  fwrite(label,6,1,yyout);
+                  result = fwrite(label,6,1,yyout);
                 }
               } else {
-                fwrite(label,5,1,yyout);
+                result = fwrite(label,5,1,yyout);
               }
             } else {
-              fwrite(label,4,1,yyout);
+              result = fwrite(label,4,1,yyout);
             }
           } else {
-            fwrite(label,3,1,yyout);
+            result = fwrite(label,3,1,yyout);
           }
         } else if (IEQ('l')) {
           label[2] = ch = fgetc(yyin);
-          if (ch == EOF) {fwrite(label,2,1,yyout); break;}
+          if (ch == EOF) {result = fwrite(label,2,1,yyout); break;}
           if (IEQ('i')) {
             label[3] = ch = fgetc(yyin);
-            if (ch == EOF) {fwrite(label,3,1,yyout); break;}
+            if (ch == EOF) {result = fwrite(label,3,1,yyout); break;}
             if (IEQ('n')) {
               label[4] = ch = fgetc(yyin);
-              if (ch == EOF) {fwrite(label,4,1,yyout); break;}
+              if (ch == EOF) {result = fwrite(label,4,1,yyout); break;}
               if (IEQ('e')) {
                 label[5] = ch = fgetc(yyin);
-                if (ch == EOF) {fwrite(label,5,1,yyout); break;}
+                if (ch == EOF) {result = fwrite(label,5,1,yyout); break;}
                 if (ch == '_') {
                   label[6] = ch = fgetc(yyin);
-                  if (ch == EOF) {fwrite(label,6,1,yyout); break;}
+                  if (ch == EOF) {result = fwrite(label,6,1,yyout); break;}
                   if (ch == '_') {
                     ch = fgetc(yyin);
                     repeat = 1;
@@ -319,30 +320,30 @@
                         (ch >= '0' && ch <= '9') ||
                         (ch >= '\x7f' && ch <= '\xff') ||
                         ch == '_') {
-                      fwrite(label,7,1,yyout);
+                      result = fwrite(label,7,1,yyout);
                     } else {
                       fputs("eaccelerator_loader_line()",yyout);
                     }
                   } else {
-                    fwrite(label,7,1,yyout);
+                    result = fwrite(label,7,1,yyout);
                   }
                 } else {
-                  fwrite(label,6,1,yyout);
+                  result = fwrite(label,6,1,yyout);
                 }
               } else {
-                fwrite(label,5,1,yyout);
+                result = fwrite(label,5,1,yyout);
               }
             } else {
-              fwrite(label,4,1,yyout);
+              result = fwrite(label,4,1,yyout);
             }
           } else {
-            fwrite(label,3,1,yyout);
+            result = fwrite(label,3,1,yyout);
           }
         } else {
-          fwrite(label,2,1,yyout);
+          result = fwrite(label,2,1,yyout);
         }
       } else {
-        fwrite(label,1,1,yyout);
+        result = fwrite(label,1,1,yyout);
       }
       allow = 0;
     } else if ((ch >= 'a' && ch <= 'z') ||
@@ -694,9 +695,11 @@
 
 static void encode_class_entry(zend_class_entry* from);
 
+/* not used 
 static void encode_class_entry_ptr(zend_class_entry** from) {
   encode_class_entry(*from);
 }
+*/
 #endif
 
 static void encode_hash(HashTable* from, encode_bucket_t encode_bucket) {
@@ -718,6 +721,7 @@
   }
 }
 
+/* not used 
 #ifdef ZEND_ENGINE_2
 #define encode_zval_hash_ex(from,p) encode_hash_ex(from, p, (encode_bucket_t)encode_zval_ptr)
 
@@ -744,6 +748,7 @@
   }
 }
 #endif
+*/
 
 static void encode_op(zend_op_array* from, zend_op* opline, unsigned int ops) {
     encode(opline->opcode);
@@ -1182,11 +1187,12 @@
 				}
 				if (prefix != NULL)
 				{
+                    size_t result = 0;
 					prefix->type = IS_STRING;
 					prefix->value.str.len = pos;
 					prefix->value.str.val = emalloc(pos+1);
 					rewind(src_fp);
-					fread(prefix->value.str.val, pos, 1, src_fp);
+					result = fread(prefix->value.str.val, pos, 1, src_fp);
 					prefix->value.str.val[prefix->value.str.len] = '\000';
 				}
 			}
@@ -1203,9 +1209,10 @@
 				FILE *tmp_fp = tmpfile();
 				if (tmp_fp)
 				{
+                    size_t result = 0;
 					if (pre_content_len > 0)
 					{
-						fwrite(pre_content, pre_content_len, 1, tmp_fp);
+                        result = fwrite(pre_content, pre_content_len, 1, tmp_fp);
 					}
 #ifndef WITHOUT_FILE_FILTER
 					filter_file(src_fp, tmp_fp TSRMLS_CC);
@@ -1219,7 +1226,7 @@
 #endif
 					if (post_content_len > 0)
 					{
-						fwrite(post_content, post_content_len, 1, tmp_fp);
+						result = fwrite(post_content, post_content_len, 1, tmp_fp);
 					}
 					rewind(tmp_fp);
 					fclose(src_fp);
Index: eaccelerator.c
===================================================================
--- eaccelerator.c	(revision 199)
+++ eaccelerator.c	(working copy)
@@ -349,6 +349,7 @@
          (v3 & 0xff);
 }
 
+/* This function isn't used. So disable it for now
 static void decode_version(char *version, int v) {
   int t = (v & 0x000f00) >> 8;
   char c;
@@ -363,7 +364,8 @@
                                      (v & 0x0ff000) >> 12,
                                      c,
                                      (v & 0x0000ff));
-}
+} 
+*/
 
 #ifdef EACCELERATOR_USE_INODE
 static int eaccelerator_inode_key(char* s, dev_t dev, ino_t ino TSRMLS_DC) {
@@ -1033,6 +1035,7 @@
   return ok;
 }
 
+#ifndef EACCELERATOR_USE_INODE
 static char* eaccelerator_realpath(const char* name, char* realname TSRMLS_DC) {
 /* ???TODO it is possibe to cache name->realname mapping to avoid lstat() calls */
 #if ZEND_MODULE_API_NO >= 20001222
@@ -1041,6 +1044,7 @@
   return V_REALPATH(name, realname);
 #endif
 }
+#endif
 
 static int eaccelerator_stat(zend_file_handle *file_handle,
                         char* realname, struct stat* buf TSRMLS_DC) {
@@ -1226,7 +1230,9 @@
   int   nreloads;
   time_t compile_time;
   int stat_result = 0;
+#ifdef DEBUG
   struct timeval tv_start;
+#endif
 
 #ifdef EACCELERATOR_USE_INODE
   realname[0] = '\000';
@@ -2095,21 +2101,28 @@
 	/* Storing Host Name */
 	EAG(hostname)[0] = '\000';
 	{
-		zval  **server_vars, **hostname;
+        union {
+            zval **v;
+            void *ptr;
+        } server_vars;
+        union {
+            zval **v;
+            void *ptr;
+        } hostname;
 
-		if (zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void **) &server_vars) == SUCCESS &&
-			Z_TYPE_PP(server_vars) == IS_ARRAY &&
-			zend_hash_find(Z_ARRVAL_PP(server_vars), "SERVER_NAME", sizeof("SERVER_NAME"), (void **) &hostname)==SUCCESS &&
-			Z_TYPE_PP(hostname) == IS_STRING &&
-			Z_STRLEN_PP(hostname) > 0)
+		if (zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), &server_vars.ptr) == SUCCESS &&
+			Z_TYPE_PP(server_vars.v) == IS_ARRAY &&
+			zend_hash_find(Z_ARRVAL_PP(server_vars.v), "SERVER_NAME", sizeof("SERVER_NAME"), &hostname.ptr)==SUCCESS &&
+			Z_TYPE_PP(hostname.v) == IS_STRING &&
+			Z_STRLEN_PP(hostname.v) > 0)
 		{
-			if (sizeof(EAG(hostname)) > Z_STRLEN_PP(hostname))
+			if (sizeof(EAG(hostname)) > Z_STRLEN_PP(hostname.v))
 			{
-				memcpy(EAG(hostname),Z_STRVAL_PP(hostname),Z_STRLEN_PP(hostname)+1);
+				memcpy(EAG(hostname),Z_STRVAL_PP(hostname.v),Z_STRLEN_PP(hostname.v)+1);
 			}
 			else
 			{
-				memcpy(EAG(hostname),Z_STRVAL_PP(hostname),sizeof(EAG(hostname))-1);
+				memcpy(EAG(hostname),Z_STRVAL_PP(hostname.v),sizeof(EAG(hostname))-1);
 				EAG(hostname)[sizeof(EAG(hostname))-1] = '\000';
 			}
 		}


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Mar 2006 11:05:06 -0000	1.5
+++ .cvsignore	11 Apr 2006 16:43:01 -0000	1.6
@@ -1 +1 @@
-eaccelerator-svn200603090012.tar.gz
+eaccelerator-0.9.5-beta2.tar.bz2


Index: php-eaccelerator.spec
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/devel/php-eaccelerator.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- php-eaccelerator.spec	14 Mar 2006 12:08:27 -0000	1.10
+++ php-eaccelerator.spec	11 Apr 2006 16:43:01 -0000	1.11
@@ -1,8 +1,9 @@
 %define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4)
-%{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo 4.4.1)}
+%define php_apiver %(cd %{_tmppath}; echo PHP_API_VERSION | %{__cc} -E --include=php.h `php-config --includes` - | tail -1)
+%{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo 5.1.2)}
 
-%define module_version 0.9.3
-%define prever         svn200603090012
+%define module_version 0.9.5
+%define prever         beta2
 
 # This is the apache userid, only used for sysvipc semaphores which is the
 # default on ppc since spinlock is not detected
@@ -11,14 +12,16 @@
 Summary: PHP accelerator, optimizer, encoder and dynamic content cacher
 Name: php-eaccelerator
 Version: %{php_version}_%{module_version}
-Release: 0.3%{?dist}
+Release: 0.1.%{prever}%{?dist}
 License: GPL
 Group: Development/Languages
 URL: http://eaccelerator.sourceforge.net/
-#Source: http://dl.sf.net/eaccelerator/eaccelerator-%{module_version}.tar.gz
-Source: http://snapshots.eaccelerator.net/eaccelerator-%{prever}.tar.gz
+Source: http://dl.sf.net/eaccelerator/eaccelerator-%{module_version}-%{prever}.tar.bz2
+Patch0: eaccelerator-0.9.5-beta2-compile.patch
+Patch1: eaccelerator-0.9.5-beta2-64bit_cast_warning.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: php = %{php_version}
+Requires: php-api = %{php_apiver}
+#Requires: php = %{php_version}
 Provides: php-zend_extension
 Conflicts: php-mmcache
 BuildRequires: php, php-devel
@@ -32,22 +35,17 @@
 
 
 %prep
-#setup -n eaccelerator-%{module_version}
-%setup -n eaccelerator-%{prever}
+%setup -n eaccelerator-%{module_version}-%{prever}
+%patch0 -p0
+%patch1 -p0
 
 
 %build
 phpize
-%configure \
-%ifarch ppc
-    --with-eaccelerator-userid="%{userid}"
-%endif
-# Set fcntl based semaphores to avoid ipc based locking issues on x86_64
-%ifarch x86_64
-%{__perl} -pi -e 's|.*(MM_SEM_[A-Z]+).*|/* #undef $1 */|g' config.h
-%{__perl} -pi -e 's|.*(MM_SEM_FCNTL).*|#define $1 1|g' config.h
-%endif
-# Compile!
+%configure
+#ifarch ppc
+#   --with-eaccelerator-userid="%{userid}"
+#endif
 %{__make} %{?_smp_mflags}
 
 
@@ -97,6 +95,9 @@
 
 
 %changelog
+* Tue Apr 11 2006 Matthias Saou <http://freshrpms.net/> 5.1.2_0.9.5-0.1.beta2
+- Update to 0.9.5-beta2.
+
 * Tue Mar 14 2006 Matthias Saou <http://freshrpms.net/> 5.1.x_0.9.3-0.3
 - Pass userid 48 to configure script on PPC for sysvipc semaphores.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Mar 2006 11:05:06 -0000	1.5
+++ sources	11 Apr 2006 16:43:01 -0000	1.6
@@ -1 +1 @@
-762cb56c56190186e5e9a46b2fd2798d  eaccelerator-svn200603090012.tar.gz
+2516b680ce372765d24e7b64003f1e64  eaccelerator-0.9.5-beta2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Apr 11 16:55:14 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 11 Apr 2006 09:55:14 -0700
Subject: rpms/python-fpconst - New directory
Message-ID: <200604111655.k3BGtGKV020893@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/python-fpconst
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20867/python-fpconst

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




From fedora-extras-commits at redhat.com  Tue Apr 11 16:55:15 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 11 Apr 2006 09:55:15 -0700
Subject: rpms/python-fpconst/devel - New directory
Message-ID: <200604111655.k3BGtHPs020896@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/python-fpconst/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20867/python-fpconst/devel

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




From fedora-extras-commits at redhat.com  Tue Apr 11 16:55:29 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 11 Apr 2006 09:55:29 -0700
Subject: rpms/python-fpconst Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604111655.k3BGtVdG020945@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/python-fpconst
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20912

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-fpconst


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

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

common : CVS/Root
	@cvs 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 Apr 11 16:55:30 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 11 Apr 2006 09:55:30 -0700
Subject: rpms/python-fpconst/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604111655.k3BGtWhF020948@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/python-fpconst/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20912/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-fpconst


--- 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 Apr 11 16:55:54 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 11 Apr 2006 09:55:54 -0700
Subject: rpms/python-fpconst import.log,1.1,1.2
Message-ID: <200604111655.k3BGturO021009@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/python-fpconst
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20976

Modified Files:
	import.log 
Log Message:
auto-import python-fpconst-0.7.2-1 on branch devel from python-fpconst-0.7.2-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-fpconst/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Apr 2006 16:55:29 -0000	1.1
+++ import.log	11 Apr 2006 16:55:54 -0000	1.2
@@ -0,0 +1 @@
+python-fpconst-0_7_2-1:HEAD:python-fpconst-0.7.2-1.src.rpm:1144774546



From fedora-extras-commits at redhat.com  Tue Apr 11 16:55:54 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 11 Apr 2006 09:55:54 -0700
Subject: rpms/python-fpconst/devel python-fpconst.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604111655.k3BGtuLA021014@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/python-fpconst/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20976/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-fpconst.spec 
Log Message:
auto-import python-fpconst-0.7.2-1 on branch devel from python-fpconst-0.7.2-1.src.rpm


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

Name:           python-fpconst
Version:        0.7.2
Release:        1%{?dist}
Summary:        A Python module for handling IEEE 754 floating point special values
Group:          Development/Languages
License:        Apache Software License
URL:            http://research.warnes.net/projects/RStatServer/fpconst/
Source0:        http://research.warnes.net/~warnes/fpconst/fpconst-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:   	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")

%description
This python module implements constants and functions for working with
IEEE754 double-precision special values.  It provides constants for
Not-a-Number (NaN), Positive Infinity (PosInf), and Negative Infinity
(NegInf), as well as functions to test for these values.

%prep
%setup -q -n fpconst-%{version}
chmod -x README pep-0754.txt

%build
CFLAGS="%{optflags}" %{__python} setup.py build

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

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc CHANGELOG COPYING README pep-0754.txt
%{python_sitelib}/*.py
%{python_sitelib}/*.pyc
%ghost %{python_sitelib}/*.pyo

%changelog
* Sat Mar 18 2006 Christopher Stone <chris.stone at gmail.com> 0.7.2-1
- Initial Release of python-fpconst, changes from fpconst include:
- Renamed package from fpconst to python-fpconst
- Removed macros in URL
- Removed python-devel from BR
- Droped the second paragraph in %description
- Droped PKG-INFO from %doc
- Added pep-0754.txt to %doc


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-fpconst/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Apr 2006 16:55:30 -0000	1.1
+++ .cvsignore	11 Apr 2006 16:55:54 -0000	1.2
@@ -0,0 +1 @@
+fpconst-0.7.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-fpconst/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Apr 2006 16:55:30 -0000	1.1
+++ sources	11 Apr 2006 16:55:54 -0000	1.2
@@ -0,0 +1 @@
+0c194744ab60f3301dfda2da9f7c4068  fpconst-0.7.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 16:57:47 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 11 Apr 2006 09:57:47 -0700
Subject: rpms/php-eaccelerator/devel php-eaccelerator.spec,1.11,1.12
Message-ID: <200604111657.k3BGvn7k021065@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/php-eaccelerator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21048

Modified Files:
	php-eaccelerator.spec 
Log Message:
Additional configure parameter for ppc, required.



Index: php-eaccelerator.spec
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/devel/php-eaccelerator.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- php-eaccelerator.spec	11 Apr 2006 16:43:01 -0000	1.11
+++ php-eaccelerator.spec	11 Apr 2006 16:57:47 -0000	1.12
@@ -42,10 +42,11 @@
 
 %build
 phpize
-%configure
-#ifarch ppc
-#   --with-eaccelerator-userid="%{userid}"
-#endif
+%configure \
+%ifarch ppc
+%   --with-eaccelerator-userid="%{userid}"
+%endif
+
 %{__make} %{?_smp_mflags}
 
 



From fedora-extras-commits at redhat.com  Tue Apr 11 17:06:23 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 11 Apr 2006 10:06:23 -0700
Subject: owners owners.list,1.834,1.835
Message-ID: <200604111706.k3BH6Pms023186@cvs-int.fedora.redhat.com>

Author: xulchris

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

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.834
retrieving revision 1.835
diff -u -r1.834 -r1.835
--- owners.list	11 Apr 2006 15:42:41 -0000	1.834
+++ owners.list	11 Apr 2006 17:06:23 -0000	1.835
@@ -1212,6 +1212,7 @@
 Fedora Extras|python-enchant|Python bindings for Enchant spellchecking library|roozbeh at farsiweb.info|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.|ivazquez at ivazquez.net|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|
 Fedora Extras|python-GeoIP|Python bindings for the GeoIP geographical lookup libraries|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-goopy|Google Python Utilities|pjones at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-HTMLgen|A class library for the generation of HTML documents|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Apr 11 17:16:07 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 11 Apr 2006 10:16:07 -0700
Subject: rpms/perl-HTML-TableExtract - New directory
Message-ID: <200604111716.k3BHG98e023296@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/perl-HTML-TableExtract
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23270/perl-HTML-TableExtract

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




From fedora-extras-commits at redhat.com  Tue Apr 11 17:16:07 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 11 Apr 2006 10:16:07 -0700
Subject: rpms/perl-HTML-TableExtract/devel - New directory
Message-ID: <200604111716.k3BHG95k023299@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/perl-HTML-TableExtract/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23270/perl-HTML-TableExtract/devel

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




From fedora-extras-commits at redhat.com  Tue Apr 11 17:16:14 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 11 Apr 2006 10:16:14 -0700
Subject: rpms/perl-HTML-TableExtract Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604111716.k3BHGHYJ023348@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/perl-HTML-TableExtract
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23315

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


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

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

common : CVS/Root
	@cvs 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 Apr 11 17:16:15 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 11 Apr 2006 10:16:15 -0700
Subject: rpms/perl-HTML-TableExtract/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200604111716.k3BHGH9e023351@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/perl-HTML-TableExtract/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23315/devel

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


--- 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 Apr 11 17:16:35 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 11 Apr 2006 10:16:35 -0700
Subject: rpms/perl-HTML-TableExtract import.log,1.1,1.2
Message-ID: <200604111717.k3BHH71u023420@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/perl-HTML-TableExtract
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23379

Modified Files:
	import.log 
Log Message:
auto-import perl-HTML-TableExtract-2.07-2 on branch devel from perl-HTML-TableExtract-2.07-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-TableExtract/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Apr 2006 17:16:14 -0000	1.1
+++ import.log	11 Apr 2006 17:16:35 -0000	1.2
@@ -0,0 +1 @@
+perl-HTML-TableExtract-2_07-2:HEAD:perl-HTML-TableExtract-2.07-2.src.rpm:1144775780



From fedora-extras-commits at redhat.com  Tue Apr 11 17:16:36 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 11 Apr 2006 10:16:36 -0700
Subject: rpms/perl-HTML-TableExtract/devel perl-HTML-TableExtract.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604111717.k3BHH8e7023426@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/perl-HTML-TableExtract/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23379/devel

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


--- NEW FILE perl-HTML-TableExtract.spec ---
Name:           perl-HTML-TableExtract
Version:        2.07
Release: 	2
Summary:        A Perl module for extracting content in HTML tables
Group:          Development/Libraries
License:        Artistic or GPL
URL:		http://www.mojotoad.com/sisk/projects/HTML-TableExtract/
Source0:        http://search.cpan.org/CPAN/authors/id/M/MS/MSISK/HTML-TableExtract-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildRequires:	perl(HTML::TreeBuilder) perl(Test::Pod) perl(Test::Pod::Coverage)

%description
HTML::TableExtract is a module that simplifies the extraction of
information contained in tables within HTML documents.

Tables of note may be specified using Headers, Depth, Count,
Attributes, or some combination of the three. See the module
documentation for details.

%prep
%setup -q -n HTML-TableExtract-%{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
make test

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/HTML/
%{_mandir}/man3/*.3*


%changelog
* Mon Apr 10 2006 Bill Nottingham <notting at redhat.com> - 2.07-2
- add some buildprereqs for testing

* Fri Apr  7 2006 Bill Nottingham <notting at redhat.com> - 2.07-1
- initial packaging



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-TableExtract/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Apr 2006 17:16:15 -0000	1.1
+++ .cvsignore	11 Apr 2006 17:16:36 -0000	1.2
@@ -0,0 +1 @@
+HTML-TableExtract-2.07.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-TableExtract/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Apr 2006 17:16:15 -0000	1.1
+++ sources	11 Apr 2006 17:16:36 -0000	1.2
@@ -0,0 +1 @@
+ad3ddfb3e25826071d1e52e336862438  HTML-TableExtract-2.07.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 17:17:36 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 11 Apr 2006 10:17:36 -0700
Subject: rpms/perl-Finance-Quote - New directory
Message-ID: <200604111717.k3BHHc2G023527@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/perl-Finance-Quote
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23501/perl-Finance-Quote

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




From fedora-extras-commits at redhat.com  Tue Apr 11 17:17:36 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 11 Apr 2006 10:17:36 -0700
Subject: rpms/perl-Finance-Quote/devel - New directory
Message-ID: <200604111717.k3BHHcx8023530@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/perl-Finance-Quote/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23501/perl-Finance-Quote/devel

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




From fedora-extras-commits at redhat.com  Tue Apr 11 17:17:44 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 11 Apr 2006 10:17:44 -0700
Subject: rpms/perl-Finance-Quote Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604111717.k3BHHk5Y023579@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/perl-Finance-Quote
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23546

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


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

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

common : CVS/Root
	@cvs 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 Apr 11 17:17:44 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 11 Apr 2006 10:17:44 -0700
Subject: rpms/perl-Finance-Quote/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200604111717.k3BHHkSK023582@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/perl-Finance-Quote/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23546/devel

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


--- 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 Apr 11 17:17:58 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 11 Apr 2006 10:17:58 -0700
Subject: rpms/perl-Finance-Quote/devel perl-Finance-Quote.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604111718.k3BHI0Mq023630@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/perl-Finance-Quote/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23610/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Finance-Quote.spec 
Log Message:
auto-import perl-Finance-Quote-1.11-3 on branch devel from perl-Finance-Quote-1.11-3.src.rpm


--- NEW FILE perl-Finance-Quote.spec ---
Name:           perl-Finance-Quote
Version:        1.11
Release: 	3
Summary:        A Perl module that retrieves stock and mutual fund quotes
Group:          Development/Libraries
License:        GPL
URL:		http://finance-quote.sourceforge.net/
Source0:	http://search.cpan.org/CPAN/authors/id/P/PJ/PJF/Finance-Quote-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildRequires:	perl(HTML::TableExtract)

%description
This module retrieves stock and mutual fund quotes from various exchanges
using various source.

%prep
%setup -q -n Finance-Quote-%{version} 
find . -name *.pm | xargs %{__sed} -i -e '/^#!.*\/usr\/bin\/perl/d'

%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
make test

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog* Documentation/*
%{perl_vendorlib}/Finance/
%{_mandir}/man3/*.3*


%changelog
* Mon Apr 10 2006 Bill Nottingham <notting at redhat.com> - 1.11-3
- add buildreq for perl-HTML-TableExtract
- clean up sed

* Mon Apr 10 2006 Bill Nottingham <notting at redhat.com> - 1.11-2
- clean up spec file

* Fri Apr  7 2006 Bill Nottingham <notting at redhat.com> - 1.11-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Finance-Quote/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Apr 2006 17:17:44 -0000	1.1
+++ .cvsignore	11 Apr 2006 17:17:58 -0000	1.2
@@ -0,0 +1 @@
+Finance-Quote-1.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Finance-Quote/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Apr 2006 17:17:44 -0000	1.1
+++ sources	11 Apr 2006 17:17:58 -0000	1.2
@@ -0,0 +1 @@
+1fd84f6524ca6e470272c94d8de441bd  Finance-Quote-1.11.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 17:18:28 2006
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Tue, 11 Apr 2006 10:18:28 -0700
Subject: rpms/ratpoison/FC-5 ratpoison.spec,1.3,1.4
Message-ID: <200604111718.k3BHIUnP023680@cvs-int.fedora.redhat.com>

Author: jwb

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

Modified Files:
	ratpoison.spec 
Log Message:
BuildRequires fixes for FC-5



Index: ratpoison.spec
===================================================================
RCS file: /cvs/extras/rpms/ratpoison/FC-5/ratpoison.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ratpoison.spec	9 Apr 2006 17:55:29 -0000	1.3
+++ ratpoison.spec	11 Apr 2006 17:18:28 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           ratpoison
 Version:        1.4.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Minimalistic window manager
 Group:          Applications/Productivity
 License:        GPL
@@ -10,10 +10,10 @@
 Source0:        http://savannah.nongnu.org/download/ratpoison/%{name}-%{version}.tar.gz
 Source1:	%{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if %{fedora} <= 4 
+%if "%{fedora}" <= "4" 
 BuildRequires:  xorg-x11-devel, readline-devel
 %else
-BuildRequires: libX11-devel, readline-devel, libXtst-devel
+BuildRequires: libX11-devel, readline-devel, libXt-devel, libXinerama-devel, libXtst-devel
 %endif
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -66,6 +66,9 @@
 %{_datadir}/xsessions/ratpoison.desktop
 
 %changelog
+* Tue Apr 11 2006 John Berninger <johnw at berningeronline dot net> - 1.4.0-4
+- BuildRequires fixes for FC-5
+
 * Sat Apr  8 2006 John Berninger <johnw at berningeronline dot net> - 1.4.0-3
 - Permissions fixes
 



From fedora-extras-commits at redhat.com  Tue Apr 11 17:21:41 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Tue, 11 Apr 2006 10:21:41 -0700
Subject: owners owners.list,1.835,1.836
Message-ID: <200604111721.k3BHLh9a023747@cvs-int.fedora.redhat.com>

Author: pfj

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

Modified Files:
	owners.list 
Log Message:

Changed gonvert to reflect change of ownership
 	owners.list 



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.835
retrieving revision 1.836
diff -u -r1.835 -r1.836
--- owners.list	11 Apr 2006 17:06:23 -0000	1.835
+++ owners.list	11 Apr 2006 17:21:41 -0000	1.836
@@ -384,7 +384,7 @@
 Fedora Extras|gnupg2|GNU utility for secure communication and data storage|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|gobby|A free collaborative editor|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|goffice|Goffice support libraries|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
-Fedora Extras|gonvert|Units conversion utility|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|gonvert|Units conversion utility|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|gossip|Gnome Jabber Client|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|gourmet|PyGTK Recipe Manager|mpeters at mac.com|extras-qa at fedoraproject.org|
 Fedora Extras|gpa|Graphical user interface for GnuPG|rdieter at math.unl.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Apr 11 17:26:59 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 11 Apr 2006 10:26:59 -0700
Subject: rpms/libtunepimp/FC-4 .cvsignore,1.2,1.3 libtunepimp.spec,1.4,1.5
Message-ID: <200604111727.k3BHR1LF023824@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore libtunepimp.spec 
Log Message:
cosmetic changes (sync'd with -devel branch)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Nov 2005 19:14:31 -0000	1.2
+++ .cvsignore	11 Apr 2006 17:26:59 -0000	1.3
@@ -1 +1 @@
-libtunepimp-0.4.0.tar.gz
+libtunepimp-0.4.2.tar.gz


Index: libtunepimp.spec
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/FC-4/libtunepimp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libtunepimp.spec	16 Mar 2006 18:08:47 -0000	1.4
+++ libtunepimp.spec	11 Apr 2006 17:26:59 -0000	1.5
@@ -11,8 +11,6 @@
 Source:	 http://ftp.musicbrainz.org/pub/musicbrainz/libtunepimp-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#Patch1:  libtunepimp-0.4.0-gcc41.patch
-
 BuildRequires: readline-devel
 BuildRequires: libvorbis-devel
 BuildRequires: flac-devel
@@ -43,8 +41,6 @@
 %prep
 %setup -q
 
-#patch1 -p1 -b .gcc41
-
 
 %build
 %configure \



From fedora-extras-commits at redhat.com  Tue Apr 11 17:29:16 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 11 Apr 2006 10:29:16 -0700
Subject: owners owners.list,1.836,1.837
Message-ID: <200604111729.k3BHTI93023852@cvs-int.fedora.redhat.com>

Author: notting

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

Modified Files:
	owners.list 
Log Message:
add perl-Finance-Quote, perl-HTML-TableExtract



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.836
retrieving revision 1.837
diff -u -r1.836 -r1.837
--- owners.list	11 Apr 2006 17:21:41 -0000	1.836
+++ owners.list	11 Apr 2006 17:29:15 -0000	1.837
@@ -942,6 +942,7 @@
 Fedora Extras|perl-File-Remove|Convenience module for removing files and directories|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Slurp|Efficient Reading/Writing of Complete Files|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Tail|Perl extension for reading from continously updated files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Finanace-Quote|A Perl module that retrieves stock and mutual fund quotes|notting at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Font-AFM|Perl interface to Adobe Font Metrics files|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Font-TTF|Perl interface to TrueType Font files|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-FreezeThaw|Convert Perl structures to strings and back|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -959,6 +960,7 @@
 Fedora Extras|perl-HTML-Format|HTML formatter modules|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Mason|HTML::Mason Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 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-Expr|Expression support extension for HTML::Template|ville.skytta at iki.fi|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-Tree|HTML tree handling modules for Perl|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Apr 11 17:32:49 2006
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Tue, 11 Apr 2006 10:32:49 -0700
Subject: rpms/ratpoison/devel ratpoison.spec,1.3,1.4
Message-ID: <200604111732.k3BHWpIW023931@cvs-int.fedora.redhat.com>

Author: jwb

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

Modified Files:
	ratpoison.spec 
Log Message:
BuildRequires fixes for FC-devel (FC-6)



Index: ratpoison.spec
===================================================================
RCS file: /cvs/extras/rpms/ratpoison/devel/ratpoison.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ratpoison.spec	9 Apr 2006 17:55:29 -0000	1.3
+++ ratpoison.spec	11 Apr 2006 17:32:49 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           ratpoison
 Version:        1.4.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Minimalistic window manager
 Group:          Applications/Productivity
 License:        GPL
@@ -13,7 +13,7 @@
 %if %{fedora} <= 4 
 BuildRequires:  xorg-x11-devel, readline-devel
 %else
-BuildRequires: libX11-devel, readline-devel, libXtst-devel
+BuildRequires: libX11-devel, readline-devel, libXt-devel, libXinerama-devel, libXtst-devel
 %endif
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -66,6 +66,9 @@
 %{_datadir}/xsessions/ratpoison.desktop
 
 %changelog
+* Tue Apr 11 2006 John Berninger <johnw at berningeronline dot net> - 1.4.0-4
+- BuildRequires fixes for FC-devel (FC-6)
+
 * Sat Apr  8 2006 John Berninger <johnw at berningeronline dot net> - 1.4.0-3
 - Permissions fixes
 



From fedora-extras-commits at redhat.com  Tue Apr 11 17:40:31 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 10:40:31 -0700
Subject: rpms/xfce4-clipman-plugin/FC-3 xfce4-clipman-plugin.spec,1.1,1.2
Message-ID: <200604111740.k3BHeXCW024005@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-clipman-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23988

Modified Files:
	xfce4-clipman-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-clipman-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-clipman-plugin/FC-3/xfce4-clipman-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-clipman-plugin.spec	16 Dec 2005 04:32:10 -0000	1.1
+++ xfce4-clipman-plugin.spec	11 Apr 2006 17:40:31 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-clipman-plugin
 Version:	0.4.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Clipboard manager plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 This is a simple cliboard history for Xfce panel. It includes a "Clear 
@@ -36,6 +37,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 17:42:18 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 10:42:18 -0700
Subject: rpms/xfce4-cpugraph-plugin/FC-3 xfce4-cpugraph-plugin.spec,1.1,1.2
Message-ID: <200604111742.k3BHgKEm024037@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-cpugraph-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24020

Modified Files:
	xfce4-cpugraph-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-cpugraph-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-cpugraph-plugin/FC-3/xfce4-cpugraph-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-cpugraph-plugin.spec	9 Dec 2005 22:52:48 -0000	1.1
+++ xfce4-cpugraph-plugin.spec	11 Apr 2006 17:42:17 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-cpugraph-plugin
 Version:	0.2.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	CPU monitor for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A CPU monitor plugin for the Xfce panel. It offers multiple display modes 
@@ -37,6 +38,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.2.2-5
+- Require xfce4-panel.
+
 * Mon Nov 28 2005 Christoph Wickert <fedora wickert at arcor de> - 0.2.2-4
 - Rebuild with new source because of md5sum mismatch.
 - Add libxfcegui4-devel BuildReqs.



From fedora-extras-commits at redhat.com  Tue Apr 11 17:43:52 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 10:43:52 -0700
Subject: rpms/xfce4-datetime-plugin/FC-3 xfce4-datetime-plugin.spec,1.2,1.3
Message-ID: <200604111743.k3BHhseL024077@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-datetime-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24060

Modified Files:
	xfce4-datetime-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-datetime-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-datetime-plugin/FC-3/xfce4-datetime-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-datetime-plugin.spec	9 Dec 2005 23:00:51 -0000	1.2
+++ xfce4-datetime-plugin.spec	11 Apr 2006 17:43:52 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-datetime-plugin
 Version:	0.3.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Date/time plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel  >= 4.2
 BuildRequires:	libxml2-devel, gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 An alternative clock plugin for the Xfce panel. A calendar appears when you 
@@ -38,6 +39,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-6
+- Require xfce4-panel.
+
 * Tue Nov 29 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-5
 - Add libxfcegui4-devel BuildReqs.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 17:45:19 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 10:45:19 -0700
Subject: rpms/xfce4-diskperf-plugin/FC-3 xfce4-diskperf-plugin.spec,1.1,1.2
Message-ID: <200604111745.k3BHjLju024112@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-diskperf-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24095

Modified Files:
	xfce4-diskperf-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-diskperf-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-diskperf-plugin/FC-3/xfce4-diskperf-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-diskperf-plugin.spec	28 Jan 2006 00:21:04 -0000	1.1
+++ xfce4-diskperf-plugin.spec	11 Apr 2006 17:45:19 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-diskperf-plugin
 Version:	1.5
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Disk performance plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 The DiskPerf plugin displays disk/partition performance (bytes transfered per
@@ -36,6 +37,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 1.5-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 1.5-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 17:47:15 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 10:47:15 -0700
Subject: rpms/xfce4-fsguard-plugin/FC-3 xfce4-fsguard-plugin.spec,1.1,1.2
Message-ID: <200604111747.k3BHlHU7024142@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-fsguard-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24125

Modified Files:
	xfce4-fsguard-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-fsguard-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-fsguard-plugin/FC-3/xfce4-fsguard-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-fsguard-plugin.spec	22 Jan 2006 23:36:42 -0000	1.1
+++ xfce4-fsguard-plugin.spec	11 Apr 2006 17:47:15 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-fsguard-plugin
 Version:	0.2.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Filesystem-Guard plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 A little Xfce plugin, which checks the free space on the chosen mountpoint 
@@ -40,6 +41,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.2.1-3
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.2.1-2
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 17:48:12 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 10:48:12 -0700
Subject: rpms/xfce4-genmon-plugin/FC-3 xfce4-genmon-plugin.spec,1.1,1.2
Message-ID: <200604111748.k3BHmEV6024187@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-genmon-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24170

Modified Files:
	xfce4-genmon-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-genmon-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-genmon-plugin/FC-3/xfce4-genmon-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-genmon-plugin.spec	9 Dec 2005 22:38:04 -0000	1.1
+++ xfce4-genmon-plugin.spec	11 Apr 2006 17:48:12 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-genmon-plugin
 Version:	1.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Generic monitor plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 The GenMon plugin cyclically spawns the indicated script/program,
@@ -36,6 +37,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 1.1-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 1.1-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 17:49:47 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 10:49:47 -0700
Subject: rpms/xfce4-minicmd-plugin/FC-3 xfce4-minicmd-plugin.spec,1.1,1.2
Message-ID: <200604111749.k3BHnnEj024215@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-minicmd-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24198

Modified Files:
	xfce4-minicmd-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-minicmd-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-minicmd-plugin/FC-3/xfce4-minicmd-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-minicmd-plugin.spec	15 Dec 2005 03:53:18 -0000	1.1
+++ xfce4-minicmd-plugin.spec	11 Apr 2006 17:49:47 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-minicmd-plugin
 Version:	0.3.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Mini command-line plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A mini command-line plugin for the Xfce panel. You can execute programs by 
@@ -38,6 +39,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 17:50:35 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 10:50:35 -0700
Subject: rpms/xfce4-modemlights-plugin/FC-3 xfce4-modemlights-plugin.spec,
	1.1, 1.2
Message-ID: <200604111750.k3BHobmi024243@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-modemlights-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24226

Modified Files:
	xfce4-modemlights-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-modemlights-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-modemlights-plugin/FC-3/xfce4-modemlights-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-modemlights-plugin.spec	15 Dec 2005 03:49:55 -0000	1.1
+++ xfce4-modemlights-plugin.spec	11 Apr 2006 17:50:35 -0000	1.2
@@ -1,6 +1,6 @@
 Name: 		xfce4-modemlights-plugin
 Version: 	0.1.1
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Summary: 	Modemlights for the XFCE panel
 
 Group: 		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A Xfce4 panel applet intended to simplify establishing a ppp connection via 
@@ -38,6 +39,9 @@
 %{_datadir}/xfce4/*
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.1.1-4
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.1.1-3
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 17:51:40 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 11 Apr 2006 10:51:40 -0700
Subject: rpms/Macaulay2/devel Macaulay2-0.9.8-cout.patch, NONE,
	1.1 Macaulay2-0.9.8-gcc4.patch, NONE,
	1.1 Macaulay2-0.9.8-htmlview.patch, NONE,
	1.1 Macaulay2-0.9.8-infodir.patch, NONE,
	1.1 Macaulay2-0.9.8-optflags.patch, NONE, 1.1 etags.sh, NONE,
	1.1 Macaulay2.desktop, 1.2, 1.3 Macaulay2.spec, 1.12,
	1.13 Macaulay2-0.9-htmlview.patch, 1.1,
	NONE Macaulay2-0.9-optimize.patch, 1.1,
	NONE Macaulay2-0.9.2-gcc3.patch, 1.1,
	NONE Macaulay2-0.9.2-gcc34.patch, 1.1,
	NONE Macaulay2-0.9.2-gcc4.patch, 1.1,
	NONE Macaulay2-0.9.2-static.patch, 1.1, NONE
Message-ID: <200604111751.k3BHpgg9024294@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	Macaulay2.desktop Macaulay2.spec 
Added Files:
	Macaulay2-0.9.8-cout.patch Macaulay2-0.9.8-gcc4.patch 
	Macaulay2-0.9.8-htmlview.patch Macaulay2-0.9.8-infodir.patch 
	Macaulay2-0.9.8-optflags.patch etags.sh 
Removed Files:
	Macaulay2-0.9-htmlview.patch Macaulay2-0.9-optimize.patch 
	Macaulay2-0.9.2-gcc3.patch Macaulay2-0.9.2-gcc34.patch 
	Macaulay2-0.9.2-gcc4.patch Macaulay2-0.9.2-static.patch 
Log Message:
* Tue Mar 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.8-0.2.cvs20060327
- 0.9.8 (cvs, no tarball yet)
- drop -doc subpkg (in main now)


Macaulay2-0.9.8-cout.patch:

--- NEW FILE Macaulay2-0.9.8-cout.patch ---
--- M2/Macaulay2/e/x_factor.cpp.std_namespace	2005-08-31 08:28:45.000000000 -0500
+++ M2/Macaulay2/e/x_factor.cpp	2006-02-10 13:24:34.000000000 -0600
@@ -31,10 +31,11 @@
 
 // debugging display routines to be called from gdb
 // needs factory to be configured without option --disable-streamio 
-void showvar(Variable &t) { cout << t << endl; }
-void showcf(CanonicalForm &t) { cout << t << endl; }
-void showcfl(CFList &t) { cout << t << endl; }
-void showcffl(CFFList &t) { cout << t << endl; }
+//using namespace std;
+//void showvar(Variable &t) { cout << t << endl; }
+//void showcf(CanonicalForm &t) { cout << t << endl; }
+//void showcfl(CFList &t) { cout << t << endl; }
+//void showcffl(CFFList &t) { cout << t << endl; }
 
 extern "C" {
   extern void factory_setup_2();

Macaulay2-0.9.8-gcc4.patch:

--- NEW FILE Macaulay2-0.9.8-gcc4.patch ---
--- M2/Macaulay2/e/linalgGB/MonomialSet.hpp.gcc4	2006-04-10 13:22:14.000000000 -0500
+++ M2/Macaulay2/e/linalgGB/MonomialSet.hpp	2006-04-10 13:22:32.000000000 -0500
@@ -16,7 +16,7 @@
   };
   
  public:
-  MonomialSet::MonomialSet();
+  MonomialSet();
   
   static MonomialSet *make();
 
--- M2/Macaulay2/e/Eschreyer.hpp.gcc4	2006-04-10 13:28:44.000000000 -0500
+++ M2/Macaulay2/e/Eschreyer.hpp	2006-04-10 13:29:02.000000000 -0500
@@ -53,7 +53,7 @@
   int find_divisor(const MonomialIdeal * mi, const int *exponents, int &result);
   // Returns the index of the least element in the monomial order which divides.
 
-  void GBKernelComputation::wipe_unneeded_terms(gbvector * & f);
+  void wipe_unneeded_terms(gbvector * & f);
   // removes every term of f which is not a lead term of some element of gb.
 
   gbvector * s_pair(gbvector * syz);
--- M2/Macaulay2/e/x_factor.cpp.gcc4	2006-04-10 13:35:25.000000000 -0500
+++ M2/Macaulay2/e/x_factor.cpp	2006-04-10 13:35:47.000000000 -0500
@@ -56,8 +56,8 @@
     __gmp_reallocate_func = save_gmp_reallocate_func;
     __gmp_free_func = save_gmp_free_func;
   }
-  enter_factory:: enter_factory() { enter(); }
-  enter_factory::~enter_factory() { exit(); }
+  enter_factory() { enter(); }
+  ~enter_factory() { exit(); }
 };
 
 struct enter_M2 { 
@@ -75,8 +75,8 @@
     __gmp_reallocate_func = save_gmp_reallocate_func;
     __gmp_free_func = save_gmp_free_func;
   }
-  enter_M2:: enter_M2() { enter(); }
-  enter_M2::~enter_M2() { exit(); }
+  enter_M2() { enter(); }
+  ~enter_M2() { exit(); }
 };
 
 static MP_INT toInteger(CanonicalForm h) {
--- M2/Macaulay2/e/mat-symm.cpp.gcc4	2006-04-10 13:34:41.000000000 -0500
+++ M2/Macaulay2/e/mat-symm.cpp	2006-04-10 13:34:54.000000000 -0500
@@ -4,7 +4,7 @@
 class SymmMatrix
 {
 public:
-  static MatrixOrNull * SymmMatrix::symmetricPower(const Matrix *m0, int p)
+  static MatrixOrNull * symmetricPower(const Matrix *m0, int p)
   {
     if (m0->n_rows() != 1)
       {
--- M2/Macaulay2/c/compat.h.gcc4	2003-11-12 08:22:54.000000000 -0600
+++ M2/Macaulay2/c/compat.h	2006-04-10 13:27:34.000000000 -0500
@@ -99,7 +99,11 @@
 int open(const char *, int, ...);
 #endif
 
-#ifdef __STDC__
+/* ifdef __STDC__ */
+/* the following doesn't compile on linux w/gcc-4.x, so 
+   maybe use some sun-specific define instead?  -- Rex
+*/
+#if 0
 int close(int);
 int fputs(const char *,FILE *); /* needed  for sunos 4.1 */
 int fprintf(FILE *,const char *,...); /* needed  for sunos 4.1 */

Macaulay2-0.9.8-htmlview.patch:

--- NEW FILE Macaulay2-0.9.8-htmlview.patch ---
--- M2/Macaulay2/bin/M2-help.htmlview	2005-03-13 20:00:26.000000000 -0600
+++ M2/Macaulay2/bin/M2-help	2006-03-28 08:50:07.000000000 -0600
@@ -1,2 +1,2 @@
 #! /bin/sh
-${WWBROWSER:-firefox} "$HOME/.Macaulay2/index.html"
+${WWBROWSER:-htmlview} "$HOME/.Macaulay2/index.html"

Macaulay2-0.9.8-infodir.patch:

--- NEW FILE Macaulay2-0.9.8-infodir.patch ---
--- M2/include/config.Makefile.in.infodir	2006-03-27 13:47:11.000000000 -0600
+++ M2/include/config.Makefile.in	2006-03-28 07:50:32.000000000 -0600
@@ -88,8 +88,8 @@
 
 binRelDir = bin
 libRelDir = lib
-infoRelDir = info
 dataRelDir = share
+infoRelDir = $(dataRelDir)/info
 manRelDir = $(dataRelDir)/man
 man1RelDir = $(manRelDir)/man1
 man3RelDir = $(manRelDir)/man3

Macaulay2-0.9.8-optflags.patch:

--- NEW FILE Macaulay2-0.9.8-optflags.patch ---
--- Macaulay2-0.9/include/config.Makefile.in_orig	Sun Sep  9 09:55:36 2001
+++ Macaulay2-0.9/include/config.Makefile.in	Mon Oct 29 11:01:53 2001
@@ -110,8 +110,8 @@
 CFLAGS   += -O3 -fexpensive-optimizations
 CXXFLAGS += -O3 -fexpensive-optimizations
 else
-CFLAGS   += -O0
-CXXFLAGS += -O0
+CFLAGS   +=
+CXXFLAGS += 
 endif
 endif
 


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

for ETAGS in etags.emacs etags ; do
 test -x /usr/bin/$ETAGS && exec $ETAGS ${1+"$@"}
done

exit 1


Index: Macaulay2.desktop
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/devel/Macaulay2.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Macaulay2.desktop	31 Mar 2006 13:00:38 -0000	1.2
+++ Macaulay2.desktop	11 Apr 2006 17:51:40 -0000	1.3
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Macaulay2
 Exec=M2
-Icon=Macaulay2.png
+Icon=Macaulay2
 SwallowTitle=Macaulay2
 Terminal=true
 Type=Application


Index: Macaulay2.spec
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/devel/Macaulay2.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Macaulay2.spec	10 Apr 2006 14:44:05 -0000	1.12
+++ Macaulay2.spec	11 Apr 2006 17:51:40 -0000	1.13
@@ -1,95 +1,98 @@
-# busted on x86_64 -- Rex
-# define m2home %{_libdir}/%{name}-%{version}
-# Makefiles hardcode "%prefix/lib" instead, ok?  -- Rex
-%define m2home %{_prefix}/lib/%{name}-%{version}
+
+%define beta cvs20060327
  
 Summary: System for algebraic geometry and commutative algebra
 Name:    Macaulay2
-Version: 0.9.2
-Release: 22%{?dist}
+Version: 0.9.8
+Release: 0.2.%{beta}%{?dist}
+
 License: GPL
 Group:   Applications/Engineering
 URL:     http://www.math.uiuc.edu/Macaulay2/
-Source:  http://www.math.uiuc.edu/Macaulay2/ftp-site/Macaulay2-0.9.2-src.tar.gz
+#Source:  http://www.math.uiuc.edu/Macaulay2/ftp-site/Macaulay2-0.9.5.beta.tar.gz
+Source:	 M2-0.9.8-%{beta}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1: Macaulay2.png
 Source2: Macaulay2.desktop
 
-Patch0: Macaulay2-0.9-optimize.patch
-Patch1: Macaulay2-0.9-htmlview.patch
-Patch2: Macaulay2-0.9.2-static.patch
-Patch3: Macaulay2-0.9.2-gcc3.patch
-Patch4: Macaulay2-0.9.2-gcc34.patch
-Patch5: Macaulay2-0.9.2-gcc4.patch
+Patch0: Macaulay2-0.9.8-optflags.patch
+Patch1: Macaulay2-0.9.8-htmlview.patch
+Patch2: Macaulay2-0.9.8-cout.patch
+Patch3: Macaulay2-0.9.8-infodir.patch
+Patch4: Macaulay2-0.9.8-gcc4.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: gc-devel
-BuildRequires: factory-devel >= 2.0.5
-BuildRequires: libfac-devel >= 2.0.5
+# See http://bugzilla.redhat.com/bugzilla/188499
+BuildRequires: ntl-devel
+BuildRequires: factory-devel 
+BuildRequires: libfac-devel 
+BuildRequires: lapack
+%if "%{?fedora}" > "3"
+BuildRequires: lapack-devel
+%endif
 BuildRequires: gdbm-devel
+BuildRequires: readline-devel
 BuildRequires: time
-#BuildRequires: lapack-devel
+BuildRequires: byacc 
+# /sbin/install-info
+BuildRequires: info
+# etags
+BuildRequires: emacs-common
+Source10: etags.sh
+# M2-help
+Requires: htmlview
+
+BuildRequires: automake
 
-Obsoletes: %{name}-emacs < %{version}-%{release}
-Provides:  %{name}-emacs = %{version}-%{release}
+Obsoletes: Macaulay2-docs < %{version}-%{release} 
+Provides:  Macaulay2-docs = %{version}-%{release}
+Obsoletes: Macaulay2-emacs < %{version}-%{release}
+Provides:  Macaulay2-emacs = %{version}-%{release}
 
 %description
 Macaulay 2 is a new software system devoted to supporting research in
 algebraic geometry and commutative algebra written by Daniel R. Grayson
 and Michael E. Stillman
 
-%package doc
-Summary: %{name} documentation
-Group: Documentation
-Requires: %{name} = %{version}
-Requires: htmlview
-%description doc
-%{name} documentation.
-
 
 %prep
-%setup -q
+%setup -q -n M2
 
-%patch0 -p1 -b .opt
+install -m755 %{SOURCE10} ./etags
+
+%patch0 -p1 -b .optflags
 %patch1 -p1 -b .htmlview
-%patch2 -p1 -b .static
-# fix gcc3 blocker, some warnings about use of deprecated headers
-%patch3 -p1 -b .gcc3
-# fc3/gcc34 fix
-%patch4 -p1 -b .gcc34
-# fc4/gcc4 fix
-%patch5 -p1 -b .gcc4
+%patch2 -p1 -b .cout
+%patch3 -p1 -b .infodir
+%patch4 -p1 -b .gcc4
 
 
 %build
 
+# We need /sbin:. in PATH to find install-info,etags
+export PATH=/sbin:`pwd`:$PATH
+
 %configure  \
   --disable-dumpdata \
-  --disable-optimize 
-
-#TODO: --with-lapacklibs 
+  --disable-optimize \
+  --disable-static \
+  --with-lapacklibs="-llapack"
 
+# Not smp-safe
 make 
 
 
 %check || :
-# NOTE: util/screen dies on fc5/buildsystem (could not open pty)
-#make check ||:
+# util/screen dies on fc5/buildsystem (could not open pty)
+#make -k check ||:
 
 
 %install
-%makeinstall
+rm -rf $RPM_BUILD_ROOT
 
-# Fix locations
-sed -i -e "s at M2HOME=.*@M2HOME=%{m2home}@" $RPM_BUILD_ROOT%{_bindir}/M2
-sed -i -e "s at M2HOME=.*@M2HOME=%{m2home}@" $RPM_BUILD_ROOT%{_bindir}/M2-help
-sed -i -e "s@$RPM_BUILD_ROOT@@g" $RPM_BUILD_ROOT%{m2home}/emacs/*
-
-## emacs files
-install -d $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
-cp -alf $RPM_BUILD_ROOT%{m2home}/emacs/*.el \
-        $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/
+make install prefix=$RPM_BUILD_ROOT%{_prefix}
 
 # app img
 install -p -m644 -D %{SOURCE1} \
@@ -103,25 +106,12 @@
   %{SOURCE2}
 
 ## Unpackaged files
-rm -f $RPM_BUILD_ROOT%{m2home}/setup
-# %doc stuff, no need to dup in appdir
-rm -f $RPM_BUILD_ROOT%{m2home}/{README,CHANGES,COPYING}
-# created by make check
-find $RPM_BUILD_ROOT%{m2home} \( -name test.out -o -name test.out*.trim \) -exec rm -v {} \;
-# .cvsignore
-find $RPM_BUILD_ROOT%{m2home} -name .cvsignore -exec rm -v {} \;
-# unuseful files outside of build environment
-find  $RPM_BUILD_ROOT%{m2home}/packages -name "Makefile*" -exec rm -v {} \;
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-#preun
-# Handle possibly existing dumpdata
-#rm -f %{m2home}/libexec/Macaulay2-*-data ||:
-
 %post
 touch --no-create %{_datadir}/icons/hicolor ||:
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
@@ -133,32 +123,26 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Macaulay2/README Macaulay2/CHANGES
+%doc Macaulay2/README Macaulay2/CHANGES Macaulay2/COPYING
 %{_bindir}/M2
+%{_bindir}/M2-emacs
+%{_bindir}/M2-help
+%{_bindir}/M2-load-libs
+%{_datadir}/Macaulay2/
+%{_datadir}/emacs/
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/*/*
-%dir %{m2home}
-%{m2home}/cache/
-%{m2home}/libexec/
-%{m2home}/m2/
-%{m2home}/packages/
-# emacs bits
-%{m2home}/emacs/
-%{_datadir}/emacs/site-lisp/
-
-%files doc
-%defattr(-,root,root,-)
-%{_bindir}/M2-help
-%{m2home}/html/
-%{m2home}/tutorial/
+# FIXME
+%{_docdir}/Macaulay2
+%{_infodir}/*
+%{_mandir}/man1/M2.1*
+%{_mandir}/man1/M2-help.1*
 
 
 %changelog
-* Mon Apr 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.2-22
-- fix icon location (#188384)
-
-* Thu Mar 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.2-21
-- *really* disable %%check (fails on fc5+ anyway) 
+* Tue Mar 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.8-0.2.cvs20060327
+- 0.9.8 (cvs, no tarball yet)
+- drop -doc subpkg (in main now)
 
 * Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.2-20
 - .desktop: drop Category=Development


--- Macaulay2-0.9-htmlview.patch DELETED ---


--- Macaulay2-0.9-optimize.patch DELETED ---


--- Macaulay2-0.9.2-gcc3.patch DELETED ---


--- Macaulay2-0.9.2-gcc34.patch DELETED ---


--- Macaulay2-0.9.2-gcc4.patch DELETED ---


--- Macaulay2-0.9.2-static.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 11 17:52:42 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 11 Apr 2006 10:52:42 -0700
Subject: rpms/Macaulay2/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200604111752.k3BHqi3q024332@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	.cvsignore sources 
Log Message:
update sources to 0.9.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Dec 2004 16:15:35 -0000	1.2
+++ .cvsignore	11 Apr 2006 17:52:42 -0000	1.3
@@ -1 +1 @@
-Macaulay2-0.9.2-src.tar.gz
+M2-0.9.8-cvs20060327.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Dec 2004 16:15:35 -0000	1.2
+++ sources	11 Apr 2006 17:52:42 -0000	1.3
@@ -1 +1 @@
-f2181baccdb9bbe75c4f6ee61f782533  Macaulay2-0.9.2-src.tar.gz
+b215fc27d49332879d0641cbcf5cba55  M2-0.9.8-cvs20060327.tar.bz2



From fedora-extras-commits at redhat.com  Tue Apr 11 17:55:07 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 10:55:07 -0700
Subject: rpms/xfce4-mount-plugin/FC-3 xfce4-mount-plugin.spec,1.2,1.3
Message-ID: <200604111755.k3BHt90v024428@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-mount-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24411

Modified Files:
	xfce4-mount-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-mount-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mount-plugin/FC-3/xfce4-mount-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-mount-plugin.spec	21 Jan 2006 22:24:09 -0000	1.2
+++ xfce4-mount-plugin.spec	11 Apr 2006 17:55:07 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-mount-plugin
 Version:	0.3.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Mount/unmount utility for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 Mount and unmount filesystems from the Xfce panel.
@@ -36,8 +37,11 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-2
+- Require xfce4-panel.
+
 * Sat Jan 21 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-1
-- Updat to 0.3.3.
+- Update to 0.3.3.
 
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.2-3
 - Add libxfcegui4-devel BuildReqs.



From fedora-extras-commits at redhat.com  Tue Apr 11 17:55:39 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 11 Apr 2006 10:55:39 -0700
Subject: rpms/Macaulay2/devel Macaulay2.spec,1.13,1.14
Message-ID: <200604111755.k3BHtfR0024456@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	Macaulay2.spec 
Log Message:
replace omitted changelog entries



Index: Macaulay2.spec
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/devel/Macaulay2.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Macaulay2.spec	11 Apr 2006 17:51:40 -0000	1.13
+++ Macaulay2.spec	11 Apr 2006 17:55:39 -0000	1.14
@@ -144,6 +144,12 @@
 - 0.9.8 (cvs, no tarball yet)
 - drop -doc subpkg (in main now)
 
+* Mon Apr 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.2-22
+- fix icon location (#188384)
+
+* Thu Mar 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.2-21
+- really disable %%check (fails on fc5+ anyway) 
+
 * Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.2-20
 - .desktop: drop Category=Development
 - app icon: follow icon spec



From fedora-extras-commits at redhat.com  Tue Apr 11 17:55:53 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 10:55:53 -0700
Subject: rpms/xfce4-mount-plugin/FC-4 xfce4-mount-plugin.spec,1.3,1.4
Message-ID: <200604111755.k3BHttP5024479@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-mount-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24462

Modified Files:
	xfce4-mount-plugin.spec 
Log Message:
fix typo in changelog


Index: xfce4-mount-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mount-plugin/FC-4/xfce4-mount-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-mount-plugin.spec	11 Apr 2006 11:26:41 -0000	1.3
+++ xfce4-mount-plugin.spec	11 Apr 2006 17:55:53 -0000	1.4
@@ -41,7 +41,7 @@
 - Require xfce4-panel.
 
 * Sat Jan 21 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-1
-- Updat to 0.3.3.
+- Update to 0.3.3.
 
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.2-3
 - Add libxfcegui4-devel BuildReqs.



From fedora-extras-commits at redhat.com  Tue Apr 11 17:56:32 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 10:56:32 -0700
Subject: rpms/xfce4-mount-plugin/FC-5 xfce4-mount-plugin.spec,1.4,1.5
Message-ID: <200604111756.k3BHuYwf024509@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-mount-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24492

Modified Files:
	xfce4-mount-plugin.spec 
Log Message:
fix typo in changelog


Index: xfce4-mount-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mount-plugin/FC-5/xfce4-mount-plugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfce4-mount-plugin.spec	11 Apr 2006 11:26:18 -0000	1.4
+++ xfce4-mount-plugin.spec	11 Apr 2006 17:56:32 -0000	1.5
@@ -44,7 +44,7 @@
 - Rebuild for Fedora Extras 5.
 
 * Sat Jan 21 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-1
-- Updat to 0.3.3.
+- Update to 0.3.3.
 
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.2-3
 - Add libxfcegui4-devel BuildReqs.



From fedora-extras-commits at redhat.com  Tue Apr 11 17:57:07 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 10:57:07 -0700
Subject: rpms/xfce4-mount-plugin/devel xfce4-mount-plugin.spec,1.4,1.5
Message-ID: <200604111757.k3BHv93l024540@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-serv24523

Modified Files:
	xfce4-mount-plugin.spec 
Log Message:
fix typo in changelog


Index: xfce4-mount-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mount-plugin/devel/xfce4-mount-plugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfce4-mount-plugin.spec	11 Apr 2006 11:25:54 -0000	1.4
+++ xfce4-mount-plugin.spec	11 Apr 2006 17:57:07 -0000	1.5
@@ -44,7 +44,7 @@
 - Rebuild for Fedora Extras 5.
 
 * Sat Jan 21 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-1
-- Updat to 0.3.3.
+- Update to 0.3.3.
 
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.2-3
 - Add libxfcegui4-devel BuildReqs.



From fedora-extras-commits at redhat.com  Tue Apr 11 18:03:24 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 11:03:24 -0700
Subject: rpms/xfce4-netload-plugin/FC-3 xfce4-netload-plugin-bufsize.patch,
	1.1, 1.2 xfce4-netload-plugin.spec, 1.2, 1.3
Message-ID: <200604111803.k3BI3Q3l026643@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-netload-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26621

Modified Files:
	xfce4-netload-plugin-bufsize.patch xfce4-netload-plugin.spec 
Log Message:
require xfce4-panel & update bufsize-patch

xfce4-netload-plugin-bufsize.patch:

Index: xfce4-netload-plugin-bufsize.patch
===================================================================
RCS file: /cvs/extras/rpms/xfce4-netload-plugin/FC-3/xfce4-netload-plugin-bufsize.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-netload-plugin-bufsize.patch	3 Feb 2006 20:20:42 -0000	1.1
+++ xfce4-netload-plugin-bufsize.patch	11 Apr 2006 18:03:24 -0000	1.2
@@ -1,17 +1,11 @@
---- panel-plugin/wormulon/linux.c.orig	2006-02-03 20:48:17.000000000 +0100
-+++ panel-plugin/wormulon/linux.c	2005-08-01 00:56:38.000000000 +0200
-@@ -101,11 +101,11 @@
- 
-     /* do not parse the first two lines as they only contain static garbage */
-     fseek(proc_net_dev, 0, SEEK_SET);
--    fgets(buffer, BUFSIZ-1, proc_net_dev);
--    fgets(buffer, BUFSIZ-1, proc_net_dev);
-+    fgets(buffer, BUFSIZE-1, proc_net_dev);
-+    fgets(buffer, BUFSIZE-1, proc_net_dev);
- 
-     interfacefound = 0;
--    while (fgets(buffer, BUFSIZ-1, proc_net_dev) != NULL)
-+    while (fgets(buffer, BUFSIZE-1, proc_net_dev) != NULL)
-     {
-         /* find the device name and substitute ':' with '\0' */
-         ptr = buffer;
+--- panel-plugin/wormulon/linux.c.orig	2005-08-01 00:56:38.000000000 +0200
++++ panel-plugin/wormulon/linux.c	2006-02-04 13:20:14.000000000 +0100
+@@ -81,7 +81,7 @@
+      * performance difference is _very_ minimal. But I don't think that it's a good
+      * idea to keep the file open for a very long time for _each_ plugin instance.
+      */
+-    char buffer[BUFSIZE];
++    char buffer[BUFSIZ];
+     char *ptr;
+     char *devname;
+     int dump;


Index: xfce4-netload-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-netload-plugin/FC-3/xfce4-netload-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-netload-plugin.spec	3 Feb 2006 20:20:42 -0000	1.2
+++ xfce4-netload-plugin.spec	11 Apr 2006 18:03:24 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-netload-plugin
 Version:	0.3.3
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Network-load monitor for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -12,6 +12,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 A network-load monitor plugin for the Xfce panel.
@@ -39,6 +40,10 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-5
+- Require xfce4-panel.
+- Modify bufsize-patch.
+
 * Thu Feb 02 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-4
 - Add bufsize-patch (#179686)
 



From fedora-extras-commits at redhat.com  Tue Apr 11 18:05:05 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 11:05:05 -0700
Subject: rpms/xfce4-notes-plugin/FC-3 xfce4-notes-plugin.spec,1.1,1.2
Message-ID: <200604111805.k3BI58rD026694@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-notes-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26674

Modified Files:
	xfce4-notes-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-notes-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-notes-plugin/FC-3/xfce4-notes-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-notes-plugin.spec	15 Dec 2005 03:46:11 -0000	1.1
+++ xfce4-notes-plugin.spec	11 Apr 2006 18:05:05 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-notes-plugin
 Version:	0.11.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Notes plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 This plugin provides sticky notes for your desktop. You can create a note by 
@@ -39,6 +40,9 @@
 %{_datadir}/xfce4/*
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.11.1-3
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.11.1-2
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 18:07:02 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 11:07:02 -0700
Subject: rpms/xfce4-quicklauncher-plugin/FC-3
	xfce4-quicklauncher-plugin.spec, 1.1, 1.2
Message-ID: <200604111807.k3BI74xN026725@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-quicklauncher-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26708

Modified Files:
	xfce4-quicklauncher-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-quicklauncher-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-quicklauncher-plugin/FC-3/xfce4-quicklauncher-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-quicklauncher-plugin.spec	27 Jan 2006 17:57:59 -0000	1.1
+++ xfce4-quicklauncher-plugin.spec	11 Apr 2006 18:07:02 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-quicklauncher-plugin
 Version:	0.81
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Quicklauncher plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 This plugin allows you to have lots of launchers in the Xfce panel, displaying 
@@ -40,6 +41,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.81-3
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.81-2
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 18:08:14 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 11:08:14 -0700
Subject: rpms/xfce4-screenshooter-plugin/FC-3
	xfce4-screenshooter-plugin.spec, 1.1, 1.2
Message-ID: <200604111808.k3BI8GdR026753@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-screenshooter-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26736

Modified Files:
	xfce4-screenshooter-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-screenshooter-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-screenshooter-plugin/FC-3/xfce4-screenshooter-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-screenshooter-plugin.spec	29 Jan 2006 23:57:30 -0000	1.1
+++ xfce4-screenshooter-plugin.spec	11 Apr 2006 18:08:14 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-screenshooter-plugin
 Version:	0.0.8
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Screenshot utility for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 The Screenshooter plugin allows you to take screenshots from the Xfce panel.
@@ -35,5 +36,8 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.0.8-2
+- Require xfce4-panel.
+
 * Sat Jan 21 2006 Christoph Wickert <fedora wickert at arcor de> - 0.0.8-1
 - Initial Fedora Extras version.



From fedora-extras-commits at redhat.com  Tue Apr 11 18:09:16 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 11:09:16 -0700
Subject: rpms/xfce4-sensors-plugin/FC-3 xfce4-sensors-plugin.spec,1.2,1.3
Message-ID: <200604111809.k3BI9I5I026790@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-sensors-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26773

Modified Files:
	xfce4-sensors-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-sensors-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-sensors-plugin/FC-3/xfce4-sensors-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-sensors-plugin.spec	22 Jan 2006 20:45:44 -0000	1.2
+++ xfce4-sensors-plugin.spec	11 Apr 2006 18:09:16 -0000	1.3
@@ -1,6 +1,6 @@
 Name: 		xfce4-sensors-plugin
 Version: 	0.7.0
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Summary: 	Sensors plugin for the Xfce panel
 
 Group: 		User Interface/Desktops
@@ -11,7 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext, lm_sensors-devel >= 2.8
-Requires:	lm_sensors >= 2.8
+Requires:	xfce4-panel >= 4.2, lm_sensors >= 2.8
 ExcludeArch:	ppc
 
 %description
@@ -39,6 +39,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.7.0-4
+- Require xfce4-panel.
+
 * Sun Jan 22 2006 Christoph Wickert <fedora wickert at arcor de> - 0.7.0-3
 - ExcludeArch ppc.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 18:09:55 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Tue, 11 Apr 2006 11:09:55 -0700
Subject: rpms/gdesklets/FC-5 gdesklets.spec,1.13,1.14
Message-ID: <200604111809.k3BI9v4Z026814@cvs-int.fedora.redhat.com>

Author: luya

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

Modified Files:
	gdesklets.spec 
Log Message:

gdesklets.spec updated. Attempt to solve some ppc issue.



Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-5/gdesklets.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gdesklets.spec	3 Apr 2006 18:33:39 -0000	1.13
+++ gdesklets.spec	11 Apr 2006 18:09:55 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           gdesklets
 Version:        0.35.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
@@ -24,9 +24,9 @@
 BuildRequires:  gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0, desktop-file-utils
 Requires:	gnome-python2-gconf >= 2.6.0
 Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
-Requires(post): desktop-file-utils
+#Requires(post): desktop-file-utils
 Requires(post): shared-mime-info
-Requires(postun): desktop-file-utils
+#Requires(postun): desktop-file-utils
 Requires(postun): shared-mime-info
 
 
@@ -71,12 +71,12 @@
 
 %post
 update-mime-database %{_datadir}/mime &> /dev/null || :
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+#update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %postun
 update-mime-database %{_datadir}/mime &> /dev/null || :
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+#update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %clean



From fedora-extras-commits at redhat.com  Tue Apr 11 18:10:09 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 11:10:09 -0700
Subject: rpms/xfce4-showdesktop-plugin/FC-3 xfce4-showdesktop-plugin.spec,
	1.1, 1.2
Message-ID: <200604111810.k3BIABFb026837@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-showdesktop-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26820

Modified Files:
	xfce4-showdesktop-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-showdesktop-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-showdesktop-plugin/FC-3/xfce4-showdesktop-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-showdesktop-plugin.spec	15 Dec 2005 03:17:47 -0000	1.1
+++ xfce4-showdesktop-plugin.spec	11 Apr 2006 18:10:09 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-showdesktop-plugin
 Version:	0.4.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Show-Desktop plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:  gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 This is a little Xfce plugin, to minimize and unminimize all windows on the
@@ -39,6 +40,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.0-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.4.0-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 18:10:57 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 11:10:57 -0700
Subject: rpms/xfce4-systemload-plugin/FC-3 xfce4-systemload-plugin.spec, 1.1,
	1.2
Message-ID: <200604111810.k3BIAxNP026865@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-systemload-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26848

Modified Files:
	xfce4-systemload-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-systemload-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-systemload-plugin/FC-3/xfce4-systemload-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-systemload-plugin.spec	16 Dec 2005 22:34:40 -0000	1.1
+++ xfce4-systemload-plugin.spec	11 Apr 2006 18:10:57 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-systemload-plugin
 Version:	0.3.6
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Systemload monitor for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 A system-load monitor plugin for the Xfce panel. It displays the current CPU 
@@ -38,6 +39,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.6-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.6-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 18:12:14 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 11:12:14 -0700
Subject: rpms/xfce4-taskbar-plugin/FC-3 xfce4-taskbar-plugin.spec,1.1,1.2
Message-ID: <200604111812.k3BICGMU026902@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-taskbar-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26885

Modified Files:
	xfce4-taskbar-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-taskbar-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-taskbar-plugin/FC-3/xfce4-taskbar-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-taskbar-plugin.spec	15 Dec 2005 03:21:10 -0000	1.1
+++ xfce4-taskbar-plugin.spec	11 Apr 2006 18:12:14 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-taskbar-plugin
 Version:	0.2.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Tasklist plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A tasklist plugin for the Xfce panel. The size of the taskbar can be changed 
@@ -37,6 +38,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.2.2-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.2.2-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 18:12:52 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 11:12:52 -0700
Subject: rpms/xfce4-wavelan-plugin/FC-3 xfce4-wavelan-plugin.spec,1.1,1.2
Message-ID: <200604111812.k3BICstM026940@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-wavelan-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26923

Modified Files:
	xfce4-wavelan-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-wavelan-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-wavelan-plugin/FC-3/xfce4-wavelan-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-wavelan-plugin.spec	15 Dec 2005 04:40:53 -0000	1.1
+++ xfce4-wavelan-plugin.spec	11 Apr 2006 18:12:51 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-wavelan-plugin
 Version:	0.4.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	WaveLAN plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A plugin for the Xfce panel that monitors a wireless LAN interface. It 
@@ -36,6 +37,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 18:13:15 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 11 Apr 2006 11:13:15 -0700
Subject: rpms/perl-Test-MockObject/FC-5 .cvsignore, 1.7,
	1.8 perl-Test-MockObject.spec, 1.11, 1.12 sources, 1.7, 1.8
Message-ID: <200604111813.k3BIDHl0026988@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-serv26951/FC-5

Modified Files:
	.cvsignore perl-Test-MockObject.spec sources 
Log Message:
Update to 1.05.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-MockObject/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	30 Mar 2006 16:26:54 -0000	1.7
+++ .cvsignore	11 Apr 2006 18:13:15 -0000	1.8
@@ -1 +1 @@
-Test-MockObject-1.04.tar.gz
+Test-MockObject-1.05.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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-Test-MockObject.spec	30 Mar 2006 16:26:54 -0000	1.11
+++ perl-Test-MockObject.spec	11 Apr 2006 18:13:15 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           perl-Test-MockObject
-Version:        1.04
+Version:        1.05
 Release:        1%{?dist}
 Summary:        Perl extension for emulating troublesome interfaces
 
@@ -59,6 +59,9 @@
 
 
 %changelog
+* Tue Apr 11 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.05-1
+- Update to 1.05.
+
 * Thu Mar 30 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.04-1
 - Update to 1.04.
 - Makefile.PL -> Build.PL.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-MockObject/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	30 Mar 2006 16:26:54 -0000	1.7
+++ sources	11 Apr 2006 18:13:15 -0000	1.8
@@ -1 +1 @@
-03224e5cecd7267c720994eeeb02c376  Test-MockObject-1.04.tar.gz
+f0dbe875fd3af865126ede948408dbaa  Test-MockObject-1.05.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 18:13:16 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 11 Apr 2006 11:13:16 -0700
Subject: rpms/perl-Test-MockObject/devel .cvsignore, 1.7,
	1.8 perl-Test-MockObject.spec, 1.11, 1.12 sources, 1.7, 1.8
Message-ID: <200604111813.k3BIDITi026994@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-serv26951/devel

Modified Files:
	.cvsignore perl-Test-MockObject.spec sources 
Log Message:
Update to 1.05.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	30 Mar 2006 16:26:54 -0000	1.7
+++ .cvsignore	11 Apr 2006 18:13:16 -0000	1.8
@@ -1 +1 @@
-Test-MockObject-1.04.tar.gz
+Test-MockObject-1.05.tar.gz


Index: perl-Test-MockObject.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/perl-Test-MockObject.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-Test-MockObject.spec	30 Mar 2006 16:26:54 -0000	1.11
+++ perl-Test-MockObject.spec	11 Apr 2006 18:13:16 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           perl-Test-MockObject
-Version:        1.04
+Version:        1.05
 Release:        1%{?dist}
 Summary:        Perl extension for emulating troublesome interfaces
 
@@ -59,6 +59,9 @@
 
 
 %changelog
+* Tue Apr 11 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.05-1
+- Update to 1.05.
+
 * Thu Mar 30 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.04-1
 - Update to 1.04.
 - Makefile.PL -> Build.PL.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	30 Mar 2006 16:26:54 -0000	1.7
+++ sources	11 Apr 2006 18:13:16 -0000	1.8
@@ -1 +1 @@
-03224e5cecd7267c720994eeeb02c376  Test-MockObject-1.04.tar.gz
+f0dbe875fd3af865126ede948408dbaa  Test-MockObject-1.05.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 18:13:45 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 11:13:45 -0700
Subject: rpms/xfce4-weather-plugin/FC-3 xfce4-weather-plugin.spec,1.1,1.2
Message-ID: <200604111813.k3BIDlUG027022@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-weather-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27005

Modified Files:
	xfce4-weather-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-weather-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-weather-plugin/FC-3/xfce4-weather-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-weather-plugin.spec	9 Dec 2005 22:42:43 -0000	1.1
+++ xfce4-weather-plugin.spec	11 Apr 2006 18:13:45 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-weather-plugin
 Version:	0.4.9
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Weather plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A weather plugin for the Xfce panel. It shows the current temperature and 
@@ -38,6 +39,9 @@
 %{_datadir}/xfce4/*
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.9-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.4.9-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 18:14:52 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 11:14:52 -0700
Subject: rpms/xfce4-websearch-plugin/FC-3 xfce4-websearch-plugin.spec, 1.1,
	1.2
Message-ID: <200604111814.k3BIEs5I027126@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-websearch-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27109

Modified Files:
	xfce4-websearch-plugin.spec 
Log Message:
require xfce4-panel & fix typo


Index: xfce4-websearch-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-websearch-plugin/FC-3/xfce4-websearch-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-websearch-plugin.spec	21 Jan 2006 20:42:55 -0000	1.1
+++ xfce4-websearch-plugin.spec	11 Apr 2006 18:14:51 -0000	1.2
@@ -1,6 +1,6 @@
 Name: 		xfce4-websearch-plugin
 Version: 	0.1.0
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 Summary: 	Websearch plugin from the XFCE panel
 
 Group: 		User Interface/Desktops
@@ -10,7 +10,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-BuildREquires:  gettext
+BuildRequires:  gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 Access searchengines from the XFCE panel.
@@ -37,6 +38,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 18:16:29 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 11:16:29 -0700
Subject: rpms/xfce4-windowlist-plugin/FC-3 xfce4-windowlist-plugin.spec, 1.1,
	1.2
Message-ID: <200604111816.k3BIGV9l027163@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-windowlist-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27146

Modified Files:
	xfce4-windowlist-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-windowlist-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-windowlist-plugin/FC-3/xfce4-windowlist-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-windowlist-plugin.spec	9 Dec 2005 22:23:35 -0000	1.1
+++ xfce4-windowlist-plugin.spec	11 Apr 2006 18:16:29 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-windowlist-plugin
 Version:	0.1.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Windowlist plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 Windowlist plugin for the Xfce panel. The menubutton shows the icon of the 
@@ -37,6 +38,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 18:21:23 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 11:21:23 -0700
Subject: rpms/xfce4-xkb-plugin/FC-3 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xfce4-xkb-plugin.spec, 1.1, 1.2
Message-ID: <200604111821.k3BILP2D027259@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xkb-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27238

Modified Files:
	.cvsignore sources xfce4-xkb-plugin.spec 
Log Message:
update to 0.3.5 & require xfce4-panel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Dec 2005 22:28:33 -0000	1.2
+++ .cvsignore	11 Apr 2006 18:21:22 -0000	1.3
@@ -1 +1 @@
-xfce4-xkb-plugin-0.3.2.tar.gz
+xfce4-xkb-plugin-0.3.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Dec 2005 22:28:33 -0000	1.2
+++ sources	11 Apr 2006 18:21:22 -0000	1.3
@@ -1 +1 @@
-b233819d685ab3b7f4a47c2da9fb6936  xfce4-xkb-plugin-0.3.2.tar.gz
+0c92dd17579e102b40289c4bc83c5505  xfce4-xkb-plugin-0.3.5.tar.gz


Index: xfce4-xkb-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/FC-3/xfce4-xkb-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-xkb-plugin.spec	16 Dec 2005 22:28:33 -0000	1.1
+++ xfce4-xkb-plugin.spec	11 Apr 2006 18:21:22 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-xkb-plugin
-Version:	0.3.2
-Release:	4%{?dist}
+Version:	0.3.5
+Release:	2%{?dist}
 Summary:	XKB layout switcher for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,11 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
+# for modular X
+%if "%{?fedora}" > "4"
+BuildRequires:  libXext-devel, libXpm-devel
+%endif
+Requires:	xfce4-panel >= 4.2
 
 %description
 Xfce XKB layout switch plugin for the Xfce panel. It displays the current 
@@ -42,6 +47,18 @@
 %{_datadir}/xfce4/xkb/flags/*.png
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.5-2
+- Require xfce4-panel.
+
+* Fri Mar 31 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.5-1
+- Update to 0.3.5.
+
+* Fri Mar 17 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.4-1
+- Update to 0.3.4.
+
+* Fri Mar 10 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-1
+- Update to 0.3.3.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.2-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 18:23:09 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 11 Apr 2006 11:23:09 -0700
Subject: rpms/perl-Gtk2/FC-5 .cvsignore, 1.12, 1.13 perl-Gtk2.spec, 1.16,
	1.17 sources, 1.12, 1.13
Message-ID: <200604111823.k3BINBHB027345@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Gtk2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27287/FC-5

Modified Files:
	.cvsignore perl-Gtk2.spec sources 
Log Message:
Update to 1.121.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	14 Mar 2006 19:16:52 -0000	1.12
+++ .cvsignore	11 Apr 2006 18:23:09 -0000	1.13
@@ -1 +1 @@
-Gtk2-1.120.tar.gz
+Gtk2-1.121.tar.gz


Index: perl-Gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-5/perl-Gtk2.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- perl-Gtk2.spec	14 Mar 2006 19:16:52 -0000	1.16
+++ perl-Gtk2.spec	11 Apr 2006 18:23:09 -0000	1.17
@@ -5,7 +5,7 @@
 #
 
 Name:           perl-Gtk2
-Version:        1.120
+Version:        1.121
 Release:        1%{?dist}
 Summary:        Perl interface to the 2.x series of the Gimp Toolkit library
 
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Tue Apr 11 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.121-1
+- Update to 1.121.
+
 * Tue Mar 14 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.120-1
 - Update to 1.120.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	14 Mar 2006 19:16:52 -0000	1.12
+++ sources	11 Apr 2006 18:23:09 -0000	1.13
@@ -1 +1 @@
-3d0eef4271bd624b284f9a23f4bdbb96  Gtk2-1.120.tar.gz
+90bd58334c49a4db9d812537de5b1620  Gtk2-1.121.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 18:23:10 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 11 Apr 2006 11:23:10 -0700
Subject: rpms/perl-Gtk2/devel .cvsignore, 1.12, 1.13 perl-Gtk2.spec, 1.16,
	1.17 sources, 1.12, 1.13
Message-ID: <200604111823.k3BINCwP027351@cvs-int.fedora.redhat.com>

Author: jpo

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

Modified Files:
	.cvsignore perl-Gtk2.spec sources 
Log Message:
Update to 1.121.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	14 Mar 2006 19:16:52 -0000	1.12
+++ .cvsignore	11 Apr 2006 18:23:10 -0000	1.13
@@ -1 +1 @@
-Gtk2-1.120.tar.gz
+Gtk2-1.121.tar.gz


Index: perl-Gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/devel/perl-Gtk2.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- perl-Gtk2.spec	14 Mar 2006 19:16:52 -0000	1.16
+++ perl-Gtk2.spec	11 Apr 2006 18:23:10 -0000	1.17
@@ -5,7 +5,7 @@
 #
 
 Name:           perl-Gtk2
-Version:        1.120
+Version:        1.121
 Release:        1%{?dist}
 Summary:        Perl interface to the 2.x series of the Gimp Toolkit library
 
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Tue Apr 11 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.121-1
+- Update to 1.121.
+
 * Tue Mar 14 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.120-1
 - Update to 1.120.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	14 Mar 2006 19:16:52 -0000	1.12
+++ sources	11 Apr 2006 18:23:10 -0000	1.13
@@ -1 +1 @@
-3d0eef4271bd624b284f9a23f4bdbb96  Gtk2-1.120.tar.gz
+90bd58334c49a4db9d812537de5b1620  Gtk2-1.121.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 18:23:09 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 11 Apr 2006 11:23:09 -0700
Subject: rpms/perl-Gtk2/FC-4 .cvsignore, 1.8, 1.9 perl-Gtk2.spec, 1.12,
	1.13 sources, 1.8, 1.9
Message-ID: <200604111823.k3BINfrC027373@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Gtk2/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27287/FC-4

Modified Files:
	.cvsignore perl-Gtk2.spec sources 
Log Message:
Update to 1.121.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	15 Mar 2006 12:18:02 -0000	1.8
+++ .cvsignore	11 Apr 2006 18:23:09 -0000	1.9
@@ -1 +1 @@
-Gtk2-1.120.tar.gz
+Gtk2-1.121.tar.gz


Index: perl-Gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-4/perl-Gtk2.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-Gtk2.spec	15 Mar 2006 12:18:02 -0000	1.12
+++ perl-Gtk2.spec	11 Apr 2006 18:23:09 -0000	1.13
@@ -5,7 +5,7 @@
 #
 
 Name:           perl-Gtk2
-Version:        1.120
+Version:        1.121
 Release:        1%{?dist}
 Summary:        Perl interface to the 2.x series of the Gimp Toolkit library
 
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Tue Apr 11 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.121-1
+- Update to 1.121.
+
 * Tue Mar 14 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.120-1
 - Update to 1.120.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	15 Mar 2006 12:18:02 -0000	1.8
+++ sources	11 Apr 2006 18:23:09 -0000	1.9
@@ -1 +1 @@
-3d0eef4271bd624b284f9a23f4bdbb96  Gtk2-1.120.tar.gz
+90bd58334c49a4db9d812537de5b1620  Gtk2-1.121.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 19:13:57 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 12:13:57 -0700
Subject: rpms/xfce4-cpugraph-plugin/FC-5 xfce4-cpugraph-plugin.spec,1.3,1.4
Message-ID: <200604111913.k3BJDxDR030514@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-cpugraph-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30497

Modified Files:
	xfce4-cpugraph-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-cpugraph-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-cpugraph-plugin/FC-5/xfce4-cpugraph-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-cpugraph-plugin.spec	16 Feb 2006 15:46:27 -0000	1.3
+++ xfce4-cpugraph-plugin.spec	11 Apr 2006 19:13:57 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		xfce4-cpugraph-plugin
 Version:	0.2.2
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	CPU monitor for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A CPU monitor plugin for the Xfce panel. It offers multiple display modes 
@@ -37,6 +38,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.2.2-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.2.2-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 19:14:13 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Tue, 11 Apr 2006 12:14:13 -0700
Subject: fedora-security/audit fc4,1.199,1.200 fc5,1.112,1.113
Message-ID: <200604111914.k3BJEDBH030538@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30491/audit

Modified Files:
	fc4 fc5 
Log Message:
Add CVE-2006-1523



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- fc4	11 Apr 2006 16:36:01 -0000	1.199
+++ fc4	11 Apr 2006 19:14:10 -0000	1.200
@@ -12,6 +12,7 @@
 CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1542 VULNERABLE (python) bz#169046
+CVE-2006-1523 VULNERABLE (kernel, fixed 2.6.16.4)
 CVE-2006-1522 VULNERABLE (kernel, fixed 2.6.16.3)
 CVE-2006-1494 VULNERABLE (php)
 CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-245]


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- fc5	11 Apr 2006 16:36:01 -0000	1.112
+++ fc5	11 Apr 2006 19:14:10 -0000	1.113
@@ -11,6 +11,7 @@
 CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1542 VULNERABLE (python) bz#169046
+CVE-2006-1523 VULNERABLE (kernel, fixed 2.6.16.4)
 CVE-2006-1522 VULNERABLE (kernel, fixed 2.6.16.3)
 CVE-2006-1494 VULNERABLE (php)
 CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-233]



From fedora-extras-commits at redhat.com  Tue Apr 11 19:23:12 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Tue, 11 Apr 2006 12:23:12 -0700
Subject: rpms/gdesklets/FC-4 gdesklets.spec,1.5,1.6
Message-ID: <200604111923.k3BJNEtY030610@cvs-int.fedora.redhat.com>

Author: luya

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

Modified Files:
	gdesklets.spec 
Log Message:

gdeslets.spec updated



Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-4/gdesklets.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gdesklets.spec	19 Jan 2006 19:39:37 -0000	1.5
+++ gdesklets.spec	11 Apr 2006 19:23:12 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           gdesklets
 Version:        0.35.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
@@ -17,7 +17,7 @@
 #							    #
 #############################################################
 
-BuildRequires:  python-devel >= 2.0.0, pyorbit-devel >= 2.0.1, pygtk2-devel >= 2.4.0
+BuildRequires:  python-devel >= 2.0.0, pyorbit-devel > 2.0.1, pygtk2-devel >= 2.4.0
 BuildRequires:  librsvg2-devel, libgtop2-devel >= 2.8.0, gettext   
 BuildRequires:  gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0, desktop-file-utils
 Requires:	gnome-python2-gconf >= 2.6.0
@@ -96,6 +96,10 @@
 
 
 %changelog
+* Tue Apr 11 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-3
+- Set greater than for pyorbit2. For some reason, the package set
+  to equal instead of greater and equal.
+
 * Thu Jan 19 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-2
 - Rebuilt
 



From fedora-extras-commits at redhat.com  Tue Apr 11 19:39:14 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 11 Apr 2006 12:39:14 -0700
Subject: rpms/xdesktopwaves/FC-5 xdesktopwaves.spec,1.5,1.6
Message-ID: <200604111939.k3BJdGd7030731@cvs-int.fedora.redhat.com>

Author: adrian

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

Modified Files:
	xdesktopwaves.spec 
Log Message:
* Tue Apr 11 2006 Adrian Reber <adrian at lisas.de> - 1.3-6
- trying to fix build on x86_64



Index: xdesktopwaves.spec
===================================================================
RCS file: /cvs/extras/rpms/xdesktopwaves/FC-5/xdesktopwaves.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xdesktopwaves.spec	11 Apr 2006 11:51:18 -0000	1.5
+++ xdesktopwaves.spec	11 Apr 2006 19:39:14 -0000	1.6
@@ -1,6 +1,6 @@
 Name:          xdesktopwaves
 Version:       1.3
-Release:       5%{?dist}
+Release:       6%{?dist}
 
 Summary:       Simulation of water waves on the X Window System desktop
 License:       GPL
@@ -21,7 +21,7 @@
 %{__sed} -i -e "s,-s,," Makefile
 
 %build
-%{__make} CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+%{__make} CFLAGS="$RPM_OPT_FLAGS" LFLAGS="-L/usr/%{_lib}" %{?_smp_mflags}
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -61,6 +61,9 @@
 %{_datadir}/pixmaps/%{name}.xpm
 
 %changelog
+* Tue Apr 11 2006 Adrian Reber <adrian at lisas.de> - 1.3-6
+- trying to fix build on x86_64
+
 * Tue Apr 11 2006 Adrian Reber <adrian at lisas.de> - 1.3-5
 - rebuilt for modular X
 



From fedora-extras-commits at redhat.com  Tue Apr 11 20:06:21 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Tue, 11 Apr 2006 13:06:21 -0700
Subject: rpms/gdesklets/FC-4 gdesklets.spec,1.6,1.7
Message-ID: <200604112006.k3BK6NpF000588@cvs-int.fedora.redhat.com>

Author: luya

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

Modified Files:
	gdesklets.spec 
Log Message:

gdesklets.spec updated



Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-4/gdesklets.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gdesklets.spec	11 Apr 2006 19:23:12 -0000	1.6
+++ gdesklets.spec	11 Apr 2006 20:06:20 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           gdesklets
 Version:        0.35.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
@@ -17,7 +17,7 @@
 #							    #
 #############################################################
 
-BuildRequires:  python-devel >= 2.0.0, pyorbit-devel > 2.0.1, pygtk2-devel >= 2.4.0
+BuildRequires:  python-devel >= 2.0.0, pyorbit-devel > 2.6.1, pygtk2-devel >= 2.4.0
 BuildRequires:  librsvg2-devel, libgtop2-devel >= 2.8.0, gettext   
 BuildRequires:  gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0, desktop-file-utils
 Requires:	gnome-python2-gconf >= 2.6.0
@@ -96,8 +96,11 @@
 
 
 %changelog
+* Tue Apr 11 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-4
+- Fixed versionning for pyorbit-devel
+
 * Tue Apr 11 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-3
-- Set greater than for pyorbit2. For some reason, the package set
+- Set greater than for pyorbit. For some reason, the package set
   to equal instead of greater and equal.
 
 * Thu Jan 19 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-2



From fedora-extras-commits at redhat.com  Tue Apr 11 20:39:31 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Tue, 11 Apr 2006 13:39:31 -0700
Subject: rpms/gdesklets/devel gdesklets.spec,1.11,1.12
Message-ID: <200604112039.k3BKdXP7001486@cvs-int.fedora.redhat.com>

Author: luya

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

Modified Files:
	gdesklets.spec 
Log Message:

gdeskets.spec updated



Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/devel/gdesklets.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gdesklets.spec	28 Feb 2006 21:15:09 -0000	1.11
+++ gdesklets.spec	11 Apr 2006 20:39:31 -0000	1.12
@@ -24,9 +24,9 @@
 BuildRequires:  gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0, desktop-file-utils
 Requires:	gnome-python2-gconf >= 2.6.0
 Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
-Requires(post): desktop-file-utils
+#Requires(post): desktop-file-utils
 Requires(post): shared-mime-info
-Requires(postun): desktop-file-utils
+#Requires(postun): desktop-file-utils
 Requires(postun): shared-mime-info
 
 
@@ -71,12 +71,12 @@
 
 %post
 update-mime-database %{_datadir}/mime &> /dev/null || :
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+#update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %postun
 update-mime-database %{_datadir}/mime &> /dev/null || :
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+#update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %clean
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Tue Apr 11 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-5
+- Rebuild for development
+
 * Thu Jan 19 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-4
 - Rebuild for Fedora Extras 5
 



From fedora-extras-commits at redhat.com  Tue Apr 11 20:46:48 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 11 Apr 2006 13:46:48 -0700
Subject: rpms/raidem/devel raidem-0.3.1-syslibs.patch,NONE,1.1
Message-ID: <200604112046.k3BKkoHi001668@cvs-int.fedora.redhat.com>

Author: jwrdegoede

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

Added Files:
	raidem-0.3.1-syslibs.patch 
Log Message:
raidem-0.3.1 WIP

raidem-0.3.1-syslibs.patch:

--- NEW FILE raidem-0.3.1-syslibs.patch ---
diff -ur raidem-0.3.1-src.orig/Makefile raidem-0.3.1-src/Makefile
--- raidem-0.3.1-src.orig/Makefile	2006-04-08 06:54:03.000000000 +0200
+++ raidem-0.3.1-src/Makefile	2006-04-09 20:46:18.000000000 +0200
@@ -4,8 +4,8 @@
 
 include Makefile.cfg
 
-CFLAGS += -W -Wall -Werror -Wno-deprecated-declarations \
-	-fno-strict-aliasing				\
+CFLAGS += -W -Wall -Wno-deprecated-declarations \
+	-fno-strict-aliasing			\
 	-Iinclude -Ilib
 #CFLAGS += -g3
 
diff -ur raidem-0.3.1-src.orig/configure.ac raidem-0.3.1-src/configure.ac
--- raidem-0.3.1-src.orig/configure.ac	2006-04-08 10:48:00.000000000 +0200
+++ raidem-0.3.1-src/configure.ac	2006-04-11 22:06:03.000000000 +0200
@@ -53,7 +53,8 @@
                               AC_MSG_NOTICE([===== Using lib/adime =====]) &&
                               (cd lib/adime; sh fix.sh unix --quick) &&
                               AC_MSG_NOTICE([===== Configured adime =====]),
-                              AC_MSG_ERROR([cannot find adime])))
+                              AC_MSG_ERROR([cannot find adime])),
+                [`$alcfg --libs`])
 
 
 AC_HAVE_LIBRARY([glyph-alleg],
@@ -104,7 +105,7 @@
 #----------------------------------------------------------------
 # Optional
 
-if ! ${alrand}; then
+if [ "$alrand" != "true" ]; then
 AC_SUBST(NO_ALRAND, 1)
 fi
 
@@ -124,7 +125,8 @@
                 AC_SUBST(HAVE_ALLEGROOGG, 1),
                 AC_CHECK_FILE([lib/allegroogg/Makefile],
                               AC_MSG_NOTICE([===== Using lib/allegroogg =====]),
-                              AC_SUBST(NO_OGG, 1)))
+                              AC_SUBST(NO_OGG, 1)),
+                [`$alcfg --libs`])
 else
 AC_SUBST(NO_OGG, 1)
 fi
diff -ur raidem-0.3.1-src.orig/misc/Makefile.all raidem-0.3.1-src/misc/Makefile.all
--- raidem-0.3.1-src.orig/misc/Makefile.all	2006-04-08 09:12:44.000000000 +0200
+++ raidem-0.3.1-src/misc/Makefile.all	2006-04-09 21:06:03.000000000 +0200
@@ -56,11 +56,14 @@
 # Glyph-Keeper
 ifdef HAVE_GLYPH_KEEPER
 LDLIBS += -lglyph-alleg
+CFLAGS += -DGLYPH_TARGET=GLYPH_TARGET_ALLEGRO
 else
 CFLAGS += -DGLYPH_TARGET=GLYPH_TARGET_ALLEGRO -Ilib/glyph-keeper/include
 endif # HAVE_GLYPH_KEEPER
 
-ifndef HAVE_FREETYPE
+ifdef HAVE_FREETYPE
+LDLIBS += `$(ftcfg) --libs`
+else
 CFLAGS += -Ilib/freetype/include
 endif
 
diff -ur raidem-0.3.1-src.orig/src/map-editor/map-proc.m raidem-0.3.1-src/src/map-editor/map-proc.m
--- raidem-0.3.1-src.orig/src/map-editor/map-proc.m	2006-01-20 03:33:33.000000000 +0100
+++ raidem-0.3.1-src/src/map-editor/map-proc.m	2006-04-09 20:47:00.000000000 +0200
@@ -4,7 +4,7 @@
 #include <allegro.h>
 #include <assert.h>
 #include <math.h>
-#include "adime/include/adime.h"
+#include <adime.h>
 #include "common.h"
 #include "group.h"
 #include "gui/gui-clip.h"



From fedora-extras-commits at redhat.com  Tue Apr 11 20:55:51 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Tue, 11 Apr 2006 13:55:51 -0700
Subject: rpms/qps/devel .cvsignore, 1.7, 1.8 qps.spec, 1.7, 1.8 sources, 1.7,
	1.8 qps.desktop, 1.1, NONE
Message-ID: <200604112055.k3BKtrFU001729@cvs-int.fedora.redhat.com>

Author: gajownik

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

Modified Files:
	.cvsignore qps.spec sources 
Removed Files:
	qps.desktop 
Log Message:
Update to 1.9.15



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qps/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	22 Mar 2006 20:47:28 -0000	1.7
+++ .cvsignore	11 Apr 2006 20:55:51 -0000	1.8
@@ -1 +1 @@
-qps-1.9.14.tar.gz
+qps-1.9.15.tar.gz


Index: qps.spec
===================================================================
RCS file: /cvs/extras/rpms/qps/devel/qps.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- qps.spec	22 Mar 2006 20:47:28 -0000	1.7
+++ qps.spec	11 Apr 2006 20:55:51 -0000	1.8
@@ -1,13 +1,12 @@
 Name:           qps
-Version:        1.9.14
+Version:        1.9.15
 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/3267/qps-1.9.14.tar.gz
-Source1:        qps.desktop
+Source0:        http://kldp.net/frs/download.php/3304/qps-1.9.15.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -36,8 +35,7 @@
 
 desktop-file-install --vendor fedora \
 	--add-category=X-Fedora \
-	--dir %{buildroot}%{_datadir}/applications\
-	%{SOURCE1}
+	--dir %{buildroot}%{_datadir}/applications qps.desktop
 
 
 %clean
@@ -54,6 +52,9 @@
 
 
 %changelog
+* Tue Apr 11 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 1.9.15-1
+- Update to 1.9.15
+
 * Wed Mar 22 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 1.9.14-1
 - Update to 1.9.14
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qps/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	22 Mar 2006 20:47:28 -0000	1.7
+++ sources	11 Apr 2006 20:55:51 -0000	1.8
@@ -1 +1 @@
-6c45c290670e8dc938afad1cd013ef81  qps-1.9.14.tar.gz
+d4fd0c451598f12b8ff16e8bed58c07d  qps-1.9.15.tar.gz


--- qps.desktop DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 11 21:10:33 2006
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Tue, 11 Apr 2006 14:10:33 -0700
Subject: rpms/monotone/devel .cvsignore, 1.6, 1.7 README.monotone-server, 1.1,
	1.2 monotone-xfail-if-root.patch, 1.3, 1.4 monotone.init, 1.3,
	1.4 monotone.spec, 1.10, 1.11 monotone.sysconfig, 1.2,
	1.3 sources, 1.6, 1.7
Message-ID: <200604112110.k3BLAZpi003997@cvs-int.fedora.redhat.com>

Author: roland

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

Modified Files:
	.cvsignore README.monotone-server monotone-xfail-if-root.patch 
	monotone.init monotone.spec monotone.sysconfig sources 
Log Message:
New upstream version 0.26


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Jan 2006 11:34:11 -0000	1.6
+++ .cvsignore	11 Apr 2006 21:10:32 -0000	1.7
@@ -1 +1 @@
-monotone-0.25.tar.gz
+monotone-0.26.tar.gz


Index: README.monotone-server
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/README.monotone-server,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.monotone-server	13 Dec 2005 07:35:07 -0000	1.1
+++ README.monotone-server	11 Apr 2006 21:10:32 -0000	1.2
@@ -35,7 +35,7 @@
 put a key in the server's database easily with "service monotone import",
 e.g. to import the public key for a private key in ~/.monotone/keys:
 
-	monotone pubkey me at my.com | sudo service monotone import
+	mtn pubkey me at my.com | sudo service monotone import
 
 For problems with this package or its scripts, please file bugs
 at http://bugzilla.redhat.com/ for the "monotone" component

monotone-xfail-if-root.patch:

Index: monotone-xfail-if-root.patch
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/monotone-xfail-if-root.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- monotone-xfail-if-root.patch	6 Jan 2006 11:34:11 -0000	1.3
+++ monotone-xfail-if-root.patch	11 Apr 2006 21:10:32 -0000	1.4
@@ -1,6 +1,17 @@
---- monotone-0.23/testsuite
-+++ monotone-0.23/testsuite
-@@ -67479,7 +67479,7 @@ $at_traceon
+--- monotone/tests/t_checkout_dir.at
++++ monotone/tests/t_checkout_dir.at
+@@ -20,7 +20,7 @@ AT_CHECK(MTN --branch=testbranch checkou
+ mkdir test_dir4
+ chmod 444 test_dir4
+ # XFAIL if run as root (hi Gentoo!)
+-AT_XFAIL_IF(test -O /)
++AT_XFAIL_IF(test -w test_dir4)
+ AT_CHECK(MTN --branch=testbranch checkout test_dir4,
+          [1], [ignore], [ignore])
+ AT_CHECK(MTN --branch=testbranch checkout test_dir4/subdir,
+--- monotone/testsuite
++++ monotone/testsuite
+@@ -69608,7 +69608,7 @@ $at_traceon
      at_desc='checkout validates target directory'
      $at_quiet $ECHO_N " 64: checkout validates target directory          $ECHO_C"
      at_xfail=no
@@ -9,14 +20,3 @@
      (
        echo "64. t_checkout_dir.at:1: testing ..."
        $at_traceon
---- monotone-0.23/tests/t_checkout_dir.at
-+++ monotone-0.23/tests/t_checkout_dir.at
-@@ -20,7 +20,7 @@ AT_CHECK(MONOTONE --branch=testbranch ch
- mkdir test_dir4
- chmod 444 test_dir4
- # XFAIL if run as root (hi Gentoo!)
--AT_XFAIL_IF(test -O /)
-+AT_XFAIL_IF(test -w test_dir4)
- AT_CHECK(MONOTONE --branch=testbranch checkout test_dir4,
-          [1], [ignore], [ignore])
- AT_CHECK(MONOTONE --branch=testbranch checkout test_dir4/subdir,


Index: monotone.init
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/monotone.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- monotone.init	13 Dec 2005 07:35:07 -0000	1.3
+++ monotone.init	11 Apr 2006 21:10:32 -0000	1.4
@@ -24,9 +24,10 @@
 # By default it's all good
 RETVAL=0
 
-MT=/usr/bin/monotone
+MT=/usr/bin/mtn
 MTSERVER=/usr/sbin/monotone-server
 MONOTONE_LOGFILE=${MONOTONE_LOGFILE:-/var/log/monotone.log}
+MONOTONE_OLDDB=/var/db/monotone/server.db
 
 random_passphrase()
 {
@@ -42,6 +43,11 @@
   start)
 	if [ -e $MONOTONE_DBFILE ]; then
 		$0 migrate
+	elif [ -e $MONOTONE_OLDDB ]; then
+		echo -n $"Pre-0.26 monotone database must be migrated by hand: "
+		failure
+		echo
+		false
 	else
 		$0 init
 	fi
@@ -86,7 +92,7 @@
 	RETVAL=$?
 	;;
   init)
-	echo -n $"Initializing database" "$MONOTONE_DBFILE" ": "
+	echo -n $"Initializing database" "${MONOTONE_DBFILE}: "
 	{ [ -d /var/db/monotone ] ||
  	  /usr/bin/install -o ${MONOTONE_USER:-monotone} \
 			   -g ${MONOTONE_GROUP:-monotone} \


Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/monotone.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- monotone.spec	28 Feb 2006 18:58:17 -0000	1.10
+++ monotone.spec	11 Apr 2006 21:10:32 -0000	1.11
@@ -1,6 +1,6 @@
 Name: monotone
-Version: 0.25
-Release: 3%{?dist}
+Version: 0.26
+Release: 1%{?dist}
 
 Summary: A free, distributed version control system
 Group: Development/Tools
@@ -75,6 +75,7 @@
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 rm -f %{buildroot}%{_infodir}/dir
+rm -f %{buildroot}%{_datadir}/doc/monotone/monotone.html
 
 %find_lang %{name}
 
@@ -87,7 +88,7 @@
 mkdir -p %{buildroot}/etc/init.d
 mkdir -p %{buildroot}/etc/sysconfig
 mkdir -p %{buildroot}/var/db
-ln -snf ../bin/monotone %{buildroot}%{_sbindir}/monotone-server
+ln -snf ../bin/mtn %{buildroot}%{_sbindir}/monotone-server
 %{__install} -c -m 0555 %{SOURCE1} %{buildroot}/etc/init.d/monotone
 %{__install} -c -m 0644 %{SOURCE2} %{buildroot}/etc/sysconfig/monotone
 %{__install} -d -m 0755 %{buildroot}/etc/monotone
@@ -99,7 +100,7 @@
 %{__install} -c -m 0640 /dev/null %{buildroot}/etc/monotone/read-permissions
 %{__install} -c -m 0640 /dev/null %{buildroot}/etc/monotone/write-permissions
 %{__install} -c -m 0644 /dev/null %{buildroot}/etc/monotone/monotonerc
-touch %{buildroot}/var/db/monotone/server.db
+touch %{buildroot}/var/db/monotone/server.mtn
 
 cp %{SOURCE3} .
 
@@ -124,9 +125,9 @@
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README README.changesets UPGRADE
 %doc monotone.html
 
-%{_bindir}/monotone
+%{_bindir}/mtn
 %{_infodir}/monotone.info*
-%{_mandir}/man1/monotone.1*
+%{_mandir}/man1/mtn.1*
 %{_datadir}/emacs/site-lisp/monotone*.el*
 
 
@@ -142,9 +143,8 @@
 %attr(0440,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/monotone/passphrase.lua
 %attr(0640,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/monotone/read-permissions
 %attr(0640,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/monotone/write-permissions
- %attr(0750,root,monotone) /etc/monotone/private-keys
 %dir %attr(0770,monotone,monotone) /var/db/monotone
-%attr(0660,monotone,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/db/monotone/server.db
+%attr(0660,monotone,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/db/monotone/server.mtn
 
 %pre server
 # Add the "monotone" user
@@ -166,8 +166,9 @@
 
 
 %changelog
-* Tue Feb 28 2006 Roland McGrath <roland at redhat.com> - 0.25-3
-- Rebuilt.
+* Mon Apr 10 2006 Roland McGrath <roland at redhat.com> - 0.26-1
+- Updated for 0.25 release.
+  - Major changes; see UPGRADE doc file for details.
 
 * Fri Jan  6 2006 Roland McGrath <roland at redhat.com> - 0.25-2
 - Restore testsuite fix for nonroot owner of / in build chroot.


Index: monotone.sysconfig
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/monotone.sysconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- monotone.sysconfig	13 Dec 2005 07:35:07 -0000	1.2
+++ monotone.sysconfig	11 Apr 2006 21:10:32 -0000	1.3
@@ -1,6 +1,6 @@
 MONOTONE_CONFDIR=/etc/monotone
 MONOTONE_KEYDIR=/etc/monotone/private-keys
-MONOTONE_DBFILE=/var/db/monotone/server.db
+MONOTONE_DBFILE=/var/db/monotone/server.mtn
 MONOTONE_PPFILE=/etc/monotone/passphrase.lua
 
 MONOTONE_RCOPTS="--confdir=$MONOTONE_CONFDIR"


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Jan 2006 11:34:11 -0000	1.6
+++ sources	11 Apr 2006 21:10:32 -0000	1.7
@@ -1 +1 @@
-fb0ad449cd0093854c55dbd5c6fc07e2  monotone-0.25.tar.gz
+21b902d1b48ffb868536d04c4ad38155  monotone-0.26.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 21:12:22 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Tue, 11 Apr 2006 14:12:22 -0700
Subject: rpms/qps/FC-5 .cvsignore, 1.7, 1.8 qps.spec, 1.7, 1.8 sources, 1.7, 
	1.8 qps.desktop, 1.1, NONE
Message-ID: <200604112112.k3BLCOtH004156@cvs-int.fedora.redhat.com>

Author: gajownik

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

Modified Files:
	.cvsignore qps.spec sources 
Removed Files:
	qps.desktop 
Log Message:
Update to 1.9.15



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qps/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	22 Mar 2006 20:47:22 -0000	1.7
+++ .cvsignore	11 Apr 2006 21:12:22 -0000	1.8
@@ -1 +1 @@
-qps-1.9.14.tar.gz
+qps-1.9.15.tar.gz


Index: qps.spec
===================================================================
RCS file: /cvs/extras/rpms/qps/FC-5/qps.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- qps.spec	22 Mar 2006 20:47:22 -0000	1.7
+++ qps.spec	11 Apr 2006 21:12:22 -0000	1.8
@@ -1,13 +1,12 @@
 Name:           qps
-Version:        1.9.14
+Version:        1.9.15
 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/3267/qps-1.9.14.tar.gz
-Source1:        qps.desktop
+Source0:        http://kldp.net/frs/download.php/3304/qps-1.9.15.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -36,8 +35,7 @@
 
 desktop-file-install --vendor fedora \
 	--add-category=X-Fedora \
-	--dir %{buildroot}%{_datadir}/applications\
-	%{SOURCE1}
+	--dir %{buildroot}%{_datadir}/applications qps.desktop
 
 
 %clean
@@ -54,6 +52,9 @@
 
 
 %changelog
+* Tue Apr 11 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 1.9.15-1
+- Update to 1.9.15
+
 * Wed Mar 22 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 1.9.14-1
 - Update to 1.9.14
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qps/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	22 Mar 2006 20:47:22 -0000	1.7
+++ sources	11 Apr 2006 21:12:22 -0000	1.8
@@ -1 +1 @@
-6c45c290670e8dc938afad1cd013ef81  qps-1.9.14.tar.gz
+d4fd0c451598f12b8ff16e8bed58c07d  qps-1.9.15.tar.gz


--- qps.desktop DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 11 21:12:27 2006
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Tue, 11 Apr 2006 14:12:27 -0700
Subject: rpms/monotone/devel monotone-0.24-gcc41.patch,1.1,NONE
Message-ID: <200604112112.k3BLCTta004177@cvs-int.fedora.redhat.com>

Author: roland

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

Removed Files:
	monotone-0.24-gcc41.patch 
Log Message:
Nuke obsolete patch


--- monotone-0.24-gcc41.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 11 21:19:30 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Tue, 11 Apr 2006 14:19:30 -0700
Subject: rpms/qps/FC-4 .cvsignore, 1.6, 1.7 qps.spec, 1.6, 1.7 sources, 1.6, 
	1.7 qps.desktop, 1.1, NONE
Message-ID: <200604112119.k3BLJWuV004279@cvs-int.fedora.redhat.com>

Author: gajownik

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

Modified Files:
	.cvsignore qps.spec sources 
Removed Files:
	qps.desktop 
Log Message:
Update to 1.9.15



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qps/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	22 Mar 2006 20:47:16 -0000	1.6
+++ .cvsignore	11 Apr 2006 21:19:30 -0000	1.7
@@ -1 +1 @@
-qps-1.9.14.tar.gz
+qps-1.9.15.tar.gz


Index: qps.spec
===================================================================
RCS file: /cvs/extras/rpms/qps/FC-4/qps.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- qps.spec	22 Mar 2006 20:47:16 -0000	1.6
+++ qps.spec	11 Apr 2006 21:19:30 -0000	1.7
@@ -1,13 +1,12 @@
 Name:           qps
-Version:        1.9.14
+Version:        1.9.15
 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/3267/qps-1.9.14.tar.gz
-Source1:        qps.desktop
+Source0:        http://kldp.net/frs/download.php/3304/qps-1.9.15.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -36,8 +35,7 @@
 
 desktop-file-install --vendor fedora \
 	--add-category=X-Fedora \
-	--dir %{buildroot}%{_datadir}/applications\
-	%{SOURCE1}
+	--dir %{buildroot}%{_datadir}/applications qps.desktop
 
 
 %clean
@@ -54,6 +52,9 @@
 
 
 %changelog
+* Tue Apr 11 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 1.9.15-1
+- Update to 1.9.15
+
 * Wed Mar 22 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 1.9.14-1
 - Update to 1.9.14
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qps/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	22 Mar 2006 20:47:16 -0000	1.6
+++ sources	11 Apr 2006 21:19:30 -0000	1.7
@@ -1 +1 @@
-6c45c290670e8dc938afad1cd013ef81  qps-1.9.14.tar.gz
+d4fd0c451598f12b8ff16e8bed58c07d  qps-1.9.15.tar.gz


--- qps.desktop DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 11 21:42:26 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 11 Apr 2006 14:42:26 -0700
Subject: rpms/perl-HTML-TableExtract/FC-4 perl-HTML-TableExtract.spec, 1.1,
	1.2
Message-ID: <200604112142.k3BLgSi0004574@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/perl-HTML-TableExtract/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4557

Modified Files:
	perl-HTML-TableExtract.spec 
Log Message:
bump



Index: perl-HTML-TableExtract.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-TableExtract/FC-4/perl-HTML-TableExtract.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-HTML-TableExtract.spec	11 Apr 2006 17:16:36 -0000	1.1
+++ perl-HTML-TableExtract.spec	11 Apr 2006 21:42:25 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-HTML-TableExtract
 Version:        2.07
-Release: 	2
+Release: 	1.fc4
 Summary:        A Perl module for extracting content in HTML tables
 Group:          Development/Libraries
 License:        Artistic or GPL



From fedora-extras-commits at redhat.com  Tue Apr 11 21:42:34 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 11 Apr 2006 14:42:34 -0700
Subject: rpms/perl-HTML-TableExtract/FC-5 perl-HTML-TableExtract.spec, 1.1,
	1.2
Message-ID: <200604112142.k3BLgafP004597@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/perl-HTML-TableExtract/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4580

Modified Files:
	perl-HTML-TableExtract.spec 
Log Message:
bump



Index: perl-HTML-TableExtract.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-TableExtract/FC-5/perl-HTML-TableExtract.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-HTML-TableExtract.spec	11 Apr 2006 17:16:36 -0000	1.1
+++ perl-HTML-TableExtract.spec	11 Apr 2006 21:42:33 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-HTML-TableExtract
 Version:        2.07
-Release: 	2
+Release: 	1.fc5
 Summary:        A Perl module for extracting content in HTML tables
 Group:          Development/Libraries
 License:        Artistic or GPL



From fedora-extras-commits at redhat.com  Tue Apr 11 21:43:43 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 11 Apr 2006 14:43:43 -0700
Subject: rpms/perl-Finance-Quote/FC-5 perl-Finance-Quote.spec,1.1,1.2
Message-ID: <200604112143.k3BLhjER004718@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/perl-Finance-Quote/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4683/FC-5

Modified Files:
	perl-Finance-Quote.spec 
Log Message:
bump



Index: perl-Finance-Quote.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Finance-Quote/FC-5/perl-Finance-Quote.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Finance-Quote.spec	11 Apr 2006 17:17:58 -0000	1.1
+++ perl-Finance-Quote.spec	11 Apr 2006 21:43:43 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Finance-Quote
 Version:        1.11
-Release: 	3
+Release: 	2.fc5
 Summary:        A Perl module that retrieves stock and mutual fund quotes
 Group:          Development/Libraries
 License:        GPL
@@ -45,7 +45,7 @@
 
 
 %changelog
-* Mon Apr 10 2006 Bill Nottingham <notting at redhat.com> - 1.11-3
+* Mon Apr 10 2006 Bill Nottingham <notting at redhat.com> - 1.11-2.fc5
 - add buildreq for perl-HTML-TableExtract
 - clean up sed
 



From fedora-extras-commits at redhat.com  Tue Apr 11 21:43:42 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 11 Apr 2006 14:43:42 -0700
Subject: rpms/perl-Finance-Quote/FC-4 perl-Finance-Quote.spec,1.1,1.2
Message-ID: <200604112143.k3BLhiSV004714@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/perl-Finance-Quote/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4683/FC-4

Modified Files:
	perl-Finance-Quote.spec 
Log Message:
bump



Index: perl-Finance-Quote.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Finance-Quote/FC-4/perl-Finance-Quote.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Finance-Quote.spec	11 Apr 2006 17:17:58 -0000	1.1
+++ perl-Finance-Quote.spec	11 Apr 2006 21:43:42 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Finance-Quote
 Version:        1.11
-Release: 	3
+Release: 	2.fc4
 Summary:        A Perl module that retrieves stock and mutual fund quotes
 Group:          Development/Libraries
 License:        GPL
@@ -45,7 +45,7 @@
 
 
 %changelog
-* Mon Apr 10 2006 Bill Nottingham <notting at redhat.com> - 1.11-3
+* Mon Apr 10 2006 Bill Nottingham <notting at redhat.com> - 1.11-2.fc4
 - add buildreq for perl-HTML-TableExtract
 - clean up sed
 



From fedora-extras-commits at redhat.com  Tue Apr 11 21:59:22 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 11 Apr 2006 14:59:22 -0700
Subject: rpms/libsexy/FC-4 .cvsignore, 1.4, 1.5 libsexy.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <200604112159.k3BLxPZn004782@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	.cvsignore libsexy.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsexy/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 Nov 2005 05:57:22 -0000	1.4
+++ .cvsignore	11 Apr 2006 21:59:22 -0000	1.5
@@ -1 +1 @@
-libsexy-0.1.4.tar.gz
+libsexy-0.1.8.tar.gz


Index: libsexy.spec
===================================================================
RCS file: /cvs/extras/rpms/libsexy/FC-4/libsexy.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libsexy.spec	11 Nov 2005 05:57:22 -0000	1.4
+++ libsexy.spec	11 Apr 2006 21:59:22 -0000	1.5
@@ -1,19 +1,19 @@
 Name:           libsexy
-Version:        0.1.4
+Version:        0.1.8
 Release:        1%{?dist}
-Summary:        Sexy new graphical widgets for GTK+ 2
+Summary:        Funky fresh graphical widgets for GTK+ 2
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://wiki.chipx86.com/wiki/Libsexy
-Source0:        http://osiris.chipx86.com/projects/libsexy/releases/%{name}-%{version}.tar.gz
+Source0:        http://releases.chipx86.com/libsexy/libsexy/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk2-devel libxml2-devel enchant-devel
+BuildRequires:  gtk2-devel libxml2-devel
+Requires:       enchant
 
 %description
-Some sexy new graphical widgets for GTK+ 2 applications. Doing naughty things
-to good widgets!
+Some funky fresh graphical widgets for GTK+ 2 applications.
 
 %package        devel
 Summary:        Headers and libraries for developing with libsexy
@@ -28,7 +28,7 @@
 %setup -q
 
 %build
-%configure --disable-static
+%configure --disable-static --enable-gtk-doc
 make %{?_smp_mflags}
 
 %install
@@ -50,11 +50,15 @@
 
 %files devel
 %defattr(-,root,root,-)
+%{_datadir}/gtk-doc/html/%{name}
 %{_includedir}/%{name}
 %{_libdir}/%{name}.so
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Tue Apr 11 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.1.8-1
+- Upstream update
+
 * Wed Nov  9 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.1.4-1
 - Upstream update
 - Build with enchant (#172577)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsexy/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Nov 2005 05:57:22 -0000	1.4
+++ sources	11 Apr 2006 21:59:22 -0000	1.5
@@ -1 +1 @@
-2fb4072a740b9ab4ad2ff5a323f7fd3d  libsexy-0.1.4.tar.gz
+ddc52cc8196f9f0bf48a5c7569b6bb38  libsexy-0.1.8.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 22:14:54 2006
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Apr 2006 15:14:54 -0700
Subject: rpms/oddjob import.log,1.5,1.6
Message-ID: <200604112214.k3BMEul9007007@cvs-int.fedora.redhat.com>

Author: nalin

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

Modified Files:
	import.log 
Log Message:
auto-import oddjob-0.25-1 on branch devel from oddjob-0.25-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/oddjob/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	28 Feb 2006 06:58:32 -0000	1.5
+++ import.log	11 Apr 2006 22:14:53 -0000	1.6
@@ -2,3 +2,4 @@
 oddjob-0_24-1:FC-3:oddjob-0.24-1.src.rpm:1141109637
 oddjob-0_24-2:FC-4:oddjob-0.24-2.src.rpm:1141109813
 oddjob-0_24-3:HEAD:oddjob-0.24-3.src.rpm:1141109909
+oddjob-0_25-1:HEAD:oddjob-0.25-1.src.rpm:1144793690



From fedora-extras-commits at redhat.com  Tue Apr 11 22:14:54 2006
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Apr 2006 15:14:54 -0700
Subject: rpms/oddjob/devel .cvsignore, 1.3, 1.4 oddjob.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <200604112214.k3BMEuG0007013@cvs-int.fedora.redhat.com>

Author: nalin

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

Modified Files:
	.cvsignore oddjob.spec sources 
Log Message:
auto-import oddjob-0.25-1 on branch devel from oddjob-0.25-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/oddjob/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Feb 2006 06:58:38 -0000	1.3
+++ .cvsignore	11 Apr 2006 22:14:54 -0000	1.4
@@ -1 +1 @@
-oddjob-0.24-1.tar.gz
+oddjob-0.25-1.tar.gz


Index: oddjob.spec
===================================================================
RCS file: /cvs/extras/rpms/oddjob/devel/oddjob.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- oddjob.spec	28 Feb 2006 06:58:38 -0000	1.2
+++ oddjob.spec	11 Apr 2006 22:14:54 -0000	1.3
@@ -1,8 +1,8 @@
 %define build_sample 0
 
 Name: oddjob
-Version: 0.24
-Release: 3
+Version: 0.25
+Release: 1
 Source: http://people.redhat.com/nalin/oddjob/oddjob-%{version}-1.tar.gz
 Summary: A D-BUS service which runs odd jobs on behalf of client applications
 License: BSD
@@ -102,6 +102,7 @@
 %config(noreplace) %{_sysconfdir}/dbus-*/system.d/oddjob.conf
 %config(noreplace) %{_sysconfdir}/oddjobd.conf
 %dir %{_sysconfdir}/oddjobd.conf.d
+%config %{_sysconfdir}/oddjobd.conf.d/oddjobd-introspection.conf
 %dir %{_sysconfdir}/%{name}
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/mkhomedir
@@ -142,11 +143,11 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
-* Tue Feb 28 2006 Nalin Dahyabhai <nalin at redhat.com> 0.24-3
-- rebuild
-
-* Tue Feb 28 2006 Nalin Dahyabhai <nalin at redhat.com> 0.24-2
-- rebuild
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-1
+- update to 0.25:
+  - add introspection for parents of objects specified in the configuration
+  - oddjobd can reload its configuration now
+  - add -u (umask) and -s (skeldir) flags to the mkhomedir helper
 
 * Tue Feb 28 2006 Nalin Dahyabhai <nalin at redhat.com> 0.24-1
 - update to 0.24, fixing some build errors against D-BUS 0.30-0.33


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/oddjob/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Feb 2006 06:58:38 -0000	1.3
+++ sources	11 Apr 2006 22:14:54 -0000	1.4
@@ -1 +1 @@
-c44b3161ca2e6c30107e597976cc296d  oddjob-0.24-1.tar.gz
+097d0a926874551a661f33d4c2db5169  oddjob-0.25-1.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 22:16:42 2006
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Apr 2006 15:16:42 -0700
Subject: rpms/oddjob/devel oddjob.spec,1.3,1.4
Message-ID: <200604112216.k3BMGiho007106@cvs-int.fedora.redhat.com>

Author: nalin

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

Modified Files:
	oddjob.spec 
Log Message:
auto-import oddjob-0.25-2 on branch devel from oddjob-0.25-2.src.rpm


Index: oddjob.spec
===================================================================
RCS file: /cvs/extras/rpms/oddjob/devel/oddjob.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- oddjob.spec	11 Apr 2006 22:14:54 -0000	1.3
+++ oddjob.spec	11 Apr 2006 22:16:42 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name: oddjob
 Version: 0.25
-Release: 1
+Release: 2
 Source: http://people.redhat.com/nalin/oddjob/oddjob-%{version}-1.tar.gz
 Summary: A D-BUS service which runs odd jobs on behalf of client applications
 License: BSD
@@ -143,6 +143,9 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-2
+- rebuild
+
 * Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-1
 - update to 0.25:
   - add introspection for parents of objects specified in the configuration



From fedora-extras-commits at redhat.com  Tue Apr 11 22:16:42 2006
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Apr 2006 15:16:42 -0700
Subject: rpms/oddjob import.log,1.6,1.7
Message-ID: <200604112216.k3BMGiMK007102@cvs-int.fedora.redhat.com>

Author: nalin

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/oddjob/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	11 Apr 2006 22:14:53 -0000	1.6
+++ import.log	11 Apr 2006 22:16:41 -0000	1.7
@@ -3,3 +3,4 @@
 oddjob-0_24-2:FC-4:oddjob-0.24-2.src.rpm:1141109813
 oddjob-0_24-3:HEAD:oddjob-0.24-3.src.rpm:1141109909
 oddjob-0_25-1:HEAD:oddjob-0.25-1.src.rpm:1144793690
+oddjob-0_25-2:HEAD:oddjob-0.25-2.src.rpm:1144793797



From fedora-extras-commits at redhat.com  Tue Apr 11 22:17:17 2006
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Apr 2006 15:17:17 -0700
Subject: rpms/oddjob import.log,1.7,1.8
Message-ID: <200604112217.k3BMHJ1L007192@cvs-int.fedora.redhat.com>

Author: nalin

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/oddjob/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	11 Apr 2006 22:16:41 -0000	1.7
+++ import.log	11 Apr 2006 22:17:16 -0000	1.8
@@ -4,3 +4,4 @@
 oddjob-0_24-3:HEAD:oddjob-0.24-3.src.rpm:1141109909
 oddjob-0_25-1:HEAD:oddjob-0.25-1.src.rpm:1144793690
 oddjob-0_25-2:HEAD:oddjob-0.25-2.src.rpm:1144793797
+oddjob-0_25-3:HEAD:oddjob-0.25-3.src.rpm:1144793832



From fedora-extras-commits at redhat.com  Tue Apr 11 22:17:17 2006
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Apr 2006 15:17:17 -0700
Subject: rpms/oddjob/devel oddjob.spec,1.4,1.5
Message-ID: <200604112217.k3BMHJqY007196@cvs-int.fedora.redhat.com>

Author: nalin

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

Modified Files:
	oddjob.spec 
Log Message:
auto-import oddjob-0.25-3 on branch devel from oddjob-0.25-3.src.rpm


Index: oddjob.spec
===================================================================
RCS file: /cvs/extras/rpms/oddjob/devel/oddjob.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- oddjob.spec	11 Apr 2006 22:16:42 -0000	1.4
+++ oddjob.spec	11 Apr 2006 22:17:17 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name: oddjob
 Version: 0.25
-Release: 2
+Release: 3
 Source: http://people.redhat.com/nalin/oddjob/oddjob-%{version}-1.tar.gz
 Summary: A D-BUS service which runs odd jobs on behalf of client applications
 License: BSD
@@ -143,6 +143,9 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-3
+- rebuild
+
 * Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-2
 - rebuild
 



From fedora-extras-commits at redhat.com  Tue Apr 11 22:17:48 2006
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Apr 2006 15:17:48 -0700
Subject: rpms/oddjob import.log,1.8,1.9
Message-ID: <200604112217.k3BMHoYE007282@cvs-int.fedora.redhat.com>

Author: nalin

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

Modified Files:
	import.log 
Log Message:
auto-import oddjob-0.25-4 on branch devel from oddjob-0.25-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/oddjob/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	11 Apr 2006 22:17:16 -0000	1.8
+++ import.log	11 Apr 2006 22:17:47 -0000	1.9
@@ -5,3 +5,4 @@
 oddjob-0_25-1:HEAD:oddjob-0.25-1.src.rpm:1144793690
 oddjob-0_25-2:HEAD:oddjob-0.25-2.src.rpm:1144793797
 oddjob-0_25-3:HEAD:oddjob-0.25-3.src.rpm:1144793832
+oddjob-0_25-4:HEAD:oddjob-0.25-4.src.rpm:1144793863



From fedora-extras-commits at redhat.com  Tue Apr 11 22:17:48 2006
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Apr 2006 15:17:48 -0700
Subject: rpms/oddjob/devel oddjob.spec,1.5,1.6
Message-ID: <200604112217.k3BMHo0m007286@cvs-int.fedora.redhat.com>

Author: nalin

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

Modified Files:
	oddjob.spec 
Log Message:
auto-import oddjob-0.25-4 on branch devel from oddjob-0.25-4.src.rpm


Index: oddjob.spec
===================================================================
RCS file: /cvs/extras/rpms/oddjob/devel/oddjob.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- oddjob.spec	11 Apr 2006 22:17:17 -0000	1.5
+++ oddjob.spec	11 Apr 2006 22:17:48 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name: oddjob
 Version: 0.25
-Release: 3
+Release: 4
 Source: http://people.redhat.com/nalin/oddjob/oddjob-%{version}-1.tar.gz
 Summary: A D-BUS service which runs odd jobs on behalf of client applications
 License: BSD
@@ -143,6 +143,9 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-4
+- rebuild
+
 * Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-3
 - rebuild
 



From fedora-extras-commits at redhat.com  Tue Apr 11 22:18:57 2006
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Apr 2006 15:18:57 -0700
Subject: rpms/oddjob import.log,1.9,1.10
Message-ID: <200604112218.k3BMIxa1007390@cvs-int.fedora.redhat.com>

Author: nalin

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

Modified Files:
	import.log 
Log Message:
auto-import oddjob-0.25-1 on branch FC-3 from oddjob-0.25-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/oddjob/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- import.log	11 Apr 2006 22:17:47 -0000	1.9
+++ import.log	11 Apr 2006 22:18:57 -0000	1.10
@@ -6,3 +6,4 @@
 oddjob-0_25-2:HEAD:oddjob-0.25-2.src.rpm:1144793797
 oddjob-0_25-3:HEAD:oddjob-0.25-3.src.rpm:1144793832
 oddjob-0_25-4:HEAD:oddjob-0.25-4.src.rpm:1144793863
+oddjob-0_25-1:FC-3:oddjob-0.25-1.src.rpm:1144793933



From fedora-extras-commits at redhat.com  Tue Apr 11 22:18:58 2006
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Apr 2006 15:18:58 -0700
Subject: rpms/oddjob/FC-3 .cvsignore, 1.3, 1.4 oddjob.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <200604112219.k3BMJ0J0007396@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/oddjob/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7357/FC-3

Modified Files:
	.cvsignore oddjob.spec sources 
Log Message:
auto-import oddjob-0.25-1 on branch FC-3 from oddjob-0.25-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/oddjob/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Feb 2006 06:54:07 -0000	1.3
+++ .cvsignore	11 Apr 2006 22:18:57 -0000	1.4
@@ -1 +1 @@
-oddjob-0.24-1.tar.gz
+oddjob-0.25-1.tar.gz


Index: oddjob.spec
===================================================================
RCS file: /cvs/extras/rpms/oddjob/FC-3/oddjob.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- oddjob.spec	28 Feb 2006 06:54:07 -0000	1.3
+++ oddjob.spec	11 Apr 2006 22:18:57 -0000	1.4
@@ -1,7 +1,7 @@
 %define build_sample 0
 
 Name: oddjob
-Version: 0.24
+Version: 0.25
 Release: 1
 Source: http://people.redhat.com/nalin/oddjob/oddjob-%{version}-1.tar.gz
 Summary: A D-BUS service which runs odd jobs on behalf of client applications
@@ -102,6 +102,7 @@
 %config(noreplace) %{_sysconfdir}/dbus-*/system.d/oddjob.conf
 %config(noreplace) %{_sysconfdir}/oddjobd.conf
 %dir %{_sysconfdir}/oddjobd.conf.d
+%config %{_sysconfdir}/oddjobd.conf.d/oddjobd-introspection.conf
 %dir %{_sysconfdir}/%{name}
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/mkhomedir
@@ -142,6 +143,12 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-1
+- update to 0.25:
+  - add introspection for parents of objects specified in the configuration
+  - oddjobd can reload its configuration now
+  - add -u (umask) and -s (skeldir) flags to the mkhomedir helper
+
 * Tue Feb 28 2006 Nalin Dahyabhai <nalin at redhat.com> 0.24-1
 - update to 0.24, fixing some build errors against D-BUS 0.30-0.33
 - require xmlto, because the generated HTML differs depending on whether


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/oddjob/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Feb 2006 06:54:07 -0000	1.3
+++ sources	11 Apr 2006 22:18:57 -0000	1.4
@@ -1 +1 @@
-c44b3161ca2e6c30107e597976cc296d  oddjob-0.24-1.tar.gz
+097d0a926874551a661f33d4c2db5169  oddjob-0.25-1.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 22:21:02 2006
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Apr 2006 15:21:02 -0700
Subject: rpms/oddjob import.log,1.10,1.11
Message-ID: <200604112221.k3BML4Lq007529@cvs-int.fedora.redhat.com>

Author: nalin

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

Modified Files:
	import.log 
Log Message:
auto-import oddjob-0.25-5 on branch FC-3 from oddjob-0.25-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/oddjob/import.log,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- import.log	11 Apr 2006 22:18:57 -0000	1.10
+++ import.log	11 Apr 2006 22:21:01 -0000	1.11
@@ -7,3 +7,4 @@
 oddjob-0_25-3:HEAD:oddjob-0.25-3.src.rpm:1144793832
 oddjob-0_25-4:HEAD:oddjob-0.25-4.src.rpm:1144793863
 oddjob-0_25-1:FC-3:oddjob-0.25-1.src.rpm:1144793933
+oddjob-0_25-5:FC-3:oddjob-0.25-5.src.rpm:1144794057



From fedora-extras-commits at redhat.com  Tue Apr 11 22:21:02 2006
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Apr 2006 15:21:02 -0700
Subject: rpms/oddjob/FC-3 oddjob.spec,1.4,1.5
Message-ID: <200604112221.k3BML42e007533@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/oddjob/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7498/FC-3

Modified Files:
	oddjob.spec 
Log Message:
auto-import oddjob-0.25-5 on branch FC-3 from oddjob-0.25-5.src.rpm


Index: oddjob.spec
===================================================================
RCS file: /cvs/extras/rpms/oddjob/FC-3/oddjob.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- oddjob.spec	11 Apr 2006 22:18:57 -0000	1.4
+++ oddjob.spec	11 Apr 2006 22:21:02 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name: oddjob
 Version: 0.25
-Release: 1
+Release: 5
 Source: http://people.redhat.com/nalin/oddjob/oddjob-%{version}-1.tar.gz
 Summary: A D-BUS service which runs odd jobs on behalf of client applications
 License: BSD
@@ -143,6 +143,18 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-5
+- rebuild
+
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-4
+- rebuild
+
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-3
+- rebuild
+
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-2
+- rebuild
+
 * Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-1
 - update to 0.25:
   - add introspection for parents of objects specified in the configuration



From fedora-extras-commits at redhat.com  Tue Apr 11 22:22:20 2006
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Apr 2006 15:22:20 -0700
Subject: rpms/oddjob import.log,1.11,1.12
Message-ID: <200604112222.k3BMMMnx007632@cvs-int.fedora.redhat.com>

Author: nalin

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

Modified Files:
	import.log 
Log Message:
auto-import oddjob-0.25-6 on branch FC-4 from oddjob-0.25-6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/oddjob/import.log,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- import.log	11 Apr 2006 22:21:01 -0000	1.11
+++ import.log	11 Apr 2006 22:22:20 -0000	1.12
@@ -8,3 +8,4 @@
 oddjob-0_25-4:HEAD:oddjob-0.25-4.src.rpm:1144793863
 oddjob-0_25-1:FC-3:oddjob-0.25-1.src.rpm:1144793933
 oddjob-0_25-5:FC-3:oddjob-0.25-5.src.rpm:1144794057
+oddjob-0_25-6:FC-4:oddjob-0.25-6.src.rpm:1144794136



From fedora-extras-commits at redhat.com  Tue Apr 11 22:22:21 2006
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Apr 2006 15:22:21 -0700
Subject: rpms/oddjob/FC-4 .cvsignore, 1.3, 1.4 oddjob.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <200604112222.k3BMMNDm007638@cvs-int.fedora.redhat.com>

Author: nalin

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

Modified Files:
	.cvsignore oddjob.spec sources 
Log Message:
auto-import oddjob-0.25-6 on branch FC-4 from oddjob-0.25-6.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/oddjob/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Feb 2006 06:57:02 -0000	1.3
+++ .cvsignore	11 Apr 2006 22:22:20 -0000	1.4
@@ -1 +1 @@
-oddjob-0.24-1.tar.gz
+oddjob-0.25-1.tar.gz


Index: oddjob.spec
===================================================================
RCS file: /cvs/extras/rpms/oddjob/FC-4/oddjob.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- oddjob.spec	28 Feb 2006 06:57:02 -0000	1.2
+++ oddjob.spec	11 Apr 2006 22:22:20 -0000	1.3
@@ -1,8 +1,8 @@
 %define build_sample 0
 
 Name: oddjob
-Version: 0.24
-Release: 2
+Version: 0.25
+Release: 6
 Source: http://people.redhat.com/nalin/oddjob/oddjob-%{version}-1.tar.gz
 Summary: A D-BUS service which runs odd jobs on behalf of client applications
 License: BSD
@@ -102,6 +102,7 @@
 %config(noreplace) %{_sysconfdir}/dbus-*/system.d/oddjob.conf
 %config(noreplace) %{_sysconfdir}/oddjobd.conf
 %dir %{_sysconfdir}/oddjobd.conf.d
+%config %{_sysconfdir}/oddjobd.conf.d/oddjobd-introspection.conf
 %dir %{_sysconfdir}/%{name}
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/mkhomedir
@@ -142,9 +143,27 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
-* Tue Feb 28 2006 Nalin Dahyabhai <nalin at redhat.com> 0.24-2
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-6
 - rebuild
 
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-5
+- rebuild
+
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-4
+- rebuild
+
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-3
+- rebuild
+
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-2
+- rebuild
+
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-1
+- update to 0.25:
+  - add introspection for parents of objects specified in the configuration
+  - oddjobd can reload its configuration now
+  - add -u (umask) and -s (skeldir) flags to the mkhomedir helper
+
 * Tue Feb 28 2006 Nalin Dahyabhai <nalin at redhat.com> 0.24-1
 - update to 0.24, fixing some build errors against D-BUS 0.30-0.33
 - require xmlto, because the generated HTML differs depending on whether


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/oddjob/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Feb 2006 06:57:02 -0000	1.3
+++ sources	11 Apr 2006 22:22:20 -0000	1.4
@@ -1 +1 @@
-c44b3161ca2e6c30107e597976cc296d  oddjob-0.24-1.tar.gz
+097d0a926874551a661f33d4c2db5169  oddjob-0.25-1.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 22:22:54 2006
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Apr 2006 15:22:54 -0700
Subject: rpms/oddjob import.log,1.12,1.13
Message-ID: <200604112223.k3BMNQ0K007733@cvs-int.fedora.redhat.com>

Author: nalin

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

Modified Files:
	import.log 
Log Message:
auto-import oddjob-0.25-7 on branch FC-5 from oddjob-0.25-7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/oddjob/import.log,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- import.log	11 Apr 2006 22:22:20 -0000	1.12
+++ import.log	11 Apr 2006 22:22:54 -0000	1.13
@@ -9,3 +9,4 @@
 oddjob-0_25-1:FC-3:oddjob-0.25-1.src.rpm:1144793933
 oddjob-0_25-5:FC-3:oddjob-0.25-5.src.rpm:1144794057
 oddjob-0_25-6:FC-4:oddjob-0.25-6.src.rpm:1144794136
+oddjob-0_25-7:FC-5:oddjob-0.25-7.src.rpm:1144794170



From fedora-extras-commits at redhat.com  Tue Apr 11 22:22:54 2006
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Apr 2006 15:22:54 -0700
Subject: rpms/oddjob/FC-5 .cvsignore, 1.3, 1.4 oddjob.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <200604112223.k3BMNRi8007738@cvs-int.fedora.redhat.com>

Author: nalin

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

Modified Files:
	.cvsignore oddjob.spec sources 
Log Message:
auto-import oddjob-0.25-7 on branch FC-5 from oddjob-0.25-7.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/oddjob/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Feb 2006 06:58:38 -0000	1.3
+++ .cvsignore	11 Apr 2006 22:22:54 -0000	1.4
@@ -1 +1 @@
-oddjob-0.24-1.tar.gz
+oddjob-0.25-1.tar.gz


Index: oddjob.spec
===================================================================
RCS file: /cvs/extras/rpms/oddjob/FC-5/oddjob.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- oddjob.spec	28 Feb 2006 06:58:38 -0000	1.2
+++ oddjob.spec	11 Apr 2006 22:22:54 -0000	1.3
@@ -1,8 +1,8 @@
 %define build_sample 0
 
 Name: oddjob
-Version: 0.24
-Release: 3
+Version: 0.25
+Release: 7
 Source: http://people.redhat.com/nalin/oddjob/oddjob-%{version}-1.tar.gz
 Summary: A D-BUS service which runs odd jobs on behalf of client applications
 License: BSD
@@ -102,6 +102,7 @@
 %config(noreplace) %{_sysconfdir}/dbus-*/system.d/oddjob.conf
 %config(noreplace) %{_sysconfdir}/oddjobd.conf
 %dir %{_sysconfdir}/oddjobd.conf.d
+%config %{_sysconfdir}/oddjobd.conf.d/oddjobd-introspection.conf
 %dir %{_sysconfdir}/%{name}
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/mkhomedir
@@ -142,12 +143,30 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
-* Tue Feb 28 2006 Nalin Dahyabhai <nalin at redhat.com> 0.24-3
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-7
 - rebuild
 
-* Tue Feb 28 2006 Nalin Dahyabhai <nalin at redhat.com> 0.24-2
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-6
 - rebuild
 
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-5
+- rebuild
+
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-4
+- rebuild
+
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-3
+- rebuild
+
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-2
+- rebuild
+
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-1
+- update to 0.25:
+  - add introspection for parents of objects specified in the configuration
+  - oddjobd can reload its configuration now
+  - add -u (umask) and -s (skeldir) flags to the mkhomedir helper
+
 * Tue Feb 28 2006 Nalin Dahyabhai <nalin at redhat.com> 0.24-1
 - update to 0.24, fixing some build errors against D-BUS 0.30-0.33
 - require xmlto, because the generated HTML differs depending on whether


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/oddjob/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Feb 2006 06:58:38 -0000	1.3
+++ sources	11 Apr 2006 22:22:54 -0000	1.4
@@ -1 +1 @@
-c44b3161ca2e6c30107e597976cc296d  oddjob-0.24-1.tar.gz
+097d0a926874551a661f33d4c2db5169  oddjob-0.25-1.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 22:23:58 2006
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Apr 2006 15:23:58 -0700
Subject: rpms/oddjob import.log,1.13,1.14
Message-ID: <200604112224.k3BMO03p007829@cvs-int.fedora.redhat.com>

Author: nalin

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

Modified Files:
	import.log 
Log Message:
auto-import oddjob-0.25-8 on branch devel from oddjob-0.25-8.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/oddjob/import.log,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- import.log	11 Apr 2006 22:22:54 -0000	1.13
+++ import.log	11 Apr 2006 22:23:57 -0000	1.14
@@ -10,3 +10,4 @@
 oddjob-0_25-5:FC-3:oddjob-0.25-5.src.rpm:1144794057
 oddjob-0_25-6:FC-4:oddjob-0.25-6.src.rpm:1144794136
 oddjob-0_25-7:FC-5:oddjob-0.25-7.src.rpm:1144794170
+oddjob-0_25-8:HEAD:oddjob-0.25-8.src.rpm:1144794233



From fedora-extras-commits at redhat.com  Tue Apr 11 22:23:58 2006
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Apr 2006 15:23:58 -0700
Subject: rpms/oddjob/devel oddjob.spec,1.6,1.7
Message-ID: <200604112224.k3BMO01S007833@cvs-int.fedora.redhat.com>

Author: nalin

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

Modified Files:
	oddjob.spec 
Log Message:
auto-import oddjob-0.25-8 on branch devel from oddjob-0.25-8.src.rpm


Index: oddjob.spec
===================================================================
RCS file: /cvs/extras/rpms/oddjob/devel/oddjob.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- oddjob.spec	11 Apr 2006 22:17:48 -0000	1.6
+++ oddjob.spec	11 Apr 2006 22:23:58 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name: oddjob
 Version: 0.25
-Release: 4
+Release: 8
 Source: http://people.redhat.com/nalin/oddjob/oddjob-%{version}-1.tar.gz
 Summary: A D-BUS service which runs odd jobs on behalf of client applications
 License: BSD
@@ -143,6 +143,18 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-8
+- rebuild
+
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-7
+- rebuild
+
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-6
+- rebuild
+
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-5
+- rebuild
+
 * Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-4
 - rebuild
 



From fedora-extras-commits at redhat.com  Tue Apr 11 22:28:39 2006
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Tue, 11 Apr 2006 15:28:39 -0700
Subject: rpms/monotone/FC-5 .cvsignore, 1.6, 1.7 README.monotone-server, 1.1,
	1.2 monotone-xfail-if-root.patch, 1.3, 1.4 monotone.init, 1.3,
	1.4 monotone.spec, 1.10, 1.11 monotone.sysconfig, 1.2,
	1.3 sources, 1.6, 1.7 monotone-0.24-gcc41.patch, 1.1, NONE
Message-ID: <200604112228.k3BMSf8K007945@cvs-int.fedora.redhat.com>

Author: roland

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

Modified Files:
	.cvsignore README.monotone-server monotone-xfail-if-root.patch 
	monotone.init monotone.spec monotone.sysconfig sources 
Removed Files:
	monotone-0.24-gcc41.patch 
Log Message:
New upstream version 0.26


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Jan 2006 11:34:11 -0000	1.6
+++ .cvsignore	11 Apr 2006 22:28:39 -0000	1.7
@@ -1 +1 @@
-monotone-0.25.tar.gz
+monotone-0.26.tar.gz


Index: README.monotone-server
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-5/README.monotone-server,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.monotone-server	13 Dec 2005 07:35:07 -0000	1.1
+++ README.monotone-server	11 Apr 2006 22:28:39 -0000	1.2
@@ -35,7 +35,7 @@
 put a key in the server's database easily with "service monotone import",
 e.g. to import the public key for a private key in ~/.monotone/keys:
 
-	monotone pubkey me at my.com | sudo service monotone import
+	mtn pubkey me at my.com | sudo service monotone import
 
 For problems with this package or its scripts, please file bugs
 at http://bugzilla.redhat.com/ for the "monotone" component

monotone-xfail-if-root.patch:

Index: monotone-xfail-if-root.patch
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-5/monotone-xfail-if-root.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- monotone-xfail-if-root.patch	6 Jan 2006 11:34:11 -0000	1.3
+++ monotone-xfail-if-root.patch	11 Apr 2006 22:28:39 -0000	1.4
@@ -1,6 +1,17 @@
---- monotone-0.23/testsuite
-+++ monotone-0.23/testsuite
-@@ -67479,7 +67479,7 @@ $at_traceon
+--- monotone/tests/t_checkout_dir.at
++++ monotone/tests/t_checkout_dir.at
+@@ -20,7 +20,7 @@ AT_CHECK(MTN --branch=testbranch checkou
+ mkdir test_dir4
+ chmod 444 test_dir4
+ # XFAIL if run as root (hi Gentoo!)
+-AT_XFAIL_IF(test -O /)
++AT_XFAIL_IF(test -w test_dir4)
+ AT_CHECK(MTN --branch=testbranch checkout test_dir4,
+          [1], [ignore], [ignore])
+ AT_CHECK(MTN --branch=testbranch checkout test_dir4/subdir,
+--- monotone/testsuite
++++ monotone/testsuite
+@@ -69608,7 +69608,7 @@ $at_traceon
      at_desc='checkout validates target directory'
      $at_quiet $ECHO_N " 64: checkout validates target directory          $ECHO_C"
      at_xfail=no
@@ -9,14 +20,3 @@
      (
        echo "64. t_checkout_dir.at:1: testing ..."
        $at_traceon
---- monotone-0.23/tests/t_checkout_dir.at
-+++ monotone-0.23/tests/t_checkout_dir.at
-@@ -20,7 +20,7 @@ AT_CHECK(MONOTONE --branch=testbranch ch
- mkdir test_dir4
- chmod 444 test_dir4
- # XFAIL if run as root (hi Gentoo!)
--AT_XFAIL_IF(test -O /)
-+AT_XFAIL_IF(test -w test_dir4)
- AT_CHECK(MONOTONE --branch=testbranch checkout test_dir4,
-          [1], [ignore], [ignore])
- AT_CHECK(MONOTONE --branch=testbranch checkout test_dir4/subdir,


Index: monotone.init
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-5/monotone.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- monotone.init	13 Dec 2005 07:35:07 -0000	1.3
+++ monotone.init	11 Apr 2006 22:28:39 -0000	1.4
@@ -24,9 +24,10 @@
 # By default it's all good
 RETVAL=0
 
-MT=/usr/bin/monotone
+MT=/usr/bin/mtn
 MTSERVER=/usr/sbin/monotone-server
 MONOTONE_LOGFILE=${MONOTONE_LOGFILE:-/var/log/monotone.log}
+MONOTONE_OLDDB=/var/db/monotone/server.db
 
 random_passphrase()
 {
@@ -42,6 +43,11 @@
   start)
 	if [ -e $MONOTONE_DBFILE ]; then
 		$0 migrate
+	elif [ -e $MONOTONE_OLDDB ]; then
+		echo -n $"Pre-0.26 monotone database must be migrated by hand: "
+		failure
+		echo
+		false
 	else
 		$0 init
 	fi
@@ -86,7 +92,7 @@
 	RETVAL=$?
 	;;
   init)
-	echo -n $"Initializing database" "$MONOTONE_DBFILE" ": "
+	echo -n $"Initializing database" "${MONOTONE_DBFILE}: "
 	{ [ -d /var/db/monotone ] ||
  	  /usr/bin/install -o ${MONOTONE_USER:-monotone} \
 			   -g ${MONOTONE_GROUP:-monotone} \


Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-5/monotone.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- monotone.spec	28 Feb 2006 18:58:17 -0000	1.10
+++ monotone.spec	11 Apr 2006 22:28:39 -0000	1.11
@@ -1,6 +1,6 @@
 Name: monotone
-Version: 0.25
-Release: 3%{?dist}
+Version: 0.26
+Release: 1%{?dist}
 
 Summary: A free, distributed version control system
 Group: Development/Tools
@@ -75,6 +75,7 @@
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 rm -f %{buildroot}%{_infodir}/dir
+rm -f %{buildroot}%{_datadir}/doc/monotone/monotone.html
 
 %find_lang %{name}
 
@@ -87,7 +88,7 @@
 mkdir -p %{buildroot}/etc/init.d
 mkdir -p %{buildroot}/etc/sysconfig
 mkdir -p %{buildroot}/var/db
-ln -snf ../bin/monotone %{buildroot}%{_sbindir}/monotone-server
+ln -snf ../bin/mtn %{buildroot}%{_sbindir}/monotone-server
 %{__install} -c -m 0555 %{SOURCE1} %{buildroot}/etc/init.d/monotone
 %{__install} -c -m 0644 %{SOURCE2} %{buildroot}/etc/sysconfig/monotone
 %{__install} -d -m 0755 %{buildroot}/etc/monotone
@@ -99,7 +100,7 @@
 %{__install} -c -m 0640 /dev/null %{buildroot}/etc/monotone/read-permissions
 %{__install} -c -m 0640 /dev/null %{buildroot}/etc/monotone/write-permissions
 %{__install} -c -m 0644 /dev/null %{buildroot}/etc/monotone/monotonerc
-touch %{buildroot}/var/db/monotone/server.db
+touch %{buildroot}/var/db/monotone/server.mtn
 
 cp %{SOURCE3} .
 
@@ -124,9 +125,9 @@
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README README.changesets UPGRADE
 %doc monotone.html
 
-%{_bindir}/monotone
+%{_bindir}/mtn
 %{_infodir}/monotone.info*
-%{_mandir}/man1/monotone.1*
+%{_mandir}/man1/mtn.1*
 %{_datadir}/emacs/site-lisp/monotone*.el*
 
 
@@ -142,9 +143,8 @@
 %attr(0440,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/monotone/passphrase.lua
 %attr(0640,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/monotone/read-permissions
 %attr(0640,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/monotone/write-permissions
- %attr(0750,root,monotone) /etc/monotone/private-keys
 %dir %attr(0770,monotone,monotone) /var/db/monotone
-%attr(0660,monotone,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/db/monotone/server.db
+%attr(0660,monotone,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/db/monotone/server.mtn
 
 %pre server
 # Add the "monotone" user
@@ -166,8 +166,9 @@
 
 
 %changelog
-* Tue Feb 28 2006 Roland McGrath <roland at redhat.com> - 0.25-3
-- Rebuilt.
+* Mon Apr 10 2006 Roland McGrath <roland at redhat.com> - 0.26-1
+- Updated for 0.25 release.
+  - Major changes; see UPGRADE doc file for details.
 
 * Fri Jan  6 2006 Roland McGrath <roland at redhat.com> - 0.25-2
 - Restore testsuite fix for nonroot owner of / in build chroot.


Index: monotone.sysconfig
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-5/monotone.sysconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- monotone.sysconfig	13 Dec 2005 07:35:07 -0000	1.2
+++ monotone.sysconfig	11 Apr 2006 22:28:39 -0000	1.3
@@ -1,6 +1,6 @@
 MONOTONE_CONFDIR=/etc/monotone
 MONOTONE_KEYDIR=/etc/monotone/private-keys
-MONOTONE_DBFILE=/var/db/monotone/server.db
+MONOTONE_DBFILE=/var/db/monotone/server.mtn
 MONOTONE_PPFILE=/etc/monotone/passphrase.lua
 
 MONOTONE_RCOPTS="--confdir=$MONOTONE_CONFDIR"


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Jan 2006 11:34:11 -0000	1.6
+++ sources	11 Apr 2006 22:28:39 -0000	1.7
@@ -1 +1 @@
-fb0ad449cd0093854c55dbd5c6fc07e2  monotone-0.25.tar.gz
+21b902d1b48ffb868536d04c4ad38155  monotone-0.26.tar.gz


--- monotone-0.24-gcc41.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 11 22:29:29 2006
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Tue, 11 Apr 2006 15:29:29 -0700
Subject: rpms/monotone/FC-4 .cvsignore, 1.6, 1.7 README.monotone-server, 1.1,
	1.2 monotone-xfail-if-root.patch, 1.3, 1.4 monotone.init, 1.6,
	1.7 monotone.spec, 1.14, 1.15 monotone.sysconfig, 1.2,
	1.3 sources, 1.6, 1.7
Message-ID: <200604112229.k3BMTVUD008026@cvs-int.fedora.redhat.com>

Author: roland

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

Modified Files:
	.cvsignore README.monotone-server monotone-xfail-if-root.patch 
	monotone.init monotone.spec monotone.sysconfig sources 
Log Message:
New upstream version 0.26


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Jan 2006 09:29:34 -0000	1.6
+++ .cvsignore	11 Apr 2006 22:29:29 -0000	1.7
@@ -1 +1 @@
-monotone-0.25.tar.gz
+monotone-0.26.tar.gz


Index: README.monotone-server
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/README.monotone-server,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.monotone-server	12 Dec 2005 02:38:33 -0000	1.1
+++ README.monotone-server	11 Apr 2006 22:29:29 -0000	1.2
@@ -35,7 +35,7 @@
 put a key in the server's database easily with "service monotone import",
 e.g. to import the public key for a private key in ~/.monotone/keys:
 
-	monotone pubkey me at my.com | sudo service monotone import
+	mtn pubkey me at my.com | sudo service monotone import
 
 For problems with this package or its scripts, please file bugs
 at http://bugzilla.redhat.com/ for the "monotone" component

monotone-xfail-if-root.patch:

Index: monotone-xfail-if-root.patch
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/monotone-xfail-if-root.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- monotone-xfail-if-root.patch	6 Jan 2006 10:27:47 -0000	1.3
+++ monotone-xfail-if-root.patch	11 Apr 2006 22:29:29 -0000	1.4
@@ -1,6 +1,17 @@
---- monotone-0.23/testsuite
-+++ monotone-0.23/testsuite
-@@ -67479,7 +67479,7 @@ $at_traceon
+--- monotone/tests/t_checkout_dir.at
++++ monotone/tests/t_checkout_dir.at
+@@ -20,7 +20,7 @@ AT_CHECK(MTN --branch=testbranch checkou
+ mkdir test_dir4
+ chmod 444 test_dir4
+ # XFAIL if run as root (hi Gentoo!)
+-AT_XFAIL_IF(test -O /)
++AT_XFAIL_IF(test -w test_dir4)
+ AT_CHECK(MTN --branch=testbranch checkout test_dir4,
+          [1], [ignore], [ignore])
+ AT_CHECK(MTN --branch=testbranch checkout test_dir4/subdir,
+--- monotone/testsuite
++++ monotone/testsuite
+@@ -69608,7 +69608,7 @@ $at_traceon
      at_desc='checkout validates target directory'
      $at_quiet $ECHO_N " 64: checkout validates target directory          $ECHO_C"
      at_xfail=no
@@ -9,14 +20,3 @@
      (
        echo "64. t_checkout_dir.at:1: testing ..."
        $at_traceon
---- monotone-0.23/tests/t_checkout_dir.at
-+++ monotone-0.23/tests/t_checkout_dir.at
-@@ -20,7 +20,7 @@ AT_CHECK(MONOTONE --branch=testbranch ch
- mkdir test_dir4
- chmod 444 test_dir4
- # XFAIL if run as root (hi Gentoo!)
--AT_XFAIL_IF(test -O /)
-+AT_XFAIL_IF(test -w test_dir4)
- AT_CHECK(MONOTONE --branch=testbranch checkout test_dir4,
-          [1], [ignore], [ignore])
- AT_CHECK(MONOTONE --branch=testbranch checkout test_dir4/subdir,


Index: monotone.init
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/monotone.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- monotone.init	12 Dec 2005 02:38:33 -0000	1.6
+++ monotone.init	11 Apr 2006 22:29:29 -0000	1.7
@@ -24,9 +24,10 @@
 # By default it's all good
 RETVAL=0
 
-MT=/usr/bin/monotone
+MT=/usr/bin/mtn
 MTSERVER=/usr/sbin/monotone-server
 MONOTONE_LOGFILE=${MONOTONE_LOGFILE:-/var/log/monotone.log}
+MONOTONE_OLDDB=/var/db/monotone/server.db
 
 random_passphrase()
 {
@@ -42,6 +43,11 @@
   start)
 	if [ -e $MONOTONE_DBFILE ]; then
 		$0 migrate
+	elif [ -e $MONOTONE_OLDDB ]; then
+		echo -n $"Pre-0.26 monotone database must be migrated by hand: "
+		failure
+		echo
+		false
 	else
 		$0 init
 	fi
@@ -86,7 +92,7 @@
 	RETVAL=$?
 	;;
   init)
-	echo -n $"Initializing database" "$MONOTONE_DBFILE" ": "
+	echo -n $"Initializing database" "${MONOTONE_DBFILE}: "
 	{ [ -d /var/db/monotone ] ||
  	  /usr/bin/install -o ${MONOTONE_USER:-monotone} \
 			   -g ${MONOTONE_GROUP:-monotone} \


Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/monotone.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- monotone.spec	6 Jan 2006 10:27:47 -0000	1.14
+++ monotone.spec	11 Apr 2006 22:29:29 -0000	1.15
@@ -1,6 +1,6 @@
 Name: monotone
-Version: 0.25
-Release: 2%{?dist}
+Version: 0.26
+Release: 1%{?dist}
 
 Summary: A free, distributed version control system
 Group: Development/Tools
@@ -75,6 +75,7 @@
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 rm -f %{buildroot}%{_infodir}/dir
+rm -f %{buildroot}%{_datadir}/doc/monotone/monotone.html
 
 %find_lang %{name}
 
@@ -87,7 +88,7 @@
 mkdir -p %{buildroot}/etc/init.d
 mkdir -p %{buildroot}/etc/sysconfig
 mkdir -p %{buildroot}/var/db
-ln -snf ../bin/monotone %{buildroot}%{_sbindir}/monotone-server
+ln -snf ../bin/mtn %{buildroot}%{_sbindir}/monotone-server
 %{__install} -c -m 0555 %{SOURCE1} %{buildroot}/etc/init.d/monotone
 %{__install} -c -m 0644 %{SOURCE2} %{buildroot}/etc/sysconfig/monotone
 %{__install} -d -m 0755 %{buildroot}/etc/monotone
@@ -99,7 +100,7 @@
 %{__install} -c -m 0640 /dev/null %{buildroot}/etc/monotone/read-permissions
 %{__install} -c -m 0640 /dev/null %{buildroot}/etc/monotone/write-permissions
 %{__install} -c -m 0644 /dev/null %{buildroot}/etc/monotone/monotonerc
-touch %{buildroot}/var/db/monotone/server.db
+touch %{buildroot}/var/db/monotone/server.mtn
 
 cp %{SOURCE3} .
 
@@ -124,9 +125,9 @@
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README README.changesets UPGRADE
 %doc monotone.html
 
-%{_bindir}/monotone
+%{_bindir}/mtn
 %{_infodir}/monotone.info*
-%{_mandir}/man1/monotone.1*
+%{_mandir}/man1/mtn.1*
 %{_datadir}/emacs/site-lisp/monotone*.el*
 
 
@@ -142,9 +143,8 @@
 %attr(0440,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/monotone/passphrase.lua
 %attr(0640,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/monotone/read-permissions
 %attr(0640,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/monotone/write-permissions
- %attr(0750,root,monotone) /etc/monotone/private-keys
 %dir %attr(0770,monotone,monotone) /var/db/monotone
-%attr(0660,monotone,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/db/monotone/server.db
+%attr(0660,monotone,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/db/monotone/server.mtn
 
 %pre server
 # Add the "monotone" user
@@ -166,6 +166,10 @@
 
 
 %changelog
+* Mon Apr 10 2006 Roland McGrath <roland at redhat.com> - 0.26-1
+- Updated for 0.25 release.
+  - Major changes; see UPGRADE doc file for details.
+
 * Fri Jan  6 2006 Roland McGrath <roland at redhat.com> - 0.25-2
 - Restore testsuite fix for nonroot owner of / in build chroot.
 


Index: monotone.sysconfig
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/monotone.sysconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- monotone.sysconfig	12 Dec 2005 02:38:33 -0000	1.2
+++ monotone.sysconfig	11 Apr 2006 22:29:29 -0000	1.3
@@ -1,6 +1,6 @@
 MONOTONE_CONFDIR=/etc/monotone
 MONOTONE_KEYDIR=/etc/monotone/private-keys
-MONOTONE_DBFILE=/var/db/monotone/server.db
+MONOTONE_DBFILE=/var/db/monotone/server.mtn
 MONOTONE_PPFILE=/etc/monotone/passphrase.lua
 
 MONOTONE_RCOPTS="--confdir=$MONOTONE_CONFDIR"


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Jan 2006 09:29:34 -0000	1.6
+++ sources	11 Apr 2006 22:29:29 -0000	1.7
@@ -1 +1 @@
-fb0ad449cd0093854c55dbd5c6fc07e2  monotone-0.25.tar.gz
+21b902d1b48ffb868536d04c4ad38155  monotone-0.26.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 22:45:34 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 11 Apr 2006 15:45:34 -0700
Subject: rpms/cernlib/devel 211-fix-comis-on-ia64-alpha.dpatch, NONE,
	1.1 319-work-around-imake-segfaults.dpatch, NONE,
	1.1 cernlib_2005.05.09.dfsg-5.diff, NONE, 1.1 patchy-case.patch,
	NONE, 1.1 patchy-fcasplit.patch, NONE,
	1.1 patchy-insecure_tmp_use.diff, NONE, 1.1 patchy-p4comp.patch,
	NONE, 1.1 patchy-perror.patch, NONE, 1.1 patchy-rceta.patch,
	NONE, 1.1 211-fix-comis-on-amd64.dpatch, 1.1,
	1.2 307-use-canonical-cfortran.dpatch, 1.2,
	1.3 800-implement-shared-library-rules-in-Imake.dpatch, 1.1,
	1.2 cernlib-gfortran.diff, 1.1, 1.2 cernlib.spec, 1.19,
	1.20 paw.README, 1.3, 1.4 211-fix-comis-on-ia64.dpatch, 1.1,
	NONE cernlib_2005.05.09.dfsg-3.diff, 1.1, NONE
Message-ID: <200604112245.k3BMjbkl008181@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	211-fix-comis-on-amd64.dpatch 
	307-use-canonical-cfortran.dpatch 
	800-implement-shared-library-rules-in-Imake.dpatch 
	cernlib-gfortran.diff cernlib.spec paw.README 
Added Files:
	211-fix-comis-on-ia64-alpha.dpatch 
	319-work-around-imake-segfaults.dpatch 
	cernlib_2005.05.09.dfsg-5.diff patchy-case.patch 
	patchy-fcasplit.patch patchy-insecure_tmp_use.diff 
	patchy-p4comp.patch patchy-perror.patch patchy-rceta.patch 
Removed Files:
	211-fix-comis-on-ia64.dpatch cernlib_2005.05.09.dfsg-3.diff 
Log Message:
* Tue Apr 11 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-14
- add patchy version 4 and build cernlib patchy. From Mattias Ellert.
- update to newer debian patchset



--- NEW FILE 211-fix-comis-on-ia64-alpha.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 211-fix-comis-on-ia64-alpha.dpatch by  <kmccarty at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Further patch building on Harald Vogt's amd64 patch attempting to
## DP: fix PAW on Itanium/Alpha Linux.  This does not yet work completely...

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/ccopys.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/ccopys.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/ccopys.c	2006-03-24 15:36:37.723420777 -0500
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/ccopys.c	2006-03-24 15:36:45.236828642 -0500
@@ -39,12 +39,45 @@
  * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005)
  */
 
+/* For Itanium and Alpha, the situation is even worse.  Itanium architecture
+ * has the data section starts at 0x6000000000000000.  The stack is
+ * supposed to be between 0x80...0 and 0xa0...0 starting at the high end
+ * and growing downwards, although on a test machine (merulo.debian.org)
+ * it seemed instead to start at 0x6000100000000000 and grow downwards.
+ * The addresses we actually get are truncated to the lowest 32 bits,
+ * so we assume that those greater than 0x80000000 are in the stack.
+ *
+ * Constant strings are in the text section starting at 0x40...0; we hope
+ * this function doesn't receive any.
+ *
+ * On Alpha, on the other hand, I couldn't find any docs for the Linux
+ * segmentation for virtual memory.  Judging by a test machine
+ * (escher.debian.org), the data section starts slightly above 0x120010000.
+ * On the other hand the stack grows downward from 0x120000000.  Here it
+ * seems safe to suppose that the variable is in the stack if the uint32
+ * truncated address received is less than 0x20000000.
+ * 
+ * -- Kevin McCarty
+ */
+	
 #if defined(CERNLIB_QMLXIA64)
      int *ja, *jb;
      int *nn;
 {
   int i,n; char *a,*b;
   n=*nn; a=*ja; b=*jb;
+# if defined (__ia64__) || defined (__alpha__)
+#  if defined (__ia64__)
+#   define autotest(_var) ((unsigned long)(_var) > 0x80000000)
+#  else /* __alpha__ */
+#   define autotest(_var) ((unsigned long)(_var) < 0x20000000)
+#  endif
+  static int dummy = 0;
+  unsigned long staticbase = ((unsigned long)&dummy) & 0xffffffff00000000L;
+  unsigned long autobase = ((unsigned long)&i) & 0xffffffff00000000L;
+  a = (unsigned long)a + (autotest(a) ? autobase : staticbase);
+  b = (unsigned long)b + (autotest(b) ? autobase : staticbase);
+# endif
 #else
      char **ja, **jb;
      int *nn;
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscald.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscald.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscald.c	2006-03-24 15:36:37.723420777 -0500
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscald.c	2006-03-24 15:51:18.796348318 -0500
@@ -74,6 +74,24 @@
 /*    printf ("cscald - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */
    long p[16];
    int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
+
+/* See relevant comments in cstrcmp.c regarding this hideous hack */
+# if defined (__ia64__) || defined (__alpha__)
+#  if defined (__ia64__)
+#   define autotest(_var) ((unsigned long)(_var) > 0x80000000)
+#  else /* __alpha__ */
+#   define autotest(_var) ((unsigned long)(_var) < 0x20000000)
+#  endif
+  static int dummy = 0;
+  unsigned long staticbase = ((unsigned long)&dummy) & 0xffffffff00000000L;
+  unsigned long autobase = ((unsigned long)&count) & 0xffffffff00000000L;
+  for (count = 0; count < 16; count++)
+    if (p[count])
+      if (autotest(p[count]))
+	p[count] += autobase;
+      else
+	p[count] += staticbase;  
+# endif
 #else
  double (type_of_call *(*name)) ();
  int *n;
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscali.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscali.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscali.c	2006-03-24 15:36:37.723420777 -0500
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscali.c	2006-03-24 15:51:05.440199025 -0500
@@ -67,6 +67,24 @@
 /*    printf ("cscali - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */
    long p[16];
    int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
+
+/* See relevant comments in cstrcmp.c regarding this hideous hack */
+# if defined (__ia64__) || defined (__alpha__)
+#  if defined (__ia64__)
+#   define autotest(_var) ((unsigned long)(_var) > 0x80000000)
+#  else /* __alpha__ */
+#   define autotest(_var) ((unsigned long)(_var) < 0x20000000)
+#  endif
+  static int dummy = 0;
+  unsigned long staticbase = ((unsigned long)&dummy) & 0xffffffff00000000L;
+  unsigned long autobase = ((unsigned long)&count) & 0xffffffff00000000L;
+  for (count = 0; count < 16; count++)
+    if (p[count])
+      if (autotest(p[count]))
+        p[count] += autobase;
+      else
+        p[count] += staticbase;
+# endif
 #else
  int (type_of_call *(*name)) ();
  int *n;
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscalr.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscalr.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscalr.c	2006-03-24 15:36:37.724420566 -0500
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscalr.c	2006-03-24 15:50:47.519024096 -0500
@@ -89,6 +89,24 @@
    long p[16];
    int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
    double r;
+
+/* See relevant comments in cstrcmp.c regarding this hideous hack */
+# if defined (__ia64__) || defined (__alpha__)
+#  if defined (__ia64__)
+#   define autotest(_var) ((unsigned long)(_var) > 0x80000000)
+#  else /* __alpha__ */
+#   define autotest(_var) ((unsigned long)(_var) < 0x20000000)
+#  endif
+  static int dummy = 0;
+  unsigned long staticbase = ((unsigned long)&dummy) & 0xffffffff00000000L;
+  unsigned long autobase = ((unsigned long)&count) & 0xffffffff00000000L;
+  for (count = 0; count < 16; count++)
+    if (p[count])
+      if (autotest(p[count]))
+        p[count] += autobase;
+      else
+        p[count] += staticbase;
+# endif
 #else
  float (type_of_call *(*name)) ();
  int *n;
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cstrcmp.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cstrcmp.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cstrcmp.c	2006-03-24 15:36:37.724420566 -0500
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cstrcmp.c	2006-03-24 15:36:45.236828642 -0500
@@ -42,6 +42,27 @@
  * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005)
  */
 
+/* For Itanium and Alpha, the situation is even worse.  Itanium architecture
+ * has the data section starts at 0x6000000000000000.  The stack is
+ * supposed to be between 0x80...0 and 0xa0...0 starting at the high end
+ * and growing downwards, although on a test machine (merulo.debian.org)
+ * it seemed instead to start at 0x6000100000000000 and grow downwards.
+ * The addresses we actually get are truncated to the lowest 32 bits,
+ * so we assume that those greater than 0x80000000 are in the stack.
+ *
+ * Constant strings are in the text section starting at 0x40...0; we hope
+ * this function doesn't receive any.
+ *
+ * On Alpha, on the other hand, I couldn't find any docs for the Linux
+ * segmentation for virtual memory.  Judging by a test machine
+ * (escher.debian.org), the data section starts slightly above 0x120010000.
+ * On the other hand the stack grows downward from 0x120000000.  Here it
+ * seems safe to suppose that the variable is in the stack if the uint32
+ * truncated address received is less than 0x20000000.
+ *
+ * -- Kevin McCarty
+ */
+
 #if defined(CERNLIB_QMLXIA64)
      int *ja, *jb;
      int *na, *nb;
@@ -56,6 +77,18 @@
     {
       a=*jb; b=*ja; la=*nb; lb=*na; k=-1;
      }
+# if defined (__ia64__) || defined (__alpha__)
+#  if defined (__ia64__)
+#   define autotest(_var) ((unsigned long)(_var) > 0x80000000)
+#  else /* __alpha__ */
+#   define autotest(_var) ((unsigned long)(_var) < 0x20000000)
+#  endif
+  static int dummy = 0;
+  unsigned long staticbase = ((unsigned long)&dummy) & 0xffffffff00000000L;
+  unsigned long autobase = ((unsigned long)&i) & 0xffffffff00000000L;
+  a = (unsigned long)a + (autotest(a) ? autobase : staticbase);
+  b = (unsigned long)b + (autotest(b) ? autobase : staticbase);
+# endif
 #else
      char **ja, **jb;
      int *na, *nb;


--- NEW FILE 319-work-around-imake-segfaults.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 319-work-around-imake-segfaults.dpatch by  <kmccarty at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: If at first Imake doesn't succeed, try, try again.
## DP: (Hideous workaround for non-deterministic imake segfaults on hppa.)

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/config/Imake.rules cernlib-2005.05.09.dfsg/src/config/Imake.rules
--- cernlib-2005.05.09.dfsg~/src/config/Imake.rules	2006-01-02 10:35:09.050384887 -0500
+++ cernlib-2005.05.09.dfsg/src/config/Imake.rules	2006-01-02 10:38:18.693611381 -0500
@@ -1296,7 +1296,11 @@
 	$(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) \		@@\
 	             -DPackageTop=$(PACKAGETOP)	\			@@\
 		     -DPackageName=$(PACKAGE_NAME) \			@@\
-		     imakeflags -f $<
+		     imakeflags -f $< || \				@@\
+		$(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) \	@@\
+	             -DPackageTop=$(PACKAGETOP)	\			@@\
+		     -DPackageName=$(PACKAGE_NAME) \			@@\
+		     imakeflags -f $< || exit 1
 
 #endif /* BuildMakefileTarget */
 
@@ -2127,7 +2131,11 @@
 			ImakeSubCmdHelper -DTOPDIR=$$imaketop \		@@\
 			-DCURDIR=$$curdir$$i \				@@\
 			-DPackageTop=$(PACKAGETOP) \			@@\
-			-DPackageName=$(PACKAGE_NAME); \		@@\
+			-DPackageName=$(PACKAGE_NAME) || \		@@\
+			ImakeSubCmdHelper -DTOPDIR=$$imaketop \		@@\
+			-DCURDIR=$$curdir$$i \				@@\
+			-DPackageTop=$(PACKAGETOP) \			@@\
+			-DPackageName=$(PACKAGE_NAME) || exit 1; \	@@\
 		fi; \							@@\
 		$(MAKE) $(MFLAGS) Makefiles; \				@@\
 		cd $$newtop; \						@@\
@@ -2322,7 +2330,12 @@
 			-DCURDIR=$$curdir$$i \				@@\
 			-DPackageTop=$(PACKAGETOP) \			@@\
 			-DPackageName=$(PACKAGE_NAME) \			@@\
-			-f $$imakefile; \				@@\
+			-f $$imakefile || \				@@\
+			ImakeSubCmdHelper -DTOPDIR=$$imaketop \		@@\
+			-DCURDIR=$$curdir$$i \				@@\
+			-DPackageTop=$(PACKAGETOP) \			@@\
+			-DPackageName=$(PACKAGE_NAME) \			@@\
+			-f $$imakefile || exit 1; \			@@\
 		fi; \							@@\
 	fi;
 #endif

cernlib_2005.05.09.dfsg-5.diff:

***** Error reading new file: [Errno 2] No such file or directory: 'cernlib_2005.05.09.dfsg-5.diff'
patchy-case.patch:

--- NEW FILE patchy-case.patch ---
diff -ur 2004.orig/src/patchy/Imakefile 2004/src/patchy/Imakefile
--- 2004.orig/src/patchy/Imakefile	1997-01-21 18:29:14.000000000 +0100
+++ 2004/src/patchy/Imakefile	2005-05-28 02:23:04.000000000 +0200
@@ -79,8 +79,8 @@
 	@ ln -s $< $@
 
 %.f:  $(LDIR)%.cra $(LDIR)patchy.car
-	ypatchy - $@ $< TTY .go
-	
+	ypatchy - :$@ :$< TTY .go
+
 .f.o:
 	$(FC) -c $(FORTRANOPTIONS) $(FDEBUGFLAGS) $<
 

patchy-fcasplit.patch:

--- NEW FILE patchy-fcasplit.patch ---
--- patchy/fcasplit.f.orig	2006-04-10 01:06:32.000000000 +0200
+++ patchy/fcasplit.f	2006-04-10 01:16:05.000000000 +0200
@@ -23,7 +23,7 @@
       PARAMETER   (CHIDA = ';DECK  I' )
       PARAMETER   (CHOVER= 'UNKNOWN')
  
-      PARAMETER   (CHPOF = '-c -O2 -Nx800 -Nc200')
+      PARAMETER   (CHPOF = '-c -O2')
       PARAMETER   (CHPOC = '-c -O2 -posix')
       PARAMETER   (CHPOA = ' ')
  

patchy-insecure_tmp_use.diff:

--- NEW FILE patchy-insecure_tmp_use.diff ---
diff -u patchy-orig/yindex patchy/yindex
--- patchy-orig/yindex	2006-04-11 10:33:39.000000000 +0200
+++ patchy/yindex	2006-04-11 10:44:10.000000000 +0200
@@ -11,7 +11,7 @@
    [ -z "$PATCHY_VERSION" ] && PATCHY_VERSION="4.15"
    PATCHY=$CERN/patchy/$PATCHY_VERSION/bin
  
-ftmp=/tmp/`echo $0 | awk -F/ '{ print $NF }'`$$
+#ftmp=/tmp/`echo $0 | awk -F/ '{ print $NF }'`$$
  
 if [ $# -eq 0 ] ; then
    cat << EoI
@@ -45,6 +45,8 @@
       exit 1
 fi
  
+exttmp=`echo $0 | awk -F/ '{ print $NF }'`$$
+ftmp="$file-$exttmp"
 if [ "$ext" != "pam" ] ; then
    echo " Preparing temporary binary PAM file, ...wait"
    ${PATCHY}/ytobin $pam $ftmp.pam - - ${ftmp}.lis .GO  > /dev/null
Seulement dans patchy: yindex-orig
diff -u patchy-orig/ylist patchy/ylist
--- patchy-orig/ylist	2006-04-11 10:33:48.000000000 +0200
+++ patchy/ylist	2006-04-11 10:40:17.000000000 +0200
@@ -11,7 +11,7 @@
    [ -z "$PATCHY_VERSION" ] && PATCHY_VERSION="4.15"
    PATCHY=$CERN/patchy/$PATCHY_VERSION/bin
  
-ftmp=/tmp/`echo $0 | awk -F/ '{ print $NF }'`$$
+#ftmp=/tmp/`echo $0 | awk -F/ '{ print $NF }'`$$
  
 if [ $# -eq 0 ] ; then
    cat << EoI
@@ -45,6 +45,8 @@
       exit 1
 fi
  
+exttmp=`echo $0 | awk -F/ '{ print $NF }'`$$
+ftmp="$file-$exttmp"
 if [ "$ext" != "pam" ] ; then
    echo " Preparing temporary binary PAM file, ...wait"
    ${PATCHY}/ytobin $pam $ftmp.pam - - ${ftmp}.lis .GO  > /dev/null
Seulement dans patchy: ylist-orig

patchy-p4comp.patch:

--- NEW FILE patchy-p4comp.patch ---
--- patchy/p4comp.fca.orig	2006-04-08 12:46:17.000000000 +0200
+++ patchy/p4comp.fca	2006-04-08 12:47:34.000000000 +0200
@@ -11458,7 +11458,7 @@
       IF (JCARD.GE.NTOTCC)   RETURN
       LE = LTK + KDNWT1 - 1
       DO 12 L=LTK,LE
-      IF (AND(IQ(L),'FF000000'X).EQ.0)    GO TO 14
+      IF (AND(IQ(L),X'FF000000').EQ.0)    GO TO 14
    12 CONTINUE
       NWTK = KDNWT
       NCH  = 80
@@ -12383,7 +12383,7 @@
       IF (JCARD.GE.NTOTCC)   RETURN
       LE = LTK + KDNWT1 - 1
       DO 13 L=LTK,LE
-      IF (AND(IQ(L),'FF000000'X).EQ.0)    GO TO 14
+      IF (AND(IQ(L),X'FF000000').EQ.0)    GO TO 14
    13 CONTINUE
       NWTK   = KDNWT
       NCHCCT = 80
@@ -14260,7 +14260,7 @@
 C--------------    END CDE                             --------------
 C     DIMENSION    MM(10), ITP(9)                                        A8M
       DIMENSION    MM(6),  ITP(9)                                       -A8M
-      PARAMETER   ( NBLANK = '20202000'X )
+      PARAMETER   ( NBLANK = X'20202000' )
  
       IT     = ITP(1)
       JARTPX = 0
@@ -14430,7 +14430,7 @@
  
    24 JLOW = JCH
  
-      MV(JCH) = AND (MV(JCH), 'FFFFFFDF'X)
+      MV(JCH) = AND (MV(JCH), X'FFFFFFDF')
  
    49 CONTINUE
       JCCLOW = MAX  (JCCLOW,JLOW)
@@ -14465,8 +14465,8 @@
  
  
  
-      DATA ACTION/'HOLD  ','RESUME','EOF   ','REWIND','ATTACH','DETACH'
-     +,           'EOFREW','CLOSE ' /
+      DATA ACTION/6HHOLD  ,6HRESUME,6HEOF   ,6HREWIND,6HATTACH,6HDETACH
+     +,           6HEOFREW,6HCLOSE  /
  
 C------    CODE BITS IN  IOTALL, IOTOFF, IOTON, IOTYP
  
@@ -14801,7 +14801,7 @@
       DO 31 JC=1,NCD
       J = J+1
       DO 19 JJ=1,KDNWT1
-      IF (AND(MV(J),'FF000000'X).EQ.0)   GO TO 31
+      IF (AND(MV(J),X'FF000000').EQ.0)   GO TO 31
    19 J = J+1
    31 CONTINUE
  
@@ -14825,7 +14825,7 @@
  
       DO 16 J=1,KDNWT1
       KIMA(J)= MV(J)
-      IF (AND(KIMA(J),'FF000000'X).EQ.0)    GO TO 31
+      IF (AND(KIMA(J),X'FF000000').EQ.0)    GO TO 31
    16 CONTINUE
       J = KDNWT
       KIMA(J)= MV(J)
@@ -14855,7 +14855,7 @@
  
       DO 16 J=1,KDNWT1
       KIMA(J)= MV(J)
-      IF (AND(KIMA(J),'FF000000'X).EQ.0)    GO TO 31
+      IF (AND(KIMA(J),X'FF000000').EQ.0)    GO TO 31
    16 CONTINUE
       J = KDNWT
       KIMA(J)= MV(J)
@@ -17316,6 +17316,8 @@
 /*>    ROUTINE ABEND
   CERN PROGLIB# Z035    ABEND           .VERSION KERNFOR  4.31  911111
 */
+#include <stdlib.h>
+
 void abend_()
 {
     exit(7);
@@ -17430,7 +17432,7 @@
       char *fname;
       int  *lgname;
 {
-      char *malloc();
+      void *malloc();
       char *ptalc, *pttext;
       int  fchput();
       int  nalc;
@@ -17664,7 +17666,7 @@
       char *ftext;
       int  lgtext;
 {
-      char *malloc();
+      void *malloc();
       char *ptalc, *ptuse;
       char *utext;
       int  nalc;

patchy-perror.patch:

--- NEW FILE patchy-perror.patch ---
--- 2005/src/patchy/patchy.car.orig	1996-07-15 13:46:22.000000000 +0200
+++ 2005/src/patchy/patchy.car	2006-04-09 02:18:17.000000000 +0200
@@ -3708,7 +3708,7 @@
 
    38 WRITE (IQTYPE,9038) CHLIFI(1:NN)
 +SELF, IF=QS_UNIX.
-      IF (LUNOLD.NE.0)  CALL PERRORF (' System msg')
+      IF (LUNOLD.NE.0)  CALL PERROR (' System msg')
 +SELF.
       IF (NQINIT.EQ.0)  THEN
           IF (IQPRNT.NE.IQTYPE)  WRITE (IQPRNT,9038) CHLIFI(1:NN)
@@ -4399,7 +4399,7 @@
       CHARACTER    MSG*(*)
 
 +SELF, IF=QS_UNIX.
-      CALL PERRORF (' Perror has')
+      CALL PERROR (' Perror has')
 +SELF.
       CALL P_KILL (MSG)
       END
@@ -4446,7 +4446,7 @@
       CHARACTER    MSG*(*)
 
 +SELF, IF=QS_UNIX.
-      CALL PERRORF ('Perror has')
+      CALL PERROR ('Perror has')
 +SELF.
       CALL P_FATAL (MSG)
       END
@@ -15112,7 +15112,7 @@
 +DECK, SEGVIOL, T=JOIN, IF=QDIAG, IF=QS_UNIX.
       SUBROUTINE SEGVIOL
 
-      CALL PERRORF ('perrorf has')
+      CALL PERROR ('perror has')
       CALL P_KILL ('SEGVIOL reached')
 
       END

patchy-rceta.patch:

--- NEW FILE patchy-rceta.patch ---
--- patchy/rceta.sh.orig	1995-05-04 21:23:45.000000000 +0200
+++ patchy/rceta.sh	2006-04-08 12:20:26.000000000 +0200
@@ -225,8 +225,8 @@
       RETURN
       END
 \\
- fort77 -o rceta rceta.f
- rceta    <<\\
+ f77 -o rceta rceta.f
+ ./rceta    <<\\
 CODE  INTERNAL A1 REPRESENTATION OF THE CETA SET / LNX
 CODE  CARD    1  IN HOLLERITH FOR CETA VALUES  1 - 47
 CODE  CARD    2  IN HOLLERITH FOR CETA VALUES 65 - 90


Index: 211-fix-comis-on-amd64.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/211-fix-comis-on-amd64.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 211-fix-comis-on-amd64.dpatch	14 Dec 2005 16:52:26 -0000	1.1
+++ 211-fix-comis-on-amd64.dpatch	11 Apr 2006 22:45:34 -0000	1.2
@@ -396,8 +396,8 @@
        ITMPLEN=CSTMPD(CHPATH, 256)
 -      CHF77 ='g77 -c'
 -      CHCC  ='cc -c'
-+      CHF77 ='g77 -c -fPIC'
-+      CHCC  ='cc -c -fPIC'
++      CHF77 ='g77 -g -c -fPIC'
++      CHCC  ='cc -g -c -fPIC'
  #endif
  #if (defined(CERNLIB_SGI))&&(defined(CERNLIB_SHL))
        ITMPLEN=CSTMPD(CHPATH, 256)


Index: 307-use-canonical-cfortran.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/307-use-canonical-cfortran.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 307-use-canonical-cfortran.dpatch	14 Dec 2005 16:52:26 -0000	1.2
+++ 307-use-canonical-cfortran.dpatch	11 Apr 2006 22:45:34 -0000	1.3
@@ -7,8 +7,8 @@
 
 @DPATCH@
 diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.doc cernlib-2005.05.09.dfsg/src/cfortran/cfortran.doc
---- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.doc	1998-12-11 17:17:09.000000000 +0000
-+++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.doc	2005-12-09 18:01:09.000000000 +0000
+--- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.doc	1998-12-11 12:17:09.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.doc	2005-12-27 11:33:41.183131708 -0500
 @@ -195,13 +195,13 @@
  HP9000> f77 -c cfortex.f
  HP9000> CC -o cfortest cfortest.c cfortex.o -lI77 -lF77 && cfortest
@@ -79,24 +79,25 @@
  - YOU MAY NOT RECEIVE MONEY FOR THE DISTRIBUTION OR FOR ITS MEDIA 
    (E.G. TAPE, DISK, COMPUTER, PAPER.)
 diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h cernlib-2005.05.09.dfsg/src/cfortran/cfortran.h
---- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h	2002-09-11 17:05:51.000000000 +0000
-+++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.h	2005-12-09 18:01:09.000000000 +0000
+--- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h	2002-09-11 13:05:51.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.h	2005-12-19 08:29:41.000000000 -0500
 @@ -1,4 +1,4 @@
 -/* cfortran.h  4.4_cernlib2002 */
 +/* cfortran.h  4.4 */
  /* http://www-zeus.desy.de/~burow/cfortran/                   */
  /* Burkhard Burow  burow at desy.de                 1990 - 2002. */
  
-@@ -11,6 +11,35 @@
+@@ -11,6 +11,38 @@
     MODIFYING, COPYING AND DISTRIBUTING THE CFORTRAN.H PACKAGE.
  */
  
 +/* The following modifications were made by the authors of CFITSIO or by me. 
-+ * I've flagged them below with "(CFITSIO)" or "(KMCCARTY)".
++ * They are flagged below with CFITSIO, the author's initials, or KMCCARTY.
 + * PDW = Peter Wilson
 + * DM  = Doug Mink
-+ * LEB = ??
-+ * -- Kevin McCarty, for Debian (11/29/2003) */
++ * LEB = Lee E Brotzman
++ * MR  = Martin Reinecke
++ * -- Kevin McCarty, for Debian (19 Dec. 2005) */
 +
 +/*******
 +   Modifications:
@@ -118,12 +119,14 @@
 +      Dec 2005: If f2cFortran is defined, enforce REAL functions in FORTRAN
 +                returning "double" in C.  This was one of the items on
 +		Burkhard's TODO list. (KMCCARTY)
++      Dec 2005: Modifications to support 8-byte integers. (MR)
++		USE AT YOUR OWN RISK!
 + *******/
 +
  /* 
    Avoid symbols already used by compilers and system *.h:
    __ - OSF1 zukal06 V3.0 347 alpha, cc -c -std1 cfortest.c
-@@ -75,7 +104,8 @@
+@@ -75,7 +107,8 @@
  
  /* Remainder of cfortran.h depends on the Fortran compiler. */
  
@@ -133,7 +136,7 @@
  #define f2cFortran
  #endif
  
-@@ -90,6 +120,27 @@
+@@ -90,6 +123,27 @@
                             Support f2c or f77 with gcc, vcc with f2c. 
                             f77 with vcc works, missing link magic for f77 I/O.*/
  #endif
@@ -161,7 +164,7 @@
  #if defined(__hpux)             /* 921107: Use __hpux instead of __hp9000s300 */
  #define       hpuxFortran       /*         Should also allow hp9000s7/800 use.*/
  #endif
-@@ -131,6 +182,7 @@
+@@ -131,6 +185,7 @@
  #if !(defined(mipsFortran)||defined(DECFortran)||defined(vmsFortran)||defined(CONVEXFortran)||defined(PowerStationFortran)||defined(AbsoftUNIXFortran)||defined(AbsoftProFortran)||defined(SXFortran))
  /* If your compiler barfs on ' #error', replace # with the trigraph for #     */
   #error "cfortran.h:  Can't find your environment among:\
@@ -169,7 +172,7 @@
      - MIPS cc and f77 2.0. (e.g. Silicon Graphics, DECstations, ...)     \
      - IBM AIX XL C and FORTRAN Compiler/6000 Version 01.01.0000.0000     \
      - VAX   VMS CC 3.1 and FORTRAN 5.4.                                  \
-@@ -151,7 +203,8 @@
+@@ -151,7 +206,8 @@
      - NAG f90: Use #define NAGf90Fortran, or cc -DNAGf90Fortran          \
      - Absoft UNIX F77: Use #define AbsoftUNIXFortran or cc -DAbsoftUNIXFortran \
      - Absoft Pro Fortran: Use #define AbsoftProFortran \
@@ -179,7 +182,7 @@
  /* Compiler must throw us out at this point! */
  #endif
  #endif
-@@ -164,7 +217,8 @@
+@@ -164,7 +220,8 @@
  
  /* Throughout cfortran.h we use: UN = Uppercase Name.  LN = Lowercase Name.   */
  
@@ -189,7 +192,7 @@
  #define CFC_(UN,LN)            _(LN,_)      /* Lowercase FORTRAN symbols.     */
  #define orig_fcallsc(UN,LN)    CFC_(UN,LN)
  #else 
-@@ -268,7 +322,8 @@
+@@ -268,7 +325,8 @@
  #endif
  
  #ifndef apolloFortran
@@ -199,7 +202,7 @@
  #define CF_NULL_PROTO
  #else                                         /* HP doesn't understand #elif. */
  /* Without ANSI prototyping, Apollo promotes float functions to double.    */
-@@ -512,7 +567,7 @@
+@@ -512,7 +570,7 @@
                      *( (F).dsc$l_m[0]=(F).dsc$bounds[0].dsc$l_u=(ELEMNO)  ),   \
    (F).dsc$a_a0    =  ( (F).dsc$a_pointer=(C) ) - (F).dsc$w_length          ,(F))
  
@@ -208,8 +211,14 @@
  #define _NUM_ELEMS      -1
  #define _NUM_ELEM_ARG   -2
  #define NUM_ELEMS(A)    A,_NUM_ELEMS
-@@ -540,7 +595,8 @@
+@@ -538,9 +596,14 @@
+   if (i==(unsigned)num_term) break;
+   else strv += elem_len-i;
  }
++if (0) {  /* to prevent not used warnings in gcc (added by ROOT) */
++   c2fstrv(0, 0, 0, 0); f2cstrv(0, 0, 0, 0); kill_trailing(0, 0);
++   vkill_trailing(0, 0, 0, 0); num_elem(0, 0, 0, 0);
++}
  return (int)num;
  }
 -#endif
@@ -218,7 +227,53 @@
  /*-------------------------------------------------------------------------*/
  
  /*           UTILITIES FOR C TO USE STRINGS IN FORTRAN COMMON BLOCKS       */
-@@ -1451,7 +1507,12 @@
+@@ -1318,6 +1381,7 @@
+ #define     INTVVVVVVV_cfTYPE int
+ #define LOGICALVVVVVVV_cfTYPE int
+ #define    LONGVVVVVVV_cfTYPE long
++#define LONGLONGVVVVVVV_cfTYPE long long   /* added by MR December 2005 */
+ #define   SHORTVVVVVVV_cfTYPE short
+ #define          PBYTE_cfTYPE INTEGER_BYTE
+ #define        PDOUBLE_cfTYPE DOUBLE_PRECISION 
+@@ -1325,6 +1389,7 @@
+ #define           PINT_cfTYPE int
+ #define       PLOGICAL_cfTYPE int
+ #define          PLONG_cfTYPE long
++#define      PLONGLONG_cfTYPE long long  /* added by MR December 2005 */
+ #define         PSHORT_cfTYPE short
+ 
+ #define CFARGS0(A,T,V,W,X,Y,Z) _3(T,_cf,A)
+@@ -1342,6 +1407,7 @@
+ #define            INT_cfINT(N,A,B,X,Y,Z)        DOUBLE_cfINT(N,A,B,X,Y,Z)
+ #define        LOGICAL_cfINT(N,A,B,X,Y,Z)        DOUBLE_cfINT(N,A,B,X,Y,Z)
+ #define           LONG_cfINT(N,A,B,X,Y,Z)        DOUBLE_cfINT(N,A,B,X,Y,Z)
++#define       LONGLONG_cfINT(N,A,B,X,Y,Z)        DOUBLE_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */
+ #define          SHORT_cfINT(N,A,B,X,Y,Z)        DOUBLE_cfINT(N,A,B,X,Y,Z)
+ #define          PBYTE_cfINT(N,A,B,X,Y,Z)       PDOUBLE_cfINT(N,A,B,X,Y,Z)
+ #define        PDOUBLE_cfINT(N,A,B,X,Y,Z) _(CFARGS,N)(A,PINT,B,X,Y,Z,0)
+@@ -1349,6 +1415,7 @@
+ #define           PINT_cfINT(N,A,B,X,Y,Z)       PDOUBLE_cfINT(N,A,B,X,Y,Z)
+ #define       PLOGICAL_cfINT(N,A,B,X,Y,Z)       PDOUBLE_cfINT(N,A,B,X,Y,Z)
+ #define          PLONG_cfINT(N,A,B,X,Y,Z)       PDOUBLE_cfINT(N,A,B,X,Y,Z)
++#define      PLONGLONG_cfINT(N,A,B,X,Y,Z)       PDOUBLE_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */
+ #define         PSHORT_cfINT(N,A,B,X,Y,Z)       PDOUBLE_cfINT(N,A,B,X,Y,Z)
+ #define          BYTEV_cfINT(N,A,B,X,Y,Z)       DOUBLEV_cfINT(N,A,B,X,Y,Z)
+ #define         BYTEVV_cfINT(N,A,B,X,Y,Z)      DOUBLEVV_cfINT(N,A,B,X,Y,Z)
+@@ -1392,6 +1459,13 @@
+ #define      LONGVVVVV_cfINT(N,A,B,X,Y,Z)   DOUBLEVVVVV_cfINT(N,A,B,X,Y,Z)
+ #define     LONGVVVVVV_cfINT(N,A,B,X,Y,Z)  DOUBLEVVVVVV_cfINT(N,A,B,X,Y,Z)
+ #define    LONGVVVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVVVV_cfINT(N,A,B,X,Y,Z)
++#define      LONGLONGV_cfINT(N,A,B,X,Y,Z)       DOUBLEV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */
++#define     LONGLONGVV_cfINT(N,A,B,X,Y,Z)      DOUBLEVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */
++#define    LONGLONGVVV_cfINT(N,A,B,X,Y,Z)     DOUBLEVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */
++#define   LONGLONGVVVV_cfINT(N,A,B,X,Y,Z)    DOUBLEVVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */
++#define  LONGLONGVVVVV_cfINT(N,A,B,X,Y,Z)   DOUBLEVVVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */
++#define LONGLONGVVVVVV_cfINT(N,A,B,X,Y,Z)  DOUBLEVVVVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */
++#define LONGLONGVVVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */
+ #define         SHORTV_cfINT(N,A,B,X,Y,Z)       DOUBLEV_cfINT(N,A,B,X,Y,Z)
+ #define        SHORTVV_cfINT(N,A,B,X,Y,Z)      DOUBLEVV_cfINT(N,A,B,X,Y,Z)
+ #define       SHORTVVV_cfINT(N,A,B,X,Y,Z)     DOUBLEVVV_cfINT(N,A,B,X,Y,Z)
+@@ -1451,7 +1525,12 @@
  #define      BYTE_cfPU(A)   CFextern INTEGER_BYTE      FCALLSC_QUALIFIER A
  #define    DOUBLE_cfPU(A)   CFextern DOUBLE_PRECISION  FCALLSC_QUALIFIER A
  #if ! (defined(FLOATFUNCTIONTYPE)&&defined(ASSIGNFLOAT)&&defined(RETURNFLOAT))
@@ -231,7 +286,80 @@
  #else				   	                   
  #define     FLOAT_cfPU(A)   CFextern FLOATFUNCTIONTYPE FCALLSC_QUALIFIER A
  #endif				   	                   
-@@ -2088,7 +2149,12 @@
+@@ -1589,6 +1668,7 @@
+ #define            INT_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E)
+ #define        LOGICAL_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,LOGICAL,A,B,C,D,E)
+ #define           LONG_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E)
++#define       LONGLONG_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */
+ #define          SHORT_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E)
+ #define          BYTEV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E)
+ #define         BYTEVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E)
+@@ -1632,6 +1712,13 @@
+ #define      LONGVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E)
+ #define     LONGVVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E)
+ #define    LONGVVVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E)
++#define      LONGLONGV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */
++#define     LONGLONGVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */
++#define    LONGLONGVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */
++#define   LONGLONGVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */
++#define  LONGLONGVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */
++#define LONGLONGVVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */
++#define LONGLONGVVVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */
+ #define         SHORTV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E)
+ #define        SHORTVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E)
+ #define       SHORTVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E)
+@@ -1645,6 +1732,7 @@
+ #define           PINT_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E)
+ #define       PLOGICAL_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,PLOGICAL,A,B,C,D,E)
+ #define          PLONG_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E)
++#define      PLONGLONG_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */
+ #define         PSHORT_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E)
+ #define         STRING_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,STRING,A,B,C,D,E)
+ #define        PSTRING_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,PSTRING,A,B,C,D,E)
+@@ -1957,6 +2045,7 @@
+ #define            INT_cfT(M,I,A,B,D) *A
+ #define        LOGICAL_cfT(M,I,A,B,D)  F2CLOGICAL(*A)
+ #define           LONG_cfT(M,I,A,B,D) *A
++#define       LONGLONG_cfT(M,I,A,B,D) *A /* added by MR December 2005 */
+ #define          SHORT_cfT(M,I,A,B,D) *A
+ #define          BYTEV_cfT(M,I,A,B,D)  A
+ #define        DOUBLEV_cfT(M,I,A,B,D)  A
+@@ -1964,6 +2053,7 @@
+ #define           INTV_cfT(M,I,A,B,D)  A
+ #define       LOGICALV_cfT(M,I,A,B,D)  A
+ #define          LONGV_cfT(M,I,A,B,D)  A
++#define      LONGLONGV_cfT(M,I,A,B,D)  A /* added by MR December 2005 */
+ #define         SHORTV_cfT(M,I,A,B,D)  A
+ #define         BYTEVV_cfT(M,I,A,B,D)  (void *)A /* We have to cast to void *,*/
+ #define        BYTEVVV_cfT(M,I,A,B,D)  (void *)A /* since we don't know the   */
+@@ -2001,6 +2091,12 @@
+ #define      LONGVVVVV_cfT(M,I,A,B,D)  (void *)A
+ #define     LONGVVVVVV_cfT(M,I,A,B,D)  (void *)A
+ #define    LONGVVVVVVV_cfT(M,I,A,B,D)  (void *)A
++#define     LONGLONGVV_cfT(M,I,A,B,D)  (void *)A /* added by MR December 2005 */
++#define    LONGLONGVVV_cfT(M,I,A,B,D)  (void *)A /* added by MR December 2005 */
++#define   LONGLONGVVVV_cfT(M,I,A,B,D)  (void *)A /* added by MR December 2005 */
++#define  LONGLONGVVVVV_cfT(M,I,A,B,D)  (void *)A /* added by MR December 2005 */
++#define LONGLONGVVVVVV_cfT(M,I,A,B,D)  (void *)A /* added by MR December 2005 */
++#define LONGLONGVVVVVVV_cfT(M,I,A,B,D)  (void *)A /* added by MR December 2005 */
+ #define        SHORTVV_cfT(M,I,A,B,D)  (void *)A
+ #define       SHORTVVV_cfT(M,I,A,B,D)  (void *)A
+ #define      SHORTVVVV_cfT(M,I,A,B,D)  (void *)A
+@@ -2013,6 +2109,7 @@
+ #define           PINT_cfT(M,I,A,B,D)  A
+ #define       PLOGICAL_cfT(M,I,A,B,D)  ((*A=F2CLOGICAL(*A)),A)
+ #define          PLONG_cfT(M,I,A,B,D)  A
++#define      PLONGLONG_cfT(M,I,A,B,D)  A /* added by MR December 2005 */
+ #define         PSHORT_cfT(M,I,A,B,D)  A
+ #define          PVOID_cfT(M,I,A,B,D)  A
+ #if defined(apolloFortran) || defined(hpuxFortran800) || defined(AbsoftUNIXFortran)
+@@ -2083,12 +2180,18 @@
+ #define     INT_cfFZ(UN,LN) int   FCALLSC_QUALIFIER fcallsc(UN,LN)(
+ #define LOGICAL_cfFZ(UN,LN) int   FCALLSC_QUALIFIER fcallsc(UN,LN)(
+ #define    LONG_cfFZ(UN,LN) long  FCALLSC_QUALIFIER fcallsc(UN,LN)(
++#define LONGLONG_cfFZ(UN,LN) long long FCALLSC_QUALIFIER fcallsc(UN,LN)( /* added by MR December 2005 */
+ #define   SHORT_cfFZ(UN,LN) short FCALLSC_QUALIFIER fcallsc(UN,LN)(
+ #define    VOID_cfFZ(UN,LN) void  FCALLSC_QUALIFIER fcallsc(UN,LN)(
  #ifndef __CF__KnR
  /* The void is req'd by the Apollo, to make this an ANSI function declaration.
     The Apollo promotes K&R float functions to double. */
@@ -245,7 +373,7 @@
  #ifdef vmsFortran
  #define  STRING_cfFZ(UN,LN) void  FCALLSC_QUALIFIER fcallsc(UN,LN)(fstring *AS
  #else
-@@ -2104,7 +2170,12 @@
+@@ -2104,7 +2207,12 @@
  #endif
  #else
  #if ! (defined(FLOATFUNCTIONTYPE)&&defined(ASSIGNFLOAT)&&defined(RETURNFLOAT))
@@ -258,7 +386,7 @@
  #else
  #define   FLOAT_cfFZ(UN,LN) FLOATFUNCTIONTYPE FCALLSC_QUALIFIER fcallsc(UN,LN)(
  #endif
-@@ -2118,7 +2189,12 @@
+@@ -2118,13 +2226,19 @@
  #define    BYTE_cfF(UN,LN)     BYTE_cfFZ(UN,LN)
  #define  DOUBLE_cfF(UN,LN)   DOUBLE_cfFZ(UN,LN)
  #ifndef __CF_KnR
@@ -271,3 +399,18 @@
  #else
  #define   FLOAT_cfF(UN,LN)    FLOAT_cfFZ(UN,LN)
  #endif
+ #define     INT_cfF(UN,LN)      INT_cfFZ(UN,LN)
+ #define LOGICAL_cfF(UN,LN)  LOGICAL_cfFZ(UN,LN)
+ #define    LONG_cfF(UN,LN)     LONG_cfFZ(UN,LN)
++#define LONGLONG_cfF(UN,LN) LONGLONG_cfFZ(UN,LN) /* added by MR December 2005 */
+ #define   SHORT_cfF(UN,LN)    SHORT_cfFZ(UN,LN)
+ #define    VOID_cfF(UN,LN)     VOID_cfFZ(UN,LN)
+ #define  STRING_cfF(UN,LN)   STRING_cfFZ(UN,LN),
+@@ -2187,6 +2301,7 @@
+ #define LOGICAL_cfI  return C2FLOGICAL(A0);
+ #endif
+ #define    LONG_cfI  return A0;
++#define LONGLONG_cfI  return A0; /* added by MR December 2005 */
+ #define   SHORT_cfI  return A0;
+ #define  STRING_cfI  return   ;
+ #define    VOID_cfI  return   ;


Index: 800-implement-shared-library-rules-in-Imake.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/800-implement-shared-library-rules-in-Imake.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 800-implement-shared-library-rules-in-Imake.dpatch	30 Nov 2005 22:01:01 -0000	1.1
+++ 800-implement-shared-library-rules-in-Imake.dpatch	11 Apr 2006 22:45:34 -0000	1.2
@@ -6,8 +6,8 @@
 
 @DPATCH@
 diff -urNad cernlib-2005.05.09.dfsg~/src/config/Imake.rules cernlib-2005.05.09.dfsg/src/config/Imake.rules
---- cernlib-2005.05.09.dfsg~/src/config/Imake.rules	2005-11-29 17:07:32.035570303 +0000
-+++ cernlib-2005.05.09.dfsg/src/config/Imake.rules	2005-11-29 17:07:40.003888782 +0000
+--- cernlib-2005.05.09.dfsg~/src/config/Imake.rules	2006-01-02 10:42:00.576902424 -0500
++++ cernlib-2005.05.09.dfsg/src/config/Imake.rules	2006-01-02 10:42:08.484202137 -0500
 @@ -904,6 +904,8 @@
   * InstallSharedLibrary - generate rules to install the indicated sharable 
   * Library
@@ -27,7 +27,7 @@
  
  /*
   * InstallLinkKitLibrary - rule to install Link Kit library.
-@@ -1963,6 +1966,15 @@
+@@ -1967,6 +1970,15 @@
  #endif /* InstallSubdirs */
  
  /*
@@ -43,7 +43,7 @@
   * InstallBinSubdirs - generate rules to recursively install programs and
   *		       scripts
   */
-@@ -2341,9 +2353,12 @@
+@@ -2354,9 +2366,12 @@
   */
  #ifndef DefinePackageLibrary
  #define DefinePackageLibrary(locallib) \
@@ -57,8 +57,8 @@
  override PACKAGE_LIB:= LibraryTargetName(locallib) $(PACKAGE_LIB)	@@\
  									@@\
 diff -urNad cernlib-2005.05.09.dfsg~/src/config/biglib.rules cernlib-2005.05.09.dfsg/src/config/biglib.rules
---- cernlib-2005.05.09.dfsg~/src/config/biglib.rules	2000-04-19 10:51:01.000000000 +0000
-+++ cernlib-2005.05.09.dfsg/src/config/biglib.rules	2005-11-29 17:09:29.336812562 +0000
+--- cernlib-2005.05.09.dfsg~/src/config/biglib.rules	2000-04-19 06:51:01.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/config/biglib.rules	2006-01-02 10:42:08.485201922 -0500
 @@ -227,7 +227,7 @@
  	RanLibrary($@)
  #endif
@@ -120,8 +120,8 @@
  #ifndef SharedLibraryBuild
  #define SharedLibraryBuild(libname,version)				@@\
 diff -urNad cernlib-2005.05.09.dfsg~/src/config/lnxLib.rules cernlib-2005.05.09.dfsg/src/config/lnxLib.rules
---- cernlib-2005.05.09.dfsg~/src/config/lnxLib.rules	1995-12-20 15:26:45.000000000 +0000
-+++ cernlib-2005.05.09.dfsg/src/config/lnxLib.rules	2005-11-29 17:07:40.004888571 +0000
+--- cernlib-2005.05.09.dfsg~/src/config/lnxLib.rules	1995-12-20 10:26:45.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/config/lnxLib.rules	2006-01-02 10:42:08.485201922 -0500
 @@ -43,6 +43,9 @@
  #ifndef PositionIndependentCplusplusFlags
  #define PositionIndependentCplusplusFlags -fPIC

cernlib-gfortran.diff:

Index: cernlib-gfortran.diff
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib-gfortran.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-gfortran.diff	16 Nov 2005 23:34:07 -0000	1.1
+++ cernlib-gfortran.diff	11 Apr 2006 22:45:34 -0000	1.2
@@ -1,6 +1,6 @@
---- src/config/linux.cf.old	2005-06-16 21:11:15.000000000 +0200
-+++ src/config/linux.cf	2005-06-16 21:09:23.000000000 +0200
-@@ -216,7 +216,7 @@
+--- 2005/src/config/linux.cf-old	2006-03-15 11:32:47.000000000 +0100
++++ 2005/src/config/linux.cf	2006-03-15 11:33:52.000000000 +0100
+@@ -478,7 +478,7 @@
      variable=value							@@\
  endif									@@\
  
@@ -9,16 +9,20 @@
  
  /* Start CERNLIB changes A.Waananen 15. Apr. 1996 */
  /*  Adapted to CERN style GF. 20-Sep-96 */
-@@ -227,10 +227,10 @@
- # define OptimizedCDebugFlags	-O1 -fomit-frame-pointer
+@@ -498,14 +498,13 @@
+ #endif
  
  #define f2cFortran	        YES
--#define FortranCmd		g77
-+#define FortranCmd		gfortran
+-#define FortranCmd		g77 -g
++#define FortranCmd		gfortran -g
  #define XargsCmd		xargs
  #define FortranSaveFlags	/* */ /* Everything static !? */
--#define DefaultFCOptions	-fno-automatic -fno-second-underscore -fugly-complex
-+#define DefaultFCOptions	-fno-second-underscore 
- #define CernlibSystem	        -DCERNLIB_LINUX -DCERNLIB_UNIX -DCERNLIB_LNX -DCERNLIB_QMGLIBC
- 
- # endif
+ #define OptimisedFortranFlags	OptimizedCDebugFlags -funroll-loops
+ /* Remove -fomit-frame-pointer since -O implies it and it inhibits debugging */
+ #ifndef DefaultFCOptions
+-# define DefaultFCOptions	-fno-automatic -fno-second-underscore \
+-				-fugly-complex
++# define DefaultFCOptions	-fno-automatic -fno-second-underscore
+ #endif
+ #define CernlibSystem	        CernlibDefaultDefines CernlibMachineDefines \
+ 				CernlibLocalDefines


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- cernlib.spec	16 Feb 2006 22:00:29 -0000	1.19
+++ cernlib.spec	11 Apr 2006 22:45:34 -0000	1.20
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       13%{?dist}
+Release:       14%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -18,6 +18,8 @@
 #BuildRequires: xorg-x11-devel lapack-devel blas-devel openmotif-devel 
 # fc devel
 BuildRequires: imake lapack-devel blas-devel openmotif-devel 
+# for patchy build scripts
+BuildRequires: tcsh
 # workaround #173530
 BuildRequires: libXau-devel
 # there are missing f2c intrinsics in gfortran so gfortran cannot be used to
@@ -45,11 +47,12 @@
 Source6: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_mathlib.tar.gz 
 Source11: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_phtools.tar.gz
 Source12: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_scripts.tar.gz
-# actually patchy isn't built, for the reason stated in
-# see http://borex.princeton.edu/~kmccarty/faq.html#36
 Source9: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_patchy.tar.gz
 Source14: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_cfortran.tar.gz
 Source16: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/lib/xsneut95.dat
+# patchy 4 source files, provided by Mattias Ellert
+Source17: patchy.tar.gz
+
 # Shell scripts that go in /etc/profile.d
 Source100: cernlib.sh.in
 Source105: cernlib.csh.in
@@ -67,7 +70,7 @@
 Source201: cernlib-deadpool.txt
 
 # debian patchset
-Patch0: cernlib_2005.05.09.dfsg-3.diff
+Patch0: cernlib_2005.05.09.dfsg-5.diff
 # change file to directory to DATADIR
 Patch1100: cernlib-enforce-FHS.diff
 Patch1: 001-fix-missing-fluka.dpatch
@@ -108,7 +111,7 @@
 Patch210: 210-improve-cfortran-header-files.dpatch
 # split in newer debian patchset
 Patch2110: 211-fix-comis-on-amd64.dpatch
-Patch2111: 211-fix-comis-on-ia64.dpatch
+Patch2111: 211-fix-comis-on-ia64-alpha.dpatch
 Patch300: 300-skip-duplicate-lenocc.dpatch
 # Use another approach, see cernlib-enforce-FHS
 # Patch33: 301-datafiles-comply-with-FHS.dpatch
@@ -135,6 +138,8 @@
 Patch314: 314-permit-using-regcomp-for-re_comp.dpatch
 Patch315: 315-fixes-for-MacOSX.dpatch
 Patch318: 318-additional-gcc-3.4-fixes.dpatch
+# certainly not needed
+Patch319: 319-work-around-imake-segfaults.dpatch
 
 Patch700: 700-remove-kernlib-from-packlib-Imakefile.dpatch
 Patch701: 701-patch-hbook-comis-Imakefiles.dpatch
@@ -190,6 +195,16 @@
 Patch1205: cernlib-gfortran.diff 
 Patch1207: cernlib-v107z0_X_before_string.diff
 
+# patchy 4
+Patch1500: patchy-rceta.patch
+Patch1501: patchy-insecure_tmp_use.diff
+Patch1502: patchy-fcasplit.patch
+Patch1503: patchy-p4comp.patch
+
+# patchy 5 (included in cernlib)
+Patch1504: patchy-case.patch
+Patch1505: patchy-perror.patch
+
 %description
 CERN program library is a large collection of general purpose libraries
 and modules maintained and offered on the CERN. Most of these programs 
@@ -279,6 +294,13 @@
 According to the responsible of the cernlib debian package, some
 of these utilities may have security flaws.
 
+%package -n patchy
+Group: Applications/Archiving
+Summary: The patchy utilities
+
+%description -n patchy
+Utilities for extracting sources from patchy cards and cradles.
+
 
 %prep
 %setup -c 
@@ -295,6 +317,20 @@
 %setup -T -D -a 12
 %setup -T -D -a 14
 %setup -T -D -a 15
+%setup -T -D -a 17
+
+# patch patchy 4 installer fortran generator script
+%patch -P 1500
+%patch -P 1501
+
+# unpack the patchy version 4 sources
+pushd patchy
+        ./rceta.sh
+popd
+
+%patch -P 1502
+%patch -P 1503
+
 
 %patch -p1
 cd %{version}
@@ -355,6 +391,7 @@
 cp src/pawlib/paw/tree/converter.h src/pawlib/paw/paw/
 
 %patch -P 318 -p1
+%patch -P 319 -p1
 
 # move kernlib out of packlib (debian 700-move-kernlib-to-top-level.sh.dpatch)
 mv src/packlib/kernlib src/kernlib
@@ -458,13 +495,15 @@
 %patch -P 805 -p1
 %patch -P 806 -p1
 
+%patch -P 1504 -p1
+%patch -P 1505 -p1
 
 %patch -P 1200
 %patch -P 1201
 %patch -P 1203
 %patch -P 1204
 # use gfortran
-#%patch -P 1205
+#%patch -P 1205 -p1
 # workaround gfortran bug
 %patch -P 1207
 
@@ -518,7 +557,8 @@
 
 # substitude the right defaults in the scripts
 sed -i -e 's:"/cern":"%{_libdir}/cernlib/":' -e 's:"pro":"%{version}":' \
-	src/scripts/paw src/scripts/cernlib src/graflib/dzdoc/dzedit/dzedit.script
+	src/scripts/paw src/scripts/cernlib src/graflib/dzdoc/dzedit/dzedit.script \
+	../patchy/ylist ../patchy/yindex
 
 # substitute version in gxint with the right version
 # substitute includedir in gxint to conform to FHS, and gxint.o to gxint.f
@@ -528,6 +568,9 @@
 sed -i -e 's:DATADIR:%{_datadir}/cernlib/%{version}:' \
   src/geant321/miface/gmorin.F src/mclibs/cojets/test/test.F src/mclibs/eurodec/eurodec/eufiles.inc src/mclibs/isajet/test/isajett.F
 
+# substitute bindir in ylist and yindex to conform to FHS
+sed -i -e 's:\$CERN/patchy/\$PATCHY_VERSION/bin:%{_bindir}:' ../patchy/ylist ../patchy/yindex
+
 # Create the build directory structure
 mkdir -p build bin lib shlib
 
@@ -546,6 +589,16 @@
 cp %{SOURCE104} bin/
 chmod a+x bin/mkdirhier
 
+PATHSAVE=$PATH
+# Build patchy version 4
+pushd ../patchy
+#        export PATH="$CERN/patchy:$CERN/patchy/p4sub:$PATH" 
+        export PATH=".:..:$PATH" 
+        p4boot.sh 0
+popd
+find ../patchy -name y* -a -perm -755 -exec install {} bin ';'
+export PATH=$PATHSAVE
+
 # Create the top level Makefile with imake
 
 cd $CERN_ROOT/build
@@ -556,6 +609,7 @@
 # Install kuipc and the scripts (cernlib, paw and gxint) in $CERN_ROOT/bin
 
 make %{?_smp_mflags} bin/kuipc
+make patchy/Makefile
 make scripts/Makefile
 cd scripts
 make install.bin
@@ -576,6 +630,10 @@
 cd $CERN_ROOT/build/packlib
 make %{?_smp_mflags} install.bin
 
+# Build patchy
+cd $CERN_ROOT/build/patchy
+make %{?_smp_mflags} install.bin
+
 %install
 
 rm -rf $RPM_BUILD_ROOT
@@ -610,7 +668,6 @@
 # to preserve symlinks
 (cd lib && tar cf - *.a) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -)
 (cd shlib && tar cf - *.so*) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -)
-#(cd src/include && tar cf - *) | (cd $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version} && tar xf -)
 
 rm -f $RPM_BUILD_ROOT%{_bindir}/mkdirhier
 
@@ -711,7 +768,39 @@
 %{_bindir}/zftp
 %doc debian/debhelper/zftp.README.debian
 
+%files -n patchy
+%defattr(-,root,root,-)
+%{_bindir}/fcasplit
+%{_bindir}/nycheck
+%{_bindir}/nydiff
+%{_bindir}/nyindex
+%{_bindir}/nylist
+%{_bindir}/nymerge
+%{_bindir}/nypatchy
+%{_bindir}/nyshell
+%{_bindir}/nysynopt
+%{_bindir}/nytidy
+%{_bindir}/ycompar
+%{_bindir}/yedit
+%{_bindir}/yexpand
+%{_bindir}/yfrceta
+%{_bindir}/yindex
+%{_bindir}/yindexb
+%{_bindir}/ylist
+%{_bindir}/ylistb
+%{_bindir}/ypatchy
+%{_bindir}/ysearch
+%{_bindir}/yshift
+%{_bindir}/ytobcd
+%{_bindir}/ytobin
+%{_bindir}/ytoceta
+
+
 %changelog
+* Tue Apr 11 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-14
+- add patchy version 4 and build cernlib patchy. From Mattias Ellert.
+- update to newer debian patchset
+
 * Thu Feb 16 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-13
 - rebuild for fc5
 


Index: paw.README
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/paw.README,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- paw.README	14 Dec 2005 16:52:26 -0000	1.3
+++ paw.README	11 Apr 2006 22:45:34 -0000	1.4
@@ -41,6 +41,11 @@
 
 to the beginning of them.
 
+5) Shared libs
+
+PAW is linked dynamically, therefore the pawlib used is selected by the
+/etc/ld.so.conf or $LD_LIBRARY_PATH settings.
+
 -- Kevin McCarty <kmccarty at debian.org>, Tue, 22 Nov 2005
 
 Adapted to the rpm package by 


--- 211-fix-comis-on-ia64.dpatch DELETED ---


--- cernlib_2005.05.09.dfsg-3.diff DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 11 22:53:00 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 11 Apr 2006 15:53:00 -0700
Subject: rpms/cernlib/devel .cvsignore, 1.3, 1.4 cernlib.spec, 1.20,
	1.21 sources, 1.3, 1.4
Message-ID: <200604112253.k3BMr28d008270@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	.cvsignore cernlib.spec sources 
Log Message:
Forgot ot upload patchy source


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	30 Nov 2005 22:01:01 -0000	1.3
+++ .cvsignore	11 Apr 2006 22:53:00 -0000	1.4
@@ -13,3 +13,4 @@
 src_graflib.tar.gz
 src_packlib.tar.gz
 xsneut95.dat
+patchy.tar.gz


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- cernlib.spec	11 Apr 2006 22:45:34 -0000	1.20
+++ cernlib.spec	11 Apr 2006 22:53:00 -0000	1.21
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       14%{?dist}
+Release:       14%{?dist}.1
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -797,7 +797,7 @@
 
 
 %changelog
-* Tue Apr 11 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-14
+* Tue Apr 11 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-14.1
 - add patchy version 4 and build cernlib patchy. From Mattias Ellert.
 - update to newer debian patchset
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 Nov 2005 22:01:01 -0000	1.3
+++ sources	11 Apr 2006 22:53:00 -0000	1.4
@@ -13,3 +13,4 @@
 67228b011eac13b44499c50219e21545  src_graflib.tar.gz
 4fdcdc9f819ebbb9c6d3a04f339cdcf8  src_packlib.tar.gz
 eecb52159458ead0ee6b0d00b90aab66  xsneut95.dat
+14e6f0dbc205ec4f106093ee27578273  patchy.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 23:12:13 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 11 Apr 2006 16:12:13 -0700
Subject: rpms/cernlib/devel cernlib.spec,1.21,1.22
Message-ID: <200604112312.k3BNCFg6010405@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	cernlib.spec 
Log Message:
* Tue Apr 11 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-15
- add conditionals in spec to have only one for all fedora versions.



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- cernlib.spec	11 Apr 2006 22:53:00 -0000	1.21
+++ cernlib.spec	11 Apr 2006 23:12:13 -0000	1.22
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       14%{?dist}.1
+Release:       15%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -12,21 +12,30 @@
 #BuildRequires: gcc-g77
 #Requires:      libxorg-x11-devel lesstif-devel libblas3-devel liblapack3-devel
 # fedora core
-# fc 3
-#BuildRequires: xorg-x11-devel lapack blas openmotif-devel
-# fc 4
-#BuildRequires: xorg-x11-devel lapack-devel blas-devel openmotif-devel 
-# fc devel
-BuildRequires: imake lapack-devel blas-devel openmotif-devel 
-# for patchy build scripts
-BuildRequires: tcsh
+BuildRequires: openmotif-devel
+%if "%fedora" <= "3"
+BuildRequires: lapack blas
+%else
+BuildRequires: lapack-devel blas-devel
+%endif
+
+%if "%fedora" <= "4"
+BuildRequires: xorg-x11-devel 
+%else
+BuildRequires: imake 
 # workaround #173530
 BuildRequires: libXau-devel
+%endif
+# for patchy build scripts
+BuildRequires: tcsh
 # there are missing f2c intrinsics in gfortran so gfortran cannot be used to
 # build the cernlib
 BuildRequires: /usr/bin/g77
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if "%fedora" > "3"
+# f771 segfaults on x86_64
 ExcludeArch:   x86_64
+%endif
 
 # these sources are different from the upstream sources as files with 
 # GPL incompatible licences are removed. You can use cernlib-remove-deadpool
@@ -218,9 +227,17 @@
 
 %package devel
 Summary:       General purpose CERN library static libraries and headers
-Requires:      lapack-devel blas-devel openmotif-devel
+Requires:      openmotif-devel
+%if "%fedora" <= "3"
+Requires:       lapack blas
+%else
+Requires:       lapack-devel blas-devel
+%endif
+
+%if "%fedora" > "4"
 # workaround #173530
 Requires:      libXau-devel
+%endif
 Requires:      %{name} = %{version}-%{release}
 Group:         Development/Libraries
 
@@ -797,7 +814,10 @@
 
 
 %changelog
-* Tue Apr 11 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-14.1
+* Tue Apr 11 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-15
+- add conditionals in spec to have only one for all fedora versions.
+
+* Tue Apr 11 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-14
 - add patchy version 4 and build cernlib patchy. From Mattias Ellert.
 - update to newer debian patchset
 



From fedora-extras-commits at redhat.com  Tue Apr 11 23:16:48 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 11 Apr 2006 16:16:48 -0700
Subject: rpms/cernlib/devel patchy-rceta.patch,1.1,1.2
Message-ID: <200604112316.k3BNGoW5010466@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	patchy-rceta.patch 
Log Message:
Add -O2 -g to f77 call.


patchy-rceta.patch:

Index: patchy-rceta.patch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/patchy-rceta.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- patchy-rceta.patch	11 Apr 2006 22:45:34 -0000	1.1
+++ patchy-rceta.patch	11 Apr 2006 23:16:48 -0000	1.2
@@ -6,7 +6,7 @@
  \\
 - fort77 -o rceta rceta.f
 - rceta    <<\\
-+ f77 -o rceta rceta.f
++ f77 -g -O2 -o rceta rceta.f
 + ./rceta    <<\\
  CODE  INTERNAL A1 REPRESENTATION OF THE CETA SET / LNX
  CODE  CARD    1  IN HOLLERITH FOR CETA VALUES  1 - 47



From fedora-extras-commits at redhat.com  Tue Apr 11 23:38:11 2006
From: fedora-extras-commits at redhat.com (John Patrick Mahowald (jpmahowa))
Date: Tue, 11 Apr 2006 16:38:11 -0700
Subject: rpms/smeg/FC-3 .cvsignore, 1.4, NONE Makefile, 1.1, NONE branch, 1.1,
	NONE smeg.spec, 1.3, NONE sources, 1.4, NONE
Message-ID: <200604112338.k3BNcDL7010672@cvs-int.fedora.redhat.com>

Author: jpmahowa

Update of /cvs/extras/rpms/smeg/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10657

Removed Files:
	.cvsignore Makefile branch smeg.spec sources 
Log Message:
smeg has been renamed to alacarte


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- smeg.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 11 23:38:31 2006
From: fedora-extras-commits at redhat.com (John Patrick Mahowald (jpmahowa))
Date: Tue, 11 Apr 2006 16:38:31 -0700
Subject: rpms/smeg/FC-5 .cvsignore, 1.4, NONE Makefile, 1.1, NONE branch, 1.1,
	NONE smeg.spec, 1.4, NONE sources, 1.4, NONE
Message-ID: <200604112338.k3BNcX7K010694@cvs-int.fedora.redhat.com>

Author: jpmahowa

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

Removed Files:
	.cvsignore Makefile branch smeg.spec sources 
Log Message:
smeg has been renamed to alacarte


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- smeg.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 11 23:38:41 2006
From: fedora-extras-commits at redhat.com (John Patrick Mahowald (jpmahowa))
Date: Tue, 11 Apr 2006 16:38:41 -0700
Subject: rpms/smeg/devel .cvsignore, 1.4, NONE Makefile, 1.1, NONE smeg.spec,
	1.4, NONE sources, 1.4, NONE
Message-ID: <200604112338.k3BNchW8010715@cvs-int.fedora.redhat.com>

Author: jpmahowa

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

Removed Files:
	.cvsignore Makefile smeg.spec sources 
Log Message:
smeg has been renamed to alacarte


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- smeg.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Apr 12 00:02:08 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 17:02:08 -0700
Subject: rpms/xfce4-battery-plugin/devel LGPL, NONE,
	1.1 xfce4-battery-plugin.spec, 1.3, 1.4 GPL, 1.1, NONE
Message-ID: <200604120002.k3C02AVm012861@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-serv12795/devel

Modified Files:
	xfce4-battery-plugin.spec 
Added Files:
	LGPL 
Removed Files:
	GPL 
Log Message:
require xfce4-panel, fix license field (#173105)


--- NEW FILE LGPL ---
		  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


Index: xfce4-battery-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/devel/xfce4-battery-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-battery-plugin.spec	15 Feb 2006 22:09:07 -0000	1.3
+++ xfce4-battery-plugin.spec	12 Apr 2006 00:02:08 -0000	1.4
@@ -1,16 +1,17 @@
 Name:		xfce4-battery-plugin
 Version:	0.3.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Battery monitor for the Xfce panel
 
 Group:		User Interface/Desktops
-License:	GPL
+License:	LGPL
 URL:		http://xfce-goodies.berlios.de/
 Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
-Source1:	GPL
+Source1:	LGPL
 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
 
 %description
 A battery monitor plugin for the Xfce panel, compatible with APM and ACPI.
@@ -27,7 +28,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
-# replace wrong BSD license with a copy of GPL
+# replace wrong BSD license with a copy of LGPL
 %__cp %{SOURCE1} COPYING
 
 %clean
@@ -39,6 +40,10 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-6
+- Require xfce4-panel.
+- Change license back to LGPL (#173105).
+
 * Wed Feb 15 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-5
 - Rebuild for Fedora Extras 5.
 


--- GPL DELETED ---



From fedora-extras-commits at redhat.com  Wed Apr 12 00:01:59 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 17:01:59 -0700
Subject: rpms/xfce4-battery-plugin/FC-3 LGPL, NONE,
	1.1 xfce4-battery-plugin.spec, 1.2, 1.3 GPL, 1.1, NONE
Message-ID: <200604120002.k3C02YEB012864@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-battery-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12795/FC-3

Modified Files:
	xfce4-battery-plugin.spec 
Added Files:
	LGPL 
Removed Files:
	GPL 
Log Message:
require xfce4-panel, fix license field (#173105)


--- NEW FILE LGPL ---
		  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


Index: xfce4-battery-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/FC-3/xfce4-battery-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-battery-plugin.spec	2 Jan 2006 23:33:36 -0000	1.2
+++ xfce4-battery-plugin.spec	12 Apr 2006 00:01:59 -0000	1.3
@@ -1,16 +1,17 @@
 Name:		xfce4-battery-plugin
 Version:	0.3.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Battery monitor for the Xfce panel
 
 Group:		User Interface/Desktops
-License:	GPL
+License:	LGPL
 URL:		http://xfce-goodies.berlios.de/
 Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
-Source1:	GPL
+Source1:	LGPL
 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
 
 %description
 A battery monitor plugin for the Xfce panel, compatible with APM and ACPI.
@@ -27,7 +28,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
-# replace wrong BSD license with a copy of GPL
+# replace wrong BSD license with a copy of LGPL
 %__cp %{SOURCE1} COPYING
 
 %clean
@@ -39,6 +40,10 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-5
+- Require xfce4-panel.
+- Change license back to LGPL (#173105).
+
 * Fri Dec 30 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.


--- GPL DELETED ---



From fedora-extras-commits at redhat.com  Wed Apr 12 00:02:07 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 17:02:07 -0700
Subject: rpms/xfce4-battery-plugin/FC-5 LGPL, NONE,
	1.1 xfce4-battery-plugin.spec, 1.3, 1.4 GPL, 1.1, NONE
Message-ID: <200604120002.k3C02dbl012866@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-battery-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12795/FC-5

Modified Files:
	xfce4-battery-plugin.spec 
Added Files:
	LGPL 
Removed Files:
	GPL 
Log Message:
require xfce4-panel, fix license field (#173105)


--- NEW FILE LGPL ---
		  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


Index: xfce4-battery-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/FC-5/xfce4-battery-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-battery-plugin.spec	15 Feb 2006 22:09:07 -0000	1.3
+++ xfce4-battery-plugin.spec	12 Apr 2006 00:02:07 -0000	1.4
@@ -1,16 +1,17 @@
 Name:		xfce4-battery-plugin
 Version:	0.3.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Battery monitor for the Xfce panel
 
 Group:		User Interface/Desktops
-License:	GPL
+License:	LGPL
 URL:		http://xfce-goodies.berlios.de/
 Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
-Source1:	GPL
+Source1:	LGPL
 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
 
 %description
 A battery monitor plugin for the Xfce panel, compatible with APM and ACPI.
@@ -27,7 +28,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
-# replace wrong BSD license with a copy of GPL
+# replace wrong BSD license with a copy of LGPL
 %__cp %{SOURCE1} COPYING
 
 %clean
@@ -39,6 +40,10 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-6
+- Require xfce4-panel.
+- Change license back to LGPL (#173105).
+
 * Wed Feb 15 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-5
 - Rebuild for Fedora Extras 5.
 


--- GPL DELETED ---



From fedora-extras-commits at redhat.com  Wed Apr 12 00:02:04 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 17:02:04 -0700
Subject: rpms/xfce4-battery-plugin/FC-4 LGPL, NONE,
	1.1 xfce4-battery-plugin.spec, 1.2, 1.3 GPL, 1.1, NONE
Message-ID: <200604120002.k3C02bxC012865@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-battery-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12795/FC-4

Modified Files:
	xfce4-battery-plugin.spec 
Added Files:
	LGPL 
Removed Files:
	GPL 
Log Message:
require xfce4-panel, fix license field (#173105)


--- NEW FILE LGPL ---
		  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


Index: xfce4-battery-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/FC-4/xfce4-battery-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-battery-plugin.spec	2 Jan 2006 23:32:22 -0000	1.2
+++ xfce4-battery-plugin.spec	12 Apr 2006 00:02:04 -0000	1.3
@@ -1,16 +1,17 @@
 Name:		xfce4-battery-plugin
 Version:	0.3.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Battery monitor for the Xfce panel
 
 Group:		User Interface/Desktops
-License:	GPL
+License:	LGPL
 URL:		http://xfce-goodies.berlios.de/
 Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
-Source1:	GPL
+Source1:	LGPL
 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
 
 %description
 A battery monitor plugin for the Xfce panel, compatible with APM and ACPI.
@@ -27,7 +28,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
-# replace wrong BSD license with a copy of GPL
+# replace wrong BSD license with a copy of LGPL
 %__cp %{SOURCE1} COPYING
 
 %clean
@@ -39,6 +40,10 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-5
+- Require xfce4-panel.
+- Change license back to LGPL (#173105).
+
 * Fri Dec 30 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.


--- GPL DELETED ---



From fedora-extras-commits at redhat.com  Wed Apr 12 04:00:00 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 11 Apr 2006 21:00:00 -0700
Subject: rpms/xchat-gnome/FC-4 xchat-gnome.spec,1.2,1.3
Message-ID: <200604120400.k3C402WI019620@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/xchat-gnome/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19597

Modified Files:
	xchat-gnome.spec 
Log Message:
* Tue Apr 11 2006 Brian Pepple <bdpepple at ameritech.net> - 0.6-6
- Rebuild for new libsexy.



Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/FC-4/xchat-gnome.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xchat-gnome.spec	12 Nov 2005 14:56:10 -0000	1.2
+++ xchat-gnome.spec	12 Apr 2006 04:00:00 -0000	1.3
@@ -6,7 +6,7 @@
 
 Name:           xchat-gnome
 Version:        0.6
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
@@ -135,6 +135,9 @@
 %endif
 
 %changelog
+* Tue Apr 11 2006 Brian Pepple <bdpepple at ameritech.net> - 0.6-6
+- Rebuild for new libsexy.
+
 * Sat Nov 12 2005 Brian Pepple <bdpepple at ameritech.net> - 0.6-5
 - Add test for release version to determine if dbus is enabled.
 - Add dist tag.



From fedora-extras-commits at redhat.com  Wed Apr 12 06:36:56 2006
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Tue, 11 Apr 2006 23:36:56 -0700
Subject: rpms/NetworkManager-vpnc/devel nm-vpnc-0.6.0-rekeying.patch, NONE, 
	1.1 NetworkManager-vpnc.spec, 1.7, 1.8
Message-ID: <200604120636.k3C6awVL026122@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/NetworkManager-vpnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26102

Modified Files:
	NetworkManager-vpnc.spec 
Added Files:
	nm-vpnc-0.6.0-rekeying.patch 
Log Message:
* Wed Apr 12 2006 Christopher Aillon <caillon at redhat.com> 0.6.0-2
- Rekey every 2 hours


nm-vpnc-0.6.0-rekeying.patch:

--- NEW FILE nm-vpnc-0.6.0-rekeying.patch ---
--- NetworkManager-vpnc-0.6.0/src/nm-vpnc-service.c.rekeying	2006-03-19 07:15:48.000000000 -0500
+++ NetworkManager-vpnc-0.6.0/src/nm-vpnc-service.c	2006-03-19 07:15:51.000000000 -0500
@@ -57,6 +57,7 @@
 
 #define NM_VPNC_HELPER_PATH		BINDIR"/nm-vpnc-service-vpnc-helper"
 #define NM_VPNC_UDP_ENCAPSULATION_PORT	0 /* random port */
+#define NM_VPNC_REKEYING_INTERVAL 7200
 
 typedef struct NmVpncData
 {
@@ -444,6 +445,7 @@
 	write_config_option (vpnc_fd, "Script " NM_VPNC_HELPER_PATH "\n");
 	write_config_option (vpnc_fd, "UDP Encapsulate\n");
 	write_config_option (vpnc_fd, "UDP Encapsulation Port %d\n", NM_VPNC_UDP_ENCAPSULATION_PORT);
+	write_config_option (vpnc_fd, "Rekeying interval %d\n", NM_VPNC_REKEYING_INTERVAL);
 	write_config_option (vpnc_fd, "IPSec secret %s\n", password_items[0]);
 	write_config_option (vpnc_fd, "Xauth password %s\n", password_items[1]);
 
@@ -485,17 +487,19 @@
 static gboolean nm_vpnc_config_options_validate (char **data_items, int num_items)
 {
 	Option	allowed_opts[] = {
-					{ "IPSec gateway",			OPT_TYPE_ADDRESS },
-					{ "IPSec ID",				OPT_TYPE_ASCII },
-					{ "IPSec secret",			OPT_TYPE_ASCII },
-					{ "Xauth username",			OPT_TYPE_ASCII },
-					{ "UDP Encapsulate",		OPT_TYPE_NONE },
-					{ "UDP Encapsulation Port",	OPT_TYPE_ASCII },
-					{ "Domain",				OPT_TYPE_ASCII },
-					{ "IKE DH Group",			OPT_TYPE_ASCII },
-					{ "Perfect Forward Secrecy",	OPT_TYPE_ASCII },
-					{ "Application Version",		OPT_TYPE_ASCII },
-					{ NULL,					OPT_TYPE_UNKNOWN } };
+		{ "IPSec gateway",            OPT_TYPE_ADDRESS },
+		{ "IPSec ID",                 OPT_TYPE_ASCII },
+		{ "IPSec secret",             OPT_TYPE_ASCII },
+		{ "Xauth username",           OPT_TYPE_ASCII },
+		{ "UDP Encapsulate",          OPT_TYPE_NONE },
+		{ "UDP Encapsulation Port",   OPT_TYPE_ASCII },
+		{ "Domain",                   OPT_TYPE_ASCII },
+		{ "IKE DH Group",             OPT_TYPE_ASCII },
+		{ "Perfect Forward Secrecy",  OPT_TYPE_ASCII },
+		{ "Application Version",      OPT_TYPE_ASCII },
+		{ "Rekeying interval",        OPT_TYPE_ASCII },
+		{ NULL,                       OPT_TYPE_UNKNOWN }
+	};
 
 	unsigned int	i;
 


Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NetworkManager-vpnc.spec	14 Mar 2006 21:34:47 -0000	1.7
+++ NetworkManager-vpnc.spec	12 Apr 2006 06:36:55 -0000	1.8
@@ -7,7 +7,7 @@
 Summary: NetworkManager VPN integration for vpnc
 Name: NetworkManager-vpnc
 Version: 0.6.0
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
@@ -32,12 +32,15 @@
 Requires: gnome-keyring
 Requires: libglade2
 
+Patch1: nm-vpnc-0.6.0-rekeying.patch
+
 %description
 This package contains software for integrating the vpnc VPN software
 with NetworkManager and the GNOME desktop
 
 %prep
 %setup -q
+%patch1 -p1 -b .rekeying
 
 %build
 %configure
@@ -50,7 +53,7 @@
 rm -f %{buildroot}%{_libdir}/lib*.la
 rm -f %{buildroot}%{_libdir}/lib*.a
 
-%find_lang %{name}
+#%find_lang %{name}
 
 %clean
 rm -rf %{buildroot}
@@ -69,7 +72,8 @@
       /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor
 fi
 
-%files -f %{name}.lang
+#%files -f %{name}.lang
+%files
 %defattr(-, root, root)
 
 %doc AUTHORS ChangeLog NEWS README
@@ -84,6 +88,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
 
 %changelog
+* Wed Apr 12 2006 Christopher Aillon <caillon at redhat.com> 0.6.0-2
+- Rekey every 2 hours
+
 * Tue Mar 14 2006 Dan Williams <dcbw at redhat.com> - 0.6.0-1
 - Update to CVS snapshot of 0.6 for NM compatibility
 



From fedora-extras-commits at redhat.com  Wed Apr 12 06:53:13 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 11 Apr 2006 23:53:13 -0700
Subject: rpms/cernlib/devel cernlib.spec,1.22,1.23
Message-ID: <200604120653.k3C6rF9h026200@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	cernlib.spec 
Log Message:
Try a x86_64 build to verify whether patchy builds or not


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- cernlib.spec	11 Apr 2006 23:12:13 -0000	1.22
+++ cernlib.spec	12 Apr 2006 06:53:13 -0000	1.23
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       15%{?dist}
+Release:       15%{?dist}.1
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -34,8 +34,10 @@
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if "%fedora" > "3"
 # f771 segfaults on x86_64
-ExcludeArch:   x86_64
+#ExcludeArch:   x86_64
 %endif
+# rceta segfaults on ppc
+ExcludeArch:   ppc
 
 # these sources are different from the upstream sources as files with 
 # GPL incompatible licences are removed. You can use cernlib-remove-deadpool
@@ -814,7 +816,7 @@
 
 
 %changelog
-* Tue Apr 11 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-15
+* Tue Apr 11 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-15.1
 - add conditionals in spec to have only one for all fedora versions.
 
 * Tue Apr 11 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-14



From fedora-extras-commits at redhat.com  Wed Apr 12 08:04:49 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Wed, 12 Apr 2006 01:04:49 -0700
Subject: fedora-security/audit fc4,1.200,1.201 fc5,1.113,1.114
Message-ID: <200604120804.k3C84nBE030548@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30526

Modified Files:
	fc4 fc5 
Log Message:
A few things new in CVE that need examining



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- fc4	11 Apr 2006 19:14:10 -0000	1.200
+++ fc4	12 Apr 2006 08:04:46 -0000	1.201
@@ -1,8 +1,10 @@
-Up to date CVE as of CVE email 20060509
-Up to date FC4 as of 20060509
+Up to date CVE as of CVE email 20060411
+Up to date FC4 as of 20060411
 
 ** are items that need attention
 
+CVE-2006-1721 ** cyrus-sasl
+CVE-2006-1650 ** firefox
 CVE-2006-1646 ignore (ipsec-tools) KAME racoon, not ipsec-tools racoon
 CVE-2006-1624 ignore (sysklogd) Silly configuration is not a security issue
 CVE-2006-1608 ignore (php) safe mode isn't safe


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- fc5	11 Apr 2006 19:14:10 -0000	1.113
+++ fc5	12 Apr 2006 08:04:46 -0000	1.114
@@ -1,8 +1,10 @@
-Up to date CVE as of CVE email 20060409
-Up to date FC5 as of 20060409
+Up to date CVE as of CVE email 20060411
+Up to date FC5 as of 20060411
 
 ** are items that need attention
 
+CVE-2006-1721 ** cyrus-sasl
+CVE-2006-1650 ** firefox
 CVE-2006-1646 ignore (ipsec-tools) KAME racoon, not ipsec-tools racoon
 CVE-2006-1624 ignore (sysklogd) Silly configuration is not a security issue
 CVE-2006-1608 ignore (php) safe mode isn't safe



From fedora-extras-commits at redhat.com  Wed Apr 12 08:08:50 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Wed, 12 Apr 2006 01:08:50 -0700
Subject: fedora-security/audit fc4,1.201,1.202 fc5,1.114,1.115
Message-ID: <200604120808.k3C88o2F030592@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30572

Modified Files:
	fc4 fc5 
Log Message:
mailman



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- fc4	12 Apr 2006 08:04:46 -0000	1.201
+++ fc4	12 Apr 2006 08:08:47 -0000	1.202
@@ -4,6 +4,7 @@
 ** are items that need attention
 
 CVE-2006-1721 ** cyrus-sasl
+CVE-2006-1712 version (mailman, only 2.1.7)
 CVE-2006-1650 ** firefox
 CVE-2006-1646 ignore (ipsec-tools) KAME racoon, not ipsec-tools racoon
 CVE-2006-1624 ignore (sysklogd) Silly configuration is not a security issue


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- fc5	12 Apr 2006 08:04:46 -0000	1.114
+++ fc5	12 Apr 2006 08:08:47 -0000	1.115
@@ -4,6 +4,7 @@
 ** are items that need attention
 
 CVE-2006-1721 ** cyrus-sasl
+CVE-2006-1712 version (mailman, only 2.1.7)
 CVE-2006-1650 ** firefox
 CVE-2006-1646 ignore (ipsec-tools) KAME racoon, not ipsec-tools racoon
 CVE-2006-1624 ignore (sysklogd) Silly configuration is not a security issue



From fedora-extras-commits at redhat.com  Wed Apr 12 12:37:40 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Wed, 12 Apr 2006 05:37:40 -0700
Subject: rpms/grace/devel grace.spec,1.6,1.7
Message-ID: <200604121237.k3CCbgRJ007902@cvs-int.fedora.redhat.com>

Author: jamatos

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

Modified Files:
	grace.spec 
Log Message:
* Wed Apr 12 2006 Jos?? Matos <jamatos at fc.up.pt> - 5.1.19-5
- Add htmlview as help viewer.



Index: grace.spec
===================================================================
RCS file: /cvs/extras/rpms/grace/devel/grace.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- grace.spec	16 Feb 2006 11:03:52 -0000	1.6
+++ grace.spec	12 Apr 2006 12:37:39 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           grace
 Version:        5.1.19
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Numerical Data Processing and Visualization Tool
 
 License:        GPL
@@ -27,6 +27,7 @@
 %endif
 
 Requires:	nedit
+Requires:	htmlview
 Requires(post): chkfontpath
 Requires(postun): chkfontpath
 
@@ -60,6 +61,7 @@
 %configure \
     --enable-editres \
     --with-editor=nedit \
+    --with-helpviewer="htmlview %s" \
     --with-printcmd="lpr" \
     --enable-grace-home=%{_datadir}/%{name} \
     --disable-pdfdrv \
@@ -164,7 +166,10 @@
 
 
 %changelog
-* Thu Feb 16 2006 Jose' Matos <jamatos at fc.up.pt> - 5.1.19-4
+* Wed Apr 12 2006 Jos?? Matos <jamatos at fc.up.pt> - 5.1.19-5
+- Add htmlview as help viewer.
+
+* Thu Feb 16 2006 Jos?? Matos <jamatos at fc.up.pt> - 5.1.19-4
 - Remove stripping option from Makefiles to have meaningfull debuginfo packages.
 - Thanks to Ville Skytt?? for the fix. (bz#180106)
 



From fedora-extras-commits at redhat.com  Wed Apr 12 12:39:39 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Wed, 12 Apr 2006 05:39:39 -0700
Subject: rpms/grace/FC-5 grace.spec,1.6,1.7
Message-ID: <200604121239.k3CCdfBH007964@cvs-int.fedora.redhat.com>

Author: jamatos

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

Modified Files:
	grace.spec 
Log Message:
* Wed Apr 12 2006 Jos?? Matos <jamatos at fc.up.pt> - 5.1.19-5
- Add htmlview as help viewer.



Index: grace.spec
===================================================================
RCS file: /cvs/extras/rpms/grace/FC-5/grace.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- grace.spec	16 Feb 2006 11:03:52 -0000	1.6
+++ grace.spec	12 Apr 2006 12:39:39 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           grace
 Version:        5.1.19
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Numerical Data Processing and Visualization Tool
 
 License:        GPL
@@ -27,6 +27,7 @@
 %endif
 
 Requires:	nedit
+Requires:	htmlview
 Requires(post): chkfontpath
 Requires(postun): chkfontpath
 
@@ -60,6 +61,7 @@
 %configure \
     --enable-editres \
     --with-editor=nedit \
+    --with-helpviewer="htmlview %s" \
     --with-printcmd="lpr" \
     --enable-grace-home=%{_datadir}/%{name} \
     --disable-pdfdrv \
@@ -164,7 +166,10 @@
 
 
 %changelog
-* Thu Feb 16 2006 Jose' Matos <jamatos at fc.up.pt> - 5.1.19-4
+* Wed Apr 12 2006 Jos?? Matos <jamatos at fc.up.pt> - 5.1.19-5
+- Add htmlview as help viewer.
+
+* Thu Feb 16 2006 Jos?? Matos <jamatos at fc.up.pt> - 5.1.19-4
 - Remove stripping option from Makefiles to have meaningfull debuginfo packages.
 - Thanks to Ville Skytt?? for the fix. (bz#180106)
 



From fedora-extras-commits at redhat.com  Wed Apr 12 12:40:48 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Wed, 12 Apr 2006 05:40:48 -0700
Subject: rpms/grace/FC-4 grace.spec,1.5,1.6
Message-ID: <200604121240.k3CCeoPS008026@cvs-int.fedora.redhat.com>

Author: jamatos

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

Modified Files:
	grace.spec 
Log Message:
* Wed Apr 12 2006 Jos?? Matos <jamatos at fc.up.pt> - 5.1.19-5
- Add htmlview as help viewer.



Index: grace.spec
===================================================================
RCS file: /cvs/extras/rpms/grace/FC-4/grace.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- grace.spec	16 Feb 2006 11:06:57 -0000	1.5
+++ grace.spec	12 Apr 2006 12:40:47 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           grace
 Version:        5.1.19
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Numerical Data Processing and Visualization Tool
 
 License:        GPL
@@ -27,6 +27,7 @@
 %endif
 
 Requires:	nedit
+Requires:	htmlview
 Requires(post): chkfontpath
 Requires(postun): chkfontpath
 
@@ -60,6 +61,7 @@
 %configure \
     --enable-editres \
     --with-editor=nedit \
+    --with-helpviewer="htmlview %s" \
     --with-printcmd="lpr" \
     --enable-grace-home=%{_datadir}/%{name} \
     --disable-pdfdrv \
@@ -164,7 +166,10 @@
 
 
 %changelog
-* Thu Feb 16 2006 Jose' Matos <jamatos at fc.up.pt> - 5.1.19-4
+* Wed Apr 12 2006 Jos?? Matos <jamatos at fc.up.pt> - 5.1.19-5
+- Add htmlview as help viewer.
+
+* Thu Feb 16 2006 Jos?? Matos <jamatos at fc.up.pt> - 5.1.19-4
 - Remove stripping option from Makefiles to have meaningfull debuginfo packages.
 - Thanks to Ville Skytt?? for the fix. (bz#180106)
 



From fedora-extras-commits at redhat.com  Wed Apr 12 14:22:14 2006
From: fedora-extras-commits at redhat.com (John Clark Williams (jcwillia))
Date: Wed, 12 Apr 2006 07:22:14 -0700
Subject: mock mock.py,1.40,1.41
Message-ID: <200604121422.k3CEMEVG012476@cvs-int.fedora.redhat.com>

Author: jcwillia

Update of /cvs/fedora/mock
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12458

Modified Files:
	mock.py 
Log Message:
change to chroot command to insure /proc and /sys are mounted/unmounted


Index: mock.py
===================================================================
RCS file: /cvs/fedora/mock/mock.py,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- mock.py	11 Apr 2006 08:01:31 -0000	1.40
+++ mock.py	12 Apr 2006 14:22:11 -0000	1.41
@@ -792,7 +792,9 @@
     elif args[0] == 'chroot':
         config_opts['clean'] = config_opts['quiet'] = False
         my= Root(config_opts)
+        my._mount()
         my.do_chroot(' '.join(args[1:]), True)
+        my.close()
         print 'Finished chroot command'
         
     else:



From fedora-extras-commits at redhat.com  Wed Apr 12 14:22:47 2006
From: fedora-extras-commits at redhat.com (John Clark Williams (jcwillia))
Date: Wed, 12 Apr 2006 07:22:47 -0700
Subject: mock buildsys-build.spec,NONE,1.1
Message-ID: <200604121422.k3CEMlQo012499@cvs-int.fedora.redhat.com>

Author: jcwillia

Update of /cvs/fedora/mock
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12482

Added Files:
	buildsys-build.spec 
Log Message:
initial checkin of dependency rpm specfile


--- NEW FILE buildsys-build.spec ---
#
# Spec file for mock buildsys configuration
#
Summary: The base set of packages for a mock chroot
Name: buildsys-build
Version: 0.5
Release: 1%{?dist}
License: GPL
Group: Development/Build Tools
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch: noarch

# packages that populate a buildsys chroot
Requires: coreutils
Requires: findutils
Requires: openssh-server
Requires: which
Requires: bash
Requires: glibc
Requires: python
Requires: createrepo
Requires: rpm
Requires: rpm-python
Requires: initscripts
Requires: chkconfig
Requires: fedora-release
Requires: buildsys-macros
Requires: perl-XML-SAX
Requires: tar
Requires: diffstat
Requires: perl-XML-Parser
Requires: perl-XML-Dumper
Requires: udev
Requires: gdb
Requires: automake15
Requires: gcc
Requires: intltool
Requires: redhat-rpm-config
Requires: automake17
Requires: pkgconfig
Requires: gettext
Requires: automake
Requires: automake16
Requires: automake14
Requires: patchutils
Requires: ctags
Requires: gcc-c++
Requires: flex
Requires: unzip
Requires: bzip2
Requires: cpio
Requires: byacc
Requires: doxygen
Requires: indent
Requires: strace
Requires: rpm-build
Requires: elfutils
Requires: patch
Requires: bison
Requires: diffutils
Requires: gzip
Requires: libtool
Requires: autoconf
Requires: make
Requires: binutils

%description
The base set of packages for a mock chroot

%prep
%build
%install
%clean

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



From fedora-extras-commits at redhat.com  Wed Apr 12 14:23:20 2006
From: fedora-extras-commits at redhat.com (John Clark Williams (jcwillia))
Date: Wed, 12 Apr 2006 07:23:20 -0700
Subject: mock Makefile,1.7,1.8
Message-ID: <200604121423.k3CENKTN012535@cvs-int.fedora.redhat.com>

Author: jcwillia

Update of /cvs/fedora/mock
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12512

Modified Files:
	Makefile 
Log Message:
added target for buildsys-build RPM


Index: Makefile
===================================================================
RCS file: /cvs/fedora/mock/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile	20 Nov 2005 21:57:30 -0000	1.7
+++ Makefile	12 Apr 2006 14:23:17 -0000	1.8
@@ -40,3 +40,8 @@
 	rm -rf build dist
 	mkdir build dist
 	rpmbuild --define "_sourcedir $(PWD)" --define "_builddir $(PWD)/build" --define "_srcrpmdir $(PWD)/dist" --define "_rpmdir $(PWD)/dist" -ba mock.spec
+
+buildsys-rpm:
+	rm -rf buildsys
+	mkdir buildsys
+	rpmbuild --define "_sourcedir $(PWD)" --define "_builddir $(PWD)/buildsys" --define "_srcrpmdir $(PWD)/buildsys" --define "_rpmdir $(PWD)/buildsys" -ba buildsys-build.spec



From fedora-extras-commits at redhat.com  Wed Apr 12 14:30:33 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 12 Apr 2006 07:30:33 -0700
Subject: rpms/Macaulay2/devel Macaulay2.spec,1.14,1.15
Message-ID: <200604121430.k3CEUZdG012575@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	Macaulay2.spec 
Log Message:
* Wed Apr 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.8-0.3.cvs20060327 
- omit x86_64, for now (#188709)



Index: Macaulay2.spec
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/devel/Macaulay2.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Macaulay2.spec	11 Apr 2006 17:55:39 -0000	1.14
+++ Macaulay2.spec	12 Apr 2006 14:30:33 -0000	1.15
@@ -4,14 +4,16 @@
 Summary: System for algebraic geometry and commutative algebra
 Name:    Macaulay2
 Version: 0.9.8
-Release: 0.2.%{beta}%{?dist}
+Release: 0.3.%{beta}%{?dist}
 
 License: GPL
 Group:   Applications/Engineering
 URL:     http://www.math.uiuc.edu/Macaulay2/
-#Source:  http://www.math.uiuc.edu/Macaulay2/ftp-site/Macaulay2-0.9.5.beta.tar.gz
+#Source:  http://www.math.uiuc.edu/Macaulay2/ftp-site/Macaulay2-%{version}.beta.tar.gz
 Source:	 M2-0.9.8-%{beta}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# "64 bit build fails", http://bugzilla.redhat.com/bugzilla/188709
+ExcludeArch: x86_64 ppc64
 
 Source1: Macaulay2.png
 Source2: Macaulay2.desktop
@@ -140,7 +142,10 @@
 
 
 %changelog
-* Tue Mar 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.8-0.2.cvs20060327
+* Wed Apr 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.8-0.3.cvs20060327 
+- omit x86_64, for now (#188709)
+
+* Tue Apr 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.8-0.2.cvs20060327
 - 0.9.8 (cvs, no tarball yet)
 - drop -doc subpkg (in main now)
 



From fedora-extras-commits at redhat.com  Wed Apr 12 14:34:42 2006
From: fedora-extras-commits at redhat.com (Dams Nade (anvil))
Date: Wed, 12 Apr 2006 07:34:42 -0700
Subject: rpms/libebml/devel .cvsignore, 1.7, 1.8 libebml.spec, 1.13,
	1.14 sources, 1.8, 1.9
Message-ID: <200604121434.k3CEYiLH012652@cvs-int.fedora.redhat.com>

Author: anvil

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

Modified Files:
	.cvsignore libebml.spec sources 
Log Message:
libebml/devel: updated to 0.7.7


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libebml/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	29 Nov 2005 09:46:41 -0000	1.7
+++ .cvsignore	12 Apr 2006 14:34:42 -0000	1.8
@@ -1 +1 @@
-libebml-0.7.6.tar.bz2
+libebml-0.7.7.tar.bz2


Index: libebml.spec
===================================================================
RCS file: /cvs/extras/rpms/libebml/devel/libebml.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libebml.spec	16 Mar 2006 18:38:40 -0000	1.13
+++ libebml.spec	12 Apr 2006 14:34:42 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: 	Extensible Binary Meta Language library
 Name: 		libebml
-Version: 	0.7.6
-Release: 	2%{?dist}
+Version: 	0.7.7
+Release: 	1%{?dist}
 License: 	LGPL
 Group: 		System Environment/Libraries
 URL: 		http://www.matroska.org/
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Wed Apr 12 2006 Dams <anvil[AT]livna.org> - 0.7.7-1
+- Updated to 0.7.7
+
 * Thu Mar 16 2006 Dams <anvil[AT]livna.org> - 0.7.6-2.fc5
 - Release bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libebml/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	29 Nov 2005 09:46:41 -0000	1.8
+++ sources	12 Apr 2006 14:34:42 -0000	1.9
@@ -1 +1 @@
-bb054799dfdf6bfa5dd2cf95416ff021  libebml-0.7.6.tar.bz2
+7c8456a50fd82c1c9755917d0182c49e  libebml-0.7.7.tar.bz2



From fedora-extras-commits at redhat.com  Wed Apr 12 14:35:29 2006
From: fedora-extras-commits at redhat.com (Dams Nade (anvil))
Date: Wed, 12 Apr 2006 07:35:29 -0700
Subject: rpms/libebml/FC-5 .cvsignore, 1.7, 1.8 libebml.spec, 1.13,
	1.14 sources, 1.8, 1.9
Message-ID: <200604121435.k3CEZVB1012684@cvs-int.fedora.redhat.com>

Author: anvil

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

Modified Files:
	.cvsignore libebml.spec sources 
Log Message:
libebml/FC-5: updated to 0.7.7


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libebml/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	29 Nov 2005 09:46:41 -0000	1.7
+++ .cvsignore	12 Apr 2006 14:35:29 -0000	1.8
@@ -1 +1 @@
-libebml-0.7.6.tar.bz2
+libebml-0.7.7.tar.bz2


Index: libebml.spec
===================================================================
RCS file: /cvs/extras/rpms/libebml/FC-5/libebml.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libebml.spec	16 Mar 2006 18:38:40 -0000	1.13
+++ libebml.spec	12 Apr 2006 14:35:29 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: 	Extensible Binary Meta Language library
 Name: 		libebml
-Version: 	0.7.6
-Release: 	2%{?dist}
+Version: 	0.7.7
+Release: 	1%{?dist}
 License: 	LGPL
 Group: 		System Environment/Libraries
 URL: 		http://www.matroska.org/
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Wed Apr 12 2006 Dams <anvil[AT]livna.org> - 0.7.7-1
+- Updated to 0.7.7
+
 * Thu Mar 16 2006 Dams <anvil[AT]livna.org> - 0.7.6-2.fc5
 - Release bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libebml/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	29 Nov 2005 09:46:41 -0000	1.8
+++ sources	12 Apr 2006 14:35:29 -0000	1.9
@@ -1 +1 @@
-bb054799dfdf6bfa5dd2cf95416ff021  libebml-0.7.6.tar.bz2
+7c8456a50fd82c1c9755917d0182c49e  libebml-0.7.7.tar.bz2



From fedora-extras-commits at redhat.com  Wed Apr 12 14:42:38 2006
From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom))
Date: Wed, 12 Apr 2006 07:42:38 -0700
Subject: devel/qgo .cvsignore,1.4,1.5 qgo.spec,1.8,1.9 sources,1.4,1.5
Message-ID: <200604121442.k3CEgf5q012877@cvs-int.fedora.redhat.com>

Author: kaboom

Update of /cvs/extras/devel/qgo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12851

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



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/qgo/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Feb 2006 18:51:37 -0000	1.4
+++ .cvsignore	12 Apr 2006 14:42:38 -0000	1.5
@@ -1 +1 @@
-qgo-1.0.4-r2.tar.gz
+qgo-1.5-r1.tar.gz


Index: qgo.spec
===================================================================
RCS file: /cvs/extras/devel/qgo/qgo.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- qgo.spec	15 Feb 2006 18:51:37 -0000	1.8
+++ qgo.spec	12 Apr 2006 14:42:38 -0000	1.9
@@ -1,11 +1,11 @@
 Summary: Graphical Go client and SGF editor
 Name: qgo
-Version: 1.0.4r2
+Version: 1.5r1
 Release: 1%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://qgo.sourceforge.net/
-Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-1.0.4-r2.tar.gz
+Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-1.5-r1.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.0.4
+%setup -q -n %{name}-1.5
 
 %build
 unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh
@@ -58,6 +58,9 @@
 %{_datadir}/mimelnk/text/sgf.desktop
 
 %changelog
+* Wed Apr 12 2006 Chris Ricker <kaboom at oobleck.net> 1.5r1
+- New upstream release
+
 * Wed Feb 15 2006 Chris Ricker <kaboom at oobleck.net> 1.0.4r2
 - New upstream release
 - Update for modular X


Index: sources
===================================================================
RCS file: /cvs/extras/devel/qgo/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Feb 2006 18:51:37 -0000	1.4
+++ sources	12 Apr 2006 14:42:38 -0000	1.5
@@ -1 +1 @@
-49da743ca769d8d18fc3a4b7a6aa0bf8  qgo-1.0.4-r2.tar.gz
+1051f540aa4e1a83a29ec6be3896c2c2  qgo-1.5-r1.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 12 14:43:13 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 12 Apr 2006 07:43:13 -0700
Subject: rpms/perl-DBD-SQLite/devel
	DBD-SQLite-1.11-type-information-segv.patch, NONE,
	1.1 DBD-SQLite-1.11-VIEW-type-information-segv.patch, 1.1, NONE
Message-ID: <200604121443.k3CEhFIN012937@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-DBD-SQLite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12919

Added Files:
	DBD-SQLite-1.11-type-information-segv.patch 
Removed Files:
	DBD-SQLite-1.11-VIEW-type-information-segv.patch 
Log Message:
Rename: DBD-SQLite-1.11-VIEW-type-information-segv.patch -> DBD-SQLite-1.11-type-information-segv.patch

DBD-SQLite-1.11-type-information-segv.patch:

--- NEW FILE DBD-SQLite-1.11-type-information-segv.patch ---
diff -ur DBD-SQLite-1.11.orig/dbdimp.c DBD-SQLite-1.11/dbdimp.c
--- DBD-SQLite-1.11.orig/dbdimp.c	2005-12-02 17:28:53.000000000 +0000
+++ DBD-SQLite-1.11/dbdimp.c	2006-02-06 12:10:31.000000000 +0000
@@ -677,11 +677,15 @@
         retsv = sv_2mortal(newRV(sv_2mortal((SV*)av)));
         for (n = 0; n < i; n++) {
             const char *fieldtype = sqlite3_column_decltype(imp_sth->stmt, n);
-            int type = sqlite3_column_type(imp_sth->stmt, n);
+            /* int type = sqlite3_column_type(imp_sth->stmt, n); */
             /* warn("got type: %d = %s\n", type, fieldtype); */
-            type = type_to_odbc_type(type);
+            /* type = type_to_odbc_type(type); */
             /* av_store(av, n, newSViv(type)); */
-            av_store(av, n, newSVpv(fieldtype, 0));
+	    if (fieldtype == NULL) {
+		av_store(av, n, newSVpv("INTEGER", 0));
+	    } else {
+                av_store(av, n, newSVpv(fieldtype, 0));
+	    }
         }
     }
     else if (strEQ(key, "NULLABLE")) {


--- DBD-SQLite-1.11-VIEW-type-information-segv.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Apr 12 14:43:56 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 12 Apr 2006 07:43:56 -0700
Subject: rpms/perl-DBD-SQLite/devel .cvsignore, 1.4, 1.5 perl-DBD-SQLite.spec,
	1.9, 1.10 sources, 1.4,
	1.5 DBD-SQLite-1.11-build-with-system-sqlite-3.3.x.patch, 1.1, NONE
Message-ID: <200604121443.k3CEhw8f012974@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-DBD-SQLite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12953

Modified Files:
	.cvsignore perl-DBD-SQLite.spec sources 
Removed Files:
	DBD-SQLite-1.11-build-with-system-sqlite-3.3.x.patch 
Log Message:
Update to 1.12.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-SQLite/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Dec 2005 20:59:23 -0000	1.4
+++ .cvsignore	12 Apr 2006 14:43:56 -0000	1.5
@@ -1 +1 @@
-DBD-SQLite-1.11.tar.gz
+DBD-SQLite-1.12.tar.gz


Index: perl-DBD-SQLite.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-SQLite/devel/perl-DBD-SQLite.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-DBD-SQLite.spec	5 Apr 2006 16:53:21 -0000	1.9
+++ perl-DBD-SQLite.spec	12 Apr 2006 14:43:56 -0000	1.10
@@ -1,14 +1,13 @@
 Name:           perl-DBD-SQLite
-Version:        1.11
-Release:        4%{?dist}
+Version:        1.12
+Release:        1%{?dist}
 Summary:        Self Contained RDBMS in a DBI Driver
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/DBD-SQLite/
 Source0:        http://www.cpan.org/authors/id/M/MS/MSERGEANT/DBD-SQLite-%{version}.tar.gz
-Patch0:         DBD-SQLite-1.11-build-with-system-sqlite-3.3.x.patch
-Patch1:         DBD-SQLite-1.11-VIEW-type-information-segv.patch
+Patch0:         DBD-SQLite-1.11-type-information-segv.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl-DBI >= 1.03
@@ -33,7 +32,6 @@
 %prep
 %setup -q -n DBD-SQLite-%{version}
 %patch0 -p1
-%patch1 -p1
 
 
 %build
@@ -67,9 +65,12 @@
 
 
 %changelog
+* Tue Apr 11 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.12-1
+- Update to 1.12.
+
 * Wed Apr  5 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.11-4
 - Patch to build with system sqlite 3.3.x (#183530).
-- Patch to avoid VIEW type information segv (#187873).
+- Patch to avoid type information segv (#187873).
 
 * Thu Mar  9 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.11-3
 - DBD::SQLite fails to build with the current FC-5 sqlite version (3.3.3);


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-SQLite/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Dec 2005 20:59:23 -0000	1.4
+++ sources	12 Apr 2006 14:43:56 -0000	1.5
@@ -1 +1 @@
-7f22d8789245047343e114e655571022  DBD-SQLite-1.11.tar.gz
+40b1d208d70d5d8cab7723df96fc239c  DBD-SQLite-1.12.tar.gz


--- DBD-SQLite-1.11-build-with-system-sqlite-3.3.x.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Apr 12 14:55:21 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 12 Apr 2006 07:55:21 -0700
Subject: rpms/perl-DBD-SQLite/FC-5
	DBD-SQLite-1.11-type-information-segv.patch, 
	NONE, 1.1 .cvsignore, 1.4, 1.5 perl-DBD-SQLite.spec, 1.8,
	1.9 sources, 1.4, 1.5
Message-ID: <200604121455.k3CEtNH9013130@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-DBD-SQLite/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13106

Modified Files:
	.cvsignore perl-DBD-SQLite.spec sources 
Added Files:
	DBD-SQLite-1.11-type-information-segv.patch 
Log Message:
Update to 1.12.

DBD-SQLite-1.11-type-information-segv.patch:

--- NEW FILE DBD-SQLite-1.11-type-information-segv.patch ---
diff -ur DBD-SQLite-1.11.orig/dbdimp.c DBD-SQLite-1.11/dbdimp.c
--- DBD-SQLite-1.11.orig/dbdimp.c	2005-12-02 17:28:53.000000000 +0000
+++ DBD-SQLite-1.11/dbdimp.c	2006-02-06 12:10:31.000000000 +0000
@@ -677,11 +677,15 @@
         retsv = sv_2mortal(newRV(sv_2mortal((SV*)av)));
         for (n = 0; n < i; n++) {
             const char *fieldtype = sqlite3_column_decltype(imp_sth->stmt, n);
-            int type = sqlite3_column_type(imp_sth->stmt, n);
+            /* int type = sqlite3_column_type(imp_sth->stmt, n); */
             /* warn("got type: %d = %s\n", type, fieldtype); */
-            type = type_to_odbc_type(type);
+            /* type = type_to_odbc_type(type); */
             /* av_store(av, n, newSViv(type)); */
-            av_store(av, n, newSVpv(fieldtype, 0));
+	    if (fieldtype == NULL) {
+		av_store(av, n, newSVpv("INTEGER", 0));
+	    } else {
+                av_store(av, n, newSVpv(fieldtype, 0));
+	    }
         }
     }
     else if (strEQ(key, "NULLABLE")) {


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-SQLite/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Dec 2005 20:59:23 -0000	1.4
+++ .cvsignore	12 Apr 2006 14:55:21 -0000	1.5
@@ -1 +1 @@
-DBD-SQLite-1.11.tar.gz
+DBD-SQLite-1.12.tar.gz


Index: perl-DBD-SQLite.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-SQLite/FC-5/perl-DBD-SQLite.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-DBD-SQLite.spec	9 Mar 2006 19:59:28 -0000	1.8
+++ perl-DBD-SQLite.spec	12 Apr 2006 14:55:21 -0000	1.9
@@ -1,12 +1,13 @@
 Name:           perl-DBD-SQLite
-Version:        1.11
-Release:        3%{?dist}
+Version:        1.12
+Release:        1%{?dist}
 Summary:        Self Contained RDBMS in a DBI Driver
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/DBD-SQLite/
 Source0:        http://www.cpan.org/authors/id/M/MS/MSERGEANT/DBD-SQLite-%{version}.tar.gz
+Patch0:         DBD-SQLite-1.11-type-information-segv.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl-DBI >= 1.03
@@ -30,10 +31,11 @@
 
 %prep
 %setup -q -n DBD-SQLite-%{version}
+%patch0 -p1
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor USE_LOCAL_SQLITE=1
+CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
 
 
@@ -63,6 +65,13 @@
 
 
 %changelog
+* Tue Apr 11 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.12-1
+- Update to 1.12.
+
+* Wed Apr  5 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.11-4
+- Patch to build with system sqlite 3.3.x (#183530).
+- Patch to avoid type information segv (#187873).
+
 * Thu Mar  9 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.11-3
 - DBD::SQLite fails to build with the current FC-5 sqlite version (3.3.3);
   see bugzilla entry #183530.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-SQLite/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Dec 2005 20:59:23 -0000	1.4
+++ sources	12 Apr 2006 14:55:21 -0000	1.5
@@ -1 +1 @@
-7f22d8789245047343e114e655571022  DBD-SQLite-1.11.tar.gz
+40b1d208d70d5d8cab7723df96fc239c  DBD-SQLite-1.12.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 12 15:30:04 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Wed, 12 Apr 2006 08:30:04 -0700
Subject: kadischi/post_install_scripts 04userconfig.py,1.1,1.2
Message-ID: <200604121530.k3CFU4uw015293@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi/post_install_scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15274/kadischi/post_install_scripts

Modified Files:
	04userconfig.py 
Log Message:
Check target rather than host for utils


Index: 04userconfig.py
===================================================================
RCS file: /cvs/devel/kadischi/post_install_scripts/04userconfig.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 04userconfig.py	10 Apr 2006 22:53:32 -0000	1.1
+++ 04userconfig.py	12 Apr 2006 15:30:02 -0000	1.2
@@ -17,8 +17,7 @@
 
 config_done = False
 
-if os.path.isfile("/usr/sbin/authconfig"):
-    run("chroot %s %s" % (sysdir, "/usr/sbin/authconfig --kickstart --nostart --enableshadow --enablemd5 --disablecache --disablenis --disableldap --disableldapauth --disableldaptls --disablekrb5 --disablehesiod --disablesmbauth"))
+run("chroot %s %s" % (sysdir, "/usr/sbin/authconfig --kickstart --nostart --enableshadow --enablemd5 --disablecache --disablenis --disableldap --disableldapauth --disableldaptls --disablekrb5 --disablehesiod --disablesmbauth"))
 
 while config_done == False:
     if anaconda_args != None:
@@ -28,13 +27,13 @@
                 config_done = True
                 sys.exit(0)
             else:
-                if os.path.isfile("/usr/sbin/lokkit") and os.path.isfile("/usr/sbin/ntsysv"):
+                if os.path.isfile(os.path.join(sysdir, "/usr/sbin/lokkit")) and os.path.isfile(os.path.join(sysdir, "/usr/sbin/ntsysv")):
                     flc_log("Taking you to interactive user configuration..")
                     run("chroot %s %s" % (sysdir, "/usr/sbin/lokkit"))
                     run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv"))
                     config_done = True   
     else:
-        if os.path.isfile("/usr/sbin/lokkit") and os.path.isfile("/usr/sbin/ntsysv"):
+        if os.path.isfile(os.path.join(sysdir, "/usr/sbin/lokkit")) and os.path.isfile(os.path.join(sysdir, "/usr/sbin/ntsysv")):
             flc_log("Taking you to interactive user configuration..")
             run("chroot %s %s" % (sysdir, "/usr/sbin/lokkit"))
             run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv"))



From fedora-extras-commits at redhat.com  Wed Apr 12 15:49:31 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Wed, 12 Apr 2006 08:49:31 -0700
Subject: rpms/seamonkey/FC-4 seamonkey-configure.patch, 1.1,
	1.2 seamonkey-mozconfig, 1.1, 1.2 seamonkey.spec, 1.2, 1.3
Message-ID: <200604121549.k3CFnXWN015357@cvs-int.fedora.redhat.com>

Author: kengert

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

Modified Files:
	seamonkey-configure.patch seamonkey-mozconfig seamonkey.spec 
Log Message:
* Wed Apr 12 2006 Kai Engert <kengert at redhat.com> 1.0-11.fc4.1
- Fix spec and patches to work with FC-4


seamonkey-configure.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 seamonkey-configure.patch
Index: seamonkey-configure.patch
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/FC-4/seamonkey-configure.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- seamonkey-configure.patch	10 Apr 2006 21:58:25 -0000	1.1
+++ seamonkey-configure.patch	12 Apr 2006 15:49:31 -0000	1.2
@@ -1,33 +1,6 @@
---- mozilla/configure.ac213	2006-02-10 09:14:59.000000000 +0100
-+++ mozilla/configure	2006-02-10 09:15:01.000000000 +0100
-@@ -941,7 +941,7 @@
- fi
- 
- echo $ac_n "checking host system type""... $ac_c" 1>&6
--echo "configure:938: checking host system type" >&5
-+echo "configure:945: checking host system type" >&5
- 
- host_alias=$host
- case "$host_alias" in
-@@ -962,7 +962,7 @@
- echo "$ac_t""$host" 1>&6
- 
- echo $ac_n "checking target system type""... $ac_c" 1>&6
--echo "configure:959: checking target system type" >&5
-+echo "configure:966: checking target system type" >&5
- 
- target_alias=$target
- case "$target_alias" in
-@@ -980,7 +980,7 @@
- echo "$ac_t""$target" 1>&6
- 
- echo $ac_n "checking build system type""... $ac_c" 1>&6
--echo "configure:977: checking build system type" >&5
-+echo "configure:984: checking build system type" >&5
- 
- build_alias=$build
- case "$build_alias" in
-@@ -1050,12 +1050,12 @@
+--- mozilla/configure.pre1	2006-04-12 13:11:17.000000000 +0200
++++ mozilla/configure	2006-04-12 13:11:22.000000000 +0200
+@@ -1042,7 +1042,7 @@
  LIBGNOME_VERSION=2.0
  
  MISSING_X=
@@ -36,280 +9,7 @@
  do
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1051: checking for $ac_word" >&5
-+echo "configure:1059: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1153,7 +1153,7 @@
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1149: checking for $ac_word" >&5
-+echo "configure:1157: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_NSINSTALL_BIN'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1226,13 +1226,13 @@
-     _SAVE_LDFLAGS="$LDFLAGS"
- 
-     echo $ac_n "checking for host c compiler""... $ac_c" 1>&6
--echo "configure:1222: checking for host c compiler" >&5
-+echo "configure:1230: checking for host c compiler" >&5
-     for ac_prog in $HOST_CC gcc cc /usr/ucb/cc cl icc
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1228: checking for $ac_word" >&5
-+echo "configure:1236: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_HOST_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1267,13 +1267,13 @@
-     fi
-     echo "$ac_t""$HOST_CC" 1>&6
-     echo $ac_n "checking for host c++ compiler""... $ac_c" 1>&6
--echo "configure:1263: checking for host c++ compiler" >&5
-+echo "configure:1271: checking for host c++ compiler" >&5
-     for ac_prog in $HOST_CXX $CCC c++ g++ gcc CC cxx cc++ cl icc
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1269: checking for $ac_word" >&5
-+echo "configure:1277: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_HOST_CXX'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1322,7 +1322,7 @@
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1318: checking for $ac_word" >&5
-+echo "configure:1326: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_HOST_RANLIB'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1357,7 +1357,7 @@
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1353: checking for $ac_word" >&5
-+echo "configure:1361: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_HOST_AR'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1392,16 +1392,16 @@
-     LDFLAGS="$HOST_LDFLAGS"
- 
-     echo $ac_n "checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:1388: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5
-+echo "configure:1396: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5
-     cat > conftest.$ac_ext <<EOF
--#line 1390 "configure"
-+#line 1398 "configure"
- #include "confdefs.h"
- 
- int main() {
- return(0);
- ; return 0; }
- EOF
--if { (eval echo configure:1397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_prog_hostcc_works=1 echo "$ac_t""yes" 1>&6
- else
-@@ -1416,16 +1416,16 @@
-     CFLAGS="$HOST_CXXFLAGS"
- 
-     echo $ac_n "checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:1412: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5
-+echo "configure:1420: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5
-     cat > conftest.$ac_ext <<EOF
--#line 1414 "configure"
-+#line 1422 "configure"
- #include "confdefs.h"
- 
- int main() {
- return(0);
- ; return 0; }
- EOF
--if { (eval echo configure:1421: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1429: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_prog_hostcxx_works=1 echo "$ac_t""yes" 1>&6
- else
-@@ -1445,7 +1445,7 @@
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1441: checking for $ac_word" >&5
-+echo "configure:1449: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1479,7 +1479,7 @@
-     # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1475: checking for $ac_word" >&5
-+echo "configure:1483: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1509,7 +1509,7 @@
-   # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1505: checking for $ac_word" >&5
-+echo "configure:1513: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1560,7 +1560,7 @@
-       # Extract the first word of "cl", so it can be a program name with args.
- set dummy cl; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1556: checking for $ac_word" >&5
-+echo "configure:1564: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1592,7 +1592,7 @@
- fi
- 
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:1588: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+echo "configure:1596: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
- 
- ac_ext=c
- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -1603,12 +1603,12 @@
[...6212 lines suppressed...]
  for ac_func in _getb67 GETB67 getb67; do
    echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 -echo "configure:18116: checking for $ac_func" >&5
-+echo "configure:18430: checking for $ac_func" >&5
++echo "configure:18305: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 18121 "configure"
-+#line 18435 "configure"
++#line 18310 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -18265,7 +18454,7 @@
+@@ -18140,7 +18329,7 @@
  
  ; return 0; }
  EOF
 -if { (eval echo configure:18144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:18458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -18292,7 +18481,7 @@
+@@ -18167,7 +18356,7 @@
  fi
  
  echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
 -echo "configure:18171: checking stack direction for C alloca" >&5
-+echo "configure:18485: checking stack direction for C alloca" >&5
++echo "configure:18360: checking stack direction for C alloca" >&5
  if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -18300,7 +18489,7 @@
+@@ -18175,7 +18364,7 @@
    ac_cv_c_stack_direction=0
  else
    cat > conftest.$ac_ext <<EOF
 -#line 18179 "configure"
-+#line 18493 "configure"
++#line 18368 "configure"
  #include "confdefs.h"
  find_stack_direction ()
  {
-@@ -18319,7 +18508,7 @@
+@@ -18194,7 +18383,7 @@
    exit (find_stack_direction() < 0);
  }
  EOF
 -if { (eval echo configure:18198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:18512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:18387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_c_stack_direction=1
  else
-@@ -18368,17 +18557,17 @@
+@@ -18243,17 +18432,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 -echo "configure:18247: checking for $ac_hdr" >&5
-+echo "configure:18561: checking for $ac_hdr" >&5
++echo "configure:18436: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 18252 "configure"
-+#line 18566 "configure"
++#line 18441 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:18257: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:18571: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:18446: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -18458,7 +18647,7 @@
+@@ -18333,7 +18522,7 @@
      # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:18337: checking for $ac_word" >&5
-+echo "configure:18651: checking for $ac_word" >&5
++echo "configure:18526: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -18502,19 +18691,19 @@
+@@ -18377,19 +18566,19 @@
       PKG_CONFIG_MIN_VERSION=0.9.0
       if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
          echo $ac_n "checking for cairo >= $CAIRO_VERSION""... $ac_c" 1>&6
 -echo "configure:18381: checking for cairo >= $CAIRO_VERSION" >&5
-+echo "configure:18695: checking for cairo >= $CAIRO_VERSION" >&5
++echo "configure:18570: checking for cairo >= $CAIRO_VERSION" >&5
  
          if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION" ; then
              echo "$ac_t""yes" 1>&6
@@ -5615,31 +5297,31 @@
  
              echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6
 -echo "configure:18388: checking CAIRO_CFLAGS" >&5
-+echo "configure:18702: checking CAIRO_CFLAGS" >&5
++echo "configure:18577: checking CAIRO_CFLAGS" >&5
              CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION"`
              echo "$ac_t""$CAIRO_CFLAGS" 1>&6
  
              echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6
 -echo "configure:18393: checking CAIRO_LIBS" >&5
-+echo "configure:18707: checking CAIRO_LIBS" >&5
++echo "configure:18582: checking CAIRO_LIBS" >&5
              ## don't use --libs since that can do evil things like add
              ## -Wl,--export-dynamic
              CAIRO_LIBS="`$PKG_CONFIG --libs-only-L \"cairo >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo >= $CAIRO_VERSION\"`"
-@@ -18579,7 +18768,7 @@
+@@ -18454,7 +18643,7 @@
          # Extract the first word of "python", so it can be a program name with args.
  set dummy python; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:18458: checking for $ac_word" >&5
-+echo "configure:18772: checking for $ac_word" >&5
++echo "configure:18647: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -18840,14 +19029,14 @@
+@@ -18715,14 +18904,14 @@
  cross_compiling=$ac_cv_prog_cc_cross
  
      cat > conftest.$ac_ext <<EOF
 -#line 18719 "configure"
-+#line 19033 "configure"
++#line 18908 "configure"
  #include "confdefs.h"
  #include <gmodule.h>
  int main() {
@@ -5647,40 +5329,29 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:18726: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:19040: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:18915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    :
  else
    echo "configure: failed program was:" >&5
-@@ -19113,6 +19302,10 @@
- 
- 
- 
-+
-+
-+
-+
- cat >> confdefs.h <<EOF
- #define MOZ_DLL_SUFFIX "$DLL_SUFFIX"
- EOF
-@@ -19140,7 +19333,7 @@
+@@ -19015,7 +19204,7 @@
                  _SAVE_CFLAGS=$CFLAGS
      CFLAGS="$CFLAGS $XCFLAGS"
      cat > conftest.$ac_ext <<EOF
 -#line 19019 "configure"
-+#line 19337 "configure"
++#line 19208 "configure"
  #include "confdefs.h"
  
          #include <stdio.h>
-@@ -19156,7 +19349,7 @@
+@@ -19031,7 +19220,7 @@
      
  ; return 0; }
  EOF
 -if { (eval echo configure:19035: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:19353: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:19224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    :
  else
    echo "configure: failed program was:" >&5
-@@ -19373,15 +19566,34 @@
+@@ -19248,15 +19437,34 @@
  # Transform confdefs.h into DEFS.
  # Protect against shell expansion while executing Makefile rules.
  # Protect against Makefile macro expansion.
@@ -5724,7 +5395,7 @@
  
  MOZ_DEFINES=$DEFS
  
-@@ -19663,12 +19875,13 @@
+@@ -19535,12 +19743,13 @@
  s%@MOZ_ENABLE_FREETYPE2@%$MOZ_ENABLE_FREETYPE2%g
  s%@MOZ_XFT_CFLAGS@%$MOZ_XFT_CFLAGS%g
  s%@MOZ_XFT_LIBS@%$MOZ_XFT_LIBS%g


Index: seamonkey-mozconfig
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/FC-4/seamonkey-mozconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- seamonkey-mozconfig	10 Apr 2006 21:58:25 -0000	1.1
+++ seamonkey-mozconfig	12 Apr 2006 15:49:31 -0000	1.2
@@ -1,5 +1,3 @@
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-zlib
 ac_add_options --with-system-png


Index: seamonkey.spec
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/FC-4/seamonkey.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- seamonkey.spec	11 Apr 2006 14:57:49 -0000	1.2
+++ seamonkey.spec	12 Apr 2006 15:49:31 -0000	1.3
@@ -1,6 +1,4 @@
 %define desktop_file_utils_version 0.9
-%define nspr_version 4.6
-%define nss_version 3.11
 %define pango_version 1.6.0
 
 %define _unpackaged_files_terminate_build 0
@@ -10,7 +8,7 @@
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
 Version:        1.0
-Release:        11%{?dist}
+Release:        11.fc4.1
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPL
 Group:          Applications/Internet
@@ -23,15 +21,11 @@
 Source10:       seamonkey-mozconfig
 Source12:       seamonkey-mail.desktop
 Source13:       seamonkey-mail-icon.png
-Source17:       mozilla-psm-exclude-list
-Source18:       mozilla-xpcom-exclude-list
 Source19:       seamonkey-fedora-default-bookmarks.html
 Source20:       seamonkey-fedora-default-prefs.js
 Source100:      find-external-requires
 
 Patch1:         firefox-1.0-prdtoa.patch
-Patch3:         firefox-1.1-nss-system-nspr.patch
-Patch4:         firefox-1.5-with-system-nss.patch
 Patch5:         seamonkey-disable-visibility.patch
 Patch6:         firefox-1.5.0.1-dumpstack.patch
 Patch21:        firefox-0.7.3-default-plugin-less-annoying.patch
@@ -42,7 +36,6 @@
 Patch101:       thunderbird-0.7.3-gnome-uriloader.patch
 Patch102:       thunderbird-1.5-bug304720.patch
 Patch220:       seamonkey-fedora-home-page.patch
-Patch225:       mozilla-nspr-packages.patch
 Patch227:       mozilla-1.4.1-ppc64.patch
 Patch301:       mozilla-1.7.3-gnome-vfs-default-app.patch
 Patch304:       mozilla-1.7.5-g-application-name.patch
@@ -57,10 +50,8 @@
 BuildRequires:  libIDL-devel
 BuildRequires:  glib2-devel
 BuildRequires:  gtk2-devel
-BuildRequires:  libXt-devel
+BuildRequires:  xorg-x11-devel
 BuildRequires:  pango-devel >= %{pango_version}
-BuildRequires:  nspr-devel >= %{nspr_version}
-BuildRequires:  nss-devel >= %{nss_version}
 BuildRequires:  fileutils
 BuildRequires:  desktop-file-utils >= %{desktop_file_utils_version}
 PreReq:         desktop-file-utils >= %{desktop_file_utils_version}
@@ -81,8 +72,6 @@
 
 %setup -q -n mozilla
 %patch1  -p0
-%patch3  -p1
-%patch4  -p1
 
 # Pragma visibility is broken on most platforms for some reason.
 # It works on i386 so leave it alone there.  Disable elsewhere.
@@ -100,7 +89,6 @@
 %patch101 -p1 -b .gnome-uriloader
 %patch102 -p1
 %patch220 -p1
-%patch225 -p1
 %patch227 -p1
 %patch301 -p1
 %patch304 -p0
@@ -175,8 +163,7 @@
 %{SOURCE7} --package xpcom --output-file %{builddir}/seamonkey.list \
     --package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
     --install-dir $RPM_BUILD_ROOT/%{mozdir} \
-    --install-root %{mozdir} \
-    --exclude-file=%{SOURCE18}
+    --install-root %{mozdir}
 
 %{SOURCE7} --package browser --output-file %{builddir}/seamonkey.list \
     --package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
@@ -191,8 +178,7 @@
 %{SOURCE7} --package psm --output-file %{builddir}/seamonkey.list \
     --package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
     --install-dir $RPM_BUILD_ROOT/%{mozdir} \
-    --install-root %{mozdir} \
-    --exclude-file=%{SOURCE17}
+    --install-root %{mozdir}
 
 %{SOURCE7} --package mail --output-file %{builddir}/seamonkey.list \
     --package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
@@ -408,6 +394,8 @@
 
 
 %changelog
+* Wed Apr 12 2006 Kai Engert <kengert at redhat.com> 1.0-11.fc4.1
+- Fix spec and patches to work with FC-4
 * Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-11
 - Fix PreReq statements
 * Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-10



From fedora-extras-commits at redhat.com  Wed Apr 12 17:42:16 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 12 Apr 2006 10:42:16 -0700
Subject: rpms/cernlib/devel patchy-unpack-rceta, NONE, 1.1 cernlib.spec, 1.23,
	1.24 sources, 1.4, 1.5
Message-ID: <200604121742.k3CHgI0o019994@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	cernlib.spec sources 
Added Files:
	patchy-unpack-rceta 
Log Message:
* Wed Apr 12 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-16
- unpack patchy offline because the files are within an unformatted
  fortran file which won't be right on all the arches.



--- NEW FILE patchy-unpack-rceta ---
#! /bin/bash

set -e
cd .

file=patchy
script=rceta.sh
archive=$file.tar.gz
echo "Unpacking from $archive"
tar xzf $archive
echo "patching script"
sed -i -e 's/fort77/f77/' -e 's:^ rceta : ./rceta :' $file/$script
pushd $file
./$script
popd
echo "Repacking $archive"
tar czf $archive $file

exit 0



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- cernlib.spec	12 Apr 2006 06:53:13 -0000	1.23
+++ cernlib.spec	12 Apr 2006 17:42:16 -0000	1.24
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       15%{?dist}.1
+Release:       16%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -32,12 +32,12 @@
 # build the cernlib
 BuildRequires: /usr/bin/g77
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if "%fedora" > "3"
+#%if "%fedora" > "3"
 # f771 segfaults on x86_64
 #ExcludeArch:   x86_64
-%endif
+#%endif
 # rceta segfaults on ppc
-ExcludeArch:   ppc
+#ExcludeArch:   ppc
 
 # these sources are different from the upstream sources as files with 
 # GPL incompatible licences are removed. You can use cernlib-remove-deadpool
@@ -61,7 +61,15 @@
 Source9: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_patchy.tar.gz
 Source14: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_cfortran.tar.gz
 Source16: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/lib/xsneut95.dat
-# patchy 4 source files, provided by Mattias Ellert
+# The patchy version 4 sources
+Source300: patchy.tar.gz
+# this is modified with regard with what Mattias gave me. Indeed the file
+# containing some other files (p4inceta) was in fortran unformatted format, 
+# I believe it is what caused a segfault of rceta on the ppc platform.
+# I have recreated the patchy.tar.gz from Mattias tarball by running
+# sh patchy-unpack-rceta
+Source203: patchy-unpack-rceta 
+
 Source17: patchy.tar.gz
 
 # Shell scripts that go in /etc/profile.d
@@ -339,13 +347,16 @@
 %setup -T -D -a 17
 
 # patch patchy 4 installer fortran generator script
+# avtually it is unusefull, because the unpacking has been done
+# offline, see comment above.
 %patch -P 1500
 %patch -P 1501
 
-# unpack the patchy version 4 sources
-pushd patchy
-        ./rceta.sh
-popd
+# unpack the patchy version 4 sources is done offline,
+# see comment above
+#pushd patchy
+#        ./rceta.sh
+#popd
 
 %patch -P 1502
 %patch -P 1503
@@ -816,6 +827,10 @@
 
 
 %changelog
+* Wed Apr 12 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-16
+- unpack patchy offline because the files are within an unformatted
+  fortran file which won't be right on all the arches.
+
 * Tue Apr 11 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-15.1
 - add conditionals in spec to have only one for all fedora versions.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Apr 2006 22:53:00 -0000	1.4
+++ sources	12 Apr 2006 17:42:16 -0000	1.5
@@ -13,4 +13,4 @@
 67228b011eac13b44499c50219e21545  src_graflib.tar.gz
 4fdcdc9f819ebbb9c6d3a04f339cdcf8  src_packlib.tar.gz
 eecb52159458ead0ee6b0d00b90aab66  xsneut95.dat
-14e6f0dbc205ec4f106093ee27578273  patchy.tar.gz
+b1f550eedc545a02f0ab58eb7d550480  patchy.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 12 17:44:10 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 12 Apr 2006 10:44:10 -0700
Subject: rpms/openvpn/devel .cvsignore, 1.10, 1.11 openvpn.spec, 1.16,
	1.17 sources, 1.10, 1.11
Message-ID: <200604121744.k3CHiCXk020074@cvs-int.fedora.redhat.com>

Author: steve

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

Modified Files:
	.cvsignore openvpn.spec sources 
Log Message:
Update to 2.1_beta13.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openvpn/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	5 Apr 2006 20:22:55 -0000	1.10
+++ .cvsignore	12 Apr 2006 17:44:10 -0000	1.11
@@ -1,2 +1,2 @@
-openvpn-2.1_beta12.tar.gz
-openvpn-2.1_beta12.tar.gz.asc
+openvpn-2.1_beta13.tar.gz
+openvpn-2.1_beta13.tar.gz.asc


Index: openvpn.spec
===================================================================
RCS file: /cvs/extras/rpms/openvpn/devel/openvpn.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- openvpn.spec	5 Apr 2006 20:22:55 -0000	1.16
+++ openvpn.spec	12 Apr 2006 17:44:10 -0000	1.17
@@ -1,10 +1,10 @@
-%define prerelease beta12
+%define prerelease beta13
 
 %define plugins down-root auth-pam
 
 Name:              openvpn
 Version:           2.1
-Release:           0.8%{?prerelease:.%{prerelease}}%{?dist}
+Release:           0.9%{?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
@@ -132,6 +132,9 @@
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Wed Apr 12 2006 Steven Pritchard <steve at kspei.com> 2.1-0.9.beta13
+- Update to 2.1_beta13
+
 * Wed Apr 05 2006 Steven Pritchard <steve at kspei.com> 2.1-0.8.beta12
 - Update to 2.1_beta12 (BZ#188050/CVE-2006-1629)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openvpn/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	5 Apr 2006 20:22:55 -0000	1.10
+++ sources	12 Apr 2006 17:44:10 -0000	1.11
@@ -1,2 +1,2 @@
-16c92fd8bdc13d29e99006589ab87dc8  openvpn-2.1_beta12.tar.gz
-6568f5e32367cc9c88a0eae78bfb2e1f  openvpn-2.1_beta12.tar.gz.asc
+94281c836f443aa10ef56eafb9346e98  openvpn-2.1_beta13.tar.gz
+e5bc47f1e441b2d89db90052ad0f8b12  openvpn-2.1_beta13.tar.gz.asc



From fedora-extras-commits at redhat.com  Wed Apr 12 17:44:33 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 12 Apr 2006 10:44:33 -0700
Subject: rpms/openvpn/FC-4 .cvsignore, 1.7, 1.8 openvpn.spec, 1.12,
	1.13 sources, 1.7, 1.8
Message-ID: <200604121744.k3CHiZNe020139@cvs-int.fedora.redhat.com>

Author: steve

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

Modified Files:
	.cvsignore openvpn.spec sources 
Log Message:
Update to 2.0.7.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openvpn/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	5 Apr 2006 23:08:10 -0000	1.7
+++ .cvsignore	12 Apr 2006 17:44:33 -0000	1.8
@@ -1,2 +1,2 @@
-openvpn-2.0.6.tar.gz
-openvpn-2.0.6.tar.gz.asc
+openvpn-2.0.7.tar.gz
+openvpn-2.0.7.tar.gz.asc


Index: openvpn.spec
===================================================================
RCS file: /cvs/extras/rpms/openvpn/FC-4/openvpn.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- openvpn.spec	5 Apr 2006 23:08:10 -0000	1.12
+++ openvpn.spec	12 Apr 2006 17:44:33 -0000	1.13
@@ -1,7 +1,7 @@
 %define plugins down-root auth-pam
 
 Name:              openvpn
-Version:           2.0.6
+Version:           2.0.7
 Release:           1%{?dist}
 Summary:           A full-featured SSL VPN solution
 URL:               http://openvpn.net/
@@ -129,6 +129,9 @@
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Wed Apr 12 2006 Steven Pritchard <steve at kspei.com> 2.0.7-1
+- Update to 2.0.7
+
 * Wed Apr 05 2006 Steven Pritchard <steve at kspei.com> 2.0.6-1
 - Update to 2.0.6 (BZ#188050/CVE-2006-1629)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openvpn/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	5 Apr 2006 23:08:10 -0000	1.7
+++ sources	12 Apr 2006 17:44:33 -0000	1.8
@@ -1,2 +1,2 @@
-8d2f95fa825e58363a676b25d4815aa7  openvpn-2.0.6.tar.gz
-1265ff8d96d50f3d3233d37658e3e516  openvpn-2.0.6.tar.gz.asc
+93528233f1f6d02fc18e2c00f82e0aca  openvpn-2.0.7.tar.gz
+f1715e85764289b5fa5f784857dcbc31  openvpn-2.0.7.tar.gz.asc



From fedora-extras-commits at redhat.com  Wed Apr 12 17:51:44 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Wed, 12 Apr 2006 10:51:44 -0700
Subject: kadischi/post_install_scripts 04userconfig.py,1.2,1.3
Message-ID: <200604121751.k3CHpiLl020220@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi/post_install_scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20203/kadischi/post_install_scripts

Modified Files:
	04userconfig.py 
Log Message:
Relly check target this time, not the host for utils


Index: 04userconfig.py
===================================================================
RCS file: /cvs/devel/kadischi/post_install_scripts/04userconfig.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 04userconfig.py	12 Apr 2006 15:30:02 -0000	1.2
+++ 04userconfig.py	12 Apr 2006 17:51:42 -0000	1.3
@@ -27,13 +27,13 @@
                 config_done = True
                 sys.exit(0)
             else:
-                if os.path.isfile(os.path.join(sysdir, "/usr/sbin/lokkit")) and os.path.isfile(os.path.join(sysdir, "/usr/sbin/ntsysv")):
+                if os.path.isfile(os.path.join(sysdir, "usr/sbin/lokkit")) and os.path.isfile(os.path.join(sysdir, "usr/sbin/ntsysv")):
                     flc_log("Taking you to interactive user configuration..")
                     run("chroot %s %s" % (sysdir, "/usr/sbin/lokkit"))
                     run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv"))
                     config_done = True   
     else:
-        if os.path.isfile(os.path.join(sysdir, "/usr/sbin/lokkit")) and os.path.isfile(os.path.join(sysdir, "/usr/sbin/ntsysv")):
+        if os.path.isfile(os.path.join(sysdir, "usr/sbin/lokkit")) and os.path.isfile(os.path.join(sysdir, "usr/sbin/ntsysv")):
             flc_log("Taking you to interactive user configuration..")
             run("chroot %s %s" % (sysdir, "/usr/sbin/lokkit"))
             run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv"))



From fedora-extras-commits at redhat.com  Wed Apr 12 18:09:24 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 12 Apr 2006 11:09:24 -0700
Subject: rpms/openvpn/FC-5 .cvsignore, 1.10, 1.11 openvpn.spec, 1.16,
	1.17 sources, 1.10, 1.11
Message-ID: <200604121809.k3CI9QuH022329@cvs-int.fedora.redhat.com>

Author: steve

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

Modified Files:
	.cvsignore openvpn.spec sources 
Log Message:
Update to 2.1_beta13.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openvpn/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	5 Apr 2006 20:30:05 -0000	1.10
+++ .cvsignore	12 Apr 2006 18:09:23 -0000	1.11
@@ -1,2 +1,2 @@
-openvpn-2.1_beta12.tar.gz
-openvpn-2.1_beta12.tar.gz.asc
+openvpn-2.1_beta13.tar.gz
+openvpn-2.1_beta13.tar.gz.asc


Index: openvpn.spec
===================================================================
RCS file: /cvs/extras/rpms/openvpn/FC-5/openvpn.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- openvpn.spec	5 Apr 2006 20:30:05 -0000	1.16
+++ openvpn.spec	12 Apr 2006 18:09:23 -0000	1.17
@@ -1,10 +1,10 @@
-%define prerelease beta12
+%define prerelease beta13
 
 %define plugins down-root auth-pam
 
 Name:              openvpn
 Version:           2.1
-Release:           0.8%{?prerelease:.%{prerelease}}%{?dist}
+Release:           0.9%{?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
@@ -132,6 +132,9 @@
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Wed Apr 12 2006 Steven Pritchard <steve at kspei.com> 2.1-0.9.beta13
+- Update to 2.1_beta13
+
 * Wed Apr 05 2006 Steven Pritchard <steve at kspei.com> 2.1-0.8.beta12
 - Update to 2.1_beta12 (BZ#188050/CVE-2006-1629)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openvpn/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	5 Apr 2006 20:30:05 -0000	1.10
+++ sources	12 Apr 2006 18:09:23 -0000	1.11
@@ -1,2 +1,2 @@
-16c92fd8bdc13d29e99006589ab87dc8  openvpn-2.1_beta12.tar.gz
-6568f5e32367cc9c88a0eae78bfb2e1f  openvpn-2.1_beta12.tar.gz.asc
+94281c836f443aa10ef56eafb9346e98  openvpn-2.1_beta13.tar.gz
+e5bc47f1e441b2d89db90052ad0f8b12  openvpn-2.1_beta13.tar.gz.asc



From fedora-extras-commits at redhat.com  Wed Apr 12 18:17:15 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 12 Apr 2006 11:17:15 -0700
Subject: rpms/openvpn/FC-3 .cvsignore, 1.7, 1.8 openvpn.spec, 1.11,
	1.12 sources, 1.7, 1.8
Message-ID: <200604121817.k3CIHHAX022419@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/openvpn/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22398

Modified Files:
	.cvsignore openvpn.spec sources 
Log Message:
Update to 2.0.7.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openvpn/FC-3/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	5 Apr 2006 23:36:50 -0000	1.7
+++ .cvsignore	12 Apr 2006 18:17:15 -0000	1.8
@@ -1,2 +1,2 @@
-openvpn-2.0.6.tar.gz
-openvpn-2.0.6.tar.gz.asc
+openvpn-2.0.7.tar.gz
+openvpn-2.0.7.tar.gz.asc


Index: openvpn.spec
===================================================================
RCS file: /cvs/extras/rpms/openvpn/FC-3/openvpn.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- openvpn.spec	5 Apr 2006 23:36:50 -0000	1.11
+++ openvpn.spec	12 Apr 2006 18:17:15 -0000	1.12
@@ -1,7 +1,7 @@
 %define plugins down-root auth-pam
 
 Name:              openvpn
-Version:           2.0.6
+Version:           2.0.7
 Release:           1%{?dist}
 Summary:           A full-featured SSL VPN solution
 URL:               http://openvpn.net/
@@ -129,6 +129,9 @@
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Wed Apr 12 2006 Steven Pritchard <steve at kspei.com> 2.0.7-1
+- Update to 2.0.7
+
 * Wed Apr 05 2006 Steven Pritchard <steve at kspei.com> 2.0.6-1
 - Update to 2.0.6 (BZ#188050/CVE-2006-1629)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openvpn/FC-3/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	5 Apr 2006 23:36:50 -0000	1.7
+++ sources	12 Apr 2006 18:17:15 -0000	1.8
@@ -1,2 +1,2 @@
-8d2f95fa825e58363a676b25d4815aa7  openvpn-2.0.6.tar.gz
-1265ff8d96d50f3d3233d37658e3e516  openvpn-2.0.6.tar.gz.asc
+93528233f1f6d02fc18e2c00f82e0aca  openvpn-2.0.7.tar.gz
+f1715e85764289b5fa5f784857dcbc31  openvpn-2.0.7.tar.gz.asc



From fedora-extras-commits at redhat.com  Wed Apr 12 19:12:29 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Wed, 12 Apr 2006 12:12:29 -0700
Subject: rpms/link-grammar/devel .cvsignore, 1.4, 1.5 link-grammar.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <200604121912.k3CJCVS0024628@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/link-grammar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24607

Modified Files:
	.cvsignore link-grammar.spec sources 
Log Message:
New upstream version




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Apr 2006 17:46:26 -0000	1.4
+++ .cvsignore	12 Apr 2006 19:12:29 -0000	1.5
@@ -1 +1 @@
-link-grammar-4.2.1.tar.gz
+link-grammar-4.2.2.tar.gz


Index: link-grammar.spec
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/devel/link-grammar.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- link-grammar.spec	10 Apr 2006 17:46:26 -0000	1.4
+++ link-grammar.spec	12 Apr 2006 19:12:29 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: A Grammar Checking library
 Name: link-grammar
-Version: 4.2.1
-Release: 2%{?dist}
+Version: 4.2.2
+Release: 1%{?dist}
 Group: System Environment/Libraries
 License: BSD-style 
 Source: http://www.abisource.com/downloads/link-grammar/%{version}/link-grammar-%{version}.tar.gz
@@ -55,6 +55,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Wed Apr 12 2006 Marc Maurer <uwog at abisource.com> 4.2.2-1
+- New upstream version
+
 * Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 4.2.1-2
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Apr 2006 17:46:26 -0000	1.4
+++ sources	12 Apr 2006 19:12:29 -0000	1.5
@@ -1 +1 @@
-c4de497b11a2eeaa93ac19f08c710f23  link-grammar-4.2.1.tar.gz
+798c165b7d7f26e60925c30515c45782  link-grammar-4.2.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 12 19:13:51 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Wed, 12 Apr 2006 12:13:51 -0700
Subject: rpms/link-grammar/FC-5 .cvsignore, 1.3, 1.4 link-grammar.spec, 1.3, 
	1.4 sources, 1.3, 1.4
Message-ID: <200604121913.k3CJDrFv024698@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/link-grammar/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24677

Modified Files:
	.cvsignore link-grammar.spec sources 
Log Message:
New upstream version




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Apr 2006 17:48:19 -0000	1.3
+++ .cvsignore	12 Apr 2006 19:13:51 -0000	1.4
@@ -1 +1 @@
-link-grammar-4.2.1.tar.gz
+link-grammar-4.2.2.tar.gz


Index: link-grammar.spec
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/FC-5/link-grammar.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- link-grammar.spec	10 Apr 2006 17:48:19 -0000	1.3
+++ link-grammar.spec	12 Apr 2006 19:13:51 -0000	1.4
@@ -1,6 +1,6 @@
 Summary: A Grammar Checking library
 Name: link-grammar
-Version: 4.2.1
+Version: 4.2.2
 Release: 1%{?dist}
 Group: System Environment/Libraries
 License: BSD-style 
@@ -55,6 +55,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Wed Apr 12 2006 Marc Maurer <uwog at abisource.com> 4.2.2-1.fc5
+- New upstream version
+
 * Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 4.2.1-1
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Apr 2006 17:48:19 -0000	1.3
+++ sources	12 Apr 2006 19:13:51 -0000	1.4
@@ -1 +1 @@
-c4de497b11a2eeaa93ac19f08c710f23  link-grammar-4.2.1.tar.gz
+798c165b7d7f26e60925c30515c45782  link-grammar-4.2.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 12 19:16:24 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Wed, 12 Apr 2006 12:16:24 -0700
Subject: rpms/link-grammar/FC-4 .cvsignore, 1.3, 1.4 link-grammar.spec, 1.6, 
	1.7 sources, 1.3, 1.4
Message-ID: <200604121916.k3CJGQxn024774@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/link-grammar/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24753

Modified Files:
	.cvsignore link-grammar.spec sources 
Log Message:
New upstream version




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Apr 2006 17:50:26 -0000	1.3
+++ .cvsignore	12 Apr 2006 19:16:24 -0000	1.4
@@ -1 +1 @@
-link-grammar-4.2.1.tar.gz
+link-grammar-4.2.2.tar.gz


Index: link-grammar.spec
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/FC-4/link-grammar.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- link-grammar.spec	10 Apr 2006 17:50:26 -0000	1.6
+++ link-grammar.spec	12 Apr 2006 19:16:24 -0000	1.7
@@ -1,6 +1,6 @@
 Summary: A Grammar Checking library
 Name: link-grammar
-Version: 4.2.1
+Version: 4.2.2
 Release: 1%{?dist}
 Group: System Environment/Libraries
 License: BSD-style 
@@ -55,6 +55,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Wed Apr 12 2006 Marc Maurer <uwog at abisource.com> 4.2.2-1.fc4
+- New upstream version
+
 * Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 4.2.1-1.fc4
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Apr 2006 17:50:26 -0000	1.3
+++ sources	12 Apr 2006 19:16:24 -0000	1.4
@@ -1 +1 @@
-c4de497b11a2eeaa93ac19f08c710f23  link-grammar-4.2.1.tar.gz
+798c165b7d7f26e60925c30515c45782  link-grammar-4.2.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 12 19:16:45 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Wed, 12 Apr 2006 12:16:45 -0700
Subject: rpms/awstats/devel awstats.README.SELinux, NONE, 1.1 awstats.spec, 
	1.11, 1.12
Message-ID: <200604121916.k3CJGlou024834@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	awstats.spec 
Added Files:
	awstats.README.SELinux 
Log Message:
add selinux support


--- NEW FILE awstats.README.SELinux ---
==========================
SELinux support in AWStats
==========================


What is the problem ?
---------------------

AWStats is a CGI script, and needs to be labelled correctly to be called
from Apache.
The files in ``/usr/share/awstats/wwwroot/cgi-bin`` need to have the 
``httpd_sys_script_exec_t`` type, and the databases files in 
``/var/lib/awstats`` need to have the ``httpd_sys_script_rw_t`` type.


How do we solve it ?
--------------------

You can change the type with the ``chcon`` command::

    chcon -R -t httpd_sys_script_exec_t /usr/share/awstats/wwwroot/cgi-bin
    chcon -R -t httpd_sys_script_rw_t /var/lib/awstats

But these modifications will be lost if the system is relabeled (you can
request a relabel with the system-config-security tool).

To make these changes permanent, this package sets the contexts by running
the following commands::

    semanage fcontext -a -t httpd_sys_script_exec_t \
        '/usr/share/awstats/wwwroot/cgi-bin(/.*)?'
    semanage fcontext -a -t httpd_sys_script_rw_t '/var/lib/awstats(/.*)?'


Please send your bug reports (if any ;) ) to https://bugzilla.redhat.com


Index: awstats.spec
===================================================================
RCS file: /cvs/extras/rpms/awstats/devel/awstats.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- awstats.spec	9 Apr 2006 15:30:31 -0000	1.11
+++ awstats.spec	12 Apr 2006 19:16:45 -0000	1.12
@@ -7,13 +7,13 @@
 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
+Source1:    awstats.README.SELinux
 BuildArch:  noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   httpd
 Requires:   perl
-Requires(post): perl
-Requires(postun): /sbin/service
-Requires(pre):  policycoreutils
+Requires(post): perl, policycoreutils
+Requires(postun): /sbin/service, policycoreutils
 
 %description
 Advanced Web Statistics is a powerful and featureful tool that generates
@@ -31,18 +31,19 @@
 With the default configuration, the statistics are available:
 http://localhost/awstats/awstats.pl
 
+
 %prep
 %setup -q
-
 # 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
+# SELinux README
+cp -a %{SOURCE1} README.SELinux
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -80,7 +81,7 @@
 ### Commit permanent changes to default configuration
 install -p -m 644 wwwroot/cgi-bin/awstats.model.conf \
     $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.model.conf
-%{__perl} -pi -e '
+perl -pi -e '
                 s|^LogFile=.*$|LogFile="%{_localstatedir}/log/httpd/access_log"|;
                 s|^DirData=.*$|DirData="%{_localstatedir}/lib/awstats"|;
                 s|^DirCgi=.*$|DirCgi="/awstats"|;
@@ -91,16 +92,17 @@
                 s|^SaveDatabaseFilesWithPermissionsForEveryone=.*$|SaveDatabaseFilesWithPermissionsForEveryone=0|;
                 s|^SkipHosts=.*$|SkipHosts="127.0.0.1"|;
                 s|^Expires=.*$|Expires=3600|;
-        ' $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.model.conf
+            ' $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.model.conf
 install -p -m 644 $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.{model,localhost.localdomain}.conf 
 
 # Fix scripts
-%{__perl} -pi -e 's|/usr/local/awstats|%{_datadir}/awstats|g' \
+perl -pi -e 's|/usr/local/awstats|%{_datadir}/awstats|g' \
              $RPM_BUILD_ROOT%{_datadir}/%{name}/tools/{*.pl,httpd_conf}
 
 # Apache configuration
 install -p -m 644 tools/httpd_conf $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/%{name}.conf
-%{__perl} -pi -e 's|/usr/local|%{_datadir}|g' $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/%{name}.conf
+perl -pi -e 's|/usr/local|%{_datadir}|g;s|Allow from all|Allow from 127.0.0.1|g' \
+             $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/%{name}.conf
 echo "# Additional Perl modules
 <IfModule mod_env.c>
     SetEnv PERL5LIB %{_datadir}/awstats/lib:%{_datadir}/awstats/plugins
@@ -114,13 +116,6 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%pre
-# Set SELinux types
-semanage fcontext -a -t httpd_sys_script_exec_t \
-    '/usr/share/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || :
-semanage fcontext -a -t httpd_sys_script_rw_t '/var/lib/awstats(/.*)?' 2>/dev/null || :
-
-
 %post
 if [ $1 -eq 1 ]; then
   if [ ! -f %{_sysconfdir}/%{name}/%{name}.`hostname`.conf ]; then
@@ -130,18 +125,28 @@
                       ' > %{_sysconfdir}/%{name}/%{name}.`hostname`.conf || :
   fi
 fi
+### SELinux support ###
+# Set SELinux file_context
+semanage fcontext -a -t httpd_sys_script_exec_t \
+    '%{_datadir}/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || :
+semanage fcontext -a -t httpd_sys_script_rw_t '%{_localstatedir}/lib/awstats(/.*)?' 2>/dev/null || :
+# Actually change the context
+chcon -R -t httpd_sys_script_exec_t %{_datadir}/awstats/wwwroot/cgi-bin
+chcon -R -t httpd_sys_script_rw_t %{_localstatedir}/lib/awstats
 
 
 %postun
 if [ $1 -ne 0 ]; then
   /sbin/service httpd condrestart >/dev/null 2>&1
 fi
+# SELinux support
 if [ $1 -eq 0 ]; then
   semanage fcontext -d -t httpd_sys_script_exec_t \
     '/usr/share/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || :
 fi
 
 
+
 %files
 %defattr(-,root,root,755)
 # Apache configuration file
@@ -155,7 +160,7 @@
 %{_datadir}/%{name}/wwwroot/cgi-bin
 # Different defattr to fix lots of files which should not be +x.
 %defattr(644,root,root,755)
-%doc README.TXT docs/*
+%doc README.TXT docs/* README.SELinux
 %{_datadir}/%{name}/lang
 %{_datadir}/%{name}/lib
 %{_datadir}/%{name}/plugins
@@ -164,9 +169,12 @@
 %{_datadir}/%{name}/wwwroot/icon
 %{_datadir}/%{name}/wwwroot/js
 
+
+
 %changelog
 * 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
+- Only allow access from localhost by default (this app has a security history)
 
 * Thu Feb 23 2006 Aurelien Bompard <gauret[AT]free.fr> 6.5-2
 - rebuild for FC5



From fedora-extras-commits at redhat.com  Wed Apr 12 19:17:24 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Wed, 12 Apr 2006 12:17:24 -0700
Subject: rpms/link-grammar/FC-3 .cvsignore, 1.3, 1.4 link-grammar.spec, 1.3, 
	1.4 sources, 1.3, 1.4
Message-ID: <200604121917.k3CJHQlT024869@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/link-grammar/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24848

Modified Files:
	.cvsignore link-grammar.spec sources 
Log Message:
New upstream version




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Apr 2006 17:58:09 -0000	1.3
+++ .cvsignore	12 Apr 2006 19:17:24 -0000	1.4
@@ -1 +1 @@
-link-grammar-4.2.1.tar.gz
+link-grammar-4.2.2.tar.gz


Index: link-grammar.spec
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/FC-3/link-grammar.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- link-grammar.spec	10 Apr 2006 17:58:09 -0000	1.3
+++ link-grammar.spec	12 Apr 2006 19:17:24 -0000	1.4
@@ -1,6 +1,6 @@
 Summary: A Grammar Checking library
 Name: link-grammar
-Version: 4.2.1
+Version: 4.2.2
 Release: 1%{?dist}
 Group: System Environment/Libraries
 License: BSD-style 
@@ -55,6 +55,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Wed Apr 12 2006 Marc Maurer <uwog at abisource.com> 4.2.2-1.fc3
+- New upstream version
+
 * Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 4.2.1-1.fc3
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Apr 2006 17:58:09 -0000	1.3
+++ sources	12 Apr 2006 19:17:24 -0000	1.4
@@ -1 +1 @@
-c4de497b11a2eeaa93ac19f08c710f23  link-grammar-4.2.1.tar.gz
+798c165b7d7f26e60925c30515c45782  link-grammar-4.2.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 12 19:26:47 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 12 Apr 2006 12:26:47 -0700
Subject: rpms/xosd/FC-5 xosd-defaults.patch,1.1,1.2 xosd.spec,1.11,1.12
Message-ID: <200604121926.k3CJQnpi025013@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	xosd-defaults.patch xosd.spec 
Log Message:
* Wed Apr 12 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.2.14-6
- Revert to upstream default font, require xorg-x11-fonts-base (#183971).


xosd-defaults.patch:

Index: xosd-defaults.patch
===================================================================
RCS file: /cvs/extras/rpms/xosd/FC-5/xosd-defaults.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xosd-defaults.patch	17 Mar 2005 21:57:09 -0000	1.1
+++ xosd-defaults.patch	12 Apr 2006 19:26:47 -0000	1.2
@@ -12,18 +12,6 @@
    shadow_offset = 1;
    outline_offset = 0;
    pos = XOSD_bottom;
-diff -Naru xosd-2.2.14.orig/src/libxosd/xosd.c xosd-2.2.14/src/libxosd/xosd.c
---- xosd-2.2.14.orig/src/libxosd/xosd.c	2004-11-17 21:27:11.000000000 +0200
-+++ xosd-2.2.14/src/libxosd/xosd.c	2005-03-17 23:43:48.000000000 +0200
-@@ -24,7 +24,7 @@
- #define XOFFSET 10
- 
- const char *osd_default_font =
--  "-misc-fixed-medium-r-semicondensed--*-*-*-*-c-*-*-*";
-+  "-*-luxi sans-*-r-*-*-17-*-*-*-*-*-*-*";
- #if 0
- "-adobe-helvetica-bold-r-*-*-10-*";
- #endif
 diff -Naru xosd-2.2.14.orig/src/xmms_plugin/xmms_osd.c xosd-2.2.14/src/xmms_plugin/xmms_osd.c
 --- xosd-2.2.14.orig/src/xmms_plugin/xmms_osd.c	2004-11-04 21:47:50.000000000 +0200
 +++ xosd-2.2.14/src/xmms_plugin/xmms_osd.c	2005-03-17 23:42:11.000000000 +0200


Index: xosd.spec
===================================================================
RCS file: /cvs/extras/rpms/xosd/FC-5/xosd.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xosd.spec	12 Mar 2006 11:46:18 -0000	1.11
+++ xosd.spec	12 Apr 2006 19:26:47 -0000	1.12
@@ -5,7 +5,7 @@
 
 Name:           xosd
 Version:        2.2.14
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        On-screen display library for X
 
 Group:          System Environment/Libraries
@@ -16,15 +16,11 @@
 Patch1:         %{name}-defaults.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Needed for main xosd:
 BuildRequires:  libX11-devel
 BuildRequires:  libXext-devel
 BuildRequires:  libXinerama-devel
-# ...and for the bmp and xmms plugins:
-BuildRequires:  gtk+-devel >= 1:1.2.2
-BuildRequires:  gdk-pixbuf-devel >= 1:0.22.0
-BuildRequires:  xmms-devel
-BuildRequires:  bmp-devel
+# As of 2.2.14, the default font *must* be found, even if not used (#183971)
+Requires:       xorg-x11-fonts-base
 
 %description
 XOSD displays text on your screen, sounds simple right? The difference
@@ -49,6 +45,9 @@
 %package     -n xmms-%{name}
 Summary:        XMMS plugin for on-screen display using the XOSD library
 Group:          Applications/Multimedia
+BuildRequires:  gtk+-devel >= 1:1.2.2
+BuildRequires:  gdk-pixbuf-devel >= 1:0.22.0
+BuildRequires:  xmms-devel
 Requires:       %{name} = %{version}-%{release}
 Requires:       xmms
 Obsoletes:      %{name}-xmms <= 2.2.12
@@ -60,6 +59,7 @@
 %package     -n bmp-%{name}
 Summary:        BMP plugin for on-screen display using the XOSD library
 Group:          Applications/Multimedia
+BuildRequires:  bmp-devel
 Requires:       %{name} = %{version}-%{release}
 Requires:       bmp
 
@@ -128,6 +128,9 @@
 
 
 %changelog
+* Wed Apr 12 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.2.14-6
+- Revert to upstream default font, require xorg-x11-fonts-base (#183971).
+
 * Sun Mar 12 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.2.14-5
 - Convert docs to UTF-8.
 



From fedora-extras-commits at redhat.com  Wed Apr 12 19:26:48 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 12 Apr 2006 12:26:48 -0700
Subject: rpms/xosd/devel xosd-defaults.patch,1.1,1.2 xosd.spec,1.11,1.12
Message-ID: <200604121926.k3CJQobO025021@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	xosd-defaults.patch xosd.spec 
Log Message:
* Wed Apr 12 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.2.14-6
- Revert to upstream default font, require xorg-x11-fonts-base (#183971).


xosd-defaults.patch:

Index: xosd-defaults.patch
===================================================================
RCS file: /cvs/extras/rpms/xosd/devel/xosd-defaults.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xosd-defaults.patch	17 Mar 2005 21:57:09 -0000	1.1
+++ xosd-defaults.patch	12 Apr 2006 19:26:48 -0000	1.2
@@ -12,18 +12,6 @@
    shadow_offset = 1;
    outline_offset = 0;
    pos = XOSD_bottom;
-diff -Naru xosd-2.2.14.orig/src/libxosd/xosd.c xosd-2.2.14/src/libxosd/xosd.c
---- xosd-2.2.14.orig/src/libxosd/xosd.c	2004-11-17 21:27:11.000000000 +0200
-+++ xosd-2.2.14/src/libxosd/xosd.c	2005-03-17 23:43:48.000000000 +0200
-@@ -24,7 +24,7 @@
- #define XOFFSET 10
- 
- const char *osd_default_font =
--  "-misc-fixed-medium-r-semicondensed--*-*-*-*-c-*-*-*";
-+  "-*-luxi sans-*-r-*-*-17-*-*-*-*-*-*-*";
- #if 0
- "-adobe-helvetica-bold-r-*-*-10-*";
- #endif
 diff -Naru xosd-2.2.14.orig/src/xmms_plugin/xmms_osd.c xosd-2.2.14/src/xmms_plugin/xmms_osd.c
 --- xosd-2.2.14.orig/src/xmms_plugin/xmms_osd.c	2004-11-04 21:47:50.000000000 +0200
 +++ xosd-2.2.14/src/xmms_plugin/xmms_osd.c	2005-03-17 23:42:11.000000000 +0200


Index: xosd.spec
===================================================================
RCS file: /cvs/extras/rpms/xosd/devel/xosd.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xosd.spec	12 Mar 2006 11:46:18 -0000	1.11
+++ xosd.spec	12 Apr 2006 19:26:48 -0000	1.12
@@ -5,7 +5,7 @@
 
 Name:           xosd
 Version:        2.2.14
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        On-screen display library for X
 
 Group:          System Environment/Libraries
@@ -16,15 +16,11 @@
 Patch1:         %{name}-defaults.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Needed for main xosd:
 BuildRequires:  libX11-devel
 BuildRequires:  libXext-devel
 BuildRequires:  libXinerama-devel
-# ...and for the bmp and xmms plugins:
-BuildRequires:  gtk+-devel >= 1:1.2.2
-BuildRequires:  gdk-pixbuf-devel >= 1:0.22.0
-BuildRequires:  xmms-devel
-BuildRequires:  bmp-devel
+# As of 2.2.14, the default font *must* be found, even if not used (#183971)
+Requires:       xorg-x11-fonts-base
 
 %description
 XOSD displays text on your screen, sounds simple right? The difference
@@ -49,6 +45,9 @@
 %package     -n xmms-%{name}
 Summary:        XMMS plugin for on-screen display using the XOSD library
 Group:          Applications/Multimedia
+BuildRequires:  gtk+-devel >= 1:1.2.2
+BuildRequires:  gdk-pixbuf-devel >= 1:0.22.0
+BuildRequires:  xmms-devel
 Requires:       %{name} = %{version}-%{release}
 Requires:       xmms
 Obsoletes:      %{name}-xmms <= 2.2.12
@@ -60,6 +59,7 @@
 %package     -n bmp-%{name}
 Summary:        BMP plugin for on-screen display using the XOSD library
 Group:          Applications/Multimedia
+BuildRequires:  bmp-devel
 Requires:       %{name} = %{version}-%{release}
 Requires:       bmp
 
@@ -128,6 +128,9 @@
 
 
 %changelog
+* Wed Apr 12 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.2.14-6
+- Revert to upstream default font, require xorg-x11-fonts-base (#183971).
+
 * Sun Mar 12 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.2.14-5
 - Convert docs to UTF-8.
 



From fedora-extras-commits at redhat.com  Wed Apr 12 19:58:53 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 12 Apr 2006 12:58:53 -0700
Subject: rpms/xmms/FC-5 xmms.req,1.1,1.2 xmms.spec,1.19,1.20
Message-ID: <200604121958.k3CJwtSs025511@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	xmms.req xmms.spec 
Log Message:
Sync with devel:

* Thu Apr  6 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1:1.2.10-23
- Split library and plugins to xmms-libs (#184606).
- ALSA is ubiquitous, don't filter dependencies to it.
- Avoid standard rpaths on lib64 archs.
- Tighten versioned -devel dependency to -libs.
- Drop no longer needed Obsoletes.
- Install icon to %{_datadir}/icons.
- Convert docs to UTF-8.
- Specfile rewrite/cleanup.
- Drop bogus Source0 URL.
- Don't use %exclude.



Index: xmms.req
===================================================================
RCS file: /cvs/extras/rpms/xmms/FC-5/xmms.req,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xmms.req	4 Apr 2005 17:59:12 -0000	1.1
+++ xmms.req	12 Apr 2006 19:58:53 -0000	1.2
@@ -3,5 +3,5 @@
 filelist=`sed "s/['\"]/\\\&/g"`
 
 { echo $filelist | tr [:blank:] \\n | /usr/lib/rpm/find-requires | \
-	grep -v artsc | grep -v esd | grep -v audiofile | grep -v asound
+	grep -v artsc | grep -v esd | grep -v audiofile
 } | sort -u


Index: xmms.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms/FC-5/xmms.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xmms.spec	2 Mar 2006 10:42:28 -0000	1.19
+++ xmms.spec	12 Apr 2006 19:58:53 -0000	1.20
@@ -1,63 +1,76 @@
-Summary: The X MultiMedia System, a media player
-Name: xmms
-Version: 1.2.10
-Release: 22%{?dist}
-Epoch: 1
-License: GPL
-Group: Applications/Multimedia
-URL: http://www.xmms.org/
-Source0: http://www.xmms.org/files/1.2.x/%{name}-%{version}.patched.tar.bz2
-Source2: xmms.req
-Source3: xmms.xpm
-Source5: rh_mp3.c
-Patch1: xmms-1.2.6-audio.patch
-Patch2: xmms-1.2.6-lazy.patch
-Patch3: xmms-1.2.8-default-skin.patch
-Patch4: xmms-1.2.9-nomp3.patch
-Patch5: xmms-1.2.8-arts.patch
-Patch6: xmms-1.2.8-alsalib.patch
-Patch7: xmms-cd-mountpoint.patch
-Patch9: xmms-underquoted.patch
-Patch10: xmms-alsa-backport.patch
-Patch11: xmms-1.2.10-gcc4.patch
-Patch12: xmms-1.2.10-crossfade-0.3.9.patch
-Patch13: xmms-1.2.10-extra_libs.patch
-
-Requires: unzip
-# the desktop file and redhat-menus are redundant requires really
-Requires: /usr/share/desktop-menu-patches/redhat-audio-player.desktop
-Requires: redhat-menus >= 0.11
-
-BuildRequires: gtk+-devel, esound-devel, arts-devel, alsa-lib-devel
-BuildRequires: libogg-devel, libvorbis-devel, mikmod-devel
-BuildRequires: gettext-devel, zlib-devel, libGL-devel
-# Use monolithic X up to FC4, and modular X for FC5+
-%if 0%{?fedora} < 5
-BuildRequires: xorg-x11-devel
-%else
-BuildRequires: libXt-devel, libSM-devel, libXxf86vm-devel
-%endif
+# This is to avoid requiring all of arts, esound, audiofile...
+%define _use_internal_dependency_generator 0
+%define __find_requires sh %{SOURCE1}
+
+Name:           xmms
+Version:        1.2.10
+Release:        23%{?dist}
+Epoch:          1
+Summary:        The X MultiMedia System, a media player
+
+Group:          Applications/Multimedia
+License:        GPL
+URL:            http://www.xmms.org/
+# http://www.xmms.org/download.php, to recreate the tarball:
+# $ wget http://www.xmms.org/files/1.2.x/xmms-1.2.10.tar.bz2
+# $ tar jx --exclude "mpg123*" -f xmms-1.2.10.tar.bz2
+# $ tar jcf xmms-1.2.10.patched.tar.bz2 xmms-1.2.10
+Source0:        %{name}-%{version}.patched.tar.bz2
+Source1:        xmms.req
+Source2:        xmms.xpm
+Source3:        rh_mp3.c
+Patch1:         %{name}-1.2.6-audio.patch
+Patch2:         %{name}-1.2.6-lazy.patch
+Patch3:         %{name}-1.2.8-default-skin.patch
+Patch4:         %{name}-1.2.9-nomp3.patch
+Patch5:         %{name}-1.2.8-arts.patch
+Patch6:         %{name}-1.2.8-alsalib.patch
+Patch7:         %{name}-cd-mountpoint.patch
+Patch9:         %{name}-underquoted.patch
+Patch10:        %{name}-alsa-backport.patch
+Patch11:        %{name}-1.2.10-gcc4.patch
+Patch12:        %{name}-1.2.10-crossfade-0.3.9.patch
+Patch13:        %{name}-1.2.10-extra_libs.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  gtk+-devel
+BuildRequires:  esound-devel
+BuildRequires:  arts-devel
+BuildRequires:  alsa-lib-devel
+BuildRequires:  libogg-devel
+BuildRequires:  libvorbis-devel
+BuildRequires:  mikmod-devel
+BuildRequires:  gettext-devel
+BuildRequires:  zlib-devel
+BuildRequires:  libGL-devel
+BuildRequires:  libXt-devel
+BuildRequires:  libSM-devel
+BuildRequires:  libXxf86vm-devel
+
+Requires:       unzip
+Requires:       %{_datadir}/desktop-menu-patches/redhat-audio-player.desktop
 Requires(post): desktop-file-utils >= 0.9
 Requires(postun): desktop-file-utils >= 0.9
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Obsoletes: xmms-esd xmms-gl xmms-mikmod xmms-gnome
-
-# This is to avoid requiring all of arts, esound, alsa...
-%define _use_internal_dependency_generator 0
-%define __find_requires %{SOURCE2}
 
 %description
-Xmms is a multimedia (Ogg Vorbis, CDs) player for the X Window System with
-an interface similar to Winamp's. Xmms supports playlists and
+XMMS is a multimedia (Ogg Vorbis, CDs) player for the X Window System
+with an interface similar to Winamp's.  XMMS supports playlists and
 streaming content and has a configurable interface.
 
+%package        libs
+Summary:        XMMS engine and core plugins
+Group:          System Environment/Libraries
+
+%description    libs
+The X MultiMedia System player engine and core plugins.
+
+%package        devel
+Summary:        Files required for XMMS plug-in development
+Group:          Development/Libraries
+Requires:       %{name}-libs = %{epoch}:%{version}-%{release}
+Requires:       gtk+-devel
 
-%package devel
-Summary: Files required for XMMS plug-in development
-Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}, gtk+-devel
-
-%description devel
+%description    devel
 Files needed for building plug-ins for the X MultiMedia System.
 
 
@@ -85,9 +98,14 @@
 %patch11 -p1 -b .gcc4
 # Fix for crossfade >= 0.3.9 to work properly
 %patch12 -p1 -b .crossfade
-# Remove extra libs from xmms-config output (was only needed for static linking)
+# Remove extra libs from xmms-config output (only needed for static linking)
 %patch13 -p1 -b .extra_libs
+# Avoid standard rpaths on lib64 archs, --disable-rpath doesn't do it
+sed -i -e 's|"/lib /usr/lib"|"/%{_lib} %{_libdir}"|' configure
 
+for f in AUTHORS ChangeLog README ; do
+    iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f
+done
 
 %build
 %configure \
@@ -97,87 +115,86 @@
     --enable-ipv6 \
     --with-pic \
     --disable-static
-# Hack around old libtool and x86_64 issue
-for i in `find . -name Makefile`; do
-    cat $i | sed s/-lpthread//g > $i.tmp
-    mv $i.tmp $i
-done
-%{__make} %{?_smp_mflags}
+find . -name Makefile | xargs sed -i -e s/-lpthread//g # old libtool, x86_64
+make %{?_smp_mflags}
 
-# Compile the default mp3 "warning dialog" plugin
-%{__cc} %{optflags} -fPIC -shared -Wl,-soname -Wl,librh_mp3.so -o librh_mp3.so \
-    -I. `gtk-config --cflags gtk` %{SOURCE5}
+%{__cc} $RPM_OPT_FLAGS -fPIC -shared -Wl,-soname -Wl,librh_mp3.so \
+    -o librh_mp3.so -I. $(gtk-config --cflags gtk) %{SOURCE3}
 
 
 %install
-%{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
-%find_lang %{name}
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+install -pm 755 librh_mp3.so $RPM_BUILD_ROOT%{_libdir}/xmms/Input
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/xmms/Skins
+find $RPM_BUILD_ROOT -name "*.la" | xargs rm -f
 
-# Install default mp3 "warning dialog" plugin
-%{__install} -m 0755 librh_mp3.so %{buildroot}%{_libdir}/xmms/Input/
+# On FC5 x86_64, some get created even though we pass --disable-static
+rm -f $RPM_BUILD_ROOT%{_libdir}/xmms/*/*.a
 
 # Link to the desktop menu entry included in redhat-menus
-%{__mkdir_p} %{buildroot}%{_datadir}/applications
-%{__ln_s} %{_datadir}/desktop-menu-patches/redhat-audio-player.desktop \
-    %{buildroot}%{_datadir}/applications/
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/applications
+ln -s %{_datadir}/desktop-menu-patches/redhat-audio-player.desktop \
+    $RPM_BUILD_ROOT%{_datadir}/applications
+install -Dpm 644 %{SOURCE2} \
+    $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/xmms.xpm
 
-# Install xmms.xpm, the Icon= from the menu entry
-%{__install} -D -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/xmms.xpm
-
-# Create empty Skins directory to be included
-%{__mkdir_p} %{buildroot}%{_datadir}/xmms/Skins/
-
-# On FC5 x86_64, some get created even though we pass --disable-static
-%{__rm} -f %{buildroot}%{_libdir}/xmms/*/*.a
+%find_lang %{name}
 
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 
 %post
-/sbin/ldconfig
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
 update-desktop-database -q || :
 
+%post libs -p /sbin/ldconfig
+
 %postun
-/sbin/ldconfig
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
 update-desktop-database -q || :
 
+%postun libs -p /sbin/ldconfig
+
 
 %files -f %{name}.lang
-%defattr(-,root,root,0755)
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING FAQ NEWS TODO README
 %{_bindir}/xmms
 %{_bindir}/wmxmms
-%{_libdir}/libxmms.so.*
-%dir %{_libdir}/xmms/
-%dir %{_libdir}/xmms/Effect/
-%dir %{_libdir}/xmms/General/
-%dir %{_libdir}/xmms/Input/
-%dir %{_libdir}/xmms/Output/
-%dir %{_libdir}/xmms/Visualization/
-%{_libdir}/xmms/Effect/*.so
-%{_libdir}/xmms/General/*.so
-%{_libdir}/xmms/Input/*.so
-%{_libdir}/xmms/Output/*.so
-%{_libdir}/xmms/Visualization/*.so
-%exclude %{_libdir}/xmms/*/*.la
 %{_datadir}/applications/*.desktop
-%{_datadir}/pixmaps/xmms.xpm
+%{_datadir}/icons/hicolor/*x*/apps/xmms.xpm
 %{_datadir}/xmms/
-%{_mandir}/man1/*
+%{_mandir}/man1/*xmms.1*
+
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/libxmms.so.*
+%{_libdir}/xmms/
 
 %files devel
-%defattr(-,root,root,0755)
+%defattr(-,root,root,-)
 %{_bindir}/xmms-config
 %{_includedir}/xmms/
-%exclude %{_libdir}/*.la
-%{_libdir}/*.so
+%{_libdir}/libxmms.so
 %{_datadir}/aclocal/xmms.m4
 
 
 %changelog
+* Thu Apr  6 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1:1.2.10-23
+- Split library and plugins to xmms-libs (#184606).
+- ALSA is ubiquitous, don't filter dependencies to it.
+- Avoid standard rpaths on lib64 archs.
+- Tighten versioned -devel dependency to -libs.
+- Drop no longer needed Obsoletes.
+- Install icon to %%{_datadir}/icons.
+- Convert docs to UTF-8.
+- Specfile rewrite/cleanup.
+- Drop bogus Source0 URL.
+- Don't use %%exclude.
+
 * Thu Mar  2 2006 Matthias Saou <http://freshrpms.net/> 1:1.2.10-22
 - Remove /usr/lib64/xmms/General/libsong_change.a (fix for FC5 x86_64...).
 



From fedora-extras-commits at redhat.com  Wed Apr 12 20:03:11 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Wed, 12 Apr 2006 13:03:11 -0700
Subject: rpms/xmms-cdread/FC-5 xmms-cdread.spec,1.10,1.11
Message-ID: <200604122003.k3CK3EUL027647@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/xmms-cdread/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27613/FC-5

Modified Files:
	xmms-cdread.spec 
Log Message:
changed Requires xmms -> xmms-libs


Index: xmms-cdread.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-cdread/FC-5/xmms-cdread.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xmms-cdread.spec	5 Mar 2006 10:00:28 -0000	1.10
+++ xmms-cdread.spec	12 Apr 2006 20:03:11 -0000	1.11
@@ -3,14 +3,14 @@
 Summary:	Digital audio CD input plugin for XMMS
 Name:		xmms-cdread
 Version:	0.14
-Release:        9%{?dist}
+Release:        10%{?dist}
 License:	GPL
 Group:		Applications/Multimedia
 URL:		http://www.xmms.org/
 Source:		ftp://ftp.stack.nl/pub/users/willem/xmms-cdread-0.14a.tar.gz
 Patch1:		xmms-cdread-shuffle.patch
 Patch2:		xmms-cdread-x86_64.patch
-Requires:	xmms = %xmmsdep
+Requires:	xmms-libs
 BuildRequires:	gtk+-devel glib-devel xmms-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -47,6 +47,9 @@
 %exclude %{xmmsinputdir}/libcdread.la
 
 %changelog
+* Sat Apr  8 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.14-10
+- changed Requires xmms -> xmms-libs
+
 * Sun Mar  5 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.14-9
 - x86_64 fixes 
 
@@ -55,7 +58,7 @@
 - added dist after release
 
 * Wed Mar  1 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.14-7
-- Rebuild for Fedora Extras 5
+- rebuild for Fedora Extras 5
 
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 0.14-6.a
 - rebuild on all arches



From fedora-extras-commits at redhat.com  Wed Apr 12 20:03:10 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Wed, 12 Apr 2006 13:03:10 -0700
Subject: rpms/xmms-cdread/FC-4 xmms-cdread.spec,1.8,1.9
Message-ID: <200604122003.k3CK3gAt027650@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/xmms-cdread/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27613/FC-4

Modified Files:
	xmms-cdread.spec 
Log Message:
changed Requires xmms -> xmms-libs


Index: xmms-cdread.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-cdread/FC-4/xmms-cdread.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xmms-cdread.spec	5 Mar 2006 10:01:11 -0000	1.8
+++ xmms-cdread.spec	12 Apr 2006 20:03:10 -0000	1.9
@@ -3,14 +3,14 @@
 Summary:	Digital audio CD input plugin for XMMS
 Name:		xmms-cdread
 Version:	0.14
-Release:        9%{?dist}
+Release:        10%{?dist}
 License:	GPL
 Group:		Applications/Multimedia
 URL:		http://www.xmms.org/
 Source:		ftp://ftp.stack.nl/pub/users/willem/xmms-cdread-0.14a.tar.gz
 Patch1:		xmms-cdread-shuffle.patch
 Patch2:		xmms-cdread-x86_64.patch
-Requires:	xmms = %xmmsdep
+Requires:	xmms-libs
 BuildRequires:	gtk+-devel glib-devel xmms-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -47,6 +47,9 @@
 %exclude %{xmmsinputdir}/libcdread.la
 
 %changelog
+* Sat Apr  8 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.14-10
+- changed Requires xmms -> xmms-libs
+
 * Sun Mar  5 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.14-9
 - x86_64 fixes 
 
@@ -55,7 +58,7 @@
 - added dist after release
 
 * Wed Mar  1 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.14-7
-- Rebuild for Fedora Extras 5
+- rebuild for Fedora Extras 5
 
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 0.14-6.a
 - rebuild on all arches



From fedora-extras-commits at redhat.com  Wed Apr 12 20:06:40 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 12 Apr 2006 13:06:40 -0700
Subject: rpms/perl-Locale-Maketext-Simple - New directory
Message-ID: <200604122006.k3CK6gph027812@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Locale-Maketext-Simple
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27786/perl-Locale-Maketext-Simple

Log Message:
Directory /cvs/extras/rpms/perl-Locale-Maketext-Simple added to the repository




From fedora-extras-commits at redhat.com  Wed Apr 12 20:06:41 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 12 Apr 2006 13:06:41 -0700
Subject: rpms/perl-Locale-Maketext-Simple/devel - New directory
Message-ID: <200604122006.k3CK6h94027815@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Locale-Maketext-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27786/perl-Locale-Maketext-Simple/devel

Log Message:
Directory /cvs/extras/rpms/perl-Locale-Maketext-Simple/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Apr 12 20:07:28 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 12 Apr 2006 13:07:28 -0700
Subject: rpms/perl-Locale-Maketext-Simple Makefile, NONE, 1.1 import.log,
	NONE, 1.1
Message-ID: <200604122007.k3CK7U2C027859@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Locale-Maketext-Simple
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27831

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Locale-Maketext-Simple


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

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

common : CVS/Root
	@cvs checkout common

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

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


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Apr 12 20:07:29 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 12 Apr 2006 13:07:29 -0700
Subject: rpms/perl-Locale-Maketext-Simple/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200604122007.k3CK7Vsk027862@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Locale-Maketext-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27831/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Locale-Maketext-Simple


--- 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 Apr 12 20:08:30 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 12 Apr 2006 13:08:30 -0700
Subject: rpms/perl-Locale-Maketext-Simple import.log,1.1,1.2
Message-ID: <200604122008.k3CK8WrW027928@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Locale-Maketext-Simple
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27895

Modified Files:
	import.log 
Log Message:
auto-import perl-Locale-Maketext-Simple-0.12-2 on branch devel from perl-Locale-Maketext-Simple-0.12-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Apr 2006 20:07:28 -0000	1.1
+++ import.log	12 Apr 2006 20:08:30 -0000	1.2
@@ -0,0 +1 @@
+perl-Locale-Maketext-Simple-0_12-2:HEAD:perl-Locale-Maketext-Simple-0.12-2.src.rpm:1144872488



From fedora-extras-commits at redhat.com  Wed Apr 12 20:08:31 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 12 Apr 2006 13:08:31 -0700
Subject: rpms/perl-Locale-Maketext-Simple/devel
	perl-Locale-Maketext-Simple.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604122008.k3CK8XtQ027933@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Locale-Maketext-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27895/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Locale-Maketext-Simple.spec 
Log Message:
auto-import perl-Locale-Maketext-Simple-0.12-2 on branch devel from perl-Locale-Maketext-Simple-0.12-2.src.rpm


--- NEW FILE perl-Locale-Maketext-Simple.spec ---
Name:           perl-Locale-Maketext-Simple
Version:        0.12
Release:        2%{?dist}
Summary:        Simple interface to Locale::Maketext::Lexicon
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Locale-Maketext-Simple/
Source0:        http://www.cpan.org/authors/id/A/AU/AUTRIJUS/Locale-Maketext-Simple-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Locale::Maketext::Lexicon) >= 0.20
Requires:       perl(Locale::Maketext::Lexicon) >= 0.20
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module is a simple wrapper around Locale::Maketext::Lexicon, designed
to alleviate the need of creating Language Classes for module authors.

%prep
%setup -q -n Locale-Maketext-Simple-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \;

chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

%check
rm -f t/0-signature.t
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Mon Apr 10 2006 Steven Pritchard <steve at kspei.com> 0.12-2
- Explicitly require perl(Locale::Maketext::Lexicon).

* Sat Apr 08 2006 Steven Pritchard <steve at kspei.com> 0.12-1
- Specfile autogenerated by cpanspec 1.64.
- Remove Module::Signature test.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2006 20:07:29 -0000	1.1
+++ .cvsignore	12 Apr 2006 20:08:31 -0000	1.2
@@ -0,0 +1 @@
+Locale-Maketext-Simple-0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2006 20:07:29 -0000	1.1
+++ sources	12 Apr 2006 20:08:31 -0000	1.2
@@ -0,0 +1 @@
+9a65312da2ae8d59f898151f9c044383  Locale-Maketext-Simple-0.12.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 12 22:28:56 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Wed, 12 Apr 2006 15:28:56 -0700
Subject: rpms/gparted/devel .cvsignore, 1.6, 1.7 gparted.spec, 1.7,
	1.8 sources, 1.6, 1.7
Message-ID: <200604122228.k3CMSw4e032473@cvs-int.fedora.redhat.com>

Author: deji

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

Modified Files:
	.cvsignore gparted.spec sources 
Log Message:
* Wed Apr 12 2006 Deji Akingunola <dakingun at gmail.com> - 0.2.4-1
- Update to newer version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gparted/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	30 Mar 2006 19:56:32 -0000	1.6
+++ .cvsignore	12 Apr 2006 22:28:56 -0000	1.7
@@ -1 +1 @@
-gparted-0.2.3.tar.bz2
+gparted-0.2.4.tar.bz2


Index: gparted.spec
===================================================================
RCS file: /cvs/extras/rpms/gparted/devel/gparted.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gparted.spec	30 Mar 2006 19:56:32 -0000	1.7
+++ gparted.spec	12 Apr 2006 22:28:56 -0000	1.8
@@ -1,6 +1,6 @@
 Summary: Gnome Partition Editor
 Name:    gparted
-Version: 0.2.3
+Version: 0.2.4
 Release: 1%{?dist}
 Group:   Applications/System
 License: GPL
@@ -77,6 +77,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/gparted
 
 %changelog
+* Wed Apr 12 2006 Deji Akingunola <dakingun at gmail.com> - 0.2.4-1
+- Update to newer version
+
 * Thu Mar 30 2006 Deji Akingunola <dakingun at gmail.com> - 0.2.3-1
 - Update to newer version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gparted/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	30 Mar 2006 19:56:32 -0000	1.6
+++ sources	12 Apr 2006 22:28:56 -0000	1.7
@@ -1 +1 @@
-329e7a254e82d29b67e521ec3f1906c7  gparted-0.2.3.tar.bz2
+8cee62b5980e76e8e0366660ae310f0c  gparted-0.2.4.tar.bz2



From fedora-extras-commits at redhat.com  Wed Apr 12 22:30:14 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Wed, 12 Apr 2006 15:30:14 -0700
Subject: rpms/gparted/FC-5 .cvsignore, 1.6, 1.7 gparted.spec, 1.7,
	1.8 sources, 1.6, 1.7
Message-ID: <200604122230.k3CMUGKs032552@cvs-int.fedora.redhat.com>

Author: deji

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

Modified Files:
	.cvsignore gparted.spec sources 
Log Message:
* Wed Apr 12 2006 Deji Akingunola <dakingun at gmail.com> - 0.2.4-1
- Update to newer version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gparted/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	30 Mar 2006 19:55:52 -0000	1.6
+++ .cvsignore	12 Apr 2006 22:30:14 -0000	1.7
@@ -1 +1 @@
-gparted-0.2.3.tar.bz2
+gparted-0.2.4.tar.bz2


Index: gparted.spec
===================================================================
RCS file: /cvs/extras/rpms/gparted/FC-5/gparted.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gparted.spec	30 Mar 2006 19:55:52 -0000	1.7
+++ gparted.spec	12 Apr 2006 22:30:14 -0000	1.8
@@ -1,6 +1,6 @@
 Summary: Gnome Partition Editor
 Name:    gparted
-Version: 0.2.3
+Version: 0.2.4
 Release: 1%{?dist}
 Group:   Applications/System
 License: GPL
@@ -77,6 +77,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/gparted
 
 %changelog
+* Wed Apr 12 2006 Deji Akingunola <dakingun at gmail.com> - 0.2.4-1
+- Update to newer version
+
 * Thu Mar 30 2006 Deji Akingunola <dakingun at gmail.com> - 0.2.3-1
 - Update to newer version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gparted/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	30 Mar 2006 19:55:52 -0000	1.6
+++ sources	12 Apr 2006 22:30:14 -0000	1.7
@@ -1 +1 @@
-329e7a254e82d29b67e521ec3f1906c7  gparted-0.2.3.tar.bz2
+8cee62b5980e76e8e0366660ae310f0c  gparted-0.2.4.tar.bz2



From fedora-extras-commits at redhat.com  Wed Apr 12 23:12:12 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Wed, 12 Apr 2006 16:12:12 -0700
Subject: kadischi/post_install_scripts 04userconfig.py,1.3,1.4
Message-ID: <200604122312.k3CNCCQk002245@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi/post_install_scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2227/kadischi/post_install_scripts

Modified Files:
	04userconfig.py 
Log Message:
Drop useless code pieces in loop, clean up.


Index: 04userconfig.py
===================================================================
RCS file: /cvs/devel/kadischi/post_install_scripts/04userconfig.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 04userconfig.py	12 Apr 2006 17:51:42 -0000	1.3
+++ 04userconfig.py	12 Apr 2006 23:12:10 -0000	1.4
@@ -8,33 +8,32 @@
 from functions import run
 from functions import flc_log
 
+
 sysdir = sys.argv[1]
+anaconda_args = sys.argv[2:]
 
-try:
-    anaconda_args = sys.argv[2:]
-except IndexError:
-    anaconda_args = None
+lokkit = os.path.isfile(os.path.join(sysdir, "usr/sbin/lokkit"))
+ntsysv = os.path.isfile(os.path.join(sysdir, "usr/sbin/ntsysv"))
 
-config_done = False
 
 run("chroot %s %s" % (sysdir, "/usr/sbin/authconfig --kickstart --nostart --enableshadow --enablemd5 --disablecache --disablenis --disableldap --disableldapauth --disableldaptls --disablekrb5 --disablehesiod --disablesmbauth"))
 
-while config_done == False:
-    if anaconda_args != None:
-        for args in anaconda_args:
-            if args.startswith("--kickstart") or args.startswith("--cmdline") or args.startswith("-C"):
-                flc_log("Skipping interactive user configuration..")
-                config_done = True
-                sys.exit(0)
-            else:
-                if os.path.isfile(os.path.join(sysdir, "usr/sbin/lokkit")) and os.path.isfile(os.path.join(sysdir, "usr/sbin/ntsysv")):
-                    flc_log("Taking you to interactive user configuration..")
-                    run("chroot %s %s" % (sysdir, "/usr/sbin/lokkit"))
-                    run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv"))
-                    config_done = True   
+if anaconda_args != []:
+    for args in anaconda_args:
+        if args.startswith("--kickstart") or args.startswith("--cmdline") or args.startswith("-C"):
+            flc_log("Skipping interactive user configuration..")
+            sys.exit(0)
+
+    if (lokkit and ntsysv) == True:
+        flc_log("Taking you to interactive user configuration..")
+        run("chroot %s %s" % (sysdir, "/usr/sbin/lokkit"))
+        run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv"))
+    else:
+        flc_log("Skipping interactive user configuration..")
+else:
+    if (lokkit and ntsysv) == True:
+        flc_log("Taking you to interactive user configuration..")
+        run("chroot %s %s" % (sysdir, "/usr/sbin/lokkit"))
+        run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv"))
     else:
-        if os.path.isfile(os.path.join(sysdir, "usr/sbin/lokkit")) and os.path.isfile(os.path.join(sysdir, "usr/sbin/ntsysv")):
-            flc_log("Taking you to interactive user configuration..")
-            run("chroot %s %s" % (sysdir, "/usr/sbin/lokkit"))
-            run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv"))
-            config_done = True
+        flc_log("Skipping interactive user configuration..")



From fedora-extras-commits at redhat.com  Wed Apr 12 23:23:38 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Wed, 12 Apr 2006 16:23:38 -0700
Subject: rpms/abiword/FC-5 abiword-2.4.4-docbuild.patch, NONE,
	1.1 abiword.spec, 1.33, 1.34
Message-ID: <200604122323.k3CNNeKJ002294@cvs-int.fedora.redhat.com>

Author: uwog

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

Modified Files:
	abiword.spec 
Added Files:
	abiword-2.4.4-docbuild.patch 
Log Message:
Fix documentation and charting support



abiword-2.4.4-docbuild.patch:

--- NEW FILE abiword-2.4.4-docbuild.patch ---
diff -r -u abiword-2.4.4.orig/abiword-docs/make-dbk.sh abiword-2.4.4/abiword-docs/make-dbk.sh
--- abiword-2.4.4.orig/abiword-docs/make-dbk.sh	2006-04-12 23:16:57.000000000 +0200
+++ abiword-2.4.4/abiword-docs/make-dbk.sh	2006-04-12 23:20:18.000000000 +0200
@@ -33,7 +33,7 @@
 		      echo $i
 
 		      # save to docbook, rename to .xml
-		      AbiWord-2.0 --to=dbk $i 2>/dev/null
+		      AbiWord-2.4 --to=dbk $i 2>/dev/null
 		      mv $n.dbk $n.xml
 		done
 
diff -r -u abiword-2.4.4.orig/abiword-docs/make-gnome-html.sh abiword-2.4.4/abiword-docs/make-gnome-html.sh
--- abiword-2.4.4.orig/abiword-docs/make-gnome-html.sh	2006-04-12 23:16:57.000000000 +0200
+++ abiword-2.4.4/abiword-docs/make-gnome-html.sh	2006-04-12 23:20:18.000000000 +0200
@@ -31,7 +31,7 @@
 		do
 		      n=`echo $i|cut -f1 -d .`
 		      echo $i
-		      AbiWord-2.0 --to=html $i 2>/dev/null
+		      AbiWord-2.4 --to=html $i 2>/dev/null
 		done
 
 		cd $CVS
diff -r -u abiword-2.4.4.orig/abiword-docs/make-html.sh abiword-2.4.4/abiword-docs/make-html.sh
--- abiword-2.4.4.orig/abiword-docs/make-html.sh	2006-04-12 23:16:57.000000000 +0200
+++ abiword-2.4.4/abiword-docs/make-html.sh	2006-04-12 23:20:44.000000000 +0200
@@ -30,7 +30,7 @@
 fi
 
 if [ -z "$ABI_DOC_PROG" ]; then
-ABI_DOC_PROG="AbiWord-2.2";
+ABI_DOC_PROG="AbiWord-2.4";
 fi
 
 html_export_options="html4: no; use-awml: no; embed-css: yes; embed-images:yes"
@@ -45,7 +45,7 @@
 		do
 		      n=`echo $i|cut -f1 -d .`
 		      echo $i
-		      $ABI_DOC_PROG --to=html --exp-props=$html_export_options $i 2>/dev/null
+		      $ABI_DOC_PROG --to=html --exp-props="$html_export_options" $i 2>/dev/null
 		      $CVS/make-abidoc.pl -I $n.info -S header.xhtml -F footer.xhtml > $n.xhtml
 		      cp $n.xhtml $n.html
 			rm -f $n.xhtml


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-5/abiword.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- abiword.spec	10 Apr 2006 23:35:23 -0000	1.33
+++ abiword.spec	12 Apr 2006 23:23:38 -0000	1.34
@@ -3,7 +3,7 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: 2.4.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -33,6 +33,7 @@
 BuildRequires: link-grammar-devel >= 4.2.1
 BuildRequires: gtkmathview-devel >= 0.7.5
 BuildRequires: libgsf-devel >= 1.12.1
+BuildRequires: goffice-devel >= 0.1.0
 
 # gnome build deps
 BuildRequires: libbonobo-devel
@@ -42,6 +43,7 @@
 
 Patch0: abiword-2.0.9-windowshelppaths.patch
 Patch1: abiword-2.4.4-desktop.patch
+Patch2: abiword-2.4.4-docbuild.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. The goal is to make
@@ -51,6 +53,7 @@
 %setup -q 
 %patch0 -p1 -b .windowshelppaths
 %patch1 -p1 -b .desktop
+%patch2 -p1 -b .docbuild
 
 %build
 cd abi
@@ -132,6 +135,10 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Wed Apr 12 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.4-2.fc5
+- Fix documentation generation
+- Fix charting support
+
 * Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.4-1.fc5
 - New upstream version
 - Remove the macro patch and update the desktop patch



From fedora-extras-commits at redhat.com  Wed Apr 12 23:49:06 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 12 Apr 2006 16:49:06 -0700
Subject: rpms/multitail/devel .cvsignore, 1.4, 1.5 multitail.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200604122349.k3CNn8C2002389@cvs-int.fedora.redhat.com>

Author: jpo

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

Modified Files:
	.cvsignore multitail.spec sources 
Log Message:
Updated to release 4.0.0.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/multitail/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	30 Mar 2006 18:28:13 -0000	1.4
+++ .cvsignore	12 Apr 2006 23:49:05 -0000	1.5
@@ -1 +1 @@
-multitail-3.8.10.tgz
+multitail-4.0.0.tgz


Index: multitail.spec
===================================================================
RCS file: /cvs/extras/rpms/multitail/devel/multitail.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- multitail.spec	30 Mar 2006 18:28:13 -0000	1.3
+++ multitail.spec	12 Apr 2006 23:49:05 -0000	1.4
@@ -1,5 +1,5 @@
 Name: multitail
-Version: 3.8.10
+Version: 4.0.0
 Release: 1%{?dist}
 Summary: View one or multiple files like tail but with multiple windows
 
@@ -41,6 +41,8 @@
 			%{buildroot}%{_sysconfdir}
 %{__make} install DESTDIR="%{buildroot}"
 
+mv %{buildroot}%{_sysconfdir}/multitail.conf.new %{buildroot}%{_sysconfdir}/multitail.conf
+
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -48,12 +50,15 @@
 %files
 %defattr(-, root, root, 0755)
 %doc *.conf *.html Changes license.txt readme.txt
-%{_mandir}/man1/multitail.1*
 %config(noreplace) %{_sysconfdir}/multitail.conf
 %{_bindir}/multitail
+%{_mandir}/man1/multitail.1*
 
 
 %changelog
+* Wed Apr 12 2006 Folkert van Heuesden <folkert at vanheusden.com> - 4.0.0-1
+- Updated to release 4.0.0.
+
 * Thu Mar 30 2006 Folkert van Heuesden <folkert at vanheusden.com> - 3.8.10-1
 - Updated to release 3.8.10.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/multitail/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	30 Mar 2006 18:28:13 -0000	1.4
+++ sources	12 Apr 2006 23:49:05 -0000	1.5
@@ -1 +1 @@
-1b4cb6288298fe61c4c5147b50bfd48d  multitail-3.8.10.tgz
+6a86bcc65185faa37720c56a414fe5dd  multitail-4.0.0.tgz



From fedora-extras-commits at redhat.com  Thu Apr 13 01:08:42 2006
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Wed, 12 Apr 2006 18:08:42 -0700
Subject: rpms/gpsd - New directory
Message-ID: <200604130108.k3D18i0r006932@cvs-int.fedora.redhat.com>

Author: mtruch

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

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




From fedora-extras-commits at redhat.com  Thu Apr 13 01:08:42 2006
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Wed, 12 Apr 2006 18:08:42 -0700
Subject: rpms/gpsd/devel - New directory
Message-ID: <200604130108.k3D18iws006935@cvs-int.fedora.redhat.com>

Author: mtruch

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

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




From fedora-extras-commits at redhat.com  Thu Apr 13 01:08:59 2006
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Wed, 12 Apr 2006 18:08:59 -0700
Subject: rpms/gpsd Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604130109.k3D191TX006984@cvs-int.fedora.redhat.com>

Author: mtruch

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

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


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

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

common : CVS/Root
	@cvs 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 Apr 13 01:08:59 2006
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Wed, 12 Apr 2006 18:08:59 -0700
Subject: rpms/gpsd/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200604130109.k3D191ZF006987@cvs-int.fedora.redhat.com>

Author: mtruch

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

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


--- 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 Apr 13 01:09:38 2006
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Wed, 12 Apr 2006 18:09:38 -0700
Subject: rpms/gpsd import.log,1.1,1.2
Message-ID: <200604130109.k3D19eC0007060@cvs-int.fedora.redhat.com>

Author: mtruch

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

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


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gpsd/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Apr 2006 01:08:59 -0000	1.1
+++ import.log	13 Apr 2006 01:09:38 -0000	1.2
@@ -0,0 +1 @@
+gpsd-2_32-3:HEAD:gpsd-2.32-3.src.rpm:1144890599



From fedora-extras-commits at redhat.com  Thu Apr 13 01:09:39 2006
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Wed, 12 Apr 2006 18:09:39 -0700
Subject: rpms/gpsd/devel gpsd.spec, NONE, 1.1 xgps.desktop, NONE,
	1.1 xgpsspeed.desktop, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200604130109.k3D19fqQ007065@cvs-int.fedora.redhat.com>

Author: mtruch

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

Modified Files:
	.cvsignore sources 
Added Files:
	gpsd.spec xgps.desktop xgpsspeed.desktop 
Log Message:
auto-import gpsd-2.32-3 on branch devel from gpsd-2.32-3.src.rpm


--- NEW FILE gpsd.spec ---
Name:           gpsd
Version:        2.32
Release:        3%{?dist}
Summary:        Service daemon for mediating access to a GPS

Group:          System Environment/Daemons
License:        BSD
URL:            http://developer.berlios.de/projects/gpsd/
Source0:        http://download.berlios.de/gpsd/%{name}-%{version}.tar.gz
Source1:        xgps.desktop
Source2:        xgpsspeed.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: dbus-devel ncurses-devel xmlto python
BuildRequires: openmotif-devel libXaw-devel desktop-file-utils

Requires(post):    /sbin/ldconfig
Requires(postun):  /sbin/ldconfig

%description 
gpsd is a service daemon that mediates access to a GPS sensor
connected to the host computer by serial or USB interface, making its
data on the location/course/velocity of the sensor available to be
queried on TCP port 2947 of the host computer.  With gpsd, multiple
GPS client applications (such as navigational and wardriving software)
can share access to a GPS without contention or loss of data.  Also,
gpsd responds to queries with a format that is substantially easier to
parse than NMEA 0183.  

%package devel
Summary:        Client libraries in C and Python for talking to a running gpsd or GPS
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description devel
This package provides C header files for the gpsd shared libraries
that manage access to a GPS for applications; also Python modules.

%package        clients
Summary:        Clients for gpsd
Group:          Applications/System

%description clients
xgps is a simple test client for gpsd with an X interface. It displays
current GPS position/time/velocity information and (for GPSes that
support the feature) the locations of accessible satellites.

xgpsspeed is a speedometer that uses position information from the GPS.
It accepts an -h option and optional argument as for gps, or a -v option
to dump the package version and exit. Additionally, it accepts -rv
(reverse video) and -nc (needle color) options.

cgps resembles xgps, but without the pictorial satellite display.  It
can run on a serial terminal or terminal emulator.

%prep
%setup -q

%build
%configure --enable-tnt --enable-dbus --disable-static
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}

%makeinstall
# additional gpsd files
mkdir -p %{buildroot}%{_libdir}/X11/app-defaults/
cp xgps.ad %{buildroot}%{_libdir}/X11/app-defaults/xgps
cp xgpsspeed.ad %{buildroot}%{_libdir}/X11/app-defaults/xgpsspeed
mkdir -p %{buildroot}%{_sysconfdir}/hotplug/usb
cp gpsd.hotplug gpsd.usermap %{buildroot}%{_sysconfdir}/hotplug/usb/
# additional gpsd-devel files
mkdir -p %{buildroot}%{_datadir}/gpsd
PYVERSION=`python -c "import sys; print sys.version[:3]"`
mkdir -p %{buildroot}%{_libdir}/python${PYVERSION}/site-packages
cp gps.py gpsfake.py %{buildroot}%{_libdir}/python${PYVERSION}/site-packages

#remove nasty little .la files
rm -f %{buildroot}%{_libdir}/libgps.la

#Install the .desktop files
desktop-file-install --vendor fedora                        \
    --dir %{buildroot}%{_datadir}/applications              \
    --add-category X-Fedora                                 \
    %{SOURCE1}
desktop-file-install --vendor fedora                        \
    --dir %{buildroot}%{_datadir}/applications              \
    --add-category X-Fedora                                 \
    %{SOURCE2}

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc README INSTALL COPYING
%{_sbindir}/gpsd
%{_bindir}/gpsprof
%{_bindir}/sirfmon
%{_libdir}/libgps.so.*
%{_mandir}/man8/gpsd.8*
%{_mandir}/man1/gpsprof.1*
%{_mandir}/man1/sirfmon.1*
%{_sysconfdir}/hotplug/usb/gpsd.hotplug
%{_sysconfdir}/hotplug/usb/gpsd.usermap
%{_libdir}/python*/site-packages/gps.py*

%files devel
%defattr(-,root,root,-)
%doc HACKING TODO
%{_bindir}/gpsfake
%{_bindir}/rtcmdecode
%{_bindir}/gpsflash
%{_libdir}/python*/site-packages/gpsfake.py*
%{_libdir}/libgps.so
%{_includedir}/gps.h
%{_includedir}/libgpsmm.h
%{_includedir}/gpsd.h
%{_mandir}/man1/gpsfake.1*
%{_mandir}/man1/rtcmdecode.1*
%{_mandir}/man1/gpsflash.1*
%{_mandir}/man3/libgps.3*
%{_mandir}/man3/libgpsmm.3*
%{_mandir}/man3/libgpsd.3*
%{_mandir}/man5/rtcm-104.5*
%{_mandir}/man5/srec.5*

%files clients
%defattr(-,root,root,-)
%{_bindir}/xgps
%{_bindir}/xgpsspeed
%{_bindir}/cgps
%{_bindir}/gpspipe
%{_bindir}/gpxlogger
%{_bindir}/cgpxlogger
%{_mandir}/man1/gps.1*
%{_mandir}/man1/gpspipe.1*
%{_libdir}/X11/app-defaults/xgps
%{_libdir}/X11/app-defaults/xgpsspeed
%{_datadir}/applications/*.desktop

%changelog
* Sun Apr 9 2006 Matthew Truch <matt at truch.net> - 2.32-3
- Include xmlto and python in buildrequires so things build right.
- Don't package static library file.  

* Wed Apr 5 2006 Matthew Truch <matt at truch.net> - 2.32-2
- Use ye olde %%{?dist} tag.

* Wed Apr 5 2006 Matthew Truch <matt at truch.net> - 2.32-1
- Initial Fedora Extras specfile


--- NEW FILE xgps.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=xgps
GenericName=GPS information
Comment=Display GPS information from a gpsd daemon
Exec=xgps
Icon=icon-globe.png
Terminal=false
Type=Application
Categories=Application;Graphics;
Version=2.32


--- NEW FILE xgpsspeed.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=xgpsspeed
GenericName=GPS speedometer
Comment=Display GPS speed from a gpsd daemon
Exec=xgpsspeed
Icon=icon-globe.png
Terminal=false
Type=Application
Categories=Application;Graphics;
Version=2.32



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gpsd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Apr 2006 01:08:59 -0000	1.1
+++ .cvsignore	13 Apr 2006 01:09:39 -0000	1.2
@@ -0,0 +1 @@
+gpsd-2.32.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gpsd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Apr 2006 01:08:59 -0000	1.1
+++ sources	13 Apr 2006 01:09:39 -0000	1.2
@@ -0,0 +1 @@
+4bb9b0c1642d36265c807a04da3d6f60  gpsd-2.32.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 13 01:18:16 2006
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Wed, 12 Apr 2006 18:18:16 -0700
Subject: owners owners.list,1.837,1.838
Message-ID: <200604130118.k3D1IIKO007242@cvs-int.fedora.redhat.com>

Author: mtruch

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

Modified Files:
	owners.list 
Log Message:
Add gpsd to owners list



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.837
retrieving revision 1.838
diff -u -r1.837 -r1.838
--- owners.list	11 Apr 2006 17:29:15 -0000	1.837
+++ owners.list	13 Apr 2006 01:18:16 -0000	1.838
@@ -394,6 +394,7 @@
 Fedora Extras|gpgme|GnuPG Made Easy|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|gpp|Gnome Photo Printer|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|
 Fedora Extras|gpredict|Real-time satellite tracking and orbit prediction program|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
+Fedora Extras|gpsd|Service daemon for mediating access to a GPS|matt at truch.net|extras-qa at fedoraproject.org|
 Fedora Extras|gpsim|A simulator for Microchip (TM) PIC (TM) microcontrollers|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
 Fedora Extras|gputils|Development utilities for Microchip (TM) PIC (TM) microcontrollers|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
 Fedora Extras|gquilt|A PyGTK wrapper for quilt|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Apr 13 02:49:44 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 12 Apr 2006 19:49:44 -0700
Subject: rpms/deskbar-applet/FC-3 deskbar-applet.spec,1.4,1.5
Message-ID: <200604130249.k3D2nk1q009501@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/deskbar-applet/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9484

Modified Files:
	deskbar-applet.spec 
Log Message:
Prepare for rebuild


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/FC-3/deskbar-applet.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- deskbar-applet.spec	5 Dec 2005 17:17:32 -0000	1.4
+++ deskbar-applet.spec	13 Apr 2006 02:49:43 -0000	1.5
@@ -43,7 +43,7 @@
 %{_libdir}/bonobo/servers/DeskbarApplet.server
 
 %changelog
-* Mon Dec  5 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.2-4
+* Wed Apr 12 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.2-4
 - Updated Source0 URL (#161670)
 
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.2-3



From fedora-extras-commits at redhat.com  Thu Apr 13 02:51:04 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 12 Apr 2006 19:51:04 -0700
Subject: rpms/deskbar-applet/FC-3 deskbar-applet.spec,1.5,1.6
Message-ID: <200604130251.k3D2p6gW009559@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/deskbar-applet/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9542

Modified Files:
	deskbar-applet.spec 
Log Message:
*sigh*


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/FC-3/deskbar-applet.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- deskbar-applet.spec	13 Apr 2006 02:49:43 -0000	1.5
+++ deskbar-applet.spec	13 Apr 2006 02:51:04 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           deskbar-applet
 Version:        0.2
-Release:        4
+Release:        4%{?dist}
 Summary:        A Gnome applet to allow easy access to various search engines
 Group:          Applications/Internet
 License:        GPL



From fedora-extras-commits at redhat.com  Thu Apr 13 06:42:27 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Wed, 12 Apr 2006 23:42:27 -0700
Subject: rpms/xmms-cdread/FC-4 xmms-cdread.spec,1.9,1.10
Message-ID: <200604130642.k3D6gT8T019888@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/xmms-cdread/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19871

Modified Files:
	xmms-cdread.spec 
Log Message:
revert back to Requires xmms


Index: xmms-cdread.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-cdread/FC-4/xmms-cdread.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xmms-cdread.spec	12 Apr 2006 20:03:10 -0000	1.9
+++ xmms-cdread.spec	13 Apr 2006 06:42:27 -0000	1.10
@@ -3,14 +3,14 @@
 Summary:	Digital audio CD input plugin for XMMS
 Name:		xmms-cdread
 Version:	0.14
-Release:        10%{?dist}
+Release:        11%{?dist}
 License:	GPL
 Group:		Applications/Multimedia
 URL:		http://www.xmms.org/
 Source:		ftp://ftp.stack.nl/pub/users/willem/xmms-cdread-0.14a.tar.gz
 Patch1:		xmms-cdread-shuffle.patch
 Patch2:		xmms-cdread-x86_64.patch
-Requires:	xmms-libs
+Requires:	xmms
 BuildRequires:	gtk+-devel glib-devel xmms-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -47,6 +47,9 @@
 %exclude %{xmmsinputdir}/libcdread.la
 
 %changelog
+* Thu Apr 13 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.14-11
+- revert to Requires xmms
+
 * Sat Apr  8 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.14-10
 - changed Requires xmms -> xmms-libs
 



From fedora-extras-commits at redhat.com  Thu Apr 13 07:56:50 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 13 Apr 2006 00:56:50 -0700
Subject: rpms/cernlib/devel cernlib.spec,1.24,1.25
Message-ID: <200604130756.k3D7uqP7022334@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	cernlib.spec 
Log Message:
dont apply rceta patch, allready done in patchy-unpack-rceta


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- cernlib.spec	12 Apr 2006 17:42:16 -0000	1.24
+++ cernlib.spec	13 Apr 2006 07:56:50 -0000	1.25
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       16%{?dist}
+Release:       16%{?dist}.1
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -215,6 +215,8 @@
 Patch1207: cernlib-v107z0_X_before_string.diff
 
 # patchy 4
+# not applied as it has allready been done by the sed one-liner in 
+# patchy-unpack-rceta
 Patch1500: patchy-rceta.patch
 Patch1501: patchy-insecure_tmp_use.diff
 Patch1502: patchy-fcasplit.patch
@@ -349,7 +351,8 @@
 # patch patchy 4 installer fortran generator script
 # avtually it is unusefull, because the unpacking has been done
 # offline, see comment above.
-%patch -P 1500
+#%patch -P 1500
+
 %patch -P 1501
 
 # unpack the patchy version 4 sources is done offline,
@@ -827,7 +830,7 @@
 
 
 %changelog
-* Wed Apr 12 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-16
+* Wed Apr 12 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-16.1
 - unpack patchy offline because the files are within an unformatted
   fortran file which won't be right on all the arches.
 



From fedora-extras-commits at redhat.com  Thu Apr 13 08:55:20 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 13 Apr 2006 01:55:20 -0700
Subject: rpms/plone/devel .cvsignore, 1.8, 1.9 plone.spec, 1.12, 1.13 sources,
	1.8, 1.9
Message-ID: <200604130855.k3D8tMwk024598@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	.cvsignore plone.spec sources 
Log Message:
fix bug 188886 (CVE-2006-1711)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plone/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	21 Feb 2006 23:58:31 -0000	1.8
+++ .cvsignore	13 Apr 2006 08:55:20 -0000	1.9
@@ -1 +1,2 @@
 Plone-2.1.2.tar.gz
+PloneHotfix20060410.tar.gz


Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/devel/plone.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- plone.spec	21 Feb 2006 23:58:31 -0000	1.12
+++ plone.spec	13 Apr 2006 08:55:20 -0000	1.13
@@ -6,12 +6,13 @@
 
 Name:           plone
 Version:        2.1.2
-Release:        1%{?dist}
+Release:        2%{?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.1.2.tar.gz
+Source1:        http://plone.org/products/plonehotfix20060410/releases/1.0/PloneHotfix20060410.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,7 +26,7 @@
 products.
 
 %prep
-%setup -q -n Plone-%{version}
+%setup -q -n Plone-%{version} -a 1
 # Clean up sources
 find . -type d -name CVS | xargs rm -rf
 find . -type f -name .cvsignore | xargs rm -rf
@@ -47,6 +48,12 @@
 rm -rf $RPM_BUILD_ROOT
 
 
+%post
+if [ "$1" -ge "2" ]; then # upgrade
+    /sbin/service zope condrestart >/dev/null 2>&1
+fi
+
+
 %files
 %defattr(644,root,root,755)
 %doc README.txt CONTENTS.txt
@@ -54,6 +61,12 @@
 
 
 %changelog
+* Thu Apr 13 2006 Aurelien Bompard <gauret[AT]free.fr> 2.1.2-2
+- apply Plone Hotfix 2006-04-10 to fix CVE-2006-1711
+- restart Zope on upgrade (will migrate it to %%postun for the
+  next release, but we need to make sure zope is restarted for
+  this one (security)
+
 * Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 2.1.2-1
 - version 2.1.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plone/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	21 Feb 2006 23:58:31 -0000	1.8
+++ sources	13 Apr 2006 08:55:20 -0000	1.9
@@ -1 +1,2 @@
 863311e29550f9b4bf6c2502fdbed1fa  Plone-2.1.2.tar.gz
+fecdb36acae4751f6a8975c2068247c3  PloneHotfix20060410.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 13 08:55:14 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 13 Apr 2006 01:55:14 -0700
Subject: rpms/plone/FC-4 .cvsignore, 1.6, 1.7 plone.spec, 1.10, 1.11 sources,
	1.6, 1.7
Message-ID: <200604130855.k3D8tkWb024607@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	.cvsignore plone.spec sources 
Log Message:
fix bug 188886 (CVE-2006-1711)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 Sep 2005 21:38:54 -0000	1.6
+++ .cvsignore	13 Apr 2006 08:55:13 -0000	1.7
@@ -1 +1,2 @@
-Plone-2.1.tar.gz
+Plone-2.1.2.tar.gz
+PloneHotfix20060410.tar.gz


Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-4/plone.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- plone.spec	8 Sep 2005 21:38:54 -0000	1.10
+++ plone.spec	13 Apr 2006 08:55:13 -0000	1.11
@@ -1,17 +1,18 @@
 %define python_minver 2.3.4
-%define zope_minver 2.7.0
+%define zope_minver 2.7.8
 
 %define zope_home      %{_libdir}/zope
 %define software_home  %{zope_home}/lib/python
 
 Name:           plone
-Version:        2.1
-Release:        1%{?dist}
+Version:        2.1.2
+Release:        2%{?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.1.tar.gz
+Source0:        http://dl.sf.net/plone/Plone-2.1.2.tar.gz
+Source1:        http://plone.org/products/plonehotfix20060410/releases/1.0/PloneHotfix20060410.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,7 +26,7 @@
 products.
 
 %prep
-%setup -q -n Plone-%{version}
+%setup -q -n Plone-%{version} -a 1
 # Clean up sources
 find . -type d -name CVS | xargs rm -rf
 find . -type f -name .cvsignore | xargs rm -rf
@@ -47,6 +48,12 @@
 rm -rf $RPM_BUILD_ROOT
 
 
+%post
+if [ "$1" -ge "2" ]; then # upgrade
+    /sbin/service zope condrestart >/dev/null 2>&1
+fi
+
+
 %files
 %defattr(644,root,root,755)
 %doc README.txt CONTENTS.txt
@@ -54,6 +61,18 @@
 
 
 %changelog
+* Thu Apr 13 2006 Aurelien Bompard <gauret[AT]free.fr> 2.1.2-2
+- apply Plone Hotfix 2006-04-10 to fix CVE-2006-1711
+- restart Zope on upgrade (will migrate it to %%postun for the
+  next release, but we need to make sure zope is restarted for
+  this one (security)
+
+* Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 2.1.2-1
+- version 2.1.2
+
+* Sat Oct 22 2005 Aurelien Bompard <gauret[AT]free.fr> 2.1.1-1
+- version 2.1.1
+
 * Thu Sep 08 2005 Aurelien Bompard <gauret[AT]free.fr> 2.1-1
 - version 2.1 final
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	8 Sep 2005 21:38:54 -0000	1.6
+++ sources	13 Apr 2006 08:55:13 -0000	1.7
@@ -1 +1,2 @@
-a72efb9aace662ac8f81f3f66ad7c44c  Plone-2.1.tar.gz
+863311e29550f9b4bf6c2502fdbed1fa  Plone-2.1.2.tar.gz
+fecdb36acae4751f6a8975c2068247c3  PloneHotfix20060410.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 13 08:55:14 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 13 Apr 2006 01:55:14 -0700
Subject: rpms/plone/FC-5 .cvsignore, 1.8, 1.9 plone.spec, 1.12, 1.13 sources,
	1.8, 1.9
Message-ID: <200604130855.k3D8tk7p024612@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	.cvsignore plone.spec sources 
Log Message:
fix bug 188886 (CVE-2006-1711)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	21 Feb 2006 23:58:31 -0000	1.8
+++ .cvsignore	13 Apr 2006 08:55:14 -0000	1.9
@@ -1 +1,2 @@
 Plone-2.1.2.tar.gz
+PloneHotfix20060410.tar.gz


Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-5/plone.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- plone.spec	21 Feb 2006 23:58:31 -0000	1.12
+++ plone.spec	13 Apr 2006 08:55:14 -0000	1.13
@@ -6,12 +6,13 @@
 
 Name:           plone
 Version:        2.1.2
-Release:        1%{?dist}
+Release:        2%{?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.1.2.tar.gz
+Source1:        http://plone.org/products/plonehotfix20060410/releases/1.0/PloneHotfix20060410.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,7 +26,7 @@
 products.
 
 %prep
-%setup -q -n Plone-%{version}
+%setup -q -n Plone-%{version} -a 1
 # Clean up sources
 find . -type d -name CVS | xargs rm -rf
 find . -type f -name .cvsignore | xargs rm -rf
@@ -47,6 +48,12 @@
 rm -rf $RPM_BUILD_ROOT
 
 
+%post
+if [ "$1" -ge "2" ]; then # upgrade
+    /sbin/service zope condrestart >/dev/null 2>&1
+fi
+
+
 %files
 %defattr(644,root,root,755)
 %doc README.txt CONTENTS.txt
@@ -54,6 +61,12 @@
 
 
 %changelog
+* Thu Apr 13 2006 Aurelien Bompard <gauret[AT]free.fr> 2.1.2-2
+- apply Plone Hotfix 2006-04-10 to fix CVE-2006-1711
+- restart Zope on upgrade (will migrate it to %%postun for the
+  next release, but we need to make sure zope is restarted for
+  this one (security)
+
 * Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 2.1.2-1
 - version 2.1.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	21 Feb 2006 23:58:31 -0000	1.8
+++ sources	13 Apr 2006 08:55:14 -0000	1.9
@@ -1 +1,2 @@
 863311e29550f9b4bf6c2502fdbed1fa  Plone-2.1.2.tar.gz
+fecdb36acae4751f6a8975c2068247c3  PloneHotfix20060410.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 13 09:14:14 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 13 Apr 2006 02:14:14 -0700
Subject: rpms/php-json/devel .cvsignore, 1.3, 1.4 php-json.html, 1.2,
	1.3 php-json.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200604130914.k3D9EGaA026858@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/php-json/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26835

Modified Files:
	.cvsignore php-json.html php-json.spec sources 
Log Message:
- Upstream update
- Added Requires on php-api (#186903)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-json/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 Feb 2006 05:03:16 -0000	1.3
+++ .cvsignore	13 Apr 2006 09:14:14 -0000	1.4
@@ -1 +1 @@
-php-json-ext-1.1.1.tar.bz2
+php-json-ext-1.2.1.tar.bz2


Index: php-json.html
===================================================================
RCS file: /cvs/extras/rpms/php-json/devel/php-json.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-json.html	14 Feb 2006 05:03:16 -0000	1.2
+++ php-json.html	13 Apr 2006 09:14:14 -0000	1.3
@@ -28,8 +28,10 @@
 	<td valign="top" class="full_width">
 	<!-- START CONTENT -->
 	<h1>php-json</h1>
-        <p><b>php-json</b> is an extremely fast PHP C extension for <a href="http://www.json.org/">JSON</a> (JavaScript Object Notation) serialisation. <b>php-json</b> uses a forked version of <a href="http://oss.metaparadigm.com/json-c/">json-c</a>.</p>
+        <p><b>php-json</b> is an extremely fast PHP C extension for <a href="http://www.json.org/">JSON</a> (JavaScript Object Notation) serialisation.</p>
         <h2>Download</h2>
+        <p>Version <a href="/projects/php-json/php-json-ext-1.2.1.tar.bz2">1.2.1</a> (<a href="/projects/php-json/php-json-4.3.2_1.2.1-1.aurore.src.rpm">SRPM</a>, <a href="http://pecl4win.php.net/ext.php/php_json.dll">Win32</a>) - Released 2006-04-01 - Rework comma insertion during encoding.</p>
+        <p>Version <a href="/projects/php-json/php-json-ext-1.2.0.tar.bz2">1.2.0</a> (<a href="/projects/php-json/php-json-4.3.2_1.2.0-1.aurore.src.rpm">SRPM</a>, <a href="http://pecl4win.php.net/ext.php/php_json.dll">Win32</a>) - Released 2006-03-14 - Complete rewrite using <a href="http://www.json.org/JSON_checker/">JSON_checker</a> as the base for the parser. Implements the <a href="http://www.ietf.org/internet-drafts/draft-crockford-jsonorg-json-04.txt">JSON specification</a>. Significant performance improvement on encoding.</p>
         <p>Version <a href="/projects/php-json/php-json-ext-1.1.1.tar.bz2">1.1.1</a> (<a href="/projects/php-json/php-json-4.3.2_1.1.1-1.aurore.src.rpm">SRPM</a>, <a href="win32/">Win32</a>) - Released 2006-01-25 - TSRM performance improvements, changed license to version 3.01 of the PHP license, avoid a potential memory leak on invalid JSON input.</p>
         <p>Version <a href="/projects/php-json/php-json-ext-1.1.0.tar.bz2">1.1.0</a> (<a href="/projects/php-json/php-json-4.3.2_1.1.0-1.aurore.src.rpm">SRPM</a>, <b>Win32</b>: <a href="/projects/php-json/php_json-1.1.0_php-4.x.zip">PHP 4.x</a>, <a href="/projects/php-json/php_json-1.1.0_php-5.0.x.zip">PHP 5.0.x</a>, <a href="/projects/php-json/php_json-1.1.0_php-5.1.x.zip">PHP 5.1.x</a>) - Released 2005-12-04 - Port to Win32.</p>
         <p>Version <a href="/projects/php-json/php-json-ext-1.0.8.tar.bz2">1.0.8</a> (<a href="/projects/php-json/php-json-4.3.2_1.0.8-1.aurore.src.rpm">SRPM</a>) - Released 2005-12-01 - Changed license to LGPL, modified build system to allow static compilation into PHP, added strndup check for json-c.</p>


Index: php-json.spec
===================================================================
RCS file: /cvs/extras/rpms/php-json/devel/php-json.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- php-json.spec	14 Feb 2006 05:03:16 -0000	1.4
+++ php-json.spec	13 Apr 2006 09:14:14 -0000	1.5
@@ -1,8 +1,9 @@
 %define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4)
 %{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo 4.3.11)}
+%define php_apiver %({ phpize --version || echo "PHP Api Version: 0" ; } | grep -i "php api" | sed 's/[^0-9]//g')
 
 Name:           php-json
-Version:        1.1.1
+Version:        1.2.1
 Release:        1%{?dist}
 Summary:        An extremely fast PHP extension for JSON
 
@@ -14,7 +15,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  php-devel
-Requires:       php = %{php_version}
+Requires:       php-api = %{php_apiver}
 
 %description
 php-json is an extremely fast PHP C extension for JSON (JavaScript Object
@@ -63,6 +64,10 @@
 %{php_extdir}/json.so
 
 %changelog
+* Thu Apr 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.1-1
+- Upstream update
+- Added Requires on php-api (#186903)
+
 * Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.1.1-1
 - Upstream update
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-json/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 Feb 2006 05:03:16 -0000	1.3
+++ sources	13 Apr 2006 09:14:14 -0000	1.4
@@ -1 +1 @@
-d884a5ca7ddb420b5b261941217f6c68  php-json-ext-1.1.1.tar.bz2
+e06e701412a055f3372775216ec3d604  php-json-ext-1.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Apr 13 09:17:32 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 13 Apr 2006 02:17:32 -0700
Subject: rpms/php-json/FC-5 php-json.spec,1.4,1.5
Message-ID: <200604130917.k3D9HYfM026926@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/php-json/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26909

Modified Files:
	php-json.spec 
Log Message:
Added Requires on php-api (#186903)


Index: php-json.spec
===================================================================
RCS file: /cvs/extras/rpms/php-json/FC-5/php-json.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- php-json.spec	14 Feb 2006 05:03:16 -0000	1.4
+++ php-json.spec	13 Apr 2006 09:17:32 -0000	1.5
@@ -1,9 +1,10 @@
 %define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4)
 %{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo 4.3.11)}
+%define php_apiver %({ phpize --version || echo "PHP Api Version: 0" ; } | grep -i "php api" | sed 's/[^0-9]//g')
 
 Name:           php-json
 Version:        1.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An extremely fast PHP extension for JSON
 
 Group:          Development/Languages
@@ -14,7 +15,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  php-devel
-Requires:       php = %{php_version}
+Requires:       php-api = %{php_apiver}
 
 %description
 php-json is an extremely fast PHP C extension for JSON (JavaScript Object
@@ -63,6 +64,9 @@
 %{php_extdir}/json.so
 
 %changelog
+* Thu Apr 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.1.1-2
+- Added Requires on php-api (#186903)
+
 * Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.1.1-1
 - Upstream update
 



From fedora-extras-commits at redhat.com  Thu Apr 13 09:45:48 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Thu, 13 Apr 2006 02:45:48 -0700
Subject: kadischi/doc COPYING, 1.1, NONE CREDITS, 1.2, NONE FAQ, 1.3,
	NONE INSTALL, 1.5, NONE Makefile.am, 1.2, NONE NEWS, 1.1.1.1,
	NONE README, 1.8, NONE TODO, 1.5, NONE
Message-ID: <200604130945.k3D9jmfM027074@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi/doc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27038/kadischi/doc

Removed Files:
	COPYING CREDITS FAQ INSTALL Makefile.am NEWS README TODO 
Log Message:
Juggle doc/ files into base kadischi directory


--- COPYING DELETED ---


--- CREDITS DELETED ---


--- FAQ DELETED ---


--- INSTALL DELETED ---


--- Makefile.am DELETED ---


--- NEWS DELETED ---


--- README DELETED ---


--- TODO DELETED ---



From fedora-extras-commits at redhat.com  Thu Apr 13 09:45:47 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Thu, 13 Apr 2006 02:45:47 -0700
Subject: kadischi COPYING, NONE, 1.1 CREDITS, NONE, 1.1 FAQ, NONE,
	1.1 INSTALL, NONE, 1.1 NEWS, NONE, 1.1 README, NONE, 1.1 TODO,
	NONE, 1.1 Makefile.am, 1.3, 1.4 configure.ac, 1.4,
	1.5 kadischi.spec, 1.3, 1.4
Message-ID: <200604130945.k3D9jlUX027070@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27038/kadischi

Modified Files:
	Makefile.am configure.ac kadischi.spec 
Added Files:
	COPYING CREDITS FAQ INSTALL NEWS README TODO 
Log Message:
Juggle doc/ files into base kadischi directory


--- NEW FILE COPYING ---
		    GNU GENERAL PUBLIC LICENSE
		       Version 2, June 1991

 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

			    Preamble

  The licenses for most software are designed to take away your
freedom to share and change it.  By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users.  This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it.  (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.)  You can apply it to
your programs, too.

  When we speak of free software, we are referring to freedom, not
price.  Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.

  To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.

  For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that
you have.  You must make sure that they, too, receive or can get the
source code.  And you must show them these terms so they know their
rights.

  We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.

  Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software.  If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.

  Finally, any free program is threatened constantly by software
patents.  We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary.  To prevent this, we have made it clear that any
patent must be licensed for everyone's free use or not licensed at all.

  The precise terms and conditions for copying, distribution and
modification follow.

		    GNU GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License.  The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language.  (Hereinafter, translation is included without limitation in
the term "modification".)  Each licensee is addressed as "you".

Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope.  The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.

  1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.

You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.

  2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:

    a) You must cause the modified files to carry prominent notices
    stating that you changed the files and the date of any change.

    b) You must cause any work that you distribute or publish, that in
    whole or in part contains or is derived from the Program or any
    part thereof, to be licensed as a whole at no charge to all third
    parties under the terms of this License.

    c) If the modified program normally reads commands interactively
    when run, you must cause it, when started running for such
    interactive use in the most ordinary way, to print or display an
    announcement including an appropriate copyright notice and a
    notice that there is no warranty (or else, saying that you provide
    a warranty) and that users may redistribute the program under
    these conditions, and telling the user how to view a copy of this
    License.  (Exception: if the Program itself is interactive but
    does not normally print such an announcement, your work based on
    the Program is not required to print an announcement.)

These requirements apply to the modified work as a whole.  If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works.  But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.

Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.

In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.

  3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:

    a) Accompany it with the complete corresponding machine-readable
    source code, which must be distributed under the terms of Sections
    1 and 2 above on a medium customarily used for software interchange; or,

    b) Accompany it with a written offer, valid for at least three
    years, to give any third party, for a charge no more than your
    cost of physically performing source distribution, a complete
    machine-readable copy of the corresponding source code, to be
    distributed under the terms of Sections 1 and 2 above on a medium
    customarily used for software interchange; or,

    c) Accompany it with the information you received as to the offer
    to distribute corresponding source code.  (This alternative is
    allowed only for noncommercial distribution and only if you
    received the program in object code or executable form with such
    an offer, in accord with Subsection b above.)

The source code for a work means the preferred form of the work for
making modifications to it.  For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable.  However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.

If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.

  4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License.  Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.

  5. You are not required to accept this License, since you have not
signed it.  However, nothing else grants you permission to modify or
distribute the Program or its derivative works.  These actions are
prohibited by law if you do not accept this License.  Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.

  6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions.  You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.

  7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License.  If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all.  For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.

If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.

It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices.  Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.

This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.

  8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded.  In such case, this License incorporates
the limitation as if written in the body of this License.

  9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time.  Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.

Each version is given a distinguishing version number.  If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation.  If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.

  10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission.  For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this.  Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.

			    NO WARRANTY

  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.

  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.

		     END OF TERMS AND CONDITIONS

	    How to Apply These Terms to Your New Programs

  If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.

  To do so, attach the following notices to the program.  It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.

    <one line to give the program's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA


Also add information on how to contact you by electronic and paper mail.

If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:

    Gnomovision version 69, Copyright (C) year name of author
    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.

The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License.  Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.

You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary.  Here is a sample; alter the names:

  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
  `Gnomovision' (which makes passes at compilers) written by James Hacker.

  <signature of Ty Coon>, 1 April 1989
  Ty Coon, President of Vice

This General Public License does not permit incorporating your program into
proprietary programs.  If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library.  If this is what you want to do, use the GNU Library General
Public License instead of this License.


--- NEW FILE CREDITS ---
Kadischi is heavily based on readonly-root
(http://people.redhat.com/dmalcolm/stateless/SRPMS/readonly-root-0.10-1.src.rpm)
package from Stateless-linux (http://fedora.redhat.com/projects/stateless/) project.

Many design decisions are collective work of people from fedora-livecd list
(https://www.redhat.com/mailman/listinfo/fedora-livecd-list/).

There are also some ideas taken from linux4all project (www.linux4all.de).

The name for the project came from Elliot Lee (sopwith at redhat.com).

Darko Ilic (darko.ilic at gmail.com) was the previous project maintainer. Now the Kadischi
Project is maintained by the community.

Since the project was started as one of the Google`s Summer of Code projects,
some credits also goes to Google ;)

Since 10 January 2005, the Kadischi Fedora Live CD Project is mainly maintained by
the community . The names of the Contributors are listed here :
(http://fedoraproject.org/wiki/Kadischi/Contributors#contributors)

--- NEW FILE FAQ ---
http://fedoraproject.org/wiki/Kadischi/FAQ

--- NEW FILE INSTALL ---
THESE ARE BASIC INSTRUCTIONS.

IT IS STRONGLY RECOMMENDED TO CONSULT KADISCHI TUTORIAL
(http://fedoraproject.org/wiki/Kadischi/Documentation) BEFORE PERFORMING THE INSTALLATION.

*******************************************************

Go to the Kadischi source directory and type

./autogen.sh
make
make install

patch -b /usr/sbin/anaconda patches/anaconda.patch
patch -b /usr/lib/anaconda/flags.py patches/flags.py.patch

Edit /etc/kadischi/build.conf and set BUILDDIR variable.

*******************************************************

BUILDDIR is a directory that will be used for storing temporary files (temporary
installation will be performed in that directory). You will need
approximately 1.5x size of desired installation available on that device. 3GB
works fine for me.

If you are using other repository than Fedora, you would have to use custom
buildstamp file or to edit the default one (/etc/kadischi/buildstamp).

For more details, check out http://fedoraproject.org/wiki/Kadischi/Documentation

--- NEW FILE NEWS ---


--- NEW FILE README ---
Kadischi : The Fedora Live CD Project

Kadischi is an application for Fedora-based Live CD generation. It takes Fedora
repository as an input and outputs a livecd iso image.

Kadischi is still in the early stage of development, but has basic functionality
and can be run successfully.

Kadischi's home page is http://fedoraproject.org/wiki/Kadischi

Kadischi tutorial can be found here http://fedoraproject.org/wiki/Kadischi/Documentation

--- NEW FILE TODO ---
Fresh TODO list can be found at http://fedoraproject.org/wiki/Kadischi/Schedule

Index: Makefile.am
===================================================================
RCS file: /cvs/devel/kadischi/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.am	30 Mar 2006 05:46:04 -0000	1.3
+++ Makefile.am	13 Apr 2006 09:45:45 -0000	1.4
@@ -2,7 +2,6 @@
 
 SUBDIRS =			\
 	conf		\
-	doc			\
 	find_live_cd	\
 	ks_examples			\
 	lib			\


Index: configure.ac
===================================================================
RCS file: /cvs/devel/kadischi/configure.ac,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- configure.ac	30 Mar 2006 05:46:04 -0000	1.4
+++ configure.ac	13 Apr 2006 09:45:45 -0000	1.5
@@ -48,7 +48,6 @@
 AC_OUTPUT([
 Makefile
 conf/Makefile
-doc/Makefile
 find_live_cd/Makefile
 ks_examples/Makefile
 lib/Makefile


Index: kadischi.spec
===================================================================
RCS file: /cvs/devel/kadischi/kadischi.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kadischi.spec	11 Apr 2006 16:16:26 -0000	1.3
+++ kadischi.spec	13 Apr 2006 09:45:45 -0000	1.4
@@ -45,7 +45,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc
+%doc FAQ README NEWS TODO COPYING CREDITS
 %dir %{_datadir}/%{name}
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/buildstamp



From fedora-extras-commits at redhat.com  Thu Apr 13 09:54:33 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 13 Apr 2006 02:54:33 -0700
Subject: rpms/gnochm/devel gnochm.spec,1.1,1.2
Message-ID: <200604130954.k3D9sZYO027113@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	gnochm.spec 
Log Message:
* Thu Apr 13 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-3
- Add mimetype to .desktop file (188809)



Index: gnochm.spec
===================================================================
RCS file: /cvs/extras/rpms/gnochm/devel/gnochm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnochm.spec	8 Apr 2006 21:55:34 -0000	1.1
+++ gnochm.spec	13 Apr 2006 09:54:33 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gnochm
 Version:        0.9.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        CHM file viewer
 
 Group:          Applications/Publishing
@@ -19,6 +19,8 @@
 BuildRequires:  scrollkeeper
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 BuildRequires: desktop-file-utils
 
 %description
@@ -46,6 +48,8 @@
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 
+echo "MimeType=application/x-chm" >> $RPM_BUILD_ROOT%{_datadir}/applications/gnochm.desktop
+
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
         --add-category X-Fedora                                 \
@@ -78,6 +82,8 @@
 
 update-mime-database %{_datadir}/mime &> /dev/null || :
 
+update-desktop-database &> /dev/null ||:
+
 %preun
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -91,6 +97,8 @@
 
 update-mime-database %{_datadir}/mime &> /dev/null || :
 
+update-desktop-database &> /dev/null ||:
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README
@@ -109,5 +117,8 @@
 %{_datadir}/pixmaps/gnochm*.png
 
 %changelog
+* Thu Apr 13 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-3
+- Add mimetype to .desktop file (188809)
+
 * Sun Mar 12 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-2
 - Fedora Extras submission, loosely based on Dag.



From fedora-extras-commits at redhat.com  Thu Apr 13 09:56:36 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 13 Apr 2006 02:56:36 -0700
Subject: rpms/gnochm/devel gnochm.spec,1.2,1.3
Message-ID: <200604130956.k3D9uchY027211@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	gnochm.spec 
Log Message:
bump release


Index: gnochm.spec
===================================================================
RCS file: /cvs/extras/rpms/gnochm/devel/gnochm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnochm.spec	13 Apr 2006 09:54:33 -0000	1.2
+++ gnochm.spec	13 Apr 2006 09:56:36 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gnochm
 Version:        0.9.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        CHM file viewer
 
 Group:          Applications/Publishing
@@ -117,7 +117,7 @@
 %{_datadir}/pixmaps/gnochm*.png
 
 %changelog
-* Thu Apr 13 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-3
+* Thu Apr 13 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-4
 - Add mimetype to .desktop file (188809)
 
 * Sun Mar 12 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-2



From fedora-extras-commits at redhat.com  Thu Apr 13 10:15:11 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 13 Apr 2006 03:15:11 -0700
Subject: rpms/psi/FC-5 psi.spec,1.15,1.16 sources,1.9,1.10
Message-ID: <200604131015.k3DAFDek029410@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	psi.spec sources 
Log Message:
update translations


Index: psi.spec
===================================================================
RCS file: /cvs/extras/rpms/psi/FC-5/psi.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- psi.spec	21 Feb 2006 17:57:38 -0000	1.15
+++ psi.spec	13 Apr 2006 10:15:11 -0000	1.16
@@ -3,7 +3,7 @@
 
 Name:       psi
 Version:    0.10
-Release:    3%{?dist}
+Release:    4%{?dist}
 Summary:    Jabber client based on Qt
 License:    GPL
 Group:      Applications/Internet
@@ -165,6 +165,9 @@
 
 
 %changelog
+* Thu Apr 13 2006 Aurelien Bompard <gauret[AT]free.fr> 0.10-4
+- update translations for CS, DE, ET and VI
+
 * Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 0.10-3
 - rebuild for FC5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/psi/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	21 Feb 2006 17:57:38 -0000	1.9
+++ sources	13 Apr 2006 10:15:11 -0000	1.10
@@ -2,4 +2,4 @@
 1b4b3374c676c330c87e2ef0cd9109fa  emoticons-0.10.tar.gz
 a359e33b1f2a8a80066771ebfbf4a916  systemicons-0.9.3.tar.gz
 51386c12abbee7100f092455bfb88bf1  rostericons-0.10.tar.gz
-fcdcddda66b4e52008f832ebedae8053  psi-lang-packs-0.10.tar.gz
+621a521ccd90a1e0272081e1a5ec7620  psi-lang-packs-0.10.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 13 10:15:12 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 13 Apr 2006 03:15:12 -0700
Subject: rpms/psi/devel psi.spec,1.15,1.16 sources,1.9,1.10
Message-ID: <200604131015.k3DAFEng029415@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	psi.spec sources 
Log Message:
update translations


Index: psi.spec
===================================================================
RCS file: /cvs/extras/rpms/psi/devel/psi.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- psi.spec	21 Feb 2006 17:57:38 -0000	1.15
+++ psi.spec	13 Apr 2006 10:15:12 -0000	1.16
@@ -3,7 +3,7 @@
 
 Name:       psi
 Version:    0.10
-Release:    3%{?dist}
+Release:    4%{?dist}
 Summary:    Jabber client based on Qt
 License:    GPL
 Group:      Applications/Internet
@@ -165,6 +165,9 @@
 
 
 %changelog
+* Thu Apr 13 2006 Aurelien Bompard <gauret[AT]free.fr> 0.10-4
+- update translations for CS, DE, ET and VI
+
 * Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 0.10-3
 - rebuild for FC5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/psi/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	21 Feb 2006 17:57:38 -0000	1.9
+++ sources	13 Apr 2006 10:15:12 -0000	1.10
@@ -2,4 +2,4 @@
 1b4b3374c676c330c87e2ef0cd9109fa  emoticons-0.10.tar.gz
 a359e33b1f2a8a80066771ebfbf4a916  systemicons-0.9.3.tar.gz
 51386c12abbee7100f092455bfb88bf1  rostericons-0.10.tar.gz
-fcdcddda66b4e52008f832ebedae8053  psi-lang-packs-0.10.tar.gz
+621a521ccd90a1e0272081e1a5ec7620  psi-lang-packs-0.10.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 13 10:15:11 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 13 Apr 2006 03:15:11 -0700
Subject: rpms/psi/FC-4 psi.spec,1.13,1.14 sources,1.7,1.8
Message-ID: <200604131015.k3DAFDYX029407@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	psi.spec sources 
Log Message:
update translations


Index: psi.spec
===================================================================
RCS file: /cvs/extras/rpms/psi/FC-4/psi.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- psi.spec	12 Jan 2006 19:03:32 -0000	1.13
+++ psi.spec	13 Apr 2006 10:15:10 -0000	1.14
@@ -3,11 +3,11 @@
 
 Name:       psi
 Version:    0.10
-Release:    1%{?dist}
+Release:    4%{?dist}
 Summary:    Jabber client based on Qt
 License:    GPL
 Group:      Applications/Internet
-URL:        http://psi.affinix.com/
+URL:        http://psi-im.org
 #Source0:    http://people.ex.ac.uk/kismith/psi/psi-0.10-test2.tar.bz2
 Source0:    http://dl.sf.net/psi/psi-0.10.tar.bz2
 Source2:    psi-uicwrapper.sh
@@ -28,12 +28,12 @@
 Requires:    gnupg
 
 # Language packs
-Source10:   psi-lang-packs-0.9.3.tar.gz
+Source10:   psi-lang-packs-0.10.tar.gz
 
 # Iconsets
-Source11:   emoticons-0.9.3.tar.gz
-Source12:   rostericons-0.9.3.tar.gz
-Source13:   systemicons-0.9.3.tar.gz
+Source11:   emoticons-0.10.tar.gz
+Source12:   rostericons-0.10.tar.gz
+#Source13:   systemicons-0.9.3.tar.gz
 
 
 
@@ -113,7 +113,7 @@
 ## Install iconsets
 tar -xzpf %{SOURCE11} -C $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
 tar -xzpf %{SOURCE12} -C $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/
-tar -xzpf %{SOURCE13} -C $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/system/
+#tar -xzpf %{SOURCE13} -C $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/system/
 
 
 # Menu
@@ -165,6 +165,12 @@
 
 
 %changelog
+* Thu Apr 13 2006 Aurelien Bompard <gauret[AT]free.fr> 0.10-4
+- update translations for CS, DE, ET and VI
+
+* Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 0.10-3
+- rebuild for FC5
+
 * Thu Jan 12 2006 Aurelien Bompard <gauret[AT]free.fr> 0.10-1
 - version 0.10 final
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/psi/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	12 Jan 2006 19:03:32 -0000	1.7
+++ sources	13 Apr 2006 10:15:10 -0000	1.8
@@ -1,5 +1,5 @@
 f0fd4ccf077f7b24e236f71c22649b7b  psi-0.10.tar.bz2
-0310084bf278d59831e4cac863e9060e  emoticons-0.9.3.tar.gz
+1b4b3374c676c330c87e2ef0cd9109fa  emoticons-0.10.tar.gz
 a359e33b1f2a8a80066771ebfbf4a916  systemicons-0.9.3.tar.gz
-79ade28d67356a4bdd57c850cc2ed6c8  rostericons-0.9.3.tar.gz
-57864bcb92feda6525cfade29f12c713  psi-lang-packs-0.9.3.tar.gz
+51386c12abbee7100f092455bfb88bf1  rostericons-0.10.tar.gz
+621a521ccd90a1e0272081e1a5ec7620  psi-lang-packs-0.10.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 13 10:55:15 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Thu, 13 Apr 2006 03:55:15 -0700
Subject: rpms/abiword/devel abiword-2.4.4-docbuild.patch, NONE,
	1.1 abiword.spec, 1.34, 1.35 abiword-2.4.2-desktop.patch, 1.1, NONE
Message-ID: <200604131055.k3DAtH8B029632@cvs-int.fedora.redhat.com>

Author: uwog

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

Modified Files:
	abiword.spec 
Added Files:
	abiword-2.4.4-docbuild.patch 
Removed Files:
	abiword-2.4.2-desktop.patch 
Log Message:
Fix documentation generation, and enable charting support



abiword-2.4.4-docbuild.patch:

--- NEW FILE abiword-2.4.4-docbuild.patch ---
diff -r -u abiword-2.4.4.orig/abiword-docs/make-dbk.sh abiword-2.4.4/abiword-docs/make-dbk.sh
--- abiword-2.4.4.orig/abiword-docs/make-dbk.sh	2006-04-12 23:16:57.000000000 +0200
+++ abiword-2.4.4/abiword-docs/make-dbk.sh	2006-04-12 23:20:18.000000000 +0200
@@ -33,7 +33,7 @@
 		      echo $i
 
 		      # save to docbook, rename to .xml
-		      AbiWord-2.0 --to=dbk $i 2>/dev/null
+		      AbiWord-2.4 --to=dbk $i 2>/dev/null
 		      mv $n.dbk $n.xml
 		done
 
diff -r -u abiword-2.4.4.orig/abiword-docs/make-gnome-html.sh abiword-2.4.4/abiword-docs/make-gnome-html.sh
--- abiword-2.4.4.orig/abiword-docs/make-gnome-html.sh	2006-04-12 23:16:57.000000000 +0200
+++ abiword-2.4.4/abiword-docs/make-gnome-html.sh	2006-04-12 23:20:18.000000000 +0200
@@ -31,7 +31,7 @@
 		do
 		      n=`echo $i|cut -f1 -d .`
 		      echo $i
-		      AbiWord-2.0 --to=html $i 2>/dev/null
+		      AbiWord-2.4 --to=html $i 2>/dev/null
 		done
 
 		cd $CVS
diff -r -u abiword-2.4.4.orig/abiword-docs/make-html.sh abiword-2.4.4/abiword-docs/make-html.sh
--- abiword-2.4.4.orig/abiword-docs/make-html.sh	2006-04-12 23:16:57.000000000 +0200
+++ abiword-2.4.4/abiword-docs/make-html.sh	2006-04-12 23:20:44.000000000 +0200
@@ -30,7 +30,7 @@
 fi
 
 if [ -z "$ABI_DOC_PROG" ]; then
-ABI_DOC_PROG="AbiWord-2.2";
+ABI_DOC_PROG="AbiWord-2.4";
 fi
 
 html_export_options="html4: no; use-awml: no; embed-css: yes; embed-images:yes"
@@ -45,7 +45,7 @@
 		do
 		      n=`echo $i|cut -f1 -d .`
 		      echo $i
-		      $ABI_DOC_PROG --to=html --exp-props=$html_export_options $i 2>/dev/null
+		      $ABI_DOC_PROG --to=html --exp-props="$html_export_options" $i 2>/dev/null
 		      $CVS/make-abidoc.pl -I $n.info -S header.xhtml -F footer.xhtml > $n.xhtml
 		      cp $n.xhtml $n.html
 			rm -f $n.xhtml


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- abiword.spec	11 Apr 2006 07:56:19 -0000	1.34
+++ abiword.spec	13 Apr 2006 10:55:15 -0000	1.35
@@ -3,7 +3,7 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: 2.4.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -33,6 +33,7 @@
 BuildRequires: link-grammar-devel >= 4.2.1
 BuildRequires: gtkmathview-devel >= 0.7.5
 BuildRequires: libgsf-devel >= 1.12.1
+BuildRequires: goffice-devel >= 0.1.0
 
 # gnome build deps
 BuildRequires: libbonobo-devel
@@ -42,6 +43,7 @@
 
 Patch0: abiword-2.0.9-windowshelppaths.patch
 Patch1: abiword-2.4.4-desktop.patch
+Patch2: abiword-2.4.4-docbuild.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. The goal is to make
@@ -51,6 +53,7 @@
 %setup -q 
 %patch0 -p1 -b .windowshelppaths
 %patch1 -p1 -b .desktop
+%patch2 -p1 -b .docbuild
 
 %build
 cd abi
@@ -132,6 +135,10 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Tue Apr 13 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.4-2.fc6
+- Fix documentation generation
+- Fix charting support
+
 * Tue Apr 11 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.4-1.fc6
 - New upstream version
 - Remove the macro patch and update the desktop patch


--- abiword-2.4.2-desktop.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Apr 13 11:09:02 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 13 Apr 2006 04:09:02 -0700
Subject: owners owners.list,1.838,1.839
Message-ID: <200604131109.k3DB94MJ031942@cvs-int.fedora.redhat.com>

Author: ixs

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

Modified Files:
	owners.list 
Log Message:
perl-Authen-Radius added



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.838
retrieving revision 1.839
diff -u -r1.838 -r1.839
--- owners.list	13 Apr 2006 01:18:16 -0000	1.838
+++ owners.list	13 Apr 2006 11:09:02 -0000	1.839
@@ -847,6 +847,7 @@
 Fedora Extras|perl-AppConfig|Perl module for reading configuration files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Archive-Zip|Perl library for accessing Zip archives|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Array-Compare|Perl extension for comparing arrays|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Authen-Radius|Perl Authen::Radius modules|andreas at bawue.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Authen-SASL|SASL Authentication framework for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-BerkeleyDB|Perl interface to Berkeley DB|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Boulder|An API for hierarchical tag/value structures|orion at cora.nwra.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Thu Apr 13 11:10:36 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 13 Apr 2006 04:10:36 -0700
Subject: rpms/perl-Authen-Radius - New directory
Message-ID: <200604131110.k3DBAcAP032291@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/perl-Authen-Radius
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32265/perl-Authen-Radius

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




From fedora-extras-commits at redhat.com  Thu Apr 13 11:10:36 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 13 Apr 2006 04:10:36 -0700
Subject: rpms/perl-Authen-Radius/devel - New directory
Message-ID: <200604131110.k3DBAcfQ032294@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/perl-Authen-Radius/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32265/perl-Authen-Radius/devel

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




From fedora-extras-commits at redhat.com  Thu Apr 13 11:10:51 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 13 Apr 2006 04:10:51 -0700
Subject: rpms/perl-Authen-Radius Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604131110.k3DBArP4032343@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/perl-Authen-Radius
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32310

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


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

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

common : CVS/Root
	@cvs 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 Apr 13 11:10:52 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 13 Apr 2006 04:10:52 -0700
Subject: rpms/perl-Authen-Radius/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200604131110.k3DBAsjG032346@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/perl-Authen-Radius/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32310/devel

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


--- 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 Apr 13 11:11:25 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 13 Apr 2006 04:11:25 -0700
Subject: rpms/perl-Authen-Radius import.log,1.1,1.2
Message-ID: <200604131111.k3DBBvd0032444@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/perl-Authen-Radius
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32374

Modified Files:
	import.log 
Log Message:
auto-import perl-Authen-Radius-0.12-2 on branch devel from perl-Authen-Radius-0.12-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Authen-Radius/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Apr 2006 11:10:51 -0000	1.1
+++ import.log	13 Apr 2006 11:11:25 -0000	1.2
@@ -0,0 +1 @@
+perl-Authen-Radius-0_12-2:HEAD:perl-Authen-Radius-0.12-2.src.rpm:1144926676



From fedora-extras-commits at redhat.com  Thu Apr 13 11:11:25 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 13 Apr 2006 04:11:25 -0700
Subject: rpms/perl-Authen-Radius/devel perl-Authen-Radius.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604131111.k3DBBwFR032448@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/perl-Authen-Radius/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32374/devel

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


--- NEW FILE perl-Authen-Radius.spec ---
Name:           perl-Authen-Radius
Version:        0.12
Release:        2%{?dist}
Summary:        Perl Authen::Radius modules
License:        Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/RadiusPerl/
Source0:        http://www.cpan.org/modules/by-module/Authen/RadiusPerl-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Data::HexDump) >= 0.02
BuildRequires:  perl(Digest::MD5) >= 2.20, perl(IO) >= 1.12
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This is RadiusPerl version 0.11. RadiusPerl is a Perl 5 module (Radius.pm)
which allows you to communicate with a Radius server from Perl. You can
just authenticate usernames/passwords via Radius, or completely imitate
AAA requests and process server response.

%prep
%setup -q -n Authen-Radius-%{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} -type d -depth -exec rmdir {} 2>/dev/null \;

chmod -R u+rwX,go+rX,go-w %{buildroot}/*

%check
# Disabled check, as a running Radius-server is needed
#make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Apr 13 2006 Andreas Thienemann <andreas at bawue.net> 0.12-2
- Final cleanup for inclusion.

* Wed Mar 29 2006 Andreas Thienemann <andreas at bawue.net> 0.12-1
- Cleaned up for FE
- Specfile autogenerated by cpanspec 1.64.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Authen-Radius/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Apr 2006 11:10:52 -0000	1.1
+++ .cvsignore	13 Apr 2006 11:11:25 -0000	1.2
@@ -0,0 +1 @@
+RadiusPerl-0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Authen-Radius/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Apr 2006 11:10:52 -0000	1.1
+++ sources	13 Apr 2006 11:11:25 -0000	1.2
@@ -0,0 +1 @@
+8427f931a4e0e689ecf8ddf30e5a0ea7  RadiusPerl-0.12.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 13 11:57:11 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Thu, 13 Apr 2006 04:57:11 -0700
Subject: rpms/abiword/FC-4 abiword-2.4.4-docbuild.patch, NONE,
	1.1 abiword.spec, 1.22, 1.23
Message-ID: <200604131157.k3DBvDVi032629@cvs-int.fedora.redhat.com>

Author: uwog

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

Modified Files:
	abiword.spec 
Added Files:
	abiword-2.4.4-docbuild.patch 
Log Message:
Fix documentation generation



abiword-2.4.4-docbuild.patch:

--- NEW FILE abiword-2.4.4-docbuild.patch ---
diff -r -u abiword-2.4.4.orig/abiword-docs/make-dbk.sh abiword-2.4.4/abiword-docs/make-dbk.sh
--- abiword-2.4.4.orig/abiword-docs/make-dbk.sh	2006-04-12 23:16:57.000000000 +0200
+++ abiword-2.4.4/abiword-docs/make-dbk.sh	2006-04-12 23:20:18.000000000 +0200
@@ -33,7 +33,7 @@
 		      echo $i
 
 		      # save to docbook, rename to .xml
-		      AbiWord-2.0 --to=dbk $i 2>/dev/null
+		      AbiWord-2.4 --to=dbk $i 2>/dev/null
 		      mv $n.dbk $n.xml
 		done
 
diff -r -u abiword-2.4.4.orig/abiword-docs/make-gnome-html.sh abiword-2.4.4/abiword-docs/make-gnome-html.sh
--- abiword-2.4.4.orig/abiword-docs/make-gnome-html.sh	2006-04-12 23:16:57.000000000 +0200
+++ abiword-2.4.4/abiword-docs/make-gnome-html.sh	2006-04-12 23:20:18.000000000 +0200
@@ -31,7 +31,7 @@
 		do
 		      n=`echo $i|cut -f1 -d .`
 		      echo $i
-		      AbiWord-2.0 --to=html $i 2>/dev/null
+		      AbiWord-2.4 --to=html $i 2>/dev/null
 		done
 
 		cd $CVS
diff -r -u abiword-2.4.4.orig/abiword-docs/make-html.sh abiword-2.4.4/abiword-docs/make-html.sh
--- abiword-2.4.4.orig/abiword-docs/make-html.sh	2006-04-12 23:16:57.000000000 +0200
+++ abiword-2.4.4/abiword-docs/make-html.sh	2006-04-12 23:20:44.000000000 +0200
@@ -30,7 +30,7 @@
 fi
 
 if [ -z "$ABI_DOC_PROG" ]; then
-ABI_DOC_PROG="AbiWord-2.2";
+ABI_DOC_PROG="AbiWord-2.4";
 fi
 
 html_export_options="html4: no; use-awml: no; embed-css: yes; embed-images:yes"
@@ -45,7 +45,7 @@
 		do
 		      n=`echo $i|cut -f1 -d .`
 		      echo $i
-		      $ABI_DOC_PROG --to=html --exp-props=$html_export_options $i 2>/dev/null
+		      $ABI_DOC_PROG --to=html --exp-props="$html_export_options" $i 2>/dev/null
 		      $CVS/make-abidoc.pl -I $n.info -S header.xhtml -F footer.xhtml > $n.xhtml
 		      cp $n.xhtml $n.html
 			rm -f $n.xhtml


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-4/abiword.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- abiword.spec	11 Apr 2006 10:01:59 -0000	1.22
+++ abiword.spec	13 Apr 2006 11:57:11 -0000	1.23
@@ -3,7 +3,7 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: 2.4.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -42,6 +42,7 @@
 
 Patch0: abiword-2.0.9-windowshelppaths.patch
 Patch1: abiword-2.4.4-desktop.patch
+Patch2: abiword-2.4.4-docbuild.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. The goal is to make
@@ -51,6 +52,7 @@
 %setup -q 
 %patch0 -p1 -b .windowshelppaths
 %patch1 -p1 -b .desktop
+%patch2 -p1 -b .docbuild
 
 %build
 cd abi
@@ -134,6 +136,9 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Tue Apr 13 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.4-2.fc4
+- Fix documentation generation
+
 * Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.4-1.fc4
 - New upstream version
 - Remove the macro patch and update the desktop patch



From fedora-extras-commits at redhat.com  Thu Apr 13 12:42:53 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 13 Apr 2006 05:42:53 -0700
Subject: rpms/cernlib/devel cernlib.spec, 1.25, 1.26 patchy-case.patch, 1.1,
	1.2
Message-ID: <200604131242.k3DCgtuA002459@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	cernlib.spec patchy-case.patch 
Log Message:
use uninstalled fcasplit for npatchy build


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- cernlib.spec	13 Apr 2006 07:56:50 -0000	1.25
+++ cernlib.spec	13 Apr 2006 12:42:53 -0000	1.26
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       16%{?dist}.1
+Release:       16%{?dist}.2
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -62,7 +62,7 @@
 Source14: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_cfortran.tar.gz
 Source16: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/lib/xsneut95.dat
 # The patchy version 4 sources
-Source300: patchy.tar.gz
+Source17: patchy.tar.gz
 # this is modified with regard with what Mattias gave me. Indeed the file
 # containing some other files (p4inceta) was in fortran unformatted format, 
 # I believe it is what caused a segfault of rceta on the ppc platform.
@@ -70,8 +70,6 @@
 # sh patchy-unpack-rceta
 Source203: patchy-unpack-rceta 
 
-Source17: patchy.tar.gz
-
 # Shell scripts that go in /etc/profile.d
 Source100: cernlib.sh.in
 Source105: cernlib.csh.in
@@ -218,6 +216,7 @@
 # not applied as it has allready been done by the sed one-liner in 
 # patchy-unpack-rceta
 Patch1500: patchy-rceta.patch
+
 Patch1501: patchy-insecure_tmp_use.diff
 Patch1502: patchy-fcasplit.patch
 Patch1503: patchy-p4comp.patch
@@ -830,7 +829,7 @@
 
 
 %changelog
-* Wed Apr 12 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-16.1
+* Wed Apr 12 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-16.2
 - unpack patchy offline because the files are within an unformatted
   fortran file which won't be right on all the arches.
 

patchy-case.patch:

Index: patchy-case.patch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/patchy-case.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- patchy-case.patch	11 Apr 2006 22:45:34 -0000	1.1
+++ patchy-case.patch	13 Apr 2006 12:42:53 -0000	1.2
@@ -1,6 +1,14 @@
-diff -ur 2004.orig/src/patchy/Imakefile 2004/src/patchy/Imakefile
---- 2004.orig/src/patchy/Imakefile	1997-01-21 18:29:14.000000000 +0100
-+++ 2004/src/patchy/Imakefile	2005-05-28 02:23:04.000000000 +0200
+--- 2004.orig/src/patchy/Imakefile	2006-04-13 11:15:58.000000000 +0200
++++ 2004/src/patchy/Imakefile	2006-04-13 11:27:07.000000000 +0200
+@@ -54,7 +54,7 @@
+ 
+ $(P5LIB): $(LDIR)patchy.car $(LDIR)p5lib.cra p5lib.libmake fcasplit Makefile
+ 	ypatchy - p5lib p5lib TTY .go
+-	fcasplit p5lib.f
++	./fcasplit p5lib.f
+ 	RemoveFile(p5lib.f)
+ 	cat p5lib.libmake >> p5lib.mkfca
+ 	$(MAKE) -f p5lib.mkfca $@
 @@ -79,8 +79,8 @@
  	@ ln -s $< $@
  
@@ -12,3 +20,15 @@
  .f.o:
  	$(FC) -c $(FORTRANOPTIONS) $(FDEBUGFLAGS) $<
  
+@@ -92,9 +92,9 @@
+ YMODULES=ycompar yedit yfrceta yindex yindexb ylist ypatchy \
+ 	 ysearch yshift ytobcd ytobin ytoceta
+ 
+-P4LINKS: $(foreach yp,$(YMODULES),$(CERN_BINDIR)$(yp))
++P4LINKS: $(foreach yp,$(YMODULES),$(CERN_BINDIR)/$(yp))
+ 
+-$(foreach yp,$(YMODULES),$(CERN_BINDIR)$(yp)):
++$(foreach yp,$(YMODULES),$(CERN_BINDIR)/$(yp)):
+ 	cd $(dir $@);	\ @@\
+ 	if [ -f ../../patchy/4.15/bin/$(notdir $@) ] ; then \ @@\
+ 		ln -s ../../patchy/4.15/bin/$(notdir $@) $(notdir $@); \ @@\



From fedora-extras-commits at redhat.com  Thu Apr 13 12:27:56 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Thu, 13 Apr 2006 05:27:56 -0700
Subject: rpms/gajim/devel .cvsignore, 1.5, 1.6 gajim.spec, 1.9, 1.10 sources,
	1.5, 1.6 gajim-0.9.1.modularX.patch, 1.1,
	NONE gajim-0.9.1.notify_crash.patch, 1.1, NONE
Message-ID: <200604131227.k3DCRwA0002333@cvs-int.fedora.redhat.com>

Author: gajownik

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

Modified Files:
	.cvsignore gajim.spec sources 
Removed Files:
	gajim-0.9.1.modularX.patch gajim-0.9.1.notify_crash.patch 
Log Message:
Update to 0.10-pre1 and drop patches



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gajim/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	15 Jan 2006 16:11:52 -0000	1.5
+++ .cvsignore	13 Apr 2006 12:27:56 -0000	1.6
@@ -1 +1 @@
-gajim-0.9.1.tar.bz2
+gajim-0.10-pre1.tar.bz2


Index: gajim.spec
===================================================================
RCS file: /cvs/extras/rpms/gajim/devel/gajim.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gajim.spec	30 Mar 2006 20:51:42 -0000	1.9
+++ gajim.spec	13 Apr 2006 12:27:56 -0000	1.10
@@ -1,14 +1,12 @@
 Name:           gajim
-Version:        0.9.1
-Release:        3%{?dist}
+Version:        0.10
+Release:        0.1.pre1%{?dist}
 Summary:        Jabber client written in PyGTK
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://gajim.org/
-Source0:        http://gajim.org/downloads/gajim-%{version}.tar.bz2
-Patch0:         gajim-0.9.1.modularX.patch
-Patch1:         gajim-0.9.1.notify_crash.patch
+Source0:        http://gajim.org/downloads/gajim-%{version}-pre1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -35,11 +33,7 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
-# gajim wants to handle executables; why?
-sed -i -e '/MimeType/d' gajim.desktop.in
 
 %build
 make \
@@ -85,6 +79,10 @@
 %{_mandir}/man1/gajim-remote.1*
 
 %changelog
+* Thu Apr 13 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 0.10-0.1.pre1
+- Update to 0.10-pre1
+- Drop patches
+
 * Thu Mar 30 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 0.9.1-3
 - Remove Gnome dependencies
 - Fix crash with notify-daemon (#187274, Stefan Plewako)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gajim/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 Jan 2006 16:11:53 -0000	1.5
+++ sources	13 Apr 2006 12:27:56 -0000	1.6
@@ -1 +1 @@
-ca82dfb7ab5c51984357ea7bab0e99af  gajim-0.9.1.tar.bz2
+e59de6722900155e3f5644c62241c9a9  gajim-0.10-pre1.tar.bz2


--- gajim-0.9.1.modularX.patch DELETED ---


--- gajim-0.9.1.notify_crash.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Apr 13 13:27:41 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 13 Apr 2006 06:27:41 -0700
Subject: rpms/xmms-modplug/FC-5 xmms-modplug.spec,1.9,1.10
Message-ID: <200604131327.k3DDRhNg004799@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xmms-modplug/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4782

Modified Files:
	xmms-modplug.spec 
Log Message:
* Thu Apr  6 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.05-6
- Require xmms-libs instead of xmms.



Index: xmms-modplug.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-modplug/FC-5/xmms-modplug.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xmms-modplug.spec	14 Feb 2006 21:18:31 -0000	1.9
+++ xmms-modplug.spec	13 Apr 2006 13:27:41 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:           xmms-modplug
 Version:        2.05
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Modplug Plugin for XMMS
 
 License:        Public Domain
@@ -16,7 +16,7 @@
 BuildRequires:  gettext
 BuildRequires:  libmodplug-devel >= 1:0.7
 BuildConflicts: %{name} < 2.0
-Requires:       xmms
+Requires:       xmms-libs
 Provides:       modplug-xmms = %{version}-%{release}
 
 %description
@@ -63,6 +63,9 @@
 
 
 %changelog
+* Thu Apr  6 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.05-6
+- Require xmms-libs instead of xmms.
+
 * Tue Feb 14 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.05-5
 - Rebuild, cosmetics.
 



From fedora-extras-commits at redhat.com  Thu Apr 13 13:28:47 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 13 Apr 2006 06:28:47 -0700
Subject: rpms/xmms-alarm/FC-5 xmms-alarm.spec,1.9,1.10
Message-ID: <200604131328.k3DDSnNk004870@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xmms-alarm/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4853

Modified Files:
	xmms-alarm.spec 
Log Message:
* Thu Apr  6 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.3.7-3
- Add dependency on the main xmms package.



Index: xmms-alarm.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-alarm/FC-5/xmms-alarm.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xmms-alarm.spec	14 Feb 2006 20:41:51 -0000	1.9
+++ xmms-alarm.spec	13 Apr 2006 13:28:47 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:           xmms-alarm
 Version:        0.3.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Plugin for using XMMS as an alarm clock
 
 License:        GPL
@@ -14,6 +14,7 @@
 BuildRequires:  xmms-devel
 BuildRequires:  glib-devel >= 1:1.2.6
 BuildRequires:  gtk+-devel >= 1:1.2.6
+Requires:       xmms
 
 %description
 %{summary}.
@@ -45,6 +46,9 @@
 
 
 %changelog
+* Thu Apr  6 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.3.7-3
+- Add dependency on the main xmms package.
+
 * Tue Feb 14 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.3.7-2
 - Rebuild, cosmetics.
 



From fedora-extras-commits at redhat.com  Thu Apr 13 14:37:51 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu, 13 Apr 2006 07:37:51 -0700
Subject: rpms/python-paramiko - New directory
Message-ID: <200604131437.k3DEbrtI007258@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-paramiko
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7237/python-paramiko

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




From fedora-extras-commits at redhat.com  Thu Apr 13 14:37:52 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu, 13 Apr 2006 07:37:52 -0700
Subject: rpms/python-paramiko/devel - New directory
Message-ID: <200604131437.k3DEbsc3007261@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-paramiko/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7237/python-paramiko/devel

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




From fedora-extras-commits at redhat.com  Thu Apr 13 14:38:05 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu, 13 Apr 2006 07:38:05 -0700
Subject: rpms/python-paramiko Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604131438.k3DEc71O007315@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-paramiko
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7282

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-paramiko


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

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

common : CVS/Root
	@cvs 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 Apr 13 14:38:05 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu, 13 Apr 2006 07:38:05 -0700
Subject: rpms/python-paramiko/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604131438.k3DEc7OE007318@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-paramiko/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7282/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-paramiko


--- 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 Apr 13 14:38:24 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu, 13 Apr 2006 07:38:24 -0700
Subject: rpms/python-paramiko import.log,1.1,1.2
Message-ID: <200604131438.k3DEcQG2007379@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-paramiko
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7346

Modified Files:
	import.log 
Log Message:
auto-import python-paramiko-1.5.3-1 on branch devel from python-paramiko-1.5.3-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-paramiko/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Apr 2006 14:38:05 -0000	1.1
+++ import.log	13 Apr 2006 14:38:23 -0000	1.2
@@ -0,0 +1 @@
+python-paramiko-1_5_3-1:HEAD:python-paramiko-1.5.3-1.src.rpm:1144939101



From fedora-extras-commits at redhat.com  Thu Apr 13 14:38:24 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu, 13 Apr 2006 07:38:24 -0700
Subject: rpms/python-paramiko/devel python-paramiko.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604131438.k3DEcQ1Y007384@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-paramiko/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7346/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-paramiko.spec 
Log Message:
auto-import python-paramiko-1.5.3-1 on branch devel from python-paramiko-1.5.3-1.src.rpm


--- NEW FILE python-paramiko.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}

%define srcname paramiko

Name:           python-paramiko
Version:        1.5.3
Release:        1%{?dist}
Summary:        A SSH2 protocol library for python

Group:          Development/Libraries
License:        LGPL
URL:            http://www.lag.net/paramiko/
Source0:        http://www.lag.net/paramiko/download/%{srcname}-%{version}.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  python-setuptools
Requires:       python-abi = %{pyver}
Requires:       python-crypto >= 1.9

%description
Paramiko (a combination of the esperanto words for "paranoid" and "friend") is
a module for python 2.3 or greater that implements the SSH2 protocol for secure
(encrypted and authenticated) connections to remote machines. Unlike SSL (aka
TLS), the SSH2 protocol does not require heirarchical certificates signed by a
powerful central authority. You may know SSH2 as the protocol that replaced
telnet and rsh for secure access to remote shells, but the protocol also
includes the ability to open arbitrary channels to remote services across an
encrypted tunnel. (This is how sftp works, for example.)

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


%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build


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


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE PKG-INFO README docs/
%{python_sitelib}/paramiko
%{python_sitelib}/paramiko-%{version}-py%{pyver}.egg-info

%changelog
* Wed Apr 12 2006 Shahms E. King <shahms at shahms.com> 1.5.3-1
  - Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-paramiko/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Apr 2006 14:38:05 -0000	1.1
+++ .cvsignore	13 Apr 2006 14:38:24 -0000	1.2
@@ -0,0 +1 @@
+paramiko-1.5.3.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-paramiko/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Apr 2006 14:38:05 -0000	1.1
+++ sources	13 Apr 2006 14:38:24 -0000	1.2
@@ -0,0 +1 @@
+9c1389f19a331554e052a7e4e2b1471c  paramiko-1.5.3.zip



From fedora-extras-commits at redhat.com  Thu Apr 13 14:47:13 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu, 13 Apr 2006 07:47:13 -0700
Subject: owners owners.list,1.839,1.840
Message-ID: <200604131447.k3DElFWV007464@cvs-int.fedora.redhat.com>

Author: shahms

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

Modified Files:
	owners.list 
Log Message:
Added python-paramiko



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.839
retrieving revision 1.840
diff -u -r1.839 -r1.840
--- owners.list	13 Apr 2006 11:09:02 -0000	1.839
+++ owners.list	13 Apr 2006 14:47:13 -0000	1.840
@@ -1230,6 +1230,7 @@
 Fedora Extras|python-nltk|Python-based Natural Language Toolkit|michel.salim at gmail.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|
+Fedora Extras|python-paramiko|A SSH2 protocol library for python|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-protocols|PyProtocols 'adapt()' implementation|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-psycopg|Alternative high-speed Postgres DB adapter|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-psyco|Python specializing compiler|shahms at shahms.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Apr 13 15:26:57 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 13 Apr 2006 08:26:57 -0700
Subject: rpms/nethack-vultures/FC-3 nethack-vultures.spec,1.20,1.21
Message-ID: <200604131526.k3DFQxfj009774@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-serv9757

Modified Files:
	nethack-vultures.spec 
Log Message:
Patched to remove PCMUSIC for FC-3




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- nethack-vultures.spec	10 Apr 2006 14:45:58 -0000	1.20
+++ nethack-vultures.spec	13 Apr 2006 15:26:57 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        2.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -10,6 +10,7 @@
 Patch0:         %{name}-1.11.0-optflags.patch
 Patch1:         %{name}-1.11.0-config.patch
 Patch2:         %{name}-1.10.1-clawguide.patch
+Patch3:         %{name}-2.0.0-pcmusic.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
@@ -38,6 +39,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2
+%patch3 -p1
 sed -i -e 's|/usr/games/lib/nethackdir|%{_prefix}/games/vultureseye|g' \
     nethack/doc/{nethack,recover}.6 nethack/include/config.h
 sed -i -e 's|/var/lib/games/nethack|%{_var}/games/vultureseye|g' \
@@ -166,6 +168,9 @@
 
 
 %changelog
+* Thu Apr 13 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-4
+- Patched out PCMUSIC so that FC-3 can still build.
+
 * Sun Apr 09 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-3
 - Packaged extra fonts
 



From fedora-extras-commits at redhat.com  Thu Apr 13 15:28:01 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 13 Apr 2006 08:28:01 -0700
Subject: rpms/nethack-vultures/FC-3 nethack-vultures-2.0.0-pcmusic.patch,
	NONE, 1.1
Message-ID: <200604131528.k3DFS3Gi009841@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-serv9823

Added Files:
	nethack-vultures-2.0.0-pcmusic.patch 
Log Message:
Whoops, forgot to commit the new patch!



nethack-vultures-2.0.0-pcmusic.patch:

--- NEW FILE nethack-vultures-2.0.0-pcmusic.patch ---
diff -c -r vultures-2.0.0/vultures/vultures_conf.h vultures-2.0.0.new/vultures/vultures_conf.h
*** vultures-2.0.0/vultures/vultures_conf.h~	2006-04-13 15:13:28.000000000 +0000
--- vultures-2.0.0/vultures/vultures_conf.h	2006-04-13 15:14:18.000000000 +0000
***************
*** 8,12 ****
  /* PCMUSIC allows us to play notes when the player uses an instrument ingame
   * nethack only defines this if __BORLANDC__ is also defined, but we can use it 
   * anyway */ 
! #define PCMUSIC
  
--- 8,12 ----
  /* PCMUSIC allows us to play notes when the player uses an instrument ingame
   * nethack only defines this if __BORLANDC__ is also defined, but we can use it 
   * anyway */ 
! #undef PCMUSIC
  



From fedora-extras-commits at redhat.com  Thu Apr 13 15:31:50 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 13 Apr 2006 08:31:50 -0700
Subject: rpms/nethack-vultures/FC-3 nethack-vultures.spec,1.21,1.22
Message-ID: <200604131531.k3DFVqlx009916@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-serv9899

Modified Files:
	nethack-vultures.spec 
Log Message:
Upped the release to build with the forgotten patch.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- nethack-vultures.spec	13 Apr 2006 15:26:57 -0000	1.21
+++ nethack-vultures.spec	13 Apr 2006 15:31:49 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        2.0.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -168,6 +168,9 @@
 
 
 %changelog
+* Thu Apr 13 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-5
+- Upped the release; forgot to include the patch in the last commit.
+
 * Thu Apr 13 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-4
 - Patched out PCMUSIC so that FC-3 can still build.
 



From fedora-extras-commits at redhat.com  Thu Apr 13 15:34:45 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 13 Apr 2006 08:34:45 -0700
Subject: rpms/cernlib/devel cernlib.spec,1.26,1.27
Message-ID: <200604131534.k3DFYlWM010002@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	cernlib.spec 
Log Message:
* Tue Apr 13 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-17
- npatchy don't build on ppc.



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- cernlib.spec	13 Apr 2006 12:42:53 -0000	1.26
+++ cernlib.spec	13 Apr 2006 15:34:44 -0000	1.27
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       16%{?dist}.2
+Release:       17%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -32,12 +32,6 @@
 # build the cernlib
 BuildRequires: /usr/bin/g77
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#%if "%fedora" > "3"
-# f771 segfaults on x86_64
-#ExcludeArch:   x86_64
-#%endif
-# rceta segfaults on ppc
-#ExcludeArch:   ppc
 
 # these sources are different from the upstream sources as files with 
 # GPL incompatible licences are removed. You can use cernlib-remove-deadpool
@@ -155,7 +149,7 @@
 Patch314: 314-permit-using-regcomp-for-re_comp.dpatch
 Patch315: 315-fixes-for-MacOSX.dpatch
 Patch318: 318-additional-gcc-3.4-fixes.dpatch
-# certainly not needed
+# certainly not needed, but who knows?
 Patch319: 319-work-around-imake-segfaults.dpatch
 
 Patch700: 700-remove-kernlib-from-packlib-Imakefile.dpatch
@@ -171,8 +165,8 @@
 Patch801: 801-non-optimized-rule-uses-fPIC-g.dpatch
 Patch802: 802-create-shared-libraries.dpatch
 # in the original cernlib kxterm is built with the C compiler, which cause
-# a failure if compiled with de cernlib debian script as -lg2c isn't found. 
-# It is corrected by
+# a failure if compiled with the cernlib debian script as -lg2c isn't found. 
+# It is corrected in
 Patch803: 803-link-binaries-dynamically.dpatch
 # 803 depends on 
 # 208-fix-redundant-packlib-dependencies.dpatch
@@ -662,9 +656,12 @@
 cd $CERN_ROOT/build/packlib
 make %{?_smp_mflags} install.bin
 
-# Build patchy
+# Build npatchy
+# The build of patchy is completly messed up on ppc
+%ifnarch ppc
 cd $CERN_ROOT/build/patchy
 make %{?_smp_mflags} install.bin
+%endif
 
 %install
 
@@ -802,6 +799,7 @@
 
 %files -n patchy
 %defattr(-,root,root,-)
+%ifnarch ppc
 %{_bindir}/fcasplit
 %{_bindir}/nycheck
 %{_bindir}/nydiff
@@ -812,6 +810,7 @@
 %{_bindir}/nyshell
 %{_bindir}/nysynopt
 %{_bindir}/nytidy
+%endif
 %{_bindir}/ycompar
 %{_bindir}/yedit
 %{_bindir}/yexpand
@@ -829,7 +828,10 @@
 
 
 %changelog
-* Wed Apr 12 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-16.2
+* Tue Apr 13 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-17
+- npatchy don't build on ppc.
+
+* Wed Apr 12 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-16
 - unpack patchy offline because the files are within an unformatted
   fortran file which won't be right on all the arches.
 



From fedora-extras-commits at redhat.com  Thu Apr 13 15:57:33 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 13 Apr 2006 08:57:33 -0700
Subject: rpms/deskbar-applet/devel deskbar-applet-2.14.1-artdir.patch, NONE, 
	1.1 deskbar-applet-2.14.1-beagleexists.patch, NONE,
	1.1 .cvsignore, 1.10, 1.11 deskbar-applet.spec, 1.21,
	1.22 sources, 1.10,
	1.11 deskbar-applet-2.14.0-beagleexists.patch, 1.1,
	NONE deskbar-applet-2.14.0-fedorabz.patch, 1.1, NONE
Message-ID: <200604131557.k3DFvZDW010126@cvs-int.fedora.redhat.com>

Author: ivazquez

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

Modified Files:
	.cvsignore deskbar-applet.spec sources 
Added Files:
	deskbar-applet-2.14.1-artdir.patch 
	deskbar-applet-2.14.1-beagleexists.patch 
Removed Files:
	deskbar-applet-2.14.0-beagleexists.patch 
	deskbar-applet-2.14.0-fedorabz.patch 
Log Message:
- Upstream update
- Decoupled the BZ handler from the upstream tarball


deskbar-applet-2.14.1-artdir.patch:

--- NEW FILE deskbar-applet-2.14.1-artdir.patch ---
--- deskbar-applet-2.14.1/data/deskbar-applet.pc.in.artdir	2006-04-13 07:25:47.000000000 -0400
+++ deskbar-applet-2.14.1/data/deskbar-applet.pc.in	2006-04-13 07:26:48.000000000 -0400
@@ -2,6 +2,7 @@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 handlersdir=@libdir@/deskbar-applet/handlers
+artdir=@datadir@/deskbar-applet/art
 
 Name: Deskbar Applet Handlers Location
 Description: Providing the location of deskbar-applet system-wide handlers.

deskbar-applet-2.14.1-beagleexists.patch:

--- NEW FILE deskbar-applet-2.14.1-beagleexists.patch ---
--- deskbar-applet-2.14.0/deskbar/handlers/beagle-static.py.fedora	2006-03-12 21:24:16.000000000 -0500
+++ deskbar-applet-2.14.0/deskbar/handlers/beagle-static.py	2006-03-12 21:24:56.000000000 -0500
@@ -1,5 +1,6 @@
 import os
 from os.path import exists, join
+from glob import glob
 from gettext import gettext as _
 
 import gobject
@@ -9,7 +10,7 @@
 #FIXME: better way to detect beagle ?
 def _check_requirements():
 	for dir in get_xdg_data_dirs():
-		if exists(join(dir, "applications", "best.desktop")) or exists(join(dir, "applications", "beagle-search.desktop")):
+		if glob(join(dir, "applications", "*best.desktop")) or glob(join(dir, "applications", "*beagle-search.desktop")):
 			return (deskbar.Handler.HANDLER_IS_HAPPY, None, None)
 	
 	return (deskbar.Handler.HANDLER_IS_NOT_APPLICABLE, "Beagle does not seem to be installed, skipping", None)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	13 Mar 2006 05:49:42 -0000	1.10
+++ .cvsignore	13 Apr 2006 15:57:33 -0000	1.11
@@ -1 +1 @@
-deskbar-applet-2.14.0.tar.bz2
+deskbar-applet-2.14.1.tar.bz2


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- deskbar-applet.spec	14 Mar 2006 15:23:37 -0000	1.21
+++ deskbar-applet.spec	13 Apr 2006 15:57:33 -0000	1.22
@@ -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.14.0
-Release:        2%{?dist}
+Version:        2.14.1
+Release:        1%{?dist}
 
 Summary:        A Gnome applet to allow easy access to various search engines
 Group:          Applications/Internet
@@ -12,14 +12,15 @@
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/deskbar-applet/2.14/%{name}-%{version}.tar.bz2
 Source1:        fedorabz.py
 Source2:        fedorabz.png
-Patch0:         deskbar-applet-2.14.0-fedorabz.patch
-Patch2:         deskbar-applet-2.14.0-beagleexists.patch
+Patch0:         deskbar-applet-2.14.1-artdir.patch
+Patch1:         deskbar-applet-2.14.1-beagleexists.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk2-devel python-devel pygtk2-devel gnome-python2-extras gettext evolution-data-server-devel gnome-desktop-devel libSM-devel gnome-python2-applet
 Requires:       gnome-python2 gnome-python2-applet gnome-python2-bonobo gnome-python2-gconf pygtk2
-Requires(pre): GConf2
+Requires(pre):  GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
+Provides:       deskbar-applet-fedorabz
 
 %description
 The goal of DeskbarApplet is to provide an omnipresent versatile search
@@ -32,10 +33,8 @@
 
 %prep
 %setup -q
-cp %{SOURCE1} deskbar/handlers
-cp %{SOURCE2} data/art
-%patch -p1 -b .fedorabz
-%patch2 -p1 -b .beagleexists
+%patch -p1 -b .artdir
+%patch1 -p1 -b .beagleexists
 
 %build
 %configure
@@ -44,6 +43,12 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+hdir="$(grep "^handlersdir=" $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc)"
+hdir="${hdir#*=}"
+adir="$(grep "^artdir=" $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc)"
+adir="${adir#*=}"
+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 {} \;
 %{find_lang} %{name}
 
@@ -84,6 +89,10 @@
 %{_datadir}/pixmaps/%{name}.svg
 
 %changelog
+* Thu Apr 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.14.1-1
+- Upstream update
+- Decoupled the BZ handler from the upstream tarball
+
 * Tue Mar 14 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.14.0-2
 - Fixed bug in Fedora Bugzilla handler (#184231)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	13 Mar 2006 05:49:42 -0000	1.10
+++ sources	13 Apr 2006 15:57:33 -0000	1.11
@@ -1 +1 @@
-2c9910160c2814e6497c5d6b6887fa8e  deskbar-applet-2.14.0.tar.bz2
+040bf4dd834005142a5a716bf76c2f20  deskbar-applet-2.14.1.tar.bz2


--- deskbar-applet-2.14.0-beagleexists.patch DELETED ---


--- deskbar-applet-2.14.0-fedorabz.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Apr 13 16:43:34 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Thu, 13 Apr 2006 09:43:34 -0700
Subject: rpms/xmms-cdread/FC-5 xmms-cdread.spec,1.11,1.12
Message-ID: <200604131643.k3DGhaYF018377@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/xmms-cdread/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18338/FC-5

Modified Files:
	xmms-cdread.spec 
Log Message:
* Thu Apr 13 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.14-11
- bumped release to stay in sync with FC-4



Index: xmms-cdread.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-cdread/FC-5/xmms-cdread.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xmms-cdread.spec	12 Apr 2006 20:03:11 -0000	1.11
+++ xmms-cdread.spec	13 Apr 2006 16:43:34 -0000	1.12
@@ -3,7 +3,7 @@
 Summary:	Digital audio CD input plugin for XMMS
 Name:		xmms-cdread
 Version:	0.14
-Release:        10%{?dist}
+Release:        11%{?dist}
 License:	GPL
 Group:		Applications/Multimedia
 URL:		http://www.xmms.org/
@@ -47,6 +47,9 @@
 %exclude %{xmmsinputdir}/libcdread.la
 
 %changelog
+* Thu Apr 13 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.14-11
+- bumped release to stay in sync with FC-4
+ 
 * Sat Apr  8 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.14-10
 - changed Requires xmms -> xmms-libs
 



From fedora-extras-commits at redhat.com  Thu Apr 13 16:43:35 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Thu, 13 Apr 2006 09:43:35 -0700
Subject: rpms/xmms-cdread/devel xmms-cdread.spec,1.11,1.12
Message-ID: <200604131643.k3DGhbds018381@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/xmms-cdread/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18338/devel

Modified Files:
	xmms-cdread.spec 
Log Message:
* Thu Apr 13 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.14-11
- bumped release to stay in sync with FC-4



Index: xmms-cdread.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-cdread/devel/xmms-cdread.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xmms-cdread.spec	8 Apr 2006 07:03:11 -0000	1.11
+++ xmms-cdread.spec	13 Apr 2006 16:43:34 -0000	1.12
@@ -3,7 +3,7 @@
 Summary:	Digital audio CD input plugin for XMMS
 Name:		xmms-cdread
 Version:	0.14
-Release:        10%{?dist}
+Release:        11%{?dist}
 License:	GPL
 Group:		Applications/Multimedia
 URL:		http://www.xmms.org/
@@ -47,6 +47,9 @@
 %exclude %{xmmsinputdir}/libcdread.la
 
 %changelog
+* Thu Apr 13 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.14-11
+- bumped release to stay in sync with FC-4
+
 * Sat Apr  8 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.14-10
 - changed Requires xmms -> xmms-libs
 



From fedora-extras-commits at redhat.com  Thu Apr 13 17:10:51 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 13 Apr 2006 10:10:51 -0700
Subject: rpms/cernlib/devel cernlib.spec,1.27,1.28
Message-ID: <200604131710.k3DHArmW024755@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	cernlib.spec 
Log Message:
yexpand is in patchy 5


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- cernlib.spec	13 Apr 2006 15:34:44 -0000	1.27
+++ cernlib.spec	13 Apr 2006 17:10:51 -0000	1.28
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       17%{?dist}
+Release:       17%{?dist}.1
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -810,10 +810,10 @@
 %{_bindir}/nyshell
 %{_bindir}/nysynopt
 %{_bindir}/nytidy
+%{_bindir}/yexpand
 %endif
 %{_bindir}/ycompar
 %{_bindir}/yedit
-%{_bindir}/yexpand
 %{_bindir}/yfrceta
 %{_bindir}/yindex
 %{_bindir}/yindexb
@@ -828,7 +828,7 @@
 
 
 %changelog
-* Tue Apr 13 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-17
+* Tue Apr 13 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-17.1
 - npatchy don't build on ppc.
 
 * Wed Apr 12 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-16



From fedora-extras-commits at redhat.com  Thu Apr 13 17:35:48 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 10:35:48 -0700
Subject: rpms/perl-Module-Load - New directory
Message-ID: <200604131735.k3DHZolZ028995@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Load
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28958/perl-Module-Load

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




From fedora-extras-commits at redhat.com  Thu Apr 13 17:35:49 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 10:35:49 -0700
Subject: rpms/perl-Module-Load/devel - New directory
Message-ID: <200604131735.k3DHZpWB029000@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Load/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28958/perl-Module-Load/devel

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




From fedora-extras-commits at redhat.com  Thu Apr 13 17:36:12 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 10:36:12 -0700
Subject: rpms/perl-Module-Load Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604131736.k3DHaEHj029115@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Load
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29074

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


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

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

common : CVS/Root
	@cvs 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 Apr 13 17:36:13 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 10:36:13 -0700
Subject: rpms/perl-Module-Load/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604131736.k3DHaFN7029121@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Load/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29074/devel

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


--- 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 Apr 13 17:36:55 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 10:36:55 -0700
Subject: rpms/perl-Module-Load import.log,1.1,1.2
Message-ID: <200604131737.k3DHbRkI029387@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Load
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29258

Modified Files:
	import.log 
Log Message:
auto-import perl-Module-Load-0.10-1 on branch devel from perl-Module-Load-0.10-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Load/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Apr 2006 17:36:12 -0000	1.1
+++ import.log	13 Apr 2006 17:36:55 -0000	1.2
@@ -0,0 +1 @@
+perl-Module-Load-0_10-1:HEAD:perl-Module-Load-0.10-1.src.rpm:1144949804



From fedora-extras-commits at redhat.com  Thu Apr 13 17:36:56 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 10:36:56 -0700
Subject: rpms/perl-Module-Load/devel perl-Module-Load.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604131737.k3DHbSi6029392@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Load/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29258/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Module-Load.spec 
Log Message:
auto-import perl-Module-Load-0.10-1 on branch devel from perl-Module-Load-0.10-1.src.rpm


--- NEW FILE perl-Module-Load.spec ---
Name:           perl-Module-Load
Version:        0.10
Release:        1%{?dist}
Summary:        Runtime require of both modules and files
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Module-Load/
Source0:        http://www.cpan.org/authors/id/K/KA/KANE/Module-Load-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Module::Load eliminates the need to know whether you are trying to
require either a file or a module.

%prep
%setup -q -n Module-Load-%{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+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Mar 23 2006 Steven Pritchard <steve at kspei.com> 0.10-1
- Specfile autogenerated by cpanspec 1.62.
- Fix License.
- Modify description slightly.
- Capitalize Summary.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Load/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Apr 2006 17:36:13 -0000	1.1
+++ .cvsignore	13 Apr 2006 17:36:56 -0000	1.2
@@ -0,0 +1 @@
+Module-Load-0.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Load/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Apr 2006 17:36:13 -0000	1.1
+++ sources	13 Apr 2006 17:36:56 -0000	1.2
@@ -0,0 +1 @@
+ee40eb2fa3059381e43d1f14d414fe67  Module-Load-0.10.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 13 18:43:14 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Apr 2006 11:43:14 -0700
Subject: rpms/kdemultimedia-extras/FC-5 kdemultimedia-extras.spec,1.1,1.2
Message-ID: <200604131843.k3DIhGfG009841@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-serv9821

Modified Files:
	kdemultimedia-extras.spec 
Log Message:
* Wed Apr 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.1-8
- -extras: Requires: kdemultimedia >= 6:3.5.1



Index: kdemultimedia-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-5/kdemultimedia-extras.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdemultimedia-extras.spec	31 Mar 2006 12:39:58 -0000	1.1
+++ kdemultimedia-extras.spec	13 Apr 2006 18:43:13 -0000	1.2
@@ -65,7 +65,7 @@
 Group:   Applications/Multimedia
 Epoch:	 6
 Version: 3.5.1
-Release: 7%{?dist}%{?kde}
+Release: 8%{?dist}%{?kde}
 
 License: GPL
 %if "%{?nonfree}" == "1"
@@ -151,7 +151,7 @@
 %if "%{?extras}" == "1"
 # debugging
 %{?debug:BuildConflicts: kdemultimedia-extras }
-Requires:  kdemultimedia = %{epoch}:%{version}
+Requires:  kdemultimedia >= %{epoch}:%{version}
 %description 
 %{summary}, including: 
 * akode_artsplugin (akode)
@@ -165,7 +165,7 @@
 %{?debug:BuildConflicts: kdemultimedia-nonfree}
 Requires: kdemultimedia = %{epoch}:%{version}
 # for main akode_artsplugins bits
-Requires: kdemultimedia-extras = %{epoch}:%{version}
+Requires: kdemultimedia-extras >= %{epoch}:%{version}
 Requires: akode-extras
 %description
 %{summary}, including:
@@ -433,6 +433,9 @@
 
 
 %changelog
+* Wed Apr 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.1-8
+- -extras: Requires: kdemultimedia >= 6:3.5.1
+
 * Thu Mar 16 2006 Rex Dieter 6:3.5.1-7
 - kfile-plugins/mp3: -extras -> -nonfree
 



From fedora-extras-commits at redhat.com  Thu Apr 13 18:45:45 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Apr 2006 11:45:45 -0700
Subject: rpms/kdemultimedia-extras/FC-4 kdemultimedia-extras.spec,1.1,1.2
Message-ID: <200604131845.k3DIjl8A010075@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	kdemultimedia-extras.spec 
Log Message:
* Wed Apr 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.1-8
- -extras: Requires: kdemultimedia >= 6:3.5.1



Index: kdemultimedia-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-4/kdemultimedia-extras.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdemultimedia-extras.spec	31 Mar 2006 12:39:58 -0000	1.1
+++ kdemultimedia-extras.spec	13 Apr 2006 18:45:45 -0000	1.2
@@ -65,7 +65,7 @@
 Group:   Applications/Multimedia
 Epoch:	 6
 Version: 3.5.1
-Release: 7%{?dist}%{?kde}
+Release: 8%{?dist}%{?kde}
 
 License: GPL
 %if "%{?nonfree}" == "1"
@@ -151,7 +151,7 @@
 %if "%{?extras}" == "1"
 # debugging
 %{?debug:BuildConflicts: kdemultimedia-extras }
-Requires:  kdemultimedia = %{epoch}:%{version}
+Requires:  kdemultimedia >= %{epoch}:%{version}
 %description 
 %{summary}, including: 
 * akode_artsplugin (akode)
@@ -165,7 +165,7 @@
 %{?debug:BuildConflicts: kdemultimedia-nonfree}
 Requires: kdemultimedia = %{epoch}:%{version}
 # for main akode_artsplugins bits
-Requires: kdemultimedia-extras = %{epoch}:%{version}
+Requires: kdemultimedia-extras >= %{epoch}:%{version}
 Requires: akode-extras
 %description
 %{summary}, including:
@@ -433,6 +433,9 @@
 
 
 %changelog
+* Wed Apr 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.1-8
+- -extras: Requires: kdemultimedia >= 6:3.5.1
+
 * Thu Mar 16 2006 Rex Dieter 6:3.5.1-7
 - kfile-plugins/mp3: -extras -> -nonfree
 



From fedora-extras-commits at redhat.com  Thu Apr 13 18:52:20 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 11:52:20 -0700
Subject: rpms/perl-Module-Loaded - New directory
Message-ID: <200604131852.k3DIqMck010604@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Loaded
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10574/perl-Module-Loaded

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




From fedora-extras-commits at redhat.com  Thu Apr 13 18:52:20 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 11:52:20 -0700
Subject: rpms/perl-Module-Loaded/devel - New directory
Message-ID: <200604131852.k3DIqMQO010607@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Loaded/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10574/perl-Module-Loaded/devel

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




From fedora-extras-commits at redhat.com  Thu Apr 13 18:52:59 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 11:52:59 -0700
Subject: rpms/perl-Module-Loaded Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604131853.k3DIr1jt010698@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Loaded
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10661

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


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

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

common : CVS/Root
	@cvs 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 Apr 13 18:53:00 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 11:53:00 -0700
Subject: rpms/perl-Module-Loaded/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200604131853.k3DIr2OC010701@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Loaded/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10661/devel

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


--- 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 Apr 13 18:56:24 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 11:56:24 -0700
Subject: rpms/perl-Module-Loaded import.log,1.1,1.2
Message-ID: <200604131856.k3DIuQF6010978@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Loaded
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10941

Modified Files:
	import.log 
Log Message:
auto-import perl-Module-Loaded-0.01-1 on branch devel from perl-Module-Loaded-0.01-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Loaded/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Apr 2006 18:52:59 -0000	1.1
+++ import.log	13 Apr 2006 18:56:24 -0000	1.2
@@ -0,0 +1 @@
+perl-Module-Loaded-0_01-1:HEAD:perl-Module-Loaded-0.01-1.src.rpm:1144954561



From fedora-extras-commits at redhat.com  Thu Apr 13 18:56:24 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 11:56:24 -0700
Subject: rpms/perl-Module-Loaded/devel perl-Module-Loaded.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604131856.k3DIuQG4010985@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Loaded/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10941/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Module-Loaded.spec 
Log Message:
auto-import perl-Module-Loaded-0.01-1 on branch devel from perl-Module-Loaded-0.01-1.src.rpm


--- NEW FILE perl-Module-Loaded.spec ---
Name:           perl-Module-Loaded
Version:        0.01
Release:        1%{?dist}
Summary:        Mark modules as loaded or unloaded
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Module-Loaded/
Source0:        http://www.cpan.org/authors/id/K/KA/KANE/Module-Loaded-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
When testing applications, often you find yourself needing to provide
functionality in your test environment that would usually be provided by
external modules. Rather than munging the %INC by hand to mark these
external modules as loaded, so they are not attempted to be loaded by
perl, this module offers you a very simple way to mark modules as loaded
and/or unloaded.

%prep
%setup -q -n Module-Loaded-%{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+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Mar 23 2006 Steven Pritchard <steve at kspei.com> 0.01-1
- Specfile autogenerated by cpanspec 1.62.
- Fix License.
- Capitalize Summary.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Loaded/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Apr 2006 18:53:00 -0000	1.1
+++ .cvsignore	13 Apr 2006 18:56:24 -0000	1.2
@@ -0,0 +1 @@
+Module-Loaded-0.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Loaded/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Apr 2006 18:53:00 -0000	1.1
+++ sources	13 Apr 2006 18:56:24 -0000	1.2
@@ -0,0 +1 @@
+bf2830c75b4ce78ebeee7f5ed074ea2a  Module-Loaded-0.01.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 13 19:11:46 2006
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 13 Apr 2006 12:11:46 -0700
Subject: rpms/wxGTK/devel wxGTK-2.6.3.2-cvs.patch, NONE, 1.1 wxGTK.spec, 1.19,
	1.20
Message-ID: <200604131911.k3DJBmGP013436@cvs-int.fedora.redhat.com>

Author: mattdm

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

Modified Files:
	wxGTK.spec 
Added Files:
	wxGTK-2.6.3.2-cvs.patch 
Log Message:
Patch to 2.6.3.2 subrelease (from cvs)


wxGTK-2.6.3.2-cvs.patch:

--- NEW FILE wxGTK-2.6.3.2-cvs.patch ---
diff -ur wxGTK-2.6.3/configure wxGTK-2.6.3.2/configure
--- wxGTK-2.6.3/configure	2006-03-21 18:42:05.000000000 -0500
+++ wxGTK-2.6.3.2/configure	2006-03-30 12:05:51.000000000 -0500
@@ -1669,7 +1669,7 @@
 wx_major_version_number=2
 wx_minor_version_number=6
 wx_release_number=3
-wx_subrelease_number=1
+wx_subrelease_number=2
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
 WX_VERSION=$WX_RELEASE.$wx_release_number
diff -ur wxGTK-2.6.3/configure.in wxGTK-2.6.3.2/configure.in
--- wxGTK-2.6.3/configure.in	2006-03-21 18:42:05.000000000 -0500
+++ wxGTK-2.6.3.2/configure.in	2006-03-30 12:05:49.000000000 -0500
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Id: configure.in,v 1.1063.2.15 2006/03/21 19:33:57 KO Exp $)dnl
+AC_REVISION($Id: configure.in,v 1.1063.2.16 2006/03/30 17:05:49 RD Exp $)dnl
 
 dnl ---------------------------------------------------------------------------
 dnl
@@ -8,7 +8,7 @@
 dnl
 dnl This script is under the wxWidgets licence.
 dnl
-dnl Version: $Id: configure.in,v 1.1063.2.15 2006/03/21 19:33:57 KO Exp $
+dnl Version: $Id: configure.in,v 1.1063.2.16 2006/03/30 17:05:49 RD Exp $
 dnl ---------------------------------------------------------------------------
 
 dnl ---------------------------------------------------------------------------
@@ -33,7 +33,7 @@
 wx_major_version_number=2
 wx_minor_version_number=6
 wx_release_number=3
-wx_subrelease_number=1
+wx_subrelease_number=2
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
 WX_VERSION=$WX_RELEASE.$wx_release_number
diff -ur wxGTK-2.6.3/contrib/src/deprecated/cwlex_yy.c wxGTK-2.6.3.2/contrib/src/deprecated/cwlex_yy.c
--- wxGTK-2.6.3/contrib/src/deprecated/cwlex_yy.c	2006-03-21 18:42:22.000000000 -0500
+++ wxGTK-2.6.3.2/contrib/src/deprecated/cwlex_yy.c	2005-05-04 14:57:49.000000000 -0400
@@ -3,7 +3,7 @@
 /* Licence:   wxWindows Licence */
 
 /* scanner skeleton version:
- * $Header: /pack/cvsroots/wxwindows/wxWindows/contrib/src/deprecated/cwlex_yy.c,v 1.2 2005/05/04 18:57:49 JS Exp $
+ * $Header: /pack/cvsroots/wxwidgets/wxWidgets/contrib/src/deprecated/cwlex_yy.c,v 1.2 2005/05/04 18:57:49 JS Exp $
 	Last change:  JS   13 Jul 97    6:17 pm
  */
 
diff -ur wxGTK-2.6.3/contrib/src/deprecated/doslex.c wxGTK-2.6.3.2/contrib/src/deprecated/doslex.c
--- wxGTK-2.6.3/contrib/src/deprecated/doslex.c	2006-03-21 18:42:22.000000000 -0500
+++ wxGTK-2.6.3.2/contrib/src/deprecated/doslex.c	2005-06-09 14:37:44.000000000 -0400
@@ -1,7 +1,7 @@
 /* A lexical scanner generated by flex */
 
 /* scanner skeleton version:
- * $Header: /pack/cvsroots/wxwindows/wxWindows/contrib/src/deprecated/doslex.c,v 1.6 2005/06/09 18:37:44 ABX Exp $
+ * $Header: /pack/cvsroots/wxwidgets/wxWidgets/contrib/src/deprecated/doslex.c,v 1.6 2005/06/09 18:37:44 ABX Exp $
   Last change:  JS   13 Jul 97    6:17 pm
  */
 /* Copyright: (c) Julian Smart */
diff -ur wxGTK-2.6.3/include/wx/version.h wxGTK-2.6.3.2/include/wx/version.h
--- wxGTK-2.6.3/include/wx/version.h	2006-03-21 18:42:08.000000000 -0500
+++ wxGTK-2.6.3.2/include/wx/version.h	2006-03-30 12:05:48.000000000 -0500
@@ -4,7 +4,7 @@
 *  Author:      Julian Smart
 *  Modified by: Ryan Norton (Converted to C)
 *  Created:     29/01/98
-*  RCS-ID:      $Id: version.h,v 1.69.2.2 2006/01/18 10:25:00 JS Exp $
+*  RCS-ID:      $Id: version.h,v 1.69.2.3 2006/03/30 17:05:48 RD Exp $
 *  Copyright:   (c) 1998 Julian Smart
 *  Licence:     wxWindows licence
 */
@@ -22,7 +22,7 @@
 #define wxMAJOR_VERSION      2
 #define wxMINOR_VERSION      6
 #define wxRELEASE_NUMBER     3
-#define wxSUBRELEASE_NUMBER  0
+#define wxSUBRELEASE_NUMBER  2
 #define wxVERSION_STRING   _T("wxWidgets 2.6.3")
 
 /*  nothing to update below this line when updating the version */
diff -ur wxGTK-2.6.3/locale/fr.po wxGTK-2.6.3.2/locale/fr.po
--- wxGTK-2.6.3/locale/fr.po	2006-03-21 18:42:51.000000000 -0500
+++ wxGTK-2.6.3.2/locale/fr.po	2005-09-20 11:18:55.000000000 -0400
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: wxWidgets-2.6.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-21 17:37+0200\n"
+"POT-Creation-Date: 2005-04-11 22:24+0200\n"
 "PO-Revision-Date: 2005-09-07 09:34+0200\n"
 "Last-Translator: Thomas Huriaux <thomas.huriaux at gmail.com>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -13,12 +13,12 @@
 "Content-Transfer-Encoding: 8bit\n"
 "plural-forms: nplurals=2; plural=n > 1\n"
 
-#: ../src/common/debugrpt.cpp:569
+#: ../src/common/debugrpt.cpp:547
 #, c-format
 msgid "\t%s: %s\n"
 msgstr "\t%s?: %s\n"
 
-#: ../src/common/debugrpt.cpp:572
+#: ../src/common/debugrpt.cpp:550
 msgid ""
 "\n"
 "Please send this report to the program maintainer, thank you!\n"
@@ -26,20 +26,20 @@
 "\n"
 "Veuillez envoyer ce rapport au responsable du programme.\n"
 
-#: ../src/palmos/utils.cpp:206
+#: ../src/palmos/utils.cpp:210
 msgid " "
 msgstr " "
 
-#: ../src/generic/dbgrptg.cpp:312
+#: ../src/generic/dbgrptg.cpp:293
 msgid "              Thank you and we're sorry for the inconvenience!\n"
 msgstr "              Merci et d?sol? pour le d?rangement.\n"
 
-#: ../src/common/log.cpp:321
+#: ../src/common/log.cpp:322
 #, c-format
 msgid " (error %ld: %s)"
 msgstr " (erreur %ld?: %s)"
 
-#: ../src/common/docview.cpp:1419
+#: ../src/common/docview.cpp:1380
 msgid " - "
 msgstr " - "
 
@@ -47,23 +47,23 @@
 msgid " Preview"
 msgstr " Aper?u"
 
-#: ../src/common/paper.cpp:124
+#: ../src/common/paper.cpp:134
 msgid "#10 Envelope, 4 1/8 x 9 1/2 in"
 msgstr "Enveloppe n??10 (4,125 x 9,5 pouces)"
 
-#: ../src/common/paper.cpp:125
+#: ../src/common/paper.cpp:135
 msgid "#11 Envelope, 4 1/2 x 10 3/8 in"
 msgstr "Enveloppe n??11 (4,5 x 10,375 pouces)"
 
-#: ../src/common/paper.cpp:126
+#: ../src/common/paper.cpp:136
 msgid "#12 Envelope, 4 3/4 x 11 in"
 msgstr "Enveloppe n??12 (4,75 x 11 pouces)"
 
-#: ../src/common/paper.cpp:127
+#: ../src/common/paper.cpp:137
 msgid "#14 Envelope, 5 x 11 1/2 in"
 msgstr "Enveloppe n??14 (5 x 11,5 pouces)"
 
-#: ../src/common/paper.cpp:123
+#: ../src/common/paper.cpp:133
 msgid "#9 Envelope, 3 7/8 x 8 7/8 in"
 msgstr "Enveloppe n??9 (3,875 x 8,875 pouces)"
 
@@ -74,13 +74,13 @@
 msgid "#define %s must be an integer."
 msgstr "#define %s doit ?tre un entier."
 
-#: ../src/html/helpfrm.cpp:1042 ../src/html/helpfrm.cpp:1044
-#: ../src/html/helpfrm.cpp:1703 ../src/html/helpfrm.cpp:1736
+#: ../src/html/helpfrm.cpp:1019 ../src/html/helpfrm.cpp:1021
+#: ../src/html/helpfrm.cpp:1689 ../src/html/helpfrm.cpp:1722
 #, c-format
 msgid "%i of %i"
 msgstr "%i de %i"
 
-#: ../src/generic/filedlgg.cpp:288
+#: ../src/generic/filedlgg.cpp:287
 #, c-format
 msgid "%ld bytes"
 msgstr "%ld octets"
@@ -90,27 +90,27 @@
 msgid "%s (or %s)"
 msgstr "%s (ou %s)"
 
-#: ../src/generic/logg.cpp:261
+#: ../src/generic/logg.cpp:262
 #, c-format
 msgid "%s Error"
 msgstr "%s Erreur"
 
-#: ../src/generic/logg.cpp:269
+#: ../src/generic/logg.cpp:270
 #, c-format
 msgid "%s Information"
 msgstr "%s Information"
 
[...16204 lines suppressed...]
--- wxGTK-2.6.3/src/tiff/tif_next.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_next.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_next.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_next.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_open.c wxGTK-2.6.3.2/src/tiff/tif_open.c
--- wxGTK-2.6.3/src/tiff/tif_open.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_open.c	2005-05-31 05:28:43.000000000 -0400
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_open.c,v 1.5 2005/05/31 09:28:43 JS Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_open.c,v 1.5 2005/05/31 09:28:43 JS Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_os2.c wxGTK-2.6.3.2/src/tiff/tif_os2.c
--- wxGTK-2.6.3/src/tiff/tif_os2.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_os2.c	2002-12-04 09:10:19.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_os2.c,v 1.2 2002/12/04 14:10:19 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_os2.c,v 1.2 2002/12/04 14:10:19 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_packbits.c wxGTK-2.6.3.2/src/tiff/tif_packbits.c
--- wxGTK-2.6.3/src/tiff/tif_packbits.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_packbits.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_packbits.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_packbits.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_predict.c wxGTK-2.6.3.2/src/tiff/tif_predict.c
--- wxGTK-2.6.3/src/tiff/tif_predict.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_predict.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_predict.c,v 1.6 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_predict.c,v 1.6 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_predict.h wxGTK-2.6.3.2/src/tiff/tif_predict.h
--- wxGTK-2.6.3/src/tiff/tif_predict.h	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_predict.h	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_predict.h,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_predict.h,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1995-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_print.c wxGTK-2.6.3.2/src/tiff/tif_print.c
--- wxGTK-2.6.3/src/tiff/tif_print.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_print.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_print.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_print.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_read.c wxGTK-2.6.3.2/src/tiff/tif_read.c
--- wxGTK-2.6.3/src/tiff/tif_read.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_read.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_read.c,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_read.c,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_strip.c wxGTK-2.6.3.2/src/tiff/tif_strip.c
--- wxGTK-2.6.3/src/tiff/tif_strip.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_strip.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_strip.c,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_strip.c,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1991-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_swab.c wxGTK-2.6.3.2/src/tiff/tif_swab.c
--- wxGTK-2.6.3/src/tiff/tif_swab.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_swab.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_swab.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_swab.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_thunder.c wxGTK-2.6.3.2/src/tiff/tif_thunder.c
--- wxGTK-2.6.3/src/tiff/tif_thunder.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_thunder.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_thunder.c,v 1.4 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_thunder.c,v 1.4 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_tile.c wxGTK-2.6.3.2/src/tiff/tif_tile.c
--- wxGTK-2.6.3/src/tiff/tif_tile.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_tile.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_tile.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_tile.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1991-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_unix.c wxGTK-2.6.3.2/src/tiff/tif_unix.c
--- wxGTK-2.6.3/src/tiff/tif_unix.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_unix.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_unix.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_unix.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_version.c wxGTK-2.6.3.2/src/tiff/tif_version.c
--- wxGTK-2.6.3/src/tiff/tif_version.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_version.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_version.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_version.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 /*
  * Copyright (c) 1992-1997 Sam Leffler
  * Copyright (c) 1992-1997 Silicon Graphics, Inc.
diff -ur wxGTK-2.6.3/src/tiff/tif_vms.c wxGTK-2.6.3.2/src/tiff/tif_vms.c
--- wxGTK-2.6.3/src/tiff/tif_vms.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_vms.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_vms.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_vms.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_warning.c wxGTK-2.6.3.2/src/tiff/tif_warning.c
--- wxGTK-2.6.3/src/tiff/tif_warning.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_warning.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_warning.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_warning.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_win32.c wxGTK-2.6.3.2/src/tiff/tif_win32.c
--- wxGTK-2.6.3/src/tiff/tif_win32.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_win32.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_win32.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_win32.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_win3.c wxGTK-2.6.3.2/src/tiff/tif_win3.c
--- wxGTK-2.6.3/src/tiff/tif_win3.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_win3.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_win3.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_win3.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_write.c wxGTK-2.6.3.2/src/tiff/tif_write.c
--- wxGTK-2.6.3/src/tiff/tif_write.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_write.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_write.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_write.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_zip.c wxGTK-2.6.3.2/src/tiff/tif_zip.c
--- wxGTK-2.6.3/src/tiff/tif_zip.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_zip.c	2004-11-19 17:29:47.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_zip.c,v 1.4 2004/11/19 22:29:47 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_zip.c,v 1.4 2004/11/19 22:29:47 VZ Exp $ */
 
 /*
  * Copyright (c) 1995-1997 Sam Leffler
diff -ur wxGTK-2.6.3/utils/helpview/src/helpview.cpp wxGTK-2.6.3.2/utils/helpview/src/helpview.cpp
--- wxGTK-2.6.3/utils/helpview/src/helpview.cpp	2006-03-21 18:42:49.000000000 -0500
+++ wxGTK-2.6.3.2/utils/helpview/src/helpview.cpp	2006-03-30 06:35:12.000000000 -0500
@@ -5,7 +5,7 @@
 // Author:      Vaclav Slavik, Julian Smart
 // Modified by:
 // Created:     2002-07-09
-// RCS-ID:      $Id: helpview.cpp,v 1.14 2005/05/30 09:24:08 ABX Exp $
+// RCS-ID:      $Id: helpview.cpp,v 1.14.2.1 2006/03/30 11:35:12 JS Exp $
 // Copyright:   (c) 2002 Vaclav Slavik, Julian Smart and others
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -63,7 +63,7 @@
 
 #ifdef __WXMAC__
     wxApp::s_macAboutMenuItemId = wxID_ABOUT;
-    wxFileName::MacRegisterDefaultTypeAndCreator( "htb" , 'HTBD' , 'HTBA' ) ;
+    wxFileName::MacRegisterDefaultTypeAndCreator( wxT("htb") , 'HTBD' , 'HTBA' ) ;
 #endif
 
     int istyle = wxHF_DEFAULT_STYLE;


Index: wxGTK.spec
===================================================================
RCS file: /cvs/extras/rpms/wxGTK/devel/wxGTK.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- wxGTK.spec	31 Mar 2006 18:44:56 -0000	1.19
+++ wxGTK.spec	13 Apr 2006 19:11:46 -0000	1.20
@@ -6,7 +6,7 @@
 
 Name:           wxGTK
 Version:        2.6.3
-Release:        1%{?dist}
+Release:        2.6.3.2.0%{?dist}
 Summary:        GTK2 port of the wxWidgets GUI library
 # The wxWindows licence is the LGPL with a specific exemption allowing
 # distribution of derived binaries under any terms. (This will eventually
@@ -15,12 +15,13 @@
 Group:          System Environment/Libraries
 URL:            http://www.wxwidgets.org/
 Source0:        http://dl.sf.net/wxwindows/%{name}-%{version}.tar.bz2
+Patch0:         wxGTK-2.6.3.2-cvs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel, zlib-devel >= 1.1.4
 BuildRequires:  libpng-devel, libjpeg-devel, libtiff-devel
 BuildRequires:  expat-devel, SDL-devel, libgnomeprintui22-devel
-BuildRequires:  libGL-devel, libGLU-devel
+BuildRequires:  mesa-libGL-devel, mesa-libGLU-devel
 %if %{withodbc}
 BuildRequires:  unixODBC-devel
 %endif
@@ -87,6 +88,8 @@
 %prep
 %setup -q
 
+%patch0 -p1 -b .2.6.3.2
+
 sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
 
 
@@ -190,11 +193,10 @@
 %endif
 
 %changelog
-* Fri May 31 2006 Matthwe Miller <mattdm at mattdm.org> - 2.6.3-1
-- mesa-*-devel buildrequires to just *-devel, for building on FC4 and
-  for The Future
+* Thu Apr 13 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3-2.6.3.2.0
+- patch to cvs subrelease 2.6.3.2 (matches wxPython)
 
-* Sat Mar 25 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3-0    
+* Sat Mar 25 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3-1    
 - 2.6.3 final
 - remove the locale_install thing -- that was just an issue with using the
   release candidate.
@@ -250,7 +252,7 @@
   Add dist tag.
 - From Tom Callaway: Build and include libwx_gtk2u_animate-2.6.
 
-
+* Thu Apr 28 2005 Matthew Miller <mattdm at mattdm.org> 2.6.1-0.1
 - update to 2.6.1
 - from Michael Schwendt in 2.4.2-11 package: build-require
   xorg-x11-Mesa-libGL and xorg-x11-Mesa-libGLU (the libGL and libGLU



From fedora-extras-commits at redhat.com  Thu Apr 13 19:30:29 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Apr 2006 12:30:29 -0700
Subject: rpms/kmymoney2/FC-3 kmymoney2.spec,1.6,1.7
Message-ID: <200604131930.k3DJUVHT013536@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kmymoney2/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13519

Modified Files:
	kmymoney2.spec 
Log Message:
* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
- desktop-file-install --vendor=""



Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/FC-3/kmymoney2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kmymoney2.spec	22 Feb 2006 15:32:19 -0000	1.6
+++ kmymoney2.spec	13 Apr 2006 19:30:29 -0000	1.7
@@ -17,7 +17,7 @@
 Summary: Personal finance 
 Name:	 kmymoney2
 Version: 0.8.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 Url:	 http://kmymoney2.sourceforge.net/
@@ -78,11 +78,10 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install --vendor fedora \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/appl*/*/*.desktop
+desktop-file-install \
+  --add-category X-Fedora -vendor="" \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
 
 ## File lists
 # locale's
@@ -130,8 +129,8 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/kmymoney*
-%{_datadir}/apps/kmymoney2
-%{_datadir}/applications/*.desktop
+%{_datadir}/apps/kmymoney2/
+%{_datadir}/applications/kde/*.desktop
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/icons/locolor/*/*/*
 %{_datadir}/mimelnk/*/*.desktop
@@ -154,6 +153,9 @@
 
 
 %changelog
+* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
+- desktop-file-install --vendor=""
+
 * Wed Feb 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-1
 - 0.8.3
 



From fedora-extras-commits at redhat.com  Thu Apr 13 19:30:45 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Apr 2006 12:30:45 -0700
Subject: rpms/kmymoney2/FC-4 kmymoney2.spec,1.6,1.7
Message-ID: <200604131930.k3DJUl10013597@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	kmymoney2.spec 
Log Message:
* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
- desktop-file-install --vendor=""



Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/FC-4/kmymoney2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kmymoney2.spec	22 Feb 2006 15:28:24 -0000	1.6
+++ kmymoney2.spec	13 Apr 2006 19:30:44 -0000	1.7
@@ -17,7 +17,7 @@
 Summary: Personal finance 
 Name:	 kmymoney2
 Version: 0.8.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 Url:	 http://kmymoney2.sourceforge.net/
@@ -78,11 +78,10 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install --vendor fedora \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/appl*/*/*.desktop
+desktop-file-install \
+  --add-category X-Fedora -vendor="" \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
 
 ## File lists
 # locale's
@@ -130,8 +129,8 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/kmymoney*
-%{_datadir}/apps/kmymoney2
-%{_datadir}/applications/*.desktop
+%{_datadir}/apps/kmymoney2/
+%{_datadir}/applications/kde/*.desktop
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/icons/locolor/*/*/*
 %{_datadir}/mimelnk/*/*.desktop
@@ -154,6 +153,9 @@
 
 
 %changelog
+* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
+- desktop-file-install --vendor=""
+
 * Wed Feb 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-1
 - 0.8.3
 



From fedora-extras-commits at redhat.com  Thu Apr 13 19:31:07 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Apr 2006 12:31:07 -0700
Subject: rpms/kmymoney2/FC-5 kmymoney2.spec,1.11,1.12
Message-ID: <200604131931.k3DJV9FQ013658@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	kmymoney2.spec 
Log Message:
* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
- desktop-file-install --vendor=""



Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/FC-5/kmymoney2.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kmymoney2.spec	22 Feb 2006 15:00:30 -0000	1.11
+++ kmymoney2.spec	13 Apr 2006 19:31:07 -0000	1.12
@@ -17,7 +17,7 @@
 Summary: Personal finance 
 Name:	 kmymoney2
 Version: 0.8.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 Url:	 http://kmymoney2.sourceforge.net/
@@ -78,11 +78,10 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install --vendor fedora \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/appl*/*/*.desktop
+desktop-file-install \
+  --add-category X-Fedora -vendor="" \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
 
 ## File lists
 # locale's
@@ -130,8 +129,8 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/kmymoney*
-%{_datadir}/apps/kmymoney2
-%{_datadir}/applications/*.desktop
+%{_datadir}/apps/kmymoney2/
+%{_datadir}/applications/kde/*.desktop
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/icons/locolor/*/*/*
 %{_datadir}/mimelnk/*/*.desktop
@@ -154,6 +153,9 @@
 
 
 %changelog
+* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
+- desktop-file-install --vendor=""
+
 * Wed Feb 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-1
 - 0.8.3
 



From fedora-extras-commits at redhat.com  Thu Apr 13 19:31:24 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Apr 2006 12:31:24 -0700
Subject: rpms/kmymoney2/devel kmymoney2.spec,1.11,1.12
Message-ID: <200604131931.k3DJVQmm013720@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	kmymoney2.spec 
Log Message:
* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
- desktop-file-install --vendor=""



Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/devel/kmymoney2.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kmymoney2.spec	22 Feb 2006 15:00:30 -0000	1.11
+++ kmymoney2.spec	13 Apr 2006 19:31:24 -0000	1.12
@@ -17,7 +17,7 @@
 Summary: Personal finance 
 Name:	 kmymoney2
 Version: 0.8.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 Url:	 http://kmymoney2.sourceforge.net/
@@ -78,11 +78,10 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install --vendor fedora \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/appl*/*/*.desktop
+desktop-file-install \
+  --add-category X-Fedora -vendor="" \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
 
 ## File lists
 # locale's
@@ -130,8 +129,8 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/kmymoney*
-%{_datadir}/apps/kmymoney2
-%{_datadir}/applications/*.desktop
+%{_datadir}/apps/kmymoney2/
+%{_datadir}/applications/kde/*.desktop
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/icons/locolor/*/*/*
 %{_datadir}/mimelnk/*/*.desktop
@@ -154,6 +153,9 @@
 
 
 %changelog
+* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
+- desktop-file-install --vendor=""
+
 * Wed Feb 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-1
 - 0.8.3
 



From fedora-extras-commits at redhat.com  Thu Apr 13 19:47:36 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Apr 2006 12:47:36 -0700
Subject: rpms/kmymoney2/devel kmymoney2.spec,1.12,1.13
Message-ID: <200604131947.k3DJlcDQ013806@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	kmymoney2.spec 
Log Message:
* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-3
- desktop-file-install --vendor=""



Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/devel/kmymoney2.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kmymoney2.spec	13 Apr 2006 19:31:24 -0000	1.12
+++ kmymoney2.spec	13 Apr 2006 19:47:36 -0000	1.13
@@ -17,7 +17,7 @@
 Summary: Personal finance 
 Name:	 kmymoney2
 Version: 0.8.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL
 Url:	 http://kmymoney2.sourceforge.net/
@@ -79,7 +79,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install \
-  --add-category X-Fedora -vendor="" \
+  --add-category X-Fedora --vendor="" \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
   $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
 
@@ -153,7 +153,7 @@
 
 
 %changelog
-* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
+* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-3
 - desktop-file-install --vendor=""
 
 * Wed Feb 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-1



From fedora-extras-commits at redhat.com  Thu Apr 13 20:03:21 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Apr 2006 13:03:21 -0700
Subject: rpms/kmymoney2/FC-5 kmymoney2.spec,1.12,1.13
Message-ID: <200604132003.k3DK3NSk015933@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	kmymoney2.spec 
Log Message:
* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-3
- desktop-file-install --vendor=""



Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/FC-5/kmymoney2.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kmymoney2.spec	13 Apr 2006 19:31:07 -0000	1.12
+++ kmymoney2.spec	13 Apr 2006 20:03:20 -0000	1.13
@@ -17,7 +17,7 @@
 Summary: Personal finance 
 Name:	 kmymoney2
 Version: 0.8.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL
 Url:	 http://kmymoney2.sourceforge.net/
@@ -79,7 +79,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install \
-  --add-category X-Fedora -vendor="" \
+  --add-category X-Fedora --vendor="" \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
   $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
 
@@ -153,7 +153,7 @@
 
 
 %changelog
-* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
+* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-3
 - desktop-file-install --vendor=""
 
 * Wed Feb 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-1



From fedora-extras-commits at redhat.com  Thu Apr 13 20:03:36 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Apr 2006 13:03:36 -0700
Subject: rpms/kmymoney2/FC-4 kmymoney2.spec,1.7,1.8
Message-ID: <200604132003.k3DK3c0X015994@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	kmymoney2.spec 
Log Message:
* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-3
- desktop-file-install --vendor=""



Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/FC-4/kmymoney2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kmymoney2.spec	13 Apr 2006 19:30:44 -0000	1.7
+++ kmymoney2.spec	13 Apr 2006 20:03:36 -0000	1.8
@@ -17,7 +17,7 @@
 Summary: Personal finance 
 Name:	 kmymoney2
 Version: 0.8.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL
 Url:	 http://kmymoney2.sourceforge.net/
@@ -79,7 +79,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install \
-  --add-category X-Fedora -vendor="" \
+  --add-category X-Fedora --vendor="" \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
   $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
 
@@ -153,7 +153,7 @@
 
 
 %changelog
-* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
+* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-3
 - desktop-file-install --vendor=""
 
 * Wed Feb 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-1



From fedora-extras-commits at redhat.com  Thu Apr 13 20:04:00 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Apr 2006 13:04:00 -0700
Subject: rpms/kmymoney2/FC-3 kmymoney2.spec,1.7,1.8
Message-ID: <200604132004.k3DK42Fv016057@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kmymoney2/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16040

Modified Files:
	kmymoney2.spec 
Log Message:
* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-3
- desktop-file-install --vendor=""



Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/FC-3/kmymoney2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kmymoney2.spec	13 Apr 2006 19:30:29 -0000	1.7
+++ kmymoney2.spec	13 Apr 2006 20:03:59 -0000	1.8
@@ -17,7 +17,7 @@
 Summary: Personal finance 
 Name:	 kmymoney2
 Version: 0.8.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL
 Url:	 http://kmymoney2.sourceforge.net/
@@ -79,7 +79,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install \
-  --add-category X-Fedora -vendor="" \
+  --add-category X-Fedora --vendor="" \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
   $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
 
@@ -153,7 +153,7 @@
 
 
 %changelog
-* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
+* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-3
 - desktop-file-install --vendor=""
 
 * Wed Feb 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-1



From fedora-extras-commits at redhat.com  Thu Apr 13 20:59:38 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Apr 2006 13:59:38 -0700
Subject: rpms/kasablanca/devel kasablanca.spec,1.15,1.16
Message-ID: <200604132059.k3DKxeV3016312@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	kasablanca.spec 
Log Message:
* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.0.2-8
- --vendor: fedora -> kde



Index: kasablanca.spec
===================================================================
RCS file: /cvs/extras/rpms/kasablanca/devel/kasablanca.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- kasablanca.spec	1 Mar 2006 16:27:16 -0000	1.15
+++ kasablanca.spec	13 Apr 2006 20:59:37 -0000	1.16
@@ -2,7 +2,7 @@
 Name:    kasablanca
 Summary: Graphical FTP client
 Version: 0.4.0.2
-Release: 7%{?dist}.3
+Release: 8%{?dist}
 
 License: GPL
 Url: 	 http://kasablanca.berlios.de/ 
@@ -57,14 +57,14 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --vendor fedora \
-  --add-category "X-Fedora" \
-  --add-category "Network" \
-  --add-category "Application" \
-  --add-category "KDE" \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  --vendor="" \
+  --add-category="X-Fedora" \
+  --add-category="Network" \
+  --add-category="Application" \
+  --add-category="KDE" \
   --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/appl*/*/*.desktop
+  $RPM_BUILD_ROOT%{_datadir}/applnk/*/*.desktop
 
 ## File lists
 # locale's
@@ -109,13 +109,16 @@
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING NEWS README 
 %{_bindir}/*
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/kde/*.desktop
 %{_datadir}/apps/kasablanca/
 %config %{_datadir}/config*/*
 %{_datadir}/icons/hicolor/*/*/*
 
 
 %changelog
+* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.0.2-8
+- --vendor: fedora -> kde
+
 * Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net>
 - fc5: gcc/glibc respin
 



From fedora-extras-commits at redhat.com  Thu Apr 13 20:59:53 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Apr 2006 13:59:53 -0700
Subject: rpms/kasablanca/FC-5 kasablanca.spec,1.15,1.16
Message-ID: <200604132059.k3DKxtZc016373@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	kasablanca.spec 
Log Message:
* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.0.2-8
- --vendor: fedora -> kde



Index: kasablanca.spec
===================================================================
RCS file: /cvs/extras/rpms/kasablanca/FC-5/kasablanca.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- kasablanca.spec	1 Mar 2006 16:27:16 -0000	1.15
+++ kasablanca.spec	13 Apr 2006 20:59:52 -0000	1.16
@@ -2,7 +2,7 @@
 Name:    kasablanca
 Summary: Graphical FTP client
 Version: 0.4.0.2
-Release: 7%{?dist}.3
+Release: 8%{?dist}
 
 License: GPL
 Url: 	 http://kasablanca.berlios.de/ 
@@ -57,14 +57,14 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --vendor fedora \
-  --add-category "X-Fedora" \
-  --add-category "Network" \
-  --add-category "Application" \
-  --add-category "KDE" \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  --vendor="" \
+  --add-category="X-Fedora" \
+  --add-category="Network" \
+  --add-category="Application" \
+  --add-category="KDE" \
   --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/appl*/*/*.desktop
+  $RPM_BUILD_ROOT%{_datadir}/applnk/*/*.desktop
 
 ## File lists
 # locale's
@@ -109,13 +109,16 @@
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING NEWS README 
 %{_bindir}/*
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/kde/*.desktop
 %{_datadir}/apps/kasablanca/
 %config %{_datadir}/config*/*
 %{_datadir}/icons/hicolor/*/*/*
 
 
 %changelog
+* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.0.2-8
+- --vendor: fedora -> kde
+
 * Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net>
 - fc5: gcc/glibc respin
 



From fedora-extras-commits at redhat.com  Thu Apr 13 21:00:07 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Apr 2006 14:00:07 -0700
Subject: rpms/kasablanca/FC-4 kasablanca.spec,1.11,1.12
Message-ID: <200604132100.k3DL09JB016448@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	kasablanca.spec 
Log Message:
* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.0.2-8
- --vendor: fedora -> kde



Index: kasablanca.spec
===================================================================
RCS file: /cvs/extras/rpms/kasablanca/FC-4/kasablanca.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kasablanca.spec	19 Jan 2006 15:59:20 -0000	1.11
+++ kasablanca.spec	13 Apr 2006 21:00:07 -0000	1.12
@@ -2,7 +2,7 @@
 Name:    kasablanca
 Summary: Graphical FTP client
 Version: 0.4.0.2
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 License: GPL
 Url: 	 http://kasablanca.berlios.de/ 
@@ -40,7 +40,7 @@
 
 # Needed(?) for older/legacy setups, harmless otherwise
 if pkg-config openssl ; then
-  export CPPFLAGS="$CPPFLAGS `pkg-config --cflags-only-I openssl`"
+  export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags-only-I openssl)"
 fi
 
 %configure \
@@ -56,14 +56,15 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --delete-original --vendor fedora \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category "X-Fedora" \
-  --add-category "Network" \
-  --add-category "Application" \
-  --add-category "KDE" \
-  $RPM_BUILD_ROOT%{_datadir}/appl*/*/*.desktop
+desktop-file-install \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  --vendor="" \
+  --add-category="X-Fedora" \
+  --add-category="Network" \
+  --add-category="Application" \
+  --add-category="KDE" \
+  --delete-original \
+  $RPM_BUILD_ROOT%{_datadir}/applnk/*/*.desktop
 
 ## File lists
 # locale's
@@ -108,13 +109,19 @@
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING NEWS README 
 %{_bindir}/*
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/kde/*.desktop
 %{_datadir}/apps/kasablanca/
 %config %{_datadir}/config*/*
 %{_datadir}/icons/hicolor/*/*/*
 
 
 %changelog
+* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.0.2-8
+- --vendor: fedora -> kde
+
+* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net>
+- fc5: gcc/glibc respin
+
 * Thu Jan 19 2006 Rex Dieter <rexdieter[AT]usrs.sf.net> 0.4.0.2-7
 - drop x-modular hack(s) (kdelibs-devel fixed)
 - .desktop: GenericName=FTP client



From fedora-extras-commits at redhat.com  Thu Apr 13 21:00:24 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Apr 2006 14:00:24 -0700
Subject: rpms/kasablanca/FC-3 kasablanca.spec,1.8,1.9
Message-ID: <200604132100.k3DL0QLa016515@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kasablanca/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16498

Modified Files:
	kasablanca.spec 
Log Message:
* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.0.2-8
- --vendor: fedora -> kde



Index: kasablanca.spec
===================================================================
RCS file: /cvs/extras/rpms/kasablanca/FC-3/kasablanca.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kasablanca.spec	19 Dec 2005 18:14:25 -0000	1.8
+++ kasablanca.spec	13 Apr 2006 21:00:24 -0000	1.9
@@ -2,7 +2,7 @@
 Name:    kasablanca
 Summary: Graphical FTP client
 Version: 0.4.0.2
-Release: 5%{?dist}
+Release: 8%{?dist}
 
 License: GPL
 Url: 	 http://kasablanca.berlios.de/ 
@@ -10,19 +10,29 @@
 Group: 	 Applications/Internet 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: kasablanca-0.4.0.2-dt.patch
+
 BuildRequires: gettext 
 BuildRequires: desktop-file-utils
 BuildRequires: openssl-devel
 BuildRequires: kdelibs-devel >= 6:3.3
 
 %description
-Kasablanca is an ftp client for KDE, among its features are currently 
-encryption (auth tls) support, fxp, site bookmarks, and queued transfers.
+Kasablanca is an ftp client for KDE, among its features are currently: 
+* ftps encryption via AUTH TLS
+* fxp (direct server to server transfer), supporting alternative mode.
+* advanced bookmarking system.
+* fast responsive multithreaded engine.
+* concurrent connections to multiple hosts.
+* interactive transfer queue, movable by drag and drop.
+* small nifty features, like a skiplist.
 
 
 %prep
 %setup -q 
 
+%patch1 -p1 -b .dt
+
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -30,7 +40,7 @@
 
 # Needed(?) for older/legacy setups, harmless otherwise
 if pkg-config openssl ; then
-  export CPPFLAGS="$CPPFLAGS `pkg-config --cflags-only-I openssl`"
+  export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags-only-I openssl)"
 fi
 
 %configure \
@@ -46,14 +56,15 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --delete-original --vendor fedora \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category "X-Fedora" \
-  --add-category "Network" \
-  --add-category "Application" \
-  --add-category "KDE" \
-  $RPM_BUILD_ROOT%{_datadir}/appl*/*/*.desktop
+desktop-file-install \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  --vendor="" \
+  --add-category="X-Fedora" \
+  --add-category="Network" \
+  --add-category="Application" \
+  --add-category="KDE" \
+  --delete-original \
+  $RPM_BUILD_ROOT%{_datadir}/applnk/*/*.desktop
 
 ## File lists
 # locale's
@@ -98,13 +109,28 @@
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING NEWS README 
 %{_bindir}/*
-%{_datadir}/applications/*.desktop
-%{_datadir}/apps/%{name}
+%{_datadir}/applications/kde/*.desktop
+%{_datadir}/apps/kasablanca/
 %config %{_datadir}/config*/*
 %{_datadir}/icons/hicolor/*/*/*
 
 
 %changelog
+* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.0.2-8
+- --vendor: fedora -> kde
+
+* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net>
+- fc5: gcc/glibc respin
+
+* Thu Jan 19 2006 Rex Dieter <rexdieter[AT]usrs.sf.net> 0.4.0.2-7
+- drop x-modular hack(s) (kdelibs-devel fixed)
+- .desktop: GenericName=FTP client
+- update %%description
+
+* Mon Dec 19 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.0.2-6
+- fix for modular X
+- workaround kdelibs-devel missing deps (#176159)
+
 * Mon Dec 19 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.0.2-5
 - %%post/%%postun: nicer icon bits
 



From fedora-extras-commits at redhat.com  Thu Apr 13 21:06:19 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Apr 2006 14:06:19 -0700
Subject: rpms/kasablanca/FC-3 kasablanca-0.4.0.2-dt.patch,NONE,1.1
Message-ID: <200604132106.k3DL6M3B018675@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kasablanca/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18654

Added Files:
	kasablanca-0.4.0.2-dt.patch 
Log Message:
import


kasablanca-0.4.0.2-dt.patch:

--- NEW FILE kasablanca-0.4.0.2-dt.patch ---
--- kasablanca-0.4.0.2/src/kasablanca.desktop.dt	2004-03-22 12:58:39.000000000 -0600
+++ kasablanca-0.4.0.2/src/kasablanca.desktop	2006-01-19 09:48:07.000000000 -0600
@@ -1,26 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=kasablanca
-Name[xx]=xxkasablancaxx
+GenericName=FTP Client
 Exec=kasablanca
 Icon=kasablanca
 Type=Application
-Comment=A simple KDE Application
-Comment[ca]=Una simple aplicaci?? KDE
-Comment[da]=Et simpelt KDE program
-Comment[de]=Eine einfache KDE-Anwendung
-Comment[el]=?????? ???????? ???????????????? ?????? KDE
-Comment[es]=Una aplicaci??n de KDE sencilla
-Comment[et]=Lihtne KDE rakendus
-Comment[fr]=Une application simple pour KDE.
-Comment[hu]=Egyszer?? KDE-alkalmaz??s
-Comment[it]=Una semplice applicazione KDE
-Comment[nl]=Een eenvoudige KDE-toepassing
-Comment[pt]=Uma aplica????o KDE simples
-Comment[pt_BR]=Um simples Aplicativo do KDE
-Comment[ru]=?????????????? ???????????????????? KDE
-Comment[sl]=Preprost program za KDE
-Comment[sr]=?????????????????????? KDE ??????????????
-Comment[sv]=Ett enkelt KDE-program
-Comment[xx]=xxA simple KDE Applicationxx
-Comment[zh_CN]=???????????????KDE????????????



From fedora-extras-commits at redhat.com  Thu Apr 13 21:08:33 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Apr 2006 14:08:33 -0700
Subject: rpms/kasablanca/FC-3 kasablanca.spec,1.9,1.10
Message-ID: <200604132108.k3DL8ZcB018756@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kasablanca/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18734

Modified Files:
	kasablanca.spec 
Log Message:
fc3 respin for missing patch



Index: kasablanca.spec
===================================================================
RCS file: /cvs/extras/rpms/kasablanca/FC-3/kasablanca.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kasablanca.spec	13 Apr 2006 21:00:24 -0000	1.9
+++ kasablanca.spec	13 Apr 2006 21:08:33 -0000	1.10
@@ -2,7 +2,7 @@
 Name:    kasablanca
 Summary: Graphical FTP client
 Version: 0.4.0.2
-Release: 8%{?dist}
+Release: 8%{?dist}.1
 
 License: GPL
 Url: 	 http://kasablanca.berlios.de/ 



From fedora-extras-commits at redhat.com  Thu Apr 13 21:09:03 2006
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 13 Apr 2006 14:09:03 -0700
Subject: rpms/wxPython/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 wxPython.spec, 1.10, 1.11
Message-ID: <200604132109.k3DL95MM018830@cvs-int.fedora.redhat.com>

Author: mattdm

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

Modified Files:
	.cvsignore sources wxPython.spec 
Log Message:
- version 2.6.3.2
- move wxversion.py _into_ lib64. Apparently that's the right thing to do.
  :)
- upstream tarball no longer includes embedded.o (since I finally got around
  to pointing that out to the developers instead of just kludging it away.)
- buildrequires to just libGLU-devel instead of mesa-libGL-devel



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wxPython/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	31 Mar 2006 02:23:27 -0000	1.4
+++ .cvsignore	13 Apr 2006 21:09:03 -0000	1.5
@@ -1 +1 @@
-wxPython-src-2.6.3.0.tar.gz
+wxPython-src-2.6.3.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wxPython/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	31 Mar 2006 02:23:27 -0000	1.4
+++ sources	13 Apr 2006 21:09:03 -0000	1.5
@@ -1 +1 @@
-2891a496f4a415179e6a231619344b27  wxPython-src-2.6.3.0.tar.gz
+a27546fab8a8d77eb6b67954e6362269  wxPython-src-2.6.3.2.tar.gz


Index: wxPython.spec
===================================================================
RCS file: /cvs/extras/rpms/wxPython/devel/wxPython.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- wxPython.spec	31 Mar 2006 18:46:12 -0000	1.10
+++ wxPython.spec	13 Apr 2006 21:09:03 -0000	1.11
@@ -4,8 +4,8 @@
 %define buildflags WXPORT=gtk2 UNICODE=1
 
 Name:           wxPython
-Version:        2.6.3.0
-Release:        5%{?dist}
+Version:        2.6.3.2
+Release:        1%{?dist}
 
 Summary:        GUI toolkit for the Python programming language
 
@@ -17,7 +17,7 @@
 
 BuildRequires:  wxGTK-devel = 2.6.3, pkgconfig
 BuildRequires:  zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel
-BuildRequires:  libGLU-devel
+BuildRequires:  libGL-devel, libGLU-devel
 BuildRequires:  python-devel, wxGTK-gl
 
 # packages should depend on "wxPython", not "wxPythonGTK2", but in case
@@ -46,9 +46,6 @@
 %prep
 %setup -q -n wxPython-src-%{version}
 
-# There's binaries included in the source tarball, resulting in bogus
-# dependencies for the package -- clean it up:
-rm wxPython/samples/embedded/embedded wxPython/samples/embedded/embedded.o
 
 %build
 # Just build the wxPython part, not all of wxWindows which we already have
@@ -64,6 +61,11 @@
 cd wxPython
 python setup.py %{buildflags} install --root=$RPM_BUILD_ROOT
 
+# this is a kludge....
+%if "%{python_sitelib}" != "%{python_sitearch}"
+mv $RPM_BUILD_ROOT%{python_sitelib}/wx.pth  $RPM_BUILD_ROOT%{python_sitearch}
+mv $RPM_BUILD_ROOT%{python_sitelib}/wxversion.py* $RPM_BUILD_ROOT%{python_sitearch}
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -73,8 +75,8 @@
 %defattr(-,root,root,-)
 %doc wxPython/docs wxPython/demo wxPython/licence/ wxPython/samples
 %{_bindir}/*
-%{python_sitelib}/wx.pth
-%{python_sitelib}/wxversion.py*
+%{python_sitearch}/wx.pth
+%{python_sitearch}/wxversion.py*
 %dir %{python_sitearch}/wx-2.6-gtk2-unicode/
 %{python_sitearch}/wx-2.6-gtk2-unicode/wx
 %{python_sitearch}/wx-2.6-gtk2-unicode/wxPython
@@ -90,8 +92,12 @@
 
 
 %changelog
-* Fri Mar 31 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3.0-5
-- mesa-libGLU-devel -> libGLU-devel, for FC4 and for The Future
+* Thu Apr 13 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3.2-1
+- version 2.6.3.2
+- move wxversion.py _into_ lib64. Apparently that's the right thing to do. :)
+- upstream tarball no longer includes embedded.o (since I finally got around
+  to pointing that out to the developers instead of just kludging it away.)
+- buildrequires to just libGLU-devel instead of mesa-libGL-devel
 
 * Fri Mar 31 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3.0-4
 - grr. bump relnumber.



From fedora-extras-commits at redhat.com  Thu Apr 13 21:50:31 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 14:50:31 -0700
Subject: rpms/perl-Params-Check - New directory
Message-ID: <200604132150.k3DLoXI9019233@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Params-Check
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19212/perl-Params-Check

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




From fedora-extras-commits at redhat.com  Thu Apr 13 21:50:32 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 14:50:32 -0700
Subject: rpms/perl-Params-Check/devel - New directory
Message-ID: <200604132150.k3DLoYew019236@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Params-Check/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19212/perl-Params-Check/devel

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




From fedora-extras-commits at redhat.com  Thu Apr 13 21:51:17 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 14:51:17 -0700
Subject: rpms/perl-Params-Check Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604132151.k3DLpJYA019285@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Params-Check
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19257

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


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

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

common : CVS/Root
	@cvs 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 Apr 13 21:51:17 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 14:51:17 -0700
Subject: rpms/perl-Params-Check/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200604132151.k3DLpJLu019288@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Params-Check/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19257/devel

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


--- 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 Apr 13 21:52:38 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 14:52:38 -0700
Subject: rpms/perl-Params-Check import.log,1.1,1.2
Message-ID: <200604132152.k3DLqegR019363@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Params-Check
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19328

Modified Files:
	import.log 
Log Message:
auto-import perl-Params-Check-0.24-1 on branch devel from perl-Params-Check-0.24-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Check/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Apr 2006 21:51:16 -0000	1.1
+++ import.log	13 Apr 2006 21:52:38 -0000	1.2
@@ -0,0 +1 @@
+perl-Params-Check-0_24-1:HEAD:perl-Params-Check-0.24-1.src.rpm:1144965133



From fedora-extras-commits at redhat.com  Thu Apr 13 21:52:39 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 14:52:39 -0700
Subject: rpms/perl-Params-Check/devel perl-Params-Check.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604132152.k3DLqfxO019368@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Params-Check/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19328/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Params-Check.spec 
Log Message:
auto-import perl-Params-Check-0.24-1 on branch devel from perl-Params-Check-0.24-1.src.rpm


--- NEW FILE perl-Params-Check.spec ---
Name:           perl-Params-Check
Version:        0.24
Release:        1%{?dist}
Summary:        Generic input parsing/checking mechanism
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Params-Check/
Source0:        http://www.cpan.org/authors/id/K/KA/KANE/Params-Check-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Locale::Maketext::Simple)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Params::Check is a generic input parsing/checking mechanism.

%prep
%setup -q -n Params-Check-%{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+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Mar 23 2006 Steven Pritchard <steve at kspei.com> 0.24-1
- Specfile autogenerated by cpanspec 1.62.
- Fix License.
- Drop explicit Requires: perl(Locale::Maketext::Simple).
- Clean up Summary a little.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Check/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Apr 2006 21:51:17 -0000	1.1
+++ .cvsignore	13 Apr 2006 21:52:39 -0000	1.2
@@ -0,0 +1 @@
+Params-Check-0.24.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Check/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Apr 2006 21:51:17 -0000	1.1
+++ sources	13 Apr 2006 21:52:39 -0000	1.2
@@ -0,0 +1 @@
+3d135f26327b78adc9deb56252ce2381  Params-Check-0.24.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 13 22:00:55 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 15:00:55 -0700
Subject: rpms/perl-Module-Load-Conditional - New directory
Message-ID: <200604132200.k3DM0vlF019543@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Load-Conditional
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19515/perl-Module-Load-Conditional

Log Message:
Directory /cvs/extras/rpms/perl-Module-Load-Conditional added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 13 22:00:56 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 15:00:56 -0700
Subject: rpms/perl-Module-Load-Conditional/devel - New directory
Message-ID: <200604132200.k3DM0wiA019546@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Load-Conditional/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19515/perl-Module-Load-Conditional/devel

Log Message:
Directory /cvs/extras/rpms/perl-Module-Load-Conditional/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 13 22:01:32 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 15:01:32 -0700
Subject: rpms/perl-Module-Load-Conditional Makefile, NONE, 1.1 import.log,
	NONE, 1.1
Message-ID: <200604132201.k3DM1ZMb021598@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Load-Conditional
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21569

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Module-Load-Conditional


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

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

common : CVS/Root
	@cvs 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 Apr 13 22:01:33 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 15:01:33 -0700
Subject: rpms/perl-Module-Load-Conditional/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200604132201.k3DM1ZeP021601@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Load-Conditional/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21569/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Module-Load-Conditional


--- 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 Apr 13 22:02:55 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 15:02:55 -0700
Subject: rpms/perl-Module-Load-Conditional/devel
	perl-Module-Load-Conditional.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604132202.k3DM2who021669@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Load-Conditional/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21634/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Module-Load-Conditional.spec 
Log Message:
auto-import perl-Module-Load-Conditional-0.08-1 on branch devel from perl-Module-Load-Conditional-0.08-1.src.rpm


--- NEW FILE perl-Module-Load-Conditional.spec ---
Name:           perl-Module-Load-Conditional
Version:        0.08
Release:        1%{?dist}
Summary:        Looking up module information / loading at runtime
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Module-Load-Conditional/
Source0:        http://www.cpan.org/authors/id/K/KA/KANE/Module-Load-Conditional-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Locale::Maketext::Simple)
BuildRequires:  perl(Module::Load)
BuildRequires:  perl(Params::Check)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Module::Load::Conditional provides simple ways to query and possibly load
any of the modules you have installed on your system during runtime.

%prep
%setup -q -n Module-Load-Conditional-%{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+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Mar 23 2006 Steven Pritchard <steve at kspei.com> 0.08-1
- Specfile autogenerated by cpanspec 1.62.
- Fix License.
- Drop explicit Requires.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Load-Conditional/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Apr 2006 22:01:33 -0000	1.1
+++ .cvsignore	13 Apr 2006 22:02:55 -0000	1.2
@@ -0,0 +1 @@
+Module-Load-Conditional-0.08.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Load-Conditional/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Apr 2006 22:01:33 -0000	1.1
+++ sources	13 Apr 2006 22:02:55 -0000	1.2
@@ -0,0 +1 @@
+9e2a706b6511651ca4eb6de0c4c89a12  Module-Load-Conditional-0.08.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 13 22:02:54 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 15:02:54 -0700
Subject: rpms/perl-Module-Load-Conditional import.log,1.1,1.2
Message-ID: <200604132203.k3DM3QPT021674@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Load-Conditional
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21634

Modified Files:
	import.log 
Log Message:
auto-import perl-Module-Load-Conditional-0.08-1 on branch devel from perl-Module-Load-Conditional-0.08-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Load-Conditional/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Apr 2006 22:01:32 -0000	1.1
+++ import.log	13 Apr 2006 22:02:54 -0000	1.2
@@ -0,0 +1 @@
+perl-Module-Load-Conditional-0_08-1:HEAD:perl-Module-Load-Conditional-0.08-1.src.rpm:1144965749



From fedora-extras-commits at redhat.com  Thu Apr 13 22:20:53 2006
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Thu, 13 Apr 2006 15:20:53 -0700
Subject: rpms/gpsd/FC-4 gpsd.spec,1.1,1.2
Message-ID: <200604132220.k3DMKtvF021859@cvs-int.fedora.redhat.com>

Author: mtruch

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

Modified Files:
	gpsd.spec 
Log Message:
Include dbus-glib in BuildRequires so it will build in mock.



Index: gpsd.spec
===================================================================
RCS file: /cvs/extras/rpms/gpsd/FC-4/gpsd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gpsd.spec	13 Apr 2006 01:09:39 -0000	1.1
+++ gpsd.spec	13 Apr 2006 22:20:53 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gpsd
 Version:        2.32
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Service daemon for mediating access to a GPS
 
 Group:          System Environment/Daemons
@@ -11,7 +11,7 @@
 Source2:        xgpsspeed.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: dbus-devel ncurses-devel xmlto python
+BuildRequires: dbus-devel dbus-glib ncurses-devel xmlto python
 BuildRequires: openmotif-devel libXaw-devel desktop-file-utils
 
 Requires(post):    /sbin/ldconfig
@@ -146,6 +146,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Thu Apr 13 2006 Matthew Truch <matt at truch.net> - 2.32-4
+- Add dbus-glib to BuildRequires as needed for build.
+
 * Sun Apr 9 2006 Matthew Truch <matt at truch.net> - 2.32-3
 - Include xmlto and python in buildrequires so things build right.
 - Don't package static library file.  



From fedora-extras-commits at redhat.com  Thu Apr 13 22:20:54 2006
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Thu, 13 Apr 2006 15:20:54 -0700
Subject: rpms/gpsd/FC-5 gpsd.spec,1.1,1.2
Message-ID: <200604132220.k3DMKuUn021863@cvs-int.fedora.redhat.com>

Author: mtruch

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

Modified Files:
	gpsd.spec 
Log Message:
Include dbus-glib in BuildRequires so it will build in mock.



Index: gpsd.spec
===================================================================
RCS file: /cvs/extras/rpms/gpsd/FC-5/gpsd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gpsd.spec	13 Apr 2006 01:09:39 -0000	1.1
+++ gpsd.spec	13 Apr 2006 22:20:54 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gpsd
 Version:        2.32
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Service daemon for mediating access to a GPS
 
 Group:          System Environment/Daemons
@@ -11,7 +11,7 @@
 Source2:        xgpsspeed.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: dbus-devel ncurses-devel xmlto python
+BuildRequires: dbus-devel dbus-glib ncurses-devel xmlto python
 BuildRequires: openmotif-devel libXaw-devel desktop-file-utils
 
 Requires(post):    /sbin/ldconfig
@@ -146,6 +146,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Thu Apr 13 2006 Matthew Truch <matt at truch.net> - 2.32-4
+- Add dbus-glib to BuildRequires as needed for build.
+
 * Sun Apr 9 2006 Matthew Truch <matt at truch.net> - 2.32-3
 - Include xmlto and python in buildrequires so things build right.
 - Don't package static library file.  



From fedora-extras-commits at redhat.com  Thu Apr 13 22:20:55 2006
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Thu, 13 Apr 2006 15:20:55 -0700
Subject: rpms/gpsd/devel gpsd.spec,1.1,1.2
Message-ID: <200604132220.k3DMKvhO021869@cvs-int.fedora.redhat.com>

Author: mtruch

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

Modified Files:
	gpsd.spec 
Log Message:
Include dbus-glib in BuildRequires so it will build in mock.



Index: gpsd.spec
===================================================================
RCS file: /cvs/extras/rpms/gpsd/devel/gpsd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gpsd.spec	13 Apr 2006 01:09:39 -0000	1.1
+++ gpsd.spec	13 Apr 2006 22:20:55 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gpsd
 Version:        2.32
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Service daemon for mediating access to a GPS
 
 Group:          System Environment/Daemons
@@ -11,7 +11,7 @@
 Source2:        xgpsspeed.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: dbus-devel ncurses-devel xmlto python
+BuildRequires: dbus-devel dbus-glib ncurses-devel xmlto python
 BuildRequires: openmotif-devel libXaw-devel desktop-file-utils
 
 Requires(post):    /sbin/ldconfig
@@ -146,6 +146,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Thu Apr 13 2006 Matthew Truch <matt at truch.net> - 2.32-4
+- Add dbus-glib to BuildRequires as needed for build.
+
 * Sun Apr 9 2006 Matthew Truch <matt at truch.net> - 2.32-3
 - Include xmlto and python in buildrequires so things build right.
 - Don't package static library file.  



From fedora-extras-commits at redhat.com  Thu Apr 13 22:28:07 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 15:28:07 -0700
Subject: owners owners.list,1.840,1.841
Message-ID: <200604132228.k3DMS9BS021993@cvs-int.fedora.redhat.com>

Author: steve

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

Modified Files:
	owners.list 
Log Message:
Adding perl-Locale-Maketext-Simple, perl-Module-Load,
perl-Module-Loaded, perl-Module-Load-Conditional, and
perl-Params-Check.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.840
retrieving revision 1.841
diff -u -r1.840 -r1.841
--- owners.list	13 Apr 2006 14:47:13 -0000	1.840
+++ owners.list	13 Apr 2006 22:28:07 -0000	1.841
@@ -1009,6 +1009,7 @@
 Fedora Extras|perl-Lingua-EN-Inflect-Number|Force number of words to singular or plural|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Locale-Maketext-Fuzzy|Maketext from already interpolated strings|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Locale-Maketext-Lexicon|Extract translatable strings from source|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Locale-Maketext-Simple|Simple interface to Locale::Maketext::Lexicon|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Log-Dispatch|Dispatches messages to one or more outputs|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Log-Log4perl|Log4j implementation for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Mail-Alias|For bugs related to the perl-Mail-Alias component|oliver at linux-kernel.at|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1025,6 +1026,9 @@
 Fedora Extras|perl-MLDBM|Store multi-level hash structure in single level tied hash|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Build|Perl module for building and installing Perl modules|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-CoreList|Perl core modules indexed by perl versions|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Module-Load|Runtime require of both modules and files|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Module-Load-Conditional|Looking up module information / loading at runtime|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Module-Loaded|Mark modules as loaded or unloaded|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Refresh|Refresh %INC files when updated on disk|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Signature|CPAN signature management utilities and modules|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Versions-Report|Report versions of all modules in memory|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1039,6 +1043,7 @@
 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-Number-Compare|Perl module for numeric comparisons|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-OLE-Storage_Lite|Simple Class for OLE document interface|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Params-Check|Generic input parsing/checking mechanism|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Params-Util|Simple standalone param-checking functions|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Params-Validate|Params-Validate Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-PAR-Dist|Toolkit for creating and manipulating Perl PAR distributions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Thu Apr 13 22:53:01 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 13 Apr 2006 15:53:01 -0700
Subject: rpms/cernlib/devel patchy-yexpand.diff, NONE, 1.1 cernlib.spec, 1.28,
	1.29
Message-ID: <200604132253.k3DMr3si022320@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	cernlib.spec 
Added Files:
	patchy-yexpand.diff 
Log Message:
* Tue Apr 13 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-18
- add a patch to yexpand, to avoid using $HOME.


patchy-yexpand.diff:

--- NEW FILE patchy-yexpand.diff ---
--- 2004.orig/src/patchy/yexpand.script	2006-04-14 00:29:48.000000000 +0200
+++ 2004/src/patchy/yexpand.script	2006-04-14 00:35:13.000000000 +0200
@@ -26,8 +26,8 @@
 # CERN_ROOT=":$CERN_ROOT" ; export CERN_ROOT 
   CERN_ROOT=":$CERN/$CERN_LEVEL" ; export CERN_ROOT 
 
-  tfile="$HOME/$tfile.yexp"
-  echo "#!/bin/sh"    >$tfile
+  tfile="./$tfile.yexp"
+  echo "#! /bin/sh"    >$tfile
   echo "  cat <<EOI" >>$tfile
   cat <$ifile        >>$tfile
   cc=$?


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- cernlib.spec	13 Apr 2006 17:10:51 -0000	1.28
+++ cernlib.spec	13 Apr 2006 22:53:01 -0000	1.29
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       17%{?dist}.1
+Release:       18%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -218,6 +218,7 @@
 # patchy 5 (included in cernlib)
 Patch1504: patchy-case.patch
 Patch1505: patchy-perror.patch
+Patch1506: patchy-yexpand.diff
 
 %description
 CERN program library is a large collection of general purpose libraries
@@ -523,6 +524,7 @@
 
 %patch -P 1504 -p1
 %patch -P 1505 -p1
+%patch -P 1506 -p1
 
 %patch -P 1200
 %patch -P 1201
@@ -828,7 +830,10 @@
 
 
 %changelog
-* Tue Apr 13 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-17.1
+* Tue Apr 13 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-18
+- add a patch to yexpand, to avoid using $HOME.
+
+* Tue Apr 13 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-17
 - npatchy don't build on ppc.
 
 * Wed Apr 12 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-16



From fedora-extras-commits at redhat.com  Thu Apr 13 22:53:57 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 13 Apr 2006 15:53:57 -0700
Subject: rpms/cernlib/devel cernlib.spec,1.29,1.30
Message-ID: <200604132253.k3DMrxRp022373@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	cernlib.spec 
Log Message:
bump release


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- cernlib.spec	13 Apr 2006 22:53:01 -0000	1.29
+++ cernlib.spec	13 Apr 2006 22:53:56 -0000	1.30
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       18%{?dist}
+Release:       19%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -830,7 +830,7 @@
 
 
 %changelog
-* Tue Apr 13 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-18
+* Tue Apr 13 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-19
 - add a patch to yexpand, to avoid using $HOME.
 
 * Tue Apr 13 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-17



From fedora-extras-commits at redhat.com  Fri Apr 14 02:31:35 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Thu, 13 Apr 2006 19:31:35 -0700
Subject: rpms/seamonkey/devel seamonkey-1.0.1-dumpstack.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 seamonkey-configure.patch, 1.1,
	1.2 seamonkey.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200604140231.k3E2VbBg031335@cvs-int.fedora.redhat.com>

Author: kengert

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

Modified Files:
	.cvsignore seamonkey-configure.patch seamonkey.spec sources 
Added Files:
	seamonkey-1.0.1-dumpstack.patch 
Log Message:
* Fri Apr 14 2006 Kai Engert <kengert at redhat.com> 1.0.1-1
- Update to SeaMonkey 1.0.1 release


seamonkey-1.0.1-dumpstack.patch:

--- NEW FILE seamonkey-1.0.1-dumpstack.patch ---
--- mozilla/xpcom/base/nsStackFrameUnix.cpp.prestackdisable	2006-04-14 02:30:15.000000000 +0200
+++ mozilla/xpcom/base/nsStackFrameUnix.cpp	2006-04-14 02:31:02.000000000 +0200
@@ -88,6 +88,9 @@
 
 void DumpStackToFile(FILE* aStream)
 {
+  fprintf(aStream, "Stacktrace disabled for now.\n"
+                   "See https://bugzilla.mozilla.org/show_bug.cgi?id=323853\n");
+#if 0
   // Stack walking code courtesy Kipp's "leaky".
 
   // Get the frame pointer
@@ -128,6 +131,7 @@
               symbol, off, info.dli_fname, foff);
     }
   }
+#endif
 }
 
 #elif defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386))


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Apr 2006 21:58:25 -0000	1.2
+++ .cvsignore	14 Apr 2006 02:31:35 -0000	1.3
@@ -1 +1 @@
-seamonkey-1.0.source.tar.bz2
+seamonkey-1.0.1.source.tar.bz2

seamonkey-configure.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 seamonkey-configure.patch
Index: seamonkey-configure.patch
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/devel/seamonkey-configure.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- seamonkey-configure.patch	10 Apr 2006 21:58:25 -0000	1.1
+++ seamonkey-configure.patch	14 Apr 2006 02:31:35 -0000	1.2
@@ -1,5 +1,5 @@
---- mozilla/configure.ac213	2006-02-10 09:14:59.000000000 +0100
-+++ mozilla/configure	2006-02-10 09:15:01.000000000 +0100
+--- mozilla/configure.prepatch	2006-04-14 02:46:30.000000000 +0200
++++ mozilla/configure	2006-04-14 02:52:12.000000000 +0200
 @@ -941,7 +941,7 @@
  fi
  
@@ -141,175 +141,175 @@
    rm -rf conftest*
    ac_cv_prog_hostcxx_works=1 echo "$ac_t""yes" 1>&6
  else
-@@ -1445,7 +1445,7 @@
+@@ -1454,7 +1454,7 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1441: checking for $ac_word" >&5
-+echo "configure:1449: checking for $ac_word" >&5
+-echo "configure:1450: checking for $ac_word" >&5
++echo "configure:1458: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1479,7 +1479,7 @@
+@@ -1488,7 +1488,7 @@
      # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1475: checking for $ac_word" >&5
-+echo "configure:1483: checking for $ac_word" >&5
+-echo "configure:1484: checking for $ac_word" >&5
++echo "configure:1492: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1509,7 +1509,7 @@
+@@ -1518,7 +1518,7 @@
    # Extract the first word of "cc", so it can be a program name with args.
  set dummy cc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1505: checking for $ac_word" >&5
-+echo "configure:1513: checking for $ac_word" >&5
+-echo "configure:1514: checking for $ac_word" >&5
++echo "configure:1522: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1560,7 +1560,7 @@
+@@ -1569,7 +1569,7 @@
        # Extract the first word of "cl", so it can be a program name with args.
  set dummy cl; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1556: checking for $ac_word" >&5
-+echo "configure:1564: checking for $ac_word" >&5
+-echo "configure:1565: checking for $ac_word" >&5
++echo "configure:1573: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1592,7 +1592,7 @@
+@@ -1601,7 +1601,7 @@
  fi
  
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:1588: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+echo "configure:1596: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+-echo "configure:1597: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
++echo "configure:1605: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
  
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -1603,12 +1603,12 @@
+@@ -1612,12 +1612,12 @@
  
  cat > conftest.$ac_ext << EOF
  
--#line 1599 "configure"
-+#line 1607 "configure"
+-#line 1608 "configure"
++#line 1616 "configure"
  #include "confdefs.h"
  
  main(){return(0);}
  EOF
--if { (eval echo configure:1604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:1613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    ac_cv_prog_cc_works=yes
    # If we can't run a trivial program, we are probably using a cross compiler.
    if (./conftest; exit) 2>/dev/null; then
-@@ -1634,12 +1634,12 @@
+@@ -1643,12 +1643,12 @@
    { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
  fi
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
--echo "configure:1630: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-+echo "configure:1638: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+-echo "configure:1639: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:1647: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
  echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
  cross_compiling=$ac_cv_prog_cc_cross
  
  echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
--echo "configure:1635: checking whether we are using GNU C" >&5
-+echo "configure:1643: checking whether we are using GNU C" >&5
+-echo "configure:1644: checking whether we are using GNU C" >&5
++echo "configure:1652: checking whether we are using GNU C" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1648,7 +1648,7 @@
+@@ -1657,7 +1657,7 @@
    yes;
  #endif
  EOF
--if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1644: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1652: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1653: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1661: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
    ac_cv_prog_gcc=yes
  else
    ac_cv_prog_gcc=no
-@@ -1667,7 +1667,7 @@
+@@ -1676,7 +1676,7 @@
  ac_save_CFLAGS="$CFLAGS"
  CFLAGS=
  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
--echo "configure:1663: checking whether ${CC-cc} accepts -g" >&5
-+echo "configure:1671: checking whether ${CC-cc} accepts -g" >&5
+-echo "configure:1672: checking whether ${CC-cc} accepts -g" >&5
++echo "configure:1680: checking whether ${CC-cc} accepts -g" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1703,7 +1703,7 @@
+@@ -1712,7 +1712,7 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1699: checking for $ac_word" >&5
-+echo "configure:1707: checking for $ac_word" >&5
+-echo "configure:1708: checking for $ac_word" >&5
++echo "configure:1716: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1739,7 +1739,7 @@
+@@ -1748,7 +1748,7 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1735: checking for $ac_word" >&5
-+echo "configure:1743: checking for $ac_word" >&5
+-echo "configure:1744: checking for $ac_word" >&5
++echo "configure:1752: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1771,7 +1771,7 @@
+@@ -1780,7 +1780,7 @@
  
  
  echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:1767: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
-+echo "configure:1775: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+-echo "configure:1776: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
++echo "configure:1784: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
  
  ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -1782,12 +1782,12 @@
+@@ -1791,12 +1791,12 @@
  
  cat > conftest.$ac_ext << EOF
  
--#line 1778 "configure"
-+#line 1786 "configure"
+-#line 1787 "configure"
++#line 1795 "configure"
  #include "confdefs.h"
  
  int main(){return(0);}
  EOF
--if { (eval echo configure:1783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:1792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    ac_cv_prog_cxx_works=yes
    # If we can't run a trivial program, we are probably using a cross compiler.
    if (./conftest; exit) 2>/dev/null; then
[...6776 lines suppressed...]
      which can conflict with char $ac_func(); below.  */
-@@ -18265,7 +18454,7 @@
+@@ -18289,7 +18481,7 @@
  
  ; return 0; }
  EOF
--if { (eval echo configure:18144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:18458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:18168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -18292,7 +18481,7 @@
+@@ -18316,7 +18508,7 @@
  fi
  
  echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
--echo "configure:18171: checking stack direction for C alloca" >&5
-+echo "configure:18485: checking stack direction for C alloca" >&5
+-echo "configure:18195: checking stack direction for C alloca" >&5
++echo "configure:18512: checking stack direction for C alloca" >&5
  if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -18300,7 +18489,7 @@
+@@ -18324,7 +18516,7 @@
    ac_cv_c_stack_direction=0
  else
    cat > conftest.$ac_ext <<EOF
--#line 18179 "configure"
-+#line 18493 "configure"
+-#line 18203 "configure"
++#line 18520 "configure"
  #include "confdefs.h"
  find_stack_direction ()
  {
-@@ -18319,7 +18508,7 @@
+@@ -18343,7 +18535,7 @@
    exit (find_stack_direction() < 0);
  }
  EOF
--if { (eval echo configure:18198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:18512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-if { (eval echo configure:18222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:18539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_c_stack_direction=1
  else
-@@ -18368,17 +18557,17 @@
+@@ -18392,17 +18584,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:18247: checking for $ac_hdr" >&5
-+echo "configure:18561: checking for $ac_hdr" >&5
+-echo "configure:18271: checking for $ac_hdr" >&5
++echo "configure:18588: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 18252 "configure"
-+#line 18566 "configure"
+-#line 18276 "configure"
++#line 18593 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:18257: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:18571: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (eval echo configure:18281: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:18598: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -18458,7 +18647,7 @@
+@@ -18482,7 +18674,7 @@
      # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:18337: checking for $ac_word" >&5
-+echo "configure:18651: checking for $ac_word" >&5
+-echo "configure:18361: checking for $ac_word" >&5
++echo "configure:18678: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -18502,19 +18691,19 @@
+@@ -18526,19 +18718,19 @@
       PKG_CONFIG_MIN_VERSION=0.9.0
       if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
          echo $ac_n "checking for cairo >= $CAIRO_VERSION""... $ac_c" 1>&6
--echo "configure:18381: checking for cairo >= $CAIRO_VERSION" >&5
-+echo "configure:18695: checking for cairo >= $CAIRO_VERSION" >&5
+-echo "configure:18405: checking for cairo >= $CAIRO_VERSION" >&5
++echo "configure:18722: checking for cairo >= $CAIRO_VERSION" >&5
  
          if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION" ; then
              echo "$ac_t""yes" 1>&6
              succeeded=yes
  
              echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6
--echo "configure:18388: checking CAIRO_CFLAGS" >&5
-+echo "configure:18702: checking CAIRO_CFLAGS" >&5
+-echo "configure:18412: checking CAIRO_CFLAGS" >&5
++echo "configure:18729: checking CAIRO_CFLAGS" >&5
              CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION"`
              echo "$ac_t""$CAIRO_CFLAGS" 1>&6
  
              echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6
--echo "configure:18393: checking CAIRO_LIBS" >&5
-+echo "configure:18707: checking CAIRO_LIBS" >&5
+-echo "configure:18417: checking CAIRO_LIBS" >&5
++echo "configure:18734: checking CAIRO_LIBS" >&5
              ## don't use --libs since that can do evil things like add
              ## -Wl,--export-dynamic
              CAIRO_LIBS="`$PKG_CONFIG --libs-only-L \"cairo >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo >= $CAIRO_VERSION\"`"
-@@ -18579,7 +18768,7 @@
+@@ -18603,7 +18795,7 @@
          # Extract the first word of "python", so it can be a program name with args.
  set dummy python; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:18458: checking for $ac_word" >&5
-+echo "configure:18772: checking for $ac_word" >&5
+-echo "configure:18482: checking for $ac_word" >&5
++echo "configure:18799: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -18840,14 +19029,14 @@
+@@ -18864,14 +19056,14 @@
  cross_compiling=$ac_cv_prog_cc_cross
  
      cat > conftest.$ac_ext <<EOF
--#line 18719 "configure"
-+#line 19033 "configure"
+-#line 18743 "configure"
++#line 19060 "configure"
  #include "confdefs.h"
  #include <gmodule.h>
  int main() {
   int x = 1; x++; 
  ; return 0; }
  EOF
--if { (eval echo configure:18726: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:19040: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:18750: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:19067: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    :
  else
    echo "configure: failed program was:" >&5
-@@ -19113,6 +19302,10 @@
+@@ -19137,6 +19329,10 @@
  
  
  
@@ -5662,25 +5664,25 @@
  cat >> confdefs.h <<EOF
  #define MOZ_DLL_SUFFIX "$DLL_SUFFIX"
  EOF
-@@ -19140,7 +19333,7 @@
+@@ -19164,7 +19360,7 @@
                  _SAVE_CFLAGS=$CFLAGS
      CFLAGS="$CFLAGS $XCFLAGS"
      cat > conftest.$ac_ext <<EOF
--#line 19019 "configure"
-+#line 19337 "configure"
+-#line 19043 "configure"
++#line 19364 "configure"
  #include "confdefs.h"
  
          #include <stdio.h>
-@@ -19156,7 +19349,7 @@
+@@ -19180,7 +19376,7 @@
      
  ; return 0; }
  EOF
--if { (eval echo configure:19035: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:19353: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:19059: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:19380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    :
  else
    echo "configure: failed program was:" >&5
-@@ -19373,15 +19566,34 @@
+@@ -19397,15 +19593,34 @@
  # Transform confdefs.h into DEFS.
  # Protect against shell expansion while executing Makefile rules.
  # Protect against Makefile macro expansion.
@@ -5724,7 +5726,7 @@
  
  MOZ_DEFINES=$DEFS
  
-@@ -19663,12 +19875,13 @@
+@@ -19688,12 +19903,13 @@
  s%@MOZ_ENABLE_FREETYPE2@%$MOZ_ENABLE_FREETYPE2%g
  s%@MOZ_XFT_CFLAGS@%$MOZ_XFT_CFLAGS%g
  s%@MOZ_XFT_LIBS@%$MOZ_XFT_LIBS%g


Index: seamonkey.spec
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/devel/seamonkey.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- seamonkey.spec	11 Apr 2006 13:59:21 -0000	1.3
+++ seamonkey.spec	14 Apr 2006 02:31:35 -0000	1.4
@@ -9,8 +9,8 @@
 
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
-Version:        1.0
-Release:        11%{?dist}
+Version:        1.0.1
+Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPL
 Group:          Applications/Internet
@@ -33,14 +33,13 @@
 Patch3:         firefox-1.1-nss-system-nspr.patch
 Patch4:         firefox-1.5-with-system-nss.patch
 Patch5:         seamonkey-disable-visibility.patch
-Patch6:         firefox-1.5.0.1-dumpstack.patch
+Patch6:         seamonkey-1.0.1-dumpstack.patch
 Patch21:        firefox-0.7.3-default-plugin-less-annoying.patch
 Patch22:        firefox-0.7.3-psfonts.patch
 Patch42:        firefox-1.1-uriloader.patch
 Patch82:        pango-cairo.patch
 Patch83:        seamonkey-cairo-bug5136.patch
 Patch101:       thunderbird-0.7.3-gnome-uriloader.patch
-Patch102:       thunderbird-1.5-bug304720.patch
 Patch220:       seamonkey-fedora-home-page.patch
 Patch225:       mozilla-nspr-packages.patch
 Patch227:       mozilla-1.4.1-ppc64.patch
@@ -98,7 +97,6 @@
 %patch82 -p0
 %patch83 -p1
 %patch101 -p1 -b .gnome-uriloader
-%patch102 -p1
 %patch220 -p1
 %patch225 -p1
 %patch227 -p1
@@ -408,6 +406,8 @@
 
 
 %changelog
+* Fri Apr 14 2006 Kai Engert <kengert at redhat.com> 1.0.1-1
+- Update to SeaMonkey 1.0.1 release
 * Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-11
 - Fix PreReq statements
 * Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-10


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Apr 2006 21:58:25 -0000	1.2
+++ sources	14 Apr 2006 02:31:35 -0000	1.3
@@ -1 +1 @@
-e4f2edc5b2248d090303c70f5b28f210  seamonkey-1.0.source.tar.bz2
+6921464b5251cafd529c04c2b9f98d5f  seamonkey-1.0.1.source.tar.bz2



From fedora-extras-commits at redhat.com  Fri Apr 14 02:51:10 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Thu, 13 Apr 2006 19:51:10 -0700
Subject: rpms/seamonkey/FC-5 seamonkey-1.0.1-dumpstack.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 seamonkey-configure.patch, 1.1,
	1.2 seamonkey.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200604140251.k3E2pCSN031436@cvs-int.fedora.redhat.com>

Author: kengert

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

Modified Files:
	.cvsignore seamonkey-configure.patch seamonkey.spec sources 
Added Files:
	seamonkey-1.0.1-dumpstack.patch 
Log Message:
* Fri Apr 14 2006 Kai Engert <kengert at redhat.com> 1.0.1-1
- Update to SeaMonkey 1.0.1 release


seamonkey-1.0.1-dumpstack.patch:

--- NEW FILE seamonkey-1.0.1-dumpstack.patch ---
--- mozilla/xpcom/base/nsStackFrameUnix.cpp.prestackdisable	2006-04-14 02:30:15.000000000 +0200
+++ mozilla/xpcom/base/nsStackFrameUnix.cpp	2006-04-14 02:31:02.000000000 +0200
@@ -88,6 +88,9 @@
 
 void DumpStackToFile(FILE* aStream)
 {
+  fprintf(aStream, "Stacktrace disabled for now.\n"
+                   "See https://bugzilla.mozilla.org/show_bug.cgi?id=323853\n");
+#if 0
   // Stack walking code courtesy Kipp's "leaky".
 
   // Get the frame pointer
@@ -128,6 +131,7 @@
               symbol, off, info.dli_fname, foff);
     }
   }
+#endif
 }
 
 #elif defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386))


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Apr 2006 21:58:25 -0000	1.2
+++ .cvsignore	14 Apr 2006 02:51:10 -0000	1.3
@@ -1 +1 @@
-seamonkey-1.0.source.tar.bz2
+seamonkey-1.0.1.source.tar.bz2

seamonkey-configure.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 seamonkey-configure.patch
Index: seamonkey-configure.patch
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/FC-5/seamonkey-configure.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- seamonkey-configure.patch	10 Apr 2006 21:58:25 -0000	1.1
+++ seamonkey-configure.patch	14 Apr 2006 02:51:10 -0000	1.2
@@ -1,5 +1,5 @@
---- mozilla/configure.ac213	2006-02-10 09:14:59.000000000 +0100
-+++ mozilla/configure	2006-02-10 09:15:01.000000000 +0100
+--- mozilla/configure.prepatch	2006-04-14 02:46:30.000000000 +0200
++++ mozilla/configure	2006-04-14 02:52:12.000000000 +0200
 @@ -941,7 +941,7 @@
  fi
  
@@ -141,175 +141,175 @@
    rm -rf conftest*
    ac_cv_prog_hostcxx_works=1 echo "$ac_t""yes" 1>&6
  else
-@@ -1445,7 +1445,7 @@
+@@ -1454,7 +1454,7 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1441: checking for $ac_word" >&5
-+echo "configure:1449: checking for $ac_word" >&5
+-echo "configure:1450: checking for $ac_word" >&5
++echo "configure:1458: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1479,7 +1479,7 @@
+@@ -1488,7 +1488,7 @@
      # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1475: checking for $ac_word" >&5
-+echo "configure:1483: checking for $ac_word" >&5
+-echo "configure:1484: checking for $ac_word" >&5
++echo "configure:1492: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1509,7 +1509,7 @@
+@@ -1518,7 +1518,7 @@
    # Extract the first word of "cc", so it can be a program name with args.
  set dummy cc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1505: checking for $ac_word" >&5
-+echo "configure:1513: checking for $ac_word" >&5
+-echo "configure:1514: checking for $ac_word" >&5
++echo "configure:1522: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1560,7 +1560,7 @@
+@@ -1569,7 +1569,7 @@
        # Extract the first word of "cl", so it can be a program name with args.
  set dummy cl; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1556: checking for $ac_word" >&5
-+echo "configure:1564: checking for $ac_word" >&5
+-echo "configure:1565: checking for $ac_word" >&5
++echo "configure:1573: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1592,7 +1592,7 @@
+@@ -1601,7 +1601,7 @@
  fi
  
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:1588: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+echo "configure:1596: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+-echo "configure:1597: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
++echo "configure:1605: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
  
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -1603,12 +1603,12 @@
+@@ -1612,12 +1612,12 @@
  
  cat > conftest.$ac_ext << EOF
  
--#line 1599 "configure"
-+#line 1607 "configure"
+-#line 1608 "configure"
++#line 1616 "configure"
  #include "confdefs.h"
  
  main(){return(0);}
  EOF
--if { (eval echo configure:1604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:1613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    ac_cv_prog_cc_works=yes
    # If we can't run a trivial program, we are probably using a cross compiler.
    if (./conftest; exit) 2>/dev/null; then
-@@ -1634,12 +1634,12 @@
+@@ -1643,12 +1643,12 @@
    { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
  fi
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
--echo "configure:1630: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-+echo "configure:1638: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+-echo "configure:1639: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:1647: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
  echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
  cross_compiling=$ac_cv_prog_cc_cross
  
  echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
--echo "configure:1635: checking whether we are using GNU C" >&5
-+echo "configure:1643: checking whether we are using GNU C" >&5
+-echo "configure:1644: checking whether we are using GNU C" >&5
++echo "configure:1652: checking whether we are using GNU C" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1648,7 +1648,7 @@
+@@ -1657,7 +1657,7 @@
    yes;
  #endif
  EOF
--if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1644: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1652: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1653: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1661: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
    ac_cv_prog_gcc=yes
  else
    ac_cv_prog_gcc=no
-@@ -1667,7 +1667,7 @@
+@@ -1676,7 +1676,7 @@
  ac_save_CFLAGS="$CFLAGS"
  CFLAGS=
  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
--echo "configure:1663: checking whether ${CC-cc} accepts -g" >&5
-+echo "configure:1671: checking whether ${CC-cc} accepts -g" >&5
+-echo "configure:1672: checking whether ${CC-cc} accepts -g" >&5
++echo "configure:1680: checking whether ${CC-cc} accepts -g" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1703,7 +1703,7 @@
+@@ -1712,7 +1712,7 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1699: checking for $ac_word" >&5
-+echo "configure:1707: checking for $ac_word" >&5
+-echo "configure:1708: checking for $ac_word" >&5
++echo "configure:1716: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1739,7 +1739,7 @@
+@@ -1748,7 +1748,7 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1735: checking for $ac_word" >&5
-+echo "configure:1743: checking for $ac_word" >&5
+-echo "configure:1744: checking for $ac_word" >&5
++echo "configure:1752: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1771,7 +1771,7 @@
+@@ -1780,7 +1780,7 @@
  
  
  echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:1767: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
-+echo "configure:1775: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+-echo "configure:1776: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
++echo "configure:1784: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
  
  ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -1782,12 +1782,12 @@
+@@ -1791,12 +1791,12 @@
  
  cat > conftest.$ac_ext << EOF
  
--#line 1778 "configure"
-+#line 1786 "configure"
+-#line 1787 "configure"
++#line 1795 "configure"
  #include "confdefs.h"
  
  int main(){return(0);}
  EOF
--if { (eval echo configure:1783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:1792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    ac_cv_prog_cxx_works=yes
    # If we can't run a trivial program, we are probably using a cross compiler.
    if (./conftest; exit) 2>/dev/null; then
[...6776 lines suppressed...]
      which can conflict with char $ac_func(); below.  */
-@@ -18265,7 +18454,7 @@
+@@ -18289,7 +18481,7 @@
  
  ; return 0; }
  EOF
--if { (eval echo configure:18144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:18458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:18168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -18292,7 +18481,7 @@
+@@ -18316,7 +18508,7 @@
  fi
  
  echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
--echo "configure:18171: checking stack direction for C alloca" >&5
-+echo "configure:18485: checking stack direction for C alloca" >&5
+-echo "configure:18195: checking stack direction for C alloca" >&5
++echo "configure:18512: checking stack direction for C alloca" >&5
  if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -18300,7 +18489,7 @@
+@@ -18324,7 +18516,7 @@
    ac_cv_c_stack_direction=0
  else
    cat > conftest.$ac_ext <<EOF
--#line 18179 "configure"
-+#line 18493 "configure"
+-#line 18203 "configure"
++#line 18520 "configure"
  #include "confdefs.h"
  find_stack_direction ()
  {
-@@ -18319,7 +18508,7 @@
+@@ -18343,7 +18535,7 @@
    exit (find_stack_direction() < 0);
  }
  EOF
--if { (eval echo configure:18198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:18512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-if { (eval echo configure:18222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:18539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_c_stack_direction=1
  else
-@@ -18368,17 +18557,17 @@
+@@ -18392,17 +18584,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:18247: checking for $ac_hdr" >&5
-+echo "configure:18561: checking for $ac_hdr" >&5
+-echo "configure:18271: checking for $ac_hdr" >&5
++echo "configure:18588: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 18252 "configure"
-+#line 18566 "configure"
+-#line 18276 "configure"
++#line 18593 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:18257: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:18571: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (eval echo configure:18281: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:18598: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -18458,7 +18647,7 @@
+@@ -18482,7 +18674,7 @@
      # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:18337: checking for $ac_word" >&5
-+echo "configure:18651: checking for $ac_word" >&5
+-echo "configure:18361: checking for $ac_word" >&5
++echo "configure:18678: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -18502,19 +18691,19 @@
+@@ -18526,19 +18718,19 @@
       PKG_CONFIG_MIN_VERSION=0.9.0
       if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
          echo $ac_n "checking for cairo >= $CAIRO_VERSION""... $ac_c" 1>&6
--echo "configure:18381: checking for cairo >= $CAIRO_VERSION" >&5
-+echo "configure:18695: checking for cairo >= $CAIRO_VERSION" >&5
+-echo "configure:18405: checking for cairo >= $CAIRO_VERSION" >&5
++echo "configure:18722: checking for cairo >= $CAIRO_VERSION" >&5
  
          if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION" ; then
              echo "$ac_t""yes" 1>&6
              succeeded=yes
  
              echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6
--echo "configure:18388: checking CAIRO_CFLAGS" >&5
-+echo "configure:18702: checking CAIRO_CFLAGS" >&5
+-echo "configure:18412: checking CAIRO_CFLAGS" >&5
++echo "configure:18729: checking CAIRO_CFLAGS" >&5
              CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION"`
              echo "$ac_t""$CAIRO_CFLAGS" 1>&6
  
              echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6
--echo "configure:18393: checking CAIRO_LIBS" >&5
-+echo "configure:18707: checking CAIRO_LIBS" >&5
+-echo "configure:18417: checking CAIRO_LIBS" >&5
++echo "configure:18734: checking CAIRO_LIBS" >&5
              ## don't use --libs since that can do evil things like add
              ## -Wl,--export-dynamic
              CAIRO_LIBS="`$PKG_CONFIG --libs-only-L \"cairo >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo >= $CAIRO_VERSION\"`"
-@@ -18579,7 +18768,7 @@
+@@ -18603,7 +18795,7 @@
          # Extract the first word of "python", so it can be a program name with args.
  set dummy python; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:18458: checking for $ac_word" >&5
-+echo "configure:18772: checking for $ac_word" >&5
+-echo "configure:18482: checking for $ac_word" >&5
++echo "configure:18799: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -18840,14 +19029,14 @@
+@@ -18864,14 +19056,14 @@
  cross_compiling=$ac_cv_prog_cc_cross
  
      cat > conftest.$ac_ext <<EOF
--#line 18719 "configure"
-+#line 19033 "configure"
+-#line 18743 "configure"
++#line 19060 "configure"
  #include "confdefs.h"
  #include <gmodule.h>
  int main() {
   int x = 1; x++; 
  ; return 0; }
  EOF
--if { (eval echo configure:18726: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:19040: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:18750: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:19067: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    :
  else
    echo "configure: failed program was:" >&5
-@@ -19113,6 +19302,10 @@
+@@ -19137,6 +19329,10 @@
  
  
  
@@ -5662,25 +5664,25 @@
  cat >> confdefs.h <<EOF
  #define MOZ_DLL_SUFFIX "$DLL_SUFFIX"
  EOF
-@@ -19140,7 +19333,7 @@
+@@ -19164,7 +19360,7 @@
                  _SAVE_CFLAGS=$CFLAGS
      CFLAGS="$CFLAGS $XCFLAGS"
      cat > conftest.$ac_ext <<EOF
--#line 19019 "configure"
-+#line 19337 "configure"
+-#line 19043 "configure"
++#line 19364 "configure"
  #include "confdefs.h"
  
          #include <stdio.h>
-@@ -19156,7 +19349,7 @@
+@@ -19180,7 +19376,7 @@
      
  ; return 0; }
  EOF
--if { (eval echo configure:19035: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:19353: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:19059: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:19380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    :
  else
    echo "configure: failed program was:" >&5
-@@ -19373,15 +19566,34 @@
+@@ -19397,15 +19593,34 @@
  # Transform confdefs.h into DEFS.
  # Protect against shell expansion while executing Makefile rules.
  # Protect against Makefile macro expansion.
@@ -5724,7 +5726,7 @@
  
  MOZ_DEFINES=$DEFS
  
-@@ -19663,12 +19875,13 @@
+@@ -19688,12 +19903,13 @@
  s%@MOZ_ENABLE_FREETYPE2@%$MOZ_ENABLE_FREETYPE2%g
  s%@MOZ_XFT_CFLAGS@%$MOZ_XFT_CFLAGS%g
  s%@MOZ_XFT_LIBS@%$MOZ_XFT_LIBS%g


Index: seamonkey.spec
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/FC-5/seamonkey.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- seamonkey.spec	11 Apr 2006 14:57:09 -0000	1.2
+++ seamonkey.spec	14 Apr 2006 02:51:10 -0000	1.3
@@ -9,8 +9,8 @@
 
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
-Version:        1.0
-Release:        11%{?dist}
+Version:        1.0.1
+Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPL
 Group:          Applications/Internet
@@ -33,14 +33,13 @@
 Patch3:         firefox-1.1-nss-system-nspr.patch
 Patch4:         firefox-1.5-with-system-nss.patch
 Patch5:         seamonkey-disable-visibility.patch
-Patch6:         firefox-1.5.0.1-dumpstack.patch
+Patch6:         seamonkey-1.0.1-dumpstack.patch
 Patch21:        firefox-0.7.3-default-plugin-less-annoying.patch
 Patch22:        firefox-0.7.3-psfonts.patch
 Patch42:        firefox-1.1-uriloader.patch
 Patch82:        pango-cairo.patch
 Patch83:        seamonkey-cairo-bug5136.patch
 Patch101:       thunderbird-0.7.3-gnome-uriloader.patch
-Patch102:       thunderbird-1.5-bug304720.patch
 Patch220:       seamonkey-fedora-home-page.patch
 Patch225:       mozilla-nspr-packages.patch
 Patch227:       mozilla-1.4.1-ppc64.patch
@@ -98,7 +97,6 @@
 %patch82 -p0
 %patch83 -p1
 %patch101 -p1 -b .gnome-uriloader
-%patch102 -p1
 %patch220 -p1
 %patch225 -p1
 %patch227 -p1
@@ -408,6 +406,8 @@
 
 
 %changelog
+* Fri Apr 14 2006 Kai Engert <kengert at redhat.com> 1.0.1-1
+- Update to SeaMonkey 1.0.1 release
 * Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-11
 - Fix PreReq statements
 * Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-10


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Apr 2006 21:58:25 -0000	1.2
+++ sources	14 Apr 2006 02:51:10 -0000	1.3
@@ -1 +1 @@
-e4f2edc5b2248d090303c70f5b28f210  seamonkey-1.0.source.tar.bz2
+6921464b5251cafd529c04c2b9f98d5f  seamonkey-1.0.1.source.tar.bz2



From fedora-extras-commits at redhat.com  Fri Apr 14 03:20:50 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Thu, 13 Apr 2006 20:20:50 -0700
Subject: rpms/seamonkey/FC-4 seamonkey-1.0.1-dumpstack.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 seamonkey-configure.patch, 1.2,
	1.3 seamonkey.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200604140320.k3E3KqSK001196@cvs-int.fedora.redhat.com>

Author: kengert

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

Modified Files:
	.cvsignore seamonkey-configure.patch seamonkey.spec sources 
Added Files:
	seamonkey-1.0.1-dumpstack.patch 
Log Message:
* Fri Apr 14 2006 Kai Engert <kengert at redhat.com> 1.0.1-1.fc4
- Update to SeaMonkey 1.0.1 release


seamonkey-1.0.1-dumpstack.patch:

--- NEW FILE seamonkey-1.0.1-dumpstack.patch ---
--- mozilla/xpcom/base/nsStackFrameUnix.cpp.prestackdisable	2006-04-14 02:30:15.000000000 +0200
+++ mozilla/xpcom/base/nsStackFrameUnix.cpp	2006-04-14 02:31:02.000000000 +0200
@@ -88,6 +88,9 @@
 
 void DumpStackToFile(FILE* aStream)
 {
+  fprintf(aStream, "Stacktrace disabled for now.\n"
+                   "See https://bugzilla.mozilla.org/show_bug.cgi?id=323853\n");
+#if 0
   // Stack walking code courtesy Kipp's "leaky".
 
   // Get the frame pointer
@@ -128,6 +131,7 @@
               symbol, off, info.dli_fname, foff);
     }
   }
+#endif
 }
 
 #elif defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386))


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Apr 2006 21:58:25 -0000	1.2
+++ .cvsignore	14 Apr 2006 03:20:50 -0000	1.3
@@ -1 +1 @@
-seamonkey-1.0.source.tar.bz2
+seamonkey-1.0.1.source.tar.bz2

seamonkey-configure.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.2 -r 1.3 seamonkey-configure.patch
Index: seamonkey-configure.patch
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/FC-4/seamonkey-configure.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- seamonkey-configure.patch	12 Apr 2006 15:49:31 -0000	1.2
+++ seamonkey-configure.patch	14 Apr 2006 03:20:50 -0000	1.3
@@ -1,5 +1,5 @@
---- mozilla/configure.pre1	2006-04-12 13:11:17.000000000 +0200
-+++ mozilla/configure	2006-04-12 13:11:22.000000000 +0200
+--- mozilla/configure.prepatch	2006-04-14 05:14:18.000000000 +0200
++++ mozilla/configure	2006-04-14 05:14:27.000000000 +0200
 @@ -1042,7 +1042,7 @@
  LIBGNOME_VERSION=2.0
  
@@ -9,7 +9,7 @@
  do
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
-@@ -1869,12 +1869,63 @@
+@@ -1878,6 +1878,57 @@
    fi
  fi
  
@@ -23,7 +23,7 @@
 +   'void exit (int);'
 +do
 +  cat > conftest.$ac_ext <<EOF
-+#line 1883 "configure"
++#line 1892 "configure"
 +#include "confdefs.h"
 +#include <stdlib.h>
 +$ac_declaration
@@ -31,7 +31,7 @@
 +exit (42);
 +; return 0; }
 +EOF
-+if { (eval echo configure:1891: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1900: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 +  :
 +else
 +  echo "configure: failed program was:" >&5
@@ -41,14 +41,14 @@
 +fi
 +rm -f conftest*
 +  cat > conftest.$ac_ext <<EOF
-+#line 1901 "configure"
++#line 1910 "configure"
 +#include "confdefs.h"
 +$ac_declaration
 +int main() {
 +exit (42);
 +; return 0; }
 +EOF
-+if { (eval echo configure:1908: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 +  rm -rf conftest*
 +  break
 +else
@@ -64,212 +64,214 @@
 +fi
 +
 +
-     for ac_prog in $RANLIB "${target_alias}-ranlib" "${target}-ranlib"
- do
+ 
+     case "$build:$target" in
+       powerpc-apple-darwin8*:i?86-apple-darwin*)
+@@ -1891,7 +1942,7 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1878: checking for $ac_word" >&5
-+echo "configure:1929: checking for $ac_word" >&5
+-echo "configure:1895: checking for $ac_word" >&5
++echo "configure:1946: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1909,7 +1960,7 @@
+@@ -1926,7 +1977,7 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1913: checking for $ac_word" >&5
-+echo "configure:1964: checking for $ac_word" >&5
+-echo "configure:1930: checking for $ac_word" >&5
++echo "configure:1981: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1944,7 +1995,7 @@
+@@ -1961,7 +2012,7 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1948: checking for $ac_word" >&5
-+echo "configure:1999: checking for $ac_word" >&5
+-echo "configure:1965: checking for $ac_word" >&5
++echo "configure:2016: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1985,7 +2036,7 @@
+@@ -2002,7 +2053,7 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1989: checking for $ac_word" >&5
-+echo "configure:2040: checking for $ac_word" >&5
+-echo "configure:2006: checking for $ac_word" >&5
++echo "configure:2057: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -2020,7 +2071,7 @@
+@@ -2037,7 +2088,7 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2024: checking for $ac_word" >&5
-+echo "configure:2075: checking for $ac_word" >&5
+-echo "configure:2041: checking for $ac_word" >&5
++echo "configure:2092: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -2055,7 +2106,7 @@
+@@ -2072,7 +2123,7 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2059: checking for $ac_word" >&5
-+echo "configure:2110: checking for $ac_word" >&5
+-echo "configure:2076: checking for $ac_word" >&5
++echo "configure:2127: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -2093,7 +2144,7 @@
+@@ -2110,7 +2161,7 @@
      # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2097: checking for $ac_word" >&5
-+echo "configure:2148: checking for $ac_word" >&5
+-echo "configure:2114: checking for $ac_word" >&5
++echo "configure:2165: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -2123,7 +2174,7 @@
+@@ -2140,7 +2191,7 @@
    # Extract the first word of "cc", so it can be a program name with args.
  set dummy cc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2127: checking for $ac_word" >&5
-+echo "configure:2178: checking for $ac_word" >&5
+-echo "configure:2144: checking for $ac_word" >&5
++echo "configure:2195: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -2174,7 +2225,7 @@
+@@ -2191,7 +2242,7 @@
        # Extract the first word of "cl", so it can be a program name with args.
  set dummy cl; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2178: checking for $ac_word" >&5
-+echo "configure:2229: checking for $ac_word" >&5
+-echo "configure:2195: checking for $ac_word" >&5
++echo "configure:2246: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -2206,7 +2257,7 @@
+@@ -2223,7 +2274,7 @@
  fi
  
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:2210: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+echo "configure:2261: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+-echo "configure:2227: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
++echo "configure:2278: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
  
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -2217,12 +2268,12 @@
+@@ -2234,12 +2285,12 @@
  
  cat > conftest.$ac_ext << EOF
  
--#line 2221 "configure"
-+#line 2272 "configure"
+-#line 2238 "configure"
++#line 2289 "configure"
  #include "confdefs.h"
  
  main(){return(0);}
[...6545 lines suppressed...]
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 18121 "configure"
-+#line 18310 "configure"
+-#line 18145 "configure"
++#line 18337 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -18140,7 +18329,7 @@
+@@ -18164,7 +18356,7 @@
  
  ; return 0; }
  EOF
--if { (eval echo configure:18144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:18333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:18168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -18167,7 +18356,7 @@
+@@ -18191,7 +18383,7 @@
  fi
  
  echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
--echo "configure:18171: checking stack direction for C alloca" >&5
-+echo "configure:18360: checking stack direction for C alloca" >&5
+-echo "configure:18195: checking stack direction for C alloca" >&5
++echo "configure:18387: checking stack direction for C alloca" >&5
  if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -18175,7 +18364,7 @@
+@@ -18199,7 +18391,7 @@
    ac_cv_c_stack_direction=0
  else
    cat > conftest.$ac_ext <<EOF
--#line 18179 "configure"
-+#line 18368 "configure"
+-#line 18203 "configure"
++#line 18395 "configure"
  #include "confdefs.h"
  find_stack_direction ()
  {
-@@ -18194,7 +18383,7 @@
+@@ -18218,7 +18410,7 @@
    exit (find_stack_direction() < 0);
  }
  EOF
--if { (eval echo configure:18198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:18387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-if { (eval echo configure:18222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:18414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_c_stack_direction=1
  else
-@@ -18243,17 +18432,17 @@
+@@ -18267,17 +18459,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:18247: checking for $ac_hdr" >&5
-+echo "configure:18436: checking for $ac_hdr" >&5
+-echo "configure:18271: checking for $ac_hdr" >&5
++echo "configure:18463: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 18252 "configure"
-+#line 18441 "configure"
+-#line 18276 "configure"
++#line 18468 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:18257: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:18446: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (eval echo configure:18281: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:18473: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -18333,7 +18522,7 @@
+@@ -18357,7 +18549,7 @@
      # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:18337: checking for $ac_word" >&5
-+echo "configure:18526: checking for $ac_word" >&5
+-echo "configure:18361: checking for $ac_word" >&5
++echo "configure:18553: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -18377,19 +18566,19 @@
+@@ -18401,19 +18593,19 @@
       PKG_CONFIG_MIN_VERSION=0.9.0
       if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
          echo $ac_n "checking for cairo >= $CAIRO_VERSION""... $ac_c" 1>&6
--echo "configure:18381: checking for cairo >= $CAIRO_VERSION" >&5
-+echo "configure:18570: checking for cairo >= $CAIRO_VERSION" >&5
+-echo "configure:18405: checking for cairo >= $CAIRO_VERSION" >&5
++echo "configure:18597: checking for cairo >= $CAIRO_VERSION" >&5
  
          if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION" ; then
              echo "$ac_t""yes" 1>&6
              succeeded=yes
  
              echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6
--echo "configure:18388: checking CAIRO_CFLAGS" >&5
-+echo "configure:18577: checking CAIRO_CFLAGS" >&5
+-echo "configure:18412: checking CAIRO_CFLAGS" >&5
++echo "configure:18604: checking CAIRO_CFLAGS" >&5
              CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION"`
              echo "$ac_t""$CAIRO_CFLAGS" 1>&6
  
              echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6
--echo "configure:18393: checking CAIRO_LIBS" >&5
-+echo "configure:18582: checking CAIRO_LIBS" >&5
+-echo "configure:18417: checking CAIRO_LIBS" >&5
++echo "configure:18609: checking CAIRO_LIBS" >&5
              ## don't use --libs since that can do evil things like add
              ## -Wl,--export-dynamic
              CAIRO_LIBS="`$PKG_CONFIG --libs-only-L \"cairo >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo >= $CAIRO_VERSION\"`"
-@@ -18454,7 +18643,7 @@
+@@ -18478,7 +18670,7 @@
          # Extract the first word of "python", so it can be a program name with args.
  set dummy python; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:18458: checking for $ac_word" >&5
-+echo "configure:18647: checking for $ac_word" >&5
+-echo "configure:18482: checking for $ac_word" >&5
++echo "configure:18674: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -18715,14 +18904,14 @@
+@@ -18739,14 +18931,14 @@
  cross_compiling=$ac_cv_prog_cc_cross
  
      cat > conftest.$ac_ext <<EOF
--#line 18719 "configure"
-+#line 18908 "configure"
+-#line 18743 "configure"
++#line 18935 "configure"
  #include "confdefs.h"
  #include <gmodule.h>
  int main() {
   int x = 1; x++; 
  ; return 0; }
  EOF
--if { (eval echo configure:18726: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:18915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:18750: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:18942: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    :
  else
    echo "configure: failed program was:" >&5
-@@ -19015,7 +19204,7 @@
+@@ -19039,7 +19231,7 @@
                  _SAVE_CFLAGS=$CFLAGS
      CFLAGS="$CFLAGS $XCFLAGS"
      cat > conftest.$ac_ext <<EOF
--#line 19019 "configure"
-+#line 19208 "configure"
+-#line 19043 "configure"
++#line 19235 "configure"
  #include "confdefs.h"
  
          #include <stdio.h>
-@@ -19031,7 +19220,7 @@
+@@ -19055,7 +19247,7 @@
      
  ; return 0; }
  EOF
--if { (eval echo configure:19035: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:19224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:19059: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:19251: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    :
  else
    echo "configure: failed program was:" >&5
-@@ -19248,15 +19437,34 @@
+@@ -19272,15 +19464,34 @@
  # Transform confdefs.h into DEFS.
  # Protect against shell expansion while executing Makefile rules.
  # Protect against Makefile macro expansion.
@@ -5395,7 +5394,7 @@
  
  MOZ_DEFINES=$DEFS
  
-@@ -19535,12 +19743,13 @@
+@@ -19560,12 +19771,13 @@
  s%@MOZ_ENABLE_FREETYPE2@%$MOZ_ENABLE_FREETYPE2%g
  s%@MOZ_XFT_CFLAGS@%$MOZ_XFT_CFLAGS%g
  s%@MOZ_XFT_LIBS@%$MOZ_XFT_LIBS%g


Index: seamonkey.spec
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/FC-4/seamonkey.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- seamonkey.spec	12 Apr 2006 15:49:31 -0000	1.3
+++ seamonkey.spec	14 Apr 2006 03:20:50 -0000	1.4
@@ -7,8 +7,8 @@
 
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
-Version:        1.0
-Release:        11.fc4.1
+Version:        1.0.1
+Release:        1.fc4
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPL
 Group:          Applications/Internet
@@ -27,14 +27,13 @@
 
 Patch1:         firefox-1.0-prdtoa.patch
 Patch5:         seamonkey-disable-visibility.patch
-Patch6:         firefox-1.5.0.1-dumpstack.patch
+Patch6:         seamonkey-1.0.1-dumpstack.patch
 Patch21:        firefox-0.7.3-default-plugin-less-annoying.patch
 Patch22:        firefox-0.7.3-psfonts.patch
 Patch42:        firefox-1.1-uriloader.patch
 Patch82:        pango-cairo.patch
 Patch83:        seamonkey-cairo-bug5136.patch
 Patch101:       thunderbird-0.7.3-gnome-uriloader.patch
-Patch102:       thunderbird-1.5-bug304720.patch
 Patch220:       seamonkey-fedora-home-page.patch
 Patch227:       mozilla-1.4.1-ppc64.patch
 Patch301:       mozilla-1.7.3-gnome-vfs-default-app.patch
@@ -87,7 +86,6 @@
 %patch82 -p0
 %patch83 -p1
 %patch101 -p1 -b .gnome-uriloader
-%patch102 -p1
 %patch220 -p1
 %patch227 -p1
 %patch301 -p1
@@ -394,6 +392,8 @@
 
 
 %changelog
+* Fri Apr 14 2006 Kai Engert <kengert at redhat.com> 1.0.1-1.fc4
+- Update to SeaMonkey 1.0.1 release
 * Wed Apr 12 2006 Kai Engert <kengert at redhat.com> 1.0-11.fc4.1
 - Fix spec and patches to work with FC-4
 * Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-11


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Apr 2006 21:58:25 -0000	1.2
+++ sources	14 Apr 2006 03:20:50 -0000	1.3
@@ -1 +1 @@
-e4f2edc5b2248d090303c70f5b28f210  seamonkey-1.0.source.tar.bz2
+6921464b5251cafd529c04c2b9f98d5f  seamonkey-1.0.1.source.tar.bz2



From fedora-extras-commits at redhat.com  Fri Apr 14 04:26:17 2006
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Thu, 13 Apr 2006 21:26:17 -0700
Subject: rpms/shorewall/devel .cvsignore, 1.13, 1.14 shorewall.spec, 1.19,
	1.20 sources, 1.13, 1.14
Message-ID: <200604140426.k3E4QJOg003415@cvs-int.fedora.redhat.com>

Author: robmv

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

Modified Files:
	.cvsignore shorewall.spec sources 
Log Message:
Update to upstream 3.2.0-Beta4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	31 Mar 2006 14:52:20 -0000	1.13
+++ .cvsignore	14 Apr 2006 04:26:17 -0000	1.14
@@ -1 +1 @@
-shorewall-3.0.6.tar.bz2
+shorewall-3.2.0-Beta4.tar.bz2


Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/shorewall.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- shorewall.spec	31 Mar 2006 14:52:20 -0000	1.19
+++ shorewall.spec	14 Apr 2006 04:26:17 -0000	1.20
@@ -1,13 +1,16 @@
+%define beta_release Beta4
+
 Name: shorewall
-Version: 3.0.6
-Release: 1%{?dist}
+Version: 3.2.0
+Release: 0.1.%{beta_release}%{?dist}
 
 Summary: Iptables-based firewall for Linux systems
 
 Group: Applications/System
 License: GPL
 URL: http://www.shorewall.net/
-Source: http://www.shorewall.net/pub/shorewall/3.0/shorewall-%{version}/shorewall-%{version}.tar.bz2
+#Source: http://www.shorewall.net/pub/shorewall/3.0/shorewall-%{version}/shorewall-%{version}.tar.bz2
+Source: http://www.shorewall.net/pub/shorewall/development/3.2/shorewall-%{version}-%{beta_release}/shorewall-%{version}-%{beta_release}.tar.bz2
 Patch0: shorewall-3.0.3-init.patch
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -25,7 +28,7 @@
 
 %prep
 
-%setup -q
+%setup -q -n %{name}-%{version}-%{beta_release}
 %patch0 -p1
 
 %install
@@ -69,9 +72,12 @@
 %{_datadir}/shorewall/rfc1918
 %{_datadir}/shorewall/version
 %{_datadir}/shorewall/Limit
+%{_datadir}/shorewall/prog.*
 
 %attr(0754,root,root) %{_datadir}/shorewall/firewall
 %attr(0754,root,root) %{_datadir}/shorewall/functions
+%attr(0754,root,root) %{_datadir}/shorewall/compiler
+%attr(0754,root,root) %{_datadir}/shorewall/shorecap
 %attr(0754,root,root) %{_datadir}/shorewall/help
 
 %attr(0700,root,root) %dir %{_localstatedir}/lib/shorewall
@@ -80,6 +86,9 @@
 %doc COPYING INSTALL changelog.txt releasenotes.txt README.txt Samples
 
 %changelog
+* Fri Apr 14 2006 Robert Marcano <roberti at marcanoonline.com> - 3.2.0-0.1.Beta4
+- Update to upstream 3.2.0-Beta4
+
 * Fri Mar 31 2006 Robert Marcano <roberti at marcanoonline.com> - 3.0.6-1
 - Update to upstream 3.0.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	31 Mar 2006 14:52:20 -0000	1.13
+++ sources	14 Apr 2006 04:26:17 -0000	1.14
@@ -1 +1 @@
-6228a86219881f015e02cefe2a6310a8  shorewall-3.0.6.tar.bz2
+37984d2c8e6f4ee220fca99ab1c451e4  shorewall-3.2.0-Beta4.tar.bz2



From fedora-extras-commits at redhat.com  Fri Apr 14 06:41:05 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 13 Apr 2006 23:41:05 -0700
Subject: rpms/amaya/FC-4 .cvsignore, 1.3, 1.4 amaya.spec, 1.14, 1.15 sources,
	1.3, 1.4
Message-ID: <200604140641.k3E6f7UW007969@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	.cvsignore amaya.spec sources 
Log Message:
upgrade to 9.5 to fix vulnerability


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amaya/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 May 2005 13:45:17 -0000	1.3
+++ .cvsignore	14 Apr 2006 06:41:05 -0000	1.4
@@ -1 +1 @@
-amaya-fullsrc-9.1.tgz
+amaya-fullsrc-9.5.tgz


Index: amaya.spec
===================================================================
RCS file: /cvs/extras/rpms/amaya/FC-4/amaya.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- amaya.spec	12 Jun 2005 11:58:52 -0000	1.14
+++ amaya.spec	14 Apr 2006 06:41:05 -0000	1.15
@@ -1,26 +1,27 @@
 Name:		amaya
-Version:	9.1
-Release:	3%{?dist}
+Version:	9.4
+Release:	1%{?dist}
 
 Summary:	W3C's browser/web authoring tool
 Group:		Applications/Internet
-Source0:	http://www.w3.org/Amaya/Distribution/amaya-fullsrc-9.1.tgz
+Source0:	http://www.w3.org/Amaya/Distribution/amaya-fullsrc-9.5.tgz
 Source1:	amaya.png
-Patch0:		amaya-9.1-configure.diff
-Patch1:		amaya-9.1-64bits.patch
 
 License:	W3C Software License
 Url:		http://www.w3.org/Amaya
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 #BuildRequires:	libjpeg-devel libpng-devel zlib-devel
 #BuildRequires:	gtk+-devel perl bison flex imlib-devel
-BuildRequires:	xorg-x11-devel, freetype-devel >= 2.0
+BuildRequires:	freetype-devel >= 2.0
 BuildRequires:	desktop-file-utils, gtk+-devel, imlib-devel
-BuildRequires:  libpng-devel
+BuildRequires:  libpng-devel, libXt-devel
 # TODO: make it link with the system's libwww. Didn't manage to build with it
 # yet. Patches accepted.
 #BuildRequires:	w3c-libwww-devel
 
+# Does not build on x86_64, see bug #182512
+ExcludeArch: x86_64
+
 %description
 Amaya is a WYSIWYG browser/web authoring tool from the W3C.
 
@@ -29,8 +30,6 @@
 
 %prep
 %setup -q -c
-%patch0 -p0
-%patch1 -p0
 
 %build
 mkdir -p Amaya/gtk-build
@@ -40,10 +39,13 @@
 export CFLAGS="$RPM_OPT_FLAGS"
 ../configure --enable-bookmarks \
              --prefix=%_libdir \
-	     --bindir=%_bindir \
-	     --exec_prefix=%_exec_prefix \
+             --bindir=%_bindir \
+             --exec_prefix=%_exec_prefix \
              --libdir=%_libdir \
+             --disable-annot \
              --with-gtk
+             
+# annotations cause build to fail
 make
 popd
 
@@ -61,7 +63,8 @@
 # fix up symlinks
 pushd ${RPM_BUILD_ROOT}%{_bindir} >/dev/null
 rm -f amaya*
-ln -s %{_libdir}/Amaya-*/gtk/bin/amaya amaya-gtk
+amayadir=`ls -d ${RPM_BUILD_ROOT}%{_libdir}/Amaya-*`
+ln -s %{_libdir}/`basename $amayadir`/gtk/bin/amaya amaya-gtk
 ln -s amaya-gtk amaya
 popd >/dev/null
 
@@ -99,6 +102,36 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Thu Apr 13 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-1
+- upgrade to 9.5 to fix vulnerability
+
+* Sun Mar 12 2006 Aurelien Bompard <gauret[AT]free.fr> 9.1-12
+- fix symlink (bug #184503)
+
+* Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 9.1-11
+- give up on x86_64 and excludearch it
+
+* Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 9.1-10
+- next try at the x86_64 patch
+
+* Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 9.1-9
+- update x86_64 patch again
+
+* Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 9.1-8
+- update x86_64 patch
+
+* Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 9.1-7
+- fix dependency on modular X11 again
+
+* Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 9.1-6
+- fix dependency on modular X11
+
+* Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 9.1-5
+- rebuild for FC5
+
+* Sun Jun 12 2005 Aurelien Bompard <gauret[AT]free.fr> 9.1-4
+- patch one more file
+
 * Sun Jun 12 2005 Aurelien Bompard <gauret[AT]free.fr> 9.1-3
 - add patch for pointer/int problem on x86_64
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amaya/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 May 2005 13:45:17 -0000	1.3
+++ sources	14 Apr 2006 06:41:05 -0000	1.4
@@ -1 +1 @@
-453fc74b79acb013e64a380865970773  amaya-fullsrc-9.1.tgz
+7b80b2fdda491a7f693b72606137f955  amaya-fullsrc-9.5.tgz



From fedora-extras-commits at redhat.com  Fri Apr 14 06:41:06 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 13 Apr 2006 23:41:06 -0700
Subject: rpms/amaya/FC-5 .cvsignore, 1.3, 1.4 amaya.spec, 1.24, 1.25 sources,
	1.3, 1.4
Message-ID: <200604140641.k3E6f8cb007975@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	.cvsignore amaya.spec sources 
Log Message:
upgrade to 9.5 to fix vulnerability


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amaya/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 May 2005 13:45:17 -0000	1.3
+++ .cvsignore	14 Apr 2006 06:41:06 -0000	1.4
@@ -1 +1 @@
-amaya-fullsrc-9.1.tgz
+amaya-fullsrc-9.5.tgz


Index: amaya.spec
===================================================================
RCS file: /cvs/extras/rpms/amaya/FC-5/amaya.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- amaya.spec	12 Mar 2006 09:42:53 -0000	1.24
+++ amaya.spec	14 Apr 2006 06:41:06 -0000	1.25
@@ -1,13 +1,11 @@
 Name:		amaya
-Version:	9.1
-Release:	12%{?dist}
+Version:	9.4
+Release:	1%{?dist}
 
 Summary:	W3C's browser/web authoring tool
 Group:		Applications/Internet
-Source0:	http://www.w3.org/Amaya/Distribution/amaya-fullsrc-9.1.tgz
+Source0:	http://www.w3.org/Amaya/Distribution/amaya-fullsrc-9.5.tgz
 Source1:	amaya.png
-Patch0:		amaya-9.1-configure.diff
-Patch1:		amaya-9.1-64bits.patch
 
 License:	W3C Software License
 Url:		http://www.w3.org/Amaya
@@ -32,8 +30,6 @@
 
 %prep
 %setup -q -c
-%patch0 -p0
-%patch1 -p0 -b .64bits
 
 %build
 mkdir -p Amaya/gtk-build
@@ -46,7 +42,10 @@
              --bindir=%_bindir \
              --exec_prefix=%_exec_prefix \
              --libdir=%_libdir \
+             --disable-annot \
              --with-gtk
+             
+# annotations cause build to fail
 make
 popd
 
@@ -103,6 +102,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Thu Apr 13 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-1
+- upgrade to 9.5 to fix vulnerability
+
 * Sun Mar 12 2006 Aurelien Bompard <gauret[AT]free.fr> 9.1-12
 - fix symlink (bug #184503)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amaya/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 May 2005 13:45:17 -0000	1.3
+++ sources	14 Apr 2006 06:41:06 -0000	1.4
@@ -1 +1 @@
-453fc74b79acb013e64a380865970773  amaya-fullsrc-9.1.tgz
+7b80b2fdda491a7f693b72606137f955  amaya-fullsrc-9.5.tgz



From fedora-extras-commits at redhat.com  Fri Apr 14 06:41:07 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 13 Apr 2006 23:41:07 -0700
Subject: rpms/amaya/devel .cvsignore, 1.3, 1.4 amaya.spec, 1.24, 1.25 sources,
	1.3, 1.4
Message-ID: <200604140641.k3E6f9Hg007981@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	.cvsignore amaya.spec sources 
Log Message:
upgrade to 9.5 to fix vulnerability


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amaya/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 May 2005 13:45:17 -0000	1.3
+++ .cvsignore	14 Apr 2006 06:41:07 -0000	1.4
@@ -1 +1 @@
-amaya-fullsrc-9.1.tgz
+amaya-fullsrc-9.5.tgz


Index: amaya.spec
===================================================================
RCS file: /cvs/extras/rpms/amaya/devel/amaya.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- amaya.spec	12 Mar 2006 09:42:53 -0000	1.24
+++ amaya.spec	14 Apr 2006 06:41:07 -0000	1.25
@@ -1,13 +1,11 @@
 Name:		amaya
-Version:	9.1
-Release:	12%{?dist}
+Version:	9.4
+Release:	1%{?dist}
 
 Summary:	W3C's browser/web authoring tool
 Group:		Applications/Internet
-Source0:	http://www.w3.org/Amaya/Distribution/amaya-fullsrc-9.1.tgz
+Source0:	http://www.w3.org/Amaya/Distribution/amaya-fullsrc-9.5.tgz
 Source1:	amaya.png
-Patch0:		amaya-9.1-configure.diff
-Patch1:		amaya-9.1-64bits.patch
 
 License:	W3C Software License
 Url:		http://www.w3.org/Amaya
@@ -32,8 +30,6 @@
 
 %prep
 %setup -q -c
-%patch0 -p0
-%patch1 -p0 -b .64bits
 
 %build
 mkdir -p Amaya/gtk-build
@@ -46,7 +42,10 @@
              --bindir=%_bindir \
              --exec_prefix=%_exec_prefix \
              --libdir=%_libdir \
+             --disable-annot \
              --with-gtk
+             
+# annotations cause build to fail
 make
 popd
 
@@ -103,6 +102,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Thu Apr 13 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-1
+- upgrade to 9.5 to fix vulnerability
+
 * Sun Mar 12 2006 Aurelien Bompard <gauret[AT]free.fr> 9.1-12
 - fix symlink (bug #184503)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amaya/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 May 2005 13:45:17 -0000	1.3
+++ sources	14 Apr 2006 06:41:07 -0000	1.4
@@ -1 +1 @@
-453fc74b79acb013e64a380865970773  amaya-fullsrc-9.1.tgz
+7b80b2fdda491a7f693b72606137f955  amaya-fullsrc-9.5.tgz



From fedora-extras-commits at redhat.com  Fri Apr 14 07:10:46 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 14 Apr 2006 00:10:46 -0700
Subject: rpms/amaya/FC-4 amaya.spec,1.15,1.16
Message-ID: <200604140710.k3E7AmvT010329@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	amaya.spec 
Log Message:
fix build on FC-4


Index: amaya.spec
===================================================================
RCS file: /cvs/extras/rpms/amaya/FC-4/amaya.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- amaya.spec	14 Apr 2006 06:41:05 -0000	1.15
+++ amaya.spec	14 Apr 2006 07:10:46 -0000	1.16
@@ -1,6 +1,6 @@
 Name:		amaya
 Version:	9.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Summary:	W3C's browser/web authoring tool
 Group:		Applications/Internet
@@ -10,11 +10,14 @@
 License:	W3C Software License
 Url:		http://www.w3.org/Amaya
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#BuildRequires:	libjpeg-devel libpng-devel zlib-devel
-#BuildRequires:	gtk+-devel perl bison flex imlib-devel
 BuildRequires:	freetype-devel >= 2.0
 BuildRequires:	desktop-file-utils, gtk+-devel, imlib-devel
 BuildRequires:  libpng-devel, libXt-devel
+%if "%fedora" >= "5"
+BuildRequires:  libXt-devel
+%else
+BuildRequires:  xorg-x11-devel
+%fi
 # TODO: make it link with the system's libwww. Didn't manage to build with it
 # yet. Patches accepted.
 #BuildRequires:	w3c-libwww-devel
@@ -102,6 +105,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-2
+- fix build on FC-4
+
 * Thu Apr 13 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-1
 - upgrade to 9.5 to fix vulnerability
 



From fedora-extras-commits at redhat.com  Fri Apr 14 07:10:47 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 14 Apr 2006 00:10:47 -0700
Subject: rpms/amaya/FC-5 amaya.spec,1.25,1.26
Message-ID: <200604140710.k3E7AnfT010331@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	amaya.spec 
Log Message:
fix build on FC-4


Index: amaya.spec
===================================================================
RCS file: /cvs/extras/rpms/amaya/FC-5/amaya.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- amaya.spec	14 Apr 2006 06:41:06 -0000	1.25
+++ amaya.spec	14 Apr 2006 07:10:47 -0000	1.26
@@ -1,6 +1,6 @@
 Name:		amaya
 Version:	9.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Summary:	W3C's browser/web authoring tool
 Group:		Applications/Internet
@@ -10,11 +10,14 @@
 License:	W3C Software License
 Url:		http://www.w3.org/Amaya
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#BuildRequires:	libjpeg-devel libpng-devel zlib-devel
-#BuildRequires:	gtk+-devel perl bison flex imlib-devel
 BuildRequires:	freetype-devel >= 2.0
 BuildRequires:	desktop-file-utils, gtk+-devel, imlib-devel
 BuildRequires:  libpng-devel, libXt-devel
+%if "%fedora" >= "5"
+BuildRequires:  libXt-devel
+%else
+BuildRequires:  xorg-x11-devel
+%fi
 # TODO: make it link with the system's libwww. Didn't manage to build with it
 # yet. Patches accepted.
 #BuildRequires:	w3c-libwww-devel
@@ -102,6 +105,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-2
+- fix build on FC-4
+
 * Thu Apr 13 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-1
 - upgrade to 9.5 to fix vulnerability
 



From fedora-extras-commits at redhat.com  Fri Apr 14 07:10:48 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 14 Apr 2006 00:10:48 -0700
Subject: rpms/amaya/devel amaya.spec,1.25,1.26
Message-ID: <200604140710.k3E7Ao92010335@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	amaya.spec 
Log Message:
fix build on FC-4


Index: amaya.spec
===================================================================
RCS file: /cvs/extras/rpms/amaya/devel/amaya.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- amaya.spec	14 Apr 2006 06:41:07 -0000	1.25
+++ amaya.spec	14 Apr 2006 07:10:47 -0000	1.26
@@ -1,6 +1,6 @@
 Name:		amaya
 Version:	9.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Summary:	W3C's browser/web authoring tool
 Group:		Applications/Internet
@@ -10,11 +10,14 @@
 License:	W3C Software License
 Url:		http://www.w3.org/Amaya
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#BuildRequires:	libjpeg-devel libpng-devel zlib-devel
-#BuildRequires:	gtk+-devel perl bison flex imlib-devel
 BuildRequires:	freetype-devel >= 2.0
 BuildRequires:	desktop-file-utils, gtk+-devel, imlib-devel
 BuildRequires:  libpng-devel, libXt-devel
+%if "%fedora" >= "5"
+BuildRequires:  libXt-devel
+%else
+BuildRequires:  xorg-x11-devel
+%fi
 # TODO: make it link with the system's libwww. Didn't manage to build with it
 # yet. Patches accepted.
 #BuildRequires:	w3c-libwww-devel
@@ -102,6 +105,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-2
+- fix build on FC-4
+
 * Thu Apr 13 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-1
 - upgrade to 9.5 to fix vulnerability
 



From fedora-extras-commits at redhat.com  Fri Apr 14 07:12:18 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 14 Apr 2006 00:12:18 -0700
Subject: rpms/amaya/devel amaya.spec,1.26,1.27
Message-ID: <200604140712.k3E7CK2A010410@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	amaya.spec 
Log Message:
typo


Index: amaya.spec
===================================================================
RCS file: /cvs/extras/rpms/amaya/devel/amaya.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- amaya.spec	14 Apr 2006 07:10:47 -0000	1.26
+++ amaya.spec	14 Apr 2006 07:12:18 -0000	1.27
@@ -17,7 +17,7 @@
 BuildRequires:  libXt-devel
 %else
 BuildRequires:  xorg-x11-devel
-%fi
+%endif
 # TODO: make it link with the system's libwww. Didn't manage to build with it
 # yet. Patches accepted.
 #BuildRequires:	w3c-libwww-devel



From fedora-extras-commits at redhat.com  Fri Apr 14 07:12:11 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 14 Apr 2006 00:12:11 -0700
Subject: rpms/amaya/FC-4 amaya.spec,1.16,1.17
Message-ID: <200604140712.k3E7Ch7t010413@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	amaya.spec 
Log Message:
typo


Index: amaya.spec
===================================================================
RCS file: /cvs/extras/rpms/amaya/FC-4/amaya.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- amaya.spec	14 Apr 2006 07:10:46 -0000	1.16
+++ amaya.spec	14 Apr 2006 07:12:11 -0000	1.17
@@ -17,7 +17,7 @@
 BuildRequires:  libXt-devel
 %else
 BuildRequires:  xorg-x11-devel
-%fi
+%endif
 # TODO: make it link with the system's libwww. Didn't manage to build with it
 # yet. Patches accepted.
 #BuildRequires:	w3c-libwww-devel



From fedora-extras-commits at redhat.com  Fri Apr 14 07:12:12 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 14 Apr 2006 00:12:12 -0700
Subject: rpms/amaya/FC-5 amaya.spec,1.26,1.27
Message-ID: <200604140712.k3E7CiaI010416@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	amaya.spec 
Log Message:
typo


Index: amaya.spec
===================================================================
RCS file: /cvs/extras/rpms/amaya/FC-5/amaya.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- amaya.spec	14 Apr 2006 07:10:47 -0000	1.26
+++ amaya.spec	14 Apr 2006 07:12:12 -0000	1.27
@@ -17,7 +17,7 @@
 BuildRequires:  libXt-devel
 %else
 BuildRequires:  xorg-x11-devel
-%fi
+%endif
 # TODO: make it link with the system's libwww. Didn't manage to build with it
 # yet. Patches accepted.
 #BuildRequires:	w3c-libwww-devel



From fedora-extras-commits at redhat.com  Fri Apr 14 07:29:14 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 14 Apr 2006 00:29:14 -0700
Subject: rpms/amarok/FC-5 .cvsignore, 1.20, 1.21 amarok.spec, 1.45,
	1.46 sources, 1.20, 1.21
Message-ID: <200604140729.k3E7TGco010582@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	.cvsignore amarok.spec sources 
Log Message:
update to beta3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-5/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	14 Mar 2006 08:38:52 -0000	1.20
+++ .cvsignore	14 Apr 2006 07:29:14 -0000	1.21
@@ -1 +1 @@
-amarok-1.4-beta2.tar.bz2
+amarok-1.4-beta3c.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-5/amarok.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- amarok.spec	21 Mar 2006 23:08:40 -0000	1.45
+++ amarok.spec	14 Apr 2006 07:29:14 -0000	1.46
@@ -1,21 +1,14 @@
-# Rebuild switch: 
-#  --with nonfree    Enables nonfree plugins (xine engine, MP4 support, iPod...)
-#
-
-%{?_with_nonfree: %define use_nonfree 1}
-
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.4
-Release:    0.9.beta2%{?dist}
+Release:    0.11.beta3%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.4-beta2.tar.bz2
+Source0:    http://dl.sf.net/amarok/amarok-1.4-beta3c.tar.bz2
 Patch0:     amarok-1.4beta1-gst10.patch
-Patch1:     amarok-1.4-helix.patch
-#Patch1:     amarok-1.3.6-libtunepimp040.patch
+#Patch1:     amarok-1.4-helix.patch
 Patch2:     amarok-1.4-engines-cfg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -30,10 +23,11 @@
 BuildRequires:  libtunepimp-devel >= 0.4.0
 BuildRequires:  kdebase-devel
 BuildRequires:  alsa-lib-devel
-BuildRequires:  akode-devel
+#BuildRequires:  akode-devel
 BuildRequires:  libifp-devel, libusb-devel
 %if "%fedora" >= "5"
 BuildRequires:  gstreamer-plugins-base-devel, gstreamer-plugins-good-devel, gstreamer-devel
+BuildRequires:  libgpod-devel
 %else
 BuildRequires:  gstreamer-plugins-devel >= 0.8.4
 %endif
@@ -41,12 +35,6 @@
 BuildRequires:  HelixPlayer
 %endif
 
-%if  0%{?use_nonfree}
-BuildRequires:  xine-lib-devel >= 0:1.0.0
-BuildRequires:  libmad-devel
-BuildRequires:  faad2-devel
-%endif
-
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -79,32 +67,13 @@
 use any of xmms' visualisation plugins with Amarok.
 
 
-%if 0%{?use_nonfree}
-%package nonfree
-Summary:    Non-free plugins for Amarok
-Group:      Applications/Multimedia
-Requires:   %{name} = %{version}
-Obsoletes:  %{name}-xine < %{version}
-Provides:   %{name}-xine = %{version}
-
-%description nonfree
-This package adds the patented/non-free plugins for Amarok:
- - xine engine
- - mp4 tagging support (not yet done)
- - iPod support (not yet done)
-%endif
-
 
 %prep
-%setup -q -n %{name}-%{version}-beta2
+%setup -q -n %{name}-%{version}-beta3c
 # Discover the helix libs
-%patch1 -p1 -b .helix
-# Use libtunepimp 0.4.0 (api changed)
-#%patch1 -p1 -b .libtunepimp040
+#%patch1 -p1 -b .helix
 # Gstreamer default sink should be autoaudiosink
 %patch2 -p1 -b .engines-cfg
-# Don't use cache to detect gst 0.10 or it will fail because gst 0.8 is not present
-#%patch0 -p1 -b .gst10
 
 
 %build
@@ -118,17 +87,11 @@
      --enable-mysql \
      --enable-postgresql \
      --with-ifp \
-%ifnarch ppc64 x86_64 s390 s390x ia64
-     --with-helix=%{_libdir}/helix \
-%endif
-%if 0%{?use_nonfree}
-     --with-xine \
-#     --with-mp4v2 \  # Compile fails
-#     --with-libgpod \ # Not packaged yet
-%else
+     --with-libgpod \
      --without-xine \
      --without-mp4v2 \
-#     --without-libgpod \
+%ifnarch ppc64 x86_64 s390 s390x ia64
+     --with-helix=%{_libdir}/helix \
 %endif
 #     --enable-final \
 #     --with-nmm \
@@ -147,13 +110,6 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus
 
-# The desktop file contains both the desktop entry and the service menu, we have to split.
-# Tail from the blank line:
-perl -ne '/^$/...do{print;0}' $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop \
-    > $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus/%name.desktop
-# Head until the blank line:
-perl -pi -e '/^$/ && exit' $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
-
 desktop-file-install  --vendor "" \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
         --delete-original \
@@ -161,7 +117,7 @@
         --add-category X-Fedora \
         $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
 
-rm -f $RPM_BUILD_ROOT%{_datadir}/applications/kde/amarokapp.desktop
+#rm -f $RPM_BUILD_ROOT%{_datadir}/applications/kde/amarokapp.desktop
 # Amarok crashes without the *.la files !
 #find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 # Remove the *.la file in /usr/lib though, those are OK to delete
@@ -207,16 +163,19 @@
 %{_bindir}/amarokapp
 %{_bindir}/amarokcollectionscanner
 %{_datadir}/apps/%{name}
+%exclude %{_datadir}/apps/%{name}/images/xine_logo.png
 %{_datadir}/icons/hicolor/*/*
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/services/amarok_void-engine_plugin.desktop
 %{_datadir}/services/amarok_ifp-mediadevice.desktop
 %{_datadir}/services/amarok_vfat-mediadevice.desktop
+%{_datadir}/services/amarok_ipod-mediadevice.desktop
 %{_datadir}/servicetypes/*.desktop
 %{_datadir}/apps/konqueror/servicemenus/*.desktop
 %{_libdir}/kde3/libamarok_void-engine_plugin.*
 %{_libdir}/kde3/libamarok_ifp-mediadevice.*
 %{_libdir}/kde3/libamarok_vfat-mediadevice.*
+%{_libdir}/kde3/libamarok_ipod-mediadevice.*
 %{_libdir}/kde3/konqsidebar_universalamarok.*
 %{_libdir}/libamarok.*
 %{_datadir}/apps/konqsidebartng/*/amarok.desktop
@@ -231,9 +190,9 @@
 %{_datadir}/services/amarok_gstengine_plugin.desktop
 %{_libdir}/kde3/libamarok_gstengine_plugin.*
 %endif
-# Akode engine
-%{_datadir}/services/amarok_aKode-engine.desktop
-%{_libdir}/kde3/libamarok_aKode-engine.*
+# Akode engine - disabled in beta3
+#%{_datadir}/services/amarok_aKode-engine.desktop
+#%{_libdir}/kde3/libamarok_aKode-engine.*
 # Helix engine
 %ifnarch ppc64 x86_64 s390 s390x ia64
 %{_libdir}/kde3/libamarok_helixengine_plugin.*
@@ -241,22 +200,21 @@
 %endif
 
 
-
 %files visualisation
 %defattr(-,root,root)
 %{_bindir}/amarok_libvisual
 %{_bindir}/amarok_xmmswrapper2
 
 
-%if 0%{?use_nonfree}
-%files nonfree
-%defattr(-,root,root)
-%{_libdir}/kde3/libamarok_xine-engine.*
-%{_datadir}/services/amarok_xine-engine.desktop
-%endif
-
 
 %changelog
+* Sun Apr 09 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-0.11.beta3
+- drop the non-free bits
+- beta 3 (akode has been disabled)
+
+* Wed Mar 22 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-0.10.beta2
+- enable libgpod support
+
 * Wed Mar 22 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-0.9.beta2
 - make amarok build even with gstreamer only
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-5/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	14 Mar 2006 08:38:52 -0000	1.20
+++ sources	14 Apr 2006 07:29:14 -0000	1.21
@@ -1 +1 @@
-0c7e2a5e8ea2d73d8e73b986090cfc37  amarok-1.4-beta2.tar.bz2
+b92433b46005f0b2fc31e0ce0bf4cb3a  amarok-1.4-beta3c.tar.bz2



From fedora-extras-commits at redhat.com  Fri Apr 14 07:29:15 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 14 Apr 2006 00:29:15 -0700
Subject: rpms/amarok/devel .cvsignore, 1.20, 1.21 amarok-1.4-helix.patch, 1.1,
	1.2 amarok.spec, 1.44, 1.45 sources, 1.20, 1.21
Message-ID: <200604140729.k3E7THTZ010590@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	.cvsignore amarok-1.4-helix.patch amarok.spec sources 
Log Message:
update to beta3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	14 Mar 2006 08:38:52 -0000	1.20
+++ .cvsignore	14 Apr 2006 07:29:15 -0000	1.21
@@ -1 +1 @@
-amarok-1.4-beta2.tar.bz2
+amarok-1.4-beta3c.tar.bz2

amarok-1.4-helix.patch:

Index: amarok-1.4-helix.patch
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok-1.4-helix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- amarok-1.4-helix.patch	14 Mar 2006 08:38:52 -0000	1.1
+++ amarok-1.4-helix.patch	14 Apr 2006 07:29:15 -0000	1.2
@@ -1,11 +1,20 @@
 --- ./configure.helix	2006-03-05 20:28:13.000000000 +0100
-+++ ./configure	2006-03-13 23:04:01.000000000 +0100
++++ ./configure	2006-03-22 00:04:48.000000000 +0100
 @@ -38181,7 +38181,7 @@
  # BEGIN DO_NOT_COMPILE CHECK
  ###############################################################################
  
 -if test x$build_xine != xyes -a x$build_helix != xno; then
-+if test x$build_xine = xno -a x$build_helix = xno; then
++if test x$build_xine = xno -a x$build_helix = xno -a x$build_gstreamer10 = xno; then
  
      DO_NOT_COMPILE="$DO_NOT_COMPILE amarok"
      no_engine=yes
+@@ -40594,7 +40594,7 @@
+     echo " =================================="
+     echo " ="
+     echo " = No suitable multimedia framework was detected. You need to install at least"
+-    echo " = the Xine or Helix framework as detailed in the amaroK README."
++    echo " = the Xine, Helix framework or GStreamer as detailed in the amaroK README."
+     echo " ="
+ fi
+ 


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- amarok.spec	14 Mar 2006 08:38:52 -0000	1.44
+++ amarok.spec	14 Apr 2006 07:29:15 -0000	1.45
@@ -1,21 +1,14 @@
-# Rebuild switch: 
-#  --with nonfree    Enables nonfree plugins (xine engine, MP4 support, iPod...)
-#
-
-%{?_with_nonfree: %define use_nonfree 1}
-
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.4
-Release:    0.8.beta2%{?dist}
+Release:    0.11.beta3%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.4-beta2.tar.bz2
+Source0:    http://dl.sf.net/amarok/amarok-1.4-beta3c.tar.bz2
 Patch0:     amarok-1.4beta1-gst10.patch
-Patch1:     amarok-1.4-helix.patch
-#Patch1:     amarok-1.3.6-libtunepimp040.patch
+#Patch1:     amarok-1.4-helix.patch
 Patch2:     amarok-1.4-engines-cfg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -30,10 +23,11 @@
 BuildRequires:  libtunepimp-devel >= 0.4.0
 BuildRequires:  kdebase-devel
 BuildRequires:  alsa-lib-devel
-BuildRequires:  akode-devel
+#BuildRequires:  akode-devel
 BuildRequires:  libifp-devel, libusb-devel
 %if "%fedora" >= "5"
 BuildRequires:  gstreamer-plugins-base-devel, gstreamer-plugins-good-devel, gstreamer-devel
+BuildRequires:  libgpod-devel
 %else
 BuildRequires:  gstreamer-plugins-devel >= 0.8.4
 %endif
@@ -41,12 +35,6 @@
 BuildRequires:  HelixPlayer
 %endif
 
-%if  0%{?use_nonfree}
-BuildRequires:  xine-lib-devel >= 0:1.0.0
-BuildRequires:  libmad-devel
-BuildRequires:  faad2-devel
-%endif
-
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -79,32 +67,13 @@
 use any of xmms' visualisation plugins with Amarok.
 
 
-%if 0%{?use_nonfree}
-%package nonfree
-Summary:    Non-free plugins for Amarok
-Group:      Applications/Multimedia
-Requires:   %{name} = %{version}
-Obsoletes:  %{name}-xine < %{version}
-Provides:   %{name}-xine = %{version}
-
-%description nonfree
-This package adds the patented/non-free plugins for Amarok:
- - xine engine
- - mp4 tagging support (not yet done)
- - iPod support (not yet done)
-%endif
-
 
 %prep
-%setup -q -n %{name}-%{version}-beta2
+%setup -q -n %{name}-%{version}-beta3c
 # Discover the helix libs
-%patch1 -p1 -b .helix
-# Use libtunepimp 0.4.0 (api changed)
-#%patch1 -p1 -b .libtunepimp040
+#%patch1 -p1 -b .helix
 # Gstreamer default sink should be autoaudiosink
 %patch2 -p1 -b .engines-cfg
-# Don't use cache to detect gst 0.10 or it will fail because gst 0.8 is not present
-#%patch0 -p1 -b .gst10
 
 
 %build
@@ -118,17 +87,11 @@
      --enable-mysql \
      --enable-postgresql \
      --with-ifp \
-%ifnarch ppc64 x86_64 s390 s390x ia64
-     --with-helix=%{_libdir}/helix \
-%endif
-%if 0%{?use_nonfree}
-     --with-xine \
-#     --with-mp4v2 \  # Compile fails
-#     --with-libgpod \ # Not packaged yet
-%else
+     --with-libgpod \
      --without-xine \
      --without-mp4v2 \
-#     --without-libgpod \
+%ifnarch ppc64 x86_64 s390 s390x ia64
+     --with-helix=%{_libdir}/helix \
 %endif
 #     --enable-final \
 #     --with-nmm \
@@ -147,21 +110,14 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus
 
-# The desktop file contains both the desktop entry and the service menu, we have to split.
-# Tail from the blank line:
-perl -ne '/^$/...do{print;0}' $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop \
-    > $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus/%name.desktop
-# Head until the blank line:
-perl -pi -e '/^$/ && exit' $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
-
-desktop-file-install  --vendor fedora \
+desktop-file-install  --vendor "" \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
         --delete-original \
         --add-category Application \
         --add-category X-Fedora \
         $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
 
-rm -f $RPM_BUILD_ROOT%{_datadir}/applications/kde/amarokapp.desktop
+#rm -f $RPM_BUILD_ROOT%{_datadir}/applications/kde/amarokapp.desktop
 # Amarok crashes without the *.la files !
 #find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 # Remove the *.la file in /usr/lib though, those are OK to delete
@@ -207,16 +163,19 @@
 %{_bindir}/amarokapp
 %{_bindir}/amarokcollectionscanner
 %{_datadir}/apps/%{name}
+%exclude %{_datadir}/apps/%{name}/images/xine_logo.png
 %{_datadir}/icons/hicolor/*/*
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/services/amarok_void-engine_plugin.desktop
 %{_datadir}/services/amarok_ifp-mediadevice.desktop
 %{_datadir}/services/amarok_vfat-mediadevice.desktop
+%{_datadir}/services/amarok_ipod-mediadevice.desktop
 %{_datadir}/servicetypes/*.desktop
 %{_datadir}/apps/konqueror/servicemenus/*.desktop
 %{_libdir}/kde3/libamarok_void-engine_plugin.*
 %{_libdir}/kde3/libamarok_ifp-mediadevice.*
 %{_libdir}/kde3/libamarok_vfat-mediadevice.*
+%{_libdir}/kde3/libamarok_ipod-mediadevice.*
 %{_libdir}/kde3/konqsidebar_universalamarok.*
 %{_libdir}/libamarok.*
 %{_datadir}/apps/konqsidebartng/*/amarok.desktop
@@ -231,9 +190,9 @@
 %{_datadir}/services/amarok_gstengine_plugin.desktop
 %{_libdir}/kde3/libamarok_gstengine_plugin.*
 %endif
-# Akode engine
-%{_datadir}/services/amarok_aKode-engine.desktop
-%{_libdir}/kde3/libamarok_aKode-engine.*
+# Akode engine - disabled in beta3
+#%{_datadir}/services/amarok_aKode-engine.desktop
+#%{_libdir}/kde3/libamarok_aKode-engine.*
 # Helix engine
 %ifnarch ppc64 x86_64 s390 s390x ia64
 %{_libdir}/kde3/libamarok_helixengine_plugin.*
@@ -241,22 +200,24 @@
 %endif
 
 
-
 %files visualisation
 %defattr(-,root,root)
 %{_bindir}/amarok_libvisual
 %{_bindir}/amarok_xmmswrapper2
 
 
-%if 0%{?use_nonfree}
-%files nonfree
-%defattr(-,root,root)
-%{_libdir}/kde3/libamarok_xine-engine.*
-%{_datadir}/services/amarok_xine-engine.desktop
-%endif
-
 
 %changelog
+* Sun Apr 09 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-0.11.beta3
+- drop the non-free bits
+- beta 3 (akode has been disabled)
+
+* Wed Mar 22 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-0.10.beta2
+- enable libgpod support
+
+* Wed Mar 22 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-0.9.beta2
+- make amarok build even with gstreamer only
+
 * Sun Mar 05 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-0.8.beta2
 - version 1.4 beta2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	14 Mar 2006 08:38:52 -0000	1.20
+++ sources	14 Apr 2006 07:29:15 -0000	1.21
@@ -1 +1 @@
-0c7e2a5e8ea2d73d8e73b986090cfc37  amarok-1.4-beta2.tar.bz2
+b92433b46005f0b2fc31e0ce0bf4cb3a  amarok-1.4-beta3c.tar.bz2



From fedora-extras-commits at redhat.com  Fri Apr 14 07:46:06 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 14 Apr 2006 00:46:06 -0700
Subject: rpms/amaya/FC-4 amaya.spec,1.17,1.18
Message-ID: <200604140746.k3E7k80Y010803@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	amaya.spec 
Log Message:
drop conditional builds


Index: amaya.spec
===================================================================
RCS file: /cvs/extras/rpms/amaya/FC-4/amaya.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- amaya.spec	14 Apr 2006 07:12:11 -0000	1.17
+++ amaya.spec	14 Apr 2006 07:46:06 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		amaya
 Version:	9.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 
 Summary:	W3C's browser/web authoring tool
 Group:		Applications/Internet
@@ -13,11 +13,7 @@
 BuildRequires:	freetype-devel >= 2.0
 BuildRequires:	desktop-file-utils, gtk+-devel, imlib-devel
 BuildRequires:  libpng-devel, libXt-devel
-%if "%fedora" >= "5"
-BuildRequires:  libXt-devel
-%else
 BuildRequires:  xorg-x11-devel
-%endif
 # TODO: make it link with the system's libwww. Didn't manage to build with it
 # yet. Patches accepted.
 #BuildRequires:	w3c-libwww-devel
@@ -105,6 +101,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-3
+- drop conditional build
+
 * Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-2
 - fix build on FC-4
 



From fedora-extras-commits at redhat.com  Fri Apr 14 07:46:08 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 14 Apr 2006 00:46:08 -0700
Subject: rpms/amaya/devel amaya.spec,1.27,1.28
Message-ID: <200604140746.k3E7kAS0010809@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	amaya.spec 
Log Message:
drop conditional builds


Index: amaya.spec
===================================================================
RCS file: /cvs/extras/rpms/amaya/devel/amaya.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- amaya.spec	14 Apr 2006 07:12:18 -0000	1.27
+++ amaya.spec	14 Apr 2006 07:46:08 -0000	1.28
@@ -1,6 +1,6 @@
 Name:		amaya
 Version:	9.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 
 Summary:	W3C's browser/web authoring tool
 Group:		Applications/Internet
@@ -13,11 +13,7 @@
 BuildRequires:	freetype-devel >= 2.0
 BuildRequires:	desktop-file-utils, gtk+-devel, imlib-devel
 BuildRequires:  libpng-devel, libXt-devel
-%if "%fedora" >= "5"
 BuildRequires:  libXt-devel
-%else
-BuildRequires:  xorg-x11-devel
-%endif
 # TODO: make it link with the system's libwww. Didn't manage to build with it
 # yet. Patches accepted.
 #BuildRequires:	w3c-libwww-devel
@@ -105,6 +101,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-3
+- drop conditional build
+
 * Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-2
 - fix build on FC-4
 



From fedora-extras-commits at redhat.com  Fri Apr 14 07:46:07 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 14 Apr 2006 00:46:07 -0700
Subject: rpms/amaya/FC-5 amaya.spec,1.27,1.28
Message-ID: <200604140746.k3E7k9ri010807@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	amaya.spec 
Log Message:
drop conditional builds


Index: amaya.spec
===================================================================
RCS file: /cvs/extras/rpms/amaya/FC-5/amaya.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- amaya.spec	14 Apr 2006 07:12:12 -0000	1.27
+++ amaya.spec	14 Apr 2006 07:46:07 -0000	1.28
@@ -1,6 +1,6 @@
 Name:		amaya
 Version:	9.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 
 Summary:	W3C's browser/web authoring tool
 Group:		Applications/Internet
@@ -13,11 +13,7 @@
 BuildRequires:	freetype-devel >= 2.0
 BuildRequires:	desktop-file-utils, gtk+-devel, imlib-devel
 BuildRequires:  libpng-devel, libXt-devel
-%if "%fedora" >= "5"
 BuildRequires:  libXt-devel
-%else
-BuildRequires:  xorg-x11-devel
-%endif
 # TODO: make it link with the system's libwww. Didn't manage to build with it
 # yet. Patches accepted.
 #BuildRequires:	w3c-libwww-devel
@@ -105,6 +101,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-3
+- drop conditional build
+
 * Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-2
 - fix build on FC-4
 



From fedora-extras-commits at redhat.com  Fri Apr 14 08:18:42 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 14 Apr 2006 01:18:42 -0700
Subject: rpms/amaya/devel amaya.spec,1.28,1.29
Message-ID: <200604140818.k3E8Iinq013111@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	amaya.spec 
Log Message:
get buildreqs right this time


Index: amaya.spec
===================================================================
RCS file: /cvs/extras/rpms/amaya/devel/amaya.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- amaya.spec	14 Apr 2006 07:46:08 -0000	1.28
+++ amaya.spec	14 Apr 2006 08:18:42 -0000	1.29
@@ -1,6 +1,6 @@
 Name:		amaya
 Version:	9.4
-Release:	3%{?dist}
+Release:	4%{?dist}
 
 Summary:	W3C's browser/web authoring tool
 Group:		Applications/Internet
@@ -12,8 +12,12 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	freetype-devel >= 2.0
 BuildRequires:	desktop-file-utils, gtk+-devel, imlib-devel
-BuildRequires:  libpng-devel, libXt-devel
+BuildRequires:  libpng-devel
+%if "%fedora" >= "5"
 BuildRequires:  libXt-devel
+%else
+BuildRequires:  xorg-x11-devel
+%endif
 # TODO: make it link with the system's libwww. Didn't manage to build with it
 # yet. Patches accepted.
 #BuildRequires:	w3c-libwww-devel
@@ -101,6 +105,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-4
+- fix buildreqs
+
 * Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-3
 - drop conditional build
 



From fedora-extras-commits at redhat.com  Fri Apr 14 08:18:41 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 14 Apr 2006 01:18:41 -0700
Subject: rpms/amaya/FC-4 amaya.spec,1.18,1.19
Message-ID: <200604140818.k3E8Ihue013105@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	amaya.spec 
Log Message:
get buildreqs right this time


Index: amaya.spec
===================================================================
RCS file: /cvs/extras/rpms/amaya/FC-4/amaya.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- amaya.spec	14 Apr 2006 07:46:06 -0000	1.18
+++ amaya.spec	14 Apr 2006 08:18:40 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		amaya
 Version:	9.4
-Release:	3%{?dist}
+Release:	4%{?dist}
 
 Summary:	W3C's browser/web authoring tool
 Group:		Applications/Internet
@@ -12,8 +12,12 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	freetype-devel >= 2.0
 BuildRequires:	desktop-file-utils, gtk+-devel, imlib-devel
-BuildRequires:  libpng-devel, libXt-devel
+BuildRequires:  libpng-devel
+%if "%fedora" >= "5"
+BuildRequires:  libXt-devel
+%else
 BuildRequires:  xorg-x11-devel
+%endif
 # TODO: make it link with the system's libwww. Didn't manage to build with it
 # yet. Patches accepted.
 #BuildRequires:	w3c-libwww-devel
@@ -101,6 +105,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-4
+- fix buildreqs
+
 * Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-3
 - drop conditional build
 



From fedora-extras-commits at redhat.com  Fri Apr 14 08:18:41 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 14 Apr 2006 01:18:41 -0700
Subject: rpms/amaya/FC-5 amaya.spec,1.28,1.29
Message-ID: <200604140818.k3E8Ihta013109@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	amaya.spec 
Log Message:
get buildreqs right this time


Index: amaya.spec
===================================================================
RCS file: /cvs/extras/rpms/amaya/FC-5/amaya.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- amaya.spec	14 Apr 2006 07:46:07 -0000	1.28
+++ amaya.spec	14 Apr 2006 08:18:41 -0000	1.29
@@ -1,6 +1,6 @@
 Name:		amaya
 Version:	9.4
-Release:	3%{?dist}
+Release:	4%{?dist}
 
 Summary:	W3C's browser/web authoring tool
 Group:		Applications/Internet
@@ -12,8 +12,12 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	freetype-devel >= 2.0
 BuildRequires:	desktop-file-utils, gtk+-devel, imlib-devel
-BuildRequires:  libpng-devel, libXt-devel
+BuildRequires:  libpng-devel
+%if "%fedora" >= "5"
 BuildRequires:  libXt-devel
+%else
+BuildRequires:  xorg-x11-devel
+%endif
 # TODO: make it link with the system's libwww. Didn't manage to build with it
 # yet. Patches accepted.
 #BuildRequires:	w3c-libwww-devel
@@ -101,6 +105,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-4
+- fix buildreqs
+
 * Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-3
 - drop conditional build
 



From fedora-extras-commits at redhat.com  Fri Apr 14 08:30:45 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 14 Apr 2006 01:30:45 -0700
Subject: rpms/amarok/devel amarok-1.4-gstreamer.patch, NONE, 1.1 amarok.spec,
	1.45, 1.46 amarok-1.4-helix.patch, 1.2, NONE
Message-ID: <200604140830.k3E8UlN7013295@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	amarok.spec 
Added Files:
	amarok-1.4-gstreamer.patch 
Removed Files:
	amarok-1.4-helix.patch 
Log Message:
make gstreamer sufficient to build on x86_64

amarok-1.4-gstreamer.patch:

--- NEW FILE amarok-1.4-gstreamer.patch ---
--- ./configure.gstreamer	2006-04-09 23:08:39.000000000 +0200
+++ ./configure	2006-04-14 10:23:09.000000000 +0200
@@ -37922,7 +37922,7 @@
 # BEGIN DO_NOT_COMPILE CHECK
 ###############################################################################
 
-if test x$build_xine = xno -a x$build_helix = xno; then
+if test x$build_xine = xno -a x$build_helix = xno -a x$build_gstreamer10 = xno; then
 
     DO_NOT_COMPILE="$DO_NOT_COMPILE amarok"
     no_engine=yes
@@ -40316,7 +40316,7 @@
     echo " =================================="
     echo " ="
     echo " = No suitable multimedia framework was detected. You need to install at least"
-    echo " = the Xine or Helix framework as detailed in the amaroK README."
+    echo " = the Xine, Helix framework or GStreamer as detailed in the amaroK README."
     echo " ="
 fi
 


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- amarok.spec	14 Apr 2006 07:29:15 -0000	1.45
+++ amarok.spec	14 Apr 2006 08:30:45 -0000	1.46
@@ -1,14 +1,14 @@
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.4
-Release:    0.11.beta3%{?dist}
+Release:    0.12.beta3%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
 Source0:    http://dl.sf.net/amarok/amarok-1.4-beta3c.tar.bz2
 Patch0:     amarok-1.4beta1-gst10.patch
-#Patch1:     amarok-1.4-helix.patch
+Patch1:     amarok-1.4-gstreamer.patch
 Patch2:     amarok-1.4-engines-cfg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -70,8 +70,8 @@
 
 %prep
 %setup -q -n %{name}-%{version}-beta3c
-# Discover the helix libs
-#%patch1 -p1 -b .helix
+# Make Gstreamer a sufficient engine as well (only engine available on x86_64)
+%patch1 -p1 -b .gstreamer
 # Gstreamer default sink should be autoaudiosink
 %patch2 -p1 -b .engines-cfg
 
@@ -208,6 +208,10 @@
 
 
 %changelog
+* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-0.12.beta3
+- add patch to make Gstreamer sufficient to build (only engine available
+  on x86_64
+
 * Sun Apr 09 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-0.11.beta3
 - drop the non-free bits
 - beta 3 (akode has been disabled)


--- amarok-1.4-helix.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Apr 14 08:30:44 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 14 Apr 2006 01:30:44 -0700
Subject: rpms/amarok/FC-5 amarok-1.4-gstreamer.patch, NONE, 1.1 amarok.spec, 
	1.46, 1.47 amarok-1.4-helix.patch, 1.2, NONE
Message-ID: <200604140830.k3E8UkE9013289@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	amarok.spec 
Added Files:
	amarok-1.4-gstreamer.patch 
Removed Files:
	amarok-1.4-helix.patch 
Log Message:
make gstreamer sufficient to build on x86_64

amarok-1.4-gstreamer.patch:

--- NEW FILE amarok-1.4-gstreamer.patch ---
--- ./configure.gstreamer	2006-04-09 23:08:39.000000000 +0200
+++ ./configure	2006-04-14 10:23:09.000000000 +0200
@@ -37922,7 +37922,7 @@
 # BEGIN DO_NOT_COMPILE CHECK
 ###############################################################################
 
-if test x$build_xine = xno -a x$build_helix = xno; then
+if test x$build_xine = xno -a x$build_helix = xno -a x$build_gstreamer10 = xno; then
 
     DO_NOT_COMPILE="$DO_NOT_COMPILE amarok"
     no_engine=yes
@@ -40316,7 +40316,7 @@
     echo " =================================="
     echo " ="
     echo " = No suitable multimedia framework was detected. You need to install at least"
-    echo " = the Xine or Helix framework as detailed in the amaroK README."
+    echo " = the Xine, Helix framework or GStreamer as detailed in the amaroK README."
     echo " ="
 fi
 


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-5/amarok.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- amarok.spec	14 Apr 2006 07:29:14 -0000	1.46
+++ amarok.spec	14 Apr 2006 08:30:44 -0000	1.47
@@ -1,14 +1,14 @@
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.4
-Release:    0.11.beta3%{?dist}
+Release:    0.12.beta3%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
 Source0:    http://dl.sf.net/amarok/amarok-1.4-beta3c.tar.bz2
 Patch0:     amarok-1.4beta1-gst10.patch
-#Patch1:     amarok-1.4-helix.patch
+Patch1:     amarok-1.4-gstreamer.patch
 Patch2:     amarok-1.4-engines-cfg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -70,8 +70,8 @@
 
 %prep
 %setup -q -n %{name}-%{version}-beta3c
-# Discover the helix libs
-#%patch1 -p1 -b .helix
+# Make Gstreamer a sufficient engine as well (only engine available on x86_64)
+%patch1 -p1 -b .gstreamer
 # Gstreamer default sink should be autoaudiosink
 %patch2 -p1 -b .engines-cfg
 
@@ -208,6 +208,10 @@
 
 
 %changelog
+* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-0.12.beta3
+- add patch to make Gstreamer sufficient to build (only engine available
+  on x86_64
+
 * Sun Apr 09 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-0.11.beta3
 - drop the non-free bits
 - beta 3 (akode has been disabled)


--- amarok-1.4-helix.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Apr 14 09:44:15 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 14 Apr 2006 02:44:15 -0700
Subject: rpms/gcl/FC-5 gcl.spec,1.18,1.19
Message-ID: <200604140944.k3E9iHlo015738@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	gcl.spec 
Log Message:



Index: gcl.spec
===================================================================
RCS file: /cvs/extras/rpms/gcl/FC-5/gcl.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gcl.spec	8 Mar 2006 20:53:23 -0000	1.18
+++ gcl.spec	14 Apr 2006 09:44:15 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           gcl
 Version:        2.6.7
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        GNU Common Lisp
 
 Group:          Development/Languages
@@ -15,8 +15,8 @@
 BuildRequires:	tcl-devel
 BuildRequires:  gmp-devel
 BuildRequires:	tetex, texinfo
-Requires(post): /sbin/install-info
-Requires(postun): /sbin/install-info
+Requires(post): /sbin/install-info, policycoreutils
+Requires(postun): /sbin/install-info, policycoreutils
 ExcludeArch:	ppc ppc64
 
 
@@ -72,14 +72,15 @@
 %post
 /sbin/install-info %{_infodir}/%{name}-si.info %{_infodir}/dir 2>/dev/null || :
 /sbin/install-info %{_infodir}/%{name}-tk.info %{_infodir}/dir 2>/dev/null || :
+/usr/sbin/semanage fcontext -a -t textrel_shlib_t "%{_libdir}/gcl-%{version}/unixport/saved_ansi_gcl" 2>/dev/null || :
+/sbin/restorecon "%{_libdir}/gcl-%{version}/unixport/saved_ansi_gcl" 2> /dev/null || :
 
 
 %postun
 if [ $1 = 0 ]; then
-  /sbin/install-info --delete %{_infodir}/%{name}-si.info \
-    %{_infodir}/dir 2>/dev/null || :
-  /sbin/install-info --delete %{_infodir}/%{name}-tk.info \
-    %{_infodir}/dir 2>/dev/null || :
+    /sbin/install-info --delete %{_infodir}/%{name}-si.info %{_infodir}/dir 2>/dev/null || :
+    /sbin/install-info --delete %{_infodir}/%{name}-tk.info %{_infodir}/dir 2>/dev/null || :
+    /usr/sbin/semanage fcontext -d -t textrel_shlib_t "%{_libdir}/gcl-%{version}/unixport/saved_ansi_gcl" 2>/dev/null || :
 fi
 
 
@@ -96,6 +97,9 @@
 
 
 %changelog
+* Fri Apr 14 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.6.7-10
+- added changes to SELinux policy
+
 * Wed Mar  8 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.6.7-7
 - Patch gcl-bash.patch for configure
 



From fedora-extras-commits at redhat.com  Fri Apr 14 09:47:31 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 14 Apr 2006 02:47:31 -0700
Subject: rpms/xemacs/FC-5 xemacs.spec,1.22,1.23
Message-ID: <200604140947.k3E9lXUJ015823@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	xemacs.spec 
Log Message:
* Fri Apr 14 2006 Ville Skytt?? <ville.skytta at iki.fi> - 21.4.19-5
- Don't expect to find ellcc if building without modules (#188929).



Index: xemacs.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs/FC-5/xemacs.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xemacs.spec	4 Apr 2006 17:44:46 -0000	1.22
+++ xemacs.spec	14 Apr 2006 09:47:31 -0000	1.23
@@ -4,13 +4,18 @@
 %bcond_without  mule
 %bcond_with     stackprot
 %bcond_without  gcc32
+%ifarch ia64
+%bcond_with     modules
+%else
+%bcond_without  modules
+%endif
 
 %define pkgdir  %{_datadir}/xemacs
 %define exectop %{_libdir}/xemacs-%{version}
 
 Name:           xemacs
 Version:        21.4.19
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -226,7 +231,7 @@
 %ifarch alpha ia64 ppc64
   --with-system-malloc
 %endif
-%ifarch ia64
+%if ! %{with modules}
   --without-modules
 %endif
 "
@@ -436,7 +441,9 @@
 %doc INSTALL README COPYING GETTING.GNU.SOFTWARE PROBLEMS CHANGES-release
 %doc etc/NEWS etc/MAILINGLISTS BUGS README.packages etc/TUTORIAL
 %doc etc/editclient.sh
+%if ! %{with modules}
 %{_bindir}/ellcc
+%endif
 %{_bindir}/etags.xemacs
 %{_bindir}/gnuattach
 %{_bindir}/gnudoit
@@ -462,6 +469,9 @@
 
 
 %changelog
+* Fri Apr 14 2006 Ville Skytt?? <ville.skytta at iki.fi> - 21.4.19-5
+- Don't expect to find ellcc if building without modules (#188929).
+
 * Fri Mar 31 2006 Ville Skytt?? <ville.skytta at iki.fi> - 21.4.19-4
 - Build with gcc 3.2.x (#183643).
 - Don't ship patch backup files.



From fedora-extras-commits at redhat.com  Fri Apr 14 09:50:20 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 14 Apr 2006 02:50:20 -0700
Subject: rpms/ecl/FC-5 ecl.spec,1.3,1.4
Message-ID: <200604140950.k3E9oMTD015903@cvs-int.fedora.redhat.com>

Author: gemi

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

Modified Files:
	ecl.spec 
Log Message:



Index: ecl.spec
===================================================================
RCS file: /cvs/extras/rpms/ecl/FC-5/ecl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ecl.spec	15 Mar 2006 16:37:45 -0000	1.3
+++ ecl.spec	14 Apr 2006 09:50:20 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           ecl
 Version:        0.9h
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Embeddable Common-Lisp
 
 Group:          Development/Languages
@@ -12,8 +12,8 @@
 BuildRequires:	libX11-devel
 BuildRequires:	m4
 BuildRequires:	texinfo
-Requires(post): /sbin/install-info
-Requires(postun): /sbin/install-info
+Requires(post): /sbin/install-info, policycoreutils
+Requires(postun): /sbin/install-info, policycoreutils
 
 %description
 ECL (Embeddable Common-Lisp) is an interpreter of the Common-Lisp
@@ -55,12 +55,15 @@
 %post
 /sbin/install-info %{_infodir}/ecldev.info %{_infodir}/dir 2>/dev/null || :
 /sbin/install-info %{_infodir}/ecl.info %{_infodir}/dir 2>/dev/null || :
+/usr/sbin/semanage fcontext -a -t textrel_shlib_t "%{_libdir}/ecl/libecl.so" 2>/dev/null || :
+/sbin/restorecon "%{_libdir}/ecl/libecl.so" 2> /dev/null || :
 
  
 %postun
 if [ $1 = 0 ]; then
   /sbin/install-info --delete %{_infodir}/ecldev.info %{_infodir}/dir 2>/dev/null || :
   /sbin/install-info --delete %{_infodir}/ecl.info %{_infodir}/dir 2>/dev/null || :
+  /usr/sbin/semanage fcontext -d -t textrel_shlib_t "%{_libdir}/ecl/libecl.so" 2>/dev/null || :
 fi
 
 
@@ -79,6 +82,9 @@
 
 
 %changelog
+* Fri Apr 14 2006 Gerard Milmeister <gemi at bluewin.ch> - 0.9h-6
+- added changes to SELinux policy
+
 * Wed Mar 15 2006 Gerard Milmeister <gemi at bluewin.ch> - 0.9h-5
 - patch for gcc 4.1
 



From fedora-extras-commits at redhat.com  Fri Apr 14 10:08:11 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 14 Apr 2006 03:08:11 -0700
Subject: rpms/xemacs/FC-5 xemacs.spec,1.23,1.24
Message-ID: <200604141008.k3EA8EqX018038@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	xemacs.spec 
Log Message:
Fix thinko in previous commit.


Index: xemacs.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs/FC-5/xemacs.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xemacs.spec	14 Apr 2006 09:47:31 -0000	1.23
+++ xemacs.spec	14 Apr 2006 10:08:11 -0000	1.24
@@ -441,7 +441,7 @@
 %doc INSTALL README COPYING GETTING.GNU.SOFTWARE PROBLEMS CHANGES-release
 %doc etc/NEWS etc/MAILINGLISTS BUGS README.packages etc/TUTORIAL
 %doc etc/editclient.sh
-%if ! %{with modules}
+%if %{with modules}
 %{_bindir}/ellcc
 %endif
 %{_bindir}/etags.xemacs



From fedora-extras-commits at redhat.com  Fri Apr 14 10:37:40 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Fri, 14 Apr 2006 03:37:40 -0700
Subject: rpms/python-sqlite2/devel .cvsignore, 1.4, 1.5 python-sqlite2.spec, 
	1.7, 1.8 sources, 1.4, 1.5
Message-ID: <200604141037.k3EAbgkH018160@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/python-sqlite2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18139

Modified Files:
	.cvsignore python-sqlite2.spec sources 
Log Message:
Update to 2.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Feb 2006 01:21:15 -0000	1.4
+++ .cvsignore	14 Apr 2006 10:37:40 -0000	1.5
@@ -1 +1 @@
-pysqlite-2.1.3.tar.gz
+pysqlite-2.2.0.tar.gz


Index: python-sqlite2.spec
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/devel/python-sqlite2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-sqlite2.spec	14 Feb 2006 10:01:33 -0000	1.7
+++ python-sqlite2.spec	14 Apr 2006 10:37:40 -0000	1.8
@@ -1,21 +1,19 @@
 %{!?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:           python-sqlite2
-Version:        2.1.3
-Release:        4%{?dist}
+Version:        2.2.0
+Release:        1%{?dist}
 Epoch:          1
 Summary:        DB-API 2.0 interface for SQLite 3.x
 
 Group:          Development/Languages
 License:        zlib/libpng
 URL:            http://pysqlite.org/
-Source0:        http://initd.org/pub/software/pysqlite/releases/2.1/%{version}/pysqlite-%{version}.tar.gz
+Source0:        http://initd.org/pub/software/pysqlite/releases/2.2/%{version}/pysqlite-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dos2unix
 BuildRequires:  python-devel
-BuildRequires:  python-setuptools
 BuildRequires:  sqlite-devel >= 3.3.3
 
 Requires:       sqlite >= 3.3.3
@@ -38,7 +36,6 @@
 rm -rf %{buildroot}
 %{__python} setup.py install -O1 \
 	--skip-build \
-	--old-and-unmanageable \
 	--root %{buildroot}
 
 %{__mv} %{buildroot}%{_prefix}/pysqlite2-doc documentation
@@ -48,7 +45,10 @@
 
 
 %check
-%{__python} setup.py test
+# workaround for some strange bug (thanks to Ville Skytt??!)
+cd documentation
+PYTHONPATH="%{buildroot}%{python_sitearch}" %{__python} -c \
+	"from pysqlite2.test import test; test()"
 
 
 %clean
@@ -58,7 +58,6 @@
 %files
 %defattr(-,root,root,-)
 %doc LICENSE documentation/*
-%doc doc/pysqlite-introduction-slides/pysqlite-introduction.pdf
 %dir %{python_sitearch}/pysqlite2
 %{python_sitearch}/pysqlite2/__init__.py
 %{python_sitearch}/pysqlite2/__init__.pyc
@@ -66,30 +65,38 @@
 %{python_sitearch}/pysqlite2/dbapi2.pyc
 %{python_sitearch}/pysqlite2/_sqlite.so
 %dir %{python_sitearch}/pysqlite2/test
+%{python_sitearch}/pysqlite2/test/__init__.py
+%{python_sitearch}/pysqlite2/test/__init__.pyc
 %{python_sitearch}/pysqlite2/test/dbapi.py
 %{python_sitearch}/pysqlite2/test/dbapi.pyc
 %{python_sitearch}/pysqlite2/test/factory.py
 %{python_sitearch}/pysqlite2/test/factory.pyc
-%{python_sitearch}/pysqlite2/test/__init__.py
-%{python_sitearch}/pysqlite2/test/__init__.pyc
+%{python_sitearch}/pysqlite2/test/hooks.py
+%{python_sitearch}/pysqlite2/test/hooks.pyc
+%{python_sitearch}/pysqlite2/test/regression.py
+%{python_sitearch}/pysqlite2/test/regression.pyc
 %{python_sitearch}/pysqlite2/test/transactions.py
 %{python_sitearch}/pysqlite2/test/transactions.pyc
 %{python_sitearch}/pysqlite2/test/types.py
 %{python_sitearch}/pysqlite2/test/types.pyc
 %{python_sitearch}/pysqlite2/test/userfunctions.py
 %{python_sitearch}/pysqlite2/test/userfunctions.pyc
-%{python_sitearch}/pysqlite-%{version}-py%{pyver}.egg-info/
 %ghost %{python_sitearch}/pysqlite2/__init__.pyo
 %ghost %{python_sitearch}/pysqlite2/dbapi2.pyo
+%ghost %{python_sitearch}/pysqlite2/test/__init__.pyo
 %ghost %{python_sitearch}/pysqlite2/test/dbapi.pyo
 %ghost %{python_sitearch}/pysqlite2/test/factory.pyo
-%ghost %{python_sitearch}/pysqlite2/test/__init__.pyo
+%ghost %{python_sitearch}/pysqlite2/test/hooks.pyo
+%ghost %{python_sitearch}/pysqlite2/test/regression.pyo
 %ghost %{python_sitearch}/pysqlite2/test/transactions.pyo
 %ghost %{python_sitearch}/pysqlite2/test/types.pyo
 %ghost %{python_sitearch}/pysqlite2/test/userfunctions.pyo
 
 
 %changelog
+* Fri Apr 14 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 1:2.2.0-1
+- Update to 2.2.0
+
 * Tue Feb 14 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 1:2.1.3-4
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Feb 2006 01:21:15 -0000	1.4
+++ sources	14 Apr 2006 10:37:40 -0000	1.5
@@ -1 +1 @@
-55ef66a963ddff5540b117db0a6c085b  pysqlite-2.1.3.tar.gz
+8f68b79b2fe891e72da193cbc3a3d5e9  pysqlite-2.2.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 14 11:23:20 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Fri, 14 Apr 2006 04:23:20 -0700
Subject: rpms/python-sqlite2/FC-5 .cvsignore, 1.4, 1.5 python-sqlite2.spec,
	1.7, 1.8 sources, 1.4, 1.5
Message-ID: <200604141123.k3EBNMEm020900@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/python-sqlite2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20879

Modified Files:
	.cvsignore python-sqlite2.spec sources 
Log Message:
Update to 2.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Feb 2006 01:21:15 -0000	1.4
+++ .cvsignore	14 Apr 2006 11:23:20 -0000	1.5
@@ -1 +1 @@
-pysqlite-2.1.3.tar.gz
+pysqlite-2.2.0.tar.gz


Index: python-sqlite2.spec
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/FC-5/python-sqlite2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-sqlite2.spec	14 Feb 2006 10:01:33 -0000	1.7
+++ python-sqlite2.spec	14 Apr 2006 11:23:20 -0000	1.8
@@ -1,21 +1,19 @@
 %{!?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:           python-sqlite2
-Version:        2.1.3
-Release:        4%{?dist}
+Version:        2.2.0
+Release:        1%{?dist}
 Epoch:          1
 Summary:        DB-API 2.0 interface for SQLite 3.x
 
 Group:          Development/Languages
 License:        zlib/libpng
 URL:            http://pysqlite.org/
-Source0:        http://initd.org/pub/software/pysqlite/releases/2.1/%{version}/pysqlite-%{version}.tar.gz
+Source0:        http://initd.org/pub/software/pysqlite/releases/2.2/%{version}/pysqlite-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dos2unix
 BuildRequires:  python-devel
-BuildRequires:  python-setuptools
 BuildRequires:  sqlite-devel >= 3.3.3
 
 Requires:       sqlite >= 3.3.3
@@ -38,7 +36,6 @@
 rm -rf %{buildroot}
 %{__python} setup.py install -O1 \
 	--skip-build \
-	--old-and-unmanageable \
 	--root %{buildroot}
 
 %{__mv} %{buildroot}%{_prefix}/pysqlite2-doc documentation
@@ -48,7 +45,10 @@
 
 
 %check
-%{__python} setup.py test
+# workaround for a strange bug (thanks to Ville Skytt??!)
+cd documentation
+PYTHONPATH="%{buildroot}%{python_sitearch}" %{__python} -c \
+	"from pysqlite2.test import test; test()"
 
 
 %clean
@@ -58,7 +58,6 @@
 %files
 %defattr(-,root,root,-)
 %doc LICENSE documentation/*
-%doc doc/pysqlite-introduction-slides/pysqlite-introduction.pdf
 %dir %{python_sitearch}/pysqlite2
 %{python_sitearch}/pysqlite2/__init__.py
 %{python_sitearch}/pysqlite2/__init__.pyc
@@ -66,30 +65,38 @@
 %{python_sitearch}/pysqlite2/dbapi2.pyc
 %{python_sitearch}/pysqlite2/_sqlite.so
 %dir %{python_sitearch}/pysqlite2/test
+%{python_sitearch}/pysqlite2/test/__init__.py
+%{python_sitearch}/pysqlite2/test/__init__.pyc
 %{python_sitearch}/pysqlite2/test/dbapi.py
 %{python_sitearch}/pysqlite2/test/dbapi.pyc
 %{python_sitearch}/pysqlite2/test/factory.py
 %{python_sitearch}/pysqlite2/test/factory.pyc
-%{python_sitearch}/pysqlite2/test/__init__.py
-%{python_sitearch}/pysqlite2/test/__init__.pyc
+%{python_sitearch}/pysqlite2/test/hooks.py
+%{python_sitearch}/pysqlite2/test/hooks.pyc
+%{python_sitearch}/pysqlite2/test/regression.py
+%{python_sitearch}/pysqlite2/test/regression.pyc
 %{python_sitearch}/pysqlite2/test/transactions.py
 %{python_sitearch}/pysqlite2/test/transactions.pyc
 %{python_sitearch}/pysqlite2/test/types.py
 %{python_sitearch}/pysqlite2/test/types.pyc
 %{python_sitearch}/pysqlite2/test/userfunctions.py
 %{python_sitearch}/pysqlite2/test/userfunctions.pyc
-%{python_sitearch}/pysqlite-%{version}-py%{pyver}.egg-info/
 %ghost %{python_sitearch}/pysqlite2/__init__.pyo
 %ghost %{python_sitearch}/pysqlite2/dbapi2.pyo
+%ghost %{python_sitearch}/pysqlite2/test/__init__.pyo
 %ghost %{python_sitearch}/pysqlite2/test/dbapi.pyo
 %ghost %{python_sitearch}/pysqlite2/test/factory.pyo
-%ghost %{python_sitearch}/pysqlite2/test/__init__.pyo
+%ghost %{python_sitearch}/pysqlite2/test/hooks.pyo
+%ghost %{python_sitearch}/pysqlite2/test/regression.pyo
 %ghost %{python_sitearch}/pysqlite2/test/transactions.pyo
 %ghost %{python_sitearch}/pysqlite2/test/types.pyo
 %ghost %{python_sitearch}/pysqlite2/test/userfunctions.pyo
 
 
 %changelog
+* Fri Apr 14 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 1:2.2.0-1
+- Update to 2.2.0
+
 * Tue Feb 14 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 1:2.1.3-4
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Feb 2006 01:21:15 -0000	1.4
+++ sources	14 Apr 2006 11:23:20 -0000	1.5
@@ -1 +1 @@
-55ef66a963ddff5540b117db0a6c085b  pysqlite-2.1.3.tar.gz
+8f68b79b2fe891e72da193cbc3a3d5e9  pysqlite-2.2.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 14 11:47:37 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 14 Apr 2006 04:47:37 -0700
Subject: rpms/gnochm/FC-4 gnochm.spec,1.1,1.2
Message-ID: <200604141147.k3EBldft021037@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	gnochm.spec 
Log Message:
* Thu Apr 13 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-4
- Add mimetype to .desktop file (188809)



Index: gnochm.spec
===================================================================
RCS file: /cvs/extras/rpms/gnochm/FC-4/gnochm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnochm.spec	8 Apr 2006 21:55:34 -0000	1.1
+++ gnochm.spec	14 Apr 2006 11:47:37 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gnochm
 Version:        0.9.7
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        CHM file viewer
 
 Group:          Applications/Publishing
@@ -19,6 +19,8 @@
 BuildRequires:  scrollkeeper
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 BuildRequires: desktop-file-utils
 
 %description
@@ -46,6 +48,8 @@
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 
+echo "MimeType=application/x-chm" >> $RPM_BUILD_ROOT%{_datadir}/applications/gnochm.desktop
+
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
         --add-category X-Fedora                                 \
@@ -78,6 +82,8 @@
 
 update-mime-database %{_datadir}/mime &> /dev/null || :
 
+update-desktop-database &> /dev/null ||:
+
 %preun
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -91,6 +97,8 @@
 
 update-mime-database %{_datadir}/mime &> /dev/null || :
 
+update-desktop-database &> /dev/null ||:
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README
@@ -109,5 +117,8 @@
 %{_datadir}/pixmaps/gnochm*.png
 
 %changelog
+* Thu Apr 13 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-4
+- Add mimetype to .desktop file (188809)
+
 * Sun Mar 12 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-2
 - Fedora Extras submission, loosely based on Dag.



From fedora-extras-commits at redhat.com  Fri Apr 14 11:48:16 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 14 Apr 2006 04:48:16 -0700
Subject: rpms/gnochm/FC-5 gnochm.spec,1.1,1.2
Message-ID: <200604141148.k3EBmIl8021101@cvs-int.fedora.redhat.com>

Author: pertusus

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

Modified Files:
	gnochm.spec 
Log Message:
* Thu Apr 13 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-4
- Add mimetype to .desktop file (188809)



Index: gnochm.spec
===================================================================
RCS file: /cvs/extras/rpms/gnochm/FC-5/gnochm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnochm.spec	8 Apr 2006 21:55:34 -0000	1.1
+++ gnochm.spec	14 Apr 2006 11:48:16 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gnochm
 Version:        0.9.7
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        CHM file viewer
 
 Group:          Applications/Publishing
@@ -19,6 +19,8 @@
 BuildRequires:  scrollkeeper
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 BuildRequires: desktop-file-utils
 
 %description
@@ -46,6 +48,8 @@
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 
+echo "MimeType=application/x-chm" >> $RPM_BUILD_ROOT%{_datadir}/applications/gnochm.desktop
+
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
         --add-category X-Fedora                                 \
@@ -78,6 +82,8 @@
 
 update-mime-database %{_datadir}/mime &> /dev/null || :
 
+update-desktop-database &> /dev/null ||:
+
 %preun
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -91,6 +97,8 @@
 
 update-mime-database %{_datadir}/mime &> /dev/null || :
 
+update-desktop-database &> /dev/null ||:
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README
@@ -109,5 +117,8 @@
 %{_datadir}/pixmaps/gnochm*.png
 
 %changelog
+* Thu Apr 13 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-4
+- Add mimetype to .desktop file (188809)
+
 * Sun Mar 12 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-2
 - Fedora Extras submission, loosely based on Dag.



From fedora-extras-commits at redhat.com  Fri Apr 14 12:29:29 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 14 Apr 2006 05:29:29 -0700
Subject: rpms/kdocker/devel kdocker.spec,1.7,1.8
Message-ID: <200604141229.k3ECTVre023319@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	kdocker.spec 
Log Message:
* Fri Apr 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-6
- --vendor=""



Index: kdocker.spec
===================================================================
RCS file: /cvs/extras/rpms/kdocker/devel/kdocker.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kdocker.spec	10 Mar 2006 20:06:04 -0000	1.7
+++ kdocker.spec	14 Apr 2006 12:29:29 -0000	1.8
@@ -67,11 +67,10 @@
 
 make install 
 
-desktop-file-install --vendor fedora \
+desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
-  --add-category Qt \
-  --delete-original \
+  --add-category="X-Fedora" --vendor="" \
+  --add-category="Qt" \
   $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 
 # remove dup'd docs
@@ -104,6 +103,9 @@
 
 
 %changelog 
+* Fri Apr 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-6
+- --vendor=""
+
 * Fri Mar 10 2006 Rex Dieter <rexdieer[AT]users.sf.net> 1.3-5
 - build failure, useless -debuginfo (#180103)
 



From fedora-extras-commits at redhat.com  Fri Apr 14 12:30:08 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 14 Apr 2006 05:30:08 -0700
Subject: rpms/kdocker/FC-5 kdocker.spec,1.7,1.8
Message-ID: <200604141230.k3ECUAsd023389@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	kdocker.spec 
Log Message:
* Fri Apr 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-6
- --vendor=""



Index: kdocker.spec
===================================================================
RCS file: /cvs/extras/rpms/kdocker/FC-5/kdocker.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kdocker.spec	10 Mar 2006 20:06:04 -0000	1.7
+++ kdocker.spec	14 Apr 2006 12:30:07 -0000	1.8
@@ -67,11 +67,10 @@
 
 make install 
 
-desktop-file-install --vendor fedora \
+desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
-  --add-category Qt \
-  --delete-original \
+  --add-category="X-Fedora" --vendor="" \
+  --add-category="Qt" \
   $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 
 # remove dup'd docs
@@ -104,6 +103,9 @@
 
 
 %changelog 
+* Fri Apr 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-6
+- --vendor=""
+
 * Fri Mar 10 2006 Rex Dieter <rexdieer[AT]users.sf.net> 1.3-5
 - build failure, useless -debuginfo (#180103)
 



From fedora-extras-commits at redhat.com  Fri Apr 14 12:31:43 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 14 Apr 2006 05:31:43 -0700
Subject: rpms/kdocker/devel kdocker.spec,1.8,1.9
Message-ID: <200604141231.k3ECVjEW023452@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	kdocker.spec 
Log Message:
Release++



Index: kdocker.spec
===================================================================
RCS file: /cvs/extras/rpms/kdocker/devel/kdocker.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kdocker.spec	14 Apr 2006 12:29:29 -0000	1.8
+++ kdocker.spec	14 Apr 2006 12:31:43 -0000	1.9
@@ -2,7 +2,7 @@
 Name:	 kdocker
 Summary: Dock any application in the system tray
 Version: 1.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 Group:   User Interface/Desktops
 License: GPL



From fedora-extras-commits at redhat.com  Fri Apr 14 12:32:06 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 14 Apr 2006 05:32:06 -0700
Subject: rpms/kdocker/FC-5 kdocker.spec,1.8,1.9
Message-ID: <200604141232.k3ECW9G2023518@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	kdocker.spec 
Log Message:
Release++



Index: kdocker.spec
===================================================================
RCS file: /cvs/extras/rpms/kdocker/FC-5/kdocker.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kdocker.spec	14 Apr 2006 12:30:07 -0000	1.8
+++ kdocker.spec	14 Apr 2006 12:32:06 -0000	1.9
@@ -2,7 +2,7 @@
 Name:	 kdocker
 Summary: Dock any application in the system tray
 Version: 1.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 Group:   User Interface/Desktops
 License: GPL



From fedora-extras-commits at redhat.com  Fri Apr 14 12:32:45 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 14 Apr 2006 05:32:45 -0700
Subject: rpms/kdocker/FC-4 kdocker.spec,1.4,1.5
Message-ID: <200604141232.k3ECWljW023584@cvs-int.fedora.redhat.com>

Author: rdieter

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

Modified Files:
	kdocker.spec 
Log Message:
* Fri Apr 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-6
- --vendor=""



Index: kdocker.spec
===================================================================
RCS file: /cvs/extras/rpms/kdocker/FC-4/kdocker.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kdocker.spec	10 Mar 2006 20:04:26 -0000	1.4
+++ kdocker.spec	14 Apr 2006 12:32:45 -0000	1.5
@@ -2,7 +2,7 @@
 Name:	 kdocker
 Summary: Dock any application in the system tray
 Version: 1.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 Group:   User Interface/Desktops
 License: GPL
@@ -67,11 +67,10 @@
 
 make install 
 
-desktop-file-install --vendor fedora \
+desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
-  --add-category Qt \
-  --delete-original \
+  --add-category="X-Fedora" --vendor="" \
+  --add-category="Qt" \
   $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 
 # remove dup'd docs
@@ -104,6 +103,9 @@
 
 
 %changelog 
+* Fri Apr 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-6
+- --vendor=""
+
 * Fri Mar 10 2006 Rex Dieter <rexdieer[AT]users.sf.net> 1.3-5
 - build failure, useless -debuginfo (#180103)
 



From fedora-extras-commits at redhat.com  Fri Apr 14 12:33:08 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 14 Apr 2006 05:33:08 -0700
Subject: rpms/kdocker/FC-3 kdocker.spec,1.3,1.4
Message-ID: <200604141233.k3ECXAOV023652@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdocker/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23635

Modified Files:
	kdocker.spec 
Log Message:
* Fri Apr 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-6
- --vendor=""



Index: kdocker.spec
===================================================================
RCS file: /cvs/extras/rpms/kdocker/FC-3/kdocker.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kdocker.spec	22 Jan 2006 02:49:26 -0000	1.3
+++ kdocker.spec	14 Apr 2006 12:33:08 -0000	1.4
@@ -2,7 +2,7 @@
 Name:	 kdocker
 Summary: Dock any application in the system tray
 Version: 1.3
-Release: 4%{?dist}
+Release: 6%{?dist}
 
 Group:   User Interface/Desktops
 License: GPL
@@ -14,6 +14,10 @@
 
 BuildRequires: desktop-file-utils
 BuildRequires: qt-devel >= 1:3.3
+%if "%{?fedora}" > "4"
+BuildRequires: libXmu-devel
+BuildRequires: libXpm-devel
+%endif
 
 %description
 KDocker will help you dock any application in the system tray. This means you
@@ -56,15 +60,17 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
+unset QTDIR || : ; . /etc/profile.d/qt.sh
+
 qmake DESTDIR=$RPM_BUILD_ROOT 
+sed -i -e '/^\s*-\?strip /d' Makefile # naughty qmake
 
 make install 
 
-desktop-file-install --vendor fedora \
+desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
-  --add-category Qt \
-  --delete-original \
+  --add-category="X-Fedora" --vendor="" \
+  --add-category="Qt" \
   $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 
 # remove dup'd docs
@@ -87,7 +93,7 @@
 
 
 %files -f %{name}.lang
-%defattr(-, root, root)
+%defattr(-,root,root,-)
 %doc AUTHORS BUGS COPYING CREDITS ChangeLog HACKING README TODO VERSION
 %{_bindir}/*
 %dir %{_datadir}/kdocker/
@@ -97,6 +103,15 @@
 
 
 %changelog 
+* Fri Apr 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-6
+- --vendor=""
+
+* Fri Mar 10 2006 Rex Dieter <rexdieer[AT]users.sf.net> 1.3-5
+- build failure, useless -debuginfo (#180103)
+
+* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 
+- fc5: gcc/glibc respin
+
 * Sat Jan 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-4
 - .desktop: fix path to app-icon (#178531)
 



From fedora-extras-commits at redhat.com  Fri Apr 14 12:38:56 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 14 Apr 2006 05:38:56 -0700
Subject: owners owners.list,1.841,1.842
Message-ID: <200604141238.k3ECcw87023732@cvs-int.fedora.redhat.com>

Author: scop

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

Modified Files:
	owners.list 
Log Message:
Orphan carpej's packages, sponsorship revoked.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.841
retrieving revision 1.842
diff -u -r1.841 -r1.842
--- owners.list	13 Apr 2006 22:28:07 -0000	1.841
+++ owners.list	14 Apr 2006 12:38:56 -0000	1.842
@@ -144,7 +144,7 @@
 Fedora Extras|compface|Library for handling X-Faces|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|comps|The list of groups and packages displayed by yum and repoview.|notting at redhat.com|katzj at redhat.com|skvidal at phy.duke.edu,sopwith at redhat.com
 Fedora Extras|cone|CONE mail reader|steve at silug.org|extras-qa at fedoraproject.org|
-Fedora Extras|configure-thinkpad|Graphical ThinkPad configuration utility|jcarpenter at condell.org|extras-qa at fedoraproject.org|
+Fedora Extras|configure-thinkpad|Graphical ThinkPad configuration utility|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|conglomerate|Extensible XML Editor|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|conserver|Serial console server daemon/client|jima at auroralinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|contact-lookup-applet|Applet which allows you to search your Evolution address book|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
@@ -539,7 +539,7 @@
 Fedora Extras|kphone|A SIP (Session Initiation Protocol) user agent for Linux|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|krecipes|Application to manage recipes and shopping-lists|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|krusader|An advanced twin-panel (commander-style) file-manager for KDE|mgarski at post.pl|extras-qa at fedoraproject.org|
-Fedora Extras|ks3switch|KDE utility for managing the output device on S3 Savage chips|jcarpenter at condell.org|extras-qa at fedoraproject.org|
+Fedora Extras|ks3switch|KDE utility for managing the output device on S3 Savage chips|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|ksensors|An lm_sensors frontend for KDE|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|kst|Plots scientific data|matt at truch.net|extras-qa at fedoraproject.org|
 Fedora Extras|ktrack|Satellite prediction software for KDE|dennis at ausil.us|extras-qa at fedoraproject.org|
@@ -681,7 +681,7 @@
 Fedora Extras|logjam|GTK2-client for LiveJournal|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|loudmouth|Jabber programming library written in C|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|lout|A document formatting system|tcallawa at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|lrmi|Library for calling real mode BIOS routines|jcarpenter at condell.org|extras-qa at fedoraproject.org|
+Fedora Extras|lrmi|Library for calling real mode BIOS routines|extras-orphan at fedoraproject.org|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|lucidlife|A Conway's Life simulator|peter at thecodergeek.com|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|
@@ -1312,7 +1312,7 @@
 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|
 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|jcarpenter at condell.org|extras-qa at fedoraproject.org|
+Fedora Extras|s3switch|Manage the output device on S3 Savage chips|extras-orphan at fedoraproject.org|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|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|
@@ -1442,8 +1442,8 @@
 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|thinkpad-kmod|Supplemental kernel modules for ThinkPad laptop computers|jcarpenter at condell.org|extras-qa at fedoraproject.org|
-Fedora Extras|thinkpad-kmod-common|Common files for ThinkPad kernel module packages|jcarpenter at condell.org|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|
 Fedora Extras|thunderbird|thunderbird mail|wtogami at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|tidy|Utility to clean up and pretty print HTML/XHTML/XML|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
@@ -1463,8 +1463,8 @@
 Fedora Extras|torcs|An OpenGL 3d racing game|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|torcs-data|The Open Racing Car Simulator data files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|torsmo|TyopoytaORvelo System MOnitor|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
-Fedora Extras|tpb|IBM ThinkPad button support utility|jcarpenter at condell.org|extras-qa at fedoraproject.org|
-Fedora Extras|tpctl|IBM ThinkPad configuration tools|jcarpenter at condell.org|extras-qa at fedoraproject.org|
+Fedora Extras|tpb|IBM ThinkPad button support utility|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|tpctl|IBM ThinkPad configuration tools|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|trac|Trac is an integrated system for managing software projects|fedora at soeterbroek.com|extras-qa at fedoraproject.org|
 Fedora Extras|translate-toolkit|A collection of tools to assist software localization|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|treecc|Tree Compiler Compiler|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
@@ -1602,7 +1602,7 @@
 Fedora Extras|xmms-skins|Skins for the X MultiMedia System|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-speex|X MultiMedia System input plugin to play speex files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms|The X MultiMedia System, a media player which resembles Winamp|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|xosd|On-screen display library for X|jcarpenter at condell.org|extras-qa at fedoraproject.org|
+Fedora Extras|xosd|On-screen display library for X|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|xpilot-ng|Space arcade game|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|xplanet|Render a planetary image into an X window|jylitalo at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|xprobe2|An active operating system fingerprinting tool|lmacken at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Apr 14 13:26:40 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 14 Apr 2006 06:26:40 -0700
Subject: rpms/openvpn/devel .cvsignore, 1.11, 1.12 openvpn.spec, 1.17,
	1.18 sources, 1.11, 1.12
Message-ID: <200604141326.k3EDQgfa025902@cvs-int.fedora.redhat.com>

Author: steve

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

Modified Files:
	.cvsignore openvpn.spec sources 
Log Message:
Update to 2.1_beta14.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openvpn/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	12 Apr 2006 17:44:10 -0000	1.11
+++ .cvsignore	14 Apr 2006 13:26:39 -0000	1.12
@@ -1,2 +1,2 @@
-openvpn-2.1_beta13.tar.gz
-openvpn-2.1_beta13.tar.gz.asc
+openvpn-2.1_beta14.tar.gz
+openvpn-2.1_beta14.tar.gz.asc


Index: openvpn.spec
===================================================================
RCS file: /cvs/extras/rpms/openvpn/devel/openvpn.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- openvpn.spec	12 Apr 2006 17:44:10 -0000	1.17
+++ openvpn.spec	14 Apr 2006 13:26:39 -0000	1.18
@@ -1,10 +1,10 @@
-%define prerelease beta13
+%define prerelease beta14
 
 %define plugins down-root auth-pam
 
 Name:              openvpn
 Version:           2.1
-Release:           0.9%{?prerelease:.%{prerelease}}%{?dist}
+Release:           0.10%{?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
@@ -132,6 +132,9 @@
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Fri Apr 14 2006 Steven Pritchard <steve at kspei.com> 2.1-0.10.beta14
+- Update to 2.1_beta14
+
 * Wed Apr 12 2006 Steven Pritchard <steve at kspei.com> 2.1-0.9.beta13
 - Update to 2.1_beta13
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openvpn/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	12 Apr 2006 17:44:10 -0000	1.11
+++ sources	14 Apr 2006 13:26:39 -0000	1.12
@@ -1,2 +1,2 @@
-94281c836f443aa10ef56eafb9346e98  openvpn-2.1_beta13.tar.gz
-e5bc47f1e441b2d89db90052ad0f8b12  openvpn-2.1_beta13.tar.gz.asc
+7bd96eaa834a1779755d68c9b2591583  openvpn-2.1_beta14.tar.gz
+835dab606f9f72c610b4f52e541ae5fd  openvpn-2.1_beta14.tar.gz.asc



From fedora-extras-commits at redhat.com  Fri Apr 14 13:37:48 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 14 Apr 2006 06:37:48 -0700
Subject: rpms/openvpn/FC-5 .cvsignore, 1.11, 1.12 openvpn.spec, 1.17,
	1.18 sources, 1.11, 1.12
Message-ID: <200604141337.k3EDboia026025@cvs-int.fedora.redhat.com>

Author: steve

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

Modified Files:
	.cvsignore openvpn.spec sources 
Log Message:
Update to 2.1_beta14.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openvpn/FC-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	12 Apr 2006 18:09:23 -0000	1.11
+++ .cvsignore	14 Apr 2006 13:37:48 -0000	1.12
@@ -1,2 +1,2 @@
-openvpn-2.1_beta13.tar.gz
-openvpn-2.1_beta13.tar.gz.asc
+openvpn-2.1_beta14.tar.gz
+openvpn-2.1_beta14.tar.gz.asc


Index: openvpn.spec
===================================================================
RCS file: /cvs/extras/rpms/openvpn/FC-5/openvpn.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- openvpn.spec	12 Apr 2006 18:09:23 -0000	1.17
+++ openvpn.spec	14 Apr 2006 13:37:48 -0000	1.18
@@ -1,10 +1,10 @@
-%define prerelease beta13
+%define prerelease beta14
 
 %define plugins down-root auth-pam
 
 Name:              openvpn
 Version:           2.1
-Release:           0.9%{?prerelease:.%{prerelease}}%{?dist}
+Release:           0.10%{?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
@@ -132,6 +132,9 @@
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Fri Apr 14 2006 Steven Pritchard <steve at kspei.com> 2.1-0.10.beta14
+- Update to 2.1_beta14
+
 * Wed Apr 12 2006 Steven Pritchard <steve at kspei.com> 2.1-0.9.beta13
 - Update to 2.1_beta13
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openvpn/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	12 Apr 2006 18:09:23 -0000	1.11
+++ sources	14 Apr 2006 13:37:48 -0000	1.12
@@ -1,2 +1,2 @@
-94281c836f443aa10ef56eafb9346e98  openvpn-2.1_beta13.tar.gz
-e5bc47f1e441b2d89db90052ad0f8b12  openvpn-2.1_beta13.tar.gz.asc
+7bd96eaa834a1779755d68c9b2591583  openvpn-2.1_beta14.tar.gz
+835dab606f9f72c610b4f52e541ae5fd  openvpn-2.1_beta14.tar.gz.asc



From fedora-extras-commits at redhat.com  Fri Apr 14 14:07:21 2006
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Fri, 14 Apr 2006 07:07:21 -0700
Subject: rpms/wxGTK/FC-5 sources, 1.4, 1.5 wxGTK.spec, 1.17,
	1.18 wxGTK-2.6.2-gcc41stringh.patch, 1.1,
	NONE wxGTK-2.6.2-intl_cpp.patch, 1.1,
	NONE wxGTK-2.6.2-socketclosefix.patch, 1.1, NONE
Message-ID: <200604141407.k3EE7NuQ028260@cvs-int.fedora.redhat.com>

Author: mattdm

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

Modified Files:
	sources wxGTK.spec 
Removed Files:
	wxGTK-2.6.2-gcc41stringh.patch wxGTK-2.6.2-intl_cpp.patch 
	wxGTK-2.6.2-socketclosefix.patch 
Log Message:
Update to wxGTK 2.6.2; massive changes (see development package and
changelog for details).



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wxGTK/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Nov 2005 19:57:40 -0000	1.4
+++ sources	14 Apr 2006 14:07:21 -0000	1.5
@@ -1 +1 @@
-ba2afe7bd028062c5fff6d5ef3249c67  wxGTK-2.6.2.tar.bz2
+3cd76c3c47913e52a3175dd47239c6ec  wxGTK-2.6.3.tar.bz2


Index: wxGTK.spec
===================================================================
RCS file: /cvs/extras/rpms/wxGTK/FC-5/wxGTK.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- wxGTK.spec	13 Feb 2006 19:50:49 -0000	1.17
+++ wxGTK.spec	14 Apr 2006 14:07:21 -0000	1.18
@@ -1,8 +1,12 @@
 %define x11libdir %{_prefix}/X11R6/%{_lib}
 
+# Option - build an ODBC subpackage using unixODBC. (This is currently 
+# broken; see <https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=176950>.)
+%define withodbc 0
+
 Name:           wxGTK
-Version:        2.6.2
-Release:        5%{?dist}
+Version:        2.6.3
+Release:        2.6.3.2.1%{?dist}
 Summary:        GTK2 port of the wxWidgets GUI library
 # The wxWindows licence is the LGPL with a specific exemption allowing
 # distribution of derived binaries under any terms. (This will eventually
@@ -11,15 +15,16 @@
 Group:          System Environment/Libraries
 URL:            http://www.wxwidgets.org/
 Source0:        http://dl.sf.net/wxwindows/%{name}-%{version}.tar.bz2
-Patch0:         wxGTK-2.6.2-intl_cpp.patch
-Patch1:         wxGTK-2.6.2-socketclosefix.patch
-Patch2:         wxGTK-2.6.2-gcc41stringh.patch
+Patch0:         wxGTK-2.6.3.2-cvs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel, zlib-devel >= 1.1.4
 BuildRequires:  libpng-devel, libjpeg-devel, libtiff-devel
 BuildRequires:  expat-devel, SDL-devel, libgnomeprintui22-devel
-BuildRequires:  mesa-libGL-devel, mesa-libGLU-devel
+BuildRequires:  libGL-devel, libGLU-devel
+%if %{withodbc}
+BuildRequires:  unixODBC-devel
+%endif
 
 # all of these are for previous Fedora Extras sub-packages
 Obsoletes:      wxGTK2 < 2.6.2-1
@@ -68,14 +73,22 @@
 Provides:       wxGTK2-gl = %{version}-%{release}
 
 %description gl
-OpenGL add-on for the wxWidgets library.
+OpenGL (a 3D graphics API) add-on for the wxWidgets library.
 
+%if %{withodbc}
+%package        odbc
+Summary:        ODBC add-on for the wxWidgets library
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description odbc
+ODBC (a SQL database connectivity API) add-on for the wxWidgets library.
+%endif
 
 %prep
 %setup -q
-%patch0 -p0 -b .intlcpp
-%patch1 -p1 -b .socketclose
-%patch2 -p1 -b .gcc41
+
+%patch0 -p1 -b .2.6.3.2
 
 sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
 
@@ -89,6 +102,9 @@
   --x-libraries=%{x11libdir} \
   --with-gtk=2 \
   --with-opengl \
+%if %{withodbc}
+  --with-odbc \
+%endif
   --with-sdl \
   --with-gnomeprint \
   --enable-shared \
@@ -170,8 +186,37 @@
 %defattr(-,root,root,-)
 %{_libdir}/libwx_gtk2u_gl-*.so.*
 
+%if %{withodbc}
+%files odbc
+%defattr(-,root,root,-)
+%{_libdir}/libwx_gtk2u_odbc-*.so.*
+%endif
 
 %changelog
+* Thu Apr 13 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3-2.6.3.2.1
+- oops -- forgot to change mesa-libGL*-devel -> libGL*-devel
+
+* Thu Apr 13 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3-2.6.3.2.0
+- patch to cvs subrelease 2.6.3.2 (matches wxPython)
+
+* Sat Mar 25 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3-1    
+- 2.6.3 final
+- remove the locale_install thing -- that was just an issue with using the
+  release candidate.
+
+* Tue Mar 21 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3-0.rc2
+- update to 2.6.3-rc2 package
+- all patches now upstream -- removing 'em.
+- use complete 'wxWidgets' source tarball instead of the wxGTK-subset one,
+  since that's all there is for the release candidate. I'm operating under
+  the assumption that we'll have a wxGTK source tarball in the future --
+  otherwise, I'm going to eventually have to change the name of this
+  package again. :)
+- add ODBC support via unixODBC as subpackage (see bug #176950)
+- wait, no; comment out ODBC support as it doesn't build...
+- add explicit make locale_install; apparently not done as part of
+  the general 'make install' anymore.
+
 * Mon Feb 13 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.2-5
 - rebuild in preparation for FC5
 
@@ -210,7 +255,7 @@
   Add dist tag.
 - From Tom Callaway: Build and include libwx_gtk2u_animate-2.6.
 
-
+* Thu Apr 28 2005 Matthew Miller <mattdm at mattdm.org> 2.6.1-0.1
 - update to 2.6.1
 - from Michael Schwendt in 2.4.2-11 package: build-require
   xorg-x11-Mesa-libGL and xorg-x11-Mesa-libGLU (the libGL and libGLU


--- wxGTK-2.6.2-gcc41stringh.patch DELETED ---


--- wxGTK-2.6.2-intl_cpp.patch DELETED ---


--- wxGTK-2.6.2-socketclosefix.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Apr 14 14:08:19 2006
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Fri, 14 Apr 2006 07:08:19 -0700
Subject: rpms/wxGTK/FC-5 wxGTK-2.6.3.2-cvs.patch,NONE,1.1
Message-ID: <200604141408.k3EE8LCS028289@cvs-int.fedora.redhat.com>

Author: mattdm

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

Added Files:
	wxGTK-2.6.3.2-cvs.patch 
Log Message:
checking in patch -- forgot to a second ago.


wxGTK-2.6.3.2-cvs.patch:

--- NEW FILE wxGTK-2.6.3.2-cvs.patch ---
diff -ur wxGTK-2.6.3/configure wxGTK-2.6.3.2/configure
--- wxGTK-2.6.3/configure	2006-03-21 18:42:05.000000000 -0500
+++ wxGTK-2.6.3.2/configure	2006-03-30 12:05:51.000000000 -0500
@@ -1669,7 +1669,7 @@
 wx_major_version_number=2
 wx_minor_version_number=6
 wx_release_number=3
-wx_subrelease_number=1
+wx_subrelease_number=2
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
 WX_VERSION=$WX_RELEASE.$wx_release_number
diff -ur wxGTK-2.6.3/configure.in wxGTK-2.6.3.2/configure.in
--- wxGTK-2.6.3/configure.in	2006-03-21 18:42:05.000000000 -0500
+++ wxGTK-2.6.3.2/configure.in	2006-03-30 12:05:49.000000000 -0500
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Id: configure.in,v 1.1063.2.15 2006/03/21 19:33:57 KO Exp $)dnl
+AC_REVISION($Id: configure.in,v 1.1063.2.16 2006/03/30 17:05:49 RD Exp $)dnl
 
 dnl ---------------------------------------------------------------------------
 dnl
@@ -8,7 +8,7 @@
 dnl
 dnl This script is under the wxWidgets licence.
 dnl
-dnl Version: $Id: configure.in,v 1.1063.2.15 2006/03/21 19:33:57 KO Exp $
+dnl Version: $Id: configure.in,v 1.1063.2.16 2006/03/30 17:05:49 RD Exp $
 dnl ---------------------------------------------------------------------------
 
 dnl ---------------------------------------------------------------------------
@@ -33,7 +33,7 @@
 wx_major_version_number=2
 wx_minor_version_number=6
 wx_release_number=3
-wx_subrelease_number=1
+wx_subrelease_number=2
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
 WX_VERSION=$WX_RELEASE.$wx_release_number
diff -ur wxGTK-2.6.3/contrib/src/deprecated/cwlex_yy.c wxGTK-2.6.3.2/contrib/src/deprecated/cwlex_yy.c
--- wxGTK-2.6.3/contrib/src/deprecated/cwlex_yy.c	2006-03-21 18:42:22.000000000 -0500
+++ wxGTK-2.6.3.2/contrib/src/deprecated/cwlex_yy.c	2005-05-04 14:57:49.000000000 -0400
@@ -3,7 +3,7 @@
 /* Licence:   wxWindows Licence */
 
 /* scanner skeleton version:
- * $Header: /pack/cvsroots/wxwindows/wxWindows/contrib/src/deprecated/cwlex_yy.c,v 1.2 2005/05/04 18:57:49 JS Exp $
+ * $Header: /pack/cvsroots/wxwidgets/wxWidgets/contrib/src/deprecated/cwlex_yy.c,v 1.2 2005/05/04 18:57:49 JS Exp $
 	Last change:  JS   13 Jul 97    6:17 pm
  */
 
diff -ur wxGTK-2.6.3/contrib/src/deprecated/doslex.c wxGTK-2.6.3.2/contrib/src/deprecated/doslex.c
--- wxGTK-2.6.3/contrib/src/deprecated/doslex.c	2006-03-21 18:42:22.000000000 -0500
+++ wxGTK-2.6.3.2/contrib/src/deprecated/doslex.c	2005-06-09 14:37:44.000000000 -0400
@@ -1,7 +1,7 @@
 /* A lexical scanner generated by flex */
 
 /* scanner skeleton version:
- * $Header: /pack/cvsroots/wxwindows/wxWindows/contrib/src/deprecated/doslex.c,v 1.6 2005/06/09 18:37:44 ABX Exp $
+ * $Header: /pack/cvsroots/wxwidgets/wxWidgets/contrib/src/deprecated/doslex.c,v 1.6 2005/06/09 18:37:44 ABX Exp $
   Last change:  JS   13 Jul 97    6:17 pm
  */
 /* Copyright: (c) Julian Smart */
diff -ur wxGTK-2.6.3/include/wx/version.h wxGTK-2.6.3.2/include/wx/version.h
--- wxGTK-2.6.3/include/wx/version.h	2006-03-21 18:42:08.000000000 -0500
+++ wxGTK-2.6.3.2/include/wx/version.h	2006-03-30 12:05:48.000000000 -0500
@@ -4,7 +4,7 @@
 *  Author:      Julian Smart
 *  Modified by: Ryan Norton (Converted to C)
 *  Created:     29/01/98
-*  RCS-ID:      $Id: version.h,v 1.69.2.2 2006/01/18 10:25:00 JS Exp $
+*  RCS-ID:      $Id: version.h,v 1.69.2.3 2006/03/30 17:05:48 RD Exp $
 *  Copyright:   (c) 1998 Julian Smart
 *  Licence:     wxWindows licence
 */
@@ -22,7 +22,7 @@
 #define wxMAJOR_VERSION      2
 #define wxMINOR_VERSION      6
 #define wxRELEASE_NUMBER     3
-#define wxSUBRELEASE_NUMBER  0
+#define wxSUBRELEASE_NUMBER  2
 #define wxVERSION_STRING   _T("wxWidgets 2.6.3")
 
 /*  nothing to update below this line when updating the version */
diff -ur wxGTK-2.6.3/locale/fr.po wxGTK-2.6.3.2/locale/fr.po
--- wxGTK-2.6.3/locale/fr.po	2006-03-21 18:42:51.000000000 -0500
+++ wxGTK-2.6.3.2/locale/fr.po	2005-09-20 11:18:55.000000000 -0400
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: wxWidgets-2.6.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-21 17:37+0200\n"
+"POT-Creation-Date: 2005-04-11 22:24+0200\n"
 "PO-Revision-Date: 2005-09-07 09:34+0200\n"
 "Last-Translator: Thomas Huriaux <thomas.huriaux at gmail.com>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -13,12 +13,12 @@
 "Content-Transfer-Encoding: 8bit\n"
 "plural-forms: nplurals=2; plural=n > 1\n"
 
-#: ../src/common/debugrpt.cpp:569
+#: ../src/common/debugrpt.cpp:547
 #, c-format
 msgid "\t%s: %s\n"
 msgstr "\t%s?: %s\n"
 
-#: ../src/common/debugrpt.cpp:572
+#: ../src/common/debugrpt.cpp:550
 msgid ""
 "\n"
 "Please send this report to the program maintainer, thank you!\n"
@@ -26,20 +26,20 @@
 "\n"
 "Veuillez envoyer ce rapport au responsable du programme.\n"
 
-#: ../src/palmos/utils.cpp:206
+#: ../src/palmos/utils.cpp:210
 msgid " "
 msgstr " "
 
-#: ../src/generic/dbgrptg.cpp:312
+#: ../src/generic/dbgrptg.cpp:293
 msgid "              Thank you and we're sorry for the inconvenience!\n"
 msgstr "              Merci et d?sol? pour le d?rangement.\n"
 
-#: ../src/common/log.cpp:321
+#: ../src/common/log.cpp:322
 #, c-format
 msgid " (error %ld: %s)"
 msgstr " (erreur %ld?: %s)"
 
-#: ../src/common/docview.cpp:1419
+#: ../src/common/docview.cpp:1380
 msgid " - "
 msgstr " - "
 
@@ -47,23 +47,23 @@
 msgid " Preview"
 msgstr " Aper?u"
 
-#: ../src/common/paper.cpp:124
+#: ../src/common/paper.cpp:134
 msgid "#10 Envelope, 4 1/8 x 9 1/2 in"
 msgstr "Enveloppe n??10 (4,125 x 9,5 pouces)"
 
-#: ../src/common/paper.cpp:125
+#: ../src/common/paper.cpp:135
 msgid "#11 Envelope, 4 1/2 x 10 3/8 in"
 msgstr "Enveloppe n??11 (4,5 x 10,375 pouces)"
 
-#: ../src/common/paper.cpp:126
+#: ../src/common/paper.cpp:136
 msgid "#12 Envelope, 4 3/4 x 11 in"
 msgstr "Enveloppe n??12 (4,75 x 11 pouces)"
 
-#: ../src/common/paper.cpp:127
+#: ../src/common/paper.cpp:137
 msgid "#14 Envelope, 5 x 11 1/2 in"
 msgstr "Enveloppe n??14 (5 x 11,5 pouces)"
 
-#: ../src/common/paper.cpp:123
+#: ../src/common/paper.cpp:133
 msgid "#9 Envelope, 3 7/8 x 8 7/8 in"
 msgstr "Enveloppe n??9 (3,875 x 8,875 pouces)"
 
@@ -74,13 +74,13 @@
 msgid "#define %s must be an integer."
 msgstr "#define %s doit ?tre un entier."
 
-#: ../src/html/helpfrm.cpp:1042 ../src/html/helpfrm.cpp:1044
-#: ../src/html/helpfrm.cpp:1703 ../src/html/helpfrm.cpp:1736
+#: ../src/html/helpfrm.cpp:1019 ../src/html/helpfrm.cpp:1021
+#: ../src/html/helpfrm.cpp:1689 ../src/html/helpfrm.cpp:1722
 #, c-format
 msgid "%i of %i"
 msgstr "%i de %i"
 
-#: ../src/generic/filedlgg.cpp:288
+#: ../src/generic/filedlgg.cpp:287
 #, c-format
 msgid "%ld bytes"
 msgstr "%ld octets"
@@ -90,27 +90,27 @@
 msgid "%s (or %s)"
 msgstr "%s (ou %s)"
 
-#: ../src/generic/logg.cpp:261
+#: ../src/generic/logg.cpp:262
 #, c-format
 msgid "%s Error"
 msgstr "%s Erreur"
 
-#: ../src/generic/logg.cpp:269
+#: ../src/generic/logg.cpp:270
 #, c-format
 msgid "%s Information"
 msgstr "%s Information"
 
[...16204 lines suppressed...]
--- wxGTK-2.6.3/src/tiff/tif_next.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_next.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_next.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_next.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_open.c wxGTK-2.6.3.2/src/tiff/tif_open.c
--- wxGTK-2.6.3/src/tiff/tif_open.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_open.c	2005-05-31 05:28:43.000000000 -0400
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_open.c,v 1.5 2005/05/31 09:28:43 JS Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_open.c,v 1.5 2005/05/31 09:28:43 JS Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_os2.c wxGTK-2.6.3.2/src/tiff/tif_os2.c
--- wxGTK-2.6.3/src/tiff/tif_os2.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_os2.c	2002-12-04 09:10:19.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_os2.c,v 1.2 2002/12/04 14:10:19 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_os2.c,v 1.2 2002/12/04 14:10:19 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_packbits.c wxGTK-2.6.3.2/src/tiff/tif_packbits.c
--- wxGTK-2.6.3/src/tiff/tif_packbits.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_packbits.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_packbits.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_packbits.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_predict.c wxGTK-2.6.3.2/src/tiff/tif_predict.c
--- wxGTK-2.6.3/src/tiff/tif_predict.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_predict.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_predict.c,v 1.6 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_predict.c,v 1.6 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_predict.h wxGTK-2.6.3.2/src/tiff/tif_predict.h
--- wxGTK-2.6.3/src/tiff/tif_predict.h	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_predict.h	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_predict.h,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_predict.h,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1995-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_print.c wxGTK-2.6.3.2/src/tiff/tif_print.c
--- wxGTK-2.6.3/src/tiff/tif_print.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_print.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_print.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_print.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_read.c wxGTK-2.6.3.2/src/tiff/tif_read.c
--- wxGTK-2.6.3/src/tiff/tif_read.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_read.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_read.c,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_read.c,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_strip.c wxGTK-2.6.3.2/src/tiff/tif_strip.c
--- wxGTK-2.6.3/src/tiff/tif_strip.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_strip.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_strip.c,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_strip.c,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1991-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_swab.c wxGTK-2.6.3.2/src/tiff/tif_swab.c
--- wxGTK-2.6.3/src/tiff/tif_swab.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_swab.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_swab.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_swab.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_thunder.c wxGTK-2.6.3.2/src/tiff/tif_thunder.c
--- wxGTK-2.6.3/src/tiff/tif_thunder.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_thunder.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_thunder.c,v 1.4 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_thunder.c,v 1.4 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_tile.c wxGTK-2.6.3.2/src/tiff/tif_tile.c
--- wxGTK-2.6.3/src/tiff/tif_tile.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_tile.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_tile.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_tile.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1991-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_unix.c wxGTK-2.6.3.2/src/tiff/tif_unix.c
--- wxGTK-2.6.3/src/tiff/tif_unix.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_unix.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_unix.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_unix.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_version.c wxGTK-2.6.3.2/src/tiff/tif_version.c
--- wxGTK-2.6.3/src/tiff/tif_version.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_version.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_version.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_version.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 /*
  * Copyright (c) 1992-1997 Sam Leffler
  * Copyright (c) 1992-1997 Silicon Graphics, Inc.
diff -ur wxGTK-2.6.3/src/tiff/tif_vms.c wxGTK-2.6.3.2/src/tiff/tif_vms.c
--- wxGTK-2.6.3/src/tiff/tif_vms.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_vms.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_vms.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_vms.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_warning.c wxGTK-2.6.3.2/src/tiff/tif_warning.c
--- wxGTK-2.6.3/src/tiff/tif_warning.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_warning.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_warning.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_warning.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_win32.c wxGTK-2.6.3.2/src/tiff/tif_win32.c
--- wxGTK-2.6.3/src/tiff/tif_win32.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_win32.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_win32.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_win32.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_win3.c wxGTK-2.6.3.2/src/tiff/tif_win3.c
--- wxGTK-2.6.3/src/tiff/tif_win3.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_win3.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_win3.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_win3.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_write.c wxGTK-2.6.3.2/src/tiff/tif_write.c
--- wxGTK-2.6.3/src/tiff/tif_write.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_write.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_write.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_write.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_zip.c wxGTK-2.6.3.2/src/tiff/tif_zip.c
--- wxGTK-2.6.3/src/tiff/tif_zip.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_zip.c	2004-11-19 17:29:47.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_zip.c,v 1.4 2004/11/19 22:29:47 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_zip.c,v 1.4 2004/11/19 22:29:47 VZ Exp $ */
 
 /*
  * Copyright (c) 1995-1997 Sam Leffler
diff -ur wxGTK-2.6.3/utils/helpview/src/helpview.cpp wxGTK-2.6.3.2/utils/helpview/src/helpview.cpp
--- wxGTK-2.6.3/utils/helpview/src/helpview.cpp	2006-03-21 18:42:49.000000000 -0500
+++ wxGTK-2.6.3.2/utils/helpview/src/helpview.cpp	2006-03-30 06:35:12.000000000 -0500
@@ -5,7 +5,7 @@
 // Author:      Vaclav Slavik, Julian Smart
 // Modified by:
 // Created:     2002-07-09
-// RCS-ID:      $Id: helpview.cpp,v 1.14 2005/05/30 09:24:08 ABX Exp $
+// RCS-ID:      $Id: helpview.cpp,v 1.14.2.1 2006/03/30 11:35:12 JS Exp $
 // Copyright:   (c) 2002 Vaclav Slavik, Julian Smart and others
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -63,7 +63,7 @@
 
 #ifdef __WXMAC__
     wxApp::s_macAboutMenuItemId = wxID_ABOUT;
-    wxFileName::MacRegisterDefaultTypeAndCreator( "htb" , 'HTBD' , 'HTBA' ) ;
+    wxFileName::MacRegisterDefaultTypeAndCreator( wxT("htb") , 'HTBD' , 'HTBA' ) ;
 #endif
 
     int istyle = wxHF_DEFAULT_STYLE;



From fedora-extras-commits at redhat.com  Fri Apr 14 14:09:42 2006
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Fri, 14 Apr 2006 07:09:42 -0700
Subject: rpms/wxPython/FC-5 sources,1.3,1.4 wxPython.spec,1.5,1.6
Message-ID: <200604141409.k3EE9ivh028326@cvs-int.fedora.redhat.com>

Author: mattdm

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

Added Files:
	sources wxPython.spec 
Log Message:
Update to 2.6.x, obsolete wxPythonGTK2 package. Massive changes; see
devel tree and changelog for details.



Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	14 Apr 2006 14:09:41 -0000	1.4
@@ -0,0 +1 @@
+a27546fab8a8d77eb6b67954e6362269  wxPython-src-2.6.3.2.tar.gz


Index: wxPython.spec
===================================================================
RCS file: wxPython.spec
diff -N wxPython.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wxPython.spec	14 Apr 2006 14:09:41 -0000	1.6
@@ -0,0 +1,148 @@
+%{!?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 buildflags WXPORT=gtk2 UNICODE=1
+
+Name:           wxPython
+Version:        2.6.3.2
+Release:        1%{?dist}
+
+Summary:        GUI toolkit for the Python programming language
+
+Group:          Development/Languages
+License:        LGPL
+URL:            http://www.wxpython.org/
+Source0:        http://dl.sf.net/wxpython/wxPython-src-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  wxGTK-devel = 2.6.3, pkgconfig
+BuildRequires:  zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel
+BuildRequires:  libGL-devel, libGLU-devel
+BuildRequires:  python-devel, wxGTK-gl
+
+# packages should depend on "wxPython", not "wxPythonGTK2", but in case
+# one does, here's the provides for it.
+Provides:       wxPythonGTK2 = %{version}-%{release}
+
+%description
+wxPython is a GUI toolkit for the Python programming language. It allows
+Python programmers to create programs with a robust, highly functional
+graphical user interface, simply and easily. It is implemented as a Python
+extension module (native code) that wraps the popular wxWindows cross
+platform GUI library, which is written in C++.
+
+%package        devel
+Group:          Development/Libraries
+Summary:        Development files for wxPython add-on modules
+Requires:       %{name} = %{version}-%{release}
+Requires:       wxGTK-devel
+
+%description devel
+This package includes C++ header files and SWIG files needed for developing
+add-on modules for wxPython. It is NOT needed for development of most
+programs which use the wxPython toolkit.
+
+
+%prep
+%setup -q -n wxPython-src-%{version}
+
+
+%build
+# Just build the wxPython part, not all of wxWindows which we already have
+# in Fedora
+cd wxPython
+# included distutils is not multilib aware; use normal
+rm -rf distutils
+python setup.py %{buildflags} build
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+cd wxPython
+python setup.py %{buildflags} install --root=$RPM_BUILD_ROOT
+
+# this is a kludge....
+%if "%{python_sitelib}" != "%{python_sitearch}"
+mv $RPM_BUILD_ROOT%{python_sitelib}/wx.pth  $RPM_BUILD_ROOT%{python_sitearch}
+mv $RPM_BUILD_ROOT%{python_sitelib}/wxversion.py* $RPM_BUILD_ROOT%{python_sitearch}
+%endif
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%doc wxPython/docs wxPython/demo wxPython/licence/ wxPython/samples
+%{_bindir}/*
+%{python_sitearch}/wx.pth
+%{python_sitearch}/wxversion.py*
+%dir %{python_sitearch}/wx-2.6-gtk2-unicode/
+%{python_sitearch}/wx-2.6-gtk2-unicode/wx
+%{python_sitearch}/wx-2.6-gtk2-unicode/wxPython
+
+%files devel
+%defattr(-,root,root,-)
+%dir %{_includedir}/wx-2.6/wx/wxPython
+%{_includedir}/wx-2.6/wx/wxPython/*.h
+%dir %{_includedir}/wx-2.6/wx/wxPython/i_files
+%{_includedir}/wx-2.6/wx/wxPython/i_files/*.i
+%{_includedir}/wx-2.6/wx/wxPython/i_files/*.py*
+%{_includedir}/wx-2.6/wx/wxPython/i_files/*.swg
+
+
+%changelog
+* Thu Apr 13 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3.2-1
+- version 2.6.3.2
+- move wxversion.py _into_ lib64. Apparently that's the right thing to do. :)
+- upstream tarball no longer includes embedded.o (since I finally got around
+  to pointing that out to the developers instead of just kludging it away.)
+- buildrequires to just libGLU-devel instead of mesa-libGL-devel
+
+* Fri Mar 31 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3.0-4
+- grr. bump relnumber.
+
+* Fri Mar 31 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3.0-3
+- oh yeah -- wxversion.py not lib64.
+
+* Fri Mar 31 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3.0-2
+- buildrequires mesa-libGLU-devel
+
+* Thu Mar 30 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3.0-1
+- update to 2.6.3.0
+- wxGTK and wxPython versions are inexorably linked; make BuildRequires
+  be exact, rather than >=.
+- make devel subpackage as per comment #7 in bug #163440.
+
+* Thu Nov 24 2005 Matthew Miller <mattdm at mattdm.org> - 2.6.1.0-1
+- update to 2.6.0.0
+- merge in changes from current extras 2.4.x package
+- Happy Thanksgiving
+- build animate extention again -- works now.
+
+* Thu Apr 28 2005 Matthew Miller <mattdm at bu.edu> - 2.6.0.0-bu45.1
+- get rid of accidental binaries in source tarball -- they generates
+  spurious dependencies and serve no purpose
+- update to 2.6.0.0 and build for Velouria
+- switch to Fedora Extras base spec file
+- enable gtk2 and unicode and all the code stuff (as FE does)
+- disable BUILD_ANIMATE extension from contrib -- doesn't build
+- files are in a different location now -- adjust to that
+- zap include files (needed only for building wxPython 3rd-party modules),
+  because I don't think this is likely to be very useful. Other option
+  would be to create a -devel package, but I think that'd be confusing.
+
+* Tue Feb 08 2005 Thorsten Leemhuis <fedora at leemhuis dot info> 0:2.4.2.4-4
+- remove included disutils - it is not multilib aware; this
+  fixes build on x86_64
+
+* Tue Jan 06 2004 Panu Matilainen <pmatilai at welho.com> 0:2.4.2.4-0.fdr.3
+- rename package to wxPythonGTK2, provide wxPython (see bug 927)
+- dont ship binaries in /usr/share
+
+* Thu Nov 20 2003 Panu Matilainen <pmatilai at welho.com> 0:2.4.2.4-0.fdr.2
+- add missing buildrequires: python-devel, wxGTK2-gl
+
+* Sun Nov 02 2003 Panu Matilainen <pmatilai at welho.com> 0:2.4.2.4-0.fdr.1
+- Initial RPM release.
+~



From fedora-extras-commits at redhat.com  Fri Apr 14 15:15:54 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Fri, 14 Apr 2006 08:15:54 -0700
Subject: rpms/nethack-vultures/FC-4 nethack-vultures.spec,1.22,1.23
Message-ID: <200604141516.k3EFGQsZ030570@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-serv30516/FC-4

Modified Files:
	nethack-vultures.spec 
Log Message:
Upped tags to stop FC-3 from replacing the later distro builds.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- nethack-vultures.spec	10 Apr 2006 14:45:59 -0000	1.22
+++ nethack-vultures.spec	14 Apr 2006 15:15:53 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        2.0.0
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -167,6 +167,9 @@
 
 
 %changelog
+* Fri Apr 14 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-5
+- Upped the release tag to keep up with FC-3
+
 * Sun Apr 09 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-3
 - Packaged extra fonts
 



From fedora-extras-commits at redhat.com  Fri Apr 14 15:15:54 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Fri, 14 Apr 2006 08:15:54 -0700
Subject: rpms/nethack-vultures/FC-5 nethack-vultures.spec,1.23,1.24
Message-ID: <200604141516.k3EFGQkT030573@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-serv30516/FC-5

Modified Files:
	nethack-vultures.spec 
Log Message:
Upped tags to stop FC-3 from replacing the later distro builds.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-5/nethack-vultures.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- nethack-vultures.spec	10 Apr 2006 14:45:59 -0000	1.23
+++ nethack-vultures.spec	14 Apr 2006 15:15:54 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        2.0.0
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -167,6 +167,9 @@
 
 
 %changelog
+* Fri Apr 14 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-5
+- Upped the release tag to keep up with FC-3
+
 * Sun Apr 09 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-3
 - Packaged extra fonts
 



From fedora-extras-commits at redhat.com  Fri Apr 14 15:15:55 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Fri, 14 Apr 2006 08:15:55 -0700
Subject: rpms/nethack-vultures/devel nethack-vultures.spec,1.23,1.24
Message-ID: <200604141516.k3EFGRl5030576@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30516/devel

Modified Files:
	nethack-vultures.spec 
Log Message:
Upped tags to stop FC-3 from replacing the later distro builds.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- nethack-vultures.spec	10 Apr 2006 14:46:05 -0000	1.23
+++ nethack-vultures.spec	14 Apr 2006 15:15:55 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        2.0.0
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -167,6 +167,9 @@
 
 
 %changelog
+* Fri Apr 14 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-5
+- Upped the release tag to keep up with FC-3
+
 * Sun Apr 09 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-3
 - Packaged extra fonts
 



From fedora-extras-commits at redhat.com  Fri Apr 14 15:37:07 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Fri, 14 Apr 2006 08:37:07 -0700
Subject: rpms/ginac/FC-5 .cvsignore, 1.3, 1.4 ginac.spec, 1.7, 1.8 sources,
	1.3, 1.4
Message-ID: <200604141537.k3EFb9U7030771@cvs-int.fedora.redhat.com>

Author: qspencer

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

Modified Files:
	.cvsignore ginac.spec sources 
Log Message:
New release. Remove old patch.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ginac/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	31 Oct 2005 23:23:57 -0000	1.3
+++ .cvsignore	14 Apr 2006 15:37:06 -0000	1.4
@@ -1 +1 @@
-ginac-1.3.3.tar.bz2
+ginac-1.3.4.tar.bz2


Index: ginac.spec
===================================================================
RCS file: /cvs/extras/rpms/ginac/FC-5/ginac.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ginac.spec	13 Feb 2006 17:50:29 -0000	1.7
+++ ginac.spec	14 Apr 2006 15:37:06 -0000	1.8
@@ -1,13 +1,12 @@
 Name:           ginac
-Version:        1.3.3
-Release:        4%{?dist}
+Version:        1.3.4
+Release:        1%{?dist}
 Summary:        C++ library for symbolic calculations
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://www.ginac.de/
 Source0:        http://www.ginac.de/%{name}-%{version}.tar.bz2
-Patch0:         ginac-1.3.3-gcc41.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post): /sbin/install-info
@@ -55,7 +54,6 @@
 
 %prep
 %setup -q
-%patch0 -p0
 
 %build
 %configure --disable-dependency-tracking --disable-static
@@ -106,6 +104,9 @@
 %{_mandir}/man?/viewgar.1*
 
 %changelog
+* Fri Apr 14 2006 Quentin Spencer <qspencer at users.sf.net> 1.3.4-1
+- New release. Old patch removed.
+
 * Mon Feb 13 2006 Quentin Spencer <qspencer at users.sf.net> 1.3.3-4
 - Rebuild for Fedora Extras 5.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ginac/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 Oct 2005 23:23:57 -0000	1.3
+++ sources	14 Apr 2006 15:37:06 -0000	1.4
@@ -1 +1 @@
-6278b954d17013a4c027e4d52a4bd8b4  ginac-1.3.3.tar.bz2
+ed887e80cc119eeb07c0329990576446  ginac-1.3.4.tar.bz2



From fedora-extras-commits at redhat.com  Fri Apr 14 15:38:40 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Fri, 14 Apr 2006 08:38:40 -0700
Subject: rpms/ginac/FC-5 ginac-1.3.3-gcc41.patch,1.1,NONE
Message-ID: <200604141538.k3EFcg4I030799@cvs-int.fedora.redhat.com>

Author: qspencer

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

Removed Files:
	ginac-1.3.3-gcc41.patch 
Log Message:
Forgot to remove old patch.


--- ginac-1.3.3-gcc41.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Apr 14 15:39:41 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Fri, 14 Apr 2006 08:39:41 -0700
Subject: rpms/ginac/devel .cvsignore, 1.3, 1.4 ginac.spec, 1.7, 1.8 sources, 
	1.3, 1.4 ginac-1.3.3-gcc41.patch, 1.1, NONE
Message-ID: <200604141539.k3EFdhRP030847@cvs-int.fedora.redhat.com>

Author: qspencer

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

Modified Files:
	.cvsignore ginac.spec sources 
Removed Files:
	ginac-1.3.3-gcc41.patch 
Log Message:
New release. Remove old patch.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ginac/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	31 Oct 2005 23:23:57 -0000	1.3
+++ .cvsignore	14 Apr 2006 15:39:41 -0000	1.4
@@ -1 +1 @@
-ginac-1.3.3.tar.bz2
+ginac-1.3.4.tar.bz2


Index: ginac.spec
===================================================================
RCS file: /cvs/extras/rpms/ginac/devel/ginac.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ginac.spec	13 Feb 2006 17:50:29 -0000	1.7
+++ ginac.spec	14 Apr 2006 15:39:41 -0000	1.8
@@ -1,13 +1,12 @@
 Name:           ginac
-Version:        1.3.3
-Release:        4%{?dist}
+Version:        1.3.4
+Release:        1%{?dist}
 Summary:        C++ library for symbolic calculations
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://www.ginac.de/
 Source0:        http://www.ginac.de/%{name}-%{version}.tar.bz2
-Patch0:         ginac-1.3.3-gcc41.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post): /sbin/install-info
@@ -55,7 +54,6 @@
 
 %prep
 %setup -q
-%patch0 -p0
 
 %build
 %configure --disable-dependency-tracking --disable-static
@@ -106,6 +104,9 @@
 %{_mandir}/man?/viewgar.1*
 
 %changelog
+* Fri Apr 14 2006 Quentin Spencer <qspencer at users.sf.net> 1.3.4-1
+- New release. Old patch removed.
+
 * Mon Feb 13 2006 Quentin Spencer <qspencer at users.sf.net> 1.3.3-4
 - Rebuild for Fedora Extras 5.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ginac/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 Oct 2005 23:23:57 -0000	1.3
+++ sources	14 Apr 2006 15:39:41 -0000	1.4
@@ -1 +1 @@
-6278b954d17013a4c027e4d52a4bd8b4  ginac-1.3.3.tar.bz2
+ed887e80cc119eeb07c0329990576446  ginac-1.3.4.tar.bz2


--- ginac-1.3.3-gcc41.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Apr 14 16:21:57 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Fri, 14 Apr 2006 09:21:57 -0700
Subject: rpms/ginac/FC-4 .cvsignore, 1.3, 1.4 ginac.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <200604141621.k3EGLxra000634@cvs-int.fedora.redhat.com>

Author: qspencer

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

Modified Files:
	.cvsignore ginac.spec sources 
Log Message:
New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ginac/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	31 Oct 2005 23:22:22 -0000	1.3
+++ .cvsignore	14 Apr 2006 16:21:57 -0000	1.4
@@ -1 +1 @@
-ginac-1.3.3.tar.bz2
+ginac-1.3.4.tar.bz2


Index: ginac.spec
===================================================================
RCS file: /cvs/extras/rpms/ginac/FC-4/ginac.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ginac.spec	2 Feb 2006 22:14:04 -0000	1.4
+++ ginac.spec	14 Apr 2006 16:21:57 -0000	1.5
@@ -1,12 +1,12 @@
 Name:           ginac
-Version:        1.3.3
-Release:        2%{?dist}
+Version:        1.3.4
+Release:        1%{?dist}
 Summary:        C++ library for symbolic calculations
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://www.ginac.de/
-Source0:        ftp://ftpthep.physik.uni-mainz.de/pub/GiNaC/%{name}-%{version}.tar.bz2
+Source0:        http://www.ginac.de/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post): /sbin/install-info
@@ -104,7 +104,8 @@
 %{_mandir}/man1/viewgar.1*
 
 %changelog
-* Thu Feb  2 2006 Quentin Spencer <qspencer at users.sf.net> 1.3.3-3
+* Fri Apr 14 2006 Quentin Spencer <qspencer at users.sf.net> 1.3.4-1
+- New release.
 - Disable static libs, remove /usr/share/info/dir, and enable parallel build.
 
 * Mon Oct 31 2005 Quentin Spencer <qspencer at users.sf.net> 1.3.3-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ginac/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 Oct 2005 23:22:22 -0000	1.3
+++ sources	14 Apr 2006 16:21:57 -0000	1.4
@@ -1 +1 @@
-6278b954d17013a4c027e4d52a4bd8b4  ginac-1.3.3.tar.bz2
+ed887e80cc119eeb07c0329990576446  ginac-1.3.4.tar.bz2



From fedora-extras-commits at redhat.com  Fri Apr 14 17:03:19 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 14 Apr 2006 10:03:19 -0700
Subject: rpms/php-adodb/FC-5 .cvsignore, 1.6, 1.7 php-adodb.spec, 1.8,
	1.9 sources, 1.6, 1.7
Message-ID: <200604141703.k3EH3LTQ002878@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/php-adodb/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2817/FC-5

Modified Files:
	.cvsignore php-adodb.spec sources 
Log Message:
- update to 4.80 (minor bugfixes)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-adodb/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	22 Feb 2006 15:30:49 -0000	1.6
+++ .cvsignore	14 Apr 2006 17:03:19 -0000	1.7
@@ -1 +1 @@
-adodb472.tgz
+adodb480.tgz


Index: php-adodb.spec
===================================================================
RCS file: /cvs/extras/rpms/php-adodb/FC-5/php-adodb.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- php-adodb.spec	22 Feb 2006 15:30:49 -0000	1.8
+++ php-adodb.spec	14 Apr 2006 17:03:19 -0000	1.9
@@ -1,9 +1,9 @@
 Name:           php-adodb
 Summary:        Active Data Objects Data Base
-Version:        4.72
+Version:        4.80
 Release:        1%{?dist}
 
-Source0:        http://dl.sf.net/adodb/adodb472.tgz
+Source0:        http://dl.sf.net/adodb/adodb480.tgz
 License:        BSD
 URL:            http://adodb.sf.net
 Group:          Development/Libraries
@@ -53,6 +53,9 @@
 %{_var}/www/icons/*
 
 %changelog
+* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 4.80-1
+- version 4.80
+
 * Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 4.72-1
 - version 4.72
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-adodb/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	22 Feb 2006 15:30:49 -0000	1.6
+++ sources	14 Apr 2006 17:03:19 -0000	1.7
@@ -1 +1 @@
-10a3a94d21d56a35f9ff62b838856911  adodb472.tgz
+942164adfc953173205231b9522304e0  adodb480.tgz



From fedora-extras-commits at redhat.com  Fri Apr 14 17:03:20 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 14 Apr 2006 10:03:20 -0700
Subject: rpms/php-adodb/devel .cvsignore, 1.6, 1.7 php-adodb.spec, 1.8,
	1.9 sources, 1.6, 1.7
Message-ID: <200604141703.k3EH3MGl002885@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/php-adodb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2817/devel

Modified Files:
	.cvsignore php-adodb.spec sources 
Log Message:
- update to 4.80 (minor bugfixes)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-adodb/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	22 Feb 2006 15:30:49 -0000	1.6
+++ .cvsignore	14 Apr 2006 17:03:20 -0000	1.7
@@ -1 +1 @@
-adodb472.tgz
+adodb480.tgz


Index: php-adodb.spec
===================================================================
RCS file: /cvs/extras/rpms/php-adodb/devel/php-adodb.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- php-adodb.spec	22 Feb 2006 15:30:49 -0000	1.8
+++ php-adodb.spec	14 Apr 2006 17:03:20 -0000	1.9
@@ -1,9 +1,9 @@
 Name:           php-adodb
 Summary:        Active Data Objects Data Base
-Version:        4.72
+Version:        4.80
 Release:        1%{?dist}
 
-Source0:        http://dl.sf.net/adodb/adodb472.tgz
+Source0:        http://dl.sf.net/adodb/adodb480.tgz
 License:        BSD
 URL:            http://adodb.sf.net
 Group:          Development/Libraries
@@ -53,6 +53,9 @@
 %{_var}/www/icons/*
 
 %changelog
+* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 4.80-1
+- version 4.80
+
 * Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 4.72-1
 - version 4.72
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-adodb/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	22 Feb 2006 15:30:49 -0000	1.6
+++ sources	14 Apr 2006 17:03:20 -0000	1.7
@@ -1 +1 @@
-10a3a94d21d56a35f9ff62b838856911  adodb472.tgz
+942164adfc953173205231b9522304e0  adodb480.tgz



From fedora-extras-commits at redhat.com  Fri Apr 14 17:03:19 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 14 Apr 2006 10:03:19 -0700
Subject: rpms/php-adodb/FC-4 .cvsignore, 1.5, 1.6 php-adodb.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <200604141703.k3EH3LmI002874@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/php-adodb/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2817/FC-4

Modified Files:
	.cvsignore php-adodb.spec sources 
Log Message:
- update to 4.80 (minor bugfixes)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-adodb/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Dec 2005 08:34:17 -0000	1.5
+++ .cvsignore	14 Apr 2006 17:03:18 -0000	1.6
@@ -1 +1 @@
-adodb468.tgz
+adodb480.tgz


Index: php-adodb.spec
===================================================================
RCS file: /cvs/extras/rpms/php-adodb/FC-4/php-adodb.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- php-adodb.spec	23 Dec 2005 08:34:17 -0000	1.7
+++ php-adodb.spec	14 Apr 2006 17:03:18 -0000	1.8
@@ -1,9 +1,9 @@
 Name:           php-adodb
 Summary:        Active Data Objects Data Base
-Version:        4.68
+Version:        4.80
 Release:        1%{?dist}
 
-Source0:        http://dl.sf.net/adodb/adodb468.tgz
+Source0:        http://dl.sf.net/adodb/adodb480.tgz
 License:        BSD
 URL:            http://adodb.sf.net
 Group:          Development/Libraries
@@ -53,6 +53,12 @@
 %{_var}/www/icons/*
 
 %changelog
+* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 4.80-1
+- version 4.80
+
+* Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 4.72-1
+- version 4.72
+
 * Fri Dec 23 2005 Aurelien Bompard <gauret[AT]free.fr> 4.68-1
 - version 4.68
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-adodb/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Dec 2005 08:34:17 -0000	1.5
+++ sources	14 Apr 2006 17:03:18 -0000	1.6
@@ -1 +1 @@
-c4e8b0db2abc7181a1d3bb0621aa0c1d  adodb468.tgz
+942164adfc953173205231b9522304e0  adodb480.tgz



From fedora-extras-commits at redhat.com  Fri Apr 14 19:14:52 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Fri, 14 Apr 2006 12:14:52 -0700
Subject: rpms/net6/devel .cvsignore, 1.5, 1.6 net6.spec, 1.7, 1.8 sources,
	1.5, 1.6
Message-ID: <200604141914.k3EJEsnW007532@cvs-int.fedora.redhat.com>

Author: lmacken

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

Modified Files:
	.cvsignore net6.spec sources 
Log Message:
1.3.0rc1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/net6/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	22 Dec 2005 08:53:09 -0000	1.5
+++ .cvsignore	14 Apr 2006 19:14:52 -0000	1.6
@@ -1 +1 @@
-net6-1.2.2.tar.gz
+net6-1.3.0rc1.tar.gz


Index: net6.spec
===================================================================
RCS file: /cvs/extras/rpms/net6/devel/net6.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- net6.spec	13 Feb 2006 22:11:29 -0000	1.7
+++ net6.spec	14 Apr 2006 19:14:52 -0000	1.8
@@ -1,15 +1,18 @@
+%define _rc rc1
+
 Name:           net6
-Version:        1.2.2
-Release:        2%{?dist}
+Version:        1.3.0
+Release:        1.rc1%{?dist}
 Summary:        A TCP protocol abstraction for library C++
 
 Group:          Development/Libraries
 License:        GPL
 URL:            http://releases.0x539.de/net6/
-Source0:        http://releases.0x539.de/net6/%{name}-%{version}.tar.gz
+Source0:        http://releases.0x539.de/net6/%{name}-%{version}%{_rc}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libsigc++20-devel
+BuildRequires:  libsigc++20-devel, gnutls-devel
+Requires:       gnutls
 
 %description
 net6 is a library which eases the development of network-based applications
@@ -33,7 +36,7 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{_rc}
 
 
 %build
@@ -70,6 +73,9 @@
 
 
 %changelog
+* Fri Apr 14 2006 Luke Macken <lmacken at redhat.com> - 1.3.0-1.rc1
+- 1.3.0rc1
+
 * Mon Feb 13 2006 Luke Macken <lmacken at redhat.com> - 1.2.2-2
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/net6/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	22 Dec 2005 08:53:09 -0000	1.5
+++ sources	14 Apr 2006 19:14:52 -0000	1.6
@@ -1 +1 @@
-8a551a2d9785b2b0ed431bb9eeb6cfd6  net6-1.2.2.tar.gz
+45511815c3be246cda11a2234cc4fa7b  net6-1.3.0rc1.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 14 19:58:26 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 14 Apr 2006 12:58:26 -0700
Subject: rpms/wv/devel wv.spec,1.14,1.15
Message-ID: <200604141958.k3EJwSOV007702@cvs-int.fedora.redhat.com>

Author: abompard

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

Modified Files:
	wv.spec 
Log Message:
rebuild


Index: wv.spec
===================================================================
RCS file: /cvs/extras/rpms/wv/devel/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	14 Apr 2006 19:58:25 -0000	1.15
@@ -1,7 +1,7 @@
 Name:       wv
 Summary:    MSWord 6/7/8/9 binary file format to HTML converter
 Version:    1.2.0
-Release:    3%{?dist}
+Release:    4%{?dist}
 License:    GPL
 Group:      Applications/Text
 URL:        http://wvware.sourceforge.net
@@ -85,6 +85,9 @@
 
 
 %changelog
+* 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 Apr 15 01:49:16 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Fri, 14 Apr 2006 18:49:16 -0700
Subject: rpms/gphpedit - New directory
Message-ID: <200604150149.k3F1nIFE022684@cvs-int.fedora.redhat.com>

Author: timj

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

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




From fedora-extras-commits at redhat.com  Sat Apr 15 01:49:17 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Fri, 14 Apr 2006 18:49:17 -0700
Subject: rpms/gphpedit/devel - New directory
Message-ID: <200604150149.k3F1nJpF022687@cvs-int.fedora.redhat.com>

Author: timj

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

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




From fedora-extras-commits at redhat.com  Sat Apr 15 01:49:37 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Fri, 14 Apr 2006 18:49:37 -0700
Subject: rpms/gphpedit/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604150149.k3F1nd4s022739@cvs-int.fedora.redhat.com>

Author: timj

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

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


--- 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 Apr 15 01:49:36 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Fri, 14 Apr 2006 18:49:36 -0700
Subject: rpms/gphpedit Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604150149.k3F1ncVw022736@cvs-int.fedora.redhat.com>

Author: timj

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

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


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

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 15 01:51:24 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Fri, 14 Apr 2006 18:51:24 -0700
Subject: rpms/gphpedit import.log,1.1,1.2
Message-ID: <200604150151.k3F1pQpi022800@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/gphpedit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22767

Modified Files:
	import.log 
Log Message:
auto-import gphpedit-0.9.80-3 on branch devel from gphpedit-0.9.80-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gphpedit/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Apr 2006 01:49:36 -0000	1.1
+++ import.log	15 Apr 2006 01:51:24 -0000	1.2
@@ -0,0 +1 @@
+gphpedit-0_9_80-3:HEAD:gphpedit-0.9.80-3.src.rpm:1145065877



From fedora-extras-commits at redhat.com  Sat Apr 15 01:51:25 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Fri, 14 Apr 2006 18:51:25 -0700
Subject: rpms/gphpedit/devel gphpedit.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604150151.k3F1pRHL022805@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/gphpedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22767/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gphpedit.spec 
Log Message:
auto-import gphpedit-0.9.80-3 on branch devel from gphpedit-0.9.80-3.src.rpm


--- NEW FILE gphpedit.spec ---
Name:           gphpedit
Version:        0.9.80
Release:        3%{?dist}
Summary:        A PHP source editor for GNOME 2

Group:          Applications/Text
License:        GPL
URL:            http://www.gphpedit.org/
Source0:        gphpedit-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtkhtml2-devel libgnomeui-devel
BuildRequires:  desktop-file-utils

%description
gPHPEdit is a GNOME2 editor dedicated to editing PHP files and other 
supporting files such as HTML/CSS.

%prep
%setup -q

# This path is hardcoded and doesn't inherit from the configure
# (see upstream bug #155 )
sed -i s_/usr/local/share/pixmaps_%{_datadir}/pixmaps_ src/main.h

# The .desktop file included isn't Free Desktop compliant
# (Fixed upstream in CVS)
%{__cat} <<EOF >gphpedit.desktop
[Desktop Entry]
Encoding=UTF-8
Name=gPHPEdit
GenericName=PHP/HTML/CSS editor
Comment=Edit PHP source files
Exec=gphpedit
Icon=gphpedit.png
Terminal=false
Type=Application
Categories=Application;Development;IDE;GNOME;
Version=0.9.4
EOF

%build
%configure
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

# Remove the desktop file installed by the package itself
rm %{buildroot}%{_datadir}/applications/gphpedit.desktop

# Install our own desktop file
desktop-file-install --vendor fedora                            \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
        --add-category X-Fedora                                 \
        gphpedit.desktop


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
%dir %{_datadir}/gphpedit
%{_bindir}/gphpedit
%{_datadir}/pixmaps/gphpedit.png
%{_datadir}/applications/fedora-gphpedit.desktop
%{_datadir}/gphpedit/php-gphpedit.api

%changelog
* Sat Apr 15 2006 Tim Jackson <rpm at timj.co.uk> 0.9.80-3
- Remove gtk2-devel (gtkhtml2-devel and libgnomeui-devel will pull it in)
- Remove empty NEWS file
- Remove generic INSTALL file

* Thu Apr 13 2006 Tim Jackson <rpm at timj.co.uk> 0.9.80-2
- Own datadir/gphpedit
- Macroize replacement pixmap path in main.h
- Add "GNOME" and "Application" to desktop file

* Sat Apr 08 2006 Tim Jackson <rpm at timj.co.uk> 0.9.80-1
- Initial RPM build for FE


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gphpedit/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Apr 2006 01:49:36 -0000	1.1
+++ .cvsignore	15 Apr 2006 01:51:25 -0000	1.2
@@ -0,0 +1 @@
+gphpedit-0.9.80.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gphpedit/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Apr 2006 01:49:36 -0000	1.1
+++ sources	15 Apr 2006 01:51:25 -0000	1.2
@@ -0,0 +1 @@
+f05e6354ea64c73dd7bfe020ae15ac71  gphpedit-0.9.80.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 15 01:53:38 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Fri, 14 Apr 2006 18:53:38 -0700
Subject: owners owners.list,1.842,1.843
Message-ID: <200604150153.k3F1re19022878@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22861

Modified Files:
	owners.list 
Log Message:
Add gphpedit


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.842
retrieving revision 1.843
diff -u -r1.842 -r1.843
--- owners.list	14 Apr 2006 12:38:56 -0000	1.842
+++ owners.list	15 Apr 2006 01:53:38 -0000	1.843
@@ -392,6 +392,7 @@
 Fedora Extras|gperiodic|Program for browsing the periodic table|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
 Fedora Extras|gpgme03|GnuPG Made Easy interface library|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|gpgme|GnuPG Made Easy|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|gphpedit|A PHP source editor for GNOME 2|rpm at timj.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|gpp|Gnome Photo Printer|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|
 Fedora Extras|gpredict|Real-time satellite tracking and orbit prediction program|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|gpsd|Service daemon for mediating access to a GPS|matt at truch.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Apr 15 08:29:35 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 15 Apr 2006 01:29:35 -0700
Subject: rpms/amarok/FC-4 .cvsignore, 1.18, 1.19 amarok.spec, 1.37,
	1.38 sources, 1.18, 1.19
Message-ID: <200604150829.k3F8Tb8c006320@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6299

Modified Files:
	.cvsignore amarok.spec sources 
Log Message:
update to 1.3.9


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	22 Jan 2006 09:07:05 -0000	1.18
+++ .cvsignore	15 Apr 2006 08:29:35 -0000	1.19
@@ -1 +1 @@
-amarok-1.3.8.tar.bz2
+amarok-1.3.9.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/amarok.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- amarok.spec	22 Jan 2006 09:07:06 -0000	1.37
+++ amarok.spec	15 Apr 2006 08:29:35 -0000	1.38
@@ -1,20 +1,13 @@
-# Rebuild switch: 
-#  --with xine    Enables xine engine
-#
-
-%{?_with_xine: %define use_xine 1}
-
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.3.8
+Version:    1.3.9
 Release:    1%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.3.8.tar.bz2
+Source0:    http://dl.sf.net/amarok/amarok-1.3.9.tar.bz2
 #Patch0:     amarok-1.3.4-helix-libs.patch
-Patch1:     amarok-1.3.6-libtunepimp040.patch
 Patch2:     amarok-1.3-engines-cfg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -28,20 +21,11 @@
 BuildRequires:  mysql-devel, postgresql-devel
 BuildRequires:  libtunepimp-devel >= 0.4.0
 BuildRequires:  kdebase-devel
-%if "%fedora" >= "5"
-BuildRequires:  gstreamer-plugins-base-devel, gstreamer-plugins-good-devel
-%else
 BuildRequires:  gstreamer-plugins-devel >= 0.8.4
-%endif
 %ifnarch ppc64 x86_64 s390 s390x ia64
 BuildRequires:  HelixPlayer
 %endif
 
-%if  0%{?use_xine}
-BuildRequires:  xine-lib-devel >= 0:1.0.0
-BuildRequires:  libmad-devel
-%endif
-
 Requires:   kdemultimedia >= 6:3.2
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -74,24 +58,10 @@
 use any of xmms' visualisation plugins with Amarok.
 
 
-%if 0%{?use_xine}
-%package xine
-Summary:    Xine engine for Amarok
-Group:      Applications/Multimedia
-Requires:   %{name} = %{version}
-
-%description xine
-Amarok can also use the xine engine to decode sound. This package
-enables it
-%endif
-
-
 %prep
 %setup -q
 # Discover the helix libs
 #%patch0 -p1 -b .helix-libs
-# Use libtunepimp 0.4.0 (api changed)
-%patch1 -p1 -b .libtunepimp040
 # Gstreamer default sink should be autoaudiosink
 %patch2 -p1 -b .engines-cfg
 
@@ -103,11 +73,11 @@
 %configure \
      --disable-debug \
      --disable-rpath \
-     --with-helix=%{_libdir}/helix \
      --enable-mysql \
      --enable-postgresql \
-%if %{?use_xine:0}%{!?use_xine:1}
-     --without-xine
+     --without-xine \
+%ifnarch ppc64 x86_64 s390 s390x ia64
+     --with-helix=%{_libdir}/helix \
 %endif
 #     --enable-final \
 #     --with-nmm \
@@ -210,16 +180,12 @@
 %{_bindir}/amarok_xmmswrapper2
 
 
-%if 0%{?use_xine}
-%files xine
-%defattr(-,root,root)
-%{_libdir}/kde3/libamarok_xine-engine.*
-%{_datadir}/services/amarok_xine-engine.desktop
-#%{_datadir}/services/amarok_xine-engine_plugin.desktop
-%endif
-
-
 %changelog
+* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 1.3.9-1
+- version 1.3.9
+- drop nonfree bits
+- drop patch 1 (upstream updated)
+
 * Sat Jan 21 2006 Aurelien Bompard <gauret[AT]free.fr> 1.3.8-1
 - version 1.3.8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	22 Jan 2006 09:07:23 -0000	1.18
+++ sources	15 Apr 2006 08:29:35 -0000	1.19
@@ -1 +1 @@
-fd1ee0509568e5f9f7d0aeb9af094786  amarok-1.3.8.tar.bz2
+fb4cb3dafd3d15657b78e24c33abcf76  amarok-1.3.9.tar.bz2



From fedora-extras-commits at redhat.com  Sat Apr 15 08:39:19 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 15 Apr 2006 01:39:19 -0700
Subject: rpms/milter-greylist/devel milter-greylist.spec, 1.11, 1.12 sources,
	1.6, 1.7
Message-ID: <200604150839.k3F8dL5k006391@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/milter-greylist/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6371

Modified Files:
	milter-greylist.spec sources 
Log Message:
updated to 2.1.4 development release



Index: milter-greylist.spec
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/milter-greylist.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- milter-greylist.spec	18 Feb 2006 11:01:53 -0000	1.11
+++ milter-greylist.spec	15 Apr 2006 08:39:18 -0000	1.12
@@ -22,8 +22,8 @@
 
 Summary:	Milter for greylisting, the next step in the spam control war
 Name:		milter-greylist
-Version:	2.0.2
-Release:	%release_func 3
+Version:	2.1.4
+Release:	%release_func 1
 License:	BSD w/ advertising
 Group:		System Environment/Daemons
 URL:		http://hcpnet.free.fr/milter-greylist/
@@ -232,6 +232,9 @@
 %endif
 
 %changelog
+* Sat Apr 15 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 2.1.4-1
+- updated to 2.1.4
+
 * Sat Feb 18 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 2.0.2-3
 - rebuilt for FC5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	22 Oct 2005 00:56:35 -0000	1.6
+++ sources	15 Apr 2006 08:39:18 -0000	1.7
@@ -1 +1 @@
-3b407107760b09bd554fb7dc5c5a3854  milter-greylist-2.0.2.tgz
+55eeb97b44bfc845c177e09f837c5b9c  milter-greylist-2.1.4.tgz



From fedora-extras-commits at redhat.com  Sat Apr 15 08:42:26 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 15 Apr 2006 01:42:26 -0700
Subject: rpms/gnochm/FC-4 gnochm.spec,1.2,1.3
Message-ID: <200604150842.k3F8gSt0006492@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/gnochm/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6447/FC-4

Modified Files:
	gnochm.spec 
Log Message:
* Sat Apr 15 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-5
- add gnome related requires (189034)



Index: gnochm.spec
===================================================================
RCS file: /cvs/extras/rpms/gnochm/FC-4/gnochm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnochm.spec	14 Apr 2006 11:47:37 -0000	1.2
+++ gnochm.spec	15 Apr 2006 08:42:26 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gnochm
 Version:        0.9.7
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        CHM file viewer
 
 Group:          Applications/Publishing
@@ -11,7 +11,8 @@
 
 BuildArch:      noarch
 BuildRequires:  gettext
-Requires:       python-chm
+Requires:       python-chm gnome-python2-gconf pygtk2-libglade 
+Requires:       gnome-python2-gtkhtml2
 
 Requires(pre): GConf2
 Requires(post): GConf2
@@ -117,6 +118,9 @@
 %{_datadir}/pixmaps/gnochm*.png
 
 %changelog
+* Sat Apr 15 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-5
+- add gnome related requires (189034)
+
 * Thu Apr 13 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-4
 - Add mimetype to .desktop file (188809)
 



From fedora-extras-commits at redhat.com  Sat Apr 15 08:42:27 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 15 Apr 2006 01:42:27 -0700
Subject: rpms/gnochm/FC-5 gnochm.spec,1.2,1.3
Message-ID: <200604150842.k3F8gT5Z006496@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/gnochm/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6447/FC-5

Modified Files:
	gnochm.spec 
Log Message:
* Sat Apr 15 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-5
- add gnome related requires (189034)



Index: gnochm.spec
===================================================================
RCS file: /cvs/extras/rpms/gnochm/FC-5/gnochm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnochm.spec	14 Apr 2006 11:48:16 -0000	1.2
+++ gnochm.spec	15 Apr 2006 08:42:27 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gnochm
 Version:        0.9.7
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        CHM file viewer
 
 Group:          Applications/Publishing
@@ -11,7 +11,8 @@
 
 BuildArch:      noarch
 BuildRequires:  gettext
-Requires:       python-chm
+Requires:       python-chm gnome-python2-gconf pygtk2-libglade 
+Requires:       gnome-python2-gtkhtml2
 
 Requires(pre): GConf2
 Requires(post): GConf2
@@ -117,6 +118,9 @@
 %{_datadir}/pixmaps/gnochm*.png
 
 %changelog
+* Sat Apr 15 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-5
+- add gnome related requires (189034)
+
 * Thu Apr 13 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-4
 - Add mimetype to .desktop file (188809)
 



From fedora-extras-commits at redhat.com  Sat Apr 15 08:42:27 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 15 Apr 2006 01:42:27 -0700
Subject: rpms/gnochm/devel gnochm.spec,1.3,1.4
Message-ID: <200604150842.k3F8gTFB006500@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/gnochm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6447/devel

Modified Files:
	gnochm.spec 
Log Message:
* Sat Apr 15 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-5
- add gnome related requires (189034)



Index: gnochm.spec
===================================================================
RCS file: /cvs/extras/rpms/gnochm/devel/gnochm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnochm.spec	13 Apr 2006 09:56:36 -0000	1.3
+++ gnochm.spec	15 Apr 2006 08:42:27 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           gnochm
 Version:        0.9.7
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        CHM file viewer
 
 Group:          Applications/Publishing
@@ -11,7 +11,8 @@
 
 BuildArch:      noarch
 BuildRequires:  gettext
-Requires:       python-chm
+Requires:       python-chm gnome-python2-gconf pygtk2-libglade 
+Requires:       gnome-python2-gtkhtml2
 
 Requires(pre): GConf2
 Requires(post): GConf2
@@ -117,6 +118,9 @@
 %{_datadir}/pixmaps/gnochm*.png
 
 %changelog
+* Sat Apr 15 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-5
+- add gnome related requires (189034)
+
 * Thu Apr 13 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-4
 - Add mimetype to .desktop file (188809)
 



From fedora-extras-commits at redhat.com  Sat Apr 15 09:41:35 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 15 Apr 2006 02:41:35 -0700
Subject: comps comps-fe5.xml.in,1.36,1.37
Message-ID: <200604150941.k3F9fbBs009005@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8988/comps

Modified Files:
	comps-fe5.xml.in 
Log Message:
add crystal-stacker


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- comps-fe5.xml.in	9 Apr 2006 07:28:28 -0000	1.36
+++ comps-fe5.xml.in	15 Apr 2006 09:41:35 -0000	1.37
@@ -200,6 +200,8 @@
         <packagereq type="optional">bzflag</packagereq>
         <packagereq type="optional">celestia</packagereq>
         <packagereq type="optional">cgoban</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">fillets-ng</packagereq>



From fedora-extras-commits at redhat.com  Sat Apr 15 09:46:34 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sat, 15 Apr 2006 02:46:34 -0700
Subject: rpms/gobby/devel gobby-0.4.0rc1-nodoclist.patch, NONE,
	1.1 .cvsignore, 1.4, 1.5 gobby.spec, 1.7, 1.8 sources, 1.4, 1.5
Message-ID: <200604150946.k3F9kabh009054@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/gobby/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9030

Modified Files:
	.cvsignore gobby.spec sources 
Added Files:
	gobby-0.4.0rc1-nodoclist.patch 
Log Message:
0.4.0rc1

gobby-0.4.0rc1-nodoclist.patch:

--- NEW FILE gobby-0.4.0rc1-nodoclist.patch ---
--- Makefile.in.orig	2006-04-15 05:32:45.000000000 -0400
+++ Makefile.in	2006-04-15 05:32:48.000000000 -0400
@@ -354,7 +354,6 @@
 @WITH_GNOME_TRUE at appicondir = $(datadir)/pixmaps
 @WITH_GNOME_TRUE at appicon_DATA = contrib/artwork/gobby.png \
 @WITH_GNOME_TRUE@	contrib/artwork/userlist.png \
- at WITH_GNOME_TRUE@	contrib/artwork/doclist.png \
 @WITH_GNOME_TRUE@	contrib/artwork/chat.png
 @WITH_GNOME_TRUE at desktopdir = $(datadir)/applications
 @WITH_GNOME_TRUE at desktop_DATA = contrib/gobby.desktop
--- Makefile.am.orig	2006-04-15 05:38:23.000000000 -0400
+++ Makefile.am	2006-04-15 05:38:29.000000000 -0400
@@ -132,7 +132,6 @@
 appicondir = $(datadir)/pixmaps
 appicon_DATA  = contrib/artwork/gobby.png
 appicon_DATA += contrib/artwork/userlist.png
-appicon_DATA += contrib/artwork/doclist.png
 appicon_DATA += contrib/artwork/chat.png
 desktopdir = $(datadir)/applications
 desktop_DATA = contrib/gobby.desktop


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gobby/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Dec 2005 09:13:30 -0000	1.4
+++ .cvsignore	15 Apr 2006 09:46:34 -0000	1.5
@@ -1 +1 @@
-gobby-0.3.0.tar.gz
+gobby-0.4.0rc1.tar.gz


Index: gobby.spec
===================================================================
RCS file: /cvs/extras/rpms/gobby/devel/gobby.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gobby.spec	15 Feb 2006 22:09:21 -0000	1.7
+++ gobby.spec	15 Apr 2006 09:46:34 -0000	1.8
@@ -1,12 +1,15 @@
+%define _rc  rc1
+
 Name:           gobby
-Version:        0.3.0
-Release:        4%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        Free collaborative editor
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://gobby.0x539.de
-Source0:        http://releases.0x539.de/gobby/%{name}-%{version}.tar.gz
+Source0:        http://releases.0x539.de/gobby/%{name}-%{version}%{_rc}.tar.gz
+Patch0:         %{name}-%{version}%{_rc}-nodoclist.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml++-devel, gtksourceview-devel, gtkmm24-devel, obby-devel
@@ -25,7 +28,8 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{_rc}
+%patch0
 
 
 %build
@@ -59,13 +63,16 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc README NEWS AUTHORS COPYING ChangeLog TODO
+%doc README NEWS AUTHORS COPYING ChangeLog
 %{_bindir}/gobby
 %{_datadir}/applications/fedora-gobby.desktop
 %{_datadir}/pixmaps/*
 
 
 %changelog
+* Sat Apr 15 2006 Luke Macken <lmacken at redhat.com> - 0.4.0-1.rc1
+- 0.4.0rc1
+
 * Wed Feb 15 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-4
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gobby/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Dec 2005 09:13:30 -0000	1.4
+++ sources	15 Apr 2006 09:46:34 -0000	1.5
@@ -1 +1 @@
-1b674f42654cc1960d37e0a6a2fcff1f  gobby-0.3.0.tar.gz
+f2839d46a2dcb1efff4fe79c23b78ef1  gobby-0.4.0rc1.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 15 12:16:30 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Sat, 15 Apr 2006 05:16:30 -0700
Subject: rpms/mod_security/FC-3 .cvsignore, 1.4, 1.5 mod_security.spec, 1.9, 
	1.10 sources, 1.5, 1.6
Message-ID: <200604151216.k3FCGWcc019710@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_security/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19689

Modified Files:
	.cvsignore mod_security.spec sources 
Log Message:
* Sat Apr 15 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.3-1
- New upstream release
- Minor spec tweak.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 Jan 2006 03:12:42 -0000	1.4
+++ .cvsignore	15 Apr 2006 12:16:30 -0000	1.5
@@ -1 +1 @@
-modsecurity-apache-1.9.2.tar.gz
+modsecurity-apache_1.9.3.tar.gz


Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-3/mod_security.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mod_security.spec	18 Jan 2006 03:12:42 -0000	1.9
+++ mod_security.spec	15 Apr 2006 12:16:30 -0000	1.10
@@ -1,6 +1,6 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 1.9.2
+Version: 1.9.3
 Release: 1%{?dist}
 License: GPL
 URL: http://www.modsecurity.org/
@@ -37,9 +37,13 @@
 %defattr (-,root,root)
 %doc CHANGES LICENSE INSTALL README httpd* util doc
 %{_libdir}/httpd/modules/mod_security.so
-%config(noreplace) /etc/httpd/conf.d/mod_security.conf
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_security.conf
 
 %changelog
+* Sat Apr 15 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.3-1
+- New upstream release
+- Minor spec tweak.
+
 * Wed Jan 18 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.2-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	18 Jan 2006 03:12:42 -0000	1.5
+++ sources	15 Apr 2006 12:16:30 -0000	1.6
@@ -1 +1 @@
-c28b66f02adb1ddb2d0885483f6f8e0e  modsecurity-apache-1.9.2.tar.gz
+cd5585488e2499c4218a4b13419c3065  modsecurity-apache_1.9.3.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 15 12:22:31 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Sat, 15 Apr 2006 05:22:31 -0700
Subject: rpms/mod_security/FC-3 mod_security.spec,1.10,1.11
Message-ID: <200604151222.k3FCMXJb019781@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_security/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19764

Modified Files:
	mod_security.spec 
Log Message:
Fix braino in last commit (forgot to change "-" to "_" in tarball &
directory names hence the build failed.)



Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-3/mod_security.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mod_security.spec	15 Apr 2006 12:16:30 -0000	1.10
+++ mod_security.spec	15 Apr 2006 12:22:31 -0000	1.11
@@ -1,11 +1,11 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
 Version: 1.9.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 URL: http://www.modsecurity.org/
 Group: System Environment/Daemons
-Source: http://www.modsecurity.org/download/modsecurity-apache-%{version}.tar.gz
+Source: http://www.modsecurity.org/download/modsecurity-apache_%{version}.tar.gz
 Source1: mod_security.conf
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: httpd  httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat %{_includedir}/httpd/.mmn || echo missing)
@@ -18,7 +18,7 @@
 
 %prep
 
-%setup -q -n modsecurity-apache-%{version}
+%setup -q -n modsecurity-apache_%{version}
 
 %build
 /usr/sbin/apxs -Wc,"%{optflags}" -c apache2/mod_security.c
@@ -40,9 +40,9 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_security.conf
 
 %changelog
-* Sat Apr 15 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.3-1
+* Sat Apr 15 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.3-2
 - New upstream release
-- Minor spec tweak.
+- Minor spec tweaks.
 
 * Wed Jan 18 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.2-1
 - New upstream release



From fedora-extras-commits at redhat.com  Sat Apr 15 12:26:16 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Sat, 15 Apr 2006 05:26:16 -0700
Subject: fedora-security/audit fc4,1.202,1.203 fc5,1.115,1.116
Message-ID: <200604151226.k3FCQGiE019845@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19825

Modified Files:
	fc4 fc5 
Log Message:
Add all the firefox suite issues



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- fc4	12 Apr 2006 08:08:47 -0000	1.202
+++ fc4	15 Apr 2006 12:26:14 -0000	1.203
@@ -1,8 +1,64 @@
-Up to date CVE as of CVE email 20060411
+Up to date CVE as of CVE email 20060414
 Up to date FC4 as of 20060411
 
 ** are items that need attention
 
+CVE-2006-1790 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1790 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-1790 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1742 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-1742 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1742 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1741 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-1741 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1741 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1740 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1740 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1739 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-1739 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1739 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1738 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-1738 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1738 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1737 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-1737 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1737 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1736 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1736 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1735 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1735 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-1735 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1734 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1734 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-1734 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1733 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1733 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-1733 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1732 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1732 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-1732 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1731 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1731 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-1731 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1730 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1730 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-1730 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1729 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1729 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1728 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-1728 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1728 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1727 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-1727 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1727 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1726 version (firefox, fixed 1.5.0.2) 1.5 only
+CVE-2006-1726 version (thunderbird, fixed 1.5.0.2) 1.5 only
+CVE-2006-1725 version (firefox, fixed 1.5.0.2) 1.5 only
+CVE-2006-1724 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-1724 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1724 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1723 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-1723 VULNERABLE (firefox, fixed 1.0.8)
 CVE-2006-1721 ** cyrus-sasl
 CVE-2006-1712 version (mailman, only 2.1.7)
 CVE-2006-1650 ** firefox
@@ -15,6 +71,12 @@
 CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1542 VULNERABLE (python) bz#169046
+CVE-2006-1531 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-1531 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1530 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-1530 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1529 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-1529 VULNERABLE (firefox, fixed 1.0.8)
 CVE-2006-1523 VULNERABLE (kernel, fixed 2.6.16.4)
 CVE-2006-1522 VULNERABLE (kernel, fixed 2.6.16.3)
 CVE-2006-1494 VULNERABLE (php)
@@ -41,6 +103,12 @@
 CVE-2006-0903 VULNERABLE (mysql) bz#183261
 CVE-2006-0884 ** thunderbird
 CVE-2006-0836 version (thunderbird, 1.5 only)
+CVE-2006-0749 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-0749 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-0749 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-0748 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-0748 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-0748 VULNERABLE (firefox, fixed 1.0.8)
 CVE-2006-0746 VULNERABLE (kpdf) bz#184308
 CVE-2006-0745 version (xorg-x11) not fc4
 CVE-2006-0744 VULNERABLE (kernel)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- fc5	12 Apr 2006 08:08:47 -0000	1.115
+++ fc5	15 Apr 2006 12:26:14 -0000	1.116
@@ -1,8 +1,64 @@
-Up to date CVE as of CVE email 20060411
+Up to date CVE as of CVE email 20060414
 Up to date FC5 as of 20060411
 
 ** are items that need attention
 
+CVE-2006-1790 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1790 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-1790 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1742 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-1742 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1742 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1741 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-1741 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1741 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1740 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1740 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1739 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-1739 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1739 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1738 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-1738 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1738 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1737 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-1737 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1737 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1736 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1736 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1735 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1735 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-1735 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1734 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1734 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-1734 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1733 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1733 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-1733 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1732 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1732 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-1732 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1731 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1731 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-1731 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1730 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1730 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-1730 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1729 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1729 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1728 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-1728 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1728 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1727 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-1727 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1727 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1726 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1726 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-1725 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1724 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-1724 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1724 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1723 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-1723 VULNERABLE (firefox, fixed 1.5.0.2)
 CVE-2006-1721 ** cyrus-sasl
 CVE-2006-1712 version (mailman, only 2.1.7)
 CVE-2006-1650 ** firefox
@@ -14,6 +70,12 @@
 CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1542 VULNERABLE (python) bz#169046
+CVE-2006-1531 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-1531 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1530 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-1530 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1529 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-1529 VULNERABLE (firefox, fixed 1.5.0.2)
 CVE-2006-1523 VULNERABLE (kernel, fixed 2.6.16.4)
 CVE-2006-1522 VULNERABLE (kernel, fixed 2.6.16.3)
 CVE-2006-1494 VULNERABLE (php)
@@ -42,6 +104,12 @@
 CVE-2006-0903 VULNERABLE (mysql) low/not upstream yet
 CVE-2006-0884 VULNERABLE (thunderbird)
 CVE-2006-0836 VULNERABLE (thunderbird)
+CVE-2006-0749 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-0749 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-0749 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-0748 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-0748 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-0748 VULNERABLE (firefox, fixed 1.5.0.2)
 CVE-2006-0746 version (kdegraphics, fixed 3.4)
 CVE-2006-0745 backport (xorg-x11) [since FEDORA-2006-172]
 CVE-2006-0744 VULNERABLE (kernel)



From fedora-extras-commits at redhat.com  Sat Apr 15 13:40:23 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 15 Apr 2006 06:40:23 -0700
Subject: rpms/libassetml - New directory
Message-ID: <200604151340.k3FDePo5022094@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libassetml
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22073/libassetml

Log Message:
Directory /cvs/extras/rpms/libassetml added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 15 13:40:23 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 15 Apr 2006 06:40:23 -0700
Subject: rpms/libassetml/devel - New directory
Message-ID: <200604151340.k3FDePD3022097@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libassetml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22073/libassetml/devel

Log Message:
Directory /cvs/extras/rpms/libassetml/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 15 13:40:42 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 15 Apr 2006 06:40:42 -0700
Subject: rpms/libassetml Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604151340.k3FDeijJ022156@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libassetml
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22123

Added Files:
	Makefile import.log 
Log Message:
Setup of module libassetml


--- NEW FILE Makefile ---
# Top level Makefile for module libassetml
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 15 13:40:42 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 15 Apr 2006 06:40:42 -0700
Subject: rpms/libassetml/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604151340.k3FDeieV022159@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libassetml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22123/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libassetml


--- 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 Apr 15 13:41:24 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 15 Apr 2006 06:41:24 -0700
Subject: rpms/libassetml/devel libassetml.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604151341.k3FDfunL022227@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libassetml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22189/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libassetml.spec 
Log Message:
auto-import libassetml-1.2.1-1 on branch devel from libassetml-1.2.1-1.src.rpm


--- NEW FILE libassetml.spec ---
Name:		libassetml
Version: 	1.2.1
Release:        1%{?dist}
Summary:        XML resource database library
Group:          System Environment/Libraries
License:	GPL  
URL:		http://sourceforge.net/projects/ofset/
Source0:        http://download.sourceforge.net/ofset/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	glib2-devel libxml2-devel texinfo texi2html

%description
AssetML defines an xml file that can be used by application developers as a
resource database. The idea is to have a way to search content on your hard
drive with metadata (like name, category, file type, description) instead of
just a file name. This way, users can browse content more easily and developers
can share content more easily.


%package devel
Summary:	Libraries and include files for libassetml
Group:		Development/Libraries
Requires:	%{name} = %{version}
Requires:	glib2-devel
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info

%description devel
Development libraries for libassetml


%prep
%setup -q
# make rpmlint happy
chmod -x src/tools/assetml-query.c


%build
%configure
make %{?_smp_mflags}
iconv -f ISO-8859-1 -t UTF8 docs/C/libassetml.info > docs/C/libassetml.tmp
mv docs/C/libassetml.tmp docs/C/libassetml.info


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/assetml
%find_lang %{name}
rm $RPM_BUILD_ROOT/%{_libdir}/%{name}.la
rm -f $RPM_BUILD_ROOT/%{_infodir}/dir


%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


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README THANKS
%{_bindir}/assetml-query
%{_libdir}/*.so.*
%dir %{_datadir}/assetml

%files devel
%{_includedir}/%{name}-1.0
%{_libdir}/*.so
%{_libdir}/pkgconfig/%{name}.pc
%{_datadir}/gnome/
%{_infodir}/%{name}.info.gz


%changelog
* Mon Apr 10 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.1-1
- Initial spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libassetml/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Apr 2006 13:40:42 -0000	1.1
+++ .cvsignore	15 Apr 2006 13:41:24 -0000	1.2
@@ -0,0 +1 @@
+libassetml-1.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libassetml/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Apr 2006 13:40:42 -0000	1.1
+++ sources	15 Apr 2006 13:41:24 -0000	1.2
@@ -0,0 +1 @@
+4b10fd0fb8e00a4fb526665413479516  libassetml-1.2.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 15 13:41:23 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 15 Apr 2006 06:41:23 -0700
Subject: rpms/libassetml import.log,1.1,1.2
Message-ID: <200604151341.k3FDftKn022223@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libassetml
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22189

Modified Files:
	import.log 
Log Message:
auto-import libassetml-1.2.1-1 on branch devel from libassetml-1.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libassetml/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Apr 2006 13:40:41 -0000	1.1
+++ import.log	15 Apr 2006 13:41:23 -0000	1.2
@@ -0,0 +1 @@
+libassetml-1_2_1-1:HEAD:libassetml-1.2.1-1.src.rpm:1145108357



From fedora-extras-commits at redhat.com  Sat Apr 15 13:42:34 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 15 Apr 2006 06:42:34 -0700
Subject: owners owners.list,1.843,1.844
Message-ID: <200604151342.k3FDgaiS022276@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22259/owners

Modified Files:
	owners.list 
Log Message:
add libassetml


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.843
retrieving revision 1.844
diff -u -r1.843 -r1.844
--- owners.list	15 Apr 2006 01:53:38 -0000	1.843
+++ owners.list	15 Apr 2006 13:42:34 -0000	1.844
@@ -566,6 +566,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|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|libbinio|A binary stream interface class library for C++|triad at df.lth.se|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|



From fedora-extras-commits at redhat.com  Sat Apr 15 16:04:07 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 15 Apr 2006 09:04:07 -0700
Subject: owners owners.list,1.844,1.845
Message-ID: <200604151604.k3FG49fK028816@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28799

Modified Files:
	owners.list 
Log Message:
Use my _bugzilla_ email


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.844
retrieving revision 1.845
diff -u -r1.844 -r1.845
--- owners.list	15 Apr 2006 13:42:34 -0000	1.844
+++ owners.list	15 Apr 2006 16:04:07 -0000	1.845
@@ -1223,7 +1223,7 @@
 Fedora Extras|python-enchant|Python bindings for Enchant spellchecking library|roozbeh at farsiweb.info|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.|ivazquez at ivazquez.net|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|
+Fedora Extras|python-fpconst|A Python module for handling IEEE 754 floating point special values|tkmame at retrogames.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-GeoIP|Python bindings for the GeoIP geographical lookup libraries|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-goopy|Google Python Utilities|pjones at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-HTMLgen|A class library for the generation of HTML documents|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Apr 15 16:58:44 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 15 Apr 2006 09:58:44 -0700
Subject: rpms/xemacs/devel xemacs-21.5.26-gtk-gcc4.patch, NONE,
	1.1 xemacs-21.5.26-utf8-fonts.patch, NONE, 1.1 xemacs.spec, 1.22,
	1.23 xemacs-21.5.25-utf8-fonts.patch, 1.1, NONE
Message-ID: <200604151658.k3FGwkbQ029021@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28998

Modified Files:
	xemacs.spec 
Added Files:
	xemacs-21.5.26-gtk-gcc4.patch xemacs-21.5.26-utf8-fonts.patch 
Removed Files:
	xemacs-21.5.25-utf8-fonts.patch 
Log Message:
* Sat Apr 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 21.5.26-3
- Don't expect to find ellcc if building without modules (#188929).
- New --with/--without rpmbuild flags:
  - xft: enable/disable Xft support, default disabled.
  - nox: enable/disable building the non-X version, default enabled
  - modules: enable/disable module support, default arch-dependent.
- Re-enable XFontSet support for menubars for non-Xft builds (from openSUSE).
- Move gnuserv to -common, gnudoit to base package, drop gnuattach.
- Split ellcc and headers to -devel subpackage.
- Drop unneeded libXaw-devel build dependency.
- Move -nox "man page" to -nox subpackage.
- Fix GTK build and glade detection for it.
- Avoid -common dependency on ALSA.


xemacs-21.5.26-gtk-gcc4.patch:

--- NEW FILE xemacs-21.5.26-gtk-gcc4.patch ---
--- xemacs-21.5.26/src/glyphs-gtk.c~	2005-11-22 13:24:44.000000000 +0200
+++ xemacs-21.5.26/src/glyphs-gtk.c	2006-04-14 23:57:23.000000000 +0300
@@ -796,7 +796,7 @@
     find_keyword_in_vector (instantiator, Q_file);
 
   IMAGE_INSTANCE_GTK_PIXMAP (ii) = pixmap;
-  IMAGE_INSTANCE_GTK_MASK (ii) = 0;
+  IMAGE_INSTANCE_PIXMAP_MASK (ii) = 0;
   IMAGE_INSTANCE_PIXMAP_WIDTH (ii) = gdk_image->width;
   IMAGE_INSTANCE_PIXMAP_HEIGHT (ii) = gdk_image->height;
   IMAGE_INSTANCE_PIXMAP_DEPTH (ii) = gdk_image->depth;
@@ -837,7 +837,7 @@
 
   IMAGE_INSTANCE_PIXMAP_FILENAME (ii) = Qnil;
   IMAGE_INSTANCE_GTK_PIXMAP (ii) = gdk_pixmap;
-  IMAGE_INSTANCE_GTK_MASK (ii) = 0;
+  IMAGE_INSTANCE_PIXMAP_MASK (ii) = 0;
   IMAGE_INSTANCE_PIXMAP_WIDTH (ii) = width;
   IMAGE_INSTANCE_PIXMAP_HEIGHT (ii) = height;
   IMAGE_INSTANCE_PIXMAP_DEPTH (ii) = depth;
@@ -2972,7 +2972,7 @@
       IMAGE_INSTANCE_TYPE (p) = IMAGE_COLOR_PIXMAP;
       /* Make sure there aren't two pointers to the same mask, causing
 	 it to get freed twice. */
-      IMAGE_INSTANCE_GTK_MASK (p) = 0;
+      IMAGE_INSTANCE_PIXMAP_MASK (p) = 0;
       break;
 
     default:

xemacs-21.5.26-utf8-fonts.patch:

--- NEW FILE xemacs-21.5.26-utf8-fonts.patch ---
--- xemacs-21.5.26/etc/Emacs.ad.orig	2003-03-27 14:57:44.000000000 +0200
+++ xemacs-21.5.26/etc/Emacs.ad	2006-04-14 20:37:56.000000000 +0300
@@ -198,8 +198,12 @@
 ! *menubar*FontSet:	-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \
 !			-*-*-*-*-*-*-*-120-*-jisx0208.1983-0
 !
-*menubar*Font:			-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*
-*popup*Font:			-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*
+*menubar*Font:			-*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-*
+*popup*Font:			-*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-*
+
+XEmacs*FontSet:			-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso10646-1, \
+				-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \
+				*
 *menubar*FontSet:		-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \
  			        -*-*-*-*-*-*-*-120-*-iso10646-1, \
  			        -*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \
@@ -211,7 +215,7 @@
 
 ! Gui elements share this font
 !
-Emacs.gui-element.attributeFont:  -*-helvetica-medium-r-*-*-*-120-*-*-*-*-iso8859-*
+Emacs.gui-element.attributeFont:  -*-helvetica-medium-r-*-*-*-120-*-*-*-*-*-*
 
 ! Font in the Motif dialog boxes.
 ! (Motif uses `fontList' while most other things use `font' - if you don't
@@ -227,7 +231,7 @@
 ! Some people use 12-point anyway because you get more text, but
 ! there's no purpose at all in doing this for dialog boxes.
 
-*Dialog*Font:			-*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-*
+*Dialog*Font:			-*-helvetica-bold-r-*-*-*-140-*-*-*-*-*-*
 
 ! Dialog box translations.
 ! =======================


Index: xemacs.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xemacs.spec	6 Apr 2006 16:27:53 -0000	1.22
+++ xemacs.spec	15 Apr 2006 16:58:44 -0000	1.23
@@ -1,24 +1,26 @@
-# TODO: xft build option
-# TODO: site-modules vs site-lisp -> to same dir (are modules noarch?)
 # TODO: review desktop entry associations
-# TODO: split off -devel?
 # TODO: zero-length /usr/share/xemacs-21.5-b26/lisp/dump-paths.el
 # TODO: non-ASCII in buffer tabs
-# TODO: re-enable XFontSet support for menubars? --> see suse fontset patch
 # TODO: build issues if previous 21.5.x installed, restore finder-inf stuff?
-# TODO: gtk+ build doesn't find glade, need pkg-config libglade --cflags
-# TODO: gtk+ build fails, invalid lvalues
+# TODO: fix --without modules build (../modules/canna_api.o not found?)
 
 %bcond_with     gtk
 %bcond_with     xaw3d
+%bcond_with     xft
 %bcond_without  mule
+%bcond_without  nox
 %bcond_without  stackprot
+%ifarch ia64
+%bcond_with     modules
+%else
+%bcond_without  modules
+%endif
 
 %define xver    %(echo %{version} | sed -e 's/\\.\\([0-9]\\+\\)$/-b\\1/')
 
 Name:           xemacs
 Version:        21.5.26
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -31,13 +33,15 @@
 Source4:        default.el
 Source5:        xemacs-sitestart.el
 
-Patch0:         %{name}-21.5.25-utf8-fonts.patch
+Patch0:         %{name}-21.5.26-utf8-fonts.patch
 Patch1:         %{name}-21.5.25-x-paths.patch
 # TODO: patch2 still needed with --with-system-packages???
 Patch2:         %{name}-21.5.25-find-paths-pkgdir.patch
 Patch3:         %{name}-21.5.25-mk-nochk-features.patch
 Patch4:         %{name}-21.5.26-no-expdyn-ia64-106744.patch
 Patch5:         %{name}-21.5.25-wnnfix-128362.patch
+# http://www.archivum.info/comp.emacs.xemacs/2005-08/msg00047.html
+Patch6:         %{name}-21.5.26-gtk-gcc4.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -57,25 +61,24 @@
 BuildRequires:  Canna-devel
 BuildRequires:  FreeWnn-devel
 %endif # mule
-
 BuildRequires:  xmkmf
 BuildRequires:  libXau-devel
 BuildRequires:  libXpm-devel
 BuildRequires:  alsa-lib-devel
-# TODO: verify this wrt gtk/xaw3d build
-BuildRequires:  xorg-x11-xbitmaps
 %if %{with gtk}
 BuildRequires:  gtk+-devel
 BuildRequires:  libglade-devel
-%else
-# TODO: verify this wrt xaw3d
-BuildRequires:  libXaw-devel
+%else  # gtk
+BuildRequires:  xorg-x11-xbitmaps
 %if %{with xaw3d}
 BuildRequires:  Xaw3d-devel
-%else
+%else  # xaw3d
 BuildRequires:  neXtaw-devel
 %endif # xaw3d
 %endif # gtk
+%if %{with xft}
+BuildRequires:  libXft-devel
+%endif # xft
 Requires:       xemacs-sumo >= 20050118-2
 Requires:       xemacs-common = %{version}-%{release}
 Requires:       xorg-x11-fonts-ISO8859-1-75dpi
@@ -149,6 +152,20 @@
 
 This package contains XEmacs documentation in GNU texinfo format.
 
+%package        devel
+Summary:        Development files for XEmacs
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description    devel
+XEmacs is a highly customizable open source text editor and
+application development system.  It is protected under the GNU General
+Public License and related to other versions of Emacs, in particular
+GNU Emacs.  Its emphasis is on modern graphical user interface support
+and an open software development model, similar to Linux.
+
+This package contains XEmacs development support files.
+
 
 %prep
 %setup -q
@@ -164,6 +181,7 @@
 %patch4 -p1
 %endif
 %patch5 -p1
+%patch6 -p1
 
 for f in man/lispref/mule.texi man/xemacs-faq.texi ; do
     iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f
@@ -179,6 +197,9 @@
 CFLAGS="$(echo $CFLAGS | sed -e 's/-fstack-protector\s*//g')"
 CFLAGS="$(echo $CFLAGS | sed -e 's/--param=ssp-buffer-size=[0-9]\+\s*//')"
 %endif
+%if %{with gtk}
+CFLAGS="$CFLAGS $(pkg-config libglade --cflags)"
+%endif
 export CFLAGS
 export EMACSLOADPATH=$PWD/lisp
 
@@ -199,15 +220,15 @@
 %ifarch alpha ia64 ppc64
     --with-system-malloc
 %endif
-%ifarch ia64
+%if ! %{with modules}
     --without-modules
 %endif
 "
 
+%if %{with nox}
 # build without X
-# note: docdir requires trailing slash # TODO: still in 21.5?
 %configure $common_options \
-    --with-docdir=%{_libdir}/xemacs-%{xver}/doc-nox/ \
+    --with-docdir=%{_libdir}/xemacs-%{xver}/doc-nox \
     --with-sound=none \
     --without-x \
     --without-canna \
@@ -220,11 +241,14 @@
 mv lib-src/DOC{,-nox}
 mv src/xemacs{,-nox-%{xver}}
 mv lib-src/config.values{,-nox}
+# grab these from -nox, the X ones may have deps on ALSA, X, etc
+for file in {e,oo}tags gnuserv {fake,move}mail yow ; do
+    mv lib-src/$file{,-mindep}
+done
+%endif # nox
 
 # build with X
-# note: docdir requires trailing slash # TODO: still in 21.5?
 %configure $common_options \
-    --with-docdir=%{_libdir}/xemacs-%{xver}/doc/ \
 %if %{with gtk}
     --with-gtk \
     --with-gnome \
@@ -236,7 +260,12 @@
     --with-scrollbars=lucid \
     --with-dialogs=athena \
 %endif
-    --without-xfs
+%if %{with xft}
+    --with-xft=all \
+%else
+    --with-xfs \
+%endif
+    --with-docdir=%{_libdir}/xemacs-%{xver}/doc
 # toplevel smp build fails
 make %{?_smp_mflags} -C lib-src
 make src/Emacs.ad.h
@@ -249,14 +278,19 @@
 
 export EMACSLOADPATH=$PWD/lisp
 
+%if %{with nox}
+# restore binaries with less dependencies; note: no -p nor move
+for file in lib-src/*-mindep ; do cp $file ${file%%-mindep} ; done
+%endif
+
 # note: no DESTDIR support
-# note: docdir requires trailing slash # TODO: still in 21.5?
 %makeinstall \
     mandir=$RPM_BUILD_ROOT%{_mandir}/man1 \
-    docdir=$RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc/
-echo ".so man1/xemacs.1" > $RPM_BUILD_ROOT%{_mandir}/man1/xemacs-nox.1
+    docdir=$RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc
 
+%if %{with nox}
 # install nox files
+echo ".so man1/xemacs.1" > $RPM_BUILD_ROOT%{_mandir}/man1/xemacs-nox.1
 install -pm 755 src/xemacs-nox-%{xver} $RPM_BUILD_ROOT%{_bindir}
 ln -s xemacs-nox-%{xver} $RPM_BUILD_ROOT%{_bindir}/xemacs-nox
 install -dm 755 $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-nox
@@ -264,6 +298,7 @@
     $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-nox/DOC
 install -pm 644 lib-src/config.values-nox \
     $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-nox/config.values
+%endif # nox
 
 # these clash with GNU Emacs
 mv $RPM_BUILD_ROOT%{_bindir}/etags{,.xemacs}
@@ -309,8 +344,9 @@
 # clean up unneeded stuff (TODO: there's probably much more)
 find $RPM_BUILD_ROOT%{_prefix} -name "*~" | xargs rm
 rm $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/*linux/gzip-el.sh
+rm $RPM_BUILD_ROOT{%{_bindir}/gnuattach,%{_mandir}/man1/gnuattach.1}
 cd $RPM_BUILD_ROOT%{_datadir}/xemacs-%{xver}/etc
-rm -r InstallGuide sparcworks tests XKeysymDB *.sco *.1
+rm -r editclient.sh InstallGuide sparcworks tests XKeysymDB *.sco *.1
 cd -
 
 # separate files
@@ -388,53 +424,85 @@
 
 %files
 %defattr(-,root,root,-)
+# gnuclient needs X libs, so not in -common
+%{_bindir}/gnuclient
+%{_bindir}/gnudoit
 %ghost %{_bindir}/xemacs
 %{_bindir}/xemacs-%{xver}
-# gnuclient, gnuserv need X libs, so not in -common
-%{_bindir}/gnuclient
-%{_libdir}/xemacs-%{xver}/*linux/gnuserv
 %{_libdir}/xemacs-%{xver}/doc/
+%if %{with modules}
+%{_libdir}/xemacs-%{xver}/*linux/modules/canna_api.ell
+%endif
 %{_datadir}/applications/*-%{name}.desktop
 %{_datadir}/icons/hicolor/48x48/apps/xemacs.png
 %{_mandir}/man1/gnuclient.1*
-%{_mandir}/man1/gnuserv.1*
+%{_mandir}/man1/gnudoit.1*
 
+%if %{with nox}
 %files nox
 %defattr(-,root,root,-)
 %ghost %{_bindir}/xemacs
 %{_bindir}/xemacs-nox
 %{_bindir}/xemacs-nox-%{xver}
 %{_libdir}/xemacs-%{xver}/doc-nox/
+%{_mandir}/man1/xemacs-nox.1*
+%endif
 
 %files common -f base-files
 %defattr(-,root,root,-)
 %doc INSTALL README COPYING PROBLEMS CHANGES-beta etc/NEWS etc/TUTORIAL
 %doc etc/editclient.sh
-%{_bindir}/ellcc
 %{_bindir}/etags.xemacs
-%{_bindir}/gnuattach
-%{_bindir}/gnudoit
 %{_bindir}/ootags
 %{_libdir}/xemacs/
 %dir %{_libdir}/xemacs-%{xver}
 %dir %{_libdir}/xemacs-%{xver}/*linux/
-%{_libdir}/xemacs-%{xver}/*linux/[acdfhimprsvwy]*
+%{_libdir}/xemacs-%{xver}/*linux/[acdfghprsvwy]*
+%{_libdir}/xemacs-%{xver}/*linux/m[am]*
+%{_libdir}/xemacs-%{xver}/*linux/movemail
+%if %{with modules}
+%dir %{_libdir}/xemacs-%{xver}/*linux/modules/
+%{_libdir}/xemacs-%{xver}/*linux/modules/auto-autoloads.elc
+%endif
 %config(noreplace) %{_sysconfdir}/skel/.xemacs/
 %{_mandir}/man1/etags.xemacs.1*
-%{_mandir}/man1/gnuattach.1*
-%{_mandir}/man1/gnudoit.1*
-%{_mandir}/man1/xemacs*.1*
+%{_mandir}/man1/gnuserv.1*
+%{_mandir}/man1/xemacs.1*
 %dir %{_localstatedir}/lock/xemacs/
 
 %files el -f el-files
 %defattr(-,root,root,-)
+%if %{with modules}
+%{_libdir}/xemacs-%{xver}/*linux/modules/auto-autoloads.el
+%endif
 
 %files info -f info-files
 %defattr(-,root,root,-)
 %{_infodir}/*.info*
 
+%files devel
+%defattr(-,root,root,-)
+%if %{with modules}
+%{_bindir}/ellcc
+%endif
+%{_libdir}/xemacs-%{xver}/*linux/include/
+
 
 %changelog
+* Sat Apr 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 21.5.26-3
+- Don't expect to find ellcc if building without modules (#188929).
+- New --with/--without rpmbuild flags:
+  - xft: enable/disable Xft support, default disabled.
+  - nox: enable/disable building the non-X version, default enabled
+  - modules: enable/disable module support, default arch-dependent.
+- Re-enable XFontSet support for menubars for non-Xft builds (from openSUSE).
+- Move gnuserv to -common, gnudoit to base package, drop gnuattach.
+- Split ellcc and headers to -devel subpackage.
+- Drop unneeded libXaw-devel build dependency.
+- Move -nox "man page" to -nox subpackage.
+- Fix GTK build and glade detection for it.
+- Avoid -common dependency on ALSA.
+
 * Thu Apr  6 2006 Ville Skytt?? <ville.skytta at iki.fi> - 21.5.26-2
 - Borrow Mike Fabian's site-start.el work from the SuSE package.
 


--- xemacs-21.5.25-utf8-fonts.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Apr 15 18:41:11 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 15 Apr 2006 11:41:11 -0700
Subject: rpms/embryo - New directory
Message-ID: <200604151841.k3FIfDRr000947@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/embryo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv919/embryo

Log Message:
Directory /cvs/extras/rpms/embryo added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 15 18:41:12 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 15 Apr 2006 11:41:12 -0700
Subject: rpms/embryo/devel - New directory
Message-ID: <200604151841.k3FIfEW7000950@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/embryo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv919/embryo/devel

Log Message:
Directory /cvs/extras/rpms/embryo/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 15 18:41:28 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 15 Apr 2006 11:41:28 -0700
Subject: rpms/embryo Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604151841.k3FIfUvH001000@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/embryo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv966

Added Files:
	Makefile import.log 
Log Message:
Setup of module embryo


--- NEW FILE Makefile ---
# Top level Makefile for module embryo
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 15 18:41:29 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 15 Apr 2006 11:41:29 -0700
Subject: rpms/embryo/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604151841.k3FIfVlY001003@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/embryo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv966/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module embryo


--- 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 Apr 15 18:42:19 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 15 Apr 2006 11:42:19 -0700
Subject: rpms/embryo import.log,1.1,1.2
Message-ID: <200604151842.k3FIgLRg001064@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/embryo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1031

Modified Files:
	import.log 
Log Message:
auto-import embryo-0.9.1.023-1 on branch devel from embryo-0.9.1.023-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/embryo/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Apr 2006 18:41:28 -0000	1.1
+++ import.log	15 Apr 2006 18:42:19 -0000	1.2
@@ -0,0 +1 @@
+embryo-0_9_1_023-1:HEAD:embryo-0.9.1.023-1.src.rpm:1145127001



From fedora-extras-commits at redhat.com  Sat Apr 15 18:42:20 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 15 Apr 2006 11:42:20 -0700
Subject: rpms/embryo/devel embryo.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604151842.k3FIgMbL001069@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/embryo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1031/devel

Modified Files:
	.cvsignore sources 
Added Files:
	embryo.spec 
Log Message:
auto-import embryo-0.9.1.023-1 on branch devel from embryo-0.9.1.023-1.src.rpm


--- NEW FILE embryo.spec ---
Name:           embryo
Version:        0.9.1.023
Release:        1%{?dist}
Summary:        A C like scripting language

Group:          System Environment/Libraries
License:        MIT
URL:            http://www.enlightenment.org/Libraries/Embryo/
Source0:        http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

#BuildRequires:  
#Requires:       

%description
Embryo implements a C like scripting language used in various parts of the
Enlightenment project, namely Edje. Embryo's scripting language is based on
CompuPhase's Small language that was introduced in Dr Dobb's Journal in 1999.
Embryo allows scripting capabilities in places that otherwise wouldn't
support basic programming structures such as in Edje EDCs.

%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name \*.la -exec rm {} \;

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING COPYING-PLAIN README
%{_bindir}/%{name}
%{_bindir}/%{name}_cc
%{_datadir}/%{name}
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc
%{_bindir}/*config
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*

%changelog
* Sun Feb  5 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.1.023-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/embryo/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Apr 2006 18:41:29 -0000	1.1
+++ .cvsignore	15 Apr 2006 18:42:20 -0000	1.2
@@ -0,0 +1 @@
+embryo-0.9.1.023.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/embryo/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Apr 2006 18:41:29 -0000	1.1
+++ sources	15 Apr 2006 18:42:20 -0000	1.2
@@ -0,0 +1 @@
+eb84d1c02e9063f2108bc5f72a7627ef  embryo-0.9.1.023.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 15 20:00:23 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sat, 15 Apr 2006 13:00:23 -0700
Subject: rpms/obby/devel .cvsignore, 1.4, 1.5 obby.spec, 1.14, 1.15 sources, 
	1.4, 1.5
Message-ID: <200604152000.k3FK0PJM003406@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/obby/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3385

Modified Files:
	.cvsignore obby.spec sources 
Log Message:
0.4.0rc1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/obby/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Dec 2005 08:56:58 -0000	1.4
+++ .cvsignore	15 Apr 2006 20:00:23 -0000	1.5
@@ -1 +1 @@
-obby-0.3.0.tar.gz
+obby-0.4.0rc1.tar.gz


Index: obby.spec
===================================================================
RCS file: /cvs/extras/rpms/obby/devel/obby.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- obby.spec	15 Feb 2006 20:09:55 -0000	1.14
+++ obby.spec	15 Apr 2006 20:00:23 -0000	1.15
@@ -1,12 +1,14 @@
+%define _rc rc1
+
 Name:           obby
-Version:        0.3.0
-Release:        3%{?dist}
+Version:        0.4.0
+Release:        1.%{_rc}%{?dist}
 Summary:        A library which provides synced document buffers
 
 Group:          Development/Libraries
 License:        GPL
 URL:            http://releases.0x539.de/obby
-Source0:        http://releases.0x539.de/obby/%{name}-%{version}.tar.gz
+Source0:        http://releases.0x539.de/obby/%{name}-%{version}%{_rc}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  net6-devel, gmp-devel, gettext-devel
@@ -29,7 +31,7 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{_rc}
 
 
 %build
@@ -65,6 +67,9 @@
 
 
 %changelog
+* Sat Apr 15 2006 Luke Macken <lmacken at redhat.com> - 0.4.0-1.rc1
+- 0.4.0rc1
+
 * Wed Feb 15 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-3
 - Rebuild for FE5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/obby/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Dec 2005 08:56:58 -0000	1.4
+++ sources	15 Apr 2006 20:00:23 -0000	1.5
@@ -1 +1 @@
-b14135018a3093395296cf091f9f824f  obby-0.3.0.tar.gz
+cd7d8755a7854ad8d29c6d2b0457fa8f  obby-0.4.0rc1.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 15 20:51:22 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 15 Apr 2006 13:51:22 -0700
Subject: owners owners.list,1.845,1.846
Message-ID: <200604152051.k3FKpOgv005789@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5769

Modified Files:
	owners.list 
Log Message:
+embryo


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.845
retrieving revision 1.846
diff -u -r1.845 -r1.846
--- owners.list	15 Apr 2006 16:04:07 -0000	1.845
+++ owners.list	15 Apr 2006 20:51:22 -0000	1.846
@@ -220,6 +220,7 @@
 Fedora Extras|eet|A library designed to write an arbitary set of chunks of data to a file|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|elmo|Terminal-based mail client|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|emacs-auctex|Enhanced TeX modes for Emacsen|ed at eh3.com|extras-qa at fedoraproject.org|
+Fedora Extras|embryo|A C like scripting language|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|emelfm2|A file manager that implements the popular two-pane design|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|enca|Character set analyzer and detector|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|enchant|An Enchanting Spell Checking Library|uwog at uwog.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Apr 15 21:18:51 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sat, 15 Apr 2006 14:18:51 -0700
Subject: rpms/net6/devel net6.spec,1.8,1.9
Message-ID: <200604152118.k3FLIsCp008676@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/net6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8659

Modified Files:
	net6.spec 
Log Message:
add gnutls-devel to BR for -devel package


Index: net6.spec
===================================================================
RCS file: /cvs/extras/rpms/net6/devel/net6.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- net6.spec	14 Apr 2006 19:14:52 -0000	1.8
+++ net6.spec	15 Apr 2006 21:18:51 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           net6
 Version:        1.3.0
-Release:        1.rc1%{?dist}
+Release:        2.rc1%{?dist}
 Summary:        A TCP protocol abstraction for library C++
 
 Group:          Development/Libraries
@@ -24,7 +24,7 @@
 Summary:        Development libraries for net6
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       pkgconfig, libsigc++20-devel
+Requires:       pkgconfig, libsigc++20-devel, gnutls-devel
 
 %description devel
 net6 is a library which eases the development of network-based applications
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Sat Apr 15 2006 Luke Macken <lmacken at redhat.com> - 1.3.0-2.rc1
+- Add gnutls-devel to BuildRequires for -devel package
+
 * Fri Apr 14 2006 Luke Macken <lmacken at redhat.com> - 1.3.0-1.rc1
 - 1.3.0rc1
 



From fedora-extras-commits at redhat.com  Sat Apr 15 22:13:12 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sat, 15 Apr 2006 15:13:12 -0700
Subject: rpms/gobby/devel gobby.spec,1.8,1.9
Message-ID: <200604152213.k3FMDEql010859@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/gobby/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10842

Modified Files:
	gobby.spec 
Log Message:
add gnome-vfs2-devel to buildrequires


Index: gobby.spec
===================================================================
RCS file: /cvs/extras/rpms/gobby/devel/gobby.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gobby.spec	15 Apr 2006 09:46:34 -0000	1.8
+++ gobby.spec	15 Apr 2006 22:13:12 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           gobby
 Version:        0.4.0
-Release:        1%{?dist}
+Release:        2.%{_rc}%{?dist}
 Summary:        Free collaborative editor
 
 Group:          Applications/Internet
@@ -14,6 +14,7 @@
 
 BuildRequires:  libxml++-devel, gtksourceview-devel, gtkmm24-devel, obby-devel
 BuildRequires:  desktop-file-utils, libXau-devel, libXdmcp-devel
+BuildRequires:  gnome-vfs2-devel
 
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -70,8 +71,12 @@
 
 
 %changelog
+* Sat Apr 15 2006 Luke Macken <lmacken at redhat.com> - 0.4.0-2.rc1
+- Add gnome-vfs2-devel to BuildRequires
+
 * Sat Apr 15 2006 Luke Macken <lmacken at redhat.com> - 0.4.0-1.rc1
 - 0.4.0rc1
+- gobby-0.4.0rc1-nodoclist.patch
 
 * Wed Feb 15 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-4
 - Rebuild for Fedora Extras 5



From fedora-extras-commits at redhat.com  Sat Apr 15 22:20:04 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 15:20:04 -0700
Subject: rpms/perl-Module-Pluggable - New directory
Message-ID: <200604152220.k3FMK6VV010988@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Pluggable
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10962/perl-Module-Pluggable

Log Message:
Directory /cvs/extras/rpms/perl-Module-Pluggable added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 15 22:20:05 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 15:20:05 -0700
Subject: rpms/perl-Module-Pluggable/devel - New directory
Message-ID: <200604152220.k3FMK7c6010991@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Pluggable/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10962/perl-Module-Pluggable/devel

Log Message:
Directory /cvs/extras/rpms/perl-Module-Pluggable/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 15 22:20:24 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 15:20:24 -0700
Subject: rpms/perl-Module-Pluggable Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604152220.k3FMKQ9s011035@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Pluggable
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11007

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Module-Pluggable


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Module-Pluggable
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 15 22:20:25 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 15:20:25 -0700
Subject: rpms/perl-Module-Pluggable/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200604152220.k3FMKRpn011038@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Pluggable/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11007/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Module-Pluggable


--- 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 Apr 15 22:20:53 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 15:20:53 -0700
Subject: rpms/perl-Module-Pluggable import.log,1.1,1.2
Message-ID: <200604152220.k3FMKtV7011104@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Pluggable
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11071

Modified Files:
	import.log 
Log Message:
auto-import perl-Module-Pluggable-2.97-1 on branch devel from perl-Module-Pluggable-2.97-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Pluggable/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Apr 2006 22:20:24 -0000	1.1
+++ import.log	15 Apr 2006 22:20:53 -0000	1.2
@@ -0,0 +1 @@
+perl-Module-Pluggable-2_97-1:HEAD:perl-Module-Pluggable-2.97-1.src.rpm:1145139646



From fedora-extras-commits at redhat.com  Sat Apr 15 22:20:54 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 15:20:54 -0700
Subject: rpms/perl-Module-Pluggable/devel perl-Module-Pluggable.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604152221.k3FMKuCV011109@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Pluggable/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11071/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Module-Pluggable.spec 
Log Message:
auto-import perl-Module-Pluggable-2.97-1 on branch devel from perl-Module-Pluggable-2.97-1.src.rpm


--- NEW FILE perl-Module-Pluggable.spec ---
Name:           perl-Module-Pluggable
Version:        2.97
Release:        1%{?dist}
Summary:        Automatically give your module the ability to have plugins
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Module-Pluggable/
Source0:        http://www.cpan.org/authors/id/S/SI/SIMONW/Module-Pluggable-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Module::Build)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Provides a simple but, hopefully, extensible way of having 'plugins' for
your module.

%prep
%setup -q -n Module-Pluggable-%{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+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Mar 23 2006 Steven Pritchard <steve at kspei.com> 2.97-1
- Specfile autogenerated by cpanspec 1.62.
- Clean up description a little.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Pluggable/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Apr 2006 22:20:24 -0000	1.1
+++ .cvsignore	15 Apr 2006 22:20:53 -0000	1.2
@@ -0,0 +1 @@
+Module-Pluggable-2.97.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Pluggable/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Apr 2006 22:20:24 -0000	1.1
+++ sources	15 Apr 2006 22:20:53 -0000	1.2
@@ -0,0 +1 @@
+f118696802530ecb4fdaf91f9b904136  Module-Pluggable-2.97.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 15 22:42:26 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 15:42:26 -0700
Subject: owners owners.list,1.846,1.847
Message-ID: <200604152242.k3FMgS9Q011188@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11171

Modified Files:
	owners.list 
Log Message:
Add perl-Module-Pluggable.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.846
retrieving revision 1.847
diff -u -r1.846 -r1.847
--- owners.list	15 Apr 2006 20:51:22 -0000	1.846
+++ owners.list	15 Apr 2006 22:42:26 -0000	1.847
@@ -1032,6 +1032,7 @@
 Fedora Extras|perl-Module-Load|Runtime require of both modules and files|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Load-Conditional|Looking up module information / loading at runtime|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Loaded|Mark modules as loaded or unloaded|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Module-Pluggable|Automatically give your module the ability to have plugins|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Refresh|Refresh %INC files when updated on disk|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Signature|CPAN signature management utilities and modules|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Versions-Report|Report versions of all modules in memory|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Sat Apr 15 23:09:05 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 16:09:05 -0700
Subject: rpms/qtparted/devel qtparted.spec,1.12,1.13
Message-ID: <200604152309.k3FN971c013367@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/qtparted/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13350

Modified Files:
	qtparted.spec 
Log Message:
Rebuild.


Index: qtparted.spec
===================================================================
RCS file: /cvs/extras/rpms/qtparted/devel/qtparted.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- qtparted.spec	13 Feb 2006 18:16:37 -0000	1.12
+++ qtparted.spec	15 Apr 2006 23:09:05 -0000	1.13
@@ -2,7 +2,7 @@
 
 Name:           qtparted
 Version:        0.4.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Partition Magic clone written in C++ using the Qt toolkit
 
 Group:          Applications/System
@@ -107,6 +107,9 @@
 
 
 %changelog
+* Fri Apr 14 2006 Steven Pritchard <steve at kspei.com> - 0.4.5-5
+- Rebuild.
+
 * Mon Feb 13 2006 Steven Pritchard <steve at kspei.com> - 0.4.5-4
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Sat Apr 15 23:41:23 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 16:41:23 -0700
Subject: rpms/perl-IPC-Cmd - New directory
Message-ID: <200604152341.k3FNfPh7013560@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-IPC-Cmd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13534/perl-IPC-Cmd

Log Message:
Directory /cvs/extras/rpms/perl-IPC-Cmd added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 15 23:41:24 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 16:41:24 -0700
Subject: rpms/perl-IPC-Cmd/devel - New directory
Message-ID: <200604152341.k3FNfQEs013563@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-serv13534/perl-IPC-Cmd/devel

Log Message:
Directory /cvs/extras/rpms/perl-IPC-Cmd/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 15 23:41:42 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 16:41:42 -0700
Subject: rpms/perl-IPC-Cmd Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604152341.k3FNfiXl013607@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-IPC-Cmd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13579

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-IPC-Cmd


--- NEW FILE Makefile ---
# Top level Makefile for module perl-IPC-Cmd
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 15 23:41:42 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 16:41:42 -0700
Subject: rpms/perl-IPC-Cmd/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604152341.k3FNfiPe013610@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-serv13579/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-IPC-Cmd


--- 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 Apr 15 23:41:54 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 16:41:54 -0700
Subject: owners owners.list,1.847,1.848
Message-ID: <200604152341.k3FNfuZZ013643@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13623

Modified Files:
	owners.list 
Log Message:
Add perl-IPC-Cmd.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.847
retrieving revision 1.848
diff -u -r1.847 -r1.848
--- owners.list	15 Apr 2006 22:42:26 -0000	1.847
+++ owners.list	15 Apr 2006 23:41:54 -0000	1.848
@@ -989,6 +989,7 @@
 Fedora Extras|perl-IO-stringy|I/O on in-core objects like strings and arrays|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-Tty|Perl interface to pseudo tty's|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-Zlib|For bugs related to the perl-IO-Zlib component|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-IPC-Cmd|Finding and running system commands made easy|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IPC-Run|Perl module for interacting with child processes|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IPC-Shareable|Share Perl variables between processes|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IPC-SharedCache|Perl module to manage a cache in SysV IPC shared memory|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Sat Apr 15 23:42:11 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 16:42:11 -0700
Subject: rpms/perl-IPC-Cmd import.log,1.1,1.2
Message-ID: <200604152342.k3FNgDow013699@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-IPC-Cmd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13666

Modified Files:
	import.log 
Log Message:
auto-import perl-IPC-Cmd-0.24-1 on branch devel from perl-IPC-Cmd-0.24-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-IPC-Cmd/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Apr 2006 23:41:42 -0000	1.1
+++ import.log	15 Apr 2006 23:42:11 -0000	1.2
@@ -0,0 +1 @@
+perl-IPC-Cmd-0_24-1:HEAD:perl-IPC-Cmd-0.24-1.src.rpm:1145144525



From fedora-extras-commits at redhat.com  Sat Apr 15 23:42:12 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 16:42:12 -0700
Subject: rpms/perl-IPC-Cmd/devel perl-IPC-Cmd.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604152342.k3FNgEtS013704@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-serv13666/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-IPC-Cmd.spec 
Log Message:
auto-import perl-IPC-Cmd-0.24-1 on branch devel from perl-IPC-Cmd-0.24-1.src.rpm


--- NEW FILE perl-IPC-Cmd.spec ---
Name:           perl-IPC-Cmd
Version:        0.24
Release:        1%{?dist}
Summary:        Finding and running system commands made easy
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/IPC-Cmd/
Source0:        http://www.cpan.org/authors/id/K/KA/KANE/IPC-Cmd-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Locale::Maketext::Simple)
BuildRequires:  perl(Module::Load::Conditional)
BuildRequires:  perl(Params::Check)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
IPC::Cmd allows you to run commands, interactively if desired, platform
independent but have them still work.

%prep
%setup -q -n IPC-Cmd-%{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+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Mar 23 2006 Steven Pritchard <steve at kspei.com> 0.24-1
- Specfile autogenerated by cpanspec 1.62.
- Fix License.
- Drop explicit Requires.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-IPC-Cmd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Apr 2006 23:41:42 -0000	1.1
+++ .cvsignore	15 Apr 2006 23:42:12 -0000	1.2
@@ -0,0 +1 @@
+IPC-Cmd-0.24.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-IPC-Cmd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Apr 2006 23:41:42 -0000	1.1
+++ sources	15 Apr 2006 23:42:12 -0000	1.2
@@ -0,0 +1 @@
+9061bd187defad873432f91fa6de9f9b  IPC-Cmd-0.24.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 15 23:44:40 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 16:44:40 -0700
Subject: rpms/perl-Archive-Extract - New directory
Message-ID: <200604152344.k3FNigJi013811@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Archive-Extract
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13784/perl-Archive-Extract

Log Message:
Directory /cvs/extras/rpms/perl-Archive-Extract added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 15 23:44:40 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 16:44:40 -0700
Subject: rpms/perl-Archive-Extract/devel - New directory
Message-ID: <200604152344.k3FNiglP013814@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Archive-Extract/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13784/perl-Archive-Extract/devel

Log Message:
Directory /cvs/extras/rpms/perl-Archive-Extract/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 15 23:44:54 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 16:44:54 -0700
Subject: rpms/perl-Archive-Extract Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604152344.k3FNiuSp013863@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Archive-Extract
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13830

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Archive-Extract


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Archive-Extract
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Apr 15 23:44:54 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 16:44:54 -0700
Subject: rpms/perl-Archive-Extract/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604152344.k3FNiukG013866@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Archive-Extract/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13830/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Archive-Extract


--- 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 Apr 15 23:45:04 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 16:45:04 -0700
Subject: owners owners.list,1.848,1.849
Message-ID: <200604152345.k3FNj6kV013898@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13877

Modified Files:
	owners.list 
Log Message:
Add perl-Archive-Extract.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.848
retrieving revision 1.849
diff -u -r1.848 -r1.849
--- owners.list	15 Apr 2006 23:41:54 -0000	1.848
+++ owners.list	15 Apr 2006 23:45:04 -0000	1.849
@@ -848,6 +848,7 @@
 Fedora Extras|perl-Apache-Session|Apache::Session Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Apache-Session-Wrapper|A simple wrapper around Apache::Session|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-AppConfig|Perl module for reading configuration files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Archive-Extract|A generic archive extracting mechanism|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Archive-Zip|Perl library for accessing Zip archives|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Array-Compare|Perl extension for comparing arrays|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Authen-Radius|Perl Authen::Radius modules|andreas at bawue.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Sat Apr 15 23:45:21 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 16:45:21 -0700
Subject: rpms/perl-Archive-Extract import.log,1.1,1.2
Message-ID: <200604152345.k3FNjN9L013952@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Archive-Extract
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13919

Modified Files:
	import.log 
Log Message:
auto-import perl-Archive-Extract-0.08-1 on branch devel from perl-Archive-Extract-0.08-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Archive-Extract/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Apr 2006 23:44:54 -0000	1.1
+++ import.log	15 Apr 2006 23:45:21 -0000	1.2
@@ -0,0 +1 @@
+perl-Archive-Extract-0_08-1:HEAD:perl-Archive-Extract-0.08-1.src.rpm:1145144715



From fedora-extras-commits at redhat.com  Sat Apr 15 23:45:22 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 16:45:22 -0700
Subject: rpms/perl-Archive-Extract/devel perl-Archive-Extract.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604152345.k3FNjOWl013957@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Archive-Extract/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13919/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Archive-Extract.spec 
Log Message:
auto-import perl-Archive-Extract-0.08-1 on branch devel from perl-Archive-Extract-0.08-1.src.rpm


--- NEW FILE perl-Archive-Extract.spec ---
Name:           perl-Archive-Extract
Version:        0.08
Release:        1%{?dist}
Summary:        A generic archive extracting mechanism
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Archive-Extract/
Source0:        http://www.cpan.org/authors/id/K/KA/KANE/Archive-Extract-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(IPC::Cmd) >= 0.24
BuildRequires:  perl(Locale::Maketext::Simple)
BuildRequires:  perl(Module::Load::Conditional) >= 0.04
BuildRequires:  perl(Params::Check) >= 0.07
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Archive::Extract is a generic archive extraction mechanism.

%prep
%setup -q -n Archive-Extract-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \;

chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Mar 23 2006 Steven Pritchard <steve at kspei.com> 0.08-1
- Specfile autogenerated by cpanspec 1.62.
- Fix License.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Archive-Extract/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Apr 2006 23:44:54 -0000	1.1
+++ .cvsignore	15 Apr 2006 23:45:22 -0000	1.2
@@ -0,0 +1 @@
+Archive-Extract-0.08.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Archive-Extract/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Apr 2006 23:44:54 -0000	1.1
+++ sources	15 Apr 2006 23:45:22 -0000	1.2
@@ -0,0 +1 @@
+1e5d21e4dcd52e168eb2d660e44a48a6  Archive-Extract-0.08.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 16 01:37:48 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Sat, 15 Apr 2006 18:37:48 -0700
Subject: rpms/paraview - New directory
Message-ID: <200604160137.k3G1bo9I018314@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/paraview
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18288/paraview

Log Message:
Directory /cvs/extras/rpms/paraview added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 16 01:37:49 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Sat, 15 Apr 2006 18:37:49 -0700
Subject: rpms/paraview/devel - New directory
Message-ID: <200604160137.k3G1bpum018317@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/paraview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18288/paraview/devel

Log Message:
Directory /cvs/extras/rpms/paraview/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 16 01:38:04 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Sat, 15 Apr 2006 18:38:04 -0700
Subject: rpms/paraview Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604160138.k3G1c6Rf018366@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/paraview
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18333

Added Files:
	Makefile import.log 
Log Message:
Setup of module paraview


--- NEW FILE Makefile ---
# Top level Makefile for module paraview
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 16 01:38:05 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Sat, 15 Apr 2006 18:38:05 -0700
Subject: rpms/paraview/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604160138.k3G1c7YM018369@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/paraview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18333/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module paraview


--- 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 Apr 16 01:44:52 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Sat, 15 Apr 2006 18:44:52 -0700
Subject: rpms/paraview import.log,1.1,1.2
Message-ID: <200604160144.k3G1ism8018464@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/paraview
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18426

Modified Files:
	import.log 
Log Message:
auto-import paraview-2.4.3-5 on branch devel from paraview-2.4.3-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/paraview/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Apr 2006 01:38:04 -0000	1.1
+++ import.log	16 Apr 2006 01:44:52 -0000	1.2
@@ -0,0 +1 @@
+paraview-2_4_3-5:HEAD:paraview-2.4.3-5.src.rpm:1145151884



From fedora-extras-commits at redhat.com  Sun Apr 16 01:44:53 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Sat, 15 Apr 2006 18:44:53 -0700
Subject: rpms/paraview/devel paraview-2.4.2-tcltk.patch, NONE,
	1.1 paraview-2.4.3-png.patch, NONE,
	1.1 paraview-2.4.3-python.patch, NONE, 1.1 paraview.spec, NONE,
	1.1 paraview.xml, NONE, 1.1 paraview_22x22.png, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604160144.k3G1itZE018475@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/paraview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18426/devel

Modified Files:
	.cvsignore sources 
Added Files:
	paraview-2.4.2-tcltk.patch paraview-2.4.3-png.patch 
	paraview-2.4.3-python.patch paraview.spec paraview.xml 
	paraview_22x22.png 
Log Message:
auto-import paraview-2.4.3-5 on branch devel from paraview-2.4.3-5.src.rpm

paraview-2.4.2-tcltk.patch:

--- NEW FILE paraview-2.4.2-tcltk.patch ---
--- paraview-2.4.2/CMakeLists.txt.orig	2006-03-10 10:20:16.000000000 -0700
+++ paraview-2.4.2/CMakeLists.txt	2006-03-10 10:22:08.000000000 -0700
@@ -271,10 +271,10 @@
   SET(VTK_TCL_TK_INTERNALS_DIR 
     "${ParaView_SOURCE_DIR}/VTK/Utilities/TclTk/internals")
   SET(VTK_TCL_TK_WRAPPING_DIR "${ParaView_SOURCE_DIR}/VTK/Wrapping/Tcl")
-  SET(TclTk_INSTALL_NO_RUNTIME ${PV_INSTALL_NO_RUNTIME})
-  SET(TclTk_INSTALL_BIN_DIR ${PV_INSTALL_BIN_DIR})
-  SET(TclTk_INSTALL_LIB_DIR ${PV_INSTALL_LIB_DIR})
-  SUBDIRS(Utilities/TclTk)
+  #SET(TclTk_INSTALL_NO_RUNTIME ${PV_INSTALL_NO_RUNTIME})
+  #SET(TclTk_INSTALL_BIN_DIR ${PV_INSTALL_BIN_DIR})
+  #SET(TclTk_INSTALL_LIB_DIR ${PV_INSTALL_LIB_DIR})
+  #SUBDIRS(Utilities/TclTk)
 ENDIF (PARAVIEW_BUILD_GUI)
 
 # Specify python build so that we can use vtkTkRenderWidget with no

paraview-2.4.3-png.patch:

--- NEW FILE paraview-2.4.3-png.patch ---
--- paraview-2.4.3/GUI/Widgets/CMakeLists.txt.orig	2006-03-29 10:20:37.000000000 -0700
+++ paraview-2.4.3/GUI/Widgets/CMakeLists.txt	2006-03-29 10:22:03.000000000 -0700
@@ -397,7 +397,6 @@
     TARGET_LINK_LIBRARIES (KWWidgets vtkParallel)
   ENDIF(VTK_USE_PARALLEL OR VTK_USE_PARALLEL_ISSET)
 ENDIF(VTK_WRAP_TCL)
-TARGET_LINK_LIBRARIES (KWWidgets vtkpng)
 
 # We need KWSys
 

paraview-2.4.3-python.patch:

--- NEW FILE paraview-2.4.3-python.patch ---
--- paraview-2.4.3/CMakeLists.txt.python	2006-03-29 16:13:54.000000000 -0700
+++ paraview-2.4.3/CMakeLists.txt	2006-03-29 16:14:24.000000000 -0700
@@ -472,11 +472,7 @@
 IF(PARAVIEW_WRAP_PYTHON)
   FIND_PACKAGE(PythonLibs REQUIRED)
   SUBDIRS(Utilities/VTKPythonWrapping)
-  IF(PV_INSTALL_NO_LIBRARIES)
-    SET(VTKPythonWrapping_INSTALL_LIBRARIES 0)
-  ELSE(PV_INSTALL_NO_LIBRARIES)
-    SET(VTKPythonWrapping_INSTALL_LIBRARIES 1)
-  ENDIF(PV_INSTALL_NO_LIBRARIES)
+  SET(VTKPythonWrapping_INSTALL_LIBRARIES 1)
   SET(VTKPythonWrapping_INSTALL_LIB_DIR ${PV_INSTALL_LIB_DIR})
   SET(VTKPythonWrapping_INSTALL_BIN_DIR ${PV_INSTALL_BIN_DIR})
 ENDIF(PARAVIEW_WRAP_PYTHON)


--- NEW FILE paraview.spec ---
Name:           paraview
Version:        2.4.3
Release:        5%{?dist}
Summary:        Parallel visualization application

Group:          Applications/Engineering
License:        Distributable
URL:            http://www.paraview.org/
Source0:        http://www.paraview.org/files/v2.4/paraview-%{version}.tar.gz
Source1:        paraview_22x22.png
Source2:        paraview.xml
Patch0:         paraview-2.4.2-tcltk.patch
Patch1:         paraview-2.4.3-png.patch
Patch2:         paraview-2.4.3-python.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  cmake, lam
BuildRequires:  libGLU-devel, libXt-devel
BuildRequires:  python-devel, tk-devel, hdf5-devel
BuildRequires:  freetype-devel, libjpeg-devel, libpng-devel, libtiff-devel, zlib-devel
BuildRequires:  expat-devel
BuildRequires:  /usr/bin/desktop-file-install
Requires:       %{name}-data = %{version}-%{release}
Requires(post):   /usr/bin/update-desktop-database
Requires(postun): /usr/bin/update-desktop-database


%description
ParaView is an application designed with the need to visualize large data
sets in mind. The goals of the ParaView project include the following:

    * Develop an open-source, multi-platform visualization application.
    * Support distributed computation models to process large data sets.
    * Create an open, flexible, and intuitive user interface.
    * Develop an extensible architecture based on open standards.

ParaView runs on distributed and shared memory parallel as well as single
processor systems and has been successfully tested on Windows, Linux and
various Unix workstations and clusters. Under the hood, ParaView uses the
Visualization Toolkit as the data processing and rendering engine and has a
user interface written using a unique blend of Tcl/Tk and C++.

NOTE: This version has NOT been compiled with MPI support.


%package        mpi
Summary:        Parallel visualization application
Group:          Applications/Engineering
Requires:       %{name}-data = %{version}-%{release}
Provides:       %{name}
Requires(post):   /usr/bin/update-desktop-database
Requires(postun): /usr/bin/update-desktop-database

%description    mpi
ParaView is an application designed with the need to visualize large data
sets in mind. The goals of the ParaView project include the following:

    * Develop an open-source, multi-platform visualization application.
    * Support distributed computation models to process large data sets.
    * Create an open, flexible, and intuitive user interface.
    * Develop an extensible architecture based on open standards.

ParaView runs on distributed and shared memory parallel as well as single
processor systems and has been successfully tested on Windows, Linux and
various Unix workstations and clusters. Under the hood, ParaView uses the
Visualization Toolkit as the data processing and rendering engine and has a
user interface written using a unique blend of Tcl/Tk and C++.

NOTE: This version has been compiled with LAM-MPI support and requires an
operating LAM-MPI runtime enviroment.


%package        data
Summary:        Data files for ParaView
Group:          Applications/Engineering
Requires(post):   /usr/bin/update-mime-database
Requires(postun): /usr/bin/update-mime-database

%description    data
%{summary}.


%package        demos
Summary:        Demo files for ParaView
Group:          Applications/Engineering
Requires:       %{name}-data = %{version}-%{release}

%description    demos
%{summary}.


%prep
%setup -q
%patch -p1 -b .tcltk
%patch1 -p1 -b .png
%patch2 -p1 -b .python
rm -rf Utilities/TclTk
sed -i -e 's,INSTALL_FILES(/man/,INSTALL_FILES(/share/man/,' Utilities/IceT/doc/man/CMakeLists.txt


%build
rm -rf fedora fedora-mpi
mkdir fedora
pushd fedora
export CC='gcc'
export CXX='g++'
export MAKE='make'
export CFLAGS="$RPM_OPT_FLAGS"
export CXXFLAGS="$RPM_OPT_FLAGS"
cmake .. \
        -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
        -DPV_INSTALL_LIB_DIR:PATH=/%{_lib}/paraview-2.4 \
        -DCMAKE_SKIP_RPATH:BOOL=ON \
        -DBUILD_SHARED_LIBS:BOOL=ON \
        -DCMAKE_CXX_COMPILER:FILEPATH=$CXX \
        -DCMAKE_C_COMPILER:FILEPATH=$CC \
        -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
        -DTCL_LIBRARY:PATH=tcl \
        -DTK_LIBRARY:PATH=tk \
        -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON \
        -DVTK_USE_MAGLED_MESA:BOOL=ON \
        -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \
        -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \
        -DVTK_USE_SYSTEM_JPEG:BOOL=ON \
        -DVTK_USE_SYSTEM_PNG:BOOL=ON \
        -DVTK_USE_SYSTEM_TIFF:BOOL=ON \
        -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \
        -DBUILD_DOCUMENTATION:BOOL=ON \
        -DBUILD_EXAMPLES:BOOL=ON
# Broken at the moment
#        -DPARAVIEW_WRAP_PYTHON:BOOL=ON \
#
make
popd
mkdir fedora-mpi
pushd fedora-mpi
export CC='gcc'
export CXX='g++'
export MAKE='make'
export CFLAGS="$RPM_OPT_FLAGS"
export CXXFLAGS="$RPM_OPT_FLAGS"
cmake .. \
        -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
        -DPV_INSTALL_LIB_DIR:PATH=/%{_lib}/paraview-2.4-mpi \
        -DCMAKE_SKIP_RPATH:BOOL=ON \
        -DBUILD_SHARED_LIBS:BOOL=ON \
        -DCMAKE_CXX_COMPILER:FILEPATH=$CXX \
        -DCMAKE_C_COMPILER:FILEPATH=$CC \
        -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
        -DTCL_LIBRARY:PATH=tcl \
        -DTK_LIBRARY:PATH=tk \
        -DPARAVIEW_USE_SYSTEM_HDF5: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_USE_MAGLED_MESA:BOOL=ON \
        -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \
        -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \
        -DVTK_USE_SYSTEM_JPEG:BOOL=ON \
        -DVTK_USE_SYSTEM_PNG:BOOL=ON \
        -DVTK_USE_SYSTEM_TIFF:BOOL=ON \
        -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \
        -DBUILD_DOCUMENTATION:BOOL=ON \
        -DBUILD_EXAMPLES:BOOL=ON
# Broken at the moment
#        -DPARAVIEW_WRAP_PYTHON:BOOL=ON \
#
make


%install
rm -rf $RPM_BUILD_ROOT

#Fix permissions
find . \( -name \*.txt -o -name \*.xml -o -name '*.[ch]' -o -name '*.[ch][px][px]' \) -print0 | xargs -0 chmod -x

# Create some needed directories
install -d $RPM_BUILD_ROOT%{_datadir}/applications
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -m644 %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -d $RPM_BUILD_ROOT%{_datadir}/mime/packages
install -m644 %SOURCE2 $RPM_BUILD_ROOT%{_datadir}/mime/packages

# Install mpi version
pushd fedora-mpi
make install DESTDIR=$RPM_BUILD_ROOT
#Get rid of useless man and cmake files
rm -rf $RPM_BUILD_ROOT%{_mandir}
rm $RPM_BUILD_ROOT%{_libdir}/paraview-2.4-mpi/*ICET*cmake
cat > paraview-mpi.desktop <<EOF
[Desktop Entry]
Encoding=UTF-8
Name=ParaView Viewer MPI
GenericName=Data Viewer
Comment=ParaView allows MPI enabled viewing of large data sets
Type=Application
Terminal=false
Icon=paraview_22x22.png
MimeType=application/x-paraview
Categories=Application;Graphics;
Exec=mpirun C paraview-mpi
EOF

desktop-file-install --vendor=fedora \
       --add-category=X-Fedora \
       --dir %{buildroot}%{_datadir}/applications/ \
       paraview-mpi.desktop

popd

#Move the mpi binaries out of the way
pushd $RPM_BUILD_ROOT/%{_bindir}
for f in *
do
   mv $f ${f}-mpi
done
popd

#Install the normal version
pushd fedora
make install DESTDIR=$RPM_BUILD_ROOT
cat > paraview.desktop <<EOF
[Desktop Entry]
Encoding=UTF-8
Name=ParaView Viewer
GenericName=Data Viewer
Comment=ParaView allows viewing of large data sets
Type=Application
Terminal=false
Icon=paraview_22x22.png
MimeType=application/x-paraview
Categories=Application;Graphics;
Exec=paraview
EOF

desktop-file-install --vendor=fedora \
       --add-category=X-Fedora \
       --dir %{buildroot}%{_datadir}/applications/ \
       paraview.desktop

popd


%clean
rm -rf $RPM_BUILD_ROOT


%post
update-desktop-database &> /dev/null ||:

%postun
update-desktop-database &> /dev/null ||:


%post   mpi
update-desktop-database &> /dev/null ||:

%postun mpi
update-desktop-database &> /dev/null ||:


%post   data
update-mime-database %{_datadir}/mime &> /dev/null || :

%postun data
update-mime-database %{_datadir}/mime &> /dev/null || :


%files
%defattr(-,root,root,-)
%doc Copyright.txt README.html
%{_bindir}/paraview
%{_bindir}/pvbatch
%{_bindir}/pvclient
%{_bindir}/pvdataserver
#%{_bindir}/pvpython
%{_bindir}/pvrenderserver
%{_bindir}/pvserver
%{_datadir}/applications/fedora-paraview.desktop
%{_libdir}/paraview-2.4/


%files mpi
%defattr(-,root,root,-)
%doc Copyright.txt README.html
%{_bindir}/paraview-mpi
%{_bindir}/pvbatch-mpi
%{_bindir}/pvclient-mpi
%{_bindir}/pvdataserver-mpi
#%{_bindir}/pvpython-mpi
%{_bindir}/pvrenderserver-mpi
%{_bindir}/pvserver-mpi
%{_datadir}/applications/fedora-paraview-mpi.desktop
%{_libdir}/paraview-2.4-mpi/


%files data
%defattr(-,root,root,-)
%{_datadir}/paraview-2.4/
%exclude %{_datadir}/paraview-2.4/Demos
%{_datadir}/pixmaps/paraview_22x22.png
%{_datadir}/mime/packages/paraview.xml


%files demos
%defattr(-,root,root,-)
%{_datadir}/paraview-2.4/Demos/


%changelog
* Wed Apr 12 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.3-5
- Cleanup permissions

* Mon Apr 10 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.3-4
- Add icon and cleanup desktop file

* Mon Apr 10 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.3-3
- Add VTK_USE_MANGLE_MESA for off screen rendering
- Cleanup source permisions
- Add an initial .desktop file
- Make requirement on -data specific to version
- Don't package Ice-T man pages and cmake files

* Thu Apr  6 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.3-2
- Add mpi version

* Tue Apr  4 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.3-1
- Initial Fedora Extras version


--- NEW FILE paraview.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
    <mime-type type="application/x-paraview">
        <comment xml:lang="en">ParaView Document</comment>
        <glob pattern="*.pvd" />
        <glob pattern="*.pvs" />
        <glob pattern="*.vti" />
        <glob pattern="*.vtp" />
        <glob pattern="*.vts" />
        <glob pattern="*.vtu" />
  </mime-type>
</mime-info>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/paraview/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Apr 2006 01:38:05 -0000	1.1
+++ .cvsignore	16 Apr 2006 01:44:53 -0000	1.2
@@ -0,0 +1 @@
+paraview-2.4.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/paraview/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Apr 2006 01:38:05 -0000	1.1
+++ sources	16 Apr 2006 01:44:53 -0000	1.2
@@ -0,0 +1 @@
+db4e6974d8bba12de8a50748161b3f42  paraview-2.4.3.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 16 04:25:53 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 15 Apr 2006 21:25:53 -0700
Subject: rpms/ularn/devel ularn-drop-setgid.patch, 1.1, 1.2 ularn.spec, 1.2,
	1.3
Message-ID: <200604160425.k3G4PuUv025059@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/ularn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25037

Modified Files:
	ularn-drop-setgid.patch ularn.spec 
Log Message:
Update setgid patch to prevent closing the scoreboard file after writing it.  This file might get written multiple times during the game.



ularn-drop-setgid.patch:

Index: ularn-drop-setgid.patch
===================================================================
RCS file: /cvs/extras/rpms/ularn/devel/ularn-drop-setgid.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ularn-drop-setgid.patch	17 Mar 2006 18:12:24 -0000	1.1
+++ ularn-drop-setgid.patch	16 Apr 2006 04:25:53 -0000	1.2
@@ -1,6 +1,6 @@
 diff -Naur Ularn/data.c Ularn.new/data.c
---- Ularn/data.c	2006-03-16 13:40:53.000000000 -0800
-+++ Ularn.new/data.c	2006-03-16 13:39:41.000000000 -0800
+--- Ularn/data.c	2006-04-15 20:53:51.000000000 -0700
++++ Ularn.new/data.c	2006-04-15 20:52:46.000000000 -0700
 @@ -5,6 +5,7 @@
  
  char *libdir = LIBDIR;
@@ -10,8 +10,8 @@
  /* the game save filename   */
  char savefilename[MAXPATHLEN];
 diff -Naur Ularn/extern.h Ularn.new/extern.h
---- Ularn/extern.h	2006-03-16 13:40:53.000000000 -0800
-+++ Ularn.new/extern.h	2006-03-16 13:42:26.000000000 -0800
+--- Ularn/extern.h	2006-04-15 20:53:51.000000000 -0700
++++ Ularn.new/extern.h	2006-04-15 20:52:47.000000000 -0700
 @@ -713,6 +713,7 @@
  	/************** extern decls for all data items **********/
  
@@ -21,8 +21,8 @@
  extern char ckpfile[], monstnamelist[];
  extern char larnlevels[],lastmonst[];
 diff -Naur Ularn/header.h Ularn.new/header.h
---- Ularn/header.h	2006-03-16 13:40:53.000000000 -0800
-+++ Ularn.new/header.h	2006-03-17 07:02:33.000000000 -0800
+--- Ularn/header.h	2006-04-15 20:53:51.000000000 -0700
++++ Ularn.new/header.h	2006-04-15 20:52:48.000000000 -0700
 @@ -6,6 +6,9 @@
  #include <sys/param.h>
  #include <sys/times.h>
@@ -34,8 +34,8 @@
  #  include <sys/timeb.h>
  #endif /* FTIMER */
 diff -Naur Ularn/main.c Ularn.new/main.c
---- Ularn/main.c	2006-03-16 13:40:53.000000000 -0800
-+++ Ularn.new/main.c	2006-03-17 07:02:35.000000000 -0800
+--- Ularn/main.c	2006-04-15 20:53:51.000000000 -0700
++++ Ularn.new/main.c	2006-04-15 20:52:48.000000000 -0700
 @@ -50,7 +50,22 @@
  	struct passwd *pwe,*getpwuid();
  	extern char *optarg;
@@ -69,7 +69,7 @@
  
 diff -Naur Ularn/scores.c Ularn.new/scores.c
 --- Ularn/scores.c	2001-11-16 10:13:28.000000000 -0800
-+++ Ularn.new/scores.c	2006-03-16 14:22:14.000000000 -0800
++++ Ularn.new/scores.c	2006-04-15 21:10:20.000000000 -0700
 @@ -145,8 +145,9 @@
  writeboard()
  {
@@ -81,7 +81,24 @@
  		lprcat("Can't open scorefile for writing\n"); 
  		lflush();
  		return(-1); 
-@@ -185,7 +186,7 @@
+@@ -164,7 +165,15 @@
+ 		return(-1); 
+ 	}
+ 	fflush(fp);
+-	fclose(fp);  
++	rewind(fp);
++        /* Don't close the scoreboard filehandle.  If we're running setgid
++         * then we won't be able to open it again, and we might have to
++         * write to it multiple times if the user wants to pay his taxes
++         * more than once in a game.
++         */
++	/*
++  	fclose(fp);  
++	*/
+ 	return(0);
+ }
+ 
+@@ -185,7 +194,7 @@
  	}
  	if (writeboard()) 
  		return(-1);


Index: ularn.spec
===================================================================
RCS file: /cvs/extras/rpms/ularn/devel/ularn.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ularn.spec	17 Mar 2006 18:22:17 -0000	1.2
+++ ularn.spec	16 Apr 2006 04:25:53 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           ularn
 Version:        1.5p4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Simple roguelike game
 
 Group:          Amusements/Games
@@ -92,6 +92,10 @@
 
 
 %changelog
+* Sat Apr 15 2006 Wart <wart at kobold.org> 1.5p4-5
+- Update setgid patch to prevent closing the scoreboard file after writing
+  it.  This file might get written multiple times during the game.
+
 * Fri Mar 17 2006 Wart <wart at kobold.org> 1.5p4-4
 - Updated setgid patch to prevent someone from regaining setgid
   privileges.



From fedora-extras-commits at redhat.com  Sun Apr 16 04:54:48 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 15 Apr 2006 21:54:48 -0700
Subject: rpms/ularn/FC-4 ularn-drop-setgid.patch,1.1,1.2 ularn.spec,1.2,1.3
Message-ID: <200604160454.k3G4soqV025160@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/ularn/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25123/FC-4

Modified Files:
	ularn-drop-setgid.patch ularn.spec 
Log Message:
Update setgid patch to prevent closing the scoreboard file after writing it.  This file might get written multiple times during the game.



ularn-drop-setgid.patch:

Index: ularn-drop-setgid.patch
===================================================================
RCS file: /cvs/extras/rpms/ularn/FC-4/ularn-drop-setgid.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ularn-drop-setgid.patch	17 Mar 2006 18:12:24 -0000	1.1
+++ ularn-drop-setgid.patch	16 Apr 2006 04:54:48 -0000	1.2
@@ -1,6 +1,6 @@
 diff -Naur Ularn/data.c Ularn.new/data.c
---- Ularn/data.c	2006-03-16 13:40:53.000000000 -0800
-+++ Ularn.new/data.c	2006-03-16 13:39:41.000000000 -0800
+--- Ularn/data.c	2006-04-15 20:53:51.000000000 -0700
++++ Ularn.new/data.c	2006-04-15 20:52:46.000000000 -0700
 @@ -5,6 +5,7 @@
  
  char *libdir = LIBDIR;
@@ -10,8 +10,8 @@
  /* the game save filename   */
  char savefilename[MAXPATHLEN];
 diff -Naur Ularn/extern.h Ularn.new/extern.h
---- Ularn/extern.h	2006-03-16 13:40:53.000000000 -0800
-+++ Ularn.new/extern.h	2006-03-16 13:42:26.000000000 -0800
+--- Ularn/extern.h	2006-04-15 20:53:51.000000000 -0700
++++ Ularn.new/extern.h	2006-04-15 20:52:47.000000000 -0700
 @@ -713,6 +713,7 @@
  	/************** extern decls for all data items **********/
  
@@ -21,8 +21,8 @@
  extern char ckpfile[], monstnamelist[];
  extern char larnlevels[],lastmonst[];
 diff -Naur Ularn/header.h Ularn.new/header.h
---- Ularn/header.h	2006-03-16 13:40:53.000000000 -0800
-+++ Ularn.new/header.h	2006-03-17 07:02:33.000000000 -0800
+--- Ularn/header.h	2006-04-15 20:53:51.000000000 -0700
++++ Ularn.new/header.h	2006-04-15 20:52:48.000000000 -0700
 @@ -6,6 +6,9 @@
  #include <sys/param.h>
  #include <sys/times.h>
@@ -34,8 +34,8 @@
  #  include <sys/timeb.h>
  #endif /* FTIMER */
 diff -Naur Ularn/main.c Ularn.new/main.c
---- Ularn/main.c	2006-03-16 13:40:53.000000000 -0800
-+++ Ularn.new/main.c	2006-03-17 07:02:35.000000000 -0800
+--- Ularn/main.c	2006-04-15 20:53:51.000000000 -0700
++++ Ularn.new/main.c	2006-04-15 20:52:48.000000000 -0700
 @@ -50,7 +50,22 @@
  	struct passwd *pwe,*getpwuid();
  	extern char *optarg;
@@ -69,7 +69,7 @@
  
 diff -Naur Ularn/scores.c Ularn.new/scores.c
 --- Ularn/scores.c	2001-11-16 10:13:28.000000000 -0800
-+++ Ularn.new/scores.c	2006-03-16 14:22:14.000000000 -0800
++++ Ularn.new/scores.c	2006-04-15 21:10:20.000000000 -0700
 @@ -145,8 +145,9 @@
  writeboard()
  {
@@ -81,7 +81,24 @@
  		lprcat("Can't open scorefile for writing\n"); 
  		lflush();
  		return(-1); 
-@@ -185,7 +186,7 @@
+@@ -164,7 +165,15 @@
+ 		return(-1); 
+ 	}
+ 	fflush(fp);
+-	fclose(fp);  
++	rewind(fp);
++        /* Don't close the scoreboard filehandle.  If we're running setgid
++         * then we won't be able to open it again, and we might have to
++         * write to it multiple times if the user wants to pay his taxes
++         * more than once in a game.
++         */
++	/*
++  	fclose(fp);  
++	*/
+ 	return(0);
+ }
+ 
+@@ -185,7 +194,7 @@
  	}
  	if (writeboard()) 
  		return(-1);


Index: ularn.spec
===================================================================
RCS file: /cvs/extras/rpms/ularn/FC-4/ularn.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ularn.spec	17 Mar 2006 18:22:17 -0000	1.2
+++ ularn.spec	16 Apr 2006 04:54:48 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           ularn
 Version:        1.5p4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Simple roguelike game
 
 Group:          Amusements/Games
@@ -92,6 +92,10 @@
 
 
 %changelog
+* Sat Apr 15 2006 Wart <wart at kobold.org> 1.5p4-5
+- Update setgid patch to prevent closing the scoreboard file after writing
+  it.  This file might get written multiple times during the game.
+
 * Fri Mar 17 2006 Wart <wart at kobold.org> 1.5p4-4
 - Updated setgid patch to prevent someone from regaining setgid
   privileges.



From fedora-extras-commits at redhat.com  Sun Apr 16 04:54:49 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 15 Apr 2006 21:54:49 -0700
Subject: rpms/ularn/FC-5 ularn-drop-setgid.patch,1.1,1.2 ularn.spec,1.2,1.3
Message-ID: <200604160454.k3G4spt9025168@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/ularn/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25123/FC-5

Modified Files:
	ularn-drop-setgid.patch ularn.spec 
Log Message:
Update setgid patch to prevent closing the scoreboard file after writing it.  This file might get written multiple times during the game.



ularn-drop-setgid.patch:

Index: ularn-drop-setgid.patch
===================================================================
RCS file: /cvs/extras/rpms/ularn/FC-5/ularn-drop-setgid.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ularn-drop-setgid.patch	17 Mar 2006 18:12:24 -0000	1.1
+++ ularn-drop-setgid.patch	16 Apr 2006 04:54:49 -0000	1.2
@@ -1,6 +1,6 @@
 diff -Naur Ularn/data.c Ularn.new/data.c
---- Ularn/data.c	2006-03-16 13:40:53.000000000 -0800
-+++ Ularn.new/data.c	2006-03-16 13:39:41.000000000 -0800
+--- Ularn/data.c	2006-04-15 20:53:51.000000000 -0700
++++ Ularn.new/data.c	2006-04-15 20:52:46.000000000 -0700
 @@ -5,6 +5,7 @@
  
  char *libdir = LIBDIR;
@@ -10,8 +10,8 @@
  /* the game save filename   */
  char savefilename[MAXPATHLEN];
 diff -Naur Ularn/extern.h Ularn.new/extern.h
---- Ularn/extern.h	2006-03-16 13:40:53.000000000 -0800
-+++ Ularn.new/extern.h	2006-03-16 13:42:26.000000000 -0800
+--- Ularn/extern.h	2006-04-15 20:53:51.000000000 -0700
++++ Ularn.new/extern.h	2006-04-15 20:52:47.000000000 -0700
 @@ -713,6 +713,7 @@
  	/************** extern decls for all data items **********/
  
@@ -21,8 +21,8 @@
  extern char ckpfile[], monstnamelist[];
  extern char larnlevels[],lastmonst[];
 diff -Naur Ularn/header.h Ularn.new/header.h
---- Ularn/header.h	2006-03-16 13:40:53.000000000 -0800
-+++ Ularn.new/header.h	2006-03-17 07:02:33.000000000 -0800
+--- Ularn/header.h	2006-04-15 20:53:51.000000000 -0700
++++ Ularn.new/header.h	2006-04-15 20:52:48.000000000 -0700
 @@ -6,6 +6,9 @@
  #include <sys/param.h>
  #include <sys/times.h>
@@ -34,8 +34,8 @@
  #  include <sys/timeb.h>
  #endif /* FTIMER */
 diff -Naur Ularn/main.c Ularn.new/main.c
---- Ularn/main.c	2006-03-16 13:40:53.000000000 -0800
-+++ Ularn.new/main.c	2006-03-17 07:02:35.000000000 -0800
+--- Ularn/main.c	2006-04-15 20:53:51.000000000 -0700
++++ Ularn.new/main.c	2006-04-15 20:52:48.000000000 -0700
 @@ -50,7 +50,22 @@
  	struct passwd *pwe,*getpwuid();
  	extern char *optarg;
@@ -69,7 +69,7 @@
  
 diff -Naur Ularn/scores.c Ularn.new/scores.c
 --- Ularn/scores.c	2001-11-16 10:13:28.000000000 -0800
-+++ Ularn.new/scores.c	2006-03-16 14:22:14.000000000 -0800
++++ Ularn.new/scores.c	2006-04-15 21:10:20.000000000 -0700
 @@ -145,8 +145,9 @@
  writeboard()
  {
@@ -81,7 +81,24 @@
  		lprcat("Can't open scorefile for writing\n"); 
  		lflush();
  		return(-1); 
-@@ -185,7 +186,7 @@
+@@ -164,7 +165,15 @@
+ 		return(-1); 
+ 	}
+ 	fflush(fp);
+-	fclose(fp);  
++	rewind(fp);
++        /* Don't close the scoreboard filehandle.  If we're running setgid
++         * then we won't be able to open it again, and we might have to
++         * write to it multiple times if the user wants to pay his taxes
++         * more than once in a game.
++         */
++	/*
++  	fclose(fp);  
++	*/
+ 	return(0);
+ }
+ 
+@@ -185,7 +194,7 @@
  	}
  	if (writeboard()) 
  		return(-1);


Index: ularn.spec
===================================================================
RCS file: /cvs/extras/rpms/ularn/FC-5/ularn.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ularn.spec	17 Mar 2006 18:22:17 -0000	1.2
+++ ularn.spec	16 Apr 2006 04:54:49 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           ularn
 Version:        1.5p4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Simple roguelike game
 
 Group:          Amusements/Games
@@ -92,6 +92,10 @@
 
 
 %changelog
+* Sat Apr 15 2006 Wart <wart at kobold.org> 1.5p4-5
+- Update setgid patch to prevent closing the scoreboard file after writing
+  it.  This file might get written multiple times during the game.
+
 * Fri Mar 17 2006 Wart <wart at kobold.org> 1.5p4-4
 - Updated setgid patch to prevent someone from regaining setgid
   privileges.



From fedora-extras-commits at redhat.com  Sun Apr 16 12:30:25 2006
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Sun, 16 Apr 2006 05:30:25 -0700
Subject: rpms/wxGTK/devel wxGTK.spec,1.20,1.21
Message-ID: <200604161230.k3GCURvI010282@cvs-int.fedora.redhat.com>

Author: mattdm

Update of /cvs/extras/rpms/wxGTK/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10263

Modified Files:
	wxGTK.spec 
Log Message:
change mesa-libGL*-devel -> libGL*-devel



Index: wxGTK.spec
===================================================================
RCS file: /cvs/extras/rpms/wxGTK/devel/wxGTK.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- wxGTK.spec	13 Apr 2006 19:11:46 -0000	1.20
+++ wxGTK.spec	16 Apr 2006 12:30:24 -0000	1.21
@@ -6,7 +6,7 @@
 
 Name:           wxGTK
 Version:        2.6.3
-Release:        2.6.3.2.0%{?dist}
+Release:        2.6.3.2.1%{?dist}
 Summary:        GTK2 port of the wxWidgets GUI library
 # The wxWindows licence is the LGPL with a specific exemption allowing
 # distribution of derived binaries under any terms. (This will eventually
@@ -21,7 +21,7 @@
 BuildRequires:  gtk2-devel, zlib-devel >= 1.1.4
 BuildRequires:  libpng-devel, libjpeg-devel, libtiff-devel
 BuildRequires:  expat-devel, SDL-devel, libgnomeprintui22-devel
-BuildRequires:  mesa-libGL-devel, mesa-libGLU-devel
+BuildRequires:  libGL-devel, libGLU-devel
 %if %{withodbc}
 BuildRequires:  unixODBC-devel
 %endif
@@ -193,6 +193,9 @@
 %endif
 
 %changelog
+* Thu Apr 13 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3-2.6.3.2.1
+- oops -- forgot to change mesa-libGL*-devel -> libGL*-devel
+
 * Thu Apr 13 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3-2.6.3.2.0
 - patch to cvs subrelease 2.6.3.2 (matches wxPython)
 



From fedora-extras-commits at redhat.com  Sun Apr 16 12:36:42 2006
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Sun, 16 Apr 2006 05:36:42 -0700
Subject: rpms/wxPythonGTK2/FC-5 sources,1.2,NONE wxPython.spec,1.10,NONE
Message-ID: <200604161236.k3GCaiNC010389@cvs-int.fedora.redhat.com>

Author: mattdm

Update of /cvs/extras/rpms/wxPythonGTK2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10374

Removed Files:
	sources wxPython.spec 
Log Message:
Removing -- migrating package name back to just 'wxPython'



--- sources DELETED ---


--- wxPython.spec DELETED ---



From fedora-extras-commits at redhat.com  Sun Apr 16 16:26:55 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sun, 16 Apr 2006 09:26:55 -0700
Subject: rpms/epiphany-extensions/FC-5 .cvsignore, 1.9,
	1.10 epiphany-extensions.spec, 1.8, 1.9 sources, 1.9, 1.10
Message-ID: <200604161627.k3GGRRPn019472@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/epiphany-extensions/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19434/FC-5

Modified Files:
	.cvsignore epiphany-extensions.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	18 Feb 2006 03:18:58 -0000	1.9
+++ .cvsignore	16 Apr 2006 16:26:54 -0000	1.10
@@ -1,8 +1 @@
-epiphany-extensions-1.7.3.tar.bz2
-epiphany-extensions-1.7.4.tar.bz2
-epiphany-extensions-1.8.0.tar.bz2
-epiphany-extensions-1.8.1.tar.bz2
-epiphany-extensions-1.9.3.tar.bz2
-epiphany-extensions-1.9.4.tar.bz2
-epiphany-extensions-1.9.6.tar.bz2
-epiphany-extensions-1.9.7.tar.bz2
+epiphany-extensions-2.14.0.1.tar.bz2


Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/FC-5/epiphany-extensions.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- epiphany-extensions.spec	18 Feb 2006 03:18:58 -0000	1.8
+++ epiphany-extensions.spec	16 Apr 2006 16:26:54 -0000	1.9
@@ -1,17 +1,17 @@
-%define ephy_major 1.9
+%define ephy_major 2.14
 
 Summary: Extensions for Epiphany, the GNOME web browser.
 Name: epiphany-extensions
-Version: 1.9.7
+Version: 2.14.0.1
 Release: 1
 License: GPL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/extensions
-Source0: %{name}-%{version}.tar.bz2
+Source0: http://ftp.gnome.org/pub/GNOME/sources/epiphany-extensions/2.14/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires: epiphany-devel > %{ephy_major}
-Requires: epiphany > %{ephy_major}
+BuildRequires: epiphany-devel >= %{ephy_major}
+Requires: epiphany >= %{ephy_major}
 
 %description
 Epiphany Extensions is a collection of extensions for Epiphany, the
@@ -39,6 +39,9 @@
 %{_libdir}/epiphany
 
 %changelog
+* Sun Apr 16 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.14.0.1-1
+- Upstream update
+
 * Fri Feb 17 2006 Christopher Aillon <caillon at redhat.com> - 1.9.7-1
 - Update to 1.9.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	18 Feb 2006 03:18:58 -0000	1.9
+++ sources	16 Apr 2006 16:26:54 -0000	1.10
@@ -1 +1 @@
-e01b3e3f6226dd516f21a2f047f18c1e  epiphany-extensions-1.9.7.tar.bz2
+1b8ec450167010b25bba48295b5808cf  epiphany-extensions-2.14.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Sun Apr 16 16:26:55 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sun, 16 Apr 2006 09:26:55 -0700
Subject: rpms/epiphany-extensions/devel .cvsignore, 1.9,
	1.10 epiphany-extensions.spec, 1.8, 1.9 sources, 1.9, 1.10
Message-ID: <200604161627.k3GGRRuY019477@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/epiphany-extensions/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19434/devel

Modified Files:
	.cvsignore epiphany-extensions.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	18 Feb 2006 03:18:58 -0000	1.9
+++ .cvsignore	16 Apr 2006 16:26:55 -0000	1.10
@@ -1,8 +1 @@
-epiphany-extensions-1.7.3.tar.bz2
-epiphany-extensions-1.7.4.tar.bz2
-epiphany-extensions-1.8.0.tar.bz2
-epiphany-extensions-1.8.1.tar.bz2
-epiphany-extensions-1.9.3.tar.bz2
-epiphany-extensions-1.9.4.tar.bz2
-epiphany-extensions-1.9.6.tar.bz2
-epiphany-extensions-1.9.7.tar.bz2
+epiphany-extensions-2.14.1.tar.bz2


Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/epiphany-extensions.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- epiphany-extensions.spec	18 Feb 2006 03:18:58 -0000	1.8
+++ epiphany-extensions.spec	16 Apr 2006 16:26:55 -0000	1.9
@@ -1,17 +1,19 @@
-%define ephy_major 1.9
+%define ephy_major 2.14.1
 
 Summary: Extensions for Epiphany, the GNOME web browser.
 Name: epiphany-extensions
-Version: 1.9.7
+Version: 2.14.1
 Release: 1
 License: GPL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/extensions
-Source0: %{name}-%{version}.tar.bz2
+Source0: http://ftp.gnome.org/pub/GNOME/sources/epiphany-extensions/2.14/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires: epiphany-devel > %{ephy_major}
-Requires: epiphany > %{ephy_major}
+BuildRequires: epiphany-devel >= %{ephy_major}
+Requires: epiphany >= %{ephy_major}
+Requires(post): scrollkeeper
+Requires(postun): scrollkeeper
 
 %description
 Epiphany Extensions is a collection of extensions for Epiphany, the
@@ -21,7 +23,7 @@
 %setup -q
 
 %build
-%configure --disable-compiler-warnings
+%configure --disable-compiler-warnings --disable-scrollkeeper
 %{__make} %{?_smp_mflags}
 
 %install
@@ -32,13 +34,24 @@
 %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
+* Sun Apr 16 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.14.1-1
+- Upstream update
+
 * Fri Feb 17 2006 Christopher Aillon <caillon at redhat.com> - 1.9.7-1
 - Update to 1.9.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	18 Feb 2006 03:18:58 -0000	1.9
+++ sources	16 Apr 2006 16:26:55 -0000	1.10
@@ -1 +1 @@
-e01b3e3f6226dd516f21a2f047f18c1e  epiphany-extensions-1.9.7.tar.bz2
+8be9c522284b0a9d7ba2797e141cf26e  epiphany-extensions-2.14.1.tar.bz2



From fedora-extras-commits at redhat.com  Sun Apr 16 20:27:44 2006
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Sun, 16 Apr 2006 13:27:44 -0700
Subject: rpms/banshee/devel .cvsignore, 1.4, 1.5 banshee.spec, 1.7,
	1.8 sources, 1.4, 1.5
Message-ID: <200604162027.k3GKRkiZ028313@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/banshee/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28292

Modified Files:
	.cvsignore banshee.spec sources 
Log Message:
* Tue Mar 21 2006 Christopher Aillon <caillon at redhat.com> 0.10.9-1
- Update to 0.10.9



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/banshee/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	14 Mar 2006 16:57:31 -0000	1.4
+++ .cvsignore	16 Apr 2006 20:27:43 -0000	1.5
@@ -1 +1 @@
-banshee-0.10.8.tar.gz
+banshee-0.10.9.tar.gz


Index: banshee.spec
===================================================================
RCS file: /cvs/extras/rpms/banshee/devel/banshee.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- banshee.spec	14 Mar 2006 19:35:06 -0000	1.7
+++ banshee.spec	16 Apr 2006 20:27:43 -0000	1.8
@@ -1,5 +1,5 @@
 Name:    banshee
-Version: 0.10.8
+Version: 0.10.9
 Release: 1
 Summary: easily import, manage, and play selections from your music collection
 
@@ -96,6 +96,9 @@
 %exclude %{_libdir}/banshee/*.la
 
 %changelog
+* Tue Mar 21 2006 Christopher Aillon <caillon at redhat.com> 0.10.9-1
+- Update to 0.10.9
+
 * Tue Mar 14 2006 Christopher Aillon <caillon at redhat.com> 0.10.8-1
 - Update to 0.10.8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/banshee/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Mar 2006 16:57:31 -0000	1.4
+++ sources	16 Apr 2006 20:27:43 -0000	1.5
@@ -1 +1 @@
-cfa4051cd8aba171a09dcb9a3f34fef3  banshee-0.10.8.tar.gz
+86b67e399ea805f69a860b3e6fd4627f  banshee-0.10.9.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 16 20:30:49 2006
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Sun, 16 Apr 2006 13:30:49 -0700
Subject: rpms/banshee/FC-5 .cvsignore, 1.4, 1.5 banshee.spec, 1.7,
	1.8 sources, 1.4, 1.5
Message-ID: <200604162030.k3GKUq4i028406@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/banshee/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28385

Modified Files:
	.cvsignore banshee.spec sources 
Log Message:
* Tue Mar 21 2006 Christopher Aillon <caillon at redhat.com> 0.10.9-1
- Update to 0.10.9



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/banshee/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	14 Mar 2006 16:57:31 -0000	1.4
+++ .cvsignore	16 Apr 2006 20:30:49 -0000	1.5
@@ -1 +1 @@
-banshee-0.10.8.tar.gz
+banshee-0.10.9.tar.gz


Index: banshee.spec
===================================================================
RCS file: /cvs/extras/rpms/banshee/FC-5/banshee.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- banshee.spec	14 Mar 2006 19:35:06 -0000	1.7
+++ banshee.spec	16 Apr 2006 20:30:49 -0000	1.8
@@ -1,6 +1,6 @@
 Name:    banshee
-Version: 0.10.8
-Release: 1
+Version: 0.10.9
+Release: 1.%{?dist}
 Summary: easily import, manage, and play selections from your music collection
 
 Group:   Applications/Multimedia
@@ -96,6 +96,9 @@
 %exclude %{_libdir}/banshee/*.la
 
 %changelog
+* Tue Mar 21 2006 Christopher Aillon <caillon at redhat.com> 0.10.9-1
+- Update to 0.10.9
+
 * Tue Mar 14 2006 Christopher Aillon <caillon at redhat.com> 0.10.8-1
 - Update to 0.10.8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/banshee/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Mar 2006 16:57:31 -0000	1.4
+++ sources	16 Apr 2006 20:30:49 -0000	1.5
@@ -1 +1 @@
-cfa4051cd8aba171a09dcb9a3f34fef3  banshee-0.10.8.tar.gz
+86b67e399ea805f69a860b3e6fd4627f  banshee-0.10.9.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 16 20:32:12 2006
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Sun, 16 Apr 2006 13:32:12 -0700
Subject: rpms/banshee/devel banshee.spec,1.8,1.9
Message-ID: <200604162032.k3GKWEBO028469@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/banshee/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28452

Modified Files:
	banshee.spec 
Log Message:



Index: banshee.spec
===================================================================
RCS file: /cvs/extras/rpms/banshee/devel/banshee.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- banshee.spec	16 Apr 2006 20:27:43 -0000	1.8
+++ banshee.spec	16 Apr 2006 20:32:12 -0000	1.9
@@ -1,6 +1,6 @@
 Name:    banshee
 Version: 0.10.9
-Release: 1
+Release: 1.%{?dist}
 Summary: easily import, manage, and play selections from your music collection
 
 Group:   Applications/Multimedia



From fedora-extras-commits at redhat.com  Sun Apr 16 22:05:51 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 16 Apr 2006 15:05:51 -0700
Subject: rpms/koffice/FC-5 koffice-kexi-version.patch, NONE, 1.1 .cvsignore, 
	1.9, 1.10 koffice.spec, 1.34, 1.35 sources, 1.9, 1.10
Message-ID: <200604162205.k3GM5rRn000522@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv458/FC-5

Modified Files:
	.cvsignore koffice.spec sources 
Added Files:
	koffice-kexi-version.patch 
Log Message:
- version upgrade
- merge fc5 -> fc4


koffice-kexi-version.patch:

--- NEW FILE koffice-kexi-version.patch ---
--- kexi/kexi_version.h.orig	2006-04-14 23:09:52.000000000 +0200
+++ kexi/kexi_version.h	2006-04-14 23:16:07.000000000 +0200
@@ -30,12 +30,12 @@
 #endif
 
 #ifndef KEXI_VERSION_STRING
-# define KEXI_VERSION_STRING "1.0 rc1"
+# define KEXI_VERSION_STRING "1.0"
 #endif
 
-#define KEXI_VERSION_MAJOR 0
-#define KEXI_VERSION_MINOR 9
-#define KEXI_VERSION_RELEASE 98
+#define KEXI_VERSION_MAJOR 1
+#define KEXI_VERSION_MINOR 0
+#define KEXI_VERSION_RELEASE 0
 
 #define KEXI_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c))
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	30 Mar 2006 12:07:42 -0000	1.9
+++ .cvsignore	16 Apr 2006 22:05:51 -0000	1.10
@@ -1 +1 @@
-koffice-1.5.0-rc1.tar.bz2
+koffice-1.5.0.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-5/koffice.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- koffice.spec	31 Mar 2006 08:22:02 -0000	1.34
+++ koffice.spec	16 Apr 2006 22:05:51 -0000	1.35
@@ -1,17 +1,17 @@
 Name:           koffice
 Version:        1.5.0
-Release:        0.1.rc1%{?dist}
+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/unstable/koffice-1.5-rc1/src/koffice-1.5.0-rc1.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-1.5.0.tar.bz2
 Source100:      koshell.png
 
 # stuff for the build configuration
 Patch0:         koffice-admin-gcc4isok.patch
-Patch1:         koffice-filters-krita-tiff.patch
+Patch1:         koffice-kexi-version.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # BuildRequires: world-devel ;)
@@ -78,6 +78,8 @@
 Requires:       koffice-krita
 Requires:       koffice-kugar
 Requires:       koffice-kexi
+Requires:       koffice-kexi-driver-mysql
+Requires:       koffice-kexi-driver-pgsql
 Requires:       koffice-kchart
 Requires:       koffice-kformula
 Requires:       koffice-filters
@@ -171,6 +173,23 @@
 
 %description kexi
 %{summary}
+For additional database drivers take a look at %{name}-kexi-driver-*
+
+%package kexi-driver-mysql
+Summary:        mysql-driver for kexi
+Group:          Applications/Productivity
+Requires:       %{name}-kexi = %{version}-%{release}
+
+%description kexi-driver-mysql
+%{summary}
+
+%package kexi-driver-pgsql
+Summary:        pgsql-driver for kexi
+Group:          Applications/Productivity
+Requires:       %{name}-kexi = %{version}-%{release}
+
+%description kexi-driver-pgsql
+%{summary}
 
 %package kchart
 Summary:        An integrated graph and chart drawing tool
@@ -206,9 +225,9 @@
 %{summary}
 
 %prep
-%setup -q -n %{name}-%{version}-rc1
+%setup -q
 %patch0 -p1
-%patch1 -p4
+%patch1
 
 # this will make sure that patch0 is considered
 make -f admin/Makefile.common
@@ -221,7 +240,7 @@
 --with-qt-libraries=$QTDIR/lib --with-extra-libs=%{_libdir} \
 --with-pgsqllibdir=%{_libdir} --with-pgsqlincdir=%{_includedir} \
 --with-pqxxlibdir=%{_libdir} --with-pqxxincdir=%{_includedir} \
---enable-final --enable-kexi-reports
+--enable-final
 
 make
 
@@ -351,13 +370,6 @@
   --delete-original \
   $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kugar.desktop
 
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kudesigner.desktop
-
 #kchart
 desktop-file-install \
   --vendor=fedora \
@@ -513,6 +525,8 @@
 %{_datadir}/apps/kofficewidgets/pics/kounitdoublespinbox2.png
 %{_datadir}/apps/kofficewidgets/pics/kounitdoublespincombobox.png
 %{_datadir}/apps/kross
+%{_libdir}/kde3/krosspython.*
+%{_libdir}/kde3/krossruby.*
 # why is this still here on fc5 and not on devel?
 %exclude %{_datadir}/mimelnk/image/x-raw.desktop
 
@@ -693,6 +707,7 @@
 %{_libdir}/kde3/libkritatiffexport.*
 %{_libdir}/kde3/libkritatiffimport.*
 %{_libdir}/kde3/kritaperftest.*
+%{_libdir}/kde3/krosskritacore.*
 %{_datadir}/apps/krita
 %{_datadir}/services/krita*.desktop
 %{_datadir}/servicetypes/krita*.desktop
@@ -718,7 +733,8 @@
 %{_datadir}/doc/HTML/en/kugar
 %{_datadir}/services/kugar*.desktop
 %{_datadir}/applications/fedora-kugar.desktop
-%{_datadir}/applications/fedora-kudesigner.desktop
+# this not being fedorarized fixes #173086
+%{_datadir}/applnk/Office/kudesigner.desktop
 
 %files kexi
 %defattr(-,root,root,-)
@@ -740,13 +756,9 @@
 %{_libdir}/libkexisql3.so.*
 %{_libdir}/libkformdesigner.so.*
 %{_libdir}/libkexiutils.so.*
-%{_libdir}/libkexireportutils.so.*
-%{_libdir}/kde3/kexihandler_report.*
-%{_libdir}/kde3/kexireportwidgets.*
 %{_libdir}/kde3/kformdesigner_containers.*
 %{_libdir}/kde3/kformdesigner_kexidbwidgets.*
 %{_libdir}/kde3/kformdesigner_stdwidgets.*
-%{_libdir}/kde3/kexidb_mysqldriver.*
 %{_libdir}/kde3/kexidb_sqlite2driver.*
 %{_libdir}/kde3/kexidb_sqlite3driver.*
 %{_libdir}/kde3/kexihandler_form.*
@@ -755,16 +767,10 @@
 %{_libdir}/kde3/kexihandler_relation.*
 %{_libdir}/kde3/kexihandler_script.*
 %{_libdir}/kde3/kexihandler_table.*
-%{_libdir}/kde3/keximigrate_mysql.*
 %{_libdir}/kde3/kexi.*
-%{_libdir}/kde3/kexidb_pqxxsqldriver.*
-%{_libdir}/kde3/keximigrate_pqxx.*
 %{_libdir}/kde3/kexihandler_csv_importexport.*
 %{_libdir}/kde3/krosskexiapp.*
 %{_libdir}/kde3/krosskexidb.*
-%{_libdir}/kde3/krosskritacore.*
-%{_libdir}/kde3/krosspython.*
-%{_libdir}/kde3/krossruby.*
 %{_libdir}/libkrossapi.so.*
 %{_libdir}/libkrossmain.so.*
 %{_datadir}/config/kexirc
@@ -772,14 +778,25 @@
 %{_datadir}/mimelnk/application/*
 %{_datadir}/servicetypes/kexi*.desktop
 %{_datadir}/services/kexi
-%{_datadir}/services/kexidb*
-%{_datadir}/services/keximigrate_mysql.desktop
-%{_datadir}/services/keximigrate_pqxx.desktop
 %{_datadir}/apps/kexi
 %{_datadir}/services/kformdesigner/*
 %{_datadir}/doc/HTML/en/kexi
 %{_datadir}/applications/fedora-kexi.desktop
+%{_datadir}/services/kexidb_sqlite*driver.desktop
+
+%files kexi-driver-mysql
+%defattr(-,root,root,-)
+%{_libdir}/kde3/kexidb_mysqldriver.*
+%{_libdir}/kde3/keximigrate_mysql.*
+%{_datadir}/services/keximigrate_mysql.desktop
+%{_datadir}/services/kexidb_mysqldriver.desktop
 
+%files kexi-driver-pgsql
+%defattr(-,root,root,-)
+%{_libdir}/kde3/kexidb_pqxxsqldriver.*
+%{_libdir}/kde3/keximigrate_pqxx.*
+%{_datadir}/services/kexidb_pqxxsqldriver.desktop
+%{_datadir}/services/keximigrate_pqxx.desktop
 
 %files kchart
 %defattr(-,root,root,-)
@@ -896,6 +913,12 @@
 %{_datadir}/applications/fedora-kplato.desktop
 
 %changelog
+* Fri Apr 14 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.5.0-1
+- split out kexi-drivers  (#188746) and fix some related issues
+- fix #173086
+- upgrade to final
+
 * Thu Mar 30 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.5.0-0.1.rc1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	30 Mar 2006 12:07:42 -0000	1.9
+++ sources	16 Apr 2006 22:05:51 -0000	1.10
@@ -1 +1 @@
-e9346977d18c67185d5b50f49ee8225b  koffice-1.5.0-rc1.tar.bz2
+220b6bde28b5ebd5c6621bc87ca2c05f  koffice-1.5.0.tar.bz2



From fedora-extras-commits at redhat.com  Sun Apr 16 22:05:51 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 16 Apr 2006 15:05:51 -0700
Subject: rpms/koffice/FC-4 .cvsignore, 1.6, 1.7 koffice.spec, 1.11,
	1.12 sources, 1.6, 1.7 koffice-CAN-2005-3193.diff, 1.1,
	NONE koffice-krita-kisfilter.patch, 1.1, NONE
Message-ID: <200604162205.k3GM5rR3000516@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv458/FC-4

Modified Files:
	.cvsignore koffice.spec sources 
Removed Files:
	koffice-CAN-2005-3193.diff koffice-krita-kisfilter.patch 
Log Message:
- version upgrade
- merge fc5 -> fc4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	15 Oct 2005 23:11:32 -0000	1.6
+++ .cvsignore	16 Apr 2006 22:05:51 -0000	1.7
@@ -1 +1 @@
-koffice-1.4.2.tar.bz2
+koffice-1.5.0.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-4/koffice.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- koffice.spec	13 Dec 2005 09:55:00 -0000	1.11
+++ koffice.spec	16 Apr 2006 22:05:51 -0000	1.12
@@ -1,20 +1,17 @@
 Name:           koffice
-Version:        1.4.2
-Release:        2%{?dist}
+Version:        1.5.0
+Release:        1%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity
 License:        GPL/LGPL
 URL:            http://www.koffice.org/
-Source0:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-1.4.2.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-1.5.0.tar.bz2
 Source100:      koshell.png
 
 # stuff for the build configuration
 Patch0:         koffice-admin-gcc4isok.patch
-# CAN-2005-3193 see #175260
-Patch1:         koffice-CAN-2005-3193.diff
-
-Patch100:       koffice-krita-kisfilter.patch
+Patch1:         koffice-kexi-version.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # BuildRequires: world-devel ;)
@@ -55,6 +52,12 @@
 BuildRequires:  doxygen
 BuildRequires:  graphviz-devel
 BuildRequires:  aspell-devel
+BuildRequires:  libacl-devel
+BuildRequires:  libxslt-devel
+BuildRequires:  OpenEXR-devel
+BuildRequires:  libexif-devel
+BuildRequires:  readline-devel
+BuildRequires:  ruby ruby-devel
 
 %description
 KOffice - Integrated Office Suite
@@ -74,9 +77,12 @@
 Requires:       koffice-krita
 Requires:       koffice-kugar
 Requires:       koffice-kexi
+Requires:       koffice-kexi-driver-mysql
+Requires:       koffice-kexi-driver-pgsql
 Requires:       koffice-kchart
 Requires:       koffice-kformula
 Requires:       koffice-filters
+Requires:       koffice-kplato
 
 %description suite
 KOffice - Integrated Office Suite
@@ -129,6 +135,7 @@
 Summary:        A flowcharting application
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{version}-%{release}
+Requires:       kdegraphics
 Obsoletes:      kivio
 
 %description kivio
@@ -165,6 +172,23 @@
 
 %description kexi
 %{summary}
+For additional database drivers take a look at %{name}-kexi-driver-*
+
+%package kexi-driver-mysql
+Summary:        mysql-driver for kexi
+Group:          Applications/Productivity
+Requires:       %{name}-kexi = %{version}-%{release}
+
+%description kexi-driver-mysql
+%{summary}
+
+%package kexi-driver-pgsql
+Summary:        pgsql-driver for kexi
+Group:          Applications/Productivity
+Requires:       %{name}-kexi = %{version}-%{release}
+
+%description kexi-driver-pgsql
+%{summary}
 
 %package kchart
 Summary:        An integrated graph and chart drawing tool
@@ -191,11 +215,18 @@
 %description filters
 %{summary}
 
+%package kplato
+Summary:         An integrated project management and planning tool
+Group:           Applications/Productivity
+Requires:        %{name}-core = %{version}-%{release}
+
+%description kplato
+%{summary}
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1
-%patch100
 
 # this will make sure that patch0 is considered
 make -f admin/Makefile.common
@@ -207,7 +238,8 @@
 --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}
+--with-pqxxlibdir=%{_libdir} --with-pqxxincdir=%{_includedir} \
+--enable-final
 
 make
 
@@ -247,14 +279,6 @@
   --delete-original \
   $RPM_BUILD_ROOT%{_datadir}/applnk/Office/koshell.desktop
 
-# kformdesigner
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/kformdesigner.desktop
-
 #kword
 desktop-file-install \
   --vendor=fedora \
@@ -300,22 +324,50 @@
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category=X-Fedora \
   --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/krita.desktop
+  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_jpeg.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
+  $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/kudesigner.desktop
+  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kugar.desktop
 
 #kchart
 desktop-file-install \
@@ -347,7 +399,17 @@
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category=X-Fedora \
   --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/kexi.desktop
+  $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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -388,33 +450,38 @@
 %post filters -p /sbin/ldconfig
 %postun filters -p /sbin/ldconfig 
 
+%post kplato -p /sbin/ldconfig
+%postun kplato -p /sbin/ldconfig
+
 %files suite
 #empty => virtual package
 
 %files core
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING.LIB README
-%{_bindir}/koscript
 %{_bindir}/koshell
 %{_bindir}/kthesaurus
 %{_bindir}/koconverter
-%{_libdir}/libkdeinit_koshell.*
-%{_libdir}/libkdeinit_kthesaurus.*
-%{_libdir}/libkdchart.*
-%{_libdir}/libkochart.*
-%{_libdir}/libkofficecore.*
-%{_libdir}/libkofficeui.*
-%{_libdir}/libkoscript.*
-%{_libdir}/libkotext.*
-%{_libdir}/libkowmf.*
-%{_libdir}/libkopainter.*
-%{_libdir}/libkstore.*
-%{_libdir}/libkwmailmerge_interface.*
-%{_libdir}/libkwmf.*
-%{_libdir}/libkdeinit_kformula.*
-%{_libdir}/libkformulalib.*
+%{_libdir}/libkdeinit_koshell.so
+%{_libdir}/libkdeinit_kthesaurus.so
+%{_libdir}/libkdchart.so.*
+%{_libdir}/libkochart.so.*
+%{_libdir}/libkofficecore.so.*
+%{_libdir}/libkofficeui.so.*
+%{_libdir}/libkotext.so.*
+%{_libdir}/libkowmf.so.*
+%{_libdir}/libkopainter.so.*
+%{_libdir}/libkstore.so.*
+%{_libdir}/libkwmailmerge_interface.so.*
+%{_libdir}/libkwmf.so.*
+%{_libdir}/libkdeinit_kformula.so
+%{_libdir}/libkformulalib.so.*
+%{_libdir}/libkopalette.so.*
+%{_libdir}/libkoproperty.so.*
 %{_libdir}/kde3/kfile_koffice.*
 %{_libdir}/kde3/kfile_ooo.*
+%{_libdir}/kde3/kfile_abiword.*
+%{_libdir}/kde3/kfile_gnumeric.*
 %{_libdir}/kde3/kodocinfopropspage.*
 %{_libdir}/kde3/kofficescan.*
 %{_libdir}/kde3/kofficethumbnail.*
@@ -452,15 +519,26 @@
 %{_datadir}/servicetypes/widgetfactory.desktop
 %{_datadir}/applications/fedora-KThesaurus.desktop
 %{_datadir}/applications/fedora-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
+%{_libdir}/kde3/krosspython.*
+%{_libdir}/kde3/krossruby.*
+# why is this still here on fc5 and not on devel?
+%exclude %{_datadir}/mimelnk/image/x-raw.desktop
 
 %files devel
 %{_includedir}/*
 %{_datadir}/doc/HTML/en/koffice-apidocs
+%{_libdir}/*.so
 
 %files kword
 %defattr(-,root,root,-)
 %{_bindir}/kword
-%{_libdir}/libkdeinit_kword.*
+%{_libdir}/libkdeinit_kword.so
+%{_libdir}/libkwordprivate.so.*
 %{_libdir}/kde3/libkwordpart.*
 %{_libdir}/kde3/kword.*
 %{_datadir}/apps/kword
@@ -474,8 +552,8 @@
 %files kspread
 %defattr(-,root,root,-)
 %{_bindir}/kspread
-%{_libdir}/libkdeinit_kspread.*
-%{_libdir}/libkspreadcommon.*
+%{_libdir}/libkdeinit_kspread.so
+%{_libdir}/libkspreadcommon.so.*
 %{_libdir}/kde3/kspread.*
 %{_libdir}/kde3/libkspreadpart.*
 %{_libdir}/kde3/kwmailmerge_kspread.*
@@ -499,10 +577,19 @@
 %defattr(-,root,root,-)
 %{_bindir}/kpresenter
 %{_bindir}/kprconverter.pl
-%{_libdir}/libkdeinit_kpresenter.*
+%{_libdir}/libkdeinit_kpresenter.so
+%{_libdir}/libkpresenterimageexport.so.*
+%{_libdir}/libkpresenterprivate.so.*
 %{_libdir}/kde3/libkpresenterpart.*
 %{_libdir}/kde3/kformula.*
 %{_libdir}/kde3/kpresenter.*
+%{_libdir}/kde3/libkpresenterbmpexport.*
+%{_libdir}/kde3/libkpresenterjpegexport.*
+%{_libdir}/kde3/libkpresentermngexport.*
+%{_libdir}/kde3/libkpresenterpngexport.*
+%{_libdir}/kde3/libkpresentersvgexport.*
+%{_libdir}/kde3/libkpresenterxbmexport.*
+%{_libdir}/kde3/libkpresenterxpmexport.*
 %{_datadir}/apps/kpresenter
 %{_datadir}/doc/HTML/en/kpresenter
 %{_datadir}/services/kpresenter*.desktop
@@ -513,9 +600,9 @@
 %files karbon
 %defattr(-,root,root,-)
 %{_bindir}/karbon
-%{_libdir}/libkdeinit_karbon.*
-%{_libdir}/libkarbonbase.*
-%{_libdir}/libkarboncommon.*
+%{_libdir}/libkdeinit_karbon.so
+%{_libdir}/libkarboncommon.so.*
+%{_libdir}/kde3/karbon_defaulttools.*
 %{_libdir}/kde3/karbon_flattenpathplugin.*
 %{_libdir}/kde3/karbon_imagetoolplugin.*
 %{_libdir}/kde3/karbon_insertknotsplugin.*
@@ -540,12 +627,25 @@
 %{_datadir}/templates/Illustration.desktop
 %{_datadir}/templates/.source/Illustration.karbon
 %{_datadir}/applications/fedora-karbon.desktop
+%{_datadir}/doc/HTML/en/karbon/
 
 %files krita
 %defattr(-,root,root,-)
 %{_bindir}/krita
-%{_libdir}/libkdeinit_krita.*
-%{_libdir}/libkritacommon.*
+%{_libdir}/libkdeinit_krita.so
+%{_libdir}/libkrita_cmyk_u16.so.*
+%{_libdir}/libkrita_gray_u16.so.*
+%{_libdir}/libkrita_lms_f32.so.*
+%{_libdir}/libkrita_rgb_f16half.so.*
+%{_libdir}/libkrita_rgb_f32.so.*
+%{_libdir}/libkrita_rgb_u16.so.*
+%{_libdir}/libkritacolor.so.*
+%{_libdir}/libkritagrayscale.so.*
+%{_libdir}/libkritaimage.so.*
+%{_libdir}/libkritargb.so.*
+%{_libdir}/libkritascripting.so.*
+%{_libdir}/libkritaui.so.*
+%{_libdir}/libkritacommon.so.*
 %{_libdir}/kde3/kritacimg.*
 %{_libdir}/kde3/kritacolorrange.*
 %{_libdir}/kde3/kritacolorsfilters.*
@@ -575,20 +675,54 @@
 %{_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.*
+%{_libdir}/kde3/krita_rgb_f16half_plugin.*
+%{_libdir}/kde3/krita_rgb_f32_plugin.*
+%{_libdir}/kde3/krita_rgb_u16_plugin.*
+%{_libdir}/kde3/kritabumpmap.*
+%{_libdir}/kde3/kritacmykplugin.*
+%{_libdir}/kde3/kritadropshadow.*
+%{_libdir}/kde3/kritafiltersgallery.*
+%{_libdir}/kde3/kritahistogramdocker.*
+%{_libdir}/kde3/kritaimageenhancement.*
+%{_libdir}/kde3/kritapixelizefilter.*
+%{_libdir}/kde3/kritaroundcornersfilter.*
+%{_libdir}/kde3/kritascripting.*
+%{_libdir}/kde3/kritaseparatechannels.*
+%{_libdir}/kde3/kritasmalltilesfilter.*
+%{_libdir}/kde3/kritasmearybrush.*
+%{_libdir}/kde3/kritasobelfilter.*
+%{_libdir}/kde3/kritatoolselectsimilar.*
+%{_libdir}/kde3/kritawetplugin.*
+%{_libdir}/kde3/libkrita_openexr_export.*
+%{_libdir}/kde3/libkrita_openexr_import.*
+%{_libdir}/kde3/libkrita_raw_import.*
+%{_libdir}/kde3/libkritajpegexport.*
+%{_libdir}/kde3/libkritajpegimport.*
+%{_libdir}/kde3/libkritapngexport.*
+%{_libdir}/kde3/libkritapngimport.*
+%{_libdir}/kde3/libkritatiffexport.*
+%{_libdir}/kde3/libkritatiffimport.*
+%{_libdir}/kde3/kritaperftest.*
+%{_libdir}/kde3/krosskritacore.*
 %{_datadir}/apps/krita
 %{_datadir}/services/krita*.desktop
 %{_datadir}/servicetypes/krita*.desktop
-%{_datadir}/applications/fedora-krita.desktop
-%{_datadir}/applications/fedora-krita_magick.desktop
+%{_datadir}/applications/fedora-krita*.desktop
+%{_datadir}/apps/kritaplugins
+%{_datadir}/doc/HTML/en/krita
+%{_datadir}/servicetypes/karbon_module.desktop
 
 %files kugar
 %defattr(-,root,root,-)
 %{_bindir}/kugar
 %{_bindir}/kudesigner
-%{_libdir}/libkdeinit_kugar.*
-%{_libdir}/libkdeinit_kudesigner.*
-%{_libdir}/libkugarlib.*
-%{_libdir}/libkudesignercore.*
+%{_libdir}/libkdeinit_kugar.so
+%{_libdir}/libkdeinit_kudesigner.so
+%{_libdir}/libkugarlib.so.*
+%{_libdir}/libkudesignercore.so
 %{_libdir}/kde3/kudesigner.*
 %{_libdir}/kde3/kugar.*
 %{_libdir}/kde3/libkudesignerpart.*
@@ -598,71 +732,86 @@
 %{_datadir}/doc/HTML/en/kugar
 %{_datadir}/services/kugar*.desktop
 %{_datadir}/applications/fedora-kugar.desktop
-%{_datadir}/applications/fedora-kudesigner.desktop
+# this not being fedorarized fixes #173086
+%{_datadir}/applnk/Office/kudesigner.desktop
 
 %files kexi
 %defattr(-,root,root,-)
 %{_bindir}/kexi
-%{_bindir}/keximigratetest
-%{_bindir}/kformdesigner
 %{_bindir}/ksqlite*
-%{_libdir}/libkdeinit_kexi.*
-%{_libdir}/libkexicore.*
-%{_libdir}/libkexidatatable.*
-%{_libdir}/libkexidbparser.*
-%{_libdir}/libkexidb.*
-%{_libdir}/libkexiextendedwidgets.*
-%{_libdir}/libkexiformutils.*
-%{_libdir}/libkexiguiutils.*
-%{_libdir}/libkeximain.*
-%{_libdir}/libkeximigrate.*
-%{_libdir}/libkexipropertyeditor.*
-%{_libdir}/libkexirelationsview.*
-%{_libdir}/libkexisql2.*
-%{_libdir}/libkexisql3.*
-%{_libdir}/libkformdesigner.*
-%{_libdir}/kde3/kexidb_mysqldriver.*
+%{_bindir}/krossrunner
+%{_libdir}/libkdeinit_kexi.so
+%{_libdir}/libkexicore.so.*
+%{_libdir}/libkexidatatable.so.*
+%{_libdir}/libkexidbparser.so.*
+%{_libdir}/libkexidb.so.*
+%{_libdir}/libkexiextendedwidgets.so.*
+%{_libdir}/libkexiformutils.so.*
+%{_libdir}/libkexiguiutils.so.*
+%{_libdir}/libkeximain.so.*
+%{_libdir}/libkeximigrate.so.*
+%{_libdir}/libkexirelationsview.so.*
+%{_libdir}/libkexisql2.so.*
+%{_libdir}/libkexisql3.so.*
+%{_libdir}/libkformdesigner.so.*
+%{_libdir}/libkexiutils.so.*
+%{_libdir}/kde3/kformdesigner_containers.*
+%{_libdir}/kde3/kformdesigner_kexidbwidgets.*
+%{_libdir}/kde3/kformdesigner_stdwidgets.*
 %{_libdir}/kde3/kexidb_sqlite2driver.*
 %{_libdir}/kde3/kexidb_sqlite3driver.*
-%{_libdir}/kde3/kexidbwidgets.*
 %{_libdir}/kde3/kexihandler_form.*
 %{_libdir}/kde3/kexihandler_migration.*
 %{_libdir}/kde3/kexihandler_query.*
 %{_libdir}/kde3/kexihandler_relation.*
 %{_libdir}/kde3/kexihandler_script.*
 %{_libdir}/kde3/kexihandler_table.*
-%{_libdir}/kde3/keximigrate_mysql.*
 %{_libdir}/kde3/kexi.*
-%{_libdir}/kde3/libkformdesigner_part.*
-%{_libdir}/kde3/kexidb_pqxxsqldriver.*
-%{_libdir}/kde3/keximigrate_pqxx.*
-%{_libdir}/kde3/containers.*
-%{_libdir}/kde3/stdwidgets.*
+%{_libdir}/kde3/kexihandler_csv_importexport.*
+%{_libdir}/kde3/krosskexiapp.*
+%{_libdir}/kde3/krosskexidb.*
+%{_libdir}/libkrossapi.so.*
+%{_libdir}/libkrossmain.so.*
 %{_datadir}/config/kexirc
 %{_datadir}/config/magic/kexi.magic
 %{_datadir}/mimelnk/application/*
 %{_datadir}/servicetypes/kexi*.desktop
 %{_datadir}/services/kexi
-%{_datadir}/services/kexidb*
-%{_datadir}/services/keximigrate_mysql.desktop
-%{_datadir}/services/keximigrate_pqxx.desktop
 %{_datadir}/apps/kexi
-%{_datadir}/apps/kformdesigner
-%{_datadir}/apps/kformdesigner_part
 %{_datadir}/services/kformdesigner/*
-%{_datadir}/services/kformdesigner_part.desktop
-%{_datadir}/applications/fedora-kformdesigner.desktop
+%{_datadir}/doc/HTML/en/kexi
 %{_datadir}/applications/fedora-kexi.desktop
+%{_datadir}/services/kexidb_sqlite*driver.desktop
+
+%files kexi-driver-mysql
+%defattr(-,root,root,-)
+%{_libdir}/kde3/kexidb_mysqldriver.*
+%{_libdir}/kde3/keximigrate_mysql.*
+%{_datadir}/services/keximigrate_mysql.desktop
+%{_datadir}/services/kexidb_mysqldriver.desktop
+
+%files kexi-driver-pgsql
+%defattr(-,root,root,-)
+%{_libdir}/kde3/kexidb_pqxxsqldriver.*
+%{_libdir}/kde3/keximigrate_pqxx.*
+%{_datadir}/services/kexidb_pqxxsqldriver.desktop
+%{_datadir}/services/keximigrate_pqxx.desktop
 
 %files kchart
 %defattr(-,root,root,-)
 %{_bindir}/kchart
-%{_libdir}/libkchartcommon.*
-%{_libdir}/libkdeinit_kchart.*
+%{_libdir}/libkchartcommon.so.*
+%{_libdir}/libkdeinit_kchart.so
+%{_libdir}/libkchartimageexport.so.*
 %{_libdir}/kde3/kchart.*
 %{_libdir}/kde3/libkchartpart.*
 %{_libdir}/kde3/libkchartpngexport.*
 %{_libdir}/kde3/libkchartsvgexport.*
+%{_libdir}/kde3/libkchartbmpexport.*
+%{_libdir}/kde3/libkchartjpegexport.*
+%{_libdir}/kde3/libkchartmngexport.*
+%{_libdir}/kde3/libkchartxbmexport.*
+%{_libdir}/kde3/libkchartxpmexport.*
 %{_datadir}/apps/kchart
 %{_datadir}/services/kchart*.desktop
 %{_datadir}/doc/HTML/en/kchart
@@ -681,16 +830,17 @@
 %files kivio
 %defattr(-,root,root,-)
 %{_bindir}/kivio
-%{_libdir}/libkdeinit_kivio.*
-%{_libdir}/libkiviocommon.*
-%{_libdir}/libkivioconnectortool.*
-%{_libdir}/libkivioselecttool.*
-%{_libdir}/libkiviotargettool.*
-%{_libdir}/libkiviotexttool.*
-%{_libdir}/libkiviozoomtool.*
+%{_libdir}/libkdeinit_kivio.so
+%{_libdir}/libkiviocommon.so.*
 %{_libdir}/kde3/kivio.*
 %{_libdir}/kde3/libkiviopart.*
 %{_libdir}/kde3/straight_connector.*
+%{_libdir}/kde3/libkivioconnectortool.*
+%{_libdir}/kde3/libkivioimageexport.*
+%{_libdir}/kde3/libkivioselecttool.*
+%{_libdir}/kde3/libkiviotargettool.*
+%{_libdir}/kde3/libkiviotexttool.*
+%{_libdir}/kde3/libkiviozoomtool.*
 %{_datadir}/apps/kivio
 %{_datadir}/config.kcfg/kivio.kcfg
 %{_datadir}/doc/HTML/en/kivio
@@ -699,7 +849,7 @@
 
 %files filters
 %defattr(-,root,root,-)
-%{_libdir}/libkwordexportfilters.*
+%{_libdir}/libkwordexportfilters.so.*
 %{_libdir}/kde3/libabiwordexport.*
 %{_libdir}/kde3/libabiwordimport.*
 %{_libdir}/kde3/libamiproexport.*
@@ -725,7 +875,6 @@
 %{_libdir}/kde3/libkwordlatexexport.*
 %{_libdir}/kde3/libmswriteexport.*
 %{_libdir}/kde3/libmswriteimport.*
-%{_libdir}/kde3/libolefilter.*
 %{_libdir}/kde3/libooimpressexport.*
 %{_libdir}/kde3/libooimpressimport.*
 %{_libdir}/kde3/liboowriterexport.*
@@ -742,25 +891,84 @@
 %{_libdir}/kde3/libmswordimport.*
 %{_libdir}/kde3/libxsltimport.*
 %{_libdir}/kde3/libxsltexport.*
+%{_libdir}/kde3/libhancomwordimport.*
+%{_libdir}/kde3/libkfosvgexport.*
+%{_libdir}/kde3/liboodrawimport.*
+%{_libdir}/kde3/libpowerpointimport.*
 %{_datadir}/apps/xsltfilter
 %{_datadir}/services/generic_filter.desktop
-%{_datadir}/services/ole*.desktop
 %{_datadir}/services/xslt*.desktop
 %{_datadir}/servicetypes/kofilter*.desktop
 
+%files kplato
+%defattr(-,root,root,-)
+%{_bindir}/kplato
+%{_libdir}/libkdeinit_kplato.so
+%{_libdir}/kde3/kplato.*
+%{_libdir}/kde3/libkplatopart.*
+%{_datadir}/apps/kplato
+%{_datadir}/doc/HTML/en/kplato
+%{_datadir}/services/kplatopart.desktop
+%{_datadir}/applications/fedora-kplato.desktop
+
 %changelog
+* Fri Apr 14 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.5.0-1
+- split out kexi-drivers  (#188746) and fix some related issues
+- fix #173086
+- upgrade to final
+
+* Thu Mar 30 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.5.0-0.1.rc1
+- version upgrade
+
+* Mon Mar 13 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.4.95-1
+- version upgrade
+
+* Sun Feb 26 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.4.90-4
+- kivio requires kdegraphics (#182289)
+
+* Wed Feb 08 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.4.90-3
+- exclude mimelnk/image/x-raw.desktop (#180335)
+
+* Mon Feb 06 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.4.90-2
+- enable ruby again (bug #179835)
+
+* Wed Feb 01 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.4.90-1
+- version upgrade
+- better split libdir/*.so -> -devel, libdir/*.so.* -> packages
+  libdir/*.la -> trash; libdir/.* -> packages
+
 * Thu Dec 08 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-1.4.2-2
+1.4.2-3
 - fix CAN-2005-3193
-- add compile patch for krita
+- gcc 4.1.0:
+    - add krita compile fixes
+    - add kspread compile fixes
+    - add kexi compile fixes
 
-* Fri Oct 14 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+* Thu Nov 10 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.4.2-2
+- remove xorg-x11-devel BR
+- rebuild
+
+* Sun Oct 16 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.4.2-1
 - version upgrade
 
 * Wed Sep 28 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.4.1-6
+- add patch for qt-3.3.5 problem
+- get devel working
+
+* Tue Sep 27 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.4.1-5
-- rebuild
+- try to fix devel build
 
 * Tue Aug 16 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.4.1-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	15 Oct 2005 23:11:32 -0000	1.6
+++ sources	16 Apr 2006 22:05:51 -0000	1.7
@@ -1 +1 @@
-6b456fb7d54c84b11396b27a96ae0cf8  koffice-1.4.2.tar.bz2
+220b6bde28b5ebd5c6621bc87ca2c05f  koffice-1.5.0.tar.bz2


--- koffice-CAN-2005-3193.diff DELETED ---


--- koffice-krita-kisfilter.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Apr 16 22:05:52 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 16 Apr 2006 15:05:52 -0700
Subject: rpms/koffice/devel koffice-kexi-version.patch, NONE, 1.1 .cvsignore,
	1.9, 1.10 koffice.spec, 1.33, 1.34 sources, 1.9,
	1.10 koffice-filters-krita-tiff.patch, 1.1, NONE
Message-ID: <200604162205.k3GM5sLt000530@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv458/devel

Modified Files:
	.cvsignore koffice.spec sources 
Added Files:
	koffice-kexi-version.patch 
Removed Files:
	koffice-filters-krita-tiff.patch 
Log Message:
- version upgrade
- merge fc5 -> fc4


koffice-kexi-version.patch:

--- NEW FILE koffice-kexi-version.patch ---
--- kexi/kexi_version.h.orig	2006-04-14 23:09:52.000000000 +0200
+++ kexi/kexi_version.h	2006-04-14 23:16:07.000000000 +0200
@@ -30,12 +30,12 @@
 #endif
 
 #ifndef KEXI_VERSION_STRING
-# define KEXI_VERSION_STRING "1.0 rc1"
+# define KEXI_VERSION_STRING "1.0"
 #endif
 
-#define KEXI_VERSION_MAJOR 0
-#define KEXI_VERSION_MINOR 9
-#define KEXI_VERSION_RELEASE 98
+#define KEXI_VERSION_MAJOR 1
+#define KEXI_VERSION_MINOR 0
+#define KEXI_VERSION_RELEASE 0
 
 #define KEXI_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c))
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	30 Mar 2006 12:07:43 -0000	1.9
+++ .cvsignore	16 Apr 2006 22:05:52 -0000	1.10
@@ -1 +1 @@
-koffice-1.5.0-rc1.tar.bz2
+koffice-1.5.0.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- koffice.spec	30 Mar 2006 12:07:43 -0000	1.33
+++ koffice.spec	16 Apr 2006 22:05:52 -0000	1.34
@@ -1,17 +1,17 @@
 Name:           koffice
 Version:        1.5.0
-Release:        0.1.rc1%{?dist}
+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/unstable/koffice-1.5-rc1/src/koffice-1.5.0-rc1.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-1.5.0.tar.bz2
 Source100:      koshell.png
 
 # stuff for the build configuration
 Patch0:         koffice-admin-gcc4isok.patch
-Patch1:         koffice-filters-krita-tiff.patch
+Patch1:         koffice-kexi-version.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # BuildRequires: world-devel ;)
@@ -78,6 +78,8 @@
 Requires:       koffice-krita
 Requires:       koffice-kugar
 Requires:       koffice-kexi
+Requires:       koffice-kexi-driver-mysql
+Requires:       koffice-kexi-driver-pgsql
 Requires:       koffice-kchart
 Requires:       koffice-kformula
 Requires:       koffice-filters
@@ -171,6 +173,23 @@
 
 %description kexi
 %{summary}
+For additional database drivers take a look at %{name}-kexi-driver-*
+
+%package kexi-driver-mysql
+Summary:        mysql-driver for kexi
+Group:          Applications/Productivity
+Requires:       %{name}-kexi = %{version}-%{release}
+
+%description kexi-driver-mysql
+%{summary}
+
+%package kexi-driver-pgsql
+Summary:        pgsql-driver for kexi
+Group:          Applications/Productivity
+Requires:       %{name}-kexi = %{version}-%{release}
+
+%description kexi-driver-pgsql
+%{summary}
 
 %package kchart
 Summary:        An integrated graph and chart drawing tool
@@ -206,9 +225,9 @@
 %{summary}
 
 %prep
-%setup -q -n %{name}-%{version}-rc1
+%setup -q
 %patch0 -p1
-%patch1 -p4
+%patch1
 
 # this will make sure that patch0 is considered
 make -f admin/Makefile.common
@@ -221,7 +240,7 @@
 --with-qt-libraries=$QTDIR/lib --with-extra-libs=%{_libdir} \
 --with-pgsqllibdir=%{_libdir} --with-pgsqlincdir=%{_includedir} \
 --with-pqxxlibdir=%{_libdir} --with-pqxxincdir=%{_includedir} \
---enable-final --enable-kexi-reports
+--enable-final
 
 make
 
@@ -351,13 +370,6 @@
   --delete-original \
   $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kugar.desktop
 
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kudesigner.desktop
-
 #kchart
 desktop-file-install \
   --vendor=fedora \
@@ -513,6 +525,10 @@
 %{_datadir}/apps/kofficewidgets/pics/kounitdoublespinbox2.png
 %{_datadir}/apps/kofficewidgets/pics/kounitdoublespincombobox.png
 %{_datadir}/apps/kross
+%{_libdir}/kde3/krosspython.*
+%{_libdir}/kde3/krossruby.*
+# why is this still here on fc5 and not on devel?
+%exclude %{_datadir}/mimelnk/image/x-raw.desktop
 
 %files devel
 %{_includedir}/*
@@ -691,6 +707,7 @@
 %{_libdir}/kde3/libkritatiffexport.*
 %{_libdir}/kde3/libkritatiffimport.*
 %{_libdir}/kde3/kritaperftest.*
+%{_libdir}/kde3/krosskritacore.*
 %{_datadir}/apps/krita
 %{_datadir}/services/krita*.desktop
 %{_datadir}/servicetypes/krita*.desktop
@@ -716,7 +733,8 @@
 %{_datadir}/doc/HTML/en/kugar
 %{_datadir}/services/kugar*.desktop
 %{_datadir}/applications/fedora-kugar.desktop
-%{_datadir}/applications/fedora-kudesigner.desktop
+# this not being fedorarized fixes #173086
+%{_datadir}/applnk/Office/kudesigner.desktop
 
 %files kexi
 %defattr(-,root,root,-)
@@ -738,13 +756,9 @@
 %{_libdir}/libkexisql3.so.*
 %{_libdir}/libkformdesigner.so.*
 %{_libdir}/libkexiutils.so.*
-%{_libdir}/libkexireportutils.so.*
-%{_libdir}/kde3/kexihandler_report.*
-%{_libdir}/kde3/kexireportwidgets.*
 %{_libdir}/kde3/kformdesigner_containers.*
 %{_libdir}/kde3/kformdesigner_kexidbwidgets.*
 %{_libdir}/kde3/kformdesigner_stdwidgets.*
-%{_libdir}/kde3/kexidb_mysqldriver.*
 %{_libdir}/kde3/kexidb_sqlite2driver.*
 %{_libdir}/kde3/kexidb_sqlite3driver.*
 %{_libdir}/kde3/kexihandler_form.*
@@ -753,16 +767,10 @@
 %{_libdir}/kde3/kexihandler_relation.*
 %{_libdir}/kde3/kexihandler_script.*
 %{_libdir}/kde3/kexihandler_table.*
-%{_libdir}/kde3/keximigrate_mysql.*
 %{_libdir}/kde3/kexi.*
-%{_libdir}/kde3/kexidb_pqxxsqldriver.*
-%{_libdir}/kde3/keximigrate_pqxx.*
 %{_libdir}/kde3/kexihandler_csv_importexport.*
 %{_libdir}/kde3/krosskexiapp.*
 %{_libdir}/kde3/krosskexidb.*
-%{_libdir}/kde3/krosskritacore.*
-%{_libdir}/kde3/krosspython.*
-%{_libdir}/kde3/krossruby.*
 %{_libdir}/libkrossapi.so.*
 %{_libdir}/libkrossmain.so.*
 %{_datadir}/config/kexirc
@@ -770,14 +778,25 @@
 %{_datadir}/mimelnk/application/*
 %{_datadir}/servicetypes/kexi*.desktop
 %{_datadir}/services/kexi
-%{_datadir}/services/kexidb*
-%{_datadir}/services/keximigrate_mysql.desktop
-%{_datadir}/services/keximigrate_pqxx.desktop
 %{_datadir}/apps/kexi
 %{_datadir}/services/kformdesigner/*
 %{_datadir}/doc/HTML/en/kexi
 %{_datadir}/applications/fedora-kexi.desktop
+%{_datadir}/services/kexidb_sqlite*driver.desktop
+
+%files kexi-driver-mysql
+%defattr(-,root,root,-)
+%{_libdir}/kde3/kexidb_mysqldriver.*
+%{_libdir}/kde3/keximigrate_mysql.*
+%{_datadir}/services/keximigrate_mysql.desktop
+%{_datadir}/services/kexidb_mysqldriver.desktop
 
+%files kexi-driver-pgsql
+%defattr(-,root,root,-)
+%{_libdir}/kde3/kexidb_pqxxsqldriver.*
+%{_libdir}/kde3/keximigrate_pqxx.*
+%{_datadir}/services/kexidb_pqxxsqldriver.desktop
+%{_datadir}/services/keximigrate_pqxx.desktop
 
 %files kchart
 %defattr(-,root,root,-)
@@ -894,6 +913,12 @@
 %{_datadir}/applications/fedora-kplato.desktop
 
 %changelog
+* Fri Apr 14 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.5.0-1
+- split out kexi-drivers  (#188746) and fix some related issues
+- fix #173086
+- upgrade to final
+
 * Thu Mar 30 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.5.0-0.1.rc1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	30 Mar 2006 12:07:43 -0000	1.9
+++ sources	16 Apr 2006 22:05:52 -0000	1.10
@@ -1 +1 @@
-e9346977d18c67185d5b50f49ee8225b  koffice-1.5.0-rc1.tar.bz2
+220b6bde28b5ebd5c6621bc87ca2c05f  koffice-1.5.0.tar.bz2


--- koffice-filters-krita-tiff.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Apr 16 22:10:10 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 16 Apr 2006 15:10:10 -0700
Subject: rpms/wine-docs/FC-5 .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 wine-docs.spec, 1.8, 1.9
Message-ID: <200604162210.k3GMAgL4000660@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-serv580/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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	3 Apr 2006 08:44:29 -0000	1.8
+++ .cvsignore	16 Apr 2006 22:10:10 -0000	1.9
@@ -1 +1 @@
-wine-docs-0.9.11.tar.bz2
+wine-docs-0.9.12.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	3 Apr 2006 08:44:29 -0000	1.8
+++ sources	16 Apr 2006 22:10:10 -0000	1.9
@@ -1 +1 @@
-a9de221c2a1442270f4eec1066379598  wine-docs-0.9.11.tar.bz2
+cc53497878f78681e85219eff2bf67ae  wine-docs-0.9.12.tar.bz2


Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-5/wine-docs.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wine-docs.spec	3 Apr 2006 08:44:29 -0000	1.8
+++ wine-docs.spec	16 Apr 2006 22:10:10 -0000	1.9
@@ -1,12 +1,12 @@
 Name:           wine-docs
-Version:        0.9.11
+Version:        0.9.12
 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.11.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.12.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
+* Fri Apr 14 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.12-1
+- version upgrade
+
 * Mon Apr 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.11-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sun Apr 16 22:10:08 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 16 Apr 2006 15:10:08 -0700
Subject: rpms/wine-docs/FC-3 .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 wine-docs.spec, 1.11, 1.12
Message-ID: <200604162210.k3GMAeiL000652@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-serv580/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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	3 Apr 2006 08:44:27 -0000	1.8
+++ .cvsignore	16 Apr 2006 22:10:08 -0000	1.9
@@ -1 +1 @@
-wine-docs-0.9.11.tar.bz2
+wine-docs-0.9.12.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-3/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	3 Apr 2006 08:44:27 -0000	1.8
+++ sources	16 Apr 2006 22:10:08 -0000	1.9
@@ -1 +1 @@
-a9de221c2a1442270f4eec1066379598  wine-docs-0.9.11.tar.bz2
+cc53497878f78681e85219eff2bf67ae  wine-docs-0.9.12.tar.bz2


Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-3/wine-docs.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wine-docs.spec	3 Apr 2006 08:44:27 -0000	1.11
+++ wine-docs.spec	16 Apr 2006 22:10:08 -0000	1.12
@@ -1,12 +1,12 @@
 Name:           wine-docs
-Version:        0.9.11
+Version:        0.9.12
 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.11.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.12.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
+* Fri Apr 14 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.12-1
+- version upgrade
+
 * Mon Apr 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.11-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sun Apr 16 22:10:09 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 16 Apr 2006 15:10:09 -0700
Subject: rpms/wine-docs/FC-4 .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 wine-docs.spec, 1.12, 1.13
Message-ID: <200604162210.k3GMAfV6000657@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-serv580/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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	3 Apr 2006 08:44:28 -0000	1.8
+++ .cvsignore	16 Apr 2006 22:10:09 -0000	1.9
@@ -1 +1 @@
-wine-docs-0.9.11.tar.bz2
+wine-docs-0.9.12.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	3 Apr 2006 08:44:28 -0000	1.8
+++ sources	16 Apr 2006 22:10:09 -0000	1.9
@@ -1 +1 @@
-a9de221c2a1442270f4eec1066379598  wine-docs-0.9.11.tar.bz2
+cc53497878f78681e85219eff2bf67ae  wine-docs-0.9.12.tar.bz2


Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-4/wine-docs.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- wine-docs.spec	3 Apr 2006 08:44:28 -0000	1.12
+++ wine-docs.spec	16 Apr 2006 22:10:09 -0000	1.13
@@ -1,12 +1,12 @@
 Name:           wine-docs
-Version:        0.9.11
+Version:        0.9.12
 Release:        0.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.11.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.12.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  docbook-utils-pdf
@@ -46,6 +46,10 @@
 %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB
 
 %changelog
+* Sat Apr 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.12-0.1
+- version upgrade
+
 * Mon Apr 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.11-0.1
 - version upgrade



From fedora-extras-commits at redhat.com  Sun Apr 16 22:10:10 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 16 Apr 2006 15:10:10 -0700
Subject: rpms/wine-docs/devel .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 wine-docs.spec, 1.8, 1.9
Message-ID: <200604162210.k3GMAgu3000665@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv580/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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	3 Apr 2006 08:44:29 -0000	1.8
+++ .cvsignore	16 Apr 2006 22:10:10 -0000	1.9
@@ -1 +1 @@
-wine-docs-0.9.11.tar.bz2
+wine-docs-0.9.12.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	3 Apr 2006 08:44:29 -0000	1.8
+++ sources	16 Apr 2006 22:10:10 -0000	1.9
@@ -1 +1 @@
-a9de221c2a1442270f4eec1066379598  wine-docs-0.9.11.tar.bz2
+cc53497878f78681e85219eff2bf67ae  wine-docs-0.9.12.tar.bz2


Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/devel/wine-docs.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wine-docs.spec	3 Apr 2006 08:44:29 -0000	1.8
+++ wine-docs.spec	16 Apr 2006 22:10:10 -0000	1.9
@@ -1,12 +1,12 @@
 Name:           wine-docs
-Version:        0.9.11
+Version:        0.9.12
 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.11.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.12.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
+* Fri Apr 14 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.12-1
+- version upgrade
+
 * Mon Apr 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.11-1
 - version upgrade



From fedora-extras-commits at redhat.com  Mon Apr 17 04:08:44 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sun, 16 Apr 2006 21:08:44 -0700
Subject: rpms/deskbar-applet/devel .cvsignore, 1.11, 1.12 deskbar-applet.spec,
	1.22, 1.23 sources, 1.11, 1.12
Message-ID: <200604170408.k3H48kDU014170@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/deskbar-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14149

Modified Files:
	.cvsignore deskbar-applet.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	13 Apr 2006 15:57:33 -0000	1.11
+++ .cvsignore	17 Apr 2006 04:08:44 -0000	1.12
@@ -1 +1 @@
-deskbar-applet-2.14.1.tar.bz2
+deskbar-applet-2.14.1.1.tar.bz2


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- deskbar-applet.spec	13 Apr 2006 15:57:33 -0000	1.22
+++ deskbar-applet.spec	17 Apr 2006 04:08:44 -0000	1.23
@@ -2,7 +2,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           deskbar-applet
-Version:        2.14.1
+Version:        2.14.1.1
 Release:        1%{?dist}
 
 Summary:        A Gnome applet to allow easy access to various search engines
@@ -12,8 +12,6 @@
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/deskbar-applet/2.14/%{name}-%{version}.tar.bz2
 Source1:        fedorabz.py
 Source2:        fedorabz.png
-Patch0:         deskbar-applet-2.14.1-artdir.patch
-Patch1:         deskbar-applet-2.14.1-beagleexists.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk2-devel python-devel pygtk2-devel gnome-python2-extras gettext evolution-data-server-devel gnome-desktop-devel libSM-devel gnome-python2-applet
 Requires:       gnome-python2 gnome-python2-applet gnome-python2-bonobo gnome-python2-gconf pygtk2
@@ -33,11 +31,9 @@
 
 %prep
 %setup -q
-%patch -p1 -b .artdir
-%patch1 -p1 -b .beagleexists
 
 %build
-%configure
+%configure --disable-schemas-install
 make %{_smp_mflags}
 
 %install
@@ -89,6 +85,9 @@
 %{_datadir}/pixmaps/%{name}.svg
 
 %changelog
+* Mon Apr 17 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.14.1.1-1
+- Upstream update
+
 * Thu Apr 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.14.1-1
 - Upstream update
 - Decoupled the BZ handler from the upstream tarball


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	13 Apr 2006 15:57:33 -0000	1.11
+++ sources	17 Apr 2006 04:08:44 -0000	1.12
@@ -1 +1 @@
-040bf4dd834005142a5a716bf76c2f20  deskbar-applet-2.14.1.tar.bz2
+9264c4cf5eaab4ac99009aea393d30ff  deskbar-applet-2.14.1.1.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 17 08:38:32 2006
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Mon, 17 Apr 2006 01:38:32 -0700
Subject: rpms/paps/devel paps-makefile.patch, NONE, 1.1 .cvsignore, 1.6,
	1.7 paps.spec, 1.8, 1.9 sources, 1.6,
	1.7 paps-0.6.1-makefile.patch, 1.1,
	NONE paps-0.6.3-fix-pagesize.patch, 1.1,
	NONE paps-0.6.3-goption.patch, 1.1, NONE paps-0.6.3-header.patch,
	1.2, NONE
Message-ID: <200604170838.k3H8cYIh025600@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/rpms/paps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25576

Modified Files:
	.cvsignore paps.spec sources 
Added Files:
	paps-makefile.patch 
Removed Files:
	paps-0.6.1-makefile.patch paps-0.6.3-fix-pagesize.patch 
	paps-0.6.3-goption.patch paps-0.6.3-header.patch 
Log Message:
* Mon Apr 17 2006 Akira TAGOH <tagoh at redhat.com> - 0.6.5-1
- New upstream release.
  - paps-0.6.3-fix-pagesize.patch: removed. it has been merged in upstream.
  - paps-0.6.3-goption.patch: removed. it has been merged in upstream.
  - paps-0.6.3-header.patch: removed. it has been merged in upstream.
- paps-makefile.patch: rework to be applied.

paps-makefile.patch:

--- NEW FILE paps-makefile.patch ---
diff -ruN paps-0.6.5.orig/doc/Makefile.am paps-0.6.5/doc/Makefile.am
--- paps-0.6.5.orig/doc/Makefile.am	2005-12-21 04:35:35.000000000 +0900
+++ paps-0.6.5/doc/Makefile.am	2006-04-17 17:28:52.000000000 +0900
@@ -10,7 +10,7 @@
 
 EXTRA_DIST = Doxyfile example-output.png mainpage.h
 
-htmldir = share/doc/libpaps/html
-install-data-hook:
-	mkdir -p $(prefix)/$(htmldir)
-	cp -dpR doxygen-html/* $(prefix)/$(htmldir)
+htmldir = $(datadir)/doc/paps-$(VERSION)/html
+#install-data-hook:
+#	mkdir -p $(prefix)/$(htmldir)
+#	cp -dpR doxygen-html/* $(prefix)/$(htmldir)
diff -ruN paps-0.6.5.orig/src/Makefile.am paps-0.6.5/src/Makefile.am
--- paps-0.6.5.orig/src/Makefile.am	2006-04-17 15:04:13.000000000 +0900
+++ paps-0.6.5/src/Makefile.am	2006-04-17 17:30:01.000000000 +0900
@@ -1,5 +1,5 @@
 man_MANS = paps.1
-lib_LIBRARIES = libpaps.a
+noinst_LIBRARIES = libpaps.a
 libpaps_a_SOURCES = libpaps.c
 libpaps_a_inc_HEADERS = libpaps.h
 libpaps_a_incdir = $(includedir)
@@ -7,9 +7,9 @@
 bin_PROGRAMS = paps
 paps_CFLAGS  = -Wall 
 paps_SOURCES = paps.c
-paps_LDADD = $(lib_LIBRARIES) $(all_libraries)
+paps_LDADD = $(noinst_LIBRARIES) $(all_libraries)
 paps_LDFLAGS = `pkg-config --libs pangoft2`
-paps_DEPENDENCIES = $(lib_LIBRARIES)
+paps_DEPENDENCIES = $(noinst_LIBRARIES)
 
 EXTRA_DIST = test_libpaps.c paps.1
 
@@ -21,7 +21,7 @@
 
 
 test_libpaps_SOURCES = test_libpaps.c
-test_libpaps_LDADD = $(lib_LIBRARIES) $(all_libraries)
+test_libpaps_LDADD = $(noinst_LIBRARIES) $(all_libraries)
 test_libpaps_LDFLAGS = `pkg-config --libs pangoft2`
-test_libpaps_DEPENDENCIES = $(lib_LIBRARIES) 
+test_libpaps_DEPENDENCIES = $(noinst_LIBRARIES) 
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/paps/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	11 Jan 2006 06:13:52 -0000	1.6
+++ .cvsignore	17 Apr 2006 08:38:31 -0000	1.7
@@ -6,3 +6,4 @@
 paps-0.6.1.tar.gz
 paps-0.6.2.tar.gz
 paps-0.6.3.tar.gz
+paps-0.6.5.tar.gz


Index: paps.spec
===================================================================
RCS file: /cvs/extras/rpms/paps/devel/paps.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- paps.spec	31 Mar 2006 05:21:07 -0000	1.8
+++ paps.spec	17 Apr 2006 08:38:31 -0000	1.9
@@ -1,17 +1,14 @@
 Name:		paps
-Version:	0.6.3
-Release:	4%{?dist}
+Version:	0.6.5
+Release:	1%{?dist}
 
 License:	LGPL
 URL:		http://paps.sourceforge.net/
 Source0:	http://prdownloads.sourceforge.net/paps/paps-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	pango-devel
-Patch0:		paps-0.6.1-makefile.patch
-Patch1:		paps-0.6.3-fix-pagesize.patch
+Patch0:		paps-makefile.patch
 Patch2:		paps-0.6.3-formfeed.patch
-Patch3:		paps-0.6.3-goption.patch
-Patch4:		paps-0.6.3-header.patch
 
 Summary:	Plain Text to PostScript converter
 Group:		Applications/Publishing
@@ -22,10 +19,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .makefile
-%patch1 -p1 -b .pagesize
 %patch2 -p1 -b .formfeed
-%patch3 -p1 -b .goption
-%patch4 -p1 -b .header
 aclocal
 automake
 autoconf
@@ -49,9 +43,17 @@
 %defattr(-, root, root, -)
 %doc AUTHORS COPYING.LIB README NEWS TODO
 %{_bindir}/paps
+%{_mandir}/man1/paps.1*
 
 
 %changelog
+* Mon Apr 17 2006 Akira TAGOH <tagoh at redhat.com> - 0.6.5-1
+- New upstream release.
+  - paps-0.6.3-fix-pagesize.patch: removed. it has been merged in upstream.
+  - paps-0.6.3-goption.patch: removed. it has been merged in upstream.
+  - paps-0.6.3-header.patch: removed. it has been merged in upstream.
+- paps-makefile.patch: rework to be applied.
+
 * Fri Mar 31 2006 Akira TAGOH <tagoh at redhat.com> - 0.6.3-4
 - paps-0.6.3-formfeed.patch: applied to deal with the formfeed mark properly.
 - paps-0.6.3-goption.patch: rewritten option parser using GOption. and segfault


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/paps/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	11 Jan 2006 06:13:52 -0000	1.6
+++ sources	17 Apr 2006 08:38:31 -0000	1.7
@@ -1 +1 @@
-6f36fd52b6254c99ac2710527ef413d6  paps-0.6.3.tar.gz
+5bb91f6358218f5cbba520376f3e3c1e  paps-0.6.5.tar.gz


--- paps-0.6.1-makefile.patch DELETED ---


--- paps-0.6.3-fix-pagesize.patch DELETED ---


--- paps-0.6.3-goption.patch DELETED ---


--- paps-0.6.3-header.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Apr 17 13:13:49 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Mon, 17 Apr 2006 06:13:49 -0700
Subject: rpms/firestarter/FC-5 firestarter-1.0.3-multicast.patch, NONE,
	1.1 firestarter.spec, 1.19, 1.20
Message-ID: <200604171313.k3HDDphA004489@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/firestarter/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4458

Modified Files:
	firestarter.spec 
Added Files:
	firestarter-1.0.3-multicast.patch 
Log Message:
Fixes bug #189067



firestarter-1.0.3-multicast.patch:

--- NEW FILE firestarter-1.0.3-multicast.patch ---
diff -ur firestarter-1.0.3/src/netfilter-script.c firestarter-1.0.3-avahi/src/netfilter-script.c
--- firestarter-1.0.3/src/netfilter-script.c	2005-01-29 04:32:08.000000000 -0800
+++ firestarter-1.0.3-avahi/src/netfilter-script.c	2006-04-17 05:58:04.000000000 -0700
@@ -738,13 +738,13 @@
 			 "	fi\n"
 			 "fi\n\n");
 
-	fprintf (script, "# Block Multicast Traffic\n"
-	                 "#  Some cable/DSL providers require their clients to accept multicast transmissions\n"
-	                 "#  you should remove the following four rules if you are affected by multicasting\n"
-	                 "$IPT -A INPUT -s 224.0.0.0/8 -d 0/0 -j DROP\n"
-	                 "$IPT -A INPUT -s 0/0 -d 224.0.0.0/8 -j DROP\n"
-	                 "$IPT -A OUTPUT -s 224.0.0.0/8 -d 0/0 -j DROP\n"
-	                 "$IPT -A OUTPUT -s 0/0 -d 224.0.0.0/8 -j DROP\n\n");
+//	fprintf (script, "# Block Multicast Traffic\n"
+//	                 "#  Some cable/DSL providers require their clients to accept multicast transmissions\n"
+//	                 "#  you should remove the following four rules if you are affected by multicasting\n"
+//	                 "$IPT -A INPUT -s 224.0.0.0/8 -d 0/0 -j DROP\n"
+//	                 "$IPT -A INPUT -s 0/0 -d 224.0.0.0/8 -j DROP\n"
+//	                 "$IPT -A OUTPUT -s 224.0.0.0/8 -d 0/0 -j DROP\n"
+//	                 "$IPT -A OUTPUT -s 0/0 -d 224.0.0.0/8 -j DROP\n\n");
 
 	fprintf (script, "# Block Traffic with Stuffed Routing\n"
                          "#  Early versions of PUMP - (the DHCP client application included in RH / Mandrake) require\n"


Index: firestarter.spec
===================================================================
RCS file: /cvs/extras/rpms/firestarter/FC-5/firestarter.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- firestarter.spec	17 Feb 2006 20:16:50 -0000	1.19
+++ firestarter.spec	17 Apr 2006 13:13:49 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		firestarter
 Version:	1.0.3
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	Firewall tool for GNOME
 
 Group:		Applications/Internet
@@ -12,7 +12,8 @@
 Patch0:		firestarter-1.0.3-pam.patch
 Patch1:		firestarter-1.0.3-services.patch
 Patch2:		firestarter-1.0.3-nobrowser.patch
-Patch3:		firestarter-1.0.3-nonroutable.patch      
+Patch3:		firestarter-1.0.3-nonroutable.patch
+Patch4:		firestarter-1.0.3-multicast.patch      
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -42,6 +43,7 @@
 %patch1 -p1 -b .services
 %patch2 -p1 -b .nobrowser
 %patch3 -p1 -b .nonroutable
+%patch4 -p1 -b .multicast
 cp %{SOURCE1} ./fs-manual.pdf
 
 %build
@@ -161,6 +163,9 @@
 
 
 %changelog
+* Mon Apr 17 2006 Michael A. Peters <mpeters at mac.com> - 1.0.3-11
+- Patch4 - Fix bug #189067 (Avahi)
+
 * Fri Feb 17 2006 Michael A. Peters <mpeters at mac.com> - 1.0.3-10
 - Devel branch rebuild
 



From fedora-extras-commits at redhat.com  Mon Apr 17 13:29:52 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 17 Apr 2006 06:29:52 -0700
Subject: rpms/leafpad/devel .cvsignore, 1.8, 1.9 leafpad.spec, 1.17,
	1.18 sources, 1.8, 1.9
Message-ID: <200604171329.k3HDTs2S004536@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/leafpad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4511

Modified Files:
	.cvsignore leafpad.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/leafpad/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	3 Feb 2006 08:17:12 -0000	1.8
+++ .cvsignore	17 Apr 2006 13:29:52 -0000	1.9
@@ -1 +1 @@
-leafpad-0.8.7.tar.gz
+leafpad-0.8.9.tar.gz


Index: leafpad.spec
===================================================================
RCS file: /cvs/extras/rpms/leafpad/devel/leafpad.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- leafpad.spec	14 Feb 2006 05:01:06 -0000	1.17
+++ leafpad.spec	17 Apr 2006 13:29:52 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           leafpad
-Version:        0.8.7
-Release:        2%{?dist}
+Version:        0.8.9
+Release:        1%{?dist}
 
 Summary:        GTK+ based simple text editor
 
@@ -10,7 +10,7 @@
 Source0:        http://savannah.nongnu.org/download/leafpad/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk2-devel >= 2.4 desktop-file-utils
+BuildRequires:  gtk2-devel >= 2.4 desktop-file-utils libgnomeprintui22-devel
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -58,6 +58,9 @@
 %exclude %{_datadir}/pixmaps/%{name}.xpm
 
 %changelog
+* Mon Apr 17 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.8.9-1
+- Upstream update
+
 * Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.8.7-2
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/leafpad/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	3 Feb 2006 08:17:12 -0000	1.8
+++ sources	17 Apr 2006 13:29:52 -0000	1.9
@@ -1 +1 @@
-6dd5a0882a289a5351b08618883427a1  leafpad-0.8.7.tar.gz
+66a502c2c9e87b8f7ef0370ecb83cbbb  leafpad-0.8.9.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 17 14:59:51 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Mon, 17 Apr 2006 07:59:51 -0700
Subject: rpms/gnomesword/FC-5 gnomesword.spec,1.8,1.9
Message-ID: <200604171459.k3HExr7j006848@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gnomesword/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6831

Modified Files:
	gnomesword.spec 
Log Message:
fixes bug 188581 (187198)



Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/FC-5/gnomesword.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gnomesword.spec	18 Feb 2006 08:12:21 -0000	1.8
+++ gnomesword.spec	17 Apr 2006 14:59:51 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           gnomesword           
 Version:        2.1.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GNOME-based Bible research tool
 
 Group:          Applications/Text
@@ -47,6 +47,7 @@
 #%%ifarch x86_64
 #libtoolize -c --force && aclocal-1.9 && autoheader && automake-1.9 && autoconf
 #%%endif
+export LDFLAGS="${LDFLAGS} -Wl,--export-dynamic"
 %configure
 make %{?_smp_mflags}
 
@@ -89,6 +90,9 @@
 
 
 %changelog
+* Mon Apr 17 2006 Michael A. Peters <mpeters at mac.com> - 2.1.5-3
+- fix bug 188581 (187198)
+
 * Sat Feb 18 2006 Michael A. Peters <mpeters at mac.com> - 2.1.5-2
 - Rebuild in devel
 



From fedora-extras-commits at redhat.com  Mon Apr 17 16:44:47 2006
From: fedora-extras-commits at redhat.com (Zack Cerza (zmc))
Date: Mon, 17 Apr 2006 09:44:47 -0700
Subject: rpms/pyspi - New directory
Message-ID: <200604171644.k3HGinOe018191@cvs-int.fedora.redhat.com>

Author: zmc

Update of /cvs/extras/rpms/pyspi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18165/pyspi

Log Message:
Directory /cvs/extras/rpms/pyspi added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 17 16:44:48 2006
From: fedora-extras-commits at redhat.com (Zack Cerza (zmc))
Date: Mon, 17 Apr 2006 09:44:48 -0700
Subject: rpms/pyspi/devel - New directory
Message-ID: <200604171644.k3HGiolP018194@cvs-int.fedora.redhat.com>

Author: zmc

Update of /cvs/extras/rpms/pyspi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18165/pyspi/devel

Log Message:
Directory /cvs/extras/rpms/pyspi/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 17 16:44:57 2006
From: fedora-extras-commits at redhat.com (Zack Cerza (zmc))
Date: Mon, 17 Apr 2006 09:44:57 -0700
Subject: rpms/pyspi Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604171644.k3HGixQ9018243@cvs-int.fedora.redhat.com>

Author: zmc

Update of /cvs/extras/rpms/pyspi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18210

Added Files:
	Makefile import.log 
Log Message:
Setup of module pyspi


--- NEW FILE Makefile ---
# Top level Makefile for module pyspi
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 17 16:44:58 2006
From: fedora-extras-commits at redhat.com (Zack Cerza (zmc))
Date: Mon, 17 Apr 2006 09:44:58 -0700
Subject: rpms/pyspi/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200604171645.k3HGj0W6018246@cvs-int.fedora.redhat.com>

Author: zmc

Update of /cvs/extras/rpms/pyspi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18210/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pyspi


--- 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 Apr 17 16:45:21 2006
From: fedora-extras-commits at redhat.com (Zack Cerza (zmc))
Date: Mon, 17 Apr 2006 09:45:21 -0700
Subject: rpms/pyspi import.log,1.1,1.2
Message-ID: <200604171645.k3HGjNSZ018309@cvs-int.fedora.redhat.com>

Author: zmc

Update of /cvs/extras/rpms/pyspi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18276

Modified Files:
	import.log 
Log Message:
auto-import pyspi-0.5.4-2 on branch devel from pyspi-0.5.4-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pyspi/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Apr 2006 16:44:57 -0000	1.1
+++ import.log	17 Apr 2006 16:45:21 -0000	1.2
@@ -0,0 +1 @@
+pyspi-0_5_4-2:HEAD:pyspi-0.5.4-2.src.rpm:1145292317



From fedora-extras-commits at redhat.com  Mon Apr 17 16:45:22 2006
From: fedora-extras-commits at redhat.com (Zack Cerza (zmc))
Date: Mon, 17 Apr 2006 09:45:22 -0700
Subject: rpms/pyspi/devel pyspi.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200604171645.k3HGjOEH018314@cvs-int.fedora.redhat.com>

Author: zmc

Update of /cvs/extras/rpms/pyspi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18276/devel

Modified Files:
	.cvsignore sources 
Added Files:
	pyspi.spec 
Log Message:
auto-import pyspi-0.5.4-2 on branch devel from pyspi-0.5.4-2.src.rpm


--- NEW FILE pyspi.spec ---
Summary: Python bindings for AT-SPI
Name: pyspi
Version: 0.5.4
Release: 2%{?dist}
License: LGPL
Group: Development/Languages
URL: http://people.redhat.com/zcerza/dogtail/
Source0: http://people.redhat.com/zcerza/dogtail/releases/pyspi-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: at-spi-devel, Pyrex

%description
AT-SPI allows assistive technologies to access GTK-based applications.  It
exposes the internals of applications for automation, so tools such as screen
readers and scripting interfaces can query and interact with GUI controls.

pyspi allows the Python language to be used to script AT-SPI-aware 
applications (currently mostly GTK+ based.)

%prep
%setup -q

%build
python ./setup.py build

%install
rm -rf $RPM_BUILD_ROOT
python ./setup.py install -O2 --root=$RPM_BUILD_ROOT --record=%{name}.files

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.files
#%files
%defattr(-,root,root,-)
%doc COPYING
%doc NEWS
%doc ChangeLog

%changelog
* Tue Mar 21 2006 Zack Cerza <zcerza at redhat.com> - 0.5.4-2
- Fix URL and Source0 fields.

* Fri Mar 10 2006 Zack Cerza <zcerza at redhat.com> - 0.5.4-1
- Remove all Requires
- Add package versions to this changelog
- Add new description
- Use official Fedora Extras BuildRoot
- Change the group to Development/Languages

* Tue Feb 14 2006 Zack Cerza <zcerza at redhat.com> - 0.5.3-2
- Add missing BuildRequires on Pyrex.

* Tue Feb  7 2006 Zack Cerza <zcerza at redhat.com> - 0.5.3-1
- Initial build.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pyspi/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2006 16:44:57 -0000	1.1
+++ .cvsignore	17 Apr 2006 16:45:22 -0000	1.2
@@ -0,0 +1 @@
+pyspi-0.5.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pyspi/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2006 16:44:57 -0000	1.1
+++ sources	17 Apr 2006 16:45:22 -0000	1.2
@@ -0,0 +1 @@
+1640a0ee46d173ed1d0e0ca345f8cd14  pyspi-0.5.4.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 17 16:49:09 2006
From: fedora-extras-commits at redhat.com (Zack Cerza (zmc))
Date: Mon, 17 Apr 2006 09:49:09 -0700
Subject: owners owners.list,1.849,1.850
Message-ID: <200604171649.k3HGnBhi018377@cvs-int.fedora.redhat.com>

Author: zmc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18357/owners

Modified Files:
	owners.list 
Log Message:
Add pyspi to list



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.849
retrieving revision 1.850
diff -u -r1.849 -r1.850
--- owners.list	15 Apr 2006 23:45:04 -0000	1.849
+++ owners.list	17 Apr 2006 16:49:09 -0000	1.850
@@ -10,7 +10,6 @@
 # uppercase and lowercase letters equivalently.
 #
 # All e-mail addresses used here MUST correspond to existing bugzilla accounts!
-
 Fedora Extras|aalib|An ASCII art library|anvil at livna.org|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|
@@ -1205,6 +1204,7 @@
 Fedora Extras|pylint|Analyzes Python code looking for bugs and signs of poor quality|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|pyparsing|An object-oriented approach to text processing|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|PyRTF|Rich Text Format (RTF) Document Generation in Python|mpeters at mac.com|extras-qa at fedoraproject.org|
+Fedora Extras|pyspi|Python bindings for AT-SPI|zcerza at redhat.com|extras-qa at fedoraproject.org
 Fedora Extras|python-4Suite-XML|A collection of XML-related technologies for Python|mitr at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-adns|Python interface for the GNU adns library|byte at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|python-amara|A collection of Pythonic tools for XML data binding|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Apr 17 16:52:15 2006
From: fedora-extras-commits at redhat.com (Zack Cerza (zmc))
Date: Mon, 17 Apr 2006 09:52:15 -0700
Subject: rpms/dogtail - New directory
Message-ID: <200604171652.k3HGqHaD018452@cvs-int.fedora.redhat.com>

Author: zmc

Update of /cvs/extras/rpms/dogtail
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18431/dogtail

Log Message:
Directory /cvs/extras/rpms/dogtail added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 17 16:52:16 2006
From: fedora-extras-commits at redhat.com (Zack Cerza (zmc))
Date: Mon, 17 Apr 2006 09:52:16 -0700
Subject: rpms/dogtail/devel - New directory
Message-ID: <200604171652.k3HGqIjc018455@cvs-int.fedora.redhat.com>

Author: zmc

Update of /cvs/extras/rpms/dogtail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18431/dogtail/devel

Log Message:
Directory /cvs/extras/rpms/dogtail/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 17 16:52:29 2006
From: fedora-extras-commits at redhat.com (Zack Cerza (zmc))
Date: Mon, 17 Apr 2006 09:52:29 -0700
Subject: rpms/dogtail Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604171652.k3HGqVM9018504@cvs-int.fedora.redhat.com>

Author: zmc

Update of /cvs/extras/rpms/dogtail
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18476

Added Files:
	Makefile import.log 
Log Message:
Setup of module dogtail


--- NEW FILE Makefile ---
# Top level Makefile for module dogtail
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 17 16:52:29 2006
From: fedora-extras-commits at redhat.com (Zack Cerza (zmc))
Date: Mon, 17 Apr 2006 09:52:29 -0700
Subject: rpms/dogtail/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604171652.k3HGqVDV018507@cvs-int.fedora.redhat.com>

Author: zmc

Update of /cvs/extras/rpms/dogtail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18476/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module dogtail


--- 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 Apr 17 16:53:40 2006
From: fedora-extras-commits at redhat.com (Zack Cerza (zmc))
Date: Mon, 17 Apr 2006 09:53:40 -0700
Subject: rpms/dogtail/devel dogtail.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604171654.k3HGsCi5018578@cvs-int.fedora.redhat.com>

Author: zmc

Update of /cvs/extras/rpms/dogtail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18540/devel

Modified Files:
	.cvsignore sources 
Added Files:
	dogtail.spec 
Log Message:
auto-import dogtail-0.5.1-2 on branch devel from dogtail-0.5.1-2.src.rpm


--- NEW FILE dogtail.spec ---
Summary: GUI test tool and automation framework
Name: dogtail
Version: 0.5.1
Release: 2%{?dist}
License: GPL
Group: User Interface/X
URL: http://people.redhat.com/zcerza/dogtail/releases/
Source0: http://people.redhat.com/zcerza/dogtail/releases/dogtail-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: python
BuildRequires: desktop-file-utils
Requires: pyspi >= 0.5.3
Requires: pygtk2
Requires: rpm-python
Requires: ImageMagick
Requires: Xvfb

%description
GUI test tool and automation framework that uses assistive technologies to 
communicate with desktop applications.

%prep
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%setup -q

%build
python ./setup.py build

%install
rm -rf $RPM_BUILD_ROOT
python ./setup.py install -O2 --root=$RPM_BUILD_ROOT --record=%{name}.files
rm -rf $RPM_BUILD_ROOT/%{_docdir}/dogtail
find examples -type f -exec chmod 0644 \{\} \;
desktop-file-install $RPM_BUILD_ROOT/%{_datadir}/applications/sniff.desktop \
  --vendor=fedora \
  --dir=$RPM_BUILD_ROOT/%{_datadir}/applications \
  --add-category X-Fedora \
  --delete-original

%post
touch --no-create %{_datadir}/icons/hicolor || :
[ -x /usr/bin/gtk-update-icon-cache ] && gtk-update-icon-cache --quiet -f %{_datadir}/icons/hicolor || :

%postun
touch --no-create %{_datadir}/icons/hicolor || :
[ -x /usr/bin/gtk-update-icon-cache ] && gtk-update-icon-cache --quiet -f %{_datadir}/icons/hicolor || :

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_bindir}/*
%{python_sitelib}/dogtail/
%{_datadir}/applications/*
%{_datadir}/dogtail/
%{_datadir}/icons/hicolor/*
%doc COPYING
%doc README
%doc examples/

%changelog
* Tue Mar 21 2006 Zack Cerza <zcerza at redhat.com> - 0.5.1-2
- Fix URL and Source0 fields.
- Fix desktop-file-utils magic; use desktop-file-install.

* Fri Feb 24 2006 Zack Cerza <zcerza at redhat.com> - 0.5.1-1
- Remove BuildRequires on at-spi-devel. Added one on python.
- Use macros instead of absolute paths.
- Touch _datadir/icons/hicolor/ before running gtk-update-icon-cache.
- Require and use desktop-file-utils.
- postun = post.
- Shorten BuildArchitectures to BuildArch. The former worked, but even vim's 
  hilighting hated it.
- Put each *Requires on a separate line.
- Remove __os_install_post definition.
- Use Fedora Extras BuildRoot.
- Instead of _libdir, which kills the build if it's /usr/lib64, use a
  python macro to define python_sitelib and use that.
- Remove the executable bit on the examples in install scriptlet.
- Remove call to /bin/rm in post scriptlet.
- Use dist in Release.

* Fri Feb 17 2006 Zack Cerza <zcerza at redhat.com> - 0.5.0-2
- It looks like xorg-x11-Xvfb changed names. Require 'Xvfb' instead.
- Remove Requires on python-elementtree, since RHEL4 didn't have it. The 
  functionality it provides is probably never used anyway, and will most likely
  be removed in the future.
- Don't run gtk-update-icon-cache if it doesn't exist.

* Fri Feb  3 2006 Zack Cerza <zcerza at redhat.com> - 0.5.0-1
- New upstream release.
- Added missing BuildRequires on at-spi-devel.
- Added Requires on pyspi >= 0.5.3.
- Added Requires on rpm-python, pygtk2, ImageMagick, xorg-x11-Xvfb, 
  python-elementtree.
- Moved documentation (including examples) to the correct place.
- Make sure /usr/share/doc/dogtail is removed.
- Added 'gtk-update-icon-cache' to %post.

* Mon Oct 24 2005 Zack Cerza <zcerza at redhat.com> - 0.4.3-1
- New upstream release.

* Sat Oct  8 2005 Jeremy Katz <katzj at redhat.com> - 0.4.2-1
- Initial build.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dogtail/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2006 16:52:29 -0000	1.1
+++ .cvsignore	17 Apr 2006 16:53:40 -0000	1.2
@@ -0,0 +1 @@
+dogtail-0.5.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dogtail/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2006 16:52:29 -0000	1.1
+++ sources	17 Apr 2006 16:53:40 -0000	1.2
@@ -0,0 +1 @@
+69269dd1eef5be141a9e5168af189978  dogtail-0.5.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 17 16:53:39 2006
From: fedora-extras-commits at redhat.com (Zack Cerza (zmc))
Date: Mon, 17 Apr 2006 09:53:39 -0700
Subject: rpms/dogtail import.log,1.1,1.2
Message-ID: <200604171654.k3HGsBOO018574@cvs-int.fedora.redhat.com>

Author: zmc

Update of /cvs/extras/rpms/dogtail
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18540

Modified Files:
	import.log 
Log Message:
auto-import dogtail-0.5.1-2 on branch devel from dogtail-0.5.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dogtail/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Apr 2006 16:52:29 -0000	1.1
+++ import.log	17 Apr 2006 16:53:39 -0000	1.2
@@ -0,0 +1 @@
+dogtail-0_5_1-2:HEAD:dogtail-0.5.1-2.src.rpm:1145292815



From fedora-extras-commits at redhat.com  Mon Apr 17 16:54:26 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon, 17 Apr 2006 09:54:26 -0700
Subject: rpms/gparted/devel gparted.spec,1.8,1.9
Message-ID: <200604171654.k3HGsSWD018627@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gparted/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18610

Modified Files:
	gparted.spec 
Log Message:
* Mon Apr 17 2006 Deji Akingunola <dakingun at gmail.com> - 0.2.4-2
- Rebuild for new parted



Index: gparted.spec
===================================================================
RCS file: /cvs/extras/rpms/gparted/devel/gparted.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gparted.spec	12 Apr 2006 22:28:56 -0000	1.8
+++ gparted.spec	17 Apr 2006 16:54:26 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Gnome Partition Editor
 Name:    gparted
 Version: 0.2.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group:   Applications/System
 License: GPL
 URL:     http://gparted.sourceforge.net
@@ -77,6 +77,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/gparted
 
 %changelog
+* Mon Apr 17 2006 Deji Akingunola <dakingun at gmail.com> - 0.2.4-2
+- Rebuild for new parted
+
 * Wed Apr 12 2006 Deji Akingunola <dakingun at gmail.com> - 0.2.4-1
 - Update to newer version
 



From fedora-extras-commits at redhat.com  Mon Apr 17 16:57:57 2006
From: fedora-extras-commits at redhat.com (Zack Cerza (zmc))
Date: Mon, 17 Apr 2006 09:57:57 -0700
Subject: owners owners.list,1.850,1.851
Message-ID: <200604171657.k3HGvx0m018714@cvs-int.fedora.redhat.com>

Author: zmc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18697/owners

Modified Files:
	owners.list 
Log Message:
Add dogtail to list



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.850
retrieving revision 1.851
diff -u -r1.850 -r1.851
--- owners.list	17 Apr 2006 16:49:09 -0000	1.850
+++ owners.list	17 Apr 2006 16:57:57 -0000	1.851
@@ -197,6 +197,7 @@
 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|docbook2X|Convert docbook into man and Texinfo|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|doctorj|Java source code analyzer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|dogtail|GUI test tool and automation framework|zcerza at redhat.com|extras-qa at fedoraproject.org
 Fedora Extras|dosbox|An x86/DOS emulator with sound/graphics|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|doulos-fonts|Doulos SIL fonts|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|drgeo-doc|html documentation for drgeo|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Apr 17 17:07:01 2006
From: fedora-extras-commits at redhat.com (Zack Cerza (zmc))
Date: Mon, 17 Apr 2006 10:07:01 -0700
Subject: rpms/dogtail/devel dogtail.spec,1.1,1.2
Message-ID: <200604171707.k3HH73cg020868@cvs-int.fedora.redhat.com>

Author: zmc

Update of /cvs/extras/rpms/dogtail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20850

Modified Files:
	dogtail.spec 
Log Message:
Fix the URL field.



Index: dogtail.spec
===================================================================
RCS file: /cvs/extras/rpms/dogtail/devel/dogtail.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dogtail.spec	17 Apr 2006 16:53:40 -0000	1.1
+++ dogtail.spec	17 Apr 2006 17:07:01 -0000	1.2
@@ -1,10 +1,10 @@
 Summary: GUI test tool and automation framework
 Name: dogtail
 Version: 0.5.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: User Interface/X
-URL: http://people.redhat.com/zcerza/dogtail/releases/
+URL: http://people.redhat.com/zcerza/dogtail/
 Source0: http://people.redhat.com/zcerza/dogtail/releases/dogtail-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -61,6 +61,9 @@
 %doc examples/
 
 %changelog
+* Mon Apr 17 2006 Zack Cerza <zcerza at redhat.com> - 0.5.1-3
+- Fix the URL field.
+
 * Tue Mar 21 2006 Zack Cerza <zcerza at redhat.com> - 0.5.1-2
 - Fix URL and Source0 fields.
 - Fix desktop-file-utils magic; use desktop-file-install.



From fedora-extras-commits at redhat.com  Mon Apr 17 17:48:38 2006
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 17 Apr 2006 10:48:38 -0700
Subject: comps comps-fe5.xml.in,1.37,1.38
Message-ID: <200604171748.k3HHmeRU021246@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21229

Modified Files:
	comps-fe5.xml.in 
Log Message:
fix syntax error



Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- comps-fe5.xml.in	15 Apr 2006 09:41:35 -0000	1.37
+++ comps-fe5.xml.in	17 Apr 2006 17:48:37 -0000	1.38
@@ -470,7 +470,7 @@
         <packagereq type="optional">ghex</packagereq>
         <packagereq type="optional">hercules</packagereq>
         <packagereq type="optional">ibmonitor</packagereq>
-	<packagereq type="optional">inadyn>/packagereq>
+	<packagereq type="optional">inadyn</packagereq>
         <packagereq type="optional">lirc</packagereq>
         <packagereq type="optional">moodss</packagereq>
         <packagereq type="optional">moomps</packagereq>



From fedora-extras-commits at redhat.com  Mon Apr 17 17:49:10 2006
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 17 Apr 2006 10:49:10 -0700
Subject: comps comps-fe6.xml, NONE, 1.1 comps-fe6.xml.in, NONE,
	1.1 comps-fe5.xml, 1.4, 1.5
Message-ID: <200604171749.k3HHnCx0021276@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21257

Modified Files:
	comps-fe5.xml 
Added Files:
	comps-fe6.xml comps-fe6.xml.in 
Log Message:
refresh xml file, add -fe6 files



--- NEW FILE comps-fe6.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE newcomps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
<comps>

  <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">conglomerate</packagereq>
        <packagereq type="optional">kile</packagereq>
        <packagereq type="optional">scribus</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">bazaar</packagereq>
        <packagereq type="optional">bigloo</packagereq>
        <packagereq type="optional">bzr</packagereq>
        <packagereq type="optional">ccache</packagereq>
        <packagereq type="optional">clisp</packagereq>
        <packagereq type="optional">cogito</packagereq>
        <packagereq type="optional">colordiff</packagereq>
        <packagereq type="optional">cpan2rpm</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">fedora-rpmdevtools</packagereq>
        <packagereq type="optional">fpc</packagereq>
        <packagereq type="optional">gforth</packagereq>
        <packagereq type="optional">ghc</packagereq>
        <packagereq type="optional">git</packagereq>
        <packagereq type="optional">highlight</packagereq>
        <packagereq type="optional">lincvs</packagereq>
        <packagereq type="optional">lua</packagereq>
        <packagereq type="optional">mach</packagereq>
        <packagereq type="optional">meld</packagereq>
        <packagereq type="optional">mercurial</packagereq>
        <packagereq type="optional">mock</packagereq>
        <packagereq type="optional">monotone</packagereq>
        <packagereq type="optional">ocaml</packagereq>
        <packagereq type="optional">pl</packagereq>
        <packagereq type="optional">plt-scheme</packagereq>
        <packagereq type="optional">pylint</packagereq>
        <packagereq type="optional">quilt</packagereq>
        <packagereq type="optional">rpmlint</packagereq>
        <packagereq type="optional">splint</packagereq>
        <packagereq type="optional">tkcvs</packagereq>
        <packagereq type="optional">tla</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">TeXmacs</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">blacs</packagereq>
        <packagereq type="optional">blas</packagereq>
        <packagereq type="optional">cernlib-utils</packagereq>
        <packagereq type="optional">galculator</packagereq>
        <packagereq type="optional">gdl</packagereq>
        <packagereq type="optional">hmmer</packagereq>
        <packagereq type="optional">kst</packagereq>
        <packagereq type="optional">lagan</packagereq>
        <packagereq type="optional">lapack</packagereq>
        <packagereq type="optional">ncarg</packagereq>
        <packagereq type="optional">numpy</packagereq>
        <packagereq type="optional">octave</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">scalapack</packagereq>
        <packagereq type="optional">SIBsim4</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>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">byzanz</packagereq>
        <packagereq type="optional">deskbar-applet</packagereq>
        <packagereq type="optional">gdesklets</packagereq>
        <packagereq type="optional">gfontview</packagereq>
        <packagereq type="optional">glunarclock</packagereq>
        <packagereq type="optional">gmpc</packagereq>
        <packagereq type="optional">gnome-applet-rhythmbox</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">sabayon</packagereq>
        <packagereq type="optional">seahorse</packagereq>
        <packagereq type="optional">smeg</packagereq>
        <packagereq type="optional">themes-backgrounds-gnome</packagereq>
        <packagereq type="optional">wp_tray</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">gazpacho</packagereq>
        <packagereq type="optional">gconfmm26-devel</packagereq>
        <packagereq type="optional">glibmm24-devel</packagereq>
        <packagereq type="optional">gnome-common</packagereq>
        <packagereq type="optional">gtkmm24-devel</packagereq>
        <packagereq type="optional">gtkalog</packagereq>
        <packagereq type="optional">gnome-vfsmm26-devel</packagereq>
        <packagereq type="optional">gquilt</packagereq>
        <packagereq type="optional">libsexy-devel</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">bzflag</packagereq>
        <packagereq type="optional">celestia</packagereq>
        <packagereq type="optional">cgoban</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">fillets-ng</packagereq>
        <packagereq type="optional">foobillard</packagereq>
        <packagereq type="optional">fortune-mod</packagereq>
        <packagereq type="optional">freeciv</packagereq>
        <packagereq type="optional">freedoom</packagereq>
        <packagereq type="optional">freedroid</packagereq>
        <packagereq type="optional">freedroidrpg</packagereq>
        <packagereq type="optional">gl-117</packagereq>
        <packagereq type="optional">gnofract4d</packagereq>
        <packagereq type="optional">gnome-sudoku</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">nethack</packagereq>
        <packagereq type="optional">nethack-vultures</packagereq>
        <packagereq type="optional">neverball</packagereq>
        <packagereq type="optional">nexuiz</packagereq>
        <packagereq type="optional">njam</packagereq>
        <packagereq type="optional">overgod</packagereq>
        <packagereq type="optional">pipenightdreams</packagereq>
        <packagereq type="optional">powermanga</packagereq>
        <packagereq type="optional">ppracer</packagereq>
        <packagereq type="optional">qascade</packagereq>
        <packagereq type="optional">qqo</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">supertux</packagereq>
        <packagereq type="optional">tong</packagereq>
        <packagereq type="optional">torcs</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">xboard</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>education</id>
    <name>Educational Software</name>
    <description>Educational software for learning</description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
        <packagereq type="optional">drgeo</packagereq>
	<packagereq type="optional">drgeo-doc</packagereq>
        <packagereq type="optional">gperiodic</packagereq>
        <packagereq type="optional">stellarium</packagereq>
        <packagereq type="optional">tuxtype2</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">amaya</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">comical</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">fwbuilder</packagereq>
        <packagereq type="optional">gajim</packagereq>
        <packagereq type="optional">galeon</packagereq>
        <packagereq type="optional">gnome-blog</packagereq>
        <packagereq type="optional">gnome-telnet</packagereq>
        <packagereq type="optional">gossip</packagereq>
        <packagereq type="optional">gtk-gnutella</packagereq>
        <packagereq type="optional">gwget</packagereq>
        <packagereq type="optional">kickpim</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">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">silky</packagereq>
        <packagereq type="optional">straw</packagereq>
        <packagereq type="optional">sylpheed</packagereq>
        <packagereq type="optional">sylpheed-claws</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">blender</packagereq>
        <packagereq type="optional">digikam</packagereq>
        <packagereq type="optional">fontforge</packagereq>
        <packagereq type="optional">fyre</packagereq>
        <packagereq type="optional">grads</packagereq>
        <packagereq type="optional">gv</packagereq>
        <packagereq type="optional">gpp</packagereq>
        <packagereq type="optional">gqview</packagereq>
        <packagereq type="optional">graphviz</packagereq>
        <packagereq type="optional">gwenview</packagereq>
        <packagereq type="optional">inkscape</packagereq>
        <packagereq type="optional">qiv</packagereq>
        <packagereq type="optional">showimg</packagereq>
        <packagereq type="optional">skencil</packagereq>
        <packagereq type="optional">sodipodi</packagereq>
        <packagereq type="optional">tuxpaint</packagereq>
    </packagelist>
  </group>

  <group>
    <id>mail-server</id>
    <name>Mail Server</name>
    <description>These packages allow you to configure an IMAP or Postfix mail server.</description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">cyrus-imapd</packagereq>
      <packagereq type="optional">enemies-of-carlotta</packagereq>
      <packagereq type="optional">perl-Cyrus</packagereq>
      <packagereq type="optional">clamav</packagereq>
      <packagereq type="optional">clamav-data</packagereq>
      <packagereq type="optional">clamav-milter</packagereq>
      <packagereq type="optional">exim</packagereq>
      <packagereq type="optional">exim-doc</packagereq>
      <packagereq type="optional">mlmmj</packagereq>
      <packagereq type="optional">pyzor</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">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">dia</packagereq>
        <packagereq type="optional">gdeskcal</packagereq>
        <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>
        <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">MagicPoint</packagereq>
        <packagereq type="optional">pybliographer</packagereq>
        <packagereq type="optional">qcad</packagereq>
        <packagereq type="optional">texmaker</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">alsamixergui</packagereq>
        <packagereq type="optional">akode</packagereq>
        <packagereq type="optional">amarok</packagereq>
        <packagereq type="optional">audacity</packagereq>
        <packagereq type="optional">bmp</packagereq>
        <packagereq type="optional">camstream</packagereq>
        <packagereq type="optional">camE</packagereq>
        <packagereq type="optional">easytag</packagereq>
        <packagereq type="optional">gcfilms</packagereq>
        <packagereq type="optional">gcombust</packagereq>
        <packagereq type="optional">gnomad2</packagereq>
        <packagereq type="optional">gnomebaker</packagereq>
        <packagereq type="optional">graveman</packagereq>
        <packagereq type="optional">grip</packagereq>
        <packagereq type="optional">kid3</packagereq>
        <packagereq type="optional">kover</packagereq>
        <packagereq type="optional">libvisual-plugins</packagereq>
        <packagereq type="optional">soundconverter</packagereq>
        <packagereq type="optional">soundtracker</packagereq>
        <packagereq type="optional">sweep</packagereq>
	<packagereq type="optional">tagtool</packagereq>
	<packagereq type="optional">ushare</packagereq>
        <packagereq type="optional">xmms</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">cfengine</packagereq>
	<packagereq type="optional">cfs</packagereq>
	<packagereq type="optional">crack</packagereq>
	<packagereq type="optional">dkms</packagereq>
        <packagereq type="optional">environment-modules</packagereq>
        <packagereq type="optional">epylog</packagereq>
        <packagereq type="optional">fuse</packagereq>
        <packagereq type="optional">fwbuilder</packagereq>
        <packagereq type="optional">ghasher</packagereq>
        <packagereq type="optional">ghex</packagereq>
        <packagereq type="optional">hercules</packagereq>
        <packagereq type="optional">ibmonitor</packagereq>
	<packagereq type="optional">inadyn</packagereq>
        <packagereq type="optional">lirc</packagereq>
        <packagereq type="optional">moodss</packagereq>
        <packagereq type="optional">moomps</packagereq>
        <packagereq type="optional">nagios</packagereq>
        <packagereq type="optional">nfswatch</packagereq>
        <packagereq type="optional">rdiff-backup</packagereq>
        <packagereq type="optional">sabayon</packagereq>
        <packagereq type="optional">shorewall</packagereq>
        <packagereq type="optional">snort</packagereq>
        <packagereq type="optional">ttywatch</packagereq>
        <packagereq type="optional">unison</packagereq>
        <packagereq type="optional">vnstat</packagereq>
        <packagereq type="optional">vpnc</packagereq>
        <packagereq type="optional">wine</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">acpitool</packagereq>
        <packagereq type="optional">i810switch</packagereq>
        <packagereq type="optional">i8kutils</packagereq>
        <packagereq type="optional">libifp</packagereq>
        <packagereq type="optional">s3switch</packagereq>
        <packagereq type="optional">tpb</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">flumotion</packagereq>
        <packagereq type="optional">icecast</packagereq>
        <packagereq type="optional">ircd-hybrid</packagereq>
        <packagereq type="optional">jabberd</packagereq>
        <packagereq type="optional">kannel</packagereq>
	<packagereq type="optional">ushare</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">bittorrent</packagereq>
        <packagereq type="optional">centericq</packagereq>
        <packagereq type="optional">cone</packagereq>
        <packagereq type="optional">elmo</packagereq>
        <packagereq type="optional">irssi</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>
    </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_geoip</packagereq>
        <packagereq type="optional">mod_security</packagereq>
        <packagereq type="optional">moin</packagereq>
        <packagereq type="optional">plone</packagereq>
        <packagereq type="optional">thttpd</packagereq>
        <packagereq type="optional">TurboGears</packagereq>
        <packagereq type="optional">zope</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="optional">xemacs-el</packagereq>
      <packagereq type="default">xemacs-info</packagereq>
      <packagereq type="optional">xemacs-nox</packagereq>
      <packagereq type="default">xemacs-sumo</packagereq>
      <packagereq type="optional">xemacs-sumo-el</packagereq>
      <packagereq type="default">xemacs-sumo-info</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="default">xfce-mcs-manager</packagereq>
      <packagereq type="default">xfce-mcs-plugins</packagereq>
      <packagereq type="mandatory">xfce-utils</packagereq>
      <packagereq type="default">xfce4-iconbox</packagereq>
      <packagereq type="mandatory">xfce4-panel</packagereq>
      <packagereq type="default">xfce4-systray</packagereq>
      <packagereq type="mandatory">xfdesktop</packagereq>
      <packagereq type="mandatory">xffm</packagereq>
      <packagereq type="default">xffm-icons</packagereq>
      <packagereq type="default">xfprint</packagereq>
      <packagereq type="mandatory">xfwm4</packagereq>
        <packagereq type="optional">xfce4-toys</packagereq>
        <packagereq type="optional">xfwm4-themes</packagereq>
      <packagereq type="default">xfwm4-themes</packagereq>
        <packagereq type="optional">xfcalendar</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">WindowMaker</packagereq>
        <packagereq type="optional">wmx</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="default">glade2</packagereq>
      <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="default">pygtk2-devel</packagereq>
      <packagereq type="mandatory">xfce-mcs-manager-devel</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>
    </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">fonttools</packagereq>
      <packagereq type="optional">rxvt</packagereq>
      <packagereq type="optional">workrave</packagereq>
      <packagereq type="optional">xlockmore</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">kickpim</packagereq>
      <packagereq type="optional">kdissert</packagereq>
      <packagereq type="optional">kbibtex</packagereq>
      <packagereq type="optional">kiosktool</packagereq>
      <packagereq type="optional">kmymoney2</packagereq>
      <packagereq type="optional">kompose</packagereq>
      <packagereq type="optional">kyum</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>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>
    </packagelist>
  </group>

  <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">qtparted</packagereq>
      <packagereq type="optional">system-config-control</packagereq>
      <packagereq type="optional">yumex</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>

  <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>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>

  <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>xfce-software-development</groupid>
      <groupid>web-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>
</comps>

--- NEW FILE comps-fe6.xml.in ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE newcomps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
<comps>

  <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">conglomerate</packagereq>
        <packagereq type="optional">kile</packagereq>
        <packagereq type="optional">scribus</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">bazaar</packagereq>
        <packagereq type="optional">bigloo</packagereq>
        <packagereq type="optional">bzr</packagereq>
        <packagereq type="optional">ccache</packagereq>
        <packagereq type="optional">clisp</packagereq>
        <packagereq type="optional">cogito</packagereq>
        <packagereq type="optional">colordiff</packagereq>
        <packagereq type="optional">cpan2rpm</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">fedora-rpmdevtools</packagereq>
        <packagereq type="optional">fpc</packagereq>
        <packagereq type="optional">gforth</packagereq>
        <packagereq type="optional">ghc</packagereq>
        <packagereq type="optional">git</packagereq>
        <packagereq type="optional">highlight</packagereq>
        <packagereq type="optional">lincvs</packagereq>
        <packagereq type="optional">lua</packagereq>
        <packagereq type="optional">mach</packagereq>
        <packagereq type="optional">meld</packagereq>
        <packagereq type="optional">mercurial</packagereq>
        <packagereq type="optional">mock</packagereq>
        <packagereq type="optional">monotone</packagereq>
        <packagereq type="optional">ocaml</packagereq>
        <packagereq type="optional">pl</packagereq>
        <packagereq type="optional">plt-scheme</packagereq>
        <packagereq type="optional">pylint</packagereq>
        <packagereq type="optional">quilt</packagereq>
        <packagereq type="optional">rpmlint</packagereq>
        <packagereq type="optional">splint</packagereq>
        <packagereq type="optional">tkcvs</packagereq>
        <packagereq type="optional">tla</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">TeXmacs</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">blacs</packagereq>
        <packagereq type="optional">blas</packagereq>
        <packagereq type="optional">cernlib-utils</packagereq>
        <packagereq type="optional">galculator</packagereq>
        <packagereq type="optional">gdl</packagereq>
        <packagereq type="optional">hmmer</packagereq>
        <packagereq type="optional">kst</packagereq>
        <packagereq type="optional">lagan</packagereq>
        <packagereq type="optional">lapack</packagereq>
        <packagereq type="optional">ncarg</packagereq>
        <packagereq type="optional">numpy</packagereq>
        <packagereq type="optional">octave</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">scalapack</packagereq>
        <packagereq type="optional">SIBsim4</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>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">byzanz</packagereq>
        <packagereq type="optional">deskbar-applet</packagereq>
        <packagereq type="optional">gdesklets</packagereq>
        <packagereq type="optional">gfontview</packagereq>
        <packagereq type="optional">glunarclock</packagereq>
        <packagereq type="optional">gmpc</packagereq>
        <packagereq type="optional">gnome-applet-rhythmbox</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">sabayon</packagereq>
        <packagereq type="optional">seahorse</packagereq>
        <packagereq type="optional">smeg</packagereq>
        <packagereq type="optional">themes-backgrounds-gnome</packagereq>
        <packagereq type="optional">wp_tray</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">gazpacho</packagereq>
        <packagereq type="optional">gconfmm26-devel</packagereq>
        <packagereq type="optional">glibmm24-devel</packagereq>
        <packagereq type="optional">gnome-common</packagereq>
        <packagereq type="optional">gtkmm24-devel</packagereq>
        <packagereq type="optional">gtkalog</packagereq>
        <packagereq type="optional">gnome-vfsmm26-devel</packagereq>
        <packagereq type="optional">gquilt</packagereq>
        <packagereq type="optional">libsexy-devel</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">bzflag</packagereq>
        <packagereq type="optional">celestia</packagereq>
        <packagereq type="optional">cgoban</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">fillets-ng</packagereq>
        <packagereq type="optional">foobillard</packagereq>
        <packagereq type="optional">fortune-mod</packagereq>
        <packagereq type="optional">freeciv</packagereq>
        <packagereq type="optional">freedoom</packagereq>
        <packagereq type="optional">freedroid</packagereq>
        <packagereq type="optional">freedroidrpg</packagereq>
        <packagereq type="optional">gl-117</packagereq>
        <packagereq type="optional">gnofract4d</packagereq>
        <packagereq type="optional">gnome-sudoku</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">nethack</packagereq>
        <packagereq type="optional">nethack-vultures</packagereq>
        <packagereq type="optional">neverball</packagereq>
        <packagereq type="optional">nexuiz</packagereq>
        <packagereq type="optional">njam</packagereq>
        <packagereq type="optional">overgod</packagereq>
        <packagereq type="optional">pipenightdreams</packagereq>
        <packagereq type="optional">powermanga</packagereq>
        <packagereq type="optional">ppracer</packagereq>
        <packagereq type="optional">qascade</packagereq>
        <packagereq type="optional">qqo</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">supertux</packagereq>
        <packagereq type="optional">tong</packagereq>
        <packagereq type="optional">torcs</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">xboard</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>education</id>
    <_name>Educational Software</_name>
    <_description>Educational software for learning</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
        <packagereq type="optional">drgeo</packagereq>
	<packagereq type="optional">drgeo-doc</packagereq>
        <packagereq type="optional">gperiodic</packagereq>
        <packagereq type="optional">stellarium</packagereq>
        <packagereq type="optional">tuxtype2</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">amaya</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">comical</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">fwbuilder</packagereq>
        <packagereq type="optional">gajim</packagereq>
        <packagereq type="optional">galeon</packagereq>
        <packagereq type="optional">gnome-blog</packagereq>
        <packagereq type="optional">gnome-telnet</packagereq>
        <packagereq type="optional">gossip</packagereq>
        <packagereq type="optional">gtk-gnutella</packagereq>
        <packagereq type="optional">gwget</packagereq>
        <packagereq type="optional">kickpim</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">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">silky</packagereq>
        <packagereq type="optional">straw</packagereq>
        <packagereq type="optional">sylpheed</packagereq>
        <packagereq type="optional">sylpheed-claws</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">blender</packagereq>
        <packagereq type="optional">digikam</packagereq>
        <packagereq type="optional">fontforge</packagereq>
        <packagereq type="optional">fyre</packagereq>
        <packagereq type="optional">grads</packagereq>
        <packagereq type="optional">gv</packagereq>
        <packagereq type="optional">gpp</packagereq>
        <packagereq type="optional">gqview</packagereq>
        <packagereq type="optional">graphviz</packagereq>
        <packagereq type="optional">gwenview</packagereq>
        <packagereq type="optional">inkscape</packagereq>
        <packagereq type="optional">qiv</packagereq>
        <packagereq type="optional">showimg</packagereq>
        <packagereq type="optional">skencil</packagereq>
        <packagereq type="optional">sodipodi</packagereq>
        <packagereq type="optional">tuxpaint</packagereq>
    </packagelist>
  </group>

  <group>
    <id>mail-server</id>
    <_name>Mail Server</_name>
    <_description>These packages allow you to configure an IMAP or Postfix mail server.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">cyrus-imapd</packagereq>
      <packagereq type="optional">enemies-of-carlotta</packagereq>
      <packagereq type="optional">perl-Cyrus</packagereq>
      <packagereq type="optional">clamav</packagereq>
      <packagereq type="optional">clamav-data</packagereq>
      <packagereq type="optional">clamav-milter</packagereq>
      <packagereq type="optional">exim</packagereq>
      <packagereq type="optional">exim-doc</packagereq>
      <packagereq type="optional">mlmmj</packagereq>
      <packagereq type="optional">pyzor</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">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">dia</packagereq>
        <packagereq type="optional">gdeskcal</packagereq>
        <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>
        <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">MagicPoint</packagereq>
        <packagereq type="optional">pybliographer</packagereq>
        <packagereq type="optional">qcad</packagereq>
        <packagereq type="optional">texmaker</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">alsamixergui</packagereq>
        <packagereq type="optional">akode</packagereq>
        <packagereq type="optional">amarok</packagereq>
        <packagereq type="optional">audacity</packagereq>
        <packagereq type="optional">bmp</packagereq>
        <packagereq type="optional">camstream</packagereq>
        <packagereq type="optional">camE</packagereq>
        <packagereq type="optional">easytag</packagereq>
        <packagereq type="optional">gcfilms</packagereq>
        <packagereq type="optional">gcombust</packagereq>
        <packagereq type="optional">gnomad2</packagereq>
        <packagereq type="optional">gnomebaker</packagereq>
        <packagereq type="optional">graveman</packagereq>
        <packagereq type="optional">grip</packagereq>
        <packagereq type="optional">kid3</packagereq>
        <packagereq type="optional">kover</packagereq>
        <packagereq type="optional">libvisual-plugins</packagereq>
        <packagereq type="optional">soundconverter</packagereq>
        <packagereq type="optional">soundtracker</packagereq>
        <packagereq type="optional">sweep</packagereq>
	<packagereq type="optional">tagtool</packagereq>
	<packagereq type="optional">ushare</packagereq>
        <packagereq type="optional">xmms</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">cfengine</packagereq>
	<packagereq type="optional">cfs</packagereq>
	<packagereq type="optional">crack</packagereq>
	<packagereq type="optional">dkms</packagereq>
        <packagereq type="optional">environment-modules</packagereq>
        <packagereq type="optional">epylog</packagereq>
        <packagereq type="optional">fuse</packagereq>
        <packagereq type="optional">fwbuilder</packagereq>
        <packagereq type="optional">ghasher</packagereq>
        <packagereq type="optional">ghex</packagereq>
        <packagereq type="optional">hercules</packagereq>
        <packagereq type="optional">ibmonitor</packagereq>
	<packagereq type="optional">inadyn</packagereq>
        <packagereq type="optional">lirc</packagereq>
        <packagereq type="optional">moodss</packagereq>
        <packagereq type="optional">moomps</packagereq>
        <packagereq type="optional">nagios</packagereq>
        <packagereq type="optional">nfswatch</packagereq>
        <packagereq type="optional">rdiff-backup</packagereq>
        <packagereq type="optional">sabayon</packagereq>
        <packagereq type="optional">shorewall</packagereq>
        <packagereq type="optional">snort</packagereq>
        <packagereq type="optional">ttywatch</packagereq>
        <packagereq type="optional">unison</packagereq>
        <packagereq type="optional">vnstat</packagereq>
        <packagereq type="optional">vpnc</packagereq>
        <packagereq type="optional">wine</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">acpitool</packagereq>
        <packagereq type="optional">i810switch</packagereq>
        <packagereq type="optional">i8kutils</packagereq>
        <packagereq type="optional">libifp</packagereq>
        <packagereq type="optional">s3switch</packagereq>
        <packagereq type="optional">tpb</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">flumotion</packagereq>
        <packagereq type="optional">icecast</packagereq>
        <packagereq type="optional">ircd-hybrid</packagereq>
        <packagereq type="optional">jabberd</packagereq>
        <packagereq type="optional">kannel</packagereq>
	<packagereq type="optional">ushare</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">bittorrent</packagereq>
        <packagereq type="optional">centericq</packagereq>
        <packagereq type="optional">cone</packagereq>
        <packagereq type="optional">elmo</packagereq>
        <packagereq type="optional">irssi</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>
    </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_geoip</packagereq>
        <packagereq type="optional">mod_security</packagereq>
        <packagereq type="optional">moin</packagereq>
        <packagereq type="optional">plone</packagereq>
        <packagereq type="optional">thttpd</packagereq>
        <packagereq type="optional">TurboGears</packagereq>
        <packagereq type="optional">zope</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="optional">xemacs-el</packagereq>
      <packagereq type="default">xemacs-info</packagereq>
      <packagereq type="optional">xemacs-nox</packagereq>
      <packagereq type="default">xemacs-sumo</packagereq>
      <packagereq type="optional">xemacs-sumo-el</packagereq>
      <packagereq type="default">xemacs-sumo-info</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="default">xfce-mcs-manager</packagereq>
      <packagereq type="default">xfce-mcs-plugins</packagereq>
      <packagereq type="mandatory">xfce-utils</packagereq>
      <packagereq type="default">xfce4-iconbox</packagereq>
      <packagereq type="mandatory">xfce4-panel</packagereq>
      <packagereq type="default">xfce4-systray</packagereq>
      <packagereq type="mandatory">xfdesktop</packagereq>
      <packagereq type="mandatory">xffm</packagereq>
      <packagereq type="default">xffm-icons</packagereq>
      <packagereq type="default">xfprint</packagereq>
      <packagereq type="mandatory">xfwm4</packagereq>
        <packagereq type="optional">xfce4-toys</packagereq>
        <packagereq type="optional">xfwm4-themes</packagereq>
      <packagereq type="default">xfwm4-themes</packagereq>
        <packagereq type="optional">xfcalendar</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">WindowMaker</packagereq>
        <packagereq type="optional">wmx</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="default">glade2</packagereq>
      <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="default">pygtk2-devel</packagereq>
      <packagereq type="mandatory">xfce-mcs-manager-devel</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>
    </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">fonttools</packagereq>
      <packagereq type="optional">rxvt</packagereq>
      <packagereq type="optional">workrave</packagereq>
      <packagereq type="optional">xlockmore</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">kickpim</packagereq>
      <packagereq type="optional">kdissert</packagereq>
      <packagereq type="optional">kbibtex</packagereq>
      <packagereq type="optional">kiosktool</packagereq>
      <packagereq type="optional">kmymoney2</packagereq>
      <packagereq type="optional">kompose</packagereq>
      <packagereq type="optional">kyum</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>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>
    </packagelist>
  </group>

  <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">qtparted</packagereq>
      <packagereq type="optional">system-config-control</packagereq>
      <packagereq type="optional">yumex</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>

  <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>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>

  <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>xfce-software-development</groupid>
      <groupid>web-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>
</comps>


Index: comps-fe5.xml
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- comps-fe5.xml	7 Apr 2006 14:11:26 -0000	1.4
+++ comps-fe5.xml	17 Apr 2006 17:49:10 -0000	1.5
@@ -24,9 +24,9 @@
     <packagelist>
         <packagereq type="optional">abicheck</packagereq>
         <packagereq type="optional">bazaar</packagereq>
+        <packagereq type="optional">bigloo</packagereq>
         <packagereq type="optional">bzr</packagereq>
         <packagereq type="optional">ccache</packagereq>
-        <packagereq type="optional">cdiff</packagereq>
         <packagereq type="optional">clisp</packagereq>
         <packagereq type="optional">cogito</packagereq>
         <packagereq type="optional">colordiff</packagereq>
@@ -41,23 +41,25 @@
         <packagereq type="optional">gforth</packagereq>
         <packagereq type="optional">ghc</packagereq>
         <packagereq type="optional">git</packagereq>
+        <packagereq type="optional">highlight</packagereq>
         <packagereq type="optional">lincvs</packagereq>
         <packagereq type="optional">lua</packagereq>
         <packagereq type="optional">mach</packagereq>
-        <packagereq type="optional">mock</packagereq>
         <packagereq type="optional">meld</packagereq>
         <packagereq type="optional">mercurial</packagereq>
+        <packagereq type="optional">mock</packagereq>
         <packagereq type="optional">monotone</packagereq>
-        <packagereq type="optional">pylint</packagereq>
         <packagereq type="optional">ocaml</packagereq>
+        <packagereq type="optional">pl</packagereq>
+        <packagereq type="optional">plt-scheme</packagereq>
+        <packagereq type="optional">pylint</packagereq>
         <packagereq type="optional">quilt</packagereq>
         <packagereq type="optional">rpmlint</packagereq>
-        <packagereq type="optional">rpmproc</packagereq>
         <packagereq type="optional">splint</packagereq>
         <packagereq type="optional">tkcvs</packagereq>
         <packagereq type="optional">tla</packagereq>
+        <packagereq type="optional">yap</packagereq>
         <packagereq type="optional">yasm</packagereq>
-        <packagereq type="optional">bigloo</packagereq>
     </packagelist>
   </group>
 
@@ -101,10 +103,12 @@
         <packagereq type="optional">blas</packagereq>
         <packagereq type="optional">cernlib-utils</packagereq>
         <packagereq type="optional">galculator</packagereq>
+        <packagereq type="optional">gdl</packagereq>
         <packagereq type="optional">hmmer</packagereq>
         <packagereq type="optional">kst</packagereq>
         <packagereq type="optional">lagan</packagereq>
         <packagereq type="optional">lapack</packagereq>
+        <packagereq type="optional">ncarg</packagereq>
         <packagereq type="optional">numpy</packagereq>
         <packagereq type="optional">octave</packagereq>
         <packagereq type="optional">qalculate-gtk</packagereq>
@@ -152,6 +156,7 @@
         <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">sabayon</packagereq>
@@ -195,12 +200,15 @@
         <packagereq type="optional">bzflag</packagereq>
         <packagereq type="optional">celestia</packagereq>
         <packagereq type="optional">cgoban</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">fillets-ng</packagereq>
         <packagereq type="optional">foobillard</packagereq>
         <packagereq type="optional">fortune-mod</packagereq>
         <packagereq type="optional">freeciv</packagereq>
+        <packagereq type="optional">freedoom</packagereq>
         <packagereq type="optional">freedroid</packagereq>
         <packagereq type="optional">freedroidrpg</packagereq>
         <packagereq type="optional">gl-117</packagereq>
@@ -213,24 +221,31 @@
         <packagereq type="optional">lacewing</packagereq>
         <packagereq type="optional">lincity-ng</packagereq>
         <packagereq type="optional">lmarbles</packagereq>
-		<packagereq type="optional">lucidlife</packagereq>
+        <packagereq type="optional">lucidlife</packagereq>
         <packagereq type="optional">Maelstrom</packagereq>
         <packagereq type="optional">nethack</packagereq>
         <packagereq type="optional">nethack-vultures</packagereq>
         <packagereq type="optional">neverball</packagereq>
         <packagereq type="optional">nexuiz</packagereq>
+        <packagereq type="optional">njam</packagereq>
         <packagereq type="optional">overgod</packagereq>
+        <packagereq type="optional">pipenightdreams</packagereq>
         <packagereq type="optional">powermanga</packagereq>
         <packagereq type="optional">ppracer</packagereq>
         <packagereq type="optional">qascade</packagereq>
         <packagereq type="optional">qqo</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">supertux</packagereq>
+        <packagereq type="optional">tong</packagereq>
         <packagereq type="optional">torcs</packagereq>
+        <packagereq type="optional">ularn</packagereq>
         <packagereq type="optional">uqm</packagereq>
         <packagereq type="optional">viruskiller</packagereq>
         <packagereq type="optional">wesnoth</packagereq>
@@ -239,6 +254,7 @@
         <packagereq type="optional">xpilot-ng</packagereq>
         <packagereq type="optional">xplanet</packagereq>
         <packagereq type="optional">xscorch</packagereq>
+        <packagereq type="optional">zasx</packagereq>
     </packagelist>
   </group>
 
@@ -302,6 +318,7 @@
         <packagereq type="optional">straw</packagereq>
         <packagereq type="optional">sylpheed</packagereq>
         <packagereq type="optional">sylpheed-claws</packagereq>
+        <packagereq type="optional">valknut</packagereq>
         <packagereq type="optional">x3270-x11</packagereq>
         <packagereq type="optional">xchat-gnome</packagereq>
     </packagelist>
@@ -319,6 +336,7 @@
         <packagereq type="optional">fontforge</packagereq>
         <packagereq type="optional">fyre</packagereq>
         <packagereq type="optional">grads</packagereq>
+        <packagereq type="optional">gv</packagereq>
         <packagereq type="optional">gpp</packagereq>
         <packagereq type="optional">gqview</packagereq>
         <packagereq type="optional">graphviz</packagereq>
@@ -347,6 +365,7 @@
       <packagereq type="optional">clamav-milter</packagereq>
       <packagereq type="optional">exim</packagereq>
       <packagereq type="optional">exim-doc</packagereq>
+      <packagereq type="optional">mlmmj</packagereq>
       <packagereq type="optional">pyzor</packagereq>
     </packagelist>
   </group>
@@ -389,6 +408,7 @@
         <packagereq type="optional">MagicPoint</packagereq>
         <packagereq type="optional">pybliographer</packagereq>
         <packagereq type="optional">qcad</packagereq>
+        <packagereq type="optional">texmaker</packagereq>
     </packagelist>
   </group>
 
@@ -414,10 +434,12 @@
         <packagereq type="optional">gnomebaker</packagereq>
         <packagereq type="optional">graveman</packagereq>
         <packagereq type="optional">grip</packagereq>
+        <packagereq type="optional">kid3</packagereq>
         <packagereq type="optional">kover</packagereq>
         <packagereq type="optional">libvisual-plugins</packagereq>
         <packagereq type="optional">soundconverter</packagereq>
         <packagereq type="optional">soundtracker</packagereq>
+        <packagereq type="optional">sweep</packagereq>
 	<packagereq type="optional">tagtool</packagereq>
 	<packagereq type="optional">ushare</packagereq>
         <packagereq type="optional">xmms</packagereq>
@@ -436,11 +458,11 @@
         <packagereq type="optional">aide</packagereq>
         <packagereq type="optional">airsnort</packagereq>
         <packagereq type="optional">apcupsd</packagereq>
-        <packagereq type="optional">apt</packagereq>
         <packagereq type="optional">cfengine</packagereq>
 	<packagereq type="optional">cfs</packagereq>
 	<packagereq type="optional">crack</packagereq>
 	<packagereq type="optional">dkms</packagereq>
+        <packagereq type="optional">environment-modules</packagereq>
         <packagereq type="optional">epylog</packagereq>
         <packagereq type="optional">fuse</packagereq>
         <packagereq type="optional">fwbuilder</packagereq>
@@ -448,6 +470,7 @@
         <packagereq type="optional">ghex</packagereq>
         <packagereq type="optional">hercules</packagereq>
         <packagereq type="optional">ibmonitor</packagereq>
+	<packagereq type="optional">inadyn</packagereq>
         <packagereq type="optional">lirc</packagereq>
         <packagereq type="optional">moodss</packagereq>
         <packagereq type="optional">moomps</packagereq>
@@ -514,6 +537,7 @@
         <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>
@@ -534,6 +558,9 @@
         <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_geoip</packagereq>
+        <packagereq type="optional">mod_security</packagereq>
         <packagereq type="optional">moin</packagereq>
         <packagereq type="optional">plone</packagereq>
         <packagereq type="optional">thttpd</packagereq>
@@ -553,8 +580,9 @@
     </grouplist>
     <packagelist>
       <packagereq type="mandatory">xemacs</packagereq>
-      <packagereq type="default">xemacs-el</packagereq>
+      <packagereq type="optional">xemacs-el</packagereq>
       <packagereq type="default">xemacs-info</packagereq>
+      <packagereq type="optional">xemacs-nox</packagereq>
       <packagereq type="default">xemacs-sumo</packagereq>
       <packagereq type="optional">xemacs-sumo-el</packagereq>
       <packagereq type="default">xemacs-sumo-info</packagereq>
@@ -670,6 +698,7 @@
       <packagereq type="optional">kbibtex</packagereq>
       <packagereq type="optional">kiosktool</packagereq>
       <packagereq type="optional">kmymoney2</packagereq>
+      <packagereq type="optional">kompose</packagereq>
       <packagereq type="optional">kyum</packagereq>
     </packagelist>
   </group>
@@ -706,7 +735,6 @@
       <packagereq type="optional">gparted</packagereq>
       <packagereq type="optional">gsynaptics</packagereq>
       <packagereq type="optional">qtparted</packagereq>
-      <packagereq type="optional">synaptic</packagereq>
       <packagereq type="optional">system-config-control</packagereq>
       <packagereq type="optional">yumex</packagereq>
     </packagelist>
@@ -785,4 +813,4 @@
       <groupid>network-server</groupid>
     </grouplist>
   </category>
-</comps>
+</comps>
\ No newline at end of file



From fedora-extras-commits at redhat.com  Mon Apr 17 20:28:36 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Mon, 17 Apr 2006 13:28:36 -0700
Subject: rpms/gphpedit/devel gphpedit.spec,1.1,1.2
Message-ID: <200604172028.k3HKSc1N030094@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/gphpedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30077

Modified Files:
	gphpedit.spec 
Log Message:
Ensure bundled (modified) gtkscintilla2 library is rebuilt; don't use precompiled binaries.


Index: gphpedit.spec
===================================================================
RCS file: /cvs/extras/rpms/gphpedit/devel/gphpedit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gphpedit.spec	15 Apr 2006 01:51:25 -0000	1.1
+++ gphpedit.spec	17 Apr 2006 20:28:36 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gphpedit
 Version:        0.9.80
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A PHP source editor for GNOME 2
 
 Group:          Applications/Text
@@ -40,6 +40,14 @@
 EOF
 
 %build
+# Remove precompiled binaries and rebuild bundled gtkscintilla2
+# (bundling is intentional and with good cause)
+pushd src/gtkscintilla2
+make clean
+make %{?_smp_mflags}
+popd
+
+# Configure and make main binary
 %configure
 make %{?_smp_mflags}
 
@@ -72,6 +80,10 @@
 %{_datadir}/gphpedit/php-gphpedit.api
 
 %changelog
+* Mon Apr 17 2006 Tim Jackson <rpm at timj.co.uk> 0.9.80-4
+- Ensure bundled gtkscintilla2 is rebuilt instead of using precompiled
+  binaries
+
 * Sat Apr 15 2006 Tim Jackson <rpm at timj.co.uk> 0.9.80-3
 - Remove gtk2-devel (gtkhtml2-devel and libgnomeui-devel will pull it in)
 - Remove empty NEWS file



From fedora-extras-commits at redhat.com  Mon Apr 17 20:43:43 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 17 Apr 2006 13:43:43 -0700
Subject: rpms/paraview/FC-4 paraview.spec,1.1,1.2
Message-ID: <200604172043.k3HKhj5B030301@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/paraview/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30284

Modified Files:
	paraview.spec 
Log Message:
FC4 X11 packages



Index: paraview.spec
===================================================================
RCS file: /cvs/extras/rpms/paraview/FC-4/paraview.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- paraview.spec	16 Apr 2006 01:44:53 -0000	1.1
+++ paraview.spec	17 Apr 2006 20:43:43 -0000	1.2
@@ -15,7 +15,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake, lam
-BuildRequires:  libGLU-devel, libXt-devel
+BuildRequires:  xorg-x11-devel
 BuildRequires:  python-devel, tk-devel, hdf5-devel
 BuildRequires:  freetype-devel, libjpeg-devel, libpng-devel, libtiff-devel, zlib-devel
 BuildRequires:  expat-devel



From fedora-extras-commits at redhat.com  Mon Apr 17 21:16:04 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Mon, 17 Apr 2006 14:16:04 -0700
Subject: owners owners.list,1.851,1.852
Message-ID: <200604172116.k3HLG6Z9032662@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32645

Modified Files:
	owners.list 
Log Message:
Take over maintainership of apt/synaptic


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.851
retrieving revision 1.852
diff -u -r1.851 -r1.852
--- owners.list	17 Apr 2006 16:57:57 -0000	1.851
+++ owners.list	17 Apr 2006 21:16:04 -0000	1.852
@@ -44,7 +44,7 @@
 Fedora Extras|apg|Automated Password Generator for random password generation|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|apmud|Power Management daemon for Apple laptops|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|apollon|Filesharing client|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
-Fedora Extras|apt|Debian's Advanced Packaging Tool with RPM support|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|pmatilai at laiskiainen.org
+Fedora Extras|apt|Debian's Advanced Packaging Tool with RPM support|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|pmatilai at laiskiainen.org
 Fedora Extras|aqhbci-qt-tools|Setup wizard and debugger for the HBCI backend for the Aqbanking library|notting at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|arc|Arc archiver|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|argus|Network transaction audit tool|somlo at cmu.edu|extras-qa at fedoraproject.org|
@@ -1408,7 +1408,7 @@
 Fedora Extras|sylpheed-claws-plugins|Additional plugins for sylpheed-claws|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|sylpheed-claws|The bleeding edge branch of Sylpheed|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|sylpheed|GTK+ based, lightweight, and fast email client|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
-Fedora Extras|synaptic|Graphical frontend for APT package manager|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|pmatilai at laiskiainen.org
+Fedora Extras|synaptic|Graphical frontend for APT package manager|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|pmatilai at laiskiainen.org
 Fedora Extras|synce|For bugs related to the synce component|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|synce-gnomevfs|Gnome-vfs module for synce|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|synce-software-manager|Software manager for use with synce|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Apr 17 22:24:33 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 17 Apr 2006 15:24:33 -0700
Subject: rpms/paraview/FC-5 paraview.spec,1.1,1.2
Message-ID: <200604172224.k3HMOZ7M002497@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/paraview/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2480

Modified Files:
	paraview.spec 
Log Message:
Exclude ppc due to gcc bug #189160



Index: paraview.spec
===================================================================
RCS file: /cvs/extras/rpms/paraview/FC-5/paraview.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- paraview.spec	16 Apr 2006 01:44:53 -0000	1.1
+++ paraview.spec	17 Apr 2006 22:24:33 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           paraview
 Version:        2.4.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Parallel visualization application
 
 Group:          Applications/Engineering
@@ -20,6 +20,8 @@
 BuildRequires:  freetype-devel, libjpeg-devel, libpng-devel, libtiff-devel, zlib-devel
 BuildRequires:  expat-devel
 BuildRequires:  /usr/bin/desktop-file-install
+ExcludeArch:    ppc
+
 Requires:       %{name}-data = %{version}-%{release}
 Requires(post):   /usr/bin/update-desktop-database
 Requires(postun): /usr/bin/update-desktop-database
@@ -308,6 +310,9 @@
 
 
 %changelog
+* Mon Apr 17 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.3-6
+- Exclude ppc due to gcc bug #189160
+
 * Wed Apr 12 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.3-5
 - Cleanup permissions
 



From fedora-extras-commits at redhat.com  Mon Apr 17 22:25:13 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 17 Apr 2006 15:25:13 -0700
Subject: rpms/paraview/devel paraview.spec,1.1,1.2
Message-ID: <200604172225.k3HMPFs3002569@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/paraview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2548

Modified Files:
	paraview.spec 
Log Message:
Exclude ppc due to gcc bug #189160



Index: paraview.spec
===================================================================
RCS file: /cvs/extras/rpms/paraview/devel/paraview.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- paraview.spec	16 Apr 2006 01:44:53 -0000	1.1
+++ paraview.spec	17 Apr 2006 22:25:13 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           paraview
 Version:        2.4.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Parallel visualization application
 
 Group:          Applications/Engineering
@@ -20,6 +20,8 @@
 BuildRequires:  freetype-devel, libjpeg-devel, libpng-devel, libtiff-devel, zlib-devel
 BuildRequires:  expat-devel
 BuildRequires:  /usr/bin/desktop-file-install
+ExcludeArch:    ppc
+
 Requires:       %{name}-data = %{version}-%{release}
 Requires(post):   /usr/bin/update-desktop-database
 Requires(postun): /usr/bin/update-desktop-database
@@ -308,6 +310,9 @@
 
 
 %changelog
+* Mon Apr 17 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.3-6
+- Exclude ppc due to gcc bug #189160
+
 * Wed Apr 12 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.3-5
 - Cleanup permissions
 



From fedora-extras-commits at redhat.com  Tue Apr 18 00:20:44 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Mon, 17 Apr 2006 17:20:44 -0700
Subject: kadischi/post_install_scripts 04userconfig.py, 1.4, 1.5 05fsclean.py,
	1.3, 1.4 Makefile.am, 1.3, 1.4
Message-ID: <200604180020.k3I0KiN7007344@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi/post_install_scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7323/kadischi/post_install_scripts

Modified Files:
	04userconfig.py 05fsclean.py Makefile.am 
Log Message:
Few minor changes. Additional user account creation post_install_script.


Index: 04userconfig.py
===================================================================
RCS file: /cvs/devel/kadischi/post_install_scripts/04userconfig.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 04userconfig.py	12 Apr 2006 23:12:10 -0000	1.4
+++ 04userconfig.py	18 Apr 2006 00:20:42 -0000	1.5
@@ -27,13 +27,13 @@
     if (lokkit and ntsysv) == True:
         flc_log("Taking you to interactive user configuration..")
         run("chroot %s %s" % (sysdir, "/usr/sbin/lokkit"))
-        run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv"))
+        run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv --level 35"))
     else:
         flc_log("Skipping interactive user configuration..")
 else:
     if (lokkit and ntsysv) == True:
         flc_log("Taking you to interactive user configuration..")
         run("chroot %s %s" % (sysdir, "/usr/sbin/lokkit"))
-        run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv"))
+        run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv --level 35"))
     else:
         flc_log("Skipping interactive user configuration..")


Index: 05fsclean.py
===================================================================
RCS file: /cvs/devel/kadischi/post_install_scripts/05fsclean.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 05fsclean.py	31 Mar 2006 21:03:41 -0000	1.3
+++ 05fsclean.py	18 Apr 2006 00:20:42 -0000	1.4
@@ -7,7 +7,7 @@
 
 # Directories that we want to empty but not delete
 directories_to_be_emptied = [
-    '/root',
+#   '/root',  root's files should stay.
     '/proc',
     '/lost+found',
     '/var/gdm',
@@ -49,10 +49,10 @@
             continue
         os.remove (path)
 
-def clean_up_root (rootdir):
+#def clean_up_root (rootdir):
     # FIXME: Do this nicer at some point
-    os.system ("chroot %s /usr/bin/rsync -a /etc/skel/ /root/" % rootdir)
-    os.chmod (rootdir + '/root', 0750)
+#    os.system ("chroot %s /usr/bin/rsync -a /etc/skel/ /root/" % rootdir)
+#    os.chmod (rootdir + '/root', 0750)
 
 rootdir = sys.argv[1]
 
@@ -61,4 +61,4 @@
         directories_to_be_emptied,
         directories_to_be_cleaned,
         files_to_be_removed)
-clean_up_root (rootdir)
+#clean_up_root (rootdir)


Index: Makefile.am
===================================================================
RCS file: /cvs/devel/kadischi/post_install_scripts/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.am	10 Apr 2006 22:53:32 -0000	1.3
+++ Makefile.am	18 Apr 2006 00:20:42 -0000	1.4
@@ -1,5 +1,5 @@
 PYTHON_FILES = 03fstab.py 04userconfig.py 05fsclean.py 06sysconfig.py
-BASH_FILES = 01prelink.sh 02install.sh
+BASH_FILES = 01prelink.sh 02install.sh 07accounts.sh
 
 pisdir = $(pkgdatadir)/post_install_scripts
 pis_SCRIPTS = $(PYTHON_FILES) $(BASH_FILES)



From fedora-extras-commits at redhat.com  Tue Apr 18 00:21:35 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Mon, 17 Apr 2006 17:21:35 -0700
Subject: kadischi/post_install_scripts 07accounts.sh,NONE,1.1
Message-ID: <200604180021.k3I0LZI5007373@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi/post_install_scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7357/kadischi/post_install_scripts

Added Files:
	07accounts.sh 
Log Message:
Few minor changes. Additional user account creation post_install_script.


--- NEW FILE 07accounts.sh ---
#!/bin/bash
#
# Allow creation of addition user accounts.
# UIDs start at 500, GID is 100.


 . /etc/kadischi/kadischi.conf

SYSDIR=$1
ANACONDA_ARGS=$2
USING_KICKSTART=$(echo $ANACONDA_ARGS | grep -G [--]kickstart)
USING_CMDLINE=$(echo $ANACONDA_ARGS | egrep -- "-C|--cmdline")
i=0


if [ $USING_KICKSTART ] || [ $USING_CMDLINE ]; then   
   exit 0
else
   echo "A non-root user should be created, create one now?"
   echo -n "[yes/no] "
   read CHOICE
   if [ $CHOICE == "y" ] || [ $CHOICE == "yes" ]; then
      while [ $CHOICE == "y" ] || [ $CHOICE == "yes" ]; do
         echo -n "Username: "
         read NEWUSERNAME
         echo -n "User shell: "
         read NEWSHELL
         if [ -n $NEWUSERNAME ] && [ -n $NEWSHELL ]; then
            chroot $SYSDIR /usr/sbin/useradd -d /home/$NEWUSERNAME -m -s $NEWSHELL -u 50$i -g 100 $NEWUSERNAME
            chroot $SYSDIR /usr/bin/passwd $NEWUSERNAME
            echo "User: $NEWUSERNAME, UID: 50$i, GID: 100 created successfully."
            (( i += 1 ))
         else
            echo "Username or shell wasn't specified."
         fi
         echo "Would you like to create another user?"
         echo -n "[yes/no] "
         read CHOICE
      done
   else
      exit 0
   fi
fi




From fedora-extras-commits at redhat.com  Tue Apr 18 01:38:03 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 17 Apr 2006 18:38:03 -0700
Subject: rpms/SOAPpy - New directory
Message-ID: <200604180138.k3I1c5SB009669@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/SOAPpy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9648/SOAPpy

Log Message:
Directory /cvs/extras/rpms/SOAPpy added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 18 01:38:04 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 17 Apr 2006 18:38:04 -0700
Subject: rpms/SOAPpy/devel - New directory
Message-ID: <200604180138.k3I1c6hN009672@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/SOAPpy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9648/SOAPpy/devel

Log Message:
Directory /cvs/extras/rpms/SOAPpy/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 18 01:38:28 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 17 Apr 2006 18:38:28 -0700
Subject: rpms/SOAPpy Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604180138.k3I1cUrx009726@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/SOAPpy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9693

Added Files:
	Makefile import.log 
Log Message:
Setup of module SOAPpy


--- NEW FILE Makefile ---
# Top level Makefile for module SOAPpy
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 18 01:38:28 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 17 Apr 2006 18:38:28 -0700
Subject: rpms/SOAPpy/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604180138.k3I1cUVF009729@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/SOAPpy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9693/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module SOAPpy


--- 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 Apr 18 01:39:10 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 17 Apr 2006 18:39:10 -0700
Subject: rpms/SOAPpy import.log,1.1,1.2
Message-ID: <200604180139.k3I1dCxm009790@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/SOAPpy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9757

Modified Files:
	import.log 
Log Message:
auto-import SOAPpy-0.11.6-2 on branch devel from SOAPpy-0.11.6-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/SOAPpy/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Apr 2006 01:38:28 -0000	1.1
+++ import.log	18 Apr 2006 01:39:10 -0000	1.2
@@ -0,0 +1 @@
+SOAPpy-0_11_6-2:HEAD:SOAPpy-0.11.6-2.src.rpm:1145324339



From fedora-extras-commits at redhat.com  Tue Apr 18 01:39:11 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 17 Apr 2006 18:39:11 -0700
Subject: rpms/SOAPpy/devel SOAPpy.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604180139.k3I1dDep009795@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/SOAPpy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9757/devel

Modified Files:
	.cvsignore sources 
Added Files:
	SOAPpy.spec 
Log Message:
auto-import SOAPpy-0.11.6-2 on branch devel from SOAPpy-0.11.6-2.src.rpm


--- NEW FILE SOAPpy.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           SOAPpy
Version:        0.11.6
Release:        2%{?dist}
Summary:        Full-featured SOAP library for Python
Group:          Development/Languages
License:        Python Software Foundation License
URL:            http://pywebsvcs.sourceforge.net/
Source0:        http://dl.sourceforge.net/pywebsvcs/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  python-fpconst >= 0.6.0
Requires:       python-fpconst >= 0.6.0
Requires:       PyXML >= 0.8.3
Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")

%description
The goal of the SOAPpy team is to provide a full-featured SOAP library
for Python that is very simple to use and that fully supports dynamic
interaction between clients and servers.


%prep
%setup -q

# remove shell bangs
pushd %{name}/wstools
for file in $(find . -type f -name "*.py"); do
  cp $file $file.orig
  grep -v "\#\! \/usr\/bin" $file.orig > $file
  rm -f $file.orig
done
popd

# remove executable flag from example scripts
chmod -x bid/* contrib/* docs/* tools/* validate/*


%build
CFLAGS="%{optflags}" %{__python} setup.py build


%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}


%check
# testTime is meant to pass, testArray is a known failure.
# ERROR: testTime (__main__.SOAPTestCase)
# FAIL: testArray (__main__.SOAPTestCase)
PYTHONPATH="%{buildroot}%{python_sitelib}" %{__python} tests/SOAPtest.py || :


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc ChangeLog LICENSE README RELEASE_INFO TODO docs/ contrib/ validate/ bid/ tools/

%dir %{python_sitelib}/%{name}
%{python_sitelib}/%{name}/*.py
%{python_sitelib}/%{name}/*.pyc
%ghost %{python_sitelib}/%{name}/*.pyo

%dir %{python_sitelib}/%{name}/wstools
%{python_sitelib}/%{name}/wstools/*.py
%{python_sitelib}/%{name}/wstools/*.pyc
%ghost %{python_sitelib}/%{name}/wstools/*.pyo


%changelog
* Mon Apr 17 2006 Christopher Stone <chris.stone at gmail.com> 0.11.6-2
- Add docs directory to %doc
- Remove PyXML BR
- Removed executable bits from doc files
- Added call to run test script in %check
- Added examples to %doc

* Sat Apr 11 2006 Christopher Stone <chris.stone at gmail.com> 0.11.6-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/SOAPpy/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Apr 2006 01:38:28 -0000	1.1
+++ .cvsignore	18 Apr 2006 01:39:11 -0000	1.2
@@ -0,0 +1 @@
+SOAPpy-0.11.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/SOAPpy/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Apr 2006 01:38:28 -0000	1.1
+++ sources	18 Apr 2006 01:39:11 -0000	1.2
@@ -0,0 +1 @@
+51ac835366badedd932c64f26fa8336b  SOAPpy-0.11.6.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 18 01:43:07 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 17 Apr 2006 18:43:07 -0700
Subject: owners owners.list,1.852,1.853
Message-ID: <200604180143.k3I1h9uX009854@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9837

Modified Files:
	owners.list 
Log Message:
New package: SOAPpy


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.852
retrieving revision 1.853
diff -u -r1.852 -r1.853
--- owners.list	17 Apr 2006 21:16:04 -0000	1.852
+++ owners.list	18 Apr 2006 01:43:06 -0000	1.853
@@ -1373,6 +1373,7 @@
 Fedora Extras|smeg|Simple menu editor for GNOME|jpmahowald at gmail.com|extras-qa at fedoraproject.org|foolish at guezz.net
 Fedora Extras|snort|An intrusion detection system|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|snownews|A RSS/RDF news aggregator|shishz at hotpop.com|extras-qa at fedoraproject.org|
+Fedora Extras|SOAPpy|Full-featured SOAP library for Python|tkmame at retrogames.com|extras-qa at fedoraproject.org|
 Fedora Extras|sobby|Standalone obby server|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|sodipodi|Vector-based drawing program|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|sopwith|SDL port of sopwith|adrian at lisas.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Apr 18 02:09:09 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Mon, 17 Apr 2006 19:09:09 -0700
Subject: rpms/torque - New directory
Message-ID: <200604180209.k3I29B8I012402@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12378/torque

Log Message:
Directory /cvs/extras/rpms/torque added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 18 02:09:09 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Mon, 17 Apr 2006 19:09:09 -0700
Subject: rpms/torque/devel - New directory
Message-ID: <200604180209.k3I29BPG012405@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12378/torque/devel

Log Message:
Directory /cvs/extras/rpms/torque/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 18 02:09:21 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Mon, 17 Apr 2006 19:09:21 -0700
Subject: rpms/torque Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604180209.k3I29NXc012481@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12444

Added Files:
	Makefile import.log 
Log Message:
Setup of module torque


--- NEW FILE Makefile ---
# Top level Makefile for module torque
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 18 02:09:22 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Mon, 17 Apr 2006 19:09:22 -0700
Subject: rpms/torque/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604180209.k3I29O55012484@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12444/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module torque


--- 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 Apr 18 02:10:39 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Mon, 17 Apr 2006 19:10:39 -0700
Subject: rpms/torque import.log,1.1,1.2
Message-ID: <200604180210.k3I2AfIT012693@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12651

Modified Files:
	import.log 
Log Message:
auto-import torque-2.1.0p0-0.7.200604171430cvs on branch devel from torque-2.1.0p0-0.7.200604171430cvs.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/torque/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Apr 2006 02:09:21 -0000	1.1
+++ import.log	18 Apr 2006 02:10:39 -0000	1.2
@@ -0,0 +1 @@
+torque-2_1_0p0-0_7_200604171430cvs:HEAD:torque-2.1.0p0-0.7.200604171430cvs.src.rpm:1145326134



From fedora-extras-commits at redhat.com  Tue Apr 18 02:10:40 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Mon, 17 Apr 2006 19:10:40 -0700
Subject: rpms/torque/devel torque-2.1.0-remove-rpath.path, NONE,
	1.1 torque.spec, NONE, 1.1 xpbs.desktop, NONE, 1.1 xpbs.png,
	NONE, 1.1 xpbsmon.desktop, NONE, 1.1 xpbsmon.png, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604180210.k3I2AgqJ012702@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12651/devel

Modified Files:
	.cvsignore sources 
Added Files:
	torque-2.1.0-remove-rpath.path torque.spec xpbs.desktop 
	xpbs.png xpbsmon.desktop xpbsmon.png 
Log Message:
auto-import torque-2.1.0p0-0.7.200604171430cvs on branch devel from torque-2.1.0p0-0.7.200604171430cvs.src.rpm


--- NEW FILE torque-2.1.0-remove-rpath.path ---
Remove the rpath added by libtool as-per fedora guidelines

--- torque-2.1.0p0-snap.200604071240/configure	2006-04-07 15:41:06.000000000 -0400
+++ ./configure	2006-04-08 15:53:16.000000000 -0400
@@ -5935,7 +5935,8 @@
 
   if test "$ld_shlibs" = yes; then
     runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
+    # hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
+    hardcode_libdir_flag_spec=''
     export_dynamic_flag_spec='${wl}--export-dynamic'
     case $host_os in
     cygwin* | mingw* | pw32*)


--- NEW FILE torque.spec ---

# comment out snap if building a real release
%define name torque
%define version 2.1.0p0
%define snap 200604171430
%define release 7

# The following options are supported:
#   --with server_name=hostname
#   --with homedir=directory
#   --with[out] rcp
#   --with[out] gui
#   --with[out] tcl


# Hrm, should we default to the name of the buildhost?  That seems only
# slightly better than picking a hostname at random.  This is exactly the kind
# of compile-time default that doesn't work well with distributable packages.
# Let's force the issue with the non-sensical "localhost".
#
# Note that "localhost" doesn't actually work.  You must either define the
# correct hostname here, pass '--with server_name=foo' to rpmbuild, or be sure
# that $PBS_SERVER_HOME/server_name contains the correct hostname.
%define server_name localhost

# change as you wish
%define use_rcp 0
%define use_tcl 1
%define build_gui 1

# these are non-defaults, but fit better into most RPM-based systems
%define torquehomedir %_localstatedir/torque



# --with/--without processing
# first, error if conflicting options are used
%{?_with_rcp: %{?_without_rcp: %{error: both _with_rcp and _without_rcp}}}
%{?_with_tcl: %{?_without_tcl: %{error: both _with_tcl and _without_tcl}}}
%{?_with_gui: %{?_without_gui: %{error: both _with_gui and _without_gui}}}

# did we find any --with options?
%{?_with_rcp: %define use_rcp 1}
%{?_with_tcl: %define use_tcl 1}
%{?_with_gui: %define build_gui 1}

%{?_with_server_name:%define server_name %(set -- %{_with_server_name}; echo $1 | grep -v with | sed 's/=//')}
%{?_with_homedir:%define torquehomedir %(set -- %{_with_homedir}; echo $1 | grep -v with | sed 's/=//')}

# did we find any --without options?
%{?_without_rcp: %define use_rcp 0}
%{?_without_tcl: %define use_tcl 0}
%{?_without_gui: %define build_gui 0}

# Set up all options as disabled
%define rcpflags    --with-rcp=/usr/bin/scp
%define tclflags    --without-tcl
%define guiflags    --disable-gui

# Enable options that we want
%if %use_rcp
%define rcpflags    --with-rcp=mom_rcp
%endif

%if %build_gui
%define guiflags   --enable-gui
%endif

%if %use_tcl
%if %build_gui
%define tclflags    --with-tcl --with-tk
%else
%define tclflags    --with-tcl --without-tk
%endif
%endif

# finish up the configs...
%define server_nameflags --with-default-server=%{server_name}


%define shared_description %(echo -e "TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource \\nmanager providing control over batch jobs and distributed compute nodes.  \\nTORQUE is based on OpenPBS version 2.3.12 and incorporates scalability, \\nfault tolerance, and feature extension patches provided by USC, NCSA, OSC, \\nthe U.S. Dept of Energy, Sandia, PNNL, U of Buffalo, TeraGrid, and many \\nother leading edge HPC organizations.\\n\\nThis build was configured with:\\n  %{server_nameflags}\\n  %{tclflags}\\n  %{guiflags}\\n  %{rcpflags}\\n")


Summary: Tera-scale Open-source Resource and QUEue manager
Name: %{name}
Version: %{version}
Release: %{?snap:0.%{release}.%{snap}cvs}%{!?snap:%{release}}%{?dist}
Source: torque-%{version}%{?snap:-snap.%snap}.tar.gz
Source2: xpbs.desktop
Source3: xpbsmon.desktop
Source4: xpbs.png
Source5: xpbsmon.png
Patch1: torque-2.1.0-remove-rpath.path
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
Conflicts: pbspro, openpbs, openpbs-oscar

%if %use_tcl
BuildRequires: tcl-devel
%endif
%if %build_gui
BuildRequires: tk-devel
%else
Obsoletes: torque-gui
%endif
%if ! %use_rcp
Requires: openssh-clients
%endif

%description
%shared_description
This package holds just a few shared files and directories.


%prep
%setup -q -n torque-%{version}%{?snap:-snap.%snap}
%patch1 -p1

%__cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} .


%build
%configure --includedir=%{_includedir}/torque --with-server-home=%{torquehomedir} \
 %{server_nameflags} %{guiflags} %{tclflags} %{rcpflags}

%__make %{?_smp_mflags}
 


%install
%__rm -rf "$RPM_BUILD_ROOT"
%__make DESTDIR=$RPM_BUILD_ROOT install

# remove files we don't need
%__rm -f $RPM_BUILD_ROOT/%_libdir/*.la
%__rm -f $RPM_BUILD_ROOT/%_libdir/*/buildindex

# install initscripts
%__mkdir_p $RPM_BUILD_ROOT%{_initrddir}
for daemon in pbs_mom pbs_sched pbs_server; do
  %__sed -e 's|^PBS_HOME=.*|PBS_HOME=%{torquehomedir}|' \
         -e 's|^PBS_DAEMON=.*|PBS_DAEMON=%{_sbindir}/'$daemon'|' \
         -e 's|chkconfig: 345|chkconfig: -|' \
        < contrib/init.d/$daemon > $RPM_BUILD_ROOT%{_initrddir}/$daemon
  %__chmod 755 $RPM_BUILD_ROOT%{_initrddir}/$daemon
done

%if %{build_gui}
# This is really trivial, but cleans up an rpmlint warning
%__sed -i -e 's|%_lib/../||' $RPM_BUILD_ROOT%{_bindir}/xpbs

# install .desktop files and my ugly icons
desktop-file-install --vendor fedora                   \
        --dir $RPM_BUILD_ROOT%{_datadir}/applications  \
        --add-category X-Fedora                        \
        xpbs.desktop
desktop-file-install --vendor fedora                   \
        --dir $RPM_BUILD_ROOT%{_datadir}/applications  \
        --add-category X-Fedora                        \
        xpbsmon.desktop
%__install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
%__install -p -m0644 xpbs.png xpbsmon.png $RPM_BUILD_ROOT%{_datadir}/pixmaps

%endif


%clean
%__rm -rf "$RPM_BUILD_ROOT"


%post
if %__grep -q "PBS services" /etc/services;then
   : PBS services already installed
else
   cat<<-__EOF__>>/etc/services
	# Standard PBS services
	pbs           15001/tcp           # pbs server (pbs_server)
	pbs           15001/udp           # pbs server (pbs_server)
	pbs_mom       15002/tcp           # mom to/from server
	pbs_mom       15002/udp           # mom to/from server
	pbs_resmom    15003/tcp           # mom resource management requests
	pbs_resmom    15003/udp           # mom resource management requests
	pbs_sched     15004/tcp           # scheduler
	pbs_sched     15004/udp           # scheduler
	__EOF__
fi


%files
%defattr(-, root, root)
%doc README.torque torque.setup Release_Notes CHANGELOG PBS_License.txt
%config(noreplace) %{torquehomedir}/pbs_environment
%config(noreplace) %{torquehomedir}/server_name
%{torquehomedir}/aux
%{torquehomedir}/spool


%package docs
Group: Documentation
Summary: Documentation files for TORQUE
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
Provides: pbs-docs
%description docs
%shared_description
This package holds the documentation files.

%files docs
%defattr(-, root, root)
%doc doc/admin_guide.ps
%{_mandir}/man*/*


%package scheduler
Group: System Environment/Daemons
Summary: Simple fifo scheduler for TORQUE
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
Provides: pbs-scheduler
%description scheduler
%shared_description
This package holds the fifo C scheduler.

%files scheduler
%defattr(-, root, root)
%attr(0755, root, root) %{_sbindir}/pbs_sched
%{_initrddir}/pbs_sched
%dir %{torquehomedir}/sched_priv
%config(noreplace) %{torquehomedir}/sched_priv/*
%{torquehomedir}/sched_logs

%post scheduler
/sbin/chkconfig --add pbs_sched

%preun scheduler
if [ $1 -eq 0 ]; then
   /sbin/service pbs_sched stop 
   /sbin/chkconfig --del pbs_sched
fi


%package server
Group: System Environment/Daemons
Summary: The main part of TORQUE
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
Provides: pbs-server
%description server
%shared_description
This package holds the server.

%files server
%defattr(-, root, root)
%attr(0755, root, root) %{_sbindir}/pbs_server
%attr(0755, root, root) %{_sbindir}/momctl
%{_initrddir}/pbs_server
%{torquehomedir}/server_logs
%{torquehomedir}/server_priv

%post server
/sbin/chkconfig --add pbs_server

%preun server
if [ $1 -eq 0 ]; then
   /sbin/service pbs_server stop 
   /sbin/chkconfig --del pbs_server
fi


%package mom
Group: System Environment/Daemons
Summary: Node execution daemon for TORQUE
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
Provides: pbs-mom
%description mom
%shared_description
This package holds the execute daemon required on every node.

%files mom
%defattr(-, root, root)
%attr(0755, root, root) %{_sbindir}/pbs_mom
%{_initrddir}/pbs_mom
%if %{use_rcp}
%attr(4755 root root) %{_sbindir}/pbs_rcp
%endif
%{torquehomedir}/mom_priv/*
%{torquehomedir}/mom_logs
%{torquehomedir}/checkpoint
%{torquehomedir}/undelivered

%post mom
/sbin/chkconfig --add pbs_mom

%preun mom
if [ $1 -eq 0 ]; then
   /sbin/service pbs_mom stop 
   /sbin/chkconfig --del pbs_mom
fi


%package client
Group: Applications/System
Summary: Client part of TORQUE
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
Provides: pbs-client
%description client
%shared_description
This package holds the command-line client programs.

%files client
%defattr(-, root, root)
%{_bindir}/q*
%{_bindir}/chk_tree
%{_bindir}/hostn
%{_bindir}/nqs2pbs
%{_bindir}/pbsdsh
%{_bindir}/pbsnodes
%{_bindir}/printjob
%{_bindir}/printtracking
%{_bindir}/tracejob
%attr(4755 root root) %{_sbindir}/pbs_iff
%{_sbindir}/pbs_demux
%if %use_tcl
%{_bindir}/pbs_tclsh
%endif

%package gui
Group: Applications/System
Summary: Graphical clients for TORQUE
Requires: %{name}-client = %{?epoch:%{epoch}:}%{version}-%{release}
Provides: xpbs xpbsmon
%description gui
%shared_description
This package holds the graphical clients.


%if %{build_gui}
%files gui
%defattr(-, root, root)
%{_bindir}/pbs_wish
%{_bindir}/xpbs
%{_bindir}/xpbsmon
%{_libdir}/xpbs
%{_libdir}/xpbsmon
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/*.png
%endif


%package localhost
Group: Applications/System
Summary: Installs and configures a minimal localhost-only batch queue system
Requires(post): %{name}-mom %{name}-server %{name}-client %{name}-scheduler

%description localhost
%shared_description
This package installs and configures a minimal localhost-only batch queue
system.

%files localhost
%defattr(-, root, root)
%pre localhost
if [ -f %{torquehomedir}/server_priv/serverdb ];then
   echo "This package wipes out the existing server configuration.  Remove" 1>&2
   echo "%{torquehomedir}/server_priv/serverdb if you really want this." 1>&2
   exit 1
fi
%post localhost
/sbin/chkconfig pbs_mom on
/sbin/chkconfig pbs_server on
/sbin/chkconfig pbs_sched on
/bin/hostname --long > %{torquehomedir}/server_priv/nodes
/bin/hostname --long > %{torquehomedir}/server_name
/bin/hostname --long > %{torquehomedir}/mom_priv/config
pbs_server -t create
qmgr -c "s s scheduling=true"
qmgr -c "c q batch queue_type=execution"
qmgr -c "s q batch started=true"
qmgr -c "s q batch enabled=true"
qmgr -c "s q batch resources_default.nodes=1"
qmgr -c "s q batch resources_default.walltime=3600"
qmgr -c "s s default_queue=batch"
%{_initrddir}/pbs_mom restart
%{_initrddir}/pbs_sched restart
%{_initrddir}/pbs_server restart
qmgr -c "s n `/bin/hostname --long` state=free" -e


%package -n lib%{name}
Summary: Run-time libs for programs which will use the %{name} library
Group: Development/Libraries
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}

%description -n lib%{name}
%shared_description
This package includes the shared libraries
necessary for running TORQUE programs.

%files -n lib%{name}
%defattr(-, root, root)
%{_libdir}/*.so.*

%post -n lib%{name} -p /sbin/ldconfig
%postun -n lib%{name} -p /sbin/ldconfig

%package -n lib%{name}-devel
Summary: Development tools for programs which will use the %{name} library
Group: Development/Libraries
Requires: lib%{name} = %{?epoch:%{epoch}:}%{version}-%{release}

%description -n lib%{name}-devel
%shared_description
This package includes the header files and static libraries
necessary for developing programs which will use %{name}.

%files -n lib%{name}-devel
%defattr(-, root, root)
%{_libdir}/*.a
%{_libdir}/*.so
%{_includedir}/torque
%{_bindir}/pbs-config


%changelog
* Mon Apr 17 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.7.200604171430cvs
- importing to fedora extras

* Mon Apr 17 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.6.200604171430cvs
- add %%{dist} tag
- cleanup the cleanups in spec
- bump to matching upstream
- move headers to /usr/include/torque/

* Wed Apr 12 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.5.200604071240cvs
- remove rpath

* Tue Apr 11 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.4.200604071240cvs
- fix release string to match fedora guidelines

* Fri Apr  7 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.3.200604071240
- spec and initscript cleanups

* Wed Apr  5 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.2.200604051756
- add .desktop files

* Wed Apr  5 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.1.200604051756
- Initial package for Fedora Extras




--- NEW FILE xpbs.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=xpbs
GenericName=PBS/TORQUE client
Comment=View job status and submit jobs
Exec=xpbs
Icon=xpbs.png
Terminal=false
Type=Application
Categories=Application;Other;
Version=1.1.12


--- NEW FILE xpbsmon.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=xpbsmon
GenericName=PBS/TORQUE cluster monitor
Comment=View node status
Exec=xpbsmon
Icon=xpbsmon.png
Terminal=false
Type=Application
Categories=Application;Other;
Version=2.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Apr 2006 02:09:21 -0000	1.1
+++ .cvsignore	18 Apr 2006 02:10:40 -0000	1.2
@@ -0,0 +1 @@
+torque-2.1.0p0-snap.200604171430.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Apr 2006 02:09:21 -0000	1.1
+++ sources	18 Apr 2006 02:10:40 -0000	1.2
@@ -0,0 +1 @@
+00ae6cf8f95960c83022ff9037dc1d57  torque-2.1.0p0-snap.200604171430.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 18 02:20:10 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Mon, 17 Apr 2006 19:20:10 -0700
Subject: owners owners.list,1.853,1.854
Message-ID: <200604180220.k3I2KCYA012900@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12883

Modified Files:
	owners.list 
Log Message:
Adding torque



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.853
retrieving revision 1.854
diff -u -r1.853 -r1.854
--- owners.list	18 Apr 2006 01:43:06 -0000	1.853
+++ owners.list	18 Apr 2006 02:20:10 -0000	1.854
@@ -1470,6 +1470,7 @@
 Fedora Extras|tong|A game of skill|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|torcs|An OpenGL 3d racing game|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|torcs-data|The Open Racing Car Simulator data files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|torque|Tera-scale Open-source Resource and QUEue manager|garrick at usc.edu|extras-qa at fedoraproject.org|
 Fedora Extras|torsmo|TyopoytaORvelo System MOnitor|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|tpb|IBM ThinkPad button support utility|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|tpctl|IBM ThinkPad configuration tools|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Apr 18 03:20:10 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 17 Apr 2006 20:20:10 -0700
Subject: rpms/edb/FC-5 .cvsignore, 1.5, 1.6 edb.spec, 1.12, 1.13 sources, 1.5,
	1.6
Message-ID: <200604180320.k3I3KCY6015202@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/edb/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15179

Modified Files:
	.cvsignore edb.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/edb/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Feb 2006 08:12:28 -0000	1.5
+++ .cvsignore	18 Apr 2006 03:20:09 -0000	1.6
@@ -1 +1 @@
-edb-1.0.5.005.tar.gz
+edb-1.0.5.007.tar.gz


Index: edb.spec
===================================================================
RCS file: /cvs/extras/rpms/edb/FC-5/edb.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- edb.spec	14 Feb 2006 05:00:20 -0000	1.12
+++ edb.spec	18 Apr 2006 03:20:10 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           edb
-Version:        1.0.5.005
+Version:        1.0.5.007
 Release:        1%{?dist}
 
 Summary:        A database convenience library wrapped around BDB
@@ -84,6 +84,9 @@
 %{_bindir}/edb_gtk_ed
 
 %changelog
+* Mon Apr 17 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5.007-1
+- Upstream update
+
 * Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5.005-1
 - Upstream update
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/edb/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Feb 2006 08:12:28 -0000	1.5
+++ sources	18 Apr 2006 03:20:10 -0000	1.6
@@ -1 +1 @@
-6b6eaa69ea05bf4b4972554f34fd8919  edb-1.0.5.005.tar.gz
+e5d8dcb5995913ae6b7f205e7ac28dbe  edb-1.0.5.007.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 18 04:44:33 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 17 Apr 2006 21:44:33 -0700
Subject: rpms/eet/FC-5 .cvsignore,1.4,1.5 eet.spec,1.7,1.8 sources,1.4,1.5
Message-ID: <200604180444.k3I4iZM5017495@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/eet/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17453/FC-5

Modified Files:
	.cvsignore eet.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eet/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Feb 2006 05:10:58 -0000	1.4
+++ .cvsignore	18 Apr 2006 04:44:33 -0000	1.5
@@ -1 +1 @@
-eet-0.9.10.023.tar.gz
+eet-0.9.10.026.tar.gz


Index: eet.spec
===================================================================
RCS file: /cvs/extras/rpms/eet/FC-5/eet.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- eet.spec	14 Feb 2006 05:00:26 -0000	1.7
+++ eet.spec	18 Apr 2006 04:44:33 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           eet
-Version:        0.9.10.023
-Release:        2%{?dist}
+Version:        0.9.10.026
+Release:        1%{?dist}
 Summary:        A library designed to write an arbitary set of chunks of data to a file
 
 Group:          System Environment/Libraries
@@ -60,6 +60,9 @@
 %{_libdir}/pkgconfig/eet.pc
 
 %changelog
+* Tue Apr 18 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.10-026-1
+- Upstream update
+
 * Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.10.023-2
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eet/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Feb 2006 05:10:58 -0000	1.4
+++ sources	18 Apr 2006 04:44:33 -0000	1.5
@@ -1 +1 @@
-d1862511bc2798747b85a2386fb2105a  eet-0.9.10.023.tar.gz
+82fa206da7926c0507bce22a0d916400  eet-0.9.10.026.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 18 04:44:34 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 17 Apr 2006 21:44:34 -0700
Subject: rpms/eet/devel .cvsignore,1.4,1.5 eet.spec,1.7,1.8 sources,1.4,1.5
Message-ID: <200604180444.k3I4iaHQ017501@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/eet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17453/devel

Modified Files:
	.cvsignore eet.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eet/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Feb 2006 05:10:58 -0000	1.4
+++ .cvsignore	18 Apr 2006 04:44:33 -0000	1.5
@@ -1 +1 @@
-eet-0.9.10.023.tar.gz
+eet-0.9.10.026.tar.gz


Index: eet.spec
===================================================================
RCS file: /cvs/extras/rpms/eet/devel/eet.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- eet.spec	14 Feb 2006 05:00:26 -0000	1.7
+++ eet.spec	18 Apr 2006 04:44:34 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           eet
-Version:        0.9.10.023
-Release:        2%{?dist}
+Version:        0.9.10.026
+Release:        1%{?dist}
 Summary:        A library designed to write an arbitary set of chunks of data to a file
 
 Group:          System Environment/Libraries
@@ -60,6 +60,9 @@
 %{_libdir}/pkgconfig/eet.pc
 
 %changelog
+* Tue Apr 18 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.10-026-1
+- Upstream update
+
 * Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.10.023-2
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eet/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Feb 2006 05:10:58 -0000	1.4
+++ sources	18 Apr 2006 04:44:34 -0000	1.5
@@ -1 +1 @@
-d1862511bc2798747b85a2386fb2105a  eet-0.9.10.023.tar.gz
+82fa206da7926c0507bce22a0d916400  eet-0.9.10.026.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 18 07:59:36 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 18 Apr 2006 00:59:36 -0700
Subject: owners owners.list,1.854,1.855
Message-ID: <200604180759.k3I7xcgL024166@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24149

Modified Files:
	owners.list 
Log Message:
fix broken entries -- missing initialcclist field separator


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.854
retrieving revision 1.855
diff -u -r1.854 -r1.855
--- owners.list	18 Apr 2006 02:20:10 -0000	1.854
+++ owners.list	18 Apr 2006 07:59:36 -0000	1.855
@@ -197,7 +197,7 @@
 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|docbook2X|Convert docbook into man and Texinfo|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|doctorj|Java source code analyzer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|dogtail|GUI test tool and automation framework|zcerza at redhat.com|extras-qa at fedoraproject.org
+Fedora Extras|dogtail|GUI test tool and automation framework|zcerza at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|dosbox|An x86/DOS emulator with sound/graphics|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|doulos-fonts|Doulos SIL fonts|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|drgeo-doc|html documentation for drgeo|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
@@ -1205,7 +1205,7 @@
 Fedora Extras|pylint|Analyzes Python code looking for bugs and signs of poor quality|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|pyparsing|An object-oriented approach to text processing|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|PyRTF|Rich Text Format (RTF) Document Generation in Python|mpeters at mac.com|extras-qa at fedoraproject.org|
-Fedora Extras|pyspi|Python bindings for AT-SPI|zcerza at redhat.com|extras-qa at fedoraproject.org
+Fedora Extras|pyspi|Python bindings for AT-SPI|zcerza at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-4Suite-XML|A collection of XML-related technologies for Python|mitr at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-adns|Python interface for the GNU adns library|byte at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|python-amara|A collection of Pythonic tools for XML data binding|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Apr 18 12:45:24 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 18 Apr 2006 05:45:24 -0700
Subject: rpms/evas/FC-5 .cvsignore, 1.2, 1.3 evas.spec, 1.3, 1.4 sources, 1.2,
	1.3
Message-ID: <200604181245.k3ICjQnq003431@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/evas/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3394/FC-5

Modified Files:
	.cvsignore evas.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/evas/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Feb 2006 18:47:45 -0000	1.2
+++ .cvsignore	18 Apr 2006 12:45:23 -0000	1.3
@@ -1 +1 @@
-evas-0.9.9.023.tar.gz
+evas-0.9.9.026.tar.gz


Index: evas.spec
===================================================================
RCS file: /cvs/extras/rpms/evas/FC-5/evas.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- evas.spec	14 Feb 2006 05:00:31 -0000	1.3
+++ evas.spec	18 Apr 2006 12:45:23 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           evas
-Version:        0.9.9.023
-Release:        2%{?dist}
+Version:        0.9.9.026
+Release:        1%{?dist}
 Summary:        A hardware-accelerated canvas API
 
 Group:          System Environment/Libraries
@@ -64,6 +64,7 @@
 %{_bindir}/*_window
 %{_datadir}/%{name}
 %{_libdir}/*.so.*
+%{_libdir}/%{name}
 
 %files devel
 %defattr(-,root,root,-)
@@ -74,6 +75,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Apr 18 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.9.026-1
+- Upstream update
+
 * Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.9.023-2
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/evas/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Feb 2006 18:47:45 -0000	1.2
+++ sources	18 Apr 2006 12:45:23 -0000	1.3
@@ -1 +1 @@
-ca5528c8894d49cbdf77873f5974c0e8  evas-0.9.9.023.tar.gz
+b2285236b8dff678a0076de2baa39095  evas-0.9.9.026.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 18 12:45:25 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 18 Apr 2006 05:45:25 -0700
Subject: rpms/evas/devel .cvsignore, 1.2, 1.3 evas.spec, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <200604181245.k3ICjR7P003437@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/evas/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3394/devel

Modified Files:
	.cvsignore evas.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/evas/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Feb 2006 18:47:45 -0000	1.2
+++ .cvsignore	18 Apr 2006 12:45:24 -0000	1.3
@@ -1 +1 @@
-evas-0.9.9.023.tar.gz
+evas-0.9.9.026.tar.gz


Index: evas.spec
===================================================================
RCS file: /cvs/extras/rpms/evas/devel/evas.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- evas.spec	14 Feb 2006 05:00:31 -0000	1.3
+++ evas.spec	18 Apr 2006 12:45:24 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           evas
-Version:        0.9.9.023
-Release:        2%{?dist}
+Version:        0.9.9.026
+Release:        1%{?dist}
 Summary:        A hardware-accelerated canvas API
 
 Group:          System Environment/Libraries
@@ -64,6 +64,7 @@
 %{_bindir}/*_window
 %{_datadir}/%{name}
 %{_libdir}/*.so.*
+%{_libdir}/%{name}
 
 %files devel
 %defattr(-,root,root,-)
@@ -74,6 +75,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Apr 18 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.9.026-1
+- Upstream update
+
 * Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.9.023-2
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/evas/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Feb 2006 18:47:45 -0000	1.2
+++ sources	18 Apr 2006 12:45:24 -0000	1.3
@@ -1 +1 @@
-ca5528c8894d49cbdf77873f5974c0e8  evas-0.9.9.023.tar.gz
+b2285236b8dff678a0076de2baa39095  evas-0.9.9.026.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 18 13:54:28 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 18 Apr 2006 06:54:28 -0700
Subject: rpms/perl-Crypt-Random - New directory
Message-ID: <200604181354.k3IDsUcR006413@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-Random
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6386/perl-Crypt-Random

Log Message:
Directory /cvs/extras/rpms/perl-Crypt-Random added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 18 13:54:28 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 18 Apr 2006 06:54:28 -0700
Subject: rpms/perl-Crypt-Random/devel - New directory
Message-ID: <200604181354.k3IDsUrl006416@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-Random/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6386/perl-Crypt-Random/devel

Log Message:
Directory /cvs/extras/rpms/perl-Crypt-Random/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 18 13:55:01 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 18 Apr 2006 06:55:01 -0700
Subject: rpms/perl-Crypt-Random Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604181355.k3IDt3kh006484@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-Random
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6449

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Crypt-Random


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Crypt-Random
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 18 13:55:01 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 18 Apr 2006 06:55:01 -0700
Subject: rpms/perl-Crypt-Random/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200604181355.k3IDt3Eo006487@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-Random/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6449/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Crypt-Random


--- 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 Apr 18 13:55:52 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 18 Apr 2006 06:55:52 -0700
Subject: rpms/perl-Crypt-Random/devel perl-Crypt-Random.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604181355.k3IDts32006566@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-Random/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6530/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Crypt-Random.spec 
Log Message:
auto-import perl-Crypt-Random-1.25-1 on branch devel from perl-Crypt-Random-1.25-1.src.rpm


--- NEW FILE perl-Crypt-Random.spec ---
Summary:	Cryptographically Secure, True Random Number Generator
Name:		perl-Crypt-Random
Version:	1.25
Release:	1%{?dist}
License:	GPL or Artistic
Group:		Development/Libraries
Url:		http://search.cpan.org/dist/Crypt-Random/
Source0:	http://search.cpan.org/CPAN/authors/id/V/VI/VIPUL/Crypt-Random-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:	noarch
BuildRequires:	perl(Math::Pari)    >= 2.001804
BuildRequires:	perl(Class::Loader) >= 2.00

%description
Crypt::Random is an interface module to the /dev/random device found on most
modern unix systems. It also interfaces with egd, a user space entropy
gathering daemon, available for systems where /dev/random (or similar) devices
are not available. When Math::Pari is installed, Crypt::Random can generate
random integers of arbritary size of a given bitsize or in a specified
interval.

%prep
%setup -q -n Crypt-Random-%{version}

# Remove shellbangs to shut rpmlint up
/usr/bin/find ./lib -name '*.pm' -print | /usr/bin/xargs %{__sed} -i -e '/^#! *\/usr\/bin\/perl /d'

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
%{__make} %{?_smp_mflags}

%check
%{__make} test

%install
%{__rm} -rf %{buildroot}
%{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
/usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
/usr/bin/find %{buildroot} -type d -depth -exec /bin/rmdir {} 2>/dev/null ';'
%{__chmod} -R u+w %{buildroot}/*

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,0755)
%doc Changes README
%{_bindir}/makerandom
%{perl_vendorlib}/Crypt/
%{_mandir}/man3/Crypt::Random.3pm*

%changelog
* Mon Dec  5 2005 Paul Howarth <paul at city-fan.org> 1.25-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-Random/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Apr 2006 13:55:01 -0000	1.1
+++ .cvsignore	18 Apr 2006 13:55:52 -0000	1.2
@@ -0,0 +1 @@
+Crypt-Random-1.25.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-Random/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Apr 2006 13:55:01 -0000	1.1
+++ sources	18 Apr 2006 13:55:52 -0000	1.2
@@ -0,0 +1 @@
+5730c9d5acdd698790216d354ffb0513  Crypt-Random-1.25.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 18 13:55:50 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 18 Apr 2006 06:55:50 -0700
Subject: rpms/perl-Crypt-Random import.log,1.1,1.2
Message-ID: <200604181356.k3IDuMqr006573@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-Random
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6530

Modified Files:
	import.log 
Log Message:
auto-import perl-Crypt-Random-1.25-1 on branch devel from perl-Crypt-Random-1.25-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-Random/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Apr 2006 13:55:00 -0000	1.1
+++ import.log	18 Apr 2006 13:55:50 -0000	1.2
@@ -0,0 +1 @@
+perl-Crypt-Random-1_25-1:HEAD:perl-Crypt-Random-1.25-1.src.rpm:1145368407



From fedora-extras-commits at redhat.com  Tue Apr 18 13:56:54 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Tue, 18 Apr 2006 06:56:54 -0700
Subject: fedora-security/audit fc4,1.203,1.204 fc5,1.116,1.117
Message-ID: <200604181356.k3IDusMF006626@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6578/audit

Modified Files:
	fc4 fc5 
Log Message:
Update CVE-2006-0744



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- fc4	15 Apr 2006 12:26:14 -0000	1.203
+++ fc4	18 Apr 2006 13:56:52 -0000	1.204
@@ -111,7 +111,7 @@
 CVE-2006-0748 VULNERABLE (firefox, fixed 1.0.8)
 CVE-2006-0746 VULNERABLE (kpdf) bz#184308
 CVE-2006-0745 version (xorg-x11) not fc4
-CVE-2006-0744 VULNERABLE (kernel)
+CVE-2006-0744 VULNERABLE (kernel, fixed 2.6.16.5)
 CVE-2006-0742 version (kernel, fixed 2.6.16) patch-2.6.16-rc6 [since FEDORA-2006-245]
 CVE-2006-0741 version (kernel, fixed 2.6.15.5) [since FEDORA-2006-245] was backport since FEDORA-2006-131
 CVE-2006-0730 version (dovecot, 1.0beta[12] only)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- fc5	15 Apr 2006 12:26:14 -0000	1.116
+++ fc5	18 Apr 2006 13:56:52 -0000	1.117
@@ -112,7 +112,7 @@
 CVE-2006-0748 VULNERABLE (firefox, fixed 1.5.0.2)
 CVE-2006-0746 version (kdegraphics, fixed 3.4)
 CVE-2006-0745 backport (xorg-x11) [since FEDORA-2006-172]
-CVE-2006-0744 VULNERABLE (kernel)
+CVE-2006-0744 VULNERABLE (kernel, fixed 2.6.16.5)
 CVE-2006-0742 version (kernel, fixed 2.6.16) patch-2.6.16-rc6 [since FEDORA-2006-233]
 CVE-2006-0741 version (kernel, fixed 2.6.15.5) patch-2.6.16-rc6 [since FEDORA-2006-233]
 CVE-2006-0730 version (dovecot, 1.0beta[12] only)



From fedora-extras-commits at redhat.com  Tue Apr 18 13:58:48 2006
From: fedora-extras-commits at redhat.com (John Clark Williams (jcwillia))
Date: Tue, 18 Apr 2006 06:58:48 -0700
Subject: mock/etc fedora-devel-i386-core.cfg, NONE,
	1.1 fedora-devel-ppc-core.cfg, NONE,
	1.1 fedora-devel-x86_64-core.cfg, NONE,
	1.1 fedora-5-i386-core.cfg, 1.3, 1.4 fedora-5-ppc-core.cfg,
	1.4, 1.5 fedora-5-x86_64-core.cfg, 1.3, 1.4
Message-ID: <200604181358.k3IDwmGs006676@cvs-int.fedora.redhat.com>

Author: jcwillia

Update of /cvs/fedora/mock/etc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6653

Modified Files:
	fedora-5-i386-core.cfg fedora-5-ppc-core.cfg 
	fedora-5-x86_64-core.cfg 
Added Files:
	fedora-devel-i386-core.cfg fedora-devel-ppc-core.cfg 
	fedora-devel-x86_64-core.cfg 
Log Message:
fixed fc5 configs to use correct path; added devel configs


--- NEW FILE fedora-devel-i386-core.cfg ---
#!/usr/bin/python -tt

import os
config_opts['root'] = 'fedora-development-i386-core'
config_opts['basedir'] = '/var/lib/mock/'
config_opts['chroot'] = '/usr/sbin/mock-helper chroot'
config_opts['mount'] = '/usr/sbin/mock-helper mount'
config_opts['umount'] = '/usr/sbin/mock-helper umount'
config_opts['rm'] = '/usr/sbin/mock-helper rm'
config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
config_opts['yum'] = '/usr/sbin/mock-helper yum'
config_opts['runuser'] = '/sbin/runuser'
config_opts['chroot_dep_package'] = 'buildsys-build'
config_opts['chrootuser'] = 'mockbuild'
config_opts['chrootgroup'] = 'mockbuild'
config_opts['chrootuid'] = os.geteuid()
config_opts['chrootgid'] = os.getegid()
config_opts['chroothome'] = '/builddir'
config_opts['clean'] = True
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
baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/development/i386

[groups]
name=groups
baseurl=http://fedoraproject.org/chroot_dep_packages/development/i386/

[extras]
name=extras
baseurl=http://fedoraproject.org/extras/development/i386

[local]
name=local
baseurl=http://extras64.linux.duke.edu/plague-results/development/

"""





--- NEW FILE fedora-devel-ppc-core.cfg ---
#!/usr/bin/python -tt
import os
config_opts['root'] = 'fedora-development-ppc-core'
config_opts['basedir'] = '/var/lib/mock/'
config_opts['chroot'] = '/usr/sbin/mock-helper chroot'
config_opts['mount'] = '/usr/sbin/mock-helper mount'
config_opts['umount'] = '/usr/sbin/mock-helper umount'
config_opts['rm'] = '/usr/sbin/mock-helper rm'
config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
config_opts['yum'] = '/usr/sbin/mock-helper yum'
config_opts['runuser'] = '/sbin/runuser'
config_opts['chroot_dep_package'] = 'buildsys-build'
config_opts['chrootuser'] = 'mockbuild'
config_opts['chrootgroup'] = 'mockbuild'
config_opts['chrootuid'] = os.geteuid()
config_opts['chrootgid'] = os.getegid()
config_opts['chroothome'] = '/builddir'
config_opts['clean'] = True
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
baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/development/ppc

[groups]
name=groups
baseurl=http://fedoraproject.org/chroot_dep_packages/development/ppc/

[extras]
name=extras
baseurl=http://fedoraproject.org/extras/development/ppc/

[local]
name=local
baseurl=http://extras64.linux.duke.edu/plague-results/development/

"""





--- NEW FILE fedora-devel-x86_64-core.cfg ---
#!/usr/bin/python -tt
import os

config_opts['root'] = 'fedora-development-x86_64-core'
config_opts['basedir'] = '/var/lib/mock/'
config_opts['chroot'] = '/usr/sbin/mock-helper chroot'
config_opts['mount'] = '/usr/sbin/mock-helper mount'
config_opts['umount'] = '/usr/sbin/mock-helper umount'
config_opts['rm'] = '/usr/sbin/mock-helper rm'
config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
config_opts['yum'] = '/usr/sbin/mock-helper yum'
config_opts['runuser'] = '/sbin/runuser'
config_opts['chroot_dep_package'] = 'buildsys-build'
config_opts['chrootuser'] = 'mockbuild'
config_opts['chrootgroup'] = 'mockbuild'
config_opts['chrootuid'] = os.geteuid()
config_opts['chrootgid'] = os.getegid()
config_opts['chroothome'] = '/builddir'
config_opts['clean'] = True
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=*.i386 *.486 *.586 *.i686 *.athlon

# repos

[core]
name=core
baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/development/x86_64

[groups]
name=groups
baseurl=http://fedoraproject.org/chroot_dep_packages/development/x86_64/

[extras]
name=extras
baseurl=http://fedoraproject.org/extras/development/x86_64/

[local]
name=local
baseurl=http://extras64.linux.duke.edu/plague-results/development/

"""





Index: fedora-5-i386-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-5-i386-core.cfg,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-5-i386-core.cfg	11 Apr 2006 08:00:51 -0000	1.3
+++ fedora-5-i386-core.cfg	18 Apr 2006 13:58:45 -0000	1.4
@@ -1,7 +1,7 @@
 #!/usr/bin/python -tt
 
 import os
-config_opts['root'] = 'fedora-development-i386-core'
+config_opts['root'] = 'fedora-5-i386-core'
 config_opts['basedir'] = '/var/lib/mock/'
 config_opts['chroot'] = '/usr/sbin/mock-helper chroot'
 config_opts['mount'] = '/usr/sbin/mock-helper mount'
@@ -35,19 +35,19 @@
 
 [core]
 name=core
-baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/development/i386
+baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/5/i386
 
 [groups]
 name=groups
-baseurl=http://fedoraproject.org/chroot_dep_packages/development/i386/
+baseurl=http://fedoraproject.org/chroot_dep_packages/5/i386/
 
 [extras]
 name=extras
-baseurl=http://fedoraproject.org/extras/development/i386
+baseurl=http://fedoraproject.org/extras/5/i386
 
 [local]
 name=local
-baseurl=http://extras64.linux.duke.edu/plague-results/development/
+baseurl=http://extras64.linux.duke.edu/plague-results/5/
 
 """
 


Index: fedora-5-ppc-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-5-ppc-core.cfg,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedora-5-ppc-core.cfg	11 Apr 2006 08:00:51 -0000	1.4
+++ fedora-5-ppc-core.cfg	18 Apr 2006 13:58:45 -0000	1.5
@@ -1,6 +1,6 @@
 #!/usr/bin/python -tt
 import os
-config_opts['root'] = 'fedora-development-ppc-core'
+config_opts['root'] = 'fedora-5-ppc-core'
 config_opts['basedir'] = '/var/lib/mock/'
 config_opts['chroot'] = '/usr/sbin/mock-helper chroot'
 config_opts['mount'] = '/usr/sbin/mock-helper mount'
@@ -35,19 +35,19 @@
 
 [core]
 name=core
-baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/development/ppc
+baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/5/ppc
 
 [groups]
 name=groups
-baseurl=http://fedoraproject.org/chroot_dep_packages/development/ppc/
+baseurl=http://fedoraproject.org/chroot_dep_packages/5/ppc/
 
 [extras]
 name=extras
-baseurl=http://fedoraproject.org/extras/development/ppc/
+baseurl=http://fedoraproject.org/extras/5/ppc/
 
 [local]
 name=local
-baseurl=http://extras64.linux.duke.edu/plague-results/development/
+baseurl=http://extras64.linux.duke.edu/plague-results/5/
 
 """
 


Index: fedora-5-x86_64-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-5-x86_64-core.cfg,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-5-x86_64-core.cfg	11 Apr 2006 08:00:51 -0000	1.3
+++ fedora-5-x86_64-core.cfg	18 Apr 2006 13:58:45 -0000	1.4
@@ -1,7 +1,7 @@
 #!/usr/bin/python -tt
 import os
 
-config_opts['root'] = 'fedora-development-x86_64-core'
+config_opts['root'] = 'fedora-5-x86_64-core'
 config_opts['basedir'] = '/var/lib/mock/'
 config_opts['chroot'] = '/usr/sbin/mock-helper chroot'
 config_opts['mount'] = '/usr/sbin/mock-helper mount'
@@ -36,19 +36,19 @@
 
 [core]
 name=core
-baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/development/x86_64
+baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/5/x86_64
 
 [groups]
 name=groups
-baseurl=http://fedoraproject.org/chroot_dep_packages/development/x86_64/
+baseurl=http://fedoraproject.org/chroot_dep_packages/5/x86_64/
 
 [extras]
 name=extras
-baseurl=http://fedoraproject.org/extras/development/x86_64/
+baseurl=http://fedoraproject.org/extras/5/x86_64/
 
 [local]
 name=local
-baseurl=http://extras64.linux.duke.edu/plague-results/development/
+baseurl=http://extras64.linux.duke.edu/plague-results/5/
 
 """
 



From fedora-extras-commits at redhat.com  Tue Apr 18 14:00:00 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Tue, 18 Apr 2006 07:00:00 -0700
Subject: fedora-security/audit fc4,1.204,1.205 fc5,1.117,1.118
Message-ID: <200604181400.k3IE00qc006705@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6684/audit

Modified Files:
	fc4 fc5 
Log Message:
Add CVE-2006-1524



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- fc4	18 Apr 2006 13:56:52 -0000	1.204
+++ fc4	18 Apr 2006 13:59:57 -0000	1.205
@@ -77,6 +77,7 @@
 CVE-2006-1530 VULNERABLE (firefox, fixed 1.0.8)
 CVE-2006-1529 VULNERABLE (thunderbird, fixed 1.0.8)
 CVE-2006-1529 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1524 VULNERABLE (kernel, fixed 2.6.16.5)
 CVE-2006-1523 VULNERABLE (kernel, fixed 2.6.16.4)
 CVE-2006-1522 VULNERABLE (kernel, fixed 2.6.16.3)
 CVE-2006-1494 VULNERABLE (php)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- fc5	18 Apr 2006 13:56:52 -0000	1.117
+++ fc5	18 Apr 2006 13:59:57 -0000	1.118
@@ -76,6 +76,7 @@
 CVE-2006-1530 VULNERABLE (firefox, fixed 1.5.0.2)
 CVE-2006-1529 VULNERABLE (thunderbird, fixed 1.5.0.2)
 CVE-2006-1529 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1524 VULNERABLE (kernel, fixed 2.6.16.5)
 CVE-2006-1523 VULNERABLE (kernel, fixed 2.6.16.4)
 CVE-2006-1522 VULNERABLE (kernel, fixed 2.6.16.3)
 CVE-2006-1494 VULNERABLE (php)



From fedora-extras-commits at redhat.com  Tue Apr 18 14:03:25 2006
From: fedora-extras-commits at redhat.com (John Clark Williams (jcwillia))
Date: Tue, 18 Apr 2006 07:03:25 -0700
Subject: mock/etc fedora-5-i386-core.cfg, 1.4, 1.5 fedora-5-ppc-core.cfg, 1.5,
	1.6 fedora-5-x86_64-core.cfg, 1.4, 1.5
Message-ID: <200604181403.k3IE3PJa008852@cvs-int.fedora.redhat.com>

Author: jcwillia

Update of /cvs/fedora/mock/etc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8828

Modified Files:
	fedora-5-i386-core.cfg fedora-5-ppc-core.cfg 
	fedora-5-x86_64-core.cfg 
Log Message:
added updates-released section to fc5 configs


Index: fedora-5-i386-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-5-i386-core.cfg,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedora-5-i386-core.cfg	18 Apr 2006 13:58:45 -0000	1.4
+++ fedora-5-i386-core.cfg	18 Apr 2006 14:03:22 -0000	1.5
@@ -37,6 +37,10 @@
 name=core
 baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/5/i386
 
+[updates-released]
+name=updates
+baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/updates/5/i386/
+
 [groups]
 name=groups
 baseurl=http://fedoraproject.org/chroot_dep_packages/5/i386/


Index: fedora-5-ppc-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-5-ppc-core.cfg,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fedora-5-ppc-core.cfg	18 Apr 2006 13:58:45 -0000	1.5
+++ fedora-5-ppc-core.cfg	18 Apr 2006 14:03:22 -0000	1.6
@@ -37,6 +37,10 @@
 name=core
 baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/5/ppc
 
+[updates-released]
+name=updates
+baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/updates/5/ppc/
+
 [groups]
 name=groups
 baseurl=http://fedoraproject.org/chroot_dep_packages/5/ppc/


Index: fedora-5-x86_64-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-5-x86_64-core.cfg,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedora-5-x86_64-core.cfg	18 Apr 2006 13:58:45 -0000	1.4
+++ fedora-5-x86_64-core.cfg	18 Apr 2006 14:03:22 -0000	1.5
@@ -38,6 +38,10 @@
 name=core
 baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/5/x86_64
 
+[updates-released]
+name=updates
+baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/updates/5/x86_64/
+
 [groups]
 name=groups
 baseurl=http://fedoraproject.org/chroot_dep_packages/5/x86_64/



From fedora-extras-commits at redhat.com  Tue Apr 18 14:04:05 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 18 Apr 2006 07:04:05 -0700
Subject: rpms/perl-Crypt-Primes - New directory
Message-ID: <200604181404.k3IE47v1008882@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-Primes
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8856/perl-Crypt-Primes

Log Message:
Directory /cvs/extras/rpms/perl-Crypt-Primes added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 18 14:04:06 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 18 Apr 2006 07:04:06 -0700
Subject: rpms/perl-Crypt-Primes/devel - New directory
Message-ID: <200604181404.k3IE48Af008885@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-Primes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8856/perl-Crypt-Primes/devel

Log Message:
Directory /cvs/extras/rpms/perl-Crypt-Primes/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 18 14:05:46 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 18 Apr 2006 07:05:46 -0700
Subject: rpms/perl-Crypt-Primes Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604181405.k3IE5mrf008932@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-Primes
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8904

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Crypt-Primes


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Crypt-Primes
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 18 14:05:46 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 18 Apr 2006 07:05:46 -0700
Subject: rpms/perl-Crypt-Primes/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200604181405.k3IE5mh1008935@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-Primes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8904/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Crypt-Primes


--- 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 Apr 18 14:06:42 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 18 Apr 2006 07:06:42 -0700
Subject: rpms/perl-Crypt-Primes import.log,1.1,1.2
Message-ID: <200604181406.k3IE6ip4009003@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-Primes
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8970

Modified Files:
	import.log 
Log Message:
auto-import perl-Crypt-Primes-0.50-1 on branch devel from perl-Crypt-Primes-0.50-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-Primes/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Apr 2006 14:05:45 -0000	1.1
+++ import.log	18 Apr 2006 14:06:41 -0000	1.2
@@ -0,0 +1 @@
+perl-Crypt-Primes-0_50-1:HEAD:perl-Crypt-Primes-0.50-1.src.rpm:1145369189



From fedora-extras-commits at redhat.com  Tue Apr 18 14:06:42 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 18 Apr 2006 07:06:42 -0700
Subject: rpms/perl-Crypt-Primes/devel perl-Crypt-Primes.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604181406.k3IE6iHJ009008@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-Primes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8970/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Crypt-Primes.spec 
Log Message:
auto-import perl-Crypt-Primes-0.50-1 on branch devel from perl-Crypt-Primes-0.50-1.src.rpm


--- NEW FILE perl-Crypt-Primes.spec ---
Summary:	Provable prime number generator for cryptographic applications
Name:		perl-Crypt-Primes
Version:	0.50
Release:	1%{?dist}
License:	GPL or Artistic
Group:		Development/Libraries
Url:		http://search.cpan.org/dist/Crypt-Primes/
Source0:	http://search.cpan.org/CPAN/authors/id/V/VI/VIPUL/Crypt-Primes-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:	noarch
BuildRequires:	perl(Math::Pari)    >= 2.001804
BuildRequires:	perl(Crypt::Random) >= 0.33

%description
This module implements Ueli Maurer's algorithm for generating large provable
primes and secure parameters for public-key cryptosystems. The generated primes
are almost uniformly distributed over the set of primes of the specified
bitsize and expected time for generation is less than the time required for
generating a pseudo-prime of the same size with Miller-Rabin tests. Detailed
description and running time analysis of the algorithm can be found in Maurer's
paper, "Fast Generation of Prime Numbers and Secure Public-Key Cryptographic
Parameters" (1994).

%prep
%setup -q -n Crypt-Primes-%{version}
%{__sed} -i -e '/^#! *\/usr\/bin\/perl /d' lib/Crypt/Primes.pm

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
%{__make} %{?_smp_mflags}

%check
%{__make} test

%install
%{__rm} -rf %{buildroot}
%{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
/usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
/usr/bin/find %{buildroot} -type d -depth -exec /bin/rmdir {} 2>/dev/null ';'
%{__chmod} -R u+w %{buildroot}/*

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,0755)
%doc Changes README docs/*
%{_bindir}/largeprimes
%{perl_vendorlib}/Crypt/Primes.pm
%{_mandir}/man1/largeprimes.1*
%{_mandir}/man3/Crypt::Primes.3pm*

%changelog
* Tue Dec  6 2005 Paul Howarth <paul at city-fan.org> 0.50-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-Primes/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Apr 2006 14:05:46 -0000	1.1
+++ .cvsignore	18 Apr 2006 14:06:42 -0000	1.2
@@ -0,0 +1 @@
+Crypt-Primes-0.50.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-Primes/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Apr 2006 14:05:46 -0000	1.1
+++ sources	18 Apr 2006 14:06:42 -0000	1.2
@@ -0,0 +1 @@
+041947b9645142615d687b89cf2e1a7b  Crypt-Primes-0.50.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 18 14:56:38 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 18 Apr 2006 07:56:38 -0700
Subject: rpms/ecore/FC-5 .cvsignore, 1.2, 1.3 ecore.spec, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <200604181456.k3IEueMW009314@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/ecore/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9277/FC-5

Modified Files:
	.cvsignore ecore.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ecore/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Feb 2006 10:27:21 -0000	1.2
+++ .cvsignore	18 Apr 2006 14:56:38 -0000	1.3
@@ -1 +1 @@
-ecore-0.9.9.023.tar.gz
+ecore-0.9.9.026.tar.gz


Index: ecore.spec
===================================================================
RCS file: /cvs/extras/rpms/ecore/FC-5/ecore.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ecore.spec	14 Feb 2006 05:00:14 -0000	1.3
+++ ecore.spec	18 Apr 2006 14:56:38 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           ecore
-Version:        0.9.9.023
-Release:        2%{?dist}
+Version:        0.9.9.026
+Release:        1%{?dist}
 Summary:        An event and X abstraction layer
 
 Group:          System Environment/Libraries
@@ -71,6 +71,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Apr 18 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.9.026-1
+- Upstream update
+
 * Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.9.023-2
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ecore/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Feb 2006 10:27:21 -0000	1.2
+++ sources	18 Apr 2006 14:56:38 -0000	1.3
@@ -1 +1 @@
-a12d806bbf687b371cd13743faff382e  ecore-0.9.9.023.tar.gz
+c9f2eaed941c9cecc4acf5c57132c1cf  ecore-0.9.9.026.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 18 14:56:38 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 18 Apr 2006 07:56:38 -0700
Subject: rpms/ecore/devel .cvsignore, 1.2, 1.3 ecore.spec, 1.3, 1.4 sources, 
	1.2, 1.3
Message-ID: <200604181456.k3IEuevg009320@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/ecore/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9277/devel

Modified Files:
	.cvsignore ecore.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ecore/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Feb 2006 10:27:21 -0000	1.2
+++ .cvsignore	18 Apr 2006 14:56:38 -0000	1.3
@@ -1 +1 @@
-ecore-0.9.9.023.tar.gz
+ecore-0.9.9.026.tar.gz


Index: ecore.spec
===================================================================
RCS file: /cvs/extras/rpms/ecore/devel/ecore.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ecore.spec	14 Feb 2006 05:00:14 -0000	1.3
+++ ecore.spec	18 Apr 2006 14:56:38 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           ecore
-Version:        0.9.9.023
-Release:        2%{?dist}
+Version:        0.9.9.026
+Release:        1%{?dist}
 Summary:        An event and X abstraction layer
 
 Group:          System Environment/Libraries
@@ -71,6 +71,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Apr 18 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.9.026-1
+- Upstream update
+
 * Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.9.023-2
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ecore/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Feb 2006 10:27:21 -0000	1.2
+++ sources	18 Apr 2006 14:56:38 -0000	1.3
@@ -1 +1 @@
-a12d806bbf687b371cd13743faff382e  ecore-0.9.9.023.tar.gz
+c9f2eaed941c9cecc4acf5c57132c1cf  ecore-0.9.9.026.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 18 14:59:50 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 18 Apr 2006 07:59:50 -0700
Subject: owners owners.list,1.855,1.856
Message-ID: <200604181459.k3IExqEZ009712@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9688

Modified Files:
	owners.list 
Log Message:
perl-Crypt-Primes
perl-Crypt-Random



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.855
retrieving revision 1.856
diff -u -r1.855 -r1.856
--- owners.list	18 Apr 2006 07:59:36 -0000	1.855
+++ owners.list	18 Apr 2006 14:59:49 -0000	1.856
@@ -910,6 +910,8 @@
 Fedora Extras|perl-Crypt-DES_EDE3|Crypt::DES_EDE3 Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Crypt-DH|Perl module implementing the Diffie-Hellman key exchange system|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Crypt-DSA|Perl module for DSA signatures and key generation|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Crypt-Primes|Provable prime number generator for cryptographic applications|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Crypt-Random|Cryptographically Secure, True Random Number Generator|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Crypt-SmbHash|Pure-perl Lanman and NT MD4 hash functions|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Data-Buffer|Read/write buffer class for perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Data-HexDump|Hexadecial Dumper|andreas at bawue.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Apr 18 15:21:34 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 18 Apr 2006 08:21:34 -0700
Subject: rpms/embryo/FC-5 .cvsignore, 1.2, 1.3 embryo.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200604181521.k3IFLau9012042@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/embryo/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12005/FC-5

Modified Files:
	.cvsignore embryo.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/embryo/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Apr 2006 18:42:20 -0000	1.2
+++ .cvsignore	18 Apr 2006 15:21:34 -0000	1.3
@@ -1 +1 @@
-embryo-0.9.1.023.tar.gz
+embryo-0.9.1.026.tar.gz


Index: embryo.spec
===================================================================
RCS file: /cvs/extras/rpms/embryo/FC-5/embryo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- embryo.spec	15 Apr 2006 18:42:20 -0000	1.1
+++ embryo.spec	18 Apr 2006 15:21:34 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           embryo
-Version:        0.9.1.023
+Version:        0.9.1.026
 Release:        1%{?dist}
 Summary:        A C like scripting language
 
@@ -64,5 +64,8 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Apr 18 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.1.026-1
+- Upstream update
+
 * Sun Feb  5 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.1.023-1
 - Initial RPM release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/embryo/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Apr 2006 18:42:20 -0000	1.2
+++ sources	18 Apr 2006 15:21:34 -0000	1.3
@@ -1 +1 @@
-eb84d1c02e9063f2108bc5f72a7627ef  embryo-0.9.1.023.tar.gz
+814379fa15cd5396bc279f4ea90bac2f  embryo-0.9.1.026.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 18 15:21:35 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 18 Apr 2006 08:21:35 -0700
Subject: rpms/embryo/devel .cvsignore, 1.2, 1.3 embryo.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200604181521.k3IFLb96012048@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/embryo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12005/devel

Modified Files:
	.cvsignore embryo.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/embryo/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Apr 2006 18:42:20 -0000	1.2
+++ .cvsignore	18 Apr 2006 15:21:35 -0000	1.3
@@ -1 +1 @@
-embryo-0.9.1.023.tar.gz
+embryo-0.9.1.026.tar.gz


Index: embryo.spec
===================================================================
RCS file: /cvs/extras/rpms/embryo/devel/embryo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- embryo.spec	15 Apr 2006 18:42:20 -0000	1.1
+++ embryo.spec	18 Apr 2006 15:21:35 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           embryo
-Version:        0.9.1.023
+Version:        0.9.1.026
 Release:        1%{?dist}
 Summary:        A C like scripting language
 
@@ -64,5 +64,8 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Apr 18 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.1.026-1
+- Upstream update
+
 * Sun Feb  5 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.1.023-1
 - Initial RPM release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/embryo/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Apr 2006 18:42:20 -0000	1.2
+++ sources	18 Apr 2006 15:21:35 -0000	1.3
@@ -1 +1 @@
-eb84d1c02e9063f2108bc5f72a7627ef  embryo-0.9.1.023.tar.gz
+814379fa15cd5396bc279f4ea90bac2f  embryo-0.9.1.026.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 18 15:25:23 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 18 Apr 2006 08:25:23 -0700
Subject: rpms/jed/devel .cvsignore, 1.3, 1.4 jed.spec, 1.9, 1.10 sources, 1.3,
	1.4 jed-info.patch, 1.1, NONE
Message-ID: <200604181525.k3IFPP67012166@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/jed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12145

Modified Files:
	.cvsignore jed.spec sources 
Removed Files:
	jed-info.patch 
Log Message:
update to 0.99.18



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jed/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	30 Nov 2005 21:54:31 -0000	1.3
+++ .cvsignore	18 Apr 2006 15:25:23 -0000	1.4
@@ -1 +1 @@
-jed-B0.99-17.135.tar.bz2
+jed-0.99-18.tar.bz2


Index: jed.spec
===================================================================
RCS file: /cvs/extras/rpms/jed/devel/jed.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jed.spec	13 Feb 2006 19:50:35 -0000	1.9
+++ jed.spec	18 Apr 2006 15:25:23 -0000	1.10
@@ -1,12 +1,12 @@
 Summary: Fast, compact editor based on the S-Lang screen library
 Name: jed
-Version: 0.99.17
-Release: 0.pre135.3
+Version: 0.99.18
+Release: 1
 License: GPL
 Group: Applications/Editors
-Source0: ftp://space.mit.edu/pub/davis/jed/v0.99/pre-0.99-17/jed-B0.99-17.135.tar.bz2
+Source0: ftp://space.mit.edu/pub/davis/jed/v0.99/jed-0.99-18.tar.bz2
 Patch1: jed-0.99.12-xkeys.patch
-Patch2: jed-info.patch
+URL: http://www.jedsoft.org/jed/
 Patch3: jed-multilib.patch
 Patch4: jed-selinux.patch
 Prereq: /sbin/install-info
@@ -26,9 +26,8 @@
 what you'd like to use.
 
 %prep
-%setup -q -n jed-B0.99-17.135
+%setup -q -n jed-0.99-18
 %patch1 -p1 -b .xkeys
-%patch2 -p1
 #%patch3 -p1
 %patch4 -p1 -b .selinux
 cd autoconf
@@ -68,6 +67,9 @@
 %{_datadir}/jed
 
 %changelog
+* Tue Apr 18 2006 Bill Nottingham <notting at redhat.com> - 0.99.18-1
+- update to 0.99.18
+
 * Mon Feb 13 2006 Bill Nottingham <notting at redhat.com> - 0.99.17-0.pre135.3
 - bump for rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jed/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 Nov 2005 21:54:31 -0000	1.3
+++ sources	18 Apr 2006 15:25:23 -0000	1.4
@@ -1 +1 @@
-8f9d3d6fa8805f0c10f14936600077c4  jed-B0.99-17.135.tar.bz2
+5378c8e7805854018d9ec5c3cfadf637  jed-0.99-18.tar.bz2


--- jed-info.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 18 15:26:38 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 18 Apr 2006 08:26:38 -0700
Subject: rpms/jed/FC-5 jed.spec, 1.9, 1.10 sources, 1.3, 1.4 jed-info.patch, 
	1.1, NONE
Message-ID: <200604181526.k3IFQeRH012206@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/jed/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12187

Modified Files:
	jed.spec sources 
Removed Files:
	jed-info.patch 
Log Message:
update to 0.99.18



Index: jed.spec
===================================================================
RCS file: /cvs/extras/rpms/jed/FC-5/jed.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jed.spec	13 Feb 2006 19:50:35 -0000	1.9
+++ jed.spec	18 Apr 2006 15:26:38 -0000	1.10
@@ -1,12 +1,12 @@
 Summary: Fast, compact editor based on the S-Lang screen library
 Name: jed
-Version: 0.99.17
-Release: 0.pre135.3
+Version: 0.99.18
+Release: 0.fc5
 License: GPL
 Group: Applications/Editors
-Source0: ftp://space.mit.edu/pub/davis/jed/v0.99/pre-0.99-17/jed-B0.99-17.135.tar.bz2
+Source0: ftp://space.mit.edu/pub/davis/jed/v0.99/jed-0.99-18.tar.bz2
 Patch1: jed-0.99.12-xkeys.patch
-Patch2: jed-info.patch
+URL: http://www.jedsoft.org/jed/
 Patch3: jed-multilib.patch
 Patch4: jed-selinux.patch
 Prereq: /sbin/install-info
@@ -26,9 +26,8 @@
 what you'd like to use.
 
 %prep
-%setup -q -n jed-B0.99-17.135
+%setup -q -n jed-0.99-18
 %patch1 -p1 -b .xkeys
-%patch2 -p1
 #%patch3 -p1
 %patch4 -p1 -b .selinux
 cd autoconf
@@ -68,6 +67,9 @@
 %{_datadir}/jed
 
 %changelog
+* Tue Apr 18 2006 Bill Nottingham <notting at redhat.com> - 0.99.18-0.fc5
+- update to 0.99.18
+
 * Mon Feb 13 2006 Bill Nottingham <notting at redhat.com> - 0.99.17-0.pre135.3
 - bump for rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jed/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 Nov 2005 21:54:31 -0000	1.3
+++ sources	18 Apr 2006 15:26:38 -0000	1.4
@@ -1 +1 @@
-8f9d3d6fa8805f0c10f14936600077c4  jed-B0.99-17.135.tar.bz2
+5378c8e7805854018d9ec5c3cfadf637  jed-0.99-18.tar.bz2


--- jed-info.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 18 15:27:36 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 18 Apr 2006 08:27:36 -0700
Subject: rpms/jed/FC-4 jed-selinux.patch, 1.1, 1.2 jed.spec, 1.6, 1.7 sources,
	1.2, 1.3 jed-info.patch, 1.1, NONE
Message-ID: <200604181527.k3IFRc6o012243@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/jed/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12219

Modified Files:
	jed-selinux.patch jed.spec sources 
Removed Files:
	jed-info.patch 
Log Message:
update to 0.99.18


jed-selinux.patch:

Index: jed-selinux.patch
===================================================================
RCS file: /cvs/extras/rpms/jed/FC-4/jed-selinux.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jed-selinux.patch	4 Mar 2005 22:37:55 -0000	1.1
+++ jed-selinux.patch	18 Apr 2006 15:27:36 -0000	1.2
@@ -1,5 +1,5 @@
---- jed-0.99-16/autoconf/configure.in.selinux	2004-09-25 01:33:25.000000000 -0400
-+++ jed-0.99-16/autoconf/configure.in	2004-09-25 01:40:05.000000000 -0400
+--- jed-0.99-16/autoconf/configure.ac.selinux	2004-09-25 01:33:25.000000000 -0400
++++ jed-0.99-16/autoconf/configure.ac	2004-09-25 01:40:05.000000000 -0400
 @@ -38,6 +38,8 @@
  
  AC_CHECK_LIB(util,openpty)


Index: jed.spec
===================================================================
RCS file: /cvs/extras/rpms/jed/FC-4/jed.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jed.spec	10 May 2005 02:55:05 -0000	1.6
+++ jed.spec	18 Apr 2006 15:27:36 -0000	1.7
@@ -1,17 +1,17 @@
 Summary: Fast, compact editor based on the S-Lang screen library
 Name: jed
-Version: 0.99.16
-Release: 10
+Version: 0.99.18
+Release: 0.fc4
 License: GPL
 Group: Applications/Editors
-Source0: ftp://space.mit.edu/pub/davis/jed/jed-0.99-16.tar.bz2
+Source0: ftp://space.mit.edu/pub/davis/jed/v0.99/jed-0.99-18.tar.bz2
 Patch1: jed-0.99.12-xkeys.patch
-Patch2: jed-info.patch
+URL: http://www.jedsoft.org/jed/
 Patch3: jed-multilib.patch
 Patch4: jed-selinux.patch
 Prereq: /sbin/install-info
 Obsoletes: jed-common jed-xjed
-BuildPrereq: slang-devel /usr/bin/autoconf-2.13
+BuildPrereq: slang-devel >= 2.0, autoconf, libselinux-devel
 BuildRoot: /var/tmp/jed-root
 
 %description
@@ -26,13 +26,14 @@
 what you'd like to use.
 
 %prep
-%setup -q -n jed-0.99-16
+%setup -q -n jed-0.99-18
 %patch1 -p1 -b .xkeys
-%patch2 -p1
-%patch3 -p1
+#%patch3 -p1
 %patch4 -p1 -b .selinux
-autoconf-2.13 -l autoconf autoconf/configure.in > configure
-chmod +x configure
+cd autoconf
+autoconf
+mv configure ..
+cd ..
 
 %build
 export JED_ROOT="%{_datadir}/jed"
@@ -66,6 +67,12 @@
 %{_datadir}/jed
 
 %changelog
+* Tue Apr 18 2006 Bill Nottingham <notting at redhat.com> - 0.99.18-0.fc4
+- update to 0.99.18
+
+* Mon Feb 13 2006 Bill Nottingham <notting at redhat.com> - 0.99.17-0.pre135.3
+- bump for rebuild
+
 * Mon May  9 2005 Bill Nottingham <notting at redhat.com> 0.99.16-10
 - don't forcibly strip binary, fixes debuginfo generation
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jed/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Mar 2005 22:37:55 -0000	1.2
+++ sources	18 Apr 2006 15:27:36 -0000	1.3
@@ -1 +1 @@
-c2bcd89c92a120559865a539c2705999  jed-0.99-16.tar.bz2
+5378c8e7805854018d9ec5c3cfadf637  jed-0.99-18.tar.bz2


--- jed-info.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 18 15:38:54 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 18 Apr 2006 08:38:54 -0700
Subject: rpms/jed/FC-4 jed-info.patch, 1.2, 1.3 jed-selinux.patch, 1.2,
	1.3 jed.spec, 1.7, 1.8 sources, 1.3, 1.4
Message-ID: <200604181538.k3IFcuQr012456@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/jed/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12427

Modified Files:
	jed-selinux.patch jed.spec sources 
Added Files:
	jed-info.patch 
Log Message:
no slang2 on FC-4 - I am an idiot. Revert.


jed-info.patch:

Index: jed-info.patch
===================================================================
RCS file: jed-info.patch
diff -N jed-info.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ jed-info.patch	18 Apr 2006 15:38:54 -0000	1.3
@@ -0,0 +1,13 @@
+--- jed/info/jed.info.entry	Sat Feb  5 11:10:19 2000
++++ jed/info/jed.info	Sat Feb  5 11:11:11 2000
+@@ -1,6 +1,10 @@
+ This is Info file jed.info, produced by Makeinfo-1.55 from the input
+ file jed.ti.
+ 
++START-INFO-DIR-ENTRY
++* JED: (jed).         The JED editor
++END-INFO-DIR-ENTRY
++
+ 
+ Indirect:
+ jed.1in: 83

jed-selinux.patch:

Index: jed-selinux.patch
===================================================================
RCS file: /cvs/extras/rpms/jed/FC-4/jed-selinux.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jed-selinux.patch	18 Apr 2006 15:27:36 -0000	1.2
+++ jed-selinux.patch	18 Apr 2006 15:38:54 -0000	1.3
@@ -1,5 +1,5 @@
---- jed-0.99-16/autoconf/configure.ac.selinux	2004-09-25 01:33:25.000000000 -0400
-+++ jed-0.99-16/autoconf/configure.ac	2004-09-25 01:40:05.000000000 -0400
+--- jed-0.99-16/autoconf/configure.in.selinux	2004-09-25 01:33:25.000000000 -0400
++++ jed-0.99-16/autoconf/configure.in	2004-09-25 01:40:05.000000000 -0400
 @@ -38,6 +38,8 @@
  
  AC_CHECK_LIB(util,openpty)


Index: jed.spec
===================================================================
RCS file: /cvs/extras/rpms/jed/FC-4/jed.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jed.spec	18 Apr 2006 15:27:36 -0000	1.7
+++ jed.spec	18 Apr 2006 15:38:54 -0000	1.8
@@ -1,17 +1,17 @@
 Summary: Fast, compact editor based on the S-Lang screen library
 Name: jed
-Version: 0.99.18
-Release: 0.fc4
+Version: 0.99.16
+Release: 10
 License: GPL
 Group: Applications/Editors
-Source0: ftp://space.mit.edu/pub/davis/jed/v0.99/jed-0.99-18.tar.bz2
+Source0: ftp://space.mit.edu/pub/davis/jed/jed-0.99-16.tar.bz2
 Patch1: jed-0.99.12-xkeys.patch
-URL: http://www.jedsoft.org/jed/
+Patch2: jed-info.patch
 Patch3: jed-multilib.patch
 Patch4: jed-selinux.patch
 Prereq: /sbin/install-info
 Obsoletes: jed-common jed-xjed
-BuildPrereq: slang-devel >= 2.0, autoconf, libselinux-devel
+BuildPrereq: slang-devel /usr/bin/autoconf-2.13
 BuildRoot: /var/tmp/jed-root
 
 %description
@@ -26,14 +26,13 @@
 what you'd like to use.
 
 %prep
-%setup -q -n jed-0.99-18
+%setup -q -n jed-0.99-16
 %patch1 -p1 -b .xkeys
-#%patch3 -p1
+%patch2 -p1
+%patch3 -p1
 %patch4 -p1 -b .selinux
-cd autoconf
-autoconf
-mv configure ..
-cd ..
+autoconf-2.13 -l autoconf autoconf/configure.in > configure
+chmod +x configure
 
 %build
 export JED_ROOT="%{_datadir}/jed"
@@ -67,12 +66,6 @@
 %{_datadir}/jed
 
 %changelog
-* Tue Apr 18 2006 Bill Nottingham <notting at redhat.com> - 0.99.18-0.fc4
-- update to 0.99.18
-
-* Mon Feb 13 2006 Bill Nottingham <notting at redhat.com> - 0.99.17-0.pre135.3
-- bump for rebuild
-
 * Mon May  9 2005 Bill Nottingham <notting at redhat.com> 0.99.16-10
 - don't forcibly strip binary, fixes debuginfo generation
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jed/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Apr 2006 15:27:36 -0000	1.3
+++ sources	18 Apr 2006 15:38:54 -0000	1.4
@@ -1 +1 @@
-5378c8e7805854018d9ec5c3cfadf637  jed-0.99-18.tar.bz2
+c2bcd89c92a120559865a539c2705999  jed-0.99-16.tar.bz2



From fedora-extras-commits at redhat.com  Tue Apr 18 16:53:02 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 18 Apr 2006 09:53:02 -0700
Subject: owners owners.list,1.856,1.857
Message-ID: <200604181653.k3IGr43n014770@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14753

Modified Files:
	owners.list 
Log Message:
Add paraview



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.856
retrieving revision 1.857
diff -u -r1.856 -r1.857
--- owners.list	18 Apr 2006 14:59:49 -0000	1.856
+++ owners.list	18 Apr 2006 16:53:02 -0000	1.857
@@ -832,6 +832,7 @@
 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|pan|A GNOME/GTK+ news reader for X|mpeters at mac.com|extras-qa at fedoraproject.org|
 Fedora Extras|paps|Plain Text to PostScript(TM) converter|tagoh at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|paraview|Parallel visualization application|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|parchive|Parity archive command line client|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|pbzip2|Parallel implementation of the bzip2 block-sorting file compressor|jeff.gilchrist at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|pcsc-lite|PC/SC Lite smart card framework and applications|ville.skytta at iki.fi|extras-qa at fedoraproject.org|ludovic.rousseau at gmail.com



From fedora-extras-commits at redhat.com  Tue Apr 18 18:31:29 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 18 Apr 2006 11:31:29 -0700
Subject: rpms/perl-Math-Pari - New directory
Message-ID: <200604181831.k3IIVVSX019676@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Math-Pari
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19650/perl-Math-Pari

Log Message:
Directory /cvs/extras/rpms/perl-Math-Pari added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 18 18:31:29 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 18 Apr 2006 11:31:29 -0700
Subject: rpms/perl-Math-Pari/devel - New directory
Message-ID: <200604181831.k3IIVV4Y019679@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-serv19650/perl-Math-Pari/devel

Log Message:
Directory /cvs/extras/rpms/perl-Math-Pari/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 18 18:31:56 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 18 Apr 2006 11:31:56 -0700
Subject: rpms/perl-Math-Pari Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604181831.k3IIVw17019728@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Math-Pari
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19695

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Math-Pari


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Math-Pari
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 18 18:31:56 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 18 Apr 2006 11:31:56 -0700
Subject: rpms/perl-Math-Pari/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604181831.k3IIVwQH019731@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-serv19695/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Math-Pari


--- 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 Apr 18 18:33:49 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 18 Apr 2006 11:33:49 -0700
Subject: rpms/perl-Math-Pari import.log,1.1,1.2
Message-ID: <200604181833.k3IIXpEu019794@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Math-Pari
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19761

Modified Files:
	import.log 
Log Message:
auto-import perl-Math-Pari-2.010704-2.fc5 on branch devel from perl-Math-Pari-2.010704-2.fc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Pari/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Apr 2006 18:31:55 -0000	1.1
+++ import.log	18 Apr 2006 18:33:49 -0000	1.2
@@ -0,0 +1 @@
+perl-Math-Pari-2_010704-2_fc5:HEAD:perl-Math-Pari-2.010704-2.fc5.src.rpm:1145385213



From fedora-extras-commits at redhat.com  Tue Apr 18 18:33:50 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 18 Apr 2006 11:33:50 -0700
Subject: rpms/perl-Math-Pari/devel perl-Math-Pari.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604181833.k3IIXqEV019799@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-serv19761/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Math-Pari.spec 
Log Message:
auto-import perl-Math-Pari-2.010704-2.fc5 on branch devel from perl-Math-Pari-2.010704-2.fc5.src.rpm


--- NEW FILE perl-Math-Pari.spec ---
# This package includes the pari library source even though that is
# being introduced to Fedora Extras in its own right (#169703). The
# rationale for this is:
# (a) This package patches the library source code
# (b) This package integrates very tightly with the library and may
#     break if the library is changed underneath it
# (c) Functionality is lost if built against an external PARI library
#     (see the INSTALL file in the distribution)

Summary:	Perl interface to PARI
Name:		perl-Math-Pari
Version:	2.010704
# 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}
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
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This package is a Perl interface to the famous library PARI for numerical/
scientific/ number-theoretic calculations. It allows use of most PARI functions
as Perl functions, and (almost) seamless merging of PARI and Perl data.

%prep
%setup -q -n Math-Pari-%{version} -a 1

# Remove redundant provides (there's also a versioned one)
%global provfilt /bin/sh -c "%{__perl_provides} | %{__grep} -Fvx 'perl(Math::Pari)'"
%define __perl_provides %{provfilt}

%build
# machine=linux-none needed to avoid breakage of 64-bit builds
# other flags cribbed from pari.spec (#169703)
export DLCFLAGS=-fPIC
%{__perl} Makefile.PL \
	INSTALLDIRS=vendor \
	OPTIMIZE="%{optflags} -fomit-frame-pointer" \
	machine=none
%{__make} %{?_smp_mflags}

%check
%{__make} test

%install
%{__rm} -rf %{buildroot}
%{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
/usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
/usr/bin/find %{buildroot} -type f -name '*.bs' -a -size 0 -exec %{__rm} -f {} ';'
/usr/bin/find %{buildroot} -type d -depth -exec /bin/rmdir {} 2>/dev/null ';'
%{__chmod} -R u+w %{buildroot}/*

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,0755)
%doc Changes README
%dir %{perl_vendorarch}/Math/
%exclude %doc %{perl_vendorarch}/Math/libPARI.dumb.pod
%doc %{perl_vendorarch}/Math/libPARI.pod
%{perl_vendorarch}/Math/*.pm
%{perl_vendorarch}/auto/Math/
%{_mandir}/man3/Math::Pari.3pm*
%{_mandir}/man3/Math::PariInit.3pm*
%{_mandir}/man3/Math::libPARI.3pm*
%exclude %{_mandir}/man3/Math::libPARI.dumb.3pm*

%changelog
* Tue Apr 18 2006 Paul Howarth <paul at city-fan.org> 2.010704-2
- Omit dumb docs (#175198)

* Mon Mar 20 2006 Paul Howarth <paul at city-fan.org> 2.010704-1
- Update to 2.010704

* Fri Mar 17 2006 Paul Howarth <paul at city-fan.org> 2.010703-2
- Simplify %%{__perl_requires} filter

* Wed Feb  1 2006 Paul Howarth <paul at city-fan.org> 2.010703-1
- Update to 2.010703
- Make pari version number calculation more robust

* Wed Dec  7 2005 Paul Howarth <paul at city-fan.org> 2.010702-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Pari/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Apr 2006 18:31:56 -0000	1.1
+++ .cvsignore	18 Apr 2006 18:33:50 -0000	1.2
@@ -0,0 +1,2 @@
+Math-Pari-2.010704.tar.gz
+pari-2.1.7.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Pari/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Apr 2006 18:31:56 -0000	1.1
+++ sources	18 Apr 2006 18:33:50 -0000	1.2
@@ -0,0 +1,2 @@
+0397da31fbe4f5485c4e7094c3661c5a  Math-Pari-2.010704.tar.gz
+357b7a42e89e2761a5367bbcbfcca5f2  pari-2.1.7.tgz



From fedora-extras-commits at redhat.com  Tue Apr 18 18:41:24 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 18 Apr 2006 11:41:24 -0700
Subject: owners owners.list,1.857,1.858
Message-ID: <200604181841.k3IIfQEr020017@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19999

Modified Files:
	owners.list 
Log Message:
perl-Math-Pari



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.857
retrieving revision 1.858
diff -u -r1.857 -r1.858
--- owners.list	18 Apr 2006 16:53:02 -0000	1.857
+++ owners.list	18 Apr 2006 18:41:24 -0000	1.858
@@ -1028,6 +1028,7 @@
 Fedora Extras|perl-Mail-SPF-Query|Mail::SPF::Query determines the legitimacy of an SMTP client IP|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MailTools|MailTools module for Perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Math-GMP|High speed arbitrary size integer math|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Math-Pari|Perl interface to PARI|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MIME-Lite|MIME-Lite - low-calorie MIME generator|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MIME-tools|Modules for parsing and creating MIME entities in Perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MIME-Types|MIME types module for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Apr 18 19:12:15 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 18 Apr 2006 12:12:15 -0700
Subject: CVSROOT avail,1.11,1.12
Message-ID: <200604181912.k3IJCFXg022477@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/devel/CVSROOT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22460

Modified Files:
	avail 
Log Message:
add pm-utils



Index: avail
===================================================================
RCS file: /cvs/devel/CVSROOT/avail,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- avail	17 Aug 2005 13:56:54 -0000	1.11
+++ avail	18 Apr 2006 19:12:13 -0000	1.12
@@ -16,3 +16,6 @@
 avail | notting,sopwith,wtogami,katzj | CVSROOT
 # trusted developers that can add modules
 avail | | CVSROOT/modules
+
+unavail | | pm-utils
+avail | notting,pjones,pknirsch | pm-utils



From fedora-extras-commits at redhat.com  Tue Apr 18 19:52:01 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 18 Apr 2006 12:52:01 -0700
Subject: rpms/smb4k/devel .cvsignore, 1.5, 1.6 smb4k.spec, 1.8, 1.9 sources, 
	1.5, 1.6
Message-ID: <200604181952.k3IJq3nx022751@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/smb4k/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22730

Modified Files:
	.cvsignore smb4k.spec sources 
Log Message:
- Updated to version 0.6.10



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smb4k/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Mar 2006 15:13:26 -0000	1.5
+++ .cvsignore	18 Apr 2006 19:52:01 -0000	1.6
@@ -1 +1 @@
-smb4k-0.6.9.tar.gz
+smb4k-0.6.10.tar.gz


Index: smb4k.spec
===================================================================
RCS file: /cvs/extras/rpms/smb4k/devel/smb4k.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- smb4k.spec	24 Mar 2006 15:13:26 -0000	1.8
+++ smb4k.spec	18 Apr 2006 19:52:01 -0000	1.9
@@ -1,5 +1,5 @@
 Name:		smb4k
-Version:	0.6.9
+Version:	0.6.10
 Release:	1%{?dist}
 Summary:	The SMB/CIFS Share Browser for KDE
 
@@ -107,6 +107,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Apr 18 2006 Marcin Garski <mgarski[AT]post.pl> 0.6.10-1
+- Updated to version 0.6.10
+
 * Fri Mar 24 2006 Marcin Garski <mgarski[AT]post.pl> 0.6.9-1
 - Updated to version 0.6.9
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smb4k/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Mar 2006 15:13:26 -0000	1.5
+++ sources	18 Apr 2006 19:52:01 -0000	1.6
@@ -1 +1 @@
-d11cb15febf8c55c04f5c96e14fced0b  smb4k-0.6.9.tar.gz
+8996f1f291efef48839998f75670987f  smb4k-0.6.10.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 18 20:00:23 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 18 Apr 2006 13:00:23 -0700
Subject: rpms/smb4k/FC-5 .cvsignore, 1.5, 1.6 smb4k.spec, 1.8, 1.9 sources,
	1.5, 1.6
Message-ID: <200604182000.k3IK0PKQ022862@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/smb4k/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22841

Modified Files:
	.cvsignore smb4k.spec sources 
Log Message:
- Updated to version 0.6.10



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Mar 2006 15:35:11 -0000	1.5
+++ .cvsignore	18 Apr 2006 20:00:22 -0000	1.6
@@ -1 +1 @@
-smb4k-0.6.9.tar.gz
+smb4k-0.6.10.tar.gz


Index: smb4k.spec
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-5/smb4k.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- smb4k.spec	24 Mar 2006 15:35:11 -0000	1.8
+++ smb4k.spec	18 Apr 2006 20:00:22 -0000	1.9
@@ -1,5 +1,5 @@
 Name:		smb4k
-Version:	0.6.9
+Version:	0.6.10
 Release:	1%{?dist}
 Summary:	The SMB/CIFS Share Browser for KDE
 
@@ -107,6 +107,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Apr 18 2006 Marcin Garski <mgarski[AT]post.pl> 0.6.10-1
+- Updated to version 0.6.10
+
 * Fri Mar 24 2006 Marcin Garski <mgarski[AT]post.pl> 0.6.9-1
 - Updated to version 0.6.9
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Mar 2006 15:35:11 -0000	1.5
+++ sources	18 Apr 2006 20:00:22 -0000	1.6
@@ -1 +1 @@
-d11cb15febf8c55c04f5c96e14fced0b  smb4k-0.6.9.tar.gz
+8996f1f291efef48839998f75670987f  smb4k-0.6.10.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 18 20:00:55 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 18 Apr 2006 13:00:55 -0700
Subject: rpms/smb4k/FC-4 .cvsignore, 1.5, 1.6 smb4k.spec, 1.5, 1.6 sources,
	1.5, 1.6
Message-ID: <200604182000.k3IK0vYp022927@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/smb4k/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22906

Modified Files:
	.cvsignore smb4k.spec sources 
Log Message:
- Updated to version 0.6.10



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Mar 2006 15:32:58 -0000	1.5
+++ .cvsignore	18 Apr 2006 20:00:55 -0000	1.6
@@ -1 +1 @@
-smb4k-0.6.9.tar.gz
+smb4k-0.6.10.tar.gz


Index: smb4k.spec
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-4/smb4k.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- smb4k.spec	24 Mar 2006 15:32:58 -0000	1.5
+++ smb4k.spec	18 Apr 2006 20:00:55 -0000	1.6
@@ -1,5 +1,5 @@
 Name:		smb4k
-Version:	0.6.9
+Version:	0.6.10
 Release:	1%{?dist}
 Summary:	The SMB/CIFS Share Browser for KDE
 
@@ -107,6 +107,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Apr 18 2006 Marcin Garski <mgarski[AT]post.pl> 0.6.10-1
+- Updated to version 0.6.10
+
 * Fri Mar 24 2006 Marcin Garski <mgarski[AT]post.pl> 0.6.9-1
 - Updated to version 0.6.9
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Mar 2006 15:32:58 -0000	1.5
+++ sources	18 Apr 2006 20:00:55 -0000	1.6
@@ -1 +1 @@
-d11cb15febf8c55c04f5c96e14fced0b  smb4k-0.6.9.tar.gz
+8996f1f291efef48839998f75670987f  smb4k-0.6.10.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 18 20:07:51 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Tue, 18 Apr 2006 13:07:51 -0700
Subject: rpms/trac/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 trac.spec,
	1.5, 1.6
Message-ID: <200604182007.k3IK7rht025071@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25050

Modified Files:
	.cvsignore sources trac.spec 
Log Message:
* Tue Apr 18 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.5-1
- bug fix release 0.9.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/trac/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Feb 2006 18:51:45 -0000	1.3
+++ .cvsignore	18 Apr 2006 20:07:51 -0000	1.4
@@ -1 +1 @@
-trac-0.9.4.tar.gz
+trac-0.9.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/trac/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Feb 2006 18:47:52 -0000	1.3
+++ sources	18 Apr 2006 20:07:51 -0000	1.4
@@ -1 +1 @@
-df752bd5ca8790e9735300c9e0be9bef  trac-0.9.4.tar.gz
+3b7d708eaf905cc6ba2b6b10a09a8cf4  trac-0.9.5.tar.gz


Index: trac.spec
===================================================================
RCS file: /cvs/extras/rpms/trac/devel/trac.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- trac.spec	16 Feb 2006 18:25:48 -0000	1.5
+++ trac.spec	18 Apr 2006 20:07:51 -0000	1.6
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           trac
-Version:        0.9.4
+Version:        0.9.5
 Release:        1%{?dist}
 Summary:        Enhanced wiki and issue tracking system
 
@@ -111,6 +111,9 @@
 %{_mandir}/man8/tracd.8*
 
 %changelog
+* Tue Apr 18 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.5-1
+- bug fix release 0.9.5
+
 * Wed Feb 15 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.4-1
 - 0.9.4
  * Deletion of reports has been fixed.



From fedora-extras-commits at redhat.com  Tue Apr 18 20:19:08 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Tue, 18 Apr 2006 13:19:08 -0700
Subject: rpms/trac/FC-4 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 trac.spec, 1.5,
	1.6
Message-ID: <200604182019.k3IKJAfs025183@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25146/FC-4

Modified Files:
	.cvsignore sources trac.spec 
Log Message:
bug fix release 0.9.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Feb 2006 18:51:02 -0000	1.3
+++ .cvsignore	18 Apr 2006 20:19:07 -0000	1.4
@@ -1 +1 @@
-trac-0.9.4.tar.gz
+trac-0.9.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Feb 2006 18:49:28 -0000	1.3
+++ sources	18 Apr 2006 20:19:07 -0000	1.4
@@ -1 +1 @@
-df752bd5ca8790e9735300c9e0be9bef  trac-0.9.4.tar.gz
+3b7d708eaf905cc6ba2b6b10a09a8cf4  trac-0.9.5.tar.gz


Index: trac.spec
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-4/trac.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- trac.spec	16 Feb 2006 19:26:48 -0000	1.5
+++ trac.spec	18 Apr 2006 20:19:07 -0000	1.6
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           trac
-Version:        0.9.4
-Release:        2%{?dist}
+Version:        0.9.5
+Release:        1%{?dist}
 Summary:        Enhanced wiki and issue tracking system
 
 Group:          Applications/Internet
@@ -111,8 +111,8 @@
 %{_mandir}/man8/tracd.8*
 
 %changelog
-* Thu Feb 16 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.4-2
-- bumped release to force plague build with new sources
+* Tue Apr 18 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.5-1
+- bug fix release 0.9.5
 
 * Wed Feb 15 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.4-1
 - 0.9.4
@@ -125,6 +125,9 @@
    2459, 2481, 2485, 2536, 2544, 2553, 2580, 2583, 2606, 2613, 2621, 
    2664, 2666, 2680, 2706, 2707, 2735
 
+* Mon Feb 13 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.3-5
+- Rebuild for Fedora Extras 5
+
 * Mon Jan 16 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.3-4
 - updated trac.conf to allow for trac.*cgi 
 



From fedora-extras-commits at redhat.com  Tue Apr 18 20:19:08 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Tue, 18 Apr 2006 13:19:08 -0700
Subject: rpms/trac/FC-5 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 trac.spec, 1.5,
	1.6
Message-ID: <200604182019.k3IKJAqw025189@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25146/FC-5

Modified Files:
	.cvsignore sources trac.spec 
Log Message:
bug fix release 0.9.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Feb 2006 18:51:45 -0000	1.3
+++ .cvsignore	18 Apr 2006 20:19:08 -0000	1.4
@@ -1 +1 @@
-trac-0.9.4.tar.gz
+trac-0.9.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Feb 2006 18:47:52 -0000	1.3
+++ sources	18 Apr 2006 20:19:08 -0000	1.4
@@ -1 +1 @@
-df752bd5ca8790e9735300c9e0be9bef  trac-0.9.4.tar.gz
+3b7d708eaf905cc6ba2b6b10a09a8cf4  trac-0.9.5.tar.gz


Index: trac.spec
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-5/trac.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- trac.spec	16 Feb 2006 18:25:48 -0000	1.5
+++ trac.spec	18 Apr 2006 20:19:08 -0000	1.6
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           trac
-Version:        0.9.4
+Version:        0.9.5
 Release:        1%{?dist}
 Summary:        Enhanced wiki and issue tracking system
 
@@ -111,6 +111,9 @@
 %{_mandir}/man8/tracd.8*
 
 %changelog
+* Tue Apr 18 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.5-1
+- bug fix release 0.9.5
+
 * Wed Feb 15 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.4-1
 - 0.9.4
  * Deletion of reports has been fixed.



From fedora-extras-commits at redhat.com  Tue Apr 18 21:45:38 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 18 Apr 2006 14:45:38 -0700
Subject: rpms/abcm2ps/devel .cvsignore, 1.15, 1.16 abcm2ps.spec, 1.17,
	1.18 sources, 1.15, 1.16
Message-ID: <200604182145.k3ILjerk027999@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27978

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 4.12.14


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	30 Mar 2006 15:01:02 -0000	1.15
+++ .cvsignore	18 Apr 2006 21:45:38 -0000	1.16
@@ -1,2 +1,2 @@
-abcm2ps-4.12.12.tar.gz
+abcm2ps-4.12.14.tar.gz
 abcplus_en-1.0.4.zip


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/abcm2ps.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- abcm2ps.spec	30 Mar 2006 15:01:02 -0000	1.17
+++ abcm2ps.spec	18 Apr 2006 21:45:38 -0000	1.18
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        4.12.12
+Version:        4.12.14
 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-4.12.12.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-4.12.14.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
+* Tue Apr 18 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.14-1
+- new version 4.12.14
+
 * Thu Mar 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.12-1
 - new version 4.12.12
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	30 Mar 2006 15:01:02 -0000	1.15
+++ sources	18 Apr 2006 21:45:38 -0000	1.16
@@ -1,2 +1,2 @@
-e293f78046593cdf9073878690e80e9a  abcm2ps-4.12.12.tar.gz
+a22f4954cb3e74d04a0be34f163cc434  abcm2ps-4.12.14.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Tue Apr 18 21:48:57 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 18 Apr 2006 14:48:57 -0700
Subject: rpms/abcm2ps/FC-4 .cvsignore, 1.15, 1.16 abcm2ps.spec, 1.16,
	1.17 sources, 1.15, 1.16
Message-ID: <200604182148.k3ILmxIr028088@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28051/FC-4

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 4.12.14


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-4/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	30 Mar 2006 15:04:07 -0000	1.15
+++ .cvsignore	18 Apr 2006 21:48:57 -0000	1.16
@@ -1,2 +1,2 @@
-abcm2ps-4.12.12.tar.gz
+abcm2ps-4.12.14.tar.gz
 abcplus_en-1.0.4.zip


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-4/abcm2ps.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- abcm2ps.spec	30 Mar 2006 15:04:07 -0000	1.16
+++ abcm2ps.spec	18 Apr 2006 21:48:57 -0000	1.17
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        4.12.12
+Version:        4.12.14
 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-4.12.12.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-4.12.14.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
+* Tue Apr 18 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.14-1
+- new version 4.12.14
+
 * Thu Mar 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.12-1
 - new version 4.12.12
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-4/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	30 Mar 2006 15:04:07 -0000	1.15
+++ sources	18 Apr 2006 21:48:57 -0000	1.16
@@ -1,2 +1,2 @@
-e293f78046593cdf9073878690e80e9a  abcm2ps-4.12.12.tar.gz
+a22f4954cb3e74d04a0be34f163cc434  abcm2ps-4.12.14.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Tue Apr 18 21:48:58 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 18 Apr 2006 14:48:58 -0700
Subject: rpms/abcm2ps/FC-5 .cvsignore, 1.15, 1.16 abcm2ps.spec, 1.17,
	1.18 sources, 1.15, 1.16
Message-ID: <200604182149.k3ILn0Mm028094@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28051/FC-5

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 4.12.14


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-5/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	30 Mar 2006 15:04:07 -0000	1.15
+++ .cvsignore	18 Apr 2006 21:48:58 -0000	1.16
@@ -1,2 +1,2 @@
-abcm2ps-4.12.12.tar.gz
+abcm2ps-4.12.14.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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- abcm2ps.spec	30 Mar 2006 15:04:07 -0000	1.17
+++ abcm2ps.spec	18 Apr 2006 21:48:58 -0000	1.18
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        4.12.12
+Version:        4.12.14
 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-4.12.12.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-4.12.14.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
+* Tue Apr 18 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.14-1
+- new version 4.12.14
+
 * Thu Mar 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.12-1
 - new version 4.12.12
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-5/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	30 Mar 2006 15:04:07 -0000	1.15
+++ sources	18 Apr 2006 21:48:58 -0000	1.16
@@ -1,2 +1,2 @@
-e293f78046593cdf9073878690e80e9a  abcm2ps-4.12.12.tar.gz
+a22f4954cb3e74d04a0be34f163cc434  abcm2ps-4.12.14.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Tue Apr 18 21:49:10 2006
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Tue, 18 Apr 2006 14:49:10 -0700
Subject: pm-utils pm-action,1.1,1.2
Message-ID: <200604182149.k3ILnAVS028119@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/devel/pm-utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28100

Modified Files:
	pm-action 
Log Message:
- test cvs repo


Index: pm-action
===================================================================
RCS file: /cvs/devel/pm-utils/pm-action,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pm-action	14 Mar 2006 14:56:26 -0000	1.1
+++ pm-action	18 Apr 2006 21:49:08 -0000	1.2
@@ -1,6 +1,9 @@
 #!/bin/bash
 
 # Simple suspend script
+#
+# Copyright 2006 Red Hat, Inc.
+#
 # Based on work from:
 #    Bill Nottingham <notting at redhat.com>
 #    Peter Jones <pjones at redhat.com>



From fedora-extras-commits at redhat.com  Tue Apr 18 22:24:42 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Tue, 18 Apr 2006 15:24:42 -0700
Subject: rpms/ikvm import.log,1.2,1.3
Message-ID: <200604182225.k3IMPE6G030369@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/ikvm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30337

Modified Files:
	import.log 
Log Message:
auto-import ikvm-0.22-5 on branch devel from ikvm-0.22-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ikvm/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	8 Mar 2006 16:23:11 -0000	1.2
+++ import.log	18 Apr 2006 22:24:42 -0000	1.3
@@ -1 +1,2 @@
 ikvm-0_22-4:HEAD:ikvm-0.22-4.src.rpm:1141834969
+ikvm-0_22-5:HEAD:ikvm-0.22-5.src.rpm:1145399070



From fedora-extras-commits at redhat.com  Tue Apr 18 22:24:43 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Tue, 18 Apr 2006 15:24:43 -0700
Subject: rpms/ikvm/devel ikvm.spec,1.1,1.2
Message-ID: <200604182225.k3IMPFsK030372@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/ikvm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30337/devel

Modified Files:
	ikvm.spec 
Log Message:
auto-import ikvm-0.22-5 on branch devel from ikvm-0.22-5.src.rpm


Index: ikvm.spec
===================================================================
RCS file: /cvs/extras/rpms/ikvm/devel/ikvm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ikvm.spec	8 Mar 2006 16:23:17 -0000	1.1
+++ ikvm.spec	18 Apr 2006 22:24:43 -0000	1.2
@@ -1,16 +1,17 @@
-%define ikvmdir %{buildroot}%{_libdir}/ikvm
+%define _libdir /usr/lib
 
 Summary: An implementation of Java for Mono
 Name: ikvm
 Version: 0.22
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 Group: Development/Languages
-Source0: http://go-mono.com/sources/ikvm/ikvm-%{version}.tar.gz
+Source0: http://go-mono.com/sources/%{name}/%{name}-%{version}.tar.gz
 Patch0: ikvm-scripts.patch
 URL: http://www.ikvm.net/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: mono-core, mono-devel, dos2unix
+BuildRequires:  mono-devel, dos2unix
+Requires: mono-core
 
 %description
 This package provides IKVM.NET, an open source Java compatibility
@@ -18,15 +19,6 @@
 and various class libraries for Java, as well as tools for Java and
 Mono interoperability.
 
-%package devel
-Summary:  IKVM pkgconfig file
-Group:    Development/Languages
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-This package contains the pkgconfig configuration file for IKVM.
-
-
 %prep
 rm -rf %{RPM_BUILD_ROOT}
 %setup -q
@@ -39,32 +31,23 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%{__mkdir} -p %{buildroot}%{_libdir}/pkgconfig
-%{__mkdir} -p %{buildroot}%{_bindir}
-%{__mkdir} -p %{ikvmdir}
-%{__install} -c bin/ikvm.exe %{ikvmdir}/ikvm.exe
-%{__install} -c bin/ikvmc.exe %{ikvmdir}/ikvmc.exe
-%{__install} -c bin/ikvmstub.exe %{ikvmdir}/ikvmstub.ex
-%{__install} -c lib/IKVM.AWT.WinForms.dll %{ikvmdir}/IKVM.AWT.WinForms.dll
-%{__install} -c lib/IKVM.GNU.Classpath.dll %{ikvmdir}/IKVM.GNU.Classpath.dll
-%{__install} -c lib/IKVM.Runtime.dll %{ikvmdir}/IKVM.Runtime.dll
-%{__install} -c scripts/ikvmc %{buildroot}%{_bindir}/ikvmc
-%{__install} -c scripts/ikvm %{buildroot}%{_bindir}/ikvm
-%{__install} -c scripts/ikvmstub %{buildroot}%{_bindir}/ikvmstub
-%{__install} -c -m 644 ikvm.pc %{buildroot}%{_libdir}/pkgconfig/ikvm.pc
+make DESTDIR=%{buildroot} install
 
 %files 
 %doc LICENSE COPYING
 %{_bindir}/*
 %{_libdir}/ikvm/
-
-%files devel
 %{_libdir}/pkgconfig/ikvm.pc
 
 %clean
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Tue Apr 18 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.22-5
+- libdir is now usr-lib irrespective of architecture built on
+- removed devel as there is no point of a devel for one file
+- multiple spec file changed
+
 * Mon Mar  6 2006 Michel Salim <michel.salim at gmail.com> 0.22-4
 - Fixed summary
 - Changed URL field



From fedora-extras-commits at redhat.com  Tue Apr 18 22:27:01 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Tue, 18 Apr 2006 15:27:01 -0700
Subject: rpms/ikvm import.log,1.3,1.4
Message-ID: <200604182227.k3IMR3bK030462@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/ikvm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30431

Modified Files:
	import.log 
Log Message:
auto-import ikvm-0.22-5 on branch FC-5 from ikvm-0.22-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ikvm/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	18 Apr 2006 22:24:42 -0000	1.3
+++ import.log	18 Apr 2006 22:27:01 -0000	1.4
@@ -1,2 +1,3 @@
 ikvm-0_22-4:HEAD:ikvm-0.22-4.src.rpm:1141834969
 ikvm-0_22-5:HEAD:ikvm-0.22-5.src.rpm:1145399070
+ikvm-0_22-5:FC-5:ikvm-0.22-5.src.rpm:1145399164



From fedora-extras-commits at redhat.com  Tue Apr 18 22:27:01 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Tue, 18 Apr 2006 15:27:01 -0700
Subject: rpms/ikvm/FC-5 ikvm.spec,1.1,1.2
Message-ID: <200604182227.k3IMR39k030466@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/ikvm/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30431/FC-5

Modified Files:
	ikvm.spec 
Log Message:
auto-import ikvm-0.22-5 on branch FC-5 from ikvm-0.22-5.src.rpm


Index: ikvm.spec
===================================================================
RCS file: /cvs/extras/rpms/ikvm/FC-5/ikvm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ikvm.spec	8 Mar 2006 16:23:17 -0000	1.1
+++ ikvm.spec	18 Apr 2006 22:27:01 -0000	1.2
@@ -1,16 +1,17 @@
-%define ikvmdir %{buildroot}%{_libdir}/ikvm
+%define _libdir /usr/lib
 
 Summary: An implementation of Java for Mono
 Name: ikvm
 Version: 0.22
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 Group: Development/Languages
-Source0: http://go-mono.com/sources/ikvm/ikvm-%{version}.tar.gz
+Source0: http://go-mono.com/sources/%{name}/%{name}-%{version}.tar.gz
 Patch0: ikvm-scripts.patch
 URL: http://www.ikvm.net/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: mono-core, mono-devel, dos2unix
+BuildRequires:  mono-devel, dos2unix
+Requires: mono-core
 
 %description
 This package provides IKVM.NET, an open source Java compatibility
@@ -18,15 +19,6 @@
 and various class libraries for Java, as well as tools for Java and
 Mono interoperability.
 
-%package devel
-Summary:  IKVM pkgconfig file
-Group:    Development/Languages
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-This package contains the pkgconfig configuration file for IKVM.
-
-
 %prep
 rm -rf %{RPM_BUILD_ROOT}
 %setup -q
@@ -39,32 +31,23 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%{__mkdir} -p %{buildroot}%{_libdir}/pkgconfig
-%{__mkdir} -p %{buildroot}%{_bindir}
-%{__mkdir} -p %{ikvmdir}
-%{__install} -c bin/ikvm.exe %{ikvmdir}/ikvm.exe
-%{__install} -c bin/ikvmc.exe %{ikvmdir}/ikvmc.exe
-%{__install} -c bin/ikvmstub.exe %{ikvmdir}/ikvmstub.ex
-%{__install} -c lib/IKVM.AWT.WinForms.dll %{ikvmdir}/IKVM.AWT.WinForms.dll
-%{__install} -c lib/IKVM.GNU.Classpath.dll %{ikvmdir}/IKVM.GNU.Classpath.dll
-%{__install} -c lib/IKVM.Runtime.dll %{ikvmdir}/IKVM.Runtime.dll
-%{__install} -c scripts/ikvmc %{buildroot}%{_bindir}/ikvmc
-%{__install} -c scripts/ikvm %{buildroot}%{_bindir}/ikvm
-%{__install} -c scripts/ikvmstub %{buildroot}%{_bindir}/ikvmstub
-%{__install} -c -m 644 ikvm.pc %{buildroot}%{_libdir}/pkgconfig/ikvm.pc
+make DESTDIR=%{buildroot} install
 
 %files 
 %doc LICENSE COPYING
 %{_bindir}/*
 %{_libdir}/ikvm/
-
-%files devel
 %{_libdir}/pkgconfig/ikvm.pc
 
 %clean
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Tue Apr 18 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.22-5
+- libdir is now usr-lib irrespective of architecture built on
+- removed devel as there is no point of a devel for one file
+- multiple spec file changed
+
 * Mon Mar  6 2006 Michel Salim <michel.salim at gmail.com> 0.22-4
 - Fixed summary
 - Changed URL field



From fedora-extras-commits at redhat.com  Wed Apr 19 02:12:25 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 18 Apr 2006 19:12:25 -0700
Subject: rpms/libmal/devel libmal.spec,1.3,1.4
Message-ID: <200604190212.k3J2CRna007498@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libmal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7481

Modified Files:
	libmal.spec 
Log Message:
* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.31-3 
- respin for pilot-link



Index: libmal.spec
===================================================================
RCS file: /cvs/extras/rpms/libmal/devel/libmal.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libmal.spec	31 Mar 2006 12:37:13 -0000	1.3
+++ libmal.spec	19 Apr 2006 02:12:25 -0000	1.4
@@ -4,7 +4,7 @@
 # NOTE: this isn't the latest version, but is the last version known to 
 # work with kdepim
 Version: 0.31 
-Release: 2%{?dist}.1
+Release: 3%{?dist}
 
 License: MPL	
 Url: 	 http://jasonday.home.att.net/code/libmal/ 
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.31-3 
+- respin for pilot-link
+
 * Wed Mar 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.31-2
 - capitalize summary
 - drop empty %%doc's: AUTHORS NEWS TODO



From fedora-extras-commits at redhat.com  Wed Apr 19 02:13:03 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 18 Apr 2006 19:13:03 -0700
Subject: rpms/libmal/FC-5 libmal.spec,1.2,1.3
Message-ID: <200604190213.k3J2D5VV007569@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libmal/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7552

Modified Files:
	libmal.spec 
Log Message:
* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.31-3 
- respin for pilot-link



Index: libmal.spec
===================================================================
RCS file: /cvs/extras/rpms/libmal/FC-5/libmal.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libmal.spec	22 Mar 2006 15:33:38 -0000	1.2
+++ libmal.spec	19 Apr 2006 02:13:03 -0000	1.3
@@ -4,7 +4,7 @@
 # NOTE: this isn't the latest version, but is the last version known to 
 # work with kdepim
 Version: 0.31 
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: MPL	
 Url: 	 http://jasonday.home.att.net/code/libmal/ 
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.31-3 
+- respin for pilot-link
+
 * Wed Mar 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.31-2
 - capitalize summary
 - drop empty %%doc's: AUTHORS NEWS TODO



From fedora-extras-commits at redhat.com  Wed Apr 19 02:23:11 2006
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Tue, 18 Apr 2006 19:23:11 -0700
Subject: rpms/wxGTK/FC-4 wxGTK-2.6.3.2-cvs.patch, NONE, 1.1 sources, 1.3,
	1.4 wxGTK.spec, 1.13, 1.14
Message-ID: <200604190223.k3J2NDE6007736@cvs-int.fedora.redhat.com>

Author: mattdm

Update of /cvs/extras/rpms/wxGTK/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7706

Modified Files:
	sources wxGTK.spec 
Added Files:
	wxGTK-2.6.3.2-cvs.patch 
Log Message:
Update to 2.6.3 -- massive changes. See bug #154618 for details.


wxGTK-2.6.3.2-cvs.patch:

--- NEW FILE wxGTK-2.6.3.2-cvs.patch ---
diff -ur wxGTK-2.6.3/configure wxGTK-2.6.3.2/configure
--- wxGTK-2.6.3/configure	2006-03-21 18:42:05.000000000 -0500
+++ wxGTK-2.6.3.2/configure	2006-03-30 12:05:51.000000000 -0500
@@ -1669,7 +1669,7 @@
 wx_major_version_number=2
 wx_minor_version_number=6
 wx_release_number=3
-wx_subrelease_number=1
+wx_subrelease_number=2
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
 WX_VERSION=$WX_RELEASE.$wx_release_number
diff -ur wxGTK-2.6.3/configure.in wxGTK-2.6.3.2/configure.in
--- wxGTK-2.6.3/configure.in	2006-03-21 18:42:05.000000000 -0500
+++ wxGTK-2.6.3.2/configure.in	2006-03-30 12:05:49.000000000 -0500
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Id: configure.in,v 1.1063.2.15 2006/03/21 19:33:57 KO Exp $)dnl
+AC_REVISION($Id: configure.in,v 1.1063.2.16 2006/03/30 17:05:49 RD Exp $)dnl
 
 dnl ---------------------------------------------------------------------------
 dnl
@@ -8,7 +8,7 @@
 dnl
 dnl This script is under the wxWidgets licence.
 dnl
-dnl Version: $Id: configure.in,v 1.1063.2.15 2006/03/21 19:33:57 KO Exp $
+dnl Version: $Id: configure.in,v 1.1063.2.16 2006/03/30 17:05:49 RD Exp $
 dnl ---------------------------------------------------------------------------
 
 dnl ---------------------------------------------------------------------------
@@ -33,7 +33,7 @@
 wx_major_version_number=2
 wx_minor_version_number=6
 wx_release_number=3
-wx_subrelease_number=1
+wx_subrelease_number=2
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
 WX_VERSION=$WX_RELEASE.$wx_release_number
diff -ur wxGTK-2.6.3/contrib/src/deprecated/cwlex_yy.c wxGTK-2.6.3.2/contrib/src/deprecated/cwlex_yy.c
--- wxGTK-2.6.3/contrib/src/deprecated/cwlex_yy.c	2006-03-21 18:42:22.000000000 -0500
+++ wxGTK-2.6.3.2/contrib/src/deprecated/cwlex_yy.c	2005-05-04 14:57:49.000000000 -0400
@@ -3,7 +3,7 @@
 /* Licence:   wxWindows Licence */
 
 /* scanner skeleton version:
- * $Header: /pack/cvsroots/wxwindows/wxWindows/contrib/src/deprecated/cwlex_yy.c,v 1.2 2005/05/04 18:57:49 JS Exp $
+ * $Header: /pack/cvsroots/wxwidgets/wxWidgets/contrib/src/deprecated/cwlex_yy.c,v 1.2 2005/05/04 18:57:49 JS Exp $
 	Last change:  JS   13 Jul 97    6:17 pm
  */
 
diff -ur wxGTK-2.6.3/contrib/src/deprecated/doslex.c wxGTK-2.6.3.2/contrib/src/deprecated/doslex.c
--- wxGTK-2.6.3/contrib/src/deprecated/doslex.c	2006-03-21 18:42:22.000000000 -0500
+++ wxGTK-2.6.3.2/contrib/src/deprecated/doslex.c	2005-06-09 14:37:44.000000000 -0400
@@ -1,7 +1,7 @@
 /* A lexical scanner generated by flex */
 
 /* scanner skeleton version:
- * $Header: /pack/cvsroots/wxwindows/wxWindows/contrib/src/deprecated/doslex.c,v 1.6 2005/06/09 18:37:44 ABX Exp $
+ * $Header: /pack/cvsroots/wxwidgets/wxWidgets/contrib/src/deprecated/doslex.c,v 1.6 2005/06/09 18:37:44 ABX Exp $
   Last change:  JS   13 Jul 97    6:17 pm
  */
 /* Copyright: (c) Julian Smart */
diff -ur wxGTK-2.6.3/include/wx/version.h wxGTK-2.6.3.2/include/wx/version.h
--- wxGTK-2.6.3/include/wx/version.h	2006-03-21 18:42:08.000000000 -0500
+++ wxGTK-2.6.3.2/include/wx/version.h	2006-03-30 12:05:48.000000000 -0500
@@ -4,7 +4,7 @@
 *  Author:      Julian Smart
 *  Modified by: Ryan Norton (Converted to C)
 *  Created:     29/01/98
-*  RCS-ID:      $Id: version.h,v 1.69.2.2 2006/01/18 10:25:00 JS Exp $
+*  RCS-ID:      $Id: version.h,v 1.69.2.3 2006/03/30 17:05:48 RD Exp $
 *  Copyright:   (c) 1998 Julian Smart
 *  Licence:     wxWindows licence
 */
@@ -22,7 +22,7 @@
 #define wxMAJOR_VERSION      2
 #define wxMINOR_VERSION      6
 #define wxRELEASE_NUMBER     3
-#define wxSUBRELEASE_NUMBER  0
+#define wxSUBRELEASE_NUMBER  2
 #define wxVERSION_STRING   _T("wxWidgets 2.6.3")
 
 /*  nothing to update below this line when updating the version */
diff -ur wxGTK-2.6.3/locale/fr.po wxGTK-2.6.3.2/locale/fr.po
--- wxGTK-2.6.3/locale/fr.po	2006-03-21 18:42:51.000000000 -0500
+++ wxGTK-2.6.3.2/locale/fr.po	2005-09-20 11:18:55.000000000 -0400
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: wxWidgets-2.6.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-21 17:37+0200\n"
+"POT-Creation-Date: 2005-04-11 22:24+0200\n"
 "PO-Revision-Date: 2005-09-07 09:34+0200\n"
 "Last-Translator: Thomas Huriaux <thomas.huriaux at gmail.com>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -13,12 +13,12 @@
 "Content-Transfer-Encoding: 8bit\n"
 "plural-forms: nplurals=2; plural=n > 1\n"
 
-#: ../src/common/debugrpt.cpp:569
+#: ../src/common/debugrpt.cpp:547
 #, c-format
 msgid "\t%s: %s\n"
 msgstr "\t%s?: %s\n"
 
-#: ../src/common/debugrpt.cpp:572
+#: ../src/common/debugrpt.cpp:550
 msgid ""
 "\n"
 "Please send this report to the program maintainer, thank you!\n"
@@ -26,20 +26,20 @@
 "\n"
 "Veuillez envoyer ce rapport au responsable du programme.\n"
 
-#: ../src/palmos/utils.cpp:206
+#: ../src/palmos/utils.cpp:210
 msgid " "
 msgstr " "
 
-#: ../src/generic/dbgrptg.cpp:312
+#: ../src/generic/dbgrptg.cpp:293
 msgid "              Thank you and we're sorry for the inconvenience!\n"
 msgstr "              Merci et d?sol? pour le d?rangement.\n"
 
-#: ../src/common/log.cpp:321
+#: ../src/common/log.cpp:322
 #, c-format
 msgid " (error %ld: %s)"
 msgstr " (erreur %ld?: %s)"
 
-#: ../src/common/docview.cpp:1419
+#: ../src/common/docview.cpp:1380
 msgid " - "
 msgstr " - "
 
@@ -47,23 +47,23 @@
 msgid " Preview"
 msgstr " Aper?u"
 
-#: ../src/common/paper.cpp:124
+#: ../src/common/paper.cpp:134
 msgid "#10 Envelope, 4 1/8 x 9 1/2 in"
 msgstr "Enveloppe n??10 (4,125 x 9,5 pouces)"
 
-#: ../src/common/paper.cpp:125
+#: ../src/common/paper.cpp:135
 msgid "#11 Envelope, 4 1/2 x 10 3/8 in"
 msgstr "Enveloppe n??11 (4,5 x 10,375 pouces)"
 
-#: ../src/common/paper.cpp:126
+#: ../src/common/paper.cpp:136
 msgid "#12 Envelope, 4 3/4 x 11 in"
 msgstr "Enveloppe n??12 (4,75 x 11 pouces)"
 
-#: ../src/common/paper.cpp:127
+#: ../src/common/paper.cpp:137
 msgid "#14 Envelope, 5 x 11 1/2 in"
 msgstr "Enveloppe n??14 (5 x 11,5 pouces)"
 
-#: ../src/common/paper.cpp:123
+#: ../src/common/paper.cpp:133
 msgid "#9 Envelope, 3 7/8 x 8 7/8 in"
 msgstr "Enveloppe n??9 (3,875 x 8,875 pouces)"
 
@@ -74,13 +74,13 @@
 msgid "#define %s must be an integer."
 msgstr "#define %s doit ?tre un entier."
 
-#: ../src/html/helpfrm.cpp:1042 ../src/html/helpfrm.cpp:1044
-#: ../src/html/helpfrm.cpp:1703 ../src/html/helpfrm.cpp:1736
+#: ../src/html/helpfrm.cpp:1019 ../src/html/helpfrm.cpp:1021
+#: ../src/html/helpfrm.cpp:1689 ../src/html/helpfrm.cpp:1722
 #, c-format
 msgid "%i of %i"
 msgstr "%i de %i"
 
-#: ../src/generic/filedlgg.cpp:288
+#: ../src/generic/filedlgg.cpp:287
 #, c-format
 msgid "%ld bytes"
 msgstr "%ld octets"
@@ -90,27 +90,27 @@
 msgid "%s (or %s)"
 msgstr "%s (ou %s)"
 
-#: ../src/generic/logg.cpp:261
+#: ../src/generic/logg.cpp:262
 #, c-format
 msgid "%s Error"
 msgstr "%s Erreur"
 
-#: ../src/generic/logg.cpp:269
+#: ../src/generic/logg.cpp:270
 #, c-format
 msgid "%s Information"
 msgstr "%s Information"
 
[...16204 lines suppressed...]
--- wxGTK-2.6.3/src/tiff/tif_next.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_next.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_next.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_next.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_open.c wxGTK-2.6.3.2/src/tiff/tif_open.c
--- wxGTK-2.6.3/src/tiff/tif_open.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_open.c	2005-05-31 05:28:43.000000000 -0400
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_open.c,v 1.5 2005/05/31 09:28:43 JS Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_open.c,v 1.5 2005/05/31 09:28:43 JS Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_os2.c wxGTK-2.6.3.2/src/tiff/tif_os2.c
--- wxGTK-2.6.3/src/tiff/tif_os2.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_os2.c	2002-12-04 09:10:19.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_os2.c,v 1.2 2002/12/04 14:10:19 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_os2.c,v 1.2 2002/12/04 14:10:19 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_packbits.c wxGTK-2.6.3.2/src/tiff/tif_packbits.c
--- wxGTK-2.6.3/src/tiff/tif_packbits.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_packbits.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_packbits.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_packbits.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_predict.c wxGTK-2.6.3.2/src/tiff/tif_predict.c
--- wxGTK-2.6.3/src/tiff/tif_predict.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_predict.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_predict.c,v 1.6 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_predict.c,v 1.6 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_predict.h wxGTK-2.6.3.2/src/tiff/tif_predict.h
--- wxGTK-2.6.3/src/tiff/tif_predict.h	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_predict.h	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_predict.h,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_predict.h,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1995-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_print.c wxGTK-2.6.3.2/src/tiff/tif_print.c
--- wxGTK-2.6.3/src/tiff/tif_print.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_print.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_print.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_print.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_read.c wxGTK-2.6.3.2/src/tiff/tif_read.c
--- wxGTK-2.6.3/src/tiff/tif_read.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_read.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_read.c,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_read.c,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_strip.c wxGTK-2.6.3.2/src/tiff/tif_strip.c
--- wxGTK-2.6.3/src/tiff/tif_strip.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_strip.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_strip.c,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_strip.c,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1991-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_swab.c wxGTK-2.6.3.2/src/tiff/tif_swab.c
--- wxGTK-2.6.3/src/tiff/tif_swab.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_swab.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_swab.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_swab.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_thunder.c wxGTK-2.6.3.2/src/tiff/tif_thunder.c
--- wxGTK-2.6.3/src/tiff/tif_thunder.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_thunder.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_thunder.c,v 1.4 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_thunder.c,v 1.4 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_tile.c wxGTK-2.6.3.2/src/tiff/tif_tile.c
--- wxGTK-2.6.3/src/tiff/tif_tile.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_tile.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_tile.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_tile.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1991-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_unix.c wxGTK-2.6.3.2/src/tiff/tif_unix.c
--- wxGTK-2.6.3/src/tiff/tif_unix.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_unix.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_unix.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_unix.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_version.c wxGTK-2.6.3.2/src/tiff/tif_version.c
--- wxGTK-2.6.3/src/tiff/tif_version.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_version.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_version.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_version.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 /*
  * Copyright (c) 1992-1997 Sam Leffler
  * Copyright (c) 1992-1997 Silicon Graphics, Inc.
diff -ur wxGTK-2.6.3/src/tiff/tif_vms.c wxGTK-2.6.3.2/src/tiff/tif_vms.c
--- wxGTK-2.6.3/src/tiff/tif_vms.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_vms.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_vms.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_vms.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_warning.c wxGTK-2.6.3.2/src/tiff/tif_warning.c
--- wxGTK-2.6.3/src/tiff/tif_warning.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_warning.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_warning.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_warning.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_win32.c wxGTK-2.6.3.2/src/tiff/tif_win32.c
--- wxGTK-2.6.3/src/tiff/tif_win32.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_win32.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_win32.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_win32.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_win3.c wxGTK-2.6.3.2/src/tiff/tif_win3.c
--- wxGTK-2.6.3/src/tiff/tif_win3.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_win3.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_win3.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_win3.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_write.c wxGTK-2.6.3.2/src/tiff/tif_write.c
--- wxGTK-2.6.3/src/tiff/tif_write.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_write.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_write.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_write.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_zip.c wxGTK-2.6.3.2/src/tiff/tif_zip.c
--- wxGTK-2.6.3/src/tiff/tif_zip.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_zip.c	2004-11-19 17:29:47.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_zip.c,v 1.4 2004/11/19 22:29:47 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_zip.c,v 1.4 2004/11/19 22:29:47 VZ Exp $ */
 
 /*
  * Copyright (c) 1995-1997 Sam Leffler
diff -ur wxGTK-2.6.3/utils/helpview/src/helpview.cpp wxGTK-2.6.3.2/utils/helpview/src/helpview.cpp
--- wxGTK-2.6.3/utils/helpview/src/helpview.cpp	2006-03-21 18:42:49.000000000 -0500
+++ wxGTK-2.6.3.2/utils/helpview/src/helpview.cpp	2006-03-30 06:35:12.000000000 -0500
@@ -5,7 +5,7 @@
 // Author:      Vaclav Slavik, Julian Smart
 // Modified by:
 // Created:     2002-07-09
-// RCS-ID:      $Id: helpview.cpp,v 1.14 2005/05/30 09:24:08 ABX Exp $
+// RCS-ID:      $Id: helpview.cpp,v 1.14.2.1 2006/03/30 11:35:12 JS Exp $
 // Copyright:   (c) 2002 Vaclav Slavik, Julian Smart and others
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -63,7 +63,7 @@
 
 #ifdef __WXMAC__
     wxApp::s_macAboutMenuItemId = wxID_ABOUT;
-    wxFileName::MacRegisterDefaultTypeAndCreator( "htb" , 'HTBD' , 'HTBA' ) ;
+    wxFileName::MacRegisterDefaultTypeAndCreator( wxT("htb") , 'HTBD' , 'HTBA' ) ;
 #endif
 
     int istyle = wxHF_DEFAULT_STYLE;


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wxGTK/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 05:32:41 -0000	1.3
+++ sources	19 Apr 2006 02:23:11 -0000	1.4
@@ -1 +1 @@
-cdadfe82fc93f8a65a2ae18a95b0b0e3  wxGTK-2.4.2.tar.bz2
+3cd76c3c47913e52a3175dd47239c6ec  wxGTK-2.6.3.tar.bz2


Index: wxGTK.spec
===================================================================
RCS file: /cvs/extras/rpms/wxGTK/FC-4/wxGTK.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- wxGTK.spec	8 May 2005 10:39:34 -0000	1.13
+++ wxGTK.spec	19 Apr 2006 02:23:11 -0000	1.14
@@ -1,203 +1,143 @@
 %define x11libdir %{_prefix}/X11R6/%{_lib}
 
+# Option - build an ODBC subpackage using unixODBC. (This is currently 
+# broken; see <https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=176950>.)
+%define withodbc 0
+
 Name:           wxGTK
-Version:        2.4.2
-Release:        12
-Summary:        GTK+ port of the wxWidgets GUI library
-License:        BSD
+Version:        2.6.3
+Release:        2.6.3.2.1%{?dist}
+Summary:        GTK2 port of the wxWidgets GUI library
+# The wxWindows licence is the LGPL with a specific exemption allowing
+# distribution of derived binaries under any terms. (This will eventually
+# change to be "wxWidgets License" once that is approved by OSI.)
+License:        wxWidgets Library Licence
 Group:          System Environment/Libraries
 URL:            http://www.wxwidgets.org/
 Source0:        http://dl.sf.net/wxwindows/%{name}-%{version}.tar.bz2
-Patch0:         wxGTK-2.4.2-privates.patch
-Patch1:         wxGTK-2.4.2-aclocal18.patch
-Patch2:		wxGTK-2.4.2-gcc4.patch
+Patch0:         wxGTK-2.6.3.2-cvs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk+-devel gtk2-devel zlib-devel >= 1.1.4
-BuildRequires:  libpng-devel libjpeg-devel libtiff-devel
-BuildRequires:  libGL libGLU
-Requires:       %{name}-common = %{version}-%{release}
+BuildRequires:  gtk2-devel, zlib-devel >= 1.1.4
+BuildRequires:  libpng-devel, libjpeg-devel, libtiff-devel
+BuildRequires:  expat-devel, SDL-devel, libgnomeprintui22-devel
+BuildRequires:  libGL-devel, libGLU-devel
+%if %{withodbc}
+BuildRequires:  unixODBC-devel
+%endif
+
+# all of these are for previous Fedora Extras sub-packages
+Obsoletes:      wxGTK2 < 2.6.2-1
+Provides:       wxGTK2 = %{version}-%{release}
+
+Obsoletes:      wxGTK-common < 2.6.2-1
+Provides:       wxGTK-common = %{version}-%{release}
+
+Obsoletes:      wxGTK2-xrc < 2.6.2-1
+Obsoletes:      wxGTK-xrc < 2.6.2-1
+Provides:       wxGTK2-xrc = %{version}-%{release}
+Provides:       wxGTK-xrc = %{version}-%{release}
+
+Obsoletes:      wxGTK2-stc < 2.6.2-1
+Obsoletes:      wxGTK-stc < 2.6.2-1
+Provides:       wxGTK2-stc = %{version}-%{release}
+Provides:       wxGTK-stc = %{version}-%{release}
 
 %description
-wxWidgets/GTK is the GTK+ (1.2) port of the C++ cross-platform wxWidgets
+wxWidgets/GTK2 is the GTK2 port of the C++ cross-platform wxWidgets
 GUI library, offering classes for all common GUI controls as well as a
 comprehensive set of helper classes for most common application tasks,
 ranging from networking to HTML display and image manipulation.
 
+
 %package        devel
 Group:          Development/Libraries
-Summary:        Development files for the wxGTK library
+Summary:        Development files for the wxGTK2 library
 Requires:       %{name} = %{version}-%{release}
-Requires:       %{name}-common-devel = %{version}-%{release}
 Requires:       %{name}-gl = %{version}-%{release}
-Requires:       %{name}-stc = %{version}-%{release}
-Requires:       %{name}-xrc = %{version}-%{release}
-Requires:       gtk+-devel
-Conflicts:      %{name}2-devel
-
-%description    devel
-This package includes files needed to link with the wxGTK library.
-
-%package     -n %{name}2
-Group:          System Environment/Libraries
-Summary:        %{name}2 is the GTK2 port of the wxWidgets GUI library
-Requires:       %{name}-common = %{version}-%{release}
-
-%description -n %{name}2
-wxWidgets/GTK2 is the GTK2 port of the C++ cross-platform wxWidgets
-GUI library, offering classes for all common GUI controls as well as a
-comprehensive set of helper classes for most common application tasks,
-ranging from networking to HTML display and image manipulation.
-
-%package     -n %{name}2-devel
-Group:          Development/Libraries
-Summary:        Development files for the wxGTK2 library
-Requires:       %{name}2 = %{version}-%{release}
-Requires:       %{name}-common-devel = %{version}-%{release}
-Requires:       %{name}2-gl = %{version}-%{release}
-Requires:       %{name}2-stc = %{version}-%{release}
-Requires:       %{name}2-xrc = %{version}-%{release}
 Requires:       gtk2-devel
-Conflicts:      %{name}-devel
+Obsoletes:      wxGTK2-devel < %{version}-%{release}
+Provides:       wxGTK2-devel = %{version}-%{release}
+Obsoletes:      wxGTK-common-devel < %{version}-%{release}
+Provides:       wxGTK-common-devel = %{version}-%{release}
 
-%description -n %{name}2-devel
+%description devel
 This package include files needed to link with the wxGTK2 library.
 
-%package        common
-Group:          System Environment/Libraries
-Summary:        wxGTK* common files
-
-%description    common
-Common files for wxWidgets/GTK1 and GTK2.
-
-%package        common-devel
-Group:          Development/Libraries
-Summary:        wxGTK* common development files
-
-%description    common-devel
-Common development files for wxWidgets/GTK1 and GTK2.
 
 %package        gl
 Summary:        OpenGL add-on for the wxWidgets library
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
+Obsoletes:      wxGTK2-gl < %{version}-%{release}
+Provides:       wxGTK2-gl = %{version}-%{release}
 
-%description    gl
-%{summary}.
-
-%package     -n %{name}2-gl
-Summary:        OpenGL add-on for the wxWidgets library
-Group:          System Environment/Libraries
-Requires:       %{name}2 = %{version}-%{release}
-
-%description -n %{name}2-gl
-%{summary}.
-
-%package        stc
-Summary:        Styled text control add-on for the wxWidgets library
-Group:          System Environment/Libraries
-Requires:       %{name} = %{version}-%{release}
-
-%description    stc
-Styled text control add-on for wxGTK. Based on the Scintillia project.
+%description gl
+OpenGL (a 3D graphics API) add-on for the wxWidgets library.
 
-%package     -n %{name}2-stc
-Summary:        Styled text control add-on for the wxWidgets library
-Group:          System Environment/Libraries
-Requires:       %{name}2 = %{version}-%{release}
-
-%description -n %{name}2-stc
-Styled text control add-on for wxGTK2. Based on the Scintillia project.
-
-%package        xrc
-Summary:        The XML-based resource system for the wxWidgets library
+%if %{withodbc}
+%package        odbc
+Summary:        ODBC add-on for the wxWidgets library
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
 
-%description    xrc
-The XML-based resource system, known as XRC, allows user interface
-elements such as dialogs, menu bars and toolbars, to be stored in
-text files and loaded into the application at run-time.
-This package is for the GTK 1.2 backend
-
-%package     -n %{name}2-xrc
-Summary:        The XML-based resource system for the wxWidgets library
-Group:          System Environment/Libraries
-Requires:       %{name}2 = %{version}-%{release}
-
-%description -n %{name}2-xrc
-The XML-based resource system, known as XRC, allows user interface
-elements such as dialogs, menu bars and toolbars, to be stored in
-text files and loaded into the application at run-time.
-This package is for the GTK2 backend.
-
+%description odbc
+ODBC (a SQL database connectivity API) add-on for the wxWidgets library.
+%endif
 
 %prep
-%setup -q -n %{name}-%{version}
-%patch0 -p1 -b .privates
-%patch1 -b .aclocal18
-%patch2 -p1 -b .gcc4
+%setup -q
+
+%patch0 -p1 -b .2.6.3.2
 
 sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
 
 
 %build
-mkdir _gtk1 _gtk2
-export CC="%{__cc}"
-export CXX="%{__cxx}"
-export CFLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$RPM_OPT_FLAGS"
+export GDK_USE_XFT=1
+
 # --disable-optimise prevents our $RPM_OPT_FLAGS being overridden
 # (see OPTIMISE in configure).
-
-cd _gtk1
-../configure \
-  --prefix=%{_prefix} \
-  --libdir=%{_libdir} \
-  --x-libraries=%{x11libdir} \
-  --with-opengl \
-  --enable-shared \
-  --enable-soname \
-  --disable-optimise
-make %{?_smp_mflags}
-make %{?_smp_mflags} -C contrib/src/stc
-make %{?_smp_mflags} -C contrib/src/xrc
-
-cd ../_gtk2
-../configure \
-  --prefix=%{_prefix} \
-  --libdir=%{_libdir} \
+%configure \
   --x-libraries=%{x11libdir} \
+  --with-gtk=2 \
   --with-opengl \
+%if %{withodbc}
+  --with-odbc \
+%endif
+  --with-sdl \
+  --with-gnomeprint \
   --enable-shared \
   --enable-soname \
   --disable-optimise \
-  --enable-gtk2
+  --enable-debug_info \
+  --enable-unicode \
+  --enable-compat22
+
 make %{?_smp_mflags}
 make %{?_smp_mflags} -C contrib/src/stc
-make %{?_smp_mflags} -C contrib/src/xrc
-
-cd ..
-
+make %{?_smp_mflags} -C contrib/src/ogl
+make %{?_smp_mflags} -C contrib/src/gizmos
+make %{?_smp_mflags} -C contrib/src/animate
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-# Since we're not using %%configure, we would really like to use
-# "make install DESTDIR=..." instead of %%makeinstall here to keep things in
-# sync.  Unfortunately that does not work.
-cd _gtk1
-%makeinstall
-%makeinstall -C contrib/src/stc
-%makeinstall -C contrib/src/xrc
-cd ../_gtk2
 %makeinstall
+
 %makeinstall -C contrib/src/stc
-%makeinstall -C contrib/src/xrc
-cd ..
+%makeinstall -C contrib/src/ogl
+%makeinstall -C contrib/src/gizmos
+%makeinstall -C contrib/src/animate
+
+# this ends up being a symlink into the buildroot directly -- 
+# not what we want!
+rm $RPM_BUILD_ROOT%{_bindir}/wx-config
+ln -s %{_libdir}/wx/config/gtk2-unicode-release-2.6 $RPM_BUILD_ROOT%{_bindir}/wx-config
 
 %find_lang wxstd
-
+%find_lang wxmsw
+cat wxmsw.lang >> wxstd.lang
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -206,109 +146,183 @@
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%post -n %{name}2 -p /sbin/ldconfig
-%postun -n %{name}2 -p /sbin/ldconfig
-
-%post devel
-ln -sf $(basename %{_bindir}/wxgtk-*-config) %{_bindir}/wx-config
-
-%post -n %{name}2-devel
-ln -sf $(basename %{_bindir}/wxgtk2*-config) %{_bindir}/wx-config
-
 %post gl -p /sbin/ldconfig
 %postun gl -p /sbin/ldconfig
 
-%post -n %{name}2-gl -p /sbin/ldconfig
-%postun -n %{name}2-gl -p /sbin/ldconfig
-
-%post stc -p /sbin/ldconfig
-%postun stc -p /sbin/ldconfig
-
-%post -n %{name}2-stc -p /sbin/ldconfig
-%postun -n %{name}2-stc -p /sbin/ldconfig
-
-%post xrc -p /sbin/ldconfig
-%postun xrc -p /sbin/ldconfig
 
-%post -n %{name}2-xrc -p /sbin/ldconfig
-%postun -n %{name}2-xrc -p /sbin/ldconfig
-
-
-%files
+%files -f wxstd.lang
 %defattr(-,root,root,-)
-%{_libdir}/libwx_gtk-*.so.*
+%doc CHANGES*.txt COPYING.LIB LICENCE.txt README*.txt
+%{_libdir}/libwx_baseu-*.so.*
+%{_libdir}/libwx_baseu_net-*.so.*
+%{_libdir}/libwx_baseu_xml-*.so.*
+%{_libdir}/libwx_gtk2u_adv-*.so.*
+%{_libdir}/libwx_gtk2u_animate-*.so.*
+%{_libdir}/libwx_gtk2u_core-*.so.*
+%{_libdir}/libwx_gtk2u_gizmos-*.so.*
+%{_libdir}/libwx_gtk2u_gizmos_xrc*.so.*
+%{_libdir}/libwx_gtk2u_html-*.so.*
+%{_libdir}/libwx_gtk2u_media-*.so.*
+%{_libdir}/libwx_gtk2u_ogl-*.so.*
+%{_libdir}/libwx_gtk2u_xrc-*.so.*
+%{_libdir}/libwx_gtk2u_stc-*.so.*
+%{_libdir}/libwx_gtk2u_qa-*.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%ghost %{_bindir}/wx-config
-%{_bindir}/wxgtk-*-config
-%{_libdir}/libwx_gtk[-_]*.so
-%{_libdir}/wx/include/gtk-*
-
-%files -n %{name}2
-%defattr(-,root,root,-)
-%{_libdir}/libwx_gtk2-*.so.*
-
-%files -n %{name}2-devel
-%defattr(-,root,root,-)
-%ghost %{_bindir}/wx-config
-%{_bindir}/wxgtk2*-config
-%{_libdir}/libwx_gtk2[-_]*.so
-%{_libdir}/wx/include/gtk2*
-
-%files common -f wxstd.lang
-%defattr(-,root,root,-)
-%doc CHANGES*.txt COPYING.LIB LICENCE.txt README*.txt
+%{_bindir}/wx-config
+%{_bindir}/wxrc*
+%{_includedir}/wx-2.6
+%{_libdir}/libwx_*.so
 %dir %{_libdir}/wx
-%{_datadir}/wx
-
-%files common-devel
-%defattr(-,root,root,-)
-%{_datadir}/aclocal/*
-%{_includedir}/wx
 %dir %{_libdir}/wx/include
+%{_libdir}/wx/include/gtk2*
+%dir %{_libdir}/wx/config
+%{_libdir}/wx/config/gtk2*
+%{_datadir}/aclocal/*
+%{_datadir}/bakefile/presets/
 
 %files gl
 %defattr(-,root,root,-)
-%{_libdir}/libwx_gtk_gl-*.so.*
-
-%files -n %{name}2-gl
-%defattr(-,root,root,-)
-%{_libdir}/libwx_gtk2_gl-*.so.*
-
-%files stc
-%defattr(-,root,root,-)
-%doc contrib/src/stc/README.txt
-%{_libdir}/libwx_gtk_stc-*.so.*
+%{_libdir}/libwx_gtk2u_gl-*.so.*
 
-%files -n %{name}2-stc
+%if %{withodbc}
+%files odbc
 %defattr(-,root,root,-)
-%doc contrib/src/stc/README.txt
-%{_libdir}/libwx_gtk2_stc-*.so.*
-
-%files xrc
-%defattr(-,root,root,-)
-%{_libdir}/libwx_gtk_xrc-*.so.*
-
-%files -n %{name}2-xrc
-%defattr(-,root,root,-)
-%{_libdir}/libwx_gtk2_xrc-*.so.*
-
+%{_libdir}/libwx_gtk2u_odbc-*.so.*
+%endif
 
 %changelog
-* Sun May  8 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 2.4.2-12
-- sed -i -e 's|/usr/lib\b|%%{_libdir}|' in configure also to fix
-  x86_64
-
-* Sat May  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.4.2-11
-- Add BR libGL and libGLU to fix FC4 build failure
-  (alternatively use xorg-x11-Mesa-libGL xorg-x11-Mesa-libGLU).
+* Thu Apr 13 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3-2.6.3.2.1
+- oops -- forgot to change mesa-libGL*-devel -> libGL*-devel
 
-* Fri Apr 22 2005 Dams <anvil[AT]livna.org> - 2.4.2-10
-- Added patch from Ignacio and Denis to fix build with gcc4 
+* Thu Apr 13 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3-2.6.3.2.0
+- patch to cvs subrelease 2.6.3.2 (matches wxPython)
 
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
-- rebuilt
+* Sat Mar 25 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3-1    
+- 2.6.3 final
+- remove the locale_install thing -- that was just an issue with using the
+  release candidate.
+
+* Tue Mar 21 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3-0.rc2
+- update to 2.6.3-rc2 package
+- all patches now upstream -- removing 'em.
+- use complete 'wxWidgets' source tarball instead of the wxGTK-subset one,
+  since that's all there is for the release candidate. I'm operating under
+  the assumption that we'll have a wxGTK source tarball in the future --
+  otherwise, I'm going to eventually have to change the name of this
+  package again. :)
+- add ODBC support via unixODBC as subpackage (see bug #176950)
+- wait, no; comment out ODBC support as it doesn't build...
+- add explicit make locale_install; apparently not done as part of
+  the general 'make install' anymore.
+
+* Mon Feb 13 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.2-5
+- rebuild in preparation for FC5
+
+* Mon Feb 06 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.2-4
+- add wxGTK-2.6.2-socketclosefix.patch to fix aMule crashes. see
+  bugzilla bug #178184
+- add wxGTK-2.6.2-gcc41stringh.patch (pulled from CVS) to make build on 
+  FC5 devel w/ gcc-4.1.
+  
+* Wed Nov 30 2005 Matthew Miller <mattdm at mattdm.org> - 2.6.2-3
+- add wxGTK-2.6.2-intl_cpp.patch to deal with amule and probably other
+  issues (see bug #154618 comment #47)
+- obsolete wxGTK2 < 2.6.2-1 specifically, at Matthias Saou's suggestion
+
+* Mon Nov 28 2005 Matthew Miller <mattdm at mattdm.org> - 2.6.2-2
+- implemented some suggestions from Matthias Saou:
+-   removed extraneous / from last line of ./configure 
+-   removed -n from setup macro, since we're now actually using the
+    standard name
+-   don't use summary macro in opengl subpackage, as it's not clear which
+    summary should get used
+-   don't bother setting CC, CXX, etc., as configure script does that
+-   move libdir/wx to devel subpackage
+
+* Thu Nov 24 2005 Matthew Miller <mattdm at mattdm.org> - 2.6.2-1
+- ready for actually putting into Extras
+- update mesa buildreqs for new split-up xorg packaging
+- libgnomeprint22-devel -> libgnomeprintui22-devel
+
+* Tue Oct 04 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.6.2-0.1
+- Update to 2.6.2.
+- Include the sample wx bakefiles.
+- Include new .mo files.
+- From Paul Johnson:
+  Change license to wxWidgets due to concerns over trademark infringement.
+  Add dist tag.
+- From Tom Callaway: Build and include libwx_gtk2u_animate-2.6.
+
+* Thu Apr 28 2005 Matthew Miller <mattdm at mattdm.org> 2.6.1-0.1
+- update to 2.6.1
+- from Michael Schwendt in 2.4.2-11 package: build-require
+  xorg-x11-Mesa-libGL and xorg-x11-Mesa-libGLU (the libGL and libGLU
+  deps aren't provided in FC3, so not using that).
+- from Thorsten Leemhuis in 2.4.2-12 package: sed -i -e
+  's|/usr/lib\b|%%{_libdir}|' in configure also to fix x86_64
+- properly include older 2.4.x changelog
+
+* Wed Apr 27 2005 Matthew Miller <mattdm at mattdm.org> - 2.6.0-0.1
+- include libwx_gtk2u_gizmos_xrc in file listing
+
+* Wed Apr 27 2005 Matthew Miller <mattdm at mattdm.org> - 2.6.0-0.0
+- update to 2.6.0 final release
+- configure now wants "--with-gtk=2" instead of "--enable-gtk2".
+
+* Wed Apr 13 2005 Matthew Miller <mattdm at mattdm.org> - 2.5.5-0.2
+- removed provides: wxWidgets/wxWidgets devel -- handy for compatibility
+  with unmodified generic source packages, but not so good for 
+  repeatable builds.
+
+* Wed Apr 13 2005 Matthew Miller <mattdm at mattdm.org> - 2.5.5-0.1
+- whoops -- forgot to remove a reference to the "common" package
+- version-release for obsoletes/provides
+
+* Tue Apr 12 2005 Matthew Miller <mattdm at mattdm.org> - 2.5.5-0
+- remove BU-specific oddities for fedora an idea for a simplied future....
+
+* Tue Apr 12 2005 Matthew Miller <mattdm at bu.edu> - 2.5.5-bu45.2
+- whoops -- forgot "Provides: wxGTK2-devel".
+
+* Tue Apr 12 2005 Matthew Miller <mattdm at bu.edu> - 2.5.5-bu45.1
+- update to 2.5.5
+
+* Sat Mar  5 2005 Matthew Miller <mattdm at bu.edu> - 2.5.4-bu45.3
+- Obsolete & provide GTK-xrc, wxGTK-stc, to provide clean upgrade path
+
+* Tue Mar  1 2005 Matthew Miller <mattdm at bu.edu> - 2.5.4-bu45.2
+- enable wxWindows 2.2 compatibility (for compatibility with 2.4 rpm,
+  ironically).
+
+* Tue Mar  1 2005 Matthew Miller <mattdm at bu.edu> - 2.5.4-bu45.1
+- update to 2.5.4 -- the devel version is where all the fun is.
+- rebase to updated FE 2.4.2 package
+- license isn't "BSD" -- it's "wxWindows Library Licence".
+- make gtk2-only -- gtk 1.0.x is no longer supported, and 1.2.x is
+  being phased out. 2.x is the way to go.
+- all current patches no longer necessary (upstream)
+- roll "common" subpackage in to main package -- no longer makes sense
+  to split it out with gtk+ gone
+- use SDL, which will make this use Alsa for sound. I believe.
+- add gnomeprint support
+- add enable-debug_info for debuginfo package
+- enable unicode
+- use GDK_USE_XFT to enable Pango and fontconfig
+- xrc moved from contrib to base -- making it no longer a subpackage
+- making stc part of base too -- it's tiny, and doesn't introduce any
+  additional deps
+- leaving gl as a subpackage, though, since it's the only part that
+  requires GL libs.
+- add 'ogl' 2d drawing lib from contrib (needed for wxPython)
+- add 'gizmos' from contrib (needed for wxPython)
+- make wx-config actually part of the package, since there's no need
+  to mess with moving it around
+- the various afm fonts are gone in 2.5....
+- use configure macro
+- add provides for wxWidgets and wxWidgets-devel, because that
+  seems like a good idea.
 
 * Sun Jan 23 2005 Ville Skytt?? <ville.skytta at iki.fi> - 2.4.2-8
 - Fix wx-config for x86_64 (#145508).



From fedora-extras-commits at redhat.com  Wed Apr 19 02:24:36 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 18 Apr 2006 19:24:36 -0700
Subject: rpms/libmal/FC-4 libmal.spec,1.2,1.3
Message-ID: <200604190224.k3J2OcFK007802@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libmal/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7785

Modified Files:
	libmal.spec 
Log Message:
* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.31-3 
- respin for pilot-link



Index: libmal.spec
===================================================================
RCS file: /cvs/extras/rpms/libmal/FC-4/libmal.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libmal.spec	22 Mar 2006 15:33:38 -0000	1.2
+++ libmal.spec	19 Apr 2006 02:24:36 -0000	1.3
@@ -4,7 +4,7 @@
 # NOTE: this isn't the latest version, but is the last version known to 
 # work with kdepim
 Version: 0.31 
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: MPL	
 Url: 	 http://jasonday.home.att.net/code/libmal/ 
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.31-3 
+- respin for pilot-link
+
 * Wed Mar 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.31-2
 - capitalize summary
 - drop empty %%doc's: AUTHORS NEWS TODO



From fedora-extras-commits at redhat.com  Wed Apr 19 02:31:13 2006
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Tue, 18 Apr 2006 19:31:13 -0700
Subject: rpms/wxGTK/FC-4 wxGTK-2.4.2-aclocal18.patch, 1.1,
	NONE wxGTK-2.4.2-gcc4.patch, 1.1,
	NONE wxGTK-2.4.2-privates.patch, 1.1, NONE
Message-ID: <200604190231.k3J2VFK5008082@cvs-int.fedora.redhat.com>

Author: mattdm

Update of /cvs/extras/rpms/wxGTK/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8067

Removed Files:
	wxGTK-2.4.2-aclocal18.patch wxGTK-2.4.2-gcc4.patch 
	wxGTK-2.4.2-privates.patch 
Log Message:
Oops; remove old patches.



--- wxGTK-2.4.2-aclocal18.patch DELETED ---


--- wxGTK-2.4.2-gcc4.patch DELETED ---


--- wxGTK-2.4.2-privates.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Apr 19 02:51:33 2006
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Tue, 18 Apr 2006 19:51:33 -0700
Subject: rpms/wxPython/FC-4 sources,1.3,1.4 wxPython.spec,1.5,1.6
Message-ID: <200604190251.k3J2pZZk008567@cvs-int.fedora.redhat.com>

Author: mattdm

Update of /cvs/extras/rpms/wxPython/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8540

Added Files:
	sources wxPython.spec 
Log Message:
Update to 2.6.x. See bug #163440 for details.



Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	19 Apr 2006 02:51:32 -0000	1.4
@@ -0,0 +1 @@
+a27546fab8a8d77eb6b67954e6362269  wxPython-src-2.6.3.2.tar.gz


Index: wxPython.spec
===================================================================
RCS file: wxPython.spec
diff -N wxPython.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wxPython.spec	19 Apr 2006 02:51:32 -0000	1.6
@@ -0,0 +1,148 @@
+%{!?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 buildflags WXPORT=gtk2 UNICODE=1
+
+Name:           wxPython
+Version:        2.6.3.2
+Release:        1%{?dist}
+
+Summary:        GUI toolkit for the Python programming language
+
+Group:          Development/Languages
+License:        LGPL
+URL:            http://www.wxpython.org/
+Source0:        http://dl.sf.net/wxpython/wxPython-src-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  wxGTK-devel = 2.6.3, pkgconfig
+BuildRequires:  zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel
+BuildRequires:  libGL-devel, libGLU-devel
+BuildRequires:  python-devel, wxGTK-gl
+
+# packages should depend on "wxPython", not "wxPythonGTK2", but in case
+# one does, here's the provides for it.
+Provides:       wxPythonGTK2 = %{version}-%{release}
+
+%description
+wxPython is a GUI toolkit for the Python programming language. It allows
+Python programmers to create programs with a robust, highly functional
+graphical user interface, simply and easily. It is implemented as a Python
+extension module (native code) that wraps the popular wxWindows cross
+platform GUI library, which is written in C++.
+
+%package        devel
+Group:          Development/Libraries
+Summary:        Development files for wxPython add-on modules
+Requires:       %{name} = %{version}-%{release}
+Requires:       wxGTK-devel
+
+%description devel
+This package includes C++ header files and SWIG files needed for developing
+add-on modules for wxPython. It is NOT needed for development of most
+programs which use the wxPython toolkit.
+
+
+%prep
+%setup -q -n wxPython-src-%{version}
+
+
+%build
+# Just build the wxPython part, not all of wxWindows which we already have
+# in Fedora
+cd wxPython
+# included distutils is not multilib aware; use normal
+rm -rf distutils
+python setup.py %{buildflags} build
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+cd wxPython
+python setup.py %{buildflags} install --root=$RPM_BUILD_ROOT
+
+# this is a kludge....
+%if "%{python_sitelib}" != "%{python_sitearch}"
+mv $RPM_BUILD_ROOT%{python_sitelib}/wx.pth  $RPM_BUILD_ROOT%{python_sitearch}
+mv $RPM_BUILD_ROOT%{python_sitelib}/wxversion.py* $RPM_BUILD_ROOT%{python_sitearch}
+%endif
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%doc wxPython/docs wxPython/demo wxPython/licence/ wxPython/samples
+%{_bindir}/*
+%{python_sitearch}/wx.pth
+%{python_sitearch}/wxversion.py*
+%dir %{python_sitearch}/wx-2.6-gtk2-unicode/
+%{python_sitearch}/wx-2.6-gtk2-unicode/wx
+%{python_sitearch}/wx-2.6-gtk2-unicode/wxPython
+
+%files devel
+%defattr(-,root,root,-)
+%dir %{_includedir}/wx-2.6/wx/wxPython
+%{_includedir}/wx-2.6/wx/wxPython/*.h
+%dir %{_includedir}/wx-2.6/wx/wxPython/i_files
+%{_includedir}/wx-2.6/wx/wxPython/i_files/*.i
+%{_includedir}/wx-2.6/wx/wxPython/i_files/*.py*
+%{_includedir}/wx-2.6/wx/wxPython/i_files/*.swg
+
+
+%changelog
+* Thu Apr 13 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3.2-1
+- version 2.6.3.2
+- move wxversion.py _into_ lib64. Apparently that's the right thing to do. :)
+- upstream tarball no longer includes embedded.o (since I finally got around
+  to pointing that out to the developers instead of just kludging it away.)
+- buildrequires to just libGLU-devel instead of mesa-libGL-devel
+
+* Fri Mar 31 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3.0-4
+- grr. bump relnumber.
+
+* Fri Mar 31 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3.0-3
+- oh yeah -- wxversion.py not lib64.
+
+* Fri Mar 31 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3.0-2
+- buildrequires mesa-libGLU-devel
+
+* Thu Mar 30 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3.0-1
+- update to 2.6.3.0
+- wxGTK and wxPython versions are inexorably linked; make BuildRequires
+  be exact, rather than >=.
+- make devel subpackage as per comment #7 in bug #163440.
+
+* Thu Nov 24 2005 Matthew Miller <mattdm at mattdm.org> - 2.6.1.0-1
+- update to 2.6.0.0
+- merge in changes from current extras 2.4.x package
+- Happy Thanksgiving
+- build animate extention again -- works now.
+
+* Thu Apr 28 2005 Matthew Miller <mattdm at bu.edu> - 2.6.0.0-bu45.1
+- get rid of accidental binaries in source tarball -- they generates
+  spurious dependencies and serve no purpose
+- update to 2.6.0.0 and build for Velouria
+- switch to Fedora Extras base spec file
+- enable gtk2 and unicode and all the code stuff (as FE does)
+- disable BUILD_ANIMATE extension from contrib -- doesn't build
+- files are in a different location now -- adjust to that
+- zap include files (needed only for building wxPython 3rd-party modules),
+  because I don't think this is likely to be very useful. Other option
+  would be to create a -devel package, but I think that'd be confusing.
+
+* Tue Feb 08 2005 Thorsten Leemhuis <fedora at leemhuis dot info> 0:2.4.2.4-4
+- remove included disutils - it is not multilib aware; this
+  fixes build on x86_64
+
+* Tue Jan 06 2004 Panu Matilainen <pmatilai at welho.com> 0:2.4.2.4-0.fdr.3
+- rename package to wxPythonGTK2, provide wxPython (see bug 927)
+- dont ship binaries in /usr/share
+
+* Thu Nov 20 2003 Panu Matilainen <pmatilai at welho.com> 0:2.4.2.4-0.fdr.2
+- add missing buildrequires: python-devel, wxGTK2-gl
+
+* Sun Nov 02 2003 Panu Matilainen <pmatilai at welho.com> 0:2.4.2.4-0.fdr.1
+- Initial RPM release.
+~



From fedora-extras-commits at redhat.com  Wed Apr 19 02:52:45 2006
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Tue, 18 Apr 2006 19:52:45 -0700
Subject: rpms/wxPythonGTK2/FC-4 wxPython.spec,1.9,NONE
Message-ID: <200604190252.k3J2ql77008648@cvs-int.fedora.redhat.com>

Author: mattdm

Update of /cvs/extras/rpms/wxPythonGTK2/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8625

Removed Files:
	wxPython.spec 
Log Message:
renaming back to wxPython



--- wxPython.spec DELETED ---



From fedora-extras-commits at redhat.com  Wed Apr 19 02:56:48 2006
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Tue, 18 Apr 2006 19:56:48 -0700
Subject: rpms/wxPython/FC-4 Makefile,1.3,1.4
Message-ID: <200604190256.k3J2uoDN008899@cvs-int.fedora.redhat.com>

Author: mattdm

Update of /cvs/extras/rpms/wxPython/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8875

Added Files:
	Makefile 
Log Message:
readding missing makefile



Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	19 Apr 2006 02:56:48 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: wxPython
+# $Id$
+NAME := wxPython
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)



From fedora-extras-commits at redhat.com  Wed Apr 19 06:35:53 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 18 Apr 2006 23:35:53 -0700
Subject: rpms/perl-HTML-Template-Expr/FC-4 .cvsignore, 1.4,
	1.5 perl-HTML-Template-Expr.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <200604190635.k3J6ZtoK018890@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-HTML-Template-Expr/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18837/FC-4

Modified Files:
	.cvsignore perl-HTML-Template-Expr.spec sources 
Log Message:
* Wed Apr 19 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.07-1
- 0.07.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Mar 2006 08:31:00 -0000	1.4
+++ .cvsignore	19 Apr 2006 06:35:53 -0000	1.5
@@ -1 +1 @@
-HTML-Template-Expr-0.06.tar.gz
+HTML-Template-Expr-0.07.tar.gz


Index: perl-HTML-Template-Expr.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/FC-4/perl-HTML-Template-Expr.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-HTML-Template-Expr.spec	4 Mar 2006 08:31:00 -0000	1.4
+++ perl-HTML-Template-Expr.spec	19 Apr 2006 06:35:53 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-HTML-Template-Expr
-Version:        0.06
+Version:        0.07
 Release:        1%{?dist}
 Summary:        Expression support extension for HTML::Template
 
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Wed Apr 19 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.07-1
+- 0.07.
+
 * Sat Mar  4 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.06-1
 - 0.06.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Mar 2006 08:31:00 -0000	1.4
+++ sources	19 Apr 2006 06:35:53 -0000	1.5
@@ -1 +1 @@
-1a7a6b908d00fc71567d9c57708a7633  HTML-Template-Expr-0.06.tar.gz
+717ea56c2244b6e2d26a0e477a4d069c  HTML-Template-Expr-0.07.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 19 06:35:54 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 18 Apr 2006 23:35:54 -0700
Subject: rpms/perl-HTML-Template-Expr/FC-5 .cvsignore, 1.4,
	1.5 perl-HTML-Template-Expr.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <200604190635.k3J6ZuYp018896@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-HTML-Template-Expr/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18837/FC-5

Modified Files:
	.cvsignore perl-HTML-Template-Expr.spec sources 
Log Message:
* Wed Apr 19 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.07-1
- 0.07.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Mar 2006 08:31:06 -0000	1.4
+++ .cvsignore	19 Apr 2006 06:35:54 -0000	1.5
@@ -1 +1 @@
-HTML-Template-Expr-0.06.tar.gz
+HTML-Template-Expr-0.07.tar.gz


Index: perl-HTML-Template-Expr.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/FC-5/perl-HTML-Template-Expr.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-HTML-Template-Expr.spec	4 Mar 2006 08:31:06 -0000	1.4
+++ perl-HTML-Template-Expr.spec	19 Apr 2006 06:35:54 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-HTML-Template-Expr
-Version:        0.06
+Version:        0.07
 Release:        1%{?dist}
 Summary:        Expression support extension for HTML::Template
 
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Wed Apr 19 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.07-1
+- 0.07.
+
 * Sat Mar  4 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.06-1
 - 0.06.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Mar 2006 08:31:06 -0000	1.4
+++ sources	19 Apr 2006 06:35:54 -0000	1.5
@@ -1 +1 @@
-1a7a6b908d00fc71567d9c57708a7633  HTML-Template-Expr-0.06.tar.gz
+717ea56c2244b6e2d26a0e477a4d069c  HTML-Template-Expr-0.07.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 19 06:35:55 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 18 Apr 2006 23:35:55 -0700
Subject: rpms/perl-HTML-Template-Expr/devel .cvsignore, 1.4,
	1.5 perl-HTML-Template-Expr.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <200604190635.k3J6ZvkG018902@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-HTML-Template-Expr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18837/devel

Modified Files:
	.cvsignore perl-HTML-Template-Expr.spec sources 
Log Message:
* Wed Apr 19 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.07-1
- 0.07.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Mar 2006 08:31:06 -0000	1.4
+++ .cvsignore	19 Apr 2006 06:35:54 -0000	1.5
@@ -1 +1 @@
-HTML-Template-Expr-0.06.tar.gz
+HTML-Template-Expr-0.07.tar.gz


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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-HTML-Template-Expr.spec	4 Mar 2006 08:31:06 -0000	1.4
+++ perl-HTML-Template-Expr.spec	19 Apr 2006 06:35:54 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-HTML-Template-Expr
-Version:        0.06
+Version:        0.07
 Release:        1%{?dist}
 Summary:        Expression support extension for HTML::Template
 
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Wed Apr 19 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.07-1
+- 0.07.
+
 * Sat Mar  4 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.06-1
 - 0.06.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Mar 2006 08:31:06 -0000	1.4
+++ sources	19 Apr 2006 06:35:54 -0000	1.5
@@ -1 +1 @@
-1a7a6b908d00fc71567d9c57708a7633  HTML-Template-Expr-0.06.tar.gz
+717ea56c2244b6e2d26a0e477a4d069c  HTML-Template-Expr-0.07.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 19 07:05:24 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Wed, 19 Apr 2006 00:05:24 -0700
Subject: rpms/firestarter/devel firestarter.spec,1.19,1.20
Message-ID: <200604190705.k3J75QbM021480@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/firestarter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21417

Modified Files:
	firestarter.spec 
Log Message:
sync w/ fc-5 changes




Index: firestarter.spec
===================================================================
RCS file: /cvs/extras/rpms/firestarter/devel/firestarter.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- firestarter.spec	17 Feb 2006 20:16:50 -0000	1.19
+++ firestarter.spec	19 Apr 2006 07:05:24 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		firestarter
 Version:	1.0.3
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	Firewall tool for GNOME
 
 Group:		Applications/Internet
@@ -12,7 +12,8 @@
 Patch0:		firestarter-1.0.3-pam.patch
 Patch1:		firestarter-1.0.3-services.patch
 Patch2:		firestarter-1.0.3-nobrowser.patch
-Patch3:		firestarter-1.0.3-nonroutable.patch      
+Patch3:		firestarter-1.0.3-nonroutable.patch
+Patch4:		firestarter-1.0.3-multicast.patch      
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -42,6 +43,7 @@
 %patch1 -p1 -b .services
 %patch2 -p1 -b .nobrowser
 %patch3 -p1 -b .nonroutable
+%patch4 -p1 -b .multicast
 cp %{SOURCE1} ./fs-manual.pdf
 
 %build
@@ -161,6 +163,9 @@
 
 
 %changelog
+* Mon Apr 17 2006 Michael A. Peters <mpeters at mac.com> - 1.0.3-11
+- Patch4 - Fix bug #189067 (Avahi)
+
 * Fri Feb 17 2006 Michael A. Peters <mpeters at mac.com> - 1.0.3-10
 - Devel branch rebuild
 



From fedora-extras-commits at redhat.com  Wed Apr 19 07:08:41 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Wed, 19 Apr 2006 00:08:41 -0700
Subject: rpms/firestarter/devel firestarter-1.0.3-multicast.patch,NONE,1.1
Message-ID: <200604190708.k3J78hDE021763@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/firestarter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21621

Added Files:
	firestarter-1.0.3-multicast.patch 
Log Message:
patch to fix bug #189067


firestarter-1.0.3-multicast.patch:

--- NEW FILE firestarter-1.0.3-multicast.patch ---
diff -ur firestarter-1.0.3/src/netfilter-script.c firestarter-1.0.3-avahi/src/netfilter-script.c
--- firestarter-1.0.3/src/netfilter-script.c	2005-01-29 04:32:08.000000000 -0800
+++ firestarter-1.0.3-avahi/src/netfilter-script.c	2006-04-17 05:58:04.000000000 -0700
@@ -738,13 +738,13 @@
 			 "	fi\n"
 			 "fi\n\n");
 
-	fprintf (script, "# Block Multicast Traffic\n"
-	                 "#  Some cable/DSL providers require their clients to accept multicast transmissions\n"
-	                 "#  you should remove the following four rules if you are affected by multicasting\n"
-	                 "$IPT -A INPUT -s 224.0.0.0/8 -d 0/0 -j DROP\n"
-	                 "$IPT -A INPUT -s 0/0 -d 224.0.0.0/8 -j DROP\n"
-	                 "$IPT -A OUTPUT -s 224.0.0.0/8 -d 0/0 -j DROP\n"
-	                 "$IPT -A OUTPUT -s 0/0 -d 224.0.0.0/8 -j DROP\n\n");
+//	fprintf (script, "# Block Multicast Traffic\n"
+//	                 "#  Some cable/DSL providers require their clients to accept multicast transmissions\n"
+//	                 "#  you should remove the following four rules if you are affected by multicasting\n"
+//	                 "$IPT -A INPUT -s 224.0.0.0/8 -d 0/0 -j DROP\n"
+//	                 "$IPT -A INPUT -s 0/0 -d 224.0.0.0/8 -j DROP\n"
+//	                 "$IPT -A OUTPUT -s 224.0.0.0/8 -d 0/0 -j DROP\n"
+//	                 "$IPT -A OUTPUT -s 0/0 -d 224.0.0.0/8 -j DROP\n\n");
 
 	fprintf (script, "# Block Traffic with Stuffed Routing\n"
                          "#  Early versions of PUMP - (the DHCP client application included in RH / Mandrake) require\n"



From fedora-extras-commits at redhat.com  Wed Apr 19 07:53:02 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Wed, 19 Apr 2006 00:53:02 -0700
Subject: rpms/pan/devel .cvsignore, 1.3, 1.4 pan.spec, 1.7, 1.8 sources, 1.3,
	1.4 pan-0.14.0-default-editor-80839.patch, 1.1,
	NONE pan-0.14.2.91-gcc4-2.patch, 1.1,
	NONE pan-0.14.2.91-linewrap.patch, 1.1, NONE
Message-ID: <200604190753.k3J7r40P021948@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/pan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21927

Modified Files:
	.cvsignore pan.spec sources 
Removed Files:
	pan-0.14.0-default-editor-80839.patch 
	pan-0.14.2.91-gcc4-2.patch pan-0.14.2.91-linewrap.patch 
Log Message:
Updating to new beta releases of pan
removing old 0.14.2.91 files



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Jun 2005 19:44:17 -0000	1.3
+++ .cvsignore	19 Apr 2006 07:53:02 -0000	1.4
@@ -1 +1,2 @@
 pan-0.14.2.91.tar.bz2
+pan-0.93.tar.bz2


Index: pan.spec
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pan.spec	17 Feb 2006 20:30:55 -0000	1.7
+++ pan.spec	19 Apr 2006 07:53:02 -0000	1.8
@@ -1,21 +1,11 @@
 Summary: A GNOME/GTK+ news reader for X
 Name: pan
-Version: 0.14.2.91
-Release: 4%{?dist}
+Version: 0.93
+Release: 1%{?dist}
 Epoch: 1
 License: GPL
 Group: Applications/Internet
-Source0: http://pan.rebelbase.com/download/%{version}/%{name}-%{version}.tar.bz2
-#Source1: net-pan.desktop
-#Source2: http://www.gnetlibrary.org/src/gnet-%{gnet_vers}.tar.gz
-#Patch5: pan-0.12.1-browser.patch
-Patch7: pan-0.14.0-default-editor-80839.patch
-# disabled (see below)
-#Patch8: pan-0.14.2-gcc34.patch
-#Patch9: pan-0.14.2-gmime-crash-120007.patch
-#Patch10: pan-desktop-rh-119909.patch
-Patch11: pan-0.14.2.91-gcc4-2.patch
-Patch12: pan-0.14.2.91-linewrap.patch
+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: libxml2-devel >= 2.4.22
@@ -24,6 +14,7 @@
 BuildRequires: pcre-devel >= 4.0
 BuildRequires: gtkspell-devel >= 2.0.2
 BuildRequires: gettext
+BuildRequires: gmime-devel >= 2.1.0
 
 %description
 Pan is a newsreader which attempts to be pleasant to new and
@@ -37,17 +28,6 @@
 
 %prep
 %setup -q
-#%%patch5 -p1 -b .browser
-%patch7 -p1 -b .editor
-# this patch breaks pan (see bug 121103)
-## gcc-3.4 fix
-#%%patch8 -p1 -b .gcc34
-# fix gmime crash
-#%patch9 -p0 -b .crash
-# add rh defs to upstream desktop file
-#%patch10 -p1 -b .rh
-%patch11 -p1 -b .gcc4
-%patch12 -p0 -b .linewrap
 
 echo "StartupNotify=true" >> pan.desktop.in
 
@@ -77,12 +57,25 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS COPYING CREDITS ChangeLog README TODO ANNOUNCE.html
+%doc AUTHORS COPYING ChangeLog README TODO
 %{_bindir}/pan
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/fedora-pan.desktop
 
 %changelog
+* Wed Apr 19 2006 Michael A. Peters <mpeters at mac.com> - 1:0.93-1
+- Update to 0.93
+
+* Mon Apr 17 2006 Michael A. Peters <mpeters at mac.com> - 1:0.91-1
+- New upstream version - using spec file mods submitted by
+- Alan C. Sanderson with cleanup - Thanks :)
+- Closes bug 187874
+-
+- #* Tue Apr 04 2006 Alan C. Sanderson <Alan.C.Sanderson at gmail.com> - 1:0.90-1
+- Updated to 0.90.
+- Added gmime-devel >= 2.1.0 BuildRequires
+- Removed patches 7,11,12
+
 * Fri Feb 17 2006 Michael A. Peters <mpeters at mac.com> - 1:0.14.2.91-4
 - Devel branch rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Jun 2005 19:44:17 -0000	1.3
+++ sources	19 Apr 2006 07:53:02 -0000	1.4
@@ -1 +1 @@
-4770d899a1c1ba968ce96bc5aeb07b62  pan-0.14.2.91.tar.bz2
+ca870a8a182f68b299796d90906918ca  pan-0.93.tar.bz2


--- pan-0.14.0-default-editor-80839.patch DELETED ---


--- pan-0.14.2.91-gcc4-2.patch DELETED ---


--- pan-0.14.2.91-linewrap.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Apr 19 07:56:13 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Wed, 19 Apr 2006 00:56:13 -0700
Subject: rpms/gdesklets/FC-4 gdesklets.spec,1.7,1.8
Message-ID: <200604190756.k3J7uFEP022019@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22002

Modified Files:
	gdesklets.spec 
Log Message:

updated gdesklets.spec



Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-4/gdesklets.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gdesklets.spec	11 Apr 2006 20:06:20 -0000	1.7
+++ gdesklets.spec	19 Apr 2006 07:56:13 -0000	1.8
@@ -1,12 +1,12 @@
 Name:           gdesklets
 Version:        0.35.3
-Release:        4%{?dist}
+Release:        8%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
 License:        GPL
 
-URL:            http://gdesklets.gnomedesktop.org/
+URL:            http://www.gdesklets.org/
 Source0:        http://www.gdesklets.org/releases/gDesklets-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -14,17 +14,19 @@
 #############################################################
 #							    #
 # Starting from 0.35.x, gDesklets no longer requires GConf. #
+# Added some X development package to support modular X     #
 #							    #
 #############################################################
 
-BuildRequires:  python-devel >= 2.0.0, pyorbit-devel > 2.6.1, pygtk2-devel >= 2.4.0
+BuildRequires:  python-devel > 2.0.0, pyorbit-devel, pygtk2-devel > 2.4.0, 
 BuildRequires:  librsvg2-devel, libgtop2-devel >= 2.8.0, gettext   
+BuildRequires:  libXau-devel, libXdmcp-devel
 BuildRequires:  gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0, desktop-file-utils
 Requires:	gnome-python2-gconf >= 2.6.0
 Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
-Requires(post): desktop-file-utils
+#Requires(post): desktop-file-utils
 Requires(post): shared-mime-info
-Requires(postun): desktop-file-utils
+#Requires(postun): desktop-file-utils
 Requires(postun): shared-mime-info
 
 
@@ -69,12 +71,12 @@
 
 %post
 update-mime-database %{_datadir}/mime &> /dev/null || :
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+#update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %postun
 update-mime-database %{_datadir}/mime &> /dev/null || :
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+#update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %clean
@@ -93,15 +95,21 @@
 %{_mandir}/man1/*
 
 
+%changelog
+* Wed Apr 19 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-8
+- Remove conditional sign for pyorbit-devel
 
+* Mon Apr 03 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-7
+- Bump 
 
-%changelog
-* Tue Apr 11 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-4
-- Fixed versionning for pyorbit-devel
+* Mon Apr 03 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-6
+- Bump 
 
-* Tue Apr 11 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-3
-- Set greater than for pyorbit. For some reason, the package set
-  to equal instead of greater and equal.
+* Mon Apr 03 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-5
+- Ajusted pyorbit requirement for ppc64
+
+* Thu Jan 19 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-4
+- Rebuild for Fedora Extras 5
 
 * Thu Jan 19 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-2
 - Rebuilt
@@ -111,10 +119,24 @@
 
 * Mon Jan 16 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-1
 - Updated to 0.35.3
-- Removed thumbnail schema
+- Removed thumbmail
 - Removed patch, no longer needed
 
-* Wed Dec 14 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-22
+* Thu Jan 5 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-26.fc5
+- Minor rebuilt
+
+* Thu Jan 5 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-25.fc5
+- Rebuilt against libgtop2-devel
+- Changed url of the provider
+
+* Sun Dec 18 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-24.fc5
+- Added libXdmcp-devel on BuildRequires
+
+* Sun Dec 18 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-23.fc5
+- Added libXau-devel on BuildRequires
+
+* Wed Dec 14 2005 Luya Tshimbalanga
+ <luya_tfz at thefinalzone.com> - 0.35.2-22
 - Added desktop-file-utils for build requirement
 - Clean up
 



From fedora-extras-commits at redhat.com  Wed Apr 19 07:58:34 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Wed, 19 Apr 2006 00:58:34 -0700
Subject: rpms/gdesklets/FC-5 gdesklets.spec,1.14,1.15
Message-ID: <200604190758.k3J7wah3022086@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22069

Modified Files:
	gdesklets.spec 
Log Message:
gdeskets.spec updated


Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-5/gdesklets.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gdesklets.spec	11 Apr 2006 18:09:55 -0000	1.14
+++ gdesklets.spec	19 Apr 2006 07:58:34 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           gdesklets
 Version:        0.35.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
@@ -18,7 +18,7 @@
 #							    #
 #############################################################
 
-BuildRequires:  python-devel > 2.0.0, pyorbit-devel > 2.0.1, pygtk2-devel > 2.4.0, 
+BuildRequires:  python-devel > 2.0.0, pyorbit-devel, pygtk2-devel > 2.4.0, 
 BuildRequires:  librsvg2-devel, libgtop2-devel >= 2.8.0, gettext   
 BuildRequires:  libXau-devel, libXdmcp-devel
 BuildRequires:  gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0, desktop-file-utils
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Wed Apr 19 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-8
+- Remove conditional sign for pyorbit-devel
+
 * Mon Apr 03 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-7
 - Bump 
 



From fedora-extras-commits at redhat.com  Wed Apr 19 08:00:50 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Wed, 19 Apr 2006 01:00:50 -0700
Subject: rpms/gdesklets/devel gdesklets.spec,1.12,1.13
Message-ID: <200604190800.k3J80qGI022159@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22142

Modified Files:
	gdesklets.spec 
Log Message:
gdeskets.spec updated


Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/devel/gdesklets.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gdesklets.spec	11 Apr 2006 20:39:31 -0000	1.12
+++ gdesklets.spec	19 Apr 2006 08:00:50 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           gdesklets
 Version:        0.35.3
-Release:        4%{?dist}
+Release:        8%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
@@ -18,7 +18,7 @@
 #							    #
 #############################################################
 
-BuildRequires:  python-devel >= 2.0.0, pyorbit-devel >= 2.0.1, pygtk2-devel >= 2.4.0, 
+BuildRequires:  python-devel > 2.0.0, pyorbit-devel, pygtk2-devel > 2.4.0, 
 BuildRequires:  librsvg2-devel, libgtop2-devel >= 2.8.0, gettext   
 BuildRequires:  libXau-devel, libXdmcp-devel
 BuildRequires:  gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0, desktop-file-utils
@@ -96,8 +96,17 @@
 
 
 %changelog
-* Tue Apr 11 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-5
-- Rebuild for development
+* Wed Apr 19 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-8
+- Remove conditional sign for pyorbit-devel
+
+* Mon Apr 03 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-7
+- Bump 
+
+* Mon Apr 03 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-6
+- Bump 
+
+* Mon Apr 03 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-5
+- Ajusted pyorbit requirement for ppc64
 
 * Thu Jan 19 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-4
 - Rebuild for Fedora Extras 5



From fedora-extras-commits at redhat.com  Wed Apr 19 08:15:12 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Wed, 19 Apr 2006 01:15:12 -0700
Subject: rpms/gdesklets/FC-4 gdesklets.spec,1.8,1.9
Message-ID: <200604190815.k3J8FEWD024288@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24269

Modified Files:
	gdesklets.spec 
Log Message:
gdeskets.spec updated


Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-4/gdesklets.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gdesklets.spec	19 Apr 2006 07:56:13 -0000	1.8
+++ gdesklets.spec	19 Apr 2006 08:15:11 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           gdesklets
 Version:        0.35.3
-Release:        8%{?dist}
+Release:        8.1%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
@@ -20,7 +20,6 @@
 
 BuildRequires:  python-devel > 2.0.0, pyorbit-devel, pygtk2-devel > 2.4.0, 
 BuildRequires:  librsvg2-devel, libgtop2-devel >= 2.8.0, gettext   
-BuildRequires:  libXau-devel, libXdmcp-devel
 BuildRequires:  gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0, desktop-file-utils
 Requires:	gnome-python2-gconf >= 2.6.0
 Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
@@ -96,6 +95,9 @@
 
 
 %changelog
+* Wed Apr 19 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-8.1
+- Removed libXau-devel and libXdmcp-devel as they don't belong to FC-4
+
 * Wed Apr 19 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-8
 - Remove conditional sign for pyorbit-devel
 



From fedora-extras-commits at redhat.com  Wed Apr 19 09:34:09 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 02:34:09 -0700
Subject: status-report-scripts - Imported sources
Message-ID: <200604190934.k3J9Y95d001257@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1242

Log Message:
Add parseBZbugList.

Status:

Vendor Tag:	fedora
Release Tags:	start
		
N status-report-scripts/parseBZbugList

No conflicts created by this import




From fedora-extras-commits at redhat.com  Wed Apr 19 09:49:12 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 02:49:12 -0700
Subject: status-report-scripts parseBZbugList,1.1.1.1,1.2
Message-ID: <200604190949.k3J9nCeU001302@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1284

Modified Files:
	parseBZbugList 
Log Message:
Parse wget output, parse all blockers, improve things...


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- parseBZbugList	19 Apr 2006 09:34:07 -0000	1.1.1.1
+++ parseBZbugList	19 Apr 2006 09:49:09 -0000	1.2
@@ -2,9 +2,10 @@
 # $Id$
 use strict;
 use Getopt::Long;
+use Date::Manip;
 
 my %opt;
-my @options = ( "help", "srpms=s@", "bzid=s" );
+my @options = ( "help", "core=s", "extras=s", "bzid=s", "o=s" );
 
 if( ! GetOptions( \%opt, @options ) ) { &usage(); }
 
@@ -12,12 +13,16 @@
 
 &usage() if defined $opt{'help'};
 
- at main::srpm = @{$opt{"srpms"}} if defined $opt{"srpms"};
-
-my $ACCEPT = 163779;
-my %BZ;
+my $FE_NEW = 163776;
+my $FE_REVIEW = 163778;
+my $FE_ACCEPT = 163779;
+my %BZN;
+my %BZR;
+my %BZA;
+my %CORE;
 my %SRPMS;
 my %NAME;
+my %OWN;
 if (defined $opt{"bzid"}) {
   local *IN;
   open IN, $opt{"bzid"} or die "Couldn't open $opt{'bzid'} : $!";
@@ -28,19 +33,26 @@
   }
   close IN;
 }
-if ($#main::srpm >= 0) {
-  foreach my $f (@main::srpm) {
-    local *IN;
-    open IN, $f or die "Couldn't open $f : $!";
-    while ( <IN> ) {
-      next unless /^\[   \] (\S+)/;
-      my $file = $1;
-      my ($pkg) = $file =~ /^(.*)-[^-]+-[^-]+\.src\.rpm/;
-      die "Bad file: $file" if $pkg eq "";
-      $SRPMS{$pkg} = 1;
-    }
-    close IN;
+if (defined $opt{"o"}) {
+  local *IN;
+  open IN, $opt{"o"} or die "Couldn't open $opt{'o'} : $!";
+  # Fedora Extras|aalib|An ASCII art library|anvil at livna.org|extras-qa at fedoraproject.org|
+  while ( <IN> ) {
+    next if /^#/;
+    s/\s+$//;
+    my @F = split /\|/;
+    $OWN{$F[1]} = \@F;
   }
+  close IN;
+}
+if (defined $opt{"extras"}) {
+  &grabRepoList($opt{"extras"}, \%SRPMS);
+}
+if (defined $opt{"core"}) {
+  &grabRepoList($opt{"core"}, \%CORE);
+}
+foreach my $k (keys %CORE) {
+  $SRPMS{$k} = 1;
 }
 while ( <> ) {
   s/[,\n]+$//;
@@ -72,12 +84,11 @@
     next;
   }
   $F[7] =~ s/["{}]//g;
+  $F[1] =~ s/["]//g;
+  $F[2] =~ s/["]//g;
+  $F[1] = ParseDate($F[1]);
+  $F[2] = ParseDate($F[2]);
   my @B = split /,/, $F[7];
-  my $block = 0;
-  foreach my $b (@B) {
-    $block = 1 if $b == $ACCEPT;
-  }
-  next if $block == 0;
   next if $F[8] =~ /TESTING-BUGSPAM/;
   if (defined $NAME{$F[0]}) {
     $F[8] = $NAME{$F[0]};
@@ -87,79 +98,156 @@
     $F[8] =~ s/^review\s+request:?\s+<?//i;
     $F[8] =~ s/[:.,>]?\s.*$//g;
   }
-  $BZ{$F[0]} = \@F;
+  my $block = 0;
+  my $bzb;
+  foreach my $b (@B) {
+    if ($b == $FE_NEW) {
+      $block += 1;
+      $bzb = \%BZN;
+    }
+    if ($b == $FE_REVIEW) {
+      $block += 1;
+      $bzb = \%BZR;
+    }
+    if ($b == $FE_ACCEPT) {
+      $block += 1;
+      $bzb = \%BZA;
+    }
+  }
+  if ($block > 1) {
+    print "Warning: bug $F[0] blocks several FE_ blockers.\n";
+    next;
+  }
+  $bzb->{$F[0]} = \@F if $block == 1;
 }
-&checkClosed();
-&checkOpen();
+print "=== About owners file ===\n\n";
+&checkOwners;
+print "\n\n=== About FE-ACCEPT packages ===\n";
+&checkAcceptClosed(\%BZA);
+&checkAcceptOpen(\%BZA);
+print "\n\n=== About FE-NEW packages ===\n";
+&checkNotClosed(\%BZN, "FE-NEW");
+print "\n\n=== About FE-REVIEW packages ===\n";
+&checkNotClosed(\%BZR, "FE-REVIEW");
 
 exit 0;
 
-sub checkClosed {
+sub checkOwners {
+  my %O;
+  my $orphan = 0;
+  my $cnt = 0;
+  foreach my $k (keys %OWN) {
+    my $a = $OWN{$k};
+    next if $$a[0] ne "Fedora Extras";
+    $cnt += 1;
+    if ($$a[3] eq 'extras-orphan at fedoraproject.org') {
+      $orphan += 1;
+      next;
+    }
+    $O{$$a[3]} += 1;
+  }
+  print "We have $cnt extras packages in owners file.\n";
+  print "There are $orphan orphans.\n";
+  my @TO = sort {$O{$b} <=> $O{$a}} keys %O;
+  print "\nTop 10 package owners:\n";
+  for my $i (0 .. 9) {
+    my $n = $TO[$i];
+    $n =~ s/\@/ at /;
+    $n =~ s/\./ dot /g;
+    printf "%-50s: %d\n", $n, $O{$TO[$i]};
+  }
+}
+
+sub checkAcceptClosed {
+  my ($BZ) = @_;
   my @BL;
+  my @BLO;
   my %O;
   my %R;
   my $cnt = 0;
   my $miss = 0;
-  foreach my $b (sort(keys %BZ)) {
-    my $a = $BZ{$b};
+  my $missO = 0;
+  foreach my $b (sort(keys %$BZ)) {
+    my $a = $BZ->{$b};
     next unless $$a[5] eq "\"CLOSED\"";
     my $pkg = $$a[8];
-    unless ($SRPMS{$pkg} == 1) {
+    unless ($SRPMS{$pkg} == 1 || defined($OWN{$pkg})) {
       $pkg =~ s/-[^-]+-[^-]+$//;
     }
-    unless ($SRPMS{$pkg} == 1) {
+    unless ($SRPMS{$pkg} == 1 || defined($OWN{$pkg})) {
       $pkg = $$a[8];
       $pkg =~ s/-[^-]+$//;
     }
-    unless ($SRPMS{$pkg} == 1) {
+    unless ($SRPMS{$pkg} == 1 || defined($OWN{$pkg})) {
       $pkg = lc $$a[8];
-      unless ($SRPMS{$pkg} == 1) {
+      unless ($SRPMS{$pkg} == 1 || defined($OWN{$pkg})) {
 	$pkg =~ s/-[^-]+-[^-]+$//;
       }
     }
-    unless ($SRPMS{$pkg} == 1) {
+    unless ($SRPMS{$pkg} == 1 || defined($OWN{$pkg})) {
       $pkg = lcfirst $$a[8];
     }
     if ($SRPMS{$pkg} == 1) {
       $R{$$a[3]} += 1;
       $O{$$a[4]} += 1;
       $cnt += 1;
+      if (!defined($CORE{$pkg}) && !defined($OWN{$pkg})) {
+	push @BLO, $b;
+	$missO += 1;
+      }
     } else {
       # print "Missing pkg: ", join(" ", @$a), "\n";
       push @BL, $b;
       $miss += 1;
+      if (defined $OWN{$pkg}) {
+	$R{$$a[3]} += 1;
+	$O{$$a[4]} += 1;
+	$cnt += 1;
+      } else {
+	push @BLO, $b;
+	$missO += 1;
+      }
     }
   }
-  print "\nWe have $miss accepted, closed packages where I'm unable to find
+  if ($miss > 0) {
+    print "\nWe have $miss accepted, closed packages where I'm unable to find
 the package in the development repo:\n\n";
-  print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
-    join(",", @BL), "\n";
+    print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
+      join(",", @BL), "\n";
+  }
+  if ($missO > 0) {
+    print "\nWe have $missO accepted, closed packages where I'm unable to find
+the package in the owners file:\n\n";
+    print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
+      join(",", @BLO), "\n";
+  }
   my @TR = sort {$R{$b} <=> $R{$a}} keys %R;
   my @TO = sort {$O{$b} <=> $O{$a}} keys %O;
   print "\nWe have $cnt accepted, closed package reviews\n";
-  print "\nTop 10 packagers:\n";
+  print "\nTop 10 BZ review requests submitters:\n";
   for my $i (0 .. 9) {
     my $n = $TO[$i];
     $n =~ s/["]//g;
     $n =~ s/\@/ at /;
-    $n =~ s/\./ dot /;
-    printf "%-40s: %d\n", $n, $O{$TO[$i]};
+    $n =~ s/\./ dot /g;
+    printf "%-50s: %d\n", $n, $O{$TO[$i]};
   }
-  print "\nTop 10 reviewers:\n";
+  print "\nTop 10 BZ review requests reviewers:\n";
   for my $i (0 .. 9) {
     my $n = $TR[$i];
     $n =~ s/["]//g;
     $n =~ s/\@/ at /;
-    $n =~ s/\./ dot /;
-    printf "%-40s: %d\n", $n, $R{$TR[$i]};
+    $n =~ s/\./ dot /g;
+    printf "%-50s: %d\n", $n, $R{$TR[$i]};
   }
 }
 
-sub checkOpen {
+sub checkAcceptOpen {
+  my ($BZ) = @_;
   my @BL;
   my $cnt = 0;
-  foreach my $b (sort(keys %BZ)) {
-    my $a = $BZ{$b};
+  foreach my $b (sort(keys %$BZ)) {
+    my $a = $BZ->{$b};
     next if $$a[5] eq "\"CLOSED\"";
     my $pkg = $$a[8];
     unless ($SRPMS{$pkg} == 1) {
@@ -180,6 +268,21 @@
     join(",", @BL), "\n";
 }
 
+sub checkNotClosed {
+  my ($BZ, $cur) = @_;
+  my @BL;
+  foreach my $b (sort(keys %$BZ)) {
+    my $a = $BZ->{$b};
+    next unless $$a[5] eq "\"CLOSED\"";
+    push @BL, $b;
+  }
+  return if $#BL < 0;
+  my $cnt = $#BL + 1;
+  print "\nWe have $cnt closed tickets still blocking $cur\n";
+  print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
+    join(",", @BL), "\n";
+}
+
 sub usage {
   print STDERR "Usage: $0 [options] <bugs list>
   where options are:
@@ -188,3 +291,17 @@
    -srpms <file>  list of SRPMS\n";
   exit 1;
 }
+
+sub grabRepoList {
+  my ($f, $h) = @_;
+  local *IN;
+  open IN, "wget -nv -O - $f|" or die "Failed to wget $f : $!";
+  while ( <IN> ) {
+    next unless /^<img \S+ alt=.\[   \].> <a href=.([^"]+)/;
+    my $file = $1;
+    my ($pkg) = $file =~ /^(.*)-[^-]+-[^-]+\.src\.rpm/;
+    die "Bad file: $file" if $pkg eq "";
+    $h->{$pkg} = 1;
+  }
+  close IN;
+}



From fedora-extras-commits at redhat.com  Wed Apr 19 09:50:47 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 02:50:47 -0700
Subject: status-report-scripts parseBZbugList,1.2,1.3
Message-ID: <200604190950.k3J9olXX001337@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1319

Modified Files:
	parseBZbugList 
Log Message:
Add more owners checks.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- parseBZbugList	19 Apr 2006 09:49:09 -0000	1.2
+++ parseBZbugList	19 Apr 2006 09:50:45 -0000	1.3
@@ -20,6 +20,7 @@
 my %BZR;
 my %BZA;
 my %CORE;
+my %EXTRAS;
 my %SRPMS;
 my %NAME;
 my %OWN;
@@ -46,11 +47,12 @@
   close IN;
 }
 if (defined $opt{"extras"}) {
-  &grabRepoList($opt{"extras"}, \%SRPMS);
+  &grabRepoList($opt{"extras"}, \%EXTRAS);
 }
 if (defined $opt{"core"}) {
   &grabRepoList($opt{"core"}, \%CORE);
 }
+%SRPMS = %EXTRAS;
 foreach my $k (keys %CORE) {
   $SRPMS{$k} = 1;
 }
@@ -136,15 +138,26 @@
   my %O;
   my $orphan = 0;
   my $cnt = 0;
+  my @NP;
+  my @NPC;
+  my @OE;
   foreach my $k (keys %OWN) {
     my $a = $OWN{$k};
     next if $$a[0] ne "Fedora Extras";
     $cnt += 1;
     if ($$a[3] eq 'extras-orphan at fedoraproject.org') {
       $orphan += 1;
+      push @OE, $k if defined $EXTRAS{$k};
       next;
     }
     $O{$$a[3]} += 1;
+    unless (defined $EXTRAS{$k}) {
+      if (defined $CORE{$k}) {
+	push @NPC, $k;
+      } else {
+	push @NP, $k;
+      }
+    }
   }
   print "We have $cnt extras packages in owners file.\n";
   print "There are $orphan orphans.\n";
@@ -156,6 +169,21 @@
     $n =~ s/\./ dot /g;
     printf "%-50s: %d\n", $n, $O{$TO[$i]};
   }
+  if ($#OE >= 0) {
+    $cnt = $#OE + 1;
+    print "\nWe have $cnt orphaned packages available in extras devel:\n";
+    print &toLine(join(" ", sort @OE)), "\n";
+  }
+  if ($#NP >= 0) {
+    $cnt = $#NP + 1;
+    print "\nWe have $cnt packages not available in extras devel:\n";
+    print &toLine(join(" ", sort @NP)), "\n";
+  }
+  if ($#NPC >= 0) {
+    $cnt = $#NPC + 1;
+    print "\nWe have $cnt packages that moved to core:\n";
+    print &toLine(join(" ", sort @NPC)), "\n";
+  }
 }
 
 sub checkAcceptClosed {
@@ -305,3 +333,20 @@
   }
   close IN;
 }
+
+sub toLine {
+  my ($s) = @_;
+  my $p1 = 0;
+  my $p2 = $p1 + 78;
+  while ($p2 < length($s)) {
+    my $p3 = rindex $s, " ", $p2;
+    if ($p3 < $p1) {
+      $p2 += 1;
+      next;
+    }
+    substr $s, $p3, 1, "\n";
+    $p1 = $p3 + 1;
+    $p2 = $p1 + 78;
+  }
+  return $s;
+}



From fedora-extras-commits at redhat.com  Wed Apr 19 09:51:38 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 02:51:38 -0700
Subject: status-report-scripts parseBZbugList,1.3,1.4
Message-ID: <200604190951.k3J9pcps001373@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1355

Modified Files:
	parseBZbugList 
Log Message:
Add more checks.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- parseBZbugList	19 Apr 2006 09:50:45 -0000	1.3
+++ parseBZbugList	19 Apr 2006 09:51:36 -0000	1.4
@@ -5,11 +5,16 @@
 use Date::Manip;
 
 my %opt;
-my @options = ( "help", "core=s", "extras=s", "bzid=s", "o=s" );
+my @options = ( "help", "core=s", "extras=s", "bzid=s", "o=s", "d=s" );
+
+$main::core = "http://mirrors.kernel.org/fedora/core/development/SRPMS/";
+$main::extras = "http://mirrors.kernel.org/fedora/extras/development/SRPMS/";
 
 if( ! GetOptions( \%opt, @options ) ) { &usage(); }
 
 # Override any default settings with arguments that the user has supplied
+$main::core = $opt{"core"} if defined $opt{"core"};
+$main::extras = $opt{"extras"} if defined $opt{"extras"};
 
 &usage() if defined $opt{'help'};
 
@@ -24,6 +29,7 @@
 my %SRPMS;
 my %NAME;
 my %OWN;
+my %DISCARD;
 if (defined $opt{"bzid"}) {
   local *IN;
   open IN, $opt{"bzid"} or die "Couldn't open $opt{'bzid'} : $!";
@@ -34,6 +40,15 @@
   }
   close IN;
 }
+if (defined $opt{"d"}) {
+  local *IN;
+  open IN, $opt{"d"} or die "Couldn't open $opt{'d'} : $!";
+  while ( <IN> ) {
+    s/\s+$//;
+    $DISCARD{$_} = 1;
+  }
+  close IN;
+}
 if (defined $opt{"o"}) {
   local *IN;
   open IN, $opt{"o"} or die "Couldn't open $opt{'o'} : $!";
@@ -42,15 +57,16 @@
     next if /^#/;
     s/\s+$//;
     my @F = split /\|/;
+    next if defined $DISCARD{$F[1]};
     $OWN{$F[1]} = \@F;
   }
   close IN;
 }
-if (defined $opt{"extras"}) {
-  &grabRepoList($opt{"extras"}, \%EXTRAS);
+if ($main::extras ne "") {
+  &grabRepoList($main::extras, \%EXTRAS);
 }
-if (defined $opt{"core"}) {
-  &grabRepoList($opt{"core"}, \%CORE);
+if ($main::core ne "") {
+  &grabRepoList($main::core, \%CORE);
 }
 %SRPMS = %EXTRAS;
 foreach my $k (keys %CORE) {
@@ -124,13 +140,19 @@
 }
 print "=== About owners file ===\n\n";
 &checkOwners;
+my $fourDaysAgo = DateCalc("4 days ago", "today");
+my $fourWeeksAgo = DateCalc("4 weeks ago", "today");
+my $eightWeeksAgo = DateCalc("8 weeks ago", "today");
 print "\n\n=== About FE-ACCEPT packages ===\n";
 &checkAcceptClosed(\%BZA);
 &checkAcceptOpen(\%BZA);
 print "\n\n=== About FE-NEW packages ===\n";
 &checkNotClosed(\%BZN, "FE-NEW");
+&checkLowActivity(\%BZN, "FE-NEW");
+#&checkNoActivity(\%BZN, "FE-NEW");
 print "\n\n=== About FE-REVIEW packages ===\n";
 &checkNotClosed(\%BZR, "FE-REVIEW");
+&checkLowActivity(\%BZR, "FE-REVIEW");
 
 exit 0;
 
@@ -224,9 +246,11 @@
 	$missO += 1;
       }
     } else {
-      # print "Missing pkg: ", join(" ", @$a), "\n";
-      push @BL, $b;
-      $miss += 1;
+      if (Date_Cmp($$a[2], $fourDaysAgo) < 0) {
+	# print "Missing pkg: ", join(" ", @$a), "\n";
+	push @BL, $b;
+	$miss += 1;
+      }
       if (defined $OWN{$pkg}) {
 	$R{$$a[3]} += 1;
 	$O{$$a[4]} += 1;
@@ -239,13 +263,13 @@
   }
   if ($miss > 0) {
     print "\nWe have $miss accepted, closed packages where I'm unable to find
-the package in the development repo:\n\n";
+the package in the development repo:\n";
     print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
       join(",", @BL), "\n";
   }
   if ($missO > 0) {
     print "\nWe have $missO accepted, closed packages where I'm unable to find
-the package in the owners file:\n\n";
+the package in the owners file:\n";
     print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
       join(",", @BLO), "\n";
   }
@@ -273,6 +297,7 @@
 sub checkAcceptOpen {
   my ($BZ) = @_;
   my @BL;
+  my @LATE;
   my $cnt = 0;
   foreach my $b (sort(keys %$BZ)) {
     my $a = $BZ->{$b};
@@ -288,12 +313,20 @@
       $cnt += 1;
       push @BL, $b;
     }
+    if (Date_Cmp($$a[2], $fourWeeksAgo) < 0) {
+      push @LATE, $b;
+    }
   }
   print "\nWe have $cnt accepted, open package reviews where the package
 appears to already be in the repo...\n";
-  print "\nAll open packages already available:\n";
   print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
     join(",", @BL), "\n";
+  if ($#LATE >= 0) {
+    $cnt = $#LATE + 1;
+    print "\nWe have $cnt accepted, open package reviews older than 4 weeks\n";
+    print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
+      join(",", @LATE), "\n";
+  }
 }
 
 sub checkNotClosed {
@@ -311,12 +344,64 @@
     join(",", @BL), "\n";
 }
 
+sub checkLowActivity {
+  my ($BZ, $cur) = @_;
+  my @BL;
+  my @LATE;
+  foreach my $b (sort(keys %$BZ)) {
+    my $a = $BZ->{$b};
+    next if $$a[5] eq "\"CLOSED\"";
+    if (Date_Cmp($$a[2], $fourWeeksAgo) < 0) {
+      if (Date_Cmp($$a[2], $eightWeeksAgo) < 0) {
+	push @LATE, $b;
+      } else {
+	push @BL, $b;
+      }
+    }
+  }
+  if ($#LATE >= 0) {
+    my $cnt = $#LATE + 1;
+    print "\nWe have $cnt $cur tickets with no activity in eight weeks\n";
+    print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
+      join(",", @LATE), "\n";
+  }
+  if ($#BL >= 0) {
+    my $cnt = $#BL + 1;
+    print "\nWe have $cnt $cur tickets with no activity in four weeks\n";
+    print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
+      join(",", @BL), "\n";
+  }
+}
+
+sub checkNoActivity {
+  my ($BZ, $cur) = @_;
+  my @BL;
+  foreach my $b (sort(keys %$BZ)) {
+    my $a = $BZ->{$b};
+    next if $$a[5] eq "\"CLOSED\"";
+    next if $$a[1] ne $$a[2];
+    if (Date_Cmp($$a[2], $eightWeeksAgo) < 0) {
+      push @BL, $b;
+    }
+  }
+  if ($#BL >= 0) {
+    my $cnt = $#BL + 1;
+    print "\nWe have $cnt $cur tickets 8 weeks old with no comments\n";
+    print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
+      join(",", @BL), "\n";
+  }
+}
+
 sub usage {
   print STDERR "Usage: $0 [options] <bugs list>
   where options are:
    -help          this help note
-   -bzid  <file>  list associating bz ticket number with package name
-   -srpms <file>  list of SRPMS\n";
+   -bzid <file>   list associating bz ticket number with package name
+   -extras <url>  Fedora extras SRPMS repo
+                  [$main::extras]
+   -core <url>    Fedora core SRPMS repo
+                  [$main::core]
+   -o <file>      owners.list file\n";
   exit 1;
 }
 



From fedora-extras-commits at redhat.com  Wed Apr 19 09:52:37 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 02:52:37 -0700
Subject: status-report-scripts parseBZbugList,1.4,1.5
Message-ID: <200604190952.k3J9qbkv001431@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1413

Modified Files:
	parseBZbugList 
Log Message:
Print number of open tickets.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- parseBZbugList	19 Apr 2006 09:51:36 -0000	1.4
+++ parseBZbugList	19 Apr 2006 09:52:35 -0000	1.5
@@ -332,13 +332,18 @@
 sub checkNotClosed {
   my ($BZ, $cur) = @_;
   my @BL;
+  my $cnt = 0;
   foreach my $b (sort(keys %$BZ)) {
     my $a = $BZ->{$b};
-    next unless $$a[5] eq "\"CLOSED\"";
-    push @BL, $b;
+    if ($$a[5] eq "\"CLOSED\"") {
+      push @BL, $b;
+      next;
+    }
+    $cnt += 1;
   }
+  print "\nWe have $cnt open tickets in $cur\n";
   return if $#BL < 0;
-  my $cnt = $#BL + 1;
+  $cnt = $#BL + 1;
   print "\nWe have $cnt closed tickets still blocking $cur\n";
   print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
     join(",", @BL), "\n";



From fedora-extras-commits at redhat.com  Wed Apr 19 09:53:36 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 02:53:36 -0700
Subject: status-report-scripts parseBZbugList,1.5,1.6
Message-ID: <200604190953.k3J9rapg001470@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1452

Modified Files:
	parseBZbugList 
Log Message:
Display more info.  Handle NEEDSPONSOR.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- parseBZbugList	19 Apr 2006 09:52:35 -0000	1.5
+++ parseBZbugList	19 Apr 2006 09:53:34 -0000	1.6
@@ -21,7 +21,9 @@
 my $FE_NEW = 163776;
 my $FE_REVIEW = 163778;
 my $FE_ACCEPT = 163779;
+my $FE_NEEDSPONSOR = 177841;
 my %BZN;
+my %BZS;
 my %BZR;
 my %BZA;
 my %CORE;
@@ -117,6 +119,7 @@
     $F[8] =~ s/[:.,>]?\s.*$//g;
   }
   my $block = 0;
+  my $sponsor = 0;
   my $bzb;
   foreach my $b (@B) {
     if ($b == $FE_NEW) {
@@ -131,12 +134,20 @@
       $block += 1;
       $bzb = \%BZA;
     }
+    if ($b == $FE_NEEDSPONSOR) {
+      $sponsor = 1;
+    }
   }
   if ($block > 1) {
     print "Warning: bug $F[0] blocks several FE_ blockers.\n";
     next;
   }
-  $bzb->{$F[0]} = \@F if $block == 1;
+  if ($block == 1) {
+    $bzb->{$F[0]} = \@F;
+    if ($sponsor == 1 && $bzb == \%BZN) {
+      $BZS{$F[0]} = \@F;
+    }
+  }
 }
 print "=== About owners file ===\n\n";
 &checkOwners;
@@ -146,13 +157,18 @@
 print "\n\n=== About FE-ACCEPT packages ===\n";
 &checkAcceptClosed(\%BZA);
 &checkAcceptOpen(\%BZA);
+print "\n\n=== About FE-REVIEW packages ===\n";
+&countOpen(\%BZR, "FE-REVIEW");
+&checkNotClosed(\%BZR, "FE-REVIEW");
+&checkLowActivity(\%BZR, "FE-REVIEW");
 print "\n\n=== About FE-NEW packages ===\n";
+&countOpen(\%BZN, "FE-NEW");
 &checkNotClosed(\%BZN, "FE-NEW");
 &checkLowActivity(\%BZN, "FE-NEW");
 #&checkNoActivity(\%BZN, "FE-NEW");
-print "\n\n=== About FE-REVIEW packages ===\n";
-&checkNotClosed(\%BZR, "FE-REVIEW");
-&checkLowActivity(\%BZR, "FE-REVIEW");
+print "\n\n=== About FE-NEEDSPONSOR packages ===\n";
+&countOpen(\%BZS, "FE-NEEDSPONSOR");
+&checkLowActivity(\%BZS, "FE-NEEDSPONSOR");
 
 exit 0;
 
@@ -191,16 +207,20 @@
     $n =~ s/\./ dot /g;
     printf "%-50s: %d\n", $n, $O{$TO[$i]};
   }
+  if ($#NP >= 0) {
+    $cnt = $#NP + 1;
+    print "\nWe have $cnt packages not available in extras devel:\n";
+    foreach my $p (sort @NP) {
+      my $a = $OWN{$p};
+      my ($owner) = $$a[3] =~ /^([^@]+)/;
+      printf "%-40s %s\n", $p, $owner;
+    }
+  }
   if ($#OE >= 0) {
     $cnt = $#OE + 1;
     print "\nWe have $cnt orphaned packages available in extras devel:\n";
     print &toLine(join(" ", sort @OE)), "\n";
   }
-  if ($#NP >= 0) {
-    $cnt = $#NP + 1;
-    print "\nWe have $cnt packages not available in extras devel:\n";
-    print &toLine(join(" ", sort @NP)), "\n";
-  }
   if ($#NPC >= 0) {
     $cnt = $#NPC + 1;
     print "\nWe have $cnt packages that moved to core:\n";
@@ -262,16 +282,14 @@
     }
   }
   if ($miss > 0) {
-    print "\nWe have $miss accepted, closed packages where I'm unable to find
-the package in the development repo:\n";
-    print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
-      join(",", @BL), "\n";
+    print "\nWe have $miss accepted, closed packages where I'm unable to ",
+      "find the package in the development repo:\n";
+    &displayBL(\@BL, $BZ);
   }
   if ($missO > 0) {
-    print "\nWe have $missO accepted, closed packages where I'm unable to find
-the package in the owners file:\n";
-    print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
-      join(",", @BLO), "\n";
+    print "\nWe have $missO accepted, closed packages where I'm unable to ",
+      "find the package in the owners file:\n";
+    &displayBL(\@BLO, $BZ);
   }
   my @TR = sort {$R{$b} <=> $R{$a}} keys %R;
   my @TO = sort {$O{$b} <=> $O{$a}} keys %O;
@@ -317,36 +335,39 @@
       push @LATE, $b;
     }
   }
-  print "\nWe have $cnt accepted, open package reviews where the package
-appears to already be in the repo...\n";
-  print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
-    join(",", @BL), "\n";
+  print "\nWe have $cnt accepted, open package reviews where the package ",
+    "appears to already be in the repo...\n";
+  &displayBL(\@BL, $BZ);
   if ($#LATE >= 0) {
     $cnt = $#LATE + 1;
     print "\nWe have $cnt accepted, open package reviews older than 4 weeks\n";
-    print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
-      join(",", @LATE), "\n";
+    &displayBL(\@LATE, $BZ);
   }
 }
 
-sub checkNotClosed {
+sub countOpen {
   my ($BZ, $cur) = @_;
-  my @BL;
   my $cnt = 0;
   foreach my $b (sort(keys %$BZ)) {
     my $a = $BZ->{$b};
-    if ($$a[5] eq "\"CLOSED\"") {
-      push @BL, $b;
-      next;
-    }
+    next if $$a[5] eq "\"CLOSED\"";
     $cnt += 1;
   }
   print "\nWe have $cnt open tickets in $cur\n";
+}
+
+sub checkNotClosed {
+  my ($BZ, $cur) = @_;
+  my @BL;
+  foreach my $b (sort(keys %$BZ)) {
+    my $a = $BZ->{$b};
+    next unless $$a[5] eq "\"CLOSED\"";
+    push @BL, $b;
+  }
   return if $#BL < 0;
-  $cnt = $#BL + 1;
+  my $cnt = $#BL + 1;
   print "\nWe have $cnt closed tickets still blocking $cur\n";
-  print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
-    join(",", @BL), "\n";
+  &displayBL(\@BL, $BZ);
 }
 
 sub checkLowActivity {
@@ -367,14 +388,12 @@
   if ($#LATE >= 0) {
     my $cnt = $#LATE + 1;
     print "\nWe have $cnt $cur tickets with no activity in eight weeks\n";
-    print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
-      join(",", @LATE), "\n";
+    &displayBL(\@LATE, $BZ);
   }
   if ($#BL >= 0) {
     my $cnt = $#BL + 1;
     print "\nWe have $cnt $cur tickets with no activity in four weeks\n";
-    print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
-      join(",", @BL), "\n";
+    &displayBL(\@BL, $BZ);
   }
 }
 
@@ -392,8 +411,7 @@
   if ($#BL >= 0) {
     my $cnt = $#BL + 1;
     print "\nWe have $cnt $cur tickets 8 weeks old with no comments\n";
-    print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
-      join(",", @BL), "\n";
+    &displayBL(\@BL, $BZ);
   }
 }
 
@@ -406,6 +424,7 @@
                   [$main::extras]
    -core <url>    Fedora core SRPMS repo
                   [$main::core]
+   -d <file>      list of discarded packages
    -o <file>      owners.list file\n";
   exit 1;
 }
@@ -440,3 +459,14 @@
   }
   return $s;
 }
+
+sub displayBL {
+  my ($BL, $BZ) = @_;
+  print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
+    join(",", @$BL), "\n";
+  foreach my $b (@$BL) {
+    my $a = $BZ->{$b};
+    my ($owner) = $$a[4] =~ /^.([^@]+)/;
+    printf "  %-40s %s\n", $$a[8], $owner;
+  }
+}



From fedora-extras-commits at redhat.com  Wed Apr 19 09:54:25 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 02:54:25 -0700
Subject: status-report-scripts parseBZbugList,1.6,1.7
Message-ID: <200604190954.k3J9sPWR001507@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1489

Modified Files:
	parseBZbugList 
Log Message:
Add -extras_r.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- parseBZbugList	19 Apr 2006 09:53:34 -0000	1.6
+++ parseBZbugList	19 Apr 2006 09:54:23 -0000	1.7
@@ -5,16 +5,19 @@
 use Date::Manip;
 
 my %opt;
-my @options = ( "help", "core=s", "extras=s", "bzid=s", "o=s", "d=s" );
+my @options = ( "help", "core=s", "extras=s", "bzid=s", "o=s", "d=s",
+		"extras_r=s" );
 
 $main::core = "http://mirrors.kernel.org/fedora/core/development/SRPMS/";
 $main::extras = "http://mirrors.kernel.org/fedora/extras/development/SRPMS/";
+$main::extras_r = "http://mirrors.kernel.org/fedora/extras/4/SRPMS/";
 
 if( ! GetOptions( \%opt, @options ) ) { &usage(); }
 
 # Override any default settings with arguments that the user has supplied
 $main::core = $opt{"core"} if defined $opt{"core"};
 $main::extras = $opt{"extras"} if defined $opt{"extras"};
+$main::extras_r = $opt{"extras_r"} if defined $opt{"extras_r"};
 
 &usage() if defined $opt{'help'};
 
@@ -28,6 +31,7 @@
 my %BZA;
 my %CORE;
 my %EXTRAS;
+my %EXTRAS_R;
 my %SRPMS;
 my %NAME;
 my %OWN;
@@ -67,6 +71,9 @@
 if ($main::extras ne "") {
   &grabRepoList($main::extras, \%EXTRAS);
 }
+if ($main::extras_r ne "") {
+  &grabRepoList($main::extras_r, \%EXTRAS_R);
+}
 if ($main::core ne "") {
   &grabRepoList($main::core, \%CORE);
 }
@@ -177,6 +184,7 @@
   my $orphan = 0;
   my $cnt = 0;
   my @NP;
+  my @NP_R;
   my @NPC;
   my @OE;
   foreach my $k (keys %OWN) {
@@ -193,7 +201,11 @@
       if (defined $CORE{$k}) {
 	push @NPC, $k;
       } else {
-	push @NP, $k;
+	if (defined $EXTRAS_R{$k}) {
+	  push @NP_R, $k;
+	} else {
+	  push @NP, $k;
+	}
       }
     }
   }
@@ -209,13 +221,23 @@
   }
   if ($#NP >= 0) {
     $cnt = $#NP + 1;
-    print "\nWe have $cnt packages not available in extras devel:\n";
+    print "\nWe have $cnt packages not available in extras devel or release:\n";
     foreach my $p (sort @NP) {
       my $a = $OWN{$p};
       my ($owner) = $$a[3] =~ /^([^@]+)/;
       printf "%-40s %s\n", $p, $owner;
     }
   }
+  if ($#NP_R >= 0) {
+    $cnt = $#NP_R + 1;
+    print "\nWe have $cnt packages not available in extras devel ";
+    print "but present in release:\n";
+    foreach my $p (sort @NP_R) {
+      my $a = $OWN{$p};
+      my ($owner) = $$a[3] =~ /^([^@]+)/;
+      printf "%-40s %s\n", $p, $owner;
+    }
+  }
   if ($#OE >= 0) {
     $cnt = $#OE + 1;
     print "\nWe have $cnt orphaned packages available in extras devel:\n";
@@ -417,15 +439,17 @@
 
 sub usage {
   print STDERR "Usage: $0 [options] <bugs list>
-  where options are:
-   -help          this help note
-   -bzid <file>   list associating bz ticket number with package name
-   -extras <url>  Fedora extras SRPMS repo
+ where options are:
+  -help           this help note
+  -bzid <file>    list associating bz ticket number with package name
+  -extras <url>   Fedora extras SRPMS development repo
                   [$main::extras]
-   -core <url>    Fedora core SRPMS repo
+  -extras_r <url> Fedora extras SRPMS release repo
+                  [$main::extras_r]
+  -core <url>     Fedora core SRPMS repo
                   [$main::core]
-   -d <file>      list of discarded packages
-   -o <file>      owners.list file\n";
+  -d <file>       list of discarded packages
+  -o <file>       owners.list file\n";
   exit 1;
 }
 



From fedora-extras-commits at redhat.com  Wed Apr 19 09:55:26 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 02:55:26 -0700
Subject: status-report-scripts parseBZbugList,1.7,1.8
Message-ID: <200604190955.k3J9tQmu001538@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1520

Modified Files:
	parseBZbugList 
Log Message:
Change output for wiki.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- parseBZbugList	19 Apr 2006 09:54:23 -0000	1.7
+++ parseBZbugList	19 Apr 2006 09:55:23 -0000	1.8
@@ -36,6 +36,13 @@
 my %NAME;
 my %OWN;
 my %DISCARD;
+my %PKG_LIST;
+my %BUG_LIST;
+my %OWNER_LIST;
+my %COUNT_LIST;
+my %OWNER_CNT;
+my %BZOWN_CNT;
+my %BZREV_CNT;
 if (defined $opt{"bzid"}) {
   local *IN;
   open IN, $opt{"bzid"} or die "Couldn't open $opt{'bzid'} : $!";
@@ -117,6 +124,9 @@
   $F[2] = ParseDate($F[2]);
   my @B = split /,/, $F[7];
   next if $F[8] =~ /TESTING-BUGSPAM/;
+  $F[9] = $F[8];
+  $F[9] =~ s/^["]+//;
+  $F[9] =~ s/["]+$//;
   if (defined $NAME{$F[0]}) {
     $F[8] = $NAME{$F[0]};
   } else {
@@ -156,31 +166,31 @@
     }
   }
 }
-print "=== About owners file ===\n\n";
 &checkOwners;
 my $fourDaysAgo = DateCalc("4 days ago", "today");
 my $fourWeeksAgo = DateCalc("4 weeks ago", "today");
 my $eightWeeksAgo = DateCalc("8 weeks ago", "today");
-print "\n\n=== About FE-ACCEPT packages ===\n";
 &checkAcceptClosed(\%BZA);
 &checkAcceptOpen(\%BZA);
-print "\n\n=== About FE-REVIEW packages ===\n";
 &countOpen(\%BZR, "FE-REVIEW");
 &checkNotClosed(\%BZR, "FE-REVIEW");
 &checkLowActivity(\%BZR, "FE-REVIEW");
-print "\n\n=== About FE-NEW packages ===\n";
 &countOpen(\%BZN, "FE-NEW");
 &checkNotClosed(\%BZN, "FE-NEW");
 &checkLowActivity(\%BZN, "FE-NEW");
 #&checkNoActivity(\%BZN, "FE-NEW");
-print "\n\n=== About FE-NEEDSPONSOR packages ===\n";
 &countOpen(\%BZS, "FE-NEEDSPONSOR");
 &checkLowActivity(\%BZS, "FE-NEEDSPONSOR");
+print "[[TableOfContents]]\n\n= FE Package Status of <date> =\n";
+&displayOwnersWiki;
+&displayAcceptWiki(\%BZA);
+&displayNewReviewWiki(\%BZR, "FE-REVIEW");
+&displayNewReviewWiki(\%BZN, "FE-NEW");
+&displayNewReviewWiki(\%BZS, "FE-NEEDSPONSOR");
 
 exit 0;
 
 sub checkOwners {
-  my %O;
   my $orphan = 0;
   my $cnt = 0;
   my @NP;
@@ -196,7 +206,7 @@
       push @OE, $k if defined $EXTRAS{$k};
       next;
     }
-    $O{$$a[3]} += 1;
+    $OWNER_CNT{$$a[3]} += 1;
     unless (defined $EXTRAS{$k}) {
       if (defined $CORE{$k}) {
 	push @NPC, $k;
@@ -209,56 +219,94 @@
       }
     }
   }
-  print "We have $cnt extras packages in owners file.\n";
-  print "There are $orphan orphans.\n";
-  my @TO = sort {$O{$b} <=> $O{$a}} keys %O;
-  print "\nTop 10 package owners:\n";
+  my @TO = sort {$OWNER_CNT{$b} <=> $OWNER_CNT{$a}} keys %OWNER_CNT;
+  $COUNT_LIST{"owner"} = $cnt;
+  $COUNT_LIST{"orphan"} = $orphan;
+  $OWNER_LIST{"package"} = \@TO;
+  $PKG_LIST{"NotDevelNotRel"} = \@NP;
+  $PKG_LIST{"NotDevel"} = \@NP_R;
+  $PKG_LIST{"OrphanDevel"} = \@OE;
+  $PKG_LIST{"MovedToCore"} = \@NPC;
+}
+
+sub displayOwnersWiki {
+  print "== About owners file ==\n\n";
+  print "=== Package count ===\n\n";
+  print "We have $COUNT_LIST{'owner'} extras packages in owners file.[[BR]]\n";
+  print "There are $COUNT_LIST{'orphan'} orphans.\n";
+  print "\n=== Top 10 package owners ===\n";
+  my $a = $OWNER_LIST{"package"};
+  &displayOwnerCntWiki($a, \%OWNER_CNT);
+  print "\n=== Packages not present in the development repo ===\n";
+  $a = $PKG_LIST{"NotDevelNotRel"};
+  if ($#$a >= 0) {
+    my $cnt = $#$a + 1;
+    print "\nWe have $cnt packages not available in extras devel or release:\n";
+    &displayPkgListByOwnerWiki($a);
+  }
+  $a = $PKG_LIST{"NotDevel"};
+  if ($#$a >= 0) {
+    my $cnt = $#$a + 1;
+    print "\nWe have $cnt packages not available in extras devel ";
+    print "but present in release:\n";
+    &displayPkgListByOwnerWiki($a);
+  }
+  $a = $PKG_LIST{"OrphanDevel"};
+  print "\n=== Orphaned packages present in the development repo ===\n";
+  if ($#$a >= 0) {
+    my $cnt = $#$a + 1;
+    print "\nWe have $cnt orphaned packages available in extras devel:{{{\n";
+    print &toLine(join(" ", sort @$a)), "\n";
+    print "}}}\n";
+  }
+  print "\n=== FE packages that moved to Fedora Core ===\n";
+  $a = $PKG_LIST{"MovedToCore"};
+  if ($#$a >= 0) {
+    my $cnt = $#$a + 1;
+    print "\nWe have $cnt packages that moved to core:{{{\n";
+    print &toLine(join(" ", sort @$a)), "\n";
+    print "}}}\n";
+  }
+}
+
+sub displayOwnerCntWiki {
+  my ($a, $c) = @_;
   for my $i (0 .. 9) {
-    my $n = $TO[$i];
+    my $n = $$a[$i];
+    $n =~ s/["]//g;
     $n =~ s/\@/ at /;
     $n =~ s/\./ dot /g;
-    printf "%-50s: %d\n", $n, $O{$TO[$i]};
+    print "||$n||$c->{$$a[$i]}||\n";
   }
-  if ($#NP >= 0) {
-    $cnt = $#NP + 1;
-    print "\nWe have $cnt packages not available in extras devel or release:\n";
-    foreach my $p (sort @NP) {
-      my $a = $OWN{$p};
-      my ($owner) = $$a[3] =~ /^([^@]+)/;
-      printf "%-40s %s\n", $p, $owner;
+}
+
+sub displayPkgListByOwnerWiki {
+  my ($a) = @_;
+  my %PO;
+  foreach my $p (@$a) {
+    my $oa = $OWN{$p};
+    my $owner = $$oa[3];
+    my $e = $PO{$owner};
+    if (defined $e) {
+      push @$e, $p;
+    } else {
+      $PO{$owner} = [ $p ];
     }
   }
-  if ($#NP_R >= 0) {
-    $cnt = $#NP_R + 1;
-    print "\nWe have $cnt packages not available in extras devel ";
-    print "but present in release:\n";
-    foreach my $p (sort @NP_R) {
-      my $a = $OWN{$p};
-      my ($owner) = $$a[3] =~ /^([^@]+)/;
-      printf "%-40s %s\n", $p, $owner;
+  foreach my $owner (sort(keys %PO)) {
+    my $e = $PO{$owner};
+    $owner =~ s/\@/ at /;
+    $owner =~ s/\./ dot /g;
+    foreach my $p (@$e) {
+      print "||$owner||`$p`||\n";
     }
   }
-  if ($#OE >= 0) {
-    $cnt = $#OE + 1;
-    print "\nWe have $cnt orphaned packages available in extras devel:\n";
-    print &toLine(join(" ", sort @OE)), "\n";
-  }
-  if ($#NPC >= 0) {
-    $cnt = $#NPC + 1;
-    print "\nWe have $cnt packages that moved to core:\n";
-    print &toLine(join(" ", sort @NPC)), "\n";
-  }
 }
 
 sub checkAcceptClosed {
   my ($BZ) = @_;
   my @BL;
   my @BLO;
-  my %O;
-  my %R;
-  my $cnt = 0;
-  my $miss = 0;
-  my $missO = 0;
   foreach my $b (sort(keys %$BZ)) {
     my $a = $BZ->{$b};
     next unless $$a[5] eq "\"CLOSED\"";
@@ -280,57 +328,67 @@
       $pkg = lcfirst $$a[8];
     }
     if ($SRPMS{$pkg} == 1) {
-      $R{$$a[3]} += 1;
-      $O{$$a[4]} += 1;
-      $cnt += 1;
+      $BZREV_CNT{$$a[3]} += 1;
+      $BZOWN_CNT{$$a[4]} += 1;
+      $COUNT_LIST{"acceptedClosed"} += 1;
       if (!defined($CORE{$pkg}) && !defined($OWN{$pkg})) {
 	push @BLO, $b;
-	$missO += 1;
+	$COUNT_LIST{"missingOwner"} += 1;
       }
     } else {
       if (Date_Cmp($$a[2], $fourDaysAgo) < 0) {
 	# print "Missing pkg: ", join(" ", @$a), "\n";
 	push @BL, $b;
-	$miss += 1;
+	$COUNT_LIST{"missing"} += 1;
       }
       if (defined $OWN{$pkg}) {
-	$R{$$a[3]} += 1;
-	$O{$$a[4]} += 1;
-	$cnt += 1;
+	$BZREV_CNT{$$a[3]} += 1;
+	$BZOWN_CNT{$$a[4]} += 1;
+	$COUNT_LIST{"acceptedClosed"} += 1;
       } else {
 	push @BLO, $b;
-	$missO += 1;
+	$COUNT_LIST{"missingOwner"} += 1;
       }
     }
   }
-  if ($miss > 0) {
-    print "\nWe have $miss accepted, closed packages where I'm unable to ",
+  my @TR = sort {$BZREV_CNT{$b} <=> $BZREV_CNT{$a}} keys %BZREV_CNT;
+  my @TO = sort {$BZOWN_CNT{$b} <=> $BZOWN_CNT{$a}} keys %BZOWN_CNT;
+  $BUG_LIST{"acceptedNoDevel"} = \@BL;
+  $BUG_LIST{"acceptedNoOwn"} = \@BLO;
+  $OWNER_LIST{"BZOwner"} = \@TO;
+  $OWNER_LIST{"BZReviewer"} = \@TR;
+}
+
+sub displayAcceptWiki {
+  my ($BZ) = @_;
+  print "\n\n== About FE-ACCEPT packages ==\n";
+  print "\n\n=== Package count ===\n";
+  print "\nWe have $COUNT_LIST{'acceptedClosed'} accepted, closed package reviews\n";
+  print "\n=== Top 10 BZ review requests submitters ===\n";
+  &displayOwnerCntWiki($OWNER_LIST{"BZOwner"}, \%BZOWN_CNT);
+  print "\n=== Top 10 BZ review requests reviewers ===\n";
+  &displayOwnerCntWiki($OWNER_LIST{"BZReviewer"}, \%BZREV_CNT);
+  print "\n\n=== Potential problems ===\n";
+  if ($COUNT_LIST{"missing"} > 0) {
+    print "\nWe have $COUNT_LIST{'missing'} accepted, closed packages where I'm unable to ",
       "find the package in the development repo:\n";
-    &displayBL(\@BL, $BZ);
+    &displayBLWiki($BUG_LIST{"acceptedNoDevel"}, $BZ);
   }
-  if ($missO > 0) {
-    print "\nWe have $missO accepted, closed packages where I'm unable to ",
+  if ($COUNT_LIST{"missingOwner"} > 0) {
+    print "\nWe have $COUNT_LIST{'missingOwner'} accepted, closed packages where I'm unable to ",
       "find the package in the owners file:\n";
-    &displayBL(\@BLO, $BZ);
+    &displayBLWiki($BUG_LIST{"acceptedNoOwn"}, $BZ);
   }
-  my @TR = sort {$R{$b} <=> $R{$a}} keys %R;
-  my @TO = sort {$O{$b} <=> $O{$a}} keys %O;
-  print "\nWe have $cnt accepted, closed package reviews\n";
-  print "\nTop 10 BZ review requests submitters:\n";
-  for my $i (0 .. 9) {
-    my $n = $TO[$i];
-    $n =~ s/["]//g;
-    $n =~ s/\@/ at /;
-    $n =~ s/\./ dot /g;
-    printf "%-50s: %d\n", $n, $O{$TO[$i]};
-  }
-  print "\nTop 10 BZ review requests reviewers:\n";
-  for my $i (0 .. 9) {
-    my $n = $TR[$i];
-    $n =~ s/["]//g;
-    $n =~ s/\@/ at /;
-    $n =~ s/\./ dot /g;
-    printf "%-50s: %d\n", $n, $R{$TR[$i]};
+  if ($COUNT_LIST{"acceptOpenInactive"} >= 0) {
+    print "\n\n=== Inactivity notice ===\n";
+    print "\nWe have $COUNT_LIST{'acceptOpenInactive'} accepted, open package reviews older than 4 weeks\n";
+    &displayBLWiki($BUG_LIST{"acceptOpenInactive"}, $BZ);
+  }
+  if ($COUNT_LIST{"acceptOpenInDevel"} > 0) {
+    print "\n\n=== Some cleanup needed ===\n";
+    print "\nWe have $COUNT_LIST{'acceptOpenInDevel'} accepted, open package reviews where the package ",
+      "appears to already be in the repo...\n";
+    &displayBLWiki($BUG_LIST{"acceptOpenInDevel"}, $BZ);
   }
 }
 
@@ -338,7 +396,6 @@
   my ($BZ) = @_;
   my @BL;
   my @LATE;
-  my $cnt = 0;
   foreach my $b (sort(keys %$BZ)) {
     my $a = $BZ->{$b};
     next if $$a[5] eq "\"CLOSED\"";
@@ -350,32 +407,25 @@
       $pkg = lcfirst $$a[8];
     }
     if ($SRPMS{$pkg} == 1) {
-      $cnt += 1;
+      $COUNT_LIST{"acceptOpenInDevel"} += 1;
       push @BL, $b;
     }
     if (Date_Cmp($$a[2], $fourWeeksAgo) < 0) {
       push @LATE, $b;
     }
   }
-  print "\nWe have $cnt accepted, open package reviews where the package ",
-    "appears to already be in the repo...\n";
-  &displayBL(\@BL, $BZ);
-  if ($#LATE >= 0) {
-    $cnt = $#LATE + 1;
-    print "\nWe have $cnt accepted, open package reviews older than 4 weeks\n";
-    &displayBL(\@LATE, $BZ);
-  }
+  $BUG_LIST{"acceptOpenInDevel"} = \@BL;
+  $BUG_LIST{"acceptOpenInactive"} = \@LATE;
+  $COUNT_LIST{"acceptOpenInactive"} = $#LATE;
 }
 
 sub countOpen {
   my ($BZ, $cur) = @_;
-  my $cnt = 0;
   foreach my $b (sort(keys %$BZ)) {
     my $a = $BZ->{$b};
     next if $$a[5] eq "\"CLOSED\"";
-    $cnt += 1;
+    $COUNT_LIST{"open$cur"} += 1;
   }
-  print "\nWe have $cnt open tickets in $cur\n";
 }
 
 sub checkNotClosed {
@@ -386,10 +436,8 @@
     next unless $$a[5] eq "\"CLOSED\"";
     push @BL, $b;
   }
-  return if $#BL < 0;
-  my $cnt = $#BL + 1;
-  print "\nWe have $cnt closed tickets still blocking $cur\n";
-  &displayBL(\@BL, $BZ);
+  $COUNT_LIST{"closed$cur"} = $#BL + 1;
+  $BUG_LIST{"closed$cur"} = \@BL;
 }
 
 sub checkLowActivity {
@@ -407,35 +455,29 @@
       }
     }
   }
-  if ($#LATE >= 0) {
-    my $cnt = $#LATE + 1;
-    print "\nWe have $cnt $cur tickets with no activity in eight weeks\n";
-    &displayBL(\@LATE, $BZ);
-  }
-  if ($#BL >= 0) {
-    my $cnt = $#BL + 1;
-    print "\nWe have $cnt $cur tickets with no activity in four weeks\n";
-    &displayBL(\@BL, $BZ);
-  }
-}
-
-sub checkNoActivity {
-  my ($BZ, $cur) = @_;
-  my @BL;
-  foreach my $b (sort(keys %$BZ)) {
-    my $a = $BZ->{$b};
-    next if $$a[5] eq "\"CLOSED\"";
-    next if $$a[1] ne $$a[2];
-    if (Date_Cmp($$a[2], $eightWeeksAgo) < 0) {
-      push @BL, $b;
-    }
-  }
-  if ($#BL >= 0) {
-    my $cnt = $#BL + 1;
-    print "\nWe have $cnt $cur tickets 8 weeks old with no comments\n";
-    &displayBL(\@BL, $BZ);
-  }
-}
+  $COUNT_LIST{"inactive8$cur"} = $#LATE + 1;
+  $COUNT_LIST{"inactive4$cur"} = $#BL + 1;
+  $BUG_LIST{"inactive8$cur"} = \@LATE;
+  $BUG_LIST{"inactive4$cur"} = \@BL;
+}
+
+#sub checkNoActivity {
+#  my ($BZ, $cur) = @_;
+#  my @BL;
+#  foreach my $b (sort(keys %$BZ)) {
+#    my $a = $BZ->{$b};
+#    next if $$a[5] eq "\"CLOSED\"";
+#    next if $$a[1] ne $$a[2];
+#    if (Date_Cmp($$a[2], $eightWeeksAgo) < 0) {
+#      push @BL, $b;
+#    }
+#  }
+#  if ($#BL >= 0) {
+#    my $cnt = $#BL + 1;
+#    print "\nWe have $cnt $cur tickets 8 weeks old with no comments\n";
+#    &displayBL(\@BL, $BZ);
+#  }
+#}
 
 sub usage {
   print STDERR "Usage: $0 [options] <bugs list>
@@ -494,3 +536,56 @@
     printf "  %-40s %s\n", $$a[8], $owner;
   }
 }
+
+sub displayBLWiki {
+  my ($BL, $BZ) = @_;
+  my %O;
+  foreach my $b (@$BL) {
+    my $a = $BZ->{$b};
+    my $e = $O{$$a[4]};
+    if (defined $e) {
+      push @$e, $a;
+    } else {
+      $O{$$a[4]} = [ $a ];
+    }
+  }
+  foreach my $n (sort(keys %O)) {
+    my $e = $O{$n};
+    $n =~ s/["]//g;
+    $n =~ s/\@/ at /;
+    $n =~ s/\./ dot /g;
+    foreach my $a (@$e) {
+      print "||$n||`$$a[8]`||[";
+      print "https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=$$a[0] $$a[0]";
+      print "]||$$a[9]||\n";
+    }
+  }
+}
+
+sub displayNewReviewWiki {
+  my ($BZ, $cur) = @_;
+  print "\n\n== About $cur packages ==\n";
+  print "\n\n=== Open ticket count ===\n";
+  my $cnt = $COUNT_LIST{"open$cur"};
+  print "\nWe have $cnt open tickets in $cur\n";
+  if ($COUNT_LIST{"inactive8$cur"} > 0
+      || $COUNT_LIST{"inactive4$cur"} > 0) {
+    print "\n\n=== Inactivity notice ===\n";
+    if ($COUNT_LIST{"inactive8$cur"} > 0) {
+      $cnt = $COUNT_LIST{"inactive8$cur"};
+      print "\nWe have $cnt $cur tickets with no activity in eight weeks\n";
+      &displayBLWiki($BUG_LIST{"inactive8$cur"}, $BZ);
+    }
+    if ($COUNT_LIST{"inactive4$cur"} > 0) {
+      $cnt = $COUNT_LIST{"inactive4$cur"};
+      print "\nWe have $cnt $cur tickets with no activity in four weeks\n";
+      &displayBLWiki($BUG_LIST{"inactive4$cur"}, $BZ);
+    }
+  }
+  if ($COUNT_LIST{"closed$cur"} > 0) {
+    print "\n\n=== Some cleanup needed ===\n";
+    $cnt = $COUNT_LIST{"closed$cur"};
+    print "\nWe have $cnt closed tickets still blocking $cur\n";
+    &displayBLWiki($BUG_LIST{"closed$cur"}, $BZ);
+  }
+}



From fedora-extras-commits at redhat.com  Wed Apr 19 09:56:21 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 02:56:21 -0700
Subject: status-report-scripts parseBZbugList,1.8,1.9
Message-ID: <200604190956.k3J9uLQU001567@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1549

Modified Files:
	parseBZbugList 
Log Message:
Start handling name changes due to upper/lower-case in owners.list.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- parseBZbugList	19 Apr 2006 09:55:23 -0000	1.8
+++ parseBZbugList	19 Apr 2006 09:56:18 -0000	1.9
@@ -197,6 +197,19 @@
   my @NP_R;
   my @NPC;
   my @OE;
+  for my $k (keys %OWN) {
+    my $l = lc $k;
+    next if $l eq $k;
+    if (defined $OWN{$l}) {
+      if (defined($EXTRAS{$l}) || defined($CORE{$l})) {
+	delete $OWN{$k};
+	next;
+      }
+      if (defined($EXTRAS{$k}) || defined($CORE{$k})) {
+	delete $OWN{$l};
+      }
+    }
+  }
   foreach my $k (keys %OWN) {
     my $a = $OWN{$k};
     next if $$a[0] ne "Fedora Extras";



From fedora-extras-commits at redhat.com  Wed Apr 19 09:57:12 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 02:57:12 -0700
Subject: status-report-scripts parseBZbugList,1.9,1.10
Message-ID: <200604190957.k3J9vCJU001599@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1578

Modified Files:
	parseBZbugList 
Log Message:
Add TODO items.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- parseBZbugList	19 Apr 2006 09:56:18 -0000	1.9
+++ parseBZbugList	19 Apr 2006 09:57:09 -0000	1.10
@@ -1,5 +1,13 @@
 #!/usr/bin/env perl
 # $Id$
+
+# TODO stuff
+# - read a moved-to-extra file
+# - check that packages listed in discarded file actually appear in owners
+# - check that open new/review packages do not appear in owners
+# - print what shoul dgo in the mailing list report
+# - fill the <Date> placeholder
+
 use strict;
 use Getopt::Long;
 use Date::Manip;



From fedora-extras-commits at redhat.com  Wed Apr 19 09:58:03 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 02:58:03 -0700
Subject: status-report-scripts parseBZbugList,1.10,1.11
Message-ID: <200604190958.k3J9w3cu001630@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1612

Modified Files:
	parseBZbugList 
Log Message:
Implement some TODO items.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- parseBZbugList	19 Apr 2006 09:57:09 -0000	1.10
+++ parseBZbugList	19 Apr 2006 09:58:01 -0000	1.11
@@ -2,11 +2,7 @@
 # $Id$
 
 # TODO stuff
-# - read a moved-to-extra file
-# - check that packages listed in discarded file actually appear in owners
-# - check that open new/review packages do not appear in owners
-# - print what shoul dgo in the mailing list report
-# - fill the <Date> placeholder
+# - print what should go in the mailing list report
 
 use strict;
 use Getopt::Long;
@@ -16,9 +12,16 @@
 my @options = ( "help", "core=s", "extras=s", "bzid=s", "o=s", "d=s",
 		"extras_r=s" );
 
-$main::core = "http://mirrors.kernel.org/fedora/core/development/SRPMS/";
-$main::extras = "http://mirrors.kernel.org/fedora/extras/development/SRPMS/";
-$main::extras_r = "http://mirrors.kernel.org/fedora/extras/4/SRPMS/";
+$main::core
+  = "http://mirrors.kernel.org/fedora/core/development/SRPMS/";
+$main::extras
+  = "http://mirrors.kernel.org/fedora/extras/development/SRPMS/";
+$main::extras_r
+  = "http://mirrors.kernel.org/fedora/extras/4/SRPMS/";
+$main::discarded
+  = "http://fedoraproject.org/wiki/Extras/PackagesNoLongerInDevel";
+$main::bzid
+  = "http://fedoraproject.org/wiki/Extras/UsefulScripts?action=AttachFile&do=get&target=bzId_pkg.txt";
 
 if( ! GetOptions( \%opt, @options ) ) { &usage(); }
 
@@ -26,6 +29,8 @@
 $main::core = $opt{"core"} if defined $opt{"core"};
 $main::extras = $opt{"extras"} if defined $opt{"extras"};
 $main::extras_r = $opt{"extras_r"} if defined $opt{"extras_r"};
+$main::discarded = $opt{"d"} if defined $opt{"d"};
+$main::bzid = $opt{"bzid"} if defined $opt{"bzid"};
 
 &usage() if defined $opt{'help'};
 
@@ -43,7 +48,9 @@
 my %SRPMS;
 my %NAME;
 my %OWN;
+my %OWN_DUP;
 my %DISCARD;
+my %FC_INTEGRATED;
 my %PKG_LIST;
 my %BUG_LIST;
 my %OWNER_LIST;
@@ -51,9 +58,10 @@
 my %OWNER_CNT;
 my %BZOWN_CNT;
 my %BZREV_CNT;
-if (defined $opt{"bzid"}) {
+if ($main::bzid ne "") {
   local *IN;
-  open IN, $opt{"bzid"} or die "Couldn't open $opt{'bzid'} : $!";
+  open IN, "wget -nv -O - \"$main::bzid\"|"
+    or die "Failed to wget $main::bzid : $!";
   while ( <IN> ) {
     s/\s+$//;
     my @F = split /\t/;
@@ -61,11 +69,32 @@
   }
   close IN;
 }
-if (defined $opt{"d"}) {
+if ($main::discarded ne "") {
   local *IN;
-  open IN, $opt{"d"} or die "Couldn't open $opt{'d'} : $!";
+  open IN, "wget -nv -O - \"$main::discarded\"|"
+    or die "Failed to wget $main::discarded : $!";
   while ( <IN> ) {
-    s/\s+$//;
+    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> ) {
+    last if /^<p>These FE packages have been retired/;
+  }
+  while ( <IN> ) {
+    last if /^<pre>/;
+  }
+  while ( <IN> ) {
+    last if /^<\/pre>/;
+    s/[\r\n]+$//;
+    s/\s.*$//;
     $DISCARD{$_} = 1;
   }
   close IN;
@@ -78,10 +107,17 @@
     next if /^#/;
     s/\s+$//;
     my @F = split /\|/;
-    next if defined $DISCARD{$F[1]};
+    if (defined $DISCARD{$F[1]}) {
+      $DISCARD{$F[1]} += 1;
+      next;
+    }
     $OWN{$F[1]} = \@F;
   }
   close IN;
+  foreach my $k (keys %DISCARD) {
+    next if $DISCARD{$k} > 1;
+    print STDERR "$k is in the list of discarded pkgs, but not in owners\n";
+  }
 }
 if ($main::extras ne "") {
   &grabRepoList($main::extras, \%EXTRAS);
@@ -174,6 +210,8 @@
     }
   }
 }
+&checkOpenInOwners(\%BZR, "FE-REVIEW");
+&checkOpenInOwners(\%BZN, "FE-NEW");
 &checkOwners;
 my $fourDaysAgo = DateCalc("4 days ago", "today");
 my $fourWeeksAgo = DateCalc("4 weeks ago", "today");
@@ -189,26 +227,39 @@
 #&checkNoActivity(\%BZN, "FE-NEW");
 &countOpen(\%BZS, "FE-NEEDSPONSOR");
 &checkLowActivity(\%BZS, "FE-NEEDSPONSOR");
-print "[[TableOfContents]]\n\n= FE Package Status of <date> =\n";
+print "[[TableOfContents]]\n\n= FE Package Status of ",
+  &UnixDate("today", "%b %e, %Y"), " =\n";
 &displayOwnersWiki;
 &displayAcceptWiki(\%BZA);
 &displayNewReviewWiki(\%BZR, "FE-REVIEW");
 &displayNewReviewWiki(\%BZN, "FE-NEW");
 &displayNewReviewWiki(\%BZS, "FE-NEEDSPONSOR");
+print "----\nCategoryExtras\n";
 
 exit 0;
 
 sub checkOwners {
   my $orphan = 0;
   my $cnt = 0;
+  my @NO;
   my @NP;
   my @NP_R;
   my @NPC;
   my @OE;
+  foreach my $k (keys %EXTRAS) {
+    next if defined $OWN{$k};
+    push @NO, $k
+  }
+  if ($#NO >= 0) {
+    $COUNT_LIST{"extrasNoOwner"} = $#NO + 1;
+    $PKG_LIST{"extrasNoOwner"} = \@NO;
+  }
   for my $k (keys %OWN) {
     my $l = lc $k;
     next if $l eq $k;
     if (defined $OWN{$l}) {
+      $OWN_DUP{$l} = $OWN{$l};
+      $OWN_DUP{$k} = $OWN{$k};
       if (defined($EXTRAS{$l}) || defined($CORE{$l})) {
 	delete $OWN{$k};
 	next;
@@ -229,7 +280,7 @@
     }
     $OWNER_CNT{$$a[3]} += 1;
     unless (defined $EXTRAS{$k}) {
-      if (defined $CORE{$k}) {
+      if (defined($CORE{$k}) || defined($FC_INTEGRATED{$k})) {
 	push @NPC, $k;
       } else {
 	if (defined $EXTRAS_R{$k}) {
@@ -272,6 +323,29 @@
     print "but present in release:\n";
     &displayPkgListByOwnerWiki($a);
   }
+  if ($COUNT_LIST{"openInOwners"} > 0) {
+    print "\n\n=== Packages that have not yet completed review ===\n";
+    print "\nWe have $COUNT_LIST{'openInOwners'} packages ",
+      "which have not yet been FE_APPROVE'd...\n";
+    &displayBLWiki($BUG_LIST{"openInOwnersFE-REVIEW"}, \%BZR);
+    &displayBLWiki($BUG_LIST{"openInOwnersFE-NEW"}, \%BZN);
+  }
+  if ($COUNT_LIST{"extrasNoOwner"} > 0) {
+    print "\n\n=== Packages missing in owners.list ===\n";
+    print "\nWe have $COUNT_LIST{'extrasNoOwner'} packages present in the ",
+      "development repo which have no entry in `owners.list`:{{{\n";
+    my $p = $PKG_LIST{"extrasNoOwner"};
+    print &toLine(join(" ", @$p)), "\n";
+    print "}}}\n";
+  }
+  my @DUP = sort(keys %OWN_DUP);
+  if ($#DUP >= 0) {
+    print "\n=== Duplicated packages ===\n";
+    my $cnt = ($#DUP + 1) / 2;
+    print "\nWe have $cnt packages which appear to be duplicated:{{{\n";
+    print &toLine(join(" ", @DUP)), "\n";
+    print "}}}\n";
+  }
   $a = $PKG_LIST{"OrphanDevel"};
   print "\n=== Orphaned packages present in the development repo ===\n";
   if ($#$a >= 0) {
@@ -504,14 +578,16 @@
   print STDERR "Usage: $0 [options] <bugs list>
  where options are:
   -help           this help note
-  -bzid <file>    list associating bz ticket number with package name
+  -bzid <url>     list associating bz ticket number with package name
+                  [$main::bzid]
   -extras <url>   Fedora extras SRPMS development repo
                   [$main::extras]
   -extras_r <url> Fedora extras SRPMS release repo
                   [$main::extras_r]
   -core <url>     Fedora core SRPMS repo
                   [$main::core]
-  -d <file>       list of discarded packages
+  -d <url>        list of migrated/discarded packages
+                  [$main::discarded]
   -o <file>       owners.list file\n";
   exit 1;
 }
@@ -519,7 +595,7 @@
 sub grabRepoList {
   my ($f, $h) = @_;
   local *IN;
-  open IN, "wget -nv -O - $f|" or die "Failed to wget $f : $!";
+  open IN, "wget -nv -O - \"$f\"|" or die "Failed to wget $f : $!";
   while ( <IN> ) {
     next unless /^<img \S+ alt=.\[   \].> <a href=.([^"]+)/;
     my $file = $1;
@@ -610,3 +686,17 @@
     &displayBLWiki($BUG_LIST{"closed$cur"}, $BZ);
   }
 }
+
+sub checkOpenInOwners {
+  my ($BZ, $cur) = @_;
+  my @BL;
+  foreach my $b (sort(keys %$BZ)) {
+    my $a = $BZ->{$b};
+    next if $$a[5] eq "\"CLOSED\"";
+    next unless defined $OWN{$$a[8]};
+    delete $OWN{$$a[8]};
+    push @BL, $b;
+  }
+  $COUNT_LIST{"openInOwners"} += $#BL + 1;
+  $BUG_LIST{"openInOwners$cur"} = \@BL;
+}



From fedora-extras-commits at redhat.com  Wed Apr 19 09:58:42 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 02:58:42 -0700
Subject: status-report-scripts parseBZbugList,1.11,1.12
Message-ID: <200604190958.k3J9wgYY001664@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1646

Modified Files:
	parseBZbugList 
Log Message:
Print mail stuff.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- parseBZbugList	19 Apr 2006 09:58:01 -0000	1.11
+++ parseBZbugList	19 Apr 2006 09:58:40 -0000	1.12
@@ -2,7 +2,6 @@
 # $Id$
 
 # TODO stuff
-# - print what should go in the mailing list report
 
 use strict;
 use Getopt::Long;
@@ -235,6 +234,15 @@
 &displayNewReviewWiki(\%BZN, "FE-NEW");
 &displayNewReviewWiki(\%BZS, "FE-NEEDSPONSOR");
 print "----\nCategoryExtras\n";
+print STDERR "\n\nFE Package Status of ",
+  &UnixDate("today", "%b %e, %Y"), "\n";
+print STDERR "\nThe full report can be found here:\n";
+print STDERR "http://fedoraproject.org/wiki/Extras/PackageStatus\n\n";
+&displayOwnersMail;
+&displayAcceptMail;
+&displayNewReviewMail("FE-REVIEW");
+&displayNewReviewMail("FE-NEW");
+&displayNewReviewMail("FE-NEEDSPONSOR");
 
 exit 0;
 
@@ -398,6 +406,46 @@
   }
 }
 
+sub displayOwnersMail {
+  print STDERR "\nOwners file stats:\n";
+  print STDERR " - $COUNT_LIST{'owner'} packages\n";
+  print STDERR " - $COUNT_LIST{'orphan'} orphans\n";
+  $a = $PKG_LIST{"NotDevelNotRel"};
+  if ($#$a >= 0) {
+    my $cnt = $#$a + 1;
+    print STDERR " - $cnt not available in extras devel or release\n";
+  }
+  $a = $PKG_LIST{"NotDevel"};
+  if ($#$a >= 0) {
+    my $cnt = $#$a + 1;
+    print STDERR " - $cnt packages not available in extras devel ";
+    print STDERR "but present in release\n";
+  }
+  if ($COUNT_LIST{"openInOwners"} > 0) {
+    print STDERR " - $COUNT_LIST{'openInOwners'} packages ",
+      "which have not yet been FE_APPROVE'd...\n";
+  }
+  if ($COUNT_LIST{"extrasNoOwner"} > 0) {
+    print STDERR " - $COUNT_LIST{'extrasNoOwner'} packages present in the ",
+      "development repo which have no owners entry\n";
+  }
+  my @DUP = sort(keys %OWN_DUP);
+  if ($#DUP >= 0) {
+    my $cnt = ($#DUP + 1) / 2;
+    print STDERR " - $cnt packages with duplicated owners entry\n";
+  }
+  $a = $PKG_LIST{"OrphanDevel"};
+  if ($#$a >= 0) {
+    my $cnt = $#$a + 1;
+    print STDERR " - $cnt orphaned packages, yet available in extras devel\n";
+  }
+  $a = $PKG_LIST{"MovedToCore"};
+  if ($#$a >= 0) {
+    my $cnt = $#$a + 1;
+    print STDERR " - $cnt packages that moved to core\n";
+  }
+}
+
 sub checkAcceptClosed {
   my ($BZ) = @_;
   my @BL;
@@ -487,6 +535,29 @@
   }
 }
 
+sub displayAcceptMail {
+  print STDERR "\nFE-ACCEPT packages stats:\n";
+  print STDERR
+    " - $COUNT_LIST{'acceptedClosed'} accepted, closed package reviews\n";
+  if ($COUNT_LIST{"missing"} > 0) {
+    print STDERR
+      " - $COUNT_LIST{'missing'} accepted, closed packages not in repo\n";
+  }
+  if ($COUNT_LIST{"missingOwner"} > 0) {
+    print STDERR
+      " - $COUNT_LIST{'missingOwner'} accepted, closed packages not in owners\n";
+  }
+  if ($COUNT_LIST{"acceptOpenInactive"} >= 0) {
+    print STDERR
+      " - $COUNT_LIST{'acceptOpenInactive'} accepted, open package reviews older than 4 weeks;\n";
+  }
+  if ($COUNT_LIST{"acceptOpenInDevel"} > 0) {
+    print STDERR
+      " - $COUNT_LIST{'acceptOpenInDevel'} accepted, open package reviews ",
+      "with a package already in the repo\n";
+  }
+}
+
 sub checkAcceptOpen {
   my ($BZ) = @_;
   my @BL;
@@ -687,6 +758,25 @@
   }
 }
 
+sub displayNewReviewMail {
+  my ($cur) = @_;
+  print STDERR "\n$cur packages stats:\n";
+  my $cnt = $COUNT_LIST{"open$cur"};
+  print STDERR " - $cnt open tickets\n";
+  if ($COUNT_LIST{"inactive8$cur"} > 0) {
+    $cnt = $COUNT_LIST{"inactive8$cur"};
+    print STDERR " - $cnt tickets with no activity in eight weeks\n";
+  }
+  if ($COUNT_LIST{"inactive4$cur"} > 0) {
+    $cnt = $COUNT_LIST{"inactive4$cur"};
+    print STDERR " - $cnt tickets with no activity in four weeks\n";
+  }
+  if ($COUNT_LIST{"closed$cur"} > 0) {
+    $cnt = $COUNT_LIST{"closed$cur"};
+    print STDERR " - $cnt closed tickets\n";
+  }
+}
+
 sub checkOpenInOwners {
   my ($BZ, $cur) = @_;
   my @BL;



From fedora-extras-commits at redhat.com  Wed Apr 19 09:59:35 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 02:59:35 -0700
Subject: status-report-scripts parseBZbugList,1.12,1.13
Message-ID: <200604190959.k3J9xZfs001709@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1691

Modified Files:
	parseBZbugList 
Log Message:
Fix broken pipe.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- parseBZbugList	19 Apr 2006 09:58:40 -0000	1.12
+++ parseBZbugList	19 Apr 2006 09:59:33 -0000	1.13
@@ -96,6 +96,9 @@
     s/\s.*$//;
     $DISCARD{$_} = 1;
   }
+  while ( <IN> ) {
+    # Read the rest to avoid a broken pipe...
+  }
   close IN;
 }
 if (defined $opt{"o"}) {



From fedora-extras-commits at redhat.com  Wed Apr 19 10:00:10 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 19 Apr 2006 03:00:10 -0700
Subject: rpms/perl-Crypt-RSA - New directory
Message-ID: <200604191000.k3JA0CLl001770@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-RSA
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1749/perl-Crypt-RSA

Log Message:
Directory /cvs/extras/rpms/perl-Crypt-RSA added to the repository




From fedora-extras-commits at redhat.com  Wed Apr 19 10:00:10 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 19 Apr 2006 03:00:10 -0700
Subject: rpms/perl-Crypt-RSA/devel - New directory
Message-ID: <200604191000.k3JA0CYq001773@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-RSA/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1749/perl-Crypt-RSA/devel

Log Message:
Directory /cvs/extras/rpms/perl-Crypt-RSA/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Apr 19 10:00:34 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 19 Apr 2006 03:00:34 -0700
Subject: rpms/perl-Crypt-RSA Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604191000.k3JA0bSN001827@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-RSA
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1794

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Crypt-RSA


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Crypt-RSA
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 19 10:00:35 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 19 Apr 2006 03:00:35 -0700
Subject: rpms/perl-Crypt-RSA/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604191000.k3JA0buk001830@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-RSA/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1794/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Crypt-RSA


--- 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 Apr 19 10:01:22 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 19 Apr 2006 03:01:22 -0700
Subject: rpms/perl-Crypt-RSA/devel perl-Crypt-RSA.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604191001.k3JA1O3W003953@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-RSA/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3912/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Crypt-RSA.spec 
Log Message:
auto-import perl-Crypt-RSA-1.57-2 on branch devel from perl-Crypt-RSA-1.57-2.src.rpm


--- NEW FILE perl-Crypt-RSA.spec ---
Summary:	RSA public-key cryptosystem
Name:		perl-Crypt-RSA
Version:	1.57
Release:	2%{?dist}
License:	GPL or Artistic
Group:		Development/Libraries
Url:		http://search.cpan.org/dist/Crypt-RSA/
Source0:	http://search.cpan.org/CPAN/authors/id/V/VI/VIPUL/Crypt-RSA-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:	noarch
BuildRequires:	perl(Class::Loader)          >= 2.00
BuildRequires:	perl(Convert::ASCII::Armour)
BuildRequires:	perl(Crypt::Random)          >= 0.34
BuildRequires:	perl(Crypt::Primes)          >= 0.38
BuildRequires:	perl(Crypt::CBC)
BuildRequires:	perl(Crypt::Blowfish)
BuildRequires:	perl(Data::Buffer)
BuildRequires:	perl(Digest::MD2)
BuildRequires:	perl(Digest::MD5)
BuildRequires:	perl(Digest::SHA1)
BuildRequires:	perl(Math::Pari)             >= 2.001804
BuildRequires:	perl(Sort::Versions)
BuildRequires:	perl(Tie::EncryptedHash)

%description
Crypt::RSA is a pure-perl, cleanroom implementation of the RSA public-key
cryptosystem. It uses Math::Pari(3), a perl interface to the blazingly fast
PARI library, for big integer arithmetic and number theoretic computations.

Crypt::RSA provides arbitrary size key-pair generation, plaintext-aware
encryption (OAEP) and digital signatures with appendix (PSS). For compatibility
with SSLv3, RSAREF2, PGP and other applications that follow the PKCS #1 v1.5
standard, it also provides PKCS #1 v1.5 encryption and signatures.

%prep
%setup -q -n Crypt-RSA-%{version}

# Remove pointless shellbangs
/usr/bin/find ./lib -name '*.pm' -print | /usr/bin/xargs %{__sed} -i -e '/^#! *\/usr\/bin\/perl /d'

# Convert documentation to UTF-8
/usr/bin/iconv -f iso-8859-1 -t utf-8 -o lib/Crypt/RSA.pm.utf-8 lib/Crypt/RSA.pm
%{__mv} -f lib/Crypt/RSA.pm.utf-8 lib/Crypt/RSA.pm

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
%{__make} %{?_smp_mflags}

%check
%{__make} test

%install
%{__rm} -rf %{buildroot}
%{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
/usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
/usr/bin/find %{buildroot} -type d -depth -exec /bin/rmdir {} 2>/dev/null ';'
%{__chmod} -R u+w %{buildroot}/*

# Additional manpages
/usr/bin/pod2man --section=3 extradocs/crypt-rsa-interoperablity.pod \
	%{buildroot}%{_mandir}/man3/crypt-rsa-interoperablity.3
/usr/bin/pod2man --section=3 extradocs/crypt-rsa-interoperablity-template.pod \
	%{buildroot}%{_mandir}/man3/crypt-rsa-interoperablity-template.3

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,0755)
%doc ARTISTIC Changes README TODO
%{perl_vendorlib}/Crypt/
%{_mandir}/man3/Crypt::RSA.3pm*
%{_mandir}/man3/Crypt::RSA::DataFormat.3pm*
%{_mandir}/man3/Crypt::RSA::Debug.3pm*
%{_mandir}/man3/Crypt::RSA::ES::OAEP.3pm*
%{_mandir}/man3/Crypt::RSA::ES::PKCS1v15.3pm*
%{_mandir}/man3/Crypt::RSA::Errorhandler.3pm*
%{_mandir}/man3/Crypt::RSA::Key.3pm*
%{_mandir}/man3/Crypt::RSA::Key::Private.3pm*
%{_mandir}/man3/Crypt::RSA::Key::Private::SSH.3pm*
%{_mandir}/man3/Crypt::RSA::Key::Public.3pm*
%{_mandir}/man3/Crypt::RSA::Key::Public::SSH.3pm*
%{_mandir}/man3/Crypt::RSA::Primitives.3pm*
%{_mandir}/man3/Crypt::RSA::SS::PKCS1v15.3pm*
%{_mandir}/man3/Crypt::RSA::SS::PSS.3pm*
%{_mandir}/man3/crypt-rsa-interoperablity.3*
%{_mandir}/man3/crypt-rsa-interoperablity-template.3*

%changelog
* Tue Apr 18 2006 Paul Howarth <paul at city-fan.org> 1.57-2
- Fix non-UTF8-encoded manpage (#183888)
- Add manpages for crypt-rsa-interoperablity(3) and
  crypt-rsa-interoperablity-template(3) (#183888)

* Mon Nov 28 2005 Paul Howarth <paul at city-fan.org> 1.57-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-RSA/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Apr 2006 10:00:35 -0000	1.1
+++ .cvsignore	19 Apr 2006 10:01:22 -0000	1.2
@@ -0,0 +1 @@
+Crypt-RSA-1.57.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-RSA/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Apr 2006 10:00:35 -0000	1.1
+++ sources	19 Apr 2006 10:01:22 -0000	1.2
@@ -0,0 +1 @@
+3fd02d3d9e398e26848a0d49bd3b8ccd  Crypt-RSA-1.57.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 19 10:01:19 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 19 Apr 2006 03:01:19 -0700
Subject: rpms/perl-Crypt-RSA import.log,1.1,1.2
Message-ID: <200604191001.k3JA1pq2003966@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-RSA
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3912

Modified Files:
	import.log 
Log Message:
auto-import perl-Crypt-RSA-1.57-2 on branch devel from perl-Crypt-RSA-1.57-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-RSA/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Apr 2006 10:00:34 -0000	1.1
+++ import.log	19 Apr 2006 10:01:19 -0000	1.2
@@ -0,0 +1 @@
+perl-Crypt-RSA-1_57-2:HEAD:perl-Crypt-RSA-1.57-2.src.rpm:1145440867



From fedora-extras-commits at redhat.com  Wed Apr 19 10:05:03 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 03:05:03 -0700
Subject: status-report-scripts parseBZbugList,1.13,1.14
Message-ID: <200604191005.k3JA53vC004086@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4068

Modified Files:
	parseBZbugList 
Log Message:
Fix some output language.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- parseBZbugList	19 Apr 2006 09:59:33 -0000	1.13
+++ parseBZbugList	19 Apr 2006 10:05:01 -0000	1.14
@@ -337,7 +337,7 @@
   if ($COUNT_LIST{"openInOwners"} > 0) {
     print "\n\n=== Packages that have not yet completed review ===\n";
     print "\nWe have $COUNT_LIST{'openInOwners'} packages ",
-      "which have not yet been FE_APPROVE'd...\n";
+      "which have not yet been FE-APPROVE'd...\n";
     &displayBLWiki($BUG_LIST{"openInOwnersFE-REVIEW"}, \%BZR);
     &displayBLWiki($BUG_LIST{"openInOwnersFE-NEW"}, \%BZN);
   }
@@ -416,7 +416,7 @@
   $a = $PKG_LIST{"NotDevelNotRel"};
   if ($#$a >= 0) {
     my $cnt = $#$a + 1;
-    print STDERR " - $cnt not available in extras devel or release\n";
+    print STDERR " - $cnt packages not available in extras devel or release\n";
   }
   $a = $PKG_LIST{"NotDevel"};
   if ($#$a >= 0) {
@@ -426,7 +426,7 @@
   }
   if ($COUNT_LIST{"openInOwners"} > 0) {
     print STDERR " - $COUNT_LIST{'openInOwners'} packages ",
-      "which have not yet been FE_APPROVE'd...\n";
+      "which have not yet been FE-APPROVE'd...\n";
   }
   if ($COUNT_LIST{"extrasNoOwner"} > 0) {
     print STDERR " - $COUNT_LIST{'extrasNoOwner'} packages present in the ",
@@ -544,11 +544,11 @@
     " - $COUNT_LIST{'acceptedClosed'} accepted, closed package reviews\n";
   if ($COUNT_LIST{"missing"} > 0) {
     print STDERR
-      " - $COUNT_LIST{'missing'} accepted, closed packages not in repo\n";
+      " - $COUNT_LIST{'missing'} accepted, closed package reviews not in repo\n";
   }
   if ($COUNT_LIST{"missingOwner"} > 0) {
     print STDERR
-      " - $COUNT_LIST{'missingOwner'} accepted, closed packages not in owners\n";
+      " - $COUNT_LIST{'missingOwner'} accepted, closed package reviews not in owners\n";
   }
   if ($COUNT_LIST{"acceptOpenInactive"} >= 0) {
     print STDERR



From fedora-extras-commits at redhat.com  Wed Apr 19 10:06:01 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 03:06:01 -0700
Subject: status-report-scripts parseBZbugList,1.14,1.15
Message-ID: <200604191006.k3JA61Zb004121@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4103

Modified Files:
	parseBZbugList 
Log Message:
Add CVS and open bugs checks.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- parseBZbugList	19 Apr 2006 10:05:01 -0000	1.14
+++ parseBZbugList	19 Apr 2006 10:05:58 -0000	1.15
@@ -1,6 +1,11 @@
 #!/usr/bin/env perl
 # $Id$
 
+# Grab BZ tickets through:
+# https://bugzilla.redhat.com/bugzilla/showdependencytree.cgi?id=FE-NEW
+# https://bugzilla.redhat.com/bugzilla/showdependencytree.cgi?id=FE-REVIEW
+# https://bugzilla.redhat.com/bugzilla/showdependencytree.cgi?id=FE-ACCEPT
+
 # TODO stuff
 
 use strict;
@@ -9,7 +14,7 @@
 
 my %opt;
 my @options = ( "help", "core=s", "extras=s", "bzid=s", "o=s", "d=s",
-		"extras_r=s" );
+		"extras_r=s", "cvs=s" );
 
 $main::core
   = "http://mirrors.kernel.org/fedora/core/development/SRPMS/";
@@ -21,6 +26,7 @@
   = "http://fedoraproject.org/wiki/Extras/PackagesNoLongerInDevel";
 $main::bzid
   = "http://fedoraproject.org/wiki/Extras/UsefulScripts?action=AttachFile&do=get&target=bzId_pkg.txt";
+$main::cvsDir = "/export/scratch/extras";
 
 if( ! GetOptions( \%opt, @options ) ) { &usage(); }
 
@@ -30,6 +36,7 @@
 $main::extras_r = $opt{"extras_r"} if defined $opt{"extras_r"};
 $main::discarded = $opt{"d"} if defined $opt{"d"};
 $main::bzid = $opt{"bzid"} if defined $opt{"bzid"};
+$main::cvsDir = $opt{"cvs"} if defined $opt{"cvs"};
 
 &usage() if defined $opt{'help'};
 
@@ -41,6 +48,7 @@
 my %BZS;
 my %BZR;
 my %BZA;
+my %BZB;
 my %CORE;
 my %EXTRAS;
 my %EXTRAS_R;
@@ -48,6 +56,8 @@
 my %NAME;
 my %OWN;
 my %OWN_DUP;
+my %OWN_CVS_RECENT;
+my %CVS_NO_OWNER;
 my %DISCARD;
 my %FC_INTEGRATED;
 my %PKG_LIST;
@@ -134,6 +144,34 @@
 foreach my $k (keys %CORE) {
   $SRPMS{$k} = 1;
 }
+# Take a look at CVS stuff
+if (-d $main::cvsDir) {
+  $main::cvsDir =~ s/\/+$//;
+  my $f = "/tmp/tstmp_$$";
+  system "touch -d '12 weeks ago' $f";
+  my $cmd = "find $main::cvsDir -name CVS -prune -o -type f -newer $f -print "
+    . "| sed 's|^$main::cvsDir/||;s|/.*||'|sort -u";
+  local *IN;
+  open IN, "$cmd |" or die "Couldn't launch find command in CVS: $!";
+  while ( <IN> ) {
+    s/\s+$//;
+    next unless defined $OWN{$_};
+    $OWN_CVS_RECENT{$_} = 1;
+  }
+  close IN;
+  unlink $f;
+  my @PL;
+  $cmd = "find $main::cvsDir -type d -name devel -print "
+    . "| sed 's|^$main::cvsDir/||;s|/.*||'";
+  open IN, "$cmd |" or die "Couldn't launch find command in CVS: $!";
+  while ( <IN> ) {
+    s/\s+$//;
+    $COUNT_LIST{"CVS"} += 1;
+    next if defined $OWN{$_};
+    $CVS_NO_OWNER{$_} = 1;
+  }
+  close IN;
+}
 while ( <> ) {
   s/[,\n]+$//;
   my @F = split /,/;
@@ -153,33 +191,36 @@
     if ($F[0] ne "bug_id"
 	|| $F[1] ne "\"opendate\""
 	|| $F[2] ne "\"changeddate\""
-	|| $F[3] ne "\"assigned_to\""
-	|| $F[4] ne "\"reporter\""
-	|| $F[5] ne "\"bug_status\""
-	|| $F[6] ne "\"resolution\""
-	|| $F[7] ne "\"blockedby\""
-	|| $F[8] ne "\"short_desc\"") {
+	|| $F[3] ne "\"bug_severity\""
+	|| $F[4] ne "\"assigned_to\""
+	|| $F[5] ne "\"reporter\""
+	|| $F[6] ne "\"bug_status\""
+	|| $F[7] ne "\"resolution\""
+	|| $F[8] ne "\"component\""
+	|| $F[9] ne "\"blockedby\""
+	|| $F[10] ne "\"short_desc\"") {
       die "Bad header: $_";
     }
     next;
   }
-  $F[7] =~ s/["{}]//g;
+  $F[9] =~ s/["{}]//g;
   $F[1] =~ s/["]//g;
   $F[2] =~ s/["]//g;
+  $F[8] =~ s/["]//g;
   $F[1] = ParseDate($F[1]);
   $F[2] = ParseDate($F[2]);
-  my @B = split /,/, $F[7];
-  next if $F[8] =~ /TESTING-BUGSPAM/;
-  $F[9] = $F[8];
-  $F[9] =~ s/^["]+//;
-  $F[9] =~ s/["]+$//;
+  my @B = split /,/, $F[9];
+  next if $F[10] =~ /TESTING-BUGSPAM/;
+  $F[11] = $F[10];
+  $F[11] =~ s/^["]+//;
+  $F[11] =~ s/["]+$//;
   if (defined $NAME{$F[0]}) {
-    $F[8] = $NAME{$F[0]};
-  } else {
+    $F[10] = $NAME{$F[0]};
+  } elsif ($F[8] eq "Package Review") {
     # Try to guess package name
-    $F[8] =~ s/["]//g;
-    $F[8] =~ s/^review\s+request:?\s+<?//i;
-    $F[8] =~ s/[:.,>]?\s.*$//g;
+    $F[10] =~ s/["]//g;
+    $F[10] =~ s/^review\s+request:?\s+<?//i;
+    $F[10] =~ s/[:.,>]?\s.*$//g;
   }
   my $block = 0;
   my $sponsor = 0;
@@ -210,7 +251,14 @@
     if ($sponsor == 1 && $bzb == \%BZN) {
       $BZS{$F[0]} = \@F;
     }
+    next;
   }
+  if (defined $OWN{$F[8]}) {
+    $COUNT_LIST{"openOPEN-BUGS"} += 1;
+    $BZB{$F[0]} = \@F;
+    next;
+  }
+  print STDERR "Not handled: ", join(" ", @F), "\n";
 }
 &checkOpenInOwners(\%BZR, "FE-REVIEW");
 &checkOpenInOwners(\%BZN, "FE-NEW");
@@ -229,6 +277,8 @@
 #&checkNoActivity(\%BZN, "FE-NEW");
 &countOpen(\%BZS, "FE-NEEDSPONSOR");
 &checkLowActivity(\%BZS, "FE-NEEDSPONSOR");
+&checkLowCVSActivity();
+&checkLowActivity(\%BZB, "OPEN-BUGS");
 print "[[TableOfContents]]\n\n= FE Package Status of ",
   &UnixDate("today", "%b %e, %Y"), " =\n";
 &displayOwnersWiki;
@@ -236,6 +286,8 @@
 &displayNewReviewWiki(\%BZR, "FE-REVIEW");
 &displayNewReviewWiki(\%BZN, "FE-NEW");
 &displayNewReviewWiki(\%BZS, "FE-NEEDSPONSOR");
+&displayNewReviewWiki(\%BZB, "OPEN-BUGS");
+&displayCVSWiki();
 print "----\nCategoryExtras\n";
 print STDERR "\n\nFE Package Status of ",
   &UnixDate("today", "%b %e, %Y"), "\n";
@@ -246,6 +298,8 @@
 &displayNewReviewMail("FE-REVIEW");
 &displayNewReviewMail("FE-NEW");
 &displayNewReviewMail("FE-NEEDSPONSOR");
+&displayNewReviewMail("OPEN-BUGS");
+&displayCVSMail();
 
 exit 0;
 
@@ -455,27 +509,27 @@
   my @BLO;
   foreach my $b (sort(keys %$BZ)) {
     my $a = $BZ->{$b};
-    next unless $$a[5] eq "\"CLOSED\"";
-    my $pkg = $$a[8];
+    next unless $$a[6] eq "\"CLOSED\"";
+    my $pkg = $$a[10];
     unless ($SRPMS{$pkg} == 1 || defined($OWN{$pkg})) {
       $pkg =~ s/-[^-]+-[^-]+$//;
     }
     unless ($SRPMS{$pkg} == 1 || defined($OWN{$pkg})) {
-      $pkg = $$a[8];
+      $pkg = $$a[10];
       $pkg =~ s/-[^-]+$//;
     }
     unless ($SRPMS{$pkg} == 1 || defined($OWN{$pkg})) {
-      $pkg = lc $$a[8];
+      $pkg = lc $$a[10];
       unless ($SRPMS{$pkg} == 1 || defined($OWN{$pkg})) {
 	$pkg =~ s/-[^-]+-[^-]+$//;
       }
     }
     unless ($SRPMS{$pkg} == 1 || defined($OWN{$pkg})) {
-      $pkg = lcfirst $$a[8];
+      $pkg = lcfirst $$a[10];
     }
     if ($SRPMS{$pkg} == 1) {
-      $BZREV_CNT{$$a[3]} += 1;
-      $BZOWN_CNT{$$a[4]} += 1;
+      $BZREV_CNT{$$a[4]} += 1;
+      $BZOWN_CNT{$$a[5]} += 1;
       $COUNT_LIST{"acceptedClosed"} += 1;
       if (!defined($CORE{$pkg}) && !defined($OWN{$pkg})) {
 	push @BLO, $b;
@@ -488,8 +542,8 @@
 	$COUNT_LIST{"missing"} += 1;
       }
       if (defined $OWN{$pkg}) {
-	$BZREV_CNT{$$a[3]} += 1;
-	$BZOWN_CNT{$$a[4]} += 1;
+	$BZREV_CNT{$$a[4]} += 1;
+	$BZOWN_CNT{$$a[5]} += 1;
 	$COUNT_LIST{"acceptedClosed"} += 1;
       } else {
 	push @BLO, $b;
@@ -567,13 +621,13 @@
   my @LATE;
   foreach my $b (sort(keys %$BZ)) {
     my $a = $BZ->{$b};
-    next if $$a[5] eq "\"CLOSED\"";
-    my $pkg = $$a[8];
+    next if $$a[6] eq "\"CLOSED\"";
+    my $pkg = $$a[10];
     unless ($SRPMS{$pkg} == 1) {
-      $pkg = lc $$a[8];
+      $pkg = lc $$a[10];
     }
     unless ($SRPMS{$pkg} == 1) {
-      $pkg = lcfirst $$a[8];
+      $pkg = lcfirst $$a[10];
     }
     if ($SRPMS{$pkg} == 1) {
       $COUNT_LIST{"acceptOpenInDevel"} += 1;
@@ -592,7 +646,7 @@
   my ($BZ, $cur) = @_;
   foreach my $b (sort(keys %$BZ)) {
     my $a = $BZ->{$b};
-    next if $$a[5] eq "\"CLOSED\"";
+    next if $$a[6] eq "\"CLOSED\"";
     $COUNT_LIST{"open$cur"} += 1;
   }
 }
@@ -602,7 +656,7 @@
   my @BL;
   foreach my $b (sort(keys %$BZ)) {
     my $a = $BZ->{$b};
-    next unless $$a[5] eq "\"CLOSED\"";
+    next unless $$a[6] eq "\"CLOSED\"";
     push @BL, $b;
   }
   $COUNT_LIST{"closed$cur"} = $#BL + 1;
@@ -615,7 +669,7 @@
   my @LATE;
   foreach my $b (sort(keys %$BZ)) {
     my $a = $BZ->{$b};
-    next if $$a[5] eq "\"CLOSED\"";
+    next if $$a[6] eq "\"CLOSED\"";
     if (Date_Cmp($$a[2], $fourWeeksAgo) < 0) {
       if (Date_Cmp($$a[2], $eightWeeksAgo) < 0) {
 	push @LATE, $b;
@@ -635,7 +689,7 @@
 #  my @BL;
 #  foreach my $b (sort(keys %$BZ)) {
 #    my $a = $BZ->{$b};
-#    next if $$a[5] eq "\"CLOSED\"";
+#    next if $$a[6] eq "\"CLOSED\"";
 #    next if $$a[1] ne $$a[2];
 #    if (Date_Cmp($$a[2], $eightWeeksAgo) < 0) {
 #      push @BL, $b;
@@ -662,7 +716,8 @@
                   [$main::core]
   -d <url>        list of migrated/discarded packages
                   [$main::discarded]
-  -o <file>       owners.list file\n";
+  -o <file>       owners.list file
+  -cvs <dir>      extras CVS directory [$main::cvsDir]\n";
   exit 1;
 }
 
@@ -703,8 +758,8 @@
     join(",", @$BL), "\n";
   foreach my $b (@$BL) {
     my $a = $BZ->{$b};
-    my ($owner) = $$a[4] =~ /^.([^@]+)/;
-    printf "  %-40s %s\n", $$a[8], $owner;
+    my ($owner) = $$a[5] =~ /^.([^@]+)/;
+    printf "  %-40s %s\n", $$a[10], $owner;
   }
 }
 
@@ -713,11 +768,11 @@
   my %O;
   foreach my $b (@$BL) {
     my $a = $BZ->{$b};
-    my $e = $O{$$a[4]};
+    my $e = $O{$$a[5]};
     if (defined $e) {
       push @$e, $a;
     } else {
-      $O{$$a[4]} = [ $a ];
+      $O{$$a[5]} = [ $a ];
     }
   }
   foreach my $n (sort(keys %O)) {
@@ -726,9 +781,9 @@
     $n =~ s/\@/ at /;
     $n =~ s/\./ dot /g;
     foreach my $a (@$e) {
-      print "||$n||`$$a[8]`||[";
+      print "||$n||`$$a[10]`||[";
       print "https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=$$a[0] $$a[0]";
-      print "]||$$a[9]||\n";
+      print "]||$$a[11]||\n";
     }
   }
 }
@@ -785,11 +840,54 @@
   my @BL;
   foreach my $b (sort(keys %$BZ)) {
     my $a = $BZ->{$b};
-    next if $$a[5] eq "\"CLOSED\"";
-    next unless defined $OWN{$$a[8]};
-    delete $OWN{$$a[8]};
+    next if $$a[6] eq "\"CLOSED\"";
+    next unless defined $OWN{$$a[10]};
+    delete $OWN{$$a[10]};
     push @BL, $b;
   }
   $COUNT_LIST{"openInOwners"} += $#BL + 1;
   $BUG_LIST{"openInOwners$cur"} = \@BL;
 }
+
+sub checkLowCVSActivity {
+  my @PL;
+  foreach my $k (keys %OWN) {
+    next if defined $OWN_CVS_RECENT{$k};
+    push @PL, $k;
+  }
+  $COUNT_LIST{"lowCVSActivity"} = $#PL + 1;
+  $PKG_LIST{"lowCVSActivity"} = \@PL;
+}
+
+sub displayCVSWiki {
+  print "\n\n== About CVS repository ==\n\n";
+  print "\n\n=== Package count ===\n";
+  print "\nWe have $COUNT_LIST{'CVS'} packages with a devel directory\n";
+  my @A = sort(keys %CVS_NO_OWNER);
+  if ($#A >= 0) {
+    my $cnt = $#A + 1;
+    print "\n=== Packages in CVS with no entry in the owners.list ===\n";
+    print "\nWe have $cnt packages in CVS with no owners entry:{{{\n";
+    print join("\n", @A), "}}}\n";
+  }
+  if ($COUNT_LIST{"lowCVSActivity"} > 0) {
+    print "\n=== Packages not touched in the last 12 weeks ===\n";
+    print "\nWe have $COUNT_LIST{'lowCVSActivity'} packages with no CVS ",
+      "activity in the last 12 weeks:\n";
+    &displayPkgListByOwnerWiki($PKG_LIST{"lowCVSActivity"});
+  }
+}
+
+sub displayCVSMail {
+  print STDERR "\nCVS stats:\n";
+  print STDERR " - $COUNT_LIST{'CVS'} packages with a devel directory\n";
+  my @A = keys %CVS_NO_OWNER;
+  if ($#A >= 0) {
+    my $cnt = $#A + 1;
+    print STDERR " - $cnt packages with no owners entry\n";
+  }
+  if ($COUNT_LIST{"lowCVSActivity"} > 0) {
+    print STDERR " - $COUNT_LIST{'lowCVSActivity'} packages with no CVS ",
+      "activity in the last 12 weeks\n";
+  }
+}



From fedora-extras-commits at redhat.com  Wed Apr 19 10:06:29 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 19 Apr 2006 03:06:29 -0700
Subject: owners owners.list,1.858,1.859
Message-ID: <200604191006.k3JA6Vlg004155@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4132

Modified Files:
	owners.list 
Log Message:
perl-Crypt-RSA



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.858
retrieving revision 1.859
diff -u -r1.858 -r1.859
--- owners.list	18 Apr 2006 18:41:24 -0000	1.858
+++ owners.list	19 Apr 2006 10:06:29 -0000	1.859
@@ -913,6 +913,7 @@
 Fedora Extras|perl-Crypt-DSA|Perl module for DSA signatures and key generation|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Crypt-Primes|Provable prime number generator for cryptographic applications|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Crypt-Random|Cryptographically Secure, True Random Number Generator|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Crypt-RSA|RSA public-key cryptosystem|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Crypt-SmbHash|Pure-perl Lanman and NT MD4 hash functions|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Data-Buffer|Read/write buffer class for perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Data-HexDump|Hexadecial Dumper|andreas at bawue.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Wed Apr 19 10:06:51 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 03:06:51 -0700
Subject: status-report-scripts parseBZbugList,1.15,1.16
Message-ID: <200604191006.k3JA6pmx004183@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4163

Modified Files:
	parseBZbugList 
Log Message:
Fix some display things.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- parseBZbugList	19 Apr 2006 10:05:58 -0000	1.15
+++ parseBZbugList	19 Apr 2006 10:06:48 -0000	1.16
@@ -221,6 +221,8 @@
     $F[10] =~ s/["]//g;
     $F[10] =~ s/^review\s+request:?\s+<?//i;
     $F[10] =~ s/[:.,>]?\s.*$//g;
+  } else {
+    $F[10] = $F[8];
   }
   my $block = 0;
   my $sponsor = 0;
@@ -283,10 +285,10 @@
   &UnixDate("today", "%b %e, %Y"), " =\n";
 &displayOwnersWiki;
 &displayAcceptWiki(\%BZA);
-&displayNewReviewWiki(\%BZR, "FE-REVIEW");
-&displayNewReviewWiki(\%BZN, "FE-NEW");
-&displayNewReviewWiki(\%BZS, "FE-NEEDSPONSOR");
-&displayNewReviewWiki(\%BZB, "OPEN-BUGS");
+&displayNewReviewWiki(\%BZR, "FE-REVIEW", 5);
+&displayNewReviewWiki(\%BZN, "FE-NEW", 5);
+&displayNewReviewWiki(\%BZS, "FE-NEEDSPONSOR", 5);
+&displayNewReviewWiki(\%BZB, "OPEN-BUGS", 4);
 &displayCVSWiki();
 print "----\nCategoryExtras\n";
 print STDERR "\n\nFE Package Status of ",
@@ -392,8 +394,8 @@
     print "\n\n=== Packages that have not yet completed review ===\n";
     print "\nWe have $COUNT_LIST{'openInOwners'} packages ",
       "which have not yet been FE-APPROVE'd...\n";
-    &displayBLWiki($BUG_LIST{"openInOwnersFE-REVIEW"}, \%BZR);
-    &displayBLWiki($BUG_LIST{"openInOwnersFE-NEW"}, \%BZN);
+    &displayBLWiki($BUG_LIST{"openInOwnersFE-REVIEW"}, \%BZR, 5);
+    &displayBLWiki($BUG_LIST{"openInOwnersFE-NEW"}, \%BZN, 5);
   }
   if ($COUNT_LIST{"extrasNoOwner"} > 0) {
     print "\n\n=== Packages missing in owners.list ===\n";
@@ -572,23 +574,23 @@
   if ($COUNT_LIST{"missing"} > 0) {
     print "\nWe have $COUNT_LIST{'missing'} accepted, closed packages where I'm unable to ",
       "find the package in the development repo:\n";
-    &displayBLWiki($BUG_LIST{"acceptedNoDevel"}, $BZ);
+    &displayBLWiki($BUG_LIST{"acceptedNoDevel"}, $BZ, 5);
   }
   if ($COUNT_LIST{"missingOwner"} > 0) {
     print "\nWe have $COUNT_LIST{'missingOwner'} accepted, closed packages where I'm unable to ",
       "find the package in the owners file:\n";
-    &displayBLWiki($BUG_LIST{"acceptedNoOwn"}, $BZ);
+    &displayBLWiki($BUG_LIST{"acceptedNoOwn"}, $BZ, 5);
   }
   if ($COUNT_LIST{"acceptOpenInactive"} >= 0) {
     print "\n\n=== Inactivity notice ===\n";
     print "\nWe have $COUNT_LIST{'acceptOpenInactive'} accepted, open package reviews older than 4 weeks\n";
-    &displayBLWiki($BUG_LIST{"acceptOpenInactive"}, $BZ);
+    &displayBLWiki($BUG_LIST{"acceptOpenInactive"}, $BZ, 5);
   }
   if ($COUNT_LIST{"acceptOpenInDevel"} > 0) {
     print "\n\n=== Some cleanup needed ===\n";
     print "\nWe have $COUNT_LIST{'acceptOpenInDevel'} accepted, open package reviews where the package ",
       "appears to already be in the repo...\n";
-    &displayBLWiki($BUG_LIST{"acceptOpenInDevel"}, $BZ);
+    &displayBLWiki($BUG_LIST{"acceptOpenInDevel"}, $BZ, 5);
   }
 }
 
@@ -764,15 +766,15 @@
 }
 
 sub displayBLWiki {
-  my ($BL, $BZ) = @_;
+  my ($BL, $BZ, $field) = @_;
   my %O;
   foreach my $b (@$BL) {
     my $a = $BZ->{$b};
-    my $e = $O{$$a[5]};
+    my $e = $O{$$a[$field]};
     if (defined $e) {
       push @$e, $a;
     } else {
-      $O{$$a[5]} = [ $a ];
+      $O{$$a[$field]} = [ $a ];
     }
   }
   foreach my $n (sort(keys %O)) {
@@ -789,7 +791,7 @@
 }
 
 sub displayNewReviewWiki {
-  my ($BZ, $cur) = @_;
+  my ($BZ, $cur, $field) = @_;
   print "\n\n== About $cur packages ==\n";
   print "\n\n=== Open ticket count ===\n";
   my $cnt = $COUNT_LIST{"open$cur"};
@@ -800,19 +802,19 @@
     if ($COUNT_LIST{"inactive8$cur"} > 0) {
       $cnt = $COUNT_LIST{"inactive8$cur"};
       print "\nWe have $cnt $cur tickets with no activity in eight weeks\n";
-      &displayBLWiki($BUG_LIST{"inactive8$cur"}, $BZ);
+      &displayBLWiki($BUG_LIST{"inactive8$cur"}, $BZ, $field);
     }
     if ($COUNT_LIST{"inactive4$cur"} > 0) {
       $cnt = $COUNT_LIST{"inactive4$cur"};
       print "\nWe have $cnt $cur tickets with no activity in four weeks\n";
-      &displayBLWiki($BUG_LIST{"inactive4$cur"}, $BZ);
+      &displayBLWiki($BUG_LIST{"inactive4$cur"}, $BZ, $field);
     }
   }
   if ($COUNT_LIST{"closed$cur"} > 0) {
     print "\n\n=== Some cleanup needed ===\n";
     $cnt = $COUNT_LIST{"closed$cur"};
     print "\nWe have $cnt closed tickets still blocking $cur\n";
-    &displayBLWiki($BUG_LIST{"closed$cur"}, $BZ);
+    &displayBLWiki($BUG_LIST{"closed$cur"}, $BZ, $field);
   }
 }
 



From fedora-extras-commits at redhat.com  Wed Apr 19 10:07:37 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 03:07:37 -0700
Subject: status-report-scripts parseBZbugList,1.16,1.17
Message-ID: <200604191007.k3JA7bUw004260@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4242

Modified Files:
	parseBZbugList 
Log Message:
Add FC_INTEGRATED to all SRPMS.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- parseBZbugList	19 Apr 2006 10:06:48 -0000	1.16
+++ parseBZbugList	19 Apr 2006 10:07:34 -0000	1.17
@@ -144,6 +144,9 @@
 foreach my $k (keys %CORE) {
   $SRPMS{$k} = 1;
 }
+foreach my $k (keys %FC_INTEGRATED) {
+  $SRPMS{$k} = 1;
+}
 # Take a look at CVS stuff
 if (-d $main::cvsDir) {
   $main::cvsDir =~ s/\/+$//;



From fedora-extras-commits at redhat.com  Wed Apr 19 10:08:17 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 03:08:17 -0700
Subject: status-report-scripts parseBZbugList,1.17,1.18
Message-ID: <200604191008.k3JA8Hqj004293@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4275

Modified Files:
	parseBZbugList 
Log Message:
Add FE-LEGAL.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- parseBZbugList	19 Apr 2006 10:07:34 -0000	1.17
+++ parseBZbugList	19 Apr 2006 10:08:14 -0000	1.18
@@ -44,8 +44,10 @@
 my $FE_REVIEW = 163778;
 my $FE_ACCEPT = 163779;
 my $FE_NEEDSPONSOR = 177841;
+my $FE_LEGAL = 182235;
 my %BZN;
 my %BZS;
+my %BZL;
 my %BZR;
 my %BZA;
 my %BZB;
@@ -229,6 +231,7 @@
   }
   my $block = 0;
   my $sponsor = 0;
+  my $legal = 0;
   my $bzb;
   foreach my $b (@B) {
     if ($b == $FE_NEW) {
@@ -246,6 +249,9 @@
     if ($b == $FE_NEEDSPONSOR) {
       $sponsor = 1;
     }
+    if ($b == $FE_LEGAL) {
+      $legal = 1;
+    }
   }
   if ($block > 1) {
     print "Warning: bug $F[0] blocks several FE_ blockers.\n";
@@ -256,6 +262,9 @@
     if ($sponsor == 1 && $bzb == \%BZN) {
       $BZS{$F[0]} = \@F;
     }
+    if ($legal == 1 && $bzb == \%BZN) {
+      $BZL{$F[0]} = \@F;
+    }
     next;
   }
   if (defined $OWN{$F[8]}) {
@@ -282,6 +291,8 @@
 #&checkNoActivity(\%BZN, "FE-NEW");
 &countOpen(\%BZS, "FE-NEEDSPONSOR");
 &checkLowActivity(\%BZS, "FE-NEEDSPONSOR");
+&countOpen(\%BZL, "FE-LEGAL");
+&checkLowActivity(\%BZL, "FE-LEGAL");
 &checkLowCVSActivity();
 &checkLowActivity(\%BZB, "OPEN-BUGS");
 print "[[TableOfContents]]\n\n= FE Package Status of ",
@@ -291,6 +302,7 @@
 &displayNewReviewWiki(\%BZR, "FE-REVIEW", 5);
 &displayNewReviewWiki(\%BZN, "FE-NEW", 5);
 &displayNewReviewWiki(\%BZS, "FE-NEEDSPONSOR", 5);
+&displayNewReviewWiki(\%BZL, "FE-LEGAL", 5);
 &displayNewReviewWiki(\%BZB, "OPEN-BUGS", 4);
 &displayCVSWiki();
 print "----\nCategoryExtras\n";



From fedora-extras-commits at redhat.com  Wed Apr 19 10:09:14 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 03:09:14 -0700
Subject: status-report-scripts parseBZbugList,1.18,1.19
Message-ID: <200604191009.k3JA9Eeb004322@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4304

Modified Files:
	parseBZbugList 
Log Message:
Start to add more owner info.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- parseBZbugList	19 Apr 2006 10:08:14 -0000	1.18
+++ parseBZbugList	19 Apr 2006 10:09:12 -0000	1.19
@@ -66,7 +66,7 @@
 my %BUG_LIST;
 my %OWNER_LIST;
 my %COUNT_LIST;
-my %OWNER_CNT;
+my %OWNER_STAT;
 my %BZOWN_CNT;
 my %BZREV_CNT;
 if ($main::bzid ne "") {
@@ -360,7 +360,15 @@
       push @OE, $k if defined $EXTRAS{$k};
       next;
     }
-    $OWNER_CNT{$$a[3]} += 1;
+    my $s = $OWNER_STAT{$$a[3]};
+    if (defined $s) {
+      $$s[0] += 1;
+    } else {
+      # We have pkg_cnt, open_bugs, touched_pkgs
+      $OWNER_STAT{$$a[3]} = [ 1, 0, 0 ];
+      $s = $OWNER_STAT{$$a[3]};
+    }
+    $$s[2] = 1 unless defined $OWN_CVS_RECENT{$k};
     unless (defined $EXTRAS{$k}) {
       if (defined($CORE{$k}) || defined($FC_INTEGRATED{$k})) {
 	push @NPC, $k;
@@ -373,7 +381,11 @@
       }
     }
   }
-  my @TO = sort {$OWNER_CNT{$b} <=> $OWNER_CNT{$a}} keys %OWNER_CNT;
+  my @TO = sort {
+    my $ca = $OWNER_STAT{$a};
+    my $cb = $OWNER_STAT{$b};
+    $$cb[0] <=> $$ca[0];
+  } keys %OWNER_STAT;
   $COUNT_LIST{"owner"} = $cnt;
   $COUNT_LIST{"orphan"} = $orphan;
   $OWNER_LIST{"package"} = \@TO;
@@ -390,7 +402,7 @@
   print "There are $COUNT_LIST{'orphan'} orphans.\n";
   print "\n=== Top 10 package owners ===\n";
   my $a = $OWNER_LIST{"package"};
-  &displayOwnerCntWiki($a, \%OWNER_CNT);
+  &displayOwnerCntWiki($a, \%OWNER_STAT);
   print "\n=== Packages not present in the development repo ===\n";
   $a = $PKG_LIST{"NotDevelNotRel"};
   if ($#$a >= 0) {
@@ -453,7 +465,8 @@
     $n =~ s/["]//g;
     $n =~ s/\@/ at /;
     $n =~ s/\./ dot /g;
-    print "||$n||$c->{$$a[$i]}||\n";
+    my $aa = $c->{$$a[$i]};
+    print "||$n||$$aa[0]||\n";
   }
 }
 



From fedora-extras-commits at redhat.com  Wed Apr 19 10:10:09 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 03:10:09 -0700
Subject: status-report-scripts parseBZbugList,1.19,1.20
Message-ID: <200604191010.k3JAA9sq004351@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4333

Modified Files:
	parseBZbugList 
Log Message:
Add more maintainer info.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- parseBZbugList	19 Apr 2006 10:09:12 -0000	1.19
+++ parseBZbugList	19 Apr 2006 10:10:06 -0000	1.20
@@ -45,6 +45,7 @@
 my $FE_ACCEPT = 163779;
 my $FE_NEEDSPONSOR = 177841;
 my $FE_LEGAL = 182235;
+my $extras_orphan = 'extras-orphan at fedoraproject.org';
 my %BZN;
 my %BZS;
 my %BZL;
@@ -64,6 +65,7 @@
 my %FC_INTEGRATED;
 my %PKG_LIST;
 my %BUG_LIST;
+my %MAINT_LIST;
 my %OWNER_LIST;
 my %COUNT_LIST;
 my %OWNER_STAT;
@@ -121,6 +123,7 @@
     next if /^#/;
     s/\s+$//;
     my @F = split /\|/;
+    next if $F[1] eq "";
     if (defined $DISCARD{$F[1]}) {
       $DISCARD{$F[1]} += 1;
       next;
@@ -172,7 +175,7 @@
   while ( <IN> ) {
     s/\s+$//;
     $COUNT_LIST{"CVS"} += 1;
-    next if defined $OWN{$_};
+    next if defined($OWN{$_}) || defined($DISCARD{$_});
     $CVS_NO_OWNER{$_} = 1;
   }
   close IN;
@@ -293,8 +296,9 @@
 &checkLowActivity(\%BZS, "FE-NEEDSPONSOR");
 &countOpen(\%BZL, "FE-LEGAL");
 &checkLowActivity(\%BZL, "FE-LEGAL");
-&checkLowCVSActivity();
 &checkLowActivity(\%BZB, "OPEN-BUGS");
+&checkBugs(\%BZB);
+&checkMaintainers();
 print "[[TableOfContents]]\n\n= FE Package Status of ",
   &UnixDate("today", "%b %e, %Y"), " =\n";
 &displayOwnersWiki;
@@ -305,6 +309,7 @@
 &displayNewReviewWiki(\%BZL, "FE-LEGAL", 5);
 &displayNewReviewWiki(\%BZB, "OPEN-BUGS", 4);
 &displayCVSWiki();
+&displayMaintainersWiki();
 print "----\nCategoryExtras\n";
 print STDERR "\n\nFE Package Status of ",
   &UnixDate("today", "%b %e, %Y"), "\n";
@@ -317,6 +322,7 @@
 &displayNewReviewMail("FE-NEEDSPONSOR");
 &displayNewReviewMail("OPEN-BUGS");
 &displayCVSMail();
+&displayMaintainersMail();
 
 exit 0;
 
@@ -351,24 +357,26 @@
       }
     }
   }
+  $OWNER_STAT{$extras_orphan} = [ 0, 0, 0, 0, {} ];
   foreach my $k (keys %OWN) {
     my $a = $OWN{$k};
     next if $$a[0] ne "Fedora Extras";
     $cnt += 1;
-    if ($$a[3] eq 'extras-orphan at fedoraproject.org') {
-      $orphan += 1;
-      push @OE, $k if defined $EXTRAS{$k};
-      next;
-    }
     my $s = $OWNER_STAT{$$a[3]};
     if (defined $s) {
       $$s[0] += 1;
     } else {
-      # We have pkg_cnt, open_bugs, touched_pkgs
-      $OWNER_STAT{$$a[3]} = [ 1, 0, 0 ];
+      # We have pkg_cnt, open_bugs, touched_pkgs, touched_bugs, bugs_hash
+      $OWNER_STAT{$$a[3]} = [ 1, 0, 0, 0, {} ];
       $s = $OWNER_STAT{$$a[3]};
     }
-    $$s[2] = 1 unless defined $OWN_CVS_RECENT{$k};
+    if ($$a[3] eq $extras_orphan) {
+      $orphan += 1;
+      push @OE, $k if defined $EXTRAS{$k};
+      next;
+    } else {
+      $$s[2] = 1 if defined $OWN_CVS_RECENT{$k};
+    }
     unless (defined $EXTRAS{$k}) {
       if (defined($CORE{$k}) || defined($FC_INTEGRATED{$k})) {
 	push @NPC, $k;
@@ -401,10 +409,9 @@
   print "We have $COUNT_LIST{'owner'} extras packages in owners file.[[BR]]\n";
   print "There are $COUNT_LIST{'orphan'} orphans.\n";
   print "\n=== Top 10 package owners ===\n";
-  my $a = $OWNER_LIST{"package"};
-  &displayOwnerCntWiki($a, \%OWNER_STAT);
+  &displayOwnerCntWiki($OWNER_LIST{"package"}, \%OWNER_STAT, 0);
   print "\n=== Packages not present in the development repo ===\n";
-  $a = $PKG_LIST{"NotDevelNotRel"};
+  my $a = $PKG_LIST{"NotDevelNotRel"};
   if ($#$a >= 0) {
     my $cnt = $#$a + 1;
     print "\nWe have $cnt packages not available in extras devel or release:\n";
@@ -459,15 +466,17 @@
 }
 
 sub displayOwnerCntWiki {
-  my ($a, $c) = @_;
+  my ($a, $c, $aref) = @_;
   for my $i (0 .. 9) {
     my $n = $$a[$i];
     $n =~ s/["]//g;
     $n =~ s/\@/ at /;
     $n =~ s/\./ dot /g;
     my $aa = $c->{$$a[$i]};
-    print "||$n||$$aa[0]||\n";
+    $aa = $$aa[$aref] if defined $aref;
+    print "||$n||$aa||\n";
   }
+  print "\n";
 }
 
 sub displayPkgListByOwnerWiki {
@@ -595,9 +604,9 @@
   print "\n\n=== Package count ===\n";
   print "\nWe have $COUNT_LIST{'acceptedClosed'} accepted, closed package reviews\n";
   print "\n=== Top 10 BZ review requests submitters ===\n";
-  &displayOwnerCntWiki($OWNER_LIST{"BZOwner"}, \%BZOWN_CNT);
+  &displayOwnerCntWiki($OWNER_LIST{"BZOwner"}, \%BZOWN_CNT, undef);
   print "\n=== Top 10 BZ review requests reviewers ===\n";
-  &displayOwnerCntWiki($OWNER_LIST{"BZReviewer"}, \%BZREV_CNT);
+  &displayOwnerCntWiki($OWNER_LIST{"BZReviewer"}, \%BZREV_CNT, undef);
   print "\n\n=== Potential problems ===\n";
   if ($COUNT_LIST{"missing"} > 0) {
     print "\nWe have $COUNT_LIST{'missing'} accepted, closed packages where I'm unable to ",
@@ -674,7 +683,7 @@
 
 sub countOpen {
   my ($BZ, $cur) = @_;
-  foreach my $b (sort(keys %$BZ)) {
+  foreach my $b (keys %$BZ) {
     my $a = $BZ->{$b};
     next if $$a[6] eq "\"CLOSED\"";
     $COUNT_LIST{"open$cur"} += 1;
@@ -879,14 +888,25 @@
   $BUG_LIST{"openInOwners$cur"} = \@BL;
 }
 
-sub checkLowCVSActivity {
+sub checkMaintainers {
   my @PL;
-  foreach my $k (keys %OWN) {
-    next if defined $OWN_CVS_RECENT{$k};
-    push @PL, $k;
+  my @BL;
+  my @O = keys %OWNER_STAT;
+  foreach my $k (@O) {
+    my $a = $OWNER_STAT{$k};
+    #next unless $$a[2] == 0 && $$a[3] == 0;
+    next unless $$a[2] == 0;
+    if ($$a[1] > 0) {
+      push @BL, $k;
+    } else {
+      push @PL, $k;
+    }
   }
-  $COUNT_LIST{"lowCVSActivity"} = $#PL + 1;
-  $PKG_LIST{"lowCVSActivity"} = \@PL;
+  $MAINT_LIST{"bugs"} = \@BL;
+  $MAINT_LIST{"packages"} = \@PL;
+  $COUNT_LIST{'maintainers'} = $#O + 1;
+  $COUNT_LIST{'maintbugs'} = $#BL + 1;
+  $COUNT_LIST{'maintpkg'} = $#PL + 1;
 }
 
 sub displayCVSWiki {
@@ -900,12 +920,6 @@
     print "\nWe have $cnt packages in CVS with no owners entry:{{{\n";
     print join("\n", @A), "}}}\n";
   }
-  if ($COUNT_LIST{"lowCVSActivity"} > 0) {
-    print "\n=== Packages not touched in the last 12 weeks ===\n";
-    print "\nWe have $COUNT_LIST{'lowCVSActivity'} packages with no CVS ",
-      "activity in the last 12 weeks:\n";
-    &displayPkgListByOwnerWiki($PKG_LIST{"lowCVSActivity"});
-  }
 }
 
 sub displayCVSMail {
@@ -916,8 +930,80 @@
     my $cnt = $#A + 1;
     print STDERR " - $cnt packages with no owners entry\n";
   }
-  if ($COUNT_LIST{"lowCVSActivity"} > 0) {
-    print STDERR " - $COUNT_LIST{'lowCVSActivity'} packages with no CVS ",
-      "activity in the last 12 weeks\n";
+}
+
+sub checkBugs {
+  my ($BZ) = @_;
+  foreach my $b (keys %$BZ) {
+    my $a = $BZ->{$b};
+    my $assignee = $$a[4];
+    $assignee =~ s/["]//g;
+    my $s = $OWNER_STAT{$assignee};
+    unless (defined $s) {
+      my $o = $OWN{$$a[10]};
+      print STDERR "Change $assignee to $$o[3]\n";
+      $s = $OWNER_STAT{$$o[3]};
+    }
+    die "Couldn't find OWNER_STAT for $assignee $$a[10]" unless defined $s;
+    $$s[1] += 1;
+    if (Date_Cmp($$a[2], $eightWeeksAgo) >= 0) {
+      $$s[3] = 1;
+    }
+    $$s[4]->{$b} = $a;
+  }
+  my @TO = sort {
+    my $ca = $OWNER_STAT{$a};
+    my $cb = $OWNER_STAT{$b};
+    $$cb[1] <=> $$ca[1];
+  } keys %OWNER_STAT;
+  $OWNER_LIST{"bugs"} = \@TO;
+}
+
+sub displayMaintainersWiki {
+  print "== About maintainers ==\n\n";
+  print "=== Maintainers count ===\n\n";
+  print "We have $COUNT_LIST{'maintainers'} maintainers in owners file.[[BR]]\n";
+  print "\n=== Top 10 bugs assignees ===\n";
+  &displayOwnerCntWiki($OWNER_LIST{"bugs"}, \%OWNER_STAT, 1);
+  if ($COUNT_LIST{'maintbugs'} > 0) {
+    print "=== Inactive maintainers with open bug reports ===\n\n";
+    print "We have $COUNT_LIST{'maintbugs'} maintainers with open bugs that ",
+      "have had no noticeable CVS activity in the last 12 weeks\n";
+    my $a = $MAINT_LIST{"bugs"};
+    foreach my $k (sort @$a) {
+      my $e = $OWNER_STAT{$k};
+      my $bugs = $$e[4];
+      my @K = keys %$bugs;
+      &displayBLWiki(\@K, $bugs, 4);
+    }
+  }
+  if ($COUNT_LIST{'maintpkg'} > 0) {
+    print "=== Inactive maintainers ===\n\n";
+    print "We have $COUNT_LIST{'maintpkg'} maintainers that ",
+      "have had no noticeable CVS activity in the last 12 weeks:\n";
+    my $a = $MAINT_LIST{"packages"};
+    foreach my $k (sort @$a) {
+      my $n = $k;
+      $n =~ s/\@/ at /;
+      $n =~ s/\./ dot /g;
+      foreach my $o (keys %OWN) {
+	my $e = $OWN{$o};
+	next unless $$e[3] eq $k;
+	print "||$n||$o||\n";
+      }
+    }
+    print "\n";
+  }
+}
+
+sub displayMaintainersMail {
+  print STDERR "\nMaintainers stats:\n";
+  print STDERR " - $COUNT_LIST{'maintainers'} maintainers\n";
+  if ($COUNT_LIST{'maintbugs'} > 0) {
+    print STDERR " - $COUNT_LIST{'maintbugs'} inactive maintainers with ",
+      "open bugs\n";
+  }
+  if ($COUNT_LIST{'maintpkg'} > 0) {
+    print STDERR " - $COUNT_LIST{'maintpkg'} inactive maintainers\n";
   }
 }



From fedora-extras-commits at redhat.com  Wed Apr 19 10:10:58 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 03:10:58 -0700
Subject: status-report-scripts parseBZbugList,1.20,1.21
Message-ID: <200604191010.k3JAAwWf004381@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4362

Modified Files:
	parseBZbugList 
Log Message:
Add some more stuff in the mail report.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- parseBZbugList	19 Apr 2006 10:10:06 -0000	1.20
+++ parseBZbugList	19 Apr 2006 10:10:56 -0000	1.21
@@ -502,6 +502,29 @@
   }
 }
 
+sub displayPkgListByOwnerMail {
+  my ($a) = @_;
+  my %PO;
+  foreach my $p (@$a) {
+    my $oa = $OWN{$p};
+    my $owner = $$oa[3];
+    my $e = $PO{$owner};
+    if (defined $e) {
+      push @$e, $p;
+    } else {
+      $PO{$owner} = [ $p ];
+    }
+  }
+  foreach my $owner (sort(keys %PO)) {
+    my $e = $PO{$owner};
+    $owner =~ s/\@/ at /;
+    $owner =~ s/\./ dot /g;
+    foreach my $p (@$e) {
+      printf STDERR "    %-42s %s\n", $owner, $p;
+    }
+  }
+}
+
 sub displayOwnersMail {
   print STDERR "\nOwners file stats:\n";
   print STDERR " - $COUNT_LIST{'owner'} packages\n";
@@ -510,12 +533,14 @@
   if ($#$a >= 0) {
     my $cnt = $#$a + 1;
     print STDERR " - $cnt packages not available in extras devel or release\n";
+    &displayPkgListByOwnerMail($a);
   }
   $a = $PKG_LIST{"NotDevel"};
   if ($#$a >= 0) {
     my $cnt = $#$a + 1;
     print STDERR " - $cnt packages not available in extras devel ";
     print STDERR "but present in release\n";
+    &displayPkgListByOwnerMail($a);
   }
   if ($COUNT_LIST{"openInOwners"} > 0) {
     print STDERR " - $COUNT_LIST{'openInOwners'} packages ",
@@ -524,6 +549,10 @@
   if ($COUNT_LIST{"extrasNoOwner"} > 0) {
     print STDERR " - $COUNT_LIST{'extrasNoOwner'} packages present in the ",
       "development repo which have no owners entry\n";
+    my $p = $PKG_LIST{"extrasNoOwner"};
+    my $s = &toLine(join(" ", @$p));
+    $s =~ s/\n/\n    /sg;
+    print STDERR "    $s\n";
   }
   my @DUP = sort(keys %OWN_DUP);
   if ($#DUP >= 0) {
@@ -534,6 +563,9 @@
   if ($#$a >= 0) {
     my $cnt = $#$a + 1;
     print STDERR " - $cnt orphaned packages, yet available in extras devel\n";
+    my $s = &toLine(join(" ", sort @$a));
+    $s =~ s/\n/\n    /sg;
+    print STDERR "    $s\n";
   }
   $a = $PKG_LIST{"MovedToCore"};
   if ($#$a >= 0) {
@@ -777,7 +809,7 @@
 sub toLine {
   my ($s) = @_;
   my $p1 = 0;
-  my $p2 = $p1 + 78;
+  my $p2 = $p1 + 72;
   while ($p2 < length($s)) {
     my $p3 = rindex $s, " ", $p2;
     if ($p3 < $p1) {
@@ -786,7 +818,7 @@
     }
     substr $s, $p3, 1, "\n";
     $p1 = $p3 + 1;
-    $p2 = $p1 + 78;
+    $p2 = $p1 + 72;
   }
   return $s;
 }



From fedora-extras-commits at redhat.com  Wed Apr 19 10:11:55 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 03:11:55 -0700
Subject: status-report-scripts parseBZbugList,1.21,1.22
Message-ID: <200604191011.k3JABtaD004417@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4397

Modified Files:
	parseBZbugList 
Log Message:
Add a few missing lines...


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- parseBZbugList	19 Apr 2006 10:10:56 -0000	1.21
+++ parseBZbugList	19 Apr 2006 10:11:52 -0000	1.22
@@ -320,6 +320,7 @@
 &displayNewReviewMail("FE-REVIEW");
 &displayNewReviewMail("FE-NEW");
 &displayNewReviewMail("FE-NEEDSPONSOR");
+&displayNewReviewMail("FE-LEGAL");
 &displayNewReviewMail("OPEN-BUGS");
 &displayCVSMail();
 &displayMaintainersMail();
@@ -550,7 +551,7 @@
     print STDERR " - $COUNT_LIST{'extrasNoOwner'} packages present in the ",
       "development repo which have no owners entry\n";
     my $p = $PKG_LIST{"extrasNoOwner"};
-    my $s = &toLine(join(" ", @$p));
+    my $s = &toLine(join(" ", sort @$p));
     $s =~ s/\n/\n    /sg;
     print STDERR "    $s\n";
   }
@@ -957,10 +958,13 @@
 sub displayCVSMail {
   print STDERR "\nCVS stats:\n";
   print STDERR " - $COUNT_LIST{'CVS'} packages with a devel directory\n";
-  my @A = keys %CVS_NO_OWNER;
+  my @A = sort(keys %CVS_NO_OWNER);
   if ($#A >= 0) {
     my $cnt = $#A + 1;
     print STDERR " - $cnt packages with no owners entry\n";
+    my $s = &toLine(join(" ", @A));
+    $s =~ s/\n/\n    /sg;
+    print STDERR "    $s\n";
   }
 }
 



From fedora-extras-commits at redhat.com  Wed Apr 19 10:13:03 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 03:13:03 -0700
Subject: status-report-scripts parseBZbugList,1.22,1.23
Message-ID: <200604191013.k3JAD3NZ004446@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4428

Modified Files:
	parseBZbugList 
Log Message:
Add a few more output.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- parseBZbugList	19 Apr 2006 10:11:52 -0000	1.22
+++ parseBZbugList	19 Apr 2006 10:13:01 -0000	1.23
@@ -546,6 +546,8 @@
   if ($COUNT_LIST{"openInOwners"} > 0) {
     print STDERR " - $COUNT_LIST{'openInOwners'} packages ",
       "which have not yet been FE-APPROVE'd...\n";
+    &displayBL($BUG_LIST{"openInOwnersFE-REVIEW"}, \%BZR, 5);
+    &displayBL($BUG_LIST{"openInOwnersFE-NEW"}, \%BZN, 5);
   }
   if ($COUNT_LIST{"extrasNoOwner"} > 0) {
     print STDERR " - $COUNT_LIST{'extrasNoOwner'} packages present in the ",
@@ -770,7 +772,7 @@
 #  if ($#BL >= 0) {
 #    my $cnt = $#BL + 1;
 #    print "\nWe have $cnt $cur tickets 8 weeks old with no comments\n";
-#    &displayBL(\@BL, $BZ);
+#    &displayBL(\@BL, $BZ, 5);
 #  }
 #}
 
@@ -825,13 +827,15 @@
 }
 
 sub displayBL {
-  my ($BL, $BZ) = @_;
-  print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
+  my ($BL, $BZ, $field) = @_;
+  print STDERR "   https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
     join(",", @$BL), "\n";
-  foreach my $b (@$BL) {
+  foreach my $b (sort @$BL) {
     my $a = $BZ->{$b};
-    my ($owner) = $$a[5] =~ /^.([^@]+)/;
-    printf "  %-40s %s\n", $$a[10], $owner;
+    my $owner = $$a[$field];
+    $owner =~ s/["]//g;
+    $owner =~ s/\@/ at /;
+    printf STDERR "     %-40s %s\n", $$a[10], $owner;
   }
 }
 



From fedora-extras-commits at redhat.com  Wed Apr 19 10:13:52 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 03:13:52 -0700
Subject: status-report-scripts parseBZbugList,1.23,1.24
Message-ID: <200604191013.k3JADq0Q004480@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4462

Modified Files:
	parseBZbugList 
Log Message:
Check owners in lower-case.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- parseBZbugList	19 Apr 2006 10:13:01 -0000	1.23
+++ parseBZbugList	19 Apr 2006 10:13:49 -0000	1.24
@@ -914,11 +914,15 @@
 sub checkOpenInOwners {
   my ($BZ, $cur) = @_;
   my @BL;
+  my %OL;
+  foreach my $k (keys %OWN) {
+    $OL{lc $k} = $k;
+  }
   foreach my $b (sort(keys %$BZ)) {
     my $a = $BZ->{$b};
     next if $$a[6] eq "\"CLOSED\"";
-    next unless defined $OWN{$$a[10]};
-    delete $OWN{$$a[10]};
+    next unless defined $OL{lc $$a[10]};
+#    delete $OWN{$OL{lc $$a[10]}};
     push @BL, $b;
   }
   $COUNT_LIST{"openInOwners"} += $#BL + 1;



From fedora-extras-commits at redhat.com  Wed Apr 19 10:14:29 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 03:14:29 -0700
Subject: status-report-scripts parseBZbugList,1.24,1.25
Message-ID: <200604191014.k3JAETcx004511@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4493

Modified Files:
	parseBZbugList 
Log Message:
Add TODO item.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- parseBZbugList	19 Apr 2006 10:13:49 -0000	1.24
+++ parseBZbugList	19 Apr 2006 10:14:27 -0000	1.25
@@ -7,6 +7,7 @@
 # https://bugzilla.redhat.com/bugzilla/showdependencytree.cgi?id=FE-ACCEPT
 
 # TODO stuff
+#  - check that owners list is sorted
 
 use strict;
 use Getopt::Long;



From fedora-extras-commits at redhat.com  Wed Apr 19 10:15:38 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 03:15:38 -0700
Subject: status-report-scripts parseBZbugList,1.25,1.26
Message-ID: <200604191015.k3JAFcL3004544@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4526

Modified Files:
	parseBZbugList 
Log Message:
Add some checks.  Move to FC5.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- parseBZbugList	19 Apr 2006 10:14:27 -0000	1.25
+++ parseBZbugList	19 Apr 2006 10:15:36 -0000	1.26
@@ -7,7 +7,6 @@
 # https://bugzilla.redhat.com/bugzilla/showdependencytree.cgi?id=FE-ACCEPT
 
 # TODO stuff
-#  - check that owners list is sorted
 
 use strict;
 use Getopt::Long;
@@ -15,14 +14,16 @@
 
 my %opt;
 my @options = ( "help", "core=s", "extras=s", "bzid=s", "o=s", "d=s",
-		"extras_r=s", "cvs=s" );
+		"extras_r=s", "core_r=s", "cvs=s" );
 
 $main::core
   = "http://mirrors.kernel.org/fedora/core/development/SRPMS/";
+$main::core_r
+  = "http://mirrors.kernel.org/fedora/core/5/source/SRPMS/";
 $main::extras
   = "http://mirrors.kernel.org/fedora/extras/development/SRPMS/";
 $main::extras_r
-  = "http://mirrors.kernel.org/fedora/extras/4/SRPMS/";
+  = "http://mirrors.kernel.org/fedora/extras/5/SRPMS/";
 $main::discarded
   = "http://fedoraproject.org/wiki/Extras/PackagesNoLongerInDevel";
 $main::bzid
@@ -35,6 +36,7 @@
 $main::core = $opt{"core"} if defined $opt{"core"};
 $main::extras = $opt{"extras"} if defined $opt{"extras"};
 $main::extras_r = $opt{"extras_r"} if defined $opt{"extras_r"};
+$main::extras_r = $opt{"core_r"} if defined $opt{"core_r"};
 $main::discarded = $opt{"d"} if defined $opt{"d"};
 $main::bzid = $opt{"bzid"} if defined $opt{"bzid"};
 $main::cvsDir = $opt{"cvs"} if defined $opt{"cvs"};
@@ -54,6 +56,7 @@
 my %BZA;
 my %BZB;
 my %CORE;
+my %CORE_R;
 my %EXTRAS;
 my %EXTRAS_R;
 my %SRPMS;
@@ -118,6 +121,7 @@
 }
 if (defined $opt{"o"}) {
   local *IN;
+  my $prev;
   open IN, $opt{"o"} or die "Couldn't open $opt{'o'} : $!";
   # Fedora Extras|aalib|An ASCII art library|anvil at livna.org|extras-qa at fedoraproject.org|
   while ( <IN> ) {
@@ -125,6 +129,9 @@
     s/\s+$//;
     my @F = split /\|/;
     next if $F[1] eq "";
+    if ($F[1] lt $prev) {
+      print STDERR "Sorting problem in owners.list: $F[1] lt $prev\n";
+    }
     if (defined $DISCARD{$F[1]}) {
       $DISCARD{$F[1]} += 1;
       next;
@@ -146,6 +153,9 @@
 if ($main::core ne "") {
   &grabRepoList($main::core, \%CORE);
 }
+if ($main::core_r ne "") {
+  &grabRepoList($main::core_r, \%CORE_R);
+}
 %SRPMS = %EXTRAS;
 foreach my $k (keys %CORE) {
   $SRPMS{$k} = 1;
@@ -176,9 +186,14 @@
   while ( <IN> ) {
     s/\s+$//;
     $COUNT_LIST{"CVS"} += 1;
+    if (defined($CORE{$_}) && -f "$main::cvsDir/$_/devel/$_.spec") {
+      push @PL, $_;
+    }
     next if defined($OWN{$_}) || defined($DISCARD{$_});
     $CVS_NO_OWNER{$_} = 1;
   }
+  $PKG_LIST{"CVSinCore"} = \@PL;
+  $COUNT_LIST{'CVSinCore'} = $#PL + 1;
   close IN;
 }
 while ( <> ) {
@@ -300,9 +315,12 @@
 &checkLowActivity(\%BZB, "OPEN-BUGS");
 &checkBugs(\%BZB);
 &checkMaintainers();
+&checkCoreAndExtras(\%CORE_R, \%EXTRAS_R, "release");
+&checkCoreAndExtras(\%CORE, \%EXTRAS, "devel");
 print "[[TableOfContents]]\n\n= FE Package Status of ",
   &UnixDate("today", "%b %e, %Y"), " =\n";
 &displayOwnersWiki;
+&displayCommonWiki;
 &displayAcceptWiki(\%BZA);
 &displayNewReviewWiki(\%BZR, "FE-REVIEW", 5);
 &displayNewReviewWiki(\%BZN, "FE-NEW", 5);
@@ -317,6 +335,7 @@
 print STDERR "\nThe full report can be found here:\n";
 print STDERR "http://fedoraproject.org/wiki/Extras/PackageStatus\n\n";
 &displayOwnersMail;
+&displayCommonMail;
 &displayAcceptMail;
 &displayNewReviewMail("FE-REVIEW");
 &displayNewReviewMail("FE-NEW");
@@ -787,7 +806,9 @@
                   [$main::extras]
   -extras_r <url> Fedora extras SRPMS release repo
                   [$main::extras_r]
-  -core <url>     Fedora core SRPMS repo
+  -core <url>     Fedora core SRPMS development repo
+                  [$main::core]
+  -core_r <url>   Fedora core SRPMS release repo
                   [$main::core]
   -d <url>        list of migrated/discarded packages
                   [$main::discarded]
@@ -962,6 +983,12 @@
     print "\nWe have $cnt packages in CVS with no owners entry:{{{\n";
     print join("\n", @A), "}}}\n";
   }
+  if ($COUNT_LIST{'CVSinCore'} > 0) {
+    print "\n=== Packages appearing in Core but still present in CVS devel ===\n";
+    print "\nWe have $COUNT_LIST{'CVSinCore'} packages in CVS devel which appear to have moved to Core: {{{\n";
+    my $a = $PKG_LIST{"CVSinCore"};
+    print join("\n", @$a), "}}}\n";
+  }
 }
 
 sub displayCVSMail {
@@ -975,6 +1002,13 @@
     $s =~ s/\n/\n    /sg;
     print STDERR "    $s\n";
   }
+  if ($COUNT_LIST{'CVSinCore'} > 0) {
+    print STDERR " - $COUNT_LIST{'CVSinCore'} packages in CVS devel *and* Core\n";
+    my $a = $PKG_LIST{"CVSinCore"};
+    my $s = &toLine(join(" ", @$a));
+    $s =~ s/\n/\n    /sg;
+    print STDERR "    $s\n";
+  }
 }
 
 sub checkBugs {
@@ -1052,3 +1086,43 @@
     print STDERR " - $COUNT_LIST{'maintpkg'} inactive maintainers\n";
   }
 }
+
+sub checkCoreAndExtras {
+  my ($c, $e, $tag) = @_;
+  my @PL;
+  foreach my $k (keys %$c) {
+    push @PL, $k if defined $e->{$k};
+  }
+  $PKG_LIST{"common$tag"} = \@PL;
+  $COUNT_LIST{"common$tag"} = $#PL + 1;
+}
+
+sub displayCommonWiki {
+  if ($COUNT_LIST{"commonrelease"} == 0 && $COUNT_LIST{"commondevel"} == 0) {
+    return;
+  }
+  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";
+    &displayPkgListByOwnerWiki($PKG_LIST{"commonrelease"});
+  }
+  if ($COUNT_LIST{"commondevel"} > 0) {
+    print "\nWe have $COUNT_LIST{'commondevel'} packages duplicated for devel:\n";
+    &displayPkgListByOwnerWiki($PKG_LIST{"commondevel"});
+  }
+}
+
+sub displayCommonMail {
+  if ($COUNT_LIST{"commonrelease"} == 0 && $COUNT_LIST{"commondevel"} == 0) {
+    return;
+  }
+  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";
+    &displayPkgListByOwnerMail($PKG_LIST{"commonrelease"});
+  }
+  if ($COUNT_LIST{"commondevel"} > 0) {
+    print STDERR " - $COUNT_LIST{'commondevel'} packages duplicated for devel:\n";
+    &displayPkgListByOwnerMail($PKG_LIST{"commondevel"});
+  }
+}



From fedora-extras-commits at redhat.com  Wed Apr 19 10:16:24 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 03:16:24 -0700
Subject: status-report-scripts parseBZbugList,1.26,1.27
Message-ID: <200604191016.k3JAGOUI004573@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4555

Modified Files:
	parseBZbugList 
Log Message:
Fix a couple minor issues, and add a TODO.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- parseBZbugList	19 Apr 2006 10:15:36 -0000	1.26
+++ parseBZbugList	19 Apr 2006 10:16:21 -0000	1.27
@@ -7,6 +7,7 @@
 # https://bugzilla.redhat.com/bugzilla/showdependencytree.cgi?id=FE-ACCEPT
 
 # TODO stuff
+#  See why count in "Inactive maintainers with open bug reports" is strange.
 
 use strict;
 use Getopt::Long;
@@ -245,6 +246,7 @@
     $F[10] =~ s/["]//g;
     $F[10] =~ s/^review\s+request:?\s+<?//i;
     $F[10] =~ s/[:.,>]?\s.*$//g;
+    $F[10] =~ s/:.*$//g;
   } else {
     $F[10] = $F[8];
   }
@@ -605,6 +607,7 @@
     my $a = $BZ->{$b};
     next unless $$a[6] eq "\"CLOSED\"";
     my $pkg = $$a[10];
+    next if defined $DISCARD{$pkg};
     unless ($SRPMS{$pkg} == 1 || defined($OWN{$pkg})) {
       $pkg =~ s/-[^-]+-[^-]+$//;
     }
@@ -850,6 +853,7 @@
 
 sub displayBL {
   my ($BL, $BZ, $field) = @_;
+  return if $#$BL < 0;
   print STDERR "   https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
     join(",", @$BL), "\n";
   foreach my $b (sort @$BL) {
@@ -863,6 +867,7 @@
 
 sub displayBLWiki {
   my ($BL, $BZ, $field) = @_;
+  return if $#$BL < 0;
   my %O;
   foreach my $b (@$BL) {
     my $a = $BZ->{$b};



From fedora-extras-commits at redhat.com  Wed Apr 19 10:17:13 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 03:17:13 -0700
Subject: status-report-scripts parseBZbugList,1.27,1.28
Message-ID: <200604191017.k3JAHDrd004604@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4586

Modified Files:
	parseBZbugList 
Log Message:
Add TODO item for comps.xml.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- parseBZbugList	19 Apr 2006 10:16:21 -0000	1.27
+++ parseBZbugList	19 Apr 2006 10:17:11 -0000	1.28
@@ -8,6 +8,8 @@
 
 # TODO stuff
 #  See why count in "Inactive maintainers with open bug reports" is strange.
+#  Check contents of comps.xml file (missing packages,
+#    retired/orphaned packages)
 
 use strict;
 use Getopt::Long;



From fedora-extras-commits at redhat.com  Wed Apr 19 10:18:03 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 03:18:03 -0700
Subject: status-report-scripts parseBZbugList,1.28,1.29
Message-ID: <200604191018.k3JAI38g004635@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4617

Modified Files:
	parseBZbugList 
Log Message:
Added usage doc.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- parseBZbugList	19 Apr 2006 10:17:11 -0000	1.28
+++ parseBZbugList	19 Apr 2006 10:18:01 -0000	1.29
@@ -1,11 +1,70 @@
 #!/usr/bin/env perl
 # $Id$
 
+# This script parses a CSV formatted Bug List and extract info on various
+# aspects of package review tickets. FE-ACCEPT blockers are checked to
+# determine whether closed tickets have their corresponding package in the
+# development repo and in the owners file, and whether still open ticket could
+# be closed. FE-NEW and FE-REVIEW blockers are checked to verify they are not
+# closed.
+#
+# To run this script, you will need the following data:
+#
+#   * one or more CSV formatted files containing the bug lists with the
+#     following columns:
+#    1.  ID
+#    2.  Open Date
+#    3.  Changed Date
+#    4.  Assignee
+#    5.  Reporter
+#    6.  Status
+#    7.  Resolution
+#    8.  Blocked By
+#    9.  Summary
+#   * the URL of packages available in the FE development repo (defaults to
+#     http://mirrors.kernel.org/fedora/extras/development/SRPMS/)
+#   * the URL of packages available in the FE release repo (defaults to
+#     http://mirrors.kernel.org/fedora/extras/5/SRPMS/)
+#   * the URL of packages available in the FC development repo (defaults to
+#     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)
+#   * a full CVS checkout of Fedora Extras packages
+
 # Grab BZ tickets through:
 # https://bugzilla.redhat.com/bugzilla/showdependencytree.cgi?id=FE-NEW
 # https://bugzilla.redhat.com/bugzilla/showdependencytree.cgi?id=FE-REVIEW
 # https://bugzilla.redhat.com/bugzilla/showdependencytree.cgi?id=FE-ACCEPT
 
+# Getting a CSV file from the above 3 URLs is not too hard:
+#  - once the page is loaded, select the "view as bug list" link
+#  - ensure you have the proper selection of columns to display, as detailed
+#    above, and if not adjust the selection through the "Change Columns" link
+#    at the bottom of the page
+#  - select the "CSV" link at the bottom of the page
+
+# Obtaining the list of open tickets is slightly more complex:
+#  - go to the advanced search page and select:
+#   product:    "Fedora Extras"
+#   version:    4 + 5 + devel
+#   component:  leave blank
+#   status:     NEW + ASSIGNED + REOPENED + MODIFIED
+#   resolution: leave blank
+#   severity:   select all except "enhancement"
+#   priority:   leave blank
+#   platform:   leave blank
+#  - in the "Advanced Searching Using Boolean Charts" section, add:
+#   Component is equal to Package Review, and select the "negated" box
+#  - perform the search and save the CSV as above (you can also save the query
+#    itself)
+
+
 # TODO stuff
 #  See why count in "Inactive maintainers with open bug reports" is strange.
 #  Check contents of comps.xml file (missing packages,



From fedora-extras-commits at redhat.com  Wed Apr 19 10:19:16 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 03:19:16 -0700
Subject: status-report-scripts parseBZbugList,1.29,1.30
Message-ID: <200604191019.k3JAJG22004666@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4648

Modified Files:
	parseBZbugList 
Log Message:
Actualy check owners.list is sorted...


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- parseBZbugList	19 Apr 2006 10:18:01 -0000	1.29
+++ parseBZbugList	19 Apr 2006 10:19:14 -0000	1.30
@@ -191,9 +191,10 @@
     s/\s+$//;
     my @F = split /\|/;
     next if $F[1] eq "";
-    if ($F[1] lt $prev) {
+    if (lc($F[1]) lt lc($prev)) {
       print STDERR "Sorting problem in owners.list: $F[1] lt $prev\n";
     }
+    $prev = $F[1];
     if (defined $DISCARD{$F[1]}) {
       $DISCARD{$F[1]} += 1;
       next;



From fedora-extras-commits at redhat.com  Wed Apr 19 10:20:22 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 03:20:22 -0700
Subject: status-report-scripts parseBZbugList,1.30,1.31
Message-ID: <200604191020.k3JAKM8S004698@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4680

Modified Files:
	parseBZbugList 
Log Message:
Fix BZ columns list in comment.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- parseBZbugList	19 Apr 2006 10:19:14 -0000	1.30
+++ parseBZbugList	19 Apr 2006 10:20:19 -0000	1.31
@@ -15,12 +15,14 @@
 #    1.  ID
 #    2.  Open Date
 #    3.  Changed Date
-#    4.  Assignee
-#    5.  Reporter
-#    6.  Status
-#    7.  Resolution
-#    8.  Blocked By
-#    9.  Summary
+#    4.  Severity
+#    5.  Assignee
+#    6.  Reporter
+#    7.  Status
+#    8.  Resolution
+#    9.  Component
+#    10. Blocked By
+#    11. Summary
 #   * the URL of packages available in the FE development repo (defaults to
 #     http://mirrors.kernel.org/fedora/extras/development/SRPMS/)
 #   * the URL of packages available in the FE release repo (defaults to



From fedora-extras-commits at redhat.com  Wed Apr 19 10:26:54 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 19 Apr 2006 03:26:54 -0700
Subject: rpms/apt/devel .cvsignore, 1.8, 1.9 apt.spec, 1.24, 1.25 sources,
	1.8, 1.9
Message-ID: <200604191026.k3JAQvsT004747@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/apt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4726

Modified Files:
	.cvsignore apt.spec sources 
Log Message:
* Wed Apr 19 2006 Ralf Cors??pius <rc040203 at freenet.de>
- 0.5.15lorg3-rc2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	9 Apr 2006 15:23:31 -0000	1.8
+++ .cvsignore	19 Apr 2006 10:26:54 -0000	1.9
@@ -1 +1 @@
-apt-0.5.15lorg3-rc1.tar.bz2
+apt-0.5.15lorg3-rc2.tar.bz2


Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- apt.spec	10 Apr 2006 17:20:27 -0000	1.24
+++ apt.spec	19 Apr 2006 10:26:54 -0000	1.25
@@ -6,12 +6,12 @@
 Summary:        Debian's Advanced Packaging Tool with RPM support
 Name:           apt
 Version:        0.5.15lorg3
-Release:        0.3.rc1%{?dist}
+Release:        0.3.rc2%{?dist}
 Group:          System Environment/Base
 URL:            http://laiskiainen.org/
 License:        GPL
 
-Source0:        http://laiskiainen.org/apt/testing/%{name}-%{version}-rc1.tar.bz2
+Source0:        http://laiskiainen.org/apt/testing/%{name}-%{version}-rc2.tar.bz2
 
 # user editable template configs
 Source1:        apt.conf
@@ -123,7 +123,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-rc1
+%setup -q -n %{name}-%{version}-rc2
 
 # fix docs to reference correct paths
 perl -pi -e \
@@ -308,6 +308,9 @@
 
 
 %changelog
+* Wed Apr 19 2006 Ralf Cors??pius <rc040203 at freenet.de>
+- 0.5.15lorg3-rc2.
+
 * Mon Apr 10 2006 Ville Skytt?? <ville.skytta at iki.fi>
 - Remove mirror select remainders (thanks to Panu).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	9 Apr 2006 15:23:32 -0000	1.8
+++ sources	19 Apr 2006 10:26:54 -0000	1.9
@@ -1 +1 @@
-d0f4b875b7d65c5a8b6563cf854a6247  apt-0.5.15lorg3-rc1.tar.bz2
+f6a6bcd712ad5826e92bad68a9f508c3  apt-0.5.15lorg3-rc2.tar.bz2



From fedora-extras-commits at redhat.com  Wed Apr 19 13:30:41 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 19 Apr 2006 06:30:41 -0700
Subject: rpms/gkrellmms/devel gkrellmms.spec,1.9,1.10
Message-ID: <200604191330.k3JDUhhh012034@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gkrellmms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12017

Modified Files:
	gkrellmms.spec 
Log Message:
* Wed Apr 19 2006 Brian Pepple <bdpepple at ameritech.net> - 2.1.22-7
- Add requires for xmms due to change in xmms package.



Index: gkrellmms.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellmms/devel/gkrellmms.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gkrellmms.spec	14 Feb 2006 17:50:36 -0000	1.9
+++ gkrellmms.spec	19 Apr 2006 13:30:40 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:           gkrellmms
 Version:        2.1.22
-Release:        5%{?dist}
+Release:        7%{?dist}
 Summary:        GKrellM XMMS plugin
 
 Group:          Applications/Multimedia
@@ -15,6 +15,8 @@
 BuildRequires:  gtk+-devel >= 1.2.10, gtk2-devel >= 2.0.1, xmms-devel >= 1.2.8
 BuildRequires:  gkrellm-devel, gettext
 
+Requires:	xmms >= 1.2.8
+
 
 %description
 GKrellM plugin for controlling XMMS.
@@ -50,6 +52,9 @@
 
 
 %changelog
+* Wed Apr 19 2006 Brian Pepple <bdpepple at ameritech.net> - 2.1.22-7
+- Add requires for xmms due to change in xmms package.
+
 * Tue Feb 14 2006 Brian Pepple <bdpepple at ameritech.net> - 2.1.22-5
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-extras-commits at redhat.com  Wed Apr 19 13:40:48 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 19 Apr 2006 06:40:48 -0700
Subject: rpms/gkrellmms/FC-5 gkrellmms.spec,1.9,1.10
Message-ID: <200604191340.k3JDeoxU012121@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gkrellmms/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12104

Modified Files:
	gkrellmms.spec 
Log Message:
* Wed Apr 19 2006 Brian Pepple <bdpepple at ameritech.net> - 2.1.22-6
- Add requires for xmms due to change in xmms package.



Index: gkrellmms.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellmms/FC-5/gkrellmms.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gkrellmms.spec	14 Feb 2006 17:50:36 -0000	1.9
+++ gkrellmms.spec	19 Apr 2006 13:40:48 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:           gkrellmms
 Version:        2.1.22
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        GKrellM XMMS plugin
 
 Group:          Applications/Multimedia
@@ -15,6 +15,8 @@
 BuildRequires:  gtk+-devel >= 1.2.10, gtk2-devel >= 2.0.1, xmms-devel >= 1.2.8
 BuildRequires:  gkrellm-devel, gettext
 
+Requires:	xmms >= 1.2.8
+
 
 %description
 GKrellM plugin for controlling XMMS.
@@ -50,6 +52,9 @@
 
 
 %changelog
+* Wed Apr 19 2006 Brian Pepple <bdpepple at ameritech.net> - 2.1.22-6
+- Add requires for xmms due to change in xmms package.
+
 * Tue Feb 14 2006 Brian Pepple <bdpepple at ameritech.net> - 2.1.22-5
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-extras-commits at redhat.com  Wed Apr 19 14:06:50 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 07:06:50 -0700
Subject: owners owners.list,1.859,1.860
Message-ID: <200604191406.k3JE6qo9014310@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14293

Modified Files:
	owners.list 
Log Message:
Sort according to POSIX.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.859
retrieving revision 1.860
diff -u -r1.859 -r1.860
--- owners.list	19 Apr 2006 10:06:29 -0000	1.859
+++ owners.list	19 Apr 2006 14:06:50 -0000	1.860
@@ -29,8 +29,8 @@
 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|alltray|Dock any application in the tray|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|alsa-firmware|Firmware for several ALSA-Supported soundcards|fedora at leemhuis.info|extras-qa at fedoraproject.org|
-Fedora Extras|alsamixergui|GUI mixer for ALSA sound devices|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|alsa-tools|The ALSA Tools|fedora at leemhuis.info|extras-qa at fedoraproject.org|
+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|
 Fedora Extras|amarok|Media player for KDE|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|amavisd-new|Email filter with virus scanner and spamassassin support|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -51,11 +51,11 @@
 Fedora Extras|artwiz-aleczapka-fonts|Set of (improved) artwiz fonts|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|asa|Convert Fortran carriage control characters|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|asciidoc|AsciiDoc text document fomatter|chrisw at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|at-poke|A tool for poking things|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|aterm|Aterm (Afterstep XVT) - a VT102 emulator for the X window system|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|athcool|Enables/disables Powersaving mode for AMD processors|gajownik at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|atitvout|ATI Rage/Radeon TV Out configuration program|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|atlas|Automatically Tuned Linear Algebra Software|qspencer at ieee.org|extras-qa at fedoraproject.org|
-Fedora Extras|at-poke|A tool for poking things|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|audacity|A multitrack audio editor|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|autossh|Utility to autorestart SSH tunnels|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|autotrace|A utility for converting bitmaps to vector graphics|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
@@ -84,8 +84,8 @@
 Fedora Extras|blogtk|Gnome application for editing/maintaining blogs|stickster at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|blt|BLT widget extension to Tcl/Tk scripting language development|jfontain at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|bluefish|A GTK2 web development application for experienced users|paul at city-fan.org|extras-qa at fedoraproject.org|
-Fedora Extras|bmp-flac2|Plugin to enable FLAC playback in the Beep Media Player|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|bmp|GTK2 based fork of the XMMS media player|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
+Fedora Extras|bmp-flac2|Plugin to enable FLAC playback in the Beep Media Player|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|boa|The boa web server|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|bochs|Bochs Project x86 PC Emulator|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|bonnie++|Bonnie++ filesystem and disk benchmark & burn-in suite|wtogami at redhat.com|extras-qa at fedoraproject.org|
@@ -94,17 +94,17 @@
 Fedora Extras|buildsystem|Fedora-Extras Buildsystem|skvidal at phy.duke.edu|extras-qa at fedoraproject.org|
 Fedora Extras|buoh|Online comics reader|chabotc at xs4all.nl|extras-qa at fedoraproject.org|
 Fedora Extras|bwbar|A program that generates a readout of the current bandwidth use|adrian at lisas.de|extras-qa at fedoraproject.org|
-Fedora Extras|bwm-ng|Bandwidth Monitor NG|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
 Fedora Extras|bwidget|Extended widget set for Tk|wart at kobold.org|extras-qa at fedoraproject.org|
+Fedora Extras|bwm-ng|Bandwidth Monitor NG|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
 Fedora Extras|byzanz|A desktop recorder|jeff at ollie.clive.ia.us|extras-qa at fedoraproject.org|
 Fedora Extras|bzflag|3D multi-player tank battle game|nphilipp at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|bzr|A friendly distributed version control system|shahms at shahms.com|extras-qa at fedoraproject.org|
+Fedora Extras|c-ares|A library that performs asynchronous DNS operations|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|cabextract|A Microsoft Cabinet file extractor|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|cacti|An rrd based graphing tool|imlinux at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|camE|Rewrite of the xawtv webcam app, which adds imlib2 support|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|camstream|CamStream - a set of programs to make use of your webcam|nomis80 at nomis80.org|extras-qa at fedoraproject.org|
 Fedora Extras|Canna|A Japanese character set input system|tagoh at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|c-ares|A library that performs asynchronous DNS operations|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|ccache|Compiler cache|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|CCfits|A C++ interface for cfitsio|spr at astrax.fis.ucm.es|extras-qa at fedoraproject.org|
 Fedora Extras|ccid|Generic USB CCID smart card reader driver|ville.skytta at iki.fi|extras-qa at fedoraproject.org|ludovic.rousseau at gmail.com
@@ -175,8 +175,8 @@
 Fedora Extras|darcs|David's advanced revision control system|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|dbh|Disk based hash library|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|dclib|Direct Connect file sharing library|lmacken at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|ddclient|A client to update dynamic DNS host entries|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|dd_rescue|Fault tolerant "dd" utility for rescuing data from bad media|andreas at bawue.net|extras-qa at fedoraproject.org|
+Fedora Extras|ddclient|A client to update dynamic DNS host entries|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|ddrescue|Fault tolerant "dd" utility for rescuing data from bad media|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|ddskk|Daredevil SKK - Simple Kana to Kanji conversion program for Emacs|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|dejavu-fonts|DejaVu Fonts|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org|
@@ -200,8 +200,8 @@
 Fedora Extras|dogtail|GUI test tool and automation framework|zcerza at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|dosbox|An x86/DOS emulator with sound/graphics|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|doulos-fonts|Doulos SIL fonts|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
-Fedora Extras|drgeo-doc|html documentation for drgeo|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
 Fedora Extras|drgeo|Interactive educational geometry software|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
+Fedora Extras|drgeo-doc|html documentation for drgeo|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
 Fedora Extras|driftnet|Network image sniffer|bnocera at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|drivel|A journal or "blog" client|stickster at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|drscheme|Graphical environment for developing programs using Scheme|gemi at bluewin.ch|extras-qa at fedoraproject.org|
@@ -233,8 +233,8 @@
 Fedora Extras|erlang|General-purpose programming language and runtime environment|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|esmtp|User configurable relay-only Mail Transfer Agent (MTA)|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|evas|A hardware-accelerated canvas API|ivazquez at ivazquez.net|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|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|exo|Application library for the Xfce desktop environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|ez-ipupdate|Client for Dynamic DNS Services|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|f2py|Fortran to Python interface generator|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
@@ -242,17 +242,17 @@
 Fedora Extras|fbdesk|Icon Manager for Fluxbox|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|fbida|FrameBuffer Imageviewer|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|fdupes|Identifies and optionally deletes duplicate files|simonb at thoughtpolice.co.uk|extras-qa at fedoraproject.org|
-Fedora Extras|fedora-rpmdevtools|Fedora RPM Development Tools|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|fedora-package-config-smart|Configuration files for the smart package manager|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|
+Fedora Extras|fedora-rpmdevtools|Fedora RPM Development Tools|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|fedora-usermgmt|Fedora tools for user management|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|feh|Fast command line image viewer using Imlib2|a.kurtz at hardsun.net|extras-qa at fedoraproject.org|
 Fedora Extras|fetchlog|The fetchlog utility displays the last new messages of a logfile|paul at xtdnet.nl|extras-qa at fedoraproject.org|
-Fedora Extras|fftw2|Fast Fourier Transform library|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|fftw|Fast Fourier Transform library|qspencer at ieee.org|extras-qa at fedoraproject.org|
+Fedora Extras|fftw2|Fast Fourier Transform library|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|fig2ps|Utility for converting xfig pictures to PS/PDF|qspencer at ieee.org|extras-qa at fedoraproject.org|
-Fedora Extras|fillets-ng-data-cs|Czech audio data files for Fish Fillets Next Generation|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|fillets-ng-data|Game data files for Fish Fillets Next Generation|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|fillets-ng|Fish Fillets Next Generation, a puzzle game with 70 levels|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|fillets-ng-data|Game data files for Fish Fillets Next Generation|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|fillets-ng-data-cs|Czech audio data files for Fish Fillets Next Generation|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|firefox|firefox browser|wtogami at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|firestarter|The Firestarter firewall tool for GNOME|mpeters at mac.com|extras-qa at fedoraproject.org|
 Fedora Extras|fish|A friendly interactive shell|oliver at linux-kernel.at|extras-qa at fedoraproject.org|liljencrantz at gmail.com
@@ -285,18 +285,18 @@
 Fedora Extras|fslint|FSlint - a utility to find and clean "lint" on a filesystem|P at draigBrady.com|extras-qa at fedoraproject.org|
 Fedora Extras|ftnchek|Static analyzer for Fortran 77 programs|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|fuse|File System in Userspace|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
+Fedora Extras|fuse-emulator|A Sinclair ZX Spectrum 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 newmail.ru|extras-qa at fedoraproject.org|
 Fedora Extras|fuse-sshfs|FUSE-Filesystem to access remote filesystems via SSH|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
-Fedora Extras|fuse-emulator|A Sinclair ZX Spectrum emulator|paul at all-the-johnsons.co.uk|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|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|gai|Generic Applet Interface|michel.salim at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|gai-pal|GAI Pal applet|michel.salim at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|gai-temp|GAI based applet that displays HDD and CPU temperature|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|gaim-guifications|Guifications plugin for GAIM|byte at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gaim-meanwhile| Lotus Sametime Community Client plugin for Gaim|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|gaim-otr|Off-The-Record Messaging plugin for GAIM|paul at xtdnet.nl|extras-qa at fedoraproject.org|
-Fedora Extras|gai-pal|GAI Pal applet|michel.salim at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|gai-temp|GAI based applet that displays HDD and CPU temperature|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|gajim|Jabber client written in PyGTK|gajownik at gmail.com|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|
@@ -335,10 +335,10 @@
 Fedora Extras|gkrellm-aclock|Analog clock plugin for GKrellM|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-freq|CPU frequency display plugin for GKrellM|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-hddtemp|Hard disk temperature plugin for GKrellM|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|gkrellmms|GKrellM XMMS plugin|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-themes|Some themes for the GNU Krell Monitor|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-volume|GKrellM volume plugin|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-weather|GKrellWeather is a weather plugin for GKrellM|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|gkrellmms|GKrellM XMMS plugin|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|gktools|GUI utilities for KerberosV tickets|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gl-117|GL-117 is an action flight simulator|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|glabels|A program for creating labels and business cards for GNOME|jspaleta at gmail.com|extras-qa at fedoraproject.org|
@@ -356,7 +356,6 @@
 Fedora Extras|gnofract4d|Gnofract 4D is a Gnome-based program to draw fractals|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnokii|Mobile phone management program|triad at df.lth.se|extras-qa at fedoraproject.org|
 Fedora Extras|gnomad2|Manager for digital audio players|triad at df.lth.se|extras-qa at fedoraproject.org|
-Fedora Extras|gnomebaker|Gnome CD burner|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-applet-music|A GNOME panel applet to control various music players|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-applet-netmon|GNOME Network Load Applet|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-applet-netspeed|GNOME applet that shows traffic on a network device|a.kurtz at hardsun.net|extras-qa at fedoraproject.org|
@@ -369,7 +368,6 @@
 Fedora Extras|gnome-password-generator|Graphical secure password generator|extras-orphan at fedoraproject.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|gnomesword|GNOME-based Bible research tool|mpeters at mac.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|
 Fedora Extras|gnome-theme-clearlooks|An attractive GTK+ 2 engine with a focus on usability|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-theme-clearlooks-bigpack|Additional Clearlooks color schemes|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
@@ -377,6 +375,8 @@
 Fedora Extras|gnome-translate|GNOME interface to libtranslate -- Natural language translator|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-vfsmm26|C++ wrapper for gnome-vfs|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-yum|GNOME Interface for YUM|toth_bandi at users.sourceforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|gnomebaker|Gnome CD burner|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
+Fedora Extras|gnomesword|GNOME-based Bible research tool|mpeters at mac.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnonlin|GStreamer extension library for non-linear editing|redhat at flyn.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnotime|Tracks and reports time spent|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnuchess|The GNU chess program|kaboom at oobleck.net|extras-qa at fedoraproject.org|
@@ -391,8 +391,8 @@
 Fedora Extras|gpa|Graphical user interface for GnuPG|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|gparted|Gnome Partition Editor|dakingun at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|gperiodic|Program for browsing the periodic table|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
-Fedora Extras|gpgme03|GnuPG Made Easy interface library|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|gpgme|GnuPG Made Easy|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|gpgme03|GnuPG Made Easy interface library|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|gphpedit|A PHP source editor for GNOME 2|rpm at timj.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|gpp|Gnome Photo Printer|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|
 Fedora Extras|gpredict|Real-time satellite tracking and orbit prediction program|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
@@ -416,20 +416,20 @@
 Fedora Extras|gstreamer08-python|Python bindings for GStreamer 0.8|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|gsview|PostScript and PDF previewer|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|gsynaptics|Settings tool for Synaptics touchpad driver|fedora at leemhuis.info|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|gtk+extra|A library of gtk+ widgets|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
+Fedora Extras|gtk-gnutella|GUI based Gnutella Client|dmitry at butskoy.name|extras-qa at fedoraproject.org|
+Fedora Extras|Gtk-Perl|Perl extensions for GTK+|matthias at rpmforge.net|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|GtkAda|An Ada95 graphical toolkit based on Gtk+|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|gtkglarea2|An OpenGL GTK widget|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|rc040203 at freenet.de
 Fedora Extras|gtkglext|OpenGL Extension to GTK|rc040203 at freenet.de|extras-qa at fedoraproject.org|
-Fedora Extras|gtk-gnutella|GUI based Gnutella Client|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|gtkmathview|Library for rendering MathML documents|uwog at uwog.net|extras-qa at fedoraproject.org|
 Fedora Extras|gtkmm20|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|gtkmm24|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
-Fedora Extras|Gtk-Perl|Perl extensions for GTK+|matthias at rpmforge.net|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|gtktalog|The GNOME disk catalog|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gtkterm|Serial port terminal|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|gtkwave|Waveform viewer|paul at city-fan.org|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|gtorrentviewer|A GTK2-based viewer and editor for BitTorrent meta files|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|gtranslator|A gettext po file editor for GNOME|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|gtweakui|Extra configuration dialogs for GNOME|matthias at rpmforge.net|extras-qa at fedoraproject.org|
@@ -443,8 +443,8 @@
 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|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|hddtemp|Hard disk temperature tool|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|hdf5|A general purpose library and file format for storing scientific data|orion at cora.nwra.com|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|
 Fedora Extras|heartbeat|Heartbeat subsystem for High-Availability Linux|fedora at soeterbroek.com|extras-qa at fedoraproject.org|
 Fedora Extras|help2man|Create simple man pages from --help output|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|hercules|Hercules S/370, ESA/390, and z/Architecture emulator|matthias at rpmforge.net|extras-qa at fedoraproject.org|
@@ -469,8 +469,8 @@
 Fedora Extras|icecast|ShoutCast compatible streaming media server|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|icu|International Components for Unicode library|fedora at leemhuis.info|extras-qa at fedoraproject.org|
-Fedora Extras|id3lib|An Open-Source library for manipulating ID3v1 and ID3v2 tags|anvil at livna.org|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|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|id3v2|A command line id3v2 tag editor|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|ifm|Interactive Fiction Mapper|chris at chrisgrau.com|extras-qa at fedoraproject.org|
 Fedora Extras|ifplugd|Detect and take action when an ethernet cable is unplugged|aaron.bennett at olin.edu|extras-qa at fedoraproject.org|
@@ -507,8 +507,8 @@
 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|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|jpgraph|An OO graph drawing class library for PHP|gauret at free.fr|extras-qa at fedoraproject.org|
-Fedora Extras|jthread|JThread provides classes to make use of threads easy on different platforms|jeff at ollie.clive.ia.us|extras-qa at fedoraproject.org|
 Fedora Extras|js|JavaScript interpreter|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|jthread|JThread provides classes to make use of threads easy on different platforms|jeff at ollie.clive.ia.us|extras-qa at fedoraproject.org|
 Fedora Extras|juk|Jukebox and music manager for KDE|nomis80 at nomis80.org|extras-qa at fedoraproject.org|
 Fedora Extras|k3b-extras|Free codec plugins for k3b|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kadischi|An application for Fedora-based LiveCD generation|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
@@ -519,8 +519,8 @@
 Fedora Extras|kasumi|Anthy dictionary management tool|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|kawa|Kawa scheme implementation|green at redhat.com|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|kdesvn|A subversion client for KDE|orion at cora.nwra.com|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|
 Fedora Extras|kdetoys|K Desktop Environment - Toys and Amusements|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kdissert|Mind-mapping-like tool for KDE|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|kdocker|Dock any application in the system tray|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
@@ -577,8 +577,8 @@
 Fedora Extras|libcmml|Library for handling Continuous Media Markup Language|thomas at apestaart.org|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|libdsk|Disc drive library for use with the Fuse emulator|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|libdnet|Simple portable interface to lowlevel networking routines|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
+Fedora Extras|libdsk|Disc drive library for use with the Fuse emulator|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|libebml|The Extensible Binary Meta Language library|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|libesmtp|SMTP client library|pawsa at theochem.kth.se|extras-qa at fedoraproject.org|
 Fedora Extras|libetpan|Portable, efficient middleware for different kinds of mail access|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
@@ -612,10 +612,10 @@
 Fedora Extras|libmodplug|Modplug mod music file format library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|libmpcdec|Musepack audio decoding library|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|libmthca|Mellanox InfiniBand HCA Userspace Driver|rolandd at cisco.com|extras-qa at fedoraproject.org|
-Fedora Extras|libnc-dap|The NetCDF interface to DAP-2 from OPeNDAP|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|libnasl|Nessus Attack Scripting Language|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
-Fedora Extras|libnet10|High-level API (toolkit) allowing the application programmer to construct and inject network packets|pertusus at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|libnc-dap|The NetCDF interface to DAP-2 from OPeNDAP|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|libnet|C library for portable packet creation and injection|pertusus at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|libnet10|High-level API (toolkit) allowing the application programmer to construct and inject network packets|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|libnjb|Library for managing digital audio players|triad at df.lth.se|extras-qa at fedoraproject.org|
 Fedora Extras|liboggz|Simple programming interface for Ogg files and streams|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|liboil|Library of Optimized Inner Loops, CPU optimized functions|matthias at rpmforge.net|extras-qa at fedoraproject.org|
@@ -629,8 +629,8 @@
 Fedora Extras|libopensync-plugin-palm|Palm plugin for libopensync|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|libopensync-plugin-python|Python plugin for libopensync|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|libopts|Options library for autogen|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
-Fedora Extras|libosip2|oSIP is an implementation of SIP|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|libosip|oSIP is an implementation of SIP|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
+Fedora Extras|libosip2|oSIP is an implementation of SIP|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|libotr|Off-The-Record Messaging library and toolkit|paul at xtdnet.nl|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|
@@ -643,8 +643,8 @@
 Fedora Extras|libsexy|Funky fresh graphical widgets for GTK+ 2|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|libshout|icecast source streaming library|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|libsidplay|A Commodore 64 music player and SID chip emulator library|bugs.michael at gmx.net|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|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|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|
@@ -671,8 +671,8 @@
 Fedora Extras|lighttpd|Lightning fast webserver with light system requirements|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|lincity-ng|City Simulation Game|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|lincvs|Graphical CVS Client|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
-Fedora Extras|linkchecker|Script that checks HTML documents for broken links|redhat at flyn.org|extras-qa at fedoraproject.org|
 Fedora Extras|link-grammar|Library that can perform grammar checking|uwog at uwog.net|extras-qa at fedoraproject.org|
+Fedora Extras|linkchecker|Script that checks HTML documents for broken links|redhat at flyn.org|extras-qa at fedoraproject.org|
 Fedora Extras|linphone|Phone anywhere in the whole world by using the Internet|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|linux-libertine-fonts|Linux Libertine Open Fonts|frank at scirocco-5v-turbo.de|extras-qa at fedoraproject.org|
 Fedora Extras|linux_logo|The linux logo - a colorful console penguin logo|matthias at rpmforge.net|extras-qa at fedoraproject.org|
@@ -729,8 +729,8 @@
 Fedora Extras|mod_geoip|GeoIP module for the Apache HTTP Server|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|
 Fedora Extras|mod_security|Security module for the Apache HTTP Server|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|
 Fedora Extras|mod_suphp|An apache2 module for executing PHP scripts with the permissions of their owners|andreas at bawue.net|extras-qa at fedoraproject.org|
-Fedora Extras|moin-latex|LaTeX plugin for the MoinMoin wiki|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|moin|MoinMoin is a Python clone of WikiWiki|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|moin-latex|LaTeX plugin for the MoinMoin wiki|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|monkey-bubble|Game in the spirit of Frozen Bubble|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|monotone|A free, distributed version control system|roland at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|moodle|A Course Management System|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
@@ -738,9 +738,9 @@
 Fedora Extras|moomps|Powerful modular monitoring service|jfontain at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|most|more, less, most|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|mpc|Command-line client for MPD|gauret at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|muine|Music Player for GNOME|foolish at guezz.net|extras-qa at fedoraproject.org|
 Fedora Extras|multisync|Calendar (and other PIM data) synchronization program|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|multitail|View one or multiple files like tail but with multiple windows|folkert at vanheusden.com|extras-qa at fedoraproject.org|
-Fedora Extras|muine|Music Player for GNOME|foolish at guezz.net|extras-qa at fedoraproject.org|
 Fedora Extras|munin|Network-wide graphing framework (grapher/gatherer)|kevin at tummy.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|nabi|Simple Hangul X Input Method|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
@@ -777,8 +777,8 @@
 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|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-data|Game data for the Nexuiz first person shooter|adrian at lisas.de|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|
 Fedora Extras|nfswatch|An NFS traffic monitoring tool|Christian.Iseli at licr.org|extras-qa at fedoraproject.org|
 Fedora Extras|nget|A utility for retrieving files using the NNTP protocol|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|ngrep|Network layer grep tool|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
@@ -810,10 +810,10 @@
 Fedora Extras|opendap|Open-source Project for a Network Data Access Protocol|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|OpenEXR|A high dynamic-range (HDR) image file format|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|openmpi|Open Message Passing Interface (LAM replacement)|jvdias 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|openoffice-extras|SOT Office presentation templates repackaged for OpenOffice.org|wtogami at redhat.com|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|openoffice.org-dict-cs_CZ|Czech spellchecker and hyphenation dictionaries for OpenOffice.org|tmraz 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|
 Fedora Extras|openvpn|A full-featured SSL VPN solution|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|orange|Squeeze out installable Microsoft cabinet files|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
@@ -864,14 +864,15 @@
 Fedora Extras|perl-Carp-Assert-More|Convenience wrappers around Carp::Assert|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Cflow|Find flows in flow files|orion at cora.nwra.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-CGI-Simple|Simple totally OO CGI interface that is CGI.pm compliant|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|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-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-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
 Fedora Extras|perl-Class-Container|Perl module for building frameworks of classes|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-Data-Inheritable|Inheritable, overridable class data|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Class-DBI|Simple Database Abstraction|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-AbstractSearch|Abstract Class::DBI's SQL with SQL::Abstract|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-AsForm|Produce HTML form elements for database columns|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-FromCGI|Update Class::DBI data using CGI::Untaint|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -883,7 +884,6 @@
 Fedora Extras|perl-Class-DBI-Plugin|Abstract base class for Class::DBI plugins|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-Plugin-RetrieveAll|More complex retrieve_all() for Class::DBI|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-Plugin-Type|Determine type information for columns|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Class-DBI|Simple Database Abstraction|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-SQLite|Extension to Class::DBI for sqlite|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-ErrorHandler|Class::ErrorHandler Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-Inspector|Get information about a class and its structure|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -923,8 +923,8 @@
 Fedora Extras|perl-DateTime|DateTime Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBD-AnyData|DBI access to XML, CSV and other formats|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBD-CSV|DBI driver for CSV files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-DBD-SQLite2|Self Contained RDBMS in a DBI Driver (sqlite 2.x)|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBD-SQLite|Self Contained RDBMS in a DBI Driver|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-DBD-SQLite2|Self Contained RDBMS in a DBI Driver (sqlite 2.x)|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBD-XBase|Perl module for reading and writing the dbf files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBIx-ContextualFetch|Add contextual fetches to DBI|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBIx-DBSchema|Database-independent schema objects|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -947,18 +947,18 @@
 Fedora Extras|perl-File-BOM|Utilities for reading Byte Order Marks|mpeters at mac.com|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-Flat|Implements a flat filesystem|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-FileHandle-Unget|A FileHandle that supports ungetting of multiple bytes|paul at city-fan.org|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-Remove|Convenience module for removing files and directories|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Slurp|Efficient Reading/Writing of Complete Files|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Tail|Perl extension for reading from continously updated files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-FileHandle-Unget|A FileHandle that supports ungetting of multiple bytes|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Finanace-Quote|A Perl module that retrieves stock and mutual fund quotes|notting at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Font-AFM|Perl interface to Adobe Font Metrics files|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Font-TTF|Perl interface to TrueType Font files|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-FreezeThaw|Convert Perl structures to strings and back|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-GDGraph3d|3D graph generation package for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-GDGraph|Graph generation package for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-GD|Perl interface to the GD graphics library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-GDGraph|Graph generation package for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-GDGraph3d|3D graph generation package for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-GDTextUtil|Text utilities for use with GD|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-gettext|Interface to gettext family of functions|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Glib|Perl interface to GLib|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -971,21 +971,21 @@
 Fedora Extras|perl-HTML-Mason|HTML::Mason Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 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-Expr|Expression support extension for HTML::Template|ville.skytta at iki.fi|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|ville.skytta at iki.fi|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-BrowserDetect|HTTP::BrowserDetect Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTTP-Proxy|A pure Perl HTTP proxy|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-HTTP-Server-Simple-Mason|HTTP::Server::Simple::Mason Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTTP-Server-Simple|Very simple standalone HTTP daemon|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-HTTP-Server-Simple-Mason|HTTP::Server::Simple::Mason Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Ima-DBI|Database connection caching and organization|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Imager|A module for creating and altering images|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|perl-Image-Base|Base class for loading, manipulating and saving images in Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Image-ExifTool|Utility for reading and writing image meta info|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Image-Info|Image meta information extraction module for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Image-Size|Determine the size of images in several common formats in Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Image-Xbm|Load, create, manipulate and save xbm image files in Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Image-Xpm|Load, create, manipulate and save xpm image files in Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Imager|A module for creating and altering images|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|perl-IO-All|IO::All Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-CaptureOutput|Capture STDOUT/STDERR from subprocesses and XS/C modules|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-Multiplex|Manage IO on many file handles|lmb at biosci.ki.se|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1044,8 +1044,8 @@
 Fedora Extras|perl-Module-Signature|CPAN signature management utilities and modules|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Versions-Report|Report versions of all modules in memory|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-CIDR-Lite|Net::CIDR::Lite perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Net-IP-CMatch|Efficiently match IP addresses against IP ranges with C|orion at cora.nwra.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-IP|Perl module for manipulation of IPv4 and IPv6 addresses|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Net-IP-CMatch|Efficiently match IP addresses against IP ranges with C|orion at cora.nwra.com|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|extras-orphan at fedoraproject.org|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
@@ -1054,10 +1054,10 @@
 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-Number-Compare|Perl module for numeric comparisons|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-OLE-Storage_Lite|Simple Class for OLE document interface|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-PAR-Dist|Toolkit for creating and manipulating Perl PAR distributions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Params-Check|Generic input parsing/checking mechanism|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Params-Util|Simple standalone param-checking functions|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Params-Validate|Params-Validate Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-PAR-Dist|Toolkit for creating and manipulating Perl PAR distributions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Parse-CPAN-Packages|Parse::CPAN::Packages Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Parse-Yapp|Perl extension for generating and using LALR parsers|pertusus at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-PatchReader|Utilities to read and manipulate patches and CVS|stickster at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1100,8 +1100,8 @@
 Fedora Extras|perl-Test-MockModule|Override subroutines in a module for unit testing|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-MockObject|Perl extension for emulating troublesome interfaces|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-NoWarnings|Make sure you didn't emit any warnings while testing|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Test-Pod-Coverage|POD documentation coverage checker|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Pod|Perl module for checking for POD errors in files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Test-Pod-Coverage|POD documentation coverage checker|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Taint|Tools to test taintedness|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Tester|Ease testing test modules built with Test::Builder|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Warn|Perl extension to test methods for warnings|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1121,18 +1121,17 @@
 Fedora Extras|perl-Text-Unidecode|US-ASCII transliterations of Unicode text|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|perl-Text-WikiFormat|Translate Wiki formatted text into other formats|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Wrapper|Simple word wrapping perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perltidy|Tool for indenting and reformatting Perl scripts|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|perl-Tie-DBI|Tie hashes to DBI relational databases|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Tie-EncryptedHash|Hashes (and objects based on hashes) with encrypting fields|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Tie-IxHash|Ordered associative arrays for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Time-modules|Perl modules for parsing dates and times|kaboom at oobleck.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Time-Piece-MySQL|MySQL-specific methods for Time::Piece|chris at chrisgrau.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Time-Piece|Time objects from localtime and gmtime|chris at chrisgrau.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Time-Piece-MySQL|MySQL-specific methods for Time::Piece|chris at chrisgrau.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Tk|Perl Graphical User Interface ToolKit|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Tree-DAG_Node|Class for representing nodes in a tree|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Tree-Simple|Tree::Simple Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Unicode-Map8|Mapping table between 8-bit chars and Unicode for Perl|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Unicode-Map|Perl module for mapping charsets from and to utf16 unicode|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Unicode-Map8|Mapping table between 8-bit chars and Unicode for Perl|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Unicode-MapUTF8|Conversions to and from arbitrary character sets and UTF8|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Unicode-String|Perl modules to handle various Unicode issues|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-UNIVERSAL-can|Hack around people calling UNIVERSAL::can() as a function|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1154,6 +1153,7 @@
 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-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|oliver at linux-kernel.at|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perltidy|Tool for indenting and reformatting Perl scripts|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|pexpect|Expect module for Python|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|pgadmin3|Graphical client for PostgreSQL|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|pgp-tools|Collection of several utilities related to OpenPGP|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|
@@ -1161,7 +1161,6 @@
 Fedora Extras|php-eaccelerator|PHP accelerator, optimizer, encoder and dynamic content cacher|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|php-extras|Additional PHP modules from the standard PHP distribution|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|php-json|An extremely fast PHP extension for JSON|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
-Fedora Extras|phpldapadmin|Web-based tool for managing LDAP servers|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 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-DB|PEAR: Database Abstraction Layer|rpm at timj.co.uk|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|
@@ -1169,18 +1168,19 @@
 Fedora Extras|php-pecl-pdo-sqlite|PECL package for PHP Data Objects Interface to SQLite v3|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|php-pecl-sqlite|PECL package for accessing SQLite databases|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|php-Smarty|Template/Presentation Framework for PHP|orion at cora.nwra.com|extras-qa at fedoraproject.org|
+Fedora Extras|phpldapadmin|Web-based tool for managing LDAP servers|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|physfs|Library to provide abstract access to various archives|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|pikdev|IDE for development of PICmicro based application (under Linux/KDE)|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
 Fedora Extras|pinentry|Collection of simple PIN or passphrase entry dialogs|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|pipenightdreams|Connect the waterpipes to create a proper pipeline|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|pitivi|Non-linear video editor|redhat at flyn.org|extras-qa at fedoraproject.org|
+Fedora Extras|pl|SWI-Prolog - Edinburgh compatible Prolog compiler|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|plague|Distributed build system for RPMs|dcbw at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|planet|Flexible RDF/RSS/Atom feed aggregator|rich at phekda.gotadsl.co.uk|extras-qa at fedoraproject.org|
-Fedora Extras|plib16|Set of portable libraries especially useful for games|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|plib|Set of portable libraries especially useful for games|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|plib16|Set of portable libraries especially useful for games|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|plone|User friendly and powerful open source Content Management System|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|plplot|Library of functions for making scientific plots|orion at cora.nwra.com|extras-qa at fedoraproject.org|
-Fedora Extras|pl|SWI-Prolog - Edinburgh compatible Prolog compiler|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|plt-scheme|Graphical environment for developing programs using Scheme|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|polyxmass-bin|The GNU polyxmass software suite|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|polyxmass-common|Contains all textual/graphical data required for polyxmass|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
@@ -1249,8 +1249,8 @@
 Fedora Extras|python-numeric|Fast multidimensional array functions for Python|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|python-paramiko|A SSH2 protocol library for python|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-protocols|PyProtocols 'adapt()' implementation|shahms at shahms.com|extras-qa at fedoraproject.org|
-Fedora Extras|python-psycopg|Alternative high-speed Postgres DB adapter|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-psyco|Python specializing compiler|shahms at shahms.com|extras-qa at fedoraproject.org|
+Fedora Extras|python-psycopg|Alternative high-speed Postgres DB adapter|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-quixote|A highly Pythonic Web application framework|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-reportlab|Python PDF generation library|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|python-setuptools|Download, build, install, upgrade, and uninstall Python packages|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
@@ -1269,9 +1269,9 @@
 Fedora Extras|qalculate-gtk|A multi-purpose desktop calculator for GNU/Linux|dakingun at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|qalculate-kde|A multi-purpose desktop calculator for GNU/Linux|dakingun at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|qascade|QT port of classic puzzle game|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|qcad|CAD program|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|qca|Qt Cryptographic Architecture|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|qca-tls|Qt Cryptographic Architecture, TLS plugin|gauret at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|qcad|CAD program|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|qemu|QEMU is a FAST! processor emulator|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|qgit|Browser for GIT repositories|dan at danny.cz|extras-qa at fedoraproject.org|
 Fedora Extras|qgo|Graphical Go client and SGF editor|kaboom at oobleck.net|extras-qa at fedoraproject.org|
@@ -1287,6 +1287,12 @@
 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|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|
+Fedora Extras|R-mAr|R module to evaluate functions for multivariate AutoRegressive analysis|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
+Fedora Extras|R-RScaLAPACK|An interface to perform parallel computation on linear algebra problems using ScaLAPACK|tcallawa at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|R-waveslim|R module, Basic wavelet routines for 1,2 and 3-dimensional signal processing|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
+Fedora Extras|R-wavethresh|R module, Software to perform wavelet statistics and transforms|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|raidem|2d top-down shoot'em up|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|ratpoison|Simplified window manager with no mouse support|jwb at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|rblcheck|A command-line interface to RBL-style listings|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
@@ -1298,12 +1304,9 @@
 Fedora Extras|repoml|Tools and data for working with RepoML files|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|repoview|Creates a set of static HTML pages in a yum repository|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|revelation|Password manager for GNOME 2|fedora at leemhuis.info|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|
 Fedora Extras|rinetd|TCP redirection server|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|rkhunter|Rootkit Hunter scans for rootkits, backdoors and local exploits|tamaster at pobox.com|extras-qa at fedoraproject.org|
 Fedora Extras|rlog|Runtime Logging for C++|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
-Fedora Extras|R-mAr|R module to evaluate functions for multivariate AutoRegressive analysis|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 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|
@@ -1313,14 +1316,11 @@
 Fedora Extras|rpmproc|Perl script to help manage and build RPM packages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|rpy|Python interface to the R language|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|rrdtool|Round Robin Database Tool to store and display time-series data|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|R-RScaLAPACK|An interface to perform parallel computation on linear algebra problems using ScaLAPACK|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|rsnapshot|Local and remote filesystem snapshot utility|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|rssowl|An RSS, RDF, and Atom Newsreader|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|rt3|Request tracker 3|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 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|oliver.andrich at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|R-waveslim|R module, Basic wavelet routines for 1,2 and 3-dimensional signal processing|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
-Fedora Extras|R-wavethresh|R module, Software to perform wavelet statistics and transforms|jamatos at fc.up.pt|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|
 Fedora Extras|rzip|A large-file compression program|i at stingr.net|extras-qa at fedoraproject.org|
@@ -1333,6 +1333,7 @@
 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|scanssh|Fast SSH server and open proxy scanner|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
+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|
 Fedora Extras|scim-chewing|SCIM IMEngine for Traditional Chinese|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-fcitx|fcitx SCIM IMEngine for Simplified Chinese|petersen at redhat.com|extras-qa at fedoraproject.org|
@@ -1342,7 +1343,6 @@
 Fedora Extras|scim-pinyin|Chinese input method for SCIM|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-qtimm|SCIM Qt Input Method module|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-skk|Scim-skk is a SCIM IMEngine module for skk to support Japanese input|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|scim|Smart Common Input Method|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-tables|SCIM Generic Table IMEngine and its data files|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-tomoe|Tomoe module for SCIM for Japanese handwritten input|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|scmxx|Exchange data with Siemens mobile phones|andreas at bawue.net|extras-qa at fedoraproject.org|
@@ -1390,8 +1390,8 @@
 Fedora Extras|spicctrl|Sony Vaio laptop SPIC control program|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 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|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
-Fedora Extras|sqlite2|Embeddable SQL engine in a C library|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|sqlite|An embeddable SQL engine in a C library|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
+Fedora Extras|sqlite2|Embeddable SQL engine in a C library|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|squidGuard|Filter, redirector and access controller plugin for squid|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
 Fedora Extras|srecord|Manipulate EPROM load files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|starfighter|For bugs related to the starfighter component|matthias at rpmforge.net|extras-qa at fedoraproject.org|
@@ -1411,9 +1411,9 @@
 Fedora Extras|sweep|An audio editor and live playback tool|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|sword|Free Bible Software Project|mpeters at mac.com|extras-qa at fedoraproject.org|
 Fedora Extras|syck|YAML for C, Python, and PHP|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
-Fedora Extras|sylpheed-claws-plugins|Additional plugins for sylpheed-claws|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
-Fedora Extras|sylpheed-claws|The bleeding edge branch of Sylpheed|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|sylpheed|GTK+ based, lightweight, and fast email client|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
+Fedora Extras|sylpheed-claws|The bleeding edge branch of Sylpheed|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|sylpheed-claws-plugins|Additional plugins for sylpheed-claws|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|synaptic|Graphical frontend for APT package manager|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|pmatilai at laiskiainen.org
 Fedora Extras|synce|For bugs related to the synce component|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|synce-gnomevfs|Gnome-vfs module for synce|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
@@ -1443,8 +1443,8 @@
 Fedora Extras|tetex-eurofont|Provides a command that prints a euro symbol|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-font-cm-lgc|The CM-LGC Type1 fonts for LaTeX|paskalis at di.uoa.gr|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-font-kerkis|The Kerkis type 1 fonts for LaTeX|paskalis at di.uoa.gr|extras-qa at fedoraproject.org|
-Fedora Extras|tetex-fontools|Tools for handling fonts with LaTeX and fontinst|mpeters at mac.com|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-font-tipa|The TIPA fonts for LaTeX|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|tetex-fontools|Tools for handling fonts with LaTeX and fontinst|mpeters at mac.com|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-lgrind|Source-code pretty-printer for LaTeX|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-perltex|Define LaTeX macros in terms of Perl code|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-pgf|Create PostScript and PDF graphics in TeX|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
@@ -1485,8 +1485,8 @@
 Fedora Extras|tripwire|An IDS (Intrusion Detection System)|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|ttf2pt1|TrueType to Adobe Type 1 converter|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|ttywatch|Log output of arbitrarily many devices|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|
-Fedora Extras|tuxpaint|Drawing program designed for young children|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|TurboGears|Back-to-front web development in Python|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
+Fedora Extras|tuxpaint|Drawing program designed for young children|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|tuxtype2|Tux Typing is an educational typing tutor for children|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|ucarp|Common Address Redundancy Protocol (CARP) for Unix|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|ucl|Portable lossless data compression library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
@@ -1519,8 +1519,8 @@
 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|wavpack|A completely open audiocodec|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
-Fedora Extras|webmin|A web-based administration interface for Unix systems.|jvdias at redhat.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|webmin|A web-based administration interface for Unix systems.|jvdias at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|wesnoth|Battle for Wesnoth is a fantasy turn-based strategy game|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|whowatch|Displays informations about the users currently logged in|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|WindowMaker|A fast, feature rich Window manager|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
@@ -1536,11 +1536,11 @@
 Fedora Extras|worminator|Sidescrolling platform and shoot'em up action-game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|worminator-data|Data for worminator the game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|wp_tray|A wallpaper-changing applet for GNOME|ivazquez at ivazquez.net|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|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|wxGTK|GTK+ port of the wxWidgets GUI library|mattdm at mattdm.org|extras-qa at fedoraproject.org|
-Fedora Extras|wxPythonGTK2|wxPython is a GUI toolkit for the Python programming language|mattdm at mattdm.org|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|
+Fedora Extras|wxPythonGTK2|wxPython is a GUI toolkit for the Python programming language|mattdm at mattdm.org|extras-qa at fedoraproject.org|
 Fedora Extras|x3270|An X Window System based IBM 3278/3279 terminal emulator|karsten at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|xbase|XBase compatible database library and tools|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|xbindkeys|Binds keys or mouse buttons to shell commands under X|gauret at free.fr|extras-qa at fedoraproject.org|
@@ -1554,6 +1554,9 @@
 Fedora Extras|xemacs|A different version of Emacs|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|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|
+Fedora Extras|xfce-utils|Utilities for the Xfce Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-appfinder|Appfinder for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-battery-plugin|Battery monitor for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-clipman-plugin|Clipboard manager plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
@@ -1562,8 +1565,8 @@
 Fedora Extras|xfce4-diskperf-plugin|Disk performance plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-fsguard-plugin|Filesystem-Guard plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-genmon-plugin|Generic monitor plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
-Fedora Extras|xfce4-iconbox|Icon box for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-icon-theme|Icons for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-iconbox|Icon box for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-minicmd-plugin|Mini command-line plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-mixer|Volume control plugin for the Xfce4 panel|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-modemlights-plugin|Modemlights for the XFCE panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
@@ -1573,8 +1576,8 @@
 Fedora Extras|xfce4-panel|Next generation panel for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-quicklauncher-plugin|Quicklauncher plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-screenshooter-plugin|Screenshot utility for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
-Fedora Extras|xfce4-session|Session manager for the Xfce4 desktop|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-sensors-plugin|Sensors plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-session|Session manager for the Xfce4 desktop|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-showdesktop-plugin|Show-Desktop plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-systemload-plugin|Systemload monitor for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-systray|Systray for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
@@ -1588,9 +1591,6 @@
 Fedora Extras|xfce4-windowlist-plugin|Windowlist plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-xkb-plugin|XKB layout switcher for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-xmms-plugin|Control XMMS from the Xfce panel|fedora.wickert at arcor.de|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|
-Fedora Extras|xfce-utils|Utilities for the Xfce Desktop Environment|kevin-redhat-bugzilla at tummy.com|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|xforms|An X11 toolkit library|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
@@ -1604,6 +1604,7 @@
 Fedora Extras|xmlindent|A XML stream reformatter|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|xmlrpc-c|A lightweight RPC library based on XML and HTTP|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|xmlstarlet|Command line XML toolkit|stickster at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|xmms|The X MultiMedia System, a media player which resembles Winamp|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-acme|XMMS plugin to use special multimedia keys in GNOME or through acme|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-alarm|xmms General plugin for using xmms as an alarm clock|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-arts|X MultiMedia System output plugin for the aRts sound system|matthias at rpmforge.net|extras-qa at fedoraproject.org|
@@ -1615,7 +1616,6 @@
 Fedora Extras|xmms-sid|SIDPlay input plugin for X MultiMedia System (XMMS)|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-skins|Skins for the X MultiMedia System|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-speex|X MultiMedia System input plugin to play speex files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|xmms|The X MultiMedia System, a media player which resembles Winamp|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|xosd|On-screen display library for X|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|xpilot-ng|Space arcade game|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|xplanet|Render a planetary image into an X window|jylitalo at iki.fi|extras-qa at fedoraproject.org|
@@ -1629,8 +1629,8 @@
 Fedora Extras|yap|High-performance Prolog Compiler|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|yasm|Complete rewrite of the NASM assembler|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|ytalk|A chat program for multiple users|imlinux at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|yumex|A GUI for Yum|tla at rasmil.dk|extras-qa at fedoraproject.org|
 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|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|



From fedora-extras-commits at redhat.com  Wed Apr 19 14:13:46 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Wed, 19 Apr 2006 07:13:46 -0700
Subject: rpms/gajim/devel .cvsignore, 1.6, 1.7 gajim.spec, 1.10, 1.11 sources,
	1.6, 1.7
Message-ID: <200604191413.k3JEDmvb014381@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/gajim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14358

Modified Files:
	.cvsignore gajim.spec sources 
Log Message:
Update to 0.10-pre2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gajim/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	13 Apr 2006 12:27:56 -0000	1.6
+++ .cvsignore	19 Apr 2006 14:13:45 -0000	1.7
@@ -1 +1 @@
-gajim-0.10-pre1.tar.bz2
+gajim-0.10-pre2.tar.bz2


Index: gajim.spec
===================================================================
RCS file: /cvs/extras/rpms/gajim/devel/gajim.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gajim.spec	13 Apr 2006 12:27:56 -0000	1.10
+++ gajim.spec	19 Apr 2006 14:13:45 -0000	1.11
@@ -1,12 +1,12 @@
 Name:           gajim
 Version:        0.10
-Release:        0.1.pre1%{?dist}
+Release:        0.1.pre2%{?dist}
 Summary:        Jabber client written in PyGTK
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://gajim.org/
-Source0:        http://gajim.org/downloads/gajim-%{version}-pre1.tar.bz2
+Source0:        http://gajim.org/downloads/gajim-%{version}-pre2.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -19,6 +19,7 @@
 BuildRequires:  python-devel
 BuildRequires:  gtkspell-devel
 
+Requires:       bind-utils
 Requires:       dbus-python
 #Requires:       gnome-python2-gconf
 Requires:       pygtk2-libglade
@@ -79,6 +80,9 @@
 %{_mandir}/man1/gajim-remote.1*
 
 %changelog
+* Wed Apr 19 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 0.10-0.1.pre2
+- Update to 0.10-pre2
+
 * Thu Apr 13 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 0.10-0.1.pre1
 - Update to 0.10-pre1
 - Drop patches


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gajim/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Apr 2006 12:27:56 -0000	1.6
+++ sources	19 Apr 2006 14:13:45 -0000	1.7
@@ -1 +1 @@
-e59de6722900155e3f5644c62241c9a9  gajim-0.10-pre1.tar.bz2
+a452d0435e730a22d83393cb97ad96d3  gajim-0.10-pre2.tar.bz2



From fedora-extras-commits at redhat.com  Wed Apr 19 14:14:08 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 19 Apr 2006 07:14:08 -0700
Subject: rpms/perl-MIME-tools/devel perl-MIME-tools.spec, 1.12, 1.13 sources,
	1.5, 1.6 .cvsignore, 1.5, 1.6
Message-ID: <200604191414.k3JEEAvp014441@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-MIME-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14385

Modified Files:
	perl-MIME-tools.spec sources .cvsignore 
Log Message:
Update to 5.420
Cosmetic changes reflecting new maintainer's preferences
Examples remain executable since they don't introduce new dependencies
Simplify provides filter



Index: perl-MIME-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-tools/devel/perl-MIME-tools.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-MIME-tools.spec	16 Jan 2006 20:47:22 -0000	1.12
+++ perl-MIME-tools.spec	19 Apr 2006 14:14:08 -0000	1.13
@@ -1,75 +1,74 @@
 Name:           perl-MIME-tools
-Version:        5.419
+Version:        5.420
 Release:        1%{?dist}
 Summary:        Modules for parsing and creating MIME entities in Perl
-
 Group:          Development/Libraries
 License:        Artistic or GPL
 URL:            http://search.cpan.org/dist/MIME-tools/
-Source0:        http://www.cpan.org/authors/id/D/DS/DSKOLL/MIME-tools-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-broot-%(%{__id_u} -n)
-
+Source0:        http://search.cpan.org/CPAN/authors/id/D/DS/DSKOLL/MIME-tools-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  perl(IO::Stringy)
-BuildRequires:  perl(MIME::Base64) >= 2.20
-BuildRequires:  perl-MailTools
+BuildRequires:  perl(IO::Stringy)       >= 1.211
+BuildRequires:  perl(MIME::Base64)      >= 2.20
+BuildRequires:  perl-MailTools          >= 1.50
 BuildRequires:  perl(MIME::QuotedPrint)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
-MIME-tools is a collection of Perl5 MIME:: modules for parsing,
-decoding, *and generating* single- or multipart (even nested
-multipart) MIME messages. (Yes, kids, that means you can send messages
-with attached GIF files).
+MIME-tools is a collection of Perl5 MIME:: modules for parsing, decoding, and
+generating single- or multipart (even nested multipart) MIME messages.
 
+Yes, kids, that means you can send messages with attached GIF files.
 
 %prep
 %setup -q -n MIME-tools-%{version}
-chmod 644 examples/* # avoid dependencies
-f=ChangeLog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
-cat << \EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} $* | grep -v '^perl(main)$'
-EOF
-%define __perl_provides %{_builddir}/MIME-tools-%{version}/%{name}-prov
-chmod +x %{__perl_provides}
 
+# Fix character encoding
+/usr/bin/iconv -f iso-8859-1 -t utf-8 ChangeLog > ChangeLog.utf8
+%{__mv} ChangeLog.utf8 ChangeLog
+
+# Remove redundant provides
+%global provfilt /bin/sh -c "%{__perl_provides} | %{__grep} -Fvx 'perl(main)'"
+%define __perl_provides %{provfilt}
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags}
-
+%{__make} %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
-rm -f $RPM_BUILD_ROOT%{perl_vendorlib}/set-version.pl
-chmod -R u+w $RPM_BUILD_ROOT/*
-
+%{__rm} -rf %{buildroot}
+%{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
+/usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
+/usr/bin/find %{buildroot} -type d -depth -exec /bin/rmdir {} 2>/dev/null ';'
+%{__chmod} -R u+w %{buildroot}/*
 
 %check
-if %{__perl} -e "use MIME::QuotedPrint 3.03" 2>/dev/null ; then
-  make test
+if %{__perl} -e "use MIME::QuotedPrint 3.03" 2>/dev/null; then
+  %{__make} test
 else
   # Expected failures: 4, 5 and 7-11 of t/Misc.t
-  make test || :
+  %{__make} test || :
 fi
 
-
 %clean
-rm -rf $RPM_BUILD_ROOT
-
+%{__rm} -rf %{buildroot}
 
 %files
-%defattr(-,root,root,-)
-%doc ChangeLog COPYING README README-OR-DIE examples/
+%defattr(-,root,root,0755)
+%doc README* COPYING ChangeLog
+# Adding examples introduces additional deps, but these are all satisfied by
+# perl, perl-MIME-tools, and perl-MailTools, which are all deps anyway.
+%doc examples
 %{perl_vendorlib}/MIME/
-%{_mandir}/man3/MIME::*.3*
-
+%{_mandir}/man3/MIME::*.3pm*
 
 %changelog
+* Wed Apr 19 2006 Paul Howarth <paul at city-fan.org> - 5.420-1
+- 5.420
+- Cosmetic changes reflecting new maintainer's preferences
+- Examples remain executable since they don't introduce new dependencies
+- Simplify provides filter
+
 * Mon Jan 16 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.419-1
 - 5.419.
 - Don't provide perl(main).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-tools/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	16 Jan 2006 20:47:22 -0000	1.5
+++ sources	19 Apr 2006 14:14:08 -0000	1.6
@@ -1 +1 @@
-1c033072b751e27ecb096bc155a7e406  MIME-tools-5.419.tar.gz
+4db6505cc0132c80c5a9cc54f443a21a  MIME-tools-5.420.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-tools/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	16 Jan 2006 20:47:22 -0000	1.5
+++ .cvsignore	19 Apr 2006 14:14:08 -0000	1.6
@@ -1 +1 @@
-MIME-tools-5.419.tar.gz
+MIME-tools-5.420.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 19 14:19:33 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 07:19:33 -0700
Subject: status-report-scripts check_owners,NONE,1.1
Message-ID: <200604191419.k3JEJXcg014514@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14497

Added Files:
	check_owners 
Log Message:
Add check_owners.


***** Error reading new file: [Errno 2] No such file or directory: 'check_owners'



From fedora-extras-commits at redhat.com  Wed Apr 19 15:15:39 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Wed, 19 Apr 2006 08:15:39 -0700
Subject: fedora-security/audit fc4,1.205,1.206 fc5,1.118,1.119
Message-ID: <200604191515.k3JFFd8g016896@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16865/audit

Modified Files:
	fc4 fc5 
Log Message:
Add CVE-2006-1056



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- fc4	18 Apr 2006 13:59:57 -0000	1.205
+++ fc4	19 Apr 2006 15:15:37 -0000	1.206
@@ -95,6 +95,7 @@
 CVE-2006-1061 version (curl, 7.15.0 - 7.15.2 only)
 CVE-2006-1059 version (samba)
 CVE-2006-1058 VULNERABLE (busybox) bz#187386
+CVE-2006-1056 VULNERABLE (kernel, fixed 2.6.16.9)
 CVE-2006-1055 VULNERABLE (kernel, fixed 2.6.17-rc1)
 CVE-2006-1052 version (kernel, fixed 2.6.16) patch-2.6.16-rc6 [since FEDORA-2006-245]
 CVE-2006-1045 VULNERABLE (thunderbird)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- fc5	18 Apr 2006 13:59:57 -0000	1.118
+++ fc5	19 Apr 2006 15:15:37 -0000	1.119
@@ -96,6 +96,7 @@
 CVE-2006-1061 backport (curl, fixed 7.15.3) [since FEDORA-2006-189]
 CVE-2006-1059 version (samba, fixed 3.0.22 at least) bz#187170 [since FEDORA-2006-259]
 CVE-2006-1058 VULNERABLE (busybox) bz#187386
+CVE-2006-1056 VULNERABLE (kernel, fixed 2.6.16.9)
 CVE-2006-1055 VULNERABLE (kernel, fixed 2.6.17-rc1)
 CVE-2006-1052 version (kernel, fixed 2.6.16) patch-2.6.16-rc6 [since FEDORA-2006-233]
 CVE-2006-1045 VULNERABLE (thunderbird)



From fedora-extras-commits at redhat.com  Wed Apr 19 15:17:29 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Wed, 19 Apr 2006 08:17:29 -0700
Subject: fedora-security/audit fc4,1.206,1.207 fc5,1.119,1.120
Message-ID: <200604191517.k3JFHTdC016944@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16914/audit

Modified Files:
	fc4 fc5 
Log Message:
Add CVE-2006-1525



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- fc4	19 Apr 2006 15:15:37 -0000	1.206
+++ fc4	19 Apr 2006 15:17:26 -0000	1.207
@@ -77,6 +77,7 @@
 CVE-2006-1530 VULNERABLE (firefox, fixed 1.0.8)
 CVE-2006-1529 VULNERABLE (thunderbird, fixed 1.0.8)
 CVE-2006-1529 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1525 VULNERABLE (kernel, fixed 2.6.16.8)
 CVE-2006-1524 VULNERABLE (kernel, fixed 2.6.16.5)
 CVE-2006-1523 VULNERABLE (kernel, fixed 2.6.16.4)
 CVE-2006-1522 VULNERABLE (kernel, fixed 2.6.16.3)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- fc5	19 Apr 2006 15:15:37 -0000	1.119
+++ fc5	19 Apr 2006 15:17:26 -0000	1.120
@@ -76,6 +76,7 @@
 CVE-2006-1530 VULNERABLE (firefox, fixed 1.5.0.2)
 CVE-2006-1529 VULNERABLE (thunderbird, fixed 1.5.0.2)
 CVE-2006-1529 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1525 VULNERABLE (kernel, fixed 2.6.16.8)
 CVE-2006-1524 VULNERABLE (kernel, fixed 2.6.16.5)
 CVE-2006-1523 VULNERABLE (kernel, fixed 2.6.16.4)
 CVE-2006-1522 VULNERABLE (kernel, fixed 2.6.16.3)



From fedora-extras-commits at redhat.com  Wed Apr 19 15:43:55 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 19 Apr 2006 08:43:55 -0700
Subject: rpms/python-protocols/devel .cvsignore, 1.2,
	1.3 python-protocols.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200604191543.k3JFhvXH017121@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-protocols/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17100

Modified Files:
	.cvsignore python-protocols.spec sources 
Log Message:
Update to dev version 1.0a0dev_r2082



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-protocols/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Mar 2005 20:49:49 -0000	1.2
+++ .cvsignore	19 Apr 2006 15:43:55 -0000	1.3
@@ -1,2 +1 @@
-PyProtocols-0.9.3.tar.gz
-setuptools.tar.gz
+PyProtocols-1.0a0dev_r2082.zip


Index: python-protocols.spec
===================================================================
RCS file: /cvs/extras/rpms/python-protocols/devel/python-protocols.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-protocols.spec	13 Feb 2006 17:53:03 -0000	1.5
+++ python-protocols.spec	19 Apr 2006 15:43:55 -0000	1.6
@@ -1,22 +1,26 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %define python_abi %(%{__python} -c "import sys; print sys.version[:3]")
 
-%define srcname PyProtocols
+%define srcname  PyProtocols
+%define alphatag a0dev_r2082
+%define srcver   1.0%{?alphatag}
+%define eggver   1.0a0
 
 Name:           python-protocols
-Version:        0.9.3
-Release:        7%{?dist}
+Version:        1.0
+Release:        0.1.%{alphatag}%{?dist}
 
 Summary:        Open Protocols and Component Adaptation for Python
 
 Group:          Development/Libraries
 License:        PSF or ZPL
 URL:            http://peak.telecommunity.com/PyProtocols.html
-Source0:        http://peak.telecommunity.com/dist/%{srcname}-%{version}.tar.gz
+#Source0:        http://peak.telecommunity.com/dist/%{srcname}-%{version}.tar.gz
+Source0:        http://www.turbogears.org/download/eggs/%{srcname}-%{srcver}.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel python-setuptools
-Requires:   python-abi = %{python_abi}
+Requires:       python-abi = %{python_abi}
 
 %description
 PyProtocols is an implementation of PEP 246 allowing Python programmers to
@@ -24,7 +28,7 @@
 fragile 'isinstance' if type() comparisons.
 
 %prep
-%setup -q -n %{srcname}-%{version}
+%setup -q -n %{srcname}-%{srcver}
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -48,10 +52,13 @@
 %{python_sitearch}/protocols/*/*.py
 %{python_sitearch}/protocols/*/*.pyc
 %ghost %{python_sitearch}/protocols/*/*.pyo
-%dir %{python_sitearch}/%{srcname}-%{version}-py%{python_abi}.egg-info
-%{python_sitearch}/%{srcname}-%{version}-py%{python_abi}.egg-info/*
+%dir %{python_sitearch}/%{srcname}-%{eggver}-py%{python_abi}.egg-info
+%{python_sitearch}/%{srcname}-%{eggver}-py%{python_abi}.egg-info/*
 
 %changelog
+* Wed Apr 19 2006 Shahms E. King <shahms at shahms.com> 1.0-0.1.a0dev_r2082
+- Update to new upstream location and snapshot version
+
 * Mon Feb 13 2006 Shahms E. King <shahms at shahms.com> 0.9.3-7
 - Rebuild for FC5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-protocols/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Feb 2006 17:53:03 -0000	1.3
+++ sources	19 Apr 2006 15:43:55 -0000	1.4
@@ -1 +1 @@
-50559c9869389e9d576b98f6382b1324  PyProtocols-0.9.3.tar.gz
+11c5871560b65cf72b45845013297b94  PyProtocols-1.0a0dev_r2082.zip



From fedora-extras-commits at redhat.com  Wed Apr 19 15:47:20 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 19 Apr 2006 08:47:20 -0700
Subject: rpms/perl-Net-SSH-Perl - New directory
Message-ID: <200604191547.k3JFlM5B017236@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Net-SSH-Perl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17215/perl-Net-SSH-Perl

Log Message:
Directory /cvs/extras/rpms/perl-Net-SSH-Perl added to the repository




From fedora-extras-commits at redhat.com  Wed Apr 19 15:47:20 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 19 Apr 2006 08:47:20 -0700
Subject: rpms/perl-Net-SSH-Perl/devel - New directory
Message-ID: <200604191547.k3JFlMxL017239@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Net-SSH-Perl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17215/perl-Net-SSH-Perl/devel

Log Message:
Directory /cvs/extras/rpms/perl-Net-SSH-Perl/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Apr 19 15:47:53 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 19 Apr 2006 08:47:53 -0700
Subject: rpms/perl-Net-SSH-Perl Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604191547.k3JFltvc017293@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Net-SSH-Perl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17260

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Net-SSH-Perl


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Net-SSH-Perl
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Apr 19 15:47:54 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 19 Apr 2006 08:47:54 -0700
Subject: rpms/perl-Net-SSH-Perl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200604191547.k3JFlu3n017296@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Net-SSH-Perl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17260/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Net-SSH-Perl


--- 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 Apr 19 15:48:42 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 19 Apr 2006 08:48:42 -0700
Subject: rpms/perl-Net-SSH-Perl import.log,1.1,1.2
Message-ID: <200604191548.k3JFmifN017359@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Net-SSH-Perl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17326

Modified Files:
	import.log 
Log Message:
auto-import perl-Net-SSH-Perl-1.30-1 on branch devel from perl-Net-SSH-Perl-1.30-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-SSH-Perl/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Apr 2006 15:47:53 -0000	1.1
+++ import.log	19 Apr 2006 15:48:41 -0000	1.2
@@ -0,0 +1 @@
+perl-Net-SSH-Perl-1_30-1:HEAD:perl-Net-SSH-Perl-1.30-1.src.rpm:1145461710



From fedora-extras-commits at redhat.com  Wed Apr 19 15:48:42 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 19 Apr 2006 08:48:42 -0700
Subject: rpms/perl-Net-SSH-Perl/devel perl-Net-SSH-Perl.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604191548.k3JFmir7017364@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Net-SSH-Perl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17326/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Net-SSH-Perl.spec 
Log Message:
auto-import perl-Net-SSH-Perl-1.30-1 on branch devel from perl-Net-SSH-Perl-1.30-1.src.rpm


--- NEW FILE perl-Net-SSH-Perl.spec ---
# IDEA is a patent-encumbered alogorithm so default to not supporting it
# To include support for the IDEA algorithm, use: rpmbuild --with IDEA

Summary:	SSH (Secure Shell) client
Name:		perl-Net-SSH-Perl
Version:	1.30
Release:	1%{?dist}
License:	GPL or Artistic
Group:		Development/Libraries
Url:		http://search.cpan.org/dist/Net-SSH-Perl/
Source0:	http://search.cpan.org/CPAN/authors/id/D/DB/DBROBINS/Net-SSH-Perl-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:	noarch
BuildRequires:	perl(String::CRC32)        >= 1.2
BuildRequires:	perl(Convert::PEM)         >= 0.05
BuildRequires:	perl(Crypt::Blowfish)
BuildRequires:	perl(Crypt::DH)            >= 0.01
BuildRequires:	perl(Crypt::DSA)           >= 0.11
BuildRequires:	perl(Crypt::RSA)
BuildRequires:	perl(Digest::BubbleBabble)
BuildRequires:	perl(Digest::HMAC_MD5)
BuildRequires:	perl(Digest::HMAC_SHA1)
BuildRequires:	perl(Digest::MD5)
BuildRequires:	perl(Digest::SHA1)         >= 2.10
BuildRequires:	perl(Math::GMP)            >= 1.04
BuildRequires:	perl(Math::Pari)           >= 2.001804
BuildRequires:	perl(MIME::Base64)

%{?_with_IDEA:BuildRequires: perl(Crypt::IDEA)}

%description
Net::SSH::Perl is an all-Perl module implementing an SSH (Secure Shell)
client. It is compatible with both the SSH-1 and SSH-2 protocols.

%prep
%setup -q -n Net-SSH-Perl-%{version}

# Avoid extra deps from examples
%{__chmod} -x eg/*

# Remove Crypt::IDEA dep if we're not supporting the IDEA algorithm
%define bogusreq 'perl(Crypt::IDEA)'
%global reqfilt /bin/sh -c "%{__perl_requires} | %{__grep} -Fvx %{bogusreq}"
%{!?_with_IDEA:%define __perl_requires %{reqfilt}}

%build
(
	# Protocol support (select one)
	# 1=SSH1 2=SSH2 3=Both
	echo 3

	# Algorithm selection (select all required)
	# 1=IDEA 2=DES 3=DES3 4=Blowfish 5=RC4
	echo %{?_with_IDEA:1 }2 3 4 5
) |
%{__perl} Makefile.PL INSTALLDIRS=vendor
%{__make} %{?_smp_mflags}

%check
%{__make} test

%install
%{__rm} -rf %{buildroot}
%{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
/usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
/usr/bin/find %{buildroot} -type d -depth -exec /bin/rmdir {} 2>/dev/null ';'
%{__chmod} -R u+w %{buildroot}/*

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,0755)
%doc Changes README LICENSE eg ToDo
%{perl_vendorlib}/Net/
%{_mandir}/man3/Net::SSH::Perl*.3pm*

%changelog
* Mon Mar 20 2006 Paul Howarth <paul at city-fan.org> 1.30-1
- Update to 1.30
- Patch for cpan rt#11674 no longer needed, fixed upstream

* Thu Mar  2 2006 Paul Howarth <paul at city-fan.org> 1.29-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-SSH-Perl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Apr 2006 15:47:54 -0000	1.1
+++ .cvsignore	19 Apr 2006 15:48:42 -0000	1.2
@@ -0,0 +1 @@
+Net-SSH-Perl-1.30.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-SSH-Perl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Apr 2006 15:47:54 -0000	1.1
+++ sources	19 Apr 2006 15:48:42 -0000	1.2
@@ -0,0 +1 @@
+063f3dc93a4fe6108b068b6d6097992d  Net-SSH-Perl-1.30.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 19 15:54:36 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 19 Apr 2006 08:54:36 -0700
Subject: owners owners.list,1.860,1.861
Message-ID: <200604191554.k3JFsc64017479@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17462

Modified Files:
	owners.list 
Log Message:
perl-Net-SSH-Perl



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.860
retrieving revision 1.861
diff -u -r1.860 -r1.861
--- owners.list	19 Apr 2006 14:06:50 -0000	1.860
+++ owners.list	19 Apr 2006 15:54:36 -0000	1.861
@@ -1051,6 +1051,7 @@
 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-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-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|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-Number-Compare|Perl module for numeric comparisons|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-OLE-Storage_Lite|Simple Class for OLE document interface|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Wed Apr 19 15:57:49 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 19 Apr 2006 08:57:49 -0700
Subject: rpms/perl-MIME-tools/FC-5 perl-MIME-tools.spec, 1.12, 1.13 sources, 
	1.5, 1.6 .cvsignore, 1.5, 1.6
Message-ID: <200604191557.k3JFvpxM017559@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-MIME-tools/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17536

Modified Files:
	perl-MIME-tools.spec sources .cvsignore 
Log Message:
resync with devel



Index: perl-MIME-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-tools/FC-5/perl-MIME-tools.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-MIME-tools.spec	16 Jan 2006 20:47:22 -0000	1.12
+++ perl-MIME-tools.spec	19 Apr 2006 15:57:49 -0000	1.13
@@ -1,75 +1,74 @@
 Name:           perl-MIME-tools
-Version:        5.419
+Version:        5.420
 Release:        1%{?dist}
 Summary:        Modules for parsing and creating MIME entities in Perl
-
 Group:          Development/Libraries
 License:        Artistic or GPL
 URL:            http://search.cpan.org/dist/MIME-tools/
-Source0:        http://www.cpan.org/authors/id/D/DS/DSKOLL/MIME-tools-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-broot-%(%{__id_u} -n)
-
+Source0:        http://search.cpan.org/CPAN/authors/id/D/DS/DSKOLL/MIME-tools-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  perl(IO::Stringy)
-BuildRequires:  perl(MIME::Base64) >= 2.20
-BuildRequires:  perl-MailTools
+BuildRequires:  perl(IO::Stringy)       >= 1.211
+BuildRequires:  perl(MIME::Base64)      >= 2.20
+BuildRequires:  perl-MailTools          >= 1.50
 BuildRequires:  perl(MIME::QuotedPrint)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
-MIME-tools is a collection of Perl5 MIME:: modules for parsing,
-decoding, *and generating* single- or multipart (even nested
-multipart) MIME messages. (Yes, kids, that means you can send messages
-with attached GIF files).
+MIME-tools is a collection of Perl5 MIME:: modules for parsing, decoding, and
+generating single- or multipart (even nested multipart) MIME messages.
 
+Yes, kids, that means you can send messages with attached GIF files.
 
 %prep
 %setup -q -n MIME-tools-%{version}
-chmod 644 examples/* # avoid dependencies
-f=ChangeLog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
-cat << \EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} $* | grep -v '^perl(main)$'
-EOF
-%define __perl_provides %{_builddir}/MIME-tools-%{version}/%{name}-prov
-chmod +x %{__perl_provides}
 
+# Fix character encoding
+/usr/bin/iconv -f iso-8859-1 -t utf-8 ChangeLog > ChangeLog.utf8
+%{__mv} ChangeLog.utf8 ChangeLog
+
+# Remove redundant provides
+%global provfilt /bin/sh -c "%{__perl_provides} | %{__grep} -Fvx 'perl(main)'"
+%define __perl_provides %{provfilt}
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags}
-
+%{__make} %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
-rm -f $RPM_BUILD_ROOT%{perl_vendorlib}/set-version.pl
-chmod -R u+w $RPM_BUILD_ROOT/*
-
+%{__rm} -rf %{buildroot}
+%{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
+/usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
+/usr/bin/find %{buildroot} -type d -depth -exec /bin/rmdir {} 2>/dev/null ';'
+%{__chmod} -R u+w %{buildroot}/*
 
 %check
-if %{__perl} -e "use MIME::QuotedPrint 3.03" 2>/dev/null ; then
-  make test
+if %{__perl} -e "use MIME::QuotedPrint 3.03" 2>/dev/null; then
+  %{__make} test
 else
   # Expected failures: 4, 5 and 7-11 of t/Misc.t
-  make test || :
+  %{__make} test || :
 fi
 
-
 %clean
-rm -rf $RPM_BUILD_ROOT
-
+%{__rm} -rf %{buildroot}
 
 %files
-%defattr(-,root,root,-)
-%doc ChangeLog COPYING README README-OR-DIE examples/
+%defattr(-,root,root,0755)
+%doc README* COPYING ChangeLog
+# Adding examples introduces additional deps, but these are all satisfied by
+# perl, perl-MIME-tools, and perl-MailTools, which are all deps anyway.
+%doc examples
 %{perl_vendorlib}/MIME/
-%{_mandir}/man3/MIME::*.3*
-
+%{_mandir}/man3/MIME::*.3pm*
 
 %changelog
+* Wed Apr 19 2006 Paul Howarth <paul at city-fan.org> - 5.420-1
+- 5.420
+- Cosmetic changes reflecting new maintainer's preferences
+- Examples remain executable since they don't introduce new dependencies
+- Simplify provides filter
+
 * Mon Jan 16 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.419-1
 - 5.419.
 - Don't provide perl(main).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-tools/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	16 Jan 2006 20:47:22 -0000	1.5
+++ sources	19 Apr 2006 15:57:49 -0000	1.6
@@ -1 +1 @@
-1c033072b751e27ecb096bc155a7e406  MIME-tools-5.419.tar.gz
+4db6505cc0132c80c5a9cc54f443a21a  MIME-tools-5.420.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-tools/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	16 Jan 2006 20:47:22 -0000	1.5
+++ .cvsignore	19 Apr 2006 15:57:49 -0000	1.6
@@ -1 +1 @@
-MIME-tools-5.419.tar.gz
+MIME-tools-5.420.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 19 15:59:31 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 19 Apr 2006 08:59:31 -0700
Subject: rpms/perl-MIME-tools/FC-4 perl-MIME-tools.spec, 1.10, 1.11 sources, 
	1.4, 1.5 .cvsignore, 1.4, 1.5
Message-ID: <200604191559.k3JFxXI9017634@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-MIME-tools/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17613

Modified Files:
	perl-MIME-tools.spec sources .cvsignore 
Log Message:
resync with devel



Index: perl-MIME-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-tools/FC-4/perl-MIME-tools.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-MIME-tools.spec	16 Jan 2006 20:50:23 -0000	1.10
+++ perl-MIME-tools.spec	19 Apr 2006 15:59:30 -0000	1.11
@@ -1,75 +1,74 @@
 Name:           perl-MIME-tools
-Version:        5.419
+Version:        5.420
 Release:        1%{?dist}
 Summary:        Modules for parsing and creating MIME entities in Perl
-
 Group:          Development/Libraries
 License:        Artistic or GPL
 URL:            http://search.cpan.org/dist/MIME-tools/
-Source0:        http://www.cpan.org/authors/id/D/DS/DSKOLL/MIME-tools-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-broot-%(%{__id_u} -n)
-
+Source0:        http://search.cpan.org/CPAN/authors/id/D/DS/DSKOLL/MIME-tools-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  perl(IO::Stringy)
-BuildRequires:  perl(MIME::Base64) >= 2.20
-BuildRequires:  perl-MailTools
+BuildRequires:  perl(IO::Stringy)       >= 1.211
+BuildRequires:  perl(MIME::Base64)      >= 2.20
+BuildRequires:  perl-MailTools          >= 1.50
 BuildRequires:  perl(MIME::QuotedPrint)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
-MIME-tools is a collection of Perl5 MIME:: modules for parsing,
-decoding, *and generating* single- or multipart (even nested
-multipart) MIME messages. (Yes, kids, that means you can send messages
-with attached GIF files).
+MIME-tools is a collection of Perl5 MIME:: modules for parsing, decoding, and
+generating single- or multipart (even nested multipart) MIME messages.
 
+Yes, kids, that means you can send messages with attached GIF files.
 
 %prep
 %setup -q -n MIME-tools-%{version}
-chmod 644 examples/* # avoid dependencies
-f=ChangeLog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
-cat << \EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} $* | grep -v '^perl(main)$'
-EOF
-%define __perl_provides %{_builddir}/MIME-tools-%{version}/%{name}-prov
-chmod +x %{__perl_provides}
 
+# Fix character encoding
+/usr/bin/iconv -f iso-8859-1 -t utf-8 ChangeLog > ChangeLog.utf8
+%{__mv} ChangeLog.utf8 ChangeLog
+
+# Remove redundant provides
+%global provfilt /bin/sh -c "%{__perl_provides} | %{__grep} -Fvx 'perl(main)'"
+%define __perl_provides %{provfilt}
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags}
-
+%{__make} %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
-rm -f $RPM_BUILD_ROOT%{perl_vendorlib}/set-version.pl
-chmod -R u+w $RPM_BUILD_ROOT/*
-
+%{__rm} -rf %{buildroot}
+%{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
+/usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
+/usr/bin/find %{buildroot} -type d -depth -exec /bin/rmdir {} 2>/dev/null ';'
+%{__chmod} -R u+w %{buildroot}/*
 
 %check
-if %{__perl} -e "use MIME::QuotedPrint 3.03" 2>/dev/null ; then
-  make test
+if %{__perl} -e "use MIME::QuotedPrint 3.03" 2>/dev/null; then
+  %{__make} test
 else
   # Expected failures: 4, 5 and 7-11 of t/Misc.t
-  make test || :
+  %{__make} test || :
 fi
 
-
 %clean
-rm -rf $RPM_BUILD_ROOT
-
+%{__rm} -rf %{buildroot}
 
 %files
-%defattr(-,root,root,-)
-%doc ChangeLog COPYING README README-OR-DIE examples/
+%defattr(-,root,root,0755)
+%doc README* COPYING ChangeLog
+# Adding examples introduces additional deps, but these are all satisfied by
+# perl, perl-MIME-tools, and perl-MailTools, which are all deps anyway.
+%doc examples
 %{perl_vendorlib}/MIME/
-%{_mandir}/man3/MIME::*.3*
-
+%{_mandir}/man3/MIME::*.3pm*
 
 %changelog
+* Wed Apr 19 2006 Paul Howarth <paul at city-fan.org> - 5.420-1
+- 5.420
+- Cosmetic changes reflecting new maintainer's preferences
+- Examples remain executable since they don't introduce new dependencies
+- Simplify provides filter
+
 * Mon Jan 16 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.419-1
 - 5.419.
 - Don't provide perl(main).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-tools/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Jan 2006 20:50:23 -0000	1.4
+++ sources	19 Apr 2006 15:59:30 -0000	1.5
@@ -1 +1 @@
-1c033072b751e27ecb096bc155a7e406  MIME-tools-5.419.tar.gz
+4db6505cc0132c80c5a9cc54f443a21a  MIME-tools-5.420.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-tools/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Jan 2006 20:50:23 -0000	1.4
+++ .cvsignore	19 Apr 2006 15:59:30 -0000	1.5
@@ -1 +1 @@
-MIME-tools-5.419.tar.gz
+MIME-tools-5.420.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 19 16:02:31 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 19 Apr 2006 09:02:31 -0700
Subject: rpms/perl-MIME-tools/FC-3 perl-MIME-tools.spec, 1.6, 1.7 sources,
	1.3, 1.4 .cvsignore, 1.3, 1.4
Message-ID: <200604191603.k3JG35PY019717@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-MIME-tools/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19688

Modified Files:
	perl-MIME-tools.spec sources .cvsignore 
Log Message:
resync with devel



Index: perl-MIME-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-tools/FC-3/perl-MIME-tools.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-MIME-tools.spec	22 Jan 2005 11:53:15 -0000	1.6
+++ perl-MIME-tools.spec	19 Apr 2006 16:02:29 -0000	1.7
@@ -1,70 +1,88 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-MIME-tools
-Version:        5.417
-Release:        1
-Epoch:          0
+Version:        5.420
+Release:        1%{?dist}
 Summary:        Modules for parsing and creating MIME entities in Perl
-
 Group:          Development/Libraries
-License:        Artistic
+License:        Artistic or GPL
 URL:            http://search.cpan.org/dist/MIME-tools/
-Source0:     http://www.cpan.org/authors/id/D/DS/DSKOLL/MIME-tools-5.417.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-broot-%(%{__id_u} -n)
-
+Source0:        http://search.cpan.org/CPAN/authors/id/D/DS/DSKOLL/MIME-tools-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  perl(IO::Stringy) perl(MIME::Base64) >= 2.20 perl-MailTools
-BuildRequires:  perl >= 1:5.6.1 perl(MIME::QuotedPrint)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires:  perl(IO::Stringy)       >= 1.211
+BuildRequires:  perl(MIME::Base64)      >= 2.20
+BuildRequires:  perl-MailTools          >= 1.50
+BuildRequires:  perl(MIME::QuotedPrint)
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
-MIME-tools is a collection of Perl5 MIME:: modules for parsing,
-decoding, *and generating* single- or multipart (even nested
-multipart) MIME messages. (Yes, kids, that means you can send messages
-with attached GIF files).
+MIME-tools is a collection of Perl5 MIME:: modules for parsing, decoding, and
+generating single- or multipart (even nested multipart) MIME messages.
 
+Yes, kids, that means you can send messages with attached GIF files.
 
 %prep
 %setup -q -n MIME-tools-%{version}
-chmod 644 examples/* # avoid dependencies
 
+# Fix character encoding
+/usr/bin/iconv -f iso-8859-1 -t utf-8 ChangeLog > ChangeLog.utf8
+%{__mv} ChangeLog.utf8 ChangeLog
+
+# Remove redundant provides
+%global provfilt /bin/sh -c "%{__perl_provides} | %{__grep} -Fvx 'perl(main)'"
+%define __perl_provides %{provfilt}
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags}
-
+%{__make} %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
-rm -f $RPM_BUILD_ROOT%{perl_vendorlib}/set-version.pl
-chmod -R u+w $RPM_BUILD_ROOT/*
-
-
-%check || :
-if %{__perl} -MMIME::QuotedPrint \
-  -e 'exit ($MIME::QuotedPrint::VERSION < 3.03)' ; then
-  make test
+%{__rm} -rf %{buildroot}
+%{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
+/usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
+/usr/bin/find %{buildroot} -type d -depth -exec /bin/rmdir {} 2>/dev/null ';'
+%{__chmod} -R u+w %{buildroot}/*
+
+%check
+if %{__perl} -e "use MIME::QuotedPrint 3.03" 2>/dev/null; then
+  %{__make} test
 else
   # Expected failures: 4, 5 and 7-11 of t/Misc.t
-  make test || :
+  %{__make} test || :
 fi
 
-
 %clean
-rm -rf $RPM_BUILD_ROOT
-
+%{__rm} -rf %{buildroot}
 
 %files
-%defattr(-,root,root,-)
-%doc ChangeLog COPYING README README-OR-DIE examples
-%{perl_vendorlib}/MIME
-%{_mandir}/man3/MIME::*.3*
-
+%defattr(-,root,root,0755)
+%doc README* COPYING ChangeLog
+# Adding examples introduces additional deps, but these are all satisfied by
+# perl, perl-MIME-tools, and perl-MailTools, which are all deps anyway.
+%doc examples
+%{perl_vendorlib}/MIME/
+%{_mandir}/man3/MIME::*.3pm*
 
 %changelog
+* Wed Apr 19 2006 Paul Howarth <paul at city-fan.org> - 5.420-1
+- 5.420
+- Cosmetic changes reflecting new maintainer's preferences
+- Examples remain executable since they don't introduce new dependencies
+- Simplify provides filter
+
+* Mon Jan 16 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.419-1
+- 5.419.
+- Don't provide perl(main).
+
+* Tue Oct  4 2005 Paul Howarth <paul at city-fan.org> - 5.418-2
+- License is same as perl (GPL or Artistic), not just Artistic
+
+* Mon Oct  3 2005 Ville Skytt?? <ville.skytta at iki.fi> - 5.418-1
+- 5.418.
+- Cosmetic specfile cleanups.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 5.417-2
+- rebuilt
+
 * Sat Jan 22 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.417-1
 - Update to 5.417.
 
@@ -100,5 +118,5 @@
 * Wed Jun 25 2003 Dams <anvil[AT]livna.org> 0:5.411-0.fdr.2.a
 - Now using roaringpenguin tarball
 
-* Sun Jun 15 2003 Dams <anvil[AT]livna.org> 
+* Sun Jun 15 2003 Dams <anvil[AT]livna.org>
 - Initial build.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-tools/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Jan 2005 11:53:15 -0000	1.3
+++ sources	19 Apr 2006 16:02:29 -0000	1.4
@@ -1 +1 @@
-a92299db8729f0f7886ada6e3539b265  MIME-tools-5.417.tar.gz
+4db6505cc0132c80c5a9cc54f443a21a  MIME-tools-5.420.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-tools/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Jan 2005 11:53:15 -0000	1.3
+++ .cvsignore	19 Apr 2006 16:02:29 -0000	1.4
@@ -1 +1 @@
-MIME-tools-5.417.tar.gz
+MIME-tools-5.420.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 19 16:51:35 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Wed, 19 Apr 2006 09:51:35 -0700
Subject: rpms/octave/devel octave-2.9.5-config.patch, NONE, 1.1 octave.spec, 
	1.36, 1.37
Message-ID: <200604191651.k3JGpb8M021162@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/octave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21142

Modified Files:
	octave.spec 
Added Files:
	octave-2.9.5-config.patch 
Log Message:
Add new patch to configure script.

octave-2.9.5-config.patch:

--- NEW FILE octave-2.9.5-config.patch ---
--- configure.orig	2006-04-18 08:22:38.000000000 -0500
+++ configure	2006-04-18 08:30:46.000000000 -0500
@@ -3291,7 +3291,7 @@
 echo "$as_me:$LINENO: result: defining localfcnfiledir to be $localfcnfiledir" >&5
 echo "${ECHO_T}defining localfcnfiledir to be $localfcnfiledir" >&6
 
-: ${localapifcnfiledir='$(datadir)/octave/site/$(apiversion)/m'}
+: ${localapifcnfiledir='$(datadir)/octave/site/$(api_version)/m'}
 echo "$as_me:$LINENO: result: defining localapifcnfiledir to be $localapifcnfiledir" >&5
 echo "${ECHO_T}defining localapifcnfiledir to be $localapifcnfiledir" >&6
 
@@ -3327,7 +3327,7 @@
 echo "$as_me:$LINENO: result: defining localoctfiledir to be $localoctfiledir" >&5
 echo "${ECHO_T}defining localoctfiledir to be $localoctfiledir" >&6
 
-: ${localapioctfiledir='$(libexecdir)/octave/site/oct/$(apiversion)/$(canonical_host_type)'}
+: ${localapioctfiledir='$(libexecdir)/octave/site/oct/$(api_version)/$(canonical_host_type)'}
 echo "$as_me:$LINENO: result: defining localapioctfiledir to be $localapioctfiledir" >&5
 echo "${ECHO_T}defining localapioctfiledir to be $localapioctfiledir" >&6
 


Index: octave.spec
===================================================================
RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- octave.spec	24 Mar 2006 21:19:19 -0000	1.36
+++ octave.spec	19 Apr 2006 16:51:35 -0000	1.37
@@ -1,6 +1,6 @@
 Name:           octave
 Version:        2.9.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 
@@ -8,6 +8,7 @@
 License:        GPL
 Source:         ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%{version}.tar.bz2
 Patch0:         octave-2.9.5-sparse.patch
+Patch1:         octave-2.9.5-config.patch
 URL:            http://www.octave.org
 Requires:       gnuplot less info texinfo 
 Requires(post): /sbin/install-info
@@ -51,6 +52,7 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0
 
 
 %build
@@ -133,6 +135,9 @@
 
 
 %changelog
+* Wed Apr 19 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.5-5
+- Add new patch to configure script (breaks octave-forge without it).
+
 * Fri Mar 24 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.5-4
 - Change patch again (suggested by the author on Octave mailing list).
 



From fedora-extras-commits at redhat.com  Wed Apr 19 18:32:16 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Wed, 19 Apr 2006 11:32:16 -0700
Subject: rpms/xdesktopwaves/FC-5 xdesktopwaves.spec,1.6,1.7
Message-ID: <200604191832.k3JIWITI026189@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/xdesktopwaves/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26172

Modified Files:
	xdesktopwaves.spec 
Log Message:
* Wed Apr 19 2006 Adrian Reber <adrian at lisas.de> - 1.3-7
- fixed BR



Index: xdesktopwaves.spec
===================================================================
RCS file: /cvs/extras/rpms/xdesktopwaves/FC-5/xdesktopwaves.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xdesktopwaves.spec	11 Apr 2006 19:39:14 -0000	1.6
+++ xdesktopwaves.spec	19 Apr 2006 18:32:15 -0000	1.7
@@ -1,6 +1,6 @@
 Name:          xdesktopwaves
 Version:       1.3
-Release:       6%{?dist}
+Release:       7%{?dist}
 
 Summary:       Simulation of water waves on the X Window System desktop
 License:       GPL
@@ -8,7 +8,7 @@
 URL:           http://xdesktopwaves.sf.net/
 Source:        http://dl.sf.net/xdesktopwaves/xdesktopwaves-1.3.tar.gz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libX11-devel, desktop-file-utils
+BuildRequires: libX11-devel, desktop-file-utils, libXext-devel
 
 %description
 xdesktopwaves is a cellular automata setting the background of your X
@@ -61,6 +61,9 @@
 %{_datadir}/pixmaps/%{name}.xpm
 
 %changelog
+* Wed Apr 19 2006 Adrian Reber <adrian at lisas.de> - 1.3-7
+- fixed BR
+
 * Tue Apr 11 2006 Adrian Reber <adrian at lisas.de> - 1.3-6
 - trying to fix build on x86_64
 



From fedora-extras-commits at redhat.com  Wed Apr 19 18:53:13 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Wed, 19 Apr 2006 11:53:13 -0700
Subject: rpms/xdesktopwaves/devel xdesktopwaves.spec,1.4,1.5
Message-ID: <200604191853.k3JIrFLP027040@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/xdesktopwaves/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27023

Modified Files:
	xdesktopwaves.spec 
Log Message:
* Wed Apr 19 2006 Adrian Reber <adrian at lisas.de> - 1.3-7
- fixed BR



Index: xdesktopwaves.spec
===================================================================
RCS file: /cvs/extras/rpms/xdesktopwaves/devel/xdesktopwaves.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xdesktopwaves.spec	10 May 2005 06:36:00 -0000	1.4
+++ xdesktopwaves.spec	19 Apr 2006 18:53:13 -0000	1.5
@@ -1,6 +1,6 @@
 Name:          xdesktopwaves
 Version:       1.3
-Release:       4%{?dist}
+Release:       7%{?dist}
 
 Summary:       Simulation of water waves on the X Window System desktop
 License:       GPL
@@ -8,7 +8,7 @@
 URL:           http://xdesktopwaves.sf.net/
 Source:        http://dl.sf.net/xdesktopwaves/xdesktopwaves-1.3.tar.gz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: xorg-x11-devel, desktop-file-utils
+BuildRequires: libX11-devel, desktop-file-utils, libXext-devel
 
 %description
 xdesktopwaves is a cellular automata setting the background of your X
@@ -21,8 +21,7 @@
 %{__sed} -i -e "s,-s,," Makefile
 
 %build
-%{__make} CFLAGS="$RPM_OPT_FLAGS -I/usr/X11R6/include" \
-    LFLAGS="-L/usr/X11R6/%{_lib}" %{?_smp_mflags}
+%{__make} CFLAGS="$RPM_OPT_FLAGS" LFLAGS="-L/usr/%{_lib}" %{?_smp_mflags}
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -62,6 +61,15 @@
 %{_datadir}/pixmaps/%{name}.xpm
 
 %changelog
+* Wed Apr 19 2006 Adrian Reber <adrian at lisas.de> - 1.3-7
+- fixed BR
+
+* Tue Apr 11 2006 Adrian Reber <adrian at lisas.de> - 1.3-6
+- trying to fix build on x86_64
+
+* Tue Apr 11 2006 Adrian Reber <adrian at lisas.de> - 1.3-5
+- rebuilt for modular X
+
 * Tue May 10 2005 Adrian Reber <adrian at lisas.de> - 1.3-4
 - remove stripping from Makefile so that the
   debuginfo subpackage gets build



From fedora-extras-commits at redhat.com  Wed Apr 19 19:45:43 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Wed, 19 Apr 2006 12:45:43 -0700
Subject: fedora-security/audit fc4,1.207,1.208 fc5,1.120,1.121
Message-ID: <200604191945.k3JJjhp1029352@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29330

Modified Files:
	fc4 fc5 
Log Message:
Note a new CVE id.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- fc4	19 Apr 2006 15:17:26 -0000	1.207
+++ fc4	19 Apr 2006 19:45:41 -0000	1.208
@@ -188,6 +188,7 @@
 CVE-2006-0036 version (kernel, fixed 2.6.15.5, only 2.6.14 and 2.6.15) [since FEDORA-2006-245] was backport since FEDORA-2006-077
 CVE-2006-0035 version (kernel, fixed 2.6.15.5) [since FEDORA-2006-245] was backport since FEDORA-2006-077
 CVE-2006-0019 version (kdelibs, fixed 3.5.1) [since FEDORA-2006-090] was backport since FEDORA-2006-050
+CVE-2005-4784 ignore (glibc) struct dirent is big enough
 CVE-2005-4746 version (freeradius) we don't build vulnerable bits
 CVE-2005-4745 version (freeradius) we don't build vulnerable bits
 CVE-2005-4744 VULNERABLE (freeradius, fixed 1.0.5) bz#167677


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- fc5	19 Apr 2006 15:17:26 -0000	1.120
+++ fc5	19 Apr 2006 19:45:41 -0000	1.121
@@ -190,6 +190,7 @@
 CVE-2006-0036 version (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 [since FEDORA-2006-233]
 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-4784 ignore (glibc) struct dirent is big enough
 CVE-2005-4746 version (freeradius) we don't build vulnerable bits
 CVE-2005-4745 version (freeradius) we don't build vulnerable bits
 CVE-2005-4744 version (freeradius, fixed 1.0.5)



From fedora-extras-commits at redhat.com  Wed Apr 19 19:48:13 2006
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Wed, 19 Apr 2006 12:48:13 -0700
Subject: rpms/gpsd/FC-5 gpsd.spec,1.2,1.3
Message-ID: <200604191948.k3JJmFHB029396@cvs-int.fedora.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/gpsd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29365/FC-5

Modified Files:
	gpsd.spec 
Log Message:
Don't enable tnt gps driver as it causes havoc.  See bug 189220.



Index: gpsd.spec
===================================================================
RCS file: /cvs/extras/rpms/gpsd/FC-5/gpsd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gpsd.spec	13 Apr 2006 22:20:54 -0000	1.2
+++ gpsd.spec	19 Apr 2006 19:48:12 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gpsd
 Version:        2.32
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Service daemon for mediating access to a GPS
 
 Group:          System Environment/Daemons
@@ -57,7 +57,7 @@
 %setup -q
 
 %build
-%configure --enable-tnt --enable-dbus --disable-static
+%configure --enable-dbus --disable-static
 make %{?_smp_mflags}
 
 %install
@@ -146,6 +146,10 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Wed Apr 19 2006 Matthew Truch <matt at truch.net> - 2.32-5
+- Don't --enable-tnt in build as it causes some gpses to not work
+  properly with sattelite view mode.  See bugzilla bug 189220.
+
 * Thu Apr 13 2006 Matthew Truch <matt at truch.net> - 2.32-4
 - Add dbus-glib to BuildRequires as needed for build.
 



From fedora-extras-commits at redhat.com  Wed Apr 19 19:48:13 2006
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Wed, 19 Apr 2006 12:48:13 -0700
Subject: rpms/gpsd/devel gpsd.spec,1.2,1.3
Message-ID: <200604191948.k3JJmFqL029400@cvs-int.fedora.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/gpsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29365/devel

Modified Files:
	gpsd.spec 
Log Message:
Don't enable tnt gps driver as it causes havoc.  See bug 189220.



Index: gpsd.spec
===================================================================
RCS file: /cvs/extras/rpms/gpsd/devel/gpsd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gpsd.spec	13 Apr 2006 22:20:55 -0000	1.2
+++ gpsd.spec	19 Apr 2006 19:48:13 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gpsd
 Version:        2.32
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Service daemon for mediating access to a GPS
 
 Group:          System Environment/Daemons
@@ -57,7 +57,7 @@
 %setup -q
 
 %build
-%configure --enable-tnt --enable-dbus --disable-static
+%configure --enable-dbus --disable-static
 make %{?_smp_mflags}
 
 %install
@@ -146,6 +146,10 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Wed Apr 19 2006 Matthew Truch <matt at truch.net> - 2.32-5
+- Don't --enable-tnt in build as it causes some gpses to not work
+  properly with sattelite view mode.  See bugzilla bug 189220.
+
 * Thu Apr 13 2006 Matthew Truch <matt at truch.net> - 2.32-4
 - Add dbus-glib to BuildRequires as needed for build.
 



From fedora-extras-commits at redhat.com  Wed Apr 19 20:01:00 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 19 Apr 2006 13:01:00 -0700
Subject: rpms/archmage - New directory
Message-ID: <200604192001.k3JK12Mk030143@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/archmage
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29562/archmage

Log Message:
Directory /cvs/extras/rpms/archmage added to the repository




From fedora-extras-commits at redhat.com  Wed Apr 19 20:01:00 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 19 Apr 2006 13:01:00 -0700
Subject: rpms/archmage/devel - New directory
Message-ID: <200604192001.k3JK12eC030869@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/archmage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29562/archmage/devel

Log Message:
Directory /cvs/extras/rpms/archmage/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Apr 19 20:01:33 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 19 Apr 2006 13:01:33 -0700
Subject: rpms/archmage/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604192001.k3JK1ZHK031669@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/archmage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31633/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module archmage


--- 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 Apr 19 20:01:31 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 19 Apr 2006 13:01:31 -0700
Subject: rpms/archmage Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604192001.k3JK1XwK031648@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/archmage
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31633

Added Files:
	Makefile import.log 
Log Message:
Setup of module archmage


--- NEW FILE Makefile ---
# Top level Makefile for module archmage
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 19 20:02:07 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 19 Apr 2006 13:02:07 -0700
Subject: rpms/archmage import.log,1.1,1.2
Message-ID: <200604192002.k3JK2gGH031733@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/archmage
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31699

Modified Files:
	import.log 
Log Message:
auto-import archmage-0.0.7-1 on branch devel from archmage-0.0.7-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/archmage/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Apr 2006 20:01:30 -0000	1.1
+++ import.log	19 Apr 2006 20:02:07 -0000	1.2
@@ -0,0 +1 @@
+archmage-0_0_7-1:HEAD:archmage-0.0.7-1.src.rpm:1145476892



From fedora-extras-commits at redhat.com  Wed Apr 19 20:02:15 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 19 Apr 2006 13:02:15 -0700
Subject: rpms/archmage/devel archmage.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604192002.k3JK2n3N031735@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/archmage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31699/devel

Modified Files:
	.cvsignore sources 
Added Files:
	archmage.spec 
Log Message:
auto-import archmage-0.0.7-1 on branch devel from archmage-0.0.7-1.src.rpm


--- NEW FILE archmage.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           archmage
Version:        0.0.7
Release:        1%{?dist}
Summary:        Extensible reader/decompiler of files in CHM format

Group:          Development/Tools
License:        GPL
URL:            http://archmage.sourceforge.net/
Source0:        http://dl.sourceforge.net/sourceforge/archmage/archmage-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
Requires:       python-chm
BuildRequires:  python-devel
Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")

%description
arCHMage - extensible reader/decompiler of files in CHM format 
(Microsoft HTML help, also known as Compiled HTML).
arCHMage is based on chmlib by Jed Wing and is written on python.


%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
install -d $RPM_BUILD_ROOT%{_mandir}/man1/
install -m644 debian/archmage.1 $RPM_BUILD_ROOT%{_mandir}/man1/


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING README
%dir %{_sysconfdir}/archmage/
%config(noreplace) %{_sysconfdir}/archmage/arch.conf
%{_bindir}/archmage
%dir %{python_sitelib}/archmod/
%{python_sitelib}/archmod/*.py
%{python_sitelib}/archmod/*.pyc
%ghost %{python_sitelib}/archmod/*.pyo
%{_datadir}/archmage/
%{_mandir}/man*/archmage*

%changelog
* Mon Mar 20 2006 Patrice Dumas <pertusus at free.fr> 0.0.7-1
- initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/archmage/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Apr 2006 20:01:33 -0000	1.1
+++ .cvsignore	19 Apr 2006 20:02:14 -0000	1.2
@@ -0,0 +1 @@
+archmage-0.0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/archmage/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Apr 2006 20:01:33 -0000	1.1
+++ sources	19 Apr 2006 20:02:14 -0000	1.2
@@ -0,0 +1 @@
+7535427b04c6f6f504ecd2fccc6dd268  archmage-0.0.7.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 19 20:36:15 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 19 Apr 2006 13:36:15 -0700
Subject: rpms/multitail/devel .cvsignore, 1.5, 1.6 multitail.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <200604192036.k3JKaHLO032036@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/multitail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32015

Modified Files:
	.cvsignore multitail.spec sources 
Log Message:
Update to 4.0.3.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/multitail/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	12 Apr 2006 23:49:05 -0000	1.5
+++ .cvsignore	19 Apr 2006 20:36:14 -0000	1.6
@@ -1 +1 @@
-multitail-4.0.0.tgz
+multitail-4.0.3.tgz


Index: multitail.spec
===================================================================
RCS file: /cvs/extras/rpms/multitail/devel/multitail.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- multitail.spec	12 Apr 2006 23:49:05 -0000	1.4
+++ multitail.spec	19 Apr 2006 20:36:14 -0000	1.5
@@ -1,5 +1,5 @@
 Name: multitail
-Version: 4.0.0
+Version: 4.0.3
 Release: 1%{?dist}
 Summary: View one or multiple files like tail but with multiple windows
 
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Wed Apr 19 2006 Folkert van Heuesden <folkert at vanheusden.com> - 4.0.3-1
+- Updated to release 4.0.3.
+
 * Wed Apr 12 2006 Folkert van Heuesden <folkert at vanheusden.com> - 4.0.0-1
 - Updated to release 4.0.0.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/multitail/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	12 Apr 2006 23:49:05 -0000	1.5
+++ sources	19 Apr 2006 20:36:14 -0000	1.6
@@ -1 +1 @@
-6a86bcc65185faa37720c56a414fe5dd  multitail-4.0.0.tgz
+b6017e19aa7cf7e2b4fddd75a596a1a7  multitail-4.0.3.tgz



From fedora-extras-commits at redhat.com  Wed Apr 19 20:45:42 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 19 Apr 2006 13:45:42 -0700
Subject: rpms/compat-wxPythonGTK2/devel compat-wxPython.spec,1.1,1.2
Message-ID: <200604192045.k3JKji68032290@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/compat-wxPythonGTK2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32233/devel

Modified Files:
	compat-wxPython.spec 
Log Message:

Get rid of unnecessary Provides



Index: compat-wxPython.spec
===================================================================
RCS file: /cvs/extras/rpms/compat-wxPythonGTK2/devel/compat-wxPython.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- compat-wxPython.spec	6 Jan 2006 16:23:11 -0000	1.1
+++ compat-wxPython.spec	19 Apr 2006 20:45:42 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:           compat-wxPythonGTK2
 Version:        2.4.2.4
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Compatibility version of the wxWidgets GUI toolkit for Python
 Group:          Development/Languages
 License:        LGPL
@@ -16,8 +16,6 @@
 BuildRequires:  zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel
 BuildRequires:  python-devel
 
-# This is what other packages should depend on, NOT the package name!
-Provides:       wxPython = %{version}-%{release}
 Obsoletes:      wxPythonGTK2 <= 2.4.2.4-7
 Obsoletes:      wxPython <= 2.4.2.4-7
 
@@ -66,6 +64,9 @@
 %{python_sitearch}/wx/
 
 %changelog
+* Wed Apr 19 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.2.4-10
+- get rid of unnecessary provides
+
 * Fri Jan  6 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.2.4-9
 - spec cleanups
 



From fedora-extras-commits at redhat.com  Wed Apr 19 20:45:36 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 19 Apr 2006 13:45:36 -0700
Subject: rpms/compat-wxPythonGTK2/FC-4 compat-wxPython.spec,1.1,1.2
Message-ID: <200604192046.k3JKk806032300@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/compat-wxPythonGTK2/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32233/FC-4

Modified Files:
	compat-wxPython.spec 
Log Message:

Get rid of unnecessary Provides



Index: compat-wxPython.spec
===================================================================
RCS file: /cvs/extras/rpms/compat-wxPythonGTK2/FC-4/compat-wxPython.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- compat-wxPython.spec	6 Jan 2006 16:23:11 -0000	1.1
+++ compat-wxPython.spec	19 Apr 2006 20:45:36 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:           compat-wxPythonGTK2
 Version:        2.4.2.4
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Compatibility version of the wxWidgets GUI toolkit for Python
 Group:          Development/Languages
 License:        LGPL
@@ -16,8 +16,6 @@
 BuildRequires:  zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel
 BuildRequires:  python-devel
 
-# This is what other packages should depend on, NOT the package name!
-Provides:       wxPython = %{version}-%{release}
 Obsoletes:      wxPythonGTK2 <= 2.4.2.4-7
 Obsoletes:      wxPython <= 2.4.2.4-7
 
@@ -66,6 +64,9 @@
 %{python_sitearch}/wx/
 
 %changelog
+* Wed Apr 19 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.2.4-10
+- get rid of unnecessary provides
+
 * Fri Jan  6 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.2.4-9
 - spec cleanups
 



From fedora-extras-commits at redhat.com  Wed Apr 19 20:45:37 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 19 Apr 2006 13:45:37 -0700
Subject: rpms/compat-wxPythonGTK2/FC-5 compat-wxPython.spec,1.1,1.2
Message-ID: <200604192046.k3JKk9nK032305@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/compat-wxPythonGTK2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32233/FC-5

Modified Files:
	compat-wxPython.spec 
Log Message:

Get rid of unnecessary Provides



Index: compat-wxPython.spec
===================================================================
RCS file: /cvs/extras/rpms/compat-wxPythonGTK2/FC-5/compat-wxPython.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- compat-wxPython.spec	6 Jan 2006 16:23:11 -0000	1.1
+++ compat-wxPython.spec	19 Apr 2006 20:45:37 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:           compat-wxPythonGTK2
 Version:        2.4.2.4
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Compatibility version of the wxWidgets GUI toolkit for Python
 Group:          Development/Languages
 License:        LGPL
@@ -16,8 +16,6 @@
 BuildRequires:  zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel
 BuildRequires:  python-devel
 
-# This is what other packages should depend on, NOT the package name!
-Provides:       wxPython = %{version}-%{release}
 Obsoletes:      wxPythonGTK2 <= 2.4.2.4-7
 Obsoletes:      wxPython <= 2.4.2.4-7
 
@@ -66,6 +64,9 @@
 %{python_sitearch}/wx/
 
 %changelog
+* Wed Apr 19 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.2.4-10
+- get rid of unnecessary provides
+
 * Fri Jan  6 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.2.4-9
 - spec cleanups
 



From fedora-extras-commits at redhat.com  Wed Apr 19 20:49:21 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 19 Apr 2006 13:49:21 -0700
Subject: rpms/multitail/FC-4 .cvsignore, 1.4, 1.5 multitail.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200604192049.k3JKnNRw032488@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/multitail/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32451/FC-4

Modified Files:
	.cvsignore multitail.spec sources 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/multitail/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	30 Mar 2006 18:28:12 -0000	1.4
+++ .cvsignore	19 Apr 2006 20:49:21 -0000	1.5
@@ -1 +1 @@
-multitail-3.8.10.tgz
+multitail-4.0.3.tgz


Index: multitail.spec
===================================================================
RCS file: /cvs/extras/rpms/multitail/FC-4/multitail.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- multitail.spec	30 Mar 2006 18:28:12 -0000	1.3
+++ multitail.spec	19 Apr 2006 20:49:21 -0000	1.4
@@ -1,5 +1,5 @@
 Name: multitail
-Version: 3.8.10
+Version: 4.0.3
 Release: 1%{?dist}
 Summary: View one or multiple files like tail but with multiple windows
 
@@ -41,6 +41,8 @@
 			%{buildroot}%{_sysconfdir}
 %{__make} install DESTDIR="%{buildroot}"
 
+mv %{buildroot}%{_sysconfdir}/multitail.conf.new %{buildroot}%{_sysconfdir}/multitail.conf
+
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -48,12 +50,18 @@
 %files
 %defattr(-, root, root, 0755)
 %doc *.conf *.html Changes license.txt readme.txt
-%{_mandir}/man1/multitail.1*
 %config(noreplace) %{_sysconfdir}/multitail.conf
 %{_bindir}/multitail
+%{_mandir}/man1/multitail.1*
 
 
 %changelog
+* Wed Apr 19 2006 Folkert van Heuesden <folkert at vanheusden.com> - 4.0.3-1
+- Updated to release 4.0.3.
+
+* Wed Apr 12 2006 Folkert van Heuesden <folkert at vanheusden.com> - 4.0.0-1
+- Updated to release 4.0.0.
+
 * Thu Mar 30 2006 Folkert van Heuesden <folkert at vanheusden.com> - 3.8.10-1
 - Updated to release 3.8.10.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/multitail/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	30 Mar 2006 18:28:12 -0000	1.4
+++ sources	19 Apr 2006 20:49:21 -0000	1.5
@@ -1 +1 @@
-1b4cb6288298fe61c4c5147b50bfd48d  multitail-3.8.10.tgz
+b6017e19aa7cf7e2b4fddd75a596a1a7  multitail-4.0.3.tgz



From fedora-extras-commits at redhat.com  Wed Apr 19 20:49:21 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 19 Apr 2006 13:49:21 -0700
Subject: rpms/multitail/FC-5 .cvsignore, 1.4, 1.5 multitail.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200604192049.k3JKnNRU032494@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/multitail/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32451/FC-5

Modified Files:
	.cvsignore multitail.spec sources 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/multitail/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	30 Mar 2006 18:28:13 -0000	1.4
+++ .cvsignore	19 Apr 2006 20:49:21 -0000	1.5
@@ -1 +1 @@
-multitail-3.8.10.tgz
+multitail-4.0.3.tgz


Index: multitail.spec
===================================================================
RCS file: /cvs/extras/rpms/multitail/FC-5/multitail.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- multitail.spec	30 Mar 2006 18:28:13 -0000	1.3
+++ multitail.spec	19 Apr 2006 20:49:21 -0000	1.4
@@ -1,5 +1,5 @@
 Name: multitail
-Version: 3.8.10
+Version: 4.0.3
 Release: 1%{?dist}
 Summary: View one or multiple files like tail but with multiple windows
 
@@ -41,6 +41,8 @@
 			%{buildroot}%{_sysconfdir}
 %{__make} install DESTDIR="%{buildroot}"
 
+mv %{buildroot}%{_sysconfdir}/multitail.conf.new %{buildroot}%{_sysconfdir}/multitail.conf
+
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -48,12 +50,18 @@
 %files
 %defattr(-, root, root, 0755)
 %doc *.conf *.html Changes license.txt readme.txt
-%{_mandir}/man1/multitail.1*
 %config(noreplace) %{_sysconfdir}/multitail.conf
 %{_bindir}/multitail
+%{_mandir}/man1/multitail.1*
 
 
 %changelog
+* Wed Apr 19 2006 Folkert van Heuesden <folkert at vanheusden.com> - 4.0.3-1
+- Updated to release 4.0.3.
+
+* Wed Apr 12 2006 Folkert van Heuesden <folkert at vanheusden.com> - 4.0.0-1
+- Updated to release 4.0.0.
+
 * Thu Mar 30 2006 Folkert van Heuesden <folkert at vanheusden.com> - 3.8.10-1
 - Updated to release 3.8.10.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/multitail/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	30 Mar 2006 18:28:13 -0000	1.4
+++ sources	19 Apr 2006 20:49:21 -0000	1.5
@@ -1 +1 @@
-1b4cb6288298fe61c4c5147b50bfd48d  multitail-3.8.10.tgz
+b6017e19aa7cf7e2b4fddd75a596a1a7  multitail-4.0.3.tgz



From fedora-extras-commits at redhat.com  Wed Apr 19 21:00:41 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 19 Apr 2006 14:00:41 -0700
Subject: rpms/perl-Error/devel .cvsignore, 1.2, 1.3 perl-Error.spec, 1.6,
	1.7 sources, 1.2, 1.3
Message-ID: <200604192100.k3JL0hk0032690@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Error/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32669

Modified Files:
	.cvsignore perl-Error.spec sources 
Log Message:
Update to 0.15008.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Dec 2004 16:29:48 -0000	1.2
+++ .cvsignore	19 Apr 2006 21:00:40 -0000	1.3
@@ -1 +1 @@
-Error-0.15.tar.gz
+Error-0.15008.tar.gz


Index: perl-Error.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/devel/perl-Error.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Error.spec	17 Feb 2006 19:03:52 -0000	1.6
+++ perl-Error.spec	19 Apr 2006 21:00:40 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Error
-Version:        0.15
-Release:        4%{?dist}
+Version:        0.15008
+Release:        1%{?dist}
 Summary:        Error Perl module
 
 License:        GPL or Artistic
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Wed Apr 19 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.15008-1
+- Update to 0.15008.
+
 * Fri Feb 17 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.15-4
 - Rebuild for FC5 (perl 5.8.8).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Dec 2004 16:29:48 -0000	1.2
+++ sources	19 Apr 2006 21:00:40 -0000	1.3
@@ -1 +1 @@
-81b4847fb893f18a4e85186bca5f4380  Error-0.15.tar.gz
+e66c11a0b7a501391643321f86f2171e  Error-0.15008.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 19 21:06:02 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 19 Apr 2006 14:06:02 -0700
Subject: rpms/compat-wxPythonGTK2/FC-5 compat-wxPython.spec,1.2,1.3
Message-ID: <200604192106.k3JL64Bs002376@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/compat-wxPythonGTK2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2345/FC-5

Modified Files:
	compat-wxPython.spec 
Log Message:

Fix missing BR



Index: compat-wxPython.spec
===================================================================
RCS file: /cvs/extras/rpms/compat-wxPythonGTK2/FC-5/compat-wxPython.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- compat-wxPython.spec	19 Apr 2006 20:45:37 -0000	1.2
+++ compat-wxPython.spec	19 Apr 2006 21:06:02 -0000	1.3
@@ -4,7 +4,7 @@
 
 Name:           compat-wxPythonGTK2
 Version:        2.4.2.4
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Compatibility version of the wxWidgets GUI toolkit for Python
 Group:          Development/Languages
 License:        LGPL
@@ -14,7 +14,7 @@
 
 BuildRequires:  compat-wxGTK2-devel >= 2.4.2, compat-wxGTK2-gl, pkgconfig
 BuildRequires:  zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel
-BuildRequires:  python-devel
+BuildRequires:  python-devel, mesa-libGLU-devel
 
 Obsoletes:      wxPythonGTK2 <= 2.4.2.4-7
 Obsoletes:      wxPython <= 2.4.2.4-7
@@ -64,6 +64,9 @@
 %{python_sitearch}/wx/
 
 %changelog
+* Wed Apr 19 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.2.4-11
+- add missing BuildRequires: mesa-libGLU-devel
+
 * Wed Apr 19 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.2.4-10
 - get rid of unnecessary provides
 



From fedora-extras-commits at redhat.com  Wed Apr 19 21:06:02 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 19 Apr 2006 14:06:02 -0700
Subject: rpms/compat-wxPythonGTK2/devel compat-wxPython.spec,1.2,1.3
Message-ID: <200604192106.k3JL64Yq002380@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/compat-wxPythonGTK2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2345/devel

Modified Files:
	compat-wxPython.spec 
Log Message:

Fix missing BR



Index: compat-wxPython.spec
===================================================================
RCS file: /cvs/extras/rpms/compat-wxPythonGTK2/devel/compat-wxPython.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- compat-wxPython.spec	19 Apr 2006 20:45:42 -0000	1.2
+++ compat-wxPython.spec	19 Apr 2006 21:06:02 -0000	1.3
@@ -4,7 +4,7 @@
 
 Name:           compat-wxPythonGTK2
 Version:        2.4.2.4
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Compatibility version of the wxWidgets GUI toolkit for Python
 Group:          Development/Languages
 License:        LGPL
@@ -14,7 +14,7 @@
 
 BuildRequires:  compat-wxGTK2-devel >= 2.4.2, compat-wxGTK2-gl, pkgconfig
 BuildRequires:  zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel
-BuildRequires:  python-devel
+BuildRequires:  python-devel, mesa-libGLU-devel
 
 Obsoletes:      wxPythonGTK2 <= 2.4.2.4-7
 Obsoletes:      wxPython <= 2.4.2.4-7
@@ -64,6 +64,9 @@
 %{python_sitearch}/wx/
 
 %changelog
+* Wed Apr 19 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.2.4-11
+- add missing BuildRequires: mesa-libGLU-devel
+
 * Wed Apr 19 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.2.4-10
 - get rid of unnecessary provides
 



From fedora-extras-commits at redhat.com  Wed Apr 19 21:15:12 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 19 Apr 2006 14:15:12 -0700
Subject: rpms/lincity-ng/devel .cvsignore, 1.3, 1.4 lincity-ng.spec, 1.6,
	1.7 sources, 1.3, 1.4
Message-ID: <200604192115.k3JLFEb5002556@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/lincity-ng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2483/devel

Modified Files:
	.cvsignore lincity-ng.spec sources 
Log Message:

Bump to 1.0.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Jan 2006 22:10:07 -0000	1.3
+++ .cvsignore	19 Apr 2006 21:15:12 -0000	1.4
@@ -1,2 +1,3 @@
 lincity-ng-1.0.1.tar.bz2
 lincity-ng-1.0.2.tar.bz2
+lincity-ng-1.0.3.tar.bz2


Index: lincity-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/devel/lincity-ng.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lincity-ng.spec	24 Mar 2006 22:09:57 -0000	1.6
+++ lincity-ng.spec	19 Apr 2006 21:15:12 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		lincity-ng
-Version:	1.0.2
-Release:	4%{?dist}
+Version:	1.0.3
+Release:	1%{?dist}
 License:	GPL
 Group:		Amusements/Games
 Summary:	City Simulation Game
@@ -13,7 +13,6 @@
 BuildRequires:	xorg-x11-proto-devel, libX11-devel, mesa-libGL-devel, mesa-libGLU-devel
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	kdelibs
-Patch0:		lincity-ng-1.0.2-gcc4.patch
 
 %description
 LinCity-NG is a City Simulation Game. It is a polished and improved version
@@ -31,7 +30,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 sed -i "s/CFLAGS += -O3 -g -Wall/CFLAGS += $RPM_OPT_FLAGS/" Jamrules
 sed -i "s/CXXFLAGS += -O3 -g -Wall/CXXFLAGS += $RPM_OPT_FLAGS/" Jamrules
 
@@ -65,6 +63,9 @@
 %{_datadir}/lincity-ng/
 
 %changelog
+* Wed Apr 19 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.3-1
+- bump to 1.0.3
+
 * Fri Mar 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.2-4
 - -O3 optimization makes the code cry
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Jan 2006 22:10:07 -0000	1.3
+++ sources	19 Apr 2006 21:15:12 -0000	1.4
@@ -1 +1 @@
-3cf29d581fca58f13faad12c126390ba  lincity-ng-1.0.2.tar.bz2
+2624857ed9437ac30445884d8593850e  lincity-ng-1.0.3.tar.bz2



From fedora-extras-commits at redhat.com  Wed Apr 19 21:15:05 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 19 Apr 2006 14:15:05 -0700
Subject: rpms/lincity-ng/FC-3 lincity-ng.spec,1.6,1.7 sources,1.3,1.4
Message-ID: <200604192115.k3JLFbgl002562@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/lincity-ng/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2483/FC-3

Modified Files:
	lincity-ng.spec sources 
Log Message:

Bump to 1.0.3



Index: lincity-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/FC-3/lincity-ng.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lincity-ng.spec	24 Mar 2006 22:09:23 -0000	1.6
+++ lincity-ng.spec	19 Apr 2006 21:15:05 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		lincity-ng
-Version:	1.0.2
-Release:	4%{?dist}
+Version:	1.0.3
+Release:	1%{?dist}
 License:	GPL
 Group:		Amusements/Games
 Summary:	City Simulation Game
@@ -12,7 +12,6 @@
 BuildRequires:	SDL_ttf-devel, xorg-x11-devel, desktop-file-utils
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	kdelibs
-Patch0:		lincity-ng-1.0.2-gcc4.patch
 
 %description
 LinCity-NG is a City Simulation Game. It is a polished and improved version
@@ -30,7 +29,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 sed -i "s/CFLAGS += -O3 -g -Wall/CFLAGS += $RPM_OPT_FLAGS/" Jamrules
 sed -i "s/CXXFLAGS += -O3 -g -Wall/CXXFLAGS += $RPM_OPT_FLAGS/" Jamrules
 
@@ -64,6 +62,9 @@
 %{_datadir}/lincity-ng/
 
 %changelog
+* Wed Apr 19 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.3-1
+- bump to 1.0.3
+
 * Fri Mar 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.2-4
 - -O3 optimization makes the code cry
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Jan 2006 22:09:28 -0000	1.3
+++ sources	19 Apr 2006 21:15:05 -0000	1.4
@@ -1 +1 @@
-3cf29d581fca58f13faad12c126390ba  lincity-ng-1.0.2.tar.bz2
+2624857ed9437ac30445884d8593850e  lincity-ng-1.0.3.tar.bz2



From fedora-extras-commits at redhat.com  Wed Apr 19 21:15:06 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 19 Apr 2006 14:15:06 -0700
Subject: rpms/lincity-ng/FC-4 lincity-ng.spec,1.6,1.7 sources,1.3,1.4
Message-ID: <200604192115.k3JLFcGO002566@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/lincity-ng/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2483/FC-4

Modified Files:
	lincity-ng.spec sources 
Log Message:

Bump to 1.0.3



Index: lincity-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/FC-4/lincity-ng.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lincity-ng.spec	24 Mar 2006 22:09:44 -0000	1.6
+++ lincity-ng.spec	19 Apr 2006 21:15:06 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		lincity-ng
-Version:	1.0.2
-Release:	4%{?dist}
+Version:	1.0.3
+Release:	1%{?dist}
 License:	GPL
 Group:		Amusements/Games
 Summary:	City Simulation Game
@@ -12,7 +12,6 @@
 BuildRequires:	SDL_ttf-devel, xorg-x11-devel, desktop-file-utils
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	kdelibs
-Patch0:		lincity-ng-1.0.2-gcc4.patch
 
 %description
 LinCity-NG is a City Simulation Game. It is a polished and improved version
@@ -30,7 +29,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 sed -i "s/CFLAGS += -O3 -g -Wall/CFLAGS += $RPM_OPT_FLAGS/" Jamrules
 sed -i "s/CXXFLAGS += -O3 -g -Wall/CXXFLAGS += $RPM_OPT_FLAGS/" Jamrules
 
@@ -64,6 +62,9 @@
 %{_datadir}/lincity-ng/
 
 %changelog
+* Wed Apr 19 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.3-1
+- bump to 1.0.3
+
 * Fri Mar 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.2-4
 - -O3 optimization makes the code cry
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Jan 2006 22:09:49 -0000	1.3
+++ sources	19 Apr 2006 21:15:06 -0000	1.4
@@ -1 +1 @@
-3cf29d581fca58f13faad12c126390ba  lincity-ng-1.0.2.tar.bz2
+2624857ed9437ac30445884d8593850e  lincity-ng-1.0.3.tar.bz2



From fedora-extras-commits at redhat.com  Wed Apr 19 21:15:07 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 19 Apr 2006 14:15:07 -0700
Subject: rpms/lincity-ng/FC-5 lincity-ng.spec,1.6,1.7 sources,1.3,1.4
Message-ID: <200604192115.k3JLFd9m002570@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/lincity-ng/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2483/FC-5

Modified Files:
	lincity-ng.spec sources 
Log Message:

Bump to 1.0.3



Index: lincity-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/FC-5/lincity-ng.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lincity-ng.spec	24 Mar 2006 22:09:51 -0000	1.6
+++ lincity-ng.spec	19 Apr 2006 21:15:06 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		lincity-ng
-Version:	1.0.2
-Release:	4%{?dist}
+Version:	1.0.3
+Release:	1%{?dist}
 License:	GPL
 Group:		Amusements/Games
 Summary:	City Simulation Game
@@ -13,7 +13,6 @@
 BuildRequires:	xorg-x11-proto-devel, libX11-devel, mesa-libGL-devel, mesa-libGLU-devel
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	kdelibs
-Patch0:		lincity-ng-1.0.2-gcc4.patch
 
 %description
 LinCity-NG is a City Simulation Game. It is a polished and improved version
@@ -31,7 +30,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 sed -i "s/CFLAGS += -O3 -g -Wall/CFLAGS += $RPM_OPT_FLAGS/" Jamrules
 sed -i "s/CXXFLAGS += -O3 -g -Wall/CXXFLAGS += $RPM_OPT_FLAGS/" Jamrules
 
@@ -65,6 +63,9 @@
 %{_datadir}/lincity-ng/
 
 %changelog
+* Wed Apr 19 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.3-1
+- bump to 1.0.3
+
 * Fri Mar 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.2-4
 - -O3 optimization makes the code cry
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Jan 2006 22:10:07 -0000	1.3
+++ sources	19 Apr 2006 21:15:06 -0000	1.4
@@ -1 +1 @@
-3cf29d581fca58f13faad12c126390ba  lincity-ng-1.0.2.tar.bz2
+2624857ed9437ac30445884d8593850e  lincity-ng-1.0.3.tar.bz2



From fedora-extras-commits at redhat.com  Wed Apr 19 21:21:07 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Wed, 19 Apr 2006 14:21:07 -0700
Subject: rpms/octave-forge/devel .cvsignore, 1.7, 1.8 octave-forge.spec, 1.21,
	1.22 sources, 1.7, 1.8
Message-ID: <200604192121.k3JLL99s002781@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/octave-forge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2760

Modified Files:
	.cvsignore octave-forge.spec sources 
Log Message:
New patches so it works with octave 2.9.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	22 Mar 2006 15:29:05 -0000	1.7
+++ .cvsignore	19 Apr 2006 21:21:07 -0000	1.8
@@ -1 +1,2 @@
 octave-forge-2006.03.17.patched.tar.gz
+octave-forge-system.patch.gz


Index: octave-forge.spec
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- octave-forge.spec	22 Mar 2006 15:29:05 -0000	1.21
+++ octave-forge.spec	19 Apr 2006 21:21:07 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           octave-forge
 Version:        2006.03.17
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -15,9 +15,10 @@
 ## tar czf octave-forge-%{version}.patched.tar.gz octave-forge-%{version}
 ## rm -Rf octave-forge-%{version}
 Source0:        %{name}-%{version}.patched.tar.gz
+Patch0:         %{name}-system.patch.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	octave >= 2.9.4 ImageMagick
+Requires:	octave >= 2.9.5 ImageMagick
 BuildRequires:  octave-devel tetex gcc-gfortran ginac-devel qhull-devel
 BuildRequires:  ImageMagick-c++-devel netcdf-devel pcre-devel gsl-devel
 BuildRequires:  libjpeg-devel libpng-devel ncurses-devel libtermcap-devel
@@ -32,6 +33,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 # The sparse matrix functions are in octave 2.9.x so don't install them
 touch main/sparse/NOINSTALL
 
@@ -67,6 +69,10 @@
 
 
 %changelog
+* Wed Apr 19 2006 Quentin Spencer <qspencer at users.sf.net> 2006.03.17-2
+- New release for octave 2.9.5.
+- Patch added for incompatibilities between octave 2.9.4 and 2.9.5.
+
 * Fri Mar 17 2006 Quentin Spencer <qspencer at users.sf.net> 2006.03.17-1
 - New release. Remove old patches.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	22 Mar 2006 15:29:05 -0000	1.7
+++ sources	19 Apr 2006 21:21:07 -0000	1.8
@@ -1 +1,2 @@
 a1e76ab52fb9894586d6a7a0dc15e603  octave-forge-2006.03.17.patched.tar.gz
+c50919d0790c7873a82c2da09d419142  octave-forge-system.patch.gz



From fedora-extras-commits at redhat.com  Wed Apr 19 21:29:13 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 19 Apr 2006 14:29:13 -0700
Subject: owners owners.list,1.861,1.862
Message-ID: <200604192129.k3JLTFhW002976@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2958

Modified Files:
	owners.list 
Log Message:
add archmage


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.861
retrieving revision 1.862
diff -u -r1.861 -r1.862
--- owners.list	19 Apr 2006 15:54:36 -0000	1.861
+++ owners.list	19 Apr 2006 21:29:13 -0000	1.862
@@ -47,6 +47,7 @@
 Fedora Extras|apt|Debian's Advanced Packaging Tool with RPM support|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|pmatilai at laiskiainen.org
 Fedora Extras|aqhbci-qt-tools|Setup wizard and debugger for the HBCI backend for the Aqbanking library|notting at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|arc|Arc archiver|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|archmod|Extensible reader/decompiler of files in CHM format|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|argus|Network transaction audit tool|somlo at cmu.edu|extras-qa at fedoraproject.org|
 Fedora Extras|artwiz-aleczapka-fonts|Set of (improved) artwiz fonts|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|asa|Convert Fortran carriage control characters|pertusus at free.fr|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Apr 19 21:37:30 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Wed, 19 Apr 2006 14:37:30 -0700
Subject: rpms/python-sqlite2/devel .cvsignore, 1.5, 1.6 python-sqlite2.spec, 
	1.8, 1.9 sources, 1.5, 1.6
Message-ID: <200604192137.k3JLbWBV003045@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/python-sqlite2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3024

Modified Files:
	.cvsignore python-sqlite2.spec sources 
Log Message:
Update to 2.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Apr 2006 10:37:40 -0000	1.5
+++ .cvsignore	19 Apr 2006 21:37:30 -0000	1.6
@@ -1 +1 @@
-pysqlite-2.2.0.tar.gz
+pysqlite-2.2.1.tar.gz


Index: python-sqlite2.spec
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/devel/python-sqlite2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-sqlite2.spec	14 Apr 2006 10:37:40 -0000	1.8
+++ python-sqlite2.spec	19 Apr 2006 21:37:30 -0000	1.9
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-sqlite2
-Version:        2.2.0
+Version:        2.2.1
 Release:        1%{?dist}
 Epoch:          1
 Summary:        DB-API 2.0 interface for SQLite 3.x
@@ -26,6 +26,9 @@
 
 %prep
 %setup -q -n pysqlite-%{version}
+sed -i -e '
+/\/usr\/local\/include/d
+/\/usr\/local\/lib/d' setup.cfg
 
 
 %build
@@ -45,7 +48,7 @@
 
 
 %check
-# workaround for some strange bug (thanks to Ville Skytt??!)
+# workaround for a strange bug (thanks to Ville Skytt??!)
 cd documentation
 PYTHONPATH="%{buildroot}%{python_sitearch}" %{__python} -c \
 	"from pysqlite2.test import test; test()"
@@ -94,6 +97,9 @@
 
 
 %changelog
+* Wed Apr 19 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 1:2.2.1-1
+- Update to 2.2.1
+
 * Fri Apr 14 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 1:2.2.0-1
 - Update to 2.2.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Apr 2006 10:37:40 -0000	1.5
+++ sources	19 Apr 2006 21:37:30 -0000	1.6
@@ -1 +1 @@
-8f68b79b2fe891e72da193cbc3a3d5e9  pysqlite-2.2.0.tar.gz
+3d9fe353420fdea44e368afd982c9786  pysqlite-2.2.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 19 21:53:22 2006
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Wed, 19 Apr 2006 14:53:22 -0700
Subject: fedora-release indexhtml-head,1.5,1.6
Message-ID: <200604192153.k3JLrMDW003162@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/fedora-release
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3131

Modified Files:
	indexhtml-head 
Log Message:
Resolving bz#182342, committing the new Fedora (TM) logo header in place of the ol' White-n-Blue F.


Index: indexhtml-head
===================================================================
RCS file: /cvs/fedora/fedora-release/indexhtml-head,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- indexhtml-head	28 Feb 2006 07:21:50 -0000	1.5
+++ indexhtml-head	19 Apr 2006 21:53:19 -0000	1.6
@@ -17,7 +17,7 @@
 		<!-- header BEGIN -->
 		<div id="fedora-header">
 			<div id="fedora-header-logo">
-				<a href="http://fedora.redhat.com/" id="link-internal"><img src="img/header-fedora_logo01.png" alt="Fedora Project"></a>
+				<a href="http://fedora.redhat.com/" id="link-internal"><img src="img/header-fedora_logo.png" alt="Fedora Project"></a>
 			</div>
 
 			<div id="fedora-header-items">



From fedora-extras-commits at redhat.com  Wed Apr 19 21:53:23 2006
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Wed, 19 Apr 2006 14:53:23 -0700
Subject: fedora-release/img header-fedora_logo.png, 1.1.1.1,
	1.2 header-fedora_logo01.png, 1.1, NONE
Message-ID: <200604192153.k3JLrNOu003167@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/fedora-release/img
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3131/img

Modified Files:
	header-fedora_logo.png 
Removed Files:
	header-fedora_logo01.png 
Log Message:
Resolving bz#182342, committing the new Fedora (TM) logo header in place of the ol' White-n-Blue F.



From fedora-extras-commits at redhat.com  Wed Apr 19 22:01:48 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 19 Apr 2006 15:01:48 -0700
Subject: owners owners.list,1.862,1.863
Message-ID: <200604192202.k3JM2Nao005286@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5265

Modified Files:
	owners.list 
Log Message:
correct name is archmage and not archmod



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.862
retrieving revision 1.863
diff -u -r1.862 -r1.863
--- owners.list	19 Apr 2006 21:29:13 -0000	1.862
+++ owners.list	19 Apr 2006 22:01:48 -0000	1.863
@@ -47,7 +47,7 @@
 Fedora Extras|apt|Debian's Advanced Packaging Tool with RPM support|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|pmatilai at laiskiainen.org
 Fedora Extras|aqhbci-qt-tools|Setup wizard and debugger for the HBCI backend for the Aqbanking library|notting at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|arc|Arc archiver|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|archmod|Extensible reader/decompiler of files in CHM format|pertusus at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|archmage|Extensible reader/decompiler of files in CHM format|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|argus|Network transaction audit tool|somlo at cmu.edu|extras-qa at fedoraproject.org|
 Fedora Extras|artwiz-aleczapka-fonts|Set of (improved) artwiz fonts|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|asa|Convert Fortran carriage control characters|pertusus at free.fr|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Apr 19 22:04:29 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Wed, 19 Apr 2006 15:04:29 -0700
Subject: rpms/python-sqlite2/FC-5 .cvsignore, 1.5, 1.6 python-sqlite2.spec,
	1.8, 1.9 sources, 1.5, 1.6
Message-ID: <200604192204.k3JM4Vq7005361@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/python-sqlite2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5340

Modified Files:
	.cvsignore python-sqlite2.spec sources 
Log Message:
Update to 2.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Apr 2006 11:23:20 -0000	1.5
+++ .cvsignore	19 Apr 2006 22:04:29 -0000	1.6
@@ -1 +1 @@
-pysqlite-2.2.0.tar.gz
+pysqlite-2.2.1.tar.gz


Index: python-sqlite2.spec
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/FC-5/python-sqlite2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-sqlite2.spec	14 Apr 2006 11:23:20 -0000	1.8
+++ python-sqlite2.spec	19 Apr 2006 22:04:29 -0000	1.9
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-sqlite2
-Version:        2.2.0
+Version:        2.2.1
 Release:        1%{?dist}
 Epoch:          1
 Summary:        DB-API 2.0 interface for SQLite 3.x
@@ -26,6 +26,9 @@
 
 %prep
 %setup -q -n pysqlite-%{version}
+sed -i -e '
+/\/usr\/local\/include/d
+/\/usr\/local\/lib/d' setup.cfg
 
 
 %build
@@ -94,6 +97,9 @@
 
 
 %changelog
+* Wed Apr 19 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 1:2.2.1-1
+- Update to 2.2.1
+
 * Fri Apr 14 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 1:2.2.0-1
 - Update to 2.2.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Apr 2006 11:23:20 -0000	1.5
+++ sources	19 Apr 2006 22:04:29 -0000	1.6
@@ -1 +1 @@
-8f68b79b2fe891e72da193cbc3a3d5e9  pysqlite-2.2.0.tar.gz
+3d9fe353420fdea44e368afd982c9786  pysqlite-2.2.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 19 22:07:30 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Wed, 19 Apr 2006 15:07:30 -0700
Subject: fedora-release fedora-extras-development.repo,1.4,1.5
Message-ID: <200604192207.k3JM7UEe005410@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/fedora/fedora-release
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5392

Modified Files:
	fedora-extras-development.repo 
Log Message:
Add development boilerplate to extras-development repo file.



Index: fedora-extras-development.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-extras-development.repo,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedora-extras-development.repo	29 Mar 2006 23:31:22 -0000	1.4
+++ fedora-extras-development.repo	19 Apr 2006 22:07:27 -0000	1.5
@@ -1,3 +1,14 @@
+# These packages are untested and still under development. This
+# repository is used for updates to test releases, and for
+# development of new releases.
+#
+# This repository can see significant daily turnover and major
+# functionality changes which cause unexpected problems with other
+# development packages. Please use these packages if you want to work
+# with the Fedora developers by testing these new development packages.
+#
+# More information is available at http://fedoraproject.org/wiki/Testing
+
 [extras-development]
 name=Fedora Extras - Development Tree
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/development/$basearch/



From fedora-extras-commits at redhat.com  Wed Apr 19 22:20:06 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 19 Apr 2006 15:20:06 -0700
Subject: rpms/wine/FC-4 .cvsignore, 1.12, 1.13 sources, 1.13, 1.14 wine.spec,
	1.20, 1.21
Message-ID: <200604192220.k3JMK8oL005557@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5487/FC-4

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- fix rpath issues (#188905)
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	3 Apr 2006 11:07:59 -0000	1.12
+++ .cvsignore	19 Apr 2006 22:20:06 -0000	1.13
@@ -1 +1 @@
-wine-0.9.11-fe.tar.bz2
+wine-0.9.12-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	3 Apr 2006 11:07:59 -0000	1.13
+++ sources	19 Apr 2006 22:20:06 -0000	1.14
@@ -1 +1 @@
-7e67d02051dfb3671990f40734aca89a  wine-0.9.11-fe.tar.bz2
+1751147723999f1efd73d1aaba910360  wine-0.9.12-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/wine.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- wine.spec	5 Apr 2006 20:33:02 -0000	1.20
+++ wine.spec	19 Apr 2006 22:20:06 -0000	1.21
@@ -1,13 +1,13 @@
 Name:		wine
-Version:	0.9.11
-Release:	2%{?dist}
+Version:	0.9.12
+Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
 License:	LGPL
 URL:		http://www.winehq.org/
 # special fedora tarball without winemp3 stuff
-Source0:        wine-0.9.11-fe.tar.bz2
+Source0:        wine-0.9.12-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -19,6 +19,7 @@
 Source105:      wine-winemine.desktop
 Source106:      wine-winhelp.desktop
 Patch0:         wine-prefixfonts.patch
+Patch1:         wine-rpath.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExclusiveArch:  %{ix86}
@@ -145,6 +146,7 @@
 %prep
 %setup -q -n %{name}-%{version}-fe
 %patch0
+%patch1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -540,6 +542,8 @@
 %{_libdir}/wine/glut32.dll.so
 %{_libdir}/wine/opengl32.dll.so
 %{_libdir}/wine/wined3d.dll.so
+%{_libdir}/wine/dnsapi.dll.so
+%{_libdir}/wine/iexplore.exe.so
 %{_sysconfdir}/ld.so.conf.d/wine-32.conf
 
 %files tools
@@ -634,6 +638,11 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sat Apr 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.12-1
+- fix rpath issues (#187429,#188905)
+- version upgrade 
+ 
 * Wed Apr 05 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.11-2
 - bump for liblcms



From fedora-extras-commits at redhat.com  Wed Apr 19 22:20:07 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 19 Apr 2006 15:20:07 -0700
Subject: rpms/wine/FC-5 .cvsignore, 1.13, 1.14 sources, 1.14, 1.15 wine.spec,
	1.24, 1.25
Message-ID: <200604192220.k3JMK9mH005563@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5487/FC-5

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- fix rpath issues (#188905)
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-5/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	3 Apr 2006 11:08:00 -0000	1.13
+++ .cvsignore	19 Apr 2006 22:20:06 -0000	1.14
@@ -1 +1 @@
-wine-0.9.11-fe.tar.bz2
+wine-0.9.12-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-5/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	3 Apr 2006 11:08:00 -0000	1.14
+++ sources	19 Apr 2006 22:20:06 -0000	1.15
@@ -1 +1 @@
-7e67d02051dfb3671990f40734aca89a  wine-0.9.11-fe.tar.bz2
+1751147723999f1efd73d1aaba910360  wine-0.9.12-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-5/wine.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- wine.spec	3 Apr 2006 11:08:00 -0000	1.24
+++ wine.spec	19 Apr 2006 22:20:06 -0000	1.25
@@ -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.11
+Version:	0.9.12
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -10,7 +10,8 @@
 URL:		http://www.winehq.org/
 # special fedora tarball without winemp3 stuff
 Patch0:         wine-prefixfonts.patch
-Source0:        wine-0.9.11-fe.tar.bz2
+Patch1:         wine-rpath.patch
+Source0:        wine-0.9.12-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -24,7 +25,7 @@
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-ExclusiveArch: %{ix86}
+ExclusiveArch:  %{ix86}
 
 BuildRequires:	bison
 BuildRequires:	flex
@@ -157,6 +158,7 @@
 %prep
 %setup -q -n %{name}-%{version}-fe
 %patch0
+%patch1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -553,6 +555,8 @@
 %{_libdir}/wine/glut32.dll.so
 %{_libdir}/wine/opengl32.dll.so
 %{_libdir}/wine/wined3d.dll.so
+%{_libdir}/wine/dnsapi.dll.so
+%{_libdir}/wine/iexplore.exe.so
 %{_sysconfdir}/ld.so.conf.d/wine-32.conf
 
 %files tools
@@ -647,6 +651,11 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sat Apr 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.12-1
+- fix rpath issues (#187429,#188905)
+- version upgrade 
+
 * Mon Apr 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.11-1
 - version upgrade



From fedora-extras-commits at redhat.com  Wed Apr 19 22:20:07 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 19 Apr 2006 15:20:07 -0700
Subject: rpms/wine/devel .cvsignore, 1.13, 1.14 sources, 1.14, 1.15 wine.spec,
	1.24, 1.25
Message-ID: <200604192220.k3JMK9JH005569@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5487/devel

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- fix rpath issues (#188905)
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	3 Apr 2006 11:08:01 -0000	1.13
+++ .cvsignore	19 Apr 2006 22:20:07 -0000	1.14
@@ -1 +1 @@
-wine-0.9.11-fe.tar.bz2
+wine-0.9.12-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	3 Apr 2006 11:08:01 -0000	1.14
+++ sources	19 Apr 2006 22:20:07 -0000	1.15
@@ -1 +1 @@
-7e67d02051dfb3671990f40734aca89a  wine-0.9.11-fe.tar.bz2
+1751147723999f1efd73d1aaba910360  wine-0.9.12-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- wine.spec	3 Apr 2006 11:08:01 -0000	1.24
+++ wine.spec	19 Apr 2006 22:20:07 -0000	1.25
@@ -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.11
+Version:	0.9.12
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -10,7 +10,8 @@
 URL:		http://www.winehq.org/
 # special fedora tarball without winemp3 stuff
 Patch0:         wine-prefixfonts.patch
-Source0:        wine-0.9.11-fe.tar.bz2
+Patch1:         wine-rpath.patch
+Source0:        wine-0.9.12-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -24,7 +25,7 @@
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-ExclusiveArch: %{ix86}
+ExclusiveArch:  %{ix86}
 
 BuildRequires:	bison
 BuildRequires:	flex
@@ -157,6 +158,7 @@
 %prep
 %setup -q -n %{name}-%{version}-fe
 %patch0
+%patch1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -553,6 +555,8 @@
 %{_libdir}/wine/glut32.dll.so
 %{_libdir}/wine/opengl32.dll.so
 %{_libdir}/wine/wined3d.dll.so
+%{_libdir}/wine/dnsapi.dll.so
+%{_libdir}/wine/iexplore.exe.so
 %{_sysconfdir}/ld.so.conf.d/wine-32.conf
 
 %files tools
@@ -647,6 +651,11 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sat Apr 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.12-1
+- fix rpath issues (#187429,#188905)
+- version upgrade 
+
 * Mon Apr 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.11-1
 - version upgrade



From fedora-extras-commits at redhat.com  Wed Apr 19 22:20:05 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 19 Apr 2006 15:20:05 -0700
Subject: rpms/wine/FC-3 .cvsignore, 1.11, 1.12 sources, 1.12, 1.13 wine.spec,
	1.18, 1.19
Message-ID: <200604192220.k3JMKb7Z005574@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5487/FC-3

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- fix rpath issues (#188905)
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	3 Apr 2006 11:07:59 -0000	1.11
+++ .cvsignore	19 Apr 2006 22:20:05 -0000	1.12
@@ -1 +1 @@
-wine-0.9.11-fe.tar.bz2
+wine-0.9.12-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	3 Apr 2006 11:07:59 -0000	1.12
+++ sources	19 Apr 2006 22:20:05 -0000	1.13
@@ -1 +1 @@
-7e67d02051dfb3671990f40734aca89a  wine-0.9.11-fe.tar.bz2
+1751147723999f1efd73d1aaba910360  wine-0.9.12-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/wine.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- wine.spec	5 Apr 2006 20:33:01 -0000	1.18
+++ wine.spec	19 Apr 2006 22:20:05 -0000	1.19
@@ -1,13 +1,13 @@
 Name:		wine
-Version:	0.9.11
-Release:	2%{?dist}
+Version:	0.9.12
+Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
 License:	LGPL
 URL:		http://www.winehq.org/
 # special fedora tarball without winemp3 stuff
-Source0:        wine-0.9.11-fe.tar.bz2
+Source0:        wine-0.9.12-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -19,6 +19,7 @@
 Source105:      wine-winemine.desktop
 Source106:      wine-winhelp.desktop
 Patch0:         wine-prefixfonts.patch
+Patch1:         wine-rpath.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExclusiveArch:  %{ix86}
@@ -145,6 +146,7 @@
 %prep
 %setup -q -n %{name}-%{version}-fe
 %patch0
+%patch1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -540,6 +542,8 @@
 %{_libdir}/wine/glut32.dll.so
 %{_libdir}/wine/opengl32.dll.so
 %{_libdir}/wine/wined3d.dll.so
+%{_libdir}/wine/dnsapi.dll.so
+%{_libdir}/wine/iexplore.exe.so
 %{_sysconfdir}/ld.so.conf.d/wine-32.conf
 
 %files tools
@@ -634,6 +638,11 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sat Apr 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.12-1
+- fix rpath issues (#187429,#188905)
+- version upgrade 
+ 
 * Wed Apr 05 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.11-2
 - bump for liblcms



From fedora-extras-commits at redhat.com  Wed Apr 19 22:21:54 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 19 Apr 2006 15:21:54 -0700
Subject: rpms/wine/FC-4 wine-rpath.patch,NONE,1.1
Message-ID: <200604192221.k3JMLu3g005660@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5600/FC-4

Added Files:
	wine-rpath.patch 
Log Message:
- add patch


wine-rpath.patch:

--- NEW FILE wine-rpath.patch ---
--- configure.orig	2006-04-15 00:02:02.000000000 +0200
+++ configure	2006-04-15 00:03:26.000000000 +0200
@@ -13375,7 +13375,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_wine_try_cflags_saved=$CFLAGS
-CFLAGS="$CFLAGS -fPIC -Wl,--rpath,\$ORIGIN/../lib"
+CFLAGS="$CFLAGS -fPIC"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -13427,9 +13427,9 @@
 echo "${ECHO_T}$ac_cv_ld_rpath" >&6
         if test "$ac_cv_ld_rpath" = "yes"
         then
-          LDEXERPATH="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
+          LDEXERPATH=""
 
-          LDDLLRPATH="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(dlldir) \$(libdir)\`"
+          LDDLLRPATH=""
 
         fi
 
--- configure.ac.orig	2006-04-15 00:15:32.000000000 +0200
+++ configure.ac	2006-04-15 00:04:51.000000000 +0200
@@ -1052,15 +1052,6 @@
           AC_SUBST(LDEXECFLAGS,["-Wl,--export-dynamic"])
         fi
 
-        AC_CACHE_CHECK([whether the linker accepts --rpath], ac_cv_ld_rpath,
-          [WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib],
-                           ac_cv_ld_rpath="yes",ac_cv_ld_rpath="no")])
-        if test "$ac_cv_ld_rpath" = "yes"
-        then
-          AC_SUBST(LDEXERPATH,["-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"])
-          AC_SUBST(LDDLLRPATH,["-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(dlldir) \$(libdir)\`"])
-        fi
-
         case $host_cpu in
           *i[[3456789]]86*)
             AC_CACHE_CHECK([whether we can relocate the executable to 0x7bf00000], ac_cv_ld_reloc_exec,



From fedora-extras-commits at redhat.com  Wed Apr 19 22:21:54 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 19 Apr 2006 15:21:54 -0700
Subject: rpms/wine/FC-5 wine-rpath.patch,NONE,1.1
Message-ID: <200604192221.k3JMLuiB005665@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5600/FC-5

Added Files:
	wine-rpath.patch 
Log Message:
- add patch


wine-rpath.patch:

--- NEW FILE wine-rpath.patch ---
--- configure.orig	2006-04-15 00:02:02.000000000 +0200
+++ configure	2006-04-15 00:03:26.000000000 +0200
@@ -13375,7 +13375,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_wine_try_cflags_saved=$CFLAGS
-CFLAGS="$CFLAGS -fPIC -Wl,--rpath,\$ORIGIN/../lib"
+CFLAGS="$CFLAGS -fPIC"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -13427,9 +13427,9 @@
 echo "${ECHO_T}$ac_cv_ld_rpath" >&6
         if test "$ac_cv_ld_rpath" = "yes"
         then
-          LDEXERPATH="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
+          LDEXERPATH=""
 
-          LDDLLRPATH="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(dlldir) \$(libdir)\`"
+          LDDLLRPATH=""
 
         fi
 
--- configure.ac.orig	2006-04-15 00:15:32.000000000 +0200
+++ configure.ac	2006-04-15 00:04:51.000000000 +0200
@@ -1052,15 +1052,6 @@
           AC_SUBST(LDEXECFLAGS,["-Wl,--export-dynamic"])
         fi
 
-        AC_CACHE_CHECK([whether the linker accepts --rpath], ac_cv_ld_rpath,
-          [WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib],
-                           ac_cv_ld_rpath="yes",ac_cv_ld_rpath="no")])
-        if test "$ac_cv_ld_rpath" = "yes"
-        then
-          AC_SUBST(LDEXERPATH,["-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"])
-          AC_SUBST(LDDLLRPATH,["-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(dlldir) \$(libdir)\`"])
-        fi
-
         case $host_cpu in
           *i[[3456789]]86*)
             AC_CACHE_CHECK([whether we can relocate the executable to 0x7bf00000], ac_cv_ld_reloc_exec,



From fedora-extras-commits at redhat.com  Wed Apr 19 22:21:55 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 19 Apr 2006 15:21:55 -0700
Subject: rpms/wine/devel wine-rpath.patch,NONE,1.1
Message-ID: <200604192221.k3JMLvjc005670@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5600/devel

Added Files:
	wine-rpath.patch 
Log Message:
- add patch


wine-rpath.patch:

--- NEW FILE wine-rpath.patch ---
--- configure.orig	2006-04-15 00:02:02.000000000 +0200
+++ configure	2006-04-15 00:03:26.000000000 +0200
@@ -13375,7 +13375,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_wine_try_cflags_saved=$CFLAGS
-CFLAGS="$CFLAGS -fPIC -Wl,--rpath,\$ORIGIN/../lib"
+CFLAGS="$CFLAGS -fPIC"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -13427,9 +13427,9 @@
 echo "${ECHO_T}$ac_cv_ld_rpath" >&6
         if test "$ac_cv_ld_rpath" = "yes"
         then
-          LDEXERPATH="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
+          LDEXERPATH=""
 
-          LDDLLRPATH="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(dlldir) \$(libdir)\`"
+          LDDLLRPATH=""
 
         fi
 
--- configure.ac.orig	2006-04-15 00:15:32.000000000 +0200
+++ configure.ac	2006-04-15 00:04:51.000000000 +0200
@@ -1052,15 +1052,6 @@
           AC_SUBST(LDEXECFLAGS,["-Wl,--export-dynamic"])
         fi
 
-        AC_CACHE_CHECK([whether the linker accepts --rpath], ac_cv_ld_rpath,
-          [WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib],
-                           ac_cv_ld_rpath="yes",ac_cv_ld_rpath="no")])
-        if test "$ac_cv_ld_rpath" = "yes"
-        then
-          AC_SUBST(LDEXERPATH,["-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"])
-          AC_SUBST(LDDLLRPATH,["-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(dlldir) \$(libdir)\`"])
-        fi
-
         case $host_cpu in
           *i[[3456789]]86*)
             AC_CACHE_CHECK([whether we can relocate the executable to 0x7bf00000], ac_cv_ld_reloc_exec,



From fedora-extras-commits at redhat.com  Wed Apr 19 22:21:53 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 19 Apr 2006 15:21:53 -0700
Subject: rpms/wine/FC-3 wine-rpath.patch,NONE,1.1
Message-ID: <200604192221.k3JMLtck005653@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5600/FC-3

Added Files:
	wine-rpath.patch 
Log Message:
- add patch


wine-rpath.patch:

--- NEW FILE wine-rpath.patch ---
--- configure.orig	2006-04-15 00:02:02.000000000 +0200
+++ configure	2006-04-15 00:03:26.000000000 +0200
@@ -13375,7 +13375,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_wine_try_cflags_saved=$CFLAGS
-CFLAGS="$CFLAGS -fPIC -Wl,--rpath,\$ORIGIN/../lib"
+CFLAGS="$CFLAGS -fPIC"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -13427,9 +13427,9 @@
 echo "${ECHO_T}$ac_cv_ld_rpath" >&6
         if test "$ac_cv_ld_rpath" = "yes"
         then
-          LDEXERPATH="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
+          LDEXERPATH=""
 
-          LDDLLRPATH="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(dlldir) \$(libdir)\`"
+          LDDLLRPATH=""
 
         fi
 
--- configure.ac.orig	2006-04-15 00:15:32.000000000 +0200
+++ configure.ac	2006-04-15 00:04:51.000000000 +0200
@@ -1052,15 +1052,6 @@
           AC_SUBST(LDEXECFLAGS,["-Wl,--export-dynamic"])
         fi
 
-        AC_CACHE_CHECK([whether the linker accepts --rpath], ac_cv_ld_rpath,
-          [WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib],
-                           ac_cv_ld_rpath="yes",ac_cv_ld_rpath="no")])
-        if test "$ac_cv_ld_rpath" = "yes"
-        then
-          AC_SUBST(LDEXERPATH,["-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"])
-          AC_SUBST(LDDLLRPATH,["-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(dlldir) \$(libdir)\`"])
-        fi
-
         case $host_cpu in
           *i[[3456789]]86*)
             AC_CACHE_CHECK([whether we can relocate the executable to 0x7bf00000], ac_cv_ld_reloc_exec,



From fedora-extras-commits at redhat.com  Wed Apr 19 22:39:04 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Wed, 19 Apr 2006 15:39:04 -0700
Subject: rpms/python-sqlite2/devel .cvsignore, 1.6, 1.7 python-sqlite2.spec, 
	1.9, 1.10 sources, 1.6, 1.7
Message-ID: <200604192239.k3JMd6QS005917@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/python-sqlite2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5874/devel

Modified Files:
	.cvsignore python-sqlite2.spec sources 
Log Message:
Mom, I feel like kernel developer - new 2.2.2 release after two hours ;)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	19 Apr 2006 21:37:30 -0000	1.6
+++ .cvsignore	19 Apr 2006 22:39:04 -0000	1.7
@@ -1 +1 @@
-pysqlite-2.2.1.tar.gz
+pysqlite-2.2.2.tar.gz


Index: python-sqlite2.spec
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/devel/python-sqlite2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- python-sqlite2.spec	19 Apr 2006 21:37:30 -0000	1.9
+++ python-sqlite2.spec	19 Apr 2006 22:39:04 -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-sqlite2
-Version:        2.2.1
+Version:        2.2.2
 Release:        1%{?dist}
 Epoch:          1
 Summary:        DB-API 2.0 interface for SQLite 3.x
@@ -97,6 +97,9 @@
 
 
 %changelog
+* Thu Apr 20 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 1:2.2.2-1
+- Update to 2.2.2
+
 * Wed Apr 19 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 1:2.2.1-1
 - Update to 2.2.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 Apr 2006 21:37:30 -0000	1.6
+++ sources	19 Apr 2006 22:39:04 -0000	1.7
@@ -1 +1 @@
-3d9fe353420fdea44e368afd982c9786  pysqlite-2.2.1.tar.gz
+3260547d3f11c85613b2de8ed529a4fc  pysqlite-2.2.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 19 22:39:03 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Wed, 19 Apr 2006 15:39:03 -0700
Subject: rpms/python-sqlite2/FC-5 .cvsignore, 1.6, 1.7 python-sqlite2.spec,
	1.9, 1.10 sources, 1.6, 1.7
Message-ID: <200604192239.k3JMd5FH005911@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/python-sqlite2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5874/FC-5

Modified Files:
	.cvsignore python-sqlite2.spec sources 
Log Message:
Mom, I feel like kernel developer - new 2.2.2 release after two hours ;)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	19 Apr 2006 22:04:29 -0000	1.6
+++ .cvsignore	19 Apr 2006 22:39:03 -0000	1.7
@@ -1 +1 @@
-pysqlite-2.2.1.tar.gz
+pysqlite-2.2.2.tar.gz


Index: python-sqlite2.spec
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/FC-5/python-sqlite2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- python-sqlite2.spec	19 Apr 2006 22:04:29 -0000	1.9
+++ python-sqlite2.spec	19 Apr 2006 22:39:03 -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-sqlite2
-Version:        2.2.1
+Version:        2.2.2
 Release:        1%{?dist}
 Epoch:          1
 Summary:        DB-API 2.0 interface for SQLite 3.x
@@ -97,6 +97,9 @@
 
 
 %changelog
+* Thu Apr 20 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 1:2.2.2-1
+- Update to 2.2.2
+
 * Wed Apr 19 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 1:2.2.1-1
 - Update to 2.2.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 Apr 2006 22:04:29 -0000	1.6
+++ sources	19 Apr 2006 22:39:03 -0000	1.7
@@ -1 +1 @@
-3d9fe353420fdea44e368afd982c9786  pysqlite-2.2.1.tar.gz
+3260547d3f11c85613b2de8ed529a4fc  pysqlite-2.2.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 20 00:34:48 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Wed, 19 Apr 2006 17:34:48 -0700
Subject: rpms/git/devel .cvsignore, 1.24, 1.25 git.spec, 1.12, 1.13 sources, 
	1.24, 1.25
Message-ID: <200604200034.k3K0YoGO010433@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10412

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	10 Apr 2006 16:48:25 -0000	1.24
+++ .cvsignore	20 Apr 2006 00:34:48 -0000	1.25
@@ -1 +1 @@
-git-1.2.6.tar.gz
+git-1.3.0.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/devel/git.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- git.spec	10 Apr 2006 16:48:25 -0000	1.12
+++ git.spec	20 Apr 2006 00:34:48 -0000	1.13
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.2.6
+Version: 	1.3.0
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Wed Apr 19 2006 Chris Wright <chrisw at redhat.com> 1.3.0-1
+- git-1.3.0
+
 * Mon Apr 10 2006 Chris Wright <chrisw at redhat.com> 1.2.6-1
 - git-1.2.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	10 Apr 2006 16:48:25 -0000	1.24
+++ sources	20 Apr 2006 00:34:48 -0000	1.25
@@ -1 +1 @@
-f10a13074e849ff8670f5dba07bfe5c1  git-1.2.6.tar.gz
+37137c9f87b0082fbf04e6b80a5144e2  git-1.3.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 20 00:36:34 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Wed, 19 Apr 2006 17:36:34 -0700
Subject: rpms/git/FC-5 .cvsignore, 1.24, 1.25 git.spec, 1.12, 1.13 sources, 
	1.24, 1.25
Message-ID: <200604200036.k3K0aaZf010509@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10488

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/FC-5/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	10 Apr 2006 16:50:46 -0000	1.24
+++ .cvsignore	20 Apr 2006 00:36:33 -0000	1.25
@@ -1 +1 @@
-git-1.2.6.tar.gz
+git-1.3.0.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/FC-5/git.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- git.spec	10 Apr 2006 16:50:46 -0000	1.12
+++ git.spec	20 Apr 2006 00:36:33 -0000	1.13
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.2.6
+Version: 	1.3.0
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Wed Apr 19 2006 Chris Wright <chrisw at redhat.com> 1.3.0-1
+- git-1.3.0
+
 * Mon Apr 10 2006 Chris Wright <chrisw at redhat.com> 1.2.6-1
 - git-1.2.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/FC-5/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	10 Apr 2006 16:50:46 -0000	1.24
+++ sources	20 Apr 2006 00:36:33 -0000	1.25
@@ -1 +1 @@
-f10a13074e849ff8670f5dba07bfe5c1  git-1.2.6.tar.gz
+37137c9f87b0082fbf04e6b80a5144e2  git-1.3.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 20 00:37:59 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Wed, 19 Apr 2006 17:37:59 -0700
Subject: rpms/git/FC-4 .cvsignore, 1.24, 1.25 git.spec, 1.12, 1.13 sources, 
	1.24, 1.25
Message-ID: <200604200038.k3K0c1NE010587@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10566

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/FC-4/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	10 Apr 2006 16:51:39 -0000	1.24
+++ .cvsignore	20 Apr 2006 00:37:58 -0000	1.25
@@ -1 +1 @@
-git-1.2.6.tar.gz
+git-1.3.0.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/FC-4/git.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- git.spec	10 Apr 2006 16:51:39 -0000	1.12
+++ git.spec	20 Apr 2006 00:37:58 -0000	1.13
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.2.6
+Version: 	1.3.0
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Wed Apr 19 2006 Chris Wright <chrisw at redhat.com> 1.3.0-1
+- git-1.3.0
+
 * Mon Apr 10 2006 Chris Wright <chrisw at redhat.com> 1.2.6-1
 - git-1.2.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/FC-4/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	10 Apr 2006 16:51:39 -0000	1.24
+++ sources	20 Apr 2006 00:37:58 -0000	1.25
@@ -1 +1 @@
-f10a13074e849ff8670f5dba07bfe5c1  git-1.2.6.tar.gz
+37137c9f87b0082fbf04e6b80a5144e2  git-1.3.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 20 00:41:34 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Wed, 19 Apr 2006 17:41:34 -0700
Subject: rpms/git/FC-3 .cvsignore, 1.24, 1.25 git.spec, 1.12, 1.13 sources, 
	1.24, 1.25
Message-ID: <200604200041.k3K0faqQ010665@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10644

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/FC-3/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	10 Apr 2006 16:53:10 -0000	1.24
+++ .cvsignore	20 Apr 2006 00:41:34 -0000	1.25
@@ -1 +1 @@
-git-1.2.6.tar.gz
+git-1.3.0.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/FC-3/git.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- git.spec	10 Apr 2006 16:53:10 -0000	1.12
+++ git.spec	20 Apr 2006 00:41:34 -0000	1.13
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.2.6
+Version: 	1.3.0
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Wed Apr 19 2006 Chris Wright <chrisw at redhat.com> 1.3.0-1
+- git-1.3.0
+
 * Mon Apr 10 2006 Chris Wright <chrisw at redhat.com> 1.2.6-1
 - git-1.2.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/FC-3/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	10 Apr 2006 16:53:10 -0000	1.24
+++ sources	20 Apr 2006 00:41:34 -0000	1.25
@@ -1 +1 @@
-f10a13074e849ff8670f5dba07bfe5c1  git-1.2.6.tar.gz
+37137c9f87b0082fbf04e6b80a5144e2  git-1.3.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 20 07:17:21 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Thu, 20 Apr 2006 00:17:21 -0700
Subject: rpms/perl-Math-Pari/FC-5 perl-Math-Pari.spec,1.1,1.2
Message-ID: <200604200717.k3K7HNnH025946@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-serv25929

Modified Files:
	perl-Math-Pari.spec 
Log Message:
Bump



Index: perl-Math-Pari.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Pari/FC-5/perl-Math-Pari.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Math-Pari.spec	18 Apr 2006 18:33:50 -0000	1.1
+++ perl-Math-Pari.spec	20 Apr 2006 07:17:20 -0000	1.2
@@ -14,7 +14,7 @@
 # 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:	2%{?dist}.1
 License:	Artistic or GPL
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Math-Pari/
@@ -73,6 +73,9 @@
 %exclude %{_mandir}/man3/Math::libPARI.dumb.3pm*
 
 %changelog
+* Thu Apr 20 2006 Paul Howarth <paul at city-fan.org> 2.010704-2.1
+- Bump for tag issue. Won't import mock-built SRPMs again!
+
 * Tue Apr 18 2006 Paul Howarth <paul at city-fan.org> 2.010704-2
 - Omit dumb docs (#175198)
 



From fedora-extras-commits at redhat.com  Thu Apr 20 09:30:51 2006
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Thu, 20 Apr 2006 02:30:51 -0700
Subject: rpms/libstatgrab/devel .cvsignore, 1.3, 1.4 libstatgrab.spec, 1.3, 
	1.4 sources, 1.3, 1.4
Message-ID: <200604200930.k3K9UrXS030678@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/extras/rpms/libstatgrab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30657

Modified Files:
	.cvsignore libstatgrab.spec sources 
Log Message:
* Update libstatgrab


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libstatgrab/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Aug 2005 08:45:32 -0000	1.3
+++ .cvsignore	20 Apr 2006 09:30:51 -0000	1.4
@@ -1 +1 @@
-libstatgrab-0.12.tar.gz
+libstatgrab-0.13.tar.gz


Index: libstatgrab.spec
===================================================================
RCS file: /cvs/extras/rpms/libstatgrab/devel/libstatgrab.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libstatgrab.spec	10 Aug 2005 08:46:59 -0000	1.3
+++ libstatgrab.spec	20 Apr 2006 09:30:51 -0000	1.4
@@ -3,10 +3,10 @@
 Summary:		Make system statistics
 Name:			libstatgrab
 
-Version:		0.12
+Version:		0.13
 Release:		1%{?dist}
 
-Source0:		ftp://ftp.i-scream.org/pub/i-scream/%{name}/%{name}-%{version}.tar.gz
+Source0:		http://ftp.i-scream.org/pub/i-scream/%{name}/%{name}-%{version}.tar.gz
 Patch0:			%{name}.nochmod.patch
 
 License:		LGPL
@@ -127,6 +127,9 @@
 %{_bindir}/vm_stats
 
 %changelog
+* Thu Apr 20 2006 Oliver Falk <oliver at linux-kernel.at>		- 0.13-1
+- Update
+
 * Wed Aug 10 2005 Oliver Falk <oliver at linux-kernel.at>		- 0.12-1
 - Update
 - Added saidar manpage


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libstatgrab/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Aug 2005 08:45:32 -0000	1.3
+++ sources	20 Apr 2006 09:30:51 -0000	1.4
@@ -1 +1 @@
-fe8bf50490e3382c29da3a553bb7ca0e  libstatgrab-0.12.tar.gz
+19818d772284c7491cdf484249890c95  libstatgrab-0.13.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 20 09:33:53 2006
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Thu, 20 Apr 2006 02:33:53 -0700
Subject: rpms/libstatgrab/FC-5 .cvsignore, 1.3, 1.4 libstatgrab.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200604200933.k3K9XuvS030770@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/extras/rpms/libstatgrab/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30749

Modified Files:
	.cvsignore libstatgrab.spec sources 
Log Message:
* Update libstatgrab


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libstatgrab/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Aug 2005 08:45:32 -0000	1.3
+++ .cvsignore	20 Apr 2006 09:33:53 -0000	1.4
@@ -1 +1 @@
-libstatgrab-0.12.tar.gz
+libstatgrab-0.13.tar.gz


Index: libstatgrab.spec
===================================================================
RCS file: /cvs/extras/rpms/libstatgrab/FC-5/libstatgrab.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libstatgrab.spec	10 Aug 2005 08:46:59 -0000	1.3
+++ libstatgrab.spec	20 Apr 2006 09:33:53 -0000	1.4
@@ -3,10 +3,10 @@
 Summary:		Make system statistics
 Name:			libstatgrab
 
-Version:		0.12
+Version:		0.13
 Release:		1%{?dist}
 
-Source0:		ftp://ftp.i-scream.org/pub/i-scream/%{name}/%{name}-%{version}.tar.gz
+Source0:		http://ftp.i-scream.org/pub/i-scream/%{name}/%{name}-%{version}.tar.gz
 Patch0:			%{name}.nochmod.patch
 
 License:		LGPL
@@ -127,6 +127,9 @@
 %{_bindir}/vm_stats
 
 %changelog
+* Thu Apr 20 2006 Oliver Falk <oliver at linux-kernel.at>		- 0.13-1
+- Update
+
 * Wed Aug 10 2005 Oliver Falk <oliver at linux-kernel.at>		- 0.12-1
 - Update
 - Added saidar manpage


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libstatgrab/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Aug 2005 08:45:32 -0000	1.3
+++ sources	20 Apr 2006 09:33:53 -0000	1.4
@@ -1 +1 @@
-fe8bf50490e3382c29da3a553bb7ca0e  libstatgrab-0.12.tar.gz
+19818d772284c7491cdf484249890c95  libstatgrab-0.13.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 20 13:15:45 2006
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 20 Apr 2006 06:15:45 -0700
Subject: rpms/pcb - New directory
Message-ID: <200604201315.k3KDFl0u007841@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/pcb
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7815/pcb

Log Message:
Directory /cvs/extras/rpms/pcb added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 20 13:15:45 2006
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 20 Apr 2006 06:15:45 -0700
Subject: rpms/pcb/devel - New directory
Message-ID: <200604201315.k3KDFlSv007844@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/pcb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7815/pcb/devel

Log Message:
Directory /cvs/extras/rpms/pcb/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 20 13:16:17 2006
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 20 Apr 2006 06:16:17 -0700
Subject: rpms/pcb/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604201316.k3KDGJS0007900@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/pcb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7864/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pcb


--- 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 Apr 20 13:16:16 2006
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 20 Apr 2006 06:16:16 -0700
Subject: rpms/pcb Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604201316.k3KDGIcr007897@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/pcb
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7864

Added Files:
	Makefile import.log 
Log Message:
Setup of module pcb


--- NEW FILE Makefile ---
# Top level Makefile for module pcb
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 20 13:37:44 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Thu, 20 Apr 2006 06:37:44 -0700
Subject: rpms/octave/FC-5 octave-2.9.5-config.patch, NONE, 1.1 octave.spec, 
	1.33, 1.34
Message-ID: <200604201337.k3KDbkmv008058@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/octave/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8038

Modified Files:
	octave.spec 
Added Files:
	octave-2.9.5-config.patch 
Log Message:
Upgrade to 2.9.5 release, add some needed patches, and lots of spec file improvements.

octave-2.9.5-config.patch:

--- NEW FILE octave-2.9.5-config.patch ---
--- configure.orig	2006-04-18 08:22:38.000000000 -0500
+++ configure	2006-04-18 08:30:46.000000000 -0500
@@ -3291,7 +3291,7 @@
 echo "$as_me:$LINENO: result: defining localfcnfiledir to be $localfcnfiledir" >&5
 echo "${ECHO_T}defining localfcnfiledir to be $localfcnfiledir" >&6
 
-: ${localapifcnfiledir='$(datadir)/octave/site/$(apiversion)/m'}
+: ${localapifcnfiledir='$(datadir)/octave/site/$(api_version)/m'}
 echo "$as_me:$LINENO: result: defining localapifcnfiledir to be $localapifcnfiledir" >&5
 echo "${ECHO_T}defining localapifcnfiledir to be $localapifcnfiledir" >&6
 
@@ -3327,7 +3327,7 @@
 echo "$as_me:$LINENO: result: defining localoctfiledir to be $localoctfiledir" >&5
 echo "${ECHO_T}defining localoctfiledir to be $localoctfiledir" >&6
 
-: ${localapioctfiledir='$(libexecdir)/octave/site/oct/$(apiversion)/$(canonical_host_type)'}
+: ${localapioctfiledir='$(libexecdir)/octave/site/oct/$(api_version)/$(canonical_host_type)'}
 echo "$as_me:$LINENO: result: defining localapioctfiledir to be $localapioctfiledir" >&5
 echo "${ECHO_T}defining localapioctfiledir to be $localapioctfiledir" >&6
 


Index: octave.spec
===================================================================
RCS file: /cvs/extras/rpms/octave/FC-5/octave.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- octave.spec	23 Mar 2006 22:43:54 -0000	1.33
+++ octave.spec	20 Apr 2006 13:37:44 -0000	1.34
@@ -8,6 +8,7 @@
 License:        GPL
 Source:         ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%{version}.tar.bz2
 Patch0:         octave-2.9.5-sparse.patch
+Patch1:         octave-2.9.5-config.patch
 URL:            http://www.octave.org
 Requires:       gnuplot less info texinfo 
 Requires(post): /sbin/install-info
@@ -51,6 +52,7 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0
 
 
 %build
@@ -133,8 +135,9 @@
 
 
 %changelog
-* Thu Mar 23 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.5-1
+* Thu Apr 20 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.5-1
 - New upstream release; remove old patches; add sparse patch.
+- Add patch for configure script.
 - Add gcc-c++ as dependency for devel package.
 - Add more docs; cleanup extra files in docs.
 - Simplify configure command.



From fedora-extras-commits at redhat.com  Thu Apr 20 13:51:53 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Thu, 20 Apr 2006 06:51:53 -0700
Subject: rpms/octave-forge/FC-5 .cvsignore, 1.7, 1.8 octave-forge.spec, 1.21,
	1.22 sources, 1.7, 1.8
Message-ID: <200604201351.k3KDptLC008474@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-serv8449

Modified Files:
	.cvsignore octave-forge.spec sources 
Log Message:
Add patch so it works with octave 2.9.5.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	17 Mar 2006 16:53:38 -0000	1.7
+++ .cvsignore	20 Apr 2006 13:51:53 -0000	1.8
@@ -1 +1,2 @@
 octave-forge-2006.03.17.patched.tar.gz
+octave-forge-system.patch.gz


Index: octave-forge.spec
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/FC-5/octave-forge.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- octave-forge.spec	17 Mar 2006 16:53:38 -0000	1.21
+++ octave-forge.spec	20 Apr 2006 13:51:53 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           octave-forge
 Version:        2006.03.17
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -15,9 +15,10 @@
 ## tar czf octave-forge-%{version}.patched.tar.gz octave-forge-%{version}
 ## rm -Rf octave-forge-%{version}
 Source0:        %{name}-%{version}.patched.tar.gz
+Patch0:         %{name}-system.patch.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	octave >= 2.9.4 ImageMagick
+Requires:	octave >= 2.9.5 ImageMagick
 BuildRequires:  octave-devel tetex gcc-gfortran ginac-devel qhull-devel
 BuildRequires:  ImageMagick-c++-devel netcdf-devel pcre-devel gsl-devel
 BuildRequires:  libjpeg-devel libpng-devel ncurses-devel libtermcap-devel
@@ -32,6 +33,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 # The sparse matrix functions are in octave 2.9.x so don't install them
 touch main/sparse/NOINSTALL
 
@@ -67,6 +69,9 @@
 
 
 %changelog
+* Thu Apr 20 2006 Quentin Spencer <qspencer at users.sf.net> 2006.03.17-2
+- Add patch for system function so it works with octave 2.9.5.
+
 * Fri Mar 17 2006 Quentin Spencer <qspencer at users.sf.net> 2006.03.17-1
 - New release. Remove old patches.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	17 Mar 2006 16:53:38 -0000	1.7
+++ sources	20 Apr 2006 13:51:53 -0000	1.8
@@ -1 +1,2 @@
 a1e76ab52fb9894586d6a7a0dc15e603  octave-forge-2006.03.17.patched.tar.gz
+c50919d0790c7873a82c2da09d419142  octave-forge-system.patch.gz



From fedora-extras-commits at redhat.com  Thu Apr 20 14:03:00 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 20 Apr 2006 07:03:00 -0700
Subject: rpms/fedora-package-config-smart/devel .cvsignore, 1.2,
	1.3 fedora-package-config-smart.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200604201403.k3KE32R3011455@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-serv11384/fedora-package-config-smart/devel

Modified Files:
	.cvsignore fedora-package-config-smart.spec sources 
Log Message:
Add smart-config virtual dependency


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-smart/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Apr 2006 17:45:23 -0000	1.2
+++ .cvsignore	20 Apr 2006 14:03:00 -0000	1.3
@@ -1 +1 @@
-fedora-package-config-smart-5.tar.bz2
+fedora-package-config-smart-5.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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-package-config-smart.spec	10 Apr 2006 17:45:23 -0000	1.1
+++ fedora-package-config-smart.spec	20 Apr 2006 14:03:00 -0000	1.2
@@ -1,12 +1,13 @@
 Summary: Configuration files for the smart package manager
 Name: fedora-package-config-smart
-Version: 5
-Release: 4
+Version: 5.89
+Release: 6
 License: GPL
 Group: System Environment/Base
 URL: http://fedora.redhat.com/
 Source0: %{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Provides: smart-config
 
 %description
 This package contains configuration files for smart.
@@ -35,6 +36,12 @@
 %config(noreplace) %{_sysconfdir}/smart/channels/*.channel
 
 %changelog
+* Thu Apr 20 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 5.89-6
+- Update to rawhide config.
+
+* Thu Apr 20 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 5-5
+- Add virtual smart-config provides (#175630 comment 13).
+
 * Sat Apr  1 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 5-4
 - Update to Fedora Core 5.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-smart/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Apr 2006 17:45:23 -0000	1.2
+++ sources	20 Apr 2006 14:03:00 -0000	1.3
@@ -1 +1 @@
-5992a399b473b042ab25e2f39cbb4992  fedora-package-config-smart-5.tar.bz2
+248314d34eb546fde3111b3dbaaa924c  fedora-package-config-smart-5.89.tar.bz2



From fedora-extras-commits at redhat.com  Thu Apr 20 14:02:46 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 20 Apr 2006 07:02:46 -0700
Subject: rpms/fedora-package-config-smart/FC-4
	fedora-package-config-smart.spec, 1.2, 1.3
Message-ID: <200604201403.k3KE3IWO011490@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-serv11384/fedora-package-config-smart/FC-4

Modified Files:
	fedora-package-config-smart.spec 
Log Message:
Add smart-config virtual dependency


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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-package-config-smart.spec	11 Apr 2006 11:47:11 -0000	1.2
+++ fedora-package-config-smart.spec	20 Apr 2006 14:02:46 -0000	1.3
@@ -1,12 +1,13 @@
 Summary: Configuration files for the smart package manager
 Name: fedora-package-config-smart
 Version: 4
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Base
 URL: http://fedora.redhat.com/
 Source0: %{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Provides: smart-config
 
 %description
 This package contains configuration files for smart.
@@ -35,6 +36,9 @@
 %config(noreplace) %{_sysconfdir}/smart/channels/*.channel
 
 %changelog
+* Thu Apr 20 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 4-4
+- Add virtual smart-config provides (#175630 comment 13).
+
 * Tue Dec 13 2005 Axel Thimm <Axel.Thimm at ATrpms.net> - 4-3
 - changed name to fedora-package-config-smart
 - Modify to only include what fedora-release includes for yum.



From fedora-extras-commits at redhat.com  Thu Apr 20 14:02:49 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 20 Apr 2006 07:02:49 -0700
Subject: rpms/fedora-package-config-smart/FC-5
	fedora-package-config-smart.spec, 1.1, 1.2
Message-ID: <200604201403.k3KE3N30011493@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-serv11384/fedora-package-config-smart/FC-5

Modified Files:
	fedora-package-config-smart.spec 
Log Message:
Add smart-config virtual dependency


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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-package-config-smart.spec	10 Apr 2006 17:45:23 -0000	1.1
+++ fedora-package-config-smart.spec	20 Apr 2006 14:02:49 -0000	1.2
@@ -1,12 +1,13 @@
 Summary: Configuration files for the smart package manager
 Name: fedora-package-config-smart
 Version: 5
-Release: 4
+Release: 5
 License: GPL
 Group: System Environment/Base
 URL: http://fedora.redhat.com/
 Source0: %{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Provides: smart-config
 
 %description
 This package contains configuration files for smart.
@@ -35,6 +36,9 @@
 %config(noreplace) %{_sysconfdir}/smart/channels/*.channel
 
 %changelog
+* Thu Apr 20 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 5-5
+- Add virtual smart-config provides (#175630 comment 13).
+
 * Sat Apr  1 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 5-4
 - Update to Fedora Core 5.
 



From fedora-extras-commits at redhat.com  Thu Apr 20 14:03:30 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 20 Apr 2006 07:03:30 -0700
Subject: rpms/smart/FC-5 smart.spec,1.2,1.3
Message-ID: <200604201403.k3KE3XDi011548@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/smart/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11499/smart/FC-5

Modified Files:
	smart.spec 
Log Message:
Add smart-config virtual dependency


Index: smart.spec
===================================================================
RCS file: /cvs/extras/rpms/smart/FC-5/smart.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- smart.spec	11 Apr 2006 10:25:27 -0000	1.2
+++ smart.spec	20 Apr 2006 14:03:30 -0000	1.3
@@ -3,7 +3,7 @@
 Summary: Next generation package handling tool
 Name: smart
 Version: 0.41
-Release: 30%{?dist}
+Release: 31%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://labix.org/smart/
@@ -19,7 +19,7 @@
 BuildRequires: desktop-file-utils
 Requires: python-abi = %(python -c "import sys ; print sys.version[:3]")
 Requires: rpm-python >= 4.4
-Requires: fedora-package-config-smart
+Requires: smart-config
 
 %description
 Smart Package Manager is a next generation package handling tool.
@@ -143,7 +143,10 @@
 %config %{_sysconfdir}/pam.d/smart-root
 
 %changelog
-* Tue Apr 11 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41
+* Thu Apr 20 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41-31
+- Add virtual smart-config dependency (#175630 comment 13).
+
+* Tue Apr 11 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41-30
 - Move the disttag to the Release: tag.
 
 * Mon Apr 10 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41-29



From fedora-extras-commits at redhat.com  Thu Apr 20 14:03:30 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 20 Apr 2006 07:03:30 -0700
Subject: rpms/smart/FC-4 smart.spec,1.2,1.3
Message-ID: <200604201403.k3KE3WVj011544@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/smart/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11499/smart/FC-4

Modified Files:
	smart.spec 
Log Message:
Add smart-config virtual dependency


Index: smart.spec
===================================================================
RCS file: /cvs/extras/rpms/smart/FC-4/smart.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- smart.spec	11 Apr 2006 10:25:26 -0000	1.2
+++ smart.spec	20 Apr 2006 14:03:30 -0000	1.3
@@ -3,7 +3,7 @@
 Summary: Next generation package handling tool
 Name: smart
 Version: 0.41
-Release: 30%{?dist}
+Release: 31%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://labix.org/smart/
@@ -19,7 +19,7 @@
 BuildRequires: desktop-file-utils
 Requires: python-abi = %(python -c "import sys ; print sys.version[:3]")
 Requires: rpm-python >= 4.4
-Requires: fedora-package-config-smart
+Requires: smart-config
 
 %description
 Smart Package Manager is a next generation package handling tool.
@@ -143,7 +143,10 @@
 %config %{_sysconfdir}/pam.d/smart-root
 
 %changelog
-* Tue Apr 11 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41
+* Thu Apr 20 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41-31
+- Add virtual smart-config dependency (#175630 comment 13).
+
+* Tue Apr 11 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41-30
 - Move the disttag to the Release: tag.
 
 * Mon Apr 10 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41-29



From fedora-extras-commits at redhat.com  Thu Apr 20 14:03:31 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 20 Apr 2006 07:03:31 -0700
Subject: rpms/smart/devel smart.spec,1.2,1.3
Message-ID: <200604201403.k3KE3XXP011552@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/smart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11499/smart/devel

Modified Files:
	smart.spec 
Log Message:
Add smart-config virtual dependency


Index: smart.spec
===================================================================
RCS file: /cvs/extras/rpms/smart/devel/smart.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- smart.spec	11 Apr 2006 10:25:27 -0000	1.2
+++ smart.spec	20 Apr 2006 14:03:31 -0000	1.3
@@ -3,7 +3,7 @@
 Summary: Next generation package handling tool
 Name: smart
 Version: 0.41
-Release: 30%{?dist}
+Release: 31%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://labix.org/smart/
@@ -19,7 +19,7 @@
 BuildRequires: desktop-file-utils
 Requires: python-abi = %(python -c "import sys ; print sys.version[:3]")
 Requires: rpm-python >= 4.4
-Requires: fedora-package-config-smart
+Requires: smart-config
 
 %description
 Smart Package Manager is a next generation package handling tool.
@@ -143,7 +143,10 @@
 %config %{_sysconfdir}/pam.d/smart-root
 
 %changelog
-* Tue Apr 11 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41
+* Thu Apr 20 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41-31
+- Add virtual smart-config dependency (#175630 comment 13).
+
+* Tue Apr 11 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41-30
 - Move the disttag to the Release: tag.
 
 * Mon Apr 10 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41-29



From fedora-extras-commits at redhat.com  Thu Apr 20 15:56:35 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu, 20 Apr 2006 08:56:35 -0700
Subject: rpms/perl-Class-Autouse/devel perl-Class-Autouse.spec,1.6,1.7
Message-ID: <200604201556.k3KFubMU014343@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-Autouse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14326

Modified Files:
	perl-Class-Autouse.spec 
Log Message:
* Thu Apr 20 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.26-1
- Upstream update.



Index: perl-Class-Autouse.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Autouse/devel/perl-Class-Autouse.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Class-Autouse.spec	28 Feb 2006 23:18:03 -0000	1.6
+++ perl-Class-Autouse.spec	20 Apr 2006 15:56:35 -0000	1.7
@@ -1,6 +1,6 @@
 Name: 		perl-Class-Autouse
-Version: 	1.21
-Release: 	3%{?dist}
+Version: 	1.26
+Release: 	1%{?dist}
 Summary: 	Run-time class loading on first method call
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -57,6 +57,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Apr 20 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.26-1
+- Upstream update.
+
 * Wed Mar 01 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.21-3
 - Rebuild for perl-5.8.8.
 



From fedora-extras-commits at redhat.com  Thu Apr 20 15:58:46 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu, 20 Apr 2006 08:58:46 -0700
Subject: rpms/perl-Class-Autouse/devel .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <200604201558.k3KFwm1N014422@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-Autouse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14403

Modified Files:
	.cvsignore sources 
Log Message:
* Thu Apr 20 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.26-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Autouse/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Feb 2006 14:35:58 -0000	1.5
+++ .cvsignore	20 Apr 2006 15:58:46 -0000	1.6
@@ -1,2 +1 @@
-Class-Autouse-1.21.tar.gz
-Class-Autouse-1.24.tar.gz
+Class-Autouse-1.26.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Autouse/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Feb 2006 14:35:58 -0000	1.5
+++ sources	20 Apr 2006 15:58:46 -0000	1.6
@@ -1,2 +1 @@
-3bf4fadd8349e57d6af0961b6565c74f  Class-Autouse-1.21.tar.gz
-6192abd3fa36d40ae40870ea66aa9b2a  Class-Autouse-1.24.tar.gz
+27d185332ff7fc18477d115802b057b2  Class-Autouse-1.26.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 20 16:12:38 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Thu, 20 Apr 2006 09:12:38 -0700
Subject: kadischi/post_install_scripts 04userconfig.py, 1.5,
	1.6 07accounts.sh, 1.1, 1.2
Message-ID: <200604201612.k3KGCcZF016624@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi/post_install_scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16605/kadischi/post_install_scripts

Modified Files:
	04userconfig.py 07accounts.sh 
Log Message:
Minor changes, break dependancy of lokkit and ntsysv both being present.


Index: 04userconfig.py
===================================================================
RCS file: /cvs/devel/kadischi/post_install_scripts/04userconfig.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 04userconfig.py	18 Apr 2006 00:20:42 -0000	1.5
+++ 04userconfig.py	20 Apr 2006 16:12:36 -0000	1.6
@@ -24,16 +24,26 @@
             flc_log("Skipping interactive user configuration..")
             sys.exit(0)
 
-    if (lokkit and ntsysv) == True:
-        flc_log("Taking you to interactive user configuration..")
+    if lokkit:
+        flc_log("Taking you to interactive firewalling configuration..")
         run("chroot %s %s" % (sysdir, "/usr/sbin/lokkit"))
+    else:
+        flc_log("lokkit can't be found, skipping firewalling configuration..")
+
+    if ntsysv:
+        flc_log("Taking you to interactive services configuration..")
         run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv --level 35"))
     else:
-        flc_log("Skipping interactive user configuration..")
+        flc_log("ntsysv can't be found, skipping services configuration..")
 else:
-    if (lokkit and ntsysv) == True:
-        flc_log("Taking you to interactive user configuration..")
+    if lokkit:
+        flc_log("Taking you to interactive firewalling configuration..")
         run("chroot %s %s" % (sysdir, "/usr/sbin/lokkit"))
+    else:
+        flc_log("lokkit can't be found, skipping firewalling configuration..")
+
+    if ntsysv:
+        flc_log("Taking you to interactive services configuration..")
         run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv --level 35"))
     else:
-        flc_log("Skipping interactive user configuration..")
+        flc_log("ntsysv can't be found, skipping interactive services configuration..")


Index: 07accounts.sh
===================================================================
RCS file: /cvs/devel/kadischi/post_install_scripts/07accounts.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 07accounts.sh	18 Apr 2006 00:21:33 -0000	1.1
+++ 07accounts.sh	20 Apr 2006 16:12:36 -0000	1.2
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # Allow creation of addition user accounts.
-# UIDs start at 500, GID is 100.
+# We will let useradd handle with defaults.
 
 
  . /etc/kadischi/kadischi.conf
@@ -10,7 +10,7 @@
 ANACONDA_ARGS=$2
 USING_KICKSTART=$(echo $ANACONDA_ARGS | grep -G [--]kickstart)
 USING_CMDLINE=$(echo $ANACONDA_ARGS | egrep -- "-C|--cmdline")
-i=0
+
 
 
 if [ $USING_KICKSTART ] || [ $USING_CMDLINE ]; then   
@@ -26,13 +26,13 @@
          echo -n "User shell: "
          read NEWSHELL
          if [ -n $NEWUSERNAME ] && [ -n $NEWSHELL ]; then
-            chroot $SYSDIR /usr/sbin/useradd -d /home/$NEWUSERNAME -m -s $NEWSHELL -u 50$i -g 100 $NEWUSERNAME
+            chroot $SYSDIR /usr/sbin/useradd -d /home/$NEWUSERNAME -m -s $NEWSHELL -g 100 $NEWUSERNAME
             chroot $SYSDIR /usr/bin/passwd $NEWUSERNAME
-            echo "User: $NEWUSERNAME, UID: 50$i, GID: 100 created successfully."
-            (( i += 1 ))
+            echo "User: $NEWUSERNAME, Home: /home/$NEWUSERNAME, GID: 100 created successfully."
          else
             echo "Username or shell wasn't specified."
          fi
+         echo "                                      "
          echo "Would you like to create another user?"
          echo -n "[yes/no] "
          read CHOICE
@@ -41,4 +41,3 @@
       exit 0
    fi
 fi
-



From fedora-extras-commits at redhat.com  Thu Apr 20 16:23:55 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Thu, 20 Apr 2006 09:23:55 -0700
Subject: rpms/deutex/devel deutex-4.4.0-freedoom.patch, NONE, 1.1 deutex.spec,
	1.1, 1.2
Message-ID: <200604201623.k3KGNvWL016782@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/deutex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16726/devel

Modified Files:
	deutex.spec 
Added Files:
	deutex-4.4.0-freedoom.patch 
Log Message:
Add freedoom to the list of known iwads.



deutex-4.4.0-freedoom.patch:

--- NEW FILE deutex-4.4.0-freedoom.patch ---
--- deutex-4.4.0/src/deutex.c	2006-04-20 08:09:14.000000000 -0700
+++ deutex-4.4.0/src/deutex.c.new	2006-04-20 08:15:33.000000000 -0700
@@ -970,14 +970,15 @@
                && MakeFileName(MainWAD,DoomDir,"","","heretic", "wad")!=TRUE
                && MakeFileName(MainWAD,DoomDir,"","","hexen",   "wad")!=TRUE
                && MakeFileName(MainWAD,DoomDir,"","","strife1", "wad")!=TRUE
+               && MakeFileName(MainWAD,DoomDir,"","","freedoom","wad")!=TRUE
                && MakeFileName(MainWAD,".",    "","","doompres","wad")!=TRUE
                && MakeFileName(MainWAD,".",    "","","doom",    "wad")!=TRUE
 	       && MakeFileName(MainWAD,".",    "","","doom2",   "wad")!=TRUE
                && MakeFileName(MainWAD,".",    "","","heretic", "wad")!=TRUE
                && MakeFileName(MainWAD,".",    "","","hexen",   "wad")!=TRUE
-               && MakeFileName(MainWAD,".",    "","","strife1", "wad")!=TRUE)
+               && MakeFileName(MainWAD,".",    "","","freedoom","wad")!=TRUE)
              ProgError("Can't find any of doom.wad, doom2.wad, doompres.wad,"
-		 " heretic.wad, hexen.wad, strife1.wad");
+		 " heretic.wad, hexen.wad, strife1.wad, freedom.wad");
          }
          /*selection bytes*/
 #if defined DeuTex


Index: deutex.spec
===================================================================
RCS file: /cvs/extras/rpms/deutex/devel/deutex.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- deutex.spec	19 Mar 2006 21:56:56 -0000	1.1
+++ deutex.spec	20 Apr 2006 16:23:55 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           deutex
 Version:        4.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        DOOM wad file manipulator
 
 Group:          Amusements/Graphics
@@ -9,6 +9,7 @@
 Source0:        http://www.teaser.fr/~amajorel/deutex/deutex-4.4.0.tar.gz
 Patch0:         deutex-4.4.0-build.patch
 Patch1:         deutex-4.4.0-64bit.patch
+Patch2:         deutex-4.4.0-freedoom.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -27,6 +28,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 # Minor permissions cleanup for rpmlint.
 chmod a-x src/picture.c
 
@@ -57,5 +59,8 @@
 
 
 %changelog
+* Sun Apr 20 2006 Wart <wart at kobold.org> 4.4.0-2
+- Add freedoom to the list of known iwads.
+
 * Sun Mar 19 2006 Wart <wart at kobold.org> 4.4.0-1
 - Initial spec file.



From fedora-extras-commits at redhat.com  Thu Apr 20 16:23:48 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Thu, 20 Apr 2006 09:23:48 -0700
Subject: rpms/deutex/FC-4 deutex-4.4.0-freedoom.patch, NONE, 1.1 deutex.spec,
	1.1, 1.2
Message-ID: <200604201624.k3KGOKPX016785@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/deutex/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16726/FC-4

Modified Files:
	deutex.spec 
Added Files:
	deutex-4.4.0-freedoom.patch 
Log Message:
Add freedoom to the list of known iwads.



deutex-4.4.0-freedoom.patch:

--- NEW FILE deutex-4.4.0-freedoom.patch ---
--- deutex-4.4.0/src/deutex.c	2006-04-20 08:09:14.000000000 -0700
+++ deutex-4.4.0/src/deutex.c.new	2006-04-20 08:15:33.000000000 -0700
@@ -970,14 +970,15 @@
                && MakeFileName(MainWAD,DoomDir,"","","heretic", "wad")!=TRUE
                && MakeFileName(MainWAD,DoomDir,"","","hexen",   "wad")!=TRUE
                && MakeFileName(MainWAD,DoomDir,"","","strife1", "wad")!=TRUE
+               && MakeFileName(MainWAD,DoomDir,"","","freedoom","wad")!=TRUE
                && MakeFileName(MainWAD,".",    "","","doompres","wad")!=TRUE
                && MakeFileName(MainWAD,".",    "","","doom",    "wad")!=TRUE
 	       && MakeFileName(MainWAD,".",    "","","doom2",   "wad")!=TRUE
                && MakeFileName(MainWAD,".",    "","","heretic", "wad")!=TRUE
                && MakeFileName(MainWAD,".",    "","","hexen",   "wad")!=TRUE
-               && MakeFileName(MainWAD,".",    "","","strife1", "wad")!=TRUE)
+               && MakeFileName(MainWAD,".",    "","","freedoom","wad")!=TRUE)
              ProgError("Can't find any of doom.wad, doom2.wad, doompres.wad,"
-		 " heretic.wad, hexen.wad, strife1.wad");
+		 " heretic.wad, hexen.wad, strife1.wad, freedom.wad");
          }
          /*selection bytes*/
 #if defined DeuTex


Index: deutex.spec
===================================================================
RCS file: /cvs/extras/rpms/deutex/FC-4/deutex.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- deutex.spec	19 Mar 2006 21:56:56 -0000	1.1
+++ deutex.spec	20 Apr 2006 16:23:48 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           deutex
 Version:        4.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        DOOM wad file manipulator
 
 Group:          Amusements/Graphics
@@ -9,6 +9,7 @@
 Source0:        http://www.teaser.fr/~amajorel/deutex/deutex-4.4.0.tar.gz
 Patch0:         deutex-4.4.0-build.patch
 Patch1:         deutex-4.4.0-64bit.patch
+Patch2:         deutex-4.4.0-freedoom.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -27,6 +28,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 # Minor permissions cleanup for rpmlint.
 chmod a-x src/picture.c
 
@@ -57,5 +59,8 @@
 
 
 %changelog
+* Sun Apr 20 2006 Wart <wart at kobold.org> 4.4.0-2
+- Add freedoom to the list of known iwads.
+
 * Sun Mar 19 2006 Wart <wart at kobold.org> 4.4.0-1
 - Initial spec file.



From fedora-extras-commits at redhat.com  Thu Apr 20 16:23:49 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Thu, 20 Apr 2006 09:23:49 -0700
Subject: rpms/deutex/FC-5 deutex-4.4.0-freedoom.patch, NONE, 1.1 deutex.spec,
	1.1, 1.2
Message-ID: <200604201624.k3KGOLq6016788@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/deutex/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16726/FC-5

Modified Files:
	deutex.spec 
Added Files:
	deutex-4.4.0-freedoom.patch 
Log Message:
Add freedoom to the list of known iwads.



deutex-4.4.0-freedoom.patch:

--- NEW FILE deutex-4.4.0-freedoom.patch ---
--- deutex-4.4.0/src/deutex.c	2006-04-20 08:09:14.000000000 -0700
+++ deutex-4.4.0/src/deutex.c.new	2006-04-20 08:15:33.000000000 -0700
@@ -970,14 +970,15 @@
                && MakeFileName(MainWAD,DoomDir,"","","heretic", "wad")!=TRUE
                && MakeFileName(MainWAD,DoomDir,"","","hexen",   "wad")!=TRUE
                && MakeFileName(MainWAD,DoomDir,"","","strife1", "wad")!=TRUE
+               && MakeFileName(MainWAD,DoomDir,"","","freedoom","wad")!=TRUE
                && MakeFileName(MainWAD,".",    "","","doompres","wad")!=TRUE
                && MakeFileName(MainWAD,".",    "","","doom",    "wad")!=TRUE
 	       && MakeFileName(MainWAD,".",    "","","doom2",   "wad")!=TRUE
                && MakeFileName(MainWAD,".",    "","","heretic", "wad")!=TRUE
                && MakeFileName(MainWAD,".",    "","","hexen",   "wad")!=TRUE
-               && MakeFileName(MainWAD,".",    "","","strife1", "wad")!=TRUE)
+               && MakeFileName(MainWAD,".",    "","","freedoom","wad")!=TRUE)
              ProgError("Can't find any of doom.wad, doom2.wad, doompres.wad,"
-		 " heretic.wad, hexen.wad, strife1.wad");
+		 " heretic.wad, hexen.wad, strife1.wad, freedom.wad");
          }
          /*selection bytes*/
 #if defined DeuTex


Index: deutex.spec
===================================================================
RCS file: /cvs/extras/rpms/deutex/FC-5/deutex.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- deutex.spec	19 Mar 2006 21:56:56 -0000	1.1
+++ deutex.spec	20 Apr 2006 16:23:49 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           deutex
 Version:        4.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        DOOM wad file manipulator
 
 Group:          Amusements/Graphics
@@ -9,6 +9,7 @@
 Source0:        http://www.teaser.fr/~amajorel/deutex/deutex-4.4.0.tar.gz
 Patch0:         deutex-4.4.0-build.patch
 Patch1:         deutex-4.4.0-64bit.patch
+Patch2:         deutex-4.4.0-freedoom.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -27,6 +28,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 # Minor permissions cleanup for rpmlint.
 chmod a-x src/picture.c
 
@@ -57,5 +59,8 @@
 
 
 %changelog
+* Sun Apr 20 2006 Wart <wart at kobold.org> 4.4.0-2
+- Add freedoom to the list of known iwads.
+
 * Sun Mar 19 2006 Wart <wart at kobold.org> 4.4.0-1
 - Initial spec file.



From fedora-extras-commits at redhat.com  Thu Apr 20 16:28:01 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Thu, 20 Apr 2006 09:28:01 -0700
Subject: rpms/perl-String-CRC32/FC-4 perl-String-CRC32.spec, 1.2, 1.3 sources,
	1.2, 1.3 .cvsignore, 1.2, 1.3
Message-ID: <200604201628.k3KGS3OV016859@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-String-CRC32/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16837

Modified Files:
	perl-String-CRC32.spec sources .cvsignore 
Log Message:
Update to 1.4



Index: perl-String-CRC32.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-String-CRC32/FC-4/perl-String-CRC32.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-String-CRC32.spec	6 Jan 2006 17:52:11 -0000	1.2
+++ perl-String-CRC32.spec	20 Apr 2006 16:28:00 -0000	1.3
@@ -1,6 +1,6 @@
 Summary:	Perl interface for cyclic redundancy check generation
 Name:		perl-String-CRC32
-Version:	1.3
+Version:	1.4
 Release:	1%{?dist}
 License:	Public Domain
 Group:		Development/Libraries
@@ -43,5 +43,8 @@
 %{_mandir}/man3/String::CRC32.3pm*
 
 %changelog
+* Thu Apr 20 2006 Paul Howarth <paul at city-fan.org> 1.4-1
+- Update to 1.4
+
 * Fri Nov 25 2005 Paul Howarth <paul at city-fan.org> 1.3-1
 - Initial build


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-String-CRC32/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Jan 2006 17:42:49 -0000	1.2
+++ sources	20 Apr 2006 16:28:00 -0000	1.3
@@ -1 +1 @@
-7683cd1b183a6af807f20ee5fd076d0b  String-CRC32-1.3.tar.gz
+9b241bc4a482a3aa59fbb1429bc30546  String-CRC32-1.4.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-String-CRC32/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Jan 2006 17:42:49 -0000	1.2
+++ .cvsignore	20 Apr 2006 16:28:00 -0000	1.3
@@ -1 +1 @@
-String-CRC32-1.3.tar.gz
+String-CRC32-1.4.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 20 16:29:42 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Thu, 20 Apr 2006 09:29:42 -0700
Subject: rpms/perl-String-CRC32/FC-3 perl-String-CRC32.spec, 1.2, 1.3 sources,
	1.2, 1.3 .cvsignore, 1.2, 1.3
Message-ID: <200604201629.k3KGTitX017000@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-String-CRC32/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16978

Modified Files:
	perl-String-CRC32.spec sources .cvsignore 
Log Message:
update to 1.4



Index: perl-String-CRC32.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-String-CRC32/FC-3/perl-String-CRC32.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-String-CRC32.spec	6 Jan 2006 17:52:11 -0000	1.2
+++ perl-String-CRC32.spec	20 Apr 2006 16:29:41 -0000	1.3
@@ -1,6 +1,6 @@
 Summary:	Perl interface for cyclic redundancy check generation
 Name:		perl-String-CRC32
-Version:	1.3
+Version:	1.4
 Release:	1%{?dist}
 License:	Public Domain
 Group:		Development/Libraries
@@ -43,5 +43,8 @@
 %{_mandir}/man3/String::CRC32.3pm*
 
 %changelog
+* Thu Apr 20 2006 Paul Howarth <paul at city-fan.org> 1.4-1
+- Update to 1.4
+
 * Fri Nov 25 2005 Paul Howarth <paul at city-fan.org> 1.3-1
 - Initial build


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-String-CRC32/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Jan 2006 17:42:49 -0000	1.2
+++ sources	20 Apr 2006 16:29:41 -0000	1.3
@@ -1 +1 @@
-7683cd1b183a6af807f20ee5fd076d0b  String-CRC32-1.3.tar.gz
+9b241bc4a482a3aa59fbb1429bc30546  String-CRC32-1.4.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-String-CRC32/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Jan 2006 17:42:49 -0000	1.2
+++ .cvsignore	20 Apr 2006 16:29:41 -0000	1.3
@@ -1 +1 @@
-String-CRC32-1.3.tar.gz
+String-CRC32-1.4.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 20 16:33:27 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu, 20 Apr 2006 09:33:27 -0700
Subject: rpms/perl-Params-Util/devel .cvsignore, 1.7,
	1.8 perl-Params-Util.spec, 1.7, 1.8 sources, 1.7, 1.8
Message-ID: <200604201633.k3KGXTVx017064@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-serv17043

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
* Thu Apr 20 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.11-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	18 Jan 2006 10:52:58 -0000	1.7
+++ .cvsignore	20 Apr 2006 16:33:26 -0000	1.8
@@ -1 +1 @@
-Params-Util-0.10.tar.gz
+Params-Util-0.11.tar.gz


Index: perl-Params-Util.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/perl-Params-Util.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Params-Util.spec	28 Feb 2006 23:27:52 -0000	1.7
+++ perl-Params-Util.spec	20 Apr 2006 16:33:26 -0000	1.8
@@ -1,6 +1,6 @@
 Name: 		perl-Params-Util
-Version: 	0.10
-Release: 	2%{?dist}
+Version: 	0.11
+Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Apr 20 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.11-1
+- Upstream update.
+
 * Wed Mar 01 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.10-2
 - Rebuild for perl-5.8.8.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	18 Jan 2006 10:52:58 -0000	1.7
+++ sources	20 Apr 2006 16:33:26 -0000	1.8
@@ -1 +1 @@
-1af92339a4772a20dddce7816c68cd80  Params-Util-0.10.tar.gz
+d3fce431cff46caa926ece63fda73946  Params-Util-0.11.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 20 17:13:10 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu, 20 Apr 2006 10:13:10 -0700
Subject: rpms/perl-Params-Validate/FC-5 .cvsignore, 1.4,
	1.5 perl-Params-Validate.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <200604201713.k3KHDCji019501@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Validate/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19480

Modified Files:
	.cvsignore perl-Params-Validate.spec sources 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Validate/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Feb 2006 05:53:20 -0000	1.4
+++ .cvsignore	20 Apr 2006 17:13:10 -0000	1.5
@@ -1 +1 @@
-Params-Validate-0.80.tar.gz
+Params-Validate-0.81.tar.gz


Index: perl-Params-Validate.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Validate/FC-5/perl-Params-Validate.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Params-Validate.spec	20 Feb 2006 06:40:04 -0000	1.5
+++ perl-Params-Validate.spec	20 Apr 2006 17:13:10 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: 	Params-Validate Perl module
 Name: 		perl-Params-Validate
-Version: 	0.80
-Release: 	2%{?dist}
+Version: 	0.81
+Release: 	1%{?dist}
 License: 	GPL or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Params-Validate/
@@ -54,6 +54,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.81-1
+- Upstream update.
+
 * Wed Feb 20 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.80-2
 - Rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Validate/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Feb 2006 05:53:20 -0000	1.4
+++ sources	20 Apr 2006 17:13:10 -0000	1.5
@@ -1 +1 @@
-37acde17038290becdef848f566698d6  Params-Validate-0.80.tar.gz
+033d043c4764b800722b9d7442bc4530  Params-Validate-0.81.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 20 19:26:11 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 20 Apr 2006 12:26:11 -0700
Subject: rpms/python-nose/devel - New directory
Message-ID: <200604201926.k3KJQDfZ024314@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-nose/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24285/python-nose/devel

Log Message:
Directory /cvs/extras/rpms/python-nose/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 20 19:26:11 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 20 Apr 2006 12:26:11 -0700
Subject: rpms/python-nose - New directory
Message-ID: <200604201926.k3KJQDSL024311@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-nose
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24285/python-nose

Log Message:
Directory /cvs/extras/rpms/python-nose added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 20 19:26:23 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 20 Apr 2006 12:26:23 -0700
Subject: rpms/python-nose Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604201926.k3KJQP3a024363@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-nose
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24330

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-nose


--- NEW FILE Makefile ---
# Top level Makefile for module python-nose
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 20 19:26:24 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 20 Apr 2006 12:26:24 -0700
Subject: rpms/python-nose/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604201926.k3KJQQvZ024366@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-nose/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24330/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-nose


--- 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 Apr 20 19:26:48 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 20 Apr 2006 12:26:48 -0700
Subject: rpms/python-nose import.log,1.1,1.2
Message-ID: <200604201926.k3KJQowb024429@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-nose
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24396

Modified Files:
	import.log 
Log Message:
auto-import python-nose-0.8.7.2-1 on branch devel from python-nose-0.8.7.2-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-nose/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	20 Apr 2006 19:26:23 -0000	1.1
+++ import.log	20 Apr 2006 19:26:48 -0000	1.2
@@ -0,0 +1 @@
+python-nose-0_8_7_2-1:HEAD:python-nose-0.8.7.2-1.src.rpm:1145561554



From fedora-extras-commits at redhat.com  Thu Apr 20 19:26:49 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 20 Apr 2006 12:26:49 -0700
Subject: rpms/python-nose/devel python-nose.spec, NONE, 1.1 .cvsignore, 1.1, 
	1.2 sources, 1.1, 1.2
Message-ID: <200604201926.k3KJQp1c024434@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-nose/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24396/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-nose.spec 
Log Message:
auto-import python-nose-0.8.7.2-1 on branch devel from python-nose-0.8.7.2-1.src.rpm


--- NEW FILE python-nose.spec ---
%{!?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:           python-nose
Version:        0.8.7.2
Release:        1%{?dist}
Summary:        A discovery-based unittest extension for Python

Group:          Development/Languages
License:        LGPL
URL:            http://somethingaboutorange.com/mrl/projects/nose/
Source0:        http://somethingaboutorange.com/mrl/projects/nose/nose-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-setuptools >= 0.6a9
Requires:       python-abi = %{pyver}

%description
nose: a discovery-based unittest extension.

nose provides an alternate test discovery and running process for unittest,
one that is intended to mimic the behavior of py.test as much as is
reasonably possible without resorting to too much magic.

%prep
%setup -q -n nose-%{version}

%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT --single-version-externally-managed
 
%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS CHANGELOG lgpl.txt NEWS README.txt
%{_bindir}/nosetests
%{python_sitelib}/nose-%{version}-py%{pyver}.egg-info
%{python_sitelib}/nose

%changelog
* Wed Apr 19 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.8.7.2-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-nose/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Apr 2006 19:26:24 -0000	1.1
+++ .cvsignore	20 Apr 2006 19:26:49 -0000	1.2
@@ -0,0 +1 @@
+nose-0.8.7.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-nose/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Apr 2006 19:26:24 -0000	1.1
+++ sources	20 Apr 2006 19:26:49 -0000	1.2
@@ -0,0 +1 @@
+400cf55994cfec7772292319f7cd195d  nose-0.8.7.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 20 19:35:28 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Thu, 20 Apr 2006 12:35:28 -0700
Subject: rpms/emacs-auctex/FC-5 emacs-auctex.spec,1.7,1.8
Message-ID: <200604201935.k3KJZUox024574@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/emacs-auctex/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24528/FC-5

Modified Files:
	emacs-auctex.spec 
Log Message:
fix startup file per bug# 189488



Index: emacs-auctex.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-auctex/FC-5/emacs-auctex.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- emacs-auctex.spec	9 Apr 2006 19:13:58 -0000	1.7
+++ emacs-auctex.spec	20 Apr 2006 19:35:28 -0000	1.8
@@ -4,7 +4,7 @@
 Summary: 	Enhanced TeX modes for Emacsen
 Name: 		emacs-auctex
 Version: 	11.82
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 License: 	GPL
 Group: 		Applications/Editors
 URL: 		http://www.gnu.org/software/auctex/
@@ -55,7 +55,7 @@
 echo "; Autoactivation of AUCTeX" > %{buildroot}%{startupfile}
 echo "; Created for %{name}-%{version}-%{release}.noarch.rpm" >> \
   %{buildroot}%{startupfile}
-echo "(require 'tex-site)" >> %{buildroot}%{startupfile}
+echo '(load "auctex.el" nil t t)' >> %{buildroot}%{startupfile}
 
 rm -rf %{buildroot}%{_var}
 rm -f %{buildroot}%{_datadir}/emacs/site-lisp/auctex/style/.nosearch
@@ -88,6 +88,9 @@
 %{_datadir}/emacs/site-lisp/tex-site.el
 
 %changelog
+* Thu Apr 20 2006 Ed Hill <ed at eh3.com> - 11.82-3
+- fix startup file per bug# 189488
+
 * Sun Apr  9 2006 Ed Hill <ed at eh3.com> - 11.82-2
 - rebuild
 



From fedora-extras-commits at redhat.com  Thu Apr 20 19:35:29 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Thu, 20 Apr 2006 12:35:29 -0700
Subject: rpms/emacs-auctex/devel emacs-auctex.spec,1.7,1.8
Message-ID: <200604201935.k3KJZVFq024578@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/emacs-auctex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24528/devel

Modified Files:
	emacs-auctex.spec 
Log Message:
fix startup file per bug# 189488



Index: emacs-auctex.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-auctex/devel/emacs-auctex.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- emacs-auctex.spec	9 Apr 2006 19:13:59 -0000	1.7
+++ emacs-auctex.spec	20 Apr 2006 19:35:29 -0000	1.8
@@ -4,7 +4,7 @@
 Summary: 	Enhanced TeX modes for Emacsen
 Name: 		emacs-auctex
 Version: 	11.82
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 License: 	GPL
 Group: 		Applications/Editors
 URL: 		http://www.gnu.org/software/auctex/
@@ -55,7 +55,7 @@
 echo "; Autoactivation of AUCTeX" > %{buildroot}%{startupfile}
 echo "; Created for %{name}-%{version}-%{release}.noarch.rpm" >> \
   %{buildroot}%{startupfile}
-echo "(require 'tex-site)" >> %{buildroot}%{startupfile}
+echo '(load "auctex.el" nil t t)' >> %{buildroot}%{startupfile}
 
 rm -rf %{buildroot}%{_var}
 rm -f %{buildroot}%{_datadir}/emacs/site-lisp/auctex/style/.nosearch
@@ -88,6 +88,9 @@
 %{_datadir}/emacs/site-lisp/tex-site.el
 
 %changelog
+* Thu Apr 20 2006 Ed Hill <ed at eh3.com> - 11.82-3
+- fix startup file per bug# 189488
+
 * Sun Apr  9 2006 Ed Hill <ed at eh3.com> - 11.82-2
 - rebuild
 



From fedora-extras-commits at redhat.com  Thu Apr 20 19:35:27 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Thu, 20 Apr 2006 12:35:27 -0700
Subject: rpms/emacs-auctex/FC-4 emacs-auctex.spec,1.5,1.6
Message-ID: <200604201935.k3KJZxUj024581@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/emacs-auctex/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24528/FC-4

Modified Files:
	emacs-auctex.spec 
Log Message:
fix startup file per bug# 189488



Index: emacs-auctex.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-auctex/FC-4/emacs-auctex.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- emacs-auctex.spec	9 Apr 2006 19:04:14 -0000	1.5
+++ emacs-auctex.spec	20 Apr 2006 19:35:27 -0000	1.6
@@ -4,7 +4,7 @@
 Summary: 	Enhanced TeX modes for Emacsen
 Name: 		emacs-auctex
 Version: 	11.82
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License: 	GPL
 Group: 		Applications/Editors
 URL: 		http://www.gnu.org/software/auctex/
@@ -55,7 +55,7 @@
 echo "; Autoactivation of AUCTeX" > %{buildroot}%{startupfile}
 echo "; Created for %{name}-%{version}-%{release}.noarch.rpm" >> \
   %{buildroot}%{startupfile}
-echo "(require 'tex-site)" >> %{buildroot}%{startupfile}
+echo '(load "auctex.el" nil t t)' >> %{buildroot}%{startupfile}
 
 rm -rf %{buildroot}%{_var}
 rm -f %{buildroot}%{_datadir}/emacs/site-lisp/auctex/style/.nosearch
@@ -88,6 +88,9 @@
 %{_datadir}/emacs/site-lisp/tex-site.el
 
 %changelog
+* Thu Apr 20 2006 Ed Hill <ed at eh3.com> - 11.82-2
+- fix startup file per bug# 189488
+
 * Sun Apr  9 2006 Ed Hill <ed at eh3.com> - 11.82-1
 - update to 11.82
 



From fedora-extras-commits at redhat.com  Thu Apr 20 21:01:23 2006
From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom))
Date: Thu, 20 Apr 2006 14:01:23 -0700
Subject: devel/rrdtool .cvsignore, 1.4, 1.5 rrdtool.spec, 1.10, 1.11 sources,
	1.4, 1.5
Message-ID: <200604202101.k3KL1uoZ029168@cvs-int.fedora.redhat.com>

Author: kaboom

Update of /cvs/extras/devel/rrdtool
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29135

Modified Files:
	.cvsignore rrdtool.spec sources 
Log Message:
update to 1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/rrdtool/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Nov 2004 02:50:26 -0000	1.4
+++ .cvsignore	20 Apr 2006 21:01:23 -0000	1.5
@@ -1 +0,0 @@
-rrdtool-1.0.49.tar.gz


Index: rrdtool.spec
===================================================================
RCS file: /cvs/extras/devel/rrdtool/rrdtool.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rrdtool.spec	20 May 2005 15:49:47 -0000	1.10
+++ rrdtool.spec	20 Apr 2006 21:01:23 -0000	1.11
@@ -1,18 +1,17 @@
-%define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4)
-
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
-Version: 1.0.49
-Release: 5%{?dist}
+Version: 1.2.12
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Databases
 URL: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/
 Source: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-1.0.x/rrdtool-%{version}.tar.gz
-Patch0: rrdtool-1.0.49-php_config.patch
-Patch1: rrdtool-1.0.49-fc4.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gcc-c++, php-devel >= 4.0, openssl-devel
-BuildRequires: libpng-devel, zlib-devel
+BuildRequires: gcc-c++ openssl-devel
+BuildRequires: libpng-devel, zlib-devel, libart_lgpl-devel
+BuildRequires: freetype-devel, python-devel
+
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %description
 RRD is the Acronym for Round Robin Database. RRD is a system to store and
@@ -23,7 +22,6 @@
 scripts (from shell or Perl) or via frontends that poll network devices and
 put a friendly user interface on it.
 
-
 %package devel
 Summary: RRDtool static libraries and header files
 Group: Development/Libraries
@@ -34,46 +32,22 @@
 display time-series data (i.e. network bandwidth, machine-room temperature,
 server load average). This package allow you to use directly this library.
 
-
-%package -n php-rrdtool
-Summary: RRDtool module for PHP
-Group: Development/Languages
-Requires: %{name} = %{version}, php >= 4.0
-
-%description -n php-rrdtool
-The php-%{name} package includes a dynamic shared object (DSO) that adds
-RRDtool bindings to the PHP HTML-embedded scripting language.
-
-
 %prep
 %setup
-%patch0 -p0 -b .phpfix
-%patch1 -p1 -b .fc4
 
 # Fixes to /usr/lib(64) for x86_64
 %{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g' \
-    configure contrib/php4/configure Makefile.in
-
+    configure Makefile.in
 
 %build
 %configure \
     --program-prefix="%{?_program_prefix}" \
     --enable-shared \
-    --enable-local-libpng \
-    --enable-local-zlib \
-    --with-pic
+    --with-pic \
+    --enable-perl-site-install \
+    --with-perl-options='INSTALLDIRS="vendor"'
 %{__make} %{?_smp_mflags}
 
-# Build the php4 module, the tmp install is required
-%define rrdtmpdir %{_tmppath}/%{buildsubdir}-tmpinstall
-%{__make} install DESTDIR="%{rrdtmpdir}"
-pushd contrib/php4
-    ./configure \
-        --with-rrdtool="%{rrdtmpdir}%{_prefix}"
-    %{__make} %{?_smp_mflags}
-popd
-%{__rm} -rf %{rrdtmpdir}
-
 # Fix @perl@ and @PERL@
 find examples/ -type f \
     -exec %{__perl} -pi -e 's|^#! \@perl\@|#!%{__perl}|gi' {} \;
@@ -82,73 +56,52 @@
 
 
 %install
-%{__rm} -rf %{buildroot}
-%makeinstall
-
-# Install the php4 module
-%{__install} -D -m0755 contrib/php4/modules/rrdtool.so \
-    %{buildroot}%{php_extdir}/rrdtool.so
-# Clean up the examples for inclusion as docs
-%{__rm} -rf contrib/php4/examples/CVS
-# Put the php config bit into place
-%{__mkdir_p} %{buildroot}%{_sysconfdir}/php.d
-%{__cat} > %{buildroot}%{_sysconfdir}/php.d/rrdtool.ini << EOF
-; Enable rrdtool extension module
-extension=rrdtool.so
-EOF
-
-# Put perl files back where they belong
-%{__mkdir_p} %{buildroot}%{perl_vendorarch}/
-%{__mv} %{buildroot}%{_libdir}/perl/* %{buildroot}%{perl_vendorarch}/
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR="$RPM_BUILD_ROOT" install
 
 # We only want .txt and .html files for the main documentation
 %{__mkdir_p} doc2/doc
 %{__cp} -a doc/*.txt doc/*.html doc2/doc/
 
 # Clean up the examples and contrib
-%{__rm} -f examples/Makefile*
-%{__rm} -f contrib/Makefile*
+%{__rm} -f examples/Makefile* examples/*.in
+
 # This is so rpm doesn't pick up perl module dependencies automatically
-find examples/ contrib/ -type f -exec chmod 0644 {} \;
+find examples/ -type f -exec chmod 0644 {} \;
 
 # Clean up the buildroot
-%{__rm} -rf %{buildroot}%{_prefix}/{contrib,doc,examples,html}/
-
+%{__rm} -rf %{buildroot}%{_prefix}/{doc,examples,html}/ \
+	%{buildroot}%{perl_vendorarch}/ntmake.pl \
+	%{buildroot}%{perl_archlib}/perllocal.pod \
 
 %clean
 %{__rm} -rf %{buildroot}
 
-
 %files
 %defattr(-, root, root, 0755)
-%doc CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO doc2/doc
+%doc CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO NEWS THREADS doc2/doc
 %{_bindir}/*
 %{_libdir}/*.so.*
+%{_datadir}/rrdtool/
+%{perl_vendorlib}/*.pm
 %{perl_vendorarch}/*.pm
 %{perl_vendorarch}/auto/*
+%{python_sitelib}/rrdtoolmodule.so
 %{_mandir}/man1/*
-
+%{_mandir}/man3/*
 
 %files devel
 %defattr(-, root, root, 0755)
 %doc examples/
-%doc contrib/add_ds contrib/killspike contrib/log2rrd contrib/rrdexplorer
-%doc contrib/rrdfetchnames contrib/rrd-file-icon contrib/rrdlastds
-%doc contrib/rrdproc contrib/rrdview contrib/snmpstats contrib/trytime
 %{_includedir}/*.h
 %{_libdir}/*.a
 %exclude %{_libdir}/*.la
 %{_libdir}/*.so
 
-
-%files -n php-rrdtool
-%defattr(-, root, root)
-%doc contrib/php4/examples contrib/php4/README
-%config(noreplace) %{_sysconfdir}/php.d/rrdtool.ini
-%{php_extdir}/rrdtool.so
-
-
 %changelog
+* Wed Apr 19 2006 Chris Ricker <kaboom at oobleck.net> 1.2.12-1
+- Rev to 1.2
+
 * Fri May 20 2005 Matthias Saou <http://freshrpms.net/> 1.0.49-5
 - Include patch from Michael to fix perl module compilation on FC4 (#156242).
 


Index: sources
===================================================================
RCS file: /cvs/extras/devel/rrdtool/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Nov 2004 02:50:26 -0000	1.4
+++ sources	20 Apr 2006 21:01:23 -0000	1.5
@@ -1 +0,0 @@
-fbe492dbf3d68abb1d86c2322e7ed44a  rrdtool-1.0.49.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 20 21:08:09 2006
From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom))
Date: Thu, 20 Apr 2006 14:08:09 -0700
Subject: devel/rrdtool .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <200604202108.k3KL8B4m029263@cvs-int.fedora.redhat.com>

Author: kaboom

Update of /cvs/extras/devel/rrdtool
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29242

Modified Files:
	.cvsignore sources 
Log Message:
stupid expired cert!



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/rrdtool/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Apr 2006 21:01:23 -0000	1.5
+++ .cvsignore	20 Apr 2006 21:08:08 -0000	1.6
@@ -0,0 +1 @@
+rrdtool-1.2.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/devel/rrdtool/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Apr 2006 21:01:23 -0000	1.5
+++ sources	20 Apr 2006 21:08:08 -0000	1.6
@@ -0,0 +1 @@
+7b544c38a818cbebcf06fe39b9f52d0d  rrdtool-1.2.12.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 20 22:12:39 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 20 Apr 2006 15:12:39 -0700
Subject: rpms/hdf/FC-5 hdf.spec,1.8,1.9
Message-ID: <200604202212.k3KMCfeB000521@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/hdf/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv504

Modified Files:
	hdf.spec 
Log Message:
Add Requires netcdf-devel for hdf-devel (bug #189337)



Index: hdf.spec
===================================================================
RCS file: /cvs/extras/rpms/hdf/FC-5/hdf.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- hdf.spec	13 Feb 2006 18:53:08 -0000	1.8
+++ hdf.spec	20 Apr 2006 22:12:38 -0000	1.9
@@ -1,6 +1,6 @@
 Name: hdf
 Version: 4.2r1
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD-ish
 Group: System Environment/Libraries
@@ -26,7 +26,7 @@
 Summary: HDF development files
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: libjpeg-devel zlib-devel
+Requires: libjpeg-devel zlib-devel netcdf-devel
 
 %description devel
 HDF development headers and libraries.
@@ -74,6 +74,9 @@
 %{_libdir}/%{name}/
 
 %changelog
+* Thu Apr 20 2006 Orion Poplawski <orion at cora.nwra.com> 4.2r1-10
+- Add Requires netcdf-devel for hdf-devel (bug #189337)
+
 * Mon Feb 13 2006 Orion Poplawski <orion at cora.nwra.com> 4.2r1-9
 - Rebuild for gcc/glibc changes
 



From fedora-extras-commits at redhat.com  Thu Apr 20 22:14:07 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 20 Apr 2006 15:14:07 -0700
Subject: rpms/hdf/FC-4 hdf.spec,1.6,1.7
Message-ID: <200604202214.k3KME9Td000579@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/hdf/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv562

Modified Files:
	hdf.spec 
Log Message:
Add Requires netcdf-devel for hdf-devel (bug #189337)



Index: hdf.spec
===================================================================
RCS file: /cvs/extras/rpms/hdf/FC-4/hdf.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- hdf.spec	20 Feb 2006 16:09:35 -0000	1.6
+++ hdf.spec	20 Apr 2006 22:14:07 -0000	1.7
@@ -1,6 +1,6 @@
 Name: hdf
 Version: 4.2r1
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD-ish
 Group: System Environment/Libraries
@@ -26,7 +26,7 @@
 Summary: HDF development files
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: libjpeg-devel zlib-devel
+Requires: libjpeg-devel zlib-devel netcdf-devel
 
 %description devel
 HDF development headers and libraries.
@@ -74,6 +74,9 @@
 %{_libdir}/%{name}/
 
 %changelog
+* Thu Apr 20 2006 Orion Poplawski <orion at cora.nwra.com> 4.2r1-7
+- Add Requires netcdf-devel for hdf-devel (bug #189337)
+
 * Mon Feb 20 2006 Orion Poplawski <orion at cora.nwra.com> 4.2r1-6
 - Compile with -DHAVE_NETCDF for gdl hdf/netcdf compatibility
 - Add patch to build on ppc



From fedora-extras-commits at redhat.com  Thu Apr 20 22:16:26 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 20 Apr 2006 15:16:26 -0700
Subject: rpms/hdf/FC-3 hdf.spec,1.10,1.11
Message-ID: <200604202216.k3KMGSpS000604@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/hdf/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv587

Modified Files:
	hdf.spec 
Log Message:
Add Requires netcdf-devel for hdf-devel (bug #189337)



Index: hdf.spec
===================================================================
RCS file: /cvs/extras/rpms/hdf/FC-3/hdf.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- hdf.spec	24 Feb 2006 23:51:25 -0000	1.10
+++ hdf.spec	20 Apr 2006 22:16:26 -0000	1.11
@@ -1,6 +1,6 @@
 Name: hdf
 Version: 4.2r1
-Release: 6%{?dist}.2
+Release: 7%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD-ish
 Group: System Environment/Libraries
@@ -26,7 +26,7 @@
 Summary: HDF development files
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: libjpeg-devel zlib-devel
+Requires: libjpeg-devel zlib-devel netcdf-devel
 
 %description devel
 HDF development headers and libraries.
@@ -74,6 +74,9 @@
 %{_libdir}/%{name}/
 
 %changelog
+* Thu Apr 20 2006 Orion Poplawski <orion at cora.nwra.com>  4.2r1-7
+- Add Requires netcdf-devel for hdf-devel (bug #189337)
+
 * Fri Feb 24 2006 Patrice Dumas <pertusus at free.fr> 4.2r1-6.2
 - use gcc-g77 instead of gcc-gfortran
 - sync with FC-4 spec file instead of devel



From fedora-extras-commits at redhat.com  Thu Apr 20 22:17:12 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 20 Apr 2006 15:17:12 -0700
Subject: rpms/hdf/devel hdf.spec,1.8,1.9
Message-ID: <200604202217.k3KMHEZv000663@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/hdf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv646

Modified Files:
	hdf.spec 
Log Message:
Add Requires netcdf-devel for hdf-devel (bug #189337)



Index: hdf.spec
===================================================================
RCS file: /cvs/extras/rpms/hdf/devel/hdf.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- hdf.spec	13 Feb 2006 18:53:08 -0000	1.8
+++ hdf.spec	20 Apr 2006 22:17:12 -0000	1.9
@@ -1,6 +1,6 @@
 Name: hdf
 Version: 4.2r1
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD-ish
 Group: System Environment/Libraries
@@ -26,7 +26,7 @@
 Summary: HDF development files
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: libjpeg-devel zlib-devel
+Requires: libjpeg-devel zlib-devel netcdf-devel
 
 %description devel
 HDF development headers and libraries.
@@ -74,6 +74,9 @@
 %{_libdir}/%{name}/
 
 %changelog
+* Thu Apr 20 2006 Orion Poplawski <orion at cora.nwra.com> 4.2r1-10
+- Add Requires netcdf-devel for hdf-devel (bug #189337)
+
 * Mon Feb 13 2006 Orion Poplawski <orion at cora.nwra.com> 4.2r1-9
 - Rebuild for gcc/glibc changes
 



From fedora-extras-commits at redhat.com  Thu Apr 20 23:29:04 2006
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 20 Apr 2006 16:29:04 -0700
Subject: rpms/pcb/devel pcb.spec,NONE,1.1
Message-ID: <200604202329.k3KNT6EM003234@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/pcb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3214

Added Files:
	pcb.spec 
Log Message:
add a spec file.  wheeee.



--- NEW FILE pcb.spec ---
Summary:	An interactive printed circuit board editor
Name:		pcb
%define		pcbver 20060414
Version:	0.%{pcbver}
Release:	1
License:	GPL
Group:		Applications/Engineering
URL:		http://pcb.sourceforge.net
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	tcl, bison, flex, gawk, netpbm-progs, ImageMagick
BuildRequires:	m4, gtk2-devel, pkgconfig, glib2-devel, gd-devel
BuildRequires:	libpng-devel, libjpeg-devel, fontconfig-devel, freetype-devel
BuildRequires:	zlib-devel, cups, tetex-latex, libICE-devel
Source0:	http://prdownloads.sourceforge.net/pcb/pcb-%{pcbver}.tar.gz

%description
PCB is an interactive printed circuit board editor for the X window system.
PCB includes a rats nest feature, design rule checking, and can provide
industry standard RS-274-X (Gerber), NC drill, and centroid data (X-Y data)
output for use in the board fabrication and assembly process. PCB offers
high end features such as an autorouter and trace optimizer which can
tremendously reduce layout time. 

%prep
%setup -q -n pcb-%{pcbver}

%build
CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} --bindir=%{_bindir} \
	--datadir=%{_datadir} --includedir=%{_includedir} \
	--libdir=%{_libdir} --mandir=%{_mandir} --sysconfdir=%{_sysconfdir} \
	--infodir=%{_infodir}

make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make DESTDIR=$RPM_BUILD_ROOT install
rm $RPM_BUILD_ROOT/%{_datadir}/pcb/tools/gerbertotk.c
chmod 0755 $RPM_BUILD_ROOT/%{_datadir}/pcb/tools/{PCB2HPGL,Merge*,tgo2pcb.tcl}

%clean
rm -rf %{buildroot}

%post
/sbin/install-info --quiet --info-dir=%{_infodir} %{_infodir}/pcb.info.gz >/dev/null 2>&1

%preun
if [ $1 = 0 ]; then
  /sbin/install-info --quiet --info-dir=%{_infodir} --delete %{_infodir}/pcb.info.gz >/dev/null 2>&1
fi

%files
%defattr(-, root, root)
%doc AUTHORS COPYING README README.* NEWS ChangeLog
%{_mandir}/man1/*
%{_datadir}/pcb*
%{_bindir}/*
%{_infodir}/*

%changelog
* Wed Apr 19 2006 <pjones at redhat.com> - 0.20060414-1
- Let there be pcb packaging.



From fedora-extras-commits at redhat.com  Thu Apr 20 23:45:16 2006
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 20 Apr 2006 16:45:16 -0700
Subject: rpms/pcb/devel .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <200604202345.k3KNjIIC003876@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/pcb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3855

Modified Files:
	.cvsignore sources 
Log Message:
- add the tarball



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pcb/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Apr 2006 13:16:17 -0000	1.1
+++ .cvsignore	20 Apr 2006 23:45:16 -0000	1.2
@@ -0,0 +1 @@
+pcb-20060414.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pcb/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Apr 2006 13:16:17 -0000	1.1
+++ sources	20 Apr 2006 23:45:16 -0000	1.2
@@ -0,0 +1 @@
+5e471a7b80f1b5ebf21be22c9b7a2e8e  pcb-20060414.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 20 23:58:11 2006
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 20 Apr 2006 16:58:11 -0700
Subject: rpms/pcb/devel pcb.desktop,NONE,1.1 pcb.spec,1.1,1.2
Message-ID: <200604202358.k3KNwDY4003969@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/pcb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3947

Modified Files:
	pcb.spec 
Added Files:
	pcb.desktop 
Log Message:
- add desktop file



--- NEW FILE pcb.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=PCB
GenericName=PCB
Exec=pcb
Terminal=false
Type=Application
Categories=Application;Electronics;
Version=0.20060414


Index: pcb.spec
===================================================================
RCS file: /cvs/extras/rpms/pcb/devel/pcb.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pcb.spec	20 Apr 2006 23:29:04 -0000	1.1
+++ pcb.spec	20 Apr 2006 23:58:11 -0000	1.2
@@ -10,8 +10,9 @@
 BuildRequires:	tcl, bison, flex, gawk, netpbm-progs, ImageMagick
 BuildRequires:	m4, gtk2-devel, pkgconfig, glib2-devel, gd-devel
 BuildRequires:	libpng-devel, libjpeg-devel, fontconfig-devel, freetype-devel
-BuildRequires:	zlib-devel, cups, tetex-latex, libICE-devel
+BuildRequires:	zlib-devel, cups, tetex-latex, libICE-devel, desktop-file-utils
 Source0:	http://prdownloads.sourceforge.net/pcb/pcb-%{pcbver}.tar.gz
+Source1:	pcb.desktop
 
 %description
 PCB is an interactive printed circuit board editor for the X window system.
@@ -37,6 +38,10 @@
 make DESTDIR=$RPM_BUILD_ROOT install
 rm $RPM_BUILD_ROOT/%{_datadir}/pcb/tools/gerbertotk.c
 chmod 0755 $RPM_BUILD_ROOT/%{_datadir}/pcb/tools/{PCB2HPGL,Merge*,tgo2pcb.tcl}
+desktop-file-install --vendor fedora \
+	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
+	--add-category X-Fedora \
+	%{SOURCE1}
 
 %clean
 rm -rf %{buildroot}



From fedora-extras-commits at redhat.com  Fri Apr 21 00:02:02 2006
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 20 Apr 2006 17:02:02 -0700
Subject: rpms/pcb/devel pcb.spec,1.2,1.3
Message-ID: <200604210002.k3L02a79006015@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/pcb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5998

Modified Files:
	pcb.spec 
Log Message:
- add to the files section too



Index: pcb.spec
===================================================================
RCS file: /cvs/extras/rpms/pcb/devel/pcb.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pcb.spec	20 Apr 2006 23:58:11 -0000	1.2
+++ pcb.spec	21 Apr 2006 00:02:01 -0000	1.3
@@ -59,6 +59,7 @@
 %doc AUTHORS COPYING README README.* NEWS ChangeLog
 %{_mandir}/man1/*
 %{_datadir}/pcb*
+%{_datadir}/applications/fedora-pcb.desktop
 %{_bindir}/*
 %{_infodir}/*
 



From fedora-extras-commits at redhat.com  Fri Apr 21 00:10:30 2006
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 20 Apr 2006 17:10:30 -0700
Subject: rpms/pcb/devel pcb.spec,1.3,1.4
Message-ID: <200604210010.k3L0AWmB006098@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/pcb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6076

Modified Files:
	pcb.spec 
Log Message:
- remove extra buildrequires



Index: pcb.spec
===================================================================
RCS file: /cvs/extras/rpms/pcb/devel/pcb.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pcb.spec	21 Apr 2006 00:02:01 -0000	1.3
+++ pcb.spec	21 Apr 2006 00:10:30 -0000	1.4
@@ -7,10 +7,9 @@
 Group:		Applications/Engineering
 URL:		http://pcb.sourceforge.net
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	tcl, bison, flex, gawk, netpbm-progs, ImageMagick
-BuildRequires:	m4, gtk2-devel, pkgconfig, glib2-devel, gd-devel
-BuildRequires:	libpng-devel, libjpeg-devel, fontconfig-devel, freetype-devel
-BuildRequires:	zlib-devel, cups, tetex-latex, libICE-devel, desktop-file-utils
+BuildRequires:	tcl, bison, flex, gawk, ImageMagick, gtk2-devel, gd-devel
+BuildRequires:	libjpeg-devel, fontconfig-devel
+BuildRequires:	cups, tetex-latex, libICE-devel, desktop-file-utils
 Source0:	http://prdownloads.sourceforge.net/pcb/pcb-%{pcbver}.tar.gz
 Source1:	pcb.desktop
 



From fedora-extras-commits at redhat.com  Fri Apr 21 00:18:09 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Thu, 20 Apr 2006 17:18:09 -0700
Subject: rpms/pygame - New directory
Message-ID: <200604210018.k3L0IBsN006319@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6296/pygame

Log Message:
Directory /cvs/extras/rpms/pygame added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 00:18:10 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Thu, 20 Apr 2006 17:18:10 -0700
Subject: rpms/pygame/devel - New directory
Message-ID: <200604210018.k3L0IC6G006322@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6296/pygame/devel

Log Message:
Directory /cvs/extras/rpms/pygame/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 00:18:29 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Thu, 20 Apr 2006 17:18:29 -0700
Subject: rpms/pygame Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604210018.k3L0IVYP006393@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6361

Added Files:
	Makefile import.log 
Log Message:
Setup of module pygame


--- NEW FILE Makefile ---
# Top level Makefile for module pygame
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 21 00:18:30 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Thu, 20 Apr 2006 17:18:30 -0700
Subject: rpms/pygame/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604210018.k3L0IW0w006396@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6361/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pygame


--- 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 Apr 21 00:19:40 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Thu, 20 Apr 2006 17:19:40 -0700
Subject: rpms/pygame import.log,1.1,1.2
Message-ID: <200604210019.k3L0JgWa006563@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6525

Modified Files:
	import.log 
Log Message:
auto-import pygame-1.7.1-2 on branch devel from pygame-1.7.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pygame/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Apr 2006 00:18:29 -0000	1.1
+++ import.log	21 Apr 2006 00:19:40 -0000	1.2
@@ -0,0 +1 @@
+pygame-1_7_1-2:HEAD:pygame-1.7.1-2.src.rpm:1145578769



From fedora-extras-commits at redhat.com  Fri Apr 21 00:19:41 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Thu, 20 Apr 2006 17:19:41 -0700
Subject: rpms/pygame/devel pygame-1.7.1-64bit.patch, NONE,
	1.1 pygame-1.7.1-config.patch, NONE, 1.1 pygame.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604210019.k3L0JhEZ006574@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6525/devel

Modified Files:
	.cvsignore sources 
Added Files:
	pygame-1.7.1-64bit.patch pygame-1.7.1-config.patch pygame.spec 
Log Message:
auto-import pygame-1.7.1-2 on branch devel from pygame-1.7.1-2.src.rpm

pygame-1.7.1-64bit.patch:

--- NEW FILE pygame-1.7.1-64bit.patch ---
--- src/mixer.c.orig	2005-08-10 23:14:27.000000000 -0700
+++ src/mixer.c	2006-04-20 14:16:28.000000000 -0700
@@ -81,7 +81,7 @@
 	    channeldata[channel].queue = NULL;
 	    channelnum = Mix_PlayChannelTimed(channel, sound, 0, -1);
 	    if(channelnum != -1)
-	    	Mix_GroupChannel(channelnum, (int)sound);
+	    	Mix_GroupChannel(channelnum, (intptr_t)sound);
 	}
 	else
 	{
@@ -354,7 +354,7 @@
 	//make sure volume on this arbitrary channel is set to full
 	Mix_Volume(channelnum, 128);
 
-	Mix_GroupChannel(channelnum, (int)chunk);
+	Mix_GroupChannel(channelnum, (intptr_t)chunk);
 	return PyChannel_New(channelnum);
 }
 
@@ -378,7 +378,7 @@
 
 	MIXER_INIT_CHECK();
 
-	return PyInt_FromLong(Mix_GroupCount((int)chunk));
+	return PyInt_FromLong(Mix_GroupCount((intptr_t)chunk));
 }
 
 
@@ -440,7 +440,7 @@
 
 	MIXER_INIT_CHECK();
 
-	Mix_FadeOutGroup((int)chunk, time);
+	Mix_FadeOutGroup((intptr_t)chunk, time);
 	RETURN_NONE
 }
 
@@ -460,7 +460,7 @@
 
 	MIXER_INIT_CHECK();
 
-	Mix_HaltGroup((int)chunk);
+	Mix_HaltGroup((intptr_t)chunk);
 	RETURN_NONE
 }
 
@@ -661,7 +661,7 @@
 
 	channelnum = Mix_PlayChannelTimed(channelnum, chunk, loops, playtime);
 	if(channelnum != -1)
-		Mix_GroupChannel(channelnum, (int)chunk);
+		Mix_GroupChannel(channelnum, (intptr_t)chunk);
 
         Py_XDECREF(channeldata[channelnum].sound);
 	Py_XDECREF(channeldata[channelnum].queue);
@@ -705,7 +705,7 @@
 	{
 	    channelnum = Mix_PlayChannelTimed(channelnum, chunk, 0, -1);
 	    if(channelnum != -1)
-		    Mix_GroupChannel(channelnum, (int)chunk);
+		    Mix_GroupChannel(channelnum, (intptr_t)chunk);
 
             channeldata[channelnum].sound = sound;
             Py_INCREF(sound);
--- src/overlay.c.org	2005-08-09 19:45:15.000000000 -0700
+++ src/overlay.c	2006-04-20 14:16:28.000000000 -0700
@@ -85,7 +85,7 @@
 {
 	// Parse data params for frame
 	int ls_y, ls_u, ls_v, y;
-	unsigned char *dst_y, *dst_u, *dst_v, *src_y, *src_u, *src_v;
+	void *dst_y, *dst_u, *dst_v, *src_y, *src_u, *src_v;
 	if(!PyArg_ParseTuple(args, "(s#s#s#)", &src_y, &ls_y, &src_u, &ls_u, &src_v, &ls_v))
 		return NULL;
 
@@ -94,9 +94,9 @@
 		SDL_LockYUVOverlay( self->cOverlay );
 
 		// No clipping at this time( only support for YUV420 )
-		dst_y = (char*)self->cOverlay->pixels[ 0 ];
-		dst_v = (char*)self->cOverlay->pixels[ 1 ];
-		dst_u = (char*)self->cOverlay->pixels[ 2 ];
+		dst_y = (void*)self->cOverlay->pixels[ 0 ];
+		dst_v = (void*)self->cOverlay->pixels[ 1 ];
+		dst_u = (void*)self->cOverlay->pixels[ 2 ];
 		for (y=0; y< self->cOverlay->h; y++)
 		{
 			memcpy( dst_y, src_y, self->cOverlay->w );
--- src/time.c.org	2004-07-22 17:33:08.000000000 -0700
+++ src/time.c	2006-04-20 14:24:43.000000000 -0700
@@ -34,7 +34,7 @@
 	{
 		SDL_Event event;
 		memset(&event, 0, sizeof(event));
-		event.type = (int)param;
+		event.type = (intptr_t)param;
 		SDL_PushEvent(&event);
 	}
 	return interval;
@@ -193,7 +193,8 @@
 static PyObject* time_set_timer(PyObject* self, PyObject* arg)
 {
 	SDL_TimerID newtimer;
-	int ticks = 0, event = SDL_NOEVENT;
+	int ticks = 0;
+	intptr_t event = SDL_NOEVENT;
 	if(!PyArg_ParseTuple(arg, "ii", &event, &ticks))
 		return NULL;
 
--- src/surface.c.orig	2005-02-05 16:03:07.000000000 -0800
+++ src/surface.c	2006-04-20 15:01:07.000000000 -0700
@@ -35,7 +35,7 @@
                         SDL_Surface *dst, SDL_Rect *dstrect);
 
 static PyObject* surface_new(PyTypeObject *type, PyObject *args, PyObject *kwds);
-static int surface_init(PySurfaceObject *self, PyObject *args, PyObject *kwds);
+static intptr_t surface_init(PySurfaceObject *self, PyObject *args, PyObject *kwds);
 
 
 /* surface object methods */
@@ -1880,7 +1880,7 @@
     return (PyObject *)self;
 }
 
-static int surface_init(PySurfaceObject *self, PyObject *args, PyObject *kwds)
+static intptr_t surface_init(PySurfaceObject *self, PyObject *args, PyObject *kwds)
 {
 	Uint32 flags = 0;
 	int width, height;
@@ -1904,19 +1904,19 @@
 	if(depth && masks) /*all info supplied, most errorchecking needed*/
 	{
 		if(PySurface_Check(depth))
-			return (int)RAISE(PyExc_ValueError, "cannot pass surface for depth and color masks");
+			return (intptr_t)RAISE(PyExc_ValueError, "cannot pass surface for depth and color masks");
 		if(!IntFromObj(depth, &bpp))
-			return (int)RAISE(PyExc_ValueError, "invalid bits per pixel depth argument");
+			return (intptr_t)RAISE(PyExc_ValueError, "invalid bits per pixel depth argument");
 		if(!PySequence_Check(masks) || PySequence_Length(masks)!=4)
-			return (int)RAISE(PyExc_ValueError, "masks argument must be sequence of four numbers");
+			return (intptr_t)RAISE(PyExc_ValueError, "masks argument must be sequence of four numbers");
 		if(!UintFromObjIndex(masks, 0, &Rmask) || !UintFromObjIndex(masks, 1, &Gmask) ||
 					!UintFromObjIndex(masks, 2, &Bmask) || !UintFromObjIndex(masks, 3, &Amask))
-			return (int)RAISE(PyExc_ValueError, "invalid mask values in masks sequence");
+			return (intptr_t)RAISE(PyExc_ValueError, "invalid mask values in masks sequence");
 	}
 	else if(depth && PyNumber_Check(depth))/*use default masks*/
 	{
 		if(!IntFromObj(depth, &bpp))
-			return (int)RAISE(PyExc_ValueError, "invalid bits per pixel depth argument");
+			return (intptr_t)RAISE(PyExc_ValueError, "invalid bits per pixel depth argument");
 		if(flags & SDL_SRCALPHA)
 		{
 			switch(bpp)
@@ -1926,7 +1926,7 @@
 			case 32:
 				Rmask = 0xFF<<16; Gmask = 0xFF<<8; Bmask = 0xFF; Amask = 0xFF<<24; break;
 			default:
-				return (int)RAISE(PyExc_ValueError, "no standard masks exist for given bitdepth with alpha");
+				return (intptr_t)RAISE(PyExc_ValueError, "no standard masks exist for given bitdepth with alpha");
 			}
 		}
 		else
@@ -1946,7 +1946,7 @@
 			case 32:
 				Rmask = 0xFF<<16; Gmask = 0xFF<<8; Bmask = 0xFF; break;
 			default:
-				return (int)RAISE(PyExc_ValueError, "nonstandard bit depth given");
+				return (intptr_t)RAISE(PyExc_ValueError, "nonstandard bit depth given");
 			}
 		}
 	}

pygame-1.7.1-config.patch:

--- NEW FILE pygame-1.7.1-config.patch ---
--- config_unix.py.orig	2006-04-18 12:39:02.000000000 -0700
+++ config_unix.py	2006-04-18 12:38:25.000000000 -0700
@@ -17,6 +17,7 @@
 
 
 def confirm(message):
+    return 1
     "ask a yes/no question, return result"
     reply = raw_input('\n' + message + ' [Y/n]:')
     if reply and string.lower(reply[0]) == 'n':


--- NEW FILE pygame.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           pygame
Version:        1.7.1
Release:        2%{?dist}
Summary:        Python modules for writing games
Group:          Development/Languages
License:        LGPL
URL:            http://www.pygame.org/
Patch0:         %{name}-%{version}-config.patch
Patch1:         %{name}-%{version}-64bit.patch
Source0:        http://pygame.org/ftp/%{name}-%{version}release.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  python-devel python-numeric
BuildRequires:  SDL_ttf-devel SDL_image-devel SDL_mixer-devel
Requires:       python-numeric

%description
Pygame is a set of Python modules designed for writing games. It is
written on top of the excellent SDL library. This allows you to create
fully featured games and multimedia programs in the python language.
Pygame is highly portable and runs on nearly every platform and
operating system.

%package devel
Summary:        Files needed for developing programs which use pygame
Group:          Development/Libraries
Requires:       %{name} == %{version}-%{release}

%description devel
This package contains headers required to build applications that use
pygame.

%prep
%setup -q -n %{name}-%{version}release
%patch0 -p0 -b .config
%patch1 -p0 -b .64bit

# rpmlint fixes
chmod -x src/ffmovie.h
rm -f examples/.#stars.py.1.7

%build
CFLAGS="%{optflags}" %{__python} setup.py build

%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}

%check
# base_test fails in mock, unable to find soundcard
PYTHONPATH="%{buildroot}%{python_sitearch}" %{__python} test/base_test.py || :
PYTHONPATH="%{buildroot}%{python_sitearch}" %{__python} test/image_test.py
PYTHONPATH="%{buildroot}%{python_sitearch}" %{__python} test/rect_test.py
 
%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc docs/ readme.txt WHATSNEW
%dir %{python_sitearch}/%{name}
%{python_sitearch}/%{name}/freesansbold.ttf
%{python_sitearch}/%{name}/pygame.ico
%{python_sitearch}/%{name}/pygame_icon.*
%{python_sitearch}/%{name}/*.so*
%{python_sitearch}/%{name}/*.py
%{python_sitearch}/%{name}/*.pyc
%ghost %{python_sitearch}/%{name}/*.pyo

%files devel
%defattr(-,root,root,-)
%doc examples/
%dir %{_includedir}/python*/%{name}
%{_includedir}/python*/%{name}/*.h

%changelog
* Thu Apr 20 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-2
- Added a patch to clean up some warnings on 64 bit compiles

* Tue Apr 18 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pygame/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2006 00:18:30 -0000	1.1
+++ .cvsignore	21 Apr 2006 00:19:40 -0000	1.2
@@ -0,0 +1 @@
+pygame-1.7.1release.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pygame/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2006 00:18:30 -0000	1.1
+++ sources	21 Apr 2006 00:19:40 -0000	1.2
@@ -0,0 +1 @@
+05d86d1af446f79411359400951053b7  pygame-1.7.1release.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 00:22:09 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Thu, 20 Apr 2006 17:22:09 -0700
Subject: owners owners.list,1.863,1.864
Message-ID: <200604210022.k3L0MB7j006661@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6644

Modified Files:
	owners.list 
Log Message:
Add pygame


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.863
retrieving revision 1.864
diff -u -r1.863 -r1.864
--- owners.list	19 Apr 2006 22:01:48 -0000	1.863
+++ owners.list	21 Apr 2006 00:22:09 -0000	1.864
@@ -1208,6 +1208,7 @@
 Fedora Extras|pychart|Python library for generating chart images|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|pydot|Python interface to Graphviz's Dot language|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|pyflowtools|Python bindings to OSU Flow-Tools library|i at stingr.net|extras-qa at fedoraproject.org|
+Fedora Extras|pygame|Python modules for writing games|tkmame at retrogames.com|extras-qa at fedoraproject.org|
 Fedora Extras|pygsl|GNU Scientific Library Interface for python|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|pylint|Analyzes Python code looking for bugs and signs of poor quality|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|pyparsing|An object-oriented approach to text processing|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Apr 21 00:38:35 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 20 Apr 2006 17:38:35 -0700
Subject: rpms/edje - New directory
Message-ID: <200604210038.k3L0cbpW006765@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/edje
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6739/edje

Log Message:
Directory /cvs/extras/rpms/edje added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 00:38:36 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 20 Apr 2006 17:38:36 -0700
Subject: rpms/edje/devel - New directory
Message-ID: <200604210038.k3L0ccw3006768@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/edje/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6739/edje/devel

Log Message:
Directory /cvs/extras/rpms/edje/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 00:38:49 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 20 Apr 2006 17:38:49 -0700
Subject: rpms/edje Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604210038.k3L0cpPI006812@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/edje
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6784

Added Files:
	Makefile import.log 
Log Message:
Setup of module edje


--- NEW FILE Makefile ---
# Top level Makefile for module edje
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 21 00:38:49 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 20 Apr 2006 17:38:49 -0700
Subject: rpms/edje/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200604210038.k3L0cpbg006815@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/edje/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6784/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module edje


--- 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 Apr 21 00:40:12 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 20 Apr 2006 17:40:12 -0700
Subject: rpms/edje import.log,1.1,1.2
Message-ID: <200604210040.k3L0eiFr006897@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/edje
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6859

Modified Files:
	import.log 
Log Message:
auto-import edje-0.5.0.026-1 on branch devel from edje-0.5.0.026-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/edje/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Apr 2006 00:38:49 -0000	1.1
+++ import.log	21 Apr 2006 00:40:12 -0000	1.2
@@ -0,0 +1 @@
+edje-0_5_0_026-1:HEAD:edje-0.5.0.026-1.src.rpm:1145580414



From fedora-extras-commits at redhat.com  Fri Apr 21 00:40:13 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 20 Apr 2006 17:40:13 -0700
Subject: rpms/edje/devel edje-0.5.0.023-novera.patch, NONE, 1.1 edje.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604210040.k3L0ejUm006901@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/edje/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6859/devel

Modified Files:
	.cvsignore sources 
Added Files:
	edje-0.5.0.023-novera.patch edje.spec 
Log Message:
auto-import edje-0.5.0.026-1 on branch devel from edje-0.5.0.026-1.src.rpm

edje-0.5.0.023-novera.patch:

--- NEW FILE edje-0.5.0.023-novera.patch ---
--- edje-0.5.0.023/configure.novera	2006-02-06 04:26:45.000000000 -0500
+++ edje-0.5.0.023/configure	2006-02-06 04:27:12.000000000 -0500
@@ -22506,7 +22506,7 @@
 
 
 
-                                                                                                                                                                                                                                      ac_config_files="$ac_config_files edje.pc edje.spec Makefile data/Makefile data/images/Makefile data/include/Makefile data/src/Makefile data/template/Makefile data/template/embryo/Makefile data/template/fonts/Makefile data/template/hashes/Makefile data/template/images/Makefile data/template/macros/Makefile data/template/parts/Makefile data/template/programs/Makefile data/test/Makefile data/test/fonts/Makefile data/test/images/Makefile src/Makefile src/lib/Makefile src/bin/Makefile edje-config debian/changelog"
+                                                                                                                                                                                                                                      ac_config_files="$ac_config_files edje.pc edje.spec Makefile data/Makefile data/images/Makefile data/include/Makefile data/src/Makefile data/template/Makefile data/template/embryo/Makefile data/template/fonts/Makefile data/template/hashes/Makefile data/template/images/Makefile data/template/macros/Makefile data/template/parts/Makefile data/template/programs/Makefile data/test/Makefile data/test/images/Makefile src/Makefile src/lib/Makefile src/bin/Makefile edje-config debian/changelog"
           ac_config_commands="$ac_config_commands default"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -23122,7 +23122,6 @@
   "data/template/parts/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/template/parts/Makefile" ;;
   "data/template/programs/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/template/programs/Makefile" ;;
   "data/test/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/test/Makefile" ;;
-  "data/test/fonts/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/test/fonts/Makefile" ;;
   "data/test/images/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/test/images/Makefile" ;;
   "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
   "src/lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/Makefile" ;;
--- edje-0.5.0.023/data/template/fonts/fonts.edc.novera	2006-02-06 04:50:04.000000000 -0500
+++ edje-0.5.0.023/data/template/fonts/fonts.edc	2006-02-06 04:50:22.000000000 -0500
@@ -1 +1 @@
-    font, "Vera.ttf" "Edje.Vera";
+    font, "/usr/share/fonts/bitstream-vera/Vera.ttf" "Edje.Vera";
--- edje-0.5.0.023/data/template/fonts/Makefile.in.novera	2006-02-06 04:49:18.000000000 -0500
+++ edje-0.5.0.023/data/template/fonts/Makefile.in	2006-02-06 04:49:28.000000000 -0500
@@ -154,7 +154,7 @@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 vimdir = @vimdir@
-FILES = Vera.ttf fonts.edc
+FILES = fonts.edc
 
 fontdir = $(pkgdatadir)/data/template/fonts
 font_DATA = $(FILES)
--- edje-0.5.0.023/data/test/Makefile.in.novera	2006-02-06 04:53:31.000000000 -0500
+++ edje-0.5.0.023/data/test/Makefile.in	2006-02-06 04:53:43.000000000 -0500
@@ -154,7 +154,7 @@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 vimdir = @vimdir@
-SUBDIRS = fonts images
+SUBDIRS = images
 subdir = data/test
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs


--- NEW FILE edje.spec ---
Name:           edje
Version:        0.5.0.026
Release:        1%{?dist}
Summary:        A complex graphical design and layout library

Group:          System Environment/Libraries
License:        MIT
URL:            http://www.enlightenment.org/Libraries/Edje/
Source0:        http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz
Patch:          edje-0.5.0.023-novera.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  eet-devel evas-devel ecore-devel embryo-devel zlib-devel
BuildRequires:  libjpeg-devel libidn-devel curl-devel
#Requires:       

%description
Edje is a complex graphical design & layout library. Its purpose is to be a
sequel to "Ebits" which to date has serviced the needs of Enlightenment
development for version 0.17. The original design parameters under which
Ebits came about were a lot more restricted than the resulting use of them,
thus Edje was born.

%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.

%prep
%setup -q
%patch -p 1 -b .novera

%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 {} \;

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING COPYING-PLAIN README
%{_bindir}/%{name}
%{_bindir}/%{name}_*
%{_datadir}/%{name}
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc
%{_bindir}/*config
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*

%changelog
* Tue Apr 18 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.5.0.026-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/edje/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2006 00:38:49 -0000	1.1
+++ .cvsignore	21 Apr 2006 00:40:13 -0000	1.2
@@ -0,0 +1 @@
+edje-0.5.0.026.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/edje/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2006 00:38:49 -0000	1.1
+++ sources	21 Apr 2006 00:40:13 -0000	1.2
@@ -0,0 +1 @@
+9907e12517b67787157cba49f863b99f  edje-0.5.0.026.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 02:02:23 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 20 Apr 2006 19:02:23 -0700
Subject: owners owners.list,1.864,1.865
Message-ID: <200604210202.k3L22v8R011242@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11222

Modified Files:
	owners.list 
Log Message:
+edje,+python-nose


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.864
retrieving revision 1.865
diff -u -r1.864 -r1.865
--- owners.list	21 Apr 2006 00:22:09 -0000	1.864
+++ owners.list	21 Apr 2006 02:02:23 -0000	1.865
@@ -218,6 +218,7 @@
 Fedora Extras|ecl|Embeddable Common-Lisp|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|ecore|An event and X abstraction layer|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|edb|A database convenience library wrapped around BDB|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
+Fedora Extras|edje|A complex graphical design and layout library|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|eet|A library designed to write an arbitary set of chunks of data to a file|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|elmo|Terminal-based mail client|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|emacs-auctex|Enhanced TeX modes for Emacsen|ed at eh3.com|extras-qa at fedoraproject.org|
@@ -1248,6 +1249,7 @@
 Fedora Extras|python-matplotlib|Python plotting library|orion at cora.nwra.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|michel.salim at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|python-nose|A discovery-based unittest extension for Python|ivazquez at ivazquez.net|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|
 Fedora Extras|python-paramiko|A SSH2 protocol library for python|shahms at shahms.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Apr 21 07:01:22 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Fri, 21 Apr 2006 00:01:22 -0700
Subject: rpms/torque/devel torque-2.1.0p0-sched-offbyone.patch, NONE,
	1.1 torque.spec, 1.1, 1.2
Message-ID: <200604210701.k3L71wQt022451@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22427

Modified Files:
	torque.spec 
Added Files:
	torque-2.1.0p0-sched-offbyone.patch 
Log Message:
fix pbs_sched error opening lockfile and immediately exiting



torque-2.1.0p0-sched-offbyone.patch:

--- NEW FILE torque-2.1.0p0-sched-offbyone.patch ---
--- torque-2.1.0p0-snap.200604171430/src/scheduler.cc/pbs_sched.c.orig 2006-04-06 23:56:37.000000000 +0200
+++ torque-2.1.0p0-snap.200604171430/src/scheduler.cc/pbs_sched.c      2006-04-20 16:52:38.000000000 +0200
@@ -992,7 +992,7 @@

         (void)sprintf(log_buffer, "%ld\n", (long)pid);

-        if (write(lockfds, log_buffer, strlen(log_buffer)+1) != strlen(log_buffer))
+        if (write(lockfds, log_buffer, strlen(log_buffer)+1) != strlen(log_buffer)+1)
           {
           perror("writing to lockfile");




Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/torque.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- torque.spec	18 Apr 2006 02:10:40 -0000	1.1
+++ torque.spec	21 Apr 2006 07:01:22 -0000	1.2
@@ -3,7 +3,7 @@
 %define name torque
 %define version 2.1.0p0
 %define snap 200604171430
-%define release 7
+%define release 8
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -91,6 +91,7 @@
 Source4: xpbs.png
 Source5: xpbsmon.png
 Patch1: torque-2.1.0-remove-rpath.path
+Patch2: torque-2.1.0p0-sched-offbyone.patch
 License: Freely redistributable (See PBS_License.txt)
 Group: System Environment/Daemons
 URL: http://www.clusterresources.com/products/torque/
@@ -119,6 +120,7 @@
 %prep
 %setup -q -n torque-%{version}%{?snap:-snap.%snap}
 %patch1 -p1
+%patch2 -p1
 
 %__cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} .
 
@@ -423,6 +425,9 @@
 
 
 %changelog
+* Thu Apr 20 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.8.200604171430cvs
+- fix pbs_sched error opening lockfile and immediately exiting
+
 * Mon Apr 17 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.7.200604171430cvs
 - importing to fedora extras
 



From fedora-extras-commits at redhat.com  Fri Apr 21 07:05:50 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Fri, 21 Apr 2006 00:05:50 -0700
Subject: rpms/torque/FC-5 torque.spec,1.1,1.2
Message-ID: <200604210705.k3L75q5i022551@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22534

Modified Files:
	torque.spec 
Log Message:
* Thu Apr 20 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.8.200604171430cvs
- fix pbs_sched error opening lockfile and immediately exiting



Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-5/torque.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- torque.spec	18 Apr 2006 02:10:40 -0000	1.1
+++ torque.spec	21 Apr 2006 07:05:50 -0000	1.2
@@ -3,7 +3,7 @@
 %define name torque
 %define version 2.1.0p0
 %define snap 200604171430
-%define release 7
+%define release 8
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -91,6 +91,7 @@
 Source4: xpbs.png
 Source5: xpbsmon.png
 Patch1: torque-2.1.0-remove-rpath.path
+Patch2: torque-2.1.0p0-sched-offbyone.patch
 License: Freely redistributable (See PBS_License.txt)
 Group: System Environment/Daemons
 URL: http://www.clusterresources.com/products/torque/
@@ -119,6 +120,7 @@
 %prep
 %setup -q -n torque-%{version}%{?snap:-snap.%snap}
 %patch1 -p1
+%patch2 -p1
 
 %__cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} .
 
@@ -423,6 +425,9 @@
 
 
 %changelog
+* Thu Apr 20 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.8.200604171430cvs
+- fix pbs_sched error opening lockfile and immediately exiting
+
 * Mon Apr 17 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.7.200604171430cvs
 - importing to fedora extras
 



From fedora-extras-commits at redhat.com  Fri Apr 21 07:06:22 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Fri, 21 Apr 2006 00:06:22 -0700
Subject: rpms/torque/FC-4 torque.spec,1.1,1.2
Message-ID: <200604210706.k3L76OZb022608@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22591

Modified Files:
	torque.spec 
Log Message:
* Thu Apr 20 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.8.200604171430cvs
- fix pbs_sched error opening lockfile and immediately exiting



Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-4/torque.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- torque.spec	18 Apr 2006 02:10:40 -0000	1.1
+++ torque.spec	21 Apr 2006 07:06:22 -0000	1.2
@@ -3,7 +3,7 @@
 %define name torque
 %define version 2.1.0p0
 %define snap 200604171430
-%define release 7
+%define release 8
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -91,6 +91,7 @@
 Source4: xpbs.png
 Source5: xpbsmon.png
 Patch1: torque-2.1.0-remove-rpath.path
+Patch2: torque-2.1.0p0-sched-offbyone.patch
 License: Freely redistributable (See PBS_License.txt)
 Group: System Environment/Daemons
 URL: http://www.clusterresources.com/products/torque/
@@ -119,6 +120,7 @@
 %prep
 %setup -q -n torque-%{version}%{?snap:-snap.%snap}
 %patch1 -p1
+%patch2 -p1
 
 %__cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} .
 
@@ -423,6 +425,9 @@
 
 
 %changelog
+* Thu Apr 20 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.8.200604171430cvs
+- fix pbs_sched error opening lockfile and immediately exiting
+
 * Mon Apr 17 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.7.200604171430cvs
 - importing to fedora extras
 



From fedora-extras-commits at redhat.com  Fri Apr 21 07:06:35 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Fri, 21 Apr 2006 00:06:35 -0700
Subject: rpms/torque/FC-3 torque.spec,1.1,1.2
Message-ID: <200604210706.k3L76bp2022633@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22614

Modified Files:
	torque.spec 
Log Message:
* Thu Apr 20 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.8.200604171430cvs
- fix pbs_sched error opening lockfile and immediately exiting



Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-3/torque.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- torque.spec	18 Apr 2006 02:10:40 -0000	1.1
+++ torque.spec	21 Apr 2006 07:06:35 -0000	1.2
@@ -3,7 +3,7 @@
 %define name torque
 %define version 2.1.0p0
 %define snap 200604171430
-%define release 7
+%define release 8
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -91,6 +91,7 @@
 Source4: xpbs.png
 Source5: xpbsmon.png
 Patch1: torque-2.1.0-remove-rpath.path
+Patch2: torque-2.1.0p0-sched-offbyone.patch
 License: Freely redistributable (See PBS_License.txt)
 Group: System Environment/Daemons
 URL: http://www.clusterresources.com/products/torque/
@@ -119,6 +120,7 @@
 %prep
 %setup -q -n torque-%{version}%{?snap:-snap.%snap}
 %patch1 -p1
+%patch2 -p1
 
 %__cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} .
 
@@ -423,6 +425,9 @@
 
 
 %changelog
+* Thu Apr 20 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.8.200604171430cvs
+- fix pbs_sched error opening lockfile and immediately exiting
+
 * Mon Apr 17 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.7.200604171430cvs
 - importing to fedora extras
 



From fedora-extras-commits at redhat.com  Fri Apr 21 07:08:09 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Fri, 21 Apr 2006 00:08:09 -0700
Subject: rpms/torque/FC-5 torque-2.1.0p0-sched-offbyone.patch,NONE,1.1
Message-ID: <200604210708.k3L78BSQ022780@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22762

Added Files:
	torque-2.1.0p0-sched-offbyone.patch 
Log Message:
* Thu Apr 20 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.8.200604171430cvs
- fix pbs_sched error opening lockfile and immediately exiting


torque-2.1.0p0-sched-offbyone.patch:

--- NEW FILE torque-2.1.0p0-sched-offbyone.patch ---
--- torque-2.1.0p0-snap.200604171430/src/scheduler.cc/pbs_sched.c.orig 2006-04-06 23:56:37.000000000 +0200
+++ torque-2.1.0p0-snap.200604171430/src/scheduler.cc/pbs_sched.c      2006-04-20 16:52:38.000000000 +0200
@@ -992,7 +992,7 @@

         (void)sprintf(log_buffer, "%ld\n", (long)pid);

-        if (write(lockfds, log_buffer, strlen(log_buffer)+1) != strlen(log_buffer))
+        if (write(lockfds, log_buffer, strlen(log_buffer)+1) != strlen(log_buffer)+1)
           {
           perror("writing to lockfile");





From fedora-extras-commits at redhat.com  Fri Apr 21 07:08:49 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Fri, 21 Apr 2006 00:08:49 -0700
Subject: rpms/torque/FC-4 torque-2.1.0p0-sched-offbyone.patch,NONE,1.1
Message-ID: <200604210708.k3L78pkk022839@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22821

Added Files:
	torque-2.1.0p0-sched-offbyone.patch 
Log Message:
* Thu Apr 20 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.8.200604171430cvs
- fix pbs_sched error opening lockfile and immediately exiting


torque-2.1.0p0-sched-offbyone.patch:

--- NEW FILE torque-2.1.0p0-sched-offbyone.patch ---
--- torque-2.1.0p0-snap.200604171430/src/scheduler.cc/pbs_sched.c.orig 2006-04-06 23:56:37.000000000 +0200
+++ torque-2.1.0p0-snap.200604171430/src/scheduler.cc/pbs_sched.c      2006-04-20 16:52:38.000000000 +0200
@@ -992,7 +992,7 @@

         (void)sprintf(log_buffer, "%ld\n", (long)pid);

-        if (write(lockfds, log_buffer, strlen(log_buffer)+1) != strlen(log_buffer))
+        if (write(lockfds, log_buffer, strlen(log_buffer)+1) != strlen(log_buffer)+1)
           {
           perror("writing to lockfile");





From fedora-extras-commits at redhat.com  Fri Apr 21 07:09:13 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Fri, 21 Apr 2006 00:09:13 -0700
Subject: rpms/torque/FC-3 torque-2.1.0p0-sched-offbyone.patch,NONE,1.1
Message-ID: <200604210709.k3L79Fvu022898@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22880

Added Files:
	torque-2.1.0p0-sched-offbyone.patch 
Log Message:
* Thu Apr 20 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.8.200604171430cvs
- fix pbs_sched error opening lockfile and immediately exiting


torque-2.1.0p0-sched-offbyone.patch:

--- NEW FILE torque-2.1.0p0-sched-offbyone.patch ---
--- torque-2.1.0p0-snap.200604171430/src/scheduler.cc/pbs_sched.c.orig 2006-04-06 23:56:37.000000000 +0200
+++ torque-2.1.0p0-snap.200604171430/src/scheduler.cc/pbs_sched.c      2006-04-20 16:52:38.000000000 +0200
@@ -992,7 +992,7 @@

         (void)sprintf(log_buffer, "%ld\n", (long)pid);

-        if (write(lockfds, log_buffer, strlen(log_buffer)+1) != strlen(log_buffer))
+        if (write(lockfds, log_buffer, strlen(log_buffer)+1) != strlen(log_buffer)+1)
           {
           perror("writing to lockfile");





From fedora-extras-commits at redhat.com  Fri Apr 21 07:59:27 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Fri, 21 Apr 2006 00:59:27 -0700
Subject: rpms/ghc/devel .cvsignore, 1.5, 1.6 ghc.spec, 1.11, 1.12 sources,
	1.5, 1.6
Message-ID: <200604210759.k3L7xTjh022999@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22978

Modified Files:
	.cvsignore ghc.spec sources 
Log Message:
update to 6.4.2 release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Sep 2005 23:37:16 -0000	1.5
+++ .cvsignore	21 Apr 2006 07:59:27 -0000	1.6
@@ -1 +1 @@
-ghc-6.4.1-src.tar.bz2
+ghc-6.4.2-src.tar.bz2


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ghc.spec	2 Mar 2006 08:40:15 -0000	1.11
+++ ghc.spec	21 Apr 2006 07:59:27 -0000	1.12
@@ -1,12 +1,12 @@
-%define ghcver ghc641
+%define ghcver ghc642
 
 # speed up test builds by not building profiled libraries
 %define build_prof 1
 %define build_doc 1
 
 Name:		ghc
-Version:	6.4.1
-Release:	3%{?dist}
+Version:	6.4.2
+Release:	1%{?dist}
 Summary:	Glasgow Haskell Compilation system
 License:	BSD style
 Group:		Development/Languages
@@ -14,8 +14,8 @@
 URL:		http://haskell.org/ghc/
 Requires:	%{ghcver} = %{version}-%{release}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: ghc, sed
-Buildrequires: gmp-devel, readline-devel, libX11-devel, freeglut-devel, openal-devel
+BuildRequires:  ghc, sed
+Buildrequires:  gmp-devel, readline-devel, libX11-devel, freeglut-devel, openal-devel
 %if %{build_doc}
 # haddock generates libraries/ docs
 Buildrequires: libxslt, docbook-style-xsl, haddock
@@ -156,15 +156,18 @@
 %endif
 
 %changelog
-* Thu Mar  2 2006 Jens Petersen <petersen at redhat.com> - 6.4.1-3
+* Thu Apr 20 2006 Jens Petersen <petersen at redhat.com> - 6.4.2-1
+- update to 6.4.2 release
+
+* Thu Mar  2 2006 Jens Petersen <petersen at redhat.com> - 6.4.1-3.fc5
 - buildrequire libX11-devel instead of xorg-x11-devel (Kevin Fenzi, #181024)
 - make ghc-doc require ghc (Michel Salim, #180449)
 
-* Tue Oct 11 2005 Jens Petersen <petersen at redhat.com> - 6.4.1-2
+* Tue Oct 11 2005 Jens Petersen <petersen at redhat.com> - 6.4.1-2.fc5
 - turn on build_doc since haddock is now in Extras
 - no longer specify ghc version to build with (Ville Skytt??, #170176)
 
-* Tue Sep 20 2005 Jens Petersen <petersen at redhat.com> - 6.4.1-1
+* Tue Sep 20 2005 Jens Petersen <petersen at redhat.com> - 6.4.1-1.fc5
 - 6.4.1 release
   - the following patches are now upstream: ghc-6.4-powerpc.patch,
     rts-GCCompact.h-x86_64.patch, ghc-6.4-dsforeign-x86_64-1097471.patch,


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Sep 2005 23:37:16 -0000	1.5
+++ sources	21 Apr 2006 07:59:27 -0000	1.6
@@ -1 +1 @@
-fd289bc7c3afa272ff831a71a50b5b00  ghc-6.4.1-src.tar.bz2
+a394bf14e94c3bca5507d568fcc03375  ghc-6.4.2-src.tar.bz2



From fedora-extras-commits at redhat.com  Fri Apr 21 08:11:43 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 21 Apr 2006 01:11:43 -0700
Subject: rpms/libassetml/devel libassetml-gcompris.patch, NONE,
	1.1 libassetml.spec, 1.1, 1.2
Message-ID: <200604210811.k3L8Bj1b025135@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libassetml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25115

Modified Files:
	libassetml.spec 
Added Files:
	libassetml-gcompris.patch 
Log Message:
* Mon Apr 17 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.1-2
- Add libassetml-gcompris.patch which adds a couple of fixes found in the
  version of libassetml as shipped with gcompris. Which is BTW currently our
  only user. Notice that this version is much less (annoyingly) verbose then
  the version bundled with gcompris.


libassetml-gcompris.patch:

--- NEW FILE libassetml-gcompris.patch ---
--- libassetml-1.2.1/src/assetml.c.gcompris	2003-10-07 13:22:37.000000000 +0200
+++ libassetml-1.2.1/src/assetml.c	2006-04-21 00:14:57.000000000 +0200
@@ -17,6 +17,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include "glib.h"
 #include "assetml.h"
 #include <config.h>
 
@@ -25,32 +26,37 @@
 #include <libxml/parser.h>
 
 #include <locale.h>
-#include <dirent.h>
 #include <string.h>
 
 #define FILE_EXT ".assetml"
 
-gchar	*assetml_get_locale(void);
-gchar	*reactivate_newline(gchar *str);
-void	 dump_asset(AssetML *assetml);
-int	 selectAssetML(const struct dirent *d);
-void	 assetml_read_xml_file(GList **gl_result, char *fname,
-			       gchar *dataset, gchar* categories, gchar* mimetype, gchar *locale, gchar* file);
-void	 assetml_load_xml(GList **gl_result, gchar *dataset, gchar* categories, gchar* mimetype, 
-			  gchar* locale, gchar* file);
-void	 free_asset(AssetML *assetml);
+const gchar	*assetml_get_locale(void);
+static gchar	*reactivate_newline(gchar *str);
+int		 selectAssetML(const gchar *dirent);
+void		 assetml_read_xml_file(GList **gl_result, char *fname,
+				       gchar *dataset, gchar* categories, gchar* mimetype, 
+				       const gchar *locale, gchar* file);
+void		 assetml_load_xml(GList **gl_result, gchar *dataset, gchar* categories, 
+				  gchar* mimetype, 
+				  const gchar* locale, gchar* file);
+void		 free_asset(AssetML *assetml);
+
+GHashTable *asset_cache = NULL;
 
 /*
  * This returns the locale for which text must be displayed
  *
  */
-gchar *assetml_get_locale()
+const gchar *assetml_get_locale()
 {
-  char *locale;
+  const char *locale;
 
-  locale = getenv("LC_ALL");
+  locale = g_getenv("LC_ALL");
+  if(locale == NULL)
+    locale = g_getenv("LC_MESSAGES");
   if(locale == NULL)
-    locale = getenv("LANG");
+    locale = g_getenv("LANG");
+
 
   if(locale!=NULL)
     return(locale);
@@ -65,7 +71,7 @@
  * \f \n \r \t \\ \" and the octal format.
  * 
  */
-gchar *reactivate_newline(gchar *str)
+static gchar *reactivate_newline(gchar *str)
 {
   gchar *newstr;
 
@@ -79,24 +85,6 @@
   return newstr;
 }
 
-void dump_asset(AssetML *assetml)
-{
-
-  printf("Dump Asset\n");
-
-  if(assetml==NULL)
-    return;
-
-  printf("  dataset     = %s\n",assetml->dataset);
-  printf("  file        = %s\n",assetml->file);
-  printf("  locale      = %s\n",assetml->locale);
-  printf("  description = %s\n",assetml->description);
-  printf("  categories  = %s\n",assetml->categories);
-  printf("  mimetype    = %s\n",assetml->mimetype);
-  printf("  credits     = %s\n",assetml->credits);
-
-}
-
 /*
  * Thanks for George Lebl <jirka at 5z.com> for his Genealogy example
  * for all the XML stuff there
@@ -131,6 +119,14 @@
     assetml->file		= NULL;
   xmlFree(tmpstr);
 
+  tmpstr = xmlGetProp(xmlnode,"name");
+  if(tmpstr && strlen(tmpstr)>0)
+  assetml->name		= g_strdup(tmpstr);
+  else
+    assetml->name		= g_path_get_basename(assetml->file);
+  xmlFree(tmpstr);
+
+
   tmpstr = xmlGetProp(xmlnode,"mimetype");
   if(tmpstr && strlen(tmpstr)>0)
   assetml->mimetype		= g_strdup(tmpstr);
@@ -138,6 +134,8 @@
     assetml->mimetype		= NULL;
   xmlFree(tmpstr);
 
+
+
   xmlnode = xmlnode->xmlChildrenNode;
   while (xmlnode != NULL) {
     gchar *lang = xmlGetProp(xmlnode,"lang");
@@ -185,22 +183,29 @@
  */
 static gboolean matching(AssetML *assetml, gchar *mydataset, 
 			 gchar *dataset, gchar* categories, gchar* mimetype, 
-			 gchar* mylocale, gchar* locale, gchar* file)
+			 const gchar* mylocale, const gchar* locale, gchar* name)
 {
   g_assert(assetml);
 
-  assetml->dataset = g_strdup(mydataset);
+  if (!assetml->locale)
+    assetml->locale = g_strdup(mylocale);
+  if (!assetml->dataset)
+    assetml->dataset = g_strdup(mydataset);
+
   if(assetml->dataset && dataset)
     if(g_ascii_strcasecmp(assetml->dataset, dataset))
       return FALSE;
 
+
   /* Check the leading locale definition matches the leading user request so that
    * File   Requested   Status
    * fr     fr_FR.UTF8  OK
    * pt     pt_BR       OK
    * pt_BR  pt          NO
    */
-  assetml->locale = g_strdup(mylocale);
+  if (!assetml->locale)
+    assetml->locale = g_strdup(mylocale);
+
   if(assetml->locale && locale)
     if(g_ascii_strncasecmp(assetml->locale, locale, strlen(assetml->locale)))
       return FALSE;
@@ -209,12 +214,16 @@
     if(g_ascii_strcasecmp(assetml->mimetype, mimetype))
       return FALSE;
 
-  if(assetml->file && file)
+  if(assetml->name && name)
+    if(g_ascii_strcasecmp(assetml->name, name))
+      return FALSE;
+
+/*  if(assetml->file && file)
     {
       gchar *str1;
       gchar *str2;
       gboolean nomatch;
-      /* We test only the basename of the file so that caller do not need to specify a full path */
+//      We test only the basename of the file so that caller do not need to specify a full path 
       str1 = g_path_get_basename(assetml->file);
       str2 = g_path_get_basename(file);
 
@@ -225,7 +234,7 @@
 
       if(nomatch)
 	return FALSE;
-    }
+    }*/
 
   if(assetml->categories && categories)
     {
@@ -247,8 +256,21 @@
 static void
 parse_doc(GList **gl_result, xmlDocPtr doc, 
 	  gchar *mydataset, gchar *rootdir, gchar* mylocale,
-	  gchar *dataset, gchar* categories, gchar* mimetype, gchar* locale, gchar* file)
+	  gchar *dataset, gchar* categories, gchar* mimetype, const gchar* locale, gchar* file, GList **cache)
 {
+  if (*cache){
+    GList *list;
+
+    for (list= *cache; list != NULL; list=list->next){
+      AssetML *assetml = (AssetML *) list->data;
+      
+      if (matching(assetml, mydataset, dataset, categories, 
+		   mimetype, mylocale, locale, file))
+	*gl_result = g_list_append (*gl_result, assetml);
+    }
+    return;
+  }
+
   xmlNodePtr node;
 
   /* find <Asset> nodes and add them to the list, this just
@@ -258,20 +280,28 @@
        we pass NULL as the node of the child */
     AssetML *assetml = assetml_add_xml_to_data(doc, node, rootdir, NULL);
 
-    if(assetml && matching(assetml, mydataset, dataset, categories, mimetype, mylocale, locale, file))
+    if(assetml && matching(assetml, mydataset, dataset, categories, 
+			   mimetype, mylocale, locale, file))
       *gl_result = g_list_append (*gl_result, assetml);
-				
+
+    if (assetml)
+      *cache = g_list_append( *cache,  assetml);
+
   }
 }
 
-
+void assetml_real_free_assetlist(GList *assetlist)
+{
+  g_list_foreach (assetlist, (GFunc) free_asset, NULL);
+  g_list_free(assetlist);
+}
 
 /* read an xml file into our memory structures and update our view,
    dump any old data we have in memory if we can load a new set
    Fill the gl_result list with all matching asseml items
 */
 void assetml_read_xml_file(GList **gl_result, char *assetmlfile,
-			   gchar *dataset, gchar* categories, gchar* mimetype, gchar *locale, gchar* file)
+			   gchar *dataset, gchar* categories, gchar* mimetype, const gchar *locale, gchar* file)
 {
   /* pointer to the new doc */
   xmlDocPtr doc;
@@ -279,82 +309,109 @@
   gchar *mylocale;
   gchar *mydataset;
 
+  GList *cache = NULL;
+
   g_return_if_fail(assetmlfile!=NULL);
 
+  /* cache asset for performance in non direct search */
+  if (!asset_cache){
+    asset_cache = g_hash_table_new_full( g_str_hash,
+					 g_str_equal,
+					 g_free,
+					 (GDestroyNotify) assetml_free_assetlist
+					 );
+  }
+
+  cache = g_hash_table_lookup (asset_cache, assetmlfile);
+
   /* parse the new file and put the result into newdoc */
-  doc = xmlParseFile(assetmlfile);
+  if (! cache){
+    doc = xmlParseFile(assetmlfile);
 
-  /* in case something went wrong */
-  if(!doc) {
-    g_warning("Oups, the parsing of %s failed", assetmlfile);
-    return;
-  }
-  
-  if(/* if there is no root element */
-     !doc->children ||
-     /* if it doesn't have a name */
-     !doc->children->name ||
-     /* if it isn't a Assetml node */
-     g_strcasecmp(doc->children->name,"AssetML")!=0) 
-    {
-      xmlFreeDoc(doc);
-      g_warning("Oups, the file %s is not of the assetml type", assetmlfile);
+    /* in case something went wrong */
+    if(!doc) {
+      g_warning("Oups, the parsing of %s failed", assetmlfile);
       return;
     }
+  
+    if(/* if there is no root element */
+       !doc->children ||
+       /* if it doesn't have a name */
+       !doc->children->name ||
+       /* if it isn't a Assetml node */
+       g_strcasecmp(doc->children->name,"AssetML")!=0) 
+      {
+	xmlFreeDoc(doc);
+	g_warning("Oups, the file %s is not of the assetml type", assetmlfile);
+	return;
+      }
+
+    rootdir   = xmlGetProp(doc->children,"rootdir");
+    mydataset = xmlGetProp(doc->children,"dataset");
+    mylocale  = xmlGetProp(doc->children,"locale");
+  }
+  else {
+    AssetML *myasset = (AssetML *) cache->data;
 
-  rootdir   = xmlGetProp(doc->children,"rootdir");
-  mydataset = xmlGetProp(doc->children,"dataset");
-  mylocale    = xmlGetProp(doc->children,"locale");
+    mylocale = myasset->locale;
+    mydataset = myasset->dataset;
+    rootdir = NULL;
+  }
 
   /* parse our document and replace old data */
-  parse_doc(gl_result, doc, mydataset, rootdir, mylocale, dataset, categories, mimetype, locale, file);
+  parse_doc(gl_result, doc, mydataset, rootdir, mylocale, dataset, categories, mimetype, locale, file, &cache);
 
-  xmlFree(rootdir);
-  xmlFree(mydataset);
+  if (rootdir)
+    g_hash_table_replace( asset_cache, g_strdup(assetmlfile), cache);
 
-  xmlFreeDoc(doc);
+  if (rootdir){
+    xmlFree(rootdir);
+    xmlFree(mydataset);
+    xmlFreeDoc(doc);
+  }
 }
 
 
 /*
  * Select only files with FILE_EXT
  */
-int selectAssetML(const struct dirent *d)
+int selectAssetML(const gchar *dirent)
 {
-  gchar *file = ((struct dirent *)d)->d_name;
   guint ext_length = strlen(FILE_EXT);
 
-  if(strlen(file)<ext_length)
+  if(strlen(dirent)<ext_length)
     return 0;
 
-  return (strncmp (&file[strlen(file)-ext_length], FILE_EXT, ext_length) == 0);
+  return (strncmp (&dirent[strlen(dirent)-ext_length], FILE_EXT, ext_length) == 0);
 }
 
 /* load all the xml files in the assetml path
  * into our memory structures.
  */
-void assetml_load_xml(GList **gl_result, gchar *dataset, gchar* categories, gchar* mimetype, gchar *locale, 
+void assetml_load_xml(GList **gl_result, gchar *dataset, gchar* categories, gchar* mimetype, const gchar *locale, 
 		      gchar* name)
 {
-  struct dirent **namelist;
-  int n;
+  const gchar  *one_dirent;
+  GDir    *dir;
 
-  n = scandir(ASSETML_DIR, &namelist, &selectAssetML, 0);
+  dir = g_dir_open(ASSETML_DIR, 0, NULL);
+  if(!dir) {
+    g_warning("opendir returns no files with extension %s in directory %s", FILE_EXT, ASSETML_DIR);
+    return;
+  }
 
-  if (n <= 0)
-    g_warning("scandir returns no files with extension %s in directory %s", FILE_EXT, ASSETML_DIR);
-  else {
-    while(n--) {
-      gchar *assetmlfile = g_strdup_printf("%s/%s", ASSETML_DIR, namelist[n]->d_name);
+  while((one_dirent = g_dir_read_name(dir)) != NULL) {
+
+    if(strstr(one_dirent, FILE_EXT)) {
+      gchar *assetmlfile = g_strdup_printf("%s/%s", ASSETML_DIR, one_dirent);
       
       assetml_read_xml_file(gl_result, assetmlfile,
-      			    dataset, categories, mimetype, locale, name);
+			    dataset, categories, mimetype, locale, name);
       
       g_free(assetmlfile);
-      free (namelist [n]);
     }
-    free (namelist);
   }
+  g_dir_close(dir);
 }
 
 
@@ -367,6 +424,7 @@
   xmlFree(assetml->description);
   xmlFree(assetml->categories);
   xmlFree(assetml->file);
+  xmlFree(assetml->name);
   xmlFree(assetml->mimetype);
   xmlFree(assetml->credits);
 
@@ -375,29 +433,25 @@
 
 void assetml_free_assetlist(GList *assetlist)
 {
-  g_list_foreach (assetlist, (GFunc) free_asset, NULL);
+  /* does not  free assets because cache */
+  //g_list_foreach (assetlist, (GFunc) free_asset, NULL);
   g_list_free(assetlist);
-
-
 }
 
-GList*	 assetml_get_asset(gchar *dataset, gchar* categories, gchar* mimetype, gchar *locale, gchar* file)
+GList*	 assetml_get_asset(gchar *dataset, gchar* categories, gchar* mimetype, const gchar *locale, gchar* file)
 {
   GList *gl_result = NULL;
 
   assetml_load_xml(&gl_result, dataset, categories, mimetype, locale, file);
 
-  if(g_list_length(gl_result)==0)
+  if(gl_result && g_list_length(gl_result)==0)
     {
       g_list_free(gl_result);
-      return NULL;
-    }
-  else
-    {
-#ifdef DEBUG
-      printf("Dumping return value of assetml_get_asset\n");
-      g_list_foreach (gl_result, (GFunc) dump_asset, NULL);
-#endif
-      return gl_result;
+      gl_result = NULL;
     }
+
+  if (!gl_result)
+    g_warning("assetml_get_asset file=%s: no match\n", file);
+
+  return gl_result;
 }
--- libassetml-1.2.1/src/assetml.h.gcompris	2003-10-07 13:22:37.000000000 +0200
+++ libassetml-1.2.1/src/assetml.h	2006-04-21 00:13:16.000000000 +0200
@@ -35,7 +35,7 @@
    \param locale is the locale to search for or NULL for the current locale
    \param file the asset file name to get or NULL for any file name
 */
-GList*	 assetml_get_asset(gchar *dataset, gchar* categories, gchar* mimetype, gchar* locale, gchar* name);
+GList*	 assetml_get_asset(gchar *dataset, gchar* categories, gchar* mimetype, const gchar* locale, gchar* name);
 
 
 void	 assetml_free_assetlist(GList *assetlist);
@@ -49,6 +49,7 @@
   gchar		*locale;
   gchar		*description;
   gchar		*file;
+  gchar		*name;
   gchar		*mimetype;
   gchar		*credits;
 };


Index: libassetml.spec
===================================================================
RCS file: /cvs/extras/rpms/libassetml/devel/libassetml.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libassetml.spec	15 Apr 2006 13:41:24 -0000	1.1
+++ libassetml.spec	21 Apr 2006 08:11:43 -0000	1.2
@@ -1,11 +1,12 @@
 Name:		libassetml
 Version: 	1.2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        XML resource database library
 Group:          System Environment/Libraries
 License:	GPL  
 URL:		http://sourceforge.net/projects/ofset/
 Source0:        http://download.sourceforge.net/ofset/%{name}-%{version}.tar.gz
+Patch0:         libassetml-gcompris.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	glib2-devel libxml2-devel texinfo texi2html
 
@@ -31,6 +32,7 @@
 
 %prep
 %setup -q
+%patch -p1 -z .gcompris
 # make rpmlint happy
 chmod -x src/tools/assetml-query.c
 
@@ -84,5 +86,11 @@
 
 
 %changelog
+* Mon Apr 17 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.1-2
+- Add libassetml-gcompris.patch which adds a couple of fixes found in the
+  version of libassetml as shipped with gcompris. Which is BTW currently our
+  only user. Notice that this version is much less (annoyingly) verbose then
+  the version bundled with gcompris.
+
 * Mon Apr 10 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.1-1
 - Initial spec file



From fedora-extras-commits at redhat.com  Fri Apr 21 08:23:17 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 21 Apr 2006 01:23:17 -0700
Subject: rpms/hugs98 - New directory
Message-ID: <200604210823.k3L8NJ9S025270@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/hugs98
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25244/hugs98

Log Message:
Directory /cvs/extras/rpms/hugs98 added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 08:23:18 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 21 Apr 2006 01:23:18 -0700
Subject: rpms/hugs98/devel - New directory
Message-ID: <200604210823.k3L8NK7i025273@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/hugs98/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25244/hugs98/devel

Log Message:
Directory /cvs/extras/rpms/hugs98/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 08:23:34 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 21 Apr 2006 01:23:34 -0700
Subject: rpms/hugs98/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604210823.k3L8Nax7025325@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/hugs98/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25289/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hugs98


--- 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 Apr 21 08:23:33 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 21 Apr 2006 01:23:33 -0700
Subject: rpms/hugs98 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604210823.k3L8NZPk025322@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/hugs98
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25289

Added Files:
	Makefile import.log 
Log Message:
Setup of module hugs98


--- NEW FILE Makefile ---
# Top level Makefile for module hugs98
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 21 08:25:46 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 21 Apr 2006 01:25:46 -0700
Subject: rpms/hugs98 import.log,1.1,1.2
Message-ID: <200604210826.k3L8QI2N025394@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/hugs98
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25357

Modified Files:
	import.log 
Log Message:
auto-import hugs98-2005.03-1.fc5 on branch devel from hugs98-2005.03-1.fc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/hugs98/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Apr 2006 08:23:33 -0000	1.1
+++ import.log	21 Apr 2006 08:25:46 -0000	1.2
@@ -0,0 +1 @@
+hugs98-2005_03-1_fc5:HEAD:hugs98-2005.03-1.fc5.src.rpm:1145607939



From fedora-extras-commits at redhat.com  Fri Apr 21 08:25:47 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 21 Apr 2006 01:25:47 -0700
Subject: rpms/hugs98/devel hugs98.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604210826.k3L8QJIu025398@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/hugs98/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25357/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hugs98.spec 
Log Message:
auto-import hugs98-2005.03-1.fc5 on branch devel from hugs98-2005.03-1.fc5.src.rpm


--- NEW FILE hugs98.spec ---
%define hugs_ver Mar2005-patched

Name:		hugs98
Version:	2005.03
Release:	1%{?dist}
Summary:	Haskell Interpreter

Group:		Development/Languages
License:	BSD
URL:		http://www.haskell.org/hugs
Source0:	http://cvs.haskell.org/Hugs/downloads/Mar2005/hugs98-Mar2005-patched.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	docbook-utils
BuildRequires:	freeglut-devel
BuildRequires:	libGL-devel
BuildRequires:	libGLU-devel
BuildRequires:	libICE-devel
BuildRequires:	libSM-devel
BuildRequires:	libX11-devel
BuildRequires:	libXi-devel
BuildRequires:	libXmu-devel
BuildRequires:	libXt-devel
BuildRequires:	readline-devel
BuildRequires:	xorg-x11-proto-devel
#BuildRequires:	openal-devel

%description
Hugs 98 is a functional programming system based on Haskell 98, the de
facto standard for non-strict functional programming languages. Hugs
98 provides an almost complete implementation of Haskell 98.


%package x11
Summary:	X11 package for Hugs98
Group:		Development/Languages
Requires:	%{name} = %{version}-%{release}

%description x11
X11 package for Hugs98.


%package opengl
Summary:	OpenGL package for Hugs98
Group:		Development/Languages
Requires:	%{name} = %{version}-%{release}

%description opengl
OpenGL package for Hugs98.


%package glut
Summary:	GLUT package for Hugs98
Group:		Development/Languages
Requires:	%{name} = %{version}-%{release}
Requires:	%{name}-opengl = %{version}-%{release}

%description glut
GLUT package for Hugs98.


%package hgl
Summary:	Haskell Graphics Library for Hugs98
Group:		Development/Languages
Requires:	%{name} = %{version}-%{release}
Requires:	%{name}-x11 = %{version}-%{release}

%description hgl
Haskell Graphics Library for Hugs98.


%package demos
Summary:	Demo files for Hugs98
Group:		Development/Languages
Requires:	%{name} = %{version}-%{release}
Requires:	%{name}-glut = %{version}-%{release}
Requires:	%{name}-hgl = %{version}-%{release}

%description demos
Demo files for Hugs98.


%prep
%setup -q -n %{name}-%{hugs_ver}


%build
%configure --with-pthreads
touch src/stamp-h.in
make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install_all_but_docs
make -C docs DESTDIR=$RPM_BUILD_ROOT install_man

find $RPM_BUILD_ROOT -name '*.so' -exec chmod 0755 '{}' ';'

mv $RPM_BUILD_ROOT%{_libdir}/hugs/demos installed-demos
rm installed-demos/Makefile.in


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc License
%doc Readme
%doc Credits
%doc docs/ffi-notes.txt
%doc docs/server.html
%doc docs/libraries-notes.txt
%doc docs/users_guide/users_guide
%{_bindir}/*
%{_libdir}/hugs
%exclude %{_libdir}/hugs/packages/X11
%exclude %{_libdir}/hugs/packages/OpenGL
%exclude %{_libdir}/hugs/packages/GLUT
%exclude %{_libdir}/hugs/packages/HGL
%{_mandir}/man*/*


%files demos
%defattr(-,root,root,-)
%doc installed-demos/*


%files x11
%defattr(-,root,root,-)
%{_libdir}/hugs/packages/X11


%files opengl
%defattr(-,root,root,-)
%{_libdir}/hugs/packages/OpenGL


%files glut
%defattr(-,root,root,-)
%{_libdir}/hugs/packages/GLUT


%files hgl
%defattr(-,root,root,-)
%{_libdir}/hugs/packages/HGL


%changelog
* Tue Apr 18 2006 Gerard Milmeister <gemi at bluewin.ch> - 2005.03-1
- changed version numbering scheme
- split off demos package
- split of some packages
- do not build openal support (compile errors)
- enable pthreads

* Wed Mar 30 2005 Gerard Milmeister <gemi at bluewin.ch> - 200503-1
- New Version Mar2005

* Sun Feb 13 2005 Gerard Milmeister <gemi at bluewin.ch> - 0:200311-1
- Changed version scheme

* Mon Jan  5 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:0.0-0.fdr.1.200311
- New Version Nov2003

* Mon Oct 20 2003 Gerard Milmeister <gemi at bluewin.ch> - Nov2002-0.fdr.1
- First Fedora release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hugs98/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2006 08:23:34 -0000	1.1
+++ .cvsignore	21 Apr 2006 08:25:46 -0000	1.2
@@ -0,0 +1 @@
+hugs98-Mar2005-patched.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hugs98/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2006 08:23:34 -0000	1.1
+++ sources	21 Apr 2006 08:25:46 -0000	1.2
@@ -0,0 +1 @@
+f72c378251f0d488fff9871583d26843  hugs98-Mar2005-patched.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 08:29:55 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 21 Apr 2006 01:29:55 -0700
Subject: owners owners.list,1.865,1.866
Message-ID: <200604210829.k3L8Tv8S025610@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25591

Modified Files:
	owners.list 
Log Message:
added hugs98


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.865
retrieving revision 1.866
diff -u -r1.865 -r1.866
--- owners.list	21 Apr 2006 02:02:23 -0000	1.865
+++ owners.list	21 Apr 2006 08:29:55 -0000	1.866
@@ -462,6 +462,7 @@
 Fedora Extras|htmltmpl|Templating engine for separation of code and HTML|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|htop|Interactive process viewer|gajownik at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|http_ping|HTTP latency measuring utility|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|hugs98|Haskell Interpreter|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|hula|A calendar and mail server|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|hunky-fonts|Modified Bitstream Vera fonts with additional letters|gajownik at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|hunt|A tool for demonstrating well known weaknesses in the TCP/IP protocol suite|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Apr 21 08:58:34 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Fri, 21 Apr 2006 01:58:34 -0700
Subject: rpms/yumex/FC-5 .cvsignore, 1.19, 1.20 sources, 1.24,
	1.25 yumex.spec, 1.25, 1.26
Message-ID: <200604210859.k3L8x6el029132@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28864/FC-5

Modified Files:
	.cvsignore sources yumex.spec 
Log Message:
Release 0.99.17


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-5/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	6 Apr 2006 10:43:27 -0000	1.19
+++ .cvsignore	21 Apr 2006 08:58:34 -0000	1.20
@@ -1 +1 @@
-yumex-0.99.16.tar.gz
+yumex-0.99.17.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-5/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	6 Apr 2006 10:43:27 -0000	1.24
+++ sources	21 Apr 2006 08:58:34 -0000	1.25
@@ -1 +1 @@
-97f3e881e2c721768506b2ee18f3a926  yumex-0.99.16.tar.gz
+a4d1b18e36e63b6a7605dbb76823dae8  yumex-0.99.17.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-5/yumex.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- yumex.spec	6 Apr 2006 10:43:27 -0000	1.25
+++ yumex.spec	21 Apr 2006 08:58:34 -0000	1.26
@@ -1,5 +1,5 @@
 Name:     yumex
-Version:  0.99.16
+Version:  0.99.17
 Release:  1.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
@@ -65,6 +65,8 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Fri Apr 21 2006 Tim Lauridsen <tla at rasmil.dk> - 0.99.17-1.0
+- Development Release 0.99.17-1.0
 * Thu Mar 30 2006 Tim Lauridsen <tla at rasmil.dk> - 0.99.16-1.0
 - Development Release 0.99.16-1.0
 * Wed Mar 22 2006 Tim Lauridsen <tla at rasmil.dk> - 0.99.15-1.0



From fedora-extras-commits at redhat.com  Fri Apr 21 08:58:34 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Fri, 21 Apr 2006 01:58:34 -0700
Subject: rpms/yumex/devel sources,1.24,1.25 yumex.spec,1.25,1.26
Message-ID: <200604210859.k3L8x6Up029140@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28864/devel

Modified Files:
	sources yumex.spec 
Log Message:
Release 0.99.17


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	6 Apr 2006 10:43:28 -0000	1.24
+++ sources	21 Apr 2006 08:58:34 -0000	1.25
@@ -1 +1 @@
-97f3e881e2c721768506b2ee18f3a926  yumex-0.99.16.tar.gz
+a4d1b18e36e63b6a7605dbb76823dae8  yumex-0.99.17.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- yumex.spec	6 Apr 2006 10:43:28 -0000	1.25
+++ yumex.spec	21 Apr 2006 08:58:34 -0000	1.26
@@ -1,5 +1,5 @@
 Name:     yumex
-Version:  0.99.16
+Version:  0.99.17
 Release:  1.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
@@ -65,6 +65,8 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Fri Apr 21 2006 Tim Lauridsen <tla at rasmil.dk> - 0.99.17-1.0
+- Development Release 0.99.17-1.0
 * Thu Mar 30 2006 Tim Lauridsen <tla at rasmil.dk> - 0.99.16-1.0
 - Development Release 0.99.16-1.0
 * Wed Mar 22 2006 Tim Lauridsen <tla at rasmil.dk> - 0.99.15-1.0



From fedora-extras-commits at redhat.com  Fri Apr 21 09:28:41 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Fri, 21 Apr 2006 02:28:41 -0700
Subject: rpms/i8kutils/FC-4 i8kutils.spec,1.8,1.9
Message-ID: <200604210929.k3L9TDql000518@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/i8kutils/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv467/FC-4

Modified Files:
	i8kutils.spec 
Log Message:
Add tcl requirement (#189567).



Index: i8kutils.spec
===================================================================
RCS file: /cvs/extras/rpms/i8kutils/FC-4/i8kutils.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- i8kutils.spec	7 Apr 2006 13:36:21 -0000	1.8
+++ i8kutils.spec	21 Apr 2006 09:28:41 -0000	1.9
@@ -4,7 +4,7 @@
 Summary: Dell laptop (Inspiron 8000 and others) SMM BIOS support tools
 Name: i8kutils
 Version: 1.25
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group: System Environment/Base
 URL: http://people.debian.org/~dz/i8k/
@@ -12,7 +12,7 @@
 Source1: http://www.coding-zone.com/i8krellm-%{gkrellmpluginver}.tar.gz
 Source2: i8kbuttons.init
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: alsa-utils, gkrellm >= 2.0.0, tk
+Requires: alsa-utils, gkrellm >= 2.0.0, tcl, tk
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig, /sbin/service
 BuildRequires: gkrellm-devel >= 2.0.0
@@ -83,7 +83,10 @@
 
 
 %changelog
-* Fri Apr  7 2006 Matthias Saou <http://freshrpms.net/> 1.25-6
+* Fri Apr 21 2006 Matthias Saou <http://freshrpms.net/> 1.25-8
+- Add tcl requirement too... (#189567).
+
+* Fri Apr  7 2006 Matthias Saou <http://freshrpms.net/> 1.25-7
 - Add tk requirement, since the included i8kmon utility requires it.
 
 * Tue Mar 14 2006 Matthias Saou <http://freshrpms.net/> 1.25-6



From fedora-extras-commits at redhat.com  Fri Apr 21 09:28:43 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Fri, 21 Apr 2006 02:28:43 -0700
Subject: rpms/i8kutils/devel i8kutils.spec,1.10,1.11
Message-ID: <200604210929.k3L9TFJd000522@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/i8kutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv467/devel

Modified Files:
	i8kutils.spec 
Log Message:
Add tcl requirement (#189567).



Index: i8kutils.spec
===================================================================
RCS file: /cvs/extras/rpms/i8kutils/devel/i8kutils.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- i8kutils.spec	7 Apr 2006 13:36:23 -0000	1.10
+++ i8kutils.spec	21 Apr 2006 09:28:42 -0000	1.11
@@ -4,7 +4,7 @@
 Summary: Dell laptop (Inspiron 8000 and others) SMM BIOS support tools
 Name: i8kutils
 Version: 1.25
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group: System Environment/Base
 URL: http://people.debian.org/~dz/i8k/
@@ -12,7 +12,7 @@
 Source1: http://www.coding-zone.com/i8krellm-%{gkrellmpluginver}.tar.gz
 Source2: i8kbuttons.init
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: alsa-utils, gkrellm >= 2.0.0, tk
+Requires: alsa-utils, gkrellm >= 2.0.0, tcl, tk
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig, /sbin/service
 BuildRequires: gkrellm-devel >= 2.0.0
@@ -83,7 +83,10 @@
 
 
 %changelog
-* Fri Apr  7 2006 Matthias Saou <http://freshrpms.net/> 1.25-6
+* Fri Apr 21 2006 Matthias Saou <http://freshrpms.net/> 1.25-8
+- Add tcl requirement too... (#189567).
+
+* Fri Apr  7 2006 Matthias Saou <http://freshrpms.net/> 1.25-7
 - Add tk requirement, since the included i8kmon utility requires it.
 
 * Tue Mar 14 2006 Matthias Saou <http://freshrpms.net/> 1.25-6



From fedora-extras-commits at redhat.com  Fri Apr 21 09:28:42 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Fri, 21 Apr 2006 02:28:42 -0700
Subject: rpms/i8kutils/FC-5 i8kutils.spec,1.10,1.11
Message-ID: <200604210929.k3L9TEbe000521@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/i8kutils/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv467/FC-5

Modified Files:
	i8kutils.spec 
Log Message:
Add tcl requirement (#189567).



Index: i8kutils.spec
===================================================================
RCS file: /cvs/extras/rpms/i8kutils/FC-5/i8kutils.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- i8kutils.spec	7 Apr 2006 13:36:22 -0000	1.10
+++ i8kutils.spec	21 Apr 2006 09:28:42 -0000	1.11
@@ -4,7 +4,7 @@
 Summary: Dell laptop (Inspiron 8000 and others) SMM BIOS support tools
 Name: i8kutils
 Version: 1.25
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group: System Environment/Base
 URL: http://people.debian.org/~dz/i8k/
@@ -12,7 +12,7 @@
 Source1: http://www.coding-zone.com/i8krellm-%{gkrellmpluginver}.tar.gz
 Source2: i8kbuttons.init
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: alsa-utils, gkrellm >= 2.0.0, tk
+Requires: alsa-utils, gkrellm >= 2.0.0, tcl, tk
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig, /sbin/service
 BuildRequires: gkrellm-devel >= 2.0.0
@@ -83,7 +83,10 @@
 
 
 %changelog
-* Fri Apr  7 2006 Matthias Saou <http://freshrpms.net/> 1.25-6
+* Fri Apr 21 2006 Matthias Saou <http://freshrpms.net/> 1.25-8
+- Add tcl requirement too... (#189567).
+
+* Fri Apr  7 2006 Matthias Saou <http://freshrpms.net/> 1.25-7
 - Add tk requirement, since the included i8kmon utility requires it.
 
 * Tue Mar 14 2006 Matthias Saou <http://freshrpms.net/> 1.25-6



From fedora-extras-commits at redhat.com  Fri Apr 21 09:54:02 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Fri, 21 Apr 2006 02:54:02 -0700
Subject: rpms/libfwbuilder/devel .cvsignore, 1.5, 1.6 libfwbuilder.spec, 1.10,
	1.11 sources, 1.5, 1.6 libfwbuilder-2.0.10-gcc4.patch, 1.1, NONE
Message-ID: <200604210954.k3L9s4PV001188@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/libfwbuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1167

Modified Files:
	.cvsignore libfwbuilder.spec sources 
Removed Files:
	libfwbuilder-2.0.10-gcc4.patch 
Log Message:
- Update to 2.0.12
- Drop gcc-4.1 patch and -ffriend-injection



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Feb 2006 17:16:36 -0000	1.5
+++ .cvsignore	21 Apr 2006 09:54:02 -0000	1.6
@@ -1 +1 @@
-libfwbuilder-2.0.10.tar.gz
+libfwbuilder-2.0.12.tar.gz


Index: libfwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/devel/libfwbuilder.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libfwbuilder.spec	22 Feb 2006 09:17:42 -0000	1.10
+++ libfwbuilder.spec	21 Apr 2006 09:54:02 -0000	1.11
@@ -1,12 +1,11 @@
 Name:           libfwbuilder
 Summary:        Firewall Builder API
-Version:        2.0.10
-Release:        2%{?dist}
+Version:        2.0.12
+Release:        1%{?dist}
 License:        GPL
 Group:          System Environment/Libraries
 URL:            http://www.fwbuilder.org/
 Source:         %{name}-%{version}.tar.gz
-Patch0:         libfwbuilder-2.0.10-gcc4.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  qt-devel >= 1:3.0.0
 BuildRequires:  libxslt-devel
@@ -46,7 +45,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc4
 
 
 %build
@@ -58,7 +56,7 @@
 #
 perl -pi -e 's|(QMAKE_CXXFLAGS_.*)|$1 \@CXXFLAGS\@|' qmake.inc.in
 
-CXXFLAGS="${RPM_OPT_FLAGS} -ffriend-injection"  %configure \
+%configure \
     --enable-auto-docdir \
     --with-templatedir=%{_datadir}/libfwbuilder \
     --disable-static  \
@@ -90,6 +88,10 @@
 
 
 %changelog
+* Fri Apr 21 2006 Ralf Ertzinger <ralf at skytale.net> 2.0.12-1.fc5
+- Update to 2.0.12
+- Drop gcc-4.1 patch and -ffriend-injection
+
 * Wed Feb 22 2006 Ralf Ertzinger <ralf at skytale.net> 2.0.10-2.fc5
 - Bump and rebuild for FC5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Feb 2006 17:16:36 -0000	1.5
+++ sources	21 Apr 2006 09:54:02 -0000	1.6
@@ -1 +1 @@
-7f171715bd398137e832a53628642fe6  libfwbuilder-2.0.10.tar.gz
+09834a242ad0f8aaae80c44ee4937c43  libfwbuilder-2.0.12.tar.gz


--- libfwbuilder-2.0.10-gcc4.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Apr 21 09:59:29 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Fri, 21 Apr 2006 02:59:29 -0700
Subject: fedora-security/audit fc5,1.121,1.122
Message-ID: <200604210959.k3L9xTb9001264@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1246/audit

Modified Files:
	fc5 
Log Message:
Update with FEDORA-2006-421 (kernel)



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- fc5	19 Apr 2006 19:45:41 -0000	1.121
+++ fc5	21 Apr 2006 09:59:27 -0000	1.122
@@ -1,5 +1,5 @@
 Up to date CVE as of CVE email 20060414
-Up to date FC5 as of 20060411
+Up to date FC5 as of 20060419
 
 ** are items that need attention
 
@@ -76,10 +76,10 @@
 CVE-2006-1530 VULNERABLE (firefox, fixed 1.5.0.2)
 CVE-2006-1529 VULNERABLE (thunderbird, fixed 1.5.0.2)
 CVE-2006-1529 VULNERABLE (firefox, fixed 1.5.0.2)
-CVE-2006-1525 VULNERABLE (kernel, fixed 2.6.16.8)
-CVE-2006-1524 VULNERABLE (kernel, fixed 2.6.16.5)
-CVE-2006-1523 VULNERABLE (kernel, fixed 2.6.16.4)
-CVE-2006-1522 VULNERABLE (kernel, fixed 2.6.16.3)
+CVE-2006-1525 version (kernel, fixed 2.6.16.8) [since FEDORA-2006-421]
+CVE-2006-1524 version (kernel, fixed 2.6.16.5) [since FEDORA-2006-421]
+CVE-2006-1523 version (kernel, fixed 2.6.16.4) [since FEDORA-2006-421]
+CVE-2006-1522 version (kernel, fixed 2.6.16.3) [since FEDORA-2006-421]
 CVE-2006-1494 VULNERABLE (php)
 CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-233]
 CVE-2006-1354 VULNERABLE (freeradius) bz#186084
@@ -97,8 +97,8 @@
 CVE-2006-1061 backport (curl, fixed 7.15.3) [since FEDORA-2006-189]
 CVE-2006-1059 version (samba, fixed 3.0.22 at least) bz#187170 [since FEDORA-2006-259]
 CVE-2006-1058 VULNERABLE (busybox) bz#187386
-CVE-2006-1056 VULNERABLE (kernel, fixed 2.6.16.9)
-CVE-2006-1055 VULNERABLE (kernel, fixed 2.6.17-rc1)
+CVE-2006-1056 version (kernel, fixed 2.6.16.9) [since FEDORA-2006-421]
+CVE-2006-1055 version (kernel, fixed 2.6.17-rc1) [since FEDORA-2006-421]
 CVE-2006-1052 version (kernel, fixed 2.6.16) patch-2.6.16-rc6 [since FEDORA-2006-233]
 CVE-2006-1045 VULNERABLE (thunderbird)
 CVE-2006-1015 ignore (php) safe mode isn't safe
@@ -115,7 +115,7 @@
 CVE-2006-0748 VULNERABLE (firefox, fixed 1.5.0.2)
 CVE-2006-0746 version (kdegraphics, fixed 3.4)
 CVE-2006-0745 backport (xorg-x11) [since FEDORA-2006-172]
-CVE-2006-0744 VULNERABLE (kernel, fixed 2.6.16.5)
+CVE-2006-0744 version (kernel, fixed 2.6.16.5) [since FEDORA-2006-421]
 CVE-2006-0742 version (kernel, fixed 2.6.16) patch-2.6.16-rc6 [since FEDORA-2006-233]
 CVE-2006-0741 version (kernel, fixed 2.6.15.5) patch-2.6.16-rc6 [since FEDORA-2006-233]
 CVE-2006-0730 version (dovecot, 1.0beta[12] only)



From fedora-extras-commits at redhat.com  Fri Apr 21 10:09:57 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Fri, 21 Apr 2006 03:09:57 -0700
Subject: rpms/bsdiff - New directory
Message-ID: <200604211009.k3LA9xjI004124@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/bsdiff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4098/bsdiff

Log Message:
Directory /cvs/extras/rpms/bsdiff added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 10:09:57 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Fri, 21 Apr 2006 03:09:57 -0700
Subject: rpms/bsdiff/devel - New directory
Message-ID: <200604211009.k3LA9xRb004127@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/bsdiff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4098/bsdiff/devel

Log Message:
Directory /cvs/extras/rpms/bsdiff/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 10:10:13 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Fri, 21 Apr 2006 03:10:13 -0700
Subject: rpms/bsdiff Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604211010.k3LAAFGj004176@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/bsdiff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4148

Added Files:
	Makefile import.log 
Log Message:
Setup of module bsdiff


--- NEW FILE Makefile ---
# Top level Makefile for module bsdiff
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 21 10:10:14 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Fri, 21 Apr 2006 03:10:14 -0700
Subject: rpms/bsdiff/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604211010.k3LAAGLW004179@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/bsdiff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4148/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module bsdiff


--- 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 Apr 21 10:10:46 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Fri, 21 Apr 2006 03:10:46 -0700
Subject: rpms/bsdiff import.log,1.1,1.2
Message-ID: <200604211010.k3LAAmm4004250@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/bsdiff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4214

Modified Files:
	import.log 
Log Message:
auto-import bsdiff-4.3-1 on branch devel from bsdiff-4.3-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/bsdiff/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Apr 2006 10:10:13 -0000	1.1
+++ import.log	21 Apr 2006 10:10:46 -0000	1.2
@@ -0,0 +1 @@
+bsdiff-4_3-1:HEAD:bsdiff-4.3-1.src.rpm:1145614239



From fedora-extras-commits at redhat.com  Fri Apr 21 10:10:47 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Fri, 21 Apr 2006 03:10:47 -0700
Subject: rpms/bsdiff/devel bsdiff.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604211010.k3LAAnIj004255@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/bsdiff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4214/devel

Modified Files:
	.cvsignore sources 
Added Files:
	bsdiff.spec 
Log Message:
auto-import bsdiff-4.3-1 on branch devel from bsdiff-4.3-1.src.rpm


--- NEW FILE bsdiff.spec ---
Summary:	Binary diff/patch utility
Name:		bsdiff
Version:	4.3
Release:	1%{?dist}
License:	BSD
Group:		Development/Tools
Source0:	http://www.daemonology.net/bsdiff/bsdiff-%{version}.tar.gz
URL:		http://www.daemonology.net/bsdiff/
BuildRequires:	bzip2-devel
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
bsdiff and bspatch are tools for building and applying patches to binary files.
By using suffix sorting (specifically, Larsson and Sadakane's qsufsort) and
taking advantage of how executable files change, bsdiff routinely produces
binary patches 50-80% smaller than those produced by Xdelta, and 15% smaller
than those produced by .RTPatch.

%prep
%setup -q

%build
%{__cc} bsdiff.c -o bsdiff ${RPM_OPT_FLAGS} -lbz2
%{__cc} bspatch.c -o bspatch ${RPM_OPT_FLAGS} -lbz2

%install
rm -rf ${RPM_BUILD_ROOT}
install -d -m 755 ${RPM_BUILD_ROOT}%{_bindir}
install -d -m 755 ${RPM_BUILD_ROOT}%{_mandir}/man1
install -m 755 bsdiff bspatch ${RPM_BUILD_ROOT}%{_bindir}
install -m 644 bsdiff.1 bspatch.1 ${RPM_BUILD_ROOT}%{_mandir}/man1

%clean
rm -rf ${RPM_BUILD_ROOT}

%files
%defattr(-,root,root)
%{_bindir}/bsdiff
%{_bindir}/bspatch
%{_mandir}/man1/*

%changelog
* Fri Mar 24 2006 Jindrich Novy <jnovy at redhat.com> 4.3-1
- initial build

Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bsdiff/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2006 10:10:14 -0000	1.1
+++ .cvsignore	21 Apr 2006 10:10:47 -0000	1.2
@@ -0,0 +1 @@
+bsdiff-4.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bsdiff/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2006 10:10:14 -0000	1.1
+++ sources	21 Apr 2006 10:10:47 -0000	1.2
@@ -0,0 +1 @@
+e6d812394f0e0ecc8d5df255aa1db22a  bsdiff-4.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 11:13:18 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Fri, 21 Apr 2006 04:13:18 -0700
Subject: fedora-security/audit fc4,1.208,1.209
Message-ID: <200604211113.k3LBDID7008428@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8400/audit

Modified Files:
	fc4 
Log Message:
Update with FEDORA-2006-423 (kernel)



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- fc4	19 Apr 2006 19:45:41 -0000	1.208
+++ fc4	21 Apr 2006 11:13:16 -0000	1.209
@@ -1,5 +1,5 @@
 Up to date CVE as of CVE email 20060414
-Up to date FC4 as of 20060411
+Up to date FC4 as of 20060420
 
 ** are items that need attention
 
@@ -77,10 +77,10 @@
 CVE-2006-1530 VULNERABLE (firefox, fixed 1.0.8)
 CVE-2006-1529 VULNERABLE (thunderbird, fixed 1.0.8)
 CVE-2006-1529 VULNERABLE (firefox, fixed 1.0.8)
-CVE-2006-1525 VULNERABLE (kernel, fixed 2.6.16.8)
-CVE-2006-1524 VULNERABLE (kernel, fixed 2.6.16.5)
-CVE-2006-1523 VULNERABLE (kernel, fixed 2.6.16.4)
-CVE-2006-1522 VULNERABLE (kernel, fixed 2.6.16.3)
+CVE-2006-1525 version (kernel, fixed 2.6.16.8) [since FEDORA-2006-423]
+CVE-2006-1524 version (kernel, fixed 2.6.16.5) [since FEDORA-2006-423]
+CVE-2006-1523 version (kernel, fixed 2.6.16.4) [since FEDORA-2006-423]
+CVE-2006-1522 version (kernel, fixed 2.6.16.3) [since FEDORA-2006-423]
 CVE-2006-1494 VULNERABLE (php)
 CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-245]
 CVE-2006-1354 VULNERABLE (freeradius) bz#186084
@@ -96,8 +96,8 @@
 CVE-2006-1061 version (curl, 7.15.0 - 7.15.2 only)
 CVE-2006-1059 version (samba)
 CVE-2006-1058 VULNERABLE (busybox) bz#187386
-CVE-2006-1056 VULNERABLE (kernel, fixed 2.6.16.9)
-CVE-2006-1055 VULNERABLE (kernel, fixed 2.6.17-rc1)
+CVE-2006-1056 version (kernel, fixed 2.6.16.9) [since FEDORA-2006-423]
+CVE-2006-1055 version (kernel, fixed 2.6.17-rc1) [since FEDORA-2006-423]
 CVE-2006-1052 version (kernel, fixed 2.6.16) patch-2.6.16-rc6 [since FEDORA-2006-245]
 CVE-2006-1045 VULNERABLE (thunderbird)
 CVE-2006-1015 ignore (php) safe mode isn't safe
@@ -114,7 +114,7 @@
 CVE-2006-0748 VULNERABLE (firefox, fixed 1.0.8)
 CVE-2006-0746 VULNERABLE (kpdf) bz#184308
 CVE-2006-0745 version (xorg-x11) not fc4
-CVE-2006-0744 VULNERABLE (kernel, fixed 2.6.16.5)
+CVE-2006-0744 version (kernel, fixed 2.6.16.5) [since FEDORA-2006-423]
 CVE-2006-0742 version (kernel, fixed 2.6.16) patch-2.6.16-rc6 [since FEDORA-2006-245]
 CVE-2006-0741 version (kernel, fixed 2.6.15.5) [since FEDORA-2006-245] was backport since FEDORA-2006-131
 CVE-2006-0730 version (dovecot, 1.0beta[12] only)
@@ -134,7 +134,7 @@
 CVE-2006-0459 version (flex) by inspection
 CVE-2006-0457 version (kernel, fixed 2.6.15.5) [since FEDORA-2006-245] was backport since FEDORA-2006-131
 CVE-2006-0455 version (gnupg, fixed 1.4.2.1) [since FEDORA-2006-116]
-CVE-2006-0454 backport (kernel, fixed 2.6.15.3) [since FEDORA-2006-102] patch-2.6.15.3
+CVE-2006-0454 version (kernel, fixed 2.6.15.3) [since FEDORA-2006-102] patch-2.6.15.3
 CVE-2006-0405 version (libtiff, 3.8.0 only)
 CVE-2006-0377 version (squirrelmail, fixed 1.4.6) [since FEDORA-2006-133]
 CVE-2006-0369 ignore (mysql) this is not a security issue
@@ -586,8 +586,8 @@
 CVE-2005-1268 backport (httpd) [since FEDORA-2005-639]
 CVE-2005-1267 backport (tcpdump) [since FEDORA-2005-407]
 CVE-2005-1266 version (spamassassin, fixed 3.0.4) [since FEDORA-2005-428]
-CVE-2005-1265 version (kernel) [since FEDORA-2005-510] was backport (kernel) patch-2.6.12-rc5
-CVE-2005-1264 version (kernel) [since FEDORA-2005-510] was backport (kernel, fixed 2.6.11.10) ..12-rc4-git5 since re0522.0
+CVE-2005-1265 version (kernel, fixed 2.6.12-rc5) [since FEDORA-2005-510] was backport
+CVE-2005-1264 version (kernel, fixed 2.6.11.10) [since FEDORA-2005-510] was backport (..12-rc4-git5 since re0522.0)
 CVE-2005-1263 version (kernel) [since FEDORA-2005-510] was patch-2.6.12-rc4-git5 since re0522.0
 CVE-2005-1262 version (gaim, fixed 1.3.0) [since re0522.0]
 CVE-2005-1261 version (gaim, fixed 1.3.0) [since re0522.0]
@@ -656,7 +656,7 @@
 CVE-2005-0758 version (gzip, fixed 1.3.5)
 CVE-2005-0758 VULNERABLE (bzip2) by inspection bz#159819
 CVE-2005-0757 version (kernel, not 2.6)
-CVE-2005-0756 version (kernel, fixed 2.6.12) [since FEDORA-2005-510] was backport (kernel) patch-2.6.12-rc5
+CVE-2005-0756 version (kernel, fixed 2.6.12) [since FEDORA-2005-510] was backport in patch-2.6.12-rc5
 CVE-2005-0755 version (HelixPlayer, fixed 10.0.4)
 CVE-2005-0754 version (kdewebdev, fixed after 3.4.0) [since FEDORA-2005-437] was backport....4.0-CAN-2005-0754.patch
 CVE-2005-0753 backport (cvs, fixed 1.12.12) in cvs-1.11.17-CAN-2005-0753.patch



From fedora-extras-commits at redhat.com  Fri Apr 21 12:03:44 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Fri, 21 Apr 2006 05:03:44 -0700
Subject: rpms/powermanga/devel powermanga.spec,1.12,1.13
Message-ID: <200604211203.k3LC3kfR019284@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/powermanga/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17213/devel

Modified Files:
	powermanga.spec 
Log Message:
Fix complete breakage from bug #184076, reported in bug #188901.



Index: powermanga.spec
===================================================================
RCS file: /cvs/extras/rpms/powermanga/devel/powermanga.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- powermanga.spec	11 Apr 2006 15:38:49 -0000	1.12
+++ powermanga.spec	21 Apr 2006 12:03:43 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Arcade 2D shoot-them-up game
 Name: powermanga
 Version: 0.80
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://linux.tlk.fr/games/Powermanga/
@@ -72,6 +72,13 @@
     --dir %{buildroot}%{_datadir}/applications \
     %{name}.desktop
 
+# Workaround for the "texts" dir not being installed, although it's needed
+%{__mkdir_p} %{buildroot}%{_datadir}/games/powermanga/texts
+%{__install} -p -m 0644 texts/*.txt \
+    %{buildroot}%{_datadir}/games/powermanga/texts/
+echo "Lang=en" > \
+    %{buildroot}%{_datadir}/games/powermanga/texts/config.ini
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -83,6 +90,7 @@
 %{_bindir}/powermanga
 %attr(2755, root, games) %{_prefix}/games/powermanga
 %{_datadir}/games/powermanga/
+%config(noreplace) %{_datadir}/games/powermanga/texts/config.ini
 %{_datadir}/pixmaps/powermanga.png
 %{_mandir}/man6/powermanga.6*
 %config(noreplace) %attr(664, root, games) %{_var}/games/powermanga.hi
@@ -92,6 +100,10 @@
 
 
 %changelog
+* Fri Apr 21 2006 Matthias Saou <http://freshrpms.net/> 0.80-2
+- Add a workaround to include the "texts" directory and files, since the game
+  won't run without, and they don't get installed automatically! (#188901).
+
 * Tue Apr 11 2006 Matthias Saou <http://freshrpms.net/> 0.80-1
 - Update to 0.80, fixes crash at level 35 boss (#184076, Hugo Cisneiros).
 - Add new zlib-devel build requirement.



From fedora-extras-commits at redhat.com  Fri Apr 21 12:03:41 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Fri, 21 Apr 2006 05:03:41 -0700
Subject: rpms/powermanga/FC-4 powermanga.spec,1.9,1.10
Message-ID: <200604211204.k3LC4E5t019317@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/powermanga/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17213/FC-4

Modified Files:
	powermanga.spec 
Log Message:
Fix complete breakage from bug #184076, reported in bug #188901.



Index: powermanga.spec
===================================================================
RCS file: /cvs/extras/rpms/powermanga/FC-4/powermanga.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- powermanga.spec	11 Apr 2006 16:14:24 -0000	1.9
+++ powermanga.spec	21 Apr 2006 12:03:41 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Arcade 2D shoot-them-up game
 Name: powermanga
 Version: 0.80
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://linux.tlk.fr/games/Powermanga/
@@ -72,6 +72,13 @@
     --dir %{buildroot}%{_datadir}/applications \
     %{name}.desktop
 
+# Workaround for the "texts" dir not being installed, although it's needed
+%{__mkdir_p} %{buildroot}%{_datadir}/games/powermanga/texts
+%{__install} -p -m 0644 texts/*.txt \
+    %{buildroot}%{_datadir}/games/powermanga/texts/
+echo "Lang=en" > \
+    %{buildroot}%{_datadir}/games/powermanga/texts/config.ini
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -83,6 +90,7 @@
 %{_bindir}/powermanga
 %attr(2755, root, games) %{_prefix}/games/powermanga
 %{_datadir}/games/powermanga/
+%config(noreplace) %{_datadir}/games/powermanga/texts/config.ini
 %{_datadir}/pixmaps/powermanga.png
 %{_mandir}/man6/powermanga.6*
 %config(noreplace) %attr(664, root, games) %{_var}/games/powermanga.hi
@@ -92,6 +100,10 @@
 
 
 %changelog
+* Fri Apr 21 2006 Matthias Saou <http://freshrpms.net/> 0.80-2
+- Add a workaround to include the "texts" directory and files, since the game
+  won't run without, and they don't get installed automatically! (#188901).
+
 * Tue Apr 11 2006 Matthias Saou <http://freshrpms.net/> 0.80-1
 - Update to 0.80, fixes crash at level 35 boss (#184076, Hugo Cisneiros).
 - Add new zlib-devel build requirement.



From fedora-extras-commits at redhat.com  Fri Apr 21 12:03:40 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Fri, 21 Apr 2006 05:03:40 -0700
Subject: rpms/powermanga/FC-3 powermanga.spec,1.5,1.6
Message-ID: <200604211204.k3LC4Dx7019314@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/powermanga/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17213/FC-3

Modified Files:
	powermanga.spec 
Log Message:
Fix complete breakage from bug #184076, reported in bug #188901.



Index: powermanga.spec
===================================================================
RCS file: /cvs/extras/rpms/powermanga/FC-3/powermanga.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- powermanga.spec	11 Apr 2006 16:34:40 -0000	1.5
+++ powermanga.spec	21 Apr 2006 12:03:40 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Arcade 2D shoot-them-up game
 Name: powermanga
 Version: 0.80
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://linux.tlk.fr/games/Powermanga/
@@ -72,6 +72,13 @@
     --dir %{buildroot}%{_datadir}/applications \
     %{name}.desktop
 
+# Workaround for the "texts" dir not being installed, although it's needed
+%{__mkdir_p} %{buildroot}%{_datadir}/games/powermanga/texts
+%{__install} -p -m 0644 texts/*.txt \
+    %{buildroot}%{_datadir}/games/powermanga/texts/
+echo "Lang=en" > \
+    %{buildroot}%{_datadir}/games/powermanga/texts/config.ini
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -83,6 +90,7 @@
 %{_bindir}/powermanga
 %attr(2755, root, games) %{_prefix}/games/powermanga
 %{_datadir}/games/powermanga/
+%config(noreplace) %{_datadir}/games/powermanga/texts/config.ini
 %{_datadir}/pixmaps/powermanga.png
 %{_mandir}/man6/powermanga.6*
 %config(noreplace) %attr(664, root, games) %{_var}/games/powermanga.hi
@@ -92,6 +100,10 @@
 
 
 %changelog
+* Fri Apr 21 2006 Matthias Saou <http://freshrpms.net/> 0.80-2
+- Add a workaround to include the "texts" directory and files, since the game
+  won't run without, and they don't get installed automatically! (#188901).
+
 * Tue Apr 11 2006 Matthias Saou <http://freshrpms.net/> 0.80-1
 - Update to 0.80, fixes crash at level 35 boss (#184076, Hugo Cisneiros).
 - Add new zlib-devel build requirement.



From fedora-extras-commits at redhat.com  Fri Apr 21 12:03:43 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Fri, 21 Apr 2006 05:03:43 -0700
Subject: rpms/powermanga/FC-5 powermanga.spec,1.12,1.13
Message-ID: <200604211204.k3LC4FPO019320@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/powermanga/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17213/FC-5

Modified Files:
	powermanga.spec 
Log Message:
Fix complete breakage from bug #184076, reported in bug #188901.



Index: powermanga.spec
===================================================================
RCS file: /cvs/extras/rpms/powermanga/FC-5/powermanga.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- powermanga.spec	11 Apr 2006 15:58:42 -0000	1.12
+++ powermanga.spec	21 Apr 2006 12:03:42 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Arcade 2D shoot-them-up game
 Name: powermanga
 Version: 0.80
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://linux.tlk.fr/games/Powermanga/
@@ -72,6 +72,13 @@
     --dir %{buildroot}%{_datadir}/applications \
     %{name}.desktop
 
+# Workaround for the "texts" dir not being installed, although it's needed
+%{__mkdir_p} %{buildroot}%{_datadir}/games/powermanga/texts
+%{__install} -p -m 0644 texts/*.txt \
+    %{buildroot}%{_datadir}/games/powermanga/texts/
+echo "Lang=en" > \
+    %{buildroot}%{_datadir}/games/powermanga/texts/config.ini
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -83,6 +90,7 @@
 %{_bindir}/powermanga
 %attr(2755, root, games) %{_prefix}/games/powermanga
 %{_datadir}/games/powermanga/
+%config(noreplace) %{_datadir}/games/powermanga/texts/config.ini
 %{_datadir}/pixmaps/powermanga.png
 %{_mandir}/man6/powermanga.6*
 %config(noreplace) %attr(664, root, games) %{_var}/games/powermanga.hi
@@ -92,6 +100,10 @@
 
 
 %changelog
+* Fri Apr 21 2006 Matthias Saou <http://freshrpms.net/> 0.80-2
+- Add a workaround to include the "texts" directory and files, since the game
+  won't run without, and they don't get installed automatically! (#188901).
+
 * Tue Apr 11 2006 Matthias Saou <http://freshrpms.net/> 0.80-1
 - Update to 0.80, fixes crash at level 35 boss (#184076, Hugo Cisneiros).
 - Add new zlib-devel build requirement.



From fedora-extras-commits at redhat.com  Fri Apr 21 13:07:28 2006
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Fri, 21 Apr 2006 06:07:28 -0700
Subject: mock mock.py,1.41,1.42
Message-ID: <200604211307.k3LD7SHn021552@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/fedora/mock
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21534

Modified Files:
	mock.py 
Log Message:
fix bug 189586
Thanks to mclasen for catching it




Index: mock.py
===================================================================
RCS file: /cvs/fedora/mock/mock.py,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- mock.py	12 Apr 2006 14:22:11 -0000	1.41
+++ mock.py	21 Apr 2006 13:07:26 -0000	1.42
@@ -229,7 +229,7 @@
         (retval, output) = self.do(command)
 
         if retval != 0:
-            raise YumError, "Error peforming yum command: %s" % command
+            raise YumError, "Error performing yum command: %s" % command
         
         return (retval, output)
         



From fedora-extras-commits at redhat.com  Fri Apr 21 14:33:19 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 21 Apr 2006 07:33:19 -0700
Subject: rpms/NetworkManager-vpnc/FC-5 nm-vpnc-0.6.0-rekeying.patch, NONE,
	1.1 NetworkManager-vpnc.spec, 1.7, 1.8
Message-ID: <200604211433.k3LEXLwM023873@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager-vpnc/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23853

Modified Files:
	NetworkManager-vpnc.spec 
Added Files:
	nm-vpnc-0.6.0-rekeying.patch 
Log Message:
Update from devel branch


nm-vpnc-0.6.0-rekeying.patch:

--- NEW FILE nm-vpnc-0.6.0-rekeying.patch ---
--- NetworkManager-vpnc-0.6.0/src/nm-vpnc-service.c.rekeying	2006-03-19 07:15:48.000000000 -0500
+++ NetworkManager-vpnc-0.6.0/src/nm-vpnc-service.c	2006-03-19 07:15:51.000000000 -0500
@@ -57,6 +57,7 @@
 
 #define NM_VPNC_HELPER_PATH		BINDIR"/nm-vpnc-service-vpnc-helper"
 #define NM_VPNC_UDP_ENCAPSULATION_PORT	0 /* random port */
+#define NM_VPNC_REKEYING_INTERVAL 7200
 
 typedef struct NmVpncData
 {
@@ -444,6 +445,7 @@
 	write_config_option (vpnc_fd, "Script " NM_VPNC_HELPER_PATH "\n");
 	write_config_option (vpnc_fd, "UDP Encapsulate\n");
 	write_config_option (vpnc_fd, "UDP Encapsulation Port %d\n", NM_VPNC_UDP_ENCAPSULATION_PORT);
+	write_config_option (vpnc_fd, "Rekeying interval %d\n", NM_VPNC_REKEYING_INTERVAL);
 	write_config_option (vpnc_fd, "IPSec secret %s\n", password_items[0]);
 	write_config_option (vpnc_fd, "Xauth password %s\n", password_items[1]);
 
@@ -485,17 +487,19 @@
 static gboolean nm_vpnc_config_options_validate (char **data_items, int num_items)
 {
 	Option	allowed_opts[] = {
-					{ "IPSec gateway",			OPT_TYPE_ADDRESS },
-					{ "IPSec ID",				OPT_TYPE_ASCII },
-					{ "IPSec secret",			OPT_TYPE_ASCII },
-					{ "Xauth username",			OPT_TYPE_ASCII },
-					{ "UDP Encapsulate",		OPT_TYPE_NONE },
-					{ "UDP Encapsulation Port",	OPT_TYPE_ASCII },
-					{ "Domain",				OPT_TYPE_ASCII },
-					{ "IKE DH Group",			OPT_TYPE_ASCII },
-					{ "Perfect Forward Secrecy",	OPT_TYPE_ASCII },
-					{ "Application Version",		OPT_TYPE_ASCII },
-					{ NULL,					OPT_TYPE_UNKNOWN } };
+		{ "IPSec gateway",            OPT_TYPE_ADDRESS },
+		{ "IPSec ID",                 OPT_TYPE_ASCII },
+		{ "IPSec secret",             OPT_TYPE_ASCII },
+		{ "Xauth username",           OPT_TYPE_ASCII },
+		{ "UDP Encapsulate",          OPT_TYPE_NONE },
+		{ "UDP Encapsulation Port",   OPT_TYPE_ASCII },
+		{ "Domain",                   OPT_TYPE_ASCII },
+		{ "IKE DH Group",             OPT_TYPE_ASCII },
+		{ "Perfect Forward Secrecy",  OPT_TYPE_ASCII },
+		{ "Application Version",      OPT_TYPE_ASCII },
+		{ "Rekeying interval",        OPT_TYPE_ASCII },
+		{ NULL,                       OPT_TYPE_UNKNOWN }
+	};
 
 	unsigned int	i;
 


Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/FC-5/NetworkManager-vpnc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NetworkManager-vpnc.spec	14 Mar 2006 21:34:47 -0000	1.7
+++ NetworkManager-vpnc.spec	21 Apr 2006 14:33:19 -0000	1.8
@@ -7,7 +7,7 @@
 Summary: NetworkManager VPN integration for vpnc
 Name: NetworkManager-vpnc
 Version: 0.6.0
-Release: 1
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
@@ -32,12 +32,15 @@
 Requires: gnome-keyring
 Requires: libglade2
 
+Patch1: nm-vpnc-0.6.0-rekeying.patch
+
 %description
 This package contains software for integrating the vpnc VPN software
 with NetworkManager and the GNOME desktop
 
 %prep
 %setup -q
+%patch1 -p1 -b .rekeying
 
 %build
 %configure
@@ -50,7 +53,7 @@
 rm -f %{buildroot}%{_libdir}/lib*.la
 rm -f %{buildroot}%{_libdir}/lib*.a
 
-%find_lang %{name}
+#%find_lang %{name}
 
 %clean
 rm -rf %{buildroot}
@@ -69,7 +72,8 @@
       /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor
 fi
 
-%files -f %{name}.lang
+#%files -f %{name}.lang
+%files
 %defattr(-, root, root)
 
 %doc AUTHORS ChangeLog NEWS README
@@ -84,6 +88,12 @@
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
 
 %changelog
+* Fri Apr 21 2006 Dan Williams <dcbw at redhat.com> 0.6.0-3
+- Add dist tag to RPM release
+
+* Wed Apr 12 2006 Christopher Aillon <caillon at redhat.com> 0.6.0-2
+- Rekey every 2 hours
+
 * Tue Mar 14 2006 Dan Williams <dcbw at redhat.com> - 0.6.0-1
 - Update to CVS snapshot of 0.6 for NM compatibility
 



From fedora-extras-commits at redhat.com  Fri Apr 21 14:34:17 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 21 Apr 2006 07:34:17 -0700
Subject: rpms/NetworkManager-vpnc/devel NetworkManager-vpnc.spec,1.8,1.9
Message-ID: <200604211434.k3LEYJtc023932@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager-vpnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23915

Modified Files:
	NetworkManager-vpnc.spec 
Log Message:
Add dist tag to RPM release


Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- NetworkManager-vpnc.spec	12 Apr 2006 06:36:55 -0000	1.8
+++ NetworkManager-vpnc.spec	21 Apr 2006 14:34:17 -0000	1.9
@@ -7,7 +7,7 @@
 Summary: NetworkManager VPN integration for vpnc
 Name: NetworkManager-vpnc
 Version: 0.6.0
-Release: 2
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
@@ -88,6 +88,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
 
 %changelog
+* Fri Apr 21 2006 Dan Williams <dcbw at redhat.com> 0.6.0-3
+- Add dist tag to RPM release
+
 * Wed Apr 12 2006 Christopher Aillon <caillon at redhat.com> 0.6.0-2
 - Rekey every 2 hours
 



From fedora-extras-commits at redhat.com  Fri Apr 21 14:52:22 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 07:52:22 -0700
Subject: rpms/splint/devel splint.spec,1.5,1.6
Message-ID: <200604211452.k3LEqOgF024077@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/splint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24060

Modified Files:
	splint.spec 
Log Message:
- Manual.pdf - file permissions corrected.
- Included a demo .splintrc file as doc (splintrc.demo == src/.splintrc).



Index: splint.spec
===================================================================
RCS file: /cvs/extras/rpms/splint/devel/splint.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- splint.spec	13 Feb 2006 19:17:27 -0000	1.5
+++ splint.spec	21 Apr 2006 14:52:22 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           splint
 Version:        3.1.1
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        An implementation of the lint program
 
 Group:          Development/Tools
@@ -20,11 +20,13 @@
 
 %prep
 %setup -q
+chmod 644 doc/manual.pdf
+cp -p src/.splintrc splintrc.demo
 
 %build
 %configure
 # Parallel builds seem to fail
-make 
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -36,13 +38,17 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README doc/manual.pdf
+%doc README doc/manual.pdf splintrc.demo
 %{_bindir}/*
 %{_mandir}/man1/*.1*
 %{_datadir}/%{name}/
 
 
 %changelog
+* Thu Apr 20 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.1.1-13
+- Manual.pdf - file permissions corrected.
+- Included a demo .splintrc file as doc (splintrc.demo == src/.splintrc).
+
 * Mon Feb 13 2006 Paul Nasrat <pnasrat at redhat.com> - 3.1.1-12
 - FC5 rebuild for new gcc
 



From fedora-extras-commits at redhat.com  Fri Apr 21 15:04:52 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 08:04:52 -0700
Subject: rpms/splint/FC-4 splint.spec,1.3,1.4
Message-ID: <200604211505.k3LF5OtG026269@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/splint/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26226/FC-4

Modified Files:
	splint.spec 
Log Message:
Sync with devel


Index: splint.spec
===================================================================
RCS file: /cvs/extras/rpms/splint/FC-4/splint.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- splint.spec	28 Jul 2005 19:12:46 -0000	1.3
+++ splint.spec	21 Apr 2006 15:04:52 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           splint
 Version:        3.1.1
-Release:        10%{?dist}
+Release:        13%{?dist}
 Summary:        An implementation of the lint program
 
 Group:          Development/Tools
@@ -20,11 +20,13 @@
 
 %prep
 %setup -q
+chmod 644 doc/manual.pdf
+cp -p src/.splintrc splintrc.demo
 
 %build
 %configure
 # Parallel builds seem to fail
-make 
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -36,13 +38,23 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README doc/manual.pdf
+%doc README doc/manual.pdf splintrc.demo
 %{_bindir}/*
 %{_mandir}/man1/*.1*
 %{_datadir}/%{name}/
 
 
 %changelog
+* Thu Apr 20 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.1.1-13
+- Manual.pdf - file permissions corrected.
+- Included a demo .splintrc file as doc (splintrc.demo == src/.splintrc).
+
+* Mon Feb 13 2006 Paul Nasrat <pnasrat at redhat.com> - 3.1.1-12
+- FC5 rebuild for new gcc
+
+* Sun Jan 15 2006 Paul Nasrat <pnasrat at redhat.com> - 3.1.1-11
+- Rebuild for FC5
+
 * Thu Jul 28 2005 Paul Nasrat <pnasrat at redhat.com> - 3.1.1-10
 - Turn off parallel builds
 



From fedora-extras-commits at redhat.com  Fri Apr 21 15:04:53 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 08:04:53 -0700
Subject: rpms/splint/FC-5 splint.spec,1.5,1.6
Message-ID: <200604211505.k3LF5PtT026272@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/splint/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26226/FC-5

Modified Files:
	splint.spec 
Log Message:
Sync with devel


Index: splint.spec
===================================================================
RCS file: /cvs/extras/rpms/splint/FC-5/splint.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- splint.spec	13 Feb 2006 19:17:27 -0000	1.5
+++ splint.spec	21 Apr 2006 15:04:53 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           splint
 Version:        3.1.1
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        An implementation of the lint program
 
 Group:          Development/Tools
@@ -20,11 +20,13 @@
 
 %prep
 %setup -q
+chmod 644 doc/manual.pdf
+cp -p src/.splintrc splintrc.demo
 
 %build
 %configure
 # Parallel builds seem to fail
-make 
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -36,13 +38,17 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README doc/manual.pdf
+%doc README doc/manual.pdf splintrc.demo
 %{_bindir}/*
 %{_mandir}/man1/*.1*
 %{_datadir}/%{name}/
 
 
 %changelog
+* Thu Apr 20 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.1.1-13
+- Manual.pdf - file permissions corrected.
+- Included a demo .splintrc file as doc (splintrc.demo == src/.splintrc).
+
 * Mon Feb 13 2006 Paul Nasrat <pnasrat at redhat.com> - 3.1.1-12
 - FC5 rebuild for new gcc
 



From fedora-extras-commits at redhat.com  Fri Apr 21 15:15:03 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 08:15:03 -0700
Subject: rpms/perl-Sub-Uplevel/devel .cvsignore, 1.2,
	1.3 perl-Sub-Uplevel.spec, 
	1.7, 1.8 sources, 1.2, 1.3 Sub-Uplevel-0.09-Uplevel.pm.patch,
	1.1, NONE
Message-ID: <200604211515.k3LFF5bR026458@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Sub-Uplevel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26437

Modified Files:
	.cvsignore perl-Sub-Uplevel.spec sources 
Removed Files:
	Sub-Uplevel-0.09-Uplevel.pm.patch 
Log Message:
Update to 0.10.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Mar 2005 03:05:23 -0000	1.2
+++ .cvsignore	21 Apr 2006 15:15:02 -0000	1.3
@@ -1 +1 @@
-Sub-Uplevel-0.09.tar.gz
+Sub-Uplevel-0.10.tar.gz


Index: perl-Sub-Uplevel.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/devel/perl-Sub-Uplevel.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Sub-Uplevel.spec	22 Feb 2006 21:12:16 -0000	1.7
+++ perl-Sub-Uplevel.spec	21 Apr 2006 15:15:03 -0000	1.8
@@ -1,13 +1,12 @@
 Name:           perl-Sub-Uplevel
-Version:        0.09
-Release:        4%{?dist}
+Version:        0.10
+Release:        1%{?dist}
 Summary:        Run a perl function in an upper stack frame
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Sub-Uplevel/
-Source0:        http://www.cpan.org/authors/id/M/MS/MSCHWERN/Sub-Uplevel-%{version}.tar.gz
-Patch0:         Sub-Uplevel-0.09-Uplevel.pm.patch
+Source0:        http://www.cpan.org/authors/id/D/DA/DAGOLDEN/Sub-Uplevel-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -22,7 +21,6 @@
 
 %prep
 %setup -q -n Sub-Uplevel-%{version}
-%patch0 -p1
 
 
 %build
@@ -54,6 +52,11 @@
 
 
 %changelog
+* Fri Apr 21 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.10-1
+- Update to 0.10.
+- New upstream maintainer.
+- Patch dropped.
+
 * Wed Feb 22 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.09-4
 - Uplevel.pm patch (perl 5.8.8). See bugzilla entry #182488.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Mar 2005 03:05:23 -0000	1.2
+++ sources	21 Apr 2006 15:15:03 -0000	1.3
@@ -1 +1 @@
-eb09cb38cd7a9b7bc9d3e85e61fe09dd  Sub-Uplevel-0.09.tar.gz
+1dcde4e58ee1eb623b7ee974f5d7d6da  Sub-Uplevel-0.10.tar.gz


--- Sub-Uplevel-0.09-Uplevel.pm.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Apr 21 15:31:06 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 08:31:06 -0700
Subject: rpms/perl-Sub-Uplevel/FC-5 .cvsignore, 1.2,
	1.3 perl-Sub-Uplevel.spec, 
	1.7, 1.8 sources, 1.2, 1.3 Sub-Uplevel-0.09-Uplevel.pm.patch,
	1.1, NONE
Message-ID: <200604211531.k3LFV8gR026719@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Sub-Uplevel/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26698

Modified Files:
	.cvsignore perl-Sub-Uplevel.spec sources 
Removed Files:
	Sub-Uplevel-0.09-Uplevel.pm.patch 
Log Message:
Update to 0.10.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Mar 2005 03:05:23 -0000	1.2
+++ .cvsignore	21 Apr 2006 15:31:06 -0000	1.3
@@ -1 +1 @@
-Sub-Uplevel-0.09.tar.gz
+Sub-Uplevel-0.10.tar.gz


Index: perl-Sub-Uplevel.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/FC-5/perl-Sub-Uplevel.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Sub-Uplevel.spec	22 Feb 2006 21:12:16 -0000	1.7
+++ perl-Sub-Uplevel.spec	21 Apr 2006 15:31:06 -0000	1.8
@@ -1,13 +1,12 @@
 Name:           perl-Sub-Uplevel
-Version:        0.09
-Release:        4%{?dist}
+Version:        0.10
+Release:        1%{?dist}
 Summary:        Run a perl function in an upper stack frame
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Sub-Uplevel/
-Source0:        http://www.cpan.org/authors/id/M/MS/MSCHWERN/Sub-Uplevel-%{version}.tar.gz
-Patch0:         Sub-Uplevel-0.09-Uplevel.pm.patch
+Source0:        http://www.cpan.org/authors/id/D/DA/DAGOLDEN/Sub-Uplevel-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -22,7 +21,6 @@
 
 %prep
 %setup -q -n Sub-Uplevel-%{version}
-%patch0 -p1
 
 
 %build
@@ -54,6 +52,11 @@
 
 
 %changelog
+* Fri Apr 21 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.10-1
+- Update to 0.10.
+- New upstream maintainer.
+- Patch dropped.
+
 * Wed Feb 22 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.09-4
 - Uplevel.pm patch (perl 5.8.8). See bugzilla entry #182488.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Mar 2005 03:05:23 -0000	1.2
+++ sources	21 Apr 2006 15:31:06 -0000	1.3
@@ -1 +1 @@
-eb09cb38cd7a9b7bc9d3e85e61fe09dd  Sub-Uplevel-0.09.tar.gz
+1dcde4e58ee1eb623b7ee974f5d7d6da  Sub-Uplevel-0.10.tar.gz


--- Sub-Uplevel-0.09-Uplevel.pm.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Apr 21 15:34:26 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 08:34:26 -0700
Subject: rpms/perl-Sub-Uplevel/FC-4 .cvsignore, 1.2,
	1.3 perl-Sub-Uplevel.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <200604211534.k3LFYS2Z026802@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Sub-Uplevel/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26781

Modified Files:
	.cvsignore perl-Sub-Uplevel.spec sources 
Log Message:
Update to 0.10.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Mar 2005 03:05:23 -0000	1.2
+++ .cvsignore	21 Apr 2006 15:34:26 -0000	1.3
@@ -1 +1 @@
-Sub-Uplevel-0.09.tar.gz
+Sub-Uplevel-0.10.tar.gz


Index: perl-Sub-Uplevel.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/FC-4/perl-Sub-Uplevel.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Sub-Uplevel.spec	6 Apr 2005 22:13:08 -0000	1.4
+++ perl-Sub-Uplevel.spec	21 Apr 2006 15:34:26 -0000	1.5
@@ -1,20 +1,17 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-Sub-Uplevel
-Version:        0.09
-Release:        2
-
+Version:        0.10
+Release:        1%{?dist}
 Summary:        Run a perl function in an upper stack frame
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Sub-Uplevel/
-Source0:   http://www.cpan.org/authors/id/M/MS/MSCHWERN/Sub-Uplevel-0.09.tar.gz
+Source0:        http://www.cpan.org/authors/id/D/DA/DAGOLDEN/Sub-Uplevel-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 Like Tcl's uplevel() function, but not quite so dangerous.  The
@@ -39,7 +36,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -55,7 +52,18 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Fri Apr 21 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.10-1
+- Update to 0.10.
+- New upstream maintainer.
+- Patch dropped.
+
+* Wed Feb 22 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.09-4
+- Uplevel.pm patch (perl 5.8.8). See bugzilla entry #182488.
+
+* Thu Dec 29 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.09-3
+- Dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.09-2
 - rebuilt
 
 * Thu Jul  8 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.09-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Mar 2005 03:05:23 -0000	1.2
+++ sources	21 Apr 2006 15:34:26 -0000	1.3
@@ -1 +1 @@
-eb09cb38cd7a9b7bc9d3e85e61fe09dd  Sub-Uplevel-0.09.tar.gz
+1dcde4e58ee1eb623b7ee974f5d7d6da  Sub-Uplevel-0.10.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 15:42:13 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 08:42:13 -0700
Subject: rpms/perl-Test-MockObject/devel .cvsignore, 1.8,
	1.9 perl-Test-MockObject.spec, 1.12, 1.13 sources, 1.8, 1.9
Message-ID: <200604211542.k3LFgFsM026915@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-serv26894

Modified Files:
	.cvsignore perl-Test-MockObject.spec sources 
Log Message:
Update to 1.06.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	11 Apr 2006 18:13:16 -0000	1.8
+++ .cvsignore	21 Apr 2006 15:42:13 -0000	1.9
@@ -1 +1 @@
-Test-MockObject-1.05.tar.gz
+Test-MockObject-1.06.tar.gz


Index: perl-Test-MockObject.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/perl-Test-MockObject.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-Test-MockObject.spec	11 Apr 2006 18:13:16 -0000	1.12
+++ perl-Test-MockObject.spec	21 Apr 2006 15:42:13 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           perl-Test-MockObject
-Version:        1.05
+Version:        1.06
 Release:        1%{?dist}
 Summary:        Perl extension for emulating troublesome interfaces
 
@@ -59,6 +59,9 @@
 
 
 %changelog
+* Fri Apr 21 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.06-1
+- Update to 1.06.
+
 * Tue Apr 11 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.05-1
 - Update to 1.05.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	11 Apr 2006 18:13:16 -0000	1.8
+++ sources	21 Apr 2006 15:42:13 -0000	1.9
@@ -1 +1 @@
-f0dbe875fd3af865126ede948408dbaa  Test-MockObject-1.05.tar.gz
+3cef7884dd6fc6b15c35dd04697a8853  Test-MockObject-1.06.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 15:55:24 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 08:55:24 -0700
Subject: rpms/perl-Test-MockObject/FC-5 .cvsignore, 1.8,
	1.9 perl-Test-MockObject.spec, 1.12, 1.13 sources, 1.8, 1.9
Message-ID: <200604211555.k3LFtQDl027035@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-serv27014

Modified Files:
	.cvsignore perl-Test-MockObject.spec sources 
Log Message:
Update to 1.06.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-MockObject/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	11 Apr 2006 18:13:15 -0000	1.8
+++ .cvsignore	21 Apr 2006 15:55:23 -0000	1.9
@@ -1 +1 @@
-Test-MockObject-1.05.tar.gz
+Test-MockObject-1.06.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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-Test-MockObject.spec	11 Apr 2006 18:13:15 -0000	1.12
+++ perl-Test-MockObject.spec	21 Apr 2006 15:55:23 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           perl-Test-MockObject
-Version:        1.05
+Version:        1.06
 Release:        1%{?dist}
 Summary:        Perl extension for emulating troublesome interfaces
 
@@ -59,6 +59,9 @@
 
 
 %changelog
+* Fri Apr 21 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.06-1
+- Update to 1.06.
+
 * Tue Apr 11 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.05-1
 - Update to 1.05.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-MockObject/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	11 Apr 2006 18:13:15 -0000	1.8
+++ sources	21 Apr 2006 15:55:23 -0000	1.9
@@ -1 +1 @@
-f0dbe875fd3af865126ede948408dbaa  Test-MockObject-1.05.tar.gz
+3cef7884dd6fc6b15c35dd04697a8853  Test-MockObject-1.06.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 15:59:44 2006
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Fri, 21 Apr 2006 08:59:44 -0700
Subject: extras-buildsys/utils extras-repobuild.py, 1.12,
	1.13 extras-repoview.py, 1.2, 1.3 extras-sign-move.py, 1.9, 1.10
Message-ID: <200604211559.k3LFxixn027137@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27115

Modified Files:
	extras-repobuild.py extras-repoview.py extras-sign-move.py 
Log Message:

correct paths for extras64 re-do.



Index: extras-repobuild.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/extras-repobuild.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- extras-repobuild.py	24 Mar 2006 23:14:28 -0000	1.12
+++ extras-repobuild.py	21 Apr 2006 15:59:41 -0000	1.13
@@ -25,7 +25,7 @@
 # email to fedora-extras-list with the built packages list
 # sing, dance, romance
 
-treedir = '/rpmbuild/extras/tree/extras'
+treedir = '/srv/rpmbuild/extras/tree/extras'
 cachedir = '/tmp/repomd-cache'
 compsname = 'comps.xml'
 archdict = {'3':['x86_64', 'i386'], 


Index: extras-repoview.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/extras-repoview.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- extras-repoview.py	17 Mar 2006 07:46:49 -0000	1.2
+++ extras-repoview.py	21 Apr 2006 15:59:41 -0000	1.3
@@ -21,7 +21,7 @@
 # get the path to where to look for the packages to be signed
 # make repoview
 
-treedir = '/rpmbuild/extras/tree/extras'
+treedir = '/srv/rpmbuild/extras/tree/extras'
 archdict = {'3':['x86_64', 'i386'], 
             '4':['ppc','x86_64', 'i386'],
             '5':['ppc','x86_64', 'i386'],


Index: extras-sign-move.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/extras-sign-move.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- extras-sign-move.py	9 Apr 2006 09:39:53 -0000	1.9
+++ extras-sign-move.py	21 Apr 2006 15:59:41 -0000	1.10
@@ -31,8 +31,8 @@
 # email to fedora-extras-list with the built packages list
 
 
-stagesdir = '/rpmbuild/repodir'
-treedir = '/rpmbuild/extras/tree/extras'
+stagesdir = '/srv/rpmbuild/repodir'
+treedir = '/srv/rpmbuild/extras/tree/extras'
 cachedir = '/tmp/repomd-cache'
 compsname = 'comps.xml'
 archdict = {'3':['x86_64', 'i386'], 



From fedora-extras-commits at redhat.com  Fri Apr 21 16:05:21 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Fri, 21 Apr 2006 09:05:21 -0700
Subject: rpms/paraview/devel paraview.spec,1.2,1.3
Message-ID: <200604211605.k3LG5NrE029214@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/paraview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29197

Modified Files:
	paraview.spec 
Log Message:
Re-enable ppc



Index: paraview.spec
===================================================================
RCS file: /cvs/extras/rpms/paraview/devel/paraview.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- paraview.spec	17 Apr 2006 22:25:13 -0000	1.2
+++ paraview.spec	21 Apr 2006 16:05:21 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           paraview
 Version:        2.4.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Parallel visualization application
 
 Group:          Applications/Engineering
@@ -20,7 +20,6 @@
 BuildRequires:  freetype-devel, libjpeg-devel, libpng-devel, libtiff-devel, zlib-devel
 BuildRequires:  expat-devel
 BuildRequires:  /usr/bin/desktop-file-install
-ExcludeArch:    ppc
 
 Requires:       %{name}-data = %{version}-%{release}
 Requires(post):   /usr/bin/update-desktop-database
@@ -310,6 +309,9 @@
 
 
 %changelog
+* Fri Apr 21 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.3-7
+- Re-enable ppc
+
 * Mon Apr 17 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.3-6
 - Exclude ppc due to gcc bug #189160
 



From fedora-extras-commits at redhat.com  Fri Apr 21 16:33:06 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Fri, 21 Apr 2006 09:33:06 -0700
Subject: rpms/wifiroamd - New directory
Message-ID: <200604211633.k3LGX8qw029499@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/wifiroamd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29469/wifiroamd

Log Message:
Directory /cvs/extras/rpms/wifiroamd added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 16:33:06 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Fri, 21 Apr 2006 09:33:06 -0700
Subject: rpms/wifiroamd/devel - New directory
Message-ID: <200604211633.k3LGX8fZ029503@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/wifiroamd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29469/wifiroamd/devel

Log Message:
Directory /cvs/extras/rpms/wifiroamd/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 16:33:15 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Fri, 21 Apr 2006 09:33:15 -0700
Subject: rpms/wifiroamd/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604211633.k3LGXHjL029566@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/wifiroamd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29526/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module wifiroamd


--- 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 Apr 21 16:33:15 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Fri, 21 Apr 2006 09:33:15 -0700
Subject: rpms/wifiroamd Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604211633.k3LGXHmE029562@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/wifiroamd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29526

Added Files:
	Makefile import.log 
Log Message:
Setup of module wifiroamd


--- NEW FILE Makefile ---
# Top level Makefile for module wifiroamd
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 21 17:00:17 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Fri, 21 Apr 2006 10:00:17 -0700
Subject: rpms/torque/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 torque.spec,
	1.2, 1.3
Message-ID: <200604211700.k3LH0J6l031307@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31286

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Fri Apr 21 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.10.200604211036cvs
- bump



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Apr 2006 02:10:40 -0000	1.2
+++ .cvsignore	21 Apr 2006 17:00:17 -0000	1.3
@@ -1 +1 @@
-torque-2.1.0p0-snap.200604171430.tar.gz
+torque-2.1.0p0-snap.200604211036.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Apr 2006 02:10:40 -0000	1.2
+++ sources	21 Apr 2006 17:00:17 -0000	1.3
@@ -1 +1 @@
-00ae6cf8f95960c83022ff9037dc1d57  torque-2.1.0p0-snap.200604171430.tar.gz
+3b40c0d81a06ef4abe14c3bb7522086d  torque-2.1.0p0-snap.200604211036.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/torque.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- torque.spec	21 Apr 2006 07:01:22 -0000	1.2
+++ torque.spec	21 Apr 2006 17:00:17 -0000	1.3
@@ -2,8 +2,8 @@
 # comment out snap if building a real release
 %define name torque
 %define version 2.1.0p0
-%define snap 200604171430
-%define release 8
+%define snap 200604211036
+%define release 10
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -91,7 +91,6 @@
 Source4: xpbs.png
 Source5: xpbsmon.png
 Patch1: torque-2.1.0-remove-rpath.path
-Patch2: torque-2.1.0p0-sched-offbyone.patch
 License: Freely redistributable (See PBS_License.txt)
 Group: System Environment/Daemons
 URL: http://www.clusterresources.com/products/torque/
@@ -120,7 +119,6 @@
 %prep
 %setup -q -n torque-%{version}%{?snap:-snap.%snap}
 %patch1 -p1
-%patch2 -p1
 
 %__cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} .
 
@@ -425,6 +423,12 @@
 
 
 %changelog
+* Fri Apr 21 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.10.200604211036cvs
+- bump
+
+* Fri Apr 21 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.9.200604171430cvs
+- fix qsub write return check
+
 * Thu Apr 20 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.8.200604171430cvs
 - fix pbs_sched error opening lockfile and immediately exiting
 



From fedora-extras-commits at redhat.com  Fri Apr 21 17:05:11 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Fri, 21 Apr 2006 10:05:11 -0700
Subject: rpms/proftpd/devel .cvsignore, 1.7, 1.8 proftpd.init, 1.4,
	1.5 proftpd.spec, 1.13, 1.14 sources, 1.7, 1.8
Message-ID: <200604211705.k3LH5DTL001073@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/proftpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1043

Modified Files:
	.cvsignore proftpd.init proftpd.spec sources 
Log Message:
Update to 1.3.0 final and add ldap, mysql and postgresql sub-packages.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	7 Mar 2006 10:34:01 -0000	1.7
+++ .cvsignore	21 Apr 2006 17:05:11 -0000	1.8
@@ -1 +1 @@
-proftpd-1.3.0rc4.tar.bz2
+proftpd-1.3.0.tar.bz2


Index: proftpd.init
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- proftpd.init	16 Nov 2004 18:34:32 -0000	1.4
+++ proftpd.init	21 Apr 2006 17:05:11 -0000	1.5
@@ -32,7 +32,7 @@
 
 start() {
 	echo -n $"Starting $prog: "
-	daemon proftpd
+	daemon proftpd 2>/dev/null
 	RETVAL=$?
 	echo
 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/proftpd


Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- proftpd.spec	7 Mar 2006 10:34:01 -0000	1.13
+++ proftpd.spec	21 Apr 2006 17:05:11 -0000	1.14
@@ -1,11 +1,11 @@
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
 Version: 1.3.0
-Release: 0.2.rc4%{?dist}
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
-Source0: ftp://ftp.proftpd.org/distrib/source/proftpd-%{version}rc4.tar.bz2
+Source0: ftp://ftp.proftpd.org/distrib/source/proftpd-%{version}.tar.bz2
 Source1: proftpd.conf
 Source2: proftpd.init
 Source3: proftpd-xinetd
@@ -13,18 +13,14 @@
 Source5: welcome.msg
 Source6: proftpd.pam
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: pam >= 0.59, /sbin/service, /sbin/chkconfig
-BuildRequires: pam-devel, perl, ncurses-devel, pkgconfig
-%{!?_without_tls:Requires: openssl}
-%{!?_without_tls:BuildRequires: openssl-devel, krb5-devel}
-%{?_with_ldap:Requires: openldap}
-%{?_with_ldap:BuildRequires: openldap-devel}
-%{?_with_mysql:Requires: mysql}
-%{?_with_mysql:BuildRequires: mysql-devel, zlib-devel}
-%{?_with_postgresql:Requires: postgresql-libs}
-%{?_with_postgresql:BuildRequires: postgresql-devel}
+Requires: pam >= 0.59
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/service, /sbin/chkconfig
+Requires(postun): /sbin/service
+BuildRequires: pam-devel, ncurses-devel, pkgconfig
+BuildRequires: openssl-devel, krb5-devel, libacl-devel
+BuildRequires: openldap-devel, mysql-devel, zlib-devel, postgresql-devel
 Provides: ftpserver
-Conflicts: wu-ftpd, anonftp, vsftpd
 
 %description
 ProFTPD is an enhanced FTP server with a focus toward simplicity, security,
@@ -36,56 +32,73 @@
 This package defaults to the standalone behaviour of ProFTPD, but all the
 needed scripts to have it run by xinetd instead are included.
 
-Available rpmbuild rebuild options :
---without : tls
---with : ldap mysql postgresql ipv6
+
+%package ldap
+Summary: Module to add LDAP support to the ProFTPD FTP server
+Group: System Environment/Daemons
+Requires: %{name} = %{version}-%{release}
+
+%description ldap
+Module to add LDAP support to the ProFTPD FTP server.
+
+
+%package mysql
+Summary: Module to add MySQL support to the ProFTPD FTP server
+Group: System Environment/Daemons
+Requires: %{name} = %{version}-%{release}
+
+%description mysql
+Module to add MySQL support to the ProFTPD FTP server.
+
+
+%package postgresql
+Summary: Module to add PostgreSQL support to the ProFTPD FTP server
+Group: System Environment/Daemons
+Requires: %{name} = %{version}-%{release}
+
+%description postgresql
+Module to add PostgreSQL support to the ProFTPD FTP server.
 
 
 %prep
-%setup -n %{name}-%{version}rc4
+%setup
 
 
 %build
-# Workaround for the PostgreSQL include file
-%{__perl} -pi -e 's|pgsql/libpq-fe.h|libpq-fe.h|g' contrib/mod_sql_postgres.c
-
 # Disable stripping in order to get useful debuginfo packages
 %{__perl} -pi -e 's|"-s"|""|g' configure
 
-# TLS includes
-OPENSSL_INC=""
-if OPENSSL_CFLAGS=`pkg-config --cflags openssl`; then
-    for i in ${OPENSSL_CFLAGS}; do
-        INCPATH=`echo $i | perl -pi -e 's|-I([a-z/]*)|$1|g'`
-        test ! -z ${INCPATH} && OPENSSL_INC="${OPENSSL_INC}:${INCPATH}"
-    done
-fi
-
 %configure \
-    --localstatedir="/var/run" \
-    --with-includes="%{_includedir}%{!?_without_tls:${OPENSSL_INC}}%{?_with_mysql::%{_includedir}/mysql}" \
-    %{?_with_ipv6:--enable-ipv6} \
-    %{?_with_mysql:--with-libraries="%{_libdir}/mysql"} \
-    %{?_with_postgresql:--with-libraries="%{_libdir}"} \
-    --with-modules=mod_readme:mod_auth_pam%{?_with_ldap::mod_ldap}%{?_with_mysql::mod_sql:mod_sql_mysql}%{?_with_postgresql::mod_sql:mod_sql_postgres}%{!?_without_tls::mod_tls}
+    --libexecdir="%{_libexecdir}/proftpd" \
+    --localstatedir="%{_var}/run" \
+    --enable-ctrls \
+    --enable-facl \
+    --enable-dso \
+    --enable-ipv6 \
+    --with-libraries="%{_libdir}/mysql" \
+    --with-includes="%{_includedir}/mysql" \
+    --with-modules=mod_readme:mod_auth_pam:mod_tls \
+    --with-shared=mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres
+
 %{__make} %{?_smp_mflags}
 
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall rundir="%{buildroot}%{_localstatedir}/run/proftpd" \
+%{__make} install DESTDIR=%{buildroot} \
+    rundir="%{_var}/run/proftpd" \
     INSTALL_USER=`id -un` \
     INSTALL_GROUP=`id -gn`
-%{__install} -D -p -m 640 %{SOURCE1} \
+%{__install} -D -p -m 0640 %{SOURCE1} \
     %{buildroot}%{_sysconfdir}/proftpd.conf
-%{__install} -D -p -m 755 %{SOURCE2} \
+%{__install} -D -p -m 0755 %{SOURCE2} \
     %{buildroot}%{_sysconfdir}/rc.d/init.d/proftpd
-%{__install} -D -p -m 640 %{SOURCE3} \
+%{__install} -D -p -m 0640 %{SOURCE3} \
     %{buildroot}%{_sysconfdir}/xinetd.d/xproftpd
-%{__install} -D -p -m 644 %{SOURCE4} \
+%{__install} -D -p -m 0644 %{SOURCE4} \
     %{buildroot}%{_sysconfdir}/logrotate.d/proftpd
-%{__install} -D -p -m 644 %{SOURCE5} %{buildroot}/var/ftp/welcome.msg
-%{__install} -D -p -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/pam.d/proftpd
+%{__install} -D -p -m 0644 %{SOURCE5} %{buildroot}/var/ftp/welcome.msg
+%{__install} -D -p -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/pam.d/proftpd
 %{__mkdir_p} %{buildroot}/var/ftp/uploads
 %{__mkdir_p} %{buildroot}/var/ftp/pub
 %{__mkdir_p} %{buildroot}/var/log/proftpd
@@ -97,7 +110,7 @@
 
 
 %post
-if [ $1 = 1 ]; then
+if [ $1 -eq 1 ]; then
     /sbin/chkconfig --add proftpd
     IFS=":"; cat /etc/passwd | \
     while { read username nu nu gid nu nu nu nu; }; do \
@@ -108,12 +121,12 @@
 fi
 
 %preun
-if [ $1 = 0 ]; then
+if [ $1 -eq 0 ]; then
     /sbin/service proftpd stop &>/dev/null || :
     /sbin/chkconfig --del proftpd
     /sbin/service xinetd reload &>/dev/null || :
-    if [ -d /var/run/proftpd ]; then
-        rm -rf /var/run/proftpd/*
+    if [ -d %{_var}/run/proftpd ]; then
+        rm -rf %{_var}/run/proftpd/*
     fi
 fi
 
@@ -136,6 +149,10 @@
 %{_sysconfdir}/rc.d/init.d/proftpd
 %{_mandir}/*/*
 %{_bindir}/*
+%dir %{_libexecdir}/proftpd/
+%{_libexecdir}/proftpd/mod_sql.so
+%exclude %{_libexecdir}/proftpd/*.a
+%exclude %{_libexecdir}/proftpd/*.la
 %{_sbindir}/*
 %dir /var/ftp/
 %attr(331, ftp, ftp) %dir /var/ftp/uploads/
@@ -143,8 +160,37 @@
 %config(noreplace) /var/ftp/welcome.msg
 %attr(750, root, root) %dir /var/log/proftpd/
 
+%files ldap
+%defattr(-, root, root, 0755)
+%dir %{_libexecdir}/proftpd/
+%{_libexecdir}/proftpd/mod_ldap.so
+
+%files mysql
+%defattr(-, root, root, 0755)
+%dir %{_libexecdir}/proftpd/
+%{_libexecdir}/proftpd/mod_sql_mysql.so
+
+%files postgresql
+%defattr(-, root, root, 0755)
+%dir %{_libexecdir}/proftpd/
+%{_libexecdir}/proftpd/mod_sql_postgres.so
+
 
 %changelog
+* Fri Apr 21 2006 Matthias Saou <http://freshrpms.net/> 1.3.0-1
+- Update to 1.3.0 final.
+- Remove no longer needed PostgreSQL and OpenSSL detection workarounds.
+- Remove explicit conflicts on wu-ftpd, anonftp and vsftpd to let people
+  install more than one ftp daemon (what for? hmm...) (#189023).
+- Enable LDAP, MySQL and PostgreSQL as DSOs by default, and stuff them in
+  new sub-packages. This won't introduce any regression since they weren't
+  enabled by default.
+- Remove useless explicit requirements.
+- Rearrange scriplets requirements.
+- Enable ctrls (controls via ftpdctl) and facl (POSIX ACLs).
+- Using --disable-static makes the build fail, so exclude .a files in %%files.
+- Silence harmless IPv6 failure message at startup when IPv6 isn't available.
+
 * Tue Mar  7 2006 Matthias Saou <http://freshrpms.net/> 1.3.0-0.2.rc4
 - Update to 1.3.0rc4 (bugfix release).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	7 Mar 2006 10:34:01 -0000	1.7
+++ sources	21 Apr 2006 17:05:11 -0000	1.8
@@ -1 +1 @@
-175da3e672d9f441b852259c7baee21e  proftpd-1.3.0rc4.tar.bz2
+fae47d01b52e035eb6b7190e74c17722  proftpd-1.3.0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Apr 21 17:05:43 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Fri, 21 Apr 2006 10:05:43 -0700
Subject: rpms/pygame/FC-4 pygame.spec,1.1,1.2
Message-ID: <200604211705.k3LH5jEP001160@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1088/pygame/FC-4

Modified Files:
	pygame.spec 
Log Message:
Added obsolete and provides for python-pygame


Index: pygame.spec
===================================================================
RCS file: /cvs/extras/rpms/pygame/FC-4/pygame.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pygame.spec	21 Apr 2006 00:19:40 -0000	1.1
+++ pygame.spec	21 Apr 2006 17:05:43 -0000	1.2
@@ -14,6 +14,8 @@
 BuildRequires:  python-devel python-numeric
 BuildRequires:  SDL_ttf-devel SDL_image-devel SDL_mixer-devel
 Requires:       python-numeric
+Obsoletes:      python-pygame < 1.7.1
+Provides:       python-pygame = %{version}-%{release}
 
 %description
 Pygame is a set of Python modules designed for writing games. It is
@@ -25,7 +27,7 @@
 %package devel
 Summary:        Files needed for developing programs which use pygame
 Group:          Development/Libraries
-Requires:       %{name} == %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description devel
 This package contains headers required to build applications that use



From fedora-extras-commits at redhat.com  Fri Apr 21 17:05:44 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Fri, 21 Apr 2006 10:05:44 -0700
Subject: rpms/pygame/FC-5 pygame.spec,1.1,1.2
Message-ID: <200604211705.k3LH5k5P001162@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1088/pygame/FC-5

Modified Files:
	pygame.spec 
Log Message:
Added obsolete and provides for python-pygame


Index: pygame.spec
===================================================================
RCS file: /cvs/extras/rpms/pygame/FC-5/pygame.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pygame.spec	21 Apr 2006 00:19:40 -0000	1.1
+++ pygame.spec	21 Apr 2006 17:05:44 -0000	1.2
@@ -14,6 +14,8 @@
 BuildRequires:  python-devel python-numeric
 BuildRequires:  SDL_ttf-devel SDL_image-devel SDL_mixer-devel
 Requires:       python-numeric
+Obsoletes:      python-pygame < 1.7.1
+Provides:       python-pygame = %{version}-%{release}
 
 %description
 Pygame is a set of Python modules designed for writing games. It is
@@ -25,7 +27,7 @@
 %package devel
 Summary:        Files needed for developing programs which use pygame
 Group:          Development/Libraries
-Requires:       %{name} == %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description devel
 This package contains headers required to build applications that use



From fedora-extras-commits at redhat.com  Fri Apr 21 17:05:44 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Fri, 21 Apr 2006 10:05:44 -0700
Subject: rpms/pygame/devel pygame.spec,1.1,1.2
Message-ID: <200604211705.k3LH5kKE001166@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1088/pygame/devel

Modified Files:
	pygame.spec 
Log Message:
Added obsolete and provides for python-pygame


Index: pygame.spec
===================================================================
RCS file: /cvs/extras/rpms/pygame/devel/pygame.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pygame.spec	21 Apr 2006 00:19:40 -0000	1.1
+++ pygame.spec	21 Apr 2006 17:05:44 -0000	1.2
@@ -14,6 +14,8 @@
 BuildRequires:  python-devel python-numeric
 BuildRequires:  SDL_ttf-devel SDL_image-devel SDL_mixer-devel
 Requires:       python-numeric
+Obsoletes:      python-pygame < 1.7.1
+Provides:       python-pygame = %{version}-%{release}
 
 %description
 Pygame is a set of Python modules designed for writing games. It is
@@ -25,7 +27,7 @@
 %package devel
 Summary:        Files needed for developing programs which use pygame
 Group:          Development/Libraries
-Requires:       %{name} == %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description devel
 This package contains headers required to build applications that use



From fedora-extras-commits at redhat.com  Fri Apr 21 17:09:30 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Fri, 21 Apr 2006 10:09:30 -0700
Subject: rpms/pygame/FC-4 pygame.spec,1.2,1.3
Message-ID: <200604211709.k3LH9Wrf001389@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1344/pygame/FC-4

Modified Files:
	pygame.spec 
Log Message:
Add changelog for new changes


Index: pygame.spec
===================================================================
RCS file: /cvs/extras/rpms/pygame/FC-4/pygame.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pygame.spec	21 Apr 2006 17:05:43 -0000	1.2
+++ pygame.spec	21 Apr 2006 17:09:30 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           pygame
 Version:        1.7.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python modules for writing games
 Group:          Development/Languages
 License:        LGPL
@@ -77,6 +77,11 @@
 %{_includedir}/python*/%{name}/*.h
 
 %changelog
+* Fri Apr 21 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-3
+- Obsolete linva python-pygame package
+- Added Provides for python-pygame
+- Fix equal sign in devel requires
+
 * Thu Apr 20 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-2
 - Added a patch to clean up some warnings on 64 bit compiles
 



From fedora-extras-commits at redhat.com  Fri Apr 21 17:09:31 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Fri, 21 Apr 2006 10:09:31 -0700
Subject: rpms/pygame/devel pygame.spec,1.2,1.3
Message-ID: <200604211709.k3LH9XHk001396@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1344/pygame/devel

Modified Files:
	pygame.spec 
Log Message:
Add changelog for new changes


Index: pygame.spec
===================================================================
RCS file: /cvs/extras/rpms/pygame/devel/pygame.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pygame.spec	21 Apr 2006 17:05:44 -0000	1.2
+++ pygame.spec	21 Apr 2006 17:09:31 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           pygame
 Version:        1.7.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python modules for writing games
 Group:          Development/Languages
 License:        LGPL
@@ -77,6 +77,11 @@
 %{_includedir}/python*/%{name}/*.h
 
 %changelog
+* Fri Apr 21 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-3
+- Obsolete linva python-pygame package
+- Added Provides for python-pygame
+- Fix equal sign in devel requires
+
 * Thu Apr 20 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-2
 - Added a patch to clean up some warnings on 64 bit compiles
 



From fedora-extras-commits at redhat.com  Fri Apr 21 17:09:30 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Fri, 21 Apr 2006 10:09:30 -0700
Subject: rpms/pygame/FC-5 pygame.spec,1.2,1.3
Message-ID: <200604211709.k3LH9W1a001394@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1344/pygame/FC-5

Modified Files:
	pygame.spec 
Log Message:
Add changelog for new changes


Index: pygame.spec
===================================================================
RCS file: /cvs/extras/rpms/pygame/FC-5/pygame.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pygame.spec	21 Apr 2006 17:05:44 -0000	1.2
+++ pygame.spec	21 Apr 2006 17:09:30 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           pygame
 Version:        1.7.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python modules for writing games
 Group:          Development/Languages
 License:        LGPL
@@ -77,6 +77,11 @@
 %{_includedir}/python*/%{name}/*.h
 
 %changelog
+* Fri Apr 21 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-3
+- Obsolete linva python-pygame package
+- Added Provides for python-pygame
+- Fix equal sign in devel requires
+
 * Thu Apr 20 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-2
 - Added a patch to clean up some warnings on 64 bit compiles
 



From fedora-extras-commits at redhat.com  Fri Apr 21 17:10:12 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Fri, 21 Apr 2006 10:10:12 -0700
Subject: rpms/octave/FC-5 octave-2.9.5-sparse.patch, 1.1, 1.2 octave.spec,
	1.34, 1.35
Message-ID: <200604211710.k3LHAEn0001445@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/octave/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1423

Modified Files:
	octave-2.9.5-sparse.patch octave.spec 
Log Message:
Use updated sparse patch from development tree.

octave-2.9.5-sparse.patch:

Index: octave-2.9.5-sparse.patch
===================================================================
RCS file: /cvs/extras/rpms/octave/FC-5/octave-2.9.5-sparse.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- octave-2.9.5-sparse.patch	23 Mar 2006 22:43:54 -0000	1.1
+++ octave-2.9.5-sparse.patch	21 Apr 2006 17:10:12 -0000	1.2
@@ -2,60 +2,401 @@
 ===================================================================
 RCS file: /cvs/octave/liboctave/SparseCmplxQR.h,v
 retrieving revision 1.2
-diff -u -r1.2 SparseCmplxQR.h
---- liboctave/SparseCmplxQR.h   8 Mar 2006 20:17:38 -0000       1.2
-+++ liboctave/SparseCmplxQR.h   23 Mar 2006 17:56:07 -0000
+retrieving revision 1.3
+diff -u -r1.2 -r1.3
+--- liboctave/SparseCmplxQR.h	8 Mar 2006 20:17:38 -0000	1.2
++++ liboctave/SparseCmplxQR.h	23 Mar 2006 18:22:51 -0000	1.3
 @@ -137,6 +137,23 @@
  #endif
  };
-
+ 
 +
 +// Publish externally used friend functions.
 +
 +extern ComplexMatrix qrsolve (const SparseComplexMatrix &a, const Matrix &b,
-+                             octave_idx_type &info);
++			      octave_idx_type &info);
 +
-+extern SparseComplexMatrix qrsolve (const SparseComplexMatrix &a,
-+                                   const SparseMatrix &b,
-+                                   octave_idx_type &info);
-+
-+extern ComplexMatrix qrsolve (const SparseComplexMatrix &a,
-+                             const ComplexMatrix &b,
-+                             octave_idx_type &info);
-+
-+extern SparseComplexMatrix qrsolve (const SparseComplexMatrix &a,
-+                                   const SparseComplexMatrix &b,
-+                                   octave_idx_type &info);
++extern SparseComplexMatrix qrsolve (const SparseComplexMatrix &a, 
++				    const SparseMatrix &b,
++				    octave_idx_type &info);
++
++extern ComplexMatrix qrsolve (const SparseComplexMatrix &a, 
++			      const ComplexMatrix &b,
++			      octave_idx_type &info);
++
++extern SparseComplexMatrix qrsolve (const SparseComplexMatrix &a, 
++				    const SparseComplexMatrix &b,
++				    octave_idx_type &info);
  #endif
-
+ 
  /*
 Index: liboctave/SparseQR.h
 ===================================================================
 RCS file: /cvs/octave/liboctave/SparseQR.h,v
 retrieving revision 1.2
-diff -u -r1.2 SparseQR.h
---- liboctave/SparseQR.h        8 Mar 2006 20:17:38 -0000       1.2
-+++ liboctave/SparseQR.h        23 Mar 2006 17:56:07 -0000
+retrieving revision 1.3
+diff -u -r1.2 -r1.3
+--- liboctave/SparseQR.h	8 Mar 2006 20:17:38 -0000	1.2
++++ liboctave/SparseQR.h	23 Mar 2006 18:22:51 -0000	1.3
 @@ -133,6 +133,22 @@
  #endif
  };
-
+ 
 +
 +// Publish externally used friend functions.
 +
-+extern Matrix qrsolve (const SparseMatrix &a, const Matrix &b,
-+                      octave_idx_type &info);
++extern Matrix qrsolve (const SparseMatrix &a, const Matrix &b, 
++		       octave_idx_type &info);
 +
 +extern SparseMatrix qrsolve (const SparseMatrix &a, const SparseMatrix &b,
-+                            octave_idx_type &info);
++			     octave_idx_type &info);
 +
 +extern ComplexMatrix qrsolve (const SparseMatrix &a, const ComplexMatrix &b,
-+                             octave_idx_type &info);
++			      octave_idx_type &info);
 +
-+extern SparseComplexMatrix qrsolve (const SparseMatrix &a,
-+                                   const SparseComplexMatrix &b,
-+                                   octave_idx_type &info);
++extern SparseComplexMatrix qrsolve (const SparseMatrix &a, 
++				    const SparseComplexMatrix &b,
++				    octave_idx_type &info);
 +
  #endif
-
+ 
  /*
+Index: liboctave/CMatrix.cc
+===================================================================
+RCS file: /cvs/octave/liboctave/CMatrix.cc,v
+retrieving revision 1.114
+diff -u -r1.114 CMatrix.cc
+--- liboctave/CMatrix.cc	2 Mar 2006 03:40:00 -0000	1.114
++++ liboctave/CMatrix.cc	24 Mar 2006 18:53:58 -0000
+@@ -889,27 +889,6 @@
+   return retval;
+ }
+ 
+-ComplexRowVector
+-ComplexMatrix::row (char *s) const
+-{
+-  if (! s)
+-    {
+-      (*current_liboctave_error_handler) ("invalid row selection");
+-      return ComplexRowVector ();
+-    }
+-
+-  char c = *s;
+-  if (c == 'f' || c == 'F')
+-    return row (static_cast<octave_idx_type>(0));
+-  else if (c == 'l' || c == 'L')
+-    return row (rows () - 1);
+-  else
+-    {
+-      (*current_liboctave_error_handler) ("invalid row selection");
+-      return ComplexRowVector ();
+-    }
+-}
+-
+ ComplexColumnVector
+ ComplexMatrix::column (octave_idx_type i) const
+ {
+@@ -927,27 +906,6 @@
+   return retval;
+ }
+ 
+-ComplexColumnVector
+-ComplexMatrix::column (char *s) const
+-{
+-  if (! s)
+-    {
+-      (*current_liboctave_error_handler) ("invalid column selection");
+-      return ComplexColumnVector ();
+-    }
+-
+-  char c = *s;
+-  if (c == 'f' || c == 'F')
+-    return column (static_cast<octave_idx_type>(0));
+-  else if (c == 'l' || c == 'L')
+-    return column (cols () - 1);
+-  else
+-    {
+-      (*current_liboctave_error_handler) ("invalid column selection");
+-      return ComplexColumnVector ();
+-    }
+-}
+-
+ ComplexMatrix
+ ComplexMatrix::inverse (void) const
+ {
+Index: liboctave/CMatrix.h
+===================================================================
+RCS file: /cvs/octave/liboctave/CMatrix.h,v
+retrieving revision 1.55
+diff -u -r1.55 CMatrix.h
+--- liboctave/CMatrix.h	26 Oct 2005 15:24:08 -0000	1.55
++++ liboctave/CMatrix.h	24 Mar 2006 18:53:58 -0000
+@@ -130,10 +130,8 @@
+   // extract row or column i.
+ 
+   ComplexRowVector row (octave_idx_type i) const;
+-  ComplexRowVector row (char *s) const;
+ 
+   ComplexColumnVector column (octave_idx_type i) const;
+-  ComplexColumnVector column (char *s) const;
+ 
+   ComplexMatrix inverse (void) const;
+   ComplexMatrix inverse (octave_idx_type& info) const;
+Index: liboctave/dMatrix.cc
+===================================================================
+RCS file: /cvs/octave/liboctave/dMatrix.cc,v
+retrieving revision 1.120
+diff -u -r1.120 dMatrix.cc
+--- liboctave/dMatrix.cc	2 Mar 2006 03:40:01 -0000	1.120
++++ liboctave/dMatrix.cc	24 Mar 2006 18:53:59 -0000
+@@ -559,27 +559,6 @@
+   return retval;
+ }
+ 
+-RowVector
+-Matrix::row (char *s) const
+-{
+-  if (! s)
+-    {
+-      (*current_liboctave_error_handler) ("invalid row selection");
+-      return RowVector ();
+-    }
+-
+-  char c = *s;
+-  if (c == 'f' || c == 'F')
+-    return row ( static_cast<octave_idx_type>(0) );
+-  else if (c == 'l' || c == 'L')
+-    return row (rows () - 1);
+-  else
+-    {
+-      (*current_liboctave_error_handler) ("invalid row selection");
+-      return RowVector ();
+-    }
+-}
+-
+ ColumnVector
+ Matrix::column (octave_idx_type i) const
+ {
+@@ -597,27 +576,6 @@
+   return retval;
+ }
+ 
+-ColumnVector
+-Matrix::column (char *s) const
+-{
+-  if (! s)
+-    {
+-      (*current_liboctave_error_handler) ("invalid column selection");
+-      return ColumnVector ();
+-    }
+-
+-  char c = *s;
+-  if (c == 'f' || c == 'F')
+-    return column (static_cast<octave_idx_type> (0));
+-  else if (c == 'l' || c == 'L')
+-    return column (cols () - 1);
+-  else
+-    {
+-      (*current_liboctave_error_handler) ("invalid column selection");
+-      return ColumnVector ();
+-    }
+-}
+-
+ Matrix
+ Matrix::inverse (void) const
+ {
+Index: liboctave/dMatrix.h
+===================================================================
+RCS file: /cvs/octave/liboctave/dMatrix.h,v
+retrieving revision 1.61
+diff -u -r1.61 dMatrix.h
+--- liboctave/dMatrix.h	26 Oct 2005 15:24:08 -0000	1.61
++++ liboctave/dMatrix.h	24 Mar 2006 18:53:59 -0000
+@@ -102,10 +102,8 @@
+   // extract row or column i.
+ 
+   RowVector row (octave_idx_type i) const;
+-  RowVector row (char *s) const;
+ 
+   ColumnVector column (octave_idx_type i) const;
+-  ColumnVector column (char *s) const;
+ 
+   Matrix inverse (void) const;
+   Matrix inverse (octave_idx_type& info) const;
+Index: liboctave/dSparse.cc
+===================================================================
+RCS file: /cvs/octave/liboctave/dSparse.cc,v
+retrieving revision 1.21
+diff -u -r1.21 dSparse.cc
+--- liboctave/dSparse.cc	22 Mar 2006 22:58:12 -0000	1.21
++++ liboctave/dSparse.cc	24 Mar 2006 18:54:00 -0000
+@@ -4404,7 +4404,7 @@
+ 		      Array<double> z (3 * nr);
+ 		      double *pz = z.fortran_vec ();
+ 		      Array<octave_idx_type> iz (nr);
+-		      int *piz = iz.fortran_vec ();
++		      octave_idx_type *piz = iz.fortran_vec ();
+ 
+ 		      F77_XFCN (dpbcon, DGBCON, 
+ 		      	(F77_CONST_CHAR_ARG2 (&job, 1),
+@@ -4540,7 +4540,7 @@
+ 		      Array<double> z (3 * nr);
+ 		      double *pz = z.fortran_vec ();
+ 		      Array<octave_idx_type> iz (nr);
+-		      int *piz = iz.fortran_vec ();
++		      octave_idx_type *piz = iz.fortran_vec ();
+ 
+ 		      F77_XFCN (dgbcon, DGBCON, 
+ 		      	(F77_CONST_CHAR_ARG2 (&job, 1),
+@@ -4678,7 +4678,7 @@
+ 		      Array<double> z (3 * nr);
+ 		      double *pz = z.fortran_vec ();
+ 		      Array<octave_idx_type> iz (nr);
+-		      int *piz = iz.fortran_vec ();
++		      octave_idx_type *piz = iz.fortran_vec ();
+ 
+ 		      F77_XFCN (dpbcon, DGBCON, 
+ 		      	(F77_CONST_CHAR_ARG2 (&job, 1),
+@@ -4851,7 +4851,7 @@
+ 		      Array<double> z (3 * nr);
+ 		      double *pz = z.fortran_vec ();
+ 		      Array<octave_idx_type> iz (nr);
+-		      int *piz = iz.fortran_vec ();
++		      octave_idx_type *piz = iz.fortran_vec ();
+ 
+ 		      F77_XFCN (dgbcon, DGBCON, 
+ 		      	(F77_CONST_CHAR_ARG2 (&job, 1),
+@@ -5031,7 +5031,7 @@
+ 		      Array<double> z (3 * nr);
+ 		      double *pz = z.fortran_vec ();
+ 		      Array<octave_idx_type> iz (nr);
+-		      int *piz = iz.fortran_vec ();
++		      octave_idx_type *piz = iz.fortran_vec ();
+ 
+ 		      F77_XFCN (dpbcon, DGBCON, 
+ 		      	(F77_CONST_CHAR_ARG2 (&job, 1),
+@@ -5208,7 +5208,7 @@
+ 		      Array<double> z (3 * nr);
+ 		      double *pz = z.fortran_vec ();
+ 		      Array<octave_idx_type> iz (nr);
+-		      int *piz = iz.fortran_vec ();
++		      octave_idx_type *piz = iz.fortran_vec ();
+ 
+ 		      F77_XFCN (dpbcon, DGBCON, 
+ 		      	(F77_CONST_CHAR_ARG2 (&job, 1),
+@@ -5379,7 +5379,7 @@
+ 		      Array<double> z (3 * nr);
+ 		      double *pz = z.fortran_vec ();
+ 		      Array<octave_idx_type> iz (nr);
+-		      int *piz = iz.fortran_vec ();
++		      octave_idx_type *piz = iz.fortran_vec ();
+ 
+ 		      F77_XFCN (dpbcon, DGBCON, 
+ 		      	(F77_CONST_CHAR_ARG2 (&job, 1),
+@@ -5586,7 +5586,7 @@
+ 		      Array<double> z (3 * nr);
+ 		      double *pz = z.fortran_vec ();
+ 		      Array<octave_idx_type> iz (nr);
+-		      int *piz = iz.fortran_vec ();
++		      octave_idx_type *piz = iz.fortran_vec ();
+ 
+ 		      F77_XFCN (dgbcon, DGBCON, 
+ 		      	(F77_CONST_CHAR_ARG2 (&job, 1),
+Index: src/ov-cell.cc
+===================================================================
+RCS file: /cvs/octave/src/ov-cell.cc,v
+retrieving revision 1.58
+diff -u -r1.58 ov-cell.cc
+--- src/ov-cell.cc	24 Mar 2006 16:42:44 -0000	1.58
++++ src/ov-cell.cc	24 Mar 2006 19:14:32 -0000
+@@ -783,10 +783,12 @@
+   
+   for (octave_idx_type i = 0; i < dv.numel (); i++)
+     {
+-      char s[20];
+-      sprintf (s, "_%d", i);
++      OSSTREAM buf;
++      buf << "_" << i << OSSTREAM_ENDS;
++      std::string s = OSSTREAM_STR (buf);
++      OSSTREAM_FREEZE (buf);
+ 
+-      if (! add_hdf5_data(data_hid, tmp.elem (i), s, "", false,
++      if (! add_hdf5_data(data_hid, tmp.elem (i), s.c_str (), "", false,
+ 			  save_as_floats))
+ 	{
+ 	  H5Gclose (data_hid);
+Index: src/ov-list.cc
+===================================================================
+RCS file: /cvs/octave/src/ov-list.cc,v
+retrieving revision 1.44
+diff -u -r1.44 ov-list.cc
+--- src/ov-list.cc	26 Apr 2005 19:24:33 -0000	1.44
++++ src/ov-list.cc	24 Mar 2006 19:14:32 -0000
+@@ -536,9 +536,13 @@
+   for (int i = 0; i < lst.length (); ++i)
+     {
+       // should we use lst.name_tags () to label the elements?
+-      char s[20];
+-      sprintf (s, "_%d", i);
+-      bool b = save_ascii_data (os, lst (i), s, infnan_warned, 
++
++      OSSTREAM buf;
++      buf << "_" << i << OSSTREAM_ENDS;
++      std::string s = OSSTREAM_STR (buf);
++      OSSTREAM_FREEZE (buf);
++
++      bool b = save_ascii_data (os, lst (i), s.c_str (), infnan_warned, 
+ 				strip_nan_and_inf, 0, 0);
+       
+       if (! b)
+@@ -607,11 +611,15 @@
+   for (int i = 0; i < lst.length (); i++)
+     {
+       // should we use lst.name_tags () to label the elements?
+-      char s[20];
+-      sprintf (s, "_%d", i);
++
++      OSSTREAM buf;
++      buf << "_" << i << OSSTREAM_ENDS;
++      std::string s = OSSTREAM_STR (buf);
++      OSSTREAM_FREEZE (buf);
+ 
+       // Recurse to print sub-value.
+-      bool b = save_binary_data (os, lst(i), s, "", 0, save_as_floats);
++      bool b = save_binary_data (os, lst(i), s.c_str (), "", 0,
++				 save_as_floats);
+ 	      
+       if (! b)
+ 	return false;
+@@ -683,9 +691,13 @@
+   for (octave_idx_type i = 0; i < lst.length (); ++i)
+     {
+       // should we use lst.name_tags () to label the elements?
+-      char s[20];
+-      sprintf (s, "_%d", i);
+-      bool retval2 = add_hdf5_data (data_hid, lst (i), s, "",
++
++      OSSTREAM buf;
++      buf << "_" << i << OSSTREAM_ENDS;
++      std::string s = OSSTREAM_STR (buf);
++      OSSTREAM_FREEZE (buf);
++
++      bool retval2 = add_hdf5_data (data_hid, lst (i), s.c_str (), "",
+ 				    false, save_as_floats);
+       if (! retval2)
+ 	break;
+Index: src/DLD-FUNCTIONS/spchol.cc
+===================================================================
+RCS file: /cvs/octave/src/DLD-FUNCTIONS/spchol.cc,v
+retrieving revision 1.7
+diff -u -r1.7 spchol.cc
+--- src/DLD-FUNCTIONS/spchol.cc	22 Mar 2006 22:58:12 -0000	1.7
++++ src/DLD-FUNCTIONS/spchol.cc	24 Mar 2006 19:55:38 -0000
+@@ -607,7 +607,7 @@
+ 	  for (octave_idx_type k = 0 ; k < n ; k++)
+ 	    {
+ 	      // get the kth row of L and store in the columns of L
+-	      cholmod_row_subtree (A1, A2, k, Parent, R, cm) ;
++	      CHOLMOD_NAME (row_subtree) (A1, A2, k, Parent, R, cm) ;
+ 	      for (octave_idx_type p = 0 ; p < Rp [1] ; p++)
+ 		L.xridx (W [Ri [p]]++) = k ;


Index: octave.spec
===================================================================
RCS file: /cvs/extras/rpms/octave/FC-5/octave.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- octave.spec	20 Apr 2006 13:37:44 -0000	1.34
+++ octave.spec	21 Apr 2006 17:10:12 -0000	1.35
@@ -1,6 +1,6 @@
 Name:           octave
 Version:        2.9.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 
@@ -135,6 +135,9 @@
 
 
 %changelog
+* Fri Apr 21 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.5-2
+- Use updated sparse patch from development tree.
+
 * Thu Apr 20 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.5-1
 - New upstream release; remove old patches; add sparse patch.
 - Add patch for configure script.



From fedora-extras-commits at redhat.com  Fri Apr 21 17:21:02 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Fri, 21 Apr 2006 10:21:02 -0700
Subject: rpms/torque/FC-5 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 torque.spec,
	1.2, 1.3
Message-ID: <200604211721.k3LHL4K3001878@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1857

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Fri Apr 21 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.10.200604211036cvs
- bump



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Apr 2006 02:10:40 -0000	1.2
+++ .cvsignore	21 Apr 2006 17:21:01 -0000	1.3
@@ -1 +1 @@
-torque-2.1.0p0-snap.200604171430.tar.gz
+torque-2.1.0p0-snap.200604211036.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Apr 2006 02:10:40 -0000	1.2
+++ sources	21 Apr 2006 17:21:01 -0000	1.3
@@ -1 +1 @@
-00ae6cf8f95960c83022ff9037dc1d57  torque-2.1.0p0-snap.200604171430.tar.gz
+3b40c0d81a06ef4abe14c3bb7522086d  torque-2.1.0p0-snap.200604211036.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-5/torque.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- torque.spec	21 Apr 2006 07:05:50 -0000	1.2
+++ torque.spec	21 Apr 2006 17:21:01 -0000	1.3
@@ -2,8 +2,8 @@
 # comment out snap if building a real release
 %define name torque
 %define version 2.1.0p0
-%define snap 200604171430
-%define release 8
+%define snap 200604211036
+%define release 10
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -91,7 +91,6 @@
 Source4: xpbs.png
 Source5: xpbsmon.png
 Patch1: torque-2.1.0-remove-rpath.path
-Patch2: torque-2.1.0p0-sched-offbyone.patch
 License: Freely redistributable (See PBS_License.txt)
 Group: System Environment/Daemons
 URL: http://www.clusterresources.com/products/torque/
@@ -120,7 +119,6 @@
 %prep
 %setup -q -n torque-%{version}%{?snap:-snap.%snap}
 %patch1 -p1
-%patch2 -p1
 
 %__cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} .
 
@@ -425,6 +423,12 @@
 
 
 %changelog
+* Fri Apr 21 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.10.200604211036cvs
+- bump
+
+* Fri Apr 21 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.9.200604171430cvs
+- fix qsub write return check
+
 * Thu Apr 20 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.8.200604171430cvs
 - fix pbs_sched error opening lockfile and immediately exiting
 



From fedora-extras-commits at redhat.com  Fri Apr 21 17:21:26 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Fri, 21 Apr 2006 10:21:26 -0700
Subject: rpms/torque/FC-4 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 torque.spec,
	1.2, 1.3
Message-ID: <200604211721.k3LHLSUC001944@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1923

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Fri Apr 21 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.10.200604211036cvs
- bump



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Apr 2006 02:10:40 -0000	1.2
+++ .cvsignore	21 Apr 2006 17:21:26 -0000	1.3
@@ -1 +1 @@
-torque-2.1.0p0-snap.200604171430.tar.gz
+torque-2.1.0p0-snap.200604211036.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Apr 2006 02:10:40 -0000	1.2
+++ sources	21 Apr 2006 17:21:26 -0000	1.3
@@ -1 +1 @@
-00ae6cf8f95960c83022ff9037dc1d57  torque-2.1.0p0-snap.200604171430.tar.gz
+3b40c0d81a06ef4abe14c3bb7522086d  torque-2.1.0p0-snap.200604211036.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-4/torque.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- torque.spec	21 Apr 2006 07:06:22 -0000	1.2
+++ torque.spec	21 Apr 2006 17:21:26 -0000	1.3
@@ -2,8 +2,8 @@
 # comment out snap if building a real release
 %define name torque
 %define version 2.1.0p0
-%define snap 200604171430
-%define release 8
+%define snap 200604211036
+%define release 10
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -91,7 +91,6 @@
 Source4: xpbs.png
 Source5: xpbsmon.png
 Patch1: torque-2.1.0-remove-rpath.path
-Patch2: torque-2.1.0p0-sched-offbyone.patch
 License: Freely redistributable (See PBS_License.txt)
 Group: System Environment/Daemons
 URL: http://www.clusterresources.com/products/torque/
@@ -120,7 +119,6 @@
 %prep
 %setup -q -n torque-%{version}%{?snap:-snap.%snap}
 %patch1 -p1
-%patch2 -p1
 
 %__cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} .
 
@@ -425,6 +423,12 @@
 
 
 %changelog
+* Fri Apr 21 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.10.200604211036cvs
+- bump
+
+* Fri Apr 21 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.9.200604171430cvs
+- fix qsub write return check
+
 * Thu Apr 20 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.8.200604171430cvs
 - fix pbs_sched error opening lockfile and immediately exiting
 



From fedora-extras-commits at redhat.com  Fri Apr 21 17:21:45 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Fri, 21 Apr 2006 10:21:45 -0700
Subject: rpms/torque/FC-3 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 torque.spec,
	1.2, 1.3
Message-ID: <200604211721.k3LHLlRo002009@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1988

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Fri Apr 21 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.10.200604211036cvs
- bump



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Apr 2006 02:10:40 -0000	1.2
+++ .cvsignore	21 Apr 2006 17:21:45 -0000	1.3
@@ -1 +1 @@
-torque-2.1.0p0-snap.200604171430.tar.gz
+torque-2.1.0p0-snap.200604211036.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Apr 2006 02:10:40 -0000	1.2
+++ sources	21 Apr 2006 17:21:45 -0000	1.3
@@ -1 +1 @@
-00ae6cf8f95960c83022ff9037dc1d57  torque-2.1.0p0-snap.200604171430.tar.gz
+3b40c0d81a06ef4abe14c3bb7522086d  torque-2.1.0p0-snap.200604211036.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-3/torque.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- torque.spec	21 Apr 2006 07:06:35 -0000	1.2
+++ torque.spec	21 Apr 2006 17:21:45 -0000	1.3
@@ -2,8 +2,8 @@
 # comment out snap if building a real release
 %define name torque
 %define version 2.1.0p0
-%define snap 200604171430
-%define release 8
+%define snap 200604211036
+%define release 10
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -91,7 +91,6 @@
 Source4: xpbs.png
 Source5: xpbsmon.png
 Patch1: torque-2.1.0-remove-rpath.path
-Patch2: torque-2.1.0p0-sched-offbyone.patch
 License: Freely redistributable (See PBS_License.txt)
 Group: System Environment/Daemons
 URL: http://www.clusterresources.com/products/torque/
@@ -120,7 +119,6 @@
 %prep
 %setup -q -n torque-%{version}%{?snap:-snap.%snap}
 %patch1 -p1
-%patch2 -p1
 
 %__cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} .
 
@@ -425,6 +423,12 @@
 
 
 %changelog
+* Fri Apr 21 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.10.200604211036cvs
+- bump
+
+* Fri Apr 21 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.9.200604171430cvs
+- fix qsub write return check
+
 * Thu Apr 20 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.8.200604171430cvs
 - fix pbs_sched error opening lockfile and immediately exiting
 



From fedora-extras-commits at redhat.com  Fri Apr 21 17:48:57 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Fri, 21 Apr 2006 10:48:57 -0700
Subject: rpms/wifiroamd import.log,1.1,1.2
Message-ID: <200604211748.k3LHmxdQ002266@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/wifiroamd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2233

Modified Files:
	import.log 
Log Message:
auto-import wifiroamd-1.05-1 on branch devel from wifiroamd-1.05-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/wifiroamd/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Apr 2006 16:33:14 -0000	1.1
+++ import.log	21 Apr 2006 17:48:57 -0000	1.2
@@ -0,0 +1 @@
+wifiroamd-1_05-1:HEAD:wifiroamd-1.05-1.src.rpm:1145641734



From fedora-extras-commits at redhat.com  Fri Apr 21 17:48:58 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Fri, 21 Apr 2006 10:48:58 -0700
Subject: rpms/wifiroamd/devel wifiroamd.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604211749.k3LHn0bL002271@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/wifiroamd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2233/devel

Modified Files:
	.cvsignore sources 
Added Files:
	wifiroamd.spec 
Log Message:
auto-import wifiroamd-1.05-1 on branch devel from wifiroamd-1.05-1.src.rpm


--- NEW FILE wifiroamd.spec ---
Name:           wifiroamd
Version:        1.05
Release:        1%{?dist}
Summary:        Automatic WiFi connection (re)establishment daemon

Group:          System Environment/Base
License:        GPL
URL:            http://www.tummy.com/Community/software/wifiroamd/
Source0:        ftp://ftp.tummy.com/pub/tummy/wifiroamd/wifiroamd-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
Requires:       dhclient
Requires:       wireless-tools
Requires:       fping

%description
WiFiRoamd is a program that monitors your wireless device to keep it
connected to a good access point.  It will scan looking for a known AP, or
will try the AP with the strongest un-encrypted signal.  If a script is
found for the specific AP ESSID or MAC address is found, that script is
run.  Otherwise, a "default" script is run.

After that script is run, scripts in the "up.d" directory are run.  These
implement extra functionality such as DHCP, ESSID "pinning" (where it
explicitly does "iwconfig $DEVICE essid $ESSID", so that you don't
accidentally wander to another AP) and other local things such as
restarting OpenVPN, etc.

%prep
%setup -q

%install
rm -rf $RPM_BUILD_ROOT
%{__mkdir} -p $RPM_BUILD_ROOT/etc/wifiroamd/scripts/
%{__cp} -a scripts/* $RPM_BUILD_ROOT/etc/wifiroamd/scripts

%{__mkdir} -p $RPM_BUILD_ROOT/etc/wifiroamd/connections/
%{__cp} -a connections/* $RPM_BUILD_ROOT/etc/wifiroamd/connections

%{__cp} config-defaults $RPM_BUILD_ROOT/etc/wifiroamd/config-defaults
%{__cp} config $RPM_BUILD_ROOT/etc/wifiroamd/config

%{__mkdir} -p $RPM_BUILD_ROOT/sbin
%{__cp} -a wifiroamd $RPM_BUILD_ROOT/sbin/wifiroamd

%{__mkdir} -p $RPM_BUILD_ROOT/etc/init.d
%{__cp} wifiroamd.init $RPM_BUILD_ROOT/etc/init.d/wifiroamd

%{__mkdir} -p $RPM_BUILD_ROOT/var/lib/wifiroamd/dhclient-leases

%{__mkdir} -p $RPM_BUILD_ROOT/etc/cron.daily
%{__cp} wifiroamd.daily $RPM_BUILD_ROOT/etc/cron.daily/wifiroamd

%{__mkdir} -p $RPM_BUILD_ROOT/etc/wifiroamd/seen

%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/man/man8
%{__cp} wifiroamd.8 $RPM_BUILD_ROOT/usr/share/man/man8

%clean
rm -rf $RPM_BUILD_ROOT

%post
if [ $1 -eq 1 ]
then
   chkconfig --add wifiroamd
fi

%preun
if [ $1 -eq 0 ]
then
   chkconfig --del wifiroamd
fi

%files
%defattr(-,root,root,-)
%doc README TODO WHATSNEW
%attr(755,root,root) /sbin/wifiroamd
%attr(755,root,root) /etc/init.d/wifiroamd
%dir /etc/wifiroamd
%dir /etc/wifiroamd/scripts
%dir /etc/wifiroamd/scripts/monitor_pinggw.d
%dir /etc/wifiroamd/scripts/down.d
%dir /etc/wifiroamd/scripts/reset.d
%dir /etc/wifiroamd/scripts/up.d
%dir /etc/wifiroamd/connections
%dir /etc/wifiroamd/connections/default.d
%dir /etc/wifiroamd/connections/nowireless.d
%dir /etc/wifiroamd/seen
#  config-default should not be user-modified.
%config /etc/wifiroamd/config-defaults
%attr(755,root,root) /etc/wifiroamd/scripts/monitor_pinggw.d/*
%attr(755,root,root) /etc/wifiroamd/scripts/reset.d/*
%attr(755,root,root) /etc/wifiroamd/scripts/up.d/*
%attr(755,root,root) /etc/wifiroamd/scripts/down.d/*
/usr/share/man/man8/*
%config(noreplace) /etc/wifiroamd/config
%dir /var/lib/wifiroamd
%dir /var/lib/wifiroamd/dhclient-leases
%attr(755,root,root) /etc/cron.daily/wifiroamd
%doc examples
%doc debian/copyright

%changelog
* Sun Mar 12 2006 Sean Reifschneider <jafo at tummy.com> - 1.05-1
- Release of 1.05.

* Sun Jan 15 2006 Kevin Fenzi <kevin at tummy.com> - 0.04-1
- Inital rpm spec


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wifiroamd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2006 16:33:15 -0000	1.1
+++ .cvsignore	21 Apr 2006 17:48:58 -0000	1.2
@@ -0,0 +1 @@
+wifiroamd-1.05.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wifiroamd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2006 16:33:15 -0000	1.1
+++ sources	21 Apr 2006 17:48:58 -0000	1.2
@@ -0,0 +1 @@
+697166fe19c150ae312276ff0eb0fe40  wifiroamd-1.05.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 18:20:37 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Fri, 21 Apr 2006 11:20:37 -0700
Subject: owners owners.list,1.866,1.867
Message-ID: <200604211820.k3LIKd5L005484@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5467/owners

Modified Files:
	owners.list 
Log Message:
add wifiroamd



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.866
retrieving revision 1.867
diff -u -r1.866 -r1.867
--- owners.list	21 Apr 2006 08:29:55 -0000	1.866
+++ owners.list	21 Apr 2006 18:20:37 -0000	1.867
@@ -1529,6 +1529,7 @@
 Fedora Extras|webmin|A web-based administration interface for Unix systems.|jvdias at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|wesnoth|Battle for Wesnoth is a fantasy turn-based strategy game|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|whowatch|Displays informations about the users currently logged in|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|wifiroamd|Automatic WiFi connection (re)establishment daemon|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|WindowMaker|A fast, feature rich Window manager|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wine|A Windows 16/32/64 bit emulator|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wine-docs|Documentation for wine|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Apr 21 18:29:35 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 21 Apr 2006 11:29:35 -0700
Subject: rpms/hugs98/FC-5 hugs98.spec,1.1,1.2
Message-ID: <200604211829.k3LITbbP005646@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/hugs98/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5629

Modified Files:
	hugs98.spec 
Log Message:



Index: hugs98.spec
===================================================================
RCS file: /cvs/extras/rpms/hugs98/FC-5/hugs98.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hugs98.spec	21 Apr 2006 08:25:46 -0000	1.1
+++ hugs98.spec	21 Apr 2006 18:29:35 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:		hugs98
 Version:	2005.03
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Haskell Interpreter
 
 Group:		Development/Languages



From fedora-extras-commits at redhat.com  Fri Apr 21 18:33:41 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 21 Apr 2006 11:33:41 -0700
Subject: comps comps-fe5.xml.in,1.38,1.39 comps-fe6.xml.in,1.1,1.2
Message-ID: <200604211833.k3LIXhf3005786@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5767

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in 
Log Message:
added hugs98


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- comps-fe5.xml.in	17 Apr 2006 17:48:37 -0000	1.38
+++ comps-fe5.xml.in	21 Apr 2006 18:33:41 -0000	1.39
@@ -42,6 +42,7 @@
         <packagereq type="optional">ghc</packagereq>
         <packagereq type="optional">git</packagereq>
         <packagereq type="optional">highlight</packagereq>
+        <packagereq type="optional">hugs98</packagereq>	
         <packagereq type="optional">lincvs</packagereq>
         <packagereq type="optional">lua</packagereq>
         <packagereq type="optional">mach</packagereq>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- comps-fe6.xml.in	17 Apr 2006 17:49:10 -0000	1.1
+++ comps-fe6.xml.in	21 Apr 2006 18:33:41 -0000	1.2
@@ -42,6 +42,7 @@
         <packagereq type="optional">ghc</packagereq>
         <packagereq type="optional">git</packagereq>
         <packagereq type="optional">highlight</packagereq>
+        <packagereq type="optional">hugs98</packagereq>	
         <packagereq type="optional">lincvs</packagereq>
         <packagereq type="optional">lua</packagereq>
         <packagereq type="optional">mach</packagereq>



From fedora-extras-commits at redhat.com  Fri Apr 21 19:02:55 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 12:02:55 -0700
Subject: rpms/perl-IO-Interface - New directory
Message-ID: <200604211902.k3LJ2vZw007924@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-IO-Interface
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7912/perl-IO-Interface

Log Message:
Directory /cvs/extras/rpms/perl-IO-Interface added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 19:02:58 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 12:02:58 -0700
Subject: rpms/perl-IO-Interface/devel - New directory
Message-ID: <200604211903.k3LJ306A007941@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-IO-Interface/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7912/perl-IO-Interface/devel

Log Message:
Directory /cvs/extras/rpms/perl-IO-Interface/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 19:03:21 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 12:03:21 -0700
Subject: rpms/perl-IO-Interface/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200604211903.k3LJ3Njn008027@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-IO-Interface/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7984/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-IO-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  Fri Apr 21 19:03:21 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 12:03:21 -0700
Subject: rpms/perl-IO-Interface Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604211903.k3LJ3NGR008024@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-IO-Interface
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7984

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-IO-Interface


--- NEW FILE Makefile ---
# Top level Makefile for module perl-IO-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  Fri Apr 21 19:03:49 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 12:03:49 -0700
Subject: rpms/perl-IO-Interface import.log,1.1,1.2
Message-ID: <200604211903.k3LJ3pLS008088@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-IO-Interface
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8055

Modified Files:
	import.log 
Log Message:
auto-import perl-IO-Interface-0.98-1 on branch devel from perl-IO-Interface-0.98-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-Interface/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Apr 2006 19:03:20 -0000	1.1
+++ import.log	21 Apr 2006 19:03:49 -0000	1.2
@@ -0,0 +1 @@
+perl-IO-Interface-0_98-1:HEAD:perl-IO-Interface-0.98-1.src.rpm:1145646221



From fedora-extras-commits at redhat.com  Fri Apr 21 19:03:50 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 12:03:50 -0700
Subject: rpms/perl-IO-Interface/devel perl-IO-Interface.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604211903.k3LJ3qNW008093@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-IO-Interface/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8055/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-IO-Interface.spec 
Log Message:
auto-import perl-IO-Interface-0.98-1 on branch devel from perl-IO-Interface-0.98-1.src.rpm


--- NEW FILE perl-IO-Interface.spec ---
Name:           perl-IO-Interface
Version:        0.98
Release:        1%{?dist}
Summary:        Perl extension for accessing network card configuration information

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/IO-Interface/
Source0:        http://www.cpan.org/authors/id/L/LD/LDS/IO-Interface-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  perl
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
IO::Interface adds methods to IO::Socket objects that allows them to
be used to retrieve and change information about the network
interfaces on your system.  In addition to the object-oriented access
methods, you can use a function-oriented style.


%prep
%setup -q -n IO-Interface-%{version}


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorarch}/IO/
%{perl_vendorarch}/auto/IO/
%{_mandir}/man3/*.3*


%changelog
* Mon Jan 30 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.98-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-Interface/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2006 19:03:21 -0000	1.1
+++ .cvsignore	21 Apr 2006 19:03:50 -0000	1.2
@@ -0,0 +1 @@
+IO-Interface-0.98.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-Interface/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2006 19:03:21 -0000	1.1
+++ sources	21 Apr 2006 19:03:50 -0000	1.2
@@ -0,0 +1 @@
+91d5029a32302aa02414c9c8e3353cec  IO-Interface-0.98.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 19:05:22 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 12:05:22 -0700
Subject: rpms/perl-GSSAPI - New directory
Message-ID: <200604211905.k3LJ5OIx008195@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-GSSAPI
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8174/perl-GSSAPI

Log Message:
Directory /cvs/extras/rpms/perl-GSSAPI added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 19:05:22 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 12:05:22 -0700
Subject: rpms/perl-GSSAPI/devel - New directory
Message-ID: <200604211905.k3LJ5OdI008198@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-GSSAPI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8174/perl-GSSAPI/devel

Log Message:
Directory /cvs/extras/rpms/perl-GSSAPI/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 19:05:43 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 12:05:43 -0700
Subject: rpms/perl-GSSAPI Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604211905.k3LJ5jpL008252@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-GSSAPI
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8219

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-GSSAPI


--- NEW FILE Makefile ---
# Top level Makefile for module perl-GSSAPI
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 21 19:05:44 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 12:05:44 -0700
Subject: rpms/perl-GSSAPI/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604211905.k3LJ5ku2008255@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-GSSAPI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8219/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-GSSAPI


--- 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 Apr 21 19:06:12 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 12:06:12 -0700
Subject: rpms/perl-GSSAPI import.log,1.1,1.2
Message-ID: <200604211906.k3LJ6EWs008317@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-GSSAPI
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8284

Modified Files:
	import.log 
Log Message:
auto-import perl-GSSAPI-0.21-1 on branch devel from perl-GSSAPI-0.21-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-GSSAPI/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Apr 2006 19:05:43 -0000	1.1
+++ import.log	21 Apr 2006 19:06:12 -0000	1.2
@@ -0,0 +1 @@
+perl-GSSAPI-0_21-1:HEAD:perl-GSSAPI-0.21-1.src.rpm:1145646364



From fedora-extras-commits at redhat.com  Fri Apr 21 19:06:13 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 12:06:13 -0700
Subject: rpms/perl-GSSAPI/devel perl-GSSAPI.spec, NONE, 1.1 .cvsignore, 1.1, 
	1.2 sources, 1.1, 1.2
Message-ID: <200604211906.k3LJ6FPk008322@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-GSSAPI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8284/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-GSSAPI.spec 
Log Message:
auto-import perl-GSSAPI-0.21-1 on branch devel from perl-GSSAPI-0.21-1.src.rpm


--- NEW FILE perl-GSSAPI.spec ---
#
# Rebuild option:
#
#   --with testsuite         - run the test suite
#

Name:           perl-GSSAPI
Version:        0.21
Release:        1%{?dist}
Summary:        Perl extension providing access to the GSSAPIv2 library

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/GSSAPI/
Source0:        http://www.cpan.org/authors/id/A/AG/AGROLMS/GSSAPI-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  perl
BuildRequires:  krb5-devel
BuildRequires:  perl(Test::Pod) >= 1.00
BuildRequires:  perl(Test::Pod::Coverage) >= 1.04
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module gives access to the routines of the GSSAPI library, as
described in rfc2743 and rfc2744 and implemented by the Kerberos-1.2
distribution from MIT.


%prep
%setup -q -n GSSAPI-%{version}
chmod a-x examples/*.pl


%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
# fails a couple of tests if network not available
%{?_with_testsuite:make test}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README examples/
%{perl_vendorarch}/GSSAPI*
%{perl_vendorarch}/auto/GSSAPI/
%{_mandir}/man3/*.3*


%changelog
* Thu Apr  6 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.21-1
- Update to 0.21.

* Fri Mar 31 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.20-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-GSSAPI/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2006 19:05:44 -0000	1.1
+++ .cvsignore	21 Apr 2006 19:06:13 -0000	1.2
@@ -0,0 +1 @@
+GSSAPI-0.21.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-GSSAPI/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2006 19:05:44 -0000	1.1
+++ sources	21 Apr 2006 19:06:13 -0000	1.2
@@ -0,0 +1 @@
+2779227c30afa412415680da54b98a10  GSSAPI-0.21.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 19:10:26 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 12:10:26 -0700
Subject: owners owners.list,1.867,1.868
Message-ID: <200604211910.k3LJASS5008399@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8378

Modified Files:
	owners.list 
Log Message:
New packages:
 - perl-IO-Interface: #187797
 - perl-GSSAPI: #187809



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.867
retrieving revision 1.868
diff -u -r1.867 -r1.868
--- owners.list	21 Apr 2006 18:20:37 -0000	1.867
+++ owners.list	21 Apr 2006 19:10:26 -0000	1.868
@@ -967,6 +967,7 @@
 Fedora Extras|perl-Glib|Perl interface to GLib|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gnome2-Canvas|Perl interface to Gnome Canvas|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|perl-GnuPG-Interface|Perl interface to GnuPG|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-GSSAPI|Perl extension providing access to the GSSAPIv2 library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gtk2|Perl interface to the 2.x series of the Gimp Toolkit library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gtk2-GladeXML|Perl interface to Gtk2 GladeXML|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|perl-Hook-LexWrap|Lexically scoped subroutine wrappers|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -991,6 +992,7 @@
 Fedora Extras|perl-Imager|A module for creating and altering images|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|perl-IO-All|IO::All Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-CaptureOutput|Capture STDOUT/STDERR from subprocesses and XS/C modules|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-IO-Interface|Perl extension for accessing network card configuration information|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-Multiplex|Manage IO on many file handles|lmb at biosci.ki.se|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-Socket-SSL|Perl library for transparent SSL|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-String|Emulate file interface for in-core strings|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Fri Apr 21 19:23:11 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Fri, 21 Apr 2006 12:23:11 -0700
Subject: rpms/argus/FC-4 argus-2.0.6.fixes.1-build.patch, 1.1,
	1.2 argus-2.0.6.fixes.1-makefile.patch, 1.1, 1.2 argus.spec, 1.2, 1.3
Message-ID: <200604211923.k3LJND9o008662@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/argus/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8635

Modified Files:
	argus-2.0.6.fixes.1-build.patch 
	argus-2.0.6.fixes.1-makefile.patch argus.spec 
Log Message:
daemon patches now eliminate unused common files: argus_parse.c, argus_util.c, and argus_auth.c


argus-2.0.6.fixes.1-build.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 argus-2.0.6.fixes.1-build.patch
Index: argus-2.0.6.fixes.1-build.patch
===================================================================
RCS file: /cvs/extras/rpms/argus/FC-4/argus-2.0.6.fixes.1-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- argus-2.0.6.fixes.1-build.patch	17 Mar 2006 19:32:36 -0000	1.1
+++ argus-2.0.6.fixes.1-build.patch	21 Apr 2006 19:23:11 -0000	1.2
@@ -1,55 +1,6649 @@
+diff -NarU5 argus-2.0.6.fixes.1.orig/common/argus_auth.c argus-2.0.6.fixes.1/common/argus_auth.c
+--- argus-2.0.6.fixes.1.orig/common/argus_auth.c	2004-02-23 10:00:36.000000000 -0500
++++ argus-2.0.6.fixes.1/common/argus_auth.c	1969-12-31 19:00:00.000000000 -0500
+@@ -1,569 +0,0 @@
+-/*
+- * Copyright (c) 2000-2004 QoSient, LLC
+- * All rights reserved.
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2, or (at your option)
+- * any later version.
+-
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+-
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+- *
+- */
+-
+-/*
+- * Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
+- *
+- * Redistribution and use in source and binary forms, with or without
+- * modification, are permitted provided that the following conditions
+- * are met:
+- *
+- * 1. Redistributions of source code must retain the above copyright
+- *    notice, this list of conditions and the following disclaimer.
+- *
+- * 2. Redistributions in binary form must reproduce the above copyright
+- *    notice, this list of conditions and the following disclaimer in
+- *    the documentation and/or other materials provided with the
+- *    distribution.
+- *
+- * 3. The name "Carnegie Mellon University" must not be used to
+- *    endorse or promote products derived from this software without
+- *    prior written permission. For permission or any other legal
+- *    details, please contact
+- *      Office of Technology Transfer
+- *      Carnegie Mellon University
+- *      5000 Forbes Avenue
+- *      Pittsburgh, PA  15213-3890
+- *      (412) 268-4387, fax: (412) 268-7395
+- *      tech-transfer at andrew.cmu.edu
+- *
+- * 4. Redistributions of any form whatsoever must retain the following
+- *    acknowledgment:
+- *    "This product includes software developed by Computing Services
+- *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+- *
+- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+- */
+-
+-/*
+- * Modified by Carter Bullard
+- * QoSient, LLC
+- *
+- */
+-
+-
+-#ifndef ArgusAuth
+-#define ArgusAuth
+-#endif
+-
+-#include <stdlib.h>
+-#include <unistd.h>
+-
+-#include <errno.h>
+-#include <string.h>
+-
+-#ifdef ARGUS_SASL
+-
+-#include <ctype.h>
+-#include <assert.h>
+-#include <sasl.h>
+-
+-#endif /* ARGUS_SASL */
+-
+-#include <netinet/in.h>
+-#include <pcap.h>
+-
+-#include <compat.h>
+-#include <interface.h>
+-
+-#include <argus_parse.h>
+-#include <argus_util.h>
+-#include <argus_out.h>
+-#include <argus_filter.h>
+-
+-
+-extern void ArgusLog (int, char *, ...);
+-
+-int ArgusInitializeAuthentication (struct ARGUS_INPUT *);
+-int ArgusAuthenticate (struct ARGUS_INPUT *);
+-
+-#ifdef ARGUS_SASL
+-
+-static int RaGetRealm(void *context, int, const char **, const char **);
+-static int RaSimple(void *context, int, const char **, unsigned *);
+-static int RaGetSecret(sasl_conn_t *, void *context, int, sasl_secret_t **);
+-
+-int RaSaslNegotiate(FILE *, FILE *, sasl_conn_t *);
+-int RaGetSaslString (FILE *, char *, int);
+-int RaSendSaslString (FILE *, const char *, int);
+-
+-/* RaCallBacks we support */
+-
+-static sasl_callback_t RaCallBacks[] = {
+-  { SASL_CB_GETREALM, &RaGetRealm,  NULL },
+-  { SASL_CB_USER,     &RaSimple,    NULL },
+-  { SASL_CB_AUTHNAME, &RaSimple,    NULL },
+-  { SASL_CB_PASS,     &RaGetSecret, NULL },
+-  { SASL_CB_LIST_END, NULL, NULL }
+-};
+-
+-char *RaSaslMech = NULL;
+-
+-#endif 
+-
+-
+-#if defined(HAVE_SOLARIS)
+-extern int getdomainname(char *name, size_t len);
+-#endif
+-
+-
+-int
+-ArgusInitializeAuthentication (struct ARGUS_INPUT *input)
+-{
+-   int retn = 1;
+-
+-#ifdef ARGUS_SASL
+-   struct sockaddr_in localaddr, remoteaddr;
+-   int salen, fd = input->fd;
+-   char *localhostname = NULL;
+-
+-   if ((retn = sasl_client_init(RaCallBacks)) != SASL_OK)
+-      ArgusLog (LOG_ERR, "ArgusInitializeAuthentication() sasl_client_init %d", retn);
+-
+-   localhostname = ArgusCalloc (1, 1024);
+-   gethostname(localhostname, 1024);
+-   if (!strchr (localhostname, '.')) {
+-      strcat (localhostname, ".");
+-      getdomainname (&localhostname[strlen(localhostname)], 1024 - strlen(localhostname));
+-   }
+-
+-   if ((retn = sasl_client_new("argus", localhostname, NULL, SASL_SECURITY_LAYER, &input->sasl_conn)) != SASL_OK)
+-      ArgusLog (LOG_ERR, "ArgusInitializeAuthentication() sasl_client_new %d", retn);
+-   
+-   /* set external properties here
+-   sasl_setprop(input->sasl_conn, SASL_SSF_EXTERNAL, &extprops); */
+-   
+-   /* set required security properties here
+-   sasl_setprop(input->sasl_conn, SASL_SEC_PROPS, &secprops); */
+-   
+-   /* set ip addresses */
+-   salen = sizeof(localaddr);
+-   if (getsockname(fd, (struct sockaddr *)&localaddr, &salen) < 0)
+-      perror("getsockname");
+-
+-   salen = sizeof(remoteaddr); 
+-   if (getpeername(fd, (struct sockaddr *)&remoteaddr, &salen) < 0)
+-      perror("getpeername");
+-
+-   if ((retn = sasl_setprop(input->sasl_conn, SASL_IP_LOCAL, &localaddr)) != SASL_OK)
+-      ArgusLog (LOG_ERR, "ArgusInitializeAuthentication() error setting localaddr %d", retn);
+-
+-   if ((retn = sasl_setprop(input->sasl_conn, SASL_IP_REMOTE, &remoteaddr)) != SASL_OK)
+-      ArgusLog (LOG_ERR, "ArgusInitializeAuthentication() error setting remoteaddr %d", retn);
+-
+-   retn = 1;
+-#endif 
+-
+-#ifdef ARGUSDEBUG
+-   ArgusDebug (2, "ArgusInitializeAuthentication () returning %d\n", retn);
+-#endif 
+-
+-   return (retn);
+-}
+-
+-
[...6308 lines suppressed...]
+-   bzero (indStr, 16);
+-   bzero (date, 128);
+-
+-   flow = &argus->argus_far.flow;
+-
+-   sprintf (srcString, "%17.17s", etheraddr_string((unsigned char *)&flow->mac_flow.ehdr.ether_shost));
+-   sprintf (dstString, "%17.17s", etheraddr_string((unsigned char *)&flow->mac_flow.ehdr.ether_dhost));
+-
+-   src_count = argus->argus_far.src.count;
+-   dst_count = argus->argus_far.dst.count;
+-
+-   if (Aflag) {
+-      src_bytes = argus->argus_far.src.appbytes;
+-      dst_bytes = argus->argus_far.dst.appbytes;
+-   } else {
+-      src_bytes = argus->argus_far.src.bytes;
+-      dst_bytes = argus->argus_far.dst.bytes;
+-   }
+-
+-   print_date (argus, date);
+-
+-   if (idflag) {
+-      if (ArgusInput->ArgusManStart.ahdr.status & ARGUS_ID_IS_IPADDR)
+-         argusIDStr = strdup (ipaddr_string (&argus->ahdr.argusid));
+-      else
+-         sprintf (argusIDStr, "%u", argus->ahdr.argusid);
+-
+-      sprintf(argus_strbuf, "%-15.15s ", argusIDStr);
+-   }
+-
+-   if (mflag) {
+-      if (ArgusThisFarStatus & ARGUS_MAC_DSR_STATUS) {
+-         struct ArgusMacStruct *mac = (struct ArgusMacStruct *) ArgusThisFarHdrs[ARGUS_MAC_DSR_INDEX];
+-
+-         esrcString = etheraddr_string ((u_char *)&mac->phys_union.ether.ethersrc);
+-         edstString = etheraddr_string ((u_char *)&mac->phys_union.ether.etherdst);
+-
+-         sprintf (srcString, "%17.17s %17.17s   %*.*s",
+-                      esrcString, edstString, hfield + 2, hfield + 2,
+-                      etheraddr_string((unsigned char *)&flow->mac_flow.ehdr.ether_shost));
+-      } else
+-         sprintf (srcString, "%17.17s %17.17s    %*.*s",
+-                      blankStr, blankStr, hfield + 2, hfield + 2, 
+-                      etheraddr_string((unsigned char *)&flow->mac_flow.ehdr.ether_shost));
+-   }
+-
+-   if (Iflag)
+-      strcpy (fmtstr, "%s%s%4s %s -   %22.22s ");
+-   else
+-      strcpy (fmtstr, "%s  %4s %s -   %22.22s ");
+-
+-   if (cflag)
+-      strcat (fmtstr, "%-8u %-8u  %-12u %-12u");
+-
+-   if ((argus->ahdr.cause & ARGUS_TIMEOUT))
+-      strcat (fmtstr, "TIM");
+-   else
+-      if (argus->argus_far.src.count && argus->argus_far.dst.count) {
+-         if ((argus->argus_far.src.count == 1) && (argus->argus_far.dst.count == 1))
+-            strcat (fmtstr, "ACC");
+-         else
+-            strcat (fmtstr, "CON");
+-      } else
+-         if (argus->ahdr.type & ARGUS_START)
+-            strcat (fmtstr, "INT");
+-
+-   proto = argus->ahdr.status & 0xFFFF;
+-
+-   sprintf (protoStr, "%s", etherproto_string(proto));
+-
+-   if (src_count)
+-      fmtstr[12 + vc] = '>'; 
+-   if (dst_count)
+-      fmtstr[10 + vc] = '<'; 
+-
+-
+-   if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0'))
+-      delim = RaFieldDelimiter;
+-   else {
+-      if (proto == 0) {
+-         delim = '.';
+-      } else {
+-         delim = ' ';
+-      }
+-   }
+-
+-   if (proto == 0) {
+-      sprintf (sportbuf, "%c%-4.4s", delim, llcsap_string((unsigned char) flow->mac_flow.ssap));
+-      sprintf (dportbuf, "%c%-4.4s", delim, llcsap_string((unsigned char) flow->mac_flow.dsap));
+-   } else {
+-      sprintf (sportbuf, "%c    ", delim);
+-      sprintf (dportbuf, "%c    ", delim);
+-
+-      if (dst_count) {
+-         if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0'))
+-            fmtstr[9 + vc] = RaFieldDelimiter;
+-      } else
+-         if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0'))
+-            fmtstr[10 + vc] = RaFieldDelimiter;
+-
+-      if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) {
+-         fmtstr[22 + vc] = RaFieldDelimiter;
+-      }
+-   }
+-
+-   strcat (srcString, sportbuf);
+-   strcat (dstString, dportbuf);
+-
+-   if ((strlen(protoStr) > 4) && !((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')))
+-      protoStr[4] = '\0';
+-
+-   ArgusGetIndicatorString (argus, indStr);
+-
+-   if (Iflag) {
+-      if (cflag)
+-         sprintf (&argus_strbuf[strlen(argus_strbuf)], fmtstr, date, indStr, protoStr,
+-               srcString, dstString, 
+-               src_count, dst_count,
+-               src_bytes, dst_bytes);
+-      else
+-         sprintf (&argus_strbuf[strlen(argus_strbuf)], fmtstr, date, indStr, protoStr,
+-               srcString, dstString);
+-   } else {
+-      if (cflag)
+-         sprintf (&argus_strbuf[strlen(argus_strbuf)], fmtstr, date, protoStr,
+-               srcString, dstString, 
+-               src_count, dst_count,
+-               src_bytes, dst_bytes);
+-      else
+-         sprintf (&argus_strbuf[strlen(argus_strbuf)], fmtstr, date, protoStr,
+-               srcString, dstString);
+-   }
+-
+-   if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) {
+-      char tmpbuf[128], *ptr = tmpbuf, *str = argus_strbuf, lastchr = ' ';
+-      int len = strlen(date) - 1;
+-      bzero (tmpbuf, sizeof(tmpbuf));
+-
+-      bcopy (str, ptr, len);
+-      str += len;
+-      ptr += len;
+-
+-      while (*str) {
+-         if (*str == ' ') {
+-            if (lastchr != RaFieldDelimiter)
+-               *ptr++ = RaFieldDelimiter;
+-            while (isspace((int)*str)) str++;
+-         }
+-         lastchr = *str;
+-
+-         *ptr++ = *str++;
+-      }
+-      bzero (argus_strbuf, MAXSTRLEN);
+-      bcopy (tmpbuf, argus_strbuf, strlen(tmpbuf));
+-   }
+-
+-   return (argus_strbuf);
+-}
+-
+-
+-
+-#ifdef NOVFPRINTF
+-/*
+- * Stock 4.3 doesn't have vfprintf. 
+- * This routine is due to Chris Torek.
+- */
+-vfprintf(f, fmt, args)
+-   FILE *f;
+-   char *fmt;
+-   va_list args;
+-{
+-   int ret;
+-
+-   if ((f->_flag & _IOWRT) == 0) {
+-      if (f->_flag & _IORW)
+-         f->_flag |= _IOWRT;
+-      else
+-         return EOF;
+-   }
+-   ret = _doprnt(fmt, args, f);
+-   return ferror(f) ? EOF : ret;
+-}
+-#endif
+-
 diff -NarU5 argus-2.0.6.fixes.1.orig/common/gencode.c argus-2.0.6.fixes.1/common/gencode.c
 --- argus-2.0.6.fixes.1.orig/common/gencode.c	2004-02-23 10:00:36.000000000 -0500
-+++ argus-2.0.6.fixes.1/common/gencode.c	2006-02-24 11:54:41.000000000 -0500
++++ argus-2.0.6.fixes.1/common/gencode.c	2006-04-21 14:57:52.000000000 -0400
 @@ -57,11 +57,11 @@
  #include <setjmp.h>
  #include <stdarg.h>
@@ -65,7 +6659,7 @@
  #include <ethertype.h>
 diff -NarU5 argus-2.0.6.fixes.1.orig/server/ArgusOutput.c argus-2.0.6.fixes.1/server/ArgusOutput.c
 --- argus-2.0.6.fixes.1.orig/server/ArgusOutput.c	2004-02-23 10:00:36.000000000 -0500
-+++ argus-2.0.6.fixes.1/server/ArgusOutput.c	2006-02-24 11:54:41.000000000 -0500
++++ argus-2.0.6.fixes.1/server/ArgusOutput.c	2006-04-21 14:57:52.000000000 -0400
 @@ -1196,11 +1196,11 @@
  void
  ArgusCheckClientStatus ()

argus-2.0.6.fixes.1-makefile.patch:

Index: argus-2.0.6.fixes.1-makefile.patch
===================================================================
RCS file: /cvs/extras/rpms/argus/FC-4/argus-2.0.6.fixes.1-makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- argus-2.0.6.fixes.1-makefile.patch	17 Mar 2006 19:32:36 -0000	1.1
+++ argus-2.0.6.fixes.1-makefile.patch	21 Apr 2006 19:23:11 -0000	1.2
@@ -1,7 +1,45 @@
 diff -NarU5 argus-2.0.6.fixes.1.orig/common/Makefile.in argus-2.0.6.fixes.1/common/Makefile.in
 --- argus-2.0.6.fixes.1.orig/common/Makefile.in	2004-02-23 10:00:36.000000000 -0500
-+++ argus-2.0.6.fixes.1/common/Makefile.in	2006-03-15 11:08:37.000000000 -0500
-@@ -144,18 +144,18 @@
++++ argus-2.0.6.fixes.1/common/Makefile.in	2006-04-21 15:03:33.000000000 -0400
+@@ -98,34 +98,28 @@
+ 
+ TAGHDR = bpf/net/bpf.h
+ 
+ TAGFILES = $(SRC) $(HDR) $(TAGHDR)
+ 
+-LIBS = @INSTALL_LIB@/argus_parse.a @INSTALL_LIB@/argus_common.a 
++LIBS = @INSTALL_LIB@/argus_common.a 
+ 
+-OBJ =	$(COMMONOBJ) $(PARSEOBJ)
++OBJ =	$(COMMONOBJ)
+ CLEANFILES = $(LIBS) $(OBJ) $(GENSRC) $(GENHDR) lex.yy.c 
+ 
+ 
+ COMMONSRC = gencode.c argus_filter.c $(GENSRC)
+ COMMONOBJ = gencode.o argus_filter.o scanner.o grammar.o version.o
+ 
+-PARSESRC = argus_parse.c argus_util.c argus_auth.c
+-PARSEOBJ = argus_parse.o argus_util.o argus_auth.o
+ 
+-SRC = $(COMMONSRC) $(PARSESRC)
++SRC = $(COMMONSRC)
+ 
+ all: $(LIBS)
+ 
+ @INSTALL_LIB@/argus_common.a: $(COMMONOBJ)
+ 	rm -f $@; ar qc $@ $(COMMONOBJ)
+ 	-$(RANLIB) $@
+ 
+- at INSTALL_LIB@/argus_parse.a: $(PARSEOBJ)
+-	rm -f $@; ar qc $@ $(PARSEOBJ)
+-	-$(RANLIB) $@
+-
+ scanner.c: scanner.l
+ 	@rm -f $@
+ 	$(LEX) -t $< > $$$$.$@; mv $$$$.$@ $@
+ 
+ scanner.o: scanner.c tokdefs.h
+@@ -144,18 +138,16 @@
  version.c: $(srcdir)/../VERSION
  	@rm -f $@
  	sed -e 's/.*/char version[] = "&";/' $(srcdir)/../VERSION > $@
@@ -15,12 +53,10 @@
 -	$(INSTALL) $(srcdir)/../lib/argus_common.a $(LIBDEST)/argus_common.a
 -	$(INSTALL) $(srcdir)/../lib/argus_parse.a  $(LIBDEST)/argus_parse.a
 +	$(INSTALL) $(srcdir)/../lib/argus_common.a $(DESTDIR)/$(LIBDEST)/argus_common.a
-+	$(INSTALL) $(srcdir)/../lib/argus_parse.a  $(DESTDIR)/$(LIBDEST)/argus_parse.a
  
 -	$(RANLIB) $(LIBDEST)/argus_common.a
 -	$(RANLIB) $(LIBDEST)/argus_parse.a
 +	$(RANLIB) $(DESTDIR)/$(LIBDEST)/argus_common.a
-+	$(RANLIB) $(DESTDIR)/$(LIBDEST)/argus_parse.a
  
  clean:
  	rm -f $(CLEANFILES)
@@ -28,7 +64,7 @@
  distclean:
 diff -NarU5 argus-2.0.6.fixes.1.orig/Makefile.in argus-2.0.6.fixes.1/Makefile.in
 --- argus-2.0.6.fixes.1.orig/Makefile.in	2004-04-13 01:32:58.000000000 -0400
-+++ argus-2.0.6.fixes.1/Makefile.in	2006-03-15 11:08:37.000000000 -0500
++++ argus-2.0.6.fixes.1/Makefile.in	2006-04-21 15:01:16.000000000 -0400
 @@ -29,14 +29,14 @@
  LIBS = @LIBS@
  
@@ -189,7 +225,7 @@
  config.status: configure
 diff -NarU5 argus-2.0.6.fixes.1.orig/server/Makefile.in argus-2.0.6.fixes.1/server/Makefile.in
 --- argus-2.0.6.fixes.1.orig/server/Makefile.in	2004-02-23 10:00:36.000000000 -0500
-+++ argus-2.0.6.fixes.1/server/Makefile.in	2006-03-15 11:09:04.000000000 -0500
++++ argus-2.0.6.fixes.1/server/Makefile.in	2006-04-21 15:01:16.000000000 -0400
 @@ -41,11 +41,11 @@
  #
  # Various configurable paths (remember to edit Makefile.in, not Makefile)


Index: argus.spec
===================================================================
RCS file: /cvs/extras/rpms/argus/FC-4/argus.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- argus.spec	20 Mar 2006 18:38:44 -0000	1.2
+++ argus.spec	21 Apr 2006 19:23:11 -0000	1.3
@@ -1,6 +1,6 @@
 Name: argus
 Version: 2.0.6.fixes.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: Network transaction audit tool
 License: GPL
 Group: Applications/Internet
@@ -123,6 +123,9 @@
 %{_mandir}/man5/ra*
 
 %changelog
+* Fri Apr 21 2006 Gabriel Somlo <somlo at cmu.edu> 2.0.6.fixes.1-9
+- daemon patches now eliminate unused common files: argus_parse.c, argus_util.c, and argus_auth.c
+
 * Mon Mar 20 2006 Gabriel Somlo <somlo at cmu.edu> 2.0.6.fixes.1-8
 - added ncurses-devel build requirement
 



From fedora-extras-commits at redhat.com  Fri Apr 21 19:23:52 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Fri, 21 Apr 2006 12:23:52 -0700
Subject: rpms/argus/devel argus-2.0.6.fixes.1-build.patch, 1.1,
	1.2 argus-2.0.6.fixes.1-makefile.patch, 1.1, 1.2 argus.spec, 1.2, 1.3
Message-ID: <200604211923.k3LJNtVI008695@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/argus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8668

Modified Files:
	argus-2.0.6.fixes.1-build.patch 
	argus-2.0.6.fixes.1-makefile.patch argus.spec 
Log Message:
daemon patches now eliminate unused common files: argus_parse.c, argus_util.c, and argus_auth.c


argus-2.0.6.fixes.1-build.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 argus-2.0.6.fixes.1-build.patch
Index: argus-2.0.6.fixes.1-build.patch
===================================================================
RCS file: /cvs/extras/rpms/argus/devel/argus-2.0.6.fixes.1-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- argus-2.0.6.fixes.1-build.patch	17 Mar 2006 19:32:36 -0000	1.1
+++ argus-2.0.6.fixes.1-build.patch	21 Apr 2006 19:23:52 -0000	1.2
@@ -1,55 +1,6649 @@
+diff -NarU5 argus-2.0.6.fixes.1.orig/common/argus_auth.c argus-2.0.6.fixes.1/common/argus_auth.c
+--- argus-2.0.6.fixes.1.orig/common/argus_auth.c	2004-02-23 10:00:36.000000000 -0500
++++ argus-2.0.6.fixes.1/common/argus_auth.c	1969-12-31 19:00:00.000000000 -0500
+@@ -1,569 +0,0 @@
+-/*
+- * Copyright (c) 2000-2004 QoSient, LLC
+- * All rights reserved.
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2, or (at your option)
+- * any later version.
+-
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+-
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+- *
+- */
+-
+-/*
+- * Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
+- *
+- * Redistribution and use in source and binary forms, with or without
+- * modification, are permitted provided that the following conditions
+- * are met:
+- *
+- * 1. Redistributions of source code must retain the above copyright
+- *    notice, this list of conditions and the following disclaimer.
+- *
+- * 2. Redistributions in binary form must reproduce the above copyright
+- *    notice, this list of conditions and the following disclaimer in
+- *    the documentation and/or other materials provided with the
+- *    distribution.
+- *
+- * 3. The name "Carnegie Mellon University" must not be used to
+- *    endorse or promote products derived from this software without
+- *    prior written permission. For permission or any other legal
+- *    details, please contact
+- *      Office of Technology Transfer
+- *      Carnegie Mellon University
+- *      5000 Forbes Avenue
+- *      Pittsburgh, PA  15213-3890
+- *      (412) 268-4387, fax: (412) 268-7395
+- *      tech-transfer at andrew.cmu.edu
+- *
+- * 4. Redistributions of any form whatsoever must retain the following
+- *    acknowledgment:
+- *    "This product includes software developed by Computing Services
+- *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+- *
+- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+- */
+-
+-/*
+- * Modified by Carter Bullard
+- * QoSient, LLC
+- *
+- */
+-
+-
+-#ifndef ArgusAuth
+-#define ArgusAuth
+-#endif
+-
+-#include <stdlib.h>
+-#include <unistd.h>
+-
+-#include <errno.h>
+-#include <string.h>
+-
+-#ifdef ARGUS_SASL
+-
+-#include <ctype.h>
+-#include <assert.h>
+-#include <sasl.h>
+-
+-#endif /* ARGUS_SASL */
+-
+-#include <netinet/in.h>
+-#include <pcap.h>
+-
+-#include <compat.h>
+-#include <interface.h>
+-
+-#include <argus_parse.h>
+-#include <argus_util.h>
+-#include <argus_out.h>
+-#include <argus_filter.h>
+-
+-
+-extern void ArgusLog (int, char *, ...);
+-
+-int ArgusInitializeAuthentication (struct ARGUS_INPUT *);
+-int ArgusAuthenticate (struct ARGUS_INPUT *);
+-
+-#ifdef ARGUS_SASL
+-
+-static int RaGetRealm(void *context, int, const char **, const char **);
+-static int RaSimple(void *context, int, const char **, unsigned *);
+-static int RaGetSecret(sasl_conn_t *, void *context, int, sasl_secret_t **);
+-
+-int RaSaslNegotiate(FILE *, FILE *, sasl_conn_t *);
+-int RaGetSaslString (FILE *, char *, int);
+-int RaSendSaslString (FILE *, const char *, int);
+-
+-/* RaCallBacks we support */
+-
+-static sasl_callback_t RaCallBacks[] = {
+-  { SASL_CB_GETREALM, &RaGetRealm,  NULL },
+-  { SASL_CB_USER,     &RaSimple,    NULL },
+-  { SASL_CB_AUTHNAME, &RaSimple,    NULL },
+-  { SASL_CB_PASS,     &RaGetSecret, NULL },
+-  { SASL_CB_LIST_END, NULL, NULL }
+-};
+-
+-char *RaSaslMech = NULL;
+-
+-#endif 
+-
+-
+-#if defined(HAVE_SOLARIS)
+-extern int getdomainname(char *name, size_t len);
+-#endif
+-
+-
+-int
+-ArgusInitializeAuthentication (struct ARGUS_INPUT *input)
+-{
+-   int retn = 1;
+-
+-#ifdef ARGUS_SASL
+-   struct sockaddr_in localaddr, remoteaddr;
+-   int salen, fd = input->fd;
+-   char *localhostname = NULL;
+-
+-   if ((retn = sasl_client_init(RaCallBacks)) != SASL_OK)
+-      ArgusLog (LOG_ERR, "ArgusInitializeAuthentication() sasl_client_init %d", retn);
+-
+-   localhostname = ArgusCalloc (1, 1024);
+-   gethostname(localhostname, 1024);
+-   if (!strchr (localhostname, '.')) {
+-      strcat (localhostname, ".");
+-      getdomainname (&localhostname[strlen(localhostname)], 1024 - strlen(localhostname));
+-   }
+-
+-   if ((retn = sasl_client_new("argus", localhostname, NULL, SASL_SECURITY_LAYER, &input->sasl_conn)) != SASL_OK)
+-      ArgusLog (LOG_ERR, "ArgusInitializeAuthentication() sasl_client_new %d", retn);
+-   
+-   /* set external properties here
+-   sasl_setprop(input->sasl_conn, SASL_SSF_EXTERNAL, &extprops); */
+-   
+-   /* set required security properties here
+-   sasl_setprop(input->sasl_conn, SASL_SEC_PROPS, &secprops); */
+-   
+-   /* set ip addresses */
+-   salen = sizeof(localaddr);
+-   if (getsockname(fd, (struct sockaddr *)&localaddr, &salen) < 0)
+-      perror("getsockname");
+-
+-   salen = sizeof(remoteaddr); 
+-   if (getpeername(fd, (struct sockaddr *)&remoteaddr, &salen) < 0)
+-      perror("getpeername");
+-
+-   if ((retn = sasl_setprop(input->sasl_conn, SASL_IP_LOCAL, &localaddr)) != SASL_OK)
+-      ArgusLog (LOG_ERR, "ArgusInitializeAuthentication() error setting localaddr %d", retn);
+-
+-   if ((retn = sasl_setprop(input->sasl_conn, SASL_IP_REMOTE, &remoteaddr)) != SASL_OK)
+-      ArgusLog (LOG_ERR, "ArgusInitializeAuthentication() error setting remoteaddr %d", retn);
+-
+-   retn = 1;
+-#endif 
+-
+-#ifdef ARGUSDEBUG
+-   ArgusDebug (2, "ArgusInitializeAuthentication () returning %d\n", retn);
+-#endif 
+-
+-   return (retn);
+-}
+-
+-
[...6308 lines suppressed...]
+-   bzero (indStr, 16);
+-   bzero (date, 128);
+-
+-   flow = &argus->argus_far.flow;
+-
+-   sprintf (srcString, "%17.17s", etheraddr_string((unsigned char *)&flow->mac_flow.ehdr.ether_shost));
+-   sprintf (dstString, "%17.17s", etheraddr_string((unsigned char *)&flow->mac_flow.ehdr.ether_dhost));
+-
+-   src_count = argus->argus_far.src.count;
+-   dst_count = argus->argus_far.dst.count;
+-
+-   if (Aflag) {
+-      src_bytes = argus->argus_far.src.appbytes;
+-      dst_bytes = argus->argus_far.dst.appbytes;
+-   } else {
+-      src_bytes = argus->argus_far.src.bytes;
+-      dst_bytes = argus->argus_far.dst.bytes;
+-   }
+-
+-   print_date (argus, date);
+-
+-   if (idflag) {
+-      if (ArgusInput->ArgusManStart.ahdr.status & ARGUS_ID_IS_IPADDR)
+-         argusIDStr = strdup (ipaddr_string (&argus->ahdr.argusid));
+-      else
+-         sprintf (argusIDStr, "%u", argus->ahdr.argusid);
+-
+-      sprintf(argus_strbuf, "%-15.15s ", argusIDStr);
+-   }
+-
+-   if (mflag) {
+-      if (ArgusThisFarStatus & ARGUS_MAC_DSR_STATUS) {
+-         struct ArgusMacStruct *mac = (struct ArgusMacStruct *) ArgusThisFarHdrs[ARGUS_MAC_DSR_INDEX];
+-
+-         esrcString = etheraddr_string ((u_char *)&mac->phys_union.ether.ethersrc);
+-         edstString = etheraddr_string ((u_char *)&mac->phys_union.ether.etherdst);
+-
+-         sprintf (srcString, "%17.17s %17.17s   %*.*s",
+-                      esrcString, edstString, hfield + 2, hfield + 2,
+-                      etheraddr_string((unsigned char *)&flow->mac_flow.ehdr.ether_shost));
+-      } else
+-         sprintf (srcString, "%17.17s %17.17s    %*.*s",
+-                      blankStr, blankStr, hfield + 2, hfield + 2, 
+-                      etheraddr_string((unsigned char *)&flow->mac_flow.ehdr.ether_shost));
+-   }
+-
+-   if (Iflag)
+-      strcpy (fmtstr, "%s%s%4s %s -   %22.22s ");
+-   else
+-      strcpy (fmtstr, "%s  %4s %s -   %22.22s ");
+-
+-   if (cflag)
+-      strcat (fmtstr, "%-8u %-8u  %-12u %-12u");
+-
+-   if ((argus->ahdr.cause & ARGUS_TIMEOUT))
+-      strcat (fmtstr, "TIM");
+-   else
+-      if (argus->argus_far.src.count && argus->argus_far.dst.count) {
+-         if ((argus->argus_far.src.count == 1) && (argus->argus_far.dst.count == 1))
+-            strcat (fmtstr, "ACC");
+-         else
+-            strcat (fmtstr, "CON");
+-      } else
+-         if (argus->ahdr.type & ARGUS_START)
+-            strcat (fmtstr, "INT");
+-
+-   proto = argus->ahdr.status & 0xFFFF;
+-
+-   sprintf (protoStr, "%s", etherproto_string(proto));
+-
+-   if (src_count)
+-      fmtstr[12 + vc] = '>'; 
+-   if (dst_count)
+-      fmtstr[10 + vc] = '<'; 
+-
+-
+-   if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0'))
+-      delim = RaFieldDelimiter;
+-   else {
+-      if (proto == 0) {
+-         delim = '.';
+-      } else {
+-         delim = ' ';
+-      }
+-   }
+-
+-   if (proto == 0) {
+-      sprintf (sportbuf, "%c%-4.4s", delim, llcsap_string((unsigned char) flow->mac_flow.ssap));
+-      sprintf (dportbuf, "%c%-4.4s", delim, llcsap_string((unsigned char) flow->mac_flow.dsap));
+-   } else {
+-      sprintf (sportbuf, "%c    ", delim);
+-      sprintf (dportbuf, "%c    ", delim);
+-
+-      if (dst_count) {
+-         if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0'))
+-            fmtstr[9 + vc] = RaFieldDelimiter;
+-      } else
+-         if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0'))
+-            fmtstr[10 + vc] = RaFieldDelimiter;
+-
+-      if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) {
+-         fmtstr[22 + vc] = RaFieldDelimiter;
+-      }
+-   }
+-
+-   strcat (srcString, sportbuf);
+-   strcat (dstString, dportbuf);
+-
+-   if ((strlen(protoStr) > 4) && !((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')))
+-      protoStr[4] = '\0';
+-
+-   ArgusGetIndicatorString (argus, indStr);
+-
+-   if (Iflag) {
+-      if (cflag)
+-         sprintf (&argus_strbuf[strlen(argus_strbuf)], fmtstr, date, indStr, protoStr,
+-               srcString, dstString, 
+-               src_count, dst_count,
+-               src_bytes, dst_bytes);
+-      else
+-         sprintf (&argus_strbuf[strlen(argus_strbuf)], fmtstr, date, indStr, protoStr,
+-               srcString, dstString);
+-   } else {
+-      if (cflag)
+-         sprintf (&argus_strbuf[strlen(argus_strbuf)], fmtstr, date, protoStr,
+-               srcString, dstString, 
+-               src_count, dst_count,
+-               src_bytes, dst_bytes);
+-      else
+-         sprintf (&argus_strbuf[strlen(argus_strbuf)], fmtstr, date, protoStr,
+-               srcString, dstString);
+-   }
+-
+-   if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) {
+-      char tmpbuf[128], *ptr = tmpbuf, *str = argus_strbuf, lastchr = ' ';
+-      int len = strlen(date) - 1;
+-      bzero (tmpbuf, sizeof(tmpbuf));
+-
+-      bcopy (str, ptr, len);
+-      str += len;
+-      ptr += len;
+-
+-      while (*str) {
+-         if (*str == ' ') {
+-            if (lastchr != RaFieldDelimiter)
+-               *ptr++ = RaFieldDelimiter;
+-            while (isspace((int)*str)) str++;
+-         }
+-         lastchr = *str;
+-
+-         *ptr++ = *str++;
+-      }
+-      bzero (argus_strbuf, MAXSTRLEN);
+-      bcopy (tmpbuf, argus_strbuf, strlen(tmpbuf));
+-   }
+-
+-   return (argus_strbuf);
+-}
+-
+-
+-
+-#ifdef NOVFPRINTF
+-/*
+- * Stock 4.3 doesn't have vfprintf. 
+- * This routine is due to Chris Torek.
+- */
+-vfprintf(f, fmt, args)
+-   FILE *f;
+-   char *fmt;
+-   va_list args;
+-{
+-   int ret;
+-
+-   if ((f->_flag & _IOWRT) == 0) {
+-      if (f->_flag & _IORW)
+-         f->_flag |= _IOWRT;
+-      else
+-         return EOF;
+-   }
+-   ret = _doprnt(fmt, args, f);
+-   return ferror(f) ? EOF : ret;
+-}
+-#endif
+-
 diff -NarU5 argus-2.0.6.fixes.1.orig/common/gencode.c argus-2.0.6.fixes.1/common/gencode.c
 --- argus-2.0.6.fixes.1.orig/common/gencode.c	2004-02-23 10:00:36.000000000 -0500
-+++ argus-2.0.6.fixes.1/common/gencode.c	2006-02-24 11:54:41.000000000 -0500
++++ argus-2.0.6.fixes.1/common/gencode.c	2006-04-21 14:57:52.000000000 -0400
 @@ -57,11 +57,11 @@
  #include <setjmp.h>
  #include <stdarg.h>
@@ -65,7 +6659,7 @@
  #include <ethertype.h>
 diff -NarU5 argus-2.0.6.fixes.1.orig/server/ArgusOutput.c argus-2.0.6.fixes.1/server/ArgusOutput.c
 --- argus-2.0.6.fixes.1.orig/server/ArgusOutput.c	2004-02-23 10:00:36.000000000 -0500
-+++ argus-2.0.6.fixes.1/server/ArgusOutput.c	2006-02-24 11:54:41.000000000 -0500
++++ argus-2.0.6.fixes.1/server/ArgusOutput.c	2006-04-21 14:57:52.000000000 -0400
 @@ -1196,11 +1196,11 @@
  void
  ArgusCheckClientStatus ()

argus-2.0.6.fixes.1-makefile.patch:

Index: argus-2.0.6.fixes.1-makefile.patch
===================================================================
RCS file: /cvs/extras/rpms/argus/devel/argus-2.0.6.fixes.1-makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- argus-2.0.6.fixes.1-makefile.patch	17 Mar 2006 19:32:36 -0000	1.1
+++ argus-2.0.6.fixes.1-makefile.patch	21 Apr 2006 19:23:52 -0000	1.2
@@ -1,7 +1,45 @@
 diff -NarU5 argus-2.0.6.fixes.1.orig/common/Makefile.in argus-2.0.6.fixes.1/common/Makefile.in
 --- argus-2.0.6.fixes.1.orig/common/Makefile.in	2004-02-23 10:00:36.000000000 -0500
-+++ argus-2.0.6.fixes.1/common/Makefile.in	2006-03-15 11:08:37.000000000 -0500
-@@ -144,18 +144,18 @@
++++ argus-2.0.6.fixes.1/common/Makefile.in	2006-04-21 15:03:33.000000000 -0400
+@@ -98,34 +98,28 @@
+ 
+ TAGHDR = bpf/net/bpf.h
+ 
+ TAGFILES = $(SRC) $(HDR) $(TAGHDR)
+ 
+-LIBS = @INSTALL_LIB@/argus_parse.a @INSTALL_LIB@/argus_common.a 
++LIBS = @INSTALL_LIB@/argus_common.a 
+ 
+-OBJ =	$(COMMONOBJ) $(PARSEOBJ)
++OBJ =	$(COMMONOBJ)
+ CLEANFILES = $(LIBS) $(OBJ) $(GENSRC) $(GENHDR) lex.yy.c 
+ 
+ 
+ COMMONSRC = gencode.c argus_filter.c $(GENSRC)
+ COMMONOBJ = gencode.o argus_filter.o scanner.o grammar.o version.o
+ 
+-PARSESRC = argus_parse.c argus_util.c argus_auth.c
+-PARSEOBJ = argus_parse.o argus_util.o argus_auth.o
+ 
+-SRC = $(COMMONSRC) $(PARSESRC)
++SRC = $(COMMONSRC)
+ 
+ all: $(LIBS)
+ 
+ @INSTALL_LIB@/argus_common.a: $(COMMONOBJ)
+ 	rm -f $@; ar qc $@ $(COMMONOBJ)
+ 	-$(RANLIB) $@
+ 
+- at INSTALL_LIB@/argus_parse.a: $(PARSEOBJ)
+-	rm -f $@; ar qc $@ $(PARSEOBJ)
+-	-$(RANLIB) $@
+-
+ scanner.c: scanner.l
+ 	@rm -f $@
+ 	$(LEX) -t $< > $$$$.$@; mv $$$$.$@ $@
+ 
+ scanner.o: scanner.c tokdefs.h
+@@ -144,18 +138,16 @@
  version.c: $(srcdir)/../VERSION
  	@rm -f $@
  	sed -e 's/.*/char version[] = "&";/' $(srcdir)/../VERSION > $@
@@ -15,12 +53,10 @@
 -	$(INSTALL) $(srcdir)/../lib/argus_common.a $(LIBDEST)/argus_common.a
 -	$(INSTALL) $(srcdir)/../lib/argus_parse.a  $(LIBDEST)/argus_parse.a
 +	$(INSTALL) $(srcdir)/../lib/argus_common.a $(DESTDIR)/$(LIBDEST)/argus_common.a
-+	$(INSTALL) $(srcdir)/../lib/argus_parse.a  $(DESTDIR)/$(LIBDEST)/argus_parse.a
  
 -	$(RANLIB) $(LIBDEST)/argus_common.a
 -	$(RANLIB) $(LIBDEST)/argus_parse.a
 +	$(RANLIB) $(DESTDIR)/$(LIBDEST)/argus_common.a
-+	$(RANLIB) $(DESTDIR)/$(LIBDEST)/argus_parse.a
  
  clean:
  	rm -f $(CLEANFILES)
@@ -28,7 +64,7 @@
  distclean:
 diff -NarU5 argus-2.0.6.fixes.1.orig/Makefile.in argus-2.0.6.fixes.1/Makefile.in
 --- argus-2.0.6.fixes.1.orig/Makefile.in	2004-04-13 01:32:58.000000000 -0400
-+++ argus-2.0.6.fixes.1/Makefile.in	2006-03-15 11:08:37.000000000 -0500
++++ argus-2.0.6.fixes.1/Makefile.in	2006-04-21 15:01:16.000000000 -0400
 @@ -29,14 +29,14 @@
  LIBS = @LIBS@
  
@@ -189,7 +225,7 @@
  config.status: configure
 diff -NarU5 argus-2.0.6.fixes.1.orig/server/Makefile.in argus-2.0.6.fixes.1/server/Makefile.in
 --- argus-2.0.6.fixes.1.orig/server/Makefile.in	2004-02-23 10:00:36.000000000 -0500
-+++ argus-2.0.6.fixes.1/server/Makefile.in	2006-03-15 11:09:04.000000000 -0500
++++ argus-2.0.6.fixes.1/server/Makefile.in	2006-04-21 15:01:16.000000000 -0400
 @@ -41,11 +41,11 @@
  #
  # Various configurable paths (remember to edit Makefile.in, not Makefile)


Index: argus.spec
===================================================================
RCS file: /cvs/extras/rpms/argus/devel/argus.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- argus.spec	20 Mar 2006 18:38:56 -0000	1.2
+++ argus.spec	21 Apr 2006 19:23:52 -0000	1.3
@@ -1,6 +1,6 @@
 Name: argus
 Version: 2.0.6.fixes.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: Network transaction audit tool
 License: GPL
 Group: Applications/Internet
@@ -123,6 +123,9 @@
 %{_mandir}/man5/ra*
 
 %changelog
+* Fri Apr 21 2006 Gabriel Somlo <somlo at cmu.edu> 2.0.6.fixes.1-9
+- daemon patches now eliminate unused common files: argus_parse.c, argus_util.c, and argus_auth.c
+
 * Mon Mar 20 2006 Gabriel Somlo <somlo at cmu.edu> 2.0.6.fixes.1-8
 - added ncurses-devel build requirement
 



From fedora-extras-commits at redhat.com  Fri Apr 21 19:24:57 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Fri, 21 Apr 2006 12:24:57 -0700
Subject: rpms/argus/FC-5 argus-2.0.6.fixes.1-build.patch, 1.1,
	1.2 argus-2.0.6.fixes.1-makefile.patch, 1.1, 1.2 argus.spec, 1.2, 1.3
Message-ID: <200604211924.k3LJOxL0008738@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/argus/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8711

Modified Files:
	argus-2.0.6.fixes.1-build.patch 
	argus-2.0.6.fixes.1-makefile.patch argus.spec 
Log Message:
daemon patches now eliminate unused common files: argus_parse.c, argus_util.c, and argus_auth.c


argus-2.0.6.fixes.1-build.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 argus-2.0.6.fixes.1-build.patch
Index: argus-2.0.6.fixes.1-build.patch
===================================================================
RCS file: /cvs/extras/rpms/argus/FC-5/argus-2.0.6.fixes.1-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- argus-2.0.6.fixes.1-build.patch	17 Mar 2006 19:32:36 -0000	1.1
+++ argus-2.0.6.fixes.1-build.patch	21 Apr 2006 19:24:57 -0000	1.2
@@ -1,55 +1,6649 @@
+diff -NarU5 argus-2.0.6.fixes.1.orig/common/argus_auth.c argus-2.0.6.fixes.1/common/argus_auth.c
+--- argus-2.0.6.fixes.1.orig/common/argus_auth.c	2004-02-23 10:00:36.000000000 -0500
++++ argus-2.0.6.fixes.1/common/argus_auth.c	1969-12-31 19:00:00.000000000 -0500
+@@ -1,569 +0,0 @@
+-/*
+- * Copyright (c) 2000-2004 QoSient, LLC
+- * All rights reserved.
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2, or (at your option)
+- * any later version.
+-
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+-
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+- *
+- */
+-
+-/*
+- * Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
+- *
+- * Redistribution and use in source and binary forms, with or without
+- * modification, are permitted provided that the following conditions
+- * are met:
+- *
+- * 1. Redistributions of source code must retain the above copyright
+- *    notice, this list of conditions and the following disclaimer.
+- *
+- * 2. Redistributions in binary form must reproduce the above copyright
+- *    notice, this list of conditions and the following disclaimer in
+- *    the documentation and/or other materials provided with the
+- *    distribution.
+- *
+- * 3. The name "Carnegie Mellon University" must not be used to
+- *    endorse or promote products derived from this software without
+- *    prior written permission. For permission or any other legal
+- *    details, please contact
+- *      Office of Technology Transfer
+- *      Carnegie Mellon University
+- *      5000 Forbes Avenue
+- *      Pittsburgh, PA  15213-3890
+- *      (412) 268-4387, fax: (412) 268-7395
+- *      tech-transfer at andrew.cmu.edu
+- *
+- * 4. Redistributions of any form whatsoever must retain the following
+- *    acknowledgment:
+- *    "This product includes software developed by Computing Services
+- *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+- *
+- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+- */
+-
+-/*
+- * Modified by Carter Bullard
+- * QoSient, LLC
+- *
+- */
+-
+-
+-#ifndef ArgusAuth
+-#define ArgusAuth
+-#endif
+-
+-#include <stdlib.h>
+-#include <unistd.h>
+-
+-#include <errno.h>
+-#include <string.h>
+-
+-#ifdef ARGUS_SASL
+-
+-#include <ctype.h>
+-#include <assert.h>
+-#include <sasl.h>
+-
+-#endif /* ARGUS_SASL */
+-
+-#include <netinet/in.h>
+-#include <pcap.h>
+-
+-#include <compat.h>
+-#include <interface.h>
+-
+-#include <argus_parse.h>
+-#include <argus_util.h>
+-#include <argus_out.h>
+-#include <argus_filter.h>
+-
+-
+-extern void ArgusLog (int, char *, ...);
+-
+-int ArgusInitializeAuthentication (struct ARGUS_INPUT *);
+-int ArgusAuthenticate (struct ARGUS_INPUT *);
+-
+-#ifdef ARGUS_SASL
+-
+-static int RaGetRealm(void *context, int, const char **, const char **);
+-static int RaSimple(void *context, int, const char **, unsigned *);
+-static int RaGetSecret(sasl_conn_t *, void *context, int, sasl_secret_t **);
+-
+-int RaSaslNegotiate(FILE *, FILE *, sasl_conn_t *);
+-int RaGetSaslString (FILE *, char *, int);
+-int RaSendSaslString (FILE *, const char *, int);
+-
+-/* RaCallBacks we support */
+-
+-static sasl_callback_t RaCallBacks[] = {
+-  { SASL_CB_GETREALM, &RaGetRealm,  NULL },
+-  { SASL_CB_USER,     &RaSimple,    NULL },
+-  { SASL_CB_AUTHNAME, &RaSimple,    NULL },
+-  { SASL_CB_PASS,     &RaGetSecret, NULL },
+-  { SASL_CB_LIST_END, NULL, NULL }
+-};
+-
+-char *RaSaslMech = NULL;
+-
+-#endif 
+-
+-
+-#if defined(HAVE_SOLARIS)
+-extern int getdomainname(char *name, size_t len);
+-#endif
+-
+-
+-int
+-ArgusInitializeAuthentication (struct ARGUS_INPUT *input)
+-{
+-   int retn = 1;
+-
+-#ifdef ARGUS_SASL
+-   struct sockaddr_in localaddr, remoteaddr;
+-   int salen, fd = input->fd;
+-   char *localhostname = NULL;
+-
+-   if ((retn = sasl_client_init(RaCallBacks)) != SASL_OK)
+-      ArgusLog (LOG_ERR, "ArgusInitializeAuthentication() sasl_client_init %d", retn);
+-
+-   localhostname = ArgusCalloc (1, 1024);
+-   gethostname(localhostname, 1024);
+-   if (!strchr (localhostname, '.')) {
+-      strcat (localhostname, ".");
+-      getdomainname (&localhostname[strlen(localhostname)], 1024 - strlen(localhostname));
+-   }
+-
+-   if ((retn = sasl_client_new("argus", localhostname, NULL, SASL_SECURITY_LAYER, &input->sasl_conn)) != SASL_OK)
+-      ArgusLog (LOG_ERR, "ArgusInitializeAuthentication() sasl_client_new %d", retn);
+-   
+-   /* set external properties here
+-   sasl_setprop(input->sasl_conn, SASL_SSF_EXTERNAL, &extprops); */
+-   
+-   /* set required security properties here
+-   sasl_setprop(input->sasl_conn, SASL_SEC_PROPS, &secprops); */
+-   
+-   /* set ip addresses */
+-   salen = sizeof(localaddr);
+-   if (getsockname(fd, (struct sockaddr *)&localaddr, &salen) < 0)
+-      perror("getsockname");
+-
+-   salen = sizeof(remoteaddr); 
+-   if (getpeername(fd, (struct sockaddr *)&remoteaddr, &salen) < 0)
+-      perror("getpeername");
+-
+-   if ((retn = sasl_setprop(input->sasl_conn, SASL_IP_LOCAL, &localaddr)) != SASL_OK)
+-      ArgusLog (LOG_ERR, "ArgusInitializeAuthentication() error setting localaddr %d", retn);
+-
+-   if ((retn = sasl_setprop(input->sasl_conn, SASL_IP_REMOTE, &remoteaddr)) != SASL_OK)
+-      ArgusLog (LOG_ERR, "ArgusInitializeAuthentication() error setting remoteaddr %d", retn);
+-
+-   retn = 1;
+-#endif 
+-
+-#ifdef ARGUSDEBUG
+-   ArgusDebug (2, "ArgusInitializeAuthentication () returning %d\n", retn);
+-#endif 
+-
+-   return (retn);
+-}
+-
+-
[...6308 lines suppressed...]
+-   bzero (indStr, 16);
+-   bzero (date, 128);
+-
+-   flow = &argus->argus_far.flow;
+-
+-   sprintf (srcString, "%17.17s", etheraddr_string((unsigned char *)&flow->mac_flow.ehdr.ether_shost));
+-   sprintf (dstString, "%17.17s", etheraddr_string((unsigned char *)&flow->mac_flow.ehdr.ether_dhost));
+-
+-   src_count = argus->argus_far.src.count;
+-   dst_count = argus->argus_far.dst.count;
+-
+-   if (Aflag) {
+-      src_bytes = argus->argus_far.src.appbytes;
+-      dst_bytes = argus->argus_far.dst.appbytes;
+-   } else {
+-      src_bytes = argus->argus_far.src.bytes;
+-      dst_bytes = argus->argus_far.dst.bytes;
+-   }
+-
+-   print_date (argus, date);
+-
+-   if (idflag) {
+-      if (ArgusInput->ArgusManStart.ahdr.status & ARGUS_ID_IS_IPADDR)
+-         argusIDStr = strdup (ipaddr_string (&argus->ahdr.argusid));
+-      else
+-         sprintf (argusIDStr, "%u", argus->ahdr.argusid);
+-
+-      sprintf(argus_strbuf, "%-15.15s ", argusIDStr);
+-   }
+-
+-   if (mflag) {
+-      if (ArgusThisFarStatus & ARGUS_MAC_DSR_STATUS) {
+-         struct ArgusMacStruct *mac = (struct ArgusMacStruct *) ArgusThisFarHdrs[ARGUS_MAC_DSR_INDEX];
+-
+-         esrcString = etheraddr_string ((u_char *)&mac->phys_union.ether.ethersrc);
+-         edstString = etheraddr_string ((u_char *)&mac->phys_union.ether.etherdst);
+-
+-         sprintf (srcString, "%17.17s %17.17s   %*.*s",
+-                      esrcString, edstString, hfield + 2, hfield + 2,
+-                      etheraddr_string((unsigned char *)&flow->mac_flow.ehdr.ether_shost));
+-      } else
+-         sprintf (srcString, "%17.17s %17.17s    %*.*s",
+-                      blankStr, blankStr, hfield + 2, hfield + 2, 
+-                      etheraddr_string((unsigned char *)&flow->mac_flow.ehdr.ether_shost));
+-   }
+-
+-   if (Iflag)
+-      strcpy (fmtstr, "%s%s%4s %s -   %22.22s ");
+-   else
+-      strcpy (fmtstr, "%s  %4s %s -   %22.22s ");
+-
+-   if (cflag)
+-      strcat (fmtstr, "%-8u %-8u  %-12u %-12u");
+-
+-   if ((argus->ahdr.cause & ARGUS_TIMEOUT))
+-      strcat (fmtstr, "TIM");
+-   else
+-      if (argus->argus_far.src.count && argus->argus_far.dst.count) {
+-         if ((argus->argus_far.src.count == 1) && (argus->argus_far.dst.count == 1))
+-            strcat (fmtstr, "ACC");
+-         else
+-            strcat (fmtstr, "CON");
+-      } else
+-         if (argus->ahdr.type & ARGUS_START)
+-            strcat (fmtstr, "INT");
+-
+-   proto = argus->ahdr.status & 0xFFFF;
+-
+-   sprintf (protoStr, "%s", etherproto_string(proto));
+-
+-   if (src_count)
+-      fmtstr[12 + vc] = '>'; 
+-   if (dst_count)
+-      fmtstr[10 + vc] = '<'; 
+-
+-
+-   if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0'))
+-      delim = RaFieldDelimiter;
+-   else {
+-      if (proto == 0) {
+-         delim = '.';
+-      } else {
+-         delim = ' ';
+-      }
+-   }
+-
+-   if (proto == 0) {
+-      sprintf (sportbuf, "%c%-4.4s", delim, llcsap_string((unsigned char) flow->mac_flow.ssap));
+-      sprintf (dportbuf, "%c%-4.4s", delim, llcsap_string((unsigned char) flow->mac_flow.dsap));
+-   } else {
+-      sprintf (sportbuf, "%c    ", delim);
+-      sprintf (dportbuf, "%c    ", delim);
+-
+-      if (dst_count) {
+-         if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0'))
+-            fmtstr[9 + vc] = RaFieldDelimiter;
+-      } else
+-         if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0'))
+-            fmtstr[10 + vc] = RaFieldDelimiter;
+-
+-      if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) {
+-         fmtstr[22 + vc] = RaFieldDelimiter;
+-      }
+-   }
+-
+-   strcat (srcString, sportbuf);
+-   strcat (dstString, dportbuf);
+-
+-   if ((strlen(protoStr) > 4) && !((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')))
+-      protoStr[4] = '\0';
+-
+-   ArgusGetIndicatorString (argus, indStr);
+-
+-   if (Iflag) {
+-      if (cflag)
+-         sprintf (&argus_strbuf[strlen(argus_strbuf)], fmtstr, date, indStr, protoStr,
+-               srcString, dstString, 
+-               src_count, dst_count,
+-               src_bytes, dst_bytes);
+-      else
+-         sprintf (&argus_strbuf[strlen(argus_strbuf)], fmtstr, date, indStr, protoStr,
+-               srcString, dstString);
+-   } else {
+-      if (cflag)
+-         sprintf (&argus_strbuf[strlen(argus_strbuf)], fmtstr, date, protoStr,
+-               srcString, dstString, 
+-               src_count, dst_count,
+-               src_bytes, dst_bytes);
+-      else
+-         sprintf (&argus_strbuf[strlen(argus_strbuf)], fmtstr, date, protoStr,
+-               srcString, dstString);
+-   }
+-
+-   if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) {
+-      char tmpbuf[128], *ptr = tmpbuf, *str = argus_strbuf, lastchr = ' ';
+-      int len = strlen(date) - 1;
+-      bzero (tmpbuf, sizeof(tmpbuf));
+-
+-      bcopy (str, ptr, len);
+-      str += len;
+-      ptr += len;
+-
+-      while (*str) {
+-         if (*str == ' ') {
+-            if (lastchr != RaFieldDelimiter)
+-               *ptr++ = RaFieldDelimiter;
+-            while (isspace((int)*str)) str++;
+-         }
+-         lastchr = *str;
+-
+-         *ptr++ = *str++;
+-      }
+-      bzero (argus_strbuf, MAXSTRLEN);
+-      bcopy (tmpbuf, argus_strbuf, strlen(tmpbuf));
+-   }
+-
+-   return (argus_strbuf);
+-}
+-
+-
+-
+-#ifdef NOVFPRINTF
+-/*
+- * Stock 4.3 doesn't have vfprintf. 
+- * This routine is due to Chris Torek.
+- */
+-vfprintf(f, fmt, args)
+-   FILE *f;
+-   char *fmt;
+-   va_list args;
+-{
+-   int ret;
+-
+-   if ((f->_flag & _IOWRT) == 0) {
+-      if (f->_flag & _IORW)
+-         f->_flag |= _IOWRT;
+-      else
+-         return EOF;
+-   }
+-   ret = _doprnt(fmt, args, f);
+-   return ferror(f) ? EOF : ret;
+-}
+-#endif
+-
 diff -NarU5 argus-2.0.6.fixes.1.orig/common/gencode.c argus-2.0.6.fixes.1/common/gencode.c
 --- argus-2.0.6.fixes.1.orig/common/gencode.c	2004-02-23 10:00:36.000000000 -0500
-+++ argus-2.0.6.fixes.1/common/gencode.c	2006-02-24 11:54:41.000000000 -0500
++++ argus-2.0.6.fixes.1/common/gencode.c	2006-04-21 14:57:52.000000000 -0400
 @@ -57,11 +57,11 @@
  #include <setjmp.h>
  #include <stdarg.h>
@@ -65,7 +6659,7 @@
  #include <ethertype.h>
 diff -NarU5 argus-2.0.6.fixes.1.orig/server/ArgusOutput.c argus-2.0.6.fixes.1/server/ArgusOutput.c
 --- argus-2.0.6.fixes.1.orig/server/ArgusOutput.c	2004-02-23 10:00:36.000000000 -0500
-+++ argus-2.0.6.fixes.1/server/ArgusOutput.c	2006-02-24 11:54:41.000000000 -0500
++++ argus-2.0.6.fixes.1/server/ArgusOutput.c	2006-04-21 14:57:52.000000000 -0400
 @@ -1196,11 +1196,11 @@
  void
  ArgusCheckClientStatus ()

argus-2.0.6.fixes.1-makefile.patch:

Index: argus-2.0.6.fixes.1-makefile.patch
===================================================================
RCS file: /cvs/extras/rpms/argus/FC-5/argus-2.0.6.fixes.1-makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- argus-2.0.6.fixes.1-makefile.patch	17 Mar 2006 19:32:36 -0000	1.1
+++ argus-2.0.6.fixes.1-makefile.patch	21 Apr 2006 19:24:57 -0000	1.2
@@ -1,7 +1,45 @@
 diff -NarU5 argus-2.0.6.fixes.1.orig/common/Makefile.in argus-2.0.6.fixes.1/common/Makefile.in
 --- argus-2.0.6.fixes.1.orig/common/Makefile.in	2004-02-23 10:00:36.000000000 -0500
-+++ argus-2.0.6.fixes.1/common/Makefile.in	2006-03-15 11:08:37.000000000 -0500
-@@ -144,18 +144,18 @@
++++ argus-2.0.6.fixes.1/common/Makefile.in	2006-04-21 15:03:33.000000000 -0400
+@@ -98,34 +98,28 @@
+ 
+ TAGHDR = bpf/net/bpf.h
+ 
+ TAGFILES = $(SRC) $(HDR) $(TAGHDR)
+ 
+-LIBS = @INSTALL_LIB@/argus_parse.a @INSTALL_LIB@/argus_common.a 
++LIBS = @INSTALL_LIB@/argus_common.a 
+ 
+-OBJ =	$(COMMONOBJ) $(PARSEOBJ)
++OBJ =	$(COMMONOBJ)
+ CLEANFILES = $(LIBS) $(OBJ) $(GENSRC) $(GENHDR) lex.yy.c 
+ 
+ 
+ COMMONSRC = gencode.c argus_filter.c $(GENSRC)
+ COMMONOBJ = gencode.o argus_filter.o scanner.o grammar.o version.o
+ 
+-PARSESRC = argus_parse.c argus_util.c argus_auth.c
+-PARSEOBJ = argus_parse.o argus_util.o argus_auth.o
+ 
+-SRC = $(COMMONSRC) $(PARSESRC)
++SRC = $(COMMONSRC)
+ 
+ all: $(LIBS)
+ 
+ @INSTALL_LIB@/argus_common.a: $(COMMONOBJ)
+ 	rm -f $@; ar qc $@ $(COMMONOBJ)
+ 	-$(RANLIB) $@
+ 
+- at INSTALL_LIB@/argus_parse.a: $(PARSEOBJ)
+-	rm -f $@; ar qc $@ $(PARSEOBJ)
+-	-$(RANLIB) $@
+-
+ scanner.c: scanner.l
+ 	@rm -f $@
+ 	$(LEX) -t $< > $$$$.$@; mv $$$$.$@ $@
+ 
+ scanner.o: scanner.c tokdefs.h
+@@ -144,18 +138,16 @@
  version.c: $(srcdir)/../VERSION
  	@rm -f $@
  	sed -e 's/.*/char version[] = "&";/' $(srcdir)/../VERSION > $@
@@ -15,12 +53,10 @@
 -	$(INSTALL) $(srcdir)/../lib/argus_common.a $(LIBDEST)/argus_common.a
 -	$(INSTALL) $(srcdir)/../lib/argus_parse.a  $(LIBDEST)/argus_parse.a
 +	$(INSTALL) $(srcdir)/../lib/argus_common.a $(DESTDIR)/$(LIBDEST)/argus_common.a
-+	$(INSTALL) $(srcdir)/../lib/argus_parse.a  $(DESTDIR)/$(LIBDEST)/argus_parse.a
  
 -	$(RANLIB) $(LIBDEST)/argus_common.a
 -	$(RANLIB) $(LIBDEST)/argus_parse.a
 +	$(RANLIB) $(DESTDIR)/$(LIBDEST)/argus_common.a
-+	$(RANLIB) $(DESTDIR)/$(LIBDEST)/argus_parse.a
  
  clean:
  	rm -f $(CLEANFILES)
@@ -28,7 +64,7 @@
  distclean:
 diff -NarU5 argus-2.0.6.fixes.1.orig/Makefile.in argus-2.0.6.fixes.1/Makefile.in
 --- argus-2.0.6.fixes.1.orig/Makefile.in	2004-04-13 01:32:58.000000000 -0400
-+++ argus-2.0.6.fixes.1/Makefile.in	2006-03-15 11:08:37.000000000 -0500
++++ argus-2.0.6.fixes.1/Makefile.in	2006-04-21 15:01:16.000000000 -0400
 @@ -29,14 +29,14 @@
  LIBS = @LIBS@
  
@@ -189,7 +225,7 @@
  config.status: configure
 diff -NarU5 argus-2.0.6.fixes.1.orig/server/Makefile.in argus-2.0.6.fixes.1/server/Makefile.in
 --- argus-2.0.6.fixes.1.orig/server/Makefile.in	2004-02-23 10:00:36.000000000 -0500
-+++ argus-2.0.6.fixes.1/server/Makefile.in	2006-03-15 11:09:04.000000000 -0500
++++ argus-2.0.6.fixes.1/server/Makefile.in	2006-04-21 15:01:16.000000000 -0400
 @@ -41,11 +41,11 @@
  #
  # Various configurable paths (remember to edit Makefile.in, not Makefile)


Index: argus.spec
===================================================================
RCS file: /cvs/extras/rpms/argus/FC-5/argus.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- argus.spec	20 Mar 2006 18:38:51 -0000	1.2
+++ argus.spec	21 Apr 2006 19:24:57 -0000	1.3
@@ -1,6 +1,6 @@
 Name: argus
 Version: 2.0.6.fixes.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: Network transaction audit tool
 License: GPL
 Group: Applications/Internet
@@ -123,6 +123,9 @@
 %{_mandir}/man5/ra*
 
 %changelog
+* Fri Apr 21 2006 Gabriel Somlo <somlo at cmu.edu> 2.0.6.fixes.1-9
+- daemon patches now eliminate unused common files: argus_parse.c, argus_util.c, and argus_auth.c
+
 * Mon Mar 20 2006 Gabriel Somlo <somlo at cmu.edu> 2.0.6.fixes.1-8
 - added ncurses-devel build requirement
 



From fedora-extras-commits at redhat.com  Fri Apr 21 19:37:11 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Fri, 21 Apr 2006 12:37:11 -0700
Subject: rpms/argus/FC-4 argus.spec,1.3,1.4
Message-ID: <200604211937.k3LJbDpQ009041@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/argus/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9024

Modified Files:
	argus.spec 
Log Message:
bumped release to work around botched CVS tag attempt



Index: argus.spec
===================================================================
RCS file: /cvs/extras/rpms/argus/FC-4/argus.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- argus.spec	21 Apr 2006 19:23:11 -0000	1.3
+++ argus.spec	21 Apr 2006 19:37:11 -0000	1.4
@@ -1,6 +1,6 @@
 Name: argus
 Version: 2.0.6.fixes.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: Network transaction audit tool
 License: GPL
 Group: Applications/Internet
@@ -123,6 +123,9 @@
 %{_mandir}/man5/ra*
 
 %changelog
+* Fri Apr 21 2006 Gabriel Somlo <somlo at cmu.edu> 2.0.6.fixes.1-10
+- bumped release to workaround botched CVS tag attempt
+
 * Fri Apr 21 2006 Gabriel Somlo <somlo at cmu.edu> 2.0.6.fixes.1-9
 - daemon patches now eliminate unused common files: argus_parse.c, argus_util.c, and argus_auth.c
 



From fedora-extras-commits at redhat.com  Fri Apr 21 19:38:19 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Fri, 21 Apr 2006 12:38:19 -0700
Subject: rpms/argus/FC-5 argus.spec,1.3,1.4
Message-ID: <200604211938.k3LJcLuH009099@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/argus/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9082

Modified Files:
	argus.spec 
Log Message:
bumped release to workaround botched CVS tag attempt



Index: argus.spec
===================================================================
RCS file: /cvs/extras/rpms/argus/FC-5/argus.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- argus.spec	21 Apr 2006 19:24:57 -0000	1.3
+++ argus.spec	21 Apr 2006 19:38:18 -0000	1.4
@@ -1,6 +1,6 @@
 Name: argus
 Version: 2.0.6.fixes.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: Network transaction audit tool
 License: GPL
 Group: Applications/Internet
@@ -123,6 +123,9 @@
 %{_mandir}/man5/ra*
 
 %changelog
+* Fri Apr 21 2006 Gabriel Somlo <somlo at cmu.edu> 2.0.6.fixes.1-10
+- bumped release to workaround botched CVS tag attempt
+
 * Fri Apr 21 2006 Gabriel Somlo <somlo at cmu.edu> 2.0.6.fixes.1-9
 - daemon patches now eliminate unused common files: argus_parse.c, argus_util.c, and argus_auth.c
 



From fedora-extras-commits at redhat.com  Fri Apr 21 19:38:45 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Fri, 21 Apr 2006 12:38:45 -0700
Subject: rpms/argus/devel argus.spec,1.3,1.4
Message-ID: <200604211938.k3LJclOj009156@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/argus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9139

Modified Files:
	argus.spec 
Log Message:
bumped release to workaround botched CVS tag attempt



Index: argus.spec
===================================================================
RCS file: /cvs/extras/rpms/argus/devel/argus.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- argus.spec	21 Apr 2006 19:23:52 -0000	1.3
+++ argus.spec	21 Apr 2006 19:38:45 -0000	1.4
@@ -1,6 +1,6 @@
 Name: argus
 Version: 2.0.6.fixes.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: Network transaction audit tool
 License: GPL
 Group: Applications/Internet
@@ -123,6 +123,9 @@
 %{_mandir}/man5/ra*
 
 %changelog
+* Fri Apr 21 2006 Gabriel Somlo <somlo at cmu.edu> 2.0.6.fixes.1-10
+- bumped release to workaround botched CVS tag attempt
+
 * Fri Apr 21 2006 Gabriel Somlo <somlo at cmu.edu> 2.0.6.fixes.1-9
 - daemon patches now eliminate unused common files: argus_parse.c, argus_util.c, and argus_auth.c
 



From fedora-extras-commits at redhat.com  Fri Apr 21 20:16:46 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 13:16:46 -0700
Subject: rpms/perl-Locale-Maketext-Simple/devel .cvsignore, 1.2,
	1.3 perl-Locale-Maketext-Simple.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200604212016.k3LKGmG6011586@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Locale-Maketext-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11565

Modified Files:
	.cvsignore perl-Locale-Maketext-Simple.spec sources 
Log Message:
Update to 0.13.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Apr 2006 20:08:31 -0000	1.2
+++ .cvsignore	21 Apr 2006 20:16:46 -0000	1.3
@@ -1 +1 @@
-Locale-Maketext-Simple-0.12.tar.gz
+Locale-Maketext-Simple-0.13.tar.gz


Index: perl-Locale-Maketext-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/devel/perl-Locale-Maketext-Simple.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Locale-Maketext-Simple.spec	12 Apr 2006 20:08:31 -0000	1.1
+++ perl-Locale-Maketext-Simple.spec	21 Apr 2006 20:16:46 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Locale-Maketext-Simple
-Version:        0.12
-Release:        2%{?dist}
+Version:        0.13
+Release:        1%{?dist}
 Summary:        Simple interface to Locale::Maketext::Lexicon
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Apr 21 2006 Steven Pritchard <steve at kspei.com> 0.13-1
+- Update to 0.13.
+
 * Mon Apr 10 2006 Steven Pritchard <steve at kspei.com> 0.12-2
 - Explicitly require perl(Locale::Maketext::Lexicon).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Apr 2006 20:08:31 -0000	1.2
+++ sources	21 Apr 2006 20:16:46 -0000	1.3
@@ -1 +1 @@
-9a65312da2ae8d59f898151f9c044383  Locale-Maketext-Simple-0.12.tar.gz
+bedbbbd4ca43a1c053f11abfc1e6b2e1  Locale-Maketext-Simple-0.13.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 20:18:13 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 13:18:13 -0700
Subject: rpms/perl-Locale-Maketext-Simple/FC-5 .cvsignore, 1.2,
	1.3 perl-Locale-Maketext-Simple.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200604212018.k3LKIFfw011691@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Locale-Maketext-Simple/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11670

Modified Files:
	.cvsignore perl-Locale-Maketext-Simple.spec sources 
Log Message:
Update to 0.13.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Apr 2006 20:08:31 -0000	1.2
+++ .cvsignore	21 Apr 2006 20:18:13 -0000	1.3
@@ -1 +1 @@
-Locale-Maketext-Simple-0.12.tar.gz
+Locale-Maketext-Simple-0.13.tar.gz


Index: perl-Locale-Maketext-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/FC-5/perl-Locale-Maketext-Simple.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Locale-Maketext-Simple.spec	12 Apr 2006 20:08:31 -0000	1.1
+++ perl-Locale-Maketext-Simple.spec	21 Apr 2006 20:18:13 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Locale-Maketext-Simple
-Version:        0.12
-Release:        2%{?dist}
+Version:        0.13
+Release:        1%{?dist}
 Summary:        Simple interface to Locale::Maketext::Lexicon
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Apr 21 2006 Steven Pritchard <steve at kspei.com> 0.13-1
+- Update to 0.13.
+
 * Mon Apr 10 2006 Steven Pritchard <steve at kspei.com> 0.12-2
 - Explicitly require perl(Locale::Maketext::Lexicon).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Apr 2006 20:08:31 -0000	1.2
+++ sources	21 Apr 2006 20:18:13 -0000	1.3
@@ -1 +1 @@
-9a65312da2ae8d59f898151f9c044383  Locale-Maketext-Simple-0.12.tar.gz
+bedbbbd4ca43a1c053f11abfc1e6b2e1  Locale-Maketext-Simple-0.13.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 20:18:44 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 13:18:44 -0700
Subject: rpms/perl-Locale-Maketext-Simple/FC-4 .cvsignore, 1.2,
	1.3 perl-Locale-Maketext-Simple.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200604212018.k3LKIkEr011773@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Locale-Maketext-Simple/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11752

Modified Files:
	.cvsignore perl-Locale-Maketext-Simple.spec sources 
Log Message:
Update to 0.13.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Apr 2006 20:08:31 -0000	1.2
+++ .cvsignore	21 Apr 2006 20:18:44 -0000	1.3
@@ -1 +1 @@
-Locale-Maketext-Simple-0.12.tar.gz
+Locale-Maketext-Simple-0.13.tar.gz


Index: perl-Locale-Maketext-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/FC-4/perl-Locale-Maketext-Simple.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Locale-Maketext-Simple.spec	12 Apr 2006 20:08:31 -0000	1.1
+++ perl-Locale-Maketext-Simple.spec	21 Apr 2006 20:18:44 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Locale-Maketext-Simple
-Version:        0.12
-Release:        2%{?dist}
+Version:        0.13
+Release:        1%{?dist}
 Summary:        Simple interface to Locale::Maketext::Lexicon
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Apr 21 2006 Steven Pritchard <steve at kspei.com> 0.13-1
+- Update to 0.13.
+
 * Mon Apr 10 2006 Steven Pritchard <steve at kspei.com> 0.12-2
 - Explicitly require perl(Locale::Maketext::Lexicon).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Apr 2006 20:08:31 -0000	1.2
+++ sources	21 Apr 2006 20:18:44 -0000	1.3
@@ -1 +1 @@
-9a65312da2ae8d59f898151f9c044383  Locale-Maketext-Simple-0.12.tar.gz
+bedbbbd4ca43a1c053f11abfc1e6b2e1  Locale-Maketext-Simple-0.13.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 20:24:34 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 13:24:34 -0700
Subject: rpms/perl-Test-Deep/devel .cvsignore, 1.2, 1.3 perl-Test-Deep.spec, 
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200604212024.k3LKOagZ011889@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-Deep/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11868

Modified Files:
	.cvsignore perl-Test-Deep.spec sources 
Log Message:
Update to 0.095.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Deep/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Apr 2006 18:23:07 -0000	1.2
+++ .cvsignore	21 Apr 2006 20:24:34 -0000	1.3
@@ -1 +1 @@
-Test-Deep-0.093.tar.gz
+Test-Deep-0.095.tar.gz


Index: perl-Test-Deep.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Deep/devel/perl-Test-Deep.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Test-Deep.spec	10 Apr 2006 18:23:07 -0000	1.1
+++ perl-Test-Deep.spec	21 Apr 2006 20:24:34 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           perl-Test-Deep
-Version:        0.093
+Version:        0.095
 Release:        1%{?dist}
 Summary:        Extremely flexible deep comparison
 License:        GPL or Artistic
@@ -50,6 +50,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Apr 21 2006 Steven Pritchard <steve at kspei.com> 0.095-1
+- Update to 0.095.
+
 * Sat Apr 08 2006 Steven Pritchard <steve at kspei.com> 0.093-1
 - Specfile autogenerated by cpanspec 1.64.
 - Improve description.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Deep/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Apr 2006 18:23:07 -0000	1.2
+++ sources	21 Apr 2006 20:24:34 -0000	1.3
@@ -1 +1 @@
-b47659e09457a72157d3db5b5be62f75  Test-Deep-0.093.tar.gz
+fb6fe44d0f6e58a0dd552f9ee958cc24  Test-Deep-0.095.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 20:36:26 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 21 Apr 2006 13:36:26 -0700
Subject: rpms/grads/FC-4 grads.spec,1.9,1.10
Message-ID: <200604212036.k3LKaStV012106@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12087

Modified Files:
	grads.spec 
Log Message:
sync with devel


Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/FC-4/grads.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- grads.spec	20 Feb 2006 23:13:02 -0000	1.9
+++ grads.spec	21 Apr 2006 20:36:26 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -104,6 +104,9 @@
 %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
+* Sat Mar 11 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-9
+- rebuild for newer libdap
+
 * Fri Feb 17 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-8
 - enable hdf for ppc, now that it is there
 - use a wrapper include file to prepend sd_ to netcdf symbols for



From fedora-extras-commits at redhat.com  Fri Apr 21 20:40:05 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 21 Apr 2006 13:40:05 -0700
Subject: rpms/grads/FC-3 gawrapsd.h, NONE, 1.1 grads-build_fixes.diff, 1.1, 
	1.2 grads.spec, 1.8, 1.9
Message-ID: <200604212040.k3LKe7CE012190@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12167

Modified Files:
	grads-build_fixes.diff grads.spec 
Added Files:
	gawrapsd.h 
Log Message:
Sync with devel (enable hdf, rebuild for newer libdap)



--- NEW FILE gawrapsd.h ---
#if USEHDF == 1
#define ncopen sd_ncopen
#define ncvarinq sd_ncvarinq
#define ncopts sd_ncopts
#define ncvarid sd_ncvarid
#define ncattinq sd_ncattinq
#define ncvarget sd_ncvarget
#define ncattget sd_ncattget
#define ncclose sd_ncclose
#define ncinquire sd_ncinquire
#define ncattname sd_ncattname
#define nctypelen sd_nctypelen
#define ncdiminq sd_ncdiminq
#endif

grads-build_fixes.diff:

Index: grads-build_fixes.diff
===================================================================
RCS file: /cvs/extras/rpms/grads/FC-3/grads-build_fixes.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grads-build_fixes.diff	20 Dec 2005 12:16:26 -0000	1.1
+++ grads-build_fixes.diff	21 Apr 2006 20:40:05 -0000	1.2
@@ -1,6 +1,6 @@
-diff -u --recursive --exclude aclocal.m4 --exclude configure --exclude Makefile.in --exclude bootstrap grads-1.9b4-orig/acinclude.m4 grads-1.9b4/acinclude.m4
+diff -u --recursive grads-1.9b4-orig/acinclude.m4 grads-1.9b4-rpm/acinclude.m4
 --- grads-1.9b4-orig/acinclude.m4	2003-10-02 16:01:15.000000000 +0200
-+++ grads-1.9b4/acinclude.m4	2005-08-16 12:08:41.000000000 +0200
++++ grads-1.9b4-rpm/acinclude.m4	2006-02-17 15:19:32.000000000 +0100
 @@ -165,10 +165,10 @@
  dnl 		   enabled, just calls AC_CHECK_LIB. If not, checks for the presence
  dnl		   of a file "libname.a" in the supplibs directory. 
@@ -81,14 +81,9 @@
  
    ga_check_dods="no"
    AC_CHECK_HEADER(udunits.h,
-Seulement dans grads-1.9b4: autom4te.cache
-Seulement dans grads-1.9b4: autoscan.log
-Seulement dans grads-1.9b4: config.h.in
-Seulement dans grads-1.9b4: config.log
-Seulement dans grads-1.9b4: config.status
-diff -u --recursive --exclude aclocal.m4 --exclude configure --exclude Makefile.in --exclude bootstrap grads-1.9b4-orig/configure.in grads-1.9b4/configure.in
+diff -u --recursive grads-1.9b4-orig/configure.in grads-1.9b4-rpm/configure.in
 --- grads-1.9b4-orig/configure.in	2005-05-23 17:04:40.000000000 +0200
-+++ grads-1.9b4/configure.in	2005-08-16 12:05:01.000000000 +0200
++++ grads-1.9b4-rpm/configure.in	2006-02-17 15:56:16.000000000 +0100
 @@ -274,14 +274,24 @@
  
  
@@ -115,7 +110,33 @@
    gui_libs="$gui_libs -lXaw -lXmu -lXt $guilibadd"
    AC_SUBST(gui_libs)
  else
-@@ -383,15 +393,25 @@
+@@ -366,6 +376,11 @@
+ fi
+ echo
+ 
++AH_BOTTOM([
++#ifdef HDF_SD_NETCDF
++#include "gawrapsd.h"
++#endif
++])
+ 
+ use_hdf=no
+ if test "$with_hdf" != "no" ; then
+@@ -373,6 +388,13 @@
+ fi
+ if test $use_hdf = "yes" ; then
+     GA_SET_LIB_VAR(hdf_libs, [mfhdf df jpeg udunits z])
++    if test "${ga_dyn_supplibs}" = "yes"; then
++      ac_save_LIBS="$LIBS"
++      LIBS="$LIBS $hdf_libs"
++      AC_CHECK_FUNC([sd_ncopen],
++        [AC_DEFINE([HDF_SD_NETCDF],[],[prepend sd_ to netcdf symbols])])
++      LIBS="$ac_save_LIBS"
++    fi
+     AC_SUBST(hdf_libs)
+     extra_bins="$extra_bins gradshdf"
+     echo "+ gradshdf (HDF-SDS/netCDF) build enabled"
+@@ -383,15 +405,25 @@
  
  
  use_dods=no
@@ -143,7 +164,7 @@
  
      GA_CHECK_LIB(gadods, main, [use_gadods=yes], [use_gadods=no])
      if test $use_gadods = "yes" ; then	
-@@ -404,7 +424,11 @@
+@@ -404,7 +436,11 @@
         echo "+ gradsdods (OPeNDAP/netCDF) build enabled - gridded interface only"
      fi
  
@@ -156,20 +177,10 @@
      AC_SUBST(dods_libs)
      AC_SUBST(gadods_def)
  else
-Seulement dans grads-1.9b4: configure.scan
-Seulement dans grads-1.9b4: grads-1.9b4.tar.gz
-Seulement dans grads-1.9b4: grads.spec
-Seulement dans grads-1.9b4: libdap.m4
-Seulement dans grads-1.9b4: libnc-dap.m4
-Seulement dans grads-1.9b4: Makefile
-Seulement dans grads-1.9b4/src: bufrscan
-Seulement dans grads-1.9b4/src: bufrscan.o
-Seulement dans grads-1.9b4/src: bufrstn.o
-Seulement dans grads-1.9b4/src: buildinfo.h
-Seulement dans grads-1.9b4/src: config.h
-diff -u --recursive --exclude aclocal.m4 --exclude configure --exclude Makefile.in --exclude bootstrap grads-1.9b4-orig/src/config.h.in grads-1.9b4/src/config.h.in
+Seulement dans grads-1.9b4-rpm/: .configure.in.swp
+diff -u --recursive grads-1.9b4-orig/src/config.h.in grads-1.9b4-rpm/src/config.h.in
 --- grads-1.9b4-orig/src/config.h.in	2004-12-15 22:00:03.000000000 +0100
-+++ grads-1.9b4/src/config.h.in	2005-08-16 12:05:39.000000000 +0200
++++ grads-1.9b4-rpm/src/config.h.in	2006-02-17 15:19:32.000000000 +0100
 @@ -88,6 +88,9 @@
  /* Define to 1 if you have the ANSI C header files. */
  #undef STDC_HEADERS
@@ -180,37 +191,9 @@
  /* Enable GUI widgets */
  #undef USEGUI
  
-Seulement dans grads-1.9b4/src: config.h.in~
-Seulement dans grads-1.9b4/src: fgbds.o
-Seulement dans grads-1.9b4/src: fgutil.o
-Seulement dans grads-1.9b4/src: gabufr.o
-Seulement dans grads-1.9b4/src: gabufrtbl.o
-Seulement dans grads-1.9b4/src: gacfg-c.o
-Seulement dans grads-1.9b4/src: gacfg-dods.o
-Seulement dans grads-1.9b4/src: gacfg-hdf.o
-Seulement dans grads-1.9b4/src: gacfg-nc.o
-Seulement dans grads-1.9b4/src: gaddes-c.o
-Seulement dans grads-1.9b4/src: gaddes-dods.o
-Seulement dans grads-1.9b4/src: gaddes-hdf.o
-Seulement dans grads-1.9b4/src: gaddes-nc.o
-Seulement dans grads-1.9b4/src: gaddes.sa.o
-Seulement dans grads-1.9b4/src: gaexpr.o
-Seulement dans grads-1.9b4/src: gafunc.o
-Seulement dans grads-1.9b4/src: gagmap.o
-Seulement dans grads-1.9b4/src: gagui.o
-Seulement dans grads-1.9b4/src: gagx.o
-Seulement dans grads-1.9b4/src: gaio-c.o
-Seulement dans grads-1.9b4/src: gaio-dods.o
-Seulement dans grads-1.9b4/src: gaio-hdf.o
-Seulement dans grads-1.9b4/src: gaio-nc.o
-Seulement dans grads-1.9b4/src: galats.o
-Seulement dans grads-1.9b4/src: gamach.o
-Seulement dans grads-1.9b4/src: gasdf-dods.o
-Seulement dans grads-1.9b4/src: gasdf-hdf.o
-Seulement dans grads-1.9b4/src: gasdf-nc.o
-diff -u --recursive --exclude aclocal.m4 --exclude configure --exclude Makefile.in --exclude bootstrap grads-1.9b4-orig/src/gauser.c grads-1.9b4/src/gauser.c
+diff -u --recursive grads-1.9b4-orig/src/gauser.c grads-1.9b4-rpm/src/gauser.c
 --- grads-1.9b4-orig/src/gauser.c	2005-05-18 20:51:01.000000000 +0200
-+++ grads-1.9b4/src/gauser.c	2005-08-16 11:33:49.000000000 +0200
++++ grads-1.9b4-rpm/src/gauser.c	2006-02-17 15:19:32.000000000 +0100
 @@ -42,6 +42,7 @@
  #endif
  
@@ -219,29 +202,9 @@
  
  /*mf 971022 --- expose Mike Fiorino's global struct to these routines for warning level setting mf*/
  extern struct gamfcmn mfcmn;
-Seulement dans grads-1.9b4/src: gauser-c.o
-Seulement dans grads-1.9b4/src: gauser-dods.o
-Seulement dans grads-1.9b4/src: gauser-hdf.o
-Seulement dans grads-1.9b4/src: gauser-nc.o
-Seulement dans grads-1.9b4/src: gautil.o
-Seulement dans grads-1.9b4/src: gautil.sa.o
-Seulement dans grads-1.9b4/src: gd13gif.o
-Seulement dans grads-1.9b4/src: gradsc
-Seulement dans grads-1.9b4/src: gradsdods
-Seulement dans grads-1.9b4/src: gradshdf
-Seulement dans grads-1.9b4/src: gradsnc
-Seulement dans grads-1.9b4/src: grads.o
-Seulement dans grads-1.9b4/src: gribmap
-Seulement dans grads-1.9b4/src: gribmap.o
-Seulement dans grads-1.9b4/src: gribscan
-Seulement dans grads-1.9b4/src: gribscan.o
-Seulement dans grads-1.9b4/src: gscrpt.o
-Seulement dans grads-1.9b4/src: gsgui.o
-Seulement dans grads-1.9b4/src: gxchpl.o
-Seulement dans grads-1.9b4/src: gxcntr.o
-diff -u --recursive --exclude aclocal.m4 --exclude configure --exclude Makefile.in --exclude bootstrap grads-1.9b4-orig/src/gxdxwd.c grads-1.9b4/src/gxdxwd.c
+diff -u --recursive grads-1.9b4-orig/src/gxdxwd.c grads-1.9b4-rpm/src/gxdxwd.c
 --- grads-1.9b4-orig/src/gxdxwd.c	2002-10-28 20:08:33.000000000 +0100
-+++ grads-1.9b4/src/gxdxwd.c	2005-08-16 11:33:49.000000000 +0200
++++ grads-1.9b4-rpm/src/gxdxwd.c	2006-02-17 15:19:32.000000000 +0100
 @@ -6,6 +6,7 @@
  #include <config.h>
  #endif
@@ -259,12 +222,9 @@
  
  #include "X11/XWDFile.h"
  
-Seulement dans grads-1.9b4/src: gxdxwd.o
-Seulement dans grads-1.9b4/src: gxeps
-Seulement dans grads-1.9b4/src: gxeps.o
-diff -u --recursive --exclude aclocal.m4 --exclude configure --exclude Makefile.in --exclude bootstrap grads-1.9b4-orig/src/gxhpng.c grads-1.9b4/src/gxhpng.c
+diff -u --recursive grads-1.9b4-orig/src/gxhpng.c grads-1.9b4-rpm/src/gxhpng.c
 --- grads-1.9b4-orig/src/gxhpng.c	2004-03-12 17:14:04.000000000 +0100
-+++ grads-1.9b4/src/gxhpng.c	2005-08-16 11:33:49.000000000 +0200
++++ grads-1.9b4-rpm/src/gxhpng.c	2006-02-17 15:19:32.000000000 +0100
 @@ -379,6 +379,11 @@
  	
  int gdCompareInt(const void *a, const void *b);
@@ -277,29 +237,3 @@
  /* Version of gdImageFilledPolygon to invoke my local 
     version of gdImageLne.  Nothing else changed... B.Doty 5/31/01 */
  
-Seulement dans grads-1.9b4/src: gxmeta.o
-Seulement dans grads-1.9b4/src: gxmeta.sa.o
-Seulement dans grads-1.9b4/src: gxps
-Seulement dans grads-1.9b4/src: gxps.o
-Seulement dans grads-1.9b4/src: gxshad.o
-Seulement dans grads-1.9b4/src: gxstrm.o
-Seulement dans grads-1.9b4/src: gxsubs.o
-Seulement dans grads-1.9b4/src: gxtran
-Seulement dans grads-1.9b4/src: gxtran.o
-Seulement dans grads-1.9b4/src: gxwmap.o
-Seulement dans grads-1.9b4/src: gxX.o
-Seulement dans grads-1.9b4/src: latsgribmap.o
-Seulement dans grads-1.9b4/src: latsgrib.o
-Seulement dans grads-1.9b4/src: latsint.o
-Seulement dans grads-1.9b4/src: latsnc-nc.o
-Seulement dans grads-1.9b4/src: latsnc.o
-Seulement dans grads-1.9b4/src: lats.o
-Seulement dans grads-1.9b4/src: latsstat.o
-Seulement dans grads-1.9b4/src: latstime.o
-Seulement dans grads-1.9b4/src: Makefile
-Seulement dans grads-1.9b4/src: stamp-h
-Seulement dans grads-1.9b4/src: stamp-h1
-Seulement dans grads-1.9b4/src: stnmap
-Seulement dans grads-1.9b4/src: stnmap.o
-Seulement dans grads-1.9b4/src: wgrib
-Seulement dans grads-1.9b4/src: wgrib.o


Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/FC-3/grads.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- grads.spec	28 Jan 2006 15:17:40 -0000	1.8
+++ grads.spec	21 Apr 2006 20:40:05 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        6%{?dist}.1
+Release:        9%{?dist}
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -16,6 +16,8 @@
 Source6:        grads-copyright_summary
 # README telling to turn BackingStore true
 Source5:        grads-README.xorg
+# include file that changes netcdf names to netcdf hdf names
+Source7:        gawrapsd.h
 # Use these files to remove files with GPL incompatible licences. In the
 # SOURCES directory with grads tarball and grads-removed-files-list, do
 # sh grads-remove-files
@@ -26,10 +28,8 @@
 Patch1:         grads_dap-no_lats.patch
 Patch2:         grads-conditionnal_lats.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# configure fails on x86_64
-ExcludeArch:    x86_64
 
-# no hdf on FC-3
+BuildRequires:  hdf-devel 
 BuildRequires:  udunits-devel netcdf-devel 
 BuildRequires:  readline-devel
 BuildRequires:  libdap-devel libnc-dap-devel
@@ -53,6 +53,8 @@
 # copy grib notice
 cp %{SOURCE2} .
 cp %{SOURCE6} .
+# copy hdf include wrapper file
+cp %{SOURCE7} src
 # concatenate autoconf m4 files
 cat %{SOURCE3} %{SOURCE4} acinclude.m4 > acinclude.m4.new
 cp acinclude.m4.new acinclude.m4
@@ -67,7 +69,6 @@
 
 %build
 ./bootstrap
-# pass the -L and -I flags for hdf on ppc even though there is no hdf
 %configure --without-gui --without-lats LDFLAGS="-L%{_libdir}/netcdf-3/ -L/usr/X11R6/lib/ -lXaw -L%{_libdir}/hdf/" CPPFLAGS="-I%{_includedir}/netcdf-3/ -I%{_includedir}/hdf/" --enable-dyn-supplibs
 
 make %{?_smp_mflags}
@@ -89,6 +90,7 @@
 %{_bindir}/bufrscan
 %{_bindir}/gradsc
 %{_bindir}/gradsdods
+%{_bindir}/gradshdf
 %{_bindir}/gradsnc
 %{_bindir}/gribmap
 %{_bindir}/gribscan
@@ -102,7 +104,15 @@
 %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
-* Thu Jan 19 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-6.1
+* Sat Mar 11 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-9
+- rebuild for newer libdap
+
+* Fri Feb 17 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-8
+- enable hdf for ppc, now that it is there
+- use a wrapper include file to prepend sd_ to netcdf symbols for
+  hdf if it is required
+
+* Thu Jan 19 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-6
 - add BR on readline-devel close #178285
 
 * Wed Dec 21 2005 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-5



From fedora-extras-commits at redhat.com  Fri Apr 21 21:00:42 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 21 Apr 2006 14:00:42 -0700
Subject: rpms/grads/FC-5 grads.spec,1.8,1.9
Message-ID: <200604212100.k3LL0iT4012361@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12344

Modified Files:
	grads.spec 
Log Message:
* Fri Apr 21 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-10
- remove unneeded X related BR and configure flags since the gui isn't built



Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/FC-5/grads.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- grads.spec	11 Mar 2006 15:06:20 -0000	1.8
+++ grads.spec	21 Apr 2006 21:00:42 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -33,7 +33,7 @@
 BuildRequires:  udunits-devel netcdf-devel 
 BuildRequires:  readline-devel
 BuildRequires:  libdap-devel libnc-dap-devel
-BuildRequires:  libsx-devel Xaw3d-devel zlib-devel libjpeg-devel gd-devel
+BuildRequires:  zlib-devel libjpeg-devel gd-devel
 BuildRequires:  ncurses-devel libpng-devel
 
 %description
@@ -69,7 +69,7 @@
 
 %build
 ./bootstrap
-%configure --without-gui --without-lats LDFLAGS="-L%{_libdir}/netcdf-3/ -L/usr/X11R6/lib/ -lXaw -L%{_libdir}/hdf/" CPPFLAGS="-I%{_includedir}/netcdf-3/ -I%{_includedir}/hdf/" --enable-dyn-supplibs
+%configure --without-gui --without-lats LDFLAGS="-L%{_libdir}/netcdf-3/ -L%{_libdir}/hdf/" CPPFLAGS="-I%{_includedir}/netcdf-3/ -I%{_includedir}/hdf/" --enable-dyn-supplibs
 
 make %{?_smp_mflags}
 cp -r doc html
@@ -104,6 +104,9 @@
 %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
+* Fri Apr 21 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-10
+- remove unneeded X related BR and configure flags since the gui isn't built
+
 * Sat Mar 11 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-9
 - rebuild for newer libdap
 



From fedora-extras-commits at redhat.com  Fri Apr 21 21:17:50 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 14:17:50 -0700
Subject: rpms/perl-Test-Deep/FC-5 .cvsignore, 1.2, 1.3 perl-Test-Deep.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200604212117.k3LLHqbG014592@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-Deep/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14571

Modified Files:
	.cvsignore perl-Test-Deep.spec sources 
Log Message:
Update to 0.095.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Deep/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Apr 2006 18:23:07 -0000	1.2
+++ .cvsignore	21 Apr 2006 21:17:50 -0000	1.3
@@ -1 +1 @@
-Test-Deep-0.093.tar.gz
+Test-Deep-0.095.tar.gz


Index: perl-Test-Deep.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Deep/FC-5/perl-Test-Deep.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Test-Deep.spec	10 Apr 2006 18:23:07 -0000	1.1
+++ perl-Test-Deep.spec	21 Apr 2006 21:17:50 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           perl-Test-Deep
-Version:        0.093
+Version:        0.095
 Release:        1%{?dist}
 Summary:        Extremely flexible deep comparison
 License:        GPL or Artistic
@@ -50,6 +50,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Apr 21 2006 Steven Pritchard <steve at kspei.com> 0.095-1
+- Update to 0.095.
+
 * Sat Apr 08 2006 Steven Pritchard <steve at kspei.com> 0.093-1
 - Specfile autogenerated by cpanspec 1.64.
 - Improve description.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Deep/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Apr 2006 18:23:07 -0000	1.2
+++ sources	21 Apr 2006 21:17:50 -0000	1.3
@@ -1 +1 @@
-b47659e09457a72157d3db5b5be62f75  Test-Deep-0.093.tar.gz
+fb6fe44d0f6e58a0dd552f9ee958cc24  Test-Deep-0.095.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 21:18:52 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 14:18:52 -0700
Subject: rpms/perl-Test-Deep/FC-4 .cvsignore, 1.2, 1.3 perl-Test-Deep.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200604212118.k3LLIsEF014666@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-Deep/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14643

Modified Files:
	.cvsignore perl-Test-Deep.spec sources 
Log Message:
Update to 0.095.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Deep/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Apr 2006 18:23:07 -0000	1.2
+++ .cvsignore	21 Apr 2006 21:18:52 -0000	1.3
@@ -1 +1 @@
-Test-Deep-0.093.tar.gz
+Test-Deep-0.095.tar.gz


Index: perl-Test-Deep.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Deep/FC-4/perl-Test-Deep.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Test-Deep.spec	10 Apr 2006 18:23:07 -0000	1.1
+++ perl-Test-Deep.spec	21 Apr 2006 21:18:52 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           perl-Test-Deep
-Version:        0.093
+Version:        0.095
 Release:        1%{?dist}
 Summary:        Extremely flexible deep comparison
 License:        GPL or Artistic
@@ -50,6 +50,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Apr 21 2006 Steven Pritchard <steve at kspei.com> 0.095-1
+- Update to 0.095.
+
 * Sat Apr 08 2006 Steven Pritchard <steve at kspei.com> 0.093-1
 - Specfile autogenerated by cpanspec 1.64.
 - Improve description.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Deep/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Apr 2006 18:23:07 -0000	1.2
+++ sources	21 Apr 2006 21:18:52 -0000	1.3
@@ -1 +1 @@
-b47659e09457a72157d3db5b5be62f75  Test-Deep-0.093.tar.gz
+fb6fe44d0f6e58a0dd552f9ee958cc24  Test-Deep-0.095.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 21:31:05 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 21 Apr 2006 14:31:05 -0700
Subject: rpms/grads/FC-5 grads.spec,1.9,1.10
Message-ID: <200604212131.k3LLV7kt015211@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15193

Modified Files:
	grads.spec 
Log Message:
* Fri Apr 21 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-11
- Add needed X related BR



Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/FC-5/grads.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- grads.spec	21 Apr 2006 21:00:42 -0000	1.9
+++ grads.spec	21 Apr 2006 21:31:05 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -35,6 +35,7 @@
 BuildRequires:  libdap-devel libnc-dap-devel
 BuildRequires:  zlib-devel libjpeg-devel gd-devel
 BuildRequires:  ncurses-devel libpng-devel
+BuildRequires:  libXmu-devel libX11-devel
 
 %description
 The Grid Analysis and Display System (GrADS) is an interactive desktop tool
@@ -104,6 +105,9 @@
 %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
+* Fri Apr 21 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-11
+- Add needed X related BR
+
 * Fri Apr 21 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-10
 - remove unneeded X related BR and configure flags since the gui isn't built
 



From fedora-extras-commits at redhat.com  Fri Apr 21 21:37:55 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Fri, 21 Apr 2006 14:37:55 -0700
Subject: rpms/prboom/devel prboom-2.4.1-gamedir.patch, NONE, 1.1 .cvsignore, 
	1.2, 1.3 prboom.spec, 1.3, 1.4 sources, 1.2,
	1.3 prboom-2.3.1-64bit.patch, 1.1,
	NONE prboom-2.3.1-config.patch, 1.1,
	NONE prboom-2.3.1-fixpsnprintf.patch, 1.1,
	NONE prboom-2.3.1-gamedir.patch, 1.2,
	NONE prboom-2.3.1-gcc4.patch, 1.2, NONE
Message-ID: <200604212137.k3LLbvHA015558@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/prboom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15508

Modified Files:
	.cvsignore prboom.spec sources 
Added Files:
	prboom-2.4.1-gamedir.patch 
Removed Files:
	prboom-2.3.1-64bit.patch prboom-2.3.1-config.patch 
	prboom-2.3.1-fixpsnprintf.patch prboom-2.3.1-gamedir.patch 
	prboom-2.3.1-gcc4.patch 
Log Message:
Update to 2.4.1



prboom-2.4.1-gamedir.patch:

--- NEW FILE prboom-2.4.1-gamedir.patch ---
diff -Naur --exclude '*.swp' prboom-2.4.1/configure prboom-2.4.1.new/configure
--- prboom-2.4.1/configure	2006-04-06 07:00:39.000000000 -0700
+++ prboom-2.4.1.new/configure	2006-04-18 19:02:51.000000000 -0700
@@ -1871,9 +1871,9 @@
 
 
 if test "x$prefix" != xNONE; then
-  DOOMWADDIR="$prefix/share/games/doom"
+  DOOMWADDIR="$prefix/share/doom"
 else
-  DOOMWADDIR="$ac_default_prefix/share/games/doom"
+  DOOMWADDIR="$ac_default_prefix/share/doom"
 fi
 cat >>confdefs.h <<_ACEOF
 #define DOOMWADDIR "$DOOMWADDIR"
diff -Naur --exclude '*.swp' prboom-2.4.1/src/d_main.c prboom-2.4.1.new/src/d_main.c
--- prboom-2.4.1/src/d_main.c	2006-04-02 09:20:33.000000000 -0700
+++ prboom-2.4.1.new/src/d_main.c	2006-04-18 19:02:06.000000000 -0700
@@ -138,6 +138,7 @@
   "doom.wad",
   "doom1.wad",
   "doomu.wad", /* CPhipps - alow doomu.wad */
+  "freedoom.wad", /* wart at kobold.org:  added freedoom for Fedora Extras */
 };
 static const int nstandard_iwads = sizeof standard_iwads/sizeof*standard_iwads;
 
diff -Naur --exclude '*.swp' prboom-2.4.1/src/s_sound.c prboom-2.4.1.new/src/s_sound.c
--- prboom-2.4.1/src/s_sound.c	2006-04-01 06:32:50.000000000 -0800
+++ prboom-2.4.1.new/src/s_sound.c	2006-04-20 15:16:09.000000000 -0700
@@ -505,6 +505,7 @@
 
       // load & register it
       music->data = W_CacheLumpNum(music->lumpnum);
+      fprintf(stderr, "Loading music lump #%d\n", music->lumpnum);
       music->handle = I_RegisterSong(music->data, W_LumpLength(music->lumpnum));
     }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/prboom/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Mar 2006 19:30:09 -0000	1.2
+++ .cvsignore	21 Apr 2006 21:37:55 -0000	1.3
@@ -1 +1 @@
-prboom-2.3.1.tar.gz
+prboom-2.4.1.tar.gz


Index: prboom.spec
===================================================================
RCS file: /cvs/extras/rpms/prboom/devel/prboom.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- prboom.spec	19 Mar 2006 06:56:29 -0000	1.3
+++ prboom.spec	21 Apr 2006 21:37:55 -0000	1.4
@@ -1,22 +1,19 @@
 %define waddir  %{_datadir}/doom
 
 Name:           prboom
-Version:        2.3.1
-Release:        5%{?dist}
+Version:        2.4.1
+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.3.1.tar.gz
-Patch0:         prboom-2.3.1-gcc4.patch
-Patch1:         prboom-2.3.1-gamedir.patch
-Patch2:         prboom-2.3.1-config.patch
-Patch3:         prboom-2.3.1-64bit.patch
-Patch4:         prboom-2.3.1-fixpsnprintf.patch
+Source0:        http://dl.sourceforge.net/prboom/prboom-2.4.1.tar.gz
+Patch0:         prboom-2.4.1-gamedir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL_mixer-devel SDL_net-devel
+BuildRequires:  libGLU-devel
 Requires:       freedoom
 
 %description
@@ -30,13 +27,9 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
-%configure --disable-cpu-opt --program-prefix=''
+%configure --enable-gl --disable-cpu-opt --program-prefix=''
 make %{?_smp_mflags}
 
 %install
@@ -69,6 +62,12 @@
 %doc doc/README.compat doc/README.demos doc/MBF.txt doc/MBFFAQ.txt doc/boom.txt
 
 %changelog
+* Tue Apr 18 2006 Wart <wart at kobold.org> 2.4.1-1
+- Update to 2.4.1
+
+* Sun Mar 19 2006 Wart <wart at kobold.org> 2.3.1-6
+- Updated -gamedir patch to add freedoom to the in-game wad menu.
+
 * Sat Mar 18 2006 Wart <wart at kobold.org> 2.3.1-5
 - Updated patches to fix segfault on i386 (BZ #185741)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/prboom/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Mar 2006 19:30:09 -0000	1.2
+++ sources	21 Apr 2006 21:37:55 -0000	1.3
@@ -1 +1 @@
-c53231604fe6cf7352e73911ad44c90d  prboom-2.3.1.tar.gz
+5cfd46fe7e3aaccfb1840b249bf34b97  prboom-2.4.1.tar.gz


--- prboom-2.3.1-64bit.patch DELETED ---


--- prboom-2.3.1-config.patch DELETED ---


--- prboom-2.3.1-fixpsnprintf.patch DELETED ---


--- prboom-2.3.1-gamedir.patch DELETED ---


--- prboom-2.3.1-gcc4.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Apr 21 21:38:00 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 14:38:00 -0700
Subject: rpms/perl-Object-Accessor/devel - New directory
Message-ID: <200604212138.k3LLc37q015591@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-serv15562/perl-Object-Accessor/devel

Log Message:
Directory /cvs/extras/rpms/perl-Object-Accessor/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 21:38:00 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 14:38:00 -0700
Subject: rpms/perl-Object-Accessor - New directory
Message-ID: <200604212138.k3LLc24S015588@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Object-Accessor
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15562/perl-Object-Accessor

Log Message:
Directory /cvs/extras/rpms/perl-Object-Accessor added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 21:38:26 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 14:38:26 -0700
Subject: rpms/perl-Object-Accessor/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604212138.k3LLcSsl015643@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-serv15607/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Object-Accessor


--- 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 Apr 21 21:38:25 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 14:38:25 -0700
Subject: rpms/perl-Object-Accessor Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604212138.k3LLcR8L015640@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Object-Accessor
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15607

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Object-Accessor


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Object-Accessor
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 21 21:39:09 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 14:39:09 -0700
Subject: rpms/perl-Object-Accessor import.log,1.1,1.2
Message-ID: <200604212139.k3LLdfn8015715@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Object-Accessor
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15671

Modified Files:
	import.log 
Log Message:
auto-import perl-Object-Accessor-0.12-2 on branch devel from perl-Object-Accessor-0.12-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Object-Accessor/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Apr 2006 21:38:25 -0000	1.1
+++ import.log	21 Apr 2006 21:39:09 -0000	1.2
@@ -0,0 +1 @@
+perl-Object-Accessor-0_12-2:HEAD:perl-Object-Accessor-0.12-2.src.rpm:1145655535



From fedora-extras-commits at redhat.com  Fri Apr 21 21:39:10 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 14:39:10 -0700
Subject: rpms/perl-Object-Accessor/devel perl-Object-Accessor.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604212139.k3LLdgXh015719@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-serv15671/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Object-Accessor.spec 
Log Message:
auto-import perl-Object-Accessor-0.12-2 on branch devel from perl-Object-Accessor-0.12-2.src.rpm


--- NEW FILE perl-Object-Accessor.spec ---
Name:           perl-Object-Accessor
Version:        0.12
Release:        2%{?dist}
Summary:        Perl module that allows per object accessors
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Object-Accessor/
Source0:        http://www.cpan.org/authors/id/K/KA/KANE/Object-Accessor-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Params::Check) >= 0.23
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Object::Accessor provides an interface to create per object accessors (as
opposed to per Class accessors, as, for example, Class::Accessor provides).

%prep
%setup -q -n Object-Accessor-%{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+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Apr 15 2006 Steven Pritchard <steve at kspei.com> 0.12-2
- Remove explicit perl(Params::Check) dependency.

* Thu Mar 23 2006 Steven Pritchard <steve at kspei.com> 0.12-1
- Specfile autogenerated by cpanspec 1.62.
- Fix Summary.
- Fix License.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Object-Accessor/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2006 21:38:26 -0000	1.1
+++ .cvsignore	21 Apr 2006 21:39:10 -0000	1.2
@@ -0,0 +1 @@
+Object-Accessor-0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Object-Accessor/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2006 21:38:26 -0000	1.1
+++ sources	21 Apr 2006 21:39:10 -0000	1.2
@@ -0,0 +1 @@
+722421fcbe2a18facd056ea6edb1be4f  Object-Accessor-0.12.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 21:48:13 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 21 Apr 2006 14:48:13 -0700
Subject: rpms/grads/FC-4 grads.spec,1.10,1.11
Message-ID: <200604212148.k3LLmF2q015980@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15958

Modified Files:
	grads.spec 
Log Message:
- Add needed X related BR
- remove unneeded Xaw related BR and configure flags since the gui isn't built




Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/FC-4/grads.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- grads.spec	21 Apr 2006 20:36:26 -0000	1.10
+++ grads.spec	21 Apr 2006 21:48:13 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        9%{?dist}
+Release:        11%{?dist}
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -33,8 +33,9 @@
 BuildRequires:  udunits-devel netcdf-devel 
 BuildRequires:  readline-devel
 BuildRequires:  libdap-devel libnc-dap-devel
-BuildRequires:  libsx-devel Xaw3d-devel zlib-devel libjpeg-devel gd-devel
+BuildRequires:  zlib-devel libjpeg-devel gd-devel
 BuildRequires:  ncurses-devel libpng-devel
+BuildRequires:  libXmu-devel libX11-devel
 
 %description
 The Grid Analysis and Display System (GrADS) is an interactive desktop tool
@@ -69,7 +70,7 @@
 
 %build
 ./bootstrap
-%configure --without-gui --without-lats LDFLAGS="-L%{_libdir}/netcdf-3/ -L/usr/X11R6/lib/ -lXaw -L%{_libdir}/hdf/" CPPFLAGS="-I%{_includedir}/netcdf-3/ -I%{_includedir}/hdf/" --enable-dyn-supplibs
+%configure --without-gui --without-lats LDFLAGS="-L%{_libdir}/netcdf-3/ -L%{_libdir}/hdf/" CPPFLAGS="-I%{_includedir}/netcdf-3/ -I%{_includedir}/hdf/" --enable-dyn-supplibs
 
 make %{?_smp_mflags}
 cp -r doc html
@@ -104,6 +105,12 @@
 %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
+* Fri Apr 21 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-11
+- Add needed X related BR
+
+* Fri Apr 21 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-10
+- remove unneeded X related BR and configure flags since the gui isn't built
+
 * Sat Mar 11 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-9
 - rebuild for newer libdap
 



From fedora-extras-commits at redhat.com  Fri Apr 21 21:51:38 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 21 Apr 2006 14:51:38 -0700
Subject: rpms/grads/devel grads.spec,1.8,1.9
Message-ID: <200604212151.k3LLpefn016170@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16153

Modified Files:
	grads.spec 
Log Message:
- Add needed X related BR
- remove unneeded Xaw related BR and configure flags since the gui isn't built




Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/devel/grads.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- grads.spec	11 Mar 2006 15:06:20 -0000	1.8
+++ grads.spec	21 Apr 2006 21:51:38 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        9%{?dist}
+Release:        11%{?dist}
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -33,8 +33,9 @@
 BuildRequires:  udunits-devel netcdf-devel 
 BuildRequires:  readline-devel
 BuildRequires:  libdap-devel libnc-dap-devel
-BuildRequires:  libsx-devel Xaw3d-devel zlib-devel libjpeg-devel gd-devel
+BuildRequires:  zlib-devel libjpeg-devel gd-devel
 BuildRequires:  ncurses-devel libpng-devel
+BuildRequires:  libXmu-devel libX11-devel
 
 %description
 The Grid Analysis and Display System (GrADS) is an interactive desktop tool
@@ -69,7 +70,7 @@
 
 %build
 ./bootstrap
-%configure --without-gui --without-lats LDFLAGS="-L%{_libdir}/netcdf-3/ -L/usr/X11R6/lib/ -lXaw -L%{_libdir}/hdf/" CPPFLAGS="-I%{_includedir}/netcdf-3/ -I%{_includedir}/hdf/" --enable-dyn-supplibs
+%configure --without-gui --without-lats LDFLAGS="-L%{_libdir}/netcdf-3/ -L%{_libdir}/hdf/" CPPFLAGS="-I%{_includedir}/netcdf-3/ -I%{_includedir}/hdf/" --enable-dyn-supplibs
 
 make %{?_smp_mflags}
 cp -r doc html
@@ -104,6 +105,12 @@
 %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
+* Fri Apr 21 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-11
+- Add needed X related BR
+
+* Fri Apr 21 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-10
+- remove unneeded X related BR and configure flags since the gui isn't built
+
 * Sat Mar 11 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-9
 - rebuild for newer libdap
 



From fedora-extras-commits at redhat.com  Fri Apr 21 21:53:12 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 14:53:12 -0700
Subject: owners owners.list,1.868,1.869
Message-ID: <200604212153.k3LLrE5J016238@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16221

Modified Files:
	owners.list 
Log Message:
Add perl-Object-Accessor.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.868
retrieving revision 1.869
diff -u -r1.868 -r1.869
--- owners.list	21 Apr 2006 19:10:26 -0000	1.868
+++ owners.list	21 Apr 2006 21:53:12 -0000	1.869
@@ -1059,6 +1059,7 @@
 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-Number-Compare|Perl module for numeric comparisons|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Object-Accessor|Perl module that allows per object accessors|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-OLE-Storage_Lite|Simple Class for OLE document interface|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-PAR-Dist|Toolkit for creating and manipulating Perl PAR distributions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Params-Check|Generic input parsing/checking mechanism|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Fri Apr 21 21:55:04 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 14:55:04 -0700
Subject: rpms/perl-File-Fetch - New directory
Message-ID: <200604212155.k3LLt6Bh016320@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-File-Fetch
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16294/perl-File-Fetch

Log Message:
Directory /cvs/extras/rpms/perl-File-Fetch added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 21:55:05 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 14:55:05 -0700
Subject: rpms/perl-File-Fetch/devel - New directory
Message-ID: <200604212155.k3LLt7XW016323@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-File-Fetch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16294/perl-File-Fetch/devel

Log Message:
Directory /cvs/extras/rpms/perl-File-Fetch/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 21:55:20 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 14:55:20 -0700
Subject: rpms/perl-File-Fetch Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604212155.k3LLtMk8016367@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-File-Fetch
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16339

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-File-Fetch


--- NEW FILE Makefile ---
# Top level Makefile for module perl-File-Fetch
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 21 21:55:21 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 14:55:21 -0700
Subject: rpms/perl-File-Fetch/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604212155.k3LLtNxE016370@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-File-Fetch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16339/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-File-Fetch


--- 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 Apr 21 21:55:57 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 14:55:57 -0700
Subject: rpms/perl-File-Fetch import.log,1.1,1.2
Message-ID: <200604212155.k3LLtx9a016436@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-File-Fetch
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16403

Modified Files:
	import.log 
Log Message:
auto-import perl-File-Fetch-0.07-1 on branch devel from perl-File-Fetch-0.07-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Fetch/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Apr 2006 21:55:20 -0000	1.1
+++ import.log	21 Apr 2006 21:55:56 -0000	1.2
@@ -0,0 +1 @@
+perl-File-Fetch-0_07-1:HEAD:perl-File-Fetch-0.07-1.src.rpm:1145656550



From fedora-extras-commits at redhat.com  Fri Apr 21 21:55:57 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 14:55:57 -0700
Subject: rpms/perl-File-Fetch/devel perl-File-Fetch.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604212155.k3LLtxab016441@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-File-Fetch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16403/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-File-Fetch.spec 
Log Message:
auto-import perl-File-Fetch-0.07-1 on branch devel from perl-File-Fetch-0.07-1.src.rpm


--- NEW FILE perl-File-Fetch.spec ---
Name:           perl-File-Fetch
Version:        0.07
Release:        1%{?dist}
Summary:        A generic file fetching mechanism
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/File-Fetch/
Source0:        http://www.cpan.org/authors/id/K/KA/KANE/File-Fetch-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(IPC::Cmd) >= 0.04
BuildRequires:  perl(Locale::Maketext::Simple)
BuildRequires:  perl(Module::Load::Conditional) >= 0.04
BuildRequires:  perl(Params::Check) >= 0.07
Requires:       perl(IPC::Cmd) >= 0.04
Requires:       perl(Module::Load::Conditional) >= 0.04
Requires:       perl(Params::Check) >= 0.07
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
File::Fetch is a generic file fetching mechanism.

%prep
%setup -q -n File-Fetch-%{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+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

%check
%{?_with_check:make test}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Mar 23 2006 Steven Pritchard <steve at kspei.com> 0.07-1
- Specfile autogenerated by cpanspec 1.62.
- Fix License.
- Drop explicit Requires: perl(Locale::Maketext::Simple).
- Disable "make test" by default (requires Internet connectivity).


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Fetch/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2006 21:55:20 -0000	1.1
+++ .cvsignore	21 Apr 2006 21:55:57 -0000	1.2
@@ -0,0 +1 @@
+File-Fetch-0.07.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Fetch/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2006 21:55:20 -0000	1.1
+++ sources	21 Apr 2006 21:55:57 -0000	1.2
@@ -0,0 +1 @@
+53135c09fa15e9cb0a980b153b9634e0  File-Fetch-0.07.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 21:59:40 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 21 Apr 2006 14:59:40 -0700
Subject: rpms/grads/devel grads.spec,1.9,1.10
Message-ID: <200604212159.k3LLxgme017016@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16941

Modified Files:
	grads.spec 
Log Message:
BR monolithic Xorg


Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/devel/grads.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- grads.spec	21 Apr 2006 21:51:38 -0000	1.9
+++ grads.spec	21 Apr 2006 21:59:40 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        11%{?dist}
+Release:        11%{?dist}.1
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -35,7 +35,7 @@
 BuildRequires:  libdap-devel libnc-dap-devel
 BuildRequires:  zlib-devel libjpeg-devel gd-devel
 BuildRequires:  ncurses-devel libpng-devel
-BuildRequires:  libXmu-devel libX11-devel
+BuildRequires:  xorg-x11-devel
 
 %description
 The Grid Analysis and Display System (GrADS) is an interactive desktop tool
@@ -105,7 +105,7 @@
 %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
-* Fri Apr 21 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-11
+* Fri Apr 21 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-11.1
 - Add needed X related BR
 
 * Fri Apr 21 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-10



From fedora-extras-commits at redhat.com  Fri Apr 21 22:03:55 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 21 Apr 2006 15:03:55 -0700
Subject: rpms/grads/devel grads.spec,1.10,1.11
Message-ID: <200604212203.k3LM3vAk019383@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19366

Modified Files:
	grads.spec 
Log Message:
revert change, use modular Xorg


Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/devel/grads.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- grads.spec	21 Apr 2006 21:59:40 -0000	1.10
+++ grads.spec	21 Apr 2006 22:03:55 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        11%{?dist}.1
+Release:        11%{?dist}.2
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -35,7 +35,7 @@
 BuildRequires:  libdap-devel libnc-dap-devel
 BuildRequires:  zlib-devel libjpeg-devel gd-devel
 BuildRequires:  ncurses-devel libpng-devel
-BuildRequires:  xorg-x11-devel
+BuildRequires:  libXmu-devel libX11-devel
 
 %description
 The Grid Analysis and Display System (GrADS) is an interactive desktop tool
@@ -105,7 +105,7 @@
 %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
-* Fri Apr 21 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-11.1
+* Fri Apr 21 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-11.2
 - Add needed X related BR
 
 * Fri Apr 21 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-10



From fedora-extras-commits at redhat.com  Fri Apr 21 22:05:26 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 21 Apr 2006 15:05:26 -0700
Subject: rpms/grads/FC-4 grads.spec,1.11,1.12
Message-ID: <200604212205.k3LM5Stq019415@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19398

Modified Files:
	grads.spec 
Log Message:
BR monolithic Xorg


Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/FC-4/grads.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- grads.spec	21 Apr 2006 21:48:13 -0000	1.11
+++ grads.spec	21 Apr 2006 22:05:25 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        11%{?dist}
+Release:        11%{?dist}.1
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -35,7 +35,7 @@
 BuildRequires:  libdap-devel libnc-dap-devel
 BuildRequires:  zlib-devel libjpeg-devel gd-devel
 BuildRequires:  ncurses-devel libpng-devel
-BuildRequires:  libXmu-devel libX11-devel
+BuildRequires:  xorg-x11-devel
 
 %description
 The Grid Analysis and Display System (GrADS) is an interactive desktop tool
@@ -105,7 +105,7 @@
 %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
-* Fri Apr 21 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-11
+* Fri Apr 21 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-11.1
 - Add needed X related BR
 
 * Fri Apr 21 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-10



From fedora-extras-commits at redhat.com  Fri Apr 21 22:19:58 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 21 Apr 2006 15:19:58 -0700
Subject: rpms/grads/FC-3 grads.spec,1.9,1.10
Message-ID: <200604212220.k3LMK0hL019816@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19799

Modified Files:
	grads.spec 
Log Message:
- Add needed X related BR
- remove unneeded Xaw related BR and configure flags since the gui isn't built




Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/FC-3/grads.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- grads.spec	21 Apr 2006 20:40:05 -0000	1.9
+++ grads.spec	21 Apr 2006 22:19:58 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        9%{?dist}
+Release:        11%{?dist}
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -33,8 +33,9 @@
 BuildRequires:  udunits-devel netcdf-devel 
 BuildRequires:  readline-devel
 BuildRequires:  libdap-devel libnc-dap-devel
-BuildRequires:  libsx-devel Xaw3d-devel zlib-devel libjpeg-devel gd-devel
+BuildRequires:  zlib-devel libjpeg-devel gd-devel
 BuildRequires:  ncurses-devel libpng-devel
+BuildRequires:  xorg-x11-devel
 
 %description
 The Grid Analysis and Display System (GrADS) is an interactive desktop tool
@@ -69,7 +70,7 @@
 
 %build
 ./bootstrap
-%configure --without-gui --without-lats LDFLAGS="-L%{_libdir}/netcdf-3/ -L/usr/X11R6/lib/ -lXaw -L%{_libdir}/hdf/" CPPFLAGS="-I%{_includedir}/netcdf-3/ -I%{_includedir}/hdf/" --enable-dyn-supplibs
+%configure --without-gui --without-lats LDFLAGS="-L%{_libdir}/netcdf-3/ -L%{_libdir}/hdf/" CPPFLAGS="-I%{_includedir}/netcdf-3/ -I%{_includedir}/hdf/" --enable-dyn-supplibs
 
 make %{?_smp_mflags}
 cp -r doc html
@@ -104,6 +105,12 @@
 %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
+* Fri Apr 21 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-11
+- Add needed X related BR
+
+* Fri Apr 21 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-10
+- remove unneeded X related BR and configure flags since the gui isn't built
+
 * Sat Mar 11 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-9
 - rebuild for newer libdap
 



From fedora-extras-commits at redhat.com  Fri Apr 21 22:38:24 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 15:38:24 -0700
Subject: rpms/sylpheed-claws/FC-4 .cvsignore, 1.13, 1.14 sources, 1.14,
	1.15 sylpheed-claws.spec, 1.30, 1.31
Message-ID: <200604212238.k3LMcQop019982@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-serv19929/FC-4

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
- split plugins from main package to ease requirements (#189113)
- version upgrade (#183357)
- fix libpisock (#189585)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	5 Apr 2006 21:37:27 -0000	1.13
+++ .cvsignore	21 Apr 2006 22:38:24 -0000	1.14
@@ -1 +1 @@
-sylpheed-claws-2.1.0.tar.bz2
+sylpheed-claws-2.1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	5 Apr 2006 21:37:27 -0000	1.14
+++ sources	21 Apr 2006 22:38:24 -0000	1.15
@@ -1 +1 @@
-03988307d87ed9d10253d35b323e5e51  sylpheed-claws-2.1.0.tar.bz2
+8d7b1d01c4f236a5e7d3e139bf43cd5a  sylpheed-claws-2.1.1.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sylpheed-claws.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sylpheed-claws.spec	5 Apr 2006 21:43:47 -0000	1.30
+++ sylpheed-claws.spec	21 Apr 2006 22:38:24 -0000	1.31
@@ -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.1.0
+Version:        2.1.1
 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.1.0.tar.bz2
+Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.1.1.tar.bz2
 Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -28,8 +28,6 @@
 BuildRequires:  gettext-devel
 BuildRequires:  libetpan-devel >= 0.45
 BuildRequires:  libgnomeprintui22-devel
-Requires:  spamassassin
-Requires:  dillo
 
 %description
 The bleeding edge branch of Sylpheed, a GTK+ based, lightweight, and fast
@@ -47,6 +45,40 @@
 The %{name}-devel package contains the header files  and pkgconfig file needed
 for development with %{name}.
 
+%package plugins-clamav
+Summary:        Clamav antivirus plugin for sylpheed-claws
+Group:          Applications/Internet
+Requires:       %{name} = %{version}-%{release}
+
+%description plugins-clamav
+%{summary}
+
+%package plugins-dillo
+Summary:        Dillo HTML viewer plugin for sylpheed-claws
+Group:          Applications/Internet
+Requires:       %{name} = %{version}-%{release}
+Requires:       dillo
+
+%description plugins-dillo
+%{summary}
+
+%package plugins-spamassassin
+Summary:        Spamassassin plugin for sylpheed-claws
+Group:          Applications/Internet
+Requires:       %{name} = %{version}-%{release}
+Requires:       spamassassin
+
+%description plugins-spamassassin
+%{summary}
+
+%package plugins-pgp
+Summary:        PGP plugin for signing and encrypting mail
+Group:          Applications/Internet
+Requires:       %{name} = %{version}-%{release}
+
+%description plugins-pgp
+%{summary}
+
 %prep
 %setup -q
 
@@ -80,6 +112,8 @@
 %{__rm} -rf ${RPM_BUILD_ROOT}%{_datadir}/gnome
 
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
+find ${RPM_BUILD_ROOT}/%{_libdir}/sylpheed-claws/plugins/ -type f -name \
+"*.a" -exec rm -f {} ';'
 
 %{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
 
@@ -97,10 +131,9 @@
 %{_bindir}/*
 %dir %{_libdir}/sylpheed-claws/
 %dir %{_libdir}/sylpheed-claws/plugins/
-%{_libdir}/sylpheed-claws/plugins/*.so
-%exclude %{_libdir}/sylpheed-claws/plugins/*.a
+%{_libdir}/sylpheed-claws/plugins/trayicon.so
 %{_datadir}/pixmaps/*
-%dir %{_datadir}/sylpheed-claws/
+%{_datadir}/sylpheed-claws/
 %{_datadir}/sylpheed-claws/*
 %{_mandir}/man1/*
 %{_datadir}/applications/*
@@ -108,12 +141,32 @@
 
 %files devel
 %defattr(-,root,root,-)
-%dir %{_includedir}/sylpheed-claws/
-%{_includedir}/sylpheed-claws/*
+%{_includedir}/sylpheed-claws/
 %{_libdir}/pkgconfig/sylpheed-claws.pc
 %{_libdir}/sylpheed-claws/plugins/*deps
 
+%files plugins-clamav
+%defattr(-,root,root,-)
+%{_libdir}/sylpheed-claws/plugins/clamav_plugin.so
+
+%files plugins-dillo
+%defattr(-,root,root,-)
+%{_libdir}/sylpheed-claws/plugins/dillo_viewer.so
+
+%files plugins-spamassassin
+%defattr(-,root,root,-)
+%{_libdir}/sylpheed-claws/plugins/spamassassin.so
+
+%files plugins-pgp
+%defattr(-,root,root,-)
+%{_libdir}/sylpheed-claws/plugins/pgp*.so
+
 %changelog
+* Sat Apr 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- split plugins from main package to ease requirements (#189113)
+- version upgrade (#183357)
+- fix libpisock (#189585)
+
 * Wed Apr 05 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.1.0-1
 - version upgrade



From fedora-extras-commits at redhat.com  Fri Apr 21 22:38:25 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 15:38:25 -0700
Subject: rpms/sylpheed-claws/FC-5 .cvsignore, 1.16, 1.17 sources, 1.17,
	1.18 sylpheed-claws.spec, 1.40, 1.41
Message-ID: <200604212238.k3LMcRP8019988@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-serv19929/FC-5

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
- split plugins from main package to ease requirements (#189113)
- version upgrade (#183357)
- fix libpisock (#189585)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-5/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	5 Apr 2006 21:37:28 -0000	1.16
+++ .cvsignore	21 Apr 2006 22:38:25 -0000	1.17
@@ -1 +1 @@
-sylpheed-claws-2.1.0.tar.bz2
+sylpheed-claws-2.1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-5/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	5 Apr 2006 21:37:28 -0000	1.17
+++ sources	21 Apr 2006 22:38:25 -0000	1.18
@@ -1 +1 @@
-03988307d87ed9d10253d35b323e5e51  sylpheed-claws-2.1.0.tar.bz2
+8d7b1d01c4f236a5e7d3e139bf43cd5a  sylpheed-claws-2.1.1.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-5/sylpheed-claws.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sylpheed-claws.spec	5 Apr 2006 21:43:48 -0000	1.40
+++ sylpheed-claws.spec	21 Apr 2006 22:38:25 -0000	1.41
@@ -1,11 +1,11 @@
 Name:           sylpheed-claws
-Version:        2.1.0
+Version:        2.1.1
 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.1.0.tar.bz2
+Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.1.1.tar.bz2
 Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -26,8 +26,6 @@
 BuildRequires:  gettext-devel
 BuildRequires:  libetpan-devel >= 0.45
 BuildRequires:  libgnomeprintui22-devel
-Requires:  spamassassin
-Requires:  dillo
 
 %description
 The bleeding edge branch of Sylpheed, a GTK+ based, lightweight, and fast
@@ -45,6 +43,40 @@
 The %{name}-devel package contains the header files  and pkgconfig file needed
 for development with %{name}.
 
+%package plugins-clamav
+Summary:        Clamav antivirus plugin for sylpheed-claws
+Group:          Applications/Internet
+Requires:       %{name} = %{version}-%{release}
+
+%description plugins-clamav
+%{summary}
+
+%package plugins-dillo
+Summary:        Dillo HTML viewer plugin for sylpheed-claws
+Group:          Applications/Internet
+Requires:       %{name} = %{version}-%{release}
+Requires:       dillo
+
+%description plugins-dillo
+%{summary}
+
+%package plugins-spamassassin
+Summary:        Spamassassin plugin for sylpheed-claws
+Group:          Applications/Internet
+Requires:       %{name} = %{version}-%{release}
+Requires:       spamassassin
+
+%description plugins-spamassassin
+%{summary}
+
+%package plugins-pgp
+Summary:        PGP plugin for signing and encrypting mail
+Group:          Applications/Internet
+Requires:       %{name} = %{version}-%{release}
+
+%description plugins-pgp
+%{summary}
+
 %prep
 %setup -q
 
@@ -74,6 +106,8 @@
 %{__rm} -rf ${RPM_BUILD_ROOT}%{_datadir}/gnome
 
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
+find ${RPM_BUILD_ROOT}/%{_libdir}/sylpheed-claws/plugins/ -type f -name \
+"*.a" -exec rm -f {} ';'
 
 %{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
 
@@ -91,8 +125,7 @@
 %{_bindir}/*
 %dir %{_libdir}/sylpheed-claws/
 %dir %{_libdir}/sylpheed-claws/plugins/
-%{_libdir}/sylpheed-claws/plugins/*.so
-%exclude %{_libdir}/sylpheed-claws/plugins/*.a
+%{_libdir}/sylpheed-claws/plugins/trayicon.so
 %{_datadir}/pixmaps/*
 %{_datadir}/sylpheed-claws
 %{_mandir}/man1/*
@@ -101,12 +134,33 @@
 
 %files devel
 %defattr(-,root,root,-)
-%dir %{_includedir}/sylpheed-claws/
-%{_includedir}/sylpheed-claws/*
+%{_includedir}/sylpheed-claws/
 %{_libdir}/pkgconfig/sylpheed-claws.pc
 %{_libdir}/sylpheed-claws/plugins/*deps
 
+%files plugins-clamav
+%defattr(-,root,root,-)
+%{_libdir}/sylpheed-claws/plugins/clamav_plugin.so
+
+%files plugins-dillo
+%defattr(-,root,root,-)
+%{_libdir}/sylpheed-claws/plugins/dillo_viewer.so
+
+%files plugins-spamassassin
+%defattr(-,root,root,-)
+%{_libdir}/sylpheed-claws/plugins/spamassassin.so
+
+%files plugins-pgp
+%defattr(-,root,root,-)
+%{_libdir}/sylpheed-claws/plugins/pgp*.so
+
 %changelog
+* Sat Apr 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.1.1-1
+- split plugins from main package to ease requirements (#189113)
+- version upgrade (#183357)
+- fix libpisock (#189585)
+
 * Wed Apr 05 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.1.0-1
 - version upgrade



From fedora-extras-commits at redhat.com  Fri Apr 21 22:38:26 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 15:38:26 -0700
Subject: rpms/sylpheed-claws/devel .cvsignore, 1.16, 1.17 sources, 1.17,
	1.18 sylpheed-claws.spec, 1.40, 1.41
Message-ID: <200604212238.k3LMcShl019994@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19929/devel

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
- split plugins from main package to ease requirements (#189113)
- version upgrade (#183357)
- fix libpisock (#189585)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	5 Apr 2006 21:37:34 -0000	1.16
+++ .cvsignore	21 Apr 2006 22:38:25 -0000	1.17
@@ -1 +1 @@
-sylpheed-claws-2.1.0.tar.bz2
+sylpheed-claws-2.1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	5 Apr 2006 21:37:34 -0000	1.17
+++ sources	21 Apr 2006 22:38:25 -0000	1.18
@@ -1 +1 @@
-03988307d87ed9d10253d35b323e5e51  sylpheed-claws-2.1.0.tar.bz2
+8d7b1d01c4f236a5e7d3e139bf43cd5a  sylpheed-claws-2.1.1.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sylpheed-claws.spec	5 Apr 2006 21:43:49 -0000	1.40
+++ sylpheed-claws.spec	21 Apr 2006 22:38:25 -0000	1.41
@@ -1,11 +1,11 @@
 Name:           sylpheed-claws
-Version:        2.1.0
+Version:        2.1.1
 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.1.0.tar.bz2
+Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.1.1.tar.bz2
 Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -26,8 +26,6 @@
 BuildRequires:  gettext-devel
 BuildRequires:  libetpan-devel >= 0.45
 BuildRequires:  libgnomeprintui22-devel
-Requires:  spamassassin
-Requires:  dillo
 
 %description
 The bleeding edge branch of Sylpheed, a GTK+ based, lightweight, and fast
@@ -45,6 +43,40 @@
 The %{name}-devel package contains the header files  and pkgconfig file needed
 for development with %{name}.
 
+%package plugins-clamav
+Summary:        Clamav antivirus plugin for sylpheed-claws
+Group:          Applications/Internet
+Requires:       %{name} = %{version}-%{release}
+
+%description plugins-clamav
+%{summary}
+
+%package plugins-dillo
+Summary:        Dillo HTML viewer plugin for sylpheed-claws
+Group:          Applications/Internet
+Requires:       %{name} = %{version}-%{release}
+Requires:       dillo
+
+%description plugins-dillo
+%{summary}
+
+%package plugins-spamassassin
+Summary:        Spamassassin plugin for sylpheed-claws
+Group:          Applications/Internet
+Requires:       %{name} = %{version}-%{release}
+Requires:       spamassassin
+
+%description plugins-spamassassin
+%{summary}
+
+%package plugins-pgp
+Summary:        PGP plugin for signing and encrypting mail
+Group:          Applications/Internet
+Requires:       %{name} = %{version}-%{release}
+
+%description plugins-pgp
+%{summary}
+
 %prep
 %setup -q
 
@@ -74,6 +106,8 @@
 %{__rm} -rf ${RPM_BUILD_ROOT}%{_datadir}/gnome
 
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
+find ${RPM_BUILD_ROOT}/%{_libdir}/sylpheed-claws/plugins/ -type f -name \
+"*.a" -exec rm -f {} ';'
 
 %{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
 
@@ -91,8 +125,7 @@
 %{_bindir}/*
 %dir %{_libdir}/sylpheed-claws/
 %dir %{_libdir}/sylpheed-claws/plugins/
-%{_libdir}/sylpheed-claws/plugins/*.so
-%exclude %{_libdir}/sylpheed-claws/plugins/*.a
+%{_libdir}/sylpheed-claws/plugins/trayicon.so
 %{_datadir}/pixmaps/*
 %{_datadir}/sylpheed-claws
 %{_mandir}/man1/*
@@ -101,12 +134,33 @@
 
 %files devel
 %defattr(-,root,root,-)
-%dir %{_includedir}/sylpheed-claws/
-%{_includedir}/sylpheed-claws/*
+%{_includedir}/sylpheed-claws/
 %{_libdir}/pkgconfig/sylpheed-claws.pc
 %{_libdir}/sylpheed-claws/plugins/*deps
 
+%files plugins-clamav
+%defattr(-,root,root,-)
+%{_libdir}/sylpheed-claws/plugins/clamav_plugin.so
+
+%files plugins-dillo
+%defattr(-,root,root,-)
+%{_libdir}/sylpheed-claws/plugins/dillo_viewer.so
+
+%files plugins-spamassassin
+%defattr(-,root,root,-)
+%{_libdir}/sylpheed-claws/plugins/spamassassin.so
+
+%files plugins-pgp
+%defattr(-,root,root,-)
+%{_libdir}/sylpheed-claws/plugins/pgp*.so
+
 %changelog
+* Sat Apr 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.1.1-1
+- split plugins from main package to ease requirements (#189113)
+- version upgrade (#183357)
+- fix libpisock (#189585)
+
 * Wed Apr 05 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.1.0-1
 - version upgrade



From fedora-extras-commits at redhat.com  Fri Apr 21 22:47:14 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 15:47:14 -0700
Subject: owners owners.list,1.869,1.870
Message-ID: <200604212247.k3LMlG4f020169@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20150

Modified Files:
	owners.list 
Log Message:
Add perl-File-Fetch.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.869
retrieving revision 1.870
diff -u -r1.869 -r1.870
--- owners.list	21 Apr 2006 21:53:12 -0000	1.869
+++ owners.list	21 Apr 2006 22:47:14 -0000	1.870
@@ -948,6 +948,7 @@
 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-File-BOM|Utilities for reading Byte Order Marks|mpeters at mac.com|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-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-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



From fedora-extras-commits at redhat.com  Fri Apr 21 22:57:24 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 15:57:24 -0700
Subject: rpms/sylpheed-claws/FC-4 sylpheed-claws.spec,1.31,1.32
Message-ID: <200604212257.k3LMvQu5020221@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-serv20204

Modified Files:
	sylpheed-claws.spec 
Log Message:
- fix typo



Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sylpheed-claws.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sylpheed-claws.spec	21 Apr 2006 22:38:24 -0000	1.31
+++ sylpheed-claws.spec	21 Apr 2006 22:57:23 -0000	1.32
@@ -15,7 +15,7 @@
 BuildRequires:  gtk2-devel >= 2.4.9
 BuildRequires:  compface >= 1.4
 BuildRequires:  openssl-devel >= 0.9.7
-BuildRequires:  openldap-devel >= 2.07
+BuildRequires:  openldap-devel >= 2.0.7
 BuildRequires:  aspell-devel >= 0.50.1
 BuildRequires:  pilot-link-devel
 BuildRequires:  gdk-pixbuf-devel



From fedora-extras-commits at redhat.com  Fri Apr 21 23:02:08 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Fri, 21 Apr 2006 16:02:08 -0700
Subject: rpms/pygame/FC-5 pygame.spec,1.3,1.4
Message-ID: <200604212302.k3LN2fJR022405@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22349/pygame/FC-5

Modified Files:
	pygame.spec 
Log Message:
Fix Requires on -devel package


Index: pygame.spec
===================================================================
RCS file: /cvs/extras/rpms/pygame/FC-5/pygame.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pygame.spec	21 Apr 2006 17:09:30 -0000	1.3
+++ pygame.spec	21 Apr 2006 23:02:07 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           pygame
 Version:        1.7.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Python modules for writing games
 Group:          Development/Languages
 License:        LGPL
@@ -28,6 +28,8 @@
 Summary:        Files needed for developing programs which use pygame
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:       SDL_ttf-devel SDL_mixer-devel
+Requires:       python-devel
 
 %description devel
 This package contains headers required to build applications that use
@@ -39,9 +41,12 @@
 %patch1 -p0 -b .64bit
 
 # rpmlint fixes
-chmod -x src/ffmovie.h
 rm -f examples/.#stars.py.1.7
 
+# These files must be provided by pygame-nonfree(-devel) packages on a
+# repository that can provide patent encumbered software.
+rm -f src/ffmovie.[ch]
+
 %build
 CFLAGS="%{optflags}" %{__python} setup.py build
 
@@ -77,6 +82,10 @@
 %{_includedir}/python*/%{name}/*.h
 
 %changelog
+* Fri Apr 21 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-4
+- Add Requires to -devel package
+- Remove ffmovie.h from -devel package since it requires smpeg-devel
+
 * Fri Apr 21 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-3
 - Obsolete linva python-pygame package
 - Added Provides for python-pygame



From fedora-extras-commits at redhat.com  Fri Apr 21 23:02:05 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Fri, 21 Apr 2006 16:02:05 -0700
Subject: rpms/pygame/FC-4 pygame.spec,1.3,1.4
Message-ID: <200604212302.k3LN2bAb022404@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22349/pygame/FC-4

Modified Files:
	pygame.spec 
Log Message:
Fix Requires on -devel package


Index: pygame.spec
===================================================================
RCS file: /cvs/extras/rpms/pygame/FC-4/pygame.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pygame.spec	21 Apr 2006 17:09:30 -0000	1.3
+++ pygame.spec	21 Apr 2006 23:02:01 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           pygame
 Version:        1.7.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Python modules for writing games
 Group:          Development/Languages
 License:        LGPL
@@ -28,6 +28,8 @@
 Summary:        Files needed for developing programs which use pygame
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:       SDL_ttf-devel SDL_mixer-devel
+Requires:       python-devel
 
 %description devel
 This package contains headers required to build applications that use
@@ -39,9 +41,12 @@
 %patch1 -p0 -b .64bit
 
 # rpmlint fixes
-chmod -x src/ffmovie.h
 rm -f examples/.#stars.py.1.7
 
+# These files must be provided by pygame-nonfree(-devel) packages on a
+# repository that can provide patent encumbered software.
+rm -f src/ffmovie.[ch]
+
 %build
 CFLAGS="%{optflags}" %{__python} setup.py build
 
@@ -77,6 +82,10 @@
 %{_includedir}/python*/%{name}/*.h
 
 %changelog
+* Fri Apr 21 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-4
+- Add Requires to -devel package
+- Remove ffmovie.h from -devel package since it requires smpeg-devel
+
 * Fri Apr 21 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-3
 - Obsolete linva python-pygame package
 - Added Provides for python-pygame



From fedora-extras-commits at redhat.com  Fri Apr 21 23:02:15 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Fri, 21 Apr 2006 16:02:15 -0700
Subject: rpms/pygame/devel pygame.spec,1.3,1.4
Message-ID: <200604212302.k3LN2mie022406@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22349/pygame/devel

Modified Files:
	pygame.spec 
Log Message:
Fix Requires on -devel package


Index: pygame.spec
===================================================================
RCS file: /cvs/extras/rpms/pygame/devel/pygame.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pygame.spec	21 Apr 2006 17:09:31 -0000	1.3
+++ pygame.spec	21 Apr 2006 23:02:14 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           pygame
 Version:        1.7.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Python modules for writing games
 Group:          Development/Languages
 License:        LGPL
@@ -28,6 +28,8 @@
 Summary:        Files needed for developing programs which use pygame
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:       SDL_ttf-devel SDL_mixer-devel
+Requires:       python-devel
 
 %description devel
 This package contains headers required to build applications that use
@@ -39,9 +41,12 @@
 %patch1 -p0 -b .64bit
 
 # rpmlint fixes
-chmod -x src/ffmovie.h
 rm -f examples/.#stars.py.1.7
 
+# These files must be provided by pygame-nonfree(-devel) packages on a
+# repository that can provide patent encumbered software.
+rm -f src/ffmovie.[ch]
+
 %build
 CFLAGS="%{optflags}" %{__python} setup.py build
 
@@ -77,6 +82,10 @@
 %{_includedir}/python*/%{name}/*.h
 
 %changelog
+* Fri Apr 21 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-4
+- Add Requires to -devel package
+- Remove ffmovie.h from -devel package since it requires smpeg-devel
+
 * Fri Apr 21 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-3
 - Obsolete linva python-pygame package
 - Added Provides for python-pygame



From fedora-extras-commits at redhat.com  Fri Apr 21 23:05:02 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 16:05:02 -0700
Subject: rpms/perl-Log-Message/devel - New directory
Message-ID: <200604212305.k3LN5434022524@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Log-Message/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22497/perl-Log-Message/devel

Log Message:
Directory /cvs/extras/rpms/perl-Log-Message/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 23:05:00 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 16:05:00 -0700
Subject: rpms/perl-Log-Message - New directory
Message-ID: <200604212305.k3LN52FF022518@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Log-Message
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22497/perl-Log-Message

Log Message:
Directory /cvs/extras/rpms/perl-Log-Message added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 23:05:23 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 16:05:23 -0700
Subject: rpms/perl-Log-Message Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604212305.k3LN5PM6022576@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Log-Message
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22543

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Log-Message


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Log-Message
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 21 23:05:24 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 16:05:24 -0700
Subject: rpms/perl-Log-Message/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604212305.k3LN5Qod022579@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Log-Message/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22543/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Log-Message


--- 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 Apr 21 23:06:03 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 16:06:03 -0700
Subject: rpms/perl-Log-Message import.log,1.1,1.2
Message-ID: <200604212306.k3LN6Z2b022647@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Log-Message
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22609

Modified Files:
	import.log 
Log Message:
auto-import perl-Log-Message-0.01-1 on branch devel from perl-Log-Message-0.01-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Message/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Apr 2006 23:05:23 -0000	1.1
+++ import.log	21 Apr 2006 23:06:03 -0000	1.2
@@ -0,0 +1 @@
+perl-Log-Message-0_01-1:HEAD:perl-Log-Message-0.01-1.src.rpm:1145660754



From fedora-extras-commits at redhat.com  Fri Apr 21 23:06:04 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 16:06:04 -0700
Subject: rpms/perl-Log-Message/devel perl-Log-Message.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604212306.k3LN6a3a022651@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Log-Message/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22609/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Log-Message.spec 
Log Message:
auto-import perl-Log-Message-0.01-1 on branch devel from perl-Log-Message-0.01-1.src.rpm


--- NEW FILE perl-Log-Message.spec ---
Name:           perl-Log-Message
Version:        0.01
Release:        1%{?dist}
Summary:        Generic message storage mechanism
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Log-Message/
Source0:        http://www.cpan.org/authors/id/K/KA/KANE/Log-Message-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Locale::Maketext::Simple)
BuildRequires:  perl(Module::Load)
BuildRequires:  perl(Params::Check)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Log::Message is a generic message storage mechanism. It allows you to store
messages on a stack -- either shared or private -- and assign meta-data to
it. Some meta-data will automatically be added for you, like a timestamp
and a stack trace, but some can be filled in by the user, like a tag by
which to identify it or group it, and a level at which to handle the
message (for example, log it, or die with it).

%prep
%setup -q -n Log-Message-%{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+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Mar 23 2006 Steven Pritchard <steve at kspei.com> 0.01-1
- Specfile autogenerated by cpanspec 1.62.
- Fix License.
- Improve Summary.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Message/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2006 23:05:24 -0000	1.1
+++ .cvsignore	21 Apr 2006 23:06:04 -0000	1.2
@@ -0,0 +1 @@
+Log-Message-0.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Message/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2006 23:05:24 -0000	1.1
+++ sources	21 Apr 2006 23:06:04 -0000	1.2
@@ -0,0 +1 @@
+f04298e81488a5a39930fd417d47656e  Log-Message-0.01.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 23:09:05 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Fri, 21 Apr 2006 16:09:05 -0700
Subject: rpms/deutex/FC-4 deutex-4.4.0-freedoom.patch,1.1,1.2
Message-ID: <200604212309.k3LN9781022980@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/deutex/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22899/FC-4

Modified Files:
	deutex-4.4.0-freedoom.patch 
Log Message:
Add freedoom to the list of known iwads.



deutex-4.4.0-freedoom.patch:

Index: deutex-4.4.0-freedoom.patch
===================================================================
RCS file: /cvs/extras/rpms/deutex/FC-4/deutex-4.4.0-freedoom.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- deutex-4.4.0-freedoom.patch	20 Apr 2006 16:23:48 -0000	1.1
+++ deutex-4.4.0-freedoom.patch	21 Apr 2006 23:09:05 -0000	1.2
@@ -1,6 +1,6 @@
 --- deutex-4.4.0/src/deutex.c	2006-04-20 08:09:14.000000000 -0700
-+++ deutex-4.4.0/src/deutex.c.new	2006-04-20 08:15:33.000000000 -0700
-@@ -970,14 +970,15 @@
++++ deutex-4.4.0/src/deutex.c.new	2006-04-20 11:19:51.000000000 -0700
+@@ -970,14 +970,16 @@
                 && MakeFileName(MainWAD,DoomDir,"","","heretic", "wad")!=TRUE
                 && MakeFileName(MainWAD,DoomDir,"","","hexen",   "wad")!=TRUE
                 && MakeFileName(MainWAD,DoomDir,"","","strife1", "wad")!=TRUE
@@ -11,6 +11,7 @@
                 && MakeFileName(MainWAD,".",    "","","heretic", "wad")!=TRUE
                 && MakeFileName(MainWAD,".",    "","","hexen",   "wad")!=TRUE
 -               && MakeFileName(MainWAD,".",    "","","strife1", "wad")!=TRUE)
++               && MakeFileName(MainWAD,".",    "","","strife1", "wad")!=TRUE
 +               && MakeFileName(MainWAD,".",    "","","freedoom","wad")!=TRUE)
               ProgError("Can't find any of doom.wad, doom2.wad, doompres.wad,"
 -		 " heretic.wad, hexen.wad, strife1.wad");



From fedora-extras-commits at redhat.com  Fri Apr 21 23:09:07 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Fri, 21 Apr 2006 16:09:07 -0700
Subject: rpms/deutex/devel deutex-4.4.0-freedoom.patch,1.1,1.2
Message-ID: <200604212309.k3LN99X3022995@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/deutex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22899/devel

Modified Files:
	deutex-4.4.0-freedoom.patch 
Log Message:
Add freedoom to the list of known iwads.



deutex-4.4.0-freedoom.patch:

Index: deutex-4.4.0-freedoom.patch
===================================================================
RCS file: /cvs/extras/rpms/deutex/devel/deutex-4.4.0-freedoom.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- deutex-4.4.0-freedoom.patch	20 Apr 2006 16:23:55 -0000	1.1
+++ deutex-4.4.0-freedoom.patch	21 Apr 2006 23:09:07 -0000	1.2
@@ -1,6 +1,6 @@
 --- deutex-4.4.0/src/deutex.c	2006-04-20 08:09:14.000000000 -0700
-+++ deutex-4.4.0/src/deutex.c.new	2006-04-20 08:15:33.000000000 -0700
-@@ -970,14 +970,15 @@
++++ deutex-4.4.0/src/deutex.c.new	2006-04-20 11:19:51.000000000 -0700
+@@ -970,14 +970,16 @@
                 && MakeFileName(MainWAD,DoomDir,"","","heretic", "wad")!=TRUE
                 && MakeFileName(MainWAD,DoomDir,"","","hexen",   "wad")!=TRUE
                 && MakeFileName(MainWAD,DoomDir,"","","strife1", "wad")!=TRUE
@@ -11,6 +11,7 @@
                 && MakeFileName(MainWAD,".",    "","","heretic", "wad")!=TRUE
                 && MakeFileName(MainWAD,".",    "","","hexen",   "wad")!=TRUE
 -               && MakeFileName(MainWAD,".",    "","","strife1", "wad")!=TRUE)
++               && MakeFileName(MainWAD,".",    "","","strife1", "wad")!=TRUE
 +               && MakeFileName(MainWAD,".",    "","","freedoom","wad")!=TRUE)
               ProgError("Can't find any of doom.wad, doom2.wad, doompres.wad,"
 -		 " heretic.wad, hexen.wad, strife1.wad");



From fedora-extras-commits at redhat.com  Fri Apr 21 23:09:06 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Fri, 21 Apr 2006 16:09:06 -0700
Subject: rpms/deutex/FC-5 deutex-4.4.0-freedoom.patch,1.1,1.2
Message-ID: <200604212309.k3LN98Tk022988@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/deutex/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22899/FC-5

Modified Files:
	deutex-4.4.0-freedoom.patch 
Log Message:
Add freedoom to the list of known iwads.



deutex-4.4.0-freedoom.patch:

Index: deutex-4.4.0-freedoom.patch
===================================================================
RCS file: /cvs/extras/rpms/deutex/FC-5/deutex-4.4.0-freedoom.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- deutex-4.4.0-freedoom.patch	20 Apr 2006 16:23:49 -0000	1.1
+++ deutex-4.4.0-freedoom.patch	21 Apr 2006 23:09:06 -0000	1.2
@@ -1,6 +1,6 @@
 --- deutex-4.4.0/src/deutex.c	2006-04-20 08:09:14.000000000 -0700
-+++ deutex-4.4.0/src/deutex.c.new	2006-04-20 08:15:33.000000000 -0700
-@@ -970,14 +970,15 @@
++++ deutex-4.4.0/src/deutex.c.new	2006-04-20 11:19:51.000000000 -0700
+@@ -970,14 +970,16 @@
                 && MakeFileName(MainWAD,DoomDir,"","","heretic", "wad")!=TRUE
                 && MakeFileName(MainWAD,DoomDir,"","","hexen",   "wad")!=TRUE
                 && MakeFileName(MainWAD,DoomDir,"","","strife1", "wad")!=TRUE
@@ -11,6 +11,7 @@
                 && MakeFileName(MainWAD,".",    "","","heretic", "wad")!=TRUE
                 && MakeFileName(MainWAD,".",    "","","hexen",   "wad")!=TRUE
 -               && MakeFileName(MainWAD,".",    "","","strife1", "wad")!=TRUE)
++               && MakeFileName(MainWAD,".",    "","","strife1", "wad")!=TRUE
 +               && MakeFileName(MainWAD,".",    "","","freedoom","wad")!=TRUE)
               ProgError("Can't find any of doom.wad, doom2.wad, doompres.wad,"
 -		 " heretic.wad, hexen.wad, strife1.wad");



From fedora-extras-commits at redhat.com  Fri Apr 21 23:09:19 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 16:09:19 -0700
Subject: rpms/perl-Log-Message-Simple - New directory
Message-ID: <200604212309.k3LN9L5E023039@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Log-Message-Simple
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23011/perl-Log-Message-Simple

Log Message:
Directory /cvs/extras/rpms/perl-Log-Message-Simple added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 23:09:20 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 16:09:20 -0700
Subject: rpms/perl-Log-Message-Simple/devel - New directory
Message-ID: <200604212309.k3LN9MJW023044@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Log-Message-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23011/perl-Log-Message-Simple/devel

Log Message:
Directory /cvs/extras/rpms/perl-Log-Message-Simple/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 23:09:35 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 16:09:35 -0700
Subject: rpms/perl-Log-Message-Simple Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604212309.k3LN9bjW023132@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Log-Message-Simple
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23071

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Log-Message-Simple


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Log-Message-Simple
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Apr 21 23:09:36 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 16:09:36 -0700
Subject: rpms/perl-Log-Message-Simple/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200604212309.k3LN9cwk023136@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Log-Message-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23071/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Log-Message-Simple


--- 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 Apr 21 23:10:20 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 16:10:20 -0700
Subject: rpms/perl-Log-Message-Simple import.log,1.1,1.2
Message-ID: <200604212310.k3LNArdc023312@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Log-Message-Simple
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23263

Modified Files:
	import.log 
Log Message:
auto-import perl-Log-Message-Simple-0.01-1 on branch devel from perl-Log-Message-Simple-0.01-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Message-Simple/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Apr 2006 23:09:35 -0000	1.1
+++ import.log	21 Apr 2006 23:10:20 -0000	1.2
@@ -0,0 +1 @@
+perl-Log-Message-Simple-0_01-1:HEAD:perl-Log-Message-Simple-0.01-1.src.rpm:1145661007



From fedora-extras-commits at redhat.com  Fri Apr 21 23:10:21 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 16:10:21 -0700
Subject: rpms/perl-Log-Message-Simple/devel perl-Log-Message-Simple.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604212310.k3LNArmc023316@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Log-Message-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23263/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Log-Message-Simple.spec 
Log Message:
auto-import perl-Log-Message-Simple-0.01-1 on branch devel from perl-Log-Message-Simple-0.01-1.src.rpm


--- NEW FILE perl-Log-Message-Simple.spec ---
Name:           perl-Log-Message-Simple
Version:        0.01
Release:        1%{?dist}
Summary:        Simplified frontend to Log::Message
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Log-Message-Simple/
Source0:        http://www.cpan.org/authors/id/K/KA/KANE/Log-Message-Simple-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Log::Message)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module provides standardized logging facilities using the
Log::Message module.

%prep
%setup -q -n Log-Message-Simple-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \;

chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Mar 23 2006 Steven Pritchard <steve at kspei.com> 0.01-1
- Specfile autogenerated by cpanspec 1.62.
- Fix Summary.
- Drop explicit Requires: perl(Log::Message).


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Message-Simple/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2006 23:09:36 -0000	1.1
+++ .cvsignore	21 Apr 2006 23:10:21 -0000	1.2
@@ -0,0 +1 @@
+Log-Message-Simple-0.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Message-Simple/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2006 23:09:36 -0000	1.1
+++ sources	21 Apr 2006 23:10:21 -0000	1.2
@@ -0,0 +1 @@
+0c60795da495f6a79d09362e8b4f0061  Log-Message-Simple-0.01.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 23:13:31 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 16:13:31 -0700
Subject: rpms/perl-Term-UI/devel - New directory
Message-ID: <200604212313.k3LNDXVY023467@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Term-UI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23429/perl-Term-UI/devel

Log Message:
Directory /cvs/extras/rpms/perl-Term-UI/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 23:13:28 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 16:13:28 -0700
Subject: owners owners.list,1.870,1.871
Message-ID: <200604212313.k3LNDU9C023453@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23420

Modified Files:
	owners.list 
Log Message:
Adding perl-Log-Message, perl-Log-Message-Simple, and perl-Term-UI.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.870
retrieving revision 1.871
diff -u -r1.870 -r1.871
--- owners.list	21 Apr 2006 22:47:14 -0000	1.870
+++ owners.list	21 Apr 2006 23:13:28 -0000	1.871
@@ -1027,6 +1027,8 @@
 Fedora Extras|perl-Locale-Maketext-Simple|Simple interface to Locale::Maketext::Lexicon|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Log-Dispatch|Dispatches messages to one or more outputs|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Log-Log4perl|Log4j implementation for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Log-Message|Generic message storage mechanism|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Log-Message-Simple|Simplified frontend to Log::Message|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Mail-Alias|For bugs related to the perl-Mail-Alias component|oliver at linux-kernel.at|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Mail-GnuPG|Process email with GPG|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Mail-Mbox-MessageParser|A fast and simple mbox folder reader|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1097,6 +1099,7 @@
 Fedora Extras|perl-Taint-Runtime|Runtime enable taint checking|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Template-Plugin-Class|Allow calling of class methods on arbitrary classes|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Template-Toolkit|Template processing system|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Term-UI|Term::ReadLine UI made easy|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Builder-Tester|For bugs related to the perl-Test-Builder-Tester component|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-ClassAPI|Provides basic first-pass API testing for large class trees|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Deep|Extremely flexible deep comparison|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Fri Apr 21 23:13:29 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 16:13:29 -0700
Subject: rpms/perl-Term-UI - New directory
Message-ID: <200604212313.k3LNDV35023466@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Term-UI
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23429/perl-Term-UI

Log Message:
Directory /cvs/extras/rpms/perl-Term-UI added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 23:13:54 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 16:13:54 -0700
Subject: rpms/perl-Term-UI/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604212313.k3LNDufQ023541@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Term-UI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23501/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Term-UI


--- 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 Apr 21 23:13:53 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 16:13:53 -0700
Subject: rpms/perl-Term-UI Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604212313.k3LNDtKG023534@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Term-UI
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23501

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Term-UI


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Term-UI
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Apr 21 23:14:31 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 16:14:31 -0700
Subject: rpms/perl-Term-UI/devel perl-Term-UI.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604212314.k3LNEXvX023607@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Term-UI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23572/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Term-UI.spec 
Log Message:
auto-import perl-Term-UI-0.12-1 on branch devel from perl-Term-UI-0.12-1.src.rpm


--- NEW FILE perl-Term-UI.spec ---
Name:           perl-Term-UI
Version:        0.12
Release:        1%{?dist}
Summary:        Term::ReadLine UI made easy
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Term-UI/
Source0:        http://www.cpan.org/authors/id/K/KA/KANE/Term-UI-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Locale::Maketext::Simple)
BuildRequires:  perl(Log::Message::Simple)
BuildRequires:  perl(Params::Check)
Requires:       perl(Log::Message::Simple)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Term::UI is a transparent way of eliminating the overhead of having to
format a question and then validate the reply, informing the user if the
answer was not proper and re-issuing the question.

%prep
%setup -q -n Term-UI-%{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+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Mar 23 2006 Steven Pritchard <steve at kspei.com> 0.12-1
- Specfile autogenerated by cpanspec 1.62.
- Fix License.
- Drop redundant explicit Requires.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Term-UI/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2006 23:13:53 -0000	1.1
+++ .cvsignore	21 Apr 2006 23:14:31 -0000	1.2
@@ -0,0 +1 @@
+Term-UI-0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Term-UI/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2006 23:13:53 -0000	1.1
+++ sources	21 Apr 2006 23:14:31 -0000	1.2
@@ -0,0 +1 @@
+b34442df078685f3e8b1197e1e98d1e6  Term-UI-0.12.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 23:14:30 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 16:14:30 -0700
Subject: rpms/perl-Term-UI import.log,1.1,1.2
Message-ID: <200604212315.k3LNF2uH023610@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Term-UI
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23572

Modified Files:
	import.log 
Log Message:
auto-import perl-Term-UI-0.12-1 on branch devel from perl-Term-UI-0.12-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Term-UI/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Apr 2006 23:13:53 -0000	1.1
+++ import.log	21 Apr 2006 23:14:29 -0000	1.2
@@ -0,0 +1 @@
+perl-Term-UI-0_12-1:HEAD:perl-Term-UI-0.12-1.src.rpm:1145661255



From fedora-extras-commits at redhat.com  Fri Apr 21 23:15:22 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Fri, 21 Apr 2006 16:15:22 -0700
Subject: rpms/pygame/FC-5 pygame.spec,1.4,1.5
Message-ID: <200604212315.k3LNFOOj023690@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23644/pygame/FC-5

Modified Files:
	pygame.spec 
Log Message:
Better wording in spec file comment


Index: pygame.spec
===================================================================
RCS file: /cvs/extras/rpms/pygame/FC-5/pygame.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pygame.spec	21 Apr 2006 23:02:07 -0000	1.4
+++ pygame.spec	21 Apr 2006 23:15:22 -0000	1.5
@@ -44,7 +44,7 @@
 rm -f examples/.#stars.py.1.7
 
 # These files must be provided by pygame-nonfree(-devel) packages on a
-# repository that can provide patent encumbered software.
+# repository that does not have restrictions on providing non-free software
 rm -f src/ffmovie.[ch]
 
 %build



From fedora-extras-commits at redhat.com  Fri Apr 21 23:15:23 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Fri, 21 Apr 2006 16:15:23 -0700
Subject: rpms/pygame/devel pygame.spec,1.4,1.5
Message-ID: <200604212315.k3LNFP9T023694@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23644/pygame/devel

Modified Files:
	pygame.spec 
Log Message:
Better wording in spec file comment


Index: pygame.spec
===================================================================
RCS file: /cvs/extras/rpms/pygame/devel/pygame.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pygame.spec	21 Apr 2006 23:02:14 -0000	1.4
+++ pygame.spec	21 Apr 2006 23:15:23 -0000	1.5
@@ -44,7 +44,7 @@
 rm -f examples/.#stars.py.1.7
 
 # These files must be provided by pygame-nonfree(-devel) packages on a
-# repository that can provide patent encumbered software.
+# repository that does not have restrictions on providing non-free software
 rm -f src/ffmovie.[ch]
 
 %build



From fedora-extras-commits at redhat.com  Fri Apr 21 23:15:21 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Fri, 21 Apr 2006 16:15:21 -0700
Subject: rpms/pygame/FC-4 pygame.spec,1.4,1.5
Message-ID: <200604212315.k3LNFrpG023704@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23644/pygame/FC-4

Modified Files:
	pygame.spec 
Log Message:
Better wording in spec file comment


Index: pygame.spec
===================================================================
RCS file: /cvs/extras/rpms/pygame/FC-4/pygame.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pygame.spec	21 Apr 2006 23:02:01 -0000	1.4
+++ pygame.spec	21 Apr 2006 23:15:21 -0000	1.5
@@ -44,7 +44,7 @@
 rm -f examples/.#stars.py.1.7
 
 # These files must be provided by pygame-nonfree(-devel) packages on a
-# repository that can provide patent encumbered software.
+# repository that does not have restrictions on providing non-free software
 rm -f src/ffmovie.[ch]
 
 %build



From fedora-extras-commits at redhat.com  Fri Apr 21 23:22:23 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 16:22:23 -0700
Subject: rpms/sylpheed-claws/FC-4 sylpheed-claws.spec,1.32,1.33
Message-ID: <200604212322.k3LNMPMx023860@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-serv23842

Modified Files:
	sylpheed-claws.spec 
Log Message:
- add missing BR



Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sylpheed-claws.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sylpheed-claws.spec	21 Apr 2006 22:57:23 -0000	1.32
+++ sylpheed-claws.spec	21 Apr 2006 23:22:23 -0000	1.33
@@ -28,6 +28,7 @@
 BuildRequires:  gettext-devel
 BuildRequires:  libetpan-devel >= 0.45
 BuildRequires:  libgnomeprintui22-devel
+BuildRequires:  xorg-x11-devel
 
 %description
 The bleeding edge branch of Sylpheed, a GTK+ based, lightweight, and fast



From fedora-extras-commits at redhat.com  Fri Apr 21 23:52:13 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 16:52:13 -0700
Subject: rpms/libopensync-plugin-palm/FC-5 libopensync-plugin-palm.spec, 1.3,
	1.4
Message-ID: <200604212352.k3LNqFL8024205@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-serv24170/FC-5

Modified Files:
	libopensync-plugin-palm.spec 
Log Message:
- bump



Index: libopensync-plugin-palm.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-palm/FC-5/libopensync-plugin-palm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libopensync-plugin-palm.spec	16 Feb 2006 23:18:36 -0000	1.3
+++ libopensync-plugin-palm.spec	21 Apr 2006 23:52:13 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-palm
 Version:        0.18
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Palm plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -60,6 +60,9 @@
 %{_includedir}/opensync-1.0/opensync/palm*.h
 
 %changelog
+* Sat Apr 22 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 
 



From fedora-extras-commits at redhat.com  Fri Apr 21 23:52:12 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 16:52:12 -0700
Subject: rpms/libopensync-plugin-palm/FC-4 libopensync-plugin-palm.spec, 1.2,
	1.3
Message-ID: <200604212352.k3LNqEfx024201@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-serv24170/FC-4

Modified Files:
	libopensync-plugin-palm.spec 
Log Message:
- bump



Index: libopensync-plugin-palm.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-palm/FC-4/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	21 Apr 2006 23:52:12 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-palm
 Version:        0.18
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Palm plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -60,6 +60,9 @@
 %{_includedir}/opensync-1.0/opensync/palm*.h
 
 %changelog
+* Sat Apr 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-3
+- bump
+
 * Tue Dec 13 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-2
 - add dist
 



From fedora-extras-commits at redhat.com  Fri Apr 21 23:56:46 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 16:56:46 -0700
Subject: rpms/wmCalClock/FC-4 wmCalClock.spec,1.3,1.4
Message-ID: <200604212356.k3LNumuk024367@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmCalClock/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24305/FC-4

Modified Files:
	wmCalClock.spec 
Log Message:
- put manpage into right location (David Kovalsky)



Index: wmCalClock.spec
===================================================================
RCS file: /cvs/extras/rpms/wmCalClock/FC-4/wmCalClock.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wmCalClock.spec	26 Sep 2005 11:11:53 -0000	1.3
+++ wmCalClock.spec	21 Apr 2006 23:56:46 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           wmCalClock
 Version:        1.25
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A Calendar clock with antialiased text
 
 Group:          User Interface/X
@@ -31,7 +31,7 @@
 %{__install} -p %{_builddir}/%{name}-%{version}/Src/wmCalClock \
 ${RPM_BUILD_ROOT}%{_bindir}
 %{__install} -p -m644 %{_builddir}/%{name}-%{version}/Src/wmCalClock.1 \
-${RPM_BUILD_ROOT}%{_mandir}
+${RPM_BUILD_ROOT}%{_mandir}/man1/
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -40,9 +40,13 @@
 %defattr(-,root,root,-)
 %doc BUGS CHANGES COPYING HINTS README TODO
 %{_bindir}/wmCalClock
-%{_mandir}/wmCalClock.1
+%{_mandir}/man1/wmCalClock.1*
 
 %changelog
+* Sat Apr 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.25-5
+- put manpage into right location (David Kovalsky)
+
 * Mon Sep 26 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.25-4
 - try to fix x86_64 build (libdir)



From fedora-extras-commits at redhat.com  Fri Apr 21 23:56:47 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 16:56:47 -0700
Subject: rpms/wmCalClock/FC-5 wmCalClock.spec,1.5,1.6
Message-ID: <200604212356.k3LNunlK024371@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmCalClock/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24305/FC-5

Modified Files:
	wmCalClock.spec 
Log Message:
- put manpage into right location (David Kovalsky)



Index: wmCalClock.spec
===================================================================
RCS file: /cvs/extras/rpms/wmCalClock/FC-5/wmCalClock.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wmCalClock.spec	16 Feb 2006 23:12:55 -0000	1.5
+++ wmCalClock.spec	21 Apr 2006 23:56:47 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           wmCalClock
 Version:        1.25
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A Calendar clock with antialiased text
 
 Group:          User Interface/X
@@ -33,7 +33,7 @@
 %{__install} -p %{_builddir}/%{name}-%{version}/Src/wmCalClock \
 ${RPM_BUILD_ROOT}%{_bindir}
 %{__install} -p -m644 %{_builddir}/%{name}-%{version}/Src/wmCalClock.1 \
-${RPM_BUILD_ROOT}%{_mandir}
+${RPM_BUILD_ROOT}%{_mandir}/man1/
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -42,9 +42,13 @@
 %defattr(-,root,root,-)
 %doc BUGS CHANGES COPYING HINTS README TODO
 %{_bindir}/wmCalClock
-%{_mandir}/wmCalClock.1
+%{_mandir}/man1/wmCalClock.1*
 
 %changelog
+* Sat Apr 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.25-7
+- put manpage into right location (David Kovalsky)
+
 * Thu Feb 16 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.25-6
 - Rebuild for Fedora Extras 5



From fedora-extras-commits at redhat.com  Fri Apr 21 23:56:47 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 16:56:47 -0700
Subject: rpms/wmCalClock/devel wmCalClock.spec,1.5,1.6
Message-ID: <200604212356.k3LNun9B024375@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmCalClock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24305/devel

Modified Files:
	wmCalClock.spec 
Log Message:
- put manpage into right location (David Kovalsky)



Index: wmCalClock.spec
===================================================================
RCS file: /cvs/extras/rpms/wmCalClock/devel/wmCalClock.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wmCalClock.spec	16 Feb 2006 23:12:55 -0000	1.5
+++ wmCalClock.spec	21 Apr 2006 23:56:47 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           wmCalClock
 Version:        1.25
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A Calendar clock with antialiased text
 
 Group:          User Interface/X
@@ -33,7 +33,7 @@
 %{__install} -p %{_builddir}/%{name}-%{version}/Src/wmCalClock \
 ${RPM_BUILD_ROOT}%{_bindir}
 %{__install} -p -m644 %{_builddir}/%{name}-%{version}/Src/wmCalClock.1 \
-${RPM_BUILD_ROOT}%{_mandir}
+${RPM_BUILD_ROOT}%{_mandir}/man1/
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -42,9 +42,13 @@
 %defattr(-,root,root,-)
 %doc BUGS CHANGES COPYING HINTS README TODO
 %{_bindir}/wmCalClock
-%{_mandir}/wmCalClock.1
+%{_mandir}/man1/wmCalClock.1*
 
 %changelog
+* Sat Apr 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.25-7
+- put manpage into right location (David Kovalsky)
+
 * Thu Feb 16 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.25-6
 - Rebuild for Fedora Extras 5



From fedora-extras-commits at redhat.com  Fri Apr 21 23:56:45 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 16:56:45 -0700
Subject: rpms/wmCalClock/FC-3 wmCalClock.spec,1.3,1.4
Message-ID: <200604212357.k3LNvIeB024378@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmCalClock/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24305/FC-3

Modified Files:
	wmCalClock.spec 
Log Message:
- put manpage into right location (David Kovalsky)



Index: wmCalClock.spec
===================================================================
RCS file: /cvs/extras/rpms/wmCalClock/FC-3/wmCalClock.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wmCalClock.spec	26 Sep 2005 11:11:53 -0000	1.3
+++ wmCalClock.spec	21 Apr 2006 23:56:45 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           wmCalClock
 Version:        1.25
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A Calendar clock with antialiased text
 
 Group:          User Interface/X
@@ -31,7 +31,7 @@
 %{__install} -p %{_builddir}/%{name}-%{version}/Src/wmCalClock \
 ${RPM_BUILD_ROOT}%{_bindir}
 %{__install} -p -m644 %{_builddir}/%{name}-%{version}/Src/wmCalClock.1 \
-${RPM_BUILD_ROOT}%{_mandir}
+${RPM_BUILD_ROOT}%{_mandir}/man1/
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -40,9 +40,13 @@
 %defattr(-,root,root,-)
 %doc BUGS CHANGES COPYING HINTS README TODO
 %{_bindir}/wmCalClock
-%{_mandir}/wmCalClock.1
+%{_mandir}/man1/wmCalClock.1*
 
 %changelog
+* Sat Apr 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.25-5
+- put manpage into right location (David Kovalsky)
+
 * Mon Sep 26 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.25-4
 - try to fix x86_64 build (libdir)



From fedora-extras-commits at redhat.com  Sat Apr 22 00:05:09 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 17:05:09 -0700
Subject: rpms/sylpheed-claws/FC-4 sylpheed-claws.spec,1.33,1.34
Message-ID: <200604220005.k3M05B8a027349@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-serv27299

Modified Files:
	sylpheed-claws.spec 
Log Message:
- work around broken libtool



Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sylpheed-claws.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sylpheed-claws.spec	21 Apr 2006 23:22:23 -0000	1.33
+++ sylpheed-claws.spec	22 Apr 2006 00:05:09 -0000	1.34
@@ -28,7 +28,7 @@
 BuildRequires:  gettext-devel
 BuildRequires:  libetpan-devel >= 0.45
 BuildRequires:  libgnomeprintui22-devel
-BuildRequires:  xorg-x11-devel
+BuildRequires:  libtool
 
 %description
 The bleeding edge branch of Sylpheed, a GTK+ based, lightweight, and fast
@@ -95,7 +95,7 @@
            --enable-aspell \
            --disable-dependency-tracking 
 
-%{__make} %{?_smp_mflags}
+%{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 %{__make} check
 
 %install



From fedora-extras-commits at redhat.com  Sat Apr 22 00:13:10 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 17:13:10 -0700
Subject: rpms/wmCalClock/FC-3 wmCalClock.spec,1.4,1.5
Message-ID: <200604220013.k3M0DgTD029105@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmCalClock/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28833/FC-3

Modified Files:
	wmCalClock.spec 
Log Message:
- create man1



Index: wmCalClock.spec
===================================================================
RCS file: /cvs/extras/rpms/wmCalClock/FC-3/wmCalClock.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wmCalClock.spec	21 Apr 2006 23:56:45 -0000	1.4
+++ wmCalClock.spec	22 Apr 2006 00:13:09 -0000	1.5
@@ -26,7 +26,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %{__mkdir_p} ${RPM_BUILD_ROOT}%{_bindir}
-%{__mkdir_p} ${RPM_BUILD_ROOT}%{_mandir}
+%{__mkdir_p} ${RPM_BUILD_ROOT}%{_mandir}/man1/
 
 %{__install} -p %{_builddir}/%{name}-%{version}/Src/wmCalClock \
 ${RPM_BUILD_ROOT}%{_bindir}



From fedora-extras-commits at redhat.com  Sat Apr 22 00:13:11 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 17:13:11 -0700
Subject: rpms/wmCalClock/FC-5 wmCalClock.spec,1.6,1.7
Message-ID: <200604220013.k3M0Dh9d029114@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmCalClock/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28833/FC-5

Modified Files:
	wmCalClock.spec 
Log Message:
- create man1



Index: wmCalClock.spec
===================================================================
RCS file: /cvs/extras/rpms/wmCalClock/FC-5/wmCalClock.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wmCalClock.spec	21 Apr 2006 23:56:47 -0000	1.6
+++ wmCalClock.spec	22 Apr 2006 00:13:11 -0000	1.7
@@ -28,7 +28,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %{__mkdir_p} ${RPM_BUILD_ROOT}%{_bindir}
-%{__mkdir_p} ${RPM_BUILD_ROOT}%{_mandir}
+%{__mkdir_p} ${RPM_BUILD_ROOT}%{_mandir}/man1/
 
 %{__install} -p %{_builddir}/%{name}-%{version}/Src/wmCalClock \
 ${RPM_BUILD_ROOT}%{_bindir}



From fedora-extras-commits at redhat.com  Sat Apr 22 00:13:10 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 17:13:10 -0700
Subject: rpms/wmCalClock/FC-4 wmCalClock.spec,1.4,1.5
Message-ID: <200604220013.k3M0DgMI029108@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmCalClock/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28833/FC-4

Modified Files:
	wmCalClock.spec 
Log Message:
- create man1



Index: wmCalClock.spec
===================================================================
RCS file: /cvs/extras/rpms/wmCalClock/FC-4/wmCalClock.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wmCalClock.spec	21 Apr 2006 23:56:46 -0000	1.4
+++ wmCalClock.spec	22 Apr 2006 00:13:10 -0000	1.5
@@ -26,7 +26,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %{__mkdir_p} ${RPM_BUILD_ROOT}%{_bindir}
-%{__mkdir_p} ${RPM_BUILD_ROOT}%{_mandir}
+%{__mkdir_p} ${RPM_BUILD_ROOT}%{_mandir}/man1/
 
 %{__install} -p %{_builddir}/%{name}-%{version}/Src/wmCalClock \
 ${RPM_BUILD_ROOT}%{_bindir}



From fedora-extras-commits at redhat.com  Sat Apr 22 00:13:12 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 17:13:12 -0700
Subject: rpms/wmCalClock/devel wmCalClock.spec,1.6,1.7
Message-ID: <200604220013.k3M0DirP029118@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmCalClock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28833/devel

Modified Files:
	wmCalClock.spec 
Log Message:
- create man1



Index: wmCalClock.spec
===================================================================
RCS file: /cvs/extras/rpms/wmCalClock/devel/wmCalClock.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wmCalClock.spec	21 Apr 2006 23:56:47 -0000	1.6
+++ wmCalClock.spec	22 Apr 2006 00:13:11 -0000	1.7
@@ -28,7 +28,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %{__mkdir_p} ${RPM_BUILD_ROOT}%{_bindir}
-%{__mkdir_p} ${RPM_BUILD_ROOT}%{_mandir}
+%{__mkdir_p} ${RPM_BUILD_ROOT}%{_mandir}/man1/
 
 %{__install} -p %{_builddir}/%{name}-%{version}/Src/wmCalClock \
 ${RPM_BUILD_ROOT}%{_bindir}



From fedora-extras-commits at redhat.com  Sat Apr 22 00:30:32 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 17:30:32 -0700
Subject: rpms/w3c-libwww/FC-5 w3c-libwww-md5.patch, NONE, 1.1 w3c-libwww.spec,
	1.1, 1.2
Message-ID: <200604220031.k3M0V4Fx031440@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/w3c-libwww/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31401/FC-5

Modified Files:
	w3c-libwww.spec 
Added Files:
	w3c-libwww-md5.patch 
Log Message:
- fix md5 (#187895)


w3c-libwww-md5.patch:

--- NEW FILE w3c-libwww-md5.patch ---
--- modules/md5/md5.h.orig	2006-04-22 02:25:32.000000000 +0200
+++ modules/md5/md5.h	2006-04-22 02:25:54.000000000 +0200
@@ -42,7 +42,7 @@
 typedef unsigned short int UINT2;
 
 /* UINT4 defines a four byte word */
-typedef unsigned long int UINT4;
+typedef unsigned int UINT4;
 
 /* PROTO_LIST is defined depending on how PROTOTYPES is defined above.
    If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it


Index: w3c-libwww.spec
===================================================================
RCS file: /cvs/extras/rpms/w3c-libwww/FC-5/w3c-libwww.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- w3c-libwww.spec	28 Feb 2006 10:21:52 -0000	1.1
+++ w3c-libwww.spec	22 Apr 2006 00:30:31 -0000	1.2
@@ -1,6 +1,6 @@
 Name:          w3c-libwww
 Version:       5.4.1
-Release:       0.2.20060206cvs%{?dist}
+Release:       0.3.20060206cvs%{?dist}
 Summary:       HTTP library of common code
 
 Group:         System Environment/Libraries
@@ -13,6 +13,7 @@
 Patch0:        w3c-libwww-configure.patch
 Patch1:        w3c-libwww-5.3.2-incdir.patch
 Patch2:        w3c-libwww-ppc64.patch
+Patch3:        w3c-libwww-md5.patch
 #external expat
 Patch100:      w3c-libwww-expat.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -58,6 +59,7 @@
 %patch0
 %patch1 -p1 
 %patch2 -p1 -b .ppc64
+%patch3
 %patch100
 
 # we don't want the libwww version
@@ -119,6 +121,10 @@
 %{_includedir}/w3c-libwww
 
 %changelog
+* Sat Apr 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+5.4.1-0.3.20060206cvs
+- fix md5 (#187895)
+
 * Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 5.4.1-0.2.20060206cvs
 - readd wwwconfig.h to fix internal header errors



From fedora-extras-commits at redhat.com  Sat Apr 22 00:30:32 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 17:30:32 -0700
Subject: rpms/w3c-libwww/devel w3c-libwww-md5.patch, NONE,
	1.1 w3c-libwww.spec, 1.1, 1.2
Message-ID: <200604220031.k3M0V4Pp031443@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/w3c-libwww/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31401/devel

Modified Files:
	w3c-libwww.spec 
Added Files:
	w3c-libwww-md5.patch 
Log Message:
- fix md5 (#187895)


w3c-libwww-md5.patch:

--- NEW FILE w3c-libwww-md5.patch ---
--- modules/md5/md5.h.orig	2006-04-22 02:25:32.000000000 +0200
+++ modules/md5/md5.h	2006-04-22 02:25:54.000000000 +0200
@@ -42,7 +42,7 @@
 typedef unsigned short int UINT2;
 
 /* UINT4 defines a four byte word */
-typedef unsigned long int UINT4;
+typedef unsigned int UINT4;
 
 /* PROTO_LIST is defined depending on how PROTOTYPES is defined above.
    If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it


Index: w3c-libwww.spec
===================================================================
RCS file: /cvs/extras/rpms/w3c-libwww/devel/w3c-libwww.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- w3c-libwww.spec	28 Feb 2006 10:21:52 -0000	1.1
+++ w3c-libwww.spec	22 Apr 2006 00:30:32 -0000	1.2
@@ -1,6 +1,6 @@
 Name:          w3c-libwww
 Version:       5.4.1
-Release:       0.2.20060206cvs%{?dist}
+Release:       0.3.20060206cvs%{?dist}
 Summary:       HTTP library of common code
 
 Group:         System Environment/Libraries
@@ -13,6 +13,7 @@
 Patch0:        w3c-libwww-configure.patch
 Patch1:        w3c-libwww-5.3.2-incdir.patch
 Patch2:        w3c-libwww-ppc64.patch
+Patch3:        w3c-libwww-md5.patch
 #external expat
 Patch100:      w3c-libwww-expat.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -58,6 +59,7 @@
 %patch0
 %patch1 -p1 
 %patch2 -p1 -b .ppc64
+%patch3
 %patch100
 
 # we don't want the libwww version
@@ -119,6 +121,10 @@
 %{_includedir}/w3c-libwww
 
 %changelog
+* Sat Apr 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+5.4.1-0.3.20060206cvs
+- fix md5 (#187895)
+
 * Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 5.4.1-0.2.20060206cvs
 - readd wwwconfig.h to fix internal header errors



From fedora-extras-commits at redhat.com  Sat Apr 22 00:34:36 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 17:34:36 -0700
Subject: rpms/sylpheed-claws-plugins/devel
	sylpheed-claws-plugins-smime.patch, 
	NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 sylpheed-claws-plugins.spec, 1.9, 1.10
Message-ID: <200604220034.k3M0YcAC031620@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-serv31472/devel

Modified Files:
	.cvsignore sources sylpheed-claws-plugins.spec 
Added Files:
	sylpheed-claws-plugins-smime.patch 
Log Message:
- version upgrade


sylpheed-claws-plugins-smime.patch:

--- NEW FILE sylpheed-claws-plugins-smime.patch ---
--- smime-0.5/configure.ac.orig	2006-04-17 11:29:30.000000000 +0200
+++ smime-0.5/configure.ac	2006-04-17 11:29:53.000000000 +0200
@@ -41,7 +41,7 @@
 fi
 
 dnl check for sylpheed-claws
-PKG_CHECK_MODULES(SYLPHEED_CLAWS, sylpheed-claws >= 2.1.0.1)
+PKG_CHECK_MODULES(SYLPHEED_CLAWS, sylpheed-claws >= 2.1.0.0)
 SYLPHEED_CLAWS_PLUGINDIR=$( $PKG_CONFIG --variable=plugindir sylpheed-claws )
 AC_SUBST(SYLPHEED_CLAWS_CFLAGS)
 AC_SUBST(SYLPHEED_CLAWS_LIBS)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Feb 2006 09:51:40 -0000	1.4
+++ .cvsignore	22 Apr 2006 00:34:35 -0000	1.5
@@ -1 +1 @@
-sylpheed-claws-extra-plugins-2.0.0.tar.bz2
+sylpheed-claws-extra-plugins-2.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Feb 2006 09:51:40 -0000	1.4
+++ sources	22 Apr 2006 00:34:35 -0000	1.5
@@ -1 +1 @@
-77fe8e71f12c6f6ae1dfe9d55ab3d7d4  sylpheed-claws-extra-plugins-2.0.0.tar.bz2
+c15f7bd52ebed8c9c9163c8a8e593c5d  sylpheed-claws-extra-plugins-2.1.0.tar.bz2


Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/sylpheed-claws-plugins.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sylpheed-claws-plugins.spec	17 Feb 2006 08:03:31 -0000	1.9
+++ sylpheed-claws-plugins.spec	22 Apr 2006 00:34:35 -0000	1.10
@@ -1,12 +1,13 @@
 Name:           sylpheed-claws-plugins
-Version:        2.0.0
-Release:        2%{?dist}
+Version:        2.1.0
+Release:        1%{?dist}
 Summary:        Additional plugins for sylpheed-claws
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
 Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-extra-plugins-%{version}.tar.bz2
+Patch0:         sylpheed-claws-plugins-smime.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  sylpheed-claws-devel >= %{version}
@@ -17,18 +18,29 @@
 BuildRequires:  synce-devel
 BuildRequires:  curl-devel
 BuildRequires:  libxml2-devel
+BuildRequires:  gtkhtml2-devel
+BuildRequires:  libidn-devel
 
 Requires:       %{name}-acpi-notifier = %{version}-%{release}
 Requires:       %{name}-att-remover = %{version}-%{release}
 Requires:       %{name}-cachesaver = %{version}-%{release}
 Requires:       %{name}-etpan-privacy = %{version}-%{release}
 Requires:       %{name}-fetchinfo = %{version}-%{release}
+Requires:       %{name}-gtkhtml2-viewer = %{version}-%{release}
 Requires:       %{name}-maildir = %{version}-%{release}
 Requires:       %{name}-mailmbox = %{version}-%{release}
+Requires:       %{name}-newmail = %{version}-%{release}
+Requires:       %{name}-notification = %{version}-%{release}
 Requires:       %{name}-perl = %{version}-%{release}
 Requires:       %{name}-rssyl = %{version}-%{release}
+Requires:       %{name}-smime = %{version}-%{release}
 Requires:       %{name}-synce = %{version}-%{release}
 Requires:       %{name}-vcalendar = %{version}-%{release}
+# and the ones from main sylpheed-package...
+Requires:       %{name}-clamav
+Requires:       %{name}-dillo
+Requires:       %{name}-spamassassin
+Requires:       %{name}-pgp
 
 %description
 Additional plugins for sylpheed-claws
@@ -49,7 +61,6 @@
 %description att-remover
 %{summary}
 
-
 %package cachesaver
 Summary:        A cache saving plugin
 Group:          Applications/Internet
@@ -77,6 +88,14 @@
 This plugin inserts headers containing some download information:
 UIDL, Sylpheeds account name, POP server, user ID and retrieval time.
 
+%package gtkhtml2-viewer
+Summary:        GTK Html Viewer
+Group:          Applications/Internet
+Requires:       sylpheed-claws >= %{version}
+
+%description gtkhtml2-viewer
+%{summary}
+
 %package maildir
 Summary:        Provide direct access to Maildir++ Mailboxes
 Group:          Applications/Internet
@@ -96,6 +115,24 @@
 %description mailmbox
 This plugin provides direct support for mailboxes in mbox format.
 
+%package newmail
+Summary:        Write a msg header summary to a log file
+Group:          Applications/Internet
+Requires:       sylpheed-claws >= %{version}
+
+%description newmail
+Write a msg header summary to a log file (defaults to ~/Mail/NewLog) an arrival
+of new mail *after* sorting.
+
+%package notification
+Summary:        New mail notifications
+Group:          Applications/Internet
+Requires:       sylpheed-claws >= %{version}
+
+%description notification
+This plugin collects various ways to notify the user of new (and possibly unread)
+mail. Currently, a popup and a mail banner are implemented.
+
 %package perl
 Summary:        Extended filtering engine
 Group:          Applications/Internet
@@ -114,6 +151,15 @@
 %description rssyl
 %{summary}
 
+%package smime
+Summary:        S/MIME signed and/or encrypted
+Group:          Applications/Internet
+Requires:       sylpheed-claws >= %{version}
+
+%description smime
+This plugin handles S/MIME signed and/or encrypted mails. You can decrypt
+mails, verify signatures or sign and encrypt your own mails.
+
 %package synce
 Summary:        Keeping the addressbook of a Windows CE device in sync
 Group:          Applications/Internet
@@ -135,16 +181,17 @@
 
 %prep
 %setup -q -n sylpheed-claws-extra-plugins-%{version}
+%patch0
 
 %build
 
 #acpi_notifier
-cd acpi_notifier-0.8
+cd acpi_notifier-1.0
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #att_remover
-cd ../att_remover-0.4
+cd ../att_remover-1.0
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
@@ -159,49 +206,70 @@
 %{__make} %{?_smp_mflags}
 
 #fetchinfo-plugin
-cd ../fetchinfo-plugin-0.4.10
+cd ../fetchinfo-plugin-0.4.12
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
+#gtkhtml2-viewer
+cd ../gtkhtml2_viewer-0.8
+%configure --disable-static --disable-dependency-tracking --disable-rpath
+%{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
+
 #maildir
-cd ../maildir-0.19
+cd ../maildir-0.20
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #mailmbox
-cd ../mailmbox-1.10
+cd ../mailmbox-1.11
+%configure --disable-static --disable-dependency-tracking
+%{__make} %{?_smp_mflags}
+
+#newmail
+cd ../newmail-0.0.3
+%configure --disable-static --disable-dependency-tracking
+%{__make} %{?_smp_mflags}
+
+#notification-plugin
+cd ../notification_plugin-0.1
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
+
 #perl
-cd ../perl_plugin-0.6
+cd ../perl_plugin-0.9
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #rssyl
-cd ../rssyl-0.4pre
+cd ../rssyl-0.4cvs6
+%configure --disable-static --disable-dependency-tracking
+%{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
+
+#smime
+cd ../smime-0.5
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #synce
-cd ../synce_plugin-0.4
+cd ../synce_plugin-0.6
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #vcalendar
-cd ../vcalendar-1.29
+cd ../vcalendar-1.71
 %configure --disable-static --disable-dependency-tracking
-%{__make} %{?_smp_mflags}
+%{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 # acpi_notifier
-cd acpi_notifier-0.8
+cd acpi_notifier-1.0
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 # att_remover
-cd ../att_remover-0.4
+cd ../att_remover-1.0
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 # cachesaver
@@ -213,31 +281,47 @@
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #fetchinfo-plugin
-cd ../fetchinfo-plugin-0.4.10
+cd ../fetchinfo-plugin-0.4.12
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
+
+#gtkhtml2-viewer
+cd ../gtkhtml2_viewer-0.8
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #maildir
-cd ../maildir-0.19
+cd ../maildir-0.20
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #mailmbox
-cd ../mailmbox-1.10
+cd ../mailmbox-1.11
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
+
+#newmail
+cd ../newmail-0.0.3
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
+
+#notification-plugin
+cd ../notification_plugin-0.1
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #perl
-cd ../perl_plugin-0.6
+cd ../perl_plugin-0.9
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #rssyl
-cd ../rssyl-0.4pre
+cd ../rssyl-0.4cvs6
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
+
+#smime
+cd ../smime-0.5
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #synce
-cd ../synce_plugin-0.4
+cd ../synce_plugin-0.6
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #vcalendar
-cd ../vcalendar-1.29
+cd ../vcalendar-1.71
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
@@ -251,11 +335,11 @@
 
 %files acpi-notifier
 %defattr(-,root,root,-)
-%doc acpi_notifier-0.8/ChangeLog
-%doc acpi_notifier-0.8/COPYING
-%doc acpi_notifier-0.8/NEWS
-%doc acpi_notifier-0.8/AUTHORS
-%doc acpi_notifier-0.8/README
+%doc acpi_notifier-1.0/ChangeLog
+%doc acpi_notifier-1.0/COPYING
+%doc acpi_notifier-1.0/NEWS
+%doc acpi_notifier-1.0/AUTHORS
+%doc acpi_notifier-1.0/README
 %{_libdir}/sylpheed-claws/plugins/acpi_notifier*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/acpi_notifier.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/acpi_notifier.mo
@@ -270,11 +354,11 @@
 
 %files att-remover
 %defattr(-,root,root,-)
-%doc att_remover-0.4/AUTHORS
-%doc att_remover-0.4/ChangeLog
-%doc att_remover-0.4/COPYING
-%doc att_remover-0.4/NEWS
-%doc att_remover-0.4/README
+%doc att_remover-1.0/AUTHORS
+%doc att_remover-1.0/ChangeLog
+%doc att_remover-1.0/COPYING
+%doc att_remover-1.0/NEWS
+%doc att_remover-1.0/README
 %{_libdir}/sylpheed-claws/plugins/att_remover*
 
 %files cachesaver
@@ -294,43 +378,69 @@
 
 %files fetchinfo
 %defattr(-,root,root,-)
-%doc fetchinfo-plugin-0.4.10/ChangeLog
-%doc fetchinfo-plugin-0.4.10/COPYING
-%doc fetchinfo-plugin-0.4.10/README
+%doc fetchinfo-plugin-0.4.12/ChangeLog
+%doc fetchinfo-plugin-0.4.12/COPYING
+%doc fetchinfo-plugin-0.4.12/README
 %{_libdir}/sylpheed-claws/plugins/fetchinfo*
 
+%files gtkhtml2-viewer
+%defattr(-,root,root,-)
+%doc gtkhtml2_viewer-0.8/AUTHORS
+%doc gtkhtml2_viewer-0.8/COPYING
+%{_libdir}/sylpheed-claws/plugins/gtkhtml2_viewer*
+%lang(es) %{_datadir}/locale/es/LC_MESSAGES/gtkhtml2_viewer.mo
+%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/gtkhtml2_viewer.mo
+
+
 %files maildir
 %defattr(-,root,root,-)
-%doc maildir-0.19/AUTHORS
-%doc maildir-0.19/ChangeLog
-%doc maildir-0.19/COPYING
-%doc maildir-0.19/README
-%doc maildir-0.19/doc/README.xml
+%doc maildir-0.20/AUTHORS
+%doc maildir-0.20/ChangeLog
+%doc maildir-0.20/COPYING
+%doc maildir-0.20/README
+%doc maildir-0.20/doc/README.xml
 %{_libdir}/sylpheed-claws/plugins/maildir*
 
 %files mailmbox
 %defattr(-,root,root,-)
-%doc mailmbox-1.10/AUTHORS
-%doc mailmbox-1.10/ChangeLog
-%doc mailmbox-1.10/COPYING
-%doc mailmbox-1.10/README
+%doc mailmbox-1.11/AUTHORS
+%doc mailmbox-1.11/ChangeLog
+%doc mailmbox-1.11/COPYING
+%doc mailmbox-1.11/README
 %{_libdir}/sylpheed-claws/plugins/mailmbox*
 
+%files newmail
+%defattr(-,root,root,-)
+%doc newmail-0.0.3/AUTHORS
+%doc newmail-0.0.3/ChangeLog
+%doc newmail-0.0.3/COPYING
+%doc newmail-0.0.3/NEWS
+%doc newmail-0.0.3/README
+%{_libdir}/sylpheed-claws/plugins/newmail.so
+
+%files notification
+%defattr(-,root,root,-)
+%doc notification_plugin-0.1/AUTHORS
+%doc notification_plugin-0.1/ChangeLog
+%doc notification_plugin-0.1/COPYING
+%doc notification_plugin-0.1/README
+%{_libdir}/sylpheed-claws/plugins/notification_plugin.so
+
 %files perl
 %defattr(-,root,root,-)
-%doc perl_plugin-0.6/AUTHORS
-%doc perl_plugin-0.6/ChangeLog
-%doc perl_plugin-0.6/COPYING
-%doc perl_plugin-0.6/README
-%doc perl_plugin-0.6/sc_perl.pod
+%doc perl_plugin-0.9/AUTHORS
+%doc perl_plugin-0.9/ChangeLog
+%doc perl_plugin-0.9/COPYING
+%doc perl_plugin-0.9/README
+%doc perl_plugin-0.9/sc_perl.pod
 %{_libdir}/sylpheed-claws/plugins/perl_plugin.so
 
 %files rssyl
 %defattr(-,root,root,-)
-%doc rssyl-0.4pre/AUTHORS
-%doc rssyl-0.4pre/ChangeLog
-%doc rssyl-0.4pre/COPYING
-%doc rssyl-0.4pre/TODO
+%doc rssyl-0.4cvs6/AUTHORS
+%doc rssyl-0.4cvs6/ChangeLog
+%doc rssyl-0.4cvs6/COPYING
+%doc rssyl-0.4cvs6/TODO
 %{_libdir}/sylpheed-claws/plugins/rssyl*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/rssyl.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/rssyl.mo
@@ -343,21 +453,28 @@
 %lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/rssyl.mo
 %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/rssyl.mo
 
+%files smime
+%defattr(-,root,root,-)
+%doc smime-0.5/ChangeLog
+%doc smime-0.5/COPYING
+%doc smime-0.5/NEWS
+%{_libdir}/sylpheed-claws/plugins/smime.so
+
 %files synce
 %defattr(-,root,root,-)
-%doc synce_plugin-0.4/AUTHORS
-%doc synce_plugin-0.4/ChangeLog
-%doc synce_plugin-0.4/COPYING
-%doc synce_plugin-0.4/README
+%doc synce_plugin-0.6/AUTHORS
+%doc synce_plugin-0.6/ChangeLog
+%doc synce_plugin-0.6/COPYING
+%doc synce_plugin-0.6/README
 %{_libdir}/sylpheed-claws/plugins/synce*
 
 %files vcalendar
 %defattr(-,root,root,-)
-%doc vcalendar-1.29/AUTHORS
-%doc vcalendar-1.29/ChangeLog
-%doc vcalendar-1.29/COPYING
-%doc vcalendar-1.29/README
-%{_libdir}/sylpheed-claws/plugins/vcalendar.so
+%doc vcalendar-1.71/AUTHORS
+%doc vcalendar-1.71/ChangeLog
+%doc vcalendar-1.71/COPYING
+%doc vcalendar-1.71/README
+%{_libdir}/sylpheed-claws/plugins/vcalendar*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/vcalendar.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/vcalendar.mo
 %lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/vcalendar.mo
@@ -370,6 +487,10 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Sat Apr 08 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.1.0-1
+- version upgrade
+
 * Fri Feb 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.0.0-2
 - Rebuild for Fedora Extras 5



From fedora-extras-commits at redhat.com  Sat Apr 22 00:34:34 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 17:34:34 -0700
Subject: rpms/sylpheed-claws-plugins/FC-4 sylpheed-claws-plugins-smime.patch,
	NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 sylpheed-claws-plugins.spec, 1.8, 1.9
Message-ID: <200604220034.k3M0YadC031606@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-serv31472/FC-4

Modified Files:
	.cvsignore sources sylpheed-claws-plugins.spec 
Added Files:
	sylpheed-claws-plugins-smime.patch 
Log Message:
- version upgrade


sylpheed-claws-plugins-smime.patch:

--- NEW FILE sylpheed-claws-plugins-smime.patch ---
--- smime-0.5/configure.ac.orig	2006-04-17 11:29:30.000000000 +0200
+++ smime-0.5/configure.ac	2006-04-17 11:29:53.000000000 +0200
@@ -41,7 +41,7 @@
 fi
 
 dnl check for sylpheed-claws
-PKG_CHECK_MODULES(SYLPHEED_CLAWS, sylpheed-claws >= 2.1.0.1)
+PKG_CHECK_MODULES(SYLPHEED_CLAWS, sylpheed-claws >= 2.1.0.0)
 SYLPHEED_CLAWS_PLUGINDIR=$( $PKG_CONFIG --variable=plugindir sylpheed-claws )
 AC_SUBST(SYLPHEED_CLAWS_CFLAGS)
 AC_SUBST(SYLPHEED_CLAWS_LIBS)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Feb 2006 09:51:34 -0000	1.4
+++ .cvsignore	22 Apr 2006 00:34:34 -0000	1.5
@@ -1 +1 @@
-sylpheed-claws-extra-plugins-2.0.0.tar.bz2
+sylpheed-claws-extra-plugins-2.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Feb 2006 09:51:34 -0000	1.4
+++ sources	22 Apr 2006 00:34:34 -0000	1.5
@@ -1 +1 @@
-77fe8e71f12c6f6ae1dfe9d55ab3d7d4  sylpheed-claws-extra-plugins-2.0.0.tar.bz2
+c15f7bd52ebed8c9c9163c8a8e593c5d  sylpheed-claws-extra-plugins-2.1.0.tar.bz2


Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-4/sylpheed-claws-plugins.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sylpheed-claws-plugins.spec	3 Feb 2006 11:24:50 -0000	1.8
+++ sylpheed-claws-plugins.spec	22 Apr 2006 00:34:34 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           sylpheed-claws-plugins
-Version:        2.0.0
+Version:        2.1.0
 Release:        1%{?dist}
 Summary:        Additional plugins for sylpheed-claws
 
@@ -7,6 +7,7 @@
 License:        GPL
 URL:            http://claws.sylpheed.org
 Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-extra-plugins-%{version}.tar.bz2
+Patch0:         sylpheed-claws-plugins-smime.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  sylpheed-claws-devel >= %{version}
@@ -17,18 +18,29 @@
 BuildRequires:  synce-devel
 BuildRequires:  curl-devel
 BuildRequires:  libxml2-devel
+BuildRequires:  gtkhtml2-devel
+BuildRequires:  libidn-devel
 
 Requires:       %{name}-acpi-notifier = %{version}-%{release}
 Requires:       %{name}-att-remover = %{version}-%{release}
 Requires:       %{name}-cachesaver = %{version}-%{release}
 Requires:       %{name}-etpan-privacy = %{version}-%{release}
 Requires:       %{name}-fetchinfo = %{version}-%{release}
+Requires:       %{name}-gtkhtml2-viewer = %{version}-%{release}
 Requires:       %{name}-maildir = %{version}-%{release}
 Requires:       %{name}-mailmbox = %{version}-%{release}
+Requires:       %{name}-newmail = %{version}-%{release}
+Requires:       %{name}-notification = %{version}-%{release}
 Requires:       %{name}-perl = %{version}-%{release}
 Requires:       %{name}-rssyl = %{version}-%{release}
+Requires:       %{name}-smime = %{version}-%{release}
 Requires:       %{name}-synce = %{version}-%{release}
 Requires:       %{name}-vcalendar = %{version}-%{release}
+# and the ones from main sylpheed-package...
+Requires:       %{name}-clamav
+Requires:       %{name}-dillo
+Requires:       %{name}-spamassassin
+Requires:       %{name}-pgp
 
 %description
 Additional plugins for sylpheed-claws
@@ -49,7 +61,6 @@
 %description att-remover
 %{summary}
 
-
 %package cachesaver
 Summary:        A cache saving plugin
 Group:          Applications/Internet
@@ -77,6 +88,14 @@
 This plugin inserts headers containing some download information:
 UIDL, Sylpheeds account name, POP server, user ID and retrieval time.
 
+%package gtkhtml2-viewer
+Summary:        GTK Html Viewer
+Group:          Applications/Internet
+Requires:       sylpheed-claws >= %{version}
+
+%description gtkhtml2-viewer
+%{summary}
+
 %package maildir
 Summary:        Provide direct access to Maildir++ Mailboxes
 Group:          Applications/Internet
@@ -96,6 +115,24 @@
 %description mailmbox
 This plugin provides direct support for mailboxes in mbox format.
 
+%package newmail
+Summary:        Write a msg header summary to a log file
+Group:          Applications/Internet
+Requires:       sylpheed-claws >= %{version}
+
+%description newmail
+Write a msg header summary to a log file (defaults to ~/Mail/NewLog) an arrival
+of new mail *after* sorting.
+
+%package notification
+Summary:        New mail notifications
+Group:          Applications/Internet
+Requires:       sylpheed-claws >= %{version}
+
+%description notification
+This plugin collects various ways to notify the user of new (and possibly unread)
+mail. Currently, a popup and a mail banner are implemented.
+
 %package perl
 Summary:        Extended filtering engine
 Group:          Applications/Internet
@@ -114,6 +151,15 @@
 %description rssyl
 %{summary}
 
+%package smime
+Summary:        S/MIME signed and/or encrypted
+Group:          Applications/Internet
+Requires:       sylpheed-claws >= %{version}
+
+%description smime
+This plugin handles S/MIME signed and/or encrypted mails. You can decrypt
+mails, verify signatures or sign and encrypt your own mails.
+
 %package synce
 Summary:        Keeping the addressbook of a Windows CE device in sync
 Group:          Applications/Internet
@@ -135,16 +181,17 @@
 
 %prep
 %setup -q -n sylpheed-claws-extra-plugins-%{version}
+%patch0
 
 %build
 
 #acpi_notifier
-cd acpi_notifier-0.8
+cd acpi_notifier-1.0
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #att_remover
-cd ../att_remover-0.4
+cd ../att_remover-1.0
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
@@ -159,49 +206,70 @@
 %{__make} %{?_smp_mflags}
 
 #fetchinfo-plugin
-cd ../fetchinfo-plugin-0.4.10
+cd ../fetchinfo-plugin-0.4.12
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
+#gtkhtml2-viewer
+cd ../gtkhtml2_viewer-0.8
+%configure --disable-static --disable-dependency-tracking --disable-rpath
+%{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
+
 #maildir
-cd ../maildir-0.19
+cd ../maildir-0.20
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #mailmbox
-cd ../mailmbox-1.10
+cd ../mailmbox-1.11
+%configure --disable-static --disable-dependency-tracking
+%{__make} %{?_smp_mflags}
+
+#newmail
+cd ../newmail-0.0.3
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
+#notification-plugin
+cd ../notification_plugin-0.1
+%configure --disable-static --disable-dependency-tracking
+%{__make} %{?_smp_mflags}
+
+
 #perl
-cd ../perl_plugin-0.6
+cd ../perl_plugin-0.9
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #rssyl
-cd ../rssyl-0.4pre
+cd ../rssyl-0.4cvs6
+%configure --disable-static --disable-dependency-tracking
+%{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
+
+#smime
+cd ../smime-0.5
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #synce
-cd ../synce_plugin-0.4
+cd ../synce_plugin-0.6
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #vcalendar
-cd ../vcalendar-1.29
+cd ../vcalendar-1.71
 %configure --disable-static --disable-dependency-tracking
-%{__make} %{?_smp_mflags}
+%{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 # acpi_notifier
-cd acpi_notifier-0.8
+cd acpi_notifier-1.0
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 # att_remover
-cd ../att_remover-0.4
+cd ../att_remover-1.0
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 # cachesaver
@@ -213,31 +281,47 @@
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #fetchinfo-plugin
-cd ../fetchinfo-plugin-0.4.10
+cd ../fetchinfo-plugin-0.4.12
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
+
+#gtkhtml2-viewer
+cd ../gtkhtml2_viewer-0.8
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #maildir
-cd ../maildir-0.19
+cd ../maildir-0.20
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #mailmbox
-cd ../mailmbox-1.10
+cd ../mailmbox-1.11
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
+
+#newmail
+cd ../newmail-0.0.3
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
+
+#notification-plugin
+cd ../notification_plugin-0.1
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #perl
-cd ../perl_plugin-0.6
+cd ../perl_plugin-0.9
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #rssyl
-cd ../rssyl-0.4pre
+cd ../rssyl-0.4cvs6
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
+
+#smime
+cd ../smime-0.5
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #synce
-cd ../synce_plugin-0.4
+cd ../synce_plugin-0.6
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #vcalendar
-cd ../vcalendar-1.29
+cd ../vcalendar-1.71
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
@@ -251,11 +335,11 @@
 
 %files acpi-notifier
 %defattr(-,root,root,-)
-%doc acpi_notifier-0.8/ChangeLog
-%doc acpi_notifier-0.8/COPYING
-%doc acpi_notifier-0.8/NEWS
-%doc acpi_notifier-0.8/AUTHORS
-%doc acpi_notifier-0.8/README
+%doc acpi_notifier-1.0/ChangeLog
+%doc acpi_notifier-1.0/COPYING
+%doc acpi_notifier-1.0/NEWS
+%doc acpi_notifier-1.0/AUTHORS
+%doc acpi_notifier-1.0/README
 %{_libdir}/sylpheed-claws/plugins/acpi_notifier*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/acpi_notifier.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/acpi_notifier.mo
@@ -270,11 +354,11 @@
 
 %files att-remover
 %defattr(-,root,root,-)
-%doc att_remover-0.4/AUTHORS
-%doc att_remover-0.4/ChangeLog
-%doc att_remover-0.4/COPYING
-%doc att_remover-0.4/NEWS
-%doc att_remover-0.4/README
+%doc att_remover-1.0/AUTHORS
+%doc att_remover-1.0/ChangeLog
+%doc att_remover-1.0/COPYING
+%doc att_remover-1.0/NEWS
+%doc att_remover-1.0/README
 %{_libdir}/sylpheed-claws/plugins/att_remover*
 
 %files cachesaver
@@ -294,43 +378,69 @@
 
 %files fetchinfo
 %defattr(-,root,root,-)
-%doc fetchinfo-plugin-0.4.10/ChangeLog
-%doc fetchinfo-plugin-0.4.10/COPYING
-%doc fetchinfo-plugin-0.4.10/README
+%doc fetchinfo-plugin-0.4.12/ChangeLog
+%doc fetchinfo-plugin-0.4.12/COPYING
+%doc fetchinfo-plugin-0.4.12/README
 %{_libdir}/sylpheed-claws/plugins/fetchinfo*
 
+%files gtkhtml2-viewer
+%defattr(-,root,root,-)
+%doc gtkhtml2_viewer-0.8/AUTHORS
+%doc gtkhtml2_viewer-0.8/COPYING
+%{_libdir}/sylpheed-claws/plugins/gtkhtml2_viewer*
+%lang(es) %{_datadir}/locale/es/LC_MESSAGES/gtkhtml2_viewer.mo
+%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/gtkhtml2_viewer.mo
+
+
 %files maildir
 %defattr(-,root,root,-)
-%doc maildir-0.19/AUTHORS
-%doc maildir-0.19/ChangeLog
-%doc maildir-0.19/COPYING
-%doc maildir-0.19/README
-%doc maildir-0.19/doc/README.xml
+%doc maildir-0.20/AUTHORS
+%doc maildir-0.20/ChangeLog
+%doc maildir-0.20/COPYING
+%doc maildir-0.20/README
+%doc maildir-0.20/doc/README.xml
 %{_libdir}/sylpheed-claws/plugins/maildir*
 
 %files mailmbox
 %defattr(-,root,root,-)
-%doc mailmbox-1.10/AUTHORS
-%doc mailmbox-1.10/ChangeLog
-%doc mailmbox-1.10/COPYING
-%doc mailmbox-1.10/README
+%doc mailmbox-1.11/AUTHORS
+%doc mailmbox-1.11/ChangeLog
+%doc mailmbox-1.11/COPYING
+%doc mailmbox-1.11/README
 %{_libdir}/sylpheed-claws/plugins/mailmbox*
 
+%files newmail
+%defattr(-,root,root,-)
+%doc newmail-0.0.3/AUTHORS
+%doc newmail-0.0.3/ChangeLog
+%doc newmail-0.0.3/COPYING
+%doc newmail-0.0.3/NEWS
+%doc newmail-0.0.3/README
+%{_libdir}/sylpheed-claws/plugins/newmail.so
+
+%files notification
+%defattr(-,root,root,-)
+%doc notification_plugin-0.1/AUTHORS
+%doc notification_plugin-0.1/ChangeLog
+%doc notification_plugin-0.1/COPYING
+%doc notification_plugin-0.1/README
+%{_libdir}/sylpheed-claws/plugins/notification_plugin.so
+
 %files perl
 %defattr(-,root,root,-)
-%doc perl_plugin-0.6/AUTHORS
-%doc perl_plugin-0.6/ChangeLog
-%doc perl_plugin-0.6/COPYING
-%doc perl_plugin-0.6/README
-%doc perl_plugin-0.6/sc_perl.pod
+%doc perl_plugin-0.9/AUTHORS
+%doc perl_plugin-0.9/ChangeLog
+%doc perl_plugin-0.9/COPYING
+%doc perl_plugin-0.9/README
+%doc perl_plugin-0.9/sc_perl.pod
 %{_libdir}/sylpheed-claws/plugins/perl_plugin.so
 
 %files rssyl
 %defattr(-,root,root,-)
-%doc rssyl-0.4pre/AUTHORS
-%doc rssyl-0.4pre/ChangeLog
-%doc rssyl-0.4pre/COPYING
-%doc rssyl-0.4pre/TODO
+%doc rssyl-0.4cvs6/AUTHORS
+%doc rssyl-0.4cvs6/ChangeLog
+%doc rssyl-0.4cvs6/COPYING
+%doc rssyl-0.4cvs6/TODO
 %{_libdir}/sylpheed-claws/plugins/rssyl*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/rssyl.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/rssyl.mo
@@ -343,21 +453,28 @@
 %lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/rssyl.mo
 %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/rssyl.mo
 
+%files smime
+%defattr(-,root,root,-)
+%doc smime-0.5/ChangeLog
+%doc smime-0.5/COPYING
+%doc smime-0.5/NEWS
+%{_libdir}/sylpheed-claws/plugins/smime.so
+
 %files synce
 %defattr(-,root,root,-)
-%doc synce_plugin-0.4/AUTHORS
-%doc synce_plugin-0.4/ChangeLog
-%doc synce_plugin-0.4/COPYING
-%doc synce_plugin-0.4/README
+%doc synce_plugin-0.6/AUTHORS
+%doc synce_plugin-0.6/ChangeLog
+%doc synce_plugin-0.6/COPYING
+%doc synce_plugin-0.6/README
 %{_libdir}/sylpheed-claws/plugins/synce*
 
 %files vcalendar
 %defattr(-,root,root,-)
-%doc vcalendar-1.29/AUTHORS
-%doc vcalendar-1.29/ChangeLog
-%doc vcalendar-1.29/COPYING
-%doc vcalendar-1.29/README
-%{_libdir}/sylpheed-claws/plugins/vcalendar.so
+%doc vcalendar-1.71/AUTHORS
+%doc vcalendar-1.71/ChangeLog
+%doc vcalendar-1.71/COPYING
+%doc vcalendar-1.71/README
+%{_libdir}/sylpheed-claws/plugins/vcalendar*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/vcalendar.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/vcalendar.mo
 %lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/vcalendar.mo
@@ -370,6 +487,14 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Sat Apr 08 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.1.0-1
+- version upgrade
+
+* Fri Feb 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.0.0-2
+- Rebuild for Fedora Extras 5
+
 * Fri Feb 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.0.0-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Apr 22 00:34:35 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 17:34:35 -0700
Subject: rpms/sylpheed-claws-plugins/FC-5 sylpheed-claws-plugins-smime.patch,
	NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 sylpheed-claws-plugins.spec, 1.9, 1.10
Message-ID: <200604220034.k3M0Yb6n031614@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-serv31472/FC-5

Modified Files:
	.cvsignore sources sylpheed-claws-plugins.spec 
Added Files:
	sylpheed-claws-plugins-smime.patch 
Log Message:
- version upgrade


sylpheed-claws-plugins-smime.patch:

--- NEW FILE sylpheed-claws-plugins-smime.patch ---
--- smime-0.5/configure.ac.orig	2006-04-17 11:29:30.000000000 +0200
+++ smime-0.5/configure.ac	2006-04-17 11:29:53.000000000 +0200
@@ -41,7 +41,7 @@
 fi
 
 dnl check for sylpheed-claws
-PKG_CHECK_MODULES(SYLPHEED_CLAWS, sylpheed-claws >= 2.1.0.1)
+PKG_CHECK_MODULES(SYLPHEED_CLAWS, sylpheed-claws >= 2.1.0.0)
 SYLPHEED_CLAWS_PLUGINDIR=$( $PKG_CONFIG --variable=plugindir sylpheed-claws )
 AC_SUBST(SYLPHEED_CLAWS_CFLAGS)
 AC_SUBST(SYLPHEED_CLAWS_LIBS)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Feb 2006 09:51:40 -0000	1.4
+++ .cvsignore	22 Apr 2006 00:34:35 -0000	1.5
@@ -1 +1 @@
-sylpheed-claws-extra-plugins-2.0.0.tar.bz2
+sylpheed-claws-extra-plugins-2.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Feb 2006 09:51:40 -0000	1.4
+++ sources	22 Apr 2006 00:34:35 -0000	1.5
@@ -1 +1 @@
-77fe8e71f12c6f6ae1dfe9d55ab3d7d4  sylpheed-claws-extra-plugins-2.0.0.tar.bz2
+c15f7bd52ebed8c9c9163c8a8e593c5d  sylpheed-claws-extra-plugins-2.1.0.tar.bz2


Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-5/sylpheed-claws-plugins.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sylpheed-claws-plugins.spec	17 Feb 2006 08:03:31 -0000	1.9
+++ sylpheed-claws-plugins.spec	22 Apr 2006 00:34:35 -0000	1.10
@@ -1,12 +1,13 @@
 Name:           sylpheed-claws-plugins
-Version:        2.0.0
-Release:        2%{?dist}
+Version:        2.1.0
+Release:        1%{?dist}
 Summary:        Additional plugins for sylpheed-claws
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
 Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-extra-plugins-%{version}.tar.bz2
+Patch0:         sylpheed-claws-plugins-smime.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  sylpheed-claws-devel >= %{version}
@@ -17,18 +18,29 @@
 BuildRequires:  synce-devel
 BuildRequires:  curl-devel
 BuildRequires:  libxml2-devel
+BuildRequires:  gtkhtml2-devel
+BuildRequires:  libidn-devel
 
 Requires:       %{name}-acpi-notifier = %{version}-%{release}
 Requires:       %{name}-att-remover = %{version}-%{release}
 Requires:       %{name}-cachesaver = %{version}-%{release}
 Requires:       %{name}-etpan-privacy = %{version}-%{release}
 Requires:       %{name}-fetchinfo = %{version}-%{release}
+Requires:       %{name}-gtkhtml2-viewer = %{version}-%{release}
 Requires:       %{name}-maildir = %{version}-%{release}
 Requires:       %{name}-mailmbox = %{version}-%{release}
+Requires:       %{name}-newmail = %{version}-%{release}
+Requires:       %{name}-notification = %{version}-%{release}
 Requires:       %{name}-perl = %{version}-%{release}
 Requires:       %{name}-rssyl = %{version}-%{release}
+Requires:       %{name}-smime = %{version}-%{release}
 Requires:       %{name}-synce = %{version}-%{release}
 Requires:       %{name}-vcalendar = %{version}-%{release}
+# and the ones from main sylpheed-package...
+Requires:       %{name}-clamav
+Requires:       %{name}-dillo
+Requires:       %{name}-spamassassin
+Requires:       %{name}-pgp
 
 %description
 Additional plugins for sylpheed-claws
@@ -49,7 +61,6 @@
 %description att-remover
 %{summary}
 
-
 %package cachesaver
 Summary:        A cache saving plugin
 Group:          Applications/Internet
@@ -77,6 +88,14 @@
 This plugin inserts headers containing some download information:
 UIDL, Sylpheeds account name, POP server, user ID and retrieval time.
 
+%package gtkhtml2-viewer
+Summary:        GTK Html Viewer
+Group:          Applications/Internet
+Requires:       sylpheed-claws >= %{version}
+
+%description gtkhtml2-viewer
+%{summary}
+
 %package maildir
 Summary:        Provide direct access to Maildir++ Mailboxes
 Group:          Applications/Internet
@@ -96,6 +115,24 @@
 %description mailmbox
 This plugin provides direct support for mailboxes in mbox format.
 
+%package newmail
+Summary:        Write a msg header summary to a log file
+Group:          Applications/Internet
+Requires:       sylpheed-claws >= %{version}
+
+%description newmail
+Write a msg header summary to a log file (defaults to ~/Mail/NewLog) an arrival
+of new mail *after* sorting.
+
+%package notification
+Summary:        New mail notifications
+Group:          Applications/Internet
+Requires:       sylpheed-claws >= %{version}
+
+%description notification
+This plugin collects various ways to notify the user of new (and possibly unread)
+mail. Currently, a popup and a mail banner are implemented.
+
 %package perl
 Summary:        Extended filtering engine
 Group:          Applications/Internet
@@ -114,6 +151,15 @@
 %description rssyl
 %{summary}
 
+%package smime
+Summary:        S/MIME signed and/or encrypted
+Group:          Applications/Internet
+Requires:       sylpheed-claws >= %{version}
+
+%description smime
+This plugin handles S/MIME signed and/or encrypted mails. You can decrypt
+mails, verify signatures or sign and encrypt your own mails.
+
 %package synce
 Summary:        Keeping the addressbook of a Windows CE device in sync
 Group:          Applications/Internet
@@ -135,16 +181,17 @@
 
 %prep
 %setup -q -n sylpheed-claws-extra-plugins-%{version}
+%patch0
 
 %build
 
 #acpi_notifier
-cd acpi_notifier-0.8
+cd acpi_notifier-1.0
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #att_remover
-cd ../att_remover-0.4
+cd ../att_remover-1.0
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
@@ -159,49 +206,70 @@
 %{__make} %{?_smp_mflags}
 
 #fetchinfo-plugin
-cd ../fetchinfo-plugin-0.4.10
+cd ../fetchinfo-plugin-0.4.12
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
+#gtkhtml2-viewer
+cd ../gtkhtml2_viewer-0.8
+%configure --disable-static --disable-dependency-tracking --disable-rpath
+%{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
+
 #maildir
-cd ../maildir-0.19
+cd ../maildir-0.20
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #mailmbox
-cd ../mailmbox-1.10
+cd ../mailmbox-1.11
+%configure --disable-static --disable-dependency-tracking
+%{__make} %{?_smp_mflags}
+
+#newmail
+cd ../newmail-0.0.3
+%configure --disable-static --disable-dependency-tracking
+%{__make} %{?_smp_mflags}
+
+#notification-plugin
+cd ../notification_plugin-0.1
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
+
 #perl
-cd ../perl_plugin-0.6
+cd ../perl_plugin-0.9
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #rssyl
-cd ../rssyl-0.4pre
+cd ../rssyl-0.4cvs6
+%configure --disable-static --disable-dependency-tracking
+%{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
+
+#smime
+cd ../smime-0.5
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #synce
-cd ../synce_plugin-0.4
+cd ../synce_plugin-0.6
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #vcalendar
-cd ../vcalendar-1.29
+cd ../vcalendar-1.71
 %configure --disable-static --disable-dependency-tracking
-%{__make} %{?_smp_mflags}
+%{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 # acpi_notifier
-cd acpi_notifier-0.8
+cd acpi_notifier-1.0
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 # att_remover
-cd ../att_remover-0.4
+cd ../att_remover-1.0
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 # cachesaver
@@ -213,31 +281,47 @@
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #fetchinfo-plugin
-cd ../fetchinfo-plugin-0.4.10
+cd ../fetchinfo-plugin-0.4.12
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
+
+#gtkhtml2-viewer
+cd ../gtkhtml2_viewer-0.8
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #maildir
-cd ../maildir-0.19
+cd ../maildir-0.20
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #mailmbox
-cd ../mailmbox-1.10
+cd ../mailmbox-1.11
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
+
+#newmail
+cd ../newmail-0.0.3
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
+
+#notification-plugin
+cd ../notification_plugin-0.1
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #perl
-cd ../perl_plugin-0.6
+cd ../perl_plugin-0.9
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #rssyl
-cd ../rssyl-0.4pre
+cd ../rssyl-0.4cvs6
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
+
+#smime
+cd ../smime-0.5
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #synce
-cd ../synce_plugin-0.4
+cd ../synce_plugin-0.6
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #vcalendar
-cd ../vcalendar-1.29
+cd ../vcalendar-1.71
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
@@ -251,11 +335,11 @@
 
 %files acpi-notifier
 %defattr(-,root,root,-)
-%doc acpi_notifier-0.8/ChangeLog
-%doc acpi_notifier-0.8/COPYING
-%doc acpi_notifier-0.8/NEWS
-%doc acpi_notifier-0.8/AUTHORS
-%doc acpi_notifier-0.8/README
+%doc acpi_notifier-1.0/ChangeLog
+%doc acpi_notifier-1.0/COPYING
+%doc acpi_notifier-1.0/NEWS
+%doc acpi_notifier-1.0/AUTHORS
+%doc acpi_notifier-1.0/README
 %{_libdir}/sylpheed-claws/plugins/acpi_notifier*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/acpi_notifier.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/acpi_notifier.mo
@@ -270,11 +354,11 @@
 
 %files att-remover
 %defattr(-,root,root,-)
-%doc att_remover-0.4/AUTHORS
-%doc att_remover-0.4/ChangeLog
-%doc att_remover-0.4/COPYING
-%doc att_remover-0.4/NEWS
-%doc att_remover-0.4/README
+%doc att_remover-1.0/AUTHORS
+%doc att_remover-1.0/ChangeLog
+%doc att_remover-1.0/COPYING
+%doc att_remover-1.0/NEWS
+%doc att_remover-1.0/README
 %{_libdir}/sylpheed-claws/plugins/att_remover*
 
 %files cachesaver
@@ -294,43 +378,69 @@
 
 %files fetchinfo
 %defattr(-,root,root,-)
-%doc fetchinfo-plugin-0.4.10/ChangeLog
-%doc fetchinfo-plugin-0.4.10/COPYING
-%doc fetchinfo-plugin-0.4.10/README
+%doc fetchinfo-plugin-0.4.12/ChangeLog
+%doc fetchinfo-plugin-0.4.12/COPYING
+%doc fetchinfo-plugin-0.4.12/README
 %{_libdir}/sylpheed-claws/plugins/fetchinfo*
 
+%files gtkhtml2-viewer
+%defattr(-,root,root,-)
+%doc gtkhtml2_viewer-0.8/AUTHORS
+%doc gtkhtml2_viewer-0.8/COPYING
+%{_libdir}/sylpheed-claws/plugins/gtkhtml2_viewer*
+%lang(es) %{_datadir}/locale/es/LC_MESSAGES/gtkhtml2_viewer.mo
+%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/gtkhtml2_viewer.mo
+
+
 %files maildir
 %defattr(-,root,root,-)
-%doc maildir-0.19/AUTHORS
-%doc maildir-0.19/ChangeLog
-%doc maildir-0.19/COPYING
-%doc maildir-0.19/README
-%doc maildir-0.19/doc/README.xml
+%doc maildir-0.20/AUTHORS
+%doc maildir-0.20/ChangeLog
+%doc maildir-0.20/COPYING
+%doc maildir-0.20/README
+%doc maildir-0.20/doc/README.xml
 %{_libdir}/sylpheed-claws/plugins/maildir*
 
 %files mailmbox
 %defattr(-,root,root,-)
-%doc mailmbox-1.10/AUTHORS
-%doc mailmbox-1.10/ChangeLog
-%doc mailmbox-1.10/COPYING
-%doc mailmbox-1.10/README
+%doc mailmbox-1.11/AUTHORS
+%doc mailmbox-1.11/ChangeLog
+%doc mailmbox-1.11/COPYING
+%doc mailmbox-1.11/README
 %{_libdir}/sylpheed-claws/plugins/mailmbox*
 
+%files newmail
+%defattr(-,root,root,-)
+%doc newmail-0.0.3/AUTHORS
+%doc newmail-0.0.3/ChangeLog
+%doc newmail-0.0.3/COPYING
+%doc newmail-0.0.3/NEWS
+%doc newmail-0.0.3/README
+%{_libdir}/sylpheed-claws/plugins/newmail.so
+
+%files notification
+%defattr(-,root,root,-)
+%doc notification_plugin-0.1/AUTHORS
+%doc notification_plugin-0.1/ChangeLog
+%doc notification_plugin-0.1/COPYING
+%doc notification_plugin-0.1/README
+%{_libdir}/sylpheed-claws/plugins/notification_plugin.so
+
 %files perl
 %defattr(-,root,root,-)
-%doc perl_plugin-0.6/AUTHORS
-%doc perl_plugin-0.6/ChangeLog
-%doc perl_plugin-0.6/COPYING
-%doc perl_plugin-0.6/README
-%doc perl_plugin-0.6/sc_perl.pod
+%doc perl_plugin-0.9/AUTHORS
+%doc perl_plugin-0.9/ChangeLog
+%doc perl_plugin-0.9/COPYING
+%doc perl_plugin-0.9/README
+%doc perl_plugin-0.9/sc_perl.pod
 %{_libdir}/sylpheed-claws/plugins/perl_plugin.so
 
 %files rssyl
 %defattr(-,root,root,-)
-%doc rssyl-0.4pre/AUTHORS
-%doc rssyl-0.4pre/ChangeLog
-%doc rssyl-0.4pre/COPYING
-%doc rssyl-0.4pre/TODO
+%doc rssyl-0.4cvs6/AUTHORS
+%doc rssyl-0.4cvs6/ChangeLog
+%doc rssyl-0.4cvs6/COPYING
+%doc rssyl-0.4cvs6/TODO
 %{_libdir}/sylpheed-claws/plugins/rssyl*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/rssyl.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/rssyl.mo
@@ -343,21 +453,28 @@
 %lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/rssyl.mo
 %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/rssyl.mo
 
+%files smime
+%defattr(-,root,root,-)
+%doc smime-0.5/ChangeLog
+%doc smime-0.5/COPYING
+%doc smime-0.5/NEWS
+%{_libdir}/sylpheed-claws/plugins/smime.so
+
 %files synce
 %defattr(-,root,root,-)
-%doc synce_plugin-0.4/AUTHORS
-%doc synce_plugin-0.4/ChangeLog
-%doc synce_plugin-0.4/COPYING
-%doc synce_plugin-0.4/README
+%doc synce_plugin-0.6/AUTHORS
+%doc synce_plugin-0.6/ChangeLog
+%doc synce_plugin-0.6/COPYING
+%doc synce_plugin-0.6/README
 %{_libdir}/sylpheed-claws/plugins/synce*
 
 %files vcalendar
 %defattr(-,root,root,-)
-%doc vcalendar-1.29/AUTHORS
-%doc vcalendar-1.29/ChangeLog
-%doc vcalendar-1.29/COPYING
-%doc vcalendar-1.29/README
-%{_libdir}/sylpheed-claws/plugins/vcalendar.so
+%doc vcalendar-1.71/AUTHORS
+%doc vcalendar-1.71/ChangeLog
+%doc vcalendar-1.71/COPYING
+%doc vcalendar-1.71/README
+%{_libdir}/sylpheed-claws/plugins/vcalendar*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/vcalendar.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/vcalendar.mo
 %lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/vcalendar.mo
@@ -370,6 +487,10 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Sat Apr 08 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.1.0-1
+- version upgrade
+
 * Fri Feb 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.0.0-2
 - Rebuild for Fedora Extras 5



From fedora-extras-commits at redhat.com  Sat Apr 22 00:58:52 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 17:58:52 -0700
Subject: rpms/sylpheed-claws-plugins/FC-5 sylpheed-claws-plugins.spec, 1.10, 
	1.11
Message-ID: <200604220059.k3M0xO5G031818@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-serv31777/FC-5

Modified Files:
	sylpheed-claws-plugins.spec 
Log Message:
- add libtool



Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-5/sylpheed-claws-plugins.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sylpheed-claws-plugins.spec	22 Apr 2006 00:34:35 -0000	1.10
+++ sylpheed-claws-plugins.spec	22 Apr 2006 00:58:51 -0000	1.11
@@ -20,6 +20,7 @@
 BuildRequires:  libxml2-devel
 BuildRequires:  gtkhtml2-devel
 BuildRequires:  libidn-devel
+BuildRequires:  libtool
 
 Requires:       %{name}-acpi-notifier = %{version}-%{release}
 Requires:       %{name}-att-remover = %{version}-%{release}



From fedora-extras-commits at redhat.com  Sat Apr 22 00:58:52 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 17:58:52 -0700
Subject: rpms/sylpheed-claws-plugins/devel sylpheed-claws-plugins.spec, 1.10,
	1.11
Message-ID: <200604220059.k3M0xOYG031821@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-serv31777/devel

Modified Files:
	sylpheed-claws-plugins.spec 
Log Message:
- add libtool



Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/sylpheed-claws-plugins.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sylpheed-claws-plugins.spec	22 Apr 2006 00:34:35 -0000	1.10
+++ sylpheed-claws-plugins.spec	22 Apr 2006 00:58:52 -0000	1.11
@@ -20,6 +20,7 @@
 BuildRequires:  libxml2-devel
 BuildRequires:  gtkhtml2-devel
 BuildRequires:  libidn-devel
+BuildRequires:  libtool
 
 Requires:       %{name}-acpi-notifier = %{version}-%{release}
 Requires:       %{name}-att-remover = %{version}-%{release}



From fedora-extras-commits at redhat.com  Sat Apr 22 01:17:50 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 18:17:50 -0700
Subject: rpms/sylpheed-claws-plugins/FC-5 sylpheed-claws-plugins.spec, 1.11, 
	1.12
Message-ID: <200604220118.k3M1IMCb001745@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-serv1709/FC-5

Modified Files:
	sylpheed-claws-plugins.spec 
Log Message:
- add gpgme BR



Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-5/sylpheed-claws-plugins.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sylpheed-claws-plugins.spec	22 Apr 2006 00:58:51 -0000	1.11
+++ sylpheed-claws-plugins.spec	22 Apr 2006 01:17:50 -0000	1.12
@@ -21,6 +21,7 @@
 BuildRequires:  gtkhtml2-devel
 BuildRequires:  libidn-devel
 BuildRequires:  libtool
+BuildRequires:  gpgme-devel
 
 Requires:       %{name}-acpi-notifier = %{version}-%{release}
 Requires:       %{name}-att-remover = %{version}-%{release}



From fedora-extras-commits at redhat.com  Sat Apr 22 01:17:51 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 18:17:51 -0700
Subject: rpms/sylpheed-claws-plugins/devel sylpheed-claws-plugins.spec, 1.11,
	1.12
Message-ID: <200604220118.k3M1IN20001748@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-serv1709/devel

Modified Files:
	sylpheed-claws-plugins.spec 
Log Message:
- add gpgme BR



Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/sylpheed-claws-plugins.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sylpheed-claws-plugins.spec	22 Apr 2006 00:58:52 -0000	1.11
+++ sylpheed-claws-plugins.spec	22 Apr 2006 01:17:51 -0000	1.12
@@ -21,6 +21,7 @@
 BuildRequires:  gtkhtml2-devel
 BuildRequires:  libidn-devel
 BuildRequires:  libtool
+BuildRequires:  gpgme-devel
 
 Requires:       %{name}-acpi-notifier = %{version}-%{release}
 Requires:       %{name}-att-remover = %{version}-%{release}



From fedora-extras-commits at redhat.com  Sat Apr 22 01:20:55 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Fri, 21 Apr 2006 18:20:55 -0700
Subject: rpms/hugs98/devel hugs98.spec,1.1,1.2
Message-ID: <200604220120.k3M1KvBd001842@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/hugs98/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1823

Modified Files:
	hugs98.spec 
Log Message:
use hugs_ver to specify tarball too



Index: hugs98.spec
===================================================================
RCS file: /cvs/extras/rpms/hugs98/devel/hugs98.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hugs98.spec	21 Apr 2006 08:25:46 -0000	1.1
+++ hugs98.spec	22 Apr 2006 01:20:55 -0000	1.2
@@ -8,7 +8,7 @@
 Group:		Development/Languages
 License:	BSD
 URL:		http://www.haskell.org/hugs
-Source0:	http://cvs.haskell.org/Hugs/downloads/Mar2005/hugs98-Mar2005-patched.tar.gz
+Source0:	http://cvs.haskell.org/Hugs/downloads/Mar2005/%{name}-%{hugs_ver}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	docbook-utils



From fedora-extras-commits at redhat.com  Sat Apr 22 01:24:55 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 18:24:55 -0700
Subject: rpms/koffice-langpack/FC-4 .cvsignore, 1.3,
	1.4 koffice-langpack.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200604220125.k3M1PRgF002026@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-serv1971/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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Oct 2005 09:54:50 -0000	1.3
+++ .cvsignore	22 Apr 2006 01:24:55 -0000	1.4
@@ -1,29 +1,48 @@
-koffice-l10n-bg-1.4.2.tar.bz2
-koffice-l10n-ca-1.4.2.tar.bz2
-koffice-l10n-cs-1.4.2.tar.bz2
-koffice-l10n-cy-1.4.2.tar.bz2
-koffice-l10n-da-1.4.2.tar.bz2
-koffice-l10n-de-1.4.2.tar.bz2
-koffice-l10n-el-1.4.2.tar.bz2
-koffice-l10n-en_GB-1.4.2.tar.bz2
-koffice-l10n-es-1.4.2.tar.bz2
-koffice-l10n-et-1.4.2.tar.bz2
-koffice-l10n-eu-1.4.2.tar.bz2
-koffice-l10n-fi-1.4.2.tar.bz2
-koffice-l10n-nb-1.4.2.tar.bz2
-koffice-l10n-nl-1.4.2.tar.bz2
-koffice-l10n-nn-1.4.2.tar.bz2
-koffice-l10n-pl-1.4.2.tar.bz2
-koffice-l10n-pt-1.4.2.tar.bz2
-koffice-l10n-pt_BR-1.4.2.tar.bz2
-koffice-l10n-ru-1.4.2.tar.bz2
-koffice-l10n-sl-1.4.2.tar.bz2
-koffice-l10n-sr-1.4.2.tar.bz2
-koffice-l10n-sr at Latn-1.4.2.tar.bz2
-koffice-l10n-sv-1.4.2.tar.bz2
-koffice-l10n-ta-1.4.2.tar.bz2
-koffice-l10n-tg-1.4.2.tar.bz2
-koffice-l10n-zh_CN-1.4.2.tar.bz2
-koffice-l10n-fr-1.4.2.tar.bz2
-koffice-l10n-hu-1.4.2.tar.bz2
-koffice-l10n-it-1.4.2.tar.bz2
+
+koffice-l10n-af-1.5.0.tar.bz2
+koffice-l10n-ar-1.5.0.tar.bz2
+koffice-l10n-bg-1.5.0.tar.bz2
+koffice-l10n-br-1.5.0.tar.bz2
+koffice-l10n-bs-1.5.0.tar.bz2
+koffice-l10n-ca-1.5.0.tar.bz2
+koffice-l10n-cs-1.5.0.tar.bz2
+koffice-l10n-cy-1.5.0.tar.bz2
+koffice-l10n-da-1.5.0.tar.bz2
+koffice-l10n-de-1.5.0.tar.bz2
+koffice-l10n-el-1.5.0.tar.bz2
+koffice-l10n-en_GB-1.5.0.tar.bz2
+koffice-l10n-eo-1.5.0.tar.bz2
+koffice-l10n-es-1.5.0.tar.bz2
+koffice-l10n-et-1.5.0.tar.bz2
+koffice-l10n-eu-1.5.0.tar.bz2
+koffice-l10n-fi-1.5.0.tar.bz2
+koffice-l10n-fr-1.5.0.tar.bz2
+koffice-l10n-ga-1.5.0.tar.bz2
+koffice-l10n-he-1.5.0.tar.bz2
+koffice-l10n-hi-1.5.0.tar.bz2
+koffice-l10n-hu-1.5.0.tar.bz2
+koffice-l10n-is-1.5.0.tar.bz2
+koffice-l10n-it-1.5.0.tar.bz2
+koffice-l10n-ja-1.5.0.tar.bz2
+koffice-l10n-lt-1.5.0.tar.bz2
+koffice-l10n-mk-1.5.0.tar.bz2
+koffice-l10n-nb-1.5.0.tar.bz2
+koffice-l10n-nl-1.5.0.tar.bz2
+koffice-l10n-nn-1.5.0.tar.bz2
+koffice-l10n-pl-1.5.0.tar.bz2
+koffice-l10n-pt-1.5.0.tar.bz2
+koffice-l10n-pt_BR-1.5.0.tar.bz2
+koffice-l10n-ro-1.5.0.tar.bz2
+koffice-l10n-ru-1.5.0.tar.bz2
+koffice-l10n-se-1.5.0.tar.bz2
+koffice-l10n-sk-1.5.0.tar.bz2
+koffice-l10n-sl-1.5.0.tar.bz2
+koffice-l10n-sr-1.5.0.tar.bz2
+koffice-l10n-sr at Latn-1.5.0.tar.bz2
+koffice-l10n-sv-1.5.0.tar.bz2
+koffice-l10n-ta-1.5.0.tar.bz2
+koffice-l10n-tg-1.5.0.tar.bz2
+koffice-l10n-tr-1.5.0.tar.bz2
+koffice-l10n-uk-1.5.0.tar.bz2
+koffice-l10n-uz-1.5.0.tar.bz2
+koffice-l10n-zh_CN-1.5.0.tar.bz2


Index: koffice-langpack.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice-langpack/FC-4/koffice-langpack.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- koffice-langpack.spec	15 Oct 2005 09:54:50 -0000	1.3
+++ koffice-langpack.spec	22 Apr 2006 01:24:55 -0000	1.4
@@ -1,40 +1,59 @@
 Name:           koffice-langpack
-Version:        1.4.2
+Version:        1.5.0
 Release:        1%{?dist}
 Summary:        Language files for koffice
 
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://www.koffice.org
-Source0:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-bg-1.4.2.tar.bz2
-Source1:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-ca-1.4.2.tar.bz2
-Source2:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-cs-1.4.2.tar.bz2
-Source3:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-cy-1.4.2.tar.bz2
-Source4:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-da-1.4.2.tar.bz2
-Source5:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-de-1.4.2.tar.bz2
-Source6:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-el-1.4.2.tar.bz2
-Source7:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-en_GB-1.4.2.tar.bz2
-Source8:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-es-1.4.2.tar.bz2
-Source9:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-et-1.4.2.tar.bz2
-Source10:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-fi-1.4.2.tar.bz2 
-Source11:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-fr-1.4.2.tar.bz2
-Source12:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-hu-1.4.2.tar.bz2
-Source13:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-it-1.4.2.tar.bz2
-Source14:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-nb-1.4.2.tar.bz2
-Source15:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-nl-1.4.2.tar.bz2
-Source16:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-nn-1.4.2.tar.bz2
-Source17:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-pl-1.4.2.tar.bz2
-Source18:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-pt_BR-1.4.2.tar.bz2
-Source19:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-pt-1.4.2.tar.bz2
-Source20:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-ru-1.4.2.tar.bz2
-Source21:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-sl-1.4.2.tar.bz2
-Source22:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-sr at Latn-1.4.2.tar.bz2
-Source23:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-sr-1.4.2.tar.bz2
-Source24:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-sv-1.4.2.tar.bz2
-Source25:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-ta-1.4.2.tar.bz2
-Source26:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-tg-1.4.2.tar.bz2
-Source27:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-zh_CN-1.4.2.tar.bz2
-Source28:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-eu-1.4.2.tar.bz2
+Source0:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-af-1.5.0.tar.bz2
+Source1:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ar-1.5.0.tar.bz2
+Source2:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-bg-1.5.0.tar.bz2
+Source3:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-br-1.5.0.tar.bz2
+Source4:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-bs-1.5.0.tar.bz2
+Source5:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ca-1.5.0.tar.bz2
+Source6:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-cs-1.5.0.tar.bz2
+Source7:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-cy-1.5.0.tar.bz2
+Source8:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-da-1.5.0.tar.bz2
+Source9:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-de-1.5.0.tar.bz2
+Source10:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-el-1.5.0.tar.bz2
+Source11:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-en_GB-1.5.0.tar.bz2
+Source12:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-eo-1.5.0.tar.bz2
+Source13:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-es-1.5.0.tar.bz2
+Source14:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-et-1.5.0.tar.bz2
+Source15:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-eu-1.5.0.tar.bz2
+Source16:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-fi-1.5.0.tar.bz2
+Source17:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-fr-1.5.0.tar.bz2
+Source18:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ga-1.5.0.tar.bz2
+Source19:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-he-1.5.0.tar.bz2
+Source20:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-hi-1.5.0.tar.bz2
+Source21:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-hu-1.5.0.tar.bz2
+Source22:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-is-1.5.0.tar.bz2
+Source23:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-it-1.5.0.tar.bz2
+Source24:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ja-1.5.0.tar.bz2
+Source25:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-lt-1.5.0.tar.bz2
+Source26:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-mk-1.5.0.tar.bz2
+Source27:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-nb-1.5.0.tar.bz2
+Source28:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-nl-1.5.0.tar.bz2
+Source29:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-nn-1.5.0.tar.bz2
+Source30:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-pl-1.5.0.tar.bz2
+Source31:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-pt-1.5.0.tar.bz2
+Source32:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-pt_BR-1.5.0.tar.bz2
+Source33:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ro-1.5.0.tar.bz2
+Source34:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ru-1.5.0.tar.bz2
+Source35:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-se-1.5.0.tar.bz2
+Source36:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sk-1.5.0.tar.bz2
+Source37:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sl-1.5.0.tar.bz2
+Source38:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sr-1.5.0.tar.bz2
+Source39:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sr at Latn-1.5.0.tar.bz2
+Source40:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sv-1.5.0.tar.bz2
+Source41:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ta-1.5.0.tar.bz2
+Source42:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-tg-1.5.0.tar.bz2
+Source43:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-tr-1.5.0.tar.bz2
+Source44:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-uk-1.5.0.tar.bz2
+Source45:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-uz-1.5.0.tar.bz2
+Source46:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-zh_CN-1.5.0.tar.bz2
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -45,6 +64,39 @@
 %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 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
@@ -93,6 +145,14 @@
 %description de
 Provides additional german translations for koffice
 
+%package eo
+Summary:        Esperanto language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%description eo
+Provides additional esperanto translations for koffice
+
 %package el
 Summary:        Greek language pack for koffice
 Group:          Applications/Productivity
@@ -143,7 +203,6 @@
 %description fi
 Provides additional finish translations for koffice
 
-
 %package fr
 Summary:        French language pack for koffice
 Group:          Applications/Productivity
@@ -152,6 +211,30 @@
 %description fr
 Provides additional french translations for koffice
 
+%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 hi
+Provides additional hindi translations for koffice
+
 %package hu
 Summary:        Hungarian language pack for koffice
 Group:          Applications/Productivity
@@ -160,13 +243,45 @@
 %description hu
 Provides additional hungarian translations for koffice
 
+%package is
+Summary:        Icelandic language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%description is
+Provides additional icelandic translations for koffice
+
 %package it
 Summary:        Italian language pack for koffice
 Group:          Applications/Productivity
 Requires:       koffice-core >= %{version}
 
 %description it
-Provides additional italian translations for koffic
+Provides additional italian translations for koffice
+
+%package ja
+Summary:        Japanese language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%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}
+
+%description mk
+Provides additional macedonian translations for koffice
 
 %package nb
 Summary:        Bokmal language pack for koffice
@@ -224,6 +339,29 @@
 %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}
+
+%description se
+Provides additional northern sami translations for koffice
+
+%package sk
+Summary:        Slovak language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%description sk
+Provides additional slovak translations for koffice
+
 %package sl
 Summary:        Slovenian language pack for koffice
 Group:          Applications/Productivity
@@ -272,6 +410,22 @@
 %description tg
 Provides additional tajik translations for koffice
 
+%package tr
+Summary:        Turkish language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%description tr
+Provides additional turkish translations for koffice
+
+%package uk
+Summary:        Ukrainian language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%description uk
+Provides additional ukrainian translations for koffice
+
 %package zh_CN
 Summary:        Simplified Chinese language pack for koffice
 Group:          Applications/Productivity
@@ -313,10 +467,30 @@
 %{__tar} xjvf %{SOURCE26}
 %{__tar} xjvf %{SOURCE27}
 %{__tar} xjvf %{SOURCE28}
+%{__tar} xjvf %{SOURCE29}
+%{__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}
 
 %build
-for lang in bg ca cs cy da de el en_GB es et eu fi fr hu it nb nl nn pl pt pt_BR \
-ru sl sr sr at Latn sv ta tg zh_CN; do
+# 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 nb nl nn pl pt pt_BR ro ru se sk sl sr \
+sr at Latn sv ta tg tr uk zh_CN; do
     cd %{_builddir}/%{name}-%{version}/koffice-l10n-$lang-%{version}
     %configure
     make %{?_smp_mflags}
@@ -325,8 +499,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-for lang in bg ca cs cy da de el en_GB es et eu fi fr hu it nb nl nn pl pt pt_BR \
-ru sl sr sr at Latn sv ta tg zh_CN; do
+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 nb nl nn pl pt pt_BR ro ru se sk sl sr \
+sr at Latn sv ta tg tr uk zh_CN; do
     cd %{_builddir}/%{name}-%{version}/koffice-l10n-$lang-%{version}
     make install DESTDIR=$RPM_BUILD_ROOT
 done
@@ -351,10 +526,26 @@
 %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
@@ -388,6 +579,10 @@
 %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/*
@@ -413,17 +608,45 @@
 %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
+%defattr(-,root,root,-)
+%lang(lt) %{_datadir}/locale/lt/LC_MESSAGES/*
+
+%files mk
+%defattr(-,root,root,-)
+%lang(mk) %{_datadir}/locale/mk/LC_MESSAGES/*
+
 %files nb
 %defattr(-,root,root,-)
 %lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/*
@@ -451,12 +674,26 @@
 %defattr(-,root,root,-)
 %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/*
+%lang(sk) %{_datadir}/doc/HTML/sk/*
+%lang(sk) %{_datadir}/apps/koffice/autocorrect/sk.xml
+
 %files sl
 %defattr(-,root,root,-)
 %lang(sl) %{_datadir}/locale/sl/LC_MESSAGES/*
@@ -483,11 +720,27 @@
 %defattr(-,root,root,-)
 %lang(tg) %{_datadir}/locale/tg/LC_MESSAGES/*
 
+%files tr
+%defattr(-,root,root,-)
+%lang(tr) %{_datadir}/locale/tr/LC_MESSAGES/*
+
+%files uk
+%defattr(-,root,root,-)
+%lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/*
+
 %files zh_CN
 %defattr(-,root,root,-)
 %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/*
 
 %changelog
+* Sat Apr 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.5.0-1
+- version upgrade
+
+* Wed Feb 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.4.2-2
+- Rebuild for Fedora Extras 5
+
 * Sat Oct 15 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.4.2-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice-langpack/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Oct 2005 09:54:50 -0000	1.3
+++ sources	22 Apr 2006 01:24:55 -0000	1.4
@@ -1,29 +1,48 @@
-ad980947860046ca4d5e0c8b23b7d3ab  koffice-l10n-bg-1.4.2.tar.bz2
-8a546eec2897af073bb564edf7150b6d  koffice-l10n-ca-1.4.2.tar.bz2
-58e6c355e478ab459e6f0a5c86662f36  koffice-l10n-cs-1.4.2.tar.bz2
-ed0c069797a89680d49bd396f80e94e1  koffice-l10n-cy-1.4.2.tar.bz2
-f6c3b0afcb299519f0663aa5a3ff3362  koffice-l10n-da-1.4.2.tar.bz2
-2659e56e079bfdd133833a39497f80e6  koffice-l10n-de-1.4.2.tar.bz2
-1aa341393b7ade4037ddeed77c73cacf  koffice-l10n-el-1.4.2.tar.bz2
-caf59bd82ac94ccbeaa4b907c218defa  koffice-l10n-en_GB-1.4.2.tar.bz2
-0f429120c8b27d1208f020a353aeb88d  koffice-l10n-es-1.4.2.tar.bz2
-1ac8201573602a69e7d00b3332cb3bec  koffice-l10n-et-1.4.2.tar.bz2
-f8417721a49dd23f20115e102b0a8204  koffice-l10n-eu-1.4.2.tar.bz2
-b4925a3bd6db8b6b787b0313e3695371  koffice-l10n-fi-1.4.2.tar.bz2
-9d8c327b3e6567d90258cec8b0694a2c  koffice-l10n-nb-1.4.2.tar.bz2
-6328a285565add97cd55413e52541050  koffice-l10n-nl-1.4.2.tar.bz2
-2e52095b2c9c879e101d274888d49fcc  koffice-l10n-nn-1.4.2.tar.bz2
-78337154a7183cda46d34f80c6bf23e5  koffice-l10n-pl-1.4.2.tar.bz2
-61e11d48f788275389f0b75e75b8de2b  koffice-l10n-pt-1.4.2.tar.bz2
-a559487f91f9bdf7eaf608f5d88c67c1  koffice-l10n-pt_BR-1.4.2.tar.bz2
-a1527f53ed16ceed8c295614eedf7deb  koffice-l10n-ru-1.4.2.tar.bz2
-6d85c8b3f84b892471fd3cadd00aba37  koffice-l10n-sl-1.4.2.tar.bz2
-97d0fa5fdb458bbe5c8ef5317e15ed5c  koffice-l10n-sr-1.4.2.tar.bz2
-65e7e7939b3d538913ddcec261741f75  koffice-l10n-sr at Latn-1.4.2.tar.bz2
-897218187ef83afcd99406b62e352e69  koffice-l10n-sv-1.4.2.tar.bz2
-2c55f413ec8e02a667e37d967186dc86  koffice-l10n-ta-1.4.2.tar.bz2
-c10cd70d7f1a9a397f768002625ad6f9  koffice-l10n-tg-1.4.2.tar.bz2
-5733aa59661f8828c66ef0d2335d4242  koffice-l10n-zh_CN-1.4.2.tar.bz2
-5f4e1d1f360a14e4ca2d24d2d85bf061  koffice-l10n-fr-1.4.2.tar.bz2
-ba83bf5a84f1ae5e7b22c1611c89e8bd  koffice-l10n-hu-1.4.2.tar.bz2
-62609f289dc1ed216c7d075045159a04  koffice-l10n-it-1.4.2.tar.bz2
+
+03217f2f39b1a21cc685a5aa85200247  koffice-l10n-af-1.5.0.tar.bz2
+922cdc3f2de8d350deaf54c32feab117  koffice-l10n-ar-1.5.0.tar.bz2
+5e24b5028de337c2cbda323fa69d56f2  koffice-l10n-bg-1.5.0.tar.bz2
+4c5c9d834f14defd87c5580092002e51  koffice-l10n-br-1.5.0.tar.bz2
+6086121e25b243d7b5543dc15ebaf3ee  koffice-l10n-bs-1.5.0.tar.bz2
+cc24df3b6d3899b89776e2d2cabb3eb5  koffice-l10n-ca-1.5.0.tar.bz2
+193f7d66d9b5c945932ee9868721f9f1  koffice-l10n-cs-1.5.0.tar.bz2
+14c6069119fb491e6b430d6663e3a60f  koffice-l10n-cy-1.5.0.tar.bz2
+fedd3f7c0c39a40940576fb86d7262f0  koffice-l10n-da-1.5.0.tar.bz2
+fe3334c31472b006907f59f47db6cb75  koffice-l10n-de-1.5.0.tar.bz2
+d7384ecf60617aa054ec3ded25cff1ea  koffice-l10n-el-1.5.0.tar.bz2
+5f00c66613f2250babd4cb02590952df  koffice-l10n-en_GB-1.5.0.tar.bz2
+79d73a7d8e5a284e1c997cbec6bc804c  koffice-l10n-eo-1.5.0.tar.bz2
+0abef42c4ea3a0992b69933ad1e94287  koffice-l10n-es-1.5.0.tar.bz2
+149ba841f9dc322336b9c153b598dea5  koffice-l10n-et-1.5.0.tar.bz2
+af2a4e93887cd55ba0cda123362650d7  koffice-l10n-eu-1.5.0.tar.bz2
+e87c44fc8c7b10c4c44c76d90cb1ca7c  koffice-l10n-fi-1.5.0.tar.bz2
+65b9b6fd7903050c4c170af11aa94fb2  koffice-l10n-fr-1.5.0.tar.bz2
+47b453c7444e404c19cc8dc85cf56d37  koffice-l10n-ga-1.5.0.tar.bz2
+1d0810b08947f072631615ffa3260bec  koffice-l10n-he-1.5.0.tar.bz2
+82231d5c7e273d0384d04e80be228167  koffice-l10n-hi-1.5.0.tar.bz2
+9c1d2441a49eaf06a6adac3f61590076  koffice-l10n-hu-1.5.0.tar.bz2
+3fc01e0a34d0ce9a2988ef30df638f62  koffice-l10n-is-1.5.0.tar.bz2
+db8b9a1bb5114e69c3768508c09bde8d  koffice-l10n-it-1.5.0.tar.bz2
+16435cf9fd545529bea61010fb35ad03  koffice-l10n-ja-1.5.0.tar.bz2
+c306e0bfdccd60fd9f11e93828475fac  koffice-l10n-lt-1.5.0.tar.bz2
+b0469b72436e35a1101ee9ea4e981ae3  koffice-l10n-mk-1.5.0.tar.bz2
+8cffcf181366737bea12a1ae9a14c294  koffice-l10n-nb-1.5.0.tar.bz2
+f4bfc5952a2612c72443d266df034e7d  koffice-l10n-nl-1.5.0.tar.bz2
+bb3444c52bcbc33aaaad542454048c69  koffice-l10n-nn-1.5.0.tar.bz2
+442946625f984e8eb9f977c39a57749d  koffice-l10n-pl-1.5.0.tar.bz2
+285b5766d9955de0fd7c2599b25115ab  koffice-l10n-pt-1.5.0.tar.bz2
+41373317668d2d7cbc20e4a5a188daf6  koffice-l10n-pt_BR-1.5.0.tar.bz2
+35fb855cb7c18b95a11602a7c8483d2d  koffice-l10n-ro-1.5.0.tar.bz2
+f5842b78af8ba903129942dfa7f6d7d4  koffice-l10n-ru-1.5.0.tar.bz2
+d153416b1403f7e4cf8a03b5739ab6a9  koffice-l10n-se-1.5.0.tar.bz2
+400b547e0520fe769594d4f39c3ec769  koffice-l10n-sk-1.5.0.tar.bz2
+7e73b04ed5952631efa8ef9ed216ce3d  koffice-l10n-sl-1.5.0.tar.bz2
+5b7f01f22ae97c8983411b043c41a689  koffice-l10n-sr-1.5.0.tar.bz2
+5bafc53a3c3b4f863fd28fc9f0a090f9  koffice-l10n-sr at Latn-1.5.0.tar.bz2
+810dd9311472f1e60f90c9fdfcc6c84c  koffice-l10n-sv-1.5.0.tar.bz2
+2991caa710ad20da8925331a51026498  koffice-l10n-ta-1.5.0.tar.bz2
+3c9f50e64cc892cfcb840c424b2940e4  koffice-l10n-tg-1.5.0.tar.bz2
+411466bf3f0f7340431f2f6448332a89  koffice-l10n-tr-1.5.0.tar.bz2
+8e3294a78b9beab5122703d61d2e9a2c  koffice-l10n-uk-1.5.0.tar.bz2
+ace68fe74216fb0a57024fb3b750fdaf  koffice-l10n-uz-1.5.0.tar.bz2
+3b15bc617451461f9911ad316a264005  koffice-l10n-zh_CN-1.5.0.tar.bz2



From fedora-extras-commits at redhat.com  Sat Apr 22 01:24:55 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 18:24:55 -0700
Subject: rpms/koffice-langpack/FC-5 .cvsignore, 1.3,
	1.4 koffice-langpack.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200604220125.k3M1PR98002033@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-serv1971/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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Oct 2005 09:54:51 -0000	1.3
+++ .cvsignore	22 Apr 2006 01:24:55 -0000	1.4
@@ -1,29 +1,48 @@
-koffice-l10n-bg-1.4.2.tar.bz2
-koffice-l10n-ca-1.4.2.tar.bz2
-koffice-l10n-cs-1.4.2.tar.bz2
-koffice-l10n-cy-1.4.2.tar.bz2
-koffice-l10n-da-1.4.2.tar.bz2
-koffice-l10n-de-1.4.2.tar.bz2
-koffice-l10n-el-1.4.2.tar.bz2
-koffice-l10n-en_GB-1.4.2.tar.bz2
-koffice-l10n-es-1.4.2.tar.bz2
-koffice-l10n-et-1.4.2.tar.bz2
-koffice-l10n-eu-1.4.2.tar.bz2
-koffice-l10n-fi-1.4.2.tar.bz2
-koffice-l10n-nb-1.4.2.tar.bz2
-koffice-l10n-nl-1.4.2.tar.bz2
-koffice-l10n-nn-1.4.2.tar.bz2
-koffice-l10n-pl-1.4.2.tar.bz2
-koffice-l10n-pt-1.4.2.tar.bz2
-koffice-l10n-pt_BR-1.4.2.tar.bz2
-koffice-l10n-ru-1.4.2.tar.bz2
-koffice-l10n-sl-1.4.2.tar.bz2
-koffice-l10n-sr-1.4.2.tar.bz2
-koffice-l10n-sr at Latn-1.4.2.tar.bz2
-koffice-l10n-sv-1.4.2.tar.bz2
-koffice-l10n-ta-1.4.2.tar.bz2
-koffice-l10n-tg-1.4.2.tar.bz2
-koffice-l10n-zh_CN-1.4.2.tar.bz2
-koffice-l10n-fr-1.4.2.tar.bz2
-koffice-l10n-hu-1.4.2.tar.bz2
-koffice-l10n-it-1.4.2.tar.bz2
+
+koffice-l10n-af-1.5.0.tar.bz2
+koffice-l10n-ar-1.5.0.tar.bz2
+koffice-l10n-bg-1.5.0.tar.bz2
+koffice-l10n-br-1.5.0.tar.bz2
+koffice-l10n-bs-1.5.0.tar.bz2
+koffice-l10n-ca-1.5.0.tar.bz2
+koffice-l10n-cs-1.5.0.tar.bz2
+koffice-l10n-cy-1.5.0.tar.bz2
+koffice-l10n-da-1.5.0.tar.bz2
+koffice-l10n-de-1.5.0.tar.bz2
+koffice-l10n-el-1.5.0.tar.bz2
+koffice-l10n-en_GB-1.5.0.tar.bz2
+koffice-l10n-eo-1.5.0.tar.bz2
+koffice-l10n-es-1.5.0.tar.bz2
+koffice-l10n-et-1.5.0.tar.bz2
+koffice-l10n-eu-1.5.0.tar.bz2
+koffice-l10n-fi-1.5.0.tar.bz2
+koffice-l10n-fr-1.5.0.tar.bz2
+koffice-l10n-ga-1.5.0.tar.bz2
+koffice-l10n-he-1.5.0.tar.bz2
+koffice-l10n-hi-1.5.0.tar.bz2
+koffice-l10n-hu-1.5.0.tar.bz2
+koffice-l10n-is-1.5.0.tar.bz2
+koffice-l10n-it-1.5.0.tar.bz2
+koffice-l10n-ja-1.5.0.tar.bz2
+koffice-l10n-lt-1.5.0.tar.bz2
+koffice-l10n-mk-1.5.0.tar.bz2
+koffice-l10n-nb-1.5.0.tar.bz2
+koffice-l10n-nl-1.5.0.tar.bz2
+koffice-l10n-nn-1.5.0.tar.bz2
+koffice-l10n-pl-1.5.0.tar.bz2
+koffice-l10n-pt-1.5.0.tar.bz2
+koffice-l10n-pt_BR-1.5.0.tar.bz2
+koffice-l10n-ro-1.5.0.tar.bz2
+koffice-l10n-ru-1.5.0.tar.bz2
+koffice-l10n-se-1.5.0.tar.bz2
+koffice-l10n-sk-1.5.0.tar.bz2
+koffice-l10n-sl-1.5.0.tar.bz2
+koffice-l10n-sr-1.5.0.tar.bz2
+koffice-l10n-sr at Latn-1.5.0.tar.bz2
+koffice-l10n-sv-1.5.0.tar.bz2
+koffice-l10n-ta-1.5.0.tar.bz2
+koffice-l10n-tg-1.5.0.tar.bz2
+koffice-l10n-tr-1.5.0.tar.bz2
+koffice-l10n-uk-1.5.0.tar.bz2
+koffice-l10n-uz-1.5.0.tar.bz2
+koffice-l10n-zh_CN-1.5.0.tar.bz2


Index: koffice-langpack.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice-langpack/FC-5/koffice-langpack.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- koffice-langpack.spec	15 Feb 2006 08:27:47 -0000	1.4
+++ koffice-langpack.spec	22 Apr 2006 01:24:55 -0000	1.5
@@ -1,40 +1,59 @@
 Name:           koffice-langpack
-Version:        1.4.2
-Release:        2%{?dist}
+Version:        1.5.0
+Release:        1%{?dist}
 Summary:        Language files for koffice
 
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://www.koffice.org
-Source0:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-bg-1.4.2.tar.bz2
-Source1:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-ca-1.4.2.tar.bz2
-Source2:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-cs-1.4.2.tar.bz2
-Source3:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-cy-1.4.2.tar.bz2
-Source4:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-da-1.4.2.tar.bz2
-Source5:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-de-1.4.2.tar.bz2
-Source6:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-el-1.4.2.tar.bz2
-Source7:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-en_GB-1.4.2.tar.bz2
-Source8:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-es-1.4.2.tar.bz2
-Source9:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-et-1.4.2.tar.bz2
-Source10:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-fi-1.4.2.tar.bz2 
-Source11:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-fr-1.4.2.tar.bz2
-Source12:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-hu-1.4.2.tar.bz2
-Source13:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-it-1.4.2.tar.bz2
-Source14:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-nb-1.4.2.tar.bz2
-Source15:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-nl-1.4.2.tar.bz2
-Source16:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-nn-1.4.2.tar.bz2
-Source17:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-pl-1.4.2.tar.bz2
-Source18:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-pt_BR-1.4.2.tar.bz2
-Source19:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-pt-1.4.2.tar.bz2
-Source20:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-ru-1.4.2.tar.bz2
-Source21:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-sl-1.4.2.tar.bz2
-Source22:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-sr at Latn-1.4.2.tar.bz2
-Source23:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-sr-1.4.2.tar.bz2
-Source24:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-sv-1.4.2.tar.bz2
-Source25:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-ta-1.4.2.tar.bz2
-Source26:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-tg-1.4.2.tar.bz2
-Source27:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-zh_CN-1.4.2.tar.bz2
-Source28:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-eu-1.4.2.tar.bz2
+Source0:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-af-1.5.0.tar.bz2
+Source1:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ar-1.5.0.tar.bz2
+Source2:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-bg-1.5.0.tar.bz2
+Source3:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-br-1.5.0.tar.bz2
+Source4:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-bs-1.5.0.tar.bz2
+Source5:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ca-1.5.0.tar.bz2
+Source6:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-cs-1.5.0.tar.bz2
+Source7:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-cy-1.5.0.tar.bz2
+Source8:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-da-1.5.0.tar.bz2
+Source9:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-de-1.5.0.tar.bz2
+Source10:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-el-1.5.0.tar.bz2
+Source11:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-en_GB-1.5.0.tar.bz2
+Source12:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-eo-1.5.0.tar.bz2
+Source13:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-es-1.5.0.tar.bz2
+Source14:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-et-1.5.0.tar.bz2
+Source15:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-eu-1.5.0.tar.bz2
+Source16:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-fi-1.5.0.tar.bz2
+Source17:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-fr-1.5.0.tar.bz2
+Source18:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ga-1.5.0.tar.bz2
+Source19:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-he-1.5.0.tar.bz2
+Source20:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-hi-1.5.0.tar.bz2
+Source21:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-hu-1.5.0.tar.bz2
+Source22:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-is-1.5.0.tar.bz2
+Source23:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-it-1.5.0.tar.bz2
+Source24:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ja-1.5.0.tar.bz2
+Source25:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-lt-1.5.0.tar.bz2
+Source26:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-mk-1.5.0.tar.bz2
+Source27:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-nb-1.5.0.tar.bz2
+Source28:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-nl-1.5.0.tar.bz2
+Source29:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-nn-1.5.0.tar.bz2
+Source30:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-pl-1.5.0.tar.bz2
+Source31:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-pt-1.5.0.tar.bz2
+Source32:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-pt_BR-1.5.0.tar.bz2
+Source33:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ro-1.5.0.tar.bz2
+Source34:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ru-1.5.0.tar.bz2
+Source35:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-se-1.5.0.tar.bz2
+Source36:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sk-1.5.0.tar.bz2
+Source37:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sl-1.5.0.tar.bz2
+Source38:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sr-1.5.0.tar.bz2
+Source39:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sr at Latn-1.5.0.tar.bz2
+Source40:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sv-1.5.0.tar.bz2
+Source41:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ta-1.5.0.tar.bz2
+Source42:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-tg-1.5.0.tar.bz2
+Source43:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-tr-1.5.0.tar.bz2
+Source44:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-uk-1.5.0.tar.bz2
+Source45:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-uz-1.5.0.tar.bz2
+Source46:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-zh_CN-1.5.0.tar.bz2
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -45,6 +64,39 @@
 %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 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
@@ -93,6 +145,14 @@
 %description de
 Provides additional german translations for koffice
 
+%package eo
+Summary:        Esperanto language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%description eo
+Provides additional esperanto translations for koffice
+
 %package el
 Summary:        Greek language pack for koffice
 Group:          Applications/Productivity
@@ -143,7 +203,6 @@
 %description fi
 Provides additional finish translations for koffice
 
-
 %package fr
 Summary:        French language pack for koffice
 Group:          Applications/Productivity
@@ -152,6 +211,30 @@
 %description fr
 Provides additional french translations for koffice
 
+%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 hi
+Provides additional hindi translations for koffice
+
 %package hu
 Summary:        Hungarian language pack for koffice
 Group:          Applications/Productivity
@@ -160,13 +243,45 @@
 %description hu
 Provides additional hungarian translations for koffice
 
+%package is
+Summary:        Icelandic language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%description is
+Provides additional icelandic translations for koffice
+
 %package it
 Summary:        Italian language pack for koffice
 Group:          Applications/Productivity
 Requires:       koffice-core >= %{version}
 
 %description it
-Provides additional italian translations for koffic
+Provides additional italian translations for koffice
+
+%package ja
+Summary:        Japanese language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%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}
+
+%description mk
+Provides additional macedonian translations for koffice
 
 %package nb
 Summary:        Bokmal language pack for koffice
@@ -224,6 +339,29 @@
 %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}
+
+%description se
+Provides additional northern sami translations for koffice
+
+%package sk
+Summary:        Slovak language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%description sk
+Provides additional slovak translations for koffice
+
 %package sl
 Summary:        Slovenian language pack for koffice
 Group:          Applications/Productivity
@@ -272,6 +410,22 @@
 %description tg
 Provides additional tajik translations for koffice
 
+%package tr
+Summary:        Turkish language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%description tr
+Provides additional turkish translations for koffice
+
+%package uk
+Summary:        Ukrainian language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%description uk
+Provides additional ukrainian translations for koffice
+
 %package zh_CN
 Summary:        Simplified Chinese language pack for koffice
 Group:          Applications/Productivity
@@ -313,10 +467,30 @@
 %{__tar} xjvf %{SOURCE26}
 %{__tar} xjvf %{SOURCE27}
 %{__tar} xjvf %{SOURCE28}
+%{__tar} xjvf %{SOURCE29}
+%{__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}
 
 %build
-for lang in bg ca cs cy da de el en_GB es et eu fi fr hu it nb nl nn pl pt pt_BR \
-ru sl sr sr at Latn sv ta tg zh_CN; do
+# 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 nb nl nn pl pt pt_BR ro ru se sk sl sr \
+sr at Latn sv ta tg tr uk zh_CN; do
     cd %{_builddir}/%{name}-%{version}/koffice-l10n-$lang-%{version}
     %configure
     make %{?_smp_mflags}
@@ -325,8 +499,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-for lang in bg ca cs cy da de el en_GB es et eu fi fr hu it nb nl nn pl pt pt_BR \
-ru sl sr sr at Latn sv ta tg zh_CN; do
+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 nb nl nn pl pt pt_BR ro ru se sk sl sr \
+sr at Latn sv ta tg tr uk zh_CN; do
     cd %{_builddir}/%{name}-%{version}/koffice-l10n-$lang-%{version}
     make install DESTDIR=$RPM_BUILD_ROOT
 done
@@ -351,10 +526,26 @@
 %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
@@ -388,6 +579,10 @@
 %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/*
@@ -413,17 +608,45 @@
 %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
+%defattr(-,root,root,-)
+%lang(lt) %{_datadir}/locale/lt/LC_MESSAGES/*
+
+%files mk
+%defattr(-,root,root,-)
+%lang(mk) %{_datadir}/locale/mk/LC_MESSAGES/*
+
 %files nb
 %defattr(-,root,root,-)
 %lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/*
@@ -451,12 +674,26 @@
 %defattr(-,root,root,-)
 %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/*
+%lang(sk) %{_datadir}/doc/HTML/sk/*
+%lang(sk) %{_datadir}/apps/koffice/autocorrect/sk.xml
+
 %files sl
 %defattr(-,root,root,-)
 %lang(sl) %{_datadir}/locale/sl/LC_MESSAGES/*
@@ -483,11 +720,23 @@
 %defattr(-,root,root,-)
 %lang(tg) %{_datadir}/locale/tg/LC_MESSAGES/*
 
+%files tr
+%defattr(-,root,root,-)
+%lang(tr) %{_datadir}/locale/tr/LC_MESSAGES/*
+
+%files uk
+%defattr(-,root,root,-)
+%lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/*
+
 %files zh_CN
 %defattr(-,root,root,-)
 %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/*
 
 %changelog
+* Sat Apr 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.5.0-1
+- version upgrade
+
 * Wed Feb 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.4.2-2
 - Rebuild for Fedora Extras 5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice-langpack/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Oct 2005 09:54:51 -0000	1.3
+++ sources	22 Apr 2006 01:24:55 -0000	1.4
@@ -1,29 +1,48 @@
-ad980947860046ca4d5e0c8b23b7d3ab  koffice-l10n-bg-1.4.2.tar.bz2
-8a546eec2897af073bb564edf7150b6d  koffice-l10n-ca-1.4.2.tar.bz2
-58e6c355e478ab459e6f0a5c86662f36  koffice-l10n-cs-1.4.2.tar.bz2
-ed0c069797a89680d49bd396f80e94e1  koffice-l10n-cy-1.4.2.tar.bz2
-f6c3b0afcb299519f0663aa5a3ff3362  koffice-l10n-da-1.4.2.tar.bz2
-2659e56e079bfdd133833a39497f80e6  koffice-l10n-de-1.4.2.tar.bz2
-1aa341393b7ade4037ddeed77c73cacf  koffice-l10n-el-1.4.2.tar.bz2
-caf59bd82ac94ccbeaa4b907c218defa  koffice-l10n-en_GB-1.4.2.tar.bz2
-0f429120c8b27d1208f020a353aeb88d  koffice-l10n-es-1.4.2.tar.bz2
-1ac8201573602a69e7d00b3332cb3bec  koffice-l10n-et-1.4.2.tar.bz2
-f8417721a49dd23f20115e102b0a8204  koffice-l10n-eu-1.4.2.tar.bz2
-b4925a3bd6db8b6b787b0313e3695371  koffice-l10n-fi-1.4.2.tar.bz2
-9d8c327b3e6567d90258cec8b0694a2c  koffice-l10n-nb-1.4.2.tar.bz2
-6328a285565add97cd55413e52541050  koffice-l10n-nl-1.4.2.tar.bz2
-2e52095b2c9c879e101d274888d49fcc  koffice-l10n-nn-1.4.2.tar.bz2
-78337154a7183cda46d34f80c6bf23e5  koffice-l10n-pl-1.4.2.tar.bz2
-61e11d48f788275389f0b75e75b8de2b  koffice-l10n-pt-1.4.2.tar.bz2
-a559487f91f9bdf7eaf608f5d88c67c1  koffice-l10n-pt_BR-1.4.2.tar.bz2
-a1527f53ed16ceed8c295614eedf7deb  koffice-l10n-ru-1.4.2.tar.bz2
-6d85c8b3f84b892471fd3cadd00aba37  koffice-l10n-sl-1.4.2.tar.bz2
-97d0fa5fdb458bbe5c8ef5317e15ed5c  koffice-l10n-sr-1.4.2.tar.bz2
-65e7e7939b3d538913ddcec261741f75  koffice-l10n-sr at Latn-1.4.2.tar.bz2
-897218187ef83afcd99406b62e352e69  koffice-l10n-sv-1.4.2.tar.bz2
-2c55f413ec8e02a667e37d967186dc86  koffice-l10n-ta-1.4.2.tar.bz2
-c10cd70d7f1a9a397f768002625ad6f9  koffice-l10n-tg-1.4.2.tar.bz2
-5733aa59661f8828c66ef0d2335d4242  koffice-l10n-zh_CN-1.4.2.tar.bz2
-5f4e1d1f360a14e4ca2d24d2d85bf061  koffice-l10n-fr-1.4.2.tar.bz2
-ba83bf5a84f1ae5e7b22c1611c89e8bd  koffice-l10n-hu-1.4.2.tar.bz2
-62609f289dc1ed216c7d075045159a04  koffice-l10n-it-1.4.2.tar.bz2
+
+03217f2f39b1a21cc685a5aa85200247  koffice-l10n-af-1.5.0.tar.bz2
+922cdc3f2de8d350deaf54c32feab117  koffice-l10n-ar-1.5.0.tar.bz2
+5e24b5028de337c2cbda323fa69d56f2  koffice-l10n-bg-1.5.0.tar.bz2
+4c5c9d834f14defd87c5580092002e51  koffice-l10n-br-1.5.0.tar.bz2
+6086121e25b243d7b5543dc15ebaf3ee  koffice-l10n-bs-1.5.0.tar.bz2
+cc24df3b6d3899b89776e2d2cabb3eb5  koffice-l10n-ca-1.5.0.tar.bz2
+193f7d66d9b5c945932ee9868721f9f1  koffice-l10n-cs-1.5.0.tar.bz2
+14c6069119fb491e6b430d6663e3a60f  koffice-l10n-cy-1.5.0.tar.bz2
+fedd3f7c0c39a40940576fb86d7262f0  koffice-l10n-da-1.5.0.tar.bz2
+fe3334c31472b006907f59f47db6cb75  koffice-l10n-de-1.5.0.tar.bz2
+d7384ecf60617aa054ec3ded25cff1ea  koffice-l10n-el-1.5.0.tar.bz2
+5f00c66613f2250babd4cb02590952df  koffice-l10n-en_GB-1.5.0.tar.bz2
+79d73a7d8e5a284e1c997cbec6bc804c  koffice-l10n-eo-1.5.0.tar.bz2
+0abef42c4ea3a0992b69933ad1e94287  koffice-l10n-es-1.5.0.tar.bz2
+149ba841f9dc322336b9c153b598dea5  koffice-l10n-et-1.5.0.tar.bz2
+af2a4e93887cd55ba0cda123362650d7  koffice-l10n-eu-1.5.0.tar.bz2
+e87c44fc8c7b10c4c44c76d90cb1ca7c  koffice-l10n-fi-1.5.0.tar.bz2
+65b9b6fd7903050c4c170af11aa94fb2  koffice-l10n-fr-1.5.0.tar.bz2
+47b453c7444e404c19cc8dc85cf56d37  koffice-l10n-ga-1.5.0.tar.bz2
+1d0810b08947f072631615ffa3260bec  koffice-l10n-he-1.5.0.tar.bz2
+82231d5c7e273d0384d04e80be228167  koffice-l10n-hi-1.5.0.tar.bz2
+9c1d2441a49eaf06a6adac3f61590076  koffice-l10n-hu-1.5.0.tar.bz2
+3fc01e0a34d0ce9a2988ef30df638f62  koffice-l10n-is-1.5.0.tar.bz2
+db8b9a1bb5114e69c3768508c09bde8d  koffice-l10n-it-1.5.0.tar.bz2
+16435cf9fd545529bea61010fb35ad03  koffice-l10n-ja-1.5.0.tar.bz2
+c306e0bfdccd60fd9f11e93828475fac  koffice-l10n-lt-1.5.0.tar.bz2
+b0469b72436e35a1101ee9ea4e981ae3  koffice-l10n-mk-1.5.0.tar.bz2
+8cffcf181366737bea12a1ae9a14c294  koffice-l10n-nb-1.5.0.tar.bz2
+f4bfc5952a2612c72443d266df034e7d  koffice-l10n-nl-1.5.0.tar.bz2
+bb3444c52bcbc33aaaad542454048c69  koffice-l10n-nn-1.5.0.tar.bz2
+442946625f984e8eb9f977c39a57749d  koffice-l10n-pl-1.5.0.tar.bz2
+285b5766d9955de0fd7c2599b25115ab  koffice-l10n-pt-1.5.0.tar.bz2
+41373317668d2d7cbc20e4a5a188daf6  koffice-l10n-pt_BR-1.5.0.tar.bz2
+35fb855cb7c18b95a11602a7c8483d2d  koffice-l10n-ro-1.5.0.tar.bz2
+f5842b78af8ba903129942dfa7f6d7d4  koffice-l10n-ru-1.5.0.tar.bz2
+d153416b1403f7e4cf8a03b5739ab6a9  koffice-l10n-se-1.5.0.tar.bz2
+400b547e0520fe769594d4f39c3ec769  koffice-l10n-sk-1.5.0.tar.bz2
+7e73b04ed5952631efa8ef9ed216ce3d  koffice-l10n-sl-1.5.0.tar.bz2
+5b7f01f22ae97c8983411b043c41a689  koffice-l10n-sr-1.5.0.tar.bz2
+5bafc53a3c3b4f863fd28fc9f0a090f9  koffice-l10n-sr at Latn-1.5.0.tar.bz2
+810dd9311472f1e60f90c9fdfcc6c84c  koffice-l10n-sv-1.5.0.tar.bz2
+2991caa710ad20da8925331a51026498  koffice-l10n-ta-1.5.0.tar.bz2
+3c9f50e64cc892cfcb840c424b2940e4  koffice-l10n-tg-1.5.0.tar.bz2
+411466bf3f0f7340431f2f6448332a89  koffice-l10n-tr-1.5.0.tar.bz2
+8e3294a78b9beab5122703d61d2e9a2c  koffice-l10n-uk-1.5.0.tar.bz2
+ace68fe74216fb0a57024fb3b750fdaf  koffice-l10n-uz-1.5.0.tar.bz2
+3b15bc617451461f9911ad316a264005  koffice-l10n-zh_CN-1.5.0.tar.bz2



From fedora-extras-commits at redhat.com  Sat Apr 22 01:24:56 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 18:24:56 -0700
Subject: rpms/koffice-langpack/devel .cvsignore, 1.3,
	1.4 koffice-langpack.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200604220125.k3M1PSLg002038@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice-langpack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1971/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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Oct 2005 09:54:51 -0000	1.3
+++ .cvsignore	22 Apr 2006 01:24:56 -0000	1.4
@@ -1,29 +1,48 @@
-koffice-l10n-bg-1.4.2.tar.bz2
-koffice-l10n-ca-1.4.2.tar.bz2
-koffice-l10n-cs-1.4.2.tar.bz2
-koffice-l10n-cy-1.4.2.tar.bz2
-koffice-l10n-da-1.4.2.tar.bz2
-koffice-l10n-de-1.4.2.tar.bz2
-koffice-l10n-el-1.4.2.tar.bz2
-koffice-l10n-en_GB-1.4.2.tar.bz2
-koffice-l10n-es-1.4.2.tar.bz2
-koffice-l10n-et-1.4.2.tar.bz2
-koffice-l10n-eu-1.4.2.tar.bz2
-koffice-l10n-fi-1.4.2.tar.bz2
-koffice-l10n-nb-1.4.2.tar.bz2
-koffice-l10n-nl-1.4.2.tar.bz2
-koffice-l10n-nn-1.4.2.tar.bz2
-koffice-l10n-pl-1.4.2.tar.bz2
-koffice-l10n-pt-1.4.2.tar.bz2
-koffice-l10n-pt_BR-1.4.2.tar.bz2
-koffice-l10n-ru-1.4.2.tar.bz2
-koffice-l10n-sl-1.4.2.tar.bz2
-koffice-l10n-sr-1.4.2.tar.bz2
-koffice-l10n-sr at Latn-1.4.2.tar.bz2
-koffice-l10n-sv-1.4.2.tar.bz2
-koffice-l10n-ta-1.4.2.tar.bz2
-koffice-l10n-tg-1.4.2.tar.bz2
-koffice-l10n-zh_CN-1.4.2.tar.bz2
-koffice-l10n-fr-1.4.2.tar.bz2
-koffice-l10n-hu-1.4.2.tar.bz2
-koffice-l10n-it-1.4.2.tar.bz2
+
+koffice-l10n-af-1.5.0.tar.bz2
+koffice-l10n-ar-1.5.0.tar.bz2
+koffice-l10n-bg-1.5.0.tar.bz2
+koffice-l10n-br-1.5.0.tar.bz2
+koffice-l10n-bs-1.5.0.tar.bz2
+koffice-l10n-ca-1.5.0.tar.bz2
+koffice-l10n-cs-1.5.0.tar.bz2
+koffice-l10n-cy-1.5.0.tar.bz2
+koffice-l10n-da-1.5.0.tar.bz2
+koffice-l10n-de-1.5.0.tar.bz2
+koffice-l10n-el-1.5.0.tar.bz2
+koffice-l10n-en_GB-1.5.0.tar.bz2
+koffice-l10n-eo-1.5.0.tar.bz2
+koffice-l10n-es-1.5.0.tar.bz2
+koffice-l10n-et-1.5.0.tar.bz2
+koffice-l10n-eu-1.5.0.tar.bz2
+koffice-l10n-fi-1.5.0.tar.bz2
+koffice-l10n-fr-1.5.0.tar.bz2
+koffice-l10n-ga-1.5.0.tar.bz2
+koffice-l10n-he-1.5.0.tar.bz2
+koffice-l10n-hi-1.5.0.tar.bz2
+koffice-l10n-hu-1.5.0.tar.bz2
+koffice-l10n-is-1.5.0.tar.bz2
+koffice-l10n-it-1.5.0.tar.bz2
+koffice-l10n-ja-1.5.0.tar.bz2
+koffice-l10n-lt-1.5.0.tar.bz2
+koffice-l10n-mk-1.5.0.tar.bz2
+koffice-l10n-nb-1.5.0.tar.bz2
+koffice-l10n-nl-1.5.0.tar.bz2
+koffice-l10n-nn-1.5.0.tar.bz2
+koffice-l10n-pl-1.5.0.tar.bz2
+koffice-l10n-pt-1.5.0.tar.bz2
+koffice-l10n-pt_BR-1.5.0.tar.bz2
+koffice-l10n-ro-1.5.0.tar.bz2
+koffice-l10n-ru-1.5.0.tar.bz2
+koffice-l10n-se-1.5.0.tar.bz2
+koffice-l10n-sk-1.5.0.tar.bz2
+koffice-l10n-sl-1.5.0.tar.bz2
+koffice-l10n-sr-1.5.0.tar.bz2
+koffice-l10n-sr at Latn-1.5.0.tar.bz2
+koffice-l10n-sv-1.5.0.tar.bz2
+koffice-l10n-ta-1.5.0.tar.bz2
+koffice-l10n-tg-1.5.0.tar.bz2
+koffice-l10n-tr-1.5.0.tar.bz2
+koffice-l10n-uk-1.5.0.tar.bz2
+koffice-l10n-uz-1.5.0.tar.bz2
+koffice-l10n-zh_CN-1.5.0.tar.bz2


Index: koffice-langpack.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice-langpack/devel/koffice-langpack.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- koffice-langpack.spec	15 Feb 2006 08:27:47 -0000	1.4
+++ koffice-langpack.spec	22 Apr 2006 01:24:56 -0000	1.5
@@ -1,40 +1,59 @@
 Name:           koffice-langpack
-Version:        1.4.2
-Release:        2%{?dist}
+Version:        1.5.0
+Release:        1%{?dist}
 Summary:        Language files for koffice
 
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://www.koffice.org
-Source0:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-bg-1.4.2.tar.bz2
-Source1:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-ca-1.4.2.tar.bz2
-Source2:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-cs-1.4.2.tar.bz2
-Source3:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-cy-1.4.2.tar.bz2
-Source4:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-da-1.4.2.tar.bz2
-Source5:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-de-1.4.2.tar.bz2
-Source6:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-el-1.4.2.tar.bz2
-Source7:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-en_GB-1.4.2.tar.bz2
-Source8:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-es-1.4.2.tar.bz2
-Source9:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-et-1.4.2.tar.bz2
-Source10:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-fi-1.4.2.tar.bz2 
-Source11:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-fr-1.4.2.tar.bz2
-Source12:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-hu-1.4.2.tar.bz2
-Source13:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-it-1.4.2.tar.bz2
-Source14:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-nb-1.4.2.tar.bz2
-Source15:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-nl-1.4.2.tar.bz2
-Source16:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-nn-1.4.2.tar.bz2
-Source17:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-pl-1.4.2.tar.bz2
-Source18:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-pt_BR-1.4.2.tar.bz2
-Source19:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-pt-1.4.2.tar.bz2
-Source20:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-ru-1.4.2.tar.bz2
-Source21:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-sl-1.4.2.tar.bz2
-Source22:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-sr at Latn-1.4.2.tar.bz2
-Source23:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-sr-1.4.2.tar.bz2
-Source24:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-sv-1.4.2.tar.bz2
-Source25:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-ta-1.4.2.tar.bz2
-Source26:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-tg-1.4.2.tar.bz2
-Source27:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-zh_CN-1.4.2.tar.bz2
-Source28:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-eu-1.4.2.tar.bz2
+Source0:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-af-1.5.0.tar.bz2
+Source1:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ar-1.5.0.tar.bz2
+Source2:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-bg-1.5.0.tar.bz2
+Source3:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-br-1.5.0.tar.bz2
+Source4:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-bs-1.5.0.tar.bz2
+Source5:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ca-1.5.0.tar.bz2
+Source6:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-cs-1.5.0.tar.bz2
+Source7:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-cy-1.5.0.tar.bz2
+Source8:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-da-1.5.0.tar.bz2
+Source9:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-de-1.5.0.tar.bz2
+Source10:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-el-1.5.0.tar.bz2
+Source11:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-en_GB-1.5.0.tar.bz2
+Source12:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-eo-1.5.0.tar.bz2
+Source13:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-es-1.5.0.tar.bz2
+Source14:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-et-1.5.0.tar.bz2
+Source15:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-eu-1.5.0.tar.bz2
+Source16:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-fi-1.5.0.tar.bz2
+Source17:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-fr-1.5.0.tar.bz2
+Source18:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ga-1.5.0.tar.bz2
+Source19:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-he-1.5.0.tar.bz2
+Source20:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-hi-1.5.0.tar.bz2
+Source21:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-hu-1.5.0.tar.bz2
+Source22:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-is-1.5.0.tar.bz2
+Source23:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-it-1.5.0.tar.bz2
+Source24:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ja-1.5.0.tar.bz2
+Source25:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-lt-1.5.0.tar.bz2
+Source26:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-mk-1.5.0.tar.bz2
+Source27:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-nb-1.5.0.tar.bz2
+Source28:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-nl-1.5.0.tar.bz2
+Source29:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-nn-1.5.0.tar.bz2
+Source30:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-pl-1.5.0.tar.bz2
+Source31:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-pt-1.5.0.tar.bz2
+Source32:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-pt_BR-1.5.0.tar.bz2
+Source33:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ro-1.5.0.tar.bz2
+Source34:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ru-1.5.0.tar.bz2
+Source35:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-se-1.5.0.tar.bz2
+Source36:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sk-1.5.0.tar.bz2
+Source37:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sl-1.5.0.tar.bz2
+Source38:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sr-1.5.0.tar.bz2
+Source39:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sr at Latn-1.5.0.tar.bz2
+Source40:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sv-1.5.0.tar.bz2
+Source41:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ta-1.5.0.tar.bz2
+Source42:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-tg-1.5.0.tar.bz2
+Source43:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-tr-1.5.0.tar.bz2
+Source44:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-uk-1.5.0.tar.bz2
+Source45:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-uz-1.5.0.tar.bz2
+Source46:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-zh_CN-1.5.0.tar.bz2
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -45,6 +64,39 @@
 %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 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
@@ -93,6 +145,14 @@
 %description de
 Provides additional german translations for koffice
 
+%package eo
+Summary:        Esperanto language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%description eo
+Provides additional esperanto translations for koffice
+
 %package el
 Summary:        Greek language pack for koffice
 Group:          Applications/Productivity
@@ -143,7 +203,6 @@
 %description fi
 Provides additional finish translations for koffice
 
-
 %package fr
 Summary:        French language pack for koffice
 Group:          Applications/Productivity
@@ -152,6 +211,30 @@
 %description fr
 Provides additional french translations for koffice
 
+%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 hi
+Provides additional hindi translations for koffice
+
 %package hu
 Summary:        Hungarian language pack for koffice
 Group:          Applications/Productivity
@@ -160,13 +243,45 @@
 %description hu
 Provides additional hungarian translations for koffice
 
+%package is
+Summary:        Icelandic language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%description is
+Provides additional icelandic translations for koffice
+
 %package it
 Summary:        Italian language pack for koffice
 Group:          Applications/Productivity
 Requires:       koffice-core >= %{version}
 
 %description it
-Provides additional italian translations for koffic
+Provides additional italian translations for koffice
+
+%package ja
+Summary:        Japanese language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%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}
+
+%description mk
+Provides additional macedonian translations for koffice
 
 %package nb
 Summary:        Bokmal language pack for koffice
@@ -224,6 +339,29 @@
 %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}
+
+%description se
+Provides additional northern sami translations for koffice
+
+%package sk
+Summary:        Slovak language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%description sk
+Provides additional slovak translations for koffice
+
 %package sl
 Summary:        Slovenian language pack for koffice
 Group:          Applications/Productivity
@@ -272,6 +410,22 @@
 %description tg
 Provides additional tajik translations for koffice
 
+%package tr
+Summary:        Turkish language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%description tr
+Provides additional turkish translations for koffice
+
+%package uk
+Summary:        Ukrainian language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%description uk
+Provides additional ukrainian translations for koffice
+
 %package zh_CN
 Summary:        Simplified Chinese language pack for koffice
 Group:          Applications/Productivity
@@ -313,10 +467,30 @@
 %{__tar} xjvf %{SOURCE26}
 %{__tar} xjvf %{SOURCE27}
 %{__tar} xjvf %{SOURCE28}
+%{__tar} xjvf %{SOURCE29}
+%{__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}
 
 %build
-for lang in bg ca cs cy da de el en_GB es et eu fi fr hu it nb nl nn pl pt pt_BR \
-ru sl sr sr at Latn sv ta tg zh_CN; do
+# 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 nb nl nn pl pt pt_BR ro ru se sk sl sr \
+sr at Latn sv ta tg tr uk zh_CN; do
     cd %{_builddir}/%{name}-%{version}/koffice-l10n-$lang-%{version}
     %configure
     make %{?_smp_mflags}
@@ -325,8 +499,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-for lang in bg ca cs cy da de el en_GB es et eu fi fr hu it nb nl nn pl pt pt_BR \
-ru sl sr sr at Latn sv ta tg zh_CN; do
+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 nb nl nn pl pt pt_BR ro ru se sk sl sr \
+sr at Latn sv ta tg tr uk zh_CN; do
     cd %{_builddir}/%{name}-%{version}/koffice-l10n-$lang-%{version}
     make install DESTDIR=$RPM_BUILD_ROOT
 done
@@ -351,10 +526,26 @@
 %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
@@ -388,6 +579,10 @@
 %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/*
@@ -413,17 +608,45 @@
 %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
+%defattr(-,root,root,-)
+%lang(lt) %{_datadir}/locale/lt/LC_MESSAGES/*
+
+%files mk
+%defattr(-,root,root,-)
+%lang(mk) %{_datadir}/locale/mk/LC_MESSAGES/*
+
 %files nb
 %defattr(-,root,root,-)
 %lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/*
@@ -451,12 +674,26 @@
 %defattr(-,root,root,-)
 %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/*
+%lang(sk) %{_datadir}/doc/HTML/sk/*
+%lang(sk) %{_datadir}/apps/koffice/autocorrect/sk.xml
+
 %files sl
 %defattr(-,root,root,-)
 %lang(sl) %{_datadir}/locale/sl/LC_MESSAGES/*
@@ -483,11 +720,23 @@
 %defattr(-,root,root,-)
 %lang(tg) %{_datadir}/locale/tg/LC_MESSAGES/*
 
+%files tr
+%defattr(-,root,root,-)
+%lang(tr) %{_datadir}/locale/tr/LC_MESSAGES/*
+
+%files uk
+%defattr(-,root,root,-)
+%lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/*
+
 %files zh_CN
 %defattr(-,root,root,-)
 %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/*
 
 %changelog
+* Sat Apr 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.5.0-1
+- version upgrade
+
 * Wed Feb 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.4.2-2
 - Rebuild for Fedora Extras 5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice-langpack/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Oct 2005 09:54:51 -0000	1.3
+++ sources	22 Apr 2006 01:24:56 -0000	1.4
@@ -1,29 +1,48 @@
-ad980947860046ca4d5e0c8b23b7d3ab  koffice-l10n-bg-1.4.2.tar.bz2
-8a546eec2897af073bb564edf7150b6d  koffice-l10n-ca-1.4.2.tar.bz2
-58e6c355e478ab459e6f0a5c86662f36  koffice-l10n-cs-1.4.2.tar.bz2
-ed0c069797a89680d49bd396f80e94e1  koffice-l10n-cy-1.4.2.tar.bz2
-f6c3b0afcb299519f0663aa5a3ff3362  koffice-l10n-da-1.4.2.tar.bz2
-2659e56e079bfdd133833a39497f80e6  koffice-l10n-de-1.4.2.tar.bz2
-1aa341393b7ade4037ddeed77c73cacf  koffice-l10n-el-1.4.2.tar.bz2
-caf59bd82ac94ccbeaa4b907c218defa  koffice-l10n-en_GB-1.4.2.tar.bz2
-0f429120c8b27d1208f020a353aeb88d  koffice-l10n-es-1.4.2.tar.bz2
-1ac8201573602a69e7d00b3332cb3bec  koffice-l10n-et-1.4.2.tar.bz2
-f8417721a49dd23f20115e102b0a8204  koffice-l10n-eu-1.4.2.tar.bz2
-b4925a3bd6db8b6b787b0313e3695371  koffice-l10n-fi-1.4.2.tar.bz2
-9d8c327b3e6567d90258cec8b0694a2c  koffice-l10n-nb-1.4.2.tar.bz2
-6328a285565add97cd55413e52541050  koffice-l10n-nl-1.4.2.tar.bz2
-2e52095b2c9c879e101d274888d49fcc  koffice-l10n-nn-1.4.2.tar.bz2
-78337154a7183cda46d34f80c6bf23e5  koffice-l10n-pl-1.4.2.tar.bz2
-61e11d48f788275389f0b75e75b8de2b  koffice-l10n-pt-1.4.2.tar.bz2
-a559487f91f9bdf7eaf608f5d88c67c1  koffice-l10n-pt_BR-1.4.2.tar.bz2
-a1527f53ed16ceed8c295614eedf7deb  koffice-l10n-ru-1.4.2.tar.bz2
-6d85c8b3f84b892471fd3cadd00aba37  koffice-l10n-sl-1.4.2.tar.bz2
-97d0fa5fdb458bbe5c8ef5317e15ed5c  koffice-l10n-sr-1.4.2.tar.bz2
-65e7e7939b3d538913ddcec261741f75  koffice-l10n-sr at Latn-1.4.2.tar.bz2
-897218187ef83afcd99406b62e352e69  koffice-l10n-sv-1.4.2.tar.bz2
-2c55f413ec8e02a667e37d967186dc86  koffice-l10n-ta-1.4.2.tar.bz2
-c10cd70d7f1a9a397f768002625ad6f9  koffice-l10n-tg-1.4.2.tar.bz2
-5733aa59661f8828c66ef0d2335d4242  koffice-l10n-zh_CN-1.4.2.tar.bz2
-5f4e1d1f360a14e4ca2d24d2d85bf061  koffice-l10n-fr-1.4.2.tar.bz2
-ba83bf5a84f1ae5e7b22c1611c89e8bd  koffice-l10n-hu-1.4.2.tar.bz2
-62609f289dc1ed216c7d075045159a04  koffice-l10n-it-1.4.2.tar.bz2
+
+03217f2f39b1a21cc685a5aa85200247  koffice-l10n-af-1.5.0.tar.bz2
+922cdc3f2de8d350deaf54c32feab117  koffice-l10n-ar-1.5.0.tar.bz2
+5e24b5028de337c2cbda323fa69d56f2  koffice-l10n-bg-1.5.0.tar.bz2
+4c5c9d834f14defd87c5580092002e51  koffice-l10n-br-1.5.0.tar.bz2
+6086121e25b243d7b5543dc15ebaf3ee  koffice-l10n-bs-1.5.0.tar.bz2
+cc24df3b6d3899b89776e2d2cabb3eb5  koffice-l10n-ca-1.5.0.tar.bz2
+193f7d66d9b5c945932ee9868721f9f1  koffice-l10n-cs-1.5.0.tar.bz2
+14c6069119fb491e6b430d6663e3a60f  koffice-l10n-cy-1.5.0.tar.bz2
+fedd3f7c0c39a40940576fb86d7262f0  koffice-l10n-da-1.5.0.tar.bz2
+fe3334c31472b006907f59f47db6cb75  koffice-l10n-de-1.5.0.tar.bz2
+d7384ecf60617aa054ec3ded25cff1ea  koffice-l10n-el-1.5.0.tar.bz2
+5f00c66613f2250babd4cb02590952df  koffice-l10n-en_GB-1.5.0.tar.bz2
+79d73a7d8e5a284e1c997cbec6bc804c  koffice-l10n-eo-1.5.0.tar.bz2
+0abef42c4ea3a0992b69933ad1e94287  koffice-l10n-es-1.5.0.tar.bz2
+149ba841f9dc322336b9c153b598dea5  koffice-l10n-et-1.5.0.tar.bz2
+af2a4e93887cd55ba0cda123362650d7  koffice-l10n-eu-1.5.0.tar.bz2
+e87c44fc8c7b10c4c44c76d90cb1ca7c  koffice-l10n-fi-1.5.0.tar.bz2
+65b9b6fd7903050c4c170af11aa94fb2  koffice-l10n-fr-1.5.0.tar.bz2
+47b453c7444e404c19cc8dc85cf56d37  koffice-l10n-ga-1.5.0.tar.bz2
+1d0810b08947f072631615ffa3260bec  koffice-l10n-he-1.5.0.tar.bz2
+82231d5c7e273d0384d04e80be228167  koffice-l10n-hi-1.5.0.tar.bz2
+9c1d2441a49eaf06a6adac3f61590076  koffice-l10n-hu-1.5.0.tar.bz2
+3fc01e0a34d0ce9a2988ef30df638f62  koffice-l10n-is-1.5.0.tar.bz2
+db8b9a1bb5114e69c3768508c09bde8d  koffice-l10n-it-1.5.0.tar.bz2
+16435cf9fd545529bea61010fb35ad03  koffice-l10n-ja-1.5.0.tar.bz2
+c306e0bfdccd60fd9f11e93828475fac  koffice-l10n-lt-1.5.0.tar.bz2
+b0469b72436e35a1101ee9ea4e981ae3  koffice-l10n-mk-1.5.0.tar.bz2
+8cffcf181366737bea12a1ae9a14c294  koffice-l10n-nb-1.5.0.tar.bz2
+f4bfc5952a2612c72443d266df034e7d  koffice-l10n-nl-1.5.0.tar.bz2
+bb3444c52bcbc33aaaad542454048c69  koffice-l10n-nn-1.5.0.tar.bz2
+442946625f984e8eb9f977c39a57749d  koffice-l10n-pl-1.5.0.tar.bz2
+285b5766d9955de0fd7c2599b25115ab  koffice-l10n-pt-1.5.0.tar.bz2
+41373317668d2d7cbc20e4a5a188daf6  koffice-l10n-pt_BR-1.5.0.tar.bz2
+35fb855cb7c18b95a11602a7c8483d2d  koffice-l10n-ro-1.5.0.tar.bz2
+f5842b78af8ba903129942dfa7f6d7d4  koffice-l10n-ru-1.5.0.tar.bz2
+d153416b1403f7e4cf8a03b5739ab6a9  koffice-l10n-se-1.5.0.tar.bz2
+400b547e0520fe769594d4f39c3ec769  koffice-l10n-sk-1.5.0.tar.bz2
+7e73b04ed5952631efa8ef9ed216ce3d  koffice-l10n-sl-1.5.0.tar.bz2
+5b7f01f22ae97c8983411b043c41a689  koffice-l10n-sr-1.5.0.tar.bz2
+5bafc53a3c3b4f863fd28fc9f0a090f9  koffice-l10n-sr at Latn-1.5.0.tar.bz2
+810dd9311472f1e60f90c9fdfcc6c84c  koffice-l10n-sv-1.5.0.tar.bz2
+2991caa710ad20da8925331a51026498  koffice-l10n-ta-1.5.0.tar.bz2
+3c9f50e64cc892cfcb840c424b2940e4  koffice-l10n-tg-1.5.0.tar.bz2
+411466bf3f0f7340431f2f6448332a89  koffice-l10n-tr-1.5.0.tar.bz2
+8e3294a78b9beab5122703d61d2e9a2c  koffice-l10n-uk-1.5.0.tar.bz2
+ace68fe74216fb0a57024fb3b750fdaf  koffice-l10n-uz-1.5.0.tar.bz2
+3b15bc617451461f9911ad316a264005  koffice-l10n-zh_CN-1.5.0.tar.bz2



From fedora-extras-commits at redhat.com  Sat Apr 22 01:25:51 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 18:25:51 -0700
Subject: rpms/koffice/FC-4 koffice-kexi-version.patch,NONE,1.1
Message-ID: <200604220125.k3M1PrfB002103@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2079

Added Files:
	koffice-kexi-version.patch 
Log Message:
- add kexi patch


koffice-kexi-version.patch:

--- NEW FILE koffice-kexi-version.patch ---
--- kexi/kexi_version.h.orig	2006-04-14 23:09:52.000000000 +0200
+++ kexi/kexi_version.h	2006-04-14 23:16:07.000000000 +0200
@@ -30,12 +30,12 @@
 #endif
 
 #ifndef KEXI_VERSION_STRING
-# define KEXI_VERSION_STRING "1.0 rc1"
+# define KEXI_VERSION_STRING "1.0"
 #endif
 
-#define KEXI_VERSION_MAJOR 0
-#define KEXI_VERSION_MINOR 9
-#define KEXI_VERSION_RELEASE 98
+#define KEXI_VERSION_MAJOR 1
+#define KEXI_VERSION_MINOR 0
+#define KEXI_VERSION_RELEASE 0
 
 #define KEXI_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c))
 



From fedora-extras-commits at redhat.com  Sat Apr 22 01:28:54 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 21 Apr 2006 18:28:54 -0700
Subject: rpms/perl-Class-Autouse/FC-5 .cvsignore, 1.5,
	1.6 perl-Class-Autouse.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <200604220128.k3M1Sum0002282@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-Autouse/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2260

Modified Files:
	.cvsignore perl-Class-Autouse.spec sources 
Log Message:
* Thu Apr 20 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.26-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Autouse/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Feb 2006 14:35:58 -0000	1.5
+++ .cvsignore	22 Apr 2006 01:28:54 -0000	1.6
@@ -1,2 +1 @@
-Class-Autouse-1.21.tar.gz
-Class-Autouse-1.24.tar.gz
+Class-Autouse-1.26.tar.gz


Index: perl-Class-Autouse.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Autouse/FC-5/perl-Class-Autouse.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Class-Autouse.spec	28 Feb 2006 23:18:03 -0000	1.6
+++ perl-Class-Autouse.spec	22 Apr 2006 01:28:54 -0000	1.7
@@ -1,6 +1,6 @@
 Name: 		perl-Class-Autouse
-Version: 	1.21
-Release: 	3%{?dist}
+Version: 	1.26
+Release: 	1%{?dist}
 Summary: 	Run-time class loading on first method call
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -57,6 +57,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Apr 20 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.26-1
+- Upstream update.
+
 * Wed Mar 01 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.21-3
 - Rebuild for perl-5.8.8.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Autouse/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Feb 2006 14:35:58 -0000	1.5
+++ sources	22 Apr 2006 01:28:54 -0000	1.6
@@ -1,2 +1 @@
-3bf4fadd8349e57d6af0961b6565c74f  Class-Autouse-1.21.tar.gz
-6192abd3fa36d40ae40870ea66aa9b2a  Class-Autouse-1.24.tar.gz
+27d185332ff7fc18477d115802b057b2  Class-Autouse-1.26.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 01:30:49 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 21 Apr 2006 18:30:49 -0700
Subject: rpms/perl-Params-Util/FC-5 .cvsignore, 1.7,
	1.8 perl-Params-Util.spec, 1.7, 1.8 sources, 1.7, 1.8
Message-ID: <200604220130.k3M1UpAB002355@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-serv2334

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
* Thu Apr 20 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.11-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	18 Jan 2006 10:52:58 -0000	1.7
+++ .cvsignore	22 Apr 2006 01:30:48 -0000	1.8
@@ -1 +1 @@
-Params-Util-0.10.tar.gz
+Params-Util-0.11.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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Params-Util.spec	28 Feb 2006 23:27:52 -0000	1.7
+++ perl-Params-Util.spec	22 Apr 2006 01:30:48 -0000	1.8
@@ -1,6 +1,6 @@
 Name: 		perl-Params-Util
-Version: 	0.10
-Release: 	2%{?dist}
+Version: 	0.11
+Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Apr 20 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.11-1
+- Upstream update.
+
 * Wed Mar 01 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.10-2
 - Rebuild for perl-5.8.8.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	18 Jan 2006 10:52:58 -0000	1.7
+++ sources	22 Apr 2006 01:30:48 -0000	1.8
@@ -1 +1 @@
-1af92339a4772a20dddce7816c68cd80  Params-Util-0.10.tar.gz
+d3fce431cff46caa926ece63fda73946  Params-Util-0.11.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 01:33:16 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 21 Apr 2006 18:33:16 -0700
Subject: rpms/perl-Params-Util/FC-4 .cvsignore, 1.7,
	1.8 perl-Params-Util.spec, 1.6, 1.7 sources, 1.7, 1.8
Message-ID: <200604220133.k3M1XIFR002430@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-serv2409

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
* Thu Apr 20 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.11-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	18 Jan 2006 10:53:44 -0000	1.7
+++ .cvsignore	22 Apr 2006 01:33:15 -0000	1.8
@@ -1 +1 @@
-Params-Util-0.10.tar.gz
+Params-Util-0.11.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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Params-Util.spec	18 Jan 2006 10:53:44 -0000	1.6
+++ perl-Params-Util.spec	22 Apr 2006 01:33:16 -0000	1.7
@@ -1,5 +1,5 @@
 Name: 		perl-Params-Util
-Version: 	0.10
+Version: 	0.11
 Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
 License: 	GPL or Artistic
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Apr 20 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.11-1
+- Upstream update.
+
 * Wed Jan 18 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.10-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	18 Jan 2006 10:53:44 -0000	1.7
+++ sources	22 Apr 2006 01:33:16 -0000	1.8
@@ -1 +1 @@
-1af92339a4772a20dddce7816c68cd80  Params-Util-0.10.tar.gz
+d3fce431cff46caa926ece63fda73946  Params-Util-0.11.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 01:50:55 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Fri, 21 Apr 2006 18:50:55 -0700
Subject: rpms/prboom/FC-4 prboom-2.4.1-gamedir.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 prboom.spec, 1.2, 1.3 sources, 1.2,
	1.3 prboom-2.3.1-64bit.patch, 1.1,
	NONE prboom-2.3.1-config.patch, 1.1,
	NONE prboom-2.3.1-fixpsnprintf.patch, 1.1,
	NONE prboom-2.3.1-gamedir.patch, 1.1,
	NONE prboom-2.3.1-gcc4.patch, 1.2, NONE
Message-ID: <200604220151.k3M1pR23002655@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/prboom/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2602/FC-4

Modified Files:
	.cvsignore prboom.spec sources 
Added Files:
	prboom-2.4.1-gamedir.patch 
Removed Files:
	prboom-2.3.1-64bit.patch prboom-2.3.1-config.patch 
	prboom-2.3.1-fixpsnprintf.patch prboom-2.3.1-gamedir.patch 
	prboom-2.3.1-gcc4.patch 
Log Message:
Update to 2.4.1



prboom-2.4.1-gamedir.patch:

--- NEW FILE prboom-2.4.1-gamedir.patch ---
diff -Naur --exclude '*.swp' prboom-2.4.1/configure prboom-2.4.1.new/configure
--- prboom-2.4.1/configure	2006-04-06 07:00:39.000000000 -0700
+++ prboom-2.4.1.new/configure	2006-04-18 19:02:51.000000000 -0700
@@ -1871,9 +1871,9 @@
 
 
 if test "x$prefix" != xNONE; then
-  DOOMWADDIR="$prefix/share/games/doom"
+  DOOMWADDIR="$prefix/share/doom"
 else
-  DOOMWADDIR="$ac_default_prefix/share/games/doom"
+  DOOMWADDIR="$ac_default_prefix/share/doom"
 fi
 cat >>confdefs.h <<_ACEOF
 #define DOOMWADDIR "$DOOMWADDIR"
diff -Naur --exclude '*.swp' prboom-2.4.1/src/d_main.c prboom-2.4.1.new/src/d_main.c
--- prboom-2.4.1/src/d_main.c	2006-04-02 09:20:33.000000000 -0700
+++ prboom-2.4.1.new/src/d_main.c	2006-04-18 19:02:06.000000000 -0700
@@ -138,6 +138,7 @@
   "doom.wad",
   "doom1.wad",
   "doomu.wad", /* CPhipps - alow doomu.wad */
+  "freedoom.wad", /* wart at kobold.org:  added freedoom for Fedora Extras */
 };
 static const int nstandard_iwads = sizeof standard_iwads/sizeof*standard_iwads;
 
diff -Naur --exclude '*.swp' prboom-2.4.1/src/s_sound.c prboom-2.4.1.new/src/s_sound.c
--- prboom-2.4.1/src/s_sound.c	2006-04-01 06:32:50.000000000 -0800
+++ prboom-2.4.1.new/src/s_sound.c	2006-04-20 15:16:09.000000000 -0700
@@ -505,6 +505,7 @@
 
       // load & register it
       music->data = W_CacheLumpNum(music->lumpnum);
+      fprintf(stderr, "Loading music lump #%d\n", music->lumpnum);
       music->handle = I_RegisterSong(music->data, W_LumpLength(music->lumpnum));
     }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/prboom/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Mar 2006 19:30:09 -0000	1.2
+++ .cvsignore	22 Apr 2006 01:50:55 -0000	1.3
@@ -1 +1 @@
-prboom-2.3.1.tar.gz
+prboom-2.4.1.tar.gz


Index: prboom.spec
===================================================================
RCS file: /cvs/extras/rpms/prboom/FC-4/prboom.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- prboom.spec	19 Mar 2006 07:02:25 -0000	1.2
+++ prboom.spec	22 Apr 2006 01:50:55 -0000	1.3
@@ -1,19 +1,15 @@
 %define waddir  %{_datadir}/doom
 
 Name:           prboom
-Version:        2.3.1
-Release:        5%{?dist}
+Version:        2.4.1
+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.3.1.tar.gz
-Patch0:         prboom-2.3.1-gcc4.patch
-Patch1:         prboom-2.3.1-gamedir.patch
-Patch2:         prboom-2.3.1-config.patch
-Patch3:         prboom-2.3.1-64bit.patch
-Patch4:         prboom-2.3.1-fixpsnprintf.patch
+Source0:        http://dl.sourceforge.net/prboom/prboom-2.4.1.tar.gz
+Patch0:         prboom-2.4.1-gamedir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL_mixer-devel SDL_net-devel
@@ -30,13 +26,9 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
-%configure --disable-cpu-opt --program-prefix=''
+%configure --enable-gl --disable-cpu-opt --program-prefix=''
 make %{?_smp_mflags}
 
 %install
@@ -69,6 +61,9 @@
 %doc doc/README.compat doc/README.demos doc/MBF.txt doc/MBFFAQ.txt doc/boom.txt
 
 %changelog
+* Tue Apr 18 2006 Wart <wart at kobold.org> 2.4.1-1
+- Update to 2.4.1
+
 * Sat Mar 18 2006 Wart <wart at kobold.org> 2.3.1-5
 - Updated patches to fix segfault on i386 (BZ #185741)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/prboom/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Mar 2006 19:30:09 -0000	1.2
+++ sources	22 Apr 2006 01:50:55 -0000	1.3
@@ -1 +1 @@
-c53231604fe6cf7352e73911ad44c90d  prboom-2.3.1.tar.gz
+5cfd46fe7e3aaccfb1840b249bf34b97  prboom-2.4.1.tar.gz


--- prboom-2.3.1-64bit.patch DELETED ---


--- prboom-2.3.1-config.patch DELETED ---


--- prboom-2.3.1-fixpsnprintf.patch DELETED ---


--- prboom-2.3.1-gamedir.patch DELETED ---


--- prboom-2.3.1-gcc4.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Apr 22 01:50:56 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Fri, 21 Apr 2006 18:50:56 -0700
Subject: rpms/prboom/FC-5 prboom-2.4.1-gamedir.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 prboom.spec, 1.2, 1.3 sources, 1.2,
	1.3 prboom-2.3.1-64bit.patch, 1.1,
	NONE prboom-2.3.1-config.patch, 1.1,
	NONE prboom-2.3.1-fixpsnprintf.patch, 1.1,
	NONE prboom-2.3.1-gamedir.patch, 1.1,
	NONE prboom-2.3.1-gcc4.patch, 1.2, NONE
Message-ID: <200604220151.k3M1pSRF002660@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/prboom/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2602/FC-5

Modified Files:
	.cvsignore prboom.spec sources 
Added Files:
	prboom-2.4.1-gamedir.patch 
Removed Files:
	prboom-2.3.1-64bit.patch prboom-2.3.1-config.patch 
	prboom-2.3.1-fixpsnprintf.patch prboom-2.3.1-gamedir.patch 
	prboom-2.3.1-gcc4.patch 
Log Message:
Update to 2.4.1



prboom-2.4.1-gamedir.patch:

--- NEW FILE prboom-2.4.1-gamedir.patch ---
diff -Naur --exclude '*.swp' prboom-2.4.1/configure prboom-2.4.1.new/configure
--- prboom-2.4.1/configure	2006-04-06 07:00:39.000000000 -0700
+++ prboom-2.4.1.new/configure	2006-04-18 19:02:51.000000000 -0700
@@ -1871,9 +1871,9 @@
 
 
 if test "x$prefix" != xNONE; then
-  DOOMWADDIR="$prefix/share/games/doom"
+  DOOMWADDIR="$prefix/share/doom"
 else
-  DOOMWADDIR="$ac_default_prefix/share/games/doom"
+  DOOMWADDIR="$ac_default_prefix/share/doom"
 fi
 cat >>confdefs.h <<_ACEOF
 #define DOOMWADDIR "$DOOMWADDIR"
diff -Naur --exclude '*.swp' prboom-2.4.1/src/d_main.c prboom-2.4.1.new/src/d_main.c
--- prboom-2.4.1/src/d_main.c	2006-04-02 09:20:33.000000000 -0700
+++ prboom-2.4.1.new/src/d_main.c	2006-04-18 19:02:06.000000000 -0700
@@ -138,6 +138,7 @@
   "doom.wad",
   "doom1.wad",
   "doomu.wad", /* CPhipps - alow doomu.wad */
+  "freedoom.wad", /* wart at kobold.org:  added freedoom for Fedora Extras */
 };
 static const int nstandard_iwads = sizeof standard_iwads/sizeof*standard_iwads;
 
diff -Naur --exclude '*.swp' prboom-2.4.1/src/s_sound.c prboom-2.4.1.new/src/s_sound.c
--- prboom-2.4.1/src/s_sound.c	2006-04-01 06:32:50.000000000 -0800
+++ prboom-2.4.1.new/src/s_sound.c	2006-04-20 15:16:09.000000000 -0700
@@ -505,6 +505,7 @@
 
       // load & register it
       music->data = W_CacheLumpNum(music->lumpnum);
+      fprintf(stderr, "Loading music lump #%d\n", music->lumpnum);
       music->handle = I_RegisterSong(music->data, W_LumpLength(music->lumpnum));
     }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/prboom/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Mar 2006 19:30:09 -0000	1.2
+++ .cvsignore	22 Apr 2006 01:50:55 -0000	1.3
@@ -1 +1 @@
-prboom-2.3.1.tar.gz
+prboom-2.4.1.tar.gz


Index: prboom.spec
===================================================================
RCS file: /cvs/extras/rpms/prboom/FC-5/prboom.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- prboom.spec	19 Mar 2006 06:59:52 -0000	1.2
+++ prboom.spec	22 Apr 2006 01:50:55 -0000	1.3
@@ -1,22 +1,19 @@
 %define waddir  %{_datadir}/doom
 
 Name:           prboom
-Version:        2.3.1
-Release:        5%{?dist}
+Version:        2.4.1
+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.3.1.tar.gz
-Patch0:         prboom-2.3.1-gcc4.patch
-Patch1:         prboom-2.3.1-gamedir.patch
-Patch2:         prboom-2.3.1-config.patch
-Patch3:         prboom-2.3.1-64bit.patch
-Patch4:         prboom-2.3.1-fixpsnprintf.patch
+Source0:        http://dl.sourceforge.net/prboom/prboom-2.4.1.tar.gz
+Patch0:         prboom-2.4.1-gamedir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL_mixer-devel SDL_net-devel
+BuildRequires:  libGLU-devel
 Requires:       freedoom
 
 %description
@@ -30,13 +27,9 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
-%configure --disable-cpu-opt --program-prefix=''
+%configure --enable-gl --disable-cpu-opt --program-prefix=''
 make %{?_smp_mflags}
 
 %install
@@ -69,6 +62,9 @@
 %doc doc/README.compat doc/README.demos doc/MBF.txt doc/MBFFAQ.txt doc/boom.txt
 
 %changelog
+* Tue Apr 18 2006 Wart <wart at kobold.org> 2.4.1-1
+- Update to 2.4.1
+
 * Sat Mar 18 2006 Wart <wart at kobold.org> 2.3.1-5
 - Updated patches to fix segfault on i386 (BZ #185741)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/prboom/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Mar 2006 19:30:09 -0000	1.2
+++ sources	22 Apr 2006 01:50:55 -0000	1.3
@@ -1 +1 @@
-c53231604fe6cf7352e73911ad44c90d  prboom-2.3.1.tar.gz
+5cfd46fe7e3aaccfb1840b249bf34b97  prboom-2.4.1.tar.gz


--- prboom-2.3.1-64bit.patch DELETED ---


--- prboom-2.3.1-config.patch DELETED ---


--- prboom-2.3.1-fixpsnprintf.patch DELETED ---


--- prboom-2.3.1-gamedir.patch DELETED ---


--- prboom-2.3.1-gcc4.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Apr 22 01:53:18 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Fri, 21 Apr 2006 18:53:18 -0700
Subject: rpms/prboom/FC-4 prboom-2.4.1-gamedir.patch,1.1,1.2
Message-ID: <200604220153.k3M1roA1002745@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/prboom/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2682/FC-4

Modified Files:
	prboom-2.4.1-gamedir.patch 
Log Message:
Remove debugging line from patch.



prboom-2.4.1-gamedir.patch:

Index: prboom-2.4.1-gamedir.patch
===================================================================
RCS file: /cvs/extras/rpms/prboom/FC-4/prboom-2.4.1-gamedir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- prboom-2.4.1-gamedir.patch	22 Apr 2006 01:50:55 -0000	1.1
+++ prboom-2.4.1-gamedir.patch	22 Apr 2006 01:53:18 -0000	1.2
@@ -24,14 +24,3 @@
  };
  static const int nstandard_iwads = sizeof standard_iwads/sizeof*standard_iwads;
  
-diff -Naur --exclude '*.swp' prboom-2.4.1/src/s_sound.c prboom-2.4.1.new/src/s_sound.c
---- prboom-2.4.1/src/s_sound.c	2006-04-01 06:32:50.000000000 -0800
-+++ prboom-2.4.1.new/src/s_sound.c	2006-04-20 15:16:09.000000000 -0700
-@@ -505,6 +505,7 @@
- 
-       // load & register it
-       music->data = W_CacheLumpNum(music->lumpnum);
-+      fprintf(stderr, "Loading music lump #%d\n", music->lumpnum);
-       music->handle = I_RegisterSong(music->data, W_LumpLength(music->lumpnum));
-     }
- 



From fedora-extras-commits at redhat.com  Sat Apr 22 01:53:18 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Fri, 21 Apr 2006 18:53:18 -0700
Subject: rpms/prboom/FC-5 prboom-2.4.1-gamedir.patch,1.1,1.2
Message-ID: <200604220153.k3M1rpBn002748@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/prboom/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2682/FC-5

Modified Files:
	prboom-2.4.1-gamedir.patch 
Log Message:
Remove debugging line from patch.



prboom-2.4.1-gamedir.patch:

Index: prboom-2.4.1-gamedir.patch
===================================================================
RCS file: /cvs/extras/rpms/prboom/FC-5/prboom-2.4.1-gamedir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- prboom-2.4.1-gamedir.patch	22 Apr 2006 01:50:55 -0000	1.1
+++ prboom-2.4.1-gamedir.patch	22 Apr 2006 01:53:18 -0000	1.2
@@ -24,14 +24,3 @@
  };
  static const int nstandard_iwads = sizeof standard_iwads/sizeof*standard_iwads;
  
-diff -Naur --exclude '*.swp' prboom-2.4.1/src/s_sound.c prboom-2.4.1.new/src/s_sound.c
---- prboom-2.4.1/src/s_sound.c	2006-04-01 06:32:50.000000000 -0800
-+++ prboom-2.4.1.new/src/s_sound.c	2006-04-20 15:16:09.000000000 -0700
-@@ -505,6 +505,7 @@
- 
-       // load & register it
-       music->data = W_CacheLumpNum(music->lumpnum);
-+      fprintf(stderr, "Loading music lump #%d\n", music->lumpnum);
-       music->handle = I_RegisterSong(music->data, W_LumpLength(music->lumpnum));
-     }
- 



From fedora-extras-commits at redhat.com  Sat Apr 22 01:53:19 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Fri, 21 Apr 2006 18:53:19 -0700
Subject: rpms/prboom/devel prboom-2.4.1-gamedir.patch,1.1,1.2
Message-ID: <200604220153.k3M1rp9P002751@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/prboom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2682/devel

Modified Files:
	prboom-2.4.1-gamedir.patch 
Log Message:
Remove debugging line from patch.



prboom-2.4.1-gamedir.patch:

Index: prboom-2.4.1-gamedir.patch
===================================================================
RCS file: /cvs/extras/rpms/prboom/devel/prboom-2.4.1-gamedir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- prboom-2.4.1-gamedir.patch	21 Apr 2006 21:37:55 -0000	1.1
+++ prboom-2.4.1-gamedir.patch	22 Apr 2006 01:53:19 -0000	1.2
@@ -24,14 +24,3 @@
  };
  static const int nstandard_iwads = sizeof standard_iwads/sizeof*standard_iwads;
  
-diff -Naur --exclude '*.swp' prboom-2.4.1/src/s_sound.c prboom-2.4.1.new/src/s_sound.c
---- prboom-2.4.1/src/s_sound.c	2006-04-01 06:32:50.000000000 -0800
-+++ prboom-2.4.1.new/src/s_sound.c	2006-04-20 15:16:09.000000000 -0700
-@@ -505,6 +505,7 @@
- 
-       // load & register it
-       music->data = W_CacheLumpNum(music->lumpnum);
-+      fprintf(stderr, "Loading music lump #%d\n", music->lumpnum);
-       music->handle = I_RegisterSong(music->data, W_LumpLength(music->lumpnum));
-     }
- 



From fedora-extras-commits at redhat.com  Sat Apr 22 01:59:03 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 18:59:03 -0700
Subject: rpms/perl-Authen-SASL/devel .cvsignore, 1.3,
	1.4 perl-Authen-SASL.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200604220159.k3M1x54P002851@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Authen-SASL/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2828

Modified Files:
	.cvsignore perl-Authen-SASL.spec sources 
Log Message:
Update to 2.10.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Authen-SASL/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	26 Apr 2005 17:14:22 -0000	1.3
+++ .cvsignore	22 Apr 2006 01:59:02 -0000	1.4
@@ -1 +1 @@
-Authen-SASL-2.09.tar.gz
+Authen-SASL-2.10.tar.gz


Index: perl-Authen-SASL.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Authen-SASL/devel/perl-Authen-SASL.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Authen-SASL.spec	17 Feb 2006 19:55:58 -0000	1.5
+++ perl-Authen-SASL.spec	22 Apr 2006 01:59:02 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Authen-SASL
-Version:        2.09
-Release:        4%{?dist}
+Version:        2.10
+Release:        1%{?dist}
 Summary:        SASL Authentication framework for Perl
 
 Group:          Development/Libraries
@@ -10,7 +10,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl >= 1:5.6.1, perl(Digest::HMAC)
+BuildRequires:  perl >= 1:5.6.1
+BuildRequires:  perl(Digest::HMAC)
+BuildRequires:  perl(GSSAPI)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -52,6 +54,9 @@
 
 
 %changelog
+* Sat Apr 22 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.10-1
+- Update to 2.10.
+
 * Fri Feb 17 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.09-4
 - Rebuild for FC5 (perl 5.8.8).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Authen-SASL/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Apr 2005 17:14:22 -0000	1.3
+++ sources	22 Apr 2006 01:59:02 -0000	1.4
@@ -1 +1 @@
-e11b60f58850ff6e71e6e1813c1f5e31  Authen-SASL-2.09.tar.gz
+041ce912640c5dff626a91435a359b88  Authen-SASL-2.10.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 02:13:32 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Fri, 21 Apr 2006 19:13:32 -0700
Subject: rpms/ghc/FC-5 .cvsignore, 1.5, 1.6 ghc.spec, 1.12, 1.13 sources, 1.5,
	1.6 ghc-6.4.1-gcc41.patch, 1.1, NONE
Message-ID: <200604220213.k3M2DYu0005120@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5099

Modified Files:
	.cvsignore ghc.spec sources 
Removed Files:
	ghc-6.4.1-gcc41.patch 
Log Message:
- update to 6.4.2 release
  - ghc-6.4.1-gcc41.patch no longer needed



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghc/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Sep 2005 23:37:16 -0000	1.5
+++ .cvsignore	22 Apr 2006 02:13:32 -0000	1.6
@@ -1 +1 @@
-ghc-6.4.1-src.tar.bz2
+ghc-6.4.2-src.tar.bz2


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/FC-5/ghc.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ghc.spec	22 Mar 2006 03:32:33 -0000	1.12
+++ ghc.spec	22 Apr 2006 02:13:32 -0000	1.13
@@ -1,12 +1,12 @@
-%define ghcver ghc641
+%define ghcver ghc642
 
 # speed up test builds by not building profiled libraries
 %define build_prof 1
 %define build_doc 1
 
 Name:		ghc
-Version:	6.4.1
-Release:	4%{?dist}
+Version:	6.4.2
+Release:	1%{?dist}
 Summary:	Glasgow Haskell Compilation system
 License:	BSD style
 Group:		Development/Languages
@@ -14,14 +14,13 @@
 URL:		http://haskell.org/ghc/
 Requires:	%{ghcver} = %{version}-%{release}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	ghc, sed
-Buildrequires:	gmp-devel, readline-devel, libX11-devel, freeglut-devel, openal-devel
+BuildRequires:  ghc, sed
+Buildrequires:  gmp-devel, readline-devel, libX11-devel, freeglut-devel, openal-devel
 %if %{build_doc}
 # haddock generates libraries/ docs
-Buildrequires:	libxslt, docbook-style-xsl, haddock
+Buildrequires: libxslt, docbook-style-xsl, haddock
 %endif
 Prefix:		%{_prefix}
-Patch1:		ghc-6.4.1-gcc41.patch
 
 %description
 GHC is a state-of-the-art programming suite for Haskell, a purely
@@ -79,7 +78,6 @@
 
 %prep
 %setup -q -n ghc-%{version}
-%patch1 -p1 -b .1-gcc
 
 %build
 %if !%{build_prof}
@@ -158,6 +156,10 @@
 %endif
 
 %changelog
+* Sat Apr 22 2006 Jens Petersen <petersen at redhat.com> - 6.4.2-1.fc5
+- update to 6.4.2 release
+  - ghc-6.4.1-gcc41.patch no longer needed
+
 * Wed Mar 22 2006 Jens Petersen <petersen at redhat.com> - 6.4.1-4.fc5
 - add ghc-6.4.1-gcc41.patch from gentoo-haskell to fix stage2 linking on x86_64
   (Chris Parrott, #185914)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghc/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Sep 2005 23:37:16 -0000	1.5
+++ sources	22 Apr 2006 02:13:32 -0000	1.6
@@ -1 +1 @@
-fd289bc7c3afa272ff831a71a50b5b00  ghc-6.4.1-src.tar.bz2
+a394bf14e94c3bca5507d568fcc03375  ghc-6.4.2-src.tar.bz2


--- ghc-6.4.1-gcc41.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Apr 22 02:32:55 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Fri, 21 Apr 2006 19:32:55 -0700
Subject: rpms/netcdf/FC-4 .cvsignore, 1.4, 1.5 netcdf.spec, 1.11,
	1.12 sources, 1.4, 1.5
Message-ID: <200604220232.k3M2WvdF005397@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/netcdf/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5344/FC-4

Modified Files:
	.cvsignore netcdf.spec sources 
Log Message:
update to upstream 3.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/netcdf/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Apr 2005 03:33:33 -0000	1.4
+++ .cvsignore	22 Apr 2006 02:32:55 -0000	1.5
@@ -1 +1 @@
-netcdf-3.6.0-p1.tar.gz
+netcdf-3.6.1.tar.gz


Index: netcdf.spec
===================================================================
RCS file: /cvs/extras/rpms/netcdf/FC-4/netcdf.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- netcdf.spec	16 Oct 2005 06:11:55 -0000	1.11
+++ netcdf.spec	22 Apr 2006 02:32:55 -0000	1.12
@@ -1,12 +1,12 @@
 Name:           netcdf
-Version:        3.6.0
-Release:        8.p1%{?dist}
+Version:        3.6.1
+Release:        1%{?dist}
 Summary:        Libraries for the Unidata network Common Data Form (NetCDF v3)
 
 Group:          Applications/Engineering
 License:        NetCDF
 URL:            http://my.unidata.ucar.edu/content/software/netcdf/index.html
-Source0:        ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-3.6.0-p1.tar.gz
+Source0:        ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-3.6.1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gcc-gfortran
@@ -53,13 +53,14 @@
 
 
 %prep
-%setup -q -n netcdf-3.6.0-p1
+%setup -q
 
 
 %build
 cd src
-export FC="gfortran"
-export CPPFLAGS="-fPIC"
+export FC="g77"
+export F90=
+export CPPFLAGS="-fPIC -Df2cFortran"
 export FFLAGS="-fPIC"
 %configure
 #  WARNING!
@@ -69,7 +70,9 @@
 mkdir lib_g77
 cp libsrc/libnetcdf.a lib_g77
 make clean
-CPPFLAGS="-fPIC -DpgiFortran"
+export FC="gfortran"
+export F90="gfortran"
+export CPPFLAGS="-fPIC -DpgiFortran"
 %configure
 make
 #  The below seems to work but I worry that it would lead to odd runtime
@@ -78,6 +81,7 @@
 #  one for the older g77 and one for gfortran.
 #    ar cru libsrc/libnetcdf.a lib_g77/libnetcdf.a
 unset FC
+unset F90
 unset CPPFLAGS
 unset FFLAGS
 
@@ -116,6 +120,9 @@
 
 
 %changelog
+* Fri Apr 21 2006 Ed Hill <ed at eh3.com> - 3.6.1-1
+- update to upstream 3.6.1
+
 * Sun Oct 16 2005 Ed Hill <ed at eh3.com> - 3.6.0-8.p1
 - building the library twice (once each for g77 and gfortran) 
   fixes an annoying problem for people who need both compilers


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/netcdf/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Apr 2005 03:33:33 -0000	1.4
+++ sources	22 Apr 2006 02:32:55 -0000	1.5
@@ -1 +1 @@
-27c193e0462d9979406d167a01a5ee95  netcdf-3.6.0-p1.tar.gz
+07a9db424337c5e4833fb84136e09a1e  netcdf-3.6.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 02:32:56 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Fri, 21 Apr 2006 19:32:56 -0700
Subject: rpms/netcdf/FC-5 .cvsignore, 1.4, 1.5 netcdf.spec, 1.13,
	1.14 sources, 1.4, 1.5
Message-ID: <200604220232.k3M2Wwvw005403@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/netcdf/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5344/FC-5

Modified Files:
	.cvsignore netcdf.spec sources 
Log Message:
update to upstream 3.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/netcdf/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Apr 2005 03:33:33 -0000	1.4
+++ .cvsignore	22 Apr 2006 02:32:56 -0000	1.5
@@ -1 +1 @@
-netcdf-3.6.0-p1.tar.gz
+netcdf-3.6.1.tar.gz


Index: netcdf.spec
===================================================================
RCS file: /cvs/extras/rpms/netcdf/FC-5/netcdf.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- netcdf.spec	17 Feb 2006 02:45:55 -0000	1.13
+++ netcdf.spec	22 Apr 2006 02:32:56 -0000	1.14
@@ -1,12 +1,12 @@
 Name:           netcdf
-Version:        3.6.0
-Release:        10.p1%{?dist}
+Version:        3.6.1
+Release:        1%{?dist}
 Summary:        Libraries for the Unidata network Common Data Form (NetCDF v3)
 
 Group:          Applications/Engineering
 License:        NetCDF
 URL:            http://my.unidata.ucar.edu/content/software/netcdf/index.html
-Source0:        ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-3.6.0-p1.tar.gz
+Source0:        ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-3.6.1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gcc-gfortran
@@ -53,13 +53,14 @@
 
 
 %prep
-%setup -q -n netcdf-3.6.0-p1
+%setup -q
 
 
 %build
 cd src
-export FC="gfortran"
-export CPPFLAGS="-fPIC"
+export FC="g77"
+export F90=
+export CPPFLAGS="-fPIC -Df2cFortran"
 export FFLAGS="-fPIC"
 %configure
 #  WARNING!
@@ -69,7 +70,9 @@
 mkdir lib_g77
 cp libsrc/libnetcdf.a lib_g77
 make clean
-CPPFLAGS="-fPIC -DpgiFortran"
+export FC="gfortran"
+export F90="gfortran"
+export CPPFLAGS="-fPIC -DpgiFortran"
 %configure
 make
 #  The below seems to work but I worry that it would lead to odd runtime
@@ -78,6 +81,7 @@
 #  one for the older g77 and one for gfortran.
 #    ar cru libsrc/libnetcdf.a lib_g77/libnetcdf.a
 unset FC
+unset F90
 unset CPPFLAGS
 unset FFLAGS
 
@@ -116,6 +120,9 @@
 
 
 %changelog
+* Fri Apr 21 2006 Ed Hill <ed at eh3.com> - 3.6.1-1
+- update to upstream 3.6.1
+
 * Thu Feb 16 2006 Ed Hill <ed at eh3.com> - 3.6.0-10.p1
 - rebuild for new GCC
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/netcdf/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Apr 2005 03:33:33 -0000	1.4
+++ sources	22 Apr 2006 02:32:56 -0000	1.5
@@ -1 +1 @@
-27c193e0462d9979406d167a01a5ee95  netcdf-3.6.0-p1.tar.gz
+07a9db424337c5e4833fb84136e09a1e  netcdf-3.6.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 02:32:57 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Fri, 21 Apr 2006 19:32:57 -0700
Subject: rpms/netcdf/devel .cvsignore, 1.4, 1.5 netcdf.spec, 1.13,
	1.14 sources, 1.4, 1.5
Message-ID: <200604220232.k3M2WxDp005409@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/netcdf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5344/devel

Modified Files:
	.cvsignore netcdf.spec sources 
Log Message:
update to upstream 3.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/netcdf/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Apr 2005 03:33:33 -0000	1.4
+++ .cvsignore	22 Apr 2006 02:32:57 -0000	1.5
@@ -1 +1 @@
-netcdf-3.6.0-p1.tar.gz
+netcdf-3.6.1.tar.gz


Index: netcdf.spec
===================================================================
RCS file: /cvs/extras/rpms/netcdf/devel/netcdf.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- netcdf.spec	17 Feb 2006 02:45:55 -0000	1.13
+++ netcdf.spec	22 Apr 2006 02:32:57 -0000	1.14
@@ -1,12 +1,12 @@
 Name:           netcdf
-Version:        3.6.0
-Release:        10.p1%{?dist}
+Version:        3.6.1
+Release:        1%{?dist}
 Summary:        Libraries for the Unidata network Common Data Form (NetCDF v3)
 
 Group:          Applications/Engineering
 License:        NetCDF
 URL:            http://my.unidata.ucar.edu/content/software/netcdf/index.html
-Source0:        ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-3.6.0-p1.tar.gz
+Source0:        ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-3.6.1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gcc-gfortran
@@ -53,13 +53,14 @@
 
 
 %prep
-%setup -q -n netcdf-3.6.0-p1
+%setup -q
 
 
 %build
 cd src
-export FC="gfortran"
-export CPPFLAGS="-fPIC"
+export FC="g77"
+export F90=
+export CPPFLAGS="-fPIC -Df2cFortran"
 export FFLAGS="-fPIC"
 %configure
 #  WARNING!
@@ -69,7 +70,9 @@
 mkdir lib_g77
 cp libsrc/libnetcdf.a lib_g77
 make clean
-CPPFLAGS="-fPIC -DpgiFortran"
+export FC="gfortran"
+export F90="gfortran"
+export CPPFLAGS="-fPIC -DpgiFortran"
 %configure
 make
 #  The below seems to work but I worry that it would lead to odd runtime
@@ -78,6 +81,7 @@
 #  one for the older g77 and one for gfortran.
 #    ar cru libsrc/libnetcdf.a lib_g77/libnetcdf.a
 unset FC
+unset F90
 unset CPPFLAGS
 unset FFLAGS
 
@@ -116,6 +120,9 @@
 
 
 %changelog
+* Fri Apr 21 2006 Ed Hill <ed at eh3.com> - 3.6.1-1
+- update to upstream 3.6.1
+
 * Thu Feb 16 2006 Ed Hill <ed at eh3.com> - 3.6.0-10.p1
 - rebuild for new GCC
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/netcdf/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Apr 2005 03:33:33 -0000	1.4
+++ sources	22 Apr 2006 02:32:57 -0000	1.5
@@ -1 +1 @@
-27c193e0462d9979406d167a01a5ee95  netcdf-3.6.0-p1.tar.gz
+07a9db424337c5e4833fb84136e09a1e  netcdf-3.6.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 02:53:07 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 21 Apr 2006 19:53:07 -0700
Subject: rpms/perl-DBIx-DBSchema/devel .cvsignore, 1.4,
	1.5 perl-DBIx-DBSchema.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <200604220253.k3M2r9F9005599@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-DBIx-DBSchema/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5578

Modified Files:
	.cvsignore perl-DBIx-DBSchema.spec sources 
Log Message:
* Sat Apr 22 2006  Ralf Cors??pius <rc040203 at freenet.de> - 0.31-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-DBSchema/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Feb 2006 09:59:16 -0000	1.4
+++ .cvsignore	22 Apr 2006 02:53:07 -0000	1.5
@@ -1 +1 @@
-DBIx-DBSchema-0.30.tar.gz
+DBIx-DBSchema-0.31.tar.gz


Index: perl-DBIx-DBSchema.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-DBSchema/devel/perl-DBIx-DBSchema.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-DBIx-DBSchema.spec	19 Feb 2006 09:59:16 -0000	1.5
+++ perl-DBIx-DBSchema.spec	22 Apr 2006 02:53:07 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           perl-DBIx-DBSchema
-Version:        0.30
+Version:        0.31
 Release:        1%{?dist}
 Summary:        Database-independent schema objects
 
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Sat Apr 22 2006  Ralf Cors??pius <rc040203 at freenet.de> - 0.31-1
+- Upstream update.
+
 * Sun Feb 19 2006  Ralf Cors??pius <rc040203 at freenet.de> - 0.30-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-DBSchema/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Feb 2006 09:59:16 -0000	1.4
+++ sources	22 Apr 2006 02:53:07 -0000	1.5
@@ -1 +1 @@
-be40b90e0e1e1bec35dbc8855351e925  DBIx-DBSchema-0.30.tar.gz
+bee0e44ff328adfea5b2c204ae5c606b  DBIx-DBSchema-0.31.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 03:07:18 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Fri, 21 Apr 2006 20:07:18 -0700
Subject: rpms/nco/FC-5 .cvsignore, 1.3, 1.4 nco.spec, 1.4,
	1.5 nco_install_C_headers.patch, 1.1, 1.2 sources, 1.3, 1.4
Message-ID: <200604220307.k3M37KgE007934@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/nco/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7873/FC-5

Modified Files:
	.cvsignore nco.spec nco_install_C_headers.patch sources 
Log Message:
update to new upstream 3.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nco/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Sep 2005 18:42:45 -0000	1.3
+++ .cvsignore	22 Apr 2006 03:07:18 -0000	1.4
@@ -1 +1 @@
-nco-3.0.2.tar.gz
+nco-3.1.2.tar.gz


Index: nco.spec
===================================================================
RCS file: /cvs/extras/rpms/nco/FC-5/nco.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nco.spec	17 Feb 2006 02:55:15 -0000	1.4
+++ nco.spec	22 Apr 2006 03:07:18 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           nco
-Version:        3.0.2
-Release:        2%{?dist}
+Version:        3.1.2
+Release:        1%{?dist}
 Summary:        Suite of programs for manipulating NetCDF/HDF4 files
 Group:          Applications/Engineering
 License:        GPL
@@ -12,9 +12,9 @@
 #    cvs -z3 -d:pserver:anonymous at cvs.sf.net:/cvsroot/nco co \
 #        -r nco-3_0_2 -d nco-3.0.2 nco
 #    tar -czf nco-3.0.2.tar.gz ./nco-3.0.2
-Source0:        nco-3.0.2.tar.gz
+Source0:        nco-3.1.2.tar.gz
 Patch0:		nco_install_C_headers.patch
-Patch1:         nco-3.0.0-fixudunits.patch
+#Patch1:         nco-3.0.0-fixudunits.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  netcdf-devel, libtool, automake, autoconf
@@ -51,19 +51,20 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+#%patch1 -p1
 
 %build
 aclocal
 autoheader
 automake --foreign
 autoconf
-export NETCDF_INC=%{_includedir}/netcdf-3 NETCDF_LIB=%{_libdir}/netcdf-3
+export CPPFLAGS=-I%{_includedir}/netcdf-3
+export LDFLAGS=-L%{_libdir}/netcdf-3
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
 export CXXFLAGS="$RPM_OPT_FLAGS -fpermissive -fPIC"
 %configure --includedir=%{_includedir}/nco
 make %{?_smp_mflags}
-unset NETCDF_INC NETCDF_LIB CPPFLAGS
+unset CPPFLAGS LDFLAGS CFLAGS CXXFLAGS
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -72,6 +73,7 @@
 make install DESTDIR=${RPM_BUILD_ROOT}
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la
 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
+rm -f ${RPM_BUILD_ROOT}%{_bindir}/mpnc*
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -106,6 +108,9 @@
 
 
 %changelog
+* Fri Apr 21 2006 Ed Hill <ed at eh3.com> - 3.1.2-1
+- update to new upstream 3.1.2
+
 * Thu Feb 16 2006 Ed Hill <ed at eh3.com> - 3.0.2-2
 - rebuild for new gcc
 

nco_install_C_headers.patch:

Index: nco_install_C_headers.patch
===================================================================
RCS file: /cvs/extras/rpms/nco/FC-5/nco_install_C_headers.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nco_install_C_headers.patch	21 Jul 2005 05:43:23 -0000	1.1
+++ nco_install_C_headers.patch	22 Apr 2006 03:07:18 -0000	1.2
@@ -1,11 +1,11 @@
---- nco-3.0.0/src/nco/Makefile.am	2004-08-06 12:44:00.000000000 -0400
-+++ nco-3.0.0_new/src/nco/Makefile.am	2005-04-18 08:54:22.000000000 -0400
-@@ -69,6 +69,8 @@
+--- nco-3.1.2/src/nco/Makefile.am.ORIG	2006-04-21 21:45:56.000000000 -0400
++++ nco-3.1.2/src/nco/Makefile.am	2006-04-21 21:46:52.000000000 -0400
+@@ -127,6 +127,8 @@
  # This creates version-stamped shared-library, e.g., libnco-2.9.4.so
  libnco_la_LDFLAGS = -release @VERSION@
  
 +include_HEADERS = $(HEADER_SRC)
 +
- libnco_la_SOURCES = nco_att_utl.c nco_bnr.c nco_cln_utl.c nco_cnf_dmn.c \
- nco_cnf_typ.c nco_cnv_arm.c nco_rth_flt.c ${NCO_GETOPT} \
- nco_cnv_csm.c nco_ctl.c nco_dbg.c nco_dmn_utl.c nco_fl_utl.c nco_lmt.c \
+ libnco_la_SOURCES = \
+ $(HEADER_SRC) \
+ ${NCO_GETOPT} \


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nco/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Sep 2005 18:42:45 -0000	1.3
+++ sources	22 Apr 2006 03:07:18 -0000	1.4
@@ -1 +1 @@
-46ddd902c9fd86e5d655ddcc8ce647c7  nco-3.0.2.tar.gz
+57164e52ae4cf67fa21edb062c746f52  nco-3.1.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 03:07:19 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Fri, 21 Apr 2006 20:07:19 -0700
Subject: rpms/nco/devel .cvsignore, 1.3, 1.4 nco.spec, 1.4,
	1.5 nco_install_C_headers.patch, 1.1, 1.2 sources, 1.3, 1.4
Message-ID: <200604220307.k3M37LBA007944@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/nco/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7873/devel

Modified Files:
	.cvsignore nco.spec nco_install_C_headers.patch sources 
Log Message:
update to new upstream 3.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nco/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Sep 2005 18:42:45 -0000	1.3
+++ .cvsignore	22 Apr 2006 03:07:19 -0000	1.4
@@ -1 +1 @@
-nco-3.0.2.tar.gz
+nco-3.1.2.tar.gz


Index: nco.spec
===================================================================
RCS file: /cvs/extras/rpms/nco/devel/nco.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nco.spec	17 Feb 2006 02:55:15 -0000	1.4
+++ nco.spec	22 Apr 2006 03:07:19 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           nco
-Version:        3.0.2
-Release:        2%{?dist}
+Version:        3.1.2
+Release:        1%{?dist}
 Summary:        Suite of programs for manipulating NetCDF/HDF4 files
 Group:          Applications/Engineering
 License:        GPL
@@ -12,9 +12,9 @@
 #    cvs -z3 -d:pserver:anonymous at cvs.sf.net:/cvsroot/nco co \
 #        -r nco-3_0_2 -d nco-3.0.2 nco
 #    tar -czf nco-3.0.2.tar.gz ./nco-3.0.2
-Source0:        nco-3.0.2.tar.gz
+Source0:        nco-3.1.2.tar.gz
 Patch0:		nco_install_C_headers.patch
-Patch1:         nco-3.0.0-fixudunits.patch
+#Patch1:         nco-3.0.0-fixudunits.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  netcdf-devel, libtool, automake, autoconf
@@ -51,19 +51,20 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+#%patch1 -p1
 
 %build
 aclocal
 autoheader
 automake --foreign
 autoconf
-export NETCDF_INC=%{_includedir}/netcdf-3 NETCDF_LIB=%{_libdir}/netcdf-3
+export CPPFLAGS=-I%{_includedir}/netcdf-3
+export LDFLAGS=-L%{_libdir}/netcdf-3
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
 export CXXFLAGS="$RPM_OPT_FLAGS -fpermissive -fPIC"
 %configure --includedir=%{_includedir}/nco
 make %{?_smp_mflags}
-unset NETCDF_INC NETCDF_LIB CPPFLAGS
+unset CPPFLAGS LDFLAGS CFLAGS CXXFLAGS
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -72,6 +73,7 @@
 make install DESTDIR=${RPM_BUILD_ROOT}
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la
 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
+rm -f ${RPM_BUILD_ROOT}%{_bindir}/mpnc*
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -106,6 +108,9 @@
 
 
 %changelog
+* Fri Apr 21 2006 Ed Hill <ed at eh3.com> - 3.1.2-1
+- update to new upstream 3.1.2
+
 * Thu Feb 16 2006 Ed Hill <ed at eh3.com> - 3.0.2-2
 - rebuild for new gcc
 

nco_install_C_headers.patch:

Index: nco_install_C_headers.patch
===================================================================
RCS file: /cvs/extras/rpms/nco/devel/nco_install_C_headers.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nco_install_C_headers.patch	21 Jul 2005 05:43:23 -0000	1.1
+++ nco_install_C_headers.patch	22 Apr 2006 03:07:19 -0000	1.2
@@ -1,11 +1,11 @@
---- nco-3.0.0/src/nco/Makefile.am	2004-08-06 12:44:00.000000000 -0400
-+++ nco-3.0.0_new/src/nco/Makefile.am	2005-04-18 08:54:22.000000000 -0400
-@@ -69,6 +69,8 @@
+--- nco-3.1.2/src/nco/Makefile.am.ORIG	2006-04-21 21:45:56.000000000 -0400
++++ nco-3.1.2/src/nco/Makefile.am	2006-04-21 21:46:52.000000000 -0400
+@@ -127,6 +127,8 @@
  # This creates version-stamped shared-library, e.g., libnco-2.9.4.so
  libnco_la_LDFLAGS = -release @VERSION@
  
 +include_HEADERS = $(HEADER_SRC)
 +
- libnco_la_SOURCES = nco_att_utl.c nco_bnr.c nco_cln_utl.c nco_cnf_dmn.c \
- nco_cnf_typ.c nco_cnv_arm.c nco_rth_flt.c ${NCO_GETOPT} \
- nco_cnv_csm.c nco_ctl.c nco_dbg.c nco_dmn_utl.c nco_fl_utl.c nco_lmt.c \
+ libnco_la_SOURCES = \
+ $(HEADER_SRC) \
+ ${NCO_GETOPT} \


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nco/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Sep 2005 18:42:45 -0000	1.3
+++ sources	22 Apr 2006 03:07:19 -0000	1.4
@@ -1 +1 @@
-46ddd902c9fd86e5d655ddcc8ce647c7  nco-3.0.2.tar.gz
+57164e52ae4cf67fa21edb062c746f52  nco-3.1.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 03:07:17 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Fri, 21 Apr 2006 20:07:17 -0700
Subject: rpms/nco/FC-4 .cvsignore, 1.3, 1.4 nco.spec, 1.3,
	1.4 nco_install_C_headers.patch, 1.1, 1.2 sources, 1.3, 1.4
Message-ID: <200604220307.k3M37nGN007953@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/nco/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7873/FC-4

Modified Files:
	.cvsignore nco.spec nco_install_C_headers.patch sources 
Log Message:
update to new upstream 3.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nco/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Sep 2005 18:41:53 -0000	1.3
+++ .cvsignore	22 Apr 2006 03:07:17 -0000	1.4
@@ -1 +1 @@
-nco-3.0.2.tar.gz
+nco-3.1.2.tar.gz


Index: nco.spec
===================================================================
RCS file: /cvs/extras/rpms/nco/FC-4/nco.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nco.spec	5 Sep 2005 18:41:53 -0000	1.3
+++ nco.spec	22 Apr 2006 03:07:17 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           nco
-Version:        3.0.2
+Version:        3.1.2
 Release:        1%{?dist}
 Summary:        Suite of programs for manipulating NetCDF/HDF4 files
 Group:          Applications/Engineering
@@ -12,9 +12,9 @@
 #    cvs -z3 -d:pserver:anonymous at cvs.sf.net:/cvsroot/nco co \
 #        -r nco-3_0_2 -d nco-3.0.2 nco
 #    tar -czf nco-3.0.2.tar.gz ./nco-3.0.2
-Source0:        nco-3.0.2.tar.gz
+Source0:        nco-3.1.2.tar.gz
 Patch0:		nco_install_C_headers.patch
-Patch1:         nco-3.0.0-fixudunits.patch
+#Patch1:         nco-3.0.0-fixudunits.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  netcdf-devel, libtool, automake, autoconf
@@ -51,19 +51,20 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+#%patch1 -p1
 
 %build
 aclocal
 autoheader
 automake --foreign
 autoconf
-export NETCDF_INC=%{_includedir}/netcdf-3 NETCDF_LIB=%{_libdir}/netcdf-3
+export CPPFLAGS=-I%{_includedir}/netcdf-3
+export LDFLAGS=-L%{_libdir}/netcdf-3
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
 export CXXFLAGS="$RPM_OPT_FLAGS -fpermissive -fPIC"
 %configure --includedir=%{_includedir}/nco
 make %{?_smp_mflags}
-unset NETCDF_INC NETCDF_LIB CPPFLAGS
+unset CPPFLAGS LDFLAGS CFLAGS CXXFLAGS
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -72,6 +73,7 @@
 make install DESTDIR=${RPM_BUILD_ROOT}
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la
 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
+rm -f ${RPM_BUILD_ROOT}%{_bindir}/mpnc*
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -106,6 +108,9 @@
 
 
 %changelog
+* Fri Apr 21 2006 Ed Hill <ed at eh3.com> - 3.1.2-1
+- update to new upstream 3.1.2
+
 * Mon Sep  5 2005 Ed Hill <ed at eh3.com> - 3.0.2-1
 - update to new upstream 3.0.2
 

nco_install_C_headers.patch:

Index: nco_install_C_headers.patch
===================================================================
RCS file: /cvs/extras/rpms/nco/FC-4/nco_install_C_headers.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nco_install_C_headers.patch	21 Jul 2005 05:43:23 -0000	1.1
+++ nco_install_C_headers.patch	22 Apr 2006 03:07:17 -0000	1.2
@@ -1,11 +1,11 @@
---- nco-3.0.0/src/nco/Makefile.am	2004-08-06 12:44:00.000000000 -0400
-+++ nco-3.0.0_new/src/nco/Makefile.am	2005-04-18 08:54:22.000000000 -0400
-@@ -69,6 +69,8 @@
+--- nco-3.1.2/src/nco/Makefile.am.ORIG	2006-04-21 21:45:56.000000000 -0400
++++ nco-3.1.2/src/nco/Makefile.am	2006-04-21 21:46:52.000000000 -0400
+@@ -127,6 +127,8 @@
  # This creates version-stamped shared-library, e.g., libnco-2.9.4.so
  libnco_la_LDFLAGS = -release @VERSION@
  
 +include_HEADERS = $(HEADER_SRC)
 +
- libnco_la_SOURCES = nco_att_utl.c nco_bnr.c nco_cln_utl.c nco_cnf_dmn.c \
- nco_cnf_typ.c nco_cnv_arm.c nco_rth_flt.c ${NCO_GETOPT} \
- nco_cnv_csm.c nco_ctl.c nco_dbg.c nco_dmn_utl.c nco_fl_utl.c nco_lmt.c \
+ libnco_la_SOURCES = \
+ $(HEADER_SRC) \
+ ${NCO_GETOPT} \


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nco/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Sep 2005 18:41:53 -0000	1.3
+++ sources	22 Apr 2006 03:07:17 -0000	1.4
@@ -1 +1 @@
-46ddd902c9fd86e5d655ddcc8ce647c7  nco-3.0.2.tar.gz
+57164e52ae4cf67fa21edb062c746f52  nco-3.1.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 03:10:59 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 21 Apr 2006 20:10:59 -0700
Subject: rpms/perl-DBIx-DBSchema/FC-5 .cvsignore, 1.4,
	1.5 perl-DBIx-DBSchema.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <200604220311.k3M3B1SC008113@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-DBIx-DBSchema/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8092

Modified Files:
	.cvsignore perl-DBIx-DBSchema.spec sources 
Log Message:
* Sat Apr 22 2006  Ralf Cors??pius <rc040203 at freenet.de> - 0.31-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-DBSchema/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Feb 2006 09:59:16 -0000	1.4
+++ .cvsignore	22 Apr 2006 03:10:59 -0000	1.5
@@ -1 +1 @@
-DBIx-DBSchema-0.30.tar.gz
+DBIx-DBSchema-0.31.tar.gz


Index: perl-DBIx-DBSchema.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-DBSchema/FC-5/perl-DBIx-DBSchema.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-DBIx-DBSchema.spec	19 Feb 2006 09:59:16 -0000	1.5
+++ perl-DBIx-DBSchema.spec	22 Apr 2006 03:10:59 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           perl-DBIx-DBSchema
-Version:        0.30
+Version:        0.31
 Release:        1%{?dist}
 Summary:        Database-independent schema objects
 
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Sat Apr 22 2006  Ralf Cors??pius <rc040203 at freenet.de> - 0.31-1
+- Upstream update.
+
 * Sun Feb 19 2006  Ralf Cors??pius <rc040203 at freenet.de> - 0.30-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-DBSchema/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Feb 2006 09:59:16 -0000	1.4
+++ sources	22 Apr 2006 03:10:59 -0000	1.5
@@ -1 +1 @@
-be40b90e0e1e1bec35dbc8855351e925  DBIx-DBSchema-0.30.tar.gz
+bee0e44ff328adfea5b2c204ae5c606b  DBIx-DBSchema-0.31.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 03:12:34 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 21 Apr 2006 20:12:34 -0700
Subject: rpms/perl-DBIx-DBSchema/FC-4 .cvsignore, 1.4,
	1.5 perl-DBIx-DBSchema.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <200604220312.k3M3Ca88008183@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-DBIx-DBSchema/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8162

Modified Files:
	.cvsignore perl-DBIx-DBSchema.spec sources 
Log Message:
* Sat Apr 22 2006  Ralf Cors??pius <rc040203 at freenet.de> - 0.31-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-DBSchema/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Feb 2006 10:00:30 -0000	1.4
+++ .cvsignore	22 Apr 2006 03:12:34 -0000	1.5
@@ -1 +1 @@
-DBIx-DBSchema-0.30.tar.gz
+DBIx-DBSchema-0.31.tar.gz


Index: perl-DBIx-DBSchema.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-DBSchema/FC-4/perl-DBIx-DBSchema.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-DBIx-DBSchema.spec	19 Feb 2006 10:00:30 -0000	1.5
+++ perl-DBIx-DBSchema.spec	22 Apr 2006 03:12:34 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           perl-DBIx-DBSchema
-Version:        0.30
+Version:        0.31
 Release:        1%{?dist}
 Summary:        Database-independent schema objects
 
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Sat Apr 22 2006  Ralf Cors??pius <rc040203 at freenet.de> - 0.31-1
+- Upstream update.
+
 * Sun Feb 19 2006  Ralf Cors??pius <rc040203 at freenet.de> - 0.30-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-DBSchema/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Feb 2006 10:00:30 -0000	1.4
+++ sources	22 Apr 2006 03:12:34 -0000	1.5
@@ -1 +1 @@
-be40b90e0e1e1bec35dbc8855351e925  DBIx-DBSchema-0.30.tar.gz
+bee0e44ff328adfea5b2c204ae5c606b  DBIx-DBSchema-0.31.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 03:46:34 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 21 Apr 2006 20:46:34 -0700
Subject: rpms/perl-DBIx-SearchBuilder/devel .cvsignore, 1.5,
	1.6 perl-DBIx-SearchBuilder.spec, 1.8, 1.9 sources, 1.5, 1.6
Message-ID: <200604220346.k3M3kaRa008417@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-serv8396

Modified Files:
	.cvsignore perl-DBIx-SearchBuilder.spec sources 
Log Message:
* Sat Apr 22 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.43-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Jan 2006 14:56:40 -0000	1.5
+++ .cvsignore	22 Apr 2006 03:46:34 -0000	1.6
@@ -1 +1 @@
-DBIx-SearchBuilder-1.38.tar.gz
+DBIx-SearchBuilder-1.43.tar.gz


Index: perl-DBIx-SearchBuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/devel/perl-DBIx-SearchBuilder.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-DBIx-SearchBuilder.spec	28 Feb 2006 23:19:32 -0000	1.8
+++ perl-DBIx-SearchBuilder.spec	22 Apr 2006 03:46:34 -0000	1.9
@@ -6,8 +6,8 @@
 #
 
 Name: 		perl-DBIx-SearchBuilder
-Version: 	1.38
-Release: 	2%{?dist}
+Version: 	1.43
+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
+* Sat Apr 22 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.43-1
+- Upstream update.
+
 * Wed Mar 01 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.38-2
 - Rebuild for perl-5.8.8.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Jan 2006 14:56:40 -0000	1.5
+++ sources	22 Apr 2006 03:46:34 -0000	1.6
@@ -1 +1 @@
-409f13913799709b890583535cd18446  DBIx-SearchBuilder-1.38.tar.gz
+3d4c4dfc46617f87f53645241288505f  DBIx-SearchBuilder-1.43.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 03:58:06 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 21 Apr 2006 20:58:06 -0700
Subject: rpms/perl-DBIx-SearchBuilder/FC-5 .cvsignore, 1.5,
	1.6 perl-DBIx-SearchBuilder.spec, 1.8, 1.9 sources, 1.5, 1.6
Message-ID: <200604220358.k3M3w8xM008501@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-serv8480

Modified Files:
	.cvsignore perl-DBIx-SearchBuilder.spec sources 
Log Message:
clog


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Jan 2006 14:56:40 -0000	1.5
+++ .cvsignore	22 Apr 2006 03:58:06 -0000	1.6
@@ -1 +1 @@
-DBIx-SearchBuilder-1.38.tar.gz
+DBIx-SearchBuilder-1.43.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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-DBIx-SearchBuilder.spec	28 Feb 2006 23:19:32 -0000	1.8
+++ perl-DBIx-SearchBuilder.spec	22 Apr 2006 03:58:06 -0000	1.9
@@ -6,8 +6,8 @@
 #
 
 Name: 		perl-DBIx-SearchBuilder
-Version: 	1.38
-Release: 	2%{?dist}
+Version: 	1.43
+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
+* Sat Apr 22 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.43-1
+- Upstream update.
+
 * Wed Mar 01 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.38-2
 - Rebuild for perl-5.8.8.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Jan 2006 14:56:40 -0000	1.5
+++ sources	22 Apr 2006 03:58:06 -0000	1.6
@@ -1 +1 @@
-409f13913799709b890583535cd18446  DBIx-SearchBuilder-1.38.tar.gz
+3d4c4dfc46617f87f53645241288505f  DBIx-SearchBuilder-1.43.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 04:01:57 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 21 Apr 2006 21:01:57 -0700
Subject: rpms/perl-DBIx-SearchBuilder/FC-4 .cvsignore, 1.3,
	1.4 perl-DBIx-SearchBuilder.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200604220402.k3M42U7i010642@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-DBIx-SearchBuilder/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10619

Modified Files:
	.cvsignore perl-DBIx-SearchBuilder.spec sources 
Log Message:
* Sat Apr 22 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.43-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Jan 2006 06:24:51 -0000	1.3
+++ .cvsignore	22 Apr 2006 04:01:54 -0000	1.4
@@ -1 +1 @@
-DBIx-SearchBuilder-1.38.tar.gz
+DBIx-SearchBuilder-1.43.tar.gz


Index: perl-DBIx-SearchBuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/FC-4/perl-DBIx-SearchBuilder.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-DBIx-SearchBuilder.spec	15 Jan 2006 06:24:51 -0000	1.3
+++ perl-DBIx-SearchBuilder.spec	22 Apr 2006 04:01:54 -0000	1.4
@@ -6,7 +6,7 @@
 #
 
 Name: 		perl-DBIx-SearchBuilder
-Version: 	1.38
+Version: 	1.43
 Release: 	1%{?dist}
 Summary: 	Encapsulate SQL queries and rows in simple perl objects
 License: 	GPL or Artistic
@@ -94,6 +94,9 @@
 %endif
 
 %changelog
+* Sat Apr 22 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.43-1
+- Upstream update.
+
 * Sun Jan 15 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.38-1
 - Update to 1.38.
 - Add a private copy of Test-Simple-0.62 to work around PR #166475.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Jan 2006 06:24:51 -0000	1.3
+++ sources	22 Apr 2006 04:01:54 -0000	1.4
@@ -1 +1 @@
-409f13913799709b890583535cd18446  DBIx-SearchBuilder-1.38.tar.gz
+3d4c4dfc46617f87f53645241288505f  DBIx-SearchBuilder-1.43.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 04:23:12 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 21 Apr 2006 21:23:12 -0700
Subject: rpms/perl-Locale-Maketext-Lexicon/devel .cvsignore, 1.5,
	1.6 perl-Locale-Maketext-Lexicon.spec, 1.7, 1.8 sources, 1.5, 1.6
Message-ID: <200604220423.k3M4NE5g010801@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10780

Modified Files:
	.cvsignore perl-Locale-Maketext-Lexicon.spec sources 
Log Message:
* Sat Apr 22 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.60-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Mar 2006 02:52:18 -0000	1.5
+++ .cvsignore	22 Apr 2006 04:23:12 -0000	1.6
@@ -1 +1 @@
-Locale-Maketext-Lexicon-0.54.tar.gz
+Locale-Maketext-Lexicon-0.60.tar.gz


Index: perl-Locale-Maketext-Lexicon.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel/perl-Locale-Maketext-Lexicon.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Locale-Maketext-Lexicon.spec	19 Mar 2006 02:52:18 -0000	1.7
+++ perl-Locale-Maketext-Lexicon.spec	22 Apr 2006 04:23:12 -0000	1.8
@@ -1,5 +1,5 @@
 Name: 		perl-Locale-Maketext-Lexicon
-Version: 	0.54
+Version: 	0.60
 Release: 	1%{?dist}
 Summary: 	Extract translatable strings from source
 License:	GPL or Artistic
@@ -55,6 +55,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Apr 22 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.60-1
+- Upstream update.
+
 * Sun Mar 19 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.54-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Mar 2006 02:52:18 -0000	1.5
+++ sources	22 Apr 2006 04:23:12 -0000	1.6
@@ -1 +1 @@
-2adcb8651081bcb07629305f8b5e8f71  Locale-Maketext-Lexicon-0.54.tar.gz
+242998c3f513999d2e57c396647f0bd2  Locale-Maketext-Lexicon-0.60.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 07:07:31 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sat, 22 Apr 2006 00:07:31 -0700
Subject: owners owners.list,1.871,1.872
Message-ID: <200604220707.k3M77XRW017475@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17458

Modified Files:
	owners.list 
Log Message:
Echoping added



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.871
retrieving revision 1.872
diff -u -r1.871 -r1.872
--- owners.list	21 Apr 2006 23:13:28 -0000	1.871
+++ owners.list	22 Apr 2006 07:07:30 -0000	1.872
@@ -215,6 +215,7 @@
 Fedora Extras|dynamite|Extract data compressed with PKWARE Data Compression Library|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|easytag|Tag editor for MP3, MP2, FLAC and OGG files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|ebtables|Ethernet Bridge frame table administration tool|tcallawa at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|echoping|TCP "echo" performance test|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|ecl|Embeddable Common-Lisp|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|ecore|An event and X abstraction layer|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|edb|A database convenience library wrapped around BDB|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Apr 22 07:08:51 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sat, 22 Apr 2006 00:08:51 -0700
Subject: rpms/echoping - New directory
Message-ID: <200604220708.k3M78rT8017550@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/echoping
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17529/echoping

Log Message:
Directory /cvs/extras/rpms/echoping added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 22 07:08:51 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sat, 22 Apr 2006 00:08:51 -0700
Subject: rpms/echoping/devel - New directory
Message-ID: <200604220708.k3M78rCB017553@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/echoping/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17529/echoping/devel

Log Message:
Directory /cvs/extras/rpms/echoping/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 22 07:09:10 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sat, 22 Apr 2006 00:09:10 -0700
Subject: rpms/echoping Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604220709.k3M79CUg017607@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/echoping
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17574

Added Files:
	Makefile import.log 
Log Message:
Setup of module echoping


--- NEW FILE Makefile ---
# Top level Makefile for module echoping
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 22 07:09:11 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sat, 22 Apr 2006 00:09:11 -0700
Subject: rpms/echoping/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604220709.k3M79DIc017610@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/echoping/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17574/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module echoping


--- 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 Apr 22 07:09:40 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sat, 22 Apr 2006 00:09:40 -0700
Subject: rpms/echoping import.log,1.1,1.2
Message-ID: <200604220709.k3M79gIG017673@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/echoping
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17638

Modified Files:
	import.log 
Log Message:
auto-import echoping-5.2.0-1 on branch devel from echoping-5.2.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/echoping/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Apr 2006 07:09:10 -0000	1.1
+++ import.log	22 Apr 2006 07:09:40 -0000	1.2
@@ -0,0 +1 @@
+echoping-5_2_0-1:HEAD:echoping-5.2.0-1.src.rpm:1145689773



From fedora-extras-commits at redhat.com  Sat Apr 22 07:09:41 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sat, 22 Apr 2006 00:09:41 -0700
Subject: rpms/echoping/devel echoping.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604220709.k3M79hMx017678@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/echoping/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17638/devel

Modified Files:
	.cvsignore sources 
Added Files:
	echoping.spec 
Log Message:
auto-import echoping-5.2.0-1 on branch devel from echoping-5.2.0-1.src.rpm


--- NEW FILE echoping.spec ---
Summary: TCP "echo" performance test
Name: echoping
Version: 5.2.0
Release: 1%{?dist}
License: GPL
Group: Applications/Internet
Source0: ftp://ftp.internatif.org/pub/unix/echoping/echoping-%{version}.tar.gz
URL: http://echoping.sourceforge.net/
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: openssl-devel, libidn-devel

%description
"echoping" is a small program to test (approximatively) performances of a
remote host by sending it TCP "echo" (or other protocol, such as HTTP)
packets.

%prep
%setup -q

%build
%configure \
	--enable-icp \
	--enable-http \
	--enable-smtp \
	--disable-ttcp \
	--enable-tos \
	--enable-priority \
 	--with-libidn \
	--with-ssl \
	--without-gnutls

%{__make} %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%doc AUTHORS COPYING ChangeLog README TODO DETAILS
%{_bindir}/echoping
%{_mandir}/man1/echoping.1*

%changelog
* Wed Mar 13 2006 Andreas Thienemann <andreas at bawue.net> 5.2.0-1
- Initial FE release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/echoping/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Apr 2006 07:09:11 -0000	1.1
+++ .cvsignore	22 Apr 2006 07:09:41 -0000	1.2
@@ -0,0 +1 @@
+echoping-5.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/echoping/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Apr 2006 07:09:11 -0000	1.1
+++ sources	22 Apr 2006 07:09:41 -0000	1.2
@@ -0,0 +1 @@
+aef46a1d09a1083e99eb5e18e9184af2  echoping-5.2.0.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 07:13:00 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Sat, 22 Apr 2006 00:13:00 -0700
Subject: owners owners.list,1.872,1.873
Message-ID: <200604220713.k3M7D2Ek017790@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17766/owners

Modified Files:
	owners.list 
Log Message:
Add bsdiff



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.872
retrieving revision 1.873
diff -u -r1.872 -r1.873
--- owners.list	22 Apr 2006 07:07:30 -0000	1.872
+++ owners.list	22 Apr 2006 07:13:00 -0000	1.873
@@ -91,6 +91,7 @@
 Fedora Extras|bochs|Bochs Project x86 PC Emulator|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|bonnie++|Bonnie++ filesystem and disk benchmark & burn-in suite|wtogami at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|brightside|Add reactivity to the corners and edges of your GNOME desktop|fedora at leemhuis.info|extras-qa at fedoraproject.org|
+Fedora Extras|bsdiff|Binary diff/patch utility|jnovy at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|bubblemon|A system monitoring dockapp|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|buildsystem|Fedora-Extras Buildsystem|skvidal at phy.duke.edu|extras-qa at fedoraproject.org|
 Fedora Extras|buoh|Online comics reader|chabotc at xs4all.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Apr 22 07:41:24 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 22 Apr 2006 00:41:24 -0700
Subject: rpms/koffice/FC-4 koffice.spec,1.12,1.13
Message-ID: <200604220741.k3M7fQWd017985@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17935/FC-4

Modified Files:
	koffice.spec 
Log Message:
- fix exclude



Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-4/koffice.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- koffice.spec	16 Apr 2006 22:05:51 -0000	1.12
+++ koffice.spec	22 Apr 2006 07:41:24 -0000	1.13
@@ -526,8 +526,6 @@
 %{_datadir}/apps/kross
 %{_libdir}/kde3/krosspython.*
 %{_libdir}/kde3/krossruby.*
-# why is this still here on fc5 and not on devel?
-%exclude %{_datadir}/mimelnk/image/x-raw.desktop
 
 %files devel
 %{_includedir}/*



From fedora-extras-commits at redhat.com  Sat Apr 22 07:41:25 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 22 Apr 2006 00:41:25 -0700
Subject: rpms/koffice/devel koffice.spec,1.34,1.35
Message-ID: <200604220741.k3M7fR7h017991@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17935/devel

Modified Files:
	koffice.spec 
Log Message:
- fix exclude



Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- koffice.spec	16 Apr 2006 22:05:52 -0000	1.34
+++ koffice.spec	22 Apr 2006 07:41:25 -0000	1.35
@@ -527,8 +527,6 @@
 %{_datadir}/apps/kross
 %{_libdir}/kde3/krosspython.*
 %{_libdir}/kde3/krossruby.*
-# why is this still here on fc5 and not on devel?
-%exclude %{_datadir}/mimelnk/image/x-raw.desktop
 
 %files devel
 %{_includedir}/*



From fedora-extras-commits at redhat.com  Sat Apr 22 07:41:25 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 22 Apr 2006 00:41:25 -0700
Subject: rpms/koffice/FC-5 koffice.spec,1.35,1.36
Message-ID: <200604220741.k3M7fRmL017989@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17935/FC-5

Modified Files:
	koffice.spec 
Log Message:
- fix exclude



Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-5/koffice.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- koffice.spec	16 Apr 2006 22:05:51 -0000	1.35
+++ koffice.spec	22 Apr 2006 07:41:24 -0000	1.36
@@ -527,8 +527,6 @@
 %{_datadir}/apps/kross
 %{_libdir}/kde3/krosspython.*
 %{_libdir}/kde3/krossruby.*
-# why is this still here on fc5 and not on devel?
-%exclude %{_datadir}/mimelnk/image/x-raw.desktop
 
 %files devel
 %{_includedir}/*



From fedora-extras-commits at redhat.com  Sat Apr 22 09:30:51 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 22 Apr 2006 02:30:51 -0700
Subject: rpms/scribus/devel .cvsignore, 1.8, 1.9 scribus.spec, 1.18,
	1.19 sources, 1.8, 1.9
Message-ID: <200604220930.k3M9Ursb022697@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/scribus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22676

Modified Files:
	.cvsignore scribus.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scribus/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	30 Mar 2006 05:39:42 -0000	1.8
+++ .cvsignore	22 Apr 2006 09:30:51 -0000	1.9
@@ -1 +1 @@
-scribus-1.3.3.tar.bz2
+scribus-1.3.3.1.tar.bz2


Index: scribus.spec
===================================================================
RCS file: /cvs/extras/rpms/scribus/devel/scribus.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- scribus.spec	30 Mar 2006 07:10:48 -0000	1.18
+++ scribus.spec	22 Apr 2006 09:30:51 -0000	1.19
@@ -1,5 +1,5 @@
 Name:           scribus
-Version:        1.3.3
+Version:        1.3.3.1
 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://www.scribus.org.uk/downloads/1.3.3/scribus-1.3.3.tar.bz2
+Source0:        http://dl.sf.net/scribus/scribus-1.3.3.1.tar.bz2
 Source1:        scribus.xml
 Source2:	scribus.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -137,6 +137,10 @@
 
 
 %changelog
+* Sat Apr 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.3.3.1-1
+- version upgrade
+
 * Tue Mar 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.3.3-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scribus/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	30 Mar 2006 05:39:42 -0000	1.8
+++ sources	22 Apr 2006 09:30:51 -0000	1.9
@@ -1 +1 @@
-3d1dc7f13573243569b18239149b4e6c  scribus-1.3.3.tar.bz2
+73864eea86de686904f4741ef35152ca  scribus-1.3.3.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Apr 22 13:08:42 2006
From: fedora-extras-commits at redhat.com (Gijs Hollestelle (gijs))
Date: Sat, 22 Apr 2006 06:08:42 -0700
Subject: rpms/python-cherrypy/devel .cvsignore, 1.5,
	1.6 python-cherrypy-regression-test.patch, 1.2,
	1.3 python-cherrypy-tutorial-doc.patch, 1.4,
	1.5 python-cherrypy.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <200604221308.k3MD8jwc032358@cvs-int.fedora.redhat.com>

Author: gijs

Update of /cvs/extras/rpms/python-cherrypy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32327

Modified Files:
	.cvsignore python-cherrypy-regression-test.patch 
	python-cherrypy-tutorial-doc.patch python-cherrypy.spec 
	sources 
Log Message:
* Sat Apr 22 2006 Gijs Hollestelle <gijs at gewis.nl> 2.2.0-1
- Update to 2.2.0




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-cherrypy/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Feb 2006 22:36:02 -0000	1.5
+++ .cvsignore	22 Apr 2006 13:08:42 -0000	1.6
@@ -1 +1 @@
-CherryPy-2.1.1.tar.gz
+CherryPy-2.2.0.tar.gz

python-cherrypy-regression-test.patch:

Index: python-cherrypy-regression-test.patch
===================================================================
RCS file: /cvs/extras/rpms/python-cherrypy/devel/python-cherrypy-regression-test.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-cherrypy-regression-test.patch	1 Nov 2005 11:58:15 -0000	1.2
+++ python-cherrypy-regression-test.patch	22 Apr 2006 13:08:42 -0000	1.3
@@ -1,11 +1,10 @@
---- CherryPy-2.1.0/cherrypy/test/test.py-orig	2005-10-21 15:43:04.000000000 +0200
-+++ CherryPy-2.1.0/cherrypy/test/test.py	2005-11-01 12:06:51.000000000 +0100
-@@ -350,7 +350,7 @@
-     CPTestHarness(testList).run()
-     
-     print
--    raw_input('hit enter')
-+
- 
- 
- if __name__ == '__main__':
+--- CherryPy-2.2.0/cherrypy/test/test.py.orig	2006-03-30 17:36:26.000000000 +0200
++++ CherryPy-2.2.0/cherrypy/test/test.py	2006-04-22 14:55:47.000000000 +0200
+@@ -311,7 +311,6 @@
+     CommandLineParser(testList).run()
+     
+     print
+-    raw_input('hit enter')
+ 
+ 
+ if __name__ == '__main__':

python-cherrypy-tutorial-doc.patch:

Index: python-cherrypy-tutorial-doc.patch
===================================================================
RCS file: /cvs/extras/rpms/python-cherrypy/devel/python-cherrypy-tutorial-doc.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-cherrypy-tutorial-doc.patch	21 Feb 2006 22:36:02 -0000	1.4
+++ python-cherrypy-tutorial-doc.patch	22 Apr 2006 13:08:42 -0000	1.5
@@ -1,11 +1,13 @@
---- CherryPy-2.1.1-orig/setup.py	2006-02-22 00:28:44.000000000 +0100
-+++ CherryPy-2.1.1/setup.py	2006-02-22 00:31:11.000000000 +0100
-@@ -35,21 +35,9 @@
+--- CherryPy-2.2.0/setup.py.orig	2006-04-22 15:04:08.000000000 +0200
++++ CherryPy-2.2.0/setup.py	2006-04-22 15:04:27.000000000 +0200
+@@ -36,23 +36,11 @@
  cp_license="BSD"
  packages=[
      "cherrypy", "cherrypy.lib", "cherrypy.lib.filter",
--    "cherrypy.tutorial", "cherrypy.test",
+-    "cherrypy.tutorial", "cherrypy.test", "cherrypy.filters",
++    "cherrypy.filters",
  ]
+ download_url="http://sourceforge.net/project/showfiles.php?group_id=56099"
  data_files=[
 -    ('cherrypy/tutorial',
 -        [
@@ -18,7 +20,8 @@
      ('cherrypy', ['cherrypy/favicon.ico',]),
 -    ('cherrypy/test', ['cherrypy/test/style.css',]),
 -    ('cherrypy/test/static', ['cherrypy/test/static/index.html',
--                              'cherrypy/test/static/has space.html',]),
+-                              'cherrypy/test/static/has space.html',
+-                              'cherrypy/test/static/dirback.jpg',]),
  ]
  ###############################################################################
  # end arguments for setup


Index: python-cherrypy.spec
===================================================================
RCS file: /cvs/extras/rpms/python-cherrypy/devel/python-cherrypy.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-cherrypy.spec	21 Feb 2006 22:36:02 -0000	1.6
+++ python-cherrypy.spec	22 Apr 2006 13:08:42 -0000	1.7
@@ -2,13 +2,13 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-cherrypy
-Version:        2.1.1
+Version:        2.2.0
 Release:        1%{?dist}
 Summary:        A pythonic, object-oriented web development framework
 Group:          Development/Libraries
 License:        BSD
 URL:            http://www.cherrypy.org/
-Source0:        http://dl.sf.net/cherrypy/CherryPy-2.1.1.tar.gz
+Source0:        http://dl.sf.net/cherrypy/CherryPy-2.2.0.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:         python-cherrypy-tutorial-doc.patch
 Patch1:         python-cherrypy-regression-test.patch
@@ -22,7 +22,7 @@
 results in smaller source code developed in less time.
 
 %prep
-%setup -q -n CherryPy-2.1.1
+%setup -q -n CherryPy-2.2.0
 %patch0 -p1 
 %patch1 -p1
 
@@ -58,8 +58,14 @@
 %{python_sitelib}/cherrypy/lib/filter/*.py
 %{python_sitelib}/cherrypy/lib/filter/*.pyc
 %ghost %{python_sitelib}/cherrypy/lib/filter/*.pyo
+%{python_sitelib}/cherrypy/filters/*.py
+%{python_sitelib}/cherrypy/filters/*.pyc
+%ghost %{python_sitelib}/cherrypy/filters/*.pyo
 
 %changelog
+* Sat Apr 22 2006 Gijs Hollestelle <gijs at gewis.nl> 2.2.0-1
+- Update to 2.2.0
+
 * Wed Feb 22 2006 Gijs Hollestelle <gijs at gewis.nl> 2.1.1-1
 - Update to 2.1.1 (Security fix)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-cherrypy/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Feb 2006 22:36:02 -0000	1.5
+++ sources	22 Apr 2006 13:08:42 -0000	1.6
@@ -1 +1 @@
-f36d73a8c38c1444285b37c3451dce86  CherryPy-2.1.1.tar.gz
+13ea297f2f0c650cca856276a45ed29a  CherryPy-2.2.0.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 14:13:13 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 22 Apr 2006 07:13:13 -0700
Subject: rpms/liferea/devel .cvsignore, 1.25, 1.26 liferea.spec, 1.37,
	1.38 sources, 1.26, 1.27
Message-ID: <200604221413.k3MEDFhR002292@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/liferea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2271

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
* Sat Apr 22 2006 Brian Pepple <bdpepple at ameritech.net> - 1.0.10-3
- Update to 1.0.10,
- Delete origianl desktop file with desktop-file-install call.
- Remove *.la, instead of excluding.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	5 Apr 2006 17:38:50 -0000	1.25
+++ .cvsignore	22 Apr 2006 14:13:13 -0000	1.26
@@ -1 +1 @@
-liferea-1.0.9.tar.gz
+liferea-1.0.10.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- liferea.spec	5 Apr 2006 17:38:50 -0000	1.37
+++ liferea.spec	22 Apr 2006 14:13:13 -0000	1.38
@@ -1,7 +1,7 @@
 %define with_dbus 1
 
 Name:           liferea
-Version:        1.0.9
+Version:        1.0.10
 Release:        3%{?dist}
 Summary:        An RSS/RDF feed reader
 
@@ -56,11 +56,12 @@
 make install DESTDIR=${RPM_BUILD_ROOT}
 %find_lang %{name}
 
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
-desktop-file-install --vendor fedora			\
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
+
+desktop-file-install --vendor fedora --delete-original	\
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications   	\
   --add-category X-Fedora			        \
-  %{name}.desktop
+  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
 
 %clean
@@ -101,10 +102,14 @@
 %{_datadir}/pixmaps/%{name}.png
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/*.so*
-%exclude %{_libdir}/%{name}/*.la
 
 
 %changelog
+* Sat Apr 22 2006 Brian Pepple <bdpepple at ameritech.net> - 1.0.10-3
+- Update to 1.0.10,
+- Delete origianl desktop file with desktop-file-install call.
+- Remove *.la, instead of excluding.
+
 * Wed Apr  5 2006 Brian Pepple <bdpepple at ameritech.net> - 1.0.9-3
 - Update to 1.0.9.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	5 Apr 2006 17:38:50 -0000	1.26
+++ sources	22 Apr 2006 14:13:13 -0000	1.27
@@ -1 +1 @@
-60f743fcb41876ad2d02f6da88251c31  liferea-1.0.9.tar.gz
+41201991b4d7a113169ebda3e7dc54ef  liferea-1.0.10.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 14:17:53 2006
From: fedora-extras-commits at redhat.com (Damian Myerscough (damian))
Date: Sat, 22 Apr 2006 07:17:53 -0700
Subject: hwtracker - Imported sources
Message-ID: <200604221417.k3MEHrMH002468@cvs-int.fedora.redhat.com>

Author: damian

Update of /cvs/devel/hwtracker
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2442

Log Message:
Hardware Tracker

Status:

Vendor Tag:	hwtracker
Release Tags:	start
		
N hwtracker/main.c
N hwtracker/xml.c
N hwtracker/hal-device
N hwtracker/.devs.xml.swo
N hwtracker/.devs.xml.swp
N hwtracker/devs.xml
N hwtracker/.xml.h.swp
N hwtracker/xml.h

No conflicts created by this import




From fedora-extras-commits at redhat.com  Sat Apr 22 14:21:26 2006
From: fedora-extras-commits at redhat.com (Damian Myerscough (damian))
Date: Sat, 22 Apr 2006 07:21:26 -0700
Subject: hwtracker hal-device,1.1.1.1,NONE
Message-ID: <200604221421.k3MELQSh002789@cvs-int.fedora.redhat.com>

Author: damian

Update of /cvs/devel/hwtracker
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2743

Removed Files:
	hal-device 
Log Message:



--- hal-device DELETED ---



From fedora-extras-commits at redhat.com  Sat Apr 22 14:48:25 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 22 Apr 2006 07:48:25 -0700
Subject: rpms/poker-eval - New directory
Message-ID: <200604221448.k3MEmRS6003337@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/poker-eval
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3311/poker-eval

Log Message:
Directory /cvs/extras/rpms/poker-eval added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 22 14:48:26 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 22 Apr 2006 07:48:26 -0700
Subject: rpms/poker-eval/devel - New directory
Message-ID: <200604221448.k3MEmSOs003340@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/poker-eval/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3311/poker-eval/devel

Log Message:
Directory /cvs/extras/rpms/poker-eval/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 22 14:48:45 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 22 Apr 2006 07:48:45 -0700
Subject: rpms/poker-eval Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604221448.k3MEmloo003385@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/poker-eval
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3357

Added Files:
	Makefile import.log 
Log Message:
Setup of module poker-eval


--- NEW FILE Makefile ---
# Top level Makefile for module poker-eval
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 22 14:48:46 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 22 Apr 2006 07:48:46 -0700
Subject: rpms/poker-eval/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604221448.k3MEmm7G003388@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/poker-eval/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3357/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module poker-eval


--- 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 Apr 22 14:49:20 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 22 Apr 2006 07:49:20 -0700
Subject: rpms/poker-eval import.log,1.1,1.2
Message-ID: <200604221449.k3MEnqeu003463@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/poker-eval
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3426

Modified Files:
	import.log 
Log Message:
auto-import poker-eval-130.0-2 on branch devel from poker-eval-130.0-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/poker-eval/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Apr 2006 14:48:45 -0000	1.1
+++ import.log	22 Apr 2006 14:49:19 -0000	1.2
@@ -0,0 +1 @@
+poker-eval-130_0-2:HEAD:poker-eval-130.0-2.src.rpm:1145717353



From fedora-extras-commits at redhat.com  Sat Apr 22 14:49:20 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 22 Apr 2006 07:49:20 -0700
Subject: rpms/poker-eval/devel poker-eval.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604221449.k3MEnqt1003467@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/poker-eval/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3426/devel

Modified Files:
	.cvsignore sources 
Added Files:
	poker-eval.spec 
Log Message:
auto-import poker-eval-130.0-2 on branch devel from poker-eval-130.0-2.src.rpm


--- NEW FILE poker-eval.spec ---
Name:           poker-eval
Version:	130.0
Release:        2%{?dist}
Summary:        Poker hand evaluator library
Group:          Development/Libraries
License:        GPL
URL:            https://gna.org/projects/pokersource/
Source0:        http://download.gna.org/pokersource/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
This package is a free (GPL) toolkit for writing programs which
simulate or analyze poker games.

%package devel
Summary:        Poker hand evaluator library development files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description devel
This package contains headers and libraries required to build applications that
use poker-eval.

%prep
%setup -q
chmod -x examples/five_card_hands.c

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

%check
make %{?_smp_mflags} check

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README TODO
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc examples/*.c
%{_includedir}/%{name}
%{_libdir}/*.so
%{_libdir}/pkgconfig/%{name}.pc
%exclude %{_libdir}/*.la

%changelog
* Tue Apr 18 2006 Christopher Stone <chris.stone at gmail.com> 130.0-2
- Added %check section
- Removed make build_tables
- Updated Source0 and URL

* Thu Mar 30 2006 Loic Dachary <loic at gnu.org> - 130.0-1
- upstream sync

* Sat Mar 18 2006 Christopher Stone <chris.stone at gmail.com> 129.0-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/poker-eval/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Apr 2006 14:48:46 -0000	1.1
+++ .cvsignore	22 Apr 2006 14:49:20 -0000	1.2
@@ -0,0 +1 @@
+poker-eval-130.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/poker-eval/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Apr 2006 14:48:46 -0000	1.1
+++ sources	22 Apr 2006 14:49:20 -0000	1.2
@@ -0,0 +1 @@
+b6feea367ba1c49d85fb04cf5913e2d9  poker-eval-130.0.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 14:52:48 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 22 Apr 2006 07:52:48 -0700
Subject: owners owners.list,1.873,1.874
Message-ID: <200604221452.k3MEqoN3003534@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3517

Modified Files:
	owners.list 
Log Message:
Add poker-eval


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.873
retrieving revision 1.874
diff -u -r1.873 -r1.874
--- owners.list	22 Apr 2006 07:13:00 -0000	1.873
+++ owners.list	22 Apr 2006 14:52:47 -0000	1.874
@@ -1195,6 +1195,7 @@
 Fedora Extras|plone|User friendly and powerful open source Content Management System|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|plplot|Library of functions for making scientific plots|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|plt-scheme|Graphical environment for developing programs using Scheme|gemi at bluewin.ch|extras-qa at fedoraproject.org|
+Fedora Extras|poker-eval|Poker hand evaluator library|tkmame at retrogames.com|extras-qa at fedoraproject.org|loic at gnu.org
 Fedora Extras|polyxmass-bin|The GNU polyxmass software suite|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|polyxmass-common|Contains all textual/graphical data required for polyxmass|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|polyxmass-data|Contains configuration files describing polymer chemistry|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Apr 22 15:42:38 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 22 Apr 2006 08:42:38 -0700
Subject: rpms/evas/FC-5 evas.spec,1.4,1.5
Message-ID: <200604221543.k3MFhAAs005785@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/evas/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5753/FC-5

Modified Files:
	evas.spec 
Log Message:
- Split out edb and directfb packages
- Added upstream Provides
- Enabled fontconfig font searching



Index: evas.spec
===================================================================
RCS file: /cvs/extras/rpms/evas/FC-5/evas.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- evas.spec	18 Apr 2006 12:45:23 -0000	1.4
+++ evas.spec	22 Apr 2006 15:42:38 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           evas
 Version:        0.9.9.026
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A hardware-accelerated canvas API
 
 Group:          System Environment/Libraries
@@ -14,7 +14,20 @@
 BuildRequires:  libjpeg-devel
 BuildRequires:  xorg-x11-proto-devel libX11-devel libXext-devel
 BuildRequires:  libXrender-devel mesa-libGL-devel mesa-libGLU-devel
-BuildRequires:  libICE-devel
+BuildRequires:  libICE-devel fontconfig-devel
+#BuildRequires:  cairo-devel
+
+Provides:       %{name}-module_loader_eet = %{version}-%{release}
+Provides:       %{name}-module_saver_eet = %{version}-%{release}
+Provides:       %{name}-module_loader_jpeg = %{version}-%{release}
+Provides:       %{name}-module_saver_jpeg = %{version}-%{release}
+Provides:       %{name}-module_loader_png = %{version}-%{release}
+Provides:       %{name}-module_saver_png = %{version}-%{release}
+#Provides:       %{name}-module_engine_cairo_x11 = %{version}-%{release}
+Provides:       %{name}-module_engine_fb = %{version}-%{release}
+Provides:       %{name}-module_engine_gl_x11 = %{version}-%{release}
+Provides:       %{name}-module_engine_software_x11 = %{version}-%{release}
+Provides:       %{name}-module_engine_xrender_x11 = %{version}-%{release}
 
 %description
 Evas is a hardware-accelerated canvas API for X-Windows that can draw
@@ -36,6 +49,25 @@
 The evas-devel package contains libraries and header files for developing
 evas applications.
 
+%package        directfb
+Summary:        evas support for DirectFB
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+Provides:       %{name}-module_engine_directfb = %{version}-%{release}
+
+%description    directfb
+This package contains the DirectFB engine for evas.
+
+%package        edb
+Summary:        evas support for edb
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+Provides:       %{name}-module_loader_edb = %{version}-%{release}
+Provides:       %{name}-module_saver_edb = %{version}-%{release}
+
+%description    edb
+This package contains the edb loader and saver for evas.
+
 %prep
 %setup -q
 %patch -p 1 -b .novera
@@ -59,12 +91,30 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING-PLAIN README
-%{_bindir}/*_load
-%{_bindir}/*_test
-%{_bindir}/*_window
+%{_bindir}/%{name}_buffer*
+%{_bindir}/%{name}_fb*
+%{_bindir}/%{name}_gl_x11*
+%{_bindir}/%{name}_software_x11*
+%{_bindir}/%{name}_xrender_x11*
 %{_datadir}/%{name}
 %{_libdir}/*.so.*
-%{_libdir}/%{name}
+%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/modules
+%dir %{_libdir}/%{name}/modules/engines
+%dir %{_libdir}/%{name}/modules/loaders
+%dir %{_libdir}/%{name}/modules/savers
+%{_libdir}/%{name}/modules/engines/buffer
+%{_libdir}/%{name}/modules/engines/fb
+%{_libdir}/%{name}/modules/engines/gl_x11
+%{_libdir}/%{name}/modules/engines/software_generic
+%{_libdir}/%{name}/modules/engines/software_x11
+%{_libdir}/%{name}/modules/engines/xrender_x11
+%{_libdir}/%{name}/modules/loaders/eet
+%{_libdir}/%{name}/modules/loaders/jpeg
+%{_libdir}/%{name}/modules/loaders/png
+%{_libdir}/%{name}/modules/savers/eet
+%{_libdir}/%{name}/modules/savers/jpeg
+%{_libdir}/%{name}/modules/savers/png
 
 %files devel
 %defattr(-,root,root,-)
@@ -74,7 +124,24 @@
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 
+%files directfb
+%defattr(-,root,root,-)
+%doc
+%{_bindir}/evas_directfb*
+%{_libdir}/%{name}/modules/engines/directfb
+
+%files edb
+%defattr(-,root,root,-)
+%doc
+%{_libdir}/%{name}/modules/loaders/edb
+%{_libdir}/%{name}/modules/savers/edb
+
 %changelog
+* Sat Apr 22 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.9.026-2
+- Split out edb and directfb packages
+- Added upstream Provides
+- Enabled fontconfig font searching
+
 * Tue Apr 18 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.9.026-1
 - Upstream update
 



From fedora-extras-commits at redhat.com  Sat Apr 22 15:42:39 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 22 Apr 2006 08:42:39 -0700
Subject: rpms/evas/devel evas.spec,1.4,1.5
Message-ID: <200604221543.k3MFhBSO005788@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/evas/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5753/devel

Modified Files:
	evas.spec 
Log Message:
- Split out edb and directfb packages
- Added upstream Provides
- Enabled fontconfig font searching



Index: evas.spec
===================================================================
RCS file: /cvs/extras/rpms/evas/devel/evas.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- evas.spec	18 Apr 2006 12:45:24 -0000	1.4
+++ evas.spec	22 Apr 2006 15:42:39 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           evas
 Version:        0.9.9.026
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A hardware-accelerated canvas API
 
 Group:          System Environment/Libraries
@@ -14,7 +14,20 @@
 BuildRequires:  libjpeg-devel
 BuildRequires:  xorg-x11-proto-devel libX11-devel libXext-devel
 BuildRequires:  libXrender-devel mesa-libGL-devel mesa-libGLU-devel
-BuildRequires:  libICE-devel
+BuildRequires:  libICE-devel fontconfig-devel
+#BuildRequires:  cairo-devel
+
+Provides:       %{name}-module_loader_eet = %{version}-%{release}
+Provides:       %{name}-module_saver_eet = %{version}-%{release}
+Provides:       %{name}-module_loader_jpeg = %{version}-%{release}
+Provides:       %{name}-module_saver_jpeg = %{version}-%{release}
+Provides:       %{name}-module_loader_png = %{version}-%{release}
+Provides:       %{name}-module_saver_png = %{version}-%{release}
+#Provides:       %{name}-module_engine_cairo_x11 = %{version}-%{release}
+Provides:       %{name}-module_engine_fb = %{version}-%{release}
+Provides:       %{name}-module_engine_gl_x11 = %{version}-%{release}
+Provides:       %{name}-module_engine_software_x11 = %{version}-%{release}
+Provides:       %{name}-module_engine_xrender_x11 = %{version}-%{release}
 
 %description
 Evas is a hardware-accelerated canvas API for X-Windows that can draw
@@ -36,6 +49,25 @@
 The evas-devel package contains libraries and header files for developing
 evas applications.
 
+%package        directfb
+Summary:        evas support for DirectFB
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+Provides:       %{name}-module_engine_directfb = %{version}-%{release}
+
+%description    directfb
+This package contains the DirectFB engine for evas.
+
+%package        edb
+Summary:        evas support for edb
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+Provides:       %{name}-module_loader_edb = %{version}-%{release}
+Provides:       %{name}-module_saver_edb = %{version}-%{release}
+
+%description    edb
+This package contains the edb loader and saver for evas.
+
 %prep
 %setup -q
 %patch -p 1 -b .novera
@@ -59,12 +91,30 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING-PLAIN README
-%{_bindir}/*_load
-%{_bindir}/*_test
-%{_bindir}/*_window
+%{_bindir}/%{name}_buffer*
+%{_bindir}/%{name}_fb*
+%{_bindir}/%{name}_gl_x11*
+%{_bindir}/%{name}_software_x11*
+%{_bindir}/%{name}_xrender_x11*
 %{_datadir}/%{name}
 %{_libdir}/*.so.*
-%{_libdir}/%{name}
+%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/modules
+%dir %{_libdir}/%{name}/modules/engines
+%dir %{_libdir}/%{name}/modules/loaders
+%dir %{_libdir}/%{name}/modules/savers
+%{_libdir}/%{name}/modules/engines/buffer
+%{_libdir}/%{name}/modules/engines/fb
+%{_libdir}/%{name}/modules/engines/gl_x11
+%{_libdir}/%{name}/modules/engines/software_generic
+%{_libdir}/%{name}/modules/engines/software_x11
+%{_libdir}/%{name}/modules/engines/xrender_x11
+%{_libdir}/%{name}/modules/loaders/eet
+%{_libdir}/%{name}/modules/loaders/jpeg
+%{_libdir}/%{name}/modules/loaders/png
+%{_libdir}/%{name}/modules/savers/eet
+%{_libdir}/%{name}/modules/savers/jpeg
+%{_libdir}/%{name}/modules/savers/png
 
 %files devel
 %defattr(-,root,root,-)
@@ -74,7 +124,24 @@
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 
+%files directfb
+%defattr(-,root,root,-)
+%doc
+%{_bindir}/evas_directfb*
+%{_libdir}/%{name}/modules/engines/directfb
+
+%files edb
+%defattr(-,root,root,-)
+%doc
+%{_libdir}/%{name}/modules/loaders/edb
+%{_libdir}/%{name}/modules/savers/edb
+
 %changelog
+* Sat Apr 22 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.9.026-2
+- Split out edb and directfb packages
+- Added upstream Provides
+- Enabled fontconfig font searching
+
 * Tue Apr 18 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.9.026-1
 - Upstream update
 



From fedora-extras-commits at redhat.com  Sat Apr 22 19:52:31 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Sat, 22 Apr 2006 12:52:31 -0700
Subject: rpms/iperf/devel - New directory
Message-ID: <200604221952.k3MJqXKU015041@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/iperf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15017/iperf/devel

Log Message:
Directory /cvs/extras/rpms/iperf/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 22 19:52:30 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Sat, 22 Apr 2006 12:52:30 -0700
Subject: rpms/iperf - New directory
Message-ID: <200604221952.k3MJqWkK015038@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/iperf
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15017/iperf

Log Message:
Directory /cvs/extras/rpms/iperf added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 22 19:52:42 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Sat, 22 Apr 2006 12:52:42 -0700
Subject: rpms/iperf Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604221952.k3MJqici015097@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/iperf
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15064

Added Files:
	Makefile import.log 
Log Message:
Setup of module iperf


--- NEW FILE Makefile ---
# Top level Makefile for module iperf
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 22 19:52:43 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Sat, 22 Apr 2006 12:52:43 -0700
Subject: rpms/iperf/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200604221952.k3MJqjsS015102@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/iperf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15064/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module iperf


--- 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 Apr 22 19:52:56 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Sat, 22 Apr 2006 12:52:56 -0700
Subject: rpms/iperf import.log,1.1,1.2
Message-ID: <200604221952.k3MJqwjM015179@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/iperf
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15146

Modified Files:
	import.log 
Log Message:
auto-import iperf-2.0.2-1 on branch devel from iperf-2.0.2-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/iperf/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Apr 2006 19:52:42 -0000	1.1
+++ import.log	22 Apr 2006 19:52:56 -0000	1.2
@@ -0,0 +1 @@
+iperf-2_0_2-1:HEAD:iperf-2.0.2-1.src.rpm:1145735573



From fedora-extras-commits at redhat.com  Sat Apr 22 19:52:57 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Sat, 22 Apr 2006 12:52:57 -0700
Subject: rpms/iperf/devel iperf.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200604221953.k3MJqxD2015184@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/iperf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15146/devel

Modified Files:
	.cvsignore sources 
Added Files:
	iperf.spec 
Log Message:
auto-import iperf-2.0.2-1 on branch devel from iperf-2.0.2-1.src.rpm


--- NEW FILE iperf.spec ---
Name: iperf
Version: 2.0.2
Release: 1%{?dist}
Summary: Measurement tool for TCP/UDP bandwidth performance
License: BSD
Group: Applications/Internet
URL: http://dast.nlanr.net/Projects/Iperf/
Source: http://dast.nlanr.net/Projects/Iperf2.0/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Iperf is a tool to measure maximum TCP bandwidth, allowing the tuning of
various parameters and UDP characteristics. Iperf reports bandwidth, delay
jitter, datagram loss.

%prep
%setup -q

%build
%configure
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%makeinstall -C src INSTALL_DIR="%{buildroot}%{_bindir}"

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root)
%doc README doc/*.gif doc/*.html
%{_bindir}/iperf

%changelog
* Wed Apr 19 2006 Gabriel Somlo <somlo at cmu.edu> 2.0.2-1
- initial build for fedora extras (based on Dag Wieers SRPM)
- fixed license tag: BSD (U. of IL / NCSA), not GPL


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/iperf/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Apr 2006 19:52:43 -0000	1.1
+++ .cvsignore	22 Apr 2006 19:52:57 -0000	1.2
@@ -0,0 +1 @@
+iperf-2.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/iperf/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Apr 2006 19:52:43 -0000	1.1
+++ sources	22 Apr 2006 19:52:57 -0000	1.2
@@ -0,0 +1 @@
+bb658aba58a5af0356f5b1342dfe8f53  iperf-2.0.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 19:52:45 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 22 Apr 2006 12:52:45 -0700
Subject: rpms/poker-eval/devel poker-eval.spec,1.1,1.2
Message-ID: <200604221953.k3MJrH1I015213@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/poker-eval/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15101

Modified Files:
	poker-eval.spec 
Log Message:
Move .c files in samples/ dir for devel %doc


Index: poker-eval.spec
===================================================================
RCS file: /cvs/extras/rpms/poker-eval/devel/poker-eval.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- poker-eval.spec	22 Apr 2006 14:49:20 -0000	1.1
+++ poker-eval.spec	22 Apr 2006 19:52:45 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           poker-eval
 Version:	130.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Poker hand evaluator library
 Group:          Development/Libraries
 License:        GPL
@@ -23,8 +23,13 @@
 
 %prep
 %setup -q
+
+# rpmlint fix
 chmod -x examples/five_card_hands.c
 
+# use samples/ directory for devel package %doc section
+mkdir samples/ && cp examples/*.c samples/
+
 %build
 %configure --disable-static
 make %{?_smp_mflags}
@@ -49,13 +54,16 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc examples/*.c
+%doc samples
 %{_includedir}/%{name}
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/%{name}.pc
 %exclude %{_libdir}/*.la
 
 %changelog
+* Sat Apr 22 2006 Christopher Stone <chris.stone at gmail.com> 130.0-3
+- Copy .c files in samples directory and use this for devel's %doc
+
 * Tue Apr 18 2006 Christopher Stone <chris.stone at gmail.com> 130.0-2
 - Added %check section
 - Removed make build_tables



From fedora-extras-commits at redhat.com  Sat Apr 22 19:56:07 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Sat, 22 Apr 2006 12:56:07 -0700
Subject: owners owners.list,1.874,1.875
Message-ID: <200604221956.k3MJu9sJ015268@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15247/owners

Modified Files:
	owners.list 
Log Message:
added entry for iperf



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.874
retrieving revision 1.875
diff -u -r1.874 -r1.875
--- owners.list	22 Apr 2006 14:52:47 -0000	1.874
+++ owners.list	22 Apr 2006 19:56:07 -0000	1.875
@@ -490,6 +490,7 @@
 Fedora Extras|Inventor|SGI Open Inventor (TM)|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|iozone|A file system performance analysis tool|nhorman at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|ip-sentinel|Tool to prevent unauthorized usage of IP addresses|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
+Fedora Extras|iperf|Measurement tool for TCP/UDP bandwidth performance|somlo at cmu.edu|extras-qa at fedoraproject.org|
 Fedora Extras|ipod-sharp|Provides high-level feature support for Apple's iPod and binds libipoddevice|caillon at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|ipxripd|IPX RIP/SAP daemon - routing for IPX networks|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|ipython|An enhanced interactive Python shell|shahms at shahms.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Apr 22 20:32:57 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 22 Apr 2006 13:32:57 -0700
Subject: rpms/pcsc-lite/FC-5 .cvsignore, 1.3, 1.4 pcsc-lite.spec, 1.8,
	1.9 sources, 1.3, 1.4
Message-ID: <200604222032.k3MKWxPS017560@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/pcsc-lite/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17523/FC-5

Modified Files:
	.cvsignore pcsc-lite.spec sources 
Log Message:
* Sat Apr 22 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.1-1
- 1.3.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pcsc-lite/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Mar 2006 15:27:11 -0000	1.3
+++ .cvsignore	22 Apr 2006 20:32:57 -0000	1.4
@@ -1 +1 @@
-pcsc-lite-1.3.0.tar.gz
+pcsc-lite-1.3.1.tar.gz


Index: pcsc-lite.spec
===================================================================
RCS file: /cvs/extras/rpms/pcsc-lite/FC-5/pcsc-lite.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pcsc-lite.spec	6 Mar 2006 15:27:15 -0000	1.8
+++ pcsc-lite.spec	22 Apr 2006 20:32:57 -0000	1.9
@@ -1,12 +1,12 @@
 Name:           pcsc-lite
-Version:        1.3.0
+Version:        1.3.1
 Release:        1%{?dist}
 Summary:        PC/SC Lite smart card framework and applications
 
 Group:          System Environment/Daemons
 License:        BSD
 URL:            http://pcsclite.alioth.debian.org/
-Source0:        https://alioth.debian.org/download.php/1472/%{name}-%{version}.tar.gz
+Source0:        http://alioth.debian.org/download.php/1565/%{name}-%{version}.tar.gz
 Patch0:         %{name}-docinst.patch
 Patch1:         %{name}-1.3.0-rpath64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -142,6 +142,9 @@
 
 
 %changelog
+* Sat Apr 22 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.1-1
+- 1.3.1.
+
 * Sun Mar  5 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.0-1
 - 1.3.0, init script and reader.conf updater included upstream.
 - Split developer docs into a -doc subpackage, include API docs.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pcsc-lite/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Mar 2006 15:27:15 -0000	1.3
+++ sources	22 Apr 2006 20:32:57 -0000	1.4
@@ -1 +1 @@
-ccbb595be0e1d47c9f9f449f183bea6c  pcsc-lite-1.3.0.tar.gz
+90fa7e9cdfdfe88fdf6644ca8b60a681  pcsc-lite-1.3.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 20:32:58 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 22 Apr 2006 13:32:58 -0700
Subject: rpms/pcsc-lite/devel .cvsignore, 1.3, 1.4 pcsc-lite.spec, 1.8,
	1.9 sources, 1.3, 1.4
Message-ID: <200604222033.k3MKX09q017566@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/pcsc-lite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17523/devel

Modified Files:
	.cvsignore pcsc-lite.spec sources 
Log Message:
* Sat Apr 22 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.1-1
- 1.3.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pcsc-lite/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Mar 2006 15:27:11 -0000	1.3
+++ .cvsignore	22 Apr 2006 20:32:58 -0000	1.4
@@ -1 +1 @@
-pcsc-lite-1.3.0.tar.gz
+pcsc-lite-1.3.1.tar.gz


Index: pcsc-lite.spec
===================================================================
RCS file: /cvs/extras/rpms/pcsc-lite/devel/pcsc-lite.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pcsc-lite.spec	6 Mar 2006 15:27:15 -0000	1.8
+++ pcsc-lite.spec	22 Apr 2006 20:32:58 -0000	1.9
@@ -1,12 +1,12 @@
 Name:           pcsc-lite
-Version:        1.3.0
+Version:        1.3.1
 Release:        1%{?dist}
 Summary:        PC/SC Lite smart card framework and applications
 
 Group:          System Environment/Daemons
 License:        BSD
 URL:            http://pcsclite.alioth.debian.org/
-Source0:        https://alioth.debian.org/download.php/1472/%{name}-%{version}.tar.gz
+Source0:        http://alioth.debian.org/download.php/1565/%{name}-%{version}.tar.gz
 Patch0:         %{name}-docinst.patch
 Patch1:         %{name}-1.3.0-rpath64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -142,6 +142,9 @@
 
 
 %changelog
+* Sat Apr 22 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.1-1
+- 1.3.1.
+
 * Sun Mar  5 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.0-1
 - 1.3.0, init script and reader.conf updater included upstream.
 - Split developer docs into a -doc subpackage, include API docs.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pcsc-lite/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Mar 2006 15:27:15 -0000	1.3
+++ sources	22 Apr 2006 20:32:58 -0000	1.4
@@ -1 +1 @@
-ccbb595be0e1d47c9f9f449f183bea6c  pcsc-lite-1.3.0.tar.gz
+90fa7e9cdfdfe88fdf6644ca8b60a681  pcsc-lite-1.3.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 20:33:58 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 22 Apr 2006 13:33:58 -0700
Subject: rpms/ccid/FC-5 .cvsignore, 1.3, 1.4 ccid.spec, 1.6, 1.7 sources, 1.3,
	1.4
Message-ID: <200604222034.k3MKY0dC017685@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/ccid/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17648/FC-5

Modified Files:
	.cvsignore ccid.spec sources 
Log Message:
* Sat Apr 22 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.0.1-1
- 1.0.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ccid/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Mar 2006 15:39:09 -0000	1.3
+++ .cvsignore	22 Apr 2006 20:33:57 -0000	1.4
@@ -1 +1 @@
-ccid-1.0.0.tar.gz
+ccid-1.0.1.tar.gz


Index: ccid.spec
===================================================================
RCS file: /cvs/extras/rpms/ccid/FC-5/ccid.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ccid.spec	6 Mar 2006 15:39:09 -0000	1.6
+++ ccid.spec	22 Apr 2006 20:33:57 -0000	1.7
@@ -1,14 +1,14 @@
-%define dropdir %(pkg-config libpcsclite --variable usbdropdir)
+%define dropdir %(pkg-config libpcsclite --variable usbdropdir 2>/dev/null)
 
 Name:           ccid
-Version:        1.0.0
+Version:        1.0.1
 Release:        1%{?dist}
 Summary:        Generic USB CCID smart card reader driver
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://pcsclite.alioth.debian.org/ccid.html
-Source0:        https://alioth.debian.org/download.php/1474/%{name}-%{version}.tar.gz
+Source0:        http://alioth.debian.org/download.php/1563/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libusb-devel >= 0.1.7
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Sat Apr 22 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.0.1-1
+- 1.0.1.
+
 * Mon Mar  6 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.0.0-1
 - 1.0.0, license changed to LGPL.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ccid/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Mar 2006 15:39:09 -0000	1.3
+++ sources	22 Apr 2006 20:33:57 -0000	1.4
@@ -1 +1 @@
-cae1d55c3361d6202adfdbea9d4e94d7  ccid-1.0.0.tar.gz
+858bd7d680cdaf0ac53c70d43974a2df  ccid-1.0.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 20:33:58 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 22 Apr 2006 13:33:58 -0700
Subject: rpms/ccid/devel .cvsignore, 1.3, 1.4 ccid.spec, 1.6, 1.7 sources,
	1.3, 1.4
Message-ID: <200604222034.k3MKY0AG017691@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/ccid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17648/devel

Modified Files:
	.cvsignore ccid.spec sources 
Log Message:
* Sat Apr 22 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.0.1-1
- 1.0.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ccid/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Mar 2006 15:39:09 -0000	1.3
+++ .cvsignore	22 Apr 2006 20:33:58 -0000	1.4
@@ -1 +1 @@
-ccid-1.0.0.tar.gz
+ccid-1.0.1.tar.gz


Index: ccid.spec
===================================================================
RCS file: /cvs/extras/rpms/ccid/devel/ccid.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ccid.spec	6 Mar 2006 15:39:09 -0000	1.6
+++ ccid.spec	22 Apr 2006 20:33:58 -0000	1.7
@@ -1,14 +1,14 @@
-%define dropdir %(pkg-config libpcsclite --variable usbdropdir)
+%define dropdir %(pkg-config libpcsclite --variable usbdropdir 2>/dev/null)
 
 Name:           ccid
-Version:        1.0.0
+Version:        1.0.1
 Release:        1%{?dist}
 Summary:        Generic USB CCID smart card reader driver
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://pcsclite.alioth.debian.org/ccid.html
-Source0:        https://alioth.debian.org/download.php/1474/%{name}-%{version}.tar.gz
+Source0:        http://alioth.debian.org/download.php/1563/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libusb-devel >= 0.1.7
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Sat Apr 22 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.0.1-1
+- 1.0.1.
+
 * Mon Mar  6 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.0.0-1
 - 1.0.0, license changed to LGPL.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ccid/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Mar 2006 15:39:09 -0000	1.3
+++ sources	22 Apr 2006 20:33:58 -0000	1.4
@@ -1 +1 @@
-cae1d55c3361d6202adfdbea9d4e94d7  ccid-1.0.0.tar.gz
+858bd7d680cdaf0ac53c70d43974a2df  ccid-1.0.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 20:35:04 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 22 Apr 2006 13:35:04 -0700
Subject: rpms/openct/devel .cvsignore, 1.4, 1.5 openct.spec, 1.9,
	1.10 sources, 1.4, 1.5 openct-0.6.6-rpath64.patch, 1.1,
	NONE openct-reader.conf, 1.1, NONE openct.rules, 1.1, NONE
Message-ID: <200604222035.k3MKZ6iU017728@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/openct/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17707

Modified Files:
	.cvsignore openct.spec sources 
Removed Files:
	openct-0.6.6-rpath64.patch openct-reader.conf openct.rules 
Log Message:
* Sat Apr 22 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.6.7-0.1.rc1
- 0.6.7-rc1, udev rules and reader.conf included upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Sep 2005 07:06:13 -0000	1.4
+++ .cvsignore	22 Apr 2006 20:35:04 -0000	1.5
@@ -1 +1 @@
-openct-0.6.6.tar.gz
+openct-0.6.7-rc1.tar.gz


Index: openct.spec
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/openct.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- openct.spec	6 Mar 2006 15:50:50 -0000	1.9
+++ openct.spec	22 Apr 2006 20:35:04 -0000	1.10
@@ -1,25 +1,22 @@
 %define dropdir %(pkg-config libpcsclite --variable=usbdropdir)
 
 Name:           openct
-Version:        0.6.6
-Release:        5%{?dist}
+Version:        0.6.7
+Release:        0.1.rc1%{?dist}
 Summary:        Middleware framework for smart card terminals
 
 Group:          System Environment/Libraries
-License:        BSD
-URL:            http://www.opensc.org/
-Source0:        http://www.opensc.org/files/%{name}-%{version}.tar.gz
+License:        LGPL
+URL:            http://www.opensc-project.org/
+Source0:        http://www.opensc-project.org/files/openct/testing/%{name}-%{version}-rc1.tar.gz
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
-Source3:        %{name}-reader.conf
-Source4:        %{name}.rules
-Patch0:         %{name}-0.6.6-rpath64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pcsc-lite-devel >= 1.3.0
 BuildRequires:  libusb-devel
 BuildRequires:  libtool-ltdl-devel
-BuildRequires:  sed
+BuildRequires:  libtool
 # TODO: verify minimum udev version
 Requires:       udev >= 062
 Requires(post): /sbin/chkconfig
@@ -56,17 +53,14 @@
 
 
 %prep
-%setup -q
-# patch0: --disable-rpath doesn't appear to do its job
-%patch0 -p1
-sed 's|__LIBDIR__|%{_libdir}|' < %{SOURCE3} > %{name}-reader.conf
+%setup -q -n %{name}-%{version}-rc1
+sh bootstrap # avoid standard rpaths on lib64 archs
+sed -ie 's|LIBDIR|%{dropdir}|' etc/reader.conf.in
+sed -ie 's|/etc/hotplug/usb/openct|%{_libdir}/openct/hotplug|' etc/openct.udev
 
 
 %build
-%configure \
-  --disable-dependency-tracking \
-  --disable-static \
-  --with-bundle-dir=%{dropdir}
+%configure --disable-dependency-tracking --disable-static
 make %{?_smp_mflags}
 
 
@@ -74,16 +68,20 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-install -Dpm 644 \
-  %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-openct.rules
+install -dm 755 $RPM_BUILD_ROOT%{dropdir}
+mv $RPM_BUILD_ROOT%{_libdir}/openct-ifd.so $RPM_BUILD_ROOT%{dropdir}
 
-ln -sf %{_libdir}/openct-ifd.so \
-  $RPM_BUILD_ROOT%{dropdir}/openct-ifd.bundle/Contents/*/
+install -Dpm 644 etc/openct.udev \
+  $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-openct.rules
+install -Dpm 755 etc/hotplug.openct $RPM_BUILD_ROOT%{_libdir}/openct/hotplug
 
 install -pm 644 etc/openct.conf $RPM_BUILD_ROOT%{_sysconfdir}/openct.conf
+
 install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/openct
+
 install -Dpm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/openct
-install -Dpm 644 %{name}-reader.conf \
+
+install -Dpm 644 etc/reader.conf \
   $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/%{name}.conf
 
 install -dm 755 $RPM_BUILD_ROOT%{_localstatedir}/run/openct
@@ -124,7 +122,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ANNOUNCE NEWS TODO doc/*.html doc/*.css
+%doc NEWS TODO doc/*.html doc/*.css
 %config(noreplace) %{_sysconfdir}/openct.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/openct
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*openct.rules
@@ -135,6 +133,7 @@
 %{_sbindir}/openct-control
 %{_libdir}/libopenct.so.*
 %{_libdir}/libopenctapi.so
+%{_libdir}/openct/
 %dir %{_localstatedir}/run/openct/
 %ghost %{_localstatedir}/run/openct/status
 %{_mandir}/man1/openct-tool.1*
@@ -149,11 +148,13 @@
 %files -n pcsc-lite-%{name}
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/reader.conf.d/%{name}.conf
-%{_libdir}/openct-ifd.so
-%{dropdir}/openct-ifd.bundle/
+%{dropdir}/openct-ifd.so
 
 
 %changelog
+* Sat Apr 22 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.6.7-0.1.rc1
+- 0.6.7-rc1, udev rules and reader.conf included upstream.
+
 * Mon Mar  6 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.6.6-5
 - Rebuild with new pcsc-lite.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Sep 2005 07:06:13 -0000	1.4
+++ sources	22 Apr 2006 20:35:04 -0000	1.5
@@ -1 +1 @@
-a9de3bef8e5e2827b8d72a2a50d0bc66  openct-0.6.6.tar.gz
+8ad0e54afa2c3ac0073cfd12238e6c48  openct-0.6.7-rc1.tar.gz


--- openct-0.6.6-rpath64.patch DELETED ---


--- openct-reader.conf DELETED ---


--- openct.rules DELETED ---



From fedora-extras-commits at redhat.com  Sat Apr 22 20:35:55 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 22 Apr 2006 13:35:55 -0700
Subject: rpms/opensc/devel .cvsignore, 1.5, 1.6 opensc.spec, 1.10,
	1.11 sources, 1.5, 1.6 opensc-0.10.1-rpath64.patch, 1.1, NONE
Message-ID: <200604222035.k3MKZv96017765@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/opensc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17744

Modified Files:
	.cvsignore opensc.spec sources 
Removed Files:
	opensc-0.10.1-rpath64.patch 
Log Message:
* Sat Apr 22 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.11.0-0.1.rc1
- 0.11.0-rc1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/opensc/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Jan 2006 22:14:15 -0000	1.5
+++ .cvsignore	22 Apr 2006 20:35:55 -0000	1.6
@@ -1 +1 @@
-opensc-0.10.1.tar.gz
+opensc-0.11.0-rc1.tar.gz


Index: opensc.spec
===================================================================
RCS file: /cvs/extras/rpms/opensc/devel/opensc.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- opensc.spec	6 Mar 2006 16:03:01 -0000	1.10
+++ opensc.spec	22 Apr 2006 20:35:55 -0000	1.11
@@ -1,15 +1,14 @@
 %define plugindir %{_libdir}/mozilla/plugins
 
 Name:           opensc
-Version:        0.10.1
-Release:        3%{?dist}
+Version:        0.11.0
+Release:        0.1.rc1%{?dist}
 Summary:        Smart card library and applications
 
 Group:          System Environment/Libraries
 License:        LGPL
-URL:            http://www.opensc.org/
-Source0:        http://www.opensc.org/files/opensc/%{name}-%{version}.tar.gz
-Patch0:         %{name}-0.10.1-rpath64.patch
+URL:            http://www.opensc-project.org/
+Source0:        http://www.opensc-project.org/files/opensc/testing/%{name}-%{version}-rc1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pcsc-lite-devel >= 1.1.1
@@ -17,6 +16,7 @@
 BuildRequires:  openct-devel
 BuildRequires:  openssl-devel >= 0.9.7a
 BuildRequires:  libtool-ltdl-devel
+BuildRequires:  libtool
 
 %description
 OpenSC is a package for for accessing smart card devices.  Basic
@@ -50,9 +50,8 @@
 
 
 %prep
-%setup -q
-# patch0: --disable-rpath doesn't seem to do what it implies
-%patch0 -p1
+%setup -q -n %{name}-%{version}-rc1
+sh bootstrap # avoid standard rpaths on lib64 archs
 cp -p src/pkcs15init/README ./README.pkcs15init
 cp -p src/scconf/README.scconf .
 
@@ -74,14 +73,12 @@
 install -dm 755 _docs/openssh
 install -pm 644 src/openssh/README src/openssh/ask-for-pin.diff _docs/openssh
 cp -pR doc _docs
-rm -r _docs/doc/{*.sh,*.xsl,old,Makefile*,tools}
+rm -r _docs/doc/{*.sh,*.xsl,api,Makefile*,tools}
 
 find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.la" | xargs rm
 
 rm $RPM_BUILD_ROOT%{plugindir}/opensc-signer.so
-mv $RPM_BUILD_ROOT%{_libdir}/opensc/opensc-signer.so \
-  $RPM_BUILD_ROOT%{plugindir}
-rmdir $RPM_BUILD_ROOT%{_libdir}/opensc
+mv $RPM_BUILD_ROOT%{_libdir}/opensc-signer.so $RPM_BUILD_ROOT%{plugindir}
 
 
 %clean
@@ -103,6 +100,7 @@
 %{_bindir}/netkey-tool
 %{_bindir}/opensc-explorer
 %{_bindir}/opensc-tool
+%{_bindir}/piv-tool
 %{_bindir}/pkcs11-tool
 %{_bindir}/pkcs15-crypt
 %{_bindir}/pkcs15-init
@@ -138,6 +136,9 @@
 
 
 %changelog
+* Sat Apr 22 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.11.0-0.1.rc1
+- 0.11.0-rc1.
+
 * Mon Mar  6 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.10.1-3
 - Rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/opensc/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Jan 2006 22:14:15 -0000	1.5
+++ sources	22 Apr 2006 20:35:55 -0000	1.6
@@ -1 +1 @@
-5549c7c339775356784837887750d232  opensc-0.10.1.tar.gz
+a911854594332241b62e5ed07b2e3a21  opensc-0.11.0-rc1.tar.gz


--- opensc-0.10.1-rpath64.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Apr 22 20:57:06 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 22 Apr 2006 13:57:06 -0700
Subject: rpms/perl-Authen-SASL/FC-5 .cvsignore, 1.3,
	1.4 perl-Authen-SASL.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200604222057.k3MKv867018116@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Authen-SASL/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18073/FC-5

Modified Files:
	.cvsignore perl-Authen-SASL.spec sources 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Authen-SASL/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	26 Apr 2005 17:14:22 -0000	1.3
+++ .cvsignore	22 Apr 2006 20:57:06 -0000	1.4
@@ -1 +1 @@
-Authen-SASL-2.09.tar.gz
+Authen-SASL-2.10.tar.gz


Index: perl-Authen-SASL.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Authen-SASL/FC-5/perl-Authen-SASL.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Authen-SASL.spec	17 Feb 2006 19:55:58 -0000	1.5
+++ perl-Authen-SASL.spec	22 Apr 2006 20:57:06 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Authen-SASL
-Version:        2.09
-Release:        4%{?dist}
+Version:        2.10
+Release:        1%{?dist}
 Summary:        SASL Authentication framework for Perl
 
 Group:          Development/Libraries
@@ -10,7 +10,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl >= 1:5.6.1, perl(Digest::HMAC)
+BuildRequires:  perl >= 1:5.6.1
+BuildRequires:  perl(Digest::HMAC)
+BuildRequires:  perl(GSSAPI)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -52,6 +54,9 @@
 
 
 %changelog
+* Sat Apr 22 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.10-1
+- Update to 2.10.
+
 * Fri Feb 17 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.09-4
 - Rebuild for FC5 (perl 5.8.8).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Authen-SASL/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Apr 2005 17:14:22 -0000	1.3
+++ sources	22 Apr 2006 20:57:06 -0000	1.4
@@ -1 +1 @@
-e11b60f58850ff6e71e6e1813c1f5e31  Authen-SASL-2.09.tar.gz
+041ce912640c5dff626a91435a359b88  Authen-SASL-2.10.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 20:57:06 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 22 Apr 2006 13:57:06 -0700
Subject: rpms/perl-Authen-SASL/FC-4 .cvsignore, 1.3,
	1.4 perl-Authen-SASL.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200604222057.k3MKv8C9018110@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Authen-SASL/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18073/FC-4

Modified Files:
	.cvsignore perl-Authen-SASL.spec sources 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Authen-SASL/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	26 Apr 2005 17:14:22 -0000	1.3
+++ .cvsignore	22 Apr 2006 20:57:06 -0000	1.4
@@ -1 +1 @@
-Authen-SASL-2.09.tar.gz
+Authen-SASL-2.10.tar.gz


Index: perl-Authen-SASL.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Authen-SASL/FC-4/perl-Authen-SASL.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Authen-SASL.spec	14 May 2005 02:12:44 -0000	1.4
+++ perl-Authen-SASL.spec	22 Apr 2006 20:57:06 -0000	1.5
@@ -1,17 +1,19 @@
 Name:           perl-Authen-SASL
-Version:        2.09
-Release:        3%{?dist}
+Version:        2.10
+Release:        1%{?dist}
 Summary:        SASL Authentication framework for Perl
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Authen-SASL/
-Source0:      http://www.cpan.org/authors/id/G/GB/GBARR/Authen-SASL-2.09.tar.gz
+Source0:        http://www.cpan.org/authors/id/G/GB/GBARR/Authen-SASL-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl >= 1:5.6.1, perl(Digest::HMAC)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires:  perl >= 1:5.6.1
+BuildRequires:  perl(Digest::HMAC)
+BuildRequires:  perl(GSSAPI)
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 SASL is a generic mechanism for authentication used by several network
@@ -36,7 +38,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -47,11 +49,17 @@
 %files
 %defattr(-,root,root,-)
 %doc api.txt Changes
-%{perl_vendorlib}/Authen
+%{perl_vendorlib}/Authen/
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Sat Apr 22 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.10-1
+- Update to 2.10.
+
+* Fri Feb 17 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.09-4
+- Rebuild for FC5 (perl 5.8.8).
+
 * Sat May 14 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.09-3
 - Add dist tag.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Authen-SASL/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Apr 2005 17:14:22 -0000	1.3
+++ sources	22 Apr 2006 20:57:06 -0000	1.4
@@ -1 +1 @@
-e11b60f58850ff6e71e6e1813c1f5e31  Authen-SASL-2.09.tar.gz
+041ce912640c5dff626a91435a359b88  Authen-SASL-2.10.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 21:07:39 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 22 Apr 2006 14:07:39 -0700
Subject: rpms/perl-Config-Tiny/devel .cvsignore, 1.7,
	1.8 perl-Config-Tiny.spec, 1.12, 1.13 sources, 1.7, 1.8
Message-ID: <200604222107.k3ML7gdF020431@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-serv20376/devel

Modified Files:
	.cvsignore perl-Config-Tiny.spec sources 
Log Message:
Updated to 2.06.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	6 Mar 2006 20:02:06 -0000	1.7
+++ .cvsignore	22 Apr 2006 21:07:39 -0000	1.8
@@ -1 +1 @@
-Config-Tiny-2.05.tar.gz
+Config-Tiny-2.06.tar.gz


Index: perl-Config-Tiny.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/perl-Config-Tiny.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-Config-Tiny.spec	6 Mar 2006 20:02:06 -0000	1.12
+++ perl-Config-Tiny.spec	22 Apr 2006 21:07:39 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           perl-Config-Tiny
-Version:        2.05
+Version:        2.06
 Release:        1%{?dist}
 Summary:        Perl module for reading and writing .ini style configuration files
 
@@ -50,10 +50,13 @@
 %defattr(-,root,root,-)
 %doc Changes LICENSE README
 %{perl_vendorlib}/Config/
-%{_mandir}/man3/*.3*
+%{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Sat Apr 22 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.06-1
+- Updated to 2.06.
+
 * Mon Mar  6 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.05-1
 - Updated to 2.05.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	6 Mar 2006 20:02:06 -0000	1.7
+++ sources	22 Apr 2006 21:07:39 -0000	1.8
@@ -1 +1 @@
-bac7f9eda771593c869313859fe45ff7  Config-Tiny-2.05.tar.gz
+40b5ce184ee6307b5a9ce1f588f824d6  Config-Tiny-2.06.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 21:07:33 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 22 Apr 2006 14:07:33 -0700
Subject: rpms/perl-Config-Tiny/FC-4 .cvsignore, 1.6,
	1.7 perl-Config-Tiny.spec, 1.10, 1.11 sources, 1.6, 1.7
Message-ID: <200604222108.k3ML85DR020436@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Config-Tiny/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20376/FC-4

Modified Files:
	.cvsignore perl-Config-Tiny.spec sources 
Log Message:
Updated to 2.06.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Mar 2006 20:02:00 -0000	1.6
+++ .cvsignore	22 Apr 2006 21:07:33 -0000	1.7
@@ -1 +1 @@
-Config-Tiny-2.05.tar.gz
+Config-Tiny-2.06.tar.gz


Index: perl-Config-Tiny.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-4/perl-Config-Tiny.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Config-Tiny.spec	6 Mar 2006 20:02:00 -0000	1.10
+++ perl-Config-Tiny.spec	22 Apr 2006 21:07:33 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           perl-Config-Tiny
-Version:        2.05
+Version:        2.06
 Release:        1%{?dist}
 Summary:        Perl module for reading and writing .ini style configuration files
 
@@ -50,10 +50,13 @@
 %defattr(-,root,root,-)
 %doc Changes LICENSE README
 %{perl_vendorlib}/Config/
-%{_mandir}/man3/*.3*
+%{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Sat Apr 22 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.06-1
+- Updated to 2.06.
+
 * Mon Mar  6 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.05-1
 - Updated to 2.05.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Mar 2006 20:02:00 -0000	1.6
+++ sources	22 Apr 2006 21:07:33 -0000	1.7
@@ -1 +1 @@
-bac7f9eda771593c869313859fe45ff7  Config-Tiny-2.05.tar.gz
+40b5ce184ee6307b5a9ce1f588f824d6  Config-Tiny-2.06.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 21:07:34 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 22 Apr 2006 14:07:34 -0700
Subject: rpms/perl-Config-Tiny/FC-5 .cvsignore, 1.7,
	1.8 perl-Config-Tiny.spec, 1.12, 1.13 sources, 1.7, 1.8
Message-ID: <200604222108.k3ML86qW020441@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Config-Tiny/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20376/FC-5

Modified Files:
	.cvsignore perl-Config-Tiny.spec sources 
Log Message:
Updated to 2.06.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	6 Mar 2006 20:02:06 -0000	1.7
+++ .cvsignore	22 Apr 2006 21:07:34 -0000	1.8
@@ -1 +1 @@
-Config-Tiny-2.05.tar.gz
+Config-Tiny-2.06.tar.gz


Index: perl-Config-Tiny.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-5/perl-Config-Tiny.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-Config-Tiny.spec	6 Mar 2006 20:02:06 -0000	1.12
+++ perl-Config-Tiny.spec	22 Apr 2006 21:07:34 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           perl-Config-Tiny
-Version:        2.05
+Version:        2.06
 Release:        1%{?dist}
 Summary:        Perl module for reading and writing .ini style configuration files
 
@@ -50,10 +50,13 @@
 %defattr(-,root,root,-)
 %doc Changes LICENSE README
 %{perl_vendorlib}/Config/
-%{_mandir}/man3/*.3*
+%{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Sat Apr 22 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.06-1
+- Updated to 2.06.
+
 * Mon Mar  6 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.05-1
 - Updated to 2.05.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	6 Mar 2006 20:02:06 -0000	1.7
+++ sources	22 Apr 2006 21:07:34 -0000	1.8
@@ -1 +1 @@
-bac7f9eda771593c869313859fe45ff7  Config-Tiny-2.05.tar.gz
+40b5ce184ee6307b5a9ce1f588f824d6  Config-Tiny-2.06.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 21:13:59 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 22 Apr 2006 14:13:59 -0700
Subject: rpms/perl-Error/FC-4 .cvsignore, 1.2, 1.3 perl-Error.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200604222114.k3MLEWk0020631@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Error/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20593/FC-4

Modified Files:
	.cvsignore perl-Error.spec sources 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Dec 2004 16:29:48 -0000	1.2
+++ .cvsignore	22 Apr 2006 21:13:59 -0000	1.3
@@ -1 +1 @@
-Error-0.15.tar.gz
+Error-0.15008.tar.gz


Index: perl-Error.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/FC-4/perl-Error.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Error.spec	6 Apr 2005 22:12:44 -0000	1.4
+++ perl-Error.spec	22 Apr 2006 21:13:59 -0000	1.5
@@ -1,15 +1,14 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-Error
-Version:        0.15
-Release:        2
-
+Version:        0.15008
+Release:        1%{?dist}
 Summary:        Error Perl module
+
 License:        GPL or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Error/
-Source0:        http://www.cpan.org/modules/by-module/Error/Error-0.15.tar.gz
+Source0:        http://www.cpan.org/modules/by-module/Error/Error-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -19,6 +18,7 @@
 for errors/exceptions that can either be thrown, for subsequent catch, or
 can simply be recorded.
 
+
 %prep
 %setup -q -n Error-%{version}
 
@@ -28,28 +28,36 @@
 
 %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+rwX,go+rX,go-w $RPM_BUILD_ROOT/*
 
-%check || :
+%check
 make test
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog README example
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
+
 %changelog
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Wed Apr 19 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.15008-1
+- Update to 0.15008.
+
+* Fri Feb 17 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.15-4
+- Rebuild for FC5 (perl 5.8.8).
+
+* Thu Dec 29 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.15-3
+- Dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.15-2
 - rebuilt
 
 * Fri Jun 11 2004 Steven Pritchard <steve at kspei.com> 0:0.15-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Dec 2004 16:29:48 -0000	1.2
+++ sources	22 Apr 2006 21:13:59 -0000	1.3
@@ -1 +1 @@
-81b4847fb893f18a4e85186bca5f4380  Error-0.15.tar.gz
+e66c11a0b7a501391643321f86f2171e  Error-0.15008.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 21:14:00 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 22 Apr 2006 14:14:00 -0700
Subject: rpms/perl-Error/FC-5 .cvsignore, 1.2, 1.3 perl-Error.spec, 1.6,
	1.7 sources, 1.2, 1.3
Message-ID: <200604222114.k3MLEWQJ020636@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-serv20593/FC-5

Modified Files:
	.cvsignore perl-Error.spec sources 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Dec 2004 16:29:48 -0000	1.2
+++ .cvsignore	22 Apr 2006 21:14:00 -0000	1.3
@@ -1 +1 @@
-Error-0.15.tar.gz
+Error-0.15008.tar.gz


Index: perl-Error.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/FC-5/perl-Error.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Error.spec	17 Feb 2006 19:03:52 -0000	1.6
+++ perl-Error.spec	22 Apr 2006 21:14:00 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Error
-Version:        0.15
-Release:        4%{?dist}
+Version:        0.15008
+Release:        1%{?dist}
 Summary:        Error Perl module
 
 License:        GPL or Artistic
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Wed Apr 19 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.15008-1
+- Update to 0.15008.
+
 * Fri Feb 17 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.15-4
 - Rebuild for FC5 (perl 5.8.8).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Dec 2004 16:29:48 -0000	1.2
+++ sources	22 Apr 2006 21:14:00 -0000	1.3
@@ -1 +1 @@
-81b4847fb893f18a4e85186bca5f4380  Error-0.15.tar.gz
+e66c11a0b7a501391643321f86f2171e  Error-0.15008.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 22:18:03 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 22 Apr 2006 15:18:03 -0700
Subject: rpms/ecore/FC-5 ecore.spec,1.4,1.5
Message-ID: <200604222218.k3MMIZXt023211@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/ecore/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23143/FC-5

Modified Files:
	ecore.spec 
Log Message:
Split out DirectFB support


Index: ecore.spec
===================================================================
RCS file: /cvs/extras/rpms/ecore/FC-5/ecore.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ecore.spec	18 Apr 2006 14:56:38 -0000	1.4
+++ ecore.spec	22 Apr 2006 22:18:02 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           ecore
 Version:        0.9.9.026
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An event and X abstraction layer
 
 Group:          System Environment/Libraries
@@ -32,6 +32,14 @@
 The ecore-devel package contains libraries and header files for developing
 ecore applications.
 
+%package        directfb
+Summary:        ecore support for DirectFB
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description    directfb
+This package adds DirectFB support to ecore.
+
 %prep
 %setup -q
 %patch -p 1 -b .novera
@@ -59,7 +67,11 @@
 %doc AUTHORS ChangeLog COPYING COPYING-PLAIN README
 %{_bindir}/*_test
 %{_datadir}/%{name}
-%{_libdir}/*.so.*
+#%{_libdir}/*.so.*
+%{_libdir}/libecore.so.*
+%{_libdir}/libecore_[a-c]*.so.*
+%{_libdir}/libecore_dbus.so.*
+%{_libdir}/libecore_[e-z]*.so.*
 
 %files devel
 %defattr(-,root,root,-)
@@ -70,7 +82,15 @@
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
 
+%files directfb
+%defattr(-,root,root,-)
+%doc
+%{_libdir}/libecore_directfb.so.*
+
 %changelog
+* Sat Apr 22 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.9.026-2
+- Split out DirectFB support
+
 * Tue Apr 18 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.9.026-1
 - Upstream update
 



From fedora-extras-commits at redhat.com  Sat Apr 22 22:18:03 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 22 Apr 2006 15:18:03 -0700
Subject: rpms/ecore/devel ecore.spec,1.4,1.5
Message-ID: <200604222218.k3MMIZw7023214@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/ecore/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23143/devel

Modified Files:
	ecore.spec 
Log Message:
Split out DirectFB support


Index: ecore.spec
===================================================================
RCS file: /cvs/extras/rpms/ecore/devel/ecore.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ecore.spec	18 Apr 2006 14:56:38 -0000	1.4
+++ ecore.spec	22 Apr 2006 22:18:03 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           ecore
 Version:        0.9.9.026
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An event and X abstraction layer
 
 Group:          System Environment/Libraries
@@ -32,6 +32,14 @@
 The ecore-devel package contains libraries and header files for developing
 ecore applications.
 
+%package        directfb
+Summary:        ecore support for DirectFB
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description    directfb
+This package adds DirectFB support to ecore.
+
 %prep
 %setup -q
 %patch -p 1 -b .novera
@@ -59,7 +67,11 @@
 %doc AUTHORS ChangeLog COPYING COPYING-PLAIN README
 %{_bindir}/*_test
 %{_datadir}/%{name}
-%{_libdir}/*.so.*
+#%{_libdir}/*.so.*
+%{_libdir}/libecore.so.*
+%{_libdir}/libecore_[a-c]*.so.*
+%{_libdir}/libecore_dbus.so.*
+%{_libdir}/libecore_[e-z]*.so.*
 
 %files devel
 %defattr(-,root,root,-)
@@ -70,7 +82,15 @@
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
 
+%files directfb
+%defattr(-,root,root,-)
+%doc
+%{_libdir}/libecore_directfb.so.*
+
 %changelog
+* Sat Apr 22 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.9.026-2
+- Split out DirectFB support
+
 * Tue Apr 18 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.9.026-1
 - Upstream update
 



From fedora-extras-commits at redhat.com  Sat Apr 22 22:38:37 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 22 Apr 2006 15:38:37 -0700
Subject: rpms/prboom/FC-4 prboom.spec,1.3,1.4
Message-ID: <200604222238.k3MMcdHM023366@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/prboom/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23321/FC-4

Modified Files:
	prboom.spec 
Log Message:
Build both opengl and non-gl versions of the binary.




Index: prboom.spec
===================================================================
RCS file: /cvs/extras/rpms/prboom/FC-4/prboom.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- prboom.spec	22 Apr 2006 01:50:55 -0000	1.3
+++ prboom.spec	22 Apr 2006 22:38:37 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           prboom
 Version:        2.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Open source port of the DOOM game engine
 
 Group:          Amusements/Games
@@ -28,8 +28,15 @@
 %patch0 -p1
 
 %build
+# Build twice.  The first time with opengl support, the second time without.
 %configure --enable-gl --disable-cpu-opt --program-prefix=''
 make %{?_smp_mflags}
+mv src/prboom src/prboom-gl
+
+make clean
+
+%configure --disable-cpu-opt --program-prefix=''
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -41,6 +48,9 @@
 mkdir -p $RPM_BUILD_ROOT/%{waddir}
 mv $RPM_BUILD_ROOT/%{_datadir}/games/doom/%{name}.wad $RPM_BUILD_ROOT/%{waddir}
 
+# Copy the renamed OpenGL binary to the bindir
+install -p -m 755 src/prboom-gl $RPM_BUILD_ROOT/%{_bindir}
+
 # Remove the doc files that will get picked up in the files
 # section below.
 rm -rf $RPM_BUILD_ROOT/%{_docdir}
@@ -51,6 +61,7 @@
 
 %files
 %defattr(-,root,root,-)
+%{_bindir}/prboom-gl
 %{_bindir}/prboom
 %{_bindir}/prboom-game-server
 %dir %{waddir}
@@ -61,6 +72,9 @@
 %doc doc/README.compat doc/README.demos doc/MBF.txt doc/MBFFAQ.txt doc/boom.txt
 
 %changelog
+* Sat Apr 22 2006 Wart <wart at kobold.org> 2.4.1-2
+- Build both opengl and non-opengl binaries.
+
 * Tue Apr 18 2006 Wart <wart at kobold.org> 2.4.1-1
 - Update to 2.4.1
 



From fedora-extras-commits at redhat.com  Sat Apr 22 22:38:38 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 22 Apr 2006 15:38:38 -0700
Subject: rpms/prboom/FC-5 prboom.spec,1.3,1.4
Message-ID: <200604222238.k3MMceZ4023370@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/prboom/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23321/FC-5

Modified Files:
	prboom.spec 
Log Message:
Build both opengl and non-gl versions of the binary.




Index: prboom.spec
===================================================================
RCS file: /cvs/extras/rpms/prboom/FC-5/prboom.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- prboom.spec	22 Apr 2006 01:50:55 -0000	1.3
+++ prboom.spec	22 Apr 2006 22:38:37 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           prboom
 Version:        2.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Open source port of the DOOM game engine
 
 Group:          Amusements/Games
@@ -29,8 +29,15 @@
 %patch0 -p1
 
 %build
+# Build twice.  The first time with opengl support, the second time without.
 %configure --enable-gl --disable-cpu-opt --program-prefix=''
 make %{?_smp_mflags}
+mv src/prboom src/prboom-gl
+
+make clean
+
+%configure --disable-cpu-opt --program-prefix=''
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -42,6 +49,9 @@
 mkdir -p $RPM_BUILD_ROOT/%{waddir}
 mv $RPM_BUILD_ROOT/%{_datadir}/games/doom/%{name}.wad $RPM_BUILD_ROOT/%{waddir}
 
+# Copy the renamed OpenGL binary to the bindir
+install -p -m 755 src/prboom-gl $RPM_BUILD_ROOT/%{_bindir}
+
 # Remove the doc files that will get picked up in the files
 # section below.
 rm -rf $RPM_BUILD_ROOT/%{_docdir}
@@ -52,6 +62,7 @@
 
 %files
 %defattr(-,root,root,-)
+%{_bindir}/prboom-gl
 %{_bindir}/prboom
 %{_bindir}/prboom-game-server
 %dir %{waddir}
@@ -62,6 +73,9 @@
 %doc doc/README.compat doc/README.demos doc/MBF.txt doc/MBFFAQ.txt doc/boom.txt
 
 %changelog
+* Sat Apr 22 2006 Wart <wart at kobold.org> 2.4.1-2
+- Build both opengl and non-opengl binaries.
+
 * Tue Apr 18 2006 Wart <wart at kobold.org> 2.4.1-1
 - Update to 2.4.1
 



From fedora-extras-commits at redhat.com  Sat Apr 22 22:38:38 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 22 Apr 2006 15:38:38 -0700
Subject: rpms/prboom/devel prboom.spec,1.4,1.5
Message-ID: <200604222238.k3MMcenk023374@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/prboom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23321/devel

Modified Files:
	prboom.spec 
Log Message:
Build both opengl and non-gl versions of the binary.




Index: prboom.spec
===================================================================
RCS file: /cvs/extras/rpms/prboom/devel/prboom.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- prboom.spec	21 Apr 2006 21:37:55 -0000	1.4
+++ prboom.spec	22 Apr 2006 22:38:38 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           prboom
 Version:        2.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Open source port of the DOOM game engine
 
 Group:          Amusements/Games
@@ -29,8 +29,15 @@
 %patch0 -p1
 
 %build
+# Build twice.  The first time with opengl support, the second time without.
 %configure --enable-gl --disable-cpu-opt --program-prefix=''
 make %{?_smp_mflags}
+mv src/prboom src/prboom-gl
+
+make clean
+
+%configure --disable-cpu-opt --program-prefix=''
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -42,6 +49,9 @@
 mkdir -p $RPM_BUILD_ROOT/%{waddir}
 mv $RPM_BUILD_ROOT/%{_datadir}/games/doom/%{name}.wad $RPM_BUILD_ROOT/%{waddir}
 
+# Copy the renamed OpenGL binary to the bindir
+install -p -m 755 src/prboom-gl $RPM_BUILD_ROOT/%{_bindir}
+
 # Remove the doc files that will get picked up in the files
 # section below.
 rm -rf $RPM_BUILD_ROOT/%{_docdir}
@@ -52,6 +62,7 @@
 
 %files
 %defattr(-,root,root,-)
+%{_bindir}/prboom-gl
 %{_bindir}/prboom
 %{_bindir}/prboom-game-server
 %dir %{waddir}
@@ -62,6 +73,9 @@
 %doc doc/README.compat doc/README.demos doc/MBF.txt doc/MBFFAQ.txt doc/boom.txt
 
 %changelog
+* Sat Apr 22 2006 Wart <wart at kobold.org> 2.4.1-2
+- Build both opengl and non-opengl binaries.
+
 * Tue Apr 18 2006 Wart <wart at kobold.org> 2.4.1-1
 - Update to 2.4.1
 



From fedora-extras-commits at redhat.com  Sat Apr 22 22:50:48 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 22 Apr 2006 15:50:48 -0700
Subject: rpms/perl-DBD-XBase/devel DBD-XBase-0.241-dbfdump-rename.patch, NONE,
	1.1 perl-DBD-XBase.spec, 1.3, 1.4
Message-ID: <200604222250.k3MMooJ2023555@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-DBD-XBase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23535

Modified Files:
	perl-DBD-XBase.spec 
Added Files:
	DBD-XBase-0.241-dbfdump-rename.patch 
Log Message:
dbfdump renamed to dbfdump.pl to avoid file conflict with shapelib.


DBD-XBase-0.241-dbfdump-rename.patch:

--- NEW FILE DBD-XBase-0.241-dbfdump-rename.patch ---
diff -ruN DBD-XBase-0.241-orig/bin/dbfdump.PL DBD-XBase-0.241/bin/dbfdump.PL
--- DBD-XBase-0.241-orig/bin/dbfdump.PL	2002-03-07 07:36:02.000000000 +0000
+++ DBD-XBase-0.241/bin/dbfdump.PL	1970-01-01 01:00:00.000000000 +0100
@@ -1,189 +0,0 @@
-
-use Config;
-my $filename = $0;
-
-$filename =~ s/\.PL$//;
-open OUT,">$filename" or die "Can't create $filename: $!";
-chmod(0755, $filename);
-print "Extracting $filename (with #! and variable substitution)\n";
-
-print OUT <<"EOHEADER";
-$Config{'startperl'} -w
-
-EOHEADER
-
-print OUT <<'EOBODY';
-
-use XBase;
-use Getopt::Long;
-use strict;
-$^W = 1;
-
-my $stdin = 0;
-
-if (defined $ARGV[$#ARGV] and $ARGV[$#ARGV] eq '-') {
-	$stdin = 1; pop @ARGV;
-}
-
-my %options;
-Getopt::Long::GetOptions( \%options,
-	'help', 'version', 'info', 'rs=s', 'fs=s', 'undef=s', 'fields=s',
-	'nomemo', 'memofile=s', 'memosep=s', 'table',
-	'SQL',
-	) or exit;
-
-if (defined $options{'version'}) {
-	print "This is dbfdump version $XBase::VERSION.\n";
-	exit;
-}
-
-if ($stdin) {
-	push @ARGV, '-';
-	$options{'nomemo'} = 1;
-}
-
-if (@ARGV == 0 or defined $options{'help'}) {
-	die <<'EOF';
-Usage: dbfdump [ options ] files
-    where the options specify
-	--rs		output record separator (default newline)
-	--fs		output field separator (default colon)
-	--fields	comma separated list of fields to print (default all)
-	--undef		what to print for NULL values (default empty string)
-	--memofile	specifies unstandard name of attached memo file
-	--memosep	separator for dBase III dbt's (default \x1a\x1a)
-	--table		output in nice table format (needs Data::ShowTable)
-    all having as parameter a string; and also
-	--nomemo	do not try to read the memo (dbt/fpt) file 
-	--info		only print info about the file and fields
-	--version	print version of the XBase library
-EOF
-}
-
-my %addopts = ();
-if (defined $options{'nomemo'} or defined $options{'info'}) {
-	$addopts{'ignorememo'} = 1;
-}
-
-$addopts{'memosep'} = $options{'memosep'};
-$addopts{'memofile'} = $options{'memofile'};
-
-if (defined $options{'info'}) {
-	$addopts{'ignorebadheader'} = 1;
-}
-
-my $file;
-for $file (@ARGV) {
-	my $table = new XBase 'name' => $file, %addopts;
-
-	if (not defined $table) {
-		print STDERR XBase->errstr;
-		next;
-	}
-	if (defined $options{'info'}) {
-		if (not defined $options{'SQL'}) {
-			print $table->header_info;
-		} else {
-			my $name = $file;
-			$name =~ s!^.*/|\.dbf$!!ig;
-			print "create table $name (\n";
-			my @names = $table->field_names;
-			my %conv = qw!
-				C varchar
-				N numeric
-				F numeric
-				L boolean
-				M blob
-				D date
-				T time
-				!;
-			my @types = map { $conv{$_} } $table->field_types;
-			my @lengths = $table->field_lengths;
-			my @decimals = $table->field_decimals;
-			for (my $i = 0; $i < @names; $i++) {
-				print "\t$names[$i] $types[$i]";
-				if ($types[$i] eq 'blob') {
-					$lengths[$i] = $decimals[$i] = undef;
-				}
-				if ($lengths[$i] or $decimals[$i]) {
-					print "($lengths[$i]";
-					print ", $decimals[$i]" if $decimals[$i];
-					print ")";
-				}
-				if (defined $names[$i+1]) {
-					print ',';
-				}
-				print "\n";
-			}
-			print ")\n";
-		}
-	} else {
-		$table->dump_records(%options) or print STDERR $table->errstr;
-	}
-	$table->close;
-}
-
-1;
-
-__END__
-
-=head1 NAME
-
-dbfdump - Dump the record of the dbf file
-
-=head1 FORMAT
-
-	dbfdump [options] files
-
-where options are
-
-	--rs		output record separator (default newline)
-	--fs		output field separator (default colon)
-	--fields	comma separated list of fields to print (default all)
-	--undef		string to print for NULL values (default empty)
-	--memofile	specifies unstandard name of attached memo file
-	--memosep	separator for dBase III dbt's (default \x1a\x1a)
-
-	--nomemo	do not try to read the memo (dbt/fpt) file
-	--info		print info about the file and fields
-		with additional --SQL parameter, outputs the SQL create table
-	--version	print version of the XBase library
-	--table		output in nice table format (only available when
-		Data::ShowTable is installed, overrides rs and fs)
-
-=head1 SYNOPSIS
-
-	dbfdump -fields id,msg table.dbf
-	dbfdump -fs=' : ' table
-	dbfdump --nomemo file.dbf
-
-	ssh user at host 'cat file.dbf.gz' | gunzip - | dbfdump -
-
-=head1 DESCRIPTION
-
-Dbfdump prints to standard output the content of dbf files listed. By
-default, it prints all fields, separated by colons, one record on
-a line. The output record and column separators can be changed by
-switches on the command line. You can also ask only for some fields to
-be printed.
-
-The content of associated memo files (dbf, fpt) is printed for memo
-fields, unless you use the C<--nomemo> option.
-
-You can specify reading the standard input by putting dash (-) instead
-of file name.
-
-=head1 AUTHOR
-
-(c) 1998--1999 Jan Pazdziora, adelton at fi.muni.cz,
-http://www.fi.muni.cz/~adelton/
-at Faculty of Informatics, Masaryk University in Brno, Czech Republic
-
-=head1 SEE ALSO
-
-perl(1); XBase(3)
-
-=cut
-
-EOBODY
-
diff -ruN DBD-XBase-0.241-orig/bin/dbfdump.pl.PL DBD-XBase-0.241/bin/dbfdump.pl.PL
--- DBD-XBase-0.241-orig/bin/dbfdump.pl.PL	1970-01-01 01:00:00.000000000 +0100
+++ DBD-XBase-0.241/bin/dbfdump.pl.PL	2006-03-16 22:17:24.000000000 +0000
@@ -0,0 +1,189 @@
+
+use Config;
+my $filename = $0;
+
+$filename =~ s/\.PL$//;
+open OUT,">$filename" or die "Can't create $filename: $!";
+chmod(0755, $filename);
+print "Extracting $filename (with #! and variable substitution)\n";
+
+print OUT <<"EOHEADER";
+$Config{'startperl'} -w
+
+EOHEADER
+
+print OUT <<'EOBODY';
+
+use XBase;
+use Getopt::Long;
+use strict;
+$^W = 1;
+
+my $stdin = 0;
+
+if (defined $ARGV[$#ARGV] and $ARGV[$#ARGV] eq '-') {
+	$stdin = 1; pop @ARGV;
+}
+
+my %options;
+Getopt::Long::GetOptions( \%options,
+	'help', 'version', 'info', 'rs=s', 'fs=s', 'undef=s', 'fields=s',
+	'nomemo', 'memofile=s', 'memosep=s', 'table',
+	'SQL',
+	) or exit;
+
+if (defined $options{'version'}) {
+	print "This is dbfdump.pl version $XBase::VERSION.\n";
+	exit;
+}
+
+if ($stdin) {
+	push @ARGV, '-';
+	$options{'nomemo'} = 1;
+}
+
+if (@ARGV == 0 or defined $options{'help'}) {
+	die <<'EOF';
+Usage: dbfdump.pl [ options ] files
+    where the options specify
+	--rs		output record separator (default newline)
+	--fs		output field separator (default colon)
+	--fields	comma separated list of fields to print (default all)
+	--undef		what to print for NULL values (default empty string)
+	--memofile	specifies unstandard name of attached memo file
+	--memosep	separator for dBase III dbt's (default \x1a\x1a)
+	--table		output in nice table format (needs Data::ShowTable)
+    all having as parameter a string; and also
+	--nomemo	do not try to read the memo (dbt/fpt) file 
+	--info		only print info about the file and fields
+	--version	print version of the XBase library
+EOF
+}
+
+my %addopts = ();
+if (defined $options{'nomemo'} or defined $options{'info'}) {
+	$addopts{'ignorememo'} = 1;
+}
+
+$addopts{'memosep'} = $options{'memosep'};
+$addopts{'memofile'} = $options{'memofile'};
+
+if (defined $options{'info'}) {
+	$addopts{'ignorebadheader'} = 1;
+}
+
+my $file;
+for $file (@ARGV) {
+	my $table = new XBase 'name' => $file, %addopts;
+
+	if (not defined $table) {
+		print STDERR XBase->errstr;
+		next;
+	}
+	if (defined $options{'info'}) {
+		if (not defined $options{'SQL'}) {
+			print $table->header_info;
+		} else {
+			my $name = $file;
+			$name =~ s!^.*/|\.dbf$!!ig;
+			print "create table $name (\n";
+			my @names = $table->field_names;
+			my %conv = qw!
+				C varchar
+				N numeric
+				F numeric
+				L boolean
+				M blob
+				D date
+				T time
+				!;
+			my @types = map { $conv{$_} } $table->field_types;
+			my @lengths = $table->field_lengths;
+			my @decimals = $table->field_decimals;
+			for (my $i = 0; $i < @names; $i++) {
+				print "\t$names[$i] $types[$i]";
+				if ($types[$i] eq 'blob') {
+					$lengths[$i] = $decimals[$i] = undef;
+				}
+				if ($lengths[$i] or $decimals[$i]) {
+					print "($lengths[$i]";
+					print ", $decimals[$i]" if $decimals[$i];
+					print ")";
+				}
+				if (defined $names[$i+1]) {
+					print ',';
+				}
+				print "\n";
+			}
+			print ")\n";
+		}
+	} else {
+		$table->dump_records(%options) or print STDERR $table->errstr;
+	}
+	$table->close;
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+dbfdump.pl - Dump the record of the dbf file
+
+=head1 FORMAT
+
+	dbfdump.pl [options] files
+
+where options are
+
+	--rs		output record separator (default newline)
+	--fs		output field separator (default colon)
+	--fields	comma separated list of fields to print (default all)
+	--undef		string to print for NULL values (default empty)
+	--memofile	specifies unstandard name of attached memo file
+	--memosep	separator for dBase III dbt's (default \x1a\x1a)
+
+	--nomemo	do not try to read the memo (dbt/fpt) file
+	--info		print info about the file and fields
+		with additional --SQL parameter, outputs the SQL create table
+	--version	print version of the XBase library
+	--table		output in nice table format (only available when
+		Data::ShowTable is installed, overrides rs and fs)
+
+=head1 SYNOPSIS
+
+	dbfdump.pl -fields id,msg table.dbf
+	dbfdump.pl -fs=' : ' table
+	dbfdump.pl --nomemo file.dbf
+
+	ssh user at host 'cat file.dbf.gz' | gunzip - | dbfdump.pl -
+
+=head1 DESCRIPTION
+
+Dbfdump prints to standard output the content of dbf files listed. By
+default, it prints all fields, separated by colons, one record on
+a line. The output record and column separators can be changed by
+switches on the command line. You can also ask only for some fields to
+be printed.
+
+The content of associated memo files (dbf, fpt) is printed for memo
+fields, unless you use the C<--nomemo> option.
+
+You can specify reading the standard input by putting dash (-) instead
+of file name.
+
+=head1 AUTHOR
+
+(c) 1998--1999 Jan Pazdziora, adelton at fi.muni.cz,
+http://www.fi.muni.cz/~adelton/
+at Faculty of Informatics, Masaryk University in Brno, Czech Republic
+
+=head1 SEE ALSO
+
+perl(1); XBase(3)
+
+=cut
+
+EOBODY
+
diff -ruN DBD-XBase-0.241-orig/Changes DBD-XBase-0.241/Changes
--- DBD-XBase-0.241-orig/Changes	2003-11-21 14:13:43.000000000 +0000
+++ DBD-XBase-0.241/Changes	2006-03-16 22:09:11.000000000 +0000
@@ -136,7 +136,7 @@
 
 0.1551 Sat Jan  9 19:21:16 CET 2000
 
-	dbfdump: Accepts --SQL modifier to --info, prints structure
+	dbfdump.pl: Accepts --SQL modifier to --info, prints structure
 	of the table as a create table SQL.
 
 0.155 Sun Nov  7 15:43:59 CET 1999
@@ -272,7 +272,7 @@
 	XBase::Memo: we now reset next_for_append to point behind the
 	end of the file, problem pointed out by Artem Belevich.
 
-	dbfdump: option --table, --fields now handles intervals.
+	dbfdump.pl: option --table, --fields now handles intervals.
 
 	t/2_read.t: fixed problem with order of fields in hash, patch
 	by Andreas J. Koenig.
@@ -301,7 +301,7 @@
 
 	XBase::SQL: fix of handling of double quoted strings.
 
-	dbfdump: memosep and memofile options fixed.
+	dbfdump.pl: memosep and memofile options fixed.
 
 	t/4_dbfdump.t: avoided using cat.
 
@@ -427,7 +427,7 @@
 
 0.0632 Wed May 27 12:27:04 MET DST 1998
 
-	Added --nomemo option to dbfdump. The list of entires is made
+	Added --nomemo option to dbfdump.pl. The list of entires is made
 	longer in any non-leaf page in ndx. Added check for the magic
 	"FFFF0800" tag in dBaseIV dbt file when reading it.
 
@@ -479,7 +479,7 @@
 	long selects. Method dump_records now prints directly,
 	doesn't use get_all_records.
 
-	Added parameter --info into the script dbfdump to print the
+	Added parameter --info into the script dbfdump.pl to print the
 	header info.
 
 	Changed way of determining the type of the dbt file after
diff -ruN DBD-XBase-0.241-orig/INSTALL DBD-XBase-0.241/INSTALL
--- DBD-XBase-0.241-orig/INSTALL	2003-04-03 18:02:37.000000000 +0100
+++ DBD-XBase-0.241/INSTALL	2006-03-16 22:08:17.000000000 +0000
@@ -43,7 +43,7 @@
 If you do not have make or you cannot run it (do you really want to
 use Perl on that machine?), just copy the content of the
 DBD-XBase-x.xxx/lib directory to wherever you want to have it. That
-should work, even if it won't give you man pages and dbfdump/indexdump
+should work, even if it won't give you man pages and dbfdump.pl/indexdump
 scripts.
 
 If you use a platform supported by ActiveState and run ActiveState
diff -ruN DBD-XBase-0.241-orig/lib/XBase/FAQ.pod DBD-XBase-0.241/lib/XBase/FAQ.pod
--- DBD-XBase-0.241-orig/lib/XBase/FAQ.pod	2002-08-16 10:38:53.000000000 +0100
+++ DBD-XBase-0.241/lib/XBase/FAQ.pod	2006-03-16 22:06:06.000000000 +0000
@@ -175,11 +175,11 @@
 
 to your script and you will see that it's not B<DBD::XBase> problem.
 
-=item The B<XBase.pm/dbfdump> stops after reading I<n> records ...
+=item The B<XBase.pm/dbfdump.pl> stops after reading I<n> records ...
 
 ... why doesn't it read all I<10 x n> records?
 
-Check if the file isn't truncated. C<dbfdump -i file.dbf> will tell
+Check if the file isn't truncated. C<dbfdump.pl -i file.dbf> will tell
 you the expected number of records and length of one record, like
 
 	Filename:       file.dbf
@@ -191,7 +191,7 @@
 	Num fields:     40
 
 So the expected length of the file is at least I<1313 + 65 * 1117>. If
-it's shorter, you've got damaged file and B<XBase.pm/dbfdump> only
+it's shorter, you've got damaged file and B<XBase.pm/dbfdump.pl> only
 reads as much rows as it can find in the dbf.
 
 =item How is this B<DBD::XBase> related to B<DBD::ODBC>?
diff -ruN DBD-XBase-0.241-orig/lib/XBase.pm DBD-XBase-0.241/lib/XBase.pm
--- DBD-XBase-0.241-orig/lib/XBase.pm	2003-11-21 14:17:49.000000000 +0000
+++ DBD-XBase-0.241/lib/XBase.pm	2006-03-16 22:05:32.000000000 +0000
@@ -1341,7 +1341,7 @@
     $table->dump_records("fs" => " | ", "rs" => " <-+\n",
 			"fields" => [ "id", "msg" ]);'
 
-Also note that there is a script dbfdump(1) that does the printing.
+Also note that there is a script dbfdump.pl(1) that does the printing.
 
 =head2 Errors and debugging
 
@@ -1423,7 +1423,7 @@
 =head1 SEE ALSO
 
 perl(1); XBase::FAQ(3); DBD::XBase(3) and DBI(3) for DBI interface;
-dbfdump(1)
+dbfdump.pl(1)
 
 =cut
 
diff -ruN DBD-XBase-0.241-orig/Makefile.PL DBD-XBase-0.241/Makefile.PL
--- DBD-XBase-0.241-orig/Makefile.PL	2003-04-03 17:37:19.000000000 +0100
+++ DBD-XBase-0.241/Makefile.PL	2006-03-16 22:20:20.000000000 +0000
@@ -41,11 +41,11 @@
 	'AUTHOR'	=> 'Jan Pazdziora (adelton at fi.muni.cz)',
 	'ABSTRACT'	=> 'Reads and writes XBase (dbf) files, includes DBI support',
 		) : ()),
-	'PL_FILES'	=> { 'bin/dbfdump.PL' => 'bin/dbfdump',
+	'PL_FILES'	=> { 'bin/dbfdump.pl.PL' => 'bin/dbfdump.pl',
 				'bin/indexdump.PL' => 'bin/indexdump' },
-	'EXE_FILES'	=> [ 'bin/dbfdump', ' bin/indexdump' ],
+	'EXE_FILES'	=> [ 'bin/dbfdump.pl', ' bin/indexdump' ],
         'dist'		=> { COMPRESS => 'gzip -9f', SUFFIX => 'gz',
 		POSTOP => 'mv $(DISTNAME)-$(VERSION).tar.gz ../' },
-	'clean'		=> { FILES => 'bin/dbfdump bin/indexdump t/newtable.dbf t/newtable.dbt t/write.dbf t/write.dbt t/rooms1.dbf t/rooms1.cdx '},	
+	'clean'		=> { FILES => 'bin/dbfdump.pl bin/indexdump t/newtable.dbf t/newtable.dbt t/write.dbf t/write.dbt t/rooms1.dbf t/rooms1.cdx '},	
 	);
 
diff -ruN DBD-XBase-0.241-orig/MANIFEST DBD-XBase-0.241/MANIFEST
--- DBD-XBase-0.241-orig/MANIFEST	2003-07-07 19:30:41.000000000 +0100
+++ DBD-XBase-0.241/MANIFEST	2006-03-16 22:20:06.000000000 +0000
@@ -4,7 +4,7 @@
 Makefile.PL
 README
 ToDo
-bin/dbfdump.PL
+bin/dbfdump.pl.PL
 bin/indexdump.PL
 dbit/00base.t
 dbit/10dsnlist.t
diff -ruN DBD-XBase-0.241-orig/new-XBase DBD-XBase-0.241/new-XBase
--- DBD-XBase-0.241-orig/new-XBase	2001-02-06 10:44:13.000000000 +0000
+++ DBD-XBase-0.241/new-XBase	2006-03-16 22:09:55.000000000 +0000
@@ -395,7 +395,7 @@
     $table->dump_records("fs" => " | ", "rs" => " <-+\n",
 			"fields" => [ "id", "msg" ]);'
 
-Also note that there is a command line script dbfdump(1) that does
+Also note that there is a command line script dbfdump.pl(1) that does
 the printing.
 
 =head1 Writing the data
@@ -597,7 +597,7 @@
 
 XBase::FAQ(3); XBase::Index(3);
 DBD::XBase(3) and DBI(3) for DBI interface;
-dbfdump(1); perl(1)
+dbfdump.pl(1); perl(1)
 
 =cut
 
diff -ruN DBD-XBase-0.241-orig/README DBD-XBase-0.241/README
--- DBD-XBase-0.241-orig/README	2003-04-03 18:02:47.000000000 +0100
+++ DBD-XBase-0.241/README	2006-03-16 22:09:29.000000000 +0000
@@ -48,7 +48,7 @@
 		my $table = new XBase 'table.dbf';
 		my @data = $table->get_record(0);
 
-	The distribution also includes a dbfdump script that prints
+	The distribution also includes a dbfdump.pl script that prints
 	the content of the table in readable form.
 
 
@@ -75,7 +75,7 @@
 	native XBase engines produce data incompatible with this
 	module.
 
-	Man pages for XBase, DBD::XBase, dbfdump, XBase::Index and
+	Man pages for XBase, DBD::XBase, dbfdump.pl, XBase::Index and
 	XBase::SDBM are included, examples of little scripts can also
 	be found in eg/ directory of the distribution. Read the DBI
 	man page for DBI specific issues, and the XBase::FAQ page.
diff -ruN DBD-XBase-0.241-orig/t/4_dbfdump.t DBD-XBase-0.241/t/4_dbfdump.t
--- DBD-XBase-0.241-orig/t/4_dbfdump.t	2002-05-15 17:18:09.000000000 +0100
+++ DBD-XBase-0.241/t/4_dbfdump.t	2006-03-16 22:07:14.000000000 +0000
@@ -9,13 +9,13 @@
 use ExtUtils::testlib;
 my $libs = join " -I", '', @INC;
 
-my $dbfdump = "$dir/blib/script/dbfdump";
+my $dbfdump = "$dir/blib/script/dbfdump.pl";
 
 my $expected = join '', <DATA>;
 my $result = '';
 
 my $command = qq!$^X $libs $dbfdump "$dir/t/rooms.dbf"!;
-print "Running dbfdump rooms.dbf: $command\n";
+print "Running dbfdump.pl rooms.dbf: $command\n";
 $result = `$command`;
 
 if ($result ne $expected)
@@ -23,7 +23,7 @@
 print "ok 1\n";
 
 $command = qq!$^X $libs $dbfdump -- - < "$dir/t/rooms.dbf"!;
-print "Running stdin dbfdump < rooms.dbf: $command\n";
+print "Running stdin dbfdump.pl < rooms.dbf: $command\n";
 $result = `$command`;
 
 if ($result ne $expected)


Index: perl-DBD-XBase.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-XBase/devel/perl-DBD-XBase.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-DBD-XBase.spec	17 Feb 2006 18:33:17 -0000	1.3
+++ perl-DBD-XBase.spec	22 Apr 2006 22:50:48 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-DBD-XBase
 Version:        0.241
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl module for reading and writing the dbf files
 
 Group:          Development/Libraries
@@ -8,6 +8,7 @@
 URL:            http://search.cpan.org/dist/DBD-XBase/
 Source0:        http://www.cpan.org/authors/id/J/JA/JANPAZ/DBD-XBase-%{version}.tar.gz
 Patch0:         DBD-XBase-0.241-indexdump.PL.patch
+Patch1:         DBD-XBase-0.241-dbfdump-rename.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -26,6 +27,7 @@
 %prep
 %setup -q -n DBD-XBase-%{version}
 %patch0 -p1
+%patch1 -p1
 chmod a-x eg/*table
 
 %build
@@ -61,6 +63,9 @@
 
 
 %changelog
+* Thu Mar 16 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.241-4
+- dbfdump renamed to dbfdump.pl to avoid file conflict with shapelib.
+
 * Fri Feb 17 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.241-3
 - Rebuild for FC5 (perl 5.8.8).
 



From fedora-extras-commits at redhat.com  Sun Apr 23 02:16:40 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Sat, 22 Apr 2006 19:16:40 -0700
Subject: rpms/libedit - New directory
Message-ID: <200604230216.k3N2Ggx5032558@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/libedit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32532/libedit

Log Message:
Directory /cvs/extras/rpms/libedit added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 23 02:16:41 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Sat, 22 Apr 2006 19:16:41 -0700
Subject: rpms/libedit/devel - New directory
Message-ID: <200604230216.k3N2GhRl032561@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/libedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32532/libedit/devel

Log Message:
Directory /cvs/extras/rpms/libedit/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 23 02:17:08 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Sat, 22 Apr 2006 19:17:08 -0700
Subject: rpms/libedit Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604230217.k3N2HA13032610@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/libedit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32577

Added Files:
	Makefile import.log 
Log Message:
Setup of module libedit


--- NEW FILE Makefile ---
# Top level Makefile for module libedit
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 23 02:17:09 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Sat, 22 Apr 2006 19:17:09 -0700
Subject: rpms/libedit/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604230217.k3N2HBcA032613@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/libedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32577/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libedit


--- 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 Apr 23 02:18:21 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Sat, 22 Apr 2006 19:18:21 -0700
Subject: rpms/libedit import.log,1.1,1.2
Message-ID: <200604230218.k3N2IN3j032676@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/libedit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32643

Modified Files:
	import.log 
Log Message:
auto-import libedit-2.9-2.20060213cvs on branch devel from libedit-2.9-2.20060213cvs.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libedit/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	23 Apr 2006 02:17:08 -0000	1.1
+++ import.log	23 Apr 2006 02:18:21 -0000	1.2
@@ -0,0 +1 @@
+libedit-2_9-2_20060213cvs:HEAD:libedit-2.9-2.20060213cvs.src.rpm:1145758688



From fedora-extras-commits at redhat.com  Sun Apr 23 02:18:22 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Sat, 22 Apr 2006 19:18:22 -0700
Subject: rpms/libedit/devel libedit.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604230218.k3N2IOGk032681@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/libedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32643/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libedit.spec 
Log Message:
auto-import libedit-2.9-2.20060213cvs on branch devel from libedit-2.9-2.20060213cvs.src.rpm


--- NEW FILE libedit.spec ---
%define	snap	20060213

Name:           libedit
Version:        2.9
Release:        2.%{snap}cvs%{?dist}
Summary:        The NetBSD Editline library (libedit)

Group:          System Environment/Libraries
License:        BSD
URL:            http://www.thrysoee.dk/editline/
Source0:        http://www.thrysoee.dk/editline/%{name}-%{snap}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ncurses-devel 

%description
This is an autotool- and libtoolized port of the NetBSD Editline
library (libedit). This Berkeley-style licensed command line
editor library provides generic line editing, history, and
tokenization functions, similar to those found in GNU Readline.

%package	devel
Summary:	Development files for %{name}
Group:		System Environment/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	ncurses-devel

%description	devel
This is an autotool- and libtoolized port of the NetBSD Editline
library (libedit). This Berkeley-style licensed command line
editor library provides generic line editing, history, and
tokenization functions, similar to those found in GNU Readline.

This package contains development files for %{name}.

%prep
%setup -q -n %{name}-%{snap}-%{version}

%build
%configure
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%post devel -p /sbin/ldconfig
%postun devel -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc ChangeLog INSTALL THANKS
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc examples/*.c
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/*.a
%{_mandir}/man3/*
%{_mandir}/man5/*

%changelog
* Thu Mar 23 2006 Michael J Knox <michael at knox.net.nz> 2.9-2.20060213cvs
- removed licence file I supplied, have requested upstream to provide one
- removed unrequire build dep

* Tue Mar 14 2006 Michael J Knox <michael at knox.net.nz> 2.9-1.20060213cvs
- removed .la
- added post and postun calls.
- fixed package groups and release.
- added %{name}.COPYING to include NetBSD BSD license.

* Tue Feb 14 2006 Michael J Knox <michael at knox.net.nz> 2.9-20060103cvs
- initial package for NetBSD's editline.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libedit/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2006 02:17:09 -0000	1.1
+++ .cvsignore	23 Apr 2006 02:18:21 -0000	1.2
@@ -0,0 +1 @@
+libedit-20060213-2.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libedit/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2006 02:17:09 -0000	1.1
+++ sources	23 Apr 2006 02:18:21 -0000	1.2
@@ -0,0 +1 @@
+adda2335413c044ae89af8b0a4bd3b69  libedit-20060213-2.9.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 23 02:24:05 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Sat, 22 Apr 2006 19:24:05 -0700
Subject: owners owners.list,1.875,1.876
Message-ID: <200604230224.k3N2O7kf032735@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32718

Modified Files:
	owners.list 
Log Message:
added entry for libedit



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.875
retrieving revision 1.876
diff -u -r1.875 -r1.876
--- owners.list	22 Apr 2006 19:56:07 -0000	1.875
+++ owners.list	23 Apr 2006 02:24:05 -0000	1.876
@@ -586,6 +586,7 @@
 Fedora Extras|libdnet|Simple portable interface to lowlevel networking routines|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
 Fedora Extras|libdsk|Disc drive library for use with the Fuse emulator|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|libebml|The Extensible Binary Meta Language library|anvil at livna.org|extras-qa at fedoraproject.org|
+Fedora Extras|libedit|The NetBSD Editline library|michael at knox.net.nz|extras-qa at fedoraproject.org|
 Fedora Extras|libesmtp|SMTP client library|pawsa at theochem.kth.se|extras-qa at fedoraproject.org|
 Fedora Extras|libetpan|Portable, efficient middleware for different kinds of mail access|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|libevent|Abstract asynchronous event notification library|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Apr 23 06:54:59 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 22 Apr 2006 23:54:59 -0700
Subject: rpms/poker-eval/devel poker-eval.spec,1.2,1.3
Message-ID: <200604230655.k3N6t17b009304@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/poker-eval/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9287

Modified Files:
	poker-eval.spec 
Log Message:
Rename samples/ to examples/


Index: poker-eval.spec
===================================================================
RCS file: /cvs/extras/rpms/poker-eval/devel/poker-eval.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- poker-eval.spec	22 Apr 2006 19:52:45 -0000	1.2
+++ poker-eval.spec	23 Apr 2006 06:54:59 -0000	1.3
@@ -27,12 +27,14 @@
 # rpmlint fix
 chmod -x examples/five_card_hands.c
 
-# use samples/ directory for devel package %doc section
-mkdir samples/ && cp examples/*.c samples/
+#  use examples/ directory for devel package %doc section
+mkdir -p tmp/examples/ && cp examples/*.c tmp/examples
+rm -f tmp/examples/getopt_w32.c
 
 %build
 %configure --disable-static
 make %{?_smp_mflags}
+cp examples/Makefile tmp/examples
 
 %install
 rm -rf %{buildroot}
@@ -54,7 +56,7 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc samples
+%doc tmp/examples
 %{_includedir}/%{name}
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/%{name}.pc
@@ -62,7 +64,7 @@
 
 %changelog
 * Sat Apr 22 2006 Christopher Stone <chris.stone at gmail.com> 130.0-3
-- Copy .c files in samples directory and use this for devel's %doc
+- Copy .c files in tmp/examples directory and use this for devel's %doc
 
 * Tue Apr 18 2006 Christopher Stone <chris.stone at gmail.com> 130.0-2
 - Added %check section



From fedora-extras-commits at redhat.com  Sun Apr 23 06:56:36 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 22 Apr 2006 23:56:36 -0700
Subject: rpms/poker-eval/devel poker-eval.spec,1.3,1.4
Message-ID: <200604230656.k3N6ucQJ009333@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/poker-eval/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9316

Modified Files:
	poker-eval.spec 
Log Message:
oops dont want this


Index: poker-eval.spec
===================================================================
RCS file: /cvs/extras/rpms/poker-eval/devel/poker-eval.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- poker-eval.spec	23 Apr 2006 06:54:59 -0000	1.3
+++ poker-eval.spec	23 Apr 2006 06:56:36 -0000	1.4
@@ -34,7 +34,6 @@
 %build
 %configure --disable-static
 make %{?_smp_mflags}
-cp examples/Makefile tmp/examples
 
 %install
 rm -rf %{buildroot}



From fedora-extras-commits at redhat.com  Sun Apr 23 09:18:26 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 23 Apr 2006 02:18:26 -0700
Subject: rpms/poker-eval/devel poker-eval.spec,1.4,1.5
Message-ID: <200604230918.k3N9ISTv016251@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/poker-eval/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16234

Modified Files:
	poker-eval.spec 
Log Message:
Fix % in changelog


Index: poker-eval.spec
===================================================================
RCS file: /cvs/extras/rpms/poker-eval/devel/poker-eval.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- poker-eval.spec	23 Apr 2006 06:56:36 -0000	1.4
+++ poker-eval.spec	23 Apr 2006 09:18:25 -0000	1.5
@@ -63,10 +63,10 @@
 
 %changelog
 * Sat Apr 22 2006 Christopher Stone <chris.stone at gmail.com> 130.0-3
-- Copy .c files in tmp/examples directory and use this for devel's %doc
+- Copy .c files in tmp/examples directory and use this for devel's %%doc
 
 * Tue Apr 18 2006 Christopher Stone <chris.stone at gmail.com> 130.0-2
-- Added %check section
+- Added %%check section
 - Removed make build_tables
 - Updated Source0 and URL
 



From fedora-extras-commits at redhat.com  Sun Apr 23 13:16:35 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun, 23 Apr 2006 06:16:35 -0700
Subject: rpms/ltsp-utils - New directory
Message-ID: <200604231316.k3NDGbg6025417@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/ltsp-utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25391/ltsp-utils

Log Message:
Directory /cvs/extras/rpms/ltsp-utils added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 23 13:16:35 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun, 23 Apr 2006 06:16:35 -0700
Subject: rpms/ltsp-utils/devel - New directory
Message-ID: <200604231316.k3NDGbxA025420@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/ltsp-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25391/ltsp-utils/devel

Log Message:
Directory /cvs/extras/rpms/ltsp-utils/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 23 13:16:55 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun, 23 Apr 2006 06:16:55 -0700
Subject: rpms/ltsp-utils Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604231316.k3NDGvID025469@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/ltsp-utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25436

Added Files:
	Makefile import.log 
Log Message:
Setup of module ltsp-utils


--- NEW FILE Makefile ---
# Top level Makefile for module ltsp-utils
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Apr 23 13:16:56 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun, 23 Apr 2006 06:16:56 -0700
Subject: rpms/ltsp-utils/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604231316.k3NDGw1c025472@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/ltsp-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25436/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ltsp-utils


--- 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 Apr 23 13:17:24 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun, 23 Apr 2006 06:17:24 -0700
Subject: rpms/ltsp-utils import.log,1.1,1.2
Message-ID: <200604231317.k3NDHQrO025533@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/ltsp-utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25500

Modified Files:
	import.log 
Log Message:
auto-import ltsp-utils-0.25-2 on branch devel from ltsp-utils-0.25-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ltsp-utils/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	23 Apr 2006 13:16:55 -0000	1.1
+++ import.log	23 Apr 2006 13:17:24 -0000	1.2
@@ -0,0 +1 @@
+ltsp-utils-0_25-2:HEAD:ltsp-utils-0.25-2.src.rpm:1145798237



From fedora-extras-commits at redhat.com  Sun Apr 23 13:17:25 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun, 23 Apr 2006 06:17:25 -0700
Subject: rpms/ltsp-utils/devel ltsp-utils.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604231317.k3NDHRT7025538@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/ltsp-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25500/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ltsp-utils.spec 
Log Message:
auto-import ltsp-utils-0.25-2 on branch devel from ltsp-utils-0.25-2.src.rpm


--- NEW FILE ltsp-utils.spec ---
Summary:   Linux Terminal Server Project (ltsp.org) utilities
Name:      ltsp-utils
Version:   0.25
Release:   2
License:   GPL
URL:       http://www.ltsp.org
Group:     Applications/System
Source:    http://ltsp.mirrors.tds.net/pub/ltsp/utils/%{name}-%{version}-0.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n )
BuildArch: noarch
Requires:  dhcp
Requires:  nfs-utils
Requires:  tftp-server
Requires:  perl(LWP), perl(URI), perl(Digest::MD5), perl(Term::Cap)

%description
This package includes the following utilities for LTSP server:
  ltspadmin   For installing and managing the packages
              on an LTSP server.
  ltspcfg     For configuring the services on an LTSP server.
  ltspinfo    For querying the workstation, to learn things,
              such as which sound daemon is being used.

%prep
%setup -n %{name}

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_sbindir}
mkdir -p $RPM_BUILD_ROOT%{_bindir}
install ltspadmin ltspcfg $RPM_BUILD_ROOT%{_sbindir}
install ltspinfo $RPM_BUILD_ROOT%{_bindir}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc ChangeLog notes.txt COPYING
%{_bindir}/ltspinfo
%{_sbindir}/ltspadmin
%{_sbindir}/ltspcfg

%changelog
* Sun Apr 23 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.25-2
- applied patch pertusus at free.fr
* Sat Apr 22 2006 <fedora at soeterbroek.com> - 0.25-1
- rebuild for upstream version 0.25
* Wed Apr 12 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.22-3
- removed Requires for perl-libwww-perl, perl-URI
* Wed Apr 12 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.22-2
- added Requires for perl(LWP), perl(URI), perl(Digest::MD5), perl(Term::Cap)
* Tue Apr 11 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.22-1
- rebuild for FE
* Mon Apr 10 2006 Jim McQuillan <jam at Ltsp.org>
- ltaspadmin - Fixed a problem handling non-numeric version/release numbers
* Sun Apr 9 2006 Jim McQuillan <jam at Ltsp.org>
- ltspcfg - Fixed problems with GDM and KDM on both Fedora FC5 and Ubuntu
- ltspadmin - Fixed problem with missing Termcap entries
- ltspadmin - Made it handle ltspcfg croaking a little nicer.
* Tue Apr 4 2006 Jim McQuillan <jam at Ltsp.org>
- ltspcfg - Changed the content that we write to dhcpd.conf, to include
  the auto-hostname stuff.
- ltspadmin - Added support for LTSP-4.2.  Also, it looks out for older
  versions of ltsp, to make sure you can't overwrite an existing installation.
- ltspcfg - fixed the problem with xdmcp showing up as NOT enabled.
- ltspadmin - Updated the pkgformat to 0.5, to support the new LTSP-4.2
  packages.
- ltspcfg - fixed autodetection of ubuntu/Breezy, and cleaned up the
  message about portmap on Debian.
* Wed Mar 16 2005 Jim McQuillan <jam at Ltsp.org>
- Changed the default url to be: http://ltsp.mirrors.tds.net/pub/ltsp/ltsp-4.1/
- Changed it to use a package.list file, rather than downloading each .ltsp
  file separately.
* Wed Aug 25 2004 Jim McQuillan <jam at Ltsp.org>
- Added code to deal with missing perl modules more gracefully.
- Added filtering of of multiple versions of the same program,
  so that only the latest version will get installed.
* Mon Aug 16 2004 Jim McQuillan <jam at Ltsp.org>
- Fixed problem with the version number in ltspadmin. It was being
  treated as a floating point number, so 0.10 was coming out as
  0.1.  I changed it to a string, and now it appears correct.
* Fri Aug 13 2004 Jim McQuillan <jam at Ltsp.org>
- Added binmode() to the download function. This fixes problems with
  md5sum mismatches that some people were having.  Thanks to
  Scott Chapman.
- Added testing for the LWP module, along with a reasonable message
  displays if LWP is not found.
* Wed Aug 4 2004 Jim McQuillan <jam at Ltsp.org>
- Fixed LANG problem in ltspadmin. It was causing md5 mismatches
* Tue Aug 3 2004 Jim McQuillan <jam at Ltsp.org>
- Added progress indicator to download screens
* Tue Jul 27 2004 Jim McQuillan <jam at Ltsp.org>
- Fixed problem in ltspcfg where it was missing the "disable" line
  in /etc/xinetd.d/tftp.
- Added progress indicator in ltspadmin
* Tue Jul 13 2004 Jim McQuillan <jam at Ltsp.org>
- Fixed testing of root in install.sh
- Moved ltspinfo to /usr/bin, instead of /usr/sbin
* Mon Jul 12 2004 Jim McQuillan <jam at Ltsp.org>
- Added ltspinfo
- Lots of fixes to ltspcfg contributed by Emiliano Gabrielli, mostly
  for Debian things.
- Fix to the Languange environment variables, to work better internationally
* Sat Jun 26 2004 Jim McQuillan <jam at Ltsp.org>
- Fixed accumulating of component size. It wasn't zeroing the total, so
  returning to the component list window would keep adding to the total.
* Thu Jun 24 2004 Jim McQuillan <jam at Ltsp.org>
- First build of the RPM package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ltsp-utils/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2006 13:16:56 -0000	1.1
+++ .cvsignore	23 Apr 2006 13:17:25 -0000	1.2
@@ -0,0 +1 @@
+ltsp-utils-0.25-0.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ltsp-utils/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2006 13:16:56 -0000	1.1
+++ sources	23 Apr 2006 13:17:25 -0000	1.2
@@ -0,0 +1 @@
+cb8197dddb83df25b70abd93a0dbd865  ltsp-utils-0.25-0.tgz



From fedora-extras-commits at redhat.com  Sun Apr 23 13:21:10 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun, 23 Apr 2006 06:21:10 -0700
Subject: owners owners.list,1.876,1.877
Message-ID: <200604231321.k3NDLC0E025603@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25586

Modified Files:
	owners.list 
Log Message:
added ltsp-utils


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.876
retrieving revision 1.877
diff -u -r1.876 -r1.877
--- owners.list	23 Apr 2006 02:24:05 -0000	1.876
+++ owners.list	23 Apr 2006 13:21:10 -0000	1.877
@@ -692,6 +692,7 @@
 Fedora Extras|loudmouth|Jabber programming library written in C|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|lout|A document formatting system|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|lrmi|Library for calling real mode BIOS routines|extras-orphan at fedoraproject.org|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|lucidlife|A Conway's Life simulator|peter at thecodergeek.com|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|



From fedora-extras-commits at redhat.com  Sun Apr 23 13:44:09 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sun, 23 Apr 2006 06:44:09 -0700
Subject: rpms/perl-List-MoreUtils - New directory
Message-ID: <200604231344.k3NDiBu0025767@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-List-MoreUtils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25741/perl-List-MoreUtils

Log Message:
Directory /cvs/extras/rpms/perl-List-MoreUtils added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 23 13:44:10 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sun, 23 Apr 2006 06:44:10 -0700
Subject: rpms/perl-List-MoreUtils/devel - New directory
Message-ID: <200604231344.k3NDiCpu025770@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-List-MoreUtils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25741/perl-List-MoreUtils/devel

Log Message:
Directory /cvs/extras/rpms/perl-List-MoreUtils/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 23 13:44:26 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sun, 23 Apr 2006 06:44:26 -0700
Subject: rpms/perl-List-MoreUtils Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604231344.k3NDiSYJ025819@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-List-MoreUtils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25786

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-List-MoreUtils


--- NEW FILE Makefile ---
# Top level Makefile for module perl-List-MoreUtils
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 23 13:44:39 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 23 Apr 2006 06:44:39 -0700
Subject: extras-buildsys/utils extras-repobuild.py, 1.13,
	1.14 extras-repoview.py, 1.3, 1.4 extras-sign-move.py, 1.10, 1.11
Message-ID: <200604231344.k3NDidak025855@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25830

Modified Files:
	extras-repobuild.py extras-repoview.py extras-sign-move.py 
Log Message:
Make stuff a bit easier to adapt to other distros/projects.


Index: extras-repobuild.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/extras-repobuild.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- extras-repobuild.py	21 Apr 2006 15:59:41 -0000	1.13
+++ extras-repobuild.py	23 Apr 2006 13:44:36 -0000	1.14
@@ -25,7 +25,9 @@
 # email to fedora-extras-list with the built packages list
 # sing, dance, romance
 
-treedir = '/srv/rpmbuild/extras/tree/extras'
+distro = 'fedora'
+project = 'extras'
+treedir = '/srv/rpmbuild/%s/tree/%s' % (project, project)
 cachedir = '/tmp/repomd-cache'
 compsname = 'comps.xml'
 archdict = {'3':['x86_64', 'i386'], 
@@ -92,7 +94,7 @@
     if not archdict.has_key(dist):
         print "No Distribution named %s found" % dist
         sys.exit(1)
-    distdir = 'fedora-%s-extras' % dist        
+    distdir = '%s-%s-%s' % (distro, dist, project)
     destdir = os.path.join(treedir, dist)
     keep = (dist == 'development') and 1 or 2
 


Index: extras-repoview.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/extras-repoview.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- extras-repoview.py	21 Apr 2006 15:59:41 -0000	1.3
+++ extras-repoview.py	23 Apr 2006 13:44:36 -0000	1.4
@@ -21,7 +21,8 @@
 # get the path to where to look for the packages to be signed
 # make repoview
 
-treedir = '/srv/rpmbuild/extras/tree/extras'
+project = 'extras'
+treedir = '/srv/rpmbuild/%s/tree/%s' % (project, project)
 archdict = {'3':['x86_64', 'i386'], 
             '4':['ppc','x86_64', 'i386'],
             '5':['ppc','x86_64', 'i386'],


Index: extras-sign-move.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/extras-sign-move.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- extras-sign-move.py	21 Apr 2006 15:59:41 -0000	1.10
+++ extras-sign-move.py	23 Apr 2006 13:44:36 -0000	1.11
@@ -30,9 +30,19 @@
 # move pkgs into repo
 # email to fedora-extras-list with the built packages list
 
+distro = 'fedora'
+project = 'extras'
+project_hr = 'Fedora Extras'
+mail_from = 'buildsys at fedoraproject.org'
+mail_to = 'fedora-extras-list at redhat.com'
+mail_footer = """
 
+For more information about the built packages please see the repository
+or the fedora Info Feed: http://fedoraproject.org/infofeed/
+
+"""
 stagesdir = '/srv/rpmbuild/repodir'
-treedir = '/srv/rpmbuild/extras/tree/extras'
+treedir = '/srv/rpmbuild/%s/tree/%s' % (project, project)
 cachedir = '/tmp/repomd-cache'
 compsname = 'comps.xml'
 archdict = {'3':['x86_64', 'i386'], 
@@ -115,27 +125,19 @@
 
 
 def email_list(pkglist, dist):
-    """email extras list with the new package listing"""
-    mail_from = 'buildsys at fedoraproject.org'
-    mail_to = 'fedora-extras-list at redhat.com'
+    """email mailing list with the new package listing"""
 
     uniqued = rpmUtils.miscutils.unique(pkglist)
     uniqued.sort()
     
-    output = "\nPackages built and released for Fedora Extras %s: %s \n\n" % (dist, len(uniqued))
+    output = "\nPackages built and released for %s %s: %s \n\n" % (project_hr, dist, len(uniqued))
     for pkg in uniqued:
         add = '%s\n' % (pkg)
         output = output + add
     
-    end = """
-
-For more information about the built packages please see the repository
-or the fedora Info Feed: http://fedoraproject.org/infofeed/
-
-"""
-    output = output + end
+    output = output + mail_footer
     msg = MIMEText(output)
-    subject = 'Fedora Extras %s Package Build Report' % dist
+    subject = '%s %s Package Build Report' % (project_hr, dist)
     msg['Subject'] = subject
     msg['From'] = mail_from
     msg['To'] = mail_to
@@ -171,7 +173,7 @@
     if not archdict.has_key(dist):
         print "No Distribution named %s found" % dist
         sys.exit(5)
-    distdir = 'fedora-%s-extras' % dist    
+    distdir = '%s-%s-%s' % (distro, dist, project)
     needsign = os.path.join(stagesdir, distdir)
     files = find_files(needsign)
     rpms = files['rpm'] + files['srpm'] + files['debuginfo']    
@@ -275,7 +277,7 @@
             shutil.move(package, rpmloc)
 
     # email the list
-    if not DEBUG:
+    if not DEBUG and mail_to:
         print "Emailing info"
         email_list(infolist, dist)
     



From fedora-extras-commits at redhat.com  Sun Apr 23 13:44:26 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sun, 23 Apr 2006 06:44:26 -0700
Subject: rpms/perl-List-MoreUtils/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604231344.k3NDiSGU025822@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-List-MoreUtils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25786/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-List-MoreUtils


--- 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 Apr 23 13:45:00 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sun, 23 Apr 2006 06:45:00 -0700
Subject: rpms/perl-List-MoreUtils import.log,1.1,1.2
Message-ID: <200604231345.k3NDj2n3025911@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-List-MoreUtils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25878

Modified Files:
	import.log 
Log Message:
auto-import perl-List-MoreUtils-0.19-1 on branch devel from perl-List-MoreUtils-0.19-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-List-MoreUtils/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	23 Apr 2006 13:44:26 -0000	1.1
+++ import.log	23 Apr 2006 13:45:00 -0000	1.2
@@ -0,0 +1 @@
+perl-List-MoreUtils-0_19-1:HEAD:perl-List-MoreUtils-0.19-1.src.rpm:1145799892



From fedora-extras-commits at redhat.com  Sun Apr 23 13:45:00 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sun, 23 Apr 2006 06:45:00 -0700
Subject: rpms/perl-List-MoreUtils/devel perl-List-MoreUtils.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604231345.k3NDj21h025916@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-List-MoreUtils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25878/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-List-MoreUtils.spec 
Log Message:
auto-import perl-List-MoreUtils-0.19-1 on branch devel from perl-List-MoreUtils-0.19-1.src.rpm


--- NEW FILE perl-List-MoreUtils.spec ---
Name:           perl-List-MoreUtils
Version:        0.19
Release:        1%{?dist}
Summary:        Provide the stuff missing in List::Util

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/List-MoreUtils/
Source0:        http://www.cpan.org/authors/id/V/VP/VPARSEVAL/List-MoreUtils-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
List::MoreUtils provides some trivial but commonly needed functionality
on lists which is not going to go into List::Util.


%prep
%setup -q -n List-MoreUtils-%{version}


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorarch}/List/
%{perl_vendorarch}/auto/List/
%{_mandir}/man3/*.3pm*


%changelog
* Sat Apr 22 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.19-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-List-MoreUtils/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2006 13:44:26 -0000	1.1
+++ .cvsignore	23 Apr 2006 13:45:00 -0000	1.2
@@ -0,0 +1 @@
+List-MoreUtils-0.19.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-List-MoreUtils/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2006 13:44:26 -0000	1.1
+++ sources	23 Apr 2006 13:45:00 -0000	1.2
@@ -0,0 +1 @@
+2cbcb4a96b4570cb28dfcbb2d0c6b08c  List-MoreUtils-0.19.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 23 13:53:34 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sun, 23 Apr 2006 06:53:34 -0700
Subject: owners owners.list,1.877,1.878
Message-ID: <200604231353.k3NDrat8026026@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26009

Modified Files:
	owners.list 
Log Message:
New package: perl-List-MoreUtils (#189678)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.877
retrieving revision 1.878
diff -u -r1.877 -r1.878
--- owners.list	23 Apr 2006 13:21:10 -0000	1.877
+++ owners.list	23 Apr 2006 13:53:34 -0000	1.878
@@ -1027,6 +1027,7 @@
 Fedora Extras|perl-libintl|Internationalization library for Perl, compatible with gettext|matthias at rpmforge.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Lingua-EN-Inflect|Convert singular to plural, select "a" or "an"|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Lingua-EN-Inflect-Number|Force number of words to singular or plural|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-List-MoreUtils|Provide the stuff missing in List::Util|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Locale-Maketext-Fuzzy|Maketext from already interpolated strings|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Locale-Maketext-Lexicon|Extract translatable strings from source|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Locale-Maketext-Simple|Simple interface to Locale::Maketext::Lexicon|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Sun Apr 23 15:53:19 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 23 Apr 2006 08:53:19 -0700
Subject: rpms/SDL_mixer/devel SDL_mixer-1.2.6-64bit.patch, NONE,
	1.1 SDL_mixer.spec, 1.12, 1.13
Message-ID: <200604231553.k3NFrLuA031448@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/SDL_mixer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31423

Modified Files:
	SDL_mixer.spec 
Added Files:
	SDL_mixer-1.2.6-64bit.patch 
Log Message:
* Sun Apr 23 2006 Brian Pepple <bdpepple at ameritech.net> - 1.2.6-8
- Add patch to fix sound on x86_64. Bug #175672.


SDL_mixer-1.2.6-64bit.patch:

--- NEW FILE SDL_mixer-1.2.6-64bit.patch ---
diff -ur SDL_mixer-1.2.6.OLD/timidity/config.h SDL_mixer-1.2.6/timidity/config.h
--- SDL_mixer-1.2.6.OLD/timidity/config.h	2004-12-16 00:20:14.000000000 -0500
+++ SDL_mixer-1.2.6/timidity/config.h	2006-04-23 11:28:44.000000000 -0400
@@ -185,14 +185,8 @@
 #define LITTLE_ENDIAN
 #endif
 
-/* DEC MMS has 64 bit long words */
-#ifdef DEC
 typedef unsigned int uint32;
 typedef int int32; 
-#else
-typedef unsigned long uint32;
-typedef long int32; 
-#endif
 typedef unsigned short uint16;
 typedef short int16;
 typedef unsigned char uint8;


Index: SDL_mixer.spec
===================================================================
RCS file: /cvs/extras/rpms/SDL_mixer/devel/SDL_mixer.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SDL_mixer.spec	13 Feb 2006 17:29:47 -0000	1.12
+++ SDL_mixer.spec	23 Apr 2006 15:53:19 -0000	1.13
@@ -1,6 +1,6 @@
 Name:		SDL_mixer
 Version:	1.2.6
-Release:	6%{?dist}
+Release:	8%{?dist}
 Summary:	Simple DirectMedia Layer - Sample Mixer Library
 
 Group:		System Environment/Libraries
@@ -10,6 +10,7 @@
 Patch1:		%{name}-1.0.6-redhat.patch
 Patch2:		%{name}-1.2.6-libmikmod.patch
 Patch4:		%{name}-1.2.5-bad_code.patch
+Patch5:		%{name}-1.2.6-64bit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Prefix:		%{_prefix}
@@ -48,6 +49,7 @@
 %patch1 -p1 -b .redhat
 %patch2 -p1 -b .libmikmod
 %patch4 -p1 -b .bad_code
+%patch5 -p1 -b .64bit
 
 
 %build
@@ -90,6 +92,9 @@
 
 
 %changelog
+* Sun Apr 23 2006 Brian Pepple <bdpepple at ameritech.net> - 1.2.6-8
+- Add patch to fix sound on x86_64. Bug #175672.
+
 * Mon Feb 13 2006 Brian Pepple <bdpepple at ameritech.net> - 1.2.6-6
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-extras-commits at redhat.com  Sun Apr 23 15:55:52 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 23 Apr 2006 08:55:52 -0700
Subject: rpms/SDL_mixer/FC-5 SDL_mixer-1.2.6-64bit.patch, NONE,
	1.1 SDL_mixer.spec, 1.12, 1.13
Message-ID: <200604231555.k3NFts9N031934@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/SDL_mixer/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31909

Modified Files:
	SDL_mixer.spec 
Added Files:
	SDL_mixer-1.2.6-64bit.patch 
Log Message:
* Sun Apr 23 2006 Brian Pepple <bdpepple at ameritech.net> - 1.2.6-7
- Add patch to fix sound on x86_64. Bug #175672.


SDL_mixer-1.2.6-64bit.patch:

--- NEW FILE SDL_mixer-1.2.6-64bit.patch ---
diff -ur SDL_mixer-1.2.6.OLD/timidity/config.h SDL_mixer-1.2.6/timidity/config.h
--- SDL_mixer-1.2.6.OLD/timidity/config.h	2004-12-16 00:20:14.000000000 -0500
+++ SDL_mixer-1.2.6/timidity/config.h	2006-04-23 11:28:44.000000000 -0400
@@ -185,14 +185,8 @@
 #define LITTLE_ENDIAN
 #endif
 
-/* DEC MMS has 64 bit long words */
-#ifdef DEC
 typedef unsigned int uint32;
 typedef int int32; 
-#else
-typedef unsigned long uint32;
-typedef long int32; 
-#endif
 typedef unsigned short uint16;
 typedef short int16;
 typedef unsigned char uint8;


Index: SDL_mixer.spec
===================================================================
RCS file: /cvs/extras/rpms/SDL_mixer/FC-5/SDL_mixer.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SDL_mixer.spec	13 Feb 2006 17:29:47 -0000	1.12
+++ SDL_mixer.spec	23 Apr 2006 15:55:52 -0000	1.13
@@ -1,6 +1,6 @@
 Name:		SDL_mixer
 Version:	1.2.6
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Simple DirectMedia Layer - Sample Mixer Library
 
 Group:		System Environment/Libraries
@@ -10,6 +10,7 @@
 Patch1:		%{name}-1.0.6-redhat.patch
 Patch2:		%{name}-1.2.6-libmikmod.patch
 Patch4:		%{name}-1.2.5-bad_code.patch
+Patch5:		%{name}-1.2.6-64bit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Prefix:		%{_prefix}
@@ -48,6 +49,7 @@
 %patch1 -p1 -b .redhat
 %patch2 -p1 -b .libmikmod
 %patch4 -p1 -b .bad_code
+%patch5 -p1 -b .64bit
 
 
 %build
@@ -90,6 +92,9 @@
 
 
 %changelog
+* Sun Apr 23 2006 Brian Pepple <bdpepple at ameritech.net> - 1.2.6-7
+- Add patch to fix sound on x86_64. Bug #175672.
+
 * Mon Feb 13 2006 Brian Pepple <bdpepple at ameritech.net> - 1.2.6-6
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-extras-commits at redhat.com  Sun Apr 23 17:11:24 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun, 23 Apr 2006 10:11:24 -0700
Subject: rpms/dejavu-fonts import.log,1.45,1.46
Message-ID: <200604231711.k3NHBQLB005540@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5505

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.5.0-1.fc6 on branch devel from dejavu-fonts-2.5.0-1.fc6.src.rpm
2.5.0


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- import.log	30 Mar 2006 17:49:15 -0000	1.45
+++ import.log	23 Apr 2006 17:11:24 -0000	1.46
@@ -42,3 +42,4 @@
 dejavu-fonts-2_4_1-1_fc5:FC-5:dejavu-fonts-2.4.1-1.fc5.src.rpm:1143660631
 dejavu-fonts-2_4_1-1_fc4:FC-4:dejavu-fonts-2.4.1-1.fc4.src.rpm:1143660926
 dejavu-fonts-2_4_1-2_fc6:HEAD:dejavu-fonts-2.4.1-2.fc6.src.rpm:1143740939
+dejavu-fonts-2_5_0-1_fc6:HEAD:dejavu-fonts-2.5.0-1.fc6.src.rpm:1145812262



From fedora-extras-commits at redhat.com  Sun Apr 23 17:11:25 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun, 23 Apr 2006 10:11:25 -0700
Subject: rpms/dejavu-fonts/devel .cvsignore, 1.12, 1.13 dejavu-fonts.spec,
	1.19, 1.20 sources, 1.12, 1.13
Message-ID: <200604231711.k3NHBRKa005546@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5505/devel

Modified Files:
	.cvsignore dejavu-fonts.spec sources 
Log Message:
auto-import dejavu-fonts-2.5.0-1.fc6 on branch devel from dejavu-fonts-2.5.0-1.fc6.src.rpm
2.5.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	29 Mar 2006 19:25:23 -0000	1.12
+++ .cvsignore	23 Apr 2006 17:11:24 -0000	1.13
@@ -1 +1 @@
-dejavu-sfd-2.4.1.tar.gz
+dejavu-sfd-2.5.tar.gz


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- dejavu-fonts.spec	30 Mar 2006 17:49:16 -0000	1.19
+++ dejavu-fonts.spec	23 Apr 2006 17:11:24 -0000	1.20
@@ -1,6 +1,6 @@
 %define archivename     dejavu-sfd
 # This macro has the same value as %{version}, except when testing pre-release snapshots
-%define archiveversion  %{version}
+%define archiveversion  2.5
 %define fontdir         %{_datadir}/fonts/%{name}
 %define xsldir          %{_datadir}/xml/%{name}
 
@@ -9,8 +9,8 @@
 %define UnicodeData	%(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt
 
 Name:      dejavu-fonts
-Version:   2.4.1
-Release:   2%{?dist}
+Version:   2.5.0
+Release:   1%{?dist}
 Summary:   DejaVu fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
@@ -60,7 +60,7 @@
 
 
 %prep
-%setup -q -n %{archivename}-%{version}
+%setup -q -n %{archivename}-%{archiveversion}
 
 
 %build
@@ -161,10 +161,13 @@
 
 
 %changelog
-* Wed Mar 29 2006  Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.4.1-1
+* Sun Apr 23 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.5.0-1
+- 2.5.0
+
+* Wed Mar 29 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.4.1-1
 - 2.4.1 (workaround pango problems)
 
-* Wed Mar 22 2006  Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.4-1
+* Wed Mar 22 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.4-1
 - 2.4 A big thanks to Stepan Roh for getting the project there
 - split out experimental typefaces
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	29 Mar 2006 19:25:23 -0000	1.12
+++ sources	23 Apr 2006 17:11:25 -0000	1.13
@@ -1 +1 @@
-ea7ee1cd16880a8ce5b3e70d97c41fc8  dejavu-sfd-2.4.1.tar.gz
+402d2f846caa83c8067e281b3c5fa8c0  dejavu-sfd-2.5.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 23 17:12:22 2006
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu))
Date: Sun, 23 Apr 2006 10:12:22 -0700
Subject: rpms/muse - New directory
Message-ID: <200604231712.k3NHCORp005669@cvs-int.fedora.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/muse
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5642/muse

Log Message:
Directory /cvs/extras/rpms/muse added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 23 17:12:23 2006
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu))
Date: Sun, 23 Apr 2006 10:12:23 -0700
Subject: rpms/muse/devel - New directory
Message-ID: <200604231712.k3NHCPio005672@cvs-int.fedora.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/muse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5642/muse/devel

Log Message:
Directory /cvs/extras/rpms/muse/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 23 17:12:37 2006
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu))
Date: Sun, 23 Apr 2006 10:12:37 -0700
Subject: rpms/muse Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604231712.k3NHCd6g005741@cvs-int.fedora.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/muse
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5695

Added Files:
	Makefile import.log 
Log Message:
Setup of module muse


--- NEW FILE Makefile ---
# Top level Makefile for module muse
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 23 17:12:38 2006
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu))
Date: Sun, 23 Apr 2006 10:12:38 -0700
Subject: rpms/muse/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200604231712.k3NHCeOt005744@cvs-int.fedora.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/muse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5695/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module muse


--- 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 Apr 23 17:12:44 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun, 23 Apr 2006 10:12:44 -0700
Subject: rpms/dejavu-fonts/FC-5 .cvsignore, 1.12, 1.13 dejavu-fonts.spec,
	1.18, 1.19 sources, 1.12, 1.13
Message-ID: <200604231712.k3NHCkkO005778@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-serv5709/FC-5

Modified Files:
	.cvsignore dejavu-fonts.spec sources 
Log Message:
auto-import dejavu-fonts-2.5.0-1.fc5 on branch FC-5 from dejavu-fonts-2.5.0-1.fc5.src.rpm
2.5.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	29 Mar 2006 19:30:48 -0000	1.12
+++ .cvsignore	23 Apr 2006 17:12:44 -0000	1.13
@@ -1 +1 @@
-dejavu-sfd-2.4.1.tar.gz
+dejavu-sfd-2.5.tar.gz


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/dejavu-fonts.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- dejavu-fonts.spec	29 Mar 2006 19:30:48 -0000	1.18
+++ dejavu-fonts.spec	23 Apr 2006 17:12:44 -0000	1.19
@@ -1,6 +1,6 @@
 %define archivename     dejavu-sfd
 # This macro has the same value as %{version}, except when testing pre-release snapshots
-%define archiveversion  %{version}
+%define archiveversion  2.5
 %define fontdir         %{_datadir}/fonts/%{name}
 %define xsldir          %{_datadir}/xml/%{name}
 
@@ -9,7 +9,7 @@
 %define UnicodeData	%(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt
 
 Name:      dejavu-fonts
-Version:   2.4.1
+Version:   2.5.0
 Release:   1%{?dist}
 Summary:   DejaVu fonts
 Group:     User Interface/X
@@ -60,7 +60,7 @@
 
 
 %prep
-%setup -q -n %{archivename}-%{version}
+%setup -q -n %{archivename}-%{archiveversion}
 
 
 %build
@@ -161,10 +161,13 @@
 
 
 %changelog
-* Wed Mar 29 2006  Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.4.1-1
+* Sun Apr 23 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.5.0-1
+- 2.5.0
+
+* Wed Mar 29 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.4.1-1
 - 2.4.1 (workaround pango problems)
 
-* Wed Mar 22 2006  Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.4-1
+* Wed Mar 22 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.4-1
 - 2.4 A big thanks to Stepan Roh for getting the project there
 - split out experimental typefaces
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	29 Mar 2006 19:30:48 -0000	1.12
+++ sources	23 Apr 2006 17:12:44 -0000	1.13
@@ -1 +1 @@
-ea7ee1cd16880a8ce5b3e70d97c41fc8  dejavu-sfd-2.4.1.tar.gz
+402d2f846caa83c8067e281b3c5fa8c0  dejavu-sfd-2.5.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 23 17:13:10 2006
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu))
Date: Sun, 23 Apr 2006 10:13:10 -0700
Subject: rpms/muse import.log,1.1,1.2
Message-ID: <200604231713.k3NHDClW005834@cvs-int.fedora.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/muse
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5799

Modified Files:
	import.log 
Log Message:
auto-import muse-3.02.6b-4 on branch devel from muse-3.02.6b-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/muse/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	23 Apr 2006 17:12:37 -0000	1.1
+++ import.log	23 Apr 2006 17:13:10 -0000	1.2
@@ -0,0 +1 @@
+muse-3_02_6b-4:HEAD:muse-3.02.6b-4.src.rpm:1145812383



From fedora-extras-commits at redhat.com  Sun Apr 23 17:13:11 2006
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu))
Date: Sun, 23 Apr 2006 10:13:11 -0700
Subject: rpms/muse/devel muse.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200604231713.k3NHDDJj005839@cvs-int.fedora.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/muse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5799/devel

Modified Files:
	.cvsignore sources 
Added Files:
	muse.spec 
Log Message:
auto-import muse-3.02.6b-4 on branch devel from muse-3.02.6b-4.src.rpm


--- NEW FILE muse.spec ---
%define pkg muse
%define xemacs 1

%define emacs_sitelisp %{_datadir}/emacs/site-lisp
%define emacs_ver 21.4

%if %{xemacs}
%define xemacs_sitelisp %{_datadir}/xemacs/xemacs-packages/lisp
%define xemacs_ver 21.4.18
%endif

Name: muse
Version: 3.02.6b       
Release: 4%{?dist}
Summary: Emacs Muse is an authoring and publishing environment for Emacs
Group: Applications/Editors
License: GPL        
URL: http://www.mwolson.org/projects/MuseMode.html           
BuildArch: noarch

Source0: http://download.gna.org/muse-el/%{pkg}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: emacs >= %{emacs_ver}, texinfo
Requires: /sbin/install-info 

%if %{xemacs}
BuildRequires: xemacs >= %{xemacs_ver}
%endif

%description 
Muse is an authoring and publishing environment for (X)Emacs. It simplifies
the process of writings documents and publishing them to various output
formats. Muse uses a very simple Wiki-like format as input.

Muse can publish to the following formats.

    * Blosxom
    * DocBook
    * HTML
    * LaTeX
    * PDF
    * Texinfo
    * XHTML
    * XML

This package contains the files common to both the Emacs and XEmacs
installations of Muse. You need to install either (or both) of emacs-%{pkg}
and xemacs-%{pkg} to use Muse.

%package -n emacs-%{pkg}
Summary: Compiled Muse lisp files for Emacs
Group: Applications/Editors
Requires: %{name} = %{version}
Requires: emacs >= %{emacs_ver}
Requires: tetex-latex

%description -n emacs-%{pkg}
This package contains the files required to use Muse with Emacs.

%package -n emacs-%{pkg}-el
Summary: Muse lisp source files for Emacs
Group: Applications/Editors
Requires: %{name} = %{version}
Requires: emacs-%{pkg} = %{version}

%description -n emacs-%{pkg}-el
This package contains the source lisp files for Muse for Emacs.

%if %{xemacs}
%package -n xemacs-%{pkg}
Summary: Compiled Muse lisp files for XEmacs
Group: Applications/Editors
Requires: %{name} = %{version}
Requires: xemacs >= %{xemacs_ver}
Requires: tetex-latex

%description -n xemacs-%{pkg}
This package contains the files required to use Muse with XEmacs.

%package -n xemacs-%{pkg}-el
Summary: Muse lisp source files for XEmacs
Group: Applications/Editors
Requires: %{name} = %{version}
Requires: xemacs-%{pkg} = %{version}

%description -n xemacs-%{pkg}-el
This package contains the source lisp files for Muse for XEmacs.
%endif

%prep
%setup -q -n %{pkg}-%{version}

%build #Note that %{_smp_mflags} causes make to hang sometimes here.
make all muse.html

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_infodir}

make install \
  PREFIX=%{buildroot}/%{_usr} \
  INFODIR=%{buildroot}/%{_infodir} \
  INSTALLINFO="/sbin/install-info --infodir=%{buildroot}/%{_infodir}"

# Create startup file.
mkdir -p %{buildroot}/%{emacs_sitelisp}/site-start.d

cat > muse-init.el << EOF
;; Load muse-mode
(require 'muse-mode)

;; Load publishing styles
(require 'muse-html)
(require 'muse-latex)
(require 'muse-texinfo)
(require 'muse-docbook)
(require 'muse-wiki)
(require 'muse-journal)
EOF

cp muse-init.el %{buildroot}/%{emacs_sitelisp}/site-start.d/

# Xemacs files
%if %{xemacs}
make clean
make lisp EMACS=xemacs SITEFLAG=-no-site-file 
make install-bin ELISPDIR=%{buildroot}/%{xemacs_sitelisp}/%{pkg}
mkdir -p %{buildroot}/%{xemacs_sitelisp}/site-start.d
cp muse-init.el %{buildroot}/%{xemacs_sitelisp}/site-start.d/
%endif 

# Remove info dir creating by make install
rm -f %{buildroot}/usr/share/info/dir

%clean
rm -rf %{buildroot}

%post
/sbin/install-info %{_infodir}/muse.info %{_infodir}/dir 2>/dev/null || :

%preun
if [ $1 -eq 0 ]; then
  /sbin/install-info --delete %{_infodir}/muse.info %{_infodir}/dir 2>/dev/null || :
fi

%files
%defattr(-,root,root,-)
%doc README NEWS AUTHORS ChangeLog ChangeLog.2004 ChangeLog.main examples muse.html
%doc %{_infodir}/*

%files -n emacs-%{pkg}
%defattr(-,root,root,-)
%{emacs_sitelisp}/%{pkg}/*.elc
%dir %{emacs_sitelisp}/%{pkg}
%{emacs_sitelisp}/site-start.d/muse-init.el

%files -n emacs-%{pkg}-el
%defattr(-,root,root,-)
%{emacs_sitelisp}/%{pkg}/*.el

%if %{xemacs}
%files -n xemacs-%{pkg}
%defattr(-,root,root,-)
%{xemacs_sitelisp}/%{pkg}/*.elc
%dir %{xemacs_sitelisp}/%{pkg}
%{xemacs_sitelisp}/site-start.d/muse-init.el

%files -n xemacs-%{pkg}-el
%defattr(-,root,root,-)
%{xemacs_sitelisp}/%{pkg}/*.el
%endif

%changelog
* Sun Apr 23 2006 RPM building account <jonathan.underwood at gmail.com> - 3.02.6b-4
- Update to version 3.02.6b

* Sun Mar  5 2006 Jonathan Underwood <jonathan.underwood at gmail.com> - 3.02.6a-3
- Added BuildRequires: texinfo
- Remove info dir from buildroot (created by make install)

* Fri Feb 10 2006 Jonathan Underwood <jonathan.underwood at gmail.com> - 3.02.6a-1
- Initial package build



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/muse/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2006 17:12:38 -0000	1.1
+++ .cvsignore	23 Apr 2006 17:13:11 -0000	1.2
@@ -0,0 +1 @@
+muse-3.02.6b.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/muse/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2006 17:12:38 -0000	1.1
+++ sources	23 Apr 2006 17:13:11 -0000	1.2
@@ -0,0 +1 @@
+98fd1e6f5e6211f375561705854d4809  muse-3.02.6b.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 23 17:12:39 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun, 23 Apr 2006 10:12:39 -0700
Subject: rpms/dejavu-fonts import.log,1.46,1.47
Message-ID: <200604231713.k3NHDB2K005812@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5709

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.5.0-1.fc5 on branch FC-5 from dejavu-fonts-2.5.0-1.fc5.src.rpm
2.5.0


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- import.log	23 Apr 2006 17:11:24 -0000	1.46
+++ import.log	23 Apr 2006 17:12:38 -0000	1.47
@@ -43,3 +43,4 @@
 dejavu-fonts-2_4_1-1_fc4:FC-4:dejavu-fonts-2.4.1-1.fc4.src.rpm:1143660926
 dejavu-fonts-2_4_1-2_fc6:HEAD:dejavu-fonts-2.4.1-2.fc6.src.rpm:1143740939
 dejavu-fonts-2_5_0-1_fc6:HEAD:dejavu-fonts-2.5.0-1.fc6.src.rpm:1145812262
+dejavu-fonts-2_5_0-1_fc5:FC-5:dejavu-fonts-2.5.0-1.fc5.src.rpm:1145812342



From fedora-extras-commits at redhat.com  Sun Apr 23 17:16:05 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun, 23 Apr 2006 10:16:05 -0700
Subject: rpms/dejavu-fonts import.log,1.47,1.48
Message-ID: <200604231716.k3NHGbrD005976@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5942

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.5.0-1.fc4 on branch FC-4 from dejavu-fonts-2.5.0-1.fc4.src.rpm
2.5.0


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- import.log	23 Apr 2006 17:12:38 -0000	1.47
+++ import.log	23 Apr 2006 17:16:05 -0000	1.48
@@ -44,3 +44,4 @@
 dejavu-fonts-2_4_1-2_fc6:HEAD:dejavu-fonts-2.4.1-2.fc6.src.rpm:1143740939
 dejavu-fonts-2_5_0-1_fc6:HEAD:dejavu-fonts-2.5.0-1.fc6.src.rpm:1145812262
 dejavu-fonts-2_5_0-1_fc5:FC-5:dejavu-fonts-2.5.0-1.fc5.src.rpm:1145812342
+dejavu-fonts-2_5_0-1_fc4:FC-4:dejavu-fonts-2.5.0-1.fc4.src.rpm:1145812549



From fedora-extras-commits at redhat.com  Sun Apr 23 17:16:06 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun, 23 Apr 2006 10:16:06 -0700
Subject: rpms/dejavu-fonts/FC-4 .cvsignore, 1.12, 1.13 dejavu-fonts.spec,
	1.13, 1.14 sources, 1.12, 1.13
Message-ID: <200604231716.k3NHGccA005981@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5942/FC-4

Modified Files:
	.cvsignore dejavu-fonts.spec sources 
Log Message:
auto-import dejavu-fonts-2.5.0-1.fc4 on branch FC-4 from dejavu-fonts-2.5.0-1.fc4.src.rpm
2.5.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	29 Mar 2006 19:35:42 -0000	1.12
+++ .cvsignore	23 Apr 2006 17:16:06 -0000	1.13
@@ -1 +1 @@
-dejavu-sfd-2.4.1.tar.gz
+dejavu-sfd-2.5.tar.gz


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/dejavu-fonts.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- dejavu-fonts.spec	29 Mar 2006 19:35:42 -0000	1.13
+++ dejavu-fonts.spec	23 Apr 2006 17:16:06 -0000	1.14
@@ -1,6 +1,6 @@
 %define archivename     dejavu-sfd
 # This macro has the same value as %{version}, except when testing pre-release snapshots
-%define archiveversion  %{version}
+%define archiveversion  2.5
 %define fontdir         %{_datadir}/fonts/%{name}
 
 # Let the perl Maintainer worry about Unicode.org data files (updates, licensing)
@@ -8,7 +8,7 @@
 %define UnicodeData    %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt
 
 Name:      dejavu-fonts
-Version:   2.4.1
+Version:   2.5.0
 Release:   1%{?dist}
 Summary:   DejaVu fonts
 Group:     User Interface/X
@@ -45,7 +45,7 @@
 
 
 %prep
-%setup -q -n %{archivename}-%{version}
+%setup -q -n %{archivename}-%{archiveversion}
 
 
 %build
@@ -127,10 +127,13 @@
 
 
 %changelog
-* Wed Mar 29 2006  Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.4.1-1
+* Sun Apr 23 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.5.0-1
+- 2.5.0
+
+* Wed Mar 29 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.4.1-1
 - 2.4.1 (workaround pango problems)
 
-* Wed Mar 22 2006  Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.4-1
+* Wed Mar 22 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.4-1
 - 2.4 A big thanks to Stepan Roh for getting the project there
 - split out experimental typefaces
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	29 Mar 2006 19:35:42 -0000	1.12
+++ sources	23 Apr 2006 17:16:06 -0000	1.13
@@ -1 +1 @@
-ea7ee1cd16880a8ce5b3e70d97c41fc8  dejavu-sfd-2.4.1.tar.gz
+402d2f846caa83c8067e281b3c5fa8c0  dejavu-sfd-2.5.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 23 17:20:28 2006
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu))
Date: Sun, 23 Apr 2006 10:20:28 -0700
Subject: owners owners.list,1.878,1.879
Message-ID: <200604231720.k3NHKUuA006033@cvs-int.fedora.redhat.com>

Author: jgu

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6016/owners

Modified Files:
	owners.list 
Log Message:
Added entry for emacs-muse package.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.878
retrieving revision 1.879
diff -u -r1.878 -r1.879
--- owners.list	23 Apr 2006 13:53:34 -0000	1.878
+++ owners.list	23 Apr 2006 17:20:28 -0000	1.879
@@ -224,6 +224,7 @@
 Fedora Extras|eet|A library designed to write an arbitary set of chunks of data to a file|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|elmo|Terminal-based mail client|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|emacs-auctex|Enhanced TeX modes for Emacsen|ed at eh3.com|extras-qa at fedoraproject.org|
+Fedora Extras|emacs-muse|Emacs Muse is an authoring and publishing environment for Emacsen|jonathan.underwood at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|embryo|A C like scripting language|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|emelfm2|A file manager that implements the popular two-pane design|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|enca|Character set analyzer and detector|dmitry at butskoy.name|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Apr 23 17:59:48 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun, 23 Apr 2006 10:59:48 -0700
Subject: rpms/ltsp-utils/devel ltsp-utils.spec,1.1,1.2
Message-ID: <200604231759.k3NHxoO1006354@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/ltsp-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6337

Modified Files:
	ltsp-utils.spec 
Log Message:
* Sun Apr 23 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.25-3
- added %dist  macro to Release



Index: ltsp-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/ltsp-utils/devel/ltsp-utils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ltsp-utils.spec	23 Apr 2006 13:17:25 -0000	1.1
+++ ltsp-utils.spec	23 Apr 2006 17:59:48 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:   Linux Terminal Server Project (ltsp.org) utilities
 Name:      ltsp-utils
 Version:   0.25
-Release:   2
+Release:   3%{?dist}
 License:   GPL
 URL:       http://www.ltsp.org
 Group:     Applications/System
@@ -44,6 +44,8 @@
 %{_sbindir}/ltspcfg
 
 %changelog
+* Sun Apr 23 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.25-3
+- added %dist  macro to Release
 * Sun Apr 23 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.25-2
 - applied patch pertusus at free.fr
 * Sat Apr 22 2006 <fedora at soeterbroek.com> - 0.25-1



From fedora-extras-commits at redhat.com  Sun Apr 23 18:02:43 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun, 23 Apr 2006 11:02:43 -0700
Subject: rpms/ltsp-utils/FC-4 ltsp-utils.spec,1.1,1.2
Message-ID: <200604231803.k3NI3GME008513@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/ltsp-utils/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8457/FC-4

Modified Files:
	ltsp-utils.spec 
Log Message:
* Sun Apr 23 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.25-3
- added %dist  macro to Release



Index: ltsp-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/ltsp-utils/FC-4/ltsp-utils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ltsp-utils.spec	23 Apr 2006 13:17:25 -0000	1.1
+++ ltsp-utils.spec	23 Apr 2006 18:02:43 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:   Linux Terminal Server Project (ltsp.org) utilities
 Name:      ltsp-utils
 Version:   0.25
-Release:   2
+Release:   3%{?dist}
 License:   GPL
 URL:       http://www.ltsp.org
 Group:     Applications/System
@@ -44,6 +44,8 @@
 %{_sbindir}/ltspcfg
 
 %changelog
+* Sun Apr 23 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.25-3
+- added %dist  macro to Release
 * Sun Apr 23 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.25-2
 - applied patch pertusus at free.fr
 * Sat Apr 22 2006 <fedora at soeterbroek.com> - 0.25-1



From fedora-extras-commits at redhat.com  Sun Apr 23 18:02:50 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun, 23 Apr 2006 11:02:50 -0700
Subject: rpms/ltsp-utils/FC-5 ltsp-utils.spec,1.1,1.2
Message-ID: <200604231803.k3NI3MUA008526@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/ltsp-utils/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8457/FC-5

Modified Files:
	ltsp-utils.spec 
Log Message:
* Sun Apr 23 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.25-3
- added %dist  macro to Release



Index: ltsp-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/ltsp-utils/FC-5/ltsp-utils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ltsp-utils.spec	23 Apr 2006 13:17:25 -0000	1.1
+++ ltsp-utils.spec	23 Apr 2006 18:02:50 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:   Linux Terminal Server Project (ltsp.org) utilities
 Name:      ltsp-utils
 Version:   0.25
-Release:   2
+Release:   3%{?dist}
 License:   GPL
 URL:       http://www.ltsp.org
 Group:     Applications/System
@@ -44,6 +44,8 @@
 %{_sbindir}/ltspcfg
 
 %changelog
+* Sun Apr 23 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.25-3
+- added %dist  macro to Release
 * Sun Apr 23 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.25-2
 - applied patch pertusus at free.fr
 * Sat Apr 22 2006 <fedora at soeterbroek.com> - 0.25-1



From fedora-extras-commits at redhat.com  Sun Apr 23 18:05:29 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 23 Apr 2006 11:05:29 -0700
Subject: rpms/xemacs/devel xemacs.desktop,1.2,1.3 xemacs.spec,1.23,1.24
Message-ID: <200604231805.k3NI5Vew008647@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8628

Modified Files:
	xemacs.desktop xemacs.spec 
Log Message:
* Sun Apr 23 2006 Ville Skytt?? <ville.skytta at iki.fi> - 21.5.26-4
- Bring StartupWMClass in desktop entry up to date.
- Fix non-MULE build.



Index: xemacs.desktop
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/xemacs.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xemacs.desktop	29 Jun 2005 21:35:00 -0000	1.2
+++ xemacs.desktop	23 Apr 2006 18:05:29 -0000	1.3
@@ -31,4 +31,4 @@
 Terminal=false
 Categories=Application;Development;TextEditor;
 Encoding=UTF-8
-StartupWMClass=Emacs
+StartupWMClass=XEmacs


Index: xemacs.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xemacs.spec	15 Apr 2006 16:58:44 -0000	1.23
+++ xemacs.spec	23 Apr 2006 18:05:29 -0000	1.24
@@ -20,7 +20,7 @@
 
 Name:           xemacs
 Version:        21.5.26
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -431,8 +431,10 @@
 %{_bindir}/xemacs-%{xver}
 %{_libdir}/xemacs-%{xver}/doc/
 %if %{with modules}
+%if %{with mule}
 %{_libdir}/xemacs-%{xver}/*linux/modules/canna_api.ell
 %endif
+%endif
 %{_datadir}/applications/*-%{name}.desktop
 %{_datadir}/icons/hicolor/48x48/apps/xemacs.png
 %{_mandir}/man1/gnuclient.1*
@@ -489,6 +491,10 @@
 
 
 %changelog
+* Sun Apr 23 2006 Ville Skytt?? <ville.skytta at iki.fi> - 21.5.26-4
+- Bring StartupWMClass in desktop entry up to date.
+- Fix non-MULE build.
+
 * Sat Apr 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 21.5.26-3
 - Don't expect to find ellcc if building without modules (#188929).
 - New --with/--without rpmbuild flags:



From fedora-extras-commits at redhat.com  Sun Apr 23 18:18:44 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun, 23 Apr 2006 11:18:44 -0700
Subject: rpms/dejavu-fonts import.log,1.48,1.49
Message-ID: <200604231818.k3NIIkI9008814@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8783

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.5.0-2.fc5 on branch FC-5 from dejavu-fonts-2.5.0-2.fc5.src.rpm
2.5.0


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- import.log	23 Apr 2006 17:16:05 -0000	1.48
+++ import.log	23 Apr 2006 18:18:43 -0000	1.49
@@ -45,3 +45,4 @@
 dejavu-fonts-2_5_0-1_fc6:HEAD:dejavu-fonts-2.5.0-1.fc6.src.rpm:1145812262
 dejavu-fonts-2_5_0-1_fc5:FC-5:dejavu-fonts-2.5.0-1.fc5.src.rpm:1145812342
 dejavu-fonts-2_5_0-1_fc4:FC-4:dejavu-fonts-2.5.0-1.fc4.src.rpm:1145812549
+dejavu-fonts-2_5_0-2_fc5:FC-5:dejavu-fonts-2.5.0-2.fc5.src.rpm:1145816306



From fedora-extras-commits at redhat.com  Sun Apr 23 18:18:44 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun, 23 Apr 2006 11:18:44 -0700
Subject: rpms/dejavu-fonts/FC-5 dejavu-fonts.spec,1.19,1.20
Message-ID: <200604231818.k3NIIkFY008818@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-serv8783/FC-5

Modified Files:
	dejavu-fonts.spec 
Log Message:
auto-import dejavu-fonts-2.5.0-2.fc5 on branch FC-5 from dejavu-fonts-2.5.0-2.fc5.src.rpm
2.5.0


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/dejavu-fonts.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- dejavu-fonts.spec	23 Apr 2006 17:12:44 -0000	1.19
+++ dejavu-fonts.spec	23 Apr 2006 18:18:44 -0000	1.20
@@ -10,7 +10,7 @@
 
 Name:      dejavu-fonts
 Version:   2.5.0
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   DejaVu fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions



From fedora-extras-commits at redhat.com  Sun Apr 23 18:39:34 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun, 23 Apr 2006 11:39:34 -0700
Subject: rpms/perl-Net-Server import.log,1.8,1.9
Message-ID: <200604231839.k3NIdaHS009036@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Net-Server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9003

Modified Files:
	import.log 
Log Message:
auto-import perl-Net-Server-0.93-1.fc6 on branch devel from perl-Net-Server-0.93-1.fc6.src.rpm
0.93


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	13 Feb 2006 21:41:37 -0000	1.8
+++ import.log	23 Apr 2006 18:39:34 -0000	1.9
@@ -5,3 +5,4 @@
 perl-Net-Server-0_90-1_fc4:FC-4:perl-Net-Server-0.90-1.fc4.src.rpm:1136724876
 perl-Net-Server-0_90-1_fc3:FC-3:perl-Net-Server-0.90-1.fc3.src.rpm:1136724984
 perl-Net-Server-0_90-2_fc5:HEAD:perl-Net-Server-0.90-2.fc5.src.rpm:1139866865
+perl-Net-Server-0_93-1_fc6:HEAD:perl-Net-Server-0.93-1.fc6.src.rpm:1145817558



From fedora-extras-commits at redhat.com  Sun Apr 23 18:39:35 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun, 23 Apr 2006 11:39:35 -0700
Subject: rpms/perl-Net-Server/devel .cvsignore, 1.4, 1.5 perl-Net-Server.spec,
	1.11, 1.12 sources, 1.4, 1.5
Message-ID: <200604231839.k3NIdbei009042@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Net-Server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9003/devel

Modified Files:
	.cvsignore perl-Net-Server.spec sources 
Log Message:
auto-import perl-Net-Server-0.93-1.fc6 on branch devel from perl-Net-Server-0.93-1.fc6.src.rpm
0.93


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Jan 2006 12:52:38 -0000	1.4
+++ .cvsignore	23 Apr 2006 18:39:34 -0000	1.5
@@ -1 +1 @@
-Net-Server-0.90.tar.gz
+Net-Server-0.93.tar.gz


Index: perl-Net-Server.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/devel/perl-Net-Server.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-Net-Server.spec	13 Feb 2006 21:41:43 -0000	1.11
+++ perl-Net-Server.spec	23 Apr 2006 18:39:34 -0000	1.12
@@ -1,8 +1,8 @@
 %define rname Net-Server
 
 Name:    perl-%{rname}
-Version: 0.90
-Release: 2%{?dist}
+Version: 0.93
+Release: 1%{?dist}
 Summary: Extensible, general Perl server engine
 
 Group:     Development/Libraries
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Sun Apr 23 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 0.93-1
+- 0.93
+
 * Mon Feb 13 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 0.90-2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Jan 2006 12:52:38 -0000	1.4
+++ sources	23 Apr 2006 18:39:34 -0000	1.5
@@ -1 +1 @@
-6874fc7b37ee2969aba03f1ccebbe6a3  Net-Server-0.90.tar.gz
+52f10776f695ea2ea94f656aa900dd0e  Net-Server-0.93.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 23 18:40:03 2006
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Sun, 23 Apr 2006 11:40:03 -0700
Subject: extras-buildsys/utils extras-sign-move.py,1.11,1.12
Message-ID: <200604231840.k3NIe3Xv009102@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9077

Modified Files:
	extras-sign-move.py 
Log Message:

if the file already exists, unlink it - this lets us sneak out silent
changes



Index: extras-sign-move.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/extras-sign-move.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- extras-sign-move.py	23 Apr 2006 13:44:36 -0000	1.11
+++ extras-sign-move.py	23 Apr 2006 18:40:01 -0000	1.12
@@ -243,6 +243,8 @@
                 rpmloc = os.path.join(destdir, arch, pkg_fn)
                 debugprint("Copying %s to %s" % (package, rpmloc))
                 if not DEBUG:                
+                    if os.path.exists(rpmloc):
+                        os.unlink(rpmloc)
                     shutil.copy2(package, rpmloc)
             
             if not DEBUG:



From fedora-extras-commits at redhat.com  Sun Apr 23 18:40:43 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun, 23 Apr 2006 11:40:43 -0700
Subject: rpms/perl-Net-Server import.log,1.9,1.10
Message-ID: <200604231840.k3NIejgt009165@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Net-Server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9132

Modified Files:
	import.log 
Log Message:
auto-import perl-Net-Server-0.93-1.fc5 on branch FC-5 from perl-Net-Server-0.93-1.fc5.src.rpm
0.93


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- import.log	23 Apr 2006 18:39:34 -0000	1.9
+++ import.log	23 Apr 2006 18:40:43 -0000	1.10
@@ -6,3 +6,4 @@
 perl-Net-Server-0_90-1_fc3:FC-3:perl-Net-Server-0.90-1.fc3.src.rpm:1136724984
 perl-Net-Server-0_90-2_fc5:HEAD:perl-Net-Server-0.90-2.fc5.src.rpm:1139866865
 perl-Net-Server-0_93-1_fc6:HEAD:perl-Net-Server-0.93-1.fc6.src.rpm:1145817558
+perl-Net-Server-0_93-1_fc5:FC-5:perl-Net-Server-0.93-1.fc5.src.rpm:1145817628



From fedora-extras-commits at redhat.com  Sun Apr 23 18:40:44 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun, 23 Apr 2006 11:40:44 -0700
Subject: rpms/perl-Net-Server/FC-5 .cvsignore, 1.4, 1.5 perl-Net-Server.spec,
	1.11, 1.12 sources, 1.4, 1.5
Message-ID: <200604231840.k3NIekuI009171@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Net-Server/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9132/FC-5

Modified Files:
	.cvsignore perl-Net-Server.spec sources 
Log Message:
auto-import perl-Net-Server-0.93-1.fc5 on branch FC-5 from perl-Net-Server-0.93-1.fc5.src.rpm
0.93


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Jan 2006 12:52:38 -0000	1.4
+++ .cvsignore	23 Apr 2006 18:40:44 -0000	1.5
@@ -1 +1 @@
-Net-Server-0.90.tar.gz
+Net-Server-0.93.tar.gz


Index: perl-Net-Server.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/FC-5/perl-Net-Server.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-Net-Server.spec	13 Feb 2006 21:41:43 -0000	1.11
+++ perl-Net-Server.spec	23 Apr 2006 18:40:44 -0000	1.12
@@ -1,8 +1,8 @@
 %define rname Net-Server
 
 Name:    perl-%{rname}
-Version: 0.90
-Release: 2%{?dist}
+Version: 0.93
+Release: 1%{?dist}
 Summary: Extensible, general Perl server engine
 
 Group:     Development/Libraries
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Sun Apr 23 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 0.93-1
+- 0.93
+
 * Mon Feb 13 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 0.90-2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Jan 2006 12:52:38 -0000	1.4
+++ sources	23 Apr 2006 18:40:44 -0000	1.5
@@ -1 +1 @@
-6874fc7b37ee2969aba03f1ccebbe6a3  Net-Server-0.90.tar.gz
+52f10776f695ea2ea94f656aa900dd0e  Net-Server-0.93.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 23 18:40:59 2006
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Sun, 23 Apr 2006 11:40:59 -0700
Subject: extras-buildsys/utils extras-sign-move.py,1.12,1.13
Message-ID: <200604231840.k3NIexBA009230@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9184

Modified Files:
	extras-sign-move.py 
Log Message:

same for debuginfo



Index: extras-sign-move.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/extras-sign-move.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- extras-sign-move.py	23 Apr 2006 18:40:01 -0000	1.12
+++ extras-sign-move.py	23 Apr 2006 18:40:57 -0000	1.13
@@ -234,6 +234,8 @@
                 rpmloc = os.path.join(destdir, arch, pkg_fn)
                 debugprint("Copying %s to %s" % (package, rpmloc))
                 if not DEBUG:
+                    if os.path.exists(rpmloc):
+                        os.unlink(rpmloc)
                     shutil.copy2(package, rpmloc)
 
         if a == 'noarch':



From fedora-extras-commits at redhat.com  Sun Apr 23 18:41:52 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun, 23 Apr 2006 11:41:52 -0700
Subject: rpms/perl-Net-Server import.log,1.10,1.11
Message-ID: <200604231841.k3NIfspM009308@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Net-Server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9275

Modified Files:
	import.log 
Log Message:
auto-import perl-Net-Server-0.93-1.fc4 on branch FC-4 from perl-Net-Server-0.93-1.fc4.src.rpm
0.93


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/import.log,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- import.log	23 Apr 2006 18:40:43 -0000	1.10
+++ import.log	23 Apr 2006 18:41:52 -0000	1.11
@@ -7,3 +7,4 @@
 perl-Net-Server-0_90-2_fc5:HEAD:perl-Net-Server-0.90-2.fc5.src.rpm:1139866865
 perl-Net-Server-0_93-1_fc6:HEAD:perl-Net-Server-0.93-1.fc6.src.rpm:1145817558
 perl-Net-Server-0_93-1_fc5:FC-5:perl-Net-Server-0.93-1.fc5.src.rpm:1145817628
+perl-Net-Server-0_93-1_fc4:FC-4:perl-Net-Server-0.93-1.fc4.src.rpm:1145817696



From fedora-extras-commits at redhat.com  Sun Apr 23 18:41:53 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun, 23 Apr 2006 11:41:53 -0700
Subject: rpms/perl-Net-Server/FC-4 .cvsignore, 1.4, 1.5 perl-Net-Server.spec,
	1.10, 1.11 sources, 1.4, 1.5
Message-ID: <200604231841.k3NIftY4009314@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Net-Server/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9275/FC-4

Modified Files:
	.cvsignore perl-Net-Server.spec sources 
Log Message:
auto-import perl-Net-Server-0.93-1.fc4 on branch FC-4 from perl-Net-Server-0.93-1.fc4.src.rpm
0.93


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Jan 2006 12:54:53 -0000	1.4
+++ .cvsignore	23 Apr 2006 18:41:52 -0000	1.5
@@ -1 +1 @@
-Net-Server-0.90.tar.gz
+Net-Server-0.93.tar.gz


Index: perl-Net-Server.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/FC-4/perl-Net-Server.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Net-Server.spec	8 Jan 2006 12:54:53 -0000	1.10
+++ perl-Net-Server.spec	23 Apr 2006 18:41:52 -0000	1.11
@@ -1,7 +1,7 @@
 %define rname Net-Server
 
 Name:    perl-%{rname}
-Version: 0.90
+Version: 0.93
 Release: 1%{?dist}
 Summary: Extensible, general Perl server engine
 
@@ -61,6 +61,12 @@
 
 
 %changelog
+* Sun Apr 23 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 0.93-1
+- 0.93
+
+* Mon Feb 13 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 0.90-2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sun Jan 8 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 0.90-1
 - Updated to 0.90
 - add IO::Multiplex dep


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Jan 2006 12:54:53 -0000	1.4
+++ sources	23 Apr 2006 18:41:52 -0000	1.5
@@ -1 +1 @@
-6874fc7b37ee2969aba03f1ccebbe6a3  Net-Server-0.90.tar.gz
+52f10776f695ea2ea94f656aa900dd0e  Net-Server-0.93.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 23 19:03:34 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 23 Apr 2006 12:03:34 -0700
Subject: rpms/poker-eval/FC-4 poker-eval.spec,1.5,1.6
Message-ID: <200604231903.k3NJ3aGL011624@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/poker-eval/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11579/poker-eval/FC-4

Modified Files:
	poker-eval.spec 
Log Message:
bump release for rebuild


Index: poker-eval.spec
===================================================================
RCS file: /cvs/extras/rpms/poker-eval/FC-4/poker-eval.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- poker-eval.spec	23 Apr 2006 09:18:25 -0000	1.5
+++ poker-eval.spec	23 Apr 2006 19:03:34 -0000	1.6
@@ -1,10 +1,10 @@
 Name:           poker-eval
 Version:	130.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Poker hand evaluator library
 Group:          Development/Libraries
 License:        GPL
-URL:            https://gna.org/projects/pokersource/
+URL:            http://pokersource.org/poker-eval.php
 Source0:        http://download.gna.org/pokersource/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -27,8 +27,8 @@
 # rpmlint fix
 chmod -x examples/five_card_hands.c
 
-#  use examples/ directory for devel package %doc section
-mkdir -p tmp/examples/ && cp examples/*.c tmp/examples
+# use examples/ directory for devel package %doc section
+mkdir -p tmp/examples && cp examples/*.c tmp/examples
 rm -f tmp/examples/getopt_w32.c
 
 %build
@@ -62,6 +62,11 @@
 %exclude %{_libdir}/*.la
 
 %changelog
+* Sun Apr 23 2006 Christopher Stone <chris.stone at gmail.com> 130.0-4
+- Update URL tag to new home page
+- Minor spec file cleanups
+- Bump release number for rebuild on devel
+
 * Sat Apr 22 2006 Christopher Stone <chris.stone at gmail.com> 130.0-3
 - Copy .c files in tmp/examples directory and use this for devel's %%doc
 



From fedora-extras-commits at redhat.com  Sun Apr 23 19:03:34 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 23 Apr 2006 12:03:34 -0700
Subject: rpms/poker-eval/FC-5 poker-eval.spec,1.5,1.6
Message-ID: <200604231903.k3NJ3aL4011628@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-serv11579/poker-eval/FC-5

Modified Files:
	poker-eval.spec 
Log Message:
bump release for rebuild


Index: poker-eval.spec
===================================================================
RCS file: /cvs/extras/rpms/poker-eval/FC-5/poker-eval.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- poker-eval.spec	23 Apr 2006 09:18:25 -0000	1.5
+++ poker-eval.spec	23 Apr 2006 19:03:34 -0000	1.6
@@ -1,10 +1,10 @@
 Name:           poker-eval
 Version:	130.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Poker hand evaluator library
 Group:          Development/Libraries
 License:        GPL
-URL:            https://gna.org/projects/pokersource/
+URL:            http://pokersource.org/poker-eval.php
 Source0:        http://download.gna.org/pokersource/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -27,8 +27,8 @@
 # rpmlint fix
 chmod -x examples/five_card_hands.c
 
-#  use examples/ directory for devel package %doc section
-mkdir -p tmp/examples/ && cp examples/*.c tmp/examples
+# use examples/ directory for devel package %doc section
+mkdir -p tmp/examples && cp examples/*.c tmp/examples
 rm -f tmp/examples/getopt_w32.c
 
 %build
@@ -62,6 +62,11 @@
 %exclude %{_libdir}/*.la
 
 %changelog
+* Sun Apr 23 2006 Christopher Stone <chris.stone at gmail.com> 130.0-4
+- Update URL tag to new home page
+- Minor spec file cleanups
+- Bump release number for rebuild on devel
+
 * Sat Apr 22 2006 Christopher Stone <chris.stone at gmail.com> 130.0-3
 - Copy .c files in tmp/examples directory and use this for devel's %%doc
 



From fedora-extras-commits at redhat.com  Sun Apr 23 19:03:35 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 23 Apr 2006 12:03:35 -0700
Subject: rpms/poker-eval/devel poker-eval.spec,1.5,1.6
Message-ID: <200604231903.k3NJ3bwa011632@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/poker-eval/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11579/poker-eval/devel

Modified Files:
	poker-eval.spec 
Log Message:
bump release for rebuild


Index: poker-eval.spec
===================================================================
RCS file: /cvs/extras/rpms/poker-eval/devel/poker-eval.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- poker-eval.spec	23 Apr 2006 09:18:25 -0000	1.5
+++ poker-eval.spec	23 Apr 2006 19:03:35 -0000	1.6
@@ -1,10 +1,10 @@
 Name:           poker-eval
 Version:	130.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Poker hand evaluator library
 Group:          Development/Libraries
 License:        GPL
-URL:            https://gna.org/projects/pokersource/
+URL:            http://pokersource.org/poker-eval.php
 Source0:        http://download.gna.org/pokersource/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -27,8 +27,8 @@
 # rpmlint fix
 chmod -x examples/five_card_hands.c
 
-#  use examples/ directory for devel package %doc section
-mkdir -p tmp/examples/ && cp examples/*.c tmp/examples
+# use examples/ directory for devel package %doc section
+mkdir -p tmp/examples && cp examples/*.c tmp/examples
 rm -f tmp/examples/getopt_w32.c
 
 %build
@@ -62,6 +62,11 @@
 %exclude %{_libdir}/*.la
 
 %changelog
+* Sun Apr 23 2006 Christopher Stone <chris.stone at gmail.com> 130.0-4
+- Update URL tag to new home page
+- Minor spec file cleanups
+- Bump release number for rebuild on devel
+
 * Sat Apr 22 2006 Christopher Stone <chris.stone at gmail.com> 130.0-3
 - Copy .c files in tmp/examples directory and use this for devel's %%doc
 



From fedora-extras-commits at redhat.com  Sun Apr 23 19:17:23 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Sun, 23 Apr 2006 12:17:23 -0700
Subject: rpms/perl-Curses - New directory
Message-ID: <200604231917.k3NJHPxC011867@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/perl-Curses
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11846/perl-Curses

Log Message:
Directory /cvs/extras/rpms/perl-Curses added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 23 19:17:24 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Sun, 23 Apr 2006 12:17:24 -0700
Subject: rpms/perl-Curses/devel - New directory
Message-ID: <200604231917.k3NJHQPL011870@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/perl-Curses/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11846/perl-Curses/devel

Log Message:
Directory /cvs/extras/rpms/perl-Curses/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 23 19:17:35 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Sun, 23 Apr 2006 12:17:35 -0700
Subject: rpms/perl-Curses Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604231917.k3NJHbq5011919@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/perl-Curses
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11891

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Curses


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Curses
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 23 19:17:36 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Sun, 23 Apr 2006 12:17:36 -0700
Subject: rpms/perl-Curses/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604231917.k3NJHcH6011922@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/perl-Curses/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11891/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Curses


--- 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 Apr 23 19:17:55 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Sun, 23 Apr 2006 12:17:55 -0700
Subject: rpms/perl-Curses import.log,1.1,1.2
Message-ID: <200604231917.k3NJHvVa011988@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/perl-Curses
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11955

Modified Files:
	import.log 
Log Message:
auto-import perl-Curses-1.13-3 on branch devel from perl-Curses-1.13-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Curses/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	23 Apr 2006 19:17:35 -0000	1.1
+++ import.log	23 Apr 2006 19:17:55 -0000	1.2
@@ -0,0 +1 @@
+perl-Curses-1_13-3:HEAD:perl-Curses-1.13-3.src.rpm:1145819760



From fedora-extras-commits at redhat.com  Sun Apr 23 19:17:55 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Sun, 23 Apr 2006 12:17:55 -0700
Subject: rpms/perl-Curses/devel perl-Curses.spec, NONE, 1.1 .cvsignore, 1.1, 
	1.2 sources, 1.1, 1.2
Message-ID: <200604231918.k3NJHvgQ011993@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/perl-Curses/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11955/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Curses.spec 
Log Message:
auto-import perl-Curses-1.13-3 on branch devel from perl-Curses-1.13-3.src.rpm


--- NEW FILE perl-Curses.spec ---
Name:           perl-Curses
Version:        1.13
Release:        3%{?dist}
Summary:        Perl bindings for ncurses

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Curses/
Source0:        http://search.cpan.org/CPAN/authors/id/G/GI/GIRAFFED/Curses-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ncurses-devel
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Perl bindings for ncurses, bringing terminal-independent character
handling capabilities to Perl.


%prep
%setup -q -n Curses-%{version}
sed -i -e 's|/usr/local/bin/perl|%{__perl}|' demo*


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" \
   PANELS MENUS FORMS
make %{?_smp_mflags}

# A note about the following alarming output...
#
#  WARNING: Your Curses form.h file appears to be in the default
#  system search path, which will not work for us because of
#  the conflicting Perl form.h file.  This means your 'make' will
#  probably fail unless you fix this, as described in the INSTALL
#  file.
#
#... can be ignored because /usr/include/form.h is a symlink to
#/usr/include/ncurses/form.h, which the Makefile.PL finds and
#uses quite happily.


%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/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Copying Artistic README demo*
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/Curses.pm
%{_mandir}/man3/*.3*


%changelog
* Fri Apr 21 2006 Garrick Staples <garrick at usc.edu> 1.13-3
- add a note about the falsely alarming warning
- don't remove execute bit from demos

* Thu Apr 20 2006 Garrick Staples <garrick at usc.edu> 1.13-2
- spec cleanups
- add doc files

* Wed Apr 19 2006 Garrick Staples <garrick at usc.edu> 1.13-1
- Initial spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Curses/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2006 19:17:36 -0000	1.1
+++ .cvsignore	23 Apr 2006 19:17:55 -0000	1.2
@@ -0,0 +1 @@
+Curses-1.13.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Curses/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2006 19:17:36 -0000	1.1
+++ sources	23 Apr 2006 19:17:55 -0000	1.2
@@ -0,0 +1 @@
+33f6a17f9ece7efda2dde3431e1540f6  Curses-1.13.tgz



From fedora-extras-commits at redhat.com  Sun Apr 23 19:21:05 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Sun, 23 Apr 2006 12:21:05 -0700
Subject: owners owners.list,1.879,1.880
Message-ID: <200604231921.k3NJL7cc012053@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12036

Modified Files:
	owners.list 
Log Message:
Added perl-Curses



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.879
retrieving revision 1.880
diff -u -r1.879 -r1.880
--- owners.list	23 Apr 2006 17:20:28 -0000	1.879
+++ owners.list	23 Apr 2006 19:21:05 -0000	1.880
@@ -924,6 +924,7 @@
 Fedora Extras|perl-Crypt-Random|Cryptographically Secure, True Random Number Generator|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Crypt-RSA|RSA public-key cryptosystem|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Crypt-SmbHash|Pure-perl Lanman and NT MD4 hash functions|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Curses|Perl bindings for ncurses|garrick at usc.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Data-Buffer|Read/write buffer class for perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Data-HexDump|Hexadecial Dumper|andreas at bawue.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Data-Page|Help when paging through sets of results|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Sun Apr 23 19:59:54 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 23 Apr 2006 12:59:54 -0700
Subject: rpms/poker-eval/devel poker-eval.spec,1.6,1.7
Message-ID: <200604231959.k3NJxuaX012307@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/poker-eval/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12260/poker-eval/devel

Modified Files:
	poker-eval.spec 
Log Message:
Update to new permanent URL


Index: poker-eval.spec
===================================================================
RCS file: /cvs/extras/rpms/poker-eval/devel/poker-eval.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- poker-eval.spec	23 Apr 2006 19:03:35 -0000	1.6
+++ poker-eval.spec	23 Apr 2006 19:59:53 -0000	1.7
@@ -1,10 +1,10 @@
 Name:           poker-eval
 Version:	130.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Poker hand evaluator library
 Group:          Development/Libraries
 License:        GPL
-URL:            http://pokersource.org/poker-eval.php
+URL:            http://pokersource.org/poker-eval/
 Source0:        http://download.gna.org/pokersource/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -62,6 +62,9 @@
 %exclude %{_libdir}/*.la
 
 %changelog
+* Sun Apr 23 2006 Christopher Stone <chris.stone at gmail.com> 130.0-5
+- Update URL to new permanent URL
+
 * Sun Apr 23 2006 Christopher Stone <chris.stone at gmail.com> 130.0-4
 - Update URL tag to new home page
 - Minor spec file cleanups



From fedora-extras-commits at redhat.com  Sun Apr 23 19:59:47 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 23 Apr 2006 12:59:47 -0700
Subject: rpms/poker-eval/FC-4 poker-eval.spec,1.6,1.7
Message-ID: <200604232000.k3NK0Jtj012321@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/poker-eval/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12260/poker-eval/FC-4

Modified Files:
	poker-eval.spec 
Log Message:
Update to new permanent URL


Index: poker-eval.spec
===================================================================
RCS file: /cvs/extras/rpms/poker-eval/FC-4/poker-eval.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- poker-eval.spec	23 Apr 2006 19:03:34 -0000	1.6
+++ poker-eval.spec	23 Apr 2006 19:59:47 -0000	1.7
@@ -1,10 +1,10 @@
 Name:           poker-eval
 Version:	130.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Poker hand evaluator library
 Group:          Development/Libraries
 License:        GPL
-URL:            http://pokersource.org/poker-eval.php
+URL:            http://pokersource.org/poker-eval/
 Source0:        http://download.gna.org/pokersource/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -62,6 +62,9 @@
 %exclude %{_libdir}/*.la
 
 %changelog
+* Sun Apr 23 2006 Christopher Stone <chris.stone at gmail.com> 130.0-5
+- Update URL to new permanent URL
+
 * Sun Apr 23 2006 Christopher Stone <chris.stone at gmail.com> 130.0-4
 - Update URL tag to new home page
 - Minor spec file cleanups



From fedora-extras-commits at redhat.com  Sun Apr 23 19:59:48 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 23 Apr 2006 12:59:48 -0700
Subject: rpms/poker-eval/FC-5 poker-eval.spec,1.6,1.7
Message-ID: <200604232000.k3NK0KXJ012324@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-serv12260/poker-eval/FC-5

Modified Files:
	poker-eval.spec 
Log Message:
Update to new permanent URL


Index: poker-eval.spec
===================================================================
RCS file: /cvs/extras/rpms/poker-eval/FC-5/poker-eval.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- poker-eval.spec	23 Apr 2006 19:03:34 -0000	1.6
+++ poker-eval.spec	23 Apr 2006 19:59:48 -0000	1.7
@@ -1,10 +1,10 @@
 Name:           poker-eval
 Version:	130.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Poker hand evaluator library
 Group:          Development/Libraries
 License:        GPL
-URL:            http://pokersource.org/poker-eval.php
+URL:            http://pokersource.org/poker-eval/
 Source0:        http://download.gna.org/pokersource/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -62,6 +62,9 @@
 %exclude %{_libdir}/*.la
 
 %changelog
+* Sun Apr 23 2006 Christopher Stone <chris.stone at gmail.com> 130.0-5
+- Update URL to new permanent URL
+
 * Sun Apr 23 2006 Christopher Stone <chris.stone at gmail.com> 130.0-4
 - Update URL tag to new home page
 - Minor spec file cleanups



From fedora-extras-commits at redhat.com  Sun Apr 23 21:20:11 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 23 Apr 2006 14:20:11 -0700
Subject: rpms/hugs98/FC-4 hugs98.spec,1.2,1.3
Message-ID: <200604232120.k3NLKDiH016902@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/hugs98/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16885

Modified Files:
	hugs98.spec 
Log Message:



Index: hugs98.spec
===================================================================
RCS file: /cvs/extras/rpms/hugs98/FC-4/hugs98.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hugs98.spec	22 Apr 2006 01:20:55 -0000	1.2
+++ hugs98.spec	23 Apr 2006 21:20:11 -0000	1.3
@@ -15,14 +15,7 @@
 BuildRequires:	freeglut-devel
 BuildRequires:	libGL-devel
 BuildRequires:	libGLU-devel
-BuildRequires:	libICE-devel
-BuildRequires:	libSM-devel
-BuildRequires:	libX11-devel
-BuildRequires:	libXi-devel
-BuildRequires:	libXmu-devel
-BuildRequires:	libXt-devel
-BuildRequires:	readline-devel
-BuildRequires:	xorg-x11-proto-devel
+BuildRequires:	xorg-x11-devel
 #BuildRequires:	openal-devel
 
 %description



From fedora-extras-commits at redhat.com  Sun Apr 23 21:31:46 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun, 23 Apr 2006 14:31:46 -0700
Subject: rpms/stripesnoop/devel stripesnoop.spec,1.4,1.5
Message-ID: <200604232131.k3NLVn54017029@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/stripesnoop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16967/devel

Modified Files:
	stripesnoop.spec 
Log Message:

Fix broken dependencies



Index: stripesnoop.spec
===================================================================
RCS file: /cvs/extras/rpms/stripesnoop/devel/stripesnoop.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- stripesnoop.spec	5 Aug 2005 19:36:49 -0000	1.4
+++ stripesnoop.spec	23 Apr 2006 21:31:46 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		stripesnoop
 Version:	1.5
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL
 Group:		Applications/System
 Summary:	Magnetic Stripe Reader
@@ -11,6 +11,8 @@
 Patch1:		stripesnoop-1.5-deflinux.patch
 Patch2:		stripesnoop-1.5-asmio.patch
 Patch3:		stripesnoop-1.5-pathing.patch
+Provides:	stripesnoop-devel = %{version}-%{release}
+Obsoletes:	stripesnoop-devel
 
 %description
 Stripe Snoop is a suite of research tools that captures, modifies, validates, 
@@ -53,6 +55,9 @@
 %{_datadir}/%{name}/
 
 %changelog
+* Sun Apr 23 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.5-5
+- provide/obsolete old -devel package to keep the repo clean
+
 * Fri Aug  5 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.5-4
 - only use asm/io.h for ppc
 - get rid of devel package (unnecessary)



From fedora-extras-commits at redhat.com  Sun Apr 23 21:31:40 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun, 23 Apr 2006 14:31:40 -0700
Subject: rpms/stripesnoop/FC-4 stripesnoop.spec,1.4,1.5
Message-ID: <200604232132.k3NLWCYL017035@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/stripesnoop/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16967/FC-4

Modified Files:
	stripesnoop.spec 
Log Message:

Fix broken dependencies



Index: stripesnoop.spec
===================================================================
RCS file: /cvs/extras/rpms/stripesnoop/FC-4/stripesnoop.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- stripesnoop.spec	5 Aug 2005 19:36:44 -0000	1.4
+++ stripesnoop.spec	23 Apr 2006 21:31:40 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		stripesnoop
 Version:	1.5
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL
 Group:		Applications/System
 Summary:	Magnetic Stripe Reader
@@ -11,6 +11,8 @@
 Patch1:		stripesnoop-1.5-deflinux.patch
 Patch2:		stripesnoop-1.5-asmio.patch
 Patch3:		stripesnoop-1.5-pathing.patch
+Provides:	stripesnoop-devel = %{version}-%{release}
+Obsoletes:	stripesnoop-devel
 
 %description
 Stripe Snoop is a suite of research tools that captures, modifies, validates, 
@@ -53,6 +55,9 @@
 %{_datadir}/%{name}/
 
 %changelog
+* Sun Apr 23 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.5-5
+- provide/obsolete old -devel package to keep the repo clean
+
 * Fri Aug  5 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.5-4
 - only use asm/io.h for ppc
 - get rid of devel package (unnecessary)



From fedora-extras-commits at redhat.com  Sun Apr 23 21:31:39 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun, 23 Apr 2006 14:31:39 -0700
Subject: rpms/stripesnoop/FC-3 stripesnoop.spec,1.4,1.5
Message-ID: <200604232132.k3NLWBqh017032@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/stripesnoop/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16967/FC-3

Modified Files:
	stripesnoop.spec 
Log Message:

Fix broken dependencies



Index: stripesnoop.spec
===================================================================
RCS file: /cvs/extras/rpms/stripesnoop/FC-3/stripesnoop.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- stripesnoop.spec	5 Aug 2005 19:36:43 -0000	1.4
+++ stripesnoop.spec	23 Apr 2006 21:31:39 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		stripesnoop
 Version:	1.5
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL
 Group:		Applications/System
 Summary:	Magnetic Stripe Reader
@@ -11,6 +11,8 @@
 Patch1:		stripesnoop-1.5-deflinux.patch
 Patch2:		stripesnoop-1.5-asmio.patch
 Patch3:		stripesnoop-1.5-pathing.patch
+Provides:	stripesnoop-devel = %{version}-%{release}
+Obsoletes:	stripesnoop-devel
 
 %description
 Stripe Snoop is a suite of research tools that captures, modifies, validates, 
@@ -53,6 +55,9 @@
 %{_datadir}/%{name}/
 
 %changelog
+* Sun Apr 23 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.5-5
+- provide/obsolete old -devel package to keep the repo clean
+
 * Fri Aug  5 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.5-4
 - only use asm/io.h for ppc
 - get rid of devel package (unnecessary)



From fedora-extras-commits at redhat.com  Sun Apr 23 21:31:41 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun, 23 Apr 2006 14:31:41 -0700
Subject: rpms/stripesnoop/FC-5 stripesnoop.spec,1.4,1.5
Message-ID: <200604232132.k3NLWD1o017038@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/stripesnoop/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16967/FC-5

Modified Files:
	stripesnoop.spec 
Log Message:

Fix broken dependencies



Index: stripesnoop.spec
===================================================================
RCS file: /cvs/extras/rpms/stripesnoop/FC-5/stripesnoop.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- stripesnoop.spec	5 Aug 2005 19:36:49 -0000	1.4
+++ stripesnoop.spec	23 Apr 2006 21:31:41 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		stripesnoop
 Version:	1.5
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL
 Group:		Applications/System
 Summary:	Magnetic Stripe Reader
@@ -11,6 +11,8 @@
 Patch1:		stripesnoop-1.5-deflinux.patch
 Patch2:		stripesnoop-1.5-asmio.patch
 Patch3:		stripesnoop-1.5-pathing.patch
+Provides:	stripesnoop-devel = %{version}-%{release}
+Obsoletes:	stripesnoop-devel
 
 %description
 Stripe Snoop is a suite of research tools that captures, modifies, validates, 
@@ -53,6 +55,9 @@
 %{_datadir}/%{name}/
 
 %changelog
+* Sun Apr 23 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.5-5
+- provide/obsolete old -devel package to keep the repo clean
+
 * Fri Aug  5 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.5-4
 - only use asm/io.h for ppc
 - get rid of devel package (unnecessary)



From fedora-extras-commits at redhat.com  Sun Apr 23 22:06:41 2006
From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken))
Date: Sun, 23 Apr 2006 15:06:41 -0700
Subject: rpms/aspell-he - New directory
Message-ID: <200604232206.k3NM6hq1019449@cvs-int.fedora.redhat.com>

Author: danken

Update of /cvs/extras/rpms/aspell-he
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19428/aspell-he

Log Message:
Directory /cvs/extras/rpms/aspell-he added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 23 22:06:42 2006
From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken))
Date: Sun, 23 Apr 2006 15:06:42 -0700
Subject: rpms/aspell-he/devel - New directory
Message-ID: <200604232206.k3NM6iCW019452@cvs-int.fedora.redhat.com>

Author: danken

Update of /cvs/extras/rpms/aspell-he/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19428/aspell-he/devel

Log Message:
Directory /cvs/extras/rpms/aspell-he/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 23 22:07:04 2006
From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken))
Date: Sun, 23 Apr 2006 15:07:04 -0700
Subject: rpms/aspell-he Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604232207.k3NM766V019501@cvs-int.fedora.redhat.com>

Author: danken

Update of /cvs/extras/rpms/aspell-he
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19473

Added Files:
	Makefile import.log 
Log Message:
Setup of module aspell-he


--- NEW FILE Makefile ---
# Top level Makefile for module aspell-he
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 23 22:07:05 2006
From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken))
Date: Sun, 23 Apr 2006 15:07:05 -0700
Subject: rpms/aspell-he/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604232207.k3NM77iZ019504@cvs-int.fedora.redhat.com>

Author: danken

Update of /cvs/extras/rpms/aspell-he/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19473/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module aspell-he


--- 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 Apr 23 22:08:09 2006
From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken))
Date: Sun, 23 Apr 2006 15:08:09 -0700
Subject: rpms/aspell-he import.log,1.1,1.2
Message-ID: <200604232208.k3NM8B18019571@cvs-int.fedora.redhat.com>

Author: danken

Update of /cvs/extras/rpms/aspell-he
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19538

Modified Files:
	import.log 
Log Message:
auto-import aspell-he-0.9-2 on branch devel from aspell-he-0.9-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/aspell-he/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	23 Apr 2006 22:07:04 -0000	1.1
+++ import.log	23 Apr 2006 22:08:09 -0000	1.2
@@ -0,0 +1 @@
+aspell-he-0_9-2:HEAD:aspell-he-0.9-2.src.rpm:1145830015



From fedora-extras-commits at redhat.com  Sun Apr 23 22:08:10 2006
From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken))
Date: Sun, 23 Apr 2006 15:08:10 -0700
Subject: rpms/aspell-he/devel aspell-he.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604232208.k3NM8CE4019576@cvs-int.fedora.redhat.com>

Author: danken

Update of /cvs/extras/rpms/aspell-he/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19538/devel

Modified Files:
	.cvsignore sources 
Added Files:
	aspell-he.spec 
Log Message:
auto-import aspell-he-0.9-2 on branch devel from aspell-he-0.9-2.src.rpm


--- NEW FILE aspell-he.spec ---
%define lang he
%define langrelease 0
Summary: Hebrew dictionary for Aspell
Name: aspell-%{lang}
Version: 0.9
Release: 2%{?dist}
License: GPL
Group: Applications/Text
URL: http://aspell.net/
Source: ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell6-%{lang}-%{version}-%{langrelease}.tar.bz2
Buildrequires: aspell >= 12:0.60
Requires: aspell >= 12:0.60
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%define debug_package %{nil}

%description
Provides the word list/dictionaries for Hebrew.

# Note that this package, like other aspell's language packs, does not come up
# cleanly through rpmlint, but with the following errors:
# E: aspell-he no-binary
# E: aspell-he only-non-binary-in-usr-lib
# This is because the package contains only data files which sit under /usr/lib.
# They have to stay there, as they are architecture-dependent (due to
# byte-ordering issues).

%prep
%setup -q -n aspell6-%{lang}-%{version}-%{langrelease}

%build
cat > Makefile <<EOF
ASPELL = aspell
DEST_DIR = $RPM_BUILD_ROOT
WORD_LIST_COMPRESS = word-list-compress
PREZIP = prezip
dictdir = ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60
datadir = ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60
EOF
cat Makefile.pre >> Makefile
make

%install
make install

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc COPYING Copyright
%{_libdir}/aspell-0.60/*

%changelog
* Sun Apr 23 2006 Dan Kenigsberg <danken at cs.technion.ac.il> 0.9-2
- Cleaned the spec file according to Bug 189157.
- Added a comment explaining why the rpmlint gives Errors for this package.
* Sun Apr 16 2006 Dan Kenigsberg <danken at cs.technion.ac.il> 0.9-1
- Stolen from the French spec file 50:0.50-9.2.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/aspell-he/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2006 22:07:05 -0000	1.1
+++ .cvsignore	23 Apr 2006 22:08:10 -0000	1.2
@@ -0,0 +1 @@
+aspell6-he-0.9-0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/aspell-he/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2006 22:07:05 -0000	1.1
+++ sources	23 Apr 2006 22:08:10 -0000	1.2
@@ -0,0 +1 @@
+f453989e1df364af9479e893c16ac9d8  aspell6-he-0.9-0.tar.bz2



From fedora-extras-commits at redhat.com  Sun Apr 23 22:12:27 2006
From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken))
Date: Sun, 23 Apr 2006 15:12:27 -0700
Subject: owners owners.list,1.880,1.881
Message-ID: <200604232212.k3NMCTPS019645@cvs-int.fedora.redhat.com>

Author: danken

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19628

Modified Files:
	owners.list 
Log Message:
added aspell-he (Hebrew dictionary for Aspell)



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.880
retrieving revision 1.881
diff -u -r1.880 -r1.881
--- owners.list	23 Apr 2006 19:21:05 -0000	1.880
+++ owners.list	23 Apr 2006 22:12:26 -0000	1.881
@@ -52,6 +52,7 @@
 Fedora Extras|artwiz-aleczapka-fonts|Set of (improved) artwiz fonts|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|asa|Convert Fortran carriage control characters|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|asciidoc|AsciiDoc text document fomatter|chrisw at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|aspell-he|Hebrew dictionary for Aspell (Hspell-based)|danken at cs.technion.ac.il|extras-qa at fedoraproject.org|
 Fedora Extras|at-poke|A tool for poking things|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|aterm|Aterm (Afterstep XVT) - a VT102 emulator for the X window system|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|athcool|Enables/disables Powersaving mode for AMD processors|gajownik at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Apr 23 22:33:58 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun, 23 Apr 2006 15:33:58 -0700
Subject: rpms/anjuta-gdl - New directory
Message-ID: <200604232234.k3NMY0sj019806@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta-gdl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19785/anjuta-gdl

Log Message:
Directory /cvs/extras/rpms/anjuta-gdl added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 23 22:33:59 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun, 23 Apr 2006 15:33:59 -0700
Subject: rpms/anjuta-gdl/devel - New directory
Message-ID: <200604232234.k3NMY1Dd019809@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta-gdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19785/anjuta-gdl/devel

Log Message:
Directory /cvs/extras/rpms/anjuta-gdl/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 23 22:34:33 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun, 23 Apr 2006 15:34:33 -0700
Subject: rpms/anjuta-gdl Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604232234.k3NMYZBg019866@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta-gdl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19833

Added Files:
	Makefile import.log 
Log Message:
Setup of module anjuta-gdl


--- NEW FILE Makefile ---
# Top level Makefile for module anjuta-gdl
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 23 22:34:33 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun, 23 Apr 2006 15:34:33 -0700
Subject: rpms/anjuta-gdl/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604232234.k3NMYZiL019869@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta-gdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19833/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module anjuta-gdl


--- 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 Apr 23 22:35:29 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun, 23 Apr 2006 15:35:29 -0700
Subject: rpms/anjuta-gdl import.log,1.1,1.2
Message-ID: <200604232236.k3NMa1fQ019935@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta-gdl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19899

Modified Files:
	import.log 
Log Message:
auto-import anjuta-gdl-0.6.0-5 on branch devel from anjuta-gdl-0.6.0-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/anjuta-gdl/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	23 Apr 2006 22:34:32 -0000	1.1
+++ import.log	23 Apr 2006 22:35:29 -0000	1.2
@@ -0,0 +1 @@
+anjuta-gdl-0_6_0-5:HEAD:anjuta-gdl-0.6.0-5.src.rpm:1145831749



From fedora-extras-commits at redhat.com  Sun Apr 23 22:35:30 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun, 23 Apr 2006 15:35:30 -0700
Subject: rpms/anjuta-gdl/devel anjuta-gdl.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604232236.k3NMa2Kp019939@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta-gdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19899/devel

Modified Files:
	.cvsignore sources 
Added Files:
	anjuta-gdl.spec 
Log Message:
auto-import anjuta-gdl-0.6.0-5 on branch devel from anjuta-gdl-0.6.0-5.src.rpm


--- NEW FILE anjuta-gdl.spec ---
Name:		anjuta-gdl
Summary:	Components and library for GNOME development tools
Version:	0.6.0
Release:	5%{?dist}
License:	GPL
Group:		Development/Libraries
Source:		http://ftp.gnome.org/pub/GNOME/sources/gdl/0.6/gdl-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL:		http://www.gnome.org
BuildRequires: 	gtk2-devel, libgnomeui-devel, libbonoboui-devel, libxml2-devel, librsvg2-devel

%description
This package contains components and libraries that are intended to be
shared between GNOME development tools, including gnome-build and anjuta2.


%package devel
Summary:	Libraries and include files for gdl
Group:		Development/Libraries
Requires:	%{name} = %{version}

%description devel
Libraries and header files if you want to make use of the gdl library in your
own programs.

%prep
%setup -q -n gdl-%{version}

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf ${RPM_BUILD_ROOT}
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/gdl/images
make DESTDIR=${RPM_BUILD_ROOT} install
find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
%find_lang gdl-1

%clean
rm -rf ${RPM_BUILD_ROOT}

%post
/sbin/ldconfig

%postun
/sbin/ldconfig

%files -f gdl-1.lang
%doc AUTHORS COPYING ChangeLog NEWS README
%defattr (-, root, root)
%{_libdir}/libgdl-1.so.*
%{_datadir}/gdl

%files devel
%defattr (-, root, root)
%{_includedir}/libgdl-1.0
%{_libdir}/*so
%{_libdir}/pkgconfig/gdl-1.0.pc

%changelog
* Sun Apr 23 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.6.0-5
- added --disable-static and removed the .a delete line
- very minor spec changes
- added find_lang again
- Thanks to rc040203 -at- freenet.de for spec changes

* Sat Apr 22 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.6.0-4
- Added %%find_lang
- Altered all buildreqs to be -devel
- Added requires gtk2

* Mon Apr 03 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.6.0-3
- Fixes to Requires (made to BuildRequires)

* Tue Feb 21 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.6.0-2
- Multiple fixes to the spec file
- Renamed rpm to anjuta-gdl to avoid conflict with another package called gdl

* Sat Feb 18 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.6.0-1
- Inital import for FC
- Large changes to the original spec file provided in the src file

* Tue Aug 10 2004 Pierre Sarrazin <http://sarrazip.com/>
- Update for version 0.4.0

* Tue Oct 24 2002 Jean Schurger <jschurger at schurger.org>
- Update for gnome 2 version

* Wed Aug 8 2001 Jens Finke <jens at gnome.org>
- created spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/anjuta-gdl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2006 22:34:33 -0000	1.1
+++ .cvsignore	23 Apr 2006 22:35:30 -0000	1.2
@@ -0,0 +1 @@
+gdl-0.6.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/anjuta-gdl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2006 22:34:33 -0000	1.1
+++ sources	23 Apr 2006 22:35:30 -0000	1.2
@@ -0,0 +1 @@
+527555a617fd670a0d4b7d03cae03dad  gdl-0.6.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 23 22:40:45 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun, 23 Apr 2006 15:40:45 -0700
Subject: owners owners.list,1.881,1.882
Message-ID: <200604232240.k3NMelpi020033@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20014/owners

Modified Files:
	owners.list 
Log Message:


Added : anjuta-gdl. Components and lib for Gnome dev tools
 
 	owners/owners.list 



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.881
retrieving revision 1.882
diff -u -r1.881 -r1.882
--- owners.list	23 Apr 2006 22:12:26 -0000	1.881
+++ owners.list	23 Apr 2006 22:40:45 -0000	1.882
@@ -36,6 +36,7 @@
 Fedora Extras|amavisd-new|Email filter with virus scanner and spamassassin support|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|amaya|W3C's browser/web authoring tool|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|anjuta|GNOME IDE for C and C++|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
+Fedora Extras|anjuta-gdl|Components and library for GNOME development tools|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|anthy|A Japanese character set input library|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|antiword|MS Word to ASCII/Postscript converter|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|apachetop|A top-like display of Apache logs|gauret at free.fr|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Apr 23 23:06:40 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 23 Apr 2006 16:06:40 -0700
Subject: rpms/munin/devel munin-1.2.4-conf.patch, NONE,
	1.1 munin-1.2.4-cron.patch, NONE, 1.1 munin.spec, 1.6, 1.7
Message-ID: <200604232306.k3NN6gqq022243@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/munin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22220

Modified Files:
	munin.spec 
Added Files:
	munin-1.2.4-conf.patch munin-1.2.4-cron.patch 
Log Message:
add patch to remove unneeded munin-nagios in cron.
add patch to remove buildhostname in munin.conf (fixes #188928)
clean up prep section of spec.


munin-1.2.4-conf.patch:

--- NEW FILE munin-1.2.4-conf.patch ---
diff -Nur munin-1.2.4.orig/server/munin.conf.in munin-1.2.4/server/munin.conf.in
--- munin-1.2.4.orig/server/munin.conf.in	2005-10-08 04:11:02.000000000 -0600
+++ munin-1.2.4/server/munin.conf.in	2006-04-22 14:17:46.000000000 -0600
@@ -24,7 +24,7 @@
 #contact.nagios.command /usr/sbin/send_nsca -H nagios.host.com -c /etc/send_nsca.cfg
 
 # a simple host tree
-[@@HOSTNAME@@]
+[localhost]
     address 127.0.0.1
     use_node_name yes
 

munin-1.2.4-cron.patch:

--- NEW FILE munin-1.2.4-cron.patch ---
diff -Nur munin-1.2.4.orig/dists/redhat/munin.cron.d munin-1.2.4/dists/redhat/munin.cron.d
--- munin-1.2.4.orig/dists/redhat/munin.cron.d	2005-10-08 04:11:01.000000000 -0600
+++ munin-1.2.4/dists/redhat/munin.cron.d	2006-04-22 14:10:48.000000000 -0600
@@ -5,4 +5,3 @@
 MAILTO=root
 
 */5 * * * *     munin test -x /usr/bin/munin-cron && /usr/bin/munin-cron
-10 10 * * *     munin test -x /usr/share/munin/munin-nagios && /usr/share/munin/munin-nagios --removeok


Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/devel/munin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- munin.spec	24 Feb 2006 18:59:04 -0000	1.6
+++ munin.spec	23 Apr 2006 23:06:40 -0000	1.7
@@ -1,6 +1,6 @@
 Name:      munin
 Version:   1.2.4
-Release:   7%{?dist}
+Release:   8%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPL
 Group:     System Environment/Daemons
@@ -9,6 +9,8 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: http://download.sourceforge.net/sourceforge/munin/%{name}_%{version}.tar.gz
+Patch0: munin-1.2.4-cron.patch
+Patch1: munin-1.2.4-conf.patch
 BuildArchitectures: noarch
 Requires: perl-HTML-Template
 Requires: perl-Net-Server
@@ -66,8 +68,8 @@
 
 %prep
 %setup -q
-rm -rf %{buildroot}
-mkdir -p %{buildroot}
+%patch0 -p1
+%patch1 -p1
 
 %build
 
@@ -221,6 +223,11 @@
 %doc %{_mandir}/man5/munin-node*
 
 %changelog
+* Sat Apr 22 2006 Kevin Fenzi <kevin at tummy.com> - 1.2.4-8
+- add patch to remove unneeded munin-nagios in cron. 
+- add patch to remove buildhostname in munin.conf (fixes #188928)
+- clean up prep section of spec. 
+
 * Fri Feb 24 2006 Kevin Fenzi <kevin at scrye.com> - 1.2.4-7
 - Remove bogus Provides for perl RRDs (fixes #182702)
 



From fedora-extras-commits at redhat.com  Sun Apr 23 23:17:15 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 23 Apr 2006 16:17:15 -0700
Subject: rpms/munin/FC-5 munin-1.2.4-conf.patch, NONE,
	1.1 munin-1.2.4-cron.patch, NONE, 1.1 munin.spec, 1.6, 1.7
Message-ID: <200604232317.k3NNHHZS022371@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/munin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22346

Modified Files:
	munin.spec 
Added Files:
	munin-1.2.4-conf.patch munin-1.2.4-cron.patch 
Log Message:
add patch to remove unneeded munin-nagios in cron.
add patch to remove buildhostname in munin.conf (fixes #188928)
clean up prep section of spec.


munin-1.2.4-conf.patch:

--- NEW FILE munin-1.2.4-conf.patch ---
diff -Nur munin-1.2.4.orig/server/munin.conf.in munin-1.2.4/server/munin.conf.in
--- munin-1.2.4.orig/server/munin.conf.in	2005-10-08 04:11:02.000000000 -0600
+++ munin-1.2.4/server/munin.conf.in	2006-04-22 14:17:46.000000000 -0600
@@ -24,7 +24,7 @@
 #contact.nagios.command /usr/sbin/send_nsca -H nagios.host.com -c /etc/send_nsca.cfg
 
 # a simple host tree
-[@@HOSTNAME@@]
+[localhost]
     address 127.0.0.1
     use_node_name yes
 

munin-1.2.4-cron.patch:

--- NEW FILE munin-1.2.4-cron.patch ---
diff -Nur munin-1.2.4.orig/dists/redhat/munin.cron.d munin-1.2.4/dists/redhat/munin.cron.d
--- munin-1.2.4.orig/dists/redhat/munin.cron.d	2005-10-08 04:11:01.000000000 -0600
+++ munin-1.2.4/dists/redhat/munin.cron.d	2006-04-22 14:10:48.000000000 -0600
@@ -5,4 +5,3 @@
 MAILTO=root
 
 */5 * * * *     munin test -x /usr/bin/munin-cron && /usr/bin/munin-cron
-10 10 * * *     munin test -x /usr/share/munin/munin-nagios && /usr/share/munin/munin-nagios --removeok


Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/FC-5/munin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- munin.spec	24 Feb 2006 18:59:04 -0000	1.6
+++ munin.spec	23 Apr 2006 23:17:15 -0000	1.7
@@ -1,6 +1,6 @@
 Name:      munin
 Version:   1.2.4
-Release:   7%{?dist}
+Release:   8%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPL
 Group:     System Environment/Daemons
@@ -9,6 +9,8 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: http://download.sourceforge.net/sourceforge/munin/%{name}_%{version}.tar.gz
+Patch0: munin-1.2.4-cron.patch
+Patch1: munin-1.2.4-conf.patch
 BuildArchitectures: noarch
 Requires: perl-HTML-Template
 Requires: perl-Net-Server
@@ -66,8 +68,8 @@
 
 %prep
 %setup -q
-rm -rf %{buildroot}
-mkdir -p %{buildroot}
+%patch0 -p1
+%patch1 -p1
 
 %build
 
@@ -221,6 +223,11 @@
 %doc %{_mandir}/man5/munin-node*
 
 %changelog
+* Sat Apr 22 2006 Kevin Fenzi <kevin at tummy.com> - 1.2.4-8
+- add patch to remove unneeded munin-nagios in cron. 
+- add patch to remove buildhostname in munin.conf (fixes #188928)
+- clean up prep section of spec. 
+
 * Fri Feb 24 2006 Kevin Fenzi <kevin at scrye.com> - 1.2.4-7
 - Remove bogus Provides for perl RRDs (fixes #182702)
 



From fedora-extras-commits at redhat.com  Sun Apr 23 23:21:26 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 23 Apr 2006 16:21:26 -0700
Subject: rpms/munin/FC-4 munin-1.2.4-conf.patch, NONE,
	1.1 munin-1.2.4-cron.patch, NONE, 1.1 munin.spec, 1.5, 1.6
Message-ID: <200604232321.k3NNLSrg022464@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/munin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22441

Modified Files:
	munin.spec 
Added Files:
	munin-1.2.4-conf.patch munin-1.2.4-cron.patch 
Log Message:
add patch to remove unneeded munin-nagios in cron.
add patch to remove buildhostname in munin.conf (fixes #188928)
clean up prep section of spec.


munin-1.2.4-conf.patch:

--- NEW FILE munin-1.2.4-conf.patch ---
diff -Nur munin-1.2.4.orig/server/munin.conf.in munin-1.2.4/server/munin.conf.in
--- munin-1.2.4.orig/server/munin.conf.in	2005-10-08 04:11:02.000000000 -0600
+++ munin-1.2.4/server/munin.conf.in	2006-04-22 14:17:46.000000000 -0600
@@ -24,7 +24,7 @@
 #contact.nagios.command /usr/sbin/send_nsca -H nagios.host.com -c /etc/send_nsca.cfg
 
 # a simple host tree
-[@@HOSTNAME@@]
+[localhost]
     address 127.0.0.1
     use_node_name yes
 

munin-1.2.4-cron.patch:

--- NEW FILE munin-1.2.4-cron.patch ---
diff -Nur munin-1.2.4.orig/dists/redhat/munin.cron.d munin-1.2.4/dists/redhat/munin.cron.d
--- munin-1.2.4.orig/dists/redhat/munin.cron.d	2005-10-08 04:11:01.000000000 -0600
+++ munin-1.2.4/dists/redhat/munin.cron.d	2006-04-22 14:10:48.000000000 -0600
@@ -5,4 +5,3 @@
 MAILTO=root
 
 */5 * * * *     munin test -x /usr/bin/munin-cron && /usr/bin/munin-cron
-10 10 * * *     munin test -x /usr/share/munin/munin-nagios && /usr/share/munin/munin-nagios --removeok


Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/FC-4/munin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- munin.spec	24 Feb 2006 19:02:54 -0000	1.5
+++ munin.spec	23 Apr 2006 23:21:26 -0000	1.6
@@ -1,6 +1,6 @@
 Name:      munin
 Version:   1.2.4
-Release:   7%{?dist}
+Release:   8%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPL
 Group:     System Environment/Daemons
@@ -9,6 +9,8 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: http://download.sourceforge.net/sourceforge/munin/%{name}_%{version}.tar.gz
+Patch0: munin-1.2.4-cron.patch
+Patch1: munin-1.2.4-conf.patch
 BuildArchitectures: noarch
 Requires: perl-HTML-Template
 Requires: perl-Net-Server
@@ -66,8 +68,8 @@
 
 %prep
 %setup -q
-rm -rf %{buildroot}
-mkdir -p %{buildroot}
+%patch0 -p1
+%patch1 -p1
 
 %build
 
@@ -221,6 +223,11 @@
 %doc %{_mandir}/man5/munin-node*
 
 %changelog
+* Sat Apr 22 2006 Kevin Fenzi <kevin at tummy.com> - 1.2.4-8
+- add patch to remove unneeded munin-nagios in cron.
+- add patch to remove buildhostname in munin.conf (fixes #188928)
+- clean up prep section of spec.
+
 * Fri Feb 24 2006 Kevin Fenzi <kevin at tummy.com> - 1.2.4-7
 - Remove bogus Provides for perl RRDs (fixes #182702)
 



From fedora-extras-commits at redhat.com  Sun Apr 23 23:24:24 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 23 Apr 2006 16:24:24 -0700
Subject: rpms/munin/FC-3 munin-1.2.4-conf.patch, NONE,
	1.1 munin-1.2.4-cron.patch, NONE, 1.1 munin.spec, 1.5, 1.6
Message-ID: <200604232324.k3NNOQbi022614@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/munin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22574

Modified Files:
	munin.spec 
Added Files:
	munin-1.2.4-conf.patch munin-1.2.4-cron.patch 
Log Message:
add patch to remove unneeded munin-nagios in cron.
add patch to remove buildhostname in munin.conf (fixes #188928)
clean up prep section of spec.


munin-1.2.4-conf.patch:

--- NEW FILE munin-1.2.4-conf.patch ---
diff -Nur munin-1.2.4.orig/server/munin.conf.in munin-1.2.4/server/munin.conf.in
--- munin-1.2.4.orig/server/munin.conf.in	2005-10-08 04:11:02.000000000 -0600
+++ munin-1.2.4/server/munin.conf.in	2006-04-22 14:17:46.000000000 -0600
@@ -24,7 +24,7 @@
 #contact.nagios.command /usr/sbin/send_nsca -H nagios.host.com -c /etc/send_nsca.cfg
 
 # a simple host tree
-[@@HOSTNAME@@]
+[localhost]
     address 127.0.0.1
     use_node_name yes
 

munin-1.2.4-cron.patch:

--- NEW FILE munin-1.2.4-cron.patch ---
diff -Nur munin-1.2.4.orig/dists/redhat/munin.cron.d munin-1.2.4/dists/redhat/munin.cron.d
--- munin-1.2.4.orig/dists/redhat/munin.cron.d	2005-10-08 04:11:01.000000000 -0600
+++ munin-1.2.4/dists/redhat/munin.cron.d	2006-04-22 14:10:48.000000000 -0600
@@ -5,4 +5,3 @@
 MAILTO=root
 
 */5 * * * *     munin test -x /usr/bin/munin-cron && /usr/bin/munin-cron
-10 10 * * *     munin test -x /usr/share/munin/munin-nagios && /usr/share/munin/munin-nagios --removeok


Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/FC-3/munin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- munin.spec	24 Feb 2006 19:07:33 -0000	1.5
+++ munin.spec	23 Apr 2006 23:24:24 -0000	1.6
@@ -1,6 +1,6 @@
 Name:      munin
 Version:   1.2.4
-Release:   7%{?dist}
+Release:   8%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPL
 Group:     System Environment/Daemons
@@ -9,6 +9,8 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: http://download.sourceforge.net/sourceforge/munin/%{name}_%{version}.tar.gz
+Patch0: munin-1.2.4-cron.patch
+Patch1: munin-1.2.4-conf.patch
 BuildArchitectures: noarch
 Provides: perl(RRDs)
 Requires: perl-HTML-Template
@@ -67,8 +69,8 @@
 
 %prep
 %setup -q
-rm -rf %{buildroot}
-mkdir -p %{buildroot}
+%patch0 -p1
+%patch1 -p1
 
 %build
 
@@ -222,6 +224,11 @@
 %doc %{_mandir}/man5/munin-node*
 
 %changelog
+* Sat Apr 22 2006 Kevin Fenzi <kevin at tummy.com> - 1.2.4-8
+- add patch to remove unneeded munin-nagios in cron.
+- add patch to remove buildhostname in munin.conf (fixes #188928)
+- clean up prep section of spec.
+
 * Fri Feb 24 2006 Kevin Fenzi <kevin at tummy.com> - 1.2.4-7
 - Remove bogus Provides for perl RRDs (fixes #182702)
 



From fedora-extras-commits at redhat.com  Sun Apr 23 23:24:38 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 23 Apr 2006 16:24:38 -0700
Subject: rpms/libchmxx - New directory
Message-ID: <200604232324.k3NNOeAi022693@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/libchmxx
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22664/libchmxx

Log Message:
Directory /cvs/extras/rpms/libchmxx added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 23 23:24:38 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 23 Apr 2006 16:24:38 -0700
Subject: rpms/libchmxx/devel - New directory
Message-ID: <200604232324.k3NNOenf022697@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/libchmxx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22664/libchmxx/devel

Log Message:
Directory /cvs/extras/rpms/libchmxx/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 23 23:24:55 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 23 Apr 2006 16:24:55 -0700
Subject: rpms/libchmxx Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604232324.k3NNOv7p022747@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/libchmxx
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22714

Added Files:
	Makefile import.log 
Log Message:
Setup of module libchmxx


--- NEW FILE Makefile ---
# Top level Makefile for module libchmxx
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 23 23:24:56 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 23 Apr 2006 16:24:56 -0700
Subject: rpms/libchmxx/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604232324.k3NNOwDC022750@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/libchmxx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22714/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libchmxx


--- 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 Apr 23 23:25:37 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 23 Apr 2006 16:25:37 -0700
Subject: rpms/libchmxx import.log,1.1,1.2
Message-ID: <200604232325.k3NNPdZE022817@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/libchmxx
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22783

Modified Files:
	import.log 
Log Message:
auto-import libchmxx-0.1-2 on branch devel from libchmxx-0.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libchmxx/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	23 Apr 2006 23:24:55 -0000	1.1
+++ import.log	23 Apr 2006 23:25:37 -0000	1.2
@@ -0,0 +1 @@
+libchmxx-0_1-2:HEAD:libchmxx-0.1-2.src.rpm:1145834696



From fedora-extras-commits at redhat.com  Sun Apr 23 23:25:38 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 23 Apr 2006 16:25:38 -0700
Subject: rpms/libchmxx/devel libchmxx-kchm-fixes.diff, NONE,
	1.1 libchmxx.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604232325.k3NNPeG0022824@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/libchmxx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22783/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libchmxx-kchm-fixes.diff libchmxx.spec 
Log Message:
auto-import libchmxx-0.1-2 on branch devel from libchmxx-0.1-2.src.rpm

libchmxx-kchm-fixes.diff:

--- NEW FILE libchmxx-kchm-fixes.diff ---
diff -u --recursive libchmxx-0.1-orig/src/chm.cpp libchmxx-0.1/src/chm.cpp
--- libchmxx-0.1-orig/src/chm.cpp	2003-10-03 13:34:19.000000000 +0200
+++ libchmxx-0.1/src/chm.cpp	2006-03-13 10:15:16.000000000 +0100
@@ -14,6 +14,8 @@
 using std::vector;
 using std::list;
 using std::map;
+using std::find;
+using std::transform;
 using namespace chm;
 
 namespace {
@@ -29,7 +31,7 @@
       if ( buf_size == file_size ) underflow(); // force loading of entire buffer, no more loads are done
     }
 
-    chmstreambuf (const char *b, size_t buf_size) : buf((char *)buf), buf_size(buf_size)
+    chmstreambuf (const char *b, size_t buf_size) : buf((char *)b), buf_size(buf_size)
     {
       is_cached = true;
       setg (buf, buf, buf + buf_size);
@@ -177,6 +179,7 @@
             if ( topics_file.empty() )
               {
                 string t = string(data.begin(), data.end() - 1);
+//				std::cout << t << std::endl;
                 if ( file_exists (t + ".hhc") )
                     topics_file = "/" + t + ".hhc";
                 if ( file_exists (t + ".hhk") )
@@ -247,11 +250,12 @@
                         last->title = value;
                     } else if ( name == "Local" ) {
                         last->path = "/" + value;
+                    } else if ( name == "local" ) {
+                        last->path = "/" + value;
                     }
                 }
                 if ( !tr.has_next () ) break; // faulty file
                 s = tr.get_next();
-
             }
             continue;
           }
diff -u --recursive libchmxx-0.1-orig/src/chmxx.h libchmxx-0.1/src/chmxx.h
--- libchmxx-0.1-orig/src/chmxx.h	2003-10-03 13:29:08.000000000 +0200
+++ libchmxx-0.1/src/chmxx.h	2006-03-13 10:14:54.000000000 +0100
@@ -9,6 +9,22 @@
 #include <list>
 #include <map>
 
+#ifndef __BYTE_ORDER
+	#ifndef BYTE_ORDER
+		#error: define proper byte order
+	#endif
+
+	#if BYTE_ORDER == LITTLE_ENDIAN
+		#define __LITTLE_ENDIAN LITTLE_ENDIAN
+		#define __BYTE_ORDER __LITTLE_ENDIAN
+	#elif BYTE_ORDER == BIG_ENDIAN
+		#define __BIG_ENDIAN BIG_ENDIAN
+		#define __BYTE_ORDER __BIG_ENDIAN
+	#else
+		#error: define proper byte order
+	#endif
+#endif
+
 /**
  * @mainpage
  * This is a c++ library for accessing the Microsoft(TM)
@@ -179,7 +195,7 @@
     unsigned long res = 0;  // long guatanteed to be 4 bytes
     read ((char *)&res, 4);
     return res;
-#else
+#elif __BYTE_ORDER == __BIG_ENDIAN
     char buf[4];
     read (buf, 4);
     size_t res = buf[0];
@@ -187,6 +203,8 @@
     res |= buf[2] << 16;
     res |= buf[3] << 24;
     return res;
+#else
+#error: define proper byte order
 #endif
   }
 
@@ -198,19 +216,21 @@
     unsigned int res = 0;   // int guaranteed to be 2 bytes
     read ((char *)&res, 2);
     return res;
-#else
+#elif __BYTE_ORDER == __BIG_ENDIAN
     char buf[2];
     read (buf, 2);
     unsigned int res = buf[0];
     res |= buf[1] << 8;
     return res;
+#else
+#error: define proper byte order
 #endif
   }
 
   /** Get a s-r encoded value from the stream. Scale must alwqays be 2.
     * Use 0 for initial pos. When finished reading an entry of sr-s
     * call the get_sr_finish(pos).*/
-  inline unsigned long get_sr (int s, int r, int& pos)
+  inline unsigned long get_sr (int , int r, int& pos)
   {
     int b = peek();
     int p = 0;


--- NEW FILE libchmxx.spec ---
Name:           libchmxx
Version:        0.1
Release:        2%{?dist}
Summary:        C++ bindings for chmlib

Group:          System Environment/Libraries
License:        LGPL/GPL
URL:            http://www.mare.ee/indrek/libchmxx/
Source0:        http://www.mare.ee/indrek/libchmxx/libchmxx-%{version}.tar.gz
Patch0:         libchmxx-kchm-fixes.diff
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  chmlib-devel
#Requires:       

%description
This is a C++ library for accessing Microsoft(tm) help
files (usually with extension chm).

%package devel
Summary:       Headers and development libraries for libchmxx
Group:         Development/Libraries
Requires:      %{name} = %{version}-%{release}
Requires:      chmlib-devel

%description devel
The libchmxx-devel package contains headers and development libraries
necessary for building programs against libchmxx.

%prep
%setup -q
%patch -p1

%build
%configure --disable-static
# fails with %{?_smp_mflags}
#make %{?_smp_mflags}
make

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_libdir}/libchmxx.la

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS README COPYING COPYING.LIB
%{_bindir}/chmdissect
%{_libdir}/libchmxx.so.*

%files devel
%defattr(-,root,root,-)
%doc html/
%{_libdir}/libchmxx.so
%{_includedir}/chmxx.h

%changelog
* Mon Mar 13 2006 Patrice Dumas <pertusus at free.fr> 0.1-2
- disable static libs

* Mon Mar 13 2006 Patrice Dumas <pertusus at free.fr> 0.1-1
- initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libchmxx/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2006 23:24:56 -0000	1.1
+++ .cvsignore	23 Apr 2006 23:25:38 -0000	1.2
@@ -0,0 +1 @@
+libchmxx-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libchmxx/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2006 23:24:56 -0000	1.1
+++ sources	23 Apr 2006 23:25:38 -0000	1.2
@@ -0,0 +1 @@
+e2987a503d4d49ec4019b67c99921372  libchmxx-0.1.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 23 23:26:25 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun, 23 Apr 2006 16:26:25 -0700
Subject: rpms/anjuta/devel .cvsignore, 1.5, 1.6 anjuta.spec, 1.16,
	1.17 sources, 1.5, 1.6
Message-ID: <200604232326.k3NNQR0W022910@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22871/devel

Modified Files:
	.cvsignore anjuta.spec sources 
Log Message:
auto-import anjuta-1.2.4a-1 on branch devel from anjuta-1.2.4a-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/anjuta/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Feb 2006 23:24:25 -0000	1.5
+++ .cvsignore	23 Apr 2006 23:26:25 -0000	1.6
@@ -1 +1 @@
-anjuta-1.2.4.tar.gz
+anjuta-1.2.4a.tar.gz


Index: anjuta.spec
===================================================================
RCS file: /cvs/extras/rpms/anjuta/devel/anjuta.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- anjuta.spec	24 Mar 2006 23:50:46 -0000	1.16
+++ anjuta.spec	23 Apr 2006 23:26:25 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           anjuta
-Version:        1.2.4
-Release:        5%{?dist}
+Version:        1.2.4a
+Release:        1%{?dist}
 Summary:        GNOME IDE for C and C++
 
 Group:          Development/Tools
@@ -114,6 +114,9 @@
 %{_datadir}/omf/%{name}
 
 %changelog
+* Mon Apr 24 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.2.4a-1
+- Bump to newer version
+
 * Fri Mar 24 2006 Michael Schwendt <bugs.michael at gmx.net> - 1.2.4-5
 - Added export dynamic
 - trivial spec changes


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/anjuta/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Feb 2006 23:24:25 -0000	1.5
+++ sources	23 Apr 2006 23:26:25 -0000	1.6
@@ -1 +1 @@
-5a709fbaedc816a88fd8b9ad5276a47b  anjuta-1.2.4.tar.gz
+7e6af289b4bfd1ec2ca72e2017efc4d3  anjuta-1.2.4a.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 23 23:26:24 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun, 23 Apr 2006 16:26:24 -0700
Subject: rpms/anjuta import.log,1.9,1.10
Message-ID: <200604232326.k3NNQQeD022904@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22871

Modified Files:
	import.log 
Log Message:
auto-import anjuta-1.2.4a-1 on branch devel from anjuta-1.2.4a-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/anjuta/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- import.log	2 Apr 2006 23:38:47 -0000	1.9
+++ import.log	23 Apr 2006 23:26:24 -0000	1.10
@@ -6,3 +6,4 @@
 anjuta-1_2_4-5:HEAD:anjuta-1.2.4-5.src.rpm:1143244226
 anjuta-1_2_4-5:FC-5:anjuta-1.2.4-5.src.rpm:1144021011
 anjuta-1_2_4-5:FC-4:anjuta-1.2.4-5.src.rpm:1144021115
+anjuta-1_2_4a-1:HEAD:anjuta-1.2.4a-1.src.rpm:1145834807



From fedora-extras-commits at redhat.com  Sun Apr 23 23:27:31 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun, 23 Apr 2006 16:27:31 -0700
Subject: rpms/anjuta import.log,1.10,1.11
Message-ID: <200604232327.k3NNRXP4023082@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23045

Modified Files:
	import.log 
Log Message:
auto-import anjuta-1.2.4a-1 on branch FC-5 from anjuta-1.2.4a-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/anjuta/import.log,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- import.log	23 Apr 2006 23:26:24 -0000	1.10
+++ import.log	23 Apr 2006 23:27:31 -0000	1.11
@@ -7,3 +7,4 @@
 anjuta-1_2_4-5:FC-5:anjuta-1.2.4-5.src.rpm:1144021011
 anjuta-1_2_4-5:FC-4:anjuta-1.2.4-5.src.rpm:1144021115
 anjuta-1_2_4a-1:HEAD:anjuta-1.2.4a-1.src.rpm:1145834807
+anjuta-1_2_4a-1:FC-5:anjuta-1.2.4a-1.src.rpm:1145834875



From fedora-extras-commits at redhat.com  Sun Apr 23 23:27:32 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun, 23 Apr 2006 16:27:32 -0700
Subject: rpms/anjuta/FC-5 .cvsignore, 1.5, 1.6 anjuta.spec, 1.16,
	1.17 sources, 1.5, 1.6
Message-ID: <200604232327.k3NNRYqB023092@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23045/FC-5

Modified Files:
	.cvsignore anjuta.spec sources 
Log Message:
auto-import anjuta-1.2.4a-1 on branch FC-5 from anjuta-1.2.4a-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/anjuta/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Feb 2006 23:24:25 -0000	1.5
+++ .cvsignore	23 Apr 2006 23:27:32 -0000	1.6
@@ -1 +1 @@
-anjuta-1.2.4.tar.gz
+anjuta-1.2.4a.tar.gz


Index: anjuta.spec
===================================================================
RCS file: /cvs/extras/rpms/anjuta/FC-5/anjuta.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- anjuta.spec	2 Apr 2006 23:37:04 -0000	1.16
+++ anjuta.spec	23 Apr 2006 23:27:32 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           anjuta
-Version:        1.2.4
-Release:        5%{?dist}
+Version:        1.2.4a
+Release:        1%{?dist}
 Summary:        GNOME IDE for C and C++
 
 Group:          Development/Tools
@@ -114,6 +114,9 @@
 %{_datadir}/omf/%{name}
 
 %changelog
+* Mon Apr 24 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.2.4a-1
+- Bump to newer version
+
 * Fri Mar 24 2006 Michael Schwendt <bugs.michael at gmx.net> - 1.2.4-5
 - Added export dynamic
 - trivial spec changes


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/anjuta/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Feb 2006 23:24:25 -0000	1.5
+++ sources	23 Apr 2006 23:27:32 -0000	1.6
@@ -1 +1 @@
-5a709fbaedc816a88fd8b9ad5276a47b  anjuta-1.2.4.tar.gz
+7e6af289b4bfd1ec2ca72e2017efc4d3  anjuta-1.2.4a.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 23 23:28:29 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun, 23 Apr 2006 16:28:29 -0700
Subject: rpms/anjuta import.log,1.11,1.12
Message-ID: <200604232329.k3NNT1IP023397@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23279

Modified Files:
	import.log 
Log Message:
auto-import anjuta-1.2.4a-1 on branch FC-4 from anjuta-1.2.4a-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/anjuta/import.log,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- import.log	23 Apr 2006 23:27:31 -0000	1.11
+++ import.log	23 Apr 2006 23:28:29 -0000	1.12
@@ -8,3 +8,4 @@
 anjuta-1_2_4-5:FC-4:anjuta-1.2.4-5.src.rpm:1144021115
 anjuta-1_2_4a-1:HEAD:anjuta-1.2.4a-1.src.rpm:1145834807
 anjuta-1_2_4a-1:FC-5:anjuta-1.2.4a-1.src.rpm:1145834875
+anjuta-1_2_4a-1:FC-4:anjuta-1.2.4a-1.src.rpm:1145834931



From fedora-extras-commits at redhat.com  Sun Apr 23 23:28:30 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun, 23 Apr 2006 16:28:30 -0700
Subject: rpms/anjuta/FC-4 .cvsignore, 1.5, 1.6 anjuta.spec, 1.11,
	1.12 sources, 1.5, 1.6
Message-ID: <200604232329.k3NNT29e023404@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23279/FC-4

Modified Files:
	.cvsignore anjuta.spec sources 
Log Message:
auto-import anjuta-1.2.4a-1 on branch FC-4 from anjuta-1.2.4a-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/anjuta/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	2 Apr 2006 23:38:48 -0000	1.5
+++ .cvsignore	23 Apr 2006 23:28:29 -0000	1.6
@@ -1 +1 @@
-anjuta-1.2.4.tar.gz
+anjuta-1.2.4a.tar.gz


Index: anjuta.spec
===================================================================
RCS file: /cvs/extras/rpms/anjuta/FC-4/anjuta.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- anjuta.spec	2 Apr 2006 23:38:48 -0000	1.11
+++ anjuta.spec	23 Apr 2006 23:28:29 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           anjuta
-Version:        1.2.4
-Release:        5%{?dist}
+Version:        1.2.4a
+Release:        1%{?dist}
 Summary:        GNOME IDE for C and C++
 
 Group:          Development/Tools
@@ -114,6 +114,9 @@
 %{_datadir}/omf/%{name}
 
 %changelog
+* Mon Apr 24 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.2.4a-1
+- Bump to newer version
+
 * Fri Mar 24 2006 Michael Schwendt <bugs.michael at gmx.net> - 1.2.4-5
 - Added export dynamic
 - trivial spec changes


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/anjuta/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Apr 2006 23:38:48 -0000	1.5
+++ sources	23 Apr 2006 23:28:29 -0000	1.6
@@ -1 +1 @@
-5a709fbaedc816a88fd8b9ad5276a47b  anjuta-1.2.4.tar.gz
+7e6af289b4bfd1ec2ca72e2017efc4d3  anjuta-1.2.4a.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 23 23:32:46 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 23 Apr 2006 16:32:46 -0700
Subject: owners owners.list,1.882,1.883
Message-ID: <200604232332.k3NNWmsX024123@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24098

Modified Files:
	owners.list 
Log Message:
add libchmxx


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.882
retrieving revision 1.883
diff -u -r1.882 -r1.883
--- owners.list	23 Apr 2006 22:40:45 -0000	1.882
+++ owners.list	23 Apr 2006 23:32:45 -0000	1.883
@@ -583,6 +583,7 @@
 Fedora Extras|libcddb|A library (C API) for accessing a CDDB server|anvil at livna.org|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|libchewing|Traditional Chinese phonetic input method library|petersen at redhat.com|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|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|



From fedora-extras-commits at redhat.com  Mon Apr 24 01:27:12 2006
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Sun, 23 Apr 2006 18:27:12 -0700
Subject: rpms/anthy/FC-5 README, NONE, 1.1 Makefile, 1.1, NONE anthy-init.el,
	1.1, NONE anthy.spec, 1.9, NONE sources, 1.5, NONE
Message-ID: <200604240127.k3O1REmH031692@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/rpms/anthy/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31676

Added Files:
	README 
Removed Files:
	Makefile anthy-init.el anthy.spec sources 
Log Message:



--- NEW FILE README ---
anthy has moved to Fedora Core.


--- Makefile DELETED ---


--- anthy-init.el DELETED ---


--- anthy.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Apr 24 01:33:18 2006
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Sun, 23 Apr 2006 18:33:18 -0700
Subject: rpms/anthy/FC-4 anthy-gcanna-nakaguro.patch, NONE, 1.1 anthy.spec, 
	1.12, 1.13
Message-ID: <200604240133.k3O1XKnY031872@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/rpms/anthy/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31852

Modified Files:
	anthy.spec 
Added Files:
	anthy-gcanna-nakaguro.patch 
Log Message:
* Mon Apr 24 2006 Akira TAGOH <tagoh at redhat.com> - 7500b-1
- New upstream release.
- anthy-gcanna-nakaguro.patch: added a word to dictionary to convert nakaguro to slash.
- run ldconfig in %%post and %%postun.

anthy-gcanna-nakaguro.patch:

--- NEW FILE anthy-gcanna-nakaguro.patch ---
diff -ruN anthy-7500.orig/anthy_gcanna_ut-20051002/gcanna.ctd anthy-7500/anthy_gcanna_ut-20051002/gcanna.ctd
--- anthy-7500.orig/anthy_gcanna_ut-20051002/gcanna.ctd	2005-10-02 17:56:27.000000000 +0900
+++ anthy-7500/anthy_gcanna_ut-20051002/gcanna.ctd	2006-03-17 22:19:17.000000000 +0900
@@ -1,5 +1,6 @@
 ?? #KJ ?? ??
 ?? #KJ / ?? ??
+?? #KJ ?? /
 ?? #KJ*40 ?? #KJ*4 ?? #KJ ?? ?? ??
 ???? #KJ*40 ???? #KJ*38 ???? #KJ*26 ???? #KJ*12 ???? ????
 ?? #KJ*40 ?? #KJ*4 ?? #KJ ?? ?? ??


Index: anthy.spec
===================================================================
RCS file: /cvs/extras/rpms/anthy/FC-4/anthy.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- anthy.spec	4 Nov 2005 20:33:18 -0000	1.12
+++ anthy.spec	24 Apr 2006 01:33:17 -0000	1.13
@@ -1,4 +1,4 @@
-%define	version		7100b
+%define	version		7500b
 %define	gcanna_ver	20051002
 
 Name:		anthy
@@ -12,6 +12,7 @@
 Source0:	http://prdownloads.sourceforge.jp/anthy/9723/anthy-%{version}.tar.gz
 Source1:	anthy-init.el
 Source2:	http://www.geocities.jp/ep3797/snapshot/tmp/anthy_gcanna_ut-%{gcanna_ver}.tar.bz2
+Patch2:		anthy-gcanna-nakaguro.patch
 
 Summary:	Japanese character set input library
 Group:		System Environment/Libraries
@@ -51,6 +52,7 @@
 
 %prep
 %setup -q -a 2
+%patch2 -p1
 
 %build
 %configure
@@ -78,6 +80,10 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
 %files
 %defattr (-, root, root)
 %doc AUTHORS COPYING ChangeLog DIARY NEWS README doc
@@ -105,6 +111,11 @@
 %{_datadir}/xemacs/site-packages/lisp/site-start.d/anthy-init.el
 
 %changelog
+* Mon Apr 24 2006 Akira TAGOH <tagoh at redhat.com> - 7500b-1
+- New upstream release.
+- anthy-gcanna-nakaguro.patch: added a word to dictionary to convert nakaguro to slash.
+- run ldconfig in %%post and %%postun.
+
 * Sat Nov  5 2005 Akira TAGOH <tagoh at redhat.com> - 7100b-1
 - New upstream release.
 - use a optimized gcanna dictionary.



From fedora-extras-commits at redhat.com  Mon Apr 24 01:36:02 2006
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Sun, 23 Apr 2006 18:36:02 -0700
Subject: rpms/anthy/FC-4 .cvsignore,1.7,1.8 sources,1.7,1.8
Message-ID: <200604240136.k3O1a4Om031957@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/rpms/anthy/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31938

Modified Files:
	.cvsignore sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/anthy/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	4 Nov 2005 20:33:18 -0000	1.7
+++ .cvsignore	24 Apr 2006 01:36:02 -0000	1.8
@@ -8,3 +8,4 @@
 anthy-6700b.tar.gz
 anthy-7100b.tar.gz
 anthy_gcanna_ut-20051002.tar.bz2
+anthy-7500b.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/anthy/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	4 Nov 2005 20:33:18 -0000	1.7
+++ sources	24 Apr 2006 01:36:02 -0000	1.8
@@ -1,2 +1,2 @@
-099514a261b1c3757f95de034a4fbc0d  anthy-7100b.tar.gz
 d0f6128b6e000e85764abbc030399db7  anthy_gcanna_ut-20051002.tar.bz2
+ed3ce5d4332751ee3f4befe843c8ebb8  anthy-7500b.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 24 03:25:49 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Sun, 23 Apr 2006 20:25:49 -0700
Subject: rpms/hugs98/FC-5 hugs98.spec,1.2,1.3
Message-ID: <200604240325.k3O3Ppjr004247@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/hugs98/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4220

Modified Files:
	hugs98.spec 
Log Message:
use hugs_version in source0



Index: hugs98.spec
===================================================================
RCS file: /cvs/extras/rpms/hugs98/FC-5/hugs98.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hugs98.spec	21 Apr 2006 18:29:35 -0000	1.2
+++ hugs98.spec	24 Apr 2006 03:25:49 -0000	1.3
@@ -8,7 +8,7 @@
 Group:		Development/Languages
 License:	BSD
 URL:		http://www.haskell.org/hugs
-Source0:	http://cvs.haskell.org/Hugs/downloads/Mar2005/hugs98-Mar2005-patched.tar.gz
+Source0:	http://cvs.haskell.org/Hugs/downloads/Mar2005/%{name}-%{hugs_ver}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	docbook-utils



From fedora-extras-commits at redhat.com  Mon Apr 24 06:19:55 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Sun, 23 Apr 2006 23:19:55 -0700
Subject: rpms/fbida/FC-3 CVE-2006-1695-fbgs.mktemp.patch, NONE,
	1.1 fbida.spec, 1.5, 1.6
Message-ID: <200604240619.k3O6JvPo011281@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/fbida/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11261

Modified Files:
	fbida.spec 
Added Files:
	CVE-2006-1695-fbgs.mktemp.patch 
Log Message:
* Mon Apr 24 2006 Adrian Reber <adrian at lisas.de> - 2.03-4
- security fix for #189721


CVE-2006-1695-fbgs.mktemp.patch:

--- NEW FILE CVE-2006-1695-fbgs.mktemp.patch ---
diff -ru fbida-2.01.orig/fbgs fbida-2.01/fbgs
--- fbida-2.01.orig/fbgs	2004-03-28 13:32:16.000000000 +0200
+++ fbida-2.01/fbgs	2006-04-08 02:49:37.000000000 +0200
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 # tmp dir
-DIR="${TMPDIR-/var/tmp}/fbps-$$"
-mkdir -p $DIR	|| exit 1
+DIR=`mktemp -dtp /tmp fbgs-XXXXXX`
+[ -d $DIR ]  || exit 1
 trap "rm -rf $DIR" EXIT
 
 # parse options


Index: fbida.spec
===================================================================
RCS file: /cvs/extras/rpms/fbida/FC-3/fbida.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fbida.spec	21 Feb 2005 17:19:10 -0000	1.5
+++ fbida.spec	24 Apr 2006 06:19:55 -0000	1.6
@@ -1,13 +1,12 @@
-# $Id$
-
 Summary:        FrameBuffer Imageviewer
 Name:           fbida
 Version:        2.03
-Release:        3
+Release:        4%{?dist}
 License:        GPL
 Group:          Applications/Multimedia
 URL:            http://linux.bytesex.org/fbida/
 Source:         http://dl.bytesex.org/releases/fbida/fbida-2.03.tar.gz
+Patch:          CVE-2006-1695-fbgs.mktemp.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libexif-devel fontconfig-devel libjpeg-devel
 BuildRequires:  libpng-devel libtiff-devel pkgconfig
@@ -39,6 +38,7 @@
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 LIB=%{_lib} prefix=%{_prefix} CFLAGS=$RPM_OPT_FLAGS %{__make} %{?_smp_mflags}
@@ -78,6 +78,9 @@
 %{_bindir}/fbgs
 
 %changelog
+* Mon Apr 24 2006 Adrian Reber <adrian at lisas.de> - 2.03-4
+- security fix for #189721
+
 * Mon Feb 21 2005 Thorsten Leemhuis <fedora at leemhuis dot info> - 2.03-3
 - Fix typo; must be LIB=%%{_lib}; really fixes x86_64
 



From fedora-extras-commits at redhat.com  Mon Apr 24 06:21:52 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Sun, 23 Apr 2006 23:21:52 -0700
Subject: rpms/fbida/FC-3 fbida.CVE-2006-1695.patch, NONE, 1.1 fbida.spec, 1.6,
	1.7 CVE-2006-1695-fbgs.mktemp.patch, 1.1, NONE
Message-ID: <200604240621.k3O6Lsot011319@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/fbida/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11299

Modified Files:
	fbida.spec 
Added Files:
	fbida.CVE-2006-1695.patch 
Removed Files:
	CVE-2006-1695-fbgs.mktemp.patch 
Log Message:
doing some renaming


fbida.CVE-2006-1695.patch:

--- NEW FILE fbida.CVE-2006-1695.patch ---
diff -ru fbida-2.01.orig/fbgs fbida-2.01/fbgs
--- fbida-2.01.orig/fbgs	2004-03-28 13:32:16.000000000 +0200
+++ fbida-2.01/fbgs	2006-04-08 02:49:37.000000000 +0200
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 # tmp dir
-DIR="${TMPDIR-/var/tmp}/fbps-$$"
-mkdir -p $DIR	|| exit 1
+DIR=`mktemp -dtp /tmp fbgs-XXXXXX`
+[ -d $DIR ]  || exit 1
 trap "rm -rf $DIR" EXIT
 
 # parse options


Index: fbida.spec
===================================================================
RCS file: /cvs/extras/rpms/fbida/FC-3/fbida.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fbida.spec	24 Apr 2006 06:19:55 -0000	1.6
+++ fbida.spec	24 Apr 2006 06:21:52 -0000	1.7
@@ -6,7 +6,7 @@
 Group:          Applications/Multimedia
 URL:            http://linux.bytesex.org/fbida/
 Source:         http://dl.bytesex.org/releases/fbida/fbida-2.03.tar.gz
-Patch:          CVE-2006-1695-fbgs.mktemp.patch
+Patch:          fbida.CVE-2006-1695.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libexif-devel fontconfig-devel libjpeg-devel
 BuildRequires:  libpng-devel libtiff-devel pkgconfig


--- CVE-2006-1695-fbgs.mktemp.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Apr 24 06:30:07 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Sun, 23 Apr 2006 23:30:07 -0700
Subject: rpms/fbida/FC-4 fbida.CVE-2006-1695.patch, NONE, 1.1 fbida.spec, 1.8,
	1.9
Message-ID: <200604240630.k3O6U9WM011411@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/fbida/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11391

Modified Files:
	fbida.spec 
Added Files:
	fbida.CVE-2006-1695.patch 
Log Message:
* Mon Apr 24 2006 Adrian Reber <adrian at lisas.de> - 2.03-6
- security fix for #189721


fbida.CVE-2006-1695.patch:

--- NEW FILE fbida.CVE-2006-1695.patch ---
diff -ru fbida-2.01.orig/fbgs fbida-2.01/fbgs
--- fbida-2.01.orig/fbgs	2004-03-28 13:32:16.000000000 +0200
+++ fbida-2.01/fbgs	2006-04-08 02:49:37.000000000 +0200
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 # tmp dir
-DIR="${TMPDIR-/var/tmp}/fbps-$$"
-mkdir -p $DIR	|| exit 1
+DIR=`mktemp -dtp /tmp fbgs-XXXXXX`
+[ -d $DIR ]  || exit 1
 trap "rm -rf $DIR" EXIT
 
 # parse options


Index: fbida.spec
===================================================================
RCS file: /cvs/extras/rpms/fbida/FC-4/fbida.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fbida.spec	10 May 2005 07:08:12 -0000	1.8
+++ fbida.spec	24 Apr 2006 06:30:07 -0000	1.9
@@ -1,11 +1,12 @@
 Summary:        FrameBuffer Imageviewer
 Name:           fbida
 Version:        2.03
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        GPL
 Group:          Applications/Multimedia
 URL:            http://linux.bytesex.org/fbida/
 Source:         http://dl.bytesex.org/releases/fbida/fbida-2.03.tar.gz
+Patch:          fbida.CVE-2006-1695.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libexif-devel fontconfig-devel libjpeg-devel
 BuildRequires:  libpng-devel libtiff-devel pkgconfig
@@ -37,6 +38,7 @@
 
 %prep
 %setup -q
+%patch -p1
 %{__sed} -i -e "s,(INSTALL) -s,(INSTALL) ," mk/Variables.mk
 
 %build
@@ -77,6 +79,9 @@
 %{_bindir}/fbgs
 
 %changelog
+* Mon Apr 24 2006 Adrian Reber <adrian at lisas.de> - 2.03-6
+- security fix for #189721
+
 * Tue May 10 2005 Adrian Reber <adrian at lisas.de> - 2.03-5
 - fix debuginfo subpackage creation
 



From fedora-extras-commits at redhat.com  Mon Apr 24 06:35:12 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Sun, 23 Apr 2006 23:35:12 -0700
Subject: rpms/fbida/FC-5 fbida.CVE-2006-1695.patch, NONE, 1.1 fbida.spec,
	1.13, 1.14
Message-ID: <200604240635.k3O6ZFad011505@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/fbida/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11485

Modified Files:
	fbida.spec 
Added Files:
	fbida.CVE-2006-1695.patch 
Log Message:
* Mon Apr 24 2006 Adrian Reber <adrian at lisas.de> - 2.03-11
- security fix for #189721


fbida.CVE-2006-1695.patch:

--- NEW FILE fbida.CVE-2006-1695.patch ---
diff -ru fbida-2.01.orig/fbgs fbida-2.01/fbgs
--- fbida-2.01.orig/fbgs	2004-03-28 13:32:16.000000000 +0200
+++ fbida-2.01/fbgs	2006-04-08 02:49:37.000000000 +0200
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 # tmp dir
-DIR="${TMPDIR-/var/tmp}/fbps-$$"
-mkdir -p $DIR	|| exit 1
+DIR=`mktemp -dtp /tmp fbgs-XXXXXX`
+[ -d $DIR ]  || exit 1
 trap "rm -rf $DIR" EXIT
 
 # parse options


Index: fbida.spec
===================================================================
RCS file: /cvs/extras/rpms/fbida/FC-5/fbida.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fbida.spec	13 Feb 2006 21:01:11 -0000	1.13
+++ fbida.spec	24 Apr 2006 06:35:12 -0000	1.14
@@ -1,11 +1,12 @@
 Summary:        FrameBuffer Imageviewer
 Name:           fbida
 Version:        2.03
-Release:        10%{?dist}
+Release:        11%{?dist}
 License:        GPL
 Group:          Applications/Multimedia
 URL:            http://linux.bytesex.org/fbida/
 Source:         http://dl.bytesex.org/releases/fbida/fbida-2.03.tar.gz
+Patch:          fbida.CVE-2006-1695.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libexif-devel fontconfig-devel libjpeg-devel
 BuildRequires:  libpng-devel libtiff-devel pkgconfig
@@ -38,6 +39,7 @@
 
 %prep
 %setup -q
+%patch -p1
 %{__sed} -i -e "s,(INSTALL) -s,(INSTALL) ," mk/Variables.mk
 %{__sed} -i -e "s,/X11R6,,g" GNUmakefile
 %{__sed} -i -e "s,/usr/X11R6/lib/X11,%{_datadir}/X11,g" mk/Autoconf.mk
@@ -80,6 +82,9 @@
 %{_bindir}/fbgs
 
 %changelog
+* Mon Apr 24 2006 Adrian Reber <adrian at lisas.de> - 2.03-11
+- security fix for #189721
+
 * Mon Feb 13 2006 Adrian Reber <adrian at lisas.de> - 2.03-10
 - rebuilt
 



From fedora-extras-commits at redhat.com  Mon Apr 24 06:49:04 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Sun, 23 Apr 2006 23:49:04 -0700
Subject: rpms/fbida/devel fbida.CVE-2006-1695.patch, NONE, 1.1 fbida.spec,
	1.13, 1.14
Message-ID: <200604240649.k3O6n6m7011604@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/fbida/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11584

Modified Files:
	fbida.spec 
Added Files:
	fbida.CVE-2006-1695.patch 
Log Message:
* Mon Apr 24 2006 Adrian Reber <adrian at lisas.de> - 2.03-11
- security fix for #189721


fbida.CVE-2006-1695.patch:

--- NEW FILE fbida.CVE-2006-1695.patch ---
diff -ru fbida-2.01.orig/fbgs fbida-2.01/fbgs
--- fbida-2.01.orig/fbgs	2004-03-28 13:32:16.000000000 +0200
+++ fbida-2.01/fbgs	2006-04-08 02:49:37.000000000 +0200
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 # tmp dir
-DIR="${TMPDIR-/var/tmp}/fbps-$$"
-mkdir -p $DIR	|| exit 1
+DIR=`mktemp -dtp /tmp fbgs-XXXXXX`
+[ -d $DIR ]  || exit 1
 trap "rm -rf $DIR" EXIT
 
 # parse options


Index: fbida.spec
===================================================================
RCS file: /cvs/extras/rpms/fbida/devel/fbida.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fbida.spec	13 Feb 2006 21:01:11 -0000	1.13
+++ fbida.spec	24 Apr 2006 06:49:04 -0000	1.14
@@ -1,11 +1,12 @@
 Summary:        FrameBuffer Imageviewer
 Name:           fbida
 Version:        2.03
-Release:        10%{?dist}
+Release:        11%{?dist}
 License:        GPL
 Group:          Applications/Multimedia
 URL:            http://linux.bytesex.org/fbida/
 Source:         http://dl.bytesex.org/releases/fbida/fbida-2.03.tar.gz
+Patch:          fbida.CVE-2006-1695.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libexif-devel fontconfig-devel libjpeg-devel
 BuildRequires:  libpng-devel libtiff-devel pkgconfig
@@ -38,6 +39,7 @@
 
 %prep
 %setup -q
+%patch -p1
 %{__sed} -i -e "s,(INSTALL) -s,(INSTALL) ," mk/Variables.mk
 %{__sed} -i -e "s,/X11R6,,g" GNUmakefile
 %{__sed} -i -e "s,/usr/X11R6/lib/X11,%{_datadir}/X11,g" mk/Autoconf.mk
@@ -80,6 +82,9 @@
 %{_bindir}/fbgs
 
 %changelog
+* Mon Apr 24 2006 Adrian Reber <adrian at lisas.de> - 2.03-11
+- security fix for #189721
+
 * Mon Feb 13 2006 Adrian Reber <adrian at lisas.de> - 2.03-10
 - rebuilt
 



From fedora-extras-commits at redhat.com  Mon Apr 24 07:38:39 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon, 24 Apr 2006 00:38:39 -0700
Subject: fedora-security/audit fc4,1.209,1.210 fc5,1.122,1.123
Message-ID: <200604240738.k3O7cd6v013918@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13898

Modified Files:
	fc4 fc5 
Log Message:
Some updates from my mailbox, still to deal with
Fedora Core 5 Update: beagle-0.2.4-1.f
Fedora Core 5 Update: gtkhtml3-3.10.1
Fedora Core 4 Update: kdegraphics-3.5.
Fedora Core 5 Update: kdegraphics-3.5.
[SECURITY] Fedora Core 5 Update: gdm-2
[SECURITY] Fedora Core 5 Update: beagl



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- fc4	21 Apr 2006 11:13:16 -0000	1.209
+++ fc4	24 Apr 2006 07:38:36 -0000	1.210
@@ -3,48 +3,48 @@
 
 ** are items that need attention
 
-CVE-2006-1790 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1790 version (firefox, fixed 1.0.8) [since FEDORA-2006-410]
 CVE-2006-1790 VULNERABLE (thunderbird, fixed 1.0.8)
 CVE-2006-1790 VULNERABLE (mozilla, fixed 1.7.13)
 CVE-2006-1742 VULNERABLE (thunderbird, fixed 1.0.8)
 CVE-2006-1742 VULNERABLE (mozilla, fixed 1.7.13)
-CVE-2006-1742 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1742 version (firefox, fixed 1.0.8) [since FEDORA-2006-410]
 CVE-2006-1741 VULNERABLE (thunderbird, fixed 1.0.8)
 CVE-2006-1741 VULNERABLE (mozilla, fixed 1.7.13)
-CVE-2006-1741 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1741 version (firefox, fixed 1.0.8) [since FEDORA-2006-410]
 CVE-2006-1740 VULNERABLE (mozilla, fixed 1.7.13)
-CVE-2006-1740 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1740 version (firefox, fixed 1.0.8) [since FEDORA-2006-410]
 CVE-2006-1739 VULNERABLE (thunderbird, fixed 1.0.8)
 CVE-2006-1739 VULNERABLE (mozilla, fixed 1.7.13)
-CVE-2006-1739 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1739 version (firefox, fixed 1.0.8) [since FEDORA-2006-410]
 CVE-2006-1738 VULNERABLE (thunderbird, fixed 1.0.8)
 CVE-2006-1738 VULNERABLE (mozilla, fixed 1.7.13)
-CVE-2006-1738 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1738 version (firefox, fixed 1.0.8) [since FEDORA-2006-410]
 CVE-2006-1737 VULNERABLE (thunderbird, fixed 1.0.8)
 CVE-2006-1737 VULNERABLE (mozilla, fixed 1.7.13)
-CVE-2006-1737 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1737 version (firefox, fixed 1.0.8) [since FEDORA-2006-410]
 CVE-2006-1736 VULNERABLE (mozilla, fixed 1.7.13)
 CVE-2006-1736 VULNERABLE (firefox, fixed 1.0.8)
 CVE-2006-1735 VULNERABLE (mozilla, fixed 1.7.13)
 CVE-2006-1735 VULNERABLE (thunderbird, fixed 1.0.8)
-CVE-2006-1735 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1735 version (firefox, fixed 1.0.8) [since FEDORA-2006-410]
 CVE-2006-1734 VULNERABLE (mozilla, fixed 1.7.13)
 CVE-2006-1734 VULNERABLE (thunderbird, fixed 1.0.8)
-CVE-2006-1734 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1734 version (firefox, fixed 1.0.8) [since FEDORA-2006-410]
 CVE-2006-1733 VULNERABLE (mozilla, fixed 1.7.13)
 CVE-2006-1733 VULNERABLE (thunderbird, fixed 1.0.8)
-CVE-2006-1733 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1733 version (firefox, fixed 1.0.8) [since FEDORA-2006-410]
 CVE-2006-1732 VULNERABLE (mozilla, fixed 1.7.13)
 CVE-2006-1732 VULNERABLE (thunderbird, fixed 1.0.8)
-CVE-2006-1732 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1732 version (firefox, fixed 1.0.8) [since FEDORA-2006-410]
 CVE-2006-1731 VULNERABLE (mozilla, fixed 1.7.13)
 CVE-2006-1731 VULNERABLE (thunderbird, fixed 1.0.8)
-CVE-2006-1731 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1731 version (firefox, fixed 1.0.8) [since FEDORA-2006-410]
 CVE-2006-1730 VULNERABLE (mozilla, fixed 1.7.13)
 CVE-2006-1730 VULNERABLE (thunderbird, fixed 1.0.8)
-CVE-2006-1730 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1730 version (firefox, fixed 1.0.8) [since FEDORA-2006-410]
 CVE-2006-1729 VULNERABLE (mozilla, fixed 1.7.13)
-CVE-2006-1729 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1729 version (firefox, fixed 1.0.8) [since FEDORA-2006-410]
 CVE-2006-1728 VULNERABLE (thunderbird, fixed 1.0.8)
 CVE-2006-1728 VULNERABLE (mozilla, fixed 1.7.13)
 CVE-2006-1728 VULNERABLE (firefox, fixed 1.0.8)
@@ -56,7 +56,7 @@
 CVE-2006-1725 version (firefox, fixed 1.5.0.2) 1.5 only
 CVE-2006-1724 VULNERABLE (thunderbird, fixed 1.0.8)
 CVE-2006-1724 VULNERABLE (mozilla, fixed 1.7.13)
-CVE-2006-1724 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1724 version (firefox, fixed 1.0.8) [since FEDORA-2006-410]
 CVE-2006-1723 VULNERABLE (thunderbird, fixed 1.0.8)
 CVE-2006-1723 VULNERABLE (firefox, fixed 1.0.8)
 CVE-2006-1721 ** cyrus-sasl
@@ -108,7 +108,7 @@
 CVE-2006-0836 version (thunderbird, 1.5 only)
 CVE-2006-0749 VULNERABLE (thunderbird, fixed 1.0.8)
 CVE-2006-0749 VULNERABLE (mozilla, fixed 1.7.13)
-CVE-2006-0749 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-0749 version (firefox, fixed 1.0.8) [since FEDORA-2006-410]
 CVE-2006-0748 VULNERABLE (thunderbird, fixed 1.0.8)
 CVE-2006-0748 VULNERABLE (mozilla, fixed 1.7.13)
 CVE-2006-0748 VULNERABLE (firefox, fixed 1.0.8)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- fc5	21 Apr 2006 09:59:27 -0000	1.122
+++ fc5	24 Apr 2006 07:38:36 -0000	1.123
@@ -3,60 +3,60 @@
 
 ** are items that need attention
 
-CVE-2006-1790 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1790 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1790 VULNERABLE (thunderbird, fixed 1.5.0.2)
 CVE-2006-1790 VULNERABLE (mozilla, fixed 1.7.13)
 CVE-2006-1742 VULNERABLE (thunderbird, fixed 1.5.0.2)
 CVE-2006-1742 VULNERABLE (mozilla, fixed 1.7.13)
-CVE-2006-1742 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1742 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1741 VULNERABLE (thunderbird, fixed 1.5.0.2)
 CVE-2006-1741 VULNERABLE (mozilla, fixed 1.7.13)
-CVE-2006-1741 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1741 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1740 VULNERABLE (mozilla, fixed 1.7.13)
-CVE-2006-1740 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1740 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1739 VULNERABLE (thunderbird, fixed 1.5.0.2)
 CVE-2006-1739 VULNERABLE (mozilla, fixed 1.7.13)
-CVE-2006-1739 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1739 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1738 VULNERABLE (thunderbird, fixed 1.5.0.2)
 CVE-2006-1738 VULNERABLE (mozilla, fixed 1.7.13)
-CVE-2006-1738 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1738 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1737 VULNERABLE (thunderbird, fixed 1.5.0.2)
 CVE-2006-1737 VULNERABLE (mozilla, fixed 1.7.13)
-CVE-2006-1737 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1737 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1736 VULNERABLE (mozilla, fixed 1.7.13)
 CVE-2006-1736 VULNERABLE (firefox, fixed 1.5.0.2)
 CVE-2006-1735 VULNERABLE (mozilla, fixed 1.7.13)
 CVE-2006-1735 VULNERABLE (thunderbird, fixed 1.5.0.2)
-CVE-2006-1735 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1735 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1734 VULNERABLE (mozilla, fixed 1.7.13)
 CVE-2006-1734 VULNERABLE (thunderbird, fixed 1.5.0.2)
-CVE-2006-1734 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1734 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1733 VULNERABLE (mozilla, fixed 1.7.13)
 CVE-2006-1733 VULNERABLE (thunderbird, fixed 1.5.0.2)
-CVE-2006-1733 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1733 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1732 VULNERABLE (mozilla, fixed 1.7.13)
 CVE-2006-1732 VULNERABLE (thunderbird, fixed 1.5.0.2)
-CVE-2006-1732 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1732 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1731 VULNERABLE (mozilla, fixed 1.7.13)
 CVE-2006-1731 VULNERABLE (thunderbird, fixed 1.5.0.2)
-CVE-2006-1731 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1731 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1730 VULNERABLE (mozilla, fixed 1.7.13)
 CVE-2006-1730 VULNERABLE (thunderbird, fixed 1.5.0.2)
-CVE-2006-1730 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1730 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1729 VULNERABLE (mozilla, fixed 1.7.13)
-CVE-2006-1729 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1729 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1728 VULNERABLE (thunderbird, fixed 1.5.0.2)
 CVE-2006-1728 VULNERABLE (mozilla, fixed 1.7.13)
-CVE-2006-1728 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1728 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1727 VULNERABLE (thunderbird, fixed 1.5.0.2)
 CVE-2006-1727 VULNERABLE (mozilla, fixed 1.7.13)
-CVE-2006-1727 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1727 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1726 VULNERABLE (firefox, fixed 1.5.0.2)
 CVE-2006-1726 VULNERABLE (thunderbird, fixed 1.5.0.2)
 CVE-2006-1725 VULNERABLE (firefox, fixed 1.5.0.2)
 CVE-2006-1724 VULNERABLE (thunderbird, fixed 1.5.0.2)
 CVE-2006-1724 VULNERABLE (mozilla, fixed 1.7.13)
-CVE-2006-1724 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1724 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1723 VULNERABLE (thunderbird, fixed 1.5.0.2)
 CVE-2006-1723 VULNERABLE (firefox, fixed 1.5.0.2)
 CVE-2006-1721 ** cyrus-sasl
@@ -109,7 +109,7 @@
 CVE-2006-0836 VULNERABLE (thunderbird)
 CVE-2006-0749 VULNERABLE (thunderbird, fixed 1.5.0.2)
 CVE-2006-0749 VULNERABLE (mozilla, fixed 1.7.13)
-CVE-2006-0749 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-0749 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-0748 VULNERABLE (thunderbird, fixed 1.5.0.2)
 CVE-2006-0748 VULNERABLE (mozilla, fixed 1.7.13)
 CVE-2006-0748 VULNERABLE (firefox, fixed 1.5.0.2)



From fedora-extras-commits at redhat.com  Mon Apr 24 07:46:19 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon, 24 Apr 2006 00:46:19 -0700
Subject: fedora-security/audit fc4,1.210,1.211 fc5,1.123,1.124
Message-ID: <200604240746.k3O7kJ89014008@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13988

Modified Files:
	fc4 fc5 
Log Message:
Catch up with new CVEs



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- fc4	24 Apr 2006 07:38:36 -0000	1.210
+++ fc4	24 Apr 2006 07:46:17 -0000	1.211
@@ -1,8 +1,11 @@
-Up to date CVE as of CVE email 20060414
+Up to date CVE as of CVE email 20060423
 Up to date FC4 as of 20060420
 
 ** are items that need attention
 
+CVE-2006-1942 ** firefox
+CVE-2006-1931 ** ruby
+CVE-2006-1902 ignore (gcc) not a vulnerability
 CVE-2006-1790 version (firefox, fixed 1.0.8) [since FEDORA-2006-410]
 CVE-2006-1790 VULNERABLE (thunderbird, fixed 1.0.8)
 CVE-2006-1790 VULNERABLE (mozilla, fixed 1.7.13)
@@ -848,6 +851,7 @@
 CVE-2005-0004 version (mysql, fixed 4.1.10)
 CVE-2005-0003 version (kernel, fixed 2.6.10)
 CVE-2005-0001 version (kernel, fixed 2.6.10)
+CVE-2004-2657 ** firefox
 CVE-2004-2655 version (xscreensaver)
 CVE-2004-2654 version (squid, fixed 2.6STABLE6)
 CVE-2004-2607 version (kernel, fixed 2.6.5)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- fc5	24 Apr 2006 07:38:36 -0000	1.123
+++ fc5	24 Apr 2006 07:46:17 -0000	1.124
@@ -1,8 +1,12 @@
-Up to date CVE as of CVE email 20060414
+Up to date CVE as of CVE email 20060423
 Up to date FC5 as of 20060419
 
 ** are items that need attention
 
+CVE-2006-1942 ** firefox
+CVE-2006-1931 ** ruby
+CVE-2006-1902 ignore (gcc) not a vulnerability
+CVE-2006-1865 version (beagle, fixed 0.2.5) [since FEDORA-2006-440]
 CVE-2006-1790 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1790 VULNERABLE (thunderbird, fixed 1.5.0.2)
 CVE-2006-1790 VULNERABLE (mozilla, fixed 1.7.13)
@@ -847,6 +851,7 @@
 CVE-2005-0004 version (mysql, fixed 4.1.10)
 CVE-2005-0003 version (kernel, fixed 2.6.10)
 CVE-2005-0001 version (kernel, fixed 2.6.10)
+CVE-2004-2657 ** firefox
 CVE-2004-2655 version (xscreensaver)
 CVE-2004-2654 version (squid, fixed 2.6STABLE6)
 CVE-2004-2607 version (kernel, fixed 2.6.5)



From fedora-extras-commits at redhat.com  Mon Apr 24 08:05:45 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon, 24 Apr 2006 01:05:45 -0700
Subject: fedora-security/audit fc5,1.124,1.125
Message-ID: <200604240805.k3O85jFB016185@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16165

Modified Files:
	fc5 
Log Message:
Deal with the beagle; check that the fix for CVE-2006-1296 made it upstream
(it did, in 0.2.4)



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- fc5	24 Apr 2006 07:46:17 -0000	1.124
+++ fc5	24 Apr 2006 08:05:43 -0000	1.125
@@ -90,7 +90,7 @@
 CVE-2006-1343 VULNERABLE (kernel)
 CVE-2006-1342 version (kernel, not 2.6) not vulnerable
 CVE-2006-1335 version (gnome-screensaver, fixed 2.14)
-CVE-2006-1296 backport (beagle) bz#185981 [since FEDORA-2006-188]
+CVE-2006-1296 version (beagle, fixed 0.2.4) bz#185981 [since FEDORA-2006-305] was backport since FEDORA-2006-188
 CVE-2006-1273 ignore (firefox) this issue only affects IE
 CVE-2006-1244 ignore (xpdf) duplicate of other cve named issues
 CVE-2006-1242 VULNERABLE (kernel)



From fedora-extras-commits at redhat.com  Mon Apr 24 08:17:34 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon, 24 Apr 2006 01:17:34 -0700
Subject: fedora-security/audit fc4,1.211,1.212 fc5,1.125,1.126
Message-ID: <200604240817.k3O8HYKs016228@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16208

Modified Files:
	fc4 fc5 
Log Message:
Finish off my fc4/fc5 catchup, check in the source that kdegraphics 3.5.2
fixed this cve upstream now (it does)



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- fc4	24 Apr 2006 07:46:17 -0000	1.211
+++ fc4	24 Apr 2006 08:17:31 -0000	1.212
@@ -1,5 +1,5 @@
 Up to date CVE as of CVE email 20060423
-Up to date FC4 as of 20060420
+Up to date FC4 as of 20060423
 
 ** are items that need attention
 
@@ -99,6 +99,7 @@
 CVE-2006-1061 version (curl, 7.15.0 - 7.15.2 only)
 CVE-2006-1059 version (samba)
 CVE-2006-1058 VULNERABLE (busybox) bz#187386
+CVE-2006-1057 VULNERABLE (gdm, fixed 2.14.1) bz#188303
 CVE-2006-1056 version (kernel, fixed 2.6.16.9) [since FEDORA-2006-423]
 CVE-2006-1055 version (kernel, fixed 2.6.17-rc1) [since FEDORA-2006-423]
 CVE-2006-1052 version (kernel, fixed 2.6.16) patch-2.6.16-rc6 [since FEDORA-2006-245]
@@ -144,7 +145,7 @@
 CVE-2006-0321 version (fetchmail, fixed 6.3.2) 6.3.X only affected
 CVE-2006-0301 version (poppler, fixed 0.4.5) [since FEDORA-2006-103]
 CVE-2006-0301 backport (xpdf) [since FEDORA-2006-104]
-CVE-2006-0301 backport (kdegraphics) [since FEDORA-2006-105]
+CVE-2006-0301 version (kdegraphics, fixed 3.5.2) [since FEDORA-2006-385] was backport since FEDORA-2006-105
 CVE-2006-0300 VULNERABLE (tar) bz#181773
 CVE-2006-0299 version (thunderbird, 1.5 only)
 CVE-2006-0299 version (mozilla, 1.8 branch only)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- fc5	24 Apr 2006 08:05:43 -0000	1.125
+++ fc5	24 Apr 2006 08:17:31 -0000	1.126
@@ -1,5 +1,5 @@
 Up to date CVE as of CVE email 20060423
-Up to date FC5 as of 20060419
+Up to date FC5 as of 20060423
 
 ** are items that need attention
 
@@ -101,6 +101,7 @@
 CVE-2006-1061 backport (curl, fixed 7.15.3) [since FEDORA-2006-189]
 CVE-2006-1059 version (samba, fixed 3.0.22 at least) bz#187170 [since FEDORA-2006-259]
 CVE-2006-1058 VULNERABLE (busybox) bz#187386
+CVE-2006-1057 version (gdm, fixed 2.14.1) bz#188303 [since FEDORA-2006-338]
 CVE-2006-1056 version (kernel, fixed 2.6.16.9) [since FEDORA-2006-421]
 CVE-2006-1055 version (kernel, fixed 2.6.17-rc1) [since FEDORA-2006-421]
 CVE-2006-1052 version (kernel, fixed 2.6.16) patch-2.6.16-rc6 [since FEDORA-2006-233]
@@ -146,7 +147,7 @@
 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 backport (kdegraphics) post-3.5.1-kdegraphics-CVE-2006-0301.diff
+CVE-2006-0301 version (kdegraphics, fixed 3.5.2) [since FEDORA-2006-352] was backport since GA
 CVE-2006-0300 VULNERABLE (tar) [fixed rawhide in tar-1.15.1-13]
 CVE-2006-0299 version (thunderbird, fixed 1.5)
 CVE-2006-0299 version (mozilla, 1.8 branch only)
@@ -189,7 +190,7 @@
 CVE-2006-0058 version (sendmail, fixed 8.13.6) [since FEDORA-2006-193]
 CVE-2006-0052 version (mailman, fixed 2.1.6)
 CVE-2006-0049 version (gnupg, fixed 1.4.2.2)
-CVE-2006-0040 VULNERABLE (gtkhtml) no upstream fix
+CVE-2006-0040 ** VULNERABLE (gtkhtml) no upstream fix
 CVE-2006-0037 version (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 [since FEDORA-2006-233]
 CVE-2006-0036 version (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 [since FEDORA-2006-233]
 CVE-2006-0035 version (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 [since FEDORA-2006-233]



From fedora-extras-commits at redhat.com  Mon Apr 24 08:26:06 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon, 24 Apr 2006 01:26:06 -0700
Subject: fedora-security/audit fc4,1.212,1.213 fc5,1.126,1.127
Message-ID: <200604240826.k3O8Q6kd016267@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16247

Modified Files:
	fc4 fc5 
Log Message:
Few minor corrections



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- fc4	24 Apr 2006 08:17:31 -0000	1.212
+++ fc4	24 Apr 2006 08:26:03 -0000	1.213
@@ -102,7 +102,7 @@
 CVE-2006-1057 VULNERABLE (gdm, fixed 2.14.1) bz#188303
 CVE-2006-1056 version (kernel, fixed 2.6.16.9) [since FEDORA-2006-423]
 CVE-2006-1055 version (kernel, fixed 2.6.17-rc1) [since FEDORA-2006-423]
-CVE-2006-1052 version (kernel, fixed 2.6.16) patch-2.6.16-rc6 [since FEDORA-2006-245]
+CVE-2006-1052 version (kernel, fixed 2.6.16) [since FEDORA-2006-423] was backport since FEDORA-2006-245
 CVE-2006-1045 VULNERABLE (thunderbird)
 CVE-2006-1015 ignore (php) safe mode isn't safe
 CVE-2006-1014 ignore (php) safe mode isn't safe
@@ -138,7 +138,7 @@
 CVE-2006-0459 version (flex) by inspection
 CVE-2006-0457 version (kernel, fixed 2.6.15.5) [since FEDORA-2006-245] was backport since FEDORA-2006-131
 CVE-2006-0455 version (gnupg, fixed 1.4.2.1) [since FEDORA-2006-116]
-CVE-2006-0454 version (kernel, fixed 2.6.15.3) [since FEDORA-2006-102] patch-2.6.15.3
+CVE-2006-0454 version (kernel, fixed 2.6.15.3) [since FEDORA-2006-423] was backport since FEDORA-2006-102
 CVE-2006-0405 version (libtiff, 3.8.0 only)
 CVE-2006-0377 version (squirrelmail, fixed 1.4.6) [since FEDORA-2006-133]
 CVE-2006-0369 ignore (mysql) this is not a security issue
@@ -590,8 +590,8 @@
 CVE-2005-1268 backport (httpd) [since FEDORA-2005-639]
 CVE-2005-1267 backport (tcpdump) [since FEDORA-2005-407]
 CVE-2005-1266 version (spamassassin, fixed 3.0.4) [since FEDORA-2005-428]
-CVE-2005-1265 version (kernel, fixed 2.6.12-rc5) [since FEDORA-2005-510] was backport
-CVE-2005-1264 version (kernel, fixed 2.6.11.10) [since FEDORA-2005-510] was backport (..12-rc4-git5 since re0522.0)
+CVE-2005-1265 version (kernel, fixed 2.6.12-rc5) [since FEDORA-2005-510] was backport since GA
+CVE-2005-1264 version (kernel, fixed 2.6.11.10) [since FEDORA-2005-510] was backport since GA
 CVE-2005-1263 version (kernel) [since FEDORA-2005-510] was patch-2.6.12-rc4-git5 since re0522.0
 CVE-2005-1262 version (gaim, fixed 1.3.0) [since re0522.0]
 CVE-2005-1261 version (gaim, fixed 1.3.0) [since re0522.0]
@@ -660,9 +660,9 @@
 CVE-2005-0758 version (gzip, fixed 1.3.5)
 CVE-2005-0758 VULNERABLE (bzip2) by inspection bz#159819
 CVE-2005-0757 version (kernel, not 2.6)
-CVE-2005-0756 version (kernel, fixed 2.6.12) [since FEDORA-2005-510] was backport in patch-2.6.12-rc5
+CVE-2005-0756 version (kernel, fixed 2.6.12) [since FEDORA-2005-510] was backport since GA
 CVE-2005-0755 version (HelixPlayer, fixed 10.0.4)
-CVE-2005-0754 version (kdewebdev, fixed after 3.4.0) [since FEDORA-2005-437] was backport....4.0-CAN-2005-0754.patch
+CVE-2005-0754 version (kdewebdev, fixed after 3.4.0) [since FEDORA-2005-437] was backport since GA
 CVE-2005-0753 backport (cvs, fixed 1.12.12) in cvs-1.11.17-CAN-2005-0753.patch
 CVE-2005-0752 version (firefox, fixed 1.0.3)
 CVE-2005-0750 version (kernel, fixed 2.6.11.6) was backport in patch-2.6.12-rc3


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- fc5	24 Apr 2006 08:17:31 -0000	1.126
+++ fc5	24 Apr 2006 08:26:03 -0000	1.127
@@ -104,7 +104,7 @@
 CVE-2006-1057 version (gdm, fixed 2.14.1) bz#188303 [since FEDORA-2006-338]
 CVE-2006-1056 version (kernel, fixed 2.6.16.9) [since FEDORA-2006-421]
 CVE-2006-1055 version (kernel, fixed 2.6.17-rc1) [since FEDORA-2006-421]
-CVE-2006-1052 version (kernel, fixed 2.6.16) patch-2.6.16-rc6 [since FEDORA-2006-233]
+CVE-2006-1052 version (kernel, fixed 2.6.16) [since FEDORA-2006-421] was patch-2.6.16-rc6 since FEDORA-2006-233
 CVE-2006-1045 VULNERABLE (thunderbird)
 CVE-2006-1015 ignore (php) safe mode isn't safe
 CVE-2006-1014 ignore (php) safe mode isn't safe



From fedora-extras-commits at redhat.com  Mon Apr 24 08:34:21 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Apr 2006 01:34:21 -0700
Subject: rpms/ghc/FC-4 .cvsignore,1.5,1.6 ghc.spec,1.7,1.8 sources,1.5,1.6
Message-ID: <200604240834.k3O8YNQ8016325@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16295

Modified Files:
	.cvsignore ghc.spec sources 
Log Message:
sync with fe5:
- update to 6.4.2 release
- make ghc-doc require ghc (Michel Salim, #180449)
- turn on build_doc since haddock is now in Extras
- no longer specify ghc version to build with (Ville Skytta, #170176)
: ----------------------------------------------------------------------



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghc/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Sep 2005 23:50:02 -0000	1.5
+++ .cvsignore	24 Apr 2006 08:34:21 -0000	1.6
@@ -1 +1 @@
-ghc-6.4.1-src.tar.bz2
+ghc-6.4.2-src.tar.bz2


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/FC-4/ghc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ghc.spec	20 Sep 2005 23:50:02 -0000	1.7
+++ ghc.spec	24 Apr 2006 08:34:21 -0000	1.8
@@ -1,12 +1,11 @@
-%define build_version 6.4
-%define ghcver ghc641
+%define ghcver ghc642
 
 # speed up test builds by not building profiled libraries
 %define build_prof 1
-%define build_doc 0
+%define build_doc 1
 
 Name:		ghc
-Version:	6.4.1
+Version:	6.4.2
 Release:	1%{?dist}
 Summary:	Glasgow Haskell Compilation system
 License:	BSD style
@@ -21,7 +20,7 @@
 # haddock generates libraries/ docs
 Buildrequires: libxslt, docbook-style-xsl, haddock
 %endif
-Prefix: %{_prefix}
+Prefix:		%{_prefix}
 
 %description
 GHC is a state-of-the-art programming suite for Haskell, a purely
@@ -66,6 +65,7 @@
 %package doc
 Summary:	Documentation for GHC
 Group:		Development/Languages
+Requires:	%{name}
 
 %description doc
 Preformatted documentation for the Glorious Glasgow Haskell
@@ -85,7 +85,7 @@
 echo "GhcRTSWays=thr debug" >> mk/build.mk
 %endif
 
-./configure --prefix=%{_prefix} --libdir=%{_libdir} --with-ghc=ghc-%{build_version}
+./configure --prefix=%{_prefix} --libdir=%{_libdir}
 
 make all
 %if %{build_doc}
@@ -156,7 +156,17 @@
 %endif
 
 %changelog
-* Tue Sep 20 2005 Jens Petersen <petersen at redhat.com> - 6.4.1-1
+* Sat Apr 22 2006 Jens Petersen <petersen at redhat.com> - 6.4.2-1.fc4
+- update to 6.4.2 release
+
+* Thu Mar  2 2006 Jens Petersen <petersen at redhat.com>
+- make ghc-doc require ghc (Michel Salim, #180449)
+
+* Tue Oct 11 2005 Jens Petersen <petersen at redhat.com>
+- turn on build_doc since haddock is now in Extras
+- no longer specify ghc version to build with (Ville Skytt??, #170176)
+
+* Tue Sep 20 2005 Jens Petersen <petersen at redhat.com> - 6.4.1-1.fc4
 - 6.4.1 release
   - the following patches are now upstream: ghc-6.4-powerpc.patch,
     rts-GCCompact.h-x86_64.patch, ghc-6.4-dsforeign-x86_64-1097471.patch,


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghc/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Sep 2005 23:50:02 -0000	1.5
+++ sources	24 Apr 2006 08:34:21 -0000	1.6
@@ -1 +1 @@
-fd289bc7c3afa272ff831a71a50b5b00  ghc-6.4.1-src.tar.bz2
+a394bf14e94c3bca5507d568fcc03375  ghc-6.4.2-src.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 24 08:51:04 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Mon, 24 Apr 2006 01:51:04 -0700
Subject: owners owners.list,1.883,1.884
Message-ID: <200604240851.k3O8p69s016421@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16404

Modified Files:
	owners.list 
Log Message:
ices added



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.883
retrieving revision 1.884
diff -u -r1.883 -r1.884
--- owners.list	23 Apr 2006 23:32:45 -0000	1.883
+++ owners.list	24 Apr 2006 08:51:04 -0000	1.884
@@ -475,6 +475,7 @@
 Fedora Extras|i8kutils|Dell laptop (Inspiron 8000 and others) SMM BIOS support tools|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 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|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|



From fedora-extras-commits at redhat.com  Mon Apr 24 08:52:18 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Mon, 24 Apr 2006 01:52:18 -0700
Subject: rpms/ices/devel - New directory
Message-ID: <200604240852.k3O8qKt1016503@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ices/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16474/ices/devel

Log Message:
Directory /cvs/extras/rpms/ices/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 24 08:52:17 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Mon, 24 Apr 2006 01:52:17 -0700
Subject: rpms/ices - New directory
Message-ID: <200604240852.k3O8qJJ6016500@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ices
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16474/ices

Log Message:
Directory /cvs/extras/rpms/ices added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 24 08:52:35 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Mon, 24 Apr 2006 01:52:35 -0700
Subject: rpms/ices Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604240852.k3O8qbeq016553@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ices
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16520

Added Files:
	Makefile import.log 
Log Message:
Setup of module ices


--- NEW FILE Makefile ---
# Top level Makefile for module ices
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 24 08:52:36 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Mon, 24 Apr 2006 01:52:36 -0700
Subject: rpms/ices/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200604240852.k3O8qc7j016556@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ices/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16520/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ices


--- 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 Apr 24 08:53:23 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Mon, 24 Apr 2006 01:53:23 -0700
Subject: rpms/ices import.log,1.1,1.2
Message-ID: <200604240853.k3O8rtQZ016630@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ices
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16594

Modified Files:
	import.log 
Log Message:
auto-import ices-2.0.1-2 on branch devel from ices-2.0.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ices/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Apr 2006 08:52:35 -0000	1.1
+++ import.log	24 Apr 2006 08:53:23 -0000	1.2
@@ -0,0 +1 @@
+ices-2_0_1-2:HEAD:ices-2.0.1-2.src.rpm:1145868800



From fedora-extras-commits at redhat.com  Mon Apr 24 08:53:24 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Mon, 24 Apr 2006 01:53:24 -0700
Subject: rpms/ices/devel ices.init, NONE, 1.1 ices.logrotate, NONE,
	1.1 ices.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604240853.k3O8ruEB016634@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ices/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16594/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ices.init ices.logrotate ices.spec 
Log Message:
auto-import ices-2.0.1-2 on branch devel from ices-2.0.1-2.src.rpm


--- NEW FILE ices.init ---
#!/bin/sh
#
# ices		This shellscript takes care of starting and stopping
#		the ices client
#
# chkconfig: 345 40 60
# description: IceS is a source client for broadcasting in Ogg Vorbis format \
#              to an icecast2 server
# processname: ices
#
# Source function library.
. /etc/init.d/functions

# Source networking configuration.
[ -f /etc/sysconfig/network ] && . /etc/sysconfig/network

# Check that networking is up.
[ ${NETWORKING} = "no" ] && exit 0

LOCKFILE=/var/lock/subsys/ices
RETVAL=0

start() {
	export TMPDIR="/var/tmp"

	echo -n "Starting ices: "
	daemon --user ices /usr/bin/ices /etc/ices.conf
	RETVAL=$?
	echo
	[ $RETVAL -eq 0 ] && touch $LOCKFILE
}	
stop() {
	echo -n "Shutting down ices: "
	killproc ices
	RETVAL=$?
	echo
	[ $RETVAL -eq 0 ] && rm -f $LOCKFILE
}	


case "$1" in
  start)
  	start
	;;
  stop)
  	stop
	;;
  restart|reload)
	stop
	start
	;;
  status)
	status $PROCESS
	RETVAL=$?
	;;
  condrestart)
  	[ -f $LOCKFILE ] && restart
	;;
  *)
	echo "Usage: $0 {start|stop|restart|status|condrestart}"
	RETVAL=1
esac

exit $?


--- NEW FILE ices.logrotate ---
/var/log/ices.log {
    weekly
    notifempty
    missingok
}


--- NEW FILE ices.spec ---
Name: ices
Version: 2.0.1
Release: 2%{?dist}
Summary: Source streaming for Icecast
Group: System Environment/Daemons
License: GPL
URL: http://www.icecast.org
Source0: http://downloads.us.xiph.org/releases/ices/ices-2.0.1.tar.bz2
Source1: ices.init
Source2: ices.logrotate
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libxml2-devel, libshout-devel >= 2.0, libvorbis-devel,
BuildRequires: alsa-lib-devel, pkgconfig, zlib-devel, libogg-devel
BuildRequires: libtheora-devel, speex-devel
Requires: streaming-server
Requires(post): /sbin/chkconfig
Requires(post): /sbin/service
Requires(preun): /sbin/chkconfig
Requires(preun): /sbin/service

%description
IceS is a source client for a streaming server. The purpose of this client is
to provide an audio stream to a streaming server such that one or more
listeners can access the stream. With this layout, this source client can be
situated remotely from the icecast server.

The primary example of a streaming server used is Icecast 2, although others
could be used if certain conditions are met.

%prep
%setup -q
perl -pi -e 's|<background>0</background>|<background>1</background>|' conf/*.xml

%build
%configure \
	--with-ogg \
	--with-vorbis

%{__make} %{?_smp_mflags}

%install
rm -rf %{buildroot}

install -D -m 755 src/ices %{buildroot}%{_bindir}/ices
install -D -m 644 conf/ices-playlist.xml %{buildroot}%{_sysconfdir}/ices.conf
install -D -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/ices
install -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/ices
install -d -m 755 %{buildroot}%{_var}/log/ices

%clean 
rm -rf %{buildroot}

%pre
/usr/sbin/useradd -c "IceS Shoutcast source" \
        -s /sbin/nologin -r -d /dev/null ices 2> /dev/null || :

%post
if [ $1 = 1 ]; then
   /sbin/chkconfig --add ices
fi

%preun
if [ $1 = 0 ]; then
        /sbin/service ices stop >/dev/null 2>&1
        /sbin/chkconfig --del ices
fi

%postun
if [ "$1" -ge "1" ]; then
        /sbin/service ices condrestart >/dev/null 2>&1
fi

%files
%defattr(-,root,root)
%doc AUTHORS COPYING README TODO doc/*.html doc/*.css conf/*.xml
%{_bindir}/ices
%config(noreplace) %{_sysconfdir}/ices.conf
%config %{_sysconfdir}/logrotate.d/ices
%{_initrddir}/ices
%attr(0770,root,ices) %{_var}/log/ices

%changelog
* Tue Mar 28 2006 Andreas Thienemann <andreas at bawue.net> 2.0.1-2
- Cleaned up the specfile for FE

* Thu Nov 17 2005 Matt Domsch <Matt_Domsch at dell.com> 2.0.1-1
- add dist tag
- rebuild for FC4

* Mon Jan 31 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:2.0.1-0.iva.0
- Upstream update

* Fri Jan  7 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:2.0.0-0.iva.0
- Retooled for Fedora Core 3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ices/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Apr 2006 08:52:36 -0000	1.1
+++ .cvsignore	24 Apr 2006 08:53:24 -0000	1.2
@@ -0,0 +1 @@
+ices-2.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ices/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Apr 2006 08:52:36 -0000	1.1
+++ sources	24 Apr 2006 08:53:24 -0000	1.2
@@ -0,0 +1 @@
+8c7be81b304c4ce588f43b9d02603f6e  ices-2.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 24 09:42:20 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 24 Apr 2006 02:42:20 -0700
Subject: rpms/perl-Algorithm-Dependency/devel .cvsignore, 1.3,
	1.4 perl-Algorithm-Dependency.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200604240942.k3O9gMkY019330@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Algorithm-Dependency/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19309

Modified Files:
	.cvsignore perl-Algorithm-Dependency.spec sources 
Log Message:
* Mon Apr 24 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.102-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-Dependency/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Oct 2005 02:59:40 -0000	1.3
+++ .cvsignore	24 Apr 2006 09:42:20 -0000	1.4
@@ -1 +1 @@
-Algorithm-Dependency-1.101.tar.gz
+Algorithm-Dependency-1.102.tar.gz


Index: perl-Algorithm-Dependency.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-Dependency/devel/perl-Algorithm-Dependency.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Algorithm-Dependency.spec	28 Feb 2006 23:15:38 -0000	1.4
+++ perl-Algorithm-Dependency.spec	24 Apr 2006 09:42:20 -0000	1.5
@@ -1,5 +1,5 @@
 Name: 		perl-Algorithm-Dependency
-Version: 	1.101
+Version: 	1.102
 Release: 	2%{?dist}
 Summary: 	Algorithmic framework for implementing dependency trees
 License: 	GPL or Artistic
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Apr 24 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.102-1
+- Upstream update.
+
 * Wed Mar 01 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.101-2
 - Rebuild for perl-5.8.8.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-Dependency/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Oct 2005 02:59:40 -0000	1.3
+++ sources	24 Apr 2006 09:42:20 -0000	1.4
@@ -1 +1 @@
-d6187a17fa90cbf4d1c513ea2c500269  Algorithm-Dependency-1.101.tar.gz
+971111997767dd456cb4a4e967c97ca3  Algorithm-Dependency-1.102.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 24 09:43:12 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 24 Apr 2006 02:43:12 -0700
Subject: rpms/perl-Algorithm-Dependency/devel perl-Algorithm-Dependency.spec,
	1.5, 1.6
Message-ID: <200604240943.k3O9hEjL019369@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Algorithm-Dependency/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19352

Modified Files:
	perl-Algorithm-Dependency.spec 
Log Message:
Fix typo in spec


Index: perl-Algorithm-Dependency.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-Dependency/devel/perl-Algorithm-Dependency.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Algorithm-Dependency.spec	24 Apr 2006 09:42:20 -0000	1.5
+++ perl-Algorithm-Dependency.spec	24 Apr 2006 09:43:11 -0000	1.6
@@ -1,6 +1,6 @@
 Name: 		perl-Algorithm-Dependency
 Version: 	1.102
-Release: 	2%{?dist}
+Release: 	1%{?dist}
 Summary: 	Algorithmic framework for implementing dependency trees
 License: 	GPL or Artistic
 Group: 		Development/Libraries



From fedora-extras-commits at redhat.com  Mon Apr 24 10:49:34 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 24 Apr 2006 03:49:34 -0700
Subject: rpms/hugs98/FC-5 openal-1.0_1.2.patch,NONE,1.1 hugs98.spec,1.3,1.4
Message-ID: <200604241049.k3OAnauh021767@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/hugs98/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21747

Modified Files:
	hugs98.spec 
Added Files:
	openal-1.0_1.2.patch 
Log Message:
added openal support

openal-1.0_1.2.patch:

--- NEW FILE openal-1.0_1.2.patch ---
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/LICENSE ghc-6.4.2/libraries/OpenAL/LICENSE
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/LICENSE	2004-01-03 04:03:07.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/LICENSE	2006-03-22 00:58:03.000000000 +0900
@@ -1,4 +1,4 @@
-Copyright (c) 2003-2004, Sven Panne
+Copyright (c) 2003-2005, Sven Panne
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/Makefile ghc-6.4.2/libraries/OpenAL/Makefile
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/Makefile	2005-03-03 01:39:55.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/Makefile	2006-03-22 00:58:03.000000000 +0900
@@ -4,6 +4,12 @@
 include $(TOP)/mk/boilerplate.mk
 -include config.mk
 
+ifneq "$(findstring clean, $(MAKECMDGOALS))" ""
+# if we're cleaning, then config.mk might have been cleaned already
+AL_BUILD_PACKAGE=yes
+PACKAGE=OpenAL
+endif
+
 ifneq "$(AL_BUILD_PACKAGE)" "no"
 
 # -----------------------------------------------------------------------------
@@ -18,19 +24,17 @@
 	Sound \
 	Sound/OpenAL \
 	Sound/OpenAL/AL \
-	Sound/OpenAL/ALC \
-	Sound/OpenAL/ALUT
+	Sound/OpenAL/ALC
 
 PACKAGE_DEPS = base OpenGL
 
 SRC_HC_OPTS += -Wall -fffi -Iinclude '-\#include "HsOpenAL.h"' -cpp
 
 # WinDoze DLL hell
+# NOTE: For some obscure/unknown reason, OpenAL uses ccall, even on WinDoze...
+SRC_HC_OPTS += -DCALLCONV=ccall
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-SRC_HC_OPTS += -DCALLCONV=stdcall
 SRC_HC_OPTS := $(subst -mno-cygwin,,$(SRC_HC_OPTS))
-else
-SRC_HC_OPTS += -DCALLCONV=ccall
 endif
 
 PACKAGE_CPP_OPTS += -DMAINTAINER=$(MAINTAINER)
@@ -41,18 +45,14 @@
 
 package.conf.inplace \
 package.conf.installed \
-Sound/OpenAL/AL/BasicTypes.$(way_)o \
-Sound/OpenAL/AL/Format.$(way_)o \
-Sound/OpenAL/ALC/BasicTypes.$(way_)o \
-Sound/OpenAL/ALC/Errors.$(way_)o \
-Sound/OpenAL/ALC/Queries.$(way_)o : include/HsOpenALConfig.h
+Sound/OpenAL/Config.$(way_)o \
+Sound/OpenAL/Constants.$(way_)o : include/HsOpenALConfig.h
 
 endif
 
 # -----------------------------------------------------------------------------
 
-DIST_CLEAN_FILES += OpenAL.buildinfo config.cache config.status
-LATE_DIST_CLEAN_FILES += config.mk
+DIST_CLEAN_FILES += OpenAL.buildinfo config.cache config.status config.mk
 
 extraclean::
 	$(RM) -rf autom4te.cache
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/OpenAL.buildinfo.in ghc-6.4.2/libraries/OpenAL/OpenAL.buildinfo.in
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/OpenAL.buildinfo.in	2005-01-16 22:13:05.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/OpenAL.buildinfo.in	2006-03-22 00:58:03.000000000 +0900
@@ -2,6 +2,7 @@
 -- System-dependent values used by Distribution.Simple.defaultUserHooks
 --
 buildable: @BUILD_PACKAGE_BOOL@
+ghc-options: -DCALLCONV=@CALLCONV@
 cc-options: -DCALLCONV=@CALLCONV@
 ld-options: @AL_LIBS@
 frameworks: @AL_FRAMEWORKS@
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/OpenAL.cabal ghc-6.4.2/libraries/OpenAL/OpenAL.cabal
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/OpenAL.cabal	2005-02-11 10:55:55.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/OpenAL.cabal	2006-03-22 00:58:03.000000000 +0900
@@ -1,5 +1,5 @@
 name:		OpenAL
-version:	1.0
+version:	1.2
 license:	BSD3
 license-file:	LICENSE
 maintainer:	Sven Panne <sven.panne at aedion.de>
@@ -10,27 +10,36 @@
 exposed-modules:
 	Sound.OpenAL,
 	Sound.OpenAL.AL,
+	Sound.OpenAL.AL.ALboolean,
+	Sound.OpenAL.AL.Attenuation,
 	Sound.OpenAL.AL.BasicTypes,
 	Sound.OpenAL.AL.Buffer,
+	Sound.OpenAL.AL.BufferInternal,
+	Sound.OpenAL.AL.Doppler,
+	Sound.OpenAL.AL.Errors,
+	Sound.OpenAL.AL.Extensions,
+	Sound.OpenAL.AL.Format,
 	Sound.OpenAL.AL.Listener,
 	Sound.OpenAL.AL.Source,
+	Sound.OpenAL.AL.StringQueries,
 	Sound.OpenAL.ALC,
+	Sound.OpenAL.ALC.BasicTypes,
+	Sound.OpenAL.ALC.Capture,
 	Sound.OpenAL.ALC.Context,
 	Sound.OpenAL.ALC.Device,
 	Sound.OpenAL.ALC.Errors,
-	Sound.OpenAL.ALC.Extensions,
-	Sound.OpenAL.ALUT,
-	Sound.OpenAL.ALUT.Initialization,
-	Sound.OpenAL.ALUT.WAV
+	Sound.OpenAL.ALC.Extensions
 other-modules:
-	Sound.OpenAL.AL.ALboolean,
-	Sound.OpenAL.AL.Format,
 	Sound.OpenAL.AL.PeekPoke,
 	Sound.OpenAL.AL.QueryUtils,
-	Sound.OpenAL.ALC.BasicTypes,
-	Sound.OpenAL.ALC.Queries,
-	Sound.OpenAL.ALUT.Exception
+	Sound.OpenAL.AL.SourceState,
+	Sound.OpenAL.AL.String,
+	Sound.OpenAL.ALC.ALCboolean,
+	Sound.OpenAL.ALC.QueryUtils,
+	Sound.OpenAL.ALC.String,
+	Sound.OpenAL.Config,
+	Sound.OpenAL.Constants
 include-dirs:	include
 includes:	"HsOpenAL.h"
 build-depends:	base, OpenGL
-extensions:	CPP
+extensions:	CPP, ForeignFunctionInterface
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/Sound/OpenAL/AL/ALboolean.hs ghc-6.4.2/libraries/OpenAL/Sound/OpenAL/AL/ALboolean.hs
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/Sound/OpenAL/AL/ALboolean.hs	2004-01-03 04:03:08.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/Sound/OpenAL/AL/ALboolean.hs	2006-03-22 00:58:03.000000000 +0900
@@ -2,7 +2,7 @@
 --------------------------------------------------------------------------------
 -- |
 -- Module      :  Sound.OpenAL.AL.ALboolean
--- Copyright   :  (c) Sven Panne 2003-2004
+-- Copyright   :  (c) Sven Panne 2003-2005
 -- License     :  BSD-style (see the file libraries/OpenAL/LICENSE)
 -- 
 -- Maintainer  :  sven.panne at aedion.de
@@ -14,16 +14,17 @@
 --------------------------------------------------------------------------------
 
 module Sound.OpenAL.AL.ALboolean (
-   ALboolean, marshalALboolean, unmarshalALboolean
+   marshalALboolean, unmarshalALboolean
 ) where
 
 import Sound.OpenAL.AL.BasicTypes ( ALboolean )
+import Sound.OpenAL.Constants ( al_FALSE, al_TRUE )
 
 --------------------------------------------------------------------------------
 
 marshalALboolean :: Bool -> ALboolean
-marshalALboolean False = 0
-marshalALboolean True  = 1
+marshalALboolean False = al_FALSE
+marshalALboolean True  = al_TRUE
 
 unmarshalALboolean :: ALboolean -> Bool
-unmarshalALboolean = (/= 0)
+unmarshalALboolean = (/= al_FALSE)
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/Sound/OpenAL/AL/Attenuation.hs ghc-6.4.2/libraries/OpenAL/Sound/OpenAL/AL/Attenuation.hs
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/Sound/OpenAL/AL/Attenuation.hs	1970-01-01 09:00:00.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/Sound/OpenAL/AL/Attenuation.hs	2006-03-22 00:58:03.000000000 +0900
@@ -0,0 +1,211 @@
+--------------------------------------------------------------------------------
+-- |
+-- Module      :  Sound.OpenAL.AL.Attenuation
+-- Copyright   :  (c) Sven Panne 2005
+-- License     :  BSD-style (see the file libraries/OpenAL/LICENSE)
+-- 
+-- Maintainer  :  sven.panne at aedion.de
+-- Stability   :  provisional
+-- Portability :  portable
+--
+-- This module corresponds to section 3.4 (Attenuation By Distance) of the
+-- OpenAL Specification and Reference (version 1.1).
+-- 
+--------------------------------------------------------------------------------
+
+module Sound.OpenAL.AL.Attenuation (
+   -- * Introduction
+   -- $Introduction
+
+   -- * Handling the Distance Model
+   DistanceModel(..), distanceModel
+
+   -- * Evaluation of Gain\/Attenuation Related State
[...9030 lines suppressed...]
+#undef CONST_AL_ORIENTATION
+
+/* The value of AL_OUT_OF_MEMORY. */
+#undef CONST_AL_OUT_OF_MEMORY
+
+/* The value of AL_PAUSED. */
+#undef CONST_AL_PAUSED
+
+/* The value of AL_PITCH. */
+#undef CONST_AL_PITCH
+
+/* The value of AL_PLAYING. */
+#undef CONST_AL_PLAYING
+
+/* The value of AL_POSITION. */
+#undef CONST_AL_POSITION
+
+/* The value of AL_REFERENCE_DISTANCE. */
+#undef CONST_AL_REFERENCE_DISTANCE
+
+/* The value of AL_RENDERER. */
+#undef CONST_AL_RENDERER
+
+/* The value of AL_ROLLOFF_FACTOR. */
+#undef CONST_AL_ROLLOFF_FACTOR
+
+/* The value of AL_SAMPLE_OFFSET. */
+#undef CONST_AL_SAMPLE_OFFSET
+
+/* The value of AL_SEC_OFFSET. */
+#undef CONST_AL_SEC_OFFSET
+
+/* The value of AL_SIZE. */
+#undef CONST_AL_SIZE
+
+/* The value of AL_SOURCE_RELATIVE. */
+#undef CONST_AL_SOURCE_RELATIVE
+
+/* The value of AL_SOURCE_STATE. */
+#undef CONST_AL_SOURCE_STATE
+
+/* The value of AL_SOURCE_TYPE. */
+#undef CONST_AL_SOURCE_TYPE
+
+/* The value of AL_SPEED_OF_SOUND. */
+#undef CONST_AL_SPEED_OF_SOUND
+
+/* The value of AL_STATIC. */
+#undef CONST_AL_STATIC
+
+/* The value of AL_STOPPED. */
+#undef CONST_AL_STOPPED
+
+/* The value of AL_STREAMING. */
+#undef CONST_AL_STREAMING
+
+/* The value of AL_TRUE. */
+#undef CONST_AL_TRUE
+
+/* The value of AL_UNDETERMINED. */
+#undef CONST_AL_UNDETERMINED
+
+/* The value of AL_VELOCITY. */
+#undef CONST_AL_VELOCITY
+
+/* The value of AL_VENDOR. */
+#undef CONST_AL_VENDOR
+
+/* The value of AL_VERSION. */
+#undef CONST_AL_VERSION
 
 /* Define to 1 if you have the <AL/alc.h> header file. */
 #undef HAVE_AL_ALC_H
@@ -63,6 +279,9 @@
 /* Define to 1 if you have the <AL/alext.h> header file. */
 #undef HAVE_AL_ALEXT_H
 
+/* Define to 1 if you have the <AL/al.h> header file. */
+#undef HAVE_AL_AL_H
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
@@ -75,6 +294,9 @@
 /* Define to 1 if you have the <OpenAL/alext.h> header file. */
 #undef HAVE_OPENAL_ALEXT_H
 
+/* Define to 1 if you have the <OpenAL/al.h> header file. */
+#undef HAVE_OPENAL_AL_H
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
@@ -96,23 +318,50 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Define to Haskell type for ALbitfield */
-#undef HTYPE_ALBITFIELD
-
 /* Define to Haskell type for ALboolean */
 #undef HTYPE_ALBOOLEAN
 
 /* Define to Haskell type for ALbyte */
 #undef HTYPE_ALBYTE
 
+/* Define to Haskell type for ALCboolean */
+#undef HTYPE_ALCBOOLEAN
+
+/* Define to Haskell type for ALCbyte */
+#undef HTYPE_ALCBYTE
+
+/* Define to Haskell type for ALCchar */
+#undef HTYPE_ALCCHAR
+
+/* Define to Haskell type for ALCdouble */
+#undef HTYPE_ALCDOUBLE
+
 /* Define to Haskell type for ALCenum */
 #undef HTYPE_ALCENUM
 
-/* Define to Haskell type for ALclampd */
-#undef HTYPE_ALCLAMPD
+/* Define to Haskell type for ALCfloat */
+#undef HTYPE_ALCFLOAT
+
+/* Define to Haskell type for ALchar */
+#undef HTYPE_ALCHAR
+
+/* Define to Haskell type for ALCint */
+#undef HTYPE_ALCINT
+
+/* Define to Haskell type for ALCshort */
+#undef HTYPE_ALCSHORT
+
+/* Define to Haskell type for ALCsizei */
+#undef HTYPE_ALCSIZEI
+
+/* Define to Haskell type for ALCubyte */
+#undef HTYPE_ALCUBYTE
+
+/* Define to Haskell type for ALCuint */
+#undef HTYPE_ALCUINT
 
-/* Define to Haskell type for ALclampf */
-#undef HTYPE_ALCLAMPF
+/* Define to Haskell type for ALCushort */
+#undef HTYPE_ALCUSHORT
 
 /* Define to Haskell type for ALdouble */
 #undef HTYPE_ALDOUBLE
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/package.conf.in ghc-6.4.2/libraries/OpenAL/package.conf.in
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/package.conf.in	2005-02-19 00:06:43.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/package.conf.in	2006-03-22 00:58:03.000000000 +0900
@@ -9,27 +9,36 @@
 exposed-modules:
 	Sound.OpenAL,
 	Sound.OpenAL.AL,
+	Sound.OpenAL.AL.ALboolean,
+	Sound.OpenAL.AL.Attenuation,
 	Sound.OpenAL.AL.BasicTypes,
 	Sound.OpenAL.AL.Buffer,
+	Sound.OpenAL.AL.BufferInternal,
+	Sound.OpenAL.AL.Doppler,
+	Sound.OpenAL.AL.Errors,
+	Sound.OpenAL.AL.Extensions,
+	Sound.OpenAL.AL.Format,
 	Sound.OpenAL.AL.Listener,
 	Sound.OpenAL.AL.Source,
+	Sound.OpenAL.AL.StringQueries,
 	Sound.OpenAL.ALC,
+	Sound.OpenAL.ALC.BasicTypes,
+	Sound.OpenAL.ALC.Capture,
 	Sound.OpenAL.ALC.Context,
 	Sound.OpenAL.ALC.Device,
 	Sound.OpenAL.ALC.Errors,
-	Sound.OpenAL.ALC.Extensions,
-	Sound.OpenAL.ALUT,
-	Sound.OpenAL.ALUT.Initialization,
-	Sound.OpenAL.ALUT.WAV
+	Sound.OpenAL.ALC.Extensions
 
 hidden-modules:
-	Sound.OpenAL.AL.ALboolean,
-	Sound.OpenAL.AL.Format,
 	Sound.OpenAL.AL.PeekPoke,
 	Sound.OpenAL.AL.QueryUtils,
-	Sound.OpenAL.ALC.BasicTypes,
-	Sound.OpenAL.ALC.Queries,
-	Sound.OpenAL.ALUT.Exception
+	Sound.OpenAL.AL.SourceState,
+	Sound.OpenAL.AL.String,
+	Sound.OpenAL.ALC.ALCboolean,
+	Sound.OpenAL.ALC.QueryUtils,
+	Sound.OpenAL.ALC.String,
+	Sound.OpenAL.Config,
+	Sound.OpenAL.Constants
 
 import-dirs:	IMPORT_DIR
 


Index: hugs98.spec
===================================================================
RCS file: /cvs/extras/rpms/hugs98/FC-5/hugs98.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hugs98.spec	24 Apr 2006 03:25:49 -0000	1.3
+++ hugs98.spec	24 Apr 2006 10:49:34 -0000	1.4
@@ -2,13 +2,14 @@
 
 Name:		hugs98
 Version:	2005.03
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Haskell Interpreter
 
 Group:		Development/Languages
 License:	BSD
 URL:		http://www.haskell.org/hugs
 Source0:	http://cvs.haskell.org/Hugs/downloads/Mar2005/%{name}-%{hugs_ver}.tar.gz
+Patch0:		openal-1.0_1.2.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	docbook-utils
@@ -23,7 +24,7 @@
 BuildRequires:	libXt-devel
 BuildRequires:	readline-devel
 BuildRequires:	xorg-x11-proto-devel
-#BuildRequires:	openal-devel
+BuildRequires:	openal-devel
 
 %description
 Hugs 98 is a functional programming system based on Haskell 98, the de
@@ -31,6 +32,15 @@
 98 provides an almost complete implementation of Haskell 98.
 
 
+%package openal
+Summary:	OpenAL package for Hugs98
+Group:		Development/Languages
+Requires:	%{name} = %{version}-%{release}
+
+%description openal
+OpenAL package for Hugs98.
+
+
 %package x11
 Summary:	X11 package for Hugs98
 Group:		Development/Languages
@@ -82,6 +92,7 @@
 
 %prep
 %setup -q -n %{name}-%{hugs_ver}
+%patch0 -p1
 
 
 %build
@@ -116,6 +127,7 @@
 %doc docs/users_guide/users_guide
 %{_bindir}/*
 %{_libdir}/hugs
+%exclude %{_libdir}/hugs/packages/OpenAL
 %exclude %{_libdir}/hugs/packages/X11
 %exclude %{_libdir}/hugs/packages/OpenGL
 %exclude %{_libdir}/hugs/packages/GLUT
@@ -128,6 +140,11 @@
 %doc installed-demos/*
 
 
+%files openal
+%defattr(-,root,root,-)
+%{_libdir}/hugs/packages/OpenAL
+
+
 %files x11
 %defattr(-,root,root,-)
 %{_libdir}/hugs/packages/X11
@@ -149,6 +166,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Gerard Milmeister <gemi at bluewin.ch> - 2005.03-3
+- added patch provided by Jens Petersen to build OpenAL package
+
 * Tue Apr 18 2006 Gerard Milmeister <gemi at bluewin.ch> - 2005.03-1
 - changed version numbering scheme
 - split off demos package



From fedora-extras-commits at redhat.com  Mon Apr 24 10:49:57 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 24 Apr 2006 03:49:57 -0700
Subject: rpms/hugs98/FC-5 hugs98.spec,1.4,1.5
Message-ID: <200604241049.k3OAnxwi021820@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/hugs98/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21803

Modified Files:
	hugs98.spec 
Log Message:



Index: hugs98.spec
===================================================================
RCS file: /cvs/extras/rpms/hugs98/FC-5/hugs98.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hugs98.spec	24 Apr 2006 10:49:34 -0000	1.4
+++ hugs98.spec	24 Apr 2006 10:49:57 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:		hugs98
 Version:	2005.03
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Haskell Interpreter
 
 Group:		Development/Languages



From fedora-extras-commits at redhat.com  Mon Apr 24 11:08:51 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 24 Apr 2006 04:08:51 -0700
Subject: rpms/hugs98/devel openal-1.0_1.2.patch, NONE, 1.1 hugs98.spec, 1.2,
	1.3
Message-ID: <200604241108.k3OB8rv0024483@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/hugs98/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24453

Modified Files:
	hugs98.spec 
Added Files:
	openal-1.0_1.2.patch 
Log Message:
added openal support

openal-1.0_1.2.patch:

--- NEW FILE openal-1.0_1.2.patch ---
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/LICENSE ghc-6.4.2/libraries/OpenAL/LICENSE
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/LICENSE	2004-01-03 04:03:07.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/LICENSE	2006-03-22 00:58:03.000000000 +0900
@@ -1,4 +1,4 @@
-Copyright (c) 2003-2004, Sven Panne
+Copyright (c) 2003-2005, Sven Panne
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/Makefile ghc-6.4.2/libraries/OpenAL/Makefile
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/Makefile	2005-03-03 01:39:55.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/Makefile	2006-03-22 00:58:03.000000000 +0900
@@ -4,6 +4,12 @@
 include $(TOP)/mk/boilerplate.mk
 -include config.mk
 
+ifneq "$(findstring clean, $(MAKECMDGOALS))" ""
+# if we're cleaning, then config.mk might have been cleaned already
+AL_BUILD_PACKAGE=yes
+PACKAGE=OpenAL
+endif
+
 ifneq "$(AL_BUILD_PACKAGE)" "no"
 
 # -----------------------------------------------------------------------------
@@ -18,19 +24,17 @@
 	Sound \
 	Sound/OpenAL \
 	Sound/OpenAL/AL \
-	Sound/OpenAL/ALC \
-	Sound/OpenAL/ALUT
+	Sound/OpenAL/ALC
 
 PACKAGE_DEPS = base OpenGL
 
 SRC_HC_OPTS += -Wall -fffi -Iinclude '-\#include "HsOpenAL.h"' -cpp
 
 # WinDoze DLL hell
+# NOTE: For some obscure/unknown reason, OpenAL uses ccall, even on WinDoze...
+SRC_HC_OPTS += -DCALLCONV=ccall
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-SRC_HC_OPTS += -DCALLCONV=stdcall
 SRC_HC_OPTS := $(subst -mno-cygwin,,$(SRC_HC_OPTS))
-else
-SRC_HC_OPTS += -DCALLCONV=ccall
 endif
 
 PACKAGE_CPP_OPTS += -DMAINTAINER=$(MAINTAINER)
@@ -41,18 +45,14 @@
 
 package.conf.inplace \
 package.conf.installed \
-Sound/OpenAL/AL/BasicTypes.$(way_)o \
-Sound/OpenAL/AL/Format.$(way_)o \
-Sound/OpenAL/ALC/BasicTypes.$(way_)o \
-Sound/OpenAL/ALC/Errors.$(way_)o \
-Sound/OpenAL/ALC/Queries.$(way_)o : include/HsOpenALConfig.h
+Sound/OpenAL/Config.$(way_)o \
+Sound/OpenAL/Constants.$(way_)o : include/HsOpenALConfig.h
 
 endif
 
 # -----------------------------------------------------------------------------
 
-DIST_CLEAN_FILES += OpenAL.buildinfo config.cache config.status
-LATE_DIST_CLEAN_FILES += config.mk
+DIST_CLEAN_FILES += OpenAL.buildinfo config.cache config.status config.mk
 
 extraclean::
 	$(RM) -rf autom4te.cache
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/OpenAL.buildinfo.in ghc-6.4.2/libraries/OpenAL/OpenAL.buildinfo.in
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/OpenAL.buildinfo.in	2005-01-16 22:13:05.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/OpenAL.buildinfo.in	2006-03-22 00:58:03.000000000 +0900
@@ -2,6 +2,7 @@
 -- System-dependent values used by Distribution.Simple.defaultUserHooks
 --
 buildable: @BUILD_PACKAGE_BOOL@
+ghc-options: -DCALLCONV=@CALLCONV@
 cc-options: -DCALLCONV=@CALLCONV@
 ld-options: @AL_LIBS@
 frameworks: @AL_FRAMEWORKS@
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/OpenAL.cabal ghc-6.4.2/libraries/OpenAL/OpenAL.cabal
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/OpenAL.cabal	2005-02-11 10:55:55.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/OpenAL.cabal	2006-03-22 00:58:03.000000000 +0900
@@ -1,5 +1,5 @@
 name:		OpenAL
-version:	1.0
+version:	1.2
 license:	BSD3
 license-file:	LICENSE
 maintainer:	Sven Panne <sven.panne at aedion.de>
@@ -10,27 +10,36 @@
 exposed-modules:
 	Sound.OpenAL,
 	Sound.OpenAL.AL,
+	Sound.OpenAL.AL.ALboolean,
+	Sound.OpenAL.AL.Attenuation,
 	Sound.OpenAL.AL.BasicTypes,
 	Sound.OpenAL.AL.Buffer,
+	Sound.OpenAL.AL.BufferInternal,
+	Sound.OpenAL.AL.Doppler,
+	Sound.OpenAL.AL.Errors,
+	Sound.OpenAL.AL.Extensions,
+	Sound.OpenAL.AL.Format,
 	Sound.OpenAL.AL.Listener,
 	Sound.OpenAL.AL.Source,
+	Sound.OpenAL.AL.StringQueries,
 	Sound.OpenAL.ALC,
+	Sound.OpenAL.ALC.BasicTypes,
+	Sound.OpenAL.ALC.Capture,
 	Sound.OpenAL.ALC.Context,
 	Sound.OpenAL.ALC.Device,
 	Sound.OpenAL.ALC.Errors,
-	Sound.OpenAL.ALC.Extensions,
-	Sound.OpenAL.ALUT,
-	Sound.OpenAL.ALUT.Initialization,
-	Sound.OpenAL.ALUT.WAV
+	Sound.OpenAL.ALC.Extensions
 other-modules:
-	Sound.OpenAL.AL.ALboolean,
-	Sound.OpenAL.AL.Format,
 	Sound.OpenAL.AL.PeekPoke,
 	Sound.OpenAL.AL.QueryUtils,
-	Sound.OpenAL.ALC.BasicTypes,
-	Sound.OpenAL.ALC.Queries,
-	Sound.OpenAL.ALUT.Exception
+	Sound.OpenAL.AL.SourceState,
+	Sound.OpenAL.AL.String,
+	Sound.OpenAL.ALC.ALCboolean,
+	Sound.OpenAL.ALC.QueryUtils,
+	Sound.OpenAL.ALC.String,
+	Sound.OpenAL.Config,
+	Sound.OpenAL.Constants
 include-dirs:	include
 includes:	"HsOpenAL.h"
 build-depends:	base, OpenGL
-extensions:	CPP
+extensions:	CPP, ForeignFunctionInterface
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/Sound/OpenAL/AL/ALboolean.hs ghc-6.4.2/libraries/OpenAL/Sound/OpenAL/AL/ALboolean.hs
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/Sound/OpenAL/AL/ALboolean.hs	2004-01-03 04:03:08.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/Sound/OpenAL/AL/ALboolean.hs	2006-03-22 00:58:03.000000000 +0900
@@ -2,7 +2,7 @@
 --------------------------------------------------------------------------------
 -- |
 -- Module      :  Sound.OpenAL.AL.ALboolean
--- Copyright   :  (c) Sven Panne 2003-2004
+-- Copyright   :  (c) Sven Panne 2003-2005
 -- License     :  BSD-style (see the file libraries/OpenAL/LICENSE)
 -- 
 -- Maintainer  :  sven.panne at aedion.de
@@ -14,16 +14,17 @@
 --------------------------------------------------------------------------------
 
 module Sound.OpenAL.AL.ALboolean (
-   ALboolean, marshalALboolean, unmarshalALboolean
+   marshalALboolean, unmarshalALboolean
 ) where
 
 import Sound.OpenAL.AL.BasicTypes ( ALboolean )
+import Sound.OpenAL.Constants ( al_FALSE, al_TRUE )
 
 --------------------------------------------------------------------------------
 
 marshalALboolean :: Bool -> ALboolean
-marshalALboolean False = 0
-marshalALboolean True  = 1
+marshalALboolean False = al_FALSE
+marshalALboolean True  = al_TRUE
 
 unmarshalALboolean :: ALboolean -> Bool
-unmarshalALboolean = (/= 0)
+unmarshalALboolean = (/= al_FALSE)
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/Sound/OpenAL/AL/Attenuation.hs ghc-6.4.2/libraries/OpenAL/Sound/OpenAL/AL/Attenuation.hs
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/Sound/OpenAL/AL/Attenuation.hs	1970-01-01 09:00:00.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/Sound/OpenAL/AL/Attenuation.hs	2006-03-22 00:58:03.000000000 +0900
@@ -0,0 +1,211 @@
+--------------------------------------------------------------------------------
+-- |
+-- Module      :  Sound.OpenAL.AL.Attenuation
+-- Copyright   :  (c) Sven Panne 2005
+-- License     :  BSD-style (see the file libraries/OpenAL/LICENSE)
+-- 
+-- Maintainer  :  sven.panne at aedion.de
+-- Stability   :  provisional
+-- Portability :  portable
+--
+-- This module corresponds to section 3.4 (Attenuation By Distance) of the
+-- OpenAL Specification and Reference (version 1.1).
+-- 
+--------------------------------------------------------------------------------
+
+module Sound.OpenAL.AL.Attenuation (
+   -- * Introduction
+   -- $Introduction
+
+   -- * Handling the Distance Model
+   DistanceModel(..), distanceModel
+
+   -- * Evaluation of Gain\/Attenuation Related State
[...9030 lines suppressed...]
+#undef CONST_AL_ORIENTATION
+
+/* The value of AL_OUT_OF_MEMORY. */
+#undef CONST_AL_OUT_OF_MEMORY
+
+/* The value of AL_PAUSED. */
+#undef CONST_AL_PAUSED
+
+/* The value of AL_PITCH. */
+#undef CONST_AL_PITCH
+
+/* The value of AL_PLAYING. */
+#undef CONST_AL_PLAYING
+
+/* The value of AL_POSITION. */
+#undef CONST_AL_POSITION
+
+/* The value of AL_REFERENCE_DISTANCE. */
+#undef CONST_AL_REFERENCE_DISTANCE
+
+/* The value of AL_RENDERER. */
+#undef CONST_AL_RENDERER
+
+/* The value of AL_ROLLOFF_FACTOR. */
+#undef CONST_AL_ROLLOFF_FACTOR
+
+/* The value of AL_SAMPLE_OFFSET. */
+#undef CONST_AL_SAMPLE_OFFSET
+
+/* The value of AL_SEC_OFFSET. */
+#undef CONST_AL_SEC_OFFSET
+
+/* The value of AL_SIZE. */
+#undef CONST_AL_SIZE
+
+/* The value of AL_SOURCE_RELATIVE. */
+#undef CONST_AL_SOURCE_RELATIVE
+
+/* The value of AL_SOURCE_STATE. */
+#undef CONST_AL_SOURCE_STATE
+
+/* The value of AL_SOURCE_TYPE. */
+#undef CONST_AL_SOURCE_TYPE
+
+/* The value of AL_SPEED_OF_SOUND. */
+#undef CONST_AL_SPEED_OF_SOUND
+
+/* The value of AL_STATIC. */
+#undef CONST_AL_STATIC
+
+/* The value of AL_STOPPED. */
+#undef CONST_AL_STOPPED
+
+/* The value of AL_STREAMING. */
+#undef CONST_AL_STREAMING
+
+/* The value of AL_TRUE. */
+#undef CONST_AL_TRUE
+
+/* The value of AL_UNDETERMINED. */
+#undef CONST_AL_UNDETERMINED
+
+/* The value of AL_VELOCITY. */
+#undef CONST_AL_VELOCITY
+
+/* The value of AL_VENDOR. */
+#undef CONST_AL_VENDOR
+
+/* The value of AL_VERSION. */
+#undef CONST_AL_VERSION
 
 /* Define to 1 if you have the <AL/alc.h> header file. */
 #undef HAVE_AL_ALC_H
@@ -63,6 +279,9 @@
 /* Define to 1 if you have the <AL/alext.h> header file. */
 #undef HAVE_AL_ALEXT_H
 
+/* Define to 1 if you have the <AL/al.h> header file. */
+#undef HAVE_AL_AL_H
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
@@ -75,6 +294,9 @@
 /* Define to 1 if you have the <OpenAL/alext.h> header file. */
 #undef HAVE_OPENAL_ALEXT_H
 
+/* Define to 1 if you have the <OpenAL/al.h> header file. */
+#undef HAVE_OPENAL_AL_H
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
@@ -96,23 +318,50 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Define to Haskell type for ALbitfield */
-#undef HTYPE_ALBITFIELD
-
 /* Define to Haskell type for ALboolean */
 #undef HTYPE_ALBOOLEAN
 
 /* Define to Haskell type for ALbyte */
 #undef HTYPE_ALBYTE
 
+/* Define to Haskell type for ALCboolean */
+#undef HTYPE_ALCBOOLEAN
+
+/* Define to Haskell type for ALCbyte */
+#undef HTYPE_ALCBYTE
+
+/* Define to Haskell type for ALCchar */
+#undef HTYPE_ALCCHAR
+
+/* Define to Haskell type for ALCdouble */
+#undef HTYPE_ALCDOUBLE
+
 /* Define to Haskell type for ALCenum */
 #undef HTYPE_ALCENUM
 
-/* Define to Haskell type for ALclampd */
-#undef HTYPE_ALCLAMPD
+/* Define to Haskell type for ALCfloat */
+#undef HTYPE_ALCFLOAT
+
+/* Define to Haskell type for ALchar */
+#undef HTYPE_ALCHAR
+
+/* Define to Haskell type for ALCint */
+#undef HTYPE_ALCINT
+
+/* Define to Haskell type for ALCshort */
+#undef HTYPE_ALCSHORT
+
+/* Define to Haskell type for ALCsizei */
+#undef HTYPE_ALCSIZEI
+
+/* Define to Haskell type for ALCubyte */
+#undef HTYPE_ALCUBYTE
+
+/* Define to Haskell type for ALCuint */
+#undef HTYPE_ALCUINT
 
-/* Define to Haskell type for ALclampf */
-#undef HTYPE_ALCLAMPF
+/* Define to Haskell type for ALCushort */
+#undef HTYPE_ALCUSHORT
 
 /* Define to Haskell type for ALdouble */
 #undef HTYPE_ALDOUBLE
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/package.conf.in ghc-6.4.2/libraries/OpenAL/package.conf.in
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/package.conf.in	2005-02-19 00:06:43.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/package.conf.in	2006-03-22 00:58:03.000000000 +0900
@@ -9,27 +9,36 @@
 exposed-modules:
 	Sound.OpenAL,
 	Sound.OpenAL.AL,
+	Sound.OpenAL.AL.ALboolean,
+	Sound.OpenAL.AL.Attenuation,
 	Sound.OpenAL.AL.BasicTypes,
 	Sound.OpenAL.AL.Buffer,
+	Sound.OpenAL.AL.BufferInternal,
+	Sound.OpenAL.AL.Doppler,
+	Sound.OpenAL.AL.Errors,
+	Sound.OpenAL.AL.Extensions,
+	Sound.OpenAL.AL.Format,
 	Sound.OpenAL.AL.Listener,
 	Sound.OpenAL.AL.Source,
+	Sound.OpenAL.AL.StringQueries,
 	Sound.OpenAL.ALC,
+	Sound.OpenAL.ALC.BasicTypes,
+	Sound.OpenAL.ALC.Capture,
 	Sound.OpenAL.ALC.Context,
 	Sound.OpenAL.ALC.Device,
 	Sound.OpenAL.ALC.Errors,
-	Sound.OpenAL.ALC.Extensions,
-	Sound.OpenAL.ALUT,
-	Sound.OpenAL.ALUT.Initialization,
-	Sound.OpenAL.ALUT.WAV
+	Sound.OpenAL.ALC.Extensions
 
 hidden-modules:
-	Sound.OpenAL.AL.ALboolean,
-	Sound.OpenAL.AL.Format,
 	Sound.OpenAL.AL.PeekPoke,
 	Sound.OpenAL.AL.QueryUtils,
-	Sound.OpenAL.ALC.BasicTypes,
-	Sound.OpenAL.ALC.Queries,
-	Sound.OpenAL.ALUT.Exception
+	Sound.OpenAL.AL.SourceState,
+	Sound.OpenAL.AL.String,
+	Sound.OpenAL.ALC.ALCboolean,
+	Sound.OpenAL.ALC.QueryUtils,
+	Sound.OpenAL.ALC.String,
+	Sound.OpenAL.Config,
+	Sound.OpenAL.Constants
 
 import-dirs:	IMPORT_DIR
 


Index: hugs98.spec
===================================================================
RCS file: /cvs/extras/rpms/hugs98/devel/hugs98.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hugs98.spec	22 Apr 2006 01:20:55 -0000	1.2
+++ hugs98.spec	24 Apr 2006 11:08:51 -0000	1.3
@@ -2,13 +2,14 @@
 
 Name:		hugs98
 Version:	2005.03
-Release:	1%{?dist}
+Release:	4%{?dist}
 Summary:	Haskell Interpreter
 
 Group:		Development/Languages
 License:	BSD
 URL:		http://www.haskell.org/hugs
 Source0:	http://cvs.haskell.org/Hugs/downloads/Mar2005/%{name}-%{hugs_ver}.tar.gz
+Patch0:		openal-1.0_1.2.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	docbook-utils
@@ -23,7 +24,7 @@
 BuildRequires:	libXt-devel
 BuildRequires:	readline-devel
 BuildRequires:	xorg-x11-proto-devel
-#BuildRequires:	openal-devel
+BuildRequires:	openal-devel
 
 %description
 Hugs 98 is a functional programming system based on Haskell 98, the de
@@ -31,6 +32,15 @@
 98 provides an almost complete implementation of Haskell 98.
 
 
+%package openal
+Summary:	OpenAL package for Hugs98
+Group:		Development/Languages
+Requires:	%{name} = %{version}-%{release}
+
+%description openal
+OpenAL package for Hugs98.
+
+
 %package x11
 Summary:	X11 package for Hugs98
 Group:		Development/Languages
@@ -82,6 +92,7 @@
 
 %prep
 %setup -q -n %{name}-%{hugs_ver}
+%patch0 -p1
 
 
 %build
@@ -116,6 +127,7 @@
 %doc docs/users_guide/users_guide
 %{_bindir}/*
 %{_libdir}/hugs
+%exclude %{_libdir}/hugs/packages/OpenAL
 %exclude %{_libdir}/hugs/packages/X11
 %exclude %{_libdir}/hugs/packages/OpenGL
 %exclude %{_libdir}/hugs/packages/GLUT
@@ -128,6 +140,11 @@
 %doc installed-demos/*
 
 
+%files openal
+%defattr(-,root,root,-)
+%{_libdir}/hugs/packages/OpenAL
+
+
 %files x11
 %defattr(-,root,root,-)
 %{_libdir}/hugs/packages/X11
@@ -149,6 +166,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Gerard Milmeister <gemi at bluewin.ch> - 2005.03-3
+- added patch provided by Jens Petersen to build OpenAL package
+
 * Tue Apr 18 2006 Gerard Milmeister <gemi at bluewin.ch> - 2005.03-1
 - changed version numbering scheme
 - split off demos package



From fedora-extras-commits at redhat.com  Mon Apr 24 11:10:55 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 24 Apr 2006 04:10:55 -0700
Subject: rpms/hugs98/FC-4 openal-1.0_1.2.patch,NONE,1.1 hugs98.spec,1.3,1.4
Message-ID: <200604241110.k3OBAv6T024591@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/hugs98/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24571

Modified Files:
	hugs98.spec 
Added Files:
	openal-1.0_1.2.patch 
Log Message:
added openal support

openal-1.0_1.2.patch:

--- NEW FILE openal-1.0_1.2.patch ---
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/LICENSE ghc-6.4.2/libraries/OpenAL/LICENSE
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/LICENSE	2004-01-03 04:03:07.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/LICENSE	2006-03-22 00:58:03.000000000 +0900
@@ -1,4 +1,4 @@
-Copyright (c) 2003-2004, Sven Panne
+Copyright (c) 2003-2005, Sven Panne
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/Makefile ghc-6.4.2/libraries/OpenAL/Makefile
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/Makefile	2005-03-03 01:39:55.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/Makefile	2006-03-22 00:58:03.000000000 +0900
@@ -4,6 +4,12 @@
 include $(TOP)/mk/boilerplate.mk
 -include config.mk
 
+ifneq "$(findstring clean, $(MAKECMDGOALS))" ""
+# if we're cleaning, then config.mk might have been cleaned already
+AL_BUILD_PACKAGE=yes
+PACKAGE=OpenAL
+endif
+
 ifneq "$(AL_BUILD_PACKAGE)" "no"
 
 # -----------------------------------------------------------------------------
@@ -18,19 +24,17 @@
 	Sound \
 	Sound/OpenAL \
 	Sound/OpenAL/AL \
-	Sound/OpenAL/ALC \
-	Sound/OpenAL/ALUT
+	Sound/OpenAL/ALC
 
 PACKAGE_DEPS = base OpenGL
 
 SRC_HC_OPTS += -Wall -fffi -Iinclude '-\#include "HsOpenAL.h"' -cpp
 
 # WinDoze DLL hell
+# NOTE: For some obscure/unknown reason, OpenAL uses ccall, even on WinDoze...
+SRC_HC_OPTS += -DCALLCONV=ccall
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-SRC_HC_OPTS += -DCALLCONV=stdcall
 SRC_HC_OPTS := $(subst -mno-cygwin,,$(SRC_HC_OPTS))
-else
-SRC_HC_OPTS += -DCALLCONV=ccall
 endif
 
 PACKAGE_CPP_OPTS += -DMAINTAINER=$(MAINTAINER)
@@ -41,18 +45,14 @@
 
 package.conf.inplace \
 package.conf.installed \
-Sound/OpenAL/AL/BasicTypes.$(way_)o \
-Sound/OpenAL/AL/Format.$(way_)o \
-Sound/OpenAL/ALC/BasicTypes.$(way_)o \
-Sound/OpenAL/ALC/Errors.$(way_)o \
-Sound/OpenAL/ALC/Queries.$(way_)o : include/HsOpenALConfig.h
+Sound/OpenAL/Config.$(way_)o \
+Sound/OpenAL/Constants.$(way_)o : include/HsOpenALConfig.h
 
 endif
 
 # -----------------------------------------------------------------------------
 
-DIST_CLEAN_FILES += OpenAL.buildinfo config.cache config.status
-LATE_DIST_CLEAN_FILES += config.mk
+DIST_CLEAN_FILES += OpenAL.buildinfo config.cache config.status config.mk
 
 extraclean::
 	$(RM) -rf autom4te.cache
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/OpenAL.buildinfo.in ghc-6.4.2/libraries/OpenAL/OpenAL.buildinfo.in
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/OpenAL.buildinfo.in	2005-01-16 22:13:05.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/OpenAL.buildinfo.in	2006-03-22 00:58:03.000000000 +0900
@@ -2,6 +2,7 @@
 -- System-dependent values used by Distribution.Simple.defaultUserHooks
 --
 buildable: @BUILD_PACKAGE_BOOL@
+ghc-options: -DCALLCONV=@CALLCONV@
 cc-options: -DCALLCONV=@CALLCONV@
 ld-options: @AL_LIBS@
 frameworks: @AL_FRAMEWORKS@
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/OpenAL.cabal ghc-6.4.2/libraries/OpenAL/OpenAL.cabal
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/OpenAL.cabal	2005-02-11 10:55:55.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/OpenAL.cabal	2006-03-22 00:58:03.000000000 +0900
@@ -1,5 +1,5 @@
 name:		OpenAL
-version:	1.0
+version:	1.2
 license:	BSD3
 license-file:	LICENSE
 maintainer:	Sven Panne <sven.panne at aedion.de>
@@ -10,27 +10,36 @@
 exposed-modules:
 	Sound.OpenAL,
 	Sound.OpenAL.AL,
+	Sound.OpenAL.AL.ALboolean,
+	Sound.OpenAL.AL.Attenuation,
 	Sound.OpenAL.AL.BasicTypes,
 	Sound.OpenAL.AL.Buffer,
+	Sound.OpenAL.AL.BufferInternal,
+	Sound.OpenAL.AL.Doppler,
+	Sound.OpenAL.AL.Errors,
+	Sound.OpenAL.AL.Extensions,
+	Sound.OpenAL.AL.Format,
 	Sound.OpenAL.AL.Listener,
 	Sound.OpenAL.AL.Source,
+	Sound.OpenAL.AL.StringQueries,
 	Sound.OpenAL.ALC,
+	Sound.OpenAL.ALC.BasicTypes,
+	Sound.OpenAL.ALC.Capture,
 	Sound.OpenAL.ALC.Context,
 	Sound.OpenAL.ALC.Device,
 	Sound.OpenAL.ALC.Errors,
-	Sound.OpenAL.ALC.Extensions,
-	Sound.OpenAL.ALUT,
-	Sound.OpenAL.ALUT.Initialization,
-	Sound.OpenAL.ALUT.WAV
+	Sound.OpenAL.ALC.Extensions
 other-modules:
-	Sound.OpenAL.AL.ALboolean,
-	Sound.OpenAL.AL.Format,
 	Sound.OpenAL.AL.PeekPoke,
 	Sound.OpenAL.AL.QueryUtils,
-	Sound.OpenAL.ALC.BasicTypes,
-	Sound.OpenAL.ALC.Queries,
-	Sound.OpenAL.ALUT.Exception
+	Sound.OpenAL.AL.SourceState,
+	Sound.OpenAL.AL.String,
+	Sound.OpenAL.ALC.ALCboolean,
+	Sound.OpenAL.ALC.QueryUtils,
+	Sound.OpenAL.ALC.String,
+	Sound.OpenAL.Config,
+	Sound.OpenAL.Constants
 include-dirs:	include
 includes:	"HsOpenAL.h"
 build-depends:	base, OpenGL
-extensions:	CPP
+extensions:	CPP, ForeignFunctionInterface
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/Sound/OpenAL/AL/ALboolean.hs ghc-6.4.2/libraries/OpenAL/Sound/OpenAL/AL/ALboolean.hs
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/Sound/OpenAL/AL/ALboolean.hs	2004-01-03 04:03:08.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/Sound/OpenAL/AL/ALboolean.hs	2006-03-22 00:58:03.000000000 +0900
@@ -2,7 +2,7 @@
 --------------------------------------------------------------------------------
 -- |
 -- Module      :  Sound.OpenAL.AL.ALboolean
--- Copyright   :  (c) Sven Panne 2003-2004
+-- Copyright   :  (c) Sven Panne 2003-2005
 -- License     :  BSD-style (see the file libraries/OpenAL/LICENSE)
 -- 
 -- Maintainer  :  sven.panne at aedion.de
@@ -14,16 +14,17 @@
 --------------------------------------------------------------------------------
 
 module Sound.OpenAL.AL.ALboolean (
-   ALboolean, marshalALboolean, unmarshalALboolean
+   marshalALboolean, unmarshalALboolean
 ) where
 
 import Sound.OpenAL.AL.BasicTypes ( ALboolean )
+import Sound.OpenAL.Constants ( al_FALSE, al_TRUE )
 
 --------------------------------------------------------------------------------
 
 marshalALboolean :: Bool -> ALboolean
-marshalALboolean False = 0
-marshalALboolean True  = 1
+marshalALboolean False = al_FALSE
+marshalALboolean True  = al_TRUE
 
 unmarshalALboolean :: ALboolean -> Bool
-unmarshalALboolean = (/= 0)
+unmarshalALboolean = (/= al_FALSE)
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/Sound/OpenAL/AL/Attenuation.hs ghc-6.4.2/libraries/OpenAL/Sound/OpenAL/AL/Attenuation.hs
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/Sound/OpenAL/AL/Attenuation.hs	1970-01-01 09:00:00.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/Sound/OpenAL/AL/Attenuation.hs	2006-03-22 00:58:03.000000000 +0900
@@ -0,0 +1,211 @@
+--------------------------------------------------------------------------------
+-- |
+-- Module      :  Sound.OpenAL.AL.Attenuation
+-- Copyright   :  (c) Sven Panne 2005
+-- License     :  BSD-style (see the file libraries/OpenAL/LICENSE)
+-- 
+-- Maintainer  :  sven.panne at aedion.de
+-- Stability   :  provisional
+-- Portability :  portable
+--
+-- This module corresponds to section 3.4 (Attenuation By Distance) of the
+-- OpenAL Specification and Reference (version 1.1).
+-- 
+--------------------------------------------------------------------------------
+
+module Sound.OpenAL.AL.Attenuation (
+   -- * Introduction
+   -- $Introduction
+
+   -- * Handling the Distance Model
+   DistanceModel(..), distanceModel
+
+   -- * Evaluation of Gain\/Attenuation Related State
[...9030 lines suppressed...]
+#undef CONST_AL_ORIENTATION
+
+/* The value of AL_OUT_OF_MEMORY. */
+#undef CONST_AL_OUT_OF_MEMORY
+
+/* The value of AL_PAUSED. */
+#undef CONST_AL_PAUSED
+
+/* The value of AL_PITCH. */
+#undef CONST_AL_PITCH
+
+/* The value of AL_PLAYING. */
+#undef CONST_AL_PLAYING
+
+/* The value of AL_POSITION. */
+#undef CONST_AL_POSITION
+
+/* The value of AL_REFERENCE_DISTANCE. */
+#undef CONST_AL_REFERENCE_DISTANCE
+
+/* The value of AL_RENDERER. */
+#undef CONST_AL_RENDERER
+
+/* The value of AL_ROLLOFF_FACTOR. */
+#undef CONST_AL_ROLLOFF_FACTOR
+
+/* The value of AL_SAMPLE_OFFSET. */
+#undef CONST_AL_SAMPLE_OFFSET
+
+/* The value of AL_SEC_OFFSET. */
+#undef CONST_AL_SEC_OFFSET
+
+/* The value of AL_SIZE. */
+#undef CONST_AL_SIZE
+
+/* The value of AL_SOURCE_RELATIVE. */
+#undef CONST_AL_SOURCE_RELATIVE
+
+/* The value of AL_SOURCE_STATE. */
+#undef CONST_AL_SOURCE_STATE
+
+/* The value of AL_SOURCE_TYPE. */
+#undef CONST_AL_SOURCE_TYPE
+
+/* The value of AL_SPEED_OF_SOUND. */
+#undef CONST_AL_SPEED_OF_SOUND
+
+/* The value of AL_STATIC. */
+#undef CONST_AL_STATIC
+
+/* The value of AL_STOPPED. */
+#undef CONST_AL_STOPPED
+
+/* The value of AL_STREAMING. */
+#undef CONST_AL_STREAMING
+
+/* The value of AL_TRUE. */
+#undef CONST_AL_TRUE
+
+/* The value of AL_UNDETERMINED. */
+#undef CONST_AL_UNDETERMINED
+
+/* The value of AL_VELOCITY. */
+#undef CONST_AL_VELOCITY
+
+/* The value of AL_VENDOR. */
+#undef CONST_AL_VENDOR
+
+/* The value of AL_VERSION. */
+#undef CONST_AL_VERSION
 
 /* Define to 1 if you have the <AL/alc.h> header file. */
 #undef HAVE_AL_ALC_H
@@ -63,6 +279,9 @@
 /* Define to 1 if you have the <AL/alext.h> header file. */
 #undef HAVE_AL_ALEXT_H
 
+/* Define to 1 if you have the <AL/al.h> header file. */
+#undef HAVE_AL_AL_H
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
@@ -75,6 +294,9 @@
 /* Define to 1 if you have the <OpenAL/alext.h> header file. */
 #undef HAVE_OPENAL_ALEXT_H
 
+/* Define to 1 if you have the <OpenAL/al.h> header file. */
+#undef HAVE_OPENAL_AL_H
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
@@ -96,23 +318,50 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Define to Haskell type for ALbitfield */
-#undef HTYPE_ALBITFIELD
-
 /* Define to Haskell type for ALboolean */
 #undef HTYPE_ALBOOLEAN
 
 /* Define to Haskell type for ALbyte */
 #undef HTYPE_ALBYTE
 
+/* Define to Haskell type for ALCboolean */
+#undef HTYPE_ALCBOOLEAN
+
+/* Define to Haskell type for ALCbyte */
+#undef HTYPE_ALCBYTE
+
+/* Define to Haskell type for ALCchar */
+#undef HTYPE_ALCCHAR
+
+/* Define to Haskell type for ALCdouble */
+#undef HTYPE_ALCDOUBLE
+
 /* Define to Haskell type for ALCenum */
 #undef HTYPE_ALCENUM
 
-/* Define to Haskell type for ALclampd */
-#undef HTYPE_ALCLAMPD
+/* Define to Haskell type for ALCfloat */
+#undef HTYPE_ALCFLOAT
+
+/* Define to Haskell type for ALchar */
+#undef HTYPE_ALCHAR
+
+/* Define to Haskell type for ALCint */
+#undef HTYPE_ALCINT
+
+/* Define to Haskell type for ALCshort */
+#undef HTYPE_ALCSHORT
+
+/* Define to Haskell type for ALCsizei */
+#undef HTYPE_ALCSIZEI
+
+/* Define to Haskell type for ALCubyte */
+#undef HTYPE_ALCUBYTE
+
+/* Define to Haskell type for ALCuint */
+#undef HTYPE_ALCUINT
 
-/* Define to Haskell type for ALclampf */
-#undef HTYPE_ALCLAMPF
+/* Define to Haskell type for ALCushort */
+#undef HTYPE_ALCUSHORT
 
 /* Define to Haskell type for ALdouble */
 #undef HTYPE_ALDOUBLE
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/package.conf.in ghc-6.4.2/libraries/OpenAL/package.conf.in
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/package.conf.in	2005-02-19 00:06:43.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/package.conf.in	2006-03-22 00:58:03.000000000 +0900
@@ -9,27 +9,36 @@
 exposed-modules:
 	Sound.OpenAL,
 	Sound.OpenAL.AL,
+	Sound.OpenAL.AL.ALboolean,
+	Sound.OpenAL.AL.Attenuation,
 	Sound.OpenAL.AL.BasicTypes,
 	Sound.OpenAL.AL.Buffer,
+	Sound.OpenAL.AL.BufferInternal,
+	Sound.OpenAL.AL.Doppler,
+	Sound.OpenAL.AL.Errors,
+	Sound.OpenAL.AL.Extensions,
+	Sound.OpenAL.AL.Format,
 	Sound.OpenAL.AL.Listener,
 	Sound.OpenAL.AL.Source,
+	Sound.OpenAL.AL.StringQueries,
 	Sound.OpenAL.ALC,
+	Sound.OpenAL.ALC.BasicTypes,
+	Sound.OpenAL.ALC.Capture,
 	Sound.OpenAL.ALC.Context,
 	Sound.OpenAL.ALC.Device,
 	Sound.OpenAL.ALC.Errors,
-	Sound.OpenAL.ALC.Extensions,
-	Sound.OpenAL.ALUT,
-	Sound.OpenAL.ALUT.Initialization,
-	Sound.OpenAL.ALUT.WAV
+	Sound.OpenAL.ALC.Extensions
 
 hidden-modules:
-	Sound.OpenAL.AL.ALboolean,
-	Sound.OpenAL.AL.Format,
 	Sound.OpenAL.AL.PeekPoke,
 	Sound.OpenAL.AL.QueryUtils,
-	Sound.OpenAL.ALC.BasicTypes,
-	Sound.OpenAL.ALC.Queries,
-	Sound.OpenAL.ALUT.Exception
+	Sound.OpenAL.AL.SourceState,
+	Sound.OpenAL.AL.String,
+	Sound.OpenAL.ALC.ALCboolean,
+	Sound.OpenAL.ALC.QueryUtils,
+	Sound.OpenAL.ALC.String,
+	Sound.OpenAL.Config,
+	Sound.OpenAL.Constants
 
 import-dirs:	IMPORT_DIR
 


Index: hugs98.spec
===================================================================
RCS file: /cvs/extras/rpms/hugs98/FC-4/hugs98.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hugs98.spec	23 Apr 2006 21:20:11 -0000	1.3
+++ hugs98.spec	24 Apr 2006 11:10:55 -0000	1.4
@@ -2,13 +2,14 @@
 
 Name:		hugs98
 Version:	2005.03
-Release:	1%{?dist}
+Release:	4%{?dist}
 Summary:	Haskell Interpreter
 
 Group:		Development/Languages
 License:	BSD
 URL:		http://www.haskell.org/hugs
 Source0:	http://cvs.haskell.org/Hugs/downloads/Mar2005/%{name}-%{hugs_ver}.tar.gz
+Patch0:		openal-1.0_1.2.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	docbook-utils
@@ -16,7 +17,7 @@
 BuildRequires:	libGL-devel
 BuildRequires:	libGLU-devel
 BuildRequires:	xorg-x11-devel
-#BuildRequires:	openal-devel
+BuildRequires:	openal-devel
 
 %description
 Hugs 98 is a functional programming system based on Haskell 98, the de
@@ -24,6 +25,15 @@
 98 provides an almost complete implementation of Haskell 98.
 
 
+%package openal
+Summary:	OpenAL package for Hugs98
+Group:		Development/Languages
+Requires:	%{name} = %{version}-%{release}
+
+%description openal
+OpenAL package for Hugs98.
+
+
 %package x11
 Summary:	X11 package for Hugs98
 Group:		Development/Languages
@@ -75,6 +85,7 @@
 
 %prep
 %setup -q -n %{name}-%{hugs_ver}
+%patch0 -p1
 
 
 %build
@@ -109,6 +120,7 @@
 %doc docs/users_guide/users_guide
 %{_bindir}/*
 %{_libdir}/hugs
+%exclude %{_libdir}/hugs/packages/OpenAL
 %exclude %{_libdir}/hugs/packages/X11
 %exclude %{_libdir}/hugs/packages/OpenGL
 %exclude %{_libdir}/hugs/packages/GLUT
@@ -121,6 +133,11 @@
 %doc installed-demos/*
 
 
+%files openal
+%defattr(-,root,root,-)
+%{_libdir}/hugs/packages/OpenAL
+
+
 %files x11
 %defattr(-,root,root,-)
 %{_libdir}/hugs/packages/X11
@@ -142,6 +159,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Gerard Milmeister <gemi at bluewin.ch> - 2005.03-3
+- added patch provided by Jens Petersen to build OpenAL package
+
 * Tue Apr 18 2006 Gerard Milmeister <gemi at bluewin.ch> - 2005.03-1
 - changed version numbering scheme
 - split off demos package



From fedora-extras-commits at redhat.com  Mon Apr 24 12:04:49 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 24 Apr 2006 05:04:49 -0700
Subject: rpms/perl-Algorithm-Dependency/FC-5 .cvsignore, 1.3,
	1.4 perl-Algorithm-Dependency.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200604241204.k3OC4poW026981@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Algorithm-Dependency/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26960

Modified Files:
	.cvsignore perl-Algorithm-Dependency.spec sources 
Log Message:
* Mon Apr 24 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.102-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-Dependency/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Oct 2005 02:59:40 -0000	1.3
+++ .cvsignore	24 Apr 2006 12:04:49 -0000	1.4
@@ -1 +1 @@
-Algorithm-Dependency-1.101.tar.gz
+Algorithm-Dependency-1.102.tar.gz


Index: perl-Algorithm-Dependency.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-Dependency/FC-5/perl-Algorithm-Dependency.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Algorithm-Dependency.spec	28 Feb 2006 23:15:38 -0000	1.4
+++ perl-Algorithm-Dependency.spec	24 Apr 2006 12:04:49 -0000	1.5
@@ -1,6 +1,6 @@
 Name: 		perl-Algorithm-Dependency
-Version: 	1.101
-Release: 	2%{?dist}
+Version: 	1.102
+Release: 	1%{?dist}
 Summary: 	Algorithmic framework for implementing dependency trees
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Apr 24 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.102-1
+- Upstream update.
+
 * Wed Mar 01 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.101-2
 - Rebuild for perl-5.8.8.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-Dependency/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Oct 2005 02:59:40 -0000	1.3
+++ sources	24 Apr 2006 12:04:49 -0000	1.4
@@ -1 +1 @@
-d6187a17fa90cbf4d1c513ea2c500269  Algorithm-Dependency-1.101.tar.gz
+971111997767dd456cb4a4e967c97ca3  Algorithm-Dependency-1.102.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 24 12:05:31 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 24 Apr 2006 05:05:31 -0700
Subject: rpms/perl-Algorithm-Dependency/FC-4 .cvsignore, 1.3,
	1.4 perl-Algorithm-Dependency.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200604241205.k3OC5XSb027046@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Algorithm-Dependency/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27025

Modified Files:
	.cvsignore perl-Algorithm-Dependency.spec sources 
Log Message:
* Mon Apr 24 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.102-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-Dependency/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Oct 2005 02:59:40 -0000	1.3
+++ .cvsignore	24 Apr 2006 12:05:31 -0000	1.4
@@ -1 +1 @@
-Algorithm-Dependency-1.101.tar.gz
+Algorithm-Dependency-1.102.tar.gz


Index: perl-Algorithm-Dependency.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-Dependency/FC-4/perl-Algorithm-Dependency.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Algorithm-Dependency.spec	12 Oct 2005 02:59:40 -0000	1.3
+++ perl-Algorithm-Dependency.spec	24 Apr 2006 12:05:31 -0000	1.4
@@ -1,5 +1,5 @@
 Name: 		perl-Algorithm-Dependency
-Version: 	1.101
+Version: 	1.102
 Release: 	1%{?dist}
 Summary: 	Algorithmic framework for implementing dependency trees
 License: 	GPL or Artistic
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Apr 24 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.102-1
+- Upstream update.
+
 * Wed Oct 12 2005 Ralf Corsepius <rc040203 at freenet.de> - 1.101-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-Dependency/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Oct 2005 02:59:40 -0000	1.3
+++ sources	24 Apr 2006 12:05:31 -0000	1.4
@@ -1 +1 @@
-d6187a17fa90cbf4d1c513ea2c500269  Algorithm-Dependency-1.101.tar.gz
+971111997767dd456cb4a4e967c97ca3  Algorithm-Dependency-1.102.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 24 14:37:06 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 24 Apr 2006 07:37:06 -0700
Subject: rpms/glib - New directory
Message-ID: <200604241437.k3OEb8n2031963@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/glib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31937/glib

Log Message:
Directory /cvs/extras/rpms/glib added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 24 14:37:07 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 24 Apr 2006 07:37:07 -0700
Subject: rpms/glib/devel - New directory
Message-ID: <200604241437.k3OEb9eI031966@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/glib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31937/glib/devel

Log Message:
Directory /cvs/extras/rpms/glib/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 24 14:37:15 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 24 Apr 2006 07:37:15 -0700
Subject: rpms/glib Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604241437.k3OEbHGx032015@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/glib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31982

Added Files:
	Makefile import.log 
Log Message:
Setup of module glib


--- NEW FILE Makefile ---
# Top level Makefile for module glib
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Apr 24 14:37:16 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 24 Apr 2006 07:37:16 -0700
Subject: rpms/glib/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200604241437.k3OEbIlZ032018@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/glib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31982/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module glib


--- 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 Apr 24 14:37:42 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 24 Apr 2006 07:37:42 -0700
Subject: rpms/glib import.log,1.1,1.2
Message-ID: <200604241438.k3OEcEKA032106@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/glib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32063

Modified Files:
	import.log 
Log Message:
auto-import glib-1.2.10-20 on branch devel from glib-1.2.10-20.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/glib/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Apr 2006 14:37:15 -0000	1.1
+++ import.log	24 Apr 2006 14:37:42 -0000	1.2
@@ -0,0 +1 @@
+glib-1_2_10-20:HEAD:glib-1.2.10-20.src.rpm:1145889458



From fedora-extras-commits at redhat.com  Mon Apr 24 14:37:42 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 24 Apr 2006 07:37:42 -0700
Subject: rpms/glib/devel glib-1.2.10-gcc34.patch, NONE,
	1.1 glib-1.2.10-isowarning.patch, NONE,
	1.1 glib-1.2.10-underquoted.patch, NONE, 1.1 glib.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604241438.k3OEcEs0032110@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/glib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32063/devel

Modified Files:
	.cvsignore sources 
Added Files:
	glib-1.2.10-gcc34.patch glib-1.2.10-isowarning.patch 
	glib-1.2.10-underquoted.patch glib.spec 
Log Message:
auto-import glib-1.2.10-20 on branch devel from glib-1.2.10-20.src.rpm

glib-1.2.10-gcc34.patch:

--- NEW FILE glib-1.2.10-gcc34.patch ---
--- glib-1.2.10/glib.h.gcc34	2004-06-21 09:15:12.000000000 -0400
+++ glib-1.2.10/glib.h	2004-06-21 09:15:22.000000000 -0400
@@ -272,7 +272,7 @@
 /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
  * macros, so we can refer to them as strings unconditionally.
  */
-#ifdef	__GNUC__
+#if defined (__GNUC__) && (__GNUC__ < 3)
 #define	G_GNUC_FUNCTION		__FUNCTION__
 #define	G_GNUC_PRETTY_FUNCTION	__PRETTY_FUNCTION__
 #else	/* !__GNUC__ */

glib-1.2.10-isowarning.patch:

--- NEW FILE glib-1.2.10-isowarning.patch ---
--- glib-1.2.10/glib.h.isowarning	Mon Feb 26 22:44:38 2001
+++ glib-1.2.10/glib.h	Sat Jul 21 19:36:31 2001
@@ -1291,6 +1291,13 @@
 #ifndef	G_LOG_DOMAIN
 #define	G_LOG_DOMAIN	((gchar*) 0)
 #endif	/* G_LOG_DOMAIN */
+
+/* Suppress warnings when GCC is in -pedantic mode and not -std=c99
+ */
+#if (__GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96))
+#pragma GCC system_header
+#endif
+
 #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 #define	g_error(...)	g_log (G_LOG_DOMAIN,         \
 			       G_LOG_LEVEL_ERROR,    \

glib-1.2.10-underquoted.patch:

--- NEW FILE glib-1.2.10-underquoted.patch ---
--- glib-1.2.10/glib.m4.underquoted	2004-08-09 09:10:44.497000620 +0100
+++ glib-1.2.10/glib.m4	2004-08-09 09:11:01.446759680 +0100
@@ -5,7 +5,7 @@
 dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or 
 dnl gthread is specified in MODULES, pass to glib-config
 dnl
-AC_DEFUN(AM_PATH_GLIB,
+AC_DEFUN([AM_PATH_GLIB],
 [dnl 
 dnl Get the cflags and libraries from the glib-config script
 dnl


--- NEW FILE glib.spec ---

Summary: A library of handy utility functions
Name: 	 glib
Epoch:	 1
Version: 1.2.10
Release: 20%{?dist}

License: LGPL
Group:	 System Environment/Libraries
URL:	 http://www.gtk.org/
Source:  ftp://ftp.gimp.org/pub/gtk/v1.2/glib-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# Suppress warnings about varargs macros for -pedantic
Patch1: glib-1.2.10-isowarning.patch
Patch2: glib-1.2.10-gcc34.patch
Patch3: glib-1.2.10-underquoted.patch

%description
GLib is a handy library of utility functions. This C library is
designed to solve some portability problems and provide other useful
functionality which most programs require.

%package devel
Summary: Libraries and header files for %{name} development 
Group:	 Development/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: pkgconfig
%description devel
%{summary}.


%prep
%setup -q 

%patch1 -p1 -b .isowarning
%patch2 -p1 -b .gcc34
%patch3 -p1 -b .underquoted


%build
%configure --disable-static

make %{?_smp_mflags}


# I *know* ||: isn't needed, but this *is* a legacy pkg afterall.
%check || :
make check


%install
rm -rf $RPM_BUILD_ROOT

%makeinstall

rm -rf $RPM_BUILD_ROOT%{_infodir}
rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
# libgmodule-1.2.so.0* missing eXecute bit
chmod a+x $RPM_BUILD_ROOT%{_libdir}/lib*.so


%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,-)
%{_bindir}/glib-config
%{_libdir}/lib*.so
%{_libdir}/glib/
%{_libdir}/pkgconfig/*
%{_includedir}/*
%{_mandir}/man1/*
%{_datadir}/aclocal/*


%changelog
* Wed Apr 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1:1.2.10-20
- cleanup %%description
- libgmodule-1.2.so.0* missing eXecute bit
- utf-8'ize specfile

* Thu Apr 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1:1.2.10-19
- cleanup for Extras
- -devel: Requires: pkgconfig

* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:1.2.10-18.2.2
- bump again for double-long bug on ppc(64)

* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:1.2.10-18.2.1
- rebuilt for new gcc4.1 snapshot and glibc changes

* Tue Jan  3 2006 Jesse Keating <jkeating at redhat.com> 1:1.2.10-18.2
- rebuilt again

* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
- rebuilt

* Mon Nov 21 2005 Matthias Clasen <mclasen at redhat.com> 1:1.2.10-18
- Make sure all libraries are stripped

* Mon Nov  7 2005 Matthias Clasen <mclasen at redhat.com> 1:1.2.10-17
- Remove .la files and static libs from the -devel package.

* Wed Mar  2 2005 Matthias Clasen <mclasen at redhat.com> 1:1.2.10-16
- Rebuild with gcc4

* Mon Aug  9 2004 Tim Waugh <twaugh at redhat.com> 1:1.2.10-15
- Fixed underquoted m4 definitions.

* Mon Jun 20 2004 Matthias Clasen <mclasen at redhat.com> 1:1.2.10-14
- Make it build with gcc 3.4

* 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:1.2.10-11.1
- build for RHEL

* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Jun  3 2003 Jeff Johnson <jbj at redhat.com>
- add explicit epoch's where needed.

* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt

* Fri Nov 29 2002 Tim Powers <timp at redhat.com> 1:1.2.10-9
- remove unpackaged files from the buildroot

* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Thu May 23 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Wed Jan 09 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Sat Jul 21 2001 Owen Taylor <otaylor at redhat.com>
- Add #pragma GCC system_header to supress warnings when in -pedantic
  mode. (41271)

* Tue Jul 10 2001 Trond Eivind Glomsrod <teg at redhat.com>
- s/Copyright/License/
- Make the devel subpackage depend on the main package

* Sun Jun 24 2001 Elliot Lee <sopwith at redhat.com>
- Bump release + rebuild.

* Sun Apr 22 2001  <jrb at redhat.com>
- Include pc files.

* Tue Apr 17 2001 Jonathan Blandford <jrb at redhat.com>
- Version 1.2.10

* Mon Mar 05 2001 Owen Taylor <otaylor at redhat.com>
- Version 1.2.9

* Wed Feb 28 2001 Owen Taylor <otaylor at redhat.com>
- Version 1.2.9pre3

* Tue Feb 27 2001 Owen Taylor <otaylor at redhat.com>
- Version 1.2.9pre2

* Tue Feb 13 2001 Owen Taylor <otaylor at redhat.com>
- Version 1.2.9pre1

* Sat Oct 28 2000 Owen Taylor <otaylor at redhat.com>
- Add patch to suppress warnings from GCC by using
  C99 standard varargs macros

* 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

* Mon Jun 19 2000 Preston Brown <pbrown at redhat.com>
- FHS paths

* Thu May 25 2000 Owen Taylor <otaylor at redhat.com>
- Version 1.2.8

* Mon May  1 2000 Matt Wilson <msw at redhat.com>
- version 1.2.7

* Fri Feb 04 2000 Owen Taylor <otaylor at redhat.com>
- Added fixes from stable branch of CVS

* Thu Oct 7  1999 Owen Taylor <otaylor at redhat.com>
- version 1.2.6

* Fri Sep 24 1999 Owen Taylor <otaylor at redhat.com>
- version 1.2.5

* Fri Sep 17 1999 Owen Taylor <otaylor at redhat.com>
- version 1.2.4

* Mon Jun 7 1999 Owen Taylor <otaylor at redhat.com>
- version 1.2.3

* Thu Mar 25 1999 Michael Fulbright <drmike at redhat.com>
- version 1.2.1

* Fri Feb 26 1999 Michael Fulbright <drmike at redhat.com>
- Version 1.2

* Thu Feb 25 1999 Michael Fulbright <drmike at redhat.com>
- version 1.2.0pre1

* Tue Feb 23 1999 Cristian Gafton <gafton at redhat.com>
- new description tags 

* Sun Feb 21 1999 Michael Fulbright <drmike at redhat.com>
- removed libtoolize from %build

* Thu Feb 11 1999 Michael Fulbright <drmike at redhat.com>
- added libgthread to file list

* Fri Feb 05 1999 Michael Fulbright <drmike at redhat.com>
- version 1.1.15

* Wed Feb 03 1999 Michael Fulbright <drmike at redhat.com>
- version 1.1.14

* Mon Jan 18 1999 Michael Fulbright <drmike at redhat.com>
- version 1.1.13

* Wed Jan 06 1999 Michael Fulbright <drmike at redhat.com>
- version 1.1.12

* Wed Dec 16 1998 Michael Fulbright <drmike at redhat.com>
- updated in preparation for the GNOME freeze

* Mon Apr 13 1998 Marc Ewing <marc at redhat.com>
- Split out glib package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glib/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Apr 2006 14:37:16 -0000	1.1
+++ .cvsignore	24 Apr 2006 14:37:42 -0000	1.2
@@ -0,0 +1 @@
+glib-1.2.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glib/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Apr 2006 14:37:16 -0000	1.1
+++ sources	24 Apr 2006 14:37:42 -0000	1.2
@@ -0,0 +1 @@
+6fe30dad87c77b91b632def29dd69ef9  glib-1.2.10.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 24 14:40:38 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 24 Apr 2006 07:40:38 -0700
Subject: owners owners.list,1.884,1.885
Message-ID: <200604241440.k3OEeeVs032176@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32159

Modified Files:
	owners.list 
Log Message:
+glib



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.884
retrieving revision 1.885
diff -u -r1.884 -r1.885
--- owners.list	24 Apr 2006 08:51:04 -0000	1.884
+++ owners.list	24 Apr 2006 14:40:38 -0000	1.885
@@ -349,6 +349,7 @@
 Fedora Extras|gktools|GUI utilities for KerberosV tickets|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gl-117|GL-117 is an action flight simulator|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|glabels|A program for creating labels and business cards for GNOME|jspaleta at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|glib|Summary: A library of handy utility functions|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|glibmm24|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|Glide3|Glide3 runtime for the 3Dfx Voodoo family of cards|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|Glide3-libGL|Glide3 OpenGL library for use with 3Dfx Voodoo 1 & 2 cards|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Apr 24 14:46:19 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Mon, 24 Apr 2006 07:46:19 -0700
Subject: rpms/swh-plugins - New directory
Message-ID: <200604241446.k3OEkLHj032328@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/swh-plugins
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32302/swh-plugins

Log Message:
Directory /cvs/extras/rpms/swh-plugins added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 24 14:46:19 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Mon, 24 Apr 2006 07:46:19 -0700
Subject: rpms/swh-plugins/devel - New directory
Message-ID: <200604241446.k3OEkLwO032331@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/swh-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32302/swh-plugins/devel

Log Message:
Directory /cvs/extras/rpms/swh-plugins/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 24 14:46:59 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Mon, 24 Apr 2006 07:46:59 -0700
Subject: rpms/swh-plugins Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604241447.k3OEl1ZZ032377@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/swh-plugins
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32349

Added Files:
	Makefile import.log 
Log Message:
Setup of module swh-plugins


--- NEW FILE Makefile ---
# Top level Makefile for module swh-plugins
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Apr 24 14:46:59 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Mon, 24 Apr 2006 07:46:59 -0700
Subject: rpms/swh-plugins/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604241447.k3OEl1Lb032380@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/swh-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32349/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module swh-plugins


--- 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 Apr 24 14:48:16 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Mon, 24 Apr 2006 07:48:16 -0700
Subject: rpms/swh-plugins import.log,1.1,1.2
Message-ID: <200604241448.k3OEmmvV032453@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/swh-plugins
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32417

Modified Files:
	import.log 
Log Message:
auto-import swh-plugins-0.4.14-2 on branch devel from swh-plugins-0.4.14-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/swh-plugins/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Apr 2006 14:46:59 -0000	1.1
+++ import.log	24 Apr 2006 14:48:16 -0000	1.2
@@ -0,0 +1 @@
+swh-plugins-0_4_14-2:HEAD:swh-plugins-0.4.14-2.src.rpm:1145890074



From fedora-extras-commits at redhat.com  Mon Apr 24 14:48:16 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Mon, 24 Apr 2006 07:48:16 -0700
Subject: rpms/swh-plugins/devel swh-plugins.spec, NONE, 1.1 .cvsignore, 1.1, 
	1.2 sources, 1.1, 1.2
Message-ID: <200604241448.k3OEmmwq032457@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/swh-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32417/devel

Modified Files:
	.cvsignore sources 
Added Files:
	swh-plugins.spec 
Log Message:
auto-import swh-plugins-0.4.14-2 on branch devel from swh-plugins-0.4.14-2.src.rpm


--- NEW FILE swh-plugins.spec ---
Summary:      A set of audio plugins for LADSPA
Name:         swh-plugins
Version:      0.4.14
Release:      2%{?dist}
License:      GPL
Group:        Applications/Multimedia
Source:       http://plugin.org.uk/releases/0.4.14/swh-plugins-0.4.14.tar.gz
URL:          http://plugin.org.uk/
BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: fftw3-devel ladspa-devel libxml2-devel

%description
A set of audio plugins for LADSPA (see http://plugin.org.uk/ for more
details).

%prep
%setup -q

%build
CFLAGS="$RPM_OPT_FLAGS" %configure
%{__make} %{?_smp_mflags} static

%install
%{__rm} -rf %{buildroot}
%{__make} DESTDIR=%{buildroot} install
%find_lang swh-plugins

%clean
%{__rm} -rf %{buildroot}

%files -f swh-plugins.lang
%defattr(-,root,root)
%doc AUTHORS ChangeLog COPYING README
%{_libdir}/ladspa/*.so
%{_datadir}/ladspa/rdf/*

%changelog
* Mon Apr 24 2006 Anthony Green <green at redhat.com> 0.4.14-2
- Fix Summary.
- Don't install INSTALL or the empty NEWS file.
- Remove some BuildRequirements.

* Sat Apr 22 2006 Anthony Green <green at redhat.com> 0.4.14-1
- Build for Fedora Extras.
- Use %find_lang.
- Don't own the ladspa dir.

* Fri Jun 24 2005 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.4.13
- removed ps_in and ps_out external declarations in pitchscale.h,
  otherwise build fails in fc4/gcc4
* Fri Mar 25 2005 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.4.13-1
- updated to 0.4.13
* Mon Jan 24 2005 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.4.12-1
- updated to 0.4.12
* Mon Dec 20 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu>  
- spec file cleanup
* Mon Nov 15 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.4.11-1
- updated to 0.4.11
* Tue Jul 20 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.4.7-1
- updated to 0.4.7
- multiarch build, up optimization to original -O6
* Sun Jul  4 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.4.4-1
- updated to 0.4.4
* Fri May 14 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.4.3-3
- more buildrequires, fixed file list
- patch for gcc3.3 happiness
* Sat May  8 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- added proper buildrequires
* Wed Feb 18 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.4.3-2
- changed name of ladspa package, do not depend on it explicitly
* Tue Dec  2 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.4.3-1
- updated to 0.4.3
* Sat Oct 11 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.4.2-2
- updated to snapshot of 2003-08-19, jackEq requires dj_eq_1901
* Mon Jun  2 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.4.2-1
- updated to 0.4.2
* Tue Apr  8 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.4.0-2
- rebuilt for newer version of fftw
* Tue Apr  8 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.4.0-1
- updated to 0.4.0
* Fri Mar  7 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.7-1
- updated to 0.3.7
* Mon Jan 13 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.6-1
- updated to 0.3.6... boy, this is movin fast :-)
* Fri Jan 10 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.5
- updated to 0.3.5... should have waited :-)
* Thu Jan  9 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.4
- updated to 0.3.4
* Wed Dec 06 2002 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.3
- updated to 0.3.3
* Wed Dec 04 2002 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.2
- updated to 0.3.2
* Fri Nov  1 2002 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.0
- updated to 0.3.0
* Fri Sep 06 2002 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu>
- updated to 0.2.8
* Fri Jan 18 2002 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu>
- updated to 0.2.3
- changed to globbing of .so files
* Thu Aug 23 2001 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu>
- added prefix, cleanup


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/swh-plugins/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Apr 2006 14:46:59 -0000	1.1
+++ .cvsignore	24 Apr 2006 14:48:16 -0000	1.2
@@ -0,0 +1 @@
+swh-plugins-0.4.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/swh-plugins/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Apr 2006 14:46:59 -0000	1.1
+++ sources	24 Apr 2006 14:48:16 -0000	1.2
@@ -0,0 +1 @@
+1d8418b85034ee9153c726c4c7188a1a  swh-plugins-0.4.14.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 24 14:52:18 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Mon, 24 Apr 2006 07:52:18 -0700
Subject: owners owners.list,1.885,1.886
Message-ID: <200604241452.k3OEqK0R032517@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32498

Modified Files:
	owners.list 
Log Message:
Add swh-plugins.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.885
retrieving revision 1.886
diff -u -r1.885 -r1.886
--- owners.list	24 Apr 2006 14:40:38 -0000	1.885
+++ owners.list	24 Apr 2006 14:52:17 -0000	1.886
@@ -1436,6 +1436,7 @@
 Fedora Extras|svn2cl|Create a ChangeLog from a Subversion log|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|swatch|A tool for actively monitoring log files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|sweep|An audio editor and live playback tool|gemi at bluewin.ch|extras-qa at fedoraproject.org|
+Fedora Extras|swh-plugins|A set of audio plugins for LADSPA|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|sword|Free Bible Software Project|mpeters at mac.com|extras-qa at fedoraproject.org|
 Fedora Extras|syck|YAML for C, Python, and PHP|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
 Fedora Extras|sylpheed|GTK+ based, lightweight, and fast email client|bugs.michael at gmx.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Apr 24 15:08:58 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 24 Apr 2006 08:08:58 -0700
Subject: owners owners.list,1.886,1.887
Message-ID: <200604241509.k3OF90jY002553@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2530

Modified Files:
	owners.list 
Log Message:
drop extraneous Summary: from bad cut-n-paste



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.886
retrieving revision 1.887
diff -u -r1.886 -r1.887
--- owners.list	24 Apr 2006 14:52:17 -0000	1.886
+++ owners.list	24 Apr 2006 15:08:58 -0000	1.887
@@ -349,7 +349,7 @@
 Fedora Extras|gktools|GUI utilities for KerberosV tickets|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gl-117|GL-117 is an action flight simulator|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|glabels|A program for creating labels and business cards for GNOME|jspaleta at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|glib|Summary: A library of handy utility functions|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|glib|A library of handy utility functions|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|glibmm24|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|Glide3|Glide3 runtime for the 3Dfx Voodoo family of cards|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|Glide3-libGL|Glide3 OpenGL library for use with 3Dfx Voodoo 1 & 2 cards|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Apr 24 15:12:40 2006
From: fedora-extras-commits at redhat.com (Mike Bonnet (mikeb))
Date: Mon, 24 Apr 2006 08:12:40 -0700
Subject: krbVmodule configure.in,1.16,1.17 python-krbV.spec,1.1,1.2
Message-ID: <200604241512.k3OFCeU0002596@cvs-int.fedora.redhat.com>

Author: mikeb

Update of /cvs/devel/krbVmodule
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2577

Modified Files:
	configure.in python-krbV.spec 
Log Message:
bump version number due to API changes, and remove version-number parsing from the spec file


Index: configure.in
===================================================================
RCS file: /cvs/devel/krbVmodule/configure.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- configure.in	5 Apr 2006 07:17:08 -0000	1.16
+++ configure.in	24 Apr 2006 15:12:38 -0000	1.17
@@ -1,6 +1,6 @@
 AC_INIT
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(python-krbV, 1.0.11)
+AM_INIT_AUTOMAKE(python-krbV, 1.0.12)
 
 AC_PREFIX_DEFAULT(/usr)
 


Index: python-krbV.spec
===================================================================
RCS file: /cvs/devel/krbVmodule/python-krbV.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-krbV.spec	5 Apr 2006 07:17:08 -0000	1.1
+++ python-krbV.spec	24 Apr 2006 15:12:38 -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(plat_specific=True)")} 
 
 Name: python-krbV
-Version: %(/bin/awk '/AM_INIT_AUTOMAKE/ { print substr($2, 0, length($2)-1) }' configure.in)
-Release: 3%{?dist}
+Version: 1.0.12
+Release: 1%{?dist}
 Summary: Python extension module for Kerberos 5
 
 Group: Development/Languages
@@ -47,6 +47,9 @@
 %{python_sitelib}/krbVmodule.so
 
 %changelog
+* Mon Apr 24 2006 Michael Bonnet <mikeb at redhat.com> - 1.0.12
+- bump version number due to API changes
+
 * Fri Mar 24 2006 Mike Bonnet <mikeb at redhat.com>
 - fix typo in error definition
 - change the return value of recvauth() from ac to (ac, princ), where princ is the principal sent by sendauth()



From fedora-extras-commits at redhat.com  Mon Apr 24 15:27:34 2006
From: fedora-extras-commits at redhat.com (Mike Bonnet (mikeb))
Date: Mon, 24 Apr 2006 08:27:34 -0700
Subject: krbVmodule autogen.sh,1.3,1.4
Message-ID: <200604241527.k3OFRYxd003001@cvs-int.fedora.redhat.com>

Author: mikeb

Update of /cvs/devel/krbVmodule
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2984

Modified Files:
	autogen.sh 
Log Message:
move autoheader to enable autogen.sh from clean sources


Index: autogen.sh
===================================================================
RCS file: /cvs/devel/krbVmodule/autogen.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- autogen.sh	20 Feb 2003 18:37:46 -0000	1.3
+++ autogen.sh	24 Apr 2006 15:27:32 -0000	1.4
@@ -53,9 +53,9 @@
 	(cd $I
 	libtoolize --force
 	aclocal -I $TOPDIR
+	autoheader
 	automake --add-missing
 	autoconf
-	autoheader
 	)
 done
 



From fedora-extras-commits at redhat.com  Mon Apr 24 15:39:24 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Mon, 24 Apr 2006 08:39:24 -0700
Subject: rpms/swh-plugins/devel swh-plugins-0.4.14-configure.patch, NONE,
	1.1 swh-plugins.spec, 1.1, 1.2
Message-ID: <200604241539.k3OFdQEf003101@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/swh-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3075

Modified Files:
	swh-plugins.spec 
Added Files:
	swh-plugins-0.4.14-configure.patch 
Log Message:
Revision -3.  Add configure patch.


swh-plugins-0.4.14-configure.patch:

--- NEW FILE swh-plugins-0.4.14-configure.patch ---
--- configure~	2005-09-07 09:12:36.000000000 -0400
+++ configure	2006-04-24 11:20:26.000000000 -0400
@@ -23242,23 +23242,6 @@
 
 CFLAGS=$lrintf_save_CFLAGS -I at top_srcdir@/intl -I at top_srcdir@
 
-if  echo ${CFLAGS} | grep "\-march=" ; then
-  { echo "$as_me:$LINENO: WARNING: CFLAGS appears to allready contain architecture specifaction, using exiting one" >&5
-echo "$as_me: WARNING: CFLAGS appears to allready contain architecture specifaction, using exiting one" >&2;}
-else
-  { echo "$as_me:$LINENO: WARNING: Can't fine architecture specifaction in CFLAGS, picking one from build host CPU type" >&5
-echo "$as_me: WARNING: Can't fine architecture specifaction in CFLAGS, picking one from build host CPU type" >&2;}
-  { echo "$as_me:$LINENO: WARNING: May result in non-portable code" >&5
-echo "$as_me: WARNING: May result in non-portable code" >&2;}
-    MACHINE="-march=${build_cpu}"
-  if test ${build_cpu} = "powerpc"; then MACHINE=""; fi
-
-  CFLAGS="$CFLAGS -Wall -O3 -fomit-frame-pointer -fstrength-reduce -funroll-loops -ffast-math -fPIC -DPIC ${MACHINE} ${USE_SSE} ${DARWIN_CFLAGS}"
-
-
-    fi
-
-
 # Check whether --with-gnu-ld or --without-gnu-ld was given.
 if test "${with_gnu_ld+set}" = set; then
   withval="$with_gnu_ld"


Index: swh-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/swh-plugins/devel/swh-plugins.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- swh-plugins.spec	24 Apr 2006 14:48:16 -0000	1.1
+++ swh-plugins.spec	24 Apr 2006 15:39:24 -0000	1.2
@@ -1,10 +1,11 @@
 Summary:      A set of audio plugins for LADSPA
 Name:         swh-plugins
 Version:      0.4.14
-Release:      2%{?dist}
+Release:      3%{?dist}
 License:      GPL
 Group:        Applications/Multimedia
 Source:       http://plugin.org.uk/releases/0.4.14/swh-plugins-0.4.14.tar.gz
+Patch0:       swh-plugins-0.4.14-configure.patch
 URL:          http://plugin.org.uk/
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -16,9 +17,10 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %configure
+CFLAGS="$RPM_OPT_FLAGS" %configure --disable-static
 %{__make} %{?_smp_mflags} static
 
 %install
@@ -36,6 +38,9 @@
 %{_datadir}/ladspa/rdf/*
 
 %changelog
+* Mon Apr 24 2006 Anthony Green <green at redhat.com> 0.4.14-3
+- Add -configure patch.  Configure with --disable-static.
+
 * Mon Apr 24 2006 Anthony Green <green at redhat.com> 0.4.14-2
 - Fix Summary.
 - Don't install INSTALL or the empty NEWS file.



From fedora-extras-commits at redhat.com  Mon Apr 24 15:41:16 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Mon, 24 Apr 2006 08:41:16 -0700
Subject: rpms/swh-plugins/FC-5 swh-plugins-0.4.14-configure.patch, NONE,
	1.1 swh-plugins.spec, 1.1, 1.2
Message-ID: <200604241541.k3OFfI39003175@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/swh-plugins/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3155

Modified Files:
	swh-plugins.spec 
Added Files:
	swh-plugins-0.4.14-configure.patch 
Log Message:
Update to revision -3.  Add configure patch.


swh-plugins-0.4.14-configure.patch:

--- NEW FILE swh-plugins-0.4.14-configure.patch ---
--- configure~	2005-09-07 09:12:36.000000000 -0400
+++ configure	2006-04-24 11:20:26.000000000 -0400
@@ -23242,23 +23242,6 @@
 
 CFLAGS=$lrintf_save_CFLAGS -I at top_srcdir@/intl -I at top_srcdir@
 
-if  echo ${CFLAGS} | grep "\-march=" ; then
-  { echo "$as_me:$LINENO: WARNING: CFLAGS appears to allready contain architecture specifaction, using exiting one" >&5
-echo "$as_me: WARNING: CFLAGS appears to allready contain architecture specifaction, using exiting one" >&2;}
-else
-  { echo "$as_me:$LINENO: WARNING: Can't fine architecture specifaction in CFLAGS, picking one from build host CPU type" >&5
-echo "$as_me: WARNING: Can't fine architecture specifaction in CFLAGS, picking one from build host CPU type" >&2;}
-  { echo "$as_me:$LINENO: WARNING: May result in non-portable code" >&5
-echo "$as_me: WARNING: May result in non-portable code" >&2;}
-    MACHINE="-march=${build_cpu}"
-  if test ${build_cpu} = "powerpc"; then MACHINE=""; fi
-
-  CFLAGS="$CFLAGS -Wall -O3 -fomit-frame-pointer -fstrength-reduce -funroll-loops -ffast-math -fPIC -DPIC ${MACHINE} ${USE_SSE} ${DARWIN_CFLAGS}"
-
-
-    fi
-
-
 # Check whether --with-gnu-ld or --without-gnu-ld was given.
 if test "${with_gnu_ld+set}" = set; then
   withval="$with_gnu_ld"


Index: swh-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/swh-plugins/FC-5/swh-plugins.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- swh-plugins.spec	24 Apr 2006 14:48:16 -0000	1.1
+++ swh-plugins.spec	24 Apr 2006 15:41:16 -0000	1.2
@@ -1,10 +1,11 @@
 Summary:      A set of audio plugins for LADSPA
 Name:         swh-plugins
 Version:      0.4.14
-Release:      2%{?dist}
+Release:      3%{?dist}
 License:      GPL
 Group:        Applications/Multimedia
 Source:       http://plugin.org.uk/releases/0.4.14/swh-plugins-0.4.14.tar.gz
+Patch0:       swh-plugins-0.4.14-configure.patch
 URL:          http://plugin.org.uk/
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -16,9 +17,10 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %configure
+CFLAGS="$RPM_OPT_FLAGS" %configure --disable-static
 %{__make} %{?_smp_mflags} static
 
 %install
@@ -36,6 +38,9 @@
 %{_datadir}/ladspa/rdf/*
 
 %changelog
+* Mon Apr 24 2006 Anthony Green <green at redhat.com> 0.4.14-3
+- Add -configure patch.  Configure with --disable-static.
+
 * Mon Apr 24 2006 Anthony Green <green at redhat.com> 0.4.14-2
 - Fix Summary.
 - Don't install INSTALL or the empty NEWS file.



From fedora-extras-commits at redhat.com  Mon Apr 24 15:52:24 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Mon, 24 Apr 2006 08:52:24 -0700
Subject: rpms/swh-plugins/devel swh-plugins.spec,1.2,1.3
Message-ID: <200604241552.k3OFqQmc003292@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/swh-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3275

Modified Files:
	swh-plugins.spec 
Log Message:
Revision -4.  Force -fPIC and -DPIC.



Index: swh-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/swh-plugins/devel/swh-plugins.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- swh-plugins.spec	24 Apr 2006 15:39:24 -0000	1.2
+++ swh-plugins.spec	24 Apr 2006 15:52:24 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:      A set of audio plugins for LADSPA
 Name:         swh-plugins
 Version:      0.4.14
-Release:      3%{?dist}
+Release:      4%{?dist}
 License:      GPL
 Group:        Applications/Multimedia
 Source:       http://plugin.org.uk/releases/0.4.14/swh-plugins-0.4.14.tar.gz
@@ -20,7 +20,7 @@
 %patch0 -p0
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %configure --disable-static
+CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" %configure --disable-static
 %{__make} %{?_smp_mflags} static
 
 %install
@@ -38,6 +38,10 @@
 %{_datadir}/ladspa/rdf/*
 
 %changelog
+* Mon Apr 24 2006 Anthony Green <green at redhat.com> 0.4.14-4
+- Force -fPIC and -DPIC.  This is required for x86_64.  Why doesn't
+libtool do this?
+
 * Mon Apr 24 2006 Anthony Green <green at redhat.com> 0.4.14-3
 - Add -configure patch.  Configure with --disable-static.
 



From fedora-extras-commits at redhat.com  Mon Apr 24 16:24:14 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Mon, 24 Apr 2006 09:24:14 -0700
Subject: rpms/quilt/FC-5 .cvsignore, 1.6, 1.7 quilt.spec, 1.10, 1.11 sources,
	1.6, 1.7
Message-ID: <200604241624.k3OGOGZT005639@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/quilt/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5565/FC-5

Modified Files:
	.cvsignore quilt.spec sources 
Log Message:

Update to latest release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quilt/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Feb 2006 03:00:03 -0000	1.6
+++ .cvsignore	24 Apr 2006 16:24:14 -0000	1.7
@@ -1 +1 @@
-quilt-0.44.tar.gz
+quilt-0.45.tar.gz


Index: quilt.spec
===================================================================
RCS file: /cvs/extras/rpms/quilt/FC-5/quilt.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- quilt.spec	16 Feb 2006 03:00:03 -0000	1.10
+++ quilt.spec	24 Apr 2006 16:24:14 -0000	1.11
@@ -6,7 +6,7 @@
 Summary:	Scripts for working with series of patches
 License:	GPL
 Group:		Development/Tools
-Version:	0.44
+Version:	0.45
 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
+* Mon Apr 24 2006 - jwboyer at jdub.homelinux.org 0.45-1
+- Update to latest release
+
 * Wed Feb 15 2006 - jwboyer at jdub.homelinux.org 0.44-1
 - Update to latest release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quilt/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	16 Feb 2006 03:00:03 -0000	1.6
+++ sources	24 Apr 2006 16:24:14 -0000	1.7
@@ -1 +1 @@
-90ec3740a590d86af40f81792885f446  quilt-0.44.tar.gz
+5f8dd5a041ca7c700b16620228f922aa  quilt-0.45.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 24 16:24:13 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Mon, 24 Apr 2006 09:24:13 -0700
Subject: rpms/quilt/FC-4 .cvsignore, 1.6, 1.7 quilt.spec, 1.10, 1.11 sources,
	1.6, 1.7
Message-ID: <200604241624.k3OGOF9l005635@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/quilt/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5565/FC-4

Modified Files:
	.cvsignore quilt.spec sources 
Log Message:

Update to latest release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quilt/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Feb 2006 02:59:58 -0000	1.6
+++ .cvsignore	24 Apr 2006 16:24:13 -0000	1.7
@@ -1 +1 @@
-quilt-0.44.tar.gz
+quilt-0.45.tar.gz


Index: quilt.spec
===================================================================
RCS file: /cvs/extras/rpms/quilt/FC-4/quilt.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- quilt.spec	16 Feb 2006 02:59:58 -0000	1.10
+++ quilt.spec	24 Apr 2006 16:24:13 -0000	1.11
@@ -6,7 +6,7 @@
 Summary:	Scripts for working with series of patches
 License:	GPL
 Group:		Development/Tools
-Version:	0.44
+Version:	0.45
 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
+* Mon Apr 24 2006 - jwboyer at jdub.homelinux.org 0.45-1
+- Update to latest release
+
 * Wed Feb 15 2006 - jwboyer at jdub.homelinux.org 0.44-1
 - Update to latest release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quilt/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	16 Feb 2006 02:59:58 -0000	1.6
+++ sources	24 Apr 2006 16:24:13 -0000	1.7
@@ -1 +1 @@
-90ec3740a590d86af40f81792885f446  quilt-0.44.tar.gz
+5f8dd5a041ca7c700b16620228f922aa  quilt-0.45.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 24 16:24:15 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Mon, 24 Apr 2006 09:24:15 -0700
Subject: rpms/quilt/devel .cvsignore, 1.6, 1.7 quilt.spec, 1.10, 1.11 sources,
	1.6, 1.7
Message-ID: <200604241624.k3OGOHFn005645@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/quilt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5565/devel

Modified Files:
	.cvsignore quilt.spec sources 
Log Message:

Update to latest release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quilt/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Feb 2006 03:00:03 -0000	1.6
+++ .cvsignore	24 Apr 2006 16:24:14 -0000	1.7
@@ -1 +1 @@
-quilt-0.44.tar.gz
+quilt-0.45.tar.gz


Index: quilt.spec
===================================================================
RCS file: /cvs/extras/rpms/quilt/devel/quilt.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- quilt.spec	16 Feb 2006 03:00:03 -0000	1.10
+++ quilt.spec	24 Apr 2006 16:24:14 -0000	1.11
@@ -6,7 +6,7 @@
 Summary:	Scripts for working with series of patches
 License:	GPL
 Group:		Development/Tools
-Version:	0.44
+Version:	0.45
 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
+* Mon Apr 24 2006 - jwboyer at jdub.homelinux.org 0.45-1
+- Update to latest release
+
 * Wed Feb 15 2006 - jwboyer at jdub.homelinux.org 0.44-1
 - Update to latest release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quilt/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	16 Feb 2006 03:00:03 -0000	1.6
+++ sources	24 Apr 2006 16:24:14 -0000	1.7
@@ -1 +1 @@
-90ec3740a590d86af40f81792885f446  quilt-0.44.tar.gz
+5f8dd5a041ca7c700b16620228f922aa  quilt-0.45.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 24 16:24:13 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Mon, 24 Apr 2006 09:24:13 -0700
Subject: rpms/quilt/FC-3 .cvsignore, 1.6, 1.7 quilt.spec, 1.10, 1.11 sources,
	1.6, 1.7
Message-ID: <200604241624.k3OGOjoB005656@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/quilt/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5565/FC-3

Modified Files:
	.cvsignore quilt.spec sources 
Log Message:

Update to latest release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quilt/FC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Feb 2006 02:59:51 -0000	1.6
+++ .cvsignore	24 Apr 2006 16:24:12 -0000	1.7
@@ -1 +1 @@
-quilt-0.44.tar.gz
+quilt-0.45.tar.gz


Index: quilt.spec
===================================================================
RCS file: /cvs/extras/rpms/quilt/FC-3/quilt.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- quilt.spec	16 Feb 2006 02:59:51 -0000	1.10
+++ quilt.spec	24 Apr 2006 16:24:12 -0000	1.11
@@ -6,7 +6,7 @@
 Summary:	Scripts for working with series of patches
 License:	GPL
 Group:		Development/Tools
-Version:	0.44
+Version:	0.45
 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
+* Mon Apr 24 2006 - jwboyer at jdub.homelinux.org 0.45-1
+- Update to latest release
+
 * Wed Feb 15 2006 - jwboyer at jdub.homelinux.org 0.44-1
 - Update to latest release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quilt/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	16 Feb 2006 02:59:51 -0000	1.6
+++ sources	24 Apr 2006 16:24:12 -0000	1.7
@@ -1 +1 @@
-90ec3740a590d86af40f81792885f446  quilt-0.44.tar.gz
+5f8dd5a041ca7c700b16620228f922aa  quilt-0.45.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 24 16:35:16 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Mon, 24 Apr 2006 09:35:16 -0700
Subject: rpms/swh-plugins/devel swh-plugins-0.4.14-Makefile.in.patch, NONE, 
	1.1 swh-plugins.spec, 1.3, 1.4
Message-ID: <200604241635.k3OGZIEp005876@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/swh-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5856

Modified Files:
	swh-plugins.spec 
Added Files:
	swh-plugins-0.4.14-Makefile.in.patch 
Log Message:
Revision -5.  Fix install problem for x86_64.


swh-plugins-0.4.14-Makefile.in.patch:

--- NEW FILE swh-plugins-0.4.14-Makefile.in.patch ---
--- Makefile.in~	2006-04-24 12:30:33.000000000 -0400
+++ Makefile.in	2006-04-24 12:31:45.000000000 -0400
@@ -609,7 +609,7 @@
 	@top_srcdir@/*.dtd @top_srcdir@/*.pl @top_srcdir@/*.css \
 	@top_srcdir@/impulses/*.h autogen.sh bozosoity-checker.pl
 
-plugindir = @libdir@/ladspa
+plugindir = $(libdir)/ladspa
 
 # Uncomment below for Darwin support.  Or add a conditional for this.
 #AM_CFLAGS = -fno-common -flat_namespace -bundle -undefined suppress -lbundle1.o


Index: swh-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/swh-plugins/devel/swh-plugins.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- swh-plugins.spec	24 Apr 2006 15:52:24 -0000	1.3
+++ swh-plugins.spec	24 Apr 2006 16:35:16 -0000	1.4
@@ -1,11 +1,12 @@
 Summary:      A set of audio plugins for LADSPA
 Name:         swh-plugins
 Version:      0.4.14
-Release:      4%{?dist}
+Release:      5%{?dist}
 License:      GPL
 Group:        Applications/Multimedia
 Source:       http://plugin.org.uk/releases/0.4.14/swh-plugins-0.4.14.tar.gz
 Patch0:       swh-plugins-0.4.14-configure.patch
+Patch1:       swh-plugins-0.4.14-Makefile.in.patch
 URL:          http://plugin.org.uk/
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -18,6 +19,7 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" %configure --disable-static
@@ -38,6 +40,9 @@
 %{_datadir}/ladspa/rdf/*
 
 %changelog
+* Mon Apr 24 2006 Anthony Green <green at redhat.com> 0.4.14-5
+- Add Makefile.in patch to install in /usrr/lib64 for x86_64.
+
 * Mon Apr 24 2006 Anthony Green <green at redhat.com> 0.4.14-4
 - Force -fPIC and -DPIC.  This is required for x86_64.  Why doesn't
 libtool do this?



From fedora-extras-commits at redhat.com  Mon Apr 24 17:31:10 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Mon, 24 Apr 2006 10:31:10 -0700
Subject: rpms/libfwbuilder/devel libfwbuilder.spec,1.11,1.12
Message-ID: <200604241731.k3OHVCQF008251@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/libfwbuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8234

Modified Files:
	libfwbuilder.spec 
Log Message:
Retagging


Index: libfwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/devel/libfwbuilder.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libfwbuilder.spec	21 Apr 2006 09:54:02 -0000	1.11
+++ libfwbuilder.spec	24 Apr 2006 17:31:10 -0000	1.12
@@ -1,7 +1,7 @@
 Name:           libfwbuilder
 Summary:        Firewall Builder API
 Version:        2.0.12
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPL
 Group:          System Environment/Libraries
 URL:            http://www.fwbuilder.org/
@@ -88,6 +88,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Ralf Ertzinger <ralf at skytale.net> 2.0.12-2.fc6
+- Retagging
+
 * Fri Apr 21 2006 Ralf Ertzinger <ralf at skytale.net> 2.0.12-1.fc5
 - Update to 2.0.12
 - Drop gcc-4.1 patch and -ffriend-injection



From fedora-extras-commits at redhat.com  Mon Apr 24 17:43:48 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 24 Apr 2006 10:43:48 -0700
Subject: extras-buildsys/utils extras-sign-move.py,1.13,1.14
Message-ID: <200604241743.k3OHhmxG008351@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8331

Modified Files:
	extras-sign-move.py 
Log Message:
Let's not overwrite any packages already in the repo.


Index: extras-sign-move.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/extras-sign-move.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- extras-sign-move.py	23 Apr 2006 18:40:57 -0000	1.13
+++ extras-sign-move.py	24 Apr 2006 17:43:46 -0000	1.14
@@ -204,16 +204,17 @@
     infolist = []
     for package in files['srpm']:
         (n,a,e,v,r) = naevr(package)
-        infolist.append('%s-%s-%s' % (n,v,r))
         pkg_fn = os.path.basename(package)
         srpmloc = os.path.join(destdir, 'SRPMS', pkg_fn)
+        debugprint('Moving %s to %s' % (package, srpmloc))
         if os.path.exists(srpmloc):
-            debugprint('Deleting %s' % srpmloc)
+            debugprint('%s already exists, ignoring new one' % srpmloc)
             if not DEBUG:
-                os.unlink(srpmloc)
-        debugprint('Moving %s to %s' % (package, srpmloc))
-        if not DEBUG:
-            shutil.move(package, srpmloc)
+                os.unlink(package)
+        else:
+            infolist.append('%s-%s-%s' % (n,v,r))
+            if not DEBUG:
+                shutil.move(package, srpmloc)
 
     # go through each package and move it to the right arch location.
     # if it is a noarch package, copy2 it to all arch locations and unlink it
@@ -233,9 +234,9 @@
                     arch = '%s/debug' % arch
                 rpmloc = os.path.join(destdir, arch, pkg_fn)
                 debugprint("Copying %s to %s" % (package, rpmloc))
-                if not DEBUG:
-                    if os.path.exists(rpmloc):
-                        os.unlink(rpmloc)
+                if os.path.exists(rpmloc):
+                    debugprint('%s already exists, ignoring new one' % rpmloc)
+                elif not DEBUG:
                     shutil.copy2(package, rpmloc)
 
         if a == 'noarch':
@@ -244,9 +245,9 @@
                     arch = '%s/debug' % arch
                 rpmloc = os.path.join(destdir, arch, pkg_fn)
                 debugprint("Copying %s to %s" % (package, rpmloc))
-                if not DEBUG:                
-                    if os.path.exists(rpmloc):
-                        os.unlink(rpmloc)
+                if os.path.exists(rpmloc):
+                    debugprint('%s already exists, ignoring new one' % rpmloc)
+                elif not DEBUG:
                     shutil.copy2(package, rpmloc)
             
             if not DEBUG:
@@ -277,7 +278,11 @@
 
         rpmloc = os.path.join(destdir, arch, pkg_fn)
         debugprint('Moving %s to %s' % (package, rpmloc))        
-        if not DEBUG:
+        if os.path.exists(rpmloc):
+            debugprint('%s already exists, ignoring new one' % rpmloc)
+            if not DEBUG:
+                os.unlink(package)
+        elif not DEBUG:
             shutil.move(package, rpmloc)
 
     # email the list



From fedora-extras-commits at redhat.com  Mon Apr 24 18:00:01 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 24 Apr 2006 11:00:01 -0700
Subject: rpms/perl-Log-Dispatch-FileRotate - New directory
Message-ID: <200604241800.k3OI03xJ008586@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch-FileRotate
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8555/perl-Log-Dispatch-FileRotate

Log Message:
Directory /cvs/extras/rpms/perl-Log-Dispatch-FileRotate added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 24 18:00:02 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 24 Apr 2006 11:00:02 -0700
Subject: rpms/perl-Log-Dispatch-FileRotate/devel - New directory
Message-ID: <200604241800.k3OI04VT008592@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8555/perl-Log-Dispatch-FileRotate/devel

Log Message:
Directory /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 24 18:00:18 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 24 Apr 2006 11:00:18 -0700
Subject: rpms/perl-Log-Dispatch-FileRotate Makefile, NONE, 1.1 import.log,
	NONE, 1.1
Message-ID: <200604241800.k3OI0KPd008640@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch-FileRotate
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8610

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Log-Dispatch-FileRotate


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Log-Dispatch-FileRotate
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 24 18:00:18 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 24 Apr 2006 11:00:18 -0700
Subject: rpms/perl-Log-Dispatch-FileRotate/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200604241800.k3OI0KqP008643@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8610/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Log-Dispatch-FileRotate


--- 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 Apr 24 18:00:51 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 24 Apr 2006 11:00:51 -0700
Subject: rpms/perl-Log-Dispatch-FileRotate import.log,1.1,1.2
Message-ID: <200604241800.k3OI0rJH008711@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch-FileRotate
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8678

Modified Files:
	import.log 
Log Message:
auto-import perl-Log-Dispatch-FileRotate-1.14-1 on branch devel from perl-Log-Dispatch-FileRotate-1.14-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Apr 2006 18:00:18 -0000	1.1
+++ import.log	24 Apr 2006 18:00:51 -0000	1.2
@@ -0,0 +1 @@
+perl-Log-Dispatch-FileRotate-1_14-1:HEAD:perl-Log-Dispatch-FileRotate-1.14-1.src.rpm:1145901643



From fedora-extras-commits at redhat.com  Mon Apr 24 18:00:52 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 24 Apr 2006 11:00:52 -0700
Subject: rpms/perl-Log-Dispatch-FileRotate/devel
	perl-Log-Dispatch-FileRotate.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604241800.k3OI0sds008716@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8678/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Log-Dispatch-FileRotate.spec 
Log Message:
auto-import perl-Log-Dispatch-FileRotate-1.14-1 on branch devel from perl-Log-Dispatch-FileRotate-1.14-1.src.rpm


--- NEW FILE perl-Log-Dispatch-FileRotate.spec ---
Name:           perl-Log-Dispatch-FileRotate
Version:        1.14
Release:        1%{?dist}
Summary:        Log to files that archive/rotate themselves

Group:          Development/Libraries
License:        Artistic
URL:            http://search.cpan.org/dist/Log-Dispatch-FileRotate/
Source0:        http://www.cpan.org/authors/id/M/MA/MARKPF/Log-Dispatch-FileRotate-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(Date::Manip)
BuildRequires:  perl(Log::Dispatch)
# See comment in the %check section
# BuildRequires:  perl(Log::Log4perl) >= 0.23
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module provides a simple object for logging to files under the
Log::Dispatch::* system, and automatically rotating them according to
different constraints. This is basically a Log::Dispatch::File wrapper
with additions.


%prep
%setup -q -n Log-Dispatch-FileRotate-%{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
# Test suite disabled: circular dependencies with Log::Log4perl
# make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/Log/Dispatch/
%{_mandir}/man3/*.3pm*


%changelog
* Mon Apr 24 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.14-1
- Update to 1.14.
- License: Artistic.

* Mon Apr 24 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.13-2
- The license is: GPL or Artistic.
  License information: http://rt.cpan.org/Public/Bug/Display.html?id=14563.

* Sun Sep 11 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.13-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Apr 2006 18:00:18 -0000	1.1
+++ .cvsignore	24 Apr 2006 18:00:52 -0000	1.2
@@ -0,0 +1 @@
+Log-Dispatch-FileRotate-1.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Apr 2006 18:00:18 -0000	1.1
+++ sources	24 Apr 2006 18:00:52 -0000	1.2
@@ -0,0 +1 @@
+b7cc69172d5c8b1a34c429d738bc3fa5  Log-Dispatch-FileRotate-1.14.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 24 18:06:26 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 24 Apr 2006 11:06:26 -0700
Subject: owners owners.list,1.887,1.888
Message-ID: <200604241806.k3OI6Ssc011068@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11050

Modified Files:
	owners.list 
Log Message:
New package: perl-Log-Dispatch-FileRotate (#171640)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.887
retrieving revision 1.888
diff -u -r1.887 -r1.888
--- owners.list	24 Apr 2006 15:08:58 -0000	1.887
+++ owners.list	24 Apr 2006 18:06:26 -0000	1.888
@@ -1039,6 +1039,7 @@
 Fedora Extras|perl-Locale-Maketext-Lexicon|Extract translatable strings from source|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Locale-Maketext-Simple|Simple interface to Locale::Maketext::Lexicon|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Log-Dispatch|Dispatches messages to one or more outputs|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Log-Dispatch-FileRotate|Log to files that archive/rotate themselves|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Log-Log4perl|Log4j implementation for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Log-Message|Generic message storage mechanism|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Log-Message-Simple|Simplified frontend to Log::Message|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Mon Apr 24 18:25:44 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Mon, 24 Apr 2006 11:25:44 -0700
Subject: fedora-security/audit fc4,1.213,1.214 fc5,1.127,1.128
Message-ID: <200604241825.k3OIPirs011148@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11126

Modified Files:
	fc4 fc5 
Log Message:
Note what the ruby issue affects.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- fc4	24 Apr 2006 08:26:03 -0000	1.213
+++ fc4	24 Apr 2006 18:25:42 -0000	1.214
@@ -4,7 +4,7 @@
 ** are items that need attention
 
 CVE-2006-1942 ** firefox
-CVE-2006-1931 ** ruby
+CVE-2006-1931 version (ruby, fixed 1.8.3)
 CVE-2006-1902 ignore (gcc) not a vulnerability
 CVE-2006-1790 version (firefox, fixed 1.0.8) [since FEDORA-2006-410]
 CVE-2006-1790 VULNERABLE (thunderbird, fixed 1.0.8)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- fc5	24 Apr 2006 08:26:03 -0000	1.127
+++ fc5	24 Apr 2006 18:25:42 -0000	1.128
@@ -4,7 +4,7 @@
 ** are items that need attention
 
 CVE-2006-1942 ** firefox
-CVE-2006-1931 ** ruby
+CVE-2006-1931 version (ruby, fixed 1.8.3)
 CVE-2006-1902 ignore (gcc) not a vulnerability
 CVE-2006-1865 version (beagle, fixed 0.2.5) [since FEDORA-2006-440]
 CVE-2006-1790 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]



From fedora-extras-commits at redhat.com  Mon Apr 24 18:47:21 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Mon, 24 Apr 2006 11:47:21 -0700
Subject: rpms/swh-plugins/devel swh-plugins-0.4.14-Makefile.in.patch, 1.1,
	1.2
Message-ID: <200604241847.k3OIlNdm011320@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/swh-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11299

Modified Files:
	swh-plugins-0.4.14-Makefile.in.patch 
Log Message:
Fix Makefile.in patch


swh-plugins-0.4.14-Makefile.in.patch:

Index: swh-plugins-0.4.14-Makefile.in.patch
===================================================================
RCS file: /cvs/extras/rpms/swh-plugins/devel/swh-plugins-0.4.14-Makefile.in.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- swh-plugins-0.4.14-Makefile.in.patch	24 Apr 2006 16:35:16 -0000	1.1
+++ swh-plugins-0.4.14-Makefile.in.patch	24 Apr 2006 18:47:21 -0000	1.2
@@ -4,7 +4,7 @@
  	@top_srcdir@/*.dtd @top_srcdir@/*.pl @top_srcdir@/*.css \
  	@top_srcdir@/impulses/*.h autogen.sh bozosoity-checker.pl
  
--plugindir = @libdir@/ladspa
+-plugindir = @prefix@/lib/ladspa
 +plugindir = $(libdir)/ladspa
  
  # Uncomment below for Darwin support.  Or add a conditional for this.



From fedora-extras-commits at redhat.com  Mon Apr 24 18:48:19 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Mon, 24 Apr 2006 11:48:19 -0700
Subject: rpms/swh-plugins/devel swh-plugins.spec,1.4,1.5
Message-ID: <200604241848.k3OImLPK011349@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/swh-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11328

Modified Files:
	swh-plugins.spec 
Log Message:
Release -6.  Fix typo in last patch.



Index: swh-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/swh-plugins/devel/swh-plugins.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- swh-plugins.spec	24 Apr 2006 16:35:16 -0000	1.4
+++ swh-plugins.spec	24 Apr 2006 18:48:19 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:      A set of audio plugins for LADSPA
 Name:         swh-plugins
 Version:      0.4.14
-Release:      5%{?dist}
+Release:      6%{?dist}
 License:      GPL
 Group:        Applications/Multimedia
 Source:       http://plugin.org.uk/releases/0.4.14/swh-plugins-0.4.14.tar.gz
@@ -40,6 +40,9 @@
 %{_datadir}/ladspa/rdf/*
 
 %changelog
+* Mon Apr 24 2006 Anthony Green <green at redhat.com> 0.4.14-6
+- Fix typo in last patch.
+
 * Mon Apr 24 2006 Anthony Green <green at redhat.com> 0.4.14-5
 - Add Makefile.in patch to install in /usrr/lib64 for x86_64.
 



From fedora-extras-commits at redhat.com  Mon Apr 24 19:04:39 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Mon, 24 Apr 2006 12:04:39 -0700
Subject: rpms/swh-plugins/FC-5 swh-plugins-0.4.14-Makefile.in.patch, NONE,
	1.1 swh-plugins.spec, 1.2, 1.3
Message-ID: <200604241904.k3OJ4fun013208@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/swh-plugins/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13188

Modified Files:
	swh-plugins.spec 
Added Files:
	swh-plugins-0.4.14-Makefile.in.patch 
Log Message:
Release -6.  Many patches.  Builds fine in devel.


swh-plugins-0.4.14-Makefile.in.patch:

--- NEW FILE swh-plugins-0.4.14-Makefile.in.patch ---
--- Makefile.in~	2006-04-24 12:30:33.000000000 -0400
+++ Makefile.in	2006-04-24 12:31:45.000000000 -0400
@@ -609,7 +609,7 @@
 	@top_srcdir@/*.dtd @top_srcdir@/*.pl @top_srcdir@/*.css \
 	@top_srcdir@/impulses/*.h autogen.sh bozosoity-checker.pl
 
-plugindir = @prefix@/lib/ladspa
+plugindir = $(libdir)/ladspa
 
 # Uncomment below for Darwin support.  Or add a conditional for this.
 #AM_CFLAGS = -fno-common -flat_namespace -bundle -undefined suppress -lbundle1.o


Index: swh-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/swh-plugins/FC-5/swh-plugins.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- swh-plugins.spec	24 Apr 2006 15:41:16 -0000	1.2
+++ swh-plugins.spec	24 Apr 2006 19:04:39 -0000	1.3
@@ -1,11 +1,12 @@
 Summary:      A set of audio plugins for LADSPA
 Name:         swh-plugins
 Version:      0.4.14
-Release:      3%{?dist}
+Release:      6%{?dist}
 License:      GPL
 Group:        Applications/Multimedia
 Source:       http://plugin.org.uk/releases/0.4.14/swh-plugins-0.4.14.tar.gz
 Patch0:       swh-plugins-0.4.14-configure.patch
+Patch1:       swh-plugins-0.4.14-Makefile.in.patch
 URL:          http://plugin.org.uk/
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -18,9 +19,10 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %configure --disable-static
+CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" %configure --disable-static
 %{__make} %{?_smp_mflags} static
 
 %install
@@ -38,6 +40,16 @@
 %{_datadir}/ladspa/rdf/*
 
 %changelog
+* Mon Apr 24 2006 Anthony Green <green at redhat.com> 0.4.14-6
+- Fix typo in last patch.
+
+* Mon Apr 24 2006 Anthony Green <green at redhat.com> 0.4.14-5
+- Add Makefile.in patch to install in /usrr/lib64 for x86_64.
+
+* Mon Apr 24 2006 Anthony Green <green at redhat.com> 0.4.14-4
+- Force -fPIC and -DPIC.  This is required for x86_64.  Why doesn't
+libtool do this?
+
 * Mon Apr 24 2006 Anthony Green <green at redhat.com> 0.4.14-3
 - Add -configure patch.  Configure with --disable-static.
 



From fedora-extras-commits at redhat.com  Mon Apr 24 20:25:10 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Mon, 24 Apr 2006 13:25:10 -0700
Subject: rpms/azureus/FC-5 azureus-nativetabs.patch, NONE,
	1.1 azureus-themed.patch, 1.2, 1.3 azureus.spec, 1.23, 1.24
Message-ID: <200604242025.k3OKPCUd017890@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/azureus/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17792

Modified Files:
	azureus-themed.patch azureus.spec 
Added Files:
	azureus-nativetabs.patch 
Log Message:
Release -5.  GUI tweak and gcj bug fix.


azureus-nativetabs.patch:

--- NEW FILE azureus-nativetabs.patch ---
--- azureus/org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionInterfaceDisplay.java.orig	2006-04-17 16:00:58.000000000 +0200
+++ azureus/org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionInterfaceDisplay.java	2006-04-17 16:01:21.000000000 +0200
@@ -78,8 +78,8 @@
 		cLook.setLayout(layout);
 
 		BooleanParameter bpCustomTab = new BooleanParameter(cLook, "useCustomTab",
-				true, MSG_PREFIX + "useCustomTabs");
-		Control cFancyTab = new BooleanParameter(cLook, "GUI_SWT_bFancyTab", true,
+				false, MSG_PREFIX + "useCustomTabs");
+		Control cFancyTab = new BooleanParameter(cLook, "GUI_SWT_bFancyTab", false,
 				MSG_PREFIX + "useFancyTabs").getControl();
 
 		Control[] controls = { cFancyTab };
--- azureus/org/gudy/azureus2/core3/config/impl/ConfigurationDefaults.java.orig	2006-04-17 17:25:18.000000000 +0200
+++ azureus/org/gudy/azureus2/core3/config/impl/ConfigurationDefaults.java	2006-04-17 17:26:19.000000000 +0200
@@ -154,7 +154,7 @@
     
     def.put("User Mode", new Long(0));
     
-    def.put("useCustomTab",TRUE);    
+    def.put("useCustomTab",FALSE);    
     def.put("GUI Refresh",new Long(1000));
     def.put("Graphics Update",new Long(4));
     def.put("ReOrder Delay",new Long(0));
@@ -167,7 +167,7 @@
     def.put("Use default data dir", FALSE);	
     def.put("Default save path", "" );
     
-    def.put("GUI_SWT_bFancyTab", TRUE);
+    def.put("GUI_SWT_bFancyTab", FALSE);
     def.put("GUI_SWT_bAlternateTablePainting", FALSE);
     def.put("update.start",TRUE);
     def.put("update.periodic",TRUE);

azureus-themed.patch:

Index: azureus-themed.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/FC-5/azureus-themed.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- azureus-themed.patch	9 Feb 2006 08:45:07 -0000	1.2
+++ azureus-themed.patch	24 Apr 2006 20:25:10 -0000	1.3
@@ -1,6 +1,6 @@
---- org/gudy/azureus2/ui/swt/ImageRepository.java~	2006-01-25 20:28:17.000000000 -0800
-+++ org/gudy/azureus2/ui/swt/ImageRepository.java	2006-01-25 20:28:27.000000000 -0800
-@@ -16,6 +16,8 @@
+--- azureus/org/gudy/azureus2/ui/swt/ImageRepository.java.orig	2006-04-22 17:48:33.000000000 +0200
++++ azureus/org/gudy/azureus2/ui/swt/ImageRepository.java	2006-04-22 17:50:33.000000000 +0200
+@@ -32,6 +32,8 @@
  import java.io.ByteArrayOutputStream;
  import java.io.File;
  import java.io.InputStream;
@@ -9,7 +9,7 @@
  import java.util.*;
  
  /**
-@@ -43,6 +45,25 @@
+@@ -59,6 +61,25 @@
      loadImage(display, "org/gudy/azureus2/ui/splash/azureus.jpg", "azureus_splash");
    }
  
@@ -22,9 +22,9 @@
 +	if (iconTheme == null)
 +	  iconTheme = org.gnu.gtk.IconTheme.getDefault();
 +
-+	return iconTheme.lookupIcon (name, 24, 
-+				     org.gnu.gtk.IconLookupFlags.NO_SVG)
-+	  .getFilename();
++	org.gnu.gtk.IconInfo icon = iconTheme.lookupIcon (name, 24, 
++	    org.gnu.gtk.IconLookupFlags.NO_SVG);
++	return icon != null ? icon.getFilename() : def;
 +      }
 +    catch (Exception ex)
 +      {
@@ -35,7 +35,7 @@
    public static void loadImages(Display display) {
      loadImage(display, "org/gudy/azureus2/ui/icons/a32.png", "azureus32");
      loadImage(display, "org/gudy/azureus2/ui/icons/a64.png", "azureus64");
-@@ -87,20 +108,44 @@
+@@ -103,20 +124,44 @@
      //ToolBar Icons
  
      loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/open.gif", "cb_open");
@@ -92,7 +92,7 @@
  
      //Status icons
      loadImage(display, "org/gudy/azureus2/ui/icons/status/ok.gif", "st_ok");
-@@ -139,6 +184,16 @@
+@@ -157,6 +202,16 @@
      Image im = getImage(name,false);
      if(null == im) {
        InputStream is = loader.getResourceAsStream(res);
@@ -109,3 +109,10 @@
        if(null != is) {
        	try { 
  	        if(alpha == 255) {
+@@ -453,4 +508,4 @@
+       
+       return key;
+     }
+-}
+\ Kein Zeilenumbruch am Dateiende.
++}


Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/FC-5/azureus.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- azureus.spec	6 Apr 2006 16:55:28 -0000	1.23
+++ azureus.spec	24 Apr 2006 20:25:10 -0000	1.24
@@ -1,6 +1,6 @@
 Name:		azureus
 Version:	2.4.0.3
-Release:	0.20060328cvs_4%{?dist}
+Release:	0.20060328cvs_5%{?dist}
 Summary:	A BitTorrent Client
 
 Group:		Applications/Internet
@@ -46,6 +46,7 @@
 Patch23:	azureus-no-update-manager-PluginInstallerImpl-2.patch
 Patch24:	azureus-MessageSlideShell-swt-3.1.patch
 Patch25:	azureus-no-update-manager-MainStatusBar.patch
+Patch26:	azureus-nativetabs.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -76,7 +77,7 @@
 %patch4 -p0
 %patch5 -p0
 %patch6 -p0
-%patch7 -p0
+%patch7 -p1
 %patch8 -p0
 %patch9 -p0
 %patch10 -p0
@@ -95,6 +96,7 @@
 %patch23 -p0
 %patch24 -p0
 %patch25 -p0
+%patch26 -p1
 cp %{SOURCE4} License.txt
 cp %{SOURCE5} ChangeLog.txt
 
@@ -204,6 +206,10 @@
 %{_libdir}/gcj/*
 
 %changelog
+* Mon Apr 24 2006 Anthony Green <green at redhat.com> - 2.4.0.3-0.20060328cvs_5
+- Two patches from Stephan Michels: nativetabs (for native GTK+ tabs), and 
+an updated azureus-themed.patch to work around GCC PR 27271.
+
 * Thu Apr 06 2006 Anthony Green <green at redhat.com> - 2.4.0.3-0.20060328cvs_4
 - Yet another correction to LD_LIBRARY_PATH.  Bugzilla #186152.
 



From fedora-extras-commits at redhat.com  Mon Apr 24 21:34:44 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Apr 2006 14:34:44 -0700
Subject: rpms/worminator/devel worminator-3.0R2.1-speed.patch, NONE,
	1.1 worminator.spec, 1.2, 1.3
Message-ID: <200604242134.k3OLYkSa023900@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/worminator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23880

Modified Files:
	worminator.spec 
Added Files:
	worminator-3.0R2.1-speed.patch 
Log Message:
* Mon Apr 24 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 3.0R2.1-3
- Limit the framerate to 80 instead of trying to reach 160 fps,
  hopefully this fixes bug 188337.


worminator-3.0R2.1-speed.patch:

--- NEW FILE worminator-3.0R2.1-speed.patch ---
--- worminator-3.0R2.1/demo.h.speed	2006-02-24 20:05:02.000000000 +0100
+++ worminator-3.0R2.1/demo.h	2006-04-24 23:10:05.000000000 +0200
@@ -74,8 +74,15 @@
 		speed_counter--;
 		if (keypressed()) time_to_quit = TRUE;
 		}
-	render_map();
-	if (keypressed()) time_to_quit = TRUE;
+	game_is_running = TRUE;
+	if (frames_to_draw) {
+		render_map();
+		frames_to_draw--;
+		}
+	while (speed_counter == 0) {
+		rest(1);
+		if (keypressed()) time_to_quit = TRUE;
+		}
 	} while(!time_to_quit);  // End core demo loop
 
 fclose(demofile);
--- worminator-3.0R2.1/Worminator.c.speed	2006-03-03 10:29:44.000000000 +0100
+++ worminator-3.0R2.1/Worminator.c	2006-04-24 23:25:29.000000000 +0200
@@ -269,6 +269,16 @@
 }
 END_OF_FUNCTION(increment_speed_counter);
 
+/***********************************\
+|** FRAMERATE THROTTLING FUNCTION **|
+\***********************************/
+void increment_frames_to_draw()
+{
+	if (frames_to_draw < 2)
+		frames_to_draw++;
+}
+END_OF_FUNCTION(increment_frames_to_draw);
+
 /*******************\
 |** MAIN FUNCTION **|
 \*******************/
@@ -333,7 +343,12 @@
 		if (player.timer > 0) player.timer--;
 		speed_counter--;
 		}
-	render_map();
+	game_is_running = TRUE;
+	if (frames_to_draw) {
+		render_map();
+		frames_to_draw--;
+		}
+	while (speed_counter == 0) rest(1);
 } while(time_to_quit == FALSE);  // End core game loop
 add_console_line("Core loop complete, beginning shutdown.");
 
@@ -1540,10 +1555,6 @@
 frame_counter++;
 if (frame_counter > 32768) frame_counter = 32768;
 
-// game_is_running can be changed from under us by update_animations, this
-// should be fixed but just to be sure put the check for it in the while.
-while (game_is_running && speed_counter == 0) rest(1);
-
 //set_palette_range(worminator_data_file[DEFAULT_WORMINATOR_PALLETE].dat, 0, 255, FALSE);
 }
 
@@ -3253,6 +3264,11 @@
 install_int_ex(increment_speed_counter, BPS_TO_TIMER(GAME_SPEED_NORMAL));
 change_game_speed(wormy_config.game_speed);
 
+// Set up the framerate throtteling timer
+LOCK_VARIABLE(frames_to_draw);
+LOCK_FUNCTION(increment_frames_to_draw);
+install_int_ex(increment_frames_to_draw, BPS_TO_TIMER(80));
+
 // Set up the soundz
 add_console_line("Initilizing sound");
 reset_sound();
--- worminator-3.0R2.1/globals.h.speed	2006-02-26 22:30:18.000000000 +0100
+++ worminator-3.0R2.1/globals.h	2006-04-24 23:10:05.000000000 +0200
@@ -255,9 +255,10 @@
 volatile int speed_counter = 0;
 volatile int idle_counter = 0;
 volatile int idle_speed_counter = 0;
+volatile int frames_to_draw = 0;
 
 // This is used to tell the game timer when to update and when not to
-char game_is_running = FALSE;
+volatile char game_is_running = FALSE;
 
 // This is used to indicate what level we are on
 char current_level = 1;
--- worminator-3.0R2.1/player.h.speed	2006-02-25 10:33:10.000000000 +0100
+++ worminator-3.0R2.1/player.h	2006-04-24 23:10:05.000000000 +0200
@@ -2188,7 +2188,11 @@
 		if (frame_loop >= 256) done = TRUE;
 		speed_counter--;
 		}
-	render_map();
+	if (frames_to_draw) {
+		render_map();
+		frames_to_draw--;
+		}
+	while (speed_counter == 0) rest(1);
 	} while (done != TRUE);
 
 // Fade out the display and clear out some junk


Index: worminator.spec
===================================================================
RCS file: /cvs/extras/rpms/worminator/devel/worminator.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- worminator.spec	14 Mar 2006 12:33:31 -0000	1.2
+++ worminator.spec	24 Apr 2006 21:34:44 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           worminator
 Version:        3.0R2.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Sidescrolling platform and shoot'em up action-game
 Group:          Amusements/Games
 License:        GPL
@@ -8,6 +8,7 @@
 Source0:        http://download.sourceforge.net/worminator/worminator-%{version}.tar.gz
 Source1:        worminator.png
 Source2:        worminator.desktop
+Patch0:         worminator-3.0R2.1-speed.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  allegro-devel, desktop-file-utils
 Requires:       worminator-data >= 3.0R2.1-2
@@ -20,8 +21,10 @@
 
 %prep
 %setup -q
+%patch -p1 -z .speed
 %{__sed} -i 's/\r//' ReadMe.txt
 
+
 %build
 gcc $RPM_OPT_FLAGS -fsigned-char -Wno-deprecated-declarations \
   -Wno-char-subscripts -DDATADIR=\"%{_datadir}/%{name}/\" -o %{name} \
@@ -69,6 +72,10 @@
 
 
 %changelog
+* Mon Apr 24 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 3.0R2.1-3
+- Limit the framerate to 80 instead of trying to reach 160 fps,
+  hopefully this fixes bug 188337.
+
 * Tue Mar 14 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 3.0R2.1-2
 - move worminator data dir from /usr/share/games to just /usr/share to match
   the games-SIG guidelines. Sorry about the somewhat large download for



From fedora-extras-commits at redhat.com  Mon Apr 24 21:49:01 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Apr 2006 14:49:01 -0700
Subject: rpms/worminator/FC-5 worminator-3.0R2.1-speed.patch, NONE,
	1.1 worminator.spec, 1.2, 1.3
Message-ID: <200604242149.k3OLn3Xj023989@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/worminator/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23969

Modified Files:
	worminator.spec 
Added Files:
	worminator-3.0R2.1-speed.patch 
Log Message:
* Mon Apr 24 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 3.0R2.1-3
- Limit the framerate to 80 instead of trying to reach 160 fps,
  hopefully this fixes bug 188337.


worminator-3.0R2.1-speed.patch:

--- NEW FILE worminator-3.0R2.1-speed.patch ---
--- worminator-3.0R2.1/demo.h.speed	2006-02-24 20:05:02.000000000 +0100
+++ worminator-3.0R2.1/demo.h	2006-04-24 23:10:05.000000000 +0200
@@ -74,8 +74,15 @@
 		speed_counter--;
 		if (keypressed()) time_to_quit = TRUE;
 		}
-	render_map();
-	if (keypressed()) time_to_quit = TRUE;
+	game_is_running = TRUE;
+	if (frames_to_draw) {
+		render_map();
+		frames_to_draw--;
+		}
+	while (speed_counter == 0) {
+		rest(1);
+		if (keypressed()) time_to_quit = TRUE;
+		}
 	} while(!time_to_quit);  // End core demo loop
 
 fclose(demofile);
--- worminator-3.0R2.1/Worminator.c.speed	2006-03-03 10:29:44.000000000 +0100
+++ worminator-3.0R2.1/Worminator.c	2006-04-24 23:25:29.000000000 +0200
@@ -269,6 +269,16 @@
 }
 END_OF_FUNCTION(increment_speed_counter);
 
+/***********************************\
+|** FRAMERATE THROTTLING FUNCTION **|
+\***********************************/
+void increment_frames_to_draw()
+{
+	if (frames_to_draw < 2)
+		frames_to_draw++;
+}
+END_OF_FUNCTION(increment_frames_to_draw);
+
 /*******************\
 |** MAIN FUNCTION **|
 \*******************/
@@ -333,7 +343,12 @@
 		if (player.timer > 0) player.timer--;
 		speed_counter--;
 		}
-	render_map();
+	game_is_running = TRUE;
+	if (frames_to_draw) {
+		render_map();
+		frames_to_draw--;
+		}
+	while (speed_counter == 0) rest(1);
 } while(time_to_quit == FALSE);  // End core game loop
 add_console_line("Core loop complete, beginning shutdown.");
 
@@ -1540,10 +1555,6 @@
 frame_counter++;
 if (frame_counter > 32768) frame_counter = 32768;
 
-// game_is_running can be changed from under us by update_animations, this
-// should be fixed but just to be sure put the check for it in the while.
-while (game_is_running && speed_counter == 0) rest(1);
-
 //set_palette_range(worminator_data_file[DEFAULT_WORMINATOR_PALLETE].dat, 0, 255, FALSE);
 }
 
@@ -3253,6 +3264,11 @@
 install_int_ex(increment_speed_counter, BPS_TO_TIMER(GAME_SPEED_NORMAL));
 change_game_speed(wormy_config.game_speed);
 
+// Set up the framerate throtteling timer
+LOCK_VARIABLE(frames_to_draw);
+LOCK_FUNCTION(increment_frames_to_draw);
+install_int_ex(increment_frames_to_draw, BPS_TO_TIMER(80));
+
 // Set up the soundz
 add_console_line("Initilizing sound");
 reset_sound();
--- worminator-3.0R2.1/globals.h.speed	2006-02-26 22:30:18.000000000 +0100
+++ worminator-3.0R2.1/globals.h	2006-04-24 23:10:05.000000000 +0200
@@ -255,9 +255,10 @@
 volatile int speed_counter = 0;
 volatile int idle_counter = 0;
 volatile int idle_speed_counter = 0;
+volatile int frames_to_draw = 0;
 
 // This is used to tell the game timer when to update and when not to
-char game_is_running = FALSE;
+volatile char game_is_running = FALSE;
 
 // This is used to indicate what level we are on
 char current_level = 1;
--- worminator-3.0R2.1/player.h.speed	2006-02-25 10:33:10.000000000 +0100
+++ worminator-3.0R2.1/player.h	2006-04-24 23:10:05.000000000 +0200
@@ -2188,7 +2188,11 @@
 		if (frame_loop >= 256) done = TRUE;
 		speed_counter--;
 		}
-	render_map();
+	if (frames_to_draw) {
+		render_map();
+		frames_to_draw--;
+		}
+	while (speed_counter == 0) rest(1);
 	} while (done != TRUE);
 
 // Fade out the display and clear out some junk


Index: worminator.spec
===================================================================
RCS file: /cvs/extras/rpms/worminator/FC-5/worminator.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- worminator.spec	14 Mar 2006 12:33:31 -0000	1.2
+++ worminator.spec	24 Apr 2006 21:49:01 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           worminator
 Version:        3.0R2.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Sidescrolling platform and shoot'em up action-game
 Group:          Amusements/Games
 License:        GPL
@@ -8,6 +8,7 @@
 Source0:        http://download.sourceforge.net/worminator/worminator-%{version}.tar.gz
 Source1:        worminator.png
 Source2:        worminator.desktop
+Patch0:         worminator-3.0R2.1-speed.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  allegro-devel, desktop-file-utils
 Requires:       worminator-data >= 3.0R2.1-2
@@ -20,8 +21,10 @@
 
 %prep
 %setup -q
+%patch -p1 -z .speed
 %{__sed} -i 's/\r//' ReadMe.txt
 
+
 %build
 gcc $RPM_OPT_FLAGS -fsigned-char -Wno-deprecated-declarations \
   -Wno-char-subscripts -DDATADIR=\"%{_datadir}/%{name}/\" -o %{name} \
@@ -69,6 +72,10 @@
 
 
 %changelog
+* Mon Apr 24 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 3.0R2.1-3
+- Limit the framerate to 80 instead of trying to reach 160 fps,
+  hopefully this fixes bug 188337.
+
 * Tue Mar 14 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 3.0R2.1-2
 - move worminator data dir from /usr/share/games to just /usr/share to match
   the games-SIG guidelines. Sorry about the somewhat large download for



From fedora-extras-commits at redhat.com  Mon Apr 24 22:05:45 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon, 24 Apr 2006 15:05:45 -0700
Subject: rpms/clamav/devel clamav-0.88.1-strncpy.patch, NONE,
	1.1 clamav-0.88.1-guys,
	please-read-the-compiler-warnings-before-doing-a-release.patch,
	NONE, 1.1 clamav.spec, 1.33, 1.34
Message-ID: <200604242205.k3OM5lBu026229@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26208/devel

Modified Files:
	clamav.spec 
Added Files:
	clamav-0.88.1-strncpy.patch 
	clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch 
Log Message:
- added patch which fixes some classes of compiler warnings; at least
  the using of implicitly declared functions was reported to cause
  segfaults on AMD64 (brought to my attention by Marc Perkel)
- added patch which fixes wrong usage of strncpy(3) in unrarlib.c


clamav-0.88.1-strncpy.patch:

--- NEW FILE clamav-0.88.1-strncpy.patch ---
2006-04-24  Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>

	* libclamav/unrarlib.c/stricomp(): terminate the string copied
	  with strncpy() explicitly with '\0'. Does not seem to be
	  exploitable at the moment due to deeply buried constraints
	  (function will be called for buffers with a static size of
	  260 only).

	  But it is better to fix it now than to run into problems
	  when function is used for other purposes.

--- clamav-0.88.1/libclamav/unrarlib.c.strncpy	2005-06-23 22:03:12.000000000 +0200
+++ clamav-0.88.1/libclamav/unrarlib.c	2006-04-24 23:10:07.000000000 +0200
@@ -1180,8 +1180,10 @@ int stricomp(char *Str1,char *Str2)
   char S1[512],S2[512];
   char *chptr;
 
-  strncpy(S1,Str1,sizeof(S1));
-  strncpy(S2,Str2,sizeof(S2));
+  strncpy(S1,Str1,sizeof(S1));
+  strncpy(S2,Str2,sizeof(S2));
+  S1[sizeof(S1)-1] = '\0';
+  S2[sizeof(S2)-1] = '\0';
 
   while((chptr = strchr(S1, '\\')) != NULL) /* ignore backslash             */
   {

***** Not enough context to create diffstat for file: clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch,NONE,1.1
***** Not enough context to create diff for file: clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch,NONE,1.1

Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- clamav.spec	6 Apr 2006 16:50:58 -0000	1.33
+++ clamav.spec	24 Apr 2006 22:05:44 -0000	1.34
@@ -22,7 +22,7 @@
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
 Version:	0.88.1
-Release:	%release_func 1
+Release:	%release_func 2
 
 License:	GPL
 Group:		Applications/File
@@ -36,6 +36,8 @@
 Source6:	clamav-update.logrotate
 Source7:	clamd.SERVICE.init
 Source8:	clamav-notify-servers
+Patch0:		clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch
+Patch1:		clamav-0.88.1-strncpy.patch
 Patch20:	clamav-0.70-user.patch
 Patch21:	clamav-0.70-path.patch
 Patch22:	clamav-0.80-initoff.patch
@@ -162,6 +164,9 @@
 
 %prep
 %setup -q
+%patch0  -p1 -b '.guys,please-read-the-compiler-warnings-before-doing-a-release.patch'
+%patch1  -p1 -b .strncpy
+
 %patch20 -p1 -b .user
 %patch21 -p1 -b .path
 %patch22 -p1 -b .initoff
@@ -186,6 +191,7 @@
 ## See https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 and
 ## http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0797
 ## also
+CFLAGS="$RPM_OPT_FLAGS -Wall -W -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99"
 %configure --disable-clamav --with-dbdir=/var/lib/clamav \
            --disable-zlib-vcheck \
 	   %{!?_without_milter:--enable-milter}
@@ -426,6 +432,12 @@
 %endif	# _without_milter
 
 %changelog
+* Mon Apr 24 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88.1-2
+- added patch which fixes some classes of compiler warnings; at least
+  the using of implicitly declared functions was reported to cause
+  segfaults on AMD64 (brought to my attention by Marc Perkel)
+- added patch which fixes wrong usage of strncpy(3) in unrarlib.c
+
 * Thu Apr 06 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88.1-1
 - updated to 0.88.1 (SECURITY)
 



From fedora-extras-commits at redhat.com  Mon Apr 24 22:50:39 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 24 Apr 2006 15:50:39 -0700
Subject: rpms/smb4k/devel .cvsignore, 1.6, 1.7 smb4k.spec, 1.9, 1.10 sources,
	1.6, 1.7
Message-ID: <200604242250.k3OMofat026473@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/smb4k/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26452

Modified Files:
	.cvsignore smb4k.spec sources 
Log Message:
- Updated to version 0.7.0, comment --enable-final



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smb4k/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	18 Apr 2006 19:52:01 -0000	1.6
+++ .cvsignore	24 Apr 2006 22:50:39 -0000	1.7
@@ -1 +1 @@
-smb4k-0.6.10.tar.gz
+smb4k-0.7.0.tar.bz2


Index: smb4k.spec
===================================================================
RCS file: /cvs/extras/rpms/smb4k/devel/smb4k.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- smb4k.spec	18 Apr 2006 19:52:01 -0000	1.9
+++ smb4k.spec	24 Apr 2006 22:50:39 -0000	1.10
@@ -1,12 +1,12 @@
 Name:		smb4k
-Version:	0.6.10
+Version:	0.7.0
 Release:	1%{?dist}
 Summary:	The SMB/CIFS Share Browser for KDE
 
 Group:		Applications/Internet
 License:	GPL
 URL:		http://smb4k.berlios.de/
-Source0:	http://download.berlios.de/smb4k/%{name}-%{version}.tar.gz
+Source0:	http://download.berlios.de/smb4k/%{name}-%{version}.tar.bz2
 Patch0:		smb4k-0.6.5-desktop.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -38,8 +38,9 @@
 %configure \
 	--disable-rpath \
 	--disable-debug \
-	--disable-dependency-tracking \
-	--enable-final
+	--disable-dependency-tracking
+# Broken on 0.7.0
+#	--enable-final
 make %{?_smp_mflags}
 
 %install
@@ -107,6 +108,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Apr 25 2006 Marcin Garski <mgarski[AT]post.pl> 0.7.0-1
+- Updated to version 0.7.0, comment --enable-final
+
 * Tue Apr 18 2006 Marcin Garski <mgarski[AT]post.pl> 0.6.10-1
 - Updated to version 0.6.10
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smb4k/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	18 Apr 2006 19:52:01 -0000	1.6
+++ sources	24 Apr 2006 22:50:39 -0000	1.7
@@ -1 +1 @@
-8996f1f291efef48839998f75670987f  smb4k-0.6.10.tar.gz
+a221dd7f4e206799ea52d8a249d1a2b5  smb4k-0.7.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 24 22:52:01 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 24 Apr 2006 15:52:01 -0700
Subject: rpms/smb4k/FC-5 .cvsignore, 1.6, 1.7 smb4k.spec, 1.9, 1.10 sources, 
	1.6, 1.7
Message-ID: <200604242252.k3OMq3CI026543@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/smb4k/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26522

Modified Files:
	.cvsignore smb4k.spec sources 
Log Message:
- Updated to version 0.7.0, comment --enable-final



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	18 Apr 2006 20:00:22 -0000	1.6
+++ .cvsignore	24 Apr 2006 22:52:01 -0000	1.7
@@ -1 +1 @@
-smb4k-0.6.10.tar.gz
+smb4k-0.7.0.tar.bz2


Index: smb4k.spec
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-5/smb4k.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- smb4k.spec	18 Apr 2006 20:00:22 -0000	1.9
+++ smb4k.spec	24 Apr 2006 22:52:01 -0000	1.10
@@ -1,12 +1,12 @@
 Name:		smb4k
-Version:	0.6.10
+Version:	0.7.0
 Release:	1%{?dist}
 Summary:	The SMB/CIFS Share Browser for KDE
 
 Group:		Applications/Internet
 License:	GPL
 URL:		http://smb4k.berlios.de/
-Source0:	http://download.berlios.de/smb4k/%{name}-%{version}.tar.gz
+Source0:	http://download.berlios.de/smb4k/%{name}-%{version}.tar.bz2
 Patch0:		smb4k-0.6.5-desktop.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -38,8 +38,9 @@
 %configure \
 	--disable-rpath \
 	--disable-debug \
-	--disable-dependency-tracking \
-	--enable-final
+	--disable-dependency-tracking
+# Broken on 0.7.0
+#	--enable-final
 make %{?_smp_mflags}
 
 %install
@@ -107,6 +108,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Apr 25 2006 Marcin Garski <mgarski[AT]post.pl> 0.7.0-1
+- Updated to version 0.7.0, comment --enable-final
+
 * Tue Apr 18 2006 Marcin Garski <mgarski[AT]post.pl> 0.6.10-1
 - Updated to version 0.6.10
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	18 Apr 2006 20:00:22 -0000	1.6
+++ sources	24 Apr 2006 22:52:01 -0000	1.7
@@ -1 +1 @@
-8996f1f291efef48839998f75670987f  smb4k-0.6.10.tar.gz
+a221dd7f4e206799ea52d8a249d1a2b5  smb4k-0.7.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 24 22:53:12 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 24 Apr 2006 15:53:12 -0700
Subject: rpms/smb4k/FC-4 .cvsignore, 1.6, 1.7 smb4k.spec, 1.6, 1.7 sources,
	1.6, 1.7
Message-ID: <200604242253.k3OMrFhc026620@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/smb4k/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26599

Modified Files:
	.cvsignore smb4k.spec sources 
Log Message:
- Updated to version 0.7.0, comment --enable-final



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	18 Apr 2006 20:00:55 -0000	1.6
+++ .cvsignore	24 Apr 2006 22:53:12 -0000	1.7
@@ -1 +1 @@
-smb4k-0.6.10.tar.gz
+smb4k-0.7.0.tar.bz2


Index: smb4k.spec
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-4/smb4k.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- smb4k.spec	18 Apr 2006 20:00:55 -0000	1.6
+++ smb4k.spec	24 Apr 2006 22:53:12 -0000	1.7
@@ -1,12 +1,12 @@
 Name:		smb4k
-Version:	0.6.10
+Version:	0.7.0
 Release:	1%{?dist}
 Summary:	The SMB/CIFS Share Browser for KDE
 
 Group:		Applications/Internet
 License:	GPL
 URL:		http://smb4k.berlios.de/
-Source0:	http://download.berlios.de/smb4k/%{name}-%{version}.tar.gz
+Source0:	http://download.berlios.de/smb4k/%{name}-%{version}.tar.bz2
 Patch0:		smb4k-0.6.5-desktop.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -38,8 +38,9 @@
 %configure \
 	--disable-rpath \
 	--disable-debug \
-	--disable-dependency-tracking \
-	--enable-final
+	--disable-dependency-tracking
+# Broken on 0.7.0
+#	--enable-final
 make %{?_smp_mflags}
 
 %install
@@ -107,6 +108,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Apr 25 2006 Marcin Garski <mgarski[AT]post.pl> 0.7.0-1
+- Updated to version 0.7.0, comment --enable-final
+
 * Tue Apr 18 2006 Marcin Garski <mgarski[AT]post.pl> 0.6.10-1
 - Updated to version 0.6.10
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	18 Apr 2006 20:00:55 -0000	1.6
+++ sources	24 Apr 2006 22:53:12 -0000	1.7
@@ -1 +1 @@
-8996f1f291efef48839998f75670987f  smb4k-0.6.10.tar.gz
+a221dd7f4e206799ea52d8a249d1a2b5  smb4k-0.7.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 24 23:00:46 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon, 24 Apr 2006 16:00:46 -0700
Subject: rpms/tclhttpd/FC-4 tclhttpd-md5-3.5.1.patch, NONE, 1.1 tclhttpd.spec,
	1.4, 1.5
Message-ID: <200604242300.k3ON0mdi026737@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclhttpd/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26717

Modified Files:
	tclhttpd.spec 
Added Files:
	tclhttpd-md5-3.5.1.patch 
Log Message:
- Change default paths to ssl files to match Fedora default locations.
- Don't create the tclhttpd home directory when adding the user.
- Added patch for utils.tcl to prevent error due to missing md5 function.
- Don't delete the tclhttpd user when uninstalling



tclhttpd-md5-3.5.1.patch:

--- NEW FILE tclhttpd-md5-3.5.1.patch ---
Index: lib/utils.tcl
===================================================================
RCS file: /cvsroot/tclhttpd/tclhttpd/lib/utils.tcl,v
retrieving revision 1.10
retrieving revision 1.14
diff -c -r1.10 -r1.14
*** lib/utils.tcl	27 May 2004 01:25:19 -0000	1.10
--- lib/utils.tcl	22 Oct 2004 03:43:06 -0000	1.14
***************
*** 4,13 ****
  # See the file "license.terms" for information on usage and redistribution
  # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  #
! # RCS: @(#) $Id: utils.tcl,v 1.10 2004/05/27 01:25:19 coldstore Exp $
  
  package provide httpd::utils 1.0
  
  # Stderr - print to standard error
  
  proc Stderr {string} {
--- 4,15 ----
  # See the file "license.terms" for information on usage and redistribution
  # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  #
! # RCS: @(#) $Id: utils.tcl,v 1.14 2004/10/22 03:43:06 coldstore Exp $
  
  package provide httpd::utils 1.0
  
+ package require httpd::log	;# Log_SetFile
+ 
  # Stderr - print to standard error
  
  proc Stderr {string} {
***************
*** 24,30 ****
  
  proc lappendOnce {listName value} {
      upvar $listName list
!     if ![info exists list] {
  	lappend list $value
      } else {
  	set ix [lsearch $list $value]
--- 26,32 ----
  
  proc lappendOnce {listName value} {
      upvar $listName list
!     if {![info exists list]} {
  	lappend list $value
      } else {
  	set ix [lsearch $list $value]
***************
*** 106,112 ****
  
  proc ldelete {varList value} {
      upvar $varList list
!     if ![info exist list] {
  	return 0
      }
      set ix [lsearch $list $value]
--- 108,114 ----
  
  proc ldelete {varList value} {
      upvar $varList list
!     if {![info exist list]} {
  	return 0
      }
      set ix [lsearch $list $value]
***************
*** 310,316 ****
      foreach name [array names a $pat] {
  	setmax max [string length $name]
      }
!     if ![info exists max] {
  	return {}
      }
      incr max [string length $aname]
--- 312,318 ----
      foreach name [array names a $pat] {
  	setmax max [string length $name]
      }
!     if {![info exists max]} {
  	return {}
      }
      incr max [string length $aname]
***************
*** 415,421 ****
  	set hit 0
  	for {set c $limit} {$c >= 0} {incr c -1} {
  	    set char [string index $line $c]
! 	    if [regexp \[\ \t\n>/\] $char] {
  		set hit 1
  		break
  	    }
--- 417,423 ----
  	set hit 0
  	for {set c $limit} {$c >= 0} {incr c -1} {
  	    set char [string index $line $c]
! 	    if {[regexp \[\ \t\n>/\] $char]} {
  		set hit 1
  		break
  	    }
***************
*** 606,619 ****
  proc K {a b} {set a}
  proc lambda {argl body} {K [info level 0] [proc [info level 0] $argl $body]}
  
- # Tcllib 1.6 has inconsistencies with md5 1.4.3 and 2.0.0,
- # and requiring 1.0 cures later conflicts with 2.0
- # we run with whatever version is available
- # by making an aliased wrapper
- if {[package vcompare [package present md5] 2.0] > -1} {
-     # we have md5 v2 - it needs to be told to return hex
-     interp alias {} md5hex {} ::md5::md5 --hex --
- } else {
-     # we have md5 v1 - it returns hex anyway
-     interp alias {} md5hex {} ::md5::md5
- }
--- 608,610 ----


Index: tclhttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/FC-4/tclhttpd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tclhttpd.spec	27 Jan 2006 19:36:38 -0000	1.4
+++ tclhttpd.spec	24 Apr 2006 23:00:46 -0000	1.5
@@ -1,7 +1,7 @@
 %define contentdir %_var/www/tclhttpd
 Name: tclhttpd
 Version: 3.5.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: Extensible Web+Application server written in Tcl
 
 Group: System Environment/Daemons
@@ -9,6 +9,7 @@
 URL:            http://tclhttpd.sourceforge.net/
 Source0:        http://prdownloads.sourceforge.net/tclhttpd/tclhttpd3.5.1.tar.gz
 Patch0:		tclhttpd_fedora.1.patch
+Patch1:		tclhttpd-md5-3.5.1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: tcl-devel
@@ -25,7 +26,8 @@
 
 %prep
 %setup -q -n %{name}%{version}
-%patch -p1
+%patch0 -p1
+%patch1
 
 %build
 %configure --with-serverroot=%{contentdir}
@@ -61,6 +63,10 @@
 #    It can be turned on manually if needed.
 sed -e 's/Config uid.*/Config uid tclhttpd/' \
         -e 's/Config gid.*/Config gid tclhttpd/' \
+        -e 's#Config SSL_CADIR.*#Config SSL_CADIR "/etc/pki/tls/certs/"#' \
+        -e 's#Config SSL_CAFILE.*#Config SSL_CAFILE "/etc/pki/tls/certs/ca-bundle.crt"#' \
+        -e 's#Config SSL_CERTFILE.*#Config SSL_CERTFILE     [file join [Config SSL_CADIR] tclhttpd.pem]#' \
+        -e 's#Config SSL_KEYFILE.*#Config SSL_KEYFILE     [file join [Config SSL_CADIR] tclhttpdkey.pem]#' \
         -e 's#Config LogFile.*#Config LogFile %_var/log/tclhttpd/log#' \
         -e 's/#Config Auth {}/Config Auth {}/' < bin/tclhttpd.rc > $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/tclhttpd.rc
 sed -e 's/^Debug_Url.*/#&/' < bin/httpdthread.tcl > $RPM_BUILD_ROOT/%{_datadir}/%{name}%{version}/httpdthread.tcl
@@ -90,7 +96,7 @@
 # server as "root" or "nobody".
 user_uid=`id -u tclhttpd 2>/dev/null`
 if [ x"$user_uid" = x ] ; then
-    /usr/sbin/fedora-useradd 16 -c "Tclhttpd" -s /bin/false -d %{contentdir} tclhttpd
+    /usr/sbin/fedora-useradd 16 -c "Tclhttpd" -s /bin/false -d %{contentdir} -M tclhttpd
 fi
 
 %post
@@ -104,9 +110,7 @@
 
 %postun
 
-if [ "$1" = "0" ]; then
-    /usr/sbin/fedora-userdel tclhttpd
-elif [ "$1" -ge "1" ]; then
+if [ "$1" -ge "1" ]; then
     /sbin/service tclhttpd restart >/dev/null 2>&1
 fi
 
@@ -131,32 +135,46 @@
 %ghost %{_var}/run/tclhttpd/tclhttpd.pid
 
 %changelog
+* Mon Apr 24 2006 Wart <wart at kobold.org> - 3.5.1-9
+- Change default paths to ssl files to match Fedora default locations.
+- Don't create the tclhttpd home directory when adding the user.
+- Added patch for utils.tcl to prevent error due to missing md5 function.
+- Don't delete the tclhttpd user when uninstalling
+
 * Fri Jan 27 2006 Wart <wart at kobold.org> - 3.5.1-8
 - Updated patch so that tclhttpd starts as root and then switches to
   the tclhttpd user.  This is necessary if tclhttpd is to listen
   on port 80.
+
 * Sun Jan 21 2006 Wart <wart at kobold.org> - 3.5.1-7
 - Check if the tclhttpd user exists before trying to create it
+
 * Sun Jan 15 2006 Wart <wart at kobold.org> - 3.5.1-6
 - Use ghosted files for runtime state files.
 - Update patch to remove build dependency on autoconf.
+
 * Tue Nov 22 2005 Wart <wart at kobold.org> - 3.5.1-5
 - Move bin/httpdthread.tcl out of the bin directory.
+
 * Sun Nov 20 2005 Wart <wart at kobold.org> - 3.5.1-4
 - Use fedora_useradd/fedora_userdel to create/delete the tclhttpd user.
 - Added BuildRequires: autoconf.
 - Clean up file permissions to remove many rpmlint warnings.
+
 * Thu Jul 7 2005 <wart at kobold.org> - 3.5.1-3
 - Add 'restart' in the rpm postun stage.  Add post/preun requirements
   for /sbin/chkconfig and /sbin/service.
 - Changed the default runlevel in the init script to '-' to prevent the
   service from being started by default.
+
 * Thu Jun 30 2005 <wart at kobold.org> - 3.5.1-2
 - Updated release tag to include %{dist}
 - Don't include changes to the spec in the patchfile.
 - run autoreconf in the prep stage, not the build stage.
+
 * Fri Jun 17 2005 <wart at kobold.org> - 3.5.1-1
 - Updated spec file to conform to Fedora Core 4 standards.
+
 * Sat Nov 13 2004 <wart at kobold.org> - 3.5.1-0.fdr.8
 - Change content directory again to prevent rpmlint warnings.
 - Change ownership of content directory to prevent rpmlint warnings.
@@ -164,13 +182,16 @@
 - Move crypt and limit dynamically loadable modules into the proper
   subdirectories
 - Turn off potentially insecure debug url.
+
 * Sun Nov 7 2004 <wart at kobold.org> - 3.5.1-0.fdr.7
 - Change content directory to /var/tclhttpd
 - Move logs to /var/log/tclhttpd
 - Remove the debug auth password.
+
 * Wed Nov 3 2004 <wart at kobold.org> - 3.5.1-0.fdr.6
 - Add missing #include <crypt.h> to crypt.c to fix a segfault on
   x86_64.
+
 * Sat Oct 30 2004 <wart at kobold.org> - 3.5.1-0.fdr.5
 - Add expect to the dependency list.
 - Let tclhttpd fork into the background if either one of tclx
@@ -178,15 +199,19 @@
 - Add existing docs to %doc list.
 - Move configuration file to /etc/tclhttpd.
 - Clean up some rpmlint warnings
+
 * Sun Oct 24 2004 <wart at kobold.org> - 3.5.1-0.fdr.4
 - Change package group in the specfile.  Add tcllib to dependency list.
   Remove tclhttpd user during uninstall.
+
 * Wed Oct 6 2004 <wart at kobold.org> - 3.5.1-0.fdr.3
 - Fix bug in the /etc/init.d/tclhttpd startup script that was causing
   it to kill a random tclsh process during shutdown, and misreporting
   the status of tclhttpd.
+
 * Tue Sep 21 2004 <wart at kobold.org> - 3.5.1-0.fdr.2
 - remove hardcoded path in the %build section of the rpm spec file.
+
 * Sun Sep 12 2004 <wart at kobold.org> - 3.5.1-0.fdr.1
 - Initial rpm with a Fedora-compatible spec file.  Included patch
   for better /etc/init.d script behaviour.



From fedora-extras-commits at redhat.com  Mon Apr 24 23:30:16 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon, 24 Apr 2006 16:30:16 -0700
Subject: rpms/tclhttpd/FC-5 tclhttpd.spec,1.6,1.7
Message-ID: <200604242330.k3ONUIna028973@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclhttpd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28956

Modified Files:
	tclhttpd.spec 
Log Message:
- Change default paths to ssl files to match Fedora default locations.
- Don't delete the tclhttpd user when uninstalling




Index: tclhttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/FC-5/tclhttpd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tclhttpd.spec	2 Apr 2006 20:12:42 -0000	1.6
+++ tclhttpd.spec	24 Apr 2006 23:30:16 -0000	1.7
@@ -1,7 +1,7 @@
 %define contentdir %_var/www/tclhttpd
 Name: tclhttpd
 Version: 3.5.1
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: Extensible Web+Application server written in Tcl
 
 Group: System Environment/Daemons
@@ -63,6 +63,10 @@
 #    It can be turned on manually if needed.
 sed -e 's/Config uid.*/Config uid tclhttpd/' \
         -e 's/Config gid.*/Config gid tclhttpd/' \
+        -e 's#Config SSL_CADIR.*#Config SSL_CADIR "/etc/pki/tls/certs/"#' \
+        -e 's#Config SSL_CAFILE.*#Config SSL_CAFILE "/etc/pki/tls/certs/ca-bundle.crt"#' \
+        -e 's#Config SSL_CERTFILE.*#Config SSL_CERTFILE     [file join [Config SSL_CADIR] tclhttpd.pem]#' \
+        -e 's#Config SSL_KEYFILE.*#Config SSL_KEYFILE     [file join [Config SSL_CADIR] tclhttpdkey.pem]#' \
         -e 's#Config LogFile.*#Config LogFile %_var/log/tclhttpd/log#' \
         -e 's/#Config Auth {}/Config Auth {}/' < bin/tclhttpd.rc > $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/tclhttpd.rc
 sed -e 's/^Debug_Url.*/#&/' < bin/httpdthread.tcl > $RPM_BUILD_ROOT/%{_datadir}/%{name}%{version}/httpdthread.tcl
@@ -106,9 +110,7 @@
 
 %postun
 
-if [ "$1" = "0" ]; then
-    /usr/sbin/fedora-userdel tclhttpd
-elif [ "$1" -ge "1" ]; then
+if [ "$1" -ge "1" ]; then
     /sbin/service tclhttpd restart >/dev/null 2>&1
 fi
 
@@ -133,6 +135,10 @@
 %ghost %{_var}/run/tclhttpd/tclhttpd.pid
 
 %changelog
+* Mon Apr 24 2006 Wart <wart at kobold.org> - 3.5.1-12
+- Change default paths to ssl files to match Fedora default locations.
+- Don't delete the tclhttpd user when uninstalling
+
 * Fri Mar 31 2006 Wart <wart at kobold.org> - 3.5.1-11
 - Don't create the tclhttpd home directory when adding the user.
 - Added patch to disable [fork] if we're running in a threaded Tcl.



From fedora-extras-commits at redhat.com  Mon Apr 24 23:31:30 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon, 24 Apr 2006 16:31:30 -0700
Subject: rpms/tclhttpd/devel tclhttpd.spec,1.6,1.7
Message-ID: <200604242331.k3ONVWlk029044@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclhttpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29027

Modified Files:
	tclhttpd.spec 
Log Message:
- Change default paths to ssl files to match Fedora default locations.
- Don't delete the tclhttpd user when uninstalling




Index: tclhttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/devel/tclhttpd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tclhttpd.spec	2 Apr 2006 20:08:06 -0000	1.6
+++ tclhttpd.spec	24 Apr 2006 23:31:30 -0000	1.7
@@ -1,7 +1,7 @@
 %define contentdir %_var/www/tclhttpd
 Name: tclhttpd
 Version: 3.5.1
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: Extensible Web+Application server written in Tcl
 
 Group: System Environment/Daemons
@@ -37,8 +37,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# Override the names of the library files so that rpm does not try to think
-# that this is a library package.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 install -p -D bin/redhat.init.tclhttpd $RPM_BUILD_ROOT/%{_initrddir}/tclhttpd
 mkdir -p $RPM_BUILD_ROOT%_var/run/tclhttpd
@@ -64,6 +63,10 @@
 #    It can be turned on manually if needed.
 sed -e 's/Config uid.*/Config uid tclhttpd/' \
         -e 's/Config gid.*/Config gid tclhttpd/' \
+        -e 's#Config SSL_CADIR.*#Config SSL_CADIR "/etc/pki/tls/certs/"#' \
+        -e 's#Config SSL_CAFILE.*#Config SSL_CAFILE "/etc/pki/tls/certs/ca-bundle.crt"#' \
+        -e 's#Config SSL_CERTFILE.*#Config SSL_CERTFILE     [file join [Config SSL_CADIR] tclhttpd.pem]#' \
+        -e 's#Config SSL_KEYFILE.*#Config SSL_KEYFILE     [file join [Config SSL_CADIR] tclhttpdkey.pem]#' \
         -e 's#Config LogFile.*#Config LogFile %_var/log/tclhttpd/log#' \
         -e 's/#Config Auth {}/Config Auth {}/' < bin/tclhttpd.rc > $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/tclhttpd.rc
 sed -e 's/^Debug_Url.*/#&/' < bin/httpdthread.tcl > $RPM_BUILD_ROOT/%{_datadir}/%{name}%{version}/httpdthread.tcl
@@ -107,9 +110,7 @@
 
 %postun
 
-if [ "$1" = "0" ]; then
-    /usr/sbin/fedora-userdel tclhttpd
-elif [ "$1" -ge "1" ]; then
+if [ "$1" -ge "1" ]; then
     /sbin/service tclhttpd restart >/dev/null 2>&1
 fi
 
@@ -134,6 +135,10 @@
 %ghost %{_var}/run/tclhttpd/tclhttpd.pid
 
 %changelog
+* Mon Apr 24 2006 Wart <wart at kobold.org> - 3.5.1-12
+- Change default paths to ssl files to match Fedora default locations.
+- Don't delete the tclhttpd user when uninstalling
+
 * Fri Mar 31 2006 Wart <wart at kobold.org> - 3.5.1-11
 - Don't create the tclhttpd home directory when adding the user.
 - Added patch to disable [fork] if we're running in a threaded Tcl.



From fedora-extras-commits at redhat.com  Tue Apr 25 00:29:50 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 17:29:50 -0700
Subject: rpms/perl-Lingua-EN-Inflect-Number/devel
	perl-Lingua-EN-Inflect-Number.spec, 1.1, 1.2
Message-ID: <200604250029.k3P0Tqtg031428@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Lingua-EN-Inflect-Number/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31360/devel

Modified Files:
	perl-Lingua-EN-Inflect-Number.spec 
Log Message:

Fix license, contacted author.



Index: perl-Lingua-EN-Inflect-Number.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Lingua-EN-Inflect-Number/devel/perl-Lingua-EN-Inflect-Number.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Lingua-EN-Inflect-Number.spec	30 Jul 2005 03:14:13 -0000	1.1
+++ perl-Lingua-EN-Inflect-Number.spec	25 Apr 2006 00:29:50 -0000	1.2
@@ -1,10 +1,9 @@
 Name:           perl-Lingua-EN-Inflect-Number
 Version:        1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Force number of words to singular or plural
 Group:          Development/Libraries
-License:        Distributable
-#License:        GPL or Artistic
+License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Lingua-EN-Inflect-Number/
 Source0:        http://search.cpan.org/CPAN/authors/id/S/SI/SIMON/Lingua-EN-Inflect-Number-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,6 +44,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-4
+- confirmed license with upstream author
+
 * Fri Jul 29 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-3
 - remove superfluous Requires: perl(Lingua::EN::Inflect)
 - set License to Distributable until we know better



From fedora-extras-commits at redhat.com  Tue Apr 25 00:29:49 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 17:29:49 -0700
Subject: rpms/perl-Lingua-EN-Inflect-Number/FC-4
	perl-Lingua-EN-Inflect-Number.spec, 1.1, 1.2
Message-ID: <200604250029.k3P0TpIV031420@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Lingua-EN-Inflect-Number/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31360/FC-4

Modified Files:
	perl-Lingua-EN-Inflect-Number.spec 
Log Message:

Fix license, contacted author.



Index: perl-Lingua-EN-Inflect-Number.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Lingua-EN-Inflect-Number/FC-4/perl-Lingua-EN-Inflect-Number.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Lingua-EN-Inflect-Number.spec	30 Jul 2005 03:14:13 -0000	1.1
+++ perl-Lingua-EN-Inflect-Number.spec	25 Apr 2006 00:29:49 -0000	1.2
@@ -1,10 +1,9 @@
 Name:           perl-Lingua-EN-Inflect-Number
 Version:        1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Force number of words to singular or plural
 Group:          Development/Libraries
-License:        Distributable
-#License:        GPL or Artistic
+License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Lingua-EN-Inflect-Number/
 Source0:        http://search.cpan.org/CPAN/authors/id/S/SI/SIMON/Lingua-EN-Inflect-Number-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,6 +44,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-4
+- confirmed license with upstream author
+
 * Fri Jul 29 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-3
 - remove superfluous Requires: perl(Lingua::EN::Inflect)
 - set License to Distributable until we know better



From fedora-extras-commits at redhat.com  Tue Apr 25 00:29:50 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 17:29:50 -0700
Subject: rpms/perl-Lingua-EN-Inflect-Number/FC-5
	perl-Lingua-EN-Inflect-Number.spec, 1.1, 1.2
Message-ID: <200604250029.k3P0TqV4031424@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Lingua-EN-Inflect-Number/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31360/FC-5

Modified Files:
	perl-Lingua-EN-Inflect-Number.spec 
Log Message:

Fix license, contacted author.



Index: perl-Lingua-EN-Inflect-Number.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Lingua-EN-Inflect-Number/FC-5/perl-Lingua-EN-Inflect-Number.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Lingua-EN-Inflect-Number.spec	30 Jul 2005 03:14:13 -0000	1.1
+++ perl-Lingua-EN-Inflect-Number.spec	25 Apr 2006 00:29:49 -0000	1.2
@@ -1,10 +1,9 @@
 Name:           perl-Lingua-EN-Inflect-Number
 Version:        1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Force number of words to singular or plural
 Group:          Development/Libraries
-License:        Distributable
-#License:        GPL or Artistic
+License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Lingua-EN-Inflect-Number/
 Source0:        http://search.cpan.org/CPAN/authors/id/S/SI/SIMON/Lingua-EN-Inflect-Number-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,6 +44,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-4
+- confirmed license with upstream author
+
 * Fri Jul 29 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-3
 - remove superfluous Requires: perl(Lingua::EN::Inflect)
 - set License to Distributable until we know better



From fedora-extras-commits at redhat.com  Tue Apr 25 00:29:48 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 17:29:48 -0700
Subject: rpms/perl-Lingua-EN-Inflect-Number/FC-3
	perl-Lingua-EN-Inflect-Number.spec, 1.1, 1.2
Message-ID: <200604250030.k3P0UK5u031433@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Lingua-EN-Inflect-Number/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31360/FC-3

Modified Files:
	perl-Lingua-EN-Inflect-Number.spec 
Log Message:

Fix license, contacted author.



Index: perl-Lingua-EN-Inflect-Number.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Lingua-EN-Inflect-Number/FC-3/perl-Lingua-EN-Inflect-Number.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Lingua-EN-Inflect-Number.spec	30 Jul 2005 03:14:13 -0000	1.1
+++ perl-Lingua-EN-Inflect-Number.spec	25 Apr 2006 00:29:48 -0000	1.2
@@ -1,10 +1,9 @@
 Name:           perl-Lingua-EN-Inflect-Number
 Version:        1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Force number of words to singular or plural
 Group:          Development/Libraries
-License:        Distributable
-#License:        GPL or Artistic
+License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Lingua-EN-Inflect-Number/
 Source0:        http://search.cpan.org/CPAN/authors/id/S/SI/SIMON/Lingua-EN-Inflect-Number-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,6 +44,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-4
+- confirmed license with upstream author
+
 * Fri Jul 29 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-3
 - remove superfluous Requires: perl(Lingua::EN::Inflect)
 - set License to Distributable until we know better



From fedora-extras-commits at redhat.com  Tue Apr 25 00:40:07 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 17:40:07 -0700
Subject: rpms/perl-Class-DBI-Loader-Relationship/devel
	perl-Class-DBI-Loader-Relationship.spec, 1.2, 1.3
Message-ID: <200604250040.k3P0e98H031681@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31617/devel

Modified Files:
	perl-Class-DBI-Loader-Relationship.spec 
Log Message:

Fix license here too.



Index: perl-Class-DBI-Loader-Relationship.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/devel/perl-Class-DBI-Loader-Relationship.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-DBI-Loader-Relationship.spec	9 Jan 2006 23:09:12 -0000	1.2
+++ perl-Class-DBI-Loader-Relationship.spec	25 Apr 2006 00:40:07 -0000	1.3
@@ -1,9 +1,9 @@
 Name:           perl-Class-DBI-Loader-Relationship
 Version:        1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Easier relationship specification in CDBI::L
 Group:          Development/Libraries
-License:        Distributable
+License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Class-DBI-Loader-Relationship/
 Source0:        http://search.cpan.org/CPAN/authors/id/S/SI/SIMON/Class-DBI-Loader-Relationship-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.3-2
+- correct license, should be GPL or Artistic
+
 * Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.3-1
 - bump to 1.3
 



From fedora-extras-commits at redhat.com  Tue Apr 25 00:40:00 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 17:40:00 -0700
Subject: rpms/perl-Class-DBI-Loader-Relationship/FC-3
	perl-Class-DBI-Loader-Relationship.spec, 1.2, 1.3
Message-ID: <200604250040.k3P0eWla031684@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31617/FC-3

Modified Files:
	perl-Class-DBI-Loader-Relationship.spec 
Log Message:

Fix license here too.



Index: perl-Class-DBI-Loader-Relationship.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/FC-3/perl-Class-DBI-Loader-Relationship.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-DBI-Loader-Relationship.spec	9 Jan 2006 23:08:17 -0000	1.2
+++ perl-Class-DBI-Loader-Relationship.spec	25 Apr 2006 00:40:00 -0000	1.3
@@ -1,9 +1,9 @@
 Name:           perl-Class-DBI-Loader-Relationship
 Version:        1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Easier relationship specification in CDBI::L
 Group:          Development/Libraries
-License:        Distributable
+License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Class-DBI-Loader-Relationship/
 Source0:        http://search.cpan.org/CPAN/authors/id/S/SI/SIMON/Class-DBI-Loader-Relationship-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.3-2
+- correct license, should be GPL or Artistic
+
 * Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.3-1
 - bump to 1.3
 



From fedora-extras-commits at redhat.com  Tue Apr 25 00:40:01 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 17:40:01 -0700
Subject: rpms/perl-Class-DBI-Loader-Relationship/FC-4
	perl-Class-DBI-Loader-Relationship.spec, 1.2, 1.3
Message-ID: <200604250040.k3P0eXBd031687@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31617/FC-4

Modified Files:
	perl-Class-DBI-Loader-Relationship.spec 
Log Message:

Fix license here too.



Index: perl-Class-DBI-Loader-Relationship.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/FC-4/perl-Class-DBI-Loader-Relationship.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-DBI-Loader-Relationship.spec	9 Jan 2006 23:08:41 -0000	1.2
+++ perl-Class-DBI-Loader-Relationship.spec	25 Apr 2006 00:40:01 -0000	1.3
@@ -1,9 +1,9 @@
 Name:           perl-Class-DBI-Loader-Relationship
 Version:        1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Easier relationship specification in CDBI::L
 Group:          Development/Libraries
-License:        Distributable
+License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Class-DBI-Loader-Relationship/
 Source0:        http://search.cpan.org/CPAN/authors/id/S/SI/SIMON/Class-DBI-Loader-Relationship-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.3-2
+- correct license, should be GPL or Artistic
+
 * Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.3-1
 - bump to 1.3
 



From fedora-extras-commits at redhat.com  Tue Apr 25 00:40:01 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 17:40:01 -0700
Subject: rpms/perl-Class-DBI-Loader-Relationship/FC-5
	perl-Class-DBI-Loader-Relationship.spec, 1.2, 1.3
Message-ID: <200604250040.k3P0eXOB031690@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31617/FC-5

Modified Files:
	perl-Class-DBI-Loader-Relationship.spec 
Log Message:

Fix license here too.



Index: perl-Class-DBI-Loader-Relationship.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/FC-5/perl-Class-DBI-Loader-Relationship.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-DBI-Loader-Relationship.spec	9 Jan 2006 23:09:12 -0000	1.2
+++ perl-Class-DBI-Loader-Relationship.spec	25 Apr 2006 00:40:01 -0000	1.3
@@ -1,9 +1,9 @@
 Name:           perl-Class-DBI-Loader-Relationship
 Version:        1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Easier relationship specification in CDBI::L
 Group:          Development/Libraries
-License:        Distributable
+License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Class-DBI-Loader-Relationship/
 Source0:        http://search.cpan.org/CPAN/authors/id/S/SI/SIMON/Class-DBI-Loader-Relationship-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.3-2
+- correct license, should be GPL or Artistic
+
 * Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.3-1
 - bump to 1.3
 



From fedora-extras-commits at redhat.com  Tue Apr 25 00:46:30 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 17:46:30 -0700
Subject: rpms/perl-UNIVERSAL-exports/FC-5 perl-UNIVERSAL-exports.spec, 1.1,
	1.2
Message-ID: <200604250046.k3P0kWxs031918@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-UNIVERSAL-exports/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31857/FC-5

Modified Files:
	perl-UNIVERSAL-exports.spec 
Log Message:

Trust debian on the license based on email correspondance.



Index: perl-UNIVERSAL-exports.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-UNIVERSAL-exports/FC-5/perl-UNIVERSAL-exports.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-UNIVERSAL-exports.spec	14 Aug 2005 18:50:51 -0000	1.1
+++ perl-UNIVERSAL-exports.spec	25 Apr 2006 00:46:30 -0000	1.2
@@ -1,10 +1,9 @@
 Name:           perl-UNIVERSAL-exports
 Version:        0.03
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Lightweight, universal exporting of variables
 Group:          Development/Libraries
-# This is likely GPL or Artistic, like perl, but it cannot be confirmed.
-License:        Distributable
+License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/UNIVERSAL-exports/
 Source0:        http://search.cpan.org/CPAN/authors/id/M/MS/MSCHWERN/UNIVERSAL-exports-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,6 +44,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.03-4
+- debian has license confirmation from 2002, we'll trust that
+
 * Sun Aug 14 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.03-3
 - change license to Distributable, since upstream never replied to 
   license confirmation



From fedora-extras-commits at redhat.com  Tue Apr 25 00:46:31 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 17:46:31 -0700
Subject: rpms/perl-UNIVERSAL-exports/devel perl-UNIVERSAL-exports.spec, 1.1, 
	1.2
Message-ID: <200604250046.k3P0kXqv031922@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-UNIVERSAL-exports/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31857/devel

Modified Files:
	perl-UNIVERSAL-exports.spec 
Log Message:

Trust debian on the license based on email correspondance.



Index: perl-UNIVERSAL-exports.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-UNIVERSAL-exports/devel/perl-UNIVERSAL-exports.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-UNIVERSAL-exports.spec	14 Aug 2005 18:50:51 -0000	1.1
+++ perl-UNIVERSAL-exports.spec	25 Apr 2006 00:46:31 -0000	1.2
@@ -1,10 +1,9 @@
 Name:           perl-UNIVERSAL-exports
 Version:        0.03
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Lightweight, universal exporting of variables
 Group:          Development/Libraries
-# This is likely GPL or Artistic, like perl, but it cannot be confirmed.
-License:        Distributable
+License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/UNIVERSAL-exports/
 Source0:        http://search.cpan.org/CPAN/authors/id/M/MS/MSCHWERN/UNIVERSAL-exports-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,6 +44,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.03-4
+- debian has license confirmation from 2002, we'll trust that
+
 * Sun Aug 14 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.03-3
 - change license to Distributable, since upstream never replied to 
   license confirmation



From fedora-extras-commits at redhat.com  Tue Apr 25 00:46:24 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 17:46:24 -0700
Subject: rpms/perl-UNIVERSAL-exports/FC-3 perl-UNIVERSAL-exports.spec, 1.1,
	1.2
Message-ID: <200604250046.k3P0ku0w031925@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-UNIVERSAL-exports/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31857/FC-3

Modified Files:
	perl-UNIVERSAL-exports.spec 
Log Message:

Trust debian on the license based on email correspondance.



Index: perl-UNIVERSAL-exports.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-UNIVERSAL-exports/FC-3/perl-UNIVERSAL-exports.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-UNIVERSAL-exports.spec	14 Aug 2005 18:50:51 -0000	1.1
+++ perl-UNIVERSAL-exports.spec	25 Apr 2006 00:46:24 -0000	1.2
@@ -1,10 +1,9 @@
 Name:           perl-UNIVERSAL-exports
 Version:        0.03
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Lightweight, universal exporting of variables
 Group:          Development/Libraries
-# This is likely GPL or Artistic, like perl, but it cannot be confirmed.
-License:        Distributable
+License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/UNIVERSAL-exports/
 Source0:        http://search.cpan.org/CPAN/authors/id/M/MS/MSCHWERN/UNIVERSAL-exports-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,6 +44,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.03-4
+- debian has license confirmation from 2002, we'll trust that
+
 * Sun Aug 14 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.03-3
 - change license to Distributable, since upstream never replied to 
   license confirmation



From fedora-extras-commits at redhat.com  Tue Apr 25 00:46:25 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 17:46:25 -0700
Subject: rpms/perl-UNIVERSAL-exports/FC-4 perl-UNIVERSAL-exports.spec, 1.1,
	1.2
Message-ID: <200604250046.k3P0kvFK031928@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-UNIVERSAL-exports/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31857/FC-4

Modified Files:
	perl-UNIVERSAL-exports.spec 
Log Message:

Trust debian on the license based on email correspondance.



Index: perl-UNIVERSAL-exports.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-UNIVERSAL-exports/FC-4/perl-UNIVERSAL-exports.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-UNIVERSAL-exports.spec	14 Aug 2005 18:50:51 -0000	1.1
+++ perl-UNIVERSAL-exports.spec	25 Apr 2006 00:46:24 -0000	1.2
@@ -1,10 +1,9 @@
 Name:           perl-UNIVERSAL-exports
 Version:        0.03
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Lightweight, universal exporting of variables
 Group:          Development/Libraries
-# This is likely GPL or Artistic, like perl, but it cannot be confirmed.
-License:        Distributable
+License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/UNIVERSAL-exports/
 Source0:        http://search.cpan.org/CPAN/authors/id/M/MS/MSCHWERN/UNIVERSAL-exports-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,6 +44,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.03-4
+- debian has license confirmation from 2002, we'll trust that
+
 * Sun Aug 14 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.03-3
 - change license to Distributable, since upstream never replied to 
   license confirmation



From fedora-extras-commits at redhat.com  Tue Apr 25 00:55:04 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 17:55:04 -0700
Subject: rpms/perl-Class-DBI-Pager/devel .cvsignore, 1.3,
	1.4 perl-Class-DBI-Pager.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200604250055.k3P0t6ZH032180@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Pager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32111/devel

Modified Files:
	.cvsignore perl-Class-DBI-Pager.spec sources 
Log Message:

bump to 0.08



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pager/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Jan 2006 18:00:47 -0000	1.3
+++ .cvsignore	25 Apr 2006 00:55:04 -0000	1.4
@@ -1,2 +1,3 @@
 Class-DBI-Pager-0.06.tar.gz
 Class-DBI-Pager-0.07.tar.gz
+Class-DBI-Pager-0.08.tar.gz


Index: perl-Class-DBI-Pager.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pager/devel/perl-Class-DBI-Pager.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-DBI-Pager.spec	10 Jan 2006 18:00:47 -0000	1.2
+++ perl-Class-DBI-Pager.spec	25 Apr 2006 00:55:04 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-Class-DBI-Pager
-Version:        0.07
+Version:        0.08
 Release:        1%{?dist}
 Summary:        Pager utility for Class::DBI
 Group:          Development/Libraries
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.08-1
+- bump to 0.08
+
 * Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.07-1
 - bump to 0.07
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pager/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Jan 2006 18:00:47 -0000	1.3
+++ sources	25 Apr 2006 00:55:04 -0000	1.4
@@ -1 +1 @@
-611f9bc30b03b8101de4b1e45bb6cc0f  Class-DBI-Pager-0.07.tar.gz
+d6b462ecc6439728a209ec5ec0192b0c  Class-DBI-Pager-0.08.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 00:54:57 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 17:54:57 -0700
Subject: rpms/perl-Class-DBI-Pager/FC-3 perl-Class-DBI-Pager.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200604250055.k3P0tTfP032189@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Pager/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32111/FC-3

Modified Files:
	perl-Class-DBI-Pager.spec sources 
Log Message:

bump to 0.08



Index: perl-Class-DBI-Pager.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pager/FC-3/perl-Class-DBI-Pager.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-DBI-Pager.spec	10 Jan 2006 18:00:35 -0000	1.2
+++ perl-Class-DBI-Pager.spec	25 Apr 2006 00:54:57 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-Class-DBI-Pager
-Version:        0.07
+Version:        0.08
 Release:        1%{?dist}
 Summary:        Pager utility for Class::DBI
 Group:          Development/Libraries
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.08-1
+- bump to 0.08
+
 * Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.07-1
 - bump to 0.07
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pager/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Jan 2006 18:00:35 -0000	1.3
+++ sources	25 Apr 2006 00:54:57 -0000	1.4
@@ -1 +1 @@
-611f9bc30b03b8101de4b1e45bb6cc0f  Class-DBI-Pager-0.07.tar.gz
+d6b462ecc6439728a209ec5ec0192b0c  Class-DBI-Pager-0.08.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 00:54:59 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 17:54:59 -0700
Subject: rpms/perl-Class-DBI-Pager/FC-5 perl-Class-DBI-Pager.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200604250055.k3P0tVg4032198@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Pager/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32111/FC-5

Modified Files:
	perl-Class-DBI-Pager.spec sources 
Log Message:

bump to 0.08



Index: perl-Class-DBI-Pager.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pager/FC-5/perl-Class-DBI-Pager.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-DBI-Pager.spec	10 Jan 2006 18:00:47 -0000	1.2
+++ perl-Class-DBI-Pager.spec	25 Apr 2006 00:54:58 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-Class-DBI-Pager
-Version:        0.07
+Version:        0.08
 Release:        1%{?dist}
 Summary:        Pager utility for Class::DBI
 Group:          Development/Libraries
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.08-1
+- bump to 0.08
+
 * Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.07-1
 - bump to 0.07
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pager/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Jan 2006 18:00:47 -0000	1.3
+++ sources	25 Apr 2006 00:54:58 -0000	1.4
@@ -1 +1 @@
-611f9bc30b03b8101de4b1e45bb6cc0f  Class-DBI-Pager-0.07.tar.gz
+d6b462ecc6439728a209ec5ec0192b0c  Class-DBI-Pager-0.08.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 00:54:58 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 17:54:58 -0700
Subject: rpms/perl-Class-DBI-Pager/FC-4 perl-Class-DBI-Pager.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200604250055.k3P0tU40032193@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Pager/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32111/FC-4

Modified Files:
	perl-Class-DBI-Pager.spec sources 
Log Message:

bump to 0.08



Index: perl-Class-DBI-Pager.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pager/FC-4/perl-Class-DBI-Pager.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-DBI-Pager.spec	10 Jan 2006 18:00:41 -0000	1.2
+++ perl-Class-DBI-Pager.spec	25 Apr 2006 00:54:58 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-Class-DBI-Pager
-Version:        0.07
+Version:        0.08
 Release:        1%{?dist}
 Summary:        Pager utility for Class::DBI
 Group:          Development/Libraries
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.08-1
+- bump to 0.08
+
 * Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.07-1
 - bump to 0.07
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pager/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Jan 2006 18:00:41 -0000	1.3
+++ sources	25 Apr 2006 00:54:58 -0000	1.4
@@ -1 +1 @@
-611f9bc30b03b8101de4b1e45bb6cc0f  Class-DBI-Pager-0.07.tar.gz
+d6b462ecc6439728a209ec5ec0192b0c  Class-DBI-Pager-0.08.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 00:57:16 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Mon, 24 Apr 2006 17:57:16 -0700
Subject: owners owners.list,1.888,1.889
Message-ID: <200604250057.k3P0vIc1032317@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32214

Modified Files:
	owners.list 
Log Message:
taking ownership of screem



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.888
retrieving revision 1.889
diff -u -r1.888 -r1.889
--- owners.list	24 Apr 2006 18:06:26 -0000	1.888
+++ owners.list	25 Apr 2006 00:57:16 -0000	1.889
@@ -1377,7 +1377,7 @@
 Fedora Extras|scons|An Open Source software construction tool|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|scorched3d|A game based loosely on the classic DOS game Scorched Earth|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|scponly|Restricted shell for ssh based file services|wtogami at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|screem|A website development enviroment|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|screem|A website development enviroment|michael at knox.net.nz|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|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|scrub|Disk scrubbing program|tcallawa at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Apr 25 01:00:50 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 24 Apr 2006 18:00:50 -0700
Subject: rpms/perl-Cairo - New directory
Message-ID: <200604250100.k3P10qvS032502@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Cairo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32473/perl-Cairo

Log Message:
Directory /cvs/extras/rpms/perl-Cairo added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 25 01:00:51 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 24 Apr 2006 18:00:51 -0700
Subject: rpms/perl-Cairo/devel - New directory
Message-ID: <200604250100.k3P10rvo032505@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Cairo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32473/perl-Cairo/devel

Log Message:
Directory /cvs/extras/rpms/perl-Cairo/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 25 01:01:13 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 24 Apr 2006 18:01:13 -0700
Subject: rpms/perl-Cairo/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604250101.k3P11F2m002164@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Cairo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2109/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Cairo


--- 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 Apr 25 01:01:12 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 24 Apr 2006 18:01:12 -0700
Subject: rpms/perl-Cairo Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604250101.k3P11EQr002154@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Cairo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2109

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Cairo


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Cairo
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Apr 25 01:02:21 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 24 Apr 2006 18:02:21 -0700
Subject: rpms/perl-Cairo import.log,1.1,1.2
Message-ID: <200604250102.k3P12tWL002244@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Cairo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2210

Modified Files:
	import.log 
Log Message:
auto-import perl-Cairo-0.03-2 on branch devel from perl-Cairo-0.03-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Cairo/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Apr 2006 01:01:12 -0000	1.1
+++ import.log	25 Apr 2006 01:02:21 -0000	1.2
@@ -0,0 +1 @@
+perl-Cairo-0_03-2:HEAD:perl-Cairo-0.03-2.src.rpm:1145926925



From fedora-extras-commits at redhat.com  Tue Apr 25 01:02:24 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 24 Apr 2006 18:02:24 -0700
Subject: rpms/perl-Cairo/devel perl-Cairo.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604250102.k3P12wGH002246@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Cairo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2210/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Cairo.spec 
Log Message:
auto-import perl-Cairo-0.03-2 on branch devel from perl-Cairo-0.03-2.src.rpm


--- NEW FILE perl-Cairo.spec ---
#
# Rebuild option:
#
#   --with testsuite         - run the test suite
#

Name:           perl-Cairo
Version:        0.03
Release:        2%{?dist}
Summary:        Perl interface to the cairo library

Group:          Development/Libraries
License:        LGPL
URL:            http://search.cpan.org/dist/Cairo/
Source0:        http://www.cpan.org/authors/id/T/TS/TSCH/Cairo-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig)
BuildRequires:  cairo-devel >= 1.0.0
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Cairo provides Perl bindings for the vector graphics library cairo.
It supports multiple output targets, including the X Window Systems,
PDF, and PNG.  Cairo produces identical output on all those targets
and makes use of hardware acceleration wherever possible.


%prep
%setup -q -n Cairo-%{version}
chmod 644 examples/simple.pl


%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 ChangeLog LICENSE NEWS README TODO examples/
%{perl_vendorarch}/Cairo*
%{perl_vendorarch}/auto/Cairo/
%{_mandir}/man3/*.3*


%changelog
* Tue Apr 18 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.03-2
- Disabled the test suite as it fails in mock.

* Sun Mar 19 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.03-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Cairo/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Apr 2006 01:01:13 -0000	1.1
+++ .cvsignore	25 Apr 2006 01:02:24 -0000	1.2
@@ -0,0 +1 @@
+Cairo-0.03.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Cairo/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Apr 2006 01:01:13 -0000	1.1
+++ sources	25 Apr 2006 01:02:24 -0000	1.2
@@ -0,0 +1 @@
+6ad0ab39eb8f56272373a9ea4515f37a  Cairo-0.03.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 01:04:50 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 18:04:50 -0700
Subject: rpms/perl-ExtUtils-XSBuilder/FC-3 perl-ExtUtils-XSBuilder.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200604250105.k3P15MwD002391@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-ExtUtils-XSBuilder/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2323/FC-3

Modified Files:
	perl-ExtUtils-XSBuilder.spec sources 
Log Message:

Bump to 0.28



Index: perl-ExtUtils-XSBuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-XSBuilder/FC-3/perl-ExtUtils-XSBuilder.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-ExtUtils-XSBuilder.spec	8 Jul 2005 18:43:53 -0000	1.2
+++ perl-ExtUtils-XSBuilder.spec	25 Apr 2006 01:04:50 -0000	1.3
@@ -1,11 +1,11 @@
 Name:           perl-ExtUtils-XSBuilder
-Version:        0.27
-Release:        2%{?dist}
+Version:        0.28
+Release:        1%{?dist}
 Summary:        Modules that parse C header files and create XS glue code
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/ExtUtils-XSBuilder/
-Source0:        http://search.cpan.org/CPAN/authors/id/G/GR/GRICHTER/ExtUtils-XSBuilder-0.27.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/G/GR/GRICHTER/ExtUtils-XSBuilder-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -51,6 +51,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.28-1
+- bump to 0.28
+
 * Fri Jul  8 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.27-2
 - cleanups
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-XSBuilder/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Jul 2005 18:39:17 -0000	1.2
+++ sources	25 Apr 2006 01:04:50 -0000	1.3
@@ -1 +1 @@
-6e1f1c8207b598166dc7a06d633db308  ExtUtils-XSBuilder-0.27.tar.gz
+1d33ddeacc01426a02e23c71c2e4cd04  ExtUtils-XSBuilder-0.28.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 01:04:51 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 18:04:51 -0700
Subject: rpms/perl-ExtUtils-XSBuilder/FC-4 perl-ExtUtils-XSBuilder.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200604250105.k3P15NoD002395@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-ExtUtils-XSBuilder/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2323/FC-4

Modified Files:
	perl-ExtUtils-XSBuilder.spec sources 
Log Message:

Bump to 0.28



Index: perl-ExtUtils-XSBuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-XSBuilder/FC-4/perl-ExtUtils-XSBuilder.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-ExtUtils-XSBuilder.spec	8 Jul 2005 18:43:53 -0000	1.2
+++ perl-ExtUtils-XSBuilder.spec	25 Apr 2006 01:04:50 -0000	1.3
@@ -1,11 +1,11 @@
 Name:           perl-ExtUtils-XSBuilder
-Version:        0.27
-Release:        2%{?dist}
+Version:        0.28
+Release:        1%{?dist}
 Summary:        Modules that parse C header files and create XS glue code
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/ExtUtils-XSBuilder/
-Source0:        http://search.cpan.org/CPAN/authors/id/G/GR/GRICHTER/ExtUtils-XSBuilder-0.27.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/G/GR/GRICHTER/ExtUtils-XSBuilder-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -51,6 +51,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.28-1
+- bump to 0.28
+
 * Fri Jul  8 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.27-2
 - cleanups
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-XSBuilder/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Jul 2005 18:39:17 -0000	1.2
+++ sources	25 Apr 2006 01:04:50 -0000	1.3
@@ -1 +1 @@
-6e1f1c8207b598166dc7a06d633db308  ExtUtils-XSBuilder-0.27.tar.gz
+1d33ddeacc01426a02e23c71c2e4cd04  ExtUtils-XSBuilder-0.28.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 01:04:57 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 18:04:57 -0700
Subject: rpms/perl-ExtUtils-XSBuilder/devel .cvsignore, 1.2,
	1.3 perl-ExtUtils-XSBuilder.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200604250105.k3P15Tde002404@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-ExtUtils-XSBuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2323/devel

Modified Files:
	.cvsignore perl-ExtUtils-XSBuilder.spec sources 
Log Message:

Bump to 0.28



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-XSBuilder/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Jul 2005 18:39:17 -0000	1.2
+++ .cvsignore	25 Apr 2006 01:04:57 -0000	1.3
@@ -1 +1,2 @@
 ExtUtils-XSBuilder-0.27.tar.gz
+ExtUtils-XSBuilder-0.28.tar.gz


Index: perl-ExtUtils-XSBuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-XSBuilder/devel/perl-ExtUtils-XSBuilder.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-ExtUtils-XSBuilder.spec	8 Jul 2005 18:43:53 -0000	1.2
+++ perl-ExtUtils-XSBuilder.spec	25 Apr 2006 01:04:57 -0000	1.3
@@ -1,11 +1,11 @@
 Name:           perl-ExtUtils-XSBuilder
-Version:        0.27
-Release:        2%{?dist}
+Version:        0.28
+Release:        1%{?dist}
 Summary:        Modules that parse C header files and create XS glue code
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/ExtUtils-XSBuilder/
-Source0:        http://search.cpan.org/CPAN/authors/id/G/GR/GRICHTER/ExtUtils-XSBuilder-0.27.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/G/GR/GRICHTER/ExtUtils-XSBuilder-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -51,6 +51,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.28-1
+- bump to 0.28
+
 * Fri Jul  8 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.27-2
 - cleanups
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-XSBuilder/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Jul 2005 18:39:17 -0000	1.2
+++ sources	25 Apr 2006 01:04:57 -0000	1.3
@@ -1 +1 @@
-6e1f1c8207b598166dc7a06d633db308  ExtUtils-XSBuilder-0.27.tar.gz
+1d33ddeacc01426a02e23c71c2e4cd04  ExtUtils-XSBuilder-0.28.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 01:04:56 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 18:04:56 -0700
Subject: rpms/perl-ExtUtils-XSBuilder/FC-5 perl-ExtUtils-XSBuilder.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200604250105.k3P15SCP002399@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-ExtUtils-XSBuilder/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2323/FC-5

Modified Files:
	perl-ExtUtils-XSBuilder.spec sources 
Log Message:

Bump to 0.28



Index: perl-ExtUtils-XSBuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-XSBuilder/FC-5/perl-ExtUtils-XSBuilder.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-ExtUtils-XSBuilder.spec	8 Jul 2005 18:43:53 -0000	1.2
+++ perl-ExtUtils-XSBuilder.spec	25 Apr 2006 01:04:56 -0000	1.3
@@ -1,11 +1,11 @@
 Name:           perl-ExtUtils-XSBuilder
-Version:        0.27
-Release:        2%{?dist}
+Version:        0.28
+Release:        1%{?dist}
 Summary:        Modules that parse C header files and create XS glue code
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/ExtUtils-XSBuilder/
-Source0:        http://search.cpan.org/CPAN/authors/id/G/GR/GRICHTER/ExtUtils-XSBuilder-0.27.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/G/GR/GRICHTER/ExtUtils-XSBuilder-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -51,6 +51,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.28-1
+- bump to 0.28
+
 * Fri Jul  8 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.27-2
 - cleanups
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-XSBuilder/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Jul 2005 18:39:17 -0000	1.2
+++ sources	25 Apr 2006 01:04:56 -0000	1.3
@@ -1 +1 @@
-6e1f1c8207b598166dc7a06d633db308  ExtUtils-XSBuilder-0.27.tar.gz
+1d33ddeacc01426a02e23c71c2e4cd04  ExtUtils-XSBuilder-0.28.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 01:12:33 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 24 Apr 2006 18:12:33 -0700
Subject: owners owners.list,1.889,1.890
Message-ID: <200604250112.k3P1CZYJ002568@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2551

Modified Files:
	owners.list 
Log Message:
New package: perl-Cairo (#1877999


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.889
retrieving revision 1.890
diff -u -r1.889 -r1.890
--- owners.list	25 Apr 2006 00:57:16 -0000	1.889
+++ owners.list	25 Apr 2006 01:12:32 -0000	1.890
@@ -873,6 +873,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-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-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-capitalization|No capitalization on method names|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Carp-Assert|Executable comments|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Carp-Assert-More|Convenience wrappers around Carp::Assert|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Apr 25 01:23:58 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 18:23:58 -0700
Subject: rpms/perl-Image-ExifTool/FC-5 perl-Image-ExifTool.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200604250124.k3P1O04L002711@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Image-ExifTool/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2644/FC-5

Modified Files:
	perl-Image-ExifTool.spec sources 
Log Message:

bump to 6.15



Index: perl-Image-ExifTool.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-ExifTool/FC-5/perl-Image-ExifTool.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Image-ExifTool.spec	31 Mar 2006 20:21:56 -0000	1.3
+++ perl-Image-ExifTool.spec	25 Apr 2006 01:23:58 -0000	1.4
@@ -1,5 +1,5 @@
 Name:		perl-Image-ExifTool
-Version:	6.09
+Version:	6.15
 Release:	1%{?dist}
 License:	GPL or Artistic
 Group:		Applications/Multimedia
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 6.15-1
+- bump to 6.15
+
 * Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 6.09-1
 - bump to 6.09
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-ExifTool/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	31 Mar 2006 20:21:56 -0000	1.4
+++ sources	25 Apr 2006 01:23:58 -0000	1.5
@@ -1 +1 @@
-66dc6aa550799a879c66f4ceba348d6d  Image-ExifTool-6.09.tar.gz
+6e888a71b152b68aaaaf3183997e2cc2  Image-ExifTool-6.15.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 01:23:58 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 18:23:58 -0700
Subject: rpms/perl-Image-ExifTool/devel .cvsignore, 1.4,
	1.5 perl-Image-ExifTool.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <200604250124.k3P1O0K7002717@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Image-ExifTool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2644/devel

Modified Files:
	.cvsignore perl-Image-ExifTool.spec sources 
Log Message:

bump to 6.15



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-ExifTool/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	31 Mar 2006 20:21:56 -0000	1.4
+++ .cvsignore	25 Apr 2006 01:23:58 -0000	1.5
@@ -1,3 +1,4 @@
 Image-ExifTool-5.53.tar.gz
 Image-ExifTool-5.89.tar.gz
 Image-ExifTool-6.09.tar.gz
+Image-ExifTool-6.15.tar.gz


Index: perl-Image-ExifTool.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-ExifTool/devel/perl-Image-ExifTool.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Image-ExifTool.spec	31 Mar 2006 20:21:56 -0000	1.3
+++ perl-Image-ExifTool.spec	25 Apr 2006 01:23:58 -0000	1.4
@@ -1,5 +1,5 @@
 Name:		perl-Image-ExifTool
-Version:	6.09
+Version:	6.15
 Release:	1%{?dist}
 License:	GPL or Artistic
 Group:		Applications/Multimedia
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 6.15-1
+- bump to 6.15
+
 * Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 6.09-1
 - bump to 6.09
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-ExifTool/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	31 Mar 2006 20:21:56 -0000	1.4
+++ sources	25 Apr 2006 01:23:58 -0000	1.5
@@ -1 +1 @@
-66dc6aa550799a879c66f4ceba348d6d  Image-ExifTool-6.09.tar.gz
+6e888a71b152b68aaaaf3183997e2cc2  Image-ExifTool-6.15.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 01:23:52 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 18:23:52 -0700
Subject: rpms/perl-Image-ExifTool/FC-3 perl-Image-ExifTool.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200604250124.k3P1OOPF002723@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Image-ExifTool/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2644/FC-3

Modified Files:
	perl-Image-ExifTool.spec sources 
Log Message:

bump to 6.15



Index: perl-Image-ExifTool.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-ExifTool/FC-3/perl-Image-ExifTool.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Image-ExifTool.spec	31 Mar 2006 20:21:54 -0000	1.3
+++ perl-Image-ExifTool.spec	25 Apr 2006 01:23:51 -0000	1.4
@@ -1,5 +1,5 @@
 Name:		perl-Image-ExifTool
-Version:	6.09
+Version:	6.15
 Release:	1%{?dist}
 License:	GPL or Artistic
 Group:		Applications/Multimedia
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 6.15-1
+- bump to 6.15
+
 * Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 6.09-1
 - bump to 6.09
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-ExifTool/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	31 Mar 2006 20:21:54 -0000	1.4
+++ sources	25 Apr 2006 01:23:51 -0000	1.5
@@ -1 +1 @@
-66dc6aa550799a879c66f4ceba348d6d  Image-ExifTool-6.09.tar.gz
+6e888a71b152b68aaaaf3183997e2cc2  Image-ExifTool-6.15.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 01:23:52 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 18:23:52 -0700
Subject: rpms/perl-Image-ExifTool/FC-4 perl-Image-ExifTool.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200604250124.k3P1OOsh002727@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Image-ExifTool/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2644/FC-4

Modified Files:
	perl-Image-ExifTool.spec sources 
Log Message:

bump to 6.15



Index: perl-Image-ExifTool.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-ExifTool/FC-4/perl-Image-ExifTool.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Image-ExifTool.spec	31 Mar 2006 20:21:55 -0000	1.3
+++ perl-Image-ExifTool.spec	25 Apr 2006 01:23:52 -0000	1.4
@@ -1,5 +1,5 @@
 Name:		perl-Image-ExifTool
-Version:	6.09
+Version:	6.15
 Release:	1%{?dist}
 License:	GPL or Artistic
 Group:		Applications/Multimedia
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 6.15-1
+- bump to 6.15
+
 * Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 6.09-1
 - bump to 6.09
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-ExifTool/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	31 Mar 2006 20:21:55 -0000	1.4
+++ sources	25 Apr 2006 01:23:52 -0000	1.5
@@ -1 +1 @@
-66dc6aa550799a879c66f4ceba348d6d  Image-ExifTool-6.09.tar.gz
+6e888a71b152b68aaaaf3183997e2cc2  Image-ExifTool-6.15.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 01:32:13 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 18:32:13 -0700
Subject: rpms/R/FC-4 R.spec,1.13,1.14 sources,1.7,1.8
Message-ID: <200604250132.k3P1WFOF002830@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2754/FC-4

Modified Files:
	R.spec sources 
Log Message:

Bump to 2.3.0. Hey, what's a pirate's favorite mathematical language? ARRRRRR!



Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/FC-4/R.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- R.spec	28 Feb 2006 23:59:37 -0000	1.13
+++ R.spec	25 Apr 2006 01:32:13 -0000	1.14
@@ -1,6 +1,6 @@
 Name: R
-Version: 2.2.1
-Release: 4%{?dist}
+Version: 2.3.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.10.2
+Provides: R-cluster = 1.10.5
 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.12
+Provides: R-lattice = 0.13
 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.20
+Provides: R-survival = 2.24
 Provides: R-tcltk = %{version}
 Provides: R-tools = %{version}
 Provides: R-utils = %{version}
@@ -155,8 +155,8 @@
 %{_infodir}/R-*.info*
 %{_mandir}/man1/*
 /etc/ld.so.conf.d/*
-%doc AUTHORS CAPABILITIES COPYING COPYING.LIB COPYRIGHTS FAQ NEWS
-%doc ONEWS README RESOURCES THANKS VERSION Y2K
+%doc doc/AUTHORS CAPABILITIES doc/COPYING doc/COPYING.LIB doc/COPYRIGHTS doc/FAQ NEWS
+%doc ONEWS README doc/RESOURCES doc/THANKS VERSION
 %doc doc/manual/R-admin.pdf
 %doc doc/manual/R-FAQ.pdf
 %doc doc/manual/R-lang.pdf
@@ -219,6 +219,9 @@
 /sbin/ldconfig
 
 %changelog
+* 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-4
 - bump for FC-5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/R/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	31 Dec 2005 20:27:43 -0000	1.7
+++ sources	25 Apr 2006 01:32:13 -0000	1.8
@@ -1 +1 @@
-42542290c6d1585af7ded330f811385c  R-2.2.1.tar.gz
+11cc1e9df640ab52e608cf9e695f7354  R-2.3.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 01:32:14 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 18:32:14 -0700
Subject: rpms/R/devel .cvsignore,1.6,1.7 R.spec,1.14,1.15 sources,1.7,1.8
Message-ID: <200604250132.k3P1WGrV002841@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2754/devel

Modified Files:
	.cvsignore R.spec sources 
Log Message:

Bump to 2.3.0. Hey, what's a pirate's favorite mathematical language? ARRRRRR!



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/R/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	31 Dec 2005 20:27:49 -0000	1.6
+++ .cvsignore	25 Apr 2006 01:32:14 -0000	1.7
@@ -3,3 +3,4 @@
 R-2.1.1.tar.gz
 R-2.2.0.tar.gz
 R-2.2.1.tar.gz
+R-2.3.0.tar.gz


Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/devel/R.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- R.spec	6 Apr 2006 22:04:55 -0000	1.14
+++ R.spec	25 Apr 2006 01:32:14 -0000	1.15
@@ -1,6 +1,6 @@
 Name: R
-Version: 2.2.1
-Release: 5%{?dist}
+Version: 2.3.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.10.2
+Provides: R-cluster = 1.10.5
 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.12
+Provides: R-lattice = 0.13
 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.20
+Provides: R-survival = 2.24
 Provides: R-tcltk = %{version}
 Provides: R-tools = %{version}
 Provides: R-utils = %{version}
@@ -155,8 +155,8 @@
 %{_infodir}/R-*.info*
 %{_mandir}/man1/*
 /etc/ld.so.conf.d/*
-%doc AUTHORS CAPABILITIES COPYING COPYING.LIB COPYRIGHTS FAQ NEWS
-%doc ONEWS README RESOURCES THANKS VERSION Y2K
+%doc doc/AUTHORS CAPABILITIES doc/COPYING doc/COPYING.LIB doc/COPYRIGHTS doc/FAQ NEWS
+%doc ONEWS README doc/RESOURCES doc/THANKS VERSION
 %doc doc/manual/R-admin.pdf
 %doc doc/manual/R-FAQ.pdf
 %doc doc/manual/R-lang.pdf
@@ -219,6 +219,9 @@
 /sbin/ldconfig
 
 %changelog
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/R/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	31 Dec 2005 20:27:49 -0000	1.7
+++ sources	25 Apr 2006 01:32:14 -0000	1.8
@@ -1 +1 @@
-42542290c6d1585af7ded330f811385c  R-2.2.1.tar.gz
+11cc1e9df640ab52e608cf9e695f7354  R-2.3.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 01:32:14 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 18:32:14 -0700
Subject: rpms/R/FC-5 R.spec,1.13,1.14 sources,1.7,1.8
Message-ID: <200604250132.k3P1WGS5002837@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2754/FC-5

Modified Files:
	R.spec sources 
Log Message:

Bump to 2.3.0. Hey, what's a pirate's favorite mathematical language? ARRRRRR!



Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/FC-5/R.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- R.spec	28 Feb 2006 23:59:43 -0000	1.13
+++ R.spec	25 Apr 2006 01:32:13 -0000	1.14
@@ -1,6 +1,6 @@
 Name: R
-Version: 2.2.1
-Release: 4%{?dist}
+Version: 2.3.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.10.2
+Provides: R-cluster = 1.10.5
 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.12
+Provides: R-lattice = 0.13
 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.20
+Provides: R-survival = 2.24
 Provides: R-tcltk = %{version}
 Provides: R-tools = %{version}
 Provides: R-utils = %{version}
@@ -155,8 +155,8 @@
 %{_infodir}/R-*.info*
 %{_mandir}/man1/*
 /etc/ld.so.conf.d/*
-%doc AUTHORS CAPABILITIES COPYING COPYING.LIB COPYRIGHTS FAQ NEWS
-%doc ONEWS README RESOURCES THANKS VERSION Y2K
+%doc doc/AUTHORS CAPABILITIES doc/COPYING doc/COPYING.LIB doc/COPYRIGHTS doc/FAQ NEWS
+%doc ONEWS README doc/RESOURCES doc/THANKS VERSION
 %doc doc/manual/R-admin.pdf
 %doc doc/manual/R-FAQ.pdf
 %doc doc/manual/R-lang.pdf
@@ -219,6 +219,9 @@
 /sbin/ldconfig
 
 %changelog
+* 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-4
 - bump for FC-5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/R/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	31 Dec 2005 20:27:49 -0000	1.7
+++ sources	25 Apr 2006 01:32:13 -0000	1.8
@@ -1 +1 @@
-42542290c6d1585af7ded330f811385c  R-2.2.1.tar.gz
+11cc1e9df640ab52e608cf9e695f7354  R-2.3.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 01:32:12 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 18:32:12 -0700
Subject: rpms/R/FC-3 R.spec,1.14,1.15 sources,1.6,1.7
Message-ID: <200604250132.k3P1Wih2002858@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2754/FC-3

Modified Files:
	R.spec sources 
Log Message:

Bump to 2.3.0. Hey, what's a pirate's favorite mathematical language? ARRRRRR!



Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/FC-3/R.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- R.spec	28 Feb 2006 23:59:31 -0000	1.14
+++ R.spec	25 Apr 2006 01:32:12 -0000	1.15
@@ -1,6 +1,6 @@
 Name: R
-Version: 2.2.1
-Release: 4%{?dist}
+Version: 2.3.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.10.2
+Provides: R-cluster = 1.10.5
 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.12
+Provides: R-lattice = 0.13
 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.20
+Provides: R-survival = 2.24
 Provides: R-tcltk = %{version}
 Provides: R-tools = %{version}
 Provides: R-utils = %{version}
@@ -154,8 +154,8 @@
 %{_infodir}/R-*.info*
 %{_mandir}/man1/*
 /etc/ld.so.conf.d/*
-%doc AUTHORS CAPABILITIES COPYING COPYING.LIB COPYRIGHTS FAQ NEWS
-%doc ONEWS README RESOURCES THANKS VERSION Y2K
+%doc doc/AUTHORS CAPABILITIES doc/COPYING doc/COPYING.LIB doc/COPYRIGHTS doc/FAQ NEWS
+%doc ONEWS README doc/RESOURCES doc/THANKS VERSION
 %doc doc/manual/R-admin.pdf
 %doc doc/manual/R-FAQ.pdf
 %doc doc/manual/R-lang.pdf
@@ -218,6 +218,9 @@
 /sbin/ldconfig
 
 %changelog
+* 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-4
 - bump for FC-5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/R/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	31 Dec 2005 20:27:36 -0000	1.6
+++ sources	25 Apr 2006 01:32:12 -0000	1.7
@@ -1 +1 @@
-42542290c6d1585af7ded330f811385c  R-2.2.1.tar.gz
+11cc1e9df640ab52e608cf9e695f7354  R-2.3.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 01:42:03 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Mon, 24 Apr 2006 18:42:03 -0700
Subject: rpms/screem/devel screem.spec,1.6,1.7
Message-ID: <200604250142.k3P1g5tR003096@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/screem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3078

Modified Files:
	screem.spec 
Log Message:
updated version, fix for miscompile



Index: screem.spec
===================================================================
RCS file: /cvs/extras/rpms/screem/devel/screem.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- screem.spec	2 Mar 2006 21:31:43 -0000	1.6
+++ screem.spec	25 Apr 2006 01:42:02 -0000	1.7
@@ -1,12 +1,13 @@
 Name:           screem
-Version:        0.14.1
+Version:        0.16.1
 Release:        1%{?dist}
 Summary:        Website development environment
 
 Group:          Development/Tools
 License:        GPL
-URL:            http://screem.sourceforge.net/
+URL:            http://www.screem.org/
 Source0:        http://download.sourceforge.net/screem/screem-%{version}.tar.gz
+Patch0:		fix_miscompile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-devel
@@ -29,7 +30,6 @@
 Requires(postun): scrollkeeper
 Requires(postun): shared-mime-info
 
-
 %description
 SCREEM is a non-WYSIWYG web site development environment with an
 advanced editor and easy access to external helper applications such
@@ -40,15 +40,9 @@
 parsing, page templates and publishing of files are also supported.
 
 %prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
 
 %setup -q
-
+%patch0	-p1 -b .mjk
 
 %build
 %configure \
@@ -58,24 +52,23 @@
            --enable-dbus
 make %{?_smp_mflags}
 
-
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DATADIRNAME=${RPM_BUILD_ROOT}%{_datadir} DESTDIR=${RPM_BUILD_ROOT}
+make install DATADIRNAME=%{buildroot}%{_datadir} DESTDIR=%{buildroot}
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
+find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
+
 desktop-file-install --delete-original --vendor fedora     \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications            \
+  --dir %{buildroot}%{_datadir}/applications            \
   --add-category X-Fedora                                  \
-  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
-%find_lang %{name}
+  %{buildroot}%{_datadir}/applications/%{name}.desktop
 
+%find_lang %{name}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
-
+rm -rf %{buildroot}
 
 %post
 export GCONF_CONFIG_SOURCE="$(gconftool-2 --get-default-source)"
@@ -84,18 +77,15 @@
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 scrollkeeper-update -q
 
-
 %preun
 export GCONF_CONFIG_SOURCE="$(gconftool-2 --get-default-source)"
 gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
 
-
 %postun
 update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 scrollkeeper-update -q
 
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS BUGS COPYING COPYING-DOCS ChangeLog NEWS README TODO
@@ -105,14 +95,18 @@
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/gnome/help/%{name}
 %{_datadir}/mime/packages/*
-%{_datadir}/mime-info
 %{_datadir}/omf
 %{_datadir}/pixmaps/*
 %{_libdir}/%{name}
+%{_libdir}/pkgconfig/*.pc
+%{_includedir}/*
 %{_sysconfdir}/gconf/schemas/*
 
-
 %changelog
+* Tue Apr 24 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.16.1-1
+- updated to 0.16.1
+- fix miscompile, patch based on debian bug report #358759
+
 * Thu Jul  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.14.1-1
 - Update to 0.14.1 (also fixes bug #153224).
 - BR gnome-menus-devel libcroco-devel



From fedora-extras-commits at redhat.com  Tue Apr 25 01:46:49 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Mon, 24 Apr 2006 18:46:49 -0700
Subject: fedora-security/audit fc4,1.214,1.215 fc5,1.128,1.129
Message-ID: <200604250146.k3P1knBZ003154@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3129

Modified Files:
	fc4 fc5 
Log Message:
Note new PHP CVE ids.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- fc4	24 Apr 2006 18:25:42 -0000	1.214
+++ fc4	25 Apr 2006 01:46:46 -0000	1.215
@@ -3,6 +3,8 @@
 
 ** are items that need attention
 
+CVE-2006-1991 VULNERABLE (php)
+CVE-2006-1990 VULNERABLE (php)
 CVE-2006-1942 ** firefox
 CVE-2006-1931 version (ruby, fixed 1.8.3)
 CVE-2006-1902 ignore (gcc) not a vulnerability


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- fc5	24 Apr 2006 18:25:42 -0000	1.128
+++ fc5	25 Apr 2006 01:46:46 -0000	1.129
@@ -3,6 +3,8 @@
 
 ** are items that need attention
 
+CVE-2006-1991 VULNERABLE (php)
+CVE-2006-1990 VULNERABLE (php)
 CVE-2006-1942 ** firefox
 CVE-2006-1931 version (ruby, fixed 1.8.3)
 CVE-2006-1902 ignore (gcc) not a vulnerability



From fedora-extras-commits at redhat.com  Tue Apr 25 01:47:30 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Mon, 24 Apr 2006 18:47:30 -0700
Subject: rpms/screem/devel sources,1.4,1.5
Message-ID: <200604250147.k3P1lWao003181@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/screem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3164

Modified Files:
	sources 
Log Message:
updated source



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/screem/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Jul 2005 20:57:33 -0000	1.4
+++ sources	25 Apr 2006 01:47:30 -0000	1.5
@@ -1 +1 @@
-b23bf53698df79477f83f3d66b6eab0d  screem-0.14.1.tar.gz
+88bfc0afadb905ddbed9bdfbc869602a  screem-0.16.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 01:48:24 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Mon, 24 Apr 2006 18:48:24 -0700
Subject: rpms/screem/devel fix_miscompile.patch,NONE,1.1 .cvsignore,1.4,1.5
Message-ID: <200604250148.k3P1mQQS003214@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/screem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3193

Modified Files:
	.cvsignore 
Added Files:
	fix_miscompile.patch 
Log Message:
patch to fix miscompile


fix_miscompile.patch:

--- NEW FILE fix_miscompile.patch ---
--- screem-0.16.1/src/screem-main.c.orig	2006-04-25 13:02:00.000000000 +1200
+++ screem-0.16.1/src/screem-main.c	2006-04-25 13:06:58.000000000 +1200
@@ -54,12 +54,23 @@
 static gchar *session_filename = SESSION_LAST;
 
 /* passed parameters stuff */
+#ifndef GNOME_PARAM_GOPTION_CONTEXT
 static const struct poptOption options[] = {
 	{ "load-session", 'l', POPT_ARG_STRING, &session_filename, 0,
 	  N_("Load the given session file"),
 	  N_("FILE") },
 	{ NULL, '\0', 0, NULL, 0, NULL, NULL }
 };
+#else /* USE GOption interface */
+static const gchar **remaining_args = NULL;
+static GOptionEntry option_entries[] = {
+  { "load-session", 'l', 0, G_OPTION_ARG_STRING, &(session_filename),
+    N_("Load the given session file"), N_("FILE") },
+  { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &remaining_args,
+    "Special option that collects any remaining arguments for us" },
+  { NULL }
+};
+#endif
 
 typedef enum {
 	MISSING_GLADE,
@@ -75,8 +86,10 @@
 int main( int argc, char *argv[] )
 {
 	GnomeProgram *program;
+	const gchar** start_files;	
+#ifndef GNOME_PARAM_GOPTION_CONTEXT
 	poptContext ctx;
-	const gchar** start_files;
+#endif
 	const gchar *icon;
 	
 	gchar *dotdir;
@@ -87,12 +100,22 @@
         bindtextdomain( GETTEXT_PACKAGE, GNOMELOCALEDIR );
 	bind_textdomain_codeset( GETTEXT_PACKAGE, "UTF-8" );
         textdomain( GETTEXT_PACKAGE );
-#endif	
+#endif
+
+#ifdef GNOME_PARAM_GOPTION_CONTEXT
+	GOptionContext *option_context = g_option_context_new("screem");
+	g_option_context_add_main_entries(option_context, option_entries, NULL);
+#endif
+	
 	program = gnome_program_init( PACKAGE, VERSION, 
 			LIBGNOMEUI_MODULE,
 			argc, argv,
 			GNOME_PROGRAM_STANDARD_PROPERTIES,
+#ifndef GNOME_PARAM_GOPTION_CONTEXT
 			GNOME_PARAM_POPT_TABLE, options,
+#else
+			GNOME_PARAM_GOPTION_CONTEXT, option_context,
+#endif
 			GNOME_PARAM_APP_DATADIR, DATADIR,
 			LIBGNOMEUI_PARAM_DEFAULT_ICON,
 			DATADIR"/pixmaps/screem.png",
@@ -105,10 +128,14 @@
 	icon = DATADIR"/pixmaps/screem.png";
         gtk_window_set_default_icon_from_file( icon, NULL );
 
+#ifndef GNOME_PARAM_GOPTION_CONTEXT
 	/* parse arguments */
 	g_object_get( G_OBJECT( program ), 
 			GNOME_PARAM_POPT_CONTEXT, &ctx, NULL );
 	start_files = parse_args( ctx, argc, argv );
+#else 
+	start_files = remaining_args;
+#endif
 
         gnome_vfs_init();
 	gnome_authentication_manager_init();
@@ -160,6 +187,7 @@
 	return FALSE;
 }
 
+#ifndef GNOME_PARAM_GOPTION_CONTEXT
 static const gchar **parse_args( poptContext ctx, int argc, char *argv[] )
 {
 	const gchar** start_files;
@@ -169,6 +197,7 @@
 
 	return start_files;
 }
+#endif
 
 static void screem_main_missing( MissingType type )
 {


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/screem/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Jul 2005 20:57:33 -0000	1.4
+++ .cvsignore	25 Apr 2006 01:48:24 -0000	1.5
@@ -1 +1 @@
-screem-0.14.1.tar.gz
+screem-0.16.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 01:52:06 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Mon, 24 Apr 2006 18:52:06 -0700
Subject: rpms/screem/FC-5 fix_miscompile.patch, NONE, 1.1 .cvsignore, 1.4,
	1.5 screem.spec, 1.6, 1.7 sources, 1.4, 1.5
Message-ID: <200604250152.k3P1q8QE003315@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/screem/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3291

Modified Files:
	.cvsignore screem.spec sources 
Added Files:
	fix_miscompile.patch 
Log Message:
updated version and patch to fix miscompile 


fix_miscompile.patch:

--- NEW FILE fix_miscompile.patch ---
--- screem-0.16.1/src/screem-main.c.orig	2006-04-25 13:02:00.000000000 +1200
+++ screem-0.16.1/src/screem-main.c	2006-04-25 13:06:58.000000000 +1200
@@ -54,12 +54,23 @@
 static gchar *session_filename = SESSION_LAST;
 
 /* passed parameters stuff */
+#ifndef GNOME_PARAM_GOPTION_CONTEXT
 static const struct poptOption options[] = {
 	{ "load-session", 'l', POPT_ARG_STRING, &session_filename, 0,
 	  N_("Load the given session file"),
 	  N_("FILE") },
 	{ NULL, '\0', 0, NULL, 0, NULL, NULL }
 };
+#else /* USE GOption interface */
+static const gchar **remaining_args = NULL;
+static GOptionEntry option_entries[] = {
+  { "load-session", 'l', 0, G_OPTION_ARG_STRING, &(session_filename),
+    N_("Load the given session file"), N_("FILE") },
+  { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &remaining_args,
+    "Special option that collects any remaining arguments for us" },
+  { NULL }
+};
+#endif
 
 typedef enum {
 	MISSING_GLADE,
@@ -75,8 +86,10 @@
 int main( int argc, char *argv[] )
 {
 	GnomeProgram *program;
+	const gchar** start_files;	
+#ifndef GNOME_PARAM_GOPTION_CONTEXT
 	poptContext ctx;
-	const gchar** start_files;
+#endif
 	const gchar *icon;
 	
 	gchar *dotdir;
@@ -87,12 +100,22 @@
         bindtextdomain( GETTEXT_PACKAGE, GNOMELOCALEDIR );
 	bind_textdomain_codeset( GETTEXT_PACKAGE, "UTF-8" );
         textdomain( GETTEXT_PACKAGE );
-#endif	
+#endif
+
+#ifdef GNOME_PARAM_GOPTION_CONTEXT
+	GOptionContext *option_context = g_option_context_new("screem");
+	g_option_context_add_main_entries(option_context, option_entries, NULL);
+#endif
+	
 	program = gnome_program_init( PACKAGE, VERSION, 
 			LIBGNOMEUI_MODULE,
 			argc, argv,
 			GNOME_PROGRAM_STANDARD_PROPERTIES,
+#ifndef GNOME_PARAM_GOPTION_CONTEXT
 			GNOME_PARAM_POPT_TABLE, options,
+#else
+			GNOME_PARAM_GOPTION_CONTEXT, option_context,
+#endif
 			GNOME_PARAM_APP_DATADIR, DATADIR,
 			LIBGNOMEUI_PARAM_DEFAULT_ICON,
 			DATADIR"/pixmaps/screem.png",
@@ -105,10 +128,14 @@
 	icon = DATADIR"/pixmaps/screem.png";
         gtk_window_set_default_icon_from_file( icon, NULL );
 
+#ifndef GNOME_PARAM_GOPTION_CONTEXT
 	/* parse arguments */
 	g_object_get( G_OBJECT( program ), 
 			GNOME_PARAM_POPT_CONTEXT, &ctx, NULL );
 	start_files = parse_args( ctx, argc, argv );
+#else 
+	start_files = remaining_args;
+#endif
 
         gnome_vfs_init();
 	gnome_authentication_manager_init();
@@ -160,6 +187,7 @@
 	return FALSE;
 }
 
+#ifndef GNOME_PARAM_GOPTION_CONTEXT
 static const gchar **parse_args( poptContext ctx, int argc, char *argv[] )
 {
 	const gchar** start_files;
@@ -169,6 +197,7 @@
 
 	return start_files;
 }
+#endif
 
 static void screem_main_missing( MissingType type )
 {


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/screem/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Jul 2005 20:57:33 -0000	1.4
+++ .cvsignore	25 Apr 2006 01:52:06 -0000	1.5
@@ -1 +1 @@
-screem-0.14.1.tar.gz
+screem-0.16.1.tar.gz


Index: screem.spec
===================================================================
RCS file: /cvs/extras/rpms/screem/FC-5/screem.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- screem.spec	2 Mar 2006 21:31:43 -0000	1.6
+++ screem.spec	25 Apr 2006 01:52:06 -0000	1.7
@@ -1,12 +1,13 @@
 Name:           screem
-Version:        0.14.1
+Version:        0.16.1
 Release:        1%{?dist}
 Summary:        Website development environment
 
 Group:          Development/Tools
 License:        GPL
-URL:            http://screem.sourceforge.net/
+URL:            http://www.screem.org/
 Source0:        http://download.sourceforge.net/screem/screem-%{version}.tar.gz
+Patch0:		fix_miscompile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-devel
@@ -29,7 +30,6 @@
 Requires(postun): scrollkeeper
 Requires(postun): shared-mime-info
 
-
 %description
 SCREEM is a non-WYSIWYG web site development environment with an
 advanced editor and easy access to external helper applications such
@@ -40,15 +40,9 @@
 parsing, page templates and publishing of files are also supported.
 
 %prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
 
 %setup -q
-
+%patch0	-p1 -b .mjk
 
 %build
 %configure \
@@ -58,24 +52,23 @@
            --enable-dbus
 make %{?_smp_mflags}
 
-
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DATADIRNAME=${RPM_BUILD_ROOT}%{_datadir} DESTDIR=${RPM_BUILD_ROOT}
+make install DATADIRNAME=%{buildroot}%{_datadir} DESTDIR=%{buildroot}
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
+find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
+
 desktop-file-install --delete-original --vendor fedora     \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications            \
+  --dir %{buildroot}%{_datadir}/applications            \
   --add-category X-Fedora                                  \
-  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
-%find_lang %{name}
+  %{buildroot}%{_datadir}/applications/%{name}.desktop
 
+%find_lang %{name}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
-
+rm -rf %{buildroot}
 
 %post
 export GCONF_CONFIG_SOURCE="$(gconftool-2 --get-default-source)"
@@ -84,18 +77,15 @@
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 scrollkeeper-update -q
 
-
 %preun
 export GCONF_CONFIG_SOURCE="$(gconftool-2 --get-default-source)"
 gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
 
-
 %postun
 update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 scrollkeeper-update -q
 
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS BUGS COPYING COPYING-DOCS ChangeLog NEWS README TODO
@@ -105,14 +95,18 @@
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/gnome/help/%{name}
 %{_datadir}/mime/packages/*
-%{_datadir}/mime-info
 %{_datadir}/omf
 %{_datadir}/pixmaps/*
 %{_libdir}/%{name}
+%{_libdir}/pkgconfig/*.pc
+%{_includedir}/*
 %{_sysconfdir}/gconf/schemas/*
 
-
 %changelog
+* Tue Apr 24 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.16.1-1
+- updated to 0.16.1
+- fix miscompile, patch based on debian bug report #358759
+
 * Thu Jul  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.14.1-1
 - Update to 0.14.1 (also fixes bug #153224).
 - BR gnome-menus-devel libcroco-devel


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/screem/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Jul 2005 20:57:33 -0000	1.4
+++ sources	25 Apr 2006 01:52:06 -0000	1.5
@@ -1 +1 @@
-b23bf53698df79477f83f3d66b6eab0d  screem-0.14.1.tar.gz
+88bfc0afadb905ddbed9bdfbc869602a  screem-0.16.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 01:54:09 2006
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Mon, 24 Apr 2006 18:54:09 -0700
Subject: extras-buildsys/utils extras-sync,NONE,1.1
Message-ID: <200604250154.k3P1s9bL003381@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3364

Added Files:
	extras-sync 
Log Message:

adding extras-sync as per ville's request.



--- NEW FILE extras-sync ---
#!/bin/bash
outputdir=/srv/rpmbuild/extras/tree/extras

echo "Test sync"
rsync -navH --delete -e ssh $outputdir/* \
   build at fedora.linux.duke.edu:/srv/web/docroot/extras/ | grep -v repodata

echo "Real Sync"
echo "Ctrl-C or kill to exit"
echo "Sleeping for 30s"
sleep 30
rsync -avH --delete -e ssh $outputdir/* build at fedora.linux.duke.edu:/srv/web/docroot/extras/







From fedora-extras-commits at redhat.com  Tue Apr 25 02:03:41 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 24 Apr 2006 19:03:41 -0700
Subject: rpms/perl-Log-Log4perl/devel perl-Log-Log4perl.spec,1.4,1.5
Message-ID: <200604250203.k3P23h7o005623@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-serv5606

Modified Files:
	perl-Log-Log4perl.spec 
Log Message:
With perl(Log::Dispatch::FileRotate)


Index: perl-Log-Log4perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/devel/perl-Log-Log4perl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Log-Log4perl.spec	6 Mar 2006 20:17:23 -0000	1.4
+++ perl-Log-Log4perl.spec	25 Apr 2006 02:03:41 -0000	1.5
@@ -1,16 +1,6 @@
-#
-# Rebuild options:
-#
-#  --with filerotate                 # With perl(Log::Dispatch::FileRotate)
-#
-
-%define log_dispatch_filerotate 0
-
-%{?_with_filerotate:%define log_dispatch_filerotate 1}
-
 Name:           perl-Log-Log4perl
 Version:        1.04
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Log4j implementation for Perl
 
 Group:          Development/Libraries
@@ -25,9 +15,7 @@
 BuildArch:      noarch
 BuildRequires:  perl(IPC::Shareable)
 BuildRequires:  perl(Log::Dispatch)
-%if %{log_dispatch_filerotate}
 BuildRequires:  perl(Log::Dispatch::FileRotate) >= 1.10
-%endif
 BuildRequires:  perl(SQL::Statement)
 BuildRequires:  perl(DBD::CSV)
 BuildRequires:  perl(XML::DOM)
@@ -44,24 +32,10 @@
 %prep
 %setup -q -n Log-Log4perl-%{version}
 %patch0 -p1
-%if %{log_dispatch_filerotate}
 %patch1 -p1
-%endif
 find lib -name "*.pm" -exec chmod a-x {} ';'
 chmod a-x eg/* 
 
-%if !%{log_dispatch_filerotate}
-# Requirements list: exclude perl(Log::Dispatch::FileRotate) >= 1.10
-
-cat <<__EOF__ > %{name}-perlreq
-#!/bin/sh
-/usr/lib/rpm/perl.req \$* | grep -v '^perl(Log::Dispatch::FileRotate)'
-__EOF__
-
-%define __perl_requires %{_builddir}/Log-Log4perl-%{version}/%{name}-perlreq
-chmod +x %{__perl_requires}
-%endif
-
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -92,6 +66,10 @@
 
 
 %changelog
+* Tue Apr 25 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.04-2
+- Log::Dispatch::FileRotate is no longer excluded due to licensing
+  problems (the package now includes copyright information).
+
 * Mon Mar  6 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.04-1
 - Update to 1.04.
 



From fedora-extras-commits at redhat.com  Tue Apr 25 02:04:45 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 19:04:45 -0700
Subject: rpms/comical/devel comical-0.8-jpe.patch, NONE,
	1.1 comical-0.8-optflags.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 comical.spec, 1.7, 1.8 sources, 1.3, 1.4
Message-ID: <200604250204.k3P24lK6005739@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/comical/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5629/devel

Modified Files:
	.cvsignore comical.spec sources 
Added Files:
	comical-0.8-jpe.patch comical-0.8-optflags.patch 
Log Message:

Bump comical to 0.8


comical-0.8-jpe.patch:

--- NEW FILE comical-0.8-jpe.patch ---
--- comical-0.8/src/ComicBookZIP.cpp.BAD	2006-04-24 20:41:07.000000000 -0500
+++ comical-0.8/src/ComicBookZIP.cpp	2006-04-24 20:41:30.000000000 -0500
@@ -54,7 +54,7 @@
 	do {
 		unzGetCurrentFileInfo(ZipFile, fileInfo, namebuf, 1024, NULL, 0, NULL, 0);
 		page = wxString::FromAscii(namebuf);
-		if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") ||
+		if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") || page.Right(4).Upper() == wxT(".JPE") || 
 		page.Right(4).Upper() == wxT(".GIF") ||
 		page.Right(4).Upper() == wxT(".PNG"))
 			Filenames->Add(page);
--- comical-0.8/src/ComicBookRAR.cpp.BAD	2006-04-24 20:41:56.000000000 -0500
+++ comical-0.8/src/ComicBookRAR.cpp	2006-04-24 20:42:15.000000000 -0500
@@ -67,7 +67,7 @@
 #else
 		page = wxString(header.FileName);
 #endif
-		if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") ||
+		if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") || page.Right(4).Upper() == wxT(".JPE") ||
 		page.Right(4).Upper() == wxT(".GIF") ||
 		page.Right(4).Upper() == wxT(".PNG"))
 			Filenames->Add(page);

comical-0.8-optflags.patch:

--- NEW FILE comical-0.8-optflags.patch ---
--- comical-0.8/unrar/makefile.linux.BAD	2006-02-11 10:15:09.000000000 -0600
+++ comical-0.8/unrar/makefile.linux	2006-04-24 20:43:10.000000000 -0500
@@ -7,7 +7,7 @@
 
 # Linux using GCC
 CXX=g++
-CXXFLAGS=-O2 -fPIC
+CXXFLAGS=-O2 -fPIC $(RPM_OPT_FLAGS)
 DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 STRIP=strip
 AR=ar
--- comical-0.8/src/Makefile.BAD	2006-04-24 20:44:53.000000000 -0500
+++ comical-0.8/src/Makefile	2006-04-24 20:45:04.000000000 -0500
@@ -1,5 +1,5 @@
 INCLUDE = -I../unrar -I../unzip
-CFLAGS = -O2 -Wall -pipe
+CFLAGS = -O2 -Wall -pipe $(RPM_OPT_FLAGS)
 CPPFLAGS = `wx-config --cxxflags` $(CFLAGS) -D_UNIX $(INCLUDE)
 
 .SUFFIXES: .cpp .png .h .d .o


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/comical/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Jan 2006 00:48:12 -0000	1.3
+++ .cvsignore	25 Apr 2006 02:04:44 -0000	1.4
@@ -1,2 +1,3 @@
 comical-0.4.tar.gz
 comical-0.7.tar.gz
+comical-0.8.tar.gz


Index: comical.spec
===================================================================
RCS file: /cvs/extras/rpms/comical/devel/comical.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- comical.spec	28 Feb 2006 21:36:40 -0000	1.7
+++ comical.spec	25 Apr 2006 02:04:44 -0000	1.8
@@ -1,21 +1,15 @@
 Name: comical
-Version: 0.7
-Release: 2%{?dist}
+Version: 0.8
+Release: 1%{?dist}
 Summary: GUI comic book viewer
 License: GPLv2
 Group: Applications/Multimedia
 URL: http://comical.sourceforge.net/
-Source0: http://download.sourceforge.net/comical/comical-0.7.tar.gz
+Source0: http://download.sourceforge.net/comical/comical-%{version}.tar.gz
 Source1: comical.png
 Source2: comical.desktop
-Patch0: comical-0.4-bracket.patch
-Patch1: comical-0.4-sort.patch
-Patch2: comical-0.4-nounrar.patch
-Patch3: comical-0.4-advancedsort.patch
-Patch4: comical-0.7-jpe.patch
-Patch5: comical-0.4-minfix.patch
-Patch6: comical-0.7-optflags.patch
-Patch7: comical-0.7-nostrip.patch
+Patch0: comical-0.8-jpe.patch
+Patch1: comical-0.8-optflags.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: wxGTK2-devel
 BuildRequires: desktop-file-utils
@@ -28,17 +22,11 @@
 
 %prep
 %setup -q
-#%patch0 -p1
-#%patch1 -p1
-#%patch2 -p1
-#%patch3 -p1
-%patch4 -p1
-#%patch5 -p1
-%patch6 -p1
-%patch7 -p1
+%patch0 -p1
+%patch1 -p1
 
 %build
-make %{?_smp_mflags}
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -62,6 +50,9 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.8-1
+- bump for 0.8
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.7-2
 - bump for FC5
 * Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.7-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/comical/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Jan 2006 00:48:12 -0000	1.3
+++ sources	25 Apr 2006 02:04:44 -0000	1.4
@@ -1 +1 @@
-b60c94a005c034d1db8ff349acd7acf5  comical-0.7.tar.gz
+f5808e28fd5a2a3d21b59cdad10eca3d  comical-0.8.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 02:04:40 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 19:04:40 -0700
Subject: rpms/comical/FC-4 comical-0.8-jpe.patch, NONE,
	1.1 comical-0.8-optflags.patch, NONE, 1.1 comical.spec, 1.7,
	1.8 sources, 1.3, 1.4
Message-ID: <200604250205.k3P25CuQ005743@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/comical/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5629/FC-4

Modified Files:
	comical.spec sources 
Added Files:
	comical-0.8-jpe.patch comical-0.8-optflags.patch 
Log Message:

Bump comical to 0.8


comical-0.8-jpe.patch:

--- NEW FILE comical-0.8-jpe.patch ---
--- comical-0.8/src/ComicBookZIP.cpp.BAD	2006-04-24 20:41:07.000000000 -0500
+++ comical-0.8/src/ComicBookZIP.cpp	2006-04-24 20:41:30.000000000 -0500
@@ -54,7 +54,7 @@
 	do {
 		unzGetCurrentFileInfo(ZipFile, fileInfo, namebuf, 1024, NULL, 0, NULL, 0);
 		page = wxString::FromAscii(namebuf);
-		if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") ||
+		if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") || page.Right(4).Upper() == wxT(".JPE") || 
 		page.Right(4).Upper() == wxT(".GIF") ||
 		page.Right(4).Upper() == wxT(".PNG"))
 			Filenames->Add(page);
--- comical-0.8/src/ComicBookRAR.cpp.BAD	2006-04-24 20:41:56.000000000 -0500
+++ comical-0.8/src/ComicBookRAR.cpp	2006-04-24 20:42:15.000000000 -0500
@@ -67,7 +67,7 @@
 #else
 		page = wxString(header.FileName);
 #endif
-		if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") ||
+		if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") || page.Right(4).Upper() == wxT(".JPE") ||
 		page.Right(4).Upper() == wxT(".GIF") ||
 		page.Right(4).Upper() == wxT(".PNG"))
 			Filenames->Add(page);

comical-0.8-optflags.patch:

--- NEW FILE comical-0.8-optflags.patch ---
--- comical-0.8/unrar/makefile.linux.BAD	2006-02-11 10:15:09.000000000 -0600
+++ comical-0.8/unrar/makefile.linux	2006-04-24 20:43:10.000000000 -0500
@@ -7,7 +7,7 @@
 
 # Linux using GCC
 CXX=g++
-CXXFLAGS=-O2 -fPIC
+CXXFLAGS=-O2 -fPIC $(RPM_OPT_FLAGS)
 DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 STRIP=strip
 AR=ar
--- comical-0.8/src/Makefile.BAD	2006-04-24 20:44:53.000000000 -0500
+++ comical-0.8/src/Makefile	2006-04-24 20:45:04.000000000 -0500
@@ -1,5 +1,5 @@
 INCLUDE = -I../unrar -I../unzip
-CFLAGS = -O2 -Wall -pipe
+CFLAGS = -O2 -Wall -pipe $(RPM_OPT_FLAGS)
 CPPFLAGS = `wx-config --cxxflags` $(CFLAGS) -D_UNIX $(INCLUDE)
 
 .SUFFIXES: .cpp .png .h .d .o


Index: comical.spec
===================================================================
RCS file: /cvs/extras/rpms/comical/FC-4/comical.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- comical.spec	28 Feb 2006 21:36:34 -0000	1.7
+++ comical.spec	25 Apr 2006 02:04:39 -0000	1.8
@@ -1,21 +1,15 @@
 Name: comical
-Version: 0.7
-Release: 2%{?dist}
+Version: 0.8
+Release: 1%{?dist}
 Summary: GUI comic book viewer
 License: GPLv2
 Group: Applications/Multimedia
 URL: http://comical.sourceforge.net/
-Source0: http://download.sourceforge.net/comical/comical-0.7.tar.gz
+Source0: http://download.sourceforge.net/comical/comical-%{version}.tar.gz
 Source1: comical.png
 Source2: comical.desktop
-Patch0: comical-0.4-bracket.patch
-Patch1: comical-0.4-sort.patch
-Patch2: comical-0.4-nounrar.patch
-Patch3: comical-0.4-advancedsort.patch
-Patch4: comical-0.7-jpe.patch
-Patch5: comical-0.4-minfix.patch
-Patch6: comical-0.7-optflags.patch
-Patch7: comical-0.7-nostrip.patch
+Patch0: comical-0.8-jpe.patch
+Patch1: comical-0.8-optflags.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: wxGTK2-devel
 BuildRequires: desktop-file-utils
@@ -28,17 +22,11 @@
 
 %prep
 %setup -q
-#%patch0 -p1
-#%patch1 -p1
-#%patch2 -p1
-#%patch3 -p1
-%patch4 -p1
-#%patch5 -p1
-%patch6 -p1
-%patch7 -p1
+%patch0 -p1
+%patch1 -p1
 
 %build
-make %{?_smp_mflags}
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -62,6 +50,9 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.8-1
+- bump for 0.8
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.7-2
 - bump for FC5
 * Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.7-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/comical/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Jan 2006 00:48:06 -0000	1.3
+++ sources	25 Apr 2006 02:04:39 -0000	1.4
@@ -1 +1 @@
-b60c94a005c034d1db8ff349acd7acf5  comical-0.7.tar.gz
+f5808e28fd5a2a3d21b59cdad10eca3d  comical-0.8.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 02:04:43 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 19:04:43 -0700
Subject: rpms/comical/FC-5 comical-0.8-jpe.patch, NONE,
	1.1 comical-0.8-optflags.patch, NONE, 1.1 comical.spec, 1.7,
	1.8 sources, 1.3, 1.4
Message-ID: <200604250205.k3P25F81005747@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/comical/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5629/FC-5

Modified Files:
	comical.spec sources 
Added Files:
	comical-0.8-jpe.patch comical-0.8-optflags.patch 
Log Message:

Bump comical to 0.8


comical-0.8-jpe.patch:

--- NEW FILE comical-0.8-jpe.patch ---
--- comical-0.8/src/ComicBookZIP.cpp.BAD	2006-04-24 20:41:07.000000000 -0500
+++ comical-0.8/src/ComicBookZIP.cpp	2006-04-24 20:41:30.000000000 -0500
@@ -54,7 +54,7 @@
 	do {
 		unzGetCurrentFileInfo(ZipFile, fileInfo, namebuf, 1024, NULL, 0, NULL, 0);
 		page = wxString::FromAscii(namebuf);
-		if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") ||
+		if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") || page.Right(4).Upper() == wxT(".JPE") || 
 		page.Right(4).Upper() == wxT(".GIF") ||
 		page.Right(4).Upper() == wxT(".PNG"))
 			Filenames->Add(page);
--- comical-0.8/src/ComicBookRAR.cpp.BAD	2006-04-24 20:41:56.000000000 -0500
+++ comical-0.8/src/ComicBookRAR.cpp	2006-04-24 20:42:15.000000000 -0500
@@ -67,7 +67,7 @@
 #else
 		page = wxString(header.FileName);
 #endif
-		if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") ||
+		if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") || page.Right(4).Upper() == wxT(".JPE") ||
 		page.Right(4).Upper() == wxT(".GIF") ||
 		page.Right(4).Upper() == wxT(".PNG"))
 			Filenames->Add(page);

comical-0.8-optflags.patch:

--- NEW FILE comical-0.8-optflags.patch ---
--- comical-0.8/unrar/makefile.linux.BAD	2006-02-11 10:15:09.000000000 -0600
+++ comical-0.8/unrar/makefile.linux	2006-04-24 20:43:10.000000000 -0500
@@ -7,7 +7,7 @@
 
 # Linux using GCC
 CXX=g++
-CXXFLAGS=-O2 -fPIC
+CXXFLAGS=-O2 -fPIC $(RPM_OPT_FLAGS)
 DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 STRIP=strip
 AR=ar
--- comical-0.8/src/Makefile.BAD	2006-04-24 20:44:53.000000000 -0500
+++ comical-0.8/src/Makefile	2006-04-24 20:45:04.000000000 -0500
@@ -1,5 +1,5 @@
 INCLUDE = -I../unrar -I../unzip
-CFLAGS = -O2 -Wall -pipe
+CFLAGS = -O2 -Wall -pipe $(RPM_OPT_FLAGS)
 CPPFLAGS = `wx-config --cxxflags` $(CFLAGS) -D_UNIX $(INCLUDE)
 
 .SUFFIXES: .cpp .png .h .d .o


Index: comical.spec
===================================================================
RCS file: /cvs/extras/rpms/comical/FC-5/comical.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- comical.spec	28 Feb 2006 21:36:40 -0000	1.7
+++ comical.spec	25 Apr 2006 02:04:42 -0000	1.8
@@ -1,21 +1,15 @@
 Name: comical
-Version: 0.7
-Release: 2%{?dist}
+Version: 0.8
+Release: 1%{?dist}
 Summary: GUI comic book viewer
 License: GPLv2
 Group: Applications/Multimedia
 URL: http://comical.sourceforge.net/
-Source0: http://download.sourceforge.net/comical/comical-0.7.tar.gz
+Source0: http://download.sourceforge.net/comical/comical-%{version}.tar.gz
 Source1: comical.png
 Source2: comical.desktop
-Patch0: comical-0.4-bracket.patch
-Patch1: comical-0.4-sort.patch
-Patch2: comical-0.4-nounrar.patch
-Patch3: comical-0.4-advancedsort.patch
-Patch4: comical-0.7-jpe.patch
-Patch5: comical-0.4-minfix.patch
-Patch6: comical-0.7-optflags.patch
-Patch7: comical-0.7-nostrip.patch
+Patch0: comical-0.8-jpe.patch
+Patch1: comical-0.8-optflags.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: wxGTK2-devel
 BuildRequires: desktop-file-utils
@@ -28,17 +22,11 @@
 
 %prep
 %setup -q
-#%patch0 -p1
-#%patch1 -p1
-#%patch2 -p1
-#%patch3 -p1
-%patch4 -p1
-#%patch5 -p1
-%patch6 -p1
-%patch7 -p1
+%patch0 -p1
+%patch1 -p1
 
 %build
-make %{?_smp_mflags}
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -62,6 +50,9 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.8-1
+- bump for 0.8
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.7-2
 - bump for FC5
 * Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.7-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/comical/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Jan 2006 00:48:12 -0000	1.3
+++ sources	25 Apr 2006 02:04:43 -0000	1.4
@@ -1 +1 @@
-b60c94a005c034d1db8ff349acd7acf5  comical-0.7.tar.gz
+f5808e28fd5a2a3d21b59cdad10eca3d  comical-0.8.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 02:19:32 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 19:19:32 -0700
Subject: rpms/ebtables/FC-4 ebtables.spec,1.8,1.9 sources,1.3,1.4
Message-ID: <200604250219.k3P2JY08005982@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ebtables/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5914/FC-4

Modified Files:
	ebtables.spec sources 
Log Message:

ebtables bump to rc2



Index: ebtables.spec
===================================================================
RCS file: /cvs/extras/rpms/ebtables/FC-4/ebtables.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ebtables.spec	3 Apr 2006 02:21:06 -0000	1.8
+++ ebtables.spec	25 Apr 2006 02:19:32 -0000	1.9
@@ -1,8 +1,8 @@
-%define prever	rc1
+%define prever	rc2
 
 Name:		ebtables
 Version:	2.0.8
-Release:	0.5.%{prever}%{?dist}
+Release:	0.1.%{prever}%{?dist}
 Summary:	Ethernet Bridge frame table administration tool
 License:	GPL
 Group:		System Environment/Base
@@ -76,6 +76,9 @@
 %ghost %{_sysconfdir}/ebtables.broute
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.1.rc2
+- bump to rc2
+
 * Sun Apr  2 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.5.rc1
 - learn to use "install" correctly. :/
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ebtables/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Jan 2006 16:03:54 -0000	1.3
+++ sources	25 Apr 2006 02:19:32 -0000	1.4
@@ -1 +1 @@
-e11a586a700e05309b624cf3329025b5  ebtables-v2.0.8-rc1.tar.gz
+f07111fcc1966be669278433c35dcc28  ebtables-v2.0.8-rc2.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 02:19:33 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 19:19:33 -0700
Subject: rpms/ebtables/FC-5 ebtables.spec,1.9,1.10 sources,1.3,1.4
Message-ID: <200604250219.k3P2JZWr005987@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ebtables/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5914/FC-5

Modified Files:
	ebtables.spec sources 
Log Message:

ebtables bump to rc2



Index: ebtables.spec
===================================================================
RCS file: /cvs/extras/rpms/ebtables/FC-5/ebtables.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ebtables.spec	3 Apr 2006 02:21:07 -0000	1.9
+++ ebtables.spec	25 Apr 2006 02:19:33 -0000	1.10
@@ -1,8 +1,8 @@
-%define prever	rc1
+%define prever	rc2
 
 Name:		ebtables
 Version:	2.0.8
-Release:	0.5.%{prever}%{?dist}
+Release:	0.1.%{prever}%{?dist}
 Summary:	Ethernet Bridge frame table administration tool
 License:	GPL
 Group:		System Environment/Base
@@ -76,6 +76,9 @@
 %ghost %{_sysconfdir}/ebtables.broute
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.1.rc2
+- bump to rc2
+
 * Sun Apr  2 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.5.rc1
 - learn to use "install" correctly. :/
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ebtables/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Jan 2006 16:04:01 -0000	1.3
+++ sources	25 Apr 2006 02:19:33 -0000	1.4
@@ -1 +1 @@
-e11a586a700e05309b624cf3329025b5  ebtables-v2.0.8-rc1.tar.gz
+f07111fcc1966be669278433c35dcc28  ebtables-v2.0.8-rc2.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 02:19:34 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 19:19:34 -0700
Subject: rpms/ebtables/devel .cvsignore, 1.3, 1.4 ebtables.spec, 1.9,
	1.10 sources, 1.3, 1.4
Message-ID: <200604250219.k3P2JauJ005993@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ebtables/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5914/devel

Modified Files:
	.cvsignore ebtables.spec sources 
Log Message:

ebtables bump to rc2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ebtables/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Jan 2006 16:04:01 -0000	1.3
+++ .cvsignore	25 Apr 2006 02:19:34 -0000	1.4
@@ -1,2 +1,3 @@
 ebtables-v2.0.6.tar.gz
 ebtables-v2.0.8-rc1.tar.gz
+ebtables-v2.0.8-rc2.tar.gz


Index: ebtables.spec
===================================================================
RCS file: /cvs/extras/rpms/ebtables/devel/ebtables.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ebtables.spec	3 Apr 2006 02:21:13 -0000	1.9
+++ ebtables.spec	25 Apr 2006 02:19:34 -0000	1.10
@@ -1,8 +1,8 @@
-%define prever	rc1
+%define prever	rc2
 
 Name:		ebtables
 Version:	2.0.8
-Release:	0.5.%{prever}%{?dist}
+Release:	0.1.%{prever}%{?dist}
 Summary:	Ethernet Bridge frame table administration tool
 License:	GPL
 Group:		System Environment/Base
@@ -76,6 +76,9 @@
 %ghost %{_sysconfdir}/ebtables.broute
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.1.rc2
+- bump to rc2
+
 * Sun Apr  2 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.5.rc1
 - learn to use "install" correctly. :/
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ebtables/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Jan 2006 16:04:01 -0000	1.3
+++ sources	25 Apr 2006 02:19:34 -0000	1.4
@@ -1 +1 @@
-e11a586a700e05309b624cf3329025b5  ebtables-v2.0.8-rc1.tar.gz
+f07111fcc1966be669278433c35dcc28  ebtables-v2.0.8-rc2.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 02:19:32 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 19:19:32 -0700
Subject: rpms/ebtables/FC-3 ebtables.spec,1.8,1.9 sources,1.3,1.4
Message-ID: <200604250220.k3P2K4us005997@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ebtables/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5914/FC-3

Modified Files:
	ebtables.spec sources 
Log Message:

ebtables bump to rc2



Index: ebtables.spec
===================================================================
RCS file: /cvs/extras/rpms/ebtables/FC-3/ebtables.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ebtables.spec	3 Apr 2006 02:21:05 -0000	1.8
+++ ebtables.spec	25 Apr 2006 02:19:32 -0000	1.9
@@ -1,8 +1,8 @@
-%define prever	rc1
+%define prever	rc2
 
 Name:		ebtables
 Version:	2.0.8
-Release:	0.5.%{prever}%{?dist}
+Release:	0.1.%{prever}%{?dist}
 Summary:	Ethernet Bridge frame table administration tool
 License:	GPL
 Group:		System Environment/Base
@@ -76,6 +76,9 @@
 %ghost %{_sysconfdir}/ebtables.broute
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.1.rc2
+- bump to rc2
+
 * Sun Apr  2 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.5.rc1
 - learn to use "install" correctly. :/
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ebtables/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Jan 2006 16:03:38 -0000	1.3
+++ sources	25 Apr 2006 02:19:32 -0000	1.4
@@ -1 +1 @@
-e11a586a700e05309b624cf3329025b5  ebtables-v2.0.8-rc1.tar.gz
+f07111fcc1966be669278433c35dcc28  ebtables-v2.0.8-rc2.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 02:38:19 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 24 Apr 2006 19:38:19 -0700
Subject: rpms/perl-Log-Log4perl/FC-4 perl-Log-Log4perl.spec,1.3,1.4
Message-ID: <200604250238.k3P2cLT9006195@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Log4perl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6164/FC-4

Modified Files:
	perl-Log-Log4perl.spec 
Log Message:
Sync with devel


Index: perl-Log-Log4perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/FC-4/perl-Log-Log4perl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Log-Log4perl.spec	6 Mar 2006 20:17:16 -0000	1.3
+++ perl-Log-Log4perl.spec	25 Apr 2006 02:38:19 -0000	1.4
@@ -1,16 +1,6 @@
-#
-# Rebuild options:
-#
-#  --with filerotate                 # With perl(Log::Dispatch::FileRotate)
-#
-
-%define log_dispatch_filerotate 0
-
-%{?_with_filerotate:%define log_dispatch_filerotate 1}
-
 Name:           perl-Log-Log4perl
 Version:        1.04
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Log4j implementation for Perl
 
 Group:          Development/Libraries
@@ -25,9 +15,7 @@
 BuildArch:      noarch
 BuildRequires:  perl(IPC::Shareable)
 BuildRequires:  perl(Log::Dispatch)
-%if %{log_dispatch_filerotate}
 BuildRequires:  perl(Log::Dispatch::FileRotate) >= 1.10
-%endif
 BuildRequires:  perl(SQL::Statement)
 BuildRequires:  perl(DBD::CSV)
 BuildRequires:  perl(XML::DOM)
@@ -44,24 +32,10 @@
 %prep
 %setup -q -n Log-Log4perl-%{version}
 %patch0 -p1
-%if %{log_dispatch_filerotate}
 %patch1 -p1
-%endif
 find lib -name "*.pm" -exec chmod a-x {} ';'
 chmod a-x eg/* 
 
-%if !%{log_dispatch_filerotate}
-# Requirements list: exclude perl(Log::Dispatch::FileRotate) >= 1.10
-
-cat <<__EOF__ > %{name}-perlreq
-#!/bin/sh
-/usr/lib/rpm/perl.req \$* | grep -v '^perl(Log::Dispatch::FileRotate)'
-__EOF__
-
-%define __perl_requires %{_builddir}/Log-Log4perl-%{version}/%{name}-perlreq
-chmod +x %{__perl_requires}
-%endif
-
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -92,6 +66,10 @@
 
 
 %changelog
+* Tue Apr 25 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.04-2
+- Log::Dispatch::FileRotate is no longer excluded due to licensing
+  problems (the package now includes copyright information).
+
 * Mon Mar  6 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.04-1
 - Update to 1.04.
 



From fedora-extras-commits at redhat.com  Tue Apr 25 02:38:20 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 24 Apr 2006 19:38:20 -0700
Subject: rpms/perl-Log-Log4perl/FC-5 perl-Log-Log4perl.spec,1.4,1.5
Message-ID: <200604250238.k3P2cMDS006199@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-serv6164/FC-5

Modified Files:
	perl-Log-Log4perl.spec 
Log Message:
Sync with devel


Index: perl-Log-Log4perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/FC-5/perl-Log-Log4perl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Log-Log4perl.spec	6 Mar 2006 20:17:23 -0000	1.4
+++ perl-Log-Log4perl.spec	25 Apr 2006 02:38:20 -0000	1.5
@@ -1,16 +1,6 @@
-#
-# Rebuild options:
-#
-#  --with filerotate                 # With perl(Log::Dispatch::FileRotate)
-#
-
-%define log_dispatch_filerotate 0
-
-%{?_with_filerotate:%define log_dispatch_filerotate 1}
-
 Name:           perl-Log-Log4perl
 Version:        1.04
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Log4j implementation for Perl
 
 Group:          Development/Libraries
@@ -25,9 +15,7 @@
 BuildArch:      noarch
 BuildRequires:  perl(IPC::Shareable)
 BuildRequires:  perl(Log::Dispatch)
-%if %{log_dispatch_filerotate}
 BuildRequires:  perl(Log::Dispatch::FileRotate) >= 1.10
-%endif
 BuildRequires:  perl(SQL::Statement)
 BuildRequires:  perl(DBD::CSV)
 BuildRequires:  perl(XML::DOM)
@@ -44,24 +32,10 @@
 %prep
 %setup -q -n Log-Log4perl-%{version}
 %patch0 -p1
-%if %{log_dispatch_filerotate}
 %patch1 -p1
-%endif
 find lib -name "*.pm" -exec chmod a-x {} ';'
 chmod a-x eg/* 
 
-%if !%{log_dispatch_filerotate}
-# Requirements list: exclude perl(Log::Dispatch::FileRotate) >= 1.10
-
-cat <<__EOF__ > %{name}-perlreq
-#!/bin/sh
-/usr/lib/rpm/perl.req \$* | grep -v '^perl(Log::Dispatch::FileRotate)'
-__EOF__
-
-%define __perl_requires %{_builddir}/Log-Log4perl-%{version}/%{name}-perlreq
-chmod +x %{__perl_requires}
-%endif
-
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -92,6 +66,10 @@
 
 
 %changelog
+* Tue Apr 25 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.04-2
+- Log::Dispatch::FileRotate is no longer excluded due to licensing
+  problems (the package now includes copyright information).
+
 * Mon Mar  6 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.04-1
 - Update to 1.04.
 



From fedora-extras-commits at redhat.com  Tue Apr 25 05:18:28 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 22:18:28 -0700
Subject: rpms/R/FC-4 R.spec,1.14,1.15
Message-ID: <200604250519.k3P5J0G3013047@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12982/FC-4

Modified Files:
	R.spec 
Log Message:

Fix FC-4 ppc fPIC issue.



Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/FC-4/R.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- R.spec	25 Apr 2006 01:32:13 -0000	1.14
+++ R.spec	25 Apr 2006 05:18:27 -0000	1.15
@@ -1,6 +1,6 @@
 Name: R
 Version: 2.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -102,6 +102,13 @@
 export R_PRINTCMD="lpr"
 export R_BROWSER="%{_bindir}/firefox"
 export F77="gfortran"
+# Only broken on FC-4, ppc
+%ifarch ppc
+export CPICFLAGS="-fPIC"
+export FPICFLAGS="-fPIC"
+export FCPICFLAGS="-fPIC"
+export CXXPICFLAGS="-fPIC"
+%endif
 ( %configure \
     --with-system-zlib --with-system-bzlib --with-system-pcre \
     --with-lapack \
@@ -219,6 +226,9 @@
 /sbin/ldconfig
 
 %changelog
+* Tue Apr 25 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.3.0-2
+- fix ppc build for FC-4 (artificial bump for everyone else)
+
 * Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.3.0-1
 - bump to 2.3.0 (also, bump module revisions)
 



From fedora-extras-commits at redhat.com  Tue Apr 25 05:18:28 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 22:18:28 -0700
Subject: rpms/R/FC-5 R.spec,1.14,1.15
Message-ID: <200604250519.k3P5J0S8013050@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12982/FC-5

Modified Files:
	R.spec 
Log Message:

Fix FC-4 ppc fPIC issue.



Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/FC-5/R.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- R.spec	25 Apr 2006 01:32:13 -0000	1.14
+++ R.spec	25 Apr 2006 05:18:28 -0000	1.15
@@ -1,6 +1,6 @@
 Name: R
 Version: 2.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -219,6 +219,9 @@
 /sbin/ldconfig
 
 %changelog
+* Tue Apr 25 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.3.0-2
+- fix ppc build for FC-4 (artificial bump for everyone else)
+
 * Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.3.0-1
 - bump to 2.3.0 (also, bump module revisions)
 



From fedora-extras-commits at redhat.com  Tue Apr 25 05:18:29 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 22:18:29 -0700
Subject: rpms/R/devel R.spec,1.15,1.16
Message-ID: <200604250519.k3P5J1OB013053@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12982/devel

Modified Files:
	R.spec 
Log Message:

Fix FC-4 ppc fPIC issue.



Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/devel/R.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- R.spec	25 Apr 2006 01:32:14 -0000	1.15
+++ R.spec	25 Apr 2006 05:18:29 -0000	1.16
@@ -1,6 +1,6 @@
 Name: R
 Version: 2.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -219,6 +219,9 @@
 /sbin/ldconfig
 
 %changelog
+* Tue Apr 25 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.3.0-2
+- fix ppc build for FC-4 (artificial bump for everyone else)
+
 * Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.3.0-1
 - bump to 2.3.0 (also, bump module revisions)
 



From fedora-extras-commits at redhat.com  Tue Apr 25 05:18:27 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 22:18:27 -0700
Subject: rpms/R/FC-3 R.spec,1.15,1.16
Message-ID: <200604250518.k3P5Ixfq013044@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12982/FC-3

Modified Files:
	R.spec 
Log Message:

Fix FC-4 ppc fPIC issue.



Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/FC-3/R.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- R.spec	25 Apr 2006 01:32:12 -0000	1.15
+++ R.spec	25 Apr 2006 05:18:27 -0000	1.16
@@ -1,6 +1,6 @@
 Name: R
 Version: 2.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -218,6 +218,9 @@
 /sbin/ldconfig
 
 %changelog
+* Tue Apr 25 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.3.0-2
+- fix ppc build for FC-4 (artificial bump for everyone else)
+
 * Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.3.0-1
 - bump to 2.3.0 (also, bump module revisions)
 



From fedora-extras-commits at redhat.com  Tue Apr 25 06:46:37 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Mon, 24 Apr 2006 23:46:37 -0700
Subject: rpms/pan/devel .cvsignore,1.4,1.5 pan.spec,1.8,1.9 sources,1.4,1.5
Message-ID: <200604250646.k3P6kdWm015560@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/pan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15539

Modified Files:
	.cvsignore pan.spec sources 
Log Message:
update to 0.94



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Apr 2006 07:53:02 -0000	1.4
+++ .cvsignore	25 Apr 2006 06:46:36 -0000	1.5
@@ -1,2 +1,3 @@
 pan-0.14.2.91.tar.bz2
 pan-0.93.tar.bz2
+pan-0.94.tar.bz2


Index: pan.spec
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pan.spec	19 Apr 2006 07:53:02 -0000	1.8
+++ pan.spec	25 Apr 2006 06:46:36 -0000	1.9
@@ -1,6 +1,6 @@
 Summary: A GNOME/GTK+ news reader for X
 Name: pan
-Version: 0.93
+Version: 0.94
 Release: 1%{?dist}
 Epoch: 1
 License: GPL
@@ -63,6 +63,9 @@
 %{_datadir}/applications/fedora-pan.desktop
 
 %changelog
+* Mon Apr 24 2006 Michael A. Peters <mpeters at mac.com> - 1:0.94-1
+- Update to 0.94
+
 * Wed Apr 19 2006 Michael A. Peters <mpeters at mac.com> - 1:0.93-1
 - Update to 0.93
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Apr 2006 07:53:02 -0000	1.4
+++ sources	25 Apr 2006 06:46:36 -0000	1.5
@@ -1 +1,2 @@
 ca870a8a182f68b299796d90906918ca  pan-0.93.tar.bz2
+1013562743c330b07b84b749ed247c66  pan-0.94.tar.bz2



From fedora-extras-commits at redhat.com  Tue Apr 25 07:41:35 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Tue, 25 Apr 2006 00:41:35 -0700
Subject: rpms/gnomesword/devel .cvsignore, 1.3, 1.4 gnomesword.spec, 1.8,
	1.9 sources, 1.4, 1.5 gnomesword-2.1.2-gettext64.patch, 1.1, NONE
Message-ID: <200604250741.k3P7fbXF017911@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gnomesword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17890

Modified Files:
	.cvsignore gnomesword.spec sources 
Removed Files:
	gnomesword-2.1.2-gettext64.patch 
Log Message:
New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Dec 2005 21:18:31 -0000	1.3
+++ .cvsignore	25 Apr 2006 07:41:35 -0000	1.4
@@ -1,2 +1,3 @@
 gnomesword-2.1.2.tar.gz
 gnomesword-2.1.3.tar.gz
+gnomesword-2.1.6.tar.gz


Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/devel/gnomesword.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gnomesword.spec	18 Feb 2006 08:12:21 -0000	1.8
+++ gnomesword.spec	25 Apr 2006 07:41:35 -0000	1.9
@@ -1,13 +1,12 @@
 Name:           gnomesword           
-Version:        2.1.5
-Release:        2%{?dist}
+Version:        2.1.6
+Release:        1%{?dist}
 Summary:        GNOME-based Bible research tool
 
 Group:          Applications/Text
 License:        GPL
 URL:            http://gnomesword.sourceforge.net/
 Source0:        http://easynews.dl.sourceforge.net/sourceforge/gnomesword/gnomesword-%{version}.tar.gz
-#Patch0:         gnomesword-2.1.2-gettext64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  sed >= 3.95
@@ -19,9 +18,6 @@
 BuildRequires:  curl-devel
 BuildRequires:  libgnomeui-devel
 BuildRequires:  scrollkeeper
-#%%ifarch x86_64
-#BuildRequires:  libtool automake autoconf
-#%%endif
 Requires(post):   scrollkeeper
 Requires(postun): scrollkeeper
 Obsoletes:      gnomesword2
@@ -36,17 +32,12 @@
 
 %prep
 %setup -q
-#%%ifarch x86_64
-#%%patch0 -p1 -b .gettext64 
-#%%endif
 
 %{__sed} -i 's?\r??' doc/help/C/legal.xml
 %{__sed} -i 's?\r??' doc/help/fr/legal.xml
 
 %build
-#%%ifarch x86_64
-#libtoolize -c --force && aclocal-1.9 && autoheader && automake-1.9 && autoconf
-#%%endif
+export LDFLAGS="${LDFLAGS} -Wl,--export-dynamic"
 %configure
 make %{?_smp_mflags}
 
@@ -89,6 +80,13 @@
 
 
 %changelog
+* Tue Apr 25 2006 Michael A. Peters <mpeters at mac.com> - 2.1.6-1
+- New upstream version
+- removed commented out fixes for since upstream fixed 64-bit issues
+
+* Mon Apr 17 2006 Michael A. Peters <mpeters at mac.com> - 2.1.5-3
+- fix bug 188581 (187198)
+
 * Sat Feb 18 2006 Michael A. Peters <mpeters at mac.com> - 2.1.5-2
 - Rebuild in devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Dec 2005 23:30:20 -0000	1.4
+++ sources	25 Apr 2006 07:41:35 -0000	1.5
@@ -1,2 +1,2 @@
-ce1171f19a40256cfdd31f42c979d91c  gnomesword-2.1.2.tar.gz
 61191b987a1cfb502841f331bad8d8cd  gnomesword-2.1.5.tar.gz
+7ef05c560c594c3bc84beeb78a611efe  gnomesword-2.1.6.tar.gz


--- gnomesword-2.1.2-gettext64.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 25 07:43:48 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Tue, 25 Apr 2006 00:43:48 -0700
Subject: rpms/gnomesword/FC-5 gnomesword.spec, 1.9, 1.10 sources, 1.4,
	1.5 gnomesword-2.1.2-gettext64.patch, 1.1, NONE
Message-ID: <200604250743.k3P7hojj017979@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gnomesword/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17960

Modified Files:
	gnomesword.spec sources 
Removed Files:
	gnomesword-2.1.2-gettext64.patch 
Log Message:
New upstream version



Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/FC-5/gnomesword.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnomesword.spec	17 Apr 2006 14:59:51 -0000	1.9
+++ gnomesword.spec	25 Apr 2006 07:43:47 -0000	1.10
@@ -1,13 +1,12 @@
 Name:           gnomesword           
-Version:        2.1.5
-Release:        3%{?dist}
+Version:        2.1.6
+Release:        1%{?dist}
 Summary:        GNOME-based Bible research tool
 
 Group:          Applications/Text
 License:        GPL
 URL:            http://gnomesword.sourceforge.net/
 Source0:        http://easynews.dl.sourceforge.net/sourceforge/gnomesword/gnomesword-%{version}.tar.gz
-#Patch0:         gnomesword-2.1.2-gettext64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  sed >= 3.95
@@ -19,9 +18,6 @@
 BuildRequires:  curl-devel
 BuildRequires:  libgnomeui-devel
 BuildRequires:  scrollkeeper
-#%%ifarch x86_64
-#BuildRequires:  libtool automake autoconf
-#%%endif
 Requires(post):   scrollkeeper
 Requires(postun): scrollkeeper
 Obsoletes:      gnomesword2
@@ -36,17 +32,11 @@
 
 %prep
 %setup -q
-#%%ifarch x86_64
-#%%patch0 -p1 -b .gettext64 
-#%%endif
 
 %{__sed} -i 's?\r??' doc/help/C/legal.xml
 %{__sed} -i 's?\r??' doc/help/fr/legal.xml
 
 %build
-#%%ifarch x86_64
-#libtoolize -c --force && aclocal-1.9 && autoheader && automake-1.9 && autoconf
-#%%endif
 export LDFLAGS="${LDFLAGS} -Wl,--export-dynamic"
 %configure
 make %{?_smp_mflags}
@@ -90,6 +80,10 @@
 
 
 %changelog
+* Tue Apr 25 2006 Michael A. Peters <mpeters at mac.com> - 2.1.6-1
+- New upstream version
+- removed commented out fixes for since upstream fixed 64-bit issues
+
 * Mon Apr 17 2006 Michael A. Peters <mpeters at mac.com> - 2.1.5-3
 - fix bug 188581 (187198)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Dec 2005 23:30:20 -0000	1.4
+++ sources	25 Apr 2006 07:43:47 -0000	1.5
@@ -1,2 +1,2 @@
-ce1171f19a40256cfdd31f42c979d91c  gnomesword-2.1.2.tar.gz
 61191b987a1cfb502841f331bad8d8cd  gnomesword-2.1.5.tar.gz
+7ef05c560c594c3bc84beeb78a611efe  gnomesword-2.1.6.tar.gz


--- gnomesword-2.1.2-gettext64.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 25 08:47:16 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Tue, 25 Apr 2006 01:47:16 -0700
Subject: fedora-security/audit fc4,1.215,1.216 fc5,1.129,1.130
Message-ID: <200604250847.k3P8lGRu020309@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20289/audit

Modified Files:
	fc4 fc5 
Log Message:
Add CVE-2006-1863



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- fc4	25 Apr 2006 01:46:46 -0000	1.215
+++ fc4	25 Apr 2006 08:47:14 -0000	1.216
@@ -8,6 +8,7 @@
 CVE-2006-1942 ** firefox
 CVE-2006-1931 version (ruby, fixed 1.8.3)
 CVE-2006-1902 ignore (gcc) not a vulnerability
+CVE-2006-1863 VULNERABLE (kernel, fixed 2.6.16.11)
 CVE-2006-1790 version (firefox, fixed 1.0.8) [since FEDORA-2006-410]
 CVE-2006-1790 VULNERABLE (thunderbird, fixed 1.0.8)
 CVE-2006-1790 VULNERABLE (mozilla, fixed 1.7.13)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- fc5	25 Apr 2006 01:46:46 -0000	1.129
+++ fc5	25 Apr 2006 08:47:14 -0000	1.130
@@ -9,6 +9,7 @@
 CVE-2006-1931 version (ruby, fixed 1.8.3)
 CVE-2006-1902 ignore (gcc) not a vulnerability
 CVE-2006-1865 version (beagle, fixed 0.2.5) [since FEDORA-2006-440]
+CVE-2006-1863 VULNERABLE (kernel, fixed 2.6.16.11)
 CVE-2006-1790 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1790 VULNERABLE (thunderbird, fixed 1.5.0.2)
 CVE-2006-1790 VULNERABLE (mozilla, fixed 1.7.13)



From fedora-extras-commits at redhat.com  Tue Apr 25 08:49:16 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 25 Apr 2006 01:49:16 -0700
Subject: rpms/d4x/FC-4 .cvsignore, 1.7, 1.8 d4x.spec, 1.10, 1.11 sources, 1.7,
	1.8
Message-ID: <200604250849.k3P8nmg4020375@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/d4x/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20320/FC-4

Modified Files:
	.cvsignore d4x.spec sources 
Log Message:
Update to 2.5.7.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/d4x/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Apr 2006 12:27:38 -0000	1.7
+++ .cvsignore	25 Apr 2006 08:49:16 -0000	1.8
@@ -1 +1 @@
-d4x-2.5.7.tar.bz2
+d4x-2.5.7.1.tar.bz2


Index: d4x.spec
===================================================================
RCS file: /cvs/extras/rpms/d4x/FC-4/d4x.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- d4x.spec	10 Apr 2006 12:27:38 -0000	1.10
+++ d4x.spec	25 Apr 2006 08:49:16 -0000	1.11
@@ -3,7 +3,7 @@
 
 Summary: Downloader for X that supports resuming and many other features
 Name: d4x
-Version: 2.5.7
+Version: 2.5.7.1
 Release: 1%{?pre:.%{pre}}%{?dist}
 Group: Applications/Internet
 License: Artistic
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Tue Apr 25 2006 Matthias Saou <http://freshrpms.net/> 2.5.7.1-1
+- Update to 2.5.7.1.
+
 * Mon Apr 10 2006 Matthias Saou <http://freshrpms.net/> 2.5.7-1
 - Update to 2.5.7.
 - Update source URL and s/gz/bz2/ again.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/d4x/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	10 Apr 2006 12:27:38 -0000	1.7
+++ sources	25 Apr 2006 08:49:16 -0000	1.8
@@ -1 +1 @@
-16e27032bf1d3396b93453afde3266dd  d4x-2.5.7.tar.bz2
+68d6336c3749a7caabb0f5a5f84f4102  d4x-2.5.7.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Apr 25 08:49:17 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 25 Apr 2006 01:49:17 -0700
Subject: rpms/d4x/FC-5 .cvsignore, 1.8, 1.9 d4x.spec, 1.12, 1.13 sources, 1.8,
	1.9
Message-ID: <200604250849.k3P8nnG2020380@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/d4x/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20320/FC-5

Modified Files:
	.cvsignore d4x.spec sources 
Log Message:
Update to 2.5.7.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/d4x/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	10 Apr 2006 12:27:39 -0000	1.8
+++ .cvsignore	25 Apr 2006 08:49:16 -0000	1.9
@@ -1 +1 @@
-d4x-2.5.7.tar.bz2
+d4x-2.5.7.1.tar.bz2


Index: d4x.spec
===================================================================
RCS file: /cvs/extras/rpms/d4x/FC-5/d4x.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- d4x.spec	10 Apr 2006 12:27:39 -0000	1.12
+++ d4x.spec	25 Apr 2006 08:49:16 -0000	1.13
@@ -3,7 +3,7 @@
 
 Summary: Downloader for X that supports resuming and many other features
 Name: d4x
-Version: 2.5.7
+Version: 2.5.7.1
 Release: 1%{?pre:.%{pre}}%{?dist}
 Group: Applications/Internet
 License: Artistic
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Tue Apr 25 2006 Matthias Saou <http://freshrpms.net/> 2.5.7.1-1
+- Update to 2.5.7.1.
+
 * Mon Apr 10 2006 Matthias Saou <http://freshrpms.net/> 2.5.7-1
 - Update to 2.5.7.
 - Update source URL and s/gz/bz2/ again.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/d4x/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	10 Apr 2006 12:27:39 -0000	1.8
+++ sources	25 Apr 2006 08:49:16 -0000	1.9
@@ -1 +1 @@
-16e27032bf1d3396b93453afde3266dd  d4x-2.5.7.tar.bz2
+68d6336c3749a7caabb0f5a5f84f4102  d4x-2.5.7.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Apr 25 08:49:17 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 25 Apr 2006 01:49:17 -0700
Subject: rpms/d4x/devel .cvsignore, 1.8, 1.9 d4x.spec, 1.12, 1.13 sources,
	1.8, 1.9
Message-ID: <200604250849.k3P8nnrY020385@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/d4x/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20320/devel

Modified Files:
	.cvsignore d4x.spec sources 
Log Message:
Update to 2.5.7.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/d4x/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	10 Apr 2006 12:07:40 -0000	1.8
+++ .cvsignore	25 Apr 2006 08:49:17 -0000	1.9
@@ -1 +1 @@
-d4x-2.5.7.tar.bz2
+d4x-2.5.7.1.tar.bz2


Index: d4x.spec
===================================================================
RCS file: /cvs/extras/rpms/d4x/devel/d4x.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- d4x.spec	10 Apr 2006 12:07:40 -0000	1.12
+++ d4x.spec	25 Apr 2006 08:49:17 -0000	1.13
@@ -3,7 +3,7 @@
 
 Summary: Downloader for X that supports resuming and many other features
 Name: d4x
-Version: 2.5.7
+Version: 2.5.7.1
 Release: 1%{?pre:.%{pre}}%{?dist}
 Group: Applications/Internet
 License: Artistic
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Tue Apr 25 2006 Matthias Saou <http://freshrpms.net/> 2.5.7.1-1
+- Update to 2.5.7.1.
+
 * Mon Apr 10 2006 Matthias Saou <http://freshrpms.net/> 2.5.7-1
 - Update to 2.5.7.
 - Update source URL and s/gz/bz2/ again.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/d4x/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	10 Apr 2006 12:07:40 -0000	1.8
+++ sources	25 Apr 2006 08:49:17 -0000	1.9
@@ -1 +1 @@
-16e27032bf1d3396b93453afde3266dd  d4x-2.5.7.tar.bz2
+68d6336c3749a7caabb0f5a5f84f4102  d4x-2.5.7.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Apr 25 09:46:18 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Tue, 25 Apr 2006 02:46:18 -0700
Subject: rpms/gourmet/FC-5 gourmet.spec,1.4,1.5 sources,1.5,1.6
Message-ID: <200604250946.k3P9kKpa022962@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gourmet/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22943

Modified Files:
	gourmet.spec sources 
Log Message:
Try building again



Index: gourmet.spec
===================================================================
RCS file: /cvs/extras/rpms/gourmet/FC-5/gourmet.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gourmet.spec	17 Mar 2006 20:07:41 -0000	1.4
+++ gourmet.spec	25 Apr 2006 09:46:18 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:		gourmet
 Version:	0.8.5.14
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	PyGTK Recipe Manager
 
 Group:		Applications/Productivity
@@ -109,6 +109,9 @@
 %{_datadir}/gourmet
 
 %changelog
+* Tue Apr 25 2006 Michael A. Peters <mpeters at mac.com> - 0.8.5.14-2
+- try build again
+
 * Fri Mar 17 2006 Michael A. Peters <mpeters at mac.com> - 0.8.5.14-1
 - New upstream version
 - rpmlint cleanup


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gourmet/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Mar 2006 20:07:41 -0000	1.5
+++ sources	25 Apr 2006 09:46:18 -0000	1.6
@@ -1,3 +1,2 @@
-77b615493759a5a37a55589e7a24b9a9  gourmet-0.8.5.12.tar.gz
 3db64a0609bf5d97b81d8600dda559b9  gourmet-0.8.5.13.tar.gz
 f958809ea958f79a0593c3e226388faa  gourmet-0.8.5.14.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 09:48:11 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Tue, 25 Apr 2006 02:48:11 -0700
Subject: rpms/gourmet/FC-4 gourmet.spec,1.4,1.5 sources,1.5,1.6
Message-ID: <200604250948.k3P9mDxc023027@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gourmet/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23008

Modified Files:
	gourmet.spec sources 
Log Message:
FC-4 build



Index: gourmet.spec
===================================================================
RCS file: /cvs/extras/rpms/gourmet/FC-4/gourmet.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gourmet.spec	17 Mar 2006 20:01:40 -0000	1.4
+++ gourmet.spec	25 Apr 2006 09:48:11 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:		gourmet
 Version:	0.8.5.14
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	PyGTK Recipe Manager
 
 Group:		Applications/Productivity
@@ -109,6 +109,9 @@
 %{_datadir}/gourmet
 
 %changelog
+* Tue Apr 25 2006 Michael A. Peters <mpeters at mac.com> - 0.8.5.14-2
+- try build again
+
 * Fri Mar 17 2006 Michael A. Peters <mpeters at mac.com> - 0.8.5.14-1
 - New upstream version
 - rpmlint cleanup


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gourmet/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Mar 2006 20:01:40 -0000	1.5
+++ sources	25 Apr 2006 09:48:11 -0000	1.6
@@ -1,3 +1,2 @@
-77b615493759a5a37a55589e7a24b9a9  gourmet-0.8.5.12.tar.gz
 3db64a0609bf5d97b81d8600dda559b9  gourmet-0.8.5.13.tar.gz
 f958809ea958f79a0593c3e226388faa  gourmet-0.8.5.14.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 09:49:42 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Tue, 25 Apr 2006 02:49:42 -0700
Subject: rpms/gourmet/FC-3 gourmet.spec,1.3,1.4 sources,1.4,1.5
Message-ID: <200604250949.k3P9niDc023090@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gourmet/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23071

Modified Files:
	gourmet.spec sources 
Log Message:
fc3 build



Index: gourmet.spec
===================================================================
RCS file: /cvs/extras/rpms/gourmet/FC-3/gourmet.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gourmet.spec	11 Nov 2005 23:28:07 -0000	1.3
+++ gourmet.spec	25 Apr 2006 09:49:42 -0000	1.4
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		gourmet
-Version:	0.8.5.13
-Release:	1%{?dist}
+Version:	0.8.5.14
+Release:	2%{?dist}
 Summary:	PyGTK Recipe Manager
 
 Group:		Applications/Productivity
@@ -33,10 +33,21 @@
 %prep
 %setup -q
 %{__sed} -i 's?\.$??g' gourmet.desktop
+%{__sed} -i 's?\r??' src/lib/defaults_sk.py
+%{__sed} -i 's?\r??' src/lib/defaults_pt.py
+chmod -x data/recipe.dtd
 # remove *.mo files - we'll regenerate them
 pushd i18n
 find -name \*.mo |xargs rm -f
 popd
+# remove shell bangs
+pushd src/lib
+for file in `find . -type f`; do
+  cp $file $file.orig
+  grep -v "\#\!\/usr\/bin" $file.orig > $file
+  rm -f $file.orig
+done
+popd
 
 %build
 pushd i18n
@@ -52,6 +63,7 @@
 %{__python} setup.py install -O1 --skip-build --root %buildroot \
 --disable-modules-check
 
+
 desktop-file-install %buildroot%_datadir/applications/gourmet.desktop \
 --vendor=fedora \
 --add-category=X-Fedora \
@@ -59,7 +71,6 @@
 --copy-name-to-generic-name \
 --delete-original
 
-
 %find_lang %{name}
 
 %clean
@@ -98,6 +109,13 @@
 %{_datadir}/gourmet
 
 %changelog
+* Tue Apr 25 2006 Michael A. Peters <mpeters at mac.com> - 0.8.5.14-2
+- try build again
+
+* Fri Mar 17 2006 Michael A. Peters <mpeters at mac.com> - 0.8.5.14-1
+- New upstream version
+- rpmlint cleanup
+
 * Fri Nov 11 2005 Michael A. Peters <mpeters at mac.com> - 0.8.5.13-1
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gourmet/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Nov 2005 23:28:07 -0000	1.4
+++ sources	25 Apr 2006 09:49:42 -0000	1.5
@@ -1,2 +1,2 @@
-77b615493759a5a37a55589e7a24b9a9  gourmet-0.8.5.12.tar.gz
 3db64a0609bf5d97b81d8600dda559b9  gourmet-0.8.5.13.tar.gz
+f958809ea958f79a0593c3e226388faa  gourmet-0.8.5.14.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 14:19:59 2006
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Tue, 25 Apr 2006 07:19:59 -0700
Subject: pm-utils Makefile,1.20,1.21
Message-ID: <200604251419.k3PEJxYC004851@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/devel/pm-utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4822

Modified Files:
	Makefile 
Log Message:
- use /etc/pm/config instead of /etc/sysconfig/pm , so this is completely
  cross-distro clean.



Index: Makefile
===================================================================
RCS file: /cvs/devel/pm-utils/Makefile,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Makefile	18 Apr 2006 01:10:33 -0000	1.20
+++ Makefile	25 Apr 2006 14:19:57 -0000	1.21
@@ -46,7 +46,6 @@
 	install -m 755 -d $(sysconfdir)/security/console.apps
 	install -m 755 -d $(sysconfdir)/pm
 	install -m 755 -d $(sysconfdir)/pm/hooks
-	install -m 755 -d $(sysconfdir)/sysconfig
 	install -m 644 pm-suspend.pam $(sysconfdir)/pam.d/pm-suspend
 	install -m 644 pm-suspend.app $(sysconfdir)/security/console.apps/pm-suspend
 	install -m 644 pm-hibernate.pam $(sysconfdir)/pam.d/pm-hibernate
@@ -54,7 +53,7 @@
 	install -m 644 pm-powersave.pam $(sysconfdir)/pam.d/pm-powersave
 	install -m 644 pm-powersave.app $(sysconfdir)/security/console.apps/pm-powersave
 
-	install -m 644 pm.sysconfig $(sysconfdir)/sysconfig/pm
+	install -m 644 pm.sysconfig $(sysconfdir)/pm/config
 	for file in pm/functions* ; do \
 		install -m 644 $$file $(sysconfdir)/pm ; \
 	done



From fedora-extras-commits at redhat.com  Tue Apr 25 14:20:00 2006
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Tue, 25 Apr 2006 07:20:00 -0700
Subject: pm-utils/pm functions,1.12,1.13
Message-ID: <200604251420.k3PEK0bj004857@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/devel/pm-utils/pm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4822/pm

Modified Files:
	functions 
Log Message:
- use /etc/pm/config instead of /etc/sysconfig/pm , so this is completely
  cross-distro clean.



Index: functions
===================================================================
RCS file: /cvs/devel/pm-utils/pm/functions,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- functions	18 Apr 2006 04:42:22 -0000	1.12
+++ functions	25 Apr 2006 14:19:58 -0000	1.13
@@ -6,7 +6,7 @@
 HIBERNATE_RESUME_POST_VIDEO=no
 SUSPEND_MODULES=""
 
-[ -f /etc/sysconfig/pm ] && . /etc/sysconfig/pm
+[ -f /etc/pm/config ] && . /etc/pm/config
 
 # export them all here
 export HIBERNATE_RESUME_POST_VIDEO



From fedora-extras-commits at redhat.com  Tue Apr 25 14:27:09 2006
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Tue, 25 Apr 2006 07:27:09 -0700
Subject: pm-utils Makefile,1.21,1.22
Message-ID: <200604251427.k3PER9UB004948@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/devel/pm-utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4923

Modified Files:
	Makefile 
Log Message:
- bump version for last release before moving it once again :/



Index: Makefile
===================================================================
RCS file: /cvs/devel/pm-utils/Makefile,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Makefile	25 Apr 2006 14:19:57 -0000	1.21
+++ Makefile	25 Apr 2006 14:27:07 -0000	1.22
@@ -1,4 +1,4 @@
-VERSION:=0.17
+VERSION:=0.18
 
 CFLAGS= $(RPM_OPT_FLAGS) -Wall -D_GNU_SOURCE -g
 LDFLAGS = 



From fedora-extras-commits at redhat.com  Tue Apr 25 14:40:31 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 25 Apr 2006 07:40:31 -0700
Subject: rpms/liferea/FC-5 .cvsignore, 1.25, 1.26 liferea.spec, 1.37,
	1.38 sources, 1.26, 1.27
Message-ID: <200604251440.k3PEeXJW005076@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/liferea/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5055

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
* Sat Apr 22 2006 Brian Pepple <bdpepple at ameritech.net> - 1.0.10-2
- Update to 1.0.10.
- Remove *.la, instead of excluding.
- Delete original desktop file in desktop-file-install call.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-5/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	5 Apr 2006 17:45:18 -0000	1.25
+++ .cvsignore	25 Apr 2006 14:40:30 -0000	1.26
@@ -1 +1 @@
-liferea-1.0.9.tar.gz
+liferea-1.0.10.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-5/liferea.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- liferea.spec	5 Apr 2006 17:45:18 -0000	1.37
+++ liferea.spec	25 Apr 2006 14:40:30 -0000	1.38
@@ -1,7 +1,7 @@
 %define with_dbus 1
 
 Name:           liferea
-Version:        1.0.9
+Version:        1.0.10
 Release:        2%{?dist}
 Summary:        An RSS/RDF feed reader
 
@@ -56,11 +56,12 @@
 make install DESTDIR=${RPM_BUILD_ROOT}
 %find_lang %{name}
 
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
-desktop-file-install --vendor fedora			\
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
+
+desktop-file-install --vendor fedora --delete-original	\
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications   	\
   --add-category X-Fedora			        \
-  %{name}.desktop
+  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
 
 %clean
@@ -101,10 +102,14 @@
 %{_datadir}/pixmaps/%{name}.png
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/*.so*
-%exclude %{_libdir}/%{name}/*.la
 
 
 %changelog
+* Sat Apr 22 2006 Brian Pepple <bdpepple at ameritech.net> - 1.0.10-2
+- Update to 1.0.10.
+- Remove *.la, instead of excluding.
+- Delete original desktop file in desktop-file-install call.
+
 * Wed Apr  5 2006 Brian Pepple <bdpepple at ameritech.net> - 1.0.9-2
 - Update to 1.0.9.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-5/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	5 Apr 2006 17:45:18 -0000	1.26
+++ sources	25 Apr 2006 14:40:30 -0000	1.27
@@ -1 +1 @@
-60f743fcb41876ad2d02f6da88251c31  liferea-1.0.9.tar.gz
+41201991b4d7a113169ebda3e7dc54ef  liferea-1.0.10.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 15:27:50 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 25 Apr 2006 08:27:50 -0700
Subject: owners owners.list,1.890,1.891
Message-ID: <200604251527.k3PFRqY0007459@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7442

Modified Files:
	owners.list 
Log Message:
* Add ownership entry for perl-Gtk2-Spell



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.890
retrieving revision 1.891
diff -u -r1.890 -r1.891
--- owners.list	25 Apr 2006 01:12:32 -0000	1.890
+++ owners.list	25 Apr 2006 15:27:50 -0000	1.891
@@ -984,6 +984,7 @@
 Fedora Extras|perl-GSSAPI|Perl extension providing access to the GSSAPIv2 library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gtk2|Perl interface to the 2.x series of the Gimp Toolkit library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gtk2-GladeXML|Perl interface to Gtk2 GladeXML|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
+Fedora Extras|perl-Gtk2-Spell|Perl interface to gtkspell|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|
 Fedora Extras|perl-Hook-LexWrap|Lexically scoped subroutine wrappers|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Format|HTML formatter modules|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Mason|HTML::Mason 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  Tue Apr 25 15:34:26 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 25 Apr 2006 08:34:26 -0700
Subject: rpms/perl-Test-SubCalls - New directory
Message-ID: <200604251534.k3PFYSeI007562@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-SubCalls
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7535/perl-Test-SubCalls

Log Message:
Directory /cvs/extras/rpms/perl-Test-SubCalls added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 25 15:34:27 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 25 Apr 2006 08:34:27 -0700
Subject: rpms/perl-Test-SubCalls/devel - New directory
Message-ID: <200604251534.k3PFYTT8007565@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-SubCalls/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7535/perl-Test-SubCalls/devel

Log Message:
Directory /cvs/extras/rpms/perl-Test-SubCalls/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 25 15:34:43 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 25 Apr 2006 08:34:43 -0700
Subject: rpms/perl-Test-SubCalls Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604251534.k3PFYjPI007614@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-SubCalls
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7581

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Test-SubCalls


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Test-SubCalls
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 25 15:34:43 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 25 Apr 2006 08:34:43 -0700
Subject: rpms/perl-Test-SubCalls/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200604251534.k3PFYjTV007617@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-SubCalls/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7581/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Test-SubCalls


--- 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 Apr 25 15:35:17 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 25 Apr 2006 08:35:17 -0700
Subject: rpms/perl-Test-SubCalls import.log,1.1,1.2
Message-ID: <200604251535.k3PFZJ0B007678@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-SubCalls
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7645

Modified Files:
	import.log 
Log Message:
auto-import perl-Test-SubCalls-0.05-1 on branch devel from perl-Test-SubCalls-0.05-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-SubCalls/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Apr 2006 15:34:43 -0000	1.1
+++ import.log	25 Apr 2006 15:35:17 -0000	1.2
@@ -0,0 +1 @@
+perl-Test-SubCalls-0_05-1:HEAD:perl-Test-SubCalls-0.05-1.src.rpm:1145979309



From fedora-extras-commits at redhat.com  Tue Apr 25 15:35:18 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 25 Apr 2006 08:35:18 -0700
Subject: rpms/perl-Test-SubCalls/devel perl-Test-SubCalls.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604251535.k3PFZKoW007683@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-SubCalls/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7645/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Test-SubCalls.spec 
Log Message:
auto-import perl-Test-SubCalls-0.05-1 on branch devel from perl-Test-SubCalls-0.05-1.src.rpm


--- NEW FILE perl-Test-SubCalls.spec ---
Name:           perl-Test-SubCalls
Version:        0.05
Release:        1%{?dist}
Summary:        Track the number of times subs are called

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Test-SubCalls/
Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/Test-SubCalls-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(Hook::LexWrap) >= 0.20
BuildRequires:  perl(Test::Builder::Tester) >= 1.02
BuildRequires:  perl(Test::Pod) >= 1.00
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
There are a number of different situations (like testing cacheing
code) where you want to want to do a number of tests, and then verify
that some underlying subroutine deep within the code was called a
specific number of times.


%prep
%setup -q -n Test-SubCalls-%{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
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes LICENSE README
%{perl_vendorlib}/Test/
%{_mandir}/man3/*.3pm*


%changelog
* Tue Apr 25 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.05-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-SubCalls/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Apr 2006 15:34:43 -0000	1.1
+++ .cvsignore	25 Apr 2006 15:35:17 -0000	1.2
@@ -0,0 +1 @@
+Test-SubCalls-0.05.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-SubCalls/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Apr 2006 15:34:43 -0000	1.1
+++ sources	25 Apr 2006 15:35:17 -0000	1.2
@@ -0,0 +1 @@
+23ae21fea8a30477aba508b4a6f785b5  Test-SubCalls-0.05.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 15:36:49 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 25 Apr 2006 08:36:49 -0700
Subject: owners owners.list,1.891,1.892
Message-ID: <200604251536.k3PFapgE007753@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7736

Modified Files:
	owners.list 
Log Message:
New package: perl-Test-SubCalls (#189874)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.891
retrieving revision 1.892
diff -u -r1.891 -r1.892
--- owners.list	25 Apr 2006 15:27:50 -0000	1.891
+++ owners.list	25 Apr 2006 15:36:49 -0000	1.892
@@ -1129,6 +1129,7 @@
 Fedora Extras|perl-Test-NoWarnings|Make sure you didn't emit any warnings while testing|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Pod|Perl module for checking for POD errors in files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Pod-Coverage|POD documentation coverage checker|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Test-SubCalls|Track the number of times subs are called|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Taint|Tools to test taintedness|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Tester|Ease testing test modules built with Test::Builder|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Warn|Perl extension to test methods for warnings|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Apr 25 15:39:13 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 25 Apr 2006 08:39:13 -0700
Subject: rpms/perl-Module-Locate - New directory
Message-ID: <200604251539.k3PFdFvS007995@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Module-Locate
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7969/perl-Module-Locate

Log Message:
Directory /cvs/extras/rpms/perl-Module-Locate added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 25 15:39:14 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 25 Apr 2006 08:39:14 -0700
Subject: rpms/perl-Module-Locate/devel - New directory
Message-ID: <200604251539.k3PFdGQg007998@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Module-Locate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7969/perl-Module-Locate/devel

Log Message:
Directory /cvs/extras/rpms/perl-Module-Locate/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 25 15:39:30 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 25 Apr 2006 08:39:30 -0700
Subject: rpms/perl-Module-Locate Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604251539.k3PFdWpF008047@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Module-Locate
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8014

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Module-Locate


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Module-Locate
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 25 15:39:31 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 25 Apr 2006 08:39:31 -0700
Subject: rpms/perl-Module-Locate/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200604251539.k3PFdXlj008050@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Module-Locate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8014/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Module-Locate


--- 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 Apr 25 15:40:03 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 25 Apr 2006 08:40:03 -0700
Subject: rpms/perl-Module-Locate import.log,1.1,1.2
Message-ID: <200604251540.k3PFe5di008113@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Module-Locate
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8078

Modified Files:
	import.log 
Log Message:
auto-import perl-Module-Locate-1.7-1 on branch devel from perl-Module-Locate-1.7-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Locate/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Apr 2006 15:39:30 -0000	1.1
+++ import.log	25 Apr 2006 15:40:03 -0000	1.2
@@ -0,0 +1 @@
+perl-Module-Locate-1_7-1:HEAD:perl-Module-Locate-1.7-1.src.rpm:1145979595



From fedora-extras-commits at redhat.com  Tue Apr 25 15:40:03 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 25 Apr 2006 08:40:03 -0700
Subject: rpms/perl-Module-Locate/devel perl-Module-Locate.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604251540.k3PFe5k3008118@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Module-Locate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8078/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Module-Locate.spec 
Log Message:
auto-import perl-Module-Locate-1.7-1 on branch devel from perl-Module-Locate-1.7-1.src.rpm


--- NEW FILE perl-Module-Locate.spec ---
Name:           perl-Module-Locate
Version:        1.7
Release:        1%{?dist}
Summary:        Locate modules in the same fashion as "require" and "use"

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Module-Locate/
Source0:        http://www.cpan.org/authors/id/B/BR/BROQ/Module-Locate-%{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
Using "locate()", return the path that "require" would find for a given
module or filename (it can also return a filehandle if a reference in @INC
has been used).  This means you can test for the existence, or find the
path for, modules without having to evaluate the code they contain.

This module also comes with accompanying utility functions that are used
within the module itself (except for "get_source") and are available for
import.


%prep
%setup -q -n Module-Locate-%{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
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/Module/
%{_mandir}/man3/*.3*


%changelog
* Tue Jan 24 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.7-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Locate/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Apr 2006 15:39:30 -0000	1.1
+++ .cvsignore	25 Apr 2006 15:40:03 -0000	1.2
@@ -0,0 +1 @@
+Module-Locate-1.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Locate/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Apr 2006 15:39:30 -0000	1.1
+++ sources	25 Apr 2006 15:40:03 -0000	1.2
@@ -0,0 +1 @@
+abf9f4f452243dcaa702d100b8c0b50c  Module-Locate-1.7.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 15:41:07 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 25 Apr 2006 08:41:07 -0700
Subject: owners owners.list,1.892,1.893
Message-ID: <200604251541.k3PFf9sF008176@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8159

Modified Files:
	owners.list 
Log Message:
New package: perl-Module-Locate (#189877)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.892
retrieving revision 1.893
diff -u -r1.892 -r1.893
--- owners.list	25 Apr 2006 15:36:49 -0000	1.892
+++ owners.list	25 Apr 2006 15:41:07 -0000	1.893
@@ -1063,6 +1063,7 @@
 Fedora Extras|perl-Module-Load|Runtime require of both modules and files|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Load-Conditional|Looking up module information / loading at runtime|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Loaded|Mark modules as loaded or unloaded|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Module-Locate|Locate modules in the same fashion as "require" and "use"|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Pluggable|Automatically give your module the ability to have plugins|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Refresh|Refresh %INC files when updated on disk|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Signature|CPAN signature management utilities and modules|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Apr 25 16:49:53 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 25 Apr 2006 09:49:53 -0700
Subject: rpms/dnsmasq - New directory
Message-ID: <200604251649.k3PGntWj011129@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11108/dnsmasq

Log Message:
Directory /cvs/extras/rpms/dnsmasq added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 25 16:49:54 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 25 Apr 2006 09:49:54 -0700
Subject: rpms/dnsmasq/devel - New directory
Message-ID: <200604251650.k3PGnuga011132@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11108/dnsmasq/devel

Log Message:
Directory /cvs/extras/rpms/dnsmasq/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 25 16:50:35 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 25 Apr 2006 09:50:35 -0700
Subject: rpms/dnsmasq Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604251650.k3PGobXS011186@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11153

Added Files:
	Makefile import.log 
Log Message:
Setup of module dnsmasq


--- NEW FILE Makefile ---
# Top level Makefile for module dnsmasq
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 25 16:50:36 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 25 Apr 2006 09:50:36 -0700
Subject: rpms/dnsmasq/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604251650.k3PGocfo011189@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11153/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module dnsmasq


--- 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 Apr 25 16:51:24 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 25 Apr 2006 09:51:24 -0700
Subject: rpms/dnsmasq import.log,1.1,1.2
Message-ID: <200604251651.k3PGpQmx011256@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11222

Modified Files:
	import.log 
Log Message:
auto-import dnsmasq-2.30-2 on branch devel from dnsmasq-2.30-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Apr 2006 16:50:35 -0000	1.1
+++ import.log	25 Apr 2006 16:51:24 -0000	1.2
@@ -0,0 +1 @@
+dnsmasq-2_30-2:HEAD:dnsmasq-2.30-2.src.rpm:1145983873



From fedora-extras-commits at redhat.com  Tue Apr 25 16:51:25 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 25 Apr 2006 09:51:25 -0700
Subject: rpms/dnsmasq/devel dnsmasq-2.30-fedora-extras.patch, NONE,
	1.1 dnsmasq.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604251651.k3PGpRVl011263@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11222/devel

Modified Files:
	.cvsignore sources 
Added Files:
	dnsmasq-2.30-fedora-extras.patch dnsmasq.spec 
Log Message:
auto-import dnsmasq-2.30-2 on branch devel from dnsmasq-2.30-2.src.rpm

dnsmasq-2.30-fedora-extras.patch:

--- NEW FILE dnsmasq-2.30-fedora-extras.patch ---
diff -urN dnsmasq-2.30/rpm/dnsmasq.rh dnsmasq-2.30-patched/rpm/dnsmasq.rh
--- dnsmasq-2.30/rpm/dnsmasq.rh	2006-04-23 08:26:21.000000000 -0500
+++ dnsmasq-2.30-patched/rpm/dnsmasq.rh	2006-04-24 15:06:01.000000000 -0500
@@ -2,7 +2,7 @@
 #
 # Startup script for the DNS caching server
 #
-# chkconfig: 2345 99 01
+# chkconfig: - 99 01
 # description: This script starts your DNS caching server
 # processname: dnsmasq
 # pidfile: /var/run/dnsmasq.pid
diff -urN dnsmasq-2.30/src/config.h dnsmasq-2.30-patched/src/config.h
--- dnsmasq-2.30/src/config.h	2006-04-23 13:27:20.000000000 -0500
+++ dnsmasq-2.30-patched/src/config.h	2006-04-24 15:04:28.000000000 -0500
@@ -167,8 +167,8 @@
 
 /* platform independent options- uncomment to enable */
 /* #define HAVE_BROKEN_RTC */
-/* #define HAVE_ISC_READER */
-/* #define HAVE_DBUS */
+#define HAVE_ISC_READER
+#define HAVE_DBUS
 
 #if defined(HAVE_BROKEN_RTC) && defined(HAVE_ISC_READER)
 #  error HAVE_ISC_READER is not compatible with HAVE_BROKEN_RTC


--- NEW FILE dnsmasq.spec ---
Name:           dnsmasq
Version:        2.30
Release:        2%{?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}-fedora-extras.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  dbus-devel

Requires(post):	 /sbin/chkconfig
Requires(post):  /sbin/service
Requires(preun): /sbin/chkconfig
Requires(preun): /sbin/service

%description
Dnsmasq is lightweight, easy to configure DNS forwarder and DHCP server. 
It is designed to provide DNS and, optionally, DHCP, to a small network. 
It can serve the names of local machines which are not in the global 
DNS. The DHCP server integrates with the DNS server and allows machines 
with DHCP-allocated addresses to appear in the DNS with names configured 
either in each host or in a central configuration file. Dnsmasq supports 
static and dynamic DHCP leases and BOOTP for network booting of diskless 
machines.


%prep
%setup -q
%patch0 -p1

%build
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
# normally i'd do 'make install'...it's a bit messy, though
mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_initrddir} \
	$RPM_BUILD_ROOT%{_mandir}/man8
install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq
install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf
install rpm/dnsmasq.rh $RPM_BUILD_ROOT%{_initrddir}/dnsmasq
install man/dnsmasq.8 $RPM_BUILD_ROOT%{_mandir}/man8/

%clean
rm -rf $RPM_BUILD_ROOT

%post
/sbin/chkconfig --add dnsmasq

%preun
if [ $1 = 0 ]; then     # execute this only if we are NOT doing an upgrade
    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,-)
%doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0
%config(noreplace) %attr(664,root,root) %{_sysconfdir}/dnsmasq.conf
%{_initrddir}/dnsmasq
%{_sbindir}/dnsmasq
%{_mandir}/man8/dnsmasq*


%changelog
* Mon Apr 24 2006 Patrick Laughton <jima at auroralinux.org> 2.30-2
- Disabled stripping of binary while installing (oops)
- Enabled HAVE_ISC_READER/HAVE_DBUS via patch
- Added BuildReq for dbus-devel

* Mon Apr 24 2006 Patrick Laughton <jima at auroralinux.org> 2.30-1
- Initial Fedora Extras RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Apr 2006 16:50:36 -0000	1.1
+++ .cvsignore	25 Apr 2006 16:51:25 -0000	1.2
@@ -0,0 +1 @@
+dnsmasq-2.30.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Apr 2006 16:50:36 -0000	1.1
+++ sources	25 Apr 2006 16:51:25 -0000	1.2
@@ -0,0 +1 @@
+91db9ef2c63269debf7794783074b751  dnsmasq-2.30.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 16:53:13 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 25 Apr 2006 09:53:13 -0700
Subject: rpms/erlang-esdl - New directory
Message-ID: <200604251653.k3PGrF7B011364@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/erlang-esdl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11338/erlang-esdl

Log Message:
Directory /cvs/extras/rpms/erlang-esdl added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 25 16:53:14 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 25 Apr 2006 09:53:14 -0700
Subject: rpms/erlang-esdl/devel - New directory
Message-ID: <200604251653.k3PGrGF2011367@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/erlang-esdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11338/erlang-esdl/devel

Log Message:
Directory /cvs/extras/rpms/erlang-esdl/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 25 16:53:34 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 25 Apr 2006 09:53:34 -0700
Subject: rpms/erlang-esdl Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604251653.k3PGraaV011428@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/erlang-esdl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11390

Added Files:
	Makefile import.log 
Log Message:
Setup of module erlang-esdl


--- NEW FILE Makefile ---
# Top level Makefile for module erlang-esdl
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 25 16:53:34 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 25 Apr 2006 09:53:34 -0700
Subject: rpms/erlang-esdl/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604251653.k3PGraiZ011432@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/erlang-esdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11390/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module erlang-esdl


--- 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 Apr 25 16:54:02 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 25 Apr 2006 09:54:02 -0700
Subject: rpms/videodog - New directory
Message-ID: <200604251654.k3PGs43Y011516@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/videodog
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11484/videodog

Log Message:
Directory /cvs/extras/rpms/videodog added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 25 16:54:02 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 25 Apr 2006 09:54:02 -0700
Subject: rpms/videodog/devel - New directory
Message-ID: <200604251654.k3PGs4ZV011522@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/videodog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11484/videodog/devel

Log Message:
Directory /cvs/extras/rpms/videodog/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 25 16:54:12 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 25 Apr 2006 09:54:12 -0700
Subject: rpms/erlang-esdl/devel erlang-esdl.spec, NONE, 1.1 .cvsignore, 1.1, 
	1.2 sources, 1.1, 1.2
Message-ID: <200604251654.k3PGsEgk011612@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/erlang-esdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11550/devel

Modified Files:
	.cvsignore sources 
Added Files:
	erlang-esdl.spec 
Log Message:
auto-import erlang-esdl-0.95.0630-4.fc5 on branch devel from erlang-esdl-0.95.0630-4.fc5.src.rpm


--- NEW FILE erlang-esdl.spec ---
Name:           erlang-esdl
Version:        0.95.0630
Release:        4%{?dist}
Summary:        Erlang OpenGL/SDL api and utilities

Group:          Development/Libraries
License:        Distributable
URL:            http://esdl.sourceforge.net
Source:		http://download.sourceforge.net/esdl/esdl-0.95.0630.src.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  SDL-devel
BuildRequires:	libGL-devel
BuildRequires:	libGLU-devel
BuildRequires:	erlang
Requires:	erlang
Provides:	esdl = %{version}-%{release}


%description
A library that gives you access to SDL and OpenGL functionality in
your Erlang program.


%package devel
Summary:	Development files for ESDL
Group:          Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description devel
Development files for ESDL.


%prep
%setup -q -n esdl-%{version}
perl -pi -e 's|INSTALLDIR = |INSTALLDIR = \$(DESTDIR)|' Makefile
perl -pi -e 's|^ERL_DIR.*|ERL_DIR:=%{_libdir}/erlang|' Makefile
find . -name '*.c' -or -name '*.h' | xargs chmod 0644


%build
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_libdir}/erlang/lib
make DESTDIR=$RPM_BUILD_ROOT install
chmod 0644 Readme
find . -name '*.html' | xargs chmod 0644
find $RPM_BUILD_ROOT%{_libdir}/erlang/lib -name 'Readme*' | xargs rm -f
find $RPM_BUILD_ROOT%{_libdir}/erlang/lib -name 'license*' | xargs rm -f
find $RPM_BUILD_ROOT%{_libdir}/erlang/lib -name '*.beam' | xargs chmod 0644
find $RPM_BUILD_ROOT%{_libdir}/erlang/lib -name '*.hrl' | xargs chmod 0644
find $RPM_BUILD_ROOT%{_libdir}/erlang/lib -name '*.erl' | xargs chmod 0644
find $RPM_BUILD_ROOT%{_libdir}/erlang/lib -name doc | xargs rm -fr
rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/esdl-%{version}/c_src


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Readme license.terms
%{_libdir}/erlang/lib/esdl-%{version}
%exclude %{_libdir}/erlang/lib/esdl-%{version}/include
%exclude %{_libdir}/erlang/lib/esdl-%{version}/src


%files devel
%defattr(-,root,root,-)
%doc doc/*.html
%{_libdir}/erlang/lib/esdl-%{version}/include
%{_libdir}/erlang/lib/esdl-%{version}/src


%changelog
* Tue Apr 25 2006 Gerard Milmeister <gemi at bluewin.ch> - 0.95.0630-4
- removed c_src directory

* Mon Apr 24 2006 Gerard Milmeister <gemi at bluewin.ch> - 0.95.0630-3
- renamed package to erlang-esdl

* Mon Apr 24 2006 Gerard Milmeister <gemi at bluewin.ch> - 0.95.0630-2
- split off devel package

* Thu Sep  8 2005 Gerard Milmeister <gemi at bluewin.ch> - 0.95.0630-1
- New Version 0.95.0630

* Sun Mar  6 2005 Gerard Milmeister <gemi at bluewin.ch> - 0.94.1025-1
- New Version 0.94.1025

* Sat Jul 17 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:0.94.0615-0.fdr.1
- New Version 0.94.0615

* Sun Apr 11 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:0.94.0125-0.fdr.1
- First Fedora release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/erlang-esdl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Apr 2006 16:53:34 -0000	1.1
+++ .cvsignore	25 Apr 2006 16:54:12 -0000	1.2
@@ -0,0 +1 @@
+esdl-0.95.0630.src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/erlang-esdl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Apr 2006 16:53:34 -0000	1.1
+++ sources	25 Apr 2006 16:54:12 -0000	1.2
@@ -0,0 +1 @@
+e892f64e9c5f6eca037757e5c38667ce  esdl-0.95.0630.src.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 16:54:11 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 25 Apr 2006 09:54:11 -0700
Subject: rpms/erlang-esdl import.log,1.1,1.2
Message-ID: <200604251654.k3PGsDA4011594@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/erlang-esdl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11550

Modified Files:
	import.log 
Log Message:
auto-import erlang-esdl-0.95.0630-4.fc5 on branch devel from erlang-esdl-0.95.0630-4.fc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/erlang-esdl/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Apr 2006 16:53:33 -0000	1.1
+++ import.log	25 Apr 2006 16:54:11 -0000	1.2
@@ -0,0 +1 @@
+erlang-esdl-0_95_0630-4_fc5:HEAD:erlang-esdl-0.95.0630-4.fc5.src.rpm:1145984043



From fedora-extras-commits at redhat.com  Tue Apr 25 16:54:14 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 25 Apr 2006 09:54:14 -0700
Subject: rpms/videodog Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604251654.k3PGsGiQ011619@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/videodog
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11592

Added Files:
	Makefile import.log 
Log Message:
Setup of module videodog


--- NEW FILE Makefile ---
# Top level Makefile for module videodog
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 25 16:54:19 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 25 Apr 2006 09:54:19 -0700
Subject: rpms/videodog/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604251654.k3PGsLOB011667@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/videodog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11592/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module videodog


--- 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 Apr 25 16:54:40 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 25 Apr 2006 09:54:40 -0700
Subject: rpms/videodog import.log,1.1,1.2
Message-ID: <200604251654.k3PGsgNm011733@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/videodog
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11699

Modified Files:
	import.log 
Log Message:
auto-import videodog-0.31-2 on branch devel from videodog-0.31-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/videodog/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Apr 2006 16:54:13 -0000	1.1
+++ import.log	25 Apr 2006 16:54:40 -0000	1.2
@@ -0,0 +1 @@
+videodog-0_31-2:HEAD:videodog-0.31-2.src.rpm:1145984075



From fedora-extras-commits at redhat.com  Tue Apr 25 16:54:41 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 25 Apr 2006 09:54:41 -0700
Subject: rpms/videodog/devel videodog.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604251654.k3PGshC2011738@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/videodog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11699/devel

Modified Files:
	.cvsignore sources 
Added Files:
	videodog.spec 
Log Message:
auto-import videodog-0.31-2 on branch devel from videodog-0.31-2.src.rpm


--- NEW FILE videodog.spec ---
Name:           videodog
Version:        0.31
Release:        2%{?dist}
Summary:        Command-line video4linux frame-grabber

Group:          Applications/Multimedia
License:        LGPL
URL:            http://paginas.terra.com.br/informatica/gleicon/video4linux/videodog.html
Source0:        http://paginas.terra.com.br/informatica/gleicon/video4linux/videodog%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	libjpeg-devel

%description
VideoDog is a command line tool to grab frames from a 
Video4linux-compliant device. It can export a file in raw, PNM, or JPG 
formats. It can also do loop capture using multiple buffers, or just be 
used to set/retrieve device data or scripts.

%prep
%setup -q -n %{name}-%{version}


%build
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_mandir}/man1 \
	$RPM_BUILD_ROOT%{_sysconfdir}
install -m 755 videodog $RPM_BUILD_ROOT%{_bindir}
install videodog.man $RPM_BUILD_ROOT%{_mandir}/man1/videodog.1
install -m 644 vd.conf $RPM_BUILD_ROOT%{_sysconfdir}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ALPHABLEND CHANGELOG CONFIG_FILE EFFECTS LICENSE MOTION README TODO USAGE
%config(noreplace) %{_sysconfdir}/vd.conf
%{_bindir}/videodog
%{_mandir}/man1/videodog.1*


%changelog
* Mon Apr 24 2006 Jima <jima at auroralinux.org> 0.31-2
- Cleaned up URLs as per Andreas Thienemann's recommendation

* Mon Apr 24 2006 Jima <jima at auroralinux.org> 0.31-1
- Initial Fedora Extras RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/videodog/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Apr 2006 16:54:19 -0000	1.1
+++ .cvsignore	25 Apr 2006 16:54:41 -0000	1.2
@@ -0,0 +1 @@
+videodog0.31.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/videodog/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Apr 2006 16:54:19 -0000	1.1
+++ sources	25 Apr 2006 16:54:41 -0000	1.2
@@ -0,0 +1 @@
+0bdc30ad64b5bbb602b351463bc26127  videodog0.31.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 16:57:30 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 25 Apr 2006 09:57:30 -0700
Subject: owners owners.list,1.893,1.894
Message-ID: <200604251657.k3PGvWYP011844@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11823

Modified Files:
	owners.list 
Log Message:
added erlang-esdl


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.893
retrieving revision 1.894
diff -u -r1.893 -r1.894
--- owners.list	25 Apr 2006 15:41:07 -0000	1.893
+++ owners.list	25 Apr 2006 16:57:30 -0000	1.894
@@ -238,6 +238,7 @@
 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|erlang|General-purpose programming language and runtime environment|gemi at bluewin.ch|extras-qa at fedoraproject.org|
+Fedora Extras|erlang-esdl|Erlang OpenGL/SDL api and utilities|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|esmtp|User configurable relay-only Mail Transfer Agent (MTA)|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|evas|A hardware-accelerated canvas API|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|exim|The exim mail transfer agent|dwmw2 at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Apr 25 17:01:53 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 25 Apr 2006 10:01:53 -0700
Subject: owners owners.list,1.894,1.895
Message-ID: <200604251702.k3PH2Tlx014126@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14107

Modified Files:
	owners.list 
Log Message:

Added dnsmasq
Added videodog



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.894
retrieving revision 1.895
diff -u -r1.894 -r1.895
--- owners.list	25 Apr 2006 16:57:30 -0000	1.894
+++ owners.list	25 Apr 2006 17:01:53 -0000	1.895
@@ -199,6 +199,7 @@
 Fedora Extras|directfb|Graphics abstraction library for the Linux Framebuffer Device|thomas at apestaart.org|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 auroralinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|docbook2X|Convert docbook into man and Texinfo|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|doctorj|Java source code analyzer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|dogtail|GUI test tool and automation framework|zcerza at redhat.com|extras-qa at fedoraproject.org|
@@ -1545,6 +1546,7 @@
 Fedora Extras|uw-imap|UW Server daemons for IMAP and POP network mail protocols|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|valknut|Direct Connect client|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|verbiste|French conjugation system|icon at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|videodog|Command-line video4linux frame-grabber|jima at auroralinux.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|vnc-ltsp-config|Easy Enabler of VNC remote LTSP desktops|rdieter at math.unl.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  Tue Apr 25 17:13:33 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Tue, 25 Apr 2006 10:13:33 -0700
Subject: fedora-security/audit fc4,1.216,1.217 fc5,1.130,1.131
Message-ID: <200604251713.k3PHDXJQ014311@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14291

Modified Files:
	fc4 fc5 
Log Message:
Note new ethereal CVE ids.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- fc4	25 Apr 2006 08:47:14 -0000	1.216
+++ fc4	25 Apr 2006 17:13:30 -0000	1.217
@@ -6,6 +6,15 @@
 CVE-2006-1991 VULNERABLE (php)
 CVE-2006-1990 VULNERABLE (php)
 CVE-2006-1942 ** firefox
+CVE-2006-1040 VULNERABLE (ethereal, fixed 0.99.0)
+CVE-2006-1039 VULNERABLE (ethereal, fixed 0.99.0)
+CVE-2006-1038 VULNERABLE (ethereal, fixed 0.99.0)
+CVE-2006-1037 VULNERABLE (ethereal, fixed 0.99.0)
+CVE-2006-1036 VULNERABLE (ethereal, fixed 0.99.0)
+CVE-2006-1035 VULNERABLE (ethereal, fixed 0.99.0)
+CVE-2006-1034 VULNERABLE (ethereal, fixed 0.99.0)
+CVE-2006-1033 VULNERABLE (ethereal, fixed 0.99.0)
+CVE-2006-1032 VULNERABLE (ethereal, fixed 0.99.0)
 CVE-2006-1931 version (ruby, fixed 1.8.3)
 CVE-2006-1902 ignore (gcc) not a vulnerability
 CVE-2006-1863 VULNERABLE (kernel, fixed 2.6.16.11)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- fc5	25 Apr 2006 08:47:14 -0000	1.130
+++ fc5	25 Apr 2006 17:13:30 -0000	1.131
@@ -6,6 +6,15 @@
 CVE-2006-1991 VULNERABLE (php)
 CVE-2006-1990 VULNERABLE (php)
 CVE-2006-1942 ** firefox
+CVE-2006-1040 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
+CVE-2006-1039 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
+CVE-2006-1038 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
+CVE-2006-1037 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
+CVE-2006-1036 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
+CVE-2006-1035 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
+CVE-2006-1034 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
+CVE-2006-1033 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
+CVE-2006-1032 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
 CVE-2006-1931 version (ruby, fixed 1.8.3)
 CVE-2006-1902 ignore (gcc) not a vulnerability
 CVE-2006-1865 version (beagle, fixed 0.2.5) [since FEDORA-2006-440]



From fedora-extras-commits at redhat.com  Tue Apr 25 17:31:01 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Tue, 25 Apr 2006 10:31:01 -0700
Subject: rpms/libsndfile/FC-5 libsndfile.spec,1.10,1.11
Message-ID: <200604251731.k3PHV3N0014444@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/libsndfile/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14427

Modified Files:
	libsndfile.spec 
Log Message:
* Thu Mar 30 2006 Andreas Thienemann <andreas at bawue.net> - 1.0.15-1
- Updated to 1.0.15



Index: libsndfile.spec
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/FC-5/libsndfile.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libsndfile.spec	16 Mar 2006 18:26:08 -0000	1.10
+++ libsndfile.spec	25 Apr 2006 17:31:00 -0000	1.11
@@ -1,6 +1,6 @@
 Summary:	Library for reading and writing sound files
 Name:		libsndfile
-Version:	1.0.14
+Version:	1.0.15
 Release:	1%{?dist}
 License:	LGPL
 Group:		System Environment/Libraries
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Thu Mar 30 2006 Andreas Thienemann <andreas at bawue.net> - 1.0.15-1
+- Updated to 1.0.15
+
 * Thu Mar 16 2006 Dams <anvil[AT]livna.org> - 1.0.14-1.fc5
 - Updated to 1.0.14
 - Dropped patch0



From fedora-extras-commits at redhat.com  Tue Apr 25 17:33:16 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Tue, 25 Apr 2006 10:33:16 -0700
Subject: rpms/libsndfile/FC-4 libsndfile.spec,1.9,1.10
Message-ID: <200604251733.k3PHXIWI014508@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/libsndfile/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14491

Modified Files:
	libsndfile.spec 
Log Message:
* Thu Mar 30 2006 Andreas Thienemann <andreas at bawue.net> - 1.0.15-1
- Updated to 1.0.15



Index: libsndfile.spec
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/FC-4/libsndfile.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libsndfile.spec	27 Jun 2005 18:19:24 -0000	1.9
+++ libsndfile.spec	25 Apr 2006 17:33:16 -0000	1.10
@@ -1,12 +1,11 @@
 Summary:	Library for reading and writing sound files
 Name:		libsndfile
-Version:	1.0.11
-Release:	3%{?dist}
+Version:	1.0.15
+Release:	1%{?dist}
 License:	LGPL
 Group:		System Environment/Libraries
 URL:		http://www.mega-nerd.com/libsndfile/
 Source0:	http://www.mega-nerd.com/libsndfile/libsndfile-%{version}.tar.gz
-Patch0:		libsndfile-1.0.11-svx-channels.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 BuildRequires:	alsa-lib-devel
@@ -32,8 +31,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .svx-channels
-
 
 %build
 %configure --disable-dependency-tracking
@@ -62,6 +59,7 @@
 %{_bindir}/sndfile-info
 %{_bindir}/sndfile-play
 %{_bindir}/sndfile-convert
+%{_bindir}/sndfile-regtest
 %{_mandir}/man1/sndfile-info.1*
 %{_mandir}/man1/sndfile-play.1*
 %{_mandir}/man1/sndfile-convert.1*
@@ -79,6 +77,13 @@
 
 
 %changelog
+* Thu Mar 30 2006 Andreas Thienemann <andreas at bawue.net> - 1.0.15-1
+- Updated to 1.0.15
+
+* Thu Mar 16 2006 Dams <anvil[AT]livna.org> - 1.0.14-1.fc5
+- Updated to 1.0.14
+- Dropped patch0
+
 * Thu May 12 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.11-3
 - rebuilt
 



From fedora-extras-commits at redhat.com  Tue Apr 25 17:34:43 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Tue, 25 Apr 2006 10:34:43 -0700
Subject: rpms/libsndfile/FC-4 libsndfile-1.0.11-svx-channels.patch,1.1,NONE
Message-ID: <200604251734.k3PHYjSE014582@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/libsndfile/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14567

Removed Files:
	libsndfile-1.0.11-svx-channels.patch 
Log Message:
Removal of unneeded patch



--- libsndfile-1.0.11-svx-channels.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 25 17:36:49 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 25 Apr 2006 10:36:49 -0700
Subject: rpms/amavisd-new/devel .cvsignore, 1.2, 1.3 amavisd-new.spec, 1.2, 
	1.3 sources, 1.2, 1.3
Message-ID: <200604251736.k3PHapB1014618@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/amavisd-new/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14597

Modified Files:
	.cvsignore amavisd-new.spec sources 
Log Message:
Update to 2.4.0.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Jan 2006 22:11:53 -0000	1.2
+++ .cvsignore	25 Apr 2006 17:36:48 -0000	1.3
@@ -1 +1 @@
-amavisd-new-2.3.3.tar.gz
+amavisd-new-2.4.0.tar.gz


Index: amavisd-new.spec
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/devel/amavisd-new.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- amavisd-new.spec	3 Feb 2006 03:25:51 -0000	1.2
+++ amavisd-new.spec	25 Apr 2006 17:36:48 -0000	1.3
@@ -2,8 +2,8 @@
 
 Summary:        Email filter with virus scanner and spamassassin support
 Name:           amavisd-new
-Version:        2.3.3
-Release:        5%{?prerelease:.%{prerelease}}%{?dist}
+Version:        2.4.0
+Release:        1%{?prerelease:.%{prerelease}}%{?dist}
 License:        GPL
 Group:          Applications/System
 URL:            http://www.ijs.si/software/amavisd/
@@ -146,6 +146,9 @@
 %ghost /var/spool/amavisd/clamd.sock
 
 %changelog
+* Tue Apr 25 2006 Steven Pritchard <steve at kspei.com> 2.4.0-1
+- Update to 2.4.0
+
 * Thu Feb 02 2006 Steven Pritchard <steve at kspei.com> 2.3.3-5
 - Add dist to Release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Jan 2006 22:11:54 -0000	1.2
+++ sources	25 Apr 2006 17:36:48 -0000	1.3
@@ -1 +1 @@
-0b02df514c1a2bf8af346bc9c7e97111  amavisd-new-2.3.3.tar.gz
+d1a3ea3244a142d8dec6dcb3e3673044  amavisd-new-2.4.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 17:41:57 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Tue, 25 Apr 2006 10:41:57 -0700
Subject: rpms/libsndfile/FC-5 sources,1.4,1.5
Message-ID: <200604251741.k3PHfxqS014689@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/libsndfile/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14672

Modified Files:
	sources 
Log Message:
* Thu Mar 30 2006 Andreas Thienemann <andreas at bawue.net> - 1.0.15-1
- Updated to 1.0.15



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Mar 2006 18:26:08 -0000	1.4
+++ sources	25 Apr 2006 17:41:57 -0000	1.5
@@ -1 +1 @@
-3513c2283f4063f57615c5b9b45bf30a  libsndfile-1.0.14.tar.gz
+4171faabfad0ce550cbe9bf1b065e976  libsndfile-1.0.15.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 17:42:12 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Tue, 25 Apr 2006 10:42:12 -0700
Subject: rpms/libsndfile/FC-4 sources,1.3,1.4
Message-ID: <200604251742.k3PHgEf4014712@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/libsndfile/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14695

Modified Files:
	sources 
Log Message:
* Thu Mar 30 2006 Andreas Thienemann <andreas at bawue.net> - 1.0.15-1
- Updated to 1.0.15



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Mar 2005 01:44:40 -0000	1.3
+++ sources	25 Apr 2006 17:42:12 -0000	1.4
@@ -1 +1 @@
-9ec0b3610041423a57387f284849f2fc  libsndfile-1.0.11.tar.gz
+4171faabfad0ce550cbe9bf1b065e976  libsndfile-1.0.15.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 18:39:20 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Tue, 25 Apr 2006 11:39:20 -0700
Subject: fedora-security/audit fc4,1.217,1.218 fc5,1.131,1.132
Message-ID: <200604251839.k3PIdK4q017463@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17438

Modified Files:
	fc4 fc5 
Log Message:
Note a firefox issue that only affects windows.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- fc4	25 Apr 2006 17:13:30 -0000	1.217
+++ fc4	25 Apr 2006 18:39:17 -0000	1.218
@@ -864,7 +864,7 @@
 CVE-2005-0004 version (mysql, fixed 4.1.10)
 CVE-2005-0003 version (kernel, fixed 2.6.10)
 CVE-2005-0001 version (kernel, fixed 2.6.10)
-CVE-2004-2657 ** firefox
+CVE-2004-2657 ignore (firefox) windows only
 CVE-2004-2655 version (xscreensaver)
 CVE-2004-2654 version (squid, fixed 2.6STABLE6)
 CVE-2004-2607 version (kernel, fixed 2.6.5)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- fc5	25 Apr 2006 17:13:30 -0000	1.131
+++ fc5	25 Apr 2006 18:39:17 -0000	1.132
@@ -864,7 +864,7 @@
 CVE-2005-0004 version (mysql, fixed 4.1.10)
 CVE-2005-0003 version (kernel, fixed 2.6.10)
 CVE-2005-0001 version (kernel, fixed 2.6.10)
-CVE-2004-2657 ** firefox
+CVE-2004-2657 ignore (firefox) windows only
 CVE-2004-2655 version (xscreensaver)
 CVE-2004-2654 version (squid, fixed 2.6STABLE6)
 CVE-2004-2607 version (kernel, fixed 2.6.5)



From fedora-extras-commits at redhat.com  Tue Apr 25 18:47:24 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Tue, 25 Apr 2006 11:47:24 -0700
Subject: rpms/apt/devel .cvsignore, 1.9, 1.10 apt.spec, 1.25, 1.26 sources,
	1.9, 1.10
Message-ID: <200604251847.k3PIlQrS017546@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/apt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17525

Modified Files:
	.cvsignore apt.spec sources 
Log Message:
Update to 0.5.15lorg3 final.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	19 Apr 2006 10:26:54 -0000	1.9
+++ .cvsignore	25 Apr 2006 18:47:24 -0000	1.10
@@ -1 +1 @@
-apt-0.5.15lorg3-rc2.tar.bz2
+apt-0.5.15lorg3.tar.bz2


Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- apt.spec	19 Apr 2006 10:26:54 -0000	1.25
+++ apt.spec	25 Apr 2006 18:47:24 -0000	1.26
@@ -6,12 +6,12 @@
 Summary:        Debian's Advanced Packaging Tool with RPM support
 Name:           apt
 Version:        0.5.15lorg3
-Release:        0.3.rc2%{?dist}
+Release:        1%{?dist}
 Group:          System Environment/Base
-URL:            http://laiskiainen.org/
+URL:            http://apt-rpm.laiskiainen.org/
 License:        GPL
 
-Source0:        http://laiskiainen.org/apt/testing/%{name}-%{version}-rc2.tar.bz2
+Source0:        http://laiskiainen.org/apt/testing/%{name}-%{version}.tar.bz2
 
 # user editable template configs
 Source1:        apt.conf
@@ -123,7 +123,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-rc2
+%setup -q
 
 # fix docs to reference correct paths
 perl -pi -e \
@@ -308,6 +308,10 @@
 
 
 %changelog
+* Tue Apr 25 2006 Axel Thimm <thimm at neu.nirvana>
+- Update to 0.5.15lorg3 final.
+- Fix URL.
+
 * Wed Apr 19 2006 Ralf Cors??pius <rc040203 at freenet.de>
 - 0.5.15lorg3-rc2.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	19 Apr 2006 10:26:54 -0000	1.9
+++ sources	25 Apr 2006 18:47:24 -0000	1.10
@@ -1 +1 @@
-f6a6bcd712ad5826e92bad68a9f508c3  apt-0.5.15lorg3-rc2.tar.bz2
+167cfdf8dea5eb1a9873a53ff546bf6a  apt-0.5.15lorg3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Apr 25 18:54:27 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Tue, 25 Apr 2006 11:54:27 -0700
Subject: fedora-security/audit fc4,1.218,1.219 fc5,1.132,1.133
Message-ID: <200604251854.k3PIsR66017619@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17599

Modified Files:
	fc4 fc5 
Log Message:
Note a kernel CVE id.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- fc4	25 Apr 2006 18:39:17 -0000	1.218
+++ fc4	25 Apr 2006 18:54:24 -0000	1.219
@@ -138,6 +138,7 @@
 CVE-2006-0645 backport (gnutls) [since FEDORA-2006-107]
 CVE-2006-0591 version (postgresql, fixed 8.0.6) [since FEDORA-2005-021]
 CVE-2006-0576 VULNERABLE (oprofile)
+CVE-2006-0558 * kernel
 CVE-2006-0557 version (kernel, fixed 2.6.15.5) [since FEDORA-2006-245] was backport since FEDORA-2006-131
 CVE-2006-0555 version (kernel, fixed 2.6.15.5) [since FEDORA-2006-245] was backport since FEDORA-2006-131
 CVE-2006-0554 version (kernel, fixed 2.6.15.5) [since FEDORA-2006-245] was backport since FEDORA-2006-131


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- fc5	25 Apr 2006 18:39:17 -0000	1.132
+++ fc5	25 Apr 2006 18:54:24 -0000	1.133
@@ -140,6 +140,7 @@
 CVE-2006-0645 version (gnutls, fixed 1.2.10)
 CVE-2006-0591 version (postgresql, fixed 8.0.6)
 CVE-2006-0576 backport (oprofile) oprofile_opcontrol.patch
+CVE-2006-0558 * kernel
 CVE-2006-0557 version (kernel, fixed 2.6.15.6) patch-2.6.16-rc6 [since FEDORA-2006-233]
 CVE-2006-0555 version (kernel, fixed 2.6.16) patch-2.6.16-rc6-git3 [since FEDORA-2006-233]
 CVE-2006-0554 version (kernel, fixed 2.6.16) patch-2.6.16-rc6 [since FEDORA-2006-233]



From fedora-extras-commits at redhat.com  Tue Apr 25 19:35:59 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 25 Apr 2006 12:35:59 -0700
Subject: rpms/amavisd-new/FC-5 .cvsignore, 1.2, 1.3 amavisd-new.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200604251936.k3PJa1v8019938@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-serv19917

Modified Files:
	.cvsignore amavisd-new.spec sources 
Log Message:
Update to 2.4.0.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Jan 2006 22:11:53 -0000	1.2
+++ .cvsignore	25 Apr 2006 19:35:59 -0000	1.3
@@ -1 +1 @@
-amavisd-new-2.3.3.tar.gz
+amavisd-new-2.4.0.tar.gz


Index: amavisd-new.spec
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/FC-5/amavisd-new.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- amavisd-new.spec	3 Feb 2006 03:25:51 -0000	1.2
+++ amavisd-new.spec	25 Apr 2006 19:35:59 -0000	1.3
@@ -2,8 +2,8 @@
 
 Summary:        Email filter with virus scanner and spamassassin support
 Name:           amavisd-new
-Version:        2.3.3
-Release:        5%{?prerelease:.%{prerelease}}%{?dist}
+Version:        2.4.0
+Release:        1%{?prerelease:.%{prerelease}}%{?dist}
 License:        GPL
 Group:          Applications/System
 URL:            http://www.ijs.si/software/amavisd/
@@ -146,6 +146,9 @@
 %ghost /var/spool/amavisd/clamd.sock
 
 %changelog
+* Tue Apr 25 2006 Steven Pritchard <steve at kspei.com> 2.4.0-1
+- Update to 2.4.0
+
 * Thu Feb 02 2006 Steven Pritchard <steve at kspei.com> 2.3.3-5
 - Add dist to Release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Jan 2006 22:11:54 -0000	1.2
+++ sources	25 Apr 2006 19:35:59 -0000	1.3
@@ -1 +1 @@
-0b02df514c1a2bf8af346bc9c7e97111  amavisd-new-2.3.3.tar.gz
+d1a3ea3244a142d8dec6dcb3e3673044  amavisd-new-2.4.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 19:37:23 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 25 Apr 2006 12:37:23 -0700
Subject: rpms/amavisd-new/FC-4 .cvsignore, 1.2, 1.3 amavisd-new.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200604251937.k3PJbPjN020005@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/amavisd-new/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19984

Modified Files:
	.cvsignore amavisd-new.spec sources 
Log Message:
Update to 2.4.0.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Jan 2006 22:11:53 -0000	1.2
+++ .cvsignore	25 Apr 2006 19:37:23 -0000	1.3
@@ -1 +1 @@
-amavisd-new-2.3.3.tar.gz
+amavisd-new-2.4.0.tar.gz


Index: amavisd-new.spec
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/FC-4/amavisd-new.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- amavisd-new.spec	3 Feb 2006 03:26:54 -0000	1.2
+++ amavisd-new.spec	25 Apr 2006 19:37:23 -0000	1.3
@@ -2,8 +2,8 @@
 
 Summary:        Email filter with virus scanner and spamassassin support
 Name:           amavisd-new
-Version:        2.3.3
-Release:        5%{?prerelease:.%{prerelease}}%{?dist}
+Version:        2.4.0
+Release:        1%{?prerelease:.%{prerelease}}%{?dist}
 License:        GPL
 Group:          Applications/System
 URL:            http://www.ijs.si/software/amavisd/
@@ -146,6 +146,9 @@
 %ghost /var/spool/amavisd/clamd.sock
 
 %changelog
+* Tue Apr 25 2006 Steven Pritchard <steve at kspei.com> 2.4.0-1
+- Update to 2.4.0
+
 * Thu Feb 02 2006 Steven Pritchard <steve at kspei.com> 2.3.3-5
 - Add dist to Release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Jan 2006 22:11:54 -0000	1.2
+++ sources	25 Apr 2006 19:37:23 -0000	1.3
@@ -1 +1 @@
-0b02df514c1a2bf8af346bc9c7e97111  amavisd-new-2.3.3.tar.gz
+d1a3ea3244a142d8dec6dcb3e3673044  amavisd-new-2.4.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 19:56:20 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 25 Apr 2006 12:56:20 -0700
Subject: rpms/dia/devel .cvsignore,1.2,1.3 dia.spec,1.7,1.8 sources,1.2,1.3
Message-ID: <200604251956.k3PJuMUJ020178@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/dia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20157

Modified Files:
	.cvsignore dia.spec sources 
Log Message:
* Tue Apr 25 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.95-1
- New upstream version 0.95 (final)
- Cleanup spec even more, correctly install the desktop file and icons,
  drop unneeded scrollkeeper-update in scripts (bz 189756)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dia/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Mar 2006 18:15:44 -0000	1.2
+++ .cvsignore	25 Apr 2006 19:56:20 -0000	1.3
@@ -1 +1 @@
-dia-0.95-pre7.tar.bz2
+dia-0.95.tar.bz2


Index: dia.spec
===================================================================
RCS file: /cvs/extras/rpms/dia/devel/dia.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dia.spec	31 Mar 2006 18:15:44 -0000	1.7
+++ dia.spec	25 Apr 2006 19:56:20 -0000	1.8
@@ -1,22 +1,18 @@
 Name: 		dia
 Version:	0.95
-%define pre     pre7
-Release:	0.%{pre}.1%{?dist}
+Release:	1%{?dist}
 Epoch:		1
-Summary:	A diagram drawing program.
+Summary:	Diagram drawing program
 Group:		Applications/Multimedia
 License:	GPL
 URL:		http://www.gnome.org/projects/dia/
-Source:		ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}-%{pre}.tar.bz2
+Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
 Patch1:         dia-0.92.2-dtd.patch
 Patch2:         dia-0.95-pre6-help.patch
 Patch3:         dia-0.94-fallbacktoxpmicons.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	intltool libgnomeui-devel python-devel pygtk2-devel
 BuildRequires:	docbook-utils docbook-style-dsssl docbook-style-xsl
-Requires:       /usr/share/desktop-menu-patches/redhat-diagrams.desktop
-Requires(post): /usr/bin/scrollkeeper-update
-Requires(postun): /usr/bin/scrollkeeper-update
 
 %description
 The Dia drawing program is designed to be like the Windows(TM) Visio
@@ -28,11 +24,10 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-%{pre}
+%setup -q
 %patch1 -p1 -b .dtd
 %patch2 -p1 -b .help
 %patch3 -p1 -b .fallbacktoxpmicons
-#rm doc/*/dia.1
 
 
 %build
@@ -44,20 +39,6 @@
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-
-# We use a symlink to the desktop-menu-patches file instead.
-#desktop-file-install --vendor net --delete-original     \
-#  --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
-#  --add-category X-Red-Hat-Extra                        \
-#  --add-category Office                                 \
-#  $RPM_BUILD_ROOT%{_datadir}/gnome/apps/Applications/dia.desktop
-
-rm $RPM_BUILD_ROOT%{_datadir}/applications/dia.desktop
-# replace desktop file for -Base case
-
-ln -sf %{_datadir}/desktop-menu-patches/redhat-diagrams.desktop $RPM_BUILD_ROOT%{_datadir}/applications/redhat-diagrams.desktop
-
 # remove scrollkeeper stuff we don't include in the package
 rm -rf $RPM_BUILD_ROOT/var
 
@@ -68,12 +49,30 @@
 # kill the plugin
 rm -f $RPM_BUILD_ROOT%{_libdir}/dia/libcairo*
 
+# below is the desktop file and icon stuff.
+desktop-file-install --vendor fedora  --delete-original \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
+  --add-category X-Fedora                               \
+  --add-category Office                                 \
+  $RPM_BUILD_ROOT%{_datadir}/applications/dia.desktop
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/dia-diagram.png   \
+  $RPM_BUILD_ROOT%{_datadir}/pixmaps/dia_gnome_icon.png \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+rmdir $RPM_BUILD_ROOT%{_datadir}/pixmaps
+
 
 %post
-scrollkeeper-update
+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
-scrollkeeper-update
+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
@@ -88,13 +87,21 @@
 %{_libdir}/dia
 %{_mandir}/*/*
 %{_datadir}/dia
-%{_datadir}/applications
+%{_datadir}/applications/fedora-dia.desktop
+%dir %{_datadir}/gnome
+%dir %{_datadir}/gnome/help
 %{_datadir}/gnome/help/dia
+%dir %{_datadir}/mime-info
 %{_datadir}/mime-info/*
-%{_datadir}/pixmaps/*
+%{_datadir}/icons/hicolor/48x48/apps/*.png
 
 
 %changelog
+* Tue Apr 25 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.95-1
+- New upstream version 0.95 (final)
+- Cleanup spec even more, correctly install the desktop file and icons,
+  drop unneeded scrollkeeper-update in scripts (bz 189756)
+
 * Fri Mar 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.95-0.pre7.1
 - Taking over as FE maintainer (bz 185886)
 - Cleanup spec to match FE packaging guidelines


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dia/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Mar 2006 18:15:44 -0000	1.2
+++ sources	25 Apr 2006 19:56:20 -0000	1.3
@@ -1 +1 @@
-c0b982162764933da17fdbfa9695408b  dia-0.95-pre7.tar.bz2
+d319921a91d4600df3578a4a64416393  dia-0.95.tar.bz2



From fedora-extras-commits at redhat.com  Tue Apr 25 20:04:06 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 25 Apr 2006 13:04:06 -0700
Subject: rpms/dia/FC-5 dia-0.95-pre6-help.patch, NONE, 1.1 .cvsignore, 1.1, 
	1.2 dia.spec, 1.8, 1.9 sources, 1.1,
	1.2 dia-0.94-CVE-2006-1550.patch, 1.1, NONE dia-0.94-gcc4.patch,
	1.1, NONE dia-0.94-gnomeflags.patch, 1.1,
	NONE dia-0.94-help.patch, 1.2, NONE dia-0.94-rh165337.patch, 1.1,
	NONE dia-0.94-svgimport-fix.patch, 1.1, NONE
Message-ID: <200604252004.k3PK48WD022389@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/dia/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22365

Modified Files:
	.cvsignore dia.spec sources 
Added Files:
	dia-0.95-pre6-help.patch 
Removed Files:
	dia-0.94-CVE-2006-1550.patch dia-0.94-gcc4.patch 
	dia-0.94-gnomeflags.patch dia-0.94-help.patch 
	dia-0.94-rh165337.patch dia-0.94-svgimport-fix.patch 
Log Message:
* Tue Apr 25 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.95-1
- New upstream version 0.95 (final)
- Cleanup spec even more, correctly install the desktop file and icons,
  drop unneeded scrollkeeper-update in scripts (bz 189756)


dia-0.95-pre6-help.patch:

--- NEW FILE dia-0.95-pre6-help.patch ---
--- dia-0.95-pre6/app/commands.c.help	2006-01-27 18:48:45.000000000 +0100
+++ dia-0.95-pre6/app/commands.c	2006-03-22 16:37:25.000000000 +0100
@@ -526,7 +526,7 @@
   const char *dentry;
   GError *error = NULL;
 
-  helpdir = dia_get_data_directory("help");
+  helpdir = g_strdup ("/usr/share/gnome/help/dia");
   if (!helpdir) {
     message_warning(_("Could not find help directory"));
     return;
@@ -554,11 +554,11 @@
 			      G_DIR_SEPARATOR_S "dia-manual.chm", NULL);
       if (!g_file_test(helpindex, G_FILE_TEST_EXISTS)) {
 	helpindex = g_strconcat(helpdir, G_DIR_SEPARATOR_S, dentry,
-			      G_DIR_SEPARATOR_S "index.html", NULL);
+			      G_DIR_SEPARATOR_S "dia.xml", NULL);
       }
 #else
       helpindex = g_strconcat(helpdir, G_DIR_SEPARATOR_S, dentry,
-			      G_DIR_SEPARATOR_S "index.html", NULL);
+			      G_DIR_SEPARATOR_S "dia.xml", NULL);
 #endif
       bestscore = score;
     }
@@ -575,7 +575,7 @@
   ShellExecuteA (0, "open", helpindex, NULL, helpdir, SW_SHOWNORMAL);
 #else
   command = getenv("BROWSER");
-  command = g_strdup_printf("%s 'file://%s' &", command ? command : "gnome-open", helpindex);
+  command = g_strdup_printf("%s '%s' &", command ? command : "yelp", helpindex);
   system(command);
   g_free(command);
 #endif
--- dia-0.95-pre6/doc/en/dia.xml.help	2006-03-22 16:33:12.000000000 +0100
+++ dia-0.95-pre6/doc/en/dia.xml	2006-03-22 16:33:13.000000000 +0100
@@ -5,7 +5,7 @@
 <!DOCTYPE book
 
   PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
   [
 
     <!ENTITY VERSION "0.95-pre6">


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dia/FC-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Oct 2005 10:54:39 -0000	1.1
+++ .cvsignore	25 Apr 2006 20:04:06 -0000	1.2
@@ -1 +1 @@
-dia-0.94.tar.bz2
+dia-0.95.tar.bz2


Index: dia.spec
===================================================================
RCS file: /cvs/extras/rpms/dia/FC-5/dia.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dia.spec	31 Mar 2006 21:52:11 -0000	1.8
+++ dia.spec	25 Apr 2006 20:04:06 -0000	1.9
@@ -1,40 +1,18 @@
-%define pango_version 1.1.5
-%define freetype_version 2.0.9
-%define libxml2_version 2.3.9
-
 Name: 		dia
-Summary:	A diagram drawing program.
-Version:	0.94
-Release:	21
+Version:	0.95
+Release:	1%{?dist}
 Epoch:		1
-Source:		ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/%{name}-%{version}.tar.bz2
+Summary:	Diagram drawing program
 Group:		Applications/Multimedia
 License:	GPL
-URL:		http://www.lysator.liu.se/~alla/dia/
+URL:		http://www.gnome.org/projects/dia/
+Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
+Patch1:         dia-0.92.2-dtd.patch
+Patch2:         dia-0.95-pre6-help.patch
+Patch3:         dia-0.94-fallbacktoxpmicons.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-Requires:	libxml2 >= %{libxml2_version}, pango >= %{pango_version}
-Requires:	glib2, gtk2, libgnome, libgnomeui, libart_lgpl, libxslt
-Requires:	scrollkeeper, freetype >= %{freetype_version}
-Requires:       /usr/share/desktop-menu-patches/redhat-diagrams.desktop
-Requires(post): /usr/bin/scrollkeeper-update
-Requires(postun): /usr/bin/scrollkeeper-update
-
-BuildRequires:	libxml2-devel >= %{libxml2_version}, intltool > 0.21
-BuildRequires:	pango-devel >= %{pango_version}
-BuildRequires:	freetype-devel >= %{freetype_version}
-BuildRequires:	glib2-devel, gtk2-devel, libgnome-devel, libgnomeui-devel
-BuildRequires:	docbook-utils docbook-dtds docbook-style-dsssl docbook-style-xsl
-BuildRequires:	openjade, libpng-devel, automake17, libart_lgpl-devel, 
-BuildRequires:  libxslt-devel, libgnome-devel
-
-Patch0: dia-0.94-svgimport-fix.patch
-Patch1: dia-0.92.2-dtd.patch
-Patch2: dia-0.94-help.patch
-Patch3: dia-0.94-gcc4.patch
-Patch4: dia-0.94-fallbacktoxpmicons.patch
-Patch5: dia-0.94-rh165337.patch
-Patch6: dia-0.94-gnomeflags.patch
-Patch7: dia-0.94-CVE-2006-1550.patch
+BuildRequires:	intltool libgnomeui-devel python-devel pygtk2-devel
+BuildRequires:	docbook-utils docbook-style-dsssl docbook-style-xsl
 
 %description
 The Dia drawing program is designed to be like the Windows(TM) Visio
@@ -44,48 +22,23 @@
 save diagrams to a custom file format, can load and save in .xml format,
 and can export to PostScript(TM).
 
-%prep
-%setup -q -n %{name}-%{version}
 
-%patch0 -p1 -b .svgimportfix
+%prep
+%setup -q
 %patch1 -p1 -b .dtd
 %patch2 -p1 -b .help
-%patch3 -p1 -b .gcc4
-%patch4 -p1 -b .fallbacktoxpmicons
-%patch5 -p1 -b .rh165337
-%patch6 -p1 -b .gnomeflags
-%patch7 -p1 -b .cve
+%patch3 -p1 -b .fallbacktoxpmicons
+
 
 %build
-rm doc/*/dia.1
-aclocal-1.7
-libtoolize --force
-automake-1.7
-autoconf
-%configure --enable-gnome --enable-db2html --with-cairo=no
-
-export GNOME_CFLAGS=`pkg-config --cflags libgnomeui-2.0 libgnome-2.0`
-export GNOME_LIBS=`pkg-config --libs libgnomeui-2.0 libgnome-2.0`
-CFLAGS=$RPM_OPT_FLAGS make
+%configure --enable-gnome --enable-db2html --with-python
+make %{?_smp_mflags}
  
+
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-
-# We use a symlink to the desktop-menu-patches file instead.
-#desktop-file-install --vendor net --delete-original     \
-#  --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
-#  --add-category X-Red-Hat-Extra                        \
-#  --add-category Office                                 \
-#  $RPM_BUILD_ROOT%{_datadir}/gnome/apps/Applications/dia.desktop
-
-rm $RPM_BUILD_ROOT%{_datadir}/applications/dia.desktop
-# replace desktop file for -Base case
-
-ln -sf %{_datadir}/desktop-menu-patches/redhat-diagrams.desktop $RPM_BUILD_ROOT%{_datadir}/applications/redhat-diagrams.desktop
-
 # remove scrollkeeper stuff we don't include in the package
 rm -rf $RPM_BUILD_ROOT/var
 
@@ -96,15 +49,36 @@
 # kill the plugin
 rm -f $RPM_BUILD_ROOT%{_libdir}/dia/libcairo*
 
+# below is the desktop file and icon stuff.
+desktop-file-install --vendor fedora  --delete-original \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
+  --add-category X-Fedora                               \
+  --add-category Office                                 \
+  $RPM_BUILD_ROOT%{_datadir}/applications/dia.desktop
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/dia-diagram.png   \
+  $RPM_BUILD_ROOT%{_datadir}/pixmaps/dia_gnome_icon.png \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+rmdir $RPM_BUILD_ROOT%{_datadir}/pixmaps
+
+
 %post
-scrollkeeper-update
+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
-scrollkeeper-update
+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 -fr $RPM_BUILD_ROOT
 
+
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog KNOWN_BUGS INSTALL NEWS README TODO THANKS doc/custom-shapes doc/diagram.dtd doc/shape.dtd doc/sheet.dtd
@@ -113,18 +87,26 @@
 %{_libdir}/dia
 %{_mandir}/*/*
 %{_datadir}/dia
-%{_datadir}/applications
+%{_datadir}/applications/fedora-dia.desktop
+%dir %{_datadir}/gnome
+%dir %{_datadir}/gnome/help
 %{_datadir}/gnome/help/dia
+%dir %{_datadir}/mime-info
 %{_datadir}/mime-info/*
-%{_datadir}/pixmaps/*
+%{_datadir}/icons/hicolor/48x48/apps/*.png
 
-%changelog
-* Fri Mar 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.94-21
-- Fix CVE-2006-1550 (bz 187556)
 
-* Fri Mar 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.94-20
-- Taking over as new FE maintainer
-- Rebuild for bz 185886
+%changelog
+* Tue Apr 25 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.95-1
+- New upstream version 0.95 (final)
+- Cleanup spec even more, correctly install the desktop file and icons,
+  drop unneeded scrollkeeper-update in scripts (bz 189756)
+
+* Fri Mar 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.95-0.pre7.1
+- Taking over as FE maintainer (bz 185886)
+- Cleanup spec to match FE packaging guidelines
+- Bump to upstream 0.95-pre7 (bz 184548)
+- Enable python plugin
 
 * Tue Jan 03 2006 Caolan McNamara <caolanm at redhat.com> 1:0.94-19
 - make buildable
@@ -321,6 +303,3 @@
 
 * Wed Apr 28 1999 Preston Brown <pbrown at redhat.com>
 - initial build for Powertools 6.0
-
-
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dia/FC-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Oct 2005 10:54:39 -0000	1.1
+++ sources	25 Apr 2006 20:04:06 -0000	1.2
@@ -1 +1 @@
-63584224912dab49fed8d2cf87ea2d85  dia-0.94.tar.bz2
+d319921a91d4600df3578a4a64416393  dia-0.95.tar.bz2


--- dia-0.94-CVE-2006-1550.patch DELETED ---


--- dia-0.94-gcc4.patch DELETED ---


--- dia-0.94-gnomeflags.patch DELETED ---


--- dia-0.94-help.patch DELETED ---


--- dia-0.94-rh165337.patch DELETED ---


--- dia-0.94-svgimport-fix.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 25 20:15:36 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 25 Apr 2006 13:15:36 -0700
Subject: rpms/dia/devel dia.spec,1.8,1.9
Message-ID: <200604252015.k3PKFcMs022496@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/dia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22479

Modified Files:
	dia.spec 
Log Message:
* Tue Apr 25 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.95-1
- New upstream version 0.95 (final)
- Cleanup spec even more, correctly install the desktop file and icons,
  drop unneeded scrollkeeper-update in scripts (bz 189756)



Index: dia.spec
===================================================================
RCS file: /cvs/extras/rpms/dia/devel/dia.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dia.spec	25 Apr 2006 19:56:20 -0000	1.8
+++ dia.spec	25 Apr 2006 20:15:35 -0000	1.9
@@ -11,8 +11,8 @@
 Patch2:         dia-0.95-pre6-help.patch
 Patch3:         dia-0.94-fallbacktoxpmicons.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-BuildRequires:	intltool libgnomeui-devel python-devel pygtk2-devel
-BuildRequires:	docbook-utils docbook-style-dsssl docbook-style-xsl
+BuildRequires:	libgnomeui-devel python-devel pygtk2-devel desktop-file-utils
+BuildRequires:	intltool docbook-utils docbook-style-dsssl docbook-style-xsl
 
 %description
 The Dia drawing program is designed to be like the Windows(TM) Visio



From fedora-extras-commits at redhat.com  Tue Apr 25 20:18:07 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 25 Apr 2006 13:18:07 -0700
Subject: rpms/dia/FC-5 dia.spec,1.9,1.10
Message-ID: <200604252018.k3PKI91t022591@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/dia/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22574

Modified Files:
	dia.spec 
Log Message:
* Tue Apr 25 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.95-1
- New upstream version 0.95 (final)
- Cleanup spec even more, correctly install the desktop file and icons,
  drop unneeded scrollkeeper-update in scripts (bz 189756)



Index: dia.spec
===================================================================
RCS file: /cvs/extras/rpms/dia/FC-5/dia.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- dia.spec	25 Apr 2006 20:04:06 -0000	1.9
+++ dia.spec	25 Apr 2006 20:18:06 -0000	1.10
@@ -11,8 +11,8 @@
 Patch2:         dia-0.95-pre6-help.patch
 Patch3:         dia-0.94-fallbacktoxpmicons.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-BuildRequires:	intltool libgnomeui-devel python-devel pygtk2-devel
-BuildRequires:	docbook-utils docbook-style-dsssl docbook-style-xsl
+BuildRequires:	libgnomeui-devel python-devel pygtk2-devel desktop-file-utils
+BuildRequires:	intltool docbook-utils docbook-style-dsssl docbook-style-xsl
 
 %description
 The Dia drawing program is designed to be like the Windows(TM) Visio



From fedora-extras-commits at redhat.com  Tue Apr 25 20:52:32 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Tue, 25 Apr 2006 13:52:32 -0700
Subject: owners owners.list,1.895,1.896
Message-ID: <200604252052.k3PKqYPa023712@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23695

Modified Files:
	owners.list 
Log Message:
Added perl-PBS



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.895
retrieving revision 1.896
diff -u -r1.895 -r1.896
--- owners.list	25 Apr 2006 17:01:53 -0000	1.895
+++ owners.list	25 Apr 2006 20:52:32 -0000	1.896
@@ -1090,6 +1090,7 @@
 Fedora Extras|perl-Parse-CPAN-Packages|Parse::CPAN::Packages Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Parse-Yapp|Perl extension for generating and using LALR parsers|pertusus at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-PatchReader|Utilities to read and manipulate patches and CVS|stickster at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-PBS|Perl binding for the Portable Batch System client library|garrick at usc.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-pmtools|A suite of small programs to help manage Perl modules|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Pod-Coverage|Checks if the documentation of a module is comprehensive|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Pod-Escapes|Perl module for resolving POD escape sequences|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Apr 25 20:54:00 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Tue, 25 Apr 2006 13:54:00 -0700
Subject: rpms/perl-PBS - New directory
Message-ID: <200604252054.k3PKs2M3023782@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/perl-PBS
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23761/perl-PBS

Log Message:
Directory /cvs/extras/rpms/perl-PBS added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 25 20:54:00 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Tue, 25 Apr 2006 13:54:00 -0700
Subject: rpms/perl-PBS/devel - New directory
Message-ID: <200604252054.k3PKs2K3023785@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/perl-PBS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23761/perl-PBS/devel

Log Message:
Directory /cvs/extras/rpms/perl-PBS/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 25 20:54:14 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Tue, 25 Apr 2006 13:54:14 -0700
Subject: rpms/perl-PBS Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604252054.k3PKsGN7023839@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/perl-PBS
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23806

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-PBS


--- NEW FILE Makefile ---
# Top level Makefile for module perl-PBS
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 25 20:54:14 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Tue, 25 Apr 2006 13:54:14 -0700
Subject: rpms/perl-PBS/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604252054.k3PKsGdV023842@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/perl-PBS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23806/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-PBS


--- 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 Apr 25 20:54:34 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Tue, 25 Apr 2006 13:54:34 -0700
Subject: rpms/perl-PBS/devel perl-PBS.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604252054.k3PKsaKP023908@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/perl-PBS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23870/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-PBS.spec 
Log Message:
auto-import perl-PBS-0.31-1 on branch devel from perl-PBS-0.31-1.src.rpm


--- NEW FILE perl-PBS.spec ---
Name:           perl-PBS
Version:        0.31
Release:        1%{?dist}
Summary:        Perl binding for the Portable Batch System client library

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://www-rcf.usc.edu/~garrick/perl-PBS/
Source0:        http://www-rcf.usc.edu/~garrick/perl-PBS/perl-PBS-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libtorque-devel
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This is a Perl binding for the Portable Batch System client library (as from
TORQUE or OpenPBS).  This allows you to stat the server, nodes, or jobs, submit
jobs, alter jobs, etc.

Specifically, the ifl, rpp, and rm APIs are implemented here.


%package -n pbstop
Summary: Full-screen curses monitor for PBS
Group: Applications/System
Version: 4.14

# torque-client is needed for pbs_iff
Requires: torque-client

# this isn't picked up by autoreq because it is eval'd in a BEGIN block
Requires: perl(PBS)

%description -n pbstop
A highly useful way to monitor your cluster in a terminal window.


%prep
%setup -q

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}

chmod ugo-x demos/*

%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/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README LICENSE Artistic demos CHANGELOG
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/PBS
%{perl_vendorarch}/PBS.pm
%{_mandir}/man3/*.3*

%files -n pbstop
%defattr(-,root,root,-)
%{_mandir}/man1/*.1*
%{_bindir}/pbstop


%changelog
* Wed Apr 19 2006 Garrick Staples <garrick at usc.edu> 0.31-1
- Initial spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-PBS/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Apr 2006 20:54:14 -0000	1.1
+++ .cvsignore	25 Apr 2006 20:54:34 -0000	1.2
@@ -0,0 +1 @@
+perl-PBS-0.31.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-PBS/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Apr 2006 20:54:14 -0000	1.1
+++ sources	25 Apr 2006 20:54:34 -0000	1.2
@@ -0,0 +1 @@
+ab776b32945db7832acfeab5fd5cfbb6  perl-PBS-0.31.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 20:54:33 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Tue, 25 Apr 2006 13:54:33 -0700
Subject: rpms/perl-PBS import.log,1.1,1.2
Message-ID: <200604252054.k3PKsanr023903@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/perl-PBS
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23870

Modified Files:
	import.log 
Log Message:
auto-import perl-PBS-0.31-1 on branch devel from perl-PBS-0.31-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-PBS/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Apr 2006 20:54:13 -0000	1.1
+++ import.log	25 Apr 2006 20:54:33 -0000	1.2
@@ -0,0 +1 @@
+perl-PBS-0_31-1:HEAD:perl-PBS-0.31-1.src.rpm:1145998355



From fedora-extras-commits at redhat.com  Tue Apr 25 21:34:08 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 25 Apr 2006 14:34:08 -0700
Subject: rpms/erlang-esdl/FC-5 erlang-esdl.spec,1.1,1.2
Message-ID: <200604252134.k3PLYAn6026773@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/erlang-esdl/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26756

Modified Files:
	erlang-esdl.spec 
Log Message:



Index: erlang-esdl.spec
===================================================================
RCS file: /cvs/extras/rpms/erlang-esdl/FC-5/erlang-esdl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- erlang-esdl.spec	25 Apr 2006 16:54:12 -0000	1.1
+++ erlang-esdl.spec	25 Apr 2006 21:34:08 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           erlang-esdl
 Version:        0.95.0630
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Erlang OpenGL/SDL api and utilities
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Tue Apr 25 21:54:42 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 25 Apr 2006 14:54:42 -0700
Subject: rpms/dnsmasq/FC-3 dnsmasq-2.30-fedora-extras.patch,1.1,1.2
Message-ID: <200604252154.k3PLsiPK026889@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26865/FC-3

Modified Files:
	dnsmasq-2.30-fedora-extras.patch 
Log Message:

Disabled dbus support for FC-3 branch (needs newer dbus to work, I guess)


dnsmasq-2.30-fedora-extras.patch:

Index: dnsmasq-2.30-fedora-extras.patch
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-3/dnsmasq-2.30-fedora-extras.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dnsmasq-2.30-fedora-extras.patch	25 Apr 2006 16:51:25 -0000	1.1
+++ dnsmasq-2.30-fedora-extras.patch	25 Apr 2006 21:54:41 -0000	1.2
@@ -13,14 +13,12 @@
 diff -urN dnsmasq-2.30/src/config.h dnsmasq-2.30-patched/src/config.h
 --- dnsmasq-2.30/src/config.h	2006-04-23 13:27:20.000000000 -0500
 +++ dnsmasq-2.30-patched/src/config.h	2006-04-24 15:04:28.000000000 -0500
-@@ -167,8 +167,8 @@
+@@ -167,7 +167,7 @@
  
  /* platform independent options- uncomment to enable */
  /* #define HAVE_BROKEN_RTC */
 -/* #define HAVE_ISC_READER */
--/* #define HAVE_DBUS */
 +#define HAVE_ISC_READER
-+#define HAVE_DBUS
+ /* #define HAVE_DBUS */
  
  #if defined(HAVE_BROKEN_RTC) && defined(HAVE_ISC_READER)
- #  error HAVE_ISC_READER is not compatible with HAVE_BROKEN_RTC



From fedora-extras-commits at redhat.com  Tue Apr 25 21:57:53 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 25 Apr 2006 14:57:53 -0700
Subject: rpms/dnsmasq/FC-3 dnsmasq.spec,1.1,1.2
Message-ID: <200604252157.k3PLvtnV026958@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26940/FC-3

Modified Files:
	dnsmasq.spec 
Log Message:

Disabled dbus support for FC-3 branch (needs newer dbus to work, I guess)



Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-3/dnsmasq.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dnsmasq.spec	25 Apr 2006 16:51:25 -0000	1.1
+++ dnsmasq.spec	25 Apr 2006 21:57:53 -0000	1.2
@@ -10,8 +10,6 @@
 Patch0:         http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-fedora-extras.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  dbus-devel
-
 Requires(post):	 /sbin/chkconfig
 Requires(post):  /sbin/service
 Requires(preun): /sbin/chkconfig
@@ -76,8 +74,7 @@
 %changelog
 * Mon Apr 24 2006 Patrick Laughton <jima at auroralinux.org> 2.30-2
 - Disabled stripping of binary while installing (oops)
-- Enabled HAVE_ISC_READER/HAVE_DBUS via patch
-- Added BuildReq for dbus-devel
+- Enabled HAVE_ISC_READER via patch
 
 * Mon Apr 24 2006 Patrick Laughton <jima at auroralinux.org> 2.30-1
 - Initial Fedora Extras RPM



From fedora-extras-commits at redhat.com  Tue Apr 25 22:09:27 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 25 Apr 2006 15:09:27 -0700
Subject: rpms/dnsmasq/FC-3 dnsmasq.spec,1.2,1.3
Message-ID: <200604252209.k3PM9TvQ029206@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29188/FC-3

Modified Files:
	dnsmasq.spec 
Log Message:

Bumping release tag



Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-3/dnsmasq.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dnsmasq.spec	25 Apr 2006 21:57:53 -0000	1.2
+++ dnsmasq.spec	25 Apr 2006 22:09:27 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           dnsmasq
 Version:        2.30
-Release:        2%{?dist}
+Release:        2%{?dist}.1
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons



From fedora-extras-commits at redhat.com  Tue Apr 25 22:13:57 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 25 Apr 2006 15:13:57 -0700
Subject: rpms/dnsmasq/FC-3 dnsmasq.spec,1.3,1.4
Message-ID: <200604252213.k3PMDxUO029316@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29299/FC-3

Modified Files:
	dnsmasq.spec 
Log Message:

'make tag' weirdness.



Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-3/dnsmasq.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dnsmasq.spec	25 Apr 2006 22:09:27 -0000	1.3
+++ dnsmasq.spec	25 Apr 2006 22:13:57 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           dnsmasq
 Version:        2.30
-Release:        2%{?dist}.1
+Release:        2%{?dist}.2
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons



From fedora-extras-commits at redhat.com  Tue Apr 25 22:19:50 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 25 Apr 2006 15:19:50 -0700
Subject: rpms/dnsmasq/FC-3 dnsmasq.spec,1.4,1.5
Message-ID: <200604252219.k3PMJqdN029385@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29368/FC-3

Modified Files:
	dnsmasq.spec 
Log Message:

Fixed changelog (sorry everybody)



Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-3/dnsmasq.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dnsmasq.spec	25 Apr 2006 22:13:57 -0000	1.4
+++ dnsmasq.spec	25 Apr 2006 22:19:50 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           dnsmasq
 Version:        2.30
-Release:        2%{?dist}.2
+Release:        2%{?dist}.3
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons
@@ -72,9 +72,13 @@
 
 
 %changelog
+* Tue Apr 25 2006 Patrick Laughton <jima at auroralinux.org> 2.30-2.fc3.3
+- Removed dbus support for FC3 (dbus version apparently too old)
+
 * Mon Apr 24 2006 Patrick Laughton <jima at auroralinux.org> 2.30-2
 - Disabled stripping of binary while installing (oops)
-- Enabled HAVE_ISC_READER via patch
+- Enabled HAVE_ISC_READER/HAVE_DBUS via patch
+- Added BuildReq for dbus-devel
 
 * Mon Apr 24 2006 Patrick Laughton <jima at auroralinux.org> 2.30-1
 - Initial Fedora Extras RPM



From fedora-extras-commits at redhat.com  Tue Apr 25 23:32:45 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 25 Apr 2006 16:32:45 -0700
Subject: rpms/perl-Log-Dispatch-FileRotate/FC-4 .cvsignore, 1.2,
	1.3 perl-Log-Dispatch-FileRotate.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200604252332.k3PNWlq9031979@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31958

Modified Files:
	.cvsignore perl-Log-Dispatch-FileRotate.spec sources 
Log Message:
- Update to 1.15.
- The author corrected the licensing terms (License: GPL or Artistic).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Apr 2006 18:00:52 -0000	1.2
+++ .cvsignore	25 Apr 2006 23:32:45 -0000	1.3
@@ -1 +1 @@
-Log-Dispatch-FileRotate-1.14.tar.gz
+Log-Dispatch-FileRotate-1.15.tar.gz


Index: perl-Log-Dispatch-FileRotate.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/FC-4/perl-Log-Dispatch-FileRotate.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Log-Dispatch-FileRotate.spec	24 Apr 2006 18:00:52 -0000	1.1
+++ perl-Log-Dispatch-FileRotate.spec	25 Apr 2006 23:32:45 -0000	1.2
@@ -1,10 +1,10 @@
 Name:           perl-Log-Dispatch-FileRotate
-Version:        1.14
+Version:        1.15
 Release:        1%{?dist}
 Summary:        Log to files that archive/rotate themselves
 
 Group:          Development/Libraries
-License:        Artistic
+License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Log-Dispatch-FileRotate/
 Source0:        http://www.cpan.org/authors/id/M/MA/MARKPF/Log-Dispatch-FileRotate-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -57,6 +57,10 @@
 
 
 %changelog
+* Wed Apr 26 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.15-1
+- Update to 1.15.
+- The author corrected the licensing terms (License: GPL or Artistic).
+
 * Mon Apr 24 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.14-1
 - Update to 1.14.
 - License: Artistic.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Apr 2006 18:00:52 -0000	1.2
+++ sources	25 Apr 2006 23:32:45 -0000	1.3
@@ -1 +1 @@
-b7cc69172d5c8b1a34c429d738bc3fa5  Log-Dispatch-FileRotate-1.14.tar.gz
+96a7984f8d55db97d676342725a6f454  Log-Dispatch-FileRotate-1.15.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 23:33:10 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 25 Apr 2006 16:33:10 -0700
Subject: rpms/perl-Log-Dispatch-FileRotate/FC-5 .cvsignore, 1.2,
	1.3 perl-Log-Dispatch-FileRotate.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200604252333.k3PNXCqi032031@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31993/FC-5

Modified Files:
	.cvsignore perl-Log-Dispatch-FileRotate.spec sources 
Log Message:
- Update to 1.15.
- The author corrected the licensing terms (License: GPL or Artistic).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Apr 2006 18:00:52 -0000	1.2
+++ .cvsignore	25 Apr 2006 23:33:10 -0000	1.3
@@ -1 +1 @@
-Log-Dispatch-FileRotate-1.14.tar.gz
+Log-Dispatch-FileRotate-1.15.tar.gz


Index: perl-Log-Dispatch-FileRotate.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/FC-5/perl-Log-Dispatch-FileRotate.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Log-Dispatch-FileRotate.spec	24 Apr 2006 18:00:52 -0000	1.1
+++ perl-Log-Dispatch-FileRotate.spec	25 Apr 2006 23:33:10 -0000	1.2
@@ -1,10 +1,10 @@
 Name:           perl-Log-Dispatch-FileRotate
-Version:        1.14
+Version:        1.15
 Release:        1%{?dist}
 Summary:        Log to files that archive/rotate themselves
 
 Group:          Development/Libraries
-License:        Artistic
+License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Log-Dispatch-FileRotate/
 Source0:        http://www.cpan.org/authors/id/M/MA/MARKPF/Log-Dispatch-FileRotate-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -57,6 +57,10 @@
 
 
 %changelog
+* Wed Apr 26 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.15-1
+- Update to 1.15.
+- The author corrected the licensing terms (License: GPL or Artistic).
+
 * Mon Apr 24 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.14-1
 - Update to 1.14.
 - License: Artistic.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Apr 2006 18:00:52 -0000	1.2
+++ sources	25 Apr 2006 23:33:10 -0000	1.3
@@ -1 +1 @@
-b7cc69172d5c8b1a34c429d738bc3fa5  Log-Dispatch-FileRotate-1.14.tar.gz
+96a7984f8d55db97d676342725a6f454  Log-Dispatch-FileRotate-1.15.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 23:33:11 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 25 Apr 2006 16:33:11 -0700
Subject: rpms/perl-Log-Dispatch-FileRotate/devel .cvsignore, 1.2,
	1.3 perl-Log-Dispatch-FileRotate.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200604252333.k3PNXDlf032037@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31993/devel

Modified Files:
	.cvsignore perl-Log-Dispatch-FileRotate.spec sources 
Log Message:
- Update to 1.15.
- The author corrected the licensing terms (License: GPL or Artistic).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Apr 2006 18:00:52 -0000	1.2
+++ .cvsignore	25 Apr 2006 23:33:11 -0000	1.3
@@ -1 +1 @@
-Log-Dispatch-FileRotate-1.14.tar.gz
+Log-Dispatch-FileRotate-1.15.tar.gz


Index: perl-Log-Dispatch-FileRotate.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/devel/perl-Log-Dispatch-FileRotate.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Log-Dispatch-FileRotate.spec	24 Apr 2006 18:00:52 -0000	1.1
+++ perl-Log-Dispatch-FileRotate.spec	25 Apr 2006 23:33:11 -0000	1.2
@@ -1,10 +1,10 @@
 Name:           perl-Log-Dispatch-FileRotate
-Version:        1.14
+Version:        1.15
 Release:        1%{?dist}
 Summary:        Log to files that archive/rotate themselves
 
 Group:          Development/Libraries
-License:        Artistic
+License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Log-Dispatch-FileRotate/
 Source0:        http://www.cpan.org/authors/id/M/MA/MARKPF/Log-Dispatch-FileRotate-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -57,6 +57,10 @@
 
 
 %changelog
+* Wed Apr 26 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.15-1
+- Update to 1.15.
+- The author corrected the licensing terms (License: GPL or Artistic).
+
 * Mon Apr 24 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.14-1
 - Update to 1.14.
 - License: Artistic.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Apr 2006 18:00:52 -0000	1.2
+++ sources	25 Apr 2006 23:33:11 -0000	1.3
@@ -1 +1 @@
-b7cc69172d5c8b1a34c429d738bc3fa5  Log-Dispatch-FileRotate-1.14.tar.gz
+96a7984f8d55db97d676342725a6f454  Log-Dispatch-FileRotate-1.15.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 26 00:14:55 2006
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu))
Date: Tue, 25 Apr 2006 17:14:55 -0700
Subject: owners owners.list,1.896,1.897
Message-ID: <200604260014.k3Q0Evd2001952@cvs-int.fedora.redhat.com>

Author: jgu

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1935

Modified Files:
	owners.list 
Log Message:
Changed module name of emacs-muse to muse



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.896
retrieving revision 1.897
diff -u -r1.896 -r1.897
--- owners.list	25 Apr 2006 20:52:32 -0000	1.896
+++ owners.list	26 Apr 2006 00:14:55 -0000	1.897
@@ -227,7 +227,6 @@
 Fedora Extras|eet|A library designed to write an arbitary set of chunks of data to a file|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|elmo|Terminal-based mail client|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|emacs-auctex|Enhanced TeX modes for Emacsen|ed at eh3.com|extras-qa at fedoraproject.org|
-Fedora Extras|emacs-muse|Emacs Muse is an authoring and publishing environment for Emacsen|jonathan.underwood at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|embryo|A C like scripting language|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|emelfm2|A file manager that implements the popular two-pane design|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|enca|Character set analyzer and detector|dmitry at butskoy.name|extras-qa at fedoraproject.org|
@@ -758,6 +757,7 @@
 Fedora Extras|multisync|Calendar (and other PIM data) synchronization program|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|multitail|View one or multiple files like tail but with multiple windows|folkert at vanheusden.com|extras-qa at fedoraproject.org|
 Fedora Extras|munin|Network-wide graphing framework (grapher/gatherer)|kevin at tummy.com|extras-qa at fedoraproject.org|
+Fedora Extras|muse|Emacs Muse is an authoring and publishing environment for Emacsen|jonathan.underwood at gmail.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|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  Wed Apr 26 00:38:33 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Tue, 25 Apr 2006 17:38:33 -0700
Subject: rpms/mftrace - New directory
Message-ID: <200604260038.k3Q0cZuX002364@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/mftrace
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2343/mftrace

Log Message:
Directory /cvs/extras/rpms/mftrace added to the repository




From fedora-extras-commits at redhat.com  Wed Apr 26 00:38:34 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Tue, 25 Apr 2006 17:38:34 -0700
Subject: rpms/mftrace/devel - New directory
Message-ID: <200604260038.k3Q0cakY002367@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/mftrace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2343/mftrace/devel

Log Message:
Directory /cvs/extras/rpms/mftrace/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Apr 26 00:38:45 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Tue, 25 Apr 2006 17:38:45 -0700
Subject: rpms/mftrace Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604260038.k3Q0clAG002421@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/mftrace
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2388

Added Files:
	Makefile import.log 
Log Message:
Setup of module mftrace


--- NEW FILE Makefile ---
# Top level Makefile for module mftrace
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 26 00:38:46 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Tue, 25 Apr 2006 17:38:46 -0700
Subject: rpms/mftrace/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604260038.k3Q0cm7B002424@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/mftrace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2388/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mftrace


--- 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 Apr 26 00:39:01 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Tue, 25 Apr 2006 17:39:01 -0700
Subject: rpms/mftrace import.log,1.1,1.2
Message-ID: <200604260039.k3Q0dXRe002488@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/mftrace
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2452

Modified Files:
	import.log 
Log Message:
auto-import mftrace-1.1.19-2 on branch devel from mftrace-1.1.19-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/mftrace/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Apr 2006 00:38:45 -0000	1.1
+++ import.log	26 Apr 2006 00:39:01 -0000	1.2
@@ -0,0 +1 @@
+mftrace-1_1_19-2:HEAD:mftrace-1.1.19-2.src.rpm:1146011952



From fedora-extras-commits at redhat.com  Wed Apr 26 00:39:02 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Tue, 25 Apr 2006 17:39:02 -0700
Subject: rpms/mftrace/devel mftrace.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604260039.k3Q0dY4D002492@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/mftrace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2452/devel

Modified Files:
	.cvsignore sources 
Added Files:
	mftrace.spec 
Log Message:
auto-import mftrace-1.1.19-2 on branch devel from mftrace-1.1.19-2.src.rpm


--- NEW FILE mftrace.spec ---
Name:		mftrace
Version:	1.1.19
Release:	2%{?dist}
Summary:	Utility for converting TeX bitmap fonts to TrueType fonts

Group:		Applications/Publishing
License:	GPL
URL:		http://www.xs4all.nl/~hanwen/mftrace/
Source0:	http://www.xs4all.nl/~hanwen/mftrace/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	python autotrace
Requires:	autotrace fontforge t1utils tetex-fonts

%description
mftrace is a small Python program that lets you trace a TeX bitmap
font into a PFA or PFB font (A PostScript Type1 Scalable Font) or TTF
(TrueType) font.

Scalable fonts offer many advantages over bitmaps, as they allow
documents to render correctly at many printer resolutions. Moreover,
Ghostscript can generate much better PDF, if given scalable PostScript
fonts.

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README.txt ChangeLog
%{_bindir}/*
%{_mandir}/man1/%{name}*
%{_datadir}/%{name}
%ghost %{_datadir}/%{name}/*.pyo


%changelog
* Tue Apr 25 2006 Quentin Spencer <qspencer at users.sourceforge.net> 1.1.19-2
- ghost .pyo files

* Thu Mar 30 2006 Quentin Spencer <qspencer at users.sourceforge.net> 1.1.19-1
- First version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mftrace/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Apr 2006 00:38:45 -0000	1.1
+++ .cvsignore	26 Apr 2006 00:39:02 -0000	1.2
@@ -0,0 +1 @@
+mftrace-1.1.19.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mftrace/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Apr 2006 00:38:45 -0000	1.1
+++ sources	26 Apr 2006 00:39:02 -0000	1.2
@@ -0,0 +1 @@
+89d5f70cdfad6ed7be146dd1b548cec1  mftrace-1.1.19.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 26 00:44:46 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Tue, 25 Apr 2006 17:44:46 -0700
Subject: owners owners.list,1.897,1.898
Message-ID: <200604260044.k3Q0im7A002619@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2602

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.897
retrieving revision 1.898
diff -u -r1.897 -r1.898
--- owners.list	26 Apr 2006 00:14:55 -0000	1.897
+++ owners.list	26 Apr 2006 00:44:46 -0000	1.898
@@ -726,6 +726,7 @@
 Fedora Extras|metakit|Embeddable database|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|mew|a great MIME mail reader for Emacs|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|mfstools|Utilities for TiVo drive upgrades|tcallawa at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|mftrace|Utility for converting TeX bitmap fonts to Type 1 or TrueType fonts|qspencer at ieee.org|extras-qa at fedoraproject.org|
 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|



From fedora-extras-commits at redhat.com  Wed Apr 26 00:47:34 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Tue, 25 Apr 2006 17:47:34 -0700
Subject: rpms/mftrace/devel mftrace.spec,1.1,1.2
Message-ID: <200604260047.k3Q0laR8002667@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/mftrace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2650

Modified Files:
	mftrace.spec 
Log Message:
Update description


Index: mftrace.spec
===================================================================
RCS file: /cvs/extras/rpms/mftrace/devel/mftrace.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mftrace.spec	26 Apr 2006 00:39:02 -0000	1.1
+++ mftrace.spec	26 Apr 2006 00:47:34 -0000	1.2
@@ -1,7 +1,7 @@
 Name:		mftrace
 Version:	1.1.19
-Release:	2%{?dist}
-Summary:	Utility for converting TeX bitmap fonts to TrueType fonts
+Release:	3%{?dist}
+Summary:	Utility for converting TeX bitmap fonts to Type 1 or TrueType fonts
 
 Group:		Applications/Publishing
 License:	GPL
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Tue Apr 25 2006 Quentin Spencer <qspencer at users.sourceforge.net> 1.1.19-3
+- Update description
+
 * Tue Apr 25 2006 Quentin Spencer <qspencer at users.sourceforge.net> 1.1.19-2
 - ghost .pyo files
 



From fedora-extras-commits at redhat.com  Wed Apr 26 01:54:37 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Tue, 25 Apr 2006 18:54:37 -0700
Subject: rpms/torque/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 torque.spec,
	1.3, 1.4
Message-ID: <200604260154.k3Q1sdTg005502@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5481

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Tue Apr 25 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.11.200604251602cvs
- bump to fix "mem" job resources for non-serial jobs
- rm.h is now installed



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Apr 2006 17:00:17 -0000	1.3
+++ .cvsignore	26 Apr 2006 01:54:37 -0000	1.4
@@ -1 +1 @@
-torque-2.1.0p0-snap.200604211036.tar.gz
+torque-2.1.0p0-snap.200604251602.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Apr 2006 17:00:17 -0000	1.3
+++ sources	26 Apr 2006 01:54:37 -0000	1.4
@@ -1 +1 @@
-3b40c0d81a06ef4abe14c3bb7522086d  torque-2.1.0p0-snap.200604211036.tar.gz
+e5172ea8627be8797664967cc3e66625  torque-2.1.0p0-snap.200604251602.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/torque.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- torque.spec	21 Apr 2006 17:00:17 -0000	1.3
+++ torque.spec	26 Apr 2006 01:54:37 -0000	1.4
@@ -2,8 +2,8 @@
 # comment out snap if building a real release
 %define name torque
 %define version 2.1.0p0
-%define snap 200604211036
-%define release 10
+%define snap 200604251602
+%define release 11
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -423,6 +423,10 @@
 
 
 %changelog
+* Tue Apr 25 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.11.200604251602cvs
+- bump to fix "mem" job resources for non-serial jobs
+- rm.h is now installed
+
 * Fri Apr 21 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.10.200604211036cvs
 - bump
 



From fedora-extras-commits at redhat.com  Wed Apr 26 01:56:22 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Tue, 25 Apr 2006 18:56:22 -0700
Subject: rpms/torque/FC-5 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 torque.spec,
	1.3, 1.4
Message-ID: <200604260156.k3Q1uOoq005569@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5548

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Tue Apr 25 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.11.200604251602cvs
- bump to fix "mem" job resources for non-serial jobs
- rm.h is now installed



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Apr 2006 17:21:01 -0000	1.3
+++ .cvsignore	26 Apr 2006 01:56:22 -0000	1.4
@@ -1 +1 @@
-torque-2.1.0p0-snap.200604211036.tar.gz
+torque-2.1.0p0-snap.200604251602.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Apr 2006 17:21:01 -0000	1.3
+++ sources	26 Apr 2006 01:56:22 -0000	1.4
@@ -1 +1 @@
-3b40c0d81a06ef4abe14c3bb7522086d  torque-2.1.0p0-snap.200604211036.tar.gz
+e5172ea8627be8797664967cc3e66625  torque-2.1.0p0-snap.200604251602.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-5/torque.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- torque.spec	21 Apr 2006 17:21:01 -0000	1.3
+++ torque.spec	26 Apr 2006 01:56:22 -0000	1.4
@@ -2,8 +2,8 @@
 # comment out snap if building a real release
 %define name torque
 %define version 2.1.0p0
-%define snap 200604211036
-%define release 10
+%define snap 200604251602
+%define release 11
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -423,6 +423,10 @@
 
 
 %changelog
+* Tue Apr 25 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.11.200604251602cvs
+- bump to fix "mem" job resources for non-serial jobs
+- rm.h is now installed
+
 * Fri Apr 21 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.10.200604211036cvs
 - bump
 



From fedora-extras-commits at redhat.com  Wed Apr 26 01:56:49 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Tue, 25 Apr 2006 18:56:49 -0700
Subject: rpms/torque/FC-4 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 torque.spec,
	1.3, 1.4
Message-ID: <200604260156.k3Q1uplQ005637@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5615

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Tue Apr 25 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.11.200604251602cvs
- bump to fix "mem" job resources for non-serial jobs
- rm.h is now installed



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Apr 2006 17:21:26 -0000	1.3
+++ .cvsignore	26 Apr 2006 01:56:49 -0000	1.4
@@ -1 +1 @@
-torque-2.1.0p0-snap.200604211036.tar.gz
+torque-2.1.0p0-snap.200604251602.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Apr 2006 17:21:26 -0000	1.3
+++ sources	26 Apr 2006 01:56:49 -0000	1.4
@@ -1 +1 @@
-3b40c0d81a06ef4abe14c3bb7522086d  torque-2.1.0p0-snap.200604211036.tar.gz
+e5172ea8627be8797664967cc3e66625  torque-2.1.0p0-snap.200604251602.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-4/torque.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- torque.spec	21 Apr 2006 17:21:26 -0000	1.3
+++ torque.spec	26 Apr 2006 01:56:49 -0000	1.4
@@ -2,8 +2,8 @@
 # comment out snap if building a real release
 %define name torque
 %define version 2.1.0p0
-%define snap 200604211036
-%define release 10
+%define snap 200604251602
+%define release 11
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -423,6 +423,10 @@
 
 
 %changelog
+* Tue Apr 25 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.11.200604251602cvs
+- bump to fix "mem" job resources for non-serial jobs
+- rm.h is now installed
+
 * Fri Apr 21 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.10.200604211036cvs
 - bump
 



From fedora-extras-commits at redhat.com  Wed Apr 26 01:57:17 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Tue, 25 Apr 2006 18:57:17 -0700
Subject: rpms/torque/FC-3 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 torque.spec,
	1.3, 1.4
Message-ID: <200604260157.k3Q1vJRH005702@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5681

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Tue Apr 25 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.11.200604251602cvs
- bump to fix "mem" job resources for non-serial jobs
- rm.h is now installed



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Apr 2006 17:21:45 -0000	1.3
+++ .cvsignore	26 Apr 2006 01:57:17 -0000	1.4
@@ -1 +1 @@
-torque-2.1.0p0-snap.200604211036.tar.gz
+torque-2.1.0p0-snap.200604251602.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Apr 2006 17:21:45 -0000	1.3
+++ sources	26 Apr 2006 01:57:17 -0000	1.4
@@ -1 +1 @@
-3b40c0d81a06ef4abe14c3bb7522086d  torque-2.1.0p0-snap.200604211036.tar.gz
+e5172ea8627be8797664967cc3e66625  torque-2.1.0p0-snap.200604251602.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-3/torque.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- torque.spec	21 Apr 2006 17:21:45 -0000	1.3
+++ torque.spec	26 Apr 2006 01:57:17 -0000	1.4
@@ -2,8 +2,8 @@
 # comment out snap if building a real release
 %define name torque
 %define version 2.1.0p0
-%define snap 200604211036
-%define release 10
+%define snap 200604251602
+%define release 11
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -423,6 +423,10 @@
 
 
 %changelog
+* Tue Apr 25 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.11.200604251602cvs
+- bump to fix "mem" job resources for non-serial jobs
+- rm.h is now installed
+
 * Fri Apr 21 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.10.200604211036cvs
 - bump
 



From fedora-extras-commits at redhat.com  Wed Apr 26 02:47:26 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Tue, 25 Apr 2006 19:47:26 -0700
Subject: rpms/gnonlin import.log,1.2,1.3
Message-ID: <200604260247.k3Q2lw5L008118@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/gnonlin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8082

Modified Files:
	import.log 
Log Message:
auto-import gnonlin-0.10.3-1 on branch devel from gnonlin-0.10.3-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnonlin/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	12 Feb 2006 02:23:49 -0000	1.2
+++ import.log	26 Apr 2006 02:47:26 -0000	1.3
@@ -1 +1,2 @@
 gnonlin-0_10_0_5-3:HEAD:gnonlin-0.10.0.5-3.src.rpm:1139711025
+gnonlin-0_10_3-1:HEAD:gnonlin-0.10.3-1.src.rpm:1146019641



From fedora-extras-commits at redhat.com  Wed Apr 26 02:47:27 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Tue, 25 Apr 2006 19:47:27 -0700
Subject: rpms/gnonlin/devel .cvsignore, 1.2, 1.3 gnonlin.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200604260248.k3Q2lxD5008123@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/gnonlin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8082/devel

Modified Files:
	.cvsignore gnonlin.spec sources 
Log Message:
auto-import gnonlin-0.10.3-1 on branch devel from gnonlin-0.10.3-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnonlin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Feb 2006 02:23:55 -0000	1.2
+++ .cvsignore	26 Apr 2006 02:47:27 -0000	1.3
@@ -1 +1 @@
-gnonlin-0.10.0.5.tar.gz
+gnonlin-0.10.3.tar.gz


Index: gnonlin.spec
===================================================================
RCS file: /cvs/extras/rpms/gnonlin/devel/gnonlin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnonlin.spec	17 Feb 2006 21:09:08 -0000	1.4
+++ gnonlin.spec	26 Apr 2006 02:47:27 -0000	1.5
@@ -1,7 +1,7 @@
 %define		gst_req	0.10.2
 Name: 		gnonlin
-Version: 	0.10.0.5
-Release:	6
+Version: 	0.10.3
+Release:	1
 Summary: 	GStreamer extension library for non-linear editing
 
 Group: 		System Environment/Libraries
@@ -59,9 +59,12 @@
 %files devel
 %defattr(-, root, root, -)
 %{_includedir}/gnl
-%{_libdir}/pkgconfig/gnonlin.pc
 
 %changelog
+* Mon Apr 25 2006 W. Michael Petullo <mike[@]flyn.org> 0.10.3-1
+- updated package to 0.10.3
+- remove gnonlin.pc 
+
 * Fri Feb 17 2006 W. Michael Petullo <mike[@]flyn.org> 0.10.0.5-6
 - bump release because of build system problem
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnonlin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Feb 2006 02:23:55 -0000	1.2
+++ sources	26 Apr 2006 02:47:27 -0000	1.3
@@ -1 +1 @@
-8c8d6935c7c3bdc05321ae85c6449212  gnonlin-0.10.0.5.tar.gz
+4fa1cebf048243e47cd590d4afed6dc6  gnonlin-0.10.3.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 26 06:36:08 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Tue, 25 Apr 2006 23:36:08 -0700
Subject: owners owners.list,1.898,1.899
Message-ID: <200604260636.k3Q6aAej017294@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17277

Modified Files:
	owners.list 
Log Message:
taking ownership of gnome-themes-extras



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.898
retrieving revision 1.899
diff -u -r1.898 -r1.899
--- owners.list	26 Apr 2006 00:44:46 -0000	1.898
+++ owners.list	26 Apr 2006 06:36:07 -0000	1.899
@@ -380,7 +380,7 @@
 Fedora Extras|gnome-telnet|A fancy GNOME telnet client|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-theme-clearlooks|An attractive GTK+ 2 engine with a focus on usability|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-theme-clearlooks-bigpack|Additional Clearlooks color schemes|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
-Fedora Extras|gnome-themes-extras|Collection of metathemes for the GNOME desktop environment|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|gnome-themes-extras|Collection of metathemes for the GNOME desktop environment|michael at knox.net.nz|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-translate|GNOME interface to libtranslate -- Natural language translator|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-vfsmm26|C++ wrapper for gnome-vfs|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-yum|GNOME Interface for YUM|toth_bandi at users.sourceforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Apr 26 06:45:28 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Tue, 25 Apr 2006 23:45:28 -0700
Subject: rpms/gnome-themes-extras/devel .cvsignore, 1.5,
	1.6 gnome-themes-extras.spec, 1.12, 1.13 sources, 1.5, 1.6
Message-ID: <200604260645.k3Q6jUaK017356@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gnome-themes-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17335

Modified Files:
	.cvsignore gnome-themes-extras.spec sources 
Log Message:
updated spec and sources



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes-extras/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Apr 2005 09:41:35 -0000	1.5
+++ .cvsignore	26 Apr 2006 06:45:28 -0000	1.6
@@ -1 +1 @@
-gnome-themes-extras-0.8.1.tar.bz2
+gnome-themes-extras-0.9.0.tar.gz


Index: gnome-themes-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes-extras/devel/gnome-themes-extras.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnome-themes-extras.spec	2 Mar 2006 21:29:57 -0000	1.12
+++ gnome-themes-extras.spec	26 Apr 2006 06:45:28 -0000	1.13
@@ -1,13 +1,13 @@
 Name:           gnome-themes-extras
-Version:        0.8.1
-Release:        1
+Version:        0.9.0
+Release:        1%{?dist}
 
-Summary:        Collection of metathemes for the GNOME desktop environment
+Summary:        Collection of metathemes for the Gnome desktop environment
 
 Group:          User Interface/Desktops
 License:        LGPL
 URL:            http://librsvg.sourceforge.net/theme.php
-Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/gnome-themes-extras/0.8/gnome-themes-extras-0.8.1.tar.bz2
+Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/gnome-themes-extras/0.9/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext gtk2-devel
@@ -20,19 +20,12 @@
 BuildArch:      noarch
 
 %description
-The GNOME themes extras package is a collection of metathemes for the GNOME
-desktop environment. This package requires that you use a GNOME 2.2 release or
-newer to work properly. The design goal of this package is to give GNOME users
+The Gnome themes extras package is a collection of metathemes for the Gnome
+desktop environment. This package requires that you use a Gnome 2.2 release or
+newer to work properly. The design goal of this package is to give Gnome users
 an extra set of themes that are not only functional, but also eye catching.
 
 %prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
-
 %setup -q
 
 %build
@@ -40,14 +33,15 @@
 make %{?_smp_mflags}
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf %{buildroot}
 %makeinstall
-%find_lang gnome-themes-extras
+
+%find_lang %{name}
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf %{buildroot}
 
-%files -f gnome-themes-extras.lang
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
 %dir %{_datadir}/icons
@@ -57,6 +51,10 @@
 
 
 %changelog
+* Tue Apr 24 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.9.0-1
+- updated version to 0.9.0
+- some house work
+
 * Mon Apr 11 2005 Adrian Reber <adrian at lisas.de> - 0.8.1-1
 - updated to 0.8.1
 - BuildArch: noarch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes-extras/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Apr 2005 09:41:35 -0000	1.5
+++ sources	26 Apr 2006 06:45:28 -0000	1.6
@@ -1 +1 @@
-0dce0d3411460d39cd57cb06d0f3012f  gnome-themes-extras-0.8.1.tar.bz2
+367cd05148b3ec663a42767d108584ed  gnome-themes-extras-0.9.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 26 06:47:19 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Tue, 25 Apr 2006 23:47:19 -0700
Subject: rpms/gnome-themes-extras/FC-5 gnome-themes-extras.spec,1.12,1.13
Message-ID: <200604260647.k3Q6lLJa017417@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gnome-themes-extras/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17400

Modified Files:
	gnome-themes-extras.spec 
Log Message:
updated spec 



Index: gnome-themes-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes-extras/FC-5/gnome-themes-extras.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnome-themes-extras.spec	2 Mar 2006 21:29:57 -0000	1.12
+++ gnome-themes-extras.spec	26 Apr 2006 06:47:19 -0000	1.13
@@ -1,13 +1,13 @@
 Name:           gnome-themes-extras
-Version:        0.8.1
-Release:        1
+Version:        0.9.0
+Release:        1%{?dist}
 
-Summary:        Collection of metathemes for the GNOME desktop environment
+Summary:        Collection of metathemes for the Gnome desktop environment
 
 Group:          User Interface/Desktops
 License:        LGPL
 URL:            http://librsvg.sourceforge.net/theme.php
-Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/gnome-themes-extras/0.8/gnome-themes-extras-0.8.1.tar.bz2
+Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/gnome-themes-extras/0.9/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext gtk2-devel
@@ -20,19 +20,12 @@
 BuildArch:      noarch
 
 %description
-The GNOME themes extras package is a collection of metathemes for the GNOME
-desktop environment. This package requires that you use a GNOME 2.2 release or
-newer to work properly. The design goal of this package is to give GNOME users
+The Gnome themes extras package is a collection of metathemes for the Gnome
+desktop environment. This package requires that you use a Gnome 2.2 release or
+newer to work properly. The design goal of this package is to give Gnome users
 an extra set of themes that are not only functional, but also eye catching.
 
 %prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
-
 %setup -q
 
 %build
@@ -40,14 +33,15 @@
 make %{?_smp_mflags}
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf %{buildroot}
 %makeinstall
-%find_lang gnome-themes-extras
+
+%find_lang %{name}
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf %{buildroot}
 
-%files -f gnome-themes-extras.lang
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
 %dir %{_datadir}/icons
@@ -57,6 +51,10 @@
 
 
 %changelog
+* Tue Apr 24 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.9.0-1
+- updated version to 0.9.0
+- some house work
+
 * Mon Apr 11 2005 Adrian Reber <adrian at lisas.de> - 0.8.1-1
 - updated to 0.8.1
 - BuildArch: noarch



From fedora-extras-commits at redhat.com  Wed Apr 26 06:48:12 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Tue, 25 Apr 2006 23:48:12 -0700
Subject: rpms/gnome-themes-extras/FC-4 gnome-themes-extras.spec,1.11,1.12
Message-ID: <200604260648.k3Q6mFRk017478@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gnome-themes-extras/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17461

Modified Files:
	gnome-themes-extras.spec 
Log Message:
updated spec



Index: gnome-themes-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes-extras/FC-4/gnome-themes-extras.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gnome-themes-extras.spec	13 Apr 2005 21:50:00 -0000	1.11
+++ gnome-themes-extras.spec	26 Apr 2006 06:48:12 -0000	1.12
@@ -1,13 +1,13 @@
 Name:           gnome-themes-extras
-Version:        0.8.1
-Release:        1
+Version:        0.9.0
+Release:        1%{?dist}
 
-Summary:        Collection of metathemes for the GNOME desktop environment
+Summary:        Collection of metathemes for the Gnome desktop environment
 
 Group:          User Interface/Desktops
 License:        LGPL
 URL:            http://librsvg.sourceforge.net/theme.php
-Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/gnome-themes-extras/0.8/gnome-themes-extras-0.8.1.tar.bz2
+Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/gnome-themes-extras/0.9/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext gtk2-devel
@@ -20,9 +20,9 @@
 BuildArch:      noarch
 
 %description
-The GNOME themes extras package is a collection of metathemes for the GNOME
-desktop environment. This package requires that you use a GNOME 2.2 release or
-newer to work properly. The design goal of this package is to give GNOME users
+The Gnome themes extras package is a collection of metathemes for the Gnome
+desktop environment. This package requires that you use a Gnome 2.2 release or
+newer to work properly. The design goal of this package is to give Gnome users
 an extra set of themes that are not only functional, but also eye catching.
 
 %prep
@@ -33,14 +33,15 @@
 make %{?_smp_mflags}
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf %{buildroot}
 %makeinstall
-%find_lang gnome-themes-extras
+
+%find_lang %{name}
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf %{buildroot}
 
-%files -f gnome-themes-extras.lang
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
 %dir %{_datadir}/icons
@@ -50,6 +51,10 @@
 
 
 %changelog
+* Tue Apr 24 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.9.0-1
+- updated version to 0.9.0
+- some house work
+
 * Mon Apr 11 2005 Adrian Reber <adrian at lisas.de> - 0.8.1-1
 - updated to 0.8.1
 - BuildArch: noarch



From fedora-extras-commits at redhat.com  Wed Apr 26 06:51:12 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Tue, 25 Apr 2006 23:51:12 -0700
Subject: rpms/gnome-themes-extras/FC-4 .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <200604260651.k3Q6pEvh017551@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gnome-themes-extras/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17532

Modified Files:
	.cvsignore sources 
Log Message:
updated sources



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes-extras/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Apr 2005 09:41:35 -0000	1.5
+++ .cvsignore	26 Apr 2006 06:51:12 -0000	1.6
@@ -1 +1 @@
-gnome-themes-extras-0.8.1.tar.bz2
+gnome-themes-extras-0.9.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes-extras/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Apr 2005 09:41:35 -0000	1.5
+++ sources	26 Apr 2006 06:51:12 -0000	1.6
@@ -1 +1 @@
-0dce0d3411460d39cd57cb06d0f3012f  gnome-themes-extras-0.8.1.tar.bz2
+367cd05148b3ec663a42767d108584ed  gnome-themes-extras-0.9.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 26 07:16:30 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Wed, 26 Apr 2006 00:16:30 -0700
Subject: rpms/gnome-themes-extras/devel .cvsignore, 1.6,
	1.7 gnome-themes-extras.spec, 1.13, 1.14 sources, 1.6, 1.7
Message-ID: <200604260716.k3Q7GWBZ019885@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gnome-themes-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19864

Modified Files:
	.cvsignore gnome-themes-extras.spec sources 
Log Message:
use bzip2'ed file instead. I thought I was already. 



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes-extras/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	26 Apr 2006 06:45:28 -0000	1.6
+++ .cvsignore	26 Apr 2006 07:16:30 -0000	1.7
@@ -1 +1 @@
-gnome-themes-extras-0.9.0.tar.gz
+gnome-themes-extras-0.9.0.tar.bz2


Index: gnome-themes-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes-extras/devel/gnome-themes-extras.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gnome-themes-extras.spec	26 Apr 2006 06:45:28 -0000	1.13
+++ gnome-themes-extras.spec	26 Apr 2006 07:16:30 -0000	1.14
@@ -1,13 +1,13 @@
 Name:           gnome-themes-extras
 Version:        0.9.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Collection of metathemes for the Gnome desktop environment
 
 Group:          User Interface/Desktops
 License:        LGPL
 URL:            http://librsvg.sourceforge.net/theme.php
-Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/gnome-themes-extras/0.9/%{name}-%{version}.tar.gz
+Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/gnome-themes-extras/0.9/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext gtk2-devel
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Wed Apr 26 2006 Michael J. Knox <michael[AT]knxo.net.nz> - 0.9.0-2
+- use bz2 tarball
+
 * Tue Apr 24 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.9.0-1
 - updated version to 0.9.0
 - some house work


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes-extras/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	26 Apr 2006 06:45:28 -0000	1.6
+++ sources	26 Apr 2006 07:16:30 -0000	1.7
@@ -1 +1 @@
-367cd05148b3ec663a42767d108584ed  gnome-themes-extras-0.9.0.tar.gz
+bac18c11fb9de8403e27441be64d9717  gnome-themes-extras-0.9.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Apr 26 07:30:33 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Wed, 26 Apr 2006 00:30:33 -0700
Subject: rpms/gnome-themes-extras/FC-5 .cvsignore, 1.5,
	1.6 gnome-themes-extras.spec, 1.13, 1.14 sources, 1.5, 1.6
Message-ID: <200604260730.k3Q7UZKg019939@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gnome-themes-extras/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19918

Modified Files:
	.cvsignore gnome-themes-extras.spec sources 
Log Message:
updated source



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes-extras/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Apr 2005 09:41:35 -0000	1.5
+++ .cvsignore	26 Apr 2006 07:30:33 -0000	1.6
@@ -1 +1 @@
-gnome-themes-extras-0.8.1.tar.bz2
+gnome-themes-extras-0.9.0.tar.bz2


Index: gnome-themes-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes-extras/FC-5/gnome-themes-extras.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gnome-themes-extras.spec	26 Apr 2006 06:47:19 -0000	1.13
+++ gnome-themes-extras.spec	26 Apr 2006 07:30:33 -0000	1.14
@@ -1,13 +1,13 @@
 Name:           gnome-themes-extras
 Version:        0.9.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Collection of metathemes for the Gnome desktop environment
 
 Group:          User Interface/Desktops
 License:        LGPL
 URL:            http://librsvg.sourceforge.net/theme.php
-Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/gnome-themes-extras/0.9/%{name}-%{version}.tar.gz
+Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/gnome-themes-extras/0.9/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext gtk2-devel
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Wed Apr 26 2006 Michael J. Knox <michael[AT]knxo.net.nz> - 0.9.0-2
+- use bz2 tarball
+
 * Tue Apr 24 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.9.0-1
 - updated version to 0.9.0
 - some house work


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes-extras/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Apr 2005 09:41:35 -0000	1.5
+++ sources	26 Apr 2006 07:30:33 -0000	1.6
@@ -1 +1 @@
-0dce0d3411460d39cd57cb06d0f3012f  gnome-themes-extras-0.8.1.tar.bz2
+bac18c11fb9de8403e27441be64d9717  gnome-themes-extras-0.9.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Apr 26 08:10:21 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Wed, 26 Apr 2006 01:10:21 -0700
Subject: rpms/gnome-themes-extras/FC-4 .cvsignore, 1.6,
	1.7 gnome-themes-extras.spec, 1.12, 1.13 sources, 1.6, 1.7
Message-ID: <200604260810.k3Q8ANO5022136@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gnome-themes-extras/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22115

Modified Files:
	.cvsignore gnome-themes-extras.spec sources 
Log Message:
updated source



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes-extras/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	26 Apr 2006 06:51:12 -0000	1.6
+++ .cvsignore	26 Apr 2006 08:10:21 -0000	1.7
@@ -1 +1 @@
-gnome-themes-extras-0.9.0.tar.gz
+gnome-themes-extras-0.9.0.tar.bz2


Index: gnome-themes-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes-extras/FC-4/gnome-themes-extras.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnome-themes-extras.spec	26 Apr 2006 06:48:12 -0000	1.12
+++ gnome-themes-extras.spec	26 Apr 2006 08:10:21 -0000	1.13
@@ -1,13 +1,13 @@
 Name:           gnome-themes-extras
 Version:        0.9.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Collection of metathemes for the Gnome desktop environment
 
 Group:          User Interface/Desktops
 License:        LGPL
 URL:            http://librsvg.sourceforge.net/theme.php
-Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/gnome-themes-extras/0.9/%{name}-%{version}.tar.gz
+Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/gnome-themes-extras/0.9/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext gtk2-devel
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Wed Apr 26 2006 Michael J. Knox <michael[AT]knxo.net.nz> - 0.9.0-2
+- use bz2 tarball
+
 * Tue Apr 24 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.9.0-1
 - updated version to 0.9.0
 - some house work


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes-extras/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	26 Apr 2006 06:51:12 -0000	1.6
+++ sources	26 Apr 2006 08:10:21 -0000	1.7
@@ -1 +1 @@
-367cd05148b3ec663a42767d108584ed  gnome-themes-extras-0.9.0.tar.gz
+bac18c11fb9de8403e27441be64d9717  gnome-themes-extras-0.9.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Apr 26 10:55:02 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Wed, 26 Apr 2006 03:55:02 -0700
Subject: rpms/rpy/devel rpy.spec,1.7,1.8
Message-ID: <200604261055.k3QAt4bV027202@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27184

Modified Files:
	rpy.spec 
Log Message:
* Wed Apr 26 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-8
- Rebuild for R-2.3.0



Index: rpy.spec
===================================================================
RCS file: /cvs/extras/rpms/rpy/devel/rpy.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rpy.spec	17 Feb 2006 11:16:57 -0000	1.7
+++ rpy.spec	26 Apr 2006 10:55:02 -0000	1.8
@@ -3,7 +3,7 @@
 Name: 		rpy
 Summary: 	Python interface to the R language
 Version:	0.4.6
-Release:	7%{?dist}
+Release:	8%{?dist}
 Url:		http://rpy.sourceforge.net
 Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
 Patch1:         rpy-install-info.patch
@@ -14,7 +14,7 @@
 BuildRequires:	R, python-numeric, python-devel, texinfo
 
 Requires:	python-numeric
-Requires:	R = 2.2.1
+Requires:	R = 2.3.0
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -66,6 +66,9 @@
 
 
 %changelog
+* 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
 - Build info docs (bz#169002).
 - Build pdf and html documentation, clean doc directory. (jamatos)



From fedora-extras-commits at redhat.com  Wed Apr 26 10:56:21 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Wed, 26 Apr 2006 03:56:21 -0700
Subject: rpms/rpy/FC-5 rpy.spec,1.7,1.8
Message-ID: <200604261056.k3QAuNgq027285@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27267

Modified Files:
	rpy.spec 
Log Message:
* Wed Apr 26 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-8
- Rebuild for R-2.3.0



Index: rpy.spec
===================================================================
RCS file: /cvs/extras/rpms/rpy/FC-5/rpy.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rpy.spec	17 Feb 2006 11:16:57 -0000	1.7
+++ rpy.spec	26 Apr 2006 10:56:21 -0000	1.8
@@ -3,7 +3,7 @@
 Name: 		rpy
 Summary: 	Python interface to the R language
 Version:	0.4.6
-Release:	7%{?dist}
+Release:	8%{?dist}
 Url:		http://rpy.sourceforge.net
 Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
 Patch1:         rpy-install-info.patch
@@ -14,7 +14,7 @@
 BuildRequires:	R, python-numeric, python-devel, texinfo
 
 Requires:	python-numeric
-Requires:	R = 2.2.1
+Requires:	R = 2.3.0
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -66,6 +66,9 @@
 
 
 %changelog
+* 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
 - Build info docs (bz#169002).
 - Build pdf and html documentation, clean doc directory. (jamatos)



From fedora-extras-commits at redhat.com  Wed Apr 26 10:56:56 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Wed, 26 Apr 2006 03:56:56 -0700
Subject: rpms/rpy/FC-4 rpy.spec,1.7,1.8
Message-ID: <200604261056.k3QAuw8K027346@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27329

Modified Files:
	rpy.spec 
Log Message:
* Wed Apr 26 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-8
- Rebuild for R-2.3.0



Index: rpy.spec
===================================================================
RCS file: /cvs/extras/rpms/rpy/FC-4/rpy.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rpy.spec	18 Feb 2006 10:51:44 -0000	1.7
+++ rpy.spec	26 Apr 2006 10:56:56 -0000	1.8
@@ -3,7 +3,7 @@
 Name: 		rpy
 Summary: 	Python interface to the R language
 Version:	0.4.6
-Release:	7%{?dist}
+Release:	8%{?dist}
 Url:		http://rpy.sourceforge.net
 Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
 Patch1:         rpy-install-info.patch
@@ -14,7 +14,7 @@
 BuildRequires:	R, python-numeric, python-devel, texinfo
 
 Requires:	python-numeric
-Requires:	R = 2.2.1
+Requires:	R = 2.3.0
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -66,6 +66,9 @@
 
 
 %changelog
+* 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
 - Build info docs (bz#169002).
 - Build pdf and html documentation, clean doc directory. (jamatos)



From fedora-extras-commits at redhat.com  Wed Apr 26 10:57:38 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Wed, 26 Apr 2006 03:57:38 -0700
Subject: rpms/rpy/FC-3 rpy.spec,1.4,1.5
Message-ID: <200604261057.k3QAveVQ027407@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27390

Modified Files:
	rpy.spec 
Log Message:
* Wed Apr 26 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-8
- Rebuild for R-2.3.0



Index: rpy.spec
===================================================================
RCS file: /cvs/extras/rpms/rpy/FC-3/rpy.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rpy.spec	3 Jan 2006 23:22:34 -0000	1.4
+++ rpy.spec	26 Apr 2006 10:57:38 -0000	1.5
@@ -3,15 +3,20 @@
 Name: 		rpy
 Summary: 	Python interface to the R language
 Version:	0.4.6
-Release:	4%{?dist}
+Release:	8%{?dist}
 Url:		http://rpy.sourceforge.net
 Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
+Patch1:         rpy-install-info.patch
 License:	GPL
 Group:		Development/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	R, python-numeric, python-devel
-Requires:	R, python-numeric
+BuildRequires:	R, python-numeric, python-devel, texinfo
+
+Requires:	python-numeric
+Requires:	R = 2.3.0
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
 
 %description
 RPy provides a robust Python interface to the R
@@ -21,36 +26,67 @@
 
 %prep
 %setup
+%patch1 -p1 -b .install-info
 
 
 %build
 env CFLAGS="$RPM_OPT_FLAGS" python setup.py build
-
+cd doc
+makeinfo --html manual.texi
+makeinfo --html manual.texi
+mv rpy manual
+make pdf
+make info
 
 %install
 rm -rf $RPM_BUILD_ROOT
 python setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
-
+cd doc
+install -d $RPM_BUILD_ROOT/%{_infodir}
+install rpy.info $RPM_BUILD_ROOT/%{_infodir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+
+%preun
+if [ $1 = 0 ]; then
+    /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
+fi
+
 
 %files
 %defattr(-,root,root)
-%doc COPYING NEWS README examples/ doc/
+%doc COPYING NEWS README examples/
+%doc doc/manual.pdf doc/manual/
+%{_infodir}/rpy.info*
 %{python_sitearch}/*
 
 
 %changelog
-* Tue Jan  3 2006 Jose' Matos <jamatos at fc.up.pt> - 0.4.6-4
+* 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
+- 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
+- Use a fixed value for R version.
+
+* 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
 - Update for R-2.2.1
 
-* Tue Oct 11 2005 Jose' 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 Jose' 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 Jose 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  Wed Apr 26 11:07:01 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Wed, 26 Apr 2006 04:07:01 -0700
Subject: rpms/rpy/FC-3 sources,1.2,1.3
Message-ID: <200604261107.k3QB73is029765@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29748

Modified Files:
	sources 
Log Message:
Sync with other branches


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rpy/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Sep 2005 16:17:23 -0000	1.2
+++ sources	26 Apr 2006 11:07:01 -0000	1.3
@@ -1 +1,2 @@
 8b5411b275c66a5409a4a3aad711d860  rpy-0.4.6.tar.gz
+0b964500da96785e22a9ee232c4e8b68  rpy-install-info.patch



From fedora-extras-commits at redhat.com  Wed Apr 26 11:28:29 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Wed, 26 Apr 2006 04:28:29 -0700
Subject: fedora-security/audit fc4,1.219,1.220 fc5,1.133,1.134
Message-ID: <200604261128.k3QBST49030211@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30191

Modified Files:
	fc4 fc5 
Log Message:
Bring up to date, fix ethereal cve names



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- fc4	25 Apr 2006 18:54:24 -0000	1.219
+++ fc4	26 Apr 2006 11:28:27 -0000	1.220
@@ -1,20 +1,20 @@
-Up to date CVE as of CVE email 20060423
-Up to date FC4 as of 20060423
+Up to date CVE as of CVE email 20060425
+Up to date FC4 as of 20060425
 
 ** are items that need attention
 
 CVE-2006-1991 VULNERABLE (php)
 CVE-2006-1990 VULNERABLE (php)
 CVE-2006-1942 ** firefox
-CVE-2006-1040 VULNERABLE (ethereal, fixed 0.99.0)
-CVE-2006-1039 VULNERABLE (ethereal, fixed 0.99.0)
-CVE-2006-1038 VULNERABLE (ethereal, fixed 0.99.0)
-CVE-2006-1037 VULNERABLE (ethereal, fixed 0.99.0)
-CVE-2006-1036 VULNERABLE (ethereal, fixed 0.99.0)
-CVE-2006-1035 VULNERABLE (ethereal, fixed 0.99.0)
-CVE-2006-1034 VULNERABLE (ethereal, fixed 0.99.0)
-CVE-2006-1033 VULNERABLE (ethereal, fixed 0.99.0)
-CVE-2006-1032 VULNERABLE (ethereal, fixed 0.99.0)
+CVE-2006-1940 VULNERABLE (ethereal, fixed 0.99.0)
+CVE-2006-1939 VULNERABLE (ethereal, fixed 0.99.0)
+CVE-2006-1938 VULNERABLE (ethereal, fixed 0.99.0)
+CVE-2006-1937 VULNERABLE (ethereal, fixed 0.99.0)
+CVE-2006-1936 VULNERABLE (ethereal, fixed 0.99.0)
+CVE-2006-1935 VULNERABLE (ethereal, fixed 0.99.0)
+CVE-2006-1934 VULNERABLE (ethereal, fixed 0.99.0)
+CVE-2006-1933 VULNERABLE (ethereal, fixed 0.99.0)
+CVE-2006-1932 VULNERABLE (ethereal, fixed 0.99.0)
 CVE-2006-1931 version (ruby, fixed 1.8.3)
 CVE-2006-1902 ignore (gcc) not a vulnerability
 CVE-2006-1863 VULNERABLE (kernel, fixed 2.6.16.11)
@@ -693,6 +693,7 @@
 CVE-2005-0654 ignore (gimp, not fixed 2.2) upstream considers harmless
 CVE-2005-0627 version (qt, fixed 3.3.4)
 CVE-2005-0626 version (squid, fixed 2.5.STABLE10) [since FEDORA-2005-913] was backport since GA
+CVE-2005-0611 version (HelixPlayer, fixed 1.0.3)
 CVE-2005-0605 backport (xorg-x11) ...-fix-CAN-2005-0605.patch
 CVE-2005-0605 ** openmotif
 CVE-2005-0602 VULNERABLE (unzip, fixed 5.52) not in srpm
@@ -738,6 +739,7 @@
 CVE-2005-0469 backport (telnet) telnet-0.17-CAN-2005-468_469.patch
 CVE-2005-0468 version (krb5, fixed 1.4.1) [since FEDORA-2005-553] was backport since GA
 CVE-2005-0468 backport (telnet) telnet-0.17-CAN-2005-468_469.patch
+CVE-2005-0455 version (HelixPlayer, fixed 1.0.3)
 CVE-2005-0449 version (kernel, fixed 2.6.11)
 CVE-2005-0448 version (perl, fixed 5.8.6) bz#173793
 CVE-2005-0446 version (squid, fixed 2.5.STABLE9)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- fc5	25 Apr 2006 18:54:24 -0000	1.133
+++ fc5	26 Apr 2006 11:28:27 -0000	1.134
@@ -1,20 +1,20 @@
-Up to date CVE as of CVE email 20060423
-Up to date FC5 as of 20060423
+Up to date CVE as of CVE email 20060425
+Up to date FC5 as of 20060425
 
 ** are items that need attention
 
 CVE-2006-1991 VULNERABLE (php)
 CVE-2006-1990 VULNERABLE (php)
 CVE-2006-1942 ** firefox
-CVE-2006-1040 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
-CVE-2006-1039 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
-CVE-2006-1038 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
-CVE-2006-1037 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
-CVE-2006-1036 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
-CVE-2006-1035 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
-CVE-2006-1034 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
-CVE-2006-1033 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
-CVE-2006-1032 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
+CVE-2006-1940 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
+CVE-2006-1939 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
+CVE-2006-1938 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
+CVE-2006-1937 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
+CVE-2006-1936 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
+CVE-2006-1935 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
+CVE-2006-1934 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
+CVE-2006-1933 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
+CVE-2006-1932 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
 CVE-2006-1931 version (ruby, fixed 1.8.3)
 CVE-2006-1902 ignore (gcc) not a vulnerability
 CVE-2006-1865 version (beagle, fixed 0.2.5) [since FEDORA-2006-440]
@@ -692,6 +692,7 @@
 CVE-2005-0654 ignore (gimp, not fixed 2.2) upstream considers harmless
 CVE-2005-0627 version (qt, fixed 3.3.4)
 CVE-2005-0626 version (squid, fixed 2.5.STABLE10)
+CVE-2005-0611 version (HelixPlayer, fixed 1.0.3)
 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
@@ -738,6 +739,7 @@
 CVE-2005-0469 backport (telnet) telnet-0.17-CAN-2005-468_469.patch
 CVE-2005-0468 version (krb5, fixed 1.4.1)
 CVE-2005-0468 backport (telnet) telnet-0.17-CAN-2005-468_469.patch
+CVE-2005-0455 version (HelixPlayer, fixed 1.0.3)
 CVE-2005-0449 version (kernel, fixed 2.6.11)
 CVE-2005-0448 version (perl, fixed 5.8.6) bz#173793
 CVE-2005-0446 version (squid, fixed 2.5.STABLE9)



From fedora-extras-commits at redhat.com  Wed Apr 26 11:47:36 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Wed, 26 Apr 2006 04:47:36 -0700
Subject: rpms/rpy/devel rpy-rversion.patch,NONE,1.1 rpy.spec,1.8,1.9
Message-ID: <200604261147.k3QBlcIi030268@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30248

Modified Files:
	rpy.spec 
Added Files:
	rpy-rversion.patch 
Log Message:
* Wed Apr 26 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-9
- Fix detection of R version.


rpy-rversion.patch:

--- NEW FILE rpy-rversion.patch ---
diff -ur rpy-0.4.6/rpy_tools.py rpy-0.4.6-new/rpy_tools.py
--- rpy-0.4.6/rpy_tools.py	2005-07-28 05:47:47.000000000 +0100
+++ rpy-0.4.6-new/rpy_tools.py	2006-04-26 12:37:16.000000000 +0100
@@ -93,7 +93,7 @@
     if stat or len(output)<=0:
       raise RuntimeError("Couldn't execute the R interpreter" +
                          " `%s'.\n" % rexec )
-    version = re.search("R +([0-9]\.[0-9]\.[0-9])", output)
+    version = re.search("R version +([0-9]\.[0-9]\.[0-9])", output)
     if not version:
       raise RuntimeError("Couldn't obtain version number from output\n"
                                "of `R --version'.\n")


Index: rpy.spec
===================================================================
RCS file: /cvs/extras/rpms/rpy/devel/rpy.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rpy.spec	26 Apr 2006 10:55:02 -0000	1.8
+++ rpy.spec	26 Apr 2006 11:47:36 -0000	1.9
@@ -3,10 +3,11 @@
 Name: 		rpy
 Summary: 	Python interface to the R language
 Version:	0.4.6
-Release:	8%{?dist}
+Release:	9%{?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)
@@ -27,7 +28,7 @@
 %prep
 %setup
 %patch1 -p1 -b .install-info
-
+%patch2 -p1
 
 %build
 env CFLAGS="$RPM_OPT_FLAGS" python setup.py build
@@ -66,6 +67,9 @@
 
 
 %changelog
+* 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
 - Rebuild for R-2.3.0
 



From fedora-extras-commits at redhat.com  Wed Apr 26 11:52:00 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Wed, 26 Apr 2006 04:52:00 -0700
Subject: rpms/rpy/FC-5 rpy-rversion.patch,NONE,1.1 rpy.spec,1.8,1.9
Message-ID: <200604261152.k3QBq2OB030302@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30281

Modified Files:
	rpy.spec 
Added Files:
	rpy-rversion.patch 
Log Message:
* Wed Apr 26 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-9
- Fix detection of R version.


rpy-rversion.patch:

--- NEW FILE rpy-rversion.patch ---
diff -ur rpy-0.4.6/rpy_tools.py rpy-0.4.6-new/rpy_tools.py
--- rpy-0.4.6/rpy_tools.py	2005-07-28 05:47:47.000000000 +0100
+++ rpy-0.4.6-new/rpy_tools.py	2006-04-26 12:37:16.000000000 +0100
@@ -93,7 +93,7 @@
     if stat or len(output)<=0:
       raise RuntimeError("Couldn't execute the R interpreter" +
                          " `%s'.\n" % rexec )
-    version = re.search("R +([0-9]\.[0-9]\.[0-9])", output)
+    version = re.search("R version +([0-9]\.[0-9]\.[0-9])", output)
     if not version:
       raise RuntimeError("Couldn't obtain version number from output\n"
                                "of `R --version'.\n")


Index: rpy.spec
===================================================================
RCS file: /cvs/extras/rpms/rpy/FC-5/rpy.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rpy.spec	26 Apr 2006 10:56:21 -0000	1.8
+++ rpy.spec	26 Apr 2006 11:52:00 -0000	1.9
@@ -3,10 +3,11 @@
 Name: 		rpy
 Summary: 	Python interface to the R language
 Version:	0.4.6
-Release:	8%{?dist}
+Release:	9%{?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)
@@ -27,7 +28,7 @@
 %prep
 %setup
 %patch1 -p1 -b .install-info
-
+%patch2 -p1
 
 %build
 env CFLAGS="$RPM_OPT_FLAGS" python setup.py build
@@ -66,6 +67,9 @@
 
 
 %changelog
+* 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
 - Rebuild for R-2.3.0
 



From fedora-extras-commits at redhat.com  Wed Apr 26 11:52:42 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Wed, 26 Apr 2006 04:52:42 -0700
Subject: rpms/rpy/FC-4 rpy-rversion.patch,NONE,1.1 rpy.spec,1.8,1.9
Message-ID: <200604261152.k3QBqiH5030334@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30314

Modified Files:
	rpy.spec 
Added Files:
	rpy-rversion.patch 
Log Message:
* Wed Apr 26 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-9
- Fix detection of R version.


rpy-rversion.patch:

--- NEW FILE rpy-rversion.patch ---
diff -ur rpy-0.4.6/rpy_tools.py rpy-0.4.6-new/rpy_tools.py
--- rpy-0.4.6/rpy_tools.py	2005-07-28 05:47:47.000000000 +0100
+++ rpy-0.4.6-new/rpy_tools.py	2006-04-26 12:37:16.000000000 +0100
@@ -93,7 +93,7 @@
     if stat or len(output)<=0:
       raise RuntimeError("Couldn't execute the R interpreter" +
                          " `%s'.\n" % rexec )
-    version = re.search("R +([0-9]\.[0-9]\.[0-9])", output)
+    version = re.search("R version +([0-9]\.[0-9]\.[0-9])", output)
     if not version:
       raise RuntimeError("Couldn't obtain version number from output\n"
                                "of `R --version'.\n")


Index: rpy.spec
===================================================================
RCS file: /cvs/extras/rpms/rpy/FC-4/rpy.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rpy.spec	26 Apr 2006 10:56:56 -0000	1.8
+++ rpy.spec	26 Apr 2006 11:52:42 -0000	1.9
@@ -3,10 +3,11 @@
 Name: 		rpy
 Summary: 	Python interface to the R language
 Version:	0.4.6
-Release:	8%{?dist}
+Release:	9%{?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)
@@ -27,7 +28,7 @@
 %prep
 %setup
 %patch1 -p1 -b .install-info
-
+%patch2 -p1
 
 %build
 env CFLAGS="$RPM_OPT_FLAGS" python setup.py build
@@ -66,6 +67,9 @@
 
 
 %changelog
+* 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
 - Rebuild for R-2.3.0
 



From fedora-extras-commits at redhat.com  Wed Apr 26 11:55:37 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Wed, 26 Apr 2006 04:55:37 -0700
Subject: rpms/rpy/FC-3 rpy-rversion.patch,NONE,1.1 rpy.spec,1.5,1.6
Message-ID: <200604261155.k3QBtdN8030371@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30351

Modified Files:
	rpy.spec 
Added Files:
	rpy-rversion.patch 
Log Message:
* Wed Apr 26 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-9
- Fix detection of R version.


rpy-rversion.patch:

--- NEW FILE rpy-rversion.patch ---
diff -ur rpy-0.4.6/rpy_tools.py rpy-0.4.6-new/rpy_tools.py
--- rpy-0.4.6/rpy_tools.py	2005-07-28 05:47:47.000000000 +0100
+++ rpy-0.4.6-new/rpy_tools.py	2006-04-26 12:37:16.000000000 +0100
@@ -93,7 +93,7 @@
     if stat or len(output)<=0:
       raise RuntimeError("Couldn't execute the R interpreter" +
                          " `%s'.\n" % rexec )
-    version = re.search("R +([0-9]\.[0-9]\.[0-9])", output)
+    version = re.search("R version +([0-9]\.[0-9]\.[0-9])", output)
     if not version:
       raise RuntimeError("Couldn't obtain version number from output\n"
                                "of `R --version'.\n")


Index: rpy.spec
===================================================================
RCS file: /cvs/extras/rpms/rpy/FC-3/rpy.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rpy.spec	26 Apr 2006 10:57:38 -0000	1.5
+++ rpy.spec	26 Apr 2006 11:55:37 -0000	1.6
@@ -3,10 +3,11 @@
 Name: 		rpy
 Summary: 	Python interface to the R language
 Version:	0.4.6
-Release:	8%{?dist}
+Release:	9%{?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)
@@ -27,7 +28,7 @@
 %prep
 %setup
 %patch1 -p1 -b .install-info
-
+%patch2 -p1
 
 %build
 env CFLAGS="$RPM_OPT_FLAGS" python setup.py build
@@ -66,6 +67,9 @@
 
 
 %changelog
+* 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
 - Rebuild for R-2.3.0
 



From fedora-extras-commits at redhat.com  Wed Apr 26 14:03:56 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 26 Apr 2006 07:03:56 -0700
Subject: rpms/openct/devel .cvsignore, 1.5, 1.6 openct.spec, 1.10,
	1.11 sources, 1.5, 1.6
Message-ID: <200604261403.k3QE3wqa004861@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/openct/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4840

Modified Files:
	.cvsignore openct.spec sources 
Log Message:
* Wed Apr 26 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.6.7-0.1.rc4
- 0.6.7-rc4.
- Re-enable PCSC hotplug in pcsc-lite subpackage.
- Include license text.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	22 Apr 2006 20:35:04 -0000	1.5
+++ .cvsignore	26 Apr 2006 14:03:56 -0000	1.6
@@ -1 +1 @@
-openct-0.6.7-rc1.tar.gz
+openct-0.6.7-rc4.tar.gz


Index: openct.spec
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/openct.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- openct.spec	22 Apr 2006 20:35:04 -0000	1.10
+++ openct.spec	26 Apr 2006 14:03:56 -0000	1.11
@@ -2,13 +2,13 @@
 
 Name:           openct
 Version:        0.6.7
-Release:        0.1.rc1%{?dist}
+Release:        0.1.rc4%{?dist}
 Summary:        Middleware framework for smart card terminals
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://www.opensc-project.org/
-Source0:        http://www.opensc-project.org/files/openct/testing/%{name}-%{version}-rc1.tar.gz
+Source0:        http://www.opensc-project.org/files/openct/testing/%{name}-%{version}-rc4.tar.gz
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,14 +53,18 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-rc1
+%setup -q -n %{name}-%{version}-rc4
 sh bootstrap # avoid standard rpaths on lib64 archs
-sed -ie 's|LIBDIR|%{dropdir}|' etc/reader.conf.in
-sed -ie 's|/etc/hotplug/usb/openct|%{_libdir}/openct/hotplug|' etc/openct.udev
+sed -i -e 's|^\([A-Z]\)|# \1|' etc/reader.conf.in
+sed -i -e 's|/etc/hotplug/usb/openct|%{_libdir}/openct/hotplug|' \
+    etc/openct.udev
 
 
 %build
-%configure --disable-dependency-tracking --disable-static
+%configure \
+    --disable-dependency-tracking \
+    --disable-static \
+    --with-bundle-dir=%{dropdir}
 make %{?_smp_mflags}
 
 
@@ -68,11 +72,8 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-install -dm 755 $RPM_BUILD_ROOT%{dropdir}
-mv $RPM_BUILD_ROOT%{_libdir}/openct-ifd.so $RPM_BUILD_ROOT%{dropdir}
-
 install -Dpm 644 etc/openct.udev \
-  $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-openct.rules
+    $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-openct.rules
 install -Dpm 755 etc/hotplug.openct $RPM_BUILD_ROOT%{_libdir}/openct/hotplug
 
 install -pm 644 etc/openct.conf $RPM_BUILD_ROOT%{_sysconfdir}/openct.conf
@@ -81,14 +82,16 @@
 
 install -Dpm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/openct
 
+so=$(find $RPM_BUILD_ROOT%{dropdir} -name \*.so | sed "s|^$RPM_BUILD_ROOT||")
+sed -i -e "s|\\(LIBPATH\\s*\\).*|\\1$so|" etc/reader.conf
 install -Dpm 644 etc/reader.conf \
-  $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/%{name}.conf
+    $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/%{name}.conf
 
 install -dm 755 $RPM_BUILD_ROOT%{_localstatedir}/run/openct
 touch $RPM_BUILD_ROOT%{_localstatedir}/run/openct/status
 chmod 644 $RPM_BUILD_ROOT%{_localstatedir}/run/openct/status
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/{*.la,openct-ifd.so}
 
 
 %clean
@@ -101,19 +104,19 @@
 
 %preun
 if [ $1 -eq 0 ] ; then
-  %{_initrddir}/openct stop >/dev/null 2>&1 || :
-  /sbin/chkconfig --del openct
+    %{_initrddir}/openct stop >/dev/null 2>&1 || :
+    /sbin/chkconfig --del openct
 fi
 
 %postun
 /sbin/ldconfig
 if [ $1 -gt 0 ] ; then
-  %{_initrddir}/openct try-restart >/dev/null || :
+    %{_initrddir}/openct try-restart >/dev/null || :
 fi
 
 %post -n pcsc-lite-%{name}
 if [ $1 -eq 1 ] ; then
-  %{_initrddir}/pcscd try-restart >/dev/null 2>&1 || :
+    %{_initrddir}/pcscd try-restart >/dev/null 2>&1 || :
 fi
 
 %postun -n pcsc-lite-%{name}
@@ -122,7 +125,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc NEWS TODO doc/*.html doc/*.css
+%doc LGPL-2.1 NEWS TODO doc/*.html doc/*.css
 %config(noreplace) %{_sysconfdir}/openct.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/openct
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*openct.rules
@@ -148,10 +151,15 @@
 %files -n pcsc-lite-%{name}
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/reader.conf.d/%{name}.conf
-%{dropdir}/openct-ifd.so
+%{dropdir}/openct-ifd.bundle/
 
 
 %changelog
+* Wed Apr 26 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.6.7-0.1.rc4
+- 0.6.7-rc4.
+- Re-enable PCSC hotplug in pcsc-lite subpackage.
+- Include license text.
+
 * Sat Apr 22 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.6.7-0.1.rc1
 - 0.6.7-rc1, udev rules and reader.conf included upstream.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	22 Apr 2006 20:35:04 -0000	1.5
+++ sources	26 Apr 2006 14:03:56 -0000	1.6
@@ -1 +1 @@
-8ad0e54afa2c3ac0073cfd12238e6c48  openct-0.6.7-rc1.tar.gz
+261d40f71696a9a2ae168ae09e18f124  openct-0.6.7-rc4.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 26 14:44:19 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Wed, 26 Apr 2006 07:44:19 -0700
Subject: rpms/rpy/devel rpy.spec,1.9,1.10
Message-ID: <200604261444.k3QEiLnI005474@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5457

Modified Files:
	rpy.spec 
Log Message:
* Wed Apr 26 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-10
- BuildRequires tetex for "make pdf" (pdftex).



Index: rpy.spec
===================================================================
RCS file: /cvs/extras/rpms/rpy/devel/rpy.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rpy.spec	26 Apr 2006 11:47:36 -0000	1.9
+++ rpy.spec	26 Apr 2006 14:44:19 -0000	1.10
@@ -3,7 +3,7 @@
 Name: 		rpy
 Summary: 	Python interface to the R language
 Version:	0.4.6
-Release:	9%{?dist}
+Release:	10%{?dist}
 Url:		http://rpy.sourceforge.net
 Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
 Patch1:         rpy-install-info.patch
@@ -12,7 +12,7 @@
 Group:		Development/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	R, python-numeric, python-devel, texinfo
+BuildRequires:	R, python-numeric, python-devel, texinfo, tetex
 
 Requires:	python-numeric
 Requires:	R = 2.3.0
@@ -67,6 +67,9 @@
 
 
 %changelog
+* 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
 - Fix detection of R version.
 



From fedora-extras-commits at redhat.com  Wed Apr 26 14:44:52 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Wed, 26 Apr 2006 07:44:52 -0700
Subject: rpms/rpy/FC-5 rpy.spec,1.9,1.10
Message-ID: <200604261444.k3QEiswT005536@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5519

Modified Files:
	rpy.spec 
Log Message:
* Wed Apr 26 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-10
- BuildRequires tetex for "make pdf" (pdftex).



Index: rpy.spec
===================================================================
RCS file: /cvs/extras/rpms/rpy/FC-5/rpy.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rpy.spec	26 Apr 2006 11:52:00 -0000	1.9
+++ rpy.spec	26 Apr 2006 14:44:52 -0000	1.10
@@ -3,7 +3,7 @@
 Name: 		rpy
 Summary: 	Python interface to the R language
 Version:	0.4.6
-Release:	9%{?dist}
+Release:	10%{?dist}
 Url:		http://rpy.sourceforge.net
 Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
 Patch1:         rpy-install-info.patch
@@ -12,7 +12,7 @@
 Group:		Development/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	R, python-numeric, python-devel, texinfo
+BuildRequires:	R, python-numeric, python-devel, texinfo, tetex
 
 Requires:	python-numeric
 Requires:	R = 2.3.0
@@ -67,6 +67,9 @@
 
 
 %changelog
+* 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
 - Fix detection of R version.
 



From fedora-extras-commits at redhat.com  Wed Apr 26 14:45:27 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Wed, 26 Apr 2006 07:45:27 -0700
Subject: rpms/rpy/FC-4 rpy.spec,1.9,1.10
Message-ID: <200604261445.k3QEjTw8005601@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5584

Modified Files:
	rpy.spec 
Log Message:
* Wed Apr 26 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-10
- BuildRequires tetex for "make pdf" (pdftex).



Index: rpy.spec
===================================================================
RCS file: /cvs/extras/rpms/rpy/FC-4/rpy.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rpy.spec	26 Apr 2006 11:52:42 -0000	1.9
+++ rpy.spec	26 Apr 2006 14:45:26 -0000	1.10
@@ -3,7 +3,7 @@
 Name: 		rpy
 Summary: 	Python interface to the R language
 Version:	0.4.6
-Release:	9%{?dist}
+Release:	10%{?dist}
 Url:		http://rpy.sourceforge.net
 Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
 Patch1:         rpy-install-info.patch
@@ -12,7 +12,7 @@
 Group:		Development/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	R, python-numeric, python-devel, texinfo
+BuildRequires:	R, python-numeric, python-devel, texinfo, tetex
 
 Requires:	python-numeric
 Requires:	R = 2.3.0
@@ -67,6 +67,9 @@
 
 
 %changelog
+* 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
 - Fix detection of R version.
 



From fedora-extras-commits at redhat.com  Wed Apr 26 14:45:58 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Wed, 26 Apr 2006 07:45:58 -0700
Subject: rpms/rpy/FC-3 rpy.spec,1.6,1.7
Message-ID: <200604261446.k3QEk03F005662@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5645

Modified Files:
	rpy.spec 
Log Message:
* Wed Apr 26 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-10
- BuildRequires tetex for "make pdf" (pdftex).



Index: rpy.spec
===================================================================
RCS file: /cvs/extras/rpms/rpy/FC-3/rpy.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rpy.spec	26 Apr 2006 11:55:37 -0000	1.6
+++ rpy.spec	26 Apr 2006 14:45:58 -0000	1.7
@@ -3,7 +3,7 @@
 Name: 		rpy
 Summary: 	Python interface to the R language
 Version:	0.4.6
-Release:	9%{?dist}
+Release:	10%{?dist}
 Url:		http://rpy.sourceforge.net
 Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
 Patch1:         rpy-install-info.patch
@@ -12,7 +12,7 @@
 Group:		Development/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	R, python-numeric, python-devel, texinfo
+BuildRequires:	R, python-numeric, python-devel, texinfo, tetex
 
 Requires:	python-numeric
 Requires:	R = 2.3.0
@@ -67,6 +67,9 @@
 
 
 %changelog
+* 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
 - Fix detection of R version.
 



From fedora-extras-commits at redhat.com  Wed Apr 26 15:06:46 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Wed, 26 Apr 2006 08:06:46 -0700
Subject: rpms/pygame/FC-4 pygame.spec,1.5,1.6
Message-ID: <200604261506.k3QF6mP7007972@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7927/pygame/FC-4

Modified Files:
	pygame.spec 
Log Message:
Fix Bugzilla bug #189991


Index: pygame.spec
===================================================================
RCS file: /cvs/extras/rpms/pygame/FC-4/pygame.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pygame.spec	21 Apr 2006 23:15:21 -0000	1.5
+++ pygame.spec	26 Apr 2006 15:06:45 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           pygame
 Version:        1.7.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Python modules for writing games
 Group:          Development/Languages
 License:        LGPL
@@ -15,7 +15,9 @@
 BuildRequires:  SDL_ttf-devel SDL_image-devel SDL_mixer-devel
 Requires:       python-numeric
 Obsoletes:      python-pygame < 1.7.1
+Obsoletes:      python-pygame-docs < 1.7.1
 Provides:       python-pygame = %{version}-%{release}
+Provides:       python-pygame-docs = %{version}-%{release}
 
 %description
 Pygame is a set of Python modules designed for writing games. It is
@@ -30,6 +32,8 @@
 Requires:       %{name} = %{version}-%{release}
 Requires:       SDL_ttf-devel SDL_mixer-devel
 Requires:       python-devel
+Obsoletes:      python-pygame-devel < 1.7.1
+Provides:       python-pygame-devel = %{version}-%{release}
 
 %description devel
 This package contains headers required to build applications that use
@@ -82,6 +86,11 @@
 %{_includedir}/python*/%{name}/*.h
 
 %changelog
+* Wed Apr 26 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-5
+- Add Obsolete/Provides tags for python-pygame-docs
+- Add Obsolete/Provides tags for python-pygame-devel to devel package
+- Hopefully this fixes Bugzilla bug #189991
+
 * Fri Apr 21 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-4
 - Add Requires to -devel package
 - Remove ffmovie.h from -devel package since it requires smpeg-devel



From fedora-extras-commits at redhat.com  Wed Apr 26 15:06:47 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Wed, 26 Apr 2006 08:06:47 -0700
Subject: rpms/pygame/devel pygame.spec,1.5,1.6
Message-ID: <200604261506.k3QF6nmu007978@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7927/pygame/devel

Modified Files:
	pygame.spec 
Log Message:
Fix Bugzilla bug #189991


Index: pygame.spec
===================================================================
RCS file: /cvs/extras/rpms/pygame/devel/pygame.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pygame.spec	21 Apr 2006 23:15:23 -0000	1.5
+++ pygame.spec	26 Apr 2006 15:06:47 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           pygame
 Version:        1.7.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Python modules for writing games
 Group:          Development/Languages
 License:        LGPL
@@ -15,7 +15,9 @@
 BuildRequires:  SDL_ttf-devel SDL_image-devel SDL_mixer-devel
 Requires:       python-numeric
 Obsoletes:      python-pygame < 1.7.1
+Obsoletes:      python-pygame-docs < 1.7.1
 Provides:       python-pygame = %{version}-%{release}
+Provides:       python-pygame-docs = %{version}-%{release}
 
 %description
 Pygame is a set of Python modules designed for writing games. It is
@@ -30,6 +32,8 @@
 Requires:       %{name} = %{version}-%{release}
 Requires:       SDL_ttf-devel SDL_mixer-devel
 Requires:       python-devel
+Obsoletes:      python-pygame-devel < 1.7.1
+Provides:       python-pygame-devel = %{version}-%{release}
 
 %description devel
 This package contains headers required to build applications that use
@@ -82,6 +86,11 @@
 %{_includedir}/python*/%{name}/*.h
 
 %changelog
+* Wed Apr 26 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-5
+- Add Obsolete/Provides tags for python-pygame-docs
+- Add Obsolete/Provides tags for python-pygame-devel to devel package
+- Hopefully this fixes Bugzilla bug #189991
+
 * Fri Apr 21 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-4
 - Add Requires to -devel package
 - Remove ffmovie.h from -devel package since it requires smpeg-devel



From fedora-extras-commits at redhat.com  Wed Apr 26 15:06:46 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Wed, 26 Apr 2006 08:06:46 -0700
Subject: rpms/pygame/FC-5 pygame.spec,1.5,1.6
Message-ID: <200604261506.k3QF6m6v007976@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7927/pygame/FC-5

Modified Files:
	pygame.spec 
Log Message:
Fix Bugzilla bug #189991


Index: pygame.spec
===================================================================
RCS file: /cvs/extras/rpms/pygame/FC-5/pygame.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pygame.spec	21 Apr 2006 23:15:22 -0000	1.5
+++ pygame.spec	26 Apr 2006 15:06:46 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           pygame
 Version:        1.7.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Python modules for writing games
 Group:          Development/Languages
 License:        LGPL
@@ -15,7 +15,9 @@
 BuildRequires:  SDL_ttf-devel SDL_image-devel SDL_mixer-devel
 Requires:       python-numeric
 Obsoletes:      python-pygame < 1.7.1
+Obsoletes:      python-pygame-docs < 1.7.1
 Provides:       python-pygame = %{version}-%{release}
+Provides:       python-pygame-docs = %{version}-%{release}
 
 %description
 Pygame is a set of Python modules designed for writing games. It is
@@ -30,6 +32,8 @@
 Requires:       %{name} = %{version}-%{release}
 Requires:       SDL_ttf-devel SDL_mixer-devel
 Requires:       python-devel
+Obsoletes:      python-pygame-devel < 1.7.1
+Provides:       python-pygame-devel = %{version}-%{release}
 
 %description devel
 This package contains headers required to build applications that use
@@ -82,6 +86,11 @@
 %{_includedir}/python*/%{name}/*.h
 
 %changelog
+* Wed Apr 26 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-5
+- Add Obsolete/Provides tags for python-pygame-docs
+- Add Obsolete/Provides tags for python-pygame-devel to devel package
+- Hopefully this fixes Bugzilla bug #189991
+
 * Fri Apr 21 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-4
 - Add Requires to -devel package
 - Remove ffmovie.h from -devel package since it requires smpeg-devel



From fedora-extras-commits at redhat.com  Wed Apr 26 15:17:36 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Wed, 26 Apr 2006 08:17:36 -0700
Subject: rpms/pygame/devel pygame.spec,1.6,1.7
Message-ID: <200604261517.k3QFHcbg008122@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8105

Modified Files:
	pygame.spec 
Log Message:
Screwed up, tried a make tag before cvs commit.  Bumping release number for rebuild


Index: pygame.spec
===================================================================
RCS file: /cvs/extras/rpms/pygame/devel/pygame.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pygame.spec	26 Apr 2006 15:06:47 -0000	1.6
+++ pygame.spec	26 Apr 2006 15:17:36 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           pygame
 Version:        1.7.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Python modules for writing games
 Group:          Development/Languages
 License:        LGPL
@@ -86,6 +86,9 @@
 %{_includedir}/python*/%{name}/*.h
 
 %changelog
+* Wed Apr 26 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-6
+- Bump release for new build on devel
+
 * Wed Apr 26 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-5
 - Add Obsolete/Provides tags for python-pygame-docs
 - Add Obsolete/Provides tags for python-pygame-devel to devel package



From fedora-extras-commits at redhat.com  Wed Apr 26 16:01:21 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Wed, 26 Apr 2006 09:01:21 -0700
Subject: owners owners.list,1.899,1.900
Message-ID: <200604261601.k3QG1woX010438@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10405

Modified Files:
	owners.list 
Log Message:
Added Metapixel



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.899
retrieving revision 1.900
diff -u -r1.899 -r1.900
--- owners.list	26 Apr 2006 06:36:07 -0000	1.899
+++ owners.list	26 Apr 2006 16:01:21 -0000	1.900
@@ -724,6 +724,7 @@
 Fedora Extras|meld|Visual diff and merge tool|bdpepple at ameritech.net|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|
 Fedora Extras|metakit|Embeddable database|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|metapixel|A Photomosaic Generator|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|mew|a great MIME mail reader for Emacs|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|mfstools|Utilities for TiVo drive upgrades|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|mftrace|Utility for converting TeX bitmap fonts to Type 1 or TrueType fonts|qspencer at ieee.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Apr 26 16:03:40 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Wed, 26 Apr 2006 09:03:40 -0700
Subject: rpms/metapixel - New directory
Message-ID: <200604261603.k3QG3glv010556@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/metapixel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10530/metapixel

Log Message:
Directory /cvs/extras/rpms/metapixel added to the repository




From fedora-extras-commits at redhat.com  Wed Apr 26 16:03:41 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Wed, 26 Apr 2006 09:03:41 -0700
Subject: rpms/metapixel/devel - New directory
Message-ID: <200604261603.k3QG3hUu010559@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/metapixel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10530/metapixel/devel

Log Message:
Directory /cvs/extras/rpms/metapixel/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Apr 26 16:03:55 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Wed, 26 Apr 2006 09:03:55 -0700
Subject: rpms/metapixel Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604261603.k3QG3vm2010608@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/metapixel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10575

Added Files:
	Makefile import.log 
Log Message:
Setup of module metapixel


--- NEW FILE Makefile ---
# Top level Makefile for module metapixel
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 26 16:03:56 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Wed, 26 Apr 2006 09:03:56 -0700
Subject: rpms/metapixel/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604261604.k3QG3w2u010611@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/metapixel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10575/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module metapixel


--- 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 Apr 26 16:04:33 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Wed, 26 Apr 2006 09:04:33 -0700
Subject: rpms/metapixel import.log,1.1,1.2
Message-ID: <200604261604.k3QG4ZgV010678@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/metapixel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10644

Modified Files:
	import.log 
Log Message:
auto-import metapixel-1.0.1-2 on branch devel from metapixel-1.0.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/metapixel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Apr 2006 16:03:55 -0000	1.1
+++ import.log	26 Apr 2006 16:04:33 -0000	1.2
@@ -0,0 +1 @@
+metapixel-1_0_1-2:HEAD:metapixel-1.0.1-2.src.rpm:1146067465



From fedora-extras-commits at redhat.com  Wed Apr 26 16:04:34 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Wed, 26 Apr 2006 09:04:34 -0700
Subject: rpms/metapixel/devel metapixel-makefile.patch, NONE,
	1.1 metapixel.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604261604.k3QG4agY010685@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/metapixel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10644/devel

Modified Files:
	.cvsignore sources 
Added Files:
	metapixel-makefile.patch metapixel.spec 
Log Message:
auto-import metapixel-1.0.1-2 on branch devel from metapixel-1.0.1-2.src.rpm

metapixel-makefile.patch:

--- NEW FILE metapixel-makefile.patch ---
--- metapixel-1.0.1/Makefile.makefile	2006-02-19 22:30:56.000000000 +0100
+++ metapixel-1.0.1/Makefile	2006-04-26 04:18:27.000000000 +0200
@@ -1,9 +1,9 @@
-PREFIX = /usr/local
+PREFIX = /usr
 INSTALL = install
 MANPAGE_XSL = /sw/share/xml/xsl/docbook-xsl/manpages/docbook.xsl
 
 BINDIR = $(PREFIX)/bin
-MANDIR = $(PREFIX)/man
+MANDIR = $(PREFIX)/share/man
 
 VERSION = 1.0.1
 
@@ -46,12 +46,13 @@
 	$(CC) $(CCOPTS) -c $<
 
 install : metapixel metapixel.1
-	$(INSTALL) -d $(BINDIR)
-	$(INSTALL) metapixel $(BINDIR)
-	$(INSTALL) metapixel-prepare $(BINDIR)
-	$(INSTALL) metapixel.1 $(MANDIR)/man1
-	$(INSTALL) metapixel-imagesize $(BINDIR)
-	$(INSTALL) metapixel-sizesort $(BINDIR)
+	$(INSTALL) -d $(DESTDIR)$(BINDIR)
+	$(INSTALL) -d $(DESTDIR)$(MANDIR)/man1
+	$(INSTALL) metapixel $(DESTDIR)$(BINDIR)
+	$(INSTALL) metapixel-prepare $(DESTDIR)$(BINDIR)
+	$(INSTALL) metapixel.1 $(DESTDIR)$(MANDIR)/man1
+	$(INSTALL) metapixel-imagesize $(DESTDIR)$(BINDIR)
+	$(INSTALL) metapixel-sizesort $(DESTDIR)$(BINDIR)
 
 clean :
 	rm -f *.o metapixel convert metapixel-imagesize *~


--- NEW FILE metapixel.spec ---
Summary: A Photomosaic Generator
Name: metapixel
Version: 1.0.1
Release: 2%{?dist}
License: GPL
Group: Applications/Multimedia
Source0: http://www.complang.tuwien.ac.at/~schani/metapixel/metapixel-%{version}.tar.gz
Patch0: metapixel-makefile.patch
URL: http://www.complang.tuwien.ac.at/~schani/metapixel/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libjpeg-devel, libpng-devel, zlib-devel

%description
Metapixel is a program for generating photomosaics. It can generate
classical photomosaics, in which the source image is viewed as a matrix
of equally sized rectangles for each of which a matching image is
substitued, as well as collage-style photomosaics, in which rectangular
parts of the source image at arbitrary positions (i.e. not aligned to a
matrix) are substituted by matching images.

%prep
%setup -q
%patch0 -p1 -b .makefile

%build
%{__make} %{?_smp_mflags}

%install
rm -rf %{buildroot}
%{__make} install DESTDIR=%{buildroot}
chmod 644 %{buildroot}%{_mandir}/man1/metapixel.1*

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING README
%{_bindir}/metapixel
%{_bindir}/metapixel-prepare
%{_bindir}/metapixel-imagesize
%{_bindir}/metapixel-sizesort
%{_mandir}/man1/metapixel.1.gz


%changelog
* Wed Apr 26 2006 Andreas Thienemann <andreas at bawue.net> 1.0.1-2
- Fixed manpage perms

* Wed Apr 26 2006 Andreas Thienemann <andreas at bawue.net> 1.0.1-1
- Updated to 1.0.1-1

* Thu Aug 25 2005 Andreas Thienemann <andreas at bawue.net> 1.0.0-1
- Initial spec.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/metapixel/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Apr 2006 16:03:56 -0000	1.1
+++ .cvsignore	26 Apr 2006 16:04:33 -0000	1.2
@@ -0,0 +1 @@
+metapixel-1.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/metapixel/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Apr 2006 16:03:56 -0000	1.1
+++ sources	26 Apr 2006 16:04:34 -0000	1.2
@@ -0,0 +1 @@
+b0fcb1ad62708478478218190c355fd0  metapixel-1.0.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 26 16:07:29 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Wed, 26 Apr 2006 09:07:29 -0700
Subject: rpms/conserver/FC-5 conserver.spec,1.1,1.2
Message-ID: <200604261607.k3QG7VA6010826@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/conserver/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10762/FC-5

Modified Files:
	conserver.spec 
Log Message:

Feature request (split 'console' out to -client subpackage)



Index: conserver.spec
===================================================================
RCS file: /cvs/extras/rpms/conserver/FC-5/conserver.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- conserver.spec	10 Apr 2006 19:25:15 -0000	1.1
+++ conserver.spec	26 Apr 2006 16:07:29 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           conserver
 Version:        8.1.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Serial console server daemon/client
 
 Group:          System Environment/Daemons
@@ -22,6 +22,13 @@
 write-access of a console (one at a time), and has a variety of bells 
 and whistles to accentuate that basic functionality.
 
+%package client
+Summary: Serial console client
+Group: Applications/Communications
+
+%description client
+This is the client package needed to interact with a Conserver daemon.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -70,7 +77,13 @@
 fi
 # make sure /etc/services has a conserver entry
 if ! egrep '\<conserver\>' /etc/services > /dev/null 2>&1 ; then
-  echo "console		 782/tcp	conserver" >> /etc/services
+  echo "console		782/tcp		conserver" >> /etc/services
+fi
+
+%post client
+# make sure /etc/services has a conserver entry
+if ! egrep '\<conserver\>' /etc/services > /dev/null 2>&1 ; then
+  echo "console		782/tcp		conserver" >> /etc/services
 fi
 
 
@@ -88,15 +101,22 @@
 %doc CHANGES FAQ LICENSE INSTALL README conserver.cf/samples/ conserver.cf/conserver.cf conserver.cf/conserver.passwd
 %config(noreplace) %{_sysconfdir}/conserver.*
 %{_initrddir}/conserver
-%{_bindir}/console
 %{_libdir}/conserver
-%{_mandir}/man1/console.1.gz
 %{_mandir}/man5/conserver.cf.5.gz
 %{_mandir}/man5/conserver.passwd.5.gz
 %{_mandir}/man8/conserver.8.gz
 %{_sbindir}/conserver
 
+%files client
+%defattr(-,root,root,-)
+%doc LICENSE
+%{_bindir}/console
+%{_mandir}/man1/console.1.gz
+
 %changelog
+* Wed Apr 26 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 8.1.14-2
+- Split 'console' out to -client subpackage, as suggested by Nate Straz
+
 * Mon Apr 10 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 8.1.14-1
 - Figures, two days after my initial Fedora Extras RPM, a new release...
 



From fedora-extras-commits at redhat.com  Wed Apr 26 16:07:30 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Wed, 26 Apr 2006 09:07:30 -0700
Subject: rpms/conserver/devel conserver.spec,1.1,1.2
Message-ID: <200604261607.k3QG7W0i010831@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/conserver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10762/devel

Modified Files:
	conserver.spec 
Log Message:

Feature request (split 'console' out to -client subpackage)



Index: conserver.spec
===================================================================
RCS file: /cvs/extras/rpms/conserver/devel/conserver.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- conserver.spec	10 Apr 2006 19:25:15 -0000	1.1
+++ conserver.spec	26 Apr 2006 16:07:30 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           conserver
 Version:        8.1.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Serial console server daemon/client
 
 Group:          System Environment/Daemons
@@ -22,6 +22,13 @@
 write-access of a console (one at a time), and has a variety of bells 
 and whistles to accentuate that basic functionality.
 
+%package client
+Summary: Serial console client
+Group: Applications/Communications
+
+%description client
+This is the client package needed to interact with a Conserver daemon.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -70,7 +77,13 @@
 fi
 # make sure /etc/services has a conserver entry
 if ! egrep '\<conserver\>' /etc/services > /dev/null 2>&1 ; then
-  echo "console		 782/tcp	conserver" >> /etc/services
+  echo "console		782/tcp		conserver" >> /etc/services
+fi
+
+%post client
+# make sure /etc/services has a conserver entry
+if ! egrep '\<conserver\>' /etc/services > /dev/null 2>&1 ; then
+  echo "console		782/tcp		conserver" >> /etc/services
 fi
 
 
@@ -88,15 +101,22 @@
 %doc CHANGES FAQ LICENSE INSTALL README conserver.cf/samples/ conserver.cf/conserver.cf conserver.cf/conserver.passwd
 %config(noreplace) %{_sysconfdir}/conserver.*
 %{_initrddir}/conserver
-%{_bindir}/console
 %{_libdir}/conserver
-%{_mandir}/man1/console.1.gz
 %{_mandir}/man5/conserver.cf.5.gz
 %{_mandir}/man5/conserver.passwd.5.gz
 %{_mandir}/man8/conserver.8.gz
 %{_sbindir}/conserver
 
+%files client
+%defattr(-,root,root,-)
+%doc LICENSE
+%{_bindir}/console
+%{_mandir}/man1/console.1.gz
+
 %changelog
+* Wed Apr 26 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 8.1.14-2
+- Split 'console' out to -client subpackage, as suggested by Nate Straz
+
 * Mon Apr 10 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 8.1.14-1
 - Figures, two days after my initial Fedora Extras RPM, a new release...
 



From fedora-extras-commits at redhat.com  Wed Apr 26 16:07:23 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Wed, 26 Apr 2006 09:07:23 -0700
Subject: rpms/conserver/FC-3 conserver.spec,1.1,1.2
Message-ID: <200604261607.k3QG7tru010872@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/conserver/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10762/FC-3

Modified Files:
	conserver.spec 
Log Message:

Feature request (split 'console' out to -client subpackage)



Index: conserver.spec
===================================================================
RCS file: /cvs/extras/rpms/conserver/FC-3/conserver.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- conserver.spec	10 Apr 2006 19:25:15 -0000	1.1
+++ conserver.spec	26 Apr 2006 16:07:23 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           conserver
 Version:        8.1.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Serial console server daemon/client
 
 Group:          System Environment/Daemons
@@ -22,6 +22,13 @@
 write-access of a console (one at a time), and has a variety of bells 
 and whistles to accentuate that basic functionality.
 
+%package client
+Summary: Serial console client
+Group: Applications/Communications
+
+%description client
+This is the client package needed to interact with a Conserver daemon.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -70,7 +77,13 @@
 fi
 # make sure /etc/services has a conserver entry
 if ! egrep '\<conserver\>' /etc/services > /dev/null 2>&1 ; then
-  echo "console		 782/tcp	conserver" >> /etc/services
+  echo "console		782/tcp		conserver" >> /etc/services
+fi
+
+%post client
+# make sure /etc/services has a conserver entry
+if ! egrep '\<conserver\>' /etc/services > /dev/null 2>&1 ; then
+  echo "console		782/tcp		conserver" >> /etc/services
 fi
 
 
@@ -88,15 +101,22 @@
 %doc CHANGES FAQ LICENSE INSTALL README conserver.cf/samples/ conserver.cf/conserver.cf conserver.cf/conserver.passwd
 %config(noreplace) %{_sysconfdir}/conserver.*
 %{_initrddir}/conserver
-%{_bindir}/console
 %{_libdir}/conserver
-%{_mandir}/man1/console.1.gz
 %{_mandir}/man5/conserver.cf.5.gz
 %{_mandir}/man5/conserver.passwd.5.gz
 %{_mandir}/man8/conserver.8.gz
 %{_sbindir}/conserver
 
+%files client
+%defattr(-,root,root,-)
+%doc LICENSE
+%{_bindir}/console
+%{_mandir}/man1/console.1.gz
+
 %changelog
+* Wed Apr 26 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 8.1.14-2
+- Split 'console' out to -client subpackage, as suggested by Nate Straz
+
 * Mon Apr 10 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 8.1.14-1
 - Figures, two days after my initial Fedora Extras RPM, a new release...
 



From fedora-extras-commits at redhat.com  Wed Apr 26 16:07:24 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Wed, 26 Apr 2006 09:07:24 -0700
Subject: rpms/conserver/FC-4 conserver.spec,1.1,1.2
Message-ID: <200604261608.k3QG7ucq010876@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/conserver/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10762/FC-4

Modified Files:
	conserver.spec 
Log Message:

Feature request (split 'console' out to -client subpackage)



Index: conserver.spec
===================================================================
RCS file: /cvs/extras/rpms/conserver/FC-4/conserver.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- conserver.spec	10 Apr 2006 19:25:15 -0000	1.1
+++ conserver.spec	26 Apr 2006 16:07:23 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           conserver
 Version:        8.1.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Serial console server daemon/client
 
 Group:          System Environment/Daemons
@@ -22,6 +22,13 @@
 write-access of a console (one at a time), and has a variety of bells 
 and whistles to accentuate that basic functionality.
 
+%package client
+Summary: Serial console client
+Group: Applications/Communications
+
+%description client
+This is the client package needed to interact with a Conserver daemon.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -70,7 +77,13 @@
 fi
 # make sure /etc/services has a conserver entry
 if ! egrep '\<conserver\>' /etc/services > /dev/null 2>&1 ; then
-  echo "console		 782/tcp	conserver" >> /etc/services
+  echo "console		782/tcp		conserver" >> /etc/services
+fi
+
+%post client
+# make sure /etc/services has a conserver entry
+if ! egrep '\<conserver\>' /etc/services > /dev/null 2>&1 ; then
+  echo "console		782/tcp		conserver" >> /etc/services
 fi
 
 
@@ -88,15 +101,22 @@
 %doc CHANGES FAQ LICENSE INSTALL README conserver.cf/samples/ conserver.cf/conserver.cf conserver.cf/conserver.passwd
 %config(noreplace) %{_sysconfdir}/conserver.*
 %{_initrddir}/conserver
-%{_bindir}/console
 %{_libdir}/conserver
-%{_mandir}/man1/console.1.gz
 %{_mandir}/man5/conserver.cf.5.gz
 %{_mandir}/man5/conserver.passwd.5.gz
 %{_mandir}/man8/conserver.8.gz
 %{_sbindir}/conserver
 
+%files client
+%defattr(-,root,root,-)
+%doc LICENSE
+%{_bindir}/console
+%{_mandir}/man1/console.1.gz
+
 %changelog
+* Wed Apr 26 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 8.1.14-2
+- Split 'console' out to -client subpackage, as suggested by Nate Straz
+
 * Mon Apr 10 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 8.1.14-1
 - Figures, two days after my initial Fedora Extras RPM, a new release...
 



From fedora-extras-commits at redhat.com  Wed Apr 26 18:51:33 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 26 Apr 2006 11:51:33 -0700
Subject: rpms/sbcl/devel .cvsignore, 1.11, 1.12 sbcl.spec, 1.40, 1.41 sources,
	1.11, 1.12
Message-ID: <200604261851.k3QIpZxK016310@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16289

Modified Files:
	.cvsignore sbcl.spec sources 
Log Message:
* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-1
- 0.9.12



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	30 Mar 2006 18:15:23 -0000	1.11
+++ .cvsignore	26 Apr 2006 18:51:33 -0000	1.12
@@ -1,4 +1,4 @@
-sbcl-0.9.11-source.tar.bz2
+sbcl-0.9.12-source.tar.bz2
 sbcl-0.9.11-x86-64-linux-binary.tar.bz2 
 sbcl-0.9.11-x86-linux-binary.tar.bz2
-sbcl-0.8.15-powerpc-linux-binary.tar.bz2
+sbcl-0.9.8-powerpc-linux-binary.tar.bz2


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sbcl.spec	30 Mar 2006 18:15:23 -0000	1.40
+++ sbcl.spec	26 Apr 2006 18:51:33 -0000	1.41
@@ -12,7 +12,7 @@
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
-Version: 0.9.11
+Version: 0.9.12
 Release: 1%{?dist}
 
 License: BSD/MIT
@@ -26,12 +26,22 @@
 #Source1: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2
 Source2: customize-target-features.lisp 
 
+## Bootstraps
+# %{ix86}
+#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-linux-binary.tar.bz2
+# x86_64
+#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-64-linux-binary.tar.bz2
+# ppc
+#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-powerpc-linux-binary.tar.bz2
+# another possible ppc bootstrap to try
+#Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
+
+
 ## x86 section
 %ifarch %{ix86}
 %define sbcl_arch x86
 BuildRequires: sbcl
 # or
-#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-linux-binary.tar.bz2
 #define sbcl_bootstrap_src -a 10 
 %endif
 
@@ -47,16 +57,10 @@
 ## ppc section
 # Latest powerpc-linux bootstrap build fails:
 # http://bugzilla.redhat.com/bugzilla/177029 
-#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2
-# another possible ppc bootstrap to try
-#Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
 Source35: ppc-linux-mcontext.h
 %ifarch ppc 
 %define sbcl_arch ppc
 %define sbcl_bootstrap_src -a 30
-BuildRequires: setarch
-%define setarch setarch %{_target_cpu}
-%define min_bootstrap 1
 %endif
 
 Source100: my_setarch.c
@@ -65,7 +69,7 @@
 Patch2: sbcl-0.9.5-personality.patch
 Patch3: sbcl-0.9.5-optflags.patch
 Patch4: sbcl-0.9.4-LIB_DIR.patch
-Patch5: sbcl-0.9.10-make-config-ppc.patch
+#Patch5: sbcl-0.9.10-make-config-ppc.patch
 Patch6: sbcl-0.9.5-verbose-build.patch
 # Allow override of contrib test failure(s)
 Patch7: sbcl-0.9.9-permissive.patch
@@ -97,7 +101,7 @@
 %patch2 -p1 -b .personality
 %patch3 -p1 -b .optflags
 %patch4 -p1 -b .LIB_DIR
-%patch5 -p1 -b .make-config-ppc
+#patch5 -p1 -b .make-config-ppc
 %{?sbcl_verbose:%patch6 -p1 -b .verbose-build}
 %patch7 -p1 -b .permissive
 
@@ -228,6 +232,9 @@
 
 
 %changelog
+* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-1
+- 0.9.12
+
 * Mon Mar 27 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.11-1
 - 0.9.11
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	30 Mar 2006 18:15:23 -0000	1.11
+++ sources	26 Apr 2006 18:51:33 -0000	1.12
@@ -1 +1 @@
-b82c3b7cf5c351cbe97af5150c17ad27  sbcl-0.9.11-source.tar.bz2
+82eef4f47d6a72a36d4484bf503fc7db  sbcl-0.9.12-source.tar.bz2



From fedora-extras-commits at redhat.com  Wed Apr 26 19:25:40 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 26 Apr 2006 12:25:40 -0700
Subject: rpms/lft/FC-5 lft-2.5-tolower-189996.patch, NONE, 1.1 lft.spec, 1.18,
	1.19
Message-ID: <200604261925.k3QJPgm6018683@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lft/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18648/FC-5

Modified Files:
	lft.spec 
Added Files:
	lft-2.5-tolower-189996.patch 
Log Message:
* Wed Apr 26 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1:2.5-3
- Backport fix for x86_64 crash at startup from upstream 2.6b5 (#189996).


lft-2.5-tolower-189996.patch:

--- NEW FILE lft-2.5-tolower-189996.patch ---
--- lft.c~	2005-08-25 07:40:36.000000000 +0300
+++ lft.c	2006-04-26 22:07:54.000000000 +0300
@@ -310,6 +310,20 @@
   return (sum);
 }
 
+static char * 
+strtolower (char *input) {
+    char *iter = input;
+    
+    if (input == NULL)
+        return NULL;
+    
+    while (*iter) {
+        *iter = tolower (*iter);
+        iter++;
+    }
+    return input;
+}
+
 void
 do_auto_ports (char *hostname, int init_dport)
 {
@@ -328,7 +342,7 @@
 
     char *mailservers[] = { "mail", "smtp", "mx", "relay", "inbound" };
     int cnt = 0;
-    hostname = (char *) tolower(hostname);
+    hostname = (char *) strtolower(hostname);
 
   for (cnt = 0 ; cnt < 5 ; cnt++)
    {


Index: lft.spec
===================================================================
RCS file: /cvs/extras/rpms/lft/FC-5/lft.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- lft.spec	16 Feb 2006 07:24:08 -0000	1.18
+++ lft.spec	26 Apr 2006 19:25:40 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           lft
 Version:        2.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          1
 Summary:        Alternate traceroute tool
 
@@ -10,6 +10,7 @@
 # http://pwhois.org/dl/?file=lft-2.5.tar.gz
 Source0:        %{name}-%{version}.tar.gz
 Patch0:         %{name}-install.patch
+Patch1:         %{name}-2.5-tolower-189996.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libpcap
@@ -27,6 +28,7 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0
 
 
 %build
@@ -53,6 +55,9 @@
 
 
 %changelog
+* Wed Apr 26 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1:2.5-3
+- Backport fix for x86_64 crash at startup from upstream 2.6b5 (#189996).
+
 * Thu Feb 16 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1:2.5-2
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Wed Apr 26 19:25:41 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 26 Apr 2006 12:25:41 -0700
Subject: rpms/lft/devel lft-2.5-tolower-189996.patch, NONE, 1.1 lft.spec,
	1.18, 1.19
Message-ID: <200604261925.k3QJPhoq018689@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lft/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18648/devel

Modified Files:
	lft.spec 
Added Files:
	lft-2.5-tolower-189996.patch 
Log Message:
* Wed Apr 26 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1:2.5-3
- Backport fix for x86_64 crash at startup from upstream 2.6b5 (#189996).


lft-2.5-tolower-189996.patch:

--- NEW FILE lft-2.5-tolower-189996.patch ---
--- lft.c~	2005-08-25 07:40:36.000000000 +0300
+++ lft.c	2006-04-26 22:07:54.000000000 +0300
@@ -310,6 +310,20 @@
   return (sum);
 }
 
+static char * 
+strtolower (char *input) {
+    char *iter = input;
+    
+    if (input == NULL)
+        return NULL;
+    
+    while (*iter) {
+        *iter = tolower (*iter);
+        iter++;
+    }
+    return input;
+}
+
 void
 do_auto_ports (char *hostname, int init_dport)
 {
@@ -328,7 +342,7 @@
 
     char *mailservers[] = { "mail", "smtp", "mx", "relay", "inbound" };
     int cnt = 0;
-    hostname = (char *) tolower(hostname);
+    hostname = (char *) strtolower(hostname);
 
   for (cnt = 0 ; cnt < 5 ; cnt++)
    {


Index: lft.spec
===================================================================
RCS file: /cvs/extras/rpms/lft/devel/lft.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- lft.spec	16 Feb 2006 07:24:08 -0000	1.18
+++ lft.spec	26 Apr 2006 19:25:40 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           lft
 Version:        2.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          1
 Summary:        Alternate traceroute tool
 
@@ -10,6 +10,7 @@
 # http://pwhois.org/dl/?file=lft-2.5.tar.gz
 Source0:        %{name}-%{version}.tar.gz
 Patch0:         %{name}-install.patch
+Patch1:         %{name}-2.5-tolower-189996.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libpcap
@@ -27,6 +28,7 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0
 
 
 %build
@@ -53,6 +55,9 @@
 
 
 %changelog
+* Wed Apr 26 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1:2.5-3
+- Backport fix for x86_64 crash at startup from upstream 2.6b5 (#189996).
+
 * Thu Feb 16 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1:2.5-2
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Wed Apr 26 21:16:37 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Wed, 26 Apr 2006 14:16:37 -0700
Subject: rpms/gnonlin import.log,1.3,1.4
Message-ID: <200604262117.k3QLH9pu023666@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/gnonlin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23634

Modified Files:
	import.log 
Log Message:
auto-import gnonlin-0.10.3-2 on branch devel from gnonlin-0.10.3-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnonlin/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	26 Apr 2006 02:47:26 -0000	1.3
+++ import.log	26 Apr 2006 21:16:37 -0000	1.4
@@ -1,2 +1,3 @@
 gnonlin-0_10_0_5-3:HEAD:gnonlin-0.10.0.5-3.src.rpm:1139711025
 gnonlin-0_10_3-1:HEAD:gnonlin-0.10.3-1.src.rpm:1146019641
+gnonlin-0_10_3-2:HEAD:gnonlin-0.10.3-2.src.rpm:1146086192



From fedora-extras-commits at redhat.com  Wed Apr 26 21:16:38 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Wed, 26 Apr 2006 14:16:38 -0700
Subject: rpms/gnonlin/devel gnonlin.spec,1.5,1.6
Message-ID: <200604262117.k3QLHAL0023669@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/gnonlin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23634/devel

Modified Files:
	gnonlin.spec 
Log Message:
auto-import gnonlin-0.10.3-2 on branch devel from gnonlin-0.10.3-2.src.rpm


Index: gnonlin.spec
===================================================================
RCS file: /cvs/extras/rpms/gnonlin/devel/gnonlin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnonlin.spec	26 Apr 2006 02:47:27 -0000	1.5
+++ gnonlin.spec	26 Apr 2006 21:16:38 -0000	1.6
@@ -1,7 +1,9 @@
-%define		gst_req	0.10.2
+%define		gst_req			0.10.2
+%define		gst_plugins_base_req	0.10.2
+
 Name: 		gnonlin
 Version: 	0.10.3
-Release:	1
+Release:	2
 Summary: 	GStreamer extension library for non-linear editing
 
 Group: 		System Environment/Libraries
@@ -10,22 +12,13 @@
 Source:		http://prdownloads.sourceforge.net/gnonlin/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: 	gstreamer-devel >= %{gst_req}
+BuildRequires: 	gstreamer-devel >= %{gst_req} gstreamer-plugins-base-devel >= %{gst_plugins_base_req}
 
 %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.
 
-%package devel
-Summary: 	Development headers for the gnonlin libraries
-Group:          Development/Libraries
-Requires:       %{name} = %{version}
-
-%description devel
-This package provides the necessary development libraries and include
-files to allow you to build applications with gnonlin.
-
 %prep
 %setup -q
 
@@ -35,18 +28,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-rm -f $RPM_BUILD_ROOT/%{_libdir}/gstreamer-0.10/libgnl.la
-# Not in Makefile
-install -p -D -m 0644 gnl/gnlcomposition.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnlcomposition.h
-install -p -D -m 0644 gnl/gnlfilesource.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnlfilesource.h
-install -p -D -m 0644 gnl/gnl.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnl.h
-install -p -D -m 0644 gnl/gnlmarshal.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnlmarshal.h
-install -p -D -m 0644 gnl/gnlobject.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnlobject.h
-install -p -D -m 0644 gnl/gnloperation.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnloperation.h
-install -p -D -m 0644 gnl/gnlsource.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnlsource.h
-install -p -D -m 0644 gnl/gnltypes.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnltypes.h
-install -p -D -m 0644 gnl/gnlversion.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnlversion.h
+
+%makeinstall
+rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{gst_majorminor}/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,12 +40,13 @@
 %doc AUTHORS COPYING.LIB README
 %{_libdir}/gstreamer-0.10/libgnl*
 
-%files devel
-%defattr(-, root, root, -)
-%{_includedir}/gnl
-
 %changelog
-* Mon Apr 25 2006 W. Michael Petullo <mike[@]flyn.org> 0.10.3-1
+* Wed Apr 26 2006 W. Michael Petullo <mike[@]flyn.org> 0.10.3-2
+- simplified install
+- require gstreamer-plugins-base-devel
+- remove -devel package
+
+* Tue Apr 25 2006 W. Michael Petullo <mike[@]flyn.org> 0.10.3-1
 - updated package to 0.10.3
 - remove gnonlin.pc 
 



From fedora-extras-commits at redhat.com  Wed Apr 26 21:17:58 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Wed, 26 Apr 2006 14:17:58 -0700
Subject: rpms/pitivi import.log,1.2,1.3
Message-ID: <200604262118.k3QLIUb3023774@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/pitivi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23738

Modified Files:
	import.log 
Log Message:
auto-import pitivi-0.10.0-1 on branch devel from pitivi-0.10.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pitivi/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	31 Mar 2006 22:43:47 -0000	1.2
+++ import.log	26 Apr 2006 21:17:57 -0000	1.3
@@ -1 +1,2 @@
 pitivi-0_9_9_2-3:HEAD:pitivi-0.9.9.2-3.src.rpm:1143845025
+pitivi-0_10_0-1:HEAD:pitivi-0.10.0-1.src.rpm:1146086271



From fedora-extras-commits at redhat.com  Wed Apr 26 21:17:58 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Wed, 26 Apr 2006 14:17:58 -0700
Subject: rpms/pitivi/devel .cvsignore, 1.2, 1.3 pitivi.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200604262118.k3QLIUVs023779@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/pitivi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23738/devel

Modified Files:
	.cvsignore pitivi.spec sources 
Log Message:
auto-import pitivi-0.10.0-1 on branch devel from pitivi-0.10.0-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pitivi/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Mar 2006 22:43:48 -0000	1.2
+++ .cvsignore	26 Apr 2006 21:17:58 -0000	1.3
@@ -1 +1 @@
-pitivi-0.9.9.2.tar.bz2
+pitivi-0.10.0.tar.bz2


Index: pitivi.spec
===================================================================
RCS file: /cvs/extras/rpms/pitivi/devel/pitivi.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pitivi.spec	31 Mar 2006 22:43:48 -0000	1.1
+++ pitivi.spec	26 Apr 2006 21:17:58 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           pitivi
-Version:        0.9.9.2
-Release:        3
+Version:        0.10.0
+Release:        1
 Summary: 	Non-linear video editor
 
 Group: 		Applications/Multimedia
@@ -20,7 +20,6 @@
 BuildRequires:  pygtk2-devel
 BuildRequires:	gtk-doc
 BuildRequires:	pkgconfig
-BuildRequires:  gnonlin-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  gnome-python2
 
@@ -72,9 +71,14 @@
 %{_libdir}/pitivi/python/pitivi/ui/*.glade
 %ghost %{_libdir}/pitivi/python/pitivi/ui/*.pyo
 %{_datadir}/pitivi
-%{_datadir}/applications/fedora-pitivi.desktop
+%{_datadir}/pixmaps/*
+%{_datadir}/applications/*
 
 %changelog
+* Wed Apr 26 2006 W. Michael Petullo <mike[@]flyn.org> 0.10.0-1
+- update to 0.10.0
+- remove BuildRequires: gnonlin-devel
+
 * Wed Feb 08 2006 W. Michael Petullo <mike[@]flyn.org> 0.9.9.2-3
 - add BuildRequires
 - add %%{_libdir}/pitivi/python/pitivi/ui/*.glade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pitivi/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Mar 2006 22:43:48 -0000	1.2
+++ sources	26 Apr 2006 21:17:58 -0000	1.3
@@ -1 +1 @@
-de6076064893eda1d7bbd70b2b64b8f0  pitivi-0.9.9.2.tar.bz2
+a03b026d0784659905519f59e7abd4e1  pitivi-0.10.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Apr 26 21:22:42 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Wed, 26 Apr 2006 14:22:42 -0700
Subject: rpms/gnonlin/FC-5 gnonlin.spec,1.4,1.5
Message-ID: <200604262122.k3QLMijI023864@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/gnonlin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23847

Modified Files:
	gnonlin.spec 
Log Message:
Update gnonlin.spec for FC5.



Index: gnonlin.spec
===================================================================
RCS file: /cvs/extras/rpms/gnonlin/FC-5/gnonlin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnonlin.spec	17 Feb 2006 21:09:08 -0000	1.4
+++ gnonlin.spec	26 Apr 2006 21:22:42 -0000	1.5
@@ -1,7 +1,9 @@
-%define		gst_req	0.10.2
+%define		gst_req			0.10.2
+%define		gst_plugins_base_req	0.10.2
+
 Name: 		gnonlin
-Version: 	0.10.0.5
-Release:	6
+Version: 	0.10.3
+Release:	2
 Summary: 	GStreamer extension library for non-linear editing
 
 Group: 		System Environment/Libraries
@@ -10,22 +12,13 @@
 Source:		http://prdownloads.sourceforge.net/gnonlin/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: 	gstreamer-devel >= %{gst_req}
+BuildRequires: 	gstreamer-devel >= %{gst_req} gstreamer-plugins-base-devel >= %{gst_plugins_base_req}
 
 %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.
 
-%package devel
-Summary: 	Development headers for the gnonlin libraries
-Group:          Development/Libraries
-Requires:       %{name} = %{version}
-
-%description devel
-This package provides the necessary development libraries and include
-files to allow you to build applications with gnonlin.
-
 %prep
 %setup -q
 
@@ -35,18 +28,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-rm -f $RPM_BUILD_ROOT/%{_libdir}/gstreamer-0.10/libgnl.la
-# Not in Makefile
-install -p -D -m 0644 gnl/gnlcomposition.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnlcomposition.h
-install -p -D -m 0644 gnl/gnlfilesource.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnlfilesource.h
-install -p -D -m 0644 gnl/gnl.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnl.h
-install -p -D -m 0644 gnl/gnlmarshal.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnlmarshal.h
-install -p -D -m 0644 gnl/gnlobject.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnlobject.h
-install -p -D -m 0644 gnl/gnloperation.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnloperation.h
-install -p -D -m 0644 gnl/gnlsource.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnlsource.h
-install -p -D -m 0644 gnl/gnltypes.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnltypes.h
-install -p -D -m 0644 gnl/gnlversion.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnlversion.h
+
+%makeinstall
+rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{gst_majorminor}/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,12 +40,16 @@
 %doc AUTHORS COPYING.LIB README
 %{_libdir}/gstreamer-0.10/libgnl*
 
-%files devel
-%defattr(-, root, root, -)
-%{_includedir}/gnl
-%{_libdir}/pkgconfig/gnonlin.pc
-
 %changelog
+* Wed Apr 26 2006 W. Michael Petullo <mike[@]flyn.org> 0.10.3-2
+- simplified install
+- require gstreamer-plugins-base-devel
+- remove -devel package
+
+* Tue Apr 25 2006 W. Michael Petullo <mike[@]flyn.org> 0.10.3-1
+- updated package to 0.10.3
+- remove gnonlin.pc 
+
 * Fri Feb 17 2006 W. Michael Petullo <mike[@]flyn.org> 0.10.0.5-6
 - bump release because of build system problem
 



From fedora-extras-commits at redhat.com  Wed Apr 26 21:23:42 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 26 Apr 2006 14:23:42 -0700
Subject: rpms/cpanspec/devel .cvsignore, 1.7, 1.8 cpanspec.spec, 1.6,
	1.7 sources, 1.7, 1.8
Message-ID: <200604262123.k3QLNi2B023900@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/cpanspec/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23875

Modified Files:
	.cvsignore cpanspec.spec sources 
Log Message:
Update to 1.65.
cpanget requires wget.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	25 Mar 2006 02:00:47 -0000	1.7
+++ .cvsignore	26 Apr 2006 21:23:42 -0000	1.8
@@ -1 +1 @@
-cpanspec-1.64.tar.gz
+cpanspec-1.65.tar.gz


Index: cpanspec.spec
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/devel/cpanspec.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cpanspec.spec	25 Mar 2006 02:00:47 -0000	1.6
+++ cpanspec.spec	26 Apr 2006 21:23:42 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           cpanspec
-Version:        1.64
+Version:        1.65
 Release:        1%{?dist}
 Summary:        RPM spec file generation utility
 License:        GPL or Artistic
@@ -10,6 +10,7 @@
 BuildArch:      noarch
 BuildRequires:  perl(Module::Build)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       /usr/bin/wget
 
 %description
 cpanspec generates spec files for Perl modules from CPAN for Fedora
@@ -50,6 +51,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Apr 26 2006 Steven Pritchard <steve at kspei.com> 1.65-1
+- Update to 1.65.
+- cpanget requires wget.
+
 * Wed Mar 24 2006 Steven Pritchard <steve at kspei.com> 1.64-1
 - Update to 1.64.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	25 Mar 2006 02:00:47 -0000	1.7
+++ sources	26 Apr 2006 21:23:42 -0000	1.8
@@ -1 +1 @@
-a77d2b4ef27633fc551d557f459b3462  cpanspec-1.64.tar.gz
+cf3704304f5a4cb80f97881b72c2a6d3  cpanspec-1.65.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 26 21:23:53 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Wed, 26 Apr 2006 14:23:53 -0700
Subject: rpms/gnonlin/FC-5 sources,1.2,1.3
Message-ID: <200604262123.k3QLNto0023923@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/gnonlin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23904

Modified Files:
	sources 
Log Message:
Update sources for FC5 build.



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnonlin/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Feb 2006 02:23:55 -0000	1.2
+++ sources	26 Apr 2006 21:23:53 -0000	1.3
@@ -1 +1 @@
-8c8d6935c7c3bdc05321ae85c6449212  gnonlin-0.10.0.5.tar.gz
+4fa1cebf048243e47cd590d4afed6dc6  gnonlin-0.10.3.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 26 22:04:39 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 26 Apr 2006 15:04:39 -0700
Subject: rpms/python-lxml - New directory
Message-ID: <200604262204.k3QM4f2v026398@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-lxml
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26372/python-lxml

Log Message:
Directory /cvs/extras/rpms/python-lxml added to the repository




From fedora-extras-commits at redhat.com  Wed Apr 26 22:04:40 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 26 Apr 2006 15:04:40 -0700
Subject: rpms/python-lxml/devel - New directory
Message-ID: <200604262204.k3QM4gpU026401@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-lxml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26372/python-lxml/devel

Log Message:
Directory /cvs/extras/rpms/python-lxml/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Apr 26 22:04:58 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 26 Apr 2006 15:04:58 -0700
Subject: rpms/python-lxml Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604262205.k3QM50gl026447@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-lxml
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26417

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-lxml


--- NEW FILE Makefile ---
# Top level Makefile for module python-lxml
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 26 22:04:58 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 26 Apr 2006 15:04:58 -0700
Subject: rpms/python-lxml/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604262205.k3QM50xx026450@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-lxml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26417/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-lxml


--- 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 Apr 26 22:05:20 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 26 Apr 2006 15:05:20 -0700
Subject: rpms/python-lxml import.log,1.1,1.2
Message-ID: <200604262205.k3QM5Mq1026516@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-lxml
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26483

Modified Files:
	import.log 
Log Message:
auto-import python-lxml-0.9.1-3 on branch devel from python-lxml-0.9.1-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-lxml/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Apr 2006 22:04:57 -0000	1.1
+++ import.log	26 Apr 2006 22:05:19 -0000	1.2
@@ -0,0 +1 @@
+python-lxml-0_9_1-3:HEAD:python-lxml-0.9.1-3.src.rpm:1146089115



From fedora-extras-commits at redhat.com  Wed Apr 26 22:05:20 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 26 Apr 2006 15:05:20 -0700
Subject: rpms/python-lxml/devel python-lxml.spec, NONE, 1.1 .cvsignore, 1.1, 
	1.2 sources, 1.1, 1.2
Message-ID: <200604262205.k3QM5M3x026521@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-lxml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26483/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-lxml.spec 
Log Message:
auto-import python-lxml-0.9.1-3 on branch devel from python-lxml-0.9.1-3.src.rpm


--- NEW FILE python-lxml.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%{!?python_version: %define python_version %(%{__python} -c "import sys ; print sys.version[:3]")}

%define srcname lxml

Name:           python-%{srcname}
Version:        0.9.1
Release:        3%{?dist}
Summary:        ElementTree-like Python bindings for libxml2 and libxslt

Group:          Development/Libraries
License:        BSD
URL:            http://codespeak.net/lxml/
Source0:        http://codespeak.net/lxml/%{srcname}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel libxslt-devel python-setuptools
# Upstream now includes the generated .c file and the Pyrex shipped
# with FC (0.9.3.1) is broken for gcc >= 4.0
#BuildRequires: Pyrex >= 0.9.4
Requires:   python-abi = %{python_version}

%description
lxml provides a Python binding to the libxslt and libxml2 libraries.  It
follows the ElementTree API as much as possible in order to provide a more
Pythonic interface to libxml2 and libxslt than the default bindings.  In
particular, lxml deals with Python Unicode strings rather than encoded UTF-8
and handles memory management automatically, unlike the default bindings.


%prep
%setup -q -n %{srcname}-%{version}


%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT --single-version-externally-managed


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README.txt LICENSES.txt PKG-INFO CREDITS.txt CHANGES.txt doc/
%{python_sitearch}/lxml-%{version}-py%{python_version}.egg-info/
%dir %{python_sitearch}/lxml
%{python_sitearch}/lxml/*.so
%{python_sitearch}/lxml/*.py
%{python_sitearch}/lxml/*.pyc
%ghost %{python_sitearch}/lxml/*.pyo

%changelog
* Wed Apr 26 2006 Shahms E. King <shahms at shahms.com> 0.9.1-3
- Add python-setuptools to BuildRequires
- Use dist tag

* Wed Apr 26 2006 Shahms E. King <shahms at shahms.com> 0.9.1-2
- Fix summary and description

* Tue Apr 18 2006 Shahms E. King <shahms at shahms.com> 0.9.1-1
- update the new upstream version
- remove Pyrex build req

* Tue Dec 13 2005 Shahms E. King <shahms at shahms.com> 0.8-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-lxml/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Apr 2006 22:04:58 -0000	1.1
+++ .cvsignore	26 Apr 2006 22:05:20 -0000	1.2
@@ -0,0 +1 @@
+lxml-0.9.1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-lxml/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Apr 2006 22:04:58 -0000	1.1
+++ sources	26 Apr 2006 22:05:20 -0000	1.2
@@ -0,0 +1 @@
+25e18d86050907f3a088550fe650f841  lxml-0.9.1.tgz



From fedora-extras-commits at redhat.com  Wed Apr 26 22:07:47 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 26 Apr 2006 15:07:47 -0700
Subject: owners owners.list,1.900,1.901
Message-ID: <200604262207.k3QM7nJs026584@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26564

Modified Files:
	owners.list 
Log Message:
added python-lxml



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.900
retrieving revision 1.901
diff -u -r1.900 -r1.901
--- owners.list	26 Apr 2006 16:01:21 -0000	1.900
+++ owners.list	26 Apr 2006 22:07:47 -0000	1.901
@@ -1278,6 +1278,7 @@
 Fedora Extras|python-json|A JSON reader and writer for Python|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|python-kid|A simple and pythonic XML template language|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|python-logilab-common|Common libraries for Logilab projects|icon at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|python-lxml|ElementTree-like Python bindings for libxml2 and libxslt|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-matplotlib|Python plotting library|orion at cora.nwra.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|michel.salim at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Apr 26 23:07:56 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 26 Apr 2006 16:07:56 -0700
Subject: rpms/cpanspec/FC-5 .cvsignore, 1.7, 1.8 cpanspec.spec, 1.6,
	1.7 sources, 1.7, 1.8
Message-ID: <200604262307.k3QN7wRV029050@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/cpanspec/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29029

Modified Files:
	.cvsignore cpanspec.spec sources 
Log Message:
Update to 1.65.
cpanget requires wget.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	25 Mar 2006 02:02:36 -0000	1.7
+++ .cvsignore	26 Apr 2006 23:07:56 -0000	1.8
@@ -1 +1 @@
-cpanspec-1.64.tar.gz
+cpanspec-1.65.tar.gz


Index: cpanspec.spec
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/FC-5/cpanspec.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cpanspec.spec	25 Mar 2006 02:02:36 -0000	1.6
+++ cpanspec.spec	26 Apr 2006 23:07:56 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           cpanspec
-Version:        1.64
+Version:        1.65
 Release:        1%{?dist}
 Summary:        RPM spec file generation utility
 License:        GPL or Artistic
@@ -10,6 +10,7 @@
 BuildArch:      noarch
 BuildRequires:  perl(Module::Build)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       /usr/bin/wget
 
 %description
 cpanspec generates spec files for Perl modules from CPAN for Fedora
@@ -50,6 +51,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Apr 26 2006 Steven Pritchard <steve at kspei.com> 1.65-1
+- Update to 1.65.
+- cpanget requires wget.
+
 * Wed Mar 24 2006 Steven Pritchard <steve at kspei.com> 1.64-1
 - Update to 1.64.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	25 Mar 2006 02:02:36 -0000	1.7
+++ sources	26 Apr 2006 23:07:56 -0000	1.8
@@ -1 +1 @@
-a77d2b4ef27633fc551d557f459b3462  cpanspec-1.64.tar.gz
+cf3704304f5a4cb80f97881b72c2a6d3  cpanspec-1.65.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 26 23:09:01 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 26 Apr 2006 16:09:01 -0700
Subject: rpms/cpanspec/FC-4 .cvsignore, 1.7, 1.8 cpanspec.spec, 1.6,
	1.7 sources, 1.7, 1.8
Message-ID: <200604262309.k3QN930c029122@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/cpanspec/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29101

Modified Files:
	.cvsignore cpanspec.spec sources 
Log Message:
Update to 1.65.
cpanget requires wget.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	25 Mar 2006 02:24:16 -0000	1.7
+++ .cvsignore	26 Apr 2006 23:09:00 -0000	1.8
@@ -1 +1 @@
-cpanspec-1.64.tar.gz
+cpanspec-1.65.tar.gz


Index: cpanspec.spec
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/FC-4/cpanspec.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cpanspec.spec	25 Mar 2006 02:24:16 -0000	1.6
+++ cpanspec.spec	26 Apr 2006 23:09:00 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           cpanspec
-Version:        1.64
+Version:        1.65
 Release:        1%{?dist}
 Summary:        RPM spec file generation utility
 License:        GPL or Artistic
@@ -10,6 +10,7 @@
 BuildArch:      noarch
 BuildRequires:  perl(Module::Build)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       /usr/bin/wget
 
 %description
 cpanspec generates spec files for Perl modules from CPAN for Fedora
@@ -50,6 +51,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Apr 26 2006 Steven Pritchard <steve at kspei.com> 1.65-1
+- Update to 1.65.
+- cpanget requires wget.
+
 * Wed Mar 24 2006 Steven Pritchard <steve at kspei.com> 1.64-1
 - Update to 1.64.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	25 Mar 2006 02:24:16 -0000	1.7
+++ sources	26 Apr 2006 23:09:00 -0000	1.8
@@ -1 +1 @@
-a77d2b4ef27633fc551d557f459b3462  cpanspec-1.64.tar.gz
+cf3704304f5a4cb80f97881b72c2a6d3  cpanspec-1.65.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 00:39:37 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Wed, 26 Apr 2006 17:39:37 -0700
Subject: rpms/raptor - New directory
Message-ID: <200604270039.k3R0deHl031589@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/raptor
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31563/raptor

Log Message:
Directory /cvs/extras/rpms/raptor added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 27 00:39:38 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Wed, 26 Apr 2006 17:39:38 -0700
Subject: rpms/raptor/devel - New directory
Message-ID: <200604270039.k3R0deFT031592@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/raptor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31563/raptor/devel

Log Message:
Directory /cvs/extras/rpms/raptor/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 27 00:39:49 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Wed, 26 Apr 2006 17:39:49 -0700
Subject: rpms/raptor Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604270039.k3R0dpSH031641@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/raptor
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31608

Added Files:
	Makefile import.log 
Log Message:
Setup of module raptor


--- NEW FILE Makefile ---
# Top level Makefile for module raptor
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 27 00:39:50 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Wed, 26 Apr 2006 17:39:50 -0700
Subject: rpms/raptor/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604270039.k3R0dqAF031644@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/raptor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31608/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module raptor


--- 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 Apr 27 00:40:34 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Wed, 26 Apr 2006 17:40:34 -0700
Subject: rpms/raptor import.log,1.1,1.2
Message-ID: <200604270041.k3R0f6CE031723@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/raptor
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31682

Modified Files:
	import.log 
Log Message:
auto-import raptor-1.4.8-5 on branch devel from raptor-1.4.8-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/raptor/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	27 Apr 2006 00:39:49 -0000	1.1
+++ import.log	27 Apr 2006 00:40:34 -0000	1.2
@@ -0,0 +1 @@
+raptor-1_4_8-5:HEAD:raptor-1.4.8-5.src.rpm:1146098434



From fedora-extras-commits at redhat.com  Thu Apr 27 00:40:34 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Wed, 26 Apr 2006 17:40:34 -0700
Subject: rpms/raptor/devel raptor-1.4.8-config.patch, NONE,
	1.1 raptor-1.4.8-pkgconfig.patch, NONE, 1.1 raptor.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604270041.k3R0f7GG031727@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/raptor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31682/devel

Modified Files:
	.cvsignore sources 
Added Files:
	raptor-1.4.8-config.patch raptor-1.4.8-pkgconfig.patch 
	raptor.spec 
Log Message:
auto-import raptor-1.4.8-5 on branch devel from raptor-1.4.8-5.src.rpm

raptor-1.4.8-config.patch:

--- NEW FILE raptor-1.4.8-config.patch ---
diff -Nur raptor-1.4.8-orig/src/raptor-config.in raptor-1.4.8/src/raptor-config.in
--- raptor-1.4.8-orig/src/raptor-config.in	2005-08-25 00:49:15.000000000 +0200
+++ raptor-1.4.8/src/raptor-config.in	2006-04-27 00:21:09.000000000 +0200
@@ -129,7 +129,7 @@
   done
 fi
 if test "$echo_libs" = "yes"; then
-  echo -L at libdir@ -lraptor @LDFLAGS@ @LIBS@
+  echo -L at libdir@ -lraptor 
 fi
 if test "$echo_libtool_libs" = "yes"; then
   echo @libdir@/@RAPTOR_LIBTOOLLIBS@

raptor-1.4.8-pkgconfig.patch:

--- NEW FILE raptor-1.4.8-pkgconfig.patch ---
diff -Nur raptor-1.4.8-orig/raptor.pc.in raptor-1.4.8/raptor.pc.in
--- raptor-1.4.8-orig/raptor.pc.in	2003-12-16 23:24:01.000000000 +0100
+++ raptor-1.4.8/raptor.pc.in	2006-04-23 22:50:05.000000000 +0200
@@ -6,6 +6,6 @@
 Name: Raptor
 Description: RDF Parser Toolkit Library
 Version: @VERSION@
-Libs: -L${libdir} -lraptor @LDFLAGS@ @LIBS@
+Libs: -L${libdir} -lraptor
 Cflags: -I${includedir}
 


--- NEW FILE raptor.spec ---
Summary:       Raptor RDF Parser Toolkit for Redland
Name:          raptor
Version:       1.4.8
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.8.tar.gz
Patch0:        raptor-1.4.8-pkgconfig.patch
Patch1:        raptor-1.4.8-config.patch
URL:           http://www.redland.opensource.ac.uk/raptor/
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libxml2-devel libxslt-devel curl-devel

%description
Raptor is the RDF Parser Toolkit for Redland that provides
a set of standalone RDF parsers, generating triples from RDF/XML
or N-Triples.

%package devel
Summary: Libraries, includes etc to develop with Raptor RDF parser library
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}

%description devel
Libraries, includes etc to develop with Raptor RDF parser library.
It provides a set of standalone RDF parsers, generating triples from
RDF/XML or N-Triples.

%prep
%setup -q
%patch0 -p1
%patch1 -p1

%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}/*.{a,la}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-, root, root)
%doc AUTHORS COPYING COPYING.LIB ChangeLog LICENSE-2.0.txt LICENSE.html LICENSE.txt NEWS README
%doc %{_mandir}/man1/rapper.1*
%doc %{_mandir}/man3/libraptor.3*
%{_libdir}/lib*.so.*
%{_bindir}/rapper


%files devel
%defattr(-, root, root)
%doc AUTHORS COPYING COPYING.LIB ChangeLog LICENSE-2.0.txt LICENSE.html LICENSE.txt NEWS README
%doc INSTALL.html
%doc %{_mandir}/man1/raptor-config.1*
%doc %{_datadir}/gtk-doc/html/raptor
%{_libdir}/lib*.so
%{_libdir}/pkgconfig/raptor.pc
%{_prefix}/include/*
%{_bindir}/raptor-config

%changelog
* Wed Apr 26 2006 Anthony Green <green at redhat.com> 1.4.8-5
- Add raptor-1.4.8-config.patch from Michael Schwendt.
- Remove some Requires from the devel package.

* Sun Apr 23 2006 Anthony Green <green at redhat.com> 1.4.8-4
- Add raptor-1.4.8-pkgconfig.patch from Michael Schwendt.

* Sun Apr 23 2006 Anthony Green <green at redhat.com> 1.4.8-3
- Many spec file fixes from Michael Schwendt.
- Add many Requires to the -devel package.

* Tue Apr 18 2006 Anthony Green <green at redhat.com> 1.4.8-1
- Upgrade sources.  
- Install with DESTDIR.
- Build for Fedora Extras.

* Fri Nov  7 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 1.0.0-1
- build for Planet CCRMA, clean up spec file

* Thu Apr 17 2003 Dave Beckett <Dave.Beckett at bristol.ac.uk>

- Added pkgconfig raptor.pc, raptor-config
- Requires curl

* Mon Jan 13 2003 Dave Beckett <Dave.Beckett at bristol.ac.uk>

- rdfdump now rapper

* Thu Jan  9 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu>
- built for planet ccrma
- one file conflicts with rdfdump in the nasm-rdoff package, so rename
  the binary to rdf-rdfdump for now. Maybe we should make this a
  "Conflict:" with nasm-rdoff and leave the file as is...

* Fri Dec 20 2002 Dave Beckett <Dave.Beckett at bristol.ac.uk>

- Updated to have two RPMs for raptor and raptor-devel.  Depend on
  libxml2 as XML parser.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/raptor/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2006 00:39:50 -0000	1.1
+++ .cvsignore	27 Apr 2006 00:40:34 -0000	1.2
@@ -0,0 +1 @@
+raptor-1.4.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/raptor/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2006 00:39:50 -0000	1.1
+++ sources	27 Apr 2006 00:40:34 -0000	1.2
@@ -0,0 +1 @@
+112d8b72a37f4de8a00f840999f2d383  raptor-1.4.8.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 00:47:33 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 26 Apr 2006 17:47:33 -0700
Subject: rpms/numpy/FC-5 .cvsignore, 1.3, 1.4 numpy.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <200604270047.k3R0lZ2K031818@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/numpy/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31781/FC-5

Modified Files:
	.cvsignore numpy.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/numpy/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 Feb 2006 01:08:01 -0000	1.3
+++ .cvsignore	27 Apr 2006 00:47:33 -0000	1.4
@@ -1 +1 @@
-numpy-0.9.5.tar.gz
+numpy-0.9.6.tar.gz


Index: numpy.spec
===================================================================
RCS file: /cvs/extras/rpms/numpy/FC-5/numpy.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- numpy.spec	17 Feb 2006 01:08:01 -0000	1.4
+++ numpy.spec	27 Apr 2006 00:47:33 -0000	1.5
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           numpy
-Version:        0.9.5
+Version:        0.9.6
 Release:        1%{?dist}
 Summary:        A fast multidimensional array facility for Python
 
@@ -35,7 +35,7 @@
 %patch1 -p1 -b .gfortran
 
 %build
-BLAS=%{_libdir} LAPACK=%{_libdir} CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -64,6 +64,9 @@
 %{python_sitearch}/%{name}
 
 %changelog
+* Wed Apr 26 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.6-1
+- Upstream update
+
 * Thu Feb 16 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.5-1
 - Upstream update
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/numpy/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Feb 2006 01:08:01 -0000	1.3
+++ sources	27 Apr 2006 00:47:33 -0000	1.4
@@ -1 +1 @@
-47fe186078c5e1f68b37e0ffc4994178  numpy-0.9.5.tar.gz
+eac9ae05bd7511cecf1ffd12da0e1993  numpy-0.9.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 00:47:34 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 26 Apr 2006 17:47:34 -0700
Subject: rpms/numpy/devel .cvsignore, 1.3, 1.4 numpy.spec, 1.4, 1.5 sources, 
	1.3, 1.4
Message-ID: <200604270047.k3R0lafa031824@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/numpy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31781/devel

Modified Files:
	.cvsignore numpy.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/numpy/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 Feb 2006 01:08:01 -0000	1.3
+++ .cvsignore	27 Apr 2006 00:47:34 -0000	1.4
@@ -1 +1 @@
-numpy-0.9.5.tar.gz
+numpy-0.9.6.tar.gz


Index: numpy.spec
===================================================================
RCS file: /cvs/extras/rpms/numpy/devel/numpy.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- numpy.spec	17 Feb 2006 01:08:01 -0000	1.4
+++ numpy.spec	27 Apr 2006 00:47:34 -0000	1.5
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           numpy
-Version:        0.9.5
+Version:        0.9.6
 Release:        1%{?dist}
 Summary:        A fast multidimensional array facility for Python
 
@@ -35,7 +35,7 @@
 %patch1 -p1 -b .gfortran
 
 %build
-BLAS=%{_libdir} LAPACK=%{_libdir} CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -64,6 +64,9 @@
 %{python_sitearch}/%{name}
 
 %changelog
+* Wed Apr 26 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.6-1
+- Upstream update
+
 * Thu Feb 16 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.5-1
 - Upstream update
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/numpy/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Feb 2006 01:08:01 -0000	1.3
+++ sources	27 Apr 2006 00:47:34 -0000	1.4
@@ -1 +1 @@
-47fe186078c5e1f68b37e0ffc4994178  numpy-0.9.5.tar.gz
+eac9ae05bd7511cecf1ffd12da0e1993  numpy-0.9.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 01:17:01 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 26 Apr 2006 18:17:01 -0700
Subject: rpms/alltray/FC-5 .cvsignore, 1.2, 1.3 alltray.spec, 1.6,
	1.7 sources, 1.2, 1.3
Message-ID: <200604270117.k3R1HXHw001681@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/alltray/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1642/FC-5

Modified Files:
	.cvsignore alltray.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alltray/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Dec 2005 23:02:37 -0000	1.2
+++ .cvsignore	27 Apr 2006 01:17:01 -0000	1.3
@@ -1 +1 @@
-alltray-0.65.tar.gz
+alltray-0.66.tar.gz


Index: alltray.spec
===================================================================
RCS file: /cvs/extras/rpms/alltray/FC-5/alltray.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- alltray.spec	14 Feb 2006 05:00:03 -0000	1.6
+++ alltray.spec	27 Apr 2006 01:17:01 -0000	1.7
@@ -1,16 +1,15 @@
 Name:           alltray
-Version:        0.65
-Release:        2%{?dist}
+Version:        0.66
+Release:        1%{?dist}
 Summary:        Dock any application in the tray
 
 Group:          User Interface/Desktops
 License:        GPL
 URL:            http://alltray.sourceforge.net/
 Source0:        http://dl.sourceforge.net/alltray/%{name}-%{version}.tar.gz
-Patch:          alltray-0.65-preload.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk2-devel desktop-file-utils
+BuildRequires:  gtk2-devel desktop-file-utils GConf2-devel
 #Requires:       
 
 %description
@@ -19,7 +18,6 @@
 
 %prep
 %setup -q
-%patch -p1 -b .preload
 
 %build
 export CFLAGS="-fPIC $RPM_OPT_FLAGS"
@@ -52,6 +50,9 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Wed Apr 26 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.66-1
+- Upstream update
+
 * Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.65-2
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alltray/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Dec 2005 23:02:37 -0000	1.2
+++ sources	27 Apr 2006 01:17:01 -0000	1.3
@@ -1 +1 @@
-c3b86dab94dbea416174d6e4dd82a173  alltray-0.65.tar.gz
+78b43bd2e19258b0518af99e21123561  alltray-0.66.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 01:17:02 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 26 Apr 2006 18:17:02 -0700
Subject: rpms/alltray/devel .cvsignore, 1.2, 1.3 alltray.spec, 1.6,
	1.7 sources, 1.2, 1.3
Message-ID: <200604270117.k3R1HYkO001686@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/alltray/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1642/devel

Modified Files:
	.cvsignore alltray.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alltray/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Dec 2005 23:02:37 -0000	1.2
+++ .cvsignore	27 Apr 2006 01:17:02 -0000	1.3
@@ -1 +1 @@
-alltray-0.65.tar.gz
+alltray-0.66.tar.gz


Index: alltray.spec
===================================================================
RCS file: /cvs/extras/rpms/alltray/devel/alltray.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- alltray.spec	14 Feb 2006 05:00:03 -0000	1.6
+++ alltray.spec	27 Apr 2006 01:17:02 -0000	1.7
@@ -1,16 +1,15 @@
 Name:           alltray
-Version:        0.65
-Release:        2%{?dist}
+Version:        0.66
+Release:        1%{?dist}
 Summary:        Dock any application in the tray
 
 Group:          User Interface/Desktops
 License:        GPL
 URL:            http://alltray.sourceforge.net/
 Source0:        http://dl.sourceforge.net/alltray/%{name}-%{version}.tar.gz
-Patch:          alltray-0.65-preload.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk2-devel desktop-file-utils
+BuildRequires:  gtk2-devel desktop-file-utils GConf2-devel
 #Requires:       
 
 %description
@@ -19,7 +18,6 @@
 
 %prep
 %setup -q
-%patch -p1 -b .preload
 
 %build
 export CFLAGS="-fPIC $RPM_OPT_FLAGS"
@@ -52,6 +50,9 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Wed Apr 26 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.66-1
+- Upstream update
+
 * Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.65-2
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alltray/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Dec 2005 23:02:37 -0000	1.2
+++ sources	27 Apr 2006 01:17:02 -0000	1.3
@@ -1 +1 @@
-c3b86dab94dbea416174d6e4dd82a173  alltray-0.65.tar.gz
+78b43bd2e19258b0518af99e21123561  alltray-0.66.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 03:00:34 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Wed, 26 Apr 2006 20:00:34 -0700
Subject: rpms/contacts - New directory
Message-ID: <200604270300.k3R30aVb004617@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/contacts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4591/contacts

Log Message:
Directory /cvs/extras/rpms/contacts added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 27 03:00:35 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Wed, 26 Apr 2006 20:00:35 -0700
Subject: rpms/contacts/devel - New directory
Message-ID: <200604270300.k3R30b2N004620@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/contacts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4591/contacts/devel

Log Message:
Directory /cvs/extras/rpms/contacts/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 27 03:00:50 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Wed, 26 Apr 2006 20:00:50 -0700
Subject: rpms/contacts Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604270300.k3R30qJR004669@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/contacts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4636

Added Files:
	Makefile import.log 
Log Message:
Setup of module contacts


--- NEW FILE Makefile ---
# Top level Makefile for module contacts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 27 03:00:50 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Wed, 26 Apr 2006 20:00:50 -0700
Subject: rpms/contacts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604270300.k3R30qi9004672@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/contacts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4636/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module contacts


--- 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 Apr 27 03:01:34 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Wed, 26 Apr 2006 20:01:34 -0700
Subject: rpms/contacts import.log,1.1,1.2
Message-ID: <200604270302.k3R32757006840@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/contacts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6806

Modified Files:
	import.log 
Log Message:
auto-import contacts-0.1-1 on branch devel from contacts-0.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/contacts/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	27 Apr 2006 03:00:49 -0000	1.1
+++ import.log	27 Apr 2006 03:01:34 -0000	1.2
@@ -0,0 +1 @@
+contacts-0_1-1:HEAD:contacts-0.1-1.src.rpm:1146106876



From fedora-extras-commits at redhat.com  Thu Apr 27 03:01:38 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Wed, 26 Apr 2006 20:01:38 -0700
Subject: rpms/contacts/devel contacts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604270302.k3R32CB1006844@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/contacts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6806/devel

Modified Files:
	.cvsignore sources 
Added Files:
	contacts.spec 
Log Message:
auto-import contacts-0.1-1 on branch devel from contacts-0.1-1.src.rpm


--- NEW FILE contacts.spec ---
Name:		contacts        
Version:        0.1
Release:        1
Summary:        Contacts addressbook

Group:         	Applications/Productivity
License:       	GPL 
URL:            http://projects.o-hand.com/contacts
Source0:        http://www.openedhand.com/~chris/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libglade2-devel >= 2.0.0
BuildRequires:  evolution-data-server-devel >= 1.2.0
BuildRequires: 	desktop-file-utils

%description
Contacts is a small, lightweight addressbook that uses libebook. 
This is the same library that GNOME Evolution uses, so all contact data that 
exists in your Evolution database is accessible via Contacts. Contacts features 
advanced vCard field type handling and is designed for use on hand-held 
devices, such as the Nokia 770 or the Sharp Zaurus series of PDAs.

%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 --delete-original	\
  --dir $RPM_BUILD_ROOT%{_datadir}/applications   	\
  --add-category X-Fedora			        \
  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING ChangeLog
%{_datadir}/pixmaps/oh-contacts.png
%{_datadir}/contacts/contacts.glade
%{_datadir}/applications/fedora-%{name}.desktop
%{_bindir}/contacts


%changelog
* Thu Apr 13 2006 David Nielsen <david at lovesunix.net> - 0.1-1
- Initial import


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/contacts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2006 03:00:50 -0000	1.1
+++ .cvsignore	27 Apr 2006 03:01:38 -0000	1.2
@@ -0,0 +1 @@
+contacts-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/contacts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2006 03:00:50 -0000	1.1
+++ sources	27 Apr 2006 03:01:38 -0000	1.2
@@ -0,0 +1 @@
+dc5a650445f0904392039006d929f192  contacts-0.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 03:05:20 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Wed, 26 Apr 2006 20:05:20 -0700
Subject: owners owners.list,1.901,1.902
Message-ID: <200604270305.k3R35MDL006934@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6917

Modified Files:
	owners.list 
Log Message:
Added contacts.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.901
retrieving revision 1.902
diff -u -r1.901 -r1.902
--- owners.list	26 Apr 2006 22:07:47 -0000	1.901
+++ owners.list	27 Apr 2006 03:05:20 -0000	1.902
@@ -151,6 +151,7 @@
 Fedora Extras|conglomerate|Extensible XML Editor|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|conserver|Serial console server daemon/client|jima at auroralinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|contact-lookup-applet|Applet which allows you to search your Evolution address book|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
+Fedora Extras|contacs|Contacts addressbook|jkeating at redhat.com|extras-qa at fedoraproject.org|
 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|cpan2rpm|Perl module packager|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Thu Apr 27 11:46:39 2006
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Thu, 27 Apr 2006 04:46:39 -0700
Subject: rpms/up-imapproxy/devel up-imapproxy-openssl098a.patch, NONE,
	1.1 up-imapproxy.spec, 1.6, 1.7
Message-ID: <200604271146.k3RBkfoB029704@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29684

Modified Files:
	up-imapproxy.spec 
Added Files:
	up-imapproxy-openssl098a.patch 
Log Message:
* Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 1.2.4-6
- Patch to fix changes in OpenSSL.
- Thanks to Paul W. Frields for providing the patch.


up-imapproxy-openssl098a.patch:

--- NEW FILE up-imapproxy-openssl098a.patch ---
diff -uNr up-imapproxy-1.2.4-orig/src/imapcommon.c up-imapproxy-1.2.4/src/imapcommon.c
--- up-imapproxy-1.2.4-orig/src/imapcommon.c	2005-08-31 12:32:24.000000000 -0400
+++ up-imapproxy-1.2.4/src/imapcommon.c	2005-12-26 13:08:30.000000000 -0500
@@ -136,6 +136,7 @@
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
+#include <openssl/md5.h>
 
 #include <pthread.h>
 #include <sys/types.h>


Index: up-imapproxy.spec
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/devel/up-imapproxy.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- up-imapproxy.spec	26 Dec 2005 14:14:01 -0000	1.6
+++ up-imapproxy.spec	27 Apr 2006 11:46:38 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: University of Pittsburgh IMAP Proxy
 Name: up-imapproxy
 Version: 1.2.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.imapproxy.org
@@ -10,6 +10,7 @@
 # Source1 can be downloaded from
 # https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=118632
 Patch0: %{name}-CAN-2005-2661.patch
+Patch1: %{name}-openssl098a.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig, /sbin/service
@@ -30,6 +31,7 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p1
 
 %build
 %configure
@@ -74,6 +76,10 @@
 %{_sbindir}/*
 
 %changelog
+* Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 1.2.4-6
+- Patch to fix changes in OpenSSL.
+- Thanks to Paul W. Frields for providing the patch.
+
 * Mon Dec 26 2005 Jeff Carlson <jeff at ultimateevil.org> - 1.2.4-5
 - Rebuild against new OpenSSL in devel (fc5 only).
 



From fedora-extras-commits at redhat.com  Thu Apr 27 11:49:28 2006
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Thu, 27 Apr 2006 04:49:28 -0700
Subject: rpms/up-imapproxy/FC-5 up-imapproxy-openssl098a.patch, NONE,
	1.1 up-imapproxy.spec, 1.6, 1.7
Message-ID: <200604271149.k3RBnUd8029754@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29734

Modified Files:
	up-imapproxy.spec 
Added Files:
	up-imapproxy-openssl098a.patch 
Log Message:
* Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 1.2.4-6
- Patch to fix changes in OpenSSL.
- Thanks to Paul W. Frields for providing the patch.


up-imapproxy-openssl098a.patch:

--- NEW FILE up-imapproxy-openssl098a.patch ---
diff -uNr up-imapproxy-1.2.4-orig/src/imapcommon.c up-imapproxy-1.2.4/src/imapcommon.c
--- up-imapproxy-1.2.4-orig/src/imapcommon.c	2005-08-31 12:32:24.000000000 -0400
+++ up-imapproxy-1.2.4/src/imapcommon.c	2005-12-26 13:08:30.000000000 -0500
@@ -136,6 +136,7 @@
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
+#include <openssl/md5.h>
 
 #include <pthread.h>
 #include <sys/types.h>


Index: up-imapproxy.spec
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/FC-5/up-imapproxy.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- up-imapproxy.spec	26 Dec 2005 14:14:01 -0000	1.6
+++ up-imapproxy.spec	27 Apr 2006 11:49:28 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: University of Pittsburgh IMAP Proxy
 Name: up-imapproxy
 Version: 1.2.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.imapproxy.org
@@ -10,6 +10,7 @@
 # Source1 can be downloaded from
 # https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=118632
 Patch0: %{name}-CAN-2005-2661.patch
+Patch1: %{name}-openssl098a.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig, /sbin/service
@@ -30,6 +31,7 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p1
 
 %build
 %configure
@@ -74,6 +76,10 @@
 %{_sbindir}/*
 
 %changelog
+* Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 1.2.4-6
+- Patch to fix changes in OpenSSL.
+- Thanks to Paul W. Frields for providing the patch.
+
 * Mon Dec 26 2005 Jeff Carlson <jeff at ultimateevil.org> - 1.2.4-5
 - Rebuild against new OpenSSL in devel (fc5 only).
 



From fedora-extras-commits at redhat.com  Thu Apr 27 11:59:33 2006
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Thu, 27 Apr 2006 04:59:33 -0700
Subject: rpms/zile/FC-5 zile.spec,1.2,1.3
Message-ID: <200604271159.k3RBxZIp029861@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/zile/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29795/FC-5

Modified Files:
	zile.spec 
Log Message:
* Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-1
- Bump to latest release.



Index: zile.spec
===================================================================
RCS file: /cvs/extras/rpms/zile/FC-5/zile.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- zile.spec	24 Aug 2005 16:26:39 -0000	1.2
+++ zile.spec	27 Apr 2006 11:59:32 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Zile Is Lossy Emacs
 Name: zile
-Version: 2.2.4
-Release: 2%{?dist}
+Version: 2.2.13
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Editors
 URL: http://zile.sourceforge.net/
@@ -40,12 +40,15 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS
-     %{_bindir}/*
-     %{_infodir}/*
-     %{_mandir}/man1/*
-     %{_datadir}/zile/
+%{_bindir}/*
+%{_infodir}/*
+%{_mandir}/man1/*
+%{_datadir}/zile/
 
 %changelog
+* Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-1
+- Bump to latest release.
+
 * Wed Aug 24 2005 Jeff Carlson <jeff at ultimateevil.org> - 2.2.4-2
 - Another BuildRequires.
 



From fedora-extras-commits at redhat.com  Thu Apr 27 11:59:32 2006
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Thu, 27 Apr 2006 04:59:32 -0700
Subject: rpms/zile/FC-4 zile.spec,1.2,1.3
Message-ID: <200604271159.k3RBxYjR029857@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/zile/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29795/FC-4

Modified Files:
	zile.spec 
Log Message:
* Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-1
- Bump to latest release.



Index: zile.spec
===================================================================
RCS file: /cvs/extras/rpms/zile/FC-4/zile.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- zile.spec	24 Aug 2005 16:26:34 -0000	1.2
+++ zile.spec	27 Apr 2006 11:59:32 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Zile Is Lossy Emacs
 Name: zile
-Version: 2.2.4
-Release: 2%{?dist}
+Version: 2.2.13
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Editors
 URL: http://zile.sourceforge.net/
@@ -40,12 +40,15 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS
-     %{_bindir}/*
-     %{_infodir}/*
-     %{_mandir}/man1/*
-     %{_datadir}/zile/
+%{_bindir}/*
+%{_infodir}/*
+%{_mandir}/man1/*
+%{_datadir}/zile/
 
 %changelog
+* Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-1
+- Bump to latest release.
+
 * Wed Aug 24 2005 Jeff Carlson <jeff at ultimateevil.org> - 2.2.4-2
 - Another BuildRequires.
 



From fedora-extras-commits at redhat.com  Thu Apr 27 11:59:33 2006
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Thu, 27 Apr 2006 04:59:33 -0700
Subject: rpms/zile/devel zile.spec,1.2,1.3
Message-ID: <200604271159.k3RBxZ4B029865@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/zile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29795/devel

Modified Files:
	zile.spec 
Log Message:
* Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-1
- Bump to latest release.



Index: zile.spec
===================================================================
RCS file: /cvs/extras/rpms/zile/devel/zile.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- zile.spec	24 Aug 2005 16:26:39 -0000	1.2
+++ zile.spec	27 Apr 2006 11:59:33 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Zile Is Lossy Emacs
 Name: zile
-Version: 2.2.4
-Release: 2%{?dist}
+Version: 2.2.13
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Editors
 URL: http://zile.sourceforge.net/
@@ -40,12 +40,15 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS
-     %{_bindir}/*
-     %{_infodir}/*
-     %{_mandir}/man1/*
-     %{_datadir}/zile/
+%{_bindir}/*
+%{_infodir}/*
+%{_mandir}/man1/*
+%{_datadir}/zile/
 
 %changelog
+* Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-1
+- Bump to latest release.
+
 * Wed Aug 24 2005 Jeff Carlson <jeff at ultimateevil.org> - 2.2.4-2
 - Another BuildRequires.
 



From fedora-extras-commits at redhat.com  Thu Apr 27 11:59:31 2006
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Thu, 27 Apr 2006 04:59:31 -0700
Subject: rpms/zile/FC-3 zile.spec,1.2,1.3
Message-ID: <200604271200.k3RC03Bq029876@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/zile/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29795/FC-3

Modified Files:
	zile.spec 
Log Message:
* Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-1
- Bump to latest release.



Index: zile.spec
===================================================================
RCS file: /cvs/extras/rpms/zile/FC-3/zile.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- zile.spec	24 Aug 2005 16:26:34 -0000	1.2
+++ zile.spec	27 Apr 2006 11:59:31 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Zile Is Lossy Emacs
 Name: zile
-Version: 2.2.4
-Release: 2%{?dist}
+Version: 2.2.13
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Editors
 URL: http://zile.sourceforge.net/
@@ -40,12 +40,15 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS
-     %{_bindir}/*
-     %{_infodir}/*
-     %{_mandir}/man1/*
-     %{_datadir}/zile/
+%{_bindir}/*
+%{_infodir}/*
+%{_mandir}/man1/*
+%{_datadir}/zile/
 
 %changelog
+* Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-1
+- Bump to latest release.
+
 * Wed Aug 24 2005 Jeff Carlson <jeff at ultimateevil.org> - 2.2.4-2
 - Another BuildRequires.
 



From fedora-extras-commits at redhat.com  Thu Apr 27 12:22:53 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Thu, 27 Apr 2006 05:22:53 -0700
Subject: fedora-security/audit fc4,1.220,1.221 fc5,1.134,1.135
Message-ID: <200604271222.k3RCMrmN032264@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32244

Modified Files:
	fc4 fc5 
Log Message:
Updates for yesterday



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- fc4	26 Apr 2006 11:28:27 -0000	1.220
+++ fc4	27 Apr 2006 12:22:51 -0000	1.221
@@ -1,22 +1,27 @@
-Up to date CVE as of CVE email 20060425
-Up to date FC4 as of 20060425
+Up to date CVE as of CVE email 20060426
+Up to date FC4 as of 20060426
 
 ** are items that need attention
 
+CVE-2006-2057 ** firefox
+CVE-2006-2026 VULNERABLE (libtiff, fixed 3.8.1) #189934
+CVE-2006-2025 VULNERABLE (libtiff, fixed 3.8.1) #189934
+CVE-2006-2024 VULNERABLE (libtiff, fixed 3.8.1) #189934
 CVE-2006-1991 VULNERABLE (php)
 CVE-2006-1990 VULNERABLE (php)
 CVE-2006-1942 ** firefox
-CVE-2006-1940 VULNERABLE (ethereal, fixed 0.99.0)
-CVE-2006-1939 VULNERABLE (ethereal, fixed 0.99.0)
-CVE-2006-1938 VULNERABLE (ethereal, fixed 0.99.0)
-CVE-2006-1937 VULNERABLE (ethereal, fixed 0.99.0)
-CVE-2006-1936 VULNERABLE (ethereal, fixed 0.99.0)
-CVE-2006-1935 VULNERABLE (ethereal, fixed 0.99.0)
-CVE-2006-1934 VULNERABLE (ethereal, fixed 0.99.0)
-CVE-2006-1933 VULNERABLE (ethereal, fixed 0.99.0)
-CVE-2006-1932 VULNERABLE (ethereal, fixed 0.99.0)
+CVE-2006-1940 version (ethereal, fixed 0.99.0) [since FEDORA-2006-461]
+CVE-2006-1939 version (ethereal, fixed 0.99.0) [since FEDORA-2006-461]
+CVE-2006-1938 version (ethereal, fixed 0.99.0) [since FEDORA-2006-461]
+CVE-2006-1937 version (ethereal, fixed 0.99.0) [since FEDORA-2006-461]
+CVE-2006-1936 version (ethereal, fixed 0.99.0) [since FEDORA-2006-461]
+CVE-2006-1935 version (ethereal, fixed 0.99.0) [since FEDORA-2006-461]
+CVE-2006-1934 version (ethereal, fixed 0.99.0) [since FEDORA-2006-461]
+CVE-2006-1933 version (ethereal, fixed 0.99.0) [since FEDORA-2006-461]
+CVE-2006-1932 version (ethereal, fixed 0.99.0) [since FEDORA-2006-461]
 CVE-2006-1931 version (ruby, fixed 1.8.3)
 CVE-2006-1902 ignore (gcc) not a vulnerability
+CVE-2006-1864 VULNERABLE (kernel)
 CVE-2006-1863 VULNERABLE (kernel, fixed 2.6.16.11)
 CVE-2006-1790 version (firefox, fixed 1.0.8) [since FEDORA-2006-410]
 CVE-2006-1790 VULNERABLE (thunderbird, fixed 1.0.8)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- fc5	26 Apr 2006 11:28:27 -0000	1.134
+++ fc5	27 Apr 2006 12:22:51 -0000	1.135
@@ -1,8 +1,12 @@
-Up to date CVE as of CVE email 20060425
-Up to date FC5 as of 20060425
+Up to date CVE as of CVE email 20060426
+Up to date FC5 as of 20060426
 
 ** are items that need attention
 
+CVE-2006-2057 ** firefox
+CVE-2006-2026 VULNERABLE (libtiff, fixed 3.8.1) #189934
+CVE-2006-2025 VULNERABLE (libtiff, fixed 3.8.1) #189934
+CVE-2006-2024 VULNERABLE (libtiff, fixed 3.8.1) #189934
 CVE-2006-1991 VULNERABLE (php)
 CVE-2006-1990 VULNERABLE (php)
 CVE-2006-1942 ** firefox
@@ -18,6 +22,7 @@
 CVE-2006-1931 version (ruby, fixed 1.8.3)
 CVE-2006-1902 ignore (gcc) not a vulnerability
 CVE-2006-1865 version (beagle, fixed 0.2.5) [since FEDORA-2006-440]
+CVE-2006-1864 VULNERABLE (kernel)
 CVE-2006-1863 VULNERABLE (kernel, fixed 2.6.16.11)
 CVE-2006-1790 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1790 VULNERABLE (thunderbird, fixed 1.5.0.2)



From fedora-extras-commits at redhat.com  Thu Apr 27 13:04:47 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Thu, 27 Apr 2006 06:04:47 -0700
Subject: owners owners.list,1.902,1.903
Message-ID: <200604271304.k3RD4nfB002147@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2126

Modified Files:
	owners.list 
Log Message:
typo in contacts.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.902
retrieving revision 1.903
diff -u -r1.902 -r1.903
--- owners.list	27 Apr 2006 03:05:20 -0000	1.902
+++ owners.list	27 Apr 2006 13:04:46 -0000	1.903
@@ -151,7 +151,7 @@
 Fedora Extras|conglomerate|Extensible XML Editor|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|conserver|Serial console server daemon/client|jima at auroralinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|contact-lookup-applet|Applet which allows you to search your Evolution address book|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
-Fedora Extras|contacs|Contacts addressbook|jkeating at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|contacts|Contacts addressbook|jkeating at redhat.com|extras-qa at fedoraproject.org|
 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|cpan2rpm|Perl module packager|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Thu Apr 27 14:19:11 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Thu, 27 Apr 2006 07:19:11 -0700
Subject: status-report-scripts parseBZbugList,1.31,1.32
Message-ID: <200604271419.k3REJB07005018@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5000

Modified Files:
	parseBZbugList 
Log Message:
Add dropped from core info, and streamline repo querying a bit.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- parseBZbugList	19 Apr 2006 10:20:19 -0000	1.31
+++ parseBZbugList	27 Apr 2006 14:19:08 -0000	1.32
@@ -77,33 +77,27 @@
 use Date::Manip;
 
 my %opt;
-my @options = ( "help", "core=s", "extras=s", "bzid=s", "o=s", "d=s",
-		"extras_r=s", "core_r=s", "cvs=s" );
+my @options = ( "help", "repourl=s", "bzid=s", "o=s", "d=s", "cvs=s",
+		"currel=i", "firstrel=i" );
 
-$main::core
-  = "http://mirrors.kernel.org/fedora/core/development/SRPMS/";
-$main::core_r
-  = "http://mirrors.kernel.org/fedora/core/5/source/SRPMS/";
-$main::extras
-  = "http://mirrors.kernel.org/fedora/extras/development/SRPMS/";
-$main::extras_r
-  = "http://mirrors.kernel.org/fedora/extras/5/SRPMS/";
+$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::cvsDir = "/export/scratch/extras";
+$main::currel = 5;
+$main::firstrel = 1;
 
 if( ! GetOptions( \%opt, @options ) ) { &usage(); }
 
 # Override any default settings with arguments that the user has supplied
-$main::core = $opt{"core"} if defined $opt{"core"};
-$main::extras = $opt{"extras"} if defined $opt{"extras"};
-$main::extras_r = $opt{"extras_r"} if defined $opt{"extras_r"};
-$main::extras_r = $opt{"core_r"} if defined $opt{"core_r"};
+$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::currel = $opt{"currel"} if defined $opt{"currel"};
+$main::firstrel = $opt{"firstrel"} if defined $opt{"firstrel"};
 
 &usage() if defined $opt{'help'};
 
@@ -119,11 +113,12 @@
 my %BZR;
 my %BZA;
 my %BZB;
-my %CORE;
-my %CORE_R;
-my %EXTRAS;
-my %EXTRAS_R;
+my %CORE_D;
+my @CORE_R;
+my %EXTRAS_D;
+my @EXTRAS_R;
 my %SRPMS;
+my @CORE_DROPPED_SRPMS;
 my %NAME;
 my %OWN;
 my %OWN_DUP;
@@ -209,20 +204,22 @@
     print STDERR "$k is in the list of discarded pkgs, but not in owners\n";
   }
 }
-if ($main::extras ne "") {
-  &grabRepoList($main::extras, \%EXTRAS);
-}
-if ($main::extras_r ne "") {
-  &grabRepoList($main::extras_r, \%EXTRAS_R);
-}
-if ($main::core ne "") {
-  &grabRepoList($main::core, \%CORE);
-}
-if ($main::core_r ne "") {
-  &grabRepoList($main::core_r, \%CORE_R);
+&grabRepoList("$main::repourl/core/development/SRPMS/", \%CORE_D);
+&grabRepoList("$main::repourl/extras/development/SRPMS/", \%EXTRAS_D);
+for my $i ($main::firstrel .. $main::currel) {
+  $CORE_R[$i] = {};
+  if ($i >= 5) {
+    &grabRepoList("$main::repourl/core/$i/source/SRPMS/", $CORE_R[$i]);
+  } else {
+    &grabRepoList("$main::repourl/core/$i/SRPMS/", $CORE_R[$i]);
+  }
+  $EXTRAS_R[$i] = {};
+  if ($i >= 3) {
+    &grabRepoList("$main::repourl/extras/$i/SRPMS/", $EXTRAS_R[$i]);
+  }
 }
-%SRPMS = %EXTRAS;
-foreach my $k (keys %CORE) {
+%SRPMS = %EXTRAS_D;
+foreach my $k (keys %CORE_D) {
   $SRPMS{$k} = 1;
 }
 foreach my $k (keys %FC_INTEGRATED) {
@@ -251,7 +248,7 @@
   while ( <IN> ) {
     s/\s+$//;
     $COUNT_LIST{"CVS"} += 1;
-    if (defined($CORE{$_}) && -f "$main::cvsDir/$_/devel/$_.spec") {
+    if (defined($CORE_D{$_}) && -f "$main::cvsDir/$_/devel/$_.spec") {
       push @PL, $_;
     }
     next if defined($OWN{$_}) || defined($DISCARD{$_});
@@ -381,8 +378,10 @@
 &checkLowActivity(\%BZB, "OPEN-BUGS");
 &checkBugs(\%BZB);
 &checkMaintainers();
-&checkCoreAndExtras(\%CORE_R, \%EXTRAS_R, "release");
-&checkCoreAndExtras(\%CORE, \%EXTRAS, "devel");
+&checkCoreAndExtras($CORE_R[$main::currel],
+		    $EXTRAS_R[$main::currel], "release");
+&checkCoreAndExtras(\%CORE_D, \%EXTRAS_D, "devel");
+&checkDropped();
 print "[[TableOfContents]]\n\n= FE Package Status of ",
   &UnixDate("today", "%b %e, %Y"), " =\n";
 &displayOwnersWiki;
@@ -395,6 +394,7 @@
 &displayNewReviewWiki(\%BZB, "OPEN-BUGS", 4);
 &displayCVSWiki();
 &displayMaintainersWiki();
+&displayDroppedWiki();
 print "----\nCategoryExtras\n";
 print STDERR "\n\nFE Package Status of ",
   &UnixDate("today", "%b %e, %Y"), "\n";
@@ -410,6 +410,7 @@
 &displayNewReviewMail("OPEN-BUGS");
 &displayCVSMail();
 &displayMaintainersMail();
+&displayDroppedMail();
 
 exit 0;
 
@@ -421,7 +422,7 @@
   my @NP_R;
   my @NPC;
   my @OE;
-  foreach my $k (keys %EXTRAS) {
+  foreach my $k (keys %EXTRAS_D) {
     next if defined $OWN{$k};
     push @NO, $k
   }
@@ -435,11 +436,11 @@
     if (defined $OWN{$l}) {
       $OWN_DUP{$l} = $OWN{$l};
       $OWN_DUP{$k} = $OWN{$k};
-      if (defined($EXTRAS{$l}) || defined($CORE{$l})) {
+      if (defined($EXTRAS_D{$l}) || defined($CORE_D{$l})) {
 	delete $OWN{$k};
 	next;
       }
-      if (defined($EXTRAS{$k}) || defined($CORE{$k})) {
+      if (defined($EXTRAS_D{$k}) || defined($CORE_D{$k})) {
 	delete $OWN{$l};
       }
     }
@@ -459,16 +460,16 @@
     }
     if ($$a[3] eq $extras_orphan) {
       $orphan += 1;
-      push @OE, $k if defined $EXTRAS{$k};
+      push @OE, $k if defined $EXTRAS_D{$k};
       next;
     } else {
       $$s[2] = 1 if defined $OWN_CVS_RECENT{$k};
     }
-    unless (defined $EXTRAS{$k}) {
-      if (defined($CORE{$k}) || defined($FC_INTEGRATED{$k})) {
+    unless (defined $EXTRAS_D{$k}) {
+      if (defined($CORE_D{$k}) || defined($FC_INTEGRATED{$k})) {
 	push @NPC, $k;
       } else {
-	if (defined $EXTRAS_R{$k}) {
+	if (defined $EXTRAS_R[$main::currel]->{$k}) {
 	  push @NP_R, $k;
 	} else {
 	  push @NP, $k;
@@ -692,7 +693,7 @@
       $BZREV_CNT{$$a[4]} += 1;
       $BZOWN_CNT{$$a[5]} += 1;
       $COUNT_LIST{"acceptedClosed"} += 1;
-      if (!defined($CORE{$pkg}) && !defined($OWN{$pkg})) {
+      if (!defined($CORE_D{$pkg}) && !defined($OWN{$pkg})) {
 	push @BLO, $b;
 	$COUNT_LIST{"missingOwner"} += 1;
       }
@@ -869,18 +870,14 @@
   -help           this help note
   -bzid <url>     list associating bz ticket number with package name
                   [$main::bzid]
-  -extras <url>   Fedora extras SRPMS development repo
-                  [$main::extras]
-  -extras_r <url> Fedora extras SRPMS release repo
-                  [$main::extras_r]
-  -core <url>     Fedora core SRPMS development repo
-                  [$main::core]
-  -core_r <url>   Fedora core SRPMS release repo
-                  [$main::core]
+  -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
-  -cvs <dir>      extras CVS directory [$main::cvsDir]\n";
+  -repourl <url>  Fedora core and extras SRPMS development repo base
+                  [$main::repourl]\n";
   exit 1;
 }
 
@@ -1195,3 +1192,44 @@
     &displayPkgListByOwnerMail($PKG_LIST{"commondevel"});
   }
 }
+
+sub checkDropped {
+  my %D;
+  for (my $i = $main::currel - 1; $i >= $main::firstrel; $i--) {
+    print STDERR "Checking core $i\n";
+    foreach my $k (keys %{$CORE_R[$i]}) {
+      print STDERR " Checking package $k\n";
+      unless ($SRPMS{$k} or $D{$k}) {
+	$CORE_DROPPED_SRPMS[$i]->{$k} = 1;
+	$D{$k} = 1;
+      }
+    }
+  }
+  my @PL = keys %D;
+  $PKG_LIST{"Dropped"} = \@PL;
+  $COUNT_LIST{'Dropped'} = $#PL + 1;
+}
+
+sub displayDroppedWiki {
+  return if $COUNT_LIST{'Dropped'} == 0;
+  print "== About dropped packages ==\n\n";
+  print "We have a total of $COUNT_LIST{'Dropped'} dropped packages.\n";
+  for (my $i = $main::currel - 1; $i >= $main::firstrel; $i--) {
+    my @A = keys %{$CORE_DROPPED_SRPMS[$i]};
+    if ($#A >= 0) {
+      my $n = $i + 1;
+      print "\n=== FC packages dropped between release $i and $n ===\n";
+      my $cnt = $#A + 1;
+      print "\nWe have $cnt packages dropped from core:{{{\n";
+      print &toLine(join(" ", sort @A)), "\n";
+      print "}}}\n";
+    }
+  }
+}
+
+sub displayDroppedMail {
+  return if $COUNT_LIST{'Dropped'} == 0;
+  print STDERR "\nDropped FC packages:\n";
+  print STDERR " - $COUNT_LIST{'Dropped'} packages were dropped from core",
+    " since FC $main::firstrel\n";
+}



From fedora-extras-commits at redhat.com  Thu Apr 27 14:54:19 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 27 Apr 2006 07:54:19 -0700
Subject: rpms/sbcl/FC-5 .cvsignore, 1.11, 1.12 sbcl.spec, 1.40, 1.41 sources,
	1.11, 1.12
Message-ID: <200604271454.k3REsL0c005170@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5149

Modified Files:
	.cvsignore sbcl.spec sources 
Log Message:
* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-1
- 0.9.12



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	30 Mar 2006 19:04:59 -0000	1.11
+++ .cvsignore	27 Apr 2006 14:54:18 -0000	1.12
@@ -1,4 +1,4 @@
-sbcl-0.9.11-source.tar.bz2
+sbcl-0.9.12-source.tar.bz2
 sbcl-0.9.11-x86-64-linux-binary.tar.bz2 
 sbcl-0.9.11-x86-linux-binary.tar.bz2
-sbcl-0.8.15-powerpc-linux-binary.tar.bz2
+sbcl-0.9.8-powerpc-linux-binary.tar.bz2


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-5/sbcl.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sbcl.spec	30 Mar 2006 19:04:59 -0000	1.40
+++ sbcl.spec	27 Apr 2006 14:54:18 -0000	1.41
@@ -12,7 +12,7 @@
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
-Version: 0.9.11
+Version: 0.9.12
 Release: 1%{?dist}
 
 License: BSD/MIT
@@ -26,12 +26,22 @@
 #Source1: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2
 Source2: customize-target-features.lisp 
 
+## Bootstraps
+# %{ix86}
+#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-linux-binary.tar.bz2
+# x86_64
+#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-64-linux-binary.tar.bz2
+# ppc
+#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-powerpc-linux-binary.tar.bz2
+# another possible ppc bootstrap to try
+#Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
+
+
 ## x86 section
 %ifarch %{ix86}
 %define sbcl_arch x86
 BuildRequires: sbcl
 # or
-#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-linux-binary.tar.bz2
 #define sbcl_bootstrap_src -a 10 
 %endif
 
@@ -47,16 +57,10 @@
 ## ppc section
 # Latest powerpc-linux bootstrap build fails:
 # http://bugzilla.redhat.com/bugzilla/177029 
-#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2
-# another possible ppc bootstrap to try
-#Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
 Source35: ppc-linux-mcontext.h
 %ifarch ppc 
 %define sbcl_arch ppc
 %define sbcl_bootstrap_src -a 30
-BuildRequires: setarch
-%define setarch setarch %{_target_cpu}
-%define min_bootstrap 1
 %endif
 
 Source100: my_setarch.c
@@ -65,7 +69,7 @@
 Patch2: sbcl-0.9.5-personality.patch
 Patch3: sbcl-0.9.5-optflags.patch
 Patch4: sbcl-0.9.4-LIB_DIR.patch
-Patch5: sbcl-0.9.10-make-config-ppc.patch
+#Patch5: sbcl-0.9.10-make-config-ppc.patch
 Patch6: sbcl-0.9.5-verbose-build.patch
 # Allow override of contrib test failure(s)
 Patch7: sbcl-0.9.9-permissive.patch
@@ -97,7 +101,7 @@
 %patch2 -p1 -b .personality
 %patch3 -p1 -b .optflags
 %patch4 -p1 -b .LIB_DIR
-%patch5 -p1 -b .make-config-ppc
+#patch5 -p1 -b .make-config-ppc
 %{?sbcl_verbose:%patch6 -p1 -b .verbose-build}
 %patch7 -p1 -b .permissive
 
@@ -228,6 +232,9 @@
 
 
 %changelog
+* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-1
+- 0.9.12
+
 * Mon Mar 27 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.11-1
 - 0.9.11
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	30 Mar 2006 19:04:59 -0000	1.11
+++ sources	27 Apr 2006 14:54:18 -0000	1.12
@@ -1 +1 @@
-b82c3b7cf5c351cbe97af5150c17ad27  sbcl-0.9.11-source.tar.bz2
+82eef4f47d6a72a36d4484bf503fc7db  sbcl-0.9.12-source.tar.bz2



From fedora-extras-commits at redhat.com  Thu Apr 27 14:57:59 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 27 Apr 2006 07:57:59 -0700
Subject: rpms/maxima/devel maxima-5.9.3-gcl-setarch.patch, NONE,
	1.1 maxima-5.9.3-sbcl-disable-debugger.patch, NONE,
	1.1 .cvsignore, 1.5, 1.6 maxima.spec, 1.23,
	1.24 maxima-5.9.2-sbcl-disable-debugger.patch, 1.1, NONE
Message-ID: <200604271458.k3REw1OA005278@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5253

Modified Files:
	.cvsignore maxima.spec 
Added Files:
	maxima-5.9.3-gcl-setarch.patch 
	maxima-5.9.3-sbcl-disable-debugger.patch 
Removed Files:
	maxima-5.9.2-sbcl-disable-debugger.patch 
Log Message:
* Wed Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-2
- use setarch -X hack to allow runtime-gcl to function (#187647)
- respin for sbcl-0.9.12


maxima-5.9.3-gcl-setarch.patch:

--- NEW FILE maxima-5.9.3-gcl-setarch.patch ---
--- maxima-5.9.3/src/maxima.in.setarch	2005-11-07 11:37:11.000000000 -0600
+++ maxima-5.9.3/src/maxima.in	2006-04-27 07:07:42.000000000 -0500
@@ -128,7 +128,7 @@
 	exec "@SCL_NAME@" -quiet -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
     fi
 elif [ "$MAXIMA_LISP" = "gcl" ]; then
-    exec "$maxima_image_base" -eval '(cl-user::run)' -f -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+    exec "setarch" "@ARCH@" "-X" "$maxima_image_base" -eval '(cl-user::run)' -f -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
 elif [ "$MAXIMA_LISP" = "acl6" ]; then
 # FIXME: arguments need in a manner consistent with the way they are extracted
 #        in the function get-application-args in command-line.lisp

maxima-5.9.3-sbcl-disable-debugger.patch:

--- NEW FILE maxima-5.9.3-sbcl-disable-debugger.patch ---
--- maxima-5.9.3/src/Makefile.am.sbcl-disable-debugger	2006-02-11 08:25:06.000000000 -0600
+++ maxima-5.9.3/src/Makefile.am	2006-04-26 14:30:15.000000000 -0500
@@ -151,7 +151,7 @@
 
 
 if SBCL
-EXECUTESBCL = $(SBCL_NAME) --noinform --noprint --eval
+EXECUTESBCL = $(SBCL_NAME) --noinform --noprint --disable-debugger --eval
 all-local: binary-sbcl/maxima.core
 install-exec-local: install-sbcl
 uninstall: uninstall-sbcl
--- maxima-5.9.3/src/Makefile.in.sbcl-disable-debugger	2006-03-19 09:23:40.000000000 -0600
+++ maxima-5.9.3/src/Makefile.in	2006-04-26 14:31:14.000000000 -0500
@@ -204,7 +204,7 @@
 @CMUCL_TRUE at EXECUTECMUCL = $(CMUCL_NAME) -noinit -batch
 @SCL_TRUE at EXECUTESCL = $(SCL_NAME) -noinit -batch
 @ACL6_TRUE at EXECUTEACL6 = $(ACL6_NAME) -batch
- at SBCL_TRUE@EXECUTESBCL = $(SBCL_NAME) --noinform --noprint --eval
+ at SBCL_TRUE@EXECUTESBCL = $(SBCL_NAME) --noinform --noprint --disable-debugger --eval
 @GCL_TRUE at EXECUTEGCL = $(GCL_NAME) -batch -eval
 @OPENMCL_TRUE at EXECUTEOPENMCL = $(OPENMCL_NAME) -e
 genericdir = $(instsrcdir)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Apr 2006 19:05:41 -0000	1.5
+++ .cvsignore	27 Apr 2006 14:57:59 -0000	1.6
@@ -1,4 +1,3 @@
-maxima-5.9.2.tar.gz
 maximabook-19-Sept-2004.pdf
 macref.pdf
 maxima-5.9.3.tar.gz


Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- maxima.spec	5 Apr 2006 19:05:41 -0000	1.23
+++ maxima.spec	27 Apr 2006 14:57:59 -0000	1.24
@@ -1,9 +1,14 @@
 
+%if "%{?fedora}" > "4"
+# See http://bugzilla.redhat.com/bugzilla/187647
+%define setarch_hack 1
+%endif
+
 Summary: Symbolic Computation Program
 Name: 	 maxima
 Version: 5.9.3
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -15,19 +20,19 @@
 #  (sbcl:  https://bugzilla.redhat.com/bugzilla/177029)
 ExclusiveArch: %{ix86} x86_64 
 
-%define _with_default_lisp --with-default-lisp=clisp
-
 %ifarch %{ix86}
 %define _enable_cmucl --enable-cmucl
 %endif
 
 %ifarch %{ix86} x86_64
+%define default_lisp clisp
 %define _enable_clisp --enable-clisp 
 %define _enable_gcl --enable-gcl 
 %define _enable_sbcl --enable-sbcl 
 %endif
 
 %ifarch ppc
+#define default_lisp sbcl
 #define _enable_clisp --enable-clisp 
 #define _enable_cmucl --enable-cmucl 
 #define _enable_gcl --enable-gcl 
@@ -46,11 +51,13 @@
 # (mysterious?) xemacs patch (don't use, for now)
 Patch2: maxima.el-xemacs.patch
 # use sbcl --disable-debugger
-Patch3: maxima-5.9.2-sbcl-disable-debugger.patch
+Patch3: maxima-5.9.3-sbcl-disable-debugger.patch
 # ghostview -> evince (ps/pdf viewer)
 Patch4: maxima-5.9.2-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
 
 # Inhibit automatic compressing of info files. Compressed info
 # files break maxima's internal help.
@@ -71,6 +78,10 @@
 BuildRequires: tk
 
 Requires: %{name}-runtime = %{version}
+## Consider this when rpm supports it -- Rex
+#if "%{?default_lisp:1}" == "1"
+#Requires(hint): %{name}-runtime-%{default_lisp} = %{version}
+#endif
 Requires: gnuplot
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
@@ -134,8 +145,13 @@
 Group:   Applications/Engineering
 BuildRequires: gcl
 Requires:  %{name} = %{version}
+%if "%{?setarch_hack}" == "1"
+BuildRequires: setarch
+Requires:  setarch
+%endif
 Obsoletes: maxima-exec-gcl < %{version}-%{release}
 Provides:  %{name}-runtime = %{version}
+Provides:  %{name}-runtime-gcl = %{version}-%{release}
 %description runtime-gcl
 Maxima compiled with Gnu Common Lisp (gcl)
 %endif
@@ -168,10 +184,16 @@
 
 %patch1 -p1 -b .htmlview
 #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
+%endif
+
+sed -i -e 's|@ARCH@|%{_target_cpu}|' src/maxima.in
 
 sed -i -e 's:/usr/local/info:/usr/share/info:' \
   interfaces/emacs/emaxima/maxima.el
@@ -182,15 +204,10 @@
 # remove CVS crud
 find -name CVS -type d | xargs rm -r
 
-#patch3 -p1 -b .sbcl-disable-debugger
-#aclocal
-#automake --add-missing --copy
-#autoconf
-
 
 %build
 %configure \
-  %{?_with_default_lisp} \
+  %{?default_lisp:--with-default-lisp=%{default_lisp} } \
   %{?_enable_clisp} %{!?_enable_clisp: --disable-clisp } %{?_with_clisp_runtime} \
   %{?_enable_cmucl} %{!?_enable_cmucl: --disable-cmucl } %{?_with_cmucl_runtime} \
   %{?_enable_gcl}   %{!?_enable_gcl:   --disable-gcl } \
@@ -356,6 +373,10 @@
 
 
 %changelog
+* Wed Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-2
+- use setarch -X hack to allow runtime-gcl to function (#187647)
+- respin for sbcl-0.9.12
+
 * Wed Apr 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-1
 - 5.9.3
 


--- maxima-5.9.2-sbcl-disable-debugger.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Apr 27 15:06:50 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Thu, 27 Apr 2006 08:06:50 -0700
Subject: rpms/dnsmasq/devel dnsmasq.spec,1.1,1.2
Message-ID: <200604271506.k3RF6qJw007515@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7491/devel

Modified Files:
	dnsmasq.spec 
Log Message:

Implementing request from upstream, unified spec, etc



Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/devel/dnsmasq.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dnsmasq.spec	25 Apr 2006 16:51:25 -0000	1.1
+++ dnsmasq.spec	27 Apr 2006 15:06:50 -0000	1.2
@@ -1,16 +1,19 @@
 Name:           dnsmasq
 Version:        2.30
-Release:        2%{?dist}
+Release:        3%{?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}-fedora-extras.patch
+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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if "%{dist}" != ".fc3"
 BuildRequires:  dbus-devel
+%endif
 
 Requires(post):	 /sbin/chkconfig
 Requires(post):  /sbin/service
@@ -31,6 +34,9 @@
 %prep
 %setup -q
 %patch0 -p1
+%if "%{dist}" != ".fc3"
+%patch1 -p1
+%endif
 
 %build
 make %{?_smp_mflags}
@@ -74,10 +80,15 @@
 
 
 %changelog
-* Mon Apr 24 2006 Patrick Laughton <jima at auroralinux.org> 2.30-2
+* Thu Apr 27 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 2.30-3
+- Un-enabled HAVE_ISC_READER, a hack to enable a deprecated feature (request)
+- Split initscript & enable-dbus patches, conditionalized dbus for FC3
+- Tweaked name field in changelog entries (trying to be consistent)
+
+* Mon Apr 24 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 2.30-2
 - Disabled stripping of binary while installing (oops)
 - Enabled HAVE_ISC_READER/HAVE_DBUS via patch
 - Added BuildReq for dbus-devel
 
-* Mon Apr 24 2006 Patrick Laughton <jima at auroralinux.org> 2.30-1
+* Mon Apr 24 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 2.30-1
 - Initial Fedora Extras RPM



From fedora-extras-commits at redhat.com  Thu Apr 27 15:16:45 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Thu, 27 Apr 2006 08:16:45 -0700
Subject: rpms/dnsmasq/devel dnsmasq-2.30-enable-dbus.patch, NONE,
	1.1 dnsmasq-2.30-initscript.patch, NONE, 1.1
Message-ID: <200604271516.k3RFGlcd007600@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7576/devel

Added Files:
	dnsmasq-2.30-enable-dbus.patch dnsmasq-2.30-initscript.patch 
Log Message:

Implementing request from upstream, unified spec, etc


dnsmasq-2.30-enable-dbus.patch:

--- NEW FILE dnsmasq-2.30-enable-dbus.patch ---
diff -urN dnsmasq-2.30/src/config.h dnsmasq-2.30-patched/src/config.h
--- dnsmasq-2.30/src/config.h	2006-04-23 13:27:20.000000000 -0500
+++ dnsmasq-2.30-patched/src/config.h	2006-04-26 13:43:54.000000000 -0500
@@ -168,7 +168,7 @@
 /* platform independent options- uncomment to enable */
 /* #define HAVE_BROKEN_RTC */
 /* #define HAVE_ISC_READER */
-/* #define HAVE_DBUS */
+#define HAVE_DBUS
 
 #if defined(HAVE_BROKEN_RTC) && defined(HAVE_ISC_READER)
 #  error HAVE_ISC_READER is not compatible with HAVE_BROKEN_RTC

dnsmasq-2.30-initscript.patch:

--- NEW FILE dnsmasq-2.30-initscript.patch ---
diff -urN dnsmasq-2.30/rpm/dnsmasq.rh dnsmasq-2.30-patched/rpm/dnsmasq.rh
--- dnsmasq-2.30/rpm/dnsmasq.rh	2006-04-23 08:26:21.000000000 -0500
+++ dnsmasq-2.30-patched/rpm/dnsmasq.rh	2006-04-24 15:06:01.000000000 -0500
@@ -2,7 +2,7 @@
 #
 # Startup script for the DNS caching server
 #
-# chkconfig: 2345 99 01
+# chkconfig: - 99 01
 # description: This script starts your DNS caching server
 # processname: dnsmasq
 # pidfile: /var/run/dnsmasq.pid



From fedora-extras-commits at redhat.com  Thu Apr 27 15:45:50 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Thu, 27 Apr 2006 08:45:50 -0700
Subject: status-report-scripts parseBZbugList,1.32,1.33
Message-ID: <200604271545.k3RFjoc2007817@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7799

Modified Files:
	parseBZbugList 
Log Message:
Remove leftover debug statements.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- parseBZbugList	27 Apr 2006 14:19:08 -0000	1.32
+++ parseBZbugList	27 Apr 2006 15:45:48 -0000	1.33
@@ -1196,9 +1196,7 @@
 sub checkDropped {
   my %D;
   for (my $i = $main::currel - 1; $i >= $main::firstrel; $i--) {
-    print STDERR "Checking core $i\n";
     foreach my $k (keys %{$CORE_R[$i]}) {
-      print STDERR " Checking package $k\n";
       unless ($SRPMS{$k} or $D{$k}) {
 	$CORE_DROPPED_SRPMS[$i]->{$k} = 1;
 	$D{$k} = 1;



From fedora-extras-commits at redhat.com  Thu Apr 27 15:54:52 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Thu, 27 Apr 2006 08:54:52 -0700
Subject: rpms/dnsmasq/FC-4 dnsmasq-2.30-enable-dbus.patch, NONE,
	1.1 dnsmasq-2.30-initscript.patch, NONE, 1.1 dnsmasq.spec, 1.1,
	1.2 dnsmasq-2.30-fedora-extras.patch, 1.1, NONE
Message-ID: <200604271554.k3RFssIB007964@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7889/FC-4

Modified Files:
	dnsmasq.spec 
Added Files:
	dnsmasq-2.30-enable-dbus.patch dnsmasq-2.30-initscript.patch 
Removed Files:
	dnsmasq-2.30-fedora-extras.patch 
Log Message:

Implementing request from upstream, unified spec/patchset, cleanup


dnsmasq-2.30-enable-dbus.patch:

--- NEW FILE dnsmasq-2.30-enable-dbus.patch ---
diff -urN dnsmasq-2.30/src/config.h dnsmasq-2.30-patched/src/config.h
--- dnsmasq-2.30/src/config.h	2006-04-23 13:27:20.000000000 -0500
+++ dnsmasq-2.30-patched/src/config.h	2006-04-26 13:43:54.000000000 -0500
@@ -168,7 +168,7 @@
 /* platform independent options- uncomment to enable */
 /* #define HAVE_BROKEN_RTC */
 /* #define HAVE_ISC_READER */
-/* #define HAVE_DBUS */
+#define HAVE_DBUS
 
 #if defined(HAVE_BROKEN_RTC) && defined(HAVE_ISC_READER)
 #  error HAVE_ISC_READER is not compatible with HAVE_BROKEN_RTC

dnsmasq-2.30-initscript.patch:

--- NEW FILE dnsmasq-2.30-initscript.patch ---
diff -urN dnsmasq-2.30/rpm/dnsmasq.rh dnsmasq-2.30-patched/rpm/dnsmasq.rh
--- dnsmasq-2.30/rpm/dnsmasq.rh	2006-04-23 08:26:21.000000000 -0500
+++ dnsmasq-2.30-patched/rpm/dnsmasq.rh	2006-04-24 15:06:01.000000000 -0500
@@ -2,7 +2,7 @@
 #
 # Startup script for the DNS caching server
 #
-# chkconfig: 2345 99 01
+# chkconfig: - 99 01
 # description: This script starts your DNS caching server
 # processname: dnsmasq
 # pidfile: /var/run/dnsmasq.pid


Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-4/dnsmasq.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dnsmasq.spec	25 Apr 2006 16:51:25 -0000	1.1
+++ dnsmasq.spec	27 Apr 2006 15:54:52 -0000	1.2
@@ -1,16 +1,19 @@
 Name:           dnsmasq
 Version:        2.30
-Release:        2%{?dist}
+Release:        3%{?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}-fedora-extras.patch
+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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if "%{dist}" != ".fc3"
 BuildRequires:  dbus-devel
+%endif
 
 Requires(post):	 /sbin/chkconfig
 Requires(post):  /sbin/service
@@ -31,6 +34,9 @@
 %prep
 %setup -q
 %patch0 -p1
+%if "%{dist}" != ".fc3"
+%patch1 -p1
+%endif
 
 %build
 make %{?_smp_mflags}
@@ -74,10 +80,15 @@
 
 
 %changelog
-* Mon Apr 24 2006 Patrick Laughton <jima at auroralinux.org> 2.30-2
+* Thu Apr 27 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 2.30-3
+- Un-enabled HAVE_ISC_READER, a hack to enable a deprecated feature (request)
+- Split initscript & enable-dbus patches, conditionalized dbus for FC3
+- Tweaked name field in changelog entries (trying to be consistent)
+
+* Mon Apr 24 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 2.30-2
 - Disabled stripping of binary while installing (oops)
 - Enabled HAVE_ISC_READER/HAVE_DBUS via patch
 - Added BuildReq for dbus-devel
 
-* Mon Apr 24 2006 Patrick Laughton <jima at auroralinux.org> 2.30-1
+* Mon Apr 24 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 2.30-1
 - Initial Fedora Extras RPM


--- dnsmasq-2.30-fedora-extras.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Apr 27 15:54:52 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Thu, 27 Apr 2006 08:54:52 -0700
Subject: rpms/dnsmasq/FC-5 dnsmasq-2.30-enable-dbus.patch, NONE,
	1.1 dnsmasq-2.30-initscript.patch, NONE, 1.1 dnsmasq.spec, 1.1,
	1.2 dnsmasq-2.30-fedora-extras.patch, 1.1, NONE
Message-ID: <200604271554.k3RFssMi007972@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7889/FC-5

Modified Files:
	dnsmasq.spec 
Added Files:
	dnsmasq-2.30-enable-dbus.patch dnsmasq-2.30-initscript.patch 
Removed Files:
	dnsmasq-2.30-fedora-extras.patch 
Log Message:

Implementing request from upstream, unified spec/patchset, cleanup


dnsmasq-2.30-enable-dbus.patch:

--- NEW FILE dnsmasq-2.30-enable-dbus.patch ---
diff -urN dnsmasq-2.30/src/config.h dnsmasq-2.30-patched/src/config.h
--- dnsmasq-2.30/src/config.h	2006-04-23 13:27:20.000000000 -0500
+++ dnsmasq-2.30-patched/src/config.h	2006-04-26 13:43:54.000000000 -0500
@@ -168,7 +168,7 @@
 /* platform independent options- uncomment to enable */
 /* #define HAVE_BROKEN_RTC */
 /* #define HAVE_ISC_READER */
-/* #define HAVE_DBUS */
+#define HAVE_DBUS
 
 #if defined(HAVE_BROKEN_RTC) && defined(HAVE_ISC_READER)
 #  error HAVE_ISC_READER is not compatible with HAVE_BROKEN_RTC

dnsmasq-2.30-initscript.patch:

--- NEW FILE dnsmasq-2.30-initscript.patch ---
diff -urN dnsmasq-2.30/rpm/dnsmasq.rh dnsmasq-2.30-patched/rpm/dnsmasq.rh
--- dnsmasq-2.30/rpm/dnsmasq.rh	2006-04-23 08:26:21.000000000 -0500
+++ dnsmasq-2.30-patched/rpm/dnsmasq.rh	2006-04-24 15:06:01.000000000 -0500
@@ -2,7 +2,7 @@
 #
 # Startup script for the DNS caching server
 #
-# chkconfig: 2345 99 01
+# chkconfig: - 99 01
 # description: This script starts your DNS caching server
 # processname: dnsmasq
 # pidfile: /var/run/dnsmasq.pid


Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-5/dnsmasq.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dnsmasq.spec	25 Apr 2006 16:51:25 -0000	1.1
+++ dnsmasq.spec	27 Apr 2006 15:54:52 -0000	1.2
@@ -1,16 +1,19 @@
 Name:           dnsmasq
 Version:        2.30
-Release:        2%{?dist}
+Release:        3%{?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}-fedora-extras.patch
+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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if "%{dist}" != ".fc3"
 BuildRequires:  dbus-devel
+%endif
 
 Requires(post):	 /sbin/chkconfig
 Requires(post):  /sbin/service
@@ -31,6 +34,9 @@
 %prep
 %setup -q
 %patch0 -p1
+%if "%{dist}" != ".fc3"
+%patch1 -p1
+%endif
 
 %build
 make %{?_smp_mflags}
@@ -74,10 +80,15 @@
 
 
 %changelog
-* Mon Apr 24 2006 Patrick Laughton <jima at auroralinux.org> 2.30-2
+* Thu Apr 27 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 2.30-3
+- Un-enabled HAVE_ISC_READER, a hack to enable a deprecated feature (request)
+- Split initscript & enable-dbus patches, conditionalized dbus for FC3
+- Tweaked name field in changelog entries (trying to be consistent)
+
+* Mon Apr 24 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 2.30-2
 - Disabled stripping of binary while installing (oops)
 - Enabled HAVE_ISC_READER/HAVE_DBUS via patch
 - Added BuildReq for dbus-devel
 
-* Mon Apr 24 2006 Patrick Laughton <jima at auroralinux.org> 2.30-1
+* Mon Apr 24 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 2.30-1
 - Initial Fedora Extras RPM


--- dnsmasq-2.30-fedora-extras.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Apr 27 15:54:53 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Thu, 27 Apr 2006 08:54:53 -0700
Subject: rpms/dnsmasq/devel dnsmasq-2.30-fedora-extras.patch,1.1,NONE
Message-ID: <200604271555.k3RFstYG007975@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7889/devel

Removed Files:
	dnsmasq-2.30-fedora-extras.patch 
Log Message:

Implementing request from upstream, unified spec/patchset, cleanup



--- dnsmasq-2.30-fedora-extras.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Apr 27 15:54:51 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Thu, 27 Apr 2006 08:54:51 -0700
Subject: rpms/dnsmasq/FC-3 dnsmasq-2.30-enable-dbus.patch, NONE,
	1.1 dnsmasq-2.30-initscript.patch, NONE, 1.1 dnsmasq.spec, 1.5,
	1.6 dnsmasq-2.30-fedora-extras.patch, 1.2, NONE
Message-ID: <200604271555.k3RFtNYd007978@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7889/FC-3

Modified Files:
	dnsmasq.spec 
Added Files:
	dnsmasq-2.30-enable-dbus.patch dnsmasq-2.30-initscript.patch 
Removed Files:
	dnsmasq-2.30-fedora-extras.patch 
Log Message:

Implementing request from upstream, unified spec/patchset, cleanup


dnsmasq-2.30-enable-dbus.patch:

--- NEW FILE dnsmasq-2.30-enable-dbus.patch ---
diff -urN dnsmasq-2.30/src/config.h dnsmasq-2.30-patched/src/config.h
--- dnsmasq-2.30/src/config.h	2006-04-23 13:27:20.000000000 -0500
+++ dnsmasq-2.30-patched/src/config.h	2006-04-26 13:43:54.000000000 -0500
@@ -168,7 +168,7 @@
 /* platform independent options- uncomment to enable */
 /* #define HAVE_BROKEN_RTC */
 /* #define HAVE_ISC_READER */
-/* #define HAVE_DBUS */
+#define HAVE_DBUS
 
 #if defined(HAVE_BROKEN_RTC) && defined(HAVE_ISC_READER)
 #  error HAVE_ISC_READER is not compatible with HAVE_BROKEN_RTC

dnsmasq-2.30-initscript.patch:

--- NEW FILE dnsmasq-2.30-initscript.patch ---
diff -urN dnsmasq-2.30/rpm/dnsmasq.rh dnsmasq-2.30-patched/rpm/dnsmasq.rh
--- dnsmasq-2.30/rpm/dnsmasq.rh	2006-04-23 08:26:21.000000000 -0500
+++ dnsmasq-2.30-patched/rpm/dnsmasq.rh	2006-04-24 15:06:01.000000000 -0500
@@ -2,7 +2,7 @@
 #
 # Startup script for the DNS caching server
 #
-# chkconfig: 2345 99 01
+# chkconfig: - 99 01
 # description: This script starts your DNS caching server
 # processname: dnsmasq
 # pidfile: /var/run/dnsmasq.pid


Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-3/dnsmasq.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dnsmasq.spec	25 Apr 2006 22:19:50 -0000	1.5
+++ dnsmasq.spec	27 Apr 2006 15:54:51 -0000	1.6
@@ -1,15 +1,20 @@
 Name:           dnsmasq
 Version:        2.30
-Release:        2%{?dist}.3
+Release:        3%{?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}-fedora-extras.patch
+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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if "%{dist}" != ".fc3"
+BuildRequires:  dbus-devel
+%endif
+
 Requires(post):	 /sbin/chkconfig
 Requires(post):  /sbin/service
 Requires(preun): /sbin/chkconfig
@@ -29,6 +34,9 @@
 %prep
 %setup -q
 %patch0 -p1
+%if "%{dist}" != ".fc3"
+%patch1 -p1
+%endif
 
 %build
 make %{?_smp_mflags}
@@ -72,13 +80,15 @@
 
 
 %changelog
-* Tue Apr 25 2006 Patrick Laughton <jima at auroralinux.org> 2.30-2.fc3.3
-- Removed dbus support for FC3 (dbus version apparently too old)
+* Thu Apr 27 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 2.30-3
+- Un-enabled HAVE_ISC_READER, a hack to enable a deprecated feature (request)
+- Split initscript & enable-dbus patches, conditionalized dbus for FC3
+- Tweaked name field in changelog entries (trying to be consistent)
 
-* Mon Apr 24 2006 Patrick Laughton <jima at auroralinux.org> 2.30-2
+* Mon Apr 24 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 2.30-2
 - Disabled stripping of binary while installing (oops)
 - Enabled HAVE_ISC_READER/HAVE_DBUS via patch
 - Added BuildReq for dbus-devel
 
-* Mon Apr 24 2006 Patrick Laughton <jima at auroralinux.org> 2.30-1
+* Mon Apr 24 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 2.30-1
 - Initial Fedora Extras RPM


--- dnsmasq-2.30-fedora-extras.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Apr 27 16:13:31 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 09:13:31 -0700
Subject: owners owners.list,1.903,1.904
Message-ID: <200604271613.k3RGDX29010412@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10394

Modified Files:
	owners.list 
Log Message:
xmms-scrobbler added


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.903
retrieving revision 1.904
diff -u -r1.903 -r1.904
--- owners.list	27 Apr 2006 13:04:46 -0000	1.903
+++ owners.list	27 Apr 2006 16:13:31 -0000	1.904
@@ -1655,6 +1655,7 @@
 Fedora Extras|xmms-flac|XMMS plugin needed to play FLAC (Free Lossless Audio Codec) files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-lirc|Plugin to use LIRC supported infrared devices in XMMS|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-modplug|Modplug Plugin for XMMS|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|xmms-scrobbler|Audioscrobbler plugin for XMMS|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-sid|SIDPlay input plugin for X MultiMedia System (XMMS)|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-skins|Skins for the X MultiMedia System|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-speex|X MultiMedia System input plugin to play speex files|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Apr 27 16:14:39 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 09:14:39 -0700
Subject: rpms/xmms-scrobbler - New directory
Message-ID: <200604271614.k3RGEfM6010498@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/xmms-scrobbler
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10472/xmms-scrobbler

Log Message:
Directory /cvs/extras/rpms/xmms-scrobbler added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 27 16:14:39 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 09:14:39 -0700
Subject: rpms/xmms-scrobbler/devel - New directory
Message-ID: <200604271614.k3RGEfkJ010502@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/xmms-scrobbler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10472/xmms-scrobbler/devel

Log Message:
Directory /cvs/extras/rpms/xmms-scrobbler/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 27 16:15:00 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 09:15:00 -0700
Subject: rpms/xmms-scrobbler/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604271615.k3RGF2vS010562@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/xmms-scrobbler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10531/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xmms-scrobbler


--- 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 Apr 27 16:15:00 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 09:15:00 -0700
Subject: rpms/xmms-scrobbler Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604271615.k3RGF247010559@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/xmms-scrobbler
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10531

Added Files:
	Makefile import.log 
Log Message:
Setup of module xmms-scrobbler


--- NEW FILE Makefile ---
# Top level Makefile for module xmms-scrobbler
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 27 16:15:38 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 09:15:38 -0700
Subject: rpms/xmms-scrobbler import.log,1.1,1.2
Message-ID: <200604271615.k3RGFek1010639@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/xmms-scrobbler
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10606

Modified Files:
	import.log 
Log Message:
auto-import xmms-scrobbler-0.3.6-2 on branch devel from xmms-scrobbler-0.3.6-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xmms-scrobbler/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	27 Apr 2006 16:14:59 -0000	1.1
+++ import.log	27 Apr 2006 16:15:38 -0000	1.2
@@ -0,0 +1 @@
+xmms-scrobbler-0_3_6-2:HEAD:xmms-scrobbler-0.3.6-2.src.rpm:1146154530



From fedora-extras-commits at redhat.com  Thu Apr 27 16:15:39 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 09:15:39 -0700
Subject: rpms/xmms-scrobbler/devel xmms-scrobbler.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604271615.k3RGFfLc010644@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/xmms-scrobbler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10606/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xmms-scrobbler.spec 
Log Message:
auto-import xmms-scrobbler-0.3.6-2 on branch devel from xmms-scrobbler-0.3.6-2.src.rpm


--- NEW FILE xmms-scrobbler.spec ---
%define xmms_plugindir %(xmms-config --general-plugin-dir 2>/dev/null || echo %{_libdir}/xmms/General)

Summary: Audioscrobbler plugin for XMMS
Name: xmms-scrobbler
Version: 0.3.6
Release: 2%{?dist}
License: GPL
Group: Applications/Multimedia
URL: http://www.last.fm/downloads.php
Source:  http://static.last.fm/plugins/xmms-scrobbler-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: xmms >= 1.2.4
BuildRequires: xmms-devel >= 1.2.4, libmusicbrainz-devel >= 2.0.0, curl-devel

%description
This is a audioscrobbler xmms plugin.
Audioscrobbler will send the name of every song you play on your computer
to Last.fm. This effortlessly populates your profile to play radio you like
and make personalised recommendations!

%prep
%setup -q


%build
%configure \
	--disable-bmp-plugin \
	--libdir=%{xmms_plugindir} \

make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

find %{buildroot} -name '*.la' -exec rm -f {} \;

%clean
rm -rf %{buildroot}


%files
%defattr(-, root, root, -)
%doc AUTHORS ChangeLog COPYING README README.tags KnownIssues TODO
%{xmms_plugindir}/libxmms_scrobbler.so


%changelog
* Thu Apr 27 2006 Andreas Thienemann <andreas at bawue.net> 0.3.6-2
- Fixed permissions

* Mon Apr 24 2006 Andreas Thienemann <andreas at bawue.net> 0.3.6-1
- Initial FE package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xmms-scrobbler/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2006 16:15:00 -0000	1.1
+++ .cvsignore	27 Apr 2006 16:15:38 -0000	1.2
@@ -0,0 +1 @@
+xmms-scrobbler-0.3.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmms-scrobbler/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2006 16:15:00 -0000	1.1
+++ sources	27 Apr 2006 16:15:39 -0000	1.2
@@ -0,0 +1 @@
+eb5b53815eb91f5294f76ca424369b7f  xmms-scrobbler-0.3.6.tar.bz2



From fedora-extras-commits at redhat.com  Thu Apr 27 16:16:55 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu, 27 Apr 2006 09:16:55 -0700
Subject: rpms/gtkhtml36 - New directory
Message-ID: <200604271616.k3RGGvWr010795@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gtkhtml36
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10769/gtkhtml36

Log Message:
Directory /cvs/extras/rpms/gtkhtml36 added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 27 16:16:56 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu, 27 Apr 2006 09:16:56 -0700
Subject: rpms/gtkhtml36/devel - New directory
Message-ID: <200604271617.k3RGGwR9010798@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gtkhtml36/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10769/gtkhtml36/devel

Log Message:
Directory /cvs/extras/rpms/gtkhtml36/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 27 16:17:31 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu, 27 Apr 2006 09:17:31 -0700
Subject: rpms/gtkhtml36 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604271617.k3RGHXS3010885@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gtkhtml36
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10850

Added Files:
	Makefile import.log 
Log Message:
Setup of module gtkhtml36


--- NEW FILE Makefile ---
# Top level Makefile for module gtkhtml36
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 27 16:17:32 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu, 27 Apr 2006 09:17:32 -0700
Subject: rpms/gtkhtml36/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604271617.k3RGHYVA010886@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gtkhtml36/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10850/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gtkhtml36


--- 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 Apr 27 16:17:47 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Thu, 27 Apr 2006 09:17:47 -0700
Subject: rpms/tetex-dvipost - New directory
Message-ID: <200604271617.k3RGHnXf010934@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/tetex-dvipost
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10908/tetex-dvipost

Log Message:
Directory /cvs/extras/rpms/tetex-dvipost added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 27 16:17:47 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Thu, 27 Apr 2006 09:17:47 -0700
Subject: rpms/tetex-dvipost/devel - New directory
Message-ID: <200604271617.k3RGHnZA010937@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/tetex-dvipost/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10908/tetex-dvipost/devel

Log Message:
Directory /cvs/extras/rpms/tetex-dvipost/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 27 16:18:03 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Thu, 27 Apr 2006 09:18:03 -0700
Subject: rpms/tetex-dvipost Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604271618.k3RGI5xg010994@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/tetex-dvipost
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10958

Added Files:
	Makefile import.log 
Log Message:
Setup of module tetex-dvipost


--- NEW FILE Makefile ---
# Top level Makefile for module tetex-dvipost
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 27 16:18:04 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Thu, 27 Apr 2006 09:18:04 -0700
Subject: rpms/tetex-dvipost/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604271618.k3RGI62K010998@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/tetex-dvipost/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10958/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tetex-dvipost


--- 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 Apr 27 16:18:44 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Thu, 27 Apr 2006 09:18:44 -0700
Subject: rpms/tetex-dvipost import.log,1.1,1.2
Message-ID: <200604271618.k3RGIkf0011066@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/tetex-dvipost
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11032

Modified Files:
	import.log 
Log Message:
auto-import tetex-dvipost-1.1-4 on branch devel from tetex-dvipost-1.1-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tetex-dvipost/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	27 Apr 2006 16:18:03 -0000	1.1
+++ import.log	27 Apr 2006 16:18:44 -0000	1.2
@@ -0,0 +1 @@
+tetex-dvipost-1_1-4:HEAD:tetex-dvipost-1.1-4.src.rpm:1146154714



From fedora-extras-commits at redhat.com  Thu Apr 27 16:18:45 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Thu, 27 Apr 2006 09:18:45 -0700
Subject: rpms/tetex-dvipost/devel tetex-dvipost-destdir.patch, NONE,
	1.1 tetex-dvipost.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200604271618.k3RGIlpd011073@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/tetex-dvipost/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11032/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tetex-dvipost-destdir.patch tetex-dvipost.spec 
Log Message:
auto-import tetex-dvipost-1.1-4 on branch devel from tetex-dvipost-1.1-4.src.rpm

tetex-dvipost-destdir.patch:

--- NEW FILE tetex-dvipost-destdir.patch ---
diff -ur dvipost-1.1/Makefile.in dvipost-new/Makefile.in
--- dvipost-1.1/Makefile.in	2006-03-23 04:47:44.000000000 +0000
+++ dvipost-new/Makefile.in	2006-04-26 17:07:42.000000000 +0100
@@ -27,14 +27,14 @@
 INSTALL_PROGRAM= @INSTALL_PROGRAM@
 INSTALL_DATA= @INSTALL_DATA@
 
-BIN=	@bindir@
+BIN=	$(DESTDIR)@bindir@
 
 # Directory to install LaTeX styles
 
-LATEX=	@texpath@
+LATEX=	$(DESTDIR)@texpath@
 
 MANEXT=	1
-MANDIR=	@mandir@/man$(MANEXT)
+MANDIR=	$(DESTDIR)@mandir@/man$(MANEXT)
 
 # Install names
 
@@ -92,6 +92,7 @@
 	for p in $(NAME) $(ALIAS); do rm -f $(BIN)/$$p; done
 
 install-exec: uninstall-exec
+	mkdir -p $(BIN)
 	$(INSTALL_PROGRAM) $(NAME) $(BIN)/$(NAME)
 	(cd $(BIN); for p in $(ALIAS); do rm -f $$p; $(LN) $(NAME) $$p; done)
 
@@ -99,6 +100,7 @@
 	for p in $(NAME) $(ALIAS); do rm -f $(MANDIR)/$$p.$(MANEXT); done
 
 install-man: uninstall-man
+	mkdir -p $(MANDIR)
 	$(INSTALL_DATA) dvipost.man $(MANDIR)/$(NAME).$(MANEXT)
 	(cd $(MANDIR); for p in $(ALIAS); \
 		do rm -f $$p.$(MANEXT); \
@@ -107,11 +109,12 @@
 
 uninstall-data:
 	for p in $(FILES); do rm -f $(LATEX)/$$p; done
-	texhash
+	#texhash
 
 install-data: uninstall-data
+	mkdir -p $(LATEX)
 	for p in $(FILES); do $(INSTALL_DATA) $$p $(LATEX)/$$p; done
-	texhash
+	#texhash
 
 distclean:: clean
 	rm -f config.cache config.log config.status Makefile


--- NEW FILE tetex-dvipost.spec ---
%define real_name dvipost
%define texmf	%{_datadir}/texmf

Name:           tetex-%{real_name}
Version:        1.1
Release:        4%{?dist}
Summary:        LaTeX post filter command to support change bars and overstrike mode

Group:          Applications/Publishing
License:        GPL
URL:            http://efeu.cybertec.at/
Source0:        http://efeu.cybertec.at/%{real_name}.tar.gz
Patch0:		%{name}-destdir.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  tetex
BuildRequires:	tetex-latex

Requires:       tetex
Requires:	tetex-fonts
Requires:	tetex-latex

%description
The command dvipost is a post procesor for dvi files, created by latex
or tex. It is used for special modes, which normally needs the support
of dvi drivers (such as dvips). With dvipost, this features could be
implemented independent of the preferred driver. Currently, the post
processor supports layout raster, change bars and overstrike mode.

%prep
%setup -q -n %{real_name}-%{version}
%patch0 -p1


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /usr/bin/texhash


%postun -p /usr/bin/texhash


%files
%defattr(-,root,root,-)
%{_bindir}/*
%{texmf}/tex/latex/misc/*

%doc README COPYING NOTES dvipost.html
%{_mandir}/man*/*


%changelog
* Thu Apr 27 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1-4
- Rename package to tetex-dvipost

* Thu Apr 27 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1-3
- Capitalize Summary, fix spell error in description, rework
  invocation of post and postun calls (thanks to Patrice Dumas)
- Add tetex-latex to Requires and BuildRequires.
- Add tetex-fonts to Requires to satisfy direct dependency on texhash

* Thu Apr 27 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1-2
- Add new entries to %%doc and expand description

* Wed Apr 26 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1-1
- First build



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tetex-dvipost/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2006 16:18:04 -0000	1.1
+++ .cvsignore	27 Apr 2006 16:18:45 -0000	1.2
@@ -0,0 +1 @@
+dvipost.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tetex-dvipost/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2006 16:18:04 -0000	1.1
+++ sources	27 Apr 2006 16:18:45 -0000	1.2
@@ -0,0 +1 @@
+2ec79283a8348312bc72831ca80ae3a2  dvipost.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 16:19:19 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu, 27 Apr 2006 09:19:19 -0700
Subject: rpms/gtkhtml36 import.log,1.1,1.2
Message-ID: <200604271619.k3RGJLNg011151@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gtkhtml36
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11117

Modified Files:
	import.log 
Log Message:
auto-import gtkhtml36-3.6.2-3.fc5 on branch devel from gtkhtml36-3.6.2-3.fc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gtkhtml36/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	27 Apr 2006 16:17:31 -0000	1.1
+++ import.log	27 Apr 2006 16:19:19 -0000	1.2
@@ -0,0 +1 @@
+gtkhtml36-3_6_2-3_fc5:HEAD:gtkhtml36-3.6.2-3.fc5.src.rpm:1146154742



From fedora-extras-commits at redhat.com  Thu Apr 27 16:19:20 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu, 27 Apr 2006 09:19:20 -0700
Subject: rpms/gtkhtml36/devel gtkhtml-3.3.0-crash.patch, NONE,
	1.1 gtkhtml36.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604271619.k3RGJM1R011158@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gtkhtml36/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11117/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gtkhtml-3.3.0-crash.patch gtkhtml36.spec 
Log Message:
auto-import gtkhtml36-3.6.2-3.fc5 on branch devel from gtkhtml36-3.6.2-3.fc5.src.rpm

gtkhtml-3.3.0-crash.patch:

--- NEW FILE gtkhtml-3.3.0-crash.patch ---
--- gtkhtml-3.3.0/src/htmlclue.c.crash	2004-08-13 15:52:27.777093526 +0100
+++ gtkhtml-3.3.0/src/htmlclue.c	2004-08-13 15:52:29.494761807 +0100
@@ -149,7 +149,7 @@
 		last = html_object_prev_not_slave (last);
 
 	g_assert (o->parent == self);
-	g_assert (last->parent == self);
+	g_assert (!last || last->parent == self);
 
 	while (o) {
 		cnext = html_object_next_not_slave (o);


--- NEW FILE gtkhtml36.spec ---
%define gtkhtml_major 3.6
%define libgnomeprint_version 2.7.1
%define gnome_icon_theme_version 1.2.3

Summary:       GtkHTML 3.6 Compatibility Library
Name:          gtkhtml36
Version:       3.6.2
Release:       3%{?dist}
License:       LGPL/GPL
Group:         System Environment/Libraries
Url:           http://www.gnome.org/
Source:        ftp://ftp.gnome.org/pub/GNOME/sources/gtkhtml/3.6/gtkhtml-%{version}.tar.bz2
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libgnomeui-devel
BuildRequires: libgnomeprintui22-devel >= %{libgnomeprint_version}
BuildRequires: gail-devel
BuildRequires: libtool, gettext
BuildRequires: gnome-icon-theme >= %{gnome_icon_theme_version}
Requires:      gnome-icon-theme >= %{gnome_icon_theme_version}

# Partial band-aid for an editing crash (bug #129844)
# http://bugzilla.ximian.com/show_bug.cgi?id=50052
Patch1:        gtkhtml-3.3.0-crash.patch


%description
GtkHTML is a lightweight HTML rendering/printing/editing engine.  It
was originally based on KHTMLW, but is now being developed
independently of it.

This package provides GtkHTML 3.6 for software that has not yet been
ported to GtkHTML 3.8.

%package devel
Summary:       Libraries, includes, etc. to develop gtkhtml applications
Group:         Development/Libraries
Requires:      %{name} = %{version}-%{release}
Requires:      libgnomeui-devel
Requires:      libgnomeprintui22-devel >= 2.2.1

%description devel
Libraries and include files that can be used to develop GtkHTML applications
that require GtkHTML 3.6

%prep
%setup -q -n gtkhtml-%{version}

%patch1 -p1 -b .crash


%build
%configure
export tagname=CC
make LIBTOOL=%{_bindir}/libtool

%install
rm -rf $RPM_BUILD_ROOT
export tagname=CC
%makeinstall LIBTOOL=/usr/bin/libtool

rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/gtkhtml/*.la
# configure doesn't seem to respect the --disable-static flag
rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
rm -f $RPM_BUILD_ROOT%{_libdir}/gtkhtml/*.a

%find_lang gtkhtml-%{gtkhtml_major}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f gtkhtml-%{gtkhtml_major}.lang
%defattr(-,root,root,-)
%doc AUTHORS BUGS ChangeLog NEWS README COPYING COPYING.LIB TODO
%{_libdir}/*.so.*
%dir %{_libdir}/gtkhtml
%{_libdir}/gtkhtml/*.so
%{_libdir}/bonobo/servers/*.server
%{_datadir}/gtkhtml-%{gtkhtml_major}

%files devel
%defattr(-,root,root,-)
%{_includedir}/libgtkhtml-%{gtkhtml_major}
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc

%changelog
* Wed Apr 26 2006 Michael A. Peters <mpeters at mac.com> - 3.6.2-3
- Fixed issues in bugzilla 171314 comment 9

* Tue Apr 25 2006 Michael A. Peters <mpeters at mac.com> - 3.6.2-2
- Don't build static libs
- Change name to gtkhtml36 per packaging guidelines

* Thu Oct 20 2005 Michael A. Peters <mpeters at mac.com> - 3.6.2-1
- Created spec file based on Fedora Core 4 gtkhtml3-3.6.2-1
- spec file - changed name to compat-gtkhtml36
- removed redundant BuildRequires
- removed redundant Requires on devel package
- removed explicit libgnomeprint22 Requires (rpm picks up library)
- Added Url tag (rpmlint), Capitalized Summary (rpmlint), aligned
-  package metadata


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkhtml36/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2006 16:17:32 -0000	1.1
+++ .cvsignore	27 Apr 2006 16:19:20 -0000	1.2
@@ -0,0 +1 @@
+gtkhtml-3.6.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkhtml36/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2006 16:17:32 -0000	1.1
+++ sources	27 Apr 2006 16:19:20 -0000	1.2
@@ -0,0 +1 @@
+37465fde0f1e1d7ba2284c5a4fd06fe7  gtkhtml-3.6.2.tar.bz2



From fedora-extras-commits at redhat.com  Thu Apr 27 16:23:24 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu, 27 Apr 2006 09:23:24 -0700
Subject: owners owners.list,1.904,1.905
Message-ID: <200604271623.k3RGNQEm011241@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11221

Modified Files:
	owners.list 
Log Message:
ownership of gtkhtml36



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.904
retrieving revision 1.905
diff -u -r1.904 -r1.905
--- owners.list	27 Apr 2006 16:13:31 -0000	1.904
+++ owners.list	27 Apr 2006 16:23:24 -0000	1.905
@@ -434,6 +434,7 @@
 Fedora Extras|GtkAda|An Ada95 graphical toolkit based on Gtk+|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|gtkglarea2|An OpenGL GTK widget|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|rc040203 at freenet.de
 Fedora Extras|gtkglext|OpenGL Extension to GTK|rc040203 at freenet.de|extras-qa at fedoraproject.org|
+Fedora Extras|gtkhtml36|GtkHTML 3.6 Compatibility Library|mpeters at mac.com|extras-qa at fedoraproject.org|
 Fedora Extras|gtkmathview|Library for rendering MathML documents|uwog at uwog.net|extras-qa at fedoraproject.org|
 Fedora Extras|gtkmm20|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|gtkmm24|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Apr 27 16:31:57 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 09:31:57 -0700
Subject: rpms/ser/FC-4 ser.spec,1.2,1.3
Message-ID: <200604271631.k3RGVxh4011346@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ser/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11301/FC-4

Modified Files:
	ser.spec 
Log Message:
bump to same nvr accross all releases


Index: ser.spec
===================================================================
RCS file: /cvs/extras/rpms/ser/FC-4/ser.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ser.spec	30 Mar 2006 16:34:30 -0000	1.2
+++ ser.spec	27 Apr 2006 16:31:56 -0000	1.3
@@ -1,10 +1,14 @@
 %define special_modules mysql jabber cpl-c postgres pa
 %define serweb_version 0.9.4
 
+%if "%{fedora}" >= "4"
+   %define serweb true
+%endif
+
 Summary: SIP Express Router
 Name: ser
 Version: 0.9.6
-Release: 4%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://ftp.iptel.org/pub/ser/latest/src/ser-%{version}_src.tar.gz
@@ -136,6 +140,8 @@
 ls README.* | grep -v -E '(mysql|postgres)' | sed -e 's/\(.*\)/%doc \1/' >> filelist
 
 # serweb configuration
+%if "%{serweb}" == "true"
+
 mkdir -p %{buildroot}%{_datadir}/serweb
 mkdir -p %{buildroot}%{_sysconfdir}/ser/serweb
 find serweb-%{serweb_version} -name '.cvsignore' -exec rm -f {} \;
@@ -145,6 +151,8 @@
 cp -rP serweb-%{serweb_version}/config/* %{buildroot}%{_sysconfdir}/ser/serweb/
 install -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/serweb.conf
 
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -191,16 +199,27 @@
 %{_libdir}/ser/modules/postgres.so
 %{_sbindir}/serpgctl
 
+# Only package, if dependencies can be met
+%if "%{serweb}" == "true"
+
 %files serweb
 %defattr(-,root,root,-)
 %doc serweb-%{serweb_version}/README serweb-%{serweb_version}/INSTALL serweb-%{serweb_version}/COPYING serweb-%{serweb_version}/CHANGELOG
 %dir %{_datadir}/serweb
 %{_datadir}/serweb/*
 %dir %{_sysconfdir}/ser/serweb
-%config(noreplace) %{_sysconfdir}/ser/serweb/*.php
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/serweb.conf
+%config(noreplace) %{_sysconfdir}/ser/serweb/*.php
+
+%endif
 
 %changelog
+* Thu Apr 01 2006 Andreas Thienemann <andreas at bawue.net> 0.9.6-6
+- *bump*
+
+* Thu Apr 01 2006 Andreas Thienemann <andreas at bawue.net> 0.9.6-5
+- Do not package serweb for FC-3, as we do not have MySQL 4
+
 * Thu Mar 30 2006 Andreas Thienemann <andreas at bawue.net> 0.9.6-4
 - Fix buildissue with %%{_libdir}
 



From fedora-extras-commits at redhat.com  Thu Apr 27 16:31:58 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 09:31:58 -0700
Subject: rpms/ser/devel ser.spec,1.3,1.4
Message-ID: <200604271632.k3RGW0ar011352@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11301/devel

Modified Files:
	ser.spec 
Log Message:
bump to same nvr accross all releases


Index: ser.spec
===================================================================
RCS file: /cvs/extras/rpms/ser/devel/ser.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ser.spec	30 Mar 2006 16:03:53 -0000	1.3
+++ ser.spec	27 Apr 2006 16:31:58 -0000	1.4
@@ -1,10 +1,14 @@
 %define special_modules mysql jabber cpl-c postgres pa
 %define serweb_version 0.9.4
 
+%if "%{fedora}" >= "4"
+   %define serweb true
+%endif
+
 Summary: SIP Express Router
 Name: ser
 Version: 0.9.6
-Release: 4%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://ftp.iptel.org/pub/ser/latest/src/ser-%{version}_src.tar.gz
@@ -136,6 +140,8 @@
 ls README.* | grep -v -E '(mysql|postgres)' | sed -e 's/\(.*\)/%doc \1/' >> filelist
 
 # serweb configuration
+%if "%{serweb}" == "true"
+
 mkdir -p %{buildroot}%{_datadir}/serweb
 mkdir -p %{buildroot}%{_sysconfdir}/ser/serweb
 find serweb-%{serweb_version} -name '.cvsignore' -exec rm -f {} \;
@@ -145,6 +151,8 @@
 cp -rP serweb-%{serweb_version}/config/* %{buildroot}%{_sysconfdir}/ser/serweb/
 install -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/serweb.conf
 
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -191,16 +199,27 @@
 %{_libdir}/ser/modules/postgres.so
 %{_sbindir}/serpgctl
 
+# Only package, if dependencies can be met
+%if "%{serweb}" == "true"
+
 %files serweb
 %defattr(-,root,root,-)
 %doc serweb-%{serweb_version}/README serweb-%{serweb_version}/INSTALL serweb-%{serweb_version}/COPYING serweb-%{serweb_version}/CHANGELOG
 %dir %{_datadir}/serweb
 %{_datadir}/serweb/*
 %dir %{_sysconfdir}/ser/serweb
-%config(noreplace) %{_sysconfdir}/ser/serweb/*.php
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/serweb.conf
+%config(noreplace) %{_sysconfdir}/ser/serweb/*.php
+
+%endif
 
 %changelog
+* Thu Apr 01 2006 Andreas Thienemann <andreas at bawue.net> 0.9.6-6
+- *bump*
+
+* Thu Apr 01 2006 Andreas Thienemann <andreas at bawue.net> 0.9.6-5
+- Do not package serweb for FC-3, as we do not have MySQL 4
+
 * Thu Mar 30 2006 Andreas Thienemann <andreas at bawue.net> 0.9.6-4
 - Fix buildissue with %%{_libdir}
 



From fedora-extras-commits at redhat.com  Thu Apr 27 16:31:57 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 09:31:57 -0700
Subject: rpms/ser/FC-5 ser.spec,1.2,1.3
Message-ID: <200604271632.k3RGVxrV011350@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ser/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11301/FC-5

Modified Files:
	ser.spec 
Log Message:
bump to same nvr accross all releases


Index: ser.spec
===================================================================
RCS file: /cvs/extras/rpms/ser/FC-5/ser.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ser.spec	30 Mar 2006 16:34:31 -0000	1.2
+++ ser.spec	27 Apr 2006 16:31:57 -0000	1.3
@@ -1,10 +1,14 @@
 %define special_modules mysql jabber cpl-c postgres pa
 %define serweb_version 0.9.4
 
+%if "%{fedora}" >= "4"
+   %define serweb true
+%endif
+
 Summary: SIP Express Router
 Name: ser
 Version: 0.9.6
-Release: 4%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://ftp.iptel.org/pub/ser/latest/src/ser-%{version}_src.tar.gz
@@ -136,6 +140,8 @@
 ls README.* | grep -v -E '(mysql|postgres)' | sed -e 's/\(.*\)/%doc \1/' >> filelist
 
 # serweb configuration
+%if "%{serweb}" == "true"
+
 mkdir -p %{buildroot}%{_datadir}/serweb
 mkdir -p %{buildroot}%{_sysconfdir}/ser/serweb
 find serweb-%{serweb_version} -name '.cvsignore' -exec rm -f {} \;
@@ -145,6 +151,8 @@
 cp -rP serweb-%{serweb_version}/config/* %{buildroot}%{_sysconfdir}/ser/serweb/
 install -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/serweb.conf
 
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -191,16 +199,27 @@
 %{_libdir}/ser/modules/postgres.so
 %{_sbindir}/serpgctl
 
+# Only package, if dependencies can be met
+%if "%{serweb}" == "true"
+
 %files serweb
 %defattr(-,root,root,-)
 %doc serweb-%{serweb_version}/README serweb-%{serweb_version}/INSTALL serweb-%{serweb_version}/COPYING serweb-%{serweb_version}/CHANGELOG
 %dir %{_datadir}/serweb
 %{_datadir}/serweb/*
 %dir %{_sysconfdir}/ser/serweb
-%config(noreplace) %{_sysconfdir}/ser/serweb/*.php
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/serweb.conf
+%config(noreplace) %{_sysconfdir}/ser/serweb/*.php
+
+%endif
 
 %changelog
+* Thu Apr 01 2006 Andreas Thienemann <andreas at bawue.net> 0.9.6-6
+- *bump*
+
+* Thu Apr 01 2006 Andreas Thienemann <andreas at bawue.net> 0.9.6-5
+- Do not package serweb for FC-3, as we do not have MySQL 4
+
 * Thu Mar 30 2006 Andreas Thienemann <andreas at bawue.net> 0.9.6-4
 - Fix buildissue with %%{_libdir}
 



From fedora-extras-commits at redhat.com  Thu Apr 27 16:36:02 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 09:36:02 -0700
Subject: rpms/xmms-scrobbler/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xmms-scrobbler.spec, 1.1, 1.2
Message-ID: <200604271636.k3RGa4JW011513@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/xmms-scrobbler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11492

Modified Files:
	.cvsignore sources xmms-scrobbler.spec 
Log Message:
* Thu Apr 27 2006 Andreas Thienemann <andreas at bawue.net> 0.3.8-1
- Updated to 0.3.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xmms-scrobbler/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Apr 2006 16:15:38 -0000	1.2
+++ .cvsignore	27 Apr 2006 16:36:01 -0000	1.3
@@ -1 +1 @@
-xmms-scrobbler-0.3.6.tar.bz2
+xmms-scrobbler-0.3.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmms-scrobbler/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Apr 2006 16:15:39 -0000	1.2
+++ sources	27 Apr 2006 16:36:01 -0000	1.3
@@ -1 +1 @@
-eb5b53815eb91f5294f76ca424369b7f  xmms-scrobbler-0.3.6.tar.bz2
+4ec7486e221485231072a48d9ac8d478  xmms-scrobbler-0.3.8.tar.bz2


Index: xmms-scrobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-scrobbler/devel/xmms-scrobbler.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xmms-scrobbler.spec	27 Apr 2006 16:15:39 -0000	1.1
+++ xmms-scrobbler.spec	27 Apr 2006 16:36:01 -0000	1.2
@@ -2,12 +2,12 @@
 
 Summary: Audioscrobbler plugin for XMMS
 Name: xmms-scrobbler
-Version: 0.3.6
-Release: 2%{?dist}
+Version: 0.3.8
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.last.fm/downloads.php
-Source:  http://static.last.fm/plugins/xmms-scrobbler-%{version}.tar.bz2
+Source: http://www.pipian.com/stuffforchat/xmms-scrobbler-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: xmms >= 1.2.4
 BuildRequires: xmms-devel >= 1.2.4, libmusicbrainz-devel >= 2.0.0, curl-devel
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Thu Apr 27 2006 Andreas Thienemann <andreas at bawue.net> 0.3.8-1
+- Updated to 0.3.8
+
 * Thu Apr 27 2006 Andreas Thienemann <andreas at bawue.net> 0.3.6-2
 - Fixed permissions
 



From fedora-extras-commits at redhat.com  Thu Apr 27 16:45:41 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 27 Apr 2006 09:45:41 -0700
Subject: rpms/thinkpad-kmod/devel kmodtool, 1.4, 1.5 thinkpad-kmod.spec, 1.7,
	1.8
Message-ID: <200604271646.k3RGkDNQ011761@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/thinkpad-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11722/devel

Modified Files:
	kmodtool thinkpad-kmod.spec 
Log Message:
* Thu Apr 27 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.9-5
- Provide "kernel-modules" instead of "kernel-module" to match yum's config.
- s/%{kver}/%{kversion}/ for consistency with other vars.
- Allow specifying %{kversion} and %{kvariants} externally.



Index: kmodtool
===================================================================
RCS file: /cvs/extras/rpms/thinkpad-kmod/devel/kmodtool,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kmodtool	24 Mar 2006 21:17:32 -0000	1.4
+++ kmodtool	27 Apr 2006 16:45:41 -0000	1.5
@@ -24,7 +24,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 myprog="kmodtool"
-myver="0.10.6"
+myver="0.10.7"
 knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen[0U]\)'
 kmod_name=
 kver=
@@ -67,7 +67,7 @@
 %package       -n kmod-${kmod_name}${dashvariant}
 Summary:          ${kmod_name} kernel module(s)
 Group:            System Environment/Kernel
-Provides:         kernel-module = ${verrel}${variant}
+Provides:         kernel-modules = ${verrel}${variant}
 Provides:         kmod-${kmod_name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:         ${kdep}
 Requires:         ${kmod_name}-kmod-common = %{?epoch:%{epoch}:}%{version}


Index: thinkpad-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/thinkpad-kmod/devel/thinkpad-kmod.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- thinkpad-kmod.spec	15 Mar 2006 20:23:25 -0000	1.7
+++ thinkpad-kmod.spec	27 Apr 2006 16:45:41 -0000	1.8
@@ -3,22 +3,23 @@
 %define   kmodtool sh %{SOURCE10}
 # end stuff to be ...
 
-# temporarily hardcoded:
-%define kver      2.6.15-1.2054_FC5
+%{?kversion: %define kversion 2.6.16-1.2096_FC5}
+
+%define kmod_name lirc
+%define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
+
+%define upvar ""
 %ifarch i686
-%define kvariants "" xen0
-%else
-%define kvariants ""
+%define xenvar xen0
+%define kdumpvar kdump
 %endif
+%{!?kvariants: %define kvariants %{?upvar} %{?xenvar} %{?kdumpvar}}
 
-                %define kmod_name thinkpad
-                %define kverrel   %(%{kmodtool} verrel  %{?kver} 2>/dev/null)
-%{!?kvariants:  %global kvariants %(%{kmodtool} variant %{?kver} 2>/dev/null)}
 
 Name:           %{kmod_name}-kmod
 Summary:        %{kmod_name} kernel modules
 Version:        5.9
-Release:        4.%(echo %{kverrel} | tr - _)
+Release:        5.%(echo %{kverrel} | tr - _)
 
 URL:            http://tpctl.sourceforge.net/
 Source0:        http://download.sf.net/tpctl/thinkpad-%{version}.tar.gz
@@ -33,14 +34,9 @@
 %description
 This package provides %{kmod_name} kernel modules.
 
-# 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 -T -c -a 0
 %patch0 -p0
 sed -i /enable_thinkpadpm/d %{kmod_name}-%{version}/2.6/drivers/thinkpad.c
@@ -69,6 +65,11 @@
 
 
 %changelog
+* Thu Apr 27 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.9-5
+- Provide "kernel-modules" instead of "kernel-module" to match yum's config.
+- s/%%{kver}/%%{kversion}/ for consistency with other vars.
+- Allow specifying %%{kversion} and %%{kvariants} externally.
+
 * Wed Mar 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.9-4
 - Drop xenU.
 



From fedora-extras-commits at redhat.com  Thu Apr 27 16:45:40 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 27 Apr 2006 09:45:40 -0700
Subject: rpms/thinkpad-kmod/FC-5 kmodtool, 1.3, 1.4 thinkpad-kmod.spec, 1.7,
	1.8
Message-ID: <200604271646.k3RGkCnO011757@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/thinkpad-kmod/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11722/FC-5

Modified Files:
	kmodtool thinkpad-kmod.spec 
Log Message:
* Thu Apr 27 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.9-5
- Provide "kernel-modules" instead of "kernel-module" to match yum's config.
- s/%{kver}/%{kversion}/ for consistency with other vars.
- Allow specifying %{kversion} and %{kvariants} externally.



Index: kmodtool
===================================================================
RCS file: /cvs/extras/rpms/thinkpad-kmod/FC-5/kmodtool,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kmodtool	15 Mar 2006 19:52:17 -0000	1.3
+++ kmodtool	27 Apr 2006 16:45:40 -0000	1.4
@@ -24,7 +24,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 myprog="kmodtool"
-myver="0.10.5"
+myver="0.10.7"
 knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen[0U]\)'
 kmod_name=
 kver=
@@ -67,10 +67,10 @@
 %package       -n kmod-${kmod_name}${dashvariant}
 Summary:          ${kmod_name} kernel module(s)
 Group:            System Environment/Kernel
-Provides:         kernel-module = ${verrel}${variant}
-Provides:         kmod-${kmod_name} = %{version}-%{release}
+Provides:         kernel-modules = ${verrel}${variant}
+Provides:         kmod-${kmod_name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:         ${kdep}
-Requires:         ${kmod_name}-kmod-common = %{version}
+Requires:         ${kmod_name}-kmod-common = %{?epoch:%{epoch}:}%{version}
 Requires(post):   /sbin/depmod
 Requires(postun): /sbin/depmod
 BuildRequires:    kernel${dashvariant}-devel-%{_target_cpu} = ${verrel}


Index: thinkpad-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/thinkpad-kmod/FC-5/thinkpad-kmod.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- thinkpad-kmod.spec	15 Mar 2006 20:23:25 -0000	1.7
+++ thinkpad-kmod.spec	27 Apr 2006 16:45:40 -0000	1.8
@@ -3,22 +3,23 @@
 %define   kmodtool sh %{SOURCE10}
 # end stuff to be ...
 
-# temporarily hardcoded:
-%define kver      2.6.15-1.2054_FC5
+%{?kversion: %define kversion 2.6.16-1.2096_FC5}
+
+%define kmod_name lirc
+%define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
+
+%define upvar ""
 %ifarch i686
-%define kvariants "" xen0
-%else
-%define kvariants ""
+%define xenvar xen0
+%define kdumpvar kdump
 %endif
+%{!?kvariants: %define kvariants %{?upvar} %{?xenvar} %{?kdumpvar}}
 
-                %define kmod_name thinkpad
-                %define kverrel   %(%{kmodtool} verrel  %{?kver} 2>/dev/null)
-%{!?kvariants:  %global kvariants %(%{kmodtool} variant %{?kver} 2>/dev/null)}
 
 Name:           %{kmod_name}-kmod
 Summary:        %{kmod_name} kernel modules
 Version:        5.9
-Release:        4.%(echo %{kverrel} | tr - _)
+Release:        5.%(echo %{kverrel} | tr - _)
 
 URL:            http://tpctl.sourceforge.net/
 Source0:        http://download.sf.net/tpctl/thinkpad-%{version}.tar.gz
@@ -33,14 +34,9 @@
 %description
 This package provides %{kmod_name} kernel modules.
 
-# 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 -T -c -a 0
 %patch0 -p0
 sed -i /enable_thinkpadpm/d %{kmod_name}-%{version}/2.6/drivers/thinkpad.c
@@ -69,6 +65,11 @@
 
 
 %changelog
+* Thu Apr 27 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.9-5
+- Provide "kernel-modules" instead of "kernel-module" to match yum's config.
+- s/%%{kver}/%%{kversion}/ for consistency with other vars.
+- Allow specifying %%{kversion} and %%{kvariants} externally.
+
 * Wed Mar 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.9-4
 - Drop xenU.
 



From fedora-extras-commits at redhat.com  Thu Apr 27 16:47:45 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 27 Apr 2006 09:47:45 -0700
Subject: rpms/lirc-kmod/FC-5 kmodtool,1.3,1.4 lirc-kmod.spec,1.6,1.7
Message-ID: <200604271648.k3RGmHwE011812@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc-kmod/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11772/FC-5

Modified Files:
	kmodtool lirc-kmod.spec 
Log Message:
* Thu Apr 27 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-6
- Provide "kernel-modules" instead of "kernel-module" to match yum's config.
- s/%{kver}/%{kversion}/ for consistency with other vars.
- Allow specifying %{kversion} and %{kvariants} externally.



Index: kmodtool
===================================================================
RCS file: /cvs/extras/rpms/lirc-kmod/FC-5/kmodtool,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kmodtool	13 Mar 2006 21:06:07 -0000	1.3
+++ kmodtool	27 Apr 2006 16:47:45 -0000	1.4
@@ -24,7 +24,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 myprog="kmodtool"
-myver="0.10.5"
+myver="0.10.7"
 knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen[0U]\)'
 kmod_name=
 kver=
@@ -67,10 +67,10 @@
 %package       -n kmod-${kmod_name}${dashvariant}
 Summary:          ${kmod_name} kernel module(s)
 Group:            System Environment/Kernel
-Provides:         kernel-module = ${verrel}${variant}
-Provides:         kmod-${kmod_name} = %{version}-%{release}
+Provides:         kernel-modules = ${verrel}${variant}
+Provides:         kmod-${kmod_name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:         ${kdep}
-Requires:         ${kmod_name}-kmod-common = %{version}
+Requires:         ${kmod_name}-kmod-common = %{?epoch:%{epoch}:}%{version}
 Requires(post):   /sbin/depmod
 Requires(postun): /sbin/depmod
 BuildRequires:    kernel${dashvariant}-devel-%{_target_cpu} = ${verrel}


Index: lirc-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/lirc-kmod/FC-5/lirc-kmod.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lirc-kmod.spec	17 Mar 2006 07:33:45 -0000	1.6
+++ lirc-kmod.spec	27 Apr 2006 16:47:45 -0000	1.7
@@ -5,29 +5,25 @@
 %define   kmodtool sh %{SOURCE10}
 # end stuff to be ...
 
-# temporarily hardcoded:
-%define kver      2.6.15-1.2054_FC5
-%ifnarch i686 x86_64 ppc
-%define kvariants ""
-%else
-%ifarch i686
-%define kvariants "" smp xen0 xenU
-%endif
-%ifarch x86_64
-%define kvariants "" xen0 xenU
-%endif
-%ifarch ppc
-%define kvariants "" smp
+%{?kversion: %define kversion 2.6.16-1.2096_FC5}
+
+%define kmod_name lirc
+%define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
+
+%define upvar ""
+%ifarch i686 ppc
+%define smpvar smp
 %endif
+%ifarch i686 x86_64
+%define xenvar xen0 xenU
+%define kdumpvar kdump
 %endif
+%{!?kvariants: %define kvariants %{?upvar} %{?smpvar} %{?xenvar} %{?kdumpvar}}
 
-                %define kmod_name lirc
-                %define kverrel   %(%{kmodtool} verrel  %{?kver} 2>/dev/null)
-%{!?kvariants:  %global kvariants %(%{kmodtool} variant %{?kver} 2>/dev/null)}
 
 Name:           %{kmod_name}-kmod
 Version:        0.8.0
-Release:        5.%(echo %{kverrel} | tr - _)
+Release:        6.%(echo %{kverrel} | tr - _)
 Summary:        LIRC kernel modules
 
 Group:          System Environment/Kernel
@@ -49,14 +45,9 @@
 computer with a remote control.  This package contains additional
 kernel modules to support additional remote control units.
 
-# 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
 cd lirc-%{version}*
 %patch0 -p0
@@ -116,6 +107,11 @@
 
 
 %changelog
+* Thu Apr 27 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-6
+- Provide "kernel-modules" instead of "kernel-module" to match yum's config.
+- s/%%{kver}/%%{kversion}/ for consistency with other vars.
+- Allow specifying %%{kversion} and %%{kvariants} externally.
+
 * Fri Mar 17 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-5
 - Drop the ppc64* experiment.
 



From fedora-extras-commits at redhat.com  Thu Apr 27 16:47:45 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 27 Apr 2006 09:47:45 -0700
Subject: rpms/lirc-kmod/devel kmodtool,1.4,1.5 lirc-kmod.spec,1.6,1.7
Message-ID: <200604271648.k3RGmHSd011816@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11772/devel

Modified Files:
	kmodtool lirc-kmod.spec 
Log Message:
* Thu Apr 27 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-6
- Provide "kernel-modules" instead of "kernel-module" to match yum's config.
- s/%{kver}/%{kversion}/ for consistency with other vars.
- Allow specifying %{kversion} and %{kvariants} externally.



Index: kmodtool
===================================================================
RCS file: /cvs/extras/rpms/lirc-kmod/devel/kmodtool,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kmodtool	24 Mar 2006 21:17:39 -0000	1.4
+++ kmodtool	27 Apr 2006 16:47:45 -0000	1.5
@@ -24,7 +24,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 myprog="kmodtool"
-myver="0.10.6"
+myver="0.10.7"
 knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen[0U]\)'
 kmod_name=
 kver=
@@ -67,7 +67,7 @@
 %package       -n kmod-${kmod_name}${dashvariant}
 Summary:          ${kmod_name} kernel module(s)
 Group:            System Environment/Kernel
-Provides:         kernel-module = ${verrel}${variant}
+Provides:         kernel-modules = ${verrel}${variant}
 Provides:         kmod-${kmod_name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:         ${kdep}
 Requires:         ${kmod_name}-kmod-common = %{?epoch:%{epoch}:}%{version}


Index: lirc-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/lirc-kmod/devel/lirc-kmod.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lirc-kmod.spec	17 Mar 2006 07:28:47 -0000	1.6
+++ lirc-kmod.spec	27 Apr 2006 16:47:45 -0000	1.7
@@ -5,29 +5,25 @@
 %define   kmodtool sh %{SOURCE10}
 # end stuff to be ...
 
-# temporarily hardcoded:
-%define kver      2.6.15-1.2054_FC5
-%ifnarch i686 x86_64 ppc
-%define kvariants ""
-%else
-%ifarch i686
-%define kvariants "" smp xen0 xenU
-%endif
-%ifarch x86_64
-%define kvariants "" xen0 xenU
-%endif
-%ifarch ppc
-%define kvariants "" smp
+%{?kversion: %define kversion 2.6.16-1.2096_FC5}
+
+%define kmod_name lirc
+%define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
+
+%define upvar ""
+%ifarch i686 ppc
+%define smpvar smp
 %endif
+%ifarch i686 x86_64
+%define xenvar xen0 xenU
+%define kdumpvar kdump
 %endif
+%{!?kvariants: %define kvariants %{?upvar} %{?smpvar} %{?xenvar} %{?kdumpvar}}
 
-                %define kmod_name lirc
-                %define kverrel   %(%{kmodtool} verrel  %{?kver} 2>/dev/null)
-%{!?kvariants:  %global kvariants %(%{kmodtool} variant %{?kver} 2>/dev/null)}
 
 Name:           %{kmod_name}-kmod
 Version:        0.8.0
-Release:        5.%(echo %{kverrel} | tr - _)
+Release:        6.%(echo %{kverrel} | tr - _)
 Summary:        LIRC kernel modules
 
 Group:          System Environment/Kernel
@@ -49,14 +45,9 @@
 computer with a remote control.  This package contains additional
 kernel modules to support additional remote control units.
 
-# 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
 cd lirc-%{version}*
 %patch0 -p0
@@ -116,6 +107,11 @@
 
 
 %changelog
+* Thu Apr 27 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-6
+- Provide "kernel-modules" instead of "kernel-module" to match yum's config.
+- s/%%{kver}/%%{kversion}/ for consistency with other vars.
+- Allow specifying %%{kversion} and %%{kvariants} externally.
+
 * Fri Mar 17 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-5
 - Drop the ppc64* experiment.
 



From fedora-extras-commits at redhat.com  Thu Apr 27 16:52:48 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Thu, 27 Apr 2006 09:52:48 -0700
Subject: owners owners.list,1.905,1.906
Message-ID: <200604271652.k3RGqoqM011878@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11856

Modified Files:
	owners.list 
Log Message:
Added tetex-dvipost


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.905
retrieving revision 1.906
diff -u -r1.905 -r1.906
--- owners.list	27 Apr 2006 16:23:24 -0000	1.905
+++ owners.list	27 Apr 2006 16:52:48 -0000	1.906
@@ -1481,6 +1481,7 @@
 Fedora Extras|tetex-armtex|Support for typesetting Armenian with TeX and LaTeX|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-beamer|A LaTeX class for producing presentations and slides|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-bytefield|Create illustrations for network protocol specifications|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
+Fedora Extras|tetex-dvipost|LaTeX post filter command to support change bars and overstrike mode|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-eurofont|Provides a command that prints a euro symbol|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-font-cm-lgc|The CM-LGC Type1 fonts for LaTeX|paskalis at di.uoa.gr|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-font-kerkis|The Kerkis type 1 fonts for LaTeX|paskalis at di.uoa.gr|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Apr 27 17:03:04 2006
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Thu, 27 Apr 2006 10:03:04 -0700
Subject: rpms/zile/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200604271703.k3RH3asn014745@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/zile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14695

Modified Files:
	.cvsignore sources 
Log Message:
* Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-1
- Bump to latest release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zile/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Aug 2005 16:36:38 -0000	1.2
+++ .cvsignore	27 Apr 2006 17:03:04 -0000	1.3
@@ -1 +1 @@
-zile-2.2.4.tar.gz
+zile-2.2.13.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zile/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Aug 2005 16:36:38 -0000	1.2
+++ sources	27 Apr 2006 17:03:04 -0000	1.3
@@ -1 +1 @@
-4c4212d9c3bc744ef438bfdf61d976e3  zile-2.2.4.tar.gz
+d2156809cf1482c2f670d35b083babb5  zile-2.2.13.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 17:04:58 2006
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Thu, 27 Apr 2006 10:04:58 -0700
Subject: rpms/zile/FC-4 sources,1.2,1.3
Message-ID: <200604271705.k3RH50i4014808@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/zile/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14761/FC-4

Modified Files:
	sources 
Log Message:
* Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-1
- Bump to latest release.



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zile/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Aug 2005 16:36:38 -0000	1.2
+++ sources	27 Apr 2006 17:04:57 -0000	1.3
@@ -1 +1 @@
-4c4212d9c3bc744ef438bfdf61d976e3  zile-2.2.4.tar.gz
+d2156809cf1482c2f670d35b083babb5  zile-2.2.13.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 17:04:57 2006
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Thu, 27 Apr 2006 10:04:57 -0700
Subject: rpms/zile/FC-3 sources,1.2,1.3
Message-ID: <200604271705.k3RH4x5N014806@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/zile/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14761/FC-3

Modified Files:
	sources 
Log Message:
* Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-1
- Bump to latest release.



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zile/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Aug 2005 16:36:38 -0000	1.2
+++ sources	27 Apr 2006 17:04:57 -0000	1.3
@@ -1 +1 @@
-4c4212d9c3bc744ef438bfdf61d976e3  zile-2.2.4.tar.gz
+d2156809cf1482c2f670d35b083babb5  zile-2.2.13.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 17:04:58 2006
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Thu, 27 Apr 2006 10:04:58 -0700
Subject: rpms/zile/FC-5 sources,1.2,1.3
Message-ID: <200604271705.k3RH50N5014812@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/zile/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14761/FC-5

Modified Files:
	sources 
Log Message:
* Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-1
- Bump to latest release.



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zile/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Aug 2005 16:36:38 -0000	1.2
+++ sources	27 Apr 2006 17:04:58 -0000	1.3
@@ -1 +1 @@
-4c4212d9c3bc744ef438bfdf61d976e3  zile-2.2.4.tar.gz
+d2156809cf1482c2f670d35b083babb5  zile-2.2.13.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 17:06:54 2006
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Thu, 27 Apr 2006 10:06:54 -0700
Subject: rpms/zile/FC-5 .cvsignore,1.2,1.3
Message-ID: <200604271706.k3RH6u2A014968@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/zile/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14914/FC-5

Modified Files:
	.cvsignore 
Log Message:
* Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-1
- Bump to latest release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zile/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Aug 2005 16:36:38 -0000	1.2
+++ .cvsignore	27 Apr 2006 17:06:54 -0000	1.3
@@ -1 +1 @@
-zile-2.2.4.tar.gz
+zile-2.2.13.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 17:06:53 2006
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Thu, 27 Apr 2006 10:06:53 -0700
Subject: rpms/zile/FC-3 .cvsignore,1.2,1.3
Message-ID: <200604271706.k3RH6tn4014959@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/zile/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14914/FC-3

Modified Files:
	.cvsignore 
Log Message:
* Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-1
- Bump to latest release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zile/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Aug 2005 16:36:38 -0000	1.2
+++ .cvsignore	27 Apr 2006 17:06:53 -0000	1.3
@@ -1 +1 @@
-zile-2.2.4.tar.gz
+zile-2.2.13.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 17:06:53 2006
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Thu, 27 Apr 2006 10:06:53 -0700
Subject: rpms/zile/FC-4 .cvsignore,1.2,1.3
Message-ID: <200604271706.k3RH6tDJ014963@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/zile/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14914/FC-4

Modified Files:
	.cvsignore 
Log Message:
* Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-1
- Bump to latest release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zile/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Aug 2005 16:36:38 -0000	1.2
+++ .cvsignore	27 Apr 2006 17:06:53 -0000	1.3
@@ -1 +1 @@
-zile-2.2.4.tar.gz
+zile-2.2.13.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 17:19:43 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Thu, 27 Apr 2006 10:19:43 -0700
Subject: fedora-security/audit fc4,1.221,1.222 fc5,1.135,1.136
Message-ID: <200604271719.k3RHJhH4015072@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15049/audit

Modified Files:
	fc4 fc5 
Log Message:
Add CVE-2006-2071 and correct CVE-2006-1524



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- fc4	27 Apr 2006 12:22:51 -0000	1.221
+++ fc4	27 Apr 2006 17:19:40 -0000	1.222
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2006-2071 version (kernel, fixed 2.6.16.6) [since FEDORA-2006-423]
 CVE-2006-2057 ** firefox
 CVE-2006-2026 VULNERABLE (libtiff, fixed 3.8.1) #189934
 CVE-2006-2025 VULNERABLE (libtiff, fixed 3.8.1) #189934
@@ -98,7 +99,7 @@
 CVE-2006-1529 VULNERABLE (thunderbird, fixed 1.0.8)
 CVE-2006-1529 VULNERABLE (firefox, fixed 1.0.8)
 CVE-2006-1525 version (kernel, fixed 2.6.16.8) [since FEDORA-2006-423]
-CVE-2006-1524 version (kernel, fixed 2.6.16.5) [since FEDORA-2006-423]
+CVE-2006-1524 version (kernel, fixed 2.6.16.7) [since FEDORA-2006-423]
 CVE-2006-1523 version (kernel, fixed 2.6.16.4) [since FEDORA-2006-423]
 CVE-2006-1522 version (kernel, fixed 2.6.16.3) [since FEDORA-2006-423]
 CVE-2006-1494 VULNERABLE (php)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- fc5	27 Apr 2006 12:22:51 -0000	1.135
+++ fc5	27 Apr 2006 17:19:40 -0000	1.136
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2006-2071 version (kernel, fixed 2.6.16.6) [since FEDORA-2006-421]
 CVE-2006-2057 ** firefox
 CVE-2006-2026 VULNERABLE (libtiff, fixed 3.8.1) #189934
 CVE-2006-2025 VULNERABLE (libtiff, fixed 3.8.1) #189934
@@ -98,7 +99,7 @@
 CVE-2006-1529 VULNERABLE (thunderbird, fixed 1.5.0.2)
 CVE-2006-1529 VULNERABLE (firefox, fixed 1.5.0.2)
 CVE-2006-1525 version (kernel, fixed 2.6.16.8) [since FEDORA-2006-421]
-CVE-2006-1524 version (kernel, fixed 2.6.16.5) [since FEDORA-2006-421]
+CVE-2006-1524 version (kernel, fixed 2.6.16.7) [since FEDORA-2006-421]
 CVE-2006-1523 version (kernel, fixed 2.6.16.4) [since FEDORA-2006-421]
 CVE-2006-1522 version (kernel, fixed 2.6.16.3) [since FEDORA-2006-421]
 CVE-2006-1494 VULNERABLE (php)



From fedora-extras-commits at redhat.com  Thu Apr 27 17:29:01 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu, 27 Apr 2006 10:29:01 -0700
Subject: rpms/gtkhtml36/FC-5 gtkhtml36.spec,1.1,1.2
Message-ID: <200604271729.k3RHT3PU015184@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gtkhtml36/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15129

Modified Files:
	gtkhtml36.spec 
Log Message:
bump the release tag - it was imported into devel with the fc5 release tag,
and I can't make tag in fc5 as result




Index: gtkhtml36.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkhtml36/FC-5/gtkhtml36.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtkhtml36.spec	27 Apr 2006 16:19:20 -0000	1.1
+++ gtkhtml36.spec	27 Apr 2006 17:29:01 -0000	1.2
@@ -5,7 +5,7 @@
 Summary:       GtkHTML 3.6 Compatibility Library
 Name:          gtkhtml36
 Version:       3.6.2
-Release:       3%{?dist}
+Release:       4%{?dist}
 License:       LGPL/GPL
 Group:         System Environment/Libraries
 Url:           http://www.gnome.org/
@@ -89,6 +89,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Apr 27 2006 Michael A. Peters <mpeters at mac.com> - 3.6.2-4
+- Bump release tag for proper tagging before build
+
 * Wed Apr 26 2006 Michael A. Peters <mpeters at mac.com> - 3.6.2-3
 - Fixed issues in bugzilla 171314 comment 9
 



From fedora-extras-commits at redhat.com  Thu Apr 27 17:29:56 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu, 27 Apr 2006 10:29:56 -0700
Subject: rpms/gtkhtml36/devel gtkhtml36.spec,1.1,1.2
Message-ID: <200604271729.k3RHTxY4015238@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gtkhtml36/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15221

Modified Files:
	gtkhtml36.spec 
Log Message:
bump release tag



Index: gtkhtml36.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkhtml36/devel/gtkhtml36.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtkhtml36.spec	27 Apr 2006 16:19:20 -0000	1.1
+++ gtkhtml36.spec	27 Apr 2006 17:29:56 -0000	1.2
@@ -5,7 +5,7 @@
 Summary:       GtkHTML 3.6 Compatibility Library
 Name:          gtkhtml36
 Version:       3.6.2
-Release:       3%{?dist}
+Release:       4%{?dist}
 License:       LGPL/GPL
 Group:         System Environment/Libraries
 Url:           http://www.gnome.org/
@@ -89,6 +89,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Apr 27 2006 Michael A. Peters <mpeters at mac.com> - 3.6.2-4
+- Bump release tag for proper tagging before build
+
 * Wed Apr 26 2006 Michael A. Peters <mpeters at mac.com> - 3.6.2-3
 - Fixed issues in bugzilla 171314 comment 9
 



From fedora-extras-commits at redhat.com  Thu Apr 27 17:43:17 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Thu, 27 Apr 2006 10:43:17 -0700
Subject: rpms/kbibtex/FC-5 .cvsignore, 1.2, 1.3 kbibtex.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200604271743.k3RHhJXd015383@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15360

Modified Files:
	.cvsignore kbibtex.spec sources 
Log Message:
- Update to version 0.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Jan 2006 08:03:21 -0000	1.2
+++ .cvsignore	27 Apr 2006 17:43:17 -0000	1.3
@@ -1 +1 @@
-kbibtex-0.1.3.tar.bz2
+kbibtex-0.1.4.tar.bz2


Index: kbibtex.spec
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/FC-5/kbibtex.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kbibtex.spec	1 Mar 2006 12:59:06 -0000	1.3
+++ kbibtex.spec	27 Apr 2006 17:43:17 -0000	1.4
@@ -1,13 +1,12 @@
 Name:		kbibtex
-Version:	0.1.3
-Release:	4%{?dist}
+Version:	0.1.4
+Release:	1%{?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
-Patch:		kbibtex-qualifier.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdebase-devel >= 3.3 libxslt-devel desktop-file-utils
@@ -20,7 +19,6 @@
 
 %prep
 %setup -q
-%patch -p1 -b .qualifier
 
 
 %build
@@ -116,8 +114,8 @@
 %{_datadir}/applications/fedora-kbibtex_part.desktop
 
 %changelog
-* Wed Mar 01 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.3-4
-- Rebuild for Fedora Extras 5
+* Wed Apr 27 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.4-1
+- Update to the version 0.1.4
 
 * Fri Dec 23 2005 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.3-3
 - Patch to resolve an error when this package is compiled with gcc 4.1.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Jan 2006 08:03:21 -0000	1.2
+++ sources	27 Apr 2006 17:43:17 -0000	1.3
@@ -1 +1 @@
-ad603af9130ff1e0ad30ac618211bdc5  kbibtex-0.1.3.tar.bz2
+8db022a94818660dfa4c4bb08aed5e8e  kbibtex-0.1.4.tar.bz2



From fedora-extras-commits at redhat.com  Thu Apr 27 17:48:19 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Thu, 27 Apr 2006 10:48:19 -0700
Subject: rpms/fedora-usermgmt/devel macros.fedora-usermgmt, NONE,
	1.1 fedora-usermgmt.spec, 1.9, 1.10
Message-ID: <200604271748.k3RHmL8V015488@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/fedora-usermgmt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15470

Modified Files:
	fedora-usermgmt.spec 
Added Files:
	macros.fedora-usermgmt 
Log Message:
- moved most content of the base package and used directories into a
  -core subpackage; this avoids dependencies loops.
- renamed -setup into the much longer -default-fedora-setup; because
  yum's depsolver is not very smart (and choses packages with smallest
  name) it might is more difficult to provide a custom -setup package
  else
- added -devel subpackages with a /etc/rpm/macros.fedora-usermgmt file



--- NEW FILE macros.fedora-usermgmt ---
## Use these macros like
##
## =====
## %bcond_without	fedora
## 
## BuildRequires:	fedora-usermgmt-devel
## %{?FE_USERADD_REQ}
## ...
## %pre
## %__fe_groupadd <uid> -r ... &>/dev/null || :
## %__fe_useradd  <uid> -r ... &>/dev/null || :
##
## %postun
## %__fe_userdel  ... &>/dev/null || :
## %__fe_groupdel ... &>/dev/null || :


%__fe_useradd		%{?with_fedora:/usr/sbin/fedora-useradd}%{!?with_fedora:__useradd() { shift; /usr/sbin/useradd "$@"; }; __useradd}
%__fe_userdel		test "$1" != 0 || %{?with_fedora:/usr/sbin/fedora-userdel}%{!?with_fedora:/usr/sbin/userdel}

%__fe_groupadd		%{?with_fedora:/usr/sbin/fedora-groupadd}%{!?with_fedora:__groupadd() { shift; /usr/sbin/groupadd "$@"; }; __groupadd}
%__fe_groupdel		test "$1" != 0 || %{?with_fedora:/usr/sbin/fedora-groupdel}%{!?with_fedora:/usr/sbin/groupdel}

%FE_USERADD_REQ	\
Requires(pre):		%{?with_fedora:fedora-usermgmt}%{!?with_fedora:shadow-utils}	\
Requires(postun):	%{?with_fedora:fedora-usermgmt}%{!?with_fedora:shadow-utils}


Index: fedora-usermgmt.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-usermgmt/devel/fedora-usermgmt.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fedora-usermgmt.spec	18 Feb 2006 09:39:08 -0000	1.9
+++ fedora-usermgmt.spec	27 Apr 2006 17:48:19 -0000	1.10
@@ -8,23 +8,28 @@
 
 Summary:	Fedora tools for user management
 Name:		fedora-usermgmt
-Version:	0.8
+Version:	0.8.90
 Release:	%release_func 2
 
 License:	GPL
 BuildArch:	noarch
 Group:		Applications/System
 URL:		http://fedoraproject.org/wiki/PackageUserCreation
-Source0:	fedora-usermgmt-wrapper
-Source1:	fedora-usermgmt-README
+Requires(pre):	%name-core = %version-%release
 Requires(pre):	instance(fedora-usermgmt)
 Requires(pre):	setup(fedora-usermgmt)
 BuildRoot:	%_tmppath/%name-%version-%release-root
-Requires(pre):		%_sysconfdir/fedora
-Requires(postun):	%_sysconfdir/fedora
 
 
-%package setup
+%package core
+Summary:	Core utilities for the fedora-usermgmt
+Group:		Applications/System
+Source0:	fedora-usermgmt-wrapper
+Source1:	fedora-usermgmt-README
+Requires:	%name = %version-%release
+
+
+%package default-fedora-setup
 Summary:	Default values for baseuid/basegid
 Group:		System Environment/Base
 Provides:	setup(fedora-usermgmt)
@@ -32,6 +37,8 @@
 Conflicts:	flavor(fedora-usermgmt-setup) < default
 Conflicts:	flavor(fedora-usermgmt-setup) > default
 Source2:	fedora-usermgmt-baseid
+Provides:	%name-setup = %name-%version
+Obsoletes:	%name-setup < %name-%version
 
 
 %package shadow-utils
@@ -50,12 +57,32 @@
 Requires:		shadow-utils
 
 
+%package devel
+Summary:	Enhancements for fedora-usermgmt
+Group:		Development/System
+Source30:	macros.fedora-usermgmt
+Conflicts:	%name < %version-%release
+Conflicts:	%name > %version-%release
+Requires(pre):		%_sysconfdir/rpm
+Requires(postun):	%_sysconfdir/rpm
+
+
 %description
 This package provides wrapper around the useradd/-del and groupadd/-del
 programs to allow predictable uids/gids.
 
 
-%description setup
+%description core
+This package provides wrapper around the useradd/-del and groupadd/-del
+programs to allow predictable uids/gids.
+
+
+%description devel
+This package provides wrapper around the useradd/-del and groupadd/-del
+programs to allow predictable uids/gids.
+
+
+%description default-fedora-setup
 This package contains default values for the base of relative UIDs. It
 is designed to be overridden by local customizations; you should create
 a package with
@@ -109,6 +136,12 @@
 %__install -p -m755 %SOURCE21 ${RPM_BUILD_ROOT}%confdir/scripts.legacy/useradd
 
 
+## The -devel installation
+%__install -d -m755           ${RPM_BUILD_ROOT}%_sysconfdir/rpm
+%__install -p -m444 %SOURCE30 ${RPM_BUILD_ROOT}%_sysconfdir/rpm/
+
+
+
 %post shadow-utils
 %alternatives --install %confdir/scripts %name %confdir/scripts.legacy 60
 %alternatives --install %confdir/scripts %name %confdir/scripts.shadow-utils 50
@@ -126,27 +159,44 @@
 %files
 %defattr(-,root,root,-)
 %doc README
+
+
+%files core
+%defattr(-,root,root,-)
 %dir %_sysconfdir/fedora
+%dir %confdir
 %pkgdatadir
 %_sbindir/*
 
 
-%files setup
+%files default-fedora-setup
 %defattr(-,root,root,-)
-%dir %confdir
 %config(noreplace) %confdir/base*
-## Temporary hack: /etc/fedora should be provided by a filesystem-like
-## package
-%dir %_sysconfdir/fedora
 
 
 %files shadow-utils
 %defattr(-,root,root,-)
-%dir %confdir/scripts.*
+%dir    %confdir/scripts.*
 %config %confdir/scripts.*/*
 
 
+%files devel
+%defattr(-,root,root,-)
+# do not add %config here; rpm does not ignore the generated
+# *.rpmsave/rpmnew files
+%_sysconfdir/rpm/macros.*
+
+
 %changelog
+* Thu Apr 27 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.8.90-2
+- moved most content of the base package and used directories into a
+  -core subpackage; this avoids dependencies loops.
+- renamed -setup into the much longer -default-fedora-setup; because
+  yum's depsolver is not very smart (and choses packages with smallest
+  name) it might is more difficult to provide a custom -setup package
+  else
+- added -devel subpackages with a /etc/rpm/macros.fedora-usermgmt file
+
 * Sat Feb 18 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.8-2
 - added the %%dist release-tag
 



From fedora-extras-commits at redhat.com  Thu Apr 27 18:18:56 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Thu, 27 Apr 2006 11:18:56 -0700
Subject: rpms/heartbeat/devel heartbeat-2.0.3-fedora-ccmuser.patch, 1.1,
	NONE heartbeat-2.0.3-fedora-chkconfig.patch, 1.1,
	NONE heartbeat-2.0.3-fedora-pam.patch, 1.1, NONE
Message-ID: <200604271818.k3RIIwsL020909@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/heartbeat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20885

Removed Files:
	heartbeat-2.0.3-fedora-ccmuser.patch 
	heartbeat-2.0.3-fedora-chkconfig.patch 
	heartbeat-2.0.3-fedora-pam.patch 
Log Message:
removal of patch files, should not have used version number in filename..


--- heartbeat-2.0.3-fedora-ccmuser.patch DELETED ---


--- heartbeat-2.0.3-fedora-chkconfig.patch DELETED ---


--- heartbeat-2.0.3-fedora-pam.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Apr 27 18:48:55 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Thu, 27 Apr 2006 11:48:55 -0700
Subject: rpms/kbibtex/FC-4 .cvsignore, 1.2, 1.3 kbibtex.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200604271848.k3RImvem026712@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26655

Modified Files:
	.cvsignore kbibtex.spec sources 
Log Message:
- Update to version 0.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Jan 2006 08:03:21 -0000	1.2
+++ .cvsignore	27 Apr 2006 18:48:54 -0000	1.3
@@ -1 +1 @@
-kbibtex-0.1.3.tar.bz2
+kbibtex-0.1.4.tar.bz2


Index: kbibtex.spec
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/FC-4/kbibtex.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kbibtex.spec	12 Jan 2006 08:03:21 -0000	1.1
+++ kbibtex.spec	27 Apr 2006 18:48:54 -0000	1.2
@@ -1,13 +1,12 @@
 Name:		kbibtex
-Version:	0.1.3
-Release:	3%{?dist}
+Version:	0.1.4
+Release:	1%{?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
-Patch:		kbibtex-qualifier.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdebase-devel >= 3.3 libxslt-devel desktop-file-utils
@@ -20,7 +19,6 @@
 
 %prep
 %setup -q
-%patch -p1 -b .qualifier
 
 
 %build
@@ -116,6 +114,9 @@
 %{_datadir}/applications/fedora-kbibtex_part.desktop
 
 %changelog
+* Wed Apr 27 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.4-1
+- Update to the version 0.1.4
+
 * Fri Dec 23 2005 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.3-3
 - Patch to resolve an error when this package is compiled with gcc 4.1.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Jan 2006 08:03:21 -0000	1.2
+++ sources	27 Apr 2006 18:48:54 -0000	1.3
@@ -1 +1 @@
-ad603af9130ff1e0ad30ac618211bdc5  kbibtex-0.1.3.tar.bz2
+8db022a94818660dfa4c4bb08aed5e8e  kbibtex-0.1.4.tar.bz2



From fedora-extras-commits at redhat.com  Thu Apr 27 18:53:10 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Thu, 27 Apr 2006 11:53:10 -0700
Subject: rpms/kbibtex/devel .cvsignore, 1.2, 1.3 kbibtex.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200604271853.k3RIrCe0027681@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27650

Modified Files:
	.cvsignore kbibtex.spec sources 
Log Message:
Update to version 0.1.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Jan 2006 08:03:21 -0000	1.2
+++ .cvsignore	27 Apr 2006 18:53:10 -0000	1.3
@@ -1 +1 @@
-kbibtex-0.1.3.tar.bz2
+kbibtex-0.1.4.tar.bz2


Index: kbibtex.spec
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/devel/kbibtex.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kbibtex.spec	1 Mar 2006 12:59:06 -0000	1.3
+++ kbibtex.spec	27 Apr 2006 18:53:10 -0000	1.4
@@ -1,13 +1,12 @@
 Name:		kbibtex
-Version:	0.1.3
-Release:	4%{?dist}
+Version:	0.1.4
+Release:	1%{?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
-Patch:		kbibtex-qualifier.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdebase-devel >= 3.3 libxslt-devel desktop-file-utils
@@ -20,7 +19,6 @@
 
 %prep
 %setup -q
-%patch -p1 -b .qualifier
 
 
 %build
@@ -116,8 +114,8 @@
 %{_datadir}/applications/fedora-kbibtex_part.desktop
 
 %changelog
-* Wed Mar 01 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.3-4
-- Rebuild for Fedora Extras 5
+* Wed Apr 27 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.4-1
+- Update to the version 0.1.4
 
 * Fri Dec 23 2005 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.3-3
 - Patch to resolve an error when this package is compiled with gcc 4.1.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Jan 2006 08:03:21 -0000	1.2
+++ sources	27 Apr 2006 18:53:10 -0000	1.3
@@ -1 +1 @@
-ad603af9130ff1e0ad30ac618211bdc5  kbibtex-0.1.3.tar.bz2
+8db022a94818660dfa4c4bb08aed5e8e  kbibtex-0.1.4.tar.bz2



From fedora-extras-commits at redhat.com  Thu Apr 27 19:05:36 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Thu, 27 Apr 2006 12:05:36 -0700
Subject: owners owners.list,1.906,1.907
Message-ID: <200604271905.k3RJ5cY4032110@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32021

Modified Files:
	owners.list 
Log Message:
taking ownership of gnome-password-generator



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.906
retrieving revision 1.907
diff -u -r1.906 -r1.907
--- owners.list	27 Apr 2006 16:52:48 -0000	1.906
+++ owners.list	27 Apr 2006 19:05:36 -0000	1.907
@@ -375,7 +375,7 @@
 Fedora Extras|gnome-blog|GNOME panel object for posting blog entries|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-common|Useful things common to building gnome packages from scratch|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-cpufreq-applet|CPU frequency scaling monitor applet|adrian at lisas.de|extras-qa at fedoraproject.org|
-Fedora Extras|gnome-password-generator|Graphical secure password generator|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|gnome-password-generator|Graphical secure password generator|michael at knox.net.nz|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  Thu Apr 27 19:06:04 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Thu, 27 Apr 2006 12:06:04 -0700
Subject: rpms/gnome-password-generator/FC-4 gnome-password-generator.spec,
	1.5, 1.6
Message-ID: <200604271906.k3RJ6aLX032337@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gnome-password-generator/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32152/FC-4

Modified Files:
	gnome-password-generator.spec 
Log Message:
updated spec, taking ownership



Index: gnome-password-generator.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-password-generator/FC-4/gnome-password-generator.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-password-generator.spec	6 Apr 2005 22:11:38 -0000	1.5
+++ gnome-password-generator.spec	27 Apr 2006 19:06:04 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           gnome-password-generator
 Version:        1.4
-Release:        3
+Release:        4%{?dist}
 
 Summary:        Graphical secure password generator
 
@@ -27,25 +27,23 @@
 
 
 %prep
-%setup -q
 
+%setup -q
 
 %build
 make %{?_smp_mflags}
 
-
 %install
-rm -rf ${RPM_BUILD_ROOT}
-make install DESTDIR=${RPM_BUILD_ROOT}
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 desktop-file-install --vendor fedora --delete-original \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications      \
+  --dir %{buildroot}%{_datadir}/applications      \
   --add-category X-Fedora                              \
-  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
+  %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
-
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
@@ -56,6 +54,9 @@
 
 
 %changelog
+* Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 1.4-4
+- taking ownership, spec clean up
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 



From fedora-extras-commits at redhat.com  Thu Apr 27 19:06:05 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Thu, 27 Apr 2006 12:06:05 -0700
Subject: rpms/gnome-password-generator/devel gnome-password-generator.spec,
	1.6, 1.7
Message-ID: <200604271906.k3RJ6bvi032345@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gnome-password-generator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32152/devel

Modified Files:
	gnome-password-generator.spec 
Log Message:
updated spec, taking ownership



Index: gnome-password-generator.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-password-generator/devel/gnome-password-generator.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnome-password-generator.spec	2 Mar 2006 21:29:27 -0000	1.6
+++ gnome-password-generator.spec	27 Apr 2006 19:06:05 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           gnome-password-generator
 Version:        1.4
-Release:        3
+Release:        4%{?dist}
 
 Summary:        Graphical secure password generator
 
@@ -27,32 +27,23 @@
 
 
 %prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
 
 %setup -q
 
-
 %build
 make %{?_smp_mflags}
 
-
 %install
-rm -rf ${RPM_BUILD_ROOT}
-make install DESTDIR=${RPM_BUILD_ROOT}
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 desktop-file-install --vendor fedora --delete-original \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications      \
+  --dir %{buildroot}%{_datadir}/applications      \
   --add-category X-Fedora                              \
-  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
+  %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
-
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
@@ -63,6 +54,9 @@
 
 
 %changelog
+* Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 1.4-4
+- taking ownership, spec clean up
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 



From fedora-extras-commits at redhat.com  Thu Apr 27 19:06:04 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Thu, 27 Apr 2006 12:06:04 -0700
Subject: rpms/gnome-password-generator/FC-5 gnome-password-generator.spec,
	1.6, 1.7
Message-ID: <200604271906.k3RJ6aAF032343@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gnome-password-generator/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32152/FC-5

Modified Files:
	gnome-password-generator.spec 
Log Message:
updated spec, taking ownership



Index: gnome-password-generator.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-password-generator/FC-5/gnome-password-generator.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnome-password-generator.spec	2 Mar 2006 21:29:27 -0000	1.6
+++ gnome-password-generator.spec	27 Apr 2006 19:06:04 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           gnome-password-generator
 Version:        1.4
-Release:        3
+Release:        4%{?dist}
 
 Summary:        Graphical secure password generator
 
@@ -27,32 +27,23 @@
 
 
 %prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
 
 %setup -q
 
-
 %build
 make %{?_smp_mflags}
 
-
 %install
-rm -rf ${RPM_BUILD_ROOT}
-make install DESTDIR=${RPM_BUILD_ROOT}
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 desktop-file-install --vendor fedora --delete-original \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications      \
+  --dir %{buildroot}%{_datadir}/applications      \
   --add-category X-Fedora                              \
-  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
+  %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
-
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
@@ -63,6 +54,9 @@
 
 
 %changelog
+* Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 1.4-4
+- taking ownership, spec clean up
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 



From fedora-extras-commits at redhat.com  Thu Apr 27 19:11:33 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 27 Apr 2006 12:11:33 -0700
Subject: rpms/opensc/devel .cvsignore, 1.6, 1.7 opensc.spec, 1.11,
	1.12 sources, 1.6, 1.7
Message-ID: <200604271911.k3RJBZEg000969@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/opensc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv939

Modified Files:
	.cvsignore opensc.spec sources 
Log Message:
* Thu Apr 27 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.11.0-0.1.rc2
- 0.11.0-rc2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/opensc/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	22 Apr 2006 20:35:55 -0000	1.6
+++ .cvsignore	27 Apr 2006 19:11:33 -0000	1.7
@@ -1 +1 @@
-opensc-0.11.0-rc1.tar.gz
+opensc-0.11.0-rc2.tar.gz


Index: opensc.spec
===================================================================
RCS file: /cvs/extras/rpms/opensc/devel/opensc.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- opensc.spec	22 Apr 2006 20:35:55 -0000	1.11
+++ opensc.spec	27 Apr 2006 19:11:33 -0000	1.12
@@ -2,13 +2,13 @@
 
 Name:           opensc
 Version:        0.11.0
-Release:        0.1.rc1%{?dist}
+Release:        0.1.rc2%{?dist}
 Summary:        Smart card library and applications
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://www.opensc-project.org/
-Source0:        http://www.opensc-project.org/files/opensc/testing/%{name}-%{version}-rc1.tar.gz
+Source0:        http://www.opensc-project.org/files/opensc/testing/%{name}-%{version}-rc2.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pcsc-lite-devel >= 1.1.1
@@ -50,7 +50,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-rc1
+%setup -q -n %{name}-%{version}-rc2
 sh bootstrap # avoid standard rpaths on lib64 archs
 cp -p src/pkcs15init/README ./README.pkcs15init
 cp -p src/scconf/README.scconf .
@@ -136,6 +136,9 @@
 
 
 %changelog
+* Thu Apr 27 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.11.0-0.1.rc2
+- 0.11.0-rc2.
+
 * Sat Apr 22 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.11.0-0.1.rc1
 - 0.11.0-rc1.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/opensc/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	22 Apr 2006 20:35:55 -0000	1.6
+++ sources	27 Apr 2006 19:11:33 -0000	1.7
@@ -1 +1 @@
-a911854594332241b62e5ed07b2e3a21  opensc-0.11.0-rc1.tar.gz
+960e33d4328bc7ee209a7a296bfc2fcc  opensc-0.11.0-rc2.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 19:28:29 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 27 Apr 2006 12:28:29 -0700
Subject: rpms/gnucap - New directory
Message-ID: <200604271928.k3RJSVrQ004351@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gnucap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4317/gnucap

Log Message:
Directory /cvs/extras/rpms/gnucap added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 27 19:28:30 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 27 Apr 2006 12:28:30 -0700
Subject: rpms/gnucap/devel - New directory
Message-ID: <200604271928.k3RJSWpg004356@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gnucap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4317/gnucap/devel

Log Message:
Directory /cvs/extras/rpms/gnucap/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 27 19:28:44 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 27 Apr 2006 12:28:44 -0700
Subject: rpms/gnucap Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604271928.k3RJSk9h004447@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gnucap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4406

Added Files:
	Makefile import.log 
Log Message:
Setup of module gnucap


--- NEW FILE Makefile ---
# Top level Makefile for module gnucap
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 27 19:28:45 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 27 Apr 2006 12:28:45 -0700
Subject: rpms/gnucap/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604271928.k3RJSlcP004453@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gnucap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4406/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gnucap


--- 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 Apr 27 19:29:33 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 27 Apr 2006 12:29:33 -0700
Subject: rpms/gnucap/devel gnucap-0.34-debian.patch, NONE, 1.1 gnucap.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604271929.k3RJTZJ4004684@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gnucap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4631/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gnucap-0.34-debian.patch gnucap.spec 
Log Message:
auto-import gnucap-0.34-2 on branch devel from gnucap-0.34-2.src.rpm

gnucap-0.34-debian.patch:

--- NEW FILE gnucap-0.34-debian.patch ---
--- gnucap-0.34.orig/doc/whatisit
+++ gnucap-0.34/doc/whatisit
@@ -1,4 +1,4 @@
-ACS is a general purpose circuit simulator.  It performs nonlinear
+Gnucap is a general purpose circuit simulator.  It performs nonlinear
 dc and transient analyses, fourier analysis, and ac analysis
 linearized at an operating point.  It is fully interactive and
 command driven.  It can also be run in batch mode or as a server.
@@ -6,7 +6,7 @@
 for the MOSFET (level 1-7) and diode are included in this
 release.
 
-ACS is not based on Berkeley Spice, but some of the models have been
+Gnucap is not based on Berkeley Spice, but some of the models have been
 derived from the Berleley models.
 
 Since it is fully interactive, it is possible to make changes and
@@ -19,7 +19,7 @@
 bipolar design.
 
 In batch mode it is mostly Spice compatible, so it is often possible
-to use the same file for both ACS and Spice.
+to use the same file for both Gnucap and Spice.
 
 The analog simulation is based on traditional nodal analysis with
 iteration by Newton's method and LU decomposition.  An event queue
@@ -36,11 +36,11 @@
 experimental and needs work.  There will be substantial improvements
 in future releases.
 
-ACS also has a simple behavioral modeling language that allows
+Gnucap also has a simple behavioral modeling language that allows
 simple behavioral descriptions of most components including capacitors
 and inductors.
 
-ACS uses an object oriented approach to modeling.  Complex models like
+Gnucap uses an object oriented approach to modeling.  Complex models like
 MOSFETS are made of simpler ones like resistors, capacitors, diodes,
 and any other models that may already exist.  The model designer does
 not need to worry about details like convergence checking, bypass
@@ -54,17 +54,13 @@
 If you are tired of Spice and want a second opinion, you want to
 play with the circuit and want a simulator that is interactive, or
 you want to study the source code and want something easier to
-follow than Spice, try ACS.
+follow than Spice, try Gnucap.
 
-ACS is an ongoing research project.  It is being released in a
+Gnucap is an ongoing research project.  It is being released in a
 preliminary phase in hopes that it will be useful and that others
 will use it as a thrust or base for their research.  I also hope
 for some comments that may help me direct my research.
 
-ACS ftp sites:
-	ftp://sunsite.unc.edu/pub/Linux/apps/circuits/acs-0.27.tar.gz
-	ftp://ftp.geda.seul.org/pub/geda/dist/acs-0.27.tar.gz
-	http://www.geda.seul.org/dist/acs-0.27.tar.gz
 
 Albert Davis
 aldavis at ieee.org
--- gnucap-0.34.orig/src/bm.cc
+++ gnucap-0.34/src/bm.cc
@@ -207,7 +207,8 @@
 /*--------------------------------------------------------------------------*/
 void EVAL_BM_ACTION_BASE::tr_finish_tdv(ELEMENT* d, double val)const
 {
-  d->_y0 = FPOLY1(CPOLY1(ioffset(d->_y0.x), 0., val));
+  CPOLY1 cp1(ioffset(d->_y0.x), 0., val);
+  d->_y0 = FPOLY1(cp1);
   tr_final_adjust(&(d->_y0), false);
 }
 /*--------------------------------------------------------------------------*/
--- gnucap-0.34.orig/src/e_card.h
+++ gnucap-0.34/src/e_card.h
@@ -32,6 +32,7 @@
 // external
 class CS;
 class COMMON_COMPONENT;
+CARD_LIST::fat_iterator findbranch(CS&,CARD_LIST::fat_iterator);
 /*--------------------------------------------------------------------------*/
 class CARD : public CKT_BASE {
 private:
--- gnucap-0.34.orig/src/d_vcvs.cc
+++ gnucap-0.34/src/d_vcvs.cc
@@ -58,7 +58,8 @@
     assert(_y0.f0 != LINEAR);
     store_values();
     q_load();
-    _m0 = CPOLY1(_y0);
+    CPOLY1 cp1(_y0);
+    _m0 =cp1;
     _m0 *= -_loss0;
   }else{
     assert(conchk(_loss0, 1./OPT::shortckt));
--- gnucap-0.34.orig/src/u_sdp.h
+++ gnucap-0.34/src/u_sdp.h
@@ -29,6 +29,9 @@
 #include "ap.h"
 /*--------------------------------------------------------------------------*/
 class OMSTREAM;
+class SDP;
+bool get(CS& cmd, const std::string& key, SDP* value,
+	 AP_MOD mod, double scale);
 /*--------------------------------------------------------------------------*/
 class SDP {
   friend bool get(CS& cmd, const std::string& key, SDP* value,
--- gnucap-0.34.orig/src/e_storag.cc
+++ gnucap-0.34/src/e_storag.cc
@@ -78,7 +78,8 @@
   _dt = NOT_VALID;
   _i0 = _q[0] = _q[1] = _q[2] = _q[3] = FPOLY1(0., 0., 0.);
   _it1_f0 = 0.;
-  _m1 = _m0 = CPOLY1(0., 0., 0.);
+  CPOLY1 cp1(0., 0., 0.);
+  _m1 = _m0 = cp1;
   assert(_loss0 == 0.);
   assert(_loss1 == 0.);
   if (!using_tr_eval()){
--- gnucap-0.34.orig/src/d_admit.cc
+++ gnucap-0.34/src/d_admit.cc
@@ -56,7 +56,8 @@
     assert(_y0.f0 != LINEAR);
     store_values();
     q_load();
-    _m0 = CPOLY1(_y0);
+    CPOLY1 cp1(_y0);
+    _m0 = cp1;
   }else{
     assert(_y0.f0 == LINEAR);
     assert(_y0.f1 == value());
@@ -171,7 +172,8 @@
 bool DEV_CPOLY_G::do_tr()
 {
   assert(_values);
-  _m0 = CPOLY1(0., _values[0], _values[1]);
+  CPOLY1 cp1(0., _values[0], _values[1]);
+  _m0 = cp1;
   return do_tr_con_chk_and_q();
 }
 /*--------------------------------------------------------------------------*/
@@ -193,7 +195,8 @@
     }}
   }}
   trace2("", _values[0], c0);
-  _m0 = CPOLY1(0., c0, _values[1]);
+  CPOLY1 cp1(0., c0, _values[1]);
+  _m0 = cp1;
 
   return do_tr_con_chk_and_q();
 }
--- gnucap-0.34.orig/src/e_compon.h
+++ gnucap-0.34/src/e_compon.h
@@ -43,6 +43,9 @@
 }
 /*--------------------------------------------------------------------------*/
 enum {CC_STATIC=27342}; // mid-sized arbitrary positive int
+class COMMON_COMPONENT;
+void attach_common(COMMON_COMPONENT* c, COMMON_COMPONENT** to);
+void detach_common(COMMON_COMPONENT** from);
 // pass this as an argument to a common constructor to mark it as static,
 // so it won't be deleted
 /*--------------------------------------------------------------------------*/
--- gnucap-0.34.orig/src/d_cap.cc
+++ gnucap-0.34/src/d_cap.cc
@@ -49,7 +49,8 @@
   _i0.f0 = differentiate();
   _i0.f1 = tr_c_to_g(_q[0].f1, _i0.f1);
 
-  _m0 = CPOLY1(_i0);
+  CPOLY1 cp1(_i0);
+  _m0 = cp1;
   return converged();
 }
 /*--------------------------------------------------------------------------*/
@@ -172,7 +173,8 @@
     }}
   }}
   
-  _m0 = CPOLY1(0., _vi0[0], _vi0[1]);
+  CPOLY1 cp1(0., _vi0[0], _vi0[1]);
+  _m0 = cp1;
   return do_tr_con_chk_and_q();
 }
 /*--------------------------------------------------------------------------*/
--- gnucap-0.34.orig/src/l_timer.h
+++ gnucap-0.34/src/l_timer.h
@@ -25,6 +25,8 @@
 #define U_TIMER_H
 #include "io_.h"
 /*--------------------------------------------------------------------------*/
+class TIMER;
+TIMER	operator-(const TIMER&,const TIMER&);
 class TIMER {
 private:
   enum {_T_NAME_LEN = 8};
--- gnucap-0.34.orig/ibis/model-in.cc
+++ gnucap-0.34/ibis/model-in.cc
@@ -145,23 +145,23 @@
 /*--------------------------------------------------------------------------*/
 void Model_Base::Type::parse(CS& file)
 {
-       set(file, "Terminator",	   &_type, mtTERMINATOR)
-    || set(file, "Input_ECL",	   &_type, mtINPUT_ECL)
-    || set(file, "Input",	   &_type, mtINPUT)
-    || set(file, "I/O_open_sink",  &_type, mtIO_OPEN_SINK)
-    || set(file, "I/O_open_drain", &_type, mtIO_OPEN_DRAIN)
-    || set(file, "I/O_open_source",&_type, mtIO_OPEN_SOURCE)
-    || set(file, "I/O_ECL",	   &_type, mtIO_ECL)
-    || set(file, "I/O",		   &_type, mtIO)
-    || set(file, "3-state_ECL",    &_type, mt3STATE_ECL)
-    || set(file, "3-state",	   &_type, mt3STATE)
-    || set(file, "Output_ECL",	   &_type, mtOUTPUT_ECL)
-    || set(file, "Output",	   &_type, mtOUTPUT)
-    || set(file, "Open_sink",	   &_type, mtOPEN_SINK)
-    || set(file, "Open_drain",	   &_type, mtOPEN_DRAIN)
-    || set(file, "Open_source",    &_type, mtOPEN_SOURCE)
-    || set(file, "Series_switch",  &_type, mtSERIES_SWITCH)
-    || set(file, "Series",	   &_type, mtSERIES)
+       set(file, "Terminator",	   (int*)&_type, (int)mtTERMINATOR)
+    || set(file, "Input_ECL",	   (int*)&_type, (int)mtINPUT_ECL)
+    || set(file, "Input",	   (int*)&_type, (int)mtINPUT)
+    || set(file, "I/O_open_sink",  (int*)&_type, (int)mtIO_OPEN_SINK)
+    || set(file, "I/O_open_drain", (int*)&_type, (int)mtIO_OPEN_DRAIN)
+    || set(file, "I/O_open_source",(int*)&_type, (int)mtIO_OPEN_SOURCE)
+    || set(file, "I/O_ECL",	   (int*)&_type, (int)mtIO_ECL)
+    || set(file, "I/O",		   (int*)&_type, (int)mtIO)
+    || set(file, "3-state_ECL",    (int*)&_type, (int)mt3STATE_ECL)
+    || set(file, "3-state",	   (int*)&_type, (int)mt3STATE)
+    || set(file, "Output_ECL",	   (int*)&_type, (int)mtOUTPUT_ECL)
+    || set(file, "Output",	   (int*)&_type, (int)mtOUTPUT)
+    || set(file, "Open_sink",	   (int*)&_type, (int)mtOPEN_SINK)
+    || set(file, "Open_drain",	   (int*)&_type, (int)mtOPEN_DRAIN)
+    || set(file, "Open_source",    (int*)&_type, (int)mtOPEN_SOURCE)
+    || set(file, "Series_switch",  (int*)&_type, (int)mtSERIES_SWITCH)
+    || set(file, "Series",	   (int*)&_type, (int)mtSERIES)
     || file.warn(0, "illegal model type");
 }
 /*--------------------------------------------------------------------------*/
@@ -235,8 +235,8 @@
 /*--------------------------------------------------------------------------*/
 void IO_Base::Polarity::parse(CS& file)
 {
-       set(file, "Non-Inverting", &_p, pNON_INVERTING)
-    || set(file, "Inverting",	  &_p, pINVERTING)
+       set(file, "Non-Inverting", (int*)&_p, (int)pNON_INVERTING)
+    || set(file, "Inverting",	  (int*)&_p, (int)pINVERTING)
     || file.warn(0, "need Inverting or Non-Inverting");
 }
 /*--------------------------------------------------------------------------*/
--- gnucap-0.34.orig/ibis/base.h
+++ gnucap-0.34/ibis/base.h
@@ -40,7 +40,7 @@
 class Base
 {
 private:
-  explicit Base(const Base&) {unreachable();}
+//  explicit Base(const Base&) {unreachable();}
   // This private base copy constructor inhibits generation of
   // copy constructors for its derived classes.
 protected:
--- gnucap-0.34.orig/ibis/comp-in.cc
+++ gnucap-0.34/ibis/comp-in.cc
@@ -24,8 +24,8 @@
 /*--------------------------------------------------------------------------*/
 void Component::Pin_Die::parse(CS& file)
 {
-       set(file, "Pin", &_pd, pdPIN)
-    || set(file, "Die", &_pd, pdDIE)
+       set(file, "Pin", (int*)&_pd, (int)pdPIN)
+    || set(file, "Die", (int*)&_pd, (int)pdDIE)
     || file.warn(0, "need Pin or Die");
 }
 /*--------------------------------------------------------------------------*/
--- gnucap-0.34.orig/ibis/file-in.cc
+++ gnucap-0.34/ibis/file-in.cc
@@ -25,9 +25,9 @@
 /*--------------------------------------------------------------------------*/
 void Redistribution::parse(CS& file)
 {
-       set(file, "Yes",	    &_r, dYES)
-    || set(file, "No",	    &_r, dNO)
-    || set(file, "Specific",&_r, dSPECIFIC)
+       set(file, "Yes",	    (int*)&_r, (int)dYES)
+    || set(file, "No",	    (int*)&_r, (int)dNO)
+    || set(file, "Specific",(int*)&_r, (int)dSPECIFIC)
     || file.warn(0, "need Yes, No, or Specific");
 }
 /*--------------------------------------------------------------------------*/
--- gnucap-0.34.orig/modelgen/mg_.h
+++ gnucap-0.34/modelgen/mg_.h
@@ -118,7 +118,7 @@
 	}
 	T* p = new T(file);
 	{if (!file.stuck(&here)) {
-	  _list.push_back(p);
+	  this->_list.push_back(p);
 	}else {
 	  delete p;
 	  file.warn(0, "not valid here");
@@ -137,7 +137,7 @@
     int here = file.cursor();
     T* m = new T(file);
     {if (!file.stuck(&here)) {
-      _list.push_back(m);
+      this->_list.push_back(m);
     }else{
       delete m;
       file.warn(0, "what's this??");
--- gnucap-0.34.orig/examples/runall
+++ gnucap-0.34/examples/runall
@@ -1,16 +1,16 @@
-#
-$1 -b eq2-145.ckt
-$1 -b eq2-289.ckt
-$1 -b eq2-577.ckt
-$1 -b eq3-1153.ckt
-$1 -b eq4-2305.ckt
-$1 -b eqboost.ckt
-$1 -b eqflat.ckt 
-$1 -b eqmodify.ckt
-$1 -b killzap.ckt
-$1 -b nmos100.ckt
-$1 -b nmos18.ckt 
-$1 -b nmos30.ckt 
-$1 -b nmp100.ckt 
-$1 -b opamp-ol.ckt
-$1 -b opamp-vf.ckt
+#!/bin/sh
+gnucap -b eq2-145.ckt
+gnucap -b eq2-289.ckt
+gnucap -b eq2-577.ckt
+gnucap -b eq3-1153.ckt
+gnucap -b eq4-2305.ckt
+gnucap -b eqboost.ckt
+gnucap -b eqflat.ckt 
+gnucap -b eqmodify.ckt
+gnucap -b killzap.ckt
+gnucap -b nmos100.ckt
+gnucap -b nmos18.ckt 
+gnucap -b nmos30.ckt 
+gnucap -b nmp100.ckt 
+gnucap -b opamp-ol.ckt
+gnucap -b opamp-vf.ckt


--- NEW FILE gnucap.spec ---
Name:           gnucap
Version:        0.34
Release:        2%{?dist}
Summary:        The Gnu Circuit Analysis Package
Group:          Applications/Engineering
License:        GPL
URL:            http://www.geda.seul.org/tools/gnucap
Source0:        http://www.geda.seul.org/tools/gnucap/archive/%{name}-%{version}.tar.gz
Patch0:         gnucap-0.34-debian.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  readline-devel

%description
The primary component is a general purpose circuit simulator. It performs
nonlinear dc and transient analyses, fourier analysis, and ac analysis. Spice
compatible models for the MOSFET (level 1-7), BJT, and diode are included in
this release. Gnucap is not based on Spice, but some of the models have been
derived from the Berkeley models. Unlike Spice, the engine is designed to do
true mixed-mode simulation. Most of the code is in place for future support of
event driven analog simulation, and true multi-rate simulation.


%prep
%setup -q
%patch0 -p1 -z .debian
%{__sed} -i 's!/usr/lib!%{_libdir}!g' src/configure 
%{__sed} -i 's!ln -s!ln!g' src/Make1
%{__sed} -i 's!ln -s!ln!g' src/Make.aux
mv doc/acs-tutorial doc/gnucap-tutorial


%build
# Don't use %%configure because this is not an autotools-generated
# configure script and will choke on some of the default configure switches.
./configure --prefix=%{_prefix}
make %{?_smp_mflags} \
  CCFLAGS="$RPM_OPT_FLAGS -DHAS_READLINE -DUNIX -DNDEBUG -I. -I.."


%install
# make install uses hardcoded /usr/bin etc paths, so we must do this DIY
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_mandir}/man1
install -m 755 src/O/gnucap $RPM_BUILD_ROOT%{_bindir}
install -m 755 ibis/O/gnucap-ibis $RPM_BUILD_ROOT%{_bindir}
install -m 755 modelgen/O/gnucap-modelgen $RPM_BUILD_ROOT%{_bindir}
install -m 644 doc/gnucap.1 doc/gnucap-ibis.1 $RPM_BUILD_ROOT%{_mandir}/man1


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc doc/COPYING doc/history doc/relnotes.* doc/gnucap-tutorial doc/whatisit
%doc man/gnucap-man.pdf man/html
%{_bindir}/%{name}*
%{_mandir}/man1/%{name}*.1.gz


%changelog
* Thu Apr 27 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.34-2
- add %%{?_smp_mflags} to the make command (bz 189699)

* Sun Apr 23 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.34-1
- Initial spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnucap/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2006 19:28:44 -0000	1.1
+++ .cvsignore	27 Apr 2006 19:29:32 -0000	1.2
@@ -0,0 +1 @@
+gnucap-0.34.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnucap/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2006 19:28:44 -0000	1.1
+++ sources	27 Apr 2006 19:29:32 -0000	1.2
@@ -0,0 +1 @@
+0d346f02a38c544fda6f8d7ec4f8b45e  gnucap-0.34.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 19:29:32 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 27 Apr 2006 12:29:32 -0700
Subject: rpms/gnucap import.log,1.1,1.2
Message-ID: <200604271929.k3RJTYab004673@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gnucap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4631

Modified Files:
	import.log 
Log Message:
auto-import gnucap-0.34-2 on branch devel from gnucap-0.34-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnucap/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	27 Apr 2006 19:28:44 -0000	1.1
+++ import.log	27 Apr 2006 19:29:32 -0000	1.2
@@ -0,0 +1 @@
+gnucap-0_34-2:HEAD:gnucap-0.34-2.src.rpm:1146166172



From fedora-extras-commits at redhat.com  Thu Apr 27 19:52:38 2006
From: fedora-extras-commits at redhat.com (Mike Bonnet (mikeb))
Date: Thu, 27 Apr 2006 12:52:38 -0700
Subject: krbVmodule COPYING, NONE, 1.1 AUTHORS, 1.1, 1.2 configure.in, 1.17,
	1.18 python-krbV.spec, 1.2, 1.3
Message-ID: <200604271952.k3RJqcp8008988@cvs-int.fedora.redhat.com>

Author: mikeb

Update of /cvs/devel/krbVmodule
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8958

Modified Files:
	AUTHORS configure.in python-krbV.spec 
Added Files:
	COPYING 
Log Message:
various cleanups before submitting to Extras


--- NEW FILE COPYING ---
		  GNU LESSER GENERAL PUBLIC LICENSE
		       Version 2.1, February 1999

 Copyright (C) 1991, 1999 Free Software Foundation, Inc.
 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

[This is the first released version of the Lesser GPL.  It also counts
 as the successor of the GNU Library Public License, version 2, hence
 the version number 2.1.]

			    Preamble

  The licenses for most software are designed to take away your
freedom to share and change it.  By contrast, the GNU General Public
Licenses are intended to guarantee your freedom to share and change
free software--to make sure the software is free for all its users.

  This license, the Lesser General Public License, applies to some
specially designated software packages--typically libraries--of the
Free Software Foundation and other authors who decide to use it.  You
can use it too, but we suggest you first think carefully about whether
this license or the ordinary General Public License is the better
strategy to use in any particular case, based on the explanations below.

  When we speak of free software, we are referring to freedom of use,
not price.  Our General Public Licenses are designed to make sure that
you have the freedom to distribute copies of free software (and charge
for this service if you wish); that you receive source code or can get
it if you want it; that you can change the software and use pieces of
it in new free programs; and that you are informed that you can do
these things.

  To protect your rights, we need to make restrictions that forbid
distributors to deny you these rights or to ask you to surrender these
rights.  These restrictions translate to certain responsibilities for
you if you distribute copies of the library or if you modify it.

  For example, if you distribute copies of the library, whether gratis
or for a fee, you must give the recipients all the rights that we gave
you.  You must make sure that they, too, receive or can get the source
code.  If you link other code with the library, you must provide
complete object files to the recipients, so that they can relink them
with the library after making changes to the library and recompiling
it.  And you must show them these terms so they know their rights.

  We protect your rights with a two-step method: (1) we copyright the
library, and (2) we offer you this license, which gives you legal
permission to copy, distribute and/or modify the library.

  To protect each distributor, we want to make it very clear that
there is no warranty for the free library.  Also, if the library is
modified by someone else and passed on, the recipients should know
that what they have is not the original version, so that the original
author's reputation will not be affected by problems that might be
introduced by others.

  Finally, software patents pose a constant threat to the existence of
any free program.  We wish to make sure that a company cannot
effectively restrict the users of a free program by obtaining a
restrictive license from a patent holder.  Therefore, we insist that
any patent license obtained for a version of the library must be
consistent with the full freedom of use specified in this license.

  Most GNU software, including some libraries, is covered by the
ordinary GNU General Public License.  This license, the GNU Lesser
General Public License, applies to certain designated libraries, and
is quite different from the ordinary General Public License.  We use
this license for certain libraries in order to permit linking those
libraries into non-free programs.

  When a program is linked with a library, whether statically or using
a shared library, the combination of the two is legally speaking a
combined work, a derivative of the original library.  The ordinary
General Public License therefore permits such linking only if the
entire combination fits its criteria of freedom.  The Lesser General
Public License permits more lax criteria for linking other code with
the library.

  We call this license the "Lesser" General Public License because it
does Less to protect the user's freedom than the ordinary General
Public License.  It also provides other free software developers Less
of an advantage over competing non-free programs.  These disadvantages
are the reason we use the ordinary General Public License for many
libraries.  However, the Lesser license provides advantages in certain
special circumstances.

  For example, on rare occasions, there may be a special need to
encourage the widest possible use of a certain library, so that it becomes
a de-facto standard.  To achieve this, non-free programs must be
allowed to use the library.  A more frequent case is that a free
library does the same job as widely used non-free libraries.  In this
case, there is little to gain by limiting the free library to free
software only, so we use the Lesser General Public License.

  In other cases, permission to use a particular library in non-free
programs enables a greater number of people to use a large body of
free software.  For example, permission to use the GNU C Library in
non-free programs enables many more people to use the whole GNU
operating system, as well as its variant, the GNU/Linux operating
system.

  Although the Lesser General Public License is Less protective of the
users' freedom, it does ensure that the user of a program that is
linked with the Library has the freedom and the wherewithal to run
that program using a modified version of the Library.

  The precise terms and conditions for copying, distribution and
modification follow.  Pay close attention to the difference between a
"work based on the library" and a "work that uses the library".  The
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.

		  GNU LESSER GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License Agreement applies to any software library or other
program which contains a notice placed by the copyright holder or
other authorized party saying it may be distributed under the terms of
this Lesser General Public License (also called "this License").
Each licensee is addressed as "you".

  A "library" means a collection of software functions and/or data
prepared so as to be conveniently linked with application programs
(which use some of those functions and data) to form executables.

  The "Library", below, refers to any such software library or work
which has been distributed under these terms.  A "work based on the
Library" means either the Library or any derivative work under
copyright law: that is to say, a work containing the Library or a
portion of it, either verbatim or with modifications and/or translated
straightforwardly into another language.  (Hereinafter, translation is
included without limitation in the term "modification".)

  "Source code" for a work means the preferred form of the work for
making modifications to it.  For a library, complete source code means
all the source code for all modules it contains, plus any associated
interface definition files, plus the scripts used to control compilation
and installation of the library.

  Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope.  The act of
running a program using the Library is not restricted, and output from
such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for
writing it).  Whether that is true depends on what the Library does
and what the program that uses the Library does.
  
  1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
appropriate copyright notice and disclaimer of warranty; keep intact
all the notices that refer to this License and to the absence of any
warranty; and distribute a copy of this License along with the
Library.

  You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a
fee.

  2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:

    a) The modified work must itself be a software library.

    b) You must cause the files modified to carry prominent notices
    stating that you changed the files and the date of any change.

    c) You must cause the whole of the work to be licensed at no
    charge to all third parties under the terms of this License.

    d) If a facility in the modified Library refers to a function or a
    table of data to be supplied by an application program that uses
    the facility, other than as an argument passed when the facility
    is invoked, then you must make a good faith effort to ensure that,
    in the event an application does not supply such function or
    table, the facility still operates, and performs whatever part of
    its purpose remains meaningful.

    (For example, a function in a library to compute square roots has
    a purpose that is entirely well-defined independent of the
    application.  Therefore, Subsection 2d requires that any
    application-supplied function or table used by this function must
    be optional: if the application does not supply it, the square
    root function must still compute square roots.)

These requirements apply to the modified work as a whole.  If
identifiable sections of that work are not derived from the Library,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works.  But when you
distribute the same sections as part of a whole which is a work based
on the Library, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote
it.

Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Library.

In addition, mere aggregation of another work not based on the Library
with the Library (or with a work based on the Library) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.

  3. You may opt to apply the terms of the ordinary GNU General Public
License instead of this License to a given copy of the Library.  To do
this, you must alter all the notices that refer to this License, so
that they refer to the ordinary GNU General Public License, version 2,
instead of to this License.  (If a newer version than version 2 of the
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.)  Do not make any other change in
these notices.

  Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.

  This option is useful when you wish to copy part of the code of
the Library into a program that is not a library.

  4. You may copy and distribute the Library (or a portion or
derivative of it, under Section 2) in object code or executable form
under the terms of Sections 1 and 2 above provided that you accompany
it with the complete corresponding machine-readable source code, which
must be distributed under the terms of Sections 1 and 2 above on a
medium customarily used for software interchange.

  If distribution of object code is made by offering access to copy
from a designated place, then offering equivalent access to copy the
source code from the same place satisfies the requirement to
distribute the source code, even though third parties are not
compelled to copy the source along with the object code.

  5. A program that contains no derivative of any portion of the
Library, but is designed to work with the Library by being compiled or
linked with it, is called a "work that uses the Library".  Such a
work, in isolation, is not a derivative work of the Library, and
therefore falls outside the scope of this License.

  However, linking a "work that uses the Library" with the Library
creates an executable that is a derivative of the Library (because it
contains portions of the Library), rather than a "work that uses the
library".  The executable is therefore covered by this License.
Section 6 states terms for distribution of such executables.

  When a "work that uses the Library" uses material from a header file
that is part of the Library, the object code for the work may be a
derivative work of the Library even though the source code is not.
Whether this is true is especially significant if the work can be
linked without the Library, or if the work is itself a library.  The
threshold for this to be true is not precisely defined by law.

  If such an object file uses only numerical parameters, data
structure layouts and accessors, and small macros and small inline
functions (ten lines or less in length), then the use of the object
file is unrestricted, regardless of whether it is legally a derivative
work.  (Executables containing this object code plus portions of the
Library will still fall under Section 6.)

  Otherwise, if the work is a derivative of the Library, you may
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.

  6. As an exception to the Sections above, you may also combine or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
under terms of your choice, provided that the terms permit
modification of the work for the customer's own use and reverse
engineering for debugging such modifications.

  You must give prominent notice with each copy of the work that the
Library is used in it and that the Library and its use are covered by
this License.  You must supply a copy of this License.  If the work
during execution displays copyright notices, you must include the
copyright notice for the Library among them, as well as a reference
directing the user to the copy of this License.  Also, you must do one
of these things:

    a) Accompany the work with the complete corresponding
    machine-readable source code for the Library including whatever
    changes were used in the work (which must be distributed under
    Sections 1 and 2 above); and, if the work is an executable linked
    with the Library, with the complete machine-readable "work that
    uses the Library", as object code and/or source code, so that the
    user can modify the Library and then relink to produce a modified
    executable containing the modified Library.  (It is understood
    that the user who changes the contents of definitions files in the
    Library will not necessarily be able to recompile the application
    to use the modified definitions.)

    b) Use a suitable shared library mechanism for linking with the
    Library.  A suitable mechanism is one that (1) uses at run time a
    copy of the library already present on the user's computer system,
    rather than copying library functions into the executable, and (2)
    will operate properly with a modified version of the library, if
    the user installs one, as long as the modified version is
    interface-compatible with the version that the work was made with.

    c) Accompany the work with a written offer, valid for at
    least three years, to give the same user the materials
    specified in Subsection 6a, above, for a charge no more
    than the cost of performing this distribution.

    d) If distribution of the work is made by offering access to copy
    from a designated place, offer equivalent access to copy the above
    specified materials from the same place.

    e) Verify that the user has already received a copy of these
    materials or that you have already sent this user a copy.

  For an executable, the required form of the "work that uses the
Library" must include any data and utility programs needed for
reproducing the executable from it.  However, as a special exception,
the materials to be distributed need not include anything that is
normally distributed (in either source or binary form) with the major
components (compiler, kernel, and so on) of the operating system on
which the executable runs, unless that component itself accompanies
the executable.

  It may happen that this requirement contradicts the license
restrictions of other proprietary libraries that do not normally
accompany the operating system.  Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.

  7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
library, provided that the separate distribution of the work based on
the Library and of the other library facilities is otherwise
permitted, and provided that you do these two things:

    a) Accompany the combined library with a copy of the same work
    based on the Library, uncombined with any other library
    facilities.  This must be distributed under the terms of the
    Sections above.

    b) Give prominent notice with the combined library of the fact
    that part of it is a work based on the Library, and explaining
    where to find the accompanying uncombined form of the same work.

  8. You may not copy, modify, sublicense, link with, or distribute
the Library except as expressly provided under this License.  Any
attempt otherwise to copy, modify, sublicense, link with, or
distribute the Library is void, and will automatically terminate your
rights under this License.  However, parties who have received copies,
or rights, from you under this License will not have their licenses
terminated so long as such parties remain in full compliance.

  9. You are not required to accept this License, since you have not
signed it.  However, nothing else grants you permission to modify or
distribute the Library or its derivative works.  These actions are
prohibited by law if you do not accept this License.  Therefore, by
modifying or distributing the Library (or any work based on the
Library), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Library or works based on it.

  10. Each time you redistribute the Library (or any work based on the
Library), the recipient automatically receives a license from the
original licensor to copy, distribute, link with or modify the Library
subject to these terms and conditions.  You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties with
this License.

  11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License.  If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Library at all.  For example, if a patent
license would not permit royalty-free redistribution of the Library by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Library.

If any portion of this section is held invalid or unenforceable under any
particular circumstance, the balance of the section is intended to apply,
and the section as a whole is intended to apply in other circumstances.

It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system which is
implemented by public license practices.  Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.

This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.

  12. If the distribution and/or use of the Library is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Library under this License may add
an explicit geographical distribution limitation excluding those countries,
so that distribution is permitted only in or among countries not thus
excluded.  In such case, this License incorporates the limitation as if
written in the body of this License.

  13. The Free Software Foundation may publish revised and/or new
versions of the Lesser General Public License from time to time.
Such new versions will be similar in spirit to the present version,
but may differ in detail to address new problems or concerns.

Each version is given a distinguishing version number.  If the Library
specifies a version number of this License which applies to it and
"any later version", you have the option of following the terms and
conditions either of that version or of any later version published by
the Free Software Foundation.  If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.

  14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission.  For software which is
copyrighted by the Free Software Foundation, write to the Free
Software Foundation; we sometimes make exceptions for this.  Our
decision will be guided by the two goals of preserving the free status
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.

			    NO WARRANTY

  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.

  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.

		     END OF TERMS AND CONDITIONS

           How to Apply These Terms to Your New Libraries

  If you develop a new library, and you want it to be of the greatest
possible use to the public, we recommend making it free software that
everyone can redistribute and change.  You can do so by permitting
redistribution under these terms (or, alternatively, under the terms of the
ordinary General Public License).

  To apply these terms, attach the following notices to the library.  It is
safest to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least the
"copyright" line and a pointer to where the full notice is found.

    <one line to give the library's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
    version 2.1 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.

    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

Also add information on how to contact you by electronic and paper mail.

You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the library, if
necessary.  Here is a sample; alter the names:

  Yoyodyne, Inc., hereby disclaims all copyright interest in the
  library `Frob' (a library for tweaking knobs) written by James Random Hacker.

  <signature of Ty Coon>, 1 April 1990
  Ty Coon, President of Vice

That's all there is to it!




Index: AUTHORS
===================================================================
RCS file: /cvs/devel/krbVmodule/AUTHORS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AUTHORS	24 Aug 2001 18:31:04 -0000	1.1
+++ AUTHORS	27 Apr 2006 19:52:36 -0000	1.2
@@ -1 +1,2 @@
 Elliot Lee <sopwith at redhat.com>
+Mike Bonnet <mikeb at redhat.com>


Index: configure.in
===================================================================
RCS file: /cvs/devel/krbVmodule/configure.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- configure.in	24 Apr 2006 15:12:38 -0000	1.17
+++ configure.in	27 Apr 2006 19:52:36 -0000	1.18
@@ -1,6 +1,6 @@
 AC_INIT
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(python-krbV, 1.0.12)
+AM_INIT_AUTOMAKE(python-krbV, $(/bin/awk '/^Version:/ { print $2 }' python-krbV.spec))
 
 AC_PREFIX_DEFAULT(/usr)
 


Index: python-krbV.spec
===================================================================
RCS file: /cvs/devel/krbVmodule/python-krbV.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-krbV.spec	24 Apr 2006 15:12:38 -0000	1.2
+++ python-krbV.spec	27 Apr 2006 19:52:36 -0000	1.3
@@ -2,13 +2,14 @@
 
 Name: python-krbV
 Version: 1.0.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Python extension module for Kerberos 5
 
 Group: Development/Languages
 License: LGPL
 
-Source: python-krbV-%{version}.tar.gz
+URL: http://people.redhat.com/mikeb/python-krbV
+Source0: http://people.redhat.com/mikeb/python-krbV/python-krbV-%{version}.tar.gz
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -18,7 +19,6 @@
 BuildRequires: /bin/awk
 
 Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
-Requires: krb5-libs >= 1.2.2
 
 %description
 python-krbV allows python programs to use Kerberos 5 authentication/security.
@@ -43,11 +43,18 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README krbV-code-snippets.py
+%doc README COPYING krbV-code-snippets.py
 %{python_sitelib}/krbVmodule.so
 
 %changelog
-* Mon Apr 24 2006 Michael Bonnet <mikeb at redhat.com> - 1.0.12
+* Thu Apr 27 2006 Mike Bonnet <mikeb at redhat.com> - 1.0.12-2
+- configure.in: parse version number out of spec file
+- add URL tag
+- add LGPL text
+- remove Requires: krb5-libs, let rpm pick up library dependencies
+- bump revision
+
+* Mon Apr 24 2006 Mike Bonnet <mikeb at redhat.com> - 1.0.12-1
 - bump version number due to API changes
 
 * Fri Mar 24 2006 Mike Bonnet <mikeb at redhat.com>



From fedora-extras-commits at redhat.com  Thu Apr 27 21:28:35 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 14:28:35 -0700
Subject: rpms/perl-Crypt-Blowfish/FC-4 perl-Crypt-Blowfish.spec,1.3,1.4
Message-ID: <200604272128.k3RLSbqL030655@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/perl-Crypt-Blowfish/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30598/FC-4

Modified Files:
	perl-Crypt-Blowfish.spec 
Log Message:
* Thu Apr 27 2006 Andreas Thienemann <andreas at bawue.net> - 2.10-1
- Updated to 2.10



Index: perl-Crypt-Blowfish.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-Blowfish/FC-4/perl-Crypt-Blowfish.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Crypt-Blowfish.spec	14 Jul 2005 19:31:30 -0000	1.3
+++ perl-Crypt-Blowfish.spec	27 Apr 2006 21:28:35 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: XS Blowfish implementation for Perl
 Name: perl-Crypt-Blowfish
-Version: 2.09
-Release: 2%{?dist}
+Version: 2.10
+Release: 1%{?dist}
 License: Distributable
 Group: Development/Libraries
 URL: http://search.cpan.org/dist/Crypt-Blowfish/
@@ -46,10 +46,12 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Apr 27 2006 Andreas Thienemann <andreas at bawue.net> - 2.10-1
+- Updated to 2.10
+
 * Thu Jul 14 2005 Andreas Thienemann <andreas at bawue.net> - 2.09-2
 - Fixed find line to not shellexpand.
 
-
 * Thu Jul 14 2005 Andreas Thienemann <andreas at bawue.net> - 2.09-1
 - Initial package
 



From fedora-extras-commits at redhat.com  Thu Apr 27 21:28:36 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 14:28:36 -0700
Subject: rpms/perl-Crypt-Blowfish/FC-5 perl-Crypt-Blowfish.spec,1.3,1.4
Message-ID: <200604272128.k3RLScAU030660@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/perl-Crypt-Blowfish/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30598/FC-5

Modified Files:
	perl-Crypt-Blowfish.spec 
Log Message:
* Thu Apr 27 2006 Andreas Thienemann <andreas at bawue.net> - 2.10-1
- Updated to 2.10



Index: perl-Crypt-Blowfish.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-Blowfish/FC-5/perl-Crypt-Blowfish.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Crypt-Blowfish.spec	14 Jul 2005 19:31:30 -0000	1.3
+++ perl-Crypt-Blowfish.spec	27 Apr 2006 21:28:36 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: XS Blowfish implementation for Perl
 Name: perl-Crypt-Blowfish
-Version: 2.09
-Release: 2%{?dist}
+Version: 2.10
+Release: 1%{?dist}
 License: Distributable
 Group: Development/Libraries
 URL: http://search.cpan.org/dist/Crypt-Blowfish/
@@ -46,10 +46,12 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Apr 27 2006 Andreas Thienemann <andreas at bawue.net> - 2.10-1
+- Updated to 2.10
+
 * Thu Jul 14 2005 Andreas Thienemann <andreas at bawue.net> - 2.09-2
 - Fixed find line to not shellexpand.
 
-
 * Thu Jul 14 2005 Andreas Thienemann <andreas at bawue.net> - 2.09-1
 - Initial package
 



From fedora-extras-commits at redhat.com  Thu Apr 27 21:28:37 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 14:28:37 -0700
Subject: rpms/perl-Crypt-Blowfish/devel .cvsignore, 1.2,
	1.3 perl-Crypt-Blowfish.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200604272128.k3RLSdIb030669@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/perl-Crypt-Blowfish/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30598/devel

Modified Files:
	.cvsignore perl-Crypt-Blowfish.spec sources 
Log Message:
* Thu Apr 27 2006 Andreas Thienemann <andreas at bawue.net> - 2.10-1
- Updated to 2.10



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-Blowfish/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Jul 2005 18:49:02 -0000	1.2
+++ .cvsignore	27 Apr 2006 21:28:37 -0000	1.3
@@ -1 +1 @@
-Crypt-Blowfish-2.09.tar.gz
+Crypt-Blowfish-2.10.tar.gz


Index: perl-Crypt-Blowfish.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-Blowfish/devel/perl-Crypt-Blowfish.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Crypt-Blowfish.spec	14 Jul 2005 19:31:30 -0000	1.3
+++ perl-Crypt-Blowfish.spec	27 Apr 2006 21:28:37 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: XS Blowfish implementation for Perl
 Name: perl-Crypt-Blowfish
-Version: 2.09
-Release: 2%{?dist}
+Version: 2.10
+Release: 1%{?dist}
 License: Distributable
 Group: Development/Libraries
 URL: http://search.cpan.org/dist/Crypt-Blowfish/
@@ -46,10 +46,12 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Apr 27 2006 Andreas Thienemann <andreas at bawue.net> - 2.10-1
+- Updated to 2.10
+
 * Thu Jul 14 2005 Andreas Thienemann <andreas at bawue.net> - 2.09-2
 - Fixed find line to not shellexpand.
 
-
 * Thu Jul 14 2005 Andreas Thienemann <andreas at bawue.net> - 2.09-1
 - Initial package
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-Blowfish/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Jul 2005 18:49:02 -0000	1.2
+++ sources	27 Apr 2006 21:28:37 -0000	1.3
@@ -1 +1 @@
-bbd037e1eb20778f3d636dff345ed02f  Crypt-Blowfish-2.09.tar.gz
+15b53308df3b29a62a9f2f718aace19a  Crypt-Blowfish-2.10.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 21:29:04 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 14:29:04 -0700
Subject: rpms/perl-Crypt-Blowfish/FC-4 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200604272129.k3RLT6RK030798@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/perl-Crypt-Blowfish/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30754/FC-4

Modified Files:
	.cvsignore sources 
Log Message:
* Thu Apr 27 2006 Andreas Thienemann <andreas at bawue.net> - 2.10-1
- Updated to 2.10



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-Blowfish/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Jul 2005 18:49:02 -0000	1.2
+++ .cvsignore	27 Apr 2006 21:29:04 -0000	1.3
@@ -1 +1 @@
-Crypt-Blowfish-2.09.tar.gz
+Crypt-Blowfish-2.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-Blowfish/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Jul 2005 18:49:02 -0000	1.2
+++ sources	27 Apr 2006 21:29:04 -0000	1.3
@@ -1 +1 @@
-bbd037e1eb20778f3d636dff345ed02f  Crypt-Blowfish-2.09.tar.gz
+15b53308df3b29a62a9f2f718aace19a  Crypt-Blowfish-2.10.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 21:29:05 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 14:29:05 -0700
Subject: rpms/perl-Crypt-Blowfish/FC-5 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200604272129.k3RLT72l030804@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/perl-Crypt-Blowfish/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30754/FC-5

Modified Files:
	.cvsignore sources 
Log Message:
* Thu Apr 27 2006 Andreas Thienemann <andreas at bawue.net> - 2.10-1
- Updated to 2.10



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-Blowfish/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Jul 2005 18:49:02 -0000	1.2
+++ .cvsignore	27 Apr 2006 21:29:05 -0000	1.3
@@ -1 +1 @@
-Crypt-Blowfish-2.09.tar.gz
+Crypt-Blowfish-2.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-Blowfish/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Jul 2005 18:49:02 -0000	1.2
+++ sources	27 Apr 2006 21:29:05 -0000	1.3
@@ -1 +1 @@
-bbd037e1eb20778f3d636dff345ed02f  Crypt-Blowfish-2.09.tar.gz
+15b53308df3b29a62a9f2f718aace19a  Crypt-Blowfish-2.10.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 21:51:15 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 27 Apr 2006 14:51:15 -0700
Subject: owners owners.list,1.907,1.908
Message-ID: <200604272151.k3RLpH51002550@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2509

Modified Files:
	owners.list 
Log Message:
+bcm43xx-fwcutter (dwmw2, #186264)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.907
retrieving revision 1.908
diff -u -r1.907 -r1.908
--- owners.list	27 Apr 2006 19:05:36 -0000	1.907
+++ owners.list	27 Apr 2006 21:51:15 -0000	1.908
@@ -75,6 +75,7 @@
 Fedora Extras|bazaar|A distributed revision control system|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|bbkeys|Completely configurable key-combo grabber for blackbox|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|bchunk|CD image format converter from .bin/.cue to .iso/.cdr|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
+Fedora Extras|bcm43xx-fwcutter|Firmware extraction tool for Broadcom wireless driver|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|BibTool|A Tool for manipulating BibTeX data bases|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|bidiv|Display logical Hebrew on unidirectional terminals|danken at cs.technion.ac.il|extras-qa at fedoraproject.org|
 Fedora Extras|bigloo|Bigloo is compiler for the Scheme programming language|gemi at bluewin.ch|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Apr 27 22:48:28 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Thu, 27 Apr 2006 15:48:28 -0700
Subject: owners owners.list,1.908,1.909
Message-ID: <200604272248.k3RMmUMv010519@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10470

Modified Files:
	owners.list 
Log Message:
taking ownership of gurlchecker



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.908
retrieving revision 1.909
diff -u -r1.908 -r1.909
--- owners.list	27 Apr 2006 21:51:15 -0000	1.908
+++ owners.list	27 Apr 2006 22:48:28 -0000	1.909
@@ -445,7 +445,7 @@
 Fedora Extras|gtorrentviewer|A GTK2-based viewer and editor for BitTorrent meta files|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|gtranslator|A gettext po file editor for GNOME|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|gtweakui|Extra configuration dialogs for GNOME|matthias at rpmforge.net|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|gurlchecker|A GNOME link validity checker|michael at knox.net.nz|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|
 Fedora Extras|gweled|Swapping gem game|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|gwenview|Simple image viewer for KDE|gauret at free.fr|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Apr 27 22:48:49 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Thu, 27 Apr 2006 15:48:49 -0700
Subject: rpms/gurlchecker/FC-4 gurlchecker.spec,1.7,1.8
Message-ID: <200604272248.k3RMmpgu010614@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gurlchecker/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10547/FC-4

Modified Files:
	gurlchecker.spec 
Log Message:
updated version



Index: gurlchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/FC-4/gurlchecker.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gurlchecker.spec	25 May 2005 21:39:31 -0000	1.7
+++ gurlchecker.spec	27 Apr 2006 22:48:49 -0000	1.8
@@ -1,65 +1,57 @@
 Name:           gurlchecker
-Version:        0.6.3
-Release: 5
+Version:        0.8.3
+Release:	1%{?dist}
 
-Summary:        A GNOME link validity checker.
+Summary:        A Gnome link validity checker
 
 Group:          Applications/Internet
 License:        GPL
-URL:            http://www.nongnu.org/gurlchecker/
-Source0:        http://savannah.nongnu.org/download/gurlchecker/stable/0.6/gurlchecker-0.6.3.tar.gz
-Source1:        gurlchecker.desktop
-Patch0: gurlchecker-gcc4.patch
+URL:            http://labs.libre-entreprise.org/projects/gurlchecker/
+Source0:        http://labs.libre-entreprise.org/frs/download.php/423/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	desktop-file-utils
-BuildRequires:  gettext
+Requires:	gnet2
+
+BuildRequires:	desktop-file-utils, gnet2-devel, gettext
 BuildRequires:  libgnomeui-devel >= 2.0
 BuildRequires:  libglade2-devel >= 2.0
 
 %description
-gURLChecker is a GNOME tool that can check links on a single web page
+gURLChecker is a Gnome tool that can check links on a single web page
 or on a whole web site in order to determine validity of each page.
 
-
 %prep
 %setup -q
-%patch0 -p1 -b .gcc4
-
 
 %build
-%configure
+%configure --disable-gtk-doc
+
 make %{?_smp_mflags}
 
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-make install DESTDIR=${RPM_BUILD_ROOT}
-%find_lang %{name}
+rm -rf %{builroot}
 
-install -p -D -m0644 ui/gURLChecker_icon.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/gurlchecker.png
-desktop-file-install --vendor fedora               \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications      \
-  --add-category X-Fedora                              \
-  --add-category Application                           \
-  --add-category Network                               \
-  %{SOURCE1}
+make install DESTDIR=%{buildroot}
 
+%find_lang %{name}
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
-
+rm -rf %{buildroot}
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO
 %{_bindir}/*
 %{_datadir}/gurlchecker/
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/*
-
+%{_mandir}/man?/*
 
 %changelog
+* Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-1
+- version update
+
 * Wed May 25 2005 Jeremy Katz <katzj at redhat.com> - 0.6.3-5
 - fix build with gcc4 (mschwendt, #156217)
 



From fedora-extras-commits at redhat.com  Thu Apr 27 22:48:50 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Thu, 27 Apr 2006 15:48:50 -0700
Subject: rpms/gurlchecker/devel gurlchecker.spec,1.8,1.9
Message-ID: <200604272248.k3RMmqSW010623@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gurlchecker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10547/devel

Modified Files:
	gurlchecker.spec 
Log Message:
updated version



Index: gurlchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/devel/gurlchecker.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gurlchecker.spec	2 Mar 2006 21:30:20 -0000	1.8
+++ gurlchecker.spec	27 Apr 2006 22:48:50 -0000	1.9
@@ -1,72 +1,57 @@
 Name:           gurlchecker
-Version:        0.6.3
-Release: 5
+Version:        0.8.3
+Release:	1%{?dist}
 
-Summary:        A GNOME link validity checker.
+Summary:        A Gnome link validity checker
 
 Group:          Applications/Internet
 License:        GPL
-URL:            http://www.nongnu.org/gurlchecker/
-Source0:        http://savannah.nongnu.org/download/gurlchecker/stable/0.6/gurlchecker-0.6.3.tar.gz
-Source1:        gurlchecker.desktop
-Patch0: gurlchecker-gcc4.patch
+URL:            http://labs.libre-entreprise.org/projects/gurlchecker/
+Source0:        http://labs.libre-entreprise.org/frs/download.php/423/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	desktop-file-utils
-BuildRequires:  gettext
+Requires:	gnet2
+
+BuildRequires:	desktop-file-utils, gnet2-devel, gettext
 BuildRequires:  libgnomeui-devel >= 2.0
 BuildRequires:  libglade2-devel >= 2.0
 
 %description
-gURLChecker is a GNOME tool that can check links on a single web page
+gURLChecker is a Gnome tool that can check links on a single web page
 or on a whole web site in order to determine validity of each page.
 
-
 %prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
-
 %setup -q
-%patch0 -p1 -b .gcc4
-
 
 %build
-%configure
+%configure --disable-gtk-doc
+
 make %{?_smp_mflags}
 
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-make install DESTDIR=${RPM_BUILD_ROOT}
-%find_lang %{name}
+rm -rf %{builroot}
 
-install -p -D -m0644 ui/gURLChecker_icon.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/gurlchecker.png
-desktop-file-install --vendor fedora               \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications      \
-  --add-category X-Fedora                              \
-  --add-category Application                           \
-  --add-category Network                               \
-  %{SOURCE1}
+make install DESTDIR=%{buildroot}
 
+%find_lang %{name}
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
-
+rm -rf %{buildroot}
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO
 %{_bindir}/*
 %{_datadir}/gurlchecker/
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/*
-
+%{_mandir}/man?/*
 
 %changelog
+* Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-1
+- version update
+
 * Wed May 25 2005 Jeremy Katz <katzj at redhat.com> - 0.6.3-5
 - fix build with gcc4 (mschwendt, #156217)
 



From fedora-extras-commits at redhat.com  Thu Apr 27 22:48:50 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Thu, 27 Apr 2006 15:48:50 -0700
Subject: rpms/gurlchecker/FC-5 gurlchecker.spec,1.8,1.9
Message-ID: <200604272248.k3RMmqsJ010618@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gurlchecker/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10547/FC-5

Modified Files:
	gurlchecker.spec 
Log Message:
updated version



Index: gurlchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/FC-5/gurlchecker.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gurlchecker.spec	2 Mar 2006 21:30:20 -0000	1.8
+++ gurlchecker.spec	27 Apr 2006 22:48:49 -0000	1.9
@@ -1,72 +1,57 @@
 Name:           gurlchecker
-Version:        0.6.3
-Release: 5
+Version:        0.8.3
+Release:	1%{?dist}
 
-Summary:        A GNOME link validity checker.
+Summary:        A Gnome link validity checker
 
 Group:          Applications/Internet
 License:        GPL
-URL:            http://www.nongnu.org/gurlchecker/
-Source0:        http://savannah.nongnu.org/download/gurlchecker/stable/0.6/gurlchecker-0.6.3.tar.gz
-Source1:        gurlchecker.desktop
-Patch0: gurlchecker-gcc4.patch
+URL:            http://labs.libre-entreprise.org/projects/gurlchecker/
+Source0:        http://labs.libre-entreprise.org/frs/download.php/423/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	desktop-file-utils
-BuildRequires:  gettext
+Requires:	gnet2
+
+BuildRequires:	desktop-file-utils, gnet2-devel, gettext
 BuildRequires:  libgnomeui-devel >= 2.0
 BuildRequires:  libglade2-devel >= 2.0
 
 %description
-gURLChecker is a GNOME tool that can check links on a single web page
+gURLChecker is a Gnome tool that can check links on a single web page
 or on a whole web site in order to determine validity of each page.
 
-
 %prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
-
 %setup -q
-%patch0 -p1 -b .gcc4
-
 
 %build
-%configure
+%configure --disable-gtk-doc
+
 make %{?_smp_mflags}
 
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-make install DESTDIR=${RPM_BUILD_ROOT}
-%find_lang %{name}
+rm -rf %{builroot}
 
-install -p -D -m0644 ui/gURLChecker_icon.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/gurlchecker.png
-desktop-file-install --vendor fedora               \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications      \
-  --add-category X-Fedora                              \
-  --add-category Application                           \
-  --add-category Network                               \
-  %{SOURCE1}
+make install DESTDIR=%{buildroot}
 
+%find_lang %{name}
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
-
+rm -rf %{buildroot}
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO
 %{_bindir}/*
 %{_datadir}/gurlchecker/
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/*
-
+%{_mandir}/man?/*
 
 %changelog
+* Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-1
+- version update
+
 * Wed May 25 2005 Jeremy Katz <katzj at redhat.com> - 0.6.3-5
 - fix build with gcc4 (mschwendt, #156217)
 



From fedora-extras-commits at redhat.com  Thu Apr 27 23:00:11 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Thu, 27 Apr 2006 16:00:11 -0700
Subject: rpms/gurlchecker/FC-4 .cvsignore, 1.2, 1.3 gurlchecker.spec, 1.8,
	1.9 sources, 1.2, 1.3
Message-ID: <200604272300.k3RN0DwY012151@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gurlchecker/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12029/FC-4

Modified Files:
	.cvsignore gurlchecker.spec sources 
Log Message:
bumped the release cuz I forgot to check in all the files before I tag the branchs



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:31:55 -0000	1.2
+++ .cvsignore	27 Apr 2006 23:00:11 -0000	1.3
@@ -1 +1 @@
-gurlchecker-0.6.3.tar.gz
+gurlchecker-0.8.3.tar.gz


Index: gurlchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/FC-4/gurlchecker.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gurlchecker.spec	27 Apr 2006 22:48:49 -0000	1.8
+++ gurlchecker.spec	27 Apr 2006 23:00:11 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           gurlchecker
 Version:        0.8.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Summary:        A Gnome link validity checker
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:31:55 -0000	1.2
+++ sources	27 Apr 2006 23:00:11 -0000	1.3
@@ -1 +1 @@
-b2db7effe6a429f8b4435d24c88d5b3b  gurlchecker-0.6.3.tar.gz
+2c4d1c74d8044ae41db980ba7ff27e98  gurlchecker-0.8.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 23:00:11 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Thu, 27 Apr 2006 16:00:11 -0700
Subject: rpms/gurlchecker/FC-5 .cvsignore, 1.2, 1.3 gurlchecker.spec, 1.9,
	1.10 sources, 1.2, 1.3
Message-ID: <200604272300.k3RN0DHl012156@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gurlchecker/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12029/FC-5

Modified Files:
	.cvsignore gurlchecker.spec sources 
Log Message:
bumped the release cuz I forgot to check in all the files before I tag the branchs



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:31:55 -0000	1.2
+++ .cvsignore	27 Apr 2006 23:00:11 -0000	1.3
@@ -1 +1 @@
-gurlchecker-0.6.3.tar.gz
+gurlchecker-0.8.3.tar.gz


Index: gurlchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/FC-5/gurlchecker.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gurlchecker.spec	27 Apr 2006 22:48:49 -0000	1.9
+++ gurlchecker.spec	27 Apr 2006 23:00:11 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           gurlchecker
 Version:        0.8.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Summary:        A Gnome link validity checker
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:31:55 -0000	1.2
+++ sources	27 Apr 2006 23:00:11 -0000	1.3
@@ -1 +1 @@
-b2db7effe6a429f8b4435d24c88d5b3b  gurlchecker-0.6.3.tar.gz
+2c4d1c74d8044ae41db980ba7ff27e98  gurlchecker-0.8.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 23:00:12 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Thu, 27 Apr 2006 16:00:12 -0700
Subject: rpms/gurlchecker/devel .cvsignore, 1.2, 1.3 gurlchecker.spec, 1.9, 
	1.10 sources, 1.2, 1.3
Message-ID: <200604272300.k3RN0ESm012163@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gurlchecker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12029/devel

Modified Files:
	.cvsignore gurlchecker.spec sources 
Log Message:
bumped the release cuz I forgot to check in all the files before I tag the branchs



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:31:55 -0000	1.2
+++ .cvsignore	27 Apr 2006 23:00:12 -0000	1.3
@@ -1 +1 @@
-gurlchecker-0.6.3.tar.gz
+gurlchecker-0.8.3.tar.gz


Index: gurlchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/devel/gurlchecker.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gurlchecker.spec	27 Apr 2006 22:48:50 -0000	1.9
+++ gurlchecker.spec	27 Apr 2006 23:00:12 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           gurlchecker
 Version:        0.8.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Summary:        A Gnome link validity checker
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:31:55 -0000	1.2
+++ sources	27 Apr 2006 23:00:12 -0000	1.3
@@ -1 +1 @@
-b2db7effe6a429f8b4435d24c88d5b3b  gurlchecker-0.6.3.tar.gz
+2c4d1c74d8044ae41db980ba7ff27e98  gurlchecker-0.8.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 23:23:58 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Thu, 27 Apr 2006 16:23:58 -0700
Subject: rpms/gurlchecker/devel gurlchecker.spec,1.10,1.11
Message-ID: <200604272324.k3RNO0fr016536@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gurlchecker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16453/devel

Modified Files:
	gurlchecker.spec 
Log Message:
missed a build depend. Fixed now



Index: gurlchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/devel/gurlchecker.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gurlchecker.spec	27 Apr 2006 23:00:12 -0000	1.10
+++ gurlchecker.spec	27 Apr 2006 23:23:58 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           gurlchecker
 Version:        0.8.3
-Release:	2%{?dist}
+Release:	1%{?dist}
 
 Summary:        A Gnome link validity checker
 
@@ -10,9 +10,9 @@
 Source0:        http://labs.libre-entreprise.org/frs/download.php/423/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	gnet2
+Requires:	gnet2, gnutls
 
-BuildRequires:	desktop-file-utils, gnet2-devel, gettext
+BuildRequires:	desktop-file-utils, gnet2-devel, gettext, gnutls-devel
 BuildRequires:  libgnomeui-devel >= 2.0
 BuildRequires:  libglade2-devel >= 2.0
 
@@ -49,6 +49,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-2
+- missed some build requires.
+
 * Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-1
 - version update
 



From fedora-extras-commits at redhat.com  Thu Apr 27 23:23:51 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Thu, 27 Apr 2006 16:23:51 -0700
Subject: rpms/gurlchecker/FC-4 gurlchecker.spec,1.9,1.10
Message-ID: <200604272324.k3RNONJ8016572@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gurlchecker/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16453/FC-4

Modified Files:
	gurlchecker.spec 
Log Message:
missed a build depend. Fixed now



Index: gurlchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/FC-4/gurlchecker.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gurlchecker.spec	27 Apr 2006 23:00:11 -0000	1.9
+++ gurlchecker.spec	27 Apr 2006 23:23:51 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           gurlchecker
 Version:        0.8.3
-Release:	2%{?dist}
+Release:	1%{?dist}
 
 Summary:        A Gnome link validity checker
 
@@ -10,9 +10,9 @@
 Source0:        http://labs.libre-entreprise.org/frs/download.php/423/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	gnet2
+Requires:	gnet2, gnutls
 
-BuildRequires:	desktop-file-utils, gnet2-devel, gettext
+BuildRequires:	desktop-file-utils, gnet2-devel, gettext, gnutls-devel
 BuildRequires:  libgnomeui-devel >= 2.0
 BuildRequires:  libglade2-devel >= 2.0
 
@@ -49,6 +49,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-2
+- missed some build requires.
+
 * Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-1
 - version update
 



From fedora-extras-commits at redhat.com  Thu Apr 27 23:23:52 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Thu, 27 Apr 2006 16:23:52 -0700
Subject: rpms/gurlchecker/FC-5 gurlchecker.spec,1.10,1.11
Message-ID: <200604272324.k3RNOObE016576@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gurlchecker/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16453/FC-5

Modified Files:
	gurlchecker.spec 
Log Message:
missed a build depend. Fixed now



Index: gurlchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/FC-5/gurlchecker.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gurlchecker.spec	27 Apr 2006 23:00:11 -0000	1.10
+++ gurlchecker.spec	27 Apr 2006 23:23:52 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           gurlchecker
 Version:        0.8.3
-Release:	2%{?dist}
+Release:	1%{?dist}
 
 Summary:        A Gnome link validity checker
 
@@ -10,9 +10,9 @@
 Source0:        http://labs.libre-entreprise.org/frs/download.php/423/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	gnet2
+Requires:	gnet2, gnutls
 
-BuildRequires:	desktop-file-utils, gnet2-devel, gettext
+BuildRequires:	desktop-file-utils, gnet2-devel, gettext, gnutls-devel
 BuildRequires:  libgnomeui-devel >= 2.0
 BuildRequires:  libglade2-devel >= 2.0
 
@@ -49,6 +49,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-2
+- missed some build requires.
+
 * Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-1
 - version update
 



From fedora-extras-commits at redhat.com  Thu Apr 27 23:26:27 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Thu, 27 Apr 2006 16:26:27 -0700
Subject: rpms/gurlchecker/devel gurlchecker.spec,1.11,1.12
Message-ID: <200604272326.k3RNQT2T016813@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gurlchecker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16736/devel

Modified Files:
	gurlchecker.spec 
Log Message:
and this bump the release tag. 



Index: gurlchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/devel/gurlchecker.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gurlchecker.spec	27 Apr 2006 23:23:58 -0000	1.11
+++ gurlchecker.spec	27 Apr 2006 23:26:27 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           gurlchecker
 Version:        0.8.3
-Release:	1%{?dist}
+Release:	3%{?dist}
 
 Summary:        A Gnome link validity checker
 
@@ -49,7 +49,7 @@
 %{_mandir}/man?/*
 
 %changelog
-* Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-2
+* Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-3
 - missed some build requires.
 
 * Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-1



From fedora-extras-commits at redhat.com  Thu Apr 27 23:26:21 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Thu, 27 Apr 2006 16:26:21 -0700
Subject: rpms/gurlchecker/FC-5 gurlchecker.spec,1.11,1.12
Message-ID: <200604272326.k3RNQrH2016853@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gurlchecker/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16736/FC-5

Modified Files:
	gurlchecker.spec 
Log Message:
and this bump the release tag. 



Index: gurlchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/FC-5/gurlchecker.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gurlchecker.spec	27 Apr 2006 23:23:52 -0000	1.11
+++ gurlchecker.spec	27 Apr 2006 23:26:21 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           gurlchecker
 Version:        0.8.3
-Release:	1%{?dist}
+Release:	3%{?dist}
 
 Summary:        A Gnome link validity checker
 
@@ -49,7 +49,7 @@
 %{_mandir}/man?/*
 
 %changelog
-* Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-2
+* Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-3
 - missed some build requires.
 
 * Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-1



From fedora-extras-commits at redhat.com  Thu Apr 27 23:26:20 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Thu, 27 Apr 2006 16:26:20 -0700
Subject: rpms/gurlchecker/FC-4 gurlchecker.spec,1.10,1.11
Message-ID: <200604272326.k3RNQquG016848@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gurlchecker/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16736/FC-4

Modified Files:
	gurlchecker.spec 
Log Message:
and this bump the release tag. 



Index: gurlchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/FC-4/gurlchecker.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gurlchecker.spec	27 Apr 2006 23:23:51 -0000	1.10
+++ gurlchecker.spec	27 Apr 2006 23:26:20 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           gurlchecker
 Version:        0.8.3
-Release:	1%{?dist}
+Release:	3%{?dist}
 
 Summary:        A Gnome link validity checker
 
@@ -49,7 +49,7 @@
 %{_mandir}/man?/*
 
 %changelog
-* Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-2
+* Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-3
 - missed some build requires.
 
 * Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-1



From fedora-extras-commits at redhat.com  Fri Apr 28 02:40:37 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 19:40:37 -0700
Subject: owners owners.list,1.909,1.910
Message-ID: <200604280240.k3S2edBL002725@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2708

Modified Files:
	owners.list 
Log Message:
Added perl-DBM-Deep


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.909
retrieving revision 1.910
diff -u -r1.909 -r1.910
--- owners.list	27 Apr 2006 22:48:28 -0000	1.909
+++ owners.list	28 Apr 2006 02:40:37 -0000	1.910
@@ -952,6 +952,7 @@
 Fedora Extras|perl-DBIx-ContextualFetch|Add contextual fetches to DBI|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBIx-DBSchema|Database-independent schema objects|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBIx-SearchBuilder|Encapsulate SQL queries and rows in simple perl objects|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-DBM-Deep|A pure perl multi-level hash/array DBM|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|perl-Devel-Cycle|Find memory cycles in objects|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Devel-StackTrace|Perl module implementing stack trace and stack trace frame objects|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Digest-BubbleBabble|Create bubble-babble fingerprints|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Fri Apr 28 02:41:36 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 19:41:36 -0700
Subject: rpms/perl-DBM-Deep - New directory
Message-ID: <200604280241.k3S2fcxk002800@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/perl-DBM-Deep
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2774/perl-DBM-Deep

Log Message:
Directory /cvs/extras/rpms/perl-DBM-Deep added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 28 02:41:36 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 19:41:36 -0700
Subject: rpms/perl-DBM-Deep/devel - New directory
Message-ID: <200604280241.k3S2fcIR002803@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/perl-DBM-Deep/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2774/perl-DBM-Deep/devel

Log Message:
Directory /cvs/extras/rpms/perl-DBM-Deep/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 28 02:41:50 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 19:41:50 -0700
Subject: rpms/perl-DBM-Deep Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604280241.k3S2fqfu002857@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/perl-DBM-Deep
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2822

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-DBM-Deep


--- NEW FILE Makefile ---
# Top level Makefile for module perl-DBM-Deep
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 28 02:41:51 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 19:41:51 -0700
Subject: rpms/perl-DBM-Deep/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604280241.k3S2frNT002861@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/perl-DBM-Deep/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2822/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-DBM-Deep


--- 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 Apr 28 02:42:21 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 19:42:21 -0700
Subject: rpms/perl-DBM-Deep import.log,1.1,1.2
Message-ID: <200604280242.k3S2gNua002923@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/perl-DBM-Deep
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2890

Modified Files:
	import.log 
Log Message:
auto-import perl-DBM-Deep-0.983-1 on branch devel from perl-DBM-Deep-0.983-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-DBM-Deep/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	28 Apr 2006 02:41:50 -0000	1.1
+++ import.log	28 Apr 2006 02:42:21 -0000	1.2
@@ -0,0 +1 @@
+perl-DBM-Deep-0_983-1:HEAD:perl-DBM-Deep-0.983-1.src.rpm:1146192133



From fedora-extras-commits at redhat.com  Fri Apr 28 02:42:22 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 19:42:22 -0700
Subject: rpms/perl-DBM-Deep/devel perl-DBM-Deep.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604280242.k3S2gO0m002928@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/perl-DBM-Deep/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2890/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-DBM-Deep.spec 
Log Message:
auto-import perl-DBM-Deep-0.983-1 on branch devel from perl-DBM-Deep-0.983-1.src.rpm


--- NEW FILE perl-DBM-Deep.spec ---
Name:           perl-DBM-Deep
Version:        0.983
Release:        1%{?dist}
Summary:        A pure perl multi-level hash/array DBM
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/DBM-Deep/
Source0:        http://www.cpan.org/modules/by-module/DBM/DBM-Deep-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Module::Build), perl(Test::Exception)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
A unique flat-file database module, written in pure perl. True multi-level
hash/array support (unlike MLDBM, which is faked), hybrid OO / tie()
interface, cross-platform FTPable files, and quite fast. Can handle
millions of keys and unlimited hash levels without significant slow-down.
Written from the ground-up in pure perl -- this is NOT a wrapper around a
C-based DBM. Out-of-the-box compatibility with Unix, Mac OS X and Windows.

%prep
%setup -q -n DBM-Deep-%{version}

%build
perl Build.PL installdirs=vendor
./Build

%install
rm -rf %{buildroot}

./Build install destdir=%{buildroot} create_packlist=0
find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null \;

chmod -R u+rwX,go+rX,go-w %{buildroot}/*

%check
./Build test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Apr 27 2006 Andreas Thienemann <andreas at bawue.net> 0.983-1
- Specfile autogenerated by cpanspec 1.64.
- Cleaned up for FE


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBM-Deep/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Apr 2006 02:41:51 -0000	1.1
+++ .cvsignore	28 Apr 2006 02:42:21 -0000	1.2
@@ -0,0 +1 @@
+DBM-Deep-0.983.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBM-Deep/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Apr 2006 02:41:51 -0000	1.1
+++ sources	28 Apr 2006 02:42:21 -0000	1.2
@@ -0,0 +1 @@
+09ddd163183e983bf1085688d0b25b75  DBM-Deep-0.983.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 28 03:17:42 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 27 Apr 2006 20:17:42 -0700
Subject: extras-buildsys/builder Builder.py, NONE, 1.1 BuilderMock.py, NONE,
	1.1 main.py, NONE, 1.1 Config.py, 1.2, 1.3 Makefile, 1.4,
	1.5 builder.py, 1.54, NONE
Message-ID: <200604280317.k3S3HgT2005362@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/builder
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5292/builder

Modified Files:
	Config.py Makefile 
Added Files:
	Builder.py BuilderMock.py main.py 
Removed Files:
	builder.py 
Log Message:
2006-04-27  Dan Williams  <dcbw at redhat.com>

    Commit partial rework of builder<->server communcation.




--- NEW FILE Builder.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 2006 Dan Williams <dcbw at redhat.com> and Red Hat, Inc.


import os
import sys
import socket
import time
import threading
import sha
import exceptions
import xmlrpclib
import OpenSSL
from plague import Commands
from plague import AuthedXMLRPCServer
from plague import HTTPServer
from plague import XMLRPCServerProxy

import Config
import BuilderMock


class BuilderInitException(Exception): pass

def get_hostname(cfg, bind_all):
    cfg_hostname = cfg.get_str("Passive", "hostname")
    if cfg_hostname and len(cfg_hostname):
        return cfg_hostname
    elif bind_all:
        return ''
    return socket.gethostname()

def determine_max_jobs(cfg):
    """ Simple max job calculator based on number of CPUs """

    import commands
    max_jobs = 1
    cmd = "/usr/bin/getconf _NPROCESSORS_ONLN"
    (s, o) = commands.getstatusoutput(cmd)
    if s == 0:
        try:
            max_jobs = int(o)
        except ValueError:
            pass
    return max_jobs

def log(string):
    sys.stdout.write(string + "\n")
    sys.stdout.flush()


class PassiveBuilderRequestHandler:
    def __init__(self, cfg, builder):
        self._builder = builder
        self._all_jobs = {} # unique id => awclass instance
        self._building_jobs_lock = threading.Lock()
        self._building_jobs = []
        self._cfg = cfg

    def _log(self, string):
        if self._cfg.get_bool("General", "debug"):
            print string

    def notify_job_done(self, archjob):
        self._building_jobs_lock.acquire()
        if archjob in self._building_jobs:
            self._building_jobs.remove(archjob)
        self._building_jobs_lock.release()

    def die(self, uniqid):
        try:
            job = self._all_jobs[uniqid]
            job.die()
        except KeyError:
            pass
        return 0

    def files(self, uniqid):
        try:
            job = self._all_jobs[uniqid]
            return job.files()
        except KeyError:
            pass
        return []
    
    def repo_unlocked(self, uniqid):
        try:
            job = self._all_jobs[uniqid]
            job.repo_unlocked()
        except KeyError:
            pass
        return 0

    def building_jobs(self):
        jobs = {}
        self._building_jobs_lock.acquire()
        building = 0
        for job in self._building_jobs:
            jobs[job.uniqid()] = job.status()
            building = building + 1
        free = self._max_jobs - building
        self._building_jobs_lock.release()
        return (jobs, free)

    def num_slots(self):
        (free_slots, max_slots) = self._builder.slots()
        return max_slots

    def job_status(self, uniqid):
        try:
            job = self._all_jobs[uniqid]
            return job.status()
        except KeyError:
            pass
        return ''

    def supported_targets(self):
        return self._builder.supported_targets()
            

class Builder(object):
    """ Abstract builder base object """
    def __init__(self, cfg):
        self._cfg = cfg
        self._certs = None
        self._max_slots = determine_max_jobs(cfg)
        self._seq_gen = Commands.SequenceGenerator()

        self._building_jobs_lock = threading.Lock()
        self._building_jobs = []
        self._all_jobs = {}

        if cfg.get_bool("SSL", "use_ssl"):
            hostname = get_hostname(self._cfg, False)
            key_file = os.path.join(cfg.get_str("SSL", "builder_key_and_cert_dir"), "%s.pem" % hostname)
            self._certs = {}
            self._certs['key_and_cert'] = key_file
            self._certs['ca_cert'] = cfg.get_str("SSL", "ca_cert")
            self._certs['peer_ca_cert'] = self._certs['ca_cert']

    def _log(self, string):
        if self._cfg.get_bool("General", "debug"):
            log(string)

    def new_builder(cfg, btype):
        if btype == 'passive':
            return PassiveBuilder(cfg)
        elif btype == 'active':
            return ActiveBuilder(cfg)
        else:
            return None
    new_builder = staticmethod(new_builder)

    def stop(self):
        pass

    def cleanup(self):
        return
        (building_jobs, free) = bcs.building_jobs()
        for jobid in building_jobs.keys():
            bcs.die(jobid)

        # wait for the jobs to clean up before quitting
        log("Waiting for running jobs to stop...")
        while True:
            (building_jobs, free) = bcs.building_jobs()
            if len(building_jobs.keys()) == 0:
                break
            try:
                log(".")
                time.sleep(0.5)
            except KeyboardInterrupt:
                break

    def slots(self):
        self._building_jobs_lock.acquire()
        free_slots = self._max_slots - len(self._building_jobs)
        self._building_jobs_lock.release()
        return (free_slots, self._max_slots)

    def supported_targets(self):
        targets = []
        for t in self._cfg.targets():
            td = t.target_dict()
            td['supported_arches'] = t.arches()
            targets.append(td)
        return targets

    def _get_target_cfg(self, target_dict):
        target_cfg = None

        # First try to find a target for buildarch specifically
        try:
            target_cfg = self._cfg.get_target(target_dict)
        except Config.InvalidTargetException:
            pass

        if not target_cfg:
            # If that doesn't work, just get a target that can build the arch
            try:
                target_cfg = self._cfg.get_target(target_dict, True)
            except Config.InvalidTargetException:
                pass

        return target_cfg

    def _new_job_for_arch(self, target_cfg, buildarch, srpm_url):
        """Creates a new mock build job given a particular build architecture."""

        if buildarch != 'noarch' and not BuilderMock.BuilderClassDict.has_key(buildarch):
            # we know nothing about the architecture 'buildarch'
            return None

        builder_class = None
        if buildarch == 'noarch':
            # Just grab the first available architecture from the ones we support
            builder_class = BuilderMock.BuilderClassDict[target_cfg.arches()[0]]
        elif buildarch in target_cfg.arches():
            builder_class = BuilderMock.BuilderClassDict[buildarch]

        # We'll throw a TypeError here if there's no available builder_class for this arch
        return builder_class(self, target_cfg, buildarch, srpm_url)

    def _start_new_job(self, target_dict, srpm_url):
        target_str = Config.make_target_string(target_dict['distro'], target_dict['target'], target_dict['arch'], target_dict['repo'])

        uniqid = -1
        msg = "Success"
        (free, max) = self.slots()
        if free <= 0:
            msg = "Error: Tried to build '%s' on target %s when already building" \
                        " maximum (%d) jobs" % (srpm_url, target_str, max)
            self._log(msg)
            return (uniqid, msg)

        target_cfg = self._get_target_cfg(target_dict)
        if not target_cfg:
            msg = "Error: Tried to build '%s' on target %s which isn't supported" % (srpm_url, target_str)
            self._log(msg)
            return (uniqid, msg)

        archjob = None
        try:
            archjob = self._new_job_for_arch(target_cfg, target_dict['arch'], srpm_url)
            uniqid = archjob.uniqid()
            self._all_jobs[uniqid] = archjob
            self._building_jobs_lock.acquire()
            self._building_jobs.append(archjob)
            self._building_jobs_lock.release()
            filename = os.path.basename(srpm_url)
            msg = "%s: started %s on %s arch %s at time %d" % (uniqid, filename,
                        target_str, target_dict['arch'], archjob.starttime())
#            job.start()
        except (OSError, TypeError), err:
            msg = "Failed request for %s on %s: '%s'" % (srpm_url,
                    target_str, err)

        self._log(msg)
        return (uniqid, msg)


class PassiveBuilder(Builder):
    """
    Passive builders initiate no communication of their own.  They wait
    for the build server to contact them, and therefore may not be used
    behind a firewall without holes being punched through it.
    """
    def __init__(self, cfg):
        Builder.__init__(self, cfg)
        self._http_server = None
        self._xmlrpc_server = None

    def _start_servers(self):
        # Start up the HTTP server thread which the build server
        # pulls completed RPMs from
        hostname = get_hostname(self._cfg, True)
        port = cfg.get_int("Passive", "fileserver_port")
        self._http_server = HTTPServer.PlgHTTPServerManager((hostname, port), work_dir, self._certs)
        self._http_server.start()

        log("Binding to address '%s' with arches: [%s]\n" % (hostname, string.join(build_arches, ",")))
        xmlrpc_port = cfg.get_int("Passive", "xmlrpc_port")
        try:
            if cfg.get_bool("SSL", "use_ssl") == True:
                self._xmlrpc_server = AuthedXMLRPCServer.AuthedSSLXMLRPCServer((hostname, xmlrpc_port), None, self._certs)
            else:
                self._xmlrpc_server = AuthedXMLRPCServer.AuthedXMLRPCServer((hostname, xmlrpc_port), None)
        except socket.error, e:
            if e[0] == 98:
                raise BuilderInitException("Error: couldn't bind to address '%s:%s'.  "  \
                           "Is the builder already running?\n" % (hostname, xmlrpc_port))

        brh = PassiveBuilderRequestHandler(cfg, self)
        self._xmlrpc_server.register_instance(brh)

    def work(self):
        self._start_servers()
        try:
            self._xmlrpc_server.serve_forever()
        except KeyboardInterrupt:
            pass

    def _stop_servers(self):
        self._http_server.stop()
        self._xmlrpc_server.stop()
        try:
            time.sleep(1)
        except KeyboardInterrupt:
            pass
        self._xmlrpc_server.server_close()

    def stop(self):
        Builder.stop(self)
        self._stop_servers()



# HACK: This class is a hack to work around SSL hanging issues,
# which cause the whole server to grind to a halt
class ActiveBuilderRequest(threading.Thread):
    def __init__(self, server, address, cmds):
        self._server = server
        self._address = address
        self._cmds = cmds
        self.done = False
        self.failed = False
        self.response = None
        threading.Thread.__init__(self)

    def run(self):
        self.setName("ActiveBuilderRequest: %s" % self._address)
        try:
            cmd_stream = Commands.serialize_to_command_stream(self._cmds)
            self.response = self._server.request(cmd_stream)
        except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, OpenSSL.SSL.Error, xmlrpclib.ProtocolError):
            self.failed = True
        except xmlrpclib.Fault, e:
            print "Builder Error (%s) in request(): server replied '%s'" % (self._address, e)
            self.failed = True
        self.done = True

class ActiveBuilder(Builder, threading.Thread):
    """
    Active builders initiate all communication to the builder server, and
    therefore may be used from behind a firewall.
    """
    _SERVER_CONTACT_INTERVAL = 20

    def __init__(self, cfg):
        Builder.__init__(self, cfg)
        self._stop = False
        self._last_comm = time.time() - self._SERVER_CONTACT_INTERVAL - 1
        self._queued_cmds = []
        self._xmlrpc_address = self._get_server_address(cfg.get_str("Active", "xmlrpc_port"))
        self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._xmlrpc_address, self._certs, timeout=20)
        threading.Thread.__init__(self)

    def _get_server_address(self, port):
        addr = self._cfg.get_str("Active", "server")
        if addr.startswith("http://"):
            addr = addr[7:]
        elif addr.startswith("https://"):
            addr = addr[8:]
        if self._cfg.get_bool("SSL", "use_ssl"):
            addr = "https://" + addr
        else:
            addr = "http://" + addr
        return addr + ":" + port

    def work(self):
        self.start()
        try:
            while not self._stop:
                time.sleep(60)
        except KeyboardInterrupt:
            pass

    def _get_default_commands(self):
        """Return a python list of serialized commands that the builder
        sends to the server every time it contacts the server."""

        defcmds = []

        # always send a target list
        next_seq = self._seq_gen.next()
        cmd = Commands.PlgCommandTargets(self.supported_targets(), next_seq)
        defcmds.append(cmd)

        # always send free & max slots
        next_seq = self._seq_gen.next()
        (free, max) = self.slots()
        cmd = Commands.PlgCommandSlots(free, max, next_seq)
        defcmds.append(cmd)

        return defcmds

    def _send_commands(self):
        """Send default commands, and any commands that we've queued up
        since the last time we sent commands to the server."""

        cmds = self._get_default_commands()
        cmds = cmds + self._queued_cmds

        # The actual XML-RPC request runs in a different thread because SSL
        # calls sometimes hang 
        req = ActiveBuilderRequest(self._server, self._xmlrpc_address, cmds)
        curtime = time.time()
        req.start()

        # Give the request 10s, otherwise forget about it
        while time.time() - curtime < 10:
            if req.done:
                break
            time.sleep(0.5)

        if req.done and not req.failed:
            self.queued_cmds = []
            return req.response
        return None

    def _dispatch_server_command(self, cmd):
        """Process a single command from the server."""

        if isinstance(cmd, Commands.PlgCommandNewJobReq):
            (uniqid, msg) = self._start_new_job(cmd.target_dict(), cmd.srpm_url())
            ack = Commands.PlgCommandNewJobAck(uniqid, msg, cmd.seq(), self._seq_gen.next())
            self._queued_cmds.append(ack)

    def _process_server_response(self, response):
        """Process the server's response."""

        if not response:
            # Something went wrong...
            return

        cmds = Commands.deserialize_command_stream(response)
        for cmd in cmds:
            self._dispatch_server_command(cmd)

    def run(self):
        """Main builder loop, send commands to and receive commands from
        the server every so often."""

        while not self._stop:
            if self._last_comm < time.time() - self._SERVER_CONTACT_INTERVAL:
                self._last_comm = time.time()
                resp = self._send_commands()
                self._process_server_response(resp)
            time.sleep(1)

    def stop(self):
        self._stop = True


--- NEW FILE BuilderMock.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 Dan Williams <dcbw at redhat.com> and Red Hat, Inc.


import threading
import sys
import os


import socket
import shutil
import string
import fcntl
import urllib
import errno
import exceptions
import threading
import sha
import time

from plague import ExecUtils
from plague import FileDownloader


def log(string):
    sys.stdout.write(string)
    sys.stdout.flush()

def get_url_for_file(cfg, file_path):
    """ Return a URL pointing to a particular file in our work dir """

    # Ensure the file we're turning into a URL lives in our builder work dir
    work_dir = cfg.get_str("Directories", "builder_work_dir")
    if not file_path.startswith(work_dir):
        return None
    file_part = file_path[len(work_dir) + 1:]
    port = "%s" % cfg.get_int("Network", "fileserver_port")
    if cfg.get_bool("SSL", "use_ssl"):
        method = "https://"
    else:
        method = "http://"
    hostname = get_hostname(cfg, False)
    full_url = "%s%s:%s/%s" % (method, hostname, port, file_part)
    return urllib.quote(full_url)

def _generate_uniqid(target_str, srpm_url):
    sum = sha.new()
    sum.update('%d %s %s' % (time.time(), target_str, srpm_url))
    return sum.hexdigest()


class BuilderMock(threading.Thread):
    """puts things together for an arch - baseclass for handling builds for 
       other arches"""

    def __init__(self, controller, target_cfg, buildarch, srpm_url):
        self._controller = controller
        self.buildarch = buildarch
        self._starttime = time.time()
        self._endtime = 0
        self._mockstarttime = 0
        self._uniqid = _generate_uniqid(str(target_cfg), srpm_url)
        self._status = 'init'
        self._die = False
        self._repo_locked = True
        self._repo_wait_start = 0
        self._files = []
        self._childpid = 0
        self._target_cfg = target_cfg
        self._builder_cfg = target_cfg.parent_cfg()
        self._srpm_url = srpm_url
        self._srpm_tries = 0
        self._log_fd = None
        self._mock_config = None
        self._done_status = ''
        self._mock_log = None
        self.buildroot = self._target_cfg.mock_config()

        self._work_dir = self._builder_cfg.get_str("Directories", "builder_work_dir")
        self._result_dir = os.path.join(self._work_dir, self._uniqid, "result")
        if not os.path.exists(self._result_dir):
            os.makedirs(self._result_dir)

        self._state_dir = os.path.join(self._work_dir, self._uniqid, "mock-state")
        if not os.path.exists(self._state_dir):
            os.makedirs(self._state_dir)

        logfile = os.path.join(self._result_dir, "job.log")
        self._log_fd = open(logfile, "w+")

        threading.Thread.__init__(self)

    def starttime(self):
        return self._starttime

    def endtime(self):
        return self._endtime

    def die(self):
        if self.is_done_status() or self._done_status == 'killed':
            return True
        self._die = True
        return True

    def _handle_death(self):
        self._die = False
        self._done_status = 'killed'
        self._log("Killing build process...\n")

        # Don't try to kill a running cleanup process
        if self._status != 'cleanup':
            # Kill a running non-cleanup mock process, if any
            if self._childpid:
                child_pgroup = 0 - self._childpid
                try:
                    # Kill all members of the child's process group
                    os.kill(child_pgroup, 9)
                except OSError, e:
                    self._log("ERROR: Couldn't kill child process group %d: %s\n" % (child_pgroup, e))
                else:
                    # Ensure child process is reaped
                    self._log("Waiting for mock process %d to exit...\n" % self._childpid)
                    try:
                        (pid, status) = os.waitpid(self._childpid, 0)
                    except OSError, e:
                        pass
                    self._log("Mock process %d exited.\n" % self._childpid)
                self._childpid = 0

            # Start cleanup up the job
            self._start_cleanup()

        self._log("Killed.\n");

    def _log(self, string):
        if string and self._log_fd:
            self._log_fd.write(string)
            self._log_fd.flush()
            os.fsync(self._log_fd.fileno())
            if self._builder_cfg.get_bool("General", "debug"):
                s = "%s: " % self._uniqid
                sys.stdout.write(s + string)
                sys.stdout.flush()

    def dl_callback(self, dl_status, cb_data, err_msg):
        url = cb_data
        if dl_status == 'done':
            self._status = 'downloaded'
            self._log("Retrieved %s.\n" % url)
        elif dl_status == 'failed':
            # If job was cancelled, just return
            if self.is_done_status():
                return

            # Retry up to 5 times
            self._srpm_tries = self._srpm_tries + 1
            if self._srpm_tries >= 5:
                self._status = 'failed'
                self._log("ERROR: Failed to retrieve %s.\n" % url)
            else:
                # retry the download
                self._status = 'init'
                self._log("ERROR: Failed to retrieve %s on attempt %d (%s).  Trying again...\n" % (url, self._srpm_tries, err_msg))

    def _copy_mock_output_to_log(self):
        if self._mock_log and os.path.exists(self._mock_log):
            ml = open(self._mock_log, "r")
            line = "foo"
            while len(line):
                line = ml.readline()
                if len(line):
                    self._log_fd.write(line)
            ml.close()
            os.remove(self._mock_log)
            self._mock_log = None

    def _start_build(self):
        self._log("Starting step 'building' with command:\n")
        if not os.path.exists(self._result_dir):
            os.makedirs(self._result_dir)
        if not os.path.exists(self._result_dir):
            os.makedirs(self._result_dir)

        # Set up build process arguments
        args = []
        builder_cmd = os.path.abspath(self._builder_cfg.get_str("General", "builder_cmd"))
        cmd = builder_cmd
        if self.arch_command and len(self.arch_command):
            arg_list = self.arch_command.split()
            for arg in arg_list:
                args.append(arg)
            cmd = os.path.abspath(arg_list[0])
        args.append(builder_cmd)
        args.append("-r")
        args.append(self.buildroot)
        args.append("--arch")
        args.append(self.buildarch)
        args.append("--resultdir=%s" % self._result_dir)
        args.append("--statedir=%s" % self._state_dir)
        args.append("--uniqueext=%s" % self._uniqid)
        args.append(self._srpm_path)
        self._log("   %s\n" % string.join(args))

        self._mock_log = os.path.join(self._result_dir, "mock-output.log")
        self._childpid = ExecUtils.exec_with_redirect(cmd, args, None, self._mock_log, self._mock_log)
        self._mockstarttime = time.time()
        self._status = 'prepping'

    def _start_cleanup(self):
        self._log("Cleaning up the buildroot...\n")

        args = []
        builder_cmd = os.path.abspath(self._builder_cfg.get_str("General", "builder_cmd"))
        cmd = builder_cmd
        if self.arch_command and len(self.arch_command):
            arg_list = self.arch_command.split()
            for arg in arg_list:
                args.append(arg)
            cmd = os.path.abspath(arg_list[0])
        args.append(builder_cmd)
        args.append("clean")
        args.append("--uniqueext=%s" % self._uniqid)
        args.append("-r")
        args.append(self.buildroot)

        self._log("   %s\n" % string.join(args))
        self._childpid = ExecUtils.exec_with_redirect(cmd, args, None, None, None)
        self._status = 'cleanup'

    def _mock_is_prepping(self):
        mock_status = self._get_mock_status()
        if mock_status:
            if mock_status == 'prep':
                return True
            elif mock_status == 'setu':
                return True
        return False

    def _mock_using_repo(self):
        mock_status = self._get_mock_status()
        if mock_status:
            if mock_status == 'init':
                return True
            elif mock_status == 'clea':
                return True
            elif mock_status == 'prep':
                return True
            elif mock_status == 'setu':
                return True
        return False

    def _mock_is_closed(self):
        mock_status = self._get_mock_status()
        if mock_status and mock_status == "done":
            return True
        return False

    def _get_mock_status(self):
        mockstatusfile = os.path.join(self._state_dir, 'status')
        if not os.path.exists(mockstatusfile):
            return None

        f = open(mockstatusfile, "r")
        fcntl.fcntl(f.fileno(), fcntl.F_SETFL, os.O_NONBLOCK)
        
        while True:
            try:
                f.seek(0, 0)
                string = f.read(4)
            except OSError, e:
                if e.errno == errno.EAGAIN:
                    try:
                        time.sleep(0.25)
                    except KeyboardInterrupt:
                        pass
                    continue
            else:
                if len(string) < 4:
                    continue
                break
        f.close()
        string = string.lower()
        return string

    def _read_mock_config(self):
        mockconfigfile = os.path.join(self._result_dir, 'mockconfig.log')
        if not os.path.exists(mockconfigfile):
            return None

        f = open(mockconfigfile, "r")
        contents = {}
        for line in f:
            (item, loc) = line.split('=')
            item = item.strip()
            loc = loc.strip()
            contents[item] = loc
        f.close()
        return contents

    def _status_init(self):
        self._log("Starting download of %s.\n" % self._srpm_url)
        self._status = 'downloading'
        target_dir = os.path.dirname(self._srpm_path)
        try:
            dl_thread = FileDownloader.FileDownloader(self.dl_callback, self._srpm_url, self._srpm_url,
                        target_dir, ['.src.rpm'], certs)
            dl_thread.start()
        except FileDownloader.FileNameException, e:
            self._status = 'failed'
            self._log("ERROR: Failed to begin SRPM download.  Error: '%s'   URL: %s\n" % (e, self._srpm_url))
            
    def _status_downloading(self):
        pass

    def _status_downloaded(self):
        # We can't start doing anything with yum until the build
        # server tells us the repo is unlocked.
        if not self._repo_locked:
            self._start_build()
        else:
            # Only show this message once
            if self._repo_wait_start <= 0:
                self._log("Waiting for repository to unlock before starting the build...\n")
                self._repo_wait_start = time.time()

            # Kill a job in 'downloaded' state after 30 minutes because
            # it's likely orphaned
            if time.time() > (self._repo_wait_start + (60 * 30)):
                self._log("Job waited too long for repo to unlock. Killing it...\n")
                self.die()

    def _watch_mock(self, good_exit, bad_exit):
        (aux_pid, status) = os.waitpid(self._childpid, os.WNOHANG)
        status = os.WEXITSTATUS(status)
        if aux_pid:
            self._childpid = 0
            if status == 0:
                self._done_status = good_exit
            elif status > 0:
                self._done_status = bad_exit

            self._copy_mock_output_to_log()
            self._start_cleanup()

    def _status_prepping(self):
        # Mock shouldn't exit at all during the prepping stage, if it does
        # something is wrong
        self._watch_mock('failed', 'failed')
        if self._status != 'prepping':
               return

        # We need to make sure that mock has dumped the status file withing a certain
        # amount of time, otherwise we can't tell what it's doing
        mockstatusfile = os.path.join(self._state_dir, 'status')
        if not os.path.exists(mockstatusfile):
            # something is wrong if mock takes more than 15s to write the status file
            if time.time() > self._mockstarttime + 15:
                self._mockstarttime = 0
                self._log("ERROR: Timed out waiting for the mock status file!  %s\n" % mockstatusfile)
                self.die()
        else:
            if not self._mock_config and self._mock_is_prepping():
                self._mock_config = self._read_mock_config()
            if not self._mock_using_repo():
                self._status = 'building'

    def _status_building(self):
        self._watch_mock('done', 'failed')

    def _status_cleanup(self):
        (aux_pid, status) = os.waitpid(self._childpid, os.WNOHANG)
        if aux_pid:
            self._childpid = 0
            # Mock exited
            if self._mock_config:
                if self._mock_config.has_key('rootdir'):
                    mock_root_dir = os.path.abspath(os.path.join(self._mock_config['rootdir'], "../"))
                    # Ensure we're actually deleteing the job's rootdir
                    if mock_root_dir.endswith(self._uniqid):
                        shutil.rmtree(mock_root_dir, ignore_errors=True)

                if self._mock_config.has_key('statedir'):
                    shutil.rmtree(self._mock_config['statedir'], ignore_errors=True)

                source_dir = os.path.abspath(os.path.join(self._mock_config['rootdir'], "../source"))
                # Ensure we're actually deleteing the job's sourcedir
                if source_dir.endswith(os.path.join(self._uniqid, "source")):
                    shutil.rmtree(source_dir, ignore_errors=True)

        # Ensure child process is reaped, if any
        if self._childpid:
            try:
                self._log("Waiting for child process %d to exit.\n" % self._childpid)
                (pid, status) = os.waitpid(self._childpid, 0)
            except OSError, e:
                self._childpid = 0
                pass

        self._copy_mock_output_to_log()

        self._files = self._find_files()
        self._status = self._done_status

    def _job_done(self):
        self._log("-----------------------\n")
        if self._status == 'done':
            self._log("Job completed successfully.\n")
        elif self._status == 'failed':
            self._log("Job failed due to build errors!  Please see build logs.\n")
        elif self._status == 'killed':
            self._log("Job failed because it was killed.\n")
        self._log("\n\n")

        if self._log_fd:
            self._log_fd.close()
            self._log_fd = None

    def run(self):
        # Print out a nice message at the start of the job
        target_dict = self._target_cfg.target_dict()
        target_str = "%s-%s-%s-%s" % (target_dict['distro'], target_dict['target'], target_dict['arch'], target_dict['repo'])
        self._log("""Starting job:
   Time: %s
   Target: %s
   UID: %s
   Architecture: %s
   SRPM: %s\n\n""" % (time.asctime(time.localtime(self._starttime)), target_str, self._uniqid, self.buildarch, self._srpm_url))

        try:
            srpm_filename = FileDownloader.get_base_filename_from_url(self._srpm_url, ['.src.rpm'])
            self._srpm_path = os.path.join(self._work_dir, self._uniqid, "source", srpm_filename)
        except FileDownloader.FileNameException, e:
            self._log("ERROR: SRPM file name was invalid.  Message: '%s'\n" % e)
            self._status = 'failed'

        # Main build job work loop
        while not self.is_done_status():
            if self._die:
                self._handle_death()

            # Execute operations for our current status
            try:
                func = getattr(self, "_status_%s" % self._status)
            except AttributeError:
                self._log("ERROR: internal builder inconsistency, didn't recognize status '%s'.\n" % self._status)
                self._status = 'failed'
            else:
                func()
            time.sleep(3)

        self._job_done()
        self._endtime = time.time()
        if self._childpid:
            self._log("ERROR: childpid was !NULL  (%d)" % self._childpid)
        self._controller.notify_job_done(self)

    def _find_files(self):
        # Grab the list of files in our job's result dir and URL encode them
        files_in_dir = os.listdir(self._result_dir)
        file_list = []
        self._log("\n")
        self._log("Output File List:\n")
        self._log("-----------------\n")
        for f in files_in_dir:
            file_url = get_url_for_file(self._builder_cfg, os.path.join(self._result_dir, f))
            if file_url:
                file_list.append(file_url)
                self._log("  Output File: %s\n" % urllib.unquote(file_url))
            else:
                self._log("  Error: Couldn't get file URL for file %s\n" % f)
        self._log("-----------------\n")
        return file_list

    def status(self):
        return self._status

    def uniqid(self):
        return self._uniqid

    def files(self):
        return self._files

    def repo_unlocked(self):
        self._repo_locked = False

    def is_done_status(self):
        if (self._status is 'done') or (self._status is 'killed') or (self._status is 'failed'):
            return True
        return False


class InvalidTargetError(exceptions.Exception): pass

class i386Arch(BuilderMock):
    def __init__(self, controller, target_cfg, buildarch, srpm_url):
        self.arch_command = '/usr/bin/setarch i686'
        BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url)

class x86_64Arch(BuilderMock):
    def __init__(self, controller, target_cfg, buildarch, srpm_url):
        self.arch_command = ''
        BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url)

class PPCArch(BuilderMock):
    def __init__(self, controller, target_cfg, buildarch, srpm_url):
        self.arch_command = '/usr/bin/setarch ppc32'
        BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url)

class PPC64Arch(BuilderMock):
    def __init__(self, controller, target_cfg, buildarch, srpm_url):
        self.arch_command = ''
        BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url)

class SparcArch(BuilderMock):
    def __init__(self, controller, target_cfg, buildarch, srpm_url):
        self.arch_command = '/usr/bin/sparc32'
        BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url)

class Sparc64Arch(BuilderMock):
    def __init__(self, controller, target_cfg, buildarch, srpm_url):
        self.arch_command = '/usr/bin/sparc64'
        BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url)


BuilderClassDict = {
                'i386':     i386Arch,
                'i486':     i386Arch,
                'i586':     i386Arch,
                'i686':     i386Arch,
                'athlon':   i386Arch,
                'x86_64':   x86_64Arch,
                'amd64':    x86_64Arch,
                'ia32e':    x86_64Arch,
                'ppc':      PPCArch,
                'ppc32':    PPCArch,
                'ppc64':    PPC64Arch,
                'sparc':    SparcArch,
                'sparcv8':  SparcArch,
                'sparcv9':  SparcArch,
                'sparc64':  Sparc64Arch
               }


--- NEW FILE main.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 Dan Williams <dcbw at redhat.com> and Red Hat, Inc.


import os
import time
import sys
import signal
from plague import ArchUtils
from plague import daemonize
from optparse import OptionParser


sys.path.append('/usr/share/plague/builder')

import Config
import Builder
import BuilderMock

def log(string):
    sys.stdout.write(string)
    sys.stdout.flush()


def drop_privs(user):
    """
    We can't and shouldn't run mock as root, so we drop privs.
    We have to run the HTTP server as root though so it can chroot
    to the fileserver directory.
    """

    if os.getuid() != 0:
        return

    import pwd
    import grp

    eu = user
    try:
        uid = int(eu)
    except ValueError:
        try:
            pwrec = pwd.getpwnam(eu)
        except KeyError:
            print "Username '%s' does not exist." % eu
            return -1
        uid = pwrec[2]
    else:
        try:
            pwrec = pwd.getpwuid(uid)
        except KeyError:
            print "User ID %d doesn't exist." % uid
            return -1
    gid = pwrec[3]

    if uid == 0:
        print "You cannot use the superuser as the 'builder_user' option."
        return -1

    # Make ourself members of the mock group build_user's group
    try:
        mock_req = grp.getgrnam('mock')
    except KeyError:
        print "Mock group doesn't exist."
        return -1
    groups = [mock_req[2], gid]
    os.setgroups(groups)

    try:
        os.setgid(gid)
    except OSError:
        print "Could drop group privileges. Error: '%s'" % sys.exc_info()
        return -1

    os.setuid(uid)
    return 0


def determine_build_arches(cfg):
    """
    Attempt to autodetect what architectures this machine can build for,
    based on the kernel's uname.  If that fails, fall back to options in
    the config file.
    """

    machine_arch = os.uname()[4]
    arches = []
    try:
        arches = ArchUtils.supported_arches[machine_arch]
    except KeyError:
        print "Unknown machine type.  Please update plague's ArchUtils.py file."

    # Ok, grab from config file if we can't autodetermine
    if not len(arches):
        arches = cfg.get_list("General", "build_arches")

    for arch in arches:
        if not arch in BuilderMock.BuilderClassDict.keys():
            print "Unknown arch '%s' is not supported." % arch
            sys.exit(1)

    return arches


builder = None

def exit_handler(signum, frame):
    global builder
    log("Received SIGTERM, quitting...\n")
    builder.stop()

def main():
    global builder

    usage = "Usage: %s  [-p <pidfile>] [-l <logfile>] [-d] -c <configfile>" % sys.argv[0]
    parser = OptionParser(usage=usage)
    parser.add_option("-p", "--pidfile", default=None,
        help='file to write the PID to')
    parser.add_option("-l", "--logfile", default=None,
        help="location of file to write log output to")
    parser.add_option("-d", "--daemon", default=False, action="store_true",
        help="daemonize (i.e., detach from the terminal)")
    parser.add_option("-c", "--configfile", default=None,
        help="location of the builder config file")
    (opts, args) = parser.parse_args()

    if not opts.configfile:
        log("Must specify a config file.\n")
        sys.exit(1)

    # Load in the config
    cfg = Config.BuilderConfig(opts.configfile)
    btype = cfg.get_str("General", "comm_type")
    if btype != 'passive' and btype != 'active':
        log("Builder communication type must be 'active' or 'passive', not '%s'.  Exiting...\n" % btype)
        sys.exit(1)

    build_arches = determine_build_arches(cfg)
    if not len(build_arches):
        log("Cannot determine buildable arches for this builder.  Exiting...\n")
        sys.exit(1)

    cfg.load_target_configs(build_arches)
    if len(cfg.targets()) == 0:
        log("No useable mock buildroots configured.  Exiting...\n")
        sys.exit(1)

    if opts.daemon:
        ret=daemonize.createDaemon()
        if ret:
            log("Daemonizing failed!\n")
            sys.exit(2)

    if opts.pidfile:
        f = open(opts.pidfile, 'w', 1)
        f.write('%d\n' % os.getpid())
        f.flush()
        f.close()

    if opts.logfile:
        logf=open(opts.logfile, 'a')
        sys.stdout=logf
        sys.stderr=logf

    work_dir = cfg.get_str("Directories", "builder_work_dir")
    if not os.path.exists(work_dir) or not os.access(work_dir, os.R_OK):
        log("%s does not exist or is not readable.\n" % work_dir)
        os._exit(1)

    # Stop running as root
    if drop_privs(cfg.get_str("General", "builder_user")) == -1:
        builder.cleanup()
        os._exit(1)

    # Set up our termination handler
    signal.signal(signal.SIGTERM, exit_handler)

    builder = Builder.Builder.new_builder(cfg, btype)

    # Start doing stuff
    builder.work()

    log("Shutting down...\n")
    builder.stop()
    builder.cleanup()
    time.sleep(2)
    log(" done.\n");

    sys.stdout.flush()
    os._exit(0)


if __name__ == '__main__':
    main()


Index: Config.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/Config.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Config.py	31 Aug 2005 14:13:02 -0000	1.2
+++ Config.py	28 Apr 2006 03:17:35 -0000	1.3
@@ -22,6 +22,10 @@
 
 class InvalidTargetException(Exception): pass
 
+def make_target_string(distro, target, arch, repo):
+    return "%s-%s-%s-%s" % (distro, target, arch, repo)
+
+
 class BuilderConfig(BaseConfig.BaseConfig):
     def __init__(self, filename):
         BaseConfig.BaseConfig.__init__(self, filename)
@@ -77,15 +81,21 @@
         self.set_option("General", "debug", "yes")
         self.set_option("General", "builder_cmd", "/usr/bin/mock")
         self.set_option("General", "builder_user", "plague-builder")
+        self.set_option("General", "comm_type", "active")
 
         self.add_section("Directories")
         self.set_option("Directories", "builder_work_dir", "/tmp/builder_work")
         self.set_option("Directories", "target_configs_dir", "/etc/plague/builder/targets")
 
-        self.add_section("Network")
-        self.set_option("Network", "fileserver_port", "8889")
-        self.set_option("Network", "xmlrpc_port", "8888")
-        self.set_option("Network", "hostname", "")
+        self.add_section("Active")
+        self.set_option("Active", "server", "")
+        self.set_option("Active", "xmlrpc_port", "8886")
+        self.set_option("Active", "fileserver_port", "8887")
+
+        self.add_section("Passive")
+        self.set_option("Passive", "hostname", "")
+        self.set_option("Passive", "xmlrpc_port", "8888")
+        self.set_option("Passive", "fileserver_port", "8889")
 
         self.add_section("SSL")
         self.set_option("SSL", "use_ssl", "yes")
@@ -159,6 +169,10 @@
     def parent_cfg(self):
         return self._parent_cfg
 
+    def __repr__(self):
+        return make_target_string(self._distro, self._target, self._basearch, self._repo)
+    __str__ = __repr__
+
     def save_default_config(self, filename=None):
         self.add_section("General")
         self.set_option("General", "distro", "fedora")


Index: Makefile
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile	25 Aug 2005 18:15:13 -0000	1.4
+++ Makefile	28 Apr 2006 03:17:35 -0000	1.5
@@ -14,11 +14,13 @@
 CONFIGDIR=$(DESTDIR)$(ETCDIR)/$(PKGNAME)/builder
 
 FILES = \
-	Config.py
+	Config.py \
+	Builder.py \
+	BuilderMock.py
 
 install:
 	$(MKDIR) -p $(DESTDIR)$(BINDIR)
-	$(INSTALL) -m 755 builder.py $(DESTDIR)/$(BINDIR)/$(PKGNAME)-builder
+	$(INSTALL) -m 755 main.py $(DESTDIR)/$(BINDIR)/$(PKGNAME)-builder
 	$(MKDIR) -p $(OTHERINSTDIR)
 	for file in $(FILES); do $(INSTALL) -m 644 $$file $(OTHERINSTDIR)/$$file; done
 	$(MKDIR) -p $(CONFIGDIR)


--- builder.py DELETED ---



From fedora-extras-commits at redhat.com  Fri Apr 28 03:17:43 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 27 Apr 2006 20:17:43 -0700
Subject: extras-buildsys/common Commands.py, NONE, 1.1 HTTPServer.py, 1.12,
	1.13 Makefile, 1.11, 1.12 URLopener.py, 1.1, 1.2
Message-ID: <200604280317.k3S3HhW9005370@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5292/common

Modified Files:
	HTTPServer.py Makefile URLopener.py 
Added Files:
	Commands.py 
Log Message:
2006-04-27  Dan Williams  <dcbw at redhat.com>

    Commit partial rework of builder<->server communcation.




--- NEW FILE Commands.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 2006 Dan Williams <dcbw at redhat.com> and Red Hat, Inc.


""" Common functions and constants for command parsing, receiving, and sending """


import threading



CMD_NAME_ERROR = "Error"
CMD_NAME_NOP = "NOP"
CMD_NAME_TARGETS = "Targets"
CMD_NAME_SLOTS = "Slots"
CMD_NAME_NEW_JOB_REQ = "NewJob"
CMD_NAME_NEW_JOB_ACK = "NewJobAck"


class SequenceGenerator(object):
    """An class that atomically increments a number."""
    def __init__(self):
        self._lock = threading.Lock()
        self._seq = 0

    def __del__(self):
        del self._lock
        del self._seq

    def next(self):
        """Returns the next number in the object's sequence."""
        self._lock.acquire()
        num = self._seq = self._seq + 1
        self._lock.release()
        return num


def serialize_to_command_stream(cmds):
    stream = []
    for cmd in cmds:
        stream.append(cmd.serialize())
    return stream


def deserialize_command_stream(cmd_stream):
    """ Converts a command stream into a list of command objects.

    Argument is a python list of serialized command objects, each
    represented by a python dict.
    
    Return value is a python list of command objects.
    """

    cmds = []
    for item in cmd_stream:
        cmd = PlgCommand.deserialize(item)
        cmds.append(cmd)
    return cmds


class PlgCommand(object):
    """Abstract base class for all builder<->server command
    objects."""

    _need_ack = False

    def __init__(self, name, seq=0):
        """Initialize the command object.  Not used directly,
        but called by subclasses.
        
        The NAME argument is the name (type) of the command.
        
        The SEQ argument is the command's sequence number, which
        should be unique among all commands the program sends.
        """
        self._name = name
        self._seq = seq

    def deserialize(cmd_stream):
        """Class method that deserializes a command stream into
        a particular subclass of command object.
        
        The CMD_STREAM argument is a python dict representing the
        serialized state of the command.

        Return value is the command object.
        """
        cmd = name = args = seq = None
        try:
            # Pull out required fields
            name = cmd_stream['name']
            args = cmd_stream['args']
            seq = cmd_stream['sequence']
        except (KeyError, TypeError), e:
            print "PlgCommand deserialize error: %s" % e
            return None

        # Create the specific command object from the command's name
        if name == CMD_NAME_ERROR:
            cmd = PlgCommandError._deserialize(args)
        elif name == CMD_NAME_TARGETS:
            cmd = PlgCommandTargets._deserialize(args)
        elif name == CMD_NAME_SLOTS:
            cmd = PlgCommandSlots._deserialize(args)
        elif name == CMD_NAME_NEW_JOB_REQ:
            cmd = PlgCommandNewJobReq._deserialize(args)
        elif name == CMD_NAME_NEW_JOB_ACK:
            cmd = PlgCommandNewJobAck._deserialize(args)

        # If command creation was successful, set the sequence
        # number from the command stream on the command.  We don't
        # want to expose the sequence number to subclasses because
        # they should never need it.
        if cmd:
            cmd._seq = seq

        return cmd

    deserialize = staticmethod(deserialize)

    def name(self):
        """Returns the command's name."""
        return self._name

    def seq(self):
        """Returns the command's sequece number."""
        return self._seq

    def need_ack(self):
        """Returns a boolean stating whether this command requires
        an acknowledgement command or not."""
        return self._need_ack

    def _serialize(self, args):
        """Serializes the basic command information into the command
        stream, returning a python dict.  Should only be called by
        subclasses, after determining the arguments the subclass wishes
        to serialize into the command.
        
        Argument ARGS is a python dict containing the subclass-specific
        command's arguments.
        """
        if not args:
            raise ValueError("args cannot be None")
        cmd = {}
        cmd['name'] = self._name
        cmd['sequence'] = self._seq
        cmd['args'] = args
        return cmd

    def __str__(self):
        return "%s(seq: %d)" % (self._name, self._seq)
    __repr__ = __str__


class PlgCommandAck(PlgCommand):
    """Abstract base class for acknowledgement commands."""

    def __init__(self, name, acked_seq, seq=0):
        PlgCommand.__init__(self, name, seq)
        self._acked_seq = acked_seq

    def _deserialize_acked_seq(args):
        try:
            acked_seq = args['acked_seq']
        except KeyError, TypeError:
            raise ValueError("No 'acked_seq' argument found.")
        return acked_seq

    _deserialize_acked_seq = staticmethod(_deserialize_acked_seq)

    def _serialize(self, args):
        args['acked_seq'] = self._acked_seq
        return PlgCommand._serialize(self, args)

    def acked_seq(self):
        return self._acked_seq


class PlgCommandNop(PlgCommand):
    def __init__(self, seq=0):
        PlgCommand.__init__(self, CMD_NAME_NOP, seq)

    def _deserialize(args):
        return PlgCommandNop()

    _deserialize = staticmethod(_deserialize)

    def serialize(self):
        return PlgCommand._serialize(self, {})


class PlgCommandError(PlgCommand):
    def __init__(self, reason, seq=0):
        PlgCommand.__init__(self, CMD_NAME_ERROR, seq)
        self._reason = reason

    def _deserialize(args):
        try:
            reason = args['reason']
        except KeyError, TypeError:
            raise ValueError("No 'reason' argument found.")
        return PlgCommandError(reason)

    _deserialize = staticmethod(_deserialize)

    def serialize(self):
        args = {}
        args['reason'] = self._reason
        return PlgCommand._serialize(self, args)

    def reason(self):
        return self._reason

    def __str__(self):
        return "%s(seq: %d, reason: %s)" % (self._name, self._seq, self._reason)


class PlgCommandSlots(PlgCommand):
    def __init__(self, free, maximum, seq=0):
        PlgCommand.__init__(self, CMD_NAME_SLOTS, seq)
        self._free_slots = free
        self._max_slots = maximum

    def _deserialize(args):
        try:
            free = args['free']
        except ValueError, TypeError:
            raise ValueError("No 'free' argument found.")
        try:
            maximum = args['max']
        except KeyError, TypeError:
            raise ValueError("No 'max' argument found.")
        return PlgCommandSlots(free, maximum)

    _deserialize = staticmethod(_deserialize)

    def serialize(self):
        args = {}
        args['free'] = self._free_slots
        args['max'] = self._max_slots
        return PlgCommand._serialize(self, args)

    def free_slots(self):
        return self._free_slots

    def max_slots(self):
        return self._max_slots

    def __str__(self):
        return "%s(seq: %d, slots: (%d of %d))" % (self._name, self._seq, self._free_slots, self._max_slots)


class PlgCommandTargets(PlgCommand):
    def __init__(self, targets, seq=0):
        PlgCommand.__init__(self, CMD_NAME_TARGETS, seq)
        self._targets = targets

    def _deserialize(args):
        try:
            targets = args['targets']
        except KeyError, TypeError:
            raise ValueError("No 'targets' argument found.")

        # Sanity checking on targets argument
        if type(targets) != type([]):
            raise ValueError("'targets' argument was not a list.")
        for target in targets:
            try:
                distro = target['distro']
                tg = target['target']
                basearch = target['arch']
                repo = target['repo']
                suparch = target['supported_arches']
            except KeyError, e:
                raise ValueError("Required item '%s' not found in a target." % e)

        return PlgCommandTargets(targets)

    _deserialize = staticmethod(_deserialize)

    def serialize(self):
        args = {}
        args['targets'] = self._targets
        return PlgCommand._serialize(self, args)

    def targets(self):
        return self._targets

    def __str__(self):
        return "%s(seq: %d, targets: %s)" % (self._name, self._seq, self._targets)


class PlgCommandNewJobReq(PlgCommand):

    _need_ack = True

    def __init__(self, parent_job, target_dict, srpm_url, seq=0):
        PlgCommand.__init__(self, CMD_NAME_NEW_JOB_REQ, seq)
        self._parent_job = parent_job  # doesn't get serialized
        self._target_dict = target_dict
        self._srpm_url = srpm_url

    def _deserialize(args):
        try:
            target_dict = args['target_dict']
        except KeyError, TypeError:
            raise ValueError("No 'target_dict' argument found.")
        try:
            srpm_url = args['srpm_url']
        except KeyError, TypeError:
            raise ValueError("No 'srpm_url' argument found.")

        return PlgCommandNewJobReq(None, target_dict, srpm_url)

    _deserialize = staticmethod(_deserialize)

    def serialize(self):
        args = {}
        args['target_dict'] = self._target_dict
        args['srpm_url'] = self._srpm_url
        return PlgCommand._serialize(self, args)

    def parent_job(self):
        return self._parent_job

    def target_dict(self):
        return self._target_dict

    def srpm_url(self):
        return self._srpm_url

    def __str__(self):
        return "%s(seq: %d, target_dict: %s, srpm_url: %s)" % (self._name, self._seq, self._target_dict, self._srpm_url)


class PlgCommandNewJobAck(PlgCommandAck):
    def __init__(self, archjob_id, msg, req_seq, seq=0):
        PlgCommandAck.__init__(self, CMD_NAME_NEW_JOB_ACK, req_seq, seq)
        self._archjob_id = archjob_id
        self._msg = msg

    def _deserialize(args):
        try:
            archjob_id = args['archjob_id']
            msg = args['msg']
        except KeyError, TypeError:
            raise ValueError("No 'archjob_id' argument found.")
        req_seq = PlgCommandAck._deserialize_acked_seq(args)
        return PlgCommandNewJobAck(archjob_id, msg, req_seq)

    _deserialize = staticmethod(_deserialize)

    def serialize(self):
        args = {}
        args['archjob_id'] = self._archjob_id
        args['msg'] = self._msg
        return PlgCommandAck._serialize(self, args)

    def archjob_id(self):
        return self._archjob_id

    def message(self):
        return self._msg



Index: HTTPServer.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/HTTPServer.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- HTTPServer.py	27 Mar 2006 15:45:39 -0000	1.12
+++ HTTPServer.py	28 Apr 2006 03:17:40 -0000	1.13
@@ -183,8 +183,11 @@
         self._server.stop()
         t = time.time()
         while not self._stopped:
-            if time.time() > t + 2:
-                break
+            try:
+                if time.time() > t + 2:
+                    break
+            except KeyboardInterrupt:
+                pass
 
 
 ###########################################################


Index: Makefile
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile	22 Jan 2006 02:08:56 -0000	1.11
+++ Makefile	28 Apr 2006 03:17:40 -0000	1.12
@@ -9,18 +9,20 @@
 
 FILES = \
 	ArchUtils.py \
+	AuthedXMLRPCServer.py \
 	BaseConfig.py \
+	Commands.py \
 	CommonErrors.py \
+	daemonize.py \
 	DebugUtils.py \
 	ExecUtils.py \
 	FileDownloader.py \
-	HTTPSURLopener.py \
+    FileUploader.py \
 	HTTPServer.py \
-	AuthedXMLRPCServer.py \
 	SSLCommon.py \
 	SSLConnection.py \
+	URLopener.py \
 	XMLRPCServerProxy.py \
-	daemonize.py \
 	__init__.py
 
 clean:


Index: URLopener.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/URLopener.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- URLopener.py	27 Mar 2006 04:12:11 -0000	1.1
+++ URLopener.py	28 Apr 2006 03:17:40 -0000	1.2
@@ -40,7 +40,7 @@
         buffer += '\r\n'
         buffer += str(v) + '\r\n'
         if sock:
-        	sock.send(buffer)
+            sock.send(buffer)
         l += len(buffer)
     for (k, v) in v_files:
         fd = v
@@ -49,7 +49,7 @@
         buffer=''
         buffer += '--%s\r\n' % boundary
         buffer += 'Content-Disposition: form-data; name="%s"; filename="%s"\r\n' \
-        		  % (k, name)
+                  % (k, name)
         buffer += 'Content-Type: %s\r\n' % get_content_type(name)
         buffer += 'Content-Length: %s\r\n' % file_size
         buffer += '\r\n'
@@ -163,14 +163,14 @@
             raise IOError(e)
 
         if data is not None:
-			if len(v_files) > 0:
-				l = send_data(v_vars, v_files, boundary, h)
-			elif len(v_vars) > 0:
-				# if data is passed as dict ...
-				data = urllib.urlencode(v_vars)
-				h.send(data)
-			else:
-				h.send(data)
+            if len(v_files) > 0:
+                l = send_data(v_vars, v_files, boundary, h)
+            elif len(v_vars) > 0:
+                # if data is passed as dict ...
+                data = urllib.urlencode(v_vars)
+                h.send(data)
+            else:
+                h.send(data)
 
         # close files
         if data is not None:



From fedora-extras-commits at redhat.com  Fri Apr 28 03:17:43 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 27 Apr 2006 20:17:43 -0700
Subject: extras-buildsys/server BuildMaster.py, 1.39, 1.40 Builder.py, 1.33,
	1.34 BuilderManager.py, 1.21, 1.22 Config.py, 1.16,
	1.17 main.py, 1.20, 1.21
Message-ID: <200604280317.k3S3Hio7005379@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5292/server

Modified Files:
	BuildMaster.py Builder.py BuilderManager.py Config.py main.py 
Log Message:
2006-04-27  Dan Williams  <dcbw at redhat.com>

    Commit partial rework of builder<->server communcation.




Index: BuildMaster.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- BuildMaster.py	24 Mar 2006 19:13:41 -0000	1.39
+++ BuildMaster.py	28 Apr 2006 03:17:41 -0000	1.40
@@ -375,9 +375,6 @@
                 have_work = True
             self._archjob_status_updates_lock.release()
 
-        if not have_work and self.builder_manager.have_work(self._paused):
-            have_work = True
-
         return have_work
 
     def get_job(self, uid):
@@ -401,9 +398,6 @@
             # Write update status for jobs to the database
             self._save_job_status()
 
-            if self.builder_manager.have_work(self._paused):
-                self.builder_manager.process(self._paused)
-
             # Clean up jobs that have finished
             self._process_finished_jobs()
 


Index: Builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- Builder.py	20 Mar 2006 12:43:21 -0000	1.33
+++ Builder.py	28 Apr 2006 03:17:41 -0000	1.34
@@ -22,6 +22,7 @@
 import os
 import urllib
 import threading
+from plague import Commands
 from plague import XMLRPCServerProxy
 from plague import CommonErrors
 import OpenSSL
@@ -34,6 +35,152 @@
 SUSPEND_TIMEOUT = 'timeout'
 SUSPEND_HARD_ERROR = 'hard-error'
 
+TYPE_PASSIVE = 1
+TYPE_ACTIVE = 2
+
+
+class Builder(threading.Thread):
+    """ Tracks all jobs on a builder instance """
+
+    def __init__(self, manager, cfg, address, weight, btype):
+        self._manager = manager
+        self._jobs = {}
+        self._free_slots = 0
+        self._num_slots = 0
+        self._address = address
+        self._available = False
+        self._suspend_reason = SUSPEND_NONE
+        self._stop = False
+        self._prepping_jobs = False
+        self._unavail_count = 0
+        self._target_list = []
+        self._when_died = 0
+        self._server_cfg = cfg
+        self._weight = weight
+        self._type = btype
+        self._seq_gen = Commands.SequenceGenerator()
+
+        try:
+            type, rest = urllib.splittype(address)
+            host, ignore = urllib.splithost(rest)
+            host, port = urllib.splitport(host)
+            self._ip = socket.gethostbyname(host)
+        except Exception, e:
+            print "Builder Error(%s): couldn't lookup builder's IP address." % address
+            raise Exception(e)
+
+        threading.Thread.__init__(self)
+        self.setName("Builder: %s" % address)
+
+    def _match_target_dict(self, td1, td2):
+        if td1['distro'] == td2['distro']:
+            if td1['target'] == td2['target']:
+                if td1['repo'] == td2['repo']:
+                    return True
+        return False
+
+    def arches(self, target_dict):
+        for td in self._target_list:
+            if self._match_target_dict(td, target_dict):
+                arches = []
+                for arch in td['supported_arches']:
+                    if not arch in arches:
+                        arches.append(arch)
+                return arches
+        return None
+
+    def can_build_for_target(self, target_dict):
+        for td in self._target_list:
+            if self._match_target_dict(td, target_dict):
+                if target_dict['arch'] in td['supported_arches']:
+                    return True
+        return False
+
+    def address(self):
+        return (self._ip, self._address)
+
+    def available(self):
+        """ Is the builder responding to requests? """
+        return self._available
+
+    def free_slots(self):
+        return self._free_slots
+
+    def weight(self):
+        return self._weight
+
+    def type(self):
+        return self._type
+
+    def stop(self):
+        self._stop = True
+
+    def _handle_builder_suspend(self, reason, msg):
+        for jobid in self._jobs.keys():
+            job = self._jobs[jobid]
+            job.builder_gone()
+            del self._jobs[jobid]
+        self._jobs = {}
+        self._available = False
+        self._suspend_reason = reason
+        self._unavail_count = 0
+        self._prepping_jobs = False
+        self._when_died = time.time()
+
+        # Notify admins
+        print "Suspending builder '%s'.  Reason: %s - %s." % (self._address, reason, msg)
+        subject = "Builder Suspended: %s" % self._address
+        msg = "The builder '%s' was suspended.  Reason: %s - %s." % (self._address, reason, msg)
+        sender = self._server_cfg.get_str("Email", "email_from")
+        for addr in self._server_cfg.get_list("Email", "admin_emails"):
+            EmailUtils.email_result(sender, addr, msg, subject)
+
+    def _handle_builder_reactivate(self, mail=False):
+        self._available = True
+        self._suspend_reason = SUSPEND_NONE
+
+        print "Re-activating builder '%s'." % self._address
+
+        if mail:
+            subject = "Builder Re-activated: %s" % self._address
+            msg = """The builder '%s' was re-activated.
+
+  Suspended at: %s
+  Re-Enabled at: %s
+""" % (self._address, time.ctime(self._when_died), time.ctime(time.time()))
+            sender = self._server_cfg.get_str("Email", "email_from")
+            for addr in self._server_cfg.get_list("Email", "admin_emails"):
+                EmailUtils.email_result(sender, addr, msg, subject)
+        self._when_died = 0
+
+    def any_prepping_jobs(self):
+        return self._prepping_jobs
+
+    def to_dict(self):
+        builder_dict = {}
+
+        addr = self._address
+        # for some reason, splithost doesn't like the protocol
+        # method, you have to give it a string starting with "//"
+        if addr.startswith("http"):
+            idx = addr.find('//')
+            addr = addr[idx:]
+        host_port, path = urllib.splithost(addr)
+        host, port = urllib.splitport(host_port)
+        builder_dict['address'] = host
+
+        arches = []
+        for td in self._target_list:
+            for arch in td['supported_arches']:
+                if not arch in arches:
+                    arches.append(arch)
+        builder_dict['arches'] = arches
+
+        builder_dict['available'] = self._available
+        builder_dict['num_slots'] = self._num_slots
+        builder_dict['free_slots'] = self._free_slots
+        return builder_dict
+
 # HACK: This class is a hack to work around SSL hanging issues,
 # which cause the whole server to grind to a halt
 class BuildingJobsCheck(threading.Thread):
@@ -61,31 +208,21 @@
         self.free_slots = free_slots
         self.done = True
 
-
-class Builder(threading.Thread):
-    """ Tracks all jobs on a builder instance """
+class PassiveBuilder(Builder):
+    """
+    Passive builders are ones that do not initiate connections.  They
+    wait for the server to contact them, and therefore cannot be behind
+    a firewall without having holes punched through it.
+    """
 
     _BUILDER_PING_INTERVAL = 60 * 5      # In seconds
 
-    def __init__(self, manager, cfg, address, weight):
-        self._cur_jobid = None
-        self._manager = manager
-        self._jobs = {}
-        self._free_slots = 0
-        self._num_slots = 0
-        self._address = address
-        self._alive = True
-        self._suspend_reason = SUSPEND_NONE
-        self._stop = False
-        self._prepping_jobs = False
-        self._unavail_count = 0
-        self._target_list = []
+    def __init__(self, manager, cfg, address, weight, btype):
+        Builder.__init__(self, manager, cfg, address, weight, btype)
+
         self._ping_timeout = 0
         self._cur_ping_interval = self._BUILDER_PING_INTERVAL
         self._ping_now = False
-        self._when_died = 0
-        self._server_cfg = cfg
-        self._weight = weight
 
         certs = None
         if self._server_cfg.get_bool("Builders", "use_ssl"):
@@ -97,17 +234,26 @@
         self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._address, certs, timeout=20)
         self._server_lock = threading.Lock()
 
-        threading.Thread.__init__(self)
-        self.setName("Builder: %s" % address)
-
-        (self._alive, target_list) = self._ping_builder()
-        if self._alive:
+        (self._available, target_list) = self._ping_builder()
+        if self._available:
             self._init_builder(target_list)
         else:
             # Treat the builder as timed out and ping it periodically
             self._ping_timeout = time.time()
             self._suspend_reason = SUSPEND_TIMEOUT
 
+    def _ping_builder(self):
+        target_list = []
+        try:
+            target_list = self._server.supported_targets()
+            alive = True
+        except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, OpenSSL.SSL.Error, xmlrpclib.ProtocolError):
+            alive = False
+        except xmlrpclib.Fault, e:
+            print "Builder Error (%s) in _ping_builder(): builder replied '%s'" % (self._address, e)
+            alive = False
+        return (alive, target_list)
+
     def _init_builder(self, target_list):
         self._target_list = target_list
 
@@ -146,7 +292,7 @@
         if bjc.done:
             if not bjc.failed:
                 self._unavail_count = 0
-                self._alive = True
+                self._available = True
                 self._free_slots = bjc.free_slots
                 return bjc.jobs
             else:
@@ -157,55 +303,22 @@
 
         return {}
 
-    def _ping_builder(self):
-        target_list = []
-        try:
-            target_list = self._server.supported_targets()
-            alive = True
-        except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, OpenSSL.SSL.Error, xmlrpclib.ProtocolError):
-            alive = False
-        except xmlrpclib.Fault, e:
-            print "Builder Error (%s) in _ping_builder(): builder replied '%s'" % (self._address, e)
-            alive = False
-        return (alive, target_list)
-
-    def _match_target_dict(self, td1, td2):
-        if td1['distro'] == td2['distro']:
-            if td1['target'] == td2['target']:
-                if td1['repo'] == td2['repo']:
-                    return True
-        return False
-
-    def arches(self, target_dict):
-        for td in self._target_list:
-            if self._match_target_dict(td, target_dict):
-                arches = []
-                for arch in td['supported_arches']:
-                    if not arch in arches:
-                        arches.append(arch)
-                return arches
-        return None
-
-    def can_build_for_target(self, target_dict):
-        for td in self._target_list:
-            if self._match_target_dict(td, target_dict):
-                if target_dict['arch'] in td['supported_arches']:
-                    return True
-        return False
-
-    def address(self):
-        return self._address
+    def ping_asap(self):
+        # Reduce the ping interval to ping the builder right away
+        self._cur_ping_interval = 0
+        self._ping_now = True
 
-    def alive(self):
-        """ Is the builder responding to requests? """
-        return self._alive
+    def _handle_builder_suspend(self, reason, msg):
+        Builder._handle_builder_suspend(self, reason, msg)
+        # Reset current ping interval to default
+        self._cur_ping_interval = self._BUILDER_PING_INTERVAL
+        self._ping_timeout = time.time()
 
-    def free_slots(self):
-        return self._free_slots
+    def _handle_builder_reactivate(self):
+        Builder._handle_builder_reactivate(self)
+        self._ping_timeout = 0
+        self._init_builder(target_list)
 
-    def weight(self):
-        return self._weight
-    
     def start_job(self, par_job, target_dict, srpm_url):
         if not self.available():
             raise RuntimeError
@@ -285,63 +398,12 @@
             pass
         return status
 
-    def stop(self):
-        self._stop = True
-
-    def ping_asap(self):
-        # Reduce the ping interval to ping the builder right away
-        self._cur_ping_interval = 0
-        self._ping_now = True
-
-    def _handle_builder_suspend(self, reason, msg):
-        for jobid in self._jobs.keys():
-            job = self._jobs[jobid]
-            job.builder_gone()
-            del self._jobs[jobid]
-        self._jobs = {}
-        self._alive = False
-        self._suspend_reason = reason
-        self._unavail_count = 0
-        self._prepping_jobs = False
-        self._when_died = time.time()
-
-        # Reset current ping interval to default
-        self._cur_ping_interval = self._BUILDER_PING_INTERVAL
-        self._ping_timeout = time.time()
-
-        # Notify admins
-        print "Suspending builder '%s'.  Reason: %s - %s." % (self._address, reason, msg)
-        subject = "Builder Suspended: %s" % self._address
-        msg = "The builder '%s' was suspended.  Reason: %s - %s." % (self._address, reason, msg)
-        sender = self._server_cfg.get_str("Email", "email_from")
-        for addr in self._server_cfg.get_list("Email", "admin_emails"):
-            EmailUtils.email_result(sender, addr, msg, subject)
-
-    def _handle_builder_reactivate(self, target_list):
-        self._alive = True
-        self._suspend_reason = SUSPEND_NONE
-        self._ping_timeout = 0
-
-        self._init_builder(target_list)
-
-        print "Re-activating builder '%s'." % self._address
-        subject = "Builder Re-activated: %s" % self._address
-        msg = """The builder '%s' was re-activated.
-
-  Suspended at: %s
-  Re-Enabled at: %s
-""" % (self._address, time.ctime(self._when_died), time.ctime(time.time()))
-        sender = self._server_cfg.get_str("Email", "email_from")
-        for addr in self._server_cfg.get_list("Email", "admin_emails"):
-            EmailUtils.email_result(sender, addr, msg, subject)
-        self._when_died = 0
-
     def run(self):
         DebugUtils.registerThreadName(self)
         while not self._stop:
             self._server_lock.acquire()
 
-            if self._alive:
+            if self._available:
                 self._update_building_jobs()
 
                 if self._unavail_count > 2:
@@ -351,12 +413,12 @@
                     # Update status of all archjobs on this builder
                     for j in self._jobs.values():
                         j.process()
-            elif not self._alive and (self._suspend_reason == SUSPEND_TIMEOUT or self._ping_now):
+            elif not self._available and (self._suspend_reason == SUSPEND_TIMEOUT or self._ping_now):
                 # Ping the builder every so often to see if it responds again
                 if time.time() > (self._ping_timeout + self._cur_ping_interval):
                     (alive, target_list) = self._ping_builder()
                     if alive:
-                        self._handle_builder_reactivate(target_list)
+                        self._handle_builder_reactivate()
                     else:
                         # Wait and ping again
                         self._ping_timeout = time.time()
@@ -368,40 +430,131 @@
             self._server_lock.release()
 
             time.sleep(20)
-    
-    def available(self):
-        """
-        Can the builder start a new job right now?
-        """
-        if self._unavail_count > 2 or not self._alive or self.free_slots() <= 0:
-            return False
-        return True
 
-    def any_prepping_jobs(self):
-        return self._prepping_jobs
 
-    def to_dict(self):
-        builder_dict = {}
+class ActiveBuilder(Builder):
+    """
+    Active builders are ones which attempt to contact the build server
+    by themselves.  Therefore, they can be behind a firewall without
+    punching holes through it.
+    """
+
+    _REQUIRED_CONTACT_INTERVAL = 20
+
+    def __init__(self, manager, cfg, address, weight, btype):
+        Builder.__init__(self, manager, cfg, address, weight, btype)
+        self._last_contact = 0
+        self._lock = threading.Lock()
+        self._cmd_queue = []
 
-        addr = self._address
-        # for some reason, splithost doesn't like the protocol
-        # method, you have to give it a string starting with "//"
-        if addr.startswith("http"):
-            idx = addr.find('//')
-            addr = addr[idx:]
-        host_port, path = urllib.splithost(addr)
-        host, port = urllib.splitport(host_port)
-        builder_dict['address'] = host
+    def _init_builder(self, target_list):
+        self._target_list = target_list
 
-        arches = []
-        for td in self._target_list:
-            for arch in td['supported_arches']:
-                if not arch in arches:
-                    arches.append(arch)
-        builder_dict['arches'] = arches
+    def _handle_new_job_ack(self, ack):
+        """Handle a NewJobAck command by finding the original command
+        sent to the builder, removing it from the command queue, and notifying
+        the parent job that this archjob is now in progress."""
+
+        old_cmd = None
+        self._lock.acquire()
+        for old_cmd in self._cmd_queue:
+            if old_cmd.seq() == ack.acked_seq() and isinstance(old_cmd, Commands.PlgCommandNewJobReq):
+                self._cmd_queue.remove(old_cmd)
+                break
+        self._lock.release()
 
-        builder_dict['alive'] = self._alive
-        builder_dict['num_slots'] = self._num_slots
-        builder_dict['free_slots'] = self._free_slots
-        return builder_dict
+        if old_cmd:
+            parent = old_cmd.parent_job()
+            archjob = ArchJob.ArchJob(self, parent, ack.archjob_id(), old_cmd.target_dict())
+            self._jobs[jobid] = archjob
+            parent.add_arch_job(archjob)
+
+    def _dispatch_command(self, cmd):
+        name = cmd.name()
+        if isinstance(cmd, Commands.PlgCommandSlots):
+            self._lock.acquire()
+            self._free_slots = cmd.free_slots()
+            self._num_slots = cmd.max_slots()
+            self._lock.release()
+        elif isinstance(cmd, Commands.PlgCommandTargets):
+            self._lock.acquire()
+            self._target_list = cmd.targets()
+            self._lock.release()
+        elif isinstance(cmd, Commands.PlgCommandNewJobAck):
+            self._handle_new_job_ack(cmd)
+        else:
+            print "Builder Error (%s): unhandled command '%s'" % (self._address, cmd.name())
+
+    def request(self, cmd_list):
+        """Process and respond to an active builder's request.  Called
+        from the BuildMaster's XML-RPC server."""
+
+        self._last_contact = time.time()
+        if not self._available:
+            self._handle_builder_reactivate(cmd_list)
+
+        # Process the commands the builder sent us
+        for cmd in cmd_list:
+            self._dispatch_command(cmd)
+
+        # Grab some work for the builder if any is available
+        new_cmds = []
+        if self._free_slots > 0:
+            req = self._manager.claim_arch_job(self)
+            if req:
+                next_seq = self._seq_gen.next()
+                cmd = Commands.PlgCommandNewJobReq(req['parent'], req['target_dict'], req['srpm_url'], next_seq)
+                new_cmds.append(cmd)
+
+        self._lock.acquire()
+        # Copy command queue
+        self._cmd_queue = self._cmd_queue + new_cmds
+        cmd_list = self._cmd_queue[:]
+        self._lock.release()
+        return cmd_list
+
+    _SLEEP_INTERVAL = 10
+    def run(self):
+        """Main builder loop.  Since the builder contacts us,
+        we don't have to do much here except handle builders
+        going away."""
 
+        DebugUtils.registerThreadName(self)
+        while not self._stop:
+            if not self._available:
+                time.sleep(self._SLEEP_INTERVAL)
+                continue
+
+            self._lock.acquire()
+            if self._unavail_count > 2:
+                self._handle_builder_suspend(SUSPEND_TIMEOUT, "the builder timed out")
+            elif self._last_contact + self._REQUIRED_CONTACT_INTERVAL < time.time():
+                self._unavail_count = self._unavail_count + 1
+            self._lock.release()
+
+            time.sleep(self._SLEEP_INTERVAL)
+
+    def _handle_builder_suspend(self, reason, msg):
+        Builder._handle_builder_suspend(self, reason, msg)
+        self._last_contact = 0
+
+    def _handle_builder_reactivate(self, cmd_list):
+        # Grab an updated target list from the command stream when
+        # the builder contacts us
+        target_list = None
+        for cmd in cmd_list:
+            if isinstance(cmd, Commands.PlgCommandTargets):
+                target_list = cmd.targets()
+        if not target_list:
+            target_list = self._target_list
+
+        mail = True
+        if self._suspend_reason == SUSPEND_NONE:
+            # Don't send mail saying the builder has been reactivated if
+            # this is the first time the builder has contacted us
+            mail = False
+
+        self._lock.acquire()
+        Builder._handle_builder_reactivate(self, mail=mail)
+        self._init_builder(target_list)
+        self._lock.release()


Index: BuilderManager.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- BuilderManager.py	20 Mar 2006 20:05:11 -0000	1.21
+++ BuilderManager.py	28 Apr 2006 03:17:41 -0000	1.22
@@ -24,91 +24,230 @@
 import Builder
 import EmailUtils
 import Config
+import time
+from plague import DebugUtils
+from plague import AuthedXMLRPCServer
+from plague import HTTPServer
+from plague import Commands
+
+
+class AddrCache(object):
+    def __init__(self):
+        self._cache = {}
+
+    def get(self, name):
+        # Expire cache entry if one exists and is old
+        time = ip = None
+        try:
+            (time, ip) = self._cache[name]
+            if time < time.time() - (60 * 60):
+                del self._cache[name]
+                time = ip = None
+        except KeyError:
+            pass
+
+        # Do a lookup and cache it
+        if not ip:
+            try:
+                ip = socket.gethostbyname(name)
+                self._cache[name] = (time.time(), ip)
+            except:
+                pass
+
+        return ip
+
+class AuthedSSLBuilderServer(AuthedXMLRPCServer.AuthedSSLXMLRPCServer):
+    """ SSL XMLRPC server that authenticates builders based on their certificate. """
+    def __init__(self, address, certs, builder_manager):
+        AuthedXMLRPCServer.AuthedSSLXMLRPCServer.__init__(self, address, self.auth_cb, certs)
+        self.authenticator = builder_manager
+        self._addr_cache = AddrCache()
+
+    def auth_cb(self, request, con_addr_pair):
+        peer_cert = request.get_peer_certificate()
+        cert_address = peer_cert.get_subject().commonName        
+        try:
+            (con_address, con_port) = con_addr_pair
+            cert_ip = self._addr_cache.get(cert_address)
+            con_ip = self._addr_cache.get(con_address)
+            builder = self.authenticator.get_builder(cert_ip, con_ip)
+            if builder.type() is not Builder.TYPE_ACTIVE:
+                builder = None
+        except Exception:
+            builder = None
+        return builder
+
+class AuthedBuilderServer(AuthedXMLRPCServer.AuthedXMLRPCServer):
+    """ Authenticates builders based on their IP address. """
+    def __init__(self, address, builder_manager):
+        AuthedXMLRPCServer.AuthedXMLRPCServer.__init__(self, address, self.auth_cb)
+        self.authenticator = builder_manager
+        self._addr_cache = AddrCache()
+
+    def auth_cb(self, request, con_addr_pair):
+        try:
+            (con_address, con_port) = con_addr_pair
+            ip = self._addr_cache.get(con_address)
+            builder = self.authenticator.get_builder(ip, ip)
+            if builder.type() is not Builder.TYPE_ACTIVE:
+                builder = None
+        except Exception:
+            builder = None
+        return builder
+
+
+class BuilderDispatcher(object):
+    def request(self, cmd_list):
+        # Authorize the builder, then pass the request
+        # to the correct builder object
+
+        builder = AuthedXMLRPCServer.get_authinfo()
+        if not builder:
+            cmd = Commands.PlgCommandError("Builder is not authorized")
+            return [cmd.serialize()]
+
+        cmds = Commands.deserialize_command_stream(cmd_list)
+        cmds_for_server = builder.request(cmds)
+        cmd_stream = Commands.serialize_to_command_stream(cmds_for_server)
+        return cmd_stream
 
 
-class BuilderManager:
+class BuilderServerThread(threading.Thread):
     """
-    Tracks individual builder instances.
+    Object to serve active builder requests in a separate thread.
+    Can't block the main BuilderManager object by sitting in
+    serve_forever().
     """
+    def __init__(self, cfg, bm):
+        self._cfg = cfg
+        self._bm = bm
+        self._stopped = False
+        threading.Thread.__init__(self)
+        self.setName("BuilderServerThread")
+
+        hostname = cfg.get_str("General", "hostname")
+        port = cfg.get_int("Active Builders", "xmlrpc_server_port")
+        if cfg.get_bool("Builders", "use_ssl") == True:
+            certs = {}
+            certs['key_and_cert'] = cfg.get_str("SSL", "server_key_and_cert")
+            certs['ca_cert'] = cfg.get_str("SSL", "ca_cert")
+            certs['peer_ca_cert'] = cfg.get_str("SSL", "ca_cert")
+            self._server = AuthedSSLBuilderServer((hostname, port), certs, self._bm)
+        else:
+            self._server = AuthedBuilderServer((hostname, port), self._bm)
+        self._dispatcher = BuilderDispatcher()
+        self._server.register_instance(self._dispatcher)
+
+    def run(self):
+        DebugUtils.registerThreadName(self)
+        self._server.serve_forever()
+        self._stopped = True
+
+    def stop(self):
+        self._server.stop()
+        t = time.time()
+        while not self._stopped:
+            try:
+                if time.time() > t + 2:
+                    break
+            except KeyboardInterrupt:
+                pass
+
+
+class BuilderManager:
+    """ Tracks individual builder instances. """
 
     def __init__(self, cfg):
         self._cfg = cfg
         self._builders_lock = threading.Lock()
 
         self._builders = []
-        self.add_new_builders()
+        any_active = self._load_builders()
+        self._print_builders()
+
+        self._queue_lock = threading.Lock()
+        self._queue = []
+
+        self._xmlrpc_server = None
+        if any_active:
+            # Builder XMLRPC server
+            # Only start it when there are active-type builders listed
+            # in the config file
+            self._xmlrpc_server = BuilderServerThread(cfg, self)
+            self._xmlrpc_server.start()
+
+        # Builder HTTP fileserver
+        hostname = cfg.get_str("General", "hostname")
+        port = cfg.get_int("Active Builders", "file_server_port")
+        http_dir = os.path.join(cfg.get_str("Directories", "server_work_dir"), "srpm_http_dir")
+        certs = {}
+        if cfg.get_bool("Builders", "use_ssl"):
+            certs['key_and_cert'] = cfg.get_str("SSL", "server_key_and_cert")
+            certs['ca_cert'] = cfg.get_str("SSL", "ca_cert")
+            certs['peer_ca_cert'] = cfg.get_str("SSL", "ca_cert")
+        self._srpm_server = HTTPServer.PlgHTTPServerManager((hostname, port), http_dir, certs)
+        self._srpm_server.start()
 
+    def _print_builders(self):
         # Print out builder list when starting up
-        print "\nBuilders:"
+        print "\nAuthorized Builders:"
         print "-" * 90
         for builder in self._builders:
-            string = "  " + builder.address()
-            string = string + " " * (40 - len(builder.address()))
+            (ip, addr) = builder.address()
+            string = "  " + addr
+            string = string + " " * (40 - len(addr))
             builder_dict = builder.to_dict()
             for arch in builder_dict['arches']:
                 string = string + arch + " "
             string = string + " " * (80 - len(string))
             status = "unavailable"
-            if builder_dict['alive']:
-                status = "alive"
+            if builder_dict['available']:
+                status = "available"
             string = string + status
             del builder_dict
             print string
         print ""
 
-        self._queue_lock = threading.Lock()
-        self._queue = []
-
-        self._have_work = False
-
-    def __del__(self):
+    def stop(self):
         for builder in self._builders:
             builder.stop()
-        time.sleep(2)
+        if self._xmlrpc_server:
+            self._xmlrpc_server.stop()
+        self._srpm_server.stop()
 
-    def set_build_master(self, build_master):
-        self._build_master = build_master
-
-    def add_new_builders(self):
+    def _load_builders(self):
         self._builders_lock.acquire()
-
-        tmp_list = self._cfg.builders()
-        prefix = "http://"
-        if self._cfg.get_bool("Builders", "use_ssl") == True:
-            prefix = "https://"
-
-        builder_list = {}
-        for addr in tmp_list.keys():
-            new_addr = addr
-            # Rewrite addresses to match current builder connection method
-            if addr.startswith("http://"):
-                new_addr = addr[7:]
-            elif addr.startswith("https://"):
-                new_addr = addr[8:]
-            if new_addr:
-                builder_list[prefix + new_addr] = tmp_list[addr]
-
-        for address in builder_list.keys():
+        any_active = False
+        builders = self._cfg.builders()
+        for address in builders:
+            (weight, btype) = builders[address]
+            if btype == Builder.TYPE_ACTIVE:
+                any_active = True
             # If the address is already in our _builders list, skip it
             skip = False
             for builder in self._builders:
-                if address == builder.address():
+                (ip, addr) = builder.address()
+                if address == addr:
                     skip = True
+                    break
             if skip == True:
                 continue
 
             # Add the builder to our build list
-            weight = builder_list[address]
-            builder = Builder.Builder(self, self._cfg, address, weight)
+            if btype == Builder.TYPE_ACTIVE:
+                builder = Builder.ActiveBuilder(self, self._cfg, address, weight, btype)
+            else:
+                builder = Builder.PassiveBuilder(self, self._cfg, address, weight, btype)
             builder.start()
             self._builders.append(builder)
-
         self._builders_lock.release()
+        return any_active
 
     def ping_suspended_builders(self):
         self._builders_lock.acquire()
         for builder in self._builders:
-            if not builder.alive():
+            passive = (builder.type() == Builder.TYPE_PASSIVE)
+            if passive and not builder.alive():
                 builder.ping_asap()
         self._builders_lock.release()
 
@@ -118,14 +257,22 @@
             builder_list.append(builder.to_dict())
         return builder_list
 
-    def have_work(self, paused):
-        avail = False
-        for builder in self._builders:
-            if builder.available():
-                avail = True
-        if not paused and len(self._queue) > 0 and avail:
-            return True
-        return self._have_work
+    def get_builder(self, cert_ip, con_ip):
+        self._builders_lock.acquire()
+        builder = None
+
+        # Ensure builder's certificate (if SSL) and
+        # the remote address of its connection are the same
+        if cert_ip == con_ip:
+            # Find matching builder in our authorized builders list
+            for b in self._builders:
+                (ip, addr) = b.address()
+                if cert_ip == ip:
+                    builder = b
+                    break
+
+        self._builders_lock.release()
+        return builder
 
     def _builder_cmp_func(self, builder1, builder2):
         # If both builders have at least one free slot, sort on
@@ -150,62 +297,23 @@
             return -1
         return 1
 
-    def process(self, paused):
-        self._have_work = False
-
-        # Don't queue any new jobs if we are paused
-        if paused:
-            return
-
-        # Deal with new arch jobs
+    def claim_arch_job(self, builder):
+        archjob = None
         self._queue_lock.acquire()
-        new_jobs = {}
         for req in self._queue:
-            parent = req['parent']
-            stage = parent.cur_stage()
-            if stage != 'building' and stage != 'waiting':
-                self._queue.remove(req)
-                continue
-
-            # Find all free builders that could satisfy the request
-            possible_builders = []
-            for builder in self._builders:
-                if builder.available() and builder.can_build_for_target(req['target_dict']):
-                    possible_builders.append(builder)
-
-            # Sort builder list by free slots and weights
-            possible_builders.sort(self._builder_cmp_func)
-            possible_builders.reverse()
-
-            for builder in possible_builders:
-                try:
-                    job = builder.start_job(parent, req['target_dict'], req['srpm_url'])
-                except RuntimeError, e:
-                    print "Builder (%s) couldn't start job %s because: '%s'" % (builder.address(),
-                        req['target_dict'], e)
-                    continue
-
-                if not new_jobs.has_key(parent):
-                    new_jobs[parent] = []
-                new_jobs[parent].append(job)
+            if builder.can_build_for_target(req['target_dict']):
                 self._queue.remove(req)
+                archjob = req
                 break
         self._queue_lock.release()
-
-        # Notify the parent jobs of their new archjobs.  Have to do this outside _queue_lock
-        # for locking reasons
-        for parent in new_jobs.keys():
-            for job in new_jobs[parent]:
-                parent.add_arch_job(job)
-
-        if len(self._queue) > 0:
-            time.sleep(0.25)
+        return archjob
 
     def request_arch_job(self, par_job, target_dict, srpm_url, orphaned):
         req = {}
         req['parent'] = par_job
         req['target_dict'] = target_dict
         req['srpm_url'] = srpm_url
+        req['time_queued'] = time.time()
 
         self._queue_lock.acquire()
         if orphaned:


Index: Config.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Config.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Config.py	20 Mar 2006 18:28:37 -0000	1.16
+++ Config.py	28 Apr 2006 03:17:41 -0000	1.17
@@ -18,6 +18,7 @@
 import fnmatch
 from ConfigParser import ConfigParser
 from plague import BaseConfig
+import Builder
 
 
 def make_target_string(distro, target, repo):
@@ -97,11 +98,21 @@
             except InvalidTargetException, e:
                 print "Error: could not add target %s because: %s" % (f, e)
 
-    def _load_builders(self):
-        if not self._config.has_section("Builders"):
+    def _get_builders_of_type(self, btype):
+        if btype == Builder.TYPE_PASSIVE:
+            section = "Passive Builders"
+        elif btype == Builder.TYPE_ACTIVE:
+            section = "Active Builders"
+        else:
+            raise Exception("Unknown builder type %d" % btype)
+
+        if not self._config.has_section(section):
             return {}
-        items = self._config.items("Builders")
-        builder_list = {}
+        prefix = "http://"
+        if self.get_bool("Builders", "use_ssl") == True:
+            prefix = "https://"
+        items = self._config.items(section)
+        list = {}
         for (tag, builder) in items:
             if not tag.startswith("builder"):
                 continue
@@ -116,8 +127,26 @@
                 weight = int(weight_str)
             except ValueError:
                 weight = 0
-            builder_list[addr] = weight
-        return builder_list
+            # Rewrite addresses to match current builder connection method
+            new_addr = addr
+            if addr.startswith("http://"):
+                new_addr = addr[7:]
+            elif addr.startswith("https://"):
+                new_addr = addr[8:]
+            if new_addr:
+                list[prefix + new_addr] = (weight, btype)
+        return list
+
+    def _load_builders(self):
+        passive_builders = self._get_builders_of_type(Builder.TYPE_PASSIVE)
+        active_builders = self._get_builders_of_type(Builder.TYPE_ACTIVE)
+
+        builders = {}
+        for key in active_builders.keys():
+            builders[key] = active_builders[key]
+        for key in passive_builders.keys():
+            builders[key] = passive_builders[key]
+        return builders
 
     def save_default_config(self, filename=None):
         self.add_section("General")
@@ -139,8 +168,15 @@
 
         self.add_section("Builders")
         self.set_option("Builders", "use_ssl", "yes")
-        self.set_option("Builders", "builder1", "20 127.0.0.1:8888")
-        self.set_option("Builders", "builder2", "0  127.0.0.2:8888")
+
+        self.add_section("Active Builders")
+        self.set_option("Active Builders", "xmlrpc_server_port", "8889")
+        self.set_option("Active Builders", "file_server_port", "8890")
+        self.set_option("Active Builders", "builder1", "20 127.0.0.1")
+        self.set_option("Active Builders", "builder2", "0  127.0.0.2")
+
+        self.add_section("Passive Builders")
+        self.set_option("Passive Builders", "builder1", "20 127.0.0.1:8888")
 
         self.add_section("SSL")
         self.set_option("SSL", "server_key_and_cert", "/etc/plague/server/certs/server_key_and_cert.pem")
@@ -152,7 +188,7 @@
         self.add_section("UI")
         self.set_option("UI", "use_ssl", "yes")
         self.set_option("UI", "client_ca_cert", "/etc/plague/server/certs/ui_ca_cert.pem")
-        self.set_option("UI", "port", "8887")
+        self.set_option("UI", "port", "8888")
         self.set_option("UI", "guest_allowed", "yes")
         self.set_option("UI", "log_url", "http://www.foo.com/logs/")
 


Index: main.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/main.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- main.py	13 Mar 2006 13:05:38 -0000	1.20
+++ main.py	28 Apr 2006 03:17:41 -0000	1.21
@@ -124,9 +124,8 @@
 
     dbm = DBManager.DBManager(cfg)
 
-    builder_manager = BuilderManager.BuilderManager(cfg)
-
     # Create the BuildMaster thread
+    builder_manager = BuilderManager.BuilderManager(cfg)
     bm = BuildMaster.BuildMaster(builder_manager, dbm, cfg)
     bm.start()
 
@@ -148,20 +147,8 @@
         if e[0] == 98:      # Address already in use
             print "Error: couldn't bind to address '%s:%s'.  Is the server already running?" % (hostname, port)
             os._exit(1)
-
     bm_server.register_instance(ui)
 
-    # SRPM fileserver
-    SRPM_SERVER_PORT = 8886
-    http_dir = os.path.join(cfg.get_str("Directories", "server_work_dir"), "srpm_http_dir")
-    srpm_server_certs = {}
-    if cfg.get_bool("Builders", "use_ssl"):
-        srpm_server_certs['key_and_cert'] = cfg.get_str("SSL", "server_key_and_cert")
-        srpm_server_certs['ca_cert'] = cfg.get_str("SSL", "ca_cert")
-        srpm_server_certs['peer_ca_cert'] = cfg.get_str("SSL", "ca_cert")
-    srpm_server = HTTPServer.PlgHTTPServerManager((hostname, SRPM_SERVER_PORT), http_dir, srpm_server_certs)
-    srpm_server.start()
-
     # Create dummy thread just to register main thread's name
     dummy = threading.Thread()
     dummy.setName("MainThread")
@@ -182,9 +169,9 @@
     # Make sure the BuildMaster thread shuts down
     print "Shutting down..."
     bm.stop()
-    srpm_server.stop()
     if use_tbs:
         tbs.stop()
+    builder_manager.stop()
 
     if opts.pidfile:
         os.unlink(opts.pidfile)



From fedora-extras-commits at redhat.com  Fri Apr 28 03:17:37 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 27 Apr 2006 20:17:37 -0700
Subject: extras-buildsys ChangeLog,1.183,1.184
Message-ID: <200604280318.k3S3I7Q9005385@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5292

Modified Files:
	ChangeLog 
Log Message:
2006-04-27  Dan Williams  <dcbw at redhat.com>

    Commit partial rework of builder<->server communcation.




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- ChangeLog	27 Mar 2006 15:45:39 -0000	1.183
+++ ChangeLog	28 Apr 2006 03:17:34 -0000	1.184
@@ -1,3 +1,7 @@
+2006-04-27  Dan Williams  <dcbw at redhat.com>
+
+    Commit partial rework of builder<->server communcation.
+
 2006-03-27  Dan Williams  <dcbw at redhat.com>
 
     * common/HTTPServer.py



From fedora-extras-commits at redhat.com  Fri Apr 28 06:06:20 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu, 27 Apr 2006 23:06:20 -0700
Subject: owners owners.list,1.910,1.911
Message-ID: <200604280606.k3S66MRL012202@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12181

Modified Files:
	owners.list 
Log Message:
reassign scim-pinyin to qshen



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.910
retrieving revision 1.911
diff -u -r1.910 -r1.911
--- owners.list	28 Apr 2006 02:40:37 -0000	1.910
+++ owners.list	28 Apr 2006 06:06:20 -0000	1.911
@@ -1382,7 +1382,7 @@
 Fedora Extras|scim-hangul|SCIM IMEngine for Korean Hangul|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-input-pad|SCIM On-screen Input Pad|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|scim-m17n|m17n-lib input method for SCIM|petersen at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|scim-pinyin|Chinese input method for SCIM|petersen at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|scim-pinyin|Chinese input method for SCIM|qshen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-qtimm|SCIM Qt Input Method module|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-skk|Scim-skk is a SCIM IMEngine module for skk to support Japanese input|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|scim-tables|SCIM Generic Table IMEngine and its data files|petersen at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Apr 28 07:21:46 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Fri, 28 Apr 2006 00:21:46 -0700
Subject: rpms/gurlchecker/FC-5 gurlchecker.spec,1.12,1.13
Message-ID: <200604280721.k3S7LmcM014601@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gurlchecker/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14554/FC-5

Modified Files:
	gurlchecker.spec 
Log Message:
missing build depend



Index: gurlchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/FC-5/gurlchecker.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gurlchecker.spec	27 Apr 2006 23:26:21 -0000	1.12
+++ gurlchecker.spec	28 Apr 2006 07:21:46 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           gurlchecker
 Version:        0.8.3
-Release:	3%{?dist}
+Release:	4%{?dist}
 
 Summary:        A Gnome link validity checker
 
@@ -13,8 +13,7 @@
 Requires:	gnet2, gnutls
 
 BuildRequires:	desktop-file-utils, gnet2-devel, gettext, gnutls-devel
-BuildRequires:  libgnomeui-devel >= 2.0
-BuildRequires:  libglade2-devel >= 2.0
+BuildRequires:  docbook-utils, libgnomeui-devel >= 2.0, libglade2-devel >= 2.0
 
 %description
 gURLChecker is a Gnome tool that can check links on a single web page
@@ -49,6 +48,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-4
+- missed docbookutils
+
 * Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-3
 - missed some build requires.
 



From fedora-extras-commits at redhat.com  Fri Apr 28 07:21:47 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Fri, 28 Apr 2006 00:21:47 -0700
Subject: rpms/gurlchecker/devel gurlchecker.spec,1.12,1.13
Message-ID: <200604280721.k3S7Lnhb014605@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gurlchecker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14554/devel

Modified Files:
	gurlchecker.spec 
Log Message:
missing build depend



Index: gurlchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/devel/gurlchecker.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gurlchecker.spec	27 Apr 2006 23:26:27 -0000	1.12
+++ gurlchecker.spec	28 Apr 2006 07:21:47 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           gurlchecker
 Version:        0.8.3
-Release:	3%{?dist}
+Release:	4%{?dist}
 
 Summary:        A Gnome link validity checker
 
@@ -13,8 +13,7 @@
 Requires:	gnet2, gnutls
 
 BuildRequires:	desktop-file-utils, gnet2-devel, gettext, gnutls-devel
-BuildRequires:  libgnomeui-devel >= 2.0
-BuildRequires:  libglade2-devel >= 2.0
+BuildRequires:  docbook-utils, libgnomeui-devel >= 2.0, libglade2-devel >= 2.0
 
 %description
 gURLChecker is a Gnome tool that can check links on a single web page
@@ -49,6 +48,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-4
+- missed docbookutils
+
 * Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-3
 - missed some build requires.
 



From fedora-extras-commits at redhat.com  Fri Apr 28 07:21:45 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Fri, 28 Apr 2006 00:21:45 -0700
Subject: rpms/gurlchecker/FC-4 gurlchecker.spec,1.11,1.12
Message-ID: <200604280721.k3S7LlW7014599@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gurlchecker/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14554/FC-4

Modified Files:
	gurlchecker.spec 
Log Message:
missing build depend



Index: gurlchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/FC-4/gurlchecker.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gurlchecker.spec	27 Apr 2006 23:26:20 -0000	1.11
+++ gurlchecker.spec	28 Apr 2006 07:21:45 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           gurlchecker
 Version:        0.8.3
-Release:	3%{?dist}
+Release:	4%{?dist}
 
 Summary:        A Gnome link validity checker
 
@@ -13,8 +13,7 @@
 Requires:	gnet2, gnutls
 
 BuildRequires:	desktop-file-utils, gnet2-devel, gettext, gnutls-devel
-BuildRequires:  libgnomeui-devel >= 2.0
-BuildRequires:  libglade2-devel >= 2.0
+BuildRequires:  docbook-utils, libgnomeui-devel >= 2.0, libglade2-devel >= 2.0
 
 %description
 gURLChecker is a Gnome tool that can check links on a single web page
@@ -49,6 +48,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-4
+- missed docbookutils
+
 * Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-3
 - missed some build requires.
 



From fedora-extras-commits at redhat.com  Fri Apr 28 07:51:42 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Fri, 28 Apr 2006 00:51:42 -0700
Subject: fedora-security/audit fc4,1.222,1.223 fc5,1.136,1.137
Message-ID: <200604280751.k3S7pgrI014806@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14786

Modified Files:
	fc4 fc5 
Log Message:
updates from yesterday



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- fc4	27 Apr 2006 17:19:40 -0000	1.222
+++ fc4	28 Apr 2006 07:51:39 -0000	1.223
@@ -1,13 +1,13 @@
-Up to date CVE as of CVE email 20060426
-Up to date FC4 as of 20060426
+Up to date CVE as of CVE email 20060427
+Up to date FC4 as of 20060427
 
 ** are items that need attention
 
 CVE-2006-2071 version (kernel, fixed 2.6.16.6) [since FEDORA-2006-423]
 CVE-2006-2057 ** firefox
-CVE-2006-2026 VULNERABLE (libtiff, fixed 3.8.1) #189934
-CVE-2006-2025 VULNERABLE (libtiff, fixed 3.8.1) #189934
-CVE-2006-2024 VULNERABLE (libtiff, fixed 3.8.1) #189934
+CVE-2006-2026 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-474]
+CVE-2006-2025 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-474]
+CVE-2006-2024 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-474]
 CVE-2006-1991 VULNERABLE (php)
 CVE-2006-1990 VULNERABLE (php)
 CVE-2006-1942 ** firefox


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- fc5	27 Apr 2006 17:19:40 -0000	1.136
+++ fc5	28 Apr 2006 07:51:39 -0000	1.137
@@ -1,13 +1,13 @@
-Up to date CVE as of CVE email 20060426
-Up to date FC5 as of 20060426
+Up to date CVE as of CVE email 20060427
+Up to date FC5 as of 20060427
 
 ** are items that need attention
 
 CVE-2006-2071 version (kernel, fixed 2.6.16.6) [since FEDORA-2006-421]
 CVE-2006-2057 ** firefox
-CVE-2006-2026 VULNERABLE (libtiff, fixed 3.8.1) #189934
-CVE-2006-2025 VULNERABLE (libtiff, fixed 3.8.1) #189934
-CVE-2006-2024 VULNERABLE (libtiff, fixed 3.8.1) #189934
+CVE-2006-2026 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-473]
+CVE-2006-2025 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-473]
+CVE-2006-2024 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-473]
 CVE-2006-1991 VULNERABLE (php)
 CVE-2006-1990 VULNERABLE (php)
 CVE-2006-1942 ** firefox



From fedora-extras-commits at redhat.com  Fri Apr 28 07:59:55 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 28 Apr 2006 00:59:55 -0700
Subject: rpms/wings - New directory
Message-ID: <200604280759.k3S7xvX7014912@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/wings
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14886/wings

Log Message:
Directory /cvs/extras/rpms/wings added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 28 07:59:56 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 28 Apr 2006 00:59:56 -0700
Subject: rpms/wings/devel - New directory
Message-ID: <200604280759.k3S7xwsg014915@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/wings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14886/wings/devel

Log Message:
Directory /cvs/extras/rpms/wings/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 28 08:00:12 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 28 Apr 2006 01:00:12 -0700
Subject: rpms/wings Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604280800.k3S80EeB014968@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/wings
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14940

Added Files:
	Makefile import.log 
Log Message:
Setup of module wings


--- NEW FILE Makefile ---
# Top level Makefile for module wings
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 28 08:00:13 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 28 Apr 2006 01:00:13 -0700
Subject: rpms/wings/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200604280800.k3S80F8s014971@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/wings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14940/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module wings


--- 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 Apr 28 08:03:26 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 28 Apr 2006 01:03:26 -0700
Subject: rpms/wings/devel wings.png, NONE, 1.1 wings.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604280803.k3S83T9l017203@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/wings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17167/devel

Modified Files:
	.cvsignore sources 
Added Files:
	wings.png wings.spec 
Log Message:
auto-import wings-0.98.32b-5.fc5 on branch devel from wings-0.98.32b-5.fc5.src.rpm


--- NEW FILE wings.spec ---
Name:           wings
Version:        0.98.32b
Release:        5%{?dist}
Summary:        3D Subdivision Modeler

Group:          Applications/Multimedia
License:        Distributable
URL:            http://www.wings3d.com
Source0:	http://prdownloads.sourceforge.net/wings/wings-0.98.32b.tar.bz2
Source1:	http://prdownloads.sourceforge.net/wings/wings3d_manual1.6.1.pdf
Source2:	http://www.midcoast.com.au/~rgcoy/downloads/wingspov-0.98.28_v1.tgz
Source3:	wings.png
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  erlang
BuildRequires:	erlang-esdl-devel
BuildRequires:	libGL-devel
BuildRequires:	libGLU-devel
BuildRequires:  desktop-file-utils
Requires:	erlang
Requires:	erlang-esdl

%description
Wings 3D is a subdivision modeler with an user interface that is easy
to use for both beginners and advanced users (inspired by Nendo and
Mirai from Izware). This package also includes the Povray exporter
plug-in.


%package docs
Group:		Applications/Multimedia
Summary:	Documentation for Wings 3D
Requires:	%{name} = %{version}-%{release}

%description docs
Documentation for Wings 3D.


%prep
%setup -q
cp %{SOURCE1} .
tar zxf %{SOURCE2}


%build
# %%{?_smp_mflags} breaks the build
make


%install
%define wingsdir $RPM_BUILD_ROOT%{_libdir}/wings
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p %{wingsdir}
cp -rf ebin %{wingsdir}
cp -rf plugins %{wingsdir}
cp -rf fonts %{wingsdir}

find $RPM_BUILD_ROOT -name '.cvsignore' | xargs rm -rf
find $RPM_BUILD_ROOT -name 'README' | xargs rm -f

cat > $RPM_BUILD_ROOT%{_bindir}/wings <<EOF
#!/bin/sh
exec erl -pa %{_libdir}/wings/ebin -run wings_start start_halt
EOF
chmod 755 $RPM_BUILD_ROOT%{_bindir}/wings

cat > wings.desktop <<EOF
[Desktop Entry]
Name=Wings 3D
Comment=Wings 3D polygon mesh modeler
Exec=wings
Icon=wings.png
Terminal=true
Type=Application
Encoding=UTF-8
X-Desktop-File-Install-Version=0.9
StartupNotify=true
StartupWMClass=Wings 3D
EOF

desktop-file-install --vendor fedora \
    --add-category X-Fedora \
    --add-category Application \
    --add-category Graphics \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
    wings.desktop

mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
cp %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/pixmaps


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/wings
%{_libdir}/wings
%{_datadir}/applications/*
%{_datadir}/pixmaps/*
%doc README license.terms AUTHORS


%files docs
%defattr(-,root,root,-)
%doc wings3d_manual1.6.1.pdf


%changelog
* Thu Apr 27 2006 Gerard Milmeister <gemi at bluewin.ch> - 0.98.32b-5
- split off docs package

* Tue Apr 25 2006 Gerard Milmeister <gemi at bluewin.ch> - 0.98.32b-3
- build against erlang-esdl-devel

* Sun Dec 18 2005 Gerard Milmeister <gemi at bluewin.ch> - 0.98.32b-1
- New Version 0.98.32b

* Sun Mar  6 2005 Gerard Milmeister <gemi at bluewin.ch> - 0.98.27b-1
- New Version 0.98.27b

* Sun Feb 13 2005 Gerard Milmeister <gemi at bluewin.ch> - 0:0.98.27a-1
- New Version 0.98.27a

* Mon Dec 27 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:0.98.26-0.fdr.1.b
- New Version 0.98.26b

* Sat Jul 17 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:0.98.24-0.fdr.1
- New Version 0.98.24

* Fri Jun  4 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:0.98.23a-0.fdr.1
- New Version 0.98.23a

* Thu May  6 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:0.98.22c-0.fdr.1
- New Version 0.98.22c

* Sun Apr 11 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:0.98.20c-0.fdr.1
- First Fedora release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wings/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Apr 2006 08:00:13 -0000	1.1
+++ .cvsignore	28 Apr 2006 08:03:26 -0000	1.2
@@ -0,0 +1,3 @@
+wings-0.98.32b.tar.bz2
+wings3d_manual1.6.1.pdf
+wingspov-0.98.28_v1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wings/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Apr 2006 08:00:13 -0000	1.1
+++ sources	28 Apr 2006 08:03:26 -0000	1.2
@@ -0,0 +1,3 @@
+11a55f0eb81261a84a29d05dd4afa999  wings-0.98.32b.tar.bz2
+c01d19b4be79b647b8605dd32753da3a  wings3d_manual1.6.1.pdf
+791ec96aefb43ca63800324a115e99c6  wingspov-0.98.28_v1.tgz



From fedora-extras-commits at redhat.com  Fri Apr 28 08:03:26 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 28 Apr 2006 01:03:26 -0700
Subject: rpms/wings import.log,1.1,1.2
Message-ID: <200604280803.k3S83wQG017211@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/wings
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17167

Modified Files:
	import.log 
Log Message:
auto-import wings-0.98.32b-5.fc5 on branch devel from wings-0.98.32b-5.fc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/wings/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	28 Apr 2006 08:00:12 -0000	1.1
+++ import.log	28 Apr 2006 08:03:26 -0000	1.2
@@ -0,0 +1 @@
+wings-0_98_32b-5_fc5:HEAD:wings-0.98.32b-5.fc5.src.rpm:1146211394



From fedora-extras-commits at redhat.com  Fri Apr 28 08:07:24 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 28 Apr 2006 01:07:24 -0700
Subject: rpms/abcm2ps/devel .cvsignore, 1.16, 1.17 abcm2ps.spec, 1.18,
	1.19 sources, 1.16, 1.17
Message-ID: <200604280807.k3S87Qec017316@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17295

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 4.12.15


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	18 Apr 2006 21:45:38 -0000	1.16
+++ .cvsignore	28 Apr 2006 08:07:24 -0000	1.17
@@ -1,2 +1,2 @@
-abcm2ps-4.12.14.tar.gz
+abcm2ps-4.12.15.tar.gz
 abcplus_en-1.0.4.zip


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/abcm2ps.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- abcm2ps.spec	18 Apr 2006 21:45:38 -0000	1.18
+++ abcm2ps.spec	28 Apr 2006 08:07:24 -0000	1.19
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        4.12.14
+Version:        4.12.15
 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-4.12.14.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-4.12.15.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
+* Fri Apr 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.15-1
+- new version 4.12.15
+
 * Tue Apr 18 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.14-1
 - new version 4.12.14
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	18 Apr 2006 21:45:38 -0000	1.16
+++ sources	28 Apr 2006 08:07:24 -0000	1.17
@@ -1,2 +1,2 @@
-a22f4954cb3e74d04a0be34f163cc434  abcm2ps-4.12.14.tar.gz
+ebea415b7d1b82d054227343e027f820  abcm2ps-4.12.15.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Fri Apr 28 08:09:03 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 28 Apr 2006 01:09:03 -0700
Subject: rpms/abcm2ps/FC-5 .cvsignore, 1.16, 1.17 abcm2ps.spec, 1.18,
	1.19 sources, 1.16, 1.17
Message-ID: <200604280809.k3S895WD017409@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17366/FC-5

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 4.12.15


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-5/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	18 Apr 2006 21:48:58 -0000	1.16
+++ .cvsignore	28 Apr 2006 08:09:03 -0000	1.17
@@ -1,2 +1,2 @@
-abcm2ps-4.12.14.tar.gz
+abcm2ps-4.12.15.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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- abcm2ps.spec	18 Apr 2006 21:48:58 -0000	1.18
+++ abcm2ps.spec	28 Apr 2006 08:09:03 -0000	1.19
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        4.12.14
+Version:        4.12.15
 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-4.12.14.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-4.12.15.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
+* Fri Apr 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.15-1
+- new version 4.12.15
+
 * Tue Apr 18 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.14-1
 - new version 4.12.14
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-5/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	18 Apr 2006 21:48:58 -0000	1.16
+++ sources	28 Apr 2006 08:09:03 -0000	1.17
@@ -1,2 +1,2 @@
-a22f4954cb3e74d04a0be34f163cc434  abcm2ps-4.12.14.tar.gz
+ebea415b7d1b82d054227343e027f820  abcm2ps-4.12.15.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Fri Apr 28 08:09:02 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 28 Apr 2006 01:09:02 -0700
Subject: rpms/abcm2ps/FC-4 .cvsignore, 1.16, 1.17 abcm2ps.spec, 1.17,
	1.18 sources, 1.16, 1.17
Message-ID: <200604280809.k3S894Ld017403@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17366/FC-4

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 4.12.15


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-4/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	18 Apr 2006 21:48:57 -0000	1.16
+++ .cvsignore	28 Apr 2006 08:09:02 -0000	1.17
@@ -1,2 +1,2 @@
-abcm2ps-4.12.14.tar.gz
+abcm2ps-4.12.15.tar.gz
 abcplus_en-1.0.4.zip


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-4/abcm2ps.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- abcm2ps.spec	18 Apr 2006 21:48:57 -0000	1.17
+++ abcm2ps.spec	28 Apr 2006 08:09:02 -0000	1.18
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        4.12.14
+Version:        4.12.15
 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-4.12.14.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-4.12.15.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
+* Fri Apr 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.15-1
+- new version 4.12.15
+
 * Tue Apr 18 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.14-1
 - new version 4.12.14
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-4/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	18 Apr 2006 21:48:57 -0000	1.16
+++ sources	28 Apr 2006 08:09:02 -0000	1.17
@@ -1,2 +1,2 @@
-a22f4954cb3e74d04a0be34f163cc434  abcm2ps-4.12.14.tar.gz
+ebea415b7d1b82d054227343e027f820  abcm2ps-4.12.15.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Fri Apr 28 08:27:03 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 28 Apr 2006 01:27:03 -0700
Subject: owners owners.list,1.911,1.912
Message-ID: <200604280827.k3S8R5hO017574@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17557

Modified Files:
	owners.list 
Log Message:
added wings


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.911
retrieving revision 1.912
diff -u -r1.911 -r1.912
--- owners.list	28 Apr 2006 06:06:20 -0000	1.911
+++ owners.list	28 Apr 2006 08:27:03 -0000	1.912
@@ -1572,6 +1572,7 @@
 Fedora Extras|WindowMaker|A fast, feature rich Window manager|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wine|A Windows 16/32/64 bit emulator|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wine-docs|Documentation for wine|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|wings|3D Subdivision Modeler|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|wlassistant|Wireless network management tool|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 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|



From fedora-extras-commits at redhat.com  Fri Apr 28 09:23:46 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Fri, 28 Apr 2006 02:23:46 -0700
Subject: rpms/proftpd/devel proftpd-1.3.0-rpath.patch, NONE, 1.1 proftpd.spec,
	1.14, 1.15
Message-ID: <200604280923.k3S9NmiU019923@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/proftpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19901

Modified Files:
	proftpd.spec 
Added Files:
	proftpd-1.3.0-rpath.patch 
Log Message:
Mark some more config files as noreplace, fix nasty -rpath (#190122).


proftpd-1.3.0-rpath.patch:

--- NEW FILE proftpd-1.3.0-rpath.patch ---
diff -Naupr proftpd-1.3.0.orig/configure proftpd-1.3.0/configure
--- proftpd-1.3.0.orig/configure	2006-03-09 19:20:04.000000000 +0100
+++ proftpd-1.3.0.orig/configure	2006-03-09 19:20:04.000000000 +0100
@@ -19660,7 +19660,7 @@ if test "${enable_dso+set}" = set; then
       ac_build_core_modules="$ac_build_core_modules modules/mod_dso.o"
       ac_build_addl_includes="$INCLTDL $ac_build_addl_includes"
 
-      MAIN_LDFLAGS="-L\$(top_srcdir)/lib/libltdl -dlopen self -export-dynamic -rpath \$(DESTDIR)\$(sbindir)"
+      MAIN_LDFLAGS="-L\$(top_srcdir)/lib/libltdl -dlopen self -export-dynamic"
       MAIN_LIBS="\$(LIBLTDL)"
 
       MODULE_LDFLAGS="-avoid-version -export-dynamic -module"
diff -Naupr proftpd-1.3.0.orig/configure.in proftpd-1.3.0/configure.in
--- proftpd-1.3.0.orig/configure.in	2006-03-09 19:12:35.000000000 +0100
+++ proftpd-1.3.0.orig/configure.in	2006-03-09 19:12:35.000000000 +0100
@@ -372,7 +372,7 @@ AC_ARG_ENABLE(dso,
       ac_build_core_modules="$ac_build_core_modules modules/mod_dso.o"
       ac_build_addl_includes="$INCLTDL $ac_build_addl_includes"
 
-      MAIN_LDFLAGS="-L\$(top_srcdir)/lib/libltdl -dlopen self -export-dynamic -rpath \$(DESTDIR)\$(sbindir)"
+      MAIN_LDFLAGS="-L\$(top_srcdir)/lib/libltdl -dlopen self -export-dynamic"
       MAIN_LIBS="\$(LIBLTDL)"
 
       MODULE_LDFLAGS="-avoid-version -export-dynamic -module"


Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- proftpd.spec	21 Apr 2006 17:05:11 -0000	1.14
+++ proftpd.spec	28 Apr 2006 09:23:46 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
 Version: 1.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
@@ -12,6 +12,7 @@
 Source4: proftpd.logrotate
 Source5: welcome.msg
 Source6: proftpd.pam
+Patch0: proftpd-1.3.0-rpath.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: pam >= 0.59
 Requires(post): /sbin/chkconfig
@@ -62,6 +63,7 @@
 
 %prep
 %setup
+%patch0 -p1 -b .rpath
 
 
 %build
@@ -144,8 +146,8 @@
 %config(noreplace) %{_sysconfdir}/proftpd.conf
 %config(noreplace) %{_sysconfdir}/xinetd.d/xproftpd
 %config %{_sysconfdir}/ftpusers
-%config %{_sysconfdir}/pam.d/proftpd
-%config %{_sysconfdir}/logrotate.d/proftpd
+%config(noreplace) %{_sysconfdir}/pam.d/proftpd
+%config(noreplace) %{_sysconfdir}/logrotate.d/proftpd
 %{_sysconfdir}/rc.d/init.d/proftpd
 %{_mandir}/*/*
 %{_bindir}/*
@@ -177,6 +179,11 @@
 
 
 %changelog
+* Fri Apr 28 2006 Matthias Saou <http://freshrpms.net/> 1.3.0-2
+- Mark pam.d and logrotate.d config files as noreplace.
+- Include patch to remove -rpath to DESTDIR/usr/sbin/ in the proftpd binary
+  when DSO is enabled (#190122).
+
 * Fri Apr 21 2006 Matthias Saou <http://freshrpms.net/> 1.3.0-1
 - Update to 1.3.0 final.
 - Remove no longer needed PostgreSQL and OpenSSL detection workarounds.



From fedora-extras-commits at redhat.com  Fri Apr 28 09:32:50 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 28 Apr 2006 02:32:50 -0700
Subject: rpms/Glide3/devel Glide3.spec,1.15,1.16
Message-ID: <200604280932.k3S9WqHb020012@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/Glide3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19995

Modified Files:
	Glide3.spec 
Log Message:
* Fri Apr 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 20050815-4
- Add scripts to set SELinux type for the .so files to textrel_shlib_t
  on i386, because of the non PIC asm used on i386 (bz 187484).



Index: Glide3.spec
===================================================================
RCS file: /cvs/extras/rpms/Glide3/devel/Glide3.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Glide3.spec	17 Feb 2006 09:48:49 -0000	1.15
+++ Glide3.spec	28 Apr 2006 09:32:50 -0000	1.16
@@ -1,29 +1,29 @@
-Name:    Glide3
-Version: 20050815
-Release: 3%{?dist}
-Summary: Glide3 runtime for the 3Dfx Voodoo family of cards
-# Glide3 is x86/alpha/ia64/x86_64 only, ia64 is untested
-ExclusiveArch: %{ix86} alpha ia64 x86_64
-
-Group:   User Interface/X Hardware Support
-License: 3DFX GLIDE Source Code General Public License
-URL:     http://glide.sourceforge.net
-
+Name:             Glide3
+Version:          20050815
+Release:          4%{?dist}
+Summary:          Glide3 runtime for the 3Dfx Voodoo family of cards
+#                 Glide3 is x86/alpha/ia64/x86_64 only, ia64 is untested
+ExclusiveArch:    %{ix86} alpha ia64 x86_64
+Group:            User Interface/X Hardware Support
+License:          3DFX GLIDE Source Code General Public License
+URL:              http://glide.sourceforge.net
 # Create the Glide3 tarball by using:
 #   cvs -d :pserver:anonymous at cvs.glide.sourceforge.net:/cvsroot/glide \
 #     co -r glide-devel-branch Glide3
 #   pushd Glide3 ; find . -name CVS -type d |xargs rm -rf
 #   find . -name .cvsignore | xargs rm ; popd
 #   tar jcf Glide3-$(date +"%Y%m%d").tar.bz2 Glide3/
-Source0: %{name}-%{version}.tar.bz2
-Source1: glidelink.c
-Patch0: Glide3-warn.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libX11-devel xorg-x11-proto-devel 
+Source0:          %{name}-%{version}.tar.bz2
+Source1:          glidelink.c
+Patch0:           Glide3-warn.patch
+BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:    libX11-devel xorg-x11-proto-devel 
 # Add these to try the experimental DGA support and add DGA=1 to %{glide_flags}
-# BuildRequires: libXxf86dga-devel libXxf86vm-devel
+# BuildRequires:  libXxf86dga-devel libXxf86vm-devel
 %ifarch %{ix86}
-BuildRequires: nasm
+BuildRequires:    nasm
+Requires(post):   policycoreutils /sbin/ldconfig
+Requires(postun): policycoreutils /sbin/ldconfig
 %endif
 
 %description
@@ -107,9 +107,27 @@
 rm -rf $RPM_BUILD_ROOT
 
 
+%ifarch %{ix86}
+%post
+/sbin/ldconfig
+# Set SELinux file_context in the policy
+semanage fcontext -a -t textrel_shlib_t '%{_libdir}/libglide3-v.\.so' 2>/dev/null || :
+# Actually change the context
+chcon -t textrel_shlib_t %{_libdir}/libglide3-v?.so || :
+%else
 %post -p /sbin/ldconfig
+%endif
 
+%ifarch %{ix86}
+%postun
+/sbin/ldconfig
+# SELinux support
+if [ $1 -eq 0 ]; then  # final removal
+  semanage fcontext -d -t textrel_shlib_t '%{_libdir}/libglide3-v.\.so' 2>/dev/null || :
+fi
+%else
 %postun -p /sbin/ldconfig
+%endif
 
 
 %files
@@ -132,6 +150,10 @@
 
 
 %changelog
+* Fri Apr 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 20050815-4
+- Add scripts to set SELinux type for the .so files to textrel_shlib_t
+  on i386, because of the non PIC asm used on i386 (bz 187484).
+
 * Mon Feb 13 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 20050815-3
 - Bump release and rebuild for new gcc4.1 and glibc.
 - add %%{?dist} for consistency with my other packages



From fedora-extras-commits at redhat.com  Fri Apr 28 09:33:49 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 28 Apr 2006 02:33:49 -0700
Subject: rpms/Glide3/FC-5 Glide3.spec,1.15,1.16
Message-ID: <200604280933.k3S9XpPd020073@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/Glide3/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20056

Modified Files:
	Glide3.spec 
Log Message:
* Fri Apr 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 20050815-4
- Add scripts to set SELinux type for the .so files to textrel_shlib_t
  on i386, because of the non PIC asm used on i386 (bz 187484).



Index: Glide3.spec
===================================================================
RCS file: /cvs/extras/rpms/Glide3/FC-5/Glide3.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Glide3.spec	17 Feb 2006 09:48:49 -0000	1.15
+++ Glide3.spec	28 Apr 2006 09:33:49 -0000	1.16
@@ -1,29 +1,29 @@
-Name:    Glide3
-Version: 20050815
-Release: 3%{?dist}
-Summary: Glide3 runtime for the 3Dfx Voodoo family of cards
-# Glide3 is x86/alpha/ia64/x86_64 only, ia64 is untested
-ExclusiveArch: %{ix86} alpha ia64 x86_64
-
-Group:   User Interface/X Hardware Support
-License: 3DFX GLIDE Source Code General Public License
-URL:     http://glide.sourceforge.net
-
+Name:             Glide3
+Version:          20050815
+Release:          4%{?dist}
+Summary:          Glide3 runtime for the 3Dfx Voodoo family of cards
+#                 Glide3 is x86/alpha/ia64/x86_64 only, ia64 is untested
+ExclusiveArch:    %{ix86} alpha ia64 x86_64
+Group:            User Interface/X Hardware Support
+License:          3DFX GLIDE Source Code General Public License
+URL:              http://glide.sourceforge.net
 # Create the Glide3 tarball by using:
 #   cvs -d :pserver:anonymous at cvs.glide.sourceforge.net:/cvsroot/glide \
 #     co -r glide-devel-branch Glide3
 #   pushd Glide3 ; find . -name CVS -type d |xargs rm -rf
 #   find . -name .cvsignore | xargs rm ; popd
 #   tar jcf Glide3-$(date +"%Y%m%d").tar.bz2 Glide3/
-Source0: %{name}-%{version}.tar.bz2
-Source1: glidelink.c
-Patch0: Glide3-warn.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libX11-devel xorg-x11-proto-devel 
+Source0:          %{name}-%{version}.tar.bz2
+Source1:          glidelink.c
+Patch0:           Glide3-warn.patch
+BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:    libX11-devel xorg-x11-proto-devel 
 # Add these to try the experimental DGA support and add DGA=1 to %{glide_flags}
-# BuildRequires: libXxf86dga-devel libXxf86vm-devel
+# BuildRequires:  libXxf86dga-devel libXxf86vm-devel
 %ifarch %{ix86}
-BuildRequires: nasm
+BuildRequires:    nasm
+Requires(post):   policycoreutils /sbin/ldconfig
+Requires(postun): policycoreutils /sbin/ldconfig
 %endif
 
 %description
@@ -107,9 +107,27 @@
 rm -rf $RPM_BUILD_ROOT
 
 
+%ifarch %{ix86}
+%post
+/sbin/ldconfig
+# Set SELinux file_context in the policy
+semanage fcontext -a -t textrel_shlib_t '%{_libdir}/libglide3-v.\.so' 2>/dev/null || :
+# Actually change the context
+chcon -t textrel_shlib_t %{_libdir}/libglide3-v?.so || :
+%else
 %post -p /sbin/ldconfig
+%endif
 
+%ifarch %{ix86}
+%postun
+/sbin/ldconfig
+# SELinux support
+if [ $1 -eq 0 ]; then  # final removal
+  semanage fcontext -d -t textrel_shlib_t '%{_libdir}/libglide3-v.\.so' 2>/dev/null || :
+fi
+%else
 %postun -p /sbin/ldconfig
+%endif
 
 
 %files
@@ -132,6 +150,10 @@
 
 
 %changelog
+* Fri Apr 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 20050815-4
+- Add scripts to set SELinux type for the .so files to textrel_shlib_t
+  on i386, because of the non PIC asm used on i386 (bz 187484).
+
 * Mon Feb 13 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 20050815-3
 - Bump release and rebuild for new gcc4.1 and glibc.
 - add %%{?dist} for consistency with my other packages



From fedora-extras-commits at redhat.com  Fri Apr 28 12:31:19 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 28 Apr 2006 05:31:19 -0700
Subject: rpms/maxima/FC-5 maxima-5.9.3-gcl-setarch.patch, NONE,
	1.1 maxima-5.9.3-sbcl-disable-debugger.patch, NONE,
	1.1 maxima.spec, 1.21,
	1.22 maxima-5.9.2-sbcl-disable-debugger.patch, 1.1, NONE
Message-ID: <200604281231.k3SCVLuv027653@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27630

Modified Files:
	maxima.spec 
Added Files:
	maxima-5.9.3-gcl-setarch.patch 
	maxima-5.9.3-sbcl-disable-debugger.patch 
Removed Files:
	maxima-5.9.2-sbcl-disable-debugger.patch 
Log Message:
* Wed Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-2
- use setarch -X hack to allow runtime-gcl to function (#187647)
- respin for sbcl-0.9.12


maxima-5.9.3-gcl-setarch.patch:

--- NEW FILE maxima-5.9.3-gcl-setarch.patch ---
--- maxima-5.9.3/src/maxima.in.setarch	2005-11-07 11:37:11.000000000 -0600
+++ maxima-5.9.3/src/maxima.in	2006-04-27 07:07:42.000000000 -0500
@@ -128,7 +128,7 @@
 	exec "@SCL_NAME@" -quiet -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
     fi
 elif [ "$MAXIMA_LISP" = "gcl" ]; then
-    exec "$maxima_image_base" -eval '(cl-user::run)' -f -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+    exec "setarch" "@ARCH@" "-X" "$maxima_image_base" -eval '(cl-user::run)' -f -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
 elif [ "$MAXIMA_LISP" = "acl6" ]; then
 # FIXME: arguments need in a manner consistent with the way they are extracted
 #        in the function get-application-args in command-line.lisp

maxima-5.9.3-sbcl-disable-debugger.patch:

--- NEW FILE maxima-5.9.3-sbcl-disable-debugger.patch ---
--- maxima-5.9.3/src/Makefile.am.sbcl-disable-debugger	2006-02-11 08:25:06.000000000 -0600
+++ maxima-5.9.3/src/Makefile.am	2006-04-26 14:30:15.000000000 -0500
@@ -151,7 +151,7 @@
 
 
 if SBCL
-EXECUTESBCL = $(SBCL_NAME) --noinform --noprint --eval
+EXECUTESBCL = $(SBCL_NAME) --noinform --noprint --disable-debugger --eval
 all-local: binary-sbcl/maxima.core
 install-exec-local: install-sbcl
 uninstall: uninstall-sbcl
--- maxima-5.9.3/src/Makefile.in.sbcl-disable-debugger	2006-03-19 09:23:40.000000000 -0600
+++ maxima-5.9.3/src/Makefile.in	2006-04-26 14:31:14.000000000 -0500
@@ -204,7 +204,7 @@
 @CMUCL_TRUE at EXECUTECMUCL = $(CMUCL_NAME) -noinit -batch
 @SCL_TRUE at EXECUTESCL = $(SCL_NAME) -noinit -batch
 @ACL6_TRUE at EXECUTEACL6 = $(ACL6_NAME) -batch
- at SBCL_TRUE@EXECUTESBCL = $(SBCL_NAME) --noinform --noprint --eval
+ at SBCL_TRUE@EXECUTESBCL = $(SBCL_NAME) --noinform --noprint --disable-debugger --eval
 @GCL_TRUE at EXECUTEGCL = $(GCL_NAME) -batch -eval
 @OPENMCL_TRUE at EXECUTEOPENMCL = $(OPENMCL_NAME) -e
 genericdir = $(instsrcdir)


Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-5/maxima.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- maxima.spec	10 Apr 2006 17:31:33 -0000	1.21
+++ maxima.spec	28 Apr 2006 12:31:19 -0000	1.22
@@ -1,9 +1,14 @@
 
+%if "%{?fedora}" > "4"
+# See http://bugzilla.redhat.com/bugzilla/187647
+%define setarch_hack 1
+%endif
+
 Summary: Symbolic Computation Program
 Name: 	 maxima
 Version: 5.9.3
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -15,19 +20,19 @@
 #  (sbcl:  https://bugzilla.redhat.com/bugzilla/177029)
 ExclusiveArch: %{ix86} x86_64 
 
-%define _with_default_lisp --with-default-lisp=clisp
-
 %ifarch %{ix86}
 %define _enable_cmucl --enable-cmucl
 %endif
 
 %ifarch %{ix86} x86_64
+%define default_lisp clisp
 %define _enable_clisp --enable-clisp 
 %define _enable_gcl --enable-gcl 
 %define _enable_sbcl --enable-sbcl 
 %endif
 
 %ifarch ppc
+#define default_lisp sbcl
 #define _enable_clisp --enable-clisp 
 #define _enable_cmucl --enable-cmucl 
 #define _enable_gcl --enable-gcl 
@@ -46,11 +51,13 @@
 # (mysterious?) xemacs patch (don't use, for now)
 Patch2: maxima.el-xemacs.patch
 # use sbcl --disable-debugger
-Patch3: maxima-5.9.2-sbcl-disable-debugger.patch
+Patch3: maxima-5.9.3-sbcl-disable-debugger.patch
 # ghostview -> evince (ps/pdf viewer)
 Patch4: maxima-5.9.2-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
 
 # Inhibit automatic compressing of info files. Compressed info
 # files break maxima's internal help.
@@ -71,6 +78,10 @@
 BuildRequires: tk
 
 Requires: %{name}-runtime = %{version}
+## Consider this when rpm supports it -- Rex
+#if "%{?default_lisp:1}" == "1"
+#Requires(hint): %{name}-runtime-%{default_lisp} = %{version}
+#endif
 Requires: gnuplot
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
@@ -134,8 +145,13 @@
 Group:   Applications/Engineering
 BuildRequires: gcl
 Requires:  %{name} = %{version}
+%if "%{?setarch_hack}" == "1"
+BuildRequires: setarch
+Requires:  setarch
+%endif
 Obsoletes: maxima-exec-gcl < %{version}-%{release}
 Provides:  %{name}-runtime = %{version}
+Provides:  %{name}-runtime-gcl = %{version}-%{release}
 %description runtime-gcl
 Maxima compiled with Gnu Common Lisp (gcl)
 %endif
@@ -168,10 +184,16 @@
 
 %patch1 -p1 -b .htmlview
 #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
+%endif
+
+sed -i -e 's|@ARCH@|%{_target_cpu}|' src/maxima.in
 
 sed -i -e 's:/usr/local/info:/usr/share/info:' \
   interfaces/emacs/emaxima/maxima.el
@@ -182,15 +204,10 @@
 # remove CVS crud
 find -name CVS -type d | xargs rm -r
 
-#patch3 -p1 -b .sbcl-disable-debugger
-#aclocal
-#automake --add-missing --copy
-#autoconf
-
 
 %build
 %configure \
-  %{?_with_default_lisp} \
+  %{?default_lisp:--with-default-lisp=%{default_lisp} } \
   %{?_enable_clisp} %{!?_enable_clisp: --disable-clisp } %{?_with_clisp_runtime} \
   %{?_enable_cmucl} %{!?_enable_cmucl: --disable-cmucl } %{?_with_cmucl_runtime} \
   %{?_enable_gcl}   %{!?_enable_gcl:   --disable-gcl } \
@@ -356,6 +373,10 @@
 
 
 %changelog
+* Wed Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-2
+- use setarch -X hack to allow runtime-gcl to function (#187647)
+- respin for sbcl-0.9.12
+
 * Wed Apr 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-1
 - 5.9.3
 


--- maxima-5.9.2-sbcl-disable-debugger.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Apr 28 12:32:46 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 28 Apr 2006 05:32:46 -0700
Subject: rpms/sbcl/FC-4 .cvsignore, 1.10, 1.11 sbcl.spec, 1.34, 1.35 sources,
	1.10, 1.11
Message-ID: <200604281232.k3SCWmjO027735@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27714

Modified Files:
	.cvsignore sbcl.spec sources 
Log Message:
* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-1
- 0.9.12



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	30 Mar 2006 19:56:23 -0000	1.10
+++ .cvsignore	28 Apr 2006 12:32:46 -0000	1.11
@@ -1,4 +1,4 @@
-sbcl-0.9.11-source.tar.bz2
+sbcl-0.9.12-source.tar.bz2
 sbcl-0.9.11-x86-64-linux-binary.tar.bz2 
 sbcl-0.9.11-x86-linux-binary.tar.bz2
-sbcl-0.8.15-powerpc-linux-binary.tar.bz2
+sbcl-0.9.8-powerpc-linux-binary.tar.bz2


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sbcl.spec	30 Mar 2006 19:56:23 -0000	1.34
+++ sbcl.spec	28 Apr 2006 12:32:46 -0000	1.35
@@ -12,7 +12,7 @@
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
-Version: 0.9.11
+Version: 0.9.12
 Release: 1%{?dist}
 
 License: BSD/MIT
@@ -26,12 +26,22 @@
 #Source1: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2
 Source2: customize-target-features.lisp 
 
+## Bootstraps
+# %{ix86}
+#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-linux-binary.tar.bz2
+# x86_64
+#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-64-linux-binary.tar.bz2
+# ppc
+#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-powerpc-linux-binary.tar.bz2
+# another possible ppc bootstrap to try
+#Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
+
+
 ## x86 section
 %ifarch %{ix86}
 %define sbcl_arch x86
 BuildRequires: sbcl
 # or
-#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-linux-binary.tar.bz2
 #define sbcl_bootstrap_src -a 10 
 %endif
 
@@ -47,16 +57,10 @@
 ## ppc section
 # Latest powerpc-linux bootstrap build fails:
 # http://bugzilla.redhat.com/bugzilla/177029 
-#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2
-# another possible ppc bootstrap to try
-#Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
 Source35: ppc-linux-mcontext.h
 %ifarch ppc 
 %define sbcl_arch ppc
 %define sbcl_bootstrap_src -a 30
-BuildRequires: setarch
-%define setarch setarch %{_target_cpu}
-%define min_bootstrap 1
 %endif
 
 Source100: my_setarch.c
@@ -65,7 +69,7 @@
 Patch2: sbcl-0.9.5-personality.patch
 Patch3: sbcl-0.9.5-optflags.patch
 Patch4: sbcl-0.9.4-LIB_DIR.patch
-Patch5: sbcl-0.9.10-make-config-ppc.patch
+#Patch5: sbcl-0.9.10-make-config-ppc.patch
 Patch6: sbcl-0.9.5-verbose-build.patch
 # Allow override of contrib test failure(s)
 Patch7: sbcl-0.9.9-permissive.patch
@@ -97,7 +101,7 @@
 %patch2 -p1 -b .personality
 %patch3 -p1 -b .optflags
 %patch4 -p1 -b .LIB_DIR
-%patch5 -p1 -b .make-config-ppc
+#patch5 -p1 -b .make-config-ppc
 %{?sbcl_verbose:%patch6 -p1 -b .verbose-build}
 %patch7 -p1 -b .permissive
 
@@ -228,6 +232,9 @@
 
 
 %changelog
+* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-1
+- 0.9.12
+
 * Mon Mar 27 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.11-1
 - 0.9.11
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	30 Mar 2006 19:56:23 -0000	1.10
+++ sources	28 Apr 2006 12:32:46 -0000	1.11
@@ -1 +1 @@
-b82c3b7cf5c351cbe97af5150c17ad27  sbcl-0.9.11-source.tar.bz2
+82eef4f47d6a72a36d4484bf503fc7db  sbcl-0.9.12-source.tar.bz2



From fedora-extras-commits at redhat.com  Fri Apr 28 12:34:14 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 28 Apr 2006 05:34:14 -0700
Subject: rpms/sbcl/FC-3 .cvsignore, 1.9, 1.10 sbcl.spec, 1.29, 1.30 sources, 
	1.9, 1.10
Message-ID: <200604281234.k3SCYGkn027810@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27789

Modified Files:
	.cvsignore sbcl.spec sources 
Log Message:
* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-1
- 0.9.12



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-3/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	27 Feb 2006 15:36:21 -0000	1.9
+++ .cvsignore	28 Apr 2006 12:34:14 -0000	1.10
@@ -1,4 +1,4 @@
-sbcl-0.9.10-source.tar.bz2
-sbcl-0.9.9-x86-linux-binary.tar.bz2
-sbcl-0.9.9-x86-64-linux-binary.tar.bz2
-sbcl-0.8.15-powerpc-linux-binary.tar.bz2
+sbcl-0.9.12-source.tar.bz2
+sbcl-0.9.11-x86-64-linux-binary.tar.bz2 
+sbcl-0.9.11-x86-linux-binary.tar.bz2
+sbcl-0.9.8-powerpc-linux-binary.tar.bz2


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-3/sbcl.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sbcl.spec	27 Feb 2006 15:36:21 -0000	1.29
+++ sbcl.spec	28 Apr 2006 12:34:14 -0000	1.30
@@ -12,7 +12,7 @@
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
-Version: 0.9.10
+Version: 0.9.12
 Release: 1%{?dist}
 
 License: BSD/MIT
@@ -26,37 +26,41 @@
 #Source1: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2
 Source2: customize-target-features.lisp 
 
+## Bootstraps
+# %{ix86}
+#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-linux-binary.tar.bz2
+# x86_64
+#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-64-linux-binary.tar.bz2
+# ppc
+#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-powerpc-linux-binary.tar.bz2
+# another possible ppc bootstrap to try
+#Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
+
+
 ## x86 section
 %ifarch %{ix86}
 %define sbcl_arch x86
 BuildRequires: sbcl
 # or
-#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.9-x86-linux-binary.tar.bz2
 #define sbcl_bootstrap_src -a 10 
 %endif
 
 ## x86_64 section
 %ifarch x86_64
 %define sbcl_arch x86-64
-#BuildRequires: sbcl
+BuildRequires: sbcl
 # or
-Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.9-x86-64-linux-binary.tar.bz2
-%define sbcl_bootstrap_src -a 20 
+#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-64-linux-binary.tar.bz2
+#define sbcl_bootstrap_src -a 20 
 %endif
 
 ## ppc section
 # Latest powerpc-linux bootstrap build fails:
 # http://bugzilla.redhat.com/bugzilla/177029 
-#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2
-# another possible ppc bootstrap to try
-#Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
 Source35: ppc-linux-mcontext.h
 %ifarch ppc 
 %define sbcl_arch ppc
 %define sbcl_bootstrap_src -a 30
-BuildRequires: setarch
-%define setarch setarch %{_target_cpu}
-%define min_bootstrap 1
 %endif
 
 Source100: my_setarch.c
@@ -65,7 +69,7 @@
 Patch2: sbcl-0.9.5-personality.patch
 Patch3: sbcl-0.9.5-optflags.patch
 Patch4: sbcl-0.9.4-LIB_DIR.patch
-Patch5: sbcl-0.9.10-make-config-ppc.patch
+#Patch5: sbcl-0.9.10-make-config-ppc.patch
 Patch6: sbcl-0.9.5-verbose-build.patch
 # Allow override of contrib test failure(s)
 Patch7: sbcl-0.9.9-permissive.patch
@@ -97,7 +101,7 @@
 %patch2 -p1 -b .personality
 %patch3 -p1 -b .optflags
 %patch4 -p1 -b .LIB_DIR
-%patch5 -p1 -b .make-config-ppc
+#patch5 -p1 -b .make-config-ppc
 %{?sbcl_verbose:%patch6 -p1 -b .verbose-build}
 %patch7 -p1 -b .permissive
 
@@ -228,6 +232,12 @@
 
 
 %changelog
+* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-1
+- 0.9.12
+
+* Mon Mar 27 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.11-1
+- 0.9.11
+
 * Mon Feb 27 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.10-1
 - 0.9.10
 - update/fix make-config-ppc patch (still broken, #177029)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-3/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	27 Feb 2006 15:36:21 -0000	1.9
+++ sources	28 Apr 2006 12:34:14 -0000	1.10
@@ -1,4 +1 @@
-58678d7081f32bdcd174c5233efba4f3  sbcl-0.9.10-source.tar.bz2
-417f524958fd7a4115902f14eaed3ab1  sbcl-0.9.9-x86-linux-binary.tar.bz2
-d9e4a6d95e255b3a24431f336fae236d  sbcl-0.9.9-x86-64-linux-binary.tar.bz2
-3a72d0785ce0a8e02f9af632c2a4f217  sbcl-0.8.15-powerpc-linux-binary.tar.bz2
+82eef4f47d6a72a36d4484bf503fc7db  sbcl-0.9.12-source.tar.bz2



From fedora-extras-commits at redhat.com  Fri Apr 28 12:36:11 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 28 Apr 2006 05:36:11 -0700
Subject: rpms/maxima/FC-4 maxima.spec,1.19,1.20
Message-ID: <200604281236.k3SCaDnu027897@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27879

Modified Files:
	maxima.spec 
Log Message:
* Wed Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-2
- use setarch -X hack to allow runtime-gcl to function (#187647)
- respin for sbcl-0.9.12



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-4/maxima.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- maxima.spec	10 Apr 2006 17:32:12 -0000	1.19
+++ maxima.spec	28 Apr 2006 12:36:11 -0000	1.20
@@ -1,9 +1,14 @@
 
+%if "%{?fedora}" > "4"
+# See http://bugzilla.redhat.com/bugzilla/187647
+%define setarch_hack 1
+%endif
+
 Summary: Symbolic Computation Program
 Name: 	 maxima
 Version: 5.9.3
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -15,19 +20,19 @@
 #  (sbcl:  https://bugzilla.redhat.com/bugzilla/177029)
 ExclusiveArch: %{ix86} x86_64 
 
-%define _with_default_lisp --with-default-lisp=clisp
-
 %ifarch %{ix86}
 %define _enable_cmucl --enable-cmucl
 %endif
 
 %ifarch %{ix86} x86_64
+%define default_lisp clisp
 %define _enable_clisp --enable-clisp 
 %define _enable_gcl --enable-gcl 
 %define _enable_sbcl --enable-sbcl 
 %endif
 
 %ifarch ppc
+#define default_lisp sbcl
 #define _enable_clisp --enable-clisp 
 #define _enable_cmucl --enable-cmucl 
 #define _enable_gcl --enable-gcl 
@@ -46,11 +51,13 @@
 # (mysterious?) xemacs patch (don't use, for now)
 Patch2: maxima.el-xemacs.patch
 # use sbcl --disable-debugger
-Patch3: maxima-5.9.2-sbcl-disable-debugger.patch
+Patch3: maxima-5.9.3-sbcl-disable-debugger.patch
 # ghostview -> evince (ps/pdf viewer)
 Patch4: maxima-5.9.2-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
 
 # Inhibit automatic compressing of info files. Compressed info
 # files break maxima's internal help.
@@ -71,6 +78,10 @@
 BuildRequires: tk
 
 Requires: %{name}-runtime = %{version}
+## Consider this when rpm supports it -- Rex
+#if "%{?default_lisp:1}" == "1"
+#Requires(hint): %{name}-runtime-%{default_lisp} = %{version}
+#endif
 Requires: gnuplot
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
@@ -134,8 +145,13 @@
 Group:   Applications/Engineering
 BuildRequires: gcl
 Requires:  %{name} = %{version}
+%if "%{?setarch_hack}" == "1"
+BuildRequires: setarch
+Requires:  setarch
+%endif
 Obsoletes: maxima-exec-gcl < %{version}-%{release}
 Provides:  %{name}-runtime = %{version}
+Provides:  %{name}-runtime-gcl = %{version}-%{release}
 %description runtime-gcl
 Maxima compiled with Gnu Common Lisp (gcl)
 %endif
@@ -168,10 +184,16 @@
 
 %patch1 -p1 -b .htmlview
 #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
+%endif
+
+sed -i -e 's|@ARCH@|%{_target_cpu}|' src/maxima.in
 
 sed -i -e 's:/usr/local/info:/usr/share/info:' \
   interfaces/emacs/emaxima/maxima.el
@@ -182,15 +204,10 @@
 # remove CVS crud
 find -name CVS -type d | xargs rm -r
 
-#patch3 -p1 -b .sbcl-disable-debugger
-#aclocal
-#automake --add-missing --copy
-#autoconf
-
 
 %build
 %configure \
-  %{?_with_default_lisp} \
+  %{?default_lisp:--with-default-lisp=%{default_lisp} } \
   %{?_enable_clisp} %{!?_enable_clisp: --disable-clisp } %{?_with_clisp_runtime} \
   %{?_enable_cmucl} %{!?_enable_cmucl: --disable-cmucl } %{?_with_cmucl_runtime} \
   %{?_enable_gcl}   %{!?_enable_gcl:   --disable-gcl } \
@@ -356,6 +373,10 @@
 
 
 %changelog
+* Wed Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-2
+- use setarch -X hack to allow runtime-gcl to function (#187647)
+- respin for sbcl-0.9.12
+
 * Wed Apr 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-1
 - 5.9.3
 



From fedora-extras-commits at redhat.com  Fri Apr 28 12:36:44 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 28 Apr 2006 05:36:44 -0700
Subject: rpms/maxima/FC-4 maxima-5.9.3-gcl-setarch.patch, NONE,
	1.1 maxima-5.9.3-sbcl-disable-debugger.patch, NONE, 1.1
Message-ID: <200604281236.k3SCakMV027934@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27913

Added Files:
	maxima-5.9.3-gcl-setarch.patch 
	maxima-5.9.3-sbcl-disable-debugger.patch 
Log Message:
oops, missed some patches on last commit


maxima-5.9.3-gcl-setarch.patch:

--- NEW FILE maxima-5.9.3-gcl-setarch.patch ---
--- maxima-5.9.3/src/maxima.in.setarch	2005-11-07 11:37:11.000000000 -0600
+++ maxima-5.9.3/src/maxima.in	2006-04-27 07:07:42.000000000 -0500
@@ -128,7 +128,7 @@
 	exec "@SCL_NAME@" -quiet -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
     fi
 elif [ "$MAXIMA_LISP" = "gcl" ]; then
-    exec "$maxima_image_base" -eval '(cl-user::run)' -f -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+    exec "setarch" "@ARCH@" "-X" "$maxima_image_base" -eval '(cl-user::run)' -f -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
 elif [ "$MAXIMA_LISP" = "acl6" ]; then
 # FIXME: arguments need in a manner consistent with the way they are extracted
 #        in the function get-application-args in command-line.lisp

maxima-5.9.3-sbcl-disable-debugger.patch:

--- NEW FILE maxima-5.9.3-sbcl-disable-debugger.patch ---
--- maxima-5.9.3/src/Makefile.am.sbcl-disable-debugger	2006-02-11 08:25:06.000000000 -0600
+++ maxima-5.9.3/src/Makefile.am	2006-04-26 14:30:15.000000000 -0500
@@ -151,7 +151,7 @@
 
 
 if SBCL
-EXECUTESBCL = $(SBCL_NAME) --noinform --noprint --eval
+EXECUTESBCL = $(SBCL_NAME) --noinform --noprint --disable-debugger --eval
 all-local: binary-sbcl/maxima.core
 install-exec-local: install-sbcl
 uninstall: uninstall-sbcl
--- maxima-5.9.3/src/Makefile.in.sbcl-disable-debugger	2006-03-19 09:23:40.000000000 -0600
+++ maxima-5.9.3/src/Makefile.in	2006-04-26 14:31:14.000000000 -0500
@@ -204,7 +204,7 @@
 @CMUCL_TRUE at EXECUTECMUCL = $(CMUCL_NAME) -noinit -batch
 @SCL_TRUE at EXECUTESCL = $(SCL_NAME) -noinit -batch
 @ACL6_TRUE at EXECUTEACL6 = $(ACL6_NAME) -batch
- at SBCL_TRUE@EXECUTESBCL = $(SBCL_NAME) --noinform --noprint --eval
+ at SBCL_TRUE@EXECUTESBCL = $(SBCL_NAME) --noinform --noprint --disable-debugger --eval
 @GCL_TRUE at EXECUTEGCL = $(GCL_NAME) -batch -eval
 @OPENMCL_TRUE at EXECUTEOPENMCL = $(OPENMCL_NAME) -e
 genericdir = $(instsrcdir)



From fedora-extras-commits at redhat.com  Fri Apr 28 12:41:55 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 28 Apr 2006 05:41:55 -0700
Subject: rpms/libsigsegv/devel .cvsignore, 1.3, 1.4 libsigsegv.spec, 1.9,
	1.10 sources, 1.3, 1.4
Message-ID: <200604281241.k3SCfwmP028005@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libsigsegv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27984

Modified Files:
	.cvsignore libsigsegv.spec sources 
Log Message:
* Fri Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.3-1
- 2.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsigsegv/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Oct 2005 18:18:13 -0000	1.3
+++ .cvsignore	28 Apr 2006 12:41:55 -0000	1.4
@@ -1 +1 @@
-libsigsegv-2.2.tar.gz
+libsigsegv-2.3.tar.gz


Index: libsigsegv.spec
===================================================================
RCS file: /cvs/extras/rpms/libsigsegv/devel/libsigsegv.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libsigsegv.spec	1 Mar 2006 16:00:06 -0000	1.9
+++ libsigsegv.spec	28 Apr 2006 12:41:55 -0000	1.10
@@ -1,12 +1,12 @@
 
 Summary: Library for handling page faults in user mode
 Name:    libsigsegv
-Version: 2.2
-Release: 1%{?dist}.2
+Version: 2.3
+Release: 1%{?dist}
 
 License: GPL
 URL:     http://libsigsegv.sourceforge.net/
-Source:  http://ftp.gnu.org/gnu/libsigsegv/libsigsegv-2.2.tar.gz
+Source:  http://ftp.gnu.org/gnu/libsigsegv/libsigsegv-%{version}.tar.gz
 Group:   System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -21,7 +21,6 @@
   - stack overflow handlers,
   - distributed shared memory,
 
-
 %package devel
 Summary: Development libraries and header files for %{name} 
 Group:   Development/Libraries
@@ -76,6 +75,9 @@
 
 
 %changelog
+* Fri Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.3-1
+- 2.3
+
 * Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 
 - fc5: gcc/glibc respin
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsigsegv/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Oct 2005 18:18:13 -0000	1.3
+++ sources	28 Apr 2006 12:41:55 -0000	1.4
@@ -1 +1 @@
-d914c40c4bf2bff9ba60b37bbc5fc226  libsigsegv-2.2.tar.gz
+81b3c50e18a29be0bc08173e74860d05  libsigsegv-2.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 28 12:52:40 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 28 Apr 2006 05:52:40 -0700
Subject: rpms/libsigsegv/FC-5 .cvsignore, 1.3, 1.4 libsigsegv.spec, 1.9,
	1.10 sources, 1.3, 1.4
Message-ID: <200604281252.k3SCqgo6028101@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libsigsegv/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28080

Modified Files:
	.cvsignore libsigsegv.spec sources 
Log Message:
* Fri Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.3-1
- 2.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsigsegv/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Oct 2005 18:18:13 -0000	1.3
+++ .cvsignore	28 Apr 2006 12:52:40 -0000	1.4
@@ -1 +1 @@
-libsigsegv-2.2.tar.gz
+libsigsegv-2.3.tar.gz


Index: libsigsegv.spec
===================================================================
RCS file: /cvs/extras/rpms/libsigsegv/FC-5/libsigsegv.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libsigsegv.spec	1 Mar 2006 16:00:06 -0000	1.9
+++ libsigsegv.spec	28 Apr 2006 12:52:40 -0000	1.10
@@ -1,12 +1,12 @@
 
 Summary: Library for handling page faults in user mode
 Name:    libsigsegv
-Version: 2.2
-Release: 1%{?dist}.2
+Version: 2.3
+Release: 1%{?dist}
 
 License: GPL
 URL:     http://libsigsegv.sourceforge.net/
-Source:  http://ftp.gnu.org/gnu/libsigsegv/libsigsegv-2.2.tar.gz
+Source:  http://ftp.gnu.org/gnu/libsigsegv/libsigsegv-%{version}.tar.gz
 Group:   System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -21,7 +21,6 @@
   - stack overflow handlers,
   - distributed shared memory,
 
-
 %package devel
 Summary: Development libraries and header files for %{name} 
 Group:   Development/Libraries
@@ -76,6 +75,9 @@
 
 
 %changelog
+* Fri Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.3-1
+- 2.3
+
 * Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 
 - fc5: gcc/glibc respin
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsigsegv/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Oct 2005 18:18:13 -0000	1.3
+++ sources	28 Apr 2006 12:52:40 -0000	1.4
@@ -1 +1 @@
-d914c40c4bf2bff9ba60b37bbc5fc226  libsigsegv-2.2.tar.gz
+81b3c50e18a29be0bc08173e74860d05  libsigsegv-2.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 28 12:53:02 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 28 Apr 2006 05:53:02 -0700
Subject: rpms/libsigsegv/FC-4 .cvsignore, 1.3, 1.4 libsigsegv.spec, 1.6,
	1.7 sources, 1.3, 1.4
Message-ID: <200604281253.k3SCr45l028168@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libsigsegv/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28147

Modified Files:
	.cvsignore libsigsegv.spec sources 
Log Message:
* Fri Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.3-1
- 2.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsigsegv/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Oct 2005 18:24:52 -0000	1.3
+++ .cvsignore	28 Apr 2006 12:53:02 -0000	1.4
@@ -1 +1 @@
-libsigsegv-2.2.tar.gz
+libsigsegv-2.3.tar.gz


Index: libsigsegv.spec
===================================================================
RCS file: /cvs/extras/rpms/libsigsegv/FC-4/libsigsegv.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libsigsegv.spec	6 Oct 2005 18:24:52 -0000	1.6
+++ libsigsegv.spec	28 Apr 2006 12:53:02 -0000	1.7
@@ -1,13 +1,12 @@
-# $Id$
 
 Summary: Library for handling page faults in user mode
 Name:    libsigsegv
-Version: 2.2
+Version: 2.3
 Release: 1%{?dist}
 
 License: GPL
 URL:     http://libsigsegv.sourceforge.net/
-Source:  http://ftp.gnu.org/gnu/libsigsegv/libsigsegv-2.2.tar.gz
+Source:  http://ftp.gnu.org/gnu/libsigsegv/libsigsegv-%{version}.tar.gz
 Group:   System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -22,7 +21,6 @@
   - stack overflow handlers,
   - distributed shared memory,
 
-
 %package devel
 Summary: Development libraries and header files for %{name} 
 Group:   Development/Libraries
@@ -77,6 +75,12 @@
 
 
 %changelog
+* Fri Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.3-1
+- 2.3
+
+* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 
+- fc5: gcc/glibc respin
+
 * Thu Oct 06 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 2.2-1
 - 2.2
 - omit .la file(s)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsigsegv/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Oct 2005 18:24:52 -0000	1.3
+++ sources	28 Apr 2006 12:53:02 -0000	1.4
@@ -1 +1 @@
-d914c40c4bf2bff9ba60b37bbc5fc226  libsigsegv-2.2.tar.gz
+81b3c50e18a29be0bc08173e74860d05  libsigsegv-2.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 28 12:53:22 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 28 Apr 2006 05:53:22 -0700
Subject: rpms/libsigsegv/FC-3 .cvsignore, 1.3, 1.4 libsigsegv.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200604281253.k3SCrO23028233@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libsigsegv/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28212

Modified Files:
	.cvsignore libsigsegv.spec sources 
Log Message:
* Fri Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.3-1
- 2.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsigsegv/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Oct 2005 18:24:52 -0000	1.3
+++ .cvsignore	28 Apr 2006 12:53:22 -0000	1.4
@@ -1 +1 @@
-libsigsegv-2.2.tar.gz
+libsigsegv-2.3.tar.gz


Index: libsigsegv.spec
===================================================================
RCS file: /cvs/extras/rpms/libsigsegv/FC-3/libsigsegv.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libsigsegv.spec	6 Oct 2005 18:24:52 -0000	1.3
+++ libsigsegv.spec	28 Apr 2006 12:53:22 -0000	1.4
@@ -1,13 +1,12 @@
-# $Id$
 
 Summary: Library for handling page faults in user mode
 Name:    libsigsegv
-Version: 2.2
+Version: 2.3
 Release: 1%{?dist}
 
 License: GPL
 URL:     http://libsigsegv.sourceforge.net/
-Source:  http://ftp.gnu.org/gnu/libsigsegv/libsigsegv-2.2.tar.gz
+Source:  http://ftp.gnu.org/gnu/libsigsegv/libsigsegv-%{version}.tar.gz
 Group:   System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -22,7 +21,6 @@
   - stack overflow handlers,
   - distributed shared memory,
 
-
 %package devel
 Summary: Development libraries and header files for %{name} 
 Group:   Development/Libraries
@@ -77,6 +75,12 @@
 
 
 %changelog
+* Fri Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.3-1
+- 2.3
+
+* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 
+- fc5: gcc/glibc respin
+
 * Thu Oct 06 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 2.2-1
 - 2.2
 - omit .la file(s)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsigsegv/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Oct 2005 18:24:52 -0000	1.3
+++ sources	28 Apr 2006 12:53:22 -0000	1.4
@@ -1 +1 @@
-d914c40c4bf2bff9ba60b37bbc5fc226  libsigsegv-2.2.tar.gz
+81b3c50e18a29be0bc08173e74860d05  libsigsegv-2.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 28 12:59:52 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 28 Apr 2006 05:59:52 -0700
Subject: rpms/sbcl/devel sbcl.spec,1.41,1.42 sources,1.12,1.13
Message-ID: <200604281259.k3SCxsVD028310@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28291

Modified Files:
	sbcl.spec sources 
Log Message:
* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net 0.9.12-1.1
- try re-enabling ppc build



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sbcl.spec	26 Apr 2006 18:51:33 -0000	1.41
+++ sbcl.spec	28 Apr 2006 12:59:52 -0000	1.42
@@ -4,40 +4,28 @@
 #define min_bootstrap 1
 
 # define to enable verbose build for debugging
-#define sbcl_verbose 1 
-
-# shell to use
-#define sbcl_shell /bin/bash -x
-%define sbcl_shell /bin/bash 
+%define sbcl_verbose 1 
+%define sbcl_shell /bin/bash -x
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.12
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 
 License: BSD/MIT
 Group: 	 Development/Languages
 URL:	 http://sbcl.sourceforge.net/
 Source0: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: %{ix86} x86_64
+#ExclusiveArch: %{ix86} x86_64
+ExclusiveArch: ppc
 
 # Pre-generated html docs (not used)
 #Source1: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2
 Source2: customize-target-features.lisp 
 
-## Bootstraps
-# %{ix86}
-#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-linux-binary.tar.bz2
-# x86_64
-#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-64-linux-binary.tar.bz2
-# ppc
-#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-powerpc-linux-binary.tar.bz2
-# another possible ppc bootstrap to try
-#Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
-
-
 ## x86 section
+#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-linux-binary.tar.bz2
 %ifarch %{ix86}
 %define sbcl_arch x86
 BuildRequires: sbcl
@@ -46,6 +34,7 @@
 %endif
 
 ## x86_64 section
+#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-64-linux-binary.tar.bz2
 %ifarch x86_64
 %define sbcl_arch x86-64
 BuildRequires: sbcl
@@ -55,6 +44,9 @@
 %endif
 
 ## ppc section
+Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-powerpc-linux-binary.tar.bz2
+# another possible ppc bootstrap to try
+#Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
 # Latest powerpc-linux bootstrap build fails:
 # http://bugzilla.redhat.com/bugzilla/177029 
 Source35: ppc-linux-mcontext.h
@@ -232,6 +224,9 @@
 
 
 %changelog
+* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net 0.9.12-1.1
+- try re-enabling ppc build
+
 * Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-1
 - 0.9.12
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	26 Apr 2006 18:51:33 -0000	1.12
+++ sources	28 Apr 2006 12:59:52 -0000	1.13
@@ -1 +1,2 @@
 82eef4f47d6a72a36d4484bf503fc7db  sbcl-0.9.12-source.tar.bz2
+83693674395d102961b76f30b241f522  sbcl-0.9.8-powerpc-linux-binary.tar.bz2



From fedora-extras-commits at redhat.com  Fri Apr 28 13:58:48 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Fri, 28 Apr 2006 06:58:48 -0700
Subject: rpms/libshout/devel libshout.spec,1.11,1.12
Message-ID: <200604281358.k3SDwof2030813@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/libshout/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30796

Modified Files:
	libshout.spec 
Log Message:
update to latest spec


Index: libshout.spec
===================================================================
RCS file: /cvs/extras/rpms/libshout/devel/libshout.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libshout.spec	17 Mar 2006 15:58:11 -0000	1.11
+++ libshout.spec	28 Apr 2006 13:58:48 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           libshout
 Version:        2.2
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        icecast source streaming library
 
 Group:          System Environment/Libraries
@@ -29,6 +29,11 @@
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 
+Requires:       libogg-devel
+Requires:       libvorbis-devel
+Requires:       libtheora-devel
+Requires:       speex-devel
+
 %description    devel
 The libshout-devel package contains the header files needed for developing
 applications that send data to an icecast server.  Install libshout-devel if
@@ -74,6 +79,14 @@
 %{_datadir}/aclocal/shout.m4
 
 %changelog
+* Fri Mar 17 2006 Thomas Vander Stichele <thomas at apestaart dot org>
+- 2.2-3
+- add Requires: to -devel package
+
+* Fri Mar 17 2006 Thomas Vander Stichele <thomas at apestaart dot org>
+- 2.2-2
+- rebuild to please the extras repository
+
 * Fri Mar 10 2006 Thomas Vander Stichele <thomas at apestaart dot org>
 - 2.2-1
 - new (incompatible) version, but deps are updated



From fedora-extras-commits at redhat.com  Fri Apr 28 13:59:34 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 28 Apr 2006 06:59:34 -0700
Subject: rpms/maxima/devel maxima.spec,1.24,1.25
Message-ID: <200604281359.k3SDxakh030881@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30864

Modified Files:
	maxima.spec 
Log Message:
* Fri Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-2.1
- try ppc build against sbcl



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- maxima.spec	27 Apr 2006 14:57:59 -0000	1.24
+++ maxima.spec	28 Apr 2006 13:59:34 -0000	1.25
@@ -1,14 +1,9 @@
 
-%if "%{?fedora}" > "4"
-# See http://bugzilla.redhat.com/bugzilla/187647
-%define setarch_hack 1
-%endif
-
 Summary: Symbolic Computation Program
 Name: 	 maxima
 Version: 5.9.3
 
-Release: 2%{?dist}
+Release: 2%{?dist}.1
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -18,7 +13,8 @@
 #  (clisp: http://bugzilla.redhat.com/bugzilla/166347) 
 #  (gcl:   http://bugzilla.redhat.com/bugzilla/167952)
 #  (sbcl:  https://bugzilla.redhat.com/bugzilla/177029)
-ExclusiveArch: %{ix86} x86_64 
+#ExclusiveArch: %{ix86} x86_64 
+ExclusiveArch: ppc
 
 %ifarch %{ix86}
 %define _enable_cmucl --enable-cmucl
@@ -32,11 +28,11 @@
 %endif
 
 %ifarch ppc
-#define default_lisp sbcl
+%define default_lisp sbcl
 #define _enable_clisp --enable-clisp 
 #define _enable_cmucl --enable-cmucl 
 #define _enable_gcl --enable-gcl 
-#define _enable_sbcl --enable-sbcl 
+%define _enable_sbcl --enable-sbcl 
 %endif
 
 Source1: maxima.png
@@ -145,7 +141,9 @@
 Group:   Applications/Engineering
 BuildRequires: gcl
 Requires:  %{name} = %{version}
-%if "%{?setarch_hack}" == "1"
+%if "%{?fedora}" > "4"
+# See http://bugzilla.redhat.com/bugzilla/187647
+%define setarch_hack 1
 BuildRequires: setarch
 Requires:  setarch
 %endif
@@ -373,6 +371,9 @@
 
 
 %changelog
+* Fri Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-2.1
+- try ppc build against sbcl
+
 * Wed Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-2
 - use setarch -X hack to allow runtime-gcl to function (#187647)
 - respin for sbcl-0.9.12



From fedora-extras-commits at redhat.com  Fri Apr 28 14:11:05 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 28 Apr 2006 07:11:05 -0700
Subject: rpms/sbcl/FC-5 sbcl.spec,1.41,1.42 sources,1.12,1.13
Message-ID: <200604281411.k3SEB74W000678@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv659

Modified Files:
	sbcl.spec sources 
Log Message:
* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net 0.9.12-1.1
- try re-enabling ppc build



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-5/sbcl.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sbcl.spec	27 Apr 2006 14:54:18 -0000	1.41
+++ sbcl.spec	28 Apr 2006 14:11:05 -0000	1.42
@@ -4,40 +4,28 @@
 #define min_bootstrap 1
 
 # define to enable verbose build for debugging
-#define sbcl_verbose 1 
-
-# shell to use
-#define sbcl_shell /bin/bash -x
-%define sbcl_shell /bin/bash 
+%define sbcl_verbose 1 
+%define sbcl_shell /bin/bash -x
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.12
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 
 License: BSD/MIT
 Group: 	 Development/Languages
 URL:	 http://sbcl.sourceforge.net/
 Source0: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: %{ix86} x86_64
+#ExclusiveArch: %{ix86} x86_64
+ExclusiveArch: ppc
 
 # Pre-generated html docs (not used)
 #Source1: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2
 Source2: customize-target-features.lisp 
 
-## Bootstraps
-# %{ix86}
-#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-linux-binary.tar.bz2
-# x86_64
-#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-64-linux-binary.tar.bz2
-# ppc
-#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-powerpc-linux-binary.tar.bz2
-# another possible ppc bootstrap to try
-#Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
-
-
 ## x86 section
+#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-linux-binary.tar.bz2
 %ifarch %{ix86}
 %define sbcl_arch x86
 BuildRequires: sbcl
@@ -46,6 +34,7 @@
 %endif
 
 ## x86_64 section
+#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-64-linux-binary.tar.bz2
 %ifarch x86_64
 %define sbcl_arch x86-64
 BuildRequires: sbcl
@@ -55,6 +44,9 @@
 %endif
 
 ## ppc section
+Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-powerpc-linux-binary.tar.bz2
+# another possible ppc bootstrap to try
+#Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
 # Latest powerpc-linux bootstrap build fails:
 # http://bugzilla.redhat.com/bugzilla/177029 
 Source35: ppc-linux-mcontext.h
@@ -232,6 +224,9 @@
 
 
 %changelog
+* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net 0.9.12-1.1
+- try re-enabling ppc build
+
 * Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-1
 - 0.9.12
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	27 Apr 2006 14:54:18 -0000	1.12
+++ sources	28 Apr 2006 14:11:05 -0000	1.13
@@ -1 +1,2 @@
 82eef4f47d6a72a36d4484bf503fc7db  sbcl-0.9.12-source.tar.bz2
+83693674395d102961b76f30b241f522  sbcl-0.9.8-powerpc-linux-binary.tar.bz2



From fedora-extras-commits at redhat.com  Fri Apr 28 14:12:01 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 28 Apr 2006 07:12:01 -0700
Subject: rpms/sbcl/FC-4 sbcl.spec,1.35,1.36 sources,1.11,1.12
Message-ID: <200604281412.k3SEC3mq000749@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv730

Modified Files:
	sbcl.spec sources 
Log Message:
* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net 0.9.12-1.1
- try re-enabling ppc build



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sbcl.spec	28 Apr 2006 12:32:46 -0000	1.35
+++ sbcl.spec	28 Apr 2006 14:12:01 -0000	1.36
@@ -4,40 +4,28 @@
 #define min_bootstrap 1
 
 # define to enable verbose build for debugging
-#define sbcl_verbose 1 
-
-# shell to use
-#define sbcl_shell /bin/bash -x
-%define sbcl_shell /bin/bash 
+%define sbcl_verbose 1 
+%define sbcl_shell /bin/bash -x
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.12
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 
 License: BSD/MIT
 Group: 	 Development/Languages
 URL:	 http://sbcl.sourceforge.net/
 Source0: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: %{ix86} x86_64
+#ExclusiveArch: %{ix86} x86_64
+ExclusiveArch: ppc
 
 # Pre-generated html docs (not used)
 #Source1: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2
 Source2: customize-target-features.lisp 
 
-## Bootstraps
-# %{ix86}
-#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-linux-binary.tar.bz2
-# x86_64
-#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-64-linux-binary.tar.bz2
-# ppc
-#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-powerpc-linux-binary.tar.bz2
-# another possible ppc bootstrap to try
-#Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
-
-
 ## x86 section
+#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-linux-binary.tar.bz2
 %ifarch %{ix86}
 %define sbcl_arch x86
 BuildRequires: sbcl
@@ -46,6 +34,7 @@
 %endif
 
 ## x86_64 section
+#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-64-linux-binary.tar.bz2
 %ifarch x86_64
 %define sbcl_arch x86-64
 BuildRequires: sbcl
@@ -55,6 +44,9 @@
 %endif
 
 ## ppc section
+Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-powerpc-linux-binary.tar.bz2
+# another possible ppc bootstrap to try
+#Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
 # Latest powerpc-linux bootstrap build fails:
 # http://bugzilla.redhat.com/bugzilla/177029 
 Source35: ppc-linux-mcontext.h
@@ -232,6 +224,9 @@
 
 
 %changelog
+* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net 0.9.12-1.1
+- try re-enabling ppc build
+
 * Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-1
 - 0.9.12
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	28 Apr 2006 12:32:46 -0000	1.11
+++ sources	28 Apr 2006 14:12:01 -0000	1.12
@@ -1 +1,2 @@
 82eef4f47d6a72a36d4484bf503fc7db  sbcl-0.9.12-source.tar.bz2
+83693674395d102961b76f30b241f522  sbcl-0.9.8-powerpc-linux-binary.tar.bz2



From fedora-extras-commits at redhat.com  Fri Apr 28 14:17:37 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Fri, 28 Apr 2006 07:17:37 -0700
Subject: rpms/mail-notification/devel mail-notification-2.0-imapauth.diff,
	NONE, 1.1 mail-notification.spec, 1.17, 1.18
Message-ID: <200604281417.k3SEHd6J000827@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/mail-notification/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv807

Modified Files:
	mail-notification.spec 
Added Files:
	mail-notification-2.0-imapauth.diff 
Log Message:
Added patch for IMAP authentication problem from project homepage (#190137, Paul Clifford)

mail-notification-2.0-imapauth.diff:

--- NEW FILE mail-notification-2.0-imapauth.diff ---
--- src/mn-imap-mailbox.c.orig	Tue Aug  9 22:01:56 2005
+++ src/mn-imap-mailbox.c	Wed Jan 25 19:22:48 2006
@@ -1646,7 +1646,12 @@
      */
     if (mn_ascii_validate(input))
       {
-	if (g_str_has_prefix(input, "+ "))
+	if (! strcmp(input, "+"))
+	  {
+	    response = g_new0(MNClientSessionResponse, 1);
+	    response->continuation = g_strdup("");
+	  }
+	else if (g_str_has_prefix(input, "+ "))
 	  {
 	    response = g_new0(MNClientSessionResponse, 1);
 	    response->continuation = g_strdup(input + 2);


Index: mail-notification.spec
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mail-notification.spec	13 Feb 2006 17:31:56 -0000	1.17
+++ mail-notification.spec	28 Apr 2006 14:17:37 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           mail-notification
 Version:        2.0
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
@@ -11,6 +11,7 @@
 Patch0:		http://savannah.nongnu.org/download/mailnotify/mail-notification-2.0-buildfix.diff
 Patch1:		http://savannah.nongnu.org/download/mailnotify/mail-notification-2.0-gmail-properties-fix.diff
 Patch2:		mail-notification-evolution.patch
+Patch3:		http://savannah.nongnu.org/download/mailnotify/mail-notification-2.0-imapauth.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext >= 0.14.1
@@ -47,6 +48,7 @@
 %patch0 -b .patch0
 %patch1 -b .patch1
 %patch2 -p1 -b .evolution
+%patch3 -b .patch3
 
 %build
 export LDFLAGS="-Wl,--export-dynamic"
@@ -118,6 +120,9 @@
 
 
 %changelog
+* Thu Apr 27 2006 Paul Clifford <paul.clifford+fe[AT]gmail[DOT]com> 2.0-12
+- Added patch for IMAP authentication problem from project homepage (#190137)
+
 * Mon Feb 13 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info>
 - Rebuild for Fedora Extras 5
 



From fedora-extras-commits at redhat.com  Fri Apr 28 14:32:32 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 28 Apr 2006 07:32:32 -0700
Subject: rpms/sbcl/devel sbcl.spec,1.42,1.43 sources,1.13,1.14
Message-ID: <200604281432.k3SEWYRi001030@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1011

Modified Files:
	sbcl.spec sources 
Log Message:
* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-2
- respin, using new ppc bootstrap 



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sbcl.spec	28 Apr 2006 12:59:52 -0000	1.42
+++ sbcl.spec	28 Apr 2006 14:32:32 -0000	1.43
@@ -4,21 +4,20 @@
 #define min_bootstrap 1
 
 # define to enable verbose build for debugging
-%define sbcl_verbose 1 
-%define sbcl_shell /bin/bash -x
+#define sbcl_verbose 1 
+%define sbcl_shell /bin/bash
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.12
-Release: 1%{?dist}.1
+Release: 2%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
 URL:	 http://sbcl.sourceforge.net/
 Source0: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#ExclusiveArch: %{ix86} x86_64
-ExclusiveArch: ppc
+ExclusiveArch: %{ix86} x86_64 ppc
 
 # Pre-generated html docs (not used)
 #Source1: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2
@@ -44,15 +43,12 @@
 %endif
 
 ## ppc section
-Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-powerpc-linux-binary.tar.bz2
-# another possible ppc bootstrap to try
-#Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
-# Latest powerpc-linux bootstrap build fails:
-# http://bugzilla.redhat.com/bugzilla/177029 
-Source35: ppc-linux-mcontext.h
+#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-powerpc-linux-binary.tar.bz2
 %ifarch ppc 
 %define sbcl_arch ppc
-%define sbcl_bootstrap_src -a 30
+BuildRequires: sbcl
+# or
+#define sbcl_bootstrap_src -a 30
 %endif
 
 Source100: my_setarch.c
@@ -103,10 +99,6 @@
 cp %{SOURCE2} ./customize-target-features.lisp
 %endif
 
-%ifarch ppc
-cp %{SOURCE35} src/runtime/ppc-linux-mcontext.h.BAK
-%endif
-
 # "install" local bootstrap
 %if "%{?sbcl_bootstrap_src}" != "%{nil}"
 mkdir sbcl-bootstrap
@@ -224,7 +216,10 @@
 
 
 %changelog
-* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net 0.9.12-1.1
+* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-2
+- respin, using new ppc bootstrap 
+
+* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-1.1
 - try re-enabling ppc build
 
 * Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	28 Apr 2006 12:59:52 -0000	1.13
+++ sources	28 Apr 2006 14:32:32 -0000	1.14
@@ -1,2 +1 @@
 82eef4f47d6a72a36d4484bf503fc7db  sbcl-0.9.12-source.tar.bz2
-83693674395d102961b76f30b241f522  sbcl-0.9.8-powerpc-linux-binary.tar.bz2



From fedora-extras-commits at redhat.com  Fri Apr 28 14:33:39 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 28 Apr 2006 07:33:39 -0700
Subject: rpms/sbcl/devel ppc-linux-mcontext.h,1.1,NONE
Message-ID: <200604281433.k3SEXfWY001096@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1081

Removed Files:
	ppc-linux-mcontext.h 
Log Message:
drop deprecated bits



--- ppc-linux-mcontext.h DELETED ---



From fedora-extras-commits at redhat.com  Fri Apr 28 15:07:20 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 28 Apr 2006 08:07:20 -0700
Subject: rpms/sbcl/FC-5 sbcl.spec, 1.42, 1.43 sources, 1.13,
	1.14 ppc-linux-mcontext.h, 1.1, NONE
Message-ID: <200604281507.k3SF7MLr003517@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3496

Modified Files:
	sbcl.spec sources 
Removed Files:
	ppc-linux-mcontext.h 
Log Message:
* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-2
- respin, using new ppc bootstrap 



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-5/sbcl.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sbcl.spec	28 Apr 2006 14:11:05 -0000	1.42
+++ sbcl.spec	28 Apr 2006 15:07:20 -0000	1.43
@@ -4,21 +4,20 @@
 #define min_bootstrap 1
 
 # define to enable verbose build for debugging
-%define sbcl_verbose 1 
-%define sbcl_shell /bin/bash -x
+#define sbcl_verbose 1 
+%define sbcl_shell /bin/bash
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.12
-Release: 1%{?dist}.1
+Release: 2%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
 URL:	 http://sbcl.sourceforge.net/
 Source0: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#ExclusiveArch: %{ix86} x86_64
-ExclusiveArch: ppc
+ExclusiveArch: %{ix86} x86_64 ppc
 
 # Pre-generated html docs (not used)
 #Source1: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2
@@ -44,15 +43,12 @@
 %endif
 
 ## ppc section
-Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-powerpc-linux-binary.tar.bz2
-# another possible ppc bootstrap to try
-#Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
-# Latest powerpc-linux bootstrap build fails:
-# http://bugzilla.redhat.com/bugzilla/177029 
-Source35: ppc-linux-mcontext.h
+#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-powerpc-linux-binary.tar.bz2
 %ifarch ppc 
 %define sbcl_arch ppc
-%define sbcl_bootstrap_src -a 30
+BuildRequires: sbcl
+# or
+#define sbcl_bootstrap_src -a 30
 %endif
 
 Source100: my_setarch.c
@@ -103,10 +99,6 @@
 cp %{SOURCE2} ./customize-target-features.lisp
 %endif
 
-%ifarch ppc
-cp %{SOURCE35} src/runtime/ppc-linux-mcontext.h.BAK
-%endif
-
 # "install" local bootstrap
 %if "%{?sbcl_bootstrap_src}" != "%{nil}"
 mkdir sbcl-bootstrap
@@ -224,7 +216,10 @@
 
 
 %changelog
-* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net 0.9.12-1.1
+* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-2
+- respin, using new ppc bootstrap 
+
+* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-1.1
 - try re-enabling ppc build
 
 * Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	28 Apr 2006 14:11:05 -0000	1.13
+++ sources	28 Apr 2006 15:07:20 -0000	1.14
@@ -1,2 +1 @@
 82eef4f47d6a72a36d4484bf503fc7db  sbcl-0.9.12-source.tar.bz2
-83693674395d102961b76f30b241f522  sbcl-0.9.8-powerpc-linux-binary.tar.bz2


--- ppc-linux-mcontext.h DELETED ---



From fedora-extras-commits at redhat.com  Fri Apr 28 15:07:37 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 28 Apr 2006 08:07:37 -0700
Subject: rpms/sbcl/FC-4 sbcl.spec, 1.36, 1.37 sources, 1.12,
	1.13 ppc-linux-mcontext.h, 1.1, NONE
Message-ID: <200604281507.k3SF7dEg003590@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3571

Modified Files:
	sbcl.spec sources 
Removed Files:
	ppc-linux-mcontext.h 
Log Message:
* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-2
- respin, using new ppc bootstrap 



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sbcl.spec	28 Apr 2006 14:12:01 -0000	1.36
+++ sbcl.spec	28 Apr 2006 15:07:37 -0000	1.37
@@ -4,21 +4,20 @@
 #define min_bootstrap 1
 
 # define to enable verbose build for debugging
-%define sbcl_verbose 1 
-%define sbcl_shell /bin/bash -x
+#define sbcl_verbose 1 
+%define sbcl_shell /bin/bash
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.12
-Release: 1%{?dist}.1
+Release: 2%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
 URL:	 http://sbcl.sourceforge.net/
 Source0: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#ExclusiveArch: %{ix86} x86_64
-ExclusiveArch: ppc
+ExclusiveArch: %{ix86} x86_64 ppc
 
 # Pre-generated html docs (not used)
 #Source1: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2
@@ -44,15 +43,12 @@
 %endif
 
 ## ppc section
-Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-powerpc-linux-binary.tar.bz2
-# another possible ppc bootstrap to try
-#Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
-# Latest powerpc-linux bootstrap build fails:
-# http://bugzilla.redhat.com/bugzilla/177029 
-Source35: ppc-linux-mcontext.h
+#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-powerpc-linux-binary.tar.bz2
 %ifarch ppc 
 %define sbcl_arch ppc
-%define sbcl_bootstrap_src -a 30
+BuildRequires: sbcl
+# or
+#define sbcl_bootstrap_src -a 30
 %endif
 
 Source100: my_setarch.c
@@ -103,10 +99,6 @@
 cp %{SOURCE2} ./customize-target-features.lisp
 %endif
 
-%ifarch ppc
-cp %{SOURCE35} src/runtime/ppc-linux-mcontext.h.BAK
-%endif
-
 # "install" local bootstrap
 %if "%{?sbcl_bootstrap_src}" != "%{nil}"
 mkdir sbcl-bootstrap
@@ -224,7 +216,10 @@
 
 
 %changelog
-* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net 0.9.12-1.1
+* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-2
+- respin, using new ppc bootstrap 
+
+* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-1.1
 - try re-enabling ppc build
 
 * Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	28 Apr 2006 14:12:01 -0000	1.12
+++ sources	28 Apr 2006 15:07:37 -0000	1.13
@@ -1,2 +1 @@
 82eef4f47d6a72a36d4484bf503fc7db  sbcl-0.9.12-source.tar.bz2
-83693674395d102961b76f30b241f522  sbcl-0.9.8-powerpc-linux-binary.tar.bz2


--- ppc-linux-mcontext.h DELETED ---



From fedora-extras-commits at redhat.com  Fri Apr 28 15:20:59 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 28 Apr 2006 08:20:59 -0700
Subject: rpms/maxima/devel maxima.spec,1.25,1.26
Message-ID: <200604281521.k3SFL1J2003932@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3911

Modified Files:
	maxima.spec 
Log Message:
* Mon Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-3 
- respin, using new ppc bootstrap



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- maxima.spec	28 Apr 2006 13:59:34 -0000	1.25
+++ maxima.spec	28 Apr 2006 15:20:59 -0000	1.26
@@ -3,18 +3,13 @@
 Name: 	 maxima
 Version: 5.9.3
 
-Release: 2%{?dist}.1
+Release: 3%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
 Source:	 http://dl.sourceforge.net/sourceforge/maxima/maxima-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# add ppc when lisps are available:
-#  (clisp: http://bugzilla.redhat.com/bugzilla/166347) 
-#  (gcl:   http://bugzilla.redhat.com/bugzilla/167952)
-#  (sbcl:  https://bugzilla.redhat.com/bugzilla/177029)
-#ExclusiveArch: %{ix86} x86_64 
-ExclusiveArch: ppc
+ExclusiveArch: %{ix86} x86_64 ppc
 
 %ifarch %{ix86}
 %define _enable_cmucl --enable-cmucl
@@ -29,8 +24,9 @@
 
 %ifarch ppc
 %define default_lisp sbcl
+# clisp: http://bugzilla.redhat.com/bugzilla/166347
 #define _enable_clisp --enable-clisp 
-#define _enable_cmucl --enable-cmucl 
+# gcl:   http://bugzilla.redhat.com/bugzilla/167952
 #define _enable_gcl --enable-gcl 
 %define _enable_sbcl --enable-sbcl 
 %endif
@@ -113,8 +109,7 @@
 Summary: Maxima compiled with clisp
 Group:	 Applications/Engineering
 BuildRequires: clisp-devel
-#define clisp_ver %{expand:%%(clisp --version | head -n 1 | cut -d' ' -f3 )}
-Requires: clisp %{?clisp_ver: >= %{clisp_ver}}
+Requires: clisp
 Requires: %{name} = %{version}
 Obsoletes: maxima-exec-clisp < %{version}-%{release}
 Provides: %{name}-runtime = %{version}
@@ -371,6 +366,9 @@
 
 
 %changelog
+* Mon Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-3 
+- respin, using new ppc bootstrap
+
 * Fri Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-2.1
 - try ppc build against sbcl
 



From fedora-extras-commits at redhat.com  Fri Apr 28 17:24:27 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 28 Apr 2006 10:24:27 -0700
Subject: rpms/maxima/FC-5 maxima.spec,1.22,1.23
Message-ID: <200604281724.k3SHOTaI009342@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9323

Modified Files:
	maxima.spec 
Log Message:
* Mon Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-3 
- respin, using new ppc bootstrap



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-5/maxima.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- maxima.spec	28 Apr 2006 12:31:19 -0000	1.22
+++ maxima.spec	28 Apr 2006 17:24:27 -0000	1.23
@@ -1,24 +1,15 @@
 
-%if "%{?fedora}" > "4"
-# See http://bugzilla.redhat.com/bugzilla/187647
-%define setarch_hack 1
-%endif
-
 Summary: Symbolic Computation Program
 Name: 	 maxima
 Version: 5.9.3
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
 Source:	 http://dl.sourceforge.net/sourceforge/maxima/maxima-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# add ppc when lisps are available:
-#  (clisp: http://bugzilla.redhat.com/bugzilla/166347) 
-#  (gcl:   http://bugzilla.redhat.com/bugzilla/167952)
-#  (sbcl:  https://bugzilla.redhat.com/bugzilla/177029)
-ExclusiveArch: %{ix86} x86_64 
+ExclusiveArch: %{ix86} x86_64 ppc
 
 %ifarch %{ix86}
 %define _enable_cmucl --enable-cmucl
@@ -32,11 +23,12 @@
 %endif
 
 %ifarch ppc
-#define default_lisp sbcl
+%define default_lisp sbcl
+# clisp: http://bugzilla.redhat.com/bugzilla/166347
 #define _enable_clisp --enable-clisp 
-#define _enable_cmucl --enable-cmucl 
+# gcl:   http://bugzilla.redhat.com/bugzilla/167952
 #define _enable_gcl --enable-gcl 
-#define _enable_sbcl --enable-sbcl 
+%define _enable_sbcl --enable-sbcl 
 %endif
 
 Source1: maxima.png
@@ -117,8 +109,7 @@
 Summary: Maxima compiled with clisp
 Group:	 Applications/Engineering
 BuildRequires: clisp-devel
-#define clisp_ver %{expand:%%(clisp --version | head -n 1 | cut -d' ' -f3 )}
-Requires: clisp %{?clisp_ver: >= %{clisp_ver}}
+Requires: clisp
 Requires: %{name} = %{version}
 Obsoletes: maxima-exec-clisp < %{version}-%{release}
 Provides: %{name}-runtime = %{version}
@@ -145,7 +136,9 @@
 Group:   Applications/Engineering
 BuildRequires: gcl
 Requires:  %{name} = %{version}
-%if "%{?setarch_hack}" == "1"
+%if "%{?fedora}" > "4"
+# See http://bugzilla.redhat.com/bugzilla/187647
+%define setarch_hack 1
 BuildRequires: setarch
 Requires:  setarch
 %endif
@@ -373,6 +366,12 @@
 
 
 %changelog
+* Mon Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-3 
+- respin, using new ppc bootstrap
+
+* Fri Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-2.1
+- try ppc build against sbcl
+
 * Wed Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-2
 - use setarch -X hack to allow runtime-gcl to function (#187647)
 - respin for sbcl-0.9.12



From fedora-extras-commits at redhat.com  Fri Apr 28 17:24:48 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 28 Apr 2006 10:24:48 -0700
Subject: rpms/maxima/FC-4 maxima.spec,1.20,1.21
Message-ID: <200604281724.k3SHOoka009403@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9386

Modified Files:
	maxima.spec 
Log Message:
* Mon Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-3 
- respin, using new ppc bootstrap



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-4/maxima.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- maxima.spec	28 Apr 2006 12:36:11 -0000	1.20
+++ maxima.spec	28 Apr 2006 17:24:48 -0000	1.21
@@ -1,24 +1,15 @@
 
-%if "%{?fedora}" > "4"
-# See http://bugzilla.redhat.com/bugzilla/187647
-%define setarch_hack 1
-%endif
-
 Summary: Symbolic Computation Program
 Name: 	 maxima
 Version: 5.9.3
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
 Source:	 http://dl.sourceforge.net/sourceforge/maxima/maxima-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# add ppc when lisps are available:
-#  (clisp: http://bugzilla.redhat.com/bugzilla/166347) 
-#  (gcl:   http://bugzilla.redhat.com/bugzilla/167952)
-#  (sbcl:  https://bugzilla.redhat.com/bugzilla/177029)
-ExclusiveArch: %{ix86} x86_64 
+ExclusiveArch: %{ix86} x86_64 ppc
 
 %ifarch %{ix86}
 %define _enable_cmucl --enable-cmucl
@@ -32,11 +23,12 @@
 %endif
 
 %ifarch ppc
-#define default_lisp sbcl
+%define default_lisp sbcl
+# clisp: http://bugzilla.redhat.com/bugzilla/166347
 #define _enable_clisp --enable-clisp 
-#define _enable_cmucl --enable-cmucl 
+# gcl:   http://bugzilla.redhat.com/bugzilla/167952
 #define _enable_gcl --enable-gcl 
-#define _enable_sbcl --enable-sbcl 
+%define _enable_sbcl --enable-sbcl 
 %endif
 
 Source1: maxima.png
@@ -117,8 +109,7 @@
 Summary: Maxima compiled with clisp
 Group:	 Applications/Engineering
 BuildRequires: clisp-devel
-#define clisp_ver %{expand:%%(clisp --version | head -n 1 | cut -d' ' -f3 )}
-Requires: clisp %{?clisp_ver: >= %{clisp_ver}}
+Requires: clisp
 Requires: %{name} = %{version}
 Obsoletes: maxima-exec-clisp < %{version}-%{release}
 Provides: %{name}-runtime = %{version}
@@ -145,7 +136,9 @@
 Group:   Applications/Engineering
 BuildRequires: gcl
 Requires:  %{name} = %{version}
-%if "%{?setarch_hack}" == "1"
+%if "%{?fedora}" > "4"
+# See http://bugzilla.redhat.com/bugzilla/187647
+%define setarch_hack 1
 BuildRequires: setarch
 Requires:  setarch
 %endif
@@ -373,6 +366,12 @@
 
 
 %changelog
+* Mon Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-3 
+- respin, using new ppc bootstrap
+
+* Fri Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-2.1
+- try ppc build against sbcl
+
 * Wed Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-2
 - use setarch -X hack to allow runtime-gcl to function (#187647)
 - respin for sbcl-0.9.12



From fedora-extras-commits at redhat.com  Fri Apr 28 18:20:13 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Fri, 28 Apr 2006 11:20:13 -0700
Subject: rpms/rman - New directory
Message-ID: <200604281820.k3SIKFq3011842@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/rman
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11821/rman

Log Message:
Directory /cvs/extras/rpms/rman added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 28 18:20:14 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Fri, 28 Apr 2006 11:20:14 -0700
Subject: rpms/rman/devel - New directory
Message-ID: <200604281820.k3SIKG1Q011845@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/rman/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11821/rman/devel

Log Message:
Directory /cvs/extras/rpms/rman/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 28 18:20:48 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Fri, 28 Apr 2006 11:20:48 -0700
Subject: rpms/rman Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604281820.k3SIKo7K011901@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/rman
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11868

Added Files:
	Makefile import.log 
Log Message:
Setup of module rman


--- NEW FILE Makefile ---
# Top level Makefile for module rman
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 28 18:20:49 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Fri, 28 Apr 2006 11:20:49 -0700
Subject: rpms/rman/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200604281820.k3SIKp2a011904@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/rman/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11868/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rman


--- 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 Apr 28 18:21:39 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Fri, 28 Apr 2006 11:21:39 -0700
Subject: rpms/rman import.log,1.1,1.2
Message-ID: <200604281821.k3SILfnZ011965@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/rman
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11932

Modified Files:
	import.log 
Log Message:
auto-import rman-3.2-2 on branch devel from rman-3.2-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/rman/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	28 Apr 2006 18:20:48 -0000	1.1
+++ import.log	28 Apr 2006 18:21:39 -0000	1.2
@@ -0,0 +1 @@
+rman-3_2-2:HEAD:rman-3.2-2.src.rpm:1146248483



From fedora-extras-commits at redhat.com  Fri Apr 28 18:21:40 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Fri, 28 Apr 2006 11:21:40 -0700
Subject: rpms/rman/devel rman.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200604281821.k3SILgt6011970@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/rman/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11932/devel

Modified Files:
	.cvsignore sources 
Added Files:
	rman.spec 
Log Message:
auto-import rman-3.2-2 on branch devel from rman-3.2-2.src.rpm


--- NEW FILE rman.spec ---
Name:		rman
Version:	3.2 
Release:	2%{?dist}
Summary:	Converts man pages to various other formats

Group:		System Environment/Base
License:	Artistic
URL:		http://sourceforge.net/projects/polyglotman
Source0:	http://easynews.dl.sourceforge.net/sourceforge/polyglotman/rman-3.2.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Parse formatted man pages and man page source from most flavors of UNIX.
Convert to HTML, ASCII, TkMan, DocBook, and other formats.


%prep
%setup -q


%build
cp Makefile Makefile.orig
cat Makefile.orig \
|sed s?"^BINDIR =.*"?"BINDIR = %{_bindir}"? \
|sed s?"^MANDIR =.*"?"MANDIR = %{_mandir}/man1"? \
|sed s?"^CFLAGS =.*"?"CFLAGS = %{optflags} -finline-functions"? \
> Makefile

make %{?_smp_mflags}

pushd contrib
for file in `ls`; do
sed -i 's?^#!/usr/local/bin/perl?#!%{_bindir}/perl?' ${file}
sed -i 's?\r??' ${file}
done
popd


%install
rm -rf %{buildroot}
install -d -m755 %{buildroot}%{_bindir}
install -d -m755 %{buildroot}%{_mandir}/man1
install -m755 rman %{buildroot}%{_bindir}/
install -m644 rman.1 %{buildroot}%{_mandir}/man1/


%clean
rm -rf %buildroot


%files
%defattr(-,root,root,-)
%doc CHANGES README-rman.txt rman.html contrib
%{_bindir}/rman
%{_mandir}/man1/*



%changelog
* Fri Apr 28 2006 Michael A. Peters <mpeters at mac.com> - 3.2-2
- Package the contrib directory with %%doc

* Thu Apr 27 2006 Michael A. Peters <mpeters at mac.com> - 3.2-1
- Initial packaging for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rman/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Apr 2006 18:20:49 -0000	1.1
+++ .cvsignore	28 Apr 2006 18:21:40 -0000	1.2
@@ -0,0 +1 @@
+rman-3.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rman/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Apr 2006 18:20:49 -0000	1.1
+++ sources	28 Apr 2006 18:21:40 -0000	1.2
@@ -0,0 +1 @@
+6d1d67641c6d042595a96a62340d3cc6  rman-3.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 28 18:25:08 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Fri, 28 Apr 2006 11:25:08 -0700
Subject: owners owners.list,1.912,1.913
Message-ID: <200604281825.k3SIPA45012051@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12027

Modified Files:
	owners.list 
Log Message:
initial ownership of rman



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.912
retrieving revision 1.913
diff -u -r1.912 -r1.913
--- owners.list	28 Apr 2006 08:27:03 -0000	1.912
+++ owners.list	28 Apr 2006 18:25:07 -0000	1.913
@@ -1349,6 +1349,7 @@
 Fedora Extras|rinetd|TCP redirection server|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|rkhunter|Rootkit Hunter scans for rootkits, backdoors and local exploits|tamaster at pobox.com|extras-qa at fedoraproject.org|
 Fedora Extras|rlog|Runtime Logging for C++|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
+Fedora Extras|rman|Converts man pages to various other formats|mpeters at mac.com|extras-qa at fedoraproject.org|
 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|



From fedora-extras-commits at redhat.com  Fri Apr 28 18:47:37 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Fri, 28 Apr 2006 11:47:37 -0700
Subject: rpms/octave-forge/devel octave-forge-2006.03.17-octcdf.patch, NONE, 
	1.1 octave-forge.spec, 1.22, 1.23
Message-ID: <200604281847.k3SIldJG012163@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/octave-forge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12143

Modified Files:
	octave-forge.spec 
Added Files:
	octave-forge-2006.03.17-octcdf.patch 
Log Message:
Add patch for octcdf and associated specfile changes.

octave-forge-2006.03.17-octcdf.patch:

--- NEW FILE octave-forge-2006.03.17-octcdf.patch ---
Index: main/octcdf/Makefile
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/octcdf/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- main/octcdf/Makefile        19 Apr 2006 19:09:51 -0000      1.6
+++ main/octcdf/Makefile        28 Apr 2006 17:51:17 -0000
@@ -34,7 +34,7 @@
        RM = rm -f
 endif

-NCTARGET = ov-netcdf.oct
+NCTARGET = netcdf.oct

 NCSOURCES = ov-netcdf.cc ov-ncfile.cc ov-ncvar.cc ov-ncatt.cc ov-ncdim.cc
 OBJECTS = $(patsubst %.cc,%.o,$(NCSOURCES))
Index: main/octcdf/configure.add
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/octcdf/configure.add,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- main/octcdf/configure.add	15 Dec 2005 22:13:52 -0000	1.2
+++ main/octcdf/configure.add	25 Apr 2006 16:35:01 -0000	1.3
@@ -11,34 +11,29 @@
     OCTCDF_LIBS="$LDFLAGS"
     OCTCDF_CFLAGS="$CPPFLAGS"
 
-        dnl checking for opendap support
+    dnl first checking for opendap support
 
-        AC_MSG_CHECKING([for nc-dap])
+    AC_MSG_CHECKING([for nc-dap])
 
-        if ncdap-config --version > /dev/null 2>&1; then
+    if ncdap-config --version > /dev/null 2>&1; then
+          AC_MSG_RESULT([yes])
           OCTCDF_LIBS="$OCTCDF_LIBS `ncdap-config --libs`"
           OCTCDF_CFLAGS="$OCTCDF_CFLAGS `ncdap-config --cflags`"
-          HAVE_NCDAP=yes
-          AC_MSG_RESULT([yes])
-        else
-          HAVE_NCDAP=no
-          AC_MSG_RESULT([no])          
-        fi
-
 
-    dnl Checking if the NetCDF library exists. 
+          HAVE_NETCDF=yes
+    else
+          AC_MSG_RESULT([no])          
 
-    AC_CHECK_LIB(netcdf,nc_open, HAVE_NETCDF=yes, HAVE_NETCDF=no,)
+          dnl if no opendap, checking if the NetCDF library exists. 
 
-    if test $HAVE_NETCDF = yes ; then
-       OCTCDF_LIBS="$OCTCDF_LIBS -lnetcdf"
-    fi
+          AC_CHECK_LIB(netcdf,nc_open, HAVE_NETCDF=yes, HAVE_NETCDF=no,)
 
-    dnl if we don't have nc-dap then we have to check for netcdf.h
-    dnl otherwise it is already given by ncdap-config --cflags
+          if test $HAVE_NETCDF = yes ; then
+            OCTCDF_LIBS="$OCTCDF_LIBS -lnetcdf"
 
-    if test $HAVE_NCDAP = no ; then
-      AC_CHECK_HEADER(netcdf.h, HAVE_NETCDF=yes, HAVE_NETCDF=no)
+            dnl we have the libraries, no we have also the headers?
+            AC_CHECK_HEADER(netcdf.h, HAVE_NETCDF=yes, HAVE_NETCDF=no)
+          fi
     fi
 
     if test $HAVE_NETCDF = yes ; then


Index: octave-forge.spec
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- octave-forge.spec	19 Apr 2006 21:21:07 -0000	1.22
+++ octave-forge.spec	28 Apr 2006 18:47:37 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           octave-forge
 Version:        2006.03.17
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -16,12 +16,14 @@
 ## rm -Rf octave-forge-%{version}
 Source0:        %{name}-%{version}.patched.tar.gz
 Patch0:         %{name}-system.patch.gz
+Patch1:         %{name}-2006.03.17-octcdf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	octave >= 2.9.5 ImageMagick
 BuildRequires:  octave-devel tetex gcc-gfortran ginac-devel qhull-devel
-BuildRequires:  ImageMagick-c++-devel netcdf-devel pcre-devel gsl-devel
+BuildRequires:  ImageMagick-c++-devel libnc-dap-devel pcre-devel gsl-devel
 BuildRequires:  libjpeg-devel libpng-devel ncurses-devel libtermcap-devel
+BuildRequires:  autoconf
 
 %description
 Octave-forge is a community project for collaborative development of
@@ -34,11 +36,13 @@
 %prep
 %setup -q
 %patch0 -p1
+# The following patch requires regenerating the configure script
+%patch1 -p0
 # The sparse matrix functions are in octave 2.9.x so don't install them
 touch main/sparse/NOINSTALL
 
 %build
-export CPPFLAGS=-I%{_includedir}/netcdf-3
+./autogen.sh
 %configure
 make %{?_smp_mflags}
 
@@ -69,6 +73,10 @@
 
 
 %changelog
+* Thu Apr 27 2006 Quentin Spencer <qspencer at users.sf.net> 2006.03.17-3
+- Add fixes for octcdf (from the author), which changes the dependency
+  from netcdf to libnc-dap. (This requires autoconf temporarily.)
+
 * Wed Apr 19 2006 Quentin Spencer <qspencer at users.sf.net> 2006.03.17-2
 - New release for octave 2.9.5.
 - Patch added for incompatibilities between octave 2.9.4 and 2.9.5.



From fedora-extras-commits at redhat.com  Fri Apr 28 19:05:19 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 28 Apr 2006 12:05:19 -0700
Subject: rpms/wings/FC-5 wings.spec,1.1,1.2
Message-ID: <200604281905.k3SJ5LdI014905@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/wings/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14888

Modified Files:
	wings.spec 
Log Message:



Index: wings.spec
===================================================================
RCS file: /cvs/extras/rpms/wings/FC-5/wings.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wings.spec	28 Apr 2006 08:03:26 -0000	1.1
+++ wings.spec	28 Apr 2006 19:05:19 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           wings
 Version:        0.98.32b
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        3D Subdivision Modeler
 
 Group:          Applications/Multimedia



From fedora-extras-commits at redhat.com  Fri Apr 28 19:37:12 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Fri, 28 Apr 2006 12:37:12 -0700
Subject: rpms/rman/devel rman.spec,1.1,1.2
Message-ID: <200604281937.k3SJbEpc015190@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/rman/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15143/devel

Modified Files:
	rman.spec 
Log Message:
Minor cleanup to do a couple things better



Index: rman.spec
===================================================================
RCS file: /cvs/extras/rpms/rman/devel/rman.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rman.spec	28 Apr 2006 18:21:40 -0000	1.1
+++ rman.spec	28 Apr 2006 19:37:12 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		rman
 Version:	3.2 
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Converts man pages to various other formats
 
 Group:		System Environment/Base
@@ -29,7 +29,7 @@
 make %{?_smp_mflags}
 
 pushd contrib
-for file in `ls`; do
+for file in `find . -type f`; do
 sed -i 's?^#!/usr/local/bin/perl?#!%{_bindir}/perl?' ${file}
 sed -i 's?\r??' ${file}
 done
@@ -50,13 +50,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES README-rman.txt rman.html contrib
+%doc CHANGES README-rman.txt rman.html contrib/
 %{_bindir}/rman
 %{_mandir}/man1/*
 
 
 
 %changelog
+* Fri Apr 28 2006 Michael A. Peters <mpeters at mac.com> - 3.2-3
+- Minor cleanup to packaging
+
 * Fri Apr 28 2006 Michael A. Peters <mpeters at mac.com> - 3.2-2
 - Package the contrib directory with %%doc
 



From fedora-extras-commits at redhat.com  Fri Apr 28 19:37:06 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Fri, 28 Apr 2006 12:37:06 -0700
Subject: rpms/rman/FC-4 rman.spec,1.1,1.2
Message-ID: <200604281937.k3SJbc5L015193@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/rman/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15143/FC-4

Modified Files:
	rman.spec 
Log Message:
Minor cleanup to do a couple things better



Index: rman.spec
===================================================================
RCS file: /cvs/extras/rpms/rman/FC-4/rman.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rman.spec	28 Apr 2006 18:21:40 -0000	1.1
+++ rman.spec	28 Apr 2006 19:37:06 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		rman
 Version:	3.2 
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Converts man pages to various other formats
 
 Group:		System Environment/Base
@@ -29,7 +29,7 @@
 make %{?_smp_mflags}
 
 pushd contrib
-for file in `ls`; do
+for file in `find . -type f`; do
 sed -i 's?^#!/usr/local/bin/perl?#!%{_bindir}/perl?' ${file}
 sed -i 's?\r??' ${file}
 done
@@ -50,13 +50,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES README-rman.txt rman.html contrib
+%doc CHANGES README-rman.txt rman.html contrib/
 %{_bindir}/rman
 %{_mandir}/man1/*
 
 
 
 %changelog
+* Fri Apr 28 2006 Michael A. Peters <mpeters at mac.com> - 3.2-3
+- Minor cleanup to packaging
+
 * Fri Apr 28 2006 Michael A. Peters <mpeters at mac.com> - 3.2-2
 - Package the contrib directory with %%doc
 



From fedora-extras-commits at redhat.com  Fri Apr 28 19:37:07 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Fri, 28 Apr 2006 12:37:07 -0700
Subject: rpms/rman/FC-5 rman.spec,1.1,1.2
Message-ID: <200604281937.k3SJbduu015196@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/rman/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15143/FC-5

Modified Files:
	rman.spec 
Log Message:
Minor cleanup to do a couple things better



Index: rman.spec
===================================================================
RCS file: /cvs/extras/rpms/rman/FC-5/rman.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rman.spec	28 Apr 2006 18:21:40 -0000	1.1
+++ rman.spec	28 Apr 2006 19:37:06 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		rman
 Version:	3.2 
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Converts man pages to various other formats
 
 Group:		System Environment/Base
@@ -29,7 +29,7 @@
 make %{?_smp_mflags}
 
 pushd contrib
-for file in `ls`; do
+for file in `find . -type f`; do
 sed -i 's?^#!/usr/local/bin/perl?#!%{_bindir}/perl?' ${file}
 sed -i 's?\r??' ${file}
 done
@@ -50,13 +50,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES README-rman.txt rman.html contrib
+%doc CHANGES README-rman.txt rman.html contrib/
 %{_bindir}/rman
 %{_mandir}/man1/*
 
 
 
 %changelog
+* Fri Apr 28 2006 Michael A. Peters <mpeters at mac.com> - 3.2-3
+- Minor cleanup to packaging
+
 * Fri Apr 28 2006 Michael A. Peters <mpeters at mac.com> - 3.2-2
 - Package the contrib directory with %%doc
 



From fedora-extras-commits at redhat.com  Fri Apr 28 19:58:17 2006
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri, 28 Apr 2006 12:58:17 -0700
Subject: rpms/zile/devel zile.spec,1.3,1.4
Message-ID: <200604281958.k3SJwJ1J015431@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/zile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15369/devel

Modified Files:
	zile.spec 
Log Message:
* Fri Apr 28 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-2
- Bump to rebuild



Index: zile.spec
===================================================================
RCS file: /cvs/extras/rpms/zile/devel/zile.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zile.spec	27 Apr 2006 11:59:33 -0000	1.3
+++ zile.spec	28 Apr 2006 19:58:17 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Zile Is Lossy Emacs
 Name: zile
 Version: 2.2.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Editors
 URL: http://zile.sourceforge.net/
@@ -46,6 +46,9 @@
 %{_datadir}/zile/
 
 %changelog
+* Fri Apr 28 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-2
+- Bump to rebuild
+
 * Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-1
 - Bump to latest release.
 



From fedora-extras-commits at redhat.com  Fri Apr 28 19:58:10 2006
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri, 28 Apr 2006 12:58:10 -0700
Subject: rpms/zile/FC-3 zile.spec,1.3,1.4
Message-ID: <200604281958.k3SJwgER015434@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/zile/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15369/FC-3

Modified Files:
	zile.spec 
Log Message:
* Fri Apr 28 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-2
- Bump to rebuild



Index: zile.spec
===================================================================
RCS file: /cvs/extras/rpms/zile/FC-3/zile.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zile.spec	27 Apr 2006 11:59:31 -0000	1.3
+++ zile.spec	28 Apr 2006 19:58:10 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Zile Is Lossy Emacs
 Name: zile
 Version: 2.2.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Editors
 URL: http://zile.sourceforge.net/
@@ -46,6 +46,9 @@
 %{_datadir}/zile/
 
 %changelog
+* Fri Apr 28 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-2
+- Bump to rebuild
+
 * Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-1
 - Bump to latest release.
 



From fedora-extras-commits at redhat.com  Fri Apr 28 19:58:11 2006
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri, 28 Apr 2006 12:58:11 -0700
Subject: rpms/zile/FC-4 zile.spec,1.3,1.4
Message-ID: <200604281958.k3SJwhw9015437@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/zile/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15369/FC-4

Modified Files:
	zile.spec 
Log Message:
* Fri Apr 28 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-2
- Bump to rebuild



Index: zile.spec
===================================================================
RCS file: /cvs/extras/rpms/zile/FC-4/zile.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zile.spec	27 Apr 2006 11:59:32 -0000	1.3
+++ zile.spec	28 Apr 2006 19:58:10 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Zile Is Lossy Emacs
 Name: zile
 Version: 2.2.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Editors
 URL: http://zile.sourceforge.net/
@@ -46,6 +46,9 @@
 %{_datadir}/zile/
 
 %changelog
+* Fri Apr 28 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-2
+- Bump to rebuild
+
 * Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-1
 - Bump to latest release.
 



From fedora-extras-commits at redhat.com  Fri Apr 28 19:58:11 2006
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri, 28 Apr 2006 12:58:11 -0700
Subject: rpms/zile/FC-5 zile.spec,1.3,1.4
Message-ID: <200604281958.k3SJwhT3015440@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/zile/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15369/FC-5

Modified Files:
	zile.spec 
Log Message:
* Fri Apr 28 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-2
- Bump to rebuild



Index: zile.spec
===================================================================
RCS file: /cvs/extras/rpms/zile/FC-5/zile.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zile.spec	27 Apr 2006 11:59:32 -0000	1.3
+++ zile.spec	28 Apr 2006 19:58:11 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Zile Is Lossy Emacs
 Name: zile
 Version: 2.2.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Editors
 URL: http://zile.sourceforge.net/
@@ -46,6 +46,9 @@
 %{_datadir}/zile/
 
 %changelog
+* Fri Apr 28 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-2
+- Bump to rebuild
+
 * Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-1
 - Bump to latest release.
 



From fedora-extras-commits at redhat.com  Fri Apr 28 21:45:27 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Fri, 28 Apr 2006 14:45:27 -0700
Subject: rpms/qof/devel qof-x86_64.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 qof.spec, 1.12, 1.13 sources, 1.3, 1.4 qof-0.6.1-build.patch,
	1.1, NONE qof-dependencies.patch, 1.1, NONE
Message-ID: <200604282145.k3SLjTkq020490@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/qof/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20464

Modified Files:
	.cvsignore qof.spec sources 
Added Files:
	qof-x86_64.patch 
Removed Files:
	qof-0.6.1-build.patch qof-dependencies.patch 
Log Message:
- Update to qof 0.6.4.
- Drop patches which are no longer relevant upstream.
- Patch a small compile problem in building tests on x86_64.


qof-x86_64.patch:

--- NEW FILE qof-x86_64.patch ---
Index: qof-0.6.4/qof/test/test-date.c
===================================================================
--- qof-0.6.4.orig/qof/test/test-date.c
+++ qof-0.6.4/qof/test/test-date.c
@@ -93,8 +93,8 @@ check_conversion (const char * str, Time
   if ((expected_ts.tv_sec != ts.tv_sec) || (expected_ts.tv_nsec != ts.tv_nsec)) 
   {
     fprintf (stderr, 
-             "\nmis-converted \"%s\" to %lld.%09ld seconds\n"
-             "\twas expecting %lld.%09ld seconds\n", 
+             "\nmis-converted \"%s\" to %" G_GUINT64_FORMAT ".%09ld seconds\n"
+             "\twas expecting %" G_GUINT64_FORMAT ".%09ld seconds\n", 
              str, ts.tv_sec, ts.tv_nsec, 
              expected_ts.tv_sec, expected_ts.tv_nsec); 
     failure ("misconverted timespec");


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qof/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Jan 2006 18:50:01 -0000	1.3
+++ .cvsignore	28 Apr 2006 21:45:27 -0000	1.4
@@ -1 +1 @@
-qof-0.6.1.tar.gz
+qof-0.6.4.tar.gz


Index: qof.spec
===================================================================
RCS file: /cvs/extras/rpms/qof/devel/qof.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- qof.spec	13 Feb 2006 18:09:57 -0000	1.12
+++ qof.spec	28 Apr 2006 21:45:27 -0000	1.13
@@ -1,14 +1,13 @@
 Name:           qof
-Version:        0.6.1
-Release:        2%{?dist}
+Version:        0.6.4
+Release:        1%{?dist}
 Summary:        Query engine library for C objects
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://qof.sf.net
 Source0:        http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:		qof-0.6.1-build.patch
-Patch1:		qof-dependencies.patch
+Patch0: qof-x86_64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libxml2-devel
@@ -17,8 +16,6 @@
 BuildRequires: intltool
 # qof doesn't ship with pre-built documentation
 BuildRequires: doxygen
-# Patch1 modifies configure.in so we have to use autoconf
-BuildRequires: autoconf
 
 %description
 QOF - The Query Object Framework is a C library that provides a query engine
@@ -67,10 +64,8 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
-autoconf --force
 %configure --disable-static
 make
 
@@ -119,6 +114,10 @@
 %doc html
 
 %changelog
+* Mon Apr 17 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.6.4-1
+- Update to qof 0.6.4.
+- Patch a small compile problem in building tests on x86_64.
+  
 * Mon Feb 13 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.6.1-2
 - Bump and rebuild for FC5.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qof/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Jan 2006 18:50:01 -0000	1.3
+++ sources	28 Apr 2006 21:45:27 -0000	1.4
@@ -1 +1 @@
-2a1c4b231fb03e49d5d9237dc6698c3e  qof-0.6.1.tar.gz
+555787c7ea06a3412ff9119fe4127886  qof-0.6.4.tar.gz


--- qof-0.6.1-build.patch DELETED ---


--- qof-dependencies.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Apr 28 21:57:36 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Fri, 28 Apr 2006 14:57:36 -0700
Subject: owners owners.list,1.913,1.914
Message-ID: <200604282157.k3SLvcjv020591@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20574

Modified Files:
	owners.list 
Log Message:
Added ccrtp


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.913
retrieving revision 1.914
diff -u -r1.913 -r1.914
--- owners.list	28 Apr 2006 18:25:07 -0000	1.913
+++ owners.list	28 Apr 2006 21:57:36 -0000	1.914
@@ -113,6 +113,7 @@
 Fedora Extras|ccache|Compiler cache|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|CCfits|A C++ interface for cfitsio|spr at astrax.fis.ucm.es|extras-qa at fedoraproject.org|
 Fedora Extras|ccid|Generic USB CCID smart card reader driver|ville.skytta at iki.fi|extras-qa at fedoraproject.org|ludovic.rousseau at gmail.com
+Fedora Extras|ccrtp|Common C++ class framework for RTP/RTCP|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|cd-discid|utility to get CDDB discid information|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|cdiff|Diff readability enhancer for color terminals|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|cdlabelgen|Generates frontcards and traycards for inserting in CD jewelcases.|harald at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Apr 28 21:57:43 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 14:57:43 -0700
Subject: rpms/perl-HTTP-Proxy/devel .cvsignore, 1.3, 1.4 perl-HTTP-Proxy.spec,
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200604282157.k3SLvjpI020618@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-HTTP-Proxy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20597

Modified Files:
	.cvsignore perl-HTTP-Proxy.spec sources 
Log Message:
Update 1.19.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Mar 2006 10:53:27 -0000	1.3
+++ .cvsignore	28 Apr 2006 21:57:42 -0000	1.4
@@ -1 +1 @@
-HTTP-Proxy-0.18.tar.gz
+HTTP-Proxy-0.19.tar.gz


Index: perl-HTTP-Proxy.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/devel/perl-HTTP-Proxy.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-HTTP-Proxy.spec	22 Mar 2006 10:53:27 -0000	1.3
+++ perl-HTTP-Proxy.spec	28 Apr 2006 21:57:42 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           perl-HTTP-Proxy
-Version:        0.18
+Version:        0.19
 Release:        1%{?dist}
 Summary:        A pure Perl HTTP proxy
 
@@ -52,10 +52,13 @@
 %defattr(-,root,root,-)
 %doc Changes README eg/
 %{perl_vendorlib}/HTTP/
-%{_mandir}/man3/*.3*
+%{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Fri Apr 28 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.19-1
+- Update to 0.19.
+
 * Wed Mar 22 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.18-1
 - Update to 0.18.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Mar 2006 10:53:27 -0000	1.3
+++ sources	28 Apr 2006 21:57:42 -0000	1.4
@@ -1 +1 @@
-9a7e180caf7d6854cd3dad3fe0f21365  HTTP-Proxy-0.18.tar.gz
+e702b597f546ad88eed9e3f285f1fff1  HTTP-Proxy-0.19.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 28 21:59:05 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Fri, 28 Apr 2006 14:59:05 -0700
Subject: owners owners.list,1.914,1.915
Message-ID: <200604282159.k3SLx7EX020688@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20669

Modified Files:
	owners.list 
Log Message:
taking ownership of doctorj



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.914
retrieving revision 1.915
diff -u -r1.914 -r1.915
--- owners.list	28 Apr 2006 21:57:36 -0000	1.914
+++ owners.list	28 Apr 2006 21:59:05 -0000	1.915
@@ -204,7 +204,7 @@
 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 auroralinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|docbook2X|Convert docbook into man and Texinfo|pertusus at free.fr|extras-qa at fedoraproject.org|
-Fedora Extras|doctorj|Java source code analyzer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|doctorj|Java source code analyzer|michael at knox.net.nz|extras-qa at fedoraproject.org|
 Fedora Extras|dogtail|GUI test tool and automation framework|zcerza at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|dosbox|An x86/DOS emulator with sound/graphics|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|doulos-fonts|Doulos SIL fonts|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Apr 28 22:00:38 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Fri, 28 Apr 2006 15:00:38 -0700
Subject: rpms/ccrtp - New directory
Message-ID: <200604282200.k3SM0ewk020774@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ccrtp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20753/ccrtp

Log Message:
Directory /cvs/extras/rpms/ccrtp added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 28 22:00:38 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Fri, 28 Apr 2006 15:00:38 -0700
Subject: rpms/ccrtp/devel - New directory
Message-ID: <200604282200.k3SM0efJ020777@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ccrtp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20753/ccrtp/devel

Log Message:
Directory /cvs/extras/rpms/ccrtp/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 28 22:00:59 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Fri, 28 Apr 2006 15:00:59 -0700
Subject: rpms/ccrtp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200604282201.k3SM11Hb020838@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ccrtp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20799/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ccrtp


--- 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 Apr 28 22:00:58 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Fri, 28 Apr 2006 15:00:58 -0700
Subject: rpms/ccrtp Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604282201.k3SM10YD020835@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ccrtp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20799

Added Files:
	Makefile import.log 
Log Message:
Setup of module ccrtp


--- NEW FILE Makefile ---
# Top level Makefile for module ccrtp
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 28 22:02:16 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Fri, 28 Apr 2006 15:02:16 -0700
Subject: rpms/ccrtp/devel ccrtp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200604282202.k3SM2Idh023021@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ccrtp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22981/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ccrtp.spec 
Log Message:
auto-import ccrtp-1.3.7-1 on branch devel from ccrtp-1.3.7-1.src.rpm


--- NEW FILE ccrtp.spec ---
Summary: Common C++ class framework for RTP/RTCP
Name: ccrtp
Version: 1.3.7
Release: 1%{?dist}
License: GPL
Group: System Environment/Libraries
Source0: http://download.sourceforge.net/gnutelephony/ccrtp-%{version}.tar.gz
URL: http://www.gnu.org/software/commoncpp/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: commoncpp2-devel

%description
ccRTP is a generic, extensible and efficient C++ framework for
developing applications based on the Real-Time Transport Protocol
(RTP) from the IETF. It is based on Common C++ and provides a full
RTP/RTCP stack for sending and receiving of realtime data by the use
of send and receive packet queues. ccRTP supports unicast,
multi-unicast and multicast, manages multiple sources, handles RTCP
automatically, supports different threading models and is generic as
for underlying network and transport protocols.

%package devel
Summary: Header files and libraries for %{name} development
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig, commoncpp2-devel
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info

%description devel
The %{name}-devel package contains the header files and libraries needed
to develop programs that use the %{name} library.


%prep
%setup -q
chmod 644 src/ccrtp/rtp.h

%build
%configure \
	--disable-static
%{__make} %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=%{buildroot}
rm -f %{buildroot}%{_infodir}/dir
find %{buildroot} -name '*.la' -exec rm -f {} \;

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%post devel
/sbin/install-info %{_infodir}/ccrtp.info* %{_infodir}/dir

%preun devel
if [ $1 = 0 ]; then
    /sbin/install-info --delete %{_infodir}/ccrtp.info* %{_infodir}/dir
fi

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING README COPYING.addendum
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc doc/html
%dir %{_includedir}/ccrtp
%{_includedir}/ccrtp/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/libccrtp1.pc
%{_infodir}/ccrtp.info*

%changelog
* Mon Apr 24 2006 Andreas Thienemann <andreas at bawue.net> 1.3.7-1
- Updated to 1.3.7

* Fri Feb 03 2006 Andreas Thienemann <andreas at bawue.net> 1.3.6-1
- Initial spec.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ccrtp/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Apr 2006 22:00:59 -0000	1.1
+++ .cvsignore	28 Apr 2006 22:02:16 -0000	1.2
@@ -0,0 +1 @@
+ccrtp-1.3.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ccrtp/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Apr 2006 22:00:59 -0000	1.1
+++ sources	28 Apr 2006 22:02:16 -0000	1.2
@@ -0,0 +1 @@
+6621be1852bd90c3dbbafa895618d8f0  ccrtp-1.3.7.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 28 22:02:14 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Fri, 28 Apr 2006 15:02:14 -0700
Subject: rpms/ccrtp import.log,1.1,1.2
Message-ID: <200604282202.k3SM2mP2023045@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ccrtp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22981

Modified Files:
	import.log 
Log Message:
auto-import ccrtp-1.3.7-1 on branch devel from ccrtp-1.3.7-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ccrtp/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	28 Apr 2006 22:00:58 -0000	1.1
+++ import.log	28 Apr 2006 22:02:13 -0000	1.2
@@ -0,0 +1 @@
+ccrtp-1_3_7-1:HEAD:ccrtp-1.3.7-1.src.rpm:1146261715



From fedora-extras-commits at redhat.com  Fri Apr 28 22:03:11 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 28 Apr 2006 15:03:11 -0700
Subject: rpms/gauche - New directory
Message-ID: <200604282203.k3SM3DGM023143@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23113/gauche

Log Message:
Directory /cvs/extras/rpms/gauche added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 28 22:03:12 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 28 Apr 2006 15:03:12 -0700
Subject: rpms/gauche/devel - New directory
Message-ID: <200604282203.k3SM3EUP023149@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23113/gauche/devel

Log Message:
Directory /cvs/extras/rpms/gauche/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 28 22:03:28 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 28 Apr 2006 15:03:28 -0700
Subject: rpms/gauche Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604282203.k3SM3UL9023229@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23182

Added Files:
	Makefile import.log 
Log Message:
Setup of module gauche


--- NEW FILE Makefile ---
# Top level Makefile for module gauche
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 28 22:03:28 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 15:03:28 -0700
Subject: rpms/perl-Error/devel .cvsignore, 1.3, 1.4 perl-Error.spec, 1.7,
	1.8 sources, 1.3, 1.4
Message-ID: <200604282203.k3SM3Ufo023235@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Error/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23188

Modified Files:
	.cvsignore perl-Error.spec sources 
Log Message:
Update to 0.15009.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Apr 2006 21:00:40 -0000	1.3
+++ .cvsignore	28 Apr 2006 22:03:28 -0000	1.4
@@ -1 +1 @@
-Error-0.15008.tar.gz
+Error-0.15009.tar.gz


Index: perl-Error.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/devel/perl-Error.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Error.spec	19 Apr 2006 21:00:40 -0000	1.7
+++ perl-Error.spec	28 Apr 2006 22:03:28 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           perl-Error
-Version:        0.15008
+Version:        0.15009
 Release:        1%{?dist}
 Summary:        Error Perl module
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Fri Apr 28 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.15009-1
+- Update to 0.15009.
+
 * Wed Apr 19 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.15008-1
 - Update to 0.15008.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Apr 2006 21:00:40 -0000	1.3
+++ sources	28 Apr 2006 22:03:28 -0000	1.4
@@ -1 +1 @@
-e66c11a0b7a501391643321f86f2171e  Error-0.15008.tar.gz
+758e3e2024d883095d500d91e3a65b8d  Error-0.15009.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 28 22:03:28 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 28 Apr 2006 15:03:28 -0700
Subject: rpms/gauche/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604282203.k3SM3UqO023236@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23182/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gauche


--- 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 Apr 28 22:05:17 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 28 Apr 2006 15:05:17 -0700
Subject: rpms/gauche import.log,1.1,1.2
Message-ID: <200604282205.k3SM5J9Z023351@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23317

Modified Files:
	import.log 
Log Message:
auto-import gauche-0.8.7-3.fc5 on branch devel from gauche-0.8.7-3.fc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gauche/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	28 Apr 2006 22:03:28 -0000	1.1
+++ import.log	28 Apr 2006 22:05:17 -0000	1.2
@@ -0,0 +1 @@
+gauche-0_8_7-3_fc5:HEAD:gauche-0.8.7-3.fc5.src.rpm:1146261910



From fedora-extras-commits at redhat.com  Fri Apr 28 22:05:18 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 28 Apr 2006 15:05:18 -0700
Subject: rpms/gauche/devel gauche-jp.patch, NONE, 1.1 gauche.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604282205.k3SM5KWG023358@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23317/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gauche-jp.patch gauche.spec 
Log Message:
auto-import gauche-0.8.7-3.fc5 on branch devel from gauche-0.8.7-3.fc5.src.rpm

gauche-jp.patch:

--- NEW FILE gauche-jp.patch ---
--- Gauche-0.8.7/doc/modgauche.texi.jp	2006-04-27 21:24:49.000000000 +0200
+++ Gauche-0.8.7/doc/modgauche.texi	2006-04-27 21:25:30.000000000 +0200
@@ -8048,7 +8048,7 @@
 it finds your code referring to undefined variable.  In such case,
 you can give a list of symbols to the @var{allow-undefined}
 keyword argument; the test will excludes them from the check.
- at c COMMON
+ at c JP
 ????????????????????????????????????????????????????????
 ??????????????????????????????????????????????????????????
 ??????????????????????????????????????????????????????????
@@ -8056,7 +8056,7 @@
 ????????????????????????????????????????????????????????????
 ??????????????????????????????????????????????????????????????
 @var{allow-undefined}??????????????????????????????
- at c JP
+ at c COMMON
 @end defun
 
 @defun test-start module-name


--- NEW FILE gauche.spec ---
Name:		gauche
Version:	0.8.7
Release:	3%{?dist}
Summary:	Scheme script interpreter with multibyte character handling

Group:		Development/Languages
License:	BSD
URL:		http://www.shiro.dreamhost.com/scheme/gauche
Source:		http://download.sourceforge.net/gauche/Gauche-0.8.7.tgz
Patch0:		gauche-jp.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	gdbm-devel
BuildRequires:	texinfo
Requires(post):	/sbin/install-info, /sbin/ldconfig
Requires(postun): /sbin/install-info, /sbin/ldconfig


%description
Gauche is a Scheme interpreter conforming Revised^5 Report on
Algorithmic Language Scheme.  It is designed for rapid development of
daily tools like system management and text processing.  It can handle
multibyte character strings natively.


%package devel
Summary:	Development files for Gauche
Group:		Development/Languages
Requires:	%{name} = %{version}-%{release}

%description devel
Development files for Gauche.


%prep
%setup -q -n Gauche-%{version}
%patch0 -p1


%build
%configure --with-rpath=no --enable-threads=pthreads --enable-multibyte=utf-8
perl -pi -e "s|POSTINSTALL = TARGETLIB=|POSTINSTALL = TARGETLIB=$RPM_BUILD_ROOT/|" src/Makefile
%ifarch i386 i586 i686
LD_LIBRARY_PATH=`pwd`/src make %{?_smp_mflags} OPTFLAGS="-fomit-frame-pointer"
%else
LD_LIBRARY_PATH=`pwd`/src make %{?_smp_mflags}
%endif


%install
rm -fr $RPM_BUILD_ROOT
LD_LIBRARY_PATH=`pwd`/src make DESTDIR=$RPM_BUILD_ROOT install-pkg
LD_LIBRARY_PATH=`pwd`/src make DESTDIR=$RPM_BUILD_ROOT install-doc

# correct permissions
chmod -R u+w $RPM_BUILD_ROOT
chmod 0644 examples/grep.scm
chmod 0644 ext/template.*

# for some reason the libraries are not correctly installed
mv src/libgauche.so* $RPM_BUILD_ROOT%{_libdir}

# remove japanese doc
rm -f $RPM_BUILD_ROOT%{_infodir}/gauche-refj.*

touch $RPM_BUILD_ROOT%{_datadir}/gauche/%{version}/lib/slibcat

# this things go into the doc of the devel package
rm -f $RPM_BUILD_ROOT%{_datadir}/gauche/%{version}/template*
rm -f $RPM_BUILD_ROOT%{_datadir}/gauche/%{version}/aclocal*

# make .c files readable for debuginfo
find -name '*.c' | xargs chmod 0644


%check
cd src; LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} make test


%clean
rm -fr $RPM_BUILD_ROOT


%post
/sbin/install-info %{_infodir}/gauche-refe.info %{_infodir}/dir 2>/dev/null || :
/sbin/ldconfig
# creates slib catalog, if possible.
/usr/bin/gosh -u slib -e "(require 'logical)" -e "(exit 0)" > /dev/null 2>&1 || echo


%postun
if [ $1 = 0 ]; then
  /sbin/install-info --delete %{_infodir}/gauche-refe.info %{_infodir}/dir 2>/dev/null || :
fi
/sbin/ldconfig


%files
%defattr(-,root,root,-)
%{_bindir}/gauche-cesconv
%{_bindir}/gauche-install
%{_bindir}/gauche-package
%{_bindir}/gosh
%{_libdir}/libgauche.so.*
%{_libdir}/gauche
%{_infodir}/*
%{_mandir}/man*/gosh*
%{_datadir}/gauche
%exclude %{_libdir}/gauche/%{version}/include
%ghost %{_datadir}/gauche/%{version}/lib/slibcat
%doc ChangeLog AUTHORS VERSION README NEWS examples COPYING


%files devel
%defattr(-,root,root,-)
%{_bindir}/gauche-config
%{_libdir}/libgauche.so
%{_libdir}/gauche/%{version}/include
%{_datadir}/aclocal/gauche.m4
%{_mandir}/man*/gauche-config*
%doc ext/template.*


%changelog
* Fri Apr 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 0.8.7-3
- added %%check
- included COPYING file in %%doc

* Thu Apr 27 2006 Gerard Milmeister <gemi at bluewin.ch> - 0.8.7-2
- fixes to permissions
- patch to fix jp problem in texinfo file

* Fri Apr 21 2006 Gerard Milmeister <gemi at bluewin.ch> - 0.8.7-1
- new version 0.8.7

* Sun Nov  6 2005 Gerard Milmeister <gemi at bluewin.ch> - 0.8.6-1
- New Version 0.8.6

* Fri Jul  1 2005 Gerard Milmeister <gemi at bluewin.ch> - 0.8.5-1
- New Version 0.8.5

* Wed Feb 23 2005 Gerard Milmeister <gemi at bluewin.ch> - 0:0.8.3-1
- New Version 0.8.3

* Sat Aug  7 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:0.8.1-0.fdr.1
- New Version 0.8.1

* Sun May 23 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:0.8-0.fdr.1
- New Version 0.8

* Fri Mar 19 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:0.7.4.2-0.fdr.1
- New Version 0.7.4.2

* Fri Mar 19 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:0.7.4.1-0.fdr.1
- New Version 0.7.4.1

* Sun Nov  9 2003 Gerard Milmeister <gemi at bluewin.ch> - 0:0.7.2-0.fdr.1
- First Fedora release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gauche/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Apr 2006 22:03:28 -0000	1.1
+++ .cvsignore	28 Apr 2006 22:05:18 -0000	1.2
@@ -0,0 +1 @@
+Gauche-0.8.7.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gauche/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Apr 2006 22:03:28 -0000	1.1
+++ sources	28 Apr 2006 22:05:18 -0000	1.2
@@ -0,0 +1 @@
+5c7cb6eba7455c9877aec884b0088a25  Gauche-0.8.7.tgz



From fedora-extras-commits at redhat.com  Fri Apr 28 23:01:36 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 28 Apr 2006 16:01:36 -0700
Subject: owners owners.list,1.915,1.916
Message-ID: <200604282302.k3SN2Abk030245@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30226

Modified Files:
	owners.list 
Log Message:
added gauche


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.915
retrieving revision 1.916
diff -u -r1.915 -r1.916
--- owners.list	28 Apr 2006 21:59:05 -0000	1.915
+++ owners.list	28 Apr 2006 23:01:36 -0000	1.916
@@ -312,6 +312,7 @@
 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|gambas|IDE based on a basic interpreter with object extensions|tcallawa at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|gauche|Scheme script interpreter with multibyte character handling|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|gazpacho|Glade Interface Creator|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gc|C++ Garbage Collector|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|gcdmaster|A Gnome Disk-At-Once (DAO) Audio CD writer|denis at poolshark.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Apr 29 01:22:33 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 28 Apr 2006 18:22:33 -0700
Subject: rpms/git/devel .cvsignore, 1.25, 1.26 git.spec, 1.13, 1.14 sources, 
	1.25, 1.26
Message-ID: <200604290122.k3T1MZfb002537@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2516

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.3.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	20 Apr 2006 00:34:48 -0000	1.25
+++ .cvsignore	29 Apr 2006 01:22:33 -0000	1.26
@@ -1 +1 @@
-git-1.3.0.tar.gz
+git-1.3.1.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/devel/git.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- git.spec	20 Apr 2006 00:34:48 -0000	1.13
+++ git.spec	29 Apr 2006 01:22:33 -0000	1.14
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.3.0
+Version: 	1.3.1
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Fri Apr 28 2006 Chris Wright <chrisw at redhat.com> 1.3.1-1
+- git-1.3.1
+
 * Wed Apr 19 2006 Chris Wright <chrisw at redhat.com> 1.3.0-1
 - git-1.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	20 Apr 2006 00:34:48 -0000	1.25
+++ sources	29 Apr 2006 01:22:33 -0000	1.26
@@ -1 +1 @@
-37137c9f87b0082fbf04e6b80a5144e2  git-1.3.0.tar.gz
+c925fd87f01f5ba638ff06d21578405b  git-1.3.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 29 01:24:12 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 28 Apr 2006 18:24:12 -0700
Subject: rpms/git/FC-5 .cvsignore, 1.25, 1.26 git.spec, 1.13, 1.14 sources, 
	1.25, 1.26
Message-ID: <200604290124.k3T1OEeS002615@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2594

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.3.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/FC-5/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	20 Apr 2006 00:36:33 -0000	1.25
+++ .cvsignore	29 Apr 2006 01:24:12 -0000	1.26
@@ -1 +1 @@
-git-1.3.0.tar.gz
+git-1.3.1.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/FC-5/git.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- git.spec	20 Apr 2006 00:36:33 -0000	1.13
+++ git.spec	29 Apr 2006 01:24:12 -0000	1.14
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.3.0
+Version: 	1.3.1
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Fri Apr 28 2006 Chris Wright <chrisw at redhat.com> 1.3.1-1
+- git-1.3.1
+
 * Wed Apr 19 2006 Chris Wright <chrisw at redhat.com> 1.3.0-1
 - git-1.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/FC-5/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	20 Apr 2006 00:36:33 -0000	1.25
+++ sources	29 Apr 2006 01:24:12 -0000	1.26
@@ -1 +1 @@
-37137c9f87b0082fbf04e6b80a5144e2  git-1.3.0.tar.gz
+c925fd87f01f5ba638ff06d21578405b  git-1.3.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 29 01:27:52 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 28 Apr 2006 18:27:52 -0700
Subject: rpms/git/FC-4 .cvsignore, 1.25, 1.26 git.spec, 1.13, 1.14 sources, 
	1.25, 1.26
Message-ID: <200604290127.k3T1Rsuo002709@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2688

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.3.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/FC-4/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	20 Apr 2006 00:37:58 -0000	1.25
+++ .cvsignore	29 Apr 2006 01:27:52 -0000	1.26
@@ -1 +1 @@
-git-1.3.0.tar.gz
+git-1.3.1.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/FC-4/git.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- git.spec	20 Apr 2006 00:37:58 -0000	1.13
+++ git.spec	29 Apr 2006 01:27:52 -0000	1.14
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.3.0
+Version: 	1.3.1
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Fri Apr 28 2006 Chris Wright <chrisw at redhat.com> 1.3.1-1
+- git-1.3.1
+
 * Wed Apr 19 2006 Chris Wright <chrisw at redhat.com> 1.3.0-1
 - git-1.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/FC-4/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	20 Apr 2006 00:37:58 -0000	1.25
+++ sources	29 Apr 2006 01:27:52 -0000	1.26
@@ -1 +1 @@
-37137c9f87b0082fbf04e6b80a5144e2  git-1.3.0.tar.gz
+c925fd87f01f5ba638ff06d21578405b  git-1.3.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 29 01:28:51 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 28 Apr 2006 18:28:51 -0700
Subject: rpms/git/FC-3 .cvsignore, 1.25, 1.26 git.spec, 1.13, 1.14 sources, 
	1.25, 1.26
Message-ID: <200604290128.k3T1Srup002785@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2764

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.3.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/FC-3/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	20 Apr 2006 00:41:34 -0000	1.25
+++ .cvsignore	29 Apr 2006 01:28:51 -0000	1.26
@@ -1 +1 @@
-git-1.3.0.tar.gz
+git-1.3.1.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/FC-3/git.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- git.spec	20 Apr 2006 00:41:34 -0000	1.13
+++ git.spec	29 Apr 2006 01:28:51 -0000	1.14
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.3.0
+Version: 	1.3.1
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Fri Apr 28 2006 Chris Wright <chrisw at redhat.com> 1.3.1-1
+- git-1.3.1
+
 * Wed Apr 19 2006 Chris Wright <chrisw at redhat.com> 1.3.0-1
 - git-1.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/FC-3/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	20 Apr 2006 00:41:34 -0000	1.25
+++ sources	29 Apr 2006 01:28:51 -0000	1.26
@@ -1 +1 @@
-37137c9f87b0082fbf04e6b80a5144e2  git-1.3.0.tar.gz
+c925fd87f01f5ba638ff06d21578405b  git-1.3.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 29 01:39:29 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 18:39:29 -0700
Subject: rpms/perl-Email-Address/devel - New directory
Message-ID: <200604290139.k3T1dVjB002915@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-serv2891/perl-Email-Address/devel

Log Message:
Directory /cvs/extras/rpms/perl-Email-Address/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 29 01:39:28 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 18:39:28 -0700
Subject: rpms/perl-Email-Address - New directory
Message-ID: <200604290139.k3T1dUQb002912@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Address
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2891/perl-Email-Address

Log Message:
Directory /cvs/extras/rpms/perl-Email-Address added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 29 01:39:48 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 18:39:48 -0700
Subject: rpms/perl-Email-Address Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604290139.k3T1doHQ002968@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Address
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2937

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Email-Address


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Email-Address
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 29 01:39:49 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 18:39:49 -0700
Subject: rpms/perl-Email-Address/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200604290139.k3T1dpCa002971@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-serv2937/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Email-Address


--- 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 Apr 29 01:40:23 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 18:40:23 -0700
Subject: rpms/perl-Email-Address import.log,1.1,1.2
Message-ID: <200604290140.k3T1ePsI003040@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Address
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3006

Modified Files:
	import.log 
Log Message:
auto-import perl-Email-Address-1.80-1 on branch devel from perl-Email-Address-1.80-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Apr 2006 01:39:48 -0000	1.1
+++ import.log	29 Apr 2006 01:40:22 -0000	1.2
@@ -0,0 +1 @@
+perl-Email-Address-1_80-1:HEAD:perl-Email-Address-1.80-1.src.rpm:1146274814



From fedora-extras-commits at redhat.com  Sat Apr 29 01:40:23 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 18:40:23 -0700
Subject: rpms/perl-Email-Address/devel perl-Email-Address.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604290140.k3T1ePaR003045@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-serv3006/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Email-Address.spec 
Log Message:
auto-import perl-Email-Address-1.80-1 on branch devel from perl-Email-Address-1.80-1.src.rpm


--- NEW FILE perl-Email-Address.spec ---
Name:           perl-Email-Address
Version:        1.80
Release:        1%{?dist}
Summary:        RFC 2822 Address Parsing and Creation

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Email-Address/
Source0:        http://www.cpan.org/authors/id/C/CW/CWEST/Email-Address-%{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 class implements a complete RFC 2822 parser that locates email
addresses in strings and returns a list of "Email::Address" objects
found. Alternatley you may construct objects manually. The goal of this
software is to be correct, and very very fast.


%prep
%setup -q -n Email-Address-%{version}
%{__perl} -pi -e 's|^#!/usr/local/bin/perl\b|#!%{__perl}|' bench/ea-vs-ma.pl


%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
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README bench/
%{perl_vendorlib}/Email/
%{_mandir}/man3/*.3pm*


%changelog
* Thu Sep 08 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.80-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Apr 2006 01:39:48 -0000	1.1
+++ .cvsignore	29 Apr 2006 01:40:23 -0000	1.2
@@ -0,0 +1 @@
+Email-Address-1.80.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Apr 2006 01:39:48 -0000	1.1
+++ sources	29 Apr 2006 01:40:23 -0000	1.2
@@ -0,0 +1 @@
+b57726d9915a502bc6b52966217a453e  Email-Address-1.80.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 29 01:41:19 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 18:41:19 -0700
Subject: rpms/perl-Email-MessageID - New directory
Message-ID: <200604290141.k3T1fL83003149@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MessageID
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3123/perl-Email-MessageID

Log Message:
Directory /cvs/extras/rpms/perl-Email-MessageID added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 29 01:41:20 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 18:41:20 -0700
Subject: rpms/perl-Email-MessageID/devel - New directory
Message-ID: <200604290141.k3T1fMPj003152@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MessageID/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3123/perl-Email-MessageID/devel

Log Message:
Directory /cvs/extras/rpms/perl-Email-MessageID/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 29 01:41:36 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 18:41:36 -0700
Subject: rpms/perl-Email-MessageID Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604290141.k3T1fcSg003197@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MessageID
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3168

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Email-MessageID


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Email-MessageID
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 29 01:41:37 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 18:41:37 -0700
Subject: rpms/perl-Email-MessageID/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604290141.k3T1fdqs003200@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MessageID/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3168/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Email-MessageID


--- 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 Apr 29 01:42:08 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 18:42:08 -0700
Subject: rpms/perl-Email-MessageID import.log,1.1,1.2
Message-ID: <200604290142.k3T1gAhQ003279@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MessageID
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3238

Modified Files:
	import.log 
Log Message:
auto-import perl-Email-MessageID-1.31-1 on branch devel from perl-Email-MessageID-1.31-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MessageID/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Apr 2006 01:41:36 -0000	1.1
+++ import.log	29 Apr 2006 01:42:08 -0000	1.2
@@ -0,0 +1 @@
+perl-Email-MessageID-1_31-1:HEAD:perl-Email-MessageID-1.31-1.src.rpm:1146274919



From fedora-extras-commits at redhat.com  Sat Apr 29 01:42:09 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 18:42:09 -0700
Subject: rpms/perl-Email-MessageID/devel perl-Email-MessageID.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604290142.k3T1gBPe003284@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MessageID/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3238/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Email-MessageID.spec 
Log Message:
auto-import perl-Email-MessageID-1.31-1 on branch devel from perl-Email-MessageID-1.31-1.src.rpm


--- NEW FILE perl-Email-MessageID.spec ---
Name:           perl-Email-MessageID
Version:        1.31
Release:        1%{?dist}
Summary:        Generate world unique message-ids

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Email-MessageID/
Source0:        http://www.cpan.org/authors/id/C/CW/CWEST/Email-MessageID-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(Email::Address) >= 1.80
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Message-ids are optional, but highly recommended, headers that identify
a message uniquely. This software generates a unique message-id.


%prep
%setup -q -n Email-MessageID-%{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
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/Email/
%{_mandir}/man3/*.3pm*


%changelog
* Thu Sep 08 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.31-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MessageID/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Apr 2006 01:41:36 -0000	1.1
+++ .cvsignore	29 Apr 2006 01:42:09 -0000	1.2
@@ -0,0 +1 @@
+Email-MessageID-1.31.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MessageID/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Apr 2006 01:41:36 -0000	1.1
+++ sources	29 Apr 2006 01:42:09 -0000	1.2
@@ -0,0 +1 @@
+578b8edbc259566ab61466e780481129  Email-MessageID-1.31.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 29 01:43:22 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 18:43:22 -0700
Subject: rpms/perl-Email-Simple - New directory
Message-ID: <200604290143.k3T1hOb4003385@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Simple
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3359/perl-Email-Simple

Log Message:
Directory /cvs/extras/rpms/perl-Email-Simple added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 29 01:43:23 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 18:43:23 -0700
Subject: rpms/perl-Email-Simple/devel - New directory
Message-ID: <200604290143.k3T1hP9Y003388@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-serv3359/perl-Email-Simple/devel

Log Message:
Directory /cvs/extras/rpms/perl-Email-Simple/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 29 01:43:44 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 18:43:44 -0700
Subject: rpms/perl-Email-Simple Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604290143.k3T1hkbv003438@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Simple
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3405

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Email-Simple


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Email-Simple
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Apr 29 01:43:44 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 18:43:44 -0700
Subject: rpms/perl-Email-Simple/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200604290143.k3T1hk7v003441@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-serv3405/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Email-Simple


--- 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 Apr 29 01:44:14 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 18:44:14 -0700
Subject: rpms/perl-Email-Simple import.log,1.1,1.2
Message-ID: <200604290144.k3T1iGRQ003502@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Simple
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3469

Modified Files:
	import.log 
Log Message:
auto-import perl-Email-Simple-1.92-1 on branch devel from perl-Email-Simple-1.92-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Simple/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Apr 2006 01:43:44 -0000	1.1
+++ import.log	29 Apr 2006 01:44:13 -0000	1.2
@@ -0,0 +1 @@
+perl-Email-Simple-1_92-1:HEAD:perl-Email-Simple-1.92-1.src.rpm:1146275045



From fedora-extras-commits at redhat.com  Sat Apr 29 01:44:14 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 18:44:14 -0700
Subject: rpms/perl-Email-Simple/devel perl-Email-Simple.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604290144.k3T1iG7Z003507@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-serv3469/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Email-Simple.spec 
Log Message:
auto-import perl-Email-Simple-1.92-1 on branch devel from perl-Email-Simple-1.92-1.src.rpm


--- NEW FILE perl-Email-Simple.spec ---
Name:           perl-Email-Simple
Version:        1.92
Release:        1%{?dist}
Summary:        Simple parsing of RFC2822 message format and headers

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Email-Simple/
Source0:        http://www.cpan.org/authors/id/C/CW/CWEST/Email-Simple-%{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
"Email::Simple" is the first deliverable of the "Perl Email Project", a
reaction against the complexity and increasing bugginess of the
"Mail::*" modules. In contrast, "Email::*" modules are meant to be
simple to use and to maintain, pared to the bone, fast, minimal in their
external dependencies, and correct.


%prep
%setup -q -n Email-Simple-%{version}


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/Email/
%{_mandir}/man3/*.3pm*


%changelog
* Thu Sep 08 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.92-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Simple/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Apr 2006 01:43:44 -0000	1.1
+++ .cvsignore	29 Apr 2006 01:44:14 -0000	1.2
@@ -0,0 +1 @@
+Email-Simple-1.92.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Simple/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Apr 2006 01:43:44 -0000	1.1
+++ sources	29 Apr 2006 01:44:14 -0000	1.2
@@ -0,0 +1 @@
+e0ac39068afca5fa62f633a31a98f813  Email-Simple-1.92.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 29 01:47:41 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 18:47:41 -0700
Subject: owners owners.list,1.916,1.917
Message-ID: <200604290147.k3T1lhM9003570@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3553

Modified Files:
	owners.list 
Log Message:
New packages:
- perl-Email-Address    (#190231)
- perl-Email-MessageID  (#190233)
- perl-Email-Simple     (#190232)



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.916
retrieving revision 1.917
diff -u -r1.916 -r1.917
--- owners.list	28 Apr 2006 23:01:36 -0000	1.916
+++ owners.list	29 Apr 2006 01:47:41 -0000	1.917
@@ -961,6 +961,9 @@
 Fedora Extras|perl-Digest-MD2|Perl interface to the MD2 Algorithm|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Digest-MD4|Perl interface to the MD4 Algorithm|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Digest-Nilsimsa|Perl interface to the Nilsima Algorithm|wtogami at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Email-Address|RFC 2822 Address Parsing and Creation|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Email-MessageID|Generate world unique message-ids|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Email-Simple|Simple parsing of RFC2822 message format and headers|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Error|Error Perl module|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Exception-Class|Declare hierarchies of exception classes|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Exporter-Lite|Lightweight exporting of variables|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Sat Apr 29 02:22:51 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Fri, 28 Apr 2006 19:22:51 -0700
Subject: rpms/doctorj/devel .cvsignore, 1.3, 1.4 Makefile, 1.3,
	1.4 doctorj.spec, 1.12, 1.13 sources, 1.3, 1.4
Message-ID: <200604290222.k3T2Mrq8006032@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/doctorj/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6009

Added Files:
	.cvsignore Makefile doctorj.spec sources 
Log Message:
updated version 



Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	29 Apr 2006 02:22:50 -0000	1.4
@@ -0,0 +1 @@
+doctorj-5.0.0.tar.gz


Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	29 Apr 2006 02:22:50 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: doctorj
+# $Id$
+NAME := doctorj
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I 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: doctorj.spec
===================================================================
RCS file: doctorj.spec
diff -N doctorj.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ doctorj.spec	29 Apr 2006 02:22:50 -0000	1.13
@@ -0,0 +1,72 @@
+Name:           doctorj
+Version:        5.0.0
+Release:        1%{?dist}
+Summary:        Java source code analyzer
+
+Group:          Development/Tools
+License:        LGPL
+URL:            http://doctorj.sourceforge.net/
+Source:         http://download.sf.net/doctorj/%{name}-%{version}.tar.gz
+BuildRequires:	java-1.4.2-gcj-compat-devel
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+%description
+DoctorJ analyzes Java code, in the following functional areas:
+documentation verification, statistics generation and syntax analysis.
+
+%prep
+%setup -q
+
+%build
+
+make %{?_smp_mflags}
+
+%install
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README
+%{_bindir}/doctorj
+%{_mandir}/man1/doctorj.1*
+%{_datadir}/%{name}
+
+%changelog
+* Sat Apr 29 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.0.0-1
+- Updated version
+
+* Fri May 20 2005 Ville Skytt?? <ville.skytta at iki.fi> - 4.0.2-7
+- Patch to fix x86_64 build.
+
+* Thu May 19 2005 Ville Skytt?? <ville.skytta at iki.fi> - 4.0.2-6
+- Rebuild.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 4.0.2-5
+- rebuilt
+
+* Sun Feb 13 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.0.2-4
+- Apply proper build fix from Michael Schwendt.
+
+* Sun Feb 13 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.0.2-3
+- Use compat-gcc-c++ to fix build on FC3+.
+
+* Sun May 30 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.0.2-0.fdr.2
+- Fix build on FC2, thanks to Michael Schwendt (bug 1025).
+
+* Fri Aug 29 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.0.2-0.fdr.1
+- Update to 4.0.2.
+
+* Thu Aug 14 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.0.1-0.fdr.1
+- Update to 4.0.1.
+- Clean up %%doc list.
+
+* Thu Mar 20 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.0.0-0.fdr.1
+- Update to 4.0.0 and to current Fedora guidelines.
+- compat-gcc-c++ no longer required.
+
+* Fri Feb  7 2003 Ville Skytt?? <ville.skytta at iki.fi> - 3.3.9-1.fedora.1
+- First Fedora release.


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	29 Apr 2006 02:22:50 -0000	1.4
@@ -0,0 +1 @@
+43a11e483ed3524e3709794be5e13267  doctorj-5.0.0.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 29 02:24:30 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 19:24:30 -0700
Subject: rpms/perl-Error/FC-4 .cvsignore, 1.3, 1.4 perl-Error.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <200604290224.k3T2OWSl006136@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Error/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6099/FC-4

Modified Files:
	.cvsignore perl-Error.spec sources 
Log Message:
Update to 0.15009.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Apr 2006 21:13:59 -0000	1.3
+++ .cvsignore	29 Apr 2006 02:24:30 -0000	1.4
@@ -1 +1 @@
-Error-0.15008.tar.gz
+Error-0.15009.tar.gz


Index: perl-Error.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/FC-4/perl-Error.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Error.spec	22 Apr 2006 21:13:59 -0000	1.5
+++ perl-Error.spec	29 Apr 2006 02:24:30 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           perl-Error
-Version:        0.15008
+Version:        0.15009
 Release:        1%{?dist}
 Summary:        Error Perl module
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Fri Apr 28 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.15009-1
+- Update to 0.15009.
+
 * Wed Apr 19 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.15008-1
 - Update to 0.15008.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Apr 2006 21:13:59 -0000	1.3
+++ sources	29 Apr 2006 02:24:30 -0000	1.4
@@ -1 +1 @@
-e66c11a0b7a501391643321f86f2171e  Error-0.15008.tar.gz
+758e3e2024d883095d500d91e3a65b8d  Error-0.15009.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 29 02:24:31 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 19:24:31 -0700
Subject: rpms/perl-Error/FC-5 .cvsignore, 1.3, 1.4 perl-Error.spec, 1.7,
	1.8 sources, 1.3, 1.4
Message-ID: <200604290224.k3T2OXoZ006142@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-serv6099/FC-5

Modified Files:
	.cvsignore perl-Error.spec sources 
Log Message:
Update to 0.15009.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Apr 2006 21:14:00 -0000	1.3
+++ .cvsignore	29 Apr 2006 02:24:31 -0000	1.4
@@ -1 +1 @@
-Error-0.15008.tar.gz
+Error-0.15009.tar.gz


Index: perl-Error.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/FC-5/perl-Error.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Error.spec	22 Apr 2006 21:14:00 -0000	1.7
+++ perl-Error.spec	29 Apr 2006 02:24:31 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           perl-Error
-Version:        0.15008
+Version:        0.15009
 Release:        1%{?dist}
 Summary:        Error Perl module
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Fri Apr 28 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.15009-1
+- Update to 0.15009.
+
 * Wed Apr 19 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.15008-1
 - Update to 0.15008.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Apr 2006 21:14:00 -0000	1.3
+++ sources	29 Apr 2006 02:24:31 -0000	1.4
@@ -1 +1 @@
-e66c11a0b7a501391643321f86f2171e  Error-0.15008.tar.gz
+758e3e2024d883095d500d91e3a65b8d  Error-0.15009.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 29 02:38:24 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Fri, 28 Apr 2006 19:38:24 -0700
Subject: rpms/doctorj/devel classpath_fix.patch,NONE,1.1
Message-ID: <200604290238.k3T2cQEv006282@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/doctorj/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6264

Added Files:
	classpath_fix.patch 
Log Message:
export classpath


classpath_fix.patch:

--- NEW FILE classpath_fix.patch ---
--- doctorj-5.0.0/bin/doctorj	2004-06-02 11:55:18.000000000 +1200
+++ doctorj-5.0.0/bin/doctorj.mjk	2006-04-29 14:30:23.000000000 +1200
@@ -21,6 +21,8 @@
    CLASSPATH="${jarfile}"
 fi
 
+export CLASSPATH
+
 DRJ_PROPERTIES="-Ddoctorj.dir=$prefix/share/doctorj $DRJ_PROPERTIES"
 
 java $DRJ_PROPERTIES org.incava.doctorj.Main "$@"



From fedora-extras-commits at redhat.com  Sat Apr 29 02:42:46 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Fri, 28 Apr 2006 19:42:46 -0700
Subject: rpms/doctorj/devel doctorj.spec,1.13,1.14
Message-ID: <200604290242.k3T2gnbs006309@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/doctorj/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6292

Modified Files:
	doctorj.spec 
Log Message:
added patch to export classpath, included requires on java-1.4.2-gcj-compat



Index: doctorj.spec
===================================================================
RCS file: /cvs/extras/rpms/doctorj/devel/doctorj.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- doctorj.spec	29 Apr 2006 02:22:50 -0000	1.13
+++ doctorj.spec	29 Apr 2006 02:42:46 -0000	1.14
@@ -1,12 +1,14 @@
 Name:           doctorj
 Version:        5.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Java source code analyzer
 
 Group:          Development/Tools
 License:        LGPL
 URL:            http://doctorj.sourceforge.net/
 Source:         http://download.sf.net/doctorj/%{name}-%{version}.tar.gz
+Patch0:		classpath_fix.patch
+Requires:	java-1.4.2-gcj-compat
 BuildRequires:	java-1.4.2-gcj-compat-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -16,6 +18,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 
@@ -36,6 +39,10 @@
 %{_datadir}/%{name}
 
 %changelog
+* Sat Apr 29 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.0.0-2
+- added patch to export classpath
+- added requires on java-1.4.2-gcj-compat
+
 * Sat Apr 29 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.0.0-1
 - Updated version
 



From fedora-extras-commits at redhat.com  Sat Apr 29 02:47:55 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Fri, 28 Apr 2006 19:47:55 -0700
Subject: rpms/doctorj/FC-4 classpath_fix.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 Makefile, 1.2, 1.3 doctorj.spec, 1.11, 1.12 sources, 1.2, 1.3
Message-ID: <200604290248.k3T2mRIu006427@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/doctorj/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6381/FC-4

Modified Files:
	.cvsignore Makefile doctorj.spec sources 
Added Files:
	classpath_fix.patch 
Log Message:
updated sources and patch to export classpath


classpath_fix.patch:

--- NEW FILE classpath_fix.patch ---
--- doctorj-5.0.0/bin/doctorj	2004-06-02 11:55:18.000000000 +1200
+++ doctorj-5.0.0/bin/doctorj.mjk	2006-04-29 14:30:23.000000000 +1200
@@ -21,6 +21,8 @@
    CLASSPATH="${jarfile}"
 fi
 
+export CLASSPATH
+
 DRJ_PROPERTIES="-Ddoctorj.dir=$prefix/share/doctorj $DRJ_PROPERTIES"
 
 java $DRJ_PROPERTIES org.incava.doctorj.Main "$@"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/doctorj/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:14:14 -0000	1.2
+++ .cvsignore	29 Apr 2006 02:47:55 -0000	1.3
@@ -1 +1 @@
-doctorj-4.0.2.tar.gz
+doctorj-5.0.0.tar.gz




Index: doctorj.spec
===================================================================
RCS file: /cvs/extras/rpms/doctorj/FC-4/doctorj.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- doctorj.spec	20 May 2005 20:40:13 -0000	1.11
+++ doctorj.spec	29 Apr 2006 02:47:55 -0000	1.12
@@ -1,57 +1,51 @@
 Name:           doctorj
-Version:        4.0.2
-Release:        7
+Version:        5.0.0
+Release:        2%{?dist}
 Summary:        Java source code analyzer
 
 Group:          Development/Tools
 License:        LGPL
 URL:            http://doctorj.sourceforge.net/
 Source:         http://download.sf.net/doctorj/%{name}-%{version}.tar.gz
-Patch0:         %{name}-improperseq.patch
-Patch1:         %{name}-yagol.patch
-Patch2:         %{name}-precision.patch
+Patch0:		classpath_fix.patch
+Requires:	java-1.4.2-gcj-compat
+BuildRequires:	java-1.4.2-gcj-compat-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  flex
-
 %description
 DoctorJ analyzes Java code, in the following functional areas:
 documentation verification, statistics generation and syntax analysis.
 
-
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-
 
 %build
-%configure
-make %{?_smp_mflags}
 
+make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-
-
-%check || :
-# make check fails as of 4.0.2...
-
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
-
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
+%doc AUTHORS ChangeLog COPYING README
 %{_bindir}/doctorj
 %{_mandir}/man1/doctorj.1*
-
+%{_datadir}/%{name}
 
 %changelog
+* Sat Apr 29 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.0.0-2
+- added patch to export classpath
+- added requires on java-1.4.2-gcj-compat
+
+* Sat Apr 29 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.0.0-1
+- Updated version
+
 * Fri May 20 2005 Ville Skytt?? <ville.skytta at iki.fi> - 4.0.2-7
 - Patch to fix x86_64 build.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/doctorj/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:14:14 -0000	1.2
+++ sources	29 Apr 2006 02:47:55 -0000	1.3
@@ -1 +1 @@
-612aac2fd1238fe0246e364e3f884c58  doctorj-4.0.2.tar.gz
+43a11e483ed3524e3709794be5e13267  doctorj-5.0.0.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 29 02:47:56 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Fri, 28 Apr 2006 19:47:56 -0700
Subject: rpms/doctorj/FC-5 .cvsignore, 1.3, 1.4 Makefile, 1.3,
	1.4 classpath_fix.patch, NONE, 1.1 doctorj.spec, 1.12,
	1.13 sources, 1.3, 1.4
Message-ID: <200604290248.k3T2mSIx006435@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/doctorj/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6381/FC-5

Added Files:
	.cvsignore Makefile classpath_fix.patch doctorj.spec sources 
Log Message:
updated sources and patch to export classpath



Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	29 Apr 2006 02:47:56 -0000	1.4
@@ -0,0 +1 @@
+doctorj-5.0.0.tar.gz


Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	29 Apr 2006 02:47:56 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: doctorj
+# $Id$
+NAME := doctorj
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)

classpath_fix.patch:

--- NEW FILE classpath_fix.patch ---
--- doctorj-5.0.0/bin/doctorj	2004-06-02 11:55:18.000000000 +1200
+++ doctorj-5.0.0/bin/doctorj.mjk	2006-04-29 14:30:23.000000000 +1200
@@ -21,6 +21,8 @@
    CLASSPATH="${jarfile}"
 fi
 
+export CLASSPATH
+
 DRJ_PROPERTIES="-Ddoctorj.dir=$prefix/share/doctorj $DRJ_PROPERTIES"
 
 java $DRJ_PROPERTIES org.incava.doctorj.Main "$@"


Index: doctorj.spec
===================================================================
RCS file: doctorj.spec
diff -N doctorj.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ doctorj.spec	29 Apr 2006 02:47:56 -0000	1.13
@@ -0,0 +1,79 @@
+Name:           doctorj
+Version:        5.0.0
+Release:        2%{?dist}
+Summary:        Java source code analyzer
+
+Group:          Development/Tools
+License:        LGPL
+URL:            http://doctorj.sourceforge.net/
+Source:         http://download.sf.net/doctorj/%{name}-%{version}.tar.gz
+Patch0:		classpath_fix.patch
+Requires:	java-1.4.2-gcj-compat
+BuildRequires:	java-1.4.2-gcj-compat-devel
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+%description
+DoctorJ analyzes Java code, in the following functional areas:
+documentation verification, statistics generation and syntax analysis.
+
+%prep
+%setup -q
+%patch0 -p1
+
+%build
+
+make %{?_smp_mflags}
+
+%install
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README
+%{_bindir}/doctorj
+%{_mandir}/man1/doctorj.1*
+%{_datadir}/%{name}
+
+%changelog
+* Sat Apr 29 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.0.0-2
+- added patch to export classpath
+- added requires on java-1.4.2-gcj-compat
+
+* Sat Apr 29 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.0.0-1
+- Updated version
+
+* Fri May 20 2005 Ville Skytt?? <ville.skytta at iki.fi> - 4.0.2-7
+- Patch to fix x86_64 build.
+
+* Thu May 19 2005 Ville Skytt?? <ville.skytta at iki.fi> - 4.0.2-6
+- Rebuild.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 4.0.2-5
+- rebuilt
+
+* Sun Feb 13 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.0.2-4
+- Apply proper build fix from Michael Schwendt.
+
+* Sun Feb 13 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.0.2-3
+- Use compat-gcc-c++ to fix build on FC3+.
+
+* Sun May 30 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.0.2-0.fdr.2
+- Fix build on FC2, thanks to Michael Schwendt (bug 1025).
+
+* Fri Aug 29 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.0.2-0.fdr.1
+- Update to 4.0.2.
+
+* Thu Aug 14 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.0.1-0.fdr.1
+- Update to 4.0.1.
+- Clean up %%doc list.
+
+* Thu Mar 20 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.0.0-0.fdr.1
+- Update to 4.0.0 and to current Fedora guidelines.
+- compat-gcc-c++ no longer required.
+
+* Fri Feb  7 2003 Ville Skytt?? <ville.skytta at iki.fi> - 3.3.9-1.fedora.1
+- First Fedora release.


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	29 Apr 2006 02:47:56 -0000	1.4
@@ -0,0 +1 @@
+43a11e483ed3524e3709794be5e13267  doctorj-5.0.0.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 29 03:09:03 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 20:09:03 -0700
Subject: rpms/perl-HTTP-Proxy/FC-4 .cvsignore, 1.3, 1.4 perl-HTTP-Proxy.spec,
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200604290309.k3T3951A008769@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-HTTP-Proxy/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8732/FC-4

Modified Files:
	.cvsignore perl-HTTP-Proxy.spec sources 
Log Message:
Update to 0.19.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Mar 2006 10:53:15 -0000	1.3
+++ .cvsignore	29 Apr 2006 03:09:03 -0000	1.4
@@ -1 +1 @@
-HTTP-Proxy-0.18.tar.gz
+HTTP-Proxy-0.19.tar.gz


Index: perl-HTTP-Proxy.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/FC-4/perl-HTTP-Proxy.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-HTTP-Proxy.spec	22 Mar 2006 10:53:15 -0000	1.3
+++ perl-HTTP-Proxy.spec	29 Apr 2006 03:09:03 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           perl-HTTP-Proxy
-Version:        0.18
+Version:        0.19
 Release:        1%{?dist}
 Summary:        A pure Perl HTTP proxy
 
@@ -52,10 +52,13 @@
 %defattr(-,root,root,-)
 %doc Changes README eg/
 %{perl_vendorlib}/HTTP/
-%{_mandir}/man3/*.3*
+%{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Fri Apr 28 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.19-1
+- Update to 0.19.
+
 * Wed Mar 22 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.18-1
 - Update to 0.18.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Mar 2006 10:53:15 -0000	1.3
+++ sources	29 Apr 2006 03:09:03 -0000	1.4
@@ -1 +1 @@
-9a7e180caf7d6854cd3dad3fe0f21365  HTTP-Proxy-0.18.tar.gz
+e702b597f546ad88eed9e3f285f1fff1  HTTP-Proxy-0.19.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 29 03:09:04 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 20:09:04 -0700
Subject: rpms/perl-HTTP-Proxy/FC-5 .cvsignore, 1.3, 1.4 perl-HTTP-Proxy.spec,
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200604290309.k3T396Db008775@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-HTTP-Proxy/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8732/FC-5

Modified Files:
	.cvsignore perl-HTTP-Proxy.spec sources 
Log Message:
Update to 0.19.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Mar 2006 10:53:21 -0000	1.3
+++ .cvsignore	29 Apr 2006 03:09:04 -0000	1.4
@@ -1 +1 @@
-HTTP-Proxy-0.18.tar.gz
+HTTP-Proxy-0.19.tar.gz


Index: perl-HTTP-Proxy.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/FC-5/perl-HTTP-Proxy.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-HTTP-Proxy.spec	22 Mar 2006 10:53:21 -0000	1.3
+++ perl-HTTP-Proxy.spec	29 Apr 2006 03:09:04 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           perl-HTTP-Proxy
-Version:        0.18
+Version:        0.19
 Release:        1%{?dist}
 Summary:        A pure Perl HTTP proxy
 
@@ -52,10 +52,13 @@
 %defattr(-,root,root,-)
 %doc Changes README eg/
 %{perl_vendorlib}/HTTP/
-%{_mandir}/man3/*.3*
+%{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Fri Apr 28 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.19-1
+- Update to 0.19.
+
 * Wed Mar 22 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.18-1
 - Update to 0.18.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Mar 2006 10:53:21 -0000	1.3
+++ sources	29 Apr 2006 03:09:04 -0000	1.4
@@ -1 +1 @@
-9a7e180caf7d6854cd3dad3fe0f21365  HTTP-Proxy-0.18.tar.gz
+e702b597f546ad88eed9e3f285f1fff1  HTTP-Proxy-0.19.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 29 03:12:38 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 20:12:38 -0700
Subject: rpms/perl-Email-MIME-ContentType - New directory
Message-ID: <200604290312.k3T3CetE008921@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MIME-ContentType
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8900/perl-Email-MIME-ContentType

Log Message:
Directory /cvs/extras/rpms/perl-Email-MIME-ContentType added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 29 03:12:39 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 20:12:39 -0700
Subject: rpms/perl-Email-MIME-ContentType/devel - New directory
Message-ID: <200604290312.k3T3Cf0F008924@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-serv8900/perl-Email-MIME-ContentType/devel

Log Message:
Directory /cvs/extras/rpms/perl-Email-MIME-ContentType/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 29 03:12:58 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 20:12:58 -0700
Subject: rpms/perl-Email-MIME-ContentType Makefile, NONE, 1.1 import.log,
	NONE, 1.1
Message-ID: <200604290313.k3T3D0L4008973@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MIME-ContentType
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8945

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Email-MIME-ContentType


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Email-MIME-ContentType
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 29 03:12:58 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 20:12:58 -0700
Subject: rpms/perl-Email-MIME-ContentType/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200604290313.k3T3D0A9008976@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-serv8945/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Email-MIME-ContentType


--- 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 Apr 29 03:13:31 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 20:13:31 -0700
Subject: rpms/perl-Email-MIME-ContentType import.log,1.1,1.2
Message-ID: <200604290314.k3T3E4tw009045@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MIME-ContentType
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9010

Modified Files:
	import.log 
Log Message:
auto-import perl-Email-MIME-ContentType-1.01-1 on branch devel from perl-Email-MIME-ContentType-1.01-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-ContentType/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Apr 2006 03:12:58 -0000	1.1
+++ import.log	29 Apr 2006 03:13:31 -0000	1.2
@@ -0,0 +1 @@
+perl-Email-MIME-ContentType-1_01-1:HEAD:perl-Email-MIME-ContentType-1.01-1.src.rpm:1146280403



From fedora-extras-commits at redhat.com  Sat Apr 29 03:13:32 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 20:13:32 -0700
Subject: rpms/perl-Email-MIME-ContentType/devel
	perl-Email-MIME-ContentType.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604290314.k3T3E40o009049@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-serv9010/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Email-MIME-ContentType.spec 
Log Message:
auto-import perl-Email-MIME-ContentType-1.01-1 on branch devel from perl-Email-MIME-ContentType-1.01-1.src.rpm


--- NEW FILE perl-Email-MIME-ContentType.spec ---
Name:           perl-Email-MIME-ContentType
Version:        1.01
Release:        1%{?dist}
Summary:        Parse a MIME Content-Type Header

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Email-MIME-ContentType/
Source0:        http://www.cpan.org/authors/id/C/CW/CWEST/Email-MIME-ContentType-%{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 responsible for parsing email content type headers
according to section 5.1 of RFC 2045. It returns a hash as above, with
entries for the discrete type, the composite type, and a hash of
attributes.


%prep
%setup -q -n Email-MIME-ContentType-%{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
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/Email/
%{_mandir}/man3/*.3pm*


%changelog
* Thu Sep 08 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.01-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-ContentType/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Apr 2006 03:12:58 -0000	1.1
+++ .cvsignore	29 Apr 2006 03:13:32 -0000	1.2
@@ -0,0 +1 @@
+Email-MIME-ContentType-1.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-ContentType/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Apr 2006 03:12:58 -0000	1.1
+++ sources	29 Apr 2006 03:13:32 -0000	1.2
@@ -0,0 +1 @@
+1aa682d2841f5d568416772bbaede1c9  Email-MIME-ContentType-1.01.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 29 03:17:30 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 20:17:30 -0700
Subject: owners owners.list,1.917,1.918
Message-ID: <200604290317.k3T3HWJk009152@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9135

Modified Files:
	owners.list 
Log Message:
New package: perl-Email-MIME-ContentType (#190236)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.917
retrieving revision 1.918
diff -u -r1.917 -r1.918
--- owners.list	29 Apr 2006 01:47:41 -0000	1.917
+++ owners.list	29 Apr 2006 03:17:29 -0000	1.918
@@ -963,6 +963,7 @@
 Fedora Extras|perl-Digest-Nilsimsa|Perl interface to the Nilsima Algorithm|wtogami at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Email-Address|RFC 2822 Address Parsing and Creation|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Email-MessageID|Generate world unique message-ids|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Email-MIME-ContentType|Parse a MIME Content-Type Header|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Email-Simple|Simple parsing of RFC2822 message format and headers|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Error|Error Perl module|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Exception-Class|Declare hierarchies of exception classes|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Sat Apr 29 03:20:11 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 20:20:11 -0700
Subject: rpms/perl-Email-MIME-Encodings - New directory
Message-ID: <200604290320.k3T3KDaq009230@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MIME-Encodings
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9204/perl-Email-MIME-Encodings

Log Message:
Directory /cvs/extras/rpms/perl-Email-MIME-Encodings added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 29 03:20:12 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 20:20:12 -0700
Subject: rpms/perl-Email-MIME-Encodings/devel - New directory
Message-ID: <200604290320.k3T3KEbr009233@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MIME-Encodings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9204/perl-Email-MIME-Encodings/devel

Log Message:
Directory /cvs/extras/rpms/perl-Email-MIME-Encodings/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 29 03:20:28 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 20:20:28 -0700
Subject: rpms/perl-Email-MIME-Encodings Makefile, NONE, 1.1 import.log, NONE,
	1.1
Message-ID: <200604290320.k3T3KUca009282@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MIME-Encodings
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9249

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Email-MIME-Encodings


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Email-MIME-Encodings
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 29 03:20:29 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 20:20:29 -0700
Subject: rpms/perl-Email-MIME-Encodings/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200604290320.k3T3KV4O009285@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MIME-Encodings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9249/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Email-MIME-Encodings


--- 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 Apr 29 03:20:56 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 20:20:56 -0700
Subject: rpms/perl-Email-MIME-Encodings import.log,1.1,1.2
Message-ID: <200604290320.k3T3Kw5w009346@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MIME-Encodings
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9313

Modified Files:
	import.log 
Log Message:
auto-import perl-Email-MIME-Encodings-1.3-1 on branch devel from perl-Email-MIME-Encodings-1.3-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-Encodings/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Apr 2006 03:20:28 -0000	1.1
+++ import.log	29 Apr 2006 03:20:56 -0000	1.2
@@ -0,0 +1 @@
+perl-Email-MIME-Encodings-1_3-1:HEAD:perl-Email-MIME-Encodings-1.3-1.src.rpm:1146280847



From fedora-extras-commits at redhat.com  Sat Apr 29 03:20:56 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 20:20:56 -0700
Subject: rpms/perl-Email-MIME-Encodings/devel perl-Email-MIME-Encodings.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604290320.k3T3Kwg4009351@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MIME-Encodings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9313/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Email-MIME-Encodings.spec 
Log Message:
auto-import perl-Email-MIME-Encodings-1.3-1 on branch devel from perl-Email-MIME-Encodings-1.3-1.src.rpm


--- NEW FILE perl-Email-MIME-Encodings.spec ---
Name:           perl-Email-MIME-Encodings
Version:        1.3
Release:        1%{?dist}
Summary:        Unified interface to MIME encoding and decoding

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Email-MIME-Encodings/
Source0:        http://www.cpan.org/authors/id/C/CW/CWEST/Email-MIME-Encodings-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(MIME::Base64) >= 3.05
BuildRequires:  perl(MIME::QuotedPrint) >= 3.03
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module simply wraps "MIME::Base64" and "MIME::QuotedPrint" so that
you can throw the contents of a "Content-Transfer-Encoding" header at
some text and have the right thing happen.


%prep
%setup -q -n Email-MIME-Encodings-%{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
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/Email/
%{_mandir}/man3/*.3pm*


%changelog
* Thu Sep 08 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.3-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-Encodings/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Apr 2006 03:20:28 -0000	1.1
+++ .cvsignore	29 Apr 2006 03:20:56 -0000	1.2
@@ -0,0 +1 @@
+Email-MIME-Encodings-1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-Encodings/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Apr 2006 03:20:28 -0000	1.1
+++ sources	29 Apr 2006 03:20:56 -0000	1.2
@@ -0,0 +1 @@
+adb933af2ff9c3cc8e158bbdcf3d19e5  Email-MIME-Encodings-1.3.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 29 03:23:46 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 20:23:46 -0700
Subject: owners owners.list,1.918,1.919
Message-ID: <200604290323.k3T3Nm8i009418@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9401

Modified Files:
	owners.list 
Log Message:
New package: perl-Email-MIME-Encodings (#190237)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.918
retrieving revision 1.919
diff -u -r1.918 -r1.919
--- owners.list	29 Apr 2006 03:17:29 -0000	1.918
+++ owners.list	29 Apr 2006 03:23:45 -0000	1.919
@@ -964,6 +964,7 @@
 Fedora Extras|perl-Email-Address|RFC 2822 Address Parsing and Creation|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Email-MessageID|Generate world unique message-ids|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Email-MIME-ContentType|Parse a MIME Content-Type Header|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Email-MIME-Encodings|Unified interface to MIME encoding and decoding|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Email-Simple|Simple parsing of RFC2822 message format and headers|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Error|Error Perl module|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Exception-Class|Declare hierarchies of exception classes|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Sat Apr 29 07:28:24 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 29 Apr 2006 00:28:24 -0700
Subject: comps comps-fe5.xml.in,1.39,1.40 comps-fe6.xml.in,1.2,1.3
Message-ID: <200604290728.k3T7SQ4h018797@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18778

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in 
Log Message:
added wings


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- comps-fe5.xml.in	21 Apr 2006 18:33:41 -0000	1.39
+++ comps-fe5.xml.in	29 Apr 2006 07:28:24 -0000	1.40
@@ -348,6 +348,7 @@
         <packagereq type="optional">skencil</packagereq>
         <packagereq type="optional">sodipodi</packagereq>
         <packagereq type="optional">tuxpaint</packagereq>
+        <packagereq type="optional">wings</packagereq>
     </packagelist>
   </group>
 


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- comps-fe6.xml.in	21 Apr 2006 18:33:41 -0000	1.2
+++ comps-fe6.xml.in	29 Apr 2006 07:28:24 -0000	1.3
@@ -348,6 +348,7 @@
         <packagereq type="optional">skencil</packagereq>
         <packagereq type="optional">sodipodi</packagereq>
         <packagereq type="optional">tuxpaint</packagereq>
+        <packagereq type="optional">wings</packagereq>
     </packagelist>
   </group>
 



From fedora-extras-commits at redhat.com  Sat Apr 29 07:33:52 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Sat, 29 Apr 2006 00:33:52 -0700
Subject: rpms/ghc/devel ghc.spec,1.12,1.13
Message-ID: <200604290733.k3T7Xsl6018864@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18845

Modified Files:
	ghc.spec 
Log Message:
- buildrequire libXt-devel so that the X11 package and deps get built
  (Garrett Mitchener, #190201)



Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ghc.spec	21 Apr 2006 07:59:27 -0000	1.12
+++ ghc.spec	29 Apr 2006 07:33:52 -0000	1.13
@@ -6,7 +6,7 @@
 
 Name:		ghc
 Version:	6.4.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Glasgow Haskell Compilation system
 License:	BSD style
 Group:		Development/Languages
@@ -15,12 +15,14 @@
 Requires:	%{ghcver} = %{version}-%{release}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ghc, sed
-Buildrequires:  gmp-devel, readline-devel, libX11-devel, freeglut-devel, openal-devel
+Buildrequires:  gmp-devel, readline-devel
+Buildrequires:  libX11-devel, libXt-devel
+Buildrequires:  freeglut-devel, openal-devel
 %if %{build_doc}
-# haddock generates libraries/ docs
+# haddock generates docs in libraries
 Buildrequires: libxslt, docbook-style-xsl, haddock
 %endif
-Prefix: %{_prefix}
+Prefix:		%{_prefix}
 
 %description
 GHC is a state-of-the-art programming suite for Haskell, a purely
@@ -156,7 +158,11 @@
 %endif
 
 %changelog
-* Thu Apr 20 2006 Jens Petersen <petersen at redhat.com> - 6.4.2-1
+* Sat Apr 29 2006 Jens Petersen <petersen at redhat.com> - 6.4.2-2.fc6
+- buildrequire libXt-devel so that the X11 package and deps get built
+  (Garrett Mitchener, #190201)
+
+* Thu Apr 20 2006 Jens Petersen <petersen at redhat.com> - 6.4.2-1.fc6
 - update to 6.4.2 release
 
 * Thu Mar  2 2006 Jens Petersen <petersen at redhat.com> - 6.4.1-3.fc5



From fedora-extras-commits at redhat.com  Sat Apr 29 08:01:01 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sat, 29 Apr 2006 01:01:01 -0700
Subject: rpms/qgit/devel .cvsignore, 1.3, 1.4 qgit.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <200604290801.k3T8139i020857@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/qgit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19111

Modified Files:
	.cvsignore qgit.spec sources 
Log Message:
 - update to upstream version 1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qgit/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Mar 2006 16:46:45 -0000	1.3
+++ .cvsignore	29 Apr 2006 08:01:01 -0000	1.4
@@ -1 +1 @@
-qgit-1.1.1.tar.bz2
+qgit-1.2.tar.bz2


Index: qgit.spec
===================================================================
RCS file: /cvs/extras/rpms/qgit/devel/qgit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qgit.spec	19 Mar 2006 16:46:45 -0000	1.3
+++ qgit.spec	29 Apr 2006 08:01:01 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           qgit
-Version:        1.1.1
+Version:        1.2
 Release:        1%{?dist}
 Summary:        QGit is a git GUI repository browser
 
@@ -11,7 +11,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils, qt-devel
-Requires:       git-core >= 1.2.0
+Requires:       git-core >= 1.3.0
 
 %description
 With qgit you are able to browse revisions history, view patch content
@@ -46,6 +46,9 @@
 
 
 %changelog
+* Sat Apr 29 2006 Dan Horak <dan at danny.cz> 1.2-1
+- update to upstream version 1.2
+
 * Sun Mar 19 2006 Dan Horak <dan at danny.cz> 1.1.1-1
 - update to upstream version 1.1.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qgit/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Mar 2006 16:46:45 -0000	1.3
+++ sources	29 Apr 2006 08:01:01 -0000	1.4
@@ -1 +1 @@
-bf81d73fd1633fbd02cb74e0b5d5b0b4  qgit-1.1.1.tar.bz2
+b862efe8190446f129dcebdca69340f5  qgit-1.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Apr 29 08:03:52 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sat, 29 Apr 2006 01:03:52 -0700
Subject: rpms/qgit/FC-4 .cvsignore, 1.3, 1.4 qgit.spec, 1.3, 1.4 sources, 1.3,
	1.4
Message-ID: <200604290803.k3T83sgk021382@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/qgit/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21361

Modified Files:
	.cvsignore qgit.spec sources 
Log Message:
 - update to upstream version 1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qgit/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Mar 2006 16:50:10 -0000	1.3
+++ .cvsignore	29 Apr 2006 08:03:52 -0000	1.4
@@ -1 +1 @@
-qgit-1.1.1.tar.bz2
+qgit-1.2.tar.bz2


Index: qgit.spec
===================================================================
RCS file: /cvs/extras/rpms/qgit/FC-4/qgit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qgit.spec	19 Mar 2006 16:50:10 -0000	1.3
+++ qgit.spec	29 Apr 2006 08:03:52 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           qgit
-Version:        1.1.1
+Version:        1.2
 Release:        1%{?dist}
 Summary:        QGit is a git GUI repository browser
 
@@ -11,7 +11,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils, qt-devel
-Requires:       git-core >= 1.2.0
+Requires:       git-core >= 1.3.0
 
 %description
 With qgit you are able to browse revisions history, view patch content
@@ -46,6 +46,9 @@
 
 
 %changelog
+* Sat Apr 29 2006 Dan Horak <dan at danny.cz> 1.2-1
+- update to upstream version 1.2
+
 * Sun Mar 19 2006 Dan Horak <dan at danny.cz> 1.1.1-1
 - update to upstream version 1.1.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qgit/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Mar 2006 16:50:10 -0000	1.3
+++ sources	29 Apr 2006 08:03:52 -0000	1.4
@@ -1 +1 @@
-bf81d73fd1633fbd02cb74e0b5d5b0b4  qgit-1.1.1.tar.bz2
+b862efe8190446f129dcebdca69340f5  qgit-1.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Apr 29 08:05:46 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sat, 29 Apr 2006 01:05:46 -0700
Subject: rpms/qgit/FC-5 .cvsignore, 1.3, 1.4 qgit.spec, 1.3, 1.4 sources, 1.3,
	1.4
Message-ID: <200604290805.k3T85mJc021463@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/qgit/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21441

Modified Files:
	.cvsignore qgit.spec sources 
Log Message:
 - update to upstream version 1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qgit/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Mar 2006 16:52:39 -0000	1.3
+++ .cvsignore	29 Apr 2006 08:05:46 -0000	1.4
@@ -1 +1 @@
-qgit-1.1.1.tar.bz2
+qgit-1.2.tar.bz2


Index: qgit.spec
===================================================================
RCS file: /cvs/extras/rpms/qgit/FC-5/qgit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qgit.spec	19 Mar 2006 16:52:39 -0000	1.3
+++ qgit.spec	29 Apr 2006 08:05:46 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           qgit
-Version:        1.1.1
+Version:        1.2
 Release:        1%{?dist}
 Summary:        QGit is a git GUI repository browser
 
@@ -11,7 +11,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils, qt-devel
-Requires:       git-core >= 1.2.0
+Requires:       git-core >= 1.3.0
 
 %description
 With qgit you are able to browse revisions history, view patch content
@@ -46,6 +46,9 @@
 
 
 %changelog
+* Sat Apr 29 2006 Dan Horak <dan at danny.cz> 1.2-1
+- update to upstream version 1.2
+
 * Sun Mar 19 2006 Dan Horak <dan at danny.cz> 1.1.1-1
 - update to upstream version 1.1.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qgit/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Mar 2006 16:52:39 -0000	1.3
+++ sources	29 Apr 2006 08:05:46 -0000	1.4
@@ -1 +1 @@
-bf81d73fd1633fbd02cb74e0b5d5b0b4  qgit-1.1.1.tar.bz2
+b862efe8190446f129dcebdca69340f5  qgit-1.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Apr 29 09:21:55 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 29 Apr 2006 02:21:55 -0700
Subject: rpms/gauche/devel gauche.spec,1.1,1.2
Message-ID: <200604290921.k3T9Lv8M024257@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24240

Modified Files:
	gauche.spec 
Log Message:



Index: gauche.spec
===================================================================
RCS file: /cvs/extras/rpms/gauche/devel/gauche.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gauche.spec	28 Apr 2006 22:05:18 -0000	1.1
+++ gauche.spec	29 Apr 2006 09:21:55 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		gauche
 Version:	0.8.7
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Scheme script interpreter with multibyte character handling
 
 Group:		Development/Languages
@@ -40,9 +40,9 @@
 %configure --with-rpath=no --enable-threads=pthreads --enable-multibyte=utf-8
 perl -pi -e "s|POSTINSTALL = TARGETLIB=|POSTINSTALL = TARGETLIB=$RPM_BUILD_ROOT/|" src/Makefile
 %ifarch i386 i586 i686
-LD_LIBRARY_PATH=`pwd`/src make %{?_smp_mflags} OPTFLAGS="-fomit-frame-pointer"
+LD_LIBRARY_PATH=`pwd`/src make OPTFLAGS="-fomit-frame-pointer"
 %else
-LD_LIBRARY_PATH=`pwd`/src make %{?_smp_mflags}
+LD_LIBRARY_PATH=`pwd`/src make
 %endif
 
 



From fedora-extras-commits at redhat.com  Sat Apr 29 10:55:03 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Sat, 29 Apr 2006 03:55:03 -0700
Subject: rpms/mod_extract_forwarded - New directory
Message-ID: <200604291055.k3TAt5mL026792@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/mod_extract_forwarded
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26771/mod_extract_forwarded

Log Message:
Directory /cvs/extras/rpms/mod_extract_forwarded added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 29 10:55:04 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Sat, 29 Apr 2006 03:55:04 -0700
Subject: rpms/mod_extract_forwarded/devel - New directory
Message-ID: <200604291055.k3TAt6gq026795@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/mod_extract_forwarded/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26771/mod_extract_forwarded/devel

Log Message:
Directory /cvs/extras/rpms/mod_extract_forwarded/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 29 10:55:29 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Sat, 29 Apr 2006 03:55:29 -0700
Subject: rpms/mod_extract_forwarded Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604291055.k3TAtVtV026873@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/mod_extract_forwarded
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26840

Added Files:
	Makefile import.log 
Log Message:
Setup of module mod_extract_forwarded


--- NEW FILE Makefile ---
# Top level Makefile for module mod_extract_forwarded
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 29 10:55:27 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 29 Apr 2006 03:55:27 -0700
Subject: extras-buildsys/utils extras-sync,1.1,1.2
Message-ID: <200604291055.k3TAtR5g026836@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26816

Modified Files:
	extras-sync 
Log Message:
Make a bit easier to adapt to other projects.


Index: extras-sync
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/extras-sync,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- extras-sync	25 Apr 2006 01:54:07 -0000	1.1
+++ extras-sync	29 Apr 2006 10:55:24 -0000	1.2
@@ -1,16 +1,13 @@
 #!/bin/bash
+
 outputdir=/srv/rpmbuild/extras/tree/extras
+targetdir=build at fedora.linux.duke.edu:/srv/web/docroot/extras/
 
 echo "Test sync"
-rsync -navH --delete -e ssh $outputdir/* \
-   build at fedora.linux.duke.edu:/srv/web/docroot/extras/ | grep -v repodata
+rsync -navH --delete -e ssh $outputdir/* $targetdir | grep -v repodata
 
 echo "Real Sync"
 echo "Ctrl-C or kill to exit"
 echo "Sleeping for 30s"
 sleep 30
-rsync -avH --delete -e ssh $outputdir/* build at fedora.linux.duke.edu:/srv/web/docroot/extras/
-
-
-
-
+rsync -avH --delete -e ssh $outputdir/* $targetdir



From fedora-extras-commits at redhat.com  Sat Apr 29 10:55:29 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Sat, 29 Apr 2006 03:55:29 -0700
Subject: rpms/mod_extract_forwarded/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200604291055.k3TAtVYI026876@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/mod_extract_forwarded/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26840/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mod_extract_forwarded


--- 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 Apr 29 10:56:09 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Sat, 29 Apr 2006 03:56:09 -0700
Subject: rpms/mod_extract_forwarded import.log,1.1,1.2
Message-ID: <200604291056.k3TAufJH026944@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/mod_extract_forwarded
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26909

Modified Files:
	import.log 
Log Message:
auto-import mod_extract_forwarded-2.0.2-1 on branch devel from mod_extract_forwarded-2.0.2-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/mod_extract_forwarded/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Apr 2006 10:55:29 -0000	1.1
+++ import.log	29 Apr 2006 10:56:09 -0000	1.2
@@ -0,0 +1 @@
+mod_extract_forwarded-2_0_2-1:HEAD:mod_extract_forwarded-2.0.2-1.src.rpm:1146308160



From fedora-extras-commits at redhat.com  Sat Apr 29 10:56:10 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Sat, 29 Apr 2006 03:56:10 -0700
Subject: rpms/mod_extract_forwarded/devel mod_extract_forwarded.conf, NONE, 
	1.1 mod_extract_forwarded.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604291056.k3TAugQt026948@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/mod_extract_forwarded/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26909/devel

Modified Files:
	.cvsignore sources 
Added Files:
	mod_extract_forwarded.conf mod_extract_forwarded.spec 
Log Message:
auto-import mod_extract_forwarded-2.0.2-1 on branch devel from mod_extract_forwarded-2.0.2-1.src.rpm


--- NEW FILE mod_extract_forwarded.conf ---
LoadModule extract_forwarded_module modules/mod_extract_forwarded.so

# MEForder can have either of two value 'refuse,accept' or 'accept,refuse' and 
# specifies the order in which the information in two associated directives,
# MEFaccept and MEFrefuse, are intepreted. The MEFaccept and MEFrefuse 
# directives are each used to spcifiy one or more IP numbers.

MEForder refuse,accept

# MEFrefuse can be 'all' OR a list of IP numbers and/or domain names of trusted
# proxy servers whose IP number can be derived by DNS from the domain name.
# The presence of 'all' overrides any particular IP numbers and means that no 
# proxy servers are to be trusted. Individual IP numbers mean that those proxy 
# servers having them are not to be trusted. This defaults to 'all'.

MEFrefuse all

# MEFaccept can be 'all' OR a list of IP numbers and/or domain names of trusted 
# proxy servers whose IP number can be derived by DNS from the domain name.
# The presence of 'all' overrides any particular IP numbers and means that all 
# proxy servers are to be trusted.
# Individual IP numbers mean that those the proxy servers having them are to be 
# trusted. This defaults to an empty list of trusted IP numbers.

# MEFaccept 1.2.3.4  1.2.3.5 

# Normal mode of use is to say:
#
#   MEForder refuse,accept
#   MEFrefuse all
#   MEFaccept <space separated list of your trusted proxy servers' IP numbers>
#
# with the MEForder directive saying apply the MEFrefuse rule first then the 
# MEFaccept rule.
# The MEFrefuse rule says do not trust any proxy servers but this is selectively
# overridden for particular IP numbers listed by the MEFaccept directive.

# MEFaddenv can be 'off', 'on' (the default) or a string. 'off' means that when
# spoofing, do not add an environment variable whose value is the IP number of
# the connecting machine. 'on' means that when spoofing, add an environment 
# variable called 'MEF_RPROXY_ADDR' whose value is the IP number of the 
# connecting machine.
# A string means that when spoofing, add an environment variable named by the 
# string supplied whose value is the IP number of the connecting machine.

MEFaddenv on

# MEFdebug can be 'on' or 'off' (the default). When turned 'on' information 
# about how the mod_extract_forwarded module is processing every request to your
# Apache 2 server, and any associated internal redirects or subsrequests, is 
# written to the server's error_log.
# The amount of output written and the way it is generated is such that you 
# would never normally want to turn this feature on.
# This feature is intended for debugging operation of the mod_extract_forwarded 
# module and it is unlikely you will want to do that.

MEFdebug off


--- NEW FILE mod_extract_forwarded.spec ---
Name:           mod_extract_forwarded
Version:        2.0.2
Release:        1%{?dist}
Summary:        Extract real source IP for forwarded HTTP requests

Group:          System Environment/Daemons
License:        Apache Software License
URL:            http://www.openinfo.co.uk/apache/
Source0:        http://www.openinfo.co.uk/apache/extract_forwarded-%{version}.tar.gz
Source1:	mod_extract_forwarded.conf
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  httpd-devel >= 2.0.38
Requires:       httpd httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat %{_includedir}/httpd/.mmn || echo missing)

%description
mod_extract_forwarded hooks itself into Apache's header parsing phase and looks 
for the X-Forwarded-For header which some (most?) proxies add to the proxied 
HTTP requests. It extracts the IP from the X-Forwarded-For and modifies the 
connection data so to the rest of Apache the request looks like it came from 
that IP rather than the proxy IP.

%prep
%setup -q -n extract_forwarded


%build
/usr/sbin/apxs -Wc,"%{optflags}" -c mod_extract_forwarded.c


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_libdir}/httpd/modules/
mkdir -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/
install -p .libs/mod_extract_forwarded.so %{buildroot}/%{_libdir}/httpd/modules/
install -m644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/

# Docs don't need to be executable
chmod -x INSTALL README

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc INSTALL README
%{_libdir}/httpd/modules/mod_extract_forwarded.so
%config(noreplace) /etc/httpd/conf.d/mod_extract_forwarded.conf


%changelog
* Wed Jan 11 2006 Tim Jackson <rpm at timj.co.uk> 2.0.2-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_extract_forwarded/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Apr 2006 10:55:29 -0000	1.1
+++ .cvsignore	29 Apr 2006 10:56:10 -0000	1.2
@@ -0,0 +1 @@
+extract_forwarded-2.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_extract_forwarded/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Apr 2006 10:55:29 -0000	1.1
+++ sources	29 Apr 2006 10:56:10 -0000	1.2
@@ -0,0 +1 @@
+d7aeb59fa81cbe74c485c33873ea1c65  extract_forwarded-2.0.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 29 10:59:20 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Sat, 29 Apr 2006 03:59:20 -0700
Subject: owners owners.list,1.919,1.920
Message-ID: <200604291059.k3TAxMe4027004@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26987

Modified Files:
	owners.list 
Log Message:
New package: mod_extract_forwarded (#177556)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.919
retrieving revision 1.920
diff -u -r1.919 -r1.920
--- owners.list	29 Apr 2006 03:23:45 -0000	1.919
+++ owners.list	29 Apr 2006 10:59:20 -0000	1.920
@@ -748,6 +748,7 @@
 Fedora Extras|mod_annodex|Apache module for server-side support of annodex media|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|mod_auth_pam|PAM authentication module for Apache|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|mod_cband|Bandwidth limiting for virtual hosts|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|
+Fedora Extras|mod_extract_forwarded|Extract real source IP for forwarded HTTP requests|rpm at timj.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|mod_geoip|GeoIP module for the Apache HTTP Server|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|
 Fedora Extras|mod_security|Security module for the Apache HTTP Server|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|
 Fedora Extras|mod_suphp|An apache2 module for executing PHP scripts with the permissions of their owners|andreas at bawue.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Apr 29 15:32:51 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 29 Apr 2006 08:32:51 -0700
Subject: rpms/bsd-games - New directory
Message-ID: <200604291532.k3TFWrbD007079@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/bsd-games
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7055/bsd-games

Log Message:
Directory /cvs/extras/rpms/bsd-games added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 29 15:32:51 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 29 Apr 2006 08:32:51 -0700
Subject: rpms/bsd-games/devel - New directory
Message-ID: <200604291532.k3TFWr5Y007082@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/bsd-games/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7055/bsd-games/devel

Log Message:
Directory /cvs/extras/rpms/bsd-games/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 29 15:33:05 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 29 Apr 2006 08:33:05 -0700
Subject: rpms/bsd-games Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604291533.k3TFX7Bd007141@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/bsd-games
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7106

Added Files:
	Makefile import.log 
Log Message:
Setup of module bsd-games


--- NEW FILE Makefile ---
# Top level Makefile for module bsd-games
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 29 15:33:05 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 29 Apr 2006 08:33:05 -0700
Subject: rpms/bsd-games/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604291533.k3TFX7KA007144@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/bsd-games/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7106/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module bsd-games


--- 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 Apr 29 15:34:43 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 29 Apr 2006 08:34:43 -0700
Subject: rpms/bsd-games import.log,1.1,1.2
Message-ID: <200604291535.k3TFZFex007294@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/bsd-games
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7228

Modified Files:
	import.log 
Log Message:
auto-import bsd-games-2.17-8 on branch devel from bsd-games-2.17-8.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/bsd-games/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Apr 2006 15:33:04 -0000	1.1
+++ import.log	29 Apr 2006 15:34:42 -0000	1.2
@@ -0,0 +1 @@
+bsd-games-2_17-8:HEAD:bsd-games-2.17-8.src.rpm:1146324875



From fedora-extras-commits at redhat.com  Sat Apr 29 15:34:43 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 29 Apr 2006 08:34:43 -0700
Subject: rpms/bsd-games/devel bsd-games-2.17-debian.patch, NONE,
	1.1 bsd-games-2.17-getline.patch, NONE,
	1.1 bsd-games-2.17-hackgid.patch, NONE,
	1.1 bsd-games-2.17-ospeed.patch, NONE,
	1.1 bsd-games-2.17-phantasiagid.patch, NONE,
	1.1 bsd-games-2.17-setresgid.patch, NONE,
	1.1 bsd-games-2.17-tetrisgid.patch, NONE,
	1.1 bsd-games-2.17-utmpstruct.patch, NONE, 1.1 bsd-games.spec,
	NONE, 1.1 config.params, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200604291535.k3TFZFve007298@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/bsd-games/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7228/devel

Modified Files:
	.cvsignore sources 
Added Files:
	bsd-games-2.17-debian.patch bsd-games-2.17-getline.patch 
	bsd-games-2.17-hackgid.patch bsd-games-2.17-ospeed.patch 
	bsd-games-2.17-phantasiagid.patch 
	bsd-games-2.17-setresgid.patch bsd-games-2.17-tetrisgid.patch 
	bsd-games-2.17-utmpstruct.patch bsd-games.spec config.params 
Log Message:
auto-import bsd-games-2.17-8 on branch devel from bsd-games-2.17-8.src.rpm

bsd-games-2.17-debian.patch:

--- NEW FILE bsd-games-2.17-debian.patch ---
--- bsdgames-2.17.orig/fish/Makefrag
+++ bsdgames-2.17/fish/Makefrag
@@ -31,7 +31,9 @@
 fish_all:	fish/fish fish/fish.instr fish/fish.6
 
 fish_install:	fish_all
-	$(INSTALL_BINARY) fish/fish $(INSTALL_PREFIX)$(GAMESDIR)/fish
-	$(HIDE_GAME) fish
+	$(INSTALL_BINARY) fish/fish $(INSTALL_PREFIX)$(GAMESDIR)/go-fish
+	$(HIDE_GAME) go-fish
 	$(INSTALL_DATA) fish/fish.instr $(INSTALL_PREFIX)$(FISH_INSTRFILE)
-	$(INSTALL_MANUAL) fish/fish.6
+	ln -sf fish.6 fish/go-fish.6 # hack for rename
+	$(INSTALL_MANUAL) fish/go-fish.6
+	rm -f fish/go-fish.6
--- bsdgames-2.17.orig/fish/fish.6
+++ bsdgames-2.17/fish/fish.6
@@ -30,10 +30,10 @@
 .\"	@(#)fish.6	8.1 (Berkeley) 5/31/93
 .\"
 .Dd May 31, 1993
-.Dt FISH 6
+.Dt GO-FISH 6
 .Os
 .Sh NAME
-.Nm fish
+.Nm go-fish
 .Nd play
 .Dq Go Fish
 .Sh SYNOPSIS
--- bsdgames-2.17.orig/gomoku/gomoku.6
+++ bsdgames-2.17/gomoku/gomoku.6
@@ -45,7 +45,7 @@
 .Op Ar inputfile
 .Sh DESCRIPTION
 .Nm
-is a two player game were the object is to get 5 in a row horizontally,
+is a two player game where the object is to get 5 in a row horizontally,
 vertically or diagonally on a 19 by 19 grid.
 By convention, black always moves first.
 With no arguments,
--- bsdgames-2.17.orig/hack/Makefrag
+++ bsdgames-2.17/hack/Makefrag
@@ -56,7 +56,8 @@
 	$(INSTALL_SCORE_GAME) hack/hack $(INSTALL_PREFIX)$(GAMESDIR)/hack
 	$(HIDE_GAME) hack
 	$(INSTALL_HACK_DIR) $(INSTALL_PREFIX)$(HACK_DIR)
-	set -e; for f in data help hh rumors; do $(INSTALL_DATA) hack/$$f $(INSTALL_PREFIX)$(HACK_DIR)/$$f; done
+	install -d $(INSTALL_PREFIX)/usr/share/bsd-games/hack
+	set -e; for f in data help hh rumors; do $(INSTALL_DATA) hack/$$f $(INSTALL_PREFIX)/usr/share/bsd-games/hack/$$f; done
 	$(INSTALL_SCORE_FILE) $(HACK_DIR)/perm
 	$(INSTALL_SCORE_FILE) $(HACK_DIR)/record
 	$(INSTALL_MANUAL) hack/hack.6
--- bsdgames-2.17.orig/hack/config.h
+++ bsdgames-2.17/hack/config.h
@@ -88,13 +88,18 @@
 /* #define PYRAMID_BUG */	/* avoid a bug on the Pyramid */
 /* #define NOWAITINCLUDE */	/* neither <wait.h> nor <sys/wait.h> exists */
 
-#define WIZARD  "bruno"	/* the person allowed to use the -D option */
+/*
+ * Debian mods: use root for WIZARD, and move files that are static to
+ * /usr/share/ -- JEH
+ */
+#define WIZARD  "root"	/* the person allowed to use the -D option */
+#define SHAREDIR "/usr/share/bsd-games/hack/"
 #define RECORD	"record"/* the file containing the list of topscorers */
 #define	NEWS	"news"	/* the file containing the latest hack news */
-#define	HELP	"help"	/* the file containing a description of the commands */
-#define	SHELP	"hh"	/* abbreviated form of the same */
-#define	RUMORFILE	"rumors"	/* a file with fortune cookies */
-#define	DATAFILE	"data"	/* a file giving the meaning of symbols used */
+#define	HELP	SHAREDIR "help"	/* the file containing a description of the commands */
+#define	SHELP	SHAREDIR "hh"	/* abbreviated form of the same */
+#define	RUMORFILE	SHAREDIR "rumors"	/* a file with fortune cookies */
+#define	DATAFILE	SHAREDIR "data"	/* a file giving the meaning of symbols used */
 #define	FMASK	0660	/* file creation mask */
 #define	HLOCK	"perm"	/* an empty file used for locking purposes */
 #define LLOCK	"safelock"	/* link to previous */
--- bsdgames-2.17.orig/hunt/hunt/hunt.c
+++ bsdgames-2.17/hunt/hunt/hunt.c
@@ -394,7 +394,8 @@
 
 	vec_cnt = 0;
 	for (ip = ifp; ip; ip = ip->ifa_next)
-		if ((ip->ifa_addr->sa_family == AF_INET) &&
+		if (ip->ifa_addr &&
+		    (ip->ifa_addr->sa_family == AF_INET) &&
 		    (ip->ifa_flags & IFF_BROADCAST))
 			vec_cnt++;
 
@@ -405,7 +406,8 @@
 
 	vec_cnt = 0;
 	for (ip = ifp; ip; ip = ip->ifa_next)
-		if ((ip->ifa_addr->sa_family == AF_INET) &&
+		if (ip->ifa_addr &&
+		    (ip->ifa_addr->sa_family == AF_INET) &&
 		    (ip->ifa_flags & IFF_BROADCAST))
 			memcpy(&(*vector)[vec_cnt++], ip->ifa_broadaddr,
 			       sizeof(struct sockaddr_in));
--- bsdgames-2.17.orig/sail/pl_main.c
+++ bsdgames-2.17/sail/pl_main.c
@@ -219,7 +219,7 @@
 		printf("\nInitial broadside %s (grape, chain, round, double): ",
 			n ? "right" : "left");
 		fflush(stdout);
-		scanf("%s", buf);
+		scanf("%9s", buf);
 		switch (*buf) {
 		case 'g':
 			load = L_GRAPE;
--- bsdgames-2.17.orig/tetris/scores.c
+++ bsdgames-2.17/tetris/scores.c
@@ -335,7 +335,8 @@
 				continue;
 			}
 		}
-		levelfound[sp->hs_level] = 1;
+        if (sp->hs_level < NLEVELS && sp->hs_level >= 0)
+    		levelfound[sp->hs_level] = 1;
 		i++, sp++;
 	}
 	return (num > MAXHISCORES ? MAXHISCORES : num);
@@ -374,12 +375,14 @@
 	for (i = MINLEVEL; i < NLEVELS; i++)
 		levelfound[i] = 0;
 	for (i = 0, sp = scores; i < nscores; i++, sp++) {
-		if (levelfound[sp->hs_level])
-			sp->hs_time = 0;
-		else {
-			sp->hs_time = 1;
-			levelfound[sp->hs_level] = 1;
-		}
+        if (sp->hs_level < NLEVELS && sp->hs_level >= 0) {
+    		if (levelfound[sp->hs_level])
+	    		sp->hs_time = 0;
+		    else {
+			    sp->hs_time = 1;
+		    	levelfound[sp->hs_level] = 1;
+		    }
+        }
 	}
 
 	/*
@@ -433,7 +436,7 @@
 				continue;
 			}
 			sp = &hs[item];
-			(void)sprintf(buf,
+			(void)snprintf(buf, sizeof(buf),
 			    "%3d%c %6d  %-11s (%6d on %d)",
 			    item + offset, sp->hs_time ? '*' : ' ',
 			    sp->hs_score * sp->hs_level,

bsd-games-2.17-getline.patch:

--- NEW FILE bsd-games-2.17-getline.patch ---
diff -Naur bsd-games-2.17/boggle/boggle/bog.c bsd-games-2.17.new/boggle/boggle/bog.c
--- bsd-games-2.17/boggle/boggle/bog.c	2004-12-07 05:34:21.000000000 -0800
+++ bsd-games-2.17.new/boggle/boggle/bog.c	2006-04-04 14:15:20.000000000 -0700
@@ -336,7 +336,7 @@
 	}
 
 	while (1) {
-		if (getline(buf) == NULL) {
+		if (xgetline(buf) == NULL) {
 			if (feof(stdin))
 				clearerr(stdin);
 			break;
diff -Naur bsd-games-2.17/boggle/boggle/extern.h bsd-games-2.17.new/boggle/boggle/extern.h
--- bsd-games-2.17/boggle/boggle/extern.h	2004-01-27 12:52:07.000000000 -0800
+++ bsd-games-2.17.new/boggle/boggle/extern.h	2006-04-04 14:15:05.000000000 -0700
@@ -43,7 +43,7 @@
 long	 dictseek(FILE *, long, int);
 void	 findword(void);
 void	 flushin(FILE *);
-char	*getline(char *);
+char	*xgetline(char *);
 void	 getword(char *);
 int	 help(void);
 int	 inputch(void);
diff -Naur bsd-games-2.17/boggle/boggle/mach.c bsd-games-2.17.new/boggle/boggle/mach.c
--- bsd-games-2.17/boggle/boggle/mach.c	2004-12-07 05:34:21.000000000 -0800
+++ bsd-games-2.17.new/boggle/boggle/mach.c	2006-04-04 14:14:43.000000000 -0700
@@ -168,7 +168,7 @@
  * - doesn't accept words longer than MAXWORDLEN or containing caps
  */
 char *
-getline(q)
+xgetline(q)
 	char *q;
 {
 	int ch, done;
diff -Naur bsd-games-2.17/cribbage/cribbage.h bsd-games-2.17.new/cribbage/cribbage.h
--- bsd-games-2.17/cribbage/cribbage.h	2004-02-08 14:29:14.000000000 -0800
+++ bsd-games-2.17.new/cribbage/cribbage.h	2006-04-04 14:11:46.000000000 -0700
@@ -77,7 +77,7 @@
 int	 fifteens(const CARD [], int);
 void	 game(void);
 void	 gamescore(void);
-char	*getline(void);
+char	*xgetline(void);
 int	 getuchar(void);
 int	 incard(CARD *);
 int	 infrom(const CARD [], int, const char *);
diff -Naur bsd-games-2.17/cribbage/crib.c bsd-games-2.17.new/cribbage/crib.c
--- bsd-games-2.17/cribbage/crib.c	2004-01-27 12:52:07.000000000 -0800
+++ bsd-games-2.17.new/cribbage/crib.c	2006-04-04 14:11:05.000000000 -0700
@@ -221,7 +221,7 @@
 			if (!rflag) {			/* player cuts deck */
 				msg(quiet ? "Cut for crib? " :
 			    "Cut to see whose crib it is -- low card wins? ");
-				getline();
+				xgetline();
 			}
 			i = (rand() >> 4) % CARDS;	/* random cut */
 			do {	/* comp cuts deck */
@@ -397,7 +397,7 @@
 		if (!rflag) {	/* random cut */
 			msg(quiet ? "Cut the deck? " :
 		    "How many cards down do you wish to cut the deck? ");
-			getline();
+			xgetline();
 		}
 		i = (rand() >> 4) % (CARDS - pos);
 		turnover = deck[i + pos];
diff -Naur bsd-games-2.17/cribbage/io.c bsd-games-2.17.new/cribbage/io.c
--- bsd-games-2.17/cribbage/io.c	2004-12-07 05:34:21.000000000 -0800
+++ bsd-games-2.17.new/cribbage/io.c	2006-04-04 14:11:05.000000000 -0700
@@ -245,7 +245,7 @@
 
 	retval = FALSE;
 	rnk = sut = EMPTY;
-	if (!(line = getline()))
+	if (!(line = xgetline()))
 		goto gotit;
 	p = p1 = line;
 	while (*p1 != ' ' && *p1 != '\0')
@@ -346,7 +346,7 @@
 
 	for (sum = 0;;) {
 		msg(prompt);
-		if (!(p = getline()) || *p == '\0') {
+		if (!(p = xgetline()) || *p == '\0') {
 			msg(quiet ? "Not a number" :
 			    "That doesn't look like a number");
 			continue;
@@ -528,12 +528,12 @@
 }
 
 /*
- * getline:
+ * xgetline:
  *      Reads the next line up to '\n' or EOF.  Multiple spaces are
  *	compressed to one space; a space is inserted before a ','
  */
 char *
-getline()
+xgetline()
 {
 	char *sp;
 	int c, oy, ox;
diff -Naur bsd-games-2.17/gomoku/bdisp.c bsd-games-2.17.new/gomoku/bdisp.c
--- bsd-games-2.17/gomoku/bdisp.c	2003-12-16 18:47:37.000000000 -0800
+++ bsd-games-2.17.new/gomoku/bdisp.c	2006-04-04 14:11:05.000000000 -0700
@@ -241,7 +241,7 @@
 }
 
 int
-getline(buf, size)
+xgetline(buf, size)
 	char *buf;
 	int size;
 {
diff -Naur bsd-games-2.17/gomoku/gomoku.h bsd-games-2.17.new/gomoku/gomoku.h
--- bsd-games-2.17/gomoku/gomoku.h	2004-01-27 12:52:07.000000000 -0800
+++ bsd-games-2.17.new/gomoku/gomoku.h	2006-04-04 14:12:15.000000000 -0700
@@ -263,7 +263,7 @@
 
 void	bdinit(struct spotstr *);
 void	init_overlap(void);
-int	getline(char *, int);
+int	xgetline(char *, int);
 void	ask(const char *);
 void	dislog(const char *);
 void	bdump(FILE *);
diff -Naur bsd-games-2.17/gomoku/main.c bsd-games-2.17.new/gomoku/main.c
--- bsd-games-2.17/gomoku/main.c	2004-01-27 12:52:07.000000000 -0800
+++ bsd-games-2.17.new/gomoku/main.c	2006-04-04 14:11:05.000000000 -0700
@@ -155,7 +155,7 @@
 		if (inputfp == NULL && test == 0) {
 			for (;;) {
 				ask("black or white? ");
-				getline(buf, sizeof(buf));
+				xgetline(buf, sizeof(buf));
 				if (buf[0] == 'b' || buf[0] == 'B') {
 					color = BLACK;
 					break;
@@ -172,7 +172,7 @@
 		}
 	} else {
 		setbuf(stdout, 0);
-		getline(buf, sizeof(buf));
+		xgetline(buf, sizeof(buf));
 		if (strcmp(buf, "black") == 0)
 			color = BLACK;
 		else if (strcmp(buf, "white") == 0)
@@ -244,7 +244,7 @@
 		getinput:
 			if (interactive)
 				ask("move? ");
-			if (!getline(buf, sizeof(buf))) {
+			if (!xgetline(buf, sizeof(buf))) {
 				curmove = RESIGN;
 				break;
 			}
@@ -256,7 +256,7 @@
 					FILE *fp;
 
 					ask("save file name? ");
-					(void)getline(buf, sizeof(buf));
+					(void)xgetline(buf, sizeof(buf));
 					if ((fp = fopen(buf, "w")) == NULL) {
 						glog("cannot create save file");
 						goto getinput;
@@ -309,14 +309,14 @@
 		if (i != RESIGN) {
 		replay:
 			ask("replay? ");
-			if (getline(buf, sizeof(buf)) &&
+			if (xgetline(buf, sizeof(buf)) &&
 			    (buf[0] == 'y' || buf[0] == 'Y'))
 				goto again;
 			if (strcmp(buf, "save") == 0) {
 				FILE *fp;
 
 				ask("save file name? ");
-				(void)getline(buf, sizeof(buf));
+				(void)xgetline(buf, sizeof(buf));
 				if ((fp = fopen(buf, "w")) == NULL) {
 					glog("cannot create save file");
 					goto replay;
@@ -367,7 +367,7 @@
 		quit();
 top:
 	ask("cmd? ");
-	if (!getline(fmtbuf, sizeof(fmtbuf)))
+	if (!xgetline(fmtbuf, sizeof(fmtbuf)))
 		quit();
 	switch (*fmtbuf) {
 	case '\0':

bsd-games-2.17-hackgid.patch:

--- NEW FILE bsd-games-2.17-hackgid.patch ---
diff -Naur --exclude '*.swp' bsd-games-2.17/hack/hack.bones.c bsd-games-2.17.new/hack/hack.bones.c
--- bsd-games-2.17/hack/hack.bones.c	2003-12-16 18:47:37.000000000 -0800
+++ bsd-games-2.17.new/hack/hack.bones.c	2006-04-27 14:17:06.000000000 -0700
@@ -140,10 +140,14 @@
 						 * ghost */
 		}
 	}
-	if ((fd = creat(bones, FMASK)) < 0)
+        setgid(hackgid);
+	if ((fd = creat(bones, FMASK)) < 0) {
+                setgid(getgid());
 		return;
+        }
 	savelev(fd, dlevel);
 	(void) close(fd);
+        setgid(getgid());
 }
 
 int
@@ -168,9 +172,12 @@
 	if (!wizard)		/* duvel!frans: don't remove bones while
 				 * debugging */
 #endif	/* WiZARD */
+                setgid(hackgid);
 		if (unlink(bones) < 0) {
+                        setgid(getgid());
 			pline("Cannot unlink %s .", bones);
 			return (0);
 		}
+                setgid(getgid());
 	return (ok);
 }
diff -Naur --exclude '*.swp' bsd-games-2.17/hack/hack.do.c bsd-games-2.17.new/hack/hack.do.c
--- bsd-games-2.17/hack/hack.do.c	2004-01-27 12:52:07.000000000 -0800
+++ bsd-games-2.17.new/hack/hack.do.c	2006-04-27 14:32:43.000000000 -0700
@@ -206,7 +206,9 @@
 		return;		/* this can happen */
 
 	glo(dlevel);
+        setgid(hackgid);
 	fd = creat(lock, FMASK);
+        setgid(getgid());
 	if (fd < 0) {
 		/*
 		 * This is not quite impossible: e.g., we may have
@@ -231,8 +233,10 @@
 	u.ux = FAR;		/* hack */
 	(void) inshop();	/* probably was a trapdoor */
 
+        setgid(hackgid);
 	savelev(fd, dlevel);
 	(void) close(fd);
+        setgid(getgid());
 
 	dlevel = newlevel;
 	if (maxdlevel < dlevel)
diff -Naur --exclude '*.swp' bsd-games-2.17/hack/hack.end.c bsd-games-2.17.new/hack/hack.end.c
--- bsd-games-2.17/hack/hack.end.c	2003-12-16 18:47:37.000000000 -0800
+++ bsd-games-2.17.new/hack/hack.end.c	2006-04-27 15:48:03.000000000 -0700
@@ -290,7 +290,11 @@
 #ifdef WIZARD
 	if (!wizard)
 #endif	/* WIZARD */
-		topten();
+        {
+            setgid(hackgid);
+            topten();
+            setgid(getgid());
+        }
 	if (done_stopprint)
 		printf("\n\n");
 	exit(0);
diff -Naur --exclude '*.swp' bsd-games-2.17/hack/hack.h bsd-games-2.17.new/hack/hack.h
--- bsd-games-2.17/hack/hack.h	2004-01-27 12:52:07.000000000 -0800
+++ bsd-games-2.17.new/hack/hack.h	2006-04-27 11:48:15.000000000 -0700
@@ -218,6 +218,7 @@
 extern int bases[];
 extern int doorindex;
 extern int hackpid;
+extern gid_t hackgid;
 extern int multi;
 extern int nroom;
 extern long moves;
diff -Naur --exclude '*.swp' bsd-games-2.17/hack/hack.main.c bsd-games-2.17.new/hack/hack.main.c
--- bsd-games-2.17/hack/hack.main.c	2004-01-27 12:52:07.000000000 -0800
+++ bsd-games-2.17.new/hack/hack.main.c	2006-04-27 20:16:23.000000000 -0700
@@ -61,6 +61,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __RCSID("$NetBSD: hack.main.c,v 1.9 2004/01/27 20:30:29 jsm Exp $");
@@ -70,6 +71,9 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <sys/types.h>
+#include <pwd.h>
+#include <limits.h>
 #include "hack.h"
 #include "extern.h"
 
@@ -83,12 +87,13 @@
 int             (*occupation)(void);
 const char           *occtxt;		/* defined when occupation != NULL */
 
+gid_t           hackgid;        /* privileged gid for writing scoreboard */
 int             hackpid;	/* current pid */
 int             locknum;	/* max num of players */
 #ifdef DEF_PAGER
 const char     *catmore;	/* default pager */
 #endif
-char            SAVEF[PL_NSIZ + 11] = "save/";	/* save/99999player */
+char            SAVEF[PATH_MAX + PL_NSIZ + 11] = ".hack.save";
 char           *hname;		/* name of the game (argv[0] of call) */
 char            obuf[BUFSIZ];	/* BUFSIZ is defined in stdio.h */
 
@@ -101,9 +106,10 @@
 	char           *argv[];
 {
 	int             fd;
-#ifdef CHDIR
-	char           *dir;
-#endif
+        char           *savedir = (char *)NULL;
+
+        hackgid = getegid();
+        setgid(getgid());
 
 	/* Check for dirty tricks with closed fds 0, 1, 2 */
 	fd = open("/dev/null", O_RDONLY);
@@ -114,31 +120,47 @@
 	hname = argv[0];
 	hackpid = getpid();
 
-#ifdef CHDIR			/* otherwise no chdir() */
 	/*
-	 * See if we must change directory to the playground.
-	 * (Perhaps hack runs suid and playground is inaccessible
-	 *  for the player.)
+         * Find the directory containing the save files.
 	 * The environment variable HACKDIR is overridden by a
 	 *  -d command line option (must be the first option given)
 	 */
 
-	dir = getenv("HACKDIR");
+	savedir = getenv("HACKDIR");
 	if (argc > 1 && !strncmp(argv[1], "-d", 2)) {
 		argc--;
 		argv++;
-		dir = argv[0] + 2;
-		if (*dir == '=' || *dir == ':')
-			dir++;
-		if (!*dir && argc > 1) {
+		savedir = argv[0] + 2;
+		if (*savedir == '=' || *savedir == ':')
+			savedir++;
+		if (!*savedir && argc > 1) {
 			argc--;
 			argv++;
-			dir = argv[0];
+			savedir = argv[0];
 		}
-		if (!*dir)
+		if (!*savedir)
 			error("Flag -d must be followed by a directory name.");
 	}
-#endif
+
+        /*
+         * If the user didn't tell us where the save games are stored then
+         * look in the home directory.
+         */
+        if (savedir == (char *)NULL) {
+            if ((savedir = getenv("HOME")) == (char *)NULL) {
+                struct passwd *pwe;
+                pwe = getpwuid(getuid());
+                if (pwe == NULL || (savedir = pwe->pw_dir) == (char *)NULL) {
+                    savedir = ".";
+                }
+            }
+        }
+        /*
+         * One final check in case we missed something earlier.
+         */
+        if (savedir == NULL || strlen(savedir) > PATH_MAX-30) {
+            savedir = ".";
+        }
 
 	/*
 	 * Who am i? Algorithm: 1. Use name as specified in HACKOPTIONS
@@ -155,12 +177,21 @@
 		char           *s;
 
 		initoptions();
-		if (!*plname && (s = getenv("USER")))
+		if (!*plname && (s = getenv("USER"))) {
 			(void) strncpy(plname, s, sizeof(plname) - 1);
-		if (!*plname && (s = getenv("LOGNAME")))
+                }
+		if (!*plname && (s = getenv("LOGNAME"))) {
 			(void) strncpy(plname, s, sizeof(plname) - 1);
-		if (!*plname && (s = getlogin()))
+                }
+		if (!*plname && (s = getlogin())) {
 			(void) strncpy(plname, s, sizeof(plname) - 1);
+                }
+                /*
+                 * Ensure that plname is null-terminated.  strncpy
+                 * doesn't guarantee it if the source is longer than
+                 * the destination.
+                 */
+                plname[sizeof(plname) - 1] = (char)NULL;
 	}
 
 	/*
@@ -169,11 +200,12 @@
 	 */
 	if (argc > 1 && !strncmp(argv[1], "-s", 2)) {
 #ifdef CHDIR
-		chdirx(dir, 0);
+		chdirx(_PATH_HACK, 0);
 #endif
 		prscore(argc, argv);
 		exit(0);
 	}
+
 	/*
 	 * It seems he really wants to play.
 	 * Remember tty modes, to be restored on exit.
@@ -191,13 +223,13 @@
 	 * Find the creation date of this game,
 	 * so as to avoid restoring outdated savefiles.
 	 */
-	gethdate(hname);
+	gethdate(argv[0]);
 
 	/*
 	 * We cannot do chdir earlier, otherwise gethdate will fail.
 	 */
 #ifdef CHDIR
-	chdirx(dir, 1);
+	chdirx(_PATH_HACK, 1);
 #endif
 
 	/*
@@ -277,7 +309,9 @@
 		(void) signal(SIGINT, SIG_IGN);
 		if (!locknum)
 			(void) strcpy(lock, plname);
+                setgid(hackgid);
 		getlock();	/* sets lock if locknum != 0 */
+                setgid(getgid());
 #ifdef WIZARD
 	} else {
 		char           *sfoo;
@@ -308,10 +342,21 @@
 	}
 #endif
 	setftty();
-	(void) sprintf(SAVEF, "save/%d%s", getuid(), plname);
-	regularize(SAVEF + 5);	/* avoid . or / in name */
-	if ((fd = open(SAVEF, O_RDONLY)) >= 0 &&
-	    (uptodate(fd) || unlink(SAVEF) == 666)) {
+
+	(void) snprintf(SAVEF, PATH_MAX, "%s/.hack.save-%d%s", savedir, getuid(), plname);
+        /* Disable this regularization.  It's only needed when using
+         * setgid and a a shared directory for save games.  In Fedora we've
+         * patched it to save games with normal user permissions (not setgid),
+         * so this isn't necessary anymore.
+         */
+	/*regularize(SAVEF + 5);*/	/* avoid . or / in name */
+        /*
+         * Removed check if the save game is up-to-date so we can avoid
+         * invalidating games during bugfix releases.  It would be
+         * _much_ better to store some sort of savefile version number
+         * in the savefile itself.
+         */
+	if ((fd = open(SAVEF, O_RDONLY)) >= 0) {
 		(void) signal(SIGINT, done1);
 		pline("Restoring old save file...");
 		(void) fflush(stdout);
@@ -540,16 +585,6 @@
 	boolean         wr;
 {
 
-#ifdef SECURE
-	if (dir			/* User specified directory? */
-#ifdef HACKDIR
-	    && strcmp(dir, HACKDIR)	/* and not the default? */
-#endif
-		) {
-		(void) setuid(getuid());	/* Ron Wessels */
-		(void) setregid(getgid(), getgid());
-	}
-#endif
 
 #ifdef HACKDIR
 	if (dir == NULL)
@@ -568,12 +603,34 @@
 
 		if (dir == NULL)
 			dir = ".";
-		if ((fd = open(RECORD, O_RDWR)) < 0) {
-			printf("Warning: cannot write %s/%s", dir, RECORD);
+
+                setgid(hackgid);
+		fd = open(RECORD, O_RDWR);
+                setgid(getgid());
+
+		if (fd < 0) {
+			printf("Warning: cannot write %s", RECORD);
 			getret();
 		} else
 			(void) close(fd);
 	}
+
+#ifdef SECURE
+	if (dir			/* User specified directory? */
+#ifdef HACKDIR
+	    && strcmp(dir, HACKDIR)	/* and not the default? */
+#endif
+		) {
+                if (setresuid(-1, getuid(), getuid()) == -1) {
+                    perror("Could not drop setuid privileges.  Aborting.");
+                    exit(1);
+                }
+                if (setresgid(-1, getgid(), getgid()) == -1) {
+                    perror("Could not drop setgid privileges.  Aborting.");
+                    exit(1);
+                }
+	}
+#endif
 }
 #endif
 
diff -Naur --exclude '*.swp' bsd-games-2.17/hack/hack.save.c bsd-games-2.17.new/hack/hack.save.c
--- bsd-games-2.17/hack/hack.save.c	2003-12-16 18:47:37.000000000 -0800
+++ bsd-games-2.17.new/hack/hack.save.c	2006-04-27 20:12:41.000000000 -0700
@@ -105,8 +105,9 @@
 	(void) signal(SIGHUP, SIG_IGN);
 	(void) signal(SIGINT, SIG_IGN);
 	if ((fd = creat(SAVEF, FMASK)) < 0) {
-		if (!hu)
-			pline("Cannot open save file. (Continue or Quit)");
+		if (!hu) {
+			pline("Cannot open save file %s. (Continue or Quit)", SAVEF);
+                }
 		(void) unlink(SAVEF);	/* ab at unido */
 		return (0);
 	}
@@ -198,10 +199,14 @@
 			break;
 		getlev(fd, 0, tmp);
 		glo(tmp);
-		if ((nfd = creat(lock, FMASK)) < 0)
+                setgid(hackgid);
+		if ((nfd = creat(lock, FMASK)) < 0) {
+                        setgid(getgid());
 			panic("Cannot open temp file %s!\n", lock);
+                }
 		savelev(nfd, tmp);
 		(void) close(nfd);
+                setgid(getgid());
 	}
 	(void) lseek(fd, (off_t) 0, SEEK_SET);
 	getlev(fd, 0, 0);
diff -Naur --exclude '*.swp' bsd-games-2.17/hack/hack.unix.c bsd-games-2.17.new/hack/hack.unix.c
--- bsd-games-2.17/hack/hack.unix.c	2003-12-16 18:47:37.000000000 -0800
+++ bsd-games-2.17.new/hack/hack.unix.c	2006-04-27 19:50:20.000000000 -0700
@@ -161,6 +161,9 @@
 
 struct stat     buf, hbuf;
 
+/*
+ * Get the timestamp of the named executable.
+ */
 void
 gethdate(name)
 	char           *name;
@@ -192,9 +195,15 @@
 	for (;;) {
 		if ((np = strchr(path, ':')) == NULL)
 			np = path + strlen(path);	/* point to end str */
-		if (np - path <= 1)	/* %% */
+		if (np - path <= 1) {	/* %% */
 			(void) strcpy(filename, name);
-		else {
+                } else if (strlen(path) >= MAXPATHLEN-strlen(name)-2) {
+                /*
+                 * Protect against long directories in PATH by skipping them.
+                 */
+                    path = np + 1;
+                    continue;
+                } else {
 			(void) strncpy(filename, path, np - path);
 			filename[np - path] = '/';
 			(void) strcpy(filename + (np - path) + 1, name);
@@ -231,6 +240,9 @@
 {
 	int             i;
 	time_t          date;
+        gid_t           initial_egid;
+
+        initial_egid = getegid();
 
 	if (fstat(fd, &buf))
 		return (0);	/* cannot get status */
@@ -255,13 +267,17 @@
 			return (0);
 	}
 	(void) close(fd);
+        setgid(hackgid);
 	for (i = 1; i <= MAXLEVEL; i++) {	/* try to remove all */
 		glo(i);
 		(void) unlink(lock);
 	}
 	glo(0);
-	if (unlink(lock))
+	if (unlink(lock)) {
+                setgid(initial_egid);
 		return (0);	/* cannot remove it */
+        }
+        setgid(initial_egid);
 	return (1);		/* success! */
 }
 
@@ -321,8 +337,9 @@
 	      : "There is a game in progress under your name.");
 gotlock:
 	fd = creat(lock, FMASK);
-	if (unlink(LLOCK) == -1)
+	if (unlink(LLOCK) == -1) {
 		error("Cannot unlink %s.", LLOCK);
+        }
 	if (fd == -1) {
 		error("cannot creat lock file.");
 	} else {

bsd-games-2.17-ospeed.patch:

--- NEW FILE bsd-games-2.17-ospeed.patch ---
diff -Naur bsd-games-2.17/backgammon/backgammon/main.c bsd-games-2.17.new/backgammon/backgammon/main.c
--- bsd-games-2.17/backgammon/backgammon/main.c	2005-02-15 22:24:50.000000000 -0800
+++ bsd-games-2.17.new/backgammon/backgammon/main.c	2006-04-03 21:52:19.000000000 -0700
@@ -30,6 +30,7 @@
  */
 
 #include <sys/cdefs.h>
+#include <termcap.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n");
@@ -53,7 +54,7 @@
 extern const char   *const instr[];		/* text of instructions */
 extern const char   *const message[];		/* update message */
 #ifndef NCURSES_VERSION
-short ospeed;			/* tty output speed */
+/*short ospeed;	*/		/* tty output speed */
 #endif
 
 const char   *const helpm[] = {		/* help message */
diff -Naur bsd-games-2.17/backgammon/teachgammon/teach.c bsd-games-2.17.new/backgammon/teachgammon/teach.c
--- bsd-games-2.17/backgammon/teachgammon/teach.c	2005-02-15 22:24:50.000000000 -0800
+++ bsd-games-2.17.new/backgammon/teachgammon/teach.c	2006-04-03 21:52:19.000000000 -0700
@@ -30,6 +30,7 @@
  */
 
 #include <sys/cdefs.h>
+#include <termcap.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n");
diff -Naur bsd-games-2.17/tetris/screen.c bsd-games-2.17.new/tetris/screen.c
--- bsd-games-2.17/tetris/screen.c	2004-01-27 12:52:07.000000000 -0800
+++ bsd-games-2.17.new/tetris/screen.c	2006-04-03 21:52:19.000000000 -0700
@@ -73,7 +73,7 @@
 extern char	PC, *BC, *UP;	/* tgoto requires globals: ugh! */
 static char BCdefault[] = "\b";
 #ifndef NCURSES_VERSION
-short	ospeed;
+/*short	ospeed;*/
 #endif
 
 static char

bsd-games-2.17-phantasiagid.patch:

--- NEW FILE bsd-games-2.17-phantasiagid.patch ---
diff -Naur --exclude '*.swp' bsd-games-2.17/phantasia/gamesupport.c bsd-games-2.17.new/phantasia/gamesupport.c
--- bsd-games-2.17/phantasia/gamesupport.c	2006-04-27 22:51:04.000000000 -0700
+++ bsd-games-2.17.new/phantasia/gamesupport.c	2006-04-27 21:01:11.000000000 -0700
@@ -518,7 +518,10 @@
 	long    loc = 0L;	/* location in scoreboard file */
 	bool    found = FALSE;	/* set if we found an entry for this login */
 
-	if ((fp = fopen(_PATH_SCORE, "r+")) != NULL) {
+        SET_PRIV_GID;
+	fp = fopen(_PATH_SCORE, "r+");
+        DROP_PRIV_GID;
+	if (fp != NULL) {
 		while (fread((char *) &sbuf, SZ_SCORESTRUCT, 1, fp) == 1)
 			if (strcmp(Player.p_login, sbuf.sb_login) == 0) {
 				found = TRUE;
diff -Naur --exclude '*.swp' bsd-games-2.17/phantasia/interplayer.c bsd-games-2.17.new/phantasia/interplayer.c
--- bsd-games-2.17/phantasia/interplayer.c	2006-04-27 22:51:04.000000000 -0700
+++ bsd-games-2.17.new/phantasia/interplayer.c	2006-04-27 21:01:45.000000000 -0700
@@ -640,14 +640,18 @@
 		mvaddstr(4, 0, "You have become king!\n");
 
 		/* let everyone else know */
+                SET_PRIV_GID;
 		fp = fopen(_PATH_MESS, "w");
+                DROP_PRIV_GID;
 		fprintf(fp, "All hail the new king!");
 		fclose(fp);
 
 		/* clear all energy voids; retain location of holy grail */
 		fseek(Energyvoidfp, 0L, SEEK_SET);
 		fread((char *) &Enrgyvoid, SZ_VOIDSTRUCT, 1, Energyvoidfp);
+                SET_PRIV_GID;
 		fp = fopen(_PATH_VOID, "w");
+                DROP_PRIV_GID;
 		fwrite((char *) &Enrgyvoid, SZ_VOIDSTRUCT, 1, fp);
 		fclose(fp);
 	}
@@ -716,7 +720,10 @@
 			break;
 
 		case '5':	/* collect accumulated taxes */
-			if ((fp = fopen(_PATH_GOLD, "r+")) != NULL)
+                        SET_PRIV_GID;
+			fp = fopen(_PATH_GOLD, "r+");
+                        DROP_PRIV_GID;
+			if (fp != NULL)
 				/* collect taxes */
 			{
 				fread((char *) &temp1, sizeof(double), 1, fp);
diff -Naur --exclude '*.swp' bsd-games-2.17/phantasia/macros.h bsd-games-2.17.new/phantasia/macros.h
--- bsd-games-2.17/phantasia/macros.h	1997-07-17 09:42:20.000000000 -0700
+++ bsd-games-2.17.new/phantasia/macros.h	2006-04-27 22:49:40.000000000 -0700
@@ -4,6 +4,10 @@
  * macros.h - macro definitions for Phantasia
  */
 
+/* setgid macros */
+#define SET_PRIV_GID setgid(phant_gid)
+#define DROP_PRIV_GID setgid(getgid())
+
 #define ROLL(BASE,INTERVAL)	floor((BASE) + (INTERVAL) * drandom())
 #define SGN(X)		((X) < 0 ? -1 : 1)
 #define CIRCLE(X, Y)	floor(distance(X, 0.0, Y, 0.0) / 125.0 + 1)
diff -Naur --exclude '*.swp' bsd-games-2.17/phantasia/main.c bsd-games-2.17.new/phantasia/main.c
--- bsd-games-2.17/phantasia/main.c	2006-04-27 22:51:04.000000000 -0700
+++ bsd-games-2.17.new/phantasia/main.c	2006-04-27 21:00:46.000000000 -0700
@@ -61,6 +61,9 @@
 #undef bool
 #include <curses.h>
 
+
+gid_t   phant_gid;
+
 int	main(int, char **);
 
 int
@@ -74,6 +77,9 @@
 	time_t  seconds;		/* for time of day */
 	double  dtemp;			/* for temporary calculations */
 
+        phant_gid = getegid();
+        DROP_PRIV_GID;
+
 	initialstate();			/* init globals */
 
 	/* process arguments */
@@ -290,22 +296,28 @@
 		Login = getpwuid(getuid())->pw_name;
 
 	/* open some files */
+        SET_PRIV_GID;
 	if ((Playersfp = fopen(_PATH_PEOPLE, "r+")) == NULL)
 		error(_PATH_PEOPLE);
+        DROP_PRIV_GID;
 	/* NOTREACHED */
 	if (fileno(Playersfp) < 3)
 		exit(1);
 
+        SET_PRIV_GID;
 	if ((Monstfp = fopen(_PATH_MONST, "r+")) == NULL)
 		error(_PATH_MONST);
+        DROP_PRIV_GID;
 	/* NOTREACHED */
 
 	if ((Messagefp = fopen(_PATH_MESS, "r")) == NULL)
 		error(_PATH_MESS);
 	/* NOTREACHED */
 
+        SET_PRIV_GID;
 	if ((Energyvoidfp = fopen(_PATH_VOID, "r+")) == NULL)
 		error(_PATH_VOID);
+        DROP_PRIV_GID;
 	if (fstat(fileno(Energyvoidfp), &sb) == -1)
 		error("stat");
 	if (sb.st_size == 0) {
@@ -508,7 +520,9 @@
 		getstring(Databuf, SZ_DATABUF);
 		/* we open the file for writing to erase any data which is
 		 * already there */
+                SET_PRIV_GID;
 		fp = fopen(_PATH_MESS, "w");
+                DROP_PRIV_GID;
 		if (Databuf[0] != '\0')
 			fprintf(fp, "%s: %s", Player.p_name, Databuf);
 		fclose(fp);
diff -Naur --exclude '*.swp' bsd-games-2.17/phantasia/misc.c bsd-games-2.17.new/phantasia/misc.c
--- bsd-games-2.17/phantasia/misc.c	2006-04-27 22:51:04.000000000 -0700
+++ bsd-games-2.17.new/phantasia/misc.c	2006-04-27 21:02:34.000000000 -0700
@@ -651,14 +651,18 @@
 	enterscore();		/* update score board */
 
 	/* put info in last dead file */
+        SET_PRIV_GID;
 	fp = fopen(_PATH_LASTDEAD, "w");
+        DROP_PRIV_GID;
 	fprintf(fp, "%s (%s, run by %s, level %.0f, killed by %s)",
 	    Player.p_name, descrtype(&Player, TRUE),
 	    Player.p_login, Player.p_level, how);
 	fclose(fp);
 
 	/* let other players know */
+        SET_PRIV_GID;
 	fp = fopen(_PATH_MESS, "w");
+        DROP_PRIV_GID;
 	fprintf(fp, "%s was killed by %s.", Player.p_name, how);
 	fclose(fp);
 
@@ -1060,7 +1064,10 @@
 	}
 	Player.p_gold -= taxes;
 
-	if ((fp = fopen(_PATH_GOLD, "r+")) != NULL)
+        SET_PRIV_GID;
+	fp = fopen(_PATH_GOLD, "r+");
+        DROP_PRIV_GID;
+	if (fp != NULL)
 		/* update taxes */
 	{
 		dtemp = 0.0;
diff -Naur --exclude '*.swp' bsd-games-2.17/phantasia/phantglobs.h bsd-games-2.17.new/phantasia/phantglobs.h
--- bsd-games-2.17/phantasia/phantglobs.h	2006-04-27 22:51:04.000000000 -0700
+++ bsd-games-2.17.new/phantasia/phantglobs.h	2006-04-27 20:25:34.000000000 -0700
@@ -4,6 +4,7 @@
  * phantglobs.h - global declarations for Phantasia
  */
 
+extern  gid_t   phant_gid;      /* gid under which the game runs */
 extern	double	Circle;		/* which circle player is in */
 extern	double	Shield;		/* force field thrown up in monster battle */
 

bsd-games-2.17-setresgid.patch:

--- NEW FILE bsd-games-2.17-setresgid.patch ---
diff -Naur --exclude '*.swp' bsd-games-2.17/adventure/main.c bsd-games-2.17.new/adventure/main.c
--- bsd-games-2.17/adventure/main.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/adventure/main.c	2006-04-07 17:27:16.000000000 -0700
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1991, 1993\n\
@@ -71,7 +72,10 @@
 	struct text *kk;
 
 	/* revoke setgid privileges from dm */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	init();		/* Initialize everything */
 	signal(SIGINT, trapdel);
diff -Naur --exclude '*.swp' bsd-games-2.17/arithmetic/arithmetic.c bsd-games-2.17.new/arithmetic/arithmetic.c
--- bsd-games-2.17/arithmetic/arithmetic.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/arithmetic/arithmetic.c	2006-04-04 17:33:55.000000000 -0700
@@ -32,6 +32,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
@@ -117,7 +118,10 @@
 	int ch, cnt;
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	while ((ch = getopt(argc, argv, "r:o:")) != -1)
 		switch(ch) {
diff -Naur --exclude '*.swp' bsd-games-2.17/atc/main.c bsd-games-2.17.new/atc/main.c
--- bsd-games-2.17/atc/main.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/atc/main.c	2006-04-06 13:35:43.000000000 -0700
@@ -41,6 +41,7 @@
  * For more info on this and all of my stuff, mail edjames at berkeley.edu.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1990, 1993\n\
@@ -77,7 +78,10 @@
 
 	/* Open the score file then revoke setgid privileges */
 	open_score_file();
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	start_time = seed = time(NULL);
 
diff -Naur --exclude '*.swp' bsd-games-2.17/backgammon/backgammon/main.c bsd-games-2.17.new/backgammon/backgammon/main.c
--- bsd-games-2.17/backgammon/backgammon/main.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/backgammon/backgammon/main.c	2006-04-06 13:39:23.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #include <termcap.h>
 #ifndef lint
@@ -101,7 +102,10 @@
 	long    t;		/* time for random num generator */
 
 	/* revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	/* initialization */
 	bflag = 2;		/* default no board */
diff -Naur --exclude '*.swp' bsd-games-2.17/backgammon/teachgammon/teach.c bsd-games-2.17.new/backgammon/teachgammon/teach.c
--- bsd-games-2.17/backgammon/teachgammon/teach.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/backgammon/teachgammon/teach.c	2006-04-06 13:39:44.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #include <termcap.h>
 #ifndef lint
@@ -68,7 +69,10 @@
 	int     i;
 
 	/* revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	signal(SIGINT, getout);
 	if (tcgetattr(0, &old) == -1)	/* get old tty mode */
diff -Naur --exclude '*.swp' bsd-games-2.17/banner/banner.c bsd-games-2.17.new/banner/banner.c
--- bsd-games-2.17/banner/banner.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/banner/banner.c	2006-04-04 17:42:03.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1993, 1994\n\
@@ -1036,7 +1037,10 @@
 	int ch;
 
 	/* revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	while ((ch = getopt(argc, argv, "w:td")) != -1)
 		switch (ch) {
diff -Naur --exclude '*.swp' bsd-games-2.17/battlestar/battlestar.c bsd-games-2.17.new/battlestar/battlestar.c
--- bsd-games-2.17/battlestar/battlestar.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/battlestar/battlestar.c	2006-04-06 13:33:22.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\
@@ -64,7 +65,10 @@
 
 	/* Open the score file then revoke setgid privileges */
 	open_score_file();
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	if (argc < 2)
 		initialize(NULL);
diff -Naur --exclude '*.swp' bsd-games-2.17/bcd/bcd.c bsd-games-2.17.new/bcd/bcd.c
--- bsd-games-2.17/bcd/bcd.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/bcd/bcd.c	2006-04-04 17:34:57.000000000 -0700
@@ -32,6 +32,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
@@ -135,7 +136,10 @@
 	char cardline[80];
 
 	/* revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	/*
 	 * The original bcd prompts with a "%" when reading from stdin,
diff -Naur --exclude '*.swp' bsd-games-2.17/boggle/boggle/bog.c bsd-games-2.17.new/boggle/boggle/bog.c
--- bsd-games-2.17/boggle/boggle/bog.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/boggle/boggle/bog.c	2006-04-04 17:41:17.000000000 -0700
@@ -32,6 +32,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1993\n\
@@ -131,7 +132,10 @@
 	char *bspec, *p;
 
 	/* revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	seed = 0;
 	batch = debug = reuse = selfuse = sflag = 0;
diff -Naur --exclude '*.swp' bsd-games-2.17/caesar/caesar.c bsd-games-2.17.new/caesar/caesar.c
--- bsd-games-2.17/caesar/caesar.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/caesar/caesar.c	2006-04-04 17:31:41.000000000 -0700
@@ -37,6 +37,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
@@ -90,7 +91,10 @@
 	int obs[26], try, winner;
 
 	/* revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	winnerdot = 0;
 	if (argc > 1)
diff -Naur --exclude '*.swp' bsd-games-2.17/canfield/canfield/canfield.c bsd-games-2.17.new/canfield/canfield/canfield.c
--- bsd-games-2.17/canfield/canfield/canfield.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/canfield/canfield/canfield.c	2006-04-06 13:31:18.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
@@ -1666,6 +1667,20 @@
 }
 
 /*
+ * Open the high score file and then drop setgid.
+ */
+void
+open_score() {
+	dbfd = open(_PATH_SCORE, O_RDWR);
+
+	/* Revoke setgid privileges */
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
+}
+
+/*
  * procedure to initialize the game
  */
 void
@@ -1679,10 +1694,6 @@
 	uid = getuid();
 	if (uid < 0)
 		uid = 0;
-	dbfd = open(_PATH_SCORE, O_RDWR);
-
-	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
 
 	if (dbfd < 0)
 		return;
@@ -1797,6 +1808,8 @@
 		exit(0);
 	}
 #endif
+        open_score();
+
 	signal(SIGINT, askquit);
 	signal(SIGHUP, cleanup);
 	signal(SIGTERM, cleanup);
diff -Naur --exclude '*.swp' bsd-games-2.17/canfield/cfscores/cfscores.c bsd-games-2.17.new/canfield/cfscores/cfscores.c
--- bsd-games-2.17/canfield/cfscores/cfscores.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/canfield/cfscores/cfscores.c	2006-04-06 13:14:59.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\
@@ -78,7 +79,10 @@
 	int uid;
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	if (argc > 2) {
 		printf("Usage: cfscores [user]\n");
diff -Naur --exclude '*.swp' bsd-games-2.17/cribbage/crib.c bsd-games-2.17.new/cribbage/crib.c
--- bsd-games-2.17/cribbage/crib.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/cribbage/crib.c	2006-04-04 18:30:44.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
@@ -76,7 +77,10 @@
 		exit(1);
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	/* Set close-on-exec flag on log file */
 	if (f != NULL) {
diff -Naur --exclude '*.swp' bsd-games-2.17/cribbage/instr.c bsd-games-2.17.new/cribbage/instr.c
--- bsd-games-2.17/cribbage/instr.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/cribbage/instr.c	2006-04-04 17:30:46.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
@@ -71,6 +72,11 @@
 		 * for mailx and man.  We only use a pager if stdout is
 		 * a terminal, and we pass the file on stdin to sh -c pager.
 		 */
+		if (setresgid(-1, getgid(), getgid()) != 0) {
+		    perror("Could not drop setgid privileges.  Aborting.");
+		    exit(1);
+		}
+
 		if (!isatty(1))
 			path = "cat";
 		else {
diff -Naur --exclude '*.swp' bsd-games-2.17/factor/factor.c bsd-games-2.17.new/factor/factor.c
--- bsd-games-2.17/factor/factor.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/factor/factor.c	2006-04-07 17:26:49.000000000 -0700
@@ -32,6 +32,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
@@ -138,6 +139,12 @@
 	int ch;
 	char *p, buf[LINE_MAX];		/* > max number of digits. */
 
+	/* Revoke setgid privileges */
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
+
 #ifdef HAVE_OPENSSL 
 	ctx = BN_CTX_new();
 #endif
@@ -145,9 +152,6 @@
 	if (val == NULL)
 		errx(1, "can't initialise bignum");
 
-	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
-
 	while ((ch = getopt(argc, argv, "")) != -1)
 		switch (ch) {
 		case '?':
diff -Naur --exclude '*.swp' bsd-games-2.17/fish/fish.c bsd-games-2.17.new/fish/fish.c
--- bsd-games-2.17/fish/fish.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/fish/fish.c	2006-04-04 17:34:45.000000000 -0700
@@ -32,6 +32,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1990, 1993\n\
@@ -103,7 +104,10 @@
 	int ch, move;
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	while ((ch = getopt(argc, argv, "p")) != -1)
 		switch(ch) {
diff -Naur --exclude '*.swp' bsd-games-2.17/fortune/fortune/fortune.c bsd-games-2.17.new/fortune/fortune/fortune.c
--- bsd-games-2.17/fortune/fortune/fortune.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/fortune/fortune/fortune.c	2006-04-07 17:28:14.000000000 -0700
@@ -32,6 +32,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1986, 1993\n\
@@ -227,7 +228,10 @@
 #endif	/* OK_TO_WRITE_DISK */
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	getargs(ac, av);
 
diff -Naur --exclude '*.swp' bsd-games-2.17/gomoku/main.c bsd-games-2.17.new/gomoku/main.c
--- bsd-games-2.17/gomoku/main.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/gomoku/main.c	2006-04-04 17:35:38.000000000 -0700
@@ -32,6 +32,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1994\n\
@@ -95,7 +96,10 @@
 	};
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	color = curmove = 0;
 
diff -Naur --exclude '*.swp' bsd-games-2.17/hangman/main.c bsd-games-2.17.new/hangman/main.c
--- bsd-games-2.17/hangman/main.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/hangman/main.c	2006-04-04 17:35:55.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\
@@ -57,7 +58,10 @@
 	int ch;
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	while ((ch = getopt(argc, argv, "d:m:")) != -1) {
 		switch (ch) {
diff -Naur --exclude '*.swp' bsd-games-2.17/hunt/hunt/hunt.c bsd-games-2.17.new/hunt/hunt/hunt.c
--- bsd-games-2.17/hunt/hunt/hunt.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/hunt/hunt/hunt.c	2006-04-04 17:36:13.000000000 -0700
@@ -30,6 +30,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __RCSID("$NetBSD: hunt.c,v 1.23 2004/11/05 21:30:32 dsl Exp $");
@@ -138,7 +139,10 @@
 	long		enter_status;
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	enter_status = env_init((long) Q_CLOAK);
 	while ((c = getopt(ac, av, "Sbcfh:l:mn:op:qst:w:")) != -1) {
diff -Naur --exclude '*.swp' bsd-games-2.17/mille/mille.c bsd-games-2.17.new/mille/mille.c
--- bsd-games-2.17/mille/mille.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/mille/mille.c	2006-04-04 17:36:28.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1982, 1993\n\
@@ -58,7 +59,10 @@
 	bool	restore;
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	if (strcmp(av[0], "a.out") == 0) {
 		outf = fopen("q", "w");
diff -Naur --exclude '*.swp' bsd-games-2.17/monop/monop.c bsd-games-2.17.new/monop/monop.c
--- bsd-games-2.17/monop/monop.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/monop/monop.c	2006-04-04 17:36:51.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
@@ -65,7 +66,10 @@
 	char *av[];
 {
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	srand(getpid());
 	heapstart = sbrk(0);
diff -Naur --exclude '*.swp' bsd-games-2.17/morse/morse.c bsd-games-2.17.new/morse/morse.c
--- bsd-games-2.17/morse/morse.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/morse/morse.c	2006-04-04 17:37:05.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1988, 1993\n\
@@ -127,7 +128,10 @@
 	char *p;
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	while ((ch = getopt(argc, argv, "ds")) != -1)
 		switch((char)ch) {
diff -Naur --exclude '*.swp' bsd-games-2.17/number/number.c bsd-games-2.17.new/number/number.c
--- bsd-games-2.17/number/number.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/number/number.c	2006-04-07 17:30:32.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1988, 1993, 1994\n\
@@ -94,7 +95,10 @@
 	char line[256];
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	lflag = 0;
 	while ((ch = getopt(argc, argv, "l")) != -1)
diff -Naur --exclude '*.swp' bsd-games-2.17/pig/pig.c bsd-games-2.17.new/pig/pig.c
--- bsd-games-2.17/pig/pig.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/pig/pig.c	2006-04-04 17:37:19.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1992, 1993\n\
@@ -66,7 +67,10 @@
 	char buf[1024];
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	while ((ch = getopt(argc, argv, "")) != -1)
 		switch(ch) {
diff -Naur --exclude '*.swp' bsd-games-2.17/pom/pom.c bsd-games-2.17.new/pom/pom.c
--- bsd-games-2.17/pom/pom.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/pom/pom.c	2006-04-04 17:37:30.000000000 -0700
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
@@ -101,7 +102,10 @@
 	char buf[1024];
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	if (time(&now) == (time_t)-1)
 		err(1, "time");
diff -Naur --exclude '*.swp' bsd-games-2.17/ppt/ppt.c bsd-games-2.17.new/ppt/ppt.c
--- bsd-games-2.17/ppt/ppt.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/ppt/ppt.c	2006-04-04 17:37:39.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1988, 1993\n\
@@ -73,7 +74,10 @@
 	int c, start, neednl, dflag;
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	dflag = 0;
 	while ((c = getopt(argc, argv, "dh")) != -1)
diff -Naur --exclude '*.swp' bsd-games-2.17/primes/primes.c bsd-games-2.17.new/primes/primes.c
--- bsd-games-2.17/primes/primes.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/primes/primes.c	2006-04-07 17:29:06.000000000 -0700
@@ -32,6 +32,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
@@ -119,7 +120,10 @@
 	char *p;
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	while ((ch = getopt(argc, argv, "")) != -1)
 		switch (ch) {
diff -Naur --exclude '*.swp' bsd-games-2.17/quiz/quiz.c bsd-games-2.17.new/quiz/quiz.c
--- bsd-games-2.17/quiz/quiz.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/quiz/quiz.c	2006-04-04 17:37:56.000000000 -0700
@@ -33,6 +33,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1991, 1993\n\
@@ -85,7 +86,10 @@
 	const char *indexfile;
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	indexfile = _PATH_QUIZIDX;
 	while ((ch = getopt(argc, argv, "i:t")) != -1)
diff -Naur --exclude '*.swp' bsd-games-2.17/rain/rain.c bsd-games-2.17.new/rain/rain.c
--- bsd-games-2.17/rain/rain.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/rain/rain.c	2006-04-04 17:38:07.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
@@ -77,7 +78,10 @@
 	int xpos[5], ypos[5];
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	while ((ch = getopt(argc, argv, "d:")) != -1)
 		switch (ch) {
diff -Naur --exclude '*.swp' bsd-games-2.17/random/random.c bsd-games-2.17.new/random/random.c
--- bsd-games-2.17/random/random.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/random/random.c	2006-04-04 17:38:19.000000000 -0700
@@ -32,6 +32,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1994\n\
@@ -73,7 +74,10 @@
 	char *ep;
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	denom = 0;
 	random_exit = unbuffer_output = 0;
diff -Naur --exclude '*.swp' bsd-games-2.17/robots/main.c bsd-games-2.17.new/robots/main.c
--- bsd-games-2.17/robots/main.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/robots/main.c	2006-04-06 13:35:58.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
@@ -68,7 +69,10 @@
 		exit(1);
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	show_only = FALSE;
 	Num_games = 1;
diff -Naur --exclude '*.swp' bsd-games-2.17/snake/snake/snake.c bsd-games-2.17.new/snake/snake/snake.c
--- bsd-games-2.17/snake/snake/snake.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/snake/snake/snake.c	2006-04-06 13:32:03.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
@@ -159,7 +160,10 @@
 		warn("fopen %s", _PATH_LOGFILE);
 		sleep(2);
 	}
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	(void) time(&tv);
 
diff -Naur --exclude '*.swp' bsd-games-2.17/snake/snscore/snscore.c bsd-games-2.17.new/snake/snscore/snscore.c
--- bsd-games-2.17/snake/snscore/snscore.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/snake/snscore/snscore.c	2006-04-06 13:15:19.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
@@ -75,7 +76,10 @@
 	struct	passwd	*p;
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	fd = fopen(recfile, "r");
 	if (fd == NULL)
diff -Naur --exclude '*.swp' bsd-games-2.17/trek/main.c bsd-games-2.17.new/trek/main.c
--- bsd-games-2.17/trek/main.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/trek/main.c	2006-04-04 17:38:38.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
@@ -173,7 +174,10 @@
 	struct	termios		argp;
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	av = argv;
 	ac = argc;
diff -Naur --exclude '*.swp' bsd-games-2.17/worm/worm.c bsd-games-2.17.new/worm/worm.c
--- bsd-games-2.17/worm/worm.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/worm/worm.c	2006-04-07 17:28:35.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
@@ -99,7 +100,10 @@
 {
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	setbuf(stdout, outbuf);
 	srand(getpid());
diff -Naur --exclude '*.swp' bsd-games-2.17/worms/worms.c bsd-games-2.17.new/worms/worms.c
--- bsd-games-2.17/worms/worms.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/worms/worms.c	2006-04-04 17:41:34.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
@@ -199,7 +200,10 @@
 	unsigned int delay = 0;
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	mp = NULL;
 	length = 16;
diff -Naur --exclude '*.swp' bsd-games-2.17/wump/wump.c bsd-games-2.17.new/wump/wump.c
--- bsd-games-2.17/wump/wump.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/wump/wump.c	2006-04-04 17:41:55.000000000 -0700
@@ -33,6 +33,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
@@ -145,7 +146,10 @@
 	int c;
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 #ifdef DEBUG
 	while ((c = getopt(argc, argv, "a:b:hp:r:t:d")) != -1)

bsd-games-2.17-tetrisgid.patch:

--- NEW FILE bsd-games-2.17-tetrisgid.patch ---
diff -Naur --exclude '*.swp' bsd-games-2.17/tetris/scores.c bsd-games-2.17.new/tetris/scores.c
--- bsd-games-2.17/tetris/scores.c	2006-04-22 20:46:56.000000000 -0700
+++ bsd-games-2.17.new/tetris/scores.c	2006-04-22 22:02:45.000000000 -0700
@@ -41,6 +41,7 @@
  *
  * Major whacks since then.
  */
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -77,85 +78,88 @@
 
 static int checkscores(struct highscore *, int);
 static int cmpscores(const void *, const void *);
-static void getscores(FILE **);
+static void getscores(FILE *);
 static void printem(int, int, struct highscore *, int, const char *);
 static char *thisuser(void);
 
 /*
- * Read the score file.  Can be called from savescore (before showscores)
- * or showscores (if savescore will not be called).  If the given pointer
- * is not NULL, sets *fpp to an open file pointer that corresponds to a
- * read/write score file that is locked with LOCK_EX.  Otherwise, the
- * file is locked with LOCK_SH for the read and closed before return.
- *
- * Note, we assume closing the stdio file releases the lock.
+ * Read the score file from a previously opened file pointer.  If the file
+ * pointer is null, then read the scoreboard from a known location.  Otherwise,
+ * the FILE pointer is rewound, read, and left open to be read again later.
  */
 static void
-getscores(fpp)
-	FILE **fpp;
+getscores(fp)
+    FILE *fp;
 {
-	int sd, mint, lck;
-	mode_t mask;
-	const char *mstr, *human;
-	FILE *sf;
-
-	if (fpp != NULL) {
-		mint = O_RDWR | O_CREAT;
-		mstr = "r+";
-		human = "read/write";
-		lck = LOCK_EX;
-	} else {
-		mint = O_RDONLY;
-		mstr = "r";
-		human = "reading";
-		lck = LOCK_SH;
-	}
-	setegid(egid);
-	mask = umask(S_IWOTH);
-	sd = open(_PATH_SCOREFILE, mint, 0666);
-	(void)umask(mask);
-	if (sd < 0) {
-		if (fpp == NULL) {
-			nscores = 0;
-			setegid(gid);
-			return;
-		}
-		err(1, "cannot open %s for %s", _PATH_SCOREFILE, human);
-	}
-	if ((sf = fdopen(sd, mstr)) == NULL) {
-		err(1, "cannot fdopen %s for %s", _PATH_SCOREFILE, human);
-	}
-	setegid(gid);
+	int sd = -1;
+        FILE *sf = fp;
 
-	/*
-	 * Grab a lock.
-	 */
-	if (flock(sd, lck))
-		warn("warning: score file %s cannot be locked",
-		    _PATH_SCOREFILE);
+        if (sf == NULL) {
+            sd = open(_PATH_SCOREFILE, O_RDONLY, 0664);
+            if (sd < 0) {
+                    nscores = 0;
+                    return;
+                    err(1, "cannot open %s for reading", _PATH_SCOREFILE);
+            }
+            if ((sf = fdopen(sd, "r")) == NULL) {
+                    err(1, "cannot fdopen %s for reading", _PATH_SCOREFILE);
+            }
+        } else {
+            rewind(sf);
+        }
 
 	nscores = fread(scores, sizeof(scores[0]), MAXHISCORES, sf);
 	if (ferror(sf)) {
 		err(1, "error reading %s", _PATH_SCOREFILE);
 	}
 
-	if (fpp)
-		*fpp = sf;
-	else
-		(void)fclose(sf);
+	else {
+                if (fp == NULL) {
+                        (void)fclose(sf);
+                }
+        }
+}
+
+/*
+ * Open the high score file and then drop setgid privileges.  If running
+ * setgid, then calling this function a second time will result in a
+ * permission denied error since gid privileges will have been lost.
+ */
+void
+open_score(fd, fp)
+    int *fd;
+    FILE **fp;
+{
+    *fd = open(_PATH_SCOREFILE, O_RDWR | O_CREAT, 0664);
+    if (*fd < 0) {
+        err(1, "Could not open scoreboard file %s", _PATH_SCOREFILE);
+    } else {
+        *fp = fdopen(*fd, "r+");
+        if (*fp == NULL) {
+            err(1, "Could not open scoreboard file %s", _PATH_SCOREFILE);
+        }
+    }
+    if (setresgid(-1, getgid(), getgid()) == -1) {
+        perror("Could not drop setgid privileges.  Aborting.");
+        exit(1);
+    }
 }
 
 void
-savescore(level)
+savescore(level, sf)
 	int level;
+        FILE *sf;
 {
 	struct highscore *sp;
 	int i;
 	int change;
-	FILE *sf;
 	const char *me;
 
-	getscores(&sf);
+        if (sf == NULL) {
+            return;
+        }
+
+	getscores(sf);
 	gotscores = 1;
 	(void)time(&now);
 
@@ -215,14 +219,17 @@
 static char *
 thisuser()
 {
-	const char *p;
+	const char *p = (char *)NULL;
 	struct passwd *pw;
 	size_t l;
 	static char u[sizeof(scores[0].hs_name)];
 
 	if (u[0])
 		return (u);
+        /* Don't use getlogin() as it will return the wrong result
+         * for someone who has su'd to a different user.
 	p = getlogin();
+         */
 	if (p == NULL || *p == '\0') {
 		pw = getpwuid(getuid());
 		if (pw != NULL)
@@ -359,7 +366,7 @@
 	int levelfound[NLEVELS];
 
 	if (!gotscores)
-		getscores((FILE **)NULL);
+		getscores(NULL);
 	(void)printf("\n\t\t\t    Tetris High Scores\n");
 
 	/*
diff -Naur --exclude '*.swp' bsd-games-2.17/tetris/scores.h bsd-games-2.17.new/tetris/scores.h
--- bsd-games-2.17/tetris/scores.h	2006-04-22 20:46:56.000000000 -0700
+++ bsd-games-2.17.new/tetris/scores.h	2006-04-22 16:30:46.000000000 -0700
@@ -48,5 +48,6 @@
 #define MAXSCORES	9	/* maximum high score entries per person */
 #define	EXPIRATION	(5L * 365 * 24 * 60 * 60)
 
-void	savescore(int);
+void	savescore(int, FILE *);
+void    open_score(int *, FILE **);
 void	showscores(int);
diff -Naur --exclude '*.swp' bsd-games-2.17/tetris/tetris.c bsd-games-2.17.new/tetris/tetris.c
--- bsd-games-2.17/tetris/tetris.c	2006-04-22 20:46:56.000000000 -0700
+++ bsd-games-2.17.new/tetris/tetris.c	2006-04-22 21:02:27.000000000 -0700
@@ -135,10 +135,15 @@
 	char key_write[6][10];
 	int ch, i, j;
 	int fd;
+        int sd = 0;
+        FILE *sf = (FILE *)NULL;
 
-	gid = getgid();
-	egid = getegid();
-	setegid(gid);
+        /*
+         * This function has the side effect of dropping setgid privileges.
+         * sd is not used, but is kept around in case we want to add code
+         * to lock shared access to the scoreboard later.
+         */
+        open_score(&sd, &sf);
 
 	fd = open("/dev/null", O_RDONLY);
 	if (fd < 3)
@@ -307,7 +312,7 @@
 
 	(void)printf("Your score:  %d point%s  x  level %d  =  %d\n",
 	    score, score == 1 ? "" : "s", level, score * level);
-	savescore(level);
+	savescore(level, sf);
 
 	printf("\nHit RETURN to see high scores, ^C to skip.\n");
 

bsd-games-2.17-utmpstruct.patch:

--- NEW FILE bsd-games-2.17-utmpstruct.patch ---
--- bsd-games-2.17.new/dm/utmpentry.c	2004-10-23 05:17:21.000000000 -0700
+++ bsd-games-2.17/dm/utmpentry.c	2006-04-04 10:51:17.000000000 -0700
@@ -291,7 +291,8 @@
 	e->line[sizeof(e->line) - 1] = '\0';
 	(void)strncpy(e->host, up->ut_host, sizeof(up->ut_host));
 	e->name[sizeof(e->host) - 1] = '\0';
-	e->tv = up->ut_tv;
+	e->tv.tv_sec = up->ut_tv.tv_sec;
+	e->tv.tv_usec = up->ut_tv.tv_usec;
 	adjust_size(e);
 }
 #endif


--- NEW FILE bsd-games.spec ---
Summary: Collection of text-based games
Name: bsd-games
Version: 2.17
Release: 8%{?dist}
License: BSD
Group: Amusements/Games
URL: ftp://metalab.unc.edu/pub/Linux/games/
Source0: ftp://metalab.unc.edu/pub/Linux/games/bsd-games-%{version}.tar.gz
Source1: config.params
# A collection of patches from Debian.
Patch0: bsd-games-2.17-debian.patch
# Patches from Fedora Core 1
Patch1: bsd-games-2.17-ospeed.patch
Patch2: bsd-games-2.17-getline.patch
Patch3: bsd-games-2.17-utmpstruct.patch
# Additional new patches
Patch4: bsd-games-2.17-setresgid.patch
Patch5: bsd-games-2.17-tetrisgid.patch
Patch6: bsd-games-2.17-hackgid.patch
Patch7: bsd-games-2.17-phantasiagid.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# It looks like textutils became coreutils at some point.  I'm not sure
# what is needed from it, so I'm commenting it out until I can find out.
#Requires: textutils
BuildRequires: ncurses-devel libtermcap-devel words
Requires(Pre): /usr/sbin/groupadd

%description
Bsd-games includes adventure, arithmetic, atc, backgammon, battlestar,
bcd, caesar, canfield, cfscores, cribbage, go-fish, gomoku,
hunt, mille, monop, morse, number, phantasia, pig, pom, ppt, primes,
quiz, rain, random, robots, rot13, sail, snake, snscore, teachgammon,
tetris-bsd, trek, wargames, worm, worms and wump.

%prep
%setup -q
install -p -m 755 %{SOURCE1} .
%patch0 -p1 -b .debian
%patch1 -p1 -b .ospeed
%patch2 -p1 -b .getline
%patch3 -p1 -b .utmpstruct
%patch4 -p1 -b .setresgid
%patch5 -p1 -b .tetrisgid
%patch6 -p1 -b .hackgid
%patch7 -p1 -b .phantasiagid

%build
# We include a templatized configuration settings file to set
# reasonable defaults, and to tell the configure script not to
# run in interactive mode.
sed -i.bak -e "s#@DESTDIR@#$RPM_BUILD_ROOT#" \
    -e "s#@bindir@#%{_bindir}#" \
    -e "s#@docdir@#%{_docdir}#" \
    -e "s#@sbindir@#%{_sbindir}#" \
    -e "s#@datadir@#%{_datadir}#" \
    -e "s#@libdir@#%{_libdir}#" \
    -e "s#@mandir@#%{_mandir}#" \
    -e "s#@var@#%{_var}#" \
    -e "s#@RPM_OPT_FLAGS@#$RPM_OPT_FLAGS#" \
    config.params 

# Don't use %%configure.  This configure script wasn't generated by
# autoconf and doesn't obey things like --prefix.
./configure
make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" %{?_smp_mflags}

# Rename one doc file to avoid naming collisions
cp hunt/README README.hunt

%install
rm -rf $RPM_BUILD_ROOT
make RPM_BUILD_ROOT="$RPM_BUILD_ROOT" install

# Change the binary name for monop to prevent a conflict with the mono-devel
# package
mv $RPM_BUILD_ROOT/%{_bindir}/monop $RPM_BUILD_ROOT/%{_bindir}/mpoly

# Remove this doc file.  We're copying it to a different location for Fedora.
rm -f $RPM_BUILD_ROOT/%{_docdir}/trek.me

%clean
rm -rf $RPM_BUILD_ROOT

%pre
%{_sbindir}/groupadd gamehack &>/dev/null || :
%{_sbindir}/groupadd gamesail &>/dev/null || :
%{_sbindir}/groupadd gamephant &>/dev/null || :

%files
%defattr(-,root,root)
%{_bindir}/adventure
%{_bindir}/arithmetic
%attr(2755,root,games) %{_bindir}/atc
%{_bindir}/backgammon
%{_bindir}/teachgammon
%attr(2755,root,games) %{_bindir}/battlestar
%{_bindir}/banner
%{_bindir}/boggle
%{_bindir}/bcd
%{_bindir}/caesar
%{_bindir}/dab
%{_bindir}/rot13
%attr(2755,root,games) %{_bindir}/canfield
%{_bindir}/cfscores
%attr(2755,root,games) %{_bindir}/cribbage
%{_bindir}/go-fish
%{_bindir}/gomoku
%attr(2755,root,gamehack) %{_bindir}/hack
%{_bindir}/hangman
%{_bindir}/hunt
%{_bindir}/mille
%{_bindir}/mpoly
%{_bindir}/morse
%{_bindir}/number
%attr(2755,root,gamephant) %{_bindir}/phantasia
%{_bindir}/pig
%{_bindir}/pom
%{_bindir}/ppt
%{_bindir}/primes
%{_bindir}/quiz
%{_bindir}/rain
%{_bindir}/random
%attr(2755,root,games) %{_bindir}/robots
%attr(2755,root,gamesail) %{_bindir}/sail
%attr(2755,root,games) %{_bindir}/snake
%{_bindir}/snscore
%attr(2755,root,games) %{_bindir}/tetris-bsd
%{_bindir}/trek
%{_bindir}/wargames
%{_bindir}/worm
%{_bindir}/worms
%{_bindir}/wtf
%{_bindir}/wump
%dir %{_datadir}/bsd-games
%{_datadir}/bsd-games/atc
%{_datadir}/bsd-games/boggle
%{_datadir}/bsd-games/cribbage.instr
%{_datadir}/bsd-games/fish.instr
%{_datadir}/bsd-games/monop-cards.pck
%{_datadir}/bsd-games/quiz
%{_datadir}/bsd-games/wump.info
%{_datadir}/misc/acronyms
%{_datadir}/misc/acronyms.comp
%{_mandir}/man6/*
%{_sbindir}/huntd
%attr(664,root,games) %{_var}/games/atc_score
%attr(664,root,games) %{_var}/games/battlestar.log
%attr(664,root,games) %{_var}/games/cfscores
%attr(664,root,games) %{_var}/games/criblog
%{_datadir}/bsd-games/hack/
%dir %attr(0775,root,gamehack) %{_var}/games/hack
%attr(664,root,gamehack) %{_var}/games/hack/*
%dir %attr(775,root,gamephant) %{_var}/games/phantasia
%attr(664,root,gamephant) %{_var}/games/phantasia/*
%dir %attr(775,root,gamesail) %{_var}/games/sail
%attr(644,root,games) %{_var}/games/robots_roll
%attr(664,root,gamesail) %{_var}/games/saillog
%attr(664,root,games) %{_var}/games/snake.log
%attr(664,root,games) %{_var}/games/snakerawscores
%attr(664,root,games) %{_var}/games/tetris-bsd.scores
%doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me

%changelog
* Fri Apr 28 2006 Wart <wart at kobold.org> 2.17-8
- Fix directory ownership of _datadir/bsd-games
- Change license to BSD

* Thu Apr 27 2006 Wart <wart at kobold.org> 2.17-7
- Remove dm for Fedora
- Turn off setgid bit for cfscores
- Limit setgid code segments in hack
- Limit setgid code segments in phantasia

* Wed Apr 26 2006 Wart <wart at kobold.org> 2.17-6
- Remove bones file modifications from hack and run with a custom group
  instead.

* Sun Apr 24 2006 Wart <wart at kobold.org> 2.17-5
- Modified bones file handling to allow us to drop setgid earlier.

* Sat Apr 22 2006 Wart <wart at kobold.org> 2.17-4
- Added dist tag to release number
- Added patch to limit potential security holes in tetris-bsd
- Added patch set from Debian's package, which includes a security patch
  for CVE-2006-1744
- Rename monop to mpoly to avoid conflict with the mono-devel package.

* Fri Apr 14 2006 Wart <wart at kobold.org> 2.17-3
- Updated setresgid patch to disable potential security holes from
  user-specified scoreboard files.
- Move hack save games to $HOME, but can be moved using HACKDIR or the
  '-d' command line option.

* Sat Apr 8 2006 Wart <wart at kobold.org> 2.17-2
- Added patch to change use of setregid to setresgid almost everywhere.
- Added missing BuildRequires

* Mon Apr 3 2006 Wart <wart at kobold.org> 2.17-1
- Updated to 2.17 with new configuration system
- Updated patches for 2.17
- Updated spec file for Fedora Extras

* Fri Feb 16 2001 Tim Powers <timp at redhat.com>
- fixed getline() redefinition, it is included in stdio.h now, so 
  getline had to be renamed. Also, -D_GNU_SOURCE
- fix bug 27850, where certain games need to be setgid games, and 
  their scorefiles etc. need to belong to group games

* Tue Aug 1 2000 Tim Powers <timp at redhat.com>
- fix bug #15013, bad dir permissions

* Mon Jul 24 2000 Prospector <prospector at redhat.com>
- rebuilt

* Thu Jul 13 2000 Trond Eivind Glomsr??d <teg at redhat.com>
- use %%{_tmppath}
- don't use internal rpm programs 
- kill countmail, no longer require frm from elm

* Mon Jun 5 2000 Tim Powers <timp at redhat.com>
- fixed man page location to be in %{_mandir}
- fixed so that regular users can build

* Fri May 5 2000 Tim Powers <timp at redhat.com>
- rebuilt for 7.0
- compress man pages

* Thu Feb 10 2000 Tim Powers <timp at redhat.com>
- strip binaries.

* Sun Nov 21 1999 Bernhard Rosenkraenzer <bero at redhat.com>
- 2.9

* Mon Nov 1 1999 Tim Powers <timp at redhat.com>
- updated source to 2.8
- fixed problem with ospeed being defined in the source instead of including
	termcap.h (new ospeed patch)
- using files list in %files section instead of entering
	_every_single_filename_.

* Sat Aug 21 1999 Bill Nottingham <notting at redhat.com>
- fix countmail (#3722). I must be bored.

* Mon Aug 16 1999 Bill Nottingham <notting at redhat.com>
- make dm setgid games, not setuid root...

* Fri Jul 9 1999 Tim Powers <timp at redhat.com>
- updated source to 2.7
- updated patches to fix bugs and the braindead configure script, 
  dropped a few of the older patches that made it into this release
- replaced -make install with make install-strip
- built for 6.1

* Wed May 12 1999 Bill Nottingham <notting at redhat.com>
- pick up some more files

* Thu Apr 01 1999 Michael Maher <mike at redhat.com>
- only a fool would add a dependency to this package on a 
  day like today.

* Fri Mar 18 1999 Michael Maher <mike at redhat.com>
- fixed bug 1550

* Mon Feb 08 1999 Michael Maher <mike at redhat.com>
- moved pacakge to PowerTools.

* Thu Jun 18 1998 Alan Cox <alan at redhat.com>
- Chris Evans pointed out a hole in sail I missed.

* Wed Jun 17 1998 Alan Cox <alan at redhat.com>
- Stopped people using cribbage to be able to cheat game score files.

* Tue May 05 1998 Prospector System <bugs at redhat.com>
- translations modified for de, fr, tr

* Thu Apr 30 1998 Cristian Gafton <gafton at redhat.com>
- fixed the config patch so that it will build on non /usr/src/redhat build
  trees

* Tue Apr 07 1998 Erik Troan <ewt at redhat.com>
- updated to bsd-games 2.1
- started over on package


--- NEW FILE config.params ---
#!/bin/sh

# This file contains the configuration settings for the bsd games
# collection as packaged for Fedora Extras.  Only some settings are
# listed here.  You'll have to comb through the configure script
# to discover other things that can be modified.

bsd_games_cfg_non_interactive=y
bsd_games_cfg_install_prefix=@DESTDIR@
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@
bsd_games_cfg_man6dir=@mandir@/man6
bsd_games_cfg_man8dir=@mandir@/man8
bsd_games_cfg_man5dir=@mandir@/man5
bsd_games_cfg_docdir=@docdir@
bsd_games_cfg_sharedir=@datadir@/bsd-games/
bsd_games_cfg_varlibdir=@var@/games/
# Don't try to chown the files.  This will fail for non-root users and
# will instead be handled in the rpm packaging.
bsd_games_cfg_do_chown=n
bsd_games_cfg_use_dot_so=.so
bsd_games_cfg_gzip_manpages=y
bsd_games_cfg_cc=gcc
bsd_games_cfg_cxx=g++
bsd_games_cfg_optimize_flags="@RPM_OPT_FLAGS@"
bsd_games_cfg_ncurses_lib=-lncurses
bsd_games_cfg_ncurses_includes=
bsd_games_cfg_base_libs=
bsd_games_cfg_yacc="bison -y"
bsd_games_cfg_lex=flex
bsd_games_cfg_lex_lib=-lfl
bsd_games_cfg_pager=/usr/bin/less
bsd_games_cfg_sail_dir="$bsd_games_cfg_varlibdir/sail"
bsd_games_cfg_sail_dir_owner="root"
bsd_games_cfg_sail_dir_group="root"
bsd_games_cfg_sail_dir_perms="0750"
bsd_games_cfg_hack_dir="/var/games/hack"
bsd_games_cfg_hack_dir_owner="root"
bsd_games_cfg_hack_dir_group="root"
bsd_games_cfg_hack_dir_perms="0755"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bsd-games/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Apr 2006 15:33:05 -0000	1.1
+++ .cvsignore	29 Apr 2006 15:34:43 -0000	1.2
@@ -0,0 +1 @@
+bsd-games-2.17.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bsd-games/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Apr 2006 15:33:05 -0000	1.1
+++ sources	29 Apr 2006 15:34:43 -0000	1.2
@@ -0,0 +1 @@
+238a38a3a017ca9b216fc42bde405639  bsd-games-2.17.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 29 15:42:44 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sat, 29 Apr 2006 08:42:44 -0700
Subject: rpms/heartbeat/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 heartbeat.spec, 1.3, 1.4 heartbeat-fedora-chkconfig.patch,
	1.1, 1.2 heartbeat-fedora-pam.patch, 1.1, 1.2
Message-ID: <200604291542.k3TFgkgc007386@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/heartbeat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7353

Modified Files:
	.cvsignore sources heartbeat.spec 
	heartbeat-fedora-chkconfig.patch heartbeat-fedora-pam.patch 
Log Message:
* Thu Apr 27 2006  Joost Soeterbroek <fedora at soeterbroek.com> - 2.0.5-1
- upstream version 2.0.5
- removed patch2 - ownership of /heartbeat/crm/cib.xml is no longer
  set in cts/CM_LinuxHAv2.py.in
  + Version 2.0.5 - significant bug fixes and a few feature deficits fixed
  + various portability fixes
  + enable GUI to run with pygtk 2.4
  + significant GUI improvements and speedups
  + numerous logging improvements (generally much quieter)
  + speed up CIB processing by writing it to disk asynchronously
  + add CIB on-disk checksums
  + removed dependency on openssl
  + added "failure stickiness" to the CIB/CRM
  + Several fixes to the membership code
  + We now log all output from resource agents
  + fixed STONITHd memory leaks.
  + Added an OCF RA for Xen guests
  + Added email alerts to ldirectord
  + Improvements to the haresources2cib upgrade tool
  + Several fixes to cibadmin
  + Fix some autoadd-related bugs
  + Added Chinese support to the GUI
  + Added a daemon to replace and generalize ipfail
    + Limited testing only
  + Significant improvements to CIM model, including modifying things
  + Extensive Master/slave testing and fixes
  + Use a digest of the parameters used in an action (smaller CIB)
  + Improved detection of "old" events that should be ignored by the PE
    (ensures resource monitoring is active when required)
  + Better detection of required and/or optimal behaviour in mixed
    (and formerly mixed) clusters
  + LRM now supports multiple concurrent monitor operations
  + Optional startup & runtime enforcement of DTD validation
    (Invalid changes are rejected)
  + cibadmin tool overhauled and verified to function correctly
  + Some deprecated CIB features now unsupported
    + Placing nvpair objects in crm_config (must now use
      cluster_property_set)
    + on_stopfail removed in favor of setting on_fail in the resource's
      stop operation
    + start_prereq removed in favor of setting prereq in the resource's
      start operation 



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Mar 2006 18:40:39 -0000	1.3
+++ .cvsignore	29 Apr 2006 15:42:44 -0000	1.4
@@ -1 +1 @@
-heartbeat-2.0.4.tar.gz
+heartbeat-2.0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Mar 2006 18:40:00 -0000	1.3
+++ sources	29 Apr 2006 15:42:44 -0000	1.4
@@ -1 +1 @@
-659aae2365daea3a17e5a4a4ae0b0a3e  heartbeat-2.0.4.tar.gz
+209228b2948cfa4762a3a66454c6cc35  heartbeat-2.0.5.tar.gz


Index: heartbeat.spec
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/devel/heartbeat.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- heartbeat.spec	29 Mar 2006 18:41:54 -0000	1.3
+++ heartbeat.spec	29 Apr 2006 15:42:44 -0000	1.4
@@ -5,19 +5,19 @@
 %define           uname hacluster
 Summary:          Heartbeat subsystem for High-Availability Linux
 Name:             heartbeat
-Version:          2.0.4
-Release:          2%{?dist}
+Version:          2.0.5
+Release:          1%{?dist}
 License:          GPL/LGPL
 URL:              http://linux-ha.org/
 Group:            System Environment/Daemons
 Source0:          http://linux-ha.org/download/%{name}-%{version}.tar.gz
 Patch0:           heartbeat-fedora-pam.patch
 Patch1:           heartbeat-fedora-chkconfig.patch
-Patch2:           heartbeat-fedora-ccmuser.patch
+#Patch2:           heartbeat-fedora-ccmuser.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires:    glib2-devel
 BuildRequires:    iputils
-BuildRequires:    openssl-devel
+#BuildRequires:    openssl-devel
 BuildRequires:    libnet-devel
 BuildRequires:    libtool-ltdl-devel
 BuildRequires:    net-snmp-devel
@@ -108,7 +108,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+#%patch2 -p1
  
 %build
 # disable-fatal-warnings flag used to disable gcc4.x warnings of 'difference in signedness'
@@ -139,7 +139,6 @@
 
 sed -i -e '1i# -*-Shell-script-*-' $RPM_BUILD_ROOT/%{_libdir}/heartbeat/ocf-shellfuncs 
 sed -i -e '1i# -*-Shell-script-*-' $RPM_BUILD_ROOT/%{_sysconfdir}/ha.d/shellfuncs
-chmod -x $RPM_BUILD_ROOT/%{_libdir}/heartbeat/crmtest/helper.sh
 chmod -x $RPM_BUILD_ROOT/%{_libdir}/heartbeat/ocf-shellfuncs
 chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/ha.d/shellfuncs
 chmod -x $RPM_BUILD_ROOT/%{_libdir}/heartbeat/pymgmt.py
@@ -191,6 +190,7 @@
 %{_libdir}/libcib.so.*
 %{_libdir}/libclm.so.*
 %{_libdir}/libcrmcommon.so.*
+%{_libdir}/libtransitioner.so.*
 %{_libdir}/libhbclient.so.*
 %{_libdir}/liblrm.so.*
 %{_libdir}/libpengine.so.*
@@ -223,9 +223,13 @@
 %{_sbindir}/crm_attribute
 %{_sbindir}/crm_resource
 %{_sbindir}/crm_verify
+%{_sbindir}/attrd_updater
+%{_sbindir}/crm_failcount
+%{_sbindir}/crm_primitive.*
 %dir %attr (755, hacluster, haclient) %{_var}/run/heartbeat/ccm
 %dir %attr (755, hacluster, haclient) %{_var}/run/heartbeat/crm
 %dir %attr (755, hacluster, haclient) %{_var}/lib/heartbeat/crm
+%dir %attr (755, hacluster, haclient) %{_var}/lib/heartbeat/pengine
 %{_mandir}/man1/cl_status.1*
 %{_mandir}/man1/ha_logger.1*
 %{_mandir}/man1/hb_standby.1*
@@ -244,7 +248,7 @@
 %{_libdir}/libhbmgmtcommon.so.*
 %{_libdir}/libhbmgmttls.so.*
 %config(noreplace) %{_sysconfdir}/pam.d/hbmgmtd
-%{_datadir}/locale/zh_CN/LC_MESSAGES/haclient.zh_CN.mo
+%{_datadir}/locale/zh_CN/LC_MESSAGES/haclient.mo
 %endif
 
 %files -n ldirectord
@@ -276,6 +280,8 @@
 %doc doc/COPYING 
 %doc doc/README
 %defattr(-,root,root)
+/usr/include/pils
+%{_libdir}/libpils.*
 %{_libdir}/pils/
 
 %files devel
@@ -290,6 +296,49 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Apr 27 2006  Joost Soeterbroek <fedora at soeterbroek.com> - 2.0.5-1
+- upstream version 2.0.5
+- removed patch2 - ownership of /heartbeat/crm/cib.xml is no longer
+  set in cts/CM_LinuxHAv2.py.in
+  + Version 2.0.5 - significant bug fixes and a few feature deficits fixed
+  + various portability fixes
+  + enable GUI to run with pygtk 2.4
+  + significant GUI improvements and speedups
+  + numerous logging improvements (generally much quieter)
+  + speed up CIB processing by writing it to disk asynchronously
+  + add CIB on-disk checksums
+  + removed dependency on openssl
+  + added "failure stickiness" to the CIB/CRM
+  + Several fixes to the membership code
+  + We now log all output from resource agents
+  + fixed STONITHd memory leaks.
+  + Added an OCF RA for Xen guests
+  + Added email alerts to ldirectord
+  + Improvements to the haresources2cib upgrade tool
+  + Several fixes to cibadmin
+  + Fix some autoadd-related bugs
+  + Added Chinese support to the GUI
+  + Added a daemon to replace and generalize ipfail
+    + Limited testing only
+  + Significant improvements to CIM model, including modifying things
+  + Extensive Master/slave testing and fixes
+  + Use a digest of the parameters used in an action (smaller CIB)
+  + Improved detection of "old" events that should be ignored by the PE
+    (ensures resource monitoring is active when required)
+  + Better detection of required and/or optimal behaviour in mixed
+    (and formerly mixed) clusters
+  + LRM now supports multiple concurrent monitor operations
+  + Optional startup & runtime enforcement of DTD validation
+    (Invalid changes are rejected)
+  + cibadmin tool overhauled and verified to function correctly
+  + Some deprecated CIB features now unsupported
+    + Placing nvpair objects in crm_config (must now use
+      cluster_property_set)
+    + on_stopfail removed in favor of setting on_fail in the resource's
+      stop operation
+    + start_prereq removed in favor of setting prereq in the resource's
+      start operation 
+
 * Wed Mar 29 2006  Joost Soeterbroek <fedora at soeterbroek.com> - 2.0.4-2
 - Version 2.0.4
 

heartbeat-fedora-chkconfig.patch:

Index: heartbeat-fedora-chkconfig.patch
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/devel/heartbeat-fedora-chkconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- heartbeat-fedora-chkconfig.patch	29 Mar 2006 15:46:50 -0000	1.1
+++ heartbeat-fedora-chkconfig.patch	29 Apr 2006 15:42:44 -0000	1.2
@@ -1,6 +1,6 @@
-diff -Nur heartbeat-2.0.4.orig/heartbeat/init.d/heartbeat.in heartbeat-2.0.4/heartbeat/init.d/heartbeat.in
---- heartbeat-2.0.4.orig/heartbeat/init.d/heartbeat.in	2005-09-10 23:46:23.000000000 +0200
-+++ heartbeat-2.0.4/heartbeat/init.d/heartbeat.in	2006-03-27 19:55:19.000000000 +0200
+diff -Nur heartbeat-2.0.5.orig/heartbeat/init.d/heartbeat.in heartbeat-2.0.5/heartbeat/init.d/heartbeat.in
+--- heartbeat-2.0.5.orig/heartbeat/init.d/heartbeat.in	2006-04-14 21:25:33.000000000 +0200
++++ heartbeat-2.0.5/heartbeat/init.d/heartbeat.in	2006-04-27 20:32:29.000000000 +0200
 @@ -13,7 +13,7 @@
  #		We don't hate anyone, and like for everyone to use
  #		our software, no matter what OS or distribution you're using.
@@ -10,26 +10,7 @@
  # description: Startup script high-availability services.
  # processname: heartbeat
  # pidfile: @localstatedir@/run/heartbeat.pid
-@@ -51,18 +51,6 @@
- RUNDIR=@localstatedir@/run
- 
- if
--  [ -r /etc/SuSE-release ]
--then
--  # rc.status is new since SuSE 7.0
--  [ -r /etc/rc.status ] && . /etc/rc.status
--  [ -r /etc/rc.config ] && . /etc/rc.config
--
--  # Determine the base and follow a runlevel link name.
--  base=${0##*/}
--  link=${base#*[SK][0-9][0-9]}
--
--fi
--if
-   [ -z "$rc_done" ]
- then
-   rc_done="Done."
-@@ -391,12 +379,7 @@
+@@ -391,12 +391,7 @@
  	StartHA
  	RC=$?
  	Echo
@@ -43,7 +24,7 @@
  	RunStartStop post-start $RC
  	;;
  
-@@ -413,11 +396,7 @@
+@@ -413,11 +408,7 @@
  	StopHA
  	RC=$?
  	Echo
@@ -56,9 +37,9 @@
          RunStartStop post-stop $RC
  	StopLogd
  	;;
-diff -Nur heartbeat-2.0.4.orig/ldirectord/init.d/ldirectord heartbeat-2.0.4/ldirectord/init.d/ldirectord
---- heartbeat-2.0.4.orig/ldirectord/init.d/ldirectord	2005-10-17 14:49:21.000000000 +0200
-+++ heartbeat-2.0.4/ldirectord/init.d/ldirectord	2006-03-27 19:56:40.000000000 +0200
+diff -Nur heartbeat-2.0.5.orig/ldirectord/init.d/ldirectord heartbeat-2.0.5/ldirectord/init.d/ldirectord
+--- heartbeat-2.0.5.orig/ldirectord/init.d/ldirectord	2005-10-17 14:49:21.000000000 +0200
++++ heartbeat-2.0.5/ldirectord/init.d/ldirectord	2006-04-27 20:33:35.000000000 +0200
 @@ -2,7 +2,7 @@
  #
  # ldirectord  Linux Director Daemon

heartbeat-fedora-pam.patch:

Index: heartbeat-fedora-pam.patch
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/devel/heartbeat-fedora-pam.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- heartbeat-fedora-pam.patch	29 Mar 2006 15:46:50 -0000	1.1
+++ heartbeat-fedora-pam.patch	29 Apr 2006 15:42:44 -0000	1.2
@@ -1,6 +1,6 @@
-diff -Nur heartbeat-2.0.4.orig/mgmt/daemon/mgmtd.pam heartbeat-2.0.4/mgmt/daemon/mgmtd.pam
---- heartbeat-2.0.4.orig/mgmt/daemon/mgmtd.pam	2005-12-30 09:35:27.000000000 +0100
-+++ heartbeat-2.0.4/mgmt/daemon/mgmtd.pam	2006-03-27 19:59:12.000000000 +0200
+diff -Nur heartbeat-2.0.5.orig/mgmt/daemon/mgmtd.pam heartbeat-2.0.5/mgmt/daemon/mgmtd.pam
+--- heartbeat-2.0.5.orig/mgmt/daemon/mgmtd.pam	2005-12-30 09:35:27.000000000 +0100
++++ heartbeat-2.0.5/mgmt/daemon/mgmtd.pam	2006-04-27 20:36:29.000000000 +0200
 @@ -1,3 +1,8 @@
 -auth    required        pam_unix.so
 -account required        pam_unix.so



From fedora-extras-commits at redhat.com  Sat Apr 29 16:27:50 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 29 Apr 2006 09:27:50 -0700
Subject: rpms/kismet - New directory
Message-ID: <200604291627.k3TGRqll009987@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/kismet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9966/kismet

Log Message:
Directory /cvs/extras/rpms/kismet added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 29 16:27:51 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 29 Apr 2006 09:27:51 -0700
Subject: rpms/kismet/devel - New directory
Message-ID: <200604291627.k3TGRrB6009990@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/kismet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9966/kismet/devel

Log Message:
Directory /cvs/extras/rpms/kismet/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 29 16:28:14 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 29 Apr 2006 09:28:14 -0700
Subject: rpms/kismet Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604291628.k3TGSGL3010044@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/kismet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10011

Added Files:
	Makefile import.log 
Log Message:
Setup of module kismet


--- NEW FILE Makefile ---
# Top level Makefile for module kismet
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 29 16:28:15 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 29 Apr 2006 09:28:15 -0700
Subject: rpms/kismet/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604291628.k3TGSHmc010047@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/kismet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10011/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module kismet


--- 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 Apr 29 16:31:28 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 29 Apr 2006 09:31:28 -0700
Subject: rpms/kismet import.log,1.1,1.2
Message-ID: <200604291631.k3TGVUZR010189@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/kismet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10145

Modified Files:
	import.log 
Log Message:
auto-import kismet-0.0.2006.04.R1-2 on branch devel from kismet-0.0.2006.04.R1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/kismet/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Apr 2006 16:28:14 -0000	1.1
+++ import.log	29 Apr 2006 16:31:28 -0000	1.2
@@ -0,0 +1 @@
+kismet-0_0_2006_04_R1-2:HEAD:kismet-0.0.2006.04.R1-2.src.rpm:1146328275



From fedora-extras-commits at redhat.com  Sat Apr 29 16:31:29 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 29 Apr 2006 09:31:29 -0700
Subject: rpms/kismet/devel kismet-2005-08-R1-jobcontrol.patch, NONE,
	1.1 kismet-2006-04-R1-alias.patch, NONE,
	1.1 kismet-2006-04-R1-alias1.patch, NONE,
	1.1 kismet-2006-04-R1-noret.patch, NONE,
	1.1 kismet-2006-04-R1-packed.patch, NONE,
	1.1 kismet-2006-04-R1-ssize.patch, NONE,
	1.1 kismet-2006-04-R1-strop.patch, NONE,
	1.1 kismet-2006-04-R1-uninit.patch, NONE,
	1.1 kismet-2006-04-R1.tar.gz.asc, NONE, 1.1 kismet.spec, NONE,
	1.1 sysconfig.kismet, NONE, 1.1 tmpwatch.kismet, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604291631.k3TGVV6E010210@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/kismet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10145/devel

Modified Files:
	.cvsignore sources 
Added Files:
	kismet-2005-08-R1-jobcontrol.patch 
	kismet-2006-04-R1-alias.patch kismet-2006-04-R1-alias1.patch 
	kismet-2006-04-R1-noret.patch kismet-2006-04-R1-packed.patch 
	kismet-2006-04-R1-ssize.patch kismet-2006-04-R1-strop.patch 
	kismet-2006-04-R1-uninit.patch kismet-2006-04-R1.tar.gz.asc 
	kismet.spec sysconfig.kismet tmpwatch.kismet 
Log Message:
auto-import kismet-0.0.2006.04.R1-2 on branch devel from kismet-0.0.2006.04.R1-2.src.rpm

kismet-2005-08-R1-jobcontrol.patch:

--- NEW FILE kismet-2005-08-R1-jobcontrol.patch ---
2006-03-18  Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>

	- scripts/kismet.in: disable jobcontrol which simply does
	  not work: when starting the server with 'kismet_server
	  ... &', write operations will result into a SIGTTOU
	  causing malfunctions. So, it is better not to use job
	  control which seems to be required for specifying the
	  last job only. A plain 'wait' will suffice there.

--- kismet-2005-08-R1/scripts/kismet.in.jobcontrol	2005-08-16 03:22:38.000000000 +0200
+++ kismet-2005-08-R1/scripts/kismet.in	2006-03-18 11:52:24.000000000 +0100
@@ -7,8 +7,6 @@
 
 GREP_OPTIONS=""
 
-set -m
-
 gui=`grep -e "^gui=" ${ETC}/kismet_ui.conf | cut -d= -f2 | tr -d " \t"`
 piddir=`grep -e "^piddir=" ${ETC}/kismet.conf | cut -d= -f2 | tr -d " \t"`
 
@@ -74,7 +72,7 @@
 if test "$?" != "5"; then
 	echo "Killing server..."
 	kill $servpid
-	wait %-
+	wait
 fi
 
 echo "Kismet exited."

kismet-2006-04-R1-alias.patch:

--- NEW FILE kismet-2006-04-R1-alias.patch ---
2006-04-22  Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>

	* expat.cc, tcpclient.cc, gpsmap.cc, packetracker.cc:

	  avoid constructs like

	  | sscanf(..., "%u", (int *)&some_var);

	  where 'some_var' is not an 'int'. Depending on the platform,
	  this might caused unwanted effects (e.g. assigning a 64-bit
	  'int' to a 32-bit 'enum'; writing to unaligned addresses
	  causing kernel traps)

	  Some time-handling related hunks should be reworked before
	  2038 ;)


--- kismet-2006-04-R1/expat.cc.alias	2005-03-23 17:36:56.000000000 +0100
+++ kismet-2006-04-R1/expat.cc	2006-04-22 18:22:02.000000000 +0200
@@ -192,12 +192,14 @@ int NetXmlStr2Struct(wireless_network *i
         return -1;
     }
 
-    if (sscanf(xmlstrnodes[net_node_wn_maxrate].c_str(), "%f", (float *) &in_net->maxrate) < 1) {
+    float	tmpmaxrate;
+    if (sscanf(xmlstrnodes[net_node_wn_maxrate].c_str(), "%f", &tmpmaxrate) < 1) {
         if (verbose)
             fprintf(stderr, "WARNING:  Illegal maxrate '%s', skipping rest of network.\n",
                     xmlstrnodes[net_node_wn_maxrate].c_str());
         return -1;
     }
+    in_net->maxrate = tmpmaxrate;
 
     if (sscanf(xmlstrnodes[net_node_pk_LLC].c_str(), "%d", &in_net->llc_packets) < 1) {
         if (verbose)
--- kismet-2006-04-R1/tcpclient.cc.alias	2005-10-17 15:52:47.000000000 +0200
+++ kismet-2006-04-R1/tcpclient.cc	2006-04-22 18:22:02.000000000 +0200
@@ -277,6 +277,8 @@ int TcpClient::ParseData(char *in_data) 
     char bssid_str[18];
     mac_addr bssid;
     int junkmajor, junkminor, junktiny;
+#warning FIXME: implement reading of time_t types 
+    int		tmptime;	// HACK: should be some 64-bit type
 
     if (sscanf(in_data, "%64[^:]", header) < 1) {
         return 0;
@@ -294,14 +295,15 @@ int TcpClient::ParseData(char *in_data) 
         if (sscanf(in_data+hdrlen, "%d.%d.%d %d \001%32[^\001]\001 %24s %d "
                    "%24[^.].%24[^.].%24s",
                    &junkmajor, &junkminor, &junktiny, 
-                   (int *) &start_time, servername, 
+                   &tmptime, servername, 
                    build, &channel_hop,
                    major, minor, tiny) < 7)
             return 0;
+	start_time = tmptime;
     } else if (!strncmp(header, "*TIME", 64)) {
-        if (sscanf(in_data+hdrlen, "%d", (int *) &serv_time) < 1)
+        if (sscanf(in_data+hdrlen, "%d", &tmptime) < 1)
             return 0;
-
+	serv_time = tmptime;
     } else if (!strncmp(header, "*NETWORK", 64)) {
         wireless_network *net;
 
@@ -393,17 +395,23 @@ int TcpClient::ParseData(char *in_data) 
             newnet = 1;
         }
 
+	{
+	int		tmptype, tmpatype;
+	int		tmpturbocell_mode;
+#warning FIXME: implement reading of time_t types 
+	int		tmpfirst_time;	// HACK: should be some 64-bit type
+	int		tmplast_time;	// HACK: should be some 64-bit type
         scanned = sscanf(in_data+hdrlen+18, "%d \001%255[^\001]\001 "
 						 "\001%255[^\001]\001 "
                          "%d %d %d %d %d %d %d %d %d %hd.%hd.%hd.%hd "
                          "%d %f %f %f %f %f %f %f %f %d %d %d %f %d %d %d %d %d %d "
 						 "%f %f %f %lf %lf %lf %ld %ld"
                          "%d %d %d %d %d %d %d %d %lld",
-                         (int *) &type, ssid, beaconstr,
+                         &tmptype, ssid, beaconstr,
                          &llc_packets, &data_packets, &crypt_packets, 
                          &interesting_packets, &channel, &crypt_set, 
-                         (int *) &first_time, (int *) &last_time,
-                         (int *) &atype, &range[0], &range[1], &range[2], 
+                         &tmpfirst_time, &tmplast_time,
+                         &tmpatype, &range[0], &range[1], &range[2], 
                          &range[3], &gps_fixed, &min_lat, &min_lon, 
                          &min_alt, &min_spd, &max_lat, &max_lon, 
                          &max_alt, &max_spd, &octets, 
@@ -413,10 +420,16 @@ int TcpClient::ParseData(char *in_data) 
                          &best_lat, &best_lon, &best_alt,
                          &aggregate_lat, &aggregate_lon, &aggregate_alt,
                          &aggregate_points, &datasize,
-                         &turbocell_nid, (int *) &turbocell_mode, 
+                         &turbocell_nid, &tmpturbocell_mode, 
                          &turbocell_sat, &carrier_set, &maxseenrate, 
                          &encoding_set, &decrypted, &dupeiv_packets, &bss_timestamp);
-
+	type           = static_cast<wireless_network_type>(tmptype);
+	first_time     = tmpfirst_time;
+	last_time      = tmplast_time;
+	atype          = static_cast<address_type>(tmpatype);
+	turbocell_mode = static_cast<turbocell_type>(tmpturbocell_mode);
+	}
+	
         if (scanned < 51) {
             // fprintf(stderr, "Flubbed network, discarding... %s  '%s'\n", bssid_str, in_data);
 			// Can't delete us out of the tracker offhand if we're not a new network,
@@ -562,12 +575,17 @@ int TcpClient::ParseData(char *in_data) 
             return 0;
         }
 
+	{
+	int		tmptype, tmpatype;
+#warning FIXME: implement reading of time_t types 
+	int		tmpfirst_time;	// HACK: should be some 64-bit type
+	int		tmplast_time;	// HACK: should be some 64-bit type
         scanned = sscanf(in_data+hdrlen+36, "%d %d %d %d %d %d %d "
                          "%f %f %f %f %f %f %f %f %lf %lf "
                          "%lf %ld %f %d %d %d %d %d %d "
                          "%f %f %f %d %hd.%hd.%hd.%hd %ld %d %d %d %d",
-                         (int *) &type,
-                         (int *) &first_time, (int *) &last_time,
+                         &tmptype,
+                         &tmpfirst_time, &tmplast_time,
                          &data_packets, &crypt_packets,
                          &interesting_packets,
                          &gps_fixed, &min_lat, &min_lon,
@@ -580,9 +597,14 @@ int TcpClient::ParseData(char *in_data) 
                          &best_quality, &best_signal, 
 						 &best_noise,
                          &best_lat, &best_lon, &best_alt,
-                         (int *) &atype, &ip[0], &ip[1], &ip[2], &ip[3],
+                         &tmpatype, &ip[0], &ip[1], &ip[2], &ip[3],
                          &datasize, &maxseenrate, &encoding_set,
                          &decrypted, &crypt_set);
+	type       = static_cast<client_type>(tmptype);
+	first_time = tmpfirst_time;
+	last_time  = tmplast_time;
+	atype      = static_cast<address_type>(tmpatype);
+	}
 
         if (scanned < 39) {
             if (nclient)
@@ -767,20 +789,31 @@ int TcpClient::ParseData(char *in_data) 
         short int sip[4], dip[4];
         int sport, dport;
 
+	{
+	int	tmptype, tmpsubtype, tmptvsec;
+	int	tmpproto_type, tmpsport, tmpdport, tmpproto_nbtype;  
         if (sscanf(in_data+hdrlen, "%d %d %d %d %d %d %17s %17s %17s "
                    "\001%32[^\001]\001 %d %hd.%hd.%hd.%hd %hd.%hd.%hd.%hd %d %d %d "
                    "\001%16[^\001]\001\n",
-                   (int *) &packinfo.type,
-                   (int *) &packinfo.subtype,
-                   (int *) &packinfo.ts.tv_sec,
+                   &tmptype,
+                   &tmpsubtype,
+                   &tmptvsec,
                    &packinfo.encrypted, &packinfo.interesting, &packinfo.beacon,
                    smac, dmac, bmac,
                    packinfo.ssid,
-                   (int *) &packinfo.proto.type,
+		   &tmpproto_type,
                    &sip[0], &sip[1], &sip[2], &sip[3], &dip[0], &dip[1], &dip[2], &dip[3],
-                   (int *) &sport, (int *) &dport,
-                   (int *) &packinfo.proto.nbtype, packinfo.proto.netbios_source) < 22)
+                   &tmpsport, &tmpdport,
+                   &tmpproto_nbtype, packinfo.proto.netbios_source) < 22)
             return 0;
+	packinfo.type       = static_cast<packet_type>(tmptype);
+	packinfo.subtype    = static_cast<packet_sub_type>(tmpsubtype);
+	packinfo.ts.tv_sec  = tmptvsec;
+	packinfo.proto.type = static_cast<protocol_info_type>(tmpproto_type);
+	sport               = tmpsport;
+	dport               = tmpdport;
+	packinfo.proto.nbtype = static_cast<protocol_netbios_type>(tmpproto_nbtype);
+	}
 
         packinfo.source_mac = smac;
         packinfo.dest_mac = dmac;
--- kismet-2006-04-R1/gpsmap.cc.alias	2006-04-22 18:22:02.000000000 +0200
+++ kismet-2006-04-R1/gpsmap.cc	2006-04-22 18:22:03.000000000 +0200
@@ -2212,7 +2212,9 @@ void DrawNetPower(vector<gps_network *> 
     // Now wait for the threads to complete and come back
     int thread_status;
     for (int t = 0; t < numthreads; t++) {
-        pthread_join(mapthread[t], (void **) &thread_status);
+        void *tmp;
+        pthread_join(mapthread[t], &tmp);
+	thread_status = reinterpret_cast<int>(tmp);
     }
 #else
     // Run one instance of our "thread".  thread number 0, it should just crunch it all
--- kismet-2006-04-R1/packetracker.cc.alias	2006-04-22 18:22:02.000000000 +0200
+++ kismet-2006-04-R1/packetracker.cc	2006-04-22 18:22:03.000000000 +0200
@@ -2350,6 +2350,7 @@ void Packetracker::ReadIPMap(FILE *in_fi
         memset(&dat, 0, sizeof(net_ip_data));
 
         short int range[4];
+	int		tmpatype;
         /*
          , mask[4], gate[4];
          */
@@ -2357,10 +2358,11 @@ void Packetracker::ReadIPMap(FILE *in_fi
         // Fetch the line and continue if we're invalid...
         if (sscanf(dline, "%17s %d %d %hd %hd %hd %hd",
                    bssid_str,
-                   (int *) &dat.atype, &dat.octets,
+                   &tmpatype, &dat.octets,
                    &range[0], &range[1], &range[2], &range[3]
                   ) < 7)
             continue;
+	dat.atype = static_cast<address_type>(tmpatype);
 
         for (int x = 0; x < 4; x++) {
             dat.range_ip[x] = (uint8_t) range[x];

kismet-2006-04-R1-alias1.patch:

--- NEW FILE kismet-2006-04-R1-alias1.patch ---
2006-04-29  Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>

	* gpsmap.cc: fixed compilation errors on 64-bit platforms
	  which were created by my previous -alias patch. This patch
	  and the problems were reported by Hans de Goede at

	  https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=165314#c24

	  The value_ptr argument was ommited completely in the
	  pthread_join() call because the result will not be used
	  at all.

	  Alternatively,

	  | thread_status = reinterpret_cast<long>(tmp);

	  instead of

	  | thread_status = reinterpret_cast<int>(tmp);

	  should be possible.


diff --git a/gpsmap.cc b/gpsmap.cc
index 1ce771b..915a482 100644
--- a/gpsmap.cc
+++ b/gpsmap.cc
@@ -2210,11 +2210,8 @@ #ifdef HAVE_PTHREAD
     pthread_attr_destroy(&attr);
 
     // Now wait for the threads to complete and come back
-    int thread_status;
     for (int t = 0; t < numthreads; t++) {
-        void *tmp;
-        pthread_join(mapthread[t], &tmp);
-	thread_status = reinterpret_cast<int>(tmp);
+        pthread_join(mapthread[t], NULL);
     }
 #else
     // Run one instance of our "thread".  thread number 0, it should just crunch it all

kismet-2006-04-R1-noret.patch:

--- NEW FILE kismet-2006-04-R1-noret.patch ---
2006-04-22  Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>

	* prism2source.cc, util.cc, configfile.cc, pcapsource.cc,
	  manuf.cc, packetracker.cc, frontend.cc, panelfront.cc,
	  gpsmap.cc:

	  honor the return value of a lot of syscall/libc functions
	  marked with __attribute__((__warn_result__)).

	  Some/all of the 'fgets(...)==NULL || feof(...)' constructs
	  abort correctly on error but do not report the error.


--- kismet-2006-04-R1/prism2source.cc.noret	2004-08-12 03:59:50.000000000 +0200
+++ kismet-2006-04-R1/prism2source.cc	2006-04-22 18:22:02.000000000 +0200
@@ -107,7 +107,8 @@ int Prism2Source::FetchPacket(kis_packet
 
     if (FD_ISSET(read_sock, &rs)) {
         char a;
-        read(read_sock, &a, 1);
+        if (read(read_sock, &a, 1)!=1)
+	  return -1;
     }
 
 //    u_char buf[MAX_PACKET_LEN];
--- kismet-2006-04-R1/util.cc.noret	2005-06-15 23:54:08.000000000 +0200
+++ kismet-2006-04-R1/util.cc	2006-04-22 18:22:02.000000000 +0200
@@ -248,9 +248,7 @@ vector<int> Str2IntVec(string in_text) {
 }
 
 int RunSysCmd(char *in_cmd) {
-    system(in_cmd);
-    
-    return 0;
+    return system(in_cmd);
 }
 
 pid_t ExecSysCmd(char *in_cmd) {
--- kismet-2006-04-R1/configfile.cc.noret	2006-01-04 16:32:46.000000000 +0100
+++ kismet-2006-04-R1/configfile.cc	2006-04-22 18:22:02.000000000 +0200
@@ -38,9 +38,8 @@ int ConfigFile::ParseConfig(const char *
     }
 
     while (!feof(configf)) {
-        fgets(confline, 8192, configf);
-
-        if (feof(configf)) break;
+        if (fgets(confline, 8192, configf) == NULL ||
+	    feof(configf)) break;
 
         // It's easier to parse this using C++ functions
         string parsestr = StrStrip(confline);
--- kismet-2006-04-R1/pcapsource.cc.noret	2006-04-02 17:13:00.000000000 +0200
+++ kismet-2006-04-R1/pcapsource.cc	2006-04-22 18:22:02.000000000 +0200
@@ -2054,7 +2054,10 @@ int monitor_ipwlivetap(const char *in_de
 		return -1;
 	}
 
-	fgets(dynif, 32, sysf);
+	if (fgets(dynif, 32, sysf) == NULL) {
+	        fclose(sysf);
+	        return -1;
+	}
 
 	// We're done with the RO 
 	fclose(sysf);
@@ -2084,7 +2087,10 @@ int monitor_ipwlivetap(const char *in_de
 			return -1;
 		}
 
-		fgets(dynif, 32, sysf);
+		if (fgets(dynif, 32, sysf) == NULL) {
+		        fclose(sysf);
+			return -1;
+		}
 
 		fclose(sysf);
 
--- kismet-2006-04-R1/manuf.cc.noret	2004-01-14 03:18:32.000000000 +0100
+++ kismet-2006-04-R1/manuf.cc	2006-04-22 18:22:02.000000000 +0200
@@ -48,8 +48,8 @@ macmap<vector<manuf *> > ReadManufMap(FI
     // Read from the file
     char dline[8192];
     while (!feof(in_file)) {
-        fgets(dline, 8192, in_file);
-        if (feof(in_file)) break;
+        if (fgets(dline, 8192, in_file) == NULL ||
+	    feof(in_file)) break;
 
         linenum++;
 
--- kismet-2006-04-R1/packetracker.cc.noret	2006-04-01 18:37:07.000000000 +0200
+++ kismet-2006-04-R1/packetracker.cc	2006-04-22 18:22:03.000000000 +0200
@@ -2295,9 +2295,8 @@ void Packetracker::ReadSSIDMap(FILE *in_
     char bssid_str[18];
 
     while (!feof(in_file)) {
-        fgets(dline, 8192, in_file);
-
-        if (feof(in_file)) break;
+        if (fgets(dline, 8192, in_file) == NULL ||
+	    feof(in_file)) break;
 
         if (sscanf(dline, "%17s %1023[^\n]\n",
                    bssid_str, name) < 2)
@@ -2313,8 +2312,10 @@ void Packetracker::ReadSSIDMap(FILE *in_
 }
 
 void Packetracker::WriteSSIDMap(FILE *in_file) {
-    fseek(in_file, 0L, SEEK_SET);
-    ftruncate(fileno(in_file), 0);
+    if (fseek(in_file, 0L, SEEK_SET) == -1 ||
+	ftruncate(fileno(in_file), 0) == -1)
+      abort();		// HACK: implement better error-handling
+#warning FIXME: implement better error-handling
 
     char format[64];
     snprintf(format, 64, "%%.%ds %%.%ds\n", MAC_STR_LEN, SSID_SIZE);
@@ -2344,9 +2344,8 @@ void Packetracker::ReadIPMap(FILE *in_fi
     net_ip_data dat;
 
     while (!feof(in_file)) {
-        fgets(dline, 8192, in_file);
-
-        if (feof(in_file)) break;
+        if (fgets(dline, 8192, in_file) == NULL ||
+	    feof(in_file)) break;
 
         memset(&dat, 0, sizeof(net_ip_data));
 
@@ -2382,8 +2383,10 @@ void Packetracker::ReadIPMap(FILE *in_fi
 }
 
 void Packetracker::WriteIPMap(FILE *in_file) {
-    fseek(in_file, 0L, SEEK_SET);
-    ftruncate(fileno(in_file), 0);
+    if (fseek(in_file, 0L, SEEK_SET) == -1 ||
+        ftruncate(fileno(in_file), 0) == -1)
+        abort();		// HACK: better error-handling
+#warning FIXME: implement better error-handling
 
     for (map<mac_addr, net_ip_data>::iterator x = bssid_ip_map.begin();
          x != bssid_ip_map.end(); ++x) {
@@ -2445,8 +2447,10 @@ void Packetracker::RemoveNetwork(mac_add
 
 // Write a gpsdrive compatable waypoint file
 int Packetracker::WriteGpsdriveWaypt(FILE *in_file) {
-    fseek(in_file, 0L, SEEK_SET);
-    ftruncate(fileno(in_file), 0);
+    if (fseek(in_file, 0L, SEEK_SET) == -1 ||
+	ftruncate(fileno(in_file), 0) == -1)
+      abort();		// HACK: better error-handling
+#warning FIXME: implement better error-handling
 
     // Convert the map to a vector and sort it
     for (map<mac_addr, wireless_network *>::const_iterator i = bssid_map.begin();
--- kismet-2006-04-R1/frontend.cc.noret	2005-06-29 20:04:43.000000000 +0200
+++ kismet-2006-04-R1/frontend.cc	2006-04-22 18:22:02.000000000 +0200
@@ -722,9 +722,8 @@ void Frontend::ReadGroupMap(FILE *in_fil
     snprintf(format, 64, "%%6[^:]: %%%d[^ ] %%1024[^\n]\n", MAC_STR_LEN);
 
     while (!feof(in_file)) {
-        fgets(dline, 8192, in_file);
-
-        if (feof(in_file)) break;
+        if (fgets(dline, 8192, in_file) == NULL ||
+	    feof(in_file)) break;
 
         // Fetch the line and continue if we're invalid...
         if (sscanf(dline, format, type, parm1, parm2) < 3)
--- kismet-2006-04-R1/panelfront.cc.noret	2005-06-29 20:04:43.000000000 +0200
+++ kismet-2006-04-R1/panelfront.cc	2006-04-22 18:22:02.000000000 +0200
@@ -1398,16 +1398,14 @@ int PanelFront::Tick() {
             int ac_line_status, battery_status, flag, percentage, apm_time;
             char units[32];
 
-            if ((apm = fopen("/proc/apm", "r")) == NULL) {
+            if ((apm = fopen("/proc/apm", "r")) == NULL ||
+		fgets(buf, 128, apm) == NULL) {
                 bat_available = 0;
                 bat_ac = 0;
                 bat_percentage = 0;
                 bat_time = 0;
                 bat_charging = 0;
             } else {
-                fgets(buf, 128, apm);
-                fclose(apm);
-
                 sscanf(buf, "%*s %*d.%*d %*x %x %x %x %d%% %d %s\n", &ac_line_status,
                        &battery_status, &flag, &percentage, &apm_time, units);
 
@@ -1436,6 +1434,8 @@ int PanelFront::Tick() {
                 if (!strncmp(units, "min", 32))
                     bat_time *= 60;
             }
+	    if (apm!=NULL)
+	      fclose(apm);
         } else {
             DIR *batteries, *ac_adapters;
             struct dirent *this_battery, *this_adapter;
--- kismet-2006-04-R1/gpsmap.cc.noret	2005-11-02 22:16:07.000000000 +0100
+++ kismet-2006-04-R1/gpsmap.cc	2006-04-22 18:22:03.000000000 +0200
@@ -4178,7 +4180,10 @@ int main(int argc, char *argv[]) {
         } else {
             char geturl[1024];
             snprintf(geturl, 1024, download_template, url, mapname);
-            system(geturl);
+            if (system(geturl)!=0) {
+	      fprintf(stderr, "WARNING: failed to execute '%s'\n", geturl);
+	      exit(1);
+	    }
         }
 
         printf("Loading map into Imagemagick structures.\n");

kismet-2006-04-R1-packed.patch:

--- NEW FILE kismet-2006-04-R1-packed.patch ---
2006-04-22  Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>

	* packetstream.h, pcapsource.h, prism2source.h: placed compiler
	  attributes at the right place:

	  | struct foo {
	  |	  char  a __attribute__((packed));
	  |       int	b __attribute__((packed));
	  | };

          is wrong, while

	  | struct bar {
	  |       char	a;
	  |	  int	b;
	  | }  __attribute__((packed));

	  is right. This patch replaces 'packed' with '__packed__' too.


--- kismet-2006-04-R1/packetstream.h.packed	2005-05-26 16:51:45.000000000 +0200
+++ kismet-2006-04-R1/packetstream.h	2006-04-22 18:22:02.000000000 +0200
@@ -38,10 +38,10 @@
 #define STREAM_COMMAND_FLUSH -1
 
 typedef struct stream_frame_header {
-    uint32_t frame_sentinel __attribute__ ((packed));
-    uint8_t frame_type __attribute__ ((packed));
-    uint32_t frame_len __attribute__ ((packed));
-};
+    uint32_t frame_sentinel;
+    uint8_t frame_type;
+    uint32_t frame_len;
+} __attribute__((__packed__));
 
 typedef struct stream_version_packet {
     uint16_t drone_version;
@@ -49,34 +49,34 @@ typedef struct stream_version_packet {
 };
 
 typedef struct stream_packet_header {
-    uint32_t header_len __attribute__ ((packed));
-    uint16_t drone_version __attribute__ ((packed));
-    uint32_t len __attribute__ ((packed));
-    uint32_t caplen __attribute__ ((packed));
-    uint64_t tv_sec __attribute__ ((packed));
-    uint64_t tv_usec __attribute__ ((packed));
-    uint16_t quality __attribute__ ((packed));
-    uint16_t signal __attribute__ ((packed));
-    uint16_t noise __attribute__ ((packed));
-    uint8_t error __attribute__ ((packed));
-    uint8_t channel __attribute__ ((packed));
-    uint8_t carrier __attribute__ ((packed));
-    uint8_t encoding __attribute__ ((packed));
-    uint32_t datarate __attribute__ ((packed));
-
-    int16_t gps_lat __attribute__ ((packed));
-    int64_t gps_lat_mant __attribute__ ((packed));
-    int16_t gps_lon __attribute__ ((packed));
-    int64_t gps_lon_mant __attribute__ ((packed));
-    int16_t gps_alt __attribute__ ((packed));
-    int64_t gps_alt_mant __attribute__ ((packed));
-    int16_t gps_spd __attribute__ ((packed));
-    int64_t gps_spd_mant __attribute__ ((packed));
-    int16_t gps_heading __attribute__ ((packed));
-    int64_t gps_heading_mant __attribute__ ((packed));
-    int8_t gps_fix __attribute__ ((packed));
+    uint32_t header_len;
+    uint16_t drone_version;
+    uint32_t len;
+    uint32_t caplen;
+    uint64_t tv_sec;
+    uint64_t tv_usec;
+    uint16_t quality;
+    uint16_t signal;
+    uint16_t noise;
+    uint8_t error;
+    uint8_t channel;
+    uint8_t carrier;
+    uint8_t encoding;
+    uint32_t datarate;
+
+    int16_t gps_lat;
+    int64_t gps_lat_mant;
+    int16_t gps_lon;
+    int64_t gps_lon_mant;
+    int16_t gps_alt;
+    int64_t gps_alt_mant;
+    int16_t gps_spd;
+    int64_t gps_spd_mant;
+    int16_t gps_heading;
+    int64_t gps_heading_mant;
+    int8_t gps_fix;
 
-    uint8_t sourcename[32] __attribute__ ((packed));
-};
+    uint8_t sourcename[32];
+} __attribute__((__packed__));
 
 #endif
--- kismet-2006-04-R1/pcapsource.h.packed	2006-03-29 05:08:05.000000000 +0200
+++ kismet-2006-04-R1/pcapsource.h	2006-04-22 18:22:02.000000000 +0200
@@ -91,27 +91,27 @@ protected:
     // Prism 802.11 headers from wlan-ng tacked on to the beginning of a
     // pcap packet... Snagged from the wlan-ng source
     typedef struct {
-        uint32_t did __attribute__ ((packed));
-        uint16_t status __attribute__ ((packed));
-        uint16_t len __attribute__ ((packed));
-        uint32_t data __attribute__ ((packed));
-    } p80211item_uint32_t;
+        uint32_t did;
+        uint16_t status;
+        uint16_t len;
+        uint32_t data;
+    } __attribute__((__packed__)) p80211item_uint32_t;
 
     typedef struct {
-        uint32_t msgcode __attribute__ ((packed));
-        uint32_t msglen __attribute__ ((packed));
-        uint8_t devname[WLAN_DEVNAMELEN_MAX] __attribute__ ((packed));
-        p80211item_uint32_t hosttime __attribute__ ((packed));
-        p80211item_uint32_t mactime __attribute__ ((packed));
-        p80211item_uint32_t channel __attribute__ ((packed));
-        p80211item_uint32_t rssi __attribute__ ((packed));
-        p80211item_uint32_t sq __attribute__ ((packed));
-        p80211item_uint32_t signal __attribute__ ((packed));
-        p80211item_uint32_t noise __attribute__ ((packed));
-        p80211item_uint32_t rate __attribute__ ((packed));
-        p80211item_uint32_t istx __attribute__ ((packed));
-        p80211item_uint32_t frmlen __attribute__ ((packed));
-    } wlan_ng_prism2_header;
+        uint32_t msgcode;
+        uint32_t msglen;
+        uint8_t devname[WLAN_DEVNAMELEN_MAX];
+        p80211item_uint32_t hosttime;
+        p80211item_uint32_t mactime;
+        p80211item_uint32_t channel;
+        p80211item_uint32_t rssi;
+        p80211item_uint32_t sq;
+        p80211item_uint32_t signal;
+        p80211item_uint32_t noise;
+        p80211item_uint32_t rate;
+        p80211item_uint32_t istx;
+        p80211item_uint32_t frmlen;
+    }  __attribute__((__packed__)) wlan_ng_prism2_header;
 
     // Prism 802.11 headers from the openbsd Hermes drivers, even though they don't return
     // a valid linktype yet.  Structure lifted from bsd_airtools by dachb0den labs.
--- kismet-2006-04-R1/prism2source.h.packed	2004-08-09 06:36:01.000000000 +0200
+++ kismet-2006-04-R1/prism2source.h	2006-04-22 18:22:02.000000000 +0200
@@ -66,27 +66,27 @@ public:
 
 protected:
     typedef struct {
-        uint32_t did __attribute__ ((packed));
-        uint16_t status __attribute__ ((packed));
-        uint16_t len __attribute__ ((packed));
-        uint32_t data __attribute__ ((packed));
-    } p80211item_t;
+        uint32_t did;
+        uint16_t status;
+        uint16_t len;
+        uint32_t data;
+    } __attribute__((__packed__)) p80211item_t;
 
     typedef struct {
-        uint32_t msgcode __attribute__ ((packed));
-        uint32_t msglen __attribute__ ((packed));
-        uint8_t devname[DEVNAME_LEN] __attribute__ ((packed));
-        p80211item_t hosttime __attribute__ ((packed));
-        p80211item_t mactime __attribute__ ((packed));
-        p80211item_t channel __attribute__ ((packed));
-        p80211item_t rssi __attribute__ ((packed));
-        p80211item_t sq __attribute__ ((packed));
-        p80211item_t signal __attribute__ ((packed));
-        p80211item_t noise __attribute__ ((packed));
-        p80211item_t rate __attribute__ ((packed));
-        p80211item_t istx __attribute__ ((packed));
-        p80211item_t frmlen __attribute__ ((packed));
-    } sniff_packet_t;
+        uint32_t msgcode;
+        uint32_t msglen;
+        uint8_t devname[DEVNAME_LEN];
+        p80211item_t hosttime;
+        p80211item_t mactime;
+        p80211item_t channel;
+        p80211item_t rssi;
+        p80211item_t sq;
+        p80211item_t signal;
+        p80211item_t noise;
+        p80211item_t rate;
+        p80211item_t istx;
+        p80211item_t frmlen;
+    } __attribute__ ((__packed__)) sniff_packet_t;
 
     int Prism2Common(kis_packet *packet, uint8_t *data, uint8_t *moddata);
 

kismet-2006-04-R1-ssize.patch:

--- NEW FILE kismet-2006-04-R1-ssize.patch ---
2006-04-29  Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>

	* gpsmap.cc: this patch is originated by Hans de Goede posted at

	  https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=165314#c25


--- kismet-2006-04-R1/gpsmap.cc.64bit	2006-04-26 06:56:39.000000000 +0200
+++ kismet-2006-04-R1/gpsmap.cc	2006-04-26 06:57:03.000000000 +0200
@@ -864,8 +864,8 @@
                     orignetfile = "./" + orignetfile;
 
                 // Break up the path to the gpsxml file and form a path based on that
-                unsigned int lastslash = 0;
-                for (unsigned int x = origxmlfile.find('/'); x != string::npos;
+                string::size_type lastslash = 0;
+                for (string::size_type x = origxmlfile.find('/'); x != string::npos;
                      lastslash = x, x = origxmlfile.find('/', lastslash+1)) {
                     // We don't actually need to do anything...
                 }
@@ -873,7 +873,7 @@
                 comp = origxmlfile.substr(0, lastslash);
 
                 lastslash = 0;
-                for (unsigned int x = orignetfile.find('/'); x != string::npos;
+                for (string::size_type x = orignetfile.find('/'); x != string::npos;
                      lastslash = x, x = orignetfile.find('/', lastslash+1)) {
                     // We don't actually need to do anything...
                 }

kismet-2006-04-R1-strop.patch:

--- NEW FILE kismet-2006-04-R1-strop.patch ---
2006-04-22  Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>

	* extra/buzzme/buzzme.c, libpcap-0.9.1-kis/fad-glifc.c,
	  libpcap-0.9.1-kis/pcap-nit.c,
	  libpcap-0.9.1-kis/pcap-snoop.c,
	  libpcap-0.9.1-kis/fad-gifc.c,
	  libpcap-0.9.1-kis/pcap-linux.c,
	  pcapsource.cc, tcpclient.cc, gpsmap_cache.cc, ifcontrol.cc:

 	  ensure, that strings copied by 'strncpy()' will be terminated
 	  by '\0'. The following replacements are used for

	  | strncpy(buf, 0, buf_len);

	  a) when 'buf[buf_len-1] == '\0' can be guaranteed (e.g. by a
	     previous memset()):
             | strncpy(buf, 0, buf_len - 1);

	  b) when 'buf[buf_len-1] == '\0' can not be guaranteed:

	     | strncpy(buf, 0, buf_len);
             | buf[buf_len-1] = '\0';

	     on first glance it seems to be more efficient to use

	     | strncpy(buf, 0, buf_len-1);

	     But most 'buf_len' are multiples of 2 or 4 allowing the
	     compiler to generate more efficient code.

	  At same places,

          | strncpy(buf, 0, sizeof buf);

	  will be used where applicable.


	  Perhaps, it would be a good idea to use BSD's strlcpy()
	  there?

	* panelfront_display.cc

	  most hunks fixes some oddnesses in the assignment/range-check
	  for 'print_width'.

          A range-check was added in PanelFront::StatsPrinter() which
          was missing before.


--- kismet-2006-04-R1/extra/buzzme/buzzme.c.strop	2002-07-22 17:01:26.000000000 +0200
+++ kismet-2006-04-R1/extra/buzzme/buzzme.c	2006-04-22 21:08:37.000000000 +0200
@@ -94,6 +94,7 @@ main(int argc, char **argv)
 
   // Figure out program name. Remove path if needed.
   strncpy(pname,argv[0],sizeof(pname));
+  pname[sizeof(pname)-1] = '\0';
   if ((progname = rindex(pname,'/')) != NULL) {
      progname++; // skip slash.
   }
--- kismet-2006-04-R1/libpcap-0.9.1-kis/fad-glifc.c.strop	2005-06-21 02:58:08.000000000 +0200
+++ kismet-2006-04-R1/libpcap-0.9.1-kis/fad-glifc.c	2006-04-22 21:08:37.000000000 +0200
@@ -213,6 +213,7 @@ pcap_findalldevs(pcap_if_t **alldevsp, c
 		 */
 		strncpy(ifrflags.lifr_name, ifrp->lifr_name,
 		    sizeof(ifrflags.lifr_name));
+		ifrflags.lifr_name[sizeof(ifrflags.lifr_name)-1] = '\0';
 		if (ioctl(fd, SIOCGLIFFLAGS, (char *)&ifrflags) < 0) {
 			if (errno == ENXIO)
 				continue;
@@ -232,6 +233,7 @@ pcap_findalldevs(pcap_if_t **alldevsp, c
 		 */
 		strncpy(ifrnetmask.lifr_name, ifrp->lifr_name,
 		    sizeof(ifrnetmask.lifr_name));
+		ifrnetmask.lifr_name[sizeof(ifrnetmask.lifr_name)-1] = '\0';
 		memcpy(&ifrnetmask.lifr_addr, &ifrp->lifr_addr,
 		    sizeof(ifrnetmask.lifr_addr));
 		if (ioctl(fd, SIOCGLIFNETMASK, (char *)&ifrnetmask) < 0) {
@@ -259,6 +261,7 @@ pcap_findalldevs(pcap_if_t **alldevsp, c
 		if (ifrflags.lifr_flags & IFF_BROADCAST) {
 			strncpy(ifrbroadaddr.lifr_name, ifrp->lifr_name,
 			    sizeof(ifrbroadaddr.lifr_name));
+			ifrbroadaddr.lifr_name[sizeof(ifrbroadaddr.lifr_name)-1] = '\0';
 			memcpy(&ifrbroadaddr.lifr_addr, &ifrp->lifr_addr,
 			    sizeof(ifrbroadaddr.lifr_addr));
 			if (ioctl(fd, SIOCGLIFBRDADDR,
@@ -294,6 +297,7 @@ pcap_findalldevs(pcap_if_t **alldevsp, c
 		if (ifrflags.lifr_flags & IFF_POINTOPOINT) {
 			strncpy(ifrdstaddr.lifr_name, ifrp->lifr_name,
 			    sizeof(ifrdstaddr.lifr_name));
+			ifrdstaddr.lifr_name[sizeof(ifrdstaddr.lifr_name)-1] = '\0';
 			memcpy(&ifrdstaddr.lifr_addr, &ifrp->lifr_addr,
 			    sizeof(ifrdstaddr.lifr_addr));
 			if (ioctl(fd, SIOCGLIFDSTADDR,
--- kismet-2006-04-R1/libpcap-0.9.1-kis/pcap-nit.c.strop	2005-06-21 02:58:08.000000000 +0200
+++ kismet-2006-04-R1/libpcap-0.9.1-kis/pcap-nit.c	2006-04-22 21:08:37.000000000 +0200
@@ -199,7 +199,7 @@ pcap_inject_nit(pcap_t *p, const void *b
 	int ret;
 
 	memset(&sa, 0, sizeof(sa));
-	strncpy(sa.sa_data, device, sizeof(sa.sa_data));
+	strncpy(sa.sa_data, device, sizeof(sa.sa_data)-1);
 	ret = sendto(p->fd, buf, size, 0, &sa, sizeof(sa));
 	if (ret == -1) {
 		snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "send: %s",
@@ -273,8 +273,9 @@ pcap_open_live(const char *device, int s
 		    "socket: %s", pcap_strerror(errno));
 		goto bad;
 	}
+	memset(&snit, 0, sizeof snit);
 	snit.snit_family = AF_NIT;
-	(void)strncpy(snit.snit_ifname, device, NITIFSIZ);
+	(void)strncpy(snit.snit_ifname, device, sizeof(snit.snit_ifname)-1);
 
 	if (bind(fd, (struct sockaddr *)&snit, sizeof(snit))) {
 		snprintf(ebuf, PCAP_ERRBUF_SIZE,
--- kismet-2006-04-R1/libpcap-0.9.1-kis/pcap-snoop.c.strop	2005-06-21 02:58:08.000000000 +0200
+++ kismet-2006-04-R1/libpcap-0.9.1-kis/pcap-snoop.c	2006-04-22 21:08:37.000000000 +0200
@@ -223,7 +223,7 @@ pcap_open_live(const char *device, int s
 	p->fd = fd;
 	memset(&sr, 0, sizeof(sr));
 	sr.sr_family = AF_RAW;
-	(void)strncpy(sr.sr_ifname, device, sizeof(sr.sr_ifname));
+	(void)strncpy(sr.sr_ifname, device, sizeof(sr.sr_ifname)-1);
 	if (bind(fd, (struct sockaddr *)&sr, sizeof(sr))) {
 		snprintf(ebuf, PCAP_ERRBUF_SIZE, "snoop bind: %s",
 		    pcap_strerror(errno));
@@ -316,6 +316,7 @@ pcap_open_live(const char *device, int s
 	 * to be no greater than the MTU.
 	 */
 	(void)strncpy(ifr.ifr_name, device, sizeof(ifr.ifr_name));
+	ifr.ifr_name[sizeof(ifr.ifr_name)-1] = '\0';
 	if (ioctl(fd, SIOCGIFMTU, (char *)&ifr) < 0) {
 		snprintf(ebuf, PCAP_ERRBUF_SIZE, "SIOCGIFMTU: %s",
 		    pcap_strerror(errno));
--- kismet-2006-04-R1/libpcap-0.9.1-kis/fad-gifc.c.strop	2005-06-21 02:58:08.000000000 +0200
+++ kismet-2006-04-R1/libpcap-0.9.1-kis/fad-gifc.c	2006-04-22 21:08:37.000000000 +0200
@@ -188,6 +188,7 @@ scan_proc_net_dev(pcap_if_t **devlistp, 
 		 * it's not up.
 		 */
 		strncpy(ifrflags.ifr_name, name, sizeof(ifrflags.ifr_name));
+		ifrflags.ifr_name[sizeof(ifrflags.ifr_name)-1] = '\0';
 		if (ioctl(fd, SIOCGIFFLAGS, (char *)&ifrflags) < 0) {
 			if (errno == ENXIO)
 				continue;
@@ -354,6 +355,7 @@ pcap_findalldevs(pcap_if_t **alldevsp, c
 		 */
 		strncpy(ifrflags.ifr_name, ifrp->ifr_name,
 		    sizeof(ifrflags.ifr_name));
+		ifrflags.ifr_name[sizeof(ifrflags.ifr_name)-1] = '\0';
 		if (ioctl(fd, SIOCGIFFLAGS, (char *)&ifrflags) < 0) {
 			if (errno == ENXIO)
 				continue;
@@ -373,6 +375,7 @@ pcap_findalldevs(pcap_if_t **alldevsp, c
 		 */
 		strncpy(ifrnetmask.ifr_name, ifrp->ifr_name,
 		    sizeof(ifrnetmask.ifr_name));
+		ifrnetmask.ifr_name[sizeof(ifrnetmask.ifr_name)-1] = '\0';
 		memcpy(&ifrnetmask.ifr_addr, &ifrp->ifr_addr,
 		    sizeof(ifrnetmask.ifr_addr));
 		if (ioctl(fd, SIOCGIFNETMASK, (char *)&ifrnetmask) < 0) {
@@ -403,6 +406,7 @@ pcap_findalldevs(pcap_if_t **alldevsp, c
 		if (ifrflags.ifr_flags & IFF_BROADCAST) {
 			strncpy(ifrbroadaddr.ifr_name, ifrp->ifr_name,
 			    sizeof(ifrbroadaddr.ifr_name));
+			ifrbroadaddr.ifr_name[sizeof(ifrbroadaddr.ifr_name)-1] = '\0';
 			memcpy(&ifrbroadaddr.ifr_addr, &ifrp->ifr_addr,
 			    sizeof(ifrbroadaddr.ifr_addr));
 			if (ioctl(fd, SIOCGIFBRDADDR,
@@ -442,6 +446,7 @@ pcap_findalldevs(pcap_if_t **alldevsp, c
 		if (ifrflags.ifr_flags & IFF_POINTOPOINT) {
 			strncpy(ifrdstaddr.ifr_name, ifrp->ifr_name,
 			    sizeof(ifrdstaddr.ifr_name));
+			ifrdstaddr.ifr_name[sizeof(ifrdstaddr.ifr_name)-1] = '\0';
 			memcpy(&ifrdstaddr.ifr_addr, &ifrp->ifr_addr,
 			    sizeof(ifrdstaddr.ifr_addr));
 			if (ioctl(fd, SIOCGIFDSTADDR,
--- kismet-2006-04-R1/libpcap-0.9.1-kis/pcap-linux.c.strop	2005-07-19 22:06:52.000000000 +0200
+++ kismet-2006-04-R1/libpcap-0.9.1-kis/pcap-linux.c	2006-04-22 21:08:37.000000000 +0200
@@ -1496,7 +1496,7 @@ iface_get_id(int fd, const char *device,
 	struct ifreq	ifr;
 
 	memset(&ifr, 0, sizeof(ifr));
-	strncpy(ifr.ifr_name, device, sizeof(ifr.ifr_name));
+	strncpy(ifr.ifr_name, device, sizeof(ifr.ifr_name)-1);
 
 	if (ioctl(fd, SIOCGIFINDEX, &ifr) == -1) {
 		snprintf(ebuf, PCAP_ERRBUF_SIZE,
@@ -1598,7 +1598,7 @@ static void	pcap_close_linux( pcap_t *ha
 		 * kernels.
 		 */
 		memset(&ifr, 0, sizeof(ifr));
-		strncpy(ifr.ifr_name, handle->md.device, sizeof(ifr.ifr_name));
+		strncpy(ifr.ifr_name, handle->md.device, sizeof(ifr.ifr_name)-1);
 		if (ioctl(handle->fd, SIOCGIFFLAGS, &ifr) == -1) {
 			fprintf(stderr,
 			    "Can't restore interface flags (SIOCGIFFLAGS failed: %s).\n"
@@ -1714,7 +1714,7 @@ live_open_old(pcap_t *handle, const char
 
 		if (promisc) {
 			memset(&ifr, 0, sizeof(ifr));
-			strncpy(ifr.ifr_name, device, sizeof(ifr.ifr_name));
+			strncpy(ifr.ifr_name, device, sizeof(ifr.ifr_name)-1);
 			if (ioctl(handle->fd, SIOCGIFFLAGS, &ifr) == -1) {
 				snprintf(ebuf, PCAP_ERRBUF_SIZE,
 					 "ioctl: %s", pcap_strerror(errno));
@@ -1792,7 +1792,7 @@ iface_bind_old(int fd, const char *devic
 	socklen_t	errlen = sizeof(err);
 
 	memset(&saddr, 0, sizeof(saddr));
-	strncpy(saddr.sa_data, device, sizeof(saddr.sa_data));
+	strncpy(saddr.sa_data, device, sizeof(saddr.sa_data)-1);
 	if (bind(fd, &saddr, sizeof(saddr)) == -1) {
 		snprintf(ebuf, PCAP_ERRBUF_SIZE,
 			 "bind: %s", pcap_strerror(errno));
@@ -1831,7 +1831,7 @@ iface_get_mtu(int fd, const char *device
 		return BIGGER_THAN_ALL_MTUS;
 
 	memset(&ifr, 0, sizeof(ifr));
-	strncpy(ifr.ifr_name, device, sizeof(ifr.ifr_name));
+	strncpy(ifr.ifr_name, device, sizeof(ifr.ifr_name)-1);
 
 	if (ioctl(fd, SIOCGIFMTU, &ifr) == -1) {
 		snprintf(ebuf, PCAP_ERRBUF_SIZE,
@@ -1851,7 +1851,7 @@ iface_get_arptype(int fd, const char *de
 	struct ifreq	ifr;
 
 	memset(&ifr, 0, sizeof(ifr));
-	strncpy(ifr.ifr_name, device, sizeof(ifr.ifr_name));
+	strncpy(ifr.ifr_name, device, sizeof(ifr.ifr_name)-1);
 
 	if (ioctl(fd, SIOCGIFHWADDR, &ifr) == -1) {
 		snprintf(ebuf, PCAP_ERRBUF_SIZE,
--- kismet-2006-04-R1/panelfront_display.cc.strop	2005-08-15 17:52:16.000000000 +0200
+++ kismet-2006-04-R1/panelfront_display.cc	2006-04-22 21:08:37.000000000 +0200
@@ -19,6 +19,7 @@
 #include "config.h"
 
 #include <math.h>
+#include <sys/param.h>
 
 #include "panelfront.h"
 #include "displaynetworksort.h"
@@ -1475,9 +1476,8 @@ int PanelFront::DetailsPrinter(void *in_
     char output[1024];
     kwin->text.clear();
 
-    int print_width = kwin->print_width;
-    if (print_width > 1024)
-        print_width = 1023;
+    size_t const print_width = MIN(static_cast<size_t>(kwin->print_width),
+				   sizeof(output));
 
 	if (details_network == NULL) {
 		kwin->text.push_back("The network or group being displayed");
@@ -1918,9 +1918,8 @@ int PanelFront::GpsPrinter(void *in_wind
 
     wireless_network *dnet = details_network->virtnet;
 
-    int print_width = kwin->print_width;
-    if (print_width > 1024)
-        print_width = 1023;
+    size_t const print_width = MIN(static_cast<size_t>(kwin->print_width),
+				   sizeof(output));
 
     if (print_width < 32) {
         kwin->text.push_back("Display not wide enough");
@@ -2603,7 +2602,8 @@ int PanelFront::StatsPrinter(void *in_wi
     vector<string> details_text;
     char output[1024];
 
-    const int print_width = kwin->print_width;
+    const size_t print_width = MIN(static_cast<size_t>(kwin->print_width),
+				   sizeof(output));
 
     snprintf(output, print_width, "Start   : %.24s", ctime((const time_t *) &start_time));
     details_text.push_back(output);
@@ -2921,9 +2921,8 @@ int PanelFront::DetailsClientPrinter(voi
     char temp[1024];
     kwin->text.clear();
 
-    int print_width = kwin->print_width;
-    if (print_width > 1024)
-        print_width = 1023;
+    size_t const print_width = MIN(static_cast<size_t>(kwin->print_width),
+				   sizeof(output));
 
     switch (details_client->type) {
     case client_fromds:
--- kismet-2006-04-R1/pcapsource.cc.strop	2006-04-22 21:08:37.000000000 +0200
+++ kismet-2006-04-R1/pcapsource.cc	2006-04-22 21:08:37.000000000 +0200
@@ -2756,7 +2756,7 @@ bool RadiotapBSD::getmediaopt(int& optio
         return false;
 
     memset(&ifmr, 0, sizeof(ifmr));
-    strncpy(ifmr.ifm_name, ifname.c_str(), sizeof(ifmr.ifm_name));
+    strncpy(ifmr.ifm_name, ifname.c_str(), sizeof(ifmr.ifm_name)-1);
 
     /*
      * We must go through the motions of reading all
@@ -2781,7 +2781,7 @@ bool RadiotapBSD::setmediaopt(int option
         return false;
 
     memset(&ifmr, 0, sizeof(ifmr));
-    strncpy(ifmr.ifm_name, ifname.c_str(), sizeof(ifmr.ifm_name));
+    strncpy(ifmr.ifm_name, ifname.c_str(), sizeof(ifmr.ifm_name)-1);
 
     /*
      * We must go through the motions of reading all
@@ -2809,7 +2809,7 @@ bool RadiotapBSD::setmediaopt(int option
     delete mwords;
 
     memset(&ifr, 0, sizeof(ifr));
-    strncpy(ifr.ifr_name, ifname.c_str(), sizeof(ifr.ifr_name));
+    strncpy(ifr.ifr_name, ifname.c_str(), sizeof(ifr.ifr_name)-1);
     ifr.ifr_media = (ifmr.ifm_current &~ IFM_OMASK) | options;
     ifr.ifr_media = (ifr.ifr_media &~ IFM_MMASK) | IFM_MAKEMODE(mode);
 
@@ -2863,7 +2863,7 @@ bool RadiotapBSD::get80211(int type, int
     if (!checksocket())
         return false;
     memset(&ireq, 0, sizeof(ireq));
-    strncpy(ireq.i_name, ifname.c_str(), sizeof(ireq.i_name));
+    strncpy(ireq.i_name, ifname.c_str(), sizeof(ireq.i_name)-1);
     ireq.i_type = type;
     ireq.i_len = len;
     ireq.i_data = data;
@@ -2881,7 +2881,7 @@ bool RadiotapBSD::set80211(int type, int
     if (!checksocket())
 	return false;
     memset(&ireq, 0, sizeof(ireq));
-    strncpy(ireq.i_name, ifname.c_str(), sizeof(ireq.i_name));
+    strncpy(ireq.i_name, ifname.c_str(), sizeof(ireq.i_name)-1);
     ireq.i_type = type;
     ireq.i_val = val;
     ireq.i_len = len;
@@ -2898,6 +2898,7 @@ bool RadiotapBSD::getifflags(int& flags)
         return false;
 
     strncpy(ifr.ifr_name, ifname.c_str(), sizeof (ifr.ifr_name));
+    ifr.ifr_name[sizeof (ifr.ifr_name)-1] = '\0';
     if (ioctl(s, SIOCGIFFLAGS, (caddr_t)&ifr) < 0) {
         perror("SIOCGIFFLAGS ioctl failed");
         return false;
--- kismet-2006-04-R1/tcpclient.cc.strop	2006-04-22 21:08:37.000000000 +0200
+++ kismet-2006-04-R1/tcpclient.cc	2006-04-22 21:08:37.000000000 +0200
@@ -107,6 +107,7 @@ int TcpClient::Connect(short int in_port
     }
 
     strncpy(hostname, in_host, MAXHOSTNAMELEN);
+    hostname[MAXHOSTNAMELEN-1] = '\0';
 
     // Set up our socket
     //bzero(&client_sock, sizeof(client_sock));
--- kismet-2006-04-R1/gpsmap_cache.cc.strop	2005-03-10 17:49:34.000000000 +0100
+++ kismet-2006-04-R1/gpsmap_cache.cc	2006-04-22 21:08:37.000000000 +0200
@@ -174,6 +174,8 @@ int ReadGpsCacheFile(const char *in_gpsf
 
         strncpy(pt->bssid, cpt.bssid, MAC_STR_LEN);
         strncpy(pt->source, cpt.source, MAC_STR_LEN);
+	pt->bssid[MAC_STR_LEN-1]  = '\0';
+	pt->source[MAC_STR_LEN-1] = '\0';
         pt->tv_sec = cpt.tv_sec;
         pt->tv_usec = cpt.tv_usec;
         pt->lat = cpt.lat;
@@ -344,9 +346,10 @@ int WriteGpsCacheFile(const char *in_gps
     for (unsigned int nsam = 0; nsam < fheader.num_points; nsam++) {
         gpscache_point cpt;
         gps_point *pt = (*in_points)[nsam];
-   
-        strncpy(cpt.bssid, pt->bssid, MAC_STR_LEN);
-        strncpy(cpt.source, pt->source, MAC_STR_LEN);
+
+	memset(&cpt, 0, sizeof cpt);
+        strncpy(cpt.bssid, pt->bssid, sizeof(cpt.bssid)-1);
+        strncpy(cpt.source, pt->source, sizeof(cpt.source)-1);
         cpt.tv_sec = pt->tv_sec;
         cpt.tv_usec = pt->tv_usec;
         cpt.lat = pt->lat;
--- kismet-2006-04-R1/ifcontrol.cc.strop	2004-08-09 06:36:01.000000000 +0200
+++ kismet-2006-04-R1/ifcontrol.cc	2006-04-22 21:08:37.000000000 +0200
@@ -32,7 +32,8 @@ int Ifconfig_Set_Flags(const char *in_de
     }
 
     // Fetch interface flags
-    strncpy(ifr.ifr_name, in_dev, IFNAMSIZ);
+    memset(&ifr, 0, sizeof ifr);
+    strncpy(ifr.ifr_name, in_dev, sizeof(ifr.ifr_name)-1);
     ifr.ifr_flags = flags;
     if (ioctl(skfd, SIOCSIFFLAGS, &ifr) < 0) {
         snprintf(errstr, STATUS_MAX, "SetIFFlags: Unknown interface %s: %s", 
@@ -58,7 +59,8 @@ int Ifconfig_Get_Flags(const char *in_de
     }
 
     // Fetch interface flags
-    strncpy(ifr.ifr_name, in_dev, IFNAMSIZ);
+    memset(&ifr, 0, sizeof ifr);
+    strncpy(ifr.ifr_name, in_dev, sizeof(ifr.ifr_name)-1);
     if (ioctl(skfd, SIOCGIFFLAGS, &ifr) < 0) {
         snprintf(errstr, STATUS_MAX, "GetIFFlags: interface %s: %s", 
                  in_dev, strerror(errno));
@@ -96,7 +98,8 @@ int Ifconfig_Get_Hwaddr(const char *in_d
     }
 
     // Fetch interface flags
-    strncpy(ifr.ifr_name, in_dev, IFNAMSIZ);
+    memset(&ifr, 0, sizeof ifr);
+    strncpy(ifr.ifr_name, in_dev, sizeof(ifr.ifr_name)-1);
     if (ioctl(skfd, SIOCGIFHWADDR, &ifr) < 0) {
         snprintf(errstr, STATUS_MAX, "Getting HWAddr: unknown interface %s: %s", 
                  in_dev, strerror(errno));
@@ -122,7 +125,8 @@ int Ifconfig_Set_Hwaddr(const char *in_d
         return -1;
     }
 
-    strncpy(ifr.ifr_name, in_dev, IFNAMSIZ);
+    memset(&ifr, 0, sizeof ifr);
+    strncpy(ifr.ifr_name, in_dev, sizeof(ifr.ifr_name)-1);
     memcpy(ifr.ifr_hwaddr.sa_data, in_hwaddr, 6);
     ifr.ifr_hwaddr.sa_family = ARPHRD_ETHER;
      
@@ -151,7 +155,8 @@ int Ifconfig_Set_MTU(const char *in_dev,
     }
 
     // Fetch interface flags
-    strncpy(ifr.ifr_name, in_dev, IFNAMSIZ);
+    memset(&ifr, 0, sizeof ifr);
+    strncpy(ifr.ifr_name, in_dev, sizeof(ifr.ifr_name)-1);
     ifr.ifr_mtu = in_mtu;
     if (ioctl(skfd, SIOCSIFMTU, &ifr) < 0) {
         snprintf(errstr, STATUS_MAX, "Setting MTU: unknown interface %s: %s", 

kismet-2006-04-R1-uninit.patch:

--- NEW FILE kismet-2006-04-R1-uninit.patch ---
2006-04-22  Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>

	* macaddr.h: initialized a 'second' attribute in an iterator
	  class which might be used uninitialized else

--- kismet-2006-04-R1/macaddr.h.uninit	2006-01-04 16:32:46.000000000 +0100
+++ kismet-2006-04-R1/macaddr.h	2006-04-22 18:22:02.000000000 +0200
@@ -290,6 +290,7 @@ public:
             } else {
                 singleton_itr = owner->singleton_map.end();
                 vector_itr = owner->mask_vec.size();
+		second     = NULL;
             }
         }
 


--- NEW FILE kismet-2006-04-R1.tar.gz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)

iD8DBQBEPdlU17KIInOLvbERAhT2AKCWL5TA/FwgFZbFubgKQc8so8bYPACaAwQd
3W60uDYNJgwGoxNwroHB5t4=
=KeKF
-----END PGP SIGNATURE-----


--- NEW FILE kismet.spec ---
## $Id: kismet.spec 1859 2006-04-23 11:47:18Z ensc at BIGO.ENSC.DE $

%global _version	2006-04-R1

## {Local macros...
%global username	kismet
%global crontabdir	%_sysconfdir/cron.daily
%global homedir		%_var/lib/%name
%global logdir		%_var/log/%name
%global cfgdir		%_sysconfdir/%name
%global _rpmversion	0.0.%(echo %_version | tr - .)
## ...local macros}

%{!?release_func:%global release_func() %1%{?dist}}

Summary:	WLAN detector, sniffer and IDS
Name:		kismet
Version:	%_rpmversion
Release:	%release_func 2
License:	GPL
Group:		Applications/Internet
URL:		http://www.kismetwireless.net/
Source0:	http://www.kismetwireless.net/code/%name-%_version.tar.gz
Source1:	http://www.kismetwireless.net/code/%name-%_version.tar.gz.asc
Source10:	tmpwatch.kismet
Source11:	sysconfig.kismet
Patch0:		kismet-2005-08-R1-jobcontrol.patch
Patch1:		kismet-2006-04-R1-packed.patch
Patch2:		kismet-2006-04-R1-noret.patch
Patch3:		kismet-2006-04-R1-uninit.patch
Patch4:		kismet-2006-04-R1-alias.patch
Patch5:		kismet-2006-04-R1-strop.patch
Patch6:		kismet-2006-04-R1-alias1.patch
Patch7:		kismet-2006-04-R1-ssize.patch
BuildRoot:	%_tmppath/%name-%version-%release-root
BuildRequires:		expat-devel ncurses-devel diffutils
BuildRequires:		gmp-devel wget glib-devel
BuildRequires:		ImageMagick-devel
# should be required by ImageMagick-devel but are missing in FC4
BuildRequires:		libtiff-devel libjpeg-devel
BuildRequires:		bzip2-devel
Requires(pre):		fedora-usermgmt
Requires(postun):	fedora-usermgmt
Requires(missingok):	tmpwatch
Requires(missingok):	crontabs
Requires(pre):		%crontabdir
Requires(postun):	%crontabdir


%package extras
Summary:	Non-core programs for 'kismet'
Group:		Applications/Internet
Requires:	%name = %version-%release


%description
Kismet is an 802.11 layer2 wireless network detector, sniffer, and
intrusion detection system. Kismet will work with any wireless card
which supports raw monitoring (rfmon) mode, and can sniff 802.11b,
802.11a, and 802.11g traffic.

Kismet identifies networks by passively collecting packets and detecting
standard named networks, detecting (and given time, decloaking) hidden
networks, and infering the presence of nonbeaconing networks via data
traffic.

%description extras
Kismet is an 802.11 layer2 wireless network detector, sniffer, and
intrusion detection system. Kismet will work with any wireless card
which supports raw monitoring (rfmon) mode, and can sniff 802.11b,
802.11a, and 802.11g traffic.

This subpackage contains programs which provide additional functionality
but introduce dependencies which are not needed for kismet to work.


%prep
%setup -q -n %name-%_version
%patch0 -p1 -b .jobcontrol
%patch1 -p1 -b .packed
%patch2 -p1 -b .noret
%patch3 -p1 -b .uninit
%patch4 -p1 -b .alias
%patch6 -p1 -b .alias1
%patch5 -p1 -b .strop
%patch7 -p1 -b .ssize

sed -e 's!/var/log/kismet!%logdir!g' %SOURCE10 >tmpwatch.kismet
touch --reference=%SOURCE10 tmpwatch.kismet || :	# keep timestamp

# set our 'kismet' user, disable GPS and log into %logdir by
# default
sed -i -e "s!your_user_here!%username!g;
           s!^gps=true!gps=false!;
           s!^logtemplate=%%!logtemplate=%logdir/%%!;
	   s!^configdir=.*!configdir=%h/!" \
		conf/kismet.conf.in conf/kismet_drone.conf

# do not strip installed binaries as it conflicts with the -debuginfo
# mechanism
sed -i -e "s!\(install .*\) -s !\1 !g" Makefile.in


%build
export ac_cv_header_linux_netlink_h=yes	# we have netlink.h; just the check is buggy
export ac_cv_lib_uClibcpp_main=no	# we do not want to build against uClibc++, even when available
%configure --enable-ipv6 --sysconfdir=%cfgdir

# HOME will be set to @srcdir@ which is disturbing distcc
make clean
make %{?_smp_mflags} HOME="$HOME"


%install
rm -rf $RPM_BUILD_ROOT
make install	\
	DESTDIR="$RPM_BUILD_ROOT" \
	INSTUSR="$(id -un)" INSTGRP="$(id -gn)" MANGRP="$(id -gn)"
install -d $RPM_BUILD_ROOT{%homedir,%logdir,%crontabdir,%_sysconfdir/sysconfig}
install -p -m755 tmpwatch.kismet $RPM_BUILD_ROOT%crontabdir
install -p -m644 %SOURCE11       $RPM_BUILD_ROOT%_sysconfdir/sysconfig/kismet


%pre
/usr/sbin/fedora-groupadd 12 -r %username &>/dev/null || :
/usr/sbin/fedora-useradd  12 -r -s /sbin/nologin -M -d %homedir		\
			     -c 'Kismet user' -g %username %username &>/dev/null || :


%postun
test "$1" != 0 || /usr/sbin/fedora-userdel  %username &>/dev/null || :
test "$1" != 0 || /usr/sbin/fedora-groupdel %username &>/dev/null || :


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc CHANGELOG* GPL README TODO docs
%dir %attr(0770,root,%username) %homedir
%dir %attr(0730,root,%username) %logdir
%dir %attr(0750,root,%username) %cfgdir
%config(noreplace) %cfgdir/*
%_bindir/kismet*
%_datadir/kismet
%_mandir/*/kismet*

%config            %crontabdir/tmpwatch.kismet
%config(noreplace) %_sysconfdir/sysconfig/kismet


%files extras
%defattr(-,root,root,-)
%_bindir/gps*
%_mandir/*/gps*


%changelog
* Sat Apr 29 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.0.2006.04.R1-2
- fixed compilation problems on AMD64 introduced by my -alias patch
  (reported by Hans de Goede)
- fixed ssize_t vs. int problem on AMD64 (found and reported by Hans
  de Goede)
- initial import into Fedora Extra (review #165314)

* Sat Apr 22 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.0.2006.04.R1-1
- updated to 2006-04-R1
- fixed/improved some ./configure checks
- removed the starting 'A' from the summary
- added a bunch of patches fixing compiler warnings

* Fri Mar 17 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.0.2005.08.R1-3
- fixed the usermgmt in the %%postun script: test for uninstallation
  and swap order of user- and groupdel operations
- moved logs to /var/log/kismet
- placed status information directly under /var/lib/kismet instead of
  /var/lib/kismet/.kismet
- added /etc/cron.dail/tmpwatch.kismet to cleanup the generated
  logfiles; used tmpwatch because kismet creates new, differently
  named logfiles.
- added -jobcontrol patch

* Thu Mar 16 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.0.2005.08.R1-2
- set *USR and *GRP variables to avoid problems with certain 'install'
  versions

* Thu Aug 18 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.0.2005.08.R1-1
- updated to 2005-08-R1 (SECURITY)
- do not use 'subst()' in %%prep anymore; the files *will* be touched
  so we do not need to care about the timestamp
- fixed copy&paste error in the gecos entry of the 'kismet' user

* Sun Aug  7 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.0.2005.07.R1a-1
- updated to 2005-07-R1a

* Sat Jul  9 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.0.2005.06.R1-1
- Initial build.


## Local Variables:
## outline-regexp: "##\\s-*{.*\\.\\.\\."
## outline-heading-end-regexp: "##\\s-*\\.\\.\\..*}"
## End:


--- NEW FILE sysconfig.kismet ---
## set this flag when automatic removal of generated kismet logfiles
## is unwanted. Default: unset
# NO_TMPWATCH=

## set this option to the number of minimum number of hours the
## generated logfiles shall be kept. Default: 72 (3 days)
# TMPWATCH_TIME=72

## add additional options which shall be given to tmpwatch(8). Default:
## unset
# TMPWATCH_FLAGS=


--- NEW FILE tmpwatch.kismet ---
#! /bin/sh

TMPWATCH=/usr/sbin/tmpwatch
CFGFILE=/etc/sysconfig/kismet
LOGDIR=/var/log/kismet

NO_TMPWATCH=
TMPWATCH_TIME=72	# 3 days
TMPWATCH_FLAGS=
test ! -e $CFGFILE      || . $CFGFILE

test -z "$NO_LOGROTATE" || exit 0
test -x "$TMPWATCH"     || exit 0


exec $TMPWATCH $TMPWATCH_FLAGS "$TMPWATCH_TIME" "$LOGDIR"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Apr 2006 16:28:15 -0000	1.1
+++ .cvsignore	29 Apr 2006 16:31:28 -0000	1.2
@@ -0,0 +1 @@
+kismet-2006-04-R1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Apr 2006 16:28:15 -0000	1.1
+++ sources	29 Apr 2006 16:31:28 -0000	1.2
@@ -0,0 +1 @@
+8ec2de513f2911df1b7edfcba5ad1c26  kismet-2006-04-R1.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 29 16:34:09 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 29 Apr 2006 09:34:09 -0700
Subject: owners owners.list,1.920,1.921
Message-ID: <200604291634.k3TGYBCt010278@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10259

Modified Files:
	owners.list 
Log Message:
added kismet


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.920
retrieving revision 1.921
diff -u -r1.920 -r1.921
--- owners.list	29 Apr 2006 10:59:20 -0000	1.920
+++ owners.list	29 Apr 2006 16:34:08 -0000	1.921
@@ -549,6 +549,7 @@
 Fedora Extras|kinput2|Japanese kanji input server for X11|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|kiosktool|KIOSK administration tool for KDE|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kipi-plugins|Plugins to use with Kipi|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|kismet|WLAN detector, sniffer and IDS|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|kmymoney2|Personal finance|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|koffice|A set of office applications for KDE|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|koffice-langpack|Language files for koffic|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Apr 29 17:23:28 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 29 Apr 2006 10:23:28 -0700
Subject: rpms/kismet/devel kismet.spec,1.1,1.2
Message-ID: <200604291723.k3THNUB7014654@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/kismet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14637

Modified Files:
	kismet.spec 
Log Message:
try to find out why ImageMagick is not detect in -devel


Index: kismet.spec
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/kismet.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kismet.spec	29 Apr 2006 16:31:28 -0000	1.1
+++ kismet.spec	29 Apr 2006 17:23:28 -0000	1.2
@@ -105,6 +105,7 @@
 export ac_cv_header_linux_netlink_h=yes	# we have netlink.h; just the check is buggy
 export ac_cv_lib_uClibcpp_main=no	# we do not want to build against uClibc++, even when available
 %configure --enable-ipv6 --sysconfdir=%cfgdir
+cat config.log
 
 # HOME will be set to @srcdir@ which is disturbing distcc
 make clean



From fedora-extras-commits at redhat.com  Sat Apr 29 17:35:08 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 29 Apr 2006 10:35:08 -0700
Subject: rpms/kismet/devel kismet.spec,1.2,1.3
Message-ID: <200604291735.k3THZARU014748@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/kismet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14731

Modified Files:
	kismet.spec 
Log Message:
added 'freetype-devel' BR which is required for -devel branch


Index: kismet.spec
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/kismet.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kismet.spec	29 Apr 2006 17:23:28 -0000	1.2
+++ kismet.spec	29 Apr 2006 17:35:08 -0000	1.3
@@ -37,7 +37,7 @@
 BuildRequires:		gmp-devel wget glib-devel
 BuildRequires:		ImageMagick-devel
 # should be required by ImageMagick-devel but are missing in FC4
-BuildRequires:		libtiff-devel libjpeg-devel
+BuildRequires:		libtiff-devel libjpeg-devel freetype-devel
 BuildRequires:		bzip2-devel
 Requires(pre):		fedora-usermgmt
 Requires(postun):	fedora-usermgmt
@@ -165,6 +165,7 @@
 - fixed ssize_t vs. int problem on AMD64 (found and reported by Hans
   de Goede)
 - initial import into Fedora Extra (review #165314)
+- added 'freetype-devel' BR which is required for -devel branch
 
 * Sat Apr 22 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.0.2006.04.R1-1
 - updated to 2006-04-R1



From fedora-extras-commits at redhat.com  Sat Apr 29 17:48:56 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 29 Apr 2006 10:48:56 -0700
Subject: comps comps-fe5.xml.in,1.40,1.41 comps-fe6.xml.in,1.3,1.4
Message-ID: <200604291748.k3THmwFO014839@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14818

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in 
Log Message:
added gauche


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- comps-fe5.xml.in	29 Apr 2006 07:28:24 -0000	1.40
+++ comps-fe5.xml.in	29 Apr 2006 17:48:56 -0000	1.41
@@ -38,6 +38,7 @@
         <packagereq type="optional">erlang</packagereq>
         <packagereq type="optional">fedora-rpmdevtools</packagereq>
         <packagereq type="optional">fpc</packagereq>
+        <packagereq type="optional">gauche</packagereq>
         <packagereq type="optional">gforth</packagereq>
         <packagereq type="optional">ghc</packagereq>
         <packagereq type="optional">git</packagereq>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- comps-fe6.xml.in	29 Apr 2006 07:28:24 -0000	1.3
+++ comps-fe6.xml.in	29 Apr 2006 17:48:56 -0000	1.4
@@ -38,6 +38,7 @@
         <packagereq type="optional">erlang</packagereq>
         <packagereq type="optional">fedora-rpmdevtools</packagereq>
         <packagereq type="optional">fpc</packagereq>
+        <packagereq type="optional">gauche</packagereq>
         <packagereq type="optional">gforth</packagereq>
         <packagereq type="optional">ghc</packagereq>
         <packagereq type="optional">git</packagereq>



From fedora-extras-commits at redhat.com  Sat Apr 29 18:11:06 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 29 Apr 2006 11:11:06 -0700
Subject: rpms/kismet/devel kismet.spec,1.3,1.4
Message-ID: <200604291811.k3TIB8pG017094@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/kismet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17077

Modified Files:
	kismet.spec 
Log Message:
removed the 'cat config.log' which was only used for debugging the freetype-devel BR issue


Index: kismet.spec
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/kismet.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kismet.spec	29 Apr 2006 17:35:08 -0000	1.3
+++ kismet.spec	29 Apr 2006 18:11:06 -0000	1.4
@@ -105,7 +105,6 @@
 export ac_cv_header_linux_netlink_h=yes	# we have netlink.h; just the check is buggy
 export ac_cv_lib_uClibcpp_main=no	# we do not want to build against uClibc++, even when available
 %configure --enable-ipv6 --sysconfdir=%cfgdir
-cat config.log
 
 # HOME will be set to @srcdir@ which is disturbing distcc
 make clean



From fedora-extras-commits at redhat.com  Sat Apr 29 18:56:35 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 29 Apr 2006 11:56:35 -0700
Subject: rpms/raidem/devel .cvsignore, 1.2, 1.3 raidem-0.3.1-syslibs.patch,
	1.1, 1.2 raidem.spec, 1.4, 1.5 sources, 1.2,
	1.3 raidem-0.3-loadpng.patch, 1.1, NONE raidem-0.3-no-mp3.patch,
	1.1, NONE raidem-0.3-syslibs.patch, 1.1,
	NONE raidem-0.3-warn.patch, 1.1, NONE
Message-ID: <200604291856.k3TIubYl017324@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/raidem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17298

Modified Files:
	.cvsignore raidem-0.3.1-syslibs.patch raidem.spec sources 
Removed Files:
	raidem-0.3-loadpng.patch raidem-0.3-no-mp3.patch 
	raidem-0.3-syslibs.patch raidem-0.3-warn.patch 
Log Message:
* Sat Apr 29 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.1-1
- New upstream release 0.3.1
- Upstream has merged most patches, dropped.
- Upstream has added ogg support (yeah!), add ogg and id3tag support.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/raidem/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Mar 2006 18:43:34 -0000	1.2
+++ .cvsignore	29 Apr 2006 18:56:35 -0000	1.3
@@ -1 +1 @@
-raidem-0.3-src.zip
+raidem-0.3.1-src.zip

raidem-0.3.1-syslibs.patch:

Index: raidem-0.3.1-syslibs.patch
===================================================================
RCS file: /cvs/extras/rpms/raidem/devel/raidem-0.3.1-syslibs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- raidem-0.3.1-syslibs.patch	11 Apr 2006 20:46:48 -0000	1.1
+++ raidem-0.3.1-syslibs.patch	29 Apr 2006 18:56:35 -0000	1.2
@@ -1,20 +1,5 @@
-diff -ur raidem-0.3.1-src.orig/Makefile raidem-0.3.1-src/Makefile
---- raidem-0.3.1-src.orig/Makefile	2006-04-08 06:54:03.000000000 +0200
-+++ raidem-0.3.1-src/Makefile	2006-04-09 20:46:18.000000000 +0200
-@@ -4,8 +4,8 @@
- 
- include Makefile.cfg
- 
--CFLAGS += -W -Wall -Werror -Wno-deprecated-declarations \
--	-fno-strict-aliasing				\
-+CFLAGS += -W -Wall -Wno-deprecated-declarations \
-+	-fno-strict-aliasing			\
- 	-Iinclude -Ilib
- #CFLAGS += -g3
- 
-diff -ur raidem-0.3.1-src.orig/configure.ac raidem-0.3.1-src/configure.ac
---- raidem-0.3.1-src.orig/configure.ac	2006-04-08 10:48:00.000000000 +0200
-+++ raidem-0.3.1-src/configure.ac	2006-04-11 22:06:03.000000000 +0200
+--- raidem-0.3.1-src/configure.ac.syslibs	2006-04-08 10:48:00.000000000 +0200
++++ raidem-0.3.1-src/configure.ac	2006-04-29 15:01:51.000000000 +0200
 @@ -53,7 +53,8 @@
                                AC_MSG_NOTICE([===== Using lib/adime =====]) &&
                                (cd lib/adime; sh fix.sh unix --quick) &&
@@ -34,20 +19,62 @@
  AC_SUBST(NO_ALRAND, 1)
  fi
  
-@@ -124,7 +125,8 @@
+@@ -120,7 +121,7 @@
+ 
+ 
+ if ${ogg}; then
+-AC_HAVE_LIBRARY([alogg],
++PKG_CHECK_MODULES(AllegroOGG, [AllegroOGG >= 1.0.0],
                  AC_SUBST(HAVE_ALLEGROOGG, 1),
                  AC_CHECK_FILE([lib/allegroogg/Makefile],
                                AC_MSG_NOTICE([===== Using lib/allegroogg =====]),
--                              AC_SUBST(NO_OGG, 1)))
-+                              AC_SUBST(NO_OGG, 1)),
-+                [`$alcfg --libs`])
+--- raidem-0.3.1-src/src/map-editor/map-proc.m.syslibs	2006-01-20 03:33:33.000000000 +0100
++++ raidem-0.3.1-src/src/map-editor/map-proc.m	2006-04-29 15:01:51.000000000 +0200
+@@ -4,7 +4,7 @@
+ #include <allegro.h>
+ #include <assert.h>
+ #include <math.h>
+-#include "adime/include/adime.h"
++#include <adime.h>
+ #include "common.h"
+ #include "group.h"
+ #include "gui/gui-clip.h"
+--- raidem-0.3.1-src/Makefile.cfg.in.syslibs	2006-04-08 07:23:28.000000000 +0200
++++ raidem-0.3.1-src/Makefile.cfg.in	2006-04-29 15:01:51.000000000 +0200
+@@ -8,6 +8,7 @@
+ INSTALL := install
+ alcfg := @alcfg@
+ ftcfg := @ftcfg@
++pkgcfg := @PKG_CONFIG@
+ 
+ # Install paths.
+ prefix := @prefix@
+--- raidem-0.3.1-src/Makefile.syslibs	2006-04-08 06:54:03.000000000 +0200
++++ raidem-0.3.1-src/Makefile	2006-04-29 15:13:53.000000000 +0200
+@@ -4,8 +4,8 @@
+ 
+ include Makefile.cfg
+ 
+-CFLAGS += -W -Wall -Werror -Wno-deprecated-declarations \
+-	-fno-strict-aliasing				\
++CFLAGS += -W -Wall -Wno-deprecated-declarations \
++	-fno-strict-aliasing			\
+ 	-Iinclude -Ilib
+ #CFLAGS += -g3
+ 
+--- raidem-0.3.1-src/misc/Makefile.all.syslibs	2006-04-08 09:12:44.000000000 +0200
++++ raidem-0.3.1-src/misc/Makefile.all	2006-04-29 15:01:51.000000000 +0200
+@@ -30,7 +30,8 @@
+ CFLAGS += -DNO_OGG
  else
- AC_SUBST(NO_OGG, 1)
- fi
-diff -ur raidem-0.3.1-src.orig/misc/Makefile.all raidem-0.3.1-src/misc/Makefile.all
---- raidem-0.3.1-src.orig/misc/Makefile.all	2006-04-08 09:12:44.000000000 +0200
-+++ raidem-0.3.1-src/misc/Makefile.all	2006-04-09 21:06:03.000000000 +0200
-@@ -56,11 +56,14 @@
+ ifdef HAVE_ALLEGROOGG
+-LDLIBS += -lalogg
++LDLIBS += `$(pkgcfg) AllegroOGG --libs`
++CFLAGS += `$(pkgcfg) AllegroOGG --cflags`
+ else
+ CFLAGS += -Ilib/allegroogg/include
+ endif # HAVE_ALLEGROOGG
+@@ -56,11 +57,14 @@
  # Glyph-Keeper
  ifdef HAVE_GLYPH_KEEPER
  LDLIBS += -lglyph-alleg
@@ -63,15 +90,3 @@
  CFLAGS += -Ilib/freetype/include
  endif
  
-diff -ur raidem-0.3.1-src.orig/src/map-editor/map-proc.m raidem-0.3.1-src/src/map-editor/map-proc.m
---- raidem-0.3.1-src.orig/src/map-editor/map-proc.m	2006-01-20 03:33:33.000000000 +0100
-+++ raidem-0.3.1-src/src/map-editor/map-proc.m	2006-04-09 20:47:00.000000000 +0200
-@@ -4,7 +4,7 @@
- #include <allegro.h>
- #include <assert.h>
- #include <math.h>
--#include "adime/include/adime.h"
-+#include <adime.h>
- #include "common.h"
- #include "group.h"
- #include "gui/gui-clip.h"


Index: raidem.spec
===================================================================
RCS file: /cvs/extras/rpms/raidem/devel/raidem.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- raidem.spec	6 Apr 2006 20:26:44 -0000	1.4
+++ raidem.spec	29 Apr 2006 18:56:35 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           raidem
-Version:        0.3
-Release:        2%{?dist}
+Version:        0.3.1
+Release:        1%{?dist}
 Summary:        2d top-down shoot'em up
 Group:          Amusements/Games
 License:        zlib License
@@ -10,13 +10,11 @@
 Source0:        %{name}-%{version}-src.zip
 Source1:        raidem.png
 Source2:        raidem.desktop
-Patch0:         raidem-0.3-no-mp3.patch
-Patch1:         raidem-0.3-syslibs.patch
-Patch2:         raidem-0.3-warn.patch
-Patch3:         raidem-0.3-loadpng.patch
+Patch0:         raidem-0.3.1-syslibs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gcc-objc glyph-keeper-devel freetype-devel adime-devel
-BuildRequires:  zziplib-devel libpng-devel desktop-file-utils
+BuildRequires:  zziplib-devel libpng-devel libid3tag-devel AllegroOGG-devel
+BuildRequires:  automake desktop-file-utils
 
 %description
 Raid'em is a 2d top-down shoot'em up. It began as a remake of Raid II
@@ -29,30 +27,29 @@
 
 %prep
 %setup -q -n %{name}-%{version}-src
-%patch0 -p1 -z .no_mp3
-%patch1 -p1 -z .syslibs
-%patch2 -p1 -z .warn
-%patch3 -p1 -z .loadpng
+%patch0 -p1 -z .syslibs
 # remove all included system libs, to avoid using the included system headers.
 mv lib/loadpng .
 rm -fr lib/*
 mv loadpng lib
+aclocal
+autoconf
 
 
 %build
-make %{?_smp_mflags} lib/loadpng/libldpng.a raid \
-  CFLAGS="$RPM_OPT_FLAGS -fsigned-char -Iinclude -Ilib -D__LINUX__ -DNO_MP3 \
-    -DNO_ID3TAGS -DNO_FBLEND -DGLYPH_TARGET=GLYPH_TARGET_ALLEGRO -DITOUCH \
-    -DRAIDEM_DATA_DIR=\\\"%{_datadir}/%{name}/\\\"" \
-  LDLIBS="-lglyph-alleg `freetype-config --libs` lib/loadpng/libldpng.a -lpng \
-    -lzzip -ladime `allegro-config --libs` -lz -lpthread -lobjc"
+# override _datadir otherwise it expects its datafile directly under /use/share
+%define _datadir /usr/share/%{name}
+%configure
+%define _datadir /use/share
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-#DIY, since the Makefile uses hardcoded ( := assigned) paths.
+# DIY, since the Makefile uses hardcoded ( := assigned) paths and install -s
+# and install -g games, etc. Fixable but this is easier
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
-install -m 755 raid $RPM_BUILD_ROOT%{_bindir}/%{name}
+install -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -a data demos maps $RPM_BUILD_ROOT%{_datadir}/%{name}
 
@@ -89,11 +86,16 @@
 %doc ChangeLog docs/LICENCE.txt docs/README.txt docs/damages.txt
 %{_bindir}/%{name}
 %{_datadir}/%{name}
-%{_datadir}/applications/fedora-raidem.desktop
-%{_datadir}/icons/hicolor/48x48/apps/raidem.png
+%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 
 
 %changelog
+* Sat Apr 29 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.1-1
+- New upstream release 0.3.1
+- Upstream has merged most patches, dropped.
+- Upstream has added ogg support (yeah!), add ogg and id3tag support.
+
 * Sun Apr  2 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3-2
 - Add missing RPM_OPT_FLAGS to CFLAGS
 - Add missing -D__LINUX__ to CFLAGS with this patch2 is no longer needed


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/raidem/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Mar 2006 18:43:34 -0000	1.2
+++ sources	29 Apr 2006 18:56:35 -0000	1.3
@@ -1 +1 @@
-7a8de682a0fe122e784cc192b19ece4e  raidem-0.3-src.zip
+5bb3fa98b43e86afa453f88a8d90bf64  raidem-0.3.1-src.zip


--- raidem-0.3-loadpng.patch DELETED ---


--- raidem-0.3-no-mp3.patch DELETED ---


--- raidem-0.3-syslibs.patch DELETED ---


--- raidem-0.3-warn.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Apr 29 21:20:17 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Sat, 29 Apr 2006 14:20:17 -0700
Subject: rpms/doctorj/devel doctorj.spec,1.14,1.15
Message-ID: <200604292120.k3TLKJHM025104@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/doctorj/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25057/devel

Modified Files:
	doctorj.spec 
Log Message:
- changed Requires and BuildRequires based on advise from Ville Skytt?? 
- made package noarch



Index: doctorj.spec
===================================================================
RCS file: /cvs/extras/rpms/doctorj/devel/doctorj.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- doctorj.spec	29 Apr 2006 02:42:46 -0000	1.14
+++ doctorj.spec	29 Apr 2006 21:20:17 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           doctorj
 Version:        5.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Java source code analyzer
 
 Group:          Development/Tools
@@ -8,10 +8,14 @@
 URL:            http://doctorj.sourceforge.net/
 Source:         http://download.sf.net/doctorj/%{name}-%{version}.tar.gz
 Patch0:		classpath_fix.patch
-Requires:	java-1.4.2-gcj-compat
-BuildRequires:	java-1.4.2-gcj-compat-devel
+
+Requires: jre
+BuildRequires: java-devel
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildArch:	noarch
+
 %description
 DoctorJ analyzes Java code, in the following functional areas:
 documentation verification, statistics generation and syntax analysis.
@@ -39,6 +43,10 @@
 %{_datadir}/%{name}
 
 %changelog
+* Sun Apr 30 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.0.0-3
+- based on advise from Ville Skytt??, changed buildrequires and requires
+- made package noarch
+
 * Sat Apr 29 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.0.0-2
 - added patch to export classpath
 - added requires on java-1.4.2-gcj-compat



From fedora-extras-commits at redhat.com  Sat Apr 29 21:20:11 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Sat, 29 Apr 2006 14:20:11 -0700
Subject: rpms/doctorj/FC-4 doctorj.spec,1.12,1.13
Message-ID: <200604292120.k3TLKhdC025107@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/doctorj/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25057/FC-4

Modified Files:
	doctorj.spec 
Log Message:
- changed Requires and BuildRequires based on advise from Ville Skytt?? 
- made package noarch



Index: doctorj.spec
===================================================================
RCS file: /cvs/extras/rpms/doctorj/FC-4/doctorj.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- doctorj.spec	29 Apr 2006 02:47:55 -0000	1.12
+++ doctorj.spec	29 Apr 2006 21:20:11 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           doctorj
 Version:        5.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Java source code analyzer
 
 Group:          Development/Tools
@@ -8,10 +8,14 @@
 URL:            http://doctorj.sourceforge.net/
 Source:         http://download.sf.net/doctorj/%{name}-%{version}.tar.gz
 Patch0:		classpath_fix.patch
-Requires:	java-1.4.2-gcj-compat
-BuildRequires:	java-1.4.2-gcj-compat-devel
+
+Requires: jre
+BuildRequires: java-devel
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildArch:	noarch
+
 %description
 DoctorJ analyzes Java code, in the following functional areas:
 documentation verification, statistics generation and syntax analysis.
@@ -39,6 +43,10 @@
 %{_datadir}/%{name}
 
 %changelog
+* Sun Apr 30 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.0.0-3
+- based on advise from Ville Skytt??, changed buildrequires and requires
+- made package noarch
+
 * Sat Apr 29 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.0.0-2
 - added patch to export classpath
 - added requires on java-1.4.2-gcj-compat



From fedora-extras-commits at redhat.com  Sat Apr 29 21:20:12 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Sat, 29 Apr 2006 14:20:12 -0700
Subject: rpms/doctorj/FC-5 doctorj.spec,1.13,1.14
Message-ID: <200604292120.k3TLKic2025110@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/doctorj/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25057/FC-5

Modified Files:
	doctorj.spec 
Log Message:
- changed Requires and BuildRequires based on advise from Ville Skytt?? 
- made package noarch



Index: doctorj.spec
===================================================================
RCS file: /cvs/extras/rpms/doctorj/FC-5/doctorj.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- doctorj.spec	29 Apr 2006 02:47:56 -0000	1.13
+++ doctorj.spec	29 Apr 2006 21:20:11 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           doctorj
 Version:        5.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Java source code analyzer
 
 Group:          Development/Tools
@@ -8,10 +8,14 @@
 URL:            http://doctorj.sourceforge.net/
 Source:         http://download.sf.net/doctorj/%{name}-%{version}.tar.gz
 Patch0:		classpath_fix.patch
-Requires:	java-1.4.2-gcj-compat
-BuildRequires:	java-1.4.2-gcj-compat-devel
+
+Requires: jre
+BuildRequires: java-devel
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildArch:	noarch
+
 %description
 DoctorJ analyzes Java code, in the following functional areas:
 documentation verification, statistics generation and syntax analysis.
@@ -39,6 +43,10 @@
 %{_datadir}/%{name}
 
 %changelog
+* Sun Apr 30 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.0.0-3
+- based on advise from Ville Skytt??, changed buildrequires and requires
+- made package noarch
+
 * Sat Apr 29 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.0.0-2
 - added patch to export classpath
 - added requires on java-1.4.2-gcj-compat



From fedora-extras-commits at redhat.com  Sat Apr 29 21:23:15 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Sat, 29 Apr 2006 14:23:15 -0700
Subject: rpms/doctorj/FC-4 doctorj.spec,1.13,1.14
Message-ID: <200604292123.k3TLNHiR025245@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/doctorj/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25226

Modified Files:
	doctorj.spec 
Log Message:
bumped release cuz I messed up the tag for FC4



Index: doctorj.spec
===================================================================
RCS file: /cvs/extras/rpms/doctorj/FC-4/doctorj.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- doctorj.spec	29 Apr 2006 21:20:11 -0000	1.13
+++ doctorj.spec	29 Apr 2006 21:23:15 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           doctorj
 Version:        5.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Java source code analyzer
 
 Group:          Development/Tools



From fedora-extras-commits at redhat.com  Sat Apr 29 21:56:10 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Sat, 29 Apr 2006 14:56:10 -0700
Subject: rpms/doctorj/FC-5 doctorj.spec,1.14,1.15
Message-ID: <200604292156.k3TLuClW025358@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/doctorj/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25341

Modified Files:
	doctorj.spec 
Log Message:
bump release so FC4 is not newer than FC5, avoid breaking things. 



Index: doctorj.spec
===================================================================
RCS file: /cvs/extras/rpms/doctorj/FC-5/doctorj.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- doctorj.spec	29 Apr 2006 21:20:11 -0000	1.14
+++ doctorj.spec	29 Apr 2006 21:56:10 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           doctorj
 Version:        5.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Java source code analyzer
 
 Group:          Development/Tools



From fedora-extras-commits at redhat.com  Sat Apr 29 21:57:38 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Sat, 29 Apr 2006 14:57:38 -0700
Subject: rpms/doctorj/devel doctorj.spec,1.15,1.16
Message-ID: <200604292157.k3TLveBm025419@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/doctorj/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25402

Modified Files:
	doctorj.spec 
Log Message:
bump release so FC4 is not newer than devel, avoid breaking things.




Index: doctorj.spec
===================================================================
RCS file: /cvs/extras/rpms/doctorj/devel/doctorj.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- doctorj.spec	29 Apr 2006 21:20:17 -0000	1.15
+++ doctorj.spec	29 Apr 2006 21:57:37 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           doctorj
 Version:        5.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Java source code analyzer
 
 Group:          Development/Tools



From fedora-extras-commits at redhat.com  Sat Apr 29 22:58:16 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 29 Apr 2006 15:58:16 -0700
Subject: rpms/bsd-games/devel bsd-games.spec,1.1,1.2
Message-ID: <200604292258.k3TMwICc027908@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/bsd-games/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27891

Modified Files:
	bsd-games.spec 
Log Message:
- Simplify files section
- Remove unnecessary comment
- Mark scoreboard files as %%config





Index: bsd-games.spec
===================================================================
RCS file: /cvs/extras/rpms/bsd-games/devel/bsd-games.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bsd-games.spec	29 Apr 2006 15:34:43 -0000	1.1
+++ bsd-games.spec	29 Apr 2006 22:58:16 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Collection of text-based games
 Name: bsd-games
 Version: 2.17
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: BSD
 Group: Amusements/Games
 URL: ftp://metalab.unc.edu/pub/Linux/games/
@@ -19,9 +19,6 @@
 Patch6: bsd-games-2.17-hackgid.patch
 Patch7: bsd-games-2.17-phantasiagid.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# It looks like textutils became coreutils at some point.  I'm not sure
-# what is needed from it, so I'm commenting it out until I can find out.
-#Requires: textutils
 BuildRequires: ncurses-devel libtermcap-devel words
 Requires(Pre): /usr/sbin/groupadd
 
@@ -131,36 +128,33 @@
 %{_bindir}/worms
 %{_bindir}/wtf
 %{_bindir}/wump
-%dir %{_datadir}/bsd-games
-%{_datadir}/bsd-games/atc
-%{_datadir}/bsd-games/boggle
-%{_datadir}/bsd-games/cribbage.instr
-%{_datadir}/bsd-games/fish.instr
-%{_datadir}/bsd-games/monop-cards.pck
-%{_datadir}/bsd-games/quiz
-%{_datadir}/bsd-games/wump.info
+%{_datadir}/%{name}
 %{_datadir}/misc/acronyms
 %{_datadir}/misc/acronyms.comp
 %{_mandir}/man6/*
 %{_sbindir}/huntd
-%attr(664,root,games) %{_var}/games/atc_score
-%attr(664,root,games) %{_var}/games/battlestar.log
-%attr(664,root,games) %{_var}/games/cfscores
-%attr(664,root,games) %{_var}/games/criblog
-%{_datadir}/bsd-games/hack/
+%config %attr(664,root,games) %{_var}/games/atc_score
+%config %attr(664,root,games) %{_var}/games/battlestar.log
+%config %attr(664,root,games) %{_var}/games/cfscores
+%config %attr(664,root,games) %{_var}/games/criblog
 %dir %attr(0775,root,gamehack) %{_var}/games/hack
-%attr(664,root,gamehack) %{_var}/games/hack/*
+%config %attr(664,root,gamehack) %{_var}/games/hack/*
 %dir %attr(775,root,gamephant) %{_var}/games/phantasia
-%attr(664,root,gamephant) %{_var}/games/phantasia/*
+%config %attr(664,root,gamephant) %{_var}/games/phantasia/*
 %dir %attr(775,root,gamesail) %{_var}/games/sail
-%attr(644,root,games) %{_var}/games/robots_roll
-%attr(664,root,gamesail) %{_var}/games/saillog
-%attr(664,root,games) %{_var}/games/snake.log
-%attr(664,root,games) %{_var}/games/snakerawscores
-%attr(664,root,games) %{_var}/games/tetris-bsd.scores
+%config %attr(644,root,games) %{_var}/games/robots_roll
+%config %attr(664,root,gamesail) %{_var}/games/saillog
+%config %attr(664,root,games) %{_var}/games/snake.log
+%config %attr(664,root,games) %{_var}/games/snakerawscores
+%config %attr(664,root,games) %{_var}/games/tetris-bsd.scores
 %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me
 
 %changelog
+* Sat Apr 29 2006 Wart <wart at kobold.org> 2.17-9
+- Simplify files section
+- Remove unnecessary comment
+- Mark scoreboard files as %%config
+
 * Fri Apr 28 2006 Wart <wart at kobold.org> 2.17-8
 - Fix directory ownership of _datadir/bsd-games
 - Change license to BSD



From fedora-extras-commits at redhat.com  Sat Apr 29 22:59:14 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 29 Apr 2006 15:59:14 -0700
Subject: rpms/bsd-games/FC-4 bsd-games.spec,1.1,1.2
Message-ID: <200604292259.k3TMxGAH027988@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/bsd-games/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27957/FC-4

Modified Files:
	bsd-games.spec 
Log Message:
- Simplify files section
- Remove unnecessary comment
- Mark scoreboard files as %%config




Index: bsd-games.spec
===================================================================
RCS file: /cvs/extras/rpms/bsd-games/FC-4/bsd-games.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bsd-games.spec	29 Apr 2006 15:34:43 -0000	1.1
+++ bsd-games.spec	29 Apr 2006 22:59:13 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Collection of text-based games
 Name: bsd-games
 Version: 2.17
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: BSD
 Group: Amusements/Games
 URL: ftp://metalab.unc.edu/pub/Linux/games/
@@ -19,9 +19,6 @@
 Patch6: bsd-games-2.17-hackgid.patch
 Patch7: bsd-games-2.17-phantasiagid.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# It looks like textutils became coreutils at some point.  I'm not sure
-# what is needed from it, so I'm commenting it out until I can find out.
-#Requires: textutils
 BuildRequires: ncurses-devel libtermcap-devel words
 Requires(Pre): /usr/sbin/groupadd
 
@@ -131,36 +128,33 @@
 %{_bindir}/worms
 %{_bindir}/wtf
 %{_bindir}/wump
-%dir %{_datadir}/bsd-games
-%{_datadir}/bsd-games/atc
-%{_datadir}/bsd-games/boggle
-%{_datadir}/bsd-games/cribbage.instr
-%{_datadir}/bsd-games/fish.instr
-%{_datadir}/bsd-games/monop-cards.pck
-%{_datadir}/bsd-games/quiz
-%{_datadir}/bsd-games/wump.info
+%{_datadir}/%{name}
 %{_datadir}/misc/acronyms
 %{_datadir}/misc/acronyms.comp
 %{_mandir}/man6/*
 %{_sbindir}/huntd
-%attr(664,root,games) %{_var}/games/atc_score
-%attr(664,root,games) %{_var}/games/battlestar.log
-%attr(664,root,games) %{_var}/games/cfscores
-%attr(664,root,games) %{_var}/games/criblog
-%{_datadir}/bsd-games/hack/
+%config %attr(664,root,games) %{_var}/games/atc_score
+%config %attr(664,root,games) %{_var}/games/battlestar.log
+%config %attr(664,root,games) %{_var}/games/cfscores
+%config %attr(664,root,games) %{_var}/games/criblog
 %dir %attr(0775,root,gamehack) %{_var}/games/hack
-%attr(664,root,gamehack) %{_var}/games/hack/*
+%config %attr(664,root,gamehack) %{_var}/games/hack/*
 %dir %attr(775,root,gamephant) %{_var}/games/phantasia
-%attr(664,root,gamephant) %{_var}/games/phantasia/*
+%config %attr(664,root,gamephant) %{_var}/games/phantasia/*
 %dir %attr(775,root,gamesail) %{_var}/games/sail
-%attr(644,root,games) %{_var}/games/robots_roll
-%attr(664,root,gamesail) %{_var}/games/saillog
-%attr(664,root,games) %{_var}/games/snake.log
-%attr(664,root,games) %{_var}/games/snakerawscores
-%attr(664,root,games) %{_var}/games/tetris-bsd.scores
+%config %attr(644,root,games) %{_var}/games/robots_roll
+%config %attr(664,root,gamesail) %{_var}/games/saillog
+%config %attr(664,root,games) %{_var}/games/snake.log
+%config %attr(664,root,games) %{_var}/games/snakerawscores
+%config %attr(664,root,games) %{_var}/games/tetris-bsd.scores
 %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me
 
 %changelog
+* Sat Apr 29 2006 Wart <wart at kobold.org> 2.17-9
+- Simplify files section
+- Remove unnecessary comment
+- Mark scoreboard files as %%config
+
 * Fri Apr 28 2006 Wart <wart at kobold.org> 2.17-8
 - Fix directory ownership of _datadir/bsd-games
 - Change license to BSD



From fedora-extras-commits at redhat.com  Sat Apr 29 22:59:14 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 29 Apr 2006 15:59:14 -0700
Subject: rpms/bsd-games/FC-5 bsd-games.spec,1.1,1.2
Message-ID: <200604292259.k3TMxG2l027992@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-serv27957/FC-5

Modified Files:
	bsd-games.spec 
Log Message:
- Simplify files section
- Remove unnecessary comment
- Mark scoreboard files as %%config




Index: bsd-games.spec
===================================================================
RCS file: /cvs/extras/rpms/bsd-games/FC-5/bsd-games.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bsd-games.spec	29 Apr 2006 15:34:43 -0000	1.1
+++ bsd-games.spec	29 Apr 2006 22:59:14 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Collection of text-based games
 Name: bsd-games
 Version: 2.17
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: BSD
 Group: Amusements/Games
 URL: ftp://metalab.unc.edu/pub/Linux/games/
@@ -19,9 +19,6 @@
 Patch6: bsd-games-2.17-hackgid.patch
 Patch7: bsd-games-2.17-phantasiagid.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# It looks like textutils became coreutils at some point.  I'm not sure
-# what is needed from it, so I'm commenting it out until I can find out.
-#Requires: textutils
 BuildRequires: ncurses-devel libtermcap-devel words
 Requires(Pre): /usr/sbin/groupadd
 
@@ -131,36 +128,33 @@
 %{_bindir}/worms
 %{_bindir}/wtf
 %{_bindir}/wump
-%dir %{_datadir}/bsd-games
-%{_datadir}/bsd-games/atc
-%{_datadir}/bsd-games/boggle
-%{_datadir}/bsd-games/cribbage.instr
-%{_datadir}/bsd-games/fish.instr
-%{_datadir}/bsd-games/monop-cards.pck
-%{_datadir}/bsd-games/quiz
-%{_datadir}/bsd-games/wump.info
+%{_datadir}/%{name}
 %{_datadir}/misc/acronyms
 %{_datadir}/misc/acronyms.comp
 %{_mandir}/man6/*
 %{_sbindir}/huntd
-%attr(664,root,games) %{_var}/games/atc_score
-%attr(664,root,games) %{_var}/games/battlestar.log
-%attr(664,root,games) %{_var}/games/cfscores
-%attr(664,root,games) %{_var}/games/criblog
-%{_datadir}/bsd-games/hack/
+%config %attr(664,root,games) %{_var}/games/atc_score
+%config %attr(664,root,games) %{_var}/games/battlestar.log
+%config %attr(664,root,games) %{_var}/games/cfscores
+%config %attr(664,root,games) %{_var}/games/criblog
 %dir %attr(0775,root,gamehack) %{_var}/games/hack
-%attr(664,root,gamehack) %{_var}/games/hack/*
+%config %attr(664,root,gamehack) %{_var}/games/hack/*
 %dir %attr(775,root,gamephant) %{_var}/games/phantasia
-%attr(664,root,gamephant) %{_var}/games/phantasia/*
+%config %attr(664,root,gamephant) %{_var}/games/phantasia/*
 %dir %attr(775,root,gamesail) %{_var}/games/sail
-%attr(644,root,games) %{_var}/games/robots_roll
-%attr(664,root,gamesail) %{_var}/games/saillog
-%attr(664,root,games) %{_var}/games/snake.log
-%attr(664,root,games) %{_var}/games/snakerawscores
-%attr(664,root,games) %{_var}/games/tetris-bsd.scores
+%config %attr(644,root,games) %{_var}/games/robots_roll
+%config %attr(664,root,gamesail) %{_var}/games/saillog
+%config %attr(664,root,games) %{_var}/games/snake.log
+%config %attr(664,root,games) %{_var}/games/snakerawscores
+%config %attr(664,root,games) %{_var}/games/tetris-bsd.scores
 %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me
 
 %changelog
+* Sat Apr 29 2006 Wart <wart at kobold.org> 2.17-9
+- Simplify files section
+- Remove unnecessary comment
+- Mark scoreboard files as %%config
+
 * Fri Apr 28 2006 Wart <wart at kobold.org> 2.17-8
 - Fix directory ownership of _datadir/bsd-games
 - Change license to BSD



From fedora-extras-commits at redhat.com  Sun Apr 30 04:28:33 2006
From: fedora-extras-commits at redhat.com (Rick L. Vinyard (rvinyard))
Date: Sat, 29 Apr 2006 21:28:33 -0700
Subject: rpms/cairomm - New directory
Message-ID: <200604300428.k3U4SZ9f010638@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/cairomm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10617/cairomm

Log Message:
Directory /cvs/extras/rpms/cairomm added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 30 04:28:33 2006
From: fedora-extras-commits at redhat.com (Rick L. Vinyard (rvinyard))
Date: Sat, 29 Apr 2006 21:28:33 -0700
Subject: rpms/cairomm/devel - New directory
Message-ID: <200604300428.k3U4SZJB010641@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/cairomm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10617/cairomm/devel

Log Message:
Directory /cvs/extras/rpms/cairomm/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 30 04:28:46 2006
From: fedora-extras-commits at redhat.com (Rick L. Vinyard (rvinyard))
Date: Sat, 29 Apr 2006 21:28:46 -0700
Subject: rpms/cairomm Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604300428.k3U4SmsP010695@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/cairomm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10662

Added Files:
	Makefile import.log 
Log Message:
Setup of module cairomm


--- NEW FILE Makefile ---
# Top level Makefile for module cairomm
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Apr 30 04:28:47 2006
From: fedora-extras-commits at redhat.com (Rick L. Vinyard (rvinyard))
Date: Sat, 29 Apr 2006 21:28:47 -0700
Subject: rpms/cairomm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604300428.k3U4SnoX010698@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/cairomm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10662/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cairomm


--- 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 Apr 30 04:29:16 2006
From: fedora-extras-commits at redhat.com (Rick L. Vinyard (rvinyard))
Date: Sat, 29 Apr 2006 21:29:16 -0700
Subject: rpms/cairomm/devel cairomm.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604300429.k3U4Tmp6010764@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/cairomm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10726/devel

Modified Files:
	.cvsignore sources 
Added Files:
	cairomm.spec 
Log Message:
auto-import cairomm-0.6.0-1 on branch devel from cairomm-0.6.0-1.src.rpm


--- NEW FILE cairomm.spec ---
Summary:          This library provides a C++ interface to cairo
Name:             cairomm
Version:          0.6.0
Release:          1%{?dist}
URL:		  http://www.cairographics.org
License:	  LGPL
Group:            System Environment/Libraries
Source:		  http://www.cairographics.org/releases/%{name}-%{version}.tar.gz
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:    cairo-devel >= 1.0.4 pkgconfig

%description
This library provides a C++ interface to cairo.

%package        devel
Summary:        Headers for developing programs that will use %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       cairo-devel >= 1.0.4 pkgconfig

%description    devel
This package contains the libraries and header files needed for
developing %{name} applications.

%prep
%setup -q 

%build
%configure --enable-static=no --enable-docs=no
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
make DESTDIR=%{buildroot} install
find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
mv docs/reference/html .

%clean
%{__rm} -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README NEWS
%{_libdir}/lib*.so.*

%files devel
%defattr(-,root,root,-)
%{_libdir}/*.so
%{_libdir}/pkgconfig/*
%{_includedir}/cairomm-1.0/
%doc ChangeLog html

%changelog
* Sun Apr  9 2006 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.6.0-1
- New upstream version should fix the upstream issues like AUTHORS and README
- Added pkgconfig to cairomm BuildRequires and cairomm-devel Requires
- Replaced makeinstall
- Fixed devel package description
- Modified includedir syntax
- docs included via the mv in install and in the devel files as html dir

* Sun Mar  5 2006 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.5.0-10
- Removed duplicate Group tag in devel
- Disabled docs till they're fixed upstream 

* Sun Mar  5 2006 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.5.0-9
- Removed requires since BuildRequires is present
- Cleaned up Source tag

* Fri Feb 24 2006 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.5.0-7
- Fixed URL and SOURCE tags
- Fixed header include directory

* Fri Feb 24 2006 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.5.0-6
- Fixed URL tag

* Wed Feb 22 2006 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.5.0-5
- Remove epoch 'leftovers'

* Wed Feb 22 2006 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.5.0-4
- Cleanup for FE

* Wed Feb 22 2006 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.5.0-3
- Added pre-release alphatag

* Wed Feb 22 2006 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.5.0-2
- Updated to current cairomm CVS
- Added documentation to devel package

* Fri Feb 03 2006 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.5.0-1
- Updated to current cairomm CVS

* Fri Jan 27 2006 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.4.0-1
- Initial creation from papyrus.spec.in



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairomm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Apr 2006 04:28:47 -0000	1.1
+++ .cvsignore	30 Apr 2006 04:29:16 -0000	1.2
@@ -0,0 +1 @@
+cairomm-0.6.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairomm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Apr 2006 04:28:47 -0000	1.1
+++ sources	30 Apr 2006 04:29:16 -0000	1.2
@@ -0,0 +1 @@
+9d967cf486b0ac59d451d47922c99e6f  cairomm-0.6.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 30 04:29:15 2006
From: fedora-extras-commits at redhat.com (Rick L. Vinyard (rvinyard))
Date: Sat, 29 Apr 2006 21:29:15 -0700
Subject: rpms/cairomm import.log,1.1,1.2
Message-ID: <200604300429.k3U4TlYl010760@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/cairomm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10726

Modified Files:
	import.log 
Log Message:
auto-import cairomm-0.6.0-1 on branch devel from cairomm-0.6.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/cairomm/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Apr 2006 04:28:46 -0000	1.1
+++ import.log	30 Apr 2006 04:29:15 -0000	1.2
@@ -0,0 +1 @@
+cairomm-0_6_0-1:HEAD:cairomm-0.6.0-1.src.rpm:1146371372



From fedora-extras-commits at redhat.com  Sun Apr 30 04:34:40 2006
From: fedora-extras-commits at redhat.com (Rick L. Vinyard (rvinyard))
Date: Sat, 29 Apr 2006 21:34:40 -0700
Subject: owners owners.list,1.921,1.922
Message-ID: <200604300434.k3U4Ygea010836@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10817

Modified Files:
	owners.list 
Log Message:
Added cairomm entry



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.921
retrieving revision 1.922
diff -u -r1.921 -r1.922
--- owners.list	29 Apr 2006 16:34:08 -0000	1.921
+++ owners.list	30 Apr 2006 04:34:39 -0000	1.922
@@ -107,6 +107,7 @@
 Fedora Extras|c-ares|A library that performs asynchronous DNS operations|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|cabextract|A Microsoft Cabinet file extractor|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|cacti|An rrd based graphing tool|imlinux at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|cairomm|C++ wrapper for cairo|rvinyard at cs.nmsu.edu|extras-qa at fedoraproject.org|
 Fedora Extras|camE|Rewrite of the xawtv webcam app, which adds imlib2 support|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|camstream|CamStream - a set of programs to make use of your webcam|nomis80 at nomis80.org|extras-qa at fedoraproject.org|
 Fedora Extras|Canna|A Japanese character set input system|tagoh at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Apr 30 05:03:15 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sat, 29 Apr 2006 22:03:15 -0700
Subject: rpms/qof/FC-5 qof-x86_64.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 qof.spec, 1.12, 1.13 sources, 1.3, 1.4 qof-0.6.1-build.patch,
	1.1, NONE qof-dependencies.patch, 1.1, NONE
Message-ID: <200604300503.k3U53lXI013079@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/qof/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13024

Modified Files:
	.cvsignore qof.spec sources 
Added Files:
	qof-x86_64.patch 
Removed Files:
	qof-0.6.1-build.patch qof-dependencies.patch 
Log Message:
* Mon Apr 17 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.6.4-1
- Update to qof 0.6.4.
- Patch a small compile problem in building tests on x86_64.


qof-x86_64.patch:

--- NEW FILE qof-x86_64.patch ---
Index: qof-0.6.4/qof/test/test-date.c
===================================================================
--- qof-0.6.4.orig/qof/test/test-date.c
+++ qof-0.6.4/qof/test/test-date.c
@@ -93,8 +93,8 @@ check_conversion (const char * str, Time
   if ((expected_ts.tv_sec != ts.tv_sec) || (expected_ts.tv_nsec != ts.tv_nsec)) 
   {
     fprintf (stderr, 
-             "\nmis-converted \"%s\" to %lld.%09ld seconds\n"
-             "\twas expecting %lld.%09ld seconds\n", 
+             "\nmis-converted \"%s\" to %" G_GUINT64_FORMAT ".%09ld seconds\n"
+             "\twas expecting %" G_GUINT64_FORMAT ".%09ld seconds\n", 
              str, ts.tv_sec, ts.tv_nsec, 
              expected_ts.tv_sec, expected_ts.tv_nsec); 
     failure ("misconverted timespec");


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qof/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Jan 2006 18:50:01 -0000	1.3
+++ .cvsignore	30 Apr 2006 05:03:15 -0000	1.4
@@ -1 +1 @@
-qof-0.6.1.tar.gz
+qof-0.6.4.tar.gz


Index: qof.spec
===================================================================
RCS file: /cvs/extras/rpms/qof/FC-5/qof.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- qof.spec	13 Feb 2006 18:09:57 -0000	1.12
+++ qof.spec	30 Apr 2006 05:03:15 -0000	1.13
@@ -1,14 +1,13 @@
 Name:           qof
-Version:        0.6.1
-Release:        2%{?dist}
+Version:        0.6.4
+Release:        1%{?dist}
 Summary:        Query engine library for C objects
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://qof.sf.net
 Source0:        http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:		qof-0.6.1-build.patch
-Patch1:		qof-dependencies.patch
+Patch0: qof-x86_64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libxml2-devel
@@ -17,8 +16,6 @@
 BuildRequires: intltool
 # qof doesn't ship with pre-built documentation
 BuildRequires: doxygen
-# Patch1 modifies configure.in so we have to use autoconf
-BuildRequires: autoconf
 
 %description
 QOF - The Query Object Framework is a C library that provides a query engine
@@ -67,10 +64,8 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
-autoconf --force
 %configure --disable-static
 make
 
@@ -119,6 +114,10 @@
 %doc html
 
 %changelog
+* Mon Apr 17 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.6.4-1
+- Update to qof 0.6.4.
+- Patch a small compile problem in building tests on x86_64.
+  
 * Mon Feb 13 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.6.1-2
 - Bump and rebuild for FC5.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qof/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Jan 2006 18:50:01 -0000	1.3
+++ sources	30 Apr 2006 05:03:15 -0000	1.4
@@ -1 +1 @@
-2a1c4b231fb03e49d5d9237dc6698c3e  qof-0.6.1.tar.gz
+555787c7ea06a3412ff9119fe4127886  qof-0.6.4.tar.gz


--- qof-0.6.1-build.patch DELETED ---


--- qof-dependencies.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Apr 30 06:40:10 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 29 Apr 2006 23:40:10 -0700
Subject: rpms/AllegroOGG - New directory
Message-ID: <200604300640.k3U6eCri015492@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/AllegroOGG
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15466/AllegroOGG

Log Message:
Directory /cvs/extras/rpms/AllegroOGG added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 30 06:40:11 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 29 Apr 2006 23:40:11 -0700
Subject: rpms/AllegroOGG/devel - New directory
Message-ID: <200604300640.k3U6eDP7015495@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/AllegroOGG/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15466/AllegroOGG/devel

Log Message:
Directory /cvs/extras/rpms/AllegroOGG/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 30 06:40:26 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 29 Apr 2006 23:40:26 -0700
Subject: rpms/AllegroOGG Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604300640.k3U6eSBK015544@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/AllegroOGG
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15511

Added Files:
	Makefile import.log 
Log Message:
Setup of module AllegroOGG


--- NEW FILE Makefile ---
# Top level Makefile for module AllegroOGG
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 30 06:40:26 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 29 Apr 2006 23:40:26 -0700
Subject: rpms/AllegroOGG/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604300640.k3U6eSXa015547@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/AllegroOGG/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15511/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module AllegroOGG


--- 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 Apr 30 06:41:33 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 29 Apr 2006 23:41:33 -0700
Subject: rpms/AllegroOGG import.log,1.1,1.2
Message-ID: <200604300641.k3U6fZ10015614@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/AllegroOGG
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15580

Modified Files:
	import.log 
Log Message:
auto-import AllegroOGG-1.0.3-2 on branch devel from AllegroOGG-1.0.3-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/AllegroOGG/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Apr 2006 06:40:25 -0000	1.1
+++ import.log	30 Apr 2006 06:41:33 -0000	1.2
@@ -0,0 +1 @@
+AllegroOGG-1_0_3-2:HEAD:AllegroOGG-1.0.3-2.src.rpm:1146379228



From fedora-extras-commits at redhat.com  Sun Apr 30 06:41:34 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 29 Apr 2006 23:41:34 -0700
Subject: rpms/AllegroOGG/devel AllegroOGG.pc.in, NONE, 1.1 AllegroOGG.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604300641.k3U6faGa015619@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/AllegroOGG/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15580/devel

Modified Files:
	.cvsignore sources 
Added Files:
	AllegroOGG.pc.in AllegroOGG.spec 
Log Message:
auto-import AllegroOGG-1.0.3-2 on branch devel from AllegroOGG-1.0.3-2.src.rpm


--- NEW FILE AllegroOGG.pc.in ---
prefix=@prefix@
exec_prefix=@prefix@
libdir=@libdir@
includedir=@includedir@

Name: @name@
Description: Ogg library for use with the Allegro game library
Version: @version@
Libs:   -l at name@
Cflags: -I${includedir}/@name@


--- NEW FILE AllegroOGG.spec ---
Name:		AllegroOGG
Version: 	1.0.3
Release:        2%{?dist}
Summary:        Ogg library for use with the Allegro game library
Group:          System Environment/Libraries
License:	BSD
URL:		http://nekros.freeshell.org/delirium/alogg.html
Source0:        http://www.hero6.com/filereviver/alogg.zip
Source1:        AllegroOGG.pc.in
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	allegro-devel libvorbis-devel

%description
%{name} is an Allegro wrapper for the Ogg Vorbis decoder from the Xiph.org
foundation. This lib lets you play OGGs and convert OGGs to Allegro SAMPLEs
amongst a lot of other capabilites.


%package devel
Summary:	Developmental libraries and include files for AllegroOgg
Group:		Development/Libraries
Requires:	%{name} = %{version}
Requires:	allegro-devel pkgconfig

%description devel
Development libraries and include files for developing applications using
the %{name} library.


%prep
%setup -q -c
%{__sed} -i 's/\r//' docs/A*.txt
%{__sed} -e "s#@prefix@#%{_prefix}#g" -e "s#@libdir@#%{_libdir}#g" \
  -e "s#@includedir@#%{_includedir}#g" -e "s#@version@#%{version}#g" \
  -e "s#@name@#%{name}#" %{SOURCE1} > %{name}.pc

%build
# makefile doesn't support creating an .so, and wants to use its own version
# of libogg and libvorbis and there is only one source file so lets DIY
gcc $RPM_OPT_FLAGS -fPIC -DPIC -Iinclude -c src/alogg.c -o src/alogg.o
gcc -g -shared -Wl,-soname=lib%{name}.so.0 -o lib%{name}.so.0 \
  src/alogg.o -logg -lvorbis -lvorbisfile \
  `allegro-config --libs | sed 's/-lalleg_unsharable//'`


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
install -m 755 lib%{name}.so.0 $RPM_BUILD_ROOT%{_libdir}
ln -s lib%{name}.so.0 $RPM_BUILD_ROOT%{_libdir}/lib%{name}.so
install -m 644 %{name}.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig

mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}
install -m 644 include/* $RPM_BUILD_ROOT%{_includedir}/%{name}


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc docs/*.txt
%{_libdir}/*.so.*

%files devel
%{_includedir}/%{name}
%{_libdir}/*.so
%{_libdir}/pkgconfig/%{name}.pc


%changelog
* Sat Apr 20 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0.3-2
- Rename .so file from liballog.so(.0) to libAllegroOGG.so(.0) and put the
  headers in /usr/include/AllegroOGG to avoid any future conflicts with the
  (unpackaged) alogg library which unsurprisingly installs libalogg.so too.
- Add a pkgconfig file to allow apps to get the proper CFLAGS and LIBS for
  this change. (bz 188625)

* Tue Apr 11 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0.3-1
- Initial spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/AllegroOGG/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Apr 2006 06:40:26 -0000	1.1
+++ .cvsignore	30 Apr 2006 06:41:34 -0000	1.2
@@ -0,0 +1 @@
+alogg.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/AllegroOGG/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Apr 2006 06:40:26 -0000	1.1
+++ sources	30 Apr 2006 06:41:34 -0000	1.2
@@ -0,0 +1 @@
+b4e99081acdb4bedb3206bdfb3b4d209  alogg.zip



From fedora-extras-commits at redhat.com  Sun Apr 30 06:49:25 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 29 Apr 2006 23:49:25 -0700
Subject: owners owners.list,1.922,1.923
Message-ID: <200604300649.k3U6nSpO015700@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15681/owners

Modified Files:
	owners.list 
Log Message:
add AllegroOGG


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.922
retrieving revision 1.923
diff -u -r1.922 -r1.923
--- owners.list	30 Apr 2006 04:34:39 -0000	1.922
+++ owners.list	30 Apr 2006 06:49:25 -0000	1.923
@@ -27,6 +27,7 @@
 Fedora Extras|akode|Audio-decoding framework|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|alacarte|Simple menu editor for GNOME|jpmahowald at gmail.com|extras-qa at fedoraproject.org|foolish at guezz.net
 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|alltray|Dock any application in the tray|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|alsa-firmware|Firmware for several ALSA-Supported soundcards|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|alsa-tools|The ALSA Tools|fedora at leemhuis.info|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Apr 30 07:30:52 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sun, 30 Apr 2006 00:30:52 -0700
Subject: owners owners.list,1.923,1.924
Message-ID: <200604300730.k3U7Us9O018048@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18031

Modified Files:
	owners.list 
Log Message:
Added bsd-games




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.923
retrieving revision 1.924
diff -u -r1.923 -r1.924
--- owners.list	30 Apr 2006 06:49:25 -0000	1.923
+++ owners.list	30 Apr 2006 07:30:52 -0000	1.924
@@ -95,6 +95,7 @@
 Fedora Extras|bochs|Bochs Project x86 PC Emulator|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|bonnie++|Bonnie++ filesystem and disk benchmark & burn-in suite|wtogami at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|brightside|Add reactivity to the corners and edges of your GNOME desktop|fedora at leemhuis.info|extras-qa at fedoraproject.org|
+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|
 Fedora Extras|bubblemon|A system monitoring dockapp|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|buildsystem|Fedora-Extras Buildsystem|skvidal at phy.duke.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Apr 30 07:31:43 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sun, 30 Apr 2006 00:31:43 -0700
Subject: comps comps-fe5.xml.in,1.41,1.42 comps-fe6.xml.in,1.4,1.5
Message-ID: <200604300731.k3U7VjNx018078@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18059

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in 
Log Message:
Added bsd-games collection




Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- comps-fe5.xml.in	29 Apr 2006 17:48:56 -0000	1.41
+++ comps-fe5.xml.in	30 Apr 2006 07:31:43 -0000	1.42
@@ -199,6 +199,7 @@
     <uservisible>true</uservisible>
     <packagelist>
         <packagereq type="optional">abe</packagereq>
+        <packagereq type="optional">bsd-games</packagereq>
         <packagereq type="optional">bzflag</packagereq>
         <packagereq type="optional">celestia</packagereq>
         <packagereq type="optional">cgoban</packagereq>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- comps-fe6.xml.in	29 Apr 2006 17:48:56 -0000	1.4
+++ comps-fe6.xml.in	30 Apr 2006 07:31:43 -0000	1.5
@@ -199,6 +199,7 @@
     <uservisible>true</uservisible>
     <packagelist>
         <packagereq type="optional">abe</packagereq>
+        <packagereq type="optional">bsd-games</packagereq>
         <packagereq type="optional">bzflag</packagereq>
         <packagereq type="optional">celestia</packagereq>
         <packagereq type="optional">cgoban</packagereq>



From fedora-extras-commits at redhat.com  Sun Apr 30 07:50:56 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 30 Apr 2006 00:50:56 -0700
Subject: rpms/gcompris - New directory
Message-ID: <200604300750.k3U7owFR018189@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gcompris
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18162/gcompris

Log Message:
Directory /cvs/extras/rpms/gcompris added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 30 07:50:57 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 30 Apr 2006 00:50:57 -0700
Subject: rpms/gcompris/devel - New directory
Message-ID: <200604300751.k3U7ox00018192@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gcompris/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18162/gcompris/devel

Log Message:
Directory /cvs/extras/rpms/gcompris/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 30 07:51:17 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 30 Apr 2006 00:51:17 -0700
Subject: rpms/gcompris Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604300751.k3U7pJTk018241@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gcompris
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18208

Added Files:
	Makefile import.log 
Log Message:
Setup of module gcompris


--- NEW FILE Makefile ---
# Top level Makefile for module gcompris
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 30 07:51:18 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 30 Apr 2006 00:51:18 -0700
Subject: rpms/gcompris/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604300751.k3U7pK6t018244@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gcompris/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18208/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gcompris


--- 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 Apr 30 08:28:51 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 30 Apr 2006 01:28:51 -0700
Subject: rpms/gcompris import.log,1.1,1.2
Message-ID: <200604300828.k3U8Srs6020584@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gcompris
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20545

Modified Files:
	import.log 
Log Message:
auto-import gcompris-7.4-4 on branch devel from gcompris-7.4-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gcompris/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Apr 2006 07:51:17 -0000	1.1
+++ import.log	30 Apr 2006 08:28:51 -0000	1.2
@@ -0,0 +1 @@
+gcompris-7_4-4:HEAD:gcompris-7.4-4.src.rpm:1146385664



From fedora-extras-commits at redhat.com  Sun Apr 30 08:28:52 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 30 Apr 2006 01:28:52 -0700
Subject: rpms/gcompris/devel U006A.ogg, NONE,
	1.1 gcompris-click_on_letter.patch, NONE,
	1.1 gcompris-electric.patch, NONE, 1.1 gcompris-nl.patch, NONE,
	1.1 gcompris-sys-assetml.patch, NONE, 1.1 gcompris.6, NONE,
	1.1 gcompris.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604300828.k3U8Ssim020597@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gcompris/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20545/devel

Modified Files:
	.cvsignore sources 
Added Files:
	U006A.ogg gcompris-click_on_letter.patch 
	gcompris-electric.patch gcompris-nl.patch 
	gcompris-sys-assetml.patch gcompris.6 gcompris.spec 
Log Message:
auto-import gcompris-7.4-4 on branch devel from gcompris-7.4-4.src.rpm


--- NEW FILE U006A.ogg ---
OggS
*???
2? ?L2???N:????:?(??B-??JL1?Vc??]|s?9??s?9??s?	BCV

2????U
*????*?(??2?,??2????:???C1??J,5?Vc????s?9Hk???Z+??RJ)? 4d

Y
???
)??R?)??R?1?RJ9??S?9??1??)?S?)???A????A(

Y	




??s?i
?????T:g?B????????;&>???6???d-r??SWlGc])??z???V-???h??{uzDji?jhBF?W?b?
?{[?5??\K.???^?C??e????K??5T+??
?J/???#[?.?w?c??e???o?
7?????A???aI<
bV???????s????f?,?p[?h???6H L?????,????c?ff??Sj4??j?B??H$.? ??/??z?K/??????bj??36 ?B??????????0]H
?g??
??
g???3?????yd?I?"!q??Yo>W???p'GS5x?T?M?Y?myn???"A?9&h?3???B?d??-?
??@??>y?&??C?ixm?z{doy?%IzaqVF??J?c?t-??4???K??c
?wX?x@?"??v??z?c?k?????

????\Q`
??^?.?|????jy??!
6'?:????8??VJ??\?GM_?????Mo?+?6
\~?'?c??j??H??^??y?qa?=p[!HLh?O?P?u????P???])k?#k?I?e?fE???
?a?;?GAF
?dm??qzQy?x??Q???g?&?rea?#
|?W?"??-???VFsT??a$???-??6?8????eU
??:?#?????h~hfwd?5ai???R ?u???o?
16gh*?xNM-??4'_8F???X?n{Br?B?y??$i????*????%????s??????U?P ??O???p??\*GE?[???n?
?????Ej!??????????????????-j?-????41?R/?y*?K
?X?=!V??{]1aB??w???,??\@???b??`s?a$C??}????H-??F?V???]|?9'????`G?
??/!Tr???????fm[???:<p????@???B!??/?? ????f?a????6oTUU?K?`????&???z??????V??u?
R?^?>??``??????
????du?<`???f}?W1?t??T?????r!`
?
?8-,???^?uW%5\???w?A??;???X???s)??????-/??????V??
????6???xn'
???
W?
D7?????a??????N??&d?k????5C?I???n?????V?a|?=??)
(??

??????????;?ut????
?_?fb{?g??p??????p??j???b}?tBT??k z??????3??yr??%, at N?a?K>
?D?\???B?
7x!I^??eS??????wy??{?XE<?
?eD?Xt???l??????2g??Zu?}?A?$??@A??????
???g?M'?!x%?%>\?W????
?k???(????Y#>?=?o??
?nMhi?Q????LjJe?n@[???iJ?.????qi?5`???G??b?(
???c????l?lG?~???t?????????g?';?BC?????d??^????N?q?<???R??
??r>???g???D??>E?Z5
?1?'???
????????P?l27?????q?Z?????$?3>?4???d??T???z,^?.?h?1jT??6??????
ZJ?4?P?5x94H????b3hDlw???!?tBV7??i;|?F?[?{???(
??????L.>?P?~I???????zi??!?y%hrp???
?Q?
&'uFt???T??s?42}??PS??U?5??m?????h
???nLNI?TH?????=)???.#C?1P?????\-9????|????,L?r?2o???!??I??y??cs?x2??5???z?U|F??X/Q.
;v

?E* ?*?4??e??U?????s?h?!?Ac??????
??_?N??&3???| ????~??.n?<p3@"h?/~NI?,T????;?
????

`???
?ZM???xU?4 |????d$?H2?!@7???:??B???4F?U??	
+??3?1]??????sz2^Zg???v?a? n?oI?v?QfO???^???T??*?)E[???c9????8		????"?M&
??Bk6r??????????^?x??? ????7??	???2??&t?B4??O3Y???#8>??&??;?,?>i.ma&z@???CvYo?]{?K??????q8???2,$?,?O?#??5???c?L??u?<??p

_?h???*?%j???4L1???6??_V???}?????wV
gcompris-click_on_letter.patch:

--- NEW FILE gcompris-click_on_letter.patch ---
--- /usr/src/redhat/BUILD/gcompris-7.4/src/boards/click_on_letter.c	2006-03-20 21:50:41.000000000 +0100
+++ gcompris/src/boards/click_on_letter.c	2006-04-29 10:41:45.000000000 +0200
@@ -21,6 +21,7 @@
 #include <math.h>
 #include <assert.h>
 #include <glib.h>
+#include <string.h>
 
 #include "gcompris/gcompris.h"
 
@@ -29,7 +30,7 @@
 #define SOUNDLISTFILE PACKAGE
 
 static GcomprisBoard *gcomprisBoard = NULL;
-static gboolean board_paused = TRUE;
+static gboolean board_paused;
 
 static void		 start_board (GcomprisBoard *agcomprisBoard);
 static void		 pause_board (gboolean pause);
@@ -55,6 +56,10 @@
 #define NUMBER_OF_LEVELS 5
 #define MAX_NUMBER_OF_LETTERS 4
 
+#define NOT_OK		0
+#define OK		1
+#define OK_NO_INIT	2
+
 #define TEXT_COLOR "white"
 
 static GnomeCanvasGroup *boardRootItem = NULL;
@@ -68,7 +73,6 @@
 static void click_on_letter_destroy_all_items(void);
 static void click_on_letter_next_level(void);
 static gint item_event(GnomeCanvasItem *item, GdkEvent *event, gpointer data);
-static gint phone_event(GnomeCanvasItem *item, GdkEvent *event, gpointer data);
 static gboolean sounds_are_fine();
 
 static int right_position;
@@ -76,7 +80,6 @@
 static gchar *right_letter;
 
 static gchar *alphabet;
-static void quit_board();
 
 static void sound_played(gchar *file);
 
@@ -137,6 +140,9 @@
 static void start_board (GcomprisBoard *agcomprisBoard)
 {
   GHashTable *config = gcompris_get_board_conf();
+  int ready;
+
+  board_paused = TRUE;
 
   gcompris_change_locale(g_hash_table_lookup( config, "locale"));
 
@@ -149,29 +155,37 @@
 
   g_hash_table_destroy(config);
 
-  sounds_are_fine();
+  ready = sounds_are_fine();
+
+  gcompris_pause_sound();
 
   if (agcomprisBoard!=NULL)
     {
       gcomprisBoard=agcomprisBoard;
-      gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), "images/scenery4_background.png");
+      gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas),
+			      "images/scenery4_background.png");
       gcomprisBoard->level=1;
       gcomprisBoard->maxlevel=NUMBER_OF_LEVELS;
       gcomprisBoard->sublevel=1;
-      gcomprisBoard->number_of_sublevel=NUMBER_OF_SUBLEVELS; /* Go to next level after this number of 'play' */
-      gcompris_bar_set(GCOMPRIS_BAR_CONFIG|GCOMPRIS_BAR_LEVEL|GCOMPRIS_BAR_REPEAT);
-      gcompris_score_start(SCORESTYLE_NOTE,
-			   50,
-			   50,
-			   gcomprisBoard->number_of_sublevel);
 
-      click_on_letter_next_level();
+      /* Go to next level after this number of 'play' */
+      gcomprisBoard->number_of_sublevel=NUMBER_OF_SUBLEVELS;
 
-      gamewon = FALSE;
-      pause_board(FALSE);
+      if(ready)
+	{
+	  /* Warning, bar buttons are set in click_on_letter_next_level()
+	     to avoid them to appear in the case a dialog is displayed */
+	  gcompris_score_start(SCORESTYLE_NOTE,
+			       50,
+			       50,
+			       gcomprisBoard->number_of_sublevel);
 
-      
+	  if(ready == OK)
+	    click_on_letter_next_level();
 
+	  gamewon = FALSE;
+	  pause_board(FALSE);
+	}
     }
 
 }
@@ -180,16 +194,13 @@
 {
   if(gcomprisBoard!=NULL)
     {
-      printf("end_board 1\n");
       pause_board(TRUE);
-      printf("end_board 1\n");
       gcompris_score_end();
-      printf("end_board 1\n");
       click_on_letter_destroy_all_items();
-      printf("end_board 1\n");
     }
   gcompris_reset_locale();
   gcomprisBoard = NULL;
+  gcompris_resume_sound();
 }
 
 /* ======================================= */
@@ -240,13 +251,17 @@
     }
 }
 
-static gboolean sounds_are_fine ()
+static gboolean sounds_are_fine()
 {
   char *str1 = NULL;
   char *str2 = NULL;
   GcomprisProperties	*properties = gcompris_get_properties();
   gchar *locale = NULL;
-  gboolean fine = TRUE;
+
+  if(!properties->fx) {
+    gcompris_dialog(_("Error: this activity cannot be played with the\nsound effects disabled.\nGo to the configuration dialog to\nenable the sound"), board_stop);
+    return(NOT_OK);
+  }
 
   /* TRANSLATORS: Put here the alphabet in your language */
   alphabet=_("abcdefghijklmnopqrstuvwxyz");
@@ -260,7 +275,7 @@
   str2 = gcompris_get_asset_file("gcompris alphabet", NULL, "audio/x-ogg", str1);
   g_free(str1);
   
-  if (!str2){
+  if (!str2) {
     locale = g_strndup(gcompris_get_locale(), 2);
     gcompris_reset_locale();
     gcompris_change_locale("en_US");
@@ -277,30 +292,27 @@
     str2 = gcompris_get_asset_file("gcompris alphabet", NULL, "audio/x-ogg", str1);
     g_free(str1);
 
-    if (!str2){
-      gchar *msg = g_strdup_printf( _("Error: this activity requires that you first install\nthe packages assetml-voices-alphabet-%s or %s"),
-					locale, "en");
-      gcompris_dialog(msg, board_stop);
-      g_free(msg);
-      return (fine);
-    }
-    else{
-      gchar *msg = g_strdup_printf( _("Error: this activity requires that you first install\nthe packages assetml-voices-alphabet-%s ! Fallback to english, sorry!"), locale);
-      gcompris_dialog(msg, NULL);
-      g_free(msg);
-    }
-  }
-
-  fine = TRUE;
-  if(!properties->fx) {
-    gcompris_dialog(_("Error: this activity cannot be played with the\nsound effects disabled.\nGo to the configuration dialogue to\nenable the sound"), board_stop);
-    fine = FALSE;
+    if (!str2)
+      {
+	gchar *msg = g_strdup_printf( _("Error: this activity requires that you first install\nthe packages assetml-voices-alphabet-%s or %s"),
+				      locale, "en");
+	gcompris_dialog(msg, board_stop);
+	g_free(msg);
+	return (NOT_OK);
+      }
+    else
+      {
+	gchar *msg = g_strdup_printf( _("Error: this activity requires that you first install\nthe packages assetml-voices-alphabet-%s ! Fallback to english, sorry!"), locale);
+	gcompris_dialog(msg, click_on_letter_next_level);
+	g_free(msg);
+	g_free(str2);
+	return(OK_NO_INIT);
+      }
   }
 
   g_free(str2);
-  
-  return(fine);
-  
+
+  return(OK);
 }
 
 /*-------------------------------------------------------------------------------*/
@@ -308,6 +320,9 @@
 /* set initial values for the next level */
 static void click_on_letter_next_level()
 {
+  /* It must be set it for the warning dialogs */
+  gcompris_bar_set(GCOMPRIS_BAR_CONFIG|GCOMPRIS_BAR_LEVEL|GCOMPRIS_BAR_REPEAT);
+
   gcompris_bar_set_level(gcomprisBoard);
 
   click_on_letter_destroy_all_items();
@@ -405,29 +420,29 @@
 
   for (i=0; i< number_of_letters; i++) {
 
-  buttons[i] = gnome_canvas_item_new (boardRootItem,
-				   gnome_canvas_pixbuf_get_type (),
-				   "pixbuf",  button_pixmap,
-				   "x",  (double) xOffset,
-				   "y",  (double) yOffset,
-				   NULL);
-
-
-  l_items[i] = gnome_canvas_item_new (boardRootItem,
-				      gnome_canvas_text_get_type (),
-				      "text", g_strdup(letters[i]),
-				      "font", gcompris_skin_font_board_huge_bold,
-				      "anchor", GTK_ANCHOR_CENTER,
-				      "fill_color_rgba", 0x0000ffff,
-				      "x",  (double) xOffset + gdk_pixbuf_get_width(button_pixmap)/2,
-				      "y",  (double) yOffset + gdk_pixbuf_get_height(button_pixmap)/2 - 5,
-				      NULL);
-  g_free(letters[i]);
-  xOffset +=HORIZONTAL_SEPARATION +gdk_pixbuf_get_width(button_pixmap);
-
-  gtk_signal_connect(GTK_OBJECT(l_items[i]), "event", (GtkSignalFunc) item_event, GINT_TO_POINTER(i));
-  gtk_signal_connect(GTK_OBJECT(buttons[i]), "event",  (GtkSignalFunc) item_event, GINT_TO_POINTER(i));
-  //  gtk_signal_connect(GTK_OBJECT(buttons[i]), "event", (GtkSignalFunc) gcompris_item_event_focus, NULL);
+    buttons[i] = gnome_canvas_item_new (boardRootItem,
+					gnome_canvas_pixbuf_get_type (),
+					"pixbuf",  button_pixmap,
+					"x",  (double) xOffset,
+					"y",  (double) yOffset,
+					NULL);
+
+
+    l_items[i] = gnome_canvas_item_new (boardRootItem,
+					gnome_canvas_text_get_type (),
+					"text", g_strdup(letters[i]),
+					"font", gcompris_skin_font_board_huge_bold,
+					"anchor", GTK_ANCHOR_CENTER,
+					"fill_color_rgba", 0x0000ffff,
+					"x",  (double) xOffset + gdk_pixbuf_get_width(button_pixmap)/2,
+					"y",  (double) yOffset + gdk_pixbuf_get_height(button_pixmap)/2 - 5,
+					NULL);
+    g_free(letters[i]);
+    xOffset +=HORIZONTAL_SEPARATION +gdk_pixbuf_get_width(button_pixmap);
+
+    gtk_signal_connect(GTK_OBJECT(l_items[i]), "event", (GtkSignalFunc) item_event, GINT_TO_POINTER(i));
+    gtk_signal_connect(GTK_OBJECT(buttons[i]), "event",  (GtkSignalFunc) item_event, GINT_TO_POINTER(i));
+    //  gtk_signal_connect(GTK_OBJECT(buttons[i]), "event", (GtkSignalFunc) gcompris_item_event_focus, NULL);
   }
 
 
@@ -463,18 +478,6 @@
   g_timeout_add(TIME_CLICK_TO_BONUS, process_ok_timeout, NULL);
 }
 /* ==================================== */
-static gint phone_event(GnomeCanvasItem *item, GdkEvent *event, gpointer data) {
-  switch (event->type)
-    {
-    case GDK_BUTTON_PRESS:
-      repeat();
-      break;
-    default:
-      break;
-    }
-  return TRUE;
-}
-/* ==================================== */
 static gint
 item_event(GnomeCanvasItem *item, GdkEvent *event, gpointer data)
 {
@@ -566,11 +569,12 @@
   return NULL;
 }
 
-static GcomprisConfCallback conf_ok(GHashTable *table)
+static void conf_ok(GHashTable *table)
 {
   if (!table){
     if (gcomprisBoard)
       pause_board(FALSE);
+
     return;
   }
     
@@ -591,12 +595,14 @@
     gcompris_change_locale(g_hash_table_lookup( config, "locale"));
     
     gchar *up_init_str = g_hash_table_lookup( config, "uppercase_only");
-    
-    if (up_init_str && (strcmp(up_init_str, "True")==0))
-      uppercase_only = TRUE;
-    else
-      uppercase_only = FALSE;
-    
+    if (up_init_str)
+      {
+	if(strcmp(up_init_str, "True")==0)
+	  uppercase_only = TRUE;
+	else
+	  uppercase_only = FALSE;
+      }
+
     if (profile_conf)
       g_hash_table_destroy(config);
     
--- /usr/src/redhat/BUILD/gcompris-7.4/src/boards/menu2.c	2006-03-30 01:06:42.000000000 +0200
+++ gcompris/src/boards/menu2.c	2006-04-29 10:41:45.000000000 +0200
@@ -1,6 +1,6 @@
 /* gcompris - menu2.c
  *
- * Time-stamp: <2006/03/30 01:06:42 bruno>
+ * Time-stamp: <2006/04/28 00:51:29 bruno>
  *
  * Copyright (C) 2000 Bruno Coudoin
  *
@@ -527,7 +527,7 @@
 	g_warning("Checking mandatory_sound_file %s\n", soundfile);
       }
 
-      if (!g_file_test (soundfile, G_FILE_TEST_EXISTS) || !gcompris_get_properties()->audio_works) 
+      if (!g_file_test (soundfile, G_FILE_TEST_EXISTS) || !gcompris_get_properties()->fx) 
 	{
 	  pixmap = gcompris_load_skin_pixmap("voice_bad.png");
 	}
--- /usr/src/redhat/BUILD/gcompris-7.4/src/boards/py-gcompris-properties.c	2005-09-20 19:07:33.000000000 +0200
+++ gcompris/src/boards/py-gcompris-properties.c	2006-04-29 10:41:45.000000000 +0200
@@ -63,15 +63,6 @@
 	return Py_False;
       }
     }
-    if(strcmp(name,"audio_works")==0){
-      if(self->cdata->audio_works){
-	Py_INCREF(Py_True);
-	return Py_True;
-      } else {
-	Py_INCREF(Py_False);
-	return Py_False;
-      }
-    }
     if(strcmp(name,"fullscreen")==0){
       if(self->cdata->fullscreen){
 	Py_INCREF(Py_True);
--- /usr/src/redhat/BUILD/gcompris-7.4/src/gcompris/properties.c	2006-03-02 01:08:31.000000000 +0100
+++ gcompris/src/gcompris/properties.c	2006-04-29 10:41:45.000000000 +0200
@@ -1,6 +1,6 @@
 /* gcompris - properties.c
  *
- * Time-stamp: <2006/03/02 01:08:31 bruno>
+ * Time-stamp: <2006/04/28 00:52:51 bruno>
  *
  * Copyright (C) 2000,2003 Bruno Coudoin
  *
@@ -294,9 +294,6 @@
 
   }
 
-  /* By default audio is said to work until libao fails to load it */
-  tmp->audio_works	= TRUE;
-
   /*
    * Warning, gcompris need a proper locale prefix to find suitable dataset
    * Some system use LOCALE 'C' for english. We have to set it explicitly
--- /usr/src/redhat/BUILD/gcompris-7.4/src/gcompris/properties.h	2006-03-02 00:48:25.000000000 +0100
+++ gcompris/src/gcompris/properties.h	2006-04-29 10:41:45.000000000 +0200
@@ -1,6 +1,6 @@
 /* gcompris - properties.h
  *
- * Time-stamp: <2006/03/02 00:48:25 bruno>
+ * Time-stamp: <2006/04/28 00:52:34 bruno>
  *
  * Copyright (C) 2000 Bruno Coudoin
  *
@@ -27,7 +27,6 @@
 typedef struct {
   gint		music;
   gint		fx;
-  gint		audio_works;
   gint		fullscreen;
   gint		noxrandr;
   gint		screensize;
--- /usr/src/redhat/BUILD/gcompris-7.4/src/boards/memory.c	2006-04-03 19:41:54.000000000 +0200
+++ gcompris/src/boards/memory.c	2006-04-19 00:18:14.000000000 +0200
@@ -1,6 +1,6 @@
 /* gcompris - memory.c
  *
- * Time-stamp: <2006/03/31 22:46:09 yves>
+ * Time-stamp: <2006/04/17 22:28:15 bruno>
  *
  * Copyright (C) 2000 Bruno Coudoin
  * 
@@ -813,6 +813,8 @@
 
       if (currentUiMode == UIMODE_SOUND)
 	{
+	  GcomprisProperties	*properties = gcompris_get_properties();
+
 	  gcompris_pause_sound();
 	  gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), "images/gcompris_band.png");
 	  base_x1 = BASE_SOUND_X1;
@@ -820,6 +822,12 @@
 	  base_x2 = BASE_SOUND_X2;
 	  base_y2 = BASE_SOUND_Y2;
 	  base_x1_tux = BASE_SOUND_X1_TUX;
+
+	  if(!properties->fx) {
+	    gcompris_dialog(_("Error: this activity cannot be played with the\nsound effects disabled.\nGo to the configuration dialog to\nenable the sound"), board_stop);
+	    return;
+	  }
+
 	}
       else
 	{
--- gcompris-7.4.orig/boards/memory_sound.xml.in	2006-01-18 20:42:30.000000000 +0100
+++ gcompris-7.4/boards/memory_sound.xml.in	2006-04-30 09:02:32.000000000 +0200
@@ -7,6 +7,7 @@
 	 mode="sound" 
 	 difficulty="1"
 	 icon="boardicons/memory_sound.png" 
+	 mandatory_sound_file="memory/plick.ogg"
 	 author="Yves Combe (yves at ycombe.net)"
 	 boarddir="">
 	 <_title>Audio memory game</_title>
--- gcompris-7.4.orig/boards/memory_sound_tux.xml.in	2006-01-22 22:31:54.000000000 +0100
+++ gcompris-7.4/boards/memory_sound_tux.xml.in	2006-04-30 09:02:32.000000000 +0200
@@ -7,6 +7,7 @@
 	 mode="sound_tux" 
 	 difficulty="2"
 	 icon="boardicons/memory_sound_tux.png" 
+	 mandatory_sound_file="memory/plick.ogg"
 	 author="Yves Combe (yves at ycombe.net)"
 	 boarddir="">
 	 <_title>Audio memory game against Tux</_title>

gcompris-electric.patch:

--- NEW FILE gcompris-electric.patch ---
--- gcompris-7.4/src/boards/python/electric.py.mkstemp	2006-02-26 19:00:06.000000000 +0100
+++ gcompris-7.4/src/boards/python/electric.py	2006-04-23 22:32:19.000000000 +0200
@@ -26,8 +26,10 @@
 import gcompris.bonus
 import gtk
 import gtk.gdk
+import gobject
 
 import os
+import tempfile
 
 # Set to True to debug
 debug = False
@@ -195,6 +197,10 @@
     if self.gnucap_timer :
       gtk.timeout_remove(self.gnucap_timer)
       self.gnucap_timer = 0
+      
+    # remove the appended items from our tools
+    for i in range(0,len(self.tools)):
+      self.tools[i].pop()
 
     # No more component in the simulation set
     self.components = []
@@ -318,7 +323,7 @@
       return
 
     if not self.gnucap_timer:
-      self.gnucap_timer = gtk.timeout_add(self.gnucap_timer_interval, self.call_gnucap)
+      self.gnucap_timer = gobject.timeout_add(self.gnucap_timer_interval, self.call_gnucap)
 
   def call_gnucap(self):
     if not self.components:
@@ -334,9 +339,8 @@
     if not connected == 1:
       if debug: print "call_gnucap: No connected component"
     
-    filename = "/tmp/gcompris_electric.gnucap.%d" %(os.getpid(),)
-
-    f = file(filename, "w+")
+    fd, filename = tempfile.mkstemp(".gnucap", "gcompris_electric", None, True)
+    f = os.fdopen(fd, "w+t")
 
     gnucap = "Title GCompris\n"
 
@@ -421,7 +425,7 @@
           i += 2
 
       
-    os.remove(filename)
+    if not debug: os.remove(filename)
     self.gnucap_timer = 0
     
   # Convert a gnucap value back in a regular number

gcompris-nl.patch:

--- NEW FILE gcompris-nl.patch ---
--- gcompris-7.4/boards/sounds/nl/alphabet/gcompris_alphabet_nl.assetml.in.nl	2006-03-20 22:47:36.000000000 +0100
+++ gcompris-7.4/boards/sounds/nl/alphabet/gcompris_alphabet_nl.assetml.in	2006-04-23 14:07:51.000000000 +0200
@@ -1,233 +1,238 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<AssetML dataset="gcompris alphabet" rootdir="../gcompris/boards/sounds/nl/alphabet/" locale="nl">
-  <Asset file="a.ogg" mimetype="audio/x-ogg">
-   <Description>a</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="b.ogg" mimetype="audio/x-ogg">
-   <Description>b</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="c.ogg" mimetype="audio/x-ogg">
-   <Description>c</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="d.ogg" mimetype="audio/x-ogg">
-   <Description>d</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="e.ogg" mimetype="audio/x-ogg">
-   <Description>e</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="f.ogg" mimetype="audio/x-ogg">
-   <Description>f</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="g.ogg" mimetype="audio/x-ogg">
-   <Description>g</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="h.ogg" mimetype="audio/x-ogg">
-   <Description>h</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="i.ogg" mimetype="audio/x-ogg">
-   <Description>i</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="j.ogg" mimetype="audio/x-ogg">
-   <Description>j</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="k.ogg" mimetype="audio/x-ogg">
-   <Description>k</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="l.ogg" mimetype="audio/x-ogg">
-   <Description>l</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="m.ogg" mimetype="audio/x-ogg">
-   <Description>m</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="n.ogg" mimetype="audio/x-ogg">
-   <Description>n</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="o.ogg" mimetype="audio/x-ogg">
-   <Description>o</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="p.ogg" mimetype="audio/x-ogg">
-   <Description>p</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="q.ogg" mimetype="audio/x-ogg">
-   <Description>q</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="r.ogg" mimetype="audio/x-ogg">
-   <Description>r</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="s.ogg" mimetype="audio/x-ogg">
-   <Description>s</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="t.ogg" mimetype="audio/x-ogg">
-   <Description>t</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="u.ogg" mimetype="audio/x-ogg">
-   <Description>u</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="v.ogg" mimetype="audio/x-ogg">
-   <Description>v</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="w.ogg" mimetype="audio/x-ogg">
-   <Description>w</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="x.ogg" mimetype="audio/x-ogg">
-   <Description>x</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="y.ogg" mimetype="audio/x-ogg">
-   <Description>y</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="z.ogg" mimetype="audio/x-ogg">
-   <Description>z</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="1.ogg" mimetype="audio/x-ogg">
-   <Description>1</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="2.ogg" mimetype="audio/x-ogg">
-   <Description>2</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="3.ogg" mimetype="audio/x-ogg">
-   <Description>3</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="4.ogg" mimetype="audio/x-ogg">
-   <Description>4</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="5.ogg" mimetype="audio/x-ogg">
-   <Description>5</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="6.ogg" mimetype="audio/x-ogg">
-   <Description>6</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="7.ogg" mimetype="audio/x-ogg">
-   <Description>7</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="8.ogg" mimetype="audio/x-ogg">
-   <Description>8</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="9.ogg" mimetype="audio/x-ogg">
-   <Description>9</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="10.ogg" mimetype="audio/x-ogg">
-   <Description>10</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="11.ogg" mimetype="audio/x-ogg">
-   <Description>11</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="12.ogg" mimetype="audio/x-ogg">
-   <Description>12</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="13.ogg" mimetype="audio/x-ogg">
-   <Description>13</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="14.ogg" mimetype="audio/x-ogg">
-   <Description>14</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="15.ogg" mimetype="audio/x-ogg">
-   <Description>15</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="16.ogg" mimetype="audio/x-ogg">
-   <Description>16</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="17.ogg" mimetype="audio/x-ogg">
-   <Description>17</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="18.ogg" mimetype="audio/x-ogg">
-   <Description>18</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="19.ogg" mimetype="audio/x-ogg">
-   <Description>19</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="20.ogg" mimetype="audio/x-ogg">
-   <Description>20</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
+<AssetML rootdir='../gcompris/boards/sounds/nl/alphabet/' locale='nl' dataset='gcompris alphabet'>
+  <Asset name='U0061.ogg' mimetype='audio/x-ogg' file='U0061.ogg'>
+    <Description>a</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0062.ogg' mimetype='audio/x-ogg' file='U0062.ogg'>
+    <Description>b</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0063.ogg' mimetype='audio/x-ogg' file='U0063.ogg'>
+    <Description>c</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0064.ogg' mimetype='audio/x-ogg' file='U0064.ogg'>
+    <Description>d</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0065.ogg' mimetype='audio/x-ogg' file='U0065.ogg'>
+    <Description>e</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0066.ogg' mimetype='audio/x-ogg' file='U0066.ogg'>
+    <Description>f</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0067.ogg' mimetype='audio/x-ogg' file='U0067.ogg'>
+    <Description>g</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0068.ogg' mimetype='audio/x-ogg' file='U0068.ogg'>
+    <Description>h</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0069.ogg' mimetype='audio/x-ogg' file='U0069.ogg'>
+    <Description>i</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U006A.ogg' mimetype='audio/x-ogg' file='U006A.ogg'>
+    <Description>j</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U006B.ogg' mimetype='audio/x-ogg' file='U006B.ogg'>
+    <Description>k</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U006C.ogg' mimetype='audio/x-ogg' file='U006C.ogg'>
+    <Description>l</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U006D.ogg' mimetype='audio/x-ogg' file='U006D.ogg'>
+    <Description>m</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U006E.ogg' mimetype='audio/x-ogg' file='U006E.ogg'>
+    <Description>n</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U006F.ogg' mimetype='audio/x-ogg' file='U006F.ogg'>
+    <Description>o</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0070.ogg' mimetype='audio/x-ogg' file='U0070.ogg'>
+    <Description>p</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0071.ogg' mimetype='audio/x-ogg' file='U0071.ogg'>
+    <Description>q</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0072.ogg' mimetype='audio/x-ogg' file='U0072.ogg'>
+    <Description>r</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0073.ogg' mimetype='audio/x-ogg' file='U0073.ogg'>
+    <Description>s</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0074.ogg' mimetype='audio/x-ogg' file='U0074.ogg'>
+    <Description>t</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0075.ogg' mimetype='audio/x-ogg' file='U0075.ogg'>
+    <Description>u</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0076.ogg' mimetype='audio/x-ogg' file='U0076.ogg'>
+    <Description>v</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0077.ogg' mimetype='audio/x-ogg' file='U0077.ogg'>
+    <Description>w</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0078.ogg' mimetype='audio/x-ogg' file='U0078.ogg'>
+    <Description>x</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0079.ogg' mimetype='audio/x-ogg' file='U0079.ogg'>
+    <Description>y</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U007A.ogg' mimetype='audio/x-ogg' file='U007A.ogg'>
+    <Description>z</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0030.ogg' mimetype='audio/x-ogg' file='U0030.ogg'>
+    <Description>0</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0031.ogg' mimetype='audio/x-ogg' file='U0031.ogg'>
+    <Description>1</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0032.ogg' mimetype='audio/x-ogg' file='U0032.ogg'>
+    <Description>2</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0033.ogg' mimetype='audio/x-ogg' file='U0033.ogg'>
+    <Description>3</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0034.ogg' mimetype='audio/x-ogg' file='U0034.ogg'>
+    <Description>4</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0035.ogg' mimetype='audio/x-ogg' file='U0035.ogg'>
+    <Description>5</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0036.ogg' mimetype='audio/x-ogg' file='U0036.ogg'>
+    <Description>6</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0037.ogg' mimetype='audio/x-ogg' file='U0037.ogg'>
+    <Description>7</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0038.ogg' mimetype='audio/x-ogg' file='U0038.ogg'>
+    <Description>8</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0039.ogg' mimetype='audio/x-ogg' file='U0039.ogg'>
+    <Description>9</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset mimetype='audio/x-ogg' file='10.ogg'>
+    <Description>10</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset mimetype='audio/x-ogg' file='11.ogg'>
+    <Description>11</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset mimetype='audio/x-ogg' file='12.ogg'>
+    <Description>12</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset mimetype='audio/x-ogg' file='13.ogg'>
+    <Description>13</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset mimetype='audio/x-ogg' file='14.ogg'>
+    <Description>14</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset mimetype='audio/x-ogg' file='15.ogg'>
+    <Description>15</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset mimetype='audio/x-ogg' file='16.ogg'>
+    <Description>16</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset mimetype='audio/x-ogg' file='17.ogg'>
+    <Description>17</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset mimetype='audio/x-ogg' file='18.ogg'>
+    <Description>18</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset mimetype='audio/x-ogg' file='19.ogg'>
+    <Description>19</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset mimetype='audio/x-ogg' file='20.ogg'>
+    <Description>20</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
   </Asset>
 </AssetML>
--- gcompris-7.4/boards/sounds/nl/misc/gcompris_misc_nl.assetml.in.nl	2006-03-27 01:45:17.000000000 +0200
+++ gcompris-7.4/boards/sounds/nl/misc/gcompris_misc_nl.assetml.in	2006-04-23 14:36:44.000000000 +0200
@@ -1,83 +1,108 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<AssetML dataset="gcompris misc" rootdir="../gcompris/boards/sounds/nl/misc/" locale="nl">
-  <Asset file="back.ogg" mimetype="audio/x-ogg">
+<AssetML rootdir="../gcompris/boards/sounds/nl/misc/" locale="nl" dataset="gcompris misc">
+  <Asset mimetype="audio/x-ogg" file="back.ogg">
    <Description>back</Description>
    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
    <Categories>audio;misc</Categories>
   </Asset>
-  <Asset file="by.ogg" mimetype="audio/x-ogg">
+  <Asset mimetype="audio/x-ogg" file="by.ogg">
    <Description>by</Description>
    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
    <Categories>audio;misc</Categories>
   </Asset>
-  <Asset file="click_on_letter.ogg" mimetype="audio/x-ogg">
+  <Asset mimetype="audio/x-ogg" file="click_on_letter.ogg">
    <Description>click_on_letter</Description>
    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
    <Categories>audio;misc</Categories>
   </Asset>
-  <Asset file="congratulation.ogg" mimetype="audio/x-ogg">
+  <Asset mimetype="audio/x-ogg" file="check_answer.ogg">
+   <Description>check_answer</Description>
+   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+   <Categories>audio;misc</Categories>
+  </Asset>
+  <Asset mimetype="audio/x-ogg" file="congratulation.ogg">
    <Description>congratulation</Description>
    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
    <Categories>audio;misc</Categories>
   </Asset>
-  <Asset file="equal.ogg" mimetype="audio/x-ogg">
+  <Asset mimetype="audio/x-ogg" file="equal.ogg">
    <Description>equal</Description>
    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
    <Categories>audio;misc</Categories>
   </Asset>
-  <Asset file="good.ogg" mimetype="audio/x-ogg">
+  <Asset mimetype="audio/x-ogg" file="good.ogg">
    <Description>good</Description>
    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
    <Categories>audio;misc</Categories>
   </Asset>
-  <Asset file="great.ogg" mimetype="audio/x-ogg">
+  <Asset mimetype="audio/x-ogg" file="great.ogg">
    <Description>great</Description>
    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
    <Categories>audio;misc</Categories>
   </Asset>
-  <Asset file="help.ogg" mimetype="audio/x-ogg">
+  <Asset mimetype="audio/x-ogg" file="help.ogg">
    <Description>help</Description>
    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
    <Categories>audio;misc</Categories>
   </Asset>
-  <Asset file="level.ogg" mimetype="audio/x-ogg">
+  <Asset mimetype="audio/x-ogg" file="level.ogg">
    <Description>level</Description>
    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
    <Categories>audio;misc</Categories>
   </Asset>
-  <Asset file="minus.ogg" mimetype="audio/x-ogg">
+  <Asset mimetype="audio/x-ogg" file="minus.ogg">
    <Description>minus</Description>
    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
    <Categories>audio;misc</Categories>
   </Asset>
-  <Asset file="ok.ogg" mimetype="audio/x-ogg">
+  <Asset mimetype="audio/x-ogg" file="ok.ogg">
    <Description>ok</Description>
    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
    <Categories>audio;misc</Categories>
   </Asset>
-  <Asset file="outof.ogg" mimetype="audio/x-ogg">
+  <Asset mimetype="audio/x-ogg" file="outof.ogg">
    <Description>outof</Description>
    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
    <Categories>audio;misc</Categories>
   </Asset>
-  <Asset file="plus.ogg" mimetype="audio/x-ogg">
+  <Asset mimetype="audio/x-ogg" file="plus.ogg">
    <Description>plus</Description>
    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
    <Categories>audio;misc</Categories>
   </Asset>
-  <Asset file="quit.ogg" mimetype="audio/x-ogg">
+  <Asset mimetype="audio/x-ogg" file="quit.ogg">
    <Description>quit</Description>
    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
    <Categories>audio;misc</Categories>
   </Asset>
-  <Asset file="super.ogg" mimetype="audio/x-ogg">
+  <Asset mimetype="audio/x-ogg" file="super.ogg">
    <Description>super</Description>
    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
    <Categories>audio;misc</Categories>
   </Asset>
-  <Asset file="welcome.ogg" mimetype="audio/x-ogg">
+  <Asset mimetype="audio/x-ogg" file="welcome.ogg">
    <Description>welcome</Description>
    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
    <Categories>audio;misc</Categories>
   </Asset>
+  <Asset mimetype="audio/x-ogg" file="awesome.ogg">
+   <Description>awesome</Description>
+   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+   <Categories>audio;misc</Categories>
+  </Asset>
+  <Asset mimetype="audio/x-ogg" file="fantastic.ogg">
+   <Description>fantastic</Description>
+   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+   <Categories>audio;misc</Categories>
+  </Asset>
+  <Asset mimetype="audio/x-ogg" file="waytogo.ogg">
+   <Description>waytogo</Description>
+   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+   <Categories>audio;misc</Categories>
+  </Asset>
+  <Asset mimetype="audio/x-ogg" file="perfect.ogg">
+   <Description>perfect</Description>
+   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+   <Categories>audio;misc</Categories>
+  </Asset>
 </AssetML>
--- gcompris-7.4/boards/sounds/nl/geography/gcompris_geography_nl.assetml.in.nl	2006-03-27 01:44:38.000000000 +0200
+++ gcompris-7.4/boards/sounds/nl/geography/gcompris_geography_nl.assetml.in	2006-04-25 08:49:50.000000000 +0200
@@ -122,7 +122,7 @@
   </Asset>
   <Asset mimetype="audio/x-ogg" file="france.ogg">
    <Description>france</Description>
-   <Credits>Susan Rich 2004 / GPL</Credits>
+   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
    <Categories>audio;geography</Categories>
   </Asset>
   <Asset mimetype="audio/x-ogg" file="french_guiana.ogg">
@@ -147,7 +147,7 @@
   </Asset>
   <Asset mimetype="audio/x-ogg" file="germany.ogg">
    <Description>germany</Description>
-   <Credits>Susan Rich 2004 / GPL</Credits>
+   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
    <Categories>audio;geography</Categories>
   </Asset>
   <Asset mimetype="audio/x-ogg" file="guyana.ogg">
@@ -340,4 +340,4 @@
    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
    <Categories>audio;geography</Categories>
   </Asset>
-</AssetML>
\ No newline at end of file
+</AssetML>
--- gcompris-7.4/po/nl.po.nl	2006-04-04 23:33:49.000000000 +0200
+++ gcompris-7.4/po/nl.po	2006-04-24 10:56:20.000000000 +0200
@@ -13,7 +13,7 @@
 "Project-Id-Version: gcompris cvs\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-03-31 02:26+0200\n"
-"PO-Revision-Date: 2006-04-04 11:58+0200\n"
+"PO-Revision-Date: 2006-04-24 00:27+0200\n"
 "Last-Translator: Johan Blok <j.blok.2 at student.rug.nl>\n"
 "Language-Team: Dutch <nl at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -1212,10 +1212,7 @@
 "Laurent Lacheny. Images and Artificial Intelligence taken from project "
 "4stattack by Jeroen Vloothuis. The original project can be found on &lt;"
 "http://forcedattack.sourceforge.net&gt;"
-msgstr ""
-"Laurent Lacheny. Afbeeldingen and Kunstmatige Intelligentie van project "
-"4stattack door Jeroen Vloothuis. Het oorspronkelijke project kan worden "
-"gevonden op &lt;http://forcedattack.sourceforge.net&gt"
+msgstr "Laurent Lacheny. Afbeeldingen and Kunstmatige Intelligentie van project 4stattack door Jeroen Vloothuis. Het oorspronkelijke project kan worden gevonden op &lt;http://forcedattack.sourceforge.net&gt;"
 
 #: ../boards/crane.xml.in.h:1
 msgid "Build the same model"
@@ -1387,10 +1384,7 @@
 "(&lt;http://schmode.net/&gt;) and from LE BERRE Daniel. These people kindly "
 "gave GCompris the authorization to include their pictures. Thanks a lot, "
 "both of you."
-msgstr ""
-"De prentjes van dieren komen van de Dierenfoto-pagina van Ralf Schmode (&lt;"
-"http://schmode.net/&gt) en van LE BERRE Daniel. Zij hebben GCompris "
-"toestemming gegeven om deze foto's te gebruiken. Bedankt!"
+msgstr "De prentjes van dieren komen van de Dierenfoto-pagina van Ralf Schmode (&lt;http://schmode.net/&gt;) en van LE BERRE Daniel. Zij hebben GCompris toestemming gegeven om deze foto's te gebruiken. Bedankt!"
 
 #: ../boards/erase.xml.in.h:4 ../src/boards/erase.c:112
 #: ../src/boards/machpuzzle.c:92

gcompris-sys-assetml.patch:

--- NEW FILE gcompris-sys-assetml.patch ---
--- gcompris-7.4/src/gcompris/assetml.c.sysassetml	2005-08-19 02:27:29.000000000 +0200
+++ gcompris-7.4/src/gcompris/assetml.c	2006-04-21 17:46:50.000000000 +0200
@@ -1,493 +0,0 @@
-/* assetml - assetml.c
- *
- * Copyright (C) 2003 Bruno Coudoin
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "glib.h"
-#include "assetml.h"
-#include <config.h>
-
-/* libxml includes */
-#include <libxml/tree.h>
-#include <libxml/parser.h>
-
-#include <locale.h>
-#include <string.h>
-
-#define FILE_EXT ".assetml"
-
-const gchar	*assetml_get_locale(void);
-static gchar	*reactivate_newline(gchar *str);
-static void	 dump_asset(AssetML *assetml);
-int		 selectAssetML(const gchar *dirent);
-void		 assetml_read_xml_file(GList **gl_result, char *fname,
-				       gchar *dataset, gchar* categories, gchar* mimetype, 
-				       const gchar *locale, gchar* file);
-void		 assetml_load_xml(GList **gl_result, gchar *dataset, gchar* categories, 
-				  gchar* mimetype, 
-				  const gchar* locale, gchar* file);
-void		 free_asset(AssetML *assetml);
-
-GHashTable *asset_cache = NULL;
-
-/*
- * This returns the locale for which text must be displayed
- *
- */
-const gchar *assetml_get_locale()
-{
-  const char *locale;
-
-  locale = g_getenv("LC_ALL");
-  if(locale == NULL)
-    locale = g_getenv("LC_MESSAGES");
-  if(locale == NULL)
-    locale = g_getenv("LANG");
-
-
-  if(locale!=NULL)
-    return(locale);
-
-  return("en_US.UTF-8");
-}
-
-/*
- * Return a copy of the given string in which it has
- * changes '\''n' to '\n'.
- * The recognized sequences are \b
- * \f \n \r \t \\ \" and the octal format.
- * 
- */
-static gchar *reactivate_newline(gchar *str)
-{
-  gchar *newstr;
-
-  if(str==NULL)
-    return NULL;
-
-  newstr = g_strcompress(str);
-  
-  g_free(str);
-
-  return newstr;
-}
-
-void dump_asset(AssetML *assetml)
-{
-
-  g_message("Dump Asset\n");
-
-  if(assetml==NULL)
-    return;
-
-  if(assetml->dataset)
-    g_message("  dataset     = %s\n",assetml->dataset);
-  if(assetml->file)
-    g_message("  file        = %s\n",assetml->file);
-  if(assetml->name)
-    g_message("  name        = %s\n",assetml->name);
-  if(assetml->locale)
-    g_message("  locale      = %s\n",assetml->locale);
-  if(assetml->description)
-    g_message("  description = %s\n",assetml->description);
-  if(assetml->categories)
-    g_message("  categories  = %s\n",assetml->categories);
-  if(assetml->mimetype)
-    g_message("  mimetype    = %s\n",assetml->mimetype);
-  if(assetml->credits)
-    g_message("  credits     = %s\n",assetml->credits);
-
-}
-
-/*
- * Thanks for George Lebl <jirka at 5z.com> for his Genealogy example
- * for all the XML stuff there
- */
-
-static AssetML *assetml_add_xml_to_data(xmlDocPtr doc,
-					xmlNodePtr xmlnode, 
-					gchar *rootdir,
-					GNode * child)
-{
-  AssetML *assetml = NULL;
-  gchar   *tmpstr;
-
-  if(/* if the node has no name */
-     !xmlnode->name ||
-     /* or if the name is not "Asset" */
-     (g_strcasecmp(xmlnode->name,"Asset")!=0)
-     )
-    return NULL;
-
-  assetml = g_malloc0 (sizeof (AssetML));
-
-  /* get the specific values */
-  tmpstr = xmlGetProp(xmlnode,"file");
-  if(tmpstr && strlen(tmpstr)>0)
-    if(rootdir[0]!='/')
-      /* This is a relative path, add ASSETML_DIR and rootdir prefix */
-      assetml->file		= g_build_filename(ASSETML_DIR, rootdir, tmpstr, NULL);
-    else
-      assetml->file		= g_build_filename(rootdir, tmpstr, NULL);
-  else
-    assetml->file		= NULL;
-  xmlFree(tmpstr);
-
-  tmpstr = xmlGetProp(xmlnode,"name");
-  if(tmpstr && strlen(tmpstr)>0)
-  assetml->name		= g_strdup(tmpstr);
-  else
-    assetml->name		= g_path_get_basename(assetml->file);
-  xmlFree(tmpstr);
-
-
-  tmpstr = xmlGetProp(xmlnode,"mimetype");
-  if(tmpstr && strlen(tmpstr)>0)
-  assetml->mimetype		= g_strdup(tmpstr);
-  else
-    assetml->mimetype		= NULL;
-  xmlFree(tmpstr);
-
-
-
-  xmlnode = xmlnode->xmlChildrenNode;
-  while (xmlnode != NULL) {
-    gchar *lang = xmlGetProp(xmlnode,"lang");
-
-    /* get the description of the asset */
-    if (!strcmp(xmlnode->name, "Description")
-	&& (lang==NULL ||
-	    !strcmp(lang, assetml_get_locale())
-	    || !strncmp(lang, assetml_get_locale(), 2)))
-      {
-	assetml->description = reactivate_newline(xmlNodeListGetString(doc, 
-								       xmlnode->xmlChildrenNode, 1));
-      }
-
-    /* get the description of the Credits */
-    if (!strcmp(xmlnode->name, "Credits")
-	&& (lang==NULL ||
-	    !strcmp(lang, assetml_get_locale())
-	    || !strncmp(lang, assetml_get_locale(), 2)))
-      {
-	assetml->credits = reactivate_newline(xmlNodeListGetString(doc, 
-								   xmlnode->xmlChildrenNode, 1));
-      }
-
-
-    /* get the description of the Categories */
-    if (!strcmp(xmlnode->name, "Categories")
-	&& (lang==NULL ||
-	    !strcmp(lang, assetml_get_locale())
-	    || !strncmp(lang, assetml_get_locale(), 2)))
-      {
-	assetml->categories = reactivate_newline(xmlNodeListGetString(doc, 
-								      xmlnode->xmlChildrenNode, 1));
-      }
-
-    xmlnode = xmlnode->next;
-  }
-
-  return(assetml);
-}
-
-/*
- * Given the assetml and the dataset, categories, name
- * return true if the assetml matches the requirements
- */
-static gboolean matching(AssetML *assetml, gchar *mydataset, 
-			 gchar *dataset, gchar* categories, gchar* mimetype, 
-			 const gchar* mylocale, const gchar* locale, gchar* name)
-{
-  g_assert(assetml);
-
-  if (!assetml->locale)
-    assetml->locale = g_strdup(mylocale);
-  if (!assetml->dataset)
-    assetml->dataset = g_strdup(mydataset);
-
-  if(assetml->dataset && dataset)
-    if(g_ascii_strcasecmp(assetml->dataset, dataset))
-      return FALSE;
-
-
-  /* Check the leading locale definition matches the leading user request so that
-   * File   Requested   Status
-   * fr     fr_FR.UTF8  OK
-   * pt     pt_BR       OK
-   * pt_BR  pt          NO
-   */
-  if (!assetml->locale)
-    assetml->locale = g_strdup(mylocale);
-
-  if(assetml->locale && locale)
-    if(g_ascii_strncasecmp(assetml->locale, locale, strlen(assetml->locale)))
-      return FALSE;
-
-  if(assetml->mimetype && mimetype)
-    if(g_ascii_strcasecmp(assetml->mimetype, mimetype))
-      return FALSE;
-
-  if(assetml->name && name)
-    if(g_ascii_strcasecmp(assetml->name, name))
-      return FALSE;
-
-/*  if(assetml->file && file)
-    {
-      gchar *str1;
-      gchar *str2;
-      gboolean nomatch;
-//      We test only the basename of the file so that caller do not need to specify a full path 
-      str1 = g_path_get_basename(assetml->file);
-      str2 = g_path_get_basename(file);
-
-      nomatch = g_ascii_strcasecmp(str1, str2);
-
-      g_free(str1);
-      g_free(str2);
-
-      if(nomatch)
-	return FALSE;
-    }*/
-
-  if(assetml->categories && categories)
-    {
-      guint i;
-      for(i=0; i<strlen(assetml->categories)-strlen(categories)+1; i++)
-	{
-	  if(!g_ascii_strncasecmp(assetml->categories+i, categories, strlen(categories)))
-	    {
-	      return TRUE;
-	    }
-	}
-      return FALSE;
-    }
-  
-  return TRUE;
-}
-
-/* parse the doc, add it to our internal structures and to the clist */
-static void
-parse_doc(GList **gl_result, xmlDocPtr doc, 
-	  gchar *mydataset, gchar *rootdir, gchar* mylocale,
-	  gchar *dataset, gchar* categories, gchar* mimetype, const gchar* locale, gchar* file, GList **cache)
-{
-  if (*cache){
-    GList *list;
-
-    for (list= *cache; list != NULL; list=list->next){
-      AssetML *assetml = (AssetML *) list->data;
-      
-      if (matching(assetml, mydataset, dataset, categories, 
-		   mimetype, mylocale, locale, file))
-	*gl_result = g_list_append (*gl_result, assetml);
-    }
-    return;
-  }
-
-  xmlNodePtr node;
-
-  /* find <Asset> nodes and add them to the list, this just
-     loops through all the children of the root of the document */
-  for(node = doc->children->children; node != NULL; node = node->next) {
-    /* add the board to the list, there are no children so
-       we pass NULL as the node of the child */
-    AssetML *assetml = assetml_add_xml_to_data(doc, node, rootdir, NULL);
-
-    if(assetml && matching(assetml, mydataset, dataset, categories, 
-			   mimetype, mylocale, locale, file)) {
-      g_message("if(assetml && matching  g_list_append)\n");
-
-      *gl_result = g_list_append (*gl_result, assetml);
-    }
-
-    if (assetml)
-      *cache = g_list_append( *cache,  assetml);
-
-  }
-}
-
-void assetml_real_free_assetlist(GList *assetlist)
-{
-  g_list_foreach (assetlist, (GFunc) free_asset, NULL);
-  g_list_free(assetlist);
-}
-
-/* read an xml file into our memory structures and update our view,
-   dump any old data we have in memory if we can load a new set
-   Fill the gl_result list with all matching asseml items
-*/
-void assetml_read_xml_file(GList **gl_result, char *assetmlfile,
-			   gchar *dataset, gchar* categories, gchar* mimetype, const gchar *locale, gchar* file)
-{
-  /* pointer to the new doc */
-  xmlDocPtr doc;
-  gchar *rootdir;
-  gchar *mylocale;
-  gchar *mydataset;
-
-  GList *cache = NULL;
-
-  g_return_if_fail(assetmlfile!=NULL);
-
-  /* cache asset for performance in non direct search */
-  if (!asset_cache){
-    asset_cache = g_hash_table_new_full( g_str_hash,
-					 g_str_equal,
-					 g_free,
-					 (GDestroyNotify) assetml_free_assetlist
-					 );
-  }
-
-  cache = g_hash_table_lookup (asset_cache, assetmlfile);
-
-  /* parse the new file and put the result into newdoc */
-  if (! cache){
-    doc = xmlParseFile(assetmlfile);
-
-    /* in case something went wrong */
-    if(!doc) {
-      g_warning("Oups, the parsing of %s failed", assetmlfile);
-      return;
-    }
-  
-    if(/* if there is no root element */
-       !doc->children ||
-       /* if it doesn't have a name */
-       !doc->children->name ||
-       /* if it isn't a Assetml node */
-       g_strcasecmp(doc->children->name,"AssetML")!=0) 
-      {
-	xmlFreeDoc(doc);
-	g_warning("Oups, the file %s is not of the assetml type", assetmlfile);
-	return;
-      }
-
-    rootdir   = xmlGetProp(doc->children,"rootdir");
-    mydataset = xmlGetProp(doc->children,"dataset");
-    mylocale  = xmlGetProp(doc->children,"locale");
-  }
-  else {
-    AssetML *myasset = (AssetML *) cache->data;
-
-    mylocale = myasset->locale;
-    mydataset = myasset->dataset;
-    rootdir = NULL;
-  }
-
-  /* parse our document and replace old data */
-  parse_doc(gl_result, doc, mydataset, rootdir, mylocale, dataset, categories, mimetype, locale, file, &cache);
-
-  if (rootdir)
-    g_hash_table_replace( asset_cache, g_strdup(assetmlfile), cache);
-
-  if (rootdir){
-    xmlFree(rootdir);
-    xmlFree(mydataset);
-    xmlFreeDoc(doc);
-  }
-}
-
-
-/*
- * Select only files with FILE_EXT
- */
-int selectAssetML(const gchar *dirent)
-{
-  guint ext_length = strlen(FILE_EXT);
-
-  if(strlen(dirent)<ext_length)
-    return 0;
-
-  return (strncmp (&dirent[strlen(dirent)-ext_length], FILE_EXT, ext_length) == 0);
-}
-
-/* load all the xml files in the assetml path
- * into our memory structures.
- */
-void assetml_load_xml(GList **gl_result, gchar *dataset, gchar* categories, gchar* mimetype, const gchar *locale, 
-		      gchar* name)
-{
-  const gchar  *one_dirent;
-  GDir    *dir;
-
-  dir = g_dir_open(ASSETML_DIR, 0, NULL);
-  if(!dir) {
-    g_warning("opendir returns no files with extension %s in directory %s", FILE_EXT, ASSETML_DIR);
-    return;
-  } else {
-    g_message("assetml_load_xml directory parsing=%s\n", ASSETML_DIR);
-  }
-
-  while((one_dirent = g_dir_read_name(dir)) != NULL) {
-
-    if(strstr(one_dirent, FILE_EXT)) {
-      gchar *assetmlfile = g_strdup_printf("%s/%s", ASSETML_DIR, one_dirent);
-      
-      assetml_read_xml_file(gl_result, assetmlfile,
-			    dataset, categories, mimetype, locale, name);
-      
-      g_free(assetmlfile);
-    }
-  }
-  g_dir_close(dir);
-}
-
-
-
-void free_asset(AssetML *assetml)
-{
-
-  xmlFree(assetml->locale);
-  xmlFree(assetml->dataset);
-  xmlFree(assetml->description);
-  xmlFree(assetml->categories);
-  xmlFree(assetml->file);
-  xmlFree(assetml->name);
-  xmlFree(assetml->mimetype);
-  xmlFree(assetml->credits);
-
-  g_free(assetml);
-}
-
-void assetml_free_assetlist(GList *assetlist)
-{
-  /* does not  free assets because cache */
-  //g_list_foreach (assetlist, (GFunc) free_asset, NULL);
-  g_list_free(assetlist);
-}
-
-GList*	 assetml_get_asset(gchar *dataset, gchar* categories, gchar* mimetype, const gchar *locale, gchar* file)
-{
-  GList *gl_result = NULL;
-
-  g_message("assetml_get_asset file=%s\n", file);
-
-  assetml_load_xml(&gl_result, dataset, categories, mimetype, locale, file);
-
-  if(gl_result && g_list_length(gl_result)==0)
-    {
-      g_list_free(gl_result);
-      return NULL;
-    }
-  else
-    {
-      g_message("assetml_get_asset file=%s number of matches=%d\n", file, g_list_length(gl_result));
-      g_list_foreach (gl_result, (GFunc) dump_asset, NULL);
-      return gl_result;
-    }
-}
--- gcompris-7.4/src/gcompris/assetml.h.sysassetml	2004-11-04 23:11:29.000000000 +0100
+++ gcompris-7.4/src/gcompris/assetml.h	2006-04-21 17:46:51.000000000 +0200
@@ -1,58 +0,0 @@
-/* gcompris - assetml.h
- *
- * Copyright (C) 2003 Bruno Coudoin
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/*! \file assetml.h
-  \brief The libassetml API
-*/
-
-#ifndef ASSETML_H
-#define ASSETML_H
-
-#include <glib.h>
-
-/**
-   \fn GList*	 assetml_get_asset(gchar *dataset, gchar* categories, gchar* mimetype, gchar* name)
-   \brief Returns a list of AssetML struct
-   \param dataset the name of the dataset, NULL for ANY dataset
-   \param categories a list of categorie columns ';' separated (NULL for all)
-   \param mimetype an official mimetype describing the content (NULL for all)
-   \param locale is the locale to search for or NULL for the current locale
-   \param file the asset file name to get or NULL for any file name
-*/
-GList*	 assetml_get_asset(gchar *dataset, gchar* categories, gchar* mimetype, const gchar* locale, gchar* name);
-
-
-void	 assetml_free_assetlist(GList *assetlist);
-
-typedef struct _AssetML         AssetML;
-
-struct _AssetML
-{
-  gchar		*dataset;
-  gchar		*categories;
-  gchar		*locale;
-  gchar		*description;
-  gchar		*file;
-  gchar		*name;
-  gchar		*mimetype;
-  gchar		*credits;
-};
-
-
-#endif
--- gcompris-7.4/src/gcompris/Makefile.in.sysassetml	2006-04-12 01:13:48.000000000 +0200
+++ gcompris-7.4/src/gcompris/Makefile.in	2006-04-17 22:52:28.000000000 +0200
@@ -308,6 +308,8 @@
 @USE_SQLITE_TRUE at sqlite_cflags = $(SQLITE3_CFLAGS)
 @USE_SQLITE_FALSE at sqlite_cflags = 
 
+ASSETML_CFLAGS=`pkg-config libassetml --cflags`
+ASSETML_LIBS=`pkg-config libassetml --libs`
 
 #if USE_CAIRO
 #cairo_ldflags = $(CAIRO_LIBS)
@@ -333,7 +335,8 @@
 	$(SDL_CFLAGS) \
 	-DGNOME_DISABLE_DEPRECATED \
         $(sqlite_cflags) \
-	$(cairo_cflags)
+	$(cairo_cflags) \
+	$(ASSETML_CFLAGS)
 
 
 gcompris_SOURCES = \
@@ -358,7 +361,7 @@
 lib_LTLIBRARIES = libgcompris-1.la
 
 libgcompris_1_la_LIBADD = \
-	$(GCOMPRIS_LIBS) $(sqlite_ldadd) $(XML_LIBS)
+	$(GCOMPRIS_LIBS) $(sqlite_ldadd) $(XML_LIBS) $(ASSETML_LIBS)
 
 
 libgcompris_1_la_LDFLAGS = $(no_undefined) \
@@ -370,7 +373,6 @@
 libgcomprisinclude_HEADERS = \
 	about.h \
 	anim.h \
-	assetml.h \
 	bonus.h \
 	cursor.h \
 	gameutil.h \
@@ -423,7 +425,6 @@
 	about.c \
 	log.c \
 	sdlplayer.c \
-	assetml.c \
 	anim.c \
         $(profile_c) \
 	$(cairo_c)
@@ -465,7 +466,7 @@
 	gcompris_alphabeta.lo gcompris_files.lo gcompris_confirm.lo \
 	profile.lo wordlist.lo gcompris_db.lo gcompris_im.lo \
 	soundutil.lo cursor.lo bonus.lo timer.lo score.lo skin.lo \
-	config.lo about.lo log.lo sdlplayer.lo assetml.lo anim.lo \
+	config.lo about.lo log.lo sdlplayer.lo anim.lo \
 	$(am__objects_1) $(am__objects_1)
 libgcompris_1_la_OBJECTS = $(am_libgcompris_1_la_OBJECTS)
 bin_PROGRAMS = gcompris$(EXEEXT)
--- gcompris-7.4/src/gcompris/board_config.c.sysassetml	2006-03-01 01:02:02.000000000 +0100
+++ gcompris-7.4/src/gcompris/board_config.c	2006-04-17 22:52:28.000000000 +0200
@@ -20,9 +20,9 @@
  */
 
 #include <string.h>
+#include <libassetml/assetml.h>
 
 #include "gcompris.h"
-#include "assetml.h"
 
 #define COMBOBOX_COL_MAX 15
 
--- gcompris-7.4/src/gcompris/Makefile.am.sysassetml	2006-04-04 01:06:25.000000000 +0200
+++ gcompris-7.4/src/gcompris/Makefile.am	2006-04-17 22:53:11.000000000 +0200
@@ -15,6 +15,9 @@
 sqlite_cflags =
 endif
 
+ASSETML_CFLAGS=`pkg-config libassetml --cflags`
+ASSETML_LIBS=`pkg-config libassetml --libs`
+
 #if USE_CAIRO
 #cairo_ldflags = $(CAIRO_LIBS)
 #cairo_cflags = $(CAIRO_CFLAGS)
@@ -53,7 +56,8 @@
 	$(SDL_CFLAGS) \
 	-DGNOME_DISABLE_DEPRECATED \
         $(sqlite_cflags) \
-	$(cairo_cflags)
+	$(cairo_cflags) \
+	$(ASSETML_CFLAGS)
 
 gcompris_SOURCES = \
 	main.c
@@ -76,7 +80,7 @@
 lib_LTLIBRARIES = libgcompris-1.la
 
 libgcompris_1_la_LIBADD = \
-	$(GCOMPRIS_LIBS) $(sqlite_ldadd) $(XML_LIBS)
+	$(GCOMPRIS_LIBS) $(sqlite_ldadd) $(XML_LIBS) $(ASSETML_LIBS)
 
 libgcompris_1_la_LDFLAGS = $(no_undefined) \
 	-version-info $(LIBGCOMPRIS_CURRENT):$(LIBGCOMPRIS_REVISION):$(LIBGCOMPRIS_AGE) 
@@ -86,7 +90,6 @@
 libgcomprisinclude_HEADERS =			\
 	about.h \
 	anim.h \
-	assetml.h \
 	bonus.h \
 	cursor.h \
 	gameutil.h \
@@ -138,7 +141,6 @@
 	about.c \
 	log.c \
 	sdlplayer.c \
-	assetml.c \
 	anim.c \
         $(profile_c) \
 	$(cairo_c)
--- gcompris-7.4/src/gcompris/gameutil.c.sysassetml	2006-04-04 00:21:44.000000000 +0200
+++ gcompris-7.4/src/gcompris/gameutil.c	2006-04-17 22:52:28.000000000 +0200
@@ -27,11 +27,10 @@
 #include <libxml/tree.h>
 #include <libxml/parser.h>
 #include <libxml/parserInternals.h>
+#include <libassetml/assetml.h>
 
 #include "gcompris.h"
 
-#include "assetml.h"
-
 #define IMAGEEXTENSION ".png"
 
 #define MAX_DESCRIPTION_LENGTH 1000


--- NEW FILE gcompris.6 ---
.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.25.
.TH "GCOMPRIS" 6 "February 2002" "User Commands"
.SH NAME
gcompris \- educational games
.SH SYNOPSIS
.B gcompris
[\fIOPTION\fR...]
.SH DESCRIPTION
GNOME options
.TP
\fB\-\-disable\-sound\fR
Disable sound server usage
.TP
\fB\-\-enable\-sound\fR
Enable sound server usage
.TP
\fB\-\-espeaker\fR=\fIHOSTNAME\fR:PORT
Host:port on which the sound server to use is
running
.HP
\fB\-\-version\fR
.PP
Help options
.TP
-?, \fB\-\-help\fR
Show this help message
.TP
\fB\-\-usage\fR
Display brief usage message
.PP
GTK options
.TP
\fB\-\-gdk\-debug\fR=\fIFLAGS\fR
Gdk debugging flags to set
.TP
\fB\-\-gdk\-no\-debug\fR=\fIFLAGS\fR
Gdk debugging flags to unset
.TP
\fB\-\-display\fR=\fIDISPLAY\fR
X display to use
.TP
\fB\-\-sync\fR
Make X calls synchronous
.TP
\fB\-\-no\-xshm\fR
Don't use X shared memory extension
.TP
\fB\-\-name\fR=\fINAME\fR
Program name as used by the window manager
.TP
\fB\-\-class\fR=\fICLASS\fR
Program class as used by the window manager
.HP
\fB\-\-gxid_host\fR=\fIHOST\fR
.HP
\fB\-\-gxid_port\fR=\fIPORT\fR
.HP
\fB\-\-xim\-preedit\fR=\fISTYLE\fR
.HP
\fB\-\-xim\-status\fR=\fISTYLE\fR
.TP
\fB\-\-gtk\-debug\fR=\fIFLAGS\fR
Gtk+ debugging flags to set
.TP
\fB\-\-gtk\-no\-debug\fR=\fIFLAGS\fR
Gtk+ debugging flags to unset
.TP
\fB\-\-g\-fatal\-warnings\fR
Make all warnings fatal
.TP
\fB\-\-gtk\-module\fR=\fIMODULE\fR
Load an additional Gtk module
.PP
GNOME GUI options
.HP
\fB\-\-disable\-crash\-dialog\fR
.PP
Session management options
.TP
\fB\-\-sm\-client\-id\fR=\fIID\fR
Specify session management ID
.TP
\fB\-\-sm\-config\-prefix\fR=\fIPREFIX\fR
Specify prefix of saved configuration
.TP
\fB\-\-sm\-disable\fR
Disable connection to session manager
.PP
gcompris options
.TP
\fB\-f\fR, \fB\-\-fullscreen\fR
run gcompris in fullscreen mode.
.TP
\fB\-w\fR, \fB\-\-window\fR
run gcompris in window mode.
.TP
\fB\-s\fR, \fB\-\-sound\fR
run gcompris with sound enabled.
.TP
\fB\-m\fR, \fB\-\-mute\fR
run gcompris without sound.
.TP
\fB\-v\fR, \fB\-\-version\fR
Prints the version of gcompris
.PP
Help options
.TP
-?, \fB\-\-help\fR
Show this help message
.TP
\fB\-\-usage\fR
Display brief usage message
.SH "SEE ALSO"
The full documentation for
.B gcompris
is maintained as a Texinfo manual.  If the
.B info
and
.B gcompris
programs are properly installed at your site, the command
.IP
.B info gcompris
.PP
should give you access to the complete manual.


--- NEW FILE gcompris.spec ---
Name:           gcompris
Version:        7.4
Release:        4%{?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
Patch1:         gcompris-sys-assetml.patch
Patch2:         gcompris-nl.patch
Patch3:         gcompris-electric.patch
Patch4:         gcompris-click_on_letter.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Buildrequires:  libgnomeui-devel sqlite-devel libassetml-devel python-devel
Buildrequires:  pygtk2-devel SDL_mixer-devel libXt-devel libXrandr-devel
Buildrequires:  gnome-python2-canvas python-sqlite2 texinfo texi2html
Buildrequires:  perl(XML::Parser) gettext desktop-file-utils gnuchess
Requires:       gnuchess gnucap tuxpaint gcompris-flags
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info

%description
GCompris / I Got IT is an educationnal game for children starting at 2.
More than 100 different activities are proposed:
* Click on the animals => learn the mouse/click usage
* Type the falling letters => learn the keyboard usage
* Falling Dices
* Falling words
* Basic algebra
* Time learning with an analog clock
* Puzzle game with famous paintings
* Drive Plane to catch clouds in increasing number
* Balance the scales
* And much more ...

Some activities make use of sounds.  For those you'll have to install the         
gcompris-sound package for the languages you intend to use.


%description -l fr
GCompris / J'ai Compris est un logiciel ??ducatif pour les enfants 
?? partir de 2 ans.

Plus de 100 activit??s sont propos??es :
* Cliquer sur les animaux => apprentissage du click et de la souris
* Entrer les lettres qui tombent => Apprentissage du clavier
* Les d??s qui tombent
* Les mots qui tombent
* Alg??bre simple
* Apprentissage de la lecture de l'heure sur une horloge analogique
* Puzzle avec des tableaux c??l??bres
* Pilote un avion pour attraper les nuages dans l'ordre
* Equilibre la balance
* ...


%package libs
Summary:        GCompris core-engine library
Group:          System Environment/Libraries

%description libs
This package contains the shared library which contains the core-engine of
GCompris.


%package devel
Summary:        Development libraries and headers for gcompris-lib
Group:          Development/Libraries
Requires:	%{name}-lib = %{version}
Requires:       libgnomecanvas-devel pkgconfig

%description devel
Developmental files for the core-engine library of GCompris


%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.


%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.


%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.


%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.


%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.


%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.


%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.


%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.


%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.


%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.


%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.


%package sound-sv
Summary:        GCompris voices in Swedish
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.


%package sound-eu
Summary:        GCompris voices in Basque
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.


%package flags
Summary:        Country flags for use with GCompris (60x40 PNG)
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.


%prep
%setup -q
%patch1 -p1 -z .sysassetml -E
# no backup files for this patch, otherwise they get installed under /usr/share
%patch2 -p1
%patch3 -p1 -z .electric
%patch4 -p1 -z .click_on_letter
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


%build
# The configure check for python-gnome.canvas fails without X running,
# --enable-py-build-only works around this
%configure --enable-py-build-only
# 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
# the translations
sed -i 's/Name=Educational suite gcompris/Name=GCompris Educational suite/' \
  gcompris.desktop
sed -i \
  's/Comment=Administration for gcompris/GenericName=Administration for gcompris\nComment=Specify which activities may be used by whom/' \
  gcompris-edit.desktop


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man6
rm $RPM_BUILD_ROOT%{_libdir}/libgcompris-1.la
rm $RPM_BUILD_ROOT%{_libdir}/gcompris/lib*.la
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
rm -fr $RPM_BUILD_ROOT/usr/lib/menu
%find_lang %{name}

# below is the desktop file and icon stuff.
desktop-file-install --vendor fedora --delete-original                  \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications                         \
  --add-category X-Fedora                                               \
  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

desktop-file-install --vendor fedora --delete-original                  \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications                         \
  --add-category X-Fedora                                               \
  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}-edit.desktop

mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps
mv $RPM_BUILD_ROOT/usr/share/pixmaps/%{name}.png \
  $RPM_BUILD_ROOT/usr/share/pixmaps/%{name}-edit.png \
  $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps
rmdir $RPM_BUILD_ROOT/usr/share/pixmaps


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :

%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
if [ $1 = 0 ]; then
    /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
fi

%post libs -p /sbin/ldconfig

%postun libs -p /sbin/ldconfig


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_bindir}/%{name}
%{_libdir}/%{name}
%dir %{_datadir}/gcompris
%dir %{_datadir}/gcompris/boards
%{_datadir}/gcompris/boards/DOCUMENTATIONS
%{_datadir}/gcompris/boards/README
%{_datadir}/gcompris/boards/a*
%{_datadir}/gcompris/boards/b*
%{_datadir}/gcompris/boards/c*
%{_datadir}/gcompris/boards/d*
%{_datadir}/gcompris/boards/e*
%{_datadir}/gcompris/boards/f*.xml
%{_datadir}/gcompris/boards/fishes
%{_datadir}/gcompris/boards/g*
%{_datadir}/gcompris/boards/h*
%{_datadir}/gcompris/boards/i*
%{_datadir}/gcompris/boards/k*
%{_datadir}/gcompris/boards/l*
%{_datadir}/gcompris/boards/m*
%{_datadir}/gcompris/boards/n*
%{_datadir}/gcompris/boards/p*
%{_datadir}/gcompris/boards/r*
%{_datadir}/gcompris/boards/s*.xml
%{_datadir}/gcompris/boards/scales
%{_datadir}/gcompris/boards/skins
%dir %{_datadir}/gcompris/boards/sounds
%{_datadir}/gcompris/boards/sounds/*.ogg
%{_datadir}/gcompris/boards/sounds/melody
%{_datadir}/gcompris/boards/sounds/memory
%{_datadir}/gcompris/boards/sounds/chronos
%{_datadir}/gcompris/boards/sounds/LuneRouge
%{_datadir}/gcompris/boards/sounds/HOWTO_ENCODE
%{_datadir}/gcompris/boards/submarine
%{_datadir}/gcompris/boards/t*
%{_datadir}/gcompris/boards/w*
%{_datadir}/gcompris/python
%{_datadir}/gnome
%{_datadir}/icons/hicolor/48x48/apps/%{name}*.png
%{_datadir}/applications/fedora-%{name}*.desktop
%{_infodir}/%{name}.info.gz
%{_mandir}/man6/%{name}.6.gz

%files libs
%defattr(-,root,root,-)
%{_libdir}/libgcompris-1.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/libgcompris-1.0
%{_libdir}/libgcompris-1.so
%{_libdir}/pkgconfig/libgcompris-1.0.pc

%files sound-da
%defattr(-,root,root,-)
%{_datadir}/assetml/gcompris_*_da.assetml
%dir %{_datadir}/gcompris
%dir %{_datadir}/gcompris/boards
%dir %{_datadir}/gcompris/boards/sounds
%{_datadir}/gcompris/boards/sounds/da

%files sound-de
%defattr(-,root,root,-)
%{_datadir}/assetml/gcompris_*_de.assetml
%dir %{_datadir}/gcompris
%dir %{_datadir}/gcompris/boards
%dir %{_datadir}/gcompris/boards/sounds
%{_datadir}/gcompris/boards/sounds/de

%files sound-en
%defattr(-,root,root,-)
%{_datadir}/assetml/gcompris_*_en.assetml
%dir %{_datadir}/gcompris
%dir %{_datadir}/gcompris/boards
%dir %{_datadir}/gcompris/boards/sounds
%{_datadir}/gcompris/boards/sounds/en

%files sound-es
%defattr(-,root,root,-)
%{_datadir}/assetml/gcompris_*_es.assetml
%dir %{_datadir}/gcompris
%dir %{_datadir}/gcompris/boards
%dir %{_datadir}/gcompris/boards/sounds
%{_datadir}/gcompris/boards/sounds/es

%files sound-fi
%defattr(-,root,root,-)
%{_datadir}/assetml/gcompris_*_fi.assetml
%dir %{_datadir}/gcompris
%dir %{_datadir}/gcompris/boards
%dir %{_datadir}/gcompris/boards/sounds
%{_datadir}/gcompris/boards/sounds/fi

%files sound-fr
%defattr(-,root,root,-)
%{_datadir}/assetml/gcompris_*_fr.assetml
%dir %{_datadir}/gcompris
%dir %{_datadir}/gcompris/boards
%dir %{_datadir}/gcompris/boards/sounds
%{_datadir}/gcompris/boards/sounds/fr

%files sound-hu
%defattr(-,root,root,-)
%{_datadir}/assetml/gcompris_*_hu.assetml
%dir %{_datadir}/gcompris
%dir %{_datadir}/gcompris/boards
%dir %{_datadir}/gcompris/boards/sounds
%{_datadir}/gcompris/boards/sounds/hu

%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-nl
%defattr(-,root,root,-)
%{_datadir}/assetml/gcompris_*_nl.assetml
%dir %{_datadir}/gcompris
%dir %{_datadir}/gcompris/boards
%dir %{_datadir}/gcompris/boards/sounds
%{_datadir}/gcompris/boards/sounds/nl

%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

%files sound-ru
%defattr(-,root,root,-)
%{_datadir}/assetml/gcompris_*_ru.assetml
%dir %{_datadir}/gcompris
%dir %{_datadir}/gcompris/boards
%dir %{_datadir}/gcompris/boards/sounds
%{_datadir}/gcompris/boards/sounds/ru

%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-eu
%defattr(-,root,root,-)
%{_datadir}/assetml/gcompris_*_eu.assetml
%dir %{_datadir}/gcompris
%dir %{_datadir}/gcompris/boards
%dir %{_datadir}/gcompris/boards/sounds
%{_datadir}/gcompris/boards/sounds/eu

%files flags
%defattr(-,root,root,-)
%{_datadir}/assetml/gcompris_flags.assetml
%dir %{_datadir}/gcompris
%dir %{_datadir}/gcompris/boards
%{_datadir}/gcompris/boards/flags


%changelog
* Sat Apr 29 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 7.4-4
- Add click_on_letter.patch from CVS which fixes a few problems with the
  click on letter activity when the sounds are not installed

* Thu Apr 27 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 7.4-3
- Don't use a patch on the .desktop files as that breaks the translations,
  instead use sed at the end of %%build

* Tue Apr 25 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 7.4-2
- Fix a few parser errors in nl.po
- Drop Patch0, instead use a configure option with the same effect

* Mon Apr 10 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 7.4-1
- Initial spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Apr 2006 07:51:18 -0000	1.1
+++ .cvsignore	30 Apr 2006 08:28:51 -0000	1.2
@@ -0,0 +1 @@
+gcompris-7.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Apr 2006 07:51:18 -0000	1.1
+++ sources	30 Apr 2006 08:28:51 -0000	1.2
@@ -0,0 +1 @@
+d80e55da21170a98d671c98b3e582cc3  gcompris-7.4.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 30 09:27:59 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun, 30 Apr 2006 02:27:59 -0700
Subject: rpms/heartbeat/FC-4 .cvsignore, 1.3,
	1.4 heartbeat-fedora-chkconfig.patch, 1.1,
	1.2 heartbeat-fedora-pam.patch, 1.1, 1.2 heartbeat.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200604300928.k3U9S1Oq022998@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/heartbeat/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22949/FC-4

Modified Files:
	.cvsignore heartbeat-fedora-chkconfig.patch 
	heartbeat-fedora-pam.patch heartbeat.spec sources 
Log Message:
* Thu Apr 27 2006  Joost Soeterbroek <fedora at soeterbroek.com> - 2.0.5-1
- upstream version 2.0.5
- removed patch2 - ownership of /heartbeat/crm/cib.xml is no longer
  set in cts/CM_LinuxHAv2.py.in
  + Version 2.0.5 - significant bug fixes and a few feature deficits fixed
  + various portability fixes
  + enable GUI to run with pygtk 2.4
  + significant GUI improvements and speedups
  + numerous logging improvements (generally much quieter)
  + speed up CIB processing by writing it to disk asynchronously
  + add CIB on-disk checksums
  + removed dependency on openssl
  + added "failure stickiness" to the CIB/CRM
  + Several fixes to the membership code
  + We now log all output from resource agents
  + fixed STONITHd memory leaks.
  + Added an OCF RA for Xen guests
  + Added email alerts to ldirectord
  + Improvements to the haresources2cib upgrade tool
  + Several fixes to cibadmin
  + Fix some autoadd-related bugs
  + Added Chinese support to the GUI
  + Added a daemon to replace and generalize ipfail
    + Limited testing only
  + Significant improvements to CIM model, including modifying things
  + Extensive Master/slave testing and fixes
  + Use a digest of the parameters used in an action (smaller CIB)
  + Improved detection of "old" events that should be ignored by the PE
    (ensures resource monitoring is active when required)
  + Better detection of required and/or optimal behaviour in mixed
    (and formerly mixed) clusters
  + LRM now supports multiple concurrent monitor operations
  + Optional startup & runtime enforcement of DTD validation
    (Invalid changes are rejected)
  + cibadmin tool overhauled and verified to function correctly
  + Some deprecated CIB features now unsupported
    + Placing nvpair objects in crm_config (must now use
      cluster_property_set)
    + on_stopfail removed in favor of setting on_fail in the resource's
      stop operation
    + start_prereq removed in favor of setting prereq in the resource's
      start operation 



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	30 Mar 2006 17:41:38 -0000	1.3
+++ .cvsignore	30 Apr 2006 09:27:59 -0000	1.4
@@ -1 +1 @@
-heartbeat-2.0.4.tar.gz
+heartbeat-2.0.5.tar.gz

heartbeat-fedora-chkconfig.patch:

Index: heartbeat-fedora-chkconfig.patch
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/FC-4/heartbeat-fedora-chkconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- heartbeat-fedora-chkconfig.patch	30 Mar 2006 17:41:38 -0000	1.1
+++ heartbeat-fedora-chkconfig.patch	30 Apr 2006 09:27:59 -0000	1.2
@@ -1,6 +1,6 @@
-diff -Nur heartbeat-2.0.4.orig/heartbeat/init.d/heartbeat.in heartbeat-2.0.4/heartbeat/init.d/heartbeat.in
---- heartbeat-2.0.4.orig/heartbeat/init.d/heartbeat.in	2005-09-10 23:46:23.000000000 +0200
-+++ heartbeat-2.0.4/heartbeat/init.d/heartbeat.in	2006-03-27 19:55:19.000000000 +0200
+diff -Nur heartbeat-2.0.5.orig/heartbeat/init.d/heartbeat.in heartbeat-2.0.5/heartbeat/init.d/heartbeat.in
+--- heartbeat-2.0.5.orig/heartbeat/init.d/heartbeat.in	2006-04-14 21:25:33.000000000 +0200
++++ heartbeat-2.0.5/heartbeat/init.d/heartbeat.in	2006-04-27 20:32:29.000000000 +0200
 @@ -13,7 +13,7 @@
  #		We don't hate anyone, and like for everyone to use
  #		our software, no matter what OS or distribution you're using.
@@ -10,26 +10,7 @@
  # description: Startup script high-availability services.
  # processname: heartbeat
  # pidfile: @localstatedir@/run/heartbeat.pid
-@@ -51,18 +51,6 @@
- RUNDIR=@localstatedir@/run
- 
- if
--  [ -r /etc/SuSE-release ]
--then
--  # rc.status is new since SuSE 7.0
--  [ -r /etc/rc.status ] && . /etc/rc.status
--  [ -r /etc/rc.config ] && . /etc/rc.config
--
--  # Determine the base and follow a runlevel link name.
--  base=${0##*/}
--  link=${base#*[SK][0-9][0-9]}
--
--fi
--if
-   [ -z "$rc_done" ]
- then
-   rc_done="Done."
-@@ -391,12 +379,7 @@
+@@ -391,12 +391,7 @@
  	StartHA
  	RC=$?
  	Echo
@@ -43,7 +24,7 @@
  	RunStartStop post-start $RC
  	;;
  
-@@ -413,11 +396,7 @@
+@@ -413,11 +408,7 @@
  	StopHA
  	RC=$?
  	Echo
@@ -56,9 +37,9 @@
          RunStartStop post-stop $RC
  	StopLogd
  	;;
-diff -Nur heartbeat-2.0.4.orig/ldirectord/init.d/ldirectord heartbeat-2.0.4/ldirectord/init.d/ldirectord
---- heartbeat-2.0.4.orig/ldirectord/init.d/ldirectord	2005-10-17 14:49:21.000000000 +0200
-+++ heartbeat-2.0.4/ldirectord/init.d/ldirectord	2006-03-27 19:56:40.000000000 +0200
+diff -Nur heartbeat-2.0.5.orig/ldirectord/init.d/ldirectord heartbeat-2.0.5/ldirectord/init.d/ldirectord
+--- heartbeat-2.0.5.orig/ldirectord/init.d/ldirectord	2005-10-17 14:49:21.000000000 +0200
++++ heartbeat-2.0.5/ldirectord/init.d/ldirectord	2006-04-27 20:33:35.000000000 +0200
 @@ -2,7 +2,7 @@
  #
  # ldirectord  Linux Director Daemon

heartbeat-fedora-pam.patch:

Index: heartbeat-fedora-pam.patch
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/FC-4/heartbeat-fedora-pam.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- heartbeat-fedora-pam.patch	30 Mar 2006 17:41:38 -0000	1.1
+++ heartbeat-fedora-pam.patch	30 Apr 2006 09:27:59 -0000	1.2
@@ -1,6 +1,6 @@
-diff -Nur heartbeat-2.0.4.orig/mgmt/daemon/mgmtd.pam heartbeat-2.0.4/mgmt/daemon/mgmtd.pam
---- heartbeat-2.0.4.orig/mgmt/daemon/mgmtd.pam	2005-12-30 09:35:27.000000000 +0100
-+++ heartbeat-2.0.4/mgmt/daemon/mgmtd.pam	2006-03-27 19:59:12.000000000 +0200
+diff -Nur heartbeat-2.0.5.orig/mgmt/daemon/mgmtd.pam heartbeat-2.0.5/mgmt/daemon/mgmtd.pam
+--- heartbeat-2.0.5.orig/mgmt/daemon/mgmtd.pam	2005-12-30 09:35:27.000000000 +0100
++++ heartbeat-2.0.5/mgmt/daemon/mgmtd.pam	2006-04-27 20:36:29.000000000 +0200
 @@ -1,3 +1,8 @@
 -auth    required        pam_unix.so
 -account required        pam_unix.so


Index: heartbeat.spec
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/FC-4/heartbeat.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- heartbeat.spec	30 Mar 2006 17:41:38 -0000	1.2
+++ heartbeat.spec	30 Apr 2006 09:27:59 -0000	1.3
@@ -5,19 +5,19 @@
 %define           uname hacluster
 Summary:          Heartbeat subsystem for High-Availability Linux
 Name:             heartbeat
-Version:          2.0.4
-Release:          2%{?dist}
+Version:          2.0.5
+Release:          1%{?dist}
 License:          GPL/LGPL
 URL:              http://linux-ha.org/
 Group:            System Environment/Daemons
 Source0:          http://linux-ha.org/download/%{name}-%{version}.tar.gz
 Patch0:           heartbeat-fedora-pam.patch
 Patch1:           heartbeat-fedora-chkconfig.patch
-Patch2:           heartbeat-fedora-ccmuser.patch
+#Patch2:           heartbeat-fedora-ccmuser.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires:    glib2-devel
 BuildRequires:    iputils
-BuildRequires:    openssl-devel
+#BuildRequires:    openssl-devel
 BuildRequires:    libnet-devel
 BuildRequires:    libtool-ltdl-devel
 BuildRequires:    net-snmp-devel
@@ -108,7 +108,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+#%patch2 -p1
  
 %build
 # disable-fatal-warnings flag used to disable gcc4.x warnings of 'difference in signedness'
@@ -139,7 +139,6 @@
 
 sed -i -e '1i# -*-Shell-script-*-' $RPM_BUILD_ROOT/%{_libdir}/heartbeat/ocf-shellfuncs 
 sed -i -e '1i# -*-Shell-script-*-' $RPM_BUILD_ROOT/%{_sysconfdir}/ha.d/shellfuncs
-chmod -x $RPM_BUILD_ROOT/%{_libdir}/heartbeat/crmtest/helper.sh
 chmod -x $RPM_BUILD_ROOT/%{_libdir}/heartbeat/ocf-shellfuncs
 chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/ha.d/shellfuncs
 chmod -x $RPM_BUILD_ROOT/%{_libdir}/heartbeat/pymgmt.py
@@ -191,6 +190,7 @@
 %{_libdir}/libcib.so.*
 %{_libdir}/libclm.so.*
 %{_libdir}/libcrmcommon.so.*
+%{_libdir}/libtransitioner.so.*
 %{_libdir}/libhbclient.so.*
 %{_libdir}/liblrm.so.*
 %{_libdir}/libpengine.so.*
@@ -223,9 +223,13 @@
 %{_sbindir}/crm_attribute
 %{_sbindir}/crm_resource
 %{_sbindir}/crm_verify
+%{_sbindir}/attrd_updater
+%{_sbindir}/crm_failcount
+%{_sbindir}/crm_primitive.*
 %dir %attr (755, hacluster, haclient) %{_var}/run/heartbeat/ccm
 %dir %attr (755, hacluster, haclient) %{_var}/run/heartbeat/crm
 %dir %attr (755, hacluster, haclient) %{_var}/lib/heartbeat/crm
+%dir %attr (755, hacluster, haclient) %{_var}/lib/heartbeat/pengine
 %{_mandir}/man1/cl_status.1*
 %{_mandir}/man1/ha_logger.1*
 %{_mandir}/man1/hb_standby.1*
@@ -244,7 +248,7 @@
 %{_libdir}/libhbmgmtcommon.so.*
 %{_libdir}/libhbmgmttls.so.*
 %config(noreplace) %{_sysconfdir}/pam.d/hbmgmtd
-%{_datadir}/locale/zh_CN/LC_MESSAGES/haclient.zh_CN.mo
+%{_datadir}/locale/zh_CN/LC_MESSAGES/haclient.mo
 %endif
 
 %files -n ldirectord
@@ -276,6 +280,8 @@
 %doc doc/COPYING 
 %doc doc/README
 %defattr(-,root,root)
+/usr/include/pils
+%{_libdir}/libpils.*
 %{_libdir}/pils/
 
 %files devel
@@ -290,6 +296,49 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Apr 27 2006  Joost Soeterbroek <fedora at soeterbroek.com> - 2.0.5-1
+- upstream version 2.0.5
+- removed patch2 - ownership of /heartbeat/crm/cib.xml is no longer
+  set in cts/CM_LinuxHAv2.py.in
+  + Version 2.0.5 - significant bug fixes and a few feature deficits fixed
+  + various portability fixes
+  + enable GUI to run with pygtk 2.4
+  + significant GUI improvements and speedups
+  + numerous logging improvements (generally much quieter)
+  + speed up CIB processing by writing it to disk asynchronously
+  + add CIB on-disk checksums
+  + removed dependency on openssl
+  + added "failure stickiness" to the CIB/CRM
+  + Several fixes to the membership code
+  + We now log all output from resource agents
+  + fixed STONITHd memory leaks.
+  + Added an OCF RA for Xen guests
+  + Added email alerts to ldirectord
+  + Improvements to the haresources2cib upgrade tool
+  + Several fixes to cibadmin
+  + Fix some autoadd-related bugs
+  + Added Chinese support to the GUI
+  + Added a daemon to replace and generalize ipfail
+    + Limited testing only
+  + Significant improvements to CIM model, including modifying things
+  + Extensive Master/slave testing and fixes
+  + Use a digest of the parameters used in an action (smaller CIB)
+  + Improved detection of "old" events that should be ignored by the PE
+    (ensures resource monitoring is active when required)
+  + Better detection of required and/or optimal behaviour in mixed
+    (and formerly mixed) clusters
+  + LRM now supports multiple concurrent monitor operations
+  + Optional startup & runtime enforcement of DTD validation
+    (Invalid changes are rejected)
+  + cibadmin tool overhauled and verified to function correctly
+  + Some deprecated CIB features now unsupported
+    + Placing nvpair objects in crm_config (must now use
+      cluster_property_set)
+    + on_stopfail removed in favor of setting on_fail in the resource's
+      stop operation
+    + start_prereq removed in favor of setting prereq in the resource's
+      start operation 
+
 * Wed Mar 29 2006  Joost Soeterbroek <fedora at soeterbroek.com> - 2.0.4-2
 - Version 2.0.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 Mar 2006 17:41:38 -0000	1.3
+++ sources	30 Apr 2006 09:27:59 -0000	1.4
@@ -1 +1 @@
-659aae2365daea3a17e5a4a4ae0b0a3e  heartbeat-2.0.4.tar.gz
+209228b2948cfa4762a3a66454c6cc35  heartbeat-2.0.5.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 30 09:28:00 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun, 30 Apr 2006 02:28:00 -0700
Subject: rpms/heartbeat/FC-5 .cvsignore, 1.3,
	1.4 heartbeat-fedora-chkconfig.patch, 1.1,
	1.2 heartbeat-fedora-pam.patch, 1.1, 1.2 heartbeat.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200604300928.k3U9S2b4023012@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/heartbeat/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22949/FC-5

Modified Files:
	.cvsignore heartbeat-fedora-chkconfig.patch 
	heartbeat-fedora-pam.patch heartbeat.spec sources 
Log Message:
* Thu Apr 27 2006  Joost Soeterbroek <fedora at soeterbroek.com> - 2.0.5-1
- upstream version 2.0.5
- removed patch2 - ownership of /heartbeat/crm/cib.xml is no longer
  set in cts/CM_LinuxHAv2.py.in
  + Version 2.0.5 - significant bug fixes and a few feature deficits fixed
  + various portability fixes
  + enable GUI to run with pygtk 2.4
  + significant GUI improvements and speedups
  + numerous logging improvements (generally much quieter)
  + speed up CIB processing by writing it to disk asynchronously
  + add CIB on-disk checksums
  + removed dependency on openssl
  + added "failure stickiness" to the CIB/CRM
  + Several fixes to the membership code
  + We now log all output from resource agents
  + fixed STONITHd memory leaks.
  + Added an OCF RA for Xen guests
  + Added email alerts to ldirectord
  + Improvements to the haresources2cib upgrade tool
  + Several fixes to cibadmin
  + Fix some autoadd-related bugs
  + Added Chinese support to the GUI
  + Added a daemon to replace and generalize ipfail
    + Limited testing only
  + Significant improvements to CIM model, including modifying things
  + Extensive Master/slave testing and fixes
  + Use a digest of the parameters used in an action (smaller CIB)
  + Improved detection of "old" events that should be ignored by the PE
    (ensures resource monitoring is active when required)
  + Better detection of required and/or optimal behaviour in mixed
    (and formerly mixed) clusters
  + LRM now supports multiple concurrent monitor operations
  + Optional startup & runtime enforcement of DTD validation
    (Invalid changes are rejected)
  + cibadmin tool overhauled and verified to function correctly
  + Some deprecated CIB features now unsupported
    + Placing nvpair objects in crm_config (must now use
      cluster_property_set)
    + on_stopfail removed in favor of setting on_fail in the resource's
      stop operation
    + start_prereq removed in favor of setting prereq in the resource's
      start operation 



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	30 Mar 2006 17:42:04 -0000	1.3
+++ .cvsignore	30 Apr 2006 09:28:00 -0000	1.4
@@ -1 +1 @@
-heartbeat-2.0.4.tar.gz
+heartbeat-2.0.5.tar.gz

heartbeat-fedora-chkconfig.patch:

Index: heartbeat-fedora-chkconfig.patch
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/FC-5/heartbeat-fedora-chkconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- heartbeat-fedora-chkconfig.patch	30 Mar 2006 17:42:04 -0000	1.1
+++ heartbeat-fedora-chkconfig.patch	30 Apr 2006 09:28:00 -0000	1.2
@@ -1,6 +1,6 @@
-diff -Nur heartbeat-2.0.4.orig/heartbeat/init.d/heartbeat.in heartbeat-2.0.4/heartbeat/init.d/heartbeat.in
---- heartbeat-2.0.4.orig/heartbeat/init.d/heartbeat.in	2005-09-10 23:46:23.000000000 +0200
-+++ heartbeat-2.0.4/heartbeat/init.d/heartbeat.in	2006-03-27 19:55:19.000000000 +0200
+diff -Nur heartbeat-2.0.5.orig/heartbeat/init.d/heartbeat.in heartbeat-2.0.5/heartbeat/init.d/heartbeat.in
+--- heartbeat-2.0.5.orig/heartbeat/init.d/heartbeat.in	2006-04-14 21:25:33.000000000 +0200
++++ heartbeat-2.0.5/heartbeat/init.d/heartbeat.in	2006-04-27 20:32:29.000000000 +0200
 @@ -13,7 +13,7 @@
  #		We don't hate anyone, and like for everyone to use
  #		our software, no matter what OS or distribution you're using.
@@ -10,26 +10,7 @@
  # description: Startup script high-availability services.
  # processname: heartbeat
  # pidfile: @localstatedir@/run/heartbeat.pid
-@@ -51,18 +51,6 @@
- RUNDIR=@localstatedir@/run
- 
- if
--  [ -r /etc/SuSE-release ]
--then
--  # rc.status is new since SuSE 7.0
--  [ -r /etc/rc.status ] && . /etc/rc.status
--  [ -r /etc/rc.config ] && . /etc/rc.config
--
--  # Determine the base and follow a runlevel link name.
--  base=${0##*/}
--  link=${base#*[SK][0-9][0-9]}
--
--fi
--if
-   [ -z "$rc_done" ]
- then
-   rc_done="Done."
-@@ -391,12 +379,7 @@
+@@ -391,12 +391,7 @@
  	StartHA
  	RC=$?
  	Echo
@@ -43,7 +24,7 @@
  	RunStartStop post-start $RC
  	;;
  
-@@ -413,11 +396,7 @@
+@@ -413,11 +408,7 @@
  	StopHA
  	RC=$?
  	Echo
@@ -56,9 +37,9 @@
          RunStartStop post-stop $RC
  	StopLogd
  	;;
-diff -Nur heartbeat-2.0.4.orig/ldirectord/init.d/ldirectord heartbeat-2.0.4/ldirectord/init.d/ldirectord
---- heartbeat-2.0.4.orig/ldirectord/init.d/ldirectord	2005-10-17 14:49:21.000000000 +0200
-+++ heartbeat-2.0.4/ldirectord/init.d/ldirectord	2006-03-27 19:56:40.000000000 +0200
+diff -Nur heartbeat-2.0.5.orig/ldirectord/init.d/ldirectord heartbeat-2.0.5/ldirectord/init.d/ldirectord
+--- heartbeat-2.0.5.orig/ldirectord/init.d/ldirectord	2005-10-17 14:49:21.000000000 +0200
++++ heartbeat-2.0.5/ldirectord/init.d/ldirectord	2006-04-27 20:33:35.000000000 +0200
 @@ -2,7 +2,7 @@
  #
  # ldirectord  Linux Director Daemon

heartbeat-fedora-pam.patch:

Index: heartbeat-fedora-pam.patch
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/FC-5/heartbeat-fedora-pam.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- heartbeat-fedora-pam.patch	30 Mar 2006 17:42:04 -0000	1.1
+++ heartbeat-fedora-pam.patch	30 Apr 2006 09:28:00 -0000	1.2
@@ -1,6 +1,6 @@
-diff -Nur heartbeat-2.0.4.orig/mgmt/daemon/mgmtd.pam heartbeat-2.0.4/mgmt/daemon/mgmtd.pam
---- heartbeat-2.0.4.orig/mgmt/daemon/mgmtd.pam	2005-12-30 09:35:27.000000000 +0100
-+++ heartbeat-2.0.4/mgmt/daemon/mgmtd.pam	2006-03-27 19:59:12.000000000 +0200
+diff -Nur heartbeat-2.0.5.orig/mgmt/daemon/mgmtd.pam heartbeat-2.0.5/mgmt/daemon/mgmtd.pam
+--- heartbeat-2.0.5.orig/mgmt/daemon/mgmtd.pam	2005-12-30 09:35:27.000000000 +0100
++++ heartbeat-2.0.5/mgmt/daemon/mgmtd.pam	2006-04-27 20:36:29.000000000 +0200
 @@ -1,3 +1,8 @@
 -auth    required        pam_unix.so
 -account required        pam_unix.so


Index: heartbeat.spec
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/FC-5/heartbeat.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- heartbeat.spec	30 Mar 2006 17:42:04 -0000	1.2
+++ heartbeat.spec	30 Apr 2006 09:28:00 -0000	1.3
@@ -5,19 +5,19 @@
 %define           uname hacluster
 Summary:          Heartbeat subsystem for High-Availability Linux
 Name:             heartbeat
-Version:          2.0.4
-Release:          2%{?dist}
+Version:          2.0.5
+Release:          1%{?dist}
 License:          GPL/LGPL
 URL:              http://linux-ha.org/
 Group:            System Environment/Daemons
 Source0:          http://linux-ha.org/download/%{name}-%{version}.tar.gz
 Patch0:           heartbeat-fedora-pam.patch
 Patch1:           heartbeat-fedora-chkconfig.patch
-Patch2:           heartbeat-fedora-ccmuser.patch
+#Patch2:           heartbeat-fedora-ccmuser.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires:    glib2-devel
 BuildRequires:    iputils
-BuildRequires:    openssl-devel
+#BuildRequires:    openssl-devel
 BuildRequires:    libnet-devel
 BuildRequires:    libtool-ltdl-devel
 BuildRequires:    net-snmp-devel
@@ -108,7 +108,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+#%patch2 -p1
  
 %build
 # disable-fatal-warnings flag used to disable gcc4.x warnings of 'difference in signedness'
@@ -139,7 +139,6 @@
 
 sed -i -e '1i# -*-Shell-script-*-' $RPM_BUILD_ROOT/%{_libdir}/heartbeat/ocf-shellfuncs 
 sed -i -e '1i# -*-Shell-script-*-' $RPM_BUILD_ROOT/%{_sysconfdir}/ha.d/shellfuncs
-chmod -x $RPM_BUILD_ROOT/%{_libdir}/heartbeat/crmtest/helper.sh
 chmod -x $RPM_BUILD_ROOT/%{_libdir}/heartbeat/ocf-shellfuncs
 chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/ha.d/shellfuncs
 chmod -x $RPM_BUILD_ROOT/%{_libdir}/heartbeat/pymgmt.py
@@ -191,6 +190,7 @@
 %{_libdir}/libcib.so.*
 %{_libdir}/libclm.so.*
 %{_libdir}/libcrmcommon.so.*
+%{_libdir}/libtransitioner.so.*
 %{_libdir}/libhbclient.so.*
 %{_libdir}/liblrm.so.*
 %{_libdir}/libpengine.so.*
@@ -223,9 +223,13 @@
 %{_sbindir}/crm_attribute
 %{_sbindir}/crm_resource
 %{_sbindir}/crm_verify
+%{_sbindir}/attrd_updater
+%{_sbindir}/crm_failcount
+%{_sbindir}/crm_primitive.*
 %dir %attr (755, hacluster, haclient) %{_var}/run/heartbeat/ccm
 %dir %attr (755, hacluster, haclient) %{_var}/run/heartbeat/crm
 %dir %attr (755, hacluster, haclient) %{_var}/lib/heartbeat/crm
+%dir %attr (755, hacluster, haclient) %{_var}/lib/heartbeat/pengine
 %{_mandir}/man1/cl_status.1*
 %{_mandir}/man1/ha_logger.1*
 %{_mandir}/man1/hb_standby.1*
@@ -244,7 +248,7 @@
 %{_libdir}/libhbmgmtcommon.so.*
 %{_libdir}/libhbmgmttls.so.*
 %config(noreplace) %{_sysconfdir}/pam.d/hbmgmtd
-%{_datadir}/locale/zh_CN/LC_MESSAGES/haclient.zh_CN.mo
+%{_datadir}/locale/zh_CN/LC_MESSAGES/haclient.mo
 %endif
 
 %files -n ldirectord
@@ -276,6 +280,8 @@
 %doc doc/COPYING 
 %doc doc/README
 %defattr(-,root,root)
+/usr/include/pils
+%{_libdir}/libpils.*
 %{_libdir}/pils/
 
 %files devel
@@ -290,6 +296,49 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Apr 27 2006  Joost Soeterbroek <fedora at soeterbroek.com> - 2.0.5-1
+- upstream version 2.0.5
+- removed patch2 - ownership of /heartbeat/crm/cib.xml is no longer
+  set in cts/CM_LinuxHAv2.py.in
+  + Version 2.0.5 - significant bug fixes and a few feature deficits fixed
+  + various portability fixes
+  + enable GUI to run with pygtk 2.4
+  + significant GUI improvements and speedups
+  + numerous logging improvements (generally much quieter)
+  + speed up CIB processing by writing it to disk asynchronously
+  + add CIB on-disk checksums
+  + removed dependency on openssl
+  + added "failure stickiness" to the CIB/CRM
+  + Several fixes to the membership code
+  + We now log all output from resource agents
+  + fixed STONITHd memory leaks.
+  + Added an OCF RA for Xen guests
+  + Added email alerts to ldirectord
+  + Improvements to the haresources2cib upgrade tool
+  + Several fixes to cibadmin
+  + Fix some autoadd-related bugs
+  + Added Chinese support to the GUI
+  + Added a daemon to replace and generalize ipfail
+    + Limited testing only
+  + Significant improvements to CIM model, including modifying things
+  + Extensive Master/slave testing and fixes
+  + Use a digest of the parameters used in an action (smaller CIB)
+  + Improved detection of "old" events that should be ignored by the PE
+    (ensures resource monitoring is active when required)
+  + Better detection of required and/or optimal behaviour in mixed
+    (and formerly mixed) clusters
+  + LRM now supports multiple concurrent monitor operations
+  + Optional startup & runtime enforcement of DTD validation
+    (Invalid changes are rejected)
+  + cibadmin tool overhauled and verified to function correctly
+  + Some deprecated CIB features now unsupported
+    + Placing nvpair objects in crm_config (must now use
+      cluster_property_set)
+    + on_stopfail removed in favor of setting on_fail in the resource's
+      stop operation
+    + start_prereq removed in favor of setting prereq in the resource's
+      start operation 
+
 * Wed Mar 29 2006  Joost Soeterbroek <fedora at soeterbroek.com> - 2.0.4-2
 - Version 2.0.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 Mar 2006 17:42:04 -0000	1.3
+++ sources	30 Apr 2006 09:28:00 -0000	1.4
@@ -1 +1 @@
-659aae2365daea3a17e5a4a4ae0b0a3e  heartbeat-2.0.4.tar.gz
+209228b2948cfa4762a3a66454c6cc35  heartbeat-2.0.5.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 30 09:35:03 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun, 30 Apr 2006 02:35:03 -0700
Subject: rpms/heartbeat/FC-4 heartbeat-2.0.3-fedora-ccmuser.patch, 1.1,
	NONE heartbeat-2.0.3-fedora-chkconfig.patch, 1.1,
	NONE heartbeat-2.0.3-fedora-pam.patch, 1.1, NONE
Message-ID: <200604300935.k3U9Z5D0023154@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/heartbeat/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23126/FC-4

Removed Files:
	heartbeat-2.0.3-fedora-ccmuser.patch 
	heartbeat-2.0.3-fedora-chkconfig.patch 
	heartbeat-2.0.3-fedora-pam.patch 
Log Message:
removed patches with upstream version in filename in favor of patches that have non-versioned filenames..


--- heartbeat-2.0.3-fedora-ccmuser.patch DELETED ---


--- heartbeat-2.0.3-fedora-chkconfig.patch DELETED ---


--- heartbeat-2.0.3-fedora-pam.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Apr 30 09:35:04 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun, 30 Apr 2006 02:35:04 -0700
Subject: rpms/heartbeat/FC-5 heartbeat-2.0.3-fedora-ccmuser.patch, 1.1,
	NONE heartbeat-2.0.3-fedora-chkconfig.patch, 1.1,
	NONE heartbeat-2.0.3-fedora-pam.patch, 1.1, NONE
Message-ID: <200604300935.k3U9Z6Z1023157@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/heartbeat/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23126/FC-5

Removed Files:
	heartbeat-2.0.3-fedora-ccmuser.patch 
	heartbeat-2.0.3-fedora-chkconfig.patch 
	heartbeat-2.0.3-fedora-pam.patch 
Log Message:
removed patches with upstream version in filename in favor of patches that have non-versioned filenames..


--- heartbeat-2.0.3-fedora-ccmuser.patch DELETED ---


--- heartbeat-2.0.3-fedora-chkconfig.patch DELETED ---


--- heartbeat-2.0.3-fedora-pam.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Apr 30 10:07:15 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 30 Apr 2006 03:07:15 -0700
Subject: rpms/clamav/devel clamav-0.88.2-guys,
	please-read-the-compiler-warnings-before-doing-a-release.patch,
	NONE, 1.1 sources, 1.15, 1.16 clamav.spec, 1.34,
	1.35 clamav-0.88.1-guys,
	please-read-the-compiler-warnings-before-doing-a-release.patch,
	1.1, NONE
Message-ID: <200604301007.k3UA7HSx025469@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25449

Modified Files:
	sources clamav.spec 
Added Files:
	clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch 
Removed Files:
	clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch 
Log Message:
- updated to 0.88.2 (SECURITY)
- rediffed patches; most issues handled by 0.88.1-2 are fixed in
  0.88.2


***** Not enough context to create diffstat for file: clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch,NONE,1.1
***** Not enough context to create diff for file: clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch,NONE,1.1

Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	6 Apr 2006 16:50:58 -0000	1.15
+++ sources	30 Apr 2006 10:07:15 -0000	1.16
@@ -1,2 +1,2 @@
-9fe8c47037051e350077513dd94fb76a  clamav-0.88.1.tar.gz
-bc06324bf070679854689235df5042d8  clamav-0.88.1.tar.gz.sig
+f0a1c610a1fb70bd748a08bea69c736c  clamav-0.88.2.tar.gz
+6846cb50e005c18ab4b39ff9aa7126fc  clamav-0.88.2.tar.gz.sig


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- clamav.spec	24 Apr 2006 22:05:44 -0000	1.34
+++ clamav.spec	30 Apr 2006 10:07:15 -0000	1.35
@@ -21,8 +21,8 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.88.1
-Release:	%release_func 2
+Version:	0.88.2
+Release:	%release_func 1
 
 License:	GPL
 Group:		Applications/File
@@ -36,7 +36,7 @@
 Source6:	clamav-update.logrotate
 Source7:	clamd.SERVICE.init
 Source8:	clamav-notify-servers
-Patch0:		clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch
+Patch0:		clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch
 Patch1:		clamav-0.88.1-strncpy.patch
 Patch20:	clamav-0.70-user.patch
 Patch21:	clamav-0.70-path.patch
@@ -432,6 +432,11 @@
 %endif	# _without_milter
 
 %changelog
+* Sun Apr 30 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88.2-1
+- updated to 0.88.2 (SECURITY)
+- rediffed patches; most issues handled by 0.88.1-2 are fixed in
+  0.88.2
+
 * Mon Apr 24 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88.1-2
 - added patch which fixes some classes of compiler warnings; at least
   the using of implicitly declared functions was reported to cause

***** Not enough context to create diffstat for file: clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch,1.1,NONE
***** Not enough context to create diff for file: clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch,1.1,NONE



From fedora-extras-commits at redhat.com  Sun Apr 30 10:33:39 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 30 Apr 2006 03:33:39 -0700
Subject: rpms/clamav/FC-4 clamav-0.88.2-guys,
	please-read-the-compiler-warnings-before-doing-a-release.patch,
	NONE, 1.1 clamav-0.88.1-strncpy.patch, NONE, 1.1 sources, 1.15,
	1.16 clamav.spec, 1.31, 1.32
Message-ID: <200604301033.k3UAXfIA025684@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25624/FC-4

Modified Files:
	sources clamav.spec 
Added Files:
	clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch 
	clamav-0.88.1-strncpy.patch 
Log Message:
- updated to 0.88.2 (SECURITY)
- added patch which fixes wrong usage of strncpy(3) in unrarlib.c
- added patch which fixes some classes of compiler warnings


***** Not enough context to create diffstat for file: clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch,NONE,1.1
***** Not enough context to create diff for file: clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch,NONE,1.1
clamav-0.88.1-strncpy.patch:

--- NEW FILE clamav-0.88.1-strncpy.patch ---
2006-04-24  Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>

	* libclamav/unrarlib.c/stricomp(): terminate the string copied
	  with strncpy() explicitly with '\0'. Does not seem to be
	  exploitable at the moment due to deeply buried constraints
	  (function will be called for buffers with a static size of
	  260 only).

	  But it is better to fix it now than to run into problems
	  when function is used for other purposes.

--- clamav-0.88.1/libclamav/unrarlib.c.strncpy	2005-06-23 22:03:12.000000000 +0200
+++ clamav-0.88.1/libclamav/unrarlib.c	2006-04-24 23:10:07.000000000 +0200
@@ -1180,8 +1180,10 @@ int stricomp(char *Str1,char *Str2)
   char S1[512],S2[512];
   char *chptr;
 
-  strncpy(S1,Str1,sizeof(S1));
-  strncpy(S2,Str2,sizeof(S2));
+  strncpy(S1,Str1,sizeof(S1));
+  strncpy(S2,Str2,sizeof(S2));
+  S1[sizeof(S1)-1] = '\0';
+  S2[sizeof(S2)-1] = '\0';
 
   while((chptr = strchr(S1, '\\')) != NULL) /* ignore backslash             */
   {
2006-04-24  Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>

	* libclamav/unrarlib.c/stricomp(): terminate the string copied
	  with strncpy() explicitly with '\0'. Does not seem to be
	  exploitable at the moment due to deeply buried constraints
	  (function will be called for buffers with a static size of
	  260 only).

	  But it is better to fix it now than to run into problems
	  when function is used for other purposes.

--- clamav-0.88.1/libclamav/unrarlib.c.strncpy	2005-06-23 22:03:12.000000000 +0200
+++ clamav-0.88.1/libclamav/unrarlib.c	2006-04-24 23:10:07.000000000 +0200
@@ -1180,8 +1180,10 @@ int stricomp(char *Str1,char *Str2)
   char S1[512],S2[512];
   char *chptr;
 
-  strncpy(S1,Str1,sizeof(S1));
-  strncpy(S2,Str2,sizeof(S2));
+  strncpy(S1,Str1,sizeof(S1));
+  strncpy(S2,Str2,sizeof(S2));
+  S1[sizeof(S1)-1] = '\0';
+  S2[sizeof(S2)-1] = '\0';
 
   while((chptr = strchr(S1, '\\')) != NULL) /* ignore backslash             */
   {


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-4/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	6 Apr 2006 16:50:59 -0000	1.15
+++ sources	30 Apr 2006 10:33:39 -0000	1.16
@@ -1,2 +1,2 @@
-9fe8c47037051e350077513dd94fb76a  clamav-0.88.1.tar.gz
-bc06324bf070679854689235df5042d8  clamav-0.88.1.tar.gz.sig
+f0a1c610a1fb70bd748a08bea69c736c  clamav-0.88.2.tar.gz
+6846cb50e005c18ab4b39ff9aa7126fc  clamav-0.88.2.tar.gz.sig


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-4/clamav.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- clamav.spec	6 Apr 2006 16:50:59 -0000	1.31
+++ clamav.spec	30 Apr 2006 10:33:39 -0000	1.32
@@ -21,7 +21,7 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.88.1
+Version:	0.88.2
 Release:	%release_func 1
 
 License:	GPL
@@ -36,6 +36,8 @@
 Source6:	clamav-update.logrotate
 Source7:	clamd.SERVICE.init
 Source8:	clamav-notify-servers
+Patch0:		clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch
+Patch1:		clamav-0.88.1-strncpy.patch
 Patch20:	clamav-0.70-user.patch
 Patch21:	clamav-0.70-path.patch
 Patch22:	clamav-0.80-initoff.patch
@@ -162,6 +164,9 @@
 
 %prep
 %setup -q
+%patch0  -p1 -b '.guys,please-read-the-compiler-warnings-before-doing-a-release.patch'
+%patch1  -p1 -b .strncpy
+
 %patch20 -p1 -b .user
 %patch21 -p1 -b .path
 %patch22 -p1 -b .initoff
@@ -186,6 +191,7 @@
 ## See https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 and
 ## http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0797
 ## also
+CFLAGS="$RPM_OPT_FLAGS -Wall -W -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99"
 %configure --disable-clamav --with-dbdir=/var/lib/clamav \
            --disable-zlib-vcheck \
 	   %{!?_without_milter:--enable-milter}
@@ -426,6 +432,11 @@
 %endif	# _without_milter
 
 %changelog
+* Sun Apr 30 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88.2-1
+- updated to 0.88.2 (SECURITY)
+- added patch which fixes wrong usage of strncpy(3) in unrarlib.c
+- added patch which fixes some classes of compiler warnings
+
 * Thu Apr 06 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88.1-1
 - updated to 0.88.1 (SECURITY)
 



From fedora-extras-commits at redhat.com  Sun Apr 30 10:33:40 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 30 Apr 2006 03:33:40 -0700
Subject: rpms/clamav/FC-3 clamav-0.88.2-guys,
	please-read-the-compiler-warnings-before-doing-a-release.patch,
	NONE, 1.1 clamav-0.88.1-strncpy.patch, NONE, 1.1 sources, 1.13,
	1.14 clamav.spec, 1.21, 1.22
Message-ID: <200604301033.k3UAXgZi025691@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25624/FC-3

Modified Files:
	sources clamav.spec 
Added Files:
	clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch 
	clamav-0.88.1-strncpy.patch 
Log Message:
- updated to 0.88.2 (SECURITY)
- added patch which fixes wrong usage of strncpy(3) in unrarlib.c
- added patch which fixes some classes of compiler warnings


***** Not enough context to create diffstat for file: clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch,NONE,1.1
***** Not enough context to create diff for file: clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch,NONE,1.1
clamav-0.88.1-strncpy.patch:

--- NEW FILE clamav-0.88.1-strncpy.patch ---
2006-04-24  Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>

	* libclamav/unrarlib.c/stricomp(): terminate the string copied
	  with strncpy() explicitly with '\0'. Does not seem to be
	  exploitable at the moment due to deeply buried constraints
	  (function will be called for buffers with a static size of
	  260 only).

	  But it is better to fix it now than to run into problems
	  when function is used for other purposes.

--- clamav-0.88.1/libclamav/unrarlib.c.strncpy	2005-06-23 22:03:12.000000000 +0200
+++ clamav-0.88.1/libclamav/unrarlib.c	2006-04-24 23:10:07.000000000 +0200
@@ -1180,8 +1180,10 @@ int stricomp(char *Str1,char *Str2)
   char S1[512],S2[512];
   char *chptr;
 
-  strncpy(S1,Str1,sizeof(S1));
-  strncpy(S2,Str2,sizeof(S2));
+  strncpy(S1,Str1,sizeof(S1));
+  strncpy(S2,Str2,sizeof(S2));
+  S1[sizeof(S1)-1] = '\0';
+  S2[sizeof(S2)-1] = '\0';
 
   while((chptr = strchr(S1, '\\')) != NULL) /* ignore backslash             */
   {
2006-04-24  Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>

	* libclamav/unrarlib.c/stricomp(): terminate the string copied
	  with strncpy() explicitly with '\0'. Does not seem to be
	  exploitable at the moment due to deeply buried constraints
	  (function will be called for buffers with a static size of
	  260 only).

	  But it is better to fix it now than to run into problems
	  when function is used for other purposes.

--- clamav-0.88.1/libclamav/unrarlib.c.strncpy	2005-06-23 22:03:12.000000000 +0200
+++ clamav-0.88.1/libclamav/unrarlib.c	2006-04-24 23:10:07.000000000 +0200
@@ -1180,8 +1180,10 @@ int stricomp(char *Str1,char *Str2)
   char S1[512],S2[512];
   char *chptr;
 
-  strncpy(S1,Str1,sizeof(S1));
-  strncpy(S2,Str2,sizeof(S2));
+  strncpy(S1,Str1,sizeof(S1));
+  strncpy(S2,Str2,sizeof(S2));
+  S1[sizeof(S1)-1] = '\0';
+  S2[sizeof(S2)-1] = '\0';
 
   while((chptr = strchr(S1, '\\')) != NULL) /* ignore backslash             */
   {


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-3/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	9 Apr 2006 22:10:45 -0000	1.13
+++ sources	30 Apr 2006 10:33:39 -0000	1.14
@@ -1,2 +1,2 @@
-9fe8c47037051e350077513dd94fb76a  clamav-0.88.1.tar.gz
-bc06324bf070679854689235df5042d8  clamav-0.88.1.tar.gz.sig
+f0a1c610a1fb70bd748a08bea69c736c  clamav-0.88.2.tar.gz
+6846cb50e005c18ab4b39ff9aa7126fc  clamav-0.88.2.tar.gz.sig


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-3/clamav.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- clamav.spec	9 Apr 2006 22:10:45 -0000	1.21
+++ clamav.spec	30 Apr 2006 10:33:39 -0000	1.22
@@ -21,7 +21,7 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.88.1
+Version:	0.88.2
 Release:	%release_func 1
 
 License:	GPL
@@ -36,6 +36,8 @@
 Source6:	clamav-update.logrotate
 Source7:	clamd.SERVICE.init
 Source8:	clamav-notify-servers
+Patch0:		clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch
+Patch1:		clamav-0.88.1-strncpy.patch
 Patch20:	clamav-0.70-user.patch
 Patch21:	clamav-0.70-path.patch
 Patch22:	clamav-0.80-initoff.patch
@@ -162,6 +164,9 @@
 
 %prep
 %setup -q
+%patch0  -p1 -b '.guys,please-read-the-compiler-warnings-before-doing-a-release.patch'
+%patch1  -p1 -b .strncpy
+
 %patch20 -p1 -b .user
 %patch21 -p1 -b .path
 %patch22 -p1 -b .initoff
@@ -186,6 +191,7 @@
 ## See https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 and
 ## http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0797
 ## also
+CFLAGS="$RPM_OPT_FLAGS -Wall -W -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99"
 %configure --disable-clamav --with-dbdir=/var/lib/clamav \
            --disable-zlib-vcheck \
 	   %{!?_without_milter:--enable-milter}
@@ -426,6 +432,11 @@
 %endif	# _without_milter
 
 %changelog
+* Sun Apr 30 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88.2-1
+- updated to 0.88.2 (SECURITY)
+- added patch which fixes wrong usage of strncpy(3) in unrarlib.c
+- added patch which fixes some classes of compiler warnings
+
 * Mon Apr 10 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88.1-1
 - updated to 0.88.1 (SECURITY)
 



From fedora-extras-commits at redhat.com  Sun Apr 30 10:33:38 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 30 Apr 2006 03:33:38 -0700
Subject: rpms/clamav/FC-5 clamav-0.88.1-strncpy.patch, NONE,
	1.1 clamav-0.88.1-guys,
	please-read-the-compiler-warnings-before-doing-a-release.patch,
	NONE, 1.1 sources, 1.15, 1.16 clamav.spec, 1.33, 1.34
Message-ID: <200604301034.k3UAYALr025699@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25624/FC-5

Modified Files:
	sources clamav.spec 
Added Files:
	clamav-0.88.1-strncpy.patch 
	clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch 
Log Message:
- updated to 0.88.2 (SECURITY)
- added patch which fixes wrong usage of strncpy(3) in unrarlib.c
- added patch which fixes some classes of compiler warnings


clamav-0.88.1-strncpy.patch:

--- NEW FILE clamav-0.88.1-strncpy.patch ---
2006-04-24  Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>

	* libclamav/unrarlib.c/stricomp(): terminate the string copied
	  with strncpy() explicitly with '\0'. Does not seem to be
	  exploitable at the moment due to deeply buried constraints
	  (function will be called for buffers with a static size of
	  260 only).

	  But it is better to fix it now than to run into problems
	  when function is used for other purposes.

--- clamav-0.88.1/libclamav/unrarlib.c.strncpy	2005-06-23 22:03:12.000000000 +0200
+++ clamav-0.88.1/libclamav/unrarlib.c	2006-04-24 23:10:07.000000000 +0200
@@ -1180,8 +1180,10 @@ int stricomp(char *Str1,char *Str2)
   char S1[512],S2[512];
   char *chptr;
 
-  strncpy(S1,Str1,sizeof(S1));
-  strncpy(S2,Str2,sizeof(S2));
+  strncpy(S1,Str1,sizeof(S1));
+  strncpy(S2,Str2,sizeof(S2));
+  S1[sizeof(S1)-1] = '\0';
+  S2[sizeof(S2)-1] = '\0';
 
   while((chptr = strchr(S1, '\\')) != NULL) /* ignore backslash             */
   {
2006-04-24  Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>

	* libclamav/unrarlib.c/stricomp(): terminate the string copied
	  with strncpy() explicitly with '\0'. Does not seem to be
	  exploitable at the moment due to deeply buried constraints
	  (function will be called for buffers with a static size of
	  260 only).

	  But it is better to fix it now than to run into problems
	  when function is used for other purposes.

--- clamav-0.88.1/libclamav/unrarlib.c.strncpy	2005-06-23 22:03:12.000000000 +0200
+++ clamav-0.88.1/libclamav/unrarlib.c	2006-04-24 23:10:07.000000000 +0200
@@ -1180,8 +1180,10 @@ int stricomp(char *Str1,char *Str2)
   char S1[512],S2[512];
   char *chptr;
 
-  strncpy(S1,Str1,sizeof(S1));
-  strncpy(S2,Str2,sizeof(S2));
+  strncpy(S1,Str1,sizeof(S1));
+  strncpy(S2,Str2,sizeof(S2));
+  S1[sizeof(S1)-1] = '\0';
+  S2[sizeof(S2)-1] = '\0';
 
   while((chptr = strchr(S1, '\\')) != NULL) /* ignore backslash             */
   {

***** Not enough context to create diffstat for file: clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch,NONE,1.1
***** Not enough context to create diff for file: clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch,NONE,1.1

Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-5/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	6 Apr 2006 16:50:58 -0000	1.15
+++ sources	30 Apr 2006 10:33:38 -0000	1.16
@@ -1,2 +1,2 @@
-9fe8c47037051e350077513dd94fb76a  clamav-0.88.1.tar.gz
-bc06324bf070679854689235df5042d8  clamav-0.88.1.tar.gz.sig
+f0a1c610a1fb70bd748a08bea69c736c  clamav-0.88.2.tar.gz
+6846cb50e005c18ab4b39ff9aa7126fc  clamav-0.88.2.tar.gz.sig


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-5/clamav.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- clamav.spec	6 Apr 2006 16:50:58 -0000	1.33
+++ clamav.spec	30 Apr 2006 10:33:38 -0000	1.34
@@ -21,7 +21,7 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.88.1
+Version:	0.88.2
 Release:	%release_func 1
 
 License:	GPL
@@ -36,6 +36,8 @@
 Source6:	clamav-update.logrotate
 Source7:	clamd.SERVICE.init
 Source8:	clamav-notify-servers
+Patch0:		clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch
+Patch1:		clamav-0.88.1-strncpy.patch
 Patch20:	clamav-0.70-user.patch
 Patch21:	clamav-0.70-path.patch
 Patch22:	clamav-0.80-initoff.patch
@@ -162,6 +164,9 @@
 
 %prep
 %setup -q
+%patch0  -p1 -b '.guys,please-read-the-compiler-warnings-before-doing-a-release.patch'
+%patch1  -p1 -b .strncpy
+
 %patch20 -p1 -b .user
 %patch21 -p1 -b .path
 %patch22 -p1 -b .initoff
@@ -186,6 +191,7 @@
 ## See https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 and
 ## http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0797
 ## also
+CFLAGS="$RPM_OPT_FLAGS -Wall -W -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99"
 %configure --disable-clamav --with-dbdir=/var/lib/clamav \
            --disable-zlib-vcheck \
 	   %{!?_without_milter:--enable-milter}
@@ -426,6 +432,11 @@
 %endif	# _without_milter
 
 %changelog
+* Sun Apr 30 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88.2-1
+- updated to 0.88.2 (SECURITY)
+- added patch which fixes wrong usage of strncpy(3) in unrarlib.c
+- added patch which fixes some classes of compiler warnings
+
 * Thu Apr 06 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88.1-1
 - updated to 0.88.1 (SECURITY)
 



From fedora-extras-commits at redhat.com  Sun Apr 30 11:10:50 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 30 Apr 2006 04:10:50 -0700
Subject: extras-repoclosure - New directory
Message-ID: <200604301110.k3UBAosj032142@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32123/extras-repoclosure

Log Message:
Directory /cvs/fedora/extras-repoclosure added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 30 11:11:54 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 30 Apr 2006 04:11:54 -0700
Subject: extras-repoclosure rc-modified, NONE, 1.1 rc-report.py, NONE,
	1.1 rc-run.py, NONE, 1.1 repoclosure.patch, NONE,
	1.1 yum.repoclosure.conf, NONE, 1.1
Message-ID: <200604301111.k3UBBsif032281@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32253

Added Files:
	rc-modified rc-report.py rc-run.py repoclosure.patch 
	yum.repoclosure.conf 
Log Message:
initial import


--- NEW FILE rc-modified ---
#!/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.
# seth vidal 2005 (c) etc etc


#Read in the metadata of a series of repositories and check all the
#   dependencies in all packages for resolution. Print out the list of
#   packages with unresolved dependencies

import sys
import os

import yum
import yum.Errors
from yum.misc import getCacheDir
from optparse import OptionParser
import rpmUtils.arch
from yum.constants import *
from repomd.packageSack import ListPackageSack


def parseArgs():
    usage = "usage: %s [-c <config file>] [-a <arch>] [-r <repoid>] [-r <repoid2>]" % sys.argv[0]
    parser = OptionParser(usage=usage)
    parser.add_option("-c", "--config", default='/etc/yum.conf',
        help='config file to use (defaults to /etc/yum.conf)')
    parser.add_option("-a", "--arch", default=None,
        help='check as if running the specified arch (default: current arch)')
    parser.add_option("-r", "--repoid", default=[], action='append',
        help="specify repo ids to query, can be specified multiple times (default is all enabled)")
    parser.add_option("-t", "--tempcache", default=False, action="store_true", 
        help="Use a temp dir for storing/accessing yum-cache")
    parser.add_option("-q", "--quiet", default=0, action="store_true", 
                      help="quiet (no output to stderr)")
    parser.add_option("-n", "--newest", default=0, action="store_true",
                      help="check only the newest packages in the repos")
    (opts, args) = parser.parse_args()
    return (opts, args)

class RepoClosure(yum.YumBase):
    def __init__(self, arch = None, config = "/etc/yum.conf"):
        yum.YumBase.__init__(self)

        self.arch = arch
        self.doConfigSetup(fn = config)
        if hasattr(self.repos, 'sqlite'):
            self.repos.sqlite = False
            self.repos._selectSackType()
    
    def evrTupletoVer(self,tuple):
        """convert and evr tuple to a version string, return None if nothing
        to convert"""
    
        e, v,r = tuple

        if v is None:
            return None
    
        val = ''
        if e is not None:
            val = '%s:%s' % (e, v)
    
        if r is not None:
            val = '%s-%s' % (val, r)
    
        return val
    
    def readMetadata(self):
        self.doRepoSetup()
        self.doSackSetup(rpmUtils.arch.getArchList(self.arch))
        for repo in self.repos.listEnabled():
            self.repos.populateSack(which=[repo.id], with='filelists')

    def getBrokenDeps(self, newest=False):
        unresolved = {}
        resolved = {}
        if newest:
            pkgs = []
            for l in self.pkgSack.returnNewestByName():
                for p in l:
                    pkgs.append(p)
        else:
            pkgs = self.pkgSack

        mypkgSack = ListPackageSack(pkgs)
        pkgtuplist = mypkgSack.simplePkgList()
        
        for pkg in pkgs:
            for (req, flags, (reqe, reqv, reqr)) in pkg.returnPrco('requires'):
                if req.startswith('rpmlib'): continue # ignore rpmlib deps
            
                ver = self.evrTupletoVer((reqe, reqv, reqr))
                if resolved.has_key((req,flags,ver)):
                    continue
                try:
                    resolve_sack = self.whatProvides(req, flags, ver)
                except yum.Errors.RepoError, e:
                    pass
            
                if len(resolve_sack) < 1:
                    if not unresolved.has_key(pkg):
                        unresolved[pkg] = []
                    unresolved[pkg].append((req, flags, ver))
                    continue
                    
                if newest:
                    resolved_by_newest = False
                    for po in resolve_sack:# look through and make sure all our answers are newest-only
                        if po.pkgtup in pkgtuplist:
                            resolved_by_newest = True
                            break

                    if resolved_by_newest:                    
                        resolved[(req,flags,ver)] = 1
                    else:
                        if not unresolved.has_key(pkg):
                            unresolved[pkg] = []
                        unresolved[pkg].append((req, flags, ver))                        
                        
        return unresolved
    
    
    def log(self, value, msg):
        pass

def main():
    (opts, cruft) = parseArgs()
    my = RepoClosure(arch = opts.arch, config = opts.config)
    
    if opts.repoid:
        for repo in my.repos.repos.values():
            if repo.id not in opts.repoid:
                repo.disable()
            else:
                repo.enable()

    if os.geteuid() != 0 or opts.tempcache:
        cachedir = getCacheDir()
        if cachedir is None:
            print "Error: Could not make cachedir, exiting"
            sys.exit(50)
            
        my.repos.setCacheDir(cachedir)

    if not opts.quiet:
        print 'Reading in repository metadata - please wait....'

    try:
        my.readMetadata()
    except yum.Errors.RepoError, e:
        print 'Filelists not available for repo: %s' % repo
        print 'Some dependencies may not be complete for this repository'
        print 'Run as root to get all dependencies or use -t to enable a user temp cache'

    if not opts.quiet:
        print 'Checking Dependencies'

    baddeps = my.getBrokenDeps(opts.newest)
    if opts.newest:
        pkgs = []
        for l in my.pkgSack.returnNewestByName():
            for p in l:
                pkgs.append(p)
        num = len(pkgs)
    else:
        num = len(my.pkgSack)
        
    repos = my.repos.listEnabled()

    if not opts.quiet:
        print 'Repos looked at: %s' % len(repos)
        for repo in repos:
            print '   %s' % repo
        print 'Num Packages in Repos: %s' % num
    
    pkgs = baddeps.keys()
    pkgs.sort()
    for pkg in pkgs:
        srcrpm = pkg.returnSimple('sourcerpm')
        print 'source rpm: %s\npackage: %s from %s\n  unresolved deps: ' % (srcrpm, pkg, pkg.repoid)
        for (n, f, v) in baddeps[pkg]:
            req = '%s' % n
            if f: 
                flag = LETTERFLAGS[f]
                req = '%s %s'% (req, flag)
            if v:
                req = '%s %s' % (req, v)
            
            print '     %s' % req
        print

if __name__ == "__main__":
    main()
        


--- NEW FILE rc-report.py ---
#!/usr/bin/python
# -*- mode: Python; indent-tabs-mode: nil; -*-

import commands
import datetime, time
import os, sys
import re
import smtplib

domail = 1
mailsummary = 1
savehistory = 1
usehistory = True

maxmailsize = 39*1024

fromaddr = 'Fedora Extras repoclosure <buildsys at fedoraproject.org>'
replytoaddr = 'fedora-extras-list at redhat.com'
subject = 'Broken dependencies in Fedora Extras'

mailserver = 'localhost'
mailuser = ''
mailpasswd = ''

# Don't repeat a report for a src.rpm for 14 days.
waitdelta = datetime.timedelta( days = 14 )
today = datetime.date.today()


# Interface to Fedora Extras CVS owners/owners.list
class OwnersList:
    
    owners = {}  # map package name to email address, owners[name]

    def Download(self):
        # Remove 'owners' directory.
        for root, dirs, files in os.walk( 'owners', topdown=False ):
            for fname in files:
                os.remove(os.path.join( root, fname ))
            for dname in dirs:
                os.rmdir(os.path.join( root, dname ))
        # Retry CVS checkout a few times.
        for count in range(3):
            (rc, rv) = commands.getstatusoutput('LC_ALL=C CVS_RSH=rsh CVSROOT=:pserver:anonymous at cvs.fedora.redhat.com:/cvs/extras cvs co owners')
            if not rc:
                break
            time.sleep(300)
        if rc:
            print rv
            sys.exit(1)

    def Refresh(self):
        self.ownersfile = 'owners/owners.list'
        self.owners = {}
        # Dumb caching. Check that file exists and is "quite recent".
        try:
            fstats = os.stat(self.ownersfile)
            if ( not fstats.st_size or ((time.time() - fstats.st_ctime) > 3600*2) ):
                raise Exception
        except:
            self.Download()
        try:
            f = file( self.ownersfile )
        except:
            print 'ERROR: could not open %s' % self.ownersfile
            sys.exit(5)
        for line in f:
            if line.startswith('#') or line.isspace():
                continue
            try:
                (repo,pkgname,summary,email,qacontact,cc) = line.split('|')
                if email.find('@') < 0:  # owners.list is broken
                    raise Exception
                self.owners[pkgname] = email
                #print '%s -> %s' % (pkgname, self.owners[pkgname])
            except:
                print 'ERROR: owners.list is broken'
                print line
        f.close()

    def GetOwner(self,name):
        try:
            r = self.owners[name]
        except KeyError:
            r = ''
        return r
        
    def __init__(self):
        self.Refresh()



# We identify broken packages based on their src.rpm name and don't report
# them more than once until expiration.
class History:

    history = {}
    incoming = {}

    def __init__(self): # Load history map file and expire its contents.
        try:
            f = file ('history.txt')
            for line in f:
                (srcrpm,timestamp) = line.rstrip().split(' ')
                (y,m,d) = timestamp.split('-')
                timestamp = datetime.date( int(y), int(m), int(d) )
                if ( timestamp+waitdelta > today ):   # Filter out entries which are too old.
                    self.history[srcrpm] = timestamp
            f.close()
        except IOError:
            print 'WARNING: could not open history file for reading'
        except:
            pass

    def Save(self):
        for srcrpm,timestamp in self.incoming.iteritems():
            self.Set(srcrpm,timestamp)
        try:
            f = file ('history.txt','w')
            for srcrpm,timestamp in self.history.iteritems():
                f.write(  ('%s %s\n' % (srcrpm,timestamp)) )
            f.close()
        except:
            print 'WARNING: could not open history file for writing'

    def Set(self,srcrpmname,timestamp):
        self.history[srcrpmname] = timestamp

    def SetDelayed(self,srcrpmname,timestamp):
        self.incoming[srcrpmname] = timestamp

    def Get(self,srcrpmname):
        try:
            r = self.history[srcrpmname]
        except KeyError:
            r = 0
        return r



def mail(smtp, fromaddr, toaddrs, replytoaddr, subject, body):
    from email.Header import Header
    from email.MIMEText import MIMEText
    msg = MIMEText( body, 'plain' )
    from email.Utils import make_msgid
    msg['Message-Id'] = make_msgid()
    msg['Subject'] = Header(subject)
    msg['From'] = Header(fromaddr)
    from email.Utils import formatdate
    msg['Date'] = formatdate()
    if len(replytoaddr):
        msg['ReplyTo'] = Header(replytoaddr)

    if isinstance(toaddrs, basestring):
        toaddrs = [toaddrs]
    to = ''
    for t in toaddrs:
        if len(to):
            to += ', '
        to += t
    msg['To'] = Header(to)

    try:
        r = smtp.sendmail( fromaddr, toaddrs, msg.as_string(False) )
        for (name, errormsg) in r.iteritems():
            print name, ':', errormsg
    except smtplib.SMTPRecipientsRefused, obj:
        print 'ERROR: SMTPRecipientsRefused'
        for (addr, errormsg) in obj.recipients.iteritems():
            print addr, ':', errormsg
    except smtplib.SMTPException:
        print 'ERROR: SMTPException'



def mailsplit(smtp, fromaddr, toaddrs, replytoaddr, subject, body):
    # NB: crude implementation - could also split at line positions
    parts = 0
    start = 0
    end = len(body)
    slices = []
    while ( start < end ):
        if ( (end-start) > maxmailsize ):
            nextstart = body.rfind( 'package: ', start, start+maxmailsize )
            if ( nextstart < 0 ):
                nextstart = body.rfind( '\n', start, start+maxmailsize )
                if ( nextstart < 0 ):
                    print 'ERROR: cannot split mail body cleanly'
                    nextstart = end
        else:
            nextstart = end
        slices.append( (start, nextstart) )
        start = nextstart
        parts += 1

    curpart = 1
    for (start,end) in slices:
        if (parts>1):
            subjectmodified = ( '(%d/%d) %s' % (curpart, parts, subject) )
        else:
            subjectmodified = subject
        slicedbody = body[start:end]
        mail(smtp,fromaddr,toaddrs,replytoaddr,subjectmodified,slicedbody)
        curpart += 1



if len(sys.argv) != 3:
    print 'SYNTAX: %s <release> <logfile>' % sys.argv[0]
    sys.exit(22)
release = sys.argv[1]
logfilename = sys.argv[2]

# This is ugly to get the report date from the report file name.
datere = re.compile('-(?P<timestamp>[0-9]+-[0-9]+-[0-9]+).txt$')
res = datere.search(logfilename)
if res:
    datestring = res.group('timestamp')
else:
    datestring = today

subject += (' %s - %s' % (release,datestring))
summail = ''

owners = OwnersList()
history = History()
report = {}  # Map, report[email], mail message body to be sent to somebody.
summary = []  # list of "package version.arch" lines
oldproblems = []
repoids = {}  # affected repository ids

pkgre = re.compile('(?P<name>.*)-[^-]+-[^-]+$')
inbody = False
srcrpm = ''
ownedby = ''
createreport = False
try:
    f = file( logfilename )
except:
    print 'ERROR: could not open input file'
    sys.exit(5)

for line in f:
    if line.startswith('source rpm: '):
        w = line.rstrip().split(' ')
        if ( len(w) >= 3 ):
            srcrpm = w[2]
            inbody = True
            createreport = not (usehistory and history.Get(srcrpm))
            if not history.Get(srcrpm):
                history.SetDelayed(srcrpm,today)
        else:
            inbody = False
        continue
    elif inbody and line.startswith('package: '):
        w = line.rstrip().split(' ')
        repoid = w[5]
        # Only report broken packages in Fedora Extras.
        if ( repoid.find('extras') < 0 ):
            inbody = False
            continue

        res = pkgre.search(srcrpm) # try to get src.rpm "name"
        if not res: # only true for invalid input
            inbody = False
            continue
        name = res.group('name')
        
        ownedby = owners.GetOwner(name)
        if ownedby == '':
            x = 'ERROR: %s not in owners.list\nERROR: source rpm is %s' % ( name, srcrpm )
            summail += x + '\n'
            inbody = False
            continue
        # name  EVR.arch
        summary.append ( ' '.join( ['\t', w[1], '  ', w[3], repoid] ) )
        repoids[repoid] = 1
    if inbody:
        # Construct report for package owner.
        if createreport:
            try:
                report[ownedby] += line
            except KeyError:
                report[ownedby] = line
        else:
            oldproblems.append(line)

if savehistory:
    history.Save()

summary.sort()
repos = repoids.keys()
repos.sort()
for repoid in repos:
    count = 0
    summail += ('Summary of broken packages in %s:\n' % repoid) + '-'*70+'\n'
    for name in summary:
        p = name.find(repoid)
        if p >= 0:
            summail += name[:p]
            summail += '\n'
            count += 1
    if not count:
        summail += 'None\n'
    summail += '\n'

if domail:
    srv = smtplib.SMTP( mailserver )
    #srv.set_debuglevel(1)
    if ( len(mailuser) and len(mailpasswd) ):
        try:
            srv.login( mailuser, mailpasswd )
        except smtplib.SMTPException:
            print 'ERROR: mailserver login failed'
            sys.exit(-1)

# Send mail to every package owner with broken package dependencies.
for toaddr,body in report.iteritems():
    x = '='*70
    summail += x+'\n'
    x = 'New report for: %s\n\n%s' % ( toaddr.replace('@',' AT '), body)
    summail += x

    mailtext = 'This is an automated mail created by an experimental script.\nYour following packages in the repository contain broken dependencies:\n\n'
    mailtext += body
    if domail:
        mailsplit( srv, fromaddr, toaddr, replytoaddr, subject, mailtext )

if len(oldproblems):
    summail += '\n'+'='*70+'\n'
    for line in oldproblems:
        summail += line
if domail and mailsummary:
    toaddr = replytoaddr  # mail summary to list
    mailsplit( srv, fromaddr, toaddr, '', ('Summary - %s' % subject), summail )

if domail:
    srv.quit()


--- NEW FILE rc-run.py ---
#!/usr/bin/python
# -*- mode: Python; indent-tabs-mode: nil; -*-

# If executed as "rc-run-all.py" it processes all releases.

import fcntl, os, sys
import datetime, time

allreleases = [ '3', '4', '5', 'development' ]

archs = { '3' : ['i386','x86_64'],
          '4' : ['i386','x86_64','ppc'],
          '5' : ['i386','x86_64','ppc'],
          'development' : ['i386','x86_64','ppc']
          }

repos = { '3' : ['fedora-core','fedora-core-updates','fedora-extras'],
          '4' : ['fedora-core','fedora-core-updates','fedora-extras'],
          '5' : ['fedora-core','fedora-core-updates','fedora-extras'],
          'development' : ['fedora-core','fedora-extras']
          }

targetarchs = { 'i386' : 'i686',
                'x86_64' : 'x86_64',
                'ppc' : 'ppc'
                }

def makereport():
    try:
        os.remove(logfilename)
    except:
        pass
    for arch in archs[release]:
        rcargs = ('-a %s ' % targetarchs[arch])
        for r in repos[release]:
            repoid = '%s-%s-%s' % (r,release,arch)
            rcargs += ('-r %s ' % repoid)
        # -n, --newest : yum-utils 0.5
        rc = os.system('./rc-modified -q -n -c ./yum.repoclosure.conf %s >> %s' % (rcargs,logfilename))
        if rc:
            return False
    return True

# Main.

# Delete old log files.
import glob
now = time.time()
for file in glob.glob('./rc-fe*.txt'):
    if ( (now - os.stat(file).st_mtime) > 3600*24*14 ):
        try:
            os.remove(file)
        except:
            pass

today = datetime.date.today()
releases = []

f = open('rc-run.lockfile','w')
try:
    rc = fcntl.flock(f, fcntl.LOCK_EX | fcntl.LOCK_NB)
    f.write( ('%s' % today) )
except IOError:
    print 'ERROR: script locked via lockfile - it seems to be running already'
    sys.exit(11)

if sys.argv[0].endswith('rc-run-all.py'): # process all releases
    for release in allreleases:
        releases.append(release)
else: # process one release given as command-line argument
    if len(sys.argv) != 2:
        print 'SYNTAX: %s <release>' % sys.argv[0]
        sys.exit(22)
    release = sys.argv[1]
    if release not in archs:
        print 'ERROR: release %s is not supported' % release
        sys.exit(22)
    releases = [release]

goodlogs = []
badlogs = []
for release in releases:
    logfilename = ('rc-fe%s-%s.txt' % (release,today))
    rv = False
    for count in range(3):
        rv = makereport()
        if ( rv ):
            goodlogs.append( (release,logfilename) )
            break
        print 'ERROR: running repoclosure for %s failed' % release
        time.sleep(720)
    if ( not rv ):
        badlogs.append( (release,logfilename) )

for (release,logfilename) in goodlogs:
    rc = os.system('./rc-report.py %s %s' % (release,logfilename))

fcntl.flock(f, fcntl.LOCK_UN)
f.close()
sys.exit(0)

repoclosure.patch:

--- NEW FILE repoclosure.patch ---
Against yum-utils-0.5:

--- /usr/bin/repoclosure	2006-02-23 18:06:16.000000000 +0100
+++ rc-modified	2006-04-30 13:02:35.000000000 +0200
@@ -88,7 +88,10 @@
         unresolved = {}
         resolved = {}
         if newest:
-            pkgs = self.pkgSack.returnNewestByNameArch()
+            pkgs = []
+            for l in self.pkgSack.returnNewestByName():
+                for p in l:
+                    pkgs.append(p)
         else:
             pkgs = self.pkgSack
 
@@ -167,7 +170,11 @@
 
     baddeps = my.getBrokenDeps(opts.newest)
     if opts.newest:
-        num = len(my.pkgSack.returnNewestByNameArch())
+        pkgs = []
+        for l in my.pkgSack.returnNewestByName():
+            for p in l:
+                pkgs.append(p)
+        num = len(pkgs)
     else:
         num = len(my.pkgSack)
         
@@ -182,7 +189,8 @@
     pkgs = baddeps.keys()
     pkgs.sort()
     for pkg in pkgs:
-        print 'package: %s from %s\n  unresolved deps: ' % (pkg, pkg.repoid)
+        srcrpm = pkg.returnSimple('sourcerpm')
+        print 'source rpm: %s\npackage: %s from %s\n  unresolved deps: ' % (srcrpm, pkg, pkg.repoid)
         for (n, f, v) in baddeps[pkg]:
             req = '%s' % n
             if f: 
@@ -192,6 +200,7 @@
                 req = '%s %s' % (req, v)
             
             print '     %s' % req
+        print
 
 if __name__ == "__main__":
     main()


--- NEW FILE yum.repoclosure.conf ---
[main]
cachedir=/var/cache/yum
debuglevel=2
logfile=/var/log/yum.log
pkgpolicy=newest
distroverpkg=redhat-release
tolerant=1
exactarch=1
retries=20
obsoletes=1
gpgcheck=1


# ===============================================================
# ATTENTION!
# Fedora Extras repository ids must contain the string 'extras'!
# ===============================================================

# Fedora Extras Development

[fedora-core-development-i386]
name=Fedora Core development i386
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/i386/
enabled=0

[fedora-extras-development-i386]
name=Fedora Extras development i386
baseurl=http://fedoraproject.org/extras/development/i386/
enabled=0


[fedora-core-development-x86_64]
name=Fedora Core development x86_64
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/x86_64/
enabled=0

[fedora-extras-development-x86_64]
name=Fedora Extras development x86_64
baseurl=http://fedoraproject.org/extras/development/x86_64/
enabled=0


[fedora-core-development-ppc]
name=Fedora Core development ppc
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/ppc/
enabled=0

[fedora-extras-development-ppc]
name=Fedora Extras development ppc
baseurl=http://fedoraproject.org/extras/development/ppc/
enabled=0


# Fedora Extras 5

[fedora-core-5-i386]
name=Fedora Core 5 i386
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/5/i386/os/
enabled=0

[fedora-core-updates-5-i386]
name=Fedora Core 5 Updates i386
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/5/i386/
enabled=0

[fedora-extras-5-i386]
name=Fedora Extras 5 i386
baseurl=http://fedoraproject.org/extras/5/i386/
enabled=0


[fedora-core-5-x86_64]
name=Fedora Core 5 x86_64
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/5/x86_64/os/
enabled=0

[fedora-core-updates-5-x86_64]
name=Fedora Core 5 Updates x86_64
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/5/x86_64/
enabled=0

[fedora-extras-5-x86_64]
name=Fedora Extras 5 x86_64
baseurl=http://fedoraproject.org/extras/5/x86_64/
enabled=0


[fedora-core-5-ppc]
name=Fedora Core 5 ppc
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/5/ppc/os/
enabled=0

[fedora-core-updates-5-ppc]
name=Fedora Core 5 Updates ppc
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/5/ppc/
enabled=0

[fedora-extras-5-ppc]
name=Fedora Extras 5 ppc
baseurl=http://fedoraproject.org/extras/5/ppc/
enabled=0


## Fedora Extras 4

[fedora-core-4-i386]
name=Fedora Core 4 i386
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/4/i386/os/
enabled=0

[fedora-core-updates-4-i386]
name=Fedora Core 4 Updates i386
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/4/i386/
enabled=0

[fedora-extras-4-i386]
name=Fedora Extras 4 i386
baseurl=http://fedoraproject.org/extras/4/i386/
enabled=0


[fedora-core-4-x86_64]
name=Fedora Core 4 x86_64
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/4/x86_64/os/
enabled=0

[fedora-core-updates-4-x86_64]
name=Fedora Core 4 Updates x86_64
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/4/x86_64/
enabled=0

[fedora-extras-4-x86_64]
name=Fedora Extras 4 x86_64
baseurl=http://fedoraproject.org/extras/4/x86_64/
enabled=0


[fedora-core-4-ppc]
name=Fedora Core 4 ppc
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/4/ppc/os/
enabled=0

[fedora-core-updates-4-ppc]
name=Fedora Core 4 Updates ppc
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/4/ppc/
enabled=0

[fedora-extras-4-ppc]
name=Fedora Extras 4 ppc
baseurl=http://fedoraproject.org/extras/4/ppc/
enabled=0


## Fedora Extras 3

[fedora-core-3-i386]
name=Fedora Core 3 i386
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/3/i386/os/
enabled=0

[fedora-core-updates-3-i386]
name=Fedora Core 3 Updates i386
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/3/i386/
enabled=0

[fedora-extras-3-i386]
name=Fedora Extras 3 i386
baseurl=http://fedoraproject.org/extras/3/i386/
enabled=0


[fedora-core-3-x86_64]
name=Fedora Core 3 x86_64
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/3/x86_64/os/
enabled=0

[fedora-core-updates-3-x86_64]
name=Fedora Core 3 Updates x86_64
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/3/x86_64/
enabled=0

[fedora-extras-3-x86_64]
name=Fedora Extras 3 x86_64
baseurl=http://fedoraproject.org/extras/3/x86_64/
enabled=0




From fedora-extras-commits at redhat.com  Sun Apr 30 11:23:47 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 30 Apr 2006 04:23:47 -0700
Subject: owners owners.list,1.924,1.925
Message-ID: <200604301123.k3UBNnJT000308@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32755/owners

Modified Files:
	owners.list 
Log Message:
add gcompris


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.924
retrieving revision 1.925
diff -u -r1.924 -r1.925
--- owners.list	30 Apr 2006 07:30:52 -0000	1.924
+++ owners.list	30 Apr 2006 11:23:46 -0000	1.925
@@ -322,6 +322,7 @@
 Fedora Extras|gcfilms|Movies collections management|tian at c-sait.net|extras-qa at fedoraproject.org|
 Fedora Extras|gcl|GNU Common Lisp|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|gcombust|Powerful GTK+ front-end for mkisofs and cdrecord|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|gcompris|Educational suite for kids 2-10 years old|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 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|gdeskcal|Eye-candy calendar for your desktop.|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Apr 30 11:24:55 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 30 Apr 2006 04:24:55 -0700
Subject: comps comps-fe6.xml.in,1.5,1.6
Message-ID: <200604301124.k3UBOvZP000407@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv386/comps

Modified Files:
	comps-fe6.xml.in 
Log Message:
add gcompris to Games


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- comps-fe6.xml.in	30 Apr 2006 07:31:43 -0000	1.5
+++ comps-fe6.xml.in	30 Apr 2006 11:24:55 -0000	1.6
@@ -214,6 +214,7 @@
         <packagereq type="optional">freedoom</packagereq>
         <packagereq type="optional">freedroid</packagereq>
         <packagereq type="optional">freedroidrpg</packagereq>
+        <packagereq type="optional">gcompris</packagereq>
         <packagereq type="optional">gl-117</packagereq>
         <packagereq type="optional">gnofract4d</packagereq>
         <packagereq type="optional">gnome-sudoku</packagereq>



From fedora-extras-commits at redhat.com  Sun Apr 30 12:20:18 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sun, 30 Apr 2006 05:20:18 -0700
Subject: rpms/libsndfile/devel .cvsignore, 1.5, 1.6 libsndfile.spec, 1.11,
	1.12 sources, 1.5, 1.6
Message-ID: <200604301220.k3UCKKFK003402@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/libsndfile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3379

Modified Files:
	.cvsignore libsndfile.spec sources 
Log Message:
* Sun Apr 30 2006 Andreas Thienemann <andreas at bawue.net> - 1.0.16-1
- Updated to 1.0.16



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 Mar 2006 22:03:36 -0000	1.5
+++ .cvsignore	30 Apr 2006 12:20:18 -0000	1.6
@@ -1 +1 @@
-libsndfile-1.0.15.tar.gz
+libsndfile-1.0.16.tar.gz


Index: libsndfile.spec
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/devel/libsndfile.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libsndfile.spec	29 Mar 2006 22:03:36 -0000	1.11
+++ libsndfile.spec	30 Apr 2006 12:20:18 -0000	1.12
@@ -1,6 +1,6 @@
 Summary:	Library for reading and writing sound files
 Name:		libsndfile
-Version:	1.0.15
+Version:	1.0.16
 Release:	1%{?dist}
 License:	LGPL
 Group:		System Environment/Libraries
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Sun Apr 30 2006 Andreas Thienemann <andreas at bawue.net> - 1.0.16-1
+- Updated to 1.0.16
+
 * Thu Mar 30 2006 Andreas Thienemann <andreas at bawue.net> - 1.0.15-1
 - Updated to 1.0.15
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 Mar 2006 22:03:36 -0000	1.5
+++ sources	30 Apr 2006 12:20:18 -0000	1.6
@@ -1 +1 @@
-4171faabfad0ce550cbe9bf1b065e976  libsndfile-1.0.15.tar.gz
+773b6639672d39b6342030c7fd1e9719  libsndfile-1.0.16.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 30 15:43:09 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Sun, 30 Apr 2006 08:43:09 -0700
Subject: rpms/pan/devel .cvsignore, 1.5, 1.6 pan.spec, 1.9, 1.10 sources, 1.5,
	1.6
Message-ID: <200604301543.k3UFhB92010626@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/pan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10605

Modified Files:
	.cvsignore pan.spec sources 
Log Message:
devel update



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	25 Apr 2006 06:46:36 -0000	1.5
+++ .cvsignore	30 Apr 2006 15:43:09 -0000	1.6
@@ -1,3 +1,4 @@
 pan-0.14.2.91.tar.bz2
 pan-0.93.tar.bz2
 pan-0.94.tar.bz2
+pan-0.95.tar.bz2


Index: pan.spec
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pan.spec	25 Apr 2006 06:46:36 -0000	1.9
+++ pan.spec	30 Apr 2006 15:43:09 -0000	1.10
@@ -1,6 +1,6 @@
 Summary: A GNOME/GTK+ news reader for X
 Name: pan
-Version: 0.94
+Version: 0.95
 Release: 1%{?dist}
 Epoch: 1
 License: GPL
@@ -8,11 +8,9 @@
 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: libxml2-devel >= 2.4.22
-BuildRequires: gnet2-devel >= 2.0.4
 BuildRequires: desktop-file-utils
-BuildRequires: pcre-devel >= 4.0
-BuildRequires: gtkspell-devel >= 2.0.2
+BuildRequires: pcre-devel >= 5.0
+BuildRequires: gtkspell-devel >= 2.0.7
 BuildRequires: gettext
 BuildRequires: gmime-devel >= 2.1.0
 
@@ -29,11 +27,11 @@
 %prep
 %setup -q
 
-echo "StartupNotify=true" >> pan.desktop.in
+echo "StartupNotify=true" >> pan.desktop
 
 
 %build
-%configure --enable-gtkspell
+%configure 
 make
 
 %install
@@ -57,12 +55,15 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog README TODO
+%doc AUTHORS ChangeLog COPYING NEWS README TODO
 %{_bindir}/pan
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/fedora-pan.desktop
 
 %changelog
+* Sun Apr 30 2006 Michael A. Peters <mpeters at mac.com> - 1:0.95-1
+- Update to 0.95
+
 * Mon Apr 24 2006 Michael A. Peters <mpeters at mac.com> - 1:0.94-1
 - Update to 0.94
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	25 Apr 2006 06:46:36 -0000	1.5
+++ sources	30 Apr 2006 15:43:09 -0000	1.6
@@ -1,2 +1,2 @@
-ca870a8a182f68b299796d90906918ca  pan-0.93.tar.bz2
 1013562743c330b07b84b749ed247c66  pan-0.94.tar.bz2
+3a0cff7a3bc8b77ad19af4a492859804  pan-0.95.tar.bz2



From fedora-extras-commits at redhat.com  Sun Apr 30 16:16:39 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Sun, 30 Apr 2006 09:16:39 -0700
Subject: rpms/pan/devel pan.spec,1.10,1.11
Message-ID: <200604301616.k3UGGfYS012944@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/pan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12925

Modified Files:
	pan.spec 
Log Message:
fix rpmlint errors on debuginfo package



Index: pan.spec
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pan.spec	30 Apr 2006 15:43:09 -0000	1.10
+++ pan.spec	30 Apr 2006 16:16:39 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: A GNOME/GTK+ news reader for X
 Name: pan
 Version: 0.95
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPL
 Group: Applications/Internet
@@ -29,6 +29,15 @@
 
 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
+
+
 
 %build
 %configure 
@@ -61,6 +70,9 @@
 %{_datadir}/applications/fedora-pan.desktop
 
 %changelog
+* Sun Apr 30 2006 Michael A. Peters <mpeters at mac.com> - 1:0.95-2
+- Fix rpmlint errors on debug package
+
 * Sun Apr 30 2006 Michael A. Peters <mpeters at mac.com> - 1:0.95-1
 - Update to 0.95
 



From fedora-extras-commits at redhat.com  Sun Apr 30 16:28:48 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sun, 30 Apr 2006 09:28:48 -0700
Subject: rpms/hevea - New directory
Message-ID: <200604301628.k3UGSot5013069@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/hevea
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13043/hevea

Log Message:
Directory /cvs/extras/rpms/hevea added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 30 16:28:49 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sun, 30 Apr 2006 09:28:49 -0700
Subject: rpms/hevea/devel - New directory
Message-ID: <200604301628.k3UGSpPJ013072@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/hevea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13043/hevea/devel

Log Message:
Directory /cvs/extras/rpms/hevea/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 30 16:29:12 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sun, 30 Apr 2006 09:29:12 -0700
Subject: rpms/hevea/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200604301629.k3UGTEgd013124@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/hevea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13088/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hevea


--- 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 Apr 30 16:29:12 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sun, 30 Apr 2006 09:29:12 -0700
Subject: rpms/hevea Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604301629.k3UGTEdt013121@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/hevea
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13088

Added Files:
	Makefile import.log 
Log Message:
Setup of module hevea


--- NEW FILE Makefile ---
# Top level Makefile for module hevea
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 30 16:30:02 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sun, 30 Apr 2006 09:30:02 -0700
Subject: rpms/hevea import.log,1.1,1.2
Message-ID: <200604301630.k3UGU4Oj013192@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/hevea
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13157

Modified Files:
	import.log 
Log Message:
auto-import hevea-1.08-4 on branch devel from hevea-1.08-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/hevea/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Apr 2006 16:29:12 -0000	1.1
+++ import.log	30 Apr 2006 16:30:02 -0000	1.2
@@ -0,0 +1 @@
+hevea-1_08-4:HEAD:hevea-1.08-4.src.rpm:1146414593



From fedora-extras-commits at redhat.com  Sun Apr 30 16:30:03 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sun, 30 Apr 2006 09:30:03 -0700
Subject: rpms/hevea/devel hevea.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200604301630.k3UGU5dH013197@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/hevea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13157/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hevea.spec 
Log Message:
auto-import hevea-1.08-4 on branch devel from hevea-1.08-4.src.rpm


--- NEW FILE hevea.spec ---
%{!?_texmf: %define _texmf %(eval "echo `kpsewhich -expand-var '$TEXMFMAIN'`")}

Name:           hevea
Version:        1.08
Release:        4%{?dist}
Summary:        LaTeX to HTML translator
Group:          Applications/Publishing
License:        QPL
URL:            http://hevea.inria.fr/
Source:         http://hevea.inria.fr/distri/hevea-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	ocaml >= 3.0.7, /usr/bin/kpsewhich
Requires:       tetex-latex netpbm-progs ghostscript tetex-dvips

%description
HEVEA is a quite complete and fast LATEX to HTML translator.
HEVEA renders symbols by using the so-called HTML "entites", which modern
browsers display those entities correctly most of the time.


%prep
%setup -q


%build
make %{?_smp_mflags} \
	PREFIX=%{_prefix} \
	LIBDIR=%{_datadir}/hevea \
	BINDIR=%{_bindir} \
	LATEXLIBDIR=%{_texmf}/tex/latex/hevea


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_libdir}/hevea
mkdir -p %{buildroot}%{_bindir}
make install \
	DESTDIR=%{buildroot} \
	PREFIX=%{_prefix} \
	LIBDIR=%{_datadir}/hevea \
	BINDIR=%{_bindir} \
	LATEXLIBDIR=%{_texmf}/tex/latex/hevea

	
%clean
rm -rf %{buildroot}


%post -p /usr/bin/texhas


%postun -p /usr/bin/texhash


%files
%defattr(-,root,root,-)
%doc README CHANGES LICENSE
%{_bindir}/*
%{_datadir}/hevea
%{_texmf}/tex/latex/hevea/


%changelog
* Sun Apr 30 2006 Andreas Thienemann <andreas at bawue.net> - 1.08-4
- Included Requirements for imagen

* Fri Apr 28 2006 Andreas Thienemann <andreas at bawue.net> - 1.08-3
- Better comformity to FHS

* Fri Apr 28 2006 Andreas Thienemann <andreas at bawue.net> - 1.08-2
- Cleaned up and adapted for FE

* Sat Jul  2 2005 Gerard Milmeister <gemi at bluewin.ch> - 1.08-1
- New Version 1.08

* Fri Mar 19 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:1.07-0.fdr.1
- First Fedora release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hevea/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Apr 2006 16:29:12 -0000	1.1
+++ .cvsignore	30 Apr 2006 16:30:03 -0000	1.2
@@ -0,0 +1 @@
+hevea-1.08.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hevea/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Apr 2006 16:29:12 -0000	1.1
+++ sources	30 Apr 2006 16:30:03 -0000	1.2
@@ -0,0 +1 @@
+073c92c9408a9679a397ce65a076c796  hevea-1.08.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 30 16:50:01 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sun, 30 Apr 2006 09:50:01 -0700
Subject: owners owners.list,1.925,1.926
Message-ID: <200604301650.k3UGo3tX013322@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13234

Modified Files:
	owners.list 
Log Message:
Added hevea



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.925
retrieving revision 1.926
diff -u -r1.925 -r1.926
--- owners.list	30 Apr 2006 11:23:46 -0000	1.925
+++ owners.list	30 Apr 2006 16:50:01 -0000	1.926
@@ -467,6 +467,7 @@
 Fedora Extras|help2man|Create simple man pages from --help output|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|hercules|Hercules S/370, ESA/390, and z/Architecture emulator|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|Hermes|HERMES pixel format conversion library|thomas at apestaart.org|extras-qa at fedoraproject.org|
+Fedora Extras|hevea|LaTeX to HTML translator|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|hfsplusutils|Tools for reading Macintosh HFS+ volumes|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|highlight|Universal source code to formatted text converter|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|hmmer|Profile HMM software for protein sequence analysis|Christian.Iseli at licr.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Apr 30 17:06:38 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 30 Apr 2006 10:06:38 -0700
Subject: rpms/ocaml/devel .cvsignore, 1.5, 1.6 ocaml.spec, 1.23, 1.24 sources,
	1.7, 1.8
Message-ID: <200604301706.k3UH6exA015564@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/ocaml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15543

Modified Files:
	.cvsignore ocaml.spec sources 
Log Message:
new version 3.09.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ocaml/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	4 Jan 2006 23:17:43 -0000	1.5
+++ .cvsignore	30 Apr 2006 17:06:38 -0000	1.6
@@ -1,4 +1,4 @@
-ocaml-3.09.1.tar.bz2
+ocaml-3.09.2.tar.bz2
 ocaml-3.09-refman.html.tar.gz
 ocaml-3.09-refman.info.tar.gz
-ocaml-3.09-refman.ps.gz
+ocaml-3.09-refman.pdf


Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml/devel/ocaml.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ocaml.spec	17 Feb 2006 21:35:11 -0000	1.23
+++ ocaml.spec	30 Apr 2006 17:06:38 -0000	1.24
@@ -1,15 +1,15 @@
 Name:		ocaml
-Version:	3.09.1
-Release: 	2%{?dist}
+Version:	3.09.2
+Release: 	1%{?dist}
 
 Summary:	Objective Caml compiler and programming environment
 
 Group:		Development/Languages
 License:	QPL/LGPL
 URL:		http://www.ocaml.org
-Source0:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09.1.tar.bz2
+Source0:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09.2.tar.bz2
 Source1:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.html.tar.gz
-Source2:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.ps.gz
+Source2:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.pdf
 Source3:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.info.tar.gz
 Patch0:		ocaml-rpath.patch
 Patch1:		ocaml-user-cflags.patch
@@ -97,7 +97,7 @@
 %patch0 -p1
 %patch1 -p1 -b .cflags
 
-cp %{SOURCE2} refman.ps.gz
+cp %{SOURCE2} refman.pdf
 
 
 %build
@@ -199,7 +199,7 @@
 
 %files docs
 %defattr(-,root,root,-)
-%doc refman.ps.gz htmlman
+%doc refman.pdf htmlman
 
 
 %files emacs
@@ -210,6 +210,9 @@
 
 
 %changelog
+* Sun Apr 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.09.2-1
+- new version 3.09.2
+
 * Fri Feb 17 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.09.1-2
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocaml/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	4 Jan 2006 23:17:43 -0000	1.7
+++ sources	30 Apr 2006 17:06:38 -0000	1.8
@@ -1,4 +1,4 @@
-b6b380ae71f6f7bc7ff0989a0f8409e6  ocaml-3.09.1.tar.bz2
+63428ce7e114520e8f529c9ca809a1b0  ocaml-3.09.2.tar.bz2
 b25eb211bf91bcaa536b12d12731ceec  ocaml-3.09-refman.html.tar.gz
 280160b1fc7c8513074c3fda0446de29  ocaml-3.09-refman.info.tar.gz
-598bb8e86329afe1ae374385b2e177e7  ocaml-3.09-refman.ps.gz
+6ed0c6b1167dbf6c1cb10a78d302bc00  ocaml-3.09-refman.pdf



From fedora-extras-commits at redhat.com  Sun Apr 30 17:20:55 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 30 Apr 2006 10:20:55 -0700
Subject: rpms/ocaml/FC-3 .cvsignore, 1.6, 1.7 ocaml.spec, 1.14, 1.15 sources,
	1.7, 1.8
Message-ID: <200604301720.k3UHKvVH015687@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/ocaml/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15632/FC-3

Modified Files:
	.cvsignore ocaml.spec sources 
Log Message:
new version 3.09.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	4 Jan 2006 23:21:22 -0000	1.6
+++ .cvsignore	30 Apr 2006 17:20:54 -0000	1.7
@@ -1,4 +1,4 @@
-ocaml-3.09.1.tar.bz2
+ocaml-3.09.2.tar.bz2
 ocaml-3.09-refman.html.tar.gz
 ocaml-3.09-refman.info.tar.gz
-ocaml-3.09-refman.ps.gz
+ocaml-3.09-refman.pdf


Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-3/ocaml.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ocaml.spec	4 Jan 2006 23:21:22 -0000	1.14
+++ ocaml.spec	30 Apr 2006 17:20:54 -0000	1.15
@@ -1,5 +1,5 @@
 Name:		ocaml
-Version:	3.09.1
+Version:	3.09.2
 Release: 	1%{?dist}
 
 Summary:	Objective Caml compiler and programming environment
@@ -7,9 +7,9 @@
 Group:		Development/Languages
 License:	QPL/LGPL
 URL:		http://www.ocaml.org
-Source0:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09.1.tar.bz2
+Source0:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09.2.tar.bz2
 Source1:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.html.tar.gz
-Source2:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.ps.gz
+Source2:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.pdf
 Source3:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.info.tar.gz
 Patch0:		ocaml-rpath.patch
 Patch1:		ocaml-user-cflags.patch
@@ -81,7 +81,8 @@
 %patch0 -p1
 %patch1 -p1 -b .cflags
 
-cp %{SOURCE2} refman.ps.gz
+cp %{SOURCE2} refman.pdf
+
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" ./configure \
@@ -172,7 +173,8 @@
 
 %files docs
 %defattr(-,root,root,-)
-%doc refman.ps.gz htmlman
+%doc refman.pdf htmlman
+
 
 %files emacs
 %defattr(-,root,root,-)
@@ -181,6 +183,9 @@
 %doc emacs/README
 
 %changelog
+* Sun Apr 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.09.2-1
+- new version 3.09.2
+
 * Thu Jan  5 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.09.1-1
 - new version 3.09.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-3/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	4 Jan 2006 23:21:22 -0000	1.7
+++ sources	30 Apr 2006 17:20:54 -0000	1.8
@@ -1,4 +1,4 @@
-b6b380ae71f6f7bc7ff0989a0f8409e6  ocaml-3.09.1.tar.bz2
+63428ce7e114520e8f529c9ca809a1b0  ocaml-3.09.2.tar.bz2
 b25eb211bf91bcaa536b12d12731ceec  ocaml-3.09-refman.html.tar.gz
 280160b1fc7c8513074c3fda0446de29  ocaml-3.09-refman.info.tar.gz
-598bb8e86329afe1ae374385b2e177e7  ocaml-3.09-refman.ps.gz
+6ed0c6b1167dbf6c1cb10a78d302bc00  ocaml-3.09-refman.pdf



From fedora-extras-commits at redhat.com  Sun Apr 30 17:20:55 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 30 Apr 2006 10:20:55 -0700
Subject: rpms/ocaml/FC-4 .cvsignore, 1.7, 1.8 ocaml.spec, 1.20, 1.21 sources,
	1.7, 1.8
Message-ID: <200604301720.k3UHKvX2015693@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/ocaml/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15632/FC-4

Modified Files:
	.cvsignore ocaml.spec sources 
Log Message:
new version 3.09.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	4 Jan 2006 23:21:28 -0000	1.7
+++ .cvsignore	30 Apr 2006 17:20:55 -0000	1.8
@@ -1,4 +1,4 @@
-ocaml-3.09.1.tar.bz2
+ocaml-3.09.2.tar.bz2
 ocaml-3.09-refman.html.tar.gz
 ocaml-3.09-refman.info.tar.gz
-ocaml-3.09-refman.ps.gz
+ocaml-3.09-refman.pdf


Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-4/ocaml.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ocaml.spec	4 Jan 2006 23:21:28 -0000	1.20
+++ ocaml.spec	30 Apr 2006 17:20:55 -0000	1.21
@@ -1,5 +1,5 @@
 Name:		ocaml
-Version:	3.09.1
+Version:	3.09.2
 Release: 	1%{?dist}
 
 Summary:	Objective Caml compiler and programming environment
@@ -7,9 +7,9 @@
 Group:		Development/Languages
 License:	QPL/LGPL
 URL:		http://www.ocaml.org
-Source0:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09.1.tar.bz2
+Source0:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09.2.tar.bz2
 Source1:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.html.tar.gz
-Source2:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.ps.gz
+Source2:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.pdf
 Source3:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.info.tar.gz
 Patch0:		ocaml-rpath.patch
 Patch1:		ocaml-user-cflags.patch
@@ -88,7 +88,7 @@
 %patch0 -p1
 %patch1 -p1 -b .cflags
 
-cp %{SOURCE2} refman.ps.gz
+cp %{SOURCE2} refman.pdf
 
 
 %build
@@ -189,7 +189,7 @@
 
 %files docs
 %defattr(-,root,root,-)
-%doc refman.ps.gz htmlman
+%doc refman.pdf htmlman
 
 
 %files emacs
@@ -200,6 +200,9 @@
 
 
 %changelog
+* Sun Apr 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.09.2-1
+- new version 3.09.2
+
 * Thu Jan  5 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.09.1-1
 - new version 3.09.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	4 Jan 2006 23:21:28 -0000	1.7
+++ sources	30 Apr 2006 17:20:55 -0000	1.8
@@ -1,4 +1,4 @@
-b6b380ae71f6f7bc7ff0989a0f8409e6  ocaml-3.09.1.tar.bz2
+63428ce7e114520e8f529c9ca809a1b0  ocaml-3.09.2.tar.bz2
 b25eb211bf91bcaa536b12d12731ceec  ocaml-3.09-refman.html.tar.gz
 280160b1fc7c8513074c3fda0446de29  ocaml-3.09-refman.info.tar.gz
-598bb8e86329afe1ae374385b2e177e7  ocaml-3.09-refman.ps.gz
+6ed0c6b1167dbf6c1cb10a78d302bc00  ocaml-3.09-refman.pdf



From fedora-extras-commits at redhat.com  Sun Apr 30 17:20:56 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 30 Apr 2006 10:20:56 -0700
Subject: rpms/ocaml/FC-5 .cvsignore, 1.5, 1.6 ocaml.spec, 1.23, 1.24 sources,
	1.7, 1.8
Message-ID: <200604301721.k3UHKwKD015699@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/ocaml/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15632/FC-5

Modified Files:
	.cvsignore ocaml.spec sources 
Log Message:
new version 3.09.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	4 Jan 2006 23:17:43 -0000	1.5
+++ .cvsignore	30 Apr 2006 17:20:56 -0000	1.6
@@ -1,4 +1,4 @@
-ocaml-3.09.1.tar.bz2
+ocaml-3.09.2.tar.bz2
 ocaml-3.09-refman.html.tar.gz
 ocaml-3.09-refman.info.tar.gz
-ocaml-3.09-refman.ps.gz
+ocaml-3.09-refman.pdf


Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-5/ocaml.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ocaml.spec	17 Feb 2006 21:35:11 -0000	1.23
+++ ocaml.spec	30 Apr 2006 17:20:56 -0000	1.24
@@ -1,15 +1,15 @@
 Name:		ocaml
-Version:	3.09.1
-Release: 	2%{?dist}
+Version:	3.09.2
+Release: 	1%{?dist}
 
 Summary:	Objective Caml compiler and programming environment
 
 Group:		Development/Languages
 License:	QPL/LGPL
 URL:		http://www.ocaml.org
-Source0:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09.1.tar.bz2
+Source0:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09.2.tar.bz2
 Source1:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.html.tar.gz
-Source2:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.ps.gz
+Source2:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.pdf
 Source3:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.info.tar.gz
 Patch0:		ocaml-rpath.patch
 Patch1:		ocaml-user-cflags.patch
@@ -97,7 +97,7 @@
 %patch0 -p1
 %patch1 -p1 -b .cflags
 
-cp %{SOURCE2} refman.ps.gz
+cp %{SOURCE2} refman.pdf
 
 
 %build
@@ -199,7 +199,7 @@
 
 %files docs
 %defattr(-,root,root,-)
-%doc refman.ps.gz htmlman
+%doc refman.pdf htmlman
 
 
 %files emacs
@@ -210,6 +210,9 @@
 
 
 %changelog
+* Sun Apr 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.09.2-1
+- new version 3.09.2
+
 * Fri Feb 17 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.09.1-2
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	4 Jan 2006 23:17:43 -0000	1.7
+++ sources	30 Apr 2006 17:20:56 -0000	1.8
@@ -1,4 +1,4 @@
-b6b380ae71f6f7bc7ff0989a0f8409e6  ocaml-3.09.1.tar.bz2
+63428ce7e114520e8f529c9ca809a1b0  ocaml-3.09.2.tar.bz2
 b25eb211bf91bcaa536b12d12731ceec  ocaml-3.09-refman.html.tar.gz
 280160b1fc7c8513074c3fda0446de29  ocaml-3.09-refman.info.tar.gz
-598bb8e86329afe1ae374385b2e177e7  ocaml-3.09-refman.ps.gz
+6ed0c6b1167dbf6c1cb10a78d302bc00  ocaml-3.09-refman.pdf



From fedora-extras-commits at redhat.com  Sun Apr 30 17:21:05 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sun, 30 Apr 2006 10:21:05 -0700
Subject: rpms/qof/devel qof-gnc-date-char.patch,NONE,1.1 qof.spec,1.13,1.14
Message-ID: <200604301721.k3UHL7FI015721@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/qof/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15653

Modified Files:
	qof.spec 
Added Files:
	qof-gnc-date-char.patch 
Log Message:
- Patch to fix a signed/unsigned char problem on ppc.


qof-gnc-date-char.patch:

--- NEW FILE qof-gnc-date-char.patch ---
--- qof-0.6.4/qof/gnc-date.c.char	2006-04-30 10:08:44.000000000 -0700
+++ qof-0.6.4/qof/gnc-date.c	2006-04-30 10:09:38.000000000 -0700
@@ -1060,7 +1060,7 @@
 
     str +=3;
     if ('.' == *str) str++;
-    if (isdigit ((unsigned char)*str) && isdigit ((unsigned char)*(str+1)))
+    if (isdigit ((char)*str) && isdigit ((char)*(str+1)))
     {
       int cyn;
       /* copy sign from hour part */


Index: qof.spec
===================================================================
RCS file: /cvs/extras/rpms/qof/devel/qof.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- qof.spec	28 Apr 2006 21:45:27 -0000	1.13
+++ qof.spec	30 Apr 2006 17:21:05 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           qof
 Version:        0.6.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Query engine library for C objects
 
 Group:          System Environment/Libraries
@@ -8,6 +8,7 @@
 URL:            http://qof.sf.net
 Source0:        http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0: qof-x86_64.patch
+Patch1: qof-gnc-date-char.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libxml2-devel
@@ -64,7 +65,8 @@
 %prep
 %setup -q
 %patch0 -p1
-
+%patch1 -p1
+%
 %build
 %configure --disable-static
 make
@@ -114,6 +116,9 @@
 %doc html
 
 %changelog
+* Sun Apr 30 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.6.4-2
+- Patch to fix a signed/unsigned char problem on ppc.
+
 * Mon Apr 17 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.6.4-1
 - Update to qof 0.6.4.
 - Patch a small compile problem in building tests on x86_64.



From fedora-extras-commits at redhat.com  Sun Apr 30 17:34:54 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sun, 30 Apr 2006 10:34:54 -0700
Subject: rpms/qof/devel qof.spec,1.14,1.15
Message-ID: <200604301734.k3UHYuHf015912@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/qof/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15895

Modified Files:
	qof.spec 
Log Message:
* Fix stupid in ahurry typo.



Index: qof.spec
===================================================================
RCS file: /cvs/extras/rpms/qof/devel/qof.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- qof.spec	30 Apr 2006 17:21:05 -0000	1.14
+++ qof.spec	30 Apr 2006 17:34:54 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           qof
 Version:        0.6.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Query engine library for C objects
 
 Group:          System Environment/Libraries
@@ -66,7 +66,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%
+
 %build
 %configure --disable-static
 make
@@ -116,6 +116,9 @@
 %doc html
 
 %changelog
+* Sun Apr 30 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.6.4-3
+- Fix stupid in a hurry typo.
+
 * Sun Apr 30 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.6.4-2
 - Patch to fix a signed/unsigned char problem on ppc.
 



From fedora-extras-commits at redhat.com  Sun Apr 30 19:53:25 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 30 Apr 2006 12:53:25 -0700
Subject: rpms/dclib/devel dclib-0.3.7-hashfix.patch, NONE,
	1.1 dclib-0.3.7-keylock.patch, NONE,
	1.1 dclib-0.3.7-permissions.patch, NONE, 1.1 dclib.spec, 1.7, 1.8
Message-ID: <200604301953.k3UJrRnP021111@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/dclib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21083

Modified Files:
	dclib.spec 
Added Files:
	dclib-0.3.7-hashfix.patch dclib-0.3.7-keylock.patch 
	dclib-0.3.7-permissions.patch 
Log Message:
* Sun Apr 20 2006 Luke Macken <lmacken at redhat.com> 0.3.7-7
- dclib-0.3.7-permissions.patch
  make valknut use the umask instead of hardcoded permissions
- dclib-0.3.7-keylock.patch
  fixes $Lock-parsing problem
- dclib-0.3.7-hashfix.patch
  fixes production of wrong hashes



dclib-0.3.7-hashfix.patch:

--- NEW FILE dclib-0.3.7-hashfix.patch ---
--- dclib/csearchindex.cpp	2005-04-06 01:21:00.397324222 +0200
+++ dclib/csearchindex.cpp	2005-04-06 01:25:34.469238109 +0200
@@ -419,10 +419,12 @@
 	CString s;
 	CBase32 base32;
 	CByteArray dst,src;
-	
-	if ( hbi < m_pHashIndex->Size() )
+	struct hashbaseobject * hbo;
+
+	if ( hbi < m_pHashBaseArray->Size() )
 	{
-		src.Append(m_pHashIndex->Data()+hbi,TIGERSIZE);
+		hbo = (struct hashbaseobject *)(m_pHashBaseArray->Data()+hbi);
+		src.Append(m_pHashIndex->Data()+hbo->m_nHashIndex,TIGERSIZE);
 		base32.Encode( &dst, &src );
 		if ( dst.Size() > 0 )
 		{

dclib-0.3.7-keylock.patch:

--- NEW FILE dclib-0.3.7-keylock.patch ---
--- dclib/cmessagehandler.cpp	2005-06-24 13:32:11.000000000 +0200
+++ dclib/cmessagehandler.cpp	2005-06-26 00:09:12.000000000 +0200
@@ -428,7 +428,7 @@
 
 	int i,i1;
 
-	i = sContent.Find(' ');
+	i = sContent.Find(" Pk=");
 
 	if ( (msg = new CMessageLock()) != 0 )
 	{

dclib-0.3.7-permissions.patch:

--- NEW FILE dclib-0.3.7-permissions.patch ---
--- dclib/core/cdir.cpp	2005-06-24 13:32:11.000000000 +0200
+++ dclib/core/cdir.cpp	2005-06-24 13:41:38.000000000 +0200
@@ -553,7 +553,7 @@
 #ifdef WIN32
 			if ( _mkdir((Path()+DIRSEPARATOR+s1).Data()) != 0 )
 #else
-			if ( mkdir((ConvertSeparators(sPath)+DIRSEPARATOR+s1).Data(),S_IRUSR|S_IWUSR|S_IXUSR) != 0 )
+			if ( mkdir((ConvertSeparators(sPath)+DIRSEPARATOR+s1).Data(),0777) != 0 )
 #endif
 			{
 				if ( errno != EEXIST )
--- dclib/core/filecopy.cpp	2005-06-24 13:32:11.000000000 +0200
+++ dclib/core/filecopy.cpp	2005-06-24 13:40:54.000000000 +0200
@@ -94,7 +94,7 @@
 	
 	blen = sb.st_blksize;
 
-	while ((to_fd = open(to, O_CREAT | O_EXCL | O_TRUNC | O_WRONLY, 0)) < 0)
+	while ((to_fd = open(to, O_CREAT | O_EXCL | O_TRUNC | O_WRONLY, 0666)) < 0)
 	{
 		if (errno == EEXIST && unlink(to) == 0)
 			continue;
--- dclib/ctransfer.cpp	2005-06-24 13:32:11.000000000 +0200
+++ dclib/ctransfer.cpp	2005-06-24 13:39:08.000000000 +0200
@@ -488,7 +488,7 @@
 
 		mode |= IO_RAW | IO_WRITEONLY;
 
-		if ( m_File.Open( sSrcFilename, mode, MO_IRUSR|MO_IWUSR|MO_IRGRP|MO_IROTH ) == FALSE )
+		if ( m_File.Open( sSrcFilename, mode, MO_IRUSR|MO_IWUSR|MO_IRGRP|MO_IWGRP|MO_IROTH|MO_IWOTH ) == FALSE )
 		{
 			CallBack_SendError(strerror(errno));
 			perror("File open");


Index: dclib.spec
===================================================================
RCS file: /cvs/extras/rpms/dclib/devel/dclib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dclib.spec	13 Feb 2006 21:00:26 -0000	1.7
+++ dclib.spec	30 Apr 2006 19:53:25 -0000	1.8
@@ -1,14 +1,17 @@
 Name:           dclib
 Version:        0.3.7
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Direct Connect file sharing library
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://dcgui.berlios.de/
 Source0:        http://download.berlios.de/dcgui/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:         %{name}-%{version}-hashfix.patch
+Patch1:         %{name}-%{version}-keylock.patch
+Patch2:         %{name}-%{version}-permissions.patch
 
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libxml2-devel, openssl-devel, bzip2-devel
 
 %description
@@ -31,6 +34,9 @@
 
 %prep
 %setup -q
+%patch0 -b .hashfix
+%patch1 -b .keylock
+%patch2 -b .perms
 
 
 %build
@@ -66,6 +72,14 @@
 
 
 %changelog
+* Sun Apr 20 2006 Luke Macken <lmacken at redhat.com> 0.3.7-7
+- dclib-0.3.7-permissions.patch
+  make valknut use the umask instead of hardcoded permissions
+- dclib-0.3.7-keylock.patch
+  fixes $Lock-parsing problem
+- dclib-0.3.7-hashfix.patch
+  fixes production of wrong hashes
+
 * Mon Feb 13 2006 Luke Macken <lmacken at redhat.com> 0.3.7-6
 - Rebuild for FE5
 



From fedora-extras-commits at redhat.com  Sun Apr 30 19:55:09 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 30 Apr 2006 12:55:09 -0700
Subject: rpms/global/FC-5 .cvsignore, 1.6, 1.7 global.spec, 1.13,
	1.14 sources, 1.6, 1.7
Message-ID: <200604301955.k3UJtBpE021273@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/global/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21200/FC-5

Modified Files:
	.cvsignore global.spec sources 
Log Message:
new version 5.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/global/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	1 Oct 2005 17:58:27 -0000	1.6
+++ .cvsignore	30 Apr 2006 19:55:09 -0000	1.7
@@ -1 +1 @@
-global-4.8.7.tar.gz
+global-5.0.tar.gz


Index: global.spec
===================================================================
RCS file: /cvs/extras/rpms/global/FC-5/global.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- global.spec	17 Feb 2006 21:30:39 -0000	1.13
+++ global.spec	30 Apr 2006 19:55:09 -0000	1.14
@@ -1,13 +1,13 @@
 Name:           global
-Version:        4.8.7
-Release:	3%{?dist}
+Version:        5.0
+Release:	1%{?dist}
 
 Summary:        Source code tag system
 
 Group:          Development/Tools
 License:        GPL/BSD
 URL:            http://www.gnu.org/software/global
-Source:         http://tamacom.com/global/global-4.8.7.tar.gz
+Source:         http://tamacom.com/global/global-5.0.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -49,6 +49,9 @@
 %{_datadir}/gtags
 
 %changelog
+* Sun Apr 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.0-1
+- new version 5.0
+
 * Fri Feb 17 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.8.7-3
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/global/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Oct 2005 17:58:27 -0000	1.6
+++ sources	30 Apr 2006 19:55:09 -0000	1.7
@@ -1 +1 @@
-35eec852b398f07e99cee08e9f6dd3c1  global-4.8.7.tar.gz
+4416b22ab4424122c6470187e5b0f552  global-5.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 30 19:55:10 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 30 Apr 2006 12:55:10 -0700
Subject: rpms/global/devel .cvsignore, 1.6, 1.7 global.spec, 1.13,
	1.14 sources, 1.6, 1.7
Message-ID: <200604301955.k3UJtCvP021279@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/global/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21200/devel

Modified Files:
	.cvsignore global.spec sources 
Log Message:
new version 5.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/global/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	1 Oct 2005 17:58:27 -0000	1.6
+++ .cvsignore	30 Apr 2006 19:55:09 -0000	1.7
@@ -1 +1 @@
-global-4.8.7.tar.gz
+global-5.0.tar.gz


Index: global.spec
===================================================================
RCS file: /cvs/extras/rpms/global/devel/global.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- global.spec	17 Feb 2006 21:30:39 -0000	1.13
+++ global.spec	30 Apr 2006 19:55:09 -0000	1.14
@@ -1,13 +1,13 @@
 Name:           global
-Version:        4.8.7
-Release:	3%{?dist}
+Version:        5.0
+Release:	1%{?dist}
 
 Summary:        Source code tag system
 
 Group:          Development/Tools
 License:        GPL/BSD
 URL:            http://www.gnu.org/software/global
-Source:         http://tamacom.com/global/global-4.8.7.tar.gz
+Source:         http://tamacom.com/global/global-5.0.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -49,6 +49,9 @@
 %{_datadir}/gtags
 
 %changelog
+* Sun Apr 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.0-1
+- new version 5.0
+
 * Fri Feb 17 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.8.7-3
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/global/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Oct 2005 17:58:27 -0000	1.6
+++ sources	30 Apr 2006 19:55:09 -0000	1.7
@@ -1 +1 @@
-35eec852b398f07e99cee08e9f6dd3c1  global-4.8.7.tar.gz
+4416b22ab4424122c6470187e5b0f552  global-5.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 30 19:55:03 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 30 Apr 2006 12:55:03 -0700
Subject: rpms/global/FC-3 .cvsignore, 1.5, 1.6 global.spec, 1.7, 1.8 sources,
	1.5, 1.6
Message-ID: <200604301955.k3UJtZBW021315@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/global/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21200/FC-3

Modified Files:
	.cvsignore global.spec sources 
Log Message:
new version 5.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/global/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Oct 2005 17:58:21 -0000	1.5
+++ .cvsignore	30 Apr 2006 19:55:02 -0000	1.6
@@ -1 +1 @@
-global-4.8.7.tar.gz
+global-5.0.tar.gz


Index: global.spec
===================================================================
RCS file: /cvs/extras/rpms/global/FC-3/global.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- global.spec	5 Oct 2005 11:21:26 -0000	1.7
+++ global.spec	30 Apr 2006 19:55:02 -0000	1.8
@@ -1,13 +1,13 @@
 Name:           global
-Version:        4.8.7
-Release:	2%{?dist}
+Version:        5.0
+Release:	1%{?dist}
 
 Summary:        Source code tag system
 
 Group:          Development/Tools
 License:        GPL/BSD
 URL:            http://www.gnu.org/software/global
-Source:         http://tamacom.com/global/global-4.8.7.tar.gz
+Source:         http://tamacom.com/global/global-5.0.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -49,6 +49,12 @@
 %{_datadir}/gtags
 
 %changelog
+* Sun Apr 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.0-1
+- new version 5.0
+
+* Fri Feb 17 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.8.7-3
+- Rebuild for Fedora Extras 5
+
 * Wed Oct  5 2005 Gerard Milmeister <gemi at bluewin.ch> - 4.8.7-2
 - Remove dir in /usr/share/info
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/global/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Oct 2005 17:58:21 -0000	1.5
+++ sources	30 Apr 2006 19:55:02 -0000	1.6
@@ -1 +1 @@
-35eec852b398f07e99cee08e9f6dd3c1  global-4.8.7.tar.gz
+4416b22ab4424122c6470187e5b0f552  global-5.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 30 19:55:03 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 30 Apr 2006 12:55:03 -0700
Subject: rpms/global/FC-4 .cvsignore, 1.6, 1.7 global.spec, 1.12,
	1.13 sources, 1.6, 1.7
Message-ID: <200604301955.k3UJtZd9021322@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/global/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21200/FC-4

Modified Files:
	.cvsignore global.spec sources 
Log Message:
new version 5.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/global/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	1 Oct 2005 17:58:22 -0000	1.6
+++ .cvsignore	30 Apr 2006 19:55:03 -0000	1.7
@@ -1 +1 @@
-global-4.8.7.tar.gz
+global-5.0.tar.gz


Index: global.spec
===================================================================
RCS file: /cvs/extras/rpms/global/FC-4/global.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- global.spec	5 Oct 2005 11:21:27 -0000	1.12
+++ global.spec	30 Apr 2006 19:55:03 -0000	1.13
@@ -1,13 +1,13 @@
 Name:           global
-Version:        4.8.7
-Release:	2%{?dist}
+Version:        5.0
+Release:	1%{?dist}
 
 Summary:        Source code tag system
 
 Group:          Development/Tools
 License:        GPL/BSD
 URL:            http://www.gnu.org/software/global
-Source:         http://tamacom.com/global/global-4.8.7.tar.gz
+Source:         http://tamacom.com/global/global-5.0.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -49,6 +49,12 @@
 %{_datadir}/gtags
 
 %changelog
+* Sun Apr 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.0-1
+- new version 5.0
+
+* Fri Feb 17 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.8.7-3
+- Rebuild for Fedora Extras 5
+
 * Wed Oct  5 2005 Gerard Milmeister <gemi at bluewin.ch> - 4.8.7-2
 - Remove dir in /usr/share/info
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/global/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Oct 2005 17:58:22 -0000	1.6
+++ sources	30 Apr 2006 19:55:03 -0000	1.7
@@ -1 +1 @@
-35eec852b398f07e99cee08e9f6dd3c1  global-4.8.7.tar.gz
+4416b22ab4424122c6470187e5b0f552  global-5.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 30 20:02:06 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sun, 30 Apr 2006 13:02:06 -0700
Subject: rpms/qof/FC-5 qof-gnc-date-char.patch,NONE,1.1 qof.spec,1.13,1.14
Message-ID: <200604302002.k3UK2ew3023855@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/qof/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20784

Modified Files:
	qof.spec 
Added Files:
	qof-gnc-date-char.patch 
Log Message:
- Patch a signed/unsigned char bug that caused errors on ppc.


qof-gnc-date-char.patch:

--- NEW FILE qof-gnc-date-char.patch ---
--- qof-0.6.4/qof/gnc-date.c.char	2006-04-30 10:08:44.000000000 -0700
+++ qof-0.6.4/qof/gnc-date.c	2006-04-30 10:09:38.000000000 -0700
@@ -1060,7 +1060,7 @@
 
     str +=3;
     if ('.' == *str) str++;
-    if (isdigit ((unsigned char)*str) && isdigit ((unsigned char)*(str+1)))
+    if (isdigit ((char)*str) && isdigit ((char)*(str+1)))
     {
       int cyn;
       /* copy sign from hour part */


Index: qof.spec
===================================================================
RCS file: /cvs/extras/rpms/qof/FC-5/qof.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- qof.spec	30 Apr 2006 05:03:15 -0000	1.13
+++ qof.spec	30 Apr 2006 20:02:06 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           qof
 Version:        0.6.4
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Query engine library for C objects
 
 Group:          System Environment/Libraries
@@ -8,6 +8,7 @@
 URL:            http://qof.sf.net
 Source0:        http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0: qof-x86_64.patch
+Patch1: qof-gnc-date-char.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libxml2-devel
@@ -64,6 +65,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --disable-static
@@ -114,6 +116,12 @@
 %doc html
 
 %changelog
+* Sun Apr 30 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.6.4-3
+- Fix stupid in a hurry typo.
+
+* Sun Apr 30 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.6.4-2
+- Patch to fix a signed/unsigned char problem on ppc.
+
 * Mon Apr 17 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.6.4-1
 - Update to qof 0.6.4.
 - Patch a small compile problem in building tests on x86_64.



From fedora-extras-commits at redhat.com  Sun Apr 30 20:59:29 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 30 Apr 2006 13:59:29 -0700
Subject: rpms/raidem-music - New directory
Message-ID: <200604302059.k3UKxVKU024270@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/raidem-music
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24244/raidem-music

Log Message:
Directory /cvs/extras/rpms/raidem-music added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 30 20:59:30 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 30 Apr 2006 13:59:30 -0700
Subject: rpms/raidem-music/devel - New directory
Message-ID: <200604302059.k3UKxWsH024273@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/raidem-music/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24244/raidem-music/devel

Log Message:
Directory /cvs/extras/rpms/raidem-music/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 30 20:59:44 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 30 Apr 2006 13:59:44 -0700
Subject: rpms/raidem-music Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604302059.k3UKxkoQ024322@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/raidem-music
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24289

Added Files:
	Makefile import.log 
Log Message:
Setup of module raidem-music


--- NEW FILE Makefile ---
# Top level Makefile for module raidem-music
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 30 20:59:45 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 30 Apr 2006 13:59:45 -0700
Subject: rpms/raidem-music/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604302059.k3UKxlNM024325@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/raidem-music/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24289/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module raidem-music


--- 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 Apr 30 21:22:52 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 30 Apr 2006 14:22:52 -0700
Subject: rpms/raidem-music import.log,1.1,1.2
Message-ID: <200604302122.k3ULMsFo026681@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/raidem-music
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26566

Modified Files:
	import.log 
Log Message:
auto-import raidem-music-1.0-1 on branch devel from raidem-music-1.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/raidem-music/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Apr 2006 20:59:44 -0000	1.1
+++ import.log	30 Apr 2006 21:22:52 -0000	1.2
@@ -0,0 +1 @@
+raidem-music-1_0-1:HEAD:raidem-music-1.0-1.src.rpm:1146430764



From fedora-extras-commits at redhat.com  Sun Apr 30 21:22:53 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 30 Apr 2006 14:22:53 -0700
Subject: rpms/raidem-music/devel dilvie_-_east_of_the_sun.ogg, NONE,
	1.1 dilvie_-_half_baked.ogg, NONE,
	1.1 dilvie_-_the_dragonfly.ogg, NONE,
	1.1 dilvie_-_up_in_ashes.ogg, NONE, 1.1 license.txt, NONE,
	1.1 raidem-music.spec, NONE, 1.1
Message-ID: <200604302122.k3ULMtDe026684@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/raidem-music/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26566/devel

Added Files:
	dilvie_-_east_of_the_sun.ogg dilvie_-_half_baked.ogg 
	dilvie_-_the_dragonfly.ogg dilvie_-_up_in_ashes.ogg 
	license.txt raidem-music.spec 
Log Message:
auto-import raidem-music-1.0-1 on branch devel from raidem-music-1.0-1.src.rpm


--- NEW FILE dilvie_-_east_of_the_sun.ogg ---
OggS
b?9?=?dkM???[MJ)%
Y
*????*????2?,??2?,??2????:)??B??k??????5G)??RJ)???9?? 4d

Y
b?d!gA?:?!c?R???c?AB??R?ABCV


Y	

!? tB))U9?sJI)x?9)??RK?sJ	???Z.?PJ(??[???RJ)????"?PJJ???!?TRj?? ?????R?1!l,!??Z?5!?j)?k?A!\I??Xk
??sj-?Xk???[???
!?B)??RJI)?B!?RJ(%??RJ)?B(??PJ)???RJ!?PJ)??RBJ)?TB!?PJ)???RJ)?PJ)??RJ))??RJ)?PB)??RRJ)??R)??RJ)???RJ)?RB)??JI)??RJ??PJ)???RJ)??R*%?RJ)?
)??sJI5t?A????j????9*)?;!??Z??uLB)?c? t?R?)?:????J???PRJ-?cl??[?1?[+??c?1??Zk-
??????R?T?(E??	???NN??M?H
b4?9???F?V
??E?
?(???(?Q?????3??u???0z?G??v;?JA?a:F!?8????C????
"#???
q!mA
YRFD????'
?;??*?JX2I
yB?/??)K??XZB???!CZ??$%H?I	QBR&??P?D?(+
?%X??b49/&$??????4(?????
eX??)??C??)?t?:?"N??8
?a1N?uX	g;??p?Ch?rX&dU????
D??? [?E?????{
7?K??9??pc??ZJ?9f????&?????[?????o??It_?????L??3GK???,?h???T#???????Q?yh?ge?????y?	???'???H:-??W?+ix??IX????*?W?*???~b???7?T;?<y??+??s?N?M??	?#FgV0??Q???????d{O?[??sbG?(?????{?????jT?+kZLV?2???Q?"N???????=Q?7?%G????b^?s<f?????*fM?I??=?Z?????|??@?????4??????&33??/
????Lq??fUS???W?DbQ*?l,??????>GD??x?????c?G???+???1?>?VXVr^????????=??*?	"	"ln3q??"hr????????@????k?t?z????W????p@|?o?o?-???
????b?*??2?"Y???^}??Dov<W=#9???V????????!?????W?U????
?&?I??D5?????z???}y???,w?K??????Z????????o??G2?q;e?F????pK?GZ?B#??_f??WH???W ???Z?I??C
?x^a???c-?0gc??O?c^?jy3???6?Xz??W?????S?\yw?j???%?_dX???[???At:???V0?)?d???'CR????C????n??6w??v at U>??W??ga??J
?dc???
??????N?,?B
 ????????\???I??~?????B?cn?N}??????;_?@??g?????<??
?
1!#?(?|?"?????d??A?i?????<?U<??Nb??=?`v[??o??ly???8!x???O???
2A*	?)?Hj??pL]?b??q??F?I?!?p+*h??" ??2t??4(BOggS
????m?	mg'??MDwU'?Ce?e?5ACMI??B8?sFk?mM?6?v???(????????G?2???EO ? ??@???:?	???1L?N?qB
??(N???;8-C???~?=?%=w???AgtZMp?hft?cq?????SD?t ??Eu?d[?nl????[{?3?X(
?T6?bO????ep?
ur?,??	 Iz????LX,5??Pq??L?i,??8-c???sZ
??AUTpb?????
8u?:BB9j??	?I
#??Zi????:UE??
F/^?;V?c??P
???P?|????N$UA
?"bq????

????????+
?P?7?D?B?2 M???RW,1X
'H?%???Y!?1V?WgX?k
?<#N?u??*?qRJ[
1?ZT?m?S???j={?"*?)+x"? NT|?p???6?(!.?n?$?z?5 ???4?
l3???x"0?????p?'?B???`
?'?@`A??=?)?+??m4?????XQDD+F	z%$!?QE?Tp?HP???owf1D :#D?-???PD??*??Q+`??6???
?NT-?N+"D4??n??]e??H?A?r?
?P?s?M???1???C?f?Z??^??Zj
j?!ap?@QQ?8T<vT??A?`b?(?hh1???1?g??$????%?T"]]?La)t?0??\??B?l-???@
}.?]<6?Gd)?gF?7Q?????/qY.??"?iJ?u??9l?H$
I??
DSD+u??xJ???#???WC?18?iD?	?
??S??1:FU=??1t??1Ze????z"pZ
1??E?h
?5?P?A????Z?q
V[q 
"
??aV?z:?P?a?5?Q??TkMa4?F??????G????0?M?]k<ZJ?????2-E;?p??????????@?@???E??Qh?E???&?b?F0@?!??'??]1Z??j:??:?.<@?pu??1 ?{?v?
?.)?
??b?) F"????????Q??gtN??h??????g4?kQ??h]?????Qg?#??=z??
?7???!+?:Qt? I?F???2??:?E?&d???]???C0?????ZS,uTs?J??1o????6h(?$?a0?	cp8??5S?sC???????2???????\??44?H]%
ZO;????F??????????F??\]5???????q???-*0?0R
I???B?PPD? ?T?X?]??????S??6N???1.??Z_?b"
l*?????;???C"&??]RPWlD?
????	i?ABe%
E? O2??	VHdD9??X??8?!?NQT???S?1????T?paP?	Z??GW?Y??}?kI?,U??+g
r?1?%??M?X??BF??v?NOu??
??|??~?B???%?
E?"TGmki?CQ?8]??APQ?Z1???`AV??`?D??!??AU?(?BV?dOggS
(?(9`?hC??????(??H0???????
F]8?!??0&X31
B??!5???y!Nb????"V?;??BWG?)
?P??L??@Z?
?@?1?
,!		H?2!@?????(?!!??+?V????
?? ???T??+?3E????
!???????Q?X??u?EE?*?R(%
 *N
?)*???8@p?"?`?P?
&?
N??????)??`DU?bT
??XA?CQ?0tt?&??????L\B?A4?x<??4Q?????9
?.?@G??
8@e at 0???Nb4?GC????9??Q]?Jm;BG????C;?!?3xB
?? ?`?
?(?F????
 ?-
"?Y?I$????????JZp?4.[?NQ?
b?Q?u???D9b&!$A?b?S
?"??? ?
?mFe]Y??IY?{t?ls????<?,H<??????y? ??VW?? ???2
?,D"
#?~W?O????z?]F??$??CGb	?EE?f~]?
?????F?)/)=z
?:{ ???ZU???????B???P????5??s'vj?????????4?
?W.
T??2?r=O??wDg??0N?5??p4??LL??.?C0??L~^?
?w7??A?VT
H???ht"?.3?I,?t-N??H(p^E?????&?HP0??7vK^?DT???Z??z-????A??G1!V?7???1w6??-???????_?c??K
??\*??? ??`K?T?F2?
?Q?6
?
]l4-?u??9L?Fn??h?RPt??Yg?1qb4&??E??-?FMwt?DNG???X?[???????????Ub?X?0?????q?x???A?B??ad?0???)?E???H?'d
??
??????4?DFsz??B&Ba??u??,?L?>{?@????]??????7qa3i9?_"W????(C?z???D?=[?.??????B?R??????s%???????,?????H??JP0??wp?I?YO?

R?0(???`??
????C_2?>]N???d??Z?A?ERU????5???\K???Uo?NPay???`7??gH???-@,%??{?!?"??S$????fy?6?H??0???Y?]@i
52?g ?gN:[???I4I?P-??tw?!??9??(G?~
rF????B??"? ??0d{kf|?????t??????

N??Ka????1??c?X?k??h4??
*C?s?M%b?+gf@??Z???_$
Z???@??????|
q?0?_%???sBY????|+?~?????/~j?
??y#b???v?7;?2???N??}?;?????
P??h?R??"5F2D?J??^
 ?
<??]+???9b?l7???0p1h??	?s???Mo???	?B)Qk??*#
eq*?*?n?{Ed4E
?KWN?MW]C}[?m?@????l2#?=gO?Q??77?o??o?W?????"?J
??UO????a?????q??i???.qr&j???$
3?]?Gg?oqm??w???#?????A???s?z?w????????)?{???????9???eZB-?n??V?*l????????t??|z?o.?si?????
????????M??q???_???	Ue?X?b>?H at T??o??V?"P??T??+???0????	?({O???(???7?L?+;w?????2uC?O`b&?????!|??i$??iV+
?}????v?|?0?O<???n??q?"60??W)H|?C??Rg??
??z?b?hJ?XG??SD?????JJ4EcQEUoU?3&[???(6?I?Q?L??D**??????o]?M+33??*??US???}??S?
??t??????DHk%???w?0$E??o3?????-?^?8?O?W???

3
SKM??u?44?(?	???????-a??ttf??'}?v???a?????_8j?J?X?|?>??:???#?3??g=?|??9??2?[?3??????:??N?;??`?????v??????3?/_o-v??T{?z??v?NO~??z??>???@??????*d7'??;??
(s???/E?#y?+??g???R^?V???5?vn??2???{??
?RA6NU???\R???s(???w[????A
st%9??"?PzZ?`5DT?[???V;???n?????n
????B?????$?A??	???$x(?Z???KQ???????4?z?x??l>????s??"5?1e{?1??L
0?T?nGd?v?|??y???\?HDc??&
q??"?XI?e?]T??V5Z;??QLKI3A`M?????$????9"??(>-??S?a:De?o??yP{??H?`????|;?????l??7<??t????>0?W???????#c??,?u???9|ih?1??????%?pO<????????)?tH??R???w?<u?Z??h?c?)?F????1??KbG?????
??r?
 ?<???u

?[DD?K???"???R????K?? ????,???&????7VpP?
???
1?	'?n???V?t?;?????)?????sV???2	Zg????????AK}U?b?5-????????G?h?@???005D????82?????y??8t???{'?lLk?'??G?@??0"??l?(?
?????????suN"?
Qjf?????? Al??
?J????????,
?F^??y_t?S?]?[???a?"?????3???:??A

 
??>?i??????>
??
??mz???<????~??~%?_?????{.VL?^T&????g?{????4?BK
??c?Ok??u?*LZ?At6???v ?@?GClm?>K?}???????1?s?u)D???5???.
@?~??@???|????d?D^?????Y???A????T5?L]??}???????????CY??????
z???<*
eg'???B??t?!geo
r?}???@??????u[?t??-,??Q??qp????2?I????a?j^j???@iT??9??6D??QMQ???IU=?????]?/?0???????.<??\????z??8?X?GX|???????u?????}?????C?????w?^??R?Eg??"???*L?~?jY???	?`???"4??X?h.+????P?
??ln???M_??6]u3?_V????
c?l*?9IS?????	E??k??a???.??!j?IP!??"2
_3d??
E"$
??"u?;D?G-G?9??/ZQ???%
VE?#??DU?m?3?qm????$
?%$$?
FSTA???C!d"/?#N??Q-?z:?i?;?\??
?@.MR???r????tW????U??'=??q7	?6?)?c?g?#e%1???x??brS???y??????????????b???
?1?@???t?\??:B0????lJ=~?"svx??????;u???L????na?.??
`vH???
?????D? VA
?R??	
?p?@??u???C?2
????r>????(?La???fA??;???*`??,?+8TV?2=??^?hd??[f&??Wo4K?L?N?] mWK???C?y?7?t4oA??!???C~?46???}???X878???:
??H`????????]?!?!?8?????????l??vr1?B?????5
???`^
????X?j7R??@_F?@????A
?L
?x!f?PW??9m???J(???`p?\nK

??J???E??? ?SK.????P??4?$D
??X??`#44??ik???F
??D+??S
?E=9???????1?????x?U???~?*+??G??BSF??c????
*???6=??
?e?
???????r??_?iCq?NI?i%?89?m~Vn*?%????????	??7?WG?t?M+????[r at Z?q>h-&Cz???(??Y-??8?@??2????s?{?y8I?"c?,Bmga?TN?Z???R??>?wO?Z$t?????!IJ1??0?&????2?l?R??1?F?JNS?Q2?Ge
?k?Y?N5#?+????
??K?X???L?@??+?W?JE.	???f"??U2N-???N?v?(>?b?N-|??????????E?.'9?0??}6P???????om??B2YJ!Hld??X?TC-?????r^???4?????????n?E}?r???}rT??*
g?????5
?????????KYDF?i??Z??]?JH???L9Q?	R?,#*$???@???*$E$BX?p?]?a?2N5
.???0?j? $????)?
+&?T??b??????!?A]?I0p!2??R???e???.0QOV,eDy"	? ??r,?:?q?CD??@?'???c????u??T?paP?	???bg0g
??_=?????5P?h??+v???????5eN?????}??????Eu??'.1!??%?

??(%&	1 at D%(F?" ?L#%,a?
vd?y?ti????X?IRB??E	2K??$"_fi	*%C"?(@`bBc$??X??4?ee+*?1c??C?N??X?"X?1L@?F
*?+?EUE??@TJ`?,? J???a?
???`b?0??s?@?1j?
>?T?
=?(B}?~??j???I?/?O?]8g-c?(dn6{??e?vn????*????E$
"F?`?c?P=?Qk?u??
??
!???????Q?X??uK??U?B?(q?D,
bQ???(j?? ??m]X?J)?0?J at 7??
?:??J??????NtN????!j???m??n?c(!L(AP

????4??????
j????P
AE? 8h
H0?u?
V
D??? N+*?V?K?????f?????1?????4?@? %@H??????????
?Uq?[??.?]?qbA,?
?F?FGa????????X???'j"Z???'D3p	"
?0"Z??C?@????@?\c?? ?s????
 8?????a
*
lMP
_???K?*X
P???IT`\??j+?`\?4!??*?R??X?'`
@??SNV 
?`?'??H?PD??SJ?*????h&t>?,????Up???
B?H)?W?
F?P?
O(Ve\??b?
!??A??8"!Y?*TZ?T
YC!*H*e?$"????#[?QOggS
??h???
???ZJC??1???s??r>??.?[?=#luTGv\<XR+NI="?4 @??
d?`?5D-?
?
=?
K???:t?????AK+J(?AR?YF?YyZ?????????5P^?%????}???[????G?yE?EzDB?S?p?kkk8b?P??M8??c72<pp??h
gF?'?&??c2???kE???;!x0???????????;nre?V?????K????mM=???35u:
???A???3P<^?z?z2????4*?????????H
?6?Cd`A\ SP%??@?

 
??\k???X??JM.?"?????h?q?	?CN'l?????i\ ?HD?'?<b
?@?????I??dB???KY??eeEq8<??i1??h?VE??XKh?+RB??)F%???P?????? .\Cf2??9O?U8?"	m??P%T????E??Qs?\???.f
 /%?dd????d	P(???/?*???BFQy?e???@?DYAY?E?3P??qbE@[??b?
??~??ug?*mf????qKJ2kR-?
?:8?s5????F/??iu.n"?VR?UD?Ge?"v?????{
(?????VMu?
Y?H??V??-`E????KA,??1???(P?1ze?h?T?k=?Y??T?r??4????h
pwJ??)?9?	%????5?h????Y)$vIi->&?;??? ?w??
?C?/?jbgg?|<y[qUV?????L???C????hex???3?~v?@?7?)v?????I4?????/???????+ED?
Yl?
F}E???|B@????^d9X!u?$C???n0G????N?!?????????c*?`(??ZKz??????V
??_:L??<
??d??h.?T??!D
???'?K|?H???T%?N?????K\syuxpw?uR??sYdN
RUcM?:?;?^??=q??P?K???
VT??UI\I??~_>S(?????j)Q???????l??G??^4??l?H??<?Li?i?|kHK?nr?Ml??]E$mk??z;?uj?&?W??DJ?;GA??z?\????'?
?VR?^??O??l.??-J??????A???zZ??}???dp?d??/oS(:?
?J?(??O?0a~?+?>??'%?C???S?8

 ?|?h3c??M??>?u?lr?D?-?P?,?2#B~?c??

K?D?$
??.i?F?E ????J#p
?J????I4???k	??.?K!rTFNs??H????zno?gs????M?g??4:????;?
?????T???@a???=L??V?}x??????!-?Z??????l???U??y?????6?q???FAKC?I??$=??"??J??d????b????8k??_?H3Cx	{_????a
L[??<A?u?M?i????C3?H?????z:??(??kxu??4??????9f?$?mHSq????????7??{??8?1???9N?=?zl?~y??3Ss??:S??c???0s?k?
??

`
b??Lc??LR2r?G?'??~??J?"??l`j??????)y?=??/??\0???=??Y?????l??{???N-??T?.?0???????g:B?o?c????o7??g??ZLm2??a????e??-<IZeNOvR?2SP%?Jg?????z;???oM
?3
?Z?v	??	(?v??L?+??????H
???u? ??V:f?R??G??$?i?i?F?B
g;@?9?}9M]K??&]??1?'???,#&`J??tO0??-;2
U??v?o??O}|???pN???M???1x}.?UN=?(????????d?E,?%?`????W+?CY???)j??he#???????[}?A???4?(????cpJ???? ?]???qOK?
?:x8=?????"?[:?b1??????n?
??????
@y
???y?????v?-????U???^??	???Z???<o,;O?Dc????.??3?o???ByV???\=??W{?L?????
v?3TLh?!?	???????0?????6??s8W????s???0
??JD?n?9?Kt30???w?Ur?Y?i???R?RK?u???????{?????????j$?90?5?$A???:??D???????
?g??????EcF?qY
<??????z<F
??E?ZW?hJ5?R;??J\ +1???9MO??f?l?{?\?Xe???PZc??Ch?D?????w?f3j?U??I??]??+????
"3I??Iqh?*?:J??:?"?????,??X?{??UC???????2??Zkr	K??C?N??#v.?a?????P?i:+?"?>??<cue?@???M???
UAH
D??B?t	?H	???
??2???7?5??=u-YE V??Q?*???????????h*MP?g??4c?9Y?Xg??\bh???6?X?0?7b?&???
???o=?C?*>??6?????K5?l+?????(?%?lR?U?:~`???d?!?IZ?hg%?Y??p?2?\
??'?=	b???~?????? ?X??~??D??>u?uZ?{?c???????????<?`?????HI??

?JF?????T??2??????$????I ?k?H?HS??????"?w
[...40740 lines suppressed...]
 ??Xu??%? ??i8??J]??????L];.\??F?? `?$af00???A?
 ?t????)nQQF????_??iTg??]??????u?v?0CA<?
?@@?????.?O?8??F?
?a?AS;??Q??Q?w6b????
?Q?"???6J
C?@D\???6?????T??hC?
\?? b?^
????6aU????_&??J???e ?f???Q-=?h?C[??x4c????@??7?c??<aIaI!J,
?
8?????	@J??*wFG,???s????>E?v?0@?!???9/Vt3,p?*A34t??q?0 B?!?Q6??|.?#?
?"!?2????]M??Gz6???k??Nk??w??*Ow??.????1??d???
?t0?7]!?r???9??	r?X???P??tHm2u
JL?3X??WUg?E?
???
Z;?A?i8?=k?zF?A?B?3?\{????????? ??
?W??d?,?????Z#L????????????w?x?k??9???v~U??XbI$	
??LV?L4!R
nR?
?
*2>?D@=??????@?A??*?e?W???jV?G?????x~[;q?\[????
???\L?Xd?
)J?$?C$?$_?gx?5?B?????KRU?'5i?A?F&
cH)
????l0*?^7X??z?A???T
sE?0F_??f???(?t`$??0 c?~?4?MY?????c?a8????yI??C??	)	?A44????=??K??hn??}6?????-t$????cu??&??@? %?D
??4?V??????K
l??z`?4P?rK
&
????g??F? ?\?v????u?????y?yBl????????I???????S?t?3&=gv
I???Q?t???:2????G?.U?`8????w\y?{ ?=??????u??G??U?N?l??
?z'f??hml???t?o?*[?X
?	???O???Hk?g?_??IAm??$5??Y????V????KG?*e?9???>?3??UB???r?]?a at k??(?:ft?<?b(??%}?	4??X???|???[?????!x???b????A??s??FR]c"?sP?E?*?t???Mf?U:???r??MGkEp??K??C\??[O?%?????Ca?C??#?????J???O?J@{E?C???(??
??k?????u???}V?L?q?+S7@??????\I????I
(?@?KU??6f???L?!@?
)tIap? (V?}'???M
t??0?B?*?E?:?V??su??N#?7@?
?Z?J??b*G???bt0?Ng????:haEQe?P??VH???1?6FP??? ?
?$%?m,??????u?
r5M7?u???h??
K#p.??6????n??F%
???`???1?z???#??
4'?txR@*(qt?E?9?%???
?{30??Z???6o???
9??S?@???p?^???*2?<?qW??FK
R??2????5D??M
??
Fp?"?%P0:??
,?
?? ??A?^3?j???V??????]??(?ry?P?R?~9????A???g????u(?U#	?6????iG?1`y?l3[???0j?????` ?|[?????
??`???vE
???$6?
g
???U	?M??Zb??rV??$?$?B]?O
.?n?@;:I?h?bRud??M??FbV?@?MdZ????ZQU????)4??N6?????i????g@'?/t????t?+BM?T???0???EJq]?\????N?????t?<?t?D??4???Fo<?c??????f??	?z?)?h`???????????}???n???cb?????????0??5????Gj?0 ,yp??m??)*??)??*~?*G?(#(p????d?-m%N?5??E???F??2?>?????"?+;A?~????k???z}??e?Y??????lY??7????N+Ib1M
??"d???g????
(??B??fYL-????"$R?D?B?S?a?Ru???u>???J?i??<,???8?d??i??????_?\?e_r???I??q'?w????<????0%??x@?G-~??<s???I?G????cXGBC????????PcK??N???P???*w??"?X4??
d??|wy?B?` _???w*??
q?X?Z??D&?"l{?????{??i??
??? ?n?]?;???? ????}$*????%??[y???z?4>+???9?E?#?r??7???C?b=????~??
?v???v???$JX?H
??j?-Rr_bl??{,s??V%Q?oJ?+??%???????
/???_(`???em:???.2?D?8 $-J??G???????a?j???*](?W??????????4H??????k???X7?1F?
??!?? I?????E???w???l?:vt??????7???v????<?oQ??,Tj#+?2?{?;??#/~`e?a??(x?Q
"??}?Z????X?u????0zkp????????????^q??&?t??????ji??=??V??<c9???9??C?U0?H8?:?s?@uJ?\?U?????
?m/?@?C?????????Ga&?j??X?????mm???????6_??XV?$??????????\???#?? X#_??u??????????Z?7??l~?
b	]???CW?<?|:?&??%T??mA?????/e???B?G;'??U??9????D3|????c?V?????J?p?X
??^???J~?V?k}??c`|?B??C???<?^0???????k??????V??u=??V?	 Q?"???????X?M?Hx?k??A?:?Qi?f?O]?pB??'?h?d??????^?!
&"U=-?$???1???+??zzv?sBU?C?
?JV?
??t????
`#??????T????U??!?q?L4????`
???GO???????O??
???^??[?????V[?(??\-'+Y????????#?
`?
n?m
>B(:????d???????\?
&M
?\2.????=\??????sD????7?[???u?7???^?W?K?????z?Y???%?3??M??4?O?????	~?ei*
>?m?)?ge??B
?j??"?O?????K??1
???3x}-]f?8??(?&????=??
?E*S??r'x??I~nAC/??<zh??+q???zK???!=W\??_??Q?[g?????????mgz?<Od
9C??3
&?VSS2??M?$?
_?{p????.=?Z?+?:?]wW?-? ?????????v#Z???O>sT??P'#??Z_??j??=?2)-!
( ??*Z#??"?w$@Z?*????C??*	?z?RW#]?"rH?P
????P???a?F/?bbhM5?5??B??:
?????GCO??n}u??????(M%4
H0?R????z??Al?????[v??????????
'C?JA5m?? ???*!?4x.Vu????;$?$?A2G$b?b?Xh~,?"A??[??E?.?`??	??	??P???????t?:??S???j	A??`:??*?3?Z???W&[px???6??>???_Z??#??%??bV????/??Vq.:bu]?^r??:M(?I?5;?<O?6?b???????????udr???Q
?
?E??U??Uk?}??^?O,?n-??n?q????????{?????4
?;
????34??@Rj;AF
?P)0U4?	?
,?4	?RDF?????|
e??X?J????*??>:?7?gT/??hMh??hASQ:E?????ZH?VA}?r?+?x??A?B_????91???5j7???? ?????DdB:r?9u??Z??
??C[???,???
?
?~??%c?????W|??5W??
0???v?b?$?M$

?3q?p??eb
?w12?}>) ?JaH}?????#??r?3
????????O???W??????}_v_w??k??L?Z????

Z??>2????O??r}???????C:st eFW?'???e?Z???7?k?7?z??~
?<0?/??v???8?????U-)?v6??f?#???;?:-,??:Y?J?WA?O?#=?????^???u??_ F?R??3??8?E????C.8f,<??zM?n??d???w?a?#???4n? A??~??{?	?V??@?U??^??h????'??C????9??x??????{???3b???7? '#
=???sMMbf???&

????0???????~???
?,??A??????O??hMVu?
?iD??3??B?U???H?NMx?J??R???5!?k?Rf????.tT??)?7?????%????????SJ???0Z???????Z??????k??(?C?^q_??)
=??K???6?(?U#?0 _??P
E?t??b]?V?G???p?xJ??????
?2???R????Y?[p????:?QEhs??]??.?H"1?
h??|??WD-
E?????F???????l?)?BZ'D?FW"????3X???R?(K?F@&1????????0_n
???J2N
?7????)???(K	?uG??'V???I,?"
q??k1|???}
?????Y????Q?N?oR?$4
?????m???_?s??2?????S??????J???F????d:???F???:?{????t{t???W????=??R??Ry??F?X?????(??{oJ??????i??K
@?
?e!???Oi&8
?0??w?	QrTM?>/???/?z?q>A????R??$H????


VU?
?????W?R?X?^?w?&7??m^c??	???????p??^3???x?9??[??Pl??4m?-??_)?q???W?R??0????O?{??
?g??!Q?
J?L???Zu`???!????dD
??F?nv>^?MX?2a?\
Z????*3rQ???J?U??d?!?R?gj?F??>a?3%U?K?2?Qtx&z??v$?~g 7x+??Q?$`????=b?0????????5?\2??P.????????e??????Oz?y?Na?`????}?;??<
S????>L?ofs?U??lUJ?0I????y
Ga4

??K	?9#?j?|??JO??l
?/n?U?I??S??N@?Cf?b,tbU?D??lE?????T?Z?6???ft??.$????l?|???h?q????^??????:(?
j\yBN?Z>??s?)???h?n?????G;9{??????h????/???s????zW z??v]??-?
&P	O?$dnh??C?g????????;?]"u*??Q?????=b~?E???I?*?*??x?8[Ku@??#?k
)?S??=g????X?7>??v??g??T???R-????1??c??Q?Bt?5??l%h?m?
???TJ??B-}	G?j?9/Z??lX????
??g2Z???$H??????GX???d??A?Q:???c??/J?(??-
??!?2????
?5!=&?????g??<??<?j?s?C
\^?y$??%w?H?3??f?\r?R	-td? ???$|H
G???Q{??jsZ!?[P????a??#?A??
f??84?pAuN??m?M???!0:UK??
"???5Xj???(;|<?????w????v?-G?_2???q?&s???a?`zp?Q?? k{M?????!??rW??i????s?fg?c???F?*?U?k?????~?\?????az BB?m??	
.?????SA??[???M/O?`P
^???s?KU?#??+?N???3?p???!N*?\???cW?)
n?6????,Q??
K$P??e??t?8|efyd??
M?0?????3y2??A?~??,?$?Y7"^1xwH?[?I?e?c???B?E?7K?7?p????b~??M??????*?;???W???S??V7c4~??Q?u??jP&x?P??C??G?/{??Y9?0c????F?=?X?4?|??`]?^[??Uxt??^??????
?~?8?!ipd?M?4`?C??<?*k?7 ??w?z?:,?5??Zd??????????S??X??9???????
??nj'c?X?
?)?
]???%|??I?N
???x???(+U?G??h????4?3??c5<J???xK??9????-??f&?Eoo????!3??d???R7~
	!??Z2c??j??4??G?5????????{????JT?#?T???????zZ?wxl ?7;???Y*=Wx7??2WX?:v$J???j??N
L??
??Q?D???/C-t
??kO~B?p???G??N???;???>??v?56<(MH?????8??S)???1????#`>??c?<?:?Ql?j?
VJ????u???????J??;??R??S'?|???G???%,/??NXa?
?s?M??D?4?????u\6??\B?K?}
v????????????????%o?_???x!?l??????'?1Q#?@1???4B??????T?????>?;0?y??
???<Q???
???????-Q?*???OgW??
?*???;???&R/?a?]??6???H???a??w???N???o?&[??S?$?fw?+??3m?????~2???F?"??????:-Lsw;?|?QrRS??=??f?M??-R??{????<????[?I??????OJ?4n??P?jv??%????0??5w?5q????m?$?????kf?????c;Z?g3`_??????3???h??K????0??`??[s?????????[H?\??e?Hf	
V
?
};u@??5R?e?f????h3L?P?t?%??'??v??u?I%)??msm??Z8?t*4w?\????SL??7??? ??E]c>??F????B???A????y)????iB?Q????ku*1??p??'^Gm??????????t:?:z??E??'j???P??d????q&e'??M?F0.?	????l?u?????x?? '?T?3????)H??L_c???I&????55zG,????b????u??L??X	??5&<m???+_e
???
?
???$V8?"

?K???`z
)??9Q????V?Dl??1?e??f????)?????(?_F????6z?n?i%??7?Y??lG??7??;J?0?h?K??|K?w
?????LnL?~h?y?bd?x?????)?G??ylXC0mRQOggS
???:?A?z???,???Y??'??Ba8??4????|?h?A?
??pH?OI4?vU?T
??;_?V?N????*u?X?????n?4?????????'*g???}w???m?{????{??K?[E???V_??O??no?:?????y?|0j??K?b
	
????

?_Qn/?rv?\??;?z?=???N'?fso????3=??(c????0?'?????d????w????s
??)?????'?L?#?o/???8????????

?u?=\~????6
???w?????z??=?r=?????)??.?[?a?dGX
??"?k?+ ???s????8 at C.??F?*&??&"|????K???x????Z}<??*.?@???2?
?/Kj&??O?/???????[
?:?e9N??w?u6???^=?y????????-??ED?n????}??????'???>?y*???u<?;p?
E??N?S???&hO?W???j???#ME?????:?|????>
?J?#[??l??????!?:?-?H"d???S-???5*H\?U@??[??bc???????_h????|g?6??o?!??:np??G??b?t?j9@???k>K,???n??yX?N???FW??%????4=s8?????h???w???????!
??Kf	??5???g?????|k_3O??:e???/??7x????5?h?5?

?|D=]?u?z1@??B??1[?????x?????1?V<~x??8?????@C?"`???~???o `???{????|??[?=nn??cj
??6
[<????/?Z?h????SU-????l/??z??V?|c???????a9?\?!?T-?kU?b???w?t??z#?!dCFA`?,w?5s?F
(???C????????2
qb?;????~????-???l}?N?v?Y7?
??OY??}???q????
???/???_|??K?wg?'so?L&?8????e?H?{??????
g
??<?3?n&???Uc??
?M|2?
8?
?<Qye?U?2%?1ZPb????y??????x????(W?(e??? |???/)?L?}W?????IU?[???;L?<??y?QY??N-G?}?y?LD?0??~E??t???L??n?S?'y?x{?'z??]??????/n?]?4????@+ru???????72U)?s???qV)?6??????Uk<??dM|l????????????f2??#???|????m|*Ra????z^S}?O???B????5P?}M??J
22?
?5???+Nt1[??~V?VLa?@?[F??m??ry?^+?7?87?
_X

???O?????(???a?{????q[[??????!_L?+???t??????)?H?c?Jt!
?il???MmUN??7????nU?v?`????&??z?Y???[????}??RX???i>,/?+e?#??#?#_???+???????@?
4@??????o???????(6OggS
?Em
?k??I?Ah??<?~]??m??{??????Z???
??>p
`:?
*
v???????U??\?????????Z_??M?/
Gs??1?IM???La?b?qd??y??~-=!?I/?????~?<?/F?o????Z?Ye?C??d?????????a?
F???B???c??*v???
?
	????fN9???YS=D?g?%?
?	??=?[???'!??}????^?r?????31S?S?9?zkt??w,????????D?*?8?+*5?1??'{??
?????^???????F<k1??M????????^?|??e?T?????O??k??"??c????oHE?7lX{??w?b^d????N?k????/?!?vc~??O???=Y|c6??T+?\??}?0??k'??d
4????O~???ko/0M??/??
;?H
?
`
?X???Nl???9U??^?
??#?D?|??/=?@?-<e?WeO??wf???#??q??????g?{i????O???U?@"w?+r??T?	?&w?zk?&?V?1?m?y?z???????????=n(???{:?Y?j?,q9'?J6?U????j?6?z[e?`??????s?K?B?9?&?????cy_?_???[43
5_???-C,E?M??????~2??#?????0????uHf??????4dV>;?????,'6??w????s{?
P
l
*??S??i2??tyo???????G?n#?;???bcm36??>	??l?i0Fk??f???:??@f?p?;V#
wX?9	?%?:+?>??`a?k??.!????B??qdg?
@?L???{?R?|?)O4???/?Go~O at y??!9N7XaG@????2??g*???;???Ir\??'?K?#?^kR&??????|?_???9j?tj?F???3G?j?3?VrU????????D???|?3???CF??f??????n????og???????b?6??Z?9?????????J?_????n????????x^????m??1|?e3A???l`H,??kut
W????x?eMiNS??f?+?;o?'y?-34f}?)?N??}Y??Ml???4(w??>?b(X|
??D?J??????(g-?????t??Nn???5????>??Ah?????H*S?O??}w?
q
?
nN?%?X?
k?????????!A????????????1???#??L?
?5'O???!WC

>5?????
???+9??@!"????b??/????Zgw}_H????C#k?C??Kj?????????c??????L???uOb<??J??f<?"}??D?i??

???X?
C?M2??9??o?????,M??<*??????
n???h?X??3%lz9?1A??????X?????A^5<N???
???4O??*Iq???
|?,???/?0
2???????s?9?????}yY?.??r7e]??E?]L?Q?3]`=?HD=~a2???r???
V?i^??? W??~*??=B;?????ak??????Ot?4?$??c??4?4???????R??2 ?~??
]??P???3?;?c^????7???#t??|???>????5d???D?O?>?xg??????%c???n!^;???y?CDL?o?????,ZF?4?????o?:k?4?d???c?????S??r?Ft??~%-?J?}:r???_?8q??)?q
`?<??1?&NL???a??????:?????+???p?????]rd?c?????? P???L???
OkXm??????
????wVb?b?hq????6o?_?0?>?<?k?}d^5???+?^.??'	"A@Y;+??K?1???m]??[
5?^????g????)kS??Z??=6Y4?
?*?
pe?)L??????'2C???0????rwV?'z????N??\??w?%??+??????
1??12*??.???^s????>?p??5?{??}?]?X???????????6?
??????t??vG??v?LK???R???So?(?q??c?L????????
????L
>5<????
??qz?\???t?e?????????|?????????HDL?q?$ i:B*?l??pa????=+Ah????A}
`???????K^G???f??????-l1&??y??????HyG??xl???????????????#?]v??D?????g?W????c%???????????)?^?????~??%?????v?7??X?d??	g????`??
???F?9????<??I???EE?0e?~?	{??????d??a?rl????????nf?Q
>5<????P5<??
?05u??????1???
3??T????~po>???Q??~??lrO.?&?????}??5_?4??????????~?|?)o	???????T?V??eK?f?!e?s?????????%?~?"c?~?!?h~?~6???U=V???Sh?g????]??[???????????T????r???W>?/<>Y-r7??8???R?5????/????T???!xM6?O??k?tg?7?t0?f??[?c??5H?B=*????|?>??o?
??
?5?>5<???Y?????=??4@??
I????!??q?U??tm?+}?"4V?)#?*{?{?p??????????t??r?????k>???V???F?????
??????edc??I$^@
^5<??3???q???T,Q4hX????y?s?y??'\PG??3?$	??
|
?????7??X???s??
???[??T	??e?
??5?
?3?t??
1???3^~??[<Y_???RuP??5????.??????i}?Y?K??f?=O????B?+c?84??
???wgh??Pn
?Rq+????]?\?dr?y(O??[??'???N'???i?4??2??T?~??2???aF???/A!?#??Y2WZ????????!a???\??G,r???????????tp?J>??h7??N??'?? ?vdN"/X>5????A?:H??????9?A
`?/`?g?;??
0??C??+???if???k
??g???c}S?????N???o??IT6??U?^
??0?0?@'?We1
??{???????o??????9wG??/?k??)?-t?^n}"?woS?>;00?w???>?30:?K????m?K??OTQ?.?v,?>???w?S-??n????d|\??_?I??????????(e_??????-??~???o|??c???$??a???r?????O??????FXj|Wg?W??W????%?????d?l?y9?ej?YF???39???&??so?P????2????I?%?Y~?dj?lF?_6??!:??????R???"Ag?
,>?*?N??????j?	8?$?y??W?!?#$	
GF
0???????H???????T1?}/??????6??????=??jl?;????????w????S????????????????1F?Z??$???G? d???I????t^e???=C?????{?u?|bm????*?e????1y]??F??*???2??	??F?z^"?$j-?7?F??O?????{?;?|}????uXw?)??!ds??{uOggS
k?/l~?w"???]K?QUJ??/?@|z??????Kp:mE>?q]?A})0$g?YU?j????B?G?{???[p??L?=??BMf2??????Wwb?????5?8??????I&
^5???Sy?????k??J

??DYE???(????}??m????g?????#??????:{??x??RbJ??Q?H????M6~5|??g?
??x?????l=cZ??&??,?????????
?_t???)????'?????Fl{????tX??
|?????????n6
CN$H??T??V 7?n??Y????FX???m?E???p
???:?)V??VCL}??*d~???:~?k&Aq??^d??r?s?1?Aul??e??lv??n?*w?sv????????x^???[??e??_???>md)?>?]9?]K>???X?????*?}T?;'?N?\w???e???v
@???????!???????^?,??aye????9???V????e?f_z?l?Ee{J???c>,?y?	?(?????Y???!??_
??6???4O?f??p9?5{_??@??????n???bf?"????h?m8??w)'????j??????I????4?
???=?????G?!?)hI/?n??~k?n???i?fV??	&3?|w????3Lu?L[>F?d??????s?-???_?1?v???G???n?y???It??m?+}Y????8j<3?Z2????c?????p?Ly???????%????n2M????u<3?bj?'??x?????????\???0	?9?G?J??g???pD}i=xGd'??5??Ww;???K?W?r7??~i???^}?z
???8??i4???{??? ?wJ#?#?e{5?jOTS??H??i7??G??t;?t?E??2WlR???|????????????>b??C?? e-?????W???2E?0????
~5|??o[
?I?jx????
???f6??3O=$???(??X???-?vP?P?s??? 4?o?_q?M????6????8?Z??}m??$W???dd5)????B?J??????f???niaL?s?Td?f:?8??
g??????a???s
~5|??w$4?>??6
G??[????=????g#?????;??n????????"???cI??z?Eg????b?S\???????6jL??=/Zs//????.?rf??????t(?.??+????9??????{??,?/???&]|(?????-???"???,?^?{'?=S>???????!3[???2????x?7#G???df,A??~??????^??3?
????Gnb??c?P?+???????srjn?M??Z??????~(<U?????d|?????L?e9???*p
?????^??????????L;?b???.P?F??U	??#;^YYFA??bn?I2<??,
_
?????v?}??_b??????Z???G?9?{???:????2=L???G?U??C?~??}?}
??????????7??IG???H.gVv}?C??W?I????)1q??????jC??FL?{t???[????Y?L????Q?????sk?C????,N??%??9?????????>???y?	??????{????B??????????}?3???d??|??????z??k-'
%??????T~5???/??j??`B?~Ww??H,

ieB?	K
}?Na?\???Q?V????z???x??h??U??kK?f?V?????[??TY*?;vg+??!???B-?????/
??????????M}?????{???????W?N???Uu???'O??????~S^???wD??w????}w?L????
??>??td????t??|?<p?}:???j	
???

?????i
???{"k??>}???d???B??g????_3G?f????(???O?????{?l????7???}??????hX?x~????????Y???u?Y??j?7??u?rv????s<??\??A>oo?=*??QF???m?@??S??%?]?S?P9b-P.U??????q ???'_N???o?d?U??????f5??0??????#[5??.f?\

--- NEW FILE dilvie_-_half_baked.ogg ---
OggS
b?9?=?dkM???[MJ)%
Y
*????*????2?,??2?,??2????:)??B??k??????5G)??RJ)???9?? 4d

Y
b?d!gA?:?!c?R???c?AB??R?ABCV


Y	

!? tB))U9?sJI)x?9)??RK?sJ	???Z.?PJ(??[???RJ)????"?PJJ???!?TRj?? ?????R?1!l,!??Z?5!?j)?k?A!\I??Xk
??sj-?Xk???[???
!?B)??RJI)?B!?RJ(%??RJ)?B(??PJ)???RJ!?PJ)??RBJ)?TB!?PJ)???RJ)?PJ)??RJ))??RJ)?PB)??RRJ)??R)??RJ)???RJ)?RB)??JI)??RJ??PJ)???RJ)??R*%?RJ)?
)??sJI5t?A????j????9*)?;!??Z??uLB)?c? t?R?)?:????J???PRJ-?cl??[?1?[+??c?1??Zk-
0x???Pg)?Mk??-?eT',??y}
??I?????LL?X??OO????z?R????????????,?s8??3?4?@?????????

???|?????/
=?URHY??_%??i??
:%???nh?|???FS?Y?K?.?t*?)~*-eu??uv?A??k6gf???L?"?v?Is?tXN?P??-N?+*?????uZ`?4??<e?M3???Ly?F??????j?~;J+????^{??ar?Jo?/?????OEb?8Hm???YEa???S,K?e??4tu?XV??t?Uw??$?D
??q??7???,????????b??????.????	?R|??????2U?A?? ?????=?t?????
??????U?^?uj?????]^o???<????Y??,?*??????????A??/??3k??y0?9?w??1W?|R?2??:???b]??_?k??S?????P
^????"(?
Q??/|???"1????9w?
??w?\\?p?
<??4h??>?????V2??o???R??????O?Vw?u?!o?cJx??e5??ye
4?U??7?
??:|??????f????Z?P??W?mN???F?X???4???+??3A?\???X9??@???(???G^U??t????y9?????B%}V????TSg%????v????????U?????5U???i%???-
????.?NwR??H
F?? N??@?8T???6?????j??<9???a{???????ntr??"? 9??@???\XtO_{`3x?]?Md??&?/X??To??=JY???K???8?LK???$+W4?????(})?????x??G?$??^??I6}H?????P"?l?~I??d??<?Q7???CAjac?~???A] |??)??????f?:+??V?#?r??d?<?~????M4%??1???^?h?qK]]l???Ls60=?[6&?{#?Z~?]n"%??
a@y?B??(?@"???P`.???K?Fp8
?3 ???m(????(N?jq~????<Rr?	????+V}L?Af;????c
????f????r??*P?Z?Nz??z???????7??[?????B(?R?n?}$?G$P???????k"?]N???????Q???=???-G???Wt?X{2z??? *b3??????(?LW?M????f?S?O????M??V%???aR??e3
??????3/m?'?sM?y?"$g:;?g??_?XX?E???NO????#)I???&{W?{??\m?}??$c?J?*?????H/v<?2d???T??d??s{\?~???RVI$
?5*?XQQ? jw?+M?^???Y?????~"vj????????+???X4!?T?86??:????Def???????f??v??????xg*x?	??}?w????m??fg?????_1r??/???????S
?????+????h/:?(?3?dx?7??g?K???2??*?????s?Ldn????????i4W???(c?????[?O????G??????????????;??A?5??*\???E??_??????????8?Y??*????9?Co?EY8??5???U??=??????<?{??????+?R at VQ
????d?
???\
??`?/?Sr?^fYx96?A??O??|???\???SI?D
?
>??
L?I??)???ERM?!?@,	&uZ??g?C??l? ???C?z2???|/>F??}?J?_???#I?????#?w?
?e??2krb	?r???????S?@?I??x6??a0???
?????g????b??????g{?7?=????
?V?_?t??/?;:???_???WR2?pHm #

p???#???\??S??J??*???|T???w?w??
DB??P
?@??????
???&?aeh?u^
O<a>{Pj??@?
h
5
??n??G???S??E\?d"?u?R?O?sP?????
???????~??gY???E??p:g???"F??*??<B&H?
????*eM???o????UP?Vc??A-??????]????
?????2??x??z(?;x??f???????*????3??gr?????Y???V??E~??z????	?_j??W?	I??9\K>V?Ck???eNj7??e???*/???a?oer??	y?1X?E????V???~???j=??7)VOGC??2H?/'?m%?G????;?PQ+??_|?|Y"?R?
>]???
]???
DRAx??9?
??/??????
l?Z?E?r??? <?Rj???Vz????U?B??e?d9???r????jt??x?y??yD,.)?g?z??M?*???g???f???}L?u?V?Y-?n^??W?????~@?-f?x??????mO??@7??P??WnVO??Q??:3??x?FZ??~+??x??????^S??+??8?~foG4?\d??N?1)??)?t?o&3?????????x?epK?

???B?i2E??[???c???t?JU???@3??e?53T
zko??s???H
?R???}{|???=??s}*p)?}??vC?W??z&?g?-g?
H??K==?
?????L???6.{?[?e??BI!?Yr(.?<?a???_???wU?$Ibq
k??(L????NC-`?>????
?;?????)+???	
gH?t??\??/W?9??????s????+??(????_??+
?<"`?)????'O}?????W at K?????uS???y?gH????h????[?d??d&??Z:x???W???s?L%$bj?t??????^??'n,?:y[?s?~??i&Vm??X:??????2?K?Z?????lT\?????jf at 5??z?e???8???Ri9H?Lo@? ?lf7??>{??G~??O?\$???????8????e=?|Q~?????z?}???????q???g???F???W??}??@?2?"6???w?8{?z??.B?OggS
?????~}S?q9????I?????3d?????#<3u???Z at 8?,??
?
????&&}B,2?w
Ff}??

??9?j?*=3??w
???M?????}??q???G??[?=????t??@???V?
?\J?????<?????g5??u?b??VS??_*???=??M?V?[??[?
????????????.?J??*~,?o??7???M????????
?
?pg?J]?.mc=?"?4c???GV?D?n???^hj?N??c5?/???t???S??x~??)?
l?Q?qo??z>S"??m?M??NB~?x????????;>L?;??-?U??!??;M?f?f??3x%>??eD?v???g????-?????eL???o? ??MH???????
??2?YP?R???
q(??,$H
?S??????I???n(?.[?8p?q0_?????O?X1?
y?B????J?K6G?
?_9??u??????82??%Q_?;???o???o???c?F?B|]???_??z
??i???K??*?|;,??w)"U?,?'+w6?P	????hd???W?
???<Gy?$	??R2E?*C?K??D	AZBJd	AI?4,0?
,`?
t] .+?Px*?~+?]?`I?>???R??9??ZiWiC?Lu???X7
?a???&??4???<C??????#~?#_{???
]????@3=w?oz~????????x0]?~S??????hk?~#-2*S?R?r????,?|&??????B???$??????]???r>4??'??,????'F?????wCX??
2?K
<E????t???/??R??>K??Z?;??n>\?jt????8?_?J???e??xx???????~?K??8?)?=L}wp9?wy?j???]???$??Go???-??T??O?

???@??D?TW????DH
p???`???{??
??;/?%'dGWG??x???????z? Ow??@{?????????h??l???u??"????S??CE%??R	??????,v??zd????2??Z?????a?Wo???|.N?,??K?M<y?W6^?????????????q????-ZM??|???
?L?wvx2????y?3?-S&??u<YJ?-OJm:??!?M?g??/?x:?x\O??3????d<?-??`b?=y~?.????8????Z?????M?Fw_?t???e??????I??\???Y?R??????0?9?????*?TK=	uz????>]T?s=??'
???????mT??_???:????N???r??2????"O?-???e[4???8k^|
????????????D??-???3OggS
Z???i$???BeL??o?%	d?fL?s???????O!?gm????^/m???Z5?E?
????Y??O???,Y?}\??1?3=,?W?W?|?#=
???z?
!?^y?x?S?~x??????q?K|???r???A?l??~?:?V??9?+???~?T?jU?o????h?YKb5??&]f???????????????/YN#?"?????x????U)?Be?O
f???1?????.?L??z=L??????FG-gI?D" 
T???K?x??????2???????D)?T@??'???w2?\O?ZE?bU;S?V9/mK?q?
;???I???'?F?"?j?????z??}{?8M??	??w}?o?j???Fa4Z_?N8w?9????3??t?	?x?-{~S?vuM???A(???7?m???]f*D????]j?>??y?????o
??]??$??!)?[?}?????A?????^&?`C?x?nIFU?E???y??g?^Hf?k?/Q?&?7u?[?8??dD^????c?Y6n??
??k??b,C??O????V?T?
??=<???$9?R??vlG???W
o?G ~[????2????????T?"
???Hm.?v>??X???T?????>?g???^??Z??d????;Z?4?g??y?Hq6q
pk???B?R^R$S???,]T?[??$S????X????C
?Ux?w???j??fi???Vx
?|?|F???4?1????y?????s???.???????Y???rq??L???<+]???c??a4{~$
??~W*Wh?dz?wJ~???ODs?[KH???*?
E[?4u]U=?/kE?-S?
?A?h?B??	qA??e???5?o?<n???~????????e$?? ?????X|??Uy???(Q<HaI?4??C4???I^:?x???J[??8??SV?~??<ksz?&?????Z?/??^?????:?x????"?D
????(???"Q???q-+????;???7??????/
??E?DRy??????X?Xg?1?.n?Z?u[v??V????9????,??e??:???R???n6
??9??2?
??Jo?(T?2^a?q??????????^???R??????????==????T?TB??^?O{>88?Q?+p???6??V???X'`_???FB
??R??D& @F,?$?TV>P?????m?~??3???e?~k??09z?????yK??q<}?"
	????49W?
?s.??????D
??Kkp#Sa???0
???]??Y??`?[A?M?!?????9??????p?J????[?^?????S??f%2????9?????7Awj?U?v??F?#c?'mw`Kr??=??[Q?????????%!?m??u2f?5=?j?G?????????AI?{?]?!Y???+???????'??nT?'?| [????i3v???{zs?c^?{??"??!? I\
q?Ca?l
y???*c??????g??)h!??W??J'??c??????gO?V??[??????r*m!R?????.?9]]?>?z
HY?????f?????w??3?$??"?*o?h?}???????????mp?????????????@?/?+???O-"???_N3*???-??aY???P??:?w&?????o?~8}<??"?P?+?oo?y[Vu??;????&??<??0?R???=1?????????OE?+?-??UUNX?St?`ZP???G?d?
)?d?y]V

B?'??fg???$???cJD?}??7Y????????????\??????UoX???	?q?????{_??`?m?n??0?L??>???G???cC?r???wnm?????????SO????ju
t????AnT???Vs??6???????
??
?s?,O??????>??????4k?Aq??????v?b???o?>?nL-y????3m??w\??I?'???>?''G.??x?a?I?T
?Kw?Jz
?SW?|Ut???w????O?f?????????:?zC??Stk?
|???e???#?~??????????>???4A?h??6/????%+!_???'_???w?:?$~?-?%??D????T???9g
?J?w?(B<8u)???u??????JK?5??D	?%???G?????q?w>3o??????????xYu?O!??%??p
8???yg??}???J????2???.?s7????j??r???$???V?'???t??$?	?J
;??Y??K????yXQ????????r??-{,m/?c???],?w??,???vg??vq?n?y)?k?????)??,??7?[m'?[?e?$?-?}?/.?j??X$?{?jvL?
n??L?'?????XR???4$?????TX
??K?J??$a


?+?z+????M??/???????????q\?pbV??r??txZ?O???????1o??|?"????x?L^??$??<???o?????Z???9|?^?$???)?????????>i?Q2??m??????NVY?c???? ??I#h]???+??iI,?<R????CK????????[f? ??Q??<?z?v??&??	+y???~z??X;??~?????d?([?L?M?az???BR	L?????{?t:r~:?9~?|???????V?-
u??
??????????????????[?&;F?=!???5????c?i??$.a?D
?????&?%?l4d??d??^ 9??
WS?9~y?x???w??u=??????
c??h??)?-EU?q??4?ROqE?',?k?/V??Cc???`M"?|???2??-?8???(??(?,???\??]'I?H$
?k?L?w?>s???????????????)?%?ot|??5#????????????)?w??=2U7???????\??Ycn????-6?C[????,G???=?)???(B?i????"Tj??5??(?&??6]y!???????:?X?Q?b??Ez???/*???@dG???e??T?f?6V??{??49??\?#????N6o?SOggS
??f?z\.?:????\??}????,?U???b?p{????T?ka?Q???9'?q:v
d2???n??U?J?_???P?j??5Q??Z?I??L?Q???h?^,$[c?????O??W4????}?g?????oy???????zm?
LV?*/??r?
,>?^.?/!??*??^???~???.)?Rk? ??F?%?$?
??r?KNSs\_=??a???3J????M???????E)ZN????9??/?|?sg_E????sDV
???5?w?h????????Y??Vz]????^f?F?q????c{???|?XO?XO??/u{VP???W?WfV?????b???zg??????$U*?????2????=?.?S^G?2$?m|?YlN?bQ?????O~X?'v????????S???iw?3????
F??|z?4??l?b??y?sE??"&?Q}&??,?|?%?Es???V??::5?????|?k?s?????T??S`?q??8b?Ax???=?V?K?c"?O?
?r????K
;`????o?4???/???>??*??WQ
V??Y?(,D?@c?_?T`Q?/?pD?)??0?I?&EV/????9?sww??K\d&
TP
??r3?4t??k5]?[??????
A???R??o?*N??Z?K??2?[???????^????]???????s??Et>??`??q???????O????Y$z@-???z????w??9?
???a?).Ah(OO?S?:LY??}d}T>?45G????:v/???8=o???Z??n?_?uS(??C?i?????@6?tx?y???GI?C~??????????$M? e?8
?????5?{???GY??w??E???yf??#+????/e??v ?z??J????C??(?b???b(?B?^2#3?????d??L$
F7T}Jl??z2?(????|?3????k<???R%S????8???3?c)N}i
]????,?X*
	~8???2?????&?
9?(
2hjEGvt?^?v?8g????!H?????Py$???j=RC???rW?????????;M{zH;??e??<??f????????????????????7)?M?-??O?Ux?d??
???\J??{???????z?????????'????)6t?kO??????6[k??bqv???f?L?J???Q9???t??E???`H?2?
?????0*7D
?h}%??\??2?E?	/K?U??????????<G5???7????o?~?????slhoo5?.??N?u??m?M???Y?A??3?????uO?:?~??R??#?%?????P[?~??sz???????????B?G?N?/&h?6???r????-eM???????(	?s$?X?R???H???8?'?n??W?G??dd???w?Z?w?{??^?L???y0??H???A+??f??|?M99,?????L^+_?$?P?,???<??S]???6??B?w?*???qxu????u:??	????????{gffv?????\???L
?-U>??bb?I/PY
??tq??#*!Z
FN?#?X?0u**?vE8??A?????0E???0%?L???J?8+s??;+?\3?A?Z?@tD?H??lc?m
?0b??b??,Z???F#???L ???Q8V?Tz????K_?|C?A??6??(???????_???????Q?,
?n??:???????N???u4(S??7?'?7???zsQe???r?F?g?
?????x????*a?<??????PR(???E???D????C_Y?a?+??,?E?7nK?pz?q?i??8??6G,?A???<?_?-?`)??dn???0??7q????v?>]??m?+??????????df&
??^?????\/w??}?????????9???8?E?????Z(??l56???Jdf(S?2???v)?uD
?6Z????Z+????^???0"A?Z????w?~]?}:{?_?????[??G????????w?D|.Q??-?whm,??m{	q?8
??
?X???j'????I?)???x?%?G??_?{?????????L?r8?9_?K[ncO?@?>?E????????z??=???9?;?????q????~n]?RG_w?i???	H?*?;??b?}(?q???A?lD<??{6?&;B??Zk?}P?J?1??2???2[;???o?G?T???J??z2????}???e?o??)fY_??~

?2'?b?8?*
=O???;^?{??(|??*M??R.6?"?Th%?Y??
Eu&????X??????di? ??H{?$+?k\I
*?L?A???q@?1??[T"?Zq ,??b?*?E?? TP?P???????"???&QYU?N??k?i?(??Q)R???@iP?Z?8?V5n??:???F?I9??"*XF??R2????f???)?Z?t ??e??\a@?.z?>?T?E??V"??6H??c?B?lRM??V???c?????]?Y5???-?G??.f??{>Y???zJ?K?$O????,%O?]?V]H)?????SIL??????????M??@????7????V?\??[?b????plZ????9uY??rY?N
0??rl?m% CK???e|???
??E?????B?W????"?diH?????$?*??I
?L?TI0?
?#Y??????*P????=qO??
[%C?`0??F<?F?,??P??d???\
M??e?M???}l?X?F??
P?Lr??7L
?[???,?_c?
?r=D]?k???O9??-p}hS?2??&h?I?wL?^?df?OggS
@[?4??????D?}?0`@g?k8????????2
???????#?V?U?I??eN6????[?I?*-???????^xf????R?
H?????~?G??c??o2?3???Yd?[2>????Jd????n?6?@(?????H??xS'5joz?(?O??R
???l?d?1?S???8??%???
??d?6???x?6^6n7?)bA?HT?7
L??YMR9??H?>??^??=|<??#?S??Hp??j?Y?oK??1??;?B??,?O???t,?R???t??h;?+[4??cx???u/??????~???w?k??<?????D??????o??n???e??I_? (3?uG;??>nnz&
???I;?K??.???3??D??????|???S?lqi?!/C?-????
?s?,L^/??~gb=??d?????EJ???]??????r?\%??
?j]???D??Y????"H??M?O?J?:??%?"I??k??+W?p,1	
8j<q???,@@x?sI
XU-??R???I??_A??????U8&|??6pj?FE9???!FwnWI2V\Re&?
????(R?Z?h_??0???QX?N'??u??jD???E
W??zm5t?????P??????3????U????:?H;??+.i?S?dN^I?C?1*swl5U???>?.G??}???-y??\??=?G?d,??VG'?g??z8??D??a??U9???[?K	#o#/????????_v??Xvw?*??6??0?l?1^h???~????'??P??Z??qep???)?N???.;;e\??????m?^t?R?[4???????s)\?L
-?z0?4=5??>LRz&?O?9?5??-]???X?>L?Y7?oVR?????N???
w?????o??6"? ??z??????t???(???1???Z?B?~?WU??}H?H???

k?j??EI(??4?i???_e??i???2????>??2-?g?2?c???H???J??9?"
?#??s??	?Z?
?Yi???Z?y??"v'%?{4??j?uF??m?6????L4??I???j
??,A???%^!?S?F?
?D ??1N??FS
e

??????1??\P????????V?!?.??}??=?0??_?_b????
 ??????BP?????\`.??Z??p
????t?5*	b?{?mw%?z_??ws}j>S?*<????
|R??\????f5????>??p(???H<@??rVW%???R??2???t??*???(%?P8}v?Z??G?? ?.??wI????l$?S????j?6??=o?b??s6{??c
U???TD-PW????q,YKiQ?C?g?I??%?????(?G`{t???(y??s\??I??P?&?$?
e??\>??^?+?z????????bDH?vJ?qj?????|x;???l7???&eI3???
??5???????C>?????O?u?Q?sh?+}?$D????k?b????[????]/???l?C
?":.???????{M???zMyCA+??HX?7nu???NqH?7n-`??ESYqHA3??P???N.??.???+W????tF??\?G??p??????|?????L/B??H???K???????????7s8?]F????^??Y????<k???&x??q?!~???f?????Yq??[P+?Z?G/??]G]vf?/??{??2??Y????4
??:?)????4?QL?m/??5?7?s?D?>??3???U??????*z??f???%u??*?v_~\k????????S?a?????[A?`v1???)????2(???|[?5D?]Wd???e????	?.F???????lJ?_??gi??B?????28?;?<?D4??t#???/?(?f???*?????h??:?????k6{?|????t?r????^Zn???+?fTN?A?b???C?y5z??|?C,??L?P?N?
z?z??wl<	??YVk*??(4-?B???*P??b??[?hUhw?|-?jn3????;???YTV?w???????9]??_7?/5??I'F?6??
???n?*?K???a?r}$??Ir?ML???W??"!]]?w?????6T?-?U??????ZD?mU;O???_;??0??*7F???
?b at B????N??@y??Z??2%=.rB??2d????p?I?9

s?g???-????*??^|??Sk?????y?????q??B]?8iw??&w:???(e?u3????????Q????+K(??x??=r1????L???F???u?_?\Y????@[u??kH'?e~8?]?#n???????2V?ZucT?{??n????+??/?n?????g6?zs?!i???K??(?H???s??4???N???X?
>?V)b???u?2??]?T?
?HBB

&9??a??B?!:?ZPx;
rJ?r^???$oF?:?,?&?,N?h???[?e??v&???R???????V???8?Q`?dJ~?F??a?<?????CS????_zo[?1?m?b ???????O??.??Tz4???vh?(2??????7????k???????/?????????HJ5???X????2)?4?)??Y?????6??	u
E?U?
??\???7
SCLc?
???!=*????J??*?r2???
?.
????k
??P??!??I7?? `???????W??'????z???????J
?Z?9??????n?b?zd?K?g?????????%??M????$
x??z?:??9??Z?W{????b9?g????x>?C???*??5??	??L?{?{\w??????.????????;?+7?E?L????{N9=I???"???I|??/?t??`??_?d?
???,>R???|x-k??l??7{2??;?5;??:1???w?ZD????:4??_??M???4G2??_x?:rj?????&?_?	+????#???9KmV??,
J*???ii??Pm?rlp^}^?V????
/??I?"{???c??Nf58????O-&????	t??Uog9^?J?_?q??????????aw[????Yo??5????C:??M???)E|??O~??6???M?e?u??@???C?C????VA??9U~??9Y?3????????Sb???sj???<}??g????W
D???f??Y
?C????|?[??@?+?Y?R? ?ir???[>?q]???F????~L?T??zWI?r?W[?J!?v??v?6??y~[?b?l?s??yc>?9H5T
S??????V!?r??N????X?,???>V?}????????	??<???Z0?
?J??G$o+?Z_?/??????r.?]t+??I	
=?">????|???Xx?#?9C7?DR]?d	g?????J??>?k??8su???ob??????tY??ml?Bh3P??G??????r?????;?Q=t???'?f????R?1???"???0BC?????7?{??_?"j???^????O???d!??od??!?f???~?RT????3?Y.a?:???^??n??Lv??V?"T????T?6?|?=?I?
.?o??t?>??Q3k
V?Q?wo?*?S{%???q????]???[L
??|??9??? K\^jM??A?F{???(w"Dz???????A??[????#????i_?????n?Ub???/???????W?w??>???-?z?'?R~ kqX?`???Q&?
??/u*??kM???t??h???)??H?j???94r?g?^??????????{?'8?? ?G?Agt???
?L???$???WX?[??;Mv?/G?<"?|????|??(??K9?/t:8?n?????C?l??h????MT??z?g??0[??????5^?-g?Us?O?U??o?d???SI}`D[K?V??|?????????????o?-(???z????o??{\/?
RU??????????P???/????Y???|???+?i???>5Jb?-&??iU?C?E?????? 0??N?L?*L?????+/?`?????/???5-,????]?????+~?:????\?Z???r?n???????(????IO????I?_?????Wf??H7??????>/Z*????o??r???<1:?Wn??Oi???m??++?N2
?~??}?$?Wn??0????|?)?(??=?%?F(?/?zr?'^?%??????tY?Y?N?M?
?2?w???R?</??F??
?V????X?^?c????o?U?edM7?,H?
??y6
?Z???-#?Z??oK?.?&?"t:???????4T??x?	????g??.Q??C.k??n?$q:I?hf"

??+??L =&%?.B4?u???T??E?]WpW?H?HI?z
??
?$

L`j7?	?
?ok??R*?L}?u?U????A?? ?#??7??????L?????-?r<??K??[??LT?
?7DX+??q?????23
??????????_?c?*?????yB???T? ???^G??????K?=??????k??R?<?|?F??7B??N<???????n????S?
?5??x????????E?i!(???r???zU??u?/|?d??y?97?>??{??S?7?V??$??.1cm???
??w?o?o???????jr?~???.?<???C?+^?????Yh??=???e??~
|
?6?#?Y?]?????Cw????e?D5p???^??|n??i?+n3Oak???lo?7C?????p???;>??=????D^YMw?df(?????<L????}??_?G???i???2[?????5?
Ar??`)?(????@??4
?t??]M`??D
?x??????R??a
nm=??S????C?f??J?<????
C????2>)=?]?B%??]????k??_???|<???????N?R7?H?#~?p???D???Bv+V????W6???qQv?C-?i???h?+s?BT??? .'?:?N]#???uh7b+????Q%??1?=
R?u?V????Z??<"???}>?;??????>^??|!???s ?`??:???
|:????	????yv?4U???UZZ? ????
/?wd??x'kE?}????.D??!X?5~??7?????#So?Zt?O?%X??
???!k~?=z=oE/??b?????
'UAJ?ZM)?0????sK???vO9?eG{[m?'?Q?:?UR:??J??>????-z???????#?Z?hY?????h}W](V?7i?????_??K?s?]??????/??h???
?????q??g{g?m?Wf/Xu?Q&??_??;?VBg}?Go?A?U?r??EZ?????????Z?;$?;??s4V?{?@6?r
??d^????5@??*?
?3???
??N01?eV?h[???Sd*E??g???6E>?'eA???p?=?[??L?0??b??D??y??yz?fO?????W????!

l?H?}?y?Z1????????(?>???=??z??t?%	1f
???$Qv6??{???U??Y?/?{?[@?/??#22???????QX??(??~rZV????W???????N??X??<?]??f??X?:?Z???????{???|?J??????6[???bN???????NI?H?W???
???$????p.s????CT???r??o???^z???Y1[??Y?~??f4???xz?7
???+p???/????S?M?R?iE]??????G"??D?????????@5???Q??{??D??'?????>?53$.?/?K??G2?oK?'?{W
$?`????Q??>???Vp:??pl?Z_-?+??????bB??U4???;??0?#????N2?????Z?_S??????,?S???~9???cI"t?`???c?????xWD_??-C"/#????2K?
?q????t?SZ?O??]?j??????f?W?9??
?D>@^"i$
???x1j???????~??????:?l???5_?h??????y??j?J
?N?_??????i??%?M????[uZ)3??R
???%+????? ??Q?????{?????t????K?OxnW?L?;??8F?D?
?T'???6????]H\V??~\?~q?g??q?e????{p!??@s???tq@
?	???c3X>???dc??=?u?8?VP?w[?i{e?#???e??k{q???^??]?H??#<2?G/s???Ce??<?'%g}?? 3?$N?$?Ht???\,5?????dY?+o"??A??`?j??Q????k?/=4??????f~??c/??\????#
?^??S???S?b???????>?F?Tx"
"??V!S?t?4]]??J?i
?mMm?"?{?x?x?n?h??'/2\B??i??c?j_'????X?2?$?}????Y?(?x`r??7???gk?U????u???w?????q??O????y??????Ndr???QcE??V?G????Y5??????K?/?HA??H??0l?
+?#?@1??<?????=N??(?#?h????v=?j[[??
??oz!???<???h??s?f%
dB??~oro??T????s???3Jm?+
#???H?|??	S?W?:?o?????U??h9'y13??[????U???kB~r?????W/!?i?8?|x?a?O??f?w?D??/???????gL7?aV?????????j?|?.??O?'??zo?~?JF????y??"z;Ir3z?Xv?_?)q????;?W??;?????? ???q???????????=>?;;?n?\??xK?'??????_O*o?Y?p??'y.??,U'R,l@?,??.mxZ?^?}?(???R(<0\?Y	t<5?M???4?IRhW?/
o"??????W?Q?ys?O?,??????????;?2mF?Z??lV{?
T?X???y?]M{?)Q???<y?gFEZ?K??????+v??s,_?y???+?"??????	\?1?j?}9?s/?????
?&?????Yw????
???????S?I?B???_6??S???&VQoO?f?'???>2z??y}T??o?"??X2?	??????X?hT>W?@:?U?????z???=?4{j``w?x??i?<????(???W???`X????L?????U?????_???????MI	?>??U!tRC=?2?z??K.~?}t0c1???
?P
??L=f?>?b	?????'????P?=??=????1	
?y
?$u??$q?\??c
b?r-2H?t??%??l?l??M%?b????F
`????????????6Z??E???????
z;yQ????K?????????m??0A??i*?????Q?\g{????U??zD%K5?????ik?FD?[??&?\??r?-????Nqp???>.Z75??jF??w.?JQ?79?@~??%}UC?*?h}?"O???j????7k?T?
?4?^????A???p???Y???qJ???g^??/~p??L,??P,%????\x????m;???(
??B_?;?>C2??w?=????|(|?P?
'B?8Q(J???Xv??{n?U?
K
P??n????????e?^?rv????r?yw???r???L?d1a??5?97V????????U????#	?wIp?+c?
???)???k??k_|>????6?:vc??`?yw7z'|???????3?????)??$!????Y??r^?b^+????n????????j[u??m:c?A?n???;I??????{vR?8?[Y?h??9?6??_??>?g{???i;y}I?^?r?????TH??em
[...31150 lines suppressed...]

???5?w?h???_qF?+?????
O?{9W??x?:??C????A?\w$a?g????UY]?gfu?o?k?p?>3???;?k???????C?=???2????????H???6Z?+???????U???2?????, *z?*,S\?<-??????_?^?}?
G1!LaR?I??K?$'wN???]?????D

?n6+?FiS????k??~n?d???Q6AaN?r~@?4??U&?"##?3A?j?R??u?:?)??u??;^r?Y?i~?~m1?VN???C_??m ??u"?t>??`??j????N??<???Y$???
?5X??E??X?&?PTBC???.?Fx6????_??{-#qmO?????????m???>%O9??????D=>?nb?B???k????^??'?"&Bm??d??G.lrP?)?????????.???p??<5?8#?EJs????~?VB??x?`y???G)>!=?X?k??`?t?`"?L????W}4`u:z???7T??=OH;?u??:????
+?%??2?}???[`;?j}?????m??,'"(F?b"?<?]wE&??E?
?	I?$$m*!	?6$!??3#"????~O$F????X/??|/??
??_s?;?1/_?V????j????R???3??b)n???n???S???_"_uI??NGdeb??4???b?Rn?J????o??Q?6??ju?F??R???g????E???pV?VvW?CooVV,?NP?Z?a
=??X???(??Z|?lS???????CE????dL?q?{s?7$?}??????z?Xy?q???????x??Z?F?}??"&?t?????	???y??N?D???{.?4???w)?jx?? @#.?W?Mc??????dS??Cy?Q???v?^`
K]???v???8??^?????)	*??C???#'????(??^?+w??S??$?RI?
;??<Y?x??????k????4??w??;RD?:)!??kMk??H??<?d?*)/1yON??_??!?=?WZ9_?{???????E?,
gZ?n??
x???:???????%?M??<?A{??B!%?m?S$?>'gGo?<??zk???????^3]?$????Yml?$ ^F?-^?V?+???
8(?b-?6?X,
??+???*qI?$

?	V?[?6x?\*???.1??Ru^??Z?????????'9??#??%??2????k0Cu??r????S&???-?x*?c?,=?????????.??'U???X???%?\?q??????}?????g?f??e???x"UW?u?#??V???%t,N?2?m?E?<?d????h??p???/??_?_???$#`?Z?????`z??j6
f????;j?o?{????G???C;->J??<?M,+?6?V????\??)?{Z???????+??|??W?v?k????
?>;??e????6????J?N???t:?B??t:?V1??p8???$$!	IHB???$$?j;??>??}?C????cm?????Z???6?/???:%*nc?E{???
??lo???e?z?2????/i4?N?L??kN???t8N?4???8?? ?"??n??????p:????p:???CY??
]0??	?H??:??dc?/0b??0c??*bj?W/p???m55*GWbI?w????n?#H??
VE????T???0xHHC?G??C??T???DC)?6b??B?3?@K?vd'??wU?TG\>?Z??H?#??$cJ?^??6#cI#?Z?bg??1s 7??_???.??????M???&?z???W?q???}\I?
????235??Q?9kP???`
??=?/e?
??*bu
?[g?$\q???SB?q ??D???X?s?GG" ???L\???F?????<?[M?i?U?	J????D?+a:?D?????bo-P??AU?93??[?w^??1????t??Mw?IPtd7????h???
?????
?????~?,
.1???????7?m,nu?}??i?:??6{?
xF
(F???G=???N
????H?%S??b?@*?:????V:?y???*%??-?W?
R+C? C?S_??h6????^?V	?t???? @??"?qA? ??LG(1?y?p:/TD?ZE
WB???U???y??8F@?s
?*??
/?Uv,4?s5s>?.|0<??????3hI?6?f??3???-??1v???t????b,?????tf??"{???dM???????"??S&?)??.@????W???????>?n??0"nUWmG)2?`????cW?8b?$	
m?????(?BmX??D???
????r]
???4{???t?`JWZ3??y????j?b<????t%?????={???Gu?3?T?
?Mv??.??q)?b???
R)N?(??Dv???<CL?
?B5?Ej???VNE?x???Cu?TE!B5??ne???0????z??=?O-nQ0??1??????d????XOggS
?@??>I?u?J?KEf	
c?$??:4c???
ufAB?
E?gq=U?
?(p??
??U???[?T)??g??
p?v????8??????o7?
??%??1$a:???%???k????6;??/=mF??_,%??>@?(?9`V?Rg3???n??bhP1???	?	????V+?.?????T????*????UT]???8N?m?%??/_????d?\??K?????.??	?1`??????^*?????#?Hq?E???Hcfk?@%$????;
eEQ\??????Z????X?o,o???6??Z7?cJ?R'*
??{`??h?%??_?O?$????????9???]8???a
?z??Nc?VutLk?m??????wjT?S?
???[E???-?r?[?(*??BY?F???<?$3???L]I????I
?
T
)I?I?esI?<
?????%.q??I
g?W???D???2#J?BX??n?:?
'??* ?Q?????????
?Y?i}?x?B?#???tZ??)?????bu???+???fh???????SXoj??? ??G?._?3??Z<?????[?!h-??E|??h?
???\?v0?w?o???TP~(;?+OY]D???QR"?\]?????-,f?
T?? H?VDT	?????&?`1hxFQ?
5Q
????C?StC*?`????x???u??ue??"??D??1t???C?N??A??i
?(nq?.\???}??7
E?]?]?=Q??!J?`zBl??e@?
GQ?????2"?Eu?-?U?(??HS??1f?.??RI81?D
????
???E?????s??uL3 ??$?l?cp??smku?SS???r????c??J??@???
V?y?v?
?pS????'?i?h?????8????!L?
]?b?!D??zF?im|%?M??Z
?M?A??C???????a?/?84]pA@??q??m|??)??`B? C?P?U??EP
??C?|)A>?E???tC"?????S???"??}?];W?Jw?	?c?
j
]??G0?.?????
???u??[
???|??Q>??l??IM??gq??????Q
?????i?VR&?#??P<???
]???X?H????!v;?K???@\^
?
BA????S???R%A?H\?p?p4>?&6?|?tU lPt?$??E??3
??CT?0Mv^0?r?7?
?8?T.????|???_? ?7?kN^??e|rRI???A6?A"???3^?w????QO???9??J?th?f;?bw F????8)?
?r??s?????r????/?7??J??????t
??g|?R??XH??N)?1???KDg?Q?L??Zt?y?????e/V???J*??c???\?K$dF?^?#???J????A????K?!?	q???<??8?6
?^?n?El?????,Q?l?=[?K??????3????e=_?g??'
?1a~i??WV;#???^???L?q?????z?q6??2Et% ????/?5
?????y?A?IX?7??Q,m???G?\??fFD?
)
??Bv#!???g???d>?G??l??:?x??p?c?*e?%)??T???
???l?9<??z??{9?]Q?Ed at h?E,??*???p??AEM?8???|?me??FS?:{{{?3??Z?//?????'6????X?`?[???X
??h??x_??+??????L???-??*??>)???????)8-?y?????????'?B????,Z??????e#??q?????G?e???"q??*2Tn?Y?9?H6?*k??"g?5?????;W?tW?jT????#????????&?.Y
?t)
S???.?RfnbK?D??N?T?6??GW?z????<)P1?T"
?^*??????A???r???e???.??????p???2??????\?k?????????????V??[n????l
??o????C???h??Z
^???71?N?uId?"?h?eJ??"'?	!C????(.qI8?+	
+:DU???l\&?l.?!??(`j=2f?%R??14T?????????8??(M?`????!FEU?U?R??D??9??U???P?ULeNoZwj???3?s????~?DA)?;?? P?~4?U??????=?|?
????{^???^??:y?w???X3?W???1J-l?l??ZVm????????,~;e???Y~+??.??[?*???j????4*?V]???F?z??
???????????L?&???0Z?S??????2N
?????????????Vi&?C??!??3$??`m%r??>l>vM?????????r%?W?
??q
?OD??"d&U3??b?b*1?Yd]??('J?|Wq??s!&??M
PJ5h at 41a
?m?|?t<????Wxj?C?4W?Y????Q??!>?&eac}??i5D?Y
K??%?Zq?R?+W(?,?
?)IV??S?]???C|W~A???I?^??.?n[?u?H??,???/?:"N
?j??^?qk??N??/?I??c^c"?M????"q]?t]pV?2?
k\?????1Zw?q??<c,G"2?)??eS?8?'?h??????
?j???qv???????Y???S?%???5.
?a??+B?D????:+?"????r?W*g
QF??q?YS??h??L???t!?b??o|??W???V?v{a??
Z?o+ at _


%???-??ck?P??>?
?N?5&??k?h?'?
??'??qn?`o?m?AW??!&
??q}?]???????m#?fE??H?^?>S1??????8+? ????SD?.?p
C8??Ag?????u^??+]4m29???
/Edh?????{s<????1L?? ???n??(?[)C?P?t??wZ?$??????EPhg!?w???$?TE????
?1?`?n?i-TFU?J!T??b;D?yF?`m?????K?a?G4i???v??v?????.??????T?0?t?D???????o?n?Z)?4?G??oo??I?3?.?L???,??1??D????;?????$??????????
gL??b,:??2
?8|????F????Z?S?????4q5???hq???~
%Z;????&???r;?|?	????YQ
$P???????????$???]\%a3I?
2??<??,?:?z????W?,)?XQ?J??;??"??8?T?b
?k??R-????????????]kz??Q??-?c<qkH?{???A?7????Qs??@kO???U;?h'???e??????-A?
"?]9R$y??G??~?J??/???P?>????>U
Z}:?i?Qlz?????e?)?x??$?=CL???A??e?`??3??V??9??w?2<?f~CdP??P#
??QP?HN?????%SCGIN2?2?
O?'B?2?v#t?x?(???ss*?G??=?"=7P??????????`(\?>[}O?'???V???=??
?7FB????f?CJ??;?."K?$

??g?o??
u??VO[???Z??kkU5??_???5L?O?f?X?U???k????j??J?A?????PV"?5?B????t???Z?p???T$????;^???H?o?+J8?AJ?)??B?]???SF}5???????R???BF??4?!5qi
P?"?sKhtD?+????k:??????EhI??[??G$??)??W??z??????????t?%?L!2?`
????|???`?V????????x??[d?pE8f
%bP!*.?tuU??NQ	M3?"hX?Z?"t?)?????W*?T%k?u????+?	m???k?????Y??2B???dQ?Q?;?W????{r|???B???X??/B8D?????y?<?~l]?T???L??%??iU[O???_??N?:s8?s???p??k?9?3u&?e???? ???w??????t4?x;??T???0O?,5?????}fz????=M?P?|R!?K?L??????$l@?.??*??-C?^????????X?_?????7?E?Jy?:l?\??????%?&	
Zz????o??X/?wi????W?(??T???^?????2?<?GE??f?5?DE?F??7?(????dO??????????H??/Xh???????n???O3??)-?;.?S?g?12m?2?????/Rc????=??;?k^???<??{??#??h???em??????H
"???8?2???O}?X??????f?E?X??;???^Q?l?)??\??s??(???????<?????!?Z dJ?/
A???J?=
?;?@a^z?FYd??*?Q????????7%?W??;4\iI??????g??W???m#?????{?-S&<>?
d??f7
M?`M??????tde?R???&+??S}wG??U8l?44v??pZ?H!mlr??@??/?*??z?6?8??X#A'

H^*#o?%Kg;
?W&kO??k??FCnS at +???Aq?Z???H??
C
?7
?F???X#N[??n
?f??T-#I?1?W3??Z???Z??Q?p???:??0^?E??????{??<??""????x?D???5?SWT[?P?OggS
?<??q(c?<??T??,??It?8E?u???S?mE?V?n?a?jZ
X0Vp??t???"8??BH???K??Q?FeC???R
?C?"?-???85Tu?5???????? b(??@?2E@?1???I??`??R?I??Xzk??f?%?O?~????)??i?M???{z?P?p%??u?[??????G1ON?~?
Sb??k at B??????&?w???n?????????????wc?????T?Cn???>U?g>?$)?s?A[V@???G
`?>V?
?@?D
Zs??

J?D)?I????????*BA?EBu\??????-m?5V??
C??[??8Dq?R?E(????J?B?f[?D??6???H;? ")?Kg{{Wt??6?U???F:iUq????TA???#J6??J?M???^????????
??O???6?v]?/?	?FDyLd?4??(Z:G??&???? #??i?HMqC?
??????????Fq??m???Q????????(???<Mw?z?n?o?
?C?????o??????????6	`@??5T
???????fz??A?m??P"2?? &??a?j????b??D
?4??Y??"-????KJ1?q8U?0??????3_????i?0&??(?[d
J
<????2H+-5'?@??4?P????|???]?.w?a??????~?&T???????c?!&?r??b??}h%u
?h?+j??J???-???(?8?"dzZ?o??
?2
????_Q?j?{??O????:4R??! ?r:jF??;????
?vkK
?M?Pp(???[?H?F???L??@????|OU?o???Bm;?iR???Z"????v_`??C?4*??(?HR??.??vz?1?641?^$q??v|??,%ZO?]???k??$Q?m7+?x??
m2z)??8???
!?e
h*??
^???>Go?b+??^??#zzGA?M??$?$]??b????$?D&?
??nT}R?d?X4EA?6?	??[G?*??i????????*2!???l&???(???h;??z;9I?Q#??(Jj-R;???|??????V*?L??u???;S?&?T?s?j9?LH??0?o8?v????O???B????">1Z????????nc?]?cb5KjI#???(?U??!H?<?/??_~?N'?rl????????vF?`??0rwSC???
??8	opPL?X?F???RJ???;?~4?<??cX????????{?b?gt??}?
?
z}????(&?N?;??`Hf???RVU???EDa+??????"?M?
$?F?Go?"??????8L??FA?WIL??[?????z98??V?
'?*T3??	??a$& l?!(N?H?V:????tD`ek?6???I?????1?*hK=Ck???!???"NH?-F?H
@??*???(-??V??m????S?`J????:??"???`S?o?
N?1??0*?1?I?XkY?[;T@??fmb??0g?~*???Bd???O#B??5,Fe?]???w??3P
???Q???????W-??z?P
[2d^?O
??5D?r???&$w???C3h)??<Q?44(?
?G?g<?*????\???3i?J1??????f?
?N??fXm,>???;i8??hx5'
gsJ?'PE??O??b??????i???[???=?????n]S??0??x??m??7TZ????v?Ld?~??????o?
@????G*?e??E?F?q?(??S3hY9???'wA?b%??,T??#??????t?P???xj??L
????&?9?N??Z?<?"I??Cb?mR$?7j??k)n?k????o-R
(z^VN???Z??????x?DN??W???????????=sS??????M t4????+????\`
??2Y?q?*???8]?v?!?M>{V????7:Z??\?Q???Wm?[^???{8????,
D>?o??g??|?????5?j|???(B&???<???d????#?????0??:+?????e15?S?h??N?????7??}8? <??????u????
????8.?????????
??JkCw???>????n^??????z??????~?L|b??\/?b?Y??s????*?W[???I@"??????k[Ra??1[????p:jE+di???|????]?N?????=R9?T??3??{??VT6?/?9,?U?y\??s?????wIAf?IBP?
?V?u???\,5?????dY?+??a\?*JT?ya???v????\YU??+??\3;?c?ry??~[??9?f??s?G??(????N?!g1??jY)?RIP?e???R?
?Q??Q
?4CW????C?XS?????+???????t????b?y??/?
?"$???Q??2??Wt?62o[?????+?md?nG??????L?Oo????4mB8?Q{?u??????w1 ]??v???J]?Nt????9{~???}?s%-??????!??&?a??[iR????
4??W%e_?0

?]?4A??LOC"?
???R??+u??:q??!??C
V?8?-?1j?>8?f/A?Z???
??????C7t-?
??%?(?E?eD?Q+??:????5Aw???x:J???b?`??E?+?l?M??$d!Rdw;??ng??%??s?+?I?$

??1??k
???,x????mx???
?"?n&K??o??????sZ?????(?=?Sl??Svz?q???F?0L?n?-??[?"?(?c%1?OaP{{???@??4?
1?=???\?$I"

u?w????eV?1sa???s?%#?sjX???"??G~s?S?~L????no&??*??+?S.?
c3g????`????
?????5???L?=a?3?h?q????,?.>??	yo?i?:?6??I?U??![?????VP[????W?HpS%?)?JR???,/???K???b?
I???,???d????0J?[?7???Y?d?uL????H?????????'??kg?\P???@???3\u???J???h???'??U?#
???dC??????QE	?S?0?X???Z??i-F??Z\????)????Q^??AG?????Q^?# NM?SUD@?A????6???y???p??-`?N????1H??????UW
BJ?a????	??????Q|
???:??????V????Bw~(????T:C?k]??`????G?d??S?a?????S???=?AB????W??[??{???o|???~?0?v??0???05 KX
???:???d??_D?\Z$?wL??N??<t"w?f???J"??	?????QD????`???H2:!(?0h??^m1bZ?????35???N????w??<?N?VI
???+??9?O{?Zy;r>R???7?p
hx(3Z?u
?D@???j???6???g????`??{?f???T??m??A??Z?)??mu?u'G/?
{??????????????P?}]???NZqT~M????????8:?/).+gl
(1Gy?0?p??????S?I/a
??L???hR??"u????)???4??NA4R????i	Z
??ap?[??n+D?p??<m??Y&??>?A??L<2?h??)md6b5smWD??nk?49?%??A#m??k}L	?D?=U[?1?H??[??6J?A?-?a?`???K?*B?	
Z????#??ds??`?S??qD?????6??4Cd	?(?yK??a?gbICZ?La(
fhqe?CSg&_?!???/I??hJxq!)???E&???o%??U4??=?0E[??:?Q?_,?C??N?,5?
???OggS
Y??:4??v44??z??_?????k?????????N?u?a(?
?????I?G????cB}>J??2?????N??S 	?%??

2
???V??}.?jlQR~<????b??N????????/fQ???"??a?IS?iQQTj1?eJAK?(>^<?M(????j?c???+????uhYvP)?qzx*#?W?+?2E???8i?k??3Vl???????D?R?N?"R???UE??)H????iB?Z?fdh }l0?(?????eR???S'c?4T-??A?+?%???????Y](6q??L1??~%?:?= ??
?l???? ??{???G???A??9Zf?????zs(????K??7?,i????~??Tf,?CS:%4
X??S?j/?????p*??(?
?5R?IO~?????
??
?0^???-?HeA`?W?b??$B6e???A/??z???
?j?r-?WF?????r6?'_^????2+?
?
?&???t???	??|???*QU
??<???T?	?=?[??qW??"4vA???????7??c?????g?i]6??\?????B?|	????????F
?????X??????x
sro????'7??L?\?{?f??s??W`???zO??\
?
?????/
|
??XX??N??(?8???[V.?@????D??B??t^??xQ?+O:???{z>???|????zx?^?O??????L_?7?''??r??Q??=?+??E??`?(!JP?}????D???_?9??;?????^t?~gw+[???}??V]z????}????v????7}??????	7? ?b???x?*?T???????l1??X?	???Z??*	xe??)>'?+????U???????)\}~'???U???c????j????????yJ?A?~??.??M??Z?????_r???L?(
?J??m\??rA?S6?2'?%(???m}???.???~???$??o?q&?TQ,??????w??
,B J??,??@E?uiT???B????
???
?L?L=S?@?&?-????2?M(????v??e???:????j???g?/??!??????H?r5?????i?D?U?x?77uc????E???????(???????.??X??????h.?4-X?+??4???9???f{V???)??:,q???~?Gg????(+??{n"G????G\o?&{`W???U`?^;??????v)?z?F????o1.E?
?AB??YHW??$JIHJ????A?J7?"ok?????'??+0 +0
?,1?A?????T????DviM?f?X?
?tA?Al(9???G?????_??????E??|????	?j?w?j??o?'H
Y(??6?|??|]J??g??*??.2?v??pNgB??h?!?zj????y/fb????+M??l??G?u???i'?x?I???q?Oa?g
?V?=?J6?????y~k&???
l?WO$?5??tE??K6?{0????
????b??
?9}????^?9?2	?w?YGa?G7?????<i?^?}?t^????e1?U???]z?_?PE??QHzb?D`?2????????
?R???]?I?RI,?
8{?g?"	0F??N0HQ????GMT??X????5?x??#5?.2??*?????9?1b??z????h?Da???\D~?OcQn???UM????Uh?"}OD??|????6%?_y??m?o?????I???????xx.????$
8_=9???a??u`???`u???!??c??opL?T?
??j??????3e?(?m2{?	?????0??83g???}ENf?R?`?,
?7ZN?????e??-V2?????+l,??^?.???Z?zV'????f????jFv?vdq??A?)z??+??????[cN??????}s
?,??3????????s? ?|?????%??l??h??wY+7*?T???I:9d?e??j???Qo4$??k6???K???.??V?X?h????u<??????m?lv?2?^}?<????[a`F?	?Y???w'?????TPn?R????u4#??i??>L???j????
???<?s??X
??*?,???????>w?~?"K??e???5?????0Z5q?|r%}???S??Xon6+~?????<[?X???.???w????;5c?w?%??N??????T?[?V)?/???_{?????x?a????^p?+????????~b???dg??:?
???42??|n?^d?/?^N??t????Je?e??!?C?LR
????N?????6???????Q??F]?E????????>?w??x???W?[E?F4?u???=?}
?j???Oy??b???6?K^r?q5Q9)Cv? ?.?"??? (e]?_?1????!N-v
NV???Sn???@?`2????(??-
xG???	q?????????p?????N????i	??Ri?b??~i?U?????JP?R??????+lL^V*Id&?:?N???????!nW?x????a??v???{???|N????c?2?l
???'????-UH^?DB?k??F?-:?G}????T?N+???jq?:[?I??)??F??????2????U
?*%????%%e1D??????$??L
8?A??

&0p??b,?"5P??E?N?Z? ??TBPq @TP???+4??^???K?dU*?V?
?QP??T-f?4?1??MW?
G;=FL8??2JUT?60????y?-??Z2r??%<+??F????x~?7????(k?l??olvK;?6s????%???=d????
l???D?V?IhE5m?He~??g?$Pn?C+????*?r??%[??N??L?N%?f?"`??[???6?P??V4r?>,e?iZ??k??KI??-???????G??
?cjy??Hq??~~9?5?????;?????[w?&s^???U_?????\?V???Sn??w??]?'????e?m7"????=o?]??D3?n????~???w??_<"%????C??7Do!????\f?p?-???+?V-+??*1EX?R?'?!?$?C6??
>J]???G`k?)??_?7??k?Q.??!2UM!????y?H?\W,???Td"

V 
I?y?'Et!
?$
?YU??
?v$?e2eA?EA??Af? ??X?h
???Q?H??A?De?0???
j?p~????;??a\#?^???6???s??SW;H??<?d_?h/2??T| M?????Z?<??\?bkJ?????+'???Y?
?i/T&6P????W=y????7?:??M&,??$?
?????3???q,???o??u??h>W]_6/????t|?'??%?????5_[Rt????d%?Df?6?Wf"?[??!???? ?V<S?z'??N?7?< y?p:j*x?????~&7Q???o_{???Fv????{z"3?#W
??s????q?o????_?Y??<!,??(z??(?c?????w
?????Z=???f???w?~??(????????V[qP
???EE?;??L=~?EgW??}??N?o????	?????Uq?T??(?
??,$
?;@
`?6?
????~??$f,
?
^?F???|k????s?3??#??9????f
'&????\?5????Y?????=???-,??O??n????M??Y??@yuIl:I?x?y%?s^??<B???-???B?tp???E???lH?	
"WE??V?
???
T?5????2@$|l
?y?7?-,??????c??(;??????{><=?}5Rs?cX?yv;y;

?????6??[??w??[8??????e??????????=_????\?t9????????s=??+?????Siw?P?hS??m???1??[,???A[i???7?\??a????[lz|?\?+v????I??J??k`???EdS??&*b?????3?b???_??????|
??W??)g5????,??b??????????=S?[&???D?.??i&?I????'?~?1;x????W+{?B?~A?K?(??x???{?,e?aE????s???u?d;?s????O??6+??E}??C??Or?}??}???|8s?g?"?
????rJ??``~5?L??1?^???`ZX0?5|
x?:?Q???U???I9?v\?t?!?`~??????5'??"??jH????????????8=ocwG>Y??"????O??j?????p???d???w?Z??:????????VsP#L???}???L??|O??>a?????z
?d?@^??64??s?~???:?q?????8)?79Q3?'??f
?(?T?V9\?4Y?J??)p!W

 &"!+#%??S('+
??4?t#\6???.hZ????<??M?{?MD("?<!?B??K???????	?}????Z??*b?<T?:?"????Z??
?]?	 ?I??????E????dX?4?X?5X??A?E?"D05?? ?)N?j?????j!T?B?GW[??
?]mQn??8??????
?\?P?x?HYQ^?"?H?@
)??\?t???K.]?t?????K?5?XA,j????C?DU?
N??V?S?Z?	???t??p*?
MW|w?2??
?b?D ?D????U????
[?H,
?(&KK
????{?5v?0;
?1?z??.?lw???<??h
X?? ???x?;B?a???F	??:??uZ??!??6??NG
?]?
??<?Z??Xb&6??
?	j
Q	W???2?????a???jFx?i?`.?QlAka@?d"?=\?L?????C5?jYEAU?	?$H)??.u?1?PM??????????????m

	r????0A?f?=;
????3?0]?hh? ?h?F
t
&&Dy???I?#EQq)
b?P???
Uk?)??XA??PQ????Z+8?1??80?? ??4"F?j?j??18???!?j??C???*X?(?)X?18?	J)AP??y<???
?c????y4??? vGB
<??GAAA?&?
:?5`??P??0?j?4(??~M???a????MT-??~C0??BM?b?!
???q$???A?_;??c??5?A
'?b?
8Q??y?bu?"@,?
p??????a?CG???????`T??Uc

--- NEW FILE dilvie_-_the_dragonfly.ogg ---
OggS
b?9?=?dkM???[MJ)%
Y
*????*????2?,??2?,??2????:)??B??k??????5G)??RJ)???9?? 4d

Y
b?d!gA?:?!c?R???c?AB??R?ABCV


Y	

!? tB))U9?sJI)x?9)??RK?sJ	???Z.?PJ(??[???RJ)????"?PJJ???!?TRj?? ?????R?1!l,!??Z?5!?j)?k?A!\I??Xk
??sj-?Xk???[???
!?B)??RJI)?B!?RJ(%??RJ)?B(??PJ)???RJ!?PJ)??RBJ)?TB!?PJ)???RJ)?PJ)??RJ))??RJ)?PB)??RRJ)??R)??RJ)???RJ)?RB)??JI)??RJ??PJ)???RJ)??R*%?RJ)?
)??sJI5t?A????j????9*)?;!??Z??uLB)?c? t?R?)?:????J???PRJ-?cl??[?1?[+??c?1??Zk-
?P?00?????f??&
???A?f]?b PR a? Q?X??@(?Q]??Nu6
V?F?:?
??I
??rR	?L???&??Y3?,x?????
??
?@c??"X?$!??/??&0Ie	??5?rLe$H??\???
AF?

?XD1(.U?4??qTQ
?""??E??v?
NK??????
`?????~
	
?NI?I*?@Fi?LI	&	?dxf??,	`)Bi1IB? I
?h?
??A??B?B???
*j.$TJb?04N?r
?(&?5?\???C?U8t
IHH? II	???e2??f!? ?E?!??af0	
M???"?????=?? ??AyeJ??,/?????<(.E?%*?4m@?i? q?h:?H?
8&JL
??,Q??
?
??
M????}"??(?2??(j?d3IQ
?-??4@???$

?? 
?>k?
PW?
??
.??Z??D$?)P??3@Vq
?$
d	?"$??@?@?.
T
?&!?h,
?" -$B???????x?X
h`?`???@P?
,!$O?#?J?
?0Z?L?U,
PE?`?!
n?!????A?? ??
v??????Z????W?B??`????S?0q??1??Q?? F+=???pLt???	?:
E? ?v?D

e????????`???e????v61??qf?,

d???5?#7
?$???
X!8?&
W`?v[WGW?M?@?=???aP??0??D?p:?`????e ??<??????	
?


??????2)?D??E@???I??????MPaSB

??P
T] ?	?!??S
??*R91??=??w??q C??;?:??\????
d2??D????/??b????????????, XH?????'D??????NE?$??????6??Y??&??
\>?
@???l?
?l*avA??qV?I?]????WSV????#
pl)9???9H?!?J??u*FE)$?<DT0?P????Z?]D?
?
v??D?#?I?!{4?`hx?A??

}?%
0$U,?
	??T
#?(D?IV1??
???	
D
Ul?? ?
?

?

h??JA?b???????#j?-?aC?C?M?sv???Kg??\

d
??hb???8
utKC
?QC??q#b(?E???,??#??Z"?;,YD&d?!?????>MT2`
??l8??D&v??????
?	?tM?4
>P0?Di???^DR???g??
IuI??|????rbi??'?
???J?rd
?'&b\B`??????
??x?b)?<?r4??????

?6z??????8????
b???
??y{??@Y?_???2?<????/-		)??	IA?$?
)?	?bfHY?@`&?[? ?,m

?P
??J)Z
??z8?4y?$??Ic?$ ??D? 

(

Ht
@????????
?@&
??E@?b"?i?z_1??? :,FV?@?D???s?????p,y]?xi? ??'9
?l?#??`?d
??PJ P??
??+?PFc?
"?N
? n at A??u???.S?4??S:??Ny`?`a??0/60L???6{1@{FJLW&%
?x??(Cx??
????f?sgD??
V???H??3?;?HKG?$%??E??

	x?????|?(??C@Y*Gi

 Xy
 .?
9
???;??B?0??n?o?h-t??n<?C??{?QQa@7??`
?Q??J?n?Q??
X???*
?N~^???g
?
4????d?$$
?^
f?*
?i?
v?E????H?/????EU?Q?4?L?
?

?????n?3];Jy????????k0N@?_k???*\h_	"?N??
????? .?1?Hq"rI ?x 8
5????`??~(?KEFV???R"?"?{g?H??z?$?F?}??4?l??`??/?'l?????
?i?????
??
?R
???.
??

?
EFG?
(??nP?EF`?E
*?`?64?+8??f?????@????1
????	??fT?{????B?l1~9$?e??Mw???*???=
?a`YH??`?????~?U?%	
?!o???\??0?[???????K??J?41??J(?Y?8G? At??3B^N"?rm? ?^?????P???)??? pB?K
J?/?
"an'?1@?%(
D??h?+?&?	 Id5????
???aj!@
(?J
?
	"
v?????k~???a???? o&??e?-?
4 at 7ZW3?????bw????m\?? ????:?#a?|M$?9?FxG`??c???"?!??;>?*???6?u?#?v?n?_??4??????S
??8?<>?
???V??k?WB???5?%.<3r?
w?

6??FP^V?????d? ?????wFY@?-V?*?	
????9????(
??08???k
??Ya380	?
z???$?
???z??Z;?*??I?D??2????
?????
?x{+??+
?i?th??
?+?'??1U??{Z?g??SbR??Ju?oS???%?$?4???."??????+?e???????????U0?M???????
?X?Pp?????&_??Dt?k??;???d1f?
?Q[?q?RHA?????
?????+?=?S?K?????UW?J??W????s??? ?M
Q????l?h:?\+PHy?R?$4>??????y?n????U??9?["+?X????#k:?GG????t??t???^m1?????x|??H??2i??>?N9ct?
?QF???/m?
s????]]??_???+???&??????"???O?????'??o?
K????????g?0?????|??????,?4n?j?&q???r?w???????E??g??.LSG?o???????t:k
fn?c??4201
lZ?D?4??6???b]yEO?
??'???4#W@[?FI???S?? ?E??nM#?.!
???k?)?y??9???<????g?]???B????_S'?%w???t?8????Z4?fb???H +?HV!?

??o???C?y??x???h??p??X2
xJ?6?????????L??Y????????*/@")???0??/la??y|E?? ?P\??5?_?.?
t????R?m
?TQ

?l0??
?+?@?K
W3?

L
??Z?++H
??f?I?

??S??u@?X??=
0D
:c??4h?N3

?8???\??:??-T????@H???/???AL`???\V???"CLP?gs?? 9`?;??k
???^??q?k??
9?Qq??????S?????????>?;3,??t
BlO,DN?J Q,8??NL~?1?;?Z
??n?F:
?1X9'???
x+?hW[H????J??G???0RL &|#?	?y	???>@?x??E? 9????
??Q?cm????y1
??&????c	
 ?E?`??
?K??G?>W	R??+????&g??
F?????????%?@????L???????e
???Vu;

???????
V???e?
	
v??Q0??j????	?T??i0?-??b6 at pE??#E?	;x&{
???
?="?2I)????????*{?u??AZ???5?H	??H???H

-?!??.7?+u?bO???1?SR?:;?>/????
?????a*=g?z?E?W?:
??_??T?

h???????c?-?A???Bl`?3???x(?4M??:?,??=?l?jQ?
k]??=?,?i????QAb


E??j(
p??P???????7?O~v?t?V????$??@???{yOlgHFF????A??q?N]?????M??????d?O:vq???HD?Yqj=??\????P?g??@?8m|2?a??:?????	??s??????~b?d?h????y]?m??)?7+???K??`???(h?5??r?r?J??$S?k
IQ?Q?TD??8p8,
b??8??
?Q!1??(???'??%f???YMDLL??
	??Df?W?!??????
???D?CD????L
W?0,^S?Z?

U
87m?????o?gka+3?.
???N??Q?(5 q??d??9
?9RoN?nR?{5K?	9?
|??B??H?*
? :???<!?7@?^,H??:?r??6
???]w??

p?
X??^??
???{
???????[??8
"??
L????a?
H?h}
[...6544 lines suppressed...]
0??)???F!~F

?F?0=????v??n?y??>???v???h4?F??H?!?}}]
 0qH
?{???!?\??QV??haBi?
?K/\??
?q"
,
?~??%
~w???
?Q??>$??88????.Z????PxG???p???2IZC&??!?@?26??????5p
?@
@+"
P????P?'???
(???
???tl?_?	r0y????L

?i?x?1??
 Q???
??

?`??;80H?S?
????
????m?s???
?QV?

?/`9?????,0PE??
Aq?kL??/W??
!hZ;r???Q???????????IZ?
??;??Z???:????@
?	??
??`?@+(@?B??
(?_6
DB?1?

Q?Za)4?e???????"???"???Gw?#
??????^W
??F?
@??????93	
??)?&

????
^G???0??h
????d?5zIpv???	??dd?!G8?L?!??
??@q?????@
a???9?b??3vd g)IP
`?D??]??4?????T3?
AO?Q
etPs?9{??
??????????Y????
*X
{??4
@??@6
L??s
@	A???V3?6`??n?????t3?
??

???_{&??
yz?????
?{?A?L?/???

(
???B????R% =?u???+R??7????_??
%
Y^???


???*!
?t?	?4?????P?	]b??0K ?x?!Y0C2??
?p???

??\T?????8???
??]?VO
OkC?????)
???t^ ?????6
@?J?8O??l?]T???j??6?r??l??kC?????n*?q?z7???{?*
??
?n????~0???-?@
??
F/???|???0??
<l1f?
??
r???A?


?FI
????b?^P??h????%e?b?*~?????E?J?4f?R?j?wEU
?????	@????a???
?
vH???????,tSA?(v=$?<3??xP?[??X
>???% ??C??
8??q"??
??o=gf?????E????g?h`?????9[?
???3
/"??j]?H
(???R???b+???{<????D@????L?|7??
??>p?
???.rv
?n?`\?6th??

\????@?e?????`??-P}?,?F??w?|?5?'??~;???f???8???*
?? 9#??
???????D?@?.^??S?r??
???}???????V????<[??[????k??S?I2??????x??x???T??1(???oUi?yM?D}A?9Qr??POi??u??u?=???r?+[??????l??5???? ?B??P?S???)7e??
@??]??
?L????

?pV-????t???
gET??????W
=,??7
???C??^
?S@????????
?)??e???r??_
8?X??p??bj???4?????%b?
?Q?,?????VU???{???p????????
?e[??^?5e?@w

mrw??
+?
u???~?O?BUb?Y<zcc|f-????????NhV&?U?M?p????????;ovz??A?P^??e???/~`pn
R?0T$??	??xr???
??r?
???3???n25??
?6G|?;	???I?

\?*??K=????m????*?q%???	?? &p?$?$/U?M?/?#?%?k???ZB?QvI??l?
?
3f?6
?
 ?UwB?	
?c?/
?QK????LP[??????g?O"?

??|?\? ???S?`	<?K??q4??'h:aX6?u?s?b????I(Z???*=??N@??43#R??[.???\?? x???-?>????h"?m!^??u&?0c???b??V?){????????r?[b? |???w?????)-???"%????Tw?Ve?t$y?~??K?${OggS
??G^??h???|???n???(??t???!{??^???#
k~?g??#p?}?????o????k?!j???
??}?U??????w%?/t+?R??^,Q?u??CS=??:{?????j9????/7??????????6@`y?K1?&-?G?l. ???}?2\
@s%??k?@??,(??7y??f?0%H??
#&fo????0?????N?i??w=|???>??G0?6????(EU??j?-Q~??>??i>{M??iOa
??+?5lrK?D/Ez??j}*?(Fo?i]???????j????????}?????c?`?x?f
Xn?R&2
_??|????ONg7I?,?5????&??Y?????fG???(?\	??
??2}Z?<0?s'?f
?m????y????6d??z???p?	?2

kPEinez< ?eS?F?????5?
?ql??sM?@???u9&?????f?e?g9?y~??$K;?H?
???????=S<????5?I??-?|
??S5t??@+??????T}kd????
.??mf
???=
??)r??{s????
?????????i??6?
{??UC?N??9?????
??=c?????????

??3????#?
??7y?\4,??OggS
?A?]c????U?##9??Y??y?????
? ?A?)?
??V?????;
(+?H
o?J?6??
?p?????v?\Q?e
??H??PN????{J}????D?5
x?_g4??83?]N??*??????8???3??-4????H??=w^?d?<|$??V?? 
??/????z-?<??D?v??:??.??'(?????:=??2GA??99?E?5\??nMT?????F?S^4Fb??????n=?U???
k??|9?bI<?,?\@
??#?w-@???
??5???$G???"???*=????Y?O????J???+??????{8;v??[???????????'?S?V???(?{????yqe??d???
?j?Q?????hM?	?.?@??Y??X??F?7X???=`?\
??4{1???'bZ2???.g??????g??U
?
??{?j???$z???!	?Q%??$???e?>;s+
??R?R9Vt^k72f???\P????p<??8?SD?#0??`???)???G
aD?_?????Z?ruM?ZcbL<Yj???O??????W*???w??U?v??^R??H??b?{??_?
)?Y
0
?_;???<qff,f
2z&?G????]U?O?i??k?????qb;!?+H?u????R???"Y?#?$@
???sI8????z???
????????????????????????<??+?3:1w\???am?cx2?C?&???
H#c?{???T?????$v~#????x???~5???'?*???v?<??\?w???m6??ww?p?T??6O?N?L~u???,I
?

????
???g\?
??0??????o6??"O9?????US??????V(???
:?????????f????U?y????5?????c"5V?F??l?5???o??u???'c?T?????2	?>B????oVY7?C??fL2??&??z?[?t?l??S??S??\?,???o???D???V???P?f????????G?????[??S??'???y:?????????e???5?C????>
?m??|@????j?k?;??
~5???K???KZO??5??`????	@???????
??/?^0?39`?q?n?i
gR?)?6?5 0???
???/e?1'z??e?;???<Hs??g
:?????_???f5?????R??]?S{?v????4?V>?????n?S{?{`???Z????k???9?(c0Mfz????/???K??+?j2?%?d@?F???+?_???;;?Q???????
?m???-?l??????e>?=F?????????????S?@?_?2????	_???????`g2?????????j:???s~}y?=???Em??z4zKzb?5??-?8f?8
?7G?????@?	K6??`~5???[?i%I??5????$?#?5?????|?Z???
6P
??
?4??j
?5ldd?z??T???^??.??_??|{f5n???????????????:?9?????1G????]u??3[????RX;??~?e,?tL?M?
7?q????1I+IX"

(z?*g?$?$
?????
o?FO??A}%7?4V??C},|??
?lp?C|??
~5????0???R5\???;?P)?	 ?O?u?_?h???Q??6?
&????/?cA???K???X9????5t??C??4oqX?????f)??'????#??Aj?????cEe?{????????f??? g??U??_}`??Y?J?!
!8
l???|.f??????K[&??????b{?1D~?2???V??
??u??"???u?Yx??zV??n????rq?iZ?7???+?M??}F7??T!??J????A??#???S?y#'??W[??o?6?*d?N/I??????
?;?^T?CW7?????x1?1?+?????Q?*??|*?Q??a?M????????y7L??4?Y?????IBV??
?W6g?
d#????&????????
????x~<e?D?\???????????=?;?oF??v??$?6F[J???/w??>?X/?.??x}?'0???R?????,:?<Z???';M^???3r?%
???/???^-E??????.?u?????&p????!?v
?&O????rI\???????	x%??M?f??'?EO?v???;?????bc?G???T????n]???g??yz~zm^?/?????~?!????g???Y??ju??O??.k?HOo-v?%a1??}
?w]??o?\?3o?Y??kE$????W?????5ig???OggS
?DdO????q}~?9?_???????z?/iI???\???~?????/??I&Kfw?????sS??e?f??in???+h$?H?{8?????2????rv?nS????r?|?Ed???V?Tb???GR^Go3
?b???M????1?Q'?2~?????[??1?A?????g?|<;??>????<{???|?~s?????h????^K|?]R?W-????g?v?j?V\?ysK????{f??U?~??x?K??_O??~??????z???
'=???????+?g?Wa?Z???~???n??????C:4????:-DbV????????x?SNn??E?x?O)?n??&??|???jA@?k?If??l6sJ??u?M???Ru?;?????9????7d??Y2??6l?=?-Y????l?.`O???YI????
??h\V??????-
?~??Q?&????????{???V??????? ?.??????|M?o???w??????`u??/???~KDv?
}??6???*?|4?.?$??o??@M?;]???$GV?z??`??M?&??????????C
?}???3?p&?~?-y:?!Z?????x?B??
????k?$??l????k?????j??]A???_'?;@?9?'#G("r=???e??n???n\?*Q?????9Q??\????)????pS??n?h5?p.?i????s|\T?cb???y?;?ws`?LJ?????????????K?):m?q??W??A???i??????r?HH???????3)s????>?MG?~???????dD??j?;???%?5`???LVw???????%?????L?o???)?LD???G??-?rdb???=???I?n?fE?
?
!aH?|d??????{a?:?X?y????y?????<[?aZr???6b
F????L???q<????.??![???????aC???2?????D`R???s?/?3???3?<B????B??n?y??2?S????????'??'6A??H|?
{l>?C:U??;J!?=;?????F???????H?W??y????z??n??A?;`d??N????G????????R3??????3=???????Dh?	?????+Y?U???2
???)Z?N???W???????v??1????O??m?|+???q??c??~XD'?+?I?l??P??h?"_j???hZ??????5??F??hN???????????f??x??(K-?LY[?
?$^???S?????????????????x=e>Ru?????gD??x:???N?r???}?V?v????"H?????[;??k?rR??y?7
?H;9?.?????g?&?!l;S?U? 	~5??G?P?U??O?(?<	????6?P?w=?#??}
??c~??;?NF?w?c?l?}g???H;n??W????????
`;?0?a;??Q.SOs????\*&
#???V?}?_;?kws?syN<m]?1???nu???D???oW!??????????????KN???VGM??&?K|:???q?b%g????????????vW?a?>??z???????
?wt$??L?,???f??wT?+J????
m?????D??/??{???d?o?=???????????9o???y????^?bY&g.?}?+?A????~???~C."g/???????????'z?:GX?????j?kr???? ?w?1????JL?t???????????????|A?-?????kzK??U??+??Q???????U?|????W??f?s??<??X?:?&_E<vH?^?%5Iy?Ro?c?$??1]2k?[??R?

6????TWq???$
???????@??OggS
??jNV~%?c?29?9??|K??2?=???>?"?{t??n~???[4?P?/&Ul4^Xy?????O0?M???w?L??&?8:o?w?r?o???&?f?=}<?????l?y??J??N???9???m??:????	?R????C???ic??(r!MDa??M??n??p}??5|???!k?9-`?/B??#?\?o???BZ??0M~O+)?
Mi???0???V2?X??n.&Hw????b}?+?)?'j?E`
??y?b??Q]?5|?Wa???????A?	??	??x	??Z?8

a??9??????6G_???? D)@???Fu????~??y?b(??(?3?%~9?Ox??u??????3???\?)?]?**>
??????????Jc<????_T?*???
r>??/??T?GQ?
?

?y?'c?L?=?_?????^??}?ZO?Q?????????O?@?of?Q?]?-N?*?;U??#OggS
????~5|m???5???0???r2o?e?l???iZ

hS???????f????????"?Hp?????X???&?]N5s???^???????\;'9?8?y??}5?????????<???????v??YO~??U???ehG?^U7???5C?>?o??$]????"O?B??=???????@v?l}?N?gKv??_ 
??dd?cf?FW???
????}x???&x"g???????]?????:[??8?a\o?????I~
?5|n?7`?????X? ???????]_
????J\%I$
C???0????C???G
?|
#A`2EEP A?I"##'
?r?q!
IH>???6hH??Y??~?

biK?A?Dy??K$PT
?????Xp??=?fD`;?:TP?+?;j??aP
?2m?:7>7M?m(?v?s?s???????PX?<
???!???D???? ?
 2JE???mA?N'a?	|o??+??^ ?(?*&j?]?C8%
)%XEQ??
??L???P' ???1?P?
?d
?C

--- NEW FILE dilvie_-_up_in_ashes.ogg ---
OggS
*???
2? ?L2???N:????:?(??B-??JL1?Vc??]|s?9??s?9??s?	BCV

2????U
*????*?(??2?,??2????:???C1??J,5?Vc????s?9Hk???Z+??RJ)? 4d

Y
???
?aLBH!dRR*)?
B*%?RAH??R2J-??R!??J? ?RR)
?4M?TUU?i??i?????UUU]?ua????????u]?ue?????,
c?1?c?1?c?1?c?1?c?1?c?1?c?1?c?1?c?1?c?1?c?1?c?1?c?1?c?1?c?1?c?1?c?1?c?1?c?1?c?1?c?1?c?1?c?1??Zk??V
!?J)??RJI)?B	??RJ)???RJ)?J)??RJ)%??RJ??RJ)??RJJ)??J)??RJ)???RJ)?RJ)??RJ))??RJ??RJ)??RRJ)??R)??RJ)???RJ)?RJ)??RJI)??RJ??RJ)???RJ)??R*??RJ)?
?E@@.!???pL8'?6
iZQ?i?????O?1?v??c&SK?Mw?i<???f?????Oo?{1?9??(?$	??S??Ve
??|?E
`?x? <yeJ??)?>gxGw/mT\????dz2???cA??aX?U-<??g??>?S&?n@
f=u??,?X?N?n
?????????
???
?k????
???AQ??F?*??*?J`95F??????j:k&?3???R@?????`?M??? ?&??D?}??3?Z?]?GG??????cj??{^
?-?6???QDPl>???#???\?j}j????L???
&Af.???m??f:???????{?????b??`? j???SS????[???0w[?????????M???????
V??(??W
h?:??n??|?%~?6?%?

r<F??Y?rN\???
??u??.????{*5$?
?.,?8"R??H?
?G??(?5Ts=?6????P????e???
\
??
|?3?-??b?N?/?P??
4????

???-???pD2J?
~????v???<L
?_??????????fJ??=?c???K??~f?@????N?u?U1?Fc????
>???c4??W?4?2??^?>?G?h????\?????#?7???:???????}???i??????z??y??UNm?}??????_j????S8t???????%
?a?
3??o7??8z?7=/E
H?a?
?z?!?1???i?~9??
 ??

%[n?
??????@???????y?????p?0}?}
??h
	?
?t???8??q
?~~??]L??{3#?
x?W
???$*???>*???}$^F?lHLl<???
?Fd?Z??
??\????M???n?X??h?u??~54??.hMq}??????????CP?-????}?
?c?:?U
<S?=l?o?N??5?KV????O/I2?????@
@??/[Hlt????bA]?x??$Qa??#?Bn????=vH?2
3?Ng??0=i??
?b????i?)????M.&?D?^?%??U
? ??3??????~???M??6
Y????????|?R=??
Ls?
?Vv/v&? m??=7IY?@?
 zqB?
_Ya?????|T?$????#1??$????P>wI?O?????0?$?s????/?H8????J,?????:??!VR?
?!?{?[?t?c22?y?????t?L?m?	??????4??Y?\2?	?humW?j?:??????Rr.+?z??s?t?I????d?h
"i?
-i
?sp?k6???
L?{?)'??v??????????{Z6????o?????CG??>?Us??
?:??G?B??RX?????@

U?*
 ?????z??|???????o/??G
??[???{??3??YN!?C???8<?{%
{,?6)?
?

P????? ????K?$????m?????????/???/Tu?g???j???S???q?qA!???-?p???}?r\.K?#N%?v?"YJ?o?3???RS?\1????????w?7uW?i??: I(<?B??Q
N4?[TY<??j?@~??<\|????|)?'
?????
???y??>9tT??????|e
?T?

???}?
~x??g?7
,M?QC3 at Z
5?q?a??B?K?????I??????????2L??????X?r?C0?U???
????n?7
?%$????Z0??&??\?TYA+
w??+?V6??g? ??0'??w9??8????nPm5l???/?|:*?B?agc|??[????n?)?"Xi?9????Z???????XZ&tF?9??n/?'??????7Hr5?
?+?j^??x5

??.?}??}??y??>??@A?O57????3	]???c?_?z???5?Oyl??4????<dBw???0?tAz?G^k?]@???0;??Jz[U???????????:???,?
]L?P?N?+?Jp?????|??s??,?/?7?o>??~????
N??w?f?B??8????]`$
`????p ?l??????ff
????*?8?Tn8???_??????_4???X
?H?%??
??6x???m?
? @?

???	+8
)R at 2?A~^????
?2h?|
@?u(?7uh??|x?????Z??????W2
R???E>??VA?T?5C??????sc?aC?????^?C?????
???jc?|????o1??9=s?]?#??8??O???????????4w??L?:{?O?{?>????@??@?@)N
?sN?kE?;?????:?'??????M?EWO????i2?g?
uE????U)s?-=??
s\?6?????~p??c???c?o??67????F99???~??oh>n??U[?_[???:???????????2????v
AQW???d??@???0??`D5????m????zT
Y?K|???<(
?
? 4??i??H????;???o

ng7????o?RK???
??o?
?<$
?23|OA??"
??q??????????C?/?u-}?v???vp?5?CM?M6???"#s'j.?q?2?@{?? ?????&?)??o?g\?8i?k???&}???wJ?D???f@?:?G?<=d?;?d???@?
???	??4p??0O?-???P?X_~?????
?b?}w?3?????ah???N&?]???@
v?????r?
????iuSc?????Z???;?????z,sv?S{?$?z3????#??
??$q??
??=b???[m??
??Q?|??g[]????u?#v???oqZA

??H????a?W.?=?-???&?
\??Z??}?j\?}P?c??r????[???]????


??>?mn??C?FI????
O??N4e?d?B??/?c?
?"??"d????]D????U??,?7UdqH??E
>k?L1;??>H%2???P?O_M]??Su??H}??n??*@3`??&??x?jn???m???d?`?4MR?
??????Ebl??D?
?mR-?.??p

????9??{C??{?!B??E&????M?'??.x?v??n(??<Z4???y?j???L,?!@K??W?`a?P????p?"?Z0??????]d7??M?	??e|m?????????R?)8?Q??-??j2?N??"?
I????>$c??q??Q;??????K?o?4@??M)??`?Ix
qQ??&?_D?Yq~?'?nZ4@????7??t??O??*f?I?=?V;wdH35;?}]}?3?-?p????4
$8?	'??
5\????;5 at 9?I????????Ww?3Rx???????t\3rR?-;????????c:?G^??????O'<0????M?'r?3{p@?R??s?|?Fi?ZI???
H?
k??? {5l?dZ?$?
~h??????^E?Z]2k?H ?3??h?"??L
??W??????.	94&n????
????????4?BR??O}F???*??D$/?????>????x?*?????a?r???{???
u$?v
H???????Z
????c?|???r???
?8Z|R,?w?`?N???c????x???n?fx????
?mb??????k???a??/o??_?VR|FB|GC7R
n?
?X???.?XH??b?Z?8?q?D??????M?S???G?-o?d]?=???Zfx
?4y	?>??am?[eJYV
?8?)?4??3?jM$?n|?E}???J??
@
HD^'B](??+4???d]????????	?e=<?_?p????(~X?\k?8????Q???
	???^??=<
/
????S?U6+?7?[2_??s?D?{;}f=L?};c???9?q?%??

?!?Zt4X???
c???9?2?DVV;?j?H????7?B9?1(t?)??<&6?????
?C?Ls?5??????4???bH~???????????9????U9?q??U??8}??CV??H??^??H??tr???????fVQ???4]hK???C

????|????E}%?k
C?
H#	?h

????{xm??eT<??@Ob<>?&?S??%????

8:P?????{??z??dV?O??)?<	
BG??y8$??{?x?"C???~???|h?^???sr
?Q?M=vz;??????
hrx????ey%:wzh??I?y
??????T?=?????>??m??1??a0?W#?c?P??]??w?(pH????=?So??g??Y??tV??$of/???gN?KV????;?V4???n?3????;????Y?c3E????=e?

G
^8?\??^?$?C!1???r?/??Q?W?
?	X????????Q??????_)3?//70s???/??'
?m't?)????mKh??????}??WG????j
?O?u~?+??'~s???s??S?
????!??J? ?3?$??????R??T??L??]??N?*??=t?????+Qv/????U4?'?}5?????m?EQ????Y?
???\??/??3?9???E`?????
???
?????????'^?|6??:]f?
??
?j?NF?????r???yI? ?e???En93??????+?3???T
P?N^-????t#?"C??H??M}??m/?C?A?t??e?fS?W??7?f???~u?Y?%????k??????<??????\??
?uw<z??=G'??Ep?8?
????&??(5h
??? ?m
`??_?
`????I???q???
??
???_;G?r?6o^6?u????=
?w=O???B?;?<;???>8)?x^ |F??Z?l?<???$0r)?[??o&??}???gz~?P??D??????4???{U]?Y
?*xS~?0b.<?s?f???q6?L?DvL???&3d?bzd?3?;??d?3?*???d7#p{???^??cR??P
?IB?ox?@(??{p???b?]???T ?5u?
A!
^XLj???\e?Y<Vn??? +h<#b?^??C
@????.?m?^
????`i
???niv?5?????lEx?k?
?	c=z??I?a*???w?o?#
???,????IM?$?slr?=?ff????? Vk??`?8???2?-???<?!?=.:vN??T?T?w????????<	??<

?;???~????g|??qsN|??J3?>?????$s???R???????T
??Op?V?????a??\l??^??\?9??9K+???N{?I?|>?j??lj at Dg??d??????^?(
?????R.d?
?m?E???E
?KaT73Y?Y??A?#?{??id??`??z???z???????L???Q??<?3????f{(`?_??y???w?!/[U?\2\????}4???p*??k6?????t??!?g 'C?8????s????r??????????s??????O???J?????(??*????8?fmJ?K??.H?b`N5????a(CuU2??k????????4Lk?d?????'?
????7t??M+??we????.???
????>??#0lp??"3???<?,{??	
?RR?
?,c?I
`?

>??dK??EE??_??SN]?l5?
Ab???,??9?kf

@???|???~'???'/-h?7?M>36???;?w?:??	*?
?~?
v=????z???O???
t?r???w?]???=o

8?7?}??????w??|??~?}??
???
.;?}g&@?
McE???????bSJ
	
??$??????iQ??tU???????7[_"??]???/???S??d:u<?a??
?^@"?,H?
?`????????
?

??????t<e??]?\???e7?<???Xt??*`'?
b??Ov7
+??`???]*33U	
?g?a?u?3??y?V?R??VK????#?Lh???????O?????{B???B?
?,
??%?
?I1??@?II?7

?_????g???????!????3??|O?w??{?m?R?K???6???@o????pX?\??4r3???9%t???{oOY?t??u??`?]POf???'*???)??3??3/??3??? ???`????g?????
s??|i??????2??????????y
:Hh?????3????^?????pEsV?(??h??Y[X???CCf?;??_?:??NV???~k?BW???????e_>???$????$P?~t???????
???K

#>C?`$???????_??c?? ,&"??Y?????(h??
&?=f??-?$??~?2Lw????????[<?????5A8???/A??1??{???????
h?'w?^???$???L?z?K3IBCq???Q?c?Z????G????????M3??"???????????? ?
Y??]|????9?????Z??^<C(?f???C????L??
?1B?Z?_??1<R
?`a.??w/
??????W????
#8?V??
s\ ?????i??????zq??p?:??)?????o???Z,+???#?O????????JU.??K??%do?$`
?R^
????-B_?=???B???r?_?????M??x?%?????r??#???,?
?]????vQHr????\?
???????g??

?g?sn???<??_Em???6'??C?''b?

hU?'??k??????)?/?
???pF6d	?<|!?)
kGs`1?c?O??G<??G?<]?Ot	
O??[?=Wg?????????!{O}L??<[??9????0H?H?\??
$?????a?
??(?K?i??X?|0
???<p??w??25}kB]499h??r!??~?m
[...25817 lines suppressed...]
?
t&??????|	l;M?m{??/h???[w?`i.C???G-_=?
4*?~
,8???4;?Wf??????Bo	
?v???t???Pu??????{Xg????3EBC5W??x???M?i*/???u2t?????Hx?+@????}?
?Fs'

>6??fkT?P??k??!6?????:?_'?p?-e
?i??|??@}??????
?uLx>(?F?]K3
N??	??.??8?^?CS4@:+I??3!?tI*???	75?,????
&sb?????z?????????>?by?~???H

?K?X??V ?!`kx???|??
 _
?5????%??9?alu?R	????????4??????@?\???k??_
?AWU
/Zq?W?9?w:??=P?}(x??$?E????????/?>@~??E?4?
???|?[?!~???R?vW?*??u??$?(??1_3???????v??~??I`2??Pt?? k{??'??*@?{?????????i???0@????????%?,??p?W?T'??????,m??[?????cX???3c?*??{%?N?@???????d?@bh??????

-?f?pb?t?$?
?I1WdV?&`	? 4?
???IM??M I`?!j?)h5
lo????w???k??l??of?t1N?i&?@?HB
?Zm?
UD??$UY???k6U??3??<??pqvv??k??????g?i????????
L?????Q]?L?zkN???cDO?K4?`

??,?25}c/$/??(~?!???Am??Qx5[????yw????n
?m?W?%??b
@X
?C?gjn???!???j?{?A?????????Q??W
E$V
?nb


4??????8?/6/??n?l????o8???????,??t???????~?m???????_???3N?d1?????????J?????}??y?Cb2rn??.M?b1???r?L6d?u/??l?}N???S+<*`H8?Z???]?{?? 
??????k?U??z??????????9=?dW????????r??tX\F4
e??8???[
?+g}?t?}?GN2?KJT}	?JM?~?|????Z????????f?	???re???+???

??8????6
_A???MB??e:!2?y?~??r?


`L?
MZ?Kb?""'%kod??????o??/?,IW>u???(0?gp|?????X??L?k?$
?4?~ys??d???<
b&??S?8,
?
??C?kv?{.Q?????b?????????7?~?s~?
?
o???q?ej???d?`}?.`r??rfgr(???Pc?????Kf5?
 FH?$E?54???a???? ?{?e?e,9????]<:f???6??X}?

?p
6OZ3?B?AD?h
v??w????6?O???>?????0?=?MSm7?a??9J??????F
r?5I%?wn?~?y?&?????3~F?Y????????yH?\?>|R?f?dj?=k?N?%)N????a?
???M??????????z???x?&?|?.?u??c????9pgi
8?up??J`??
39??~??g6?r?????5??@???vK?6???w??['9}?????}?{0?0??o??????>
?o?6??,``?_??z???????]???9?
??>?L%??!??????pm?????9
K-
?!%?"?H%E+??I????G>????u??U???
??n? 
pjes???O??sg?m?D?????L???*??2{0??/?M0U\?q?
?? 	????R>@;??B??}?N??&???????b?9???D?kM?e???1?	fD?`?gn?\?
H???????5??,??.?~?	?/3?5CVW?=ch?I?T?????
?6`AK)	>y4?
?5d?H???`?."MRb?@?T?M????L0+'???????V?U?ibR@
?H_$`?L#?i??,
?5d=J???(????????????

??
????????????k?-5?]y2??	
???K?9p????2??N?E]{??.?*O?????3??m[\?=#"???fz<??k?En$?;?~?+????~L?n at 4?wJ?e ????C?=?F?%kL?????N?';
??p?
??~q??N?P???????a?
?

`?u	4?
?5???

,?ZY?;?????"o??@ru?????[?e???v?L^??????+
M???d
?? %???<4#???!?%?????MK???N
?1??
???;?
jgV_/?k;???F???????????L~ ???t?s?q.???>???????#?6
???a????????O??u???9??37;??w
n??NA??w3l]???X0?Z??M????S????3????T?:[@Y??v
0??r,A??=??x9?
???N?}

?E@#KJ??S???;?C?=$?d?wW???Y?k???4?bq????6??,7????}????????y:???????`y?C?=?????.1??{???_???7?[t??0G?%.???-???DX?&UBH+?
Hy4y>Pw?_?
U2q???lh?e?s?T4-?B?elc?P)-
?????60?
???hV???Z???
&&????w??f*E?
???
:xk??????????n??d?Y????????y77p????E??;??b?aO???????>s??)?j.@?
?e?????
HqV(??:^G?+:???6?????RK
?C?>????lL'E?
????????hC%Kf
?eWS????I????x?J??o7?{?????z7+?n??5.???????i?3???w??l?????nN??)?9????????gl>?o????u??Ny
iV??[pP5????^B,??L)??? ????\????0

???g?r?????c????|????a????
?>??x?V??s??Mmh?I?>3??_j???f??l???0?:?/????Y????????????l8?????3???O????>??l????).r????c?{?2?a?dg??>L?=??nm??????S??s??3?a?a?V?w??C?{??f=?M]????fN??s:9gq?l
?^????/S??]?.~???+???????????TG
??P$?2?)
??3????p???????"??Z??$?

?PuT?g?????M?
??='?/?pvu?3f?i??g?????????????y???6|8??UUg??v{?????2??w??W??rC@???T???h?T??W
??XV????J
J2?
xA?u?\???T~]?Z ?`????m!

nXa??????:!;{\??

%4??]?m?i?JQ?dA

?~??f
??"BU%3
8??s??????@}?n~???Cn8p6??N?
???P8?.?F?U?*%?

?! ?%?

J???
*	?e<??
???l??????TBn?uNf?g?MX?_??9???g??9?g???e&??~????>??o???L?=s?w???p:?u6Tf?7????????t???T?????,?{??g?:??T'????V??e??
_?c???y???????}k?&?/?hR?i?@:?????????
????
?B??F?a?FT??$3	
???x?j?o?e?x?j?o?e?x?j?o?e

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$

--- NEW FILE license.txt ---
Creative Commons Legal Code
Attribution 1.0
CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS DRAFT LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE.
License 
THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE IS PROHIBITED. 
BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. 
1. Definitions 
a."Collective Work" means a work, such as a periodical issue, anthology or encyclopedia, in which the Work in its entirety in unmodified form, along with a number of other contributions, constituting separate and independent works in themselves, are assembled into a collective whole. A work that constitutes a Collective Work will not be considered a Derivative Work (as defined below) for the purposes of this License. 
b."Derivative Work" means a work based upon the Work or upon the Work and other pre-existing works, such as a translation, musical arrangement, dramatization, fictionalization, motion picture version, sound recording, art reproduction, abridgment, condensation, or any other form in which the Work may be recast, transformed, or adapted, except that a work that constitutes a Collective Work will not be considered a Derivative Work for the purpose of this License. 
c."Licensor" means the individual or entity that offers the Work under the terms of this License. 
d."Original Author" means the individual or entity who created the Work. 
e."Work" means the copyrightable work of authorship offered under the terms of this License. 
f."You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation. 
2. Fair Use Rights. Nothing in this license is intended to reduce, limit, or restrict any rights arising from fair use, first sale or other limitations on the exclusive rights of the copyright owner under copyright law or other applicable laws. 
3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below: 
a.to reproduce the Work, to incorporate the Work into one or more Collective Works, and to reproduce the Work as incorporated in the Collective Works; 
b.to create and reproduce Derivative Works; 
c.to distribute copies or phonorecords of, display publicly, perform publicly, and perform publicly by means of a digital audio transmission the Work including as incorporated in Collective Works; 
d.to distribute copies or phonorecords of, display publicly, perform publicly, and perform publicly by means of a digital audio transmission Derivative Works; 
The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. All rights not expressly granted by Licensor are hereby reserved. 
4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions: 
a.You may distribute, publicly display, publicly perform, or publicly digitally perform the Work only under the terms of this License, and You must include a copy of, or the Uniform Resource Identifier for, this License with every copy or phonorecord of the Work You distribute, publicly display, publicly perform, or publicly digitally perform. You may not offer or impose any terms on the Work that alter or restrict the terms of this License or the recipients' exercise of the rights granted hereunder. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties. You may not distribute, publicly display, publicly perform, or publicly digitally perform the Work with any technological measures that control access or use of the Work in a manner inconsistent with the terms of this License Agreement. The above applies to the Work as incorporated in a Collective Work, but this does not require the Collective Work ap!
 art from the Work itself to be made subject to the terms of this License. If You create a Collective Work, upon notice from any Licensor You must, to the extent practicable, remove from the Collective Work any reference to such Licensor or the Original Author, as requested. If You create a Derivative Work, upon notice from any Licensor You must, to the extent practicable, remove from the Derivative Work any reference to such Licensor or the Original Author, as requested. 
b.If you distribute, publicly display, publicly perform, or publicly digitally perform the Work or any Derivative Works or Collective Works, You must keep intact all copyright notices for the Work and give the Original Author credit reasonable to the medium or means You are utilizing by conveying the name (or pseudonym if applicable) of the Original Author if supplied; the title of the Work if supplied; in the case of a Derivative Work, a credit identifying the use of the Work in the Derivative Work (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). Such credit may be implemented in any reasonable manner; provided, however, that in the case of a Derivative Work or Collective Work, at a minimum such credit will appear where any other comparable authorship credit appears and in a manner at least as prominent as such other comparable authorship credit. 
5. Representations, Warranties and Disclaimer
a.By offering the Work for public release under this License, Licensor represents and warrants that, to the best of Licensor's knowledge after reasonable inquiry: 
i.Licensor has secured all rights in the Work necessary to grant the license rights hereunder and to permit the lawful exercise of the rights granted hereunder without You having any obligation to pay any royalties, compulsory license fees, residuals or any other payments; 
b.The Work does not infringe the copyright, trademark, publicity rights, common law rights or any other right of any third party or constitute defamation, invasion of privacy or other tortious injury to any third party. 
c.EXCEPT AS EXPRESSLY STATED IN THIS LICENSE OR OTHERWISE AGREED IN WRITING OR REQUIRED BY APPLICABLE LAW, THE WORK IS LICENSED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES REGARDING THE CONTENTS OR ACCURACY OF THE WORK. 
6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, AND EXCEPT FOR DAMAGES ARISING FROM LIABILITY TO A THIRD PARTY RESULTING FROM BREACH OF THE WARRANTIES IN SECTION 5, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 
7. Termination 
a.This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Derivative Works or Collective Works from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License. 
b.Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above. 
8. Miscellaneous 
a.Each time You distribute or publicly digitally perform the Work or a Collective Work, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License. 
b.Each time You distribute or publicly digitally perform a Derivative Work, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License. 
c.If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. 
d.No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent. 
e.This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You. 
Creative Commons is not a party to this License, and makes no warranty whatsoever in connection with the Work. Creative Commons will not be liable to You or any party on any legal theory for any damages whatsoever, including without limitation any general, special, incidental or consequential damages arising in connection to this license. Notwithstanding the foregoing two (2) sentences, if Creative Commons has expressly identified itself as the Licensor hereunder, it shall have all rights and obligations of Licensor. 
Except for the limited purpose of indicating to the public that the Work is licensed under the CCPL, neither party will use the trademark "Creative Commons" or any related trademark or logo of Creative Commons without the prior written consent of Creative Commons. Any permitted use will be in compliance with Creative Commons' then-current trademark usage guidelines, as may be published on its website or otherwise made available upon request from time to time.
Creative Commons may be contacted at http://creativecommons.org/.


--- NEW FILE raidem-music.spec ---
Name:           raidem-music
Version:        1.0
Release:        1%{?dist}
Summary:        Background music for the game raidem
Group:          Amusements/Games
License:        Creative Commons BY / Attribution
URL:            http://www.dilvie.com/
Source0:        http://www.dilvie.com/music/dilvie_-_the_dragonfly.ogg
# transcoded from: http://www.dilvie.com/music/dilvie_-_up_in_ashes.mp3
Source1:        dilvie_-_up_in_ashes.ogg
Source2:	http://www.dilvie.com/music/dilvie_-_half_baked.ogg
Source3:        http://www.dilvie.com/music/dilvie_-_east_of_the_sun.ogg
Source4:        license.txt
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Buildarch:      noarch
Requires:       raidem >= 0.3.1

%description
Music created by Eric Hamilton (dilvie) for the game Raid'em


%prep
%setup -q -c -T
cp %{SOURCE4} .


%build
# nothing todo content only


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/raidem/music/menu
install -p -m 644 %{SOURCE0} $RPM_BUILD_ROOT%{_datadir}/raidem/music/menu
mkdir -p $RPM_BUILD_ROOT%{_datadir}/raidem/music/level1
install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/raidem/music/level1
mkdir -p $RPM_BUILD_ROOT%{_datadir}/raidem/music/level2
install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/raidem/music/level2
mkdir -p $RPM_BUILD_ROOT%{_datadir}/raidem/music/level3
install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/raidem/music/level3


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc license.txt
%{_datadir}/raidem/music


%changelog
* Sat Apr 29 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-1
- Initial spec file



From fedora-extras-commits at redhat.com  Sun Apr 30 21:27:53 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 30 Apr 2006 14:27:53 -0700
Subject: rpms/pl/devel .cvsignore,1.7,1.8 pl.spec,1.23,1.24 sources,1.7,1.8
Message-ID: <200604302127.k3ULRtbw026792@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/pl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26729/devel

Modified Files:
	.cvsignore pl.spec sources 
Log Message:
new version 5.6.12


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pl/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	8 Mar 2006 19:18:52 -0000	1.7
+++ .cvsignore	30 Apr 2006 21:27:52 -0000	1.8
@@ -1,3 +1,3 @@
-HTMLmanual.tar.gz
-pl-5.6.7.tar.gz
 userguide.html.tgz
+pl-5.6.12.tar.gz
+HTMLmanual.tar.gz


Index: pl.spec
===================================================================
RCS file: /cvs/extras/rpms/pl/devel/pl.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- pl.spec	8 Mar 2006 19:18:52 -0000	1.23
+++ pl.spec	30 Apr 2006 21:27:53 -0000	1.24
@@ -1,5 +1,5 @@
 Name:		pl
-Version:	5.6.7
+Version:	5.6.12
 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.7.tar.gz
+Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.12.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
@@ -95,6 +95,9 @@
 
 
 %changelog
+* Sun Apr 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.6.12-1
+- new version 5.6.12
+
 * Wed Mar  8 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.6.7-1
 - new version 5.6.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pl/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	8 Mar 2006 19:18:52 -0000	1.7
+++ sources	30 Apr 2006 21:27:53 -0000	1.8
@@ -1,3 +1,3 @@
-f1691c99e00622145c00d50caf4aef08  HTMLmanual.tar.gz
-63f8a2dd6a48333fb1f848f78c1c5409  pl-5.6.7.tar.gz
 72feb8797f134c45be719133873cae1f  userguide.html.tgz
+ba25b23284b0ea6563c060e666500e1f  pl-5.6.12.tar.gz
+ad62344ae892832ad2d450f7193e13e0  HTMLmanual.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 30 21:27:52 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 30 Apr 2006 14:27:52 -0700
Subject: rpms/pl/FC-5 .cvsignore,1.7,1.8 pl.spec,1.23,1.24 sources,1.7,1.8
Message-ID: <200604302127.k3ULRsUO026786@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/pl/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26729/FC-5

Modified Files:
	.cvsignore pl.spec sources 
Log Message:
new version 5.6.12


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	8 Mar 2006 19:18:52 -0000	1.7
+++ .cvsignore	30 Apr 2006 21:27:52 -0000	1.8
@@ -1,3 +1,3 @@
-HTMLmanual.tar.gz
-pl-5.6.7.tar.gz
 userguide.html.tgz
+pl-5.6.12.tar.gz
+HTMLmanual.tar.gz


Index: pl.spec
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-5/pl.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- pl.spec	8 Mar 2006 19:18:52 -0000	1.23
+++ pl.spec	30 Apr 2006 21:27:52 -0000	1.24
@@ -1,5 +1,5 @@
 Name:		pl
-Version:	5.6.7
+Version:	5.6.12
 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.7.tar.gz
+Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.12.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
@@ -95,6 +95,9 @@
 
 
 %changelog
+* Sun Apr 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.6.12-1
+- new version 5.6.12
+
 * Wed Mar  8 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.6.7-1
 - new version 5.6.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	8 Mar 2006 19:18:52 -0000	1.7
+++ sources	30 Apr 2006 21:27:52 -0000	1.8
@@ -1,3 +1,3 @@
-f1691c99e00622145c00d50caf4aef08  HTMLmanual.tar.gz
-63f8a2dd6a48333fb1f848f78c1c5409  pl-5.6.7.tar.gz
 72feb8797f134c45be719133873cae1f  userguide.html.tgz
+ba25b23284b0ea6563c060e666500e1f  pl-5.6.12.tar.gz
+ad62344ae892832ad2d450f7193e13e0  HTMLmanual.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 30 21:27:51 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 30 Apr 2006 14:27:51 -0700
Subject: rpms/pl/FC-4 .cvsignore,1.7,1.8 pl.spec,1.19,1.20 sources,1.7,1.8
Message-ID: <200604302127.k3ULRr8j026782@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/pl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26729/FC-4

Modified Files:
	.cvsignore pl.spec sources 
Log Message:
new version 5.6.12


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	8 Mar 2006 19:18:46 -0000	1.7
+++ .cvsignore	30 Apr 2006 21:27:51 -0000	1.8
@@ -1,3 +1,3 @@
-HTMLmanual.tar.gz
-pl-5.6.7.tar.gz
 userguide.html.tgz
+pl-5.6.12.tar.gz
+HTMLmanual.tar.gz


Index: pl.spec
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-4/pl.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- pl.spec	8 Mar 2006 19:18:46 -0000	1.19
+++ pl.spec	30 Apr 2006 21:27:51 -0000	1.20
@@ -1,5 +1,5 @@
 Name:		pl
-Version:	5.6.7
+Version:	5.6.12
 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.7.tar.gz
+Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.12.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
@@ -85,6 +85,9 @@
 
 
 %changelog
+* Sun Apr 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.6.12-1
+- new version 5.6.12
+
 * Wed Mar  8 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.6.7-1
 - new version 5.6.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	8 Mar 2006 19:18:46 -0000	1.7
+++ sources	30 Apr 2006 21:27:51 -0000	1.8
@@ -1,3 +1,3 @@
-f1691c99e00622145c00d50caf4aef08  HTMLmanual.tar.gz
-63f8a2dd6a48333fb1f848f78c1c5409  pl-5.6.7.tar.gz
 72feb8797f134c45be719133873cae1f  userguide.html.tgz
+ba25b23284b0ea6563c060e666500e1f  pl-5.6.12.tar.gz
+ad62344ae892832ad2d450f7193e13e0  HTMLmanual.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 30 21:41:16 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 30 Apr 2006 14:41:16 -0700
Subject: owners owners.list,1.926,1.927
Message-ID: <200604302141.k3ULfIfT026984@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26967/owners

Modified Files:
	owners.list 
Log Message:
unorphan monkey-bubble


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.926
retrieving revision 1.927
diff -u -r1.926 -r1.927
--- owners.list	30 Apr 2006 16:50:01 -0000	1.926
+++ owners.list	30 Apr 2006 21:41:16 -0000	1.927
@@ -760,7 +760,7 @@
 Fedora Extras|mod_suphp|An apache2 module for executing PHP scripts with the permissions of their owners|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|moin|MoinMoin is a Python clone of WikiWiki|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|moin-latex|LaTeX plugin for the MoinMoin wiki|ed at eh3.com|extras-qa at fedoraproject.org|
-Fedora Extras|monkey-bubble|Game in the spirit of Frozen Bubble|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|monkey-bubble|Game in the spirit of Frozen Bubble|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|michael at knox.net.nz
 Fedora Extras|monotone|A free, distributed version control system|roland at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|moodle|A Course Management System|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|moodss|Powerful modular monitoring graphical application|jfontain at free.fr|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Apr 30 21:58:26 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 30 Apr 2006 14:58:26 -0700
Subject: rpms/monkey-bubble/devel .cvsignore, 1.2, 1.3 monkey-bubble.spec,
	1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200604302158.k3ULwSVt027054@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/monkey-bubble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27033

Modified Files:
	.cvsignore monkey-bubble.spec sources 
Log Message:
* Sat Apr 29 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.2-1
- New upstream version 0.3.2
- Add a patch to make it use gstreamer-0.10 instead of 0.8
- Add a patch to fix some warnings
- Properly install the icon
- Fix the scripts to properly handle the GConf schemas and call
  scrollkeeper-update. Don't call ldconfig as there is no lib.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monkey-bubble/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:52:25 -0000	1.2
+++ .cvsignore	30 Apr 2006 21:58:26 -0000	1.3
@@ -1 +1 @@
-monkey-bubble-0.1.6.tar.gz
+monkey-bubble-0.3.2.tar.gz


Index: monkey-bubble.spec
===================================================================
RCS file: /cvs/extras/rpms/monkey-bubble/devel/monkey-bubble.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- monkey-bubble.spec	2 Mar 2006 21:30:57 -0000	1.3
+++ monkey-bubble.spec	30 Apr 2006 21:58:26 -0000	1.4
@@ -1,55 +1,47 @@
-Name:           monkey-bubble
-Version:        0.1.6
-Release:        1
-Summary:        Game in the spirit of Frozen Bubble
-
-Group:          Amusements/Games
-License:        GPL
-URL:            http://monkey-bubble.tuxfamily.org/
-Source0:        http://monkey-bubble.tuxfamily.org/monkey-bubble-0.1.6.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  libgnomeui-devel
-BuildRequires:  librsvg2-devel
-BuildRequires:  gstreamer-devel
-BuildRequires:  libcroco-devel
-BuildRequires:  pkgconfig
-BuildRequires:  gettext
-BuildRequires:  desktop-file-utils
-Requires(post): GConf2
+Name:             monkey-bubble
+Version:          0.3.2
+Release:          1%{?dist}
+Summary:          Game in the spirit of Frozen Bubble
+Group:            Amusements/Games
+License:          GPL
+URL:              http://monkey-bubble.tuxfamily.org/
+Source0:          http://monkey-bubble.tuxfamily.org/%{name}-%{version}.tar.gz
+Patch0:           monkey-bubble-0.3.2-gstreamer.patch
+Patch1:           monkey-bubble-0.3.2-fixes.patch
+BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:    libgnomeui-devel librsvg2-devel gstreamer-devel gettext
+BuildRequires:    desktop-file-utils
+Requires(pre):    GConf2
+Requires(post):   GConf2 scrollkeeper
+Requires(preun):  GConf2
+Requires(postun): scrollkeeper
 
 %description
-Monkey Bubble is a bust'a'move clone built using Gnometechnologies. It
+Monkey Bubble is a bust'a'move clone built using Gnome technologies. It
 currently supports 1 and 2 player games, is levelcompatible with frozen bubble,
-and features svg vector graphics forresolution independent display.
-
+and features svg vector graphics for resolution independent display.
 
 
 %prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
-
 %setup -q
+%patch0 -p1 -z .gstreamer
+%patch1 -p1 -z .fixes
+%{__sed} -i s/monkey-bubble-icon/monkey-bubble/ %{name}.desktop.in
 
 
 %build
+export CFLAGS="$RPM_OPT_FLAGS -Wno-pointer-sign"
 %configure --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}
 
-find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
-install -p -D -m0644 ./pixmaps/monkey-bubble-icon.xpm ${RPM_BUILD_ROOT}/%{_datadir}/pixmaps/monkey-bubble-icon.xpm
+# below is the desktop file and icon stuff.
 desktop-file-install --vendor fedora --delete-original \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications      \
   --add-category X-Fedora                              \
@@ -57,41 +49,69 @@
   --add-category Game                                  \
   ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
+mv ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/monkey-bubble-icon.png \
+  ${RPM_BUILD_ROOT}/%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+rmdir ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
 
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
 
+%pre
+if [ "$1" -gt 1 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
+fi
 
 %post
-/sbin/ldconfig
-export GCONF_CONFIG_SOURCE="$(gconftool-2 --get-default-source)"
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null
-
-
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+/usr/bin/gconftool-2 --makefile-install-rule \
+  %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+%preun
+if [ "$1" -eq 0 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
+fi
 
 %postun
-/sbin/ldconfig
-
+scrollkeeper-update -q || :
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
-%config %{_sysconfdir}/gconf/schemas/*
-%{_bindir}/monkey*
-%{_libdir}/*.*
+%config %{_sysconfdir}/gconf/schemas/%{name}.schemas
+%{_bindir}/monkey-*
 %{_datadir}/%{name}
+%{_datadir}/gnome
+%{_datadir}/omf
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/pixmaps/*
-
-%exclude %{_bindir}/gsttest
-%exclude %{_libdir}/*so
-
+%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 
 
 %changelog
+* Sat Apr 29 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.2-1
+- New upstream version 0.3.2
+- Add a patch to make it use gstreamer-0.10 instead of 0.8
+- Add a patch to fix some warnings
+- Properly install the icon
+- Fix the scripts to properly handle the GConf schemas and call
+  scrollkeeper-update. Don't call ldconfig as there is no lib.
+
 * Fri Nov 21 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.1.6-0.fdr.4
 - Drop .so files (for real this time).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monkey-bubble/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:52:25 -0000	1.2
+++ sources	30 Apr 2006 21:58:26 -0000	1.3
@@ -1 +1 @@
-cba30bf4d1a33048cb9317b8893088c8  monkey-bubble-0.1.6.tar.gz
+37e91fa4cdbab9ec06b2ee2a5aa0683c  monkey-bubble-0.3.2.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 30 21:59:42 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 30 Apr 2006 14:59:42 -0700
Subject: rpms/monkey-bubble/devel monkey-bubble-0.3.2-fixes.patch, NONE,
	1.1 monkey-bubble-0.3.2-gstreamer.patch, NONE, 1.1
Message-ID: <200604302159.k3ULxist027121@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/monkey-bubble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27100

Added Files:
	monkey-bubble-0.3.2-fixes.patch 
	monkey-bubble-0.3.2-gstreamer.patch 
Log Message:
* Sat Apr 29 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.2-1
- New upstream version 0.3.2
- Add a patch to make it use gstreamer-0.10 instead of 0.8
- Add a patch to fix some warnings
- Properly install the icon
- Fix the scripts to properly handle the GConf schemas and call
  scrollkeeper-update. Don't call ldconfig as there is no lib.


monkey-bubble-0.3.2-fixes.patch:

--- NEW FILE monkey-bubble-0.3.2-fixes.patch ---
--- monkey-bubble-0.3.2/src/ui/ui-network-client.c.fixes	2004-06-29 08:53:46.000000000 +0200
+++ monkey-bubble-0.3.2/src/ui/ui-network-client.c	2006-04-30 21:02:10.000000000 +0200
@@ -145,21 +145,21 @@
        list = gtk_list_store_new(3,G_TYPE_STRING,G_TYPE_BOOLEAN,G_TYPE_BOOLEAN);
 
         column = gtk_tree_view_column_new_with_attributes("Player name",gtk_cell_renderer_text_new(),
-                                                          "text",0);
+                                                          "text",0, (char *)NULL);
 
         gtk_tree_view_append_column (GTK_TREE_VIEW (item), column);
 
         column = gtk_tree_view_column_new();
 
         column = gtk_tree_view_column_new_with_attributes("Owner",gtk_cell_renderer_toggle_new(),
-                                                          "active",1);
+                                                          "active",1, (char *)NULL);
 
         gtk_tree_view_append_column (GTK_TREE_VIEW (item), column);
 
         column = gtk_tree_view_column_new();
 
         column = gtk_tree_view_column_new_with_attributes("Ready",gtk_cell_renderer_toggle_new(),
-                                                          "active",2);
+                                                          "active",2, (char *)NULL);
 
         gtk_tree_view_append_column (GTK_TREE_VIEW (item), column);
 
--- monkey-bubble-0.3.2/src/ui/ui-network-server.c.fixes	2004-06-29 08:53:46.000000000 +0200
+++ monkey-bubble-0.3.2/src/ui/ui-network-server.c	2006-04-30 21:02:10.000000000 +0200
@@ -155,21 +155,21 @@
        list = gtk_list_store_new(3,G_TYPE_STRING,G_TYPE_BOOLEAN,G_TYPE_BOOLEAN);
 
         column = gtk_tree_view_column_new_with_attributes("Player name",gtk_cell_renderer_text_new(),
-                                                          "text",0);
+                                                          "text",0, (char *)NULL);
 
         gtk_tree_view_append_column (GTK_TREE_VIEW (item), column);
 
         column = gtk_tree_view_column_new();
 
         column = gtk_tree_view_column_new_with_attributes("Owner",gtk_cell_renderer_toggle_new(),
-                                                          "active",1);
+                                                          "active",1, (char *)NULL);
 
         gtk_tree_view_append_column (GTK_TREE_VIEW (item), column);
 
         column = gtk_tree_view_column_new();
 
         column = gtk_tree_view_column_new_with_attributes("Ready",gtk_cell_renderer_toggle_new(),
-                                                          "active",2);
+                                                          "active",2, (char *)NULL);
 
         gtk_tree_view_append_column (GTK_TREE_VIEW (item), column);
 
--- monkey-bubble-0.3.2/src/ui/eggcellrendererkeys.c.fixes	2004-06-29 08:53:44.000000000 +0200
+++ monkey-bubble-0.3.2/src/ui/eggcellrendererkeys.c	2006-04-30 21:05:22.000000000 +0200
@@ -519,6 +519,7 @@
   EggCellRendererKeys *keys;
   GtkWidget *label;
   GtkWidget *eventbox;
+  GtkWidget **double_ptr;
   
   celltext = GTK_CELL_RENDERER_TEXT (cell);
   keys = EGG_CELL_RENDERER_KEYS (cell);
@@ -551,8 +552,9 @@
   eventbox = g_object_new (pointless_eventbox_subclass_get_type (),
                            NULL);
   keys->edit_widget = eventbox;
+  double_ptr = &(keys->edit_widget);
   g_object_add_weak_pointer (G_OBJECT (keys->edit_widget),
-                             (void**) &keys->edit_widget);
+                             (void**) double_ptr);
   
   label = gtk_label_new (NULL);
   gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
@@ -586,9 +588,9 @@
 }
 
 void
-egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys *keys,
-                                        guint                keyval,
-                                        GdkModifierType      mask)
+egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys   *keys,
+                                        guint                  keyval,
+                                        EggVirtualModifierType mask)
 {
   char *text;
   gboolean changed;
@@ -628,9 +630,9 @@
 }
 
 void
-egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys *keys,
-                                        guint               *keyval,
-                                        GdkModifierType     *mask)
+egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys    *keys,
+                                        guint                  *keyval,
+                                        EggVirtualModifierType *mask)
 {
   g_return_if_fail (EGG_IS_CELL_RENDERER_KEYS (keys));
 

monkey-bubble-0.3.2-gstreamer.patch:

--- NEW FILE monkey-bubble-0.3.2-gstreamer.patch ---
--- monkey-bubble-0.3.2/configure.in.gstreamer	2004-07-02 08:37:35.000000000 +0200
+++ monkey-bubble-0.3.2/configure.in	2006-04-30 22:06:54.000000000 +0200
@@ -68,8 +68,7 @@
 PKG_CHECK_MODULES(LIBMONKEYAUDIO_A,[
 	gtk+-2.0
 	gthread-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	])
 AC_SUBST(LIBMONKEYAUDIO_A_CFLAGS)
 AC_SUBST(LIBMONKEYAUDIO_A_LIBS)
@@ -88,8 +87,7 @@
 	gthread-2.0
 	librsvg-2.0
 	libgnomeui-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	gconf-2.0
 	libglade-2.0
 	])
--- monkey-bubble-0.3.2/src/audio/sound-manager.c.gstreamer	2004-07-02 08:30:15.000000000 +0200
+++ monkey-bubble-0.3.2/src/audio/sound-manager.c	2006-04-30 22:26:35.000000000 +0200
@@ -20,7 +20,6 @@
 #include "sound-manager.h"
 #include "playground.h"
 #include <gst/gst.h>
-#include <gst/gconf/gconf.h>
 #define PRIVATE(sound_manager) (sound_manager->private)
 
 static GObjectClass* parent_class = NULL;
@@ -28,17 +27,11 @@
 struct SoundManagerPrivate {
   GstElement * main_bin;
   GstElement * filesrc;
-    GstElement * oggdemux;
+  GstElement * oggdemux;
   GstElement * vorbis_dec;
-    GstElement * audioconvert;
+  GstElement * audioconvert;
   GstElement * output;
-
-	 gboolean new_pad_ok;
-  gboolean is_playing;
-  gint idle_id;
-
-	 GThread * loop_thread;
-	 gchar * current_music_path;
+  gchar * current_music_path;
 };
 
 
@@ -119,16 +112,31 @@
 	 return FALSE;
 }
 
-static void eos(GstElement *e ,gpointer user_data) {
-    g_print("end of fie..\n");
-
-	 //	 	 g_idle_add(ck,user_data);
-	 // g_idle_add(start_play,mbin);
-	 g_timeout_add(100, restart_play,user_data);
-}
-static void error_handler(GstElement * e,GObject * o,gchar * string,gpointer data) {
-    g_print("error : %s\n",string);
+static gboolean
+bus_call (GstBus     *bus,
+	  GstMessage *msg,
+	  gpointer    data)
+{
+  switch (GST_MESSAGE_TYPE (msg)) {
+    case GST_MESSAGE_EOS:
+      g_timeout_add(100, restart_play, data);
+      break;
+    case GST_MESSAGE_ERROR: {
+      gchar *debug;
+      GError *err;
+
+      gst_message_parse_error (msg, &err, &debug);
+      g_free (debug);
+
+      g_print ("Error: %s\n", err->message);
+      g_error_free (err);
+      break;
+    }
+    default:
+      break;
+  }
 
+  return TRUE;
 }
 
 
@@ -139,8 +147,7 @@
     sound_manager = SOUND_MANAGER (g_object_new (TYPE_SOUND_MANAGER, NULL));
 
     dp = PRIVATE(sound_manager);
-  
-    dp->is_playing = FALSE;			       
+    dp->main_bin = NULL;			       
     return sound_manager;
 }
 
@@ -148,43 +155,11 @@
 static void
 stop_play(SoundManager * m) 
 {
-
-    if( sound_active) {
-
-		  if( PRIVATE(m)->is_playing ) {
-				
-				PRIVATE(m)->is_playing = FALSE;
-				g_thread_join( PRIVATE(m)->loop_thread);
-
-				gst_element_set_state( PRIVATE(m)->main_bin,GST_STATE_NULL);
-				gst_bin_iterate( GST_BIN(PRIVATE(m)->main_bin));
-		  }
-		  
-
-		  
-		  g_object_unref( G_OBJECT(PRIVATE(m)->main_bin ));
-		  
-		  PRIVATE(m)->output = NULL;
-		  PRIVATE(m)->main_bin = NULL;
-		  PRIVATE(m)->vorbis_dec = NULL;
-		  PRIVATE(m)->filesrc = NULL;
-	 }
-}
-
-static gpointer
-loop(gpointer data) 
-{
-	 SoundManager * m;
-	 m = SOUND_MANAGER(data);
-	 while( PRIVATE(m)->is_playing) {
-		  g_usleep(10*1000);
-		  if( gst_bin_iterate( GST_BIN(PRIVATE(m)->main_bin)) == FALSE) {
-				PRIVATE(m)->is_playing = FALSE;
-		  }		  		  
-		  
-	 }
-
-	 return NULL;
+    if( PRIVATE(m)->main_bin ) {
+	gst_element_set_state( PRIVATE(m)->main_bin,GST_STATE_NULL);
+        g_object_unref( G_OBJECT(PRIVATE(m)->main_bin ));
+        PRIVATE(m)->main_bin = NULL;
+    }
 }
 
 
@@ -193,29 +168,9 @@
 		 GObject *new_pad,
 		 SoundManager * m)
 {
-   
-    gst_element_set_state (PRIVATE(m)->main_bin, GST_STATE_PAUSED);
-
-    gst_bin_add_many(GST_BIN(PRIVATE(m)->main_bin),
-		     PRIVATE(m)->vorbis_dec,
-		     PRIVATE(m)->audioconvert,
-		     PRIVATE(m)->output,
-		     NULL);
-
-  
-  gst_element_link_many(
-		     PRIVATE(m)->vorbis_dec,
-		     PRIVATE(m)->audioconvert,
-		     PRIVATE(m)->output,
-			NULL);
-  
-  GstPad * pad = gst_element_get_pad( GST_ELEMENT(PRIVATE(m)->vorbis_dec),"sink");
-
-  gst_pad_link( GST_PAD(new_pad), pad);
-  PRIVATE(m)->new_pad_ok = TRUE;
-
-    
-  gst_element_set_state (GST_ELEMENT(PRIVATE(m)->main_bin), GST_STATE_PLAYING); 
+  GstPad *sinkpad = gst_element_get_pad (PRIVATE(m)->vorbis_dec, "sink");
+  gst_pad_link (GST_PAD(new_pad), sinkpad);
+  gst_object_unref (sinkpad);
 }
 
 
@@ -223,47 +178,41 @@
 start_play(SoundManager *m, gchar * path) 
 {
   if( sound_active) {
-		PRIVATE(m)->new_pad_ok = FALSE;
 		PRIVATE(m)->main_bin = gst_pipeline_new("bin");
 		PRIVATE(m)->filesrc = gst_element_factory_make("filesrc","filesrc");
 		PRIVATE(m)->oggdemux = gst_element_factory_make("oggdemux","oggdemux");
 		PRIVATE(m)->vorbis_dec = gst_element_factory_make("vorbisdec","vorbisdec");
 		PRIVATE(m)->audioconvert = gst_element_factory_make("audioconvert","audioconvert");
-		PRIVATE(m)->output =  gst_gconf_get_default_audio_sink();
+		PRIVATE(m)->output = gst_element_factory_make ("alsasink", "alsa-output");
 
 		PRIVATE(m)->current_music_path = g_strdup(path);
 
-		g_signal_connect(G_OBJECT(PRIVATE(m)->main_bin),
-							  "error", GTK_SIGNAL_FUNC(error_handler),NULL);
-    
-		g_signal_connect( PRIVATE(m)->oggdemux, "new-pad", G_CALLBACK(oggdemux_new_pad),m);
-		
-		gst_bin_add_many( GST_BIN( PRIVATE(m)->main_bin),
-								PRIVATE(m)->filesrc,
-								PRIVATE(m)->oggdemux,
-								NULL);
-		
 		g_object_set( G_OBJECT( PRIVATE(m)->filesrc), "location",path,NULL);
 		
-		g_object_set( G_OBJECT( PRIVATE(m)->filesrc), "blocksize",10000,NULL);
-		
-		g_signal_connect(PRIVATE(m)->filesrc,
-							  "eos",
-							  G_CALLBACK(eos),
-							  m);
-	 
-		gst_element_link_many( PRIVATE(m)->filesrc, PRIVATE(m)->oggdemux,NULL);
-		
+//		g_object_set( G_OBJECT( PRIVATE(m)->filesrc), "blocksize",10000,NULL);
+                gst_bus_add_watch (gst_pipeline_get_bus (
+                     GST_PIPELINE (PRIVATE(m)->main_bin)),
+		     bus_call, m);
+
+		gst_bin_add_many( GST_BIN( PRIVATE(m)->main_bin),
+                        PRIVATE(m)->filesrc,
+			PRIVATE(m)->oggdemux,
+			PRIVATE(m)->vorbis_dec,
+			PRIVATE(m)->audioconvert,
+			PRIVATE(m)->output,
+			NULL);
+
+
+		gst_element_link( PRIVATE(m)->filesrc, PRIVATE(m)->oggdemux );
+                gst_element_link_many(
+		        PRIVATE(m)->vorbis_dec,
+		        PRIVATE(m)->audioconvert,
+		        PRIVATE(m)->output,
+			NULL);
+		g_signal_connect( PRIVATE(m)->oggdemux, "pad-added",
+		        G_CALLBACK(oggdemux_new_pad), m);
 		
 		gst_element_set_state( PRIVATE(m)->main_bin,GST_STATE_PLAYING);
-		
-		PRIVATE(m)->is_playing = TRUE;
-		
-		while( !PRIVATE(m)->new_pad_ok && gst_bin_iterate( GST_BIN( PRIVATE(m)->main_bin)) && PRIVATE(m)->is_playing );
-		
-		PRIVATE(m)->loop_thread =
-			 g_thread_create( loop,m,TRUE,NULL);
-
   }
 }
 
@@ -271,7 +220,7 @@
 
   g_assert(IS_SOUND_MANAGER(m));
   
-  if( PRIVATE(m)->is_playing == TRUE) {
+  if( PRIVATE(m)->main_bin) {
 		stop_play(m);		
   }
   
--- monkey-bubble-0.3.2/configure.gstreamer	2004-07-02 09:07:24.000000000 +0200
+++ monkey-bubble-0.3.2/configure	2006-04-30 22:06:54.000000000 +0200
@@ -20454,21 +20454,18 @@
         echo "$as_me:$LINENO: checking for
 	gtk+-2.0
 	gthread-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	" >&5
 echo $ECHO_N "checking for
 	gtk+-2.0
 	gthread-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	... $ECHO_C" >&6
 
         if $PKG_CONFIG --exists "
 	gtk+-2.0
 	gthread-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	" ; then
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
@@ -20479,8 +20476,7 @@
             LIBMONKEYAUDIO_A_CFLAGS=`$PKG_CONFIG --cflags "
 	gtk+-2.0
 	gthread-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	"`
             echo "$as_me:$LINENO: result: $LIBMONKEYAUDIO_A_CFLAGS" >&5
 echo "${ECHO_T}$LIBMONKEYAUDIO_A_CFLAGS" >&6
@@ -20490,8 +20486,7 @@
             LIBMONKEYAUDIO_A_LIBS=`$PKG_CONFIG --libs "
 	gtk+-2.0
 	gthread-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	"`
             echo "$as_me:$LINENO: result: $LIBMONKEYAUDIO_A_LIBS" >&5
 echo "${ECHO_T}$LIBMONKEYAUDIO_A_LIBS" >&6
@@ -20503,8 +20498,7 @@
             LIBMONKEYAUDIO_A_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
 	gtk+-2.0
 	gthread-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	"`
             echo $LIBMONKEYAUDIO_A_PKG_ERRORS
         fi
@@ -20523,14 +20517,12 @@
      { { echo "$as_me:$LINENO: error: Library requirements (
 	gtk+-2.0
 	gthread-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
 echo "$as_me: error: Library requirements (
 	gtk+-2.0
 	gthread-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
    { (exit 1); exit 1; }; }
   fi
@@ -20731,8 +20723,7 @@
 	gthread-2.0
 	librsvg-2.0
 	libgnomeui-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	gconf-2.0
 	libglade-2.0
 	" >&5
@@ -20741,8 +20732,7 @@
 	gthread-2.0
 	librsvg-2.0
 	libgnomeui-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	gconf-2.0
 	libglade-2.0
 	... $ECHO_C" >&6
@@ -20752,8 +20742,7 @@
 	gthread-2.0
 	librsvg-2.0
 	libgnomeui-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	gconf-2.0
 	libglade-2.0
 	" ; then
@@ -20768,8 +20757,7 @@
 	gthread-2.0
 	librsvg-2.0
 	libgnomeui-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	gconf-2.0
 	libglade-2.0
 	"`
@@ -20783,8 +20771,7 @@
 	gthread-2.0
 	librsvg-2.0
 	libgnomeui-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	gconf-2.0
 	libglade-2.0
 	"`
@@ -20800,8 +20787,7 @@
 	gthread-2.0
 	librsvg-2.0
 	libgnomeui-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	gconf-2.0
 	libglade-2.0
 	"`
@@ -20824,8 +20810,7 @@
 	gthread-2.0
 	librsvg-2.0
 	libgnomeui-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	gconf-2.0
 	libglade-2.0
 	) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
@@ -20834,8 +20819,7 @@
 	gthread-2.0
 	librsvg-2.0
 	libgnomeui-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	gconf-2.0
 	libglade-2.0
 	) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}



From fedora-extras-commits at redhat.com  Sun Apr 30 22:01:31 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 30 Apr 2006 15:01:31 -0700
Subject: rpms/monkey-bubble/FC-5 monkey-bubble-0.3.2-fixes.patch, NONE,
	1.1 monkey-bubble-0.3.2-gstreamer.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 monkey-bubble.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200604302202.k3UM24k2029353@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/monkey-bubble/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29324

Modified Files:
	.cvsignore monkey-bubble.spec sources 
Added Files:
	monkey-bubble-0.3.2-fixes.patch 
	monkey-bubble-0.3.2-gstreamer.patch 
Log Message:
* Sat Apr 29 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.2-1
- New upstream version 0.3.2
- Add a patch to make it use gstreamer-0.10 instead of 0.8
- Add a patch to fix some warnings
- Properly install the icon
- Fix the scripts to properly handle the GConf schemas and call
  scrollkeeper-update. Don't call ldconfig as there is no lib.


monkey-bubble-0.3.2-fixes.patch:

--- NEW FILE monkey-bubble-0.3.2-fixes.patch ---
--- monkey-bubble-0.3.2/src/ui/ui-network-client.c.fixes	2004-06-29 08:53:46.000000000 +0200
+++ monkey-bubble-0.3.2/src/ui/ui-network-client.c	2006-04-30 21:02:10.000000000 +0200
@@ -145,21 +145,21 @@
        list = gtk_list_store_new(3,G_TYPE_STRING,G_TYPE_BOOLEAN,G_TYPE_BOOLEAN);
 
         column = gtk_tree_view_column_new_with_attributes("Player name",gtk_cell_renderer_text_new(),
-                                                          "text",0);
+                                                          "text",0, (char *)NULL);
 
         gtk_tree_view_append_column (GTK_TREE_VIEW (item), column);
 
         column = gtk_tree_view_column_new();
 
         column = gtk_tree_view_column_new_with_attributes("Owner",gtk_cell_renderer_toggle_new(),
-                                                          "active",1);
+                                                          "active",1, (char *)NULL);
 
         gtk_tree_view_append_column (GTK_TREE_VIEW (item), column);
 
         column = gtk_tree_view_column_new();
 
         column = gtk_tree_view_column_new_with_attributes("Ready",gtk_cell_renderer_toggle_new(),
-                                                          "active",2);
+                                                          "active",2, (char *)NULL);
 
         gtk_tree_view_append_column (GTK_TREE_VIEW (item), column);
 
--- monkey-bubble-0.3.2/src/ui/ui-network-server.c.fixes	2004-06-29 08:53:46.000000000 +0200
+++ monkey-bubble-0.3.2/src/ui/ui-network-server.c	2006-04-30 21:02:10.000000000 +0200
@@ -155,21 +155,21 @@
        list = gtk_list_store_new(3,G_TYPE_STRING,G_TYPE_BOOLEAN,G_TYPE_BOOLEAN);
 
         column = gtk_tree_view_column_new_with_attributes("Player name",gtk_cell_renderer_text_new(),
-                                                          "text",0);
+                                                          "text",0, (char *)NULL);
 
         gtk_tree_view_append_column (GTK_TREE_VIEW (item), column);
 
         column = gtk_tree_view_column_new();
 
         column = gtk_tree_view_column_new_with_attributes("Owner",gtk_cell_renderer_toggle_new(),
-                                                          "active",1);
+                                                          "active",1, (char *)NULL);
 
         gtk_tree_view_append_column (GTK_TREE_VIEW (item), column);
 
         column = gtk_tree_view_column_new();
 
         column = gtk_tree_view_column_new_with_attributes("Ready",gtk_cell_renderer_toggle_new(),
-                                                          "active",2);
+                                                          "active",2, (char *)NULL);
 
         gtk_tree_view_append_column (GTK_TREE_VIEW (item), column);
 
--- monkey-bubble-0.3.2/src/ui/eggcellrendererkeys.c.fixes	2004-06-29 08:53:44.000000000 +0200
+++ monkey-bubble-0.3.2/src/ui/eggcellrendererkeys.c	2006-04-30 21:05:22.000000000 +0200
@@ -519,6 +519,7 @@
   EggCellRendererKeys *keys;
   GtkWidget *label;
   GtkWidget *eventbox;
+  GtkWidget **double_ptr;
   
   celltext = GTK_CELL_RENDERER_TEXT (cell);
   keys = EGG_CELL_RENDERER_KEYS (cell);
@@ -551,8 +552,9 @@
   eventbox = g_object_new (pointless_eventbox_subclass_get_type (),
                            NULL);
   keys->edit_widget = eventbox;
+  double_ptr = &(keys->edit_widget);
   g_object_add_weak_pointer (G_OBJECT (keys->edit_widget),
-                             (void**) &keys->edit_widget);
+                             (void**) double_ptr);
   
   label = gtk_label_new (NULL);
   gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
@@ -586,9 +588,9 @@
 }
 
 void
-egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys *keys,
-                                        guint                keyval,
-                                        GdkModifierType      mask)
+egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys   *keys,
+                                        guint                  keyval,
+                                        EggVirtualModifierType mask)
 {
   char *text;
   gboolean changed;
@@ -628,9 +630,9 @@
 }
 
 void
-egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys *keys,
-                                        guint               *keyval,
-                                        GdkModifierType     *mask)
+egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys    *keys,
+                                        guint                  *keyval,
+                                        EggVirtualModifierType *mask)
 {
   g_return_if_fail (EGG_IS_CELL_RENDERER_KEYS (keys));
 

monkey-bubble-0.3.2-gstreamer.patch:

--- NEW FILE monkey-bubble-0.3.2-gstreamer.patch ---
--- monkey-bubble-0.3.2/configure.in.gstreamer	2004-07-02 08:37:35.000000000 +0200
+++ monkey-bubble-0.3.2/configure.in	2006-04-30 22:06:54.000000000 +0200
@@ -68,8 +68,7 @@
 PKG_CHECK_MODULES(LIBMONKEYAUDIO_A,[
 	gtk+-2.0
 	gthread-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	])
 AC_SUBST(LIBMONKEYAUDIO_A_CFLAGS)
 AC_SUBST(LIBMONKEYAUDIO_A_LIBS)
@@ -88,8 +87,7 @@
 	gthread-2.0
 	librsvg-2.0
 	libgnomeui-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	gconf-2.0
 	libglade-2.0
 	])
--- monkey-bubble-0.3.2/src/audio/sound-manager.c.gstreamer	2004-07-02 08:30:15.000000000 +0200
+++ monkey-bubble-0.3.2/src/audio/sound-manager.c	2006-04-30 22:26:35.000000000 +0200
@@ -20,7 +20,6 @@
 #include "sound-manager.h"
 #include "playground.h"
 #include <gst/gst.h>
-#include <gst/gconf/gconf.h>
 #define PRIVATE(sound_manager) (sound_manager->private)
 
 static GObjectClass* parent_class = NULL;
@@ -28,17 +27,11 @@
 struct SoundManagerPrivate {
   GstElement * main_bin;
   GstElement * filesrc;
-    GstElement * oggdemux;
+  GstElement * oggdemux;
   GstElement * vorbis_dec;
-    GstElement * audioconvert;
+  GstElement * audioconvert;
   GstElement * output;
-
-	 gboolean new_pad_ok;
-  gboolean is_playing;
-  gint idle_id;
-
-	 GThread * loop_thread;
-	 gchar * current_music_path;
+  gchar * current_music_path;
 };
 
 
@@ -119,16 +112,31 @@
 	 return FALSE;
 }
 
-static void eos(GstElement *e ,gpointer user_data) {
-    g_print("end of fie..\n");
-
-	 //	 	 g_idle_add(ck,user_data);
-	 // g_idle_add(start_play,mbin);
-	 g_timeout_add(100, restart_play,user_data);
-}
-static void error_handler(GstElement * e,GObject * o,gchar * string,gpointer data) {
-    g_print("error : %s\n",string);
+static gboolean
+bus_call (GstBus     *bus,
+	  GstMessage *msg,
+	  gpointer    data)
+{
+  switch (GST_MESSAGE_TYPE (msg)) {
+    case GST_MESSAGE_EOS:
+      g_timeout_add(100, restart_play, data);
+      break;
+    case GST_MESSAGE_ERROR: {
+      gchar *debug;
+      GError *err;
+
+      gst_message_parse_error (msg, &err, &debug);
+      g_free (debug);
+
+      g_print ("Error: %s\n", err->message);
+      g_error_free (err);
+      break;
+    }
+    default:
+      break;
+  }
 
+  return TRUE;
 }
 
 
@@ -139,8 +147,7 @@
     sound_manager = SOUND_MANAGER (g_object_new (TYPE_SOUND_MANAGER, NULL));
 
     dp = PRIVATE(sound_manager);
-  
-    dp->is_playing = FALSE;			       
+    dp->main_bin = NULL;			       
     return sound_manager;
 }
 
@@ -148,43 +155,11 @@
 static void
 stop_play(SoundManager * m) 
 {
-
-    if( sound_active) {
-
-		  if( PRIVATE(m)->is_playing ) {
-				
-				PRIVATE(m)->is_playing = FALSE;
-				g_thread_join( PRIVATE(m)->loop_thread);
-
-				gst_element_set_state( PRIVATE(m)->main_bin,GST_STATE_NULL);
-				gst_bin_iterate( GST_BIN(PRIVATE(m)->main_bin));
-		  }
-		  
-
-		  
-		  g_object_unref( G_OBJECT(PRIVATE(m)->main_bin ));
-		  
-		  PRIVATE(m)->output = NULL;
-		  PRIVATE(m)->main_bin = NULL;
-		  PRIVATE(m)->vorbis_dec = NULL;
-		  PRIVATE(m)->filesrc = NULL;
-	 }
-}
-
-static gpointer
-loop(gpointer data) 
-{
-	 SoundManager * m;
-	 m = SOUND_MANAGER(data);
-	 while( PRIVATE(m)->is_playing) {
-		  g_usleep(10*1000);
-		  if( gst_bin_iterate( GST_BIN(PRIVATE(m)->main_bin)) == FALSE) {
-				PRIVATE(m)->is_playing = FALSE;
-		  }		  		  
-		  
-	 }
-
-	 return NULL;
+    if( PRIVATE(m)->main_bin ) {
+	gst_element_set_state( PRIVATE(m)->main_bin,GST_STATE_NULL);
+        g_object_unref( G_OBJECT(PRIVATE(m)->main_bin ));
+        PRIVATE(m)->main_bin = NULL;
+    }
 }
 
 
@@ -193,29 +168,9 @@
 		 GObject *new_pad,
 		 SoundManager * m)
 {
-   
-    gst_element_set_state (PRIVATE(m)->main_bin, GST_STATE_PAUSED);
-
-    gst_bin_add_many(GST_BIN(PRIVATE(m)->main_bin),
-		     PRIVATE(m)->vorbis_dec,
-		     PRIVATE(m)->audioconvert,
-		     PRIVATE(m)->output,
-		     NULL);
-
-  
-  gst_element_link_many(
-		     PRIVATE(m)->vorbis_dec,
-		     PRIVATE(m)->audioconvert,
-		     PRIVATE(m)->output,
-			NULL);
-  
-  GstPad * pad = gst_element_get_pad( GST_ELEMENT(PRIVATE(m)->vorbis_dec),"sink");
-
-  gst_pad_link( GST_PAD(new_pad), pad);
-  PRIVATE(m)->new_pad_ok = TRUE;
-
-    
-  gst_element_set_state (GST_ELEMENT(PRIVATE(m)->main_bin), GST_STATE_PLAYING); 
+  GstPad *sinkpad = gst_element_get_pad (PRIVATE(m)->vorbis_dec, "sink");
+  gst_pad_link (GST_PAD(new_pad), sinkpad);
+  gst_object_unref (sinkpad);
 }
 
 
@@ -223,47 +178,41 @@
 start_play(SoundManager *m, gchar * path) 
 {
   if( sound_active) {
-		PRIVATE(m)->new_pad_ok = FALSE;
 		PRIVATE(m)->main_bin = gst_pipeline_new("bin");
 		PRIVATE(m)->filesrc = gst_element_factory_make("filesrc","filesrc");
 		PRIVATE(m)->oggdemux = gst_element_factory_make("oggdemux","oggdemux");
 		PRIVATE(m)->vorbis_dec = gst_element_factory_make("vorbisdec","vorbisdec");
 		PRIVATE(m)->audioconvert = gst_element_factory_make("audioconvert","audioconvert");
-		PRIVATE(m)->output =  gst_gconf_get_default_audio_sink();
+		PRIVATE(m)->output = gst_element_factory_make ("alsasink", "alsa-output");
 
 		PRIVATE(m)->current_music_path = g_strdup(path);
 
-		g_signal_connect(G_OBJECT(PRIVATE(m)->main_bin),
-							  "error", GTK_SIGNAL_FUNC(error_handler),NULL);
-    
-		g_signal_connect( PRIVATE(m)->oggdemux, "new-pad", G_CALLBACK(oggdemux_new_pad),m);
-		
-		gst_bin_add_many( GST_BIN( PRIVATE(m)->main_bin),
-								PRIVATE(m)->filesrc,
-								PRIVATE(m)->oggdemux,
-								NULL);
-		
 		g_object_set( G_OBJECT( PRIVATE(m)->filesrc), "location",path,NULL);
 		
-		g_object_set( G_OBJECT( PRIVATE(m)->filesrc), "blocksize",10000,NULL);
-		
-		g_signal_connect(PRIVATE(m)->filesrc,
-							  "eos",
-							  G_CALLBACK(eos),
-							  m);
-	 
-		gst_element_link_many( PRIVATE(m)->filesrc, PRIVATE(m)->oggdemux,NULL);
-		
+//		g_object_set( G_OBJECT( PRIVATE(m)->filesrc), "blocksize",10000,NULL);
+                gst_bus_add_watch (gst_pipeline_get_bus (
+                     GST_PIPELINE (PRIVATE(m)->main_bin)),
+		     bus_call, m);
+
+		gst_bin_add_many( GST_BIN( PRIVATE(m)->main_bin),
+                        PRIVATE(m)->filesrc,
+			PRIVATE(m)->oggdemux,
+			PRIVATE(m)->vorbis_dec,
+			PRIVATE(m)->audioconvert,
+			PRIVATE(m)->output,
+			NULL);
+
+
+		gst_element_link( PRIVATE(m)->filesrc, PRIVATE(m)->oggdemux );
+                gst_element_link_many(
+		        PRIVATE(m)->vorbis_dec,
+		        PRIVATE(m)->audioconvert,
+		        PRIVATE(m)->output,
+			NULL);
+		g_signal_connect( PRIVATE(m)->oggdemux, "pad-added",
+		        G_CALLBACK(oggdemux_new_pad), m);
 		
 		gst_element_set_state( PRIVATE(m)->main_bin,GST_STATE_PLAYING);
-		
-		PRIVATE(m)->is_playing = TRUE;
-		
-		while( !PRIVATE(m)->new_pad_ok && gst_bin_iterate( GST_BIN( PRIVATE(m)->main_bin)) && PRIVATE(m)->is_playing );
-		
-		PRIVATE(m)->loop_thread =
-			 g_thread_create( loop,m,TRUE,NULL);
-
   }
 }
 
@@ -271,7 +220,7 @@
 
   g_assert(IS_SOUND_MANAGER(m));
   
-  if( PRIVATE(m)->is_playing == TRUE) {
+  if( PRIVATE(m)->main_bin) {
 		stop_play(m);		
   }
   
--- monkey-bubble-0.3.2/configure.gstreamer	2004-07-02 09:07:24.000000000 +0200
+++ monkey-bubble-0.3.2/configure	2006-04-30 22:06:54.000000000 +0200
@@ -20454,21 +20454,18 @@
         echo "$as_me:$LINENO: checking for
 	gtk+-2.0
 	gthread-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	" >&5
 echo $ECHO_N "checking for
 	gtk+-2.0
 	gthread-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	... $ECHO_C" >&6
 
         if $PKG_CONFIG --exists "
 	gtk+-2.0
 	gthread-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	" ; then
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
@@ -20479,8 +20476,7 @@
             LIBMONKEYAUDIO_A_CFLAGS=`$PKG_CONFIG --cflags "
 	gtk+-2.0
 	gthread-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	"`
             echo "$as_me:$LINENO: result: $LIBMONKEYAUDIO_A_CFLAGS" >&5
 echo "${ECHO_T}$LIBMONKEYAUDIO_A_CFLAGS" >&6
@@ -20490,8 +20486,7 @@
             LIBMONKEYAUDIO_A_LIBS=`$PKG_CONFIG --libs "
 	gtk+-2.0
 	gthread-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	"`
             echo "$as_me:$LINENO: result: $LIBMONKEYAUDIO_A_LIBS" >&5
 echo "${ECHO_T}$LIBMONKEYAUDIO_A_LIBS" >&6
@@ -20503,8 +20498,7 @@
             LIBMONKEYAUDIO_A_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
 	gtk+-2.0
 	gthread-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	"`
             echo $LIBMONKEYAUDIO_A_PKG_ERRORS
         fi
@@ -20523,14 +20517,12 @@
      { { echo "$as_me:$LINENO: error: Library requirements (
 	gtk+-2.0
 	gthread-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
 echo "$as_me: error: Library requirements (
 	gtk+-2.0
 	gthread-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
    { (exit 1); exit 1; }; }
   fi
@@ -20731,8 +20723,7 @@
 	gthread-2.0
 	librsvg-2.0
 	libgnomeui-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	gconf-2.0
 	libglade-2.0
 	" >&5
@@ -20741,8 +20732,7 @@
 	gthread-2.0
 	librsvg-2.0
 	libgnomeui-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	gconf-2.0
 	libglade-2.0
 	... $ECHO_C" >&6
@@ -20752,8 +20742,7 @@
 	gthread-2.0
 	librsvg-2.0
 	libgnomeui-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	gconf-2.0
 	libglade-2.0
 	" ; then
@@ -20768,8 +20757,7 @@
 	gthread-2.0
 	librsvg-2.0
 	libgnomeui-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	gconf-2.0
 	libglade-2.0
 	"`
@@ -20783,8 +20771,7 @@
 	gthread-2.0
 	librsvg-2.0
 	libgnomeui-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	gconf-2.0
 	libglade-2.0
 	"`
@@ -20800,8 +20787,7 @@
 	gthread-2.0
 	librsvg-2.0
 	libgnomeui-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	gconf-2.0
 	libglade-2.0
 	"`
@@ -20824,8 +20810,7 @@
 	gthread-2.0
 	librsvg-2.0
 	libgnomeui-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	gconf-2.0
 	libglade-2.0
 	) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
@@ -20834,8 +20819,7 @@
 	gthread-2.0
 	librsvg-2.0
 	libgnomeui-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	gconf-2.0
 	libglade-2.0
 	) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monkey-bubble/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:52:25 -0000	1.2
+++ .cvsignore	30 Apr 2006 22:01:31 -0000	1.3
@@ -1 +1 @@
-monkey-bubble-0.1.6.tar.gz
+monkey-bubble-0.3.2.tar.gz


Index: monkey-bubble.spec
===================================================================
RCS file: /cvs/extras/rpms/monkey-bubble/FC-5/monkey-bubble.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- monkey-bubble.spec	2 Mar 2006 21:30:57 -0000	1.3
+++ monkey-bubble.spec	30 Apr 2006 22:01:31 -0000	1.4
@@ -1,55 +1,47 @@
-Name:           monkey-bubble
-Version:        0.1.6
-Release:        1
-Summary:        Game in the spirit of Frozen Bubble
-
-Group:          Amusements/Games
-License:        GPL
-URL:            http://monkey-bubble.tuxfamily.org/
-Source0:        http://monkey-bubble.tuxfamily.org/monkey-bubble-0.1.6.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  libgnomeui-devel
-BuildRequires:  librsvg2-devel
-BuildRequires:  gstreamer-devel
-BuildRequires:  libcroco-devel
-BuildRequires:  pkgconfig
-BuildRequires:  gettext
-BuildRequires:  desktop-file-utils
-Requires(post): GConf2
+Name:             monkey-bubble
+Version:          0.3.2
+Release:          1%{?dist}
+Summary:          Game in the spirit of Frozen Bubble
+Group:            Amusements/Games
+License:          GPL
+URL:              http://monkey-bubble.tuxfamily.org/
+Source0:          http://monkey-bubble.tuxfamily.org/%{name}-%{version}.tar.gz
+Patch0:           monkey-bubble-0.3.2-gstreamer.patch
+Patch1:           monkey-bubble-0.3.2-fixes.patch
+BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:    libgnomeui-devel librsvg2-devel gstreamer-devel gettext
+BuildRequires:    desktop-file-utils
+Requires(pre):    GConf2
+Requires(post):   GConf2 scrollkeeper
+Requires(preun):  GConf2
+Requires(postun): scrollkeeper
 
 %description
-Monkey Bubble is a bust'a'move clone built using Gnometechnologies. It
+Monkey Bubble is a bust'a'move clone built using Gnome technologies. It
 currently supports 1 and 2 player games, is levelcompatible with frozen bubble,
-and features svg vector graphics forresolution independent display.
-
+and features svg vector graphics for resolution independent display.
 
 
 %prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
-
 %setup -q
+%patch0 -p1 -z .gstreamer
+%patch1 -p1 -z .fixes
+%{__sed} -i s/monkey-bubble-icon/monkey-bubble/ %{name}.desktop.in
 
 
 %build
+export CFLAGS="$RPM_OPT_FLAGS -Wno-pointer-sign"
 %configure --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}
 
-find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
-install -p -D -m0644 ./pixmaps/monkey-bubble-icon.xpm ${RPM_BUILD_ROOT}/%{_datadir}/pixmaps/monkey-bubble-icon.xpm
+# below is the desktop file and icon stuff.
 desktop-file-install --vendor fedora --delete-original \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications      \
   --add-category X-Fedora                              \
@@ -57,41 +49,69 @@
   --add-category Game                                  \
   ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
+mv ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/monkey-bubble-icon.png \
+  ${RPM_BUILD_ROOT}/%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+rmdir ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
 
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
 
+%pre
+if [ "$1" -gt 1 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
+fi
 
 %post
-/sbin/ldconfig
-export GCONF_CONFIG_SOURCE="$(gconftool-2 --get-default-source)"
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null
-
-
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+/usr/bin/gconftool-2 --makefile-install-rule \
+  %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+%preun
+if [ "$1" -eq 0 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
+fi
 
 %postun
-/sbin/ldconfig
-
+scrollkeeper-update -q || :
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
-%config %{_sysconfdir}/gconf/schemas/*
-%{_bindir}/monkey*
-%{_libdir}/*.*
+%config %{_sysconfdir}/gconf/schemas/%{name}.schemas
+%{_bindir}/monkey-*
 %{_datadir}/%{name}
+%{_datadir}/gnome
+%{_datadir}/omf
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/pixmaps/*
-
-%exclude %{_bindir}/gsttest
-%exclude %{_libdir}/*so
-
+%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 
 
 %changelog
+* Sat Apr 29 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.2-1
+- New upstream version 0.3.2
+- Add a patch to make it use gstreamer-0.10 instead of 0.8
+- Add a patch to fix some warnings
+- Properly install the icon
+- Fix the scripts to properly handle the GConf schemas and call
+  scrollkeeper-update. Don't call ldconfig as there is no lib.
+
 * Fri Nov 21 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.1.6-0.fdr.4
 - Drop .so files (for real this time).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monkey-bubble/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:52:25 -0000	1.2
+++ sources	30 Apr 2006 22:01:31 -0000	1.3
@@ -1 +1 @@
-cba30bf4d1a33048cb9317b8893088c8  monkey-bubble-0.1.6.tar.gz
+37e91fa4cdbab9ec06b2ee2a5aa0683c  monkey-bubble-0.3.2.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 30 23:03:14 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sun, 30 Apr 2006 16:03:14 -0700
Subject: rpms/hevea/devel hevea.spec,1.1,1.2
Message-ID: <200604302303.k3UN3Gqw032501@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/hevea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32484

Modified Files:
	hevea.spec 
Log Message:
* Mon May 01 2006 Andreas Thienemann <andreas at bawue.net> - 1.08-5
- Typofix in %post



Index: hevea.spec
===================================================================
RCS file: /cvs/extras/rpms/hevea/devel/hevea.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hevea.spec	30 Apr 2006 16:30:03 -0000	1.1
+++ hevea.spec	30 Apr 2006 23:03:14 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           hevea
 Version:        1.08
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        LaTeX to HTML translator
 Group:          Applications/Publishing
 License:        QPL
@@ -46,7 +46,7 @@
 rm -rf %{buildroot}
 
 
-%post -p /usr/bin/texhas
+%post -p /usr/bin/texhash
 
 
 %postun -p /usr/bin/texhash
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Mon May 01 2006 Andreas Thienemann <andreas at bawue.net> - 1.08-5
+- Typofix in %post
+
 * Sun Apr 30 2006 Andreas Thienemann <andreas at bawue.net> - 1.08-4
 - Included Requirements for imagen
 



From fedora-extras-commits at redhat.com  Sun Apr 30 23:04:46 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sun, 30 Apr 2006 16:04:46 -0700
Subject: rpms/hevea/devel hevea.spec,1.2,1.3
Message-ID: <200604302304.k3UN4mV0032595@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/hevea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32578

Modified Files:
	hevea.spec 
Log Message:
Typofix 2



Index: hevea.spec
===================================================================
RCS file: /cvs/extras/rpms/hevea/devel/hevea.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hevea.spec	30 Apr 2006 23:03:14 -0000	1.2
+++ hevea.spec	30 Apr 2006 23:04:46 -0000	1.3
@@ -14,8 +14,8 @@
 
 %description
 HEVEA is a quite complete and fast LATEX to HTML translator.
-HEVEA renders symbols by using the so-called HTML "entites", which modern
-browsers display those entities correctly most of the time.
+HEVEA renders symbols by using the so-called HTML "entites", which
+modern browsers display correctly most of the time.
 
 
 %prep



From fedora-extras-commits at redhat.com  Sun Apr 30 23:51:49 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 30 Apr 2006 16:51:49 -0700
Subject: rpms/valknut/devel valknut.desktop,1.1,1.2 valknut.spec,1.5,1.6
Message-ID: <200604302351.k3UNpplH000305@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/valknut/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32754

Modified Files:
	valknut.desktop valknut.spec 
Log Message:
execute with --disable-tray, since it is horribly broken


Index: valknut.desktop
===================================================================
RCS file: /cvs/extras/rpms/valknut/devel/valknut.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- valknut.desktop	4 Oct 2005 16:58:43 -0000	1.1
+++ valknut.desktop	30 Apr 2006 23:51:49 -0000	1.2
@@ -3,7 +3,7 @@
 Name=Valknut
 Comment=Direct Connect client
 Icon=valknut.png
-Exec=valknut
+Exec=valknut --disable-tray
 Terminal=false
 Type=Application
 Categories=Network;Application;X-Fedora;


Index: valknut.spec
===================================================================
RCS file: /cvs/extras/rpms/valknut/devel/valknut.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- valknut.spec	28 Feb 2006 18:57:35 -0000	1.5
+++ valknut.spec	30 Apr 2006 23:51:49 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           valknut
 Version:        0.3.7
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Valknut is a QT Direct Connect client
 
 Group:          Applications/Internet
@@ -58,6 +58,9 @@
 
 
 %changelog
+* Sun Apr 30 2006 Luke Macken <lmacken at redhat.com> 0.3.7-8
+- Execute with --disable-tray in desktop file, since it is horribly broken.
+
 * Tue Feb 28 2006 Luke Macken <lmacken at redhat.com> 0.3.7-7
 - Add patch to remove extra qualification build error
 



From fedora-extras-commits at redhat.com  Sat Apr  1 00:33:30 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 31 Mar 2006 17:33:30 -0700
Subject: rpms/perl-Clone/devel .cvsignore, 1.2, 1.3 perl-Clone.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200604010033.k310XWId000902@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Clone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv829/devel

Modified Files:
	.cvsignore perl-Clone.spec sources 
Log Message:

0.20



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Clone/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Jan 2006 16:25:53 -0000	1.2
+++ .cvsignore	1 Apr 2006 00:33:30 -0000	1.3
@@ -1 +1,2 @@
 Clone-0.18.tar.gz
+Clone-0.20.tar.gz


Index: perl-Clone.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Clone/devel/perl-Clone.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Clone.spec	28 Feb 2006 23:23:30 -0000	1.2
+++ perl-Clone.spec	1 Apr 2006 00:33:30 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Clone
-Version:        0.18
-Release:        3%{?dist}
+Version:        0.20
+Release:        1%{?dist}
 Summary:        Recursively copy perl datatypes
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -8,7 +8,7 @@
 Source0:        http://search.cpan.org/CPAN/authors/id/R/RD/RDF/Clone-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	perl(ExtUtils::ParseXS)
+BuildRequires:	perl(ExtUtils::ParseXS), perl(Taint::Runtime)
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -50,6 +50,10 @@
 
 
 %changelog
+* Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.20-1
+- bump to 0.20
+- new BR: perl-Taint-Runtime
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.18-3
 - bump for FC-5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Clone/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Jan 2006 16:25:53 -0000	1.2
+++ sources	1 Apr 2006 00:33:30 -0000	1.3
@@ -1 +1 @@
-7e37be978c939054100f40d64a2850db  Clone-0.18.tar.gz
+f369cb742a92733688a9a7b8514a2538  Clone-0.20.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  1 00:33:29 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 31 Mar 2006 17:33:29 -0700
Subject: rpms/perl-Clone/FC-5 perl-Clone.spec,1.2,1.3 sources,1.2,1.3
Message-ID: <200604010033.k310XVoO000896@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Clone/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv829/FC-5

Modified Files:
	perl-Clone.spec sources 
Log Message:

0.20



Index: perl-Clone.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Clone/FC-5/perl-Clone.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Clone.spec	28 Feb 2006 23:23:30 -0000	1.2
+++ perl-Clone.spec	1 Apr 2006 00:33:29 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Clone
-Version:        0.18
-Release:        3%{?dist}
+Version:        0.20
+Release:        1%{?dist}
 Summary:        Recursively copy perl datatypes
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -8,7 +8,7 @@
 Source0:        http://search.cpan.org/CPAN/authors/id/R/RD/RDF/Clone-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	perl(ExtUtils::ParseXS)
+BuildRequires:	perl(ExtUtils::ParseXS), perl(Taint::Runtime)
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -50,6 +50,10 @@
 
 
 %changelog
+* Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.20-1
+- bump to 0.20
+- new BR: perl-Taint-Runtime
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.18-3
 - bump for FC-5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Clone/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Jan 2006 16:25:53 -0000	1.2
+++ sources	1 Apr 2006 00:33:29 -0000	1.3
@@ -1 +1 @@
-7e37be978c939054100f40d64a2850db  Clone-0.18.tar.gz
+f369cb742a92733688a9a7b8514a2538  Clone-0.20.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  1 00:33:28 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 31 Mar 2006 17:33:28 -0700
Subject: rpms/perl-Clone/FC-3 perl-Clone.spec,1.2,1.3 sources,1.2,1.3
Message-ID: <200604010034.k310Y0Ts000906@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Clone/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv829/FC-3

Modified Files:
	perl-Clone.spec sources 
Log Message:

0.20



Index: perl-Clone.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Clone/FC-3/perl-Clone.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Clone.spec	28 Feb 2006 23:23:18 -0000	1.2
+++ perl-Clone.spec	1 Apr 2006 00:33:28 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Clone
-Version:        0.18
-Release:        3%{?dist}
+Version:        0.20
+Release:        1%{?dist}
 Summary:        Recursively copy perl datatypes
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -8,7 +8,7 @@
 Source0:        http://search.cpan.org/CPAN/authors/id/R/RD/RDF/Clone-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	perl(ExtUtils::ParseXS)
+BuildRequires:	perl(ExtUtils::ParseXS), perl(Taint::Runtime)
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -50,6 +50,10 @@
 
 
 %changelog
+* Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.20-1
+- bump to 0.20
+- new BR: perl-Taint-Runtime
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.18-3
 - bump for FC-5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Clone/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Jan 2006 16:25:53 -0000	1.2
+++ sources	1 Apr 2006 00:33:28 -0000	1.3
@@ -1 +1 @@
-7e37be978c939054100f40d64a2850db  Clone-0.18.tar.gz
+f369cb742a92733688a9a7b8514a2538  Clone-0.20.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  1 00:33:29 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 31 Mar 2006 17:33:29 -0700
Subject: rpms/perl-Clone/FC-4 perl-Clone.spec,1.2,1.3 sources,1.2,1.3
Message-ID: <200604010034.k310Y1ja000910@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Clone/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv829/FC-4

Modified Files:
	perl-Clone.spec sources 
Log Message:

0.20



Index: perl-Clone.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Clone/FC-4/perl-Clone.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Clone.spec	28 Feb 2006 23:23:24 -0000	1.2
+++ perl-Clone.spec	1 Apr 2006 00:33:28 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-Clone
-Version:        0.18
-Release:        3%{?dist}
+Version:        0.20
+Release:        1%{?dist}
 Summary:        Recursively copy perl datatypes
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -8,7 +8,7 @@
 Source0:        http://search.cpan.org/CPAN/authors/id/R/RD/RDF/Clone-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	perl(ExtUtils::ParseXS)
+BuildRequires:	perl(ExtUtils::ParseXS), perl(Taint::Runtime)
 Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -50,6 +50,10 @@
 
 
 %changelog
+* Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.20-1
+- bump to 0.20
+- new BR: perl-Taint-Runtime
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.18-3
 - bump for FC-5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Clone/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Jan 2006 16:25:53 -0000	1.2
+++ sources	1 Apr 2006 00:33:28 -0000	1.3
@@ -1 +1 @@
-7e37be978c939054100f40d64a2850db  Clone-0.18.tar.gz
+f369cb742a92733688a9a7b8514a2538  Clone-0.20.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  1 05:33:14 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 31 Mar 2006 22:33:14 -0700
Subject: rpms/perl-Class-DBI/devel .cvsignore, 1.2, 1.3 perl-Class-DBI.spec, 
	1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200604010533.k315XGlb011500@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11421/devel

Modified Files:
	.cvsignore perl-Class-DBI.spec sources 
Log Message:

3.0.14



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	29 Aug 2005 03:28:25 -0000	1.2
+++ .cvsignore	1 Apr 2006 05:33:14 -0000	1.3
@@ -1 +1,2 @@
 Class-DBI-0.96.tar.gz
+Class-DBI-v3.0.14.tar.gz


Index: perl-Class-DBI.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI/devel/perl-Class-DBI.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-DBI.spec	31 Aug 2005 23:24:19 -0000	1.2
+++ perl-Class-DBI.spec	1 Apr 2006 05:33:14 -0000	1.3
@@ -1,18 +1,18 @@
 Name:           perl-Class-DBI
-Version:        0.96
-Release:        6%{?dist}
+Version:        3.0.14
+Release:        1%{?dist}
 Summary:        Simple Database Abstraction
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Class-DBI/
-Source0:        http://search.cpan.org/CPAN/authors/id/T/TM/TMTM/Class-DBI-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/T/TM/TMTM/Class-DBI-v%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl(Class::Accessor), perl(Class::Data::Inheritable)
 BuildRequires:  perl(Class::Trigger), perl(Ima::DBI), perl(UNIVERSAL::moniker)
 BuildRequires:  perl-DBD-Pg, perl(DBD::SQLite), perl(Date::Simple)
-BuildRequires:  perl(Time::Piece::MySQL)
+BuildRequires:  perl(Time::Piece::MySQL), perl(Clone), perl(version)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:  perl(Class::Accessor), perl(Ima::DBI)
 
@@ -20,7 +20,7 @@
 %{summary}.
 
 %prep
-%setup -q -n Class-DBI-%{version}
+%setup -q -n Class-DBI-v%{version}
 perldoc -t perlgpl > COPYING
 perldoc -t perlartistic > Artistic
 
@@ -51,6 +51,12 @@
 
 
 %changelog
+* Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 3.0.14-1
+- bump to 3.0.14
+
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 3.0.13-1
+- bump to 3.0.13
+
 * Wed Aug 31 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.96-6
 - comment out make test, since it fails.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Aug 2005 03:28:25 -0000	1.2
+++ sources	1 Apr 2006 05:33:14 -0000	1.3
@@ -1 +1 @@
-5026f142435b589c31aae1a97b2f1344  Class-DBI-0.96.tar.gz
+c61f5da79207b8a8c440c10cde2b35bd  Class-DBI-v3.0.14.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  1 05:33:13 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 31 Mar 2006 22:33:13 -0700
Subject: rpms/perl-Class-DBI/FC-5 perl-Class-DBI.spec, 1.2, 1.3 sources, 1.2,
	1.3
Message-ID: <200604010533.k315XFnM011494@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11421/FC-5

Modified Files:
	perl-Class-DBI.spec sources 
Log Message:

3.0.14



Index: perl-Class-DBI.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI/FC-5/perl-Class-DBI.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-DBI.spec	31 Aug 2005 23:24:19 -0000	1.2
+++ perl-Class-DBI.spec	1 Apr 2006 05:33:13 -0000	1.3
@@ -1,18 +1,18 @@
 Name:           perl-Class-DBI
-Version:        0.96
-Release:        6%{?dist}
+Version:        3.0.14
+Release:        1%{?dist}
 Summary:        Simple Database Abstraction
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Class-DBI/
-Source0:        http://search.cpan.org/CPAN/authors/id/T/TM/TMTM/Class-DBI-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/T/TM/TMTM/Class-DBI-v%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl(Class::Accessor), perl(Class::Data::Inheritable)
 BuildRequires:  perl(Class::Trigger), perl(Ima::DBI), perl(UNIVERSAL::moniker)
 BuildRequires:  perl-DBD-Pg, perl(DBD::SQLite), perl(Date::Simple)
-BuildRequires:  perl(Time::Piece::MySQL)
+BuildRequires:  perl(Time::Piece::MySQL), perl(Clone), perl(version)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:  perl(Class::Accessor), perl(Ima::DBI)
 
@@ -20,7 +20,7 @@
 %{summary}.
 
 %prep
-%setup -q -n Class-DBI-%{version}
+%setup -q -n Class-DBI-v%{version}
 perldoc -t perlgpl > COPYING
 perldoc -t perlartistic > Artistic
 
@@ -51,6 +51,12 @@
 
 
 %changelog
+* Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 3.0.14-1
+- bump to 3.0.14
+
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 3.0.13-1
+- bump to 3.0.13
+
 * Wed Aug 31 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.96-6
 - comment out make test, since it fails.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Aug 2005 03:28:25 -0000	1.2
+++ sources	1 Apr 2006 05:33:13 -0000	1.3
@@ -1 +1 @@
-5026f142435b589c31aae1a97b2f1344  Class-DBI-0.96.tar.gz
+c61f5da79207b8a8c440c10cde2b35bd  Class-DBI-v3.0.14.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  1 05:33:07 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 31 Mar 2006 22:33:07 -0700
Subject: rpms/perl-Class-DBI/FC-3 perl-Class-DBI.spec, 1.2, 1.3 sources, 1.2,
	1.3
Message-ID: <200604010533.k315XdvI011506@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11421/FC-3

Modified Files:
	perl-Class-DBI.spec sources 
Log Message:

3.0.14



Index: perl-Class-DBI.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI/FC-3/perl-Class-DBI.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-DBI.spec	31 Aug 2005 23:24:13 -0000	1.2
+++ perl-Class-DBI.spec	1 Apr 2006 05:33:07 -0000	1.3
@@ -1,18 +1,18 @@
 Name:           perl-Class-DBI
-Version:        0.96
-Release:        6%{?dist}
+Version:        3.0.14
+Release:        1%{?dist}
 Summary:        Simple Database Abstraction
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Class-DBI/
-Source0:        http://search.cpan.org/CPAN/authors/id/T/TM/TMTM/Class-DBI-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/T/TM/TMTM/Class-DBI-v%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl(Class::Accessor), perl(Class::Data::Inheritable)
 BuildRequires:  perl(Class::Trigger), perl(Ima::DBI), perl(UNIVERSAL::moniker)
 BuildRequires:  perl-DBD-Pg, perl(DBD::SQLite), perl(Date::Simple)
-BuildRequires:  perl(Time::Piece::MySQL)
+BuildRequires:  perl(Time::Piece::MySQL), perl(Clone), perl(version)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:  perl(Class::Accessor), perl(Ima::DBI)
 
@@ -20,7 +20,7 @@
 %{summary}.
 
 %prep
-%setup -q -n Class-DBI-%{version}
+%setup -q -n Class-DBI-v%{version}
 perldoc -t perlgpl > COPYING
 perldoc -t perlartistic > Artistic
 
@@ -51,6 +51,12 @@
 
 
 %changelog
+* Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 3.0.14-1
+- bump to 3.0.14
+
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 3.0.13-1
+- bump to 3.0.13
+
 * Wed Aug 31 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.96-6
 - comment out make test, since it fails.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Aug 2005 03:28:25 -0000	1.2
+++ sources	1 Apr 2006 05:33:07 -0000	1.3
@@ -1 +1 @@
-5026f142435b589c31aae1a97b2f1344  Class-DBI-0.96.tar.gz
+c61f5da79207b8a8c440c10cde2b35bd  Class-DBI-v3.0.14.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  1 05:33:08 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 31 Mar 2006 22:33:08 -0700
Subject: rpms/perl-Class-DBI/FC-4 perl-Class-DBI.spec, 1.2, 1.3 sources, 1.2,
	1.3
Message-ID: <200604010533.k315XeRL011510@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11421/FC-4

Modified Files:
	perl-Class-DBI.spec sources 
Log Message:

3.0.14



Index: perl-Class-DBI.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI/FC-4/perl-Class-DBI.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-DBI.spec	31 Aug 2005 23:24:13 -0000	1.2
+++ perl-Class-DBI.spec	1 Apr 2006 05:33:08 -0000	1.3
@@ -1,18 +1,18 @@
 Name:           perl-Class-DBI
-Version:        0.96
-Release:        6%{?dist}
+Version:        3.0.14
+Release:        1%{?dist}
 Summary:        Simple Database Abstraction
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Class-DBI/
-Source0:        http://search.cpan.org/CPAN/authors/id/T/TM/TMTM/Class-DBI-%{version}.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/T/TM/TMTM/Class-DBI-v%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl(Class::Accessor), perl(Class::Data::Inheritable)
 BuildRequires:  perl(Class::Trigger), perl(Ima::DBI), perl(UNIVERSAL::moniker)
 BuildRequires:  perl-DBD-Pg, perl(DBD::SQLite), perl(Date::Simple)
-BuildRequires:  perl(Time::Piece::MySQL)
+BuildRequires:  perl(Time::Piece::MySQL), perl(Clone), perl(version)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:  perl(Class::Accessor), perl(Ima::DBI)
 
@@ -20,7 +20,7 @@
 %{summary}.
 
 %prep
-%setup -q -n Class-DBI-%{version}
+%setup -q -n Class-DBI-v%{version}
 perldoc -t perlgpl > COPYING
 perldoc -t perlartistic > Artistic
 
@@ -51,6 +51,12 @@
 
 
 %changelog
+* Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 3.0.14-1
+- bump to 3.0.14
+
+* Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 3.0.13-1
+- bump to 3.0.13
+
 * Wed Aug 31 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.96-6
 - comment out make test, since it fails.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	29 Aug 2005 03:28:25 -0000	1.2
+++ sources	1 Apr 2006 05:33:08 -0000	1.3
@@ -1 +1 @@
-5026f142435b589c31aae1a97b2f1344  Class-DBI-0.96.tar.gz
+c61f5da79207b8a8c440c10cde2b35bd  Class-DBI-v3.0.14.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  1 05:40:56 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 31 Mar 2006 22:40:56 -0700
Subject: rpms/perl-Class-DBI-Loader/devel .cvsignore, 1.2,
	1.3 perl-Class-DBI-Loader.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200604010540.k315ewTX011745@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Loader/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11676/devel

Modified Files:
	.cvsignore perl-Class-DBI-Loader.spec sources 
Log Message:

0.32



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Sep 2005 18:26:15 -0000	1.2
+++ .cvsignore	1 Apr 2006 05:40:55 -0000	1.3
@@ -1 +1,2 @@
 Class-DBI-Loader-0.22.tar.gz
+Class-DBI-Loader-0.32.tar.gz


Index: perl-Class-DBI-Loader.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader/devel/perl-Class-DBI-Loader.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-Loader.spec	14 Sep 2005 18:26:15 -0000	1.1
+++ perl-Class-DBI-Loader.spec	1 Apr 2006 05:40:55 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-Loader
-Version:        0.22
-Release:        4%{?dist}
+Version:        0.32
+Release:        1%{?dist}
 Summary:        Dynamic definition of Class::DBI sub classes
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.32-1
+- bump for 0.32
+
 * Fri Sep  9 2005 Paul Howarth <paul at city-fan.org> 0.22-4
 - include POD tests in %%check, but disable failing POD coverage test
 - remove explicit Class::DBI dep because it's pulled in by other deps


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Sep 2005 18:26:15 -0000	1.2
+++ sources	1 Apr 2006 05:40:55 -0000	1.3
@@ -1 +1 @@
-fdb246040add571cffc1134184e9ca0f  Class-DBI-Loader-0.22.tar.gz
+194acde55d137c86fc44291dfb97687e  Class-DBI-Loader-0.32.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  1 05:40:49 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 31 Mar 2006 22:40:49 -0700
Subject: rpms/perl-Class-DBI-Loader/FC-3 perl-Class-DBI-Loader.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200604010541.k315fL2x011749@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Loader/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11676/FC-3

Modified Files:
	perl-Class-DBI-Loader.spec sources 
Log Message:

0.32



Index: perl-Class-DBI-Loader.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader/FC-3/perl-Class-DBI-Loader.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-Loader.spec	14 Sep 2005 18:26:15 -0000	1.1
+++ perl-Class-DBI-Loader.spec	1 Apr 2006 05:40:48 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-Loader
-Version:        0.22
-Release:        4%{?dist}
+Version:        0.32
+Release:        1%{?dist}
 Summary:        Dynamic definition of Class::DBI sub classes
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.32-1
+- bump for 0.32
+
 * Fri Sep  9 2005 Paul Howarth <paul at city-fan.org> 0.22-4
 - include POD tests in %%check, but disable failing POD coverage test
 - remove explicit Class::DBI dep because it's pulled in by other deps


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Sep 2005 18:26:15 -0000	1.2
+++ sources	1 Apr 2006 05:40:48 -0000	1.3
@@ -1 +1 @@
-fdb246040add571cffc1134184e9ca0f  Class-DBI-Loader-0.22.tar.gz
+194acde55d137c86fc44291dfb97687e  Class-DBI-Loader-0.32.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  1 05:40:49 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 31 Mar 2006 22:40:49 -0700
Subject: rpms/perl-Class-DBI-Loader/FC-4 perl-Class-DBI-Loader.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200604010541.k315fLK5011753@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Loader/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11676/FC-4

Modified Files:
	perl-Class-DBI-Loader.spec sources 
Log Message:

0.32



Index: perl-Class-DBI-Loader.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader/FC-4/perl-Class-DBI-Loader.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-Loader.spec	14 Sep 2005 18:26:15 -0000	1.1
+++ perl-Class-DBI-Loader.spec	1 Apr 2006 05:40:49 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-Loader
-Version:        0.22
-Release:        4%{?dist}
+Version:        0.32
+Release:        1%{?dist}
 Summary:        Dynamic definition of Class::DBI sub classes
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.32-1
+- bump for 0.32
+
 * Fri Sep  9 2005 Paul Howarth <paul at city-fan.org> 0.22-4
 - include POD tests in %%check, but disable failing POD coverage test
 - remove explicit Class::DBI dep because it's pulled in by other deps


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Sep 2005 18:26:15 -0000	1.2
+++ sources	1 Apr 2006 05:40:49 -0000	1.3
@@ -1 +1 @@
-fdb246040add571cffc1134184e9ca0f  Class-DBI-Loader-0.22.tar.gz
+194acde55d137c86fc44291dfb97687e  Class-DBI-Loader-0.32.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  1 05:40:50 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 31 Mar 2006 22:40:50 -0700
Subject: rpms/perl-Class-DBI-Loader/FC-5 perl-Class-DBI-Loader.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200604010541.k315fMoB011757@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Loader/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11676/FC-5

Modified Files:
	perl-Class-DBI-Loader.spec sources 
Log Message:

0.32



Index: perl-Class-DBI-Loader.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader/FC-5/perl-Class-DBI-Loader.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-Loader.spec	14 Sep 2005 18:26:15 -0000	1.1
+++ perl-Class-DBI-Loader.spec	1 Apr 2006 05:40:50 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-Loader
-Version:        0.22
-Release:        4%{?dist}
+Version:        0.32
+Release:        1%{?dist}
 Summary:        Dynamic definition of Class::DBI sub classes
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.32-1
+- bump for 0.32
+
 * Fri Sep  9 2005 Paul Howarth <paul at city-fan.org> 0.22-4
 - include POD tests in %%check, but disable failing POD coverage test
 - remove explicit Class::DBI dep because it's pulled in by other deps


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Sep 2005 18:26:15 -0000	1.2
+++ sources	1 Apr 2006 05:40:50 -0000	1.3
@@ -1 +1 @@
-fdb246040add571cffc1134184e9ca0f  Class-DBI-Loader-0.22.tar.gz
+194acde55d137c86fc44291dfb97687e  Class-DBI-Loader-0.32.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  1 05:45:21 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 31 Mar 2006 22:45:21 -0700
Subject: rpms/perl-Class-DBI-Plugin-RetrieveAll/devel .cvsignore, 1.3,
	1.4 perl-Class-DBI-Plugin-RetrieveAll.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200604010545.k315jN96011993@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11922/devel

Modified Files:
	.cvsignore perl-Class-DBI-Plugin-RetrieveAll.spec sources 
Log Message:

1.04



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Jan 2006 16:54:31 -0000	1.3
+++ .cvsignore	1 Apr 2006 05:45:21 -0000	1.4
@@ -1,2 +1,3 @@
 Class-DBI-Plugin-RetrieveAll-1.01.tar.gz
 Class-DBI-Plugin-RetrieveAll-1.02.tar.gz
+Class-DBI-Plugin-RetrieveAll-1.04.tar.gz


Index: perl-Class-DBI-Plugin-RetrieveAll.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/devel/perl-Class-DBI-Plugin-RetrieveAll.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-DBI-Plugin-RetrieveAll.spec	5 Jan 2006 16:54:31 -0000	1.2
+++ perl-Class-DBI-Plugin-RetrieveAll.spec	1 Apr 2006 05:45:21 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-Class-DBI-Plugin-RetrieveAll
-Version:        1.02
+Version:        1.04
 Release:        1%{?dist}
 Summary:        More complex retrieve_all() for Class::DBI
 Group:          Development/Libraries
@@ -46,6 +46,9 @@
 
 
 %changelog
+* Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.04-1
+- bump to 1.04
+
 * Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.02-1
 - bump to 1.02
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Jan 2006 16:54:31 -0000	1.3
+++ sources	1 Apr 2006 05:45:21 -0000	1.4
@@ -1 +1 @@
-69480add94fa1800c9db2c8da87f40f2  Class-DBI-Plugin-RetrieveAll-1.02.tar.gz
+859fe774e6d74636b6406b821d4d66d1  Class-DBI-Plugin-RetrieveAll-1.04.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  1 05:45:14 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 31 Mar 2006 22:45:14 -0700
Subject: rpms/perl-Class-DBI-Plugin-RetrieveAll/FC-3
	perl-Class-DBI-Plugin-RetrieveAll.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200604010545.k315jkSM011997@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11922/FC-3

Modified Files:
	perl-Class-DBI-Plugin-RetrieveAll.spec sources 
Log Message:

1.04



Index: perl-Class-DBI-Plugin-RetrieveAll.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/FC-3/perl-Class-DBI-Plugin-RetrieveAll.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-DBI-Plugin-RetrieveAll.spec	5 Jan 2006 16:54:19 -0000	1.2
+++ perl-Class-DBI-Plugin-RetrieveAll.spec	1 Apr 2006 05:45:14 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-Class-DBI-Plugin-RetrieveAll
-Version:        1.02
+Version:        1.04
 Release:        1%{?dist}
 Summary:        More complex retrieve_all() for Class::DBI
 Group:          Development/Libraries
@@ -46,6 +46,9 @@
 
 
 %changelog
+* Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.04-1
+- bump to 1.04
+
 * Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.02-1
 - bump to 1.02
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Jan 2006 16:54:19 -0000	1.3
+++ sources	1 Apr 2006 05:45:14 -0000	1.4
@@ -1 +1 @@
-69480add94fa1800c9db2c8da87f40f2  Class-DBI-Plugin-RetrieveAll-1.02.tar.gz
+859fe774e6d74636b6406b821d4d66d1  Class-DBI-Plugin-RetrieveAll-1.04.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  1 05:45:16 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 31 Mar 2006 22:45:16 -0700
Subject: rpms/perl-Class-DBI-Plugin-RetrieveAll/FC-5
	perl-Class-DBI-Plugin-RetrieveAll.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200604010545.k315jmZl012003@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11922/FC-5

Modified Files:
	perl-Class-DBI-Plugin-RetrieveAll.spec sources 
Log Message:

1.04



Index: perl-Class-DBI-Plugin-RetrieveAll.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/FC-5/perl-Class-DBI-Plugin-RetrieveAll.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-DBI-Plugin-RetrieveAll.spec	5 Jan 2006 16:54:31 -0000	1.2
+++ perl-Class-DBI-Plugin-RetrieveAll.spec	1 Apr 2006 05:45:16 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-Class-DBI-Plugin-RetrieveAll
-Version:        1.02
+Version:        1.04
 Release:        1%{?dist}
 Summary:        More complex retrieve_all() for Class::DBI
 Group:          Development/Libraries
@@ -46,6 +46,9 @@
 
 
 %changelog
+* Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.04-1
+- bump to 1.04
+
 * Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.02-1
 - bump to 1.02
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Jan 2006 16:54:31 -0000	1.3
+++ sources	1 Apr 2006 05:45:16 -0000	1.4
@@ -1 +1 @@
-69480add94fa1800c9db2c8da87f40f2  Class-DBI-Plugin-RetrieveAll-1.02.tar.gz
+859fe774e6d74636b6406b821d4d66d1  Class-DBI-Plugin-RetrieveAll-1.04.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  1 05:45:15 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri, 31 Mar 2006 22:45:15 -0700
Subject: rpms/perl-Class-DBI-Plugin-RetrieveAll/FC-4
	perl-Class-DBI-Plugin-RetrieveAll.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200604010545.k315jlVE012001@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11922/FC-4

Modified Files:
	perl-Class-DBI-Plugin-RetrieveAll.spec sources 
Log Message:

1.04



Index: perl-Class-DBI-Plugin-RetrieveAll.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/FC-4/perl-Class-DBI-Plugin-RetrieveAll.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-DBI-Plugin-RetrieveAll.spec	5 Jan 2006 16:54:25 -0000	1.2
+++ perl-Class-DBI-Plugin-RetrieveAll.spec	1 Apr 2006 05:45:15 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-Class-DBI-Plugin-RetrieveAll
-Version:        1.02
+Version:        1.04
 Release:        1%{?dist}
 Summary:        More complex retrieve_all() for Class::DBI
 Group:          Development/Libraries
@@ -46,6 +46,9 @@
 
 
 %changelog
+* Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.04-1
+- bump to 1.04
+
 * Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.02-1
 - bump to 1.02
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Plugin-RetrieveAll/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Jan 2006 16:54:25 -0000	1.3
+++ sources	1 Apr 2006 05:45:15 -0000	1.4
@@ -1 +1 @@
-69480add94fa1800c9db2c8da87f40f2  Class-DBI-Plugin-RetrieveAll-1.02.tar.gz
+859fe774e6d74636b6406b821d4d66d1  Class-DBI-Plugin-RetrieveAll-1.04.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  1 10:58:01 2006
From: fedora-extras-commits at redhat.com (Duncan Ferguson (duncs))
Date: Sat,  1 Apr 2006 03:58:01 -0700
Subject: rpms/perl-X11-Protocol/FC-3 perl-X11-Protocol.spec,1.2,1.3
Message-ID: <200604011058.k31Aw3jf022550@cvs-int.fedora.redhat.com>

Author: duncs

Update of /cvs/extras/rpms/perl-X11-Protocol/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22533

Modified Files:
	perl-X11-Protocol.spec 
Log Message:
Fix potential bug in specfile


Index: perl-X11-Protocol.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-X11-Protocol/FC-3/perl-X11-Protocol.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-X11-Protocol.spec	31 Mar 2006 18:01:07 -0000	1.2
+++ perl-X11-Protocol.spec	1 Apr 2006 10:58:01 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-X11-Protocol
 Version:        0.55
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        X11-Protocol - Raw interface to X Window System servers
 
 Group:          Development/Libraries
@@ -29,7 +29,7 @@
 
 # Testing requires X - use "rpmbuild --with X"
 %{!?_with_X:\
-%{__perl} -pi -e 'print "print \"Remaining tests require X\n\"; exit 0;"
+%{__perl} -pi -e 'print "print \"Remaining tests require X\n\"; exit 0;" \
 			if /Insert your test code below/;' test.pl \
 }
 
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Sat Apr 01 2006 Duncan Ferguson <duncan_j_ferguson at yahoo.co.uk> 0.55-2
+- Specfile bugfile
+
 * Fri Mar 31 2006 Duncan Ferguson <duncan_j_ferguson at yahoo.co.uk> 0.55-1
 - Update to new version of X11::Protocol
 



From fedora-extras-commits at redhat.com  Sat Apr  1 12:03:28 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sat,  1 Apr 2006 05:03:28 -0700
Subject: rpms/ser/FC-3 ser.spec,1.2,1.3
Message-ID: <200604011203.k31C3UIn027111@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ser/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27084

Modified Files:
	ser.spec 
Log Message:
* Thu Mar 30 2006 Andreas Thienemann <andreas at bawue.net> 0.9.6-5
- Do not package serweb for FC-3, as we do not have MySQL 4



Index: ser.spec
===================================================================
RCS file: /cvs/extras/rpms/ser/FC-3/ser.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ser.spec	30 Mar 2006 16:34:29 -0000	1.2
+++ ser.spec	1 Apr 2006 12:03:28 -0000	1.3
@@ -1,10 +1,14 @@
 %define special_modules mysql jabber cpl-c postgres pa
 %define serweb_version 0.9.4
 
+%if "%{fedora}" >= "4"
+   %define serweb true
+%endif
+
 Summary: SIP Express Router
 Name: ser
 Version: 0.9.6
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://ftp.iptel.org/pub/ser/latest/src/ser-%{version}_src.tar.gz
@@ -191,16 +195,24 @@
 %{_libdir}/ser/modules/postgres.so
 %{_sbindir}/serpgctl
 
+# Only package, if dependencies can be met
+%if "%{serweb}" == "true"
+
 %files serweb
 %defattr(-,root,root,-)
 %doc serweb-%{serweb_version}/README serweb-%{serweb_version}/INSTALL serweb-%{serweb_version}/COPYING serweb-%{serweb_version}/CHANGELOG
 %dir %{_datadir}/serweb
 %{_datadir}/serweb/*
 %dir %{_sysconfdir}/ser/serweb
-%config(noreplace) %{_sysconfdir}/ser/serweb/*.php
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/serweb.conf
+%config(noreplace) %{_sysconfdir}/ser/serweb/*.php
+
+%endif
 
 %changelog
+* Thu Mar 30 2006 Andreas Thienemann <andreas at bawue.net> 0.9.6-5
+- Do not package serweb for FC-3, as we do not have MySQL 4
+
 * Thu Mar 30 2006 Andreas Thienemann <andreas at bawue.net> 0.9.6-4
 - Fix buildissue with %%{_libdir}
 



From fedora-extras-commits at redhat.com  Sat Apr  1 12:19:16 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sat,  1 Apr 2006 05:19:16 -0700
Subject: rpms/ser/FC-3 ser.spec,1.3,1.4
Message-ID: <200604011219.k31CJIp7027196@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ser/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27179

Modified Files:
	ser.spec 
Log Message:
* Thu Apr 01 2006 Andreas Thienemann <andreas at bawue.net> 0.9.6-6
- *bump*



Index: ser.spec
===================================================================
RCS file: /cvs/extras/rpms/ser/FC-3/ser.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ser.spec	1 Apr 2006 12:03:28 -0000	1.3
+++ ser.spec	1 Apr 2006 12:19:16 -0000	1.4
@@ -8,7 +8,7 @@
 Summary: SIP Express Router
 Name: ser
 Version: 0.9.6
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://ftp.iptel.org/pub/ser/latest/src/ser-%{version}_src.tar.gz
@@ -140,6 +140,8 @@
 ls README.* | grep -v -E '(mysql|postgres)' | sed -e 's/\(.*\)/%doc \1/' >> filelist
 
 # serweb configuration
+%if "%{serweb}" == "true"
+
 mkdir -p %{buildroot}%{_datadir}/serweb
 mkdir -p %{buildroot}%{_sysconfdir}/ser/serweb
 find serweb-%{serweb_version} -name '.cvsignore' -exec rm -f {} \;
@@ -149,6 +151,8 @@
 cp -rP serweb-%{serweb_version}/config/* %{buildroot}%{_sysconfdir}/ser/serweb/
 install -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/serweb.conf
 
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -210,7 +214,10 @@
 %endif
 
 %changelog
-* Thu Mar 30 2006 Andreas Thienemann <andreas at bawue.net> 0.9.6-5
+* Thu Apr 01 2006 Andreas Thienemann <andreas at bawue.net> 0.9.6-6
+- *bump*
+
+* Thu Apr 01 2006 Andreas Thienemann <andreas at bawue.net> 0.9.6-5
 - Do not package serweb for FC-3, as we do not have MySQL 4
 
 * Thu Mar 30 2006 Andreas Thienemann <andreas at bawue.net> 0.9.6-4



From fedora-extras-commits at redhat.com  Sat Apr  1 12:43:07 2006
From: fedora-extras-commits at redhat.com (Jeff Sheltren (sheltren))
Date: Sat,  1 Apr 2006 05:43:07 -0700
Subject: rpms/cfengine/FC-5 .cvsignore, 1.10, 1.11 cfengine.spec, 1.16,
	1.17 sources, 1.10, 1.11
Message-ID: <200604011243.k31Ch92m027373@cvs-int.fedora.redhat.com>

Author: sheltren

Update of /cvs/extras/rpms/cfengine/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27352

Modified Files:
	.cvsignore cfengine.spec sources 
Log Message:
Update to upstream 2.1.20



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cfengine/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	3 Mar 2006 13:12:26 -0000	1.10
+++ .cvsignore	1 Apr 2006 12:43:07 -0000	1.11
@@ -1,4 +1,4 @@
-cfengine-2.1.19p1.tar.gz
+cfengine-2.1.20.tar.gz
 cfenvd
 cfexecd
 cfservd


Index: cfengine.spec
===================================================================
RCS file: /cvs/extras/rpms/cfengine/FC-5/cfengine.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- cfengine.spec	3 Mar 2006 13:12:26 -0000	1.16
+++ cfengine.spec	1 Apr 2006 12:43:07 -0000	1.17
@@ -1,10 +1,10 @@
 Summary: A systems administration tool for networks
 Name: cfengine
-Version: 2.1.19p1
+Version: 2.1.20
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System
-Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.19p1.tar.gz
+Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.20.tar.gz
 Source1: cfexecd
 Source2: cfservd
 Source3: cfenvd
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Fri Mar 31 2006 Jeff Sheltren <sheltren at cs.ucsb.edu> - 2.1.20-1
+- Update to upstream 2.1.20
+
 * Thu Mar  2 2006 Jeff Sheltren <sheltren at cs.ucsb.edu> - 2.1.19p1-1
 - Update to upstream 2.1.19p1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cfengine/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	3 Mar 2006 13:12:26 -0000	1.10
+++ sources	1 Apr 2006 12:43:07 -0000	1.11
@@ -1,4 +1,4 @@
-0524e0bcbf947d021c78f8c37461c323  cfengine-2.1.19p1.tar.gz
+2510349fef9ccc47d80f133d4a35322e  cfengine-2.1.20.tar.gz
 37c565f98d2b252c9c6cf1c88d654e02  cfenvd
 19f07f0d576abf8bf8cb875ab6ad66c6  cfexecd
 fe6c086a41f428d47bde30646e0310c4  cfservd



From fedora-extras-commits at redhat.com  Sat Apr  1 12:47:11 2006
From: fedora-extras-commits at redhat.com (Jeff Sheltren (sheltren))
Date: Sat,  1 Apr 2006 05:47:11 -0700
Subject: rpms/cfengine/FC-4 .cvsignore, 1.10, 1.11 cfengine.spec, 1.14,
	1.15 sources, 1.10, 1.11
Message-ID: <200604011247.k31ClD5l027454@cvs-int.fedora.redhat.com>

Author: sheltren

Update of /cvs/extras/rpms/cfengine/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27433

Modified Files:
	.cvsignore cfengine.spec sources 
Log Message:
Update to upstream 2.1.20



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cfengine/FC-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	3 Mar 2006 13:14:40 -0000	1.10
+++ .cvsignore	1 Apr 2006 12:47:11 -0000	1.11
@@ -1,4 +1,4 @@
-cfengine-2.1.19p1.tar.gz
+cfengine-2.1.20.tar.gz
 cfenvd
 cfexecd
 cfservd


Index: cfengine.spec
===================================================================
RCS file: /cvs/extras/rpms/cfengine/FC-4/cfengine.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- cfengine.spec	3 Mar 2006 13:14:40 -0000	1.14
+++ cfengine.spec	1 Apr 2006 12:47:11 -0000	1.15
@@ -1,10 +1,10 @@
 Summary: A systems administration tool for networks
 Name: cfengine
-Version: 2.1.19p1
+Version: 2.1.20
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System
-Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.19p1.tar.gz
+Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.20.tar.gz
 Source1: cfexecd
 Source2: cfservd
 Source3: cfenvd
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Fri Mar 31 2006 Jeff Sheltren <sheltren at cs.ucsb.edu> - 2.1.20-1
+- Update to upstream 2.1.20
+
 * Thu Mar  2 2006 Jeff Sheltren <sheltren at cs.ucsb.edu> - 2.1.19p1-1
 - Update to upstream 2.1.19p1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cfengine/FC-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	3 Mar 2006 13:14:40 -0000	1.10
+++ sources	1 Apr 2006 12:47:11 -0000	1.11
@@ -1,4 +1,4 @@
-0524e0bcbf947d021c78f8c37461c323  cfengine-2.1.19p1.tar.gz
+2510349fef9ccc47d80f133d4a35322e  cfengine-2.1.20.tar.gz
 37c565f98d2b252c9c6cf1c88d654e02  cfenvd
 19f07f0d576abf8bf8cb875ab6ad66c6  cfexecd
 fe6c086a41f428d47bde30646e0310c4  cfservd



From fedora-extras-commits at redhat.com  Sat Apr  1 12:49:00 2006
From: fedora-extras-commits at redhat.com (Jeff Sheltren (sheltren))
Date: Sat,  1 Apr 2006 05:49:00 -0700
Subject: rpms/cfengine/FC-3 .cvsignore, 1.11, 1.12 cfengine.spec, 1.13,
	1.14 sources, 1.11, 1.12
Message-ID: <200604011249.k31Cn2dR027533@cvs-int.fedora.redhat.com>

Author: sheltren

Update of /cvs/extras/rpms/cfengine/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27512

Modified Files:
	.cvsignore cfengine.spec sources 
Log Message:
Update to upstream 2.1.20



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cfengine/FC-3/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	3 Mar 2006 13:16:15 -0000	1.11
+++ .cvsignore	1 Apr 2006 12:49:00 -0000	1.12
@@ -1,4 +1,4 @@
-cfengine-2.1.19p1.tar.gz
+cfengine-2.1.20.tar.gz
 cfenvd
 cfexecd
 cfservd


Index: cfengine.spec
===================================================================
RCS file: /cvs/extras/rpms/cfengine/FC-3/cfengine.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- cfengine.spec	3 Mar 2006 13:16:15 -0000	1.13
+++ cfengine.spec	1 Apr 2006 12:49:00 -0000	1.14
@@ -1,10 +1,10 @@
 Summary: A systems administration tool for networks
 Name: cfengine
-Version: 2.1.19p1
+Version: 2.1.20
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System
-Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.19p1.tar.gz
+Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.20.tar.gz
 Source1: cfexecd
 Source2: cfservd
 Source3: cfenvd
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Fri Mar 31 2006 Jeff Sheltren <sheltren at cs.ucsb.edu> - 2.1.20-1
+- Update to upstream 2.1.20
+
 * Thu Mar  2 2006 Jeff Sheltren <sheltren at cs.ucsb.edu> - 2.1.19p1-1
 - Update to upstream 2.1.19p1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cfengine/FC-3/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	3 Mar 2006 13:16:15 -0000	1.11
+++ sources	1 Apr 2006 12:49:00 -0000	1.12
@@ -1,4 +1,4 @@
-0524e0bcbf947d021c78f8c37461c323  cfengine-2.1.19p1.tar.gz
+2510349fef9ccc47d80f133d4a35322e  cfengine-2.1.20.tar.gz
 37c565f98d2b252c9c6cf1c88d654e02  cfenvd
 19f07f0d576abf8bf8cb875ab6ad66c6  cfexecd
 fe6c086a41f428d47bde30646e0310c4  cfservd



From fedora-extras-commits at redhat.com  Sat Apr  1 12:50:33 2006
From: fedora-extras-commits at redhat.com (Jeff Sheltren (sheltren))
Date: Sat,  1 Apr 2006 05:50:33 -0700
Subject: rpms/cfengine/devel .cvsignore, 1.10, 1.11 cfengine.spec, 1.16,
	1.17 sources, 1.10, 1.11
Message-ID: <200604011250.k31CoZ3W027612@cvs-int.fedora.redhat.com>

Author: sheltren

Update of /cvs/extras/rpms/cfengine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27591

Modified Files:
	.cvsignore cfengine.spec sources 
Log Message:
Update to upstream 2.1.20



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cfengine/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	3 Mar 2006 13:12:26 -0000	1.10
+++ .cvsignore	1 Apr 2006 12:50:33 -0000	1.11
@@ -1,4 +1,4 @@
-cfengine-2.1.19p1.tar.gz
+cfengine-2.1.20.tar.gz
 cfenvd
 cfexecd
 cfservd


Index: cfengine.spec
===================================================================
RCS file: /cvs/extras/rpms/cfengine/devel/cfengine.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- cfengine.spec	3 Mar 2006 13:12:26 -0000	1.16
+++ cfengine.spec	1 Apr 2006 12:50:33 -0000	1.17
@@ -1,10 +1,10 @@
 Summary: A systems administration tool for networks
 Name: cfengine
-Version: 2.1.19p1
+Version: 2.1.20
 Release: 1%{?dist}
 License: GPL
 Group: Applications/System
-Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.19p1.tar.gz
+Source0: ftp://ftp.iu.hio.no/pub/cfengine/cfengine-2.1.20.tar.gz
 Source1: cfexecd
 Source2: cfservd
 Source3: cfenvd
@@ -118,6 +118,9 @@
 
 
 %changelog
+* Fri Mar 31 2006 Jeff Sheltren <sheltren at cs.ucsb.edu> - 2.1.20-1
+- Update to upstream 2.1.20
+
 * Thu Mar  2 2006 Jeff Sheltren <sheltren at cs.ucsb.edu> - 2.1.19p1-1
 - Update to upstream 2.1.19p1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cfengine/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	3 Mar 2006 13:12:26 -0000	1.10
+++ sources	1 Apr 2006 12:50:33 -0000	1.11
@@ -1,4 +1,4 @@
-0524e0bcbf947d021c78f8c37461c323  cfengine-2.1.19p1.tar.gz
+2510349fef9ccc47d80f133d4a35322e  cfengine-2.1.20.tar.gz
 37c565f98d2b252c9c6cf1c88d654e02  cfenvd
 19f07f0d576abf8bf8cb875ab6ad66c6  cfexecd
 fe6c086a41f428d47bde30646e0310c4  cfservd



From fedora-extras-commits at redhat.com  Sat Apr  1 15:36:13 2006
From: fedora-extras-commits at redhat.com (James Bowes (jbowes))
Date: Sat,  1 Apr 2006 08:36:13 -0700
Subject: rpms/pwgen - New directory
Message-ID: <200604011536.k31FaFYY001844@cvs-int.fedora.redhat.com>

Author: jbowes

Update of /cvs/extras/rpms/pwgen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1817/pwgen

Log Message:
Directory /cvs/extras/rpms/pwgen added to the repository




From fedora-extras-commits at redhat.com  Sat Apr  1 15:36:13 2006
From: fedora-extras-commits at redhat.com (James Bowes (jbowes))
Date: Sat,  1 Apr 2006 08:36:13 -0700
Subject: rpms/pwgen/devel - New directory
Message-ID: <200604011536.k31FaFM4001847@cvs-int.fedora.redhat.com>

Author: jbowes

Update of /cvs/extras/rpms/pwgen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1817/pwgen/devel

Log Message:
Directory /cvs/extras/rpms/pwgen/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Apr  1 15:36:26 2006
From: fedora-extras-commits at redhat.com (James Bowes (jbowes))
Date: Sat,  1 Apr 2006 08:36:26 -0700
Subject: rpms/pwgen Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604011536.k31FaSEK001893@cvs-int.fedora.redhat.com>

Author: jbowes

Update of /cvs/extras/rpms/pwgen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1864

Added Files:
	Makefile import.log 
Log Message:
Setup of module pwgen


--- NEW FILE Makefile ---
# Top level Makefile for module pwgen
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr  1 15:36:27 2006
From: fedora-extras-commits at redhat.com (James Bowes (jbowes))
Date: Sat,  1 Apr 2006 08:36:27 -0700
Subject: rpms/pwgen/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200604011536.k31FaTZh001896@cvs-int.fedora.redhat.com>

Author: jbowes

Update of /cvs/extras/rpms/pwgen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1864/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pwgen


--- 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 Apr  1 15:36:47 2006
From: fedora-extras-commits at redhat.com (James Bowes (jbowes))
Date: Sat,  1 Apr 2006 08:36:47 -0700
Subject: rpms/pwgen import.log,1.1,1.2
Message-ID: <200604011537.k31FbJXI001968@cvs-int.fedora.redhat.com>

Author: jbowes

Update of /cvs/extras/rpms/pwgen
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1931

Modified Files:
	import.log 
Log Message:
auto-import pwgen-2.05-3 on branch devel from pwgen-2.05-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pwgen/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	1 Apr 2006 15:36:26 -0000	1.1
+++ import.log	1 Apr 2006 15:36:47 -0000	1.2
@@ -0,0 +1 @@
+pwgen-2_05-3:HEAD:pwgen-2.05-3.src.rpm:1143905804



From fedora-extras-commits at redhat.com  Sat Apr  1 15:36:48 2006
From: fedora-extras-commits at redhat.com (James Bowes (jbowes))
Date: Sat,  1 Apr 2006 08:36:48 -0700
Subject: rpms/pwgen/devel pwgen.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200604011537.k31FbK52001974@cvs-int.fedora.redhat.com>

Author: jbowes

Update of /cvs/extras/rpms/pwgen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1931/devel

Modified Files:
	.cvsignore sources 
Added Files:
	pwgen.spec 
Log Message:
auto-import pwgen-2.05-3 on branch devel from pwgen-2.05-3.src.rpm


--- NEW FILE pwgen.spec ---
Name:           pwgen
Version:        2.05
Release:        3%{?dist}
Summary:        Automatic password generation

Group:          Applications/System
License:        GPL 
URL:            http://sf.net/projects/pwgen
Source0:        http://dl.sf.net/pwgen/pwgen-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
pwgen generates random, meaningless but pronounceable passwords. These
passwords contain either only lowercase letters, or upper and lower case, or
upper case, lower case and numeric digits. Upper case letters and numeric
digits are placed in a way that eases memorizing the password.

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog
%{_bindir}/pwgen
%{_mandir}/man1/pwgen.1.*


%changelog
* Sat Mar 25 2006 James Bowes <jbowes at redhat.com> - 2.05-3
- Add dist tag to release.
- Don't strip binary, since rpmbuild will do it.
* Fri Mar 24 2006 James Bowes <jbowes at redhat.com> - 2.05-2
- Use url for Source0 in spec file.
- Use glob for man page extension.
- Increment release number.
* Sun Mar 12 2006 James Bowes <jbowes at redhat.com> - 2.05-1
- Initial Fedora packaging.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pwgen/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Apr 2006 15:36:26 -0000	1.1
+++ .cvsignore	1 Apr 2006 15:36:48 -0000	1.2
@@ -0,0 +1 @@
+pwgen-2.05.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pwgen/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Apr 2006 15:36:26 -0000	1.1
+++ sources	1 Apr 2006 15:36:48 -0000	1.2
@@ -0,0 +1 @@
+b94546a346cb352054ea2d3d09f7f885  pwgen-2.05.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  1 15:49:41 2006
From: fedora-extras-commits at redhat.com (James Bowes (jbowes))
Date: Sat,  1 Apr 2006 08:49:41 -0700
Subject: owners owners.list,1.787,1.788
Message-ID: <200604011549.k31Fnh0e002086@cvs-int.fedora.redhat.com>

Author: jbowes

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2067

Modified Files:
	owners.list 
Log Message:
Add myself as pwgen owner


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.787
retrieving revision 1.788
diff -u -r1.787 -r1.788
--- owners.list	31 Mar 2006 22:45:51 -0000	1.787
+++ owners.list	1 Apr 2006 15:49:41 -0000	1.788
@@ -1158,6 +1158,7 @@
 Fedora Extras|pth|GNU Pth - The GNU Portable Threads|bugs.michael at gmx.net|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|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|
 Fedora Extras|pydot|Python interface to Graphviz's Dot language|tcallawa at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Apr  1 15:52:44 2006
From: fedora-extras-commits at redhat.com (James Bowes (jbowes))
Date: Sat,  1 Apr 2006 08:52:44 -0700
Subject: rpms/pwgen/devel pwgen.spec,1.1,1.2
Message-ID: <200604011552.k31FqkW5002122@cvs-int.fedora.redhat.com>

Author: jbowes

Update of /cvs/extras/rpms/pwgen/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2105

Modified Files:
	pwgen.spec 
Log Message:
Fix man page file globbing. Add spaces between changelog entries.


Index: pwgen.spec
===================================================================
RCS file: /cvs/extras/rpms/pwgen/devel/pwgen.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pwgen.spec	1 Apr 2006 15:36:48 -0000	1.1
+++ pwgen.spec	1 Apr 2006 15:52:44 -0000	1.2
@@ -37,16 +37,17 @@
 %defattr(-,root,root,-)
 %doc ChangeLog
 %{_bindir}/pwgen
-%{_mandir}/man1/pwgen.1.*
+%{_mandir}/man1/pwgen.1*
 
 
 %changelog
 * Sat Mar 25 2006 James Bowes <jbowes at redhat.com> - 2.05-3
 - Add dist tag to release.
 - Don't strip binary, since rpmbuild will do it.
+
 * Fri Mar 24 2006 James Bowes <jbowes at redhat.com> - 2.05-2
 - Use url for Source0 in spec file.
 - Use glob for man page extension.
-- Increment release number.
+
 * Sun Mar 12 2006 James Bowes <jbowes at redhat.com> - 2.05-1
 - Initial Fedora packaging.



From fedora-extras-commits at redhat.com  Sat Apr  1 18:01:02 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  1 Apr 2006 11:01:02 -0700
Subject: rpms/libmpcdec - New directory
Message-ID: <200604011801.k31I14Ji008283@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libmpcdec
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7746/libmpcdec

Log Message:
Directory /cvs/extras/rpms/libmpcdec added to the repository




From fedora-extras-commits at redhat.com  Sat Apr  1 18:01:03 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  1 Apr 2006 11:01:03 -0700
Subject: rpms/libmpcdec/devel - New directory
Message-ID: <200604011801.k31I15U7008404@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libmpcdec/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7746/libmpcdec/devel

Log Message:
Directory /cvs/extras/rpms/libmpcdec/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Apr  1 18:01:12 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  1 Apr 2006 11:01:12 -0700
Subject: rpms/libmpcdec Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604011801.k31I1FUO008508@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libmpcdec
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8494

Added Files:
	Makefile import.log 
Log Message:
Setup of module libmpcdec


--- NEW FILE Makefile ---
# Top level Makefile for module libmpcdec
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr  1 18:01:18 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  1 Apr 2006 11:01:18 -0700
Subject: rpms/libmpcdec/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604011801.k31I1Lii008528@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libmpcdec/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8494/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libmpcdec


--- 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 Apr  1 18:01:55 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  1 Apr 2006 11:01:55 -0700
Subject: rpms/libmpcdec import.log,1.1,1.2
Message-ID: <200604011802.k31I2VEa008604@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libmpcdec
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8570

Modified Files:
	import.log 
Log Message:
auto-import libmpcdec-1.2.2-1 on branch devel from libmpcdec-1.2.2-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libmpcdec/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	1 Apr 2006 18:01:12 -0000	1.1
+++ import.log	1 Apr 2006 18:01:55 -0000	1.2
@@ -0,0 +1 @@
+libmpcdec-1_2_2-1:HEAD:libmpcdec-1.2.2-1.src.rpm:1143914510



From fedora-extras-commits at redhat.com  Sat Apr  1 18:02:00 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  1 Apr 2006 11:02:00 -0700
Subject: rpms/libmpcdec/devel libmpcdec.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604011802.k31I2YDa008606@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libmpcdec/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8570/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libmpcdec.spec 
Log Message:
auto-import libmpcdec-1.2.2-1 on branch devel from libmpcdec-1.2.2-1.src.rpm


--- NEW FILE libmpcdec.spec ---

Summary: Musepack audio decoding library
Name:	 libmpcdec
Version: 1.2.2
Release: 1%{?dist}

License: LGPL
Group: 	 System Environment/Libraries
URL: 	 http://www.musepack.net/
Source:	 http://files2.musepack.net/source/libmpcdec-1.2.2.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Musepack is an audio compression format with a strong emphasis on high quality.
It's not lossless, but it is designed for transparency, so that you won't be
able to hear differences between the original wave file and the much smaller
MPC file.
It is based on the MPEG-1 Layer-2 / MP2 algorithms, but has rapidly developed
and vastly improved and is now at an advanced stage in which it contains
heavily optimized and patentless code.


%package devel
Summary: Development files for the Musepack audio decoding library
Group:	 Development/Libraries
Requires: %{name} = %{version}-%{release}
%description devel
%{summary}.


%prep
%setup -q


%build
%configure --disable-static

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT

make install DESTDIR=$RPM_BUILD_ROOT

#Unpackaged files
rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la


%clean
rm -rf $RPM_BUILD_ROOT 


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
%{_libdir}/lib*.so.*

%files devel
%defattr(-,root,root,-)
%doc docs/html/*
%{_includedir}/*
%{_libdir}/lib*.so


%changelog
* Thu Jan 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.2.2-1
- libmpcdec-1.2.2

* Thu Jan 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.1-2
- cleanup

* Fri Jun 17 2005 Mihai Maties <mihai at xcyb.org> 1.1-1
- update to 1.1
- changed license to BSD
- updated the spec to use autotools

* Fri Nov 26 2004 Matthias Saou <http://freshrpms.net/> 1.0.2-1
- Initial RPM release.
- Include the mandatory copy of the LGPL (there is none in the sources...).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libmpcdec/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Apr 2006 18:01:18 -0000	1.1
+++ .cvsignore	1 Apr 2006 18:02:00 -0000	1.2
@@ -0,0 +1 @@
+libmpcdec-1.2.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libmpcdec/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Apr 2006 18:01:18 -0000	1.1
+++ sources	1 Apr 2006 18:02:00 -0000	1.2
@@ -0,0 +1 @@
+f14e07285b9b102a806649074c1d779b  libmpcdec-1.2.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Apr  1 18:08:13 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  1 Apr 2006 11:08:13 -0700
Subject: rpms/libmpcdec/devel libmpcdec.spec,1.1,1.2
Message-ID: <200604011808.k31I8Fl2008701@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libmpcdec/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8684

Modified Files:
	libmpcdec.spec 
Log Message:
* Sat Apr 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.2.2-2
- License: BSD



Index: libmpcdec.spec
===================================================================
RCS file: /cvs/extras/rpms/libmpcdec/devel/libmpcdec.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libmpcdec.spec	1 Apr 2006 18:02:00 -0000	1.1
+++ libmpcdec.spec	1 Apr 2006 18:08:13 -0000	1.2
@@ -2,9 +2,9 @@
 Summary: Musepack audio decoding library
 Name:	 libmpcdec
 Version: 1.2.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 
-License: LGPL
+License: BSD 
 Group: 	 System Environment/Libraries
 URL: 	 http://www.musepack.net/
 Source:	 http://files2.musepack.net/source/libmpcdec-1.2.2.tar.bz2
@@ -19,7 +19,6 @@
 and vastly improved and is now at an advanced stage in which it contains
 heavily optimized and patentless code.
 
-
 %package devel
 Summary: Development files for the Musepack audio decoding library
 Group:	 Development/Libraries
@@ -69,6 +68,9 @@
 
 
 %changelog
+* Sat Apr 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.2.2-2
+- License: BSD
+
 * Thu Jan 19 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.2.2-1
 - libmpcdec-1.2.2
 



From fedora-extras-commits at redhat.com  Sat Apr  1 18:19:35 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Sat,  1 Apr 2006 11:19:35 -0700
Subject: rpms/gnokii - New directory
Message-ID: <200604011819.k31IJb2s008839@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/gnokii
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8813/gnokii

Log Message:
Directory /cvs/extras/rpms/gnokii added to the repository




From fedora-extras-commits at redhat.com  Sat Apr  1 18:19:36 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Sat,  1 Apr 2006 11:19:36 -0700
Subject: rpms/gnokii/devel - New directory
Message-ID: <200604011819.k31IJcYK008842@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/gnokii/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8813/gnokii/devel

Log Message:
Directory /cvs/extras/rpms/gnokii/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Apr  1 18:19:55 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Sat,  1 Apr 2006 11:19:55 -0700
Subject: rpms/gnokii Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604011819.k31IJvR1008886@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/gnokii
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8858

Added Files:
	Makefile import.log 
Log Message:
Setup of module gnokii


--- NEW FILE Makefile ---
# Top level Makefile for module gnokii
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr  1 18:19:55 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Sat,  1 Apr 2006 11:19:55 -0700
Subject: rpms/gnokii/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604011820.k31IJvno008889@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/gnokii/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8858/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gnokii


--- 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 Apr  1 18:24:59 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Sat,  1 Apr 2006 11:24:59 -0700
Subject: rpms/gnokii import.log,1.1,1.2
Message-ID: <200604011825.k31IP16Z009024@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/gnokii
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8980

Modified Files:
	import.log 
Log Message:
auto-import gnokii-0.6.12-2 on branch devel from gnokii-0.6.12-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnokii/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	1 Apr 2006 18:19:55 -0000	1.1
+++ import.log	1 Apr 2006 18:24:58 -0000	1.2
@@ -0,0 +1 @@
+gnokii-0_6_12-2:HEAD:gnokii-0.6.12-2.src.rpm:1143915886



From fedora-extras-commits at redhat.com  Sat Apr  1 18:24:59 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Sat,  1 Apr 2006 11:24:59 -0700
Subject: rpms/gnokii/devel gnokii-config.patch, NONE,
	1.1 gnokii-htmlview.patch, NONE, 1.1 gnokii-pkgconfig.patch, NONE,
	1.1 gnokii-smsd-README.smsd2mail, NONE,
	1.1 gnokii-smsd-rename.patch, NONE, 1.1 gnokii-smsd-sql.patch,
	NONE, 1.1 gnokii-smsd.init, NONE, 1.1 gnokii-smsd.logrotate,
	NONE, 1.1 gnokii-smsd.sysconfig, NONE, 1.1 gnokii-smsd2mail.sh,
	NONE, 1.1 gnokii-xgnokii-pkgconfig.patch, NONE, 1.1 gnokii.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604011825.k31IP1mB009041@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/gnokii/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8980/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gnokii-config.patch gnokii-htmlview.patch 
	gnokii-pkgconfig.patch gnokii-smsd-README.smsd2mail 
	gnokii-smsd-rename.patch gnokii-smsd-sql.patch 
	gnokii-smsd.init gnokii-smsd.logrotate gnokii-smsd.sysconfig 
	gnokii-smsd2mail.sh gnokii-xgnokii-pkgconfig.patch gnokii.spec 
Log Message:
auto-import gnokii-0.6.12-2 on branch devel from gnokii-0.6.12-2.src.rpm

gnokii-config.patch:

--- NEW FILE gnokii-config.patch ---
--- Docs/sample/gnokiirc~	2005-07-24 22:16:22.000000000 +0300
+++ Docs/sample/gnokiirc	2005-08-06 23:33:26.000000000 +0300
@@ -59,7 +59,7 @@
 # port software (eg. minicom). If you have wrong permissions for the
 # directory, a warning will be generated. If you don't want a lockfile, set
 # it to 'no'.
-use_locking = yes
+use_locking = no
 
 # Baudrate to use on serial port connections.
 # Currently used only by models AT and BIP/CIMD. Defaults to 19200.
@@ -115,7 +115,7 @@
 # permissions 4750, owned by root, group gnokii.  Ensure you
 # are in the gnokii group and that the group exists...
 [gnokiid]
-bindir = /usr/local/sbin/
+bindir = /usr/sbin/
 
 # Any entries in the following two sections will be set as environment
 # variables when running the scripts.

gnokii-htmlview.patch:

--- NEW FILE gnokii-htmlview.patch ---
--- xgnokii/xgnokii_cfg.c~	2006-02-15 23:49:56.000000000 +0100
+++ xgnokii/xgnokii_cfg.c	2006-03-05 21:27:15.000000000 +0100
@@ -73,7 +73,7 @@
 	xgnokiiConfig.user.fax = g_strdup("");
 	xgnokiiConfig.user.email = g_strdup("");
 	xgnokiiConfig.user.address = g_strdup("");
-	xgnokiiConfig.helpviewer = g_strdup("mozilla");
+	xgnokiiConfig.helpviewer = g_strdup("htmlview");
 	if ((homedir = g_get_home_dir()) == NULL)
 		homedir = "";
 	xgnokiiConfig.mailbox = g_strdup_printf("%s/Mail/smsbox", homedir);

gnokii-pkgconfig.patch:

--- NEW FILE gnokii-pkgconfig.patch ---
--- common/gnokii.pc.in~	2006-02-15 23:49:56.000000000 +0100
+++ common/gnokii.pc.in	2006-03-05 21:40:46.000000000 +0100
@@ -6,5 +6,5 @@
 Name: gnokii
 Description: Gnokii library interface
 Version: @VERSION@
-Libs: -L${libdir} -lgnokii @LIBS@ @XPM_LIBS@ @LIBICONV@
-Cflags: -I${includedir} @CFLAGS@ @XPM_CFLAGS@
+Libs: -L${libdir} -lgnokii
+Cflags: -I${includedir}


--- NEW FILE gnokii-smsd-README.smsd2mail ---
* Make the gnokii user a member of a group that has read and write access to
  the SMS device.  For example on RHL-9 and later and ttyS0, add gnokii to the
  uucp group.  See "ls -l /dev/ttyS*".

* Copy smsd2mail.sh somewhere, eg. /usr/local/sbin, make sure it's executable
  by the gnokii user.

* Configure SMSD_OPTIONS in /etc/sysconfig/gnokii-smsd like:

  SMSD_OPTS="-u /usr/local/sbin/smsd2mail.sh -m file"

gnokii-smsd-rename.patch:

--- NEW FILE gnokii-smsd-rename.patch ---
diff -ru smsd.orig/Makefile smsd/Makefile
--- smsd.orig/Makefile	2005-07-24 22:16:22.000000000 +0300
+++ smsd/Makefile	2005-08-06 23:54:55.000000000 +0300
@@ -20,7 +20,9 @@
 
 SMSD_MAN=man/smsd.8
 
-CFLAGS += -DMODULES_DIR=\"${libdir}/smsd\" $(PTHREAD_CFLAGS) \
+pkglibdir = ${libdir}/gnokii-smsd
+
+CFLAGS += -DMODULES_DIR=\"$(pkglibdir)\" $(PTHREAD_CFLAGS) \
 	  $(shell $(GLIBCFLAGS))
 
 LDLIBS += $(PTHREAD_LIBS) \
@@ -56,7 +58,7 @@
 libpq.la: pq.lo
 	$(LIBTOOL) --mode=link $(CC) -o libpq.la pq.lo \
 	$(shell $(GLIBLDLIBS)) -L$(shell pg_config --libdir) -lpq \
-	-export-dynamic -avoid-version -rpath ${libdir}/smsd
+	-export-dynamic -avoid-version -rpath $(pkglibdir)
 
 # MySQL support
 mysql.lo: smsd.h mysql.c
@@ -66,7 +68,7 @@
 libmysql.la: mysql.lo
 	$(LIBTOOL) --mode=link $(CC) -o libmysql.la mysql.lo \
 	$(shell $(GLIBLDLIBS)) $(shell mysql_config --libs) \
-	-export-dynamic -avoid-version -rpath ${libdir}/smsd
+	-export-dynamic -avoid-version -rpath $(pkglibdir)
 
 # File support
 file.lo: smsd.h file.c
@@ -76,7 +78,7 @@
 libfile.la: file.lo
 	$(LIBTOOL) --mode=link $(CC) -o libfile.la file.lo \
 	$(shell $(GLIBLDLIBS)) \
-	-export-dynamic -avoid-version -rpath ${libdir}/smsd
+	-export-dynamic -avoid-version -rpath $(pkglibdir)
 
 ### End of DB Modules
 
@@ -90,11 +92,11 @@
 install: all
 	$(INSTALL) -d $(DESTDIR)$(sbindir)
 	$(LIBTOOL) --mode=install $(INSTALL) -m 755 smsd $(DESTDIR)$(sbindir)
-	$(INSTALL) -d $(DESTDIR)${libdir}/smsd
+	$(INSTALL) -d $(DESTDIR)$(pkglibdir)
 	for f in $(DB_LIBS) ; do \
-	$(LIBTOOL) --mode=install $(INSTALL) $$f $(DESTDIR)${libdir}/smsd ; \
+	$(LIBTOOL) --mode=install $(INSTALL) $$f $(DESTDIR)$(pkglibdir) ; \
 	done
-	$(LIBTOOL) --mode=finish ${libdir}/smsd
+	$(LIBTOOL) --mode=finish $(pkglibdir)
 	$(INSTALL) -d $(DESTDIR)$(man8dir)
 	$(INSTALL_DATA) $(SMSD_MAN) $(DESTDIR)$(man8dir)
 
diff -ru smsd.orig/man/smsd.8 smsd/man/smsd.8
--- smsd.orig/man/smsd.8	2005-07-24 22:16:22.000000000 +0300
+++ smsd/man/smsd.8	2005-08-06 23:51:36.000000000 +0300
@@ -1,13 +1,13 @@
-.TH "smsd" "8" "April  26, 2005" "" "Gnokii"
+.TH "gnokii-smsd" "8" "April  26, 2005" "" "Gnokii"
 .SH "NAME"
-smsd \- daemon for handling incoming and outgoing SMSes using libgnokii
+gnokii-smsd \- daemon for handling incoming and outgoing SMSes using libgnokii
 .SH "SYNOPSIS"
-.B smsd \fI[OPTIONS]\fR
+.B gnokii-smsd \fI[OPTIONS]\fR
 
 .SH "DESCRIPTION"
 .PP 
 The
-.B SMSD
+.B gnokii-smsd
 (SMS daemon) program is intended for receiving and sending SMSes.
 
 .PP

gnokii-smsd-sql.patch:

--- NEW FILE gnokii-smsd-sql.patch ---
diff -ru gnokii-0.6.8.orig/smsd/sms.tables.mysql.sql gnokii-0.6.8/smsd/sms.tables.mysql.sql
--- gnokii-0.6.8.orig/smsd/sms.tables.mysql.sql	2005-07-24 22:16:22.000000000 +0300
+++ gnokii-0.6.8/smsd/sms.tables.mysql.sql	2005-08-06 23:13:49.000000000 +0300
@@ -1,12 +1,6 @@
-# MySQL dump 8.13
-#
-# Host: localhost    Database: sms
-#--------------------------------------------------------
-# Server version	3.23.36
+-- CREATE DATABASE smsd;
 
-#
-# Table structure for table 'inbox'
-#
+-- USE smsd;
 
 CREATE TABLE inbox (
   id int(10) unsigned NOT NULL auto_increment,
@@ -17,16 +11,7 @@
   phone tinyint(4),
   processed tinyint(4) NOT NULL default '0',
   PRIMARY KEY  (id)
-) TYPE=MyISAM;
-
-#
-# Dumping data for table 'inbox'
-#
-
-
-#
-# Table structure for table 'outbox'
-#
+);
 
 CREATE TABLE outbox (
   id int(10) unsigned NOT NULL auto_increment,
@@ -41,10 +26,8 @@
   not_before time NOT NULL default '00:00:00',
   not_after time  NOT NULL default '23:59:59',
   PRIMARY KEY  (id)
-) TYPE=MyISAM;
-
-#
-# Dumping data for table 'outbox'
-#
-
+);
 
+-- CREATE INDEX outbox_processed_ix ON outbox (processed);
+ 
+-- GRANT SELECT, INSERT, UPDATE, DELETE ON smsd.* TO smsd at localhost;
diff -ru gnokii-0.6.8.orig/smsd/sms.tables.pq.sql gnokii-0.6.8/smsd/sms.tables.pq.sql
--- gnokii-0.6.8.orig/smsd/sms.tables.pq.sql	2005-07-24 22:16:22.000000000 +0300
+++ gnokii-0.6.8/smsd/sms.tables.pq.sql	2005-08-06 23:13:49.000000000 +0300
@@ -1,3 +1,14 @@
+-- \set ON_ERROR_STOP 1;
+-- CREATE USER "smsd" WITH NOCREATEDB NOCREATEUSER;
+-- CREATE DATABASE "smsd" WITH OWNER = "smsd";
+-- \connect "smsd" "smsd"
+-- COMMENT ON DATABASE "smsd" IS 'Gnokii SMSD Database';
+-- \set ON_ERROR_STOP 1;
+-- CREATE USER "smsd" WITH NOCREATEDB NOCREATEUSER;
+-- CREATE DATABASE "smsd" WITH OWNER = "smsd";
+-- \connect "smsd" "smsd"
+-- COMMENT ON DATABASE "smsd" IS 'Gnokii SMSD Database';
+
 CREATE TABLE "inbox" (
 	"id" serial,
 	"number" character varying(20) NOT NULL,
@@ -23,3 +34,5 @@
         "not_after" time without time zone DEFAULT '23:59:59' NOT NULL,
 	PRIMARY KEY ("id")
 );
+
+-- CREATE INDEX "outbox_processed_ix" ON "outbox" (processed);


--- NEW FILE gnokii-smsd.init ---
#!/bin/sh
#
# gnokii-smsd  Starts and stops the Gnokii SMS daemon
#
# chkconfig:   - 95 05
#
# processname: gnokii-smsd
# description: Gnokii SMS daemon receives and sends SMS messages.
# config:      /etc/gnokiirc
# config:      /etc/sysconfig/gnokii-smsd

exec=/usr/sbin/gnokii-smsd
prog=$(basename $exec)

# Make sure relevant files exist
[ -x $exec -a -e /etc/sysconfig/gnokii-smsd ] || exit 0

# Source SMSD configuration.
. /etc/sysconfig/gnokii-smsd

[ -n "$SMSD_OPTS" ] || exit 0
[ -z "$SMSD_LOG"  ] || SMSD_OPTS="$SMSD_OPTS --logfile \"$SMSD_LOG\""

# Source function library.
. /etc/rc.d/init.d/functions

lockfile=/var/lock/subsys/$prog

start() {
    # Ensure that we have a writable log file.
    if [ -n "$SMSD_LOG" ]; then
        [ -e "$SMSD_LOG" ] || > "$SMSD_LOG"
        chmod 0640 "$SMSD_LOG"
        chown gnokii:gnokii "$SMSD_LOG"
    fi
    echo -n $"Starting Gnokii SMS daemon ($prog): "
    daemon --user gnokii $exec $SMSD_OPTS \&
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop() {
    echo -n $"Stopping Gnokii SMS daemon ($prog): "
    killproc $prog
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

restart() {
    stop
    start
}

# See how we were called.
case "$1" in
  start|stop|restart)
    $1
    ;;
  reload|force-reload)
    restart
    ;;
  condrestart|try-restart)
    [ ! -f $lockfile ] || restart
    ;;
  status)
    status $prog
    ;;
  *)
    echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
    exit 2
esac


--- NEW FILE gnokii-smsd.logrotate ---
/var/log/gnokii-smsd {
    missingok
    notifempty
    create 0640 gnokii gnokii
}


--- NEW FILE gnokii-smsd.sysconfig ---
#                                                                    -*- sh -*-
# All options to Gnokii SMS daemon (gnokii-smsd), *except* log file.
#
# Note that due to security reasons, it is not advisable to set the
# database password here (if you can avoid doing so) because it may be
# visible in eg. ps(1) output.
#
# Example:
#  SMSD_OPTS="--user smsd --db smsd --host 127.0.0.1 --module pq"
#

SMSD_OPTS=""

#
# Log file location.  If you adjust this, see also /etc/logrotate.d/gnokii-smsd
#

SMSD_LOG="/var/log/gnokii-smsd"


--- NEW FILE gnokii-smsd2mail.sh ---
#!/bin/sh
TO=root at localhost
( echo From: $1 ; echo Date: $2 ; echo ; cat ) | mail -s "SMS from $1" $TO

gnokii-xgnokii-pkgconfig.patch:

--- NEW FILE gnokii-xgnokii-pkgconfig.patch ---
--- xgnokii/xgnokii.pc.in~	2006-02-15 23:49:56.000000000 +0100
+++ xgnokii/xgnokii.pc.in	2006-03-08 20:52:36.000000000 +0100
@@ -7,5 +7,5 @@
 Name: xgnokii
 Description: GTK2 gnokii library interface
 Version: @XVERSION@
-Libs: -L${libdir} -lgnokii @LIBS@ @XPM_LIBS@ @LIBICONV@
-Cflags: -I${includedir} @CFLAGS@ @XPM_CFLAGS@
+Libs: -L${libdir} -lgnokii
+Cflags: -I${includedir}


--- NEW FILE gnokii.spec ---
# TODO: DKU2 kernel module (usb-serial.h missing from kernel-devel)
# TODO: merge patches upstream where applicable

Name:           gnokii
Version:        0.6.12
Release:        2%{?dist}
Summary:        Linux/Unix tool suite for various mobile phones

Group:          Applications/Communications
License:        GPL
URL:            http://www.gnokii.org/
Source0:        http://www.gnokii.org/download/gnokii/%{name}-%{version}.tar.bz2
Source2:        %{name}-smsd.init
Source3:        %{name}-smsd.sysconfig
Source4:        %{name}-smsd.logrotate
Source5:        %{name}-smsd2mail.sh
Source6:        %{name}-smsd-README.smsd2mail
# Patch to make gnokii use "htmlview" instead of "mozilla" as default browser
Patch0:         %{name}-htmlview.patch
# Patch to also guide the user on how to create the smsd database without presupposing 
# it already exists plus a more apropriate index setup.
Patch1:         %{name}-smsd-sql.patch
# Patch to remove port locking and apply the system-wide /usr/sbin directory
# to the path instead of the default /usr/local
Patch2:         %{name}-config.patch
# Patch to rename smdsd to gnokii-smsd (also in doc)
Patch3:         %{name}-smsd-rename.patch
# Patch to fix the superfluous include statements
Patch4:         %{name}-pkgconfig.patch
Patch5:		%{name}-xgnokii-pkgconfig.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  flex
BuildRequires:  gettext
BuildRequires:  gtk2-devel
BuildRequires:  desktop-file-utils
BuildRequires:  ImageMagick
BuildRequires:  postgresql-devel
BuildRequires:  mysql-devel
BuildRequires:  zlib-devel
BuildRequires:  bluez-libs-devel
%{?_with_libical:BuildRequires: libical-devel >= 0.24}
%if "%fedora" >= "5"
BuildRequires:	libXt-devel
BuildRequires:	libXpm-devel 
%else
# openssl-devel: https://bugzilla.redhat.com/159569
BuildRequires:  openssl-devel
%endif
Requires(pre):  %{_sbindir}/groupadd

%description
Gnokii provides tools and a user space driver for use with mobile
phones under Linux, various unices and Win32. With gnokii you can do
such things as make data calls, update your address book, change
calendar entires, send and receive SMS messages and load ring tones
depending on the phone you have.

%package     -n xgnokii
Summary:        Graphical Linux/Unix tool suite for various mobile phones
Group:          Applications/Communications
Requires:       %{name} = %{version}-%{release}

%description -n xgnokii
Xgnokii is graphical Linux/Unix tool suite for various mobile
phones. It allows you to edit your contacts book, send/read SMS's
from/in computer and more other features.

%package        smsd
Summary:        Gnokii SMS daemon
Group:          System Environment/Daemons
Requires:       %{name} = %{version}-%{release}
Requires(pre):  %{_sbindir}/useradd
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig

%description    smsd
The Gnokii SMS daemon receives and sends SMS messages.

%package        smsd-pgsql
Summary:        PostgreSQL support for Gnokii SMS daemon
Group:          System Environment/Daemons
Requires:       %{name}-smsd = %{version}-%{release}
Obsoletes:      %{name}-smsd-postgresql < 0.6.4-0.lvn.2

%description    smsd-pgsql
%{summary}.

%package        smsd-mysql
Summary:        MySQL support for Gnokii SMS daemon
Group:          System Environment/Daemons
Requires:       %{name}-smsd = %{version}-%{release}

%description    smsd-mysql
%{summary}.

%package        devel
Summary:        Gnokii development files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       pkgconfig

%description    devel
%{summary}.


%prep
%setup -q
%patch0 -p0
%patch1 -p1
%patch2 -p0
%patch3 -p0
%patch4 -p0
%patch5 -p0
install -pm 644 %{SOURCE5} smsd2mail.sh
install -pm 644 %{SOURCE6} README.smsd2mail
# Fix up X86_64 library placement issue
%{__sed} -i -e 's|/lib /usr/lib\b|/%{_lib} %{_libdir}|' configure


%build
%configure --enable-security --disable-rpath --disable-static \
  %{?_with_libical:--with-libical=%{_prefix}}
make # -j X for X > 1 fails as of 0.5.6 - 0.6.7
make %{?_smp_mflags} -C smsd all libpq.la libmysql.la libfile.la


%install
rm -rf $RPM_BUILD_ROOT __docinst

make install install-docs DESTDIR=$RPM_BUILD_ROOT \
  xmandir=%{_mandir}/man1 docdir=/__docinst

mv $RPM_BUILD_ROOT/__docinst .
rm __docinst/{README-MacOSX,README-WIN32,packaging-howto}

make install DESTDIR=$RPM_BUILD_ROOT pkglibdir=%{_libdir}/gnokii-smsd -C smsd \
  DB_LIBS="libfile.la libpq.la libmysql.la"
mv $RPM_BUILD_ROOT%{_sbindir}/{,gnokii-}smsd
mv $RPM_BUILD_ROOT%{_mandir}/man8/{,gnokii-}smsd.8

rm $RPM_BUILD_ROOT%{_libdir}{,/gnokii-smsd}/lib*.la

install -Dpm 644 Docs/sample/gnokiirc $RPM_BUILD_ROOT%{_sysconfdir}/gnokiirc

desktop-file-install \
  --delete-original \
  --vendor fedora \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
  --mode 644 \
  --add-category X-Fedora \
  $RPM_BUILD_ROOT%{_datadir}/applications/xgnokii.desktop

install -dm 755 $RPM_BUILD_ROOT%{_datadir}/pixmaps
convert Docs/sample/logo/gnokii.xpm \
  $RPM_BUILD_ROOT%{_datadir}/pixmaps/xgnokii.png
chmod 644 $RPM_BUILD_ROOT%{_datadir}/pixmaps/xgnokii.png

install -Dpm 755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/gnokii-smsd
install -Dpm 640 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/gnokii-smsd
install -Dpm 644 %{SOURCE4} \
  $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/gnokii-smsd

iconv -f iso8859-2 -t utf8 -o iconv.tmp ChangeLog
mv iconv.tmp ChangeLog
iconv -f iso8859-2 -t utf8 -o iconv.tmp Docs/CREDITS
mv iconv.tmp Docs/CREDITS
iconv -f iso8859-2 -t utf8 -o iconv.tmp Docs/README
mv iconv.tmp Docs/README
iconv -f iso8859-2 -t utf8 -o iconv.tmp COPYRIGHT
mv iconv.tmp COPYRIGHT
iconv -f iso8859-2 -t utf8 -o iconv.tmp smsd/ChangeLog
mv iconv.tmp smsd/ChangeLog
iconv -f iso8859-2 -t utf8 -o iconv.tmp xgnokii/ChangeLog
mv iconv.tmp xgnokii/ChangeLog



%find_lang %{name}


%clean
rm -rf $RPM_BUILD_ROOT


%pre
%{_sbindir}/groupadd -r gnokii >/dev/null 2>&1 || :

%pre smsd
%{_sbindir}/useradd -r -M -d / -g gnokii \
  -s /sbin/nologin -c "Gnokii system user" gnokii >/dev/null 2>&1 || :

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%post smsd
/sbin/chkconfig --add gnokii-smsd

%preun smsd
if [ $1 -eq 0 ] ; then
  %{_initrddir}/gnokii-smsd stop >/dev/null 2>&1 || :
  /sbin/chkconfig --del gnokii-smsd
fi

%postun smsd
if [ $1 -ge 1 ] ; then
  %{_initrddir}/gnokii-smsd try-restart >/dev/null 2>&1 || :
fi


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc ChangeLog COPY* MAINTAINERS TODO VERSION __docinst/*
%config(noreplace) %{_sysconfdir}/gnokiirc
%attr(4750,root,gnokii) %{_sbindir}/mgnokiidev
%{_bindir}/gnokii
%{_bindir}/ppm2nokia
%{_bindir}/sendsms
%{_bindir}/todologo
%{_sbindir}/gnokiid
%{_libdir}/libgnokii.so.*
%{_mandir}/man1/gnokii.1*
%{_mandir}/man1/ppm2nokia.1*
%{_mandir}/man1/sendsms.1*
%{_mandir}/man1/todologo.1*
%{_mandir}/man8/gnokiid.8*
%{_mandir}/man8/mgnokiidev.8*

%files -n xgnokii
%defattr(-,root,root,-)
%doc xgnokii/ChangeLog xgnokii/README.vcard xgnokii/VERSION
%{_bindir}/xgnokii
%{_datadir}/pixmaps/xgnokii.png
%{_datadir}/applications/*xgnokii.desktop
%{_datadir}/xgnokii/
%{_mandir}/man1/xgnokii.1*

%files smsd
%defattr(-,root,root,-)
%doc smsd/action smsd/ChangeLog smsd/README README.smsd2mail smsd2mail.sh
%attr(-,gnokii,gnokii) %config(noreplace) %{_sysconfdir}/sysconfig/gnokii-smsd
%config(noreplace) %{_sysconfdir}/logrotate.d/gnokii-smsd
%{_initrddir}/gnokii-smsd
%{_sbindir}/gnokii-smsd
%{_mandir}/man8/gnokii-smsd.8*
%dir %{_libdir}/gnokii-smsd/
%{_libdir}/gnokii-smsd/libfile.so

%files smsd-pgsql
%defattr(-,root,root,-)
%doc smsd/sms.tables.pq.sql
%{_libdir}/gnokii-smsd/libpq.so

%files smsd-mysql
%defattr(-,root,root,-)
%doc smsd/sms.tables.mysql.sql
%{_libdir}/gnokii-smsd/libmysql.so

%files devel
%defattr(-,root,root,-)
%{_includedir}/gnokii*
%{_libdir}/libgnokii.so
%{_libdir}/pkgconfig/gnokii.pc
%{_libdir}/pkgconfig/xgnokii.pc

%changelog
* Thu Mar 31 2006 Linus Walleij <triad at df.lth.se> - 0.6.12-2
- Updated after comments from Ville.

* Thu Mar 16 2006 Linus Walleij <triad at df.lth.se> - 0.6.12-1
- New upstream tarball

* Wed Mar 8 2006 Linus Walleij <triad at df.lth.se> - 0.6.11-2
- Updated after comments from Ville.

* Sun Mar 5 2006 Linus Walleij <triad at df.lth.se> - 0.6.11-1
- 0.6.11
- Modified to drop into the Fedora Extras as the nice package it now is
- Based work off Ville's good olde package

* Sun Nov 13 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.6.10-0.lvn.1
- 0.6.10.
- Clean up pkgconfig file and -devel dependencies from bits needed only
  for static libs.

* Thu Nov  3 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0.6.9-0.lvn.1
- 0.6.9, desktop entry file included upstream.
- Drop zero Epochs.

* Sat Aug  6 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.6.8-0.lvn.1
- 0.6.8.
- Don't ship static libraries.
- Rename smsd to gnokii-smsd to avoid conflicts with smstools.
- Remove not included files instead of using %%exclude.

* Sat Jun  4 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.6.7-0.lvn.2
- BuildRequire openssl-devel to work around https://bugzilla.redhat.com/159569

* Thu Jun  2 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.6.7-0.lvn.1
- 0.6.7.
- Build unconditionally with bluetooth support.

* Mon May  2 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.6.5-0.lvn.1
- 0.6.5.

* Fri Nov  5 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.6.4-0.lvn.2
- Rename -smsd-postgresql to -smsd-pgsql for consistency with other similar
  packages in FC/Extras.

* Fri Oct 22 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.6.4-0.lvn.1
- Update to 0.6.4, perms and pgsql patches applied upstream.
- Xgnokii help locale symlink hack no longer necessary.
- Don't remove user/group on last erase, move smsd user to -smsd subpackage.
- Add libical support (disabled), rebuild with "--with libical" to enable.

* Mon Jul  5 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.6.3-0.lvn.1
- Update to 0.6.3.

* Sun Jun 20 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.6.1-0.lvn.4
- Improve Xgnokii desktop entry according to GNOME HIG.

* Sun Jun 13 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.6.1-0.lvn.3
- Remove duplicate gettext build dependency (bug 95).

* Sun Jun  6 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.6.1-0.lvn.2
- Fix chown syntax in smsd init script.
- Summary and description improvements.
- Trim $RPM_OPT_FLAGS out from gnokii.pc.
- Make -devel require XFree86-devel.

* Sun Apr 18 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.6.1-0.lvn.1
- Update to 0.6.1.

* Thu Mar 18 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.6.0-0.lvn.2
- Make -devel require pkgconfig.

* Mon Feb 23 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.6.0-0.lvn.1
- Update to 0.6.0.

* Mon Feb  2 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.5.10-0.lvn.1
- Update to 0.5.10.

* Tue Jan 27 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.5.9-0.lvn.1
- Update to 0.5.9.
- Specfile cleanups, small init script enhancements.

* Sat Dec 27 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.5.7-0.lvn.1
- Update to 0.5.7.
- Move smsd man page into -smsd subpackage.

* Sat Nov 15 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.5.6-0.lvn.1
- Update to 0.5.6.
- Include sample action script for forwarding SMSD messages to mail.
- s/fedora/livna/.
- Specfile and init script cleanups.

* Sat Jul 19 2003 Warren Togami <warren at togami.com> - 0:0.5.2-0.fdr.2
- Disable smp flags to prevent build failure

* Sun Jun 15 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.5.2-0.fdr.1
- Update to 0.5.2.

* Thu May 29 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.5.1-0.fdr.1
- Update to 0.5.1.
- Include init script, sysconfig and logrotate config for smsd.

* Tue May 27 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:0.5.0-0.fdr.1
- Update to 0.5.0.

* Sun Nov  3 2002 Ville Skytt?? <ville.skytta at iki.fi> 0.4.3-1cr
- RedHat'ified PLD version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnokii/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Apr 2006 18:19:55 -0000	1.1
+++ .cvsignore	1 Apr 2006 18:24:59 -0000	1.2
@@ -0,0 +1 @@
+gnokii-0.6.12.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnokii/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Apr 2006 18:19:55 -0000	1.1
+++ sources	1 Apr 2006 18:24:59 -0000	1.2
@@ -0,0 +1 @@
+846e03e7cf3581000c9d0141c2950b79  gnokii-0.6.12.tar.bz2



From fedora-extras-commits at redhat.com  Sat Apr  1 18:44:10 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Sat,  1 Apr 2006 11:44:10 -0700
Subject: owners owners.list,1.788,1.789
Message-ID: <200604011844.k31IiChk009136@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9119

Modified Files:
	owners.list 
Log Message:
Added gnokii



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.788
retrieving revision 1.789
diff -u -r1.788 -r1.789
--- owners.list	1 Apr 2006 15:49:41 -0000	1.788
+++ owners.list	1 Apr 2006 18:44:10 -0000	1.789
@@ -342,6 +342,7 @@
 Fedora Extras|gmpc|GNOME frontend for the MPD|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|gnet2|A simple network library built upon glib|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnofract4d|Gnofract 4D is a Gnome-based program to draw fractals|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|gnokii|Mobile phone management program|triad at df.lth.se|extras-qa at fedoraproject.org|
 Fedora Extras|gnomad2|Manager for digital audio players|triad at df.lth.se|extras-qa at fedoraproject.org|
 Fedora Extras|gnomebaker|Gnome CD burner|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-applet-music|A GNOME panel applet to control various music players|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:11 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:11 -0700
Subject: rpms/perl-GD-SVG/devel .cvsignore, 1.2, NONE Makefile, 1.1,
	NONE perl-GD-SVG.spec, 1.1, NONE sources, 1.2, NONE
Message-ID: <200604011848.k31ImD9g009262@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-GD-SVG/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-GD-SVG/devel

Removed Files:
	.cvsignore Makefile perl-GD-SVG.spec sources 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- perl-GD-SVG.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:13 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:13 -0700
Subject: rpms/perl-Graph/devel .cvsignore, 1.2, NONE Makefile, 1.1,
	NONE perl-Graph.spec, 1.1, NONE sources, 1.2, NONE
Message-ID: <200604011848.k31ImFxv009291@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Graph/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-Graph/devel

Removed Files:
	.cvsignore Makefile perl-Graph.spec sources 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- perl-Graph.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:26 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:26 -0700
Subject: rpms/perl-Heap/devel .cvsignore, 1.2, NONE Makefile, 1.1,
	NONE perl-Heap.spec, 1.1, NONE sources, 1.2, NONE
Message-ID: <200604011848.k31ImSWd009355@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Heap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-Heap/devel

Removed Files:
	.cvsignore Makefile perl-Heap.spec sources 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- perl-Heap.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:39 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:39 -0700
Subject: rpms/perl-SVG/devel .cvsignore, 1.2, NONE Makefile, 1.1,
	NONE perl-SVG.spec, 1.1, NONE sources, 1.2, NONE
Message-ID: <200604011848.k31Imf6D009412@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-SVG/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-SVG/devel

Removed Files:
	.cvsignore Makefile perl-SVG.spec sources 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- perl-SVG.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:51 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:51 -0700
Subject: rpms/perl-Text-Shellwords/devel .cvsignore, 1.2, NONE Makefile, 1.1,
	NONE perl-Text-Shellwords.spec, 1.1, NONE sources, 1.2, NONE
Message-ID: <200604011848.k31ImrS7009469@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Text-Shellwords/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-Text-Shellwords/devel

Removed Files:
	.cvsignore Makefile perl-Text-Shellwords.spec sources 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- perl-Text-Shellwords.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:59 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:59 -0700
Subject: rpms/perl-XML-Writer/devel .cvsignore, 1.2, NONE Makefile, 1.1,
	NONE perl-XML-Writer.spec, 1.1, NONE sources, 1.2, NONE
Message-ID: <200604011849.k31In1ji009526@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-XML-Writer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-XML-Writer/devel

Removed Files:
	.cvsignore Makefile perl-XML-Writer.spec sources 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- perl-XML-Writer.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:10 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:10 -0700
Subject: rpms/perl-GD-SVG/FC-5 perl-GD-SVG.spec,1.1,1.2
Message-ID: <200604011849.k31InCZk009575@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-GD-SVG/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-GD-SVG/FC-5

Modified Files:
	perl-GD-SVG.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-GD-SVG.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GD-SVG/FC-5/perl-GD-SVG.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-GD-SVG.spec	11 Apr 2005 22:34:59 -0000	1.1
+++ perl-GD-SVG.spec	1 Apr 2006 18:48:10 -0000	1.2
@@ -22,6 +22,12 @@
 
 
 %prep
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %setup -q -n GD-SVG-%{version}
 
 # avoid extra dependencies



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:45 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:45 -0700
Subject: rpms/perl-Text-Shellwords/FC-4 perl-Text-Shellwords.spec,1.1,1.2
Message-ID: <200604011849.k31InH5o009589@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Text-Shellwords/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-Text-Shellwords/FC-4

Modified Files:
	perl-Text-Shellwords.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-Text-Shellwords.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-Shellwords/FC-4/perl-Text-Shellwords.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Text-Shellwords.spec	11 Apr 2005 22:45:15 -0000	1.1
+++ perl-Text-Shellwords.spec	1 Apr 2006 18:48:45 -0000	1.2
@@ -24,6 +24,12 @@
 
 
 %prep
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %setup -q -n Text-Shellwords-%{version}
 # Clean up /usr/local/bin/perl mess
 #%{__perl} -pi -e 's|/usr/local/bin/perl\b|%{__perl}|' \



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:46 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:46 -0700
Subject: rpms/perl-Text-Shellwords/FC-5 perl-Text-Shellwords.spec,1.1,1.2
Message-ID: <200604011849.k31InIdJ009592@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Text-Shellwords/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-Text-Shellwords/FC-5

Modified Files:
	perl-Text-Shellwords.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-Text-Shellwords.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-Shellwords/FC-5/perl-Text-Shellwords.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Text-Shellwords.spec	11 Apr 2005 22:45:15 -0000	1.1
+++ perl-Text-Shellwords.spec	1 Apr 2006 18:48:46 -0000	1.2
@@ -24,6 +24,12 @@
 
 
 %prep
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %setup -q -n Text-Shellwords-%{version}
 # Clean up /usr/local/bin/perl mess
 #%{__perl} -pi -e 's|/usr/local/bin/perl\b|%{__perl}|' \



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:11 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:11 -0700
Subject: rpms/perl-Graph/FC-3 perl-Graph.spec,1.1,1.2
Message-ID: <200604011849.k31InDh4009578@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Graph/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-Graph/FC-3

Modified Files:
	perl-Graph.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-Graph.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Graph/FC-3/perl-Graph.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Graph.spec	11 Apr 2005 22:37:28 -0000	1.1
+++ perl-Graph.spec	1 Apr 2006 18:48:11 -0000	1.2
@@ -27,6 +27,12 @@
 
 
 %prep
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %setup -q -n Graph-%{version}
 
 



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:12 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:12 -0700
Subject: rpms/perl-Graph/FC-4 perl-Graph.spec,1.1,1.2
Message-ID: <200604011849.k31InExb009582@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Graph/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-Graph/FC-4

Modified Files:
	perl-Graph.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-Graph.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Graph/FC-4/perl-Graph.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Graph.spec	11 Apr 2005 22:37:28 -0000	1.1
+++ perl-Graph.spec	1 Apr 2006 18:48:12 -0000	1.2
@@ -27,6 +27,12 @@
 
 
 %prep
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %setup -q -n Graph-%{version}
 
 



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:14 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:14 -0700
Subject: rpms/perl-Heap/FC-3 perl-Heap.spec,1.1,1.2
Message-ID: <200604011849.k31InGYj009586@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Heap/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-Heap/FC-3

Modified Files:
	perl-Heap.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-Heap.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Heap/FC-3/perl-Heap.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Heap.spec	11 Apr 2005 22:39:52 -0000	1.1
+++ perl-Heap.spec	1 Apr 2006 18:48:14 -0000	1.2
@@ -24,6 +24,12 @@
 
 
 %prep
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %setup -q -n Heap-%{version}
 
 



From fedora-extras-commits at redhat.com  Sat Apr  1 18:49:12 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:49:12 -0700
Subject: rpms/perl-bioperl/devel .cvsignore, 1.2, NONE Makefile, 1.1,
	NONE bioperl-1.5.0-paths.patch, 1.1, NONE filter-requires.sh,
	1.1, NONE perl-bioperl.spec, 1.1, NONE sources, 1.2, NONE
Message-ID: <200604011849.k31InEKq009579@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-bioperl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-bioperl/devel

Removed Files:
	.cvsignore Makefile bioperl-1.5.0-paths.patch 
	filter-requires.sh perl-bioperl.spec sources 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- bioperl-1.5.0-paths.patch DELETED ---


--- filter-requires.sh DELETED ---


--- perl-bioperl.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:52 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:52 -0700
Subject: rpms/perl-XML-Writer/FC-3 perl-XML-Writer.spec,1.1,1.2
Message-ID: <200604011849.k31InOgd009605@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-XML-Writer/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-XML-Writer/FC-3

Modified Files:
	perl-XML-Writer.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-XML-Writer.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-Writer/FC-3/perl-XML-Writer.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-XML-Writer.spec	11 Apr 2005 22:46:26 -0000	1.1
+++ perl-XML-Writer.spec	1 Apr 2006 18:48:52 -0000	1.2
@@ -23,6 +23,12 @@
 
 
 %prep
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %setup -q -n XML-Writer-%{version}
 
 



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:13 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:13 -0700
Subject: rpms/perl-Graph/FC-5 perl-Graph.spec,1.1,1.2
Message-ID: <200604011849.k31InF6S009585@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Graph/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-Graph/FC-5

Modified Files:
	perl-Graph.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-Graph.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Graph/FC-5/perl-Graph.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Graph.spec	11 Apr 2005 22:37:28 -0000	1.1
+++ perl-Graph.spec	1 Apr 2006 18:48:12 -0000	1.2
@@ -27,6 +27,12 @@
 
 
 %prep
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %setup -q -n Graph-%{version}
 
 



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:20 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:20 -0700
Subject: rpms/perl-Heap/FC-4 perl-Heap.spec,1.1,1.2
Message-ID: <200604011849.k31InMtW009599@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Heap/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-Heap/FC-4

Modified Files:
	perl-Heap.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-Heap.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Heap/FC-4/perl-Heap.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Heap.spec	11 Apr 2005 22:39:52 -0000	1.1
+++ perl-Heap.spec	1 Apr 2006 18:48:19 -0000	1.2
@@ -24,6 +24,12 @@
 
 
 %prep
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %setup -q -n Heap-%{version}
 
 



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:20 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:20 -0700
Subject: rpms/perl-Heap/FC-5 perl-Heap.spec,1.1,1.2
Message-ID: <200604011849.k31InM3q009602@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Heap/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-Heap/FC-5

Modified Files:
	perl-Heap.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-Heap.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Heap/FC-5/perl-Heap.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Heap.spec	11 Apr 2005 22:39:52 -0000	1.1
+++ perl-Heap.spec	1 Apr 2006 18:48:20 -0000	1.2
@@ -24,6 +24,12 @@
 
 
 %prep
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %setup -q -n Heap-%{version}
 
 



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:58 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:58 -0700
Subject: rpms/perl-XML-Writer/FC-4 perl-XML-Writer.spec,1.1,1.2
Message-ID: <200604011849.k31InUao009611@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-XML-Writer/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-XML-Writer/FC-4

Modified Files:
	perl-XML-Writer.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-XML-Writer.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-Writer/FC-4/perl-XML-Writer.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-XML-Writer.spec	11 Apr 2005 22:46:26 -0000	1.1
+++ perl-XML-Writer.spec	1 Apr 2006 18:48:58 -0000	1.2
@@ -23,6 +23,12 @@
 
 
 %prep
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %setup -q -n XML-Writer-%{version}
 
 



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:32 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:32 -0700
Subject: rpms/perl-SVG/FC-4 perl-SVG.spec,1.1,1.2
Message-ID: <200604011849.k31InZ4w009620@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-SVG/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-SVG/FC-4

Modified Files:
	perl-SVG.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-SVG.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SVG/FC-4/perl-SVG.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-SVG.spec	11 Apr 2005 22:43:59 -0000	1.1
+++ perl-SVG.spec	1 Apr 2006 18:48:32 -0000	1.2
@@ -18,6 +18,12 @@
 (scaleable vector graphics) images using the W3C SVG xml recommendation.
 
 %prep
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %setup -q -n SVG-%{version}
 
 # avoid extra dependencies



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:33 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:33 -0700
Subject: rpms/perl-SVG/FC-5 perl-SVG.spec,1.1,1.2
Message-ID: <200604011849.k31InZTl009623@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-SVG/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-SVG/FC-5

Modified Files:
	perl-SVG.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-SVG.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SVG/FC-5/perl-SVG.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-SVG.spec	11 Apr 2005 22:43:59 -0000	1.1
+++ perl-SVG.spec	1 Apr 2006 18:48:33 -0000	1.2
@@ -18,6 +18,12 @@
 (scaleable vector graphics) images using the W3C SVG xml recommendation.
 
 %prep
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %setup -q -n SVG-%{version}
 
 # avoid extra dependencies



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:58 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:58 -0700
Subject: rpms/perl-XML-Writer/FC-5 perl-XML-Writer.spec,1.1,1.2
Message-ID: <200604011849.k31InUwS009614@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-XML-Writer/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-XML-Writer/FC-5

Modified Files:
	perl-XML-Writer.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-XML-Writer.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-XML-Writer/FC-5/perl-XML-Writer.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-XML-Writer.spec	11 Apr 2005 22:46:26 -0000	1.1
+++ perl-XML-Writer.spec	1 Apr 2006 18:48:58 -0000	1.2
@@ -23,6 +23,12 @@
 
 
 %prep
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %setup -q -n XML-Writer-%{version}
 
 



From fedora-extras-commits at redhat.com  Sat Apr  1 18:49:00 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:49:00 -0700
Subject: rpms/perl-bioperl/FC-3 perl-bioperl.spec,1.1,1.2
Message-ID: <200604011849.k31InWkF009617@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-bioperl/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-bioperl/FC-3

Modified Files:
	perl-bioperl.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-bioperl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-bioperl/FC-3/perl-bioperl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-bioperl.spec	11 Apr 2005 22:50:21 -0000	1.1
+++ perl-bioperl.spec	1 Apr 2006 18:48:59 -0000	1.2
@@ -25,6 +25,12 @@
 
 
 %prep
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %setup -q -n bioperl-%{version}
 %patch0 -p1 
 



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:27 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:27 -0700
Subject: rpms/perl-SVG/FC-3 perl-SVG.spec,1.1,1.2
Message-ID: <200604011849.k31InTN6009608@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-SVG/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-SVG/FC-3

Modified Files:
	perl-SVG.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-SVG.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-SVG/FC-3/perl-SVG.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-SVG.spec	11 Apr 2005 22:43:59 -0000	1.1
+++ perl-SVG.spec	1 Apr 2006 18:48:26 -0000	1.2
@@ -25,6 +25,12 @@
 
 
 %build
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags}
 



From fedora-extras-commits at redhat.com  Sat Apr  1 18:49:05 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:49:05 -0700
Subject: rpms/perl-bioperl/FC-4 perl-bioperl.spec,1.1,1.2
Message-ID: <200604011849.k31InbHc009626@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-bioperl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-bioperl/FC-4

Modified Files:
	perl-bioperl.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-bioperl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-bioperl/FC-4/perl-bioperl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-bioperl.spec	11 Apr 2005 22:50:21 -0000	1.1
+++ perl-bioperl.spec	1 Apr 2006 18:49:05 -0000	1.2
@@ -25,6 +25,12 @@
 
 
 %prep
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %setup -q -n bioperl-%{version}
 %patch0 -p1 
 



From fedora-extras-commits at redhat.com  Sat Apr  1 18:49:06 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:49:06 -0700
Subject: rpms/perl-bioperl/FC-5 perl-bioperl.spec,1.1,1.2
Message-ID: <200604011849.k31IncCS009629@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-bioperl/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-bioperl/FC-5

Modified Files:
	perl-bioperl.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-bioperl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-bioperl/FC-5/perl-bioperl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-bioperl.spec	11 Apr 2005 22:50:21 -0000	1.1
+++ perl-bioperl.spec	1 Apr 2006 18:49:06 -0000	1.2
@@ -25,6 +25,12 @@
 
 
 %prep
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %setup -q -n bioperl-%{version}
 %patch0 -p1 
 



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:09 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:09 -0700
Subject: rpms/perl-GD-SVG/FC-3 perl-GD-SVG.spec,1.1,1.2
Message-ID: <200604011849.k31Infku009630@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-GD-SVG/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-GD-SVG/FC-3

Modified Files:
	perl-GD-SVG.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-GD-SVG.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GD-SVG/FC-3/perl-GD-SVG.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-GD-SVG.spec	11 Apr 2005 22:34:59 -0000	1.1
+++ perl-GD-SVG.spec	1 Apr 2006 18:48:09 -0000	1.2
@@ -22,6 +22,12 @@
 
 
 %prep
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %setup -q -n GD-SVG-%{version}
 
 # avoid extra dependencies



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:39 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:39 -0700
Subject: rpms/perl-Text-Shellwords/FC-3 perl-Text-Shellwords.spec,1.1,1.2
Message-ID: <200604011849.k31InfAA009633@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-Text-Shellwords/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-Text-Shellwords/FC-3

Modified Files:
	perl-Text-Shellwords.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-Text-Shellwords.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Text-Shellwords/FC-3/perl-Text-Shellwords.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Text-Shellwords.spec	11 Apr 2005 22:45:15 -0000	1.1
+++ perl-Text-Shellwords.spec	1 Apr 2006 18:48:39 -0000	1.2
@@ -24,6 +24,12 @@
 
 
 %prep
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %setup -q -n Text-Shellwords-%{version}
 # Clean up /usr/local/bin/perl mess
 #%{__perl} -pi -e 's|/usr/local/bin/perl\b|%{__perl}|' \



From fedora-extras-commits at redhat.com  Sat Apr  1 18:48:09 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:48:09 -0700
Subject: rpms/perl-GD-SVG/FC-4 perl-GD-SVG.spec,1.1,1.2
Message-ID: <200604011849.k31IngZ4009634@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/perl-GD-SVG/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9144/perl-GD-SVG/FC-4

Modified Files:
	perl-GD-SVG.spec 
Log Message:
Some fire'n'forget packages which have never been built before. Removing them from devel and disabling them in the branches.


Index: perl-GD-SVG.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-GD-SVG/FC-4/perl-GD-SVG.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-GD-SVG.spec	11 Apr 2005 22:34:59 -0000	1.1
+++ perl-GD-SVG.spec	1 Apr 2006 18:48:09 -0000	1.2
@@ -22,6 +22,12 @@
 
 
 %prep
+cat<<EOT
+
+Build disabled. Package is without maintainer and has never been built before.
+
+EOT
+exit 1
 %setup -q -n GD-SVG-%{version}
 
 # avoid extra dependencies



From fedora-extras-commits at redhat.com  Sat Apr  1 18:50:57 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  1 Apr 2006 11:50:57 -0700
Subject: owners owners.list,1.789,1.790
Message-ID: <200604011850.k31IoxKm009661@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9644

Modified Files:
	owners.list 
Log Message:
Some fire'n'forget packages which have never been built before. Removed them from devel and disabled them in the branches.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.789
retrieving revision 1.790
diff -u -r1.789 -r1.790
--- owners.list	1 Apr 2006 18:44:10 -0000	1.789
+++ owners.list	1 Apr 2006 18:50:56 -0000	1.790
@@ -826,7 +826,6 @@
 Fedora Extras|perl-Array-Compare|Perl extension for comparing arrays|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Authen-SASL|SASL Authentication framework for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-BerkeleyDB|Perl interface to Berkeley DB|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-bioperl|A package of public domain Perl tools for computational molecular biology|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Boulder|An API for hierarchical tag/value structures|orion at cora.nwra.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 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-Cache|Cache-Cache module for perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -926,16 +925,13 @@
 Fedora Extras|perl-GDGraph3d|3D graph generation package for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-GDGraph|Graph generation package for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-GD|Perl interface to the GD graphics library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-GD-SVG|GD SVG enables SVG output from scripts written using GD|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-GDTextUtil|Text utilities for use with GD|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-gettext|Interface to gettext family of functions|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Glib|Perl interface to GLib|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gnome2-Canvas|Perl interface to Gnome Canvas|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|perl-GnuPG-Interface|Perl interface to GnuPG|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Graph|A Perl module for dealing with graphs, the abstract data structures|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gtk2|Perl interface to the 2.x series of the Gimp Toolkit library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gtk2-GladeXML|Perl interface to Gtk2 GladeXML|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
-Fedora Extras|perl-Heap|A collection of routines for managing a heap data structure|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Hook-LexWrap|Lexically scoped subroutine wrappers|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Format|HTML formatter modules|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Mason|HTML::Mason Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1046,7 +1042,6 @@
 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-ShellQuote|Perl module for quoting strings for passing through the shell|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Sub-Uplevel|Run a perl function in an upper stack frame|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-SVG|An extention to generate stand-alone or inline SVG|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Taint-Runtime|Runtime enable taint checking|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Template-Plugin-Class|Allow calling of class methods on arbitrary classes|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Template-Toolkit|Template processing system|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1074,7 +1069,6 @@
 Fedora Extras|perl-Text-Levenshtein|Text::Levenshtein Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Quoted|Extract the structure of a quoted mail message|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Reform|Manual text wrapping and reformatting|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Text-Shellwords|A thin wrapper around the shellwords.pl package|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Template|Expand template text with embedded Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Unidecode|US-ASCII transliterations of Unicode text|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|perl-Text-WikiFormat|Translate Wiki formatted text into other formats|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1108,7 +1102,6 @@
 Fedora Extras|perl-XML-RegExp|Regular expressions for XML tokens|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-XML-RSS|Perl module for managing RDF Site Summary (RSS) files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-XML-Simple|Easy API to maintain XML in Perl|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-XML-Writer|A simple Perl module for writing XML documents|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-XML-XPath|XPath parser and evaluator for Perl|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|extras-orphan at fedoraproject.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



From fedora-extras-commits at redhat.com  Sat Apr  1 19:29:03 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat,  1 Apr 2006 12:29:03 -0700
Subject: rpms/graveman/FC-5 graveman-membug.patch, NONE, 1.1 graveman.spec, 
	1.12, 1.13
Message-ID: <200604011929.k31JT5nb011743@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/graveman/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11723

Modified Files:
	graveman.spec 
Added Files:
	graveman-membug.patch 
Log Message:


graveman-membug.patch:

--- NEW FILE graveman-membug.patch ---
--- graveman-0.3.12-4/src/support.c.membug	2006-04-01 21:25:42.000000000 +0200
+++ graveman-0.3.12-4/src/support.c	2006-04-01 21:25:54.000000000 +0200
@@ -168,7 +168,7 @@
 {
   g_return_val_if_fail(Agrave != NULL, NULL);
 
-  g_free(Agrave->xml);
+  //g_free(Agrave->xml);
   if (Agrave->data) g_hash_table_destroy(Agrave->data);
 
   g_free(Agrave);


Index: graveman.spec
===================================================================
RCS file: /cvs/extras/rpms/graveman/FC-5/graveman.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- graveman.spec	17 Feb 2006 20:42:00 -0000	1.12
+++ graveman.spec	1 Apr 2006 19:29:03 -0000	1.13
@@ -1,12 +1,13 @@
 Name:           graveman
 Version:        0.3.12.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A frontend for cdrtools, dvd+rw-tools and sox
 
 Group:          Applications/Archiving
 License:        GPL
 URL:            http://graveman.tuxfamily.org
 Source0:        http://graveman.tuxfamily.org/sources/graveman-0.3.12-4.tar.bz2
+Patch0:		graveman-membug.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libid3tag-devel, libvorbis-devel, gtk2-devel, libogg-devel, desktop-file-utils
@@ -66,6 +67,9 @@
 
 
 %changelog
+* Sat Apr  1 2006 Gerard Milmeister <gemi at bluewin.ch> - 0.3.12.4-4
+- Patch for memory bug
+
 * Fri Feb 17 2006 Gerard Milmeister <gemi at bluewin.ch> - 0.3.12.4-3
 - Rebuild for Fedora Extras 5
 



From fedora-extras-commits at redhat.com  Sat Apr  1 19:33:57 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat,  1 Apr 2006 12:33:57 -0700
Subject: rpms/graveman/FC-5 graveman.spec,1.13,1.14
Message-ID: <200604011933.k31JXxjG011810@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/graveman/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11793

Modified Files:
	graveman.spec 
Log Message:



Index: graveman.spec
===================================================================
RCS file: /cvs/extras/rpms/graveman/FC-5/graveman.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- graveman.spec	1 Apr 2006 19:29:03 -0000	1.13
+++ graveman.spec	1 Apr 2006 19:33:57 -0000	1.14
@@ -23,6 +23,7 @@
 
 %prep
 %setup -q -n graveman-0.3.12-4
+%patch0
 perl -pi -e 's|^Applicationman = .*|Applicationman=\$(DESTDIR)%{_mandir}|' man/Makefile.in
 
 



From fedora-extras-commits at redhat.com  Sat Apr  1 19:42:21 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat,  1 Apr 2006 12:42:21 -0700
Subject: rpms/graveman/FC-5 graveman.spec,1.14,1.15
Message-ID: <200604011942.k31JgNq0011866@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/graveman/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11849

Modified Files:
	graveman.spec 
Log Message:



Index: graveman.spec
===================================================================
RCS file: /cvs/extras/rpms/graveman/FC-5/graveman.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- graveman.spec	1 Apr 2006 19:33:57 -0000	1.14
+++ graveman.spec	1 Apr 2006 19:42:21 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           graveman
 Version:        0.3.12.4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A frontend for cdrtools, dvd+rw-tools and sox
 
 Group:          Applications/Archiving
@@ -23,7 +23,7 @@
 
 %prep
 %setup -q -n graveman-0.3.12-4
-%patch0
+%patch0 -p1
 perl -pi -e 's|^Applicationman = .*|Applicationman=\$(DESTDIR)%{_mandir}|' man/Makefile.in
 
 



From fedora-extras-commits at redhat.com  Sat Apr  1 19:44:00 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat,  1 Apr 2006 12:44:00 -0700
Subject: rpms/graveman/devel graveman-membug.patch, NONE, 1.1 graveman.spec, 
	1.12, 1.13
Message-ID: <200604011944.k31Ji2Qj011935@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/graveman/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11915

Modified Files:
	graveman.spec 
Added Files:
	graveman-membug.patch 
Log Message:


graveman-membug.patch:

--- NEW FILE graveman-membug.patch ---
--- graveman-0.3.12-4/src/support.c.membug	2006-04-01 21:25:42.000000000 +0200
+++ graveman-0.3.12-4/src/support.c	2006-04-01 21:25:54.000000000 +0200
@@ -168,7 +168,7 @@
 {
   g_return_val_if_fail(Agrave != NULL, NULL);
 
-  g_free(Agrave->xml);
+  //g_free(Agrave->xml);
   if (Agrave->data) g_hash_table_destroy(Agrave->data);
 
   g_free(Agrave);


Index: graveman.spec
===================================================================
RCS file: /cvs/extras/rpms/graveman/devel/graveman.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- graveman.spec	17 Feb 2006 20:42:00 -0000	1.12
+++ graveman.spec	1 Apr 2006 19:44:00 -0000	1.13
@@ -1,12 +1,13 @@
 Name:           graveman
 Version:        0.3.12.4
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        A frontend for cdrtools, dvd+rw-tools and sox
 
 Group:          Applications/Archiving
 License:        GPL
 URL:            http://graveman.tuxfamily.org
 Source0:        http://graveman.tuxfamily.org/sources/graveman-0.3.12-4.tar.bz2
+Patch0:		graveman-membug.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libid3tag-devel, libvorbis-devel, gtk2-devel, libogg-devel, desktop-file-utils
@@ -22,6 +23,7 @@
 
 %prep
 %setup -q -n graveman-0.3.12-4
+%patch0 -p1
 perl -pi -e 's|^Applicationman = .*|Applicationman=\$(DESTDIR)%{_mandir}|' man/Makefile.in
 
 
@@ -66,6 +68,9 @@
 
 
 %changelog
+* Sat Apr  1 2006 Gerard Milmeister <gemi at bluewin.ch> - 0.3.12.4-4
+- Patch for memory bug
+
 * Fri Feb 17 2006 Gerard Milmeister <gemi at bluewin.ch> - 0.3.12.4-3
 - Rebuild for Fedora Extras 5
 



From fedora-extras-commits at redhat.com  Sat Apr  1 22:08:05 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat,  1 Apr 2006 15:08:05 -0700
Subject: rpms/azureus/FC-5 azureus-MessageSlideShell-swt-3.1.patch, NONE,
	1.1 azureus-no-update-manager-MainStatusBar.patch, NONE,
	1.1 .cvsignore, 1.4, 1.5 azureus-no-install-remove-plugins.patch,
	1.1, 1.2 azureus-no-update-manager-AzureusCoreImpl.patch, 1.1,
	1.2 azureus-no-update-manager-CoreUpdateChecker.patch, 1.1,
	1.2 azureus-no-update-manager-UpdateMonitor.patch, 1.1,
	1.2 azureus.spec, 1.19, 1.20 sources, 1.4, 1.5
Message-ID: <200604012208.k31M8889018326@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/azureus/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18279

Modified Files:
	.cvsignore azureus-no-install-remove-plugins.patch 
	azureus-no-update-manager-AzureusCoreImpl.patch 
	azureus-no-update-manager-CoreUpdateChecker.patch 
	azureus-no-update-manager-UpdateMonitor.patch azureus.spec 
	sources 
Added Files:
	azureus-MessageSlideShell-swt-3.1.patch 
	azureus-no-update-manager-MainStatusBar.patch 
Log Message:
Update to latest source snapshot.


azureus-MessageSlideShell-swt-3.1.patch:

--- NEW FILE azureus-MessageSlideShell-swt-3.1.patch ---
--- org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java.~1.15.~	2006-03-20 23:10:27.000000000 -0800
+++ org/gudy/azureus2/ui/swt/shells/MessageSlideShell.java	2006-03-25 17:30:47.000000000 -0800
@@ -269,13 +269,7 @@
 
 		// Create shell & widgets
 		shell = new Shell(display, SWT.ON_TOP);
-		if (USE_SWT32_BG_SET) {
-			try {
-				shell.setBackgroundMode(SWT.INHERIT_DEFAULT);
-			} catch (NoSuchMethodError e) {
-				// Ignore
-			}
-		}
+
 		Utils.setShellIcon(shell);
 		shell.setText(popupParams.title);
 
@@ -507,13 +501,6 @@
 			gc.dispose();
 
 			boolean bAlternateDrawing = true;
-			if (USE_SWT32_BG_SET) {
-				try {
-					shell.setBackgroundImage(imgBackground);
-					bAlternateDrawing = false;
-				} catch (NoSuchMethodError e) {
-				}
-			}
 
 			if (bAlternateDrawing) {
 				// Drawing of BG Image for pre SWT 3.2

azureus-no-update-manager-MainStatusBar.patch:

--- NEW FILE azureus-no-update-manager-MainStatusBar.patch ---
--- org/gudy/azureus2/ui/swt/mainwindow/MainStatusBar.java.~1.1.~	2006-03-20 23:21:17.000000000 -0800
+++ org/gudy/azureus2/ui/swt/mainwindow/MainStatusBar.java	2006-03-25 18:13:47.000000000 -0800
@@ -544,8 +544,6 @@
 		});
 		statusDown.setMenu(menuDownSpeed);
 
-		addUpdateListener();
-
 		return statusBar;
 	}
 
@@ -619,16 +617,6 @@
 		}
 	}
 
-	private void addUpdateListener() {
-		azureusCore.getPluginManager().getDefaultPluginInterface()
-				.getUpdateManager().addListener(new UpdateManagerListener() {
-					public void checkInstanceCreated(UpdateCheckInstance instance) {
-
-						new updateStatusChanger(instance);
-					}
-				});
-	}
-
 	protected class updateStatusChanger {
 		UpdateCheckInstance instance;
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/azureus/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Feb 2006 17:00:46 -0000	1.4
+++ .cvsignore	1 Apr 2006 22:08:05 -0000	1.5
@@ -1,3 +1,3 @@
+azureus2-cvs-20060325.tar.gz
 azplugins_1.8.8.jar
-azureus2-cvs-20060209.tar.gz
 bdcc_2.2.2.zip

azureus-no-install-remove-plugins.patch:

Index: azureus-no-install-remove-plugins.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/FC-5/azureus-no-install-remove-plugins.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- azureus-no-install-remove-plugins.patch	9 Feb 2006 08:45:07 -0000	1.1
+++ azureus-no-install-remove-plugins.patch	1 Apr 2006 22:08:05 -0000	1.2
@@ -1,8 +1,8 @@
---- org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java.~1.58.~	2006-01-31 14:43:47.000000000 -0500
-+++ org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java	2006-02-09 00:05:11.000000000 -0500
+--- org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java.orig	2006-03-28 04:35:35.000000000 -0800
++++ org/gudy/azureus2/ui/swt/mainwindow/MainMenu.java	2006-03-28 04:41:30.000000000 -0800
 @@ -347,26 +347,6 @@
-       menu_plugin.setMenu(pluginMenu);
-       if(notMainWindow) {performOneTimeDisable(menu_plugin, true);}
+ 			menu_plugin_logViews.setMenu(pluginLogsMenu);
+ 			menu_plugin_logViews.setData("EOL", "1");
  
 -      new MenuItem(pluginMenu, SWT.SEPARATOR);
 -      
@@ -38,7 +38,7 @@
 -        help_checkupdate.addListener(SWT.Selection, new Listener() {
 -        	public void handleEvent(Event e) {
 -        		mainWindow.getShell().setFocus();
--        		UpdateMonitor.getSingleton( mainWindow.getAzureusCore()).performCheck();
+-        		UpdateMonitor.getSingleton( mainWindow.getAzureusCore()).performCheck(true);
 -        	}
 -        });
 -      }

azureus-no-update-manager-AzureusCoreImpl.patch:

Index: azureus-no-update-manager-AzureusCoreImpl.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/FC-5/azureus-no-update-manager-AzureusCoreImpl.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- azureus-no-update-manager-AzureusCoreImpl.patch	10 Feb 2006 17:00:46 -0000	1.1
+++ azureus-no-update-manager-AzureusCoreImpl.patch	1 Apr 2006 22:08:05 -0000	1.2
@@ -1,6 +1,6 @@
---- com/aelitis/azureus/core/impl/AzureusCoreImpl.java.orig	2006-02-09 23:23:01.000000000 -0500
-+++ com/aelitis/azureus/core/impl/AzureusCoreImpl.java	2006-02-09 23:23:19.000000000 -0500
-@@ -391,13 +391,6 @@
+--- com/aelitis/azureus/core/impl/AzureusCoreImpl.java.orig	2006-03-25 14:17:49.000000000 -0800
++++ com/aelitis/azureus/core/impl/AzureusCoreImpl.java	2006-03-25 15:14:01.000000000 -0800
+@@ -584,14 +584,6 @@
  			if (Logger.isEnabled())
  				Logger.log(new LogEvent(LOGID, "Stop operation completes"));
  	
@@ -11,6 +11,7 @@
 -				
 -				AzureusRestarterFactory.create( this ).restart( true );
 -			}
- 		}finally{
- 			
- 			stopping_sem.releaseForever();
+-			
+ 			try{
+ 				ThreadGroup	tg = Thread.currentThread().getThreadGroup();
+ 				

azureus-no-update-manager-CoreUpdateChecker.patch:

Index: azureus-no-update-manager-CoreUpdateChecker.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/FC-5/azureus-no-update-manager-CoreUpdateChecker.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- azureus-no-update-manager-CoreUpdateChecker.patch	10 Feb 2006 17:00:46 -0000	1.1
+++ azureus-no-update-manager-CoreUpdateChecker.patch	1 Apr 2006 22:08:05 -0000	1.2
@@ -1,6 +1,6 @@
---- org/gudy/azureus2/update/CoreUpdateChecker.java.orig	2006-02-09 23:27:55.000000000 -0500
-+++ org/gudy/azureus2/update/CoreUpdateChecker.java	2006-02-09 23:28:47.000000000 -0500
-@@ -124,8 +124,6 @@
+--- org/gudy/azureus2/update/CoreUpdateChecker.java.orig	2006-03-25 14:18:45.000000000 -0800
++++ org/gudy/azureus2/update/CoreUpdateChecker.java	2006-03-25 17:19:32.000000000 -0800
+@@ -122,8 +122,6 @@
  		props.setProperty( "plugin.version", plugin_interface.getAzureusVersion());
  		
  		rdf = plugin_interface.getUtilities().getResourceDownloaderFactory();
@@ -9,7 +9,7 @@
  	}
  	
  	public String
-@@ -144,178 +142,9 @@
+@@ -142,155 +140,9 @@
  	checkForUpdate(
  		final UpdateChecker	checker )
  	{
@@ -17,15 +17,7 @@
 -			String	current_version = plugin_interface.getAzureusVersion();
 -			
 -			log.log( "Update check starts: current = " + current_version );
--									
--			boolean	TESTING = false;	// !!!!TODO: REMOVE THIS
--			
--			if ( TESTING ){
--			
--				System.out.println( "CoreUpdater: !!!! Testing mode !!!!" );
--				
--			}
--				
+-													
 -			Map	decoded = VersionCheckClient.getSingleton().getVersionCheckInfo(
 -		  			first_check?VersionCheckClient.REASON_UPDATE_CHECK_START:VersionCheckClient.REASON_UPDATE_CHECK_PERIODIC);
 -
@@ -61,26 +53,11 @@
 -			
 -			log.log( msg );
 -			
--			boolean	latest_is_cvs	= Constants.isCVSVersion( latest_version );
--			String	latest_base		= Constants.getBaseVersion( latest_version );
--			
--			String	current_base	= Constants.getBaseVersion();
--				
--				// currently we upgrade from, for example
--				//  1) 2.0.8.4     -> 2.0.8.6
--				//	2) 2.0.8.5_CVS -> 2.0.8.6
--				// but not to a CVS version (also currently never reported as latest...)
--				
--			if ( latest_is_cvs && !TESTING ){
+-			if ( !shouldUpdate( current_version, latest_version )){
 -				
 -				return;
 -			}
--
--			if ( Constants.compareVersions( current_base, latest_base ) >= 0 && !TESTING){
 -				
--				return;
--			}
--			
 -			final String	f_latest_version	= latest_version;
 -			final String	f_latest_file_name	= latest_file_name;
 -			

azureus-no-update-manager-UpdateMonitor.patch:

Index: azureus-no-update-manager-UpdateMonitor.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/FC-5/azureus-no-update-manager-UpdateMonitor.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- azureus-no-update-manager-UpdateMonitor.patch	10 Feb 2006 17:00:46 -0000	1.1
+++ azureus-no-update-manager-UpdateMonitor.patch	1 Apr 2006 22:08:05 -0000	1.2
@@ -1,6 +1,6 @@
---- org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.orig	2006-02-09 23:25:26.000000000 -0500
-+++ org/gudy/azureus2/ui/swt/update/UpdateMonitor.java	2006-02-09 23:26:30.000000000 -0500
-@@ -87,147 +87,18 @@
+--- org/gudy/azureus2/ui/swt/update/UpdateMonitor.java.orig	2006-03-28 04:35:36.000000000 -0800
++++ org/gudy/azureus2/ui/swt/update/UpdateMonitor.java	2006-03-28 04:44:37.000000000 -0800
+@@ -88,149 +88,19 @@
  	{
  		azureus_core	= _azureus_core;
  		
@@ -49,12 +49,14 @@
  	{
 -		boolean check_at_start	= false;
 -		boolean check_periodic	= false;
+-		boolean bOldSWT = SWT.getVersion() < 3139;
 -	
 -			// no update checks for java web start
 -		
 -		if ( !SystemProperties.isJavaWebStartInstance()){
 -					
--			check_at_start	= COConfigurationManager.getBooleanParameter( "update.start", true );
+-			// force check when SWT is really old
+-			check_at_start	= COConfigurationManager.getBooleanParameter( "update.start", true ) || bOldSWT;
 -			check_periodic	= COConfigurationManager.getBooleanParameter( "update.periodic", true );
 -		}
 -		
@@ -65,7 +67,7 @@
 -		if (	( check_at_start && start_of_day) ||
 -				( check_periodic && !start_of_day )){
 -			
--			performCheck();	// this will implicitly do usage stats
+-			performCheck(bOldSWT);	// this will implicitly do usage stats
 -			
 -		}else{
 -
@@ -84,10 +86,11 @@
 -						}
 -					});
 -		}
++
  	}
  	
  	public void
- 	performCheck()
+ 	performCheck(final boolean bForce)
  	{
 -		if ( SystemProperties.isJavaWebStartInstance()){
 -			
@@ -135,7 +138,7 @@
 -				
 -			    		current_update_instance = 
 -			    			um.createUpdateCheckInstance(
--			    				UpdateCheckInstance.UCI_UPDATE,
+-			    				bForce ? UpdateCheckInstance.UCI_INSTALL : UpdateCheckInstance.UCI_UPDATE,
 -			  					"update.instance.update" );
 -			  	
 -			    		current_update_instance.start();


Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/FC-5/azureus.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- azureus.spec	14 Feb 2006 04:48:03 -0000	1.19
+++ azureus.spec	1 Apr 2006 22:08:05 -0000	1.20
@@ -1,49 +1,51 @@
-Name:           azureus
-Version:        2.4.0.0
-Release:        0.20060209cvs_1%{?dist}
-Summary:        A BitTorrent Client
-
-Group:          Applications/Internet
-License:        GPL
-URL:            http://azureus.sourceforge.net
+Name:		azureus
+Version:	2.4.0.3
+Release:	0.20060328cvs_1%{?dist}
+Summary:	A BitTorrent Client
+
+Group:		Applications/Internet
+License:	GPL
+URL:		http://azureus.sourceforge.net
 
 # A cvs snapshot with the build and bouncycastle directories
 # removed.
-Source0:        azureus2-cvs-20060209.tar.gz
+Source0:	azureus2-cvs-20060325.tar.gz
 
-Source1:        azureus.script
-Source2:        Azureus.desktop
-Source3:        azureus.applications
-Source4:        azureus-License.txt
-Source5:        azureus-ChangeLog.txt
+Source1:	azureus.script
+Source2:	Azureus.desktop
+Source3:	azureus.applications
+Source4:	azureus-License.txt
+Source5:	azureus-ChangeLog.txt
 
 Source6:	azplugins_1.8.8.jar
 Source7:	bdcc_2.2.2.zip
 
-Patch0:         azureus-remove-win32-osx-platforms.patch
-Patch1:         azureus-remove-win32-PlatformManagerUpdateChecker.patch
-Patch2:         azureus-cache-size.patch
-Patch3:         azureus-remove-manifest-classpath.patch
-Patch4:         azureus-ConfigSectionPlugins-swt-3.1.patch
-Patch5:         azureus-Messages-swt-3.1.patch
-Patch6:         azureus-TableView-swt-3.1.patch
-Patch7:         azureus-themed.patch
-Patch8:         azureus-rh-bugzilla-180418.patch
-Patch9:         azureus-no-shared-plugins.patch
-Patch10:        azureus-no-install-remove-plugins.patch
-Patch11:        azureus-no-restart.patch
-Patch12:        azureus-no-updates-PluginInitializer.patch
-Patch13:        azureus-no-updates-PluginInterfaceImpl.patch
-Patch14:        azureus-no-update-manager-AzureusCoreImpl.patch
-Patch15:        azureus-no-update-manager-CorePatchChecker.patch
-Patch16:        azureus-no-update-manager-CoreUpdateChecker.patch
-Patch17:        azureus-no-update-manager-MainWindow.patch
-Patch18:        azureus-no-update-manager-PluginInstallerImpl.patch
-Patch19:        azureus-no-update-manager-PluginUpdatePlugin.patch
-Patch20:        azureus-no-update-manager-SWTUpdateChecker.patch
-#Patch21:        azureus-no-update-manager-TableView.patch
-Patch22:        azureus-no-update-manager-UpdateMonitor.patch
-Patch23:        azureus-no-update-manager-PluginInstallerImpl-2.patch
+Patch0:		azureus-remove-win32-osx-platforms.patch
+Patch1:		azureus-remove-win32-PlatformManagerUpdateChecker.patch
+Patch2:		azureus-cache-size.patch
+Patch3:		azureus-remove-manifest-classpath.patch
+Patch4:		azureus-ConfigSectionPlugins-swt-3.1.patch
+Patch5:		azureus-Messages-swt-3.1.patch
+Patch6:		azureus-TableView-swt-3.1.patch
+Patch7:		azureus-themed.patch
+Patch8:		azureus-rh-bugzilla-180418.patch
+Patch9:		azureus-no-shared-plugins.patch
+Patch10:	azureus-no-install-remove-plugins.patch
+Patch11:	azureus-no-restart.patch
+Patch12:	azureus-no-updates-PluginInitializer.patch
+Patch13:	azureus-no-updates-PluginInterfaceImpl.patch
+Patch14:	azureus-no-update-manager-AzureusCoreImpl.patch
+Patch15:	azureus-no-update-manager-CorePatchChecker.patch
+Patch16:	azureus-no-update-manager-CoreUpdateChecker.patch
+Patch17:	azureus-no-update-manager-MainWindow.patch
+Patch18:	azureus-no-update-manager-PluginInstallerImpl.patch
+Patch19:	azureus-no-update-manager-PluginUpdatePlugin.patch
+Patch20:	azureus-no-update-manager-SWTUpdateChecker.patch
+#Patch21:	 azureus-no-update-manager-TableView.patch
+Patch22:	azureus-no-update-manager-UpdateMonitor.patch
+Patch23:	azureus-no-update-manager-PluginInstallerImpl-2.patch
+Patch24:	azureus-MessageSlideShell-swt-3.1.patch
+Patch25:	azureus-no-update-manager-MainStatusBar.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -84,20 +86,22 @@
 %patch14 -p0
 %patch15 -p0
 %patch16 -p0
-%patch17 -p0
+#%patch17 -p0
 %patch18 -p0
 %patch19 -p0
 %patch20 -p0
 #%patch21 -p0
 %patch22 -p0
 %patch23 -p0
+%patch24 -p0
+%patch25 -p0
 cp %{SOURCE4} License.txt
 cp %{SOURCE5} ChangeLog.txt
 
 %build
 mkdir -p build/libs
 build-jar-repository build/libs jakarta-commons-cli swt-gtk-3.1.1 log4j gnu-crypto gtk2.8 glib0.2
-ln -s /usr/share/java/gcj-endorsed/bcprov-131.jar build/libs
+ln -s /usr/share/java/gcj-endorsed/bcprov-1.31.jar build/libs
 find ./ -name osx | xargs rm -r
 find ./ -name macosx | xargs rm -r
 find ./ -name [Ww]in32\* | xargs rm -r
@@ -199,6 +203,10 @@
 %{_libdir}/gcj/*
 
 %changelog
+* Tue Mar 28 2006 Anthony Green <green at redhat.com> - 2.4.0.3-0.20060328cvs_1
+- Update sources.
+- Fix bcprov jar file reference.
+
 * Mon Feb 13 2006 Anthony Green <green at redhat.com> - 2.4.0.0-0.20060207cvs_1
 - Remove absolute path from azureus-no-updates-PluginInterfaceImpl.patch.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/azureus/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Feb 2006 17:00:46 -0000	1.4
+++ sources	1 Apr 2006 22:08:05 -0000	1.5
@@ -1,3 +1,3 @@
+a1827e2041841940c4ca16fdf240afac  azureus2-cvs-20060325.tar.gz
 28f136e1d99d8a0d0d04ef4398f782b4  azplugins_1.8.8.jar
-ed4b5f0e19ad6632198731baeb48aac5  azureus2-cvs-20060209.tar.gz
 0e88c3952b36ba221e277420a7080b43  bdcc_2.2.2.zip



From fedora-extras-commits at redhat.com  Sat Apr  1 23:17:09 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat,  1 Apr 2006 16:17:09 -0700
Subject: rpms/lib765 import.log,1.5,1.6
Message-ID: <200604012317.k31NHBbP020593@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/lib765
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20560

Modified Files:
	import.log 
Log Message:
auto-import lib765-0.3.4-1 on branch devel from lib765-0.3.4-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/lib765/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	10 Mar 2006 22:32:56 -0000	1.5
+++ import.log	1 Apr 2006 23:17:09 -0000	1.6
@@ -2,3 +2,4 @@
 lib765-0_3_3-4:HEAD:lib765-0.3.3-4.src.rpm:1141758291
 lib765-0_3_3-5:HEAD:lib765-0.3.3-5.src.rpm:1141954170
 lib765-0_3_3-6:HEAD:lib765-0.3.3-6.src.rpm:1142029964
+lib765-0_3_4-1:HEAD:lib765-0.3.4-1.src.rpm:1143933417



From fedora-extras-commits at redhat.com  Sat Apr  1 23:17:10 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat,  1 Apr 2006 16:17:10 -0700
Subject: rpms/lib765/devel .cvsignore, 1.2, 1.3 lib765.spec, 1.4, 1.5 sources,
	1.2, 1.3
Message-ID: <200604012317.k31NHC3M020599@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/lib765/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20560/devel

Modified Files:
	.cvsignore lib765.spec sources 
Log Message:
auto-import lib765-0.3.4-1 on branch devel from lib765-0.3.4-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lib765/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Jan 2006 00:58:49 -0000	1.2
+++ .cvsignore	1 Apr 2006 23:17:10 -0000	1.3
@@ -1 +1 @@
-lib765-0.3.3.tar.gz
+lib765-0.3.4.tar.gz


Index: lib765.spec
===================================================================
RCS file: /cvs/extras/rpms/lib765/devel/lib765.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lib765.spec	10 Mar 2006 22:33:02 -0000	1.4
+++ lib765.spec	1 Apr 2006 23:17:10 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: A library for emulating the uPD765a floppy controller
 Name: lib765
-Version: 0.3.3
-Release: 6%{?dist}
+Version: 0.3.4
+Release: 1%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source: http://www.seasip.demon.co.uk/Unix/LibDsk/lib765-%{version}.tar.gz
@@ -51,6 +51,9 @@
 %exclude %{_libdir}/lib765.la
 
 %changelog
+* Sun Apr 02 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.3.4-1
+- Bump to new version
+
 * Fri Mar 10 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.3.3-6
 - Minor tweak to the spec file
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lib765/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Jan 2006 00:58:49 -0000	1.2
+++ sources	1 Apr 2006 23:17:10 -0000	1.3
@@ -1 +1 @@
-831929572120af53781322e0456c708b  lib765-0.3.3.tar.gz
+fd916b3fe613c39e07540bdbc0effc7f  lib765-0.3.4.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  1 23:18:48 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat,  1 Apr 2006 16:18:48 -0700
Subject: rpms/libdsk import.log,1.2,1.3
Message-ID: <200604012318.k31NIoPq020702@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libdsk
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20669

Modified Files:
	import.log 
Log Message:
auto-import libdsk-1.1.9-1 on branch devel from libdsk-1.1.9-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libdsk/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	13 Jan 2006 01:08:19 -0000	1.2
+++ import.log	1 Apr 2006 23:18:48 -0000	1.3
@@ -1 +1,2 @@
 libdsk-1_1_6-1:HEAD:libdsk-1.1.6-1.src.rpm:1137114439
+libdsk-1_1_9-1:HEAD:libdsk-1.1.9-1.src.rpm:1143933516



From fedora-extras-commits at redhat.com  Sat Apr  1 23:18:49 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sat,  1 Apr 2006 16:18:49 -0700
Subject: rpms/libdsk/devel .cvsignore, 1.2, 1.3 libdsk.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200604012318.k31NIp2t020708@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/libdsk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20669/devel

Modified Files:
	.cvsignore libdsk.spec sources 
Log Message:
auto-import libdsk-1.1.9-1 on branch devel from libdsk-1.1.9-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libdsk/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Jan 2006 01:08:43 -0000	1.2
+++ .cvsignore	1 Apr 2006 23:18:49 -0000	1.3
@@ -1 +1 @@
-libdsk-1.1.6.tar.gz
+libdsk-1.1.9.tar.gz


Index: libdsk.spec
===================================================================
RCS file: /cvs/extras/rpms/libdsk/devel/libdsk.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libdsk.spec	13 Jan 2006 01:08:43 -0000	1.1
+++ libdsk.spec	1 Apr 2006 23:18:49 -0000	1.2
@@ -1,6 +1,6 @@
 Summary: Library for accessing disk images
 Name: libdsk
-Version: 1.1.6
+Version: 1.1.9
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Libraries
@@ -68,6 +68,8 @@
 %{_bindir}/md3serial
 %{_bindir}/dskdump
 %{_bindir}/dskscan
+%{_bindir}/dskutil
+%{_mandir}/man1/dskutil.1*
 %{_mandir}/man1/dskdump.1*
 %{_mandir}/man1/dskscan.1*
 %{_mandir}/man1/dskform.1*
@@ -83,6 +85,9 @@
 %exclude %{_libdir}/libdsk.la
 
 %changelog
+* Sun Apr 02 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 1.1.9-1
+- Bump to new version
+
 * Fri Nov 11 2005 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 1.1.6.1
 - Removed packager
 - Altered BR to remove requirement for sed


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libdsk/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Jan 2006 01:08:43 -0000	1.2
+++ sources	1 Apr 2006 23:18:49 -0000	1.3
@@ -1 +1 @@
-8abf60a90ab13c7f9f57d4a94dcd2166  libdsk-1.1.6.tar.gz
+a773876031e3a0813f36e76214d73753  libdsk-1.1.9.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  1 23:55:59 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  1 Apr 2006 16:55:59 -0700
Subject: rpms/k3b-extras - New directory
Message-ID: <200604012356.k31Nu1xB021227@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/k3b-extras
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21201/k3b-extras

Log Message:
Directory /cvs/extras/rpms/k3b-extras added to the repository




From fedora-extras-commits at redhat.com  Sat Apr  1 23:56:00 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  1 Apr 2006 16:56:00 -0700
Subject: rpms/k3b-extras/devel - New directory
Message-ID: <200604012356.k31Nu2DE021230@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/k3b-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21201/k3b-extras/devel

Log Message:
Directory /cvs/extras/rpms/k3b-extras/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Apr  1 23:56:07 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  1 Apr 2006 16:56:07 -0700
Subject: rpms/k3b-extras Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604012356.k31Nu9kT021279@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/k3b-extras
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21246

Added Files:
	Makefile import.log 
Log Message:
Setup of module k3b-extras


--- NEW FILE Makefile ---
# Top level Makefile for module k3b-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  Sat Apr  1 23:56:08 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  1 Apr 2006 16:56:08 -0700
Subject: rpms/k3b-extras/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604012356.k31NuAN8021282@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/k3b-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21246/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module k3b-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  Sat Apr  1 23:56:24 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  1 Apr 2006 16:56:24 -0700
Subject: rpms/k3b-extras import.log,1.1,1.2
Message-ID: <200604012356.k31NuQKf021343@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/k3b-extras
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21310

Modified Files:
	import.log 
Log Message:
auto-import k3b-extras-0.12.14-1 on branch devel from k3b-extras-0.12.14-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/k3b-extras/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	1 Apr 2006 23:56:07 -0000	1.1
+++ import.log	1 Apr 2006 23:56:24 -0000	1.2
@@ -0,0 +1 @@
+k3b-extras-0_12_14-1:HEAD:k3b-extras-0.12.14-1.src.rpm:1143935781



From fedora-extras-commits at redhat.com  Sat Apr  1 23:56:25 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  1 Apr 2006 16:56:25 -0700
Subject: rpms/k3b-extras/devel k3b-extras.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604012356.k31NuRwN021348@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/k3b-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21310/devel

Modified Files:
	.cvsignore sources 
Added Files:
	k3b-extras.spec 
Log Message:
auto-import k3b-extras-0.12.14-1 on branch devel from k3b-extras-0.12.14-1.src.rpm


--- NEW FILE k3b-extras.spec ---

Name:           k3b-extras
Summary:        Free codec plugins for k3b
Version:        0.12.14
Release:        1%{?dist}

Group:          Applications/Multimedia
License:        GPL
URL:            http://www.k3b.org/
Source0:        http://dl.sf.net/k3b/k3b-%{version}.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  kdelibs-devel 
BuildRequires:  taglib-devel
BuildRequires:  libmusicbrainz-devel
BuildRequires:  gettext
BuildRequires:  libmpcdec-devel
BuildRequires:  libsndfile-devel

# It already Requires: libk3b.so.2 libk3bdevice.so.2, isn't that enough?  -- Rex
Requires:       k3b >= %{version}


%description
Free decoder/encoder plugins for k3b, including:
musepack decoder (libmpcdec)
sndfile decoder (libsndfile)


%prep
%setup -q -n k3b-%{version}


%build
unset QTDIR || : ; source /etc/profile.d/qt.sh
export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include

%configure \
  --disable-rpath \
  --enable-new-ldflags \
  --disable-debug --disable-warnings \
  --disable-dependancy-tracking --enable-final \
  --with-musepack \
  --with-sndfile

for dir in libk3bdevice libk3b plugins/decoder/libsndfile plugins/decoder/musepack ; do
make -C $dir %{?_smp_mflags}
done


%install
rm -rf $RPM_BUILD_ROOT

for dir in plugins/decoder/libsndfile plugins/decoder/musepack ; do
make -C $dir install DESTDIR=$RPM_BUILD_ROOT
done


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,755)
%{_libdir}/kde3/libk3blibsndfiledecoder.*
%{_libdir}/kde3/libk3bmpcdecoder.*
%{_datadir}/apps/k3b/plugins/k3blibsndfiledecoder.plugin
%{_datadir}/apps/k3b/plugins/k3bmpcdecoder.plugin


%changelog
* Mon Mar 27 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.12.14-1
- -extras subpkg for libsndfile, libmpcdec



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/k3b-extras/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	1 Apr 2006 23:56:08 -0000	1.1
+++ .cvsignore	1 Apr 2006 23:56:25 -0000	1.2
@@ -0,0 +1 @@
+k3b-0.12.14.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/k3b-extras/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	1 Apr 2006 23:56:08 -0000	1.1
+++ sources	1 Apr 2006 23:56:25 -0000	1.2
@@ -0,0 +1 @@
+51ef4fdf98365a285489dc1e11a07a3c  k3b-0.12.14.tar.bz2



From fedora-extras-commits at redhat.com  Sat Apr  1 23:57:38 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  1 Apr 2006 16:57:38 -0700
Subject: rpms/k3b-extras/devel k3b-extras.spec,1.1,1.2
Message-ID: <200604012357.k31NveZm021407@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/k3b-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21390

Modified Files:
	k3b-extras.spec 
Log Message:
* Sat Apr 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.12.14-2
- drop extraneous BR: taglib-devel, libmusicbrainz-devel
- Requires: k3b >= 0.12



Index: k3b-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/k3b-extras/devel/k3b-extras.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- k3b-extras.spec	1 Apr 2006 23:56:25 -0000	1.1
+++ k3b-extras.spec	1 Apr 2006 23:57:38 -0000	1.2
@@ -2,7 +2,7 @@
 Name:           k3b-extras
 Summary:        Free codec plugins for k3b
 Version:        0.12.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Group:          Applications/Multimedia
 License:        GPL
@@ -11,15 +11,14 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdelibs-devel 
-BuildRequires:  taglib-devel
-BuildRequires:  libmusicbrainz-devel
+#BuildRequires:  taglib-devel
+#BuildRequires:  libmusicbrainz-devel
 BuildRequires:  gettext
 BuildRequires:  libmpcdec-devel
 BuildRequires:  libsndfile-devel
 
 # It already Requires: libk3b.so.2 libk3bdevice.so.2, isn't that enough?  -- Rex
-Requires:       k3b >= %{version}
-
+Requires:       k3b >= 0.12 
 
 %description
 Free decoder/encoder plugins for k3b, including:
@@ -43,17 +42,17 @@
   --with-musepack \
   --with-sndfile
 
-for dir in libk3bdevice libk3b plugins/decoder/libsndfile plugins/decoder/musepack ; do
-make -C $dir %{?_smp_mflags}
-done
+make %{?_smp_mflags} -C libk3bdevice
+make %{?_smp_mflags} -C libk3b
+make %{?_smp_mflags} -C plugins/decoder/libsndfile
+make %{?_smp_mflags} -C plugins/decoder/musepack
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-for dir in plugins/decoder/libsndfile plugins/decoder/musepack ; do
-make -C $dir install DESTDIR=$RPM_BUILD_ROOT
-done
+make install DESTDIR=$RPM_BUILD_ROOT -C plugins/decoder/libsndfile
+make install DESTDIR=$RPM_BUILD_ROOT -C plugins/decoder/musepack
 
 
 %clean
@@ -61,7 +60,7 @@
 
 
 %files
-%defattr(-,root,root,755)
+%defattr(-,root,root,-)
 %{_libdir}/kde3/libk3blibsndfiledecoder.*
 %{_libdir}/kde3/libk3bmpcdecoder.*
 %{_datadir}/apps/k3b/plugins/k3blibsndfiledecoder.plugin
@@ -69,6 +68,10 @@
 
 
 %changelog
+* Sat Apr 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.12.14-2
+- drop extraneous BR: taglib-devel, libmusicbrainz-devel
+- Requires: k3b >= 0.12
+
 * Mon Mar 27 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.12.14-1
 - -extras subpkg for libsndfile, libmpcdec
 



From fedora-extras-commits at redhat.com  Sun Apr  2 00:18:55 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  1 Apr 2006 17:18:55 -0700
Subject: owners owners.list,1.790,1.791
Message-ID: <200604020018.k320IvEi023486@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23469

Modified Files:
	owners.list 
Log Message:
+libmpcdec
+k3b-extras



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.790
retrieving revision 1.791
diff -u -r1.790 -r1.791
--- owners.list	1 Apr 2006 18:50:56 -0000	1.790
+++ owners.list	2 Apr 2006 00:18:55 -0000	1.791
@@ -494,6 +494,7 @@
 Fedora Extras|jpgraph|An OO graph drawing class library for PHP|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|js|JavaScript interpreter|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|juk|Jukebox and music manager for KDE|nomis80 at nomis80.org|extras-qa at fedoraproject.org|
+Fedora Extras|k3b-extras|Free codec plugins for k3b|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kadischi|An application for Fedora-based LiveCD generation|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
 Fedora Extras|kakasi|A Japanese character set conversion filter|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|kanatest|Hiragana and Katakana drill tool|robert at marcanoonline.com|extras-qa at fedoraproject.org|
@@ -590,6 +591,7 @@
 Fedora Extras|libmatroska|An open Audio/Video container format|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|libmcrypt|Encryption algorithms library|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|libmodplug|Modplug mod music file format library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|libmpcdec|Musepack audio decoding library|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|libmthca|Mellanox InfiniBand HCA Userspace Driver|rolandd at cisco.com|extras-qa at fedoraproject.org|
 Fedora Extras|libnc-dap|The NetCDF interface to DAP-2 from OPeNDAP|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|libnasl|Nessus Attack Scripting Language|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Apr  2 03:34:32 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat,  1 Apr 2006 20:34:32 -0700
Subject: rpms/azureus/FC-5 azureus.script,1.7,1.8 azureus.spec,1.20,1.21
Message-ID: <200604020334.k323YYeb029744@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/azureus/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29725

Modified Files:
	azureus.script azureus.spec 
Log Message:
Revision 2.  Bugzilla #186152.



Index: azureus.script
===================================================================
RCS file: /cvs/extras/rpms/azureus/FC-5/azureus.script,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- azureus.script	10 Feb 2006 17:00:46 -0000	1.7
+++ azureus.script	2 Apr 2006 03:34:32 -0000	1.8
@@ -9,10 +9,10 @@
 # Reconstruct the plugins dir.
 rm -rf $APPDIR/plugins
 mkdir -p $APPDIR/plugins
-pushd $APPDIR/plugins
+pushd $APPDIR/plugins > /dev/null 2>&1
 for pdir in /usr/share/azureus/plugins/*; do
   ln -s $pdir .;
 done;
-popd
+popd > /dev/null 2>&1
 
-CLASSPATH=`build-classpath jakarta-commons-cli log4j swt-gtk-3.1.1 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 CLASSPATH=`build-classpath jakarta-commons-cli log4j swt-gtk-3.1.1 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-5/azureus.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- azureus.spec	1 Apr 2006 22:08:05 -0000	1.20
+++ azureus.spec	2 Apr 2006 03:34:32 -0000	1.21
@@ -1,6 +1,6 @@
 Name:		azureus
 Version:	2.4.0.3
-Release:	0.20060328cvs_1%{?dist}
+Release:	0.20060328cvs_2%{?dist}
 Summary:	A BitTorrent Client
 
 Group:		Applications/Internet
@@ -134,6 +134,7 @@
 install -dm 755 $RPM_BUILD_ROOT%{_datadir}/azureus/plugins
 install -pm 644 dist/Azureus2.jar $RPM_BUILD_ROOT%{_datadir}/azureus/Azureus2.jar
 install -p -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/azureus
+sed --in-place "s:/usr/lib:%{_libdir}:" $RPM_BUILD_ROOT%{_bindir}/azureus
 
 install -dm 755 $RPM_BUILD_ROOT%{_datadir}/azureus/plugins/azplugins
 install -pm 644 plugins/azplugins/azplugins_1.8.8.jar $RPM_BUILD_ROOT%{_datadir}/azureus/plugins/azplugins/azplugins_1.8.8.jar
@@ -203,6 +204,10 @@
 %{_libdir}/gcj/*
 
 %changelog
+* Sat Apr 01 2006 Anthony Green <green at redhat.com> - 2.4.0.3-0.20060328cvs_2
+- Set LD_LIBRARY_PATH for Sun java alternative.  Bugzilla #186152.
+- Remove pushd/popd noise from startup script.
+
 * Tue Mar 28 2006 Anthony Green <green at redhat.com> - 2.4.0.3-0.20060328cvs_1
 - Update sources.
 - Fix bcprov jar file reference.



From fedora-extras-commits at redhat.com  Sun Apr  2 03:59:39 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Sat,  1 Apr 2006 20:59:39 -0700
Subject: rpms/rssowl/FC-5 rssowl.spec,1.6,1.7
Message-ID: <200604020359.k323xfgf029854@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/rssowl/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29837

Modified Files:
	rssowl.spec 
Log Message:
Move to rev -13.



Index: rssowl.spec
===================================================================
RCS file: /cvs/extras/rpms/rssowl/FC-5/rssowl.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rssowl.spec	10 Mar 2006 14:01:01 -0000	1.6
+++ rssowl.spec	2 Apr 2006 03:59:39 -0000	1.7
@@ -1,6 +1,6 @@
 %define name    rssowl
 %define version 1.2
-%define release 12%{?dist}
+%define release 13%{?dist}
 %define jdk     java
 
 Name:           %name
@@ -138,7 +138,7 @@
 %{_libdir}/gcj/%{name}
 
 %changelog
-* Fri Mar 10 2006 Anthony Green <green at redhat.com> - 1.2-12
+* Fri Mar 10 2006 Anthony Green <green at redhat.com> - 1.2-13
 - Fix script goof.
 
 * Thu Mar  9 2006 Anthony Green <green at redhat.com> - 1.2-11



From fedora-extras-commits at redhat.com  Sun Apr  2 04:45:10 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Sat,  1 Apr 2006 21:45:10 -0700
Subject: owners owners.list,1.791,1.792
Message-ID: <200604020445.k324jC9f032021@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32002

Modified Files:
	owners.list 
Log Message:
+kdemultimedia-extras



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.791
retrieving revision 1.792
diff -u -r1.791 -r1.792
--- owners.list	2 Apr 2006 00:18:55 -0000	1.791
+++ owners.list	2 Apr 2006 04:45:10 -0000	1.792
@@ -504,6 +504,7 @@
 Fedora Extras|kawa|Kawa scheme implementation|green at redhat.com|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|kdesvn|A subversion client for KDE|orion at cora.nwra.com|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|kdetoys|K Desktop Environment - Toys and Amusements|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kdissert|Mind-mapping-like tool for KDE|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|kdocker|Dock any application in the system tray|rdieter at math.unl.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Apr  2 06:49:25 2006
From: fedora-extras-commits at redhat.com (András Tóth (tbandi72))
Date: Sat,  1 Apr 2006 23:49:25 -0700
Subject: rpms/gnome-yum import.log,1.2,1.3
Message-ID: <200604020649.k326nRes003755@cvs-int.fedora.redhat.com>

Author: tbandi72

Update of /cvs/extras/rpms/gnome-yum
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3722

Modified Files:
	import.log 
Log Message:
auto-import gnome-yum-0.1.3-1.fc4 on branch FC-4 from gnome-yum-0.1.3-1.fc4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnome-yum/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	29 Mar 2006 16:08:25 -0000	1.2
+++ import.log	2 Apr 2006 06:49:25 -0000	1.3
@@ -1 +1,2 @@
 gnome-yum-0_1_3-1:HEAD:gnome-yum-0.1.3-1.src.rpm:1143648486
+gnome-yum-0_1_3-1_fc4:FC-4:gnome-yum-0.1.3-1.fc4.src.rpm:1143960557



From fedora-extras-commits at redhat.com  Sun Apr  2 06:49:26 2006
From: fedora-extras-commits at redhat.com (András Tóth (tbandi72))
Date: Sat,  1 Apr 2006 23:49:26 -0700
Subject: rpms/gnome-yum/FC-4 gnome-yum.spec, 1.2, 1.3 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604020649.k326nSlk003761@cvs-int.fedora.redhat.com>

Author: tbandi72

Update of /cvs/extras/rpms/gnome-yum/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3722/FC-4

Modified Files:
	.cvsignore sources 
Added Files:
	gnome-yum.spec 
Log Message:
auto-import gnome-yum-0.1.3-1.fc4 on branch FC-4 from gnome-yum-0.1.3-1.fc4.src.rpm


Index: gnome-yum.spec
===================================================================
RCS file: gnome-yum.spec
diff -N gnome-yum.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnome-yum.spec	2 Apr 2006 06:49:26 -0000	1.3
@@ -0,0 +1,54 @@
+Summary:         GNOME interface for YUM
+Name:            gnome-yum
+Version:         0.1.3
+Release:         1%{?dist}
+Group:           Applications/System
+License:         GPL
+Source0:         http://prdownloads.sourceforge.net/g/gn/gnome-yum/%{name}-%{version}.tar.bz2
+Url:             http://gnome-yum.sourceforge.net
+Requires:        usermode
+BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:   GConf2-devel vte-devel gnome-vfs2-devel desktop-file-utils libgnomeui-devel
+
+%description 
+GNOME Interface for YUM
+
+%prep
+%setup -q
+
+%build
+%configure
+make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%makeinstall
+%find_lang gnome-yum
+rm -f $RPM_BUILD_ROOT%{_bindir}/gnome-yum
+cd $RPM_BUILD_ROOT%{_bindir}
+ln -s consolehelper gnome-yum
+for doc in ABOUT-NLS AUTHORS README COPYING INSTALL NEWS TODO ChangeLog; do
+	rm -f $RPM_BUILD_ROOT%{_prefix}/doc/gnome-yum/$doc
+done
+desktop-file-install --vendor fedora --delete-original       \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
+  $RPM_BUILD_ROOT%{_datadir}/applications/gnome-yum.desktop
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files -f gnome-yum.lang
+%doc ABOUT-NLS AUTHORS README COPYING INSTALL TODO ChangeLog 
+%defattr(-,root,root)
+%dir %{_datadir}/pixmaps/gnome-yum
+%{_datadir}/pixmaps/gnome-yum
+%{_datadir}/applications/*.desktop
+%{_bindir}/gnome-yum
+%{_sbindir}/gnome-yum
+%config(noreplace) %{_sysconfdir}/pam.d/gnome-yum
+%config(noreplace) %{_sysconfdir}/security/console.apps/gnome-yum
+%attr(0755,root,root) %{_datadir}/gnome-yum/gyum-query.sh
+
+%changelog
+* Sat Jan 14 2006 Andr??s T??th  <toth_bandi at users.sourceforge.net> - 0.1.3-1
+- Fixed specfile format bugs


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-yum/FC-4/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Mar 2006 04:50:44 -0000	1.1
+++ .cvsignore	2 Apr 2006 06:49:26 -0000	1.2
@@ -0,0 +1 @@
+gnome-yum-0.1.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-yum/FC-4/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Mar 2006 04:50:44 -0000	1.1
+++ sources	2 Apr 2006 06:49:26 -0000	1.2
@@ -0,0 +1 @@
+0a3bbb714418b8b849e5fa3ecab877fc  gnome-yum-0.1.3.tar.bz2



From fedora-extras-commits at redhat.com  Sun Apr  2 06:51:15 2006
From: fedora-extras-commits at redhat.com (András Tóth (tbandi72))
Date: Sat,  1 Apr 2006 23:51:15 -0700
Subject: rpms/gnome-yum import.log,1.3,1.4
Message-ID: <200604020651.k326pHQi003871@cvs-int.fedora.redhat.com>

Author: tbandi72

Update of /cvs/extras/rpms/gnome-yum
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3837

Modified Files:
	import.log 
Log Message:
auto-import gnome-yum-0.1.3-1.fc5 on branch FC-5 from gnome-yum-0.1.3-1.fc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnome-yum/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	2 Apr 2006 06:49:25 -0000	1.3
+++ import.log	2 Apr 2006 06:51:15 -0000	1.4
@@ -1,2 +1,3 @@
 gnome-yum-0_1_3-1:HEAD:gnome-yum-0.1.3-1.src.rpm:1143648486
 gnome-yum-0_1_3-1_fc4:FC-4:gnome-yum-0.1.3-1.fc4.src.rpm:1143960557
+gnome-yum-0_1_3-1_fc5:FC-5:gnome-yum-0.1.3-1.fc5.src.rpm:1143960666



From fedora-extras-commits at redhat.com  Sun Apr  2 06:51:15 2006
From: fedora-extras-commits at redhat.com (András Tóth (tbandi72))
Date: Sat,  1 Apr 2006 23:51:15 -0700
Subject: rpms/gnome-yum/FC-5 gnome-yum.spec, 1.2, 1.3 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604020651.k326pHpk003877@cvs-int.fedora.redhat.com>

Author: tbandi72

Update of /cvs/extras/rpms/gnome-yum/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3837/FC-5

Modified Files:
	.cvsignore sources 
Added Files:
	gnome-yum.spec 
Log Message:
auto-import gnome-yum-0.1.3-1.fc5 on branch FC-5 from gnome-yum-0.1.3-1.fc5.src.rpm


Index: gnome-yum.spec
===================================================================
RCS file: gnome-yum.spec
diff -N gnome-yum.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnome-yum.spec	2 Apr 2006 06:51:15 -0000	1.3
@@ -0,0 +1,54 @@
+Summary:         GNOME interface for YUM
+Name:            gnome-yum
+Version:         0.1.3
+Release:         1%{?dist}
+Group:           Applications/System
+License:         GPL
+Source0:         http://prdownloads.sourceforge.net/g/gn/gnome-yum/%{name}-%{version}.tar.bz2
+Url:             http://gnome-yum.sourceforge.net
+Requires:        usermode
+BuildRoot:       %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:   GConf2-devel vte-devel gnome-vfs2-devel desktop-file-utils libgnomeui-devel
+
+%description 
+GNOME Interface for YUM
+
+%prep
+%setup -q
+
+%build
+%configure
+make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+%makeinstall
+%find_lang gnome-yum
+rm -f $RPM_BUILD_ROOT%{_bindir}/gnome-yum
+cd $RPM_BUILD_ROOT%{_bindir}
+ln -s consolehelper gnome-yum
+for doc in ABOUT-NLS AUTHORS README COPYING INSTALL NEWS TODO ChangeLog; do
+	rm -f $RPM_BUILD_ROOT%{_prefix}/doc/gnome-yum/$doc
+done
+desktop-file-install --vendor fedora --delete-original       \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
+  $RPM_BUILD_ROOT%{_datadir}/applications/gnome-yum.desktop
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files -f gnome-yum.lang
+%doc ABOUT-NLS AUTHORS README COPYING INSTALL TODO ChangeLog 
+%defattr(-,root,root)
+%dir %{_datadir}/pixmaps/gnome-yum
+%{_datadir}/pixmaps/gnome-yum
+%{_datadir}/applications/*.desktop
+%{_bindir}/gnome-yum
+%{_sbindir}/gnome-yum
+%config(noreplace) %{_sysconfdir}/pam.d/gnome-yum
+%config(noreplace) %{_sysconfdir}/security/console.apps/gnome-yum
+%attr(0755,root,root) %{_datadir}/gnome-yum/gyum-query.sh
+
+%changelog
+* Sat Jan 14 2006 Andr??s T??th  <toth_bandi at users.sourceforge.net> - 0.1.3-1
+- Fixed specfile format bugs


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-yum/FC-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Mar 2006 04:50:44 -0000	1.1
+++ .cvsignore	2 Apr 2006 06:51:15 -0000	1.2
@@ -0,0 +1 @@
+gnome-yum-0.1.3.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-yum/FC-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Mar 2006 04:50:44 -0000	1.1
+++ sources	2 Apr 2006 06:51:15 -0000	1.2
@@ -0,0 +1 @@
+0a3bbb714418b8b849e5fa3ecab877fc  gnome-yum-0.1.3.tar.bz2



From fedora-extras-commits at redhat.com  Sun Apr  2 06:59:58 2006
From: fedora-extras-commits at redhat.com (András Tóth (tbandi72))
Date: Sat,  1 Apr 2006 23:59:58 -0700
Subject: rpms/gnome-yum/FC-4 gnome-yum-0.1.3-1.fc4.src.rpm,NONE,1.1.2.1
Message-ID: <200604020700.k32700wJ004046@cvs-int.fedora.redhat.com>

Author: tbandi72

Update of /cvs/extras/rpms/gnome-yum/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4031

Added Files:
      Tag: gnome-yum-0_1_3-1_fc4
	gnome-yum-0.1.3-1.fc4.src.rpm 
Log Message:



--- NEW FILE gnome-yum-0.1.3-1.fc4.src.rpm ---
????


 '
eXa?[???I?l|R|?C??

-O????????;s?9]9?@??mt/???;[??z?1?tj,?D???_P??<????W??}????????Bi????l???.m?)C??\?l?*???DF?{??:z?????)?:?]???g???hO?.
??9W_?????~7????MZ?,
_5)?\\??_?o#?d?}?f#oj??m???&Pg??L???Jq
?k&????o?;g[ 0?y?????E?)L??u

?6tz39??????d????IN?????GN?"?(?X??H??%G?\|?1'H??h??????pVW[WMN?a?,c??xn?????m??m???A???~?~?.+,???($"?){????????O?
?E-?"q?r?T???EZx<???Qo???t?????)h?hk?????[sqQ}.?q????}39y??E?????????h%??ur?????????;???IHj?L??G??????)?]zM??S?V?]P?&?t?VKw?a1?+?I?
??a?:???@I9???{w^?(?????v??Qm???????s[?_??T???v'?H4?q???&PR?\??76???? +??[??s?'vN??????#~??=XtT??8?2635??/?.????}g	??~?%ao7wz?Q?>?FT$???Rs?0??d??R5???l???74??? ?2???Dc????h?.??'???L???u?q?F4?
??W?gt????RS?S?Q?Q??l3`^nK	b?k??'?r\?bP+?-
3??>?AL?R7T>j?},?k?T?J?/??????8?#???U??qe?{?\@?????[3v@?U?v??\?+??R??U? ?=;gp{f?????WLm???1?p???M3d?%?F????J:??5??SKa??O???7??w?????65???9F+?=-?5???$,$??+~?W????c?5?8C/?r?????u?[???????cs&??m???????$??`???V?????0??????U?yf<???{?j?@8Ujg???k??????)Q?o*?EJe{??G;t#x+????ud\?-rG??j(?hM>#?
?????P|???@?g?G???v?????5?????`???`????*??PH????E?
??I%6v???????xZ???2~fzK???K???u	?=??v??p??
??p@?y-????M?=??U????NOt(??<4=T:??KJ?Z????e?Ky)???	(K???
????^???????9?w?]t??$????(??9K?#b???\??9??r[
vC????%???F??????W?]Y??&??P??}?{'
u:+???qh??(????#dV?W%????k???a??q????_?x??(?A??T????T?$mj???E$?rI?L??M?&??G?????-???f?,????7?O?9?{?????e?;??$q0
}??d?5??c??uc??|ex(?wG???i???^7????B???????}??????ZB??A????]?;o}R??U0lX0GW6u???	???:?(???%&????6X8	+?*"yoI7????????hZ(???????????????1???ZC?w???K?)??So7+??7.^?S^?Kh8??????zhU7?^V{{????c????A?E??????l???????'L?P??W@?,??I?AZ?W???5Z?.n??_Z?p??J???$v=nmju?#?b?b????v??????q%??)T??m?3?7?_??Q+?~P??0?B???????V??d??
/`L5?[+n!q?Wo9???4ab??*Ar?L0?H?Bz??6?????h?s&O?&??v???n?????	n<?(BGh?????-c???H???4???C???cT????!Xn??
?U?|+?M???B??;OGmC??_?d??}N?u5AQ?Qg??`??5???ih?s0???,Bw?d?5T?x?(4s?C?w??<{|??(?B??'""lp???{?B!
HVBU????_?v?????,?}+/D??2????K?{"?=?????UL ??,,???Efy??%=<???6???-??pj+??????\*?9?0e??F??:?s?;??u/??K???W??N??s??v?_??????2?"??t???S?c???Vy???8?2??{??Z?eyQUN???????\:?|?ti?????B????o??*????ocI"????"???Cw!6??`??G??????????-??8??????]Z?v??????]?f?	?)??V]/K?x'??m?'?9?xjiEa????1w?;???C?E??|??????~???Eg?
U?	??yB(?e?v?j????P?v?z????b??+?y??
??@?z<6?9?.?||?}56~?Z????d}@KZ5D>??3y???K?p?vcZ?.T.b??>??????P%?u??o2?????.??$?kq????6???HD?(??m1_K?=;?D????5v.???u?E??%{?l?z6?N~?J??h ??7??<?c????B?W?S?uc???3W?|???@?????p?k????E$*?I???????????A%2G<?????N??*??3?????'"???????Q??
^?[.?(\?u?4I??t??&:?*A???wL??????0??Q???BxP???????'Iv?v???????u,%?????0?
v??????????uT??Z-??a4Fr????(V?????`?E????D5\??r????2u? ??j??u?,~Uv?[??~}?L??p3Dr:H??h????>>????
?g[#??[??+????o5F??FJ???0??<?y???v4?I???^?U??M
'"3?r???O????????????e
?B????L@??N?jd???;?V~z`K??-(u?=4^????C??????8>?*?/K???<n??{?J???h?C?\???RM???<?RR?f?>???=???QJ?;?_???0?R`pqK??)D???4`Fr?:?nf??K,???Xc???S?\?v???.?
????????i8??4I???z???-=q??:|?j??+??
???R?^7
??8??)t^?X?????Or?*D???I	w?O????aEB??j?z??N??h8??
J??:
??""|U?w?n!'E??Bn????k?H????*?>*&G??~[8???a:18y??
???[B??T?
?S???bt?????ni#lLXn?z??:y7'??Y?^T?????????U??l?4S?v	????~??|
=?yh??iA??Tw??,?0@KK?+u?h??8????????#
z??p]nL???????od|?s'?R?[??


0??D-n?A????A?:u????h;>?0?6;??f???h????J
)??0A&??~a5[?G(?r???N?kS#?1m!????u
?+??P??D??g??k????}Q?q7???*#?]??????
??c????
?r??Q??@??\ga??hhB??N/7[?Wl?P??r-Db?mO
??$"
??V??3?#?
u
ho??%;5!g? ?Z^RBQ?"??,ej?d??6??-?
??????U???f???I1?CD?Q	????????*???A???Yw]?#3?t/ahl
'?????e"/?N2v??`D:J<0?"?A????v???n?Y(w7?M6;1q?r?^?u?A????'U????y?PJ?39?<'??n??????B?" ~?_?
??J?1P??'?~'??y?!?>/??{???}???XD|?
'???N(?	
\????;????F?????9???=&+????[DE$?(-t?=??m???n??Q
???G?#?8?????tM??s?????p

??+)???OK?zqXic?l??i>$??A&???}~?QBC????J$9?r?y???:???N????????????'????u??+7??o???w?s??
??X
,???f?Q??l??6Wej'?????x???73???xi?????Ol=?YH??&u?t?????;!b??+?*?????~]?"?}??5Q?7?h??,pVn???th??}????o?y?=m?c??????????M????????Oh???V???????/?=????H?_?1?kd?"?~?b]?????:?rN?O?}bp?F?o????]????pL??H??
R?q??H
p>?WG?N
??=??????????? 	?Q???
xV\G?`?T??p??????a?
i??3??m?M{?d????7??}???/64t?
eGMj??	???E???~o?JW&??X?pb?????2??H?z
^DF??*:?
sAH??I?d???D?z01???+??EX?b?t????)?,????WV??n????????%???
qN)?i2?ei?f6+X6?R??M???:L,??b????Rt|?(????.&?p?Gh(g????, T@????"H?#!"???_????????????c&??r??(??t	+
????'?~g,8wg??ID?R??O???=???9???p?n????S?<???`?m7???G?!??uW????g89??????r???mGc?e<.>??.<j???v???????0?/???U?V?p???4?a??Y????G;??g~??<????.??WN<?9b??N\ ?x>N??bz?3??9R?>RI%u?v??I?lF??m?z.???????wt??0F???}???
???]'???)?j?J?wB?r?c??Y?N????`?4?,U?T[eQA~??
?uN?+??&f????T??\3???/*???)F;P0v?yb??V???	??*!$?<?]??4??AU8wu?{2*:xd??1?J?TB-???p?$????"p??s??T,Q??@?K?b?c.Sz?
?Ub?T0PQs???A?g???P??p,?F????',??.?Vipf+)~??V&?????5??Mu?T7?h?F?n\?c
??6?aQ?????:?y{q???H{/yl3???OK[??????>R>?|??????D|
???S?>?????C?E?\,??f??z????_?J???[7??????I????dM??d?k????.v?L??????&%u?vM_?v?`i???2\"???l?Vk??:@?i??
(?2T? ??,X|???0DU??H")<?
????.?XO??_???B(d(??;??????l?=??OS???I?S??

???D??|g????[??????<?fj#u?x?????{hdx?o?a???N
??vk^?
??????|????????Cx????????q?,D?}?X
 8>?T?K<E??&???D8?DVv????m?x???e?;?p4w?%??.??7????I??????????td?b???v+????6?u??_??????x?T?h?T???e????s??(?j??"??E:??????W??????W???
?8|??????_o????B??l????hg?????????????
By???Eb??0?'dDP??!?O?X"k????C>Y6hBdO??? ?Gk???????
??X1?"?PTe?a?b?b+"?`?TTX?AQFE"?????p'?	????$??P?BiD
-????T????CV
P@?9r	!QR\?R??@??F(???T?%??a????RN???{u??	(??_v?-Jv?"T?H'u??n7???"??5??(????????:p?=??^?7?U??????Gxm|???{?@t??????X?!?k's,#?2?g?N?y7RD?e??N?R3'?e
_g6???VA%j#Z?(????O7?[???q??1???8:?]???m??6Yu?e7?0AQg;?M?t`;?????O^?h?_H?1zt^oc????qz??;????\??A??R??q??2??&???
?@@?
(??G????l?l??;c??zg[~
@??b?Ub????"I? ???ZBuR??.???G????~?D??5????v?Y,A]s
Yp`7?1?z??)?jOc?8?RE!?5?,?s?0???bhe$d	?|/cI3?w?LRE???`?!?D9?u8?1??

?????=??
*??}`RBD??H?????U[???r:?RLhj?G.?t?S=h?Y???????1???}T?-??g?????>?E)U??VyX?Z?????rOV?????i???????k?}uO???b{p?gVA??? ??}V??S???????t7Z>?'%????Cs?q?~????5?>???{?Z???d??+?????K[j?E-??wX?g'o?????p2?????>#?U?G??!?|.???u$3[??z;9??v=??????1??????B#O?Y6??ji?????t??7m??eN??	????@x`[?y?=w?????	??	U???-x| a`N????VQ???A?C0??_???`?'??2?	5?|?D/D??P??U<?????iO??A??V?a?$$%R??b???b&8?	}?UF?Z;?????Up??1J?PaU?`J?pz?@?@E?O?P%??q??b????,???ek??;H
 ?c???Ni???
xD????????R????o??0J???????r?rWYz??etl?
*?V*q????
(
0~T????)9?I	??~?!
??X?i??[??Q~???[=???????W=?????z8??HL~??????????N???N?^>?????
$?u?3w<?y??S?P?"I?????l????E?Sl??['fh?s?EGl??????T4???>q????Lf	f ?GW??x/
=??.????Ia??YN???G
???I?8E?l?ca:*?????"O??O??UQUb????????{o??????IURu?C??p???=?]<bD?3`&?3???;?V??r?(?==
?zk?DU???
 ?p?{	???Z?M
I$A???(J??
C?_V???Eb
E??V1D
Z?+	Z?UX(?"??"??b(???*???$
tl??|dU??????T5g;??c???">????d.?a?,e??[?B]6????X???@A?? d?g???W??q?????^??v??
`???%?1??????W
?\??H??er??|?'1?6?????*d?????3???P??z?E??OZ??????B????
?"=
k?W?A??C,F0??~<??=?l?t
Z?h?%????t8dB???W?z???.?A!????????
?2?=?E??<?b?m??^?w??W?????O???\V??-&^?????c<<.???]?p??\???????&|?6?,?DS?y`_??PT??2??#~??????6???</?#????M?-oUS?t???????n
??-u??}<?-???t?c???zi	O?zTo?1?((7
07#??6s????q??
???????Y~ 8?hC??!n?????;7?X:???{:?q?~???jd\n1???5??h6??k?D??(????%??????sTyP?d?O;??????:????3??E?nf??CH???$c?M?b?p???S??>?B??Hr?k???;C2{"D?????I?#??b??t-?&Tr??}r?e?(???????
?R???????w??? p??'????"W?6?8??_~???U????????K%??b???=x0?e?b??h??%? S

^?5i{)|+?|?j>??}??O???b??*-P?????????UEX????9????????AADw???V?4@?e?$a??8F???R\?l9????????
?S?????
V?e??g	wM?g|??N??C?}?k?7
????.W.?!???F?z??u???U???0?)'??>Q??@7?*<=?}!Y??0?B?!????KXA?W`??%?Z??XC??????\~<?????X?;?????g?C?????D???J??S!??+??\??u$????KY?_????D?r??fp7????2???v???7?_8?C?P??p?"=.??VL:?????OJ????3?<&q?V})Y040}?????$(?,>f?%	??3?? ????u??N?n?????
?o???A?????J????l
???1C"?9??>???,cq???l
???G??????CV?;???0??
??b??C???u?e?a`U?GD?&7
e1	??????;????????~???H?W?`????kD??6^i3??4?SR\?XZOE??i?????o?z??m??q?/??JB?4???-!??8???????H??@M?A???Q?n5I?(
?qte?"jm????5)?Un"[3|???o?HZU ;PL
???$=?#?&????T_??Xj	i?G,7?G???v???A??@??B????E\?????K-0Q>?????r??|-@?u??>$???bc"?
[??????????~?Q?mKR??"????cU1?Z?-|????Evn???X??cU?z?????C??>???c?-;????m?V??H0?q^R??t?a^9u???F??0??}???`?bp?b6??&?fY-C
,O??[?6xI?}P]?x????7y(???????c?? 
E??S"
???i??+is?EN?nx
??F???a???"??N[j?w?{??.?~.?\+??K!??t?~^??i???? ?-?h????JfZb?u.???_??Y???S>?(????C}O????y1?t?????])?8????
?/R?*??H$$??:?VC	????Ab?j>5?o????????????;?Yt??i?????~6?C??X
?ta??r???U?f?sn???x??c??T????
c??G?4?RcJo]?k"'?
Q???7>?6???A?T???|?	??????r????K??_y??(????Bvm?,=?????O?Z?xb???4?g?f????????P???*??IDRF?????r??nH?T?{b??)`?W&~e???h7?QL=??c%?Gf????BZ???????J????????Y?F??8??v?j~???.???T?]#????[?dl????#+?j?@N??G????+Doiy]?c]
???C? ?c?
???$?=8???\ ? ???IM??W???X?Z/?????
??%?kw92Y?A??Z??i????c1?\????m???I?.??&6?1Q??z?Tl?,????

E?gin????D[J????????V~1Y?O{?i?-?=-??D????j?C?ZExh5$?????????X??zE??*?????????sUh?Pi6k?<^?0???@?V\?g???f????2????l
????s??m/?8f?J0_#p???^??Y?<??_S?\?+??;?????????????s?5?*??f3$D???&X??f??p?:?4?.3Xc?????%??<?3Q?]??x???a'F??V??}?w????{?%#???Z!?]	
?????*???VO?7$<?k??~?H?j?????u???p-R?D?^?XSIk???O?^?1?1t?	?It$??0P/?N?E?&??8?%Q???'r??w?*?????????^?l?????w7?:?^3????yu?P?A?ox???N
G9????>??22???73?PM????I>??m????????T??{2n?m<?m?3??o????W???T?`??
k?m?M??a???|??????"P?.e??q?;??4c?????"?t??m?XRS??o????]3ag???lQG??]R??????"???v)6?hT????wN?}_,`??o?(?r???"????I?Nx6?i????D)C?#??MD^??]???|?(?T?h?1?Z????*AO?w????,?????
,???[[???J?tX??aG??b??.?%G??"???;<??4???????G?e??V2?r?U?j?3?O*~)?2Gg	?K???wV???`?S?/????{???RR?+????:?W?[???]N????y???F2??Y??bD??E????W?}??el6????????????)D?6??@h4?]?Bo?1@?u?,=??? ???|?X?"C???dX?R?:??b?U??
bO?c?@??S???4;k5?p?F??;??????vP????
??_?R????
]?*t?u?o????? Y?'??t?s????g?c??u?!?'??``?.Bd??*d?O?Ek*?K]SI???hr???{?>??X?h???3?"?9:W?1?!}?O?0?F?2??
?"_???????u?\W[???d??/??4?C???e?<???????x?????W????s??Q?/?G<Q??%?<?G???@?fB`?lcp?
?Y
?????a??/>??U???#???????
?P????y???m?~?U?s[???1????#G???&c??L?\OU???????_R9????|\:?}>?\??????Jm?e ??
?/B6)??(o7??????D??^?''?????????@?@P??S?DW??'?????'k???????=?Q?m#?????? ?!??
??R?????]???~?$?H?`???D0??$X?H?U,??`??t??H?P:2
g???H?@?,cE????? ET?
??M?!?Vf?P ?Z
G???%????F?$H2?,$P??R??1J?3???JiT?idd??d
0*D???X?PSQ?b ?2??y?
>4?x2IA?J?
Q??C	?????BtN?b?n?J??Y"k???I$??Hh?!?zt???????:6???????????Q?K????4b{?
D7R`&k?#^](???T?;???1Ll????]H???w??
?:?q???r??{;n???DA???d?
Hk??a??h$?S`????]?	?"??*?Q
e??`aH??K?
???O&???$|??C@[ 
??T-`m`B?????*?N????T?b?`??/????#?v???zPY4????3H7|?a???af%|????p?C=
??????Aa?;????O??2 l"m
C-?0"V	F
?)ha?????P?s
???U?J (
*?"??(d`))E?"??#???W!0"Ie??,??&(??%?
+J!)??0??X(#%?J??d???p3]>?5?	#?	?vha??%($0I??I?Ya?h???"d???P
 q?:+??3??o&?RL?,?I????D?I?=?)&?Q???uo ?
?r
??l?KT??1?'???/
??H?????m??I?sUUUUUUUUU??
"??D?"D!d?;*????*???2um??????h???W???u??L????sq?dhT??
?)?S
?-?m!-????
??ZJx???f,z%?????%??{???sz6H7MN
?*?X*?6???UJ?????UPQEX?*(?ciQ?V(??Ub?TZ?K??K?.???????&????^?v?i???'??????v2?~???g???m`?T??q	???:R???Y??{???????????7>?!d*?v????@1??s??g ??????wM7_O??????o?????~?^#?l????t????{?v?%6H????H???*
{????
v??????&}?????^%vO
?t/h???N?P(??S???7??p?98?f?!?f??.???>???E?`??i?3?g?.@?C?`|9Y0)?	>
??D?1R(??f`T?b????\X?NqE?"AZe?????????3?
o??&2??JL,P?*z.???%b20X?(x??/?????	'X?,??`?????b
??
(HS R?D?}q$??hea???j'??,?gC???uE
H??
%;?	@?B?5R???Po/??q)?? z'??\]????+r????,?
?a???|=?h{[r?{??A??8????b???aG?.=@>????^[?D~?0Z?]?W????Dr???(?rc3?t?T?ut??j?27?vTG	???hHD????.?t?2?T$?m\xQ??2g<k0?J??Sj?73?g?????*zSo{<???68?n??A4???k????2??@???>??/????vv?9????&??5 ?"(A`?dSY1N?$?D?8?~?s??^????0a??:?z$6'4?r???????|???;?.5??gV?u??8g?uc1??g??!?[z???5o??S?z"??>=???fx?Y???&?M??A???????
H?? ?s,??????f?@?@?!?7.?~	/Go????^#???|?d?2?KI???b?lT???8???yC??????RN????tqR3Y? 
!?????R?T= P?p?m),?4|?q?TTC?????|?QP?!Q???"????????5??$ :???D\?????}?n???????2?j???L9}???p{?@k????bb~?????P !?N??["??zx??????x
;????9?? ???*
E?c ?H
DI
d?$?$P?
??R"?H#
@,Y
@DQ ??,?Ad@R, ?"?

,?XAD`, ?T??
?? ???E?!
?A??b??DU`???dFH?
??!$b*?#
	?"?1b?"??H?#
b??1#??"	??b*???? "??1?AAHI ???*?TX ?????dA?1?0D0dA`???
TX?/4???[?5???Ao?f????U?;?@??
`?<????u??Oo#Y?Y??W{????_}???u??[???#??,k??v??t6?o
??J<R???|\M>/??H|????????\,Q????D??)R1W??!6???8{,W?zH ???x?????f?!??cUh(]???.?TB

A??????h:?]?k??y??j?@?,?
`?i???;E???(tD?
[?s?*??#7??-?MG?yIz??m?vt??????^/??"??_?"????)Ji?Y^?Ju??,?{R???V???W?4N??t? ?-2??=oU1D?{^???J??b?1j%?iw?????1L??:r)zR#)?Q???g????^/ui???xYe?(??O??F??r?(?kcM6?{o{??1??F?
?M2???7?\???????U2@F??\7?~/?~>.^??o???1?^???}?9?B??????C?????????v??;??_g??F??W????{??????3U?vs???lsU?Y?*2RBo??????g?B?P??v-d?@?|????#?$Ea5?.r??U
??2??JVgG?2??T?=?????OwG_=>?'?6????f6m???v??e?u??g????4?M" xb?}?:?
?`w`?z)?\4!?[?0?R?????7s_"]???????
+?B????y??{;
??7?*?CD?p
]?j??{r2O??JS??->9?g??
????????[??nM??%N???C???L?SvL?F?,.?FCu `?v3?'_?3?-??Qq?B????????????rrs ?|??\?^#?Yo!4N??`????C??D^q]Rt??? ??8GR?\????Q??V???(c???/??~o'?F??#M????
oe???w???,|LRW???oj6???????C?>?????\b?|=l????P3&$B~M?=?un?d-?5??)o?	?ccM|?@;D0?8??1
mm0+?T=A(8^}??TKn?r??w'U]??^?Z???cO`7?Pi?RT???jjN?#?i=Y??????[?Cm??T@???
?^K]??!g???T?4?A??5QL?
%m???&?$???3??t??E???zgH???? ?0??}??>F???Ux?54???k?Z?]~P@?w-??}}U^?-??????????~?L&K???A<,???i??*c,?	??Mj??C??z&E#??N.?;?UF0`3??x.V3??z?%F?"???????<???G?,??5!W?9?\)?{?-(t???9?Sxs-??????]E[?SaF?0??j)>?ufm??!?1Pk7Y???Z?^]??E)~M ??Zx?o??18p?6?su?
??@?G
????f'?????????O?t"??]A???=N#(?k}8RH??
?(????7xY???]<@y??f*T???3??2????j	?*??????
.?(Ar???l?6?|A??5=$q???zn????:?_wT?@?Uj?`?EZ?$?#E????FfK????????Y??$B?H?4.?M
?@B+*??Z?O?c??z6????ns?????????^`???p?????t????-[?9??????By?	Wa]M??????B????.,?H?I?????m?e??????!?_d?O5p?????9R?????z???????S~?M;4???w??_/^?9??=|?E9Gm??#
?????9??[??????>>?&???
?Lq?r?*7??F|?L?)g?????:(H?0????:I?v??}4H??????????<'???J??????d?????{??Q??FJ?X??p???E?E.??8?;ra???\??nMS????:??$Y|??.!v?u?HWF?5S?O?^N?/??S??3??????c?"???mo??E??`???????^?????m??m??m??2???n????0?c{????;??}??G????b]??????O@?????
)????????S?{%/QS??]?E?%]??{?^?{??}?"^)??o???Mk?U??~m]#???)V?????v-??nD?d_m-?0???}&1?g?|mg)?;??Y????????7???5Lk
??F?_?z??Q???S??Vl????6U???????F}
?3G?/\??CLj???_J???+S????F???G????uv?????=m??
"??^?t?(???2?????@?~]z?h??????O(t??ys????ho??in????O?cNk
U?<???f|vk??k6?5`?
?<?n?!%i?1?#??~5J??????cS{?????w?_?y?vQEQEQEQEQEQE??oc???????#'????+K?7i?p??[0na>?????yy
?v?e?F	 ????;??O?e?#H)/??1??V1??@???3?i}F?k9??oR?,?D????????~??c???pe??[m7?R?d?l<b??r???[?6"Z?T98$eY????
??7x?2E&??	?C?m[????)?]R?W>?@?Wl?IN?}??#?AU?????(??)%??W???z?i?Y????r??n????L?9?vLe????VS??&`?3G]V???CDX???f????.e3???_?R`:?D????????V?~B???~?W??1????Jz?w?????{Qv	?^?y???m?-????????58!fF????????!_%???HQ?q????j?f?DT??????a[??N?3?n??x??c?	??be? ????c7???IG3<?g?oNt#?`?w??	;t?,Hg??+????v??+??\}??u?{F0??&iPc=????????C????~?VB??||??tf?s}|K?{??:e?X??%???LD??	???4TTs3o???^3Nq??|6m??mg@???????w5??	??t?l?i?'?qh??v?r]???D9?9????z>B?E1???L?J+h|g^q?????~*??{??;y7??<??????????+R?-??????[Kim-?????m-???/?5?={>??n??=]?<EE?\????TY???Q??I???c?=?]?????!?s?C??F!??Y?`??@{??{rK???yN???e???8??dp?O?!
 zU?j?Vj??????^???V?6?????????G?xO??z[?P?????9?S'??????v~???I?e????G??9
??????t?
}??)*?E?
?????q??%???3$??"?}??"???????[?p????d??'??O?5pm-????-??}?9f?s9?7vU?`??V????=c????{?suH?t????Y?]??o???^ff?&???yE??Jo|q`?????7D8?$??A???q?e??%'5??y#?{IgP?et%??L^}?ry?rr\%?m??{?P????
???[?|<?%wFqT-?9?l???-$?m<?????-,???I?
lR"FK?y???/?f???????T??t&????b\??#nS,Y&8??
???(?)T?Z?'??S????z?NK+d*???F?n?^?2??????$_?_!$Pj)??.???9???=??s?L???????b??MZ>?M???)?tS??)?^??MD?? ??H}??-)L??L?AU???zu?y??????e???Y????O???????k???l?J?'
K?74?+???0?U??|????	?????7D??{?z
???P?????"q???d#d^S??s???iJ1Q+???y?W??!m?????q????	#??	?????
Z+<???M?s???J??	??U?8??8s?7???Pu$]^
?G1??E$ii???vm?Ym?|?)a??I??????9-???C?	??W?rs? ?~D?^??Wu}ZF??"??jRy?o???-?x?????/;??dfV	e?{???C?<?w?'?????K?<q ?T??g?'?_?????s????LS????O&??#f?W?"??C?7I>v%???
?{	??????c??
M??W>??S&?Q:???$O???2?g?iP?e?E??????aU??????U????A?iWe?Mu???Y????U?6??Zo??D?S<??}^??\?&s>?u
?ed?G|??????N??
?q?T??.?"T?2H???
??
W??>??J??????7?????3o??*E???H???ap????`?/???~???Q	?5??~A??
<?????'
??{2?-s??v?5????a?F~gd_"??e@
???{?\?;??,?$?2??_?3>5*N??u????`???T?*?'?Ff%k??a???"???.?;?k????}?,K??Vap?a?eo)?>???P?!????E?(??K/tb?&???y4?*D?H??b??U????K??w??
u
?B?'?t?#}?)?n?|
\wk+?A????b5jkF?D?V???G?9???6K?@(?????_?L???T?72D?
?o|?J???el???0 )f?a2?^??kn2%o?[}4?????'?g?7~????2~??AR??h??hh???S>??=
?|L??f?Ky???4???3K&??n??Q???w??y)?KUa??????n??!?m,????f??Jo?f??\A?o??%???i?t8???_???@7?????{)????????[????d??s??{??3xH?1Q[??`?	?`7??:?P???<?.:v?????4?C?,tu?*	?Bl???;'e~?/F?X??=?QPf(9?4????d?????)??<?vl?D??T??q&i{???w;J{?Q?~?H?<???F_J]T?s?a?.???=?/u??p?
?V????K#^f[%$???q%?W?s
	?<??`?I?3L???|???w????GA?<h?'[??N+>?SC?R??y?3???c0E?
b$$?]&?k?W????b?W?p?1N???9?(0?z?>???&nr;???+?iw?p!?K?~)???T???!R?Q?Q???C?n?????????:r\????K=%??????97?uF??]??(????w{{?$;+??&@w?_???????r???]?a?#??????Da?%?SqEY????.x?R)D???xL?^??Bj)s?E3??[#???T?J?
?????~?x?E?W6???1?????5-????
{m+!{J0{o????
????38tKf???G???w;,?T????I?f??T?5??h?]!+????iQ?|????X"n_=_s??]'s?????x?????G????????r{d?e??
??????=??????^^g|.=k?|??hN<????8rRE,]???	??wE-?f\2???tR??H??E?s?M???I)|??g=5??X????gf??+f????
?C???w??\?hl?'<?w???.?o?\????(Lsd+???y???????E2;wlh???????????t???n?B??????u?w`???i??<?L??x<x???G]?#k]??\??~??8'iP?????_~"d
?$6>??'??D%?????<0"???????Wf?G]/?e?????
????,?2??%?J?^lq`Y??????t???nj?E?eO?2Y?Fj?;'n?
???????????g,??'?V????!????~e=?
a???!0?0?um
{??~?a?????4??Q?luM
???k???K??*??)_?_~?M?Pr??a??,@???G??=?)?W1p?(C??c^?????g??@C?
??????\?s???	???P?&9#?P?q????
|?????mk?y??WR#i?d??E?"????$,e???]???t\??B???LD???|X?????ui??WK??r?s?0?'`"?uk?,?/Y?????????`	??????8????9??????#? ?d???L9?(??-Cr??F???????????S?!??????Asaj?'?&???=n?u?>
|??6???^q??3k??<v<????][;z??
397????tr???m}???dt?b??#qC?8?5.#?"$?p?v?#w?8???p????iH???CV?[^?mW????'???-??1????dI?7u??
?e??p{2?c?q?ZnBo?b?I??S?
e?<H??k???	.?????!?l?~?q?#?T????2z?W?s?9??{{=??i\???Z:????%c???b?????8? ?VT?O?I?2???v??
?,???$G\???????z?>??????????eO?)??
??`sUS?#?
?????d?R^?[_????=??????????7?L???j??e?f??x
w??B???K?????1????]??????&;i^???e???p?`yO?C?X(??|"H?:a??? b?`?gT??;+uL?h?C0?87???k???X?2t?e~??5????|
?s??????^?7
9?????lY??????% ~???{???q|k?X??#1?!?7*???N?T??{[4?Kh?s?'C??
l)?ceu-?y?/??P?8?@tga?????	?e?#.HL2n??
Qf?o?[?.??9t???a?y???i??F?,0???H?*E:t_?ThY??i??????s??J?/?D????\R`0?
????,?%???u?~?u_?????hCsgW??????E?w??}??????B????j?
?,x?|r;q?_?'S.?_d???4F?
?H}J?tZY????
X?#?H?w?:8:?'??????mX?9?q??w????Y?@???8U5t??????)W"?lJ????I^?	?R?p??8???Xh??Bm??|???????????a???K??????K??L????????-??)E(?^C/??/'?d?'?S~???t??K???~?;vGL?	Ox???ON??%L?B?e"???Y???,#??Ev????????"
Z???<?"hZ????Qa|+?s&?\?nk??C?,?8c]??}Q`cR??g?1

J???Fa????Z??????Y??????t+M?!C????O,???*???`?????5???2????::?????~g,???g??>W???`?gg?j????R??J?????c??J?U?<P?A????a?;??oQ???]?n?hW/<Lq?R,??H???M:ud?<?????t?e?J????,8)?ZM??B=?XL@?i?_?i??QX?G?????D????????S?5+:'?%??yU??SO
??KU??(????5b9???m?c???c?_???T????k?k??h5?U??G?:??_vcw?????[O8~???^9?tz??; ikM??S??k_>??????w??/?J??rh'???w???????\??{?LK`???
??4?F?$??}?
S??
???	??#2}*??UD?0?s?????<?/|
?Q????T???9?-???r?<Y{{??a?V*c?|%?????E??g?????6???q?&??o??L?O??,????????'lh?C)m?!y??!?HH??%%]	=????0K1H??9(r???m zAD????`3~????D??x???0??r?`,?{?7??3?????????H-4{??S^?n3E?&o?[]?TV8??dE??D*"?k#?V
%?f??}?8?????\,:??"?O??S??J?q{oJ~???????!?R??#????x?
?=??Uh??v?]c?r+[w?R??\??????&kR=J.C??????w?????d???
?&%?????N!??;=?%?
??+?6?S??j?Vc_h???c?????'???
?&?)????2?T??UZuq?d??pgL?9?o;sz????8?8zQ:4?-?)?1 ????fW7?r??HP?4U??q??N????I?/?(f?%y?.?:?;u??
:??;?\??9?Fv??????????OT???:?5?:?ue????X?-D(?\hoI`_l????>?y54?
?
?
8??+??????
?3F?jq*??)n6V?D????&Z_B??G,3S%?????fG?O}??a??`C?f?R?{j?_??06???;?^A??????L???U?1???NO?<<?41?8?Leo????SG???Nnc?F?????
.??V|-???F?=W0F}????`??sI?HRL?2R\?]?1??z?C??
Ydut???_??
W????????z??\Q?-X??z???L????B??o)???N?n?KkNlN???
?7y>b)?>9u???u???s??-??????hH????????N????,j_B?<?
?iz??kX??z4
_.??W?/???w
=???N??H3 ??8??G?`??B???A?O[+*[????lC??????B7??b?=?of?`]e??W?P?3G?"???M?*?????5???q?I???	 
?	$t?%'??X???(??k???X??d??	a?_I???????
ie2-?K????6e6u?V
l????YUH??e9?t????x2%v(???m??????????/L?Mg3i?		t??E/? 
?N?P???\???'ng?Q???!V?#"$ ????@??n6U???n?<????{???D?????i?M??
f.?????;?????r???,#?Z??????v????????Z
G????`?V?????Y???z???9???????O"A???1?Ci??????y$?o???`??W???/?d'?$??1????2?"?Xo???<|k?{???9?5>-?Sa???8??r0?W2????c??h??-?<B??'?????*?hd??~N?9??\???y7?Y.?????P?q????R?i_N!?1??}_???A??3???PR~?????2(=????p?Y?e??B?t?u?mq=?R?k??????mpW(8<2B??{mA?TU?1??.???????x[??nF?/??}?+?z??P????A??`1??C/7L?CH2?Ic!?P?*?ue? [??X\?CWHJP?c?rxv??J?>???k?~Z??L?dW>?Hz?!???A??,???????g????Y	M"!9L ?!/ ^]*?+?g??_?3UUgB???an??t?T?????S??)?????U?*?:?N??????:t$??J?????J?q
????c??N??s????4,?J??#?#p??z?? ?D?$???u?????&:?C;0A"y?????2
V??????\????N?.?>W??_5?kR?b?L-
GZ????0?UO??/?K???jby?S?H???X|??zX?GC???shGA?V????Td$%???r&0?*?? ?*?????6oj?`Ud$0z??@?[?o???????x?G?u
???????}5.????d$!?~?)?2
???*???C??`??,T??"???+	Tk(????O??I????b?-????:V*?????Uh?U]?u-W%?~O?t^#3?J?`??9?Y?k?K`???)`???UUV ?????uU?
??qj??m?8-hR????.]????}??O`tz*?5???=iJ?J??Qo[???e??[4?????)
Z???%%??@fR???!?Vq7?l?P?p??pP?*??&*?|?."\?BA?6lB?????%?L?@@??
-oQ??2u??N??}3??u???
?????|??5b?+?G?????W??:?^e+&wYfyu?n?CV???????p????~?c??"".`??8%?????)?gi?d ??|??5????g?b8??Pm??<?-??E????s??+'???J???y???L??.-?????l
?????2L?????<??????;$DJU?*";?+5??{??=??????????_?z????r+???c
?HH???'??2	?	????1????????hu?.@??????5o?????>?[ERuh??C#???????EUL?-x??L???z??ZT??w]@??r?5?h2?????f?	,t??Rc??P??2???F?????"*???a???Z??t?H??S?J+?C?????(q?@_?8??M?I???Hb???UQ]?c?I??`??!?????????
?Fcg????U
X*\?%???}?M???gD?I?(3??
? ?()L??Q????cN$\d?"?E*P??9?2???8B

?????C"f??????x???\?ZKP??"?"
?????T/?=?'l"??Wx1???e?????:????oN?v?(?t?I%{?hO?#??9iT?V?????MF?	????r~0?
?X??	?y?q??u??}7N!?? ???????l?????y ???yMYa????u????v?\????a?h`???????:?R???f??????1v?_`?3?I??,j4par????I?|???????=???)j?,????^?*?MH????R
?X2????
?
? j??Ri?3?}K?WH'???8?#?,F??F?C?2#?>?EW????1???4?#???*8z?#]??
??U???H*?b?GP?(!?HF?4??-?M??B??c!?k??Z5{??????$>x???1?^Y=??j6?v#????J?G?("G??^H??C
0k?{?5G???yX?Y?????W?*a"??]?/E???2	#"@????????????{_???}???7????)??????^?W.???+N??E?u?????p???
? ??:??<?gO???
?y??w??T?%*h????
?y)t/p?2????Pn??zs|??HcP??q?|	1?&?3??!??
5???@)?4???tl}??Au??dB???A??[?xS?.?'?+>?:M???F*s???F?/0?Y?sSe???=,??Y???C
G??uQ?D`?qL???XP????
?w?`??@F
??"? ????{?!??????y??????
@?<?B?B???&?????????hg??Wg?ai?=???Ua????????V??r??mw?????w?L/??4O??
? ????????'???@??o?8?b2t)?,?????????????X0>??k?@@?#?B?w?p?0/cP?K[???u?????o~?????
]wN:??C&???"]?,n??qaZ>???[b`?`h???????q?o?RL?v?Fv????^P^/???T^bEUd??????1????,F? G??u??J?:p41@?S
??Dv?e??y?.I??%???[??.a("[&s??~yk?zy??????_?z???|??7???A?n???q??N????^dw??R???_????P??|UP`???1?!?C2?????CN^r??????`??Tt|??5	???F7)????????D}0J?Q?n?S???????%(r??[?p???Eb?q??v?q??_?Y?o?S?)
?_o>?9G???.x??b??1?H"
?e#??t??T??Ce?u\M;{??s?'m??W???Q???J??}??N/G+S)DL??0?$p?j?????n_D$?f??????3tA]}???x	??H????????H??J??%??>RQ??Tk???????c??(^f????
H???"????_??r???f????y??C??3~?.4??c(????\.????5???;???Z?#????)?????/?P?,???!?e????n???W??Dp;????h?@P???8????{???????`?u??M<??.?XKQq%?|?Co???^?,???t?:1???S7Sw??j?????T?1
??@.??@???? ?(z???T??{h\O????L?@?a$?2H?
?d?j?????d??&*?????r?01O?	FD????????k=??V?k??$??;??
??N[2????d5\?_????oB?k???`????<[L?!??,??)??"}?K?>I??v????38I/O?????>??:?s????9???S?v????T?????????R??????t=??=?,?C????N???*l??8ot\??)aE?rO$??)ad?Bi%??K???d!??Q?k??U?~ ???3? ?T??RqI??????UD??*'z_?C??;??5?N?x?>?'c?QUNY?cEU???x?????????7?^???d???????NP??2=??A+U?J?u????9????{?8|=???a?V??cV?&????-??^?????#*??????8???#_=]??:?W????x9???o??S?s??X???!?????H???&?`
N??=?M?pE?z??~G??nd????x??CO?0??8?=
?
U??j?rD?}?$?za?I???i?b???hI?J?????k`???>
U???6c%?]
??Qs?z?J??J?\L?t????s?K\1?N??*??M????"<??))h?7\x?9??k
?q?h?]S?X kE???/????8???6?I2I!S?bI??tn?^>?[??P???????2k??1?VUxRQ??s?sDI???"Hi
C????#?-t?'q???"?T????c8T.'a?Z??l??3?g????????????U?RG????*8??m???
???}?????A???????3????>?.?A?R
H?Q0=i???1??S0?&???;????????6/?{???2tq??&0?p`?d???{
?*?"?a?????????
Ba???}G??l?BE5?"o????i??4?Dd1?s!
??F?????,]?L????iHu=????O?Dp?iv??'<9|$?i8?Z?E?%C?{OS?j?]&?mq??????i??	@BF?b?@?f>dy?P}@sb???h*?{p??????U<
??4csFv????A?]?m|O??O at a?J?j*?&?]?l7.???F?u??N?eb?/9?f??r)S???n	?Rb0?)?v?I?H????%????M?H?4t????0?????
5????\?=??K/\P????b??!ceH?h?1?U;??5?1??a4????q
?=?t?Z?Iu???-a????????>????o??&?u?'/??w
??q??z??6?9?r
[...1653 lines suppressed...]
??l???Y)
q{??\N????????m?I???)V?I?H????z
?>?__?????4?V?$-?F?@????w??@??@r+??X?e?V??????!Xg??E??@C??k
w?0$C$??????i?Sz[n?IT?!QV?-+j!uH't at GN?:?~??IKH%??5T????????Y&???*??r;*?????trH~~9^X??
f??>????????R???o???sz?z"D??\?ly????SL???!#?	???
??M????ws?????[??[????;?3??M?????E].2v
???~???4???"? 6?t???Zb
????)!?k%????C?U????jT?=a?s?????v???"???nFa??????H!Y?h?X??f?;j?AY?G??b??;???v-????????\?`????G??>"9-?#??D???*??-?<&?H?1aI?,/?????j&??!$??????????kyJ%?@?$?ciI??BIV0?1??`??(????"??
"LB??d?&cE&E&_?
r?r???W????dg;yf?_?4n?q)????=????u?????k??<?????K??$?"????O???$??oK??%??????u????????~?}*>?=T???n?
???$?&???@x??tQ7?z}_???????}??
c&(,?l?e?E?k?<$??????KJ???????2?????=?70QILU?'
?!5???i????)??????PPR	??M_Kf?l?l?n?f?
8?B@??(U??I???????aX???(?0?Ez??s?<??N?N?-%{??
-?v9????C??7
U4B 
m?8???n?B???,D???/??Q}?O?}r??~s????g?????X????????k????l????*?Vm??-?3??U????F?dR{?$?????b??=f	?"?X??????I??>??????@T?V??GG?-??g?????o?4????7?%?-*u??cIU"%%?n?M??bD`?????p??E6?*0?&`}???l#???~\??"=ga?`|6E???%?A
HA??Z(??0???a?B??g?%?
8 $ ??Dqw$?Uf?zic?w@?\?5(??r?????57]?	?.Q???)??M??
???1u?{'6???q??c????.&G?N??u
?![S??
????/&??LJ?e?? ???u?\?gS??Y<??#?2?u??7?}??o1????h??,?N?I????)???"l?o?m?K???????Z?M??????V?t????I?$?Z?L?,VF?W:?s??--?N?%mk52??Y?]?W??<y/.L7`Q??7??
#`aTw?
E??G`?P???-?AC??W?lDn?????6??	g??$??C????Po
H?P*"?B???????f?X?m/e??????z0??G??s?LE??????????p:?e????dN?????p??1OO6,????PL+?K????@?;Xuh???J?????l?k?I??xj???Pe??
t??R?l/.
??a??`7E`jf0R????$?{??\
?4:r
??????????`??K?>?>???????D??C
F????????????g&??c7}?????G????}w?l??_??????)??J?Z*oR<?<?A?nl????-6???Qj??D???E[E?G???=?~l?E??`?as?S'??%L?~??Kk???f??O?D?L?J?????T??d???????EJf????
??????{L???ZM?~??????b??????T???Ph?{$9???B%?Mv
??($XY
??BY?;g,
?m?%??P8?4?????xo?m??(Q-s:6?`?X?
v????Jk?R?,???|4
h(?
V???"4m?>?6M???K	E?????{?????E???m????
?d?'?i??????]??u????????}S-??t?-*B???[nZ?c??m?25aM??J?J?(h)????&K?]?tul~????Q????	)T?:6n?%B?
TD?
d1???X?y???'?1???2t????5!p??b??Q???'??????
P 
{j,!?P?N?7WK.??l^#?A??}?5='4??S??z?k??2ld?N???zk?	E\.)?f?R???IQj???????"l?a??????'??A
t6?
?????4zN???lX????r+U?H~?4K??j!K?d??I	f????}M????-?-?,V???	???<?1|R<?
???"@??U?d"??a???{?)?,??_6
2?D)??4?Jgyd?;C?????o???2T[2?P^????
&='xi????n??	??Q2????d??3?x#??JF??A?,0JFRX????2i?I!?Kp?b???????x=h?<???x	
?s?.????Y?{n??o?Ct?i?a?????"*:Kl=?Rz??"?je???%dr?aM:?C$?)57?
?%?*h?U?P?,e????_??{????'|Q??Hy??`R1?????i?(h?N??????GC,??DL`???:?_f?????-COI?q?e??m?
?]ua???????"?
?B2??u???????		=X?s
??(f??????? ?C?70????v"??a??Le%b?@??KAbn?d?Ox~??h0?R?)????
???(?0?S?9l????o!}??
*R?+??5,cNl??????e????&?HY??3???M?%21$?`'=?1	? ??#?o
?SE?]X4??6H?ad#???$?!?J??H????FL5??+?&?IU?A????]A0??e??q3??D-?Z?E}???????s????????c]??????>?O?5??!??{???v[???D?tO?j?&0??ZZI+gY???l????6Cx???Y	>Dp????IT??6???k<G???C???
????(??
?K!d???j??2???c???H?;?<?=????JI??(>^????????N?*7d??n?h+
%?0??CE??e?`xGM??
e?,?\???n|?/mhQ?x??'@"???l??????c??~ZKO??~(??0????p?Tbcc>???u>??r'?
D?|?????\_v'???7??Y?????R*?????~??Q????????j???P?31^?o?:^??? 85??M(???h???[bc????B????*?K,????"A???
o???2?Z??????Y?;??Y;,?-?????R????De??r
???~s??x??$??AM[??^;??/?1?!OS?Uep2C?X?1?Q?????.F\?c)?????$L?V??	B????w?D??h<a?:Z??q?h?LQ)	??7t6?:?
?!?o?? ????P`1?K?3?;R8?s?w???
?IRRW??*?tt??7?????L?. ??(R??.b??w???@??PF?j
H:?7BtBhL????c
?9?	???wgPZ'H???'?lz???7?~???a????hh($?1?????????b0b?}??"?x?'?cy??S???;S?@?RyU,,?uq?C
???%{~cN??h?'?TJ?>I?-???N??ZN\?????????I?C??G??(?!|=???%@?4?B$O???3?D?SR???&???o???oS?M??m?3?
??9rV?@n??U???	?,??????%????(t@?N??	-*???>????????nC1R???u'??)???L??^H???A????^X????D*???h???N???k5????P\???$?+?w?D???e???k???0C/??E?8h???7Aj?q	?c
$I??a?dK??F????:??i??av??r%p?????f?7?UI]?~L?)P????{}?+1?2????#??M;xpk?a/?u@q	????????%Rh??>~zb??s4-,?{db?A???$!6???????\8i????h?K?,O?????
X?+?646??4?1.u{??|?P4A???B?)M?6??5???"$?
???T6v????`?D????~?&9L????8#K:;??{4
?(5????y?"????T!?w?]p???4??T???\?????e$M8`??(H?"??B?&?\??X<?????#?2?RB
?6???
?JhZ????YK?t???p??/&a-?A?0????I$?v1H????@(Pa+i?&??0??$?+	IR??N??$???'F?G?Ma??D?*??/???c?]?KQ	???qKQ?f????u?6??at^??H??>?AV???1???U???>_?]???f???*????vC}?h??3????d!h??CI?9?+?????)A?"&?AWT0???????v???????7lG?????9
??I?"?<?x5?

h%bI??????=`???	L.C<n????#?(T?K???	??SBHA A0@???/"????4[IL?m?F?
??f????vtGE;?o?m?`.3#A??NH??l?{dp???;h0???d?D??
?]?4EKK$????(kb??f???4??h"WdsK??C??????]???!?#}??F
??^^????^???d???f?
`OI?)??N???U??,apP@?????X?'?&d?ER??????)???????x?%????IV?8??u?g?? ?????k|	?
?r??5C????#~?x<t?(?{?8???=?M-?	????~????x?O(??9??B?Q1?^?eM
?9??!?C?i?*X????I?im*\?
iDA?wk??	?????Tt????m_?T&?+"J?xS???`??X`#??*??p?g	"?PL?Y-??T^x??~?qHa????J??R5?Z??/K??Ix?_>???Jn???@3y??@??:?c}??gTm?L?f????.Mn???#m%?$[F_:???4?A??` lP?c
&?%g?"?(??J??????8ZG#<-?-??s?!??????????0??8?????U?????\???(?T?9\@C???rGH?-?p?d:?snu?V????d?:?DB2?u???l
b??i??}o????`3?{?&???VS1????^??a=???,
`n\Z#SU???=9?R?=/~???;?#??e???)???A?r8s???3^?EuqNs???*?4????6?K%???=????.E?P$8D????????N(?|
?2?$f??V???PmH??F?gZ!Er
?mS?{X?9g+v?l???6???rY???????-b`?{??
??G????QUAb??\B<J
8?????I???
??HKF?fE???&??]y??eL%?$i?
jR????????4S
?e8l??~^???{???U at 0???(?(?????d??`?,^mL>-TO.?x??+	??p,
?HI)?ct???e+YN???da???a?$???.X??FJ???#[*W$;6b???1???w??i]FU?3?[??????gK????|f?<N???t?;|:%z?^??x?????+?
?Q?6v4?o???,?:R?X?G+,?h??0?e?4f??'U???(TZG]?N??0
?u??+(?b;?pa???D??4????B?CJA????%?B???+ISj???i??:f?<?????K<?V"]t?4??FY?????1??HNJ???P?c?I"?xDc?????5??Gg1???xpO'?	?5??Frg(B??pc????8L???5??p???xv?d?5???t3?<v?????3!
?b??KX?4aTD
r???????S?"C?RC]R
????1??G??s?A????f?8?Ic*$??dHU???gy?1o?r?"54??5?Jr?8?-	?lX?????f?p?[??>,?Kv??@?????? x?12Pb?(?h???`Z`?
???1?
AK?_p;?x_^?!b??1??(<	?h*??	?;
5Qb???b\? ??E??He5???V?????J?f?+m????????Z?!&???
??I/,Q????Ui????o`ov??6{??Rk,???M?U$??U%???z6X??;7????J+Y2?L?(U?H
IdD???aO???]??0??\?R}????????~s??#4	_J	?b*~L"H}&?0??????]??l??A??G ??d4????????)??Z$
"XkC?	6?F??K3????jo8I!("??Q%s??E?\?4$Y?"????????"??????N??_1?ldY	??;k:?p???$??H??oR?\????{Y??S?jp?Q????8`???>???????D=?gd??kT????`x+^?D>?*(P
{?l??,
?mm?????h??H??t??nk???<M"?,?#/@?x(?R?Y?Q???tl}L???#mu5?PT?$UY	])?d at 8?
j?>6?I?0?$?I?t/???%E
1???T/??o?8?Q??d?}?(B?B???????????JF??yX8??b!t???Cp;t?g???:????B:?7?????3/??k????6k????5%?????g??????0?
???i??1?-
????>?i^??9?x\?F?
??R0?$l?!v?5?5?????a??.??>???????^??
??lDJ1naH`y??~?l?1??LBD?%A??B?.?r?1?3?%&*h%?(??w????M
#????b??p??N^5?W
[Z??Z???Vc&?%??]*?{!
???;?L????C?S=?
L?V?????T9?????{:A??V??e??(5Y??cF?>^??l?S7?BJZ#?q??????Y{kh??2NE?F??Cx,?????j?)
??%MP[
???W!?a?A?X?X?0???U)??'W1?"??wI?h??R?H??????Q???y$Q???4????AU?i?7???I????h?T??w~W???d????{a?9?i,?????E?wQfH????"? H?????6d&<????F|???[=~?m?<?z?'1?Akd/????RL??:0P?????F
P*1?C??
?tS????
j??v=?V
k	?"C??1?@? 1
??@??j?m?q0~???a?A?????W
?Z??	;?$t???;-?C???R??Mh?^??=?????k?g?~?<:?????
?U?d?2?b=k???T?au???.~)?]h|??V?@??G?c?-%?-$?v??c?t?n??????h??????%-????????D?$:?(??????1?;sO<+M?i?vVB??
?Ve??c?Q?w?F?_?L?????jC?M^????m??I?E??xV?x?<?[(^
C?6???d??1:q?V?0m??U&???a?T???H?i<?.?I?d,??B$ ??+"?F	?I?]o????gb?B????1?S?O?k{????a"!????D?%!??mMV??????k??$=??#?d??:cA??,?)6,??z?n"5??Q??o0??0?,?C2Vg??U?O?N#j? ??????b?$1?????????I,?,?3??i???pT*R? ????!?D5;L?z??z??C?B?2u???E?Z?)?`<???
???g???|?$O|?R?HJ?%??????X?ZiZ$J???D
?~?
?'??'H???{?&??
???M(?hX???????R-R?V?B?*C?
(???i?b-w?5?d?Sa?????q?w9???????????PJ????YC0??5?(??m4??b4?????r_/3??\Mo???????l??n?A/
?$?!~?'?P??d	??e???-????Z??????+R-i?ke)X??4DM5??$??!$?D????Co??>???_;H?f??Z5?U,???????? ????
?#??!???U?8??!?'?6MrvG?????:f?"
<[B?A????????d???1?W???0?|?x???????,=?7?"*?)?(j??H?Q< ?z.41U???]?Tr<?|?4>????t??+??????Q?:??9??Uio4??5t?n?%?
0?3??6??%?RCh
M??4?????oM??3?$PL???Mh.??????"<?;????	!?#?JU(?qPg=d at r???a?\??G1?=,?Ia	?????\?4?:?!???_H??D????_?[????)L6R??lvA??F?J+?`t??J?<???`?C????iJC?2?4?*6?v;@m4???QY?,?`?x?vEa???m????8}?tV"???q?Z??@eqZ	????
8X at b?44G?1*X??\7???:u~??????;?K;??#??E!?i`?%???-?W??O??,??o?I?S5??{L
Z??>?Z?na?~Xx#?zeW?e-????;`?j???#Q????JG??????#??)$???????)hX???H?3???B????B????lY?6??Ur?i?4r?????HB?$???????-O??l???E+?a?N?i?*0~?k??=??
z??G???@??}?@???B??????E<??h
"|?	?(?l???&a1?5R??@?f
4?$????m?%????JRt???+???tC?;???P?"????	?;??
???(???7%-?????f:?????E????.*g3.?u???P
5o? ?Kk?????Wy???Y???[??
?L4*I#Ddq???????D?Jy????h?I??=?R5-???n?y???,?3|lL?N?@??R??/??T?)?K?x.????<???4?yT-??8C?a+MU h}??~???ps8
?D"R'?,?s???Y1k"??2M?
Rm???i?!??%0[???T?Y
?D

9y??cLliBc!?9?	A,,??<m1'm$a??%???I???N?X|???d?E*E"?X???mT??"???Giv?"8?h;9????s8???yZr?gK???"?QF?$$????2?;?:??a+J?0??? 6?BVMCQ???\Zs????S?Gb????M?8????????z?"??x????????n?WXn????L?H?d6X*???????i?R??1'T?B=??,??V%*R???N?g9i$0??R?,+??]?A??L<??w???????BvG?D4?n???N?N?FB?	>?????DZ?r?3??'3?E??u??k?*??????
m?+?I7?VZ?Hm1?~?K??w???vZ?#B)??1@??Y???[76?b???c???HE	?ab?sQ??{1V$9
?L5?
Zy
??&??M?
??3????:??I!?u????e????l?m;?M????)?S
?w??Y0&?v?l??% ???s????5EQ??H??eE?h	
:gg??&??5?o?7??q4l?N????2H]Q?~????"?"?8"???PM	?/B
???l"<?B?x??_???|?2.?s??t?P???n??D????WG?U?O??G??`$?^????????K>],1AUE$#????4?pd8???|}K?P?"?????&c~?o?!2p?@t&`????>????Y
Kh?)@??J?^???|??$?!Pk2??g?&?O??0C]???(?{?
=?=?/PA???}Q?4?????<0
?T?`h?	???Q??Eg??n4L?? ?|?O4?????,00I?3$n&H
9?	?B?r?r??????'?%aI0?GtBJh5?4????=[??,?h????i?[Y??I????R???@??J??L?A???Ph?
*h?i'?14"?0*?e?B-?0?2&??L
 ??3,?Y?'???zs'=y????fCR?`?B?`Q?U
}6I?3????	Wa?.)?Hx?????
????4?TP?
8B???aR???r?AC?*?T????6??9?YA)??Q??dA??s?>????6jn
$?E?,???[T?,?E???%?QM??
????y????]????????^1aw{"?(D???P?IBU'?'???|A?}?j?Ol]@? ?(F$?J
`???-?????????@??????t??$}???%???8Tl@?7+????}q}??S?JN????9Ro????~?>???GO?>??i?glb?d??)lB?X?
?Z?Kh??!)??Zy??;uUU?Q4?a /???w???m??c1v???e?X?0m?6?~??s?m??i??[????????????P?I??????
S
"<???0M@???,?:??$?%??y?????(???????Hq??d1M???@l>w?? ??d?m>c
YA????5H?F???o?\??V?>t???a'??IDa?!2ZX?????1CG????L??6???e????6,??)
X<W?????
f?
I"?????????:$?? ??	bJ?6V3??QQl?f????mYb?hn?????[Z1Dj
???2????89??($GR?CB-66?*?m?t?????P>?????$??n?#???ViJ??6Sr?X??"??O?
?????
P???G?y??Z?%6?RH????(ZT??|?>zr?<??sOmTVSI????SV??X?ZZ??j???KQU????H0bD??`PX?`?Z?????"???i
?
?G'???F?M?<???n??????}?q?CA?2S?J@?$?rz??x?e???A?c?>?'?=
?!??????#8?????$V?<!2
?y?????
SO???xp???????{?6>??nk??6???g[q??Q??/?c??tO6????u?????X?B??$?I3:????;?qtk:!EZ9?2Q??o?0???(???V?%$T?@??Q.?d0?``#?0??<???????k????\

S]?S~/x?#mgT
??A #?e?[X???`x?J?????Gp??????(?	????????}?M"?E)??r=??Q??
?I?*?lO$~Y??yy?????
f0!o???3??t?>?[s??8E??<n????1#??*[V???}v??c?????hsF?!??i????-[c??l8?:F?????7l???l?????kf??Z?C#,?????,?-??i?
?f?????,
???M??"2???F62#j"??????e*?
????50S???$Go??N?PK
??I?#?bj??????9^?)??r??l?3???|C????)??lk?h???e??~?3?sSm?M??4?????X???d???e]?4(V/?W?????0?@0?#??#?T>(??q?Y?5_o??<?>?I_????MU?"??H?????{?@?G?{?	??UUB?=????????2=k??"'?Jb2H????g??7E??\?J?{+=???<i???)S?????X???{????X?y?9KV?????????k
X5?Y????1q?!B??k%????~e
?|?Q???TaF??
'?iU?Y3??x?X\gq???i.?0?zSN??y??n???jx????U?D???9 at n ????-??)???T
j <??#?G?4.??-??>??<?A???[??YDY#d?vA??J?0:Djr??0?!?9?$??????t?]$????\#.X5J#??d^
??c@$??.5v;?P18
R?mlPR^???9??C?-??X*Q???D??(?(?"?"?TQ$Qq?????o??V~&s?{?$?w????h!??	sy??#??t?#U8???????L\=M???????O????V?f?q??X0`??b?,?YUW??>?m?1?;???????_k?HI`F$$??W"??I????0????tDH?c$???8?|????Pn+?]`?M?@?V???
/?
}Z&?;?????b??D1????BuOQ??????.U??X??wF'??????2!??$?BR??*??????~]????Mf?([b-%j?m?e??
??????[%??)?3&?Em4eeSSTEl???%%??VV?IX?-??kT?R)?????H??5mF??i?IcV,?km??????H?RLD?MD?1[j?b????????V?(???KJQ?q!?-NC??pS?u??o!=???6C??=?FbH??de ????Bw:??_tf??U@?j???'g??'?[??'?,???????????]?g?{?P????u?f?mU???M?Z56??J?f?$?Z???j?2?6Dn]??KlF?-?:???&?M[fZ??kY?Bl?d?jb<N?h?D?*)r&1&?n<??y?h?}???0#Hd^???
?? ?C?rAJt4????0?a?\??O??6X?????4?Y?mg:MD?6?/?G????>bM??QMQ???u?yc
?@VA
  ?^?????1@X?d????jC? ??????=VH???E???`SIV
KSN?n?rc:???f???K????????<_?$DXEPy??????N????;??QFDD????????G?G^@g?=9??9???Z8?? Jl?o#`a?Y???????????NR9????ad?P; *?$?????9?$??Z??????K?@\g??l8???B???'?qat??7?A6??o
MObcb(??I?????E`a?cd?@??W'?6iA???`T??n????E??3???)??@_*??U(?B
@UOo??rX&?~??8a
	d8?K?O??Bg?<?R??QJ%???4???R?u??c??e??ao
?????gvtL??(????&??0?????B?j*-K
'???M>?a??k??m???
fD???RV?DW&??? ??@??\a0n??
"kM??CO?
DR?B??p?????D????	B?*????m?l??????"$??e!w?	H?
9?F#<????$|??"N9$&P???
?b?mI?D?SG?:?EY>,??	6??hd|?w?.??Y#B?l???"?Q?G?1?
?u?dH???????~?}?? ??Y????b?;???H?-?;y?b?n?T8N??_d5?????{|?gs?cl?????\#????965*??c[o?e?t?DJ????R?I?4?'?H??}`B??>?6?VH?3????4?\????yi	???&??k
V:@??????uk?Sd????t??4???J?z?T??? 	AL??v????O|?wG???M??)????????M-?LN,?.IN?????2?M??UfI??R?O-??(??]L??p????? ry
????)??Z?i??M????S????bL%???%]"??_???h?BUG$+??????I8?@?2DT??y????P?=??????(??h??()?K??A???{8?=??*S:DX????Oa
?K ????=??6_?0f+??|!??"??~d.8T	F?/_????????AC??&ILP???I????y??p??????P[q?????????Q??IM??P????&?????pe?? ?__???M?? ???F?a?o???wB?A?jJ??Zy?????????f?Ye?6????2???????CSG at l??/G?$????
$"O???c?i?^??[Yn?????7?UU$3-M??F?$??X?@?G(??S6?
????My??M??dF?T?A?c"l0????|???x?gI?|Y????y4????F????$??J?,{`EN
N?%?]??N??<??_m?5?8? x?7??o;x??Y?L???*?Q???????;0?#???????<??????"5??-QI$??.?MI????????'?????????R?(??I???m?<Ux????t?????
a??????T3???????H?d%?o??|?????????|/IX???????Y??Ve?m??J?iAd?q???Q??h???????>K
z?#Nc????
??BpAt??`x??GU=4*?BX!??_??????
???f?k-?o??{b???J????py??M???U??D??m???-?TSC?'rtX???)???1?b????l`??m??%???y???I)U?z????????ac?iLS&g?D?dR,V??`?U??.XnTpQ9X???m???i?m??{???m?
&??L?
??3??g1yM????f????^F?ccfc5??=?L?????????i????k??%????????#????L=Vs????????q?????hP???????i2I<?????{M
?KAb?
??@?Z????)?()
*?E?1To?	????\K???E??????l????'????/???0?r??|?~B?EB????Y???us
??NG????+??<"????w?Mdjb??$?????
??b`I/?'wm)????#?????W
9(??????b?Rb?
?<8:i&oH????E(?K??Iu???	????
???!R7?_,?h'G?????????l=R?m?????%?zE?%???st??w???Y??N
?@????=^<??A?@?0???z?>!?6?)z??
JU???$J?#%B??!e??A???K
???????x/J??%	C??1jb???z???
?B?????????=????o??[?O?@?'??H@??x?X???S$?y????(??????UF?Z?.???A?^f???]Q????UTR\???/t???v?`???u?-
???:?Uu"????h<?=zA??h?(?Pa?L?bR???@Hf+Ul-???a????????????T?-(b?b&?I`_??\a5??4-|??}'???O?????L????1??9%???i?2jUl??!#&?a??[B??t/??@R?p?????xf	I?s?z?<s?=7o^_????X
1t???@?)
??}??>
?[??1???HmYf??b???-
??(A!
H)'??RN??[&F??1*jf?[?v?????m??R?d??i?oQ?"Z????????H?'?A$?K
A%??
?#=.?M??v???????M???q????.????u?	?sZ?i-??+%g?qe???Y?????s??U?5?Yf?m&f????&tu?n?t?kk6-2??[v[??8??????

?Y?
|o??;V??????? md@?lo>m?xy7?o?PL?Rl,?*%????I???e
??
??4??X???|????Vy$0$??fE%<! ??``Mg?Y?Bhp?8??4? ??z2?,"?P0??'c%E0?L3 B??;?He?M
y???
a?bi-?	*?>?
?(k??%	?>?8??5
G??)?@D.$?)>T??cu?_%t -?ahPA)[BzvXt\?1???,??I??????????<?aaG????x?[!0{ G:?,????B?6?"?LC??=C?IH>4@?B??D?Asm?z?D<?@?JH?Q??A?[JGR??n?O??M???Mh??e+?B?1?R	
'?_	???l??c)D?Bz????????
KaH?:x?o?-??i(3h>?8<IQ?????^*P?Jd?,.?h?
??7?1??v??y????I?????,(??c????cf????CU?D-???p_??A?ycYV??b?3????c	?D???W????+"?*???dz???%
@??N?
	A???cL?P?'Jy?Z ???3{{?IIE?'BC?Y??:}=???0????G?H???\?1[?T??D???4`??R~0?CBP?H?[%??p??LA?AJ???@?Ci??????6N:?+??,?
d??JH8??F?????????Zd8?s????|b?e?6?%)xQ
??2?G*?0 ??T??? ??????X$LHAt?.?4???q??X???8?x>??6??v?????????????"?M?bB??????aWkOez	????yT?????I?
D~p?????B?!????e????p?vS???"??????d50+??bB(?sCIG???)5??0?FF?N??W$Q?h4?H????0?0L????b$????'k1qx?I*?p
?R?W???$??RF?2M*??I?\?2%????T???f1
k)?\7?`????v!?F
?????R0)R%$\b ??P:??E
???Jix??????D?
?3?
?"R?7?????7?????z??r?$??G'???????O?-?-??A?Ds?>?bv;?????B?????????=???^0PB?
???I?D-???h????>G??O????#??RR?????8<??%???
?q?UUj?(C?A?.???_??)?xp??8?}??????Xn@??eUa*?e
?_p??????Nt
?s?}X)??\|?|???|(?R
~&????6"?0???v<g?J??B??????[V?2Ii?&?5??2?2?E?;M5MC?A???6?????S?}7?].L????n??;&???J-UD<b$~Rn???q?	??c#???`YH??/y???x?v?'?o ???\???HF?5?d3	0?
?6??????????H????6???7??<??$?2?+hZ???2?dld?*? h??l?????!ZJ
d???eAJ?w???,???E??L????T?J?i?????????<DQl??J??;76&???F2??u???$`/????????0?
D??!?l???b
?J??A?Is????p??F?g??~R`?#t??I???jMT?W????U????w~???g?-?????'?(??g?????#5??7YK>6
????5MX??T#??E?T?<D??i??"&?*
k??~????z?R?i.????TJ$?$(07???"?????D???}?
Y#Q>]??#!
???+f??l??8!I5[k,???d???^=???j?dV?DM?D??vn?4?}H????`???N&6D C??????DTP?DM ?B????>??????8?jj?M??[?YIc?=6{???vM"?A???p??4nIIT?C??G,??);#??Mc*???bd???B?@?NWnT?vZ??`x?%?????4Y7??7?c??r??qf ??
??PQ?2?;n??9g6W????g??3?b#???qj???D??)A8?M?:?r
~N?x?H??g@e??Z?p?0??n????E?I??5??!?p)R????bH???^:?,`??%??a-??(M-????h??????K\?#2?`???H?IT????oH?d??4hMVib?Ax???r]?b
"??I??J??0?f?g???M?
?!BKX?????????(?w????|?.
X0?T???w?7???T??X?c?dt/2?'!???L?P?????]?fN??I????2<??G?g?hP???)c?F9Z?K?????4T??v??	?%?0
?h??????
?0?]?d?6?Z(+??rS at Fq??m?-???x??bLE?@?-??nr ?WsG?
W|??o??O?n6?1?[(?z????s?b?$
???,?B???????#m6???C",????q?????n?yw,?T?+$?O?(&-??e?4d??TfGfq?6dS(?;?:I^\XU?7???
???3???J?[R?????'H?Nr??1?G??????[K???h??2Y&??5[X?	?7??????j??i??????????q?A?
?=F^ ??D?u??p?G?I??
{?/??Y?Y????	??[o\D??cW???UB=2dy?}	???!CP?IA?M?h?Qm?-"??????L??Z?M?5?gsg-??????^?Ny???d$;???y????X?????<??CaOm-??N???)?o??Oq???'?=!?????di?X??b???5??9?i?i?!?g??o???<bW??>Q&
??(F(?<N???P?????I?&?*??
??l?M>?g?y?+T?~}m???1??????!?R?bKCX?zx?m?WP?Y?E??JE$D????E??
???
"?PH???V???x?e_v????VM?1Y?S?AT??L+~m???~s??G?u???S?D?d???4G!??[_???m?z???|??????*??u?-l??G?D?EpyA???j|q at x?$?$%??Pv`B.???9<?F???,P????
?
G????e?M??m?h?|?|????el????4??a????A???&?FT?;_?????Ac??D
eY"?????(K?\m?M?c!?cR?2alE??w?[?k??4d:???;GJ-?ZF5(
?? ??AC^?iaI^??@p?
?*$??p????u
z???r??M??=??2???|???-?@?$y~.??Xt4I???????????R??R?,????????u?c??G?eu???y???m????;?SDs??T?????eHXH?)jy???Z????qI-4?dJrI??+??]?L??????5????(H?o??|S????<N??0`?)???6?X0??c?2	'?bJ
G9?4?+mo?Wl???h??),?kG????=??|?q?N,??t?FR??M?P?n?u????v*???,??????d!?_??2f??y??N?}?????kkZ??BD at -?C???????>??Q
`_?6e
???H??
??Nh?RF2l?b??d~???	y???I8H?????n#??0??????I??}?2z}?????_M??

(ZY?'???????Q?,W?3??W?0?&A????????
????O????B|j?
?T}???q?d?[%?m??7?$?????*([n??I??l????%??I??:??M6&f??DZ2???9????0QH?H$????Ib?,YeX??	?X?)m[V?C|??C?
?4N?:?/?????{>?EA?
??i???b???}I
sS?key????2??y?K$Nm?6?n,s????Y????&?;
??m???????Y?(??????|??`s?M??Z??N6~??*?
???q?T???????*KJa9?0???`?A??????L0d?Q???$???f??O??B????A	wJpC$??X??????????G?[#??!?w??Iu?^w???\x????
L??6??44?+??=?l?????{d????K'?"??t??k	?|Y2?#%+?-?????????^Tu?`Aa?{Q??|?????z?=?ig}??(<??fy%????I$????mU??'??????RPRz0?????s??X[?????1C??X?>?@?E???O>
M?o??C?^???#??P'?????3Cm?D.o??????????C???v
p#??????3??3??????N??
D??????-L?6>?6??$m?s*?$}v,?,??)a??q?????Y]d??????<
??I2?A?D ?A:?%????
`?#?"FR?`?YDi?,
AR?CJ??.?()$XJM???i?mX?2???????T????"?PK?d???aE`?B(?
Z?M?
5t??AN??k{b7?m?,??khE??h?Z3??V+)D??L?
??L?n??n????s???h[:/?8{[v?X?!ey?W???)??Ef???Ft"?EkU?????c?3?,!c???t??`l?
?!?,%H?X??(???	?b??6?;z%???"?"??????3?Oc??jv?h???kB?1??>?J???9??p??`?
?(k???&'??<H0??(Mo??\tY2[3??X D?(?0Q???H?B????(?bf@??Ci?=????=??2?????*9F???V?n?v?E????Ua[m?YM?Fy??q??????['??xu???f?f??Z???b1bL?d??'???XPk*J?????8?+!??,"	??g??!??J????e?6u?t?sg??;???s?X?`0?E??4TR(?a?h?&???$??????i??Q??*(?:
???GEAL??)0??X??&????h:-??7??a?PB???H??)`&??mfI?y??U?6??
?s?_????[My&???1d%?X?Z?e??E?!DQ
?????3)XE?Ze???n?{?T<mf?h?o?4??	?j?U??w???S???~?_Y
&??t"N,???>?A???N$4r??j??GVa?*|???X??????t???????n???d??????R?%?HD?H?W?(F???v?,Nr??w??H9o???V?i??b??U,K&??????F??????8????"???|??Mt?TiD$Y???@
w*$?;???o?)C?<???l???neC(RW?B?=?????6??d???5??}?8????]??r??*!D???E???$WAK??I*??]?"???2?d?H?Sd?Q????k?+???p??[
????&?t???q??/X?EI???R??KR???c?????????c??PF?1??	?Fy??JStG?
Jz:0?h?L??-?5???U?x	U'?Ej???(w
i?@R?H3??	?)??8y2? E+????
!@?nC?????}\??9*??b??????????A??nID0>KP at +?????E?KO??~?<???e????X?f?D????????b?C??>?G:?'0"7?	??`?k??/y??g?F??????v	?`???\v$S5b???C?X-??B5C?B	??	???EE????B2$&m-?U?d??V????j??(7??nm??2}h}Pc?C?c???????{ ??$?0?<?>?C??7?;?y$?????'H|??C?????z|???=??j*??T?'?j??
??????h' ?a
.F*?	T?'?dj???X??qc?zR??P??R??v'???w?b7??\?M??D?65"F
5 ???$%??Y at BP(???Yn?MM?6?B?-?i?<?qy??r?
#??>D0?hy?b??D"h???#j?#?+?@`?P?H?	"%??h?&?3??v???F?K?V ?3d?xM?D?R?????=???????Pz5+n?
?4?#Fn$@??2qI?????h;(??}*F??V?????5???)?Q??#??HI?
?4i(4??M???{?d???	"k&D[??MYAkV???o]'?4?o?!?sl????~sVqJ`?a?B?K?5????+????$??!?	?cF?L6???CV?b????OF???x???????xJ????X???q???+??
,dPPbgq<??~'????*?K#*	9?j~O?Re?S??????F???????x at h=^??V??~~~???p?k?(`Bk?N????:N???????????Y?Q?????c=???M??????'q?????????w>?NT?&
3(?&????=? 4?D??`lZ?]??Z@?!?^?NG-??9?!^?o0?"H?tN)R?2v#?????Nu??4??3y?????g????=????????^??@?j??"??i?\???H?tB??}??\???s??p??F;\???2+Y???=?m?KB?Y????Z?p??$?*Z???X:V??o?.c"c!F???h??	?h/?^?#A??85???|?(!?"???,Q?=M??)?0??5?iS?2{?BzlF????2v=?L%F????x =RB??1??:?%??0??K??o"?}=
}O??k???A??????0Q???`s]???2??z??#?-??d????????:I??K[|?<???e?:?q*???r?W??K???r?0????s?
P????v
x???aO?0l?k?n???%?d?o?>o??_X?:\z?#+33???ar??????????????l*?#?I?????xK?y;???=3??N??\?}|???????>??5F$m??,04?1 at D?T????
????_u????o;?r?u?????
?%?????'u0E|?Y?;B3;	?\B??z?V2???cm3?1t????s????;?`?????@?w':?lN:R?,\??qj<??+`S???H@???/;H??Z?(9??t??jO
?
????????)I?????a???^?Hp^\???I?R?R?b?e}??11,?*
?@?=??t?h'??v?q????T?9?J?e??^??__,?pJ???	?A*?+4V??"???G5??????-??cR?#?~=?g?;?R[MT???0`??U???;f)??????B?DD?cQc???,??8??pAX??????e?????W??
^?yx*?a???Q?K%???q?6????`?ouhcm0?}:Uy@??WH
?VY?on ???
;S?,??MR%?2?N%??<R???(N)y??ddd9s??;$??fHoH???Q?????g????&]1m????J?2K?S?]?N????g? ?????
?lA??U8
????7?<???8f??<zy????~?:?k?????????&?{??Z?,?H?|!?j??_>=3??o{?
^L?u????Q}0E$??P?I???????_~?w?
?d???O??@RH?	;?e6???$ {??t?qY?C?K.?C??%?X?l=7?6???U?b??UmUTUUU??????!???????F+aB?????U2
???a!?H?c?b{gN?s[??????'?^aD??1v#???L??H? ?????
?6????????H??t	~?%.?b????iG?2d?a?>V/???LUV4?d?$??)???
?Q2b?0/E?1aI????'?(?-?H/????y???????L??0?E???NF".????*??VQ??b	?q??w???NO?3???S????s????l?????Jx???O????}?U???%??b!?Ae??)%?mF?????=6~????y|?|*???
?>??fBu?6??? g?zsQ????[,R?.S5fO?L????0??%???}Y?a?rc???r??L??qhg?X??iQ1"?????@\kg?6??O???t?=*???H???AzI+?;
?`???arTj61?OP6???????
???g?M?X?????m???I??}?l????<?q???o?y2v?eO?u???1?MfZps
?\2?$???.??-<,??f2???pr>?e??R
??
h??53?????Y3?\??Y??????I3??X	?Iv?N?US????l??????O+?t??+e>?|??????g?-A??'?!m?|rF?,+?C0Ez?g??"?(?BD?????
?' ??
??CT"=????y"?
 ?P?$ud??<????
?pS??&??3?N??r???!?iA??Mk6?C?0N??q?'*??f3,{?????U??"??+?|?8i\?v?^t??????H?s???????S?-???JC???}k-?7|;???b???Y7??'??????Y_??sY4?wX??Y!e6[>??o74????-?[z??????x?EKX?,?????RE?<r>??m????q?7?BI'$PVA?{=m?6?3l??????fn(\O1??x	?@a???%???P<!?%??$????h,?	e???F??N!?i)(u/.?%?
?2????q???1?C?8;?g?jv?c?	a??j?*?\f??6?i*tL
???HHRV??L??&??B?i???#??
Ul??{?
?Emi???M?Q???2??M!D)?NH4V
g?D	??!`%x???NjS?D??b_????!??LOw?
3?D??b:;?;?`?>??{??y?>1????
6b??!?mw{?ZS??"?????H?k?tcj3?&??
??G<qc&??cVV????m?
*]??_??m?X???	??\???B?"{r?@E????%DD?hn????g???v?~X
?{?D????E?Y????6h????d5??3\??%?tKY?}4i???ad?/9?m???L?q/(\]??7??M\?O??
?"?[P-C?pkn???q??e8
d?S???s??????U-?K"'???\?N??g???[&????'uLe?s??wK???f?(4D?"????????
??cv?Z??7?Z??$????$??B???>`
k'??PHC?zJ???y?e9f?d?%?O??'<?86??h~?
???7??{||^?&T/??=I???w??4?w????kk????Z+z???ZL??%???F?Sz???l/'? ???]{????f??Te|??????.t?*1???????????0Y?8?? ??d??cw?4??@l?%<9AHRQ?x??H?\?f??c?xdt??????K?&X??UkM???hq?{???FA???<??Z:fk?JWQ???nT??<P??O?Q???D?i?X??	??????j?vly??qwb,?9?,?A??E}?1>9G??wWb????Pp*????c?K???+??74t?k???h?>??t?????i??
!?l?,??c??R?%?N??H+???ip??;?h?&???:!6????W?
?w?
[w??0?j?t??)?
?0?s??????t?r??u&r(x??cD:??"?]C[2??????k?d?{ #?&?l ???5??E??????|?PO/??JN?aX?EgY??})
?8.?'??|V??IN.p???S&????8eiHr?R???? t?#JT?+h??6K??kr?w?zY??G+%J???????A??vm??p?[?????un??it?|R??1F??w??~Ma?,.?????????r????d?\??p?Xb?4?ePJ?uh??p??%?????h???~????(?
????w???C?6?id??Y???-?]?qf???
??{1?????`?,u???y??Tmn
I??f??wv9l?97?P'??Q?T?U???YA
??z?0?J?
???`?X.?????t?]N???]????\[??	??#??N|1?c?o???*?x????????W??mkh?HU??H+?Fb4?CE??)a>?]?C?##?Z7/?A?^???c??NB?w?	???>T/????f9??9?_^$5??????t??,?????}?????3??P????Q??4?{????b??F?(?,=H;F??O;
(?????{^'?????4i???9v?h?Y%<I??uI>????&?XO????29<?85`U?=?d????n)?????|#??5Y?????q\?g????????.??%//p?????7?o6<+????H?nu?!{?L?s+?i?`?ukkt?v??:????`???C"?K????%F0????z??C@??;?j_?g?&JWO[?G???y\?(??9?????e
?Nsae?T?????:?TW??Fl?"?????A?g???5???|??x|??N\????&?iOL(??}??z
	K)4????}???u?Y?????????%??d?s??rKI??%{@??????q???=O?f[RZq??h????P?????d?R?d??x&?4G?+???z+??IZ??1c?x?w?n
~?W????EZ??U?N??
OZN??K??O??U	T&?????O?:??+????I_??yKh?????EJ???$??????&4M????xd?K?5[??b??T?????~?
???F??eX;PH????!i??+?-E<o-*???S?
?y?|???$FQ?}n?me;|p?????????????L?/?L?hl????E?`??
??y?????-?oR9?G???|?;???{???M?]4Z??sxMS???;?V9???;?.?D???[???vz??NCo>g???<?!????$??????Uq????|=,?e????x?????3!cB????C??T?E??*?????)????????`?j?N??fs????MA???V?c?cQ8??????????s?b???????K?????u?]\sKl?,!?f?g at Q~GQ3P?????k???P7?M?z??mHK????????`?=T????a?????B?c%?j?B??@?9AFk?Rq?t??????>f&?:?/w?{P'?;@Vi?^NE???X?L>(?m?c??????????x??/??????eL	X??&}^5s?,?r?K4
?,=)w?^????8:????Jq?t?2???S
?????????aS??l??P???b?Y,???z	%???4tN????_?????_j??L?I5?~?7	???????l???l]?m?^?3?m??k?h??`?I?l?????E???)w??^???#koC????????f???2???????cee?????????????MD???77??H?>;,Lj???Hlb??
9????FE? ???e???[?H>;^r????K??M?b???c????:T;VAA???<+??S||\E??\????:0???w?S?D*???_i_??C?N?!u&;??m
x??6?A!?0h0\H???B?
???&)J>~?Q?O?
8??F?.?),????4???`?_Np??}?d?_x"?1n????+?
}???s?????(?p?????zM???4??B_????^????????:6-??J???? M????yVvL?^06a??"???R?n'?]*?
?2??$\L?C??g?B????
?A?Y#^?TR?G5-,??????k?h?.}??6??|'`y??????????E??B??
F?=?<??IR??H?}??\??,?{eG???J?$Y??6???h"?????do3?g!?S?y?%?6?Q??pns{??4w?Ue????(??J????qQ??<e)ZHg????V??6uLd4`?????a~?Vk???E???8=.??>	??`????QWl?Q?'??N???f~9'5?0?mI???6e???zaz~??,?:?}??o??t??0???j?-???h?;???"???
\T`?????GA??????KPf???s??V???a0??
?E??r?d\
?B????\????????74????E????<4?>??Z??{???	????9f??<.^??q[?};??F?????r?2oG[??????W????w'?!-U??[???????	$??h?`$VL?5?G?????k9!)*9??????4??)z?4??d?|??n?=??6??)-&e??i?'??5?n?(?*???????Nmj?ni?@
b??h??5?:??)??P?2??sG??s?/#?r?V??[\O?$?????????D2?Vy??N???'???????[O??????]*3?t?QC	?]?"??m???p;kl????L`G???U????Ge	N??*?%?m???P>??<U@?Z4U??8?2?%????J????+|?w?????oo/?n/S??G0,?!?F
r??6?????o???I????????<??xI??)
???0![???????t?/?t9?M?A?????]y??M?????Jc>?>?????w?P%?????o?
s2???\?e^L/o??9????R/?
[d`Sx????????g?????????????
?fP??'a?k?I?d?iV????I?T$??;%"?n?#????]0?Eg??N>H?k}P??M?8??ti?c$?????tzK?*a??#?-NA??E?TAl_????d??}j?}
?????[????????#?G]CP/bv{g?XW5???5d7i??R2Ei?d);?
-??o[???????A9?z??H4%]k??????????C:???A?S??"?[	??????G?)_??w?????0?>??eJe8??I?V??u?n????????????&e?djn4?j??7?+?lS?C,?\??a?gl??N#?uv??,?:dDI??dM?[:7?U.z(3?;???egTs???D?$???B8NV<?!??6C?????D/?f???z???#[???=:J???
??+???l?????0??
X?<z&?~?8???d???L???L?????z?>$????+???{??l8???L???? u?????I,??u>$?b??
f???<????????~?=?6???A??=?z?$?vT??H?????F?rL?? ???X??z??i?F*?o??W?(?.???3$P5??(ni?z
J???JbrjH_)?8???????b??Y??]????rz??zN}?
_?L??g0????q???	?B6?bE?Zv??z!?0H??i???6V?#]?:O?%t??n??=4 ??k?)?i??????a?-?
3?#.|bK?#??R?????	.$0??t?c&????3Jr:w???4???7??@Z
????w??{u??#?2?f????dW????<??B?>?e???M?????%?????@S??z&c$???99??7m\??/????0Glu??P?lwVx#?V??k???;?^?Z?kw??FU	???I????E"%?_SE?????
??????l?B?j4???K???f?~??W???x?l%?R?NS?
K?~???????,?c?G??? ?????/LZ?~??p?L?B?xH
	:/?a???#_.?Sf??G??!??-??m??????g???)????????0m?T??YQ?Z.I?8t?



From fedora-extras-commits at redhat.com  Sun Apr  2 07:03:38 2006
From: fedora-extras-commits at redhat.com (András Tóth (tbandi72))
Date: Sun,  2 Apr 2006 00:03:38 -0700
Subject: rpms/gnome-yum/FC-4 gnome-yum-0.1.3.tar.bz2,NONE,1.2.4.1
Message-ID: <200604020703.k3273eGa006122@cvs-int.fedora.redhat.com>

Author: tbandi72

Update of /cvs/extras/rpms/gnome-yum/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6107

Added Files:
      Tag: gnome-yum-0_1_3-1_fc4
	gnome-yum-0.1.3.tar.bz2 
Log Message:



--- NEW FILE gnome-yum-0.1.3.tar.bz2 ---
BZh91AY&SY?F?`?????????????????????????????????????????????q??M?Uv?A??Q
[`@
?at?u?{?
]?????@???[?w?<????????y??k?5
???n??[i?|??>??v?u??-`?`
	%TU?jU=?N???9???8Z<???@???v/????>?}????X?}???????;k??????t???N??|}?zuR/??s?S???P?Z???=???)?`??%0?0*a??]??L???a{???xtw??!:x??`u???T?
?;????Vm2???8;P??U`??p
(?`
??#??????^??k???[??ml.????\suU???????

	M @
l?4
4??zLh??j??SS?OMOE=O'???????=S??%?My?M
O?=???Q???????T~??j??d???z?$???&?@L	?4	?!?S?'?L?&M2i?d???d???C&E?L&MM?&&?`##???h?f?MOd??{F?????PD?
G???????5A?eLO?'?????2???OT??H?4???d??#
????6??xo????BH~
????7???6I??H?@G?S??
?? v??U??e?b?t?%p??@??`??Tm???????No/???Id@?
???W?7.????????mn?x????x???r??{V????C?SL??????D??f?)??%b	??)W??U??R?,!?5??>???sJ??GK?M??=?xXo??r??D., "|?????'????mp$|?-B???????{?W??>g??Ct1N????s?L??%twKd??y?`[??E{?w??L|??!
	
?~??X,$X?????^????!??w?????n????5????V?'??b`[c?9?rR6????g??w^S??'?D??Q??????<?>NW??uE?
k??}??u~??Y??????v?????l)?6`h5l<????C!{??!??6?u?i?]\?D???@
?V:????SQ??????m?'?????]o}o??y8?i?0??Q
 ???????L@?	
?????k????
<5D4O??uh{?O????????????<?7?q?[q???nGCY?{\??<?Z???6pp???a0?O??z?^f?fJ??l?$!
???9?<?a??/
1???5?F???
?y?cl0???"?????f#?????????????(????K??p.[?/??
?I???T???????Ai1?z??j<>C????2??i??1?????cCP???]????P???9I??&_??#???????x??1??????G?????
???]?P??V.??xb???#$?=?9U?>;??
\??A???,D ?n??*G????|s???
??	?U??_?
??r{?b?0
I-?$]E0
?
yC??~?~? }(
Q?|=+;???A?~??1????5U?ln?????x4n?l????#????????\/=v?y???#,c??l?
?	??F?^vF3?V1???wic"??i??s??.??
cB???x4???f?!v3??D50?>??{\Zq 6????~??50D?????zBd?~6kiZ??j?|b(-?p??9???AU??v??)????M??G??26PX??]q???N*????o?????Q?r?x2m???????3?9q?.?
??????5o/??A?F?1?*????????"?`

??> iY?~l4??r??G5??????????`?H?Wuu????9|??????!??L?E(???C??????~h??C??R????P??Nw+??~9???????eC_????[\????E???fg??}???G?J?ZG?lxtP????k??}??'c???;[O???)?*
2~i???q?z??A?r?~????h?w?UE????$
???K2?b??nX???%k???U????
????
aAR???b?Po?N$???\T?x?(?-?)y??q??O?Z5^??9???^E??????]?{J1D??~?o?a??<{??ME?????=?G?????:???`?UU?"?Q
?Ii????(y??????????????p?p??c?Cm?B?(?"??x?^?
??A?&


0??D-n?A????A?:u????h;>?0?6;??f???h????J
)??0A&??~a5[?G(?r???N?kS#?1m!????u
?+??P??D??g??k????}Q?q7???*#?]??????
??c????
?r??Q??@??\ga??hhB??N/7[?Wl?P??r-Db?mO
??$"
??V??3?#?
u
ho??%;5!g? ?Z^RBQ?"??,ej?d??6??-?
??????U???f???I1?CD?Q	????????*???A???Yw]?#3?t/ahl
'?????e"/?N2v??`D:J<0?"?A????v???n?Y(w7?M6;1q?r?^?u?A????'U????y?PJ?39?<'??n??????B?" ~?_?
??J?1P??'?~'??y?!?>/??{???}???XD|?
'???N(?	
?"#Db?*A?)XPUX??J?%B?$Eb??#UEX?b"1PV(?1TbDc,X??(?@X? ?????X`
C<6????}?
???e*IYU"???d|i@?C??w?/
o??=Aq1o~?????/?eD?"@ IO?????

?X?,b1
Ub?$b?$????&????/?????C'i?Y?????????l?????0?>|?v????????I!?A?oL?????????D??????GB???7?6!???Hc
D?~?>?d$!??U$
"??$?$d
"?0b???EX, at X11??d???????5?=???XJ???=?
c E??Ad???I
?R!!!
????EEb??????????*)?D?*??1?)???"?UY`??DA"#b?Tc"?(?`"?,E@2 (?
?EV"(?0T"
???$T?????b?A??DPb ?R"r???(? ??A??E??+AX?0AQX?b(1U 1?
?" ?j,`?TF0dA?,`?DY#?0B#PAA?H$D?b?(E??
???Q0U4???s???????:A ??2d????l???O,??}?HR@????`?zFK_???>??-
b6Ra??Y@???t?1??{D???~?C3?y[??+5U???iQ????F?>???T???????B?#F;???/?WE??????q???g?t?;?[????Q????\????k??1}%???????????>kV?:(???#??U?/e???%?Z?a?6:;?????#?,??mB2?1T?E<>Z|??2?`??*\tR??2c???
???s?t??????????J????$???"?b:????KtrU*E?????r?????*????]/7I?$o-?p?g???a??2?Yd??d)???7?3?	XpFX??n???D?q??2????
Dzm?,)1^??z;9??!P?n9????)u???
k0??m?/ct?*]?384$?'6
eGMj??	???E???~o?JW&??X?pb?????2??H?z
^DF??*:?
sAH??I?d???D?z01???+??EX?b?t????)?,????WV??n????????%???
qN)?i2?ei?f6+X6?R??M???:L,??b????Rt|?(????.&?p?Gh(g????, T@????"H?#!"???_????????????c&??r??(??t	+
????'?~g,8wg??ID?R??O???=???9???p?n????S?<???`?m7???G?!??uW????g89??????r???mGc?e<.>??.<j???v???????0?/???U?V?p???4?a??Y????G;??g~??<????.??WN<?9b??N\ ?x>N??bz?3??9R?>RI%u?v??I?lF??m?z.???????wt??0F???}???
???]'???)?j?J?wB?r?c??Y?N????`?4?,U?T[eQA~??
?uN?+??&f????T??\3???/*???)F;P0v?yb??V???	??*!$?<?]??4??AU8wu?{2*:xd??1?J?TB-???p?$????"p??s??T,Q??@?K?b?c.Sz?
?Ub?T0PQs???A?g???P??p,?F????',??.?Vipf+)~??V&?????5??Mu?T7?h?F?n\?c
??6?aQ?????:?y{q???H{/yl3???OK[??????>R>?|??????D|
???S?>?????C?E?\,??f??z????_?J???[7??????I????dM??d?k????.v?L??????&%u?vM_?v?`i???2\"???l?Vk??:@?i??
(?2T? ??,X|???0DU??H")<?
????.?XO??_???B(d(??;??????l?=??OS???I?S??

???D??|g????[??????<?fj#u?x?????{hdx?o?a???N
??vk^?
??????|????????Cx????????q?,D?}?X
 8>?T?K<E??&???D8?DVv????m?x???e?;?p4w?%??.??7????I??????????td?b???v+????6?u??_??????x?T?h?T???e????s??(?j??"??E:??????W??????W???
?8|??????_o????B??l????hg?????????????
By???Eb??0?'dDP??!?O?X"k????C>Y6hBdO??? ?Gk???????
??X1?"?PTe?a?b?b+"?`?TTX?AQFE"?????p'?	????$??P?BiD
-????T????CV
P@?9r	!QR\?R??@??F(???T?%??a????RN???{u??	(??_v?-Jv?"T?H'u??n7???"??5??(????????:p?=??^?7?U??????Gxm|???{?@t??????X?!?k's,#?2?g?N?y7RD?e??N?R3'?e
_g6???VA%j#Z?(????O7?[???q??1???8:?]???m??6Yu?e7?0AQg;?M?t`;?????O^?h?_H?1zt^oc????qz??;????\??A??R??q??2??&???
?@@?
(??G????l?l??;c??zg[~
@??b?Ub????"I? ???ZBuR??.???G????~?D??5????v?Y,A]s
Yp`7?1?z??)?jOc?8?RE!?5?,?s?0???bhe$d	?|/cI3?w?LRE???`?!?D9?u8?1??

?????=??
*??}`RBD??H?????U[???r:?RLhj?G.?t?S=h?Y???????1???}T?-??g?????>?E)U??VyX?Z?????rOV?????i???????k?}uO???b{p?gVA??? ??}V??S???????t7Z>?'%????Cs?q?~????5?>???{?Z???d??+?????K[j?E-??wX?g'o?????p2?????>#?U?G??!?|.???u$3[??z;9??v=??????1??????B#O?Y6??ji?????t??7m??eN??	????@x`[?y?=w?????	??	U???-x| a`N????VQ???A?C0??_???`?'??2?	5?|?D/D??P??U<?????iO??A??V?a?$$%R??b???b&8?	}?UF?Z;?????Up??1J?PaU?`J?pz?@?@E?O?P%??q??b????,???ek??;H
 ?c???Ni???
xD????????R????o??0J???????r?rWYz??etl?
*?V*q????
(
0~T????)9?I	??~?!
??X?i??[??Q~???[=???????W=?????z8??HL~??????????N???N?^>?????
$?u?3w<?y??S?P?"I?????l????E?Sl??['fh?s?EGl??????T4???>q????Lf	f ?GW??x/
=??.????Ia??YN???G
???I?8E?l?ca:*?????"O??O??UQUb????????{o??????IURu?C??p???=?]<bD?3`&?3???;?V??r?(?==
?zk?DU???
 ?p?{	???Z?M
I$A???(J??
C?_V???Eb
E??V1D
Z?+	Z?UX(?"??"??b(???*???$
tl??|dU??????T5g;??c???">????d.?a?,e??[?B]6????X???@A?? d?g???W??q?????^??v??
`???%?1??????W
?\??H??er??|?'1?6?????*d?????3???P??z?E??OZ??????B????
?"=
k?W?A??C,F0??~<??=?l?t
Z?h?%????t8dB???W?z???.?A!????????
?2?=?E??<?b?m??^?w??W?????O???\V??-&^?????c<<.???]?p??\???????&|?6?,?DS?y`_??PT??2??#~??????6???</?#????M?-oUS?t???????n
??-u??}<?-???t?c???zi	O?zTo?1?((7
07#??6s????q??
???????Y~ 8?hC??!n?????;7?X:???{:?q?~???jd\n1???5??h6??k?D??(????%??????sTyP?d?O;??????:????3??E?nf??CH???$c?M?b?p???S??>?B??Hr?k???;C2{"D?????I?#??b??t-?&Tr??}r?e?(???????
?R???????w??? p??'????"W?6?8??_~???U????????K%??b???=x0?e?b??h??%? S

^?5i{)|+?|?j>??}??O???b??*-P?????????UEX????9????????AADw???V?4@?e?$a??8F???R\?l9????????
?S?????
V?e??g	wM?g|??N??C?}?k?7
????.W.?!???F?z??u???U???0?)'??>Q??@7?*<=?}!Y??0?B?!????KXA?W`??%?Z??XC??????\~<?????X?;?????g?C?????D???J??S!??+??\??u$????KY?_????D?r??fp7????2???v???7?_8?C?P??p?"=.??VL:?????OJ????3?<&q?V})Y040}?????$(?,>f?%	??3?? ????u??N?n?????
?o???A?????J????l
???1C"?9??>???,cq???l
???G??????CV?;???0??
??b??C???u?e?a`U?GD?&7
e1	??????;????????~???H?W?`????kD??6^i3??4?SR\?XZOE??i?????o?z??m??q?/??JB?4???-!??8???????H??@M?A???Q?n5I?(
?qte?"jm????5)?Un"[3|???o?HZU ;PL
???$=?#?&????T_??Xj	i?G,7?G???v???A??@??B????E\?????K-0Q>?????r??|-@?u??>$???bc"?
[??????????~?Q?mKR??"????cU1?Z?-|????Evn???X??cU?z?????C??>???c?-;????m?V??H0?q^R??t?a^9u???F??0??}???`?bp?b6??&?fY-C
,O??[?6xI?}P]?x????7y(???????c?? 
E??S"
???i??+is?EN?nx
??F???a???"??N[j?w?{??.?~.?\+??K!??t?~^??i???? ?-?h????JfZb?u.???_??Y???S>?(????C}O????y1?t?????])?8????
?/R?*??H$$??:?VC	????Ab?j>5?o????????????;?Yt??i?????~6?C??X
?ta??r???U?f?sn???x??c??T????
c??G?4?RcJo]?k"'?
Q???7>?6???A?T???|?	??????r????K??_y??(????Bvm?,=?????O?Z?xb???4?g?f????????P???*??IDRF?????r??nH?T?{b??)`?W&~e???h7?QL=??c%?Gf????BZ???????J????????Y?F??8??v?j~???.???T?]#????[?dl????#+?j?@N??G????+Doiy]?c]
???C? ?c?
???$?=8???\ ? ???IM??W???X?Z/?????
??%?kw92Y?A??Z??i????c1?\????m???I?.??&6?1Q??z?Tl?,????

E?gin????D[J????????V~1Y?O{?i?-?=-??D????j?C?ZExh5$?????????X??zE??*?????????sUh?Pi6k?<^?0???@?V\?g???f????2????l
????s??m/?8f?J0_#p???^??Y?<??_S?\?+??;?????????????s?5?*??f3$D???&X??f??p?:?4?.3Xc?????%??<?3Q?]??x???a'F??V??}?w????{?%#???Z!?]	
?????*???VO?7$<?k??~?H?j?????u???p-R?D?^?XSIk???O?^?1?1t?	?It$??0P/?N?E?&??8?%Q???'r??w?*?????????^?l?????w7?:?^3????yu?P?A?ox???N
G9????>??22???73?PM????I>??m????????T??{2n?m<?m?3??o????W???T?`??
k?m?M??a???|??????"P?.e??q?;??4c?????"?t??m?XRS??o????]3ag???lQG??]R??????"???v)6?hT????wN?}_,`??o?(?r???"????I?Nx6?i????D)C?#??MD^??]???|?(?T?h?1?Z????*AO?w????,?????
,???[[???J?tX??aG??b??.?%G??"???;<??4???????G?e??V2?r?U?j?3?O*~)?2Gg	?K???wV???`?S?/????{???RR?+????:?W?[???]N????y???F2??Y??bD??E????W?}??el6????????????)D?6??@h4?]?Bo?1@?u?,=??? ???|?X?"C???dX?R?:??b?U??I?G??q???\nBn?n?SM?O???u?<??\????Ql????7??? ;????X?zEt'/??c$?!??????w#K
bO?c?@??S???4;k5?p?F??;??????vP????
??_?R????
]?*t?u?o????? Y?'??t?s????g?c??u?!?'??``?.Bd??*d?O?Ek*?K]SI???hr???{?>??X?h???3?"?9:W?1?!}?O?0?F?2??
?"_???????u?\W[???d??/??4?C???e?<???????x?????W????s??Q?/?G<Q??%?<?G???@?fB`?lcp?
?Y
?????a??/>??U???#???????
?P????y???m?~?U?s[???1????#G???&c??L?\OU???????_R9????|\:?}>?\??????Jm?e ??
?/B6)??(o7??????D??^?''?????????@?@P??S?DW??'?????'k???????=?Q?m#?????? ?!??
??R?????]???~?$?H?`???D0??$X?H?U,??`??t??H?P:2
g???H?@?,cE????? ET?
??M?!?Vf?P ?Z
G???%????F?$H2?,$P??R??1J?3???JiT?idd??d
0*D???X?PSQ?b ?2??y?
>4?x2IA?J?
Q??C	?????BtN?b?n?J??Y"k???I$??Hh?!?zt???????:6???????????Q?K????4b{?
D7R`&k?#^](???T?;???1Ll????]H???w??
?:?q???r??{;n???DA???d?
Hk??a??h$?S`????]?	?"??*?Q
e??`aH??K?
???O&???$|??C@[ 
??T-`m`B?????*?N????T?b?`??/????#?v???zPY4????3H7|?a???af%|????p?C=
??????Aa?;????O??2 l"m
C-?0"V	F
?)ha?????P?s
???U?J (
*?"??(d`))E?"??#???W!0"Ie??,??&(??%?
+J!)??0??X(#%?J??d???p3]>?5?	#?	?vha??%($0I??I?Ya?h???"d???P
 q?:+??3??o&?RL?,?I????D?I?=?)&?Q???uo ?
?r
??l?KT??1?'???/??.???I+??????h?4]FI???ha??}}???w??*???|T???"?,|?l?????, F0H%?k??????^?QQ=?Z??kNej???%(T?????M?????JC??0N????H?M?????PS?`?`?8?#??=?O?I??I?W???}>?r????/s???G???t?????????"`w???h??2
??H?????m??I?sUUUUUUUUU??
"??D?"D!d?;*????*???2um??????h???W???u??L????sq?dhT??
?)?S
?-?m!-????
??ZJx???f,z%?????%??{???sz6H7MN
?*?X*?6???UJ?????UPQEX?*(?ciQ?V(??Ub?TZ?K??K?.???????&????^?v?i???'??????v2?~???g???m`?T??q	???:R???Y??{???????????7>?!d*?v????@1??s??g ??????wM7_O??????o?????~?^#?l????t????{?v?%6H????H???*
{????
v??????&}?????^%vO
?t/h???N?P(??S???7??p?98?f?!?f??.???>???E?`??i?3?g?.@?C?`|9Y0)?	>
??D?1R(??f`T?b????\X?NqE?"AZe?????????3?
o??&2??JL,P?*z.???%b20X?(x??/?????	'X?,??`?????b
??
(HS R?D?}q$??hea???j'??,?gC???uE
H??
%;?	@?B?5R???Po/??q)?? z'??\]????+r????,?
?a???|=?h{[r?{??A??8????b???aG?.=@>????^[?D~?0Z?]?W????Dr???(?rc3?t?T?ut??j?27?vTG	???hHD????.?t?2?T$?m\xQ??2g<k0?J??Sj?73?g?????*zSo{<???68?n??A4???k????2??@???>??/????vv?9????&??5 ?"(A`?dSY1N?$?D?8?~?s??^????0a??:?z$6'4?r???????|???;?.5??gV?u??8g?uc1??g??!?[z???5o??S?z"??>=???fx?Y???&?M??A???????
H?? ?s,??????f?@?@?!?7.?~	/Go????^#???|?d?2?KI???b?lT???8???yC??????RN????tqR3Y? 
!?????R?T= P?p?m),?4|?q?TTC?????|?QP?!Q???"????????5??$ :???D\?????}?n???????2?j???L9}???p{?@k????bb~?????P !?N??["??zx??????x
;????9?? ???*
E?c ?H
DI
d?$?$P?
??R"?H#
@,Y
@DQ ??,?Ad@R, ?"?

,?XAD`, ?T??
?? ???E?!
?A??b??DU`???dFH?
??!$b*?#
	?"?1b?"??H?#
b??1#??"	??b*???? "??1?AAHI ???*?TX ?????dA?1?0D0dA`???
TX?/4???[?5???Ao?f????U?;?@??
`?<????u??Oo#Y?Y??W{????_}???u??[???#??,k??v??t6?o
??J<R???|\M>/??H|????????\,Q????D??)R1W??!6???8{,W?zH ???x?????f?!??cUh(]???.?TB

A??????h:?]?k??y??j?@?,?
`?i???;E???(tD?
[?s?*??#7??-?MG?yIz??m?vt??????^/??"??_?"????)Ji?Y^?Ju??,?{R???V???W?4N??t? ?-2??=oU1D?{^???J??b?1j%?iw?????1L??:r)zR#)?Q???g????^/ui???xYe?(??O??F??r?(?kcM6?{o{??1??F?
?M2???7?\???????U2@F??\7?~/?~>.^??o???1?^???}?9?B??????C?????????v??;??_g??F??W????{??????3U?vs???lsU?Y?*2RBo??????g?B?P??v-d?@?|????#?$Ea5?.r??U
??2??JVgG?2??T?=?????OwG_=>?'?6????f6m???v??e?u??g????4?M" xb?}?:?
?`w`?z)?\4!?[?0?R?????7s_"]???????
+?B????y??{;
??7?*?CD?p
]?j??{r2O??JS??->9?g??
????????[??nM??%N???C???L?SvL?F?,.?FCu `?v3?'_?3?-??Qq?B????????????rrs ?|??\?^#?Yo!4N??`????C??D^q]Rt??? ??8GR?\????Q??V???(c???/??~o'?F??#M????
oe???w???,|LRW???oj6???????C?>?????\b?|=l????P3&$B~M?=?un?d-?5??)o?	?ccM|?@;D0?8??1
mm0+?T=A(8^}??TKn?r??w'U]??^?Z???cO`7?Pi?RT???jjN?#?i=Y??????[?Cm??T@???
?^K]??!g???T?4?A??5QL?
%m???&?$???3??t??E???zgH???? ?0??}??>F???Ux?54???k?Z?]~P@?w-??}}U^?-??????????~?L&K???A<,???i??*c,?	??Mj??C??z&E#??N.?;?UF0`3??x.V3??z?%F?"???????<???G?,??5!W?9?\)?{?-(t???9?Sxs-??????]E[?SaF?0??j)>?ufm??!?1Pk7Y???Z?^]??E)~M ??Zx?o??18p?6?su?
??@?G
????f'?????????O?t"??]A???=N#(?k}8RH??
?(????7xY???]<@y??f*T???3??2????j	?*??????
.?(Ar???l?6?|A??5=$q???zn????:?_wT?@?Uj?`?EZ?$?#E????FfK????????Y??$B?H?4.?M
?@B+*??Z?O?c??z6????ns?????????^`???p?????t????-[?9??????By?	Wa]M??????B????.,?H?I?????m?e??????!?_d?O5p?????9R?????z???????S~?M;4???w??_/^?9??=|?E9Gm??#
?????9??[??????>>?&???
?Lq?r?*7??F|?L?)g?????:(H?0????:I?v??}4H??????????<'???J??????d?????{??Q??FJ?X??p???E?E.??8?;ra???\??nMS????:??$Y|??.!v?u?HWF?5S?O?^N?/??S??3??????c?"???mo??E??`???????^?????m??m??m??2???n????0?c{????;??}??G????b]??????O@?????
)????????S?{%/QS??]?E?%]??{?^?{??}?"^)??o???Mk?U??~m]#???)V?????v-??nD?d_m-?0???}&1?g?|mg)?;??Y????????7???5Lk
??F?_?z??Q???S??Vl????6U???????F}
?3G?/\??CLj???_J???+S????F???G????uv?????=m??
"??^?t?(???2?????@?~]z?h??????O(t??ys????ho??in????O?cNk
U?<???f|vk??k6?5`?
?<?n?!%i?1?#??~5J??????cS{?????w?_?y?vQEQEQEQEQEQE??oc???????#'????+K?7i?p??[0na>?????yy
?v?e?F	 ????;??O?e?#H)/??1??V1??@???3?i}F?k9??oR?,?D????????~??c???pe??[m7?R?d?l<b??r???[?6"Z?T98$eY????
??7x?2E&??	?C?m[????)?]R?W>?@?Wl?IN?}??#?AU?????(??)%??W???z?i?Y????r??n????L?9?vLe????VS??&`?3G]V???CDX???f????.e3???_?R`:?D????????V?~B???~?W??1????Jz?w?????{Qv	?^?y???m?-????????58!fF????????!_%???HQ?q????j?f?DT??????a[??N?3?n??x??c?	??be? ????c7???IG3<?g?oNt#?`?w??	;t?,Hg??+????v??+??\}??u?{F0??&iPc=????????C????~?VB??||??tf?s}|K?{??:e?X??%???LD??	???4TTs3o???^3Nq??|6m??mg@???????w5??	??t?l?i?'?qh??v?r]???D9?9????z>B?E1???L?J+h|g^q?????~*??{??;y7??<??????????+R?-??????[Kim-?????m-???/?5?={>??n??=]?<EE?\????TY???Q??I???c?=?]?????!?s?C??F!??Y?`??@{??{rK???yN???e???8??dp?O?!
 zU?j?Vj??????^???V?6?????????G?xO??z[?P?????9?S'??????v~???I?e????G??9
??????t???D?o`t
7?Vg?G]Fu?J?????????p???y???e???
?k??1?E$?@.~??h?r?????<??q?j3[vjr??I?z?4??/<oX????Dd?";?NG
\???e?=w?7A?:_?I$?I$??ow???????B????S^b??Q?{T??,????????"?}?n ???L????????5?K?J???Z|?w#?|t:.??x??7\?;????7;E7?????<T????r?????Np??y?e^?????ojO19?????\????????yN(i?I??s1??iQz???????p1?u?x??X[S-??`?f??r;?4??q%\??`?xpf??:?????'???va!????/?????U?N??[?7???????????F?`1?G?laL1??D?8?s'>SH'?FM?>???P?wk??r?jn???U?2'c|O?????vy?%???????U??(x??????r??*?]@N#???b?s?4?y?????59xP???????
?`"7h??V??"?V?$?I$????????n????Z.??8?u{???]n???Io?=????Sy???%Q?G4V???????4????Lmze?c]?{]Cm?A5&8W?A?'i?
9?D? ??*r??o?C?d? ?b????\?,?1J>?NQ????n_?????&??`?P??
cn???
?A?&]c??v~>?g?>N?p?3x??I$?I*x?m??kp??yG??S??I??
???f?;????3????I?8P?r?Q???o?4_????w37?????????C]
?QH???%
?b???4?J((E?D
 ?X0?E??RB([ H?2
??{?C\m??ms?60?c"?=h??!??y?m????NN7?k]???[?????J??"kZ2fj1??????Mk??????(??(??(????E)h??b???e4R??jR?? ?1?N!?????w?qb?P?
????$??{?vq???S[?~q;???G{xH?:?g???etTz25?3eA????
 ???
?OQEQEQEQEQEQEQEQ!!!!!!!#2?m???<@8?s?????:?=??Io?_???	???]Q???`??;???K??yh?:?!?Z
v7?E????O^]?>?6??5?,n?????y?(a???Lh?-Evm?zO??%P=~????L4}O?'?#?E??_U?S?+???7sMr?????B???2
'??3@0?]?y?I?}?u?47?Vs?i??nM_?
??M?d?{?L	?5s{?}?-kZ?Kim-?kZ?J???kZ??????[Kim<?:?D>)???J?									?|T??W?^???`l????Y!
???u{???}2??|??@????u'	?/G?????L?D???'-?^????N5?
?z0???C*R?D?:
?%'Z??I?woU??n??atz??N?SN+9??rdE_.Qi????-Gz??d{?o1??E"?,?Y?f?icE?L-&?F??????~<xz?9?c,7?@?m?9*~??c??!??l?yx?k????G8??}:N?????2??W?q?:???ra.???@_`????[x??????}}m? ??G??t2:U??~??????????????????Yz??[???6f??|&???j?c?????=n????J]??S??Z????M???G?5??xqL??^^???tm????}?]??ez?&????|<;?2?[??C9?83?}?T?JUw??????r?4H0??????IT=?Ot?[?;W??:?\.v?{???m??????i	}_???Mx??;?Z??y$?
g?'?b~??7Y?(?m
(q?9??????_?;$??a???>5?|?????U?t?\???????"`r"",X??i[?N4y_'?B?5?36?"???i)A?z
?DH0???4vK?B?
?h?<????Z??wfb?K4????I??Y??????Hqm???A?k:e#?U/?1??{?9m??i???<??QEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE????^??SO??/?????d?w?Q?????N_/?????7ZjL_?mu???????s??[^-???????gJ9??f?4)??D?Y????+?d?}Y?????Jk?ZhEv8(??b???QA??k???G?M^??]???uZ???J????{???2??Ib[l????|/^??7?p?jm??l??M?b?i?B
???v`???g???:???N?h?9?Ln???*F!?????.>l????c????]?C???Gw????????6?6????p?T<???ru4?P?y??
???????s?z??'??t???Z8f?
s}0?`?*?i?)??3??;??;?z????????t'???w&??wJyjSY?`??????mc?2	3???n?yo???BC???????C??I?L?????&Nv?N|??&@????3B????Wv
??^???i?]"?????{??n??Z?}v8
????f_<??&?????!C??.W???!\r"Y?1???H???l?/P?Z???r?e?????U?????)??|k]^s;Y?l1-9??>?[????8?q)?R???&x?X????M????????Rxup?B?N??(??v?89O????3???#????Mi??^N8????????	c???BDc%wf
????
#???t??G?u?'*??2????B???mZ????V?+8q??
t?MT??1?k?sR?o????7??X???7Ow,?H?oA??o{o?\?I&
D@??;?tQE?2????eQE?u???:???CvK"???[Kim.??>??????k????n[~Y?-7??v_????m??DCsf??pm??x??ot?Bvo?????uDh??U?QEQEQEQE2sf???2???	19??>?&?@???d `3Dr??????}?S~??U??+H????J??-?6?????~	?????H???h ???mg?r?R?Hx??t=??7??"??.?!????eZ?#????n}?????9????f?%??Z?????
?P?K?i??5mZ??-8???58[?????f?q?o??{;?^?_4?{???~??????w?}M6t!0??N?)=.w?<&?Ik???Z?@?v?~Z:?A????q?0y??l ??o7IDp???<?~???zg\??u????A\?Y?.??=Oo???:BgV?1??!?G?U???;9?y?P(Zm??9ggp?|?O??o?o?`??7
-??S???'?+?jZ??)?????)???g??G????V??????s?]????F+??)??&??{Q?|??8?A6????_m?w?v?????"?_b??8?>W?1????zs??~?(??(?????o?{`??~?k??????????)??N??<????_-o??i?\a??W)
??????e
?@??D?C??????,????1u(,?1l????d)?? {MS?)????4?:??.?????wL??w,?{k??m?/??17DW????1???|???kk?0????SU?i???A?`?m??6Dn????L???B?1??????cK^??0???6??#u|???24|h"??hF????d?w%/??-?v~Zi??i??????Bv|???F?t??{??sK?8????]????D8?????3Z????l????/?!???{?T?Xr???Lw??????&S??o*
?k?D(w??????;'3?-'i'O????k?????'fo????Sp??dg&?y??l?????
7@?Niw?.?g??3E???^/^Yg??,?????-??m5Y???;???fe?'??=,?[L??L??_?=
???"??	
?X??K7?KY++q???????Z?k???V??m??E?????/???]??h?Z????v??W7???.U???:????a??&'?[z*????{?I$"z{????|?_?S?????a2??Bl??T??0Bww
??x?????_?e?X?e??.?@w?ZaoqL?????j???[??S??????.<@????h??Y??????{?u(?^?;??????<?:????r?n?_??[/?cL?????dY?$?E
????r5???????=b???????OG??K7?????22???,???Nt)????sIw`?c?????FfF?????o`?	X??????*?
????vr?????f??Ay??p???MSb?]]^?????5A^??*?qe?Z?`[??e????Yg?V?_K??????1??b?$??=?????jb????????C??"??$$(????(??(??(??"(???s??-2&f`?ea??3???M-???L?,????L$?N? `??4?z??a?1:?0Xq??#??u?_???b^?eaR?U??Q2?e?C??$???J?X*?<S?>89??(^;?5?1??P??|i?<{????X??	?I?o?$????v??a ?NX1??L??^??8?=?????????\A?????}MIa??????n?#Q?L??>?!n?????m?=??.???_?n;?x?jTS???O?T?????????s3?????i?/T?X^??^??%???w?????j4s?5?S7??|??_??>???w??j?-???\3?XL=uI???!w?_???%???o(?8????<Y_J??J|????>? ??^eZzH?i??U?c??_???~^Npdq???xES????e??f??us???V?Q??&?/???????Dz]?[[W?V?`??}-?r??w????td%4
???'????$L???X P? ?B=?????c?_Jd????Nw??????
?S?\tt???mU
?:?+?(?#???d???Yo???]??I5????eLm????#?m??os%O?p??o?M????????8JM???????m?K???B???U????]?7*??????*??{$??K?,??J?b???eZQ\R+???&?htq?y|???R?R?????/?JyNY?c??9_??2UWS?y?L0?q????Ol??S????k@?wp???6]???>?:?????t?fH??#PU>/???:???az?)?????>)>????r????Q?EQ??h?????????}?Q?H?#?l!]??V?)>?bG%?Z?${hP1??$??yr?B??k?-d?????????6?XU??Us???P?j?+ab;?p#??lfC-IW6?2~QQCZ?Nq????TRu?c???-??4??%>?????;???F??
??$e?c???????????[692t?;&?Q-
0???DH??#
???B(??bDB0b?p0????KaY*EUV?a?i?N?
?u?I??n??????Ws1]?,?\?a??????g??2?s?O?????i?)??????????8}?1d?_???XP??Vg?>n??z?1??:Q?Yb?||<Q,???;????????????9??\??7T??[S???,?t??????????????kZ????>?d??f???P???U?jC?j??^?nm9?SFF?T???(kG/h??I?I?a'y??,?????}??Tz??(_??=???~Elw_)_j?Lm?????"?H??>z*???ju????_j??|?])????nQ???:#T$f?e??~n???.w8??U?U??+???????w?dc?;mB???~O??&,Ms?	???????Z???m??0??<?y^?fw?[??????
4??ux?<??p;U???S?uT??t?p???V?=VF1??^???/Nki?
1??u?#??????kx?W?v?'??G?`?????~;j????|zo{??N????~D????)??_%f???4?~?o??]???{??w????yr??}q?3??w?t??\:????\7?????)?L?:^?)????w\c????:???s??-??N3??'??<4???o?-_?2?MM??Z>8d?8?b???Va?S??Z?9m??????i??????uGf#??????????nL?Y?????????????x???oGWg}F?????:F?*v?\"?e????@p0?*!????zz[X?
G????`?V?????Y???z???9???????O"A???1?Ci??????y$?o???`??W???/?d'?$??1????2?"?Xo???<|k?{???9?5>-?Sa???8??r0?W2????c??h??-?<B??'?????*?hd??~N?9??\???y7?Y.?????P?q????R?i_N!?1??}_???A??3???PR~?????2(=????p?Y?e??B?t?u?mq=?R?k??????mpW(8<2B??{mA?TU?1??.???????x[??nF?/??}?+?z??P????A??`1??C/7L?CH2?Ic!?P?*?ue? [??X\?CWHJP?c?rxv??J?>???k?~Z??L?dW>?Hz?!???A??,???????g????Y	M"!9L ?!/ ^]*?+?g??_?3UUgB???an??t?T?????S??)?????U?*?:?N??????:t$??J?????J?q
????c??N??s????4,?J??#?#p??z?? ?D?$???u?????&:?C;0A"y?????2
V??????\????N?.?>W??_5?kR?b?L-
GZ????0?UO??/?K???jby?S?H???X|??zX?GC???shGA?V????Td$%???r&0?*?? ?*?????6oj?`Ud$0z??@?[?o???????x?G?u
???????}5.????d$!?~?)?2
???*???C??`??,T??"???+	Tk(????O??I????b?-????:V*?????Uh?U]?u-W%?~O?t^#3?J?`??9?Y?k?K`???)`???UUV ?????uU?
??qj??m?8-hR????.]????}??O`tz*?5???=iJ?J??Qo[???e??[4?????)
Z???%%??@fR???!?Vq7?l?P?p??pP?*??&*?|?."\?BA?6lB?????%?L?@@??
-oQ??2u??N??}3??u???
?????|??5b?+?G?????W??:?^e+&wYfyu?n?CV???????p????~?c??"".`??8%?????)?gi?d ??|??5????g?b8??Pm??<?-??E????s??+'???J???y???L??.-?????l
?????2L?????<??????;$DJU?*";?+5??{??=??????????_?z????r+???c
?HH???'??2	?	????1????????hu?.@??????5o?????>?[ERuh??C#???????EUL?-x??L???z??ZT??w]@??r?5?h2?????f?	,t??Rc??P??2???F?????"*???a???Z??t?H??S?J+?C?????(q?@_?8??M?I???Hb???UQ]?c?I??`??!?????????
?Fcg????U
X*\?%???}?M???gD?I?(3??
? ?()L??Q????cN$\d?"?E*P??9?2???8B

?????C"f??????x???\?ZKP??"?"
?????T/?=?'l"??Wx1???e?????:????oN?v?(?t?I%{?hO?#??9iT?V?????MF?	????r~0?
?X??	?y?q??u??}7N!?? ???????l?????y ???yMYa????u????v?\????a?h`???????:?R???f??????1v?_`?3?I??,j4par????I?|???????=???)j?,????^?*?MH????R
?X2????
?
? j??Ri?3?}K?WH'???8?#?,F??F?C?2#?>?EW????1???4?#???*8z?#]??
??U???H*?b?GP?(!?HF?4??-?M??B??c!?k??Z5{??????$>x???1?^Y=??j6?v#????J?G?("G??^H??C
0k?{?5G???yX?Y?????W?*a"??]?/E???2	#"@????????????{_???}???7????)??????^?W.???+N??E?u?????p???
? ??:??<?gO???
?y??w??T?%*h????
?y)t/p?2????Pn??zs|??HcP??q?|	1?&?3??!??
5???@)?4???tl}??Au??dB???A??[?xS?.?'?+>?:M???F*s???F?/0?Y?sSe???=,??Y???C
G??uQ?D`?qL???XP????
?w?`??@F
??"? ????{?!??????y??????
@?<?B?B???&?????????hg??Wg?ai?=???Ua????????V??r??mw?????w?L/??4O??t?B}9?{??tu=???sb?????????gp??????C??J????>???S??~:?
? ????????'???@??o?8?b2t)?,?????????????X0>??k?@@?#?B?w?p?0/cP?K[???u?????o~?????
]wN:??C&???"]?,n??qaZ>???[b`?`h???????q?o?RL?v?Fv????^P^/???T^bEUd??????1????,F? G??u??J?:p41@?S
??Dv?e??y?.I??%???[??.a("[&s??~yk?zy??????_?z???|??7???A?n???q??N????^dw??R???_????P??|UP`???1?!?C2?????CN^r??????`??Tt|??5	???F7)????????D}0J?Q?n?S???????%(r??[?p???Eb?q??v?q??_?Y?o?S?)
?_o>?9G???.x??b??1?H"
?e#??t??T??Ce?u\M;{??s?'m??W???Q???J??}??N/G+S)DL??0?$p?j?????n_D$?f??????3tA]}???x	??H????????H??J??%??>RQ??Tk???????c??(^f????
H???"????_??r???f????y??C??3~?.4??c(????\.????5???;???Z?#????)?????/?P?,???!?e????n???W??Dp;????h?@P???8????{???????`?u??M<??.?XKQq%?|?Co???^?,???t?:1???S7Sw??j?????T?1
??@.??@???? ?(z???T??{h\O????L?@?a$?2H?
?d?j?????d??&*?????r?01O?	FD????????k=??V?k??$??;??
??N[2????d5\?_????oB?k???`????<[L?!??,??)??"}?K?>I??v????38I/O?????>??:?s????9???S?v????T?????????R??????t=??=?,?C????N???*l??8ot\??)aE?rO$??)ad?Bi%??K???d!??Q?k??U?~ ???3? ?T??RqI??????UD??*'z_?C??;??5?N?x?>?'c?QUNY?cEU???x?????????7?^???d???????NP??2=??A+U?J?u????9????{?8|=???a?V??cV?&????-??^?????#*??????8???#_=]??:?W????x9???o??S?s??X???!?????H???&?`
N??=?M?pE?z??~G??nd????x??CO?0??8?=
?
U??j?rD?}?$?za?I???i?b???hI?J?????k`???>
U???6c%?]
??Qs?z?J??J?\L?t????s?K\1?N??*??M????"<??))h?7\x?9??k
?q?h?]S?X kE???/????8???6?I2I!S?bI??tn?^>?[??P???????2k??1?VUxRQ??s?sDI???"Hi
C????#?-t?'q???"?T????c8T.'a?Z??l??3?g????????????U?RG????*8??m???
???}?????A???????3????>?.?A?R
H?Q0=i???1??S0?&???;????????6/?{???2tq??&0?p`?d???{
?*?"?a?????????
Ba???}G??l?BE5?"o????i??4?Dd1?s!
??F?????,]?L????iHu=????O?Dp?iv??'<9|$?i8?Z?E?%C?{OS?j?]&?mq??????i??	@BF?b?@?f>dy?P}@sb???h*?{p??????U<
??4csFv????A?]?m|O??O at a?J?j*?&?]?l7.???F?u??N?eb?/9?f??r)S???n	?Rb0?)?v?I?H????%????M?H?4t????0?????
5????\?=??K/\P????b??!ceH?h?1?U;??5?1??a4????q
[...1780 lines suppressed...]
?4:r
??????????`??K?>?>???????D??C
F????????????g&??c7}?????G????}w?l??_??????)??J?Z*oR<?<?A?nl????-6???Qj??D???E[E?G???=?~l?E??`?as?S'??%L?~??Kk???f??O?D?L?J?????T??d???????EJf????
??????{L???ZM?~??????b??????T???Ph?{$9???B%?Mv
??($XY
??BY?;g,
?m?%??P8?4?????xo?m??(Q-s:6?`?X?
v????Jk?R?,???|4
h(?
V???"4m?>?6M???K	E?????{?????E???m????
?d?'?i??????]??u????????}S-??t?-*B???[nZ?c??m?25aM??J?J?(h)????&K?]?tul~????Q????	)T?:6n?%B?
TD?
d1???X?y???'?1???2t????5!p??b??Q???'??????
P 
{j,!?P?N?7WK.??l^#?A??}?5='4??S??z?k??2ld?N???zk?	E\.)?f?R???IQj???????"l?a??????'??A
t6?
?????4zN???lX????r+U?H~?4K??j!K?d??I	f????}M????-?-?,V???	???<?1|R<?
???"@??U?d"??a???{?)?,??_6
2?D)??4?Jgyd?;C?????o???2T[2?P^????
&='xi????n??	??Q2????d??3?x#??JF??A?,0JFRX????2i?I!?Kp?b???????x=h?<???x	
?s?.????Y?{n??o?Ct?i?a?????"*:Kl=?Rz??"?je???%dr?aM:?C$?)57?
?%?*h?U?P?,e????_??{????'|Q??Hy??`R1?????i?(h?N??????GC,??DL`???:?_f?????-COI?q?e??m?
?]ua???????"?
?B2??u???????		=X?s
??(f??????? ?C?70????v"??a??Le%b?@??KAbn?d?Ox~??h0?R?)????
???(?0?S?9l????o!}??
*R?+??5,cNl??????e????&?HY??3???M?%21$?`'=?1	? ??#?o
?SE?]X4??6H?ad#???$?!?J??H????FL5??+?&?IU?A????]A0??e??q3??D-?Z?E}???????s????????c]??????>?O?5??!??{???v[???D?tO?j?&0??ZZI+gY???l????6Cx???Y	>Dp????IT??6???k<G???C???
????(??
?K!d???j??2???c???H?;?<?=????JI??(>^????????N?*7d??n?h+
%?0??CE??e?`xGM??
e?,?\???n|?/mhQ?x??'@"???l??????c??~ZKO??~(??0????p?Tbcc>???u>??r'?
D?|?????\_v'???7??Y?????R*?????~??Q????????j???P?31^?o?:^??? 85??M(???h???[bc????B????*?K,????"A???
o???2?Z??????Y?;??Y;,?-?????R????De??r
???~s??x??$??AM[??^;??/?1?!OS?Uep2C?X?1?Q?????.F\?c)?????$L?V??	B????w?D??h<a?:Z??q?h?LQ)	??7t6?:?
?!?o?? ????P`1?K?3?;R8?s?w???
?IRRW??*?tt??7?????L?. ??(R??.b??w???@??PF?j
H:?7BtBhL????c
?9?	???wgPZ'H???'?lz???7?~???a????hh($?1?????????b0b?}??"?x?'?cy??S???;S?@?RyU,,?uq?C
???%{~cN??h?'?TJ?>I?-???N??ZN\?????????I?C??G??(?!|=???%@?4?B$O???3?D?SR???&???o???oS?M??m?3?
??9rV?@n??U???	?,??????%????(t@?N??	-*???>????????nC1R???u'??)???L??^H???A????^X????D*???h???N???k5????P\???$?+?w?D???e???k???0C/??E?8h???7Aj?q	?c
$I??a?dK??F????:??i??av??r%p?????f?7?UI]?~L?)P????{}?+1?2????#??M;xpk?a/?u@q	????????%Rh??>~zb??s4-,?{db?A???$!6???????\8i????h?K?,O?????
X?+?646??4?1.u{??|?P4A???B?)M?6??5???"$?
???T6v????`?D????~?&9L????8#K:;??{4
?(5????y?"????T!?w?]p???4??T???\?????e$M8`??(H?"??B?&?\??X<?????#?2?RB
?6???
?JhZ????YK?t???p??/&a-?A?0????I$?v1H????@(Pa+i?&??0??$?+	IR??N??$???'F?G?Ma??D?*??/???c?]?KQ	???qKQ?f????u?6??at^??H??>?AV???1???U???>_?]???f???*????vC}?h??3????d!h??CI?9?+?????)A?"&?AWT0???????v???????7lG?????9
??I?"?<?x5?

h%bI??????=`???	L.C<n????#?(T?K???	??SBHA A0@???/"????4[IL?m?F?
??f????vtGE;?o?m?`.3#A??NH??l?{dp???;h0???d?D??
?]?4EKK$????(kb??f???4??h"WdsK??C??????]???!?#}??F
??^^????^???d???f?
`OI?)??N???U??,apP@?????X?'?&d?ER??????)???????x?%????IV?8??u?g?? ?????k|	?
?r??5C????#~?x<t?(?{?8???=?M-?	????~????x?O(??9??B?Q1?^?eM
?9??!?C?i?*X????I?im*\?
iDA?wk??	?????Tt????m_?T&?+"J?xS???`??X`#??*??p?g	"?PL?Y-??T^x??~?qHa????J??R5?Z??/K??Ix?_>???Jn???@3y??@??:?c}??gTm?L?f????.Mn???#m%?$[F_:???4?A??` lP?c
&?%g?"?(??J??????8ZG#<-?-??s?!??????????0??8?????U?????\???(?T?9\@C???rGH?-?p?d:?snu?V????d?:?DB2?u???l
b??i??}o????`3?{?&???VS1????^??a=???,
`n\Z#SU???=9?R?=/~???;?#??e???)???A?r8s???3^?EuqNs???*?4????6?K%???=????.E?P$8D????????N(?|
?2?$f??V???PmH??F?gZ!Er
?mS?{X?9g+v?l???6???rY???????-b`?{??
??G????QUAb??\B<J
8?????I???
??HKF?fE???&??]y??eL%?$i?
jR????????4S
?e8l??~^???{???U at 0???(?(?????d??`?,^mL>-TO.?x??+	??p,
?HI)?ct???e+YN???da???a?$???.X??FJ???#[*W$;6b???1???w??i]FU?3?[??????gK????|f?<N???t?;|:%z?^??x?????+?
?Q?6v4?o???,?:R?X?G+,?h??0?e?4f??'U???(TZG]?N??0
?u??+(?b;?pa???D??4????B?CJA????%?B???+ISj???i??:f?<?????K<?V"]t?4??FY?????1??HNJ???P?c?I"?xDc?????5??Gg1???xpO'?	?5??Frg(B??pc????8L???5??p???xv?d?5???t3?<v?????3!
?b??KX?4aTD
r???????S?"C?RC]R
????1??G??s?A????f?8?Ic*$??dHU???gy?1o?r?"54??5?Jr?8?-	?lX?????f?p?[??>,?Kv??@?????? x?12Pb?(?h???`Z`?
???1?
AK?_p;?x_^?!b??1??(<	?h*??	?;
5Qb???b\? ??E??He5???V?????J?f?+m????????Z?!&???
??I/,Q????Ui????o`ov??6{??Rk,???M?U$??U%???z6X??;7????J+Y2?L?(U?H
IdD???aO???]??0??\?R}????????~s??#4	_J	?b*~L"H}&?0??????]??l??A??G ??d4????????)??Z$
"XkC?	6?F??K3????jo8I!("??Q%s??E?\?4$Y?"????????"??????N??_1?ldY	??;k:?p???$??H??oR?\????{Y??S?jp?Q????8`???>???????D=?gd??kT????`x+^?D>?*(P
{?l??,
?mm?????h??H??t??nk???<M"?,?#/@?x(?R?Y?Q???tl}L???#mu5?PT?$UY	])?d at 8?
j?>6?I?0?$?I?t/???%E
1???T/??o?8?Q??d?}?(B?B???????????JF??yX8??b!t???Cp;t?g???:????B:?7?????3/??k????6k????5%?????g??????0?
???i??1?-
????>?i^??9?x\?F?
??R0?$l?!v?5?5?????a??.??>???????^??
??lDJ1naH`y??~?l?1??LBD?%A??B?.?r?1?3?%&*h%?(??w????M
#????b??p??N^5?W
[Z??Z???Vc&?%??]*?{!
???;?L????C?S=?
L?V?????T9?????{:A??V??e??(5Y??cF?>^??l?S7?BJZ#?q??????Y{kh??2NE?F??Cx,?????j?)
??%MP[
???W!?a?A?X?X?0???U)??'W1?"??wI?h??R?H??????Q???y$Q???4????AU?i?7???I????h?T??w~W???d????{a?9?i,?????E?wQfH????"? H?????6d&<????F|???[=~?m?<?z?'1?Akd/????RL??:0P?????F
P*1?C??
?tS????
j??v=?V
k	?"C??1?@? 1
??@??j?m?q0~???a?A?????W
?Z??	;?$t???;-?C???R??Mh?^??=?????k?g?~?<:?????
?U?d?2?b=k???T?au???.~)?]h|??V?@??G?c?-%?-$?v??c?t?n??????h??????%-????????D?$:?(??????1?;sO<+M?i?vVB??
?Ve??c?Q?w?F?_?L?????jC?M^????m??I?E??xV?x?<?[(^
C?6???d??1:q?V?0m??U&???a?T???H?i<?.?I?d,??B$ ??+"?F	?I?]o????gb?B????1?S?O?k{????a"!????D?%!??mMV??????k??$=??#?d??:cA??,?)6,??z?n"5??Q??o0??0?,?C2Vg??U?O?N#j? ??????b?$1?????????I,?,?3??i???pT*R? ????!?D5;L?z??z??C?B?2u???E?Z?)?`<???
???g???|?$O|?R?HJ?%??????X?ZiZ$J???D
?~?
?'??'H???{?&??
???M(?hX???????R-R?V?B?*C?
(???i?b-w?5?d?Sa?????q?w9???????????PJ????YC0??5?(??m4??b4?????r_/3??\Mo???????l??n?A/
?$?!~?'?P??d	??e???-????Z??????+R-i?ke)X??4DM5??$??!$?D????Co??>???_;H?f??Z5?U,???????? ????
?#??!???U?8??!?'?6MrvG?????:f?"
<[B?A????????d???1?W???0?|?x???????,=?7?"*?)?(j??H?Q< ?z.41U???]?Tr<?|?4>????t??+??????Q?:??9??Uio4??5t?n?%?
0?3??6??%?RCh
M??4?????oM??3?$PL???Mh.??????"<?;????	!?#?JU(?qPg=d at r???a?\??G1?=,?Ia	?????\?4?:?!???_H??D????_?[????)L6R??lvA??F?J+?`t??J?<???`?C????iJC?2?4?*6?v;@m4???QY?,?`?x?vEa???m????8}?tV"???q?Z??@eqZ	????
8X at b?44G?1*X??\7???:u~??????;?K;??#??E!?i`?%???-?W??O??,??o?I?S5??{L
Z??>?Z?na?~Xx#?zeW?e-????;`?j???#Q????JG??????#??)$???????)hX???H?3???B????B????lY?6??Ur?i?4r?????HB?$???????-O??l???E+?a?N?i?*0~?k??=??
z??G???@??}?@???B??????E<??h
"|?	?(?l???&a1?5R??@?f
4?$????m?%????JRt???+???tC?;???P?"????	?;??
???(???7%-?????f:?????E????.*g3.?u???P
5o? ?Kk?????Wy???Y???[??
?L4*I#Ddq???????D?Jy????h?I??=?R5-???n?y???,?3|lL?N?@??R??/??T?)?K?x.????<???4?yT-??8C?a+MU h}??~???ps8
?D"R'?,?s???Y1k"??2M?
Rm???i?!??%0[???T?Y
?D

9y??cLliBc!?9?	A,,??<m1'm$a??%???I???N?X|???d?E*E"?X???mT??"???Giv?"8?h;9????s8???yZr?gK???"?QF?$$????2?;?:??a+J?0??? 6?BVMCQ???\Zs????S?Gb????M?8????????z?"??x????????n?WXn????L?H?d6X*???????i?R??1'T?B=??,??V%*R???N?g9i$0??R?,+??]?A??L<??w???????BvG?D4?n???N?N?FB?	>?????DZ?r?3??'3?E??u??k?*??????
m?+?I7?VZ?Hm1?~?K??w???vZ?#B)??1@??Y???[76?b???c???HE	?ab?sQ??{1V$9
?L5?
Zy
??&??M?
??3????:??I!?u????e????l?m;?M????)?S
?w??Y0&?v?l??% ???s????5EQ??H??eE?h	
:gg??&??5?o?7??q4l?N????2H]Q?~????"?"?8"???PM	?/B
???l"<?B?x??_???|?2.?s??t?P???n??D????WG?U?O??G??`$?^????????K>],1AUE$#????4?pd8???|}K?P?"?????&c~?o?!2p?@t&`????>????Y
Kh?)@??J?^???|??$?!Pk2??g?&?O??0C]???(?{?
=?=?/PA???}Q?4?????<0
?T?`h?	???Q??Eg??n4L?? ?|?O4?????,00I?3$n&H
9?	?B?r?r??????'?%aI0?GtBJh5?4????=[??,?h????i?[Y??I????R???@??J??L?A???Ph?
*h?i'?14"?0*?e?B-?0?2&??L
 ??3,?Y?'???zs'=y????fCR?`?B?`Q?U
}6I?3????	Wa?.)?Hx?????
????4?TP?
8B???aR???r?AC?*?T????6??9?YA)??Q??dA??s?>????6jn
$?E?,???[T?,?E???%?QM??
????y????]????????^1aw{"?(D???P?IBU'?'???|A?}?j?Ol]@? ?(F$?J
`???-?????????@??????t??$}???%???8Tl@?7+????}q}??S?JN????9Ro????~?>???GO?>??i?glb?d??)lB?X?
?Z?Kh??!)??Zy??;uUU?Q4?a /???w???m??c1v???e?X?0m?6?~??s?m??i??[????????????P?I??????
S
"<???0M@???,?:??$?%??y?????(???????Hq??d1M???@l>w?? ??d?m>c
YA????5H?F???o?\??V?>t???a'??IDa?!2ZX?????1CG????L??6???e????6,??)
X<W?????
f?
I"?????????:$?? ??	bJ?6V3??QQl?f????mYb?hn?????[Z1Dj
???2????89??($GR?CB-66?*?m?t?????P>?????$??n?#???ViJ??6Sr?X??"??O?
?????
P???G?y??Z?%6?RH????(ZT??|?>zr?<??sOmTVSI????SV??X?ZZ??j???KQU????H0bD??`PX?`?Z?????"???i
?
?G'???F?M?<???n??????}?q?CA?2S?J@?$?rz??x?e???A?c?>?'?=
?!??????#8?????$V?<!2
?y?????
SO???xp???????{?6>??nk??6???g[q??Q??/?c??tO6????u?????X?B??$?I3:????;?qtk:!EZ9?2Q??o?0???(???V?%$T?@??Q.?d0?``#?0??<???????k????\

S]?S~/x?#mgT
??A #?e?[X???`x?J?????Gp??????(?	????????}?M"?E)??r=??Q??
?I?*?lO$~Y??yy?????
f0!o???3??t?>?[s??8E??<n????1#??*[V???}v??c?????hsF?!??i????-[c??l8?:F?????7l???l?????kf??Z?C#,?????,?-??i?
?f?????,
???M??"2???F62#j"??????e*?
????50S???$Go??N?PK
??I?#?bj??????9^?)??r??l?3???|C????)??lk?h???e??~?3?sSm?M??4?????X???d???e]?4(V/?W?????0?@0?#??#?T>(??q?Y?5_o??<?>?I_????MU?"??H?????{?@?G?{?	??UUB?=????????2=k??"'?Jb2H????g??7E??\?J?{+=???<i???)S?????X???{????X?y?9KV?????????k
X5?Y????1q?!B??k%????~e
?|?Q???TaF??
'?iU?Y3??x?X\gq???i.?0?zSN??y??n???jx????U?D???9 at n ????-??)???T
j <??#?G?4.??-??>??<?A???[??YDY#d?vA??J?0:Djr??0?!?9?$??????t?]$????\#.X5J#??d^
??c@$??.5v;?P18
R?mlPR^???9??C?-??X*Q???D??(?(?"?"?TQ$Qq?????o??V~&s?{?$?w????h!??	sy??#??t?#U8???????L\=M???????O????V?f?q??X0`??b?,?YUW??>?m?1?;???????_k?HI`F$$??W"??I????0????tDH?c$???8?|????Pn+?]`?M?@?V???
/?
}Z&?;?????b??D1????BuOQ??????.U??X??wF'??????2!??$?BR??*??????~]????Mf?([b-%j?m?e??
??????[%??)?3&?Em4eeSSTEl???%%??VV?IX?-??kT?R)?????H??5mF??i?IcV,?km??????H?RLD?MD?1[j?b????????V?(???KJQ?q!?-NC??pS?u??o!=???6C??=?FbH??de ????Bw:??_tf??U@?j???'g??'?[??'?,???????????]?g?{?P????u?f?mU???M?Z56??J?f?$?Z???j?2?6Dn]??KlF?-?:???&?M[fZ??kY?Bl?d?jb<N?h?D?*)r&1&?n<??y?h?}???0#Hd^???
?? ?C?rAJt4????0?a?\??O??6X?????4?Y?mg:MD?6?/?G????>bM??QMQ???u?yc
?@VA
  ?^?????1@X?d????jC? ??????=VH???E???`SIV
KSN?n?rc:???f???K????????<_?$DXEPy??????N????;??QFDD????????G?G^@g?=9??9???Z8?? Jl?o#`a?Y???????????NR9????ad?P; *?$?????9?$??Z??????K?@\g??l8???B???'?qat??7?A6??o
MObcb(??I?????E`a?cd?@??W'?6iA???`T??n????E??3???)??@_*??U(?B
@UOo??rX&?~??8a
	d8?K?O??Bg?<?R??QJ%???4???R?u??c??e??ao
?????gvtL??(????&??0?????B?j*-K
'???M>?a??k??m???
fD???RV?DW&??? ??@??\a0n??
"kM??CO?
DR?B??p?????D????	B?*????m?l??????"$??e!w?	H?
9?F#<????$|??"N9$&P???
?b?mI?D?SG?:?EY>,??	6??hd|?w?.??Y#B?l???"?Q?G?1?
?u?dH???????~?}?? ??Y????b?;???H?-?;y?b?n?T8N??_d5?????{|?gs?cl?????\#????965*??c[o?e?t?DJ????R?I?4?'?H??}`B??>?6?VH?3????4?\????yi	???&??k
V:@??????uk?Sd????t??4???J?z?T??? 	AL??v????O|?wG???M??)????????M-?LN,?.IN?????2?M??UfI??R?O-??(??]L??p????? ry
????)??Z?i??M????S????bL%???%]"??_???h?BUG$+??????I8?@?2DT??y????P?=??????(??h??()?K??A???{8?=??*S:DX????Oa
?K ????=??6_?0f+??|!??"??~d.8T	F?/_????????AC??&ILP???I????y??p??????P[q?????????Q??IM??P????&?????pe?? ?__???M?? ???F?a?o???wB?A?jJ??Zy?????????f?Ye?6????2???????CSG at l??/G?$????
$"O???c?i?^??[Yn?????7?UU$3-M??F?$??X?@?G(??S6?
????My??M??dF?T?A?c"l0????|???x?gI?|Y????y4????F????$??J?,{`EN
N?%?]??N??<??_m?5?8? x?7??o;x??Y?L???*?Q???????;0?#???????<??????"5??-QI$??.?MI????????'?????????R?(??I???m?<Ux????t?????
a??????T3???????H?d%?o??|?????????|/IX???????Y??Ve?m??J?iAd?q???Q??h???????>K
z?#Nc????
??BpAt??`x??GU=4*?BX!??_??????
???f?k-?o??{b???J????py??M???U??D??m???-?TSC?'rtX???)???1?b????l`??m??%???y???I)U?z????????ac?iLS&g?D?dR,V??`?U??.XnTpQ9X???m???i?m??{???m?
&??L?
??3??g1yM????f????^F?ccfc5??=?L?????????i????k??%????????#????L=Vs????????q?????hP???????i2I<?????{M
?KAb?
??@?Z????)?()
*?E?1To?	????\K???E??????l????'????/???0?r??|?~B?EB????Y???us
??NG????+??<"????w?Mdjb??$?????
??b`I/?'wm)????#?????W
9(??????b?Rb?
?<8:i&oH????E(?K??Iu???	????
???!R7?_,?h'G?????????l=R?m?????%?zE?%???st??w???Y??N
?@????=^<??A?@?0???z?>!?6?)z??
JU???$J?#%B??!e??A???K
???????x/J??%	C??1jb???z???
?B?????????=????o??[?O?@?'??H@??x?X???S$?y????(??????UF?Z?.???A?^f???]Q????UTR\???/t???v?`???u?-
???:?Uu"????h<?=zA??h?(?Pa?L?bR???@Hf+Ul-???a????????????T?-(b?b&?I`_??\a5??4-|??}'???O?????L????1??9%???i?2jUl??!#&?a??[B??t/??@R?p?????xf	I?s?z?<s?=7o^_????X
1t???@?)
??}??>
?[??1???HmYf??b???-
??(A!
H)'??RN??[&F??1*jf?[?v?????m??R?d??i?oQ?"Z????????H?'?A$?K
A%??
?#=.?M??v???????M???q????.????u?	?sZ?i-??+%g?qe???Y?????s??U?5?Yf?m&f????&tu?n?t?kk6-2??[v[??8??????

?Y?
|o??;V??????? md@?lo>m?xy7?o?PL?Rl,?*%????I???e
??
??4??X???|????Vy$0$??fE%<! ??``Mg?Y?Bhp?8??4? ??z2?,"?P0??'c%E0?L3 B??;?He?M
y???
a?bi-?	*?>?
?(k??%	?>?8??5
G??)?@D.$?)>T??cu?_%t -?ahPA)[BzvXt\?1???,??I??????????<?aaG????x?[!0{ G:?,????B?6?"?LC??=C?IH>4@?B??D?Asm?z?D<?@?JH?Q??A?[JGR??n?O??M???Mh??e+?B?1?R	
'?_	???l??c)D?Bz?????????,?@????l?H?# ??Gf
?q?+)??
KaH?:x?o?-??i(3h>?8<IQ?????^*P?Jd?,.?h?
??7?1??v??y????I?????,(??c????cf????CU?D-???p_??A?ycYV??b?3????c	?D???W????+"?*???dz???%
@??N?
	A???cL?P?'Jy?Z ???3{{?IIE?'BC?Y??:}=???0????G?H???\?1[?T??D???4`??R~0?CBP?H?[%??p??LA?AJ???@?Ci??????6N:?+??,?
d??JH8??F?????????Zd8?s????|b?e?6?%)xQ
??2?G*?0 ??T??? ??????X$LHAt?.?4???q??X???8?x>??6??v?????????????"?M?bB??????aWkOez	????yT?????I?
D~p?????B?!????e????p?vS???"??????d50+??bB(?sCIG???)5??0?FF?N??W$Q?h4?H????0?0L????b$????'k1qx?I*?p
?R?W???$??RF?2M*??I?\?2%????T???f1
k)?\7?`????v!?F
?????R0)R%$\b ??P:??E
???Jix??????D?
?3?
?"R?7?????7?????z??r?$??G'???????O?-?-??A?Ds?>?bv;?????B?????????=???^0PB?
???I?D-???h????>G??O????#??RR?????8<??%???
?q?UUj?(C?A?.???_??)?xp??8?}??????Xn@??eUa*?e
?_p??????Nt
?s?}X)??\|?|???|(?R
~&????6"?0???v<g?J??B??????[V?2Ii?&?5??2?2?E?;M5MC?A???6?????S?}7?].L????n??;&???J-UD<b$~Rn???q?	??c#???`YH??/y???x?v?'?o ???\???HF?5?d3	0?
?6??????????H????6???7??<??$?2?+hZ???2?dld?*? h??l?????!ZJ
d???eAJ?w???,???E??L????T?J?i?????????<DQl??J??;76&???F2??u???$`/????????0?
D??!?l???b
?J??A?Is????p??F?g??~R`?#t??I???jMT?W????U????w~???g?-?????'?(??g?????#5??7YK>6
????5MX??T#??E?T?<D??i??"&?*
k??~????z?R?i.????TJ$?$(07???"?????D???}?
Y#Q>]??#!
???+f??l??8!I5[k,???d???^=???j?dV?DM?D??vn?4?}H????`???N&6D C??????DTP?DM ?B????>??????8?jj?M??[?YIc?=6{???vM"?A???p??4nIIT?C??G,??);#??Mc*???bd???B?@?NWnT?vZ??`x?%?????4Y7??7?c??r??qf ??
??PQ?2?;n??9g6W????g??3?b#???qj???D??)A8?M?:?r
~N?x?H??g@e??Z?p?0??n????E?I??5??!?p)R????bH???^:?,`??%??a-??(M-????h??????K\?#2?`???H?IT????oH?d??4hMVib?Ax???r]?b
"??I??J??0?f?g???M?
?!BKX?????????(?w????|?.
X0?T???w?7???T??X?c?dt/2?'!???L?P?????]?fN??I????2<??G?g?hP???)c?F9Z?K?????4T??v??	?%?0
?h??????
?0?]?d?6?Z(+??rS at Fq??m?-???x??bLE?@?-??nr ?WsG?
W|??o??O?n6?1?[(?z????s?b?$
???,?B???????#m6???C",????q?????n?yw,?T?+$?O?(&-??e?4d??TfGfq?6dS(?;?:I^\XU?7???
???3???J?[R?????'H?Nr??1?G??????[K???h??2Y&??5[X?	?7??????j??i??????????q?A?
?=F^ ??D?u??p?G?I??
{?/??Y?Y????	??[o\D??cW???UB=2dy?}	???!CP?IA?M?h?Qm?-"??????L??Z?M?5?gsg-??????^?Ny???d$;???y????X?????<??CaOm-??N???)?o??Oq???'?=!?????di?X??b???5??9?i?i?!?g??o???<bW??>Q&
??(F(?<N???P?????I?&?*??
??l?M>?g?y?+T?~}m???1??????!?R?bKCX?zx?m?WP?Y?E??JE$D????E??
???Oxn(Gp)V	?QX?#?d?C?-????(???n-?H0?VVg?{??Yu?
?6?M?[?|?SZ???M?I?N?`lm
??????EV????5?fI??k?I?(?????dG?TP?h??'-??
3?@
?,Gy??{=??U'?hv????g??)?kn?=?fte9y??*h at t?_?C???a?4B+?
"?PH???V???x?e_v????VM?1Y?S?AT??L+~m???~s??G?u???S?D?d???4G!??[_???m?z???|??????*??u?-l??G?D?EpyA???j|q at x?$?$%??Pv`B.???9<?F???,P????
????&E???a???v???+?VmX?
G????e?M??m?h?|?|????el????4??a????A???&?FT?;_?????Ac??D
eY"?????(K?\m?M?c!?cR?2alE??w?[?k??4d:???;GJ-?ZF5(
?? ??AC^?iaI^??@p?
?*$??p????u
z???r??M??=??2???|???-?@?$y~.??Xt4I???????????R??R?,????????u?c??G?eu???y???m????;?SDs??T?????eHXH?)jy???Z????qI-4?dJrI??+??]?L??????5????(H?o??|S????<N??0`?)???6?X0??c?2	'?bJ
G9?4?+mo?Wl???h??),?kG????=??|?q?N,??t?FR??M?P?n?u????v*???,??????d!?_??2f??y??N?}?????kkZ??BD at -?C???????>??Q
`_?6e
???H??
??Nh?RF2l?b??d~???	y???I8H?????n#??0??????I??}?2z}?????_M??

(ZY?'???????Q?,W?3??W?0?&A????????
????O????B|j?
?T}???q?d?[%?m??7?$?????*([n??I??l????%??I??:??M6&f??DZ2???9????0QH?H$????Ib?,YeX??	?X?)m[V?C|??C?
?4N?:?/?????{>?EA?
??i???b???}I
sS?key????2??y?K$Nm?6?n,s????Y????&?;
??m???????Y?(??????|??`s?M??Z??N6~??*?
???q?T???????*KJa9?0???`?A??????L0d?Q???$???f??O??B????A	wJpC$??X??????????G?[#??!?w??Iu?^w???\x????
L??6??44?+??=?l?????{d????K'?"??t??k	?|Y2?#%+?-?????????^Tu?`Aa?{Q??|?????z?=?ig}??(<??fy%????I$????mU??'??????RPRz0?????s??X[?????1C??X?>?@?E???O>
M?o??C?^???#??P'?????3Cm?D.o??????????C???v
p#??????3??3??????N??
D??????-L?6>?6??$m?s*?$}v,?,??)a??q?????Y]d??????<
??I2?A?D ?A:?%????
`?#?"FR?`?YDi?,
AR?CJ??.?()$XJM???i?mX?2???????T????"?PK?d???aE`?B(?
Z?M?
5t??AN??k{b7?m?,??khE??h?Z3??V+)D??L?
??L?n??n????s???h[:/?8{[v?X?!ey?W???)??Ef???Ft"?EkU?????c?3?,!c???t??`l?
?!?,%H?X??(???	?b??6?;z%???"?"??????3?Oc??jv?h???kB?1??>?J???9??p??`?
?(k???&'??<H0??(Mo??\tY2[3??X D?(?0Q???H?B????(?bf@??Ci?=????=??2?????*9F???V?n?v?E????Ua[m?YM?Fy??q??????['??xu???f?f??Z???b1bL?d??'???XPk*J?????8?+!??,"	??g??!??J????e?6u?t?sg??;???s?X?`0?E??4TR(?a?h?&???$??????i??Q??*(?:
???GEAL??)0??X??&????h:-??7??a?PB???H??)`&??mfI?y??U?6??
?s?_????[My&???1d%?X?Z?e??E?!DQ
?????3)XE?Ze???n?{?T<mf?h?o?4??	?j?U??w???S???~?_Y
&??t"N,???>?A???N$4r??j??GVa?*|???X??????t???????n???d??????R?%?HD?H?W?(F???v?,Nr??w??H9o???V?i??b??U,K&??????F??????8????"???|??Mt?TiD$Y???@
w*$?;???o?)C?<???l???neC(RW?B?=?????6??d???5??}?8????]??r??*!D???E???$WAK??I*??]?"???2?d?H?Sd?Q????k?+???p??[
????&?t???q??/X?EI???R??KR???c?????????c??PF?1??	?Fy??JStG?
Jz:0?h?L??-?5???U?x	U'?Ej???(w
i?@R?H3??	?)??8y2? E+????
!@?nC?????}\??9*??b??????????A??nID0>KP at +?????E?KO??~?<???e????X?f?D????????b?C??>?G:?'0"7?	??`?k??/y??g?F??????v	?`???\v$S5b???C?X-??B5C?B	??	???EE????B2$&m-?U?d??V????j??(7??nm??2}h}Pc?C?c???????{ ??$?0?<?>?C??7?;?y$?????'H|??C?????z|???=??j*??T?'?j??
??????h' ?a
.F*?	T?'?dj???X??qc?zR??P??R??v'???w?b7??\?M??D?65"F
5 ???$%??Y at BP(???Yn?MM?6?B?-?i?<?qy??r?
#??>D0?hy?b??D"h???#j?#?+?@`?P?H?	"%??h?&?3??v???F?K?V ?3d?xM?D?R?????=???????Pz5+n?
?4?#Fn$@??2qI?????h;(??}*F??V?????5???)?Q??#??HI?
?4i(4??M???{?d???	"k&D[??MYAkV???o]'?4?o?!?sl????~sVqJ`?a?B?K?5????+????$??!?	?cF?L6???CV?b????OF???x???????xJ????X???q???+??
,dPPbgq<??~'????*?K#*	9?j~O?Re?S??????F???????x at h=^??V??~~~???p?k?(`Bk?N????:N???????????Y?Q?????c=???M??????'q?????????w>?NT?&
3(?&????=? 4?D??`lZ?]??Z@?!?^?NG-??9?!^?o0?"H?tN)R?2v#?????Nu??4??3y?????g????=????????^??@?j??"??i?\???H?tB??}??\???s??p??F;\???2+Y???=?m?KB?Y????Z?p??$?*Z???X:V??o?.c"c!F???h??	?h/?^?#A??85???|?(!?"???,Q?=M??)?0??5?iS?2{?BzlF????2v=?L%F????x =RB??1??:?%??0??K??o"?}=
}O??k???A??????0Q???`s]???2??z??#?-??d????????:I??K[|?<???e?:?q*???r?W??K???r?0????s?
P????v
x???aO?0l?k?n???%?d?o?>o??_X?:\z?#+33???ar??????????????l*?#?I?????xK?y;???=3??N??\?}|???????>??5F$m??,04?1 at D?T????
????_u????o;?r?u?????
?%?????'u0E|?Y?;B3;	?\B??z?V2???cm3?1t????s????;?`?????@?w':?lN:R?,\??qj<??+`S???H@???/;H??Z?(9??t??jO
?
????????)I?????a???^?Hp^\???I?R?R?b?e}??11,?*
?@?=??t?h'??v?q????T?9?J?e??^??__,?pJ???	?A*?+4V??"???G5??????-??cR?#?~=?g?;?R[MT???0`??U???;f)??????B?DD?cQc???,??8??pAX??????e?????W??
^?yx*?a???Q?K%???q?6????`?ouhcm0?}:Uy@??WH
?VY?on ???
;S?,??MR%?2?N%??<R???(N)y??ddd9s??;$??fHoH???Q?????g????&]1m????J?2K?S?]?N????g? ?????
?lA??U8
????7?<???8f??<zy????~?:?k?????????&?{??Z?,?H?|!?j??_>=3??o{?
^L?u????Q}0E$??P?I???????_~?w?
?d???O??@RH?	;?e6???$ {??t?qY?C?K.?C??%?X?l=7?6???U?b??UmUTUUU??????!???????F+aB?????U2
???a!?H?c?b{gN?s[??????'?^aD??1v#???L??H? ?????
?6????????H??t	~?%.?b????iG?2d?a?>V/???LUV4?d?$??)???
?Q2b?0/E?1aI????'?(?-?H/????y???????L??0?E???NF".????*??VQ??b	?q??w???NO?3???S????s????l?????Jx???O????}?U???%??b!?Ae??)%?mF?????=6~????y|?|*???
?>??fBu?6??? g?zsQ????[,R?.S5fO?L????0??%???}Y?a?rc???r??L??qhg?X??iQ1"?????@\kg?6??O???t?=*???H???AzI+?;
?`???arTj61?OP6???????
???g?M?X?????m???I??}?l????<?q???o?y2v?eO?u???1?MfZps
?\2?$???.??-<,??f2???pr>?e??R
??
h??53?????Y3?\??Y??????I3??X	?Iv?N?US????l??????O+?t??+e>?|??????g?-A??'?!m?|rF?,+?C0Ez?g??"?(?BD????????????v?MH??t?f?d?[?%?n?4??????????6????5E??%?T?
?' ??
??CT"=????y"?
 ?P?$ud??<????
?pS??&??3?N??r???!?iA??Mk6?C?0N??q?'*??f3,{?????U??"??+?|?8i\?v?^t??????H?s???????S?-???JC???}k-?7|;???b???Y7??'??????Y_??sY4?wX??Y!e6[>??o74????-?[z??????x?EKX?,?????RE?<r>??m????q?7?BI'$PVA?{=m?6?3l??????fn(\O1??x	?@a???%???P<!?%??$????h,?	e???F??N!?i)(u/.?%?
?2????q???1?C?8;?g?jv?c?	a??j?*?\f??6?i*tL
???HHRV??L??&??B?i???#??
Ul??{?
?Emi???M?Q???2??M!D)?NH4V
g?D	??!`%x???NjS?D??b_????!??LOw?'=4d?d'?Hra8p?O*F @(%??U?Wq?W?????#????P?C??E.1UC?b???b??EUk?
?}>v?G?OL???YM?Y(zA?y???o??%???????d??R"X?????m@?R9(?
?AaC?????t:w~;
?1?????O?$??h7%??_|Cv???????Y@?=J?XdX?)??L?F????X??h????fy??G??D???
?8?y???]Q????@9G???(^?H??%)?1)?Dz??I?
[Q\?dP??$??3>??L??Y?tearb??a?
????&R?R?-?
E?G?><Sd???EI?w20??7.??dRM?<JQ??(??MnR?j??????N?&?????
L&L??>?}N?D?:?s???@??	?	?
???z??|0?????0L?
?iV?,??`0?????HY??Bky?%????2?s?{0A+????P???*??,?|??{?	???pU/?(?N#}?T??R:???o?KHk?KV????1?
??M????0??UJ?	???K?B??
?]?!
?wc('0??P??hU a?
 ?QC????VDKQ??i?:??x@?H
?H??B?b???dl? n?N???p ?? ??dAu	r?F?|y?Vb?v??U???\?f?S??v??"C??,r<h??	i?X?x??9 ???q9p??*?
dK,z5k?*a)R????-A??DaR	D?;????Q|Z2?0KH?1??P?@??m?>????m.M?
???T????>~?????["??x;*1F@?E???@PZ??*U???)??>??
?s?D?g?3?????E9,P?L?5?bf^8?7+Qz%???s?D.n??b?????^???1 ?,-Y?"??r?85??v??s??c????hQ???????:FT%4W{
??VjP?jt???sw??Cg??XJ9????6???F
?x5?Oe??2??'?N?%???Y?L??=?E?`?X?H???So?0????F\7?2^F??]?Y6H0$|\-?a??2C?IKGQH?]NX?<B\??*?	?????tN:u?@??
0?)X?mTF??E??(????
?????A?
??
az???9C????A?Pw7+b?????rx??E?Y?1J at h?b??n?FT????b?????????V?;rw1??ps??@D???????cagn??????0?U???k?o????i5??,)
"??c?z?F\jR?cA?w??????NI?y??6l?--t?z at o?3???Ca?n?3??O
#?m	???
gD?*??S????4?&B???]?+3???a(???V??J?????"
?:???????u??1-?rJ
?f?&????????? ?yI??U?,&???WL??J?q\`??3?????2a2!?B?C??vRXs,A????F;9?`g?P3,??0pHpq%?Pv??v?N??7???W?b|s???t???MSCh??	???o&???0?V???L[Yq?:9-?E)n/?????F[????Ii?????0?MaK??f?????[?????????-
????RUGJ??pI???X1
??c???.M"X??H?L??y1r?@?Y!*Tp?k?/(?&??] ?gP?Ub???fu?3c???c1??1?.??"d?x?6G?????4???S"DM{?j??T?5??w?C???B98?z,??????????0??k??fb??D?1?qIh!?b0*?w#??9??18E???
???m?'??D?
????U
`?l*jc?Y=?Yp?6m???foH??4??h\?%??<(q?X?8PC7??9"?	?h????*??&???J??????'N?MC?h0??Wz?UMb?jB?I8:<???:???	????w4????
P<??9???0#-?E|??(?A?N0?	1??? J?.)?q?&2h?4?????^FZ??k?F\1P<U?5m`???eY?	1
0Y9y
f?XD??B?e??M???9?R@?????	1m!???a<B?
?A?Z?0+)3??k??,?Q???0&??A?Y2T???O????Bl?????}a???z??????????j[?O?I=???.O?Wd????3??'??Ldj????UU[m??n????QbjM#IY?
???j?*???????T????? \?j ????RE??,?~???(???g?-f?(&JbM5??6???1???9?? y????z???VH?4G?/\QBDD?ocq??7
7~?????????

???L}?	????}????-v+?
D
j%y?""f??????U??rjmC?HdG?=???+??n?z?di??>?#???m????g??,z??@RJd?????????i??CsI!??hn=?O}??>?]
??1>.?
??M??%??T???&???`?????^^???Df$,JbR?'??iF?S?1???#v?????????g?????.?)???A!?I?????7???p?B?E?9????:??l??qQEI?RI?M"fQ
N!??WxI"
?=??rP#N?nE????H?x?",?
????3?`?Ru?{~bz9?N
?EX??k aB???A_?
;????TP??e<66t?'F??6?qk??2.
?S?w]??*???6??E?iaP?_uGT????XP?"1?}?B:?#3???@?R?*???'?<
)Dp1?w???,???1)??i?&?{?2
`??8?{8?
z???DT??????A?????E{??????Oo?J?E????a???;?1?{*?J8J*O?F????'??#)????)??'??1?????
D????`??$??(??QV$??+??[y]Tp'??V?s?:?pcb?o??[!m?S?|J}???B??0??????1????d.??x?Ub??c?_????"?-???~?E?C?P??!??Q?%??Y%-?&L???????*QG&???RM??????????LMd?D??|???IK?Cx]??M~%7k!??4?$EP?P?&pR?$~???t?"!?aXE???????:???v??_?w?-????R?iB4?=?<q?8?W??)?}
h*N??a?IH!?~????a?C?FM??????N??h?
[0??[b?dm??????x
????>????
]??h3?WBb???????G??S???????C??Q??< H??\??????+?
t#M???
-O#??O?????????#?:u???????"???W>>??D A?S?? EW?"?s?+??TP?~????%B}p???g.?z???LB,?7 ?ZT??????MI?k!???5P???f?\?lIS????{?O<??
ooM??L??;?J?P?x??x0(??D?????|??????????????'????P??5?????[?$D? ?E^?"H???a?R6@??eR?s?t???-????c????4??+!
????M??h?W!h[?@|C?4
??a????b=u?<sJl1Jj72G&??o{i??A?E?6??S????????????????mV?b???RT?Xhh??EO????>o~D?)?pb?4?v?U0U?J??w!? ??/1??+?<5?^??/ZR??$?/Y???yS??D2?-Hs2?S3?a?>??V????}??o????63?F??f???BH?????~#?G?W?O?i??
|?N?D?QqX?>x|??.r`3.8
????|p??ov??????rZP??f?????]D??zs???????????8?l?rI??): `??Lu??[???q	???????IK
???j?Yd{?ji?????aa???????)\6?p?Y????t?????L$?IZ??????a?|??P
??4?,???m??x?J\H?Ft????K?Sv?e?????3-x?L/(?,???????PC{V7?
?!2???,?9 at 3?2???;?$??#"0n??.??fb??\?S??vqV???????D?&f??
??3[?`????0????4@?S??????\BK????<b_~?}??A~3????L?g?{a??????<3O????s	]C??<??7`?D????\?)???0? ????Vr?@H~v??~y1?A??f?1??
??`???????2!?v??@?=???*?nm?? ?E?>Rb?}???????9?Bq&?y?$?#x????C~???????	"?\????"	F(T??~)??@??f?f)????z?I*???,?,???X<b~????X?z|???????+????J0
?R?06<u=0?*??_
1\D=?rT????"???O0??`?"?H???'??	u??#??????????X$???????]iy??0>g?."
???$?;???????2??
y7|?$???@??????b??UP??
0xy/#???ck?2z??v??B?{??S??X???????L??!?jG???DA??f?$V?(s?1?H<?????O???;U2L58;ISGt????R????????G?R?????T?1?2D????H?

?v 



From fedora-extras-commits at redhat.com  Sun Apr  2 07:12:50 2006
From: fedora-extras-commits at redhat.com (András Tóth (tbandi72))
Date: Sun,  2 Apr 2006 00:12:50 -0700
Subject: rpms/gnome-yum/FC-5 gnome-yum-0.1.3-1.fc5.src.rpm, NONE,
	1.1.2.1 gnome-yum-0.1.3.tar.bz2, NONE, 1.2.4.1
Message-ID: <200604020712.k327Cqpa006294@cvs-int.fedora.redhat.com>

Author: tbandi72

Update of /cvs/extras/rpms/gnome-yum/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6279

Added Files:
      Tag: gnome-yum-0_1_3-1_fc5
	gnome-yum-0.1.3-1.fc5.src.rpm gnome-yum-0.1.3.tar.bz2 
Log Message:



--- NEW FILE gnome-yum-0.1.3-1.fc5.src.rpm ---
????

??
??	??x	??
?D,2?
????
	?nov+?^hpm?????????@J&??I??M?6???[]???n?????6U7?P[?"?1????(?
??9I????%j?a?2.?s?]3fJ,??kb??}?????s.h?,_k?,?j19?t?),?<??_p?[t?	?y?"2?h*?l-89?
+?QO?\~A~?/~??>?????F?U???jG?st*9k????[f??JS?4???
M?6DWO??C??F	??3W?mS???Y??{]??W?{?t??#?|R??g?????n?? ???1	????'???;???O
K;e2
??u??}3?i2(?;?x?'AQ??H???#???a?????c?????7?9*4<j
Z<???<4<??\\T??s????u?LA??d?a>?????
<Z?4Dx????'????3???g?Z%?g?Q?????di?i?^???T?UnT?I(]????xX?
k-????2hL?O?N??8?"?d??=?D.?_??+k?
???y??????????k????_??}?x7???
?L
?mG?K??x?jy?YB1??O?B???
???u????
IlDm???+L?9?{?T
p?"????
M6!=????!???i?-???????	?-!?bj?u\??+???????w?l????To?@?i4????R????????W??
~OKp?
""&	????????Fa???
E??c?????,h?q??%'?n?xr??]d](:??=???
gt????ze3??o????????P??&w?a??1C?????wW?7??0.?r~????B?????g:<???x?Y?U?U?|g(?????~Xpa{h??$?2=Jik?????
)=?G?F?????
??\?8??u?	C??le??k??O???&Kw???M??c??e?>pucY???.IL?X?Z?*?9/xn-"??wb??DtM?y)W???=R?,?$r??}X?	-)l????x?J?
!??????{ %??M|?=??~?????Er?%?j????`P?+??n??[??g>EF????M]?,mow??>
?'i?	>?g?
N???
?H?[?
-p8??&|9???v?s?????????>>v{j???P???q??vJ??????
??????W???E?#k2??Z????????e???X???5tl?}?#<?![~?s?oe??	?=?iG8??P&????f?i??G?$(dA????<????\???l2>?]?[?D???????~?????a?Ek???o\	?y
??q[?????W?n?J?Tf!????ll#i???!?$
???????]?d<?-?
??"?????p???PH
?D??<????vl?+zaP??O?:(??????n?L??F??????/??O?v*z????+
?Dz?#M??1?<?????J?y7?]?
S8{"l?#"aT?j?F?v??'l??I???]9???E?(fK???s?(?d???????w4x?|???VK??D??\|*?$??c??`"?q`??3Q
w???????L?"?b?Z?b?6?_??????__?Sx'???'1g?y=???h???????8???e?JE????[?????R??3?1?f???v??t????eU?}S??????z????3?jx??dl???bY@??k??=P??S???????????2aJ?e???v???P?????:?O?
????8b??
??????+)???<h??T&? ??G???????@??7?r?e??O??C?D??O?%??\?cb
?
?n?.
??????????
!9???@?-?T=?]5e??_0@G<??l???????H? ??????M?XN??U#??
?SF]??S?Ol???q???l?J?
+????X?y?K2????t?~??fS??q??F???.?@????????6????7?d?tso??qm???(o~?t?%?v??:MR????+??DKO??D?????????-}?T???M??k?x
?'?'?9,????
????rR?]??O??gX??=????????#?ek??????y??_U
?????C?IQs?????????(R?c??
????q???D%?e?NN?e;


0??D-n?A????A?:u????h;>?0?6;??f???h????J
)??0A&??~a5[?G(?r???N?kS#?1m!????u
?+??P??D??g??k????}Q?q7???*#?]??????
??c????
?r??Q??@??\ga??hhB??N/7[?Wl?P??r-Db?mO
??$"
??V??3?#?
u
ho??%;5!g? ?Z^RBQ?"??,ej?d??6??-?
??????U???f???I1?CD?Q	????????*???A???Yw]?#3?t/ahl
'?????e"/?N2v??`D:J<0?"?A????v???n?Y(w7?M6;1q?r?^?u?A????'U????y?PJ?39?<'??n??????B?" ~?_?
??J?1P??'?~'??y?!?>/??{???}???XD|?
'???N(?	
\????;????F?????9???=&+????[DE$?(-t?=??m???n??Q
???G?#?8?????tM??s?????p

??+)???OK?zqXic?l??i>$??A&???}~?QBC????J$9?r?y???:???N????????????'????u??+7??o???w?s??
??X
,???f?Q??l??6Wej'?????x???73???xi?????Ol=?YH??&u?t?????;!b??+?*?????~]?"?}??5Q?7?h??,pVn???th??}????o?y?=m?c??????????M????????Oh???V???????/?=????H?_?1?kd?"?~?b]?????:?rN?O?}bp?F?o????]????pL??H??
R?q??H
p>?WG?N
??=??????????? 	?Q???
xV\G?`?T??p??????a?
i??3??m?M{?d????7??}???/64t?
eGMj??	???E???~o?JW&??X?pb?????2??H?z
^DF??*:?
sAH??I?d???D?z01???+??EX?b?t????)?,????WV??n????????%???
qN)?i2?ei?f6+X6?R??M???:L,??b????Rt|?(????.&?p?Gh(g????, T@????"H?#!"???_????????????c&??r??(??t	+
????'?~g,8wg??ID?R??O???=???9???p?n????S?<???`?m7???G?!??uW????g89??????r???mGc?e<.>??.<j???v???????0?/???U?V?p???4?a??Y????G;??g~??<????.??WN<?9b??N\ ?x>N??bz?3??9R?>RI%u?v??I?lF??m?z.???????wt??0F???}???
???]'???)?j?J?wB?r?c??Y?N????`?4?,U?T[eQA~??
?uN?+??&f????T??\3???/*???)F;P0v?yb??V???	??*!$?<?]??4??AU8wu?{2*:xd??1?J?TB-???p?$????"p??s??T,Q??@?K?b?c.Sz?
?Ub?T0PQs???A?g???P??p,?F????',??.?Vipf+)~??V&?????5??Mu?T7?h?F?n\?c
??6?aQ?????:?y{q???H{/yl3???OK[??????>R>?|??????D|
???S?>?????C?E?\,??f??z????_?J???[7??????I????dM??d?k????.v?L??????&%u?vM_?v?`i???2\"???l?Vk??:@?i??
(?2T? ??,X|???0DU??H")<?
????.?XO??_???B(d(??;??????l?=??OS???I?S??

???D??|g????[??????<?fj#u?x?????{hdx?o?a???N
??vk^?
??????|????????Cx????????q?,D?}?X
 8>?T?K<E??&???D8?DVv????m?x???e?;?p4w?%??.??7????I??????????td?b???v+????6?u??_??????x?T?h?T???e????s??(?j??"??E:??????W??????W???
?8|??????_o????B??l????hg?????????????
By???Eb??0?'dDP??!?O?X"k????C>Y6hBdO??? ?Gk???????
??X1?"?PTe?a?b?b+"?`?TTX?AQFE"?????p'?	????$??P?BiD
-????T????CV
P@?9r	!QR\?R??@??F(???T?%??a????RN???{u??	(??_v?-Jv?"T?H'u??n7???"??5??(????????:p?=??^?7?U??????Gxm|???{?@t??????X?!?k's,#?2?g?N?y7RD?e??N?R3'?e
_g6???VA%j#Z?(????O7?[???q??1???8:?]???m??6Yu?e7?0AQg;?M?t`;?????O^?h?_H?1zt^oc????qz??;????\??A??R??q??2??&???
?@@?
(??G????l?l??;c??zg[~
@??b?Ub????"I? ???ZBuR??.???G????~?D??5????v?Y,A]s
Yp`7?1?z??)?jOc?8?RE!?5?,?s?0???bhe$d	?|/cI3?w?LRE???`?!?D9?u8?1??

?????=??
*??}`RBD??H?????U[???r:?RLhj?G.?t?S=h?Y???????1???}T?-??g?????>?E)U??VyX?Z?????rOV?????i???????k?}uO???b{p?gVA??? ??}V??S???????t7Z>?'%????Cs?q?~????5?>???{?Z???d??+?????K[j?E-??wX?g'o?????p2?????>#?U?G??!?|.???u$3[??z;9??v=??????1??????B#O?Y6??ji?????t??7m??eN??	????@x`[?y?=w?????	??	U???-x| a`N????VQ???A?C0??_???`?'??2?	5?|?D/D??P??U<?????iO??A??V?a?$$%R??b???b&8?	}?UF?Z;?????Up??1J?PaU?`J?pz?@?@E?O?P%??q??b????,???ek??;H
 ?c???Ni???
xD????????R????o??0J???????r?rWYz??etl?
*?V*q????
(
0~T????)9?I	??~?!
??X?i??[??Q~???[=???????W=?????z8??HL~??????????N???N?^>?????
$?u?3w<?y??S?P?"I?????l????E?Sl??['fh?s?EGl??????T4???>q????Lf	f ?GW??x/
=??.????Ia??YN???G
???I?8E?l?ca:*?????"O??O??UQUb????????{o??????IURu?C??p???=?]<bD?3`&?3???;?V??r?(?==
?zk?DU???
 ?p?{	???Z?M
I$A???(J??
C?_V???Eb
E??V1D
Z?+	Z?UX(?"??"??b(???*???$
tl??|dU??????T5g;??c???">????d.?a?,e??[?B]6????X???@A?? d?g???W??q?????^??v??
`???%?1??????W
?\??H??er??|?'1?6?????*d?????3???P??z?E??OZ??????B????
?"=
k?W?A??C,F0??~<??=?l?t
Z?h?%????t8dB???W?z???.?A!????????
?2?=?E??<?b?m??^?w??W?????O???\V??-&^?????c<<.???]?p??\???????&|?6?,?DS?y`_??PT??2??#~??????6???</?#????M?-oUS?t???????n
??-u??}<?-???t?c???zi	O?zTo?1?((7
07#??6s????q??
???????Y~ 8?hC??!n?????;7?X:???{:?q?~???jd\n1???5??h6??k?D??(????%??????sTyP?d?O;??????:????3??E?nf??CH???$c?M?b?p???S??>?B??Hr?k???;C2{"D?????I?#??b??t-?&Tr??}r?e?(???????
?R???????w??? p??'????"W?6?8??_~???U????????K%??b???=x0?e?b??h??%? S

^?5i{)|+?|?j>??}??O???b??*-P?????????UEX????9????????AADw???V?4@?e?$a??8F???R\?l9????????
?S?????
V?e??g	wM?g|??N??C?}?k?7
????.W.?!???F?z??u???U???0?)'??>Q??@7?*<=?}!Y??0?B?!????KXA?W`??%?Z??XC??????\~<?????X?;?????g?C?????D???J??S!??+??\??u$????KY?_????D?r??fp7????2???v???7?_8?C?P??p?"=.??VL:?????OJ????3?<&q?V})Y040}?????$(?,>f?%	??3?? ????u??N?n?????
?o???A?????J????l
???1C"?9??>???,cq???l
???G??????CV?;???0??
??b??C???u?e?a`U?GD?&7
e1	??????;????????~???H?W?`????kD??6^i3??4?SR\?XZOE??i?????o?z??m??q?/??JB?4???-!??8???????H??@M?A???Q?n5I?(
?qte?"jm????5)?Un"[3|???o?HZU ;PL
???$=?#?&????T_??Xj	i?G,7?G???v???A??@??B????E\?????K-0Q>?????r??|-@?u??>$???bc"?
[??????????~?Q?mKR??"????cU1?Z?-|????Evn???X??cU?z?????C??>???c?-;????m?V??H0?q^R??t?a^9u???F??0??}???`?bp?b6??&?fY-C
,O??[?6xI?}P]?x????7y(???????c?? 
E??S"
???i??+is?EN?nx
??F???a???"??N[j?w?{??.?~.?\+??K!??t?~^??i???? ?-?h????JfZb?u.???_??Y???S>?(????C}O????y1?t?????])?8????
?/R?*??H$$??:?VC	????Ab?j>5?o????????????;?Yt??i?????~6?C??X
?ta??r???U?f?sn???x??c??T????
c??G?4?RcJo]?k"'?
Q???7>?6???A?T???|?	??????r????K??_y??(????Bvm?,=?????O?Z?xb???4?g?f????????P???*??IDRF?????r??nH?T?{b??)`?W&~e???h7?QL=??c%?Gf????BZ???????J????????Y?F??8??v?j~???.???T?]#????[?dl????#+?j?@N??G????+Doiy]?c]
???C? ?c?
???$?=8???\ ? ???IM??W???X?Z/?????
??%?kw92Y?A??Z??i????c1?\????m???I?.??&6?1Q??z?Tl?,????

E?gin????D[J????????V~1Y?O{?i?-?=-??D????j?C?ZExh5$?????????X??zE??*?????????sUh?Pi6k?<^?0???@?V\?g???f????2????l
????s??m/?8f?J0_#p???^??Y?<??_S?\?+??;?????????????s?5?*??f3$D???&X??f??p?:?4?.3Xc?????%??<?3Q?]??x???a'F??V??}?w????{?%#???Z!?]	
?????*???VO?7$<?k??~?H?j?????u???p-R?D?^?XSIk???O?^?1?1t?	?It$??0P/?N?E?&??8?%Q???'r??w?*?????????^?l?????w7?:?^3????yu?P?A?ox???N
G9????>??22???73?PM????I>??m????????T??{2n?m<?m?3??o????W???T?`??
k?m?M??a???|??????"P?.e??q?;??4c?????"?t??m?XRS??o????]3ag???lQG??]R??????"???v)6?hT????wN?}_,`??o?(?r???"????I?Nx6?i????D)C?#??MD^??]???|?(?T?h?1?Z????*AO?w????,?????
,???[[???J?tX??aG??b??.?%G??"???;<??4???????G?e??V2?r?U?j?3?O*~)?2Gg	?K???wV???`?S?/????{???RR?+????:?W?[???]N????y???F2??Y??bD??E????W?}??el6????????????)D?6??@h4?]?Bo?1@?u?,=??? ???|?X?"C???dX?R?:??b?U??
bO?c?@??S???4;k5?p?F??;??????vP????
??_?R????
]?*t?u?o????? Y?'??t?s????g?c??u?!?'??``?.Bd??*d?O?Ek*?K]SI???hr???{?>??X?h???3?"?9:W?1?!}?O?0?F?2??
?"_???????u?\W[???d??/??4?C???e?<???????x?????W????s??Q?/?G<Q??%?<?G???@?fB`?lcp?
?Y
?????a??/>??U???#???????
?P????y???m?~?U?s[???1????#G???&c??L?\OU???????_R9????|\:?}>?\??????Jm?e ??
?/B6)??(o7??????D??^?''?????????@?@P??S?DW??'?????'k???????=?Q?m#?????? ?!??
??R?????]???~?$?H?`???D0??$X?H?U,??`??t??H?P:2
g???H?@?,cE????? ET?
??M?!?Vf?P ?Z
G???%????F?$H2?,$P??R??1J?3???JiT?idd??d
0*D???X?PSQ?b ?2??y?
>4?x2IA?J?
Q??C	?????BtN?b?n?J??Y"k???I$??Hh?!?zt???????:6???????????Q?K????4b{?
D7R`&k?#^](???T?;???1Ll????]H???w??
?:?q???r??{;n???DA???d?
Hk??a??h$?S`????]?	?"??*?Q
e??`aH??K?
???O&???$|??C@[ 
??T-`m`B?????*?N????T?b?`??/????#?v???zPY4????3H7|?a???af%|????p?C=
??????Aa?;????O??2 l"m
C-?0"V	F
?)ha?????P?s
???U?J (
*?"??(d`))E?"??#???W!0"Ie??,??&(??%?
+J!)??0??X(#%?J??d???p3]>?5?	#?	?vha??%($0I??I?Ya?h???"d???P
 q?:+??3??o&?RL?,?I????D?I?=?)&?Q???uo ?
?r
??l?KT??1?'???/
??H?????m??I?sUUUUUUUUU??
"??D?"D!d?;*????*???2um??????h???W???u??L????sq?dhT??
?)?S
?-?m!-????
??ZJx???f,z%?????%??{???sz6H7MN
?*?X*?6???UJ?????UPQEX?*(?ciQ?V(??Ub?TZ?K??K?.???????&????^?v?i???'??????v2?~???g???m`?T??q	???:R???Y??{???????????7>?!d*?v????@1??s??g ??????wM7_O??????o?????~?^#?l????t????{?v?%6H????H???*
{????
v??????&}?????^%vO
?t/h???N?P(??S???7??p?98?f?!?f??.???>???E?`??i?3?g?.@?C?`|9Y0)?	>
??D?1R(??f`T?b????\X?NqE?"AZe?????????3?
o??&2??JL,P?*z.???%b20X?(x??/?????	'X?,??`?????b
??
(HS R?D?}q$??hea???j'??,?gC???uE
H??
%;?	@?B?5R???Po/??q)?? z'??\]????+r????,?
?a???|=?h{[r?{??A??8????b???aG?.=@>????^[?D~?0Z?]?W????Dr???(?rc3?t?T?ut??j?27?vTG	???hHD????.?t?2?T$?m\xQ??2g<k0?J??Sj?73?g?????*zSo{<???68?n??A4???k????2??@???>??/????vv?9????&??5 ?"(A`?dSY1N?$?D?8?~?s??^????0a??:?z$6'4?r???????|???;?.5??gV?u??8g?uc1??g??!?[z???5o??S?z"??>=???fx?Y???&?M??A???????
H?? ?s,??????f?@?@?!?7.?~	/Go????^#???|?d?2?KI???b?lT???8???yC??????RN????tqR3Y? 
!?????R?T= P?p?m),?4|?q?TTC?????|?QP?!Q???"????????5??$ :???D\?????}?n???????2?j???L9}???p{?@k????bb~?????P !?N??["??zx??????x
;????9?? ???*
E?c ?H
DI
d?$?$P?
??R"?H#
@,Y
@DQ ??,?Ad@R, ?"?

,?XAD`, ?T??
?? ???E?!
?A??b??DU`???dFH?
??!$b*?#
	?"?1b?"??H?#
b??1#??"	??b*???? "??1?AAHI ???*?TX ?????dA?1?0D0dA`???
TX?/4???[?5???Ao?f????U?;?@??
`?<????u??Oo#Y?Y??W{????_}???u??[???#??,k??v??t6?o
??J<R???|\M>/??H|????????\,Q????D??)R1W??!6???8{,W?zH ???x?????f?!??cUh(]???.?TB

A??????h:?]?k??y??j?@?,?
`?i???;E???(tD?
[?s?*??#7??-?MG?yIz??m?vt??????^/??"??_?"????)Ji?Y^?Ju??,?{R???V???W?4N??t? ?-2??=oU1D?{^???J??b?1j%?iw?????1L??:r)zR#)?Q???g????^/ui???xYe?(??O??F??r?(?kcM6?{o{??1??F?
?M2???7?\???????U2@F??\7?~/?~>.^??o???1?^???}?9?B??????C?????????v??;??_g??F??W????{??????3U?vs???lsU?Y?*2RBo??????g?B?P??v-d?@?|????#?$Ea5?.r??U
??2??JVgG?2??T?=?????OwG_=>?'?6????f6m???v??e?u??g????4?M" xb?}?:?
?`w`?z)?\4!?[?0?R?????7s_"]???????
+?B????y??{;
??7?*?CD?p
]?j??{r2O??JS??->9?g??
????????[??nM??%N???C???L?SvL?F?,.?FCu `?v3?'_?3?-??Qq?B????????????rrs ?|??\?^#?Yo!4N??`????C??D^q]Rt??? ??8GR?\????Q??V???(c???/??~o'?F??#M????
oe???w???,|LRW???oj6???????C?>?????\b?|=l????P3&$B~M?=?un?d-?5??)o?	?ccM|?@;D0?8??1
mm0+?T=A(8^}??TKn?r??w'U]??^?Z???cO`7?Pi?RT???jjN?#?i=Y??????[?Cm??T@???
?^K]??!g???T?4?A??5QL?
%m???&?$???3??t??E???zgH???? ?0??}??>F???Ux?54???k?Z?]~P@?w-??}}U^?-??????????~?L&K???A<,???i??*c,?	??Mj??C??z&E#??N.?;?UF0`3??x.V3??z?%F?"???????<???G?,??5!W?9?\)?{?-(t???9?Sxs-??????]E[?SaF?0??j)>?ufm??!?1Pk7Y???Z?^]??E)~M ??Zx?o??18p?6?su?
??@?G
????f'?????????O?t"??]A???=N#(?k}8RH??
?(????7xY???]<@y??f*T???3??2????j	?*??????
.?(Ar???l?6?|A??5=$q???zn????:?_wT?@?Uj?`?EZ?$?#E????FfK????????Y??$B?H?4.?M
?@B+*??Z?O?c??z6????ns?????????^`???p?????t????-[?9??????By?	Wa]M??????B????.,?H?I?????m?e??????!?_d?O5p?????9R?????z???????S~?M;4???w??_/^?9??=|?E9Gm??#
?????9??[??????>>?&???
?Lq?r?*7??F|?L?)g?????:(H?0????:I?v??}4H??????????<'???J??????d?????{??Q??FJ?X??p???E?E.??8?;ra???\??nMS????:??$Y|??.!v?u?HWF?5S?O?^N?/??S??3??????c?"???mo??E??`???????^?????m??m??m??2???n????0?c{????;??}??G????b]??????O@?????
)????????S?{%/QS??]?E?%]??{?^?{??}?"^)??o???Mk?U??~m]#???)V?????v-??nD?d_m-?0???}&1?g?|mg)?;??Y????????7???5Lk
??F?_?z??Q???S??Vl????6U???????F}
?3G?/\??CLj???_J???+S????F???G????uv?????=m??
"??^?t?(???2?????@?~]z?h??????O(t??ys????ho??in????O?cNk
U?<???f|vk??k6?5`?
?<?n?!%i?1?#??~5J??????cS{?????w?_?y?vQEQEQEQEQEQE??oc???????#'????+K?7i?p??[0na>?????yy
?v?e?F	 ????;??O?e?#H)/??1??V1??@???3?i}F?k9??oR?,?D????????~??c???pe??[m7?R?d?l<b??r???[?6"Z?T98$eY????
??7x?2E&??	?C?m[????)?]R?W>?@?Wl?IN?}??#?AU?????(??)%??W???z?i?Y????r??n????L?9?vLe????VS??&`?3G]V???CDX???f????.e3???_?R`:?D????????V?~B???~?W??1????Jz?w?????{Qv	?^?y???m?-????????58!fF????????!_%???HQ?q????j?f?DT??????a[??N?3?n??x??c?	??be? ????c7???IG3<?g?oNt#?`?w??	;t?,Hg??+????v??+??\}??u?{F0??&iPc=????????C????~?VB??||??tf?s}|K?{??:e?X??%???LD??	???4TTs3o???^3Nq??|6m??mg@???????w5??	??t?l?i?'?qh??v?r]???D9?9????z>B?E1???L?J+h|g^q?????~*??{??;y7??<??????????+R?-??????[Kim-?????m-???/?5?={>??n??=]?<EE?\????TY???Q??I???c?=?]?????!?s?C??F!??Y?`??@{??{rK???yN???e???8??dp?O?!
 zU?j?Vj??????^???V?6?????????G?xO??z[?P?????9?S'??????v~???I?e????G??9
??????t?
}??)*?E?
?????q??%???3$??"?}??"???????[?p????d??'??O?5pm-????-??}?9f?s9?7vU?`??V????=c????{?suH?t????Y?]??o???^ff?&???yE??Jo|q`?????7D8?$??A???q?e??%'5??y#?{IgP?et%??L^}?ry?rr\%?m??{?P????
???[?|<?%wFqT-?9?l???-$?m<?????-,???I?
lR"FK?y???/?f???????T??t&????b\??#nS,Y&8??
???(?)T?Z?'??S????z?NK+d*???F?n?^?2??????$_?_!$Pj)??.???9???=??s?L???????b??MZ>?M???)?tS??)?^??MD?? ??H}??-)L??L?AU???zu?y??????e???Y????O???????k???l?J?'
K?74?+???0?U??|????	?????7D??{?z
???P?????"q???d#d^S??s???iJ1Q+???y?W??!m?????q????	#??	?????
Z+<???M?s???J??	??U?8??8s?7???Pu$]^
?G1??E$ii???vm?Ym?|?)a??I??????9-???C?	??W?rs? ?~D?^??Wu}ZF??"??jRy?o???-?x?????/;??dfV	e?{???C?<?w?'?????K?<q ?T??g?'?_?????s????LS????O&??#f?W?"??C?7I>v%???
?{	??????c??
M??W>??S&?Q:???$O???2?g?iP?e?E??????aU??????U????A?iWe?Mu???Y????U?6??Zo??D?S<??}^??\?&s>?u
?ed?G|??????N??
?q?T??.?"T?2H???
??
W??>??J??????7?????3o??*E???H???ap????`?/???~???Q	?5??~A??
<?????'
??{2?-s??v?5????a?F~gd_"??e@
???{?\?;??,?$?2??_?3>5*N??u????`???T?*?'?Ff%k??a???"???.?;?k????}?,K??Vap?a?eo)?>???P?!????E?(??K/tb?&???y4?*D?H??b??U????K??w??
u
?B?'?t?#}?)?n?|
\wk+?A????b5jkF?D?V???G?9???6K?@(?????_?L???T?72D?
?o|?J???el???0 )f?a2?^??kn2%o?[}4?????'?g?7~????2~??AR??h??hh???S>??=
?|L??f?Ky???4???3K&??n??Q???w??y)?KUa??????n??!?m,????f??Jo?f??\A?o??%???i?t8???_???@7?????{)????????[????d??s??{??3xH?1Q[??`?	?`7??:?P???<?.:v?????4?C?,tu?*	?Bl???;'e~?/F?X??=?QPf(9?4????d?????)??<?vl?D??T??q&i{???w;J{?Q?~?H?<???F_J]T?s?a?.???=?/u??p?
?V????K#^f[%$???q%?W?s
	?<??`?I?3L???|???w????GA?<h?'[??N+>?SC?R??y?3???c0E?
b$$?]&?k?W????b?W?p?1N???9?(0?z?>???&nr;???+?iw?p!?K?~)???T???!R?Q?Q???C?n?????????:r\????K=%??????97?uF??]??(????w{{?$;+??&@w?_???????r???]?a?#??????Da?%?SqEY????.x?R)D???xL?^??Bj)s?E3??[#???T?J?
?????~?x?E?W6???1?????5-????
{m+!{J0{o????
????38tKf???G???w;,?T????I?f??T?5??h?]!+????iQ?|????X"n_=_s??]'s?????x?????G????????r{d?e??
??????=??????^^g|.=k?|??hN<????8rRE,]???	??wE-?f\2???tR??H??E?s?M???I)|??g=5??X????gf??+f????
?C???w??\?hl?'<?w???.?o?\????(Lsd+???y???????E2;wlh???????????t???n?B??????u?w`???i??<?L??x<x???G]?#k]??\??~??8'iP?????_~"d
?$6>??'??D%?????<0"???????Wf?G]/?e?????
????,?2??%?J?^lq`Y??????t???nj?E?eO?2Y?Fj?;'n?
???????????g,??'?V????!????~e=?
a???!0?0?um
{??~?a?????4??Q?luM
???k???K??*??)_?_~?M?Pr??a??,@???G??=?)?W1p?(C??c^?????g??@C?
??????\?s???	???P?&9#?P?q????
|?????mk?y??WR#i?d??E?"????$,e???]???t\??B???LD???|X?????ui??WK??r?s?0?'`"?uk?,?/Y?????????`	??????8????9??????#? ?d???L9?(??-Cr??F???????????S?!??????Asaj?'?&???=n?u?>
|??6???^q??3k??<v<????][;z??
397????tr???m}???dt?b??#qC?8?5.#?"$?p?v?#w?8???p????iH???CV?[^?mW????'???-??1????dI?7u??
?e??p{2?c?q?ZnBo?b?I??S?
e?<H??k???	.?????!?l?~?q?#?T????2z?W?s?9??{{=??i\???Z:????%c???b?????8? ?VT?O?I?2???v??
?,???$G\???????z?>??????????eO?)??
??`sUS?#?
?????d?R^?[_????=??????????7?L???j??e?f??x
w??B???K?????1????]??????&;i^???e???p?`yO?C?X(??|"H?:a??? b?`?gT??;+uL?h?C0?87???k???X?2t?e~??5????|
?s??????^?7
9?????lY??????% ~???{???q|k?X??#1?!?7*???N?T??{[4?Kh?s?'C??
l)?ceu-?y?/??P?8?@tga?????	?e?#.HL2n??
Qf?o?[?.??9t???a?y???i??F?,0???H?*E:t_?ThY??i??????s??J?/?D????\R`0?
????,?%???u?~?u_?????hCsgW??????E?w??}??????B????j?
?,x?|r;q?_?'S.?_d???4F?
?H}J?tZY????
X?#?H?w?:8:?'??????mX?9?q??w????Y?@???8U5t??????)W"?lJ????I^?	?R?p??8???Xh??Bm??|???????????a???K??????K??L????????-??)E(?^C/??/'?d?'?S~???t??K???~?;vGL?	Ox???ON??%L?B?e"???Y???,#??Ev????????"
Z???<?"hZ????Qa|+?s&?\?nk??C?,?8c]??}Q`cR??g?1

J???Fa????Z??????Y??????t+M?!C????O,???*???`?????5???2????::?????~g,???g??>W???`?gg?j????R??J?????c??J?U?<P?A????a?;??oQ???]?n?hW/<Lq?R,??H???M:ud?<?????t?e?J????,8)?ZM??B=?XL@?i?_?i??QX?G?????D????????S?5+:'?%??yU??SO
??KU??(????5b9???m?c???c?_???T????k?k??h5?U??G?:??_vcw?????[O8~???^9?tz??; ikM??S??k_>??????w??/?J??rh'???w???????\??{?LK`???
??4?F?$??}?
S??
???	??#2}*??UD?0?s?????<?/|
?Q????T???9?-???r?<Y{{??a?V*c?|%?????E??g?????6???q?&??o??L?O??,????????'lh?C)m?!y??!?HH??%%]	=????0K1H??9(r???m zAD????`3~????D??x???0??r?`,?{?7??3?????????H-4{??S^?n3E?&o?[]?TV8??dE??D*"?k#?V
%?f??}?8?????\,:??"?O??S??J?q{oJ~???????!?R??#????x?
?=??Uh??v?]c?r+[w?R??\??????&kR=J.C??????w?????d???
?&%?????N!??;=?%?
??+?6?S??j?Vc_h???c?????'???
?&?)????2?T??UZuq?d??pgL?9?o;sz????8?8zQ:4?-?)?1 ????fW7?r??HP?4U??q??N????I?/?(f?%y?.?:?;u??
:??;?\??9?Fv??????????OT???:?5?:?ue????X?-D(?\hoI`_l????>?y54?
?
?
8??+??????
?3F?jq*??)n6V?D????&Z_B??G,3S%?????fG?O}??a??`C?f?R?{j?_??06???;?^A??????L???U?1???NO?<<?41?8?Leo????SG???Nnc?F?????
.??V|-???F?=W0F}????`??sI?HRL?2R\?]?1??z?C??
Ydut???_??
W????????z??\Q?-X??z???L????B??o)???N?n?KkNlN???
?7y>b)?>9u???u???s??-??????hH????????N????,j_B?<?
?iz??kX??z4
_.??W?/???w
=???N??H3 ??8??G?`??B???A?O[+*[????lC??????B7??b?=?of?`]e??W?P?3G?"???M?*?????5???q?I???	 
?	$t?%'??X???(??k???X??d??	a?_I???????
ie2-?K????6e6u?V
l????YUH??e9?t????x2%v(???m??????????/L?Mg3i?		t??E/? 
?N?P???\???'ng?Q???!V?#"$ ????@??n6U???n?<????{???D?????i?M??
f.?????;?????r???,#?Z??????v????????Z
G????`?V?????Y???z???9???????O"A???1?Ci??????y$?o???`??W???/?d'?$??1????2?"?Xo???<|k?{???9?5>-?Sa???8??r0?W2????c??h??-?<B??'?????*?hd??~N?9??\???y7?Y.?????P?q????R?i_N!?1??}_???A??3???PR~?????2(=????p?Y?e??B?t?u?mq=?R?k??????mpW(8<2B??{mA?TU?1??.???????x[??nF?/??}?+?z??P????A??`1??C/7L?CH2?Ic!?P?*?ue? [??X\?CWHJP?c?rxv??J?>???k?~Z??L?dW>?Hz?!???A??,???????g????Y	M"!9L ?!/ ^]*?+?g??_?3UUgB???an??t?T?????S??)?????U?*?:?N??????:t$??J?????J?q
????c??N??s????4,?J??#?#p??z?? ?D?$???u?????&:?C;0A"y?????2
V??????\????N?.?>W??_5?kR?b?L-
GZ????0?UO??/?K???jby?S?H???X|??zX?GC???shGA?V????Td$%???r&0?*?? ?*?????6oj?`Ud$0z??@?[?o???????x?G?u
???????}5.????d$!?~?)?2
???*???C??`??,T??"???+	Tk(????O??I????b?-????:V*?????Uh?U]?u-W%?~O?t^#3?J?`??9?Y?k?K`???)`???UUV ?????uU?
??qj??m?8-hR????.]????}??O`tz*?5???=iJ?J??Qo[???e??[4?????)
Z???%%??@fR???!?Vq7?l?P?p??pP?*??&*?|?."\?BA?6lB?????%?L?@@??
-oQ??2u??N??}3??u???
?????|??5b?+?G?????W??:?^e+&wYfyu?n?CV???????p????~?c??"".`??8%?????)?gi?d ??|??5????g?b8??Pm??<?-??E????s??+'???J???y???L??.-?????l
?????2L?????<??????;$DJU?*";?+5??{??=??????????_?z????r+???c
?HH???'??2	?	????1????????hu?.@??????5o?????>?[ERuh??C#???????EUL?-x??L???z??ZT??w]@??r?5?h2?????f?	,t??Rc??P??2???F?????"*???a???Z??t?H??S?J+?C?????(q?@_?8??M?I???Hb???UQ]?c?I??`??!?????????
?Fcg????U
X*\?%???}?M???gD?I?(3??
? ?()L??Q????cN$\d?"?E*P??9?2???8B

?????C"f??????x???\?ZKP??"?"
?????T/?=?'l"??Wx1???e?????:????oN?v?(?t?I%{?hO?#??9iT?V?????MF?	????r~0?
?X??	?y?q??u??}7N!?? ???????l?????y ???yMYa????u????v?\????a?h`???????:?R???f??????1v?_`?3?I??,j4par????I?|???????=???)j?,????^?*?MH????R
?X2????
?
? j??Ri?3?}K?WH'???8?#?,F??F?C?2#?>?EW????1???4?#???*8z?#]??
??U???H*?b?GP?(!?HF?4??-?M??B??c!?k??Z5{??????$>x???1?^Y=??j6?v#????J?G?("G??^H??C
0k?{?5G???yX?Y?????W?*a"??]?/E???2	#"@????????????{_???}???7????)??????^?W.???+N??E?u?????p???
? ??:??<?gO???
?y??w??T?%*h????
?y)t/p?2????Pn??zs|??HcP??q?|	1?&?3??!??
5???@)?4???tl}??Au??dB???A??[?xS?.?'?+>?:M???F*s???F?/0?Y?sSe???=,??Y???C
G??uQ?D`?qL???XP????
?w?`??@F
??"? ????{?!??????y??????
@?<?B?B???&?????????hg??Wg?ai?=???Ua????????V??r??mw?????w?L/??4O??
? ????????'???@??o?8?b2t)?,?????????????X0>??k?@@?#?B?w?p?0/cP?K[???u?????o~?????
]wN:??C&???"]?,n??qaZ>???[b`?`h???????q?o?RL?v?Fv????^P^/???T^bEUd??????1????,F? G??u??J?:p41@?S
??Dv?e??y?.I??%???[??.a("[&s??~yk?zy??????_?z???|??7???A?n???q??N????^dw??R???_????P??|UP`???1?!?C2?????CN^r??????`??Tt|??5	???F7)????????D}0J?Q?n?S???????%(r??[?p???Eb?q??v?q??_?Y?o?S?)
?_o>?9G???.x??b??1?H"
?e#??t??T??Ce?u\M;{??s?'m??W???Q???J??}??N/G+S)DL??0?$p?j?????n_D$?f??????3tA]}???x	??H????????H??J??%??>RQ??Tk???????c??(^f????
H???"????_??r???f????y??C??3~?.4??c(????\.????5???;???Z?#????)?????/?P?,???!?e????n???W??Dp;????h?@P???8????{???????`?u??M<??.?XKQq%?|?Co???^?,???t?:1???S7Sw??j?????T?1
??@.??@???? ?(z???T??{h\O????L?@?a$?2H?
?d?j?????d??&*?????r?01O?	FD????????k=??V?k??$??;??
??N[2????d5\?_????oB?k???`????<[L?!??,??)??"}?K?>I??v????38I/O?????>??:?s????9???S?v????T?????????R??????t=??=?,?C????N???*l??8ot\??)aE?rO$??)ad?Bi%??K???d!??Q?k??U?~ ???3? ?T??RqI??????UD??*'z_?C??;??5?N?x?>?'c?QUNY?cEU???x?????????7?^???d???????NP??2=??A+U?J?u????9????{?8|=???a?V??cV?&????-??^?????#*??????8???#_=]??:?W????x9???o??S?s??X???!?????H???&?`
N??=?M?pE?z??~G??nd????x??CO?0??8?=
?
U??j?rD?}?$?za?I???i?b???hI?J?????k`???>
U???6c%?]
??Qs?z?J??J?\L?t????s?K\1?N??*??M????"<??))h?7\x?9??k
?q?h?]S?X kE???/????8???6?I2I!S?bI??tn?^>?[??P???????2k??1?VUxRQ??s?sDI???"Hi
C????#?-t?'q???"?T????c8T.'a?Z??l??3?g????????????U?RG????*8??m???
???}?????A???????3????>?.?A?R
[...1665 lines suppressed...]
U4B 
m?8???n?B???,D???/??Q}?O?}r??~s????g?????X????????k????l????*?Vm??-?3??U????F?dR{?$?????b??=f	?"?X??????I??>??????@T?V??GG?-??g?????o?4????7?%?-*u??cIU"%%?n?M??bD`?????p??E6?*0?&`}???l#???~\??"=ga?`|6E???%?A
HA??Z(??0???a?B??g?%?
8 $ ??Dqw$?Uf?zic?w@?\?5(??r?????57]?	?.Q???)??M??
???1u?{'6???q??c????.&G?N??u
?![S??
????/&??LJ?e?? ???u?\?gS??Y<??#?2?u??7?}??o1????h??,?N?I????)???"l?o?m?K???????Z?M??????V?t????I?$?Z?L?,VF?W:?s??--?N?%mk52??Y?]?W??<y/.L7`Q??7??
#`aTw?
E??G`?P???-?AC??W?lDn?????6??	g??$??C????Po
H?P*"?B???????f?X?m/e??????z0??G??s?LE??????????p:?e????dN?????p??1OO6,????PL+?K????@?;Xuh???J?????l?k?I??xj???Pe??
t??R?l/.
??a??`7E`jf0R????$?{??\
?4:r
??????????`??K?>?>???????D??C
F????????????g&??c7}?????G????}w?l??_??????)??J?Z*oR<?<?A?nl????-6???Qj??D???E[E?G???=?~l?E??`?as?S'??%L?~??Kk???f??O?D?L?J?????T??d???????EJf????
??????{L???ZM?~??????b??????T???Ph?{$9???B%?Mv
??($XY
??BY?;g,
?m?%??P8?4?????xo?m??(Q-s:6?`?X?
v????Jk?R?,???|4
h(?
V???"4m?>?6M???K	E?????{?????E???m????
?d?'?i??????]??u????????}S-??t?-*B???[nZ?c??m?25aM??J?J?(h)????&K?]?tul~????Q????	)T?:6n?%B?
TD?
d1???X?y???'?1???2t????5!p??b??Q???'??????
P 
{j,!?P?N?7WK.??l^#?A??}?5='4??S??z?k??2ld?N???zk?	E\.)?f?R???IQj???????"l?a??????'??A
t6?
?????4zN???lX????r+U?H~?4K??j!K?d??I	f????}M????-?-?,V???	???<?1|R<?
???"@??U?d"??a???{?)?,??_6
2?D)??4?Jgyd?;C?????o???2T[2?P^????
&='xi????n??	??Q2????d??3?x#??JF??A?,0JFRX????2i?I!?Kp?b???????x=h?<???x	
?s?.????Y?{n??o?Ct?i?a?????"*:Kl=?Rz??"?je???%dr?aM:?C$?)57?
?%?*h?U?P?,e????_??{????'|Q??Hy??`R1?????i?(h?N??????GC,??DL`???:?_f?????-COI?q?e??m?
?]ua???????"?
?B2??u???????		=X?s
??(f??????? ?C?70????v"??a??Le%b?@??KAbn?d?Ox~??h0?R?)????
???(?0?S?9l????o!}??
*R?+??5,cNl??????e????&?HY??3???M?%21$?`'=?1	? ??#?o
?SE?]X4??6H?ad#???$?!?J??H????FL5??+?&?IU?A????]A0??e??q3??D-?Z?E}???????s????????c]??????>?O?5??!??{???v[???D?tO?j?&0??ZZI+gY???l????6Cx???Y	>Dp????IT??6???k<G???C???
????(??
?K!d???j??2???c???H?;?<?=????JI??(>^????????N?*7d??n?h+
%?0??CE??e?`xGM??
e?,?\???n|?/mhQ?x??'@"???l??????c??~ZKO??~(??0????p?Tbcc>???u>??r'?
D?|?????\_v'???7??Y?????R*?????~??Q????????j???P?31^?o?:^??? 85??M(???h???[bc????B????*?K,????"A???
o???2?Z??????Y?;??Y;,?-?????R????De??r
???~s??x??$??AM[??^;??/?1?!OS?Uep2C?X?1?Q?????.F\?c)?????$L?V??	B????w?D??h<a?:Z??q?h?LQ)	??7t6?:?
?!?o?? ????P`1?K?3?;R8?s?w???
?IRRW??*?tt??7?????L?. ??(R??.b??w???@??PF?j
H:?7BtBhL????c
?9?	???wgPZ'H???'?lz???7?~???a????hh($?1?????????b0b?}??"?x?'?cy??S???;S?@?RyU,,?uq?C
???%{~cN??h?'?TJ?>I?-???N??ZN\?????????I?C??G??(?!|=???%@?4?B$O???3?D?SR???&???o???oS?M??m?3?
??9rV?@n??U???	?,??????%????(t@?N??	-*???>????????nC1R???u'??)???L??^H???A????^X????D*???h???N???k5????P\???$?+?w?D???e???k???0C/??E?8h???7Aj?q	?c
$I??a?dK??F????:??i??av??r%p?????f?7?UI]?~L?)P????{}?+1?2????#??M;xpk?a/?u@q	????????%Rh??>~zb??s4-,?{db?A???$!6???????\8i????h?K?,O?????
X?+?646??4?1.u{??|?P4A???B?)M?6??5???"$?
???T6v????`?D????~?&9L????8#K:;??{4
?(5????y?"????T!?w?]p???4??T???\?????e$M8`??(H?"??B?&?\??X<?????#?2?RB
?6???
?JhZ????YK?t???p??/&a-?A?0????I$?v1H????@(Pa+i?&??0??$?+	IR??N??$???'F?G?Ma??D?*??/???c?]?KQ	???qKQ?f????u?6??at^??H??>?AV???1???U???>_?]???f???*????vC}?h??3????d!h??CI?9?+?????)A?"&?AWT0???????v???????7lG?????9
??I?"?<?x5?

h%bI??????=`???	L.C<n????#?(T?K???	??SBHA A0@???/"????4[IL?m?F?
??f????vtGE;?o?m?`.3#A??NH??l?{dp???;h0???d?D??
?]?4EKK$????(kb??f???4??h"WdsK??C??????]???!?#}??F
??^^????^???d???f?
`OI?)??N???U??,apP@?????X?'?&d?ER??????)???????x?%????IV?8??u?g?? ?????k|	?
?r??5C????#~?x<t?(?{?8???=?M-?	????~????x?O(??9??B?Q1?^?eM
?9??!?C?i?*X????I?im*\?
iDA?wk??	?????Tt????m_?T&?+"J?xS???`??X`#??*??p?g	"?PL?Y-??T^x??~?qHa????J??R5?Z??/K??Ix?_>???Jn???@3y??@??:?c}??gTm?L?f????.Mn???#m%?$[F_:???4?A??` lP?c
&?%g?"?(??J??????8ZG#<-?-??s?!??????????0??8?????U?????\???(?T?9\@C???rGH?-?p?d:?snu?V????d?:?DB2?u???l
b??i??}o????`3?{?&???VS1????^??a=???,
`n\Z#SU???=9?R?=/~???;?#??e???)???A?r8s???3^?EuqNs???*?4????6?K%???=????.E?P$8D????????N(?|
?2?$f??V???PmH??F?gZ!Er
?mS?{X?9g+v?l???6???rY???????-b`?{??
??G????QUAb??\B<J
8?????I???
??HKF?fE???&??]y??eL%?$i?
jR????????4S
?e8l??~^???{???U at 0???(?(?????d??`?,^mL>-TO.?x??+	??p,
?HI)?ct???e+YN???da???a?$???.X??FJ???#[*W$;6b???1???w??i]FU?3?[??????gK????|f?<N???t?;|:%z?^??x?????+?
?Q?6v4?o???,?:R?X?G+,?h??0?e?4f??'U???(TZG]?N??0
?u??+(?b;?pa???D??4????B?CJA????%?B???+ISj???i??:f?<?????K<?V"]t?4??FY?????1??HNJ???P?c?I"?xDc?????5??Gg1???xpO'?	?5??Frg(B??pc????8L???5??p???xv?d?5???t3?<v?????3!
?b??KX?4aTD
r???????S?"C?RC]R
????1??G??s?A????f?8?Ic*$??dHU???gy?1o?r?"54??5?Jr?8?-	?lX?????f?p?[??>,?Kv??@?????? x?12Pb?(?h???`Z`?
???1?
AK?_p;?x_^?!b??1??(<	?h*??	?;
5Qb???b\? ??E??He5???V?????J?f?+m????????Z?!&???
??I/,Q????Ui????o`ov??6{??Rk,???M?U$??U%???z6X??;7????J+Y2?L?(U?H
IdD???aO???]??0??\?R}????????~s??#4	_J	?b*~L"H}&?0??????]??l??A??G ??d4????????)??Z$
"XkC?	6?F??K3????jo8I!("??Q%s??E?\?4$Y?"????????"??????N??_1?ldY	??;k:?p???$??H??oR?\????{Y??S?jp?Q????8`???>???????D=?gd??kT????`x+^?D>?*(P
{?l??,
?mm?????h??H??t??nk???<M"?,?#/@?x(?R?Y?Q???tl}L???#mu5?PT?$UY	])?d at 8?
j?>6?I?0?$?I?t/???%E
1???T/??o?8?Q??d?}?(B?B???????????JF??yX8??b!t???Cp;t?g???:????B:?7?????3/??k????6k????5%?????g??????0?
???i??1?-
????>?i^??9?x\?F?
??R0?$l?!v?5?5?????a??.??>???????^??
??lDJ1naH`y??~?l?1??LBD?%A??B?.?r?1?3?%&*h%?(??w????M
#????b??p??N^5?W
[Z??Z???Vc&?%??]*?{!
???;?L????C?S=?
L?V?????T9?????{:A??V??e??(5Y??cF?>^??l?S7?BJZ#?q??????Y{kh??2NE?F??Cx,?????j?)
??%MP[
???W!?a?A?X?X?0???U)??'W1?"??wI?h??R?H??????Q???y$Q???4????AU?i?7???I????h?T??w~W???d????{a?9?i,?????E?wQfH????"? H?????6d&<????F|???[=~?m?<?z?'1?Akd/????RL??:0P?????F
P*1?C??
?tS????
j??v=?V
k	?"C??1?@? 1
??@??j?m?q0~???a?A?????W
?Z??	;?$t???;-?C???R??Mh?^??=?????k?g?~?<:?????
?U?d?2?b=k???T?au???.~)?]h|??V?@??G?c?-%?-$?v??c?t?n??????h??????%-????????D?$:?(??????1?;sO<+M?i?vVB??
?Ve??c?Q?w?F?_?L?????jC?M^????m??I?E??xV?x?<?[(^
C?6???d??1:q?V?0m??U&???a?T???H?i<?.?I?d,??B$ ??+"?F	?I?]o????gb?B????1?S?O?k{????a"!????D?%!??mMV??????k??$=??#?d??:cA??,?)6,??z?n"5??Q??o0??0?,?C2Vg??U?O?N#j? ??????b?$1?????????I,?,?3??i???pT*R? ????!?D5;L?z??z??C?B?2u???E?Z?)?`<???
???g???|?$O|?R?HJ?%??????X?ZiZ$J???D
?~?
?'??'H???{?&??
???M(?hX???????R-R?V?B?*C?
(???i?b-w?5?d?Sa?????q?w9???????????PJ????YC0??5?(??m4??b4?????r_/3??\Mo???????l??n?A/
?$?!~?'?P??d	??e???-????Z??????+R-i?ke)X??4DM5??$??!$?D????Co??>???_;H?f??Z5?U,???????? ????
?#??!???U?8??!?'?6MrvG?????:f?"
<[B?A????????d???1?W???0?|?x???????,=?7?"*?)?(j??H?Q< ?z.41U???]?Tr<?|?4>????t??+??????Q?:??9??Uio4??5t?n?%?
0?3??6??%?RCh
M??4?????oM??3?$PL???Mh.??????"<?;????	!?#?JU(?qPg=d at r???a?\??G1?=,?Ia	?????\?4?:?!???_H??D????_?[????)L6R??lvA??F?J+?`t??J?<???`?C????iJC?2?4?*6?v;@m4???QY?,?`?x?vEa???m????8}?tV"???q?Z??@eqZ	????
8X at b?44G?1*X??\7???:u~??????;?K;??#??E!?i`?%???-?W??O??,??o?I?S5??{L
Z??>?Z?na?~Xx#?zeW?e-????;`?j???#Q????JG??????#??)$???????)hX???H?3???B????B????lY?6??Ur?i?4r?????HB?$???????-O??l???E+?a?N?i?*0~?k??=??
z??G???@??}?@???B??????E<??h
"|?	?(?l???&a1?5R??@?f
4?$????m?%????JRt???+???tC?;???P?"????	?;??
???(???7%-?????f:?????E????.*g3.?u???P
5o? ?Kk?????Wy???Y???[??
?L4*I#Ddq???????D?Jy????h?I??=?R5-???n?y???,?3|lL?N?@??R??/??T?)?K?x.????<???4?yT-??8C?a+MU h}??~???ps8
?D"R'?,?s???Y1k"??2M?
Rm???i?!??%0[???T?Y
?D

9y??cLliBc!?9?	A,,??<m1'm$a??%???I???N?X|???d?E*E"?X???mT??"???Giv?"8?h;9????s8???yZr?gK???"?QF?$$????2?;?:??a+J?0??? 6?BVMCQ???\Zs????S?Gb????M?8????????z?"??x????????n?WXn????L?H?d6X*???????i?R??1'T?B=??,??V%*R???N?g9i$0??R?,+??]?A??L<??w???????BvG?D4?n???N?N?FB?	>?????DZ?r?3??'3?E??u??k?*??????
m?+?I7?VZ?Hm1?~?K??w???vZ?#B)??1@??Y???[76?b???c???HE	?ab?sQ??{1V$9
?L5?
Zy
??&??M?
??3????:??I!?u????e????l?m;?M????)?S
?w??Y0&?v?l??% ???s????5EQ??H??eE?h	
:gg??&??5?o?7??q4l?N????2H]Q?~????"?"?8"???PM	?/B
???l"<?B?x??_???|?2.?s??t?P???n??D????WG?U?O??G??`$?^????????K>],1AUE$#????4?pd8???|}K?P?"?????&c~?o?!2p?@t&`????>????Y
Kh?)@??J?^???|??$?!Pk2??g?&?O??0C]???(?{?
=?=?/PA???}Q?4?????<0
?T?`h?	???Q??Eg??n4L?? ?|?O4?????,00I?3$n&H
9?	?B?r?r??????'?%aI0?GtBJh5?4????=[??,?h????i?[Y??I????R???@??J??L?A???Ph?
*h?i'?14"?0*?e?B-?0?2&??L
 ??3,?Y?'???zs'=y????fCR?`?B?`Q?U
}6I?3????	Wa?.)?Hx?????
????4?TP?
8B???aR???r?AC?*?T????6??9?YA)??Q??dA??s?>????6jn
$?E?,???[T?,?E???%?QM??
????y????]????????^1aw{"?(D???P?IBU'?'???|A?}?j?Ol]@? ?(F$?J
`???-?????????@??????t??$}???%???8Tl@?7+????}q}??S?JN????9Ro????~?>???GO?>??i?glb?d??)lB?X?
?Z?Kh??!)??Zy??;uUU?Q4?a /???w???m??c1v???e?X?0m?6?~??s?m??i??[????????????P?I??????
S
"<???0M@???,?:??$?%??y?????(???????Hq??d1M???@l>w?? ??d?m>c
YA????5H?F???o?\??V?>t???a'??IDa?!2ZX?????1CG????L??6???e????6,??)
X<W?????
f?
I"?????????:$?? ??	bJ?6V3??QQl?f????mYb?hn?????[Z1Dj
???2????89??($GR?CB-66?*?m?t?????P>?????$??n?#???ViJ??6Sr?X??"??O?
?????
P???G?y??Z?%6?RH????(ZT??|?>zr?<??sOmTVSI????SV??X?ZZ??j???KQU????H0bD??`PX?`?Z?????"???i
?
?G'???F?M?<???n??????}?q?CA?2S?J@?$?rz??x?e???A?c?>?'?=
?!??????#8?????$V?<!2
?y?????
SO???xp???????{?6>??nk??6???g[q??Q??/?c??tO6????u?????X?B??$?I3:????;?qtk:!EZ9?2Q??o?0???(???V?%$T?@??Q.?d0?``#?0??<???????k????\

S]?S~/x?#mgT
??A #?e?[X???`x?J?????Gp??????(?	????????}?M"?E)??r=??Q??
?I?*?lO$~Y??yy?????
f0!o???3??t?>?[s??8E??<n????1#??*[V???}v??c?????hsF?!??i????-[c??l8?:F?????7l???l?????kf??Z?C#,?????,?-??i?
?f?????,
???M??"2???F62#j"??????e*?
????50S???$Go??N?PK
??I?#?bj??????9^?)??r??l?3???|C????)??lk?h???e??~?3?sSm?M??4?????X???d???e]?4(V/?W?????0?@0?#??#?T>(??q?Y?5_o??<?>?I_????MU?"??H?????{?@?G?{?	??UUB?=????????2=k??"'?Jb2H????g??7E??\?J?{+=???<i???)S?????X???{????X?y?9KV?????????k
X5?Y????1q?!B??k%????~e
?|?Q???TaF??
'?iU?Y3??x?X\gq???i.?0?zSN??y??n???jx????U?D???9 at n ????-??)???T
j <??#?G?4.??-??>??<?A???[??YDY#d?vA??J?0:Djr??0?!?9?$??????t?]$????\#.X5J#??d^
??c@$??.5v;?P18
R?mlPR^???9??C?-??X*Q???D??(?(?"?"?TQ$Qq?????o??V~&s?{?$?w????h!??	sy??#??t?#U8???????L\=M???????O????V?f?q??X0`??b?,?YUW??>?m?1?;???????_k?HI`F$$??W"??I????0????tDH?c$???8?|????Pn+?]`?M?@?V???
/?
}Z&?;?????b??D1????BuOQ??????.U??X??wF'??????2!??$?BR??*??????~]????Mf?([b-%j?m?e??
??????[%??)?3&?Em4eeSSTEl???%%??VV?IX?-??kT?R)?????H??5mF??i?IcV,?km??????H?RLD?MD?1[j?b????????V?(???KJQ?q!?-NC??pS?u??o!=???6C??=?FbH??de ????Bw:??_tf??U@?j???'g??'?[??'?,???????????]?g?{?P????u?f?mU???M?Z56??J?f?$?Z???j?2?6Dn]??KlF?-?:???&?M[fZ??kY?Bl?d?jb<N?h?D?*)r&1&?n<??y?h?}???0#Hd^???
?? ?C?rAJt4????0?a?\??O??6X?????4?Y?mg:MD?6?/?G????>bM??QMQ???u?yc
?@VA
  ?^?????1@X?d????jC? ??????=VH???E???`SIV
KSN?n?rc:???f???K????????<_?$DXEPy??????N????;??QFDD????????G?G^@g?=9??9???Z8?? Jl?o#`a?Y???????????NR9????ad?P; *?$?????9?$??Z??????K?@\g??l8???B???'?qat??7?A6??o
MObcb(??I?????E`a?cd?@??W'?6iA???`T??n????E??3???)??@_*??U(?B
@UOo??rX&?~??8a
	d8?K?O??Bg?<?R??QJ%???4???R?u??c??e??ao
?????gvtL??(????&??0?????B?j*-K
'???M>?a??k??m???
fD???RV?DW&??? ??@??\a0n??
"kM??CO?
DR?B??p?????D????	B?*????m?l??????"$??e!w?	H?
9?F#<????$|??"N9$&P???
?b?mI?D?SG?:?EY>,??	6??hd|?w?.??Y#B?l???"?Q?G?1?
?u?dH???????~?}?? ??Y????b?;???H?-?;y?b?n?T8N??_d5?????{|?gs?cl?????\#????965*??c[o?e?t?DJ????R?I?4?'?H??}`B??>?6?VH?3????4?\????yi	???&??k
V:@??????uk?Sd????t??4???J?z?T??? 	AL??v????O|?wG???M??)????????M-?LN,?.IN?????2?M??UfI??R?O-??(??]L??p????? ry
????)??Z?i??M????S????bL%???%]"??_???h?BUG$+??????I8?@?2DT??y????P?=??????(??h??()?K??A???{8?=??*S:DX????Oa
?K ????=??6_?0f+??|!??"??~d.8T	F?/_????????AC??&ILP???I????y??p??????P[q?????????Q??IM??P????&?????pe?? ?__???M?? ???F?a?o???wB?A?jJ??Zy?????????f?Ye?6????2???????CSG at l??/G?$????
$"O???c?i?^??[Yn?????7?UU$3-M??F?$??X?@?G(??S6?
????My??M??dF?T?A?c"l0????|???x?gI?|Y????y4????F????$??J?,{`EN
N?%?]??N??<??_m?5?8? x?7??o;x??Y?L???*?Q???????;0?#???????<??????"5??-QI$??.?MI????????'?????????R?(??I???m?<Ux????t?????
a??????T3???????H?d%?o??|?????????|/IX???????Y??Ve?m??J?iAd?q???Q??h???????>K
z?#Nc????
??BpAt??`x??GU=4*?BX!??_??????
???f?k-?o??{b???J????py??M???U??D??m???-?TSC?'rtX???)???1?b????l`??m??%???y???I)U?z????????ac?iLS&g?D?dR,V??`?U??.XnTpQ9X???m???i?m??{???m?
&??L?
??3??g1yM????f????^F?ccfc5??=?L?????????i????k??%????????#????L=Vs????????q?????hP???????i2I<?????{M
?KAb?
??@?Z????)?()
*?E?1To?	????\K???E??????l????'????/???0?r??|?~B?EB????Y???us
??NG????+??<"????w?Mdjb??$?????
??b`I/?'wm)????#?????W
9(??????b?Rb?
?<8:i&oH????E(?K??Iu???	????
???!R7?_,?h'G?????????l=R?m?????%?zE?%???st??w???Y??N
?@????=^<??A?@?0???z?>!?6?)z??
JU???$J?#%B??!e??A???K
???????x/J??%	C??1jb???z???
?B?????????=????o??[?O?@?'??H@??x?X???S$?y????(??????UF?Z?.???A?^f???]Q????UTR\???/t???v?`???u?-
???:?Uu"????h<?=zA??h?(?Pa?L?bR???@Hf+Ul-???a????????????T?-(b?b&?I`_??\a5??4-|??}'???O?????L????1??9%???i?2jUl??!#&?a??[B??t/??@R?p?????xf	I?s?z?<s?=7o^_????X
1t???@?)
??}??>
?[??1???HmYf??b???-
??(A!
H)'??RN??[&F??1*jf?[?v?????m??R?d??i?oQ?"Z????????H?'?A$?K
A%??
?#=.?M??v???????M???q????.????u?	?sZ?i-??+%g?qe???Y?????s??U?5?Yf?m&f????&tu?n?t?kk6-2??[v[??8??????

?Y?
|o??;V??????? md@?lo>m?xy7?o?PL?Rl,?*%????I???e
??
??4??X???|????Vy$0$??fE%<! ??``Mg?Y?Bhp?8??4? ??z2?,"?P0??'c%E0?L3 B??;?He?M
y???
a?bi-?	*?>?
?(k??%	?>?8??5
G??)?@D.$?)>T??cu?_%t -?ahPA)[BzvXt\?1???,??I??????????<?aaG????x?[!0{ G:?,????B?6?"?LC??=C?IH>4@?B??D?Asm?z?D<?@?JH?Q??A?[JGR??n?O??M???Mh??e+?B?1?R	
'?_	???l??c)D?Bz????????
KaH?:x?o?-??i(3h>?8<IQ?????^*P?Jd?,.?h?
??7?1??v??y????I?????,(??c????cf????CU?D-???p_??A?ycYV??b?3????c	?D???W????+"?*???dz???%
@??N?
	A???cL?P?'Jy?Z ???3{{?IIE?'BC?Y??:}=???0????G?H???\?1[?T??D???4`??R~0?CBP?H?[%??p??LA?AJ???@?Ci??????6N:?+??,?
d??JH8??F?????????Zd8?s????|b?e?6?%)xQ
??2?G*?0 ??T??? ??????X$LHAt?.?4???q??X???8?x>??6??v?????????????"?M?bB??????aWkOez	????yT?????I?
D~p?????B?!????e????p?vS???"??????d50+??bB(?sCIG???)5??0?FF?N??W$Q?h4?H????0?0L????b$????'k1qx?I*?p
?R?W???$??RF?2M*??I?\?2%????T???f1
k)?\7?`????v!?F
?????R0)R%$\b ??P:??E
???Jix??????D?
?3?
?"R?7?????7?????z??r?$??G'???????O?-?-??A?Ds?>?bv;?????B?????????=???^0PB?
???I?D-???h????>G??O????#??RR?????8<??%???
?q?UUj?(C?A?.???_??)?xp??8?}??????Xn@??eUa*?e
?_p??????Nt
?s?}X)??\|?|???|(?R
~&????6"?0???v<g?J??B??????[V?2Ii?&?5??2?2?E?;M5MC?A???6?????S?}7?].L????n??;&???J-UD<b$~Rn???q?	??c#???`YH??/y???x?v?'?o ???\???HF?5?d3	0?
?6??????????H????6???7??<??$?2?+hZ???2?dld?*? h??l?????!ZJ
d???eAJ?w???,???E??L????T?J?i?????????<DQl??J??;76&???F2??u???$`/????????0?
D??!?l???b
?J??A?Is????p??F?g??~R`?#t??I???jMT?W????U????w~???g?-?????'?(??g?????#5??7YK>6
????5MX??T#??E?T?<D??i??"&?*
k??~????z?R?i.????TJ$?$(07???"?????D???}?
Y#Q>]??#!
???+f??l??8!I5[k,???d???^=???j?dV?DM?D??vn?4?}H????`???N&6D C??????DTP?DM ?B????>??????8?jj?M??[?YIc?=6{???vM"?A???p??4nIIT?C??G,??);#??Mc*???bd???B?@?NWnT?vZ??`x?%?????4Y7??7?c??r??qf ??
??PQ?2?;n??9g6W????g??3?b#???qj???D??)A8?M?:?r
~N?x?H??g@e??Z?p?0??n????E?I??5??!?p)R????bH???^:?,`??%??a-??(M-????h??????K\?#2?`???H?IT????oH?d??4hMVib?Ax???r]?b
"??I??J??0?f?g???M?
?!BKX?????????(?w????|?.
X0?T???w?7???T??X?c?dt/2?'!???L?P?????]?fN??I????2<??G?g?hP???)c?F9Z?K?????4T??v??	?%?0
?h??????
?0?]?d?6?Z(+??rS at Fq??m?-???x??bLE?@?-??nr ?WsG?
W|??o??O?n6?1?[(?z????s?b?$
???,?B???????#m6???C",????q?????n?yw,?T?+$?O?(&-??e?4d??TfGfq?6dS(?;?:I^\XU?7???
???3???J?[R?????'H?Nr??1?G??????[K???h??2Y&??5[X?	?7??????j??i??????????q?A?
?=F^ ??D?u??p?G?I??
{?/??Y?Y????	??[o\D??cW???UB=2dy?}	???!CP?IA?M?h?Qm?-"??????L??Z?M?5?gsg-??????^?Ny???d$;???y????X?????<??CaOm-??N???)?o??Oq???'?=!?????di?X??b???5??9?i?i?!?g??o???<bW??>Q&
??(F(?<N???P?????I?&?*??
??l?M>?g?y?+T?~}m???1??????!?R?bKCX?zx?m?WP?Y?E??JE$D????E??
???
"?PH???V???x?e_v????VM?1Y?S?AT??L+~m???~s??G?u???S?D?d???4G!??[_???m?z???|??????*??u?-l??G?D?EpyA???j|q at x?$?$%??Pv`B.???9<?F???,P????
?
G????e?M??m?h?|?|????el????4??a????A???&?FT?;_?????Ac??D
eY"?????(K?\m?M?c!?cR?2alE??w?[?k??4d:???;GJ-?ZF5(
?? ??AC^?iaI^??@p?
?*$??p????u
z???r??M??=??2???|???-?@?$y~.??Xt4I???????????R??R?,????????u?c??G?eu???y???m????;?SDs??T?????eHXH?)jy???Z????qI-4?dJrI??+??]?L??????5????(H?o??|S????<N??0`?)???6?X0??c?2	'?bJ
G9?4?+mo?Wl???h??),?kG????=??|?q?N,??t?FR??M?P?n?u????v*???,??????d!?_??2f??y??N?}?????kkZ??BD at -?C???????>??Q
`_?6e
???H??
??Nh?RF2l?b??d~???	y???I8H?????n#??0??????I??}?2z}?????_M??

(ZY?'???????Q?,W?3??W?0?&A????????
????O????B|j?
?T}???q?d?[%?m??7?$?????*([n??I??l????%??I??:??M6&f??DZ2???9????0QH?H$????Ib?,YeX??	?X?)m[V?C|??C?
?4N?:?/?????{>?EA?
??i???b???}I
sS?key????2??y?K$Nm?6?n,s????Y????&?;
??m???????Y?(??????|??`s?M??Z??N6~??*?
???q?T???????*KJa9?0???`?A??????L0d?Q???$???f??O??B????A	wJpC$??X??????????G?[#??!?w??Iu?^w???\x????
L??6??44?+??=?l?????{d????K'?"??t??k	?|Y2?#%+?-?????????^Tu?`Aa?{Q??|?????z?=?ig}??(<??fy%????I$????mU??'??????RPRz0?????s??X[?????1C??X?>?@?E???O>
M?o??C?^???#??P'?????3Cm?D.o??????????C???v
p#??????3??3??????N??
D??????-L?6>?6??$m?s*?$}v,?,??)a??q?????Y]d??????<
??I2?A?D ?A:?%????
`?#?"FR?`?YDi?,
AR?CJ??.?()$XJM???i?mX?2???????T????"?PK?d???aE`?B(?
Z?M?
5t??AN??k{b7?m?,??khE??h?Z3??V+)D??L?
??L?n??n????s???h[:/?8{[v?X?!ey?W???)??Ef???Ft"?EkU?????c?3?,!c???t??`l?
?!?,%H?X??(???	?b??6?;z%???"?"??????3?Oc??jv?h???kB?1??>?J???9??p??`?
?(k???&'??<H0??(Mo??\tY2[3??X D?(?0Q???H?B????(?bf@??Ci?=????=??2?????*9F???V?n?v?E????Ua[m?YM?Fy??q??????['??xu???f?f??Z???b1bL?d??'???XPk*J?????8?+!??,"	??g??!??J????e?6u?t?sg??;???s?X?`0?E??4TR(?a?h?&???$??????i??Q??*(?:
???GEAL??)0??X??&????h:-??7??a?PB???H??)`&??mfI?y??U?6??
?s?_????[My&???1d%?X?Z?e??E?!DQ
?????3)XE?Ze???n?{?T<mf?h?o?4??	?j?U??w???S???~?_Y
&??t"N,???>?A???N$4r??j??GVa?*|???X??????t???????n???d??????R?%?HD?H?W?(F???v?,Nr??w??H9o???V?i??b??U,K&??????F??????8????"???|??Mt?TiD$Y???@
w*$?;???o?)C?<???l???neC(RW?B?=?????6??d???5??}?8????]??r??*!D???E???$WAK??I*??]?"???2?d?H?Sd?Q????k?+???p??[
????&?t???q??/X?EI???R??KR???c?????????c??PF?1??	?Fy??JStG?
Jz:0?h?L??-?5???U?x	U'?Ej???(w
i?@R?H3??	?)??8y2? E+????
!@?nC?????}\??9*??b??????????A??nID0>KP at +?????E?KO??~?<???e????X?f?D????????b?C??>?G:?'0"7?	??`?k??/y??g?F??????v	?`???\v$S5b???C?X-??B5C?B	??	???EE????B2$&m-?U?d??V????j??(7??nm??2}h}Pc?C?c???????{ ??$?0?<?>?C??7?;?y$?????'H|??C?????z|???=??j*??T?'?j??
??????h' ?a
.F*?	T?'?dj???X??qc?zR??P??R??v'???w?b7??\?M??D?65"F
5 ???$%??Y at BP(???Yn?MM?6?B?-?i?<?qy??r?
#??>D0?hy?b??D"h???#j?#?+?@`?P?H?	"%??h?&?3??v???F?K?V ?3d?xM?D?R?????=???????Pz5+n?
?4?#Fn$@??2qI?????h;(??}*F??V?????5???)?Q??#??HI?
?4i(4??M???{?d???	"k&D[??MYAkV???o]'?4?o?!?sl????~sVqJ`?a?B?K?5????+????$??!?	?cF?L6???CV?b????OF???x???????xJ????X???q???+??
,dPPbgq<??~'????*?K#*	9?j~O?Re?S??????F???????x at h=^??V??~~~???p?k?(`Bk?N????:N???????????Y?Q?????c=???M??????'q?????????w>?NT?&
3(?&????=? 4?D??`lZ?]??Z@?!?^?NG-??9?!^?o0?"H?tN)R?2v#?????Nu??4??3y?????g????=????????^??@?j??"??i?\???H?tB??}??\???s??p??F;\???2+Y???=?m?KB?Y????Z?p??$?*Z???X:V??o?.c"c!F???h??	?h/?^?#A??85???|?(!?"???,Q?=M??)?0??5?iS?2{?BzlF????2v=?L%F????x =RB??1??:?%??0??K??o"?}=
}O??k???A??????0Q???`s]???2??z??#?-??d????????:I??K[|?<???e?:?q*???r?W??K???r?0????s?
P????v
x???aO?0l?k?n???%?d?o?>o??_X?:\z?#+33???ar??????????????l*?#?I?????xK?y;???=3??N??\?}|???????>??5F$m??,04?1 at D?T????
????_u????o;?r?u?????
?%?????'u0E|?Y?;B3;	?\B??z?V2???cm3?1t????s????;?`?????@?w':?lN:R?,\??qj<??+`S???H@???/;H??Z?(9??t??jO
?
????????)I?????a???^?Hp^\???I?R?R?b?e}??11,?*
?@?=??t?h'??v?q????T?9?J?e??^??__,?pJ???	?A*?+4V??"???G5??????-??cR?#?~=?g?;?R[MT???0`??U???;f)??????B?DD?cQc???,??8??pAX??????e?????W??
^?yx*?a???Q?K%???q?6????`?ouhcm0?}:Uy@??WH
?VY?on ???
;S?,??MR%?2?N%??<R???(N)y??ddd9s??;$??fHoH???Q?????g????&]1m????J?2K?S?]?N????g? ?????
?lA??U8
????7?<???8f??<zy????~?:?k?????????&?{??Z?,?H?|!?j??_>=3??o{?
^L?u????Q}0E$??P?I???????_~?w?
?d???O??@RH?	;?e6???$ {??t?qY?C?K.?C??%?X?l=7?6???U?b??UmUTUUU??????!???????F+aB?????U2
???a!?H?c?b{gN?s[??????'?^aD??1v#???L??H? ?????
?6????????H??t	~?%.?b????iG?2d?a?>V/???LUV4?d?$??)???
?Q2b?0/E?1aI????'?(?-?H/????y???????L??0?E???NF".????*??VQ??b	?q??w???NO?3???S????s????l?????Jx???O????}?U???%??b!?Ae??)%?mF?????=6~????y|?|*???
?>??fBu?6??? g?zsQ????[,R?.S5fO?L????0??%???}Y?a?rc???r??L??qhg?X??iQ1"?????@\kg?6??O???t?=*???H???AzI+?;
?`???arTj61?OP6???????
???g?M?X?????m???I??}?l????<?q???o?y2v?eO?u???1?MfZps
?\2?$???.??-<,??f2???pr>?e??R
??
h??53?????Y3?\??Y??????I3??X	?Iv?N?US????l??????O+?t??+e>?|??????g?-A??'?!m?|rF?,+?C0Ez?g??"?(?BD?????
?' ??
??CT"=????y"?
 ?P?$ud??<????
?pS??&??3?N??r???!?iA??Mk6?C?0N??q?'*??f3,{?????U??"??+?|?8i\?v?^t??????H?s???????S?-???JC???}k-?7|;???b???Y7??'??????Y_??sY4?wX??Y!e6[>??o74????-?[z??????x?EKX?,?????RE?<r>??m????q?7?BI'$PVA?{=m?6?3l??????fn(\O1??x	?@a???%???P<!?%??$????h,?	e???F??N!?i)(u/.?%?
?2????q???1?C?8;?g?jv?c?	a??j?*?\f??6?i*tL
???HHRV??L??&??B?i???#??
Ul??{?
?Emi???M?Q???2??M!D)?NH4V
g?D	??!`%x???NjS?D??b_????!??LOw?
)?????????k??????J?
Z?f?fgU?t??G2:????:K?v????5????TB\?S???A?13
a>Y???w?Ja?x?i*.AtC<{4gO?{E+|#C?`?G/?
?HSCEG%???????3?
???,M??Z????w??LhP?	%*???"??5?2?r?~???w????jq????c[;?]??!?3)???e(*????c?<????,r?k???2WrD_iK???V?0????2??eqCB??/??aG??}?V&?W????Bb[m!?`	?5A?
???BA?q??
??{??*?i?zh?C?cbf?LMF?R???s!q??'????zd?L?????i???????FX6gR??????  ??B????i?di??I??}??x????G?.??????}YBu#
 ??T??-Q??c
?jX)?*S?p??
??????w$?$/MG?*X?E
:?0???)?&?{??tcJI)???M??O:ZV??????g??0k???JE??p??&wW+???y?[???b&?????
tUK?q????l???q?uQ???*E???????e1??D?'?;
??8?QUX>mk?]7?p?????i?)??<I?s?FA??&?)O?
bm???h??%B??U)7F?G??
1E?z?D_WO?:??d?Sk??????I?M?S??#	i???Xd?l?e,w0o??jra?6:M?????
???[????/Q?E?A????n???>
{X???
????:????o?Z?`???LnGI,i??`??F}y????+??#?A?!H??`g?F??]7?????<p??=????l@???y1#d?8????)#/yy?????m?7ro????*???R????#?j??????N??Fa\???????????-]E=?????&!??Gm??"??\V??????????V
?[??9
???
&??bR??%0?#????Q??1?9a?as=???y?=j??v(3?BI?zj??Jq??????????5/I?j?;??????
^?f???7????????,~???l?+lB??5??7u???;?????XE?N?~\[?\??????z????w,??s?#P?r?????+v??X??2Cv????u+S?????L????????????????-^???v?Bo[???Y"????"U?ReZH?O???o???&]|N??-?Idj>o ?3?/X??W*?????t?f????????????P?~VaR?fI???z?1??[??xCC?~????m??6?rl6A?3 ?7??G+{?^?=?(KN?8?g9???|???
91\?f?R?0'??
??#?????\??JYi??im??{?^??:??7?d'?[
????d?&?[B???n????v??,D,?h}?|.????????3?0?W?F*???-?a??\??>??????!?!?f?T???b??E?!??????(???????e???i???5_U:??>?.??@(??????A?8R????*wd??o???	????d????
???(???E??_???a?\hTq??\*????g?k]?|???*??l???QS?????~?)?m-?/^?|??o G??????)????????????(g].M?d?m?????.K?[???I?4?? ?LZgPWtL*?\?0Eh-??????5?ea?*~^-??DC?dm\d??G?g4?{??|8???Pj??8zli???x?x?eKa	?|?`?L?}	????Q?????z5Q?p<6?F??Jf5?B?X*3?W~??O?v?????M'??huw?gX_OK????dP2g??=NN??c??????*og7?0|r[?[?l???J?k??m?i??r??*?H?h~3??x??s??
?
???TB
?A'?U?nSQ??VUJ?I??m??H?=?W?Z?
X1??????1?t? S??????g???Z?Ll???l??k?????f=Bs?R????X??b?4P?H6?0??
???sW?u?60U?vh??BcX??2I?,?Uo?y???]?o?8??,\????
?{7>?b*?????"?Y??H+N???k
?$m{
]V?1xoX?u@~????:?o%O?E|H??b??i???yD????????M&??u????q??}wy????@?o?4?????C????>?w(Hy?????f??	????h???$?e??7?0rOrJ?v\??hr?????=!?()??????d?,???&???yE?|!??~????U?p????7??%}??{2??O:?rMZw??????"??T?i5???????????v??Z8}]W?P?ws??=|oK"6~??4????z"??U?Z????Q?C#$???!??,???	w?f'??cZ??{?q`1Gu??]?s?`m?,I???[{A?Q8$??,?S???????(R??"l????zSx??????????vC?^t???
???hV??z?D??ZLD?x????d.????????u;? ca??)?=?9?~?s?"???/?g????'?????'?']_{k?????G?uH???'-??j??2???	s?f?y???K??
?E??!?N??e??Hd?,K??z^???d%???yU??=?????j?A??3QI??[????'?d?_??KBi?m??nE??;Z??Uu????m?1C?,?T??_?b?L??:?)?{?vc??t????!&@?)V?q
?v??=?P???????Q2??;?#?Y.N?{?+???$???e?hR?CZ?/?????C??1?/?}? 9v??????W???C???H?xq?{C?lq?`???v
I?!??<?y?\X??p1????H?	???b???<?????Esn??3U?K?h??)?#
<H,;W
?z?012??H??????7??D???F???xw?Jy??}?O?Oj?
RV?U
???????w???f????_???6??>n`?WA??~JE???K??)??e2?>g ??P-i?
????????????}???Ak4g,?la??!c???W:??
;? ?4gDf?aof??????({G??'?????-?ra?O???C???@r???O:??"vT?%?y??B??I??:OY?_?Lnra7??????y???F?d[?????8?K5xg?$???mh_??J??[?9??]??	;?s??@??"IP????
1??La??yU-`5????6??2??:T?#z????0???F??[C9???:n??b,G???"qx?J&";U%p? 	??X~??\YGf{?_?#(?????9????g??c?????O???rjf?F*|?I?}%?i??VrK??
?`[? ??)?"BX?&??????.	?cn?<~????q?"??fp?\?<c???}K?/??,?B???6^??Yi\?i???
???e?G???]?_??? ??H0B??????!|"??L
k??IS1?k??4???:+????i?eOF?M?Z?ip?'?L??XF??h??????\0O?`"????MsH?????:?3??C??z<?9?NA??????r	__~J?;???C$??]S~O?t?????;?H?1?O680?1W??a:?B??????7*/C^vv??OULV?d???y???Y?????2^E???I	????
}?w?+???????????gA?`???????,
A???w@??EmP????q???????F????_w7;? ?7O;?`???????z??j 'w_;o{?????dn?K??t?????_Z?&v?>N??]?@D??v?vH?#AxB??:???kx{?y????????
?????A>?vn?:N6v??????z?y????;????)??????G?????G???z?1?`'?n????????????'???Y??yB????0_??*X???????/????????^~N?v>?E????v???#V?sr?Exx?????????????x??
?c?H??I??!N?j??v??a?{????F2 at b?a9?;??w??p?K??Tc???4.?@Uk?_???N??[????|;+?.?[??y?YN!9-????l?
Q????T??e
1r???????I?)Nj	?r?.??^?qd??<0???PLnU???[???1?l???WM?.???Jl
c???Xu*?.??G?>?e????Mx?kpZM???I_?J?-?"U??X?Y^?M?_?]???????????????b$Q??3+??%?L?W???B?????
a?n?a?????
15N??Kq????+3s???+??\??Y?????[?3?V?~?e z?mg

--- NEW FILE gnome-yum-0.1.3.tar.bz2 ---
BZh91AY&SY?F?`?????????????????????????????????????????????q??M?Uv?A??Q
[`@
?at?u?{?
]?????@???[?w?<????????y??k?5
???n??[i?|??>??v?u??-`?`
	%TU?jU=?N???9???8Z<???@???v/????>?}????X?}???????;k??????t???N??|}?zuR/??s?S???P?Z???=???)?`??%0?0*a??]??L???a{???xtw??!:x??`u???T?
?;????Vm2???8;P??U`??p
(?`
??#??????^??k???[??ml.????\suU???????

	M @
l?4
4??zLh??j??SS?OMOE=O'???????=S??%?My?M
O?=???Q???????T~??j??d???z?$???&?@L	?4	?!?S?'?L?&M2i?d???d???C&E?L&MM?&&?`##???h?f?MOd??{F?????PD?
G???????5A?eLO?'?????2???OT??H?4???d??#
????6??xo????BH~
????7???6I??H?@G?S??
?? v??U??e?b?t?%p??@??`??Tm???????No/???Id@?
???W?7.????????mn?x????x???r??{V????C?SL??????D??f?)??%b	??)W??U??R?,!?5??>???sJ??GK?M??=?xXo??r??D., "|?????'????mp$|?-B???????{?W??>g??Ct1N????s?L??%twKd??y?`[??E{?w??L|??!
	
?~??X,$X?????^????!??w?????n????5????V?'??b`[c?9?rR6????g??w^S??'?D??Q??????<?>NW??uE?
k??}??u~??Y??????v?????l)?6`h5l<????C!{??!??6?u?i?]\?D???@
?V:????SQ??????m?'?????]o}o??y8?i?0??Q
 ???????L@?	
?????k????
<5D4O??uh{?O????????????<?7?q?[q???nGCY?{\??<?Z???6pp???a0?O??z?^f?fJ??l?$!
???9?<?a??/
1???5?F???
?y?cl0???"?????f#?????????????(????K??p.[?/??
?I???T???????Ai1?z??j<>C????2??i??1?????cCP???]????P???9I??&_??#???????x??1??????G?????
???]?P??V.??xb???#$?=?9U?>;??
\??A???,D ?n??*G????|s???
??	?U??_?
??r{?b?0
I-?$]E0
?
yC??~?~? }(
Q?|=+;???A?~??1????5U?ln?????x4n?l????#????????\/=v?y???#,c??l?
?	??F?^vF3?V1???wic"??i??s??.??
cB???x4???f?!v3??D50?>??{\Zq 6????~??50D?????zBd?~6kiZ??j?|b(-?p??9???AU??v??)????M??G??26PX??]q???N*????o?????Q?r?x2m???????3?9q?.?
??????5o/??A?F?1?*????????"?`

??> iY?~l4??r??G5??????????`?H?Wuu????9|??????!??L?E(???C??????~h??C??R????P??Nw+??~9???????eC_????[\????E???fg??}???G?J?ZG?lxtP????k??}??'c???;[O???)?*
2~i???q?z??A?r?~????h?w?UE????$
???K2?b??nX???%k???U????
????
aAR???b?Po?N$???\T?x?(?-?)y??q??O?Z5^??9???^E??????]?{J1D??~?o?a??<{??ME?????=?G?????:???`?UU?"?Q
?Ii????(y??????????????p?p??c?Cm?B?(?"??x?^?
??A?&


0??D-n?A????A?:u????h;>?0?6;??f???h????J
)??0A&??~a5[?G(?r???N?kS#?1m!????u
?+??P??D??g??k????}Q?q7???*#?]??????
??c????
?r??Q??@??\ga??hhB??N/7[?Wl?P??r-Db?mO
??$"
??V??3?#?
u
ho??%;5!g? ?Z^RBQ?"??,ej?d??6??-?
??????U???f???I1?CD?Q	????????*???A???Yw]?#3?t/ahl
'?????e"/?N2v??`D:J<0?"?A????v???n?Y(w7?M6;1q?r?^?u?A????'U????y?PJ?39?<'??n??????B?" ~?_?
??J?1P??'?~'??y?!?>/??{???}???XD|?
'???N(?	
?"#Db?*A?)XPUX??J?%B?$Eb??#UEX?b"1PV(?1TbDc,X??(?@X? ?????X`
C<6????}?
???e*IYU"???d|i@?C??w?/
o??=Aq1o~?????/?eD?"@ IO?????

?X?,b1
Ub?$b?$????&????/?????C'i?Y?????????l?????0?>|?v????????I!?A?oL?????????D??????GB???7?6!???Hc
D?~?>?d$!??U$
"??$?$d
"?0b???EX, at X11??d???????5?=???XJ???=?
c E??Ad???I
?R!!!
????EEb??????????*)?D?*??1?)???"?UY`??DA"#b?Tc"?(?`"?,E@2 (?
?EV"(?0T"
???$T?????b?A??DPb ?R"r???(? ??A??E??+AX?0AQX?b(1U 1?
?" ?j,`?TF0dA?,`?DY#?0B#PAA?H$D?b?(E??
???Q0U4???s???????:A ??2d????l???O,??}?HR@????`?zFK_???>??-
b6Ra??Y@???t?1??{D???~?C3?y[??+5U???iQ????F?>???T???????B?#F;???/?WE??????q???g?t?;?[????Q????\????k??1}%???????????>kV?:(???#??U?/e???%?Z?a?6:;?????#?,??mB2?1T?E<>Z|??2?`??*\tR??2c???
???s?t??????????J????$???"?b:????KtrU*E?????r?????*????]/7I?$o-?p?g???a??2?Yd??d)???7?3?	XpFX??n???D?q??2????
Dzm?,)1^??z;9??!P?n9????)u???
k0??m?/ct?*]?384$?'6
eGMj??	???E???~o?JW&??X?pb?????2??H?z
^DF??*:?
sAH??I?d???D?z01???+??EX?b?t????)?,????WV??n????????%???
qN)?i2?ei?f6+X6?R??M???:L,??b????Rt|?(????.&?p?Gh(g????, T@????"H?#!"???_????????????c&??r??(??t	+
????'?~g,8wg??ID?R??O???=???9???p?n????S?<???`?m7???G?!??uW????g89??????r???mGc?e<.>??.<j???v???????0?/???U?V?p???4?a??Y????G;??g~??<????.??WN<?9b??N\ ?x>N??bz?3??9R?>RI%u?v??I?lF??m?z.???????wt??0F???}???
???]'???)?j?J?wB?r?c??Y?N????`?4?,U?T[eQA~??
?uN?+??&f????T??\3???/*???)F;P0v?yb??V???	??*!$?<?]??4??AU8wu?{2*:xd??1?J?TB-???p?$????"p??s??T,Q??@?K?b?c.Sz?
?Ub?T0PQs???A?g???P??p,?F????',??.?Vipf+)~??V&?????5??Mu?T7?h?F?n\?c
??6?aQ?????:?y{q???H{/yl3???OK[??????>R>?|??????D|
???S?>?????C?E?\,??f??z????_?J???[7??????I????dM??d?k????.v?L??????&%u?vM_?v?`i???2\"???l?Vk??:@?i??
(?2T? ??,X|???0DU??H")<?
????.?XO??_???B(d(??;??????l?=??OS???I?S??

???D??|g????[??????<?fj#u?x?????{hdx?o?a???N
??vk^?
??????|????????Cx????????q?,D?}?X
 8>?T?K<E??&???D8?DVv????m?x???e?;?p4w?%??.??7????I??????????td?b???v+????6?u??_??????x?T?h?T???e????s??(?j??"??E:??????W??????W???
?8|??????_o????B??l????hg?????????????
By???Eb??0?'dDP??!?O?X"k????C>Y6hBdO??? ?Gk???????
??X1?"?PTe?a?b?b+"?`?TTX?AQFE"?????p'?	????$??P?BiD
-????T????CV
P@?9r	!QR\?R??@??F(???T?%??a????RN???{u??	(??_v?-Jv?"T?H'u??n7???"??5??(????????:p?=??^?7?U??????Gxm|???{?@t??????X?!?k's,#?2?g?N?y7RD?e??N?R3'?e
_g6???VA%j#Z?(????O7?[???q??1???8:?]???m??6Yu?e7?0AQg;?M?t`;?????O^?h?_H?1zt^oc????qz??;????\??A??R??q??2??&???
?@@?
(??G????l?l??;c??zg[~
@??b?Ub????"I? ???ZBuR??.???G????~?D??5????v?Y,A]s
Yp`7?1?z??)?jOc?8?RE!?5?,?s?0???bhe$d	?|/cI3?w?LRE???`?!?D9?u8?1??

?????=??
*??}`RBD??H?????U[???r:?RLhj?G.?t?S=h?Y???????1???}T?-??g?????>?E)U??VyX?Z?????rOV?????i???????k?}uO???b{p?gVA??? ??}V??S???????t7Z>?'%????Cs?q?~????5?>???{?Z???d??+?????K[j?E-??wX?g'o?????p2?????>#?U?G??!?|.???u$3[??z;9??v=??????1??????B#O?Y6??ji?????t??7m??eN??	????@x`[?y?=w?????	??	U???-x| a`N????VQ???A?C0??_???`?'??2?	5?|?D/D??P??U<?????iO??A??V?a?$$%R??b???b&8?	}?UF?Z;?????Up??1J?PaU?`J?pz?@?@E?O?P%??q??b????,???ek??;H
 ?c???Ni???
xD????????R????o??0J???????r?rWYz??etl?
*?V*q????
(
0~T????)9?I	??~?!
??X?i??[??Q~???[=???????W=?????z8??HL~??????????N???N?^>?????
$?u?3w<?y??S?P?"I?????l????E?Sl??['fh?s?EGl??????T4???>q????Lf	f ?GW??x/
=??.????Ia??YN???G
???I?8E?l?ca:*?????"O??O??UQUb????????{o??????IURu?C??p???=?]<bD?3`&?3???;?V??r?(?==
?zk?DU???
 ?p?{	???Z?M
I$A???(J??
C?_V???Eb
E??V1D
Z?+	Z?UX(?"??"??b(???*???$
tl??|dU??????T5g;??c???">????d.?a?,e??[?B]6????X???@A?? d?g???W??q?????^??v??
`???%?1??????W
?\??H??er??|?'1?6?????*d?????3???P??z?E??OZ??????B????
?"=
k?W?A??C,F0??~<??=?l?t
Z?h?%????t8dB???W?z???.?A!????????
?2?=?E??<?b?m??^?w??W?????O???\V??-&^?????c<<.???]?p??\???????&|?6?,?DS?y`_??PT??2??#~??????6???</?#????M?-oUS?t???????n
??-u??}<?-???t?c???zi	O?zTo?1?((7
07#??6s????q??
???????Y~ 8?hC??!n?????;7?X:???{:?q?~???jd\n1???5??h6??k?D??(????%??????sTyP?d?O;??????:????3??E?nf??CH???$c?M?b?p???S??>?B??Hr?k???;C2{"D?????I?#??b??t-?&Tr??}r?e?(???????
?R???????w??? p??'????"W?6?8??_~???U????????K%??b???=x0?e?b??h??%? S

^?5i{)|+?|?j>??}??O???b??*-P?????????UEX????9????????AADw???V?4@?e?$a??8F???R\?l9????????
?S?????
V?e??g	wM?g|??N??C?}?k?7
????.W.?!???F?z??u???U???0?)'??>Q??@7?*<=?}!Y??0?B?!????KXA?W`??%?Z??XC??????\~<?????X?;?????g?C?????D???J??S!??+??\??u$????KY?_????D?r??fp7????2???v???7?_8?C?P??p?"=.??VL:?????OJ????3?<&q?V})Y040}?????$(?,>f?%	??3?? ????u??N?n?????
?o???A?????J????l
???1C"?9??>???,cq???l
???G??????CV?;???0??
??b??C???u?e?a`U?GD?&7
e1	??????;????????~???H?W?`????kD??6^i3??4?SR\?XZOE??i?????o?z??m??q?/??JB?4???-!??8???????H??@M?A???Q?n5I?(
?qte?"jm????5)?Un"[3|???o?HZU ;PL
???$=?#?&????T_??Xj	i?G,7?G???v???A??@??B????E\?????K-0Q>?????r??|-@?u??>$???bc"?
[??????????~?Q?mKR??"????cU1?Z?-|????Evn???X??cU?z?????C??>???c?-;????m?V??H0?q^R??t?a^9u???F??0??}???`?bp?b6??&?fY-C
,O??[?6xI?}P]?x????7y(???????c?? 
E??S"
???i??+is?EN?nx
??F???a???"??N[j?w?{??.?~.?\+??K!??t?~^??i???? ?-?h????JfZb?u.???_??Y???S>?(????C}O????y1?t?????])?8????
?/R?*??H$$??:?VC	????Ab?j>5?o????????????;?Yt??i?????~6?C??X
?ta??r???U?f?sn???x??c??T????
c??G?4?RcJo]?k"'?
Q???7>?6???A?T???|?	??????r????K??_y??(????Bvm?,=?????O?Z?xb???4?g?f????????P???*??IDRF?????r??nH?T?{b??)`?W&~e???h7?QL=??c%?Gf????BZ???????J????????Y?F??8??v?j~???.???T?]#????[?dl????#+?j?@N??G????+Doiy]?c]
???C? ?c?
???$?=8???\ ? ???IM??W???X?Z/?????
??%?kw92Y?A??Z??i????c1?\????m???I?.??&6?1Q??z?Tl?,????

E?gin????D[J????????V~1Y?O{?i?-?=-??D????j?C?ZExh5$?????????X??zE??*?????????sUh?Pi6k?<^?0???@?V\?g???f????2????l
????s??m/?8f?J0_#p???^??Y?<??_S?\?+??;?????????????s?5?*??f3$D???&X??f??p?:?4?.3Xc?????%??<?3Q?]??x???a'F??V??}?w????{?%#???Z!?]	
?????*???VO?7$<?k??~?H?j?????u???p-R?D?^?XSIk???O?^?1?1t?	?It$??0P/?N?E?&??8?%Q???'r??w?*?????????^?l?????w7?:?^3????yu?P?A?ox???N
G9????>??22???73?PM????I>??m????????T??{2n?m<?m?3??o????W???T?`??
k?m?M??a???|??????"P?.e??q?;??4c?????"?t??m?XRS??o????]3ag???lQG??]R??????"???v)6?hT????wN?}_,`??o?(?r???"????I?Nx6?i????D)C?#??MD^??]???|?(?T?h?1?Z????*AO?w????,?????
,???[[???J?tX??aG??b??.?%G??"???;<??4???????G?e??V2?r?U?j?3?O*~)?2Gg	?K???wV???`?S?/????{???RR?+????:?W?[???]N????y???F2??Y??bD??E????W?}??el6????????????)D?6??@h4?]?Bo?1@?u?,=??? ???|?X?"C???dX?R?:??b?U??I?G??q???\nBn?n?SM?O???u?<??\????Ql????7??? ;????X?zEt'/??c$?!??????w#K
bO?c?@??S???4;k5?p?F??;??????vP????
??_?R????
]?*t?u?o????? Y?'??t?s????g?c??u?!?'??``?.Bd??*d?O?Ek*?K]SI???hr???{?>??X?h???3?"?9:W?1?!}?O?0?F?2??
?"_???????u?\W[???d??/??4?C???e?<???????x?????W????s??Q?/?G<Q??%?<?G???@?fB`?lcp?
?Y
?????a??/>??U???#???????
?P????y???m?~?U?s[???1????#G???&c??L?\OU???????_R9????|\:?}>?\??????Jm?e ??
?/B6)??(o7??????D??^?''?????????@?@P??S?DW??'?????'k???????=?Q?m#?????? ?!??
??R?????]???~?$?H?`???D0??$X?H?U,??`??t??H?P:2
g???H?@?,cE????? ET?
??M?!?Vf?P ?Z
G???%????F?$H2?,$P??R??1J?3???JiT?idd??d
0*D???X?PSQ?b ?2??y?
>4?x2IA?J?
Q??C	?????BtN?b?n?J??Y"k???I$??Hh?!?zt???????:6???????????Q?K????4b{?
D7R`&k?#^](???T?;???1Ll????]H???w??
?:?q???r??{;n???DA???d?
Hk??a??h$?S`????]?	?"??*?Q
e??`aH??K?
???O&???$|??C@[ 
??T-`m`B?????*?N????T?b?`??/????#?v???zPY4????3H7|?a???af%|????p?C=
??????Aa?;????O??2 l"m
C-?0"V	F
?)ha?????P?s
???U?J (
*?"??(d`))E?"??#???W!0"Ie??,??&(??%?
+J!)??0??X(#%?J??d???p3]>?5?	#?	?vha??%($0I??I?Ya?h???"d???P
 q?:+??3??o&?RL?,?I????D?I?=?)&?Q???uo ?
?r
??l?KT??1?'???/??.???I+??????h?4]FI???ha??}}???w??*???|T???"?,|?l?????, F0H%?k??????^?QQ=?Z??kNej???%(T?????M?????JC??0N????H?M?????PS?`?`?8?#??=?O?I??I?W???}>?r????/s???G???t?????????"`w???h??2
??H?????m??I?sUUUUUUUUU??
"??D?"D!d?;*????*???2um??????h???W???u??L????sq?dhT??
?)?S
?-?m!-????
??ZJx???f,z%?????%??{???sz6H7MN
?*?X*?6???UJ?????UPQEX?*(?ciQ?V(??Ub?TZ?K??K?.???????&????^?v?i???'??????v2?~???g???m`?T??q	???:R???Y??{???????????7>?!d*?v????@1??s??g ??????wM7_O??????o?????~?^#?l????t????{?v?%6H????H???*
{????
v??????&}?????^%vO
?t/h???N?P(??S???7??p?98?f?!?f??.???>???E?`??i?3?g?.@?C?`|9Y0)?	>
??D?1R(??f`T?b????\X?NqE?"AZe?????????3?
o??&2??JL,P?*z.???%b20X?(x??/?????	'X?,??`?????b
??
(HS R?D?}q$??hea???j'??,?gC???uE
H??
%;?	@?B?5R???Po/??q)?? z'??\]????+r????,?
?a???|=?h{[r?{??A??8????b???aG?.=@>????^[?D~?0Z?]?W????Dr???(?rc3?t?T?ut??j?27?vTG	???hHD????.?t?2?T$?m\xQ??2g<k0?J??Sj?73?g?????*zSo{<???68?n??A4???k????2??@???>??/????vv?9????&??5 ?"(A`?dSY1N?$?D?8?~?s??^????0a??:?z$6'4?r???????|???;?.5??gV?u??8g?uc1??g??!?[z???5o??S?z"??>=???fx?Y???&?M??A???????
H?? ?s,??????f?@?@?!?7.?~	/Go????^#???|?d?2?KI???b?lT???8???yC??????RN????tqR3Y? 
!?????R?T= P?p?m),?4|?q?TTC?????|?QP?!Q???"????????5??$ :???D\?????}?n???????2?j???L9}???p{?@k????bb~?????P !?N??["??zx??????x
;????9?? ???*
E?c ?H
DI
d?$?$P?
??R"?H#
@,Y
@DQ ??,?Ad@R, ?"?

,?XAD`, ?T??
?? ???E?!
?A??b??DU`???dFH?
??!$b*?#
	?"?1b?"??H?#
b??1#??"	??b*???? "??1?AAHI ???*?TX ?????dA?1?0D0dA`???
TX?/4???[?5???Ao?f????U?;?@??
`?<????u??Oo#Y?Y??W{????_}???u??[???#??,k??v??t6?o
??J<R???|\M>/??H|????????\,Q????D??)R1W??!6???8{,W?zH ???x?????f?!??cUh(]???.?TB

A??????h:?]?k??y??j?@?,?
`?i???;E???(tD?
[?s?*??#7??-?MG?yIz??m?vt??????^/??"??_?"????)Ji?Y^?Ju??,?{R???V???W?4N??t? ?-2??=oU1D?{^???J??b?1j%?iw?????1L??:r)zR#)?Q???g????^/ui???xYe?(??O??F??r?(?kcM6?{o{??1??F?
?M2???7?\???????U2@F??\7?~/?~>.^??o???1?^???}?9?B??????C?????????v??;??_g??F??W????{??????3U?vs???lsU?Y?*2RBo??????g?B?P??v-d?@?|????#?$Ea5?.r??U
??2??JVgG?2??T?=?????OwG_=>?'?6????f6m???v??e?u??g????4?M" xb?}?:?
?`w`?z)?\4!?[?0?R?????7s_"]???????
+?B????y??{;
??7?*?CD?p
]?j??{r2O??JS??->9?g??
????????[??nM??%N???C???L?SvL?F?,.?FCu `?v3?'_?3?-??Qq?B????????????rrs ?|??\?^#?Yo!4N??`????C??D^q]Rt??? ??8GR?\????Q??V???(c???/??~o'?F??#M????
oe???w???,|LRW???oj6???????C?>?????\b?|=l????P3&$B~M?=?un?d-?5??)o?	?ccM|?@;D0?8??1
mm0+?T=A(8^}??TKn?r??w'U]??^?Z???cO`7?Pi?RT???jjN?#?i=Y??????[?Cm??T@???
?^K]??!g???T?4?A??5QL?
%m???&?$???3??t??E???zgH???? ?0??}??>F???Ux?54???k?Z?]~P@?w-??}}U^?-??????????~?L&K???A<,???i??*c,?	??Mj??C??z&E#??N.?;?UF0`3??x.V3??z?%F?"???????<???G?,??5!W?9?\)?{?-(t???9?Sxs-??????]E[?SaF?0??j)>?ufm??!?1Pk7Y???Z?^]??E)~M ??Zx?o??18p?6?su?
??@?G
????f'?????????O?t"??]A???=N#(?k}8RH??
?(????7xY???]<@y??f*T???3??2????j	?*??????
.?(Ar???l?6?|A??5=$q???zn????:?_wT?@?Uj?`?EZ?$?#E????FfK????????Y??$B?H?4.?M
?@B+*??Z?O?c??z6????ns?????????^`???p?????t????-[?9??????By?	Wa]M??????B????.,?H?I?????m?e??????!?_d?O5p?????9R?????z???????S~?M;4???w??_/^?9??=|?E9Gm??#
?????9??[??????>>?&???
?Lq?r?*7??F|?L?)g?????:(H?0????:I?v??}4H??????????<'???J??????d?????{??Q??FJ?X??p???E?E.??8?;ra???\??nMS????:??$Y|??.!v?u?HWF?5S?O?^N?/??S??3??????c?"???mo??E??`???????^?????m??m??m??2???n????0?c{????;??}??G????b]??????O@?????
)????????S?{%/QS??]?E?%]??{?^?{??}?"^)??o???Mk?U??~m]#???)V?????v-??nD?d_m-?0???}&1?g?|mg)?;??Y????????7???5Lk
??F?_?z??Q???S??Vl????6U???????F}
?3G?/\??CLj???_J???+S????F???G????uv?????=m??
"??^?t?(???2?????@?~]z?h??????O(t??ys????ho??in????O?cNk
U?<???f|vk??k6?5`?
?<?n?!%i?1?#??~5J??????cS{?????w?_?y?vQEQEQEQEQEQE??oc???????#'????+K?7i?p??[0na>?????yy
?v?e?F	 ????;??O?e?#H)/??1??V1??@???3?i}F?k9??oR?,?D????????~??c???pe??[m7?R?d?l<b??r???[?6"Z?T98$eY????
??7x?2E&??	?C?m[????)?]R?W>?@?Wl?IN?}??#?AU?????(??)%??W???z?i?Y????r??n????L?9?vLe????VS??&`?3G]V???CDX???f????.e3???_?R`:?D????????V?~B???~?W??1????Jz?w?????{Qv	?^?y???m?-????????58!fF????????!_%???HQ?q????j?f?DT??????a[??N?3?n??x??c?	??be? ????c7???IG3<?g?oNt#?`?w??	;t?,Hg??+????v??+??\}??u?{F0??&iPc=????????C????~?VB??||??tf?s}|K?{??:e?X??%???LD??	???4TTs3o???^3Nq??|6m??mg@???????w5??	??t?l?i?'?qh??v?r]???D9?9????z>B?E1???L?J+h|g^q?????~*??{??;y7??<??????????+R?-??????[Kim-?????m-???/?5?={>??n??=]?<EE?\????TY???Q??I???c?=?]?????!?s?C??F!??Y?`??@{??{rK???yN???e???8??dp?O?!
 zU?j?Vj??????^???V?6?????????G?xO??z[?P?????9?S'??????v~???I?e????G??9
??????t???D?o`t
7?Vg?G]Fu?J?????????p???y???e???
?k??1?E$?@.~??h?r?????<??q?j3[vjr??I?z?4??/<oX????Dd?";?NG
\???e?=w?7A?:_?I$?I$??ow???????B????S^b??Q?{T??,????????"?}?n ???L????????5?K?J???Z|?w#?|t:.??x??7\?;????7;E7?????<T????r?????Np??y?e^?????ojO19?????\????????yN(i?I??s1??iQz???????p1?u?x??X[S-??`?f??r;?4??q%\??`?xpf??:?????'???va!????/?????U?N??[?7???????????F?`1?G?laL1??D?8?s'>SH'?FM?>???P?wk??r?jn???U?2'c|O?????vy?%???????U??(x??????r??*?]@N#???b?s?4?y?????59xP???????
?`"7h??V??"?V?$?I$????????n????Z.??8?u{???]n???Io?=????Sy???%Q?G4V???????4????Lmze?c]?{]Cm?A5&8W?A?'i?
9?D? ??*r??o?C?d? ?b????\?,?1J>?NQ????n_?????&??`?P??
cn???
?A?&]c??v~>?g?>N?p?3x??I$?I*x?m??kp??yG??S??I??
???f?;????3????I?8P?r?Q???o?4_????w37?????????C]
?QH???%
?b???4?J((E?D
 ?X0?E??RB([ H?2
??{?C\m??ms?60?c"?=h??!??y?m????NN7?k]???[?????J??"kZ2fj1??????Mk??????(??(??(????E)h??b???e4R??jR?? ?1?N!?????w?qb?P?
????$??{?vq???S[?~q;???G{xH?:?g???etTz25?3eA????
 ???
?OQEQEQEQEQEQEQEQ!!!!!!!#2?m???<@8?s?????:?=??Io?_???	???]Q???`??;???K??yh?:?!?Z
v7?E????O^]?>?6??5?,n?????y?(a???Lh?-Evm?zO??%P=~????L4}O?'?#?E??_U?S?+???7sMr?????B???2
'??3@0?]?y?I?}?u?47?Vs?i??nM_?
??M?d?{?L	?5s{?}?-kZ?Kim-?kZ?J???kZ??????[Kim<?:?D>)???J?									?|T??W?^???`l????Y!
???u{???}2??|??@????u'	?/G?????L?D???'-?^????N5?
?z0???C*R?D?:
?%'Z??I?woU??n??atz??N?SN+9??rdE_.Qi????-Gz??d{?o1??E"?,?Y?f?icE?L-&?F??????~<xz?9?c,7?@?m?9*~??c??!??l?yx?k????G8??}:N?????2??W?q?:???ra.???@_`????[x??????}}m? ??G??t2:U??~??????????????????Yz??[???6f??|&???j?c?????=n????J]??S??Z????M???G?5??xqL??^^???tm????}?]??ez?&????|<;?2?[??C9?83?}?T?JUw??????r?4H0??????IT=?Ot?[?;W??:?\.v?{???m??????i	}_???Mx??;?Z??y$?
g?'?b~??7Y?(?m
(q?9??????_?;$??a???>5?|?????U?t?\???????"`r"",X??i[?N4y_'?B?5?36?"???i)A?z
?DH0???4vK?B?
?h?<????Z??wfb?K4????I??Y??????Hqm???A?k:e#?U/?1??{?9m??i???<??QEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQEQE????^??SO??/?????d?w?Q?????N_/?????7ZjL_?mu???????s??[^-???????gJ9??f?4)??D?Y????+?d?}Y?????Jk?ZhEv8(??b???QA??k???G?M^??]???uZ???J????{???2??Ib[l????|/^??7?p?jm??l??M?b?i?B
???v`???g???:???N?h?9?Ln???*F!?????.>l????c????]?C???Gw????????6?6????p?T<???ru4?P?y??
???????s?z??'??t???Z8f?
s}0?`?*?i?)??3??;??;?z????????t'???w&??wJyjSY?`??????mc?2	3???n?yo???BC???????C??I?L?????&Nv?N|??&@????3B????Wv
??^???i?]"?????{??n??Z?}v8
????f_<??&?????!C??.W???!\r"Y?1???H???l?/P?Z???r?e?????U?????)??|k]^s;Y?l1-9??>?[????8?q)?R???&x?X????M????????Rxup?B?N??(??v?89O????3???#????Mi??^N8????????	c???BDc%wf
????
#???t??G?u?'*??2????B???mZ????V?+8q??
t?MT??1?k?sR?o????7??X???7Ow,?H?oA??o{o?\?I&
D@??;?tQE?2????eQE?u???:???CvK"???[Kim.??>??????k????n[~Y?-7??v_????m??DCsf??pm??x??ot?Bvo?????uDh??U?QEQEQEQE2sf???2???	19??>?&?@???d `3Dr??????}?S~??U??+H????J??-?6?????~	?????H???h ???mg?r?R?Hx??t=??7??"??.?!????eZ?#????n}?????9????f?%??Z?????
?P?K?i??5mZ??-8???58[?????f?q?o??{;?^?_4?{???~??????w?}M6t!0??N?)=.w?<&?Ik???Z?@?v?~Z:?A????q?0y??l ??o7IDp???<?~???zg\??u????A\?Y?.??=Oo???:BgV?1??!?G?U???;9?y?P(Zm??9ggp?|?O??o?o?`??7
-??S???'?+?jZ??)?????)???g??G????V??????s?]????F+??)??&??{Q?|??8?A6????_m?w?v?????"?_b??8?>W?1????zs??~?(??(?????o?{`??~?k??????????)??N??<????_-o??i?\a??W)
??????e
?@??D?C??????,????1u(,?1l????d)?? {MS?)????4?:??.?????wL??w,?{k??m?/??17DW????1???|???kk?0????SU?i???A?`?m??6Dn????L???B?1??????cK^??0???6??#u|???24|h"??hF????d?w%/??-?v~Zi??i??????Bv|???F?t??{??sK?8????]????D8?????3Z????l????/?!???{?T?Xr???Lw??????&S??o*
?k?D(w??????;'3?-'i'O????k?????'fo????Sp??dg&?y??l?????
7@?Niw?.?g??3E???^/^Yg??,?????-??m5Y???;???fe?'??=,?[L??L??_?=
???"??	
?X??K7?KY++q???????Z?k???V??m??E?????/???]??h?Z????v??W7???.U???:????a??&'?[z*????{?I$"z{????|?_?S?????a2??Bl??T??0Bww
??x?????_?e?X?e??.?@w?ZaoqL?????j???[??S??????.<@????h??Y??????{?u(?^?;??????<?:????r?n?_??[/?cL?????dY?$?E
????r5???????=b???????OG??K7?????22???,???Nt)????sIw`?c?????FfF?????o`?	X??????*?
????vr?????f??Ay??p???MSb?]]^?????5A^??*?qe?Z?`[??e????Yg?V?_K??????1??b?$??=?????jb????????C??"??$$(????(??(??(??"(???s??-2&f`?ea??3???M-???L?,????L$?N? `??4?z??a?1:?0Xq??#??u?_???b^?eaR?U??Q2?e?C??$???J?X*?<S?>89??(^;?5?1??P??|i?<{????X??	?I?o?$????v??a ?NX1??L??^??8?=?????????\A?????}MIa??????n?#Q?L??>?!n?????m?=??.???_?n;?x?jTS???O?T?????????s3?????i?/T?X^??^??%???w?????j4s?5?S7??|??_??>???w??j?-???\3?XL=uI???!w?_???%???o(?8????<Y_J??J|????>? ??^eZzH?i??U?c??_???~^Npdq???xES????e??f??us???V?Q??&?/???????Dz]?[[W?V?`??}-?r??w????td%4
???'????$L???X P? ?B=?????c?_Jd????Nw??????
?S?\tt???mU
?:?+?(?#???d???Yo???]??I5????eLm????#?m??os%O?p??o?M????????8JM???????m?K???B???U????]?7*??????*??{$??K?,??J?b???eZQ\R+???&?htq?y|???R?R?????/?JyNY?c??9_??2UWS?y?L0?q????Ol??S????k@?wp???6]???>?:?????t?fH??#PU>/???:???az?)?????>)>????r????Q?EQ??h?????????}?Q?H?#?l!]??V?)>?bG%?Z?${hP1??$??yr?B??k?-d?????????6?XU??Us???P?j?+ab;?p#??lfC-IW6?2~QQCZ?Nq????TRu?c???-??4??%>?????;???F??
??$e?c???????????[692t?;&?Q-
0???DH??#
???B(??bDB0b?p0????KaY*EUV?a?i?N?
?u?I??n??????Ws1]?,?\?a??????g??2?s?O?????i?)??????????8}?1d?_???XP??Vg?>n??z?1??:Q?Yb?||<Q,???;????????????9??\??7T??[S???,?t??????????????kZ????>?d??f???P???U?jC?j??^?nm9?SFF?T???(kG/h??I?I?a'y??,?????}??Tz??(_??=???~Elw_)_j?Lm?????"?H??>z*???ju????_j??|?])????nQ???:#T$f?e??~n???.w8??U?U??+???????w?dc?;mB???~O??&,Ms?	???????Z???m??0??<?y^?fw?[??????
4??ux?<??p;U???S?uT??t?p???V?=VF1??^???/Nki?
1??u?#??????kx?W?v?'??G?`?????~;j????|zo{??N????~D????)??_%f???4?~?o??]???{??w????yr??}q?3??w?t??\:????\7?????)?L?:^?)????w\c????:???s??-??N3??'??<4???o?-_?2?MM??Z>8d?8?b???Va?S??Z?9m??????i??????uGf#??????????nL?Y?????????????x???oGWg}F?????:F?*v?\"?e????@p0?*!????zz[X?
G????`?V?????Y???z???9???????O"A???1?Ci??????y$?o???`??W???/?d'?$??1????2?"?Xo???<|k?{???9?5>-?Sa???8??r0?W2????c??h??-?<B??'?????*?hd??~N?9??\???y7?Y.?????P?q????R?i_N!?1??}_???A??3???PR~?????2(=????p?Y?e??B?t?u?mq=?R?k??????mpW(8<2B??{mA?TU?1??.???????x[??nF?/??}?+?z??P????A??`1??C/7L?CH2?Ic!?P?*?ue? [??X\?CWHJP?c?rxv??J?>???k?~Z??L?dW>?Hz?!???A??,???????g????Y	M"!9L ?!/ ^]*?+?g??_?3UUgB???an??t?T?????S??)?????U?*?:?N??????:t$??J?????J?q
????c??N??s????4,?J??#?#p??z?? ?D?$???u?????&:?C;0A"y?????2
V??????\????N?.?>W??_5?kR?b?L-
GZ????0?UO??/?K???jby?S?H???X|??zX?GC???shGA?V????Td$%???r&0?*?? ?*?????6oj?`Ud$0z??@?[?o???????x?G?u
???????}5.????d$!?~?)?2
???*???C??`??,T??"???+	Tk(????O??I????b?-????:V*?????Uh?U]?u-W%?~O?t^#3?J?`??9?Y?k?K`???)`???UUV ?????uU?
??qj??m?8-hR????.]????}??O`tz*?5???=iJ?J??Qo[???e??[4?????)
Z???%%??@fR???!?Vq7?l?P?p??pP?*??&*?|?."\?BA?6lB?????%?L?@@??
-oQ??2u??N??}3??u???
?????|??5b?+?G?????W??:?^e+&wYfyu?n?CV???????p????~?c??"".`??8%?????)?gi?d ??|??5????g?b8??Pm??<?-??E????s??+'???J???y???L??.-?????l
?????2L?????<??????;$DJU?*";?+5??{??=??????????_?z????r+???c
?HH???'??2	?	????1????????hu?.@??????5o?????>?[ERuh??C#???????EUL?-x??L???z??ZT??w]@??r?5?h2?????f?	,t??Rc??P??2???F?????"*???a???Z??t?H??S?J+?C?????(q?@_?8??M?I???Hb???UQ]?c?I??`??!?????????
?Fcg????U
X*\?%???}?M???gD?I?(3??
? ?()L??Q????cN$\d?"?E*P??9?2???8B

?????C"f??????x???\?ZKP??"?"
?????T/?=?'l"??Wx1???e?????:????oN?v?(?t?I%{?hO?#??9iT?V?????MF?	????r~0?
?X??	?y?q??u??}7N!?? ???????l?????y ???yMYa????u????v?\????a?h`???????:?R???f??????1v?_`?3?I??,j4par????I?|???????=???)j?,????^?*?MH????R
?X2????
?
? j??Ri?3?}K?WH'???8?#?,F??F?C?2#?>?EW????1???4?#???*8z?#]??
??U???H*?b?GP?(!?HF?4??-?M??B??c!?k??Z5{??????$>x???1?^Y=??j6?v#????J?G?("G??^H??C
0k?{?5G???yX?Y?????W?*a"??]?/E???2	#"@????????????{_???}???7????)??????^?W.???+N??E?u?????p???
? ??:??<?gO???
?y??w??T?%*h????
?y)t/p?2????Pn??zs|??HcP??q?|	1?&?3??!??
5???@)?4???tl}??Au??dB???A??[?xS?.?'?+>?:M???F*s???F?/0?Y?sSe???=,??Y???C
G??uQ?D`?qL???XP????
?w?`??@F
??"? ????{?!??????y??????
@?<?B?B???&?????????hg??Wg?ai?=???Ua????????V??r??mw?????w?L/??4O??t?B}9?{??tu=???sb?????????gp??????C??J????>???S??~:?
? ????????'???@??o?8?b2t)?,?????????????X0>??k?@@?#?B?w?p?0/cP?K[???u?????o~?????
]wN:??C&???"]?,n??qaZ>???[b`?`h???????q?o?RL?v?Fv????^P^/???T^bEUd??????1????,F? G??u??J?:p41@?S
??Dv?e??y?.I??%???[??.a("[&s??~yk?zy??????_?z???|??7???A?n???q??N????^dw??R???_????P??|UP`???1?!?C2?????CN^r??????`??Tt|??5	???F7)????????D}0J?Q?n?S???????%(r??[?p???Eb?q??v?q??_?Y?o?S?)
?_o>?9G???.x??b??1?H"
?e#??t??T??Ce?u\M;{??s?'m??W???Q???J??}??N/G+S)DL??0?$p?j?????n_D$?f??????3tA]}???x	??H????????H??J??%??>RQ??Tk???????c??(^f????
H???"????_??r???f????y??C??3~?.4??c(????\.????5???;???Z?#????)?????/?P?,???!?e????n???W??Dp;????h?@P???8????{???????`?u??M<??.?XKQq%?|?Co???^?,???t?:1???S7Sw??j?????T?1
??@.??@???? ?(z???T??{h\O????L?@?a$?2H?
?d?j?????d??&*?????r?01O?	FD????????k=??V?k??$??;??
??N[2????d5\?_????oB?k???`????<[L?!??,??)??"}?K?>I??v????38I/O?????>??:?s????9???S?v????T?????????R??????t=??=?,?C????N???*l??8ot\??)aE?rO$??)ad?Bi%??K???d!??Q?k??U?~ ???3? ?T??RqI??????UD??*'z_?C??;??5?N?x?>?'c?QUNY?cEU???x?????????7?^???d???????NP??2=??A+U?J?u????9????{?8|=???a?V??cV?&????-??^?????#*??????8???#_=]??:?W????x9???o??S?s??X???!?????H???&?`
N??=?M?pE?z??~G??nd????x??CO?0??8?=
?
U??j?rD?}?$?za?I???i?b???hI?J?????k`???>
U???6c%?]
??Qs?z?J??J?\L?t????s?K\1?N??*??M????"<??))h?7\x?9??k
?q?h?]S?X kE???/????8???6?I2I!S?bI??tn?^>?[??P???????2k??1?VUxRQ??s?sDI???"Hi
C????#?-t?'q???"?T????c8T.'a?Z??l??3?g????????????U?RG????*8??m???
???}?????A???????3????>?.?A?R
H?Q0=i???1??S0?&???;????????6/?{???2tq??&0?p`?d???{
?*?"?a?????????
Ba???}G??l?BE5?"o????i??4?Dd1?s!
??F?????,]?L????iHu=????O?Dp?iv??'<9|$?i8?Z?E?%C?{OS?j?]&?mq??????i??	@BF?b?@?f>dy?P}@sb???h*?{p??????U<
??4csFv????A?]?m|O??O at a?J?j*?&?]?l7.???F?u??N?eb?/9?f??r)S???n	?Rb0?)?v?I?H????%????M?H?4t????0?????
5????\?=??K/\P????b??!ceH?h?1?U;??5?1??a4????q
[...1780 lines suppressed...]
?4:r
??????????`??K?>?>???????D??C
F????????????g&??c7}?????G????}w?l??_??????)??J?Z*oR<?<?A?nl????-6???Qj??D???E[E?G???=?~l?E??`?as?S'??%L?~??Kk???f??O?D?L?J?????T??d???????EJf????
??????{L???ZM?~??????b??????T???Ph?{$9???B%?Mv
??($XY
??BY?;g,
?m?%??P8?4?????xo?m??(Q-s:6?`?X?
v????Jk?R?,???|4
h(?
V???"4m?>?6M???K	E?????{?????E???m????
?d?'?i??????]??u????????}S-??t?-*B???[nZ?c??m?25aM??J?J?(h)????&K?]?tul~????Q????	)T?:6n?%B?
TD?
d1???X?y???'?1???2t????5!p??b??Q???'??????
P 
{j,!?P?N?7WK.??l^#?A??}?5='4??S??z?k??2ld?N???zk?	E\.)?f?R???IQj???????"l?a??????'??A
t6?
?????4zN???lX????r+U?H~?4K??j!K?d??I	f????}M????-?-?,V???	???<?1|R<?
???"@??U?d"??a???{?)?,??_6
2?D)??4?Jgyd?;C?????o???2T[2?P^????
&='xi????n??	??Q2????d??3?x#??JF??A?,0JFRX????2i?I!?Kp?b???????x=h?<???x	
?s?.????Y?{n??o?Ct?i?a?????"*:Kl=?Rz??"?je???%dr?aM:?C$?)57?
?%?*h?U?P?,e????_??{????'|Q??Hy??`R1?????i?(h?N??????GC,??DL`???:?_f?????-COI?q?e??m?
?]ua???????"?
?B2??u???????		=X?s
??(f??????? ?C?70????v"??a??Le%b?@??KAbn?d?Ox~??h0?R?)????
???(?0?S?9l????o!}??
*R?+??5,cNl??????e????&?HY??3???M?%21$?`'=?1	? ??#?o
?SE?]X4??6H?ad#???$?!?J??H????FL5??+?&?IU?A????]A0??e??q3??D-?Z?E}???????s????????c]??????>?O?5??!??{???v[???D?tO?j?&0??ZZI+gY???l????6Cx???Y	>Dp????IT??6???k<G???C???
????(??
?K!d???j??2???c???H?;?<?=????JI??(>^????????N?*7d??n?h+
%?0??CE??e?`xGM??
e?,?\???n|?/mhQ?x??'@"???l??????c??~ZKO??~(??0????p?Tbcc>???u>??r'?
D?|?????\_v'???7??Y?????R*?????~??Q????????j???P?31^?o?:^??? 85??M(???h???[bc????B????*?K,????"A???
o???2?Z??????Y?;??Y;,?-?????R????De??r
???~s??x??$??AM[??^;??/?1?!OS?Uep2C?X?1?Q?????.F\?c)?????$L?V??	B????w?D??h<a?:Z??q?h?LQ)	??7t6?:?
?!?o?? ????P`1?K?3?;R8?s?w???
?IRRW??*?tt??7?????L?. ??(R??.b??w???@??PF?j
H:?7BtBhL????c
?9?	???wgPZ'H???'?lz???7?~???a????hh($?1?????????b0b?}??"?x?'?cy??S???;S?@?RyU,,?uq?C
???%{~cN??h?'?TJ?>I?-???N??ZN\?????????I?C??G??(?!|=???%@?4?B$O???3?D?SR???&???o???oS?M??m?3?
??9rV?@n??U???	?,??????%????(t@?N??	-*???>????????nC1R???u'??)???L??^H???A????^X????D*???h???N???k5????P\???$?+?w?D???e???k???0C/??E?8h???7Aj?q	?c
$I??a?dK??F????:??i??av??r%p?????f?7?UI]?~L?)P????{}?+1?2????#??M;xpk?a/?u@q	????????%Rh??>~zb??s4-,?{db?A???$!6???????\8i????h?K?,O?????
X?+?646??4?1.u{??|?P4A???B?)M?6??5???"$?
???T6v????`?D????~?&9L????8#K:;??{4
?(5????y?"????T!?w?]p???4??T???\?????e$M8`??(H?"??B?&?\??X<?????#?2?RB
?6???
?JhZ????YK?t???p??/&a-?A?0????I$?v1H????@(Pa+i?&??0??$?+	IR??N??$???'F?G?Ma??D?*??/???c?]?KQ	???qKQ?f????u?6??at^??H??>?AV???1???U???>_?]???f???*????vC}?h??3????d!h??CI?9?+?????)A?"&?AWT0???????v???????7lG?????9
??I?"?<?x5?

h%bI??????=`???	L.C<n????#?(T?K???	??SBHA A0@???/"????4[IL?m?F?
??f????vtGE;?o?m?`.3#A??NH??l?{dp???;h0???d?D??
?]?4EKK$????(kb??f???4??h"WdsK??C??????]???!?#}??F
??^^????^???d???f?
`OI?)??N???U??,apP@?????X?'?&d?ER??????)???????x?%????IV?8??u?g?? ?????k|	?
?r??5C????#~?x<t?(?{?8???=?M-?	????~????x?O(??9??B?Q1?^?eM
?9??!?C?i?*X????I?im*\?
iDA?wk??	?????Tt????m_?T&?+"J?xS???`??X`#??*??p?g	"?PL?Y-??T^x??~?qHa????J??R5?Z??/K??Ix?_>???Jn???@3y??@??:?c}??gTm?L?f????.Mn???#m%?$[F_:???4?A??` lP?c
&?%g?"?(??J??????8ZG#<-?-??s?!??????????0??8?????U?????\???(?T?9\@C???rGH?-?p?d:?snu?V????d?:?DB2?u???l
b??i??}o????`3?{?&???VS1????^??a=???,
`n\Z#SU???=9?R?=/~???;?#??e???)???A?r8s???3^?EuqNs???*?4????6?K%???=????.E?P$8D????????N(?|
?2?$f??V???PmH??F?gZ!Er
?mS?{X?9g+v?l???6???rY???????-b`?{??
??G????QUAb??\B<J
8?????I???
??HKF?fE???&??]y??eL%?$i?
jR????????4S
?e8l??~^???{???U at 0???(?(?????d??`?,^mL>-TO.?x??+	??p,
?HI)?ct???e+YN???da???a?$???.X??FJ???#[*W$;6b???1???w??i]FU?3?[??????gK????|f?<N???t?;|:%z?^??x?????+?
?Q?6v4?o???,?:R?X?G+,?h??0?e?4f??'U???(TZG]?N??0
?u??+(?b;?pa???D??4????B?CJA????%?B???+ISj???i??:f?<?????K<?V"]t?4??FY?????1??HNJ???P?c?I"?xDc?????5??Gg1???xpO'?	?5??Frg(B??pc????8L???5??p???xv?d?5???t3?<v?????3!
?b??KX?4aTD
r???????S?"C?RC]R
????1??G??s?A????f?8?Ic*$??dHU???gy?1o?r?"54??5?Jr?8?-	?lX?????f?p?[??>,?Kv??@?????? x?12Pb?(?h???`Z`?
???1?
AK?_p;?x_^?!b??1??(<	?h*??	?;
5Qb???b\? ??E??He5???V?????J?f?+m????????Z?!&???
??I/,Q????Ui????o`ov??6{??Rk,???M?U$??U%???z6X??;7????J+Y2?L?(U?H
IdD???aO???]??0??\?R}????????~s??#4	_J	?b*~L"H}&?0??????]??l??A??G ??d4????????)??Z$
"XkC?	6?F??K3????jo8I!("??Q%s??E?\?4$Y?"????????"??????N??_1?ldY	??;k:?p???$??H??oR?\????{Y??S?jp?Q????8`???>???????D=?gd??kT????`x+^?D>?*(P
{?l??,
?mm?????h??H??t??nk???<M"?,?#/@?x(?R?Y?Q???tl}L???#mu5?PT?$UY	])?d at 8?
j?>6?I?0?$?I?t/???%E
1???T/??o?8?Q??d?}?(B?B???????????JF??yX8??b!t???Cp;t?g???:????B:?7?????3/??k????6k????5%?????g??????0?
???i??1?-
????>?i^??9?x\?F?
??R0?$l?!v?5?5?????a??.??>???????^??
??lDJ1naH`y??~?l?1??LBD?%A??B?.?r?1?3?%&*h%?(??w????M
#????b??p??N^5?W
[Z??Z???Vc&?%??]*?{!
???;?L????C?S=?
L?V?????T9?????{:A??V??e??(5Y??cF?>^??l?S7?BJZ#?q??????Y{kh??2NE?F??Cx,?????j?)
??%MP[
???W!?a?A?X?X?0???U)??'W1?"??wI?h??R?H??????Q???y$Q???4????AU?i?7???I????h?T??w~W???d????{a?9?i,?????E?wQfH????"? H?????6d&<????F|???[=~?m?<?z?'1?Akd/????RL??:0P?????F
P*1?C??
?tS????
j??v=?V
k	?"C??1?@? 1
??@??j?m?q0~???a?A?????W
?Z??	;?$t???;-?C???R??Mh?^??=?????k?g?~?<:?????
?U?d?2?b=k???T?au???.~)?]h|??V?@??G?c?-%?-$?v??c?t?n??????h??????%-????????D?$:?(??????1?;sO<+M?i?vVB??
?Ve??c?Q?w?F?_?L?????jC?M^????m??I?E??xV?x?<?[(^
C?6???d??1:q?V?0m??U&???a?T???H?i<?.?I?d,??B$ ??+"?F	?I?]o????gb?B????1?S?O?k{????a"!????D?%!??mMV??????k??$=??#?d??:cA??,?)6,??z?n"5??Q??o0??0?,?C2Vg??U?O?N#j? ??????b?$1?????????I,?,?3??i???pT*R? ????!?D5;L?z??z??C?B?2u???E?Z?)?`<???
???g???|?$O|?R?HJ?%??????X?ZiZ$J???D
?~?
?'??'H???{?&??
???M(?hX???????R-R?V?B?*C?
(???i?b-w?5?d?Sa?????q?w9???????????PJ????YC0??5?(??m4??b4?????r_/3??\Mo???????l??n?A/
?$?!~?'?P??d	??e???-????Z??????+R-i?ke)X??4DM5??$??!$?D????Co??>???_;H?f??Z5?U,???????? ????
?#??!???U?8??!?'?6MrvG?????:f?"
<[B?A????????d???1?W???0?|?x???????,=?7?"*?)?(j??H?Q< ?z.41U???]?Tr<?|?4>????t??+??????Q?:??9??Uio4??5t?n?%?
0?3??6??%?RCh
M??4?????oM??3?$PL???Mh.??????"<?;????	!?#?JU(?qPg=d at r???a?\??G1?=,?Ia	?????\?4?:?!???_H??D????_?[????)L6R??lvA??F?J+?`t??J?<???`?C????iJC?2?4?*6?v;@m4???QY?,?`?x?vEa???m????8}?tV"???q?Z??@eqZ	????
8X at b?44G?1*X??\7???:u~??????;?K;??#??E!?i`?%???-?W??O??,??o?I?S5??{L
Z??>?Z?na?~Xx#?zeW?e-????;`?j???#Q????JG??????#??)$???????)hX???H?3???B????B????lY?6??Ur?i?4r?????HB?$???????-O??l???E+?a?N?i?*0~?k??=??
z??G???@??}?@???B??????E<??h
"|?	?(?l???&a1?5R??@?f
4?$????m?%????JRt???+???tC?;???P?"????	?;??
???(???7%-?????f:?????E????.*g3.?u???P
5o? ?Kk?????Wy???Y???[??
?L4*I#Ddq???????D?Jy????h?I??=?R5-???n?y???,?3|lL?N?@??R??/??T?)?K?x.????<???4?yT-??8C?a+MU h}??~???ps8
?D"R'?,?s???Y1k"??2M?
Rm???i?!??%0[???T?Y
?D

9y??cLliBc!?9?	A,,??<m1'm$a??%???I???N?X|???d?E*E"?X???mT??"???Giv?"8?h;9????s8???yZr?gK???"?QF?$$????2?;?:??a+J?0??? 6?BVMCQ???\Zs????S?Gb????M?8????????z?"??x????????n?WXn????L?H?d6X*???????i?R??1'T?B=??,??V%*R???N?g9i$0??R?,+??]?A??L<??w???????BvG?D4?n???N?N?FB?	>?????DZ?r?3??'3?E??u??k?*??????
m?+?I7?VZ?Hm1?~?K??w???vZ?#B)??1@??Y???[76?b???c???HE	?ab?sQ??{1V$9
?L5?
Zy
??&??M?
??3????:??I!?u????e????l?m;?M????)?S
?w??Y0&?v?l??% ???s????5EQ??H??eE?h	
:gg??&??5?o?7??q4l?N????2H]Q?~????"?"?8"???PM	?/B
???l"<?B?x??_???|?2.?s??t?P???n??D????WG?U?O??G??`$?^????????K>],1AUE$#????4?pd8???|}K?P?"?????&c~?o?!2p?@t&`????>????Y
Kh?)@??J?^???|??$?!Pk2??g?&?O??0C]???(?{?
=?=?/PA???}Q?4?????<0
?T?`h?	???Q??Eg??n4L?? ?|?O4?????,00I?3$n&H
9?	?B?r?r??????'?%aI0?GtBJh5?4????=[??,?h????i?[Y??I????R???@??J??L?A???Ph?
*h?i'?14"?0*?e?B-?0?2&??L
 ??3,?Y?'???zs'=y????fCR?`?B?`Q?U
}6I?3????	Wa?.)?Hx?????
????4?TP?
8B???aR???r?AC?*?T????6??9?YA)??Q??dA??s?>????6jn
$?E?,???[T?,?E???%?QM??
????y????]????????^1aw{"?(D???P?IBU'?'???|A?}?j?Ol]@? ?(F$?J
`???-?????????@??????t??$}???%???8Tl@?7+????}q}??S?JN????9Ro????~?>???GO?>??i?glb?d??)lB?X?
?Z?Kh??!)??Zy??;uUU?Q4?a /???w???m??c1v???e?X?0m?6?~??s?m??i??[????????????P?I??????
S
"<???0M@???,?:??$?%??y?????(???????Hq??d1M???@l>w?? ??d?m>c
YA????5H?F???o?\??V?>t???a'??IDa?!2ZX?????1CG????L??6???e????6,??)
X<W?????
f?
I"?????????:$?? ??	bJ?6V3??QQl?f????mYb?hn?????[Z1Dj
???2????89??($GR?CB-66?*?m?t?????P>?????$??n?#???ViJ??6Sr?X??"??O?
?????
P???G?y??Z?%6?RH????(ZT??|?>zr?<??sOmTVSI????SV??X?ZZ??j???KQU????H0bD??`PX?`?Z?????"???i
?
?G'???F?M?<???n??????}?q?CA?2S?J@?$?rz??x?e???A?c?>?'?=
?!??????#8?????$V?<!2
?y?????
SO???xp???????{?6>??nk??6???g[q??Q??/?c??tO6????u?????X?B??$?I3:????;?qtk:!EZ9?2Q??o?0???(???V?%$T?@??Q.?d0?``#?0??<???????k????\

S]?S~/x?#mgT
??A #?e?[X???`x?J?????Gp??????(?	????????}?M"?E)??r=??Q??
?I?*?lO$~Y??yy?????
f0!o???3??t?>?[s??8E??<n????1#??*[V???}v??c?????hsF?!??i????-[c??l8?:F?????7l???l?????kf??Z?C#,?????,?-??i?
?f?????,
???M??"2???F62#j"??????e*?
????50S???$Go??N?PK
??I?#?bj??????9^?)??r??l?3???|C????)??lk?h???e??~?3?sSm?M??4?????X???d???e]?4(V/?W?????0?@0?#??#?T>(??q?Y?5_o??<?>?I_????MU?"??H?????{?@?G?{?	??UUB?=????????2=k??"'?Jb2H????g??7E??\?J?{+=???<i???)S?????X???{????X?y?9KV?????????k
X5?Y????1q?!B??k%????~e
?|?Q???TaF??
'?iU?Y3??x?X\gq???i.?0?zSN??y??n???jx????U?D???9 at n ????-??)???T
j <??#?G?4.??-??>??<?A???[??YDY#d?vA??J?0:Djr??0?!?9?$??????t?]$????\#.X5J#??d^
??c@$??.5v;?P18
R?mlPR^???9??C?-??X*Q???D??(?(?"?"?TQ$Qq?????o??V~&s?{?$?w????h!??	sy??#??t?#U8???????L\=M???????O????V?f?q??X0`??b?,?YUW??>?m?1?;???????_k?HI`F$$??W"??I????0????tDH?c$???8?|????Pn+?]`?M?@?V???
/?
}Z&?;?????b??D1????BuOQ??????.U??X??wF'??????2!??$?BR??*??????~]????Mf?([b-%j?m?e??
??????[%??)?3&?Em4eeSSTEl???%%??VV?IX?-??kT?R)?????H??5mF??i?IcV,?km??????H?RLD?MD?1[j?b????????V?(???KJQ?q!?-NC??pS?u??o!=???6C??=?FbH??de ????Bw:??_tf??U@?j???'g??'?[??'?,???????????]?g?{?P????u?f?mU???M?Z56??J?f?$?Z???j?2?6Dn]??KlF?-?:???&?M[fZ??kY?Bl?d?jb<N?h?D?*)r&1&?n<??y?h?}???0#Hd^???
?? ?C?rAJt4????0?a?\??O??6X?????4?Y?mg:MD?6?/?G????>bM??QMQ???u?yc
?@VA
  ?^?????1@X?d????jC? ??????=VH???E???`SIV
KSN?n?rc:???f???K????????<_?$DXEPy??????N????;??QFDD????????G?G^@g?=9??9???Z8?? Jl?o#`a?Y???????????NR9????ad?P; *?$?????9?$??Z??????K?@\g??l8???B???'?qat??7?A6??o
MObcb(??I?????E`a?cd?@??W'?6iA???`T??n????E??3???)??@_*??U(?B
@UOo??rX&?~??8a
	d8?K?O??Bg?<?R??QJ%???4???R?u??c??e??ao
?????gvtL??(????&??0?????B?j*-K
'???M>?a??k??m???
fD???RV?DW&??? ??@??\a0n??
"kM??CO?
DR?B??p?????D????	B?*????m?l??????"$??e!w?	H?
9?F#<????$|??"N9$&P???
?b?mI?D?SG?:?EY>,??	6??hd|?w?.??Y#B?l???"?Q?G?1?
?u?dH???????~?}?? ??Y????b?;???H?-?;y?b?n?T8N??_d5?????{|?gs?cl?????\#????965*??c[o?e?t?DJ????R?I?4?'?H??}`B??>?6?VH?3????4?\????yi	???&??k
V:@??????uk?Sd????t??4???J?z?T??? 	AL??v????O|?wG???M??)????????M-?LN,?.IN?????2?M??UfI??R?O-??(??]L??p????? ry
????)??Z?i??M????S????bL%???%]"??_???h?BUG$+??????I8?@?2DT??y????P?=??????(??h??()?K??A???{8?=??*S:DX????Oa
?K ????=??6_?0f+??|!??"??~d.8T	F?/_????????AC??&ILP???I????y??p??????P[q?????????Q??IM??P????&?????pe?? ?__???M?? ???F?a?o???wB?A?jJ??Zy?????????f?Ye?6????2???????CSG at l??/G?$????
$"O???c?i?^??[Yn?????7?UU$3-M??F?$??X?@?G(??S6?
????My??M??dF?T?A?c"l0????|???x?gI?|Y????y4????F????$??J?,{`EN
N?%?]??N??<??_m?5?8? x?7??o;x??Y?L???*?Q???????;0?#???????<??????"5??-QI$??.?MI????????'?????????R?(??I???m?<Ux????t?????
a??????T3???????H?d%?o??|?????????|/IX???????Y??Ve?m??J?iAd?q???Q??h???????>K
z?#Nc????
??BpAt??`x??GU=4*?BX!??_??????
???f?k-?o??{b???J????py??M???U??D??m???-?TSC?'rtX???)???1?b????l`??m??%???y???I)U?z????????ac?iLS&g?D?dR,V??`?U??.XnTpQ9X???m???i?m??{???m?
&??L?
??3??g1yM????f????^F?ccfc5??=?L?????????i????k??%????????#????L=Vs????????q?????hP???????i2I<?????{M
?KAb?
??@?Z????)?()
*?E?1To?	????\K???E??????l????'????/???0?r??|?~B?EB????Y???us
??NG????+??<"????w?Mdjb??$?????
??b`I/?'wm)????#?????W
9(??????b?Rb?
?<8:i&oH????E(?K??Iu???	????
???!R7?_,?h'G?????????l=R?m?????%?zE?%???st??w???Y??N
?@????=^<??A?@?0???z?>!?6?)z??
JU???$J?#%B??!e??A???K
???????x/J??%	C??1jb???z???
?B?????????=????o??[?O?@?'??H@??x?X???S$?y????(??????UF?Z?.???A?^f???]Q????UTR\???/t???v?`???u?-
???:?Uu"????h<?=zA??h?(?Pa?L?bR???@Hf+Ul-???a????????????T?-(b?b&?I`_??\a5??4-|??}'???O?????L????1??9%???i?2jUl??!#&?a??[B??t/??@R?p?????xf	I?s?z?<s?=7o^_????X
1t???@?)
??}??>
?[??1???HmYf??b???-
??(A!
H)'??RN??[&F??1*jf?[?v?????m??R?d??i?oQ?"Z????????H?'?A$?K
A%??
?#=.?M??v???????M???q????.????u?	?sZ?i-??+%g?qe???Y?????s??U?5?Yf?m&f????&tu?n?t?kk6-2??[v[??8??????

?Y?
|o??;V??????? md@?lo>m?xy7?o?PL?Rl,?*%????I???e
??
??4??X???|????Vy$0$??fE%<! ??``Mg?Y?Bhp?8??4? ??z2?,"?P0??'c%E0?L3 B??;?He?M
y???
a?bi-?	*?>?
?(k??%	?>?8??5
G??)?@D.$?)>T??cu?_%t -?ahPA)[BzvXt\?1???,??I??????????<?aaG????x?[!0{ G:?,????B?6?"?LC??=C?IH>4@?B??D?Asm?z?D<?@?JH?Q??A?[JGR??n?O??M???Mh??e+?B?1?R	
'?_	???l??c)D?Bz?????????,?@????l?H?# ??Gf
?q?+)??
KaH?:x?o?-??i(3h>?8<IQ?????^*P?Jd?,.?h?
??7?1??v??y????I?????,(??c????cf????CU?D-???p_??A?ycYV??b?3????c	?D???W????+"?*???dz???%
@??N?
	A???cL?P?'Jy?Z ???3{{?IIE?'BC?Y??:}=???0????G?H???\?1[?T??D???4`??R~0?CBP?H?[%??p??LA?AJ???@?Ci??????6N:?+??,?
d??JH8??F?????????Zd8?s????|b?e?6?%)xQ
??2?G*?0 ??T??? ??????X$LHAt?.?4???q??X???8?x>??6??v?????????????"?M?bB??????aWkOez	????yT?????I?
D~p?????B?!????e????p?vS???"??????d50+??bB(?sCIG???)5??0?FF?N??W$Q?h4?H????0?0L????b$????'k1qx?I*?p
?R?W???$??RF?2M*??I?\?2%????T???f1
k)?\7?`????v!?F
?????R0)R%$\b ??P:??E
???Jix??????D?
?3?
?"R?7?????7?????z??r?$??G'???????O?-?-??A?Ds?>?bv;?????B?????????=???^0PB?
???I?D-???h????>G??O????#??RR?????8<??%???
?q?UUj?(C?A?.???_??)?xp??8?}??????Xn@??eUa*?e
?_p??????Nt
?s?}X)??\|?|???|(?R
~&????6"?0???v<g?J??B??????[V?2Ii?&?5??2?2?E?;M5MC?A???6?????S?}7?].L????n??;&???J-UD<b$~Rn???q?	??c#???`YH??/y???x?v?'?o ???\???HF?5?d3	0?
?6??????????H????6???7??<??$?2?+hZ???2?dld?*? h??l?????!ZJ
d???eAJ?w???,???E??L????T?J?i?????????<DQl??J??;76&???F2??u???$`/????????0?
D??!?l???b
?J??A?Is????p??F?g??~R`?#t??I???jMT?W????U????w~???g?-?????'?(??g?????#5??7YK>6
????5MX??T#??E?T?<D??i??"&?*
k??~????z?R?i.????TJ$?$(07???"?????D???}?
Y#Q>]??#!
???+f??l??8!I5[k,???d???^=???j?dV?DM?D??vn?4?}H????`???N&6D C??????DTP?DM ?B????>??????8?jj?M??[?YIc?=6{???vM"?A???p??4nIIT?C??G,??);#??Mc*???bd???B?@?NWnT?vZ??`x?%?????4Y7??7?c??r??qf ??
??PQ?2?;n??9g6W????g??3?b#???qj???D??)A8?M?:?r
~N?x?H??g@e??Z?p?0??n????E?I??5??!?p)R????bH???^:?,`??%??a-??(M-????h??????K\?#2?`???H?IT????oH?d??4hMVib?Ax???r]?b
"??I??J??0?f?g???M?
?!BKX?????????(?w????|?.
X0?T???w?7???T??X?c?dt/2?'!???L?P?????]?fN??I????2<??G?g?hP???)c?F9Z?K?????4T??v??	?%?0
?h??????
?0?]?d?6?Z(+??rS at Fq??m?-???x??bLE?@?-??nr ?WsG?
W|??o??O?n6?1?[(?z????s?b?$
???,?B???????#m6???C",????q?????n?yw,?T?+$?O?(&-??e?4d??TfGfq?6dS(?;?:I^\XU?7???
???3???J?[R?????'H?Nr??1?G??????[K???h??2Y&??5[X?	?7??????j??i??????????q?A?
?=F^ ??D?u??p?G?I??
{?/??Y?Y????	??[o\D??cW???UB=2dy?}	???!CP?IA?M?h?Qm?-"??????L??Z?M?5?gsg-??????^?Ny???d$;???y????X?????<??CaOm-??N???)?o??Oq???'?=!?????di?X??b???5??9?i?i?!?g??o???<bW??>Q&
??(F(?<N???P?????I?&?*??
??l?M>?g?y?+T?~}m???1??????!?R?bKCX?zx?m?WP?Y?E??JE$D????E??
???Oxn(Gp)V	?QX?#?d?C?-????(???n-?H0?VVg?{??Yu?
?6?M?[?|?SZ???M?I?N?`lm
??????EV????5?fI??k?I?(?????dG?TP?h??'-??
3?@
?,Gy??{=??U'?hv????g??)?kn?=?fte9y??*h at t?_?C???a?4B+?
"?PH???V???x?e_v????VM?1Y?S?AT??L+~m???~s??G?u???S?D?d???4G!??[_???m?z???|??????*??u?-l??G?D?EpyA???j|q at x?$?$%??Pv`B.???9<?F???,P????
????&E???a???v???+?VmX?
G????e?M??m?h?|?|????el????4??a????A???&?FT?;_?????Ac??D
eY"?????(K?\m?M?c!?cR?2alE??w?[?k??4d:???;GJ-?ZF5(
?? ??AC^?iaI^??@p?
?*$??p????u
z???r??M??=??2???|???-?@?$y~.??Xt4I???????????R??R?,????????u?c??G?eu???y???m????;?SDs??T?????eHXH?)jy???Z????qI-4?dJrI??+??]?L??????5????(H?o??|S????<N??0`?)???6?X0??c?2	'?bJ
G9?4?+mo?Wl???h??),?kG????=??|?q?N,??t?FR??M?P?n?u????v*???,??????d!?_??2f??y??N?}?????kkZ??BD at -?C???????>??Q
`_?6e
???H??
??Nh?RF2l?b??d~???	y???I8H?????n#??0??????I??}?2z}?????_M??

(ZY?'???????Q?,W?3??W?0?&A????????
????O????B|j?
?T}???q?d?[%?m??7?$?????*([n??I??l????%??I??:??M6&f??DZ2???9????0QH?H$????Ib?,YeX??	?X?)m[V?C|??C?
?4N?:?/?????{>?EA?
??i???b???}I
sS?key????2??y?K$Nm?6?n,s????Y????&?;
??m???????Y?(??????|??`s?M??Z??N6~??*?
???q?T???????*KJa9?0???`?A??????L0d?Q???$???f??O??B????A	wJpC$??X??????????G?[#??!?w??Iu?^w???\x????
L??6??44?+??=?l?????{d????K'?"??t??k	?|Y2?#%+?-?????????^Tu?`Aa?{Q??|?????z?=?ig}??(<??fy%????I$????mU??'??????RPRz0?????s??X[?????1C??X?>?@?E???O>
M?o??C?^???#??P'?????3Cm?D.o??????????C???v
p#??????3??3??????N??
D??????-L?6>?6??$m?s*?$}v,?,??)a??q?????Y]d??????<
??I2?A?D ?A:?%????
`?#?"FR?`?YDi?,
AR?CJ??.?()$XJM???i?mX?2???????T????"?PK?d???aE`?B(?
Z?M?
5t??AN??k{b7?m?,??khE??h?Z3??V+)D??L?
??L?n??n????s???h[:/?8{[v?X?!ey?W???)??Ef???Ft"?EkU?????c?3?,!c???t??`l?
?!?,%H?X??(???	?b??6?;z%???"?"??????3?Oc??jv?h???kB?1??>?J???9??p??`?
?(k???&'??<H0??(Mo??\tY2[3??X D?(?0Q???H?B????(?bf@??Ci?=????=??2?????*9F???V?n?v?E????Ua[m?YM?Fy??q??????['??xu???f?f??Z???b1bL?d??'???XPk*J?????8?+!??,"	??g??!??J????e?6u?t?sg??;???s?X?`0?E??4TR(?a?h?&???$??????i??Q??*(?:
???GEAL??)0??X??&????h:-??7??a?PB???H??)`&??mfI?y??U?6??
?s?_????[My&???1d%?X?Z?e??E?!DQ
?????3)XE?Ze???n?{?T<mf?h?o?4??	?j?U??w???S???~?_Y
&??t"N,???>?A???N$4r??j??GVa?*|???X??????t???????n???d??????R?%?HD?H?W?(F???v?,Nr??w??H9o???V?i??b??U,K&??????F??????8????"???|??Mt?TiD$Y???@
w*$?;???o?)C?<???l???neC(RW?B?=?????6??d???5??}?8????]??r??*!D???E???$WAK??I*??]?"???2?d?H?Sd?Q????k?+???p??[
????&?t???q??/X?EI???R??KR???c?????????c??PF?1??	?Fy??JStG?
Jz:0?h?L??-?5???U?x	U'?Ej???(w
i?@R?H3??	?)??8y2? E+????
!@?nC?????}\??9*??b??????????A??nID0>KP at +?????E?KO??~?<???e????X?f?D????????b?C??>?G:?'0"7?	??`?k??/y??g?F??????v	?`???\v$S5b???C?X-??B5C?B	??	???EE????B2$&m-?U?d??V????j??(7??nm??2}h}Pc?C?c???????{ ??$?0?<?>?C??7?;?y$?????'H|??C?????z|???=??j*??T?'?j??
??????h' ?a
.F*?	T?'?dj???X??qc?zR??P??R??v'???w?b7??\?M??D?65"F
5 ???$%??Y at BP(???Yn?MM?6?B?-?i?<?qy??r?
#??>D0?hy?b??D"h???#j?#?+?@`?P?H?	"%??h?&?3??v???F?K?V ?3d?xM?D?R?????=???????Pz5+n?
?4?#Fn$@??2qI?????h;(??}*F??V?????5???)?Q??#??HI?
?4i(4??M???{?d???	"k&D[??MYAkV???o]'?4?o?!?sl????~sVqJ`?a?B?K?5????+????$??!?	?cF?L6???CV?b????OF???x???????xJ????X???q???+??
,dPPbgq<??~'????*?K#*	9?j~O?Re?S??????F???????x at h=^??V??~~~???p?k?(`Bk?N????:N???????????Y?Q?????c=???M??????'q?????????w>?NT?&
3(?&????=? 4?D??`lZ?]??Z@?!?^?NG-??9?!^?o0?"H?tN)R?2v#?????Nu??4??3y?????g????=????????^??@?j??"??i?\???H?tB??}??\???s??p??F;\???2+Y???=?m?KB?Y????Z?p??$?*Z???X:V??o?.c"c!F???h??	?h/?^?#A??85???|?(!?"???,Q?=M??)?0??5?iS?2{?BzlF????2v=?L%F????x =RB??1??:?%??0??K??o"?}=
}O??k???A??????0Q???`s]???2??z??#?-??d????????:I??K[|?<???e?:?q*???r?W??K???r?0????s?
P????v
x???aO?0l?k?n???%?d?o?>o??_X?:\z?#+33???ar??????????????l*?#?I?????xK?y;???=3??N??\?}|???????>??5F$m??,04?1 at D?T????
????_u????o;?r?u?????
?%?????'u0E|?Y?;B3;	?\B??z?V2???cm3?1t????s????;?`?????@?w':?lN:R?,\??qj<??+`S???H@???/;H??Z?(9??t??jO
?
????????)I?????a???^?Hp^\???I?R?R?b?e}??11,?*
?@?=??t?h'??v?q????T?9?J?e??^??__,?pJ???	?A*?+4V??"???G5??????-??cR?#?~=?g?;?R[MT???0`??U???;f)??????B?DD?cQc???,??8??pAX??????e?????W??
^?yx*?a???Q?K%???q?6????`?ouhcm0?}:Uy@??WH
?VY?on ???
;S?,??MR%?2?N%??<R???(N)y??ddd9s??;$??fHoH???Q?????g????&]1m????J?2K?S?]?N????g? ?????
?lA??U8
????7?<???8f??<zy????~?:?k?????????&?{??Z?,?H?|!?j??_>=3??o{?
^L?u????Q}0E$??P?I???????_~?w?
?d???O??@RH?	;?e6???$ {??t?qY?C?K.?C??%?X?l=7?6???U?b??UmUTUUU??????!???????F+aB?????U2
???a!?H?c?b{gN?s[??????'?^aD??1v#???L??H? ?????
?6????????H??t	~?%.?b????iG?2d?a?>V/???LUV4?d?$??)???
?Q2b?0/E?1aI????'?(?-?H/????y???????L??0?E???NF".????*??VQ??b	?q??w???NO?3???S????s????l?????Jx???O????}?U???%??b!?Ae??)%?mF?????=6~????y|?|*???
?>??fBu?6??? g?zsQ????[,R?.S5fO?L????0??%???}Y?a?rc???r??L??qhg?X??iQ1"?????@\kg?6??O???t?=*???H???AzI+?;
?`???arTj61?OP6???????
???g?M?X?????m???I??}?l????<?q???o?y2v?eO?u???1?MfZps
?\2?$???.??-<,??f2???pr>?e??R
??
h??53?????Y3?\??Y??????I3??X	?Iv?N?US????l??????O+?t??+e>?|??????g?-A??'?!m?|rF?,+?C0Ez?g??"?(?BD????????????v?MH??t?f?d?[?%?n?4??????????6????5E??%?T?
?' ??
??CT"=????y"?
 ?P?$ud??<????
?pS??&??3?N??r???!?iA??Mk6?C?0N??q?'*??f3,{?????U??"??+?|?8i\?v?^t??????H?s???????S?-???JC???}k-?7|;???b???Y7??'??????Y_??sY4?wX??Y!e6[>??o74????-?[z??????x?EKX?,?????RE?<r>??m????q?7?BI'$PVA?{=m?6?3l??????fn(\O1??x	?@a???%???P<!?%??$????h,?	e???F??N!?i)(u/.?%?
?2????q???1?C?8;?g?jv?c?	a??j?*?\f??6?i*tL
???HHRV??L??&??B?i???#??
Ul??{?
?Emi???M?Q???2??M!D)?NH4V
g?D	??!`%x???NjS?D??b_????!??LOw?'=4d?d'?Hra8p?O*F @(%??U?Wq?W?????#????P?C??E.1UC?b???b??EUk?
?}>v?G?OL???YM?Y(zA?y???o??%???????d??R"X?????m@?R9(?
?AaC?????t:w~;
?1?????O?$??h7%??_|Cv???????Y@?=J?XdX?)??L?F????X??h????fy??G??D???
?8?y???]Q????@9G???(^?H??%)?1)?Dz??I?
[Q\?dP??$??3>??L??Y?tearb??a?
????&R?R?-?
E?G?><Sd???EI?w20??7.??dRM?<JQ??(??MnR?j??????N?&?????
L&L??>?}N?D?:?s???@??	?	?
???z??|0?????0L?
?iV?,??`0?????HY??Bky?%????2?s?{0A+????P???*??,?|??{?	???pU/?(?N#}?T??R:???o?KHk?KV????1?
??M????0??UJ?	???K?B??
?]?!
?wc('0??P??hU a?
 ?QC????VDKQ??i?:??x@?H
?H??B?b???dl? n?N???p ?? ??dAu	r?F?|y?Vb?v??U???\?f?S??v??"C??,r<h??	i?X?x??9 ???q9p??*?
dK,z5k?*a)R????-A??DaR	D?;????Q|Z2?0KH?1??P?@??m?>????m.M?
???T????>~?????["??x;*1F@?E???@PZ??*U???)??>??
?s?D?g?3?????E9,P?L?5?bf^8?7+Qz%???s?D.n??b?????^???1 ?,-Y?"??r?85??v??s??c????hQ???????:FT%4W{
??VjP?jt???sw??Cg??XJ9????6???F
?x5?Oe??2??'?N?%???Y?L??=?E?`?X?H???So?0????F\7?2^F??]?Y6H0$|\-?a??2C?IKGQH?]NX?<B\??*?	?????tN:u?@??
0?)X?mTF??E??(????
?????A?
??
az???9C????A?Pw7+b?????rx??E?Y?1J at h?b??n?FT????b?????????V?;rw1??ps??@D???????cagn??????0?U???k?o????i5??,)
"??c?z?F\jR?cA?w??????NI?y??6l?--t?z at o?3???Ca?n?3??O
#?m	???
gD?*??S????4?&B???]?+3???a(???V??J?????"
?:???????u??1-?rJ
?f?&????????? ?yI??U?,&???WL??J?q\`??3?????2a2!?B?C??vRXs,A????F;9?`g?P3,??0pHpq%?Pv??v?N??7???W?b|s???t???MSCh??	???o&???0?V???L[Yq?:9-?E)n/?????F[????Ii?????0?MaK??f?????[?????????-
????RUGJ??pI???X1
??c???.M"X??H?L??y1r?@?Y!*Tp?k?/(?&??] ?gP?Ub???fu?3c???c1??1?.??"d?x?6G?????4???S"DM{?j??T?5??w?C???B98?z,??????????0??k??fb??D?1?qIh!?b0*?w#??9??18E???
???m?'??D?
????U
`?l*jc?Y=?Yp?6m???foH??4??h\?%??<(q?X?8PC7??9"?	?h????*??&???J??????'N?MC?h0??Wz?UMb?jB?I8:<???:???	????w4????
P<??9???0#-?E|??(?A?N0?	1??? J?.)?q?&2h?4?????^FZ??k?F\1P<U?5m`???eY?	1
0Y9y
f?XD??B?e??M???9?R@?????	1m!???a<B?
?A?Z?0+)3??k??,?Q???0&??A?Y2T???O????Bl?????}a???z??????????j[?O?I=???.O?Wd????3??'??Ldj????UU[m??n????QbjM#IY?
???j?*???????T????? \?j ????RE??,?~???(???g?-f?(&JbM5??6???1???9?? y????z???VH?4G?/\QBDD?ocq??7
7~?????????

???L}?	????}????-v+?
D
j%y?""f??????U??rjmC?HdG?=???+??n?z?di??>?#???m????g??,z??@RJd?????????i??CsI!??hn=?O}??>?]
??1>.?
??M??%??T???&???`?????^^???Df$,JbR?'??iF?S?1???#v?????????g?????.?)???A!?I?????7???p?B?E?9????:??l??qQEI?RI?M"fQ
N!??WxI"
?=??rP#N?nE????H?x?",?
????3?`?Ru?{~bz9?N
?EX??k aB???A_?
;????TP??e<66t?'F??6?qk??2.
?S?w]??*???6??E?iaP?_uGT????XP?"1?}?B:?#3???@?R?*???'?<
)Dp1?w???,???1)??i?&?{?2
`??8?{8?
z???DT??????A?????E{??????Oo?J?E????a???;?1?{*?J8J*O?F????'??#)????)??'??1?????
D????`??$??(??QV$??+??[y]Tp'??V?s?:?pcb?o??[!m?S?|J}???B??0??????1????d.??x?Ub??c?_????"?-???~?E?C?P??!??Q?%??Y%-?&L???????*QG&???RM??????????LMd?D??|???IK?Cx]??M~%7k!??4?$EP?P?&pR?$~???t?"!?aXE???????:???v??_?w?-????R?iB4?=?<q?8?W??)?}
h*N??a?IH!?~????a?C?FM??????N??h?
[0??[b?dm??????x
????>????
]??h3?WBb???????G??S???????C??Q??< H??\??????+?
t#M???
-O#??O?????????#?:u???????"???W>>??D A?S?? EW?"?s?+??TP?~????%B}p???g.?z???LB,?7 ?ZT??????MI?k!???5P???f?\?lIS????{?O<??
ooM??L??;?J?P?x??x0(??D?????|??????????????'????P??5?????[?$D? ?E^?"H???a?R6@??eR?s?t???-????c????4??+!
????M??h?W!h[?@|C?4
??a????b=u?<sJl1Jj72G&??o{i??A?E?6??S????????????????mV?b???RT?Xhh??EO????>o~D?)?pb?4?v?U0U?J??w!? ??/1??+?<5?^??/ZR??$?/Y???yS??D2?-Hs2?S3?a?>??V????}??o????63?F??f???BH?????~#?G?W?O?i??
|?N?D?QqX?>x|??.r`3.8
????|p??ov??????rZP??f?????]D??zs???????????8?l?rI??): `??Lu??[???q	???????IK
???j?Yd{?ji?????aa???????)\6?p?Y????t?????L$?IZ??????a?|??P
??4?,???m??x?J\H?Ft????K?Sv?e?????3-x?L/(?,???????PC{V7?
?!2???,?9 at 3?2???;?$??#"0n??.??fb??\?S??vqV???????D?&f??
??3[?`????0????4@?S??????\BK????<b_~?}??A~3????L?g?{a??????<3O????s	]C??<??7`?D????\?)???0? ????Vr?@H~v??~y1?A??f?1??
??`???????2!?v??@?=???*?nm?? ?E?>Rb?}???????9?Bq&?y?$?#x????C~???????	"?\????"	F(T??~)??@??f?f)????z?I*???,?,???X<b~????X?z|???????+????J0
?R?06<u=0?*??_
1\D=?rT????"???O0??`?"?H???'??	u??#??????????X$???????]iy??0>g?."
???$?;???????2??
y7|?$???@??????b??UP??
0xy/#???ck?2z??v??B?{??S??X???????L??!?jG???DA??f?$V?(s?1?H<?????O???;U2L58;ISGt????R????????G?R?????T?1?2D????H?

?v 



From fedora-extras-commits at redhat.com  Sun Apr  2 08:01:06 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun,  2 Apr 2006 01:01:06 -0700
Subject: rpms/python-myghty/FC-5 .cvsignore, 1.5, 1.6 python-myghty.spec, 1.5,
	1.6 sources, 1.5, 1.6
Message-ID: <200604020801.k32818fd008417@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-myghty/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8375

Modified Files:
	.cvsignore python-myghty.spec sources 
Log Message:
1.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-myghty/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	26 Jan 2006 07:17:19 -0000	1.5
+++ .cvsignore	2 Apr 2006 08:01:06 -0000	1.6
@@ -1 +1 @@
-Myghty-1.0.tar.gz
+Myghty-1.0.1.tar.gz


Index: python-myghty.spec
===================================================================
RCS file: /cvs/extras/rpms/python-myghty/FC-5/python-myghty.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-myghty.spec	26 Jan 2006 07:17:19 -0000	1.5
+++ python-myghty.spec	2 Apr 2006 08:01:06 -0000	1.6
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-myghty
-Version:        1.0
+Version:        1.0.1
 Release:        1%{?dist}
 Summary:        A Python-based templating system derived from HTML::Mason
 
@@ -12,7 +12,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  python
+BuildRequires:  python-setuptools
+
 
 %description
 Myghty is a Python based web and templating framework originally based on
@@ -48,6 +49,9 @@
 
 
 %changelog
+* Sun Apr 02 2006 Luke Macken <lmacken at redhat.com> 1.0.1-1
+- 1.0.1
+
 * Wed Jan 04 2006 Luke Macken <lmacken at redhat.com> 1.0-1
 - 1.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-myghty/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	26 Jan 2006 07:17:19 -0000	1.5
+++ sources	2 Apr 2006 08:01:06 -0000	1.6
@@ -1 +1 @@
-4329dea233683c2e073036ea48f23fd8  Myghty-1.0.tar.gz
+82b2a05f421b2b81cae716ccde74dce1  Myghty-1.0.1.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr  2 08:03:24 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun,  2 Apr 2006 01:03:24 -0700
Subject: rpms/python-myghty/FC-5 python-myghty.spec,1.6,1.7
Message-ID: <200604020803.k3283Q7f008569@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-myghty/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8552

Modified Files:
	python-myghty.spec 
Log Message:
rebuild


Index: python-myghty.spec
===================================================================
RCS file: /cvs/extras/rpms/python-myghty/FC-5/python-myghty.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-myghty.spec	2 Apr 2006 08:01:06 -0000	1.6
+++ python-myghty.spec	2 Apr 2006 08:03:24 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           python-myghty
 Version:        1.0.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A Python-based templating system derived from HTML::Mason
 
 Group:          Development/Libraries
@@ -49,7 +49,7 @@
 
 
 %changelog
-* Sun Apr 02 2006 Luke Macken <lmacken at redhat.com> 1.0.1-1
+* Sun Apr 02 2006 Luke Macken <lmacken at redhat.com> 1.0.1-2
 - 1.0.1
 
 * Wed Jan 04 2006 Luke Macken <lmacken at redhat.com> 1.0-1



From fedora-extras-commits at redhat.com  Sun Apr  2 08:05:40 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun,  2 Apr 2006 01:05:40 -0700
Subject: rpms/python-myghty/FC-4 .cvsignore, 1.2, 1.3 python-myghty.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200604020805.k3285gid008640@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/python-myghty/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8619

Modified Files:
	.cvsignore python-myghty.spec sources 
Log Message:
1.0.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-myghty/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Sep 2005 17:55:21 -0000	1.2
+++ .cvsignore	2 Apr 2006 08:05:39 -0000	1.3
@@ -1 +1 @@
-Myghty-0.98c.tar.gz
+Myghty-1.0.1.tar.gz


Index: python-myghty.spec
===================================================================
RCS file: /cvs/extras/rpms/python-myghty/FC-4/python-myghty.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-myghty.spec	14 Sep 2005 17:55:21 -0000	1.1
+++ python-myghty.spec	2 Apr 2006 08:05: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:           python-myghty
-Version:        0.98c
-Release:        1
+Version:        1.0.1
+Release:        1%{?dist}
 Summary:        A Python-based templating system derived from HTML::Mason
 
 Group:          Development/Libraries
@@ -12,7 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  python
+BuildRequires:  python-setuptools
 
 %description
 Myghty is a Python based web and templating framework originally based on
@@ -49,6 +49,9 @@
 
 
 %changelog
+* Sun Apr 02 2006 Luke Macken <lmacken at redhat.com> 1.0.1-1
+- 1.0.1
+
 * Mon Sep 12 2005 Luke Macken <lmacken at redhat.com> 0.98c-1
 - Bump to version 0.98c
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-myghty/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Sep 2005 17:55:21 -0000	1.2
+++ sources	2 Apr 2006 08:05:40 -0000	1.3
@@ -1 +1 @@
-73d5ee5302ffb610059928c8353f2201  Myghty-0.98c.tar.gz
+82b2a05f421b2b81cae716ccde74dce1  Myghty-1.0.1.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr  2 12:11:48 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Sun,  2 Apr 2006 05:11:48 -0700
Subject: rpms/gwget/FC-5 gwget-epiphany214.patch, NONE, 1.1 gwget.spec, 1.11,
	1.12
Message-ID: <200604021211.k32CBovJ017290@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/gwget/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17270

Modified Files:
	gwget.spec 
Added Files:
	gwget-epiphany214.patch 
Log Message:
0.97-3 -- - Add LDFLAGS=-Wl,--export-dynamic #187623

gwget-epiphany214.patch:

--- NEW FILE gwget-epiphany214.patch ---
diff -Naur gwget-0.97.org/configure.in gwget-0.97/configure.in
--- gwget-0.97.org/configure.in	2006-04-02 10:28:42.000000000 +0200
+++ gwget-0.97/configure.in	2006-04-02 10:39:58.000000000 +0200
@@ -71,8 +71,10 @@
 
 dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8 or 1.10
 EPHY_AUTODETECT="(autodetect)"
-if pkg-config --exists epiphany-1.10; then
-               EPHY_VER=1.10
+if pkg-config --exists epiphany-2.14; then
+        EPHY_VER=2.14
+elif pkg-config --exists epiphany-1.10; then
+        EPHY_VER=1.10
 elif pkg-config --exists epiphany-1.8; then
        	EPHY_VER=1.8
 elif pkg-config --exists epiphany-1.6; then
@@ -107,11 +109,15 @@
           AC_DEFINE_UNQUOTED(EPHY_VERSION, 110, [Define to the Epiphany version (12 or 14 or 16)])
           EPIPHANY_PKGCONFIG=epiphany-1.10
           EPIPHANY_REQUIRED=1.9.0
+elif test $EPHY_VER = "2.14"; then
+          AC_DEFINE_UNQUOTED(EPHY_VERSION, 214, [Define to the Epiphany version (12 or 14 or 16)])
+          EPIPHANY_PKGCONFIG=epiphany-2.14
+          EPIPHANY_REQUIRED=2.14
 else
      	AC_MSG_RESULT([no epiphany installed])
 fi
 
-if test $EPHY_VER = "1.2" || test $EPHY_VER = "1.4" || test $EPHY_VER = "1.6" || test $EPHY_VER = "1.8" || test $EPHY_VER = "1.10"; then
+if test $EPHY_VER = "1.2" || test $EPHY_VER = "1.4" || test $EPHY_VER = "1.6" || test $EPHY_VER = "1.8" || test $EPHY_VER = "1.10"  || test $EPHY_VER = "2.14" ; then
 AC_MSG_RESULT([$EPHY_VER $EPHY_AUTODETECT])
 
 LIBGLIB_REQUIRED=2.4.0


Index: gwget.spec
===================================================================
RCS file: /cvs/extras/rpms/gwget/FC-5/gwget.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gwget.spec	13 Feb 2006 17:31:50 -0000	1.11
+++ gwget.spec	2 Apr 2006 12:11:47 -0000	1.12
@@ -1,13 +1,14 @@
-%define epimajor 1.9
+%define epimajor 2.14
 
 Summary:	Graphical download manager that uses wget
 Name:		gwget
 Version:	0.97
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		Applications/Internet
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gwget/0.97/gwget-0.97.tar.bz2
 Source1:	gwget.desktop
+Patch0:		gwget-epiphany214.patch
 URL:		http://gnome.org/projects/gwget
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildrequires:	libgnomeui-devel >= 2.0
@@ -16,6 +17,7 @@
 BuildRequires:	gettext >= 0.14.1
 BuildRequires:	desktop-file-utils
 BuildRequires:	epiphany-devel >= %{epimajor}
+BuildRequires:	autoconf
 Requires:	wget >= 1.9
 Requires(post):		GConf2
 Requires(preun):	GConf2
@@ -37,9 +39,12 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .patch0
+autoreconf -f
 
 %build
-%configure
+export LDFLAGS="${LDFLAGS} -Wl,--export-dynamic"
+%configure 
 make %{?_smp_mflags}
 
 %install
@@ -90,7 +95,11 @@
 
 
 %changelog
-* Mon Feb 13 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info>
+* Sun Apr 02 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.97-3
+- Add LDFLAGS="-Wl,--export-dynamic" #187623
+- Add patch from cvs to build against latest epiphany
+
+* Mon Feb 13 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.97-2
 - Rebuild for Fedora Extras 5
 
 * Wed Feb 01 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.97-1



From fedora-extras-commits at redhat.com  Sun Apr  2 12:31:18 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Sun,  2 Apr 2006 05:31:18 -0700
Subject: rpms/brightside/FC-5 brightside.spec,1.11,1.12
Message-ID: <200604021231.k32CVK4L017412@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/brightside/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17393

Modified Files:
	brightside.spec 
Log Message:
1.4.0-11 -- Update URL, Use desktop-file-install (fixes #187638)


Index: brightside.spec
===================================================================
RCS file: /cvs/extras/rpms/brightside/FC-5/brightside.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- brightside.spec	13 Feb 2006 17:31:21 -0000	1.11
+++ brightside.spec	2 Apr 2006 12:31:17 -0000	1.12
@@ -1,12 +1,12 @@
 Name:           brightside
 Version:        1.4.0
-Release: 	10%{?dist}
+Release: 	11%{?dist}
 
 Summary:        Add reactivity to the corners and edges of your GNOME desktop
 
 Group:          Applications/Productivity
 License:        GPL
-URL:            http://home.jesus.ox.ac.uk/~ecatmur/brightside/
+URL:            http://catmur.co.uk/~ed/main/brightside/
 Source0:        http://home.jesus.ox.ac.uk/~ecatmur/brightside/download/brightside-1.4.0.tar.bz2
 Patch0:         %{name}-gconf-mouse-speed.patch
 Patch1:         %{name}-libwnck.patch
@@ -19,6 +19,7 @@
 BuildRequires:  libwnck-devel >= 2.6.0
 BuildRequires:  libgnomeui-devel >= 2.6.0
 BuildRequires:  libglade2-devel >= 2.2.0
+BuildRequires:	desktop-file-utils
 
 ExcludeArch: 	ppc ppc64
 
@@ -45,6 +46,12 @@
 # For GConf apps: prevent schemas from being installed at this stage
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
+desktop-file-install --vendor fedora                   \
+  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications      \
+  --add-category X-Fedora                              \
+  --delete-original                                    \
+  $RPM_BUILD_ROOT/%{_datadir}/control-center-2.0/capplets/brightside.desktop
+
 # Note: the find_lang macro requires gettext
 %find_lang Brightside
 
@@ -79,11 +86,15 @@
 %{_datadir}/%{name}
 %{_sysconfdir}/gconf/schemas/brightside.schemas
 %{_datadir}/pixmaps/brightside-48.png
-%{_datadir}/control-center-2.0/capplets/brightside.desktop
+%{_datadir}/applications/*.desktop
 
 
 %changelog
-* Mon Feb 13 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info>
+* Sun Apr 02 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - - 1.4.0-11
+- Update URL
+- Use desktop-file-install
+
+* Mon Feb 13 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.4.0-10
 - Rebuild for Fedora Extras 5
 
 * Wed Aug 17 2005 Thorsten Leemhuis <fedora[AT]leemhuis[dot]info> - 1.4.0-9



From fedora-extras-commits at redhat.com  Sun Apr  2 12:55:47 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Sun,  2 Apr 2006 05:55:47 -0700
Subject: rpms/brightside/devel brightside.spec,1.11,1.12
Message-ID: <200604021255.k32CtnLx017551@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/brightside/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17534

Modified Files:
	brightside.spec 
Log Message:
1.4.0-11 -- Update URL, Use desktop-file-install (fixes #187638)


Index: brightside.spec
===================================================================
RCS file: /cvs/extras/rpms/brightside/devel/brightside.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- brightside.spec	13 Feb 2006 17:31:21 -0000	1.11
+++ brightside.spec	2 Apr 2006 12:55:47 -0000	1.12
@@ -1,12 +1,12 @@
 Name:           brightside
 Version:        1.4.0
-Release: 	10%{?dist}
+Release: 	11%{?dist}
 
 Summary:        Add reactivity to the corners and edges of your GNOME desktop
 
 Group:          Applications/Productivity
 License:        GPL
-URL:            http://home.jesus.ox.ac.uk/~ecatmur/brightside/
+URL:            http://catmur.co.uk/~ed/main/brightside/
 Source0:        http://home.jesus.ox.ac.uk/~ecatmur/brightside/download/brightside-1.4.0.tar.bz2
 Patch0:         %{name}-gconf-mouse-speed.patch
 Patch1:         %{name}-libwnck.patch
@@ -19,6 +19,7 @@
 BuildRequires:  libwnck-devel >= 2.6.0
 BuildRequires:  libgnomeui-devel >= 2.6.0
 BuildRequires:  libglade2-devel >= 2.2.0
+BuildRequires:	desktop-file-utils
 
 ExcludeArch: 	ppc ppc64
 
@@ -45,6 +46,12 @@
 # For GConf apps: prevent schemas from being installed at this stage
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
+desktop-file-install --vendor fedora                   \
+  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications      \
+  --add-category X-Fedora                              \
+  --delete-original                                    \
+  $RPM_BUILD_ROOT/%{_datadir}/control-center-2.0/capplets/brightside.desktop
+
 # Note: the find_lang macro requires gettext
 %find_lang Brightside
 
@@ -79,11 +86,15 @@
 %{_datadir}/%{name}
 %{_sysconfdir}/gconf/schemas/brightside.schemas
 %{_datadir}/pixmaps/brightside-48.png
-%{_datadir}/control-center-2.0/capplets/brightside.desktop
+%{_datadir}/applications/*.desktop
 
 
 %changelog
-* Mon Feb 13 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info>
+* Sun Apr 02 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - - 1.4.0-11
+- Update URL
+- Use desktop-file-install
+
+* Mon Feb 13 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.4.0-10
 - Rebuild for Fedora Extras 5
 
 * Wed Aug 17 2005 Thorsten Leemhuis <fedora[AT]leemhuis[dot]info> - 1.4.0-9



From fedora-extras-commits at redhat.com  Sun Apr  2 13:08:44 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Sun,  2 Apr 2006 06:08:44 -0700
Subject: rpms/gwget/devel gwget-epiphany214.patch, NONE, 1.1 gwget.spec, 1.11,
	1.12
Message-ID: <200604021308.k32D8kYd019624@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/gwget/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19603

Modified Files:
	gwget.spec 
Added Files:
	gwget-epiphany214.patch 
Log Message:
0.97-3 -- - Add LDFLAGS=-Wl,--export-dynamic to fix #187623; add patch for epiphany

gwget-epiphany214.patch:

--- NEW FILE gwget-epiphany214.patch ---
diff -Naur gwget-0.97.org/configure.in gwget-0.97/configure.in
--- gwget-0.97.org/configure.in	2006-04-02 10:28:42.000000000 +0200
+++ gwget-0.97/configure.in	2006-04-02 10:39:58.000000000 +0200
@@ -71,8 +71,10 @@
 
 dnl try to autodetect Epiphany 1.2, 1.4, 1.6, 1.8 or 1.10
 EPHY_AUTODETECT="(autodetect)"
-if pkg-config --exists epiphany-1.10; then
-               EPHY_VER=1.10
+if pkg-config --exists epiphany-2.14; then
+        EPHY_VER=2.14
+elif pkg-config --exists epiphany-1.10; then
+        EPHY_VER=1.10
 elif pkg-config --exists epiphany-1.8; then
        	EPHY_VER=1.8
 elif pkg-config --exists epiphany-1.6; then
@@ -107,11 +109,15 @@
           AC_DEFINE_UNQUOTED(EPHY_VERSION, 110, [Define to the Epiphany version (12 or 14 or 16)])
           EPIPHANY_PKGCONFIG=epiphany-1.10
           EPIPHANY_REQUIRED=1.9.0
+elif test $EPHY_VER = "2.14"; then
+          AC_DEFINE_UNQUOTED(EPHY_VERSION, 214, [Define to the Epiphany version (12 or 14 or 16)])
+          EPIPHANY_PKGCONFIG=epiphany-2.14
+          EPIPHANY_REQUIRED=2.14
 else
      	AC_MSG_RESULT([no epiphany installed])
 fi
 
-if test $EPHY_VER = "1.2" || test $EPHY_VER = "1.4" || test $EPHY_VER = "1.6" || test $EPHY_VER = "1.8" || test $EPHY_VER = "1.10"; then
+if test $EPHY_VER = "1.2" || test $EPHY_VER = "1.4" || test $EPHY_VER = "1.6" || test $EPHY_VER = "1.8" || test $EPHY_VER = "1.10"  || test $EPHY_VER = "2.14" ; then
 AC_MSG_RESULT([$EPHY_VER $EPHY_AUTODETECT])
 
 LIBGLIB_REQUIRED=2.4.0


Index: gwget.spec
===================================================================
RCS file: /cvs/extras/rpms/gwget/devel/gwget.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gwget.spec	13 Feb 2006 17:31:50 -0000	1.11
+++ gwget.spec	2 Apr 2006 13:08:44 -0000	1.12
@@ -1,13 +1,14 @@
-%define epimajor 1.9
+%define epimajor 2.14
 
 Summary:	Graphical download manager that uses wget
 Name:		gwget
 Version:	0.97
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	GPL
 Group:		Applications/Internet
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gwget/0.97/gwget-0.97.tar.bz2
 Source1:	gwget.desktop
+Patch0:		gwget-epiphany214.patch
 URL:		http://gnome.org/projects/gwget
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Buildrequires:	libgnomeui-devel >= 2.0
@@ -16,6 +17,7 @@
 BuildRequires:	gettext >= 0.14.1
 BuildRequires:	desktop-file-utils
 BuildRequires:	epiphany-devel >= %{epimajor}
+BuildRequires:	autoconf
 Requires:	wget >= 1.9
 Requires(post):		GConf2
 Requires(preun):	GConf2
@@ -37,9 +39,12 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .patch0
+autoreconf -f
 
 %build
-%configure
+export LDFLAGS="${LDFLAGS} -Wl,--export-dynamic"
+%configure 
 make %{?_smp_mflags}
 
 %install
@@ -90,7 +95,11 @@
 
 
 %changelog
-* Mon Feb 13 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info>
+* Sun Apr 02 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.97-3
+- Add LDFLAGS="-Wl,--export-dynamic" #187623
+- Add patch from cvs to build against latest epiphany
+
+* Mon Feb 13 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0.97-2
 - Rebuild for Fedora Extras 5
 
 * Wed Feb 01 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.97-1



From fedora-extras-commits at redhat.com  Sun Apr  2 14:20:00 2006
From: fedora-extras-commits at redhat.com (Duncan Ferguson (duncs))
Date: Sun,  2 Apr 2006 07:20:00 -0700
Subject: rpms/perl-X11-Protocol/FC-3 perl-X11-Protocol.spec,1.3,1.4
Message-ID: <200604021420.k32EK2U0021860@cvs-int.fedora.redhat.com>

Author: duncs

Update of /cvs/extras/rpms/perl-X11-Protocol/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21843

Modified Files:
	perl-X11-Protocol.spec 
Log Message:
Fix bug with builds on FC-3


Index: perl-X11-Protocol.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-X11-Protocol/FC-3/perl-X11-Protocol.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-X11-Protocol.spec	1 Apr 2006 10:58:01 -0000	1.3
+++ perl-X11-Protocol.spec	2 Apr 2006 14:20:00 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-X11-Protocol
 Version:        0.55
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        X11-Protocol - Raw interface to X Window System servers
 
 Group:          Development/Libraries
@@ -28,10 +28,10 @@
 %setup -q -n X11-Protocol-%{version}
 
 # Testing requires X - use "rpmbuild --with X"
-%{!?_with_X:\
-%{__perl} -pi -e 'print "print \"Remaining tests require X\n\"; exit 0;" \
-			if /Insert your test code below/;' test.pl \
-}
+%if 0%{!?_with_X:1}
+%{__perl} -pi -e 'print "print \"Remaining tests require X\n\"; exit 0;" 
+			if /Insert your test code below/;' test.pl 
+%endif
 
 perldoc -t perlartistic > Artistic
 perldoc -t perlgpl > COPYING
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Sun Apr 02 2006 Duncan Ferguson <duncan_j_ferguson at yahoo.co.uk> 0.55-3
+- Change tests for X environment
+
 * Sat Apr 01 2006 Duncan Ferguson <duncan_j_ferguson at yahoo.co.uk> 0.55-2
 - Specfile bugfile
 



From fedora-extras-commits at redhat.com  Sun Apr  2 14:42:05 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Sun,  2 Apr 2006 07:42:05 -0700
Subject: owners owners.list,1.792,1.793
Message-ID: <200604021442.k32Eg7Ks021958@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21941

Modified Files:
	owners.list 
Log Message:
Christoph Wickert takes over gwget


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.792
retrieving revision 1.793
diff -u -r1.792 -r1.793
--- owners.list	2 Apr 2006 04:45:10 -0000	1.792
+++ owners.list	2 Apr 2006 14:42:05 -0000	1.793
@@ -423,7 +423,7 @@
 Fedora Extras|gv|A X front-end for the Ghostscript PostScript(TM) interpreter|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|gweled|Swapping gem game|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|gwenview|Simple image viewer for KDE|gauret at free.fr|extras-qa at fedoraproject.org|
-Fedora Extras|gwget|GUI Download manager using wget|fedora at leemhuis.info|extras-qa at fedoraproject.org|
+Fedora Extras|gwget|GUI Download manager using wget|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 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|



From fedora-extras-commits at redhat.com  Sun Apr  2 15:47:45 2006
From: fedora-extras-commits at redhat.com (Duncan Ferguson (duncs))
Date: Sun,  2 Apr 2006 08:47:45 -0700
Subject: rpms/perl-X11-Protocol/FC-4 perl-X11-Protocol.spec,1.2,1.3
Message-ID: <200604021547.k32FllPn024132@cvs-int.fedora.redhat.com>

Author: duncs

Update of /cvs/extras/rpms/perl-X11-Protocol/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24115

Modified Files:
	perl-X11-Protocol.spec 
Log Message:
Fixes for FC-3


Index: perl-X11-Protocol.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-X11-Protocol/FC-4/perl-X11-Protocol.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-X11-Protocol.spec	31 Mar 2006 18:04:06 -0000	1.2
+++ perl-X11-Protocol.spec	2 Apr 2006 15:47:44 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-X11-Protocol
 Version:        0.55
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        X11-Protocol - Raw interface to X Window System servers
 
 Group:          Development/Libraries
@@ -28,10 +28,10 @@
 %setup -q -n X11-Protocol-%{version}
 
 # Testing requires X - use "rpmbuild --with X"
-%{!?_with_X:\
-%{__perl} -pi -e 'print "print \"Remaining tests require X\n\"; exit 0;"
-			if /Insert your test code below/;' test.pl \
-}
+%if 0%{!?_with_X:1}
+%{__perl} -pi -e 'print "print \"Remaining tests require X\n\"; exit 0;" 
+			if /Insert your test code below/;' test.pl 
+%endif
 
 perldoc -t perlartistic > Artistic
 perldoc -t perlgpl > COPYING
@@ -69,6 +69,12 @@
 
 
 %changelog
+* Sun Apr 02 2006 Duncan Ferguson <duncan_j_ferguson at yahoo.co.uk> 0.55-3
+- Change tests for X environment
+
+* Sat Apr 01 2006 Duncan Ferguson <duncan_j_ferguson at yahoo.co.uk> 0.55-2
+- Specfile bugfile
+
 * Fri Mar 31 2006 Duncan Ferguson <duncan_j_ferguson at yahoo.co.uk> 0.55-1
 - Update to new version of X11::Protocol
 



From fedora-extras-commits at redhat.com  Sun Apr  2 15:47:52 2006
From: fedora-extras-commits at redhat.com (Duncan Ferguson (duncs))
Date: Sun,  2 Apr 2006 08:47:52 -0700
Subject: rpms/perl-X11-Protocol/devel perl-X11-Protocol.spec,1.2,1.3
Message-ID: <200604021547.k32Fls5C024155@cvs-int.fedora.redhat.com>

Author: duncs

Update of /cvs/extras/rpms/perl-X11-Protocol/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24138

Modified Files:
	perl-X11-Protocol.spec 
Log Message:
Fixes for FC-3


Index: perl-X11-Protocol.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-X11-Protocol/devel/perl-X11-Protocol.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-X11-Protocol.spec	31 Mar 2006 18:07:02 -0000	1.2
+++ perl-X11-Protocol.spec	2 Apr 2006 15:47:52 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-X11-Protocol
 Version:        0.55
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        X11-Protocol - Raw interface to X Window System servers
 
 Group:          Development/Libraries
@@ -28,10 +28,10 @@
 %setup -q -n X11-Protocol-%{version}
 
 # Testing requires X - use "rpmbuild --with X"
-%{!?_with_X:\
-%{__perl} -pi -e 'print "print \"Remaining tests require X\n\"; exit 0;"
-			if /Insert your test code below/;' test.pl \
-}
+%if 0%{!?_with_X:1}
+%{__perl} -pi -e 'print "print \"Remaining tests require X\n\"; exit 0;" 
+			if /Insert your test code below/;' test.pl 
+%endif
 
 perldoc -t perlartistic > Artistic
 perldoc -t perlgpl > COPYING
@@ -69,6 +69,12 @@
 
 
 %changelog
+* Sun Apr 02 2006 Duncan Ferguson <duncan_j_ferguson at yahoo.co.uk> 0.55-3
+- Change tests for X environment
+
+* Sat Apr 01 2006 Duncan Ferguson <duncan_j_ferguson at yahoo.co.uk> 0.55-2
+- Specfile bugfile
+
 * Fri Mar 31 2006 Duncan Ferguson <duncan_j_ferguson at yahoo.co.uk> 0.55-1
 - Update to new version of X11::Protocol
 



From fedora-extras-commits at redhat.com  Sun Apr  2 16:11:34 2006
From: fedora-extras-commits at redhat.com (András Tóth (tbandi72))
Date: Sun,  2 Apr 2006 09:11:34 -0700
Subject: rpms/gnome-yum/FC-4 gnome-yum-0.1.3-1.fc4.src.rpm, 1.1.2.1,
	NONE gnome-yum-0.1.3.tar.bz2, 1.2.4.1, NONE
Message-ID: <200604021611.k32GBafF026464@cvs-int.fedora.redhat.com>

Author: tbandi72

Update of /cvs/extras/rpms/gnome-yum/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26449

Removed Files:
      Tag: gnome-yum-0_1_3-1_fc4
	gnome-yum-0.1.3-1.fc4.src.rpm gnome-yum-0.1.3.tar.bz2 
Log Message:



--- gnome-yum-0.1.3-1.fc4.src.rpm DELETED ---


--- gnome-yum-0.1.3.tar.bz2 DELETED ---



From fedora-extras-commits at redhat.com  Sun Apr  2 16:13:31 2006
From: fedora-extras-commits at redhat.com (András Tóth (tbandi72))
Date: Sun,  2 Apr 2006 09:13:31 -0700
Subject: rpms/gnome-yum/FC-5 gnome-yum-0.1.3-1.fc5.src.rpm, 1.1.2.1,
	NONE gnome-yum-0.1.3.tar.bz2, 1.2.4.1, NONE
Message-ID: <200604021613.k32GDXof026507@cvs-int.fedora.redhat.com>

Author: tbandi72

Update of /cvs/extras/rpms/gnome-yum/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26492

Removed Files:
      Tag: gnome-yum-0_1_3-1_fc5
	gnome-yum-0.1.3-1.fc5.src.rpm gnome-yum-0.1.3.tar.bz2 
Log Message:



--- gnome-yum-0.1.3-1.fc5.src.rpm DELETED ---


--- gnome-yum-0.1.3.tar.bz2 DELETED ---



From fedora-extras-commits at redhat.com  Sun Apr  2 18:36:10 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Sun,  2 Apr 2006 11:36:10 -0700
Subject: rpms/vnstat/devel vnstat.spec,1.4,1.5
Message-ID: <200604021836.k32IaCDU031660@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/vnstat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31643

Modified Files:
	vnstat.spec 
Log Message:
* Fri Mar 18 2006 Adrian Reber <adrian at lisas.de> - 1.4-7
- rebuilt; fixed dist tag



Index: vnstat.spec
===================================================================
RCS file: /cvs/extras/rpms/vnstat/devel/vnstat.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- vnstat.spec	23 May 2005 00:22:11 -0000	1.4
+++ vnstat.spec	2 Apr 2006 18:36:10 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:	Console-based network traffic monitor
 Name:		vnstat
 Version:	1.4
-Release: 5
+Release:	7%{?dist}
 
 License:	GPL
 Group:		System Environment/Daemons
@@ -87,6 +87,12 @@
 %attr(-,vnstat,vnstat)%{_localstatedir}/lib/%{name}
 
 %changelog
+* Fri Mar 18 2006 Adrian Reber <adrian at lisas.de> - 1.4-7
+- rebuilt; fixed dist tag
+
+* Fri Mar 18 2006 Adrian Reber <adrian at lisas.de> - 1.4-6
+- rebuilt
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.4-5
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Sun Apr  2 18:51:11 2006
From: fedora-extras-commits at redhat.com (Duncan Ferguson (duncs))
Date: Sun,  2 Apr 2006 11:51:11 -0700
Subject: rpms/perl-X11-Protocol/FC-5 perl-X11-Protocol.spec,1.1,1.2
Message-ID: <200604021851.k32IpDw8031750@cvs-int.fedora.redhat.com>

Author: duncs

Update of /cvs/extras/rpms/perl-X11-Protocol/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31733

Modified Files:
	perl-X11-Protocol.spec 
Log Message:
Updated to latest version, with spec file bugfixes


Index: perl-X11-Protocol.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-X11-Protocol/FC-5/perl-X11-Protocol.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-X11-Protocol.spec	10 Sep 2005 10:29:51 -0000	1.1
+++ perl-X11-Protocol.spec	2 Apr 2006 18:51:11 -0000	1.2
@@ -1,12 +1,12 @@
 Name:           perl-X11-Protocol
-Version:        0.54
-Release:        2%{?dist}
+Version:        0.55
+Release:        3%{?dist}
 Summary:        X11-Protocol - Raw interface to X Window System servers
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/X11-Protocol/
-Source0:        http://search.cpan.org/CPAN/authors/id/S/SM/SMCCAM/X11-Protocol-0.54.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/S/SM/SMCCAM/X11-Protocol-0.55.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:	noarch
@@ -28,10 +28,10 @@
 %setup -q -n X11-Protocol-%{version}
 
 # Testing requires X - use "rpmbuild --with X"
-%{!?_with_X:\
-%{__perl} -pi -e 'print "print \"Remaining tests require X\n\"; exit 0;"
-			if /Insert your test code below/;' test.pl \
-}
+%if 0%{!?_with_X:1}
+%{__perl} -pi -e 'print "print \"Remaining tests require X\n\"; exit 0;" 
+			if /Insert your test code below/;' test.pl 
+%endif
 
 perldoc -t perlartistic > Artistic
 perldoc -t perlgpl > COPYING
@@ -69,6 +69,15 @@
 
 
 %changelog
+* Sun Apr 02 2006 Duncan Ferguson <duncan_j_ferguson at yahoo.co.uk> 0.55-3
+- Change tests for X environment
+
+* Sat Apr 01 2006 Duncan Ferguson <duncan_j_ferguson at yahoo.co.uk> 0.55-2
+- Specfile bugfile
+
+* Fri Mar 31 2006 Duncan Ferguson <duncan_j_ferguson at yahoo.co.uk> 0.55-1
+- Update to new version of X11::Protocol
+
 * Fri Aug 26 2005 Paul Howarth <paul at city-fan.org> 0.54-2
 - remove redundant BR: perl
 - remove compiler optimization flags, redundant for noarch package



From fedora-extras-commits at redhat.com  Sun Apr  2 20:08:06 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sun,  2 Apr 2006 13:08:06 -0700
Subject: rpms/tclhttpd/devel tclhttpd-3.5.1-nofork.patch, NONE,
	1.1 tclhttpd.spec, 1.5, 1.6
Message-ID: <200604022008.k32K88xA003512@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclhttpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3492

Modified Files:
	tclhttpd.spec 
Added Files:
	tclhttpd-3.5.1-nofork.patch 
Log Message:
- Don't create the tclhttpd home directory when adding the user.
- Added patch to disable [fork] if we're running in a threaded Tcl.
- Add newlines to make the ChangeLog more readable.



tclhttpd-3.5.1-nofork.patch:

--- NEW FILE tclhttpd-3.5.1-nofork.patch ---
diff -Naur tclhttpd3.5.1/bin/httpd.tcl tclhttpd3.5.1.new/bin/httpd.tcl
--- tclhttpd3.5.1/bin/httpd.tcl	2006-04-02 12:57:00.000000000 -0700
+++ tclhttpd3.5.1.new/bin/httpd.tcl	2006-04-02 12:57:50.000000000 -0700
@@ -342,6 +342,11 @@
 
 # Fork a child process if expect is present.
 if {$Config(daemon)} {
+    if {[info exists tcl_platform(threaded)] && $tcl_platform(threaded) == 1} {
+	Stderr "Can't fork with a threaded interpreter.  Please run without the -daemon flag."
+        exit 1
+    }
+
     if {![catch {package require Expect}] || ![catch {package require Tclx}]} {
         if {[fork]} {
             exit
diff -Naur tclhttpd3.5.1/bin/redhat.init.tclhttpd tclhttpd3.5.1.new/bin/redhat.init.tclhttpd
--- tclhttpd3.5.1/bin/redhat.init.tclhttpd	2006-04-02 12:57:00.000000000 -0700
+++ tclhttpd3.5.1.new/bin/redhat.init.tclhttpd	2006-04-02 12:58:23.000000000 -0700
@@ -142,7 +142,7 @@
 'start')
         echo -n $"Starting $prog: "
         ln -sf /var/run/tclhttpd/tclhttpd.pid /var/run/tclhttpd.pid
-	daemon $prog -daemon 1 -config /etc/tclhttpd/tclhttpd.rc -docRoot /var/www/tclhttpd/htdocs -library /var/www/tclhttpd/custom
+	daemon $prog -config /etc/tclhttpd/tclhttpd.rc -docRoot /var/www/tclhttpd/htdocs -library /var/www/tclhttpd/custom 2>1 >> /var/log/tclhttpd/startup.log &
         RETVAL=$?
         echo
         [ $RETVAL = 0 ] && touch /var/lock/subsys/tclhttpd


Index: tclhttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/devel/tclhttpd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tclhttpd.spec	21 Feb 2006 17:32:00 -0000	1.5
+++ tclhttpd.spec	2 Apr 2006 20:08:06 -0000	1.6
@@ -1,7 +1,7 @@
 %define contentdir %_var/www/tclhttpd
 Name: tclhttpd
 Version: 3.5.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: Extensible Web+Application server written in Tcl
 
 Group: System Environment/Daemons
@@ -10,6 +10,7 @@
 Source0:        http://prdownloads.sourceforge.net/tclhttpd/tclhttpd3.5.1.tar.gz
 Patch0:		tclhttpd_fedora.1.patch
 Patch1:		tclhttpd-md5-3.5.1.patch
+Patch2:		tclhttpd-3.5.1-nofork.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: tcl-devel
@@ -28,10 +29,10 @@
 %setup -q -n %{name}%{version}
 %patch0 -p1
 %patch1
+%patch2 -p1
 
 %build
 %configure --with-serverroot=%{contentdir}
-#make limit_LIB_FILE=liblimit.so crypt_LIB_FILE=libcrypt.so %{?_smp_mflags}
 make %{?_smp_mflags}
 
 %install
@@ -92,7 +93,7 @@
 # server as "root" or "nobody".
 user_uid=`id -u tclhttpd 2>/dev/null`
 if [ x"$user_uid" = x ] ; then
-    /usr/sbin/fedora-useradd 16 -c "Tclhttpd" -s /bin/false -d %{contentdir} tclhttpd
+    /usr/sbin/fedora-useradd 16 -c "Tclhttpd" -s /bin/false -d %{contentdir} -M tclhttpd
 fi
 
 %post
@@ -133,36 +134,51 @@
 %ghost %{_var}/run/tclhttpd/tclhttpd.pid
 
 %changelog
+* Fri Mar 31 2006 Wart <wart at kobold.org> - 3.5.1-11
+- Don't create the tclhttpd home directory when adding the user.
+- Added patch to disable [fork] if we're running in a threaded Tcl.
+- Add newlines to make the ChangeLog more readable.
+
 * Tue Feb 21 2006 Wart <wart at kobold.org> - 3.5.1-10
 - Rebuild for FC5
+
 * Fri Jan 27 2006 Wart <wart at kobold.org> - 3.5.1-9
 - Added patch for utils.tcl to prevent error due to missing md5 function.
+
 * Fri Jan 27 2006 Wart <wart at kobold.org> - 3.5.1-8
 - Updated patch so that tclhttpd starts as root and then switches to
   the tclhttpd user.  This is necessary if tclhttpd is to listen
   on port 80.
+
 * Sun Jan 21 2006 Wart <wart at kobold.org> - 3.5.1-7
 - Check if the tclhttpd user exists before trying to create it
+
 * Sun Jan 15 2006 Wart <wart at kobold.org> - 3.5.1-6
 - Use ghosted files for runtime state files.
 - Update patch to remove build dependency on autoconf.
+
 * Tue Nov 22 2005 Wart <wart at kobold.org> - 3.5.1-5
 - Move bin/httpdthread.tcl out of the bin directory.
+
 * Sun Nov 20 2005 Wart <wart at kobold.org> - 3.5.1-4
 - Use fedora_useradd/fedora_userdel to create/delete the tclhttpd user.
 - Added BuildRequires: autoconf.
 - Clean up file permissions to remove many rpmlint warnings.
+
 * Thu Jul 7 2005 <wart at kobold.org> - 3.5.1-3
 - Add 'restart' in the rpm postun stage.  Add post/preun requirements
   for /sbin/chkconfig and /sbin/service.
 - Changed the default runlevel in the init script to '-' to prevent the
   service from being started by default.
+
 * Thu Jun 30 2005 <wart at kobold.org> - 3.5.1-2
 - Updated release tag to include %{dist}
 - Don't include changes to the spec in the patchfile.
 - run autoreconf in the prep stage, not the build stage.
+
 * Fri Jun 17 2005 <wart at kobold.org> - 3.5.1-1
 - Updated spec file to conform to Fedora Core 4 standards.
+
 * Sat Nov 13 2004 <wart at kobold.org> - 3.5.1-0.fdr.8
 - Change content directory again to prevent rpmlint warnings.
 - Change ownership of content directory to prevent rpmlint warnings.
@@ -170,13 +186,16 @@
 - Move crypt and limit dynamically loadable modules into the proper
   subdirectories
 - Turn off potentially insecure debug url.
+
 * Sun Nov 7 2004 <wart at kobold.org> - 3.5.1-0.fdr.7
 - Change content directory to /var/tclhttpd
 - Move logs to /var/log/tclhttpd
 - Remove the debug auth password.
+
 * Wed Nov 3 2004 <wart at kobold.org> - 3.5.1-0.fdr.6
 - Add missing #include <crypt.h> to crypt.c to fix a segfault on
   x86_64.
+
 * Sat Oct 30 2004 <wart at kobold.org> - 3.5.1-0.fdr.5
 - Add expect to the dependency list.
 - Let tclhttpd fork into the background if either one of tclx
@@ -184,15 +203,19 @@
 - Add existing docs to %doc list.
 - Move configuration file to /etc/tclhttpd.
 - Clean up some rpmlint warnings
+
 * Sun Oct 24 2004 <wart at kobold.org> - 3.5.1-0.fdr.4
 - Change package group in the specfile.  Add tcllib to dependency list.
   Remove tclhttpd user during uninstall.
+
 * Wed Oct 6 2004 <wart at kobold.org> - 3.5.1-0.fdr.3
 - Fix bug in the /etc/init.d/tclhttpd startup script that was causing
   it to kill a random tclsh process during shutdown, and misreporting
   the status of tclhttpd.
+
 * Tue Sep 21 2004 <wart at kobold.org> - 3.5.1-0.fdr.2
 - remove hardcoded path in the %build section of the rpm spec file.
+
 * Sun Sep 12 2004 <wart at kobold.org> - 3.5.1-0.fdr.1
 - Initial rpm with a Fedora-compatible spec file.  Included patch
   for better /etc/init.d script behaviour.



From fedora-extras-commits at redhat.com  Sun Apr  2 20:12:42 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sun,  2 Apr 2006 13:12:42 -0700
Subject: rpms/tclhttpd/FC-5 tclhttpd-3.5.1-nofork.patch, NONE,
	1.1 tclhttpd.spec, 1.5, 1.6
Message-ID: <200604022012.k32KCis4003584@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclhttpd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3564

Modified Files:
	tclhttpd.spec 
Added Files:
	tclhttpd-3.5.1-nofork.patch 
Log Message:
- Don't create the tclhttpd home directory when adding the user.
- Added patch to disable [fork] if we're running in a threaded Tcl.
- Add newlines to make the ChangeLog more readable.



tclhttpd-3.5.1-nofork.patch:

--- NEW FILE tclhttpd-3.5.1-nofork.patch ---
diff -Naur tclhttpd3.5.1/bin/httpd.tcl tclhttpd3.5.1.new/bin/httpd.tcl
--- tclhttpd3.5.1/bin/httpd.tcl	2006-04-02 12:57:00.000000000 -0700
+++ tclhttpd3.5.1.new/bin/httpd.tcl	2006-04-02 12:57:50.000000000 -0700
@@ -342,6 +342,11 @@
 
 # Fork a child process if expect is present.
 if {$Config(daemon)} {
+    if {[info exists tcl_platform(threaded)] && $tcl_platform(threaded) == 1} {
+	Stderr "Can't fork with a threaded interpreter.  Please run without the -daemon flag."
+        exit 1
+    }
+
     if {![catch {package require Expect}] || ![catch {package require Tclx}]} {
         if {[fork]} {
             exit
diff -Naur tclhttpd3.5.1/bin/redhat.init.tclhttpd tclhttpd3.5.1.new/bin/redhat.init.tclhttpd
--- tclhttpd3.5.1/bin/redhat.init.tclhttpd	2006-04-02 12:57:00.000000000 -0700
+++ tclhttpd3.5.1.new/bin/redhat.init.tclhttpd	2006-04-02 12:58:23.000000000 -0700
@@ -142,7 +142,7 @@
 'start')
         echo -n $"Starting $prog: "
         ln -sf /var/run/tclhttpd/tclhttpd.pid /var/run/tclhttpd.pid
-	daemon $prog -daemon 1 -config /etc/tclhttpd/tclhttpd.rc -docRoot /var/www/tclhttpd/htdocs -library /var/www/tclhttpd/custom
+	daemon $prog -config /etc/tclhttpd/tclhttpd.rc -docRoot /var/www/tclhttpd/htdocs -library /var/www/tclhttpd/custom 2>1 >> /var/log/tclhttpd/startup.log &
         RETVAL=$?
         echo
         [ $RETVAL = 0 ] && touch /var/lock/subsys/tclhttpd


Index: tclhttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/FC-5/tclhttpd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- tclhttpd.spec	21 Feb 2006 17:32:00 -0000	1.5
+++ tclhttpd.spec	2 Apr 2006 20:12:42 -0000	1.6
@@ -1,7 +1,7 @@
 %define contentdir %_var/www/tclhttpd
 Name: tclhttpd
 Version: 3.5.1
-Release: 10%{?dist}
+Release: 11%{?dist}
 Summary: Extensible Web+Application server written in Tcl
 
 Group: System Environment/Daemons
@@ -10,6 +10,7 @@
 Source0:        http://prdownloads.sourceforge.net/tclhttpd/tclhttpd3.5.1.tar.gz
 Patch0:		tclhttpd_fedora.1.patch
 Patch1:		tclhttpd-md5-3.5.1.patch
+Patch2:		tclhttpd-3.5.1-nofork.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: tcl-devel
@@ -28,16 +29,15 @@
 %setup -q -n %{name}%{version}
 %patch0 -p1
 %patch1
+%patch2 -p1
 
 %build
 %configure --with-serverroot=%{contentdir}
-#make limit_LIB_FILE=liblimit.so crypt_LIB_FILE=libcrypt.so %{?_smp_mflags}
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# Override the names of the library files so that rpm does not try to think
-# that this is a library package.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 install -p -D bin/redhat.init.tclhttpd $RPM_BUILD_ROOT/%{_initrddir}/tclhttpd
 mkdir -p $RPM_BUILD_ROOT%_var/run/tclhttpd
@@ -92,7 +92,7 @@
 # server as "root" or "nobody".
 user_uid=`id -u tclhttpd 2>/dev/null`
 if [ x"$user_uid" = x ] ; then
-    /usr/sbin/fedora-useradd 16 -c "Tclhttpd" -s /bin/false -d %{contentdir} tclhttpd
+    /usr/sbin/fedora-useradd 16 -c "Tclhttpd" -s /bin/false -d %{contentdir} -M tclhttpd
 fi
 
 %post
@@ -133,36 +133,51 @@
 %ghost %{_var}/run/tclhttpd/tclhttpd.pid
 
 %changelog
+* Fri Mar 31 2006 Wart <wart at kobold.org> - 3.5.1-11
+- Don't create the tclhttpd home directory when adding the user.
+- Added patch to disable [fork] if we're running in a threaded Tcl.
+- Add newlines to make the ChangeLog more readable.
+
 * Tue Feb 21 2006 Wart <wart at kobold.org> - 3.5.1-10
 - Rebuild for FC5
+
 * Fri Jan 27 2006 Wart <wart at kobold.org> - 3.5.1-9
 - Added patch for utils.tcl to prevent error due to missing md5 function.
+
 * Fri Jan 27 2006 Wart <wart at kobold.org> - 3.5.1-8
 - Updated patch so that tclhttpd starts as root and then switches to
   the tclhttpd user.  This is necessary if tclhttpd is to listen
   on port 80.
+
 * Sun Jan 21 2006 Wart <wart at kobold.org> - 3.5.1-7
 - Check if the tclhttpd user exists before trying to create it
+
 * Sun Jan 15 2006 Wart <wart at kobold.org> - 3.5.1-6
 - Use ghosted files for runtime state files.
 - Update patch to remove build dependency on autoconf.
+
 * Tue Nov 22 2005 Wart <wart at kobold.org> - 3.5.1-5
 - Move bin/httpdthread.tcl out of the bin directory.
+
 * Sun Nov 20 2005 Wart <wart at kobold.org> - 3.5.1-4
 - Use fedora_useradd/fedora_userdel to create/delete the tclhttpd user.
 - Added BuildRequires: autoconf.
 - Clean up file permissions to remove many rpmlint warnings.
+
 * Thu Jul 7 2005 <wart at kobold.org> - 3.5.1-3
 - Add 'restart' in the rpm postun stage.  Add post/preun requirements
   for /sbin/chkconfig and /sbin/service.
 - Changed the default runlevel in the init script to '-' to prevent the
   service from being started by default.
+
 * Thu Jun 30 2005 <wart at kobold.org> - 3.5.1-2
 - Updated release tag to include %{dist}
 - Don't include changes to the spec in the patchfile.
 - run autoreconf in the prep stage, not the build stage.
+
 * Fri Jun 17 2005 <wart at kobold.org> - 3.5.1-1
 - Updated spec file to conform to Fedora Core 4 standards.
+
 * Sat Nov 13 2004 <wart at kobold.org> - 3.5.1-0.fdr.8
 - Change content directory again to prevent rpmlint warnings.
 - Change ownership of content directory to prevent rpmlint warnings.
@@ -170,13 +185,16 @@
 - Move crypt and limit dynamically loadable modules into the proper
   subdirectories
 - Turn off potentially insecure debug url.
+
 * Sun Nov 7 2004 <wart at kobold.org> - 3.5.1-0.fdr.7
 - Change content directory to /var/tclhttpd
 - Move logs to /var/log/tclhttpd
 - Remove the debug auth password.
+
 * Wed Nov 3 2004 <wart at kobold.org> - 3.5.1-0.fdr.6
 - Add missing #include <crypt.h> to crypt.c to fix a segfault on
   x86_64.
+
 * Sat Oct 30 2004 <wart at kobold.org> - 3.5.1-0.fdr.5
 - Add expect to the dependency list.
 - Let tclhttpd fork into the background if either one of tclx
@@ -184,15 +202,19 @@
 - Add existing docs to %doc list.
 - Move configuration file to /etc/tclhttpd.
 - Clean up some rpmlint warnings
+
 * Sun Oct 24 2004 <wart at kobold.org> - 3.5.1-0.fdr.4
 - Change package group in the specfile.  Add tcllib to dependency list.
   Remove tclhttpd user during uninstall.
+
 * Wed Oct 6 2004 <wart at kobold.org> - 3.5.1-0.fdr.3
 - Fix bug in the /etc/init.d/tclhttpd startup script that was causing
   it to kill a random tclsh process during shutdown, and misreporting
   the status of tclhttpd.
+
 * Tue Sep 21 2004 <wart at kobold.org> - 3.5.1-0.fdr.2
 - remove hardcoded path in the %build section of the rpm spec file.
+
 * Sun Sep 12 2004 <wart at kobold.org> - 3.5.1-0.fdr.1
 - Initial rpm with a Fedora-compatible spec file.  Included patch
   for better /etc/init.d script behaviour.



From fedora-extras-commits at redhat.com  Sun Apr  2 20:21:02 2006
From: fedora-extras-commits at redhat.com (Duncan Ferguson (duncs))
Date: Sun,  2 Apr 2006 13:21:02 -0700
Subject: rpms/perl-X11-Protocol/FC-5 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200604022021.k32KL4tU003660@cvs-int.fedora.redhat.com>

Author: duncs

Update of /cvs/extras/rpms/perl-X11-Protocol/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3641

Modified Files:
	.cvsignore sources 
Log Message:
version update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-X11-Protocol/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Sep 2005 10:29:51 -0000	1.2
+++ .cvsignore	2 Apr 2006 20:21:02 -0000	1.3
@@ -1 +1 @@
-X11-Protocol-0.54.tar.gz
+X11-Protocol-0.55.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-X11-Protocol/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Sep 2005 10:29:51 -0000	1.2
+++ sources	2 Apr 2006 20:21:02 -0000	1.3
@@ -1 +1 @@
-b2ad4dc41755f2b08f9cd2899636346c  X11-Protocol-0.54.tar.gz
+3d914cb8945105a8b96ec1497dee47e2  X11-Protocol-0.55.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr  2 20:31:51 2006
From: fedora-extras-commits at redhat.com (Duncan Ferguson (duncs))
Date: Sun,  2 Apr 2006 13:31:51 -0700
Subject: rpms/perl-X11-Protocol/FC-5 perl-X11-Protocol.spec,1.2,1.3
Message-ID: <200604022031.k32KVrrt003854@cvs-int.fedora.redhat.com>

Author: duncs

Update of /cvs/extras/rpms/perl-X11-Protocol/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3837

Modified Files:
	perl-X11-Protocol.spec 
Log Message:
Correct silly procedural mistake


Index: perl-X11-Protocol.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-X11-Protocol/FC-5/perl-X11-Protocol.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-X11-Protocol.spec	2 Apr 2006 18:51:11 -0000	1.2
+++ perl-X11-Protocol.spec	2 Apr 2006 20:31:51 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           perl-X11-Protocol
 Version:        0.55
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        X11-Protocol - Raw interface to X Window System servers
 
 Group:          Development/Libraries
@@ -69,6 +69,9 @@
 
 
 %changelog
+* Sun Apr 02 2006 Duncan Ferguson <duncan_j_ferguson at yahoo.co.uk> 0.55-4
+- Correct silly procedural mistake
+
 * Sun Apr 02 2006 Duncan Ferguson <duncan_j_ferguson at yahoo.co.uk> 0.55-3
 - Change tests for X environment
 



From fedora-extras-commits at redhat.com  Sun Apr  2 20:44:31 2006
From: fedora-extras-commits at redhat.com (Warren Togami (wtogami))
Date: Sun, 2 Apr 2006 13:44:31 -0700
Subject: owners owners.list,1.793,1.794
Message-ID: <200604022044.k32KiVeC003992@cvs-int.fedora.redhat.com>

Author: wtogami

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3971

Modified Files:
	owners.list 
Log Message:
nabi is orphaned



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.793
retrieving revision 1.794
diff -u -r1.793 -r1.794
--- owners.list	2 Apr 2006 14:42:05 -0000	1.793
+++ owners.list	2 Apr 2006 20:44:31 -0000	1.794
@@ -723,7 +723,7 @@
 Fedora Extras|muine|Music Player for GNOME|foolish at guezz.net|extras-qa at fedoraproject.org|
 Fedora Extras|munin|Network-wide graphing framework (grapher/gatherer)|kevin at tummy.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|nabi|Simple Hangul X Input Method|djoo at redhat.com|extras-qa at fedoraproject.org|wtogami at redhat.com
+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|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|



From fedora-extras-commits at redhat.com  Sun Apr  2 21:03:00 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Sun,  2 Apr 2006 14:03:00 -0700
Subject: rpms/gnokii/devel gnokii.spec,1.1,1.2
Message-ID: <200604022103.k32L32Ah006130@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/gnokii/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6091

Modified Files:
	gnokii.spec 
Log Message:
Post-approval patches.



Index: gnokii.spec
===================================================================
RCS file: /cvs/extras/rpms/gnokii/devel/gnokii.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnokii.spec	1 Apr 2006 18:24:59 -0000	1.1
+++ gnokii.spec	2 Apr 2006 21:03:00 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           gnokii
 Version:        0.6.12
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Linux/Unix tool suite for various mobile phones
 
 Group:          Applications/Communications
@@ -116,6 +116,19 @@
 install -pm 644 %{SOURCE6} README.smsd2mail
 # Fix up X86_64 library placement issue
 %{__sed} -i -e 's|/lib /usr/lib\b|/%{_lib} %{_libdir}|' configure
+# Polish default font, cool but ISO8859-2
+iconv -f iso8859-2 -t utf8 -o iconv.tmp ChangeLog
+mv iconv.tmp ChangeLog
+iconv -f iso8859-2 -t utf8 -o iconv.tmp Docs/CREDITS
+mv iconv.tmp Docs/CREDITS
+iconv -f iso8859-2 -t utf8 -o iconv.tmp Docs/README
+mv iconv.tmp Docs/README
+iconv -f iso8859-2 -t utf8 -o iconv.tmp COPYRIGHT
+mv iconv.tmp COPYRIGHT
+iconv -f iso8859-2 -t utf8 -o iconv.tmp smsd/ChangeLog
+mv iconv.tmp smsd/ChangeLog
+iconv -f iso8859-2 -t utf8 -o iconv.tmp xgnokii/ChangeLog
+mv iconv.tmp xgnokii/ChangeLog
 
 
 %build
@@ -161,20 +174,6 @@
 install -Dpm 644 %{SOURCE4} \
   $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/gnokii-smsd
 
-iconv -f iso8859-2 -t utf8 -o iconv.tmp ChangeLog
-mv iconv.tmp ChangeLog
-iconv -f iso8859-2 -t utf8 -o iconv.tmp Docs/CREDITS
-mv iconv.tmp Docs/CREDITS
-iconv -f iso8859-2 -t utf8 -o iconv.tmp Docs/README
-mv iconv.tmp Docs/README
-iconv -f iso8859-2 -t utf8 -o iconv.tmp COPYRIGHT
-mv iconv.tmp COPYRIGHT
-iconv -f iso8859-2 -t utf8 -o iconv.tmp smsd/ChangeLog
-mv iconv.tmp smsd/ChangeLog
-iconv -f iso8859-2 -t utf8 -o iconv.tmp xgnokii/ChangeLog
-mv iconv.tmp xgnokii/ChangeLog
-
-
 
 %find_lang %{name}
 
@@ -235,6 +234,8 @@
 %{_datadir}/applications/*xgnokii.desktop
 %{_datadir}/xgnokii/
 %{_mandir}/man1/xgnokii.1*
+%{_libdir}/pkgconfig/xgnokii.pc
+%dir %{_prefix}/share/xgnokii
 
 %files smsd
 %defattr(-,root,root,-)
@@ -262,9 +263,11 @@
 %{_includedir}/gnokii*
 %{_libdir}/libgnokii.so
 %{_libdir}/pkgconfig/gnokii.pc
-%{_libdir}/pkgconfig/xgnokii.pc
 
 %changelog
+* Sun Apr 2 2006 Linus Walleij <triad at df.lth.se> - 0.6.12-3
+- Post-import updates.
+
 * Thu Mar 31 2006 Linus Walleij <triad at df.lth.se> - 0.6.12-2
 - Updated after comments from Ville.
 



From fedora-extras-commits at redhat.com  Sun Apr  2 21:37:40 2006
From: fedora-extras-commits at redhat.com (Linus Walleij (snirkel))
Date: Sun,  2 Apr 2006 14:37:40 -0700
Subject: rpms/gnokii/devel gnokii.spec,1.2,1.3
Message-ID: <200604022137.k32LbgPl006299@cvs-int.fedora.redhat.com>

Author: snirkel

Update of /cvs/extras/rpms/gnokii/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6282

Modified Files:
	gnokii.spec 
Log Message:
Fixed a goof-up.



Index: gnokii.spec
===================================================================
RCS file: /cvs/extras/rpms/gnokii/devel/gnokii.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnokii.spec	2 Apr 2006 21:03:00 -0000	1.2
+++ gnokii.spec	2 Apr 2006 21:37:40 -0000	1.3
@@ -3,7 +3,7 @@
 
 Name:           gnokii
 Version:        0.6.12
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Linux/Unix tool suite for various mobile phones
 
 Group:          Applications/Communications
@@ -232,10 +232,8 @@
 %{_bindir}/xgnokii
 %{_datadir}/pixmaps/xgnokii.png
 %{_datadir}/applications/*xgnokii.desktop
-%{_datadir}/xgnokii/
 %{_mandir}/man1/xgnokii.1*
-%{_libdir}/pkgconfig/xgnokii.pc
-%dir %{_prefix}/share/xgnokii
+%{_prefix}/share/xgnokii/
 
 %files smsd
 %defattr(-,root,root,-)
@@ -263,8 +261,12 @@
 %{_includedir}/gnokii*
 %{_libdir}/libgnokii.so
 %{_libdir}/pkgconfig/gnokii.pc
+%{_libdir}/pkgconfig/xgnokii.pc
 
 %changelog
+* Sun Apr 2 2006 Linus Walleij <triad at df.lth.se> - 0.6.12-4
+- Goofed up. Fixit it...
+
 * Sun Apr 2 2006 Linus Walleij <triad at df.lth.se> - 0.6.12-3
 - Post-import updates.
 



From fedora-extras-commits at redhat.com  Sun Apr  2 21:44:44 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Sun,  2 Apr 2006 14:44:44 -0700
Subject: rpms/python-imaging/devel python-imaging-lib64.patch, NONE,
	1.1 python-imaging.spec, 1.7, 1.8
Message-ID: <200604022144.k32LikGd006388@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/python-imaging/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6364

Modified Files:
	python-imaging.spec 
Added Files:
	python-imaging-lib64.patch 
Log Message:
* Sun Apr  2 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-2
- Fix bug #185203 (Thanks to Rick L Vinyard Jr)


python-imaging-lib64.patch:

--- NEW FILE python-imaging-lib64.patch ---
--- setup-old.py	2005-03-23 18:16:40.000000000 +0000
+++ setup.py	2006-04-02 22:34:04.000000000 +0100
@@ -180,6 +180,7 @@
         add_directory(library_dirs, "/usr/local/lib")
         add_directory(include_dirs, "/usr/local/include")
 
+        add_directory(library_dirs, "/usr/lib64")
         add_directory(library_dirs, "/usr/lib")
         add_directory(include_dirs, "/usr/include")
 


Index: python-imaging.spec
===================================================================
RCS file: /cvs/extras/rpms/python-imaging/devel/python-imaging.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-imaging.spec	6 Mar 2006 01:31:12 -0000	1.7
+++ python-imaging.spec	2 Apr 2006 21:44:44 -0000	1.8
@@ -5,12 +5,13 @@
 Summary: Python's own image processing library
 Name: python-imaging
 Version: 1.1.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: Distributable
 Group: Development/Languages
 Source0: http://effbot.org/downloads/Imaging-%{version}.tar.gz
 Patch0: %{name}-no-xv.patch
+Patch1: %{name}-lib64.patch
 URL: http://www.pythonware.com/products/pil/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -48,6 +49,7 @@
 %prep
 %setup -q -n Imaging-%{version}
 %patch0 -p1
+%patch1 -p0
 
 # fix the interpreter path for Scripts/*.py
 cd Scripts
@@ -102,6 +104,9 @@
 
 
 %changelog
+* Sun Apr  2 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-2
+- Fix bug #185203 (Thanks to Rick L Vinyard Jr)
+
 * Sun Mar  5 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-1
 - Update to 1.1.5
 



From fedora-extras-commits at redhat.com  Sun Apr  2 21:57:27 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Sun,  2 Apr 2006 14:57:27 -0700
Subject: rpms/python-imaging/FC-5 python-imaging-lib64.patch, NONE,
	1.1 python-imaging.spec, 1.7, 1.8
Message-ID: <200604022157.k32LvTTU006472@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/python-imaging/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6452

Modified Files:
	python-imaging.spec 
Added Files:
	python-imaging-lib64.patch 
Log Message:
* Sun Apr  2 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-2
- Fix bug #185203 (Thanks to Rick L Vinyard Jr)


python-imaging-lib64.patch:

--- NEW FILE python-imaging-lib64.patch ---
--- setup-old.py	2005-03-23 18:16:40.000000000 +0000
+++ setup.py	2006-04-02 22:34:04.000000000 +0100
@@ -180,6 +180,7 @@
         add_directory(library_dirs, "/usr/local/lib")
         add_directory(include_dirs, "/usr/local/include")
 
+        add_directory(library_dirs, "/usr/lib64")
         add_directory(library_dirs, "/usr/lib")
         add_directory(include_dirs, "/usr/include")
 


Index: python-imaging.spec
===================================================================
RCS file: /cvs/extras/rpms/python-imaging/FC-5/python-imaging.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-imaging.spec	6 Mar 2006 01:31:12 -0000	1.7
+++ python-imaging.spec	2 Apr 2006 21:57:26 -0000	1.8
@@ -5,12 +5,13 @@
 Summary: Python's own image processing library
 Name: python-imaging
 Version: 1.1.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: Distributable
 Group: Development/Languages
 Source0: http://effbot.org/downloads/Imaging-%{version}.tar.gz
 Patch0: %{name}-no-xv.patch
+Patch1: %{name}-lib64.patch
 URL: http://www.pythonware.com/products/pil/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -48,6 +49,7 @@
 %prep
 %setup -q -n Imaging-%{version}
 %patch0 -p1
+%patch1 -p0
 
 # fix the interpreter path for Scripts/*.py
 cd Scripts
@@ -102,6 +104,9 @@
 
 
 %changelog
+* Sun Apr  2 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-2
+- Fix bug #185203 (Thanks to Rick L Vinyard Jr)
+
 * Sun Mar  5 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-1
 - Update to 1.1.5
 



From fedora-extras-commits at redhat.com  Sun Apr  2 21:59:25 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Sun,  2 Apr 2006 14:59:25 -0700
Subject: rpms/python-imaging/FC-4 python-imaging-lib64.patch, NONE,
	1.1 python-imaging.spec, 1.7, 1.8
Message-ID: <200604022159.k32LxRH0006541@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/python-imaging/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6521

Modified Files:
	python-imaging.spec 
Added Files:
	python-imaging-lib64.patch 
Log Message:
* Sun Apr  2 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-2
- Fix bug #185203 (Thanks to Rick L Vinyard Jr)


python-imaging-lib64.patch:

--- NEW FILE python-imaging-lib64.patch ---
--- setup-old.py	2005-03-23 18:16:40.000000000 +0000
+++ setup.py	2006-04-02 22:34:04.000000000 +0100
@@ -180,6 +180,7 @@
         add_directory(library_dirs, "/usr/local/lib")
         add_directory(include_dirs, "/usr/local/include")
 
+        add_directory(library_dirs, "/usr/lib64")
         add_directory(library_dirs, "/usr/lib")
         add_directory(include_dirs, "/usr/include")
 


Index: python-imaging.spec
===================================================================
RCS file: /cvs/extras/rpms/python-imaging/FC-4/python-imaging.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-imaging.spec	6 Mar 2006 01:49:15 -0000	1.7
+++ python-imaging.spec	2 Apr 2006 21:59:25 -0000	1.8
@@ -5,12 +5,13 @@
 Summary: Python's own image processing library
 Name: python-imaging
 Version: 1.1.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: Distributable
 Group: Development/Languages
 Source0: http://effbot.org/downloads/Imaging-%{version}.tar.gz
 Patch0: %{name}-no-xv.patch
+Patch1: %{name}-lib64.patch
 URL: http://www.pythonware.com/products/pil/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -48,6 +49,7 @@
 %prep
 %setup -q -n Imaging-%{version}
 %patch0 -p1
+%patch1 -p0
 
 # fix the interpreter path for Scripts/*.py
 cd Scripts
@@ -102,6 +104,9 @@
 
 
 %changelog
+* Sun Apr  2 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-2
+- Fix bug #185203 (Thanks to Rick L Vinyard Jr)
+
 * Sun Mar  5 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-1
 - Update to 1.1.5
 



From fedora-extras-commits at redhat.com  Sun Apr  2 22:08:14 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun,  2 Apr 2006 15:08:14 -0700
Subject: fedora-rpmdevtools spectemplate-lib.spec, NONE,
	1.1 fedora-newrpmspec, 1.6, 1.7 fedora-rpmdevtools.spec, 1.92, 1.93
Message-ID: <200604022208.k32M8EKM008647@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/fedora-rpmdevtools
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8626

Modified Files:
	fedora-newrpmspec fedora-rpmdevtools.spec 
Added Files:
	spectemplate-lib.spec 
Log Message:
* Mon Apr  3 2006 Ville Skytt?? <ville.skytta at iki.fi>
- Add spec template for library packages (#185606, Ignacio Vazquez-Abrams).



--- NEW FILE spectemplate-lib.spec ---
Name:           
Version:        
Release:        1%{?dist}
Summary:        

Group:          System Environment/Libraries
License:        
URL:            
Source0:        
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  
Requires:       

%description


%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.


%prep
%setup -q


%build
%configure --disable-static
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%files
%defattr(-,root,root,-)
%doc
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc
%{_includedir}/*
%{_libdir}/*.so


%changelog


Index: fedora-newrpmspec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/fedora-newrpmspec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fedora-newrpmspec	5 Feb 2006 14:05:34 -0000	1.6
+++ fedora-newrpmspec	2 Apr 2006 22:08:11 -0000	1.7
@@ -14,8 +14,10 @@
 Options:
   -o FILE  Output the specfile to FILE.  "-" means stdout.  The default is
            "<appname>.spec", or "$DEFSPEC" if appname is not given.
-  -t TYPE  Force use of the TYPE spec template.  The default is "$DEFTYPE",
-           see $SPECDIR/spectemplate-*.spec for available types.
+  -t TYPE  Force use of the TYPE spec template.  The default is guessed
+           from <appname>, falling back to "$DEFTYPE" if the guesswork
+           does not result in a more specific one or if <appname> is not
+           given.  See $SPECDIR/spectemplate-*.spec for available types.
   -h       Show this usage message
 EOF
     exit $ret
@@ -65,6 +67,9 @@
         ruby-*)
             spectype=ruby
             ;;
+        lib*|*-lib|*-libs)
+            spectype=lib
+            ;;
         *)
             spectype=$DEFTYPE
             ;;


Index: fedora-rpmdevtools.spec
===================================================================
RCS file: /cvs/fedora/fedora-rpmdevtools/fedora-rpmdevtools.spec,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- fedora-rpmdevtools.spec	26 Feb 2006 15:53:55 -0000	1.92
+++ fedora-rpmdevtools.spec	2 Apr 2006 22:08:11 -0000	1.93
@@ -127,6 +127,9 @@
 
 
 %changelog
+* Mon Apr  3 2006 Ville Skytt?? <ville.skytta at iki.fi>
+- Add spec template for library packages (#185606, Ignacio Vazquez-Abrams).
+
 * Sun Feb 26 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.5-1
 - Improve diffarchive and extract error messages.
 



From fedora-extras-commits at redhat.com  Sun Apr  2 22:08:18 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sun,  2 Apr 2006 15:08:18 -0700
Subject: rpms/abe/devel abe-1.1-settings.patch,NONE,1.1 abe.spec,1.11,1.12
Message-ID: <200604022208.k32M8KUU008669@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/abe/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8622

Modified Files:
	abe.spec 
Added Files:
	abe-1.1-settings.patch 
Log Message:
Enable changing the video settings in-game.



abe-1.1-settings.patch:

--- NEW FILE abe-1.1-settings.patch ---
diff -Naur --exclude '*.swp' abe-1.1/src/Menu.c abe-1.1.new/src/Menu.c
--- abe-1.1/src/Menu.c	2005-03-05 08:20:04.000000000 -0800
+++ abe-1.1.new/src/Menu.c	2006-04-02 15:04:37.000000000 -0700
@@ -116,7 +116,7 @@
   if(n == SOUND_ENABLED || n == MUSIC_ENABLED)
     return sound_loaded;
   else
-    return 0;
+    return 1;
 }
 
 void


Index: abe.spec
===================================================================
RCS file: /cvs/extras/rpms/abe/devel/abe.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- abe.spec	4 Mar 2006 21:24:50 -0000	1.11
+++ abe.spec	2 Apr 2006 22:08:18 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           abe
 Version:        1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Scrolling, platform-jumping, ancient pyramid exploring game
 Group:          Amusements/Games
@@ -8,6 +8,7 @@
 URL:            http://abe.sourceforge.net/
 Source0:        http://dl.sourceforge.net/abe/abe-1.1.tar.gz
 Source1:        %{name}.png
+Patch0:		abe-1.1-settings.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL-devel >= 1.2.3, SDL_mixer-devel >= 1.2.3
@@ -19,6 +20,7 @@
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 %configure --with-data-dir=%{_datadir}/%{name}
@@ -63,6 +65,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Sun Apr 2 2006 Wart <wart at kobold.org> 1.1-2
+- Enable changing the video settings (BZ #187589)
+
 * Sat Mar 4 2006 Wart <wart at kobold.org> 1.1-1
 - Update to 1.1
 



From fedora-extras-commits at redhat.com  Sun Apr  2 22:19:53 2006
From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb))
Date: Sun,  2 Apr 2006 15:19:53 -0700
Subject: rpms/muine/FC-5 muine.spec,1.2,1.3
Message-ID: <200604022219.k32MJtX2008760@cvs-int.fedora.redhat.com>

Author: sindrepb

Update of /cvs/extras/rpms/muine/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8743

Modified Files:
	muine.spec 
Log Message:
Removed %{epoch} dependency in -devel pacakge


Index: muine.spec
===================================================================
RCS file: /cvs/extras/rpms/muine/FC-5/muine.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- muine.spec	23 Mar 2006 13:32:28 -0000	1.2
+++ muine.spec	2 Apr 2006 22:19:53 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           muine
 Version:        0.8.4
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Music Player for GNOME
 
 Group:          Applications/Multimedia
@@ -34,7 +34,7 @@
 %package devel
 Summary: Files required for Muine plug-in development
 Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}
+Requires: %{name} = %{version}
 
 %description devel
 Files needed for building plug-ins for Muine.
@@ -115,6 +115,9 @@
 %{_libdir}/muine/*.a
 
 %changelog
+* Sun Apr 02 2006 Sindre Pedersen Bj??rdal <foolish[AT]guezz.net> - 0.8.4-7
+- Remove %{epoch} in -devel Requires
+
 * Tue Mar 23 2006 Sindre Pedersen Bj??rdal <foolish[AT]guezz.net> - 0.8.4-6
 - Add missing mono-web dependency 
 



From fedora-extras-commits at redhat.com  Sun Apr  2 22:20:09 2006
From: fedora-extras-commits at redhat.com (Sindre Pedersen Bjørdal (sindrepb))
Date: Sun,  2 Apr 2006 15:20:09 -0700
Subject: rpms/muine/devel muine.spec,1.1,1.2
Message-ID: <200604022220.k32MKB1O008783@cvs-int.fedora.redhat.com>

Author: sindrepb

Update of /cvs/extras/rpms/muine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8766

Modified Files:
	muine.spec 
Log Message:
Removed %{epoch} dependency in -devel pacakge


Index: muine.spec
===================================================================
RCS file: /cvs/extras/rpms/muine/devel/muine.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- muine.spec	15 Mar 2006 15:27:18 -0000	1.1
+++ muine.spec	2 Apr 2006 22:20:09 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           muine
 Version:        0.8.4
-Release:        5%{?dist}
+Release:        7%{?dist}
 Summary:        Music Player for GNOME
 
 Group:          Applications/Multimedia
@@ -17,7 +17,7 @@
 BuildRequires:	libid3tag-devel
 BuildRequires:	libvorbis-devel, flac-devel
 BuildRequires:	desktop-file-utils, gettext
-Requires:       mono-core, dbus-sharp >= 0.50, gtk-sharp2
+Requires:       mono-core, mono-web, dbus-sharp >= 0.50, gtk-sharp2
 
 Requires(pre): 	GConf2
 Requires(post): GConf2, desktop-file-utils
@@ -34,7 +34,7 @@
 %package devel
 Summary: Files required for Muine plug-in development
 Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}
+Requires: %{name} = %{version}
 
 %description devel
 Files needed for building plug-ins for Muine.
@@ -115,6 +115,12 @@
 %{_libdir}/muine/*.a
 
 %changelog
+* Sun Apr 02 2006 Sindre Pedersen Bj??rdal <foolish[AT]guezz.net> - 0.8.4-7
+- Remove %{epoch} in -devel Requires
+
+* Tue Mar 23 2006 Sindre Pedersen Bj??rdal <foolish[AT]guezz.net> - 0.8.4-6
+- Add missing mono-web dependency 
+
 * Tue Mar 14 2006 Sindre Pedersen Bj??rdal <foolish[AT]fedoraforum.org> - 0.8.4-5
 - Patch added to really fix the x86_64 issue
 



From fedora-extras-commits at redhat.com  Sun Apr  2 22:24:19 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sun,  2 Apr 2006 15:24:19 -0700
Subject: rpms/abe/FC-5 abe.spec,1.11,1.12
Message-ID: <200604022224.k32MOLKo008808@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/abe/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8791

Modified Files:
	abe.spec 
Log Message:
- Enable changing the video settings (BZ #187589)




Index: abe.spec
===================================================================
RCS file: /cvs/extras/rpms/abe/FC-5/abe.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- abe.spec	4 Mar 2006 21:24:50 -0000	1.11
+++ abe.spec	2 Apr 2006 22:24:19 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           abe
 Version:        1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Scrolling, platform-jumping, ancient pyramid exploring game
 Group:          Amusements/Games
@@ -8,6 +8,7 @@
 URL:            http://abe.sourceforge.net/
 Source0:        http://dl.sourceforge.net/abe/abe-1.1.tar.gz
 Source1:        %{name}.png
+Patch0:		abe-1.1-settings.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL-devel >= 1.2.3, SDL_mixer-devel >= 1.2.3
@@ -19,6 +20,7 @@
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 %configure --with-data-dir=%{_datadir}/%{name}
@@ -63,6 +65,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Sun Apr 2 2006 Wart <wart at kobold.org> 1.1-2
+- Enable changing the video settings (BZ #187589)
+
 * Sat Mar 4 2006 Wart <wart at kobold.org> 1.1-1
 - Update to 1.1
 



From fedora-extras-commits at redhat.com  Sun Apr  2 22:24:59 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sun,  2 Apr 2006 15:24:59 -0700
Subject: rpms/abe/FC-4 abe-1.1-settings.patch,NONE,1.1 abe.spec,1.9,1.10
Message-ID: <200604022225.k32MP1LW008858@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/abe/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8824/FC-4

Modified Files:
	abe.spec 
Added Files:
	abe-1.1-settings.patch 
Log Message:
- Enable changing the video settings (BZ #187589)



abe-1.1-settings.patch:

--- NEW FILE abe-1.1-settings.patch ---
diff -Naur --exclude '*.swp' abe-1.1/src/Menu.c abe-1.1.new/src/Menu.c
--- abe-1.1/src/Menu.c	2005-03-05 08:20:04.000000000 -0800
+++ abe-1.1.new/src/Menu.c	2006-04-02 15:04:37.000000000 -0700
@@ -116,7 +116,7 @@
   if(n == SOUND_ENABLED || n == MUSIC_ENABLED)
     return sound_loaded;
   else
-    return 0;
+    return 1;
 }
 
 void


Index: abe.spec
===================================================================
RCS file: /cvs/extras/rpms/abe/FC-4/abe.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- abe.spec	4 Mar 2006 23:10:55 -0000	1.9
+++ abe.spec	2 Apr 2006 22:24:59 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           abe
 Version:        1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Scrolling, platform-jumping, ancient pyramid exploring game
 Group:          Amusements/Games
@@ -8,6 +8,7 @@
 URL:            http://abe.sourceforge.net/
 Source0:        http://dl.sourceforge.net/abe/abe-1.1.tar.gz
 Source1:        %{name}.png
+Patch0:		abe-1.1-settings.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL-devel >= 1.2.3, SDL_mixer-devel >= 1.2.3
@@ -19,6 +20,7 @@
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 %configure --with-data-dir=%{_datadir}/%{name}
@@ -63,6 +65,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Sun Apr 2 2006 Wart <wart at kobold.org> 1.1-2
+- Enable changing the video settings (BZ #187589)
+
 * Sat Mar 4 2006 Wart <wart at kobold.org> 1.1-1
 - Update to 1.1
 



From fedora-extras-commits at redhat.com  Sun Apr  2 22:25:00 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sun,  2 Apr 2006 15:25:00 -0700
Subject: rpms/abe/FC-5 abe-1.1-settings.patch,NONE,1.1
Message-ID: <200604022225.k32MP2rS008863@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/abe/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8824/FC-5

Added Files:
	abe-1.1-settings.patch 
Log Message:
- Enable changing the video settings (BZ #187589)



abe-1.1-settings.patch:

--- NEW FILE abe-1.1-settings.patch ---
diff -Naur --exclude '*.swp' abe-1.1/src/Menu.c abe-1.1.new/src/Menu.c
--- abe-1.1/src/Menu.c	2005-03-05 08:20:04.000000000 -0800
+++ abe-1.1.new/src/Menu.c	2006-04-02 15:04:37.000000000 -0700
@@ -116,7 +116,7 @@
   if(n == SOUND_ENABLED || n == MUSIC_ENABLED)
     return sound_loaded;
   else
-    return 0;
+    return 1;
 }
 
 void



From fedora-extras-commits at redhat.com  Sun Apr  2 23:37:04 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun,  2 Apr 2006 16:37:04 -0700
Subject: rpms/anjuta import.log,1.7,1.8
Message-ID: <200604022337.k32Nb6fw011074@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11042

Modified Files:
	import.log 
Log Message:
auto-import anjuta-1.2.4-5 on branch FC-5 from anjuta-1.2.4-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/anjuta/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	24 Mar 2006 23:50:40 -0000	1.7
+++ import.log	2 Apr 2006 23:37:03 -0000	1.8
@@ -4,3 +4,4 @@
 anjuta-1_2_4-2:HEAD:anjuta-1.2.4-2.src.rpm:1140477846
 anjuta-1_2_4-3:HEAD:anjuta-1.2.4-3.src.rpm:1140643945
 anjuta-1_2_4-5:HEAD:anjuta-1.2.4-5.src.rpm:1143244226
+anjuta-1_2_4-5:FC-5:anjuta-1.2.4-5.src.rpm:1144021011



From fedora-extras-commits at redhat.com  Sun Apr  2 23:37:04 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun,  2 Apr 2006 16:37:04 -0700
Subject: rpms/anjuta/FC-5 anjuta-encodings.patch, 1.1, 1.2 anjuta.spec, 1.15,
	1.16
Message-ID: <200604022337.k32Nb6YT011082@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11042/FC-5

Modified Files:
	anjuta-encodings.patch anjuta.spec 
Log Message:
auto-import anjuta-1.2.4-5 on branch FC-5 from anjuta-1.2.4-5.src.rpm

anjuta-encodings.patch:

Index: anjuta-encodings.patch
===================================================================
RCS file: /cvs/extras/rpms/anjuta/FC-5/anjuta-encodings.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- anjuta-encodings.patch	20 Feb 2006 23:24:25 -0000	1.1
+++ anjuta-encodings.patch	2 Apr 2006 23:37:04 -0000	1.2
@@ -1,4 +1,4 @@
---- src/anjuta-encodings.c.orig	2005-12-15 18:50:55.000000000 +0100
+--- src/anjuta-encodings.c	2005-12-15 18:50:55.000000000 +0100
 +++ src/anjuta-encodings.c	2005-12-15 18:51:38.000000000 +0100
 @@ -707,15 +707,15 @@
  	gtk_tree_view_set_search_column (GTK_TREE_VIEW (stock_treeview),
@@ -37,4 +37,16 @@
  	
  	anjuta_preferences_register_property_custom (pref, supported_treeview,
  												SUPPORTED_ENCODINGS,
- 												"ISO-8859-15",
+
+--- src/Makefile.in	2005-08-12 16:37:02.000000000 +0200
++++ src/Makefile.in	2006-03-24 19:16:54.000000000 +0100
+@@ -723,7 +723,7 @@
+ 	done
+ anjuta$(EXEEXT): $(anjuta_OBJECTS) $(anjuta_DEPENDENCIES) 
+ 	@rm -f anjuta$(EXEEXT)
+-	$(CXXLINK) $(anjuta_LDFLAGS) $(anjuta_OBJECTS) $(anjuta_LDADD) $(LIBS)
++	$(CXXLINK) -Wl,--export-dynamic $(anjuta_LDFLAGS) $(anjuta_OBJECTS) $(anjuta_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+									"ISO-8859-15",


Index: anjuta.spec
===================================================================
RCS file: /cvs/extras/rpms/anjuta/FC-5/anjuta.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- anjuta.spec	22 Feb 2006 21:32:45 -0000	1.15
+++ anjuta.spec	2 Apr 2006 23:37:04 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           anjuta
 Version:        1.2.4
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        GNOME IDE for C and C++
 
 Group:          Development/Tools
@@ -20,6 +20,8 @@
 BuildRequires:  libtool
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
+BuildRequires:	libgnome-devel
+BuildRequires:	gtk2-devel
 Epoch: 1
 Requires:       pkgconfig libtool gettext-devel
 Requires(post):   scrollkeeper
@@ -46,12 +48,12 @@
 
 %prep
 %setup -q
-%patch -p0 -b patch0
+%patch -p0 -b .encodings
 
 %build
 # configure option --enable-final does not work corretly on x86_64; Use
 # -DNDEBUG in CFLAGS
-export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
+export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
 %configure
 %define libnoprefix %(echo %_libdir | sed 's,%_prefix/,,')
 sed -i -e 's!\(.*PACKAGE_PLUGIN_DIR@,.*\)lib\(/anjuta.*\)!\1%{libnoprefix}\2!g' config.status ; ./config.status
@@ -78,6 +80,10 @@
     s!(^GLOBAL_TAGS_FILE=).*!$1%{_datadir}/%{name}/system.tags!;
     s!tm_global_tags!%{name}_tm_global_tags!g;
 ' ${RPM_BUILD_ROOT}%{_bindir}/anjuta_create_global_tags.sh
+pushd ${RPM_BUILD_ROOT}%{_docdir}
+ln -s anjuta-1.2.4 anjuta
+popd
+
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -95,6 +101,7 @@
 %{_bindir}/%{name}*
 %{_libdir}/%{name}
 %{_datadir}/%{name}
+%{_datadir}/doc/anjuta
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/pixmaps/%{name}
 %{_datadir}/mime-info/anjuta.mime
@@ -107,6 +114,15 @@
 %{_datadir}/omf/%{name}
 
 %changelog
+* Fri Mar 24 2006 Michael Schwendt <bugs.michael at gmx.net> - 1.2.4-5
+- Added export dynamic
+- trivial spec changes
+
+* Fri Mar 24 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 1.2.4-4
+- Added dependancies for gtk2-devel and libgnome-devel
+- Re-instated debug
+- Add symlink for documentation
+
 * Wed Feb 22 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 1.2.4-3
 - Added back in the epoch - oopsie!
 



From fedora-extras-commits at redhat.com  Sun Apr  2 23:38:48 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun,  2 Apr 2006 16:38:48 -0700
Subject: rpms/anjuta/FC-4 anjuta-encodings.patch, NONE, 1.1 .cvsignore, 1.4, 
	1.5 anjuta.spec, 1.10, 1.11 sources, 1.4, 1.5
Message-ID: <200604022338.k32NcoHC011191@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11149/FC-4

Modified Files:
	.cvsignore anjuta.spec sources 
Added Files:
	anjuta-encodings.patch 
Log Message:
auto-import anjuta-1.2.4-5 on branch FC-4 from anjuta-1.2.4-5.src.rpm

anjuta-encodings.patch:

--- NEW FILE anjuta-encodings.patch ---
--- src/anjuta-encodings.c	2005-12-15 18:50:55.000000000 +0100
+++ src/anjuta-encodings.c	2005-12-15 18:51:38.000000000 +0100
@@ -707,15 +707,15 @@
 	gtk_tree_view_set_search_column (GTK_TREE_VIEW (stock_treeview),
 									 COLUMN_ENCODING_NAME);
 	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (stock_treeview));
 	g_return_if_fail (selection != NULL);
 	gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE);
-	g_signal_connect (G_OBJECT (selection), "changed",
-					  G_CALLBACK (on_stock_selection_changed), NULL);
 
 	model = create_encodings_treeview_model ();
 	gtk_tree_view_set_model (GTK_TREE_VIEW (stock_treeview), model);
+	g_signal_connect (G_OBJECT (selection), "changed",
+					  G_CALLBACK (on_stock_selection_changed), NULL);
 	g_object_unref (model);
 
 	/* Add the encoding column for supported treeview*/
 	cell = gtk_cell_renderer_text_new ();
 	column = gtk_tree_view_column_new_with_attributes (_("Supported Encodings"),
@@ -726,17 +726,17 @@
 	gtk_tree_view_set_search_column (GTK_TREE_VIEW (supported_treeview),
 									 COLUMN_ENCODING_NAME);
 	selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (supported_treeview));
 	g_return_if_fail (selection != NULL);
 	gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);
-	g_signal_connect (G_OBJECT (selection), "changed",
-					  G_CALLBACK (on_supported_selection_changed), NULL);
 
 	/* create list store */
 	model = GTK_TREE_MODEL (gtk_list_store_new (SUPPORTED_ENCODING_NUM_COLS,
 												G_TYPE_STRING, G_TYPE_POINTER));
 	gtk_tree_view_set_model (GTK_TREE_VIEW (supported_treeview), model);
+	g_signal_connect (G_OBJECT (selection), "changed",
+					  G_CALLBACK (on_supported_selection_changed), NULL);
 	g_object_unref (model);
 	
 	anjuta_preferences_register_property_custom (pref, supported_treeview,
 												SUPPORTED_ENCODINGS,

--- src/Makefile.in	2005-08-12 16:37:02.000000000 +0200
+++ src/Makefile.in	2006-03-24 19:16:54.000000000 +0100
@@ -723,7 +723,7 @@
 	done
 anjuta$(EXEEXT): $(anjuta_OBJECTS) $(anjuta_DEPENDENCIES) 
 	@rm -f anjuta$(EXEEXT)
-	$(CXXLINK) $(anjuta_LDFLAGS) $(anjuta_OBJECTS) $(anjuta_LDADD) $(LIBS)
+	$(CXXLINK) -Wl,--export-dynamic $(anjuta_LDFLAGS) $(anjuta_OBJECTS) $(anjuta_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
									"ISO-8859-15",


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/anjuta/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Jul 2005 14:07:32 -0000	1.4
+++ .cvsignore	2 Apr 2006 23:38:48 -0000	1.5
@@ -1 +1 @@
-anjuta-1.2.3.tar.gz
+anjuta-1.2.4.tar.gz


Index: anjuta.spec
===================================================================
RCS file: /cvs/extras/rpms/anjuta/FC-4/anjuta.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- anjuta.spec	7 Jul 2005 14:07:32 -0000	1.10
+++ anjuta.spec	2 Apr 2006 23:38:48 -0000	1.11
@@ -1,7 +1,6 @@
 Name:           anjuta
-Version:        1.2.3
-Release:        1%{?dist}
-Epoch:          1
+Version:        1.2.4
+Release:        5%{?dist}
 Summary:        GNOME IDE for C and C++
 
 Group:          Development/Tools
@@ -9,18 +8,21 @@
 URL:            http://anjuta.org/
 Source0:        http://download.sourceforge.net/anjuta/anjuta-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+Patch0: anjuta-encodings.patch
 BuildRequires:  libgnomeui-devel >= 2.0.2
 BuildRequires:  libbonoboui-devel >= 2.0.1
 BuildRequires:  libgnomeprintui22-devel
 BuildRequires:  ncurses-devel >= 5.0
 BuildRequires:  pcre-devel >= 3.9
+BuildRequires:  popt
 BuildRequires:  vte-devel
 BuildRequires:  scrollkeeper
 BuildRequires:  libtool
 BuildRequires:  gettext
 BuildRequires:  desktop-file-utils
-
+BuildRequires:	libgnome-devel
+BuildRequires:	gtk2-devel
+Epoch: 1
 Requires:       pkgconfig libtool gettext-devel
 Requires(post):   scrollkeeper
 Requires(postun): scrollkeeper
@@ -44,24 +46,19 @@
 %description docs
 Anjuta documentation.
 
-
-
 %prep
 %setup -q
-
-
+%patch -p0 -b .encodings
 
 %build
 # configure option --enable-final does not work corretly on x86_64; Use
 # -DNDEBUG in CFLAGS
-export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG"
+export CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
 %configure
 %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
 
-
-
 %install
 rm -rf ${RPM_BUILD_ROOT}
 %makeinstall
@@ -83,24 +80,20 @@
     s!(^GLOBAL_TAGS_FILE=).*!$1%{_datadir}/%{name}/system.tags!;
     s!tm_global_tags!%{name}_tm_global_tags!g;
 ' ${RPM_BUILD_ROOT}%{_bindir}/anjuta_create_global_tags.sh
-
+pushd ${RPM_BUILD_ROOT}%{_docdir}
+ln -s anjuta-1.2.4 anjuta
+popd
 
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
-
-
 %post docs
 scrollkeeper-update -q
 
-
-
 %postun docs
 scrollkeeper-update -q
 
-
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
@@ -108,6 +101,7 @@
 %{_bindir}/%{name}*
 %{_libdir}/%{name}
 %{_datadir}/%{name}
+%{_datadir}/doc/anjuta
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/pixmaps/%{name}
 %{_datadir}/mime-info/anjuta.mime
@@ -119,10 +113,30 @@
 %{_datadir}/gnome/help/%{name}
 %{_datadir}/omf/%{name}
 
+%changelog
+* Fri Mar 24 2006 Michael Schwendt <bugs.michael at gmx.net> - 1.2.4-5
+- Added export dynamic
+- trivial spec changes
+
+* Fri Mar 24 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 1.2.4-4
+- Added dependancies for gtk2-devel and libgnome-devel
+- Re-instated debug
+- Add symlink for documentation
+
+* Wed Feb 22 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 1.2.4-3
+- Added back in the epoch - oopsie!
+
+* Mon Feb 20 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 1.2.4-2
+- Added patch from Anjuta-bugzilla
+
+* Sat Feb 17 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> - 1.2.4-1
+- bumped to 1.2.4
+- change of maintainer
 
+* Thu Aug 18 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1:1.2.3-3
+- rebuilt
 
-%changelog
-* Thu Jul  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1:1.2.3-1
+* Thu Jul  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1:1.2.3-2
 - Update to 1.2.3.
 - Add gettext-devel dependency (Paul Frields).
 - Add libtool (+automake, +autoconf) dependency.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/anjuta/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Jul 2005 14:07:33 -0000	1.4
+++ sources	2 Apr 2006 23:38:48 -0000	1.5
@@ -1 +1 @@
-a2fc3873519f566607cf268276db3b90  anjuta-1.2.3.tar.gz
+5a709fbaedc816a88fd8b9ad5276a47b  anjuta-1.2.4.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr  2 23:38:47 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun,  2 Apr 2006 16:38:47 -0700
Subject: rpms/anjuta import.log,1.8,1.9
Message-ID: <200604022338.k32NcnS2011183@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11149

Modified Files:
	import.log 
Log Message:
auto-import anjuta-1.2.4-5 on branch FC-4 from anjuta-1.2.4-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/anjuta/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	2 Apr 2006 23:37:03 -0000	1.8
+++ import.log	2 Apr 2006 23:38:47 -0000	1.9
@@ -5,3 +5,4 @@
 anjuta-1_2_4-3:HEAD:anjuta-1.2.4-3.src.rpm:1140643945
 anjuta-1_2_4-5:HEAD:anjuta-1.2.4-5.src.rpm:1143244226
 anjuta-1_2_4-5:FC-5:anjuta-1.2.4-5.src.rpm:1144021011
+anjuta-1_2_4-5:FC-4:anjuta-1.2.4-5.src.rpm:1144021115



From fedora-extras-commits at redhat.com  Sun Apr  2 23:45:55 2006
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Sun,  2 Apr 2006 16:45:55 -0700
Subject: owners owners.list,1.794,1.795
Message-ID: <200604022345.k32NjwMd011257@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11240

Modified Files:
	owners.list 
Log Message:
fix bouncing e-mail address


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.794
retrieving revision 1.795
diff -u -r1.794 -r1.795
--- owners.list	2 Apr 2006 20:44:31 -0000	1.794
+++ owners.list	2 Apr 2006 23:45:55 -0000	1.795
@@ -364,7 +364,7 @@
 Fedora Extras|gnome-themes-extras|Collection of metathemes for the GNOME desktop environment|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-translate|GNOME interface to libtranslate -- Natural language translator|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-vfsmm26|C++ wrapper for gnome-vfs|denis at poolshark.org|extras-qa at fedoraproject.org|
-Fedora Extras|gnome-yum|GNOME Interface for YUM|tbandi at users.sourceforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|gnome-yum|GNOME Interface for YUM|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnonlin|GStreamer extension library for non-linear editing|redhat at flyn.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnotime|Tracks and reports time spent|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnuchess|The GNU chess program|kaboom at oobleck.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Apr  3 00:07:11 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun,  2 Apr 2006 17:07:11 -0700
Subject: owners owners.list,1.795,1.796
Message-ID: <200604030007.k3307D83013498@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13481

Modified Files:
	owners.list 
Log Message:
fetch correct email addr from bug 176542


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.795
retrieving revision 1.796
diff -u -r1.795 -r1.796
--- owners.list	2 Apr 2006 23:45:55 -0000	1.795
+++ owners.list	3 Apr 2006 00:07:11 -0000	1.796
@@ -364,7 +364,7 @@
 Fedora Extras|gnome-themes-extras|Collection of metathemes for the GNOME desktop environment|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-translate|GNOME interface to libtranslate -- Natural language translator|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-vfsmm26|C++ wrapper for gnome-vfs|denis at poolshark.org|extras-qa at fedoraproject.org|
-Fedora Extras|gnome-yum|GNOME Interface for YUM|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|gnome-yum|GNOME Interface for YUM|toth_bandi at users.sourceforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnonlin|GStreamer extension library for non-linear editing|redhat at flyn.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnotime|Tracks and reports time spent|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnuchess|The GNU chess program|kaboom at oobleck.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Apr  3 00:33:11 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Sun,  2 Apr 2006 17:33:11 -0700
Subject: rpms/pam_mount import.log,1.14,1.15
Message-ID: <200604030033.k330XDX0013609@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/pam_mount
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13576

Modified Files:
	import.log 
Log Message:
auto-import pam_mount-0.13.0-1 on branch devel from pam_mount-0.13.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pam_mount/import.log,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- import.log	2 Jan 2006 04:53:23 -0000	1.14
+++ import.log	3 Apr 2006 00:33:11 -0000	1.15
@@ -11,3 +11,4 @@
 pam_mount-0_9_25-4:HEAD:pam_mount-0.9.25-4.src.rpm:1118332757
 pam_mount-0_9_25-5:HEAD:pam_mount-0.9.25-5.src.rpm:1132804079
 pam_mount-0_11_0-1:HEAD:pam_mount-0.11.0-1.src.rpm:1136177590
+pam_mount-0_13_0-1:HEAD:pam_mount-0.13.0-1.src.rpm:1144024378



From fedora-extras-commits at redhat.com  Mon Apr  3 00:33:11 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Sun,  2 Apr 2006 17:33:11 -0700
Subject: rpms/pam_mount/devel pam_mount-0.13.0-loop.patch, NONE,
	1.1 pam_mount-0.13.0.tbz2, NONE, 1.1 pam_mount.spec, 1.10,
	1.11 pam_mount-0.11.0.tbz2, 1.1, NONE
Message-ID: <200604030033.k330XEtV013615@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/pam_mount/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13576/devel

Modified Files:
	pam_mount.spec 
Added Files:
	pam_mount-0.13.0-loop.patch pam_mount-0.13.0.tbz2 
Removed Files:
	pam_mount-0.11.0.tbz2 
Log Message:
auto-import pam_mount-0.13.0-1 on branch devel from pam_mount-0.13.0-1.src.rpm

pam_mount-0.13.0-loop.patch:

--- NEW FILE pam_mount-0.13.0-loop.patch ---
diff -u --recursive --new-file pam_mount-0.13.0-vanilla/include/linux/loop.h pam_mount-0.13.0/include/linux/loop.h
--- pam_mount-0.13.0-vanilla/include/linux/loop.h	1969-12-31 18:00:00.000000000 -0600
+++ pam_mount-0.13.0/include/linux/loop.h	2006-04-02 19:16:24.000000000 -0500
@@ -0,0 +1,163 @@
+#ifndef _LINUX_LOOP_H
+#define _LINUX_LOOP_H
+
+/*
+ * include/linux/loop.h
+ *
+ * Written by Theodore Ts'o, 3/29/93.
+ *
+ * Copyright 1993 by Theodore Ts'o.  Redistribution of this file is
+ * permitted under the GNU General Public License.
+ */
+
+#define LO_NAME_SIZE	64
+#define LO_KEY_SIZE	32
+
+#ifdef __KERNEL__
+#include <linux/bio.h>
+#include <linux/blkdev.h>
+#include <linux/spinlock.h>
+
+/* Possible states of device */
+enum {
+	Lo_unbound,
+	Lo_bound,
+	Lo_rundown,
+};
+
+struct loop_func_table;
+
+struct loop_device {
+	int		lo_number;
+	int		lo_refcnt;
+	loff_t		lo_offset;
+	loff_t		lo_sizelimit;
+	int		lo_flags;
+	int		(*transfer)(struct loop_device *, int cmd,
+				    struct page *raw_page, unsigned raw_off,
+				    struct page *loop_page, unsigned loop_off,
+				    int size, sector_t real_block);
+	char		lo_file_name[LO_NAME_SIZE];
+	char		lo_crypt_name[LO_NAME_SIZE];
+	char		lo_encrypt_key[LO_KEY_SIZE];
+	int		lo_encrypt_key_size;
+	struct loop_func_table *lo_encryption;
+	__u32           lo_init[2];
+	uid_t		lo_key_owner;	/* Who set the key */
+	int		(*ioctl)(struct loop_device *, int cmd, 
+				 unsigned long arg); 
+
+	struct file *	lo_backing_file;
+	struct block_device *lo_device;
+	unsigned	lo_blocksize;
+	void		*key_data; 
+
+	gfp_t		old_gfp_mask;
+
+	spinlock_t		lo_lock;
+	struct bio 		*lo_bio;
+	struct bio		*lo_biotail;
+	int			lo_state;
+	struct completion	lo_done;
+	struct completion	lo_bh_done;
+	struct semaphore	lo_ctl_mutex;
+	int			lo_pending;
+
+	request_queue_t		*lo_queue;
+};
+
+#endif /* __KERNEL__ */
+
+/*
+ * Loop flags
+ */
+enum {
+	LO_FLAGS_READ_ONLY	= 1,
+	LO_FLAGS_USE_AOPS	= 2,
+};
+
+#include <asm/posix_types.h>	/* for __kernel_old_dev_t */
+#include <asm/types.h>		/* for __u64 */
+
+typedef unsigned short __kernel_old_dev_t;
+
+/* Backwards compatibility version */
+struct loop_info {
+	int		   lo_number;		/* ioctl r/o */
+	__kernel_old_dev_t lo_device; 		/* ioctl r/o */
+	unsigned long	   lo_inode; 		/* ioctl r/o */
+	__kernel_old_dev_t lo_rdevice; 		/* ioctl r/o */
+	int		   lo_offset;
+	int		   lo_encrypt_type;
+	int		   lo_encrypt_key_size; 	/* ioctl w/o */
+	int		   lo_flags;			/* ioctl r/o */
+	char		   lo_name[LO_NAME_SIZE];
+	unsigned char	   lo_encrypt_key[LO_KEY_SIZE]; /* ioctl w/o */
+	unsigned long	   lo_init[2];
+	char		   reserved[4];
+};
+
+struct loop_info64 {
+	__u64		   lo_device;			/* ioctl r/o */
+	__u64		   lo_inode;			/* ioctl r/o */
+	__u64		   lo_rdevice;			/* ioctl r/o */
+	__u64		   lo_offset;
+	__u64		   lo_sizelimit;/* bytes, 0 == max available */
+	__u32		   lo_number;			/* ioctl r/o */
+	__u32		   lo_encrypt_type;
+	__u32		   lo_encrypt_key_size;		/* ioctl w/o */
+	__u32		   lo_flags;			/* ioctl r/o */
+	__u8		   lo_file_name[LO_NAME_SIZE];
+	__u8		   lo_crypt_name[LO_NAME_SIZE];
+	__u8		   lo_encrypt_key[LO_KEY_SIZE]; /* ioctl w/o */
+	__u64		   lo_init[2];
+};
+
+/*
+ * Loop filter types
+ */
+
+#define LO_CRYPT_NONE		0
+#define LO_CRYPT_XOR		1
+#define LO_CRYPT_DES		2
+#define LO_CRYPT_FISH2		3    /* Twofish encryption */
+#define LO_CRYPT_BLOW		4
+#define LO_CRYPT_CAST128	5
+#define LO_CRYPT_IDEA		6
+#define LO_CRYPT_DUMMY		9
+#define LO_CRYPT_SKIPJACK	10
+#define LO_CRYPT_CRYPTOAPI	18
+#define MAX_LO_CRYPT		20
+
+#ifdef __KERNEL__
+/* Support for loadable transfer modules */
+struct loop_func_table {
+	int number;	/* filter type */ 
+	int (*transfer)(struct loop_device *lo, int cmd,
+			struct page *raw_page, unsigned raw_off,
+			struct page *loop_page, unsigned loop_off,
+			int size, sector_t real_block);
+	int (*init)(struct loop_device *, const struct loop_info64 *); 
+	/* release is called from loop_unregister_transfer or clr_fd */
+	int (*release)(struct loop_device *); 
+	int (*ioctl)(struct loop_device *, int cmd, unsigned long arg);
+	struct module *owner;
+}; 
+
+int loop_register_transfer(struct loop_func_table *funcs);
+int loop_unregister_transfer(int number); 
+
+#endif
+/*
+ * IOCTL commands --- we will commandeer 0x4C ('L')
+ */
+
+#define LOOP_SET_FD		0x4C00
+#define LOOP_CLR_FD		0x4C01
+#define LOOP_SET_STATUS		0x4C02
+#define LOOP_GET_STATUS		0x4C03
+#define LOOP_SET_STATUS64	0x4C04
+#define LOOP_GET_STATUS64	0x4C05
+#define LOOP_CHANGE_FD		0x4C06
+
+#endif


--- NEW FILE pam_mount-0.13.0.tbz2 ---
BZh91AY&SYQ???_??????????????????
?[????V??x?MO??;g??????????mI??v?w`?????????}Zg6??2?s?}?<????l??F?wW_g?/l???????Q?E?P
???}8???oWr??[F???E?1??v????????_y????]?4=
?ami?lY??xc?7g(???sA????
u?????????f??}?t?
A?????????????????gCC??v\?j?>????uy[i??r???????s???uZ\qYa???V?z?????????
?????H?W??_>?????Z?v????y}k|?u?}??yg????}??K?{???=???5
g)>?:?v???????????|????Z:???6?(+ZP?????????????????3????
?
?1?)?RR1A????@???b?*lJ?@?D
???
?z/??>ytp?uMOr|Rb4LVT????:?????sHI??A8,??????Z0???k l?A?7?
?WB?#Tp
y?-C??? ??M?k???0#1?Yc?????(??g?????(??c?a?^?L???V????%?IA??5??w??????Q????U??K
bH?l{?4OP?[??1?aij??B-?7??~l?d???f
%S*
???'?p?:??????]V???x?;A>??0?
[?3VRNr???y?K?'5!a??j?7@????
+????(9???\?5(;L%8Ns??GcC(C4??k????n?A????=????%V2W?zU??(?(h};x??????:?????aFd;????m?I??y???d'nNN?
Ul0?0c?	???4?A? ???C?(aw?H????y???*?Wpl}?Ds#?????,??>O??A???H???Ag?A
? q????
??dK>????;ps-{?1??z?????U??/??????YA??D??\????I?y?c\?;#S?m(?<??1???) ?v??'??s?w"b??????
3??_&?`&??v-????a??:??#???g?eI?x?????E;?????G?V??96??!?Cy?b??????s?!?(?<c`<?:??|:??s?k12??
Eq??????O??%k??@?R?2?fHoC??%\?3^??*???????g??Fa?3??^?:?b$
?????U?B????@?????
??C???%#CwQ-U3O??T??????????gPi???"?u^??j??X?????k{???9?=??~???w?n$?{7M?=g??U;??[2k`?j???9??
??t??H#????&8fic?SQ&4
???g??b{/???4r
a??NFg?7B??f?!?~?????:?YY-??r0TG\&?s??`??Yzb?K!?)B????A????yo?
?]Q?;
Z?UIUU\?g
eC
R??????c?p???<?HIr@?:
????JG????K#????	??????'??.?s}????_???????gow??c????'?&?_????=]??E?s?M???.?Sxz???O7????Z??dq???O??\x7p???????|?~{???????{[?.?3m????	?MOk???_??<?'?r
????Z??2?&>g?|?>j?$??4?%???`??<?
?zD?2]??p????F?F???:????w??B???6?? ??(?D?Y6??????1<Q???0?
?s[??
:?S??????H^??{?U??FSAI????	\?????'S?}?|s?????s?D>???G??B???.????!?@?W?<F?S
?RN5S?]?<?A,u????*mYm?h????nj?vF???s?64?4{;o??????d#???????E!_?qM?|n3??????%#?(`?I?O?g'??7$s2? k?SQ~Y?2???B?L??S>R??J???PM	?2?h?JW???????X1??=.p?F??p?Rmp!<???????? ??R2?I?<????W???
?[?|d?????i>z????37?;? ????w?U?ciQ????^?)	?T????h?Mr
??N??o?x???O?N?P???6???5?9???B???????X??5??]??z o1????$p?*#??&?????#?1????????)C?LM	?%??;&l?????rK?+(??y??"?A???+(?\?)??0?B??
?ad-?>?LN	?I??$(T?????`?^E"????$`?h2|>I?O??am??????
??;?|V?:Y>I?VIJ??h?jH?K?c?:W?'Fmr???m$?p?^I?
)?0???"??t???a?!??%?????vU?T$[??3?N??p66a?i\g?;-?-?*rc??B3.L?
?uJ?NZ??
?4Xq??? 29W'd?P?r$??$DN1J?q??
.\B???{????e????9????V<????Wg0?#?c?&?l???C@?W?<L??$?B???l?{9?Bt??@??e?_??B???el??!P?`?
Yff????.?$???Pq?N?z?i????cs?Df???R???????M|??I??-?g???6?fu%F?????"??e??"H?E??)!v?d?T-ae?{!?T??xZ?L???
?%!A?+?9?LP_%?d)??baS???????!??92????t?i%?K?F=1'?@??Os??Z?6??????`D?????I?'??xp?????)Y?At??M????y??{XA?xGt??b???G????x?m???-?[?
*3
rsZ??
5???
%d?XP???k???fF8?????8?8??@S%&??\k4z????V1C,B!A??\)????H????????Tu`=n?<?????1???I?*]???jY??!d?Oqff??aH??u???L@ P???M????'?;?????nY?,????mC??C???????f????95?-???=?CH?J?8??=??\f?????r??????@h
S??E0X?v:????NM?Z???fG??z7g?0T??WlW??*??"?i?v0???^???+]l?.??79??KP?QL?T??P??fK.???2.b??U)???^?d??mi?????w?^???|?#5T??d??7?bS?~B
??K	??&?L?p???ZF??????S\??7o??S%6?c?C?9#V?W?@?w?M???p????????<fU?v?s?xK??i}???C}	???c?O/?_???'^?m??1??i????I??r?.D??*?)???(?????>H-J???
?J02??RH?O?g9fr>???????u ?2??dL?N?
0F??DI>????D???0??????Ne?~??y???mIOE
?
???C?n
???7????fa?<?2L?z??%h??d%X?b?Q?;???$CL????Q?y??C???,?0?=??pz?$0Q????W???
??Q?]??
???v?5s???T?0(??8?f5?kW??[d7??Z???'?S?@??'?=?;?0?Q????SB?0Q??I??B??1??c??)??"?y???0????Z???jX?QCz?UL?I???Uv^E??7???'?a>??????0??2,??a?>??$?(??2???????#??v5????QP$XT?$????XP???*_Y? ????z?N?C"z????P??????h????b,PgC.Kys,.?e?@???H???-2+??(?W??Y#??2?x???P^F??Y?.??^???P+???o^u[???(Z?)x,?i?Y?NW'?3?w?!??H????7K????j?
?6}V????t?i??v??:???o???j\O??mf]0?f??6},6C?j??/??@?Ek???K0?}???(?[~??)?+?y??_?pQ??p8????g5?I?QM?NJ?N0??8w??L
a???Xo??!aB????_	e??H????0????Q????C??$?<b??g??
 ??????<;+??s?]??M9??
?T{A??A?0[?@?? ???? ???%q?)??@?^^9?`??)AAH?^1/r@?^??#?c????H?i?Ar!?XF?fR??????tf(80j?`??9??G`a????T??
7??)?5??,*8M?#9???z?CU???4'\:?????D?4??fn
s{h????????
TE]B~??
????@?m?
??7?"u????F???+??aO???[?610B??'O??`?)?v<)?TB??Y?#????~??;????z1_^?7?????M?
$??Ga??1???aR?s?F?@0'?C??B?*?Z?
?
E07?#*>&&T?)N????;4?=o?N_q??A?????x?'?0/7W?+???G?46)?-?X??Y?2J?7????e????L|?8?`??a?wc??"h???0??U??l??v~W&?$???aPi;qf"H?}1???'pyP]=C??HGd\??\????i???Q??????{ZB1G??v4???u`????}????????c??????
??K?W9HZP????,L??Ci?????????@?L/?(?86l?8?e??3?D=? ????L?+?b,????~?%|???x???????x?1????c????L????????}8\@??}??.s??	{??g]I?v8???G?E????Y?aO???/??%:???t'?.??`???:4 at EH?/?<?D????;??<Sd????>CVuIL?6"??????FTw?j??,????}#5y~X??f?0?`?#0?='????????K????\??O<?%??uU]?Q?????3U???m\?(?5pP??????????8?O?Zi??????\hd ????AS???A#$R????l??d?E??&~?????3M?2#7??{????O??????M?????????C?? ??
!???5A?DP?0???9?iJ?Gx????b?J?tTC|?H??? ?)?K`????[????a??Wu*???????2zJ??o??????????? ??E?g8v]????f??rn?<??p%??????o*?O??????}???R???????)???R33?x}:^??p_?z?X?r??|??2d??`?]??
T??????L?B????$7??|??h0a'-??=?bm???k???K?P5?????????A?v#?<F??L'R??^?????.?j????+??-l??v}??Q-?[Q"
??i??7X???????????????~??\??5x??:gWm????9?M??F?AG?rI?,???o??,?H43|?D
?Z?????W?U??z{??}??????u????\j???gi?o4?lLD3,????)??!??N+j???K???U????????1>ZU?\???V?f??K(??R????????????s?;?????x??7??a??[n?N?e?[?|???e?<?5I????w????2?c?@J$?wW&=]??<??_-?gPH??m???d??8??@??90?y??6?g?w?c??7"???Lw|???y??!?/????i?y??YP?(Q?nCfCb??F?x?Z.%????m???U?bTS5<{G?qzh??s%L>Q?????b???????TKx?[d???an?W?>2?s3?4"?f???????Zg=?	????o?]?q???????Y%g???s?#`?!f?k?????W???^?5?V?@??1??`o#?@?>s?????7??o_7@?O)}oP??7)X?7{Qc+???????u???j{Ujc???<??C?<?????
??OA??h??R4F?l??s?`is?s3
[$? ?$9?-a????}n???Om??	?&	??
`guWq?PF%zg2$q???'?S??jIB?
???@?4F??e",w?&??E???)??%?x???????q???f?9>bx3?tLLL???????????????d?10?E!R??????????s??{=##??~????2?:H?C
??????,?WgF?2???h]\???????<???4??u??*???61??X???a9
?#????;???y?4??V????}hL??<w???j???Gt???ESl?wpw??s?x???~???`>,?&???H?=???;@?2???Q????????d?o??oa?:?fW????>?G??d?Te"??U??(0?aA?b\n6?*U??Nw???@???3$o??D?O??s???????W???
?z???n?"??????E??A?v?G	?M???l?u??e ??U??1?????8?x*I?S???RZ??Z???\???qe??T.Q?
?99?\Q*??f????E<???eG?L?
?WyB????aTS?.?P????9m?[???<.??&??,?;7T:?r??Q?1??9??54?,?K at -
?
?????d????f?{;?#zjt~?S+??????'?:>T??<n???9V?Y$]???~f???N???y&,???wE?T??
+8?4o?r?\2j4p?P??\??Pgz???6??x?|c?r??t?:MFR??rF9+,?fN+????k?A<?v????`ME???4r????=v?+ZP???*8????????????J?????l?6
?????L?:??N???V???x???"g?T?j???1?\?A?c????>?_??9??"?????j???????;?%???{x@?A1?jC?.0??[!R?h	)??F??i$?		i????5?K
P??@D?P?	?AJSP????)???b
bF%J%)%h? 2???A???	??)?
?*J?d????$?dA
8c?????DJ????????&F?
?0?4??;g?%(b?`??|`1(=??'?a"H?????1,(
???2>?bF??E?T=2?T(
D?T???
?4?? ??GD*)?
??Jh?>r?5
L???$???+?@$????:@??9IG!F?ON???s???	?8CA????#??Y0N8!?c?6??Pz!?M;8h2C?5Bz?C???????3?.?a	?<{2?c?^??????9x?o>zC??"??EN????
?a?8???2?=To??ON??0C???????>?;?????p?"q?
)+%Y?*
G??|??# ??@?$? ??????w???Q??%8G?
%?
BaQ?E?
B???h???"$ZJ!?0???HL?N<?0??`??????????	?bP@?(??????ab??#?
u0?Hd?,,1X?d?	?"@??2:?*D?:4
D??
?Q(hC??
?"
 ?0?!mYd($o?F??\S?
?????? @P??a	A?Q?U??b`?xI?@?+Hp???,k d??@?????:~?d9?A?@!DF??D?
????0dd ?????1???C
L`jx{|?%f??-??b?;6L(??t??? ???$??!??P?8????v$	???
B?r	r8??p???"?,???<V??`(,?l??(8?HB$(?bt(-???)?????
46?`&????tC?ERq& ???q?VkT?????n?h?H?:??zHI?{T?|}???	n???cF^????V?I?jp?.'DB?
e??%???R?Yj*?:`E???8`,??a?
???X?&At?~??
??????j/???}	????,?e7?=?t6?????x?L????a??]??~?7?!??Wy??+*?H& ??@??31Q1??????:;oZ*<????a<??;?eI?$`$?7?? 	?JN"J??z'??????Xu>?T??@a?$????R?8?????i?y?w$s?DYE??,??H-y???b?:%s?? ?L?a?=!v????Xa^`B?!?(" w&??&?????!?????<??3?(??G??K??????O3?}?i?[???9??@@0C?=?:\\????X$??,?
??$??80??n?Y???a??a????;Y?}]?we?Q????????z????"
$???)?r?+d?
x????F
M???????i??N"@???
?HD0???????J???B???A9?-??c?!18?Gq????~wV
1?????~?!?o#??HG????(*???`??Hq}???q!?i?<??~'!??O???Q???0b00?
?`??ga???????z`0@???????
?\p????ID?x9????`n$6??|;?c@??@???G`Km?TT?vo?:?5??	?J?t{	?q????=?;???,p??K???=??:?T??{???(|?X???]?????????/??s?ic??e??F#
??^z??^m?????U?P.????JAI7?Q?6????:c?r??{?!h???!X?zL?D???? |????? ?_???9?f<?`?N??/p?~f?NSb9(?????????"?a???f)???0??C?V
??JZ4??hL?????#????^??????D?(qG??R?_5(c???Nw???5-??,??????.?^u??y??_??+H?-Y??/?l?#\??C
'y?n*>Bs??}???Q)d?07?y?O?????z/?c
???D??J??Q&???d4?Xt???J??u?H?0?dg!?X6G?
n2??B?`???{
???+??0p?B
T??A	?????(U?>h"M?????D`l}??z{c???????O3?#??T??`??(?$ l??6k?aF`?~+?<?O??-???r??C??h?qmp
 u???hs:?s;J?8A?!?
?v!6?w?B  0;B#?``M\L ??????c?,"V& ?\0??-????F?>???????/q?E:?9????F?{???}???6???A??8??1??????P-??HX?S?Q?B??L
j?????l:0??)?P?hLXP`?@?p5{?`5?
??????2? ?&???????q??????S6??o???'T?r	d???>	?s!Ay?i?.?/?$L??dr7?1? ???#??LFr??????v?]A?]=l?W???????+???????
M??_??Y?:4?1?I}?dM??? !U????{N?b????T?p???	?^|??=?????? #?0u? ????6?N&I??
?e???J6?E(.@G??HS??*?Fak??tM??+??:A??????8?wI?Y?	???PL??b?g??_y??z?????D?p$?L??\?W???,?1
??C [???e?[v??
?>?}??k?M?h~M?J?p??4??PF
B?:??C??XRrZGZ??J??	?h ?)]g????H(?JU???????T$?~????D???e?dAL????????c9:?N??fy&9?b`i??e?????v4??? ?????Yrr??G?9_J?p?i?fj?D??Ne?????o?????K?e$?>U?"???????;?
???X??(v?@
??????mg??l??b?|w:??@????Jy?kZ_?Gb?g?y_>?F)EA?bUKbk?i?;K?????@6A???k??A ??/hC?????7h?4!
=?{?M???p????ri?q??yT_???C???
R?n
?`????:l??????F???Oj?r&a??XN??????Fo	?N!?'???????y?=?I???"??V??N??~'?H???Q?=bB?:K??????m?
??s???(?pM??^??~r~??sY??|?? ?bs??????????`?#?	8??????E~?????Ai1A9q?yI9H????? p?0?C?0`?? 35(??2?z}J?a?S?D??h?KTb7?????P+t%?^???a?AE?
c?????? `??H?<?SE?????<
?P0x??O?!/???a?Hy at w??D ???%z?? ???c????bP?[?? ,QZ?H??c?Ty?<??X??j??
m????P??Z??]<???????ir?q?e3.???#????jK?=c????H?b??d?? R??M?x>??Ns5?????i??&F
,0?~??"	mO?????=i
??I???????#?????q???&?????K???????#?J???????????Nsp.p?:D?J0?R,<?&<??q?????F???bi???7???P?-?d?????O??? h??p?\?t?? ?/2?%bd ,b???[???

?"
!)???H?31??i?8R??Os	L?& ,?.mZf?????}ZV???#y???FhS?ui?????n.?2E?????i?fCW]
N???zd??APYy:???????l???2?
O??#?S?p???<??*Nc?9?>??y?>???U???r???6oy??? B?h??fB??7??`?FJ??`j4Nsff"pT?/??Sh,>?>#?_x@?.7??6	??M??t":?L?<???H??>?0?Q0??vV?C??????A?M???l?L??Q&???[P??|???g|??????w?uN?j'?2E|C"???@??	%??>
?!?Z?V?HI?????kZ??(
?3!1?G'cWF???~n?`???????>?V??5c5hml+c	fU??Y???*T!V?J?s%2????y?[??????:+}]????#?:???Ig|??[!?????;????4V?>????n??x?uE???u???R?z?l?t?]t??
??8???!hh5_?Z??3IYoTQl?7??><o??
?dZ"??????`?I???)bM?B??|
??????P$yg at C?M	M5????6:s8?????~s?,W????Xe???Bc??
Sq4
????XxsM at w?cQt	?
?????????|???
?4-???=??0?	?h?4??cM??1	?(I%CX?[??q???x?@`fn8??W?LFG<?Y?O??????~G?&b??"s?
jjg",Ho:?F?R0x???????y???JC??
?;3'?9?	c?9?9L???????k?&?T?L?d??E0?s/??6?%1?????#D?2^?ew?z?e?bg~??`2????U`?e??"??gD?_?????BQ?U??)H??????Q1ze=p???ru<?????o????:bd????g????YB2?ZbBH??2??:&Jr'???????1?[??,?]?4????k??1??n???$?ytq??	???f??\'?_?yUUUUUWL-??h??in
?,?~8:??j?q?NQ??????L?]2R??6??????;????_?????g;????7q??u*}3?{ng*n???T??6$??I$i??????Ug?????^8|L?!c?????/#???8Ni?1?W??L?N?O??-??o??m;1)?|}???	
?`
9?"?S+O?r at D?X
Z??n"q?!??{???M???pu???@:L?<?z??<(?9v???J2am?lp?/??3????|??U?4?H
?Yi9? ??35?? %H?+???mK???| ?C??3z?? ??????YC?-???`?PpO?'z9	?B?$???:?)!$?{?(\?/Z?B???We?4?}?8P8???6B??L#?cp0??@????????]c??l>-)???,
?g+???k??g??k,??
=S,?:?(??Ns??????
=#N??d?B?v??2?pzD??6??_?Ku3????Y?r????{>!t1
??k8?0&k'[Y
?U?KS\??????w????b??2???r???
|`dI???@??I?2?b?cowQ????B??2?)?2?D#Lvr#??w?KL0???$??????q????W??;
?????4????W&??<K??????5??q?p}???
? ?f?R???t??M.^???Z?:8?????????y?bs?????????2?X=!?ov???I-??k???pM??h,?k???w1???D?i??2??#U??5?????D??0?2??c?8????"?l??9?p???wi?O?9Ol???W?
o???P8???H?Ks???JGA?t?ww?&2m)*?p?????~????uk?c?a?0?Xt??O8?
j+?3???V?4P>
??Wk?&Q????g`?????R????~????LVYD.n!f??H?P?0??Zr?5;7??{H ?E}?x?S
*?1???c??????*?2??????X???Z????)E?1?=#???):?J?@?
??:S
?zh??l?`???,\???Q??q5W*??G????D????@vE(<B????1?&??w?b=??=Zn?
6`??r7????s?? ?p?~??
m??%?	?B??0?uv?d???g?Li?Hp???U?rf?R?[@?h?H9#tX??w?B???-$:????R?`?+X:
%?-t?"?lBDP?
?&???9??H???w??
???|M?a;?;W
!??R??	????eM{??&>-????E?r?a?I??
????4??&K??i????ES?0T??;3??do	?>P&K??????*????z?/D^?`??P?A?R?B??K
?? @??0R???dAg?b?{J-???^#B:??2????^?????rQ8.?F??H?T#?3?SE??????40Ad??F?|=??????? ??z??}-?????#*???+*AZ?D?F?C?8?3b??8i??Z??
'?%j?#C??sk???/?c)?2??Y~Bg/???T_? ??^?Q??6?E"?3:???r??????.m4?%?8h???ds??r???/+i@?fX|)?Si??Y
3?&r??????Z?2?G???Y??6fI\?1??2???2Syn:?	?f??w???$?5??Sx2pu2?????-Y????"
?|?`|?j??????/\??2+?r??0'"2(3(?E?;??@??`?3??,???+?????A?????S ?!???Md!>????t??>l??f?)'?29???
E?????4X.?,*????????D?M?0?f??y?
?G??z?k_M?2C????%??v9?QR???(o??O?@x?H?C??Q?a??/?@ta
?N^?
3NW	??Z?@
: ????X??=u?M????5?Q????f???W?e?Q%9?W??J?
?a=%juZ?.??G{?i?r
8?	?4&?AB??pV?ET?``<?>??%???~?}????{??9????D?4????P&a????????uN8{??a?!??C???
????)?T?I>J????????#??w-?K?&?2"?@??3??Fy??:[?????ST?'`?X??a????6?'F2??A????E?TZl?#???(>?)??_?Z/??q??\??t#v???
?b??aW'?*?i?H???V??[??Q????D*g\?zNz*?????f?Y?kj?}|?K!?c????h???uKGr+xt?]?^?ryipp$iK,6??`Q?|J?O??m???????
??c??S?0?_??^=?[I?0?U???????????p???7?Y?L/?NZ'j?I?g	 ?o?D??=??*Eq?L????R?"R/
R?`<c?0??4????!(??s??H??)???3ikJ?g?????Yg???f??rD??=&.V?`??@w?????!??
?~????uk???Z????}=??k??nH??n?w??"?????{WE?nK??h?$??l?!?M[\?5???M??+?	5?7??8?n?~??&P???Z?????fl-?'}-F8?&?`?M?SH*X??y {??%Eu??T?Z???|c?jV???y8
??????e?????o?xA??:?????????{h??c?#G???t?A?bC?Q??&;??\??X????>0?f?i?<
??HR/???A?
??x4?J?%&??????u?D?yj?*?J	????h?;?????*?#c?mC")??5??L?\?.?U?5?ld???V????Y?Q??*??0&?S??????&????B???#?U)?Mo
????Pe?|%??}1HQ?%?ow?<c?Z??P?l????Cg??U[[_??Vg?vG?t??
???6?G???(_4???s??a??+9u_?j???&?$???c?T&?C?j????D??`+%(1h????
O?i??=L???Q??]???????|?????? ??`h?????)?3??: gU,IM!??+?????~PL???B}]?l?J]p
????6|5cF?g????2-?????^z????H?c?'a?0???a!:@?lq?????6)???1?t)D+?dz?
??????t????
i
?>G2)BWl?\
??Z?
:D?????C,?@g?qj7?0itrh)3?z??Z???2??&T??`.h??J?.?N??)
w_??%?S/?/?1 at 1???I????A??:????<?~/?d6??r???d??????8r?Ys?_???????6z{????9?Pcl?"?????3rV80?S$"????0s;???4k
???{D?-??L?(H?Oy?=?gK????aA!*?|???$1!???4Q?e?$?vT6Nj?&a??
~B!??eU?J?????_O??.W-y?:\Y?sM_?Y??;?b??SB?{?S5??W59?????'??]?z{???`???g?8|???O?Pg?u???B':T?
?K\?? ???Q???s;?=??D??R?&	???x????a?$c???????5x:?[*??I???v?A?F?BY??\kb???q6
?????_?????Xfr??????yIU
D2:q,??????????I??3????O?? aP?E??L!Q???c0^?9?*?rK????E?U)?.KRmGn?
?mP0????Hw?????hd???1h???
?A??V?mS?#m??c
?n>?\}???_?	;L&?N ?+=?????????y?~?'?#4z?#?~Tw4?
??ihw$?~E/
???
9?f|?? {[????n??-?3{??V????2??=M?@?m?T<?&???A8??2]ll?@?Y??=??H???X
????Op?[??2??9r3-|????????5??$????m????2Z
??+?^???F??&_?z???=^????J??ma??6Lg????V1?.u??`???????????C	}??? ????s?hr???x???s??Y?k(???
m??vN?]??????U??m8??Is?AQ?]N?????"dU'hD\D4
Y?01?WzB??????jx????N??2??B?<?s^???6??*?FG%??
?l?/?iL?y????b9??c?s?"G
a??o???????Ya2%???A.???h??p?xul??_?6=0Z`??65?????:?????,2?????w?Q at 9M?{gL????4??N:v??[3muk???#C??u?s????6?[?P4`?MX?a?!?{?.??i????j?rB@?P???NE?K?B???z
??????w??:h?????????ee???a]s*Vi???xn????d4??g???|)?	??o??I??
A?
????
k???y_I??z???v????????1??b$???C???~CJ???Q)?lK
?p?B?J??F?>z?8???R?
?I2??
x???x{0??a?8d??",?dJ?)?2??}??17nC??DK,a??9J????a??xP???)U!;x??a???????>????;b$???b???~??]M???h?????Zw@:?3??B#??o?*SNuc?a??p??]???Hb??gr?d??5&,??`?Th??r?6???o?x?69???+????RA???v>O??
?%?G?^`??/u?xL6wN??zs at Da??'?????#?J??y
???? ????;
P??`g?7???kE???Z?????J?Hl??0?u%?????!B????????w?:&??o>_??
?$h?!{?t^%}?'b????{T+@Q??????{c??M(???Xa)H?P???l?@??)??f??f???V3d?'????S33W??Y?4CN?S?l?gL?Q}?Qk??>?B%??}r+a??sj?=?M?
6??d?dz??[??~3-????????xyt?NDG?$1??l??K?????6Z?\?6???w??m7??g??:t?%i;????L82??	??$??:h:??d???&
>i?@?q??_????L???h?L?S??????/|r??????2??d?K8i?!\??k??PA?a?;N??Zp$;"p?????????B??6??=x?m???N^????	4???Y?8??r?]?Y???~???^??e2=?????&u???wD???8??R???u?!0l	?.?a??
????
?	??6?I?
??t?
!d<@??????g?\=?k?%U$??
"???1????> L}Q?bFdN??K!?`?~???R??t??OY???i?C&4]7?,?????W?????%e{/f?M|3??{)????c??a?z??YrqJ??X?;3F&!9???7,?\??^???.0"?WI?T??N?{??7???"??`zvrc?????n?b???k?
?w?/ty???g-?N???????Y9???q?;
R?0????[4??\9z9B!????A??]	??A?q?\??m??????J?? RUP??c ???!1????aw??1?))??+???
PL-?F?T?????Sle"Z^?C???E???????M??8?? ??Z?????f??*Zf????mu~?0?=??????`TC??z??3????M?Q(????????SB???,?:?>]p??B????????????{^???!??	?;??7'?QA g|?2?'L???zj?a??8u??>VS?ti?u?wG}?5??\????RD?Mc ?p? ??t??
??~?l?s$???x?O?R?@?=?,4?|????#????!'.??????[?s???{? ???H?zG??????v???9?????e	h??.*???S]??()?i??*c,?JD?c
???*S??Reh???N??9edx????m?L
6?u0?x\??yr>??????V?o#vRQ???HM?mN?W*6??~&B??	???	#	??]?S?"A???? ?R\?K???y?????3]?o??;]z???g!?????=?=$<??:@Kp?2??e
???????i$?ky??l7?I??Nr&,}???????
???s?3??#????)??,{C^?	?=??q??????F?\?C???????fm???q<Q????l??J?
?0+V??t?"???????!??1??	?@?P???qU?????O1?GIFtl???3??G?>??+M?H?[?~?Q	?r????"c*?HZ???N???=M??,??y/???am8;j???S
?;4???????W?m[??!c?
???;Z
?f? ??c3?X?????+??L?.G??L?????Y???????h??%
????C??9???&
?uz??M???l?
?=?????!????vt??q?M4Q????
?	T?@?Wo.6k?Omu???u$z???6?b0hv?????u?S???#jTq4T???m?R??????.?????e?[???Ck??Q?aA??YR?/?4??5???????????7?'u??v
???P?5??????\?\
C?9`?#?
???q???ej$????c???q?Z6?L???????2?>(K??"?@(z!
@h!QA?/???i?C
???vPq?&v?O3cCyge07?H???i?????,?w
'Z???&<111?I
?^?	?Iq*???1?2#Ic3Ob? ??9????b????i=xSbG??????z/??|?}+?
??w?~??O????c??????????p??u?1?t????$?`cl???h????.?J???x??S???l6??????&?o
????|'-A?qe&??w??0?x?k???????,???????@?b??D????@????p????????A????????W?????+???I[+??*f???
0???aB?)~O????????~??????^?Y?1??`????Gi<???Vg?v$?
?
?92v?Dt?I????T?7?q?|7???
h?VN???_?V9?,?)?h?K??????{???k??;N$????8J?V?1?rb??UM	??Er-?g?1?7?Y??:??Ilrxl?a?/8?2??k?>?J???S	z??i?f?)?.:?R"???EG????M??s???????h???????s? n??h??4
3?h?'P?1???FO?69????+q>???????du?q|/?x?d????(?~U?Y?`??z?k:?u??;???xp?naS~??.p?en#?&?#!4??{?q?a?!1]X??,L??x-@??<
#?<N?\Wym}E4:?zRh<G?8?W????+$	x}????'c}????%f4>????
??P????ku\S|?2???o?I?.???i)T)?;?W?`???X,??J`??\????>????]:/
???gHI?O]???A?w?????}>2?\?lu{^??/????Bx??W
?x??6???&???e????e?0?{??>??*??F?6ca.??N0{?Y?'??0???|??~r??????/zr?fUf?!?T1&F? Ma???)c1?W?-??^?b?3Y!?+Xp?/???<??8????1????A?_??&s??p_??????7??????4xGi??X-l??7h???+????
P??o>?9???????-?Y??ZTR????\|.F?,:R
???6??a at i??7?t{?(:?????K?;????s?*&,?O?\{Hpa??HCX?qXJ?????S	??+W
Q??J??r?1?,?cr??!
se??5?U?)t?dg????i?????_Nz?	?M???8d??r?i ??l=???X,s?G??k??W?r:(?li8??_?o????1?????LQ&/t??c??c??M????
&???3??
[K?Ik4??????|????????b?s?{#?p~??\|*E?????}?^`N???????c?8)?EM??6?C??*'"?lW?2??????O???.?.#\9?d??m?J?/??C???"aW???xZ?aa?{N????q??????????????P^????i?3?~?;hY??te?[???b???????I?q"
z"?
???@p?>01????P?6??ud	h?h8T0?<????;?C(??d??j?? ?=M??????????'G?1D?{4A /???eC&
!:?*e{?j???z?1!?#???x0\?*???????{y?mpq
??:?
_AP???wy?????r????)?r]**?LF?v'?3?\???'u??4?I?S?>?p?`?t??	?E?5?XX?K?b??T?????&?*???S?2>????a3#
???A?J?A??z????P??d
?w?|88Nw3?y9?Ju??>D8?#4p,-?????YXI,??e?Z??K?4?`?e+????Aq???#????4?/fX??)????_?,8?=u??|??v?]?el?Z?B????dT??9?????????9?O'???A
J?|O
a????2 ???????7%(
????E?gir??1??y
?W?r??=Fh???3??i*X??8dM??8??2??92?|??40?$??F????9l
D??$???y??*2?V?$sA?
y?Tk????q?!????/? !P
$D??? m?_?????????{??=c?]3S?]???Yc??,?.?{*??A???I?????b~??OH???/c??AvD???q??y??????????G??2?I=?3!?K????&R3?&?Q?????R?1)???????`hT???Y????
t|??rJc?-*?
?????16L??H?QFl?.2?????????^??M??c?k??#?'?HM?
%R?=K!?q???yS??F?"?V?x~?????zg?Z??Na%WP?a??,?E?*???lJ?91!???E5???*?!????2??	???q]?f????:zgy??????_A?Z??4??-(R&????1A??f?g??8U?+?r,??e?bK???:????)?NYI8?????5?n(????b`?????5u?????.?_??????6???????????#?9_???OF??T??*?:?9v??ZT???????W?6?)??[??<?`??f?L~?????q{?i?\?ri?Xt ~?8??e??.ub?????^N
?F??|??j?d??ny??IUYv?''Wl???h(?36?|?>0A?YB??9?x?+p?[?Z\;??+r?2;	?
????d??8+?q???O?????9??#??>p??&??|??
??9D?*N????e??Si ??|3??G&3??B2??^5??&???^????Ap????L??*
B?u?h?]??g????)n?????dSg??V?
?)??L}L?>?O"h????scK,?aWwETO????!????????d%????C??NE??
<????
?;4????kx?>??H???F???2????A??u??7????`????Q??	????????????4N5??????z?}?
?H?|)????.7Y*?$?Z?c??(????c??oUT???^??~?X???	=??d
???O?e?<??M0F?f?1????<l?D???T??w??????LM??0
XU??????W
4?b?W??06??Ch??J?]?????w???'Xe?aB?n?|?T&L3??=?

??
K(?20j??(d?hM??&??P???D?????&r	"?x?`????G?????y?q= ?5?'?4?+G????XT?qr??v?I??Gi?q???k??6P???[???4?c?-?t????
"8Yx?"??????U[{	y4r
???A?MIJh??5?p?*?????|1?H????L*??)8??????M?Gl?#??`?X??+A?u???e#
BiIB???Y?>o??x??bNhpg
?S??
?HI?????h???J????y?????Cu?????b?H00w#?#?8^mb???b???<d(8h|?c????j???? ?9?`??????9>?>?~]??'????o??j?o?"??.n???(@?D?1e??d??????????Xv????M??@?]?n??d=>???-?? ??
?J*?????$IJZ``L~?!x???Sz?Up?????U?.?R%??M4??R??W??>?*?????{	?SM)j*?\???'<???!???>??f
{?q???T??K8@]?	'?o????`?m????{B%?T ?
?*????1x}?Y????C??+g?_?5???K
W???JGx)?8??O??????????4??????w???/A?????2LA?'??????%v?w?"?L0??T????A?h???R?b?)?G??8F??eR<&!???Wp?LO??0D
# ?D?<<<0R??????c??4,J?&??qUUU???????????*?W????????0"pd?1??
??1?xg?0???"??????v&B?Q)?4QF)@P8?@??w%?c?,dsS?XN??L?eQ?(P??p'??
?q?F??AK?hQ???@??q?8?JI?x`??kD??6?@p?,F??ShX
?phYy?
?a?&??1??)?hX?????1?C?H???1C?;?N!?4??
?Q?8???7??????
???|?L?6,?#J_S?"}4g??1!???????
?H??????#??"e$a?iH[n?p?*?Ji???????"#
h???6????NZ#??FL????r4A??o'?????`@9
PQ)$?+{0%???k???C?q????2D?`>e?e?	W^??[(X?(2jP(?aX VHVIU??????<Jag?I?`~????pu???OB?_@?#??R???!@??J2J?%RE??]?:9s(??]coG?N?@????"jw??06$6?.??7?"?????<??0???t???nge?
G]8?I:$?!???6C?~]?{?????????_?|C????????bFkrN??"?(2b?O??E??KMa????.?	????x???"?Y8????}2EI,??????"7?&m??}?!?O&Y	0%gf?4($T?w???8~?]`????pTT? W????kn?NT?????*
Y4?????????'??lwM?0??G?j?ID???HX*
!?YZD$1?
?]???-??R1	TeG???
A??D?C?S??/?<?)c
????W??_?(C!??,?????w?z
b???????=??$[*??mp??$?K*;1Z`?y?;?alX??hbE?R??x?	?aI??b0??333?5???????`$7???i?&M???3?0??
?Za???????c?6AK,.?S??? ??m?B?D"?L???Z??? ?!?G"?v^??7????U@?LL~
?? ?HX@???	?????!???C?F??G]?(k3:???6q!I`??=?v?BLD[?xA???8??e?U?? 4?Zg???SX?o?????'zv
?0)??? !???Q
?S???0?`?I?>????Q???????Fq?g at y???8??!Q9[F?]??)??(?;?????w2.?aj`?4w
??????!Ui?(Q??a1?
?m?(
`???D2A,?$:?
0??I??L???2a?<??]??I&$?$????S??a;i{v????2???r?mU? b??<C??{G
?? S??Y???4?8???-??8???km?????1a??f??<???H?)"F=
???];C???S?|?am????m???CH??(???%$?6dv{(:HdS??n???n???O'A0?!???
?SQWwCB;?C?In u[
???????
??(??????hqCN?C?) P??'?Y?#??????f@?i:VITh?v????0 ????
?z?k?!?ti??a?6%D2?A
? ?&?4?F???B]~?
J???HI?%v?%`???@?A
??<?0???$?#????R??ib?,?{ r\H??)????d3rhV	?,?@h}lL??@H?X"U?x	????Ha?
zOh@?E ?f?}????t+?o???L??
?&NhY?#??M?`??3U	????4G?:O?L??~??????d???T?J?d??Qg??????n???W?	0????Vc
??z"???w?????E???h?0?'??
??0????8??@5?R;U	???
k?!?
???L???
??w????w ?Y?ab??	?>?"a???????e
J?????h???<?8n??T?H
?
?*I!T?t???!?5y????9???
??C??!wh?"?E??y?h1??h?$?B?W????0eg9???F?`???c1??????????S3=?fdx?'X??NgH?8:b??w??X.?DI?1x?i?v?`0??e!?`??.6|!W!???jwiJ??m$?????????U?p[?????:?H$?Q???g??v3Y??d?K?D???1
?/I?????????????XoFE?X*???A??x???Y??<^g?????|????q??)(1\??j2??E??E???(/y??????t_?L???(A?1?0?b|V?pz??h??##I?8??????? fg???@??5??????K;5?A???8?????9??al?????Y1?Ah0'
4E? ?XF;?"F??$z??j?&^H`?g2??&X??N??Z?d??<Y*^????a?o???1????B.?#
?'?p??(.*??;?????????l(???
??N??mbW?2?~?*ws
??9W?A:2?W??????u?3yT?K???@?????v???I?Bq2
??.???????;??7?-i?j???0?m??1L?L?xg@?1!?c(M?????GNNq???? ?	??92?.X^?!?
???????l?d??{x??\	??Lz???`GA?P????+5?4?????????43(?M?????p????????	??(??????.9?|9??F'?x??0??&'???ln??4?dHN???A??xw??p?h??fSAw?K?|??v?????a??c3??>??)???n0?D???`f
0?????"`??????????

?&?????!J|?& b",?1`0??????	??O??p?"?8*D?
wU?Y??x[GDj??i7??'>?2? ,??en.?SS???ckE??V.E??????s?t???`??????4?{??|?wok?77Dm?1???
?????n/?C0EzX???N??4??o?Z?? E????b??a??l?#
1????U??H????H?????k???'???|?mi??C??TY

?e??!<?h%R?k????wO????8?p5'?????@(???
?????#?+??8-@?????q?????	?q????M7?5?a(vv??!???_sZ0s?????o[??T0x?=?T??????^?;???????#E;????8??????O???????4?'??<?B2?|E\?Q?,f8???????y?????A??qq0?
??31?qn+?U???/??VMA???????{L?!???v??6??Q??????x?-?K???,s????c???p???2?????h.
?x?OI?$y??'&?^???~=?K?????U??	?)???9?w?Q$??oG?????1??I?????iX\??T?i???x:???6?????{K?-?W???????q?"??`c<?F?%?a??o???>???Z8?f?????`??9K}d?e?l.?g???X???G???W???/?wVV?&W?x??ts=???????yc??RQ??????
??A??qU??^?(??2?zW?iB?O???d?)6???f????!&:0t?????`???>R?? ?r?R*]?J?h???^??????t??b?X8?q??????????B??0W???%?]?t???<?%d?S?P?-R?????n)UC??>1!-??`1)M$IE4?bf&#??2B<9????,o#?-A?T??????????"?????	???v?f??QS?????ST??
??U?!A??:?x?UQT?&?%?E)?b???_@$F?
"@??=fK-?o?k??????hzf?????v?U
dO???"?xp??????
??=???????Y'?
?\xf?!$?1???????{}?^??gl3}?g?????S???v????M*?:?=g?CN?L:?SS}??????T?\??C??y \??]?)??mG?p_<6??;h??y??g?7?-? ?4CG?K????j??? ??L?i??6?B1?X??'?4?0??EL!H????B?H??M????Cf?r???N,3 T?t??Y@?V????m???m/R?b??)?9?8Fc????????
?I?;;_??	a???Z?~??1?>:?O@?	?
@???X?
?,?????&?"?{??0Sh$?pp? '
?at????>???fRrCJNI2Xsv?f(?????s?y?lC?"8?3?QA?RL???f?????r???R2???Ew??6???4???<EF?88v!?{???i
??A#!E????!???K3$????'/x??l*`?0RAr????2-?uZ?N?B?"?Y
????T?I3
??????6o?~j???x|#??.??q&-n???h??????z???L?
??v?%?k0"???.???7K?F???jC.????{a??5????}5??????>}??:?mr??\?s;q??h?@?2???[nb??????K??4?i??NH?0??s.?X??tTZm???)w
????`(? PA`E?'S??$?@?w4+?????????????*,??d?mN8??????zo]?8?^??????^?^?f????&?*??	0]??7?????Ga??q
??????A?Y?Yk???C?=?TM?Q?????3Rv??pw
??G?????+?o7	r??????;"?h?0???$?g?????s???C?\?@a??|)9?i?RZx?????5Nv?%R?]g?E??,?`)6????q?+o?%
?u???????v?jK?\??_???8??????????v9???8h^??9??P???>]???'[?#WZ????w@&????b?*????3???????????????m????: ??GE}v[????W+??^9y???v?MriC)\WUxE???C|WsB?ff?;?2???A3F?2?Y>CR?+*?V?:!?<?O??4????<?dU[???z/,?J???F?*?2k?[??JW?"?r?eiR?>??4OW??J???6S??7+K??{???D??r??2??#B?I???9?Q8??U?i"????*?&2^+??c#f?&??3g?MV?????@?Q????u??~??
?????/aE?????Q?rPJ???\????7????v?-?|????|h???0%???
??C??|5???fS???
????1???????g??h?? ???S['c??AN?????%t[??2????9>.?%??BuQ?n@?a?R???m??1H+K?|_%?p?=5????????_?h4??????Tn?T???9??M??@m?????y????Xvo??A<.?-2f7??!p??4?D$U????cQI???????e??#qA???H?f????Q?-U?2?LI??iI?1([???? UR?4????v1?????ZU(?(yy??N???H?E0?????Zc??M?n??????????<)n?9?{????;???/RA???_?J?A]B.9?????QB??t??t??????M?{ @??S^?Sk"??=0DAi?z
$A?????????d??????'??G??%&?w5?&???N??
u?
O???*??|?e??(C=???l?}?F!M4?????UU'??'2??_????#???????????9?m??E??]f?B??1???o??
?D4^
]BSGS?jJ>?0
?-?:T?????
u-x?2`?lH??$hP??Wd0??0P?8?k
O?
?7Vi?~!v TdT??? ????z?gW?)??_p???h
q?D}?????????[??;?s`???
???l<c

??C`???`?0`7
??dA????M????????*???A???9/{????????
?h%?oD??ci?`e?Pfkk?6?[(???K4???,?
{F??+??[?Sh?K?? ??2??c?{??z?8?:?8?h(?x?3?fs]??_???ts??-??]7??

0b?????{?M?=I?(wOC?[U?k??T?:???7U?_?&???&\$!??FL????zb?Dt???v????^???q???@f???h?????p$;???2?,?????????>b???ct?~7??I?]#?#T#Tk=Y?l???{???zn??v&?3?9?????Au3L??H???? ?_?D
??~=?????3-6?????L????
a????$????%H?k?????Dv??SOO@?
??H?;{
????T??3`??????D?N??xA???????'fi?????FN??k?b'5
IS3{?????-???|?WX???A?,?qX???]s????u????g??(??a??CmG??2i???f%S?????J@?????????1???? U"?[;L}{??~??"qd?,?-V??Up??5^?t??b?????><0P????*?p??????k?C???????:???u??Q^?2h}?????'????E?iGLC???~?p?
(S?????"ji?t?z?>N>9ca??k???3X(?>??<?~^??'~?=|1?6W??0???I??q???8?7???64a?U9}4
Nx
?*??(?q???#??2};wwa?+????z?>?M??6k??y?2L?K?RTa????xn:????????c??R}??q???Q}Y???a??????????x|}?k???????f<????8Q??6?b?????U?
??b?S????J?O?WW??????+|???SG?sl?j???1**9H????A??kuH?u??y???	d?pb??$??9????l???Q5u?
??????7?\u?twEw/?????c?u?:??1?#ZJ??????O???J?L??5?A
???GW?&k?[g?Y"
1F???[H#?nn#???^1?yGE???M??s??$??/??r89?r?)D??Q?\??/?V?ms???S??A_?ej=z4Wk????
[?qY]?;?z?$@y??F?????? ?ZW?`E???????s?#????[??)??B?W???m????'???!??U??_??L???O?e??l?MF?z?????n!o??L?u?P6.?ek?e:??R?=F????<?0??r??8s{}y?M??hp??bs??Z.H????H?????
?????'?A??????x6??k7)?
?tm?(x????y$??lt?????_%???h?????p???n0?z??????A???????8i??#???|6?tz?p??@????	2

A??	??)??xM?????E????tpG??`???&-?4z?8%??X#??x??
?4?2??
?T?fwP?
?W|z??fv?0?Jc?s????<e?k'??U?k???m?T?n?4?k???r?G?c??E?/.??YU?hP]??h?????TN?x???????A+?OC?Z^????jt???VX?[?2????m?uCk{E???Z?6?KT???????feg???:???|??&??]?t?)J??-F}&?Y-??}?????O??
d?|?~Ia=9scQ]>?l?T??7f??-+L?????}Z?????=r?5?(??>\%???H?^??u_?????c=?3A?)?_?y????u??Z?
???H???&???Ti:a?q???'a3
???6??3UI???;?$? ,n_????a(?d8?2v?8???C?0
???&??OV???=??????????X,????TG?????????c?!?e?o'BX???7#????m"ir?BA?"??UMb??RW???E??E?8?????z
c
???<???|?@02u0?B
??E1
b*b?]?l^?G?????tlH??FK&?^?7?/?z??h)?OE?_?i????#g? ?XPljb???N???l?G(?BD?? ?
` ????$	???4??0C,L??)2?@?33?
?ys=,"???????jt?:
?t3
9?Tf4? ?5|0>s_t'?m'?1B~???
C?z?}?r????d?p2????0?D???P
#???????r!?tDo??????3u??w?m?????Lv?4?1
??? ?m???o?~V???Gam
\w
?0?$hN?7q?3x?
???Z??$??ah?G>????6W????R}? UP&??z?"_2?j???
??2q??L?????|??-???De??W{?(8?a??L?????c?
(???bq??r??N?HfF?3??V???Y??7??6a????I?A??????
^=EM?qw???]?=?]??;???]&???r?,(_??U?7?Q??8C?e????D????|Pi=??rj???tN.?G?!Q?(?4?J??;? EC??:??$;??l??`??A~?0???C?J-???;??$??[ ?y??"?BR
????????h]C{?:??m?X???^?`????Q83??????????m$TO???????F???&o/	??%?k??Y?q?(???P? ??5|??r??;`????0Z?@?#,?@&?
????????&?????}%e?[?#???h?BP,??q??T??f?F???w?????A-H.2?
n?ip??	???q2?d??i??qc?V???C`Xg>????e]?U??????c???0??#5\?8D??ux%K?a5Rt????
d?>??.$?$????H???????b'????T?B?Z{;?O???R??]ui L??[[?????.?#?"!??0e?
?u?/L?"??@ay??????????h
?u??W??iy?Jz"`cWGX?e?t.4??k??????^H??21T?E??b??
??Q>??
?????`F)W?????(??S	?]???=?O???r<v	A??|?/T?}?`e?d at DDk????r?????@r0rs???9{??dP?| %"
??? ?H'??3??1$??KMM??^?:*QF?G?	?
?????P?A??"dN?$Z???1?Z???L?????????"WS[??
?p??fo-?$???GpG~?????#5????d??@]n?)?{==?#??3H?+8bQ?????????i?;i?n???2bj?[??5?b??6??p??M??0?&?2
?/fS??)? ?P9??G.R??9???
???5??}?9??&??5!??	???Y	r?1#??(?????TB??q???
??????'?DE?hn.Fz*??9???y????O7??p?Y4?UPOqe??
?vO)zLK PB?????%5?????~/p???
??p???y?
????K?????/-??af%
:?u?????"-n9Y???H??
^?x?????a?,9?1?M.~hR2??TT????e=???*?????;3w???HA?>?W????????{?
[%??k???Mpj?	?????]?m??y??????5???;rJ?g?=????#"?(s?V?k??????????????r9X??6?dN??Ts`???????K7??,?33_>?????????*fR?fR??&b???G_????n??????O?????)rp??$OQ5-??RD?I#_????C??????p??o??2!|F9_/??:4
??O?B?|D???Xtr??k???i??wo?/*p *+BC at 9?'??BmR???????G??6$??????6?\6?\?'_???`O?&
???EN8ZO1?.y?*?l#)i!??0?h?X??er?EY?#?<2????g$l?????l??SR^8?s??S??)??P????(?w????
???fHx???"????f?M?>q??????D??*>?'?????)???p?^[?????A????????Fo?8MUUUA5U5U?E??_???wE???????????,????B?3?&qI????y?
Lgf???I?G???7?????>2???,??????UUKED{??;H
F??????'?e?IH????$Hi&0(6X:"]l\????X?@U@
?)?T????E
;????_??I	?R?sg?d>(?xM(?K?>??<{????S1?N??`?O?????

?awf???N??0?i%?^F?#? ??????'???N3?Y????????/[_???S????f?7???????^dg???0?????????E??O)?x????w????p?:???`??j4??????P??@?????m??, }lq?<???O??|?0&7ao?O>????>? ??[??L?????2*?J?.0????P?%
''@?,dd=L?d???Lh
???	S?????8?'??(?T??h7	P?
??
ms????EM?5??&?%?]?

???VW??????>C?!???
?$?C?LB2QR,Iy(?2??J?Q?\??A?0??,?uc????(.???e8??E?D??[?o??q?3?D;'2'?	? TJ?????????	2?E$??!AI#A
J?"???????y??n??p?r???<
??*???w9L'???,????7??
x?/???@R4?i5FR?Q?/??##
A
v)?_?9yf???c??4?F5?*?z??y5?Z4d???@?q???u?%A???E??,?p?a????@??R
???{b??(?(L??????I
?E??y
?m?????????|{????!?7?*F?????eS<)?rC????iC. c?aT?}?{;;3=?&
'?e7?K^???X$??W?1B8?MQ???k?!QR?5d&3?DN5??FRF???$?	6???qbv?E???a??????.?
)?????
:?'???nO???<?!??%????Ue??X )??7?Q?*??&CU4?z1q??????JR?????{.z???????????????l??a?P(v>??ov;??P;?2-?l-?a??&ur?????U?D?L?=$?^?l?C?u??S?6l?YNY???0J???2?&42[
?l0X?u???R?
?0[#o0o=w??????8?S???wM?%?NoJ??TD??uqi??o????$8??9
?;????9E	~s!???q	???C??8l??R{??e?S?e{,?tj?0=?j?_??]?'??????I9?:???,?????R9??*???\?o?(?b???U??UUj?Z?UUUUj?U?U?!??aJw>-UDT?UUUUYVUU'??}?k?im8????s?}+Z?_??v\?P?????v???(E?R?B"?(????]??u??W5Z??8K?<????ET0*
?sR??????e??|??'?????????????*????m??m?????p}??????Ym???Z?r
\??????y???X0N8??km??j???s???>?5????v???k????^UWkm??Uv???J'???]???o??(??"~Vw?5?g????P??1???	??:??????#??/?U7?z???[?><?I??o?9u?????Yes8??
?a}
?A?????c????m???nn????'??H0??;?4?E????????=Eur?????(?@#?n)?Pc
h??????@?*2??p?|?{??-<H??I??O84A??X?S??)[Ya???Ul?t??E?3|F?	??Rc??l??=?X???? a`p?o???Y.??[ ?&?\?????v?????]?pv?H??jC??
??S;?????h??n????=.??/?????7?.Z?1?N1?t
?]?(???0?;n????Z6C???]?|?0??????>;zs???4l??a?$]Q??LG???6??N????A???????q?h?T???"c??????BK$!$?????A>?H?~b$??~??6 H ???@??[?	{??|?ucz?@?????J
X BEf?y?I???????????"??J'?>d??) ?2 at KL-@,?
??"JB???
???Q
?
??2?T.?1??@:??$9!`y??#???????>z??????I????~? ??V?????_?0?
O??
 ??C??q?d?f?????A???@?	L1??j6?3??Q??R5?Fu??????1? c?C?]?}??
?'^?p?
??t
?+N?qExz??@X|TC
Di??d?P?b ???b???'$?h??
{F?A??z????W?????W?fQ??????C??W	2
??y u;:00w??????M$P?/?'?f7????4Z%iA?
????u??M at Q\1#2b?v????Y2)Sr?68-=B??q?VZ?-??????$3?L???'WQ???%?w????a
???d?E?*t????z?@???5??(^?_a?
?L?M
??%`?????U
 ??xD0a?D?~???Gn/?X?8C??>?0X ?N
?,???p????B
U0?/l`??vf???bP??c20s?
[?zF?8F?+?Ht?.!??G.C?&????L??>?i??.?e,?]?#?'????e? z?St??I??N%!?
|
??BH?0?w_???`C??m?71???.LH???Q?? ?;?Q??
??U%V??q~?Q?"2f?<?0?nZ$|??
?H???????ja??j?C???=??5?+??iJM??r?b????a?????rmq?,??2`?`aP5????P?????Giv???????,??????1?J ?g?0YAFh?u??B?p??D	??p0??;??@6(??E`??????Zx???????I ???6?JR?x)`!?????h9{??e? ?J$P6`a?>A?
K6?????@;5??7$?4???=????yo] .?4??D#90????.B(,?X:p2%?$! ?r	???Ax?/?56RE????p?~+*9x??P<D??`#?xd?8????a#TBh?
/Q???D)(?lM~? ???%"?? ?i?,????5????s?&?38hm=?K???#t??????
bE???U`fAC???K??
??q??[
?C????{?;B?3?q>??9`?t????#F????2
???
?Z?80.??n?pL?$
T???????1U??uRq'
???,??'?A?w^/x(??G?*(H?'?s?\Oj??!$)???????m??nww%d:??9X`[
??%?#2???????zq?hh?3+<??f`k????Z`D????????P.??????+?t?g.s??N???QJ??? ??$?I$?I9Af?$?h?Fdt?P?$??~??X&gI?`/???`K-?3?
?G?W?Q?_?LP?!???MB?H?d? F????????x,z?i? 22L`?
@z1???????!o????V<???T?E????`????6???????????/???????????????YL?\?,?/??D???(?(z??"?ll??@?C}
??a$??9?$?a??P??0?D?
,?????????
????
p???????2?1??2???????????G??*???????G3t?}_?\?c	?N;nw,???=bl?N???t??????TiU?_??????@?EN??H?T\?
@
p?o?dE???G???:
????GB??81??Q>?ZQ???q?|
?
.T??R!?pf??C
d?,&??NO?Xl?eI!????
A?R??
??f`_?m~X`|?( ??C?U<@3?2?3@??>3?yu??
$"?????Ey?|???L??????\?!?0R?{^?J$0???*????s3h?????S??R?*??GP*?J;???)0d???2?j*????:?k?`xE5S??Q>>???#g?>Sc_?,C3X???4???.1?8A?#'????
iI" ?????L
?#??ynrW????@js?37???? p?!?CFu??V`9M?e!Nnv?DUPKI?"*h?v
??
#J??%
????<zz?p?8??GZ(??oD?
????s?a?????at&??1?$$8&
?eBD??X?s??@?$? ??0@??P????0????K ?Ar??<???p???D???hE??4?
???+????o?E?HCD??D"?	?$?Z??C?{???n???E???,0*???
zh?tAA?C0h?LN?1?J! ????K??Ne?J??J??X?@ev*??i>:t?"???m?q? p??wnkK.?lW!??lt

4????!???H
1H?;???5??b???<P3?
?????)??C)?j??A???>?W@?SBn??????-??!B0?x?0 at D:??9?-]??<?WE?00?U?q?]??M?S
6?<?????"'???`?8?ZD?-?[2?G???r????y?Vf	?A
??	w?8XM
????n????4IT?c???-?????{z?a??e?@A)?9hz.?B??C?
,???$Q???`?t?`g
E?]*R????&?PI?KP????
J!:%#?A???CB?t1r?	??T?`qaE????#?,?x?*???#?????D?	????z?@?>vt?1??????|??e<?=]
fQQ%S?,j?F??g??Oi?w??H?
????l,7WewV+??l?i?dXjjC;?
?H?
6%j???7
?	??$%??L?G??(?+
D????9%?VZ (No?g	?Q	E?`
??H-?Pv?;`?|G;%
?????????????6~mZS)????H[?[?7?h?#f?A	?`??f????Z?c??9?$ov4|?1????rg?]c?Irq2????5Q????c,?Gg?????;?L?9?x???7CO??$DLw6323	)x??q??!
??

??d9Bl???bYf
X?e|9?#?2b?UP|?L?V{z)'???2P	H?6]?a?P????iF?Q	???G ?J
/????%? ?
HC*
M
B???6?bDB	M??4??&4????Bfe???Xq|b? =?V?c??y??r?3??%v
????*???L?.U?dA?)?M?
?T?L??9?$*R?????Gr&ZQ8:???'????4d??C ???-?s4????,??
?`7
?
^??WRd.N
?Y??W??-CH
o?!??
H??B?LR0? ?Bu?@?"!?{@????ceE"]?V?8?|0?3???Xfb????a?Z8"fr?"?*Z?=HK(W!@??|??v??v*???R????"?Zj????"9?w?[??>?#r|????0[4??+)eRQT????g??7?T?6???T?F??Nh"?9?8oW1??'?????~xl??f?T?? S
8??*X?]z&?*p?@?|?-D??????`?!???{ ?y?'?B?(_4[????Nd'+(?????/i?p??W?v??8? ???7d'?=??u~Y????sKc"????",?2??`Du	?$h?????x?i!;???A?@?!??f|)???>??|?r??i,??r??I?-/??p?dU??FC?;dA?+??^%?+????MSA?
H?/G?A??N?&???L?Gp&??v???]eR~#??Qv0/?o?qOj?
@????C?P?0???a????`u?z??	('?
z??^
??
e%!???Y??M?$M?a?7??+Cy?Z?Hr?`a?Y?9 K???h?`|?f???~?i??$?????p??5
?"	D
~??j?wP??Qv"?}7a???$?A????????.?@?*?2
? @??W\????????T?B???}?C?ZR??.JZ??????~??,Kp????	??/????b??b?D*s?BBA?Hb?L???????M?T ?1?>=????????'???I?
???P?:V?;V?z at H?
??F???????N???O?{A\$(?V?t?????|??p??? ???????????8?????]?(???rN???,????DEc?????s??????,?????, ???k{??L???iT?8O??8????	4 ?`?????q':??)????????|?ad?8?$??7??D at d?f??!9?{
?????*????k????+NX[????)?~_</C
j??XF??_]?pi6??r??
?????f?_???f??????;qy???y???????	?0O?v
??o
??H??????
:"???????0eN?S?!Hs??(??.@ ??$0"?j
?_??l?????H8,B?B;???S??@??j'??n0
Q??k???cI???3??s-N	???????-R???mN??c?S?4???hL??W?a???B???FEH???ENa??G???????L?Y
`aI??4?$O?y?V?F$?A?B?1 at Ls??0
?-??9H?*\?C6?
j??:}????,????m???M????????????????*tM?^?3?
'N9?r??;9?????ZWM"?!?*1k?Xm??Bz8????????i???\Ld??54?dh?????Z????!FW????Br???|}??=pEU????E??<??s??????????;?#{U??t?8??$?????J??K?/??R??)??C?G???q???AR+D?ql???2J#??-(??o7?C?8??*???????S??3???Q???2
	!3???????o??f3B_\8?????=?@?J,?????bM?U`X??mP?J?rmeY%]??@??p???won?W???;y<?<|?<??G?b?v???g?2?????x?]p?F???????q?z???UWQ?_??WW??,=?????a??????q{???y?g????mO?W/	??i(j??Wt?3??e???Z<??2??????????<?K/771o??+??]??s?q\? ?A????AAf??"?|Jfi????'???L??!??7S7????;7'
5)}_*???XfcLw????C ?*???u|f}GAQF????.???s`?1Y??l<?wvfv?`?T?????/~?#?D?
B!?F?a?)??
@>&Gr`8??"??????D??N~p????T*?Q?A
!?
??,???v??f??|???!????"????~????,I????%???CSv_??qdJ)w?CT????5???u????t?&t[?B-?m
?iZy?6|?????qdP??l????????oo9?A?Q?\?_wk?=?n?|N;?0?i????O\v+q?1A0?L?D%???????y????7ir?I?`?=??<wi??#h_e?U'???{??? (@?
%???f???*?N.??pwL???pwq???L??9?3??`?????
???????a????f?g9?????]?zl??r??B??????????;?T???v??????E6Dz???_
m,*?%{??#???H{?c
R*???????>?v?A?
?????}????N?(?6??6v???n?Y*????
>??d5(7?@?????b?X????MD?>?5N????Pg?j?
?!&c?:??	!????&?P????????%??	a2fXd????~??UP?7({?;`
??h?@@?
/??????Q	Q(?&??U(???S?
???W???~?????hG??P?>???3????_X`T?_N??????p
?`#?c??2`?!?????
????
 A
???f
? ?!????????????????fH?=A??a???o*??
?e???[?=?q=?y0k????4=La1??=?s?(??`?Y?@?^Y?\?L???M2U??{/Ue$F"
AS`&??F?$?	?uG??A?%M?x?.??????
H??m??h??
T7??0?F??hW?N>???)@?8?"??`'?(?w????l??)?#wB
?B???

?re?/?@??c????L1l?Ha03<??;H,?0??????mHA?	???0??
"??P???6?mF????R???
KP????%??iJX!ZY,
[$?
F??????%%?????T@???	?8??7Q??p??UUUEUUIZg??x????A?x?
b "?"b????#??;???P;?&X
?:??3???K??!????????|?
?/c???????pE?P8oH?????I??bQ????
?N?@?
???C)?<
?????+?B?yjpH????0 *r6?61B0^T?
?M
1P*?????
.h??p???U??????X?Q?
RUq??w??HF1???q???u?z+?r0wC??NC???C????eM???>S?<N?)E???q#DF	??*?WH??
i???0???L???4?@@?Fb`H?fB?XQ"?D???iN?? ?oTY5L???|}??G?? ?P??@?a?d$!?>`:?`?!?D$??P$??(?N?A

9?????6?2???-????@QEC?P?}????O!S???Q`?j??0?:??@ ?M?z?z?_f????;?+???D?Lg~@hs?S*??TzB?!`c@?s?P<?=?-???????o?r???????????P?	G?.?????~?!????????? R!?B?"d?-S
???:H?<?bhB=?
??\L
?|2?0???s??)c??>?w?}d?y?1
???
???ddt"9F???"??????;??b??3
;
???f!T????]????'???	?'?/q?A??:c??f?wc??Sq?????;?? ??q?;@@?8?{?$?Y-?Bb???bwRR?bc???;8?Y???11?bc??(|]??@??Ck??k??M?&1?m?4?M??lll??7v
D?j???????FL??a
?c
>?p8F?0??7\D?5T?5?p4?Dj?s???[K?!1
??????1???d???
???@? ?	??}???R?j??/?|&Ri?
?`a$??,-??7????)"??>?????t?O??\??8?*?
??'w
b? !????y
???f??`=\_?>???p?rE???????"-?U?F?C??F??\????@Lx
0?Y!?]+M?L?d?
+bP?%???|???a?$=?????B?rG?
j?Gs
??????J?????B??g???(??j?????*????>a$E
RtC..%??? c?#???@????;??????R&J?fS?????C?	)?Hr(?k??zE?????.v?VY?A?Fb??????^eM????(?#????W??????	????u>Y??^9?3?'?ty?_???$auT?????)Y??bE#*??`!???Q???? 
???
0r$
??@)w??!}?`Qa"?A??t???q????I?$x=GVcJ?D?$f??`|?
???/h??CIe?\`???X"	|?????s$???J??
Y????j?4??D??(x$??0$??3Ra?ru?/)H?|E*M4?

(?m????	?H?]Y
!?Z?E???EO?D?`??g.??.Qbt??T}3????@????`&@,T???n=~?PD???%zQ_??O~<?;jE?b"?
?i????????o??/?	D\Cq?l?$e"=R??lP????o??R?R?????@???
bTZP????*???(^})?g?sw??R	?"??M?????
??M??}????0?@NPq?!?<????AJ?M.$??
??t?0?
/? HE)U??H&)??i(*!b?P??????s7??M#?AL4?&A\?!???'????A??c???L0?}??????T???%??h??-??m???')a??N???=?7????>U???"zqe1"@?aC?P??C??%Uo*hD??8????C???!????a|t)??o?(?Zb???wh????????Q?W?'4?t?!?2(?0+ ?*??*	??
?E???A&Q?G?a??VM???2#o??h_?)N?W?
?!??~???????c]????_?????Q??<0*_??????NF?O???}??
?C?
?R???!?
@??O??t"????.?
cI(d-
LMP?????8(=@?6
&"~????sW?)KP???(S??? O7?????/j>?
@???0!???
???0b??1??
T++?e$X?t?&C??"T2?`???Z??)*??l?i/??+Bc??z$4O>?[1.?L
?Y?l??E??;Yd??3???luL?Ub??8??T??	?o3!kf??7?qa?n,?		?QQf????
M ???,?E`DTaW??y??'nE??R?=?,?	?" ?#??Dl?6NS?C??=G?{Y?? ????a?,;iB`????^[??????dT?*!????w???.?i??]???\??wvj?:O???,?!????3.???^%?$???????=8??|?UAg?
???d hnY(*j?rn`	??^?16	?A?erC(B????;7???q?
 =y??h?L#B_??!@O???~??
?g??i??{?Ig?R?i???c"4?Q6$ ??~???9?s3naM??e#dd<,?H"A???Uf?:wD?,??8I??S?
PU_G?`??H??5uU#??????3?>x??Fa.???p?h?jc?1??(y?????I
g?8hMC?h

R??j??
?T!:??h???#?@)"Qy.?A`?A&!"
??#-)
sG?{ xAC???X(b?}?	8?pK?Tx? ?H????? ?%? $?b?+????HQ$?F`C??9Q@?,? b`%$bC???? ?Q ?? R???#?.??@??y@???D????=?e??~??8	????A?$?8?@?:h????ArM?I?????s?M?\B?T:?????+??'??6??%b"s%?G(?R??F-NYe????9???4FF?<?f?a?C???6???p?8??t?A??3G??	?E!??:^?}??ph?^????S?'?,??DNY???/0?P22l???y??GCv?????tN?????r?G?T????q??=p?Rhz(?N??	?UB?@? J?#??k?P??f?d???	@@"""!???R2??B?+A??>?l?2??pL????&?C???K$j??B??C??YL?kZ?()??~???)??I?<!ndb????U?Bb???????????????.??&?h
iA b	????Cb?
`??
?O??????'?v?
B?!??a7????	??x?`S??>?T,|Y>??C?O8???M???????)?>?t?aL8XJ??{????????
qwM???
?#51??e?x???|}??p????U6	?i4?????i??R???????+ml)O0U?l'?,>???&?m)?|N?!}?w?
???k5[20?@?C!?1}*?8`?,?1Fb??????!?T???)0?T??d?J?U94?#?L$???)???g?a?RT)c
?2??K?????}????t??e?^6??]?Dp?#@0???C?
"?,O??? ?!?`^?e??????W?[P-???<b??uV????F
?l
"?D??????sK?x?x%??*??a???	?MQ
M,????!??
c6?)???d?l????\?)h???i?GK???d?`h??:?G????j???F
@??*?>??y?j?
H0*??j??q%*(}x?N%u?}??i?jZ??Q???????=Bb})??>??7@?M?0?$????:?p
CF???hu?m"i?
{?*|????{=p???$?)4?8Qum?\????
nY??y??4PQ3E8i?CH?W???S???z???0R?%???8?c?e
???3?w?A?;??????????:|<?gp

(eo?????C??8&(?:
?L??^??Jk??O'???}*?R????Kz??u??4M
j(?:@O.??'O
y'?$I	G??#??
?????h|??!?N?Y?6????<?-??AT
/R??<B??????x,?JKK	A'????q?p3?22?~????90
P)???+ah???S??2H?,0'iE??f?	???}??fbW~????fg????????|a??F?I ?&H(a????????r??gY4?O??&?S??w$$????????QD8?Ne9P???NE^?9?n@?????ZP?T2C????z??F??? _RQ!@?=y&??E
??%@?????y?
????k*????????????	??K?Q?*D?>??W???????N?V!"a1`?)Yd?erB?7??????5?8?H??}??puz?i?=A??????
??6NaJ`;???h???>??????????3?;?C?0
d
?J???!I?????sn?;Nn???&`& ?7
	N
?????2
?AK?$Q??$???}0e
da?{??|??~???i??? ??=???FS)>L?M???G4P8?;'L?9?i????G-X??u??p?.!?????S??????F]???6?Y-v-?????L????)??1l l?/:e????9?48?F???"	NZrT<?(F:C,??? C?(??UL98??9?? ?
???
?.6?F
??1U??J?]e]Q???????p??96?E?s????nsL?E	??D??n?d??s? ?cg?&0?3??X?????????8?zU??T??,?W:?+!$jh?e??'nn??3?=6?4s???E???N0?6?????(tSPK?????x?L?g? J?"?C?F?w????
???2
K ?
H$A?@x
???!W?.????h????}?JF,'?	u?????.?>N?s????W?4???"F
\:9d??J2?? Y?*,dj????m_Rh?q?J??d?g?n??????0?;g????I?w
?,?{?B?l?????&z$??]?????w?v?H???e
]???	?d?R???????vk?9BD'????????l???jA??tc20?4?dy?????????7??q?02a6,!???3 ?4???P???X?s?Es??Y??:@1??? ?&FRp?Q????-??T7c??????????????D2A???
QD3????7N^H'}??9?0r?b???2zY?P1~d?r>B?Ag
%<?
????=?zm0a?rf
?0?	zC
?(H?A?N?pe?????Q??????????s???d'l3*?T?l8?]9?k??p?H2??d>F0?^O??????p??

C??? ??D&??????m??`m?
?P#?`R?P????-??
P??Ac&1A
?"?hh1??\'D6??)??
???!H?{?c	????;6v)5?'??d????<dG8O?c?h????'?
?:?,???!??=
.[?A??????E?gC?h??????????????q?m??e??%w????QCI&0???1??#???zY+?:?,?]C(s???sJ7yFI
octx?F??????&Gh??b?gh??H?a?F???T??]?%?,>??b!????>L?&?2????]?rQP[
s???????l|????lt??p???N????v"???????c??$?p?????Y@?????

E
u??
??%?G? h??;?6???;"B?O3???{????????z&G?!????)????;(????]'^5?????#3Yi??2???3?I?0??I(?K?????Ob?7e?#!P?????8?sD?eX?K[T?????WEZI??$Ge??8`G ??d2??? ???y??81z-?????B??O?2?9??k????pO?]?E??????< ??$x/?D:?N??;???%%???U?7J??ud[???**???!????H???j$?Ahq0??&?:??bQ#%&?;???rX??????????@?c?o	?????ea?b?\?r"T????L??p?{?Q?^+?UX???xj?a???`?R??2N?G,?]???d?#???F?Cr??&??\??#?B?c?W?r??2
=b2?(?)<?Ej?z???$?????+????6?????e?hc'$#?"WlK d???r?B+?d?Ysl@???h?mI?kVa?S8??K?9[l?bi+T?46???`???????D?d?"EY?&???6?l?9aN????D?B??l?5
&?B?u?{Md$68iVZ?f???^\?7?p6^[M5???'99?>N??Qx3???=??+??????B?X???????v?L'??????H?n1?P'?T*?
z???N????0??]?U,?/?x9rZ[?????,/X?u??$???X?????a&
?` hI???%????#0??\]? ??OvD:q%???=b?6U?{_w?G?J[8??ym?M?????B?"?"(`Hu?n?:?9F?(?y??]??[%?????? w+??b?vc??E+|!???V?????N:??^r ??v???gl7W?,??e	?#?":?}?1???.
`?R?]t?.0H1?[?X?T
?0>????????S???
F
?5DC?Q???5o	?FQCr:[??)?Hd??B?lY???????
a

?CD??
?? m?(
3???AB?DP?
a?t?????{??w?
????=+?s???????
?%??
??
??8H?
?C??>
??oF?Dl?????*?%g???FfhEh??2?m?TX??Y
??????H?CIJ'???N'????>?D????C
??????]????B???HFWBC?J?3???a??V`?p_????!?.??"I?LYr<??????J?:(N6?edTCe???D????9???a???Pm$,?C
?????*g??`?5?4?t?2??"?D???????H???f?^?sg ??G?p?1\???)??p'?
R???>?????
!

'
R?Ksb????=P?b?X??ta?).?.Fv?4$0??0K
0y?t?k|?L6Jh?|?*
??U^K?fX?5?n??1t#?:?&?d?G? ?'!?$T?4"ak?????XIn?a??p(?e$???#???tP???
?!
?l?????)?D?A?k?4n?m?:3???~
?T??i5$?y??U?
M4?*	?v?a??????.??_4????2?R?(???%LBUS@?
??$ \?3o?jf?in????`??e?????Vu?????m???,h*?;?h??M7???WiX???a??K?J2??'v?!??Q?>n????De1?w?9?
??[Q?2r?%??o.B?u??K?h:???a??p???i?B\?.??d?)?elp?d?]^???
AJP'l???a2v`??
0)4?-p????q
?r?????y;v??	?c????~4g????r?aG?KD8???;n?9s??5w]ial?,&2J???C?u{ ?c?????A?U???l?H!B??%aB?n0x
'??C
??kD?z??
j? ?D
p??<???BP!?A?`X}P>? @?h(?4"iJ?m????q????
?1B7?q?0??RE`?~-?[TB:??`k?????&??N???
??uht@>?`????JE?j??lL|??x?a,u?6?P???M????E?\Bh??Y
????(??o?
?*v??*?&????I5???JBi=Vj??D??x???dD?@?/?y?8???z??|?????
???S`??0M
?"d??'??????D[??c???????L!?;3?w??S?C???:
??B?n?|W?
????t(?.?????@?7F????|qqasxsu??NS??X
@;???????,??Hf
T?#??
I8?Xv?$?3?I?B$D`?$?`?L	B
???????t?? t??	?,??F?P?G??0???O?p????;?C?Pv& ?m?	d??ie?Bp+?K????F??D????Z&-???C??;c?
hM?x
m?B`Y???7S??J	??y?7??1??B*W at AmA??i|?i?4x?3??
?g?Q8?????
2??
^bta?g???:?e??e?$?*MA?@?????R??J??XB
f+?
????|?`dGK? ??????

Sb?#??????1???Q????TDQ,TRm????8?D?1/? ?
?b:"`?\?$???mp?Q/"????????Ux?xP???? ??OS?@?	?
????%?FK?:H???3???M.???O?????FFytP??$`???X(??cJ?(?X4ZP%J?? ?KdTiK+T??.8????c?2?#
R??\D?5}?}i??f???O????
`D??L@?Z????`J???"??"D???4
???*
?JF?((Fe@?"?b?9Q??????:?man*`?????*=??"VC?D&?0??????B0B??B?BT@??@a-!2

2??L,0??D(?"2-P?
??
?j??
=?? dH?[0X??9?????~?C?
Q#?z1!4?qvX`???R	(C???I?V!T????b????
h??"
	jX????%J???b??B$?$"X??(??3
0???p????B???R
?N?'x
?D@?F?XQ???:{?StQQ?f"Pb??E?!SyF?? ?@y??????6
v?Z?????? nP?,N?8L%??$?H_;?8;K	F???????W?&
1P??k??oB%?????m??T?Q???
?f)3???_T??H?? w4	?@!?C2TO?-??3??Gq?+???'??D?????G?hzL????,?.`?3?I
A??{?a?#?????p ?qx?r????:??D%Q?8?-?,'??x?
?R+?!57# ??F3M?P??v??u?`?}2?????B????
=??y?Chi?n?\=l?7?A
N?>K?Ij?:q?U?2????)?9G ?^?qC?
??h?9???%0@?/????????;'??`??? ?????
?Q$D?9i2d(,???
???/??????? jX?????P???@
?@B?Hd&h?& ?R?"??$f??)
P?? $*jfj?
&E??Y?B?&Q?($?j{???8cg???f`r#??bL
:?G:?M>#&4??&K?#????%????k:????5<??" ?)??
8??,?rq?UEU0L
00?C1?ey
?6)??$"I??WID?&???????ZY?h???	?bh?S
b
?%&?\#?
~???`l????=?t ?H at p??????M?U	*????
??:?u8Ih??Z}r????	??
a?;Yv"`"??4?k????Y'?>2?3?1????????!)?-0K?Z??	???EKt4??4??-
	2*xvq;???N??K??]???)e'?????e?`]?
9???%B????1?O?$=?F\R?[?#Rz??:??q?XE????a;?? bh?l?H`0?C??????V?=?xu{#%?B??>x??f??31????q??"????/?????4cCFL ???]??I?(??"H?TV??H?qV??'Df=???,?8??'??z5<?
o*?????&??u
??U	M??*?GHh?:??!???w?s?9??? ??O@????J????0??? ?Z?"???,?y??7Ph?+
?0a?$???G??
?D???z??
L4H????;Y?YP?????-????HH
??_???4x???d[BHXG???????H?;xQ??\b??":??;(vJ???`D? n at m??i??	1?fA????@?d???kQa%?`??#(HJ?B
BD$????C?d!X
??M?w?????v?)?b?h|4r??!rA??9"r???	??7??????@?E?4?8A??p??@CO]??A{??S$?n
a??@A?
'?
C???'?q7?,?z??H?$g-??h?+???~?h?F???u?$D,AUf????<a~????xk??f??&%-???}u????A?i
1
6?$???`????
+)?3?F??h]1h???|HH}Dd?
(ls?vez??x"???Le?`??sgw?~t>Sc ?	?	????4?????:u>????l????
?(??e??;??
qd????%,??? !?g?fN?E,
Y?cz?????,?)?4???K? `&??cR?CJ???????K?f??A?m????e???pU?????3bS???/c ?????? ?????x?h?q:?8??K???,<??g???*????vG.?h(	@??
>@????p?????S?a%??dP??)3?b,?3?N?Cr???
???$?D$
?
"N???'?????/%
????0PEC0-
?
+1 at Q-?AQ ?D1@?2?QJD??????D%EKFfKL?AA??
IL?
???E?$A??dCP1+?????	?`?i? ?	E$Rp?p&H$Bf&????$?R$j????d???b???F~l?C?]dVO&D?!t??A?EB??dN
? IRR??vs?E???h?AGx??H???"Z
????W??9'????v|C?_
?AA(a?+?r
(d?T??+???????033 A$M?KBI
?L3"?m??$???$ ??"?VPIB??"(??9???
1??????:w:??????EW
?O??????J??
%
t&???45$?~??X?d	? T?`???C?#??????j?"?E???=?x?u?udP/V9???<?
?"x?w5??@??????
??e????R*b
????RR%?p?m?H?x?M
??%?
0?L???Q?X????"'CD??09??\7?(R?p?KS#d
?d??U???~'???A?2A2??
??4U???d?0Zf???$?S????-_?3?Cv()?J$?X?L?)??w??#?`Q_|??????
9`???z?:=h}?.????,??G??W?><&???6x????/}?l5?;`????L?x7?Ui=???T!???(D?
D???T?|P??????t9?+???%?????yb? d??T??=?y?<?#4???????6?????e?J?F???,???s
?2v8?F62????J?(??!?M?A??????~?!??Gq?????xvf????
??77?v??`???D?????1^.o???~??]?i??d?SP?iG?`Q???v???"?H?O??B?J??Ga???g?
"?S??c?v	?56??D?HHO?%M?????:
AtJb?)????l?4r`?M?1????Sur????????P>Xvzi?	O
F??n4U B)&H??=D?????????ac&0;t`2[??J?GxNR??
??%-s?S?@?????~%? p?{?2?RP?Hx??B?e%?C7?N?K+
?+c?=???z??z0_?
AE?,?1g??S!???h??&$?qR??????i??Q?$~Y?2????i?????gLP?F?H??????z?=a?&V??+?sE???jV??nChXY?Y???#x???Q4??+?A?A???C?@q? 7?
??E?=?tX??	I??T?p??&?8?o?$6G?l
???O#d,;
???? ?????gDx??qA at CqD????aE?Kxt?????????9?
?`????j??????g#daqB
:??:?H?pa???????&??%N??9???AM?t? ???
?:???S?u?????(??f?'??0?!B??g?8
r??q?N?_Ad]?c???!lcG?1`^?? ?F?w/L????L??i-)??,@???!T???[x?O???j???????????hz?x?!FUN???a%?? ,a?f
(?0HM3??lJ??B??L???V?2:???
???b?}?C?9sy$-????Mv????? ?P?t
1?3??
R,?I?Q??e?C????y??<\?u?
????x0?????U0T????
">??? Y?IU	????
?3???I4!????S??=	?????5??,?|[
8?7[cme?qo?????	???i?hR???60??0?##??g??M??=?(?"??"l?:D???i??w/c???V?GRS????ts??????!)@t0/aB(?8={??`#=??X?Z%??P?B:?14H?%?b?C
0G(??lX??:?R



?!?&T?YI??6%c!Q??G@?
??????BA?#
???`2 f?fC?cO????6?Lv??
?h????????d?a8ux???
?)
D:0??;'?#B???})?????[`?l'??????"??y??<?s?
?ph??,
!??@5b
??B??+b??b%u"?GD?
}XQIIV?V??g70?@????R2"[M???V?y?X8@{? ???_?_?,h?f????TatE??????????"J,??????2%h?H8?!?q9p????8)!c?B????h??d/'???0??????X??bF?B	??P???<9BQ???8?}??D??m?2z??C<?R;5???N!??!0???$??4?? ?]?bsgt!???
LM??H
?B?]?0jX?B??!????JoSX?@dm88???r0?"?1?c%?q???B?KJ 2??!/??%??Z\?K?4??9#?
S?%MX!??.3 at R?????D??"?"n9?	De?B???
??d?J?RUp??
x???@??qg????i?"??b?!???*`1???O???@?
D?K)?RQ???0FIa=0??C0???=??<??"?{?Rc8?9R?H??q???;??T??wj??DD(??N2??0??P?0??7J???K=q?1'?a'??	=?9 ?HI$4???t??`^??Y-???!_??:l?????;?D2T?p??r?SE|9????o????p?&?1h ?y??3?1???x?T?B??5
???b?2?e??2?(?H2??+z????hK?6???g9?0?_6?????p0sG????DF3??C?p??30` 9?????<??wjQ?fF??p?3RRv?1"e>v'B?y?vMO??	??>????
i.??4?]-?g;2Z9??E'*P44 ?0?)J????0???@???7e?R
@????????m????8?R??F??g?N?1?PIqA?q??????=z?iX?S|?A??????V??N?0f6?.H?)?R$??p?????@XF??
?c??
?\????]kP??
?X?
ln&???A3A*?h????PRuB?b@?ZR???P?ke1S[
??P?d0???)?(S?,$?2?u
=?
????l?D?Z?CD*i?6???Q????>??
?lPT>RPm??C??X?/?S?80v??nv_?????????nI??s?Vq?r?D??\_??????E^B????faP???????b???6??V#???z?yGbR?D?????
k?DX+???$?& ????????\
E?		
|(>???=?d??]+?@?\?z?!???;/(??$)|C???`?n??D???????(??????b
?wPW?\???!K?
??,?[ v????
?{?
H?,?`a??? ?????dY??????d??6??A???
?"?e?MS.???U??????!
p?L?K*!UC?9?H: ;8???.?)74?????5??
C?l?C]???wU???I??Nh??XThZ~??b^\?<??RxDI??_?S???A??`?4???Y1??;?????t??{K?.?Nb9?\8)?0?i4?0??@?`?
?$??|?F?????>p
??X?(m??{#?,?????Z?)?|?x)??(E??S?`/@{??>^????@?=?2?6G??q?^?n?#?"~?a??2?7??@??|;???f??l`a????????o??_??j?:??v???Q?B
(
?3?z??a??1????d@
??w>??
$\
?On}Ym??,?0??'??`?}S???P??wO?t?f
yt????_??????3??0(h?@??h????P?HQIE
???
kX???h?6JYx?&?{?Y&CM?O
,?
?

??0c?$???e9??v????Y???3?!???h?CL?????G?
i??9??p1?T??[?$??XJ'??s???? $?XE?F^?ai
?)
	?c|6?????z	?fg'?by?'_?JO'??<)?????_???o?p?/'}???\???D?A?$E?????4R?e?
&)?X&cc??q?'p????F?pdd$&`?e ?0?e?'?&	???G?o
?????D?,B$?{?w at 8{SS?????; l?&??
?
?W?_<?}uu??????YAhy?
?!?C??b%ga??DD????")4Y
?
?C??U?
?F??5!?R??!???<??XOX??B???RBH
P@h
????@?(@d!?"?$ z)????YvX??M4?|L?e	??T??1Re??L4nA?:q?HL?H	BCva??E????a???
*D?>d??1CMA?T0
+H?j?0?
	p?<?@F1'!Yi
?Hq<?	|@????q<????({`?q
R?????
???q>?
?V4?+???c??D(D?)"
W?(a
L
?a	?
I?%VIB???? ?Kim???l*$??
:B?Z`?????6?X??*FT?????l??q),???????????I??x??:x?e???f??s?U0??O5#??hq,(
Q?<?u?M??1?bD???d?7N???.F??g
? ??FC?Q8E0z?	<??@A$?pP???P?Sb???pB?
r??q?	??)??h!
B!?r4(kJ?%????d?Z???TY ?l	??
?i?????=b'?A[????B??
5??uAv4y?QTg?0<v??T??????$l:".0
)??_$???)?6<?\	@?p?S cV?#?<C?n98?<????????

2?u
??dSm????1????K?#G
???
?3?????N?[?T?????????@1?&u???6???M0bc?1.?ad`?]?2FD?
L$0 ??
??S?E8h ??<-?,????_Aq???
?
?)????L
J?<N1@(??1J??M=2?yAb??2?z y??
?x?!m?H??&?%=?74r??p??	?@?N=cc@??k?kD???}q:a?\?9?=?h??????/;?
	??????u?8?]???
d??!???????
0%YH???m????R?<pi
?.Z??	??|h???`??`Y~t?
?B9??r??8H??I??????&tJ??77?
??cF????Q?H?b??$A??????
??=a?
????$M????
?V???l?M?J??wk???p??Y????v?F0???O??Z!??;??P;s?:?f^?pnQ]??D?P?a1???c~???[D????,:??%?
?@??,=??p????U?'p????O?@
???+L?h5

7??A???????)??9???$ >Ys?'???~??Q=?
?/?}?l???*w?I??.
!?
??????? ??^J C$
?T?tA):???*
???#???a?G?T<j??5Q<????"??a? F%-$bJ
bW?0` q?
?`?O,~9??`RE? 	\	??R??$??jH
=?>????:J&?-@?P?}??o???B4?D?B
{????U8 ?????
Ta??!oaJ??
??? 9
Nq=!^?"s'I?I?????B?E!D`r6??y??cHw?????j?"Q&?\?~????Z1?s???C?Gs?B)c??4?Nt????)?z\?? }|?@?9
B?J
AC??????0\?',?Z?9?f??Y<?V???z?)?
??<hi{?P
???u ?@??
1??M?b???.,#?VP??	@?!0?J?1d??`?@??B?0?E?D
?1#??6b ?q?"Q??vDj
?&
?:???33?s?z^r??(B4n??c??Di? 
"+G???|<v?;??<????p?]???<m???c|k>??ZEC?-?^'8m?$??b?h????d'.???`??7??????Y ???"?*?h6X??I
h?"t8J("!???0
??????rA?a???<??7?????#na?????B?? ??K
?8????"D?????	??`?!J?TI9	????p8`	??

<!/&C?@??????4?HRTE%DHT
MALITL!	*???d7CC?&y???ba??w??9??<?D?x@?-,-	P??R?J?????d??y??S?JA#?*???,??0#J) ?C@?-B???????CH?)B?)9?>?P
???"6?'??`Hzn??Qu??????N?W%?VQC
f?bJ?aJ??c?J?Y?Y??q?o%??????a[?h????
T?CA?C?I!Z?@m???!??D?&????Y%pD??n????Q`?9Kg&?jMF-H???W!)@???e?4a????XX)??P9??V-PCD??LJ,e???=F!:?X?"???t'!??pg?]????A?
HM=??&??0?A	+g?._?i?n??????j???Gz?????????n{!???L?:%? !Mi????+?o???a?????#???C???c?`j)b?)?v?9"Bq?-?5K.?1??????( ?M?'!???\?$?.????`?/
Gk!
H^?f??"?*L?????????=?$!J?p~????O4?	??????FPQ????????
?5??-?>
p??,1%D?V?????_
?^???A?B??5,??s`???TP?eF?P?I?id
\5??TvH??
?1(i\H??v| 1?-1*?????F?????`l? ?q?A??i9j^Z,?r??5M~??;?0p???.??$,q?6fp??]??
.?????_?%l???1
 g??@??S????U>??a??P??Y6?????q_`P?}WC$??C?+??$?`EH?'?????ic?
05??d4_???^Lc.??r?4?<????`u`???g?/1s??X#p?`@??p???p`????? W??>???"@?????$1B6Z!?
@?B??v????HQ? ?????h?aLCp??zJ[E??G?MSU_c??8??!?w????>?
??| ?????#?0???e?*??"'??H??????i?$S?$P<?9??.???Q????)??h??X?M at x???H|?y?AA?kc??^???F)0?P4Es?&m???y????%???w??<S?y??r?????GQ8????
?????,	"H???8.??
???p????JI4Q?DF????a{?
????i???0??0>??? d@B&???#?b	?U_1???????u~??&?JI$?baG?r?0y>s??G??N?5/|S1=?A?\DA
\F???	???O?.?R???
??&????(?@?????Xi??!H'9T?J)4"G??0wz??Q????>?????X?
D>?\?VMc?v??):?D?c?|?B???c4?7!?9X?C??.4?I??;???H?1????4?hh?????R?AR?R)
u??SS?ej.??D.???:??
???A0?????"I
d?6?A?x?,?H"R?Q?????12F"C??0?$c()ju?#9(?J( E??d9?>???bC?
??1?fi7 ?K8` u?h?<??kB??LiYh???g?N(Z??Q???FY??v
u(R!???p?bP<?P??????K
???t??-A1IHP?5B
???z????bbD?a??B??&<`c33
?2}?
/??3????a>I??a?????Nhz?E,)?D???l???T?.?eT?%?"(???a?9?T`,"??????v?QW3?Z9???3?,?kZ?VP4,?4???`m]??????tjW?2???:?
??kD\R
JR?_?<,??`??z???<???V*?P(?z?*C
???iB???\?`#???B?????&??h KA?
?J??slhhH??b(`6??T|l?0F2"oaNFF?
6,&?S?7??4-?@3?"?DP0P? ???
?n?'Y?S??.?P?:c??????1?q?<`b@!??tE"(Gz??v!?Ac 5?????@e!@;?=,???????(???
?9????
?a?????;?
&?q
B?@??6?A?@?vGf
???b??,PRg?.JG?$??M??M?f+??x:8i
5b?
"?qA?<'Y(?!R	?????A
Ym-?C dA?????-'
?;T???YL??9rO?x2VF?D??];??wy@?M!DfjgVcYaqFR????B???OZ?c::?
A?A@?MX?0???f?f
?1{?
??~?7??^????$? ?@??P=O?????????]2?#0?".?????_7B???>X40H ?A?#I??d?dBI?
x!?????*|"y??"??x?"4?p??a???3?SI?<?a??-(??\U?
)JO5?)T ?????????????"?TJ%J!????|
"???p?^(?????{%)?`?\U"??9?? ??#F??D? )???=?z?y&;??? ?u!FG???????Z#??|I		???W???Q	!???F?????
??y4;?
4J??????tG ;???
?$
	?
?E??CWT
????T"s
??D???J?1H??????&???p???qTvy?j??a?R???`qc?jd
???H`???
j(d?@?E?
?'??1???$"XE?.d]U?1???Y?|?]?R{y<3??GHO=??XR??$??B?H?J?????
???
;????"P?Y
?l"??c S!4A9?
?`?1??d.?{???j3?4?P???b?H?^}f1s?EQSL??X???m?p?8!?e?????!?
:0'e??????L?X	"?l?C????????3K???-
?G?O??<?Ps???
?`??
2??v?+J3,?C??5??^??????.GSjvg=???!??rQ??=S??Z W=??h????I?d?1??z]`????N??l??"	?q??2?%??af?????a?0Ca7EM?`yS?v??'???????<?js?Txt??k??xhn9?	??|C?e9?a?O);?Bja?o?7?n??z?:vEKm?<?C'
????gW??_hx
?m
00e?fm
Q?H???K
??QR%k
(b"1P?B!??T? ?Zn?Q?`d6?P?B`?(^???B?????}i???N?V?K?=x?V'??Oe?+A??Cd??M??P???,
? ?aUXDIA
4]'=?Z??-::3$	????H?????s%????
?=?8??\i&d??\??????8=`?F?Rx????f??ja?)?,^???@6???)??\2??&Y?w
?a?_3#?pAxe?"?1~L?z?t???g c??????k?'??e?????{+?Sj??]??????63???qy??%?m2????mR?LI&+*,L??tP????G??????R
?je/?ES?4&?????4?V????????kM??FD?????-??!iX??1T?&Fc+??.N?$1?YN9a?:d??Gw?n??;?1??:[?????R????????e?`d?&?`$?
??l2E?c??q@?L?0z|?>X?0????{ :rJ:T??y?^???!33??.?Cd?QiM
_?)?Q??e]c9??-3?#??I???@??c?E[??&d??!0?ZL?2q???R ?y	??/???!??!???.?1?U??F#??8N????B?'?'c??A?s|s?Q???)?I
?.?????Y????a=????;??u?r?lDn9?a??S???6f??$6!C????pt?je?W?]P?l??1??&?p?????	d+!,?\?F8?v%>????0b????q????????C????84?????1?9??? ????D?N?$?B?xX????????Yo	?1c?8?td:???????i?k?:b?=q???'Q??|?+	????	1R?.?er?>?I??Uu?(??e0?k???
!?Q?Q????L<??m?el1E?????C@??	????Q??u:A*??????+ZrkN?g)???F??9?W^??????=??1`???q?u????W3&#t??0?D3???T?iIL?(?????q??9LA?=O???????5?q|??!????(+C???[?B=C#	???2
G$???K?)9?:tL?{X59?=k`??
???? u??S???.??9??v??WX?Wj?;1??????'?X?|G??042l?cAC?h?X&`zl?????w?(_HA?>?Ya??;/{????1+?(?>-????s?o2??W??lvQ+8G(0??n`P07?????jQ??H??mY1?w???PK?0n{)?m?osq????	?J
??Mr??l??&??(>=??	?E
&??P?/?~=d`?%y?	M???s?????o_
????o+?????????????*R?2H????E?b%am-????L?<??t?8P??1w?????G?????0o??
?????
???=?fBT??`b???j?V?0<Qrz?B???
?{D>???d-?	CY?V&???]?A???jr???"FfQ??PW???'/?
?3??%????;-0k??v{3)y??????O????b??.??????p??????f=d)2gM&??<?????c?5?P??N?I??	??{????q?o???????Y?~h???db\	??0?
?F?x?????\??A?Q?@??[A?3@?W%?`?????CX?z,=?0?p3??y?V?.??)G7?,<???F
4?Y? o?qG??POJ??j?{??(?	R??9??????>??`?le?O??Ia<~-.?1mBc???)
????|H?z!qI????u	~????RSe?lb
XE`L?_???3?2?
?%5?ZCa??
{a?1??????=???o|h?)???b?U?2?!??>????X:???#$??yD?@BE?
?w?1c?????s?~2"?B?w?|@?? ??????>&'???3/????~oZ??????????!?d?.?????@?
?S5

???4h?Z??????????B??????bp?;?5]5?Q#??,p?7?;??[??Y?O
4]??????e;?c?{o????Hp0???g???????a?H?Q???????U??C*??10??"????? a???????5??fY????!?A?H	???5?}??B?l7??`a

?a?@???<???N4??`1?N???c??+n??3????v????????6????4???>?<????????????????? 'J??U`o?NkJT
???1??0&L??D?l?
?lJ??:aT?U??'	\??DhL??h??k"???b**S?!Z2?Ld/????{?N????F???CU??????:D????
???l????YB??????z}s?f?"r??4r:?%>??xI??????????Hf?X?ae??id?9??%RR(??tA?0??A+?V?x??	?????`3?T?jZj
#?{[y?0y1?6"X??c????
?G???????JB?hu?KPN???m?3???
???`???Q
??X_q?V2O?@?2#??C.??[?(??G<I?8yD4 at u????=?z8t?r6mxsw??b??^	<???8?????n???T0?D$??c??
%?o??p#1?O?	?8?0?i ;?|? @?I58-?$?K04?KC?1m??Hj?H?XC????S+*?:=_
?Tx???f*B??D?`y??V?>??
??`"ZV?!?6??
u?ga???` ??	??N!OI??F?#
?M??!?b??????:q&[??%??1??J
4 ??PUJ5?(z4?FL}z"w3??Ct?????0???c=YY???VE?(?-?`q?L?
??^h%??? *p?t?G????.F???ly?
?
??V?J )_????|?r?;?ah??=??XA???h?=??O?????? ??	??j???
?r10R=|;C2????b??b?4?]???0S?:?H??hN
" ??B%?@(??B???!??01>??I?????(j- 	? 
p??M????.??QA|??$L2UP?w|???#?e ?'MJ?W?x
?aHQ???j$??|????z???B??UD??	PK9?G0?
????P(?h??????H?j!??%?+?f=?/*-N?
??? ?????~P!?+QGov?1????p?b%??9i??,m???1?D?a?pHI?ae?]=?a??????Cbz????
?bK?`/Y?q???n?3-?bx?A???9?7??_H?H?????I??????`b?
[`?5R:?xf????
??d???????`I???????RHT??Q????u9??>
?I??@3#?\$?S????????FZ51?l"??????#rb#)??S!`?i088a?j?6E??WM:?T1??H2B??r??o?????Q?7???Yp/????$p=9?????
;?
H???????n?] #??&2R4?????? ??(
\$P8m?)???
?Y?P?Pa??`???
????Q{?2????A?@x??<?.?
x?<?G?
?J8??b??)^)???<0?a??????	??`-????(X?%Y??2B?R???????"???h^00?y?
?H?`?M?%??m;??e??"EH:???I??
??#????t?i"?fff v?:=E`zn@?c????????2??{? j?;??J?;H?a?Z&M?i-?WJ,{!? ?R?(?Q?qn??????-???OC}?-S-{????03/?t???ve??5-
?`7i????I?.?V?/???F?2?J.??#?S??;?0?? B?1?loo.N????&3??&??j??d???s?00!?[2?????:&??Q???*????b9H?8d?
?1Nh?])?BEk?ZrP?@?????f?
D??'4\c&??n*n?k?&9?r???
j?#P????B?2??_(???
?-	&??<x$????l? ??
??????b???en8??d#0,??????!?y<???|??.??&??b???j?3?????Y?/???z???Qk?=?D?V?!???ID_???=??nm??G????V???(5???-pH??2???F
hLpB?q?1??: Q?X?*!???9??Qz?@?G?p:???JvK??IB?o?e?F?+"j;???????i>???V
???6w??I??tM??@?T??{U???
???gE?J?????*??Es??,??,??n^af?e?4y4t????3???W?k?VM????6?*sD??????L5(0$,??"X??@XH?L2d?. v2???w?1I??aRG??*?q?,hn?]?O
??<J????;???A????<?????pz????l?-?+
3@gvh'g[%?M.????T??.?Mpip??
?3?W???k	%?S??e????g?C??H{??????:]0?G?AZ2Z???Ue??f??Kh???R??4bdVQ??[?R?Y
??%??]??Y????C8??ZYX???s?? ??M.cl???#?-?????
???p!???3%??8????U??+A?#???Z??K+??n?8gT?l&????&f?X????Y???$v?0?dwv?q+n??\q??`?????EM???9?C??#???.d?(??N7LJ?v???dK+i??m.3?:??????

??h[???J??{3?F
%d&
????8%?&K?N??d0?Z????n????sV?<qJGA????jHb?5G???D?4
2?.????????[???~?
@'?????????????

W??a???!????B6q???32}:)??'??c???{e??????{????A?(?H??
??l3??X???????(?/?8B0???@c=??%<?~J\?p?;?e??)&|?9U
!????B?&?S?y??<(?
???x?:am??????x??8??4	
B
kP?H??
??|???
Yff"t?48???5????k$zX	d?<?.y, /Ee??CB?K1lS,A? ?u????iIVCu(??????h?p?? 2??Y^"hf?S2V?wc?r{#>=???8C&??
VbX?]??|$0Cdd???MLgtH??F??Ab[ Ghs$>	?4?!??>?T??;??:hp}`?,$???"??J@-???
?*???????
??

0-t&?N9 at lO_??'f_???
H??
????e??VA^????[c?!?s?g?]N>TX?a??d??H??ww????V????K?8#?DaiN?"<???[?0
St4??I?jr????.?(?
?????Y????????<?????it?%S)?"o?qS??S?$?% ??Q??G&Wyx??2??r#?+?X??G?dB?'	????
J(T?F?(B?'2?P???4??6??x!)?1z0c2rP?????B$bB%y???
????6?)B!_1??j??{?2T"!G1??M
R?
h????$P?G$Z?? ??+?%R??????h@??(
?????6?h\???r_l?8T????C???@?d?C ???(????K?<QHo(????B%(?%@T0?7!?
?:?v?wu?u1
!+?#HK?D???,?Z?b%(R? P???G??TF
?n"Xi
RW?_RH}0??????`h?h?:HS??	I?
?y};I?F??M"?????c-??H???0?
)B???'?????$???I?*|??d==z7??Z?D??S???S??c/?T??e8?)?=7????UC???<?'??m"v??e@??2?yY?xYNU ??I?V?J??G???2??0

R?$??5???-???N
p?+???h????1.%$)???0p?)??M at 0???(?()?.2`D1q3(??????yya?I#?v????G9q:ZCR???a	1h?)?>Pzt<?y}Z	?????B???~?pyPj?t?z?0YD|
af??y.???sJ _	7???)*?)?XSe[Ca???|?xF?o??m??????*?O??u?????:a????N>$tZnBY?]?c????0???f?X??F\?+?l?9? ??|	A??dIH?9?J?`u:?JXL&??O?-?Rd??[g9??4???????Pr"??b??+??"h))$!??#?v,K??4D]\0??%?P?????C??
h?'vKJ??I?!?Z????"l/??
E7?"???m??0??0?=KBVt?Z?	Fr@?c?s??-??jm???D?\5??@=??h?&?d!??IP????i?8??I?h??zG????:????}?????@u:?o??
?YX?"c???;???F??tXw?PZ%??%E?????
:U?WN??.?J??*<???==Q?=bQ?L*????C[??j??0K?9??e9~?????1.L?qD?SV???OCp?N?????P? ? #??????L??)P????r?:???|Q?Va? ?????8???N??????/??P???????F????Hdb,?"?4?
H?D?gO ?A?@??
Ho//d?P????#MR?rh???<?a?C???JvC??#z
??R*!!?S?/??Z?H?N?oQWl????J????????q?<???9A;C&+?????gy???[?1C?a??%
?r?g???F8u?x
?c?,N
=?????~???j}?*???}NkM,O??h?????N???F0??RE??,(*??(?D?Z??ev?f??T?!-%P?$CE,??-Na?e
??
b
a $???0??_?!?M$?'C
?3?)??B??|1????????????zMu;?
 ??????nI???/???9???<?????
L??1???`8??*?!)?"M???
P???P??d)`?;??`???9?Q?Z??D???q?7?/?6p,???s???GT??o9=????,?$^[
?@?4??eQ??~?"?"?L,2?xsS??
??
0`???r!??Hq??
?
?j?
%???<?Q? q?
R?;!7??A?1>?z1?*c?a?????~?4)????S!??JR???H??&??	+???A??^?a?0?j??????/??
7?4cx???????%?W??2????k+????4
 ht?9r-????q????HdH?
?H?`??c?????w???????v?>?mg@?F??
R	?	???n^??"??@?1???uk~???wx????3?y??X???>???U2CI??1\?z4?UTw?0 R6???H?T8??I??s?=m`?6wxq?q?????;L?m?$

????Q??2?J?g??????C???:?X)2b3?z?S????????a????S??
E???_?V;?a??*?????h???cOn};m?|E4?E4>?R3??Cm"c?????????????)pl?????Y>?A?Kd?????{g??O"%3%?~b?2Q+O????FR?1*G
?V????[`??P???)?Ki??j;#P?%?	F??b(???]H???((???c?94?x0???eF?w?2?'??@Q? J????,?&-0?;H?3<?`??f??7C;@???%(XR;#\?<??Fz(?*????RvC??`x?>-?q???$??q(?r?-?
?!qP*?x?y ???Yq????"?????y??eU?x???Zz?M???????f???1??2?R?eL-JR?X#8??+?r??f?????V???\?j????m?d(?LQg	???E?DS?<"aff(??(??9q?>]a?`a?6?H???P+4?3?N???????E?"M?$???E?F6???}?S???h4I[Z?hS??3G#aI Q'3e?M???"wrNP?B7
>+f??
??5??O
???Y?fU??#;???I?H!|??t?u?fYOp?W2???

V??J at _?y?)JS??A???PW?DA?/?@`?`???`???????O??|?^?7??i?u?o?????????t??????`?F
??P? ?d!??KR?YKtP?f?|???O???)??????)E^$Q
?dJbB??BF1?H2B??>?G?z>????????
??C
?v???????'?g(s?,?18??????????></????*a??Q2??UM???U?G? ????@????????b???"?
?H?!??k ??=??? C`P??Xrb?M?V!HC.
?:?????p<??>??b+?Rp???*,<???????8?,?
??0?{??w???<?Pv=???H?????g???m????????)???8D
?????????????????????!?|?$??$1?????

?P?
]4m????????}o?????.?????+????/??T???hk }P???{?4i?^????9???????s? ^??z???????m?z^b??^????????w2	%Z??m?i???????n;?tL@?{?y????
?c?R??PD????W?c\???7o???fa???@
Jz
???
????v`&????}?????????3M4$?????60Z|?$t?m@?v/m?{????-?????N???zQ?v????T??????mw?}vyw}??3?k-?
???WN??
?
DB
b=??~"?dM#??=F??C@
??????a?YX??^?S?& ??????L??????(4a?ad?0/?q??`?YfYibB "F#??2B?h??<???D	d|??
?(P??
 1??
R?L??!KM3$	.?1?vBAE*RDEQ
&?H?*
i????J(?"(*eI?	?**F??"J??
??`? &%"&
?&???h??(?B`JfT?%)N??S????HH??T#IH?KMUP?D?P?
?%'q??e@?Q
DJ??	J?+!J?
4?9??M)H?"S3I at P?
?"%Q at P?
TD-D?U??AA@?P?D???D?ACE
?!CIAJ%0
@?T)@D?+)E RP??BD?hC(??JY?+d?+
AJa?!???&&B4?H??QC*1
M?J!@?
4?B?HR?@1?
?*?H? `@?R? ?,???
c ?)?T at aCAE?dP?	?a?5T!I@?P?J5????D??Bd?XH?"a1?!?Q??ELL at TQh????`(?U???n??HP??E(%?0?(B??(h;???????"?)+	2????u4????A??Z0?????R?`?? i???F??$?J???b*???()?"???"?!????JH	??+PL4fa??
P?\m??1??????????ET???3VFTPQ?eQTa?_F?d4??s???TH?I?$1?I?J????? ?j	?"????????l????$L?A
PP?)
(?J
?&?A????))?"???f(????&E&$(?? ?(?? )HX
"?I($a
R?
?L??,?
?i?"J"d ??*"?b
?*D?dM
*UDAAE	I?D?4?QLAPSQMDJ?- ?? 2?Q???0
DIC0?CS?5@{I$??fT#DS??f(0???1-P-	EI???'"?B???@???p&?)H?%?&??&?1?*??&
 ?(????L?DATHL5SKf+????1BD??)h?(?e?
?Z?iH??X"(C????y?????
?X?y?y????2?????Z?????S??
?^?/??5?!????=C7!:???2?Ra? ?????T???1?CHl????9}?)??????KdN??46???0???J?o???
??P??)
=$?96pa?$a8%????44??????????_?y??9f???A?e?H9??6?r??????d?B??O??lm?|0???N
????
?}?o???k?6?]??X??<j
d?O75
:?p$?A??
????c2r????+?v<???T?b?2?A?*??Q?????????j?=a?.x?|8?F????u??/??/????????n??????z???b1:??Y??Z?>52Y16????>???W??nrU?1=??0???????-[5E??~ & ???Q??WE??J??KC?i?\S?????W
Y+???R%??DG????s?=
?i?n??1.?z?T?Y???M??T?N??e?dok?'??P!?c??????h?-???)P? ? m?:ovc!????%i????L??JR???a
KD8??}?$%????O
z??5?!?D?Bv|H?5?:????\?g?6??2;J?g???#:??yW??x??Vs??)????g??Z???{?$??F?m!?????cU?????????H.j}9??l&?	????h?h??+I?2A??HlTt????k???8D??Lp?4?e?s?????zu?1???'??Y?E??!~g??*`wx+ ,c`&??5cY?;?O;s?o?8?v???\z??|?aH??F?"A????, ?+=??x???Z?&J/????0tcP?K???$?*R??$??6[??0`???????>?8v?|?;???D???$G??????s??'a?%???[???O????v}/o???Z?_Ht5?2?t?%??????ZSj2??vkd#$???A!!????;w?~g?????d~????G?y??4/????l?q???Y?h?#??
???MBj??d?r???f??r?v(,??L?<????dg?
7?4???o?S?&?W??WQ?????/???{|<x<?g[wi?`f2M?????q?]??_gk??e??FU/iP?y?I??uvo/?~?T??y???np?[?w?????#???????????q?n???????;_)???@?:??????+????'????$$a??_KqF??/??k??G????]-[????3?
?9L????????tv??U??.l?^G????????y???wd??Y?:?z?hm?m???5o????/t$??????T+?O;??>c??\?s at 0CCE???!/???]UzI?K???0M?????#??x???k??U?????o??
???y/???BO?z??7??{??U?d.?p???8???o?A?l}Q??Q?=I??eX9Q?U??Mc,s????>1??????8q??????	??w?B??w??tv?&)???U?_?^?[N?u:g4y1Y????s????:????s?%7??[??;????n?????J?j1FvRwiox???????1???????S?Z4^#???]???<??'0"a??O??k?a??Y?q??D!?J???\LOlj???<?t?b?a
?i4Z??r??~???q_????Buj??|)???xfV#??5.	?|??,?cfD??q??????Kl??Y?A?m???L?3:??
4??]?+1?"?|??N&-F???)%Z?&?1?|???@??=2<???r??(/?????<??????m?^X???d????>?xv???b?8???????*`?(y?????q>???x????s???*i??uW??
A?#?B<??&????????P?c???????
} ?HH???$;?hr
j?????v?}?pD?DU?7??v2-Dk???$]]_??a\?z?o??XkN??bq??nns>11?>?D?>??)]=(K?C?\?P?]?#?-?????S?????(???O????za?=l;?m??#?????d??|??

k??|????|???????5)?/_??????rh?????;@d??A?I??Y??
?i
?&?_??Qp????{???1?&i	??;t?c????+"?n?g??N?i??mB?9??????2:/??
?qc????5+"p?6Pr]?I?k?({"3?w:X2,W??>???t?wu?`?z?[M??*<x3?}???WQ???5#????qJ'?????,??y?n?2?????????<5???-????y???E?g????B???????j?$?I$?[}K??F???fc?????
?x,???j?Z??????}I?loR?????x???j?)?k?)J?j????}UT???
??1?N?????m????*?*5??
??????Q
??+_2?p????*??w|??+?)Ob?^?l?Jqd??}??%`?W??0?R??V?/"?[m???????????v???	1?&????(N??C??????????j ?f?
???i3??*2??7W?????????-U?????T?? ???????.?J??k?a?('????LD?R???h????????P???_??IW??f{>??22/???B??k?????%?<0?-?W?????~9jv?=ux?J??????X>??>?(?}?Y???l?}0??A,v??|?????????#?G?;B?q?6?p????L?,?z??2Lv?"??b???cIt?'B?v?Gr?-??e?ZH????yPtb^?"?S?> ?#y????:?i???{??93
?d?%???B?????pv??C????L?|nZ\?v??< ?/?5p),??????F??Tb+Y`???z??l????oV??!?_??t\??^????????2]L-[Z??x?????????]>?%?BI$?!??c?b?sk??d???G ??4z!?????
m?-?d3h?}W??@???
?1Y?=??#??
?{???6H???P.?;?>?????C?~?~???????l??gd????sCd?e???yb???8L?0??P?:??2|??w0??|#???noB{/???!???$?AS??0?????l???oL/A??s??bd
4d}"?!/?zO?g???u??
?j???$Y06o?j)0??u???wa??]?u;???k???;?&??7???Z?]`????!u?w?a????.I?f??S96!'?!K#S???oL9us?|Ns?S?%x??czZ?5AP0??(y?37i?'??}F??A???<4?l?m
??l'???3???t?Hk?q?
???9We????n????3??Q??7?N?P??x?????6,??????Q
n??~2u????2<o=9???X?q?$??,???x?Q???vbZ0?{m|>?????i?:g=q#wn8???`r??v?Y1$?uN?I(?????y??????Q??0{a??y?n?FwJb?!+2?B?:!?????P	XY???????-?g6???M{;??|????j??????g?=?H??0.0?g?/?/??L}??????o%???e??D???H0????6?5i
Q??7F<?I7?wO?$???}???c?????z4ml:?&?Q??`)????;?U?"n?O???K?Mx?a??L????~b?l????(a??????"???{oW?v?]?????\[??U?2?0??Y;=J5?er?3_co?????&??Elg%dM?r??8Pl?E?3'??pe+???6Xdok?5??.??????@?????Q?2c?9??@??!??????I?d"???D??jC,W??3??I<??/'>?]yJ???6
E!$U??fQ?P?,?N?????8Ma(E?6Ga?T?6(??H"G$,??K??p{????^??Z???k.f?\5i?(M??v"??#F?i?D???????3?J?8????v*?????!
 ?R??{?nr??JFD??????d??3??jMJ?}V(?^???W,[?R?e?m?Xa??dY?????{'???0?C??????????lr5??3OoI?C?sl+?[>???????hy??o?U?????K+??\????2?C??+X??f?O??????ck?Q??a?????h??z'???}??Y?Jn? !X??s4??8??}???H?D9P??\???|/?
?_??z??????-#U??/:`??jVE??????k?9??xn??rCm???l%??N?????M????S??#{???i|?f??'g???5??????hcgVn?????d_?~_
7?R?[?CT!<?w?M???>???`?8??)'??#G????????1?;??2???{??M)??q? fB?Q?Y[oP??-;K?z??-??~?}?9??????|J?P??`?(??xBY????j
????l??]?co7?A?/??G??z?u??y^???;??_5R???3?@?>?????3?P?]?n?
x????M?x:??lz???C?0Q??li???Q[??6?
,E?????L!??i?M0?H?q??qH??rU?9qm??#&>??wg??????{?cz????GHJ?$s????9?7??h ??_??5???6B
j??h????Bd????? ??)??h?{???t;?"????`???M??u???'?y`?Sg??(???fF??e&??q8???qG?y????a??????1??.???%G??o?+k?????p?Cv??$???0?:?&<k???B?j??????K{?2@??'??-4$???	????*?
???K??X??dXU??G??{i#???9?9;u?\U?>p|?KA|#??????5?*?0?hA???Z?+T]?U^z^G????[??jl??ff3??/s???h??g ?????u?????~?/e%???/Z?3?{o?g?f??Z???????cd?3??.??"??7?*,"=?u????>?I?m?????N?,?YHBI,wv?????<?D?mP??L??????????8?f???;??TrS????R?S9Z??^lB??Od????]_??l????H???`?8?\?.?O??????
<?@?/?AP????yq?N5???????
????J?3?0a???)?`??????(????n???]?P???<!%HF&??ibv?/+U??k??E?_u?????&???????j??u?j???e\V??R5/?b??B?{9R????F?????????d?8?_?l1?H?k-W?????5y>_??U/?????*?oj???cB?7?1l&????$-!W-?y?
?w??E"H?Q??|?&CQ?M8?)??????ro?N???91?????A????}(?$??EyF&?XVcVp?xv?7vLn?H??=??>??W??H?/??h<y?t??<?N??h?z?d?&?*???????+?8E+1????:???
??*?&^?j???U2I???@???????H?q??H?2!??9#???
r?0Q3K?nr?????+?b?/??]?/Q????????Z5z???$??!?u-G?$?^?%?????[
??	8p^_%E????)?d(?r??W!??L?u?e?iU?b/\?b????O?(CE
30???VT1??VC???s?@????^0????C?_?J?1?b?n???*??e:?`?????Q?4?,8?5??",3??7???????i???G???
/?-?hVE?1??	?Bt???fOr+?z???>a?;Ko?B??.f?????7?/2?q???Q??^}f?
???Mw????O??b5r?]?^2??????tk?f?wA?ay~?:BYm????9?Es?l?????????s?????bg?6?????????????1?3s"? z"?tw?,PX
&??
C@?c.??4?b?p??&??1??90????y?rF5w?R??JP?1??aZ?b?????1?a??t?	%A????uv5`?%??"F???	*	u?x??&fa?9X????5??4??|????L???m???_H?i???B<?1?c?Y??$???r
??|????l??OY^;J???-???rIf??????'????FO??dAV?R????V????!?Z??????????????m?f?$,-??~U?
?65??+C=??????????y?????+????
9C?g??3??????j??Lb???0??F???d??&ZP?????U~??p?1~R-?????????XLfk???"c?E?1ub?HQ`q??9?
????&?W?Uo.#????X??:??.Trm??2KR?vtP?m????
?+?7?????/7m????uX????#???A37?7??????B?#bgT?Kuz???|I+???|1?+g?e??????^?^?G,w5???-I~??D???????X???j???????Y?i?s??]??5??a??[?+x??H!?e?
??f???k1??	wQ?2~???,f)?'?-?Q??????;??:?[??????g?#?Q4???$q???N???X},?oBVC???i??:????	?????P{???????v?????? L?L?????C??
?P??????%???p|L?QS?aBH?{oNp?2Zr
?.?nn?	?	??I$???Y?_?#?~??k?zb??jo??wG?y??n????*??9????QN????e??+U?r{rub?t1?el}_?y???????????>
?$V?G???SUn??t?*C?'4?0??v??_?5t?97??/^VQ?t?^OJE	???????o??
???o?:6???0?T:?|?7?3?l?
7hm???+<?c?? tM:q???L??Lq?Q???gnN???i????n?Y??~????}?????????
~2?+??????o?js?Z?`?2?ar?*+?:???l?????96W9???$??I	?!??E??'???????]???rb?Ll??e???5(/F??lAM???o?bEp?|?6
? ??|N?%??.?A????/{s{?j?~?,??@???2u6??i??;A!?????O`jWx?J,?!????H?Y??$??"J??5??xi???|??(????N1???t?\?????-????????}}?B???/
D?bbO???CM.??????????????????f???~m??<?W;??f??????p?????E???????=E??????@??f?/)$K?r??i?????N!???:c??*?L0???????*?U~???z6????d?Ctl??z?(.q?@??}N?m??U???H!?A??w??=*??x??/?gf???&H??J?????|}7??ko???
??k??o??tO??1???a????s????p?G?1>"TNj7xp,8<??;????PH?????4?

Q?-?uI()???7?z?B?)d?jW?f])?_/??~?x???q???5?0??
C??pV?<??R?Z4h?l$?.??M??????8??ER???jj??k???Y?0??]?????P_??F?Z-??]???+????I[??W???U.??????????A:??y?:?S5SZ??B^?@????L?q??#?i?9?????zC?3?_???????~?kUUUUZ?,???3++0??????DTUUTZ?#3#(????????????????qf?????????U???3?f??]PeeUXEDTGK??????`OAd?
+??6??:9???d?6?]?'+[7/h?=8?Cm?d	$?BJ??j???Y???lO?1?4?'t9\?v?A?u?kO?????z????W?#CAJ!??.(}?J:b_@w9P8???e?????[?~??? d
=??@?
E??DG?a?@~/???@??<?x|Mg?:;vue???cf?????}??+?????????W??8???&??????F?}?gGT???r?>??+,f?-Vn%)?z??H?Z?5q=??(?J???????&??????
??f??(??$?a??"
B(?)???X???h"")h$?????a??????JF`???J"J"J???$??2J?D?@L?AT*A4??H???4???
J?
$??
???H??&
??
?0
BT?AM#04?????!D?B&$E?1??/????n0?'???m???????GY}??)??zu????;??????(??B'g?m??}{|?0????c?
2???h???????o?$??u??M?
?Z

F?????%?
Z???b
I?)"??(???????&)?P??	V
j??????!???C2$$EC???i?JA??5?L

??I`???B$?`D???D3%4?@???&?p??@"
?H,?Tm?`8a?????????C>*j
"?Q??5a?^<?,o^|???!P?N?w???j*ujT???c?z?!?	?2?F?i<?@?
?
????????k?cW(&?b??3????
=}x???r& ???[0\???6???xi?9[~??Zb?	)
$??2G?`[??C;g?*?Z??d??71?-?2P?	????=s???X?o??c?????4?????
L?f?????fNNs????????I
e?E&Y??`SY??EC??????.??&?fcrS?9$U-1$?A?M9?f8?I5IX???????_2??i?l:/??Dk????$J(?b?%??32 at 3????8x3??t??*???
m
`!0?bJ?b"~????,F?????????? ?'?B????D???,?
L?)rh)?7??D?w?c	??A????8f????2C|d?j0k,????
D(?8H)??d??	??????v?\_?,
??g2??p$120
???	!N"?E	?C? ?qR???h)(@l!a???)L1?H?JJBf(*?RR?
?Re2?b???d
D????$D?G
?HL%0DC???
?q??p??s??i$??%,?7???ys?P???I??Mi?1J???5.???kC
&b??X??????N4??*?Tm??!?X?+#$?`<tg??hY2???;??@?,????I0K?!
L????m???=`BF ????o??<?o??????z1gu?=<?t???}n8????{{??H???vO???]g??&?z???????=?T	p??????G???)r?;IDe?)???F?Di?????_?R5e~n??
????:??????:sb?????-???0??????<???m?N8El???@?=5;??,}?}z_?k?Y??6J?S??
q?W.??k??wI?????S??*?IN???F?=?`????D????]??J??cLv???????O?8x,uF?3?]3|N????/?P??@???(???=?c?a? X=?A?L?`?9??2?????????*???n?g!??????9f?????:2:C?>R?)T??	7d?&j??[?&?????-kP????c??)?b?]oZ????j:??4oS&?r???n:\3??-?:??c@???????Fe?5$x4?b:?0N???RFM%<???Q$;?5?????LC*???5??<+
???>?(??0??ZoG?9???zK????=?_Q?????j??
	J?`?<|?}J>?
?sV??IL???L1yE???q?2?Y???d??\??,?%>?=r????Ro???;v????J@??:??eZPm~
??/A0x???.??W??sGZ?F5????Y?;?;^wk????ui?????j???(}??h??,?J?????Rr???u????B??8 ?&?%???g????Nd?N?CKe?Z?,?j?f??5^^V?>?|*utc????H??=(/`?
?N????????a?4r2??u???S?#1??????}H4??????3?([?nI?Pm^??il<?=?????TK>T??n???@?12?????m7U?Fj?30?3!	$?_????????????????d^k???"O?<g??#??N
???kLM??C;?X
i?"a?!??<?z??l8????mP?lm???D/?c??m%??2????? ?@?mU#a?&1$Y$??y{?xz
r9?????^?off?V@??$?}?'?(???0?
?8?}D?:)???@9`??H??&{????(!??(?)?t???
l?o?q??j:l !*??o?k.l?????a?????`?^6??E????a`?{ ??~?&3W?F?D???r??b?b(?????<V??y?Vx? zjN*k VZ?????]+K??[?~c4?Hh?????? f km	A??????o`X0z????'o??????
dG U;????P3?S=^?????@Z?Q??JWhKs3
Wb?GX7?E!^??.????|yo?"p?Dae?
DyN???I??2??v~,?
?BKH,4?IX??s?aj?B????PdN???^}??^?i2e??T"3DO?#|j6??>??*@}?????LT?fB????c??????'?>Tk{>?????X?1?0`??0V0L????p"?o
?C8?{#??????3.+ 	?
n.??9?????`??6?`!?2;?;? w?,8?P?;??|GJ?????zO?Y?"???A??????5i?M?W#HNG?????E?F`??1?1???L?????y!s?f????1??1??I?????Eu?1a?????4m
o4?}?N???}???????}K?)
????7|?p????>?pD?q?l???
????
e?????J?t@??_?9??RU??+?oD???u &2?"Yk?\D?<cU"L^???2??}k^??????`?!?
^nA??$?8ytO?????9
???????%	?	??????z??h[??=??J
????D?!?Ge?	DRHP
c?N????BBwM"?Ci??z?&F?0??Qd?vo???)P??A??
?yJS?????C?+?O?F??p??.l<??|?t?zU???x?????}??????pM???8??{q??????o????.?g??????????e??69??5??q?/w???QSR?N???!?d^?&<Vt?s?u2G?|#????P???????[|w???,???/6?f?s_??Z???????8
O??b?3uU??Aw?tB?;?_?vM?za1?????n|#??F2c???e"?"???2??P??;???reT???x??Rs>l??
!~???wk?
=?@d{h???N?v?X$.?A,+?2???????
?????????????J???2"??Y??
???	???(x????yfa ?U$I?j+??H???f??*?j *?)fc??'??Tr8$$H??4?7?F?.??<??}?s????xr??????JM??????}????]
u??;??l??8???iU??????N?/?????E??}???????)??]???O.y?%~?A?|SB????U?o?E???:?:9B?r?u????}?#??????#??h?A?|~???fZ?????????w??????S??]/?????q?3s??z?????U?*i9>??????r?*AJ??o??D???F????}u???w???_?z????l[?z.?Us?SN???W?5??X???g?u???M?Xkslm???H???????o??d?W_?|?l?]?s0???]??O?]??<!??????j???,[?A??r?f????????????T??????w?~7??1W=?f???:???]En????z??D ?????funH.?4?0y#????6????A0_E??T4?
????????5W
?w??)????c+?C<LW??B??w??9?C?i|5
63??<0?<??[Cj?
???g??
??0??!???-CJ?q????5O????|K1?E??Abq
??:
??,?X?]q?ar?l?k
???5???p???US??
t!G?
J0?p?;,\z??8???????U????7@?vPe?s??	??1g??,???L?	?????B???k?4:??]?}???@,?v??b@??g??va?Z??`0b??MLL?|G0??`8H?0?????1?????????Ek???P[CtN???????pnQ??j?%????;?:	z??????`?I03?gI??1????Y???y;?h?????O?V?B?????30u?f
??t?;???'86W?F!?0??????7????
QCw???H?	?;??a?K?0?b|=D?`?j??F??DF&aG
?,4?#??2????Z?y??l????h?p?PY????Zg??(?G?????d??Y???U1	????3&Rk??2L??f3
h??????E?n?5?/????Vv?U???????#Pl??m?????????Jp?^?{djV??Vtd??sLy????DX???????"?Vm?G%???!?
? 7?q
??ZI??????|????P`b??t???l&?Y???j?R??6C?x?=??C?4???g>(??8:a???!?k??U?|??0M????B???????Oy??<??X[????5G????`?>????`?`BW?(`[B?q8?1??+
R?n?;|:k??UL??@?B3S
:?&6??B??*$?
 ?a????????
???z<?9??q>9??2???95????9????9??&!?+?????z??r??????Q#?KX?q????O???????X~4????,????ZJ?`9?,;??@?
???????@??o????Ga??0V??6rPj?3??'?7 ?@x?-??kB?????5???y0?CBC??0(?
??????I????(?j0?=????!??~??>??_oz~?????L??~7o?{s?3?m(~?`???b)??A? %PT????95?@?j(??*???????y?k
*%?H?f1D?b?????O(?J??????
?????M???r?C??o?????K???,9?`sE??@5????;-?-??f4/????	?4[??&8\w???$Xs????K??r??I??x???????&o??z???O?~?<^/???????ps,?s=?|??j????M???bRGA? ?*????????r?
(??4qLO?[,Ly???+?`hIy??JG=????/??n?Z?a??}9?GC??0???&"=+P?zf????_&^@pr?????E
?I?eH?nUFy????y]n?(*5X???-??~????M?N??m?@mh?L?$d?????O??=?v?N??(?:J?M?<.?q?$?a*??q???
'??VW?????c^???????1???H5??????U:1?G?|6???\?=?F8?*?3end#?IA#??yuT4*LKt?'V{k?k????????????5?"?C???&#?,!2??9w???????????T6??0?????"[x??v~???<?	????O???fE
???$f;?????3??????& ??V?|\=?{1Gw???~>
??u???"???2?M??~u5?>
?X>?40i`I^2???
&??? 3?^?B?o????y??+??80@?o_K??????Yw?????V#???'??G?JxO????]5?h????U;Ov7????W?????e?;?>~]/?q??F???
Q?W?T6????llYAor??"??n?Z>??6???f????/?bX'?(??????m`????????}>??
q&8[?u?w?]????2lR?g}?|'??K???:)???????$e?o??/?(??n????vv???(z????? %i`??.?|?.??*??;
?m?.?3"f?
?	 @?E?????H?`???\?4?$|eY????^!?Q????
^F??F?&??>3????K?
???$"	???3????Z??I?c4?Y0?B??4?Md8 at Ye4????LZL1 ??Y??|?????n???l?v
:??D?F?(C????
????????Y$o?i???=FG?,?i????????]???S?r
<?M
??vO??????! DS??
$(?dT
T??????!5>\????W4?3!
???e?F??{??????A??8{U??8???xq
v?{+\??p???&t?7v???I???U0?:?K?U?????5?@5ck?!y??1e;t????x7??y????y'3?[b<??eE??/????cL??l????B^S??qK??rI$?I$?BF??I$?Gww?/??`KD?[????R.nL3+J?lv??????qb?";w????U
?F??Tg??k6?
?}??r5????-?aC???????"i?!]?Y???.?S?d>_???????????Ld???mR-??e?V?????V??{Ww?K????e/2??!R????aO?h?u??g??G?D{??5?D?Cv??c -?e7??]L??o??ph?P?%??W?????O?}???????7<?X?4???G??|Qm?3??D%~H??p?a,t3??60?oc????????z?H?`?T??)Q??5&?????A0f?	??{6??x???J??
K?}wU?}|j??}EG???>??H	9??L??J2?J?/2x????3|??X??2Ln<?K??"8$?1???????????????y??1C?|KZ?"2[*"M&Q,??t??????|???s????}?ABE$RE(Y?v?8B~?N???
?E.???????
?Q4?M|????$??????
M?xQ????f??&B?c
??:??F??k???{]??B~+????,??+l??l?u??I$?I3??kZ?r?2I$?Nk?????%???????z???[d?I&,Y?m????3?????9h??????x&?G??(o?|????_@5L#?zC?9??b?Bd??wf7N?)z?#k_????X`????????*???i??,???0?,?M?B??]C
?v????????J*K??\c??R?[?j?V????&?%&0?J????G????eQ?GY??P]w	#V????d??Fl??Y???(?+0,?w??._ML?Y
?hP???[o<?@|?aGU???????c??>??5J?? ??G??9?&???????????;?r?>b???? w?<m???,g????W?G&?Y{??C[??sTv\?X?
?????;??H?[
???Tj???^??lr?5?+a??%=jK??%d57#????"??:KQ???????F???U(T"?P?VNl??IW?`N??????Y
J??6???Ju???}$???[^?W?????????Ye?mzO??O???F?lDYv281?~??b?[Ph?*+s??
?*??-??y??kY???v??k????e??jg?M??F?l?,?yI[???????s]??$????g-X?>4?U?Sm6?'???8OX??O?????
=\?9*?;?vQ'M?'Ye?Ni)?h??N?
??w?}\?M?h??Q?] Is,N??!?k??F?	M-??!D	???Y???5?S[o???K9F?3???{???kE?????B?V??????{??euPxA?m????os+a????3&????(ye??9?}??8??8??`?pU,s???o??C?????x?i?"W
5wc?N?4?9?
H;????1`P?$d?M^*????yz??G??f???&`62???0????I?w:?
<?
8?"?????NS:*?z?????E???G?.??=??<?}e?,f????o#}EXy?s?G5[??W???,????}{?+??2?J???9?s????$
??Ai??B???3?@????n??0?????7????Qes?????a??????\b??Eu?t<?????x??v??H?A?;???u'???P?L?J +
??;3?,fd
V??r5[??Ih6??q??b?	?=%??~~???g?}>?/????R???????`?B??s?a?f)?J?6ac?xU????1h?f??A#???\I?W7??N??.f??1?%?(.Ng??????x?e)?pP???#,':??\x?A?mrwT??~?,~v?G<?.[???0#??????a???"C
?????f?C????MD??g?S
???L?!T??z??
???BX?K?[4J?t/??M?h????
?I?>?f??!???,?H?????u?N??X??%E ???r?4???}t???z???????b???[bX??'4??????}ft????????Lz9??o?PH??!?R?Gg???????????C?L?'fb9:?A?a??X???*?????+?-S???0s??7?Ni??2??i?f???i?Ou???82q??K????B??r?`0?p??T?Re?^??t-??p.\f??.?*?s??`{??U]v??
c?o??g1?|{?f???m?7<?2jR??4?????,??u2HI$???S3?Fw}?9?'L?<?%?????m?awM?E???B?`?H;34<??(j????j"?D?Iv2?~?=?zMs*?U??6*|;?????f?f???noU0F????????l?*X???5?w?????xBH
?????B??g?	O?7+?Z|?+?a?n?????]2	Jl?E?sD???$/}??xm
;??7???{??????~?>?# ~{>l???3??d???6ALB??u????N8?%???d?????l? ????]FL?O?Mz?9*?<B??*]4	??-???Kiv?X2d?v?f??s#????1t??ce??-H?v????kp?!X|???$?????S?J?ie{??T???1L??'????]?RQ9???2??N?w?????m???l??~????{?m??Q?/"?3????j?_?p'%l??P?u??&s?#????>7??$a??D#?g?@???|?????YXl???7>?o?
?=???}? ?0}??9??V4
??????????????w????=es-?}?d??i???x??????(W8?/?Yb??V<??H]????G???????Y?6c=??~x??f=o?(?z???d????e???l??N???F???9?1??X??uz%??>????5\M?w4?x~?????q?4?r??????T??/7??????_??>X?
t?\?a??a???????????/!?
k???????|KN&52W??;??c?#5w???@?$3T2k?8?AJK??myA???<>s?Uyrq]?T?a????'???l???nff-ttTP?2*7???t?(???A?p6??rI??!
o?
?????x??6>P???D??&?L?e?_c?OM???h??m??v??V?*^s?4???iO
?V???j&(-Pi?8c?~?C?@???_b??&N-?.??m?7???Z?xO???W?HQ??L?
???h?C??x???Y?k?}?>??,4?(?H?N]
???u?~G	1?????w?.H?l??r???'+K?n???J??????*Z)?b???W
?MB???Ir?^>?3?,??:.??/?5+:G?a?sN???8?8?
?=q#???5S?J??] ?LFV?D????>L
??????$?????ua??g??'???tZ???@?u+
x???Oq?<?7*0gvU???[,4??g??|)??D?s??5?k	???LQ=??=?`l??>?H????,?????s?V>??X'?q,??(?
 ?p?????
???h?6???F???@X?XC3?
E??b?C?U[#3?<Gj?H?H?dZ???h??$???-!?????"0??M?:^"?13??O?????L)?F?s??\?;I?^???;?????v???x???A-?3%e???,b?X&?o?9aY??P\????^?A????????ej??T??G?|zz?????r??ncK?Q??L??tr?~b????s?5I?????~_?k!??^??u????2??R???A*?WH??????~??Q???
?[?tO?(?R?????	r4U0b?:??C??aU]??ac ??]?????,?????.???????l#E%z?1Y ??A?????$EG=?.?<u????w5?b??l?e???`????_?}??7^?A-??-nH=?b??????0i?Ce??]d?U0&<?$=-?R???%???N?r??h'?=??2D??:$	???,!E?2/|??????L??a?$(?i??N??i&?=????vr??e?~?????yX?3???RYN9!??(??C-?=???EJ?&n?V?lfD?C??? ?Z?
??4?%?3*????.???y?c;>???2???F??(????,l	? ?d!C0?
2?P?0A???Y?=??~}??M???e?TK???????v????Y)l=MU???xT[???%?l????.???L"????UduVE/=Dz~	X?;F#??tf?$??????O???U?w???UP??}m??_o3??536????>Hu????.Jp????(?Y+???q????qW?/???????H??P?Z?+?=#1??Xi7?L????QIV3l??B??wb?bB?.??m?k ?+Bq?V at i~v?G?;?v???YXIj??0?lJN?H?2 1=Z?Tx?U,4l?R?'?7.U
?[F??????=j???ll?????
$???pLpM?)?e?F&?c?4??#P??4?????V???s?=}?[???=????<
???BI*?b???H??????g?????????g6??!T??
?x?h??y)yw??C???QJ"??}?????'M?*?c
??/???rS?.bq?C??:???B????????%?`??hz???W(X??????J???1???)??E?ew(????}?}L?=?e????=?????+??f???TJ???'U??XW?"?GZ.f`???'k?m??A??z?V?A??	Z?	?P???D?=??M??:????lr#e??&??K'*?U???.P???4?m???n??0?9?X8n?{??X??<`J?8?wn??@+??1????"Em'W???nW?w??Tz4?e??"??(A???2|	???Ps??U4w???r?6?r
?????*??C??n=???)????????3???de?bV?&?????+4???[<??.?0?aT???^?%M&?T??

?A??T???[?(???3?>u?1?????rJf???????????t!?`????????
? C>b?M"5?@?|??y??a??????5u??W????#F?2???+}\??F`??F?9????2I??2?}#cm<tZ??llS???vy	?SU???Go?d?~??????:???T??4???a???$!?	1?D?&_g????=?,??)?V?+USK????g?NI?????@?:	???z?\PV?N??5?????????`l?????q9???|??????????5?????W??n??m????????>??Y?m??qosC?q??5Sa????4?
1?S?p?a1lG???r~^l?i;ST_???????S???cwfKED?&L?/S;A?NU????0!FX???????8?q??kRV@??<z????6?Z??k/sRJx?@y?!??E??F4?$di?`;???C??<$ 8i???????/???nU?????i?vz??l???*?
??Y_?OM?[*????F?el?UKD????(???t]8?$?l?w??i???M?J??WBH???#qYU\r?b2?ZCRb:Yh?&?h7?\?02a?9cdC???\?d`????+[ ???5GPK?M\????l/?,?ZN?h`yjYz?z??	?b???rd????[w?I?T??D?9S???t]=??4d?
{^?0L?"N?g?bd"0???????A0?u????kCc3???_???d??????????%?wX=?Z?????$?r]??.:
>???r??k?q????%)???9?)????l??}C?Z??????????\*?I???$?V???~?:???b?S0b
?D???^???a?pR?h?H~??`??Px?h?'???X?qB????
?	?p???:???~s????I???~??}??#???????es???q??,&
Fh?A5?9 at b??sAG?????1?x???j:??M???e?????h???W9???R????f?d?2V?'?q??0T???94C?s??2??$????$eM??k5#p?a:+?y!?dqx??#?c??e?
]b~r???'i??k=m??G	]iS?????DP; ?AJ+YCj???]??&?????1?Y
Y????6??pLL'?,???}|v?C??)(?(??&?????\?_*??B0??OyT?/>??(U??PL
??	???&???2????"?ax91????2?\?6???c????sS??$!?r???;?????T???e?*1?M??????$?SD7?o>)?QLV2?C?
8?p???*??:=??
??n??
?P?$?V??i?E9LI?T?,?j|??????????T????ug^/??>?+???c??{??#0XY??#?????	Z~*?1]F??K???1?*?%???c?H?? @?????#??=k??sr!??/?l[???g???+?@???62?X??!?????l?060??m?OE?a??=l?:*?@??;'?~)??t??J??????4?????'??g5??6BM~???!??OQ9?b????:qq&???@	9dp??????"9??#?,r?h}???c??w?<???e%??c?fl???????m???|gX??;fO??Rw?3?w??'H??????T?1<????k????kp???j'?Z???m:???<??Y???
._?q?<
I?????*pe????O?iY?7???c

?d?B'(?l?b;??sy-
?!4??????9B%????????t40?Q;1(th????????7?j;^??????a??L??tH?Jd??zt??'?bE?u?O5k??4?4?????F??q#6????3M?_\?.??A??p?z??a?????$??4*?s????:?????w??b?s?VH?+?Zd]X&+h?=??D??iI?)? ??*???L-I??l???i>???????yz???0D-????N?
	????N?S?m??KsZ????]??Q????6????p9?<j_?Dn%??'&?????????S?7z???????U??4???S???Z8@?W	(d??g+J?V?0C???T??_Pq	B???"N?o-?Q??'hd?N??F????P???p??????'??y:??c??l?:Z[??f????????{<????>???W????T??+`?0u1nvl?]?$AUk??N*?*??????=%???
??T??`?aa???a??????<b!??
????????80\3)H!_??&??V???A?+?i??i??aJ???&l6X???s????Q_??<5?????2b+?gm??U???iH?????,??]??1?YYj??7???d??1???Ne5yR??s?????	?FX6?Jq+LHi6????)?????????3??f??Nv4j?sE]?}??\?<V????????g=?	?*n??o9?Ak??,?^?2???M?????3??Zj?~??????aO?L????cr?y+???(?n-?q+Xf?/+.{??7-

??_?a'dK>w??KL?????e??g??	???%?t?O0?
???u??e?%x?7??Y?????{K??4I???:?93??b?3?^????V?????A??8?[?T?
|	+???T????ho??0
??Juc+x?nm?}?3F????g,?k
??]RI",???ioj????*,?@?F????j??J?\Y?????$??????;RsB=f?<??%?2
??X???,??ak??*h??=:?j?*z???????W\J&????????,?!]N5?A??1j??@b????#;2??}5??????3?E????????g????gT?g??????)L[???????%?=?Q???R?j???v??%?? ??<V????&>i???a?_6?s?9?????????M?	?I?6?~??[??B.?????e??s??8
??? ?&g?"???V?????dS?ad????tr??7???gg}%??s.?z?6??8VD?2j??R??s3??Uc=mv}S??2A?+???D??Z>?$?Kq'?=??????T????V?%?????Ka6V??(,??@H!?
?~??[1?@f5E?Z?u??6?p?
7?`?ppSP?	??y9?Iz??f!CKz??E^?/&h?n??em?Z??????x:??;?n???_n`?k???qF	???d*4s j??y???4m???]?CI?h??C???L?^mO{w???????????????j?C??17????Vb?T?!ES?c??[???l????p?*???o?W?%?mM?????[KY???P??f?
-"/G\??y?*?=?&?O?4?;o?1?|3i0D?u%??
?+???a?;???d9j??rd?u?T?????-???S????!JR0Y?zo??
?0??????Y??F??'&???k??Qf{??'KS????F9?bp;w???h&!???<?-<W?%MAO"?e?h?m???w??????????A?7.;e?$??C*l???n?-q?2&??T?!hV
?;@?D?"i??N?JtL?RC???6???.)P??fS?r???????_?>_?q????s8r(8YE?Plcr6?y?yw_?>/??hD???65a?5
Xp>r?bKTQ???f??m?Sm?lr!?*0????w??p??S?2??????5?????XB??6????i:???C?????	?
r???"Rq????ys??]w???7|??+a"?t^?+???
we?:?;????
_j???`!???h:??\??"??t????^?LE?Txv?????ah?5`=?0?F???YH>Ye%??{??????j?so?M????F??}?+??????t?H$??{??|?hh?d?} ^???Qy??a?????>???14?A??U
???X7???o??????	hQ?:?b?M??>2y?????~%?gg3?FWjv??60?U???????P- ???
oc??EZ~????@??s?(????R????-?,?iID?^8??????????R
$ v;???]?_?+?????8???S??	?P?P?q?l??R?1??TbV???{?N????c??W?H?p??{?@???n<IX????)??>W????b"???G?<??[9????????????i??6n%?
???VB~)?UXE?G1??8?????????^T?? G???cP??fk?^?>p?$
:??l!6mi\0??????#<?!?e??5(?U~?w?c8?0V??@I?}?ev???yx0u7????
}ri??????|#LV???r??mf???W?)??????bbv????????_??s
???F?B??
[Y???m?+?7?fg?b????????????????%Y2???y?9??B_?e"x?'^???<?O'??p????uH?"#
?X?n??????[???????t?0???Vn???kP???+"1???[
Z?,? ????t???Cuj?eI1?%N~?s??LtV?=+,ZG?"2??H???X?N?VC??m?0uAZ???q?-e?}??{
k??u?P%P?t`n?ez??~%??9?j?X?1[???1U!??-?
:?h?o?G???#??]?x??AHV??Zz?k?_i)???`iIB??\????????US?J	?wYC+???
???1??>??,yG????z??u?#;???qd???????????????,?1?V?)(N+T8[x??D?j??U???z?F'??p?ak??Wv????s@Z?D?p???R#H??m??	??se???)?1??+?%?????N0{?GR!??d?8"??)
?C??prS?1?^|???*jrqv?t?z?GH?????KE??v,#f?"_GR?%A?<??X???r8??vv????6????5]l?bN3????D?HC???O??H4o5]?Q? $??N?e?A??x??	+e??XS??2?vY??|A?E?bP^???_E?i?/f?7??3??oD[?q??6????P ?^?$h?=?????\??^C?"????yX	Ev2W??rR?@?m?6r??c0z?B%??????
|??wG???m?'9tiZ7???7MM????????z5??????]gQ???f???-?_8??K
Q???v?8V?|??7?0[???U???yj????cl?)4??d4?/]???L\?????Dv+a?l?o??15???=R?a?n&?=?
#{"p1i??"???3`?3??u?????]^????"???we?u/jk5????_j?=E4A(o?(>$t?????????3m??zh??
?_e??????(h?3?|?2?h???V6?e[jV?P??T??*4Q?
???@??????????i9?C?w???=p???\??27T?eWr???l??l??:1???&-'c???m?y~??(???&?P??^5??
A??x\n?'?9'`tRjwf?p}?
(?O/>?????[G??0?	??:8(9?$<R???_?q???U"A???????M?????3????L?yb{l??m^??y??&h??^2?????v9=fy???:q??+'4 at hd?%{^??B??V-??? ??A?\??,?c-
@?`?>t???v??[
EABFD?J??Z??????y`??? ?<S?????(\????(?a?63r?pFi?97{?/?k???????y??f0??$??X?^?/?
?????????0?.1???9P;?0??<!^?(,????C?O???*n????-+0Z??????)?i???Xm~??;?U;?@|:????!?=(??&?l)?'??2?o??I??-E
?????#??6
?0
?A??A"?????,dhU1?6?;+
HQ?f?rm??x?+????K??l7Jt??y>?
???!??'B7dd?Hs??hC?pK??)?<??Pn???N#q??R?? )?????k6V1I@?ga?P
?(??d ??V<?????m??Ca?gc??k??!K?.]_O?g_?L?Et_z5?f???U??D?|e?Q???!/?p??|5?}???W?)?1??k?o?%:8???]3?Y?:?`"C(????S)GP?x???>Y`f?U&cdw?{?3???cm?Nf??-?:???Hi?*9??~???Mx????3???l??\????v)???{l?19m?????O?d^???	?P]w)?_9????g???)
???P?!?X?a'?'p??
^D8w?`0i?X??c??????	?d?zlQ:2??z?????7???]???????????|??????jS?U??P?c?6????3??Z?6K.?R??-?d-???)Q??t?94?]r????5??@8	C?ris~k?'G]??_????(???????????D?:O?????\N?L?X[??J???$??????O#K?e?o??;\0cK??7???????)0?{???[?:-?q?????w?}?????e=?p??s???3???kLp#5'???X(?!??J??n?K!????Dv6??OH???Z????? ?VH?hy0?????k?M\?A?
I?2UT>t?Rf?R`??~?[??k?QG\?1{?t??
?????4?????V ????,??F?&?lM
q???d??1?H;?Mq???S?M?????u?\?|F.Yr7?l????;??>[Fo??+?/>?^??l?<?? ??zS????Gcwvh??w"??}?L?<?I??Fu?{0y?????????-????5???O?=c???M???[????w?LN?m?r????x?$?y?!??H(?$????na??8s	?t??!
 ???4???-?id???l=?p????.!??N??C-	????q?:*?P?|0??Z_X??5?[2????_???[Zs???B?
??c?\??~#`??Kch4??l\f(K???\???=
?z<?[??????q??????3???????'e1?9!?u?I?1?]???F??=?#??m?^???R??$;????D??4R???]?qq?N?I???I!?A?cXJP['????_#???z?SM?9?"??
??mGm???D,;?/?J??j1k^???=?;???D??
?)?J6???
Q???1?Q~_]R+bx???
?7t???Q2?{???v?\?E?P!?g?S?i???;?6?f?l?
^yO?????bk???>r.y?J?xw????m?+?.??mkQ6u8!?=??
o2?j?YI???Z?2?!_*??1AiZ?,-?/E?\y$?I???????:m"????5hFi??P?8O??pWoN????|??D'4M??T?1]5-
??-y???????QZsL?[Sb	?#?$?????g??3?'??H?:?A6M??|2???~?????E<?n????Z???r?t??1????j?????.tr(?n?? H???(?^C\{?54l?K=?.???$?/#??o?gaj0??????0?KJ???*?a8??j?qo-*?czus?hY?<k?????^?>?<6?9?9DZU?m???c?p.?????R?
??q;'hC?:a3K???????nx?????5??Ws?`9??4??????
?s?g?Me??|6??)??E?A??*0??????a?
5W%p?b??=??<?[T_???@??6dj?}-??4D?I?l??#^|9?n7?u??X@????
^fh?4?Ti?<$??SR???c?A?98s?
nk3??
??/w &?q tl??Xh	?j`????3[????Q??8d??>???SA?pZg???b???{?|?W?/?do?????aO???L????]?*????])?b&!r?wX??iN?	?h~{C??????#?^??h?t?%??CUV???jLP&R?<?DF?*O5l??????[?{'hI???v?
G????wXP{?PT?/Ax????N??K!?&r??M?#??&??o?f?QF?[7w8?KV?'M<?B??_?P??Hg8??\r?u??z?????Q?????j;#?O???<P.{??/B??L????q?IEg?"g??I?$?s?}3-?x@??:w?l??a????,f?16L????|?<?xhBv?E]???;???oK?^-@??tw??N"??
?
T??????????????p?=????????@?|???zC??=?Si??p??????q?hR\4"?H2
2?x?\~?????
??
??? o?????$??HC?
O??Gg1?
}=?

?")??# z??? ?<?????W?g??oo???A??|??Q?t??????????O???G??T????l"?B??c????TQ??????I??'?????h?&a*?C
?r8U?vd;
?5?j??4????c6?}v?M???z??Z5?k????????????#?n:?r 4_???p????mr?)?^@??\??"<?kF??h1???c?l??????~V?RF?Ll?????????X???T???H+?d??xhN???gp???]AL-?z???8G?h?1???eZ?????c?P???2s?W#O?gVk?m??{??=A#???-?L,??.???????????[4h??P????q????k??z???:?+??=j??i
??G???yd-????U????r???F?????J??}t?'?4?B?????D?q????l?q?mP??
>??B?vc]Z?????r?._?y?[.???ZZC??\?D?Fb?:??????^?'??QZ??q??L?Q?????jUG??=?u?/??h????
o???"?V????d??(?e?g??kD??c?E?o????V??E~?u?C????G??-??|???????4l???4???????l0?IV????t?????~????????{??NZ
?+?x?wU8{6?????9????^?[?????I??U??????u?a?&??e?akY?(????M???pe???2a???i??????4'??~iS???k???4??????r????>?r9W"????7??_???}????2H4?Io??	??<??{??????;?3}?d??u[w?.u????3??Ec<???@????_#?.???s?ZC???n ???c????g????$A????\??????x????C??D;H?T???Mt"t3?9.]+?M?k???'?~t?/???y_q?Em?oF????|?s*?????Jt?C???r???-4a??&???4?qI?; ;8?-')?f???}'1?c?a??.,?o?_}TGr?O?W?4??3?W???QP?z??s?8?]?55:CP#SD?tJ?R???q?D?????vv;?C?dm??:e????#??JB??v??????u??p?}?HN
Yp?>????7~Tp?V??p??/>>cY}\????[?<??#?????#?A)$????/fR-DBYOs:???
??m???x?^w?iqho-:?{F??Z?9?:?"????2o??dH????0_?2?,(;?L?????w??1?????m??-??~n??????_??#???dT????A'?gv?O????v????ezn?w	;???????? {???&?;}?(A*??=????7?1&?)?I?D??02{?0?^g?rz??Q?o?4?o?K??6?tK?B???]??T-?-?]$??U??H????shh????8?I?D?P????Mo????kZ???dH?A???$???????,???z?.o????N9Vt???#?.???+yQz????Qi48?g?8Q?O{?
>x~OO?R??+????1???Z{H???;??]??????;???v???O=X{??&?????t	B????p?|?Jv???Qa? r?K83L??F???g<?204????????ad?d1ML@=;?
BF?1/?MMU?????C?2??)???.i??v)???,?????VF???C?S?R

??#3??????h>???q????^
x?Q??????~>b?,ra???
"??????9???2??\???
????{9?g?? ??g??m?????G??V?T?F?[??M&9^-?=?_?1R
??fb?????X?!????_f?!??J6pK???]Fj???xH???I??[??????????\~?f?1hD??e????q?%??t?K;??*?$??^???????{??m?j?4?E????7-W?C??
}%?P???????
??y??(b????!M?!,D?[??????l_??????\???S?^V??. +?	?????e????t??DI

E|????????>|?b?i?/??r(?????4ff???2?????W?>???HP???a???0???t???? ?ZL
???????%?B=Dlt????u??I1@? ???"i?H??bD?I??
)JBJ"??I?3T?!`@Q6CHJBV?10Bt?)?zqz???
I??C???????W??Fjv?hN??????J9%daQMY aHD6?>???e??????D??L0Aa??DB?J?XF$16a??`EY?l0?b'?A?SLh??`?7?c?0L????2}Q?D@-?AH?|
?Q?0?$!?b?????/????t?_?>/??????|????G????????-???$??'yng???W?N??\gs??|l??N?$?*??B?~??	??3????P?l??9?,?O??9???`??=pO~_???{3?j?????t??
??T*"???.ithb[q"?$??,kZ????m9?????|????????PD???DB???AMD4???=p???'???A?b??)?@?q?=y??^?q|??K~??>b?v??o??_??QHe{w?9???60*?????.o?3C3k??7f4???????k???7??5L??,?{O?3B;fBRwx?)
?????`?W7??}#e
?[?9???Q?.tu=.z|???N?}?????U?s?<??g??[25?~,r??WFu?G??m?
???7U(h????uU
:!??XY>5'/??_)?)?\???????`?]??{????"????UG%r??x????Q???M????[_?C??H?????ob??P4q?"??E????SG?t?>????[
U?D??????????,M??{Z???3?MBD{&mcD?c??Zd8(@???5:???0j8?????H
?*??gl?Q??3????P(????|?
?6???T?????;O/?F>?3"???E??80?LS??8?????J?????nG????U6???=??M??Q?, -?E#2/???R??F?!???WJ6??$Oa
?P2[????9???_<??CM3W??W????
?vIHtAic ?]?????'????1B??(?????c???c??%?
?:??2??????H??R?a&??5q??\?X??s0Fq
??V2Fi???ikR??????y?5?$m?&?T?!???f?7]??p??[?B?r?C+?+??J3&???C+u??bO?Gd???F??mp`?XEC-M?e(?Z??L?^E)?	Z?N????????4??M&4T?Jk
L2??q??+-??`8?%0???D?%x????i?$3r`H???5#e??=;HK??(E?@v*?#?{3N?4\
dU?@?uI?W ?+q????Q#|?? ?	?T?????h??' ?5???Wl???
X?D(?'??hf??F)u?V??P
???c+???8???Cp?m?U0??HM????N?.4???4?1???)Vf`?X2??n?f?????,?B???B7(????c??!???mz#??f?1\?Mh_?i??Y-%??d?B$D ????97?G$??+??I??I.??uZ"f??1?4????N???r:?5?@??M8??&*;?D????(?nh???K??XL
??:11?&z&???.???T?R?k
~???z in?h??e,?B?Ay??d(a?}?????Y?%?@<???C???????#?B??
04?2???"T+G?????
??-?????+gf??4??!!hi?????????k`S6B?R*$0!jp{**)??????????=??w??1?_+D?hS???5??&L?2??,???k???i??t?u3??$ w:?+?SD?
?LKD???
S??0)?Z}n??$q1--?RC
	?RZ?n??JW?'?+?fs?7%?3???v?<pq#???;?????k???,$C??cW?[Ad8<???ZZT?	`????????89?y=0M?T?S.?????{??????A5E?a?h????????AEK???u!E_k?"??D]A}zW??`?]IvH!?#Da?s??????%?R?4????(???B?
y?f
?_???h???hb???J?R?b??????????I%??????????KL????Ifx??U	%S?f#???k? HS >???#wXG?V???A=???OG?$G?@DAO=u$?N????{KH????`_?U|???~A????#	1?????6i??X??!?? @?IX??????$??@?,Q(C??7L?T?a[M?tMX?Mgl?_?!?????-i?XM???o?
??MC?I??wO=?!?!???h:+$2j??@?????a???ik?Js?=?S?
??MH?J,?,?9b?z?>_??;??]>K?-???4-??S?????????[VH?dcn?!?r\?ci5Y]??????L?y?=H? ????H????I+nRQ?QIIP??*???b{X? ?M????r?7?Vny?9?6??0??A???q???????	3va?Hg?+?=Al:????P?(?_(]?=R?{H+?"*??Mbh9????????8?M?p??Z?
?T????.??4dA?m?GM
?Q?|??3?>iI?h1?c???I??g?`?O??W-??$m?6??d??gN?L???d<x@??d$o??h at J?@d?4???? ????h????z0???|??????]<5?n?d??????4s??{
p?.?31q?@wU#??,?-??d0c?$
??*e????j
?q?m7?I??])?W?Q?E9????f@???)?W???
?6??????<?????O?$?vH?,$???????b???^???????E\??*????@???Nt??dP0$x?8[oF?i+?A????Z:?}????E(v?????7??bx?1??[aa i^B
*?e!???qVP??S??0??t6oHjj?,??P@??t>&?o?AQ??|??B=? ?a1$'????????T?!?c14DcQ?3A??
9??~??@?K
???<?w?t???`??C
??|6K???L?a????ra?w>??R??zU5???	h??W??E?@?bA????Q3???9?y}???`?a-? pdq?>??????????I????V??<_D??v
??U???L9L;,????S??"?W
???e?????
????
R?	?A???k?Vy??<
)$??`:???????@?????????U??2?d?0??F?????U??`}?9?.??yT??"i
???7????G8X??(r<??l@k???????	??]!?8???BL?I
pJ{]?5????HSf??
????`qX?z?6S??+?????
??0fL?I?R?y?????eN_???~
????s????z????????m?rNz1???????>??w????k{??????"*?u?1??????T??;???7KI-s ?~??9????<?W??	???a??*?s?0?q??s?Y?l?????-4??F?'?$?.????u?TV???e?aYX?&u???M?IB?v???0b?Y????
(I???-?XFzn????S??:?P??P?????<???m??hJ?????aa0<?bM?(??????^Q?~z??"?????Z?>??5?k/??Tc=???	??m????F,h??n??f??F7K??ZF}v??c?K??>i??}??I???
O?{?i?}<?????????k???8???Jzh\m?1???ts99?wXQ_?R?!?l?2??u'???????0?2O?iL	?
????6?Q????????I?
CLB??W6?9:A?H???>?y????6?r?E4???<[?x??h?E??U?qUmFk?xo????EwA????t?KB?=????Jg+?*???d?R)??J???????0=Gvh???4?c8?9y&??????"??????%?I?q?H???0????Ig?????V??p"Q6???j1??j??~bH??u?c????????????<D??5KA7???????f?U????5?Q????e??!?s????????Q?????3?.?8???N???wG?2??_Iy5???0??????s%?5??	?Cy??????b??\?/n
?????"?????????A??:V??Dkrg?"[??2??Z
*??|?-*?"?o?n?????
?stT_???U??05???4k???????v???0'Qt??F?Y??~?????n???4tL1??u?1?I]???k??D9???l?????t=?????????`????3S?R???!s??X4???;????????????I
OD@,??"?5l?/s??8?4??1??/??dhf??w??d?????o?Q?	???an'U??U?h?
????.?v??????T?????????$M?@k?	~?`l??????????'????7?8??o????>-3?X????t/_?????eQ5Y???????p???8????????+e?;?;y???Ti?k?;??j???m????{???\??o-????-??A???nk??n?6U???Q?Y?~{d???}8??????e??@n<Q?3c????\=????*D=??p*I???????K????Bt????}??????	???????<???f????x<??p9???r+y?7+??e?????????{"????w?z?????^??????????????Y?j??4???????p"b??????y<?
~(L??lH?@lABD(?Vo7p??`??$x/K??]??J???=??]o???F??????sD$1?????]??:??v?yI??O??5N????8x?Wmt???7??J??#S????????:w???
?????^UE?f????v????q??Ok!%????)???Ai???`h?v??+m)??U;
W?/c?????'RW?y????????}??"0?#?0?t?i/???1?:/???z4?>?g?i ????04<P?9?$??5???	*Hrm???[??>?>?????0s?!?Dt?`?1?`?n?c??????>?V?hTE/.?k
??`?x/+c??z???W?Y2???c??p?????tq???=??f?o??a}v\?{y??}??
I?y??Z2?:??????????rL?G??Y?/?&l?????}u??;r;W?Y??????
??m.\?
??M'??4?5Hr`????_7OE????Y?;??1??=????u???h?ep3?(B?D
S?%tm?(????K?I??s?xZ????????*??~f??$j41?(??,??\??????Dit?z=?Xttr?j?U??????1???]q^?p~8_A???=??>;u?? ????3??Q??sR?}??E?a?W?]lz?C??H??wV}4?5?$'??F'??????!
??[S??u?E+?F+??|?:?AD{C?G??|?c?????]??3\???G_A??V??o=?]G??U?g>?}?W6?o?=??K[2
???I?????????
[??>?d?)?h??\6?????.z???????W?y:v?????h?}??=Ma???Z%t&?G???'?,_uh?*?%????????0o[:c?]skj??{?????u???ELtX?-H??*R???m?#????????????a?J?|??^X??"???X???lzMhm
c'`Q9p?m??bk????Q~<\[&?U??C?\??_????????????t?s??xVE????q9????????4???????m'??u???/??MV=8|??2??:????T,??9???T?
?
 L&
?t?$
7???R?op\??6??P?GA?(8?F?dY8?c????x?c??_??b??l+x??????R?;???<???U????<??{$&?u?^??,??=]=?;XF????	CD?M~?u??????m?n??wl????+???f????????L v}?????t???4H??m?I??QP`??	~k?C?(?????-?????j?? ?????3_dq?]??<?!E}??|??*?<???m????N???o?y?A?B??E:?eZq?l????T<?y??t???F?}|1???HZ??7???R?N?s1?????u???C??/???|?v??nr?Z??8????
n???????f?q?F??I/X?'????%-'?fI"???~,A??????>?'?d??$??????/.^5?cJ??3?_GQ?o?>????????qt??E???q?(e?9?t0_k?^?3?:zo??u4?N?????}?dM??UqV=??F?[k?_9?=?\?5????vUd??4Yz??al0??W??f <???d??X8?!ow!t??=??Z]???M???y]?&??h??m
??Fbs>l??????k???+??>????q?????s????o??w?6???K$??U?<???S?Tv???<s4d?1C?3???4p?sF??!?u????7L????0?\^?????|?????????????_/?|???^?????srEp?????Z???<?_?N?:89	??\?MG?j????2~??m%2"??ka????M??????S??$??Q????)????C
?|)?6??????PH??@B??X??@??qJ ??X???uh?H?'!h?a??T=?5NbF&f(LDHX?N!p????E???2S"??r?3"H????t?Ga?
t!??(??????"?E?R`?Rz??6o=?DRF2??C?Y*yHXD?????J???3?b?_o?pp?????M????????F????h??w_?Q???,??j?????Q
??EPb@TFF?b? ?V`hb(?(?Q??[8>/?}??S?)g?beU)!J~!\???
?Z?x?E7b?$~zss
:G?12?D??????S(?d?????)??wm?\f0?X}??;???u?o??????q?vTvnYV????7?de3iGa???e?-?P??1?,???3P??????\Aztj?yu?????????d
?????l????,??-?YwI????lu?d~?Ps???]???^?.???P)?bTp`}i/y?????}?T}??k??Q?m?px??[?#-?"?????H??ei??????Q??y??*-???jt??C??D&UG?>?)?T??(='x}??????c?
(???Q
?p????B???C????s???\???*??X???5?"-??????}?~?p??q??!:d?HT???Zi??){?????T?????`???>???JV"&%ud???F


??? y??9v??"f??y???QDG???F?????#???}???e??`?Mu3???*??F?????????l?.K^!???s???@#??bB>Y??}??v?"	*???Z?? R???D?? ?b.???K`?y??d;???d:??IG@?r?E???U??/????#?F?v????IQ?
?b??"K?0X	h??
#????u!??x??}dpH????|:??<p??i??`&?{2xH??0R?E$B?w?A6?ks?9???8?1	?@9v
??E Pn????????Vf&Yt??????:??e;?2~X:B???8?4?6???????4????^??:??b
=
FV??dvB!WZ?V??"Z??f??2SU"1cM?aox???&??hY????.
?????L7?nB??H??????{{?>???????Z??g????W????/??Z?S???}?N?t???!???_?????hd???%?)??F?m?Y?e\"|?? ???C?N=???K12?oG?u?S?????{D??I?=?vh?A???? ????6??/??)?e??~??P?????7???C??
H6r>l?{?/?x?
v???G?????????3?.y??3RNn??w?+'????Z???#Sc???G_??'?????)?"_?	L?+?z??l?????"j?o???,FM??4?1_????????[?V?"?-????;?'q???F???6?)C?x?=??o?o
|	???.?.???f+???
?????x?$???]_?><??{?????nW?????1ET?X????R???
?=g??W?lZ\?<?=??U-!?? mh?a.vB????wz?0?MU?#;????A?;	?:?SN??????U0w?????0?
??j8??`???y?^aKO?^"?:???o?b80&[^?5
Y,?Y.v5?????|??????>l?mA?-`?1?n?K??????{V??_???F?k|?*??v?Lx???m%????J??c?f\U???Tw????E?8?$`??ew????U??p?5\?:6K??R?'??n{	/?????????]?E?G^???x?????s?89?Q???/+?????U[s???nb.???to??i???3?^?R\?????(WF?{??fH??????~D?<?Y?$?~m???
T????w??w????g?EU?X?V???????p??>????l???$??"3???=??=A???0?b??%]U???z6U???????/9??mc??3?]p|}??\????>?9?f[????5h??J????? 0?84??b??????d??????F?????;??E????N@?`??	q?:l?u??q??????l???*`?*J|???9?3?<?:I??l3dM`?Q?>S~N6A?N?????????M??????-?.?aep???A&?<????m=[???????[:?m????j#??lr??????q?<?????Z?'????
[A?
?dY6?Y??IL???s}<w?xi?.oH?l?81?K'?C?d?c????l????fV?!Y???#??_aa
???.?z???U4???W?.?A?????*?+?s?~
S??%b?LE?w?/\?1Q???"??Z?i??~-??w????!??0??yre???0?`}+???Bu??j3??
7h??
??{????~?????q??????x??\?g*? ??mg????#?>"?D
??=????/Um??=??????vp6?F?G????????VV}q\!Eg!Z???(6????p??72%?quE ?
Wc&A8*F????Q????b?<?7??{????*}?=??";!?>???vox"??"N??&??(Kf)???mt,Y?+x/??n\?5Qv?R?vg??????<i?/}
???)??d?MN&?(G???v<oh?~	?????Z?}r'???Ak?|	???j&?6??&????????V???v??Z0~??ZRH?O?n?i4?s??????d|
??{??????H?R?y??^?E?*$h?>?=mT???~#Q???????y??h??e??I at P
?1T]T	?BhD?v?????;~Z
3???8@@??W??Q?c???????hX?c???Er????0???????
O??y?=&?J"A!?-?k??8???z`?>?#???)C??'?l?F?M???OK
????!?0?D==???S?
??H????G?????????Rt? ?}?}?H1 ;[????H7 t ?0?h????xP?aC?W??'??D??H???c1?F?u???tV?Sg???B??:??!P&QL??S??iR<?Ub??'???vf?????*??K??x?{=??Dh^?????????	?O???
K?0
?M?Hc?7?HE?`???7??$???Q_k???D??Be?o??@?l?b\?0u?s)?CR?s?9?st?F	?Q?:?tD?J??I?4[P?D??????u??3a??1w??[P???????????|_?r~64??f
?;?p?Yn?????
??????MG?i????$P{%?v?)?,?O???"?b?????;3?>??qIL?,>sG?_4?,#??s?'??r???{D(???O??]?0??ej?'Y?$???a?A?]?r??????~n{>?
ph2??Z ?w:q?D??I$??pQ???E???V
?M	?&???CS???????^hEz?
?"?u?y|2d:??@?x???//
?N?9? C??lvS?
???:#?_P
??????I!???M???
??;??I$???wn'P?,?A{q?7?,?)4??`?m?'(nw?fR??M??
??:p?@1?vM???????@iJ?h???A??QT?.c, at o?b?a?2>?????:=Vu??????w???(????????
yP???%?I>q???????2~??u?_??cZw2???^?t??fg???pF??zF?G???	G???F?R??7?C?E??J?g?rFF5]????Z??W5??mf??Np?E????YS??????O??=`?;???9?????Z??x??;kP?#SC??M??q??E?~?q????X?z?_}T??
g???Vc
?c????u#L?W?z,?5???5?\V???????>???????:????<?e(??
??vl???*k6???[*?? ???Vi???K?c!?cinl???	?????=?e??>|;H./?????0????_vu4???/?b ?
~?e!?e
?d?\4(?e-0?:n?Mu??
?~([?i???YQ9?hz?]?7?ie%?T????Wc??0 ?:s/RN?\(?b?f\?^?H,?AG,~?Ln?<\??N?V?B???Y1?V/????~????o???77?e????6?
?Al???u?V?{?~Oy??S]??:?Z?Z"H????L`!?#?????kV5me?)d???N??e?E?CT?gm2??<?2???????|t???YJG??#c?;?????????a!?R??N???"??A??\Ii??wJR>?W7EQ??$?	??x??D?????-?3?3?B???????Q?????????g4??d??8ff??c???	?.s??6O???3Vd?6??h5??????}y$??{&R?t?l'?q)??X!l?!????,-???^?????1L??z????qUn?\?S???????,???'?eTp?~??Q X???3)??G%??#?q???2?
?A???v??!?I&W????????Ma??2A_4T'?????<???? ~??0j???r2L???????z?=>???rW??|QDDb??e?????????'U?2?ui??a??s????4]????L??6dY??]?E,6<Q<???
????.C??????BPI??
?W?
??a%??????!R???
vX-p?~?p?&Z@??M$%?%???8?5p5
?P??s?w?0e}?i??4?f5?Y]??HV???i??u_?Tw???J?j2z<???WT??U4? ?x??yd
?m??k??P????I???.?4???d?
	?`L?p??8y??y4oM?C?f?o??R?>?8>??}?h????:9Q??|"?}E??ZZw??Q?HU_~?9y?????l<?9g?{??vD??"????=??	?H??F????2??G??)X???s'b??	???@?]?W
???/??PAe?)?1B?FT?nLu??
?gy??3?i?
?c?s^??=l?dZ?[??-+??i%?d????Y???7_?|???q?????03??AL?_8i#i_y?^?\?h&?"1lB?b??$H<^8_Q@??@???
j?m[???????`?vEMF+
????l;P{
???1?????x]9??E3%????e\c??#|M???????Y????^???h?I?|??d_?|p????O?????????2,???!(?ISvQ?aC????1?X?@?0?
kR?Yz:o
???F{tPLb????h.????Z??+?06??m?*?????51?=9jepl|O?0??[?????q??1??FF@??*\?*&sn?9?>'??V?UH?J?q*???^%?o??.??|?<XlJ8??F+ ?-Hy????f{~????fv?%m??8??"??+&}?o????f??'A????#?Q????N?C@??"2o???yK???>	3t?3o?c?9????`?e?$??!??O?G]?B?A???#~???????????oLx?O????O?G\M?*(d4g??/??\ds?
?>@>????F B?h<;?? k?Wt?Q?>????3?
?~???f???)?f?-?'??R??"?$?Y???9?4"??jD?*????{?U??Jy at n#?x
????
	??j?uL
,?,?????=X????A??h???_?u,???x]+???j?JL?
=??t;??-~?O?u??vu?=`m?3??Q???*????????
?&*?
E3?d?^I&;?? ?0U???9?
@<?N??w??

v?W'?	AA?m?pbk????????????&xr.NC?G]??
?H???>>?C????a_-?AHq?{?y?/?@????,_?:Jl?9l~KC0???????????7????t?b?? vA9??]??Z?Z/
?????l????7??js?A??>U??R`t?L?
???z?^?R?x?77?F#??O??l??\??????J??D1????_???"_??[
????@?jz?;{?+?Cbo??s??o?????
??
.(?D1???.?
??a:?????HSM?I?????W<N??m????6I?????lN6?w~???
?s??
??p??D?%?-K? ?H?????;
?"?b?r?D??p:????"Eb?I?X
?l?.???m??;?K?k;??V3_|	???J0????>Gw??U'{?c??q????X
????????
3RZX?*:??HQ??????r9?????FS9:?T??0C?A??9?<aA??>?i"Gh>???9?W??*?_7????e????^??;??I??? ???6???5??ws?\]x1?_ [?????Wd-??"???sbJ?H??k?fu?B?R?[sX0?/?B#
$P?ED*?#?H???/?gC????|??ut??gd8??Q?????y~x???]!???-????F`??h??????nz??+M?:??fiH?`???a?y\?GAs???pc??&???l?jd??^???g??NaG???O??gY???%?!???"??0?{mB?=????`??1?????nW?tN$??Tfg?q??m#???D??R?Hk3POf?-??o???2=&??????8?H?;
fC
Z???c?bB$????j?;(6?;??"3??????,?lN??+8???
??&K
!?I
L?<V?1Oi?dEa?"?????"Ul?<?
??s?jjAR?>?hb?_?aa?$?3??V??d".f???",?$(?????Y???[???@?????G?x8?7??? i????$4?SHj???I(2K? ???9,??|??v?j?B?L???
5?DHtR????'?}rI?&??0?
??>X??????????tX{?%?
?oy??X?Xt????xQ??++{H???3=c?h????f.dh
2<??????>|?J????oD???w??>A$??Ps?i???H?
?t????$??YY??[??:G?4l?<*??|??ia???2M?v??????:?Q?&=?????a??0?)Ed???.??t>j?S???+?r
?$????oy??4????bJ5????`v?/???????????s????nPB?\???\?/v'?????q??k?~??????????????W??;kh??'_???`;h??D?E=???L?:?_+r????5?M??"*N?bD?????D*?p??????@?/???a????M???o??O????X???0??:?neT??TUSm????kB)???g??????t??	 ??zF???l???_???\;?N?P?~{?!da??t2f???N?i???S??pMw}?s?sZ??+????
?Mn??
(I?
??j????Y?2|RH?Y
F*?~?P>h?8???d7???
?2m??%H?fEq8]?_I??m7?\O?N$
?~vJ????f??#?0{?????V???z8?6???<M???)a?o????[??{?Y??F{?y?l*??N??c?4i??Zb????0???3?]
???W??????<??k??|Q??j?;\|?(H?.P;p?=7E
??+?/??
??E'm???
???E?????wE???F??W?Q????C5y?4b??????4(=?K?{???%????*u#?1?????????f?????U??t_??m?
?{??#Hd?5?T???:FH?$~???do??M?R??~??5??c
??9????jk4k?Z?GkV??%?????=?????????Iw?%?P?AX??m?`???l??S?&?g???T?cv?m???C>?,?T\?Y{H??.G?v??=^?f??*?"?*4_???;{??:`?8"9?h???}??q?4sy?oG? ?,?w???mu?B?
\?:Nw????j9E?&????(??????w??y?d???j??	4?? ?^b[?1??c)?)???lz??e.?{s???a 6??+???m!kw?B???8g??cNy^B?Hd??>??8????a?????;%U?ewOmT4E????9z???_)?"I??3Z? "c??SE?q?<ul?V?
?S2????n?J3.?q???]J?+y????4C#K;?????",?0???b????m?Btuo{?W???x??G????t??1??on?"2???+,?{??(_~i?6???D???`O?T?O7?n?????y#?e??????????}?m???!???BG???Y???????7?6??fh?=?]?????}uH?7???0%g???#??????w?F?)????9]C=?]?<9??x ????I?#ia? =?A??.&?5FSRA
????t?0?5?t??+ ??(?? O?z?9?,??????v?v?O?????mt??0f??l?IH???e???????6;??|];??a?Fa??9????syy?????]?7?G??????BfHfctB??s?|Oi*1$?B??l??g?WO?jzT???g??????G\b?YqU?1s:?[^?????x??SN?~?7FC????5??7W?? ???O???????Tj???Q'??6?s??v?[P????(e:????md?p???r/~?&??2??=+#??iH??</?R?????????Cr???k_\??$?>!?];??m?=C7????w????(8y?=i??L?Z?2??????
??vC?dx??7?:O^t|??T?0Ow???|?????c????F?_??]6fZ?????:*X?E?$J?B?2Cq;6???75??)?y??{l;?H?2??????J? ??-
!s???? ????I4a?y??o#???p?L]?v??????)?!??v?zt?K)N3z2?\}:???UN??SZo???^!??q?????Q?$jv?.??~0?(xj???UY|?}?j???[??3?bt???V??C??&+????HRr?D?NDMO,6?9?? ?ad????.??<?1???????"'????S??wM"4??{(M?'>???????????
0??ys?=?')?<tp?h?uz?G???y#?x?8?f??U!???Q?2???x?5???R??
Mx???G?????>xu?za?M?J?L/?????`??{??$?P??H??_??;y?
??T?@
??#1Q???J??s:3?yed???j?<LX???b??O????s?jw??w??4?%T?o?.G???_????????e???+????	???
B????P?!5*8?u?????
???2????~&?????N?????)???]e????????=<?k?I?%s????,??)?U?*???y???M(uj?^??T?????w??[??A???]?j??!b???<!???N??????w?????h?9?}???????
 ??f$DVS??E8?d,??U??C?j???????????
\??????????d????????
???@?C??????p??Sy?P?HJZB?`????(?8??T
????4IHS at e?u?	??6???
X????L???"9??s??????|???!*A???C?7o??p ?_?]?]XTV??b???H??}ZvQ?????R??:P+??????Q?9???5[?w?M?)v?6???z?~Y????M0?'+;
x?p??X?(?	?!f???~o??e?N??B?D??gT?
???\?3%Bm??_?R?!]=%|'?[??^?@
??9??1?>b"s")?a7t?a1??	?|?t at a2$&?x?/?E???? ,??e?",:??%??A???cA????H|??????+?|!&?aYr.?????bV??????k???b??M????C???I??Ri???????\y,?V?"??Xg.????-??'?#Ywo8????D????E@???6V???H??????|o?;b??y?-??????.??????i?k+5??n??S??ho????@A?????W??
i????)?z?r????lU???]zu?????Md????=%3?3?
??m???c???G??)??0B???????s?mz?
?zu??X????????Z?0??5????UPte?i?a???\Cw?v?n\
5c_??y????n?????.?n?O??y?oT}?q????v?$????g2?*f?????????UQQUUUUUT?{??M???????????t?:qr?wv???T??eW??0????????6kU???[????N8Sr??bJ??k*?r????9?v?????? ??6U????5?b??3??m?as?l???D?HR?????????UK??+
??;??U?	|^?m???G??QQ
8yZ??K^?i??????????d?g9?c??5?Nl?;?3yp<?/f??,????2`?
??D????|???+??x$o??n?Nf?C	$????u??????o??fo`h???L??L#?lr??FhfyK?0??0?`?w??B???,?Cn5?~?qe??G`?;/?\z??G
DR??H???L:T????	??`D	?M?0??%????Z(F?ZgI?@G?????b`/
???J?}I??5y,?e?????+\'I-??C?M????\U?d??;??xr>Ret????
W?FEU??????GHa! ?v???????,k??W_-a??O?Z?c'd??UxH?? 
uK??V???}	?????g????UF'5?+???????OO??????????~^5UEUUV?(???@??IH??I%=,??(?I"?24Z?????d(?!?
?I8`?;??}?h???q\??GI??a	?{??x
????Hy7}???&9??I	$??G??a?????hs9I$??/H?K\?}?%S??A?$?w?N<????`?s???]??fxn?:??QUS0V;?B?p4??+>Nx?????q??g-??yr?a?>[????w?-lX??@C[?????:v?????
TSC%2E0?I?@L?A??vf?p'???lhF"?'?f[z????????? ??
???-"D!@D??
??
&U0?M?.94?M4?M4?M4?M4?M4?M4?
?b??M4?M4?M4?M4?M?<??i??i)????N??8$??<C?A??i???G?????i??c?9 ?s??:??i?<O???8x???a??}???p?y??v??dddg
j3R?(??UvEm8F??O?j?	???#??Q=??R?????(}'???x?P?I?	?????)yh?????~?)T0?^??I,?H?
 ??{???=a???????!
?RXT?&
?l(?D??#???AA??????????6?X?zOPz???n??B B&?Eh?
?$?C"]?*??*????8???????H?l?DJ=S!?wCn??h???h?Piipd
???0???X???????>????Ea?T??r??????*?RB$?????paJr?0d???????!?Q<H9??8>4!U%+??????7?>??H??_??=??R1?S?+??
?o?a???7?T???,?^Sr????V\=??a???(?LByxa?U??*
?$:?z?g
?Q?{?x8g??I??B??C????!i:???}?e????c?U%i]Z????>
??-???wS???0r???q?l?i??%(????????????*????????0E????LX???u???:gY??XR?-\? ?B?n{R??"??<_??z??9aO\A??? ah???o?k?[5?A^Z???o??M???I&<?#? 2Z?3^sy.ny
	tt
A1N?.
	???a?'?'????L?}?A?`????@?.&??xb??i??a?%??f?p?=???B,?(9Ea??!??OBk???????6;g?i? E??0?j??(*??<}?bu?"?????Q?s?c??v??g?_v)??@~???N?khq?%?r????1???@???????????>}j??0??0???$????????e??j?O.???\?v#^F&A??ER?????????9?!??[?%l?8y??????????
Jv?_???:??)?s ???oUE??4??????%zwB(???WX?0??A?????P$q-]???y?@h"?? ?)9?6?"y$;??Y?X??A=08??(???=
?
?P??????D?2_?y?8H>???,z?TX?E{?8$8f??5l??L9????6????????(g??????mv???????w???/"??"????h5WR9?\-Id?e?$h3
<?cY????????B???????????`??h??~)_+???i?*"
???iK?|?G???=?@??>?"hbN?????(?c?w??i?&`??l????%2r???y??V?fh>
i?60
?9?#??aq?r??s??A?G???ix B?R$????
s`???J?Ld????g_?E?D???!????G??b?X`	??
?4]<?}?W??{?U?/?	ym3f?&???RlK?pf>Xcr??r?B?`A%up\?`?
??:P??????E???Z??`K,?p?XsG(Qy%6?\?1???*U?O??dI
?K#?o???aM32,?U!?EP}?da=?O]??N??@??#?h~???X???q
{?(??L$?aI??b??L;???U????"
?<H??H?	?H??q&=??W?y????K?r????2?=f?bu?f?d???+E?$mm?()7!@?hd "|Q????7t???@?H2??O|L?	??i>x??JOSl`I@
?
?6{w{>?~????????<?? `bo???#??wl}?Cd?J??@?$???
?	|F??}???Q?/?P$!;?l??!?P?c??p????Ja>?C??C?Y?bu?T
P????(N?6???????P?v?H|wW???C`*???Z*??????7fa???
cT?fIh?-???"?B?/?z7;LX?zi?[?????PIii?[/??8?%zS??:Fz??	$"R??1?O?	?s?/?H0?J?@??"<?????z???9
9Q<?/??"???$c'??|?3?}^L??D?]7???yl;P2u?U??D81??>,??w??DX?(Q[??O????!??0>?????p?+%@?T$?I ??(_;?I
}?`}:?P?A?????omY!;f?ap?0???` 
vc????
3??0?????????qD??`?????DC?)D??(7??????QH??
z??F??O,??`??I??????Dk????
P%b?y:?M????"??N\?????
???Q;?[?P???2????N?????!1??;((??j?U??`p7]?B??
>???Q0I&,?:4Q??uQ??? f??????*?i???N???Op?k??r?#?.?????h<?r<??c??=C???
EJQ$S7???}?g?S?&AL?T
?>aodB at 3|@??????j??W?nFFBBH
%Rdd%RKE?y}{?Q?l9???e??9??8M?!T??a?3
?????
?m??80??????V???E}h??R0?x?[??PG0?L???R??????y?t:?????	m?P?u??C??I?lC?X?8??=,C?2E@#L?v?-m???2?EE?~a??k???HQB%2
]1???????#`????.x?s5o<$>??9?z?g	c??0e1?0?*302?n???R??<?st?s?:)?j?V?S????|?????l??Y%hm??]y?
??z?x??????&???T??D?e`?jD>
R/?]??
?P???	6??mYE???Drr?<?m???j??ZU?~?bxU0?|5`?w<?@cCG??@?4??
?????
P;p#????y?I???A?q?t??????B?L?=?/??Z)???8???|9??`E?w@?00?k5,;???U,

?
???6?+S?????b=4Y?%????!??(0?A?;?i?
??@H./T????????v?.??a'??	????W?v???4?x??IN?6V??{b @~?=p?^r?M?_??f
 w????????>S??3>R~?F?k??i??pVb
fvY??]a???-?&?H??\C??&p?n??2qY
v?#?-
???]=(o4&??h.]?/???+o????^x?????Hd-??4k??w?Nc??=^??vB6Z9z??bd????r???ar\?y???g(
??? ?????j?=????q????1?W?9x?uS?:??j??r??I??????????Bp?3*~?#??hD???~?r?h>???&?peQ????BG?'??3"_?y?N?|??
ED?1?????;??????
c]3w?<Ad0&1?p????'DAV}C??!??????"??F!?0?L??k???!MOu}??
?S?	??????oT????K?v?U)H?EL????'???h2?/%???(?????s?!??5?E???N?"O?????O???^?:??
?L?B???y??
s?????????&H	?)???e*DkN?+H??|^??zR????+?-??;L&???G?	????d*(????S??l?_`?4???&??B???z#???1????1????6??z???
?? *k

jF?
E? :?PQ:f
 ?I?2!???W???!????z?3:2>?]H9C
hK?)?W???S?H$?:A
|$??????
???~??v?L?5?!?0T~*D8?#???P61???Hw(?d?n[O[?V?w??"??Fl/?/
??d???G?<Y??!
?PD?"&P?Z?????
????6??Lq??@??T	G???a?B`;??)??(? ?+,4?jLZ$?"?G?G??

??2??okP???????
"}??Ro??x?k
n?}(6????????3f?\?H????I(?w1??l?X?;??'??;?U???????y|x?5??k???K???????4???w?9W?hq???? ?PD???Z??:???2
?i6??ye?4?OW5?J?M?QIuui???Oc??n]?!m4?wwW.??)??????1?6'??$?<Q?E?b???????m	??[l??&????}??M???Ese??????L$???.N?.?l???fe-???n??P?hm????
?b?b?C?t?y$??
?o??R???? 1????h???"v?*n1Z?$???(?s.??D????v?B;u?b0?????V?m???n???q???%???
????1????}??=N???????
 B
??s3??-??Zf???.???T:?c????ms???,?X??m:
sdr???;?y?zx?Jw?w??!#???J}2?uJz???KaF??????|6V!5?
>??L?='??r????	?;B???m????6????29??C?ZB??O>.V????j?^
??
??n@??T?]????????y??A??d?S?el?F??oI?-z??f?N?-?o|?????/??
+??9.gN?+j-08??g?_3??@C????s??d????m:v?????.??t??:?*@T??z ?
?Ne(pM?R5%RAr>?0???n?rI?w/???v?????c??m????]?
?99M???????L??)K?t?o??x?#rm???26?Kq at m$?
82F??????&Z????58??R????xc?uY?rap????&
??|??????3???AP?;???@?
*
<?,?
??X??????9???7???C?F<???4/?K??E???V2??a?M7k?I#?:5?<?d?d?pM?g
?0???????p?X????	\??????????>???z????=???~???q?!L???Kj?)?%n?m?????iF$m?q???
F?I???=??U?`???	???{?0??b??M+h0??g
?h??tm
<6;?.d?ML???:5!<?)sixf`?q#i?h??(???? ?A?v|S??N<:?>BX?V
???%t?Q?Z$;jR???
*??%BUP?w?A????@#?mrC?4O1b?&A?$???s???'c???p+??
?56?>?a???|??Q?SCKM/?B??HC????|??A^Z
?7?lg7?c?cORI
<??	???H??????M??XT
??D?CQ qx?
u!A'ba
b?>??C?o?????:?*I	h9C????j?6A??????<?iZ???Z	?hT ??N0?
?
h?????3.?#?J9
?<??2??@L???
?@??:?0	
??7?Q??????p?r?
R
?A Z{?(c????R=X?.cv0h???<U?w?oQf8??}5???????R???.? ?f2?|??$9HQ??d8???4?3KW6???l??T?A?v?l?+????nS??I2s??G???y6k)l?K7?d*n????h6??K???g?u?:?????[TR?g^q???/???j???#4AB(M?D?v ?f???24GD?C????JM@??l.?9??
??v??0JP?C'?O;?????7?rX??^08Ae?????gF
??PRDRRD2H?A?N??E4Z????W??=$`C?/V????/	Mdp2Q??<=?z??CK?
T?X=??CQLH P?
 ?-??!S2L&F<???m?l[jB@?????6*wiS??!?|?^?+??@???7?	??L???T???IV???k????_?.???wD?{????(#???1?LDe??$??	?x?$??2m?UH01W.??T?jh?]?["?????2?:0??u?????h??t?!6]?????Hx????p!&??2f?????(???ZW?,?l???2:*??f????z?&???BR?'??$@????
X????A?????;5$?/|zh??'?	O?O??8:~xS7???)?m?(iP?B?m1??x????3?
?P1"i???F????sM???!y
B??t??1??
!0%?
B

?
???H??P?=>?!??
?C$*???}?_??L???wD"sp?1?*h??jS_&?(4?????D??o;?o?N???#oXEX?1B?P?%	????P	??8{???

??u?D V?|]?!?0b????3+?:$7.????0pP?&?v at h
(?e??X????2g5<?E@??????j???2??ZHtDU??d
?@?R????y??~?A?T
?$&F?2???ED???u0??"?

m??k'?6FE?? ?@?CIz"????
?????I????"gq??fh
I??_6??5??T{'?b?Ea}vC??????XCk??N???D?? |??F???E$LMC^^?1`?p?
?C3???G?I?S??b?!/HZ?*?????6?P?IB?
H??g??7???5_!?Q%#??z???Y?>u4??????_S?????I,9L????K
?7????m??kBV??4???v??/B/z??wG?t{???Y??Q at P[h??Wm????Is]B??
???T???????;??(
??L`$?


4 dE?$??h^|????
) ???X
????LR?:??m?????mX}~>a?|??I?`?P?<??????B?i??8?????|4N?#i???(e??k???Tc??=?d?	????????4??-?>w?)4r??L?8M at 8T??!?Z??
()W???&?;??u]?`??Qs5?p?"Y??~?F??g{@fr)??????"??zb9?1?@????wp;???"L?h?t6k


P.??1
?U?4?
p
v??~"0??"?g?I?\????[c?r"8?????I4?p??????A?G??1?-??????QS?r???u?????????@8H*V?H>T????|?s)w
?$U??F??\??C??@>L
?}:?V??Yc%?????@?????~??<?a?p"?/??tb?eF?0??\???r?D??9?
SDp[y??O???z??4?3!??O??????P?FD?	 ?
??ni???P??s??}??J`@???X	????[*?OT
??d?Z2dc?T?E?E2/?(R?&o
(|W|?.?c3???N???
?=?H'z?'$DI2?5D!P+S??%
+??e8
SLY|q?????M?^??h?"f?U8???SI?|TZ(???????l????3B|oaC???j?7$r?*?yo4#??}H?????bI,??x:??????q
3A_?;&@????
P;:?QN?G?
T("?$?&@??$?\???1??`????%?!K`!?2???e?r
#
?c?L?(???
8????E??p?j?n?(??>T????^C?k??DSPB1D)??7?dG?e?=??D?@N'???????????4C?)I?;???	?	??G????#h????4????I????W????]?TM"???z???N1CA>??yG??O?V??B????N????????C?_Y?	?
??!??????#??5$V??pW2)q~?????yv???h?[hh?)??>E?????
m`wD1?P?f?????`?
4???;a??????L???&0~R
?
D
??5S!??u?G???(a?
?w?UCpm@???z?cVy??F?
|???0%??H?4??#?????^D???'d8???)?*s(4?A#|L?A? `1
1????C(V?0?X?$_Q????fc??6???gP?C?1O??????S??g?ck{????Ta???D???'7??Yt??9??'?k????j?#0?)dLcl??5B?la&-LT??a???bB%??X???><?Z|	?4???c??k?z?????X?X??'7??g????????
???0???2?????????I??gM?4???xqE??A?N?
C?

%????*?r9%R??QU3??B??R?3???r?4???Ya?W?)?gc??#2
?d?????jh^]?????jx?Z.5???P}?0??f??29QiI H7??%?	U e.?1????<D?k?? 6???`sq?hwR?3?a?e6??|????????iP??,???????""?"????"*?"????cG?!???N???W+e??K???C}"??Z??????n???gd?????$s?h]qU?4_??PpD=?a?L??????<?b???z???StT??JV[
????S?w??C?sZL??"?x?YM[??4h?'FE?gK???? )s2	?T SAkCH???j??	!?s?8?+@?2?~???????,??6??6????Kr1Qb??F8d!J??Qb?X??(??SL??\???i?4?c??r??
???????rV@?8q??????2A????z???B
IDBHD?q/????va???6X??CcB?Sd?????@?I?,%Z?~	?TF??9??nl???ZJq???L??xE??M??????;3?Y5P,?h?@?Y9)?h?d?B!:n???ZE3U??Q???????@?+?u??2?ZY?/??6o???c????$????&???
!0LD?|?
-??-<??$??B???/?`??HR|?D????G$?|)??0??????d)?#?}K???#???E?????G
??a?0^F??)9
?SYQU??F?T?b??{/)??+.????;R??@????D???F1O????w?D??!b???D????S?Dj?37?+-.?????Y
???????l?P??qU?
??*A?%"6???2A?
??,?-bj0?P???z????	?????,&3V??L[|ak
???a???!?E??RA7?Q???`?8??????5?????
????T<!I???a?2???5]??F??3?z?s??-ZeKJT)c???t+!??dh?? ???pl???x??Q;??'?	@??I?????]?J?}?&4=?a??z]?????|y????D????????4?????7VG??m???&?$?M???d$#X?c????c5?j+	u1?(Y?k???(???? ?A?n???Zw*??U
????P<C??C^??y{0=m6
?2G+??
58d,?
h;i?I?P	?M????bQ"TAC???c?	?t0??S?T?MH?@0"????;??S?P
???<?? ???(?Y?wh6iS?
?!|?
jP?	???
?E?T????$8???Q?x?:?mE??????pZE???p?^t1j$^????`?j?NT??????AO)??yu<z
?????{?x???/t?9?C)???}?????N?,?????ZK???,?*2*???I8?8???{1?p???{??x??2?6?ToJ	{??,???:?????????2?k"(P?)??&?5	C????H4
????c?
????h?V?H?<l0??y?8 v3? ?b0?R
P4?6&??q0z0 ?8?x?A?ar??q?????n|???q??a???
???h~?h???b? ???9IW?:Ed?q?5??a:?;CSa????e???qqH?a?r?????P??EClTF??&x{P??]
???0?b[hSz??(??*g??1??'?Tw?.?
h???*?J?????B?t}???4?!?fB?h`O?#XU??#hme1"C	?
?Q1(@c?eY\DN?4??
Wrw??a???$?F'?&%??C?5wq4??F
??@?S??JD?XX<ba?@?z?36?H??U????????M1??
X?1?gZP????Y???#I?????`EdM?E???h?"9?jt	?j?.1?Vj???P?TU????k@?dG?'Q?!r;?N????|?????5fc?? /????^]??)????\?B?AA???m:???i?4aX?;
?X?HM?5.?Ej?????QD?? ZV???p^]&|y?o?8?G?^??????1??k?"eM1??b/Fz#Q???|????m???0=???0??? ?7?f?)h
7??3$?	H?E]!Ol?
??S??)??7/'?e???O?{s$??.aB?I?AB*Q?U?+\No???v?8]?????O?Y1v??mty???#???8?r-?C
??K?\?f<=D??N??p??7X????????n??h??&?????T(?8?0?*?L!??(L??P?0!?????DP?????t??fR??Z?F???@?2?
?????k?b`
???xl"~T??????>j??
?,??`@lBQ??MK??b'????wy~`???QA??`?0???y?l|?9	Z?l???o?/??.???AW????J"CN?3	E)??P2?O????&I8a8IC?ub
J
?????>?Oi?k?Nm???8??&<IT?H?P???[???'?Oyws??b?????	???2??=+?3? ?d2c.??,$PO?2!??'?jQH?
??Cl???-Vxp???t?A???L??b??@?'??I??u?""/W?>
???i?
??Gd]Yj???????\??v??j????(j?S??`?
 ???}8K,?y?Ny=?jQEc`)??}t-4P??sl!	g^????Q??w?"U????`[??? ??P?Z?
??p&
??]W??????9????8
 ??Y\?`??M??~o??|S8m???T|?B?oS;l?L6l??*???u?????(l????,V??M????Iab???0)?AE??f?+??????nZl?$?J?y?E$?:?\vB??????z?2?>?=K!?
??8$???B???)P?D?E?a????7/}???e????fODg?
	?vrm???`??r???qr?$???k?L0/+!?G????
?D{??~????P?a??????A
???p +??cs ?
?	B?????C?!?=??d??
?$???????????,L3?fC&1??r????n?????????? ?$!&?Qv;?~??
??Q() 8"1
????1?X*?yh????O$??D??
??

J????!?/w7#?j	QqS????5j!?Q????K$???0?Y???????{`????%
???!?K?;???D?)?h}a???`R???9???C??	??j?c?7?}???_+>;?k3?C?Dq??H?%x?/????????t8?:X???????n??Pr?X?c)
m????I???b?L????*A?jq;?uaAO?x?C????????w???R??A???C???(??E0.?s
??(?8F??1?{??f????iWNtb???gd\???e7?cT?5zzz??3fR?g?br???3,?q?%D?7?????d??????,C`ph?????Tq??Z??3??k$|?4c???4??!FIbd??2i?? ???gs?????Pb????c?
h??9&$b,?7R???h?w??s}?c
??;x??%?????<???s?4??b-???<??h?e???
????D;???S???y??????wrY??
?o?%Wu
???F??~H?gM??%A,<d??O:??Gw???"-??????3?????*?$?(^?M??????????????:5?Wo??<s??Ln<?;??o;??v"????96????????z??H?
??d?L?f??q?B??|9?b at -?7ij????ST8????
H???V??????b?6?f?X2?3zJ&%????v?#H>O??Gm??????L#??8?s?$??r
?1???*?dbhL?????n??9?m!QbY???+?dn????L?v?v]3??Xj??4??`?x????gi?dx0p??B????T??
?????(7??BP???+I;9k?C?5?b_q?|t???'?h?c??d3?
??[?Kmr??5??!??x?????M????S?I"!?bMc???[?;&0w?mOM?.9?? ?????P$3?!3? ??)x??1X?NHdx!
B	3t?6H?MS21??????
%C???8??La!
?:d???R??[???:<e74?R?xi?:k4??:????$??e?g?}U?I??M?h"o=??w??]??l?j?C?X??7%.?.M????"sI?????%N?!??a--1???#???9?xa???Y???6FM??,???C??	X??Ci??l?m??????H???eqs<?
???y68?m??0?M??u"??s'lha?Da?$O????^<z?V0;0]^?I}??F??C?1?????8??6??{?Mr?"??g?8w?u=?Z
???&L7????;.?5????'?7H'?T#V?WsX???&fs.J??;;
!?^????f%??s?????Wn??!???y
x????+j?
???1?????????m??v]?*R??????t?L?%k???'c?x?U?WQ?l5]`[???i?6??????q
????D?????/hlZb?l}G??\?eNS???#??5+??R??]X???s?
???i3qa???!??N*????(P$6??Z??C?l'?a?%``nF????YLS?Q ????(?t?D???xr????^n-????? wr???[b]??1???/?'?#'?????:e?X3M?;pq?8???
)?^<":?j?????-y?El??"?YWq"????7??q8?1?n?I???????4???C??,???5Z? ??q???cZ??`??0????i??????m????????v:?k?"?#g?????????a??(?p?-???o?%?G(a???6!???????s?J???R
;??|?U??
?(??(?M/o?-?ii????M?lh? p??<{?J?D\?????qU?A???^?k??5=wR??@?3z???$a??E???`??gf?I????u??L???b*D4!?l[?Z?|!?1?u???S?MsC??????8H(?n??l???;????b??wT?=?XI????P??\?qc?k?l?
t-??
2TCpZc?????c??d??D??????????o??3?['?T{D?Z???M9???O???a?O?\????J?:cT???p(;?yY??;!z	???a6q>??81?X0?8????EM8r?$?*?|?j?v???=s}????0?g??T?H$w??V?LO?w???
??,?4????L???';?g?\??~S\?"??S@?7vz{n?*????c?~O?v??3??????6
?D?"KF?? ????????4
????
s
?h?9?;?T?[,????????????;?|8??
v6????`M????);S??
4P"??????`????????Ph)??h??#?U3UT?UM?}:b
?a*|????)?S??$?E?xBR?lQ?5!?H{D:???[??d??
6?!^??[n???T2???? zx?????j??z??????0I at E?V"???`???
Q ?)??R
4%X???lC?f?$ sTE?yCU?!)?U??V??4?i????wmB&L?@EBA???,???Dm????~x??????(3x?H?????F0Xo?i?"H??`S??A?#???????0^R???kV?C?D???E???_h?9G?X?(Z???X???/?_???F??*?Bl??L??'tAC???08??fQ????A?j???
?\????W
?@?@?U??e???????3?a???XcK{?????f?"X???????)^??w??IE?BpD#?-?@n?,??P?:i!&??E-???$$V?02D,r????3nxp??IgX??o??S????3?#?m??W4'!?n[?lu??V?h?????&D?U??b??^'?????#???$o?x??
?u:??????l ?Dr?ps????e2B????!?W??2qf??????D?S????q??????2K+|??-?z{+??z?f???M????j????:??a?]??f?0?]<???????m????R?Z$??L`?5gy:???7??=?-??:??YKt?;p?\?5?????<2?
}??q?pc?'?0??BMZ2b]e[#?OC?
?gI????^`???#??Nw??????	?$5&????)Z??q????b?f??Ap??????A?U????u"h????Sb?GMCZ?????<?.S?????????hZ9?`???/m??z!z;
?2kfn????C)??+:9??7]???)_r?v5\??}"?\?.????Q?v??%_cIA?^}???j?Wv?J?TC?5??B?t???d??Zg?	??o)??V_m6??x0v?	AYvc2?d????;te?b?y?`(0?f?
????BkH-?c+?O#0aC$ix???&A??@??.
i?A`so
?u3A4????[??p?81??.%???
(???D?3?!???[3???????z)?%??k??9?7?9)p83R?-??????	RH??B?4?AFELTjsoiRy?3?ZS%#1JJ!????????`|?Ji?c??_d?U]?q??{??2???T?)??s? P
%E??1mM:?3~~b=??A?D?@d?D(7? &???(tq??????s????KR???(?E<h???jm?D???x??*?{??]^????z?	"'3?;K??B*???6x?n?n?$?g"
??y?bBd@??"QN?w?h?_|Sr8?#?????
????????P?7?t????4??@,???O??6?????:h?
?8B??e
??dQ?a???k?B.??-???????M??\ZW??????s?2??g.?=:?????qR{??5??????????????;v!Tl(?&??'
$S]3/\?,?	?imzi?????t)?U?[?5?0s?0:
?v&?
?6?YM
?X,
&Q?itf!j???)
Qo*L??FI2?eVb-2??s?F??Z??urq?\???n????Cy?M?
?c6?Me?BHuo?l?k?jI???t????wge??9	?U???XC7 Wr?s?d??m?"??/4????{???
rHA?l?Gbq?Hk??JK4S???????d???
????9?V)??m?
 ??C/??33??,?)?uEE]i=.C
R3L?5??c?q?N?}????q? ??
?p?V?6!A?UT at ED1$1?q?:???	?	?
ArP????
bF?X?);f??6?V?R?C???'n??
q?-*P.??0?>?k-?f?'4'???!??
J??T??0
??*R10\????t?.????A??h?&??????A???tY?L??q??&??JC???~??{?2?\????Q?C?;??>?|?|z???V9f)D?|?????2@
?
0C?SX=?a-?w(?Y
@?_?]yq????a????R?y0e-
+K


?e?0`pI?????00??
?jn?????GV:?e?w??	;!?YK??(?J???l?
?K

1n?????x)?>u????q????l=K"?fb?????
???b?B??U?m
W?#s??p?=
????%J????????????4?0?)???>

?????\
?*?.l?j?J\?|?r?1#
]rr4?*G8?????$a?8FX?H?k???Hd683???7F?(??	?B????H?T?5?8?`?????lHL2H?Cgh0?i?????z4.
(??????+h?'??*M&??F???.HX??U??? ?A? ?P?A???.?:p?m?cf&9?H?????8g`T???L???[(?Gp?@@f&??e??9aL1#;'ycLn???????D?A?c??0??Z?0??!?dYa??P9?Bb6	??	$@?cC?ry???<?UDk?8F?????X??c????Q!??#Ts ??a?P?!{?f	?.??4&s{???4??????O)???%?mr?H(A????
?
D?S??$??k"???x?]?X??"!???(Q?L)"
R??!8???8]
F;8[?dHM??U${f?2???[z
????	?q??Q]2??#?=??h??&????!?0?kn?\?????{a?P?b?|"?fO?K??	????$SJ|??D?n?:?r
i,??
$?#R
???8????M??yt
??
Y?OV?<?????&~?Op??5????%?THj0)J)BhJ	i ?????g????8Z??j^?D???$z?`?
??N'C;??	?I??F:????
Of:??"}?C?(?e????
dly??0A?d\!???6P?t?)??(t???????u'XW	:??~?	?
?V???L?:@i?N?H11Des
??!??j??H?`?4???? 36??Hh?????????]	i?? ` ???x??)6K?n
????n.8?xrj??0??H?14???N??1????`?4:?kjF&b???????&??????x?B#z)88La?????0???KS0O?????^??0t??0E?Ecq?V?eIS???Z??????,?????mI#?F???Lc?&????Z??
RQ?+IG????
M4??
????N???H????Q?8?MF.
e[i,s??????\oZbW?5%Y???"i2?^?\q??^???.??]?????
??Q???
??\?v?z?!@??:?
?X?P??
~??$? ??z??eI?"?e?*p??
?$??h??*?G??y?V5??`??????^?v?}??k???UbK(???
(?b?@<{??!4??K?1?????6K??i69s??1??=D???P?c?;??b?"??P?-??&?L442??]?????eD9???l?
?	B?!?T???Q?f4D?5??+
%pc???#.??8?.Td?b`??ZmZ	fQ???3?0?"n???t$????:??@aJ
#??I54?]?1GB??(PP}8??	??????????J
??J?
+?{?*??l-C`>UTRB??fa?a??\
%&	???S@?H?Z?? ?L?Z??N????-???c_;"C?#
????h_??>?K?s???????D6{?lv?+l&???z???B4????m+-?K0?-?b????&?? riMi?Aet@?A?"?P?f""p0
u??v?6???_?J}Rd??(?Ar
)?	??Q????DT='??0??^?@'
??;H8F?!2????@
H*??
?(1+@?4(L?R???N$?	0?4?#B-R?4?Q-(?B?L?(&08?X?}??5?????)PUP_o(?@?%	T?AC1*?O?T?E??t???C??????T??X8'?]??
A?
?D??0LL??P@??b??AD?TQ?Xg????f????
??
??P?
?9p1*???:8F#??Sb??U??
4B8H?`???}??CP)i??rH?}
)0oCHD???!D?%???P????8
?????u?c??????XDm???_?T(?Y??????M??qV?????%??X
?I~!?@?
???8?s?CC????t0:Q????m+$H2E30?z???$Z?????!?1?H??2????a?#H???T???{?)?????n?OA???\?????E
EA?QM?2J?&CTu"?
-"?2%? ??
DP\(,G?-??.??an?=?RFe`?W????40??$??M??#i?Q3RK??G?BW?baX?Q??d*?i???
,4q???IU
4?
!LMV?c$2L????B	?J&`E?C!2^?4Wv??F6a ?}??@??J??5]T?E?
?h?:q?	???;?,? 2X?bz??j
IHl?????j2???
4?"???@S? ?>?!9%?G??!???R?9?SP^a???^0?HHD(?????p
@?C?????E??o?B?E9???n?j}?|?F???
M???Oy???:??f??ZB!???&?W>x???D??<??
????0???!?????4??!??	?C??$?1'cdp?.??$??#??C???xN?#?v?2(q'???y9??]N<?$f??????C???????'2??
?
I?i6??E?j?3??UZu?L`p?S?D??G(m??C?CB?X>?+?\??dx??Ah??rU??????rt
|????K?}??Ei?tZ
a????????0
?p`?(??54?????	????{?8????`7H!H??4Cs????czs?? C????Q?vO????????5??g???8??\????????Oh??l??F??5?+?4??]n??????????VteG1"d?@27?????!?!???h?@?Z(v??gr?:??xn????0????WF?yh??c?5U?b???&?????8?????<??&??fX?????M?E?i?l??
 3????8l??nw5???????u?5?v?Tg?`??1?B??OM*t??ms,<??C^3???$]??q?)?
?????-?e?d?????????!???e?S??Q???]'&????9
'?
?f?	??
???&??'?Gd@?y??"}???!\ &*?????A???8{p?A^i2??&?8?m*??6f?>?~???#????M????U??^a??8?.7????_t??+A????p?;?-?I???n?CF1$?`?3V?????u??s|????i???4?bI??j?H?<?|
???b%?h??l	?Qe?,?Q?r?c?y?????!??i?M?RK$?????L?S?+???%#?h?B?8???`?
+?P?8z ?!
?*?????O/??w?P
E$??3,EJ?I	)E5DE??D?DI#II at KH?R?%!)T?*SD)?4PT?T$T?S
$K"?-4?L???(T4?
)L%$%ST$??R
??f??=
?CA`?+??,x??#????f?P`@?.??Y(
M?,??}?i?@??h$	!?"B?J;?%)Q???">X1(Q??"	?fA?H&a ??? ????$?????h?????????XBd????`??I?F
? ?b(BI1p????!?0C?E=??*i???jQ?????{???<???J?J?????????l?9/????Bh=????
?`Kb?i@?! A??
??Q?]?pJ?D???????	P?*???]??g{<??}???r}?Qw=?9???(??eC?&|??;?k???KF???
V??JyWCuI8?M?":a??,
???FD?? ???UO?'q?M???F???Y?U?tu?}f?"?1
???QS??????MT? ??GCDH??~oW?L?^?[#~???
?z??wf?w?~,=KLz?"????:B~I???rdF.:B?Q??4?=??YF??BT?YP??11?cz?G?:L`:?i??(??
????m?'"J???F4??? ?1`?6364?P?(?c???`R&?A1?<??"?j????? ???4X????lcx?^H?=j?0yE?????PR?@?_???M?????
H?? 

	g3:!?C?tg?????S'?M#?q?`???H
}(
?0??>?OT\ bT? `??i???T9??IAT
?
?????]"???p??Q
????gi?;????X?!`c?f(FT4D?cS
hz?pp$|?
@???#?????Q???`nQ1)M?Y0??`???????5X???M??X?xL??
??/???????l%????os???A???&??DR=n?V????U?????4?8Lx?6!?%?C? ???@3T???
T?A6+???A5&K?S?9s8??????:?
??@(?E

-?LS?????L???iQF4?!??tAI?
????QI?>(???;v/?????|
??I?v??q?a	q??
E"wN??
f9??&??L?d?+?9MHiQ?J?SBG???$?????@??M?D?N?:?}?5}%W?????=a?n/l?	
d	?zR??C?Q>????hy?????*?r???
)??h?9????0? .?G}/?&???a?A$KA??????o???????-~!??RvL??pR!B$?A??:EX?!i8????$???l'2?;???88Ii ?A?f??=????????u????v?`? ?a?J??????a??:?????Z????2z???S?~2?pZ?Zg\??`
6?j
M.??WfA?C?//??????????YExK?????W?
Xo{#"?C????6?$9???"0??hb??z?^m?V???R?f4aG?C?J/8?;?^??X?1?BD5789!ITCA4?,?@d??M(C?????9?0b}r??d???2Q?'??p?>G?KRt-?
HAn???B?
I
^C?????@?!3a?qD&?x??hsQ?Rm?Ox?????A??`?#?Q	??O???95?xC=???C????qz/????4?$?K?????C?]I???<
?	
?~c_?????7?'?;tjh)? +????(C??V~Vu?W????y?????"jh???8??A???a
Y?{???u at 9]n?V????r9?Bj???<)??!hz???G??`wb???Q7P?
C??!L+????0f?d7?a?????k???i?xe)?~>
?-b05c(?x?N???D????y`??|D??Ek@??(??????}???D?=B?i?m?????W9U??oxRUD?0?UD'^?&?6s??*???>8I???nl`?d??|'l????J???B?%??C(D????5?P??;??)@?d??((D? a?jdr??????;(???D???x~$5'???
?*~+T5??7???]?5?????$1?????$????#A???+n??q?r??:9yfgn??&?[??
?Wj?A?
l`??8\?]?9?u?-???? x???)??r?:
??.#??L??!?f????:?PY?????:"??=y???????zs??2?G1S
|n?rXi??Vu????y{~?????Sr|?p??M??????t,?qHL
(#??(p?Z?P=@e"?C???
)!??d
&K@?*1)m?"?$5?Lf?+?8?;;k4???f
$PpY????
?????6?	?????
?*???^4P??JC??t??R??
b8???N?<???D&U????v??^??????-;N????sc?)tU?X?>?u?????r!2r0?? MO)$]?rQ?`U?O?????oQ??D;j?i?d??``?3`??????z?+?LC$tS1K#?baP^??????MC"?{??0????????y???@?>E????*??r?,??d{?sTs???B??t?(?(?c?B?E??Z??q???$?????M
??p?$:???????"?????i??]eEfW2?? }^`?}??|?????Q_b??J'a,?>`??O??=.??z???X??MQI???D??!?????e??1?h??Q???2&QV"?_[???%??"3??0n?n??b????WML?Q@;?l?{???@B????

^{G????@???!8??'?Oi??]???m?r?_y_`?)?$??q??{?5"??????L|^P?
?B??
?e??}??????%"?V 
s??L?p?IdB!??aD4??&?	'0???8?h

i???$??Y??)	??BL0??
(??d?
??p at w0u?6c??Zi??/?F%??(???jT??P?m????g???h p??????[^?C?????2?F??
?P?T???2?Jl??C ??
?N??z.??-@???i?K???
?i?
?lY??(4?;t?5???<a?	????v???p::dW?,?\???6hq??x?
E?`A?
?L1??&L 4`?#???bl+?D3R,?c
?+???????#D??
?m???????F+?????
SJ??iTx0w(4???

A8 "S?	? ?1?lpB$q??^?????A?L?>?LcDcN?#UZ"?3??	$?(
ih?d*C??H?j??6a???	L?R???1?'??~~????C?cT?S????
2P?,?$??
~??
r??Z?e
y?P?(B)?
F~???G??v??O???{[ap?(??+??'?,"zL?8???!???C?e ??R???nj,z?8H?8N?$??5????.?????X??r\.?{?'?l??;(k??|??`+???`D?]C???:?!?<?
???D???
???I`?*E?F?ThP`?JZ(E"T?E2" ?T?)bI%?"h???R????j?B?

z??D>?!???F(??Cb??!??GK?l9?????l??>p????%0?mc?:w??Q?`%????
~b?+xK???!H:N?????v??lP??0?.??????.HP??<??`h9???? ????h/?
??N?Y??C??#?'?
??? wB+?*?CB9??5?,??(?N?x???
|?2???? !y??_a?<?
HiaQ??;FZJ????I?@?n4&??T????Z?[m???b?h?1??BD@?v?Q??
i?C??"i4?9?_4T
?h???UQ]e??c??Q'N???%A?v?5?$?@??HZ'?F??
R?|??dU?U$??8???O?_zr??8??M?SQB?	?!?????PM????"$"??&
rF??9Tr???O)??w?X2??":????0???Q?ih?2?0??1??b!?"Dy%??J??P????,w??Z+qA??(??@
H??????M??????TP??QDH?-5"n@???f??a?????b??v@??Y???H?a??f?i%??
?D?v?5?!???l<?t;?:?!?ul??@l?)?b?HqS??0?G??;??5????
H?p??!E
??|??:a????C??4??0?\??l2i??	??(w?;#??4l
?.??T??6??k???.[*?(??D??j)????N?(??Mwp`wf?F???? 	bb%??6??9????z'L?
}?/<??tb|6??!??# 2?p(??`??"o??????@?
?a??S???
X???;?Y????t???4???	??[??@????BZrf??w?)?5???D$A1?$C?w???]?bZ??3????}??e?C8u?????/Ac???????#????L?????Z@??m;?pr??Y0ZV??%???<?C@:?~?@??=s#?F??????C???
?`???r???A????1??N?"S$???s ????_????]???
s-?3j??-`?R"??S???P?jt>??V??BsO[???"M???o?????? 0????:??????????Qx~0?G?$??q?hq?BeH"H"?!)Z??[?Z???????)Wp???0H`??0???d?@zJA?N?)H
%?{!?????NgT??
61??1$J???Y-?"w,+Dv??0?aA??????P1?

?%P??)~
?)K?ZP??6<<??Q?'8????
??PUELMS?tQ_????=?9??R??Rb?LM?T?f?f?0~??pz?(????<N??{???}??"&??Pw1??>B'e??Z?B??P:H?"ng
?M???
?) ??(???e?I?D?P_UJZa??
JD??Y?3???9 8?
?T?Q V@?

??
}t@?DE%e$d?""Q??=P:1v?G???X?!??Y????	f?(W?1??(?aN?e????? ?fB	??#1H???@????H??	?yx/?
A????02??[3jz?H?r???;?I`?K#???| yI??%$M???W?1???
1?mP$:??w?????R?Y???T?"?U"?I"`BiiI??DJF?@??X
????P???f?6C?#,?1?	j"?????B']?jJ?d???C,?!????MK4????Pd4?jj$???
\+??lc?i??pYC' $?????4dFv?Li??A2qD??Ji??.??"gD9?E4w?5k ?!S:]?6????#cZ??{?oR???u?@?	?4K+
F???,??!??)I??????.??$
?	?l???-b??)J????f&?"'m????d?L"?d ??S??????q!?6?V	?@+-????d? ?F??
6?0r0?UZ)?
t?

R?"???J!?i??J?Xb@

A(BIRHe???w?RI-_??RH&
?dPI~?65
3?w???????`ZO???c?????|e??????L?/??ccI0??v??6h??2=?bX0T!?M?P???PY???&
?:{??TQ5I?aL???}??????h?Tc??c??a?!?JQ~"B??U'"z?????9H5?C?N?Y???182??? ?]?
?fW\1?cF?R?
g??P4kgGr
??Dh?2?s?/O????/??????	G?

pa??!?cH0?3~q">24^j??R???^8p???'???0s??#?Bf-z?y???T?Py??_
?5$#$??????O2??l@?_b????c??\????4VY2l;%H???U????|?[a?A
i4??D??[
l?FSB-??p?s?0Y?L?i?w?!???
?|&Al?+????)E3{%o???????
9#??,??hp???_????xWti=??1]3?????X???4??C?Y??x???u?f?	?M??\???z$?^QzAZ?4?F?n?sLx95??#?Q:?t?????%?wA`O?wp??5?<d&??\??y?
?????lY????.?????8????il .?
?*??i??htYtt?????{?D;?9???X???y?^??H????3???Y?U?a?k?c??R0$?	??n~c?6?????p??O{qa??Ga3_?y??????o??W?O???>?????????8????W???_??l?????????????????_?_??tb}-w????????????????????
???tf?j????Q.j)??????]?3?lb??B??N8B?Cm?rd?f??8T?%???n228?$?yLq???w????R$???????h5????U?TA?s?.????
?l??
?T<d
??$
Ba?z???T??[(?N???:??I;????f?H??????e?gd??F#?vXx??????] ??5??~S??????"( C??4??M@?"?u??334r{?_??U???&?F?>?SS?!?????????=????a???m??Ukm?,'<? W??N?!?0]
??A?mH???????V?D
??pD???!?EK;$?????@?"t???
??	??????H?C?j?)x?????4????L?i?:?(?'?????2I'??$h?u?1????????|???
???

>?D2@$b?0?8?xC2?sw?hM?S? '@@1

?????@?Dre?W?Q??0??/~4|???F????Xp?X1r??*?NEpb??
&%?a?8?Y.)u$?"??L?d???0???Xw{??WU{??D4SzA5??<??`t%lm?-?)?
?&?'LnA??D
P?? ???????>?O'?~??????C
u??p??'?88?"!?I??b???r;????!?_?D?u4?
???c?????HAPY?d4HQ$@a?a+??,?EKJA???9fDw???YS???'?`????a???H??E>`k???v?????PbB(XW???^?N??7o?$?$??????P?a?9l?)????????Q?'?wt??x?G?/?t??4??8??lBx???D?:??i?k&?????
=NM?P?{???PUd??d??F???D??$?_T????B?
D?(f?1?X@D?0r?$????s7??!????y???U4a??c???7N???p(?L?	&,R??BcE?F8??1???? ?0jt?Ca
6??0?$??44?IP?f
4?21A?l$??(????Z
?LH?n:?*?{?]@?
b????f?d???`?h??T)F???<???kY.?6`?a
?*????(A?????`??BR#?A?
4??@9?^???5FA?&???J:???,?M=\h?D??C
P??[?<?2????Y!"e?dd
}(???`?I?"?A?????? ?
`?$e4m?,??I?2?lY???t???I0b%?a?)&h???;???p???lM???,{??H?UOL?1a?'?x????Y??30?	"
?
?V????B5k??\C\?"??#?
?3@?6m???????"?m9?.?`?
??K0?2??jX
Hc?i%US@????
?i?X??
=?)??????t?$?$U?(?C??7??2?D???:Z1???d?_?d???	???0?Z?-?.?:?????HY??av
??.(C???-
??>	????0????)?H1`aZV?SY?d????t?;???Q????#?d?????)?t]????o??????FE#!a????
????c??o?D#$d @??"P?3!
?@???
?qA??lH??6?o????+???N??????(?8
s?tq??>h&;(;???y???iy#?9ru?C?Ic???X7?%2?c??	I??T?j-r)????6?<"??|?}SI)
Xz?`hq?iX?FDv?????????;rk??p?>B??W?)??a?UYk_9?Q??.?t????Ey???S???se??n?@??
??2?+??
m?q?X?Q?_S?	\j?F?X&G#+sxD?"?	?M0??$Hn?.q??*?K?nf ??6m????Q4C???S??????{?
????P?"???,=??4
5G ???$?
6?wfh0??D???P>?
???q?}?I2???B?
?A?????4?O&Bd(ShB??4h??^????	??RRZ??	wL??$`???n#@???oj??3Y????N?:?\????x?6/????Z
h???4?qB?
????)?
?????Z??X?#??N??
???l?&??
45???????6?x?|????A?B??7?!?s4O?D?4?G??[U,m??d?8?f??
?6:D?S?&?U?>@;????PQh`?:U?
?)#????f(?'0R?b?e@????Q??*?*?%(`J`??q??IMA??
a??f??=?Oh5)?C?????"/H=2?K?
?C
W$",?????rD?li??iS???pP????6?dd
???B??(tY	???`q ne???R??
??Jw
$????xn?G??????9e?>?Ci>??<??;'??
d!???:4?5c???u?O??~??????pu[??Mh????v?9 )mR?	u??4r9H??6?C?uo_?:??^??$F???I@?I?Y`?Z4????;R}?b???<?T.H~yi?S?3QP3bJ?
?-???q?w6????I??2&?\?2?\#?????n??bmy?4v?`?????
(?&???<B??A??;???9BB???;c??@?$L3v?L??$-??+?r?f??4'?I????!?+??
+???9?"?4????l?Q\?.f????;?o???c?N??0n?o??*3??3????Z2)OG??`???Q%\2 ??}?c?"???B??????1?
???????r???????6??p')31/???"?????
3?3?A??4?lm?(?Y????sz1??Xj?/????8?)???ejF??C?h]X??????5???3?t?????T?,1	*?????l?&?G??h61???'i
c
/,??u|???????r?mi0?x?dd?1/#*??????J????]zZ??7??l8q|-?t???J3]?????<???hD#????b?J6? ??A
??CJ?2?_<??o??+W?M?rh-??m?gx?d?U??????ht?v?????2k?H??p?o?FY?\?????9lv???;??b????I??h???v?q??-?0????i_A????????]???pic#"?\??`v,U??2?x??;?1{J?m??u???1??E??.????a?8-?P?#?a??dT"????-??>4w?FrZIgBb?\
t?j[?"?=?L???O?V;<?zQ????rA????AC?<?'??]?????>?Z at J???
?	????_8k????????p???Hr?W?|??X??4]??????v=??:?pY???6]???uq????????s?????5"?E, ??????`?7?fe?C?W*&M*?|pt7?8?=(fF?"J???w?.j3?????C8???T?YV?K?????
}?_-F?~??J???mG??M?~??
|1US1(??B??g??*?1??R,?c?F?8=???i?P??@/????$?Y_????e??6???
~0=??????l?Oob	?????:u????3????A??\B=O*???V?-v):????4i?F????<j?f?F??Z??|+B?fM??')?h??24?????8?
?89???LY?0 f
%)????XC?l???????}PC??|6?*^?)*}?R?????$??9=&?qA?????r"C??!l4,9
?0t
??B???K????@<ah^JU?:
??-Np??i=???+?w?4]????#C?1?r	??	?`Fqf<]??iE"`i$????4??[UJ???*<??b?`???
???`?j???Y?X?o? Z?1?N??}?;"??0?Q`	F!???i?i?%?P????B?,1CPaH? a&?i"9 ????'????Q??0????????b+????=??i??dC???0%?=???_,Jn?
B??(??G??D????#?k?
=?9U@??_?qJ{?\??r ? H???^`?{??n:fC;??`?9?I?]?s???	?????M?(??h???A???????{????iS?h????0a% bI???dr?????M?X?R????~?t?uL?Gt????
????b?????ut?w0??\??@??*EP???)??w6?4"D	?x??-???Z?d??B7?H0L???????C b4?R??u~g6
???$&s??(*?<?
"E"<!?cf?E4
?=1<B?:?
I&?`??(P=x`P?0gO???L0?@???t?)??IB???g??A$?5???;?i?????
ZS !?B?????
???@???"??Xhv;~????8I(??D?c??]68?B}???w/??>?M???i?bb?l~????0~????????
?@ ???eb??????s???d?1JWH#]?uY?r#X0b4?B"D?$???C$:?i??bzd!Xai>P3?G??a(??????????
?;?W?
zAx at W?nC??A????T???T???1Mr??IcP2?pL?0u??y?
bD?P?MX9?8FP??M(????^,??b!??Ru??k??j(?
/????m???b,Y??%@??y?u0J.??^??}??p?????????1????B??H?
X(F??%??Jm7
2??1Sx3?:????:?.?8?Z??w4ej??"?6?`7=??|?GM/!M5I?;R?0;6U???1???vj`?e?<c???v??(p?7?o?q*2????UHS?j`z?p??r?	97h?&qt???0`T8R????'X?Zr?Jv???ff25?f?1
@?AI??Zi?Z?. e? z?o<???c:???????I76<t5?Z??q????*j?????*s#?K???']p?H?q?:???8?b?N??0????<
z???&??$0l$?rl??\?`w?YA?a?7?Uyi?????ZX?????7?zg?Q#ar???^?i?T??`?\bs
????LE4xim?7????tY?I????utp??
??`*??[d????nd?o
?#x??ZLX?h#??
???I"??$:?(??"$r
??ks&p5?*?b]:[?cSwff.m?=??????
?;??? 8#??@I?????6SE6H?Ip+?F???e?iMk,?n&]??
0J??X???jb??Yjz?\??d????5???E????}*X?cG5?R)??????
?L?$"x'??S?b???*t????U=?????j;????a?@???C#5%??m@d at k????e??`-0<(Wz??????0?????\bs
??6?Rt?$!*4A??????gx????wEc??o?M?],p?Ck*?8+:jV6?X????l?6Y?Ah?!???^??2g????
?s? ?Rl???R??D7T?????p?5???5?0??;sw???Ls????:????<TH??:
0?XS??I?|BY0x?FQ-??.?'2)CCAzX?Xh???? X?a
?8K??
???0c????'????HU~??A58P?t??"?
j??'@c
h$=i?rOU??????!?m at 9p?	??@?aI???B??R????bK?T~
`]?e?	????1????9?1????pq???R?H?hK%?????T?&Prvl??S???N??a??M~?$??(h??M???w???o???n?
a?*?-?<?P?A?_????2?~ ?8'?(h??}???????M\e?\??n????(d????{t
??p??!?8+?Z??*?d??l;Ft?A^K??O?J?Ss???.?k??|P??????}P?VT"?5???????!?L
%4%w?????w??y?x%X|??????6b???]H???H??(@??M+?+????M"?????&?!??"$?"P?	?
 >?`nl??h&)???t?ww?H^8???[???+

??+?U!H?E|?????DK?v?R?$B9V?f)@l?`2U???? ???B?0n??Mfd?=$?_???0L?"rJd!@??????
S?
???9?sE??b????DO??##j?@<Js6?2Q?!q?L
??jq?g( ? ?"?J
i?????HG??$??>??H?$?I???4????]??m??PS?!?P	??u1@`<<?qK???2p-??A
?
???
?m??4??F???*?WP?S???hF	A ???X
z??t??????2???Ac?(5H??$2??E2??m??????TcY?bCFA?d ?YJ?kQ&BT?-S??7X?z?T?*v$?h??f
!?!???v/?&`=???`?(J8B?0?B?c1TT? w63HB?B?J%??S
6Y??J????? iV?*??j?I? h?? ?S?;?0??????C`!)??4
?!???l?s9Tb???'?	?kF??Qi8????wC??!?E?X?
??G?? GY?MG?.????T? 
e????C???wL=Y?>??8??{???
Y?P?b???X?D???? ?3Krx;ox at Qv
?S?JuW?? ??!?Q??
??{?i?$??(????X+????8D???mo???????b??a?y?????WgY:0Py?C???2"??&?DLU?@-:?K??K??yf?\:6?V}$-!W?
?
/2(B?"??b	?y????_?
????#S"???f|??`SrH0`1????

J?P???a?5
?d??%(?C????yK??	?H#?&?J? H?
X|~?SQ
S2,
:u(H0'H'????O???{?????!?:?????P??CJ,????I
?S??Bf??G??wa?qC9?
9?*????6?p???O$r?&??R?$??1???$??3??/r?AHZs?|????????P?E1?A????=??*?A5]??
M0L??AG?2??{??????,?0?2}*??"k?s@?L?"??%Ot?x?$?&?
??M???S[go???`??M24??+O$??C??BH??????(O??8??X???M%?>???A???x??G$	?? J?????>?????U?A3a&%???BIk???C?J??????????^7!??CrT{)???H4
L4PY???`??#??????????
i??1
??!?"(d?#!?d'???u9,?
?4?cJ?? ????P
?>?X?l??U??O?&??
?>)4??))??&?"`??81??@?G?p???6BqP????0?????8<*???<???t??????e?
??????Q????s2x}/?(?U4OFT7z?????}y???!????D?$i?1???oSa?? L?SN_??N#z!?]?????3q=?U??+Q??;?O7???????b???
h?$?M	
	??	????8U7??a?ZY?')???TA
H?I?S? |??
1?b$?4&??`;tS?A/M?#????Gyv?G??@pFa??$CD???0
H???4 ?\?1
?s???vQB6AH!NK?N9???D[3????#"U\??3???;Z??1???z???h?H?nw???%?-U{E???z?C?4GC?_??{?SC???fu??@?N?:?
?:?'?????$[???[?B8???u?9?(4?ZV?&96?????K[aDX??Ud?2g
_?1
??|?e??:?2(>???G??S??4!?9??EX??R$$A?)?????@3??NKF?,?KJ:?U$??#G??
?/??/h?+?p?S}??w???????b?Wr2?g???4??	-?6xs??b>?"3:??Su_?h??"#?"b?d?_SY??UM?N??ye?x?j9d?b???
A???5??L6N?:????!r??v&?d5??$??6e???????????l?k??{??????5?N?L?5M?s??QZB#D??\?????)??F*\G=*??3@???Ce+???j?bq&????2?4=??C:E?D?h?p
??'s??iAH?k?#<EF?H??
$?????5?\????Z
_4??]?k;A??M0(28???8A?
}?2?$A???:Q??Yk??Y??A~?
@?
 ?#???? ,s@????US?"?,I?
s??/j??D#? "?p@?$0c????A???a???Q?O??@?!?
%?(J???j*(B?????~x????????????h?"??*i????(?*??b"Bj
b??????&L??*??b (?!?L?0
b??a????=?Xs?Rb????c?VX&S???yO???????	??!?c?4??c?G?????Q????bQ?t??-?W??	?U?
?K????`???;???G????,???C?G?XA?
|<???????0??4??n?fO???RP?,?YiS???????V

Index: pam_mount.spec
===================================================================
RCS file: /cvs/extras/rpms/pam_mount/devel/pam_mount.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pam_mount.spec	2 Jan 2006 04:53:30 -0000	1.10
+++ pam_mount.spec	3 Apr 2006 00:33:11 -0000	1.11
@@ -1,10 +1,11 @@
 Summary: A PAM module that can mount volumes for a user session
 Name: pam_mount
-Version: 0.11.0
+Version: 0.13.0
 Release: 1
 License: LGPL
 Group: System Environment/Base
 Source: http://prdownloads.sourceforge.net/pam-mount/%{name}-%{version}.tbz2
+Patch0: pam_mount-0.13.0-loop.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: http://pam-mount.sourceforge.net/
 Requires: pam
@@ -50,17 +51,16 @@
 
 
 %setup
+%patch0 -p1
 
 
 %build
-# See BZ 174190 for why this definition is required.
-export CFLAGS=-I/lib/modules/`uname -r`/build/include/
 %configure --libdir=/%{_lib}
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%makeinstall libdir=/%{_lib}
+%makeinstall libdir=/${RPM_BUILD_ROOT}/%{_lib}
 mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/security
 mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/selinux/strict/src/policy/macros
 mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/selinux/strict/src/policy/file_contexts/misc
@@ -97,6 +97,11 @@
 
 
 %changelog
+* Sun Apr 02 2006 W. Michael Petullo <mike[@]flyn.org> - 0.13.0-1
+   - Updated to pam_mount 0.13.0.
+   - Added patch to allow to build with local loop.h (see RH BZ 174190.)
+   - Ensure module installed in RPM_BUILD_ROOT when building package.
+
 * Sun Jan 01 2006 W. Michael Petullo <mike[@]flyn.org> - 0.11.0-1
    - Updated to pam_mount 0.11.0.
    - Mike Petullo is no longer the up-stream maintainer.


--- pam_mount-0.11.0.tbz2 DELETED ---



From fedora-extras-commits at redhat.com  Mon Apr  3 01:33:35 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Sun,  2 Apr 2006 18:33:35 -0700
Subject: rpms/pam_mount import.log,1.15,1.16
Message-ID: <200604030134.k331Y76v015813@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/pam_mount
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15771

Modified Files:
	import.log 
Log Message:
auto-import pam_mount-0.13.0-2 on branch devel from pam_mount-0.13.0-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pam_mount/import.log,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- import.log	3 Apr 2006 00:33:11 -0000	1.15
+++ import.log	3 Apr 2006 01:33:35 -0000	1.16
@@ -12,3 +12,4 @@
 pam_mount-0_9_25-5:HEAD:pam_mount-0.9.25-5.src.rpm:1132804079
 pam_mount-0_11_0-1:HEAD:pam_mount-0.11.0-1.src.rpm:1136177590
 pam_mount-0_13_0-1:HEAD:pam_mount-0.13.0-1.src.rpm:1144024378
+pam_mount-0_13_0-2:HEAD:pam_mount-0.13.0-2.src.rpm:1144028006



From fedora-extras-commits at redhat.com  Mon Apr  3 01:33:36 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Sun,  2 Apr 2006 18:33:36 -0700
Subject: rpms/pam_mount/devel pam_mount.spec,1.11,1.12
Message-ID: <200604030134.k331Y8rl015816@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/pam_mount/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15771/devel

Modified Files:
	pam_mount.spec 
Log Message:
auto-import pam_mount-0.13.0-2 on branch devel from pam_mount-0.13.0-2.src.rpm


Index: pam_mount.spec
===================================================================
RCS file: /cvs/extras/rpms/pam_mount/devel/pam_mount.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pam_mount.spec	3 Apr 2006 00:33:11 -0000	1.11
+++ pam_mount.spec	3 Apr 2006 01:33:36 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: A PAM module that can mount volumes for a user session
 Name: pam_mount
 Version: 0.13.0
-Release: 1
+Release: 2
 License: LGPL
 Group: System Environment/Base
 Source: http://prdownloads.sourceforge.net/pam-mount/%{name}-%{version}.tbz2
@@ -64,9 +64,9 @@
 mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/security
 mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/selinux/strict/src/policy/macros
 mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/selinux/strict/src/policy/file_contexts/misc
-install --owner=root --group=root --mode=0644 config/pam_mount.conf ${RPM_BUILD_ROOT}/%{_sysconfdir}/security
-install --owner=root --group=root --mode=0644 config/pam_mount_macros.te ${RPM_BUILD_ROOT}/%{_sysconfdir}/selinux/strict/src/policy/macros
-install --owner=root --group=root --mode=0644 config/pam_mount.fc ${RPM_BUILD_ROOT}/%{_sysconfdir}/selinux/strict/src/policy/file_contexts/misc
+install --mode=0644 config/pam_mount.conf ${RPM_BUILD_ROOT}/%{_sysconfdir}/security
+install --mode=0644 config/pam_mount_macros.te ${RPM_BUILD_ROOT}/%{_sysconfdir}/selinux/strict/src/policy/macros
+install --mode=0644 config/pam_mount.fc ${RPM_BUILD_ROOT}/%{_sysconfdir}/selinux/strict/src/policy/file_contexts/misc
 rm -f ${RPM_BUILD_ROOT}/%{_lib}/security/pam_mount.a
 rm -f ${RPM_BUILD_ROOT}/%{_lib}/security/pam_mount.la
 
@@ -97,6 +97,9 @@
 
 
 %changelog
+* Sun Apr 02 2006 W. Michael Petullo <mike[@]flyn.org> - 0.13.0-2
+   - Don't use --owner=root or --group=root on install.
+
 * Sun Apr 02 2006 W. Michael Petullo <mike[@]flyn.org> - 0.13.0-1
    - Updated to pam_mount 0.13.0.
    - Added patch to allow to build with local loop.h (see RH BZ 174190.)



From fedora-extras-commits at redhat.com  Mon Apr  3 01:54:09 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  2 Apr 2006 18:54:09 -0700
Subject: rpms/ebtables/FC-3 ebtables.spec,1.6,1.7
Message-ID: <200604030154.k331sfXL016033@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ebtables/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15969/FC-3

Modified Files:
	ebtables.spec 
Log Message:

Package up shared libs too



Index: ebtables.spec
===================================================================
RCS file: /cvs/extras/rpms/ebtables/FC-3/ebtables.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ebtables.spec	29 Mar 2006 21:42:10 -0000	1.6
+++ ebtables.spec	3 Apr 2006 01:54:08 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:		ebtables
 Version:	2.0.8
-Release:	0.3.%{prever}%{?dist}
+Release:	0.4.%{prever}%{?dist}
 Summary:	Ethernet Bridge frame table administration tool
 License:	GPL
 Group:		System Environment/Base
@@ -33,6 +33,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -D -m0755 extensions/*.so $RPM_BUILD_ROOT%{_libdir}
+install -D -m0755 *.so $RPM_BUILD_ROOT%{_libdir}
 install -D -m0755 ebtables $RPM_BUILD_ROOT/sbin/ebtables
 install -D -m0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/ebtables
 install -D -m0644 ethertypes $RPM_BUILD_ROOT%{_sysconfdir}/ethertypes
@@ -46,6 +48,7 @@
 
 %post
 /sbin/chkconfig --add ebtables
+/sbin/ldconfig
 
 %preun
 if [ $1 -eq 0 ]; then
@@ -57,6 +60,7 @@
 if [ $1 -ge 1 ]; then
 	/sbin/service ebtables condrestart &> /dev/null || :
 fi
+/sbin/ldconfig
 
 %files
 %defattr(-, root, root, 0755)
@@ -64,12 +68,16 @@
 %doc %{_mandir}/man8/ebtables.8*
 %config(noreplace) %{_sysconfdir}/ethertypes
 %{_initrddir}/ebtables
+%{_libdir}/libebt*.so
 /sbin/ebtables
 %ghost %{_sysconfdir}/ebtables.filter
 %ghost %{_sysconfdir}/ebtables.nat
 %ghost %{_sysconfdir}/ebtables.broute
 
 %changelog
+* Sun Apr  2 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.4.rc1
+- package up the shared libs too
+
 * Wed Mar 29 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.3.rc1
 - use -fPIC
 



From fedora-extras-commits at redhat.com  Mon Apr  3 01:54:09 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  2 Apr 2006 18:54:09 -0700
Subject: rpms/ebtables/FC-4 ebtables.spec,1.6,1.7
Message-ID: <200604030154.k331sfqw016036@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ebtables/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15969/FC-4

Modified Files:
	ebtables.spec 
Log Message:

Package up shared libs too



Index: ebtables.spec
===================================================================
RCS file: /cvs/extras/rpms/ebtables/FC-4/ebtables.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ebtables.spec	29 Mar 2006 21:42:11 -0000	1.6
+++ ebtables.spec	3 Apr 2006 01:54:09 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:		ebtables
 Version:	2.0.8
-Release:	0.3.%{prever}%{?dist}
+Release:	0.4.%{prever}%{?dist}
 Summary:	Ethernet Bridge frame table administration tool
 License:	GPL
 Group:		System Environment/Base
@@ -33,6 +33,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -D -m0755 extensions/*.so $RPM_BUILD_ROOT%{_libdir}
+install -D -m0755 *.so $RPM_BUILD_ROOT%{_libdir}
 install -D -m0755 ebtables $RPM_BUILD_ROOT/sbin/ebtables
 install -D -m0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/ebtables
 install -D -m0644 ethertypes $RPM_BUILD_ROOT%{_sysconfdir}/ethertypes
@@ -46,6 +48,7 @@
 
 %post
 /sbin/chkconfig --add ebtables
+/sbin/ldconfig
 
 %preun
 if [ $1 -eq 0 ]; then
@@ -57,6 +60,7 @@
 if [ $1 -ge 1 ]; then
 	/sbin/service ebtables condrestart &> /dev/null || :
 fi
+/sbin/ldconfig
 
 %files
 %defattr(-, root, root, 0755)
@@ -64,12 +68,16 @@
 %doc %{_mandir}/man8/ebtables.8*
 %config(noreplace) %{_sysconfdir}/ethertypes
 %{_initrddir}/ebtables
+%{_libdir}/libebt*.so
 /sbin/ebtables
 %ghost %{_sysconfdir}/ebtables.filter
 %ghost %{_sysconfdir}/ebtables.nat
 %ghost %{_sysconfdir}/ebtables.broute
 
 %changelog
+* Sun Apr  2 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.4.rc1
+- package up the shared libs too
+
 * Wed Mar 29 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.3.rc1
 - use -fPIC
 



From fedora-extras-commits at redhat.com  Mon Apr  3 01:54:15 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  2 Apr 2006 18:54:15 -0700
Subject: rpms/ebtables/FC-5 ebtables.spec,1.7,1.8
Message-ID: <200604030154.k331slF9016039@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ebtables/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15969/FC-5

Modified Files:
	ebtables.spec 
Log Message:

Package up shared libs too



Index: ebtables.spec
===================================================================
RCS file: /cvs/extras/rpms/ebtables/FC-5/ebtables.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ebtables.spec	29 Mar 2006 21:42:12 -0000	1.7
+++ ebtables.spec	3 Apr 2006 01:54:15 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:		ebtables
 Version:	2.0.8
-Release:	0.3.%{prever}%{?dist}
+Release:	0.4.%{prever}%{?dist}
 Summary:	Ethernet Bridge frame table administration tool
 License:	GPL
 Group:		System Environment/Base
@@ -33,6 +33,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -D -m0755 extensions/*.so $RPM_BUILD_ROOT%{_libdir}
+install -D -m0755 *.so $RPM_BUILD_ROOT%{_libdir}
 install -D -m0755 ebtables $RPM_BUILD_ROOT/sbin/ebtables
 install -D -m0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/ebtables
 install -D -m0644 ethertypes $RPM_BUILD_ROOT%{_sysconfdir}/ethertypes
@@ -46,6 +48,7 @@
 
 %post
 /sbin/chkconfig --add ebtables
+/sbin/ldconfig
 
 %preun
 if [ $1 -eq 0 ]; then
@@ -57,6 +60,7 @@
 if [ $1 -ge 1 ]; then
 	/sbin/service ebtables condrestart &> /dev/null || :
 fi
+/sbin/ldconfig
 
 %files
 %defattr(-, root, root, 0755)
@@ -64,12 +68,16 @@
 %doc %{_mandir}/man8/ebtables.8*
 %config(noreplace) %{_sysconfdir}/ethertypes
 %{_initrddir}/ebtables
+%{_libdir}/libebt*.so
 /sbin/ebtables
 %ghost %{_sysconfdir}/ebtables.filter
 %ghost %{_sysconfdir}/ebtables.nat
 %ghost %{_sysconfdir}/ebtables.broute
 
 %changelog
+* Sun Apr  2 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.4.rc1
+- package up the shared libs too
+
 * Wed Mar 29 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.3.rc1
 - use -fPIC
 



From fedora-extras-commits at redhat.com  Mon Apr  3 01:54:16 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  2 Apr 2006 18:54:16 -0700
Subject: rpms/ebtables/devel ebtables.spec,1.7,1.8
Message-ID: <200604030154.k331smqD016042@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ebtables/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15969/devel

Modified Files:
	ebtables.spec 
Log Message:

Package up shared libs too



Index: ebtables.spec
===================================================================
RCS file: /cvs/extras/rpms/ebtables/devel/ebtables.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ebtables.spec	29 Mar 2006 21:42:13 -0000	1.7
+++ ebtables.spec	3 Apr 2006 01:54:15 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:		ebtables
 Version:	2.0.8
-Release:	0.3.%{prever}%{?dist}
+Release:	0.4.%{prever}%{?dist}
 Summary:	Ethernet Bridge frame table administration tool
 License:	GPL
 Group:		System Environment/Base
@@ -33,6 +33,8 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -D -m0755 extensions/*.so $RPM_BUILD_ROOT%{_libdir}
+install -D -m0755 *.so $RPM_BUILD_ROOT%{_libdir}
 install -D -m0755 ebtables $RPM_BUILD_ROOT/sbin/ebtables
 install -D -m0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/ebtables
 install -D -m0644 ethertypes $RPM_BUILD_ROOT%{_sysconfdir}/ethertypes
@@ -46,6 +48,7 @@
 
 %post
 /sbin/chkconfig --add ebtables
+/sbin/ldconfig
 
 %preun
 if [ $1 -eq 0 ]; then
@@ -57,6 +60,7 @@
 if [ $1 -ge 1 ]; then
 	/sbin/service ebtables condrestart &> /dev/null || :
 fi
+/sbin/ldconfig
 
 %files
 %defattr(-, root, root, 0755)
@@ -64,12 +68,16 @@
 %doc %{_mandir}/man8/ebtables.8*
 %config(noreplace) %{_sysconfdir}/ethertypes
 %{_initrddir}/ebtables
+%{_libdir}/libebt*.so
 /sbin/ebtables
 %ghost %{_sysconfdir}/ebtables.filter
 %ghost %{_sysconfdir}/ebtables.nat
 %ghost %{_sysconfdir}/ebtables.broute
 
 %changelog
+* Sun Apr  2 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.4.rc1
+- package up the shared libs too
+
 * Wed Mar 29 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.3.rc1
 - use -fPIC
 



From fedora-extras-commits at redhat.com  Mon Apr  3 02:21:13 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  2 Apr 2006 19:21:13 -0700
Subject: rpms/ebtables/devel ebtables.spec,1.8,1.9
Message-ID: <200604030221.k332LFuR019204@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ebtables/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18941/devel

Modified Files:
	ebtables.spec 
Log Message:

Fix stupid mistake.



Index: ebtables.spec
===================================================================
RCS file: /cvs/extras/rpms/ebtables/devel/ebtables.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ebtables.spec	3 Apr 2006 01:54:15 -0000	1.8
+++ ebtables.spec	3 Apr 2006 02:21:13 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:		ebtables
 Version:	2.0.8
-Release:	0.4.%{prever}%{?dist}
+Release:	0.5.%{prever}%{?dist}
 Summary:	Ethernet Bridge frame table administration tool
 License:	GPL
 Group:		System Environment/Base
@@ -33,8 +33,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -D -m0755 extensions/*.so $RPM_BUILD_ROOT%{_libdir}
-install -D -m0755 *.so $RPM_BUILD_ROOT%{_libdir}
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+install -m0755 extensions/*.so $RPM_BUILD_ROOT%{_libdir}
+install -m0755 *.so $RPM_BUILD_ROOT%{_libdir}
 install -D -m0755 ebtables $RPM_BUILD_ROOT/sbin/ebtables
 install -D -m0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/ebtables
 install -D -m0644 ethertypes $RPM_BUILD_ROOT%{_sysconfdir}/ethertypes
@@ -75,6 +76,9 @@
 %ghost %{_sysconfdir}/ebtables.broute
 
 %changelog
+* Sun Apr  2 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.5.rc1
+- learn to use "install" correctly. :/
+
 * Sun Apr  2 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.4.rc1
 - package up the shared libs too
 



From fedora-extras-commits at redhat.com  Mon Apr  3 02:21:06 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  2 Apr 2006 19:21:06 -0700
Subject: rpms/ebtables/FC-3 ebtables.spec,1.7,1.8
Message-ID: <200604030221.k332LcKP019451@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ebtables/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18941/FC-3

Modified Files:
	ebtables.spec 
Log Message:

Fix stupid mistake.



Index: ebtables.spec
===================================================================
RCS file: /cvs/extras/rpms/ebtables/FC-3/ebtables.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ebtables.spec	3 Apr 2006 01:54:08 -0000	1.7
+++ ebtables.spec	3 Apr 2006 02:21:05 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:		ebtables
 Version:	2.0.8
-Release:	0.4.%{prever}%{?dist}
+Release:	0.5.%{prever}%{?dist}
 Summary:	Ethernet Bridge frame table administration tool
 License:	GPL
 Group:		System Environment/Base
@@ -33,8 +33,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -D -m0755 extensions/*.so $RPM_BUILD_ROOT%{_libdir}
-install -D -m0755 *.so $RPM_BUILD_ROOT%{_libdir}
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+install -m0755 extensions/*.so $RPM_BUILD_ROOT%{_libdir}
+install -m0755 *.so $RPM_BUILD_ROOT%{_libdir}
 install -D -m0755 ebtables $RPM_BUILD_ROOT/sbin/ebtables
 install -D -m0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/ebtables
 install -D -m0644 ethertypes $RPM_BUILD_ROOT%{_sysconfdir}/ethertypes
@@ -75,6 +76,9 @@
 %ghost %{_sysconfdir}/ebtables.broute
 
 %changelog
+* Sun Apr  2 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.5.rc1
+- learn to use "install" correctly. :/
+
 * Sun Apr  2 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.4.rc1
 - package up the shared libs too
 



From fedora-extras-commits at redhat.com  Mon Apr  3 02:21:06 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  2 Apr 2006 19:21:06 -0700
Subject: rpms/ebtables/FC-4 ebtables.spec,1.7,1.8
Message-ID: <200604030221.k332LcBa019462@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ebtables/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18941/FC-4

Modified Files:
	ebtables.spec 
Log Message:

Fix stupid mistake.



Index: ebtables.spec
===================================================================
RCS file: /cvs/extras/rpms/ebtables/FC-4/ebtables.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ebtables.spec	3 Apr 2006 01:54:09 -0000	1.7
+++ ebtables.spec	3 Apr 2006 02:21:06 -0000	1.8
@@ -2,7 +2,7 @@
 
 Name:		ebtables
 Version:	2.0.8
-Release:	0.4.%{prever}%{?dist}
+Release:	0.5.%{prever}%{?dist}
 Summary:	Ethernet Bridge frame table administration tool
 License:	GPL
 Group:		System Environment/Base
@@ -33,8 +33,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -D -m0755 extensions/*.so $RPM_BUILD_ROOT%{_libdir}
-install -D -m0755 *.so $RPM_BUILD_ROOT%{_libdir}
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+install -m0755 extensions/*.so $RPM_BUILD_ROOT%{_libdir}
+install -m0755 *.so $RPM_BUILD_ROOT%{_libdir}
 install -D -m0755 ebtables $RPM_BUILD_ROOT/sbin/ebtables
 install -D -m0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/ebtables
 install -D -m0644 ethertypes $RPM_BUILD_ROOT%{_sysconfdir}/ethertypes
@@ -75,6 +76,9 @@
 %ghost %{_sysconfdir}/ebtables.broute
 
 %changelog
+* Sun Apr  2 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.5.rc1
+- learn to use "install" correctly. :/
+
 * Sun Apr  2 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.4.rc1
 - package up the shared libs too
 



From fedora-extras-commits at redhat.com  Mon Apr  3 02:21:07 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  2 Apr 2006 19:21:07 -0700
Subject: rpms/ebtables/FC-5 ebtables.spec,1.8,1.9
Message-ID: <200604030221.k332Ldxj019474@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ebtables/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18941/FC-5

Modified Files:
	ebtables.spec 
Log Message:

Fix stupid mistake.



Index: ebtables.spec
===================================================================
RCS file: /cvs/extras/rpms/ebtables/FC-5/ebtables.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ebtables.spec	3 Apr 2006 01:54:15 -0000	1.8
+++ ebtables.spec	3 Apr 2006 02:21:07 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:		ebtables
 Version:	2.0.8
-Release:	0.4.%{prever}%{?dist}
+Release:	0.5.%{prever}%{?dist}
 Summary:	Ethernet Bridge frame table administration tool
 License:	GPL
 Group:		System Environment/Base
@@ -33,8 +33,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -D -m0755 extensions/*.so $RPM_BUILD_ROOT%{_libdir}
-install -D -m0755 *.so $RPM_BUILD_ROOT%{_libdir}
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+install -m0755 extensions/*.so $RPM_BUILD_ROOT%{_libdir}
+install -m0755 *.so $RPM_BUILD_ROOT%{_libdir}
 install -D -m0755 ebtables $RPM_BUILD_ROOT/sbin/ebtables
 install -D -m0755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/ebtables
 install -D -m0644 ethertypes $RPM_BUILD_ROOT%{_sysconfdir}/ethertypes
@@ -75,6 +76,9 @@
 %ghost %{_sysconfdir}/ebtables.broute
 
 %changelog
+* Sun Apr  2 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.5.rc1
+- learn to use "install" correctly. :/
+
 * Sun Apr  2 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.4.rc1
 - package up the shared libs too
 



From fedora-extras-commits at redhat.com  Mon Apr  3 05:56:16 2006
From: fedora-extras-commits at redhat.com (Radek Vokál (rvokal))
Date: Sun,  2 Apr 2006 22:56:16 -0700
Subject: rpms/gjots2 - New directory
Message-ID: <200604030556.k335uIRU027960@cvs-int.fedora.redhat.com>

Author: rvokal

Update of /cvs/extras/rpms/gjots2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27934/gjots2

Log Message:
Directory /cvs/extras/rpms/gjots2 added to the repository




From fedora-extras-commits at redhat.com  Mon Apr  3 05:56:17 2006
From: fedora-extras-commits at redhat.com (Radek Vokál (rvokal))
Date: Sun,  2 Apr 2006 22:56:17 -0700
Subject: rpms/gjots2/devel - New directory
Message-ID: <200604030556.k335uJI5027963@cvs-int.fedora.redhat.com>

Author: rvokal

Update of /cvs/extras/rpms/gjots2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27934/gjots2/devel

Log Message:
Directory /cvs/extras/rpms/gjots2/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Apr  3 05:57:09 2006
From: fedora-extras-commits at redhat.com (Radek Vokál (rvokal))
Date: Sun,  2 Apr 2006 22:57:09 -0700
Subject: rpms/gjots2 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604030557.k335vBti028012@cvs-int.fedora.redhat.com>

Author: rvokal

Update of /cvs/extras/rpms/gjots2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27979

Added Files:
	Makefile import.log 
Log Message:
Setup of module gjots2


--- NEW FILE Makefile ---
# Top level Makefile for module gjots2
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr  3 05:57:10 2006
From: fedora-extras-commits at redhat.com (Radek Vokál (rvokal))
Date: Sun,  2 Apr 2006 22:57:10 -0700
Subject: rpms/gjots2/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604030557.k335vCAp028015@cvs-int.fedora.redhat.com>

Author: rvokal

Update of /cvs/extras/rpms/gjots2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27979/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gjots2


--- 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 Apr  3 05:58:56 2006
From: fedora-extras-commits at redhat.com (Radek Vokál (rvokal))
Date: Sun,  2 Apr 2006 22:58:56 -0700
Subject: rpms/gjots2 import.log,1.1,1.2
Message-ID: <200604030558.k335wwbC028082@cvs-int.fedora.redhat.com>

Author: rvokal

Update of /cvs/extras/rpms/gjots2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28048

Modified Files:
	import.log 
Log Message:
auto-import gjots2-2.3.4-4 on branch devel from gjots2-2.3.4-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gjots2/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	3 Apr 2006 05:57:09 -0000	1.1
+++ import.log	3 Apr 2006 05:58:56 -0000	1.2
@@ -0,0 +1 @@
+gjots2-2_3_4-4:HEAD:gjots2-2.3.4-4.src.rpm:1144043916



From fedora-extras-commits at redhat.com  Mon Apr  3 05:58:57 2006
From: fedora-extras-commits at redhat.com (Radek Vokál (rvokal))
Date: Sun,  2 Apr 2006 22:58:57 -0700
Subject: rpms/gjots2/devel gjots2-2.3.4-sitelib.patch, NONE, 1.1 gjots2.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604030558.k335wxkg028089@cvs-int.fedora.redhat.com>

Author: rvokal

Update of /cvs/extras/rpms/gjots2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28048/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gjots2-2.3.4-sitelib.patch gjots2.spec 
Log Message:
auto-import gjots2-2.3.4-4 on branch devel from gjots2-2.3.4-4.src.rpm

gjots2-2.3.4-sitelib.patch:

--- NEW FILE gjots2-2.3.4-sitelib.patch ---
--- gjots2-2.3.4/bin/gjots2.lib	2005-12-24 09:02:42.000000000 +0100
+++ gjots2-2.3.4/bin/gjots2	2006-03-28 16:16:13.000000000 +0200
@@ -3,6 +3,7 @@
 import sys, os, getopt
 import gettext
 gettext.install('gjots2', '/usr/share/locale')
+from distutils.sysconfig import get_python_lib
 
 def ver2str(ver):
     return ".".join(map(str,ver))
@@ -63,7 +64,7 @@
 	else:
 		# Assumption: we're running from $prefix/bin
 		prefix, bin = os.path.split(dirName)
-		sys.path = [ prefix + '/lib/gjots2' ] + sys.path
+		sys.path = [ get_python_lib() + '/gjots2' ] + sys.path
 
 	from gui import *
 	from version import *


--- NEW FILE gjots2.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

# $Id: gjots2.spec,v 1.12.2.12 2006/01/23 17:26:14 bhepple Exp $
#   Copyright (C) 2002-2005 Robert Hepple 
#
#   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.

%define ver 2.3.4
%define rel 4

Summary: A note jotter - Organise your ideas, notes, facts in a hierarchy
Name: gjots2
Version: %{ver}
Release: %{rel}%{?dist}
URL: http://bhepple.freeshell.org/gjots
Source: http://bhepple.freeshell.org/gjots/%{name}-%{version}.tgz
Patch0: gjots2-2.3.4-sitelib.patch
License: GPL
Group: Applications/Productivity
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: desktop-file-utils

Requires: python >= 2.3, pygtk2 >= 2.4.0, gnome-python2 >= 2.0.2
Requires: libglade2 >= 2.4, gnome-python2-gconf >= 2.6.0

%description

gjots2 ("gee-jots" or, if you prefer, "gyachts"!) is a way to marshall
and organise your text notes in a convenient, hierachical way. I use
it for all my notes on Unix, my personal bits and pieces, recipes and
even PINs and passwords (encrypted with ccrypt(1)).

You can also use it to "mind-map" your compositions - write down all
your thoughts and then start to organise them into a tree. By
manipulating the tree you can easily reorder your thoughts and
structure them appropriately.

%prep
%setup -q
%patch0 -p1 -b .lib

iconv -f iso-8859-1 -t utf-8 -o man.tmp share/man/man1/docbook2gjots.1 && mv man.tmp share/man/man1/docbook2gjots.1
iconv -f iso-8859-1 -t utf-8 -o man.tmp share/man/man1/gjots2docbook.1 && mv man.tmp share/man/man1/gjots2docbook.1
iconv -f iso-8859-1 -t utf-8 -o man.tmp share/man/man1/gjots2html.1 && mv man.tmp share/man/man1/gjots2html.1

%build
%install

# typically:
#	buildroot=/var/tmp/root-gjots2-2.3.4
#	_datadir=/usr/share
#	_bindir=/usr/bin
#	_libdir=/usr/lib

%{__rm} -rf %{buildroot}
%{__install} -d -m0755  \
                        %{buildroot}%{_datadir}/applications \
                        %{buildroot}%{_datadir}/%{name} \
                        %{buildroot}%{_datadir}/pixmaps \
                        %{buildroot}%{_datadir}/man/man1 \
                        %{buildroot}%{python_sitelib}/%{name} \
                        %{buildroot}%{_bindir} \
						%{buildroot}%{_datadir}/locale/en_US/LC_MESSAGES \
						%{buildroot}%{_datadir}/locale/fr/LC_MESSAGES \
						%{buildroot}%{_datadir}/locale/no/LC_MESSAGES \
						%{buildroot}%{_datadir}/locale/nb/LC_MESSAGES \
						%{buildroot}%{_datadir}/locale/ru/LC_MESSAGES

%{__install} -m0755 bin/gjots2 bin/gjots2docbook bin/gjots2html bin/docbook2gjots %{buildroot}%{_bindir}/
%{__install} -m0644 lib/*.py %{buildroot}%{python_sitelib}/%{name}/
%{__install} -m0644 gjots.glade2 %{buildroot}%{_datadir}/%{name}
%{__install} -m0644 gjots.png %{buildroot}%{_datadir}/%{name}
%{__install} -m0644 gjots.png %{buildroot}%{_datadir}/pixmaps/
%{__install} -m0644 gjots2-hide-all.png %{buildroot}%{_datadir}/%{name}
%{__install} -m0644 gjots2-merge-items.png %{buildroot}%{_datadir}/%{name}
%{__install} -m0644 gjots2-new-child.png %{buildroot}%{_datadir}/%{name}
%{__install} -m0644 gjots2-new-page.png %{buildroot}%{_datadir}/%{name}
%{__install} -m0644 gjots2-show-all.png %{buildroot}%{_datadir}/%{name}
%{__install} -m0644 gjots2-split-item.png %{buildroot}%{_datadir}/%{name}
desktop-file-install --vendor fedora                            \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
                --add-category X-Fedora                         \
                        %{name}.desktop

%{__install} -m0644 share/man/man1/gjots2.1 %{buildroot}%{_datadir}/man/man1
%{__install} -m0644 share/man/man1/gjots2html.1 %{buildroot}%{_datadir}/man/man1
%{__install} -m0644 share/man/man1/gjots2docbook.1 %{buildroot}%{_datadir}/man/man1
%{__install} -m0644 share/man/man1/docbook2gjots.1 %{buildroot}%{_datadir}/man/man1
%{__install} -m0644 po/en_US/LC_MESSAGES/gjots2.mo %{buildroot}%{_datadir}/locale/en_US/LC_MESSAGES
%{__install} -m0644 po/fr/LC_MESSAGES/gjots2.mo %{buildroot}%{_datadir}/locale/fr/LC_MESSAGES
%{__install} -m0644 po/no/LC_MESSAGES/gjots2.mo %{buildroot}%{_datadir}/locale/no/LC_MESSAGES
%{__install} -m0644 po/nb/LC_MESSAGES/gjots2.mo %{buildroot}%{_datadir}/locale/nb/LC_MESSAGES
%{__install} -m0644 po/ru/LC_MESSAGES/gjots2.mo %{buildroot}%{_datadir}/locale/ru/LC_MESSAGES
%find_lang %{name}

%clean
%{__rm} -rf %{buildroot}


%files -f gjots2.lang
%defattr(-,root,root)
%doc AUTHORS INSTALL README COPYING ChangeLog gjots2.gjots gjots2.en_US.gjots gjots2.fr.gjots gjots2.nb.gjots gjots2.no.gjots gjots2.ru.gjots
%dir %{python_sitelib}/%{name}
%{python_sitelib}/%{name}/*.py
%{python_sitelib}/%{name}/*.pyc
%ghost %{python_sitelib}/%{name}/*.pyo
%{_bindir}/gjots2
%{_bindir}/gjots2html*
%{_bindir}/gjots2docbook
%{_bindir}/docbook2gjots
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/*
%{_datadir}/pixmaps/gjots.png
%{_datadir}/applications/fedora-gjots2.desktop
%{_mandir}/man1/%{name}*
%{_mandir}/man1/docbook2gjots*

%changelog
* Thu Mar 30 2006 Radek Vok??l <rvokal at redhat.com> 2.3.4-4
- BuildRequires: desktop-file-utils

* Tue Mar 28 2006 Radek Vok??l <rvokal at redhat.com> 2.3.4-3
- move libs to python_sitelib

* Fri Mar 17 2006 Radek Vok??l <rvokal at redhat.com> 2.3.4-2
- convert man pages to UTF-8
- add file list

* Wed Mar 15 2006 Radek Vok??l <rvokal at redhat.com> 2.3.4-1
- initial build for Fedora Core


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gjots2/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Apr 2006 05:57:10 -0000	1.1
+++ .cvsignore	3 Apr 2006 05:58:56 -0000	1.2
@@ -0,0 +1 @@
+gjots2-2.3.4.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gjots2/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Apr 2006 05:57:10 -0000	1.1
+++ sources	3 Apr 2006 05:58:56 -0000	1.2
@@ -0,0 +1 @@
+ae05d1ea976de08dd9fc80faa04c558f  gjots2-2.3.4.tgz



From fedora-extras-commits at redhat.com  Mon Apr  3 06:03:25 2006
From: fedora-extras-commits at redhat.com (Radek Vokál (rvokal))
Date: Sun,  2 Apr 2006 23:03:25 -0700
Subject: owners owners.list,1.796,1.797
Message-ID: <200604030603.k3363RFQ030154@cvs-int.fedora.redhat.com>

Author: rvokal

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30137

Modified Files:
	owners.list 
Log Message:
gjots2


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.796
retrieving revision 1.797
diff -u -r1.796 -r1.797
--- owners.list	3 Apr 2006 00:07:11 -0000	1.796
+++ owners.list	3 Apr 2006 06:03:25 -0000	1.797
@@ -321,6 +321,7 @@
 Fedora Extras|gift-openft|Openft plugin for giFT|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|ginac|C++ library for symbolic calculation|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|git-core|A distributed SCM|chrisw at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|gjots2|Simple jotter application for your desktop - an outline processor|rvokal at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-aclock|Analog clock plugin for GKrellM|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-freq|CPU frequency display plugin for GKrellM|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-hddtemp|Hard disk temperature plugin for GKrellM|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Apr  3 07:11:12 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon,  3 Apr 2006 00:11:12 -0700
Subject: rpms/jabberd/devel .cvsignore, 1.4, 1.5 jabberd.spec, 1.12,
	1.13 sources, 1.4, 1.5
Message-ID: <200604030711.k337BExn032317@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/jabberd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32296

Modified Files:
	.cvsignore jabberd.spec sources 
Log Message:
* Mon Apr 03 2006 Adrian Reber <adrian at lisas.de> - 2.0-0.s11.9
- updated to 2.0-0.s11



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jabberd/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Nov 2005 12:28:12 -0000	1.4
+++ .cvsignore	3 Apr 2006 07:11:12 -0000	1.5
@@ -1 +1 @@
-jabberd-2.0s10.tar.gz
+jabberd-2.0s11.tar.gz


Index: jabberd.spec
===================================================================
RCS file: /cvs/extras/rpms/jabberd/devel/jabberd.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jabberd.spec	15 Feb 2006 21:25:29 -0000	1.12
+++ jabberd.spec	3 Apr 2006 07:11:12 -0000	1.13
@@ -1,10 +1,10 @@
 Summary: OpenSource server implementation of the Jabber protocols
 Name: jabberd
 Version: 2.0
-Release: 0.s10.9%{?dist}
+Release: 0.s11.9%{?dist}
 License: GPL
 Group: System Environment/Daemons
-Source0: http://files.jabberstudio.org/jabberd2/jabberd-2.0s10.tar.gz
+Source0: http://files.jabberstudio.org/jabberd2/jabberd-2.0s11.tar.gz
 Source1: jabberd
 Source2: jabberd.sysconfig
 URL: http://jabberd.jabberstudio.org/2/
@@ -33,7 +33,7 @@
 This packages defaults to use pam and the Berkeley DB.
 
 %prep
-%setup -q -n %{name}-%{version}s10
+%setup -q -n %{name}-%{version}s11
 
 %build
 %define _sysconfdir /etc/jabberd
@@ -177,6 +177,9 @@
 %ghost %{_sysconfdir}/jabberd/server.pem
 
 %changelog
+* Mon Apr 03 2006 Adrian Reber <adrian at lisas.de> - 2.0-0.s11.9
+- updated to 2.0-0.s11
+
 * Wed Feb 15 2006 Adrian Reber <adrian at lisas.de> - 2.0-0.s10.9
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jabberd/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Nov 2005 12:28:12 -0000	1.4
+++ sources	3 Apr 2006 07:11:12 -0000	1.5
@@ -1 +1 @@
-e8df4a9a5680009071204d423cff2de0  jabberd-2.0s10.tar.gz
+67d1663ed97a5ba707d5d145b1d19c55  jabberd-2.0s11.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr  3 07:25:28 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon,  3 Apr 2006 00:25:28 -0700
Subject: rpms/jabberd/FC-5 .cvsignore, 1.4, 1.5 jabberd.spec, 1.12,
	1.13 sources, 1.4, 1.5
Message-ID: <200604030725.k337PUBP032403@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/jabberd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32382

Modified Files:
	.cvsignore jabberd.spec sources 
Log Message:
* Mon Apr 03 2006 Adrian Reber <adrian at lisas.de> - 2.0-0.s11.9
- updated to 2.0-0.s11



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jabberd/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Nov 2005 12:28:12 -0000	1.4
+++ .cvsignore	3 Apr 2006 07:25:28 -0000	1.5
@@ -1 +1 @@
-jabberd-2.0s10.tar.gz
+jabberd-2.0s11.tar.gz


Index: jabberd.spec
===================================================================
RCS file: /cvs/extras/rpms/jabberd/FC-5/jabberd.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jabberd.spec	15 Feb 2006 21:25:29 -0000	1.12
+++ jabberd.spec	3 Apr 2006 07:25:28 -0000	1.13
@@ -1,10 +1,10 @@
 Summary: OpenSource server implementation of the Jabber protocols
 Name: jabberd
 Version: 2.0
-Release: 0.s10.9%{?dist}
+Release: 0.s11.9%{?dist}
 License: GPL
 Group: System Environment/Daemons
-Source0: http://files.jabberstudio.org/jabberd2/jabberd-2.0s10.tar.gz
+Source0: http://files.jabberstudio.org/jabberd2/jabberd-2.0s11.tar.gz
 Source1: jabberd
 Source2: jabberd.sysconfig
 URL: http://jabberd.jabberstudio.org/2/
@@ -33,7 +33,7 @@
 This packages defaults to use pam and the Berkeley DB.
 
 %prep
-%setup -q -n %{name}-%{version}s10
+%setup -q -n %{name}-%{version}s11
 
 %build
 %define _sysconfdir /etc/jabberd
@@ -177,6 +177,9 @@
 %ghost %{_sysconfdir}/jabberd/server.pem
 
 %changelog
+* Mon Apr 03 2006 Adrian Reber <adrian at lisas.de> - 2.0-0.s11.9
+- updated to 2.0-0.s11
+
 * Wed Feb 15 2006 Adrian Reber <adrian at lisas.de> - 2.0-0.s10.9
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jabberd/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Nov 2005 12:28:12 -0000	1.4
+++ sources	3 Apr 2006 07:25:28 -0000	1.5
@@ -1 +1 @@
-e8df4a9a5680009071204d423cff2de0  jabberd-2.0s10.tar.gz
+67d1663ed97a5ba707d5d145b1d19c55  jabberd-2.0s11.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr  3 07:27:00 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Mon,  3 Apr 2006 00:27:00 -0700
Subject: rpms/jabberd/FC-4 .cvsignore, 1.4, 1.5 jabberd.spec, 1.11,
	1.12 sources, 1.4, 1.5
Message-ID: <200604030727.k337R2Oj032473@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/jabberd/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32452

Modified Files:
	.cvsignore jabberd.spec sources 
Log Message:
* Mon Apr 03 2006 Adrian Reber <adrian at lisas.de> - 2.0-0.s11.9
- updated to 2.0-0.s11



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jabberd/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	28 Nov 2005 09:06:16 -0000	1.4
+++ .cvsignore	3 Apr 2006 07:27:00 -0000	1.5
@@ -1 +1 @@
-jabberd-2.0s10.tar.gz
+jabberd-2.0s11.tar.gz


Index: jabberd.spec
===================================================================
RCS file: /cvs/extras/rpms/jabberd/FC-4/jabberd.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jabberd.spec	28 Nov 2005 09:10:26 -0000	1.11
+++ jabberd.spec	3 Apr 2006 07:27:00 -0000	1.12
@@ -1,10 +1,10 @@
 Summary: OpenSource server implementation of the Jabber protocols
 Name: jabberd
 Version: 2.0
-Release: 0.s10.8%{?dist}
+Release: 0.s11.9%{?dist}
 License: GPL
 Group: System Environment/Daemons
-Source0: http://files.jabberstudio.org/jabberd2/jabberd-2.0s10.tar.gz
+Source0: http://files.jabberstudio.org/jabberd2/jabberd-2.0s11.tar.gz
 Source1: jabberd
 Source2: jabberd.sysconfig
 URL: http://jabberd.jabberstudio.org/2/
@@ -33,7 +33,7 @@
 This packages defaults to use pam and the Berkeley DB.
 
 %prep
-%setup -q -n %{name}-%{version}s10
+%setup -q -n %{name}-%{version}s11
 
 %build
 %define _sysconfdir /etc/jabberd
@@ -177,6 +177,12 @@
 %ghost %{_sysconfdir}/jabberd/server.pem
 
 %changelog
+* Mon Apr 03 2006 Adrian Reber <adrian at lisas.de> - 2.0-0.s11.9
+- updated to 2.0-0.s11
+
+* Wed Feb 15 2006 Adrian Reber <adrian at lisas.de> - 2.0-0.s10.9
+- rebuilt
+
 * Sun Nov 27 2005 Adrian Reber <adrian at lisas.de> - 2.0-0.s10.8
 - %%{_sysconfdir}/jabberd/server.pem was listed twice
 - added /sbin/service dependency to %%post, %%postun and %%preun


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jabberd/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Nov 2005 09:06:16 -0000	1.4
+++ sources	3 Apr 2006 07:27:00 -0000	1.5
@@ -1 +1 @@
-e8df4a9a5680009071204d423cff2de0  jabberd-2.0s10.tar.gz
+67d1663ed97a5ba707d5d145b1d19c55  jabberd-2.0s11.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr  3 08:44:29 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  3 Apr 2006 01:44:29 -0700
Subject: rpms/wine-docs/FC-5 .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 wine-docs.spec, 1.7, 1.8
Message-ID: <200604030844.k338iVTb002267@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-serv2192/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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	15 Mar 2006 22:27:37 -0000	1.7
+++ .cvsignore	3 Apr 2006 08:44:29 -0000	1.8
@@ -1 +1 @@
-wine-docs-0.9.10.tar.bz2
+wine-docs-0.9.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	15 Mar 2006 22:27:37 -0000	1.7
+++ sources	3 Apr 2006 08:44:29 -0000	1.8
@@ -1 +1 @@
-8057a2d7901c6436d69ee7bbe88700b4  wine-docs-0.9.10.tar.bz2
+a9de221c2a1442270f4eec1066379598  wine-docs-0.9.11.tar.bz2


Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-5/wine-docs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wine-docs.spec	15 Mar 2006 22:27:37 -0000	1.7
+++ wine-docs.spec	3 Apr 2006 08:44:29 -0000	1.8
@@ -1,12 +1,12 @@
 Name:           wine-docs
-Version:        0.9.10
+Version:        0.9.11
 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.10.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.11.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
+* Mon Apr 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.11-1
+- version upgrade
+
 * Wed Mar 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.10-1
 - version upgrade



From fedora-extras-commits at redhat.com  Mon Apr  3 08:44:28 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  3 Apr 2006 01:44:28 -0700
Subject: rpms/wine-docs/FC-4 .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 wine-docs.spec, 1.11, 1.12
Message-ID: <200604030844.k338iUfe002263@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-serv2192/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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	15 Mar 2006 22:27:32 -0000	1.7
+++ .cvsignore	3 Apr 2006 08:44:28 -0000	1.8
@@ -1 +1 @@
-wine-docs-0.9.10.tar.bz2
+wine-docs-0.9.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	15 Mar 2006 22:27:32 -0000	1.7
+++ sources	3 Apr 2006 08:44:28 -0000	1.8
@@ -1 +1 @@
-8057a2d7901c6436d69ee7bbe88700b4  wine-docs-0.9.10.tar.bz2
+a9de221c2a1442270f4eec1066379598  wine-docs-0.9.11.tar.bz2


Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-4/wine-docs.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wine-docs.spec	22 Mar 2006 00:04:33 -0000	1.11
+++ wine-docs.spec	3 Apr 2006 08:44:28 -0000	1.12
@@ -1,12 +1,12 @@
 Name:           wine-docs
-Version:        0.9.10
+Version:        0.9.11
 Release:        0.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.10.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.11.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  docbook-utils-pdf
@@ -46,6 +46,10 @@
 %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB
 
 %changelog
+* Mon Apr 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.11-0.1
+- version upgrade
+
 * Wed Mar 22 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.9.10-0.1
 - make this release 0.1 as to not move the old tag
 - insert docbook2txt wrapper script in %%build to get strace output



From fedora-extras-commits at redhat.com  Mon Apr  3 08:44:30 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  3 Apr 2006 01:44:30 -0700
Subject: rpms/wine-docs/devel .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 wine-docs.spec, 1.7, 1.8
Message-ID: <200604030844.k338iWpB002273@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2192/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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	15 Mar 2006 22:27:37 -0000	1.7
+++ .cvsignore	3 Apr 2006 08:44:29 -0000	1.8
@@ -1 +1 @@
-wine-docs-0.9.10.tar.bz2
+wine-docs-0.9.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	15 Mar 2006 22:27:37 -0000	1.7
+++ sources	3 Apr 2006 08:44:29 -0000	1.8
@@ -1 +1 @@
-8057a2d7901c6436d69ee7bbe88700b4  wine-docs-0.9.10.tar.bz2
+a9de221c2a1442270f4eec1066379598  wine-docs-0.9.11.tar.bz2


Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/devel/wine-docs.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- wine-docs.spec	15 Mar 2006 22:27:37 -0000	1.7
+++ wine-docs.spec	3 Apr 2006 08:44:29 -0000	1.8
@@ -1,12 +1,12 @@
 Name:           wine-docs
-Version:        0.9.10
+Version:        0.9.11
 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.10.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.11.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
+* Mon Apr 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.11-1
+- version upgrade
+
 * Wed Mar 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.10-1
 - version upgrade



From fedora-extras-commits at redhat.com  Mon Apr  3 08:44:27 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  3 Apr 2006 01:44:27 -0700
Subject: rpms/wine-docs/FC-3 .cvsignore, 1.7, 1.8 sources, 1.7,
	1.8 wine-docs.spec, 1.10, 1.11
Message-ID: <200604030845.k338j0bO002281@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-serv2192/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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	15 Mar 2006 22:27:26 -0000	1.7
+++ .cvsignore	3 Apr 2006 08:44:27 -0000	1.8
@@ -1 +1 @@
-wine-docs-0.9.10.tar.bz2
+wine-docs-0.9.11.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-3/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	15 Mar 2006 22:27:26 -0000	1.7
+++ sources	3 Apr 2006 08:44:27 -0000	1.8
@@ -1 +1 @@
-8057a2d7901c6436d69ee7bbe88700b4  wine-docs-0.9.10.tar.bz2
+a9de221c2a1442270f4eec1066379598  wine-docs-0.9.11.tar.bz2


Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-3/wine-docs.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- wine-docs.spec	15 Mar 2006 22:27:26 -0000	1.10
+++ wine-docs.spec	3 Apr 2006 08:44:27 -0000	1.11
@@ -1,12 +1,12 @@
 Name:           wine-docs
-Version:        0.9.10
+Version:        0.9.11
 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.10.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.11.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
+* Mon Apr 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.11-1
+- version upgrade
+
 * Wed Mar 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.10-1
 - version upgrade



From fedora-extras-commits at redhat.com  Mon Apr  3 11:07:59 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  3 Apr 2006 04:07:59 -0700
Subject: rpms/wine/FC-3 wine-prefixfonts.patch, NONE, 1.1 .cvsignore, 1.10, 
	1.11 sources, 1.11, 1.12 wine.spec, 1.16, 1.17
Message-ID: <200604031108.k33B8VeL009249@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8882/FC-3

Modified Files:
	.cvsignore sources wine.spec 
Added Files:
	wine-prefixfonts.patch 
Log Message:
- version upgrade
- fix #187546


wine-prefixfonts.patch:

--- NEW FILE wine-prefixfonts.patch ---
--- tools/wineprefixcreate.in.orig	2006-04-03 10:04:18.000000000 +0200
+++ tools/wineprefixcreate.in	2006-04-03 10:06:20.000000000 +0200
@@ -170,6 +170,9 @@
 export WINEPREFIX
 "${WINELOADER:-wine}" rundll32.exe setupapi.dll,InstallHinfSection DefaultInstall 128 wine.inf
 
+# Copy the font files
+cp /usr/share/wine/fonts/* "$CROOT/windows/fonts/"
+
 # Wait for the wineserver to finish
 
 if [ $do_wait = 1 ]


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	17 Mar 2006 13:24:42 -0000	1.10
+++ .cvsignore	3 Apr 2006 11:07:59 -0000	1.11
@@ -1 +1 @@
-wine-0.9.10-fe.tar.bz2
+wine-0.9.11-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	17 Mar 2006 13:24:42 -0000	1.11
+++ sources	3 Apr 2006 11:07:59 -0000	1.12
@@ -1 +1 @@
-054e71983834d777be3271f63f8484d6  wine-0.9.10-fe.tar.bz2
+7e67d02051dfb3671990f40734aca89a  wine-0.9.11-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/wine.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- wine.spec	17 Mar 2006 13:55:47 -0000	1.16
+++ wine.spec	3 Apr 2006 11:07:59 -0000	1.17
@@ -1,5 +1,5 @@
 Name:		wine
-Version:	0.9.10
+Version:	0.9.11
 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.10-fe.tar.bz2
+Source0:        wine-0.9.11-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -18,6 +18,7 @@
 Source104:      wine-winefile.desktop
 Source105:      wine-winemine.desktop
 Source106:      wine-winhelp.desktop
+Patch0:         wine-prefixfonts.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExclusiveArch:  %{ix86}
@@ -143,6 +144,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}-fe
+%patch0
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -330,8 +332,6 @@
 %{_libdir}/wine/avicap32.dll.so
 %{_libdir}/wine/avifil32.dll.so
 %{_libdir}/wine/avifile.dll16
-%{_libdir}/wine/aviinfo.exe.so
-%{_libdir}/wine/aviplay.exe.so
 %{_libdir}/wine/cabinet.dll.so
 %{_libdir}/wine/cards.dll.so
 %{_libdir}/wine/cfgmgr32.dll.so
@@ -517,6 +517,7 @@
 %{_libdir}/wine/winnls32.dll.so
 %{_libdir}/wine/winsock.dll16
 %{_libdir}/wine/winspool.drv.so
+%{_libdir}/wine/spoolss.dll.so
 %{_libdir}/wine/wintab.dll16
 %{_libdir}/wine/wintab32.dll.so
 %{_libdir}/wine/wintrust.dll.so
@@ -633,6 +634,11 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Mon Apr 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.11-1
+- version upgrade
+- fix #187546
+
 * Fri Mar 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de
 0.9.10-1
 - version upgrade



From fedora-extras-commits at redhat.com  Mon Apr  3 11:08:00 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  3 Apr 2006 04:08:00 -0700
Subject: rpms/wine/FC-4 wine-prefixfonts.patch, NONE, 1.1 .cvsignore, 1.11, 
	1.12 sources, 1.12, 1.13 wine.spec, 1.18, 1.19
Message-ID: <200604031108.k33B8WB5009254@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8882/FC-4

Modified Files:
	.cvsignore sources wine.spec 
Added Files:
	wine-prefixfonts.patch 
Log Message:
- version upgrade
- fix #187546


wine-prefixfonts.patch:

--- NEW FILE wine-prefixfonts.patch ---
--- tools/wineprefixcreate.in.orig	2006-04-03 10:04:18.000000000 +0200
+++ tools/wineprefixcreate.in	2006-04-03 10:06:20.000000000 +0200
@@ -170,6 +170,9 @@
 export WINEPREFIX
 "${WINELOADER:-wine}" rundll32.exe setupapi.dll,InstallHinfSection DefaultInstall 128 wine.inf
 
+# Copy the font files
+cp /usr/share/wine/fonts/* "$CROOT/windows/fonts/"
+
 # Wait for the wineserver to finish
 
 if [ $do_wait = 1 ]


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	17 Mar 2006 13:24:48 -0000	1.11
+++ .cvsignore	3 Apr 2006 11:07:59 -0000	1.12
@@ -1 +1 @@
-wine-0.9.10-fe.tar.bz2
+wine-0.9.11-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	17 Mar 2006 13:24:48 -0000	1.12
+++ sources	3 Apr 2006 11:07:59 -0000	1.13
@@ -1 +1 @@
-054e71983834d777be3271f63f8484d6  wine-0.9.10-fe.tar.bz2
+7e67d02051dfb3671990f40734aca89a  wine-0.9.11-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/wine.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- wine.spec	17 Mar 2006 13:55:53 -0000	1.18
+++ wine.spec	3 Apr 2006 11:07:59 -0000	1.19
@@ -1,5 +1,5 @@
 Name:		wine
-Version:	0.9.10
+Version:	0.9.11
 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.10-fe.tar.bz2
+Source0:        wine-0.9.11-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -18,6 +18,7 @@
 Source104:      wine-winefile.desktop
 Source105:      wine-winemine.desktop
 Source106:      wine-winhelp.desktop
+Patch0:         wine-prefixfonts.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExclusiveArch:  %{ix86}
@@ -143,6 +144,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}-fe
+%patch0
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -330,8 +332,6 @@
 %{_libdir}/wine/avicap32.dll.so
 %{_libdir}/wine/avifil32.dll.so
 %{_libdir}/wine/avifile.dll16
-%{_libdir}/wine/aviinfo.exe.so
-%{_libdir}/wine/aviplay.exe.so
 %{_libdir}/wine/cabinet.dll.so
 %{_libdir}/wine/cards.dll.so
 %{_libdir}/wine/cfgmgr32.dll.so
@@ -517,6 +517,7 @@
 %{_libdir}/wine/winnls32.dll.so
 %{_libdir}/wine/winsock.dll16
 %{_libdir}/wine/winspool.drv.so
+%{_libdir}/wine/spoolss.dll.so
 %{_libdir}/wine/wintab.dll16
 %{_libdir}/wine/wintab32.dll.so
 %{_libdir}/wine/wintrust.dll.so
@@ -633,6 +634,11 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Mon Apr 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.11-1
+- version upgrade
+- fix #187546
+
 * Fri Mar 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de
 0.9.10-1
 - version upgrade



From fedora-extras-commits at redhat.com  Mon Apr  3 11:08:00 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  3 Apr 2006 04:08:00 -0700
Subject: rpms/wine/FC-5 wine-prefixfonts.patch, NONE, 1.1 .cvsignore, 1.12, 
	1.13 sources, 1.13, 1.14 wine.spec, 1.23, 1.24
Message-ID: <200604031108.k33B8WYq009259@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8882/FC-5

Modified Files:
	.cvsignore sources wine.spec 
Added Files:
	wine-prefixfonts.patch 
Log Message:
- version upgrade
- fix #187546


wine-prefixfonts.patch:

--- NEW FILE wine-prefixfonts.patch ---
--- tools/wineprefixcreate.in.orig	2006-04-03 10:04:18.000000000 +0200
+++ tools/wineprefixcreate.in	2006-04-03 10:06:20.000000000 +0200
@@ -170,6 +170,9 @@
 export WINEPREFIX
 "${WINELOADER:-wine}" rundll32.exe setupapi.dll,InstallHinfSection DefaultInstall 128 wine.inf
 
+# Copy the font files
+cp /usr/share/wine/fonts/* "$CROOT/windows/fonts/"
+
 # Wait for the wineserver to finish
 
 if [ $do_wait = 1 ]


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	17 Mar 2006 13:24:54 -0000	1.12
+++ .cvsignore	3 Apr 2006 11:08:00 -0000	1.13
@@ -1 +1 @@
-wine-0.9.10-fe.tar.bz2
+wine-0.9.11-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	17 Mar 2006 13:24:54 -0000	1.13
+++ sources	3 Apr 2006 11:08:00 -0000	1.14
@@ -1 +1 @@
-054e71983834d777be3271f63f8484d6  wine-0.9.10-fe.tar.bz2
+7e67d02051dfb3671990f40734aca89a  wine-0.9.11-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-5/wine.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- wine.spec	19 Mar 2006 23:47:46 -0000	1.23
+++ wine.spec	3 Apr 2006 11:08:00 -0000	1.24
@@ -1,15 +1,16 @@
 %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.10
-Release:	2%{?dist}
+Version:	0.9.11
+Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
 License:	LGPL
 URL:		http://www.winehq.org/
 # special fedora tarball without winemp3 stuff
-Source0:        wine-0.9.10-fe.tar.bz2
+Patch0:         wine-prefixfonts.patch
+Source0:        wine-0.9.11-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -155,6 +156,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}-fe
+%patch0
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -343,8 +345,6 @@
 %{_libdir}/wine/avicap32.dll.so
 %{_libdir}/wine/avifil32.dll.so
 %{_libdir}/wine/avifile.dll16
-%{_libdir}/wine/aviinfo.exe.so
-%{_libdir}/wine/aviplay.exe.so
 %{_libdir}/wine/cabinet.dll.so
 %{_libdir}/wine/cards.dll.so
 %{_libdir}/wine/cfgmgr32.dll.so
@@ -530,6 +530,7 @@
 %{_libdir}/wine/winnls32.dll.so
 %{_libdir}/wine/winsock.dll16
 %{_libdir}/wine/winspool.drv.so
+%{_libdir}/wine/spoolss.dll.so
 %{_libdir}/wine/wintab.dll16
 %{_libdir}/wine/wintab32.dll.so
 %{_libdir}/wine/wintrust.dll.so
@@ -646,6 +647,11 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Mon Apr 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.11-1
+- version upgrade
+- fix #187546
+
 * Mon Mar 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.10-2
 - bump for x86_64 tree inclusion \o/



From fedora-extras-commits at redhat.com  Mon Apr  3 11:08:01 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  3 Apr 2006 04:08:01 -0700
Subject: rpms/wine/devel wine-prefixfonts.patch, NONE, 1.1 .cvsignore, 1.12, 
	1.13 sources, 1.13, 1.14 wine.spec, 1.23, 1.24
Message-ID: <200604031108.k33B8XeA009266@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8882/devel

Modified Files:
	.cvsignore sources wine.spec 
Added Files:
	wine-prefixfonts.patch 
Log Message:
- version upgrade
- fix #187546


wine-prefixfonts.patch:

--- NEW FILE wine-prefixfonts.patch ---
--- tools/wineprefixcreate.in.orig	2006-04-03 10:04:18.000000000 +0200
+++ tools/wineprefixcreate.in	2006-04-03 10:06:20.000000000 +0200
@@ -170,6 +170,9 @@
 export WINEPREFIX
 "${WINELOADER:-wine}" rundll32.exe setupapi.dll,InstallHinfSection DefaultInstall 128 wine.inf
 
+# Copy the font files
+cp /usr/share/wine/fonts/* "$CROOT/windows/fonts/"
+
 # Wait for the wineserver to finish
 
 if [ $do_wait = 1 ]


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	17 Mar 2006 13:25:00 -0000	1.12
+++ .cvsignore	3 Apr 2006 11:08:01 -0000	1.13
@@ -1 +1 @@
-wine-0.9.10-fe.tar.bz2
+wine-0.9.11-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	17 Mar 2006 13:25:00 -0000	1.13
+++ sources	3 Apr 2006 11:08:01 -0000	1.14
@@ -1 +1 @@
-054e71983834d777be3271f63f8484d6  wine-0.9.10-fe.tar.bz2
+7e67d02051dfb3671990f40734aca89a  wine-0.9.11-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- wine.spec	19 Mar 2006 23:47:51 -0000	1.23
+++ wine.spec	3 Apr 2006 11:08:01 -0000	1.24
@@ -1,15 +1,16 @@
 %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.10
-Release:	2%{?dist}
+Version:	0.9.11
+Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
 License:	LGPL
 URL:		http://www.winehq.org/
 # special fedora tarball without winemp3 stuff
-Source0:        wine-0.9.10-fe.tar.bz2
+Patch0:         wine-prefixfonts.patch
+Source0:        wine-0.9.11-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -155,6 +156,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}-fe
+%patch0
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -343,8 +345,6 @@
 %{_libdir}/wine/avicap32.dll.so
 %{_libdir}/wine/avifil32.dll.so
 %{_libdir}/wine/avifile.dll16
-%{_libdir}/wine/aviinfo.exe.so
-%{_libdir}/wine/aviplay.exe.so
 %{_libdir}/wine/cabinet.dll.so
 %{_libdir}/wine/cards.dll.so
 %{_libdir}/wine/cfgmgr32.dll.so
@@ -530,6 +530,7 @@
 %{_libdir}/wine/winnls32.dll.so
 %{_libdir}/wine/winsock.dll16
 %{_libdir}/wine/winspool.drv.so
+%{_libdir}/wine/spoolss.dll.so
 %{_libdir}/wine/wintab.dll16
 %{_libdir}/wine/wintab32.dll.so
 %{_libdir}/wine/wintrust.dll.so
@@ -646,6 +647,11 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Mon Apr 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.11-1
+- version upgrade
+- fix #187546
+
 * Mon Mar 20 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.10-2
 - bump for x86_64 tree inclusion \o/



From fedora-extras-commits at redhat.com  Mon Apr  3 12:05:38 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  3 Apr 2006 05:05:38 -0700
Subject: rpms/fluxbox/FC-5 fluxbox-menu.patch, 1.1, 1.2 fluxbox.spec, 1.17,
	1.18
Message-ID: <200604031205.k33C5egp011957@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/fluxbox/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11920/FC-5

Modified Files:
	fluxbox-menu.patch fluxbox.spec 
Log Message:
- fix #187734


fluxbox-menu.patch:

Index: fluxbox-menu.patch
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/FC-5/fluxbox-menu.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fluxbox-menu.patch	2 Mar 2006 22:57:50 -0000	1.1
+++ fluxbox-menu.patch	3 Apr 2006 12:05:38 -0000	1.2
@@ -5,7 +5,7 @@
  # idesk &
  
 +if [ -x /usr/bin/fluxbox-xdg-menu.py ]; then
-+ /usr/bin/fluxbox-generate_menu --with-icons &
++ /usr/bin/fluxbox-xdg-menu.py --with-icons &
 +fi
 +
  # And last but not least we start fluxbox.


Index: fluxbox.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/FC-5/fluxbox.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- fluxbox.spec	19 Mar 2006 23:31:03 -0000	1.17
+++ fluxbox.spec	3 Apr 2006 12:05:38 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           fluxbox
 Version:        0.9.15
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:	Window Manager based on Blackbox
 
@@ -78,6 +78,10 @@
 %{_datadir}/xsessions/fluxbox.desktop
 
 %changelog
+* Mon Apr 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.15-2
+- fix #187734
+
 * Sun Mar 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.15-1
 - version upgrade



From fedora-extras-commits at redhat.com  Mon Apr  3 12:05:39 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Mon,  3 Apr 2006 05:05:39 -0700
Subject: rpms/fluxbox/devel fluxbox-menu.patch, 1.1, 1.2 fluxbox.spec, 1.17,
	1.18
Message-ID: <200604031205.k33C5fdF011965@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/fluxbox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11920/devel

Modified Files:
	fluxbox-menu.patch fluxbox.spec 
Log Message:
- fix #187734


fluxbox-menu.patch:

Index: fluxbox-menu.patch
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/devel/fluxbox-menu.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fluxbox-menu.patch	2 Mar 2006 22:57:50 -0000	1.1
+++ fluxbox-menu.patch	3 Apr 2006 12:05:39 -0000	1.2
@@ -5,7 +5,7 @@
  # idesk &
  
 +if [ -x /usr/bin/fluxbox-xdg-menu.py ]; then
-+ /usr/bin/fluxbox-generate_menu --with-icons &
++ /usr/bin/fluxbox-xdg-menu.py --with-icons &
 +fi
 +
  # And last but not least we start fluxbox.


Index: fluxbox.spec
===================================================================
RCS file: /cvs/extras/rpms/fluxbox/devel/fluxbox.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- fluxbox.spec	19 Mar 2006 23:31:09 -0000	1.17
+++ fluxbox.spec	3 Apr 2006 12:05:39 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           fluxbox
 Version:        0.9.15
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:	Window Manager based on Blackbox
 
@@ -78,6 +78,10 @@
 %{_datadir}/xsessions/fluxbox.desktop
 
 %changelog
+* Mon Apr 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.15-2
+- fix #187734
+
 * Sun Mar 19 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.15-1
 - version upgrade



From fedora-extras-commits at redhat.com  Mon Apr  3 12:12:11 2006
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon,  3 Apr 2006 05:12:11 -0700
Subject: rpms/driftnet - New directory
Message-ID: <200604031212.k33CCDjb012125@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/extras/rpms/driftnet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12099/driftnet

Log Message:
Directory /cvs/extras/rpms/driftnet added to the repository




From fedora-extras-commits at redhat.com  Mon Apr  3 12:12:12 2006
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon,  3 Apr 2006 05:12:12 -0700
Subject: rpms/driftnet/devel - New directory
Message-ID: <200604031212.k33CCExI012128@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/extras/rpms/driftnet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12099/driftnet/devel

Log Message:
Directory /cvs/extras/rpms/driftnet/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Apr  3 12:12:41 2006
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon,  3 Apr 2006 05:12:41 -0700
Subject: rpms/driftnet Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604031212.k33CChPP012177@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/extras/rpms/driftnet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12144

Added Files:
	Makefile import.log 
Log Message:
Setup of module driftnet


--- NEW FILE Makefile ---
# Top level Makefile for module driftnet
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr  3 12:12:42 2006
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon,  3 Apr 2006 05:12:42 -0700
Subject: rpms/driftnet/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604031212.k33CCiaI012180@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/extras/rpms/driftnet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12144/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module driftnet


--- 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 Apr  3 12:15:00 2006
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon,  3 Apr 2006 05:15:00 -0700
Subject: rpms/driftnet import.log,1.1,1.2
Message-ID: <200604031215.k33CF2vP012273@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/extras/rpms/driftnet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12233

Modified Files:
	import.log 
Log Message:
auto-import driftnet-0.1.6-7 on branch devel from driftnet-0.1.6-7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/driftnet/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	3 Apr 2006 12:12:41 -0000	1.1
+++ import.log	3 Apr 2006 12:14:59 -0000	1.2
@@ -0,0 +1 @@
+driftnet-0_1_6-7:HEAD:driftnet-0.1.6-7.src.rpm:1144066487



From fedora-extras-commits at redhat.com  Mon Apr  3 12:15:00 2006
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon,  3 Apr 2006 05:15:00 -0700
Subject: rpms/driftnet/devel driftnet-0.1.6-no-makedepend.patch, NONE,
	1.1 driftnet-0.1.6-pam.config, NONE,
	1.1 driftnet-0.1.6-security.config, NONE,
	1.1 driftnet-dont-use-tmpnam.patch, NONE,
	1.1 driftnet-gtk2-port.patch, NONE, 1.1 driftnet.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604031215.k33CF2dl012284@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/extras/rpms/driftnet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12233/devel

Modified Files:
	.cvsignore sources 
Added Files:
	driftnet-0.1.6-no-makedepend.patch driftnet-0.1.6-pam.config 
	driftnet-0.1.6-security.config driftnet-dont-use-tmpnam.patch 
	driftnet-gtk2-port.patch driftnet.spec 
Log Message:
auto-import driftnet-0.1.6-7 on branch devel from driftnet-0.1.6-7.src.rpm

driftnet-0.1.6-no-makedepend.patch:

--- NEW FILE driftnet-0.1.6-no-makedepend.patch ---
diff -urN driftnet-0.1.6.old/endian.c driftnet-0.1.6/endian.c
--- driftnet-0.1.6.old/endian.c	2002-07-09 20:26:41.000000000 +0100
+++ driftnet-0.1.6/endian.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,37 +0,0 @@
-/*
- * endian.c:
- * Determine platform endianness.
- *
- * Copyright (c) 2002 . All rights reserved.
- * Email: chris at ex-parrot.com; WWW: http://www.ex-parrot.com/~chris/
- *
- */
-
-static const char rcsid[] = "$Id: endian.c,v 1.5 2002/06/10 21:25:48 chris Exp $";
-
-#include <stdio.h>
-#ifdef USE_SYS_TYPES_H
-#   include <sys/types.h>       /* Solaris etc. */
-#else
-#   include <stdint.h>          /* C99 standard. */
-#endif
-
-int main(void) {
-#if defined(LITTLE_ENDIAN) || defined(_LITTLE_ENDIAN)
-    printf("-DDRIFTNET_LITTLE_ENDIAN\n");
-	return 0;
-#elif defined(BIG_ENDIAN) || defined(_BIG_ENDIAN)
-    printf("-DDRIFTNET_BIG_ENDIAN\n");
-	return 0;
-#else
-    uint32_t a = 0;
-    *((uint8_t*)&a) = 0xff;
-    if (a == 0xff000000)
-        printf("-DDRIFTNET_BIG_ENDIAN\n");
-    else if (a == 0x000000ff)
-        printf("-DDRIFTNET_LITTLE_ENDIAN\n");
-    else
-        return -1; /* don't know. */
-#endif  /* endianness test */
-    return 0;
-}
diff -urN driftnet-0.1.6.old/img.h driftnet-0.1.6/img.h
--- driftnet-0.1.6.old/img.h	2002-07-09 20:26:41.000000000 +0100
+++ driftnet-0.1.6/img.h	2006-04-03 13:05:04.000000000 +0100
@@ -21,12 +21,13 @@
 #endif
 
 #include <stdio.h>
+#include <glib.h>
 
 typedef uint8_t chan;
 typedef uint32_t pel;
 
 /* Yuk. GDKRGB expects data in a specific ordering. */
-#if defined(DRIFTNET_LITTLE_ENDIAN)
+#if (G_BYTE_ORDER == G_LITTLE_ENDIAN)
 #   define PEL(r, g, b)        ((pel)((chan)(r) | ((chan)(g) << 8) | ((chan)(b) << 16)))
 #   define PELA(r, g, b, a)    ((pel)((chan)(r) | ((chan)(g) << 8) | ((chan)(b) << 16) | ((chan)(a) << 24)))
 
@@ -34,7 +35,7 @@
 #   define GETG(p)             ((chan)(((p) & (pel)0x0000ff00) >>  8))
 #   define GETB(p)             ((chan)(((p) & (pel)0x00ff0000) >> 16))
 #   define GETA(p)             ((chan)(((p) & (pel)0xff000000) >> 24))
-#elif defined(DRIFTNET_BIG_ENDIAN)
+#elif defined(G_BYTE_ORDER == G_BIG_ENDIAN)
 #   define PEL(r, g, b)        ((pel)(((chan)(r) << 24) | ((chan)(g) << 16) | ((chan)(b) << 8)))
 #   define PELA(r, g, b, a)    ((pel)(((chan)(r) << 24) | ((chan)(g) << 16) | ((chan)(b) << 8) | ((chan)(a))))
 
diff -urN driftnet-0.1.6.old/Makefile driftnet-0.1.6/Makefile
--- driftnet-0.1.6.old/Makefile	2006-04-03 13:02:13.000000000 +0100
+++ driftnet-0.1.6/Makefile	2006-04-03 13:06:00.000000000 +0100
@@ -67,7 +67,7 @@
 
 SUBDIRS = 
 
-TXTS = README TODO COPYING CHANGES CREDITS driftnet.1 driftnet.1.in endian.c
+TXTS = README TODO COPYING CHANGES CREDITS driftnet.1 driftnet.1.in
 SRCS = audio.c mpeghdr.c gif.c img.c jpeg.c png.c driftnet.c image.c \
        display.c playaudio.c connection.c media.c
 HDRS = img.h driftnet.h mpeghdr.h
@@ -77,41 +77,26 @@
 
 default: driftnet driftnet.1
 
-driftnet:   depend $(OBJS)
+driftnet:   $(OBJS)
 	$(CC) -o driftnet $(OBJS) $(LDFLAGS) $(LDLIBS)
 
 driftnet.1: driftnet.1.in Makefile
 	( echo '.\" DO NOT EDIT THIS FILE-- edit driftnet.1.in instead' ; sed s/@@@VERSION@@@/$(VERSION)/ ) < driftnet.1.in > driftnet.1
 
-endianness: endian
-	./endian > endianness
+%.o:    %.c Makefile
+	$(CC) $(CFLAGS) -c -o $@ $<
 
-endian: endian.c
-	$(CC) $(CFLAGS) -o endian endian.c
-
-%.o:    %.c Makefile endianness
-	$(CC) $(CFLAGS) `cat endianness` -c -o $@ $<
-
-clean:  nodepend
-	rm -f *~ *.bak *.o core $(BINS) TAGS driftnet.1 endian endianness
+clean:
+	rm -f *~ *.bak *.o core $(BINS) TAGS driftnet.1
 
 tags:
 	etags *.c *.h
 
-tarball: nodepend $(SRCS) $(HDRS) $(TXTS)
+tarball: $(SRCS) $(HDRS) $(TXTS)
 	mkdir driftnet-$(VERSION)
 	set -e ; for i in Makefile $(SRCS) $(HDRS) $(TXTS) ; do cp $$i driftnet-$(VERSION)/$$i ; done
 	tar cvzf driftnet-$(VERSION).tar.gz driftnet-$(VERSION)
 	rm -rf driftnet-$(VERSION)
 	mv driftnet-$(VERSION).tar.gz ..
 	
-depend: endianness
-	makedepend -- $(CFLAGS) `cat endianness` -- $(SRCS)
-	touch depend
-	rm -f Makefile.bak
-
-nodepend:
-	makedepend -- --
-	rm -f depend Makefile.bak
-
 # DO NOT DELETE


--- NEW FILE driftnet-0.1.6-pam.config ---
#%PAM-1.0
auth       sufficient   pam_rootok.so
auth       sufficient   pam_timestamp.so
auth       include      system-auth
session    required     pam_permit.so
session    optional     pam_xauth.so
session    optional     pam_timestamp.so
account    required     pam_permit.so


--- NEW FILE driftnet-0.1.6-security.config ---
USER=root
PROGRAM=/usr/sbin/driftnet
SESSION=true

driftnet-dont-use-tmpnam.patch:

--- NEW FILE driftnet-dont-use-tmpnam.patch ---
diff -urp driftnet-0.1.6.old/driftnet.c driftnet-0.1.6/driftnet.c
--- driftnet-0.1.6.old/driftnet.c	2002-07-09 20:26:41.000000000 +0100
+++ driftnet-0.1.6/driftnet.c	2005-12-13 16:52:04.000000000 +0000
@@ -11,6 +11,8 @@ static const char rcsid[] = "$Id: driftn
 
 #undef NDEBUG
 
+#include <glib.h>
+
 #include <assert.h>
 #include <dirent.h>
 #include <errno.h>
@@ -585,10 +587,15 @@ int main(int argc, char *argv[]) {
     } else {
         /* need to make a temporary directory. */
         for (;;) {
-            tmpdir = strdup(tmpnam(NULL));
-            if (mkdir(tmpdir, 0700) == 0)
-                break;
-            free(tmpdir);
+            const char *tmp;
+	    char *template;
+
+	    tmp = g_get_tmp_dir();
+	    template = g_build_filename(tmp, "drifnet-XXXXXX", NULL);
+	    tmpdir = mkdtemp (template);
+	    g_free (template);
+	    if (tmpdir)
+		break;
         }
     }
 

driftnet-gtk2-port.patch:

--- NEW FILE driftnet-gtk2-port.patch ---
diff -urN driftnet-0.1.6/display.c driftnet-0.1.6.bak/display.c
--- driftnet-0.1.6/display.c	2002-07-09 20:26:41.000000000 +0100
+++ driftnet-0.1.6.bak/display.c	2004-04-17 22:08:25.373349299 +0100
@@ -20,6 +20,7 @@
 #include <fcntl.h>
 #include <string.h>
 #include <errno.h>
+#include <time.h>
 
 #include <sys/stat.h>
 
@@ -104,7 +105,7 @@
         GdkGC *gc;
         gc = gdk_gc_new(drawable);
         gdk_draw_rgb_32_image(drawable, gc, 0, 0, width, height, GDK_RGB_DITHER_NORMAL, (guchar*)backing_image->flat, sizeof(pel) * width);
-        gdk_gc_destroy(gc);
+        g_object_unref(gc);
     }
 }
 
@@ -172,7 +173,7 @@
  * React to an expose event, perhaps changing the backing image size. */
 void expose_event(GtkWidget *widget, GdkEvent *event, gpointer data) {
     if (darea) drawable = darea->window;
-    gdk_window_get_size(drawable, &width, &height);
+    gdk_drawable_get_size(GDK_DRAWABLE(drawable), &width, &height);
     if (!backing_image || backing_image->width != width || backing_image->height != height)
         make_backing_image();
 
@@ -183,7 +184,7 @@
  * React to a configure event, perhaps changing the backing image size. */
 void configure_event(GtkWidget *widget, GdkEvent *event, gpointer data) {
     if (darea) drawable = darea->window;
-    gdk_window_get_size(drawable, &width, &height);
+    gdk_drawable_get_size(GDK_DRAWABLE(drawable), &width, &height);
     if (!backing_image || backing_image->width != width || backing_image->height != height)
         make_backing_image();
 
@@ -387,28 +388,26 @@
        
     /* do some init thing */
     gtk_init(&argc, &argv);
-    gdk_rgb_init();
 
-    gtk_widget_set_default_colormap(gdk_rgb_get_cmap());
-    gtk_widget_set_default_visual(gdk_rgb_get_visual());
+    gtk_widget_push_colormap(gdk_rgb_get_colormap());
 
     /* Make our own window. */
     window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
-    gtk_widget_set_usize(window, 0, 0);
+    gtk_widget_set_size_request(window, 0, 0);
 
     darea = gtk_drawing_area_new();
     gtk_container_add(GTK_CONTAINER(window), darea);
     gtk_widget_set_events(darea, GDK_EXPOSURE_MASK|GDK_BUTTON_PRESS_MASK|GDK_BUTTON_RELEASE_MASK);
 
-    gtk_signal_connect(GTK_OBJECT(window), "delete_event", GTK_SIGNAL_FUNC(delete_event), NULL);
-    gtk_signal_connect(GTK_OBJECT(window), "destroy", GTK_SIGNAL_FUNC(destroy), NULL);
+    g_signal_connect(G_OBJECT(window), "delete_event", GTK_SIGNAL_FUNC(delete_event), NULL);
+    g_signal_connect(G_OBJECT(window), "destroy", GTK_SIGNAL_FUNC(destroy), NULL);
 
-    gtk_signal_connect(GTK_OBJECT(darea), "expose-event", GTK_SIGNAL_FUNC(expose_event), NULL);
-    gtk_signal_connect(GTK_OBJECT(darea), "configure_event", GTK_SIGNAL_FUNC(expose_event), NULL);
+    g_signal_connect(G_OBJECT(darea), "expose-event", GTK_SIGNAL_FUNC(expose_event), NULL);
+    g_signal_connect(G_OBJECT(darea), "configure_event", GTK_SIGNAL_FUNC(expose_event), NULL);
     
     /* mouse button press/release for saving images */
-    gtk_signal_connect(GTK_OBJECT(darea), "button_press_event", GTK_SIGNAL_FUNC(button_press_event), NULL);
-    gtk_signal_connect(GTK_OBJECT(darea), "button_press_event", GTK_SIGNAL_FUNC(button_release_event), NULL);
+    g_signal_connect(G_OBJECT(darea), "button_press_event", GTK_SIGNAL_FUNC(button_press_event), NULL);
+    g_signal_connect(G_OBJECT(darea), "button_press_event", GTK_SIGNAL_FUNC(button_release_event), NULL);
 
     gtk_widget_show_all(window);
 
diff -urN driftnet-0.1.6/Makefile driftnet-0.1.6.bak/Makefile
--- driftnet-0.1.6/Makefile	2004-04-17 21:57:20.454251440 +0100
+++ driftnet-0.1.6.bak/Makefile	2004-04-17 22:08:31.654607973 +0100
@@ -31,8 +31,11 @@
 
 # Optional C compiler and linker flags. Typical driftnet builds have support
 # for displaying captured images in an X window, and need the following flags:
-CFLAGS  += `gtk-config --cflags`
-LDLIBS  += -ljpeg -lungif `gtk-config --libs`
+CFLAGS  += `pkg-config --cflags gtk+-2.0`
+LDLIBS  += -ljpeg -lungif `pkg-config --libs gtk+-2.0`
+
+# For development, disable the deprecated shite
+CFLAGS += -DGTK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED
 
 # Alternatively, you can build a version of driftnet which can only be used
 # in `adjunct' mode as the back end for some other image-processing program. To


--- NEW FILE driftnet.spec ---
Name: driftnet
License: GPL
Group: Applications/Internet
Version: 0.1.6
Release: 7
Summary: Network image sniffer
URL: http://www.ex-parrot.com/~chris/driftnet/
Source0: http://www.ex-parrot.com/~chris/driftnet/driftnet-0.1.6.tar.gz
Source1: %name-%{version}-pam.config
Source2: %name-%{version}-security.config
Patch0: driftnet-gtk2-port.patch
Patch1: driftnet-dont-use-tmpnam.patch
Patch2: driftnet-0.1.6-no-makedepend.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libpcap gtk2-devel libungif-devel libjpeg-devel
Requires: %{_bindir}/consolehelper

%description
Driftnet is a program which listens to network traffic and picks out images 
from TCP streams it observes. Fun to run on a host which sees lots of web 
traffic.

%prep
%setup -q
%patch0 -p1 -b .gtk2
%patch1 -p1 -b .tmpnam
%patch2 -p1 -b .makedep

%build
CFLAGS="$RPM_OPT_FLAGS" make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
install -Dpm 0755 driftnet  \
	$RPM_BUILD_ROOT%{_sbindir}/driftnet
install -Dpm 0644 driftnet.1 \
	$RPM_BUILD_ROOT/%{_mandir}/man1/driftnet.1
ln -sf consolehelper $RPM_BUILD_ROOT%{_bindir}/driftnet
install -Dpm 644 %{SOURCE1} \
	$RPM_BUILD_ROOT%{_sysconfdir}/pam.d/driftnet
install -Dpm 644 %{SOURCE2} \
	$RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/driftnet

%files
%defattr(-,root,root,-)
%doc CHANGES COPYING CREDITS README TODO
%{_bindir}/driftnet
%{_sbindir}/driftnet
%config(noreplace) %{_sysconfdir}/pam.d/driftnet
%config %{_sysconfdir}/security/console.apps/driftnet
%{_mandir}/man1/driftnet.1*

%clean
rm -rf $RPM_BUILD_ROOT

%changelog
* Mon Apr 03 2006 - Bastien Nocera <hadess at hadess.net> - 0.1.6-7
- spell "driftnet" correctly in driftnet-dont-use-tmpnam.patch
  Add patch2 to remove imake dependency
  update the PAM config to be more like existing ones
  move buildroot deletion to install from prep
  Thanks to Adrian Reber <adrian at lisas.de> for pointing to those last 2

* Tue Dec 13 2005 - Bastien Nocera <hadess at hadess.net> - 0.1.6-6
- update for FC5, don't use tmpnam

* Fri Nov 11 2005 - Bastien Nocera <hadess at hadess.net> - 0.1.6-5
- Major cleanups by Adrian Reber <adrian at lisas.de>

* Sat Apr 17 2004 - Bastien Nocera <hadess at hadess.net> - 0.1.6-4
- Oops, it wasn't a GTK2 application, ended up porting it

* Sat Apr 10 2004 - Bastien Nocera <hadess at hadess.net> - 0.1.6-3
- Recompile against a newer libpcap

* Fri Jun 20 2003 - Bastien Nocera <hadess at hadess.net> - 0.1.6-2
- Added a PAM configuration file

* Fri Jun 20 2003 - Bastien Nocera <hadess at hadess.net> - 0.1.6-1
- First release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/driftnet/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Apr 2006 12:12:41 -0000	1.1
+++ .cvsignore	3 Apr 2006 12:15:00 -0000	1.2
@@ -0,0 +1 @@
+driftnet-0.1.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/driftnet/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Apr 2006 12:12:41 -0000	1.1
+++ sources	3 Apr 2006 12:15:00 -0000	1.2
@@ -0,0 +1 @@
+8e11d77770452f97bb3c23f510489815  driftnet-0.1.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr  3 12:23:29 2006
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon,  3 Apr 2006 05:23:29 -0700
Subject: owners owners.list,1.797,1.798
Message-ID: <200604031223.k33CNVg0012370@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12341

Modified Files:
	owners.list 
Log Message:
Added driftnet



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.797
retrieving revision 1.798
diff -u -r1.797 -r1.798
--- owners.list	3 Apr 2006 06:03:25 -0000	1.797
+++ owners.list	3 Apr 2006 12:23:29 -0000	1.798
@@ -197,6 +197,7 @@
 Fedora Extras|doulos-fonts|Doulos SIL fonts|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|drgeo-doc|html documentation for drgeo|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
 Fedora Extras|drgeo|Interactive educational geometry software|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
+Fedora Extras|driftnet|Network image sniffer|hadess at hadess.net|extras-qa at fedoraproject.org|
 Fedora Extras|drivel|A journal or "blog" client|stickster at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|drscheme|Graphical environment for developing programs using Scheme|gemi at bluewin.ch|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|



From fedora-extras-commits at redhat.com  Mon Apr  3 13:04:45 2006
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon,  3 Apr 2006 06:04:45 -0700
Subject: rpms/driftnet/devel driftnet-0.1.6-no-makedepend.patch, 1.1,
	1.2 driftnet.spec, 1.1, 1.2
Message-ID: <200604031304.k33D4lKk014649@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/extras/rpms/driftnet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14625

Modified Files:
	driftnet-0.1.6-no-makedepend.patch driftnet.spec 
Log Message:
* Mon Apr 03 2006 - Bastien Nocera <hadess at hadess.net> - 0.1.6-8
- Fix typo in the imake removal patch that broke on big endian machines


driftnet-0.1.6-no-makedepend.patch:

Index: driftnet-0.1.6-no-makedepend.patch
===================================================================
RCS file: /cvs/extras/rpms/driftnet/devel/driftnet-0.1.6-no-makedepend.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- driftnet-0.1.6-no-makedepend.patch	3 Apr 2006 12:15:00 -0000	1.1
+++ driftnet-0.1.6-no-makedepend.patch	3 Apr 2006 13:04:44 -0000	1.2
@@ -62,7 +62,7 @@
  #   define GETB(p)             ((chan)(((p) & (pel)0x00ff0000) >> 16))
  #   define GETA(p)             ((chan)(((p) & (pel)0xff000000) >> 24))
 -#elif defined(DRIFTNET_BIG_ENDIAN)
-+#elif defined(G_BYTE_ORDER == G_BIG_ENDIAN)
++#elif (G_BYTE_ORDER == G_BIG_ENDIAN)
  #   define PEL(r, g, b)        ((pel)(((chan)(r) << 24) | ((chan)(g) << 16) | ((chan)(b) << 8)))
  #   define PELA(r, g, b, a)    ((pel)(((chan)(r) << 24) | ((chan)(g) << 16) | ((chan)(b) << 8) | ((chan)(a))))
  


Index: driftnet.spec
===================================================================
RCS file: /cvs/extras/rpms/driftnet/devel/driftnet.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- driftnet.spec	3 Apr 2006 12:15:00 -0000	1.1
+++ driftnet.spec	3 Apr 2006 13:04:44 -0000	1.2
@@ -2,7 +2,7 @@
 License: GPL
 Group: Applications/Internet
 Version: 0.1.6
-Release: 7
+Release: 8
 Summary: Network image sniffer
 URL: http://www.ex-parrot.com/~chris/driftnet/
 Source0: http://www.ex-parrot.com/~chris/driftnet/driftnet-0.1.6.tar.gz
@@ -55,6 +55,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 03 2006 - Bastien Nocera <hadess at hadess.net> - 0.1.6-8
+- Fix typo in the imake removal patch that broke on big endian machines
+
 * Mon Apr 03 2006 - Bastien Nocera <hadess at hadess.net> - 0.1.6-7
 - spell "driftnet" correctly in driftnet-dont-use-tmpnam.patch
   Add patch2 to remove imake dependency



From fedora-extras-commits at redhat.com  Mon Apr  3 13:10:33 2006
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon,  3 Apr 2006 06:10:33 -0700
Subject: rpms/driftnet/devel driftnet.spec,1.2,1.3
Message-ID: <200604031310.k33DAZnT014776@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/extras/rpms/driftnet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14759

Modified Files:
	driftnet.spec 
Log Message:
- build update



Index: driftnet.spec
===================================================================
RCS file: /cvs/extras/rpms/driftnet/devel/driftnet.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- driftnet.spec	3 Apr 2006 13:04:44 -0000	1.2
+++ driftnet.spec	3 Apr 2006 13:10:33 -0000	1.3
@@ -2,7 +2,7 @@
 License: GPL
 Group: Applications/Internet
 Version: 0.1.6
-Release: 8
+Release: 9
 Summary: Network image sniffer
 URL: http://www.ex-parrot.com/~chris/driftnet/
 Source0: http://www.ex-parrot.com/~chris/driftnet/driftnet-0.1.6.tar.gz
@@ -55,7 +55,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %changelog
-* Mon Apr 03 2006 - Bastien Nocera <hadess at hadess.net> - 0.1.6-8
+* Mon Apr 03 2006 - Bastien Nocera <hadess at hadess.net> - 0.1.6-9
 - Fix typo in the imake removal patch that broke on big endian machines
 
 * Mon Apr 03 2006 - Bastien Nocera <hadess at hadess.net> - 0.1.6-7



From fedora-extras-commits at redhat.com  Mon Apr  3 13:16:49 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  3 Apr 2006 06:16:49 -0700
Subject: rpms/kile/devel .cvsignore, 1.4, 1.5 kile.spec, 1.24, 1.25 sources, 
	1.4, 1.5
Message-ID: <200604031316.k33DGpxq014853@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14832

Modified Files:
	.cvsignore kile.spec sources 
Log Message:
* Fri Mar 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9-1
- 1.9(final)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kile/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Aug 2005 18:28:43 -0000	1.4
+++ .cvsignore	3 Apr 2006 13:16:49 -0000	1.5
@@ -1 +1 @@
-kile-1.8.1.tar.bz2
+kile-1.9.tar.bz2


Index: kile.spec
===================================================================
RCS file: /cvs/extras/rpms/kile/devel/kile.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- kile.spec	1 Mar 2006 16:37:43 -0000	1.24
+++ kile.spec	3 Apr 2006 13:16:49 -0000	1.25
@@ -1,24 +1,23 @@
 
 Name:	 kile
 Summary: (La)TeX source editor and TeX shell
-Version: 1.8.1
-Release: 7%{?dist}.2
+Version: 1.9
+Release: 1%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
 URL:	 http://kile.sourceforge.net/
-Source0: http://dl.sourceforge.net/sourceforge/kile/kile-1.8.1.tar.bz2
+Source0: http://dl.sourceforge.net/sourceforge/kile/kile-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
+BuildRequires: gettext
 BuildRequires: desktop-file-utils
-
-BuildRequires: qt-devel >= 1:3.3
-BuildRequires: kdelibs-devel >= 6:3.3
+BuildRequires: kdelibs-devel
 
 Requires: tetex-latex
 ## Optional/recommended, but not absolutely required.
-#Requires: gnuplot
-#Requires: xfig
+#Requires(hint): gnuplot
+#Requires(hint): xfig
 
 # kile-i18n is no longer separate pkg
 Obsoletes: kile-i18n < %{version}
@@ -52,8 +51,10 @@
 
 %configure \
   --disable-rpath \
+  --disable-gcc-hidden-visibility \
+  --enable-new-ldflags \
   --disable-debug --disable-warnings \
-  --disable-dependency-tracking --enable-final
+  --disable-dependancy-tracking --enable-final 
 
 make %{?_smp_mflags}
 
@@ -63,11 +64,11 @@
 
 make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install --vendor fedora \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/appl*/*/*.desktop
+desktop-file-install \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  --vendor="" \
+  --add-category="X-Fedora" \
+  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
   
 ## File lists
 # locale's
@@ -94,29 +95,25 @@
 
 
 %post
-for icon_theme in hicolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
 
 %postun
-for icon_theme in hicolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog README TODO
 %{_bindir}/*
-%{_datadir}/apps/kile
+%{_datadir}/apps/kile/
 %{_datadir}/apps/kconf_update/kile*
 %config %{_datadir}/config*/*
 %{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/kde/*.desktop
 %{_datadir}/mimelnk/*/*.desktop
 
 
@@ -125,6 +122,12 @@
 
 
 %changelog
+* Fri Mar 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9-1
+- 1.9(final)
+
+* Mon Mar 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9-0.1.rc
+- 1.9rc1
+
 * Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net>
 - fc5: gcc/glibc respin
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kile/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Aug 2005 18:28:43 -0000	1.4
+++ sources	3 Apr 2006 13:16:49 -0000	1.5
@@ -1 +1 @@
-9ac4cd9294c6aff1acca1def68923a7d  kile-1.8.1.tar.bz2
+32b660b4baccecf895d40c5ed43d2ffc  kile-1.9.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr  3 13:19:56 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Mon,  3 Apr 2006 06:19:56 -0700
Subject: rpms/mediawiki/devel .cvsignore, 1.3, 1.4 mediawiki.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200604031319.k33DJwJN014924@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/mediawiki/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14903

Modified Files:
	.cvsignore mediawiki.spec sources 
Log Message:
* Mon Apr 03 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.5.8-1
- Update to upstream 1.5.8 (contains security fixes)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Mar 2006 21:15:59 -0000	1.3
+++ .cvsignore	3 Apr 2006 13:19:56 -0000	1.4
@@ -1 +1 @@
-mediawiki-1.5.7.tar.gz
+mediawiki-1.5.8.tar.gz


Index: mediawiki.spec
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/devel/mediawiki.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mediawiki.spec	2 Mar 2006 21:15:59 -0000	1.4
+++ mediawiki.spec	3 Apr 2006 13:19:56 -0000	1.5
@@ -1,7 +1,7 @@
 %define wikidir %{_var}/www/mediawiki
 
 Name:           mediawiki
-Version:        1.5.7
+Version:        1.5.8
 Release:        1%{?dist}
 Summary:        The PHP-based wiki software behind Wikipedia
 
@@ -89,6 +89,9 @@
 
 
 %changelog
+* Mon Apr 03 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.5.8-1
+- Update to upstream 1.5.8 (contains security fixes)
+
 * Thu Mar 02 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.5.7-1
 - Update to upstream 1.5.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Mar 2006 21:15:59 -0000	1.3
+++ sources	3 Apr 2006 13:19:56 -0000	1.4
@@ -1 +1 @@
-0a2347e2422006d8f75479b06c1963d8  mediawiki-1.5.7.tar.gz
+1eef94157377fa8c3d049877a27c0163  mediawiki-1.5.8.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr  3 13:25:11 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Mon,  3 Apr 2006 06:25:11 -0700
Subject: rpms/mediawiki/FC-4 .cvsignore, 1.3, 1.4 mediawiki.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200604031325.k33DPDor014975@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/mediawiki/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14954

Modified Files:
	.cvsignore mediawiki.spec sources 
Log Message:
* Mon Apr 03 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.5.8-1
- Update to upstream 1.5.8 (contains security fixes)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Mar 2006 21:33:16 -0000	1.3
+++ .cvsignore	3 Apr 2006 13:25:11 -0000	1.4
@@ -1 +1 @@
-mediawiki-1.5.7.tar.gz
+mediawiki-1.5.8.tar.gz


Index: mediawiki.spec
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/FC-4/mediawiki.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mediawiki.spec	2 Mar 2006 21:33:16 -0000	1.3
+++ mediawiki.spec	3 Apr 2006 13:25:11 -0000	1.4
@@ -1,7 +1,7 @@
 %define wikidir %{_var}/www/mediawiki
 
 Name:           mediawiki
-Version:        1.5.7
+Version:        1.5.8
 Release:        1%{?dist}
 Summary:        The PHP-based wiki software behind Wikipedia
 
@@ -89,6 +89,9 @@
 
 
 %changelog
+* Mon Apr 03 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.5.8-1
+- Update to upstream 1.5.8 (contains security fixes)
+
 * Thu Mar 02 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.5.7-1
 - Update to upstream 1.5.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Mar 2006 21:33:16 -0000	1.3
+++ sources	3 Apr 2006 13:25:11 -0000	1.4
@@ -1 +1 @@
-0a2347e2422006d8f75479b06c1963d8  mediawiki-1.5.7.tar.gz
+1eef94157377fa8c3d049877a27c0163  mediawiki-1.5.8.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr  3 13:36:11 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  3 Apr 2006 06:36:11 -0700
Subject: rpms/kile/FC-5 .cvsignore, 1.4, 1.5 kile.spec, 1.24, 1.25 sources,
	1.4, 1.5
Message-ID: <200604031336.k33DaDvP015061@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kile/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15040

Modified Files:
	.cvsignore kile.spec sources 
Log Message:
* Fri Mar 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9-1
- 1.9(final)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Aug 2005 18:28:43 -0000	1.4
+++ .cvsignore	3 Apr 2006 13:36:11 -0000	1.5
@@ -1 +1 @@
-kile-1.8.1.tar.bz2
+kile-1.9.tar.bz2


Index: kile.spec
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-5/kile.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- kile.spec	1 Mar 2006 16:37:43 -0000	1.24
+++ kile.spec	3 Apr 2006 13:36:11 -0000	1.25
@@ -1,24 +1,23 @@
 
 Name:	 kile
 Summary: (La)TeX source editor and TeX shell
-Version: 1.8.1
-Release: 7%{?dist}.2
+Version: 1.9
+Release: 1%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
 URL:	 http://kile.sourceforge.net/
-Source0: http://dl.sourceforge.net/sourceforge/kile/kile-1.8.1.tar.bz2
+Source0: http://dl.sourceforge.net/sourceforge/kile/kile-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
+BuildRequires: gettext
 BuildRequires: desktop-file-utils
-
-BuildRequires: qt-devel >= 1:3.3
-BuildRequires: kdelibs-devel >= 6:3.3
+BuildRequires: kdelibs-devel
 
 Requires: tetex-latex
 ## Optional/recommended, but not absolutely required.
-#Requires: gnuplot
-#Requires: xfig
+#Requires(hint): gnuplot
+#Requires(hint): xfig
 
 # kile-i18n is no longer separate pkg
 Obsoletes: kile-i18n < %{version}
@@ -52,8 +51,10 @@
 
 %configure \
   --disable-rpath \
+  --disable-gcc-hidden-visibility \
+  --enable-new-ldflags \
   --disable-debug --disable-warnings \
-  --disable-dependency-tracking --enable-final
+  --disable-dependancy-tracking --enable-final 
 
 make %{?_smp_mflags}
 
@@ -63,11 +64,11 @@
 
 make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install --vendor fedora \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/appl*/*/*.desktop
+desktop-file-install \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  --vendor="" \
+  --add-category="X-Fedora" \
+  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
   
 ## File lists
 # locale's
@@ -94,29 +95,25 @@
 
 
 %post
-for icon_theme in hicolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
 
 %postun
-for icon_theme in hicolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog README TODO
 %{_bindir}/*
-%{_datadir}/apps/kile
+%{_datadir}/apps/kile/
 %{_datadir}/apps/kconf_update/kile*
 %config %{_datadir}/config*/*
 %{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/kde/*.desktop
 %{_datadir}/mimelnk/*/*.desktop
 
 
@@ -125,6 +122,12 @@
 
 
 %changelog
+* Fri Mar 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9-1
+- 1.9(final)
+
+* Mon Mar 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9-0.1.rc
+- 1.9rc1
+
 * Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net>
 - fc5: gcc/glibc respin
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Aug 2005 18:28:43 -0000	1.4
+++ sources	3 Apr 2006 13:36:11 -0000	1.5
@@ -1 +1 @@
-9ac4cd9294c6aff1acca1def68923a7d  kile-1.8.1.tar.bz2
+32b660b4baccecf895d40c5ed43d2ffc  kile-1.9.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr  3 13:36:36 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  3 Apr 2006 06:36:36 -0700
Subject: rpms/kile/FC-4 .cvsignore, 1.3, 1.4 kile.spec, 1.19, 1.20 sources,
	1.4, 1.5
Message-ID: <200604031336.k33DacMp015126@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kile/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15105

Modified Files:
	.cvsignore kile.spec sources 
Log Message:
* Fri Mar 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9-1
- 1.9(final)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Jan 2005 15:32:49 -0000	1.3
+++ .cvsignore	3 Apr 2006 13:36:36 -0000	1.4
@@ -1 +1 @@
-kile-1.7.1.tar.bz2
+kile-1.9.tar.bz2


Index: kile.spec
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-4/kile.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- kile.spec	15 Dec 2005 17:52:52 -0000	1.19
+++ kile.spec	3 Apr 2006 13:36:36 -0000	1.20
@@ -1,26 +1,23 @@
 
 Name:	 kile
 Summary: (La)TeX source editor and TeX shell
-Version: 1.8.1
-Release: 7%{?dist}
+Version: 1.9
+Release: 1%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
 URL:	 http://kile.sourceforge.net/
-Source0: http://dl.sourceforge.net/sourceforge/kile/kile-1.8.1.tar.bz2
+Source0: http://dl.sourceforge.net/sourceforge/kile/kile-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
+BuildRequires: gettext
 BuildRequires: desktop-file-utils
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
-
-BuildRequires: qt-devel >= 1:3.3
-BuildRequires: kdelibs-devel >= 6:3.3
+BuildRequires: kdelibs-devel
 
 Requires: tetex-latex
 ## Optional/recommended, but not absolutely required.
-#Requires: gnuplot
-#Requires: xfig
+#Requires(hint): gnuplot
+#Requires(hint): xfig
 
 # kile-i18n is no longer separate pkg
 Obsoletes: kile-i18n < %{version}
@@ -54,8 +51,10 @@
 
 %configure \
   --disable-rpath \
+  --disable-gcc-hidden-visibility \
+  --enable-new-ldflags \
   --disable-debug --disable-warnings \
-  --disable-dependency-tracking --enable-final
+  --disable-dependancy-tracking --enable-final 
 
 make %{?_smp_mflags}
 
@@ -65,11 +64,11 @@
 
 make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install --vendor fedora \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/appl*/*/*.desktop
+desktop-file-install \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  --vendor="" \
+  --add-category="X-Fedora" \
+  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
   
 ## File lists
 # locale's
@@ -96,29 +95,25 @@
 
 
 %post
-for icon_theme in hicolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
 
 %postun
-for icon_theme in hicolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog README TODO
 %{_bindir}/*
-%{_datadir}/apps/kile
+%{_datadir}/apps/kile/
 %{_datadir}/apps/kconf_update/kile*
 %config %{_datadir}/config*/*
 %{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/kde/*.desktop
 %{_datadir}/mimelnk/*/*.desktop
 
 
@@ -127,6 +122,15 @@
 
 
 %changelog
+* Fri Mar 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9-1
+- 1.9(final)
+
+* Mon Mar 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9-0.1.rc
+- 1.9rc1
+
+* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net>
+- fc5: gcc/glibc respin
+
 * Thu Nov 10 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.3-7
 - fix symlinks
 - simplify configure


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	5 Aug 2005 17:35:52 -0000	1.4
+++ sources	3 Apr 2006 13:36:36 -0000	1.5
@@ -1 +1 @@
-9ac4cd9294c6aff1acca1def68923a7d  kile-1.8.1.tar.bz2
+32b660b4baccecf895d40c5ed43d2ffc  kile-1.9.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr  3 13:37:00 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon,  3 Apr 2006 06:37:00 -0700
Subject: rpms/kile/FC-3 .cvsignore, 1.3, 1.4 kile.spec, 1.15, 1.16 sources,
	1.4, 1.5
Message-ID: <200604031337.k33Db2N8015195@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kile/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15174

Modified Files:
	.cvsignore kile.spec sources 
Log Message:
* Fri Mar 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9-1
- 1.9(final)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Jan 2005 15:32:49 -0000	1.3
+++ .cvsignore	3 Apr 2006 13:37:00 -0000	1.4
@@ -1 +1 @@
-kile-1.7.1.tar.bz2
+kile-1.9.tar.bz2


Index: kile.spec
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-3/kile.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- kile.spec	15 Dec 2005 17:52:47 -0000	1.15
+++ kile.spec	3 Apr 2006 13:37:00 -0000	1.16
@@ -1,26 +1,23 @@
 
 Name:	 kile
 Summary: (La)TeX source editor and TeX shell
-Version: 1.8.1
-Release: 7%{?dist}
+Version: 1.9
+Release: 1%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
 URL:	 http://kile.sourceforge.net/
-Source0: http://dl.sourceforge.net/sourceforge/kile/kile-1.8.1.tar.bz2
+Source0: http://dl.sourceforge.net/sourceforge/kile/kile-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
+BuildRequires: gettext
 BuildRequires: desktop-file-utils
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
-
-BuildRequires: qt-devel >= 1:3.3
-BuildRequires: kdelibs-devel >= 6:3.3
+BuildRequires: kdelibs-devel
 
 Requires: tetex-latex
 ## Optional/recommended, but not absolutely required.
-#Requires: gnuplot
-#Requires: xfig
+#Requires(hint): gnuplot
+#Requires(hint): xfig
 
 # kile-i18n is no longer separate pkg
 Obsoletes: kile-i18n < %{version}
@@ -54,8 +51,10 @@
 
 %configure \
   --disable-rpath \
+  --disable-gcc-hidden-visibility \
+  --enable-new-ldflags \
   --disable-debug --disable-warnings \
-  --disable-dependency-tracking --enable-final
+  --disable-dependancy-tracking --enable-final 
 
 make %{?_smp_mflags}
 
@@ -65,11 +64,11 @@
 
 make install%{!?debug_package:-strip} DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install --vendor fedora \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/appl*/*/*.desktop
+desktop-file-install \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  --vendor="" \
+  --add-category="X-Fedora" \
+  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
   
 ## File lists
 # locale's
@@ -96,29 +95,25 @@
 
 
 %post
-for icon_theme in hicolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
 
 %postun
-for icon_theme in hicolor ; do
-  touch --no-create %{_datadir}/icons/${icon_theme} ||:
-  gtk-update-icon-cache -q %{_datadir}/icons/${icon_theme} 2> /dev/null ||:
-done
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog README TODO
 %{_bindir}/*
-%{_datadir}/apps/kile
+%{_datadir}/apps/kile/
 %{_datadir}/apps/kconf_update/kile*
 %config %{_datadir}/config*/*
 %{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/kde/*.desktop
 %{_datadir}/mimelnk/*/*.desktop
 
 
@@ -127,6 +122,15 @@
 
 
 %changelog
+* Fri Mar 17 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9-1
+- 1.9(final)
+
+* Mon Mar 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.9-0.1.rc
+- 1.9rc1
+
+* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net>
+- fc5: gcc/glibc respin
+
 * Thu Nov 10 2005 Rex Dieter <rexdieter[AT]users.sf.net> 1.8.3-7
 - fix symlinks
 - simplify configure


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kile/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	5 Aug 2005 17:47:59 -0000	1.4
+++ sources	3 Apr 2006 13:37:00 -0000	1.5
@@ -1 +1 @@
-9ac4cd9294c6aff1acca1def68923a7d  kile-1.8.1.tar.bz2
+32b660b4baccecf895d40c5ed43d2ffc  kile-1.9.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr  3 13:37:18 2006
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Mon,  3 Apr 2006 06:37:18 -0700
Subject: owners owners.list,1.798,1.799
Message-ID: <200604031337.k33DbKKY015252@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15170

Modified Files:
	owners.list 
Log Message:
- change my e-mail address to match the one in bugzilla



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.798
retrieving revision 1.799
diff -u -r1.798 -r1.799
--- owners.list	3 Apr 2006 12:23:29 -0000	1.798
+++ owners.list	3 Apr 2006 13:37:18 -0000	1.799
@@ -197,7 +197,7 @@
 Fedora Extras|doulos-fonts|Doulos SIL fonts|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|drgeo-doc|html documentation for drgeo|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
 Fedora Extras|drgeo|Interactive educational geometry software|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
-Fedora Extras|driftnet|Network image sniffer|hadess at hadess.net|extras-qa at fedoraproject.org|
+Fedora Extras|driftnet|Network image sniffer|bnocera at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|drivel|A journal or "blog" client|stickster at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|drscheme|Graphical environment for developing programs using Scheme|gemi at bluewin.ch|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|



From fedora-extras-commits at redhat.com  Mon Apr  3 13:44:34 2006
From: fedora-extras-commits at redhat.com (Roozbeh Pournader (roozbeh))
Date: Mon,  3 Apr 2006 06:44:34 -0700
Subject: rpms/mediawiki/FC-5 .cvsignore, 1.3, 1.4 mediawiki.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200604031344.k33Diaxk015390@cvs-int.fedora.redhat.com>

Author: roozbeh

Update of /cvs/extras/rpms/mediawiki/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15369

Modified Files:
	.cvsignore mediawiki.spec sources 
Log Message:
* Mon Apr 03 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.5.8-1
- Update to upstream 1.5.8 (contains security fixes)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Mar 2006 21:15:59 -0000	1.3
+++ .cvsignore	3 Apr 2006 13:44:34 -0000	1.4
@@ -1 +1 @@
-mediawiki-1.5.7.tar.gz
+mediawiki-1.5.8.tar.gz


Index: mediawiki.spec
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/FC-5/mediawiki.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mediawiki.spec	2 Mar 2006 21:15:59 -0000	1.4
+++ mediawiki.spec	3 Apr 2006 13:44:34 -0000	1.5
@@ -1,7 +1,7 @@
 %define wikidir %{_var}/www/mediawiki
 
 Name:           mediawiki
-Version:        1.5.7
+Version:        1.5.8
 Release:        1%{?dist}
 Summary:        The PHP-based wiki software behind Wikipedia
 
@@ -89,6 +89,9 @@
 
 
 %changelog
+* Mon Apr 03 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.5.8-1
+- Update to upstream 1.5.8 (contains security fixes)
+
 * Thu Mar 02 2006 Roozbeh Pournader <roozbeh at farsiweb.info> - 1.5.7-1
 - Update to upstream 1.5.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mediawiki/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Mar 2006 21:15:59 -0000	1.3
+++ sources	3 Apr 2006 13:44:34 -0000	1.4
@@ -1 +1 @@
-0a2347e2422006d8f75479b06c1963d8  mediawiki-1.5.7.tar.gz
+1eef94157377fa8c3d049877a27c0163  mediawiki-1.5.8.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr  3 16:22:06 2006
From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom))
Date: Mon,  3 Apr 2006 09:22:06 -0700
Subject: owners owners.list,1.799,1.800
Message-ID: <200604031622.k33GM8sR022922@cvs-int.fedora.redhat.com>

Author: kaboom

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22905

Modified Files:
	owners.list 
Log Message:
Orphaning openbox



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.799
retrieving revision 1.800
diff -u -r1.799 -r1.800
--- owners.list	3 Apr 2006 13:37:18 -0000	1.799
+++ owners.list	3 Apr 2006 16:22:06 -0000	1.800
@@ -783,7 +783,7 @@
 Fedora Extras|oidentd|Implementation of the RFC1413 identification server|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|oneko|Cat chases the cursor|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|openal|Open Audio Library|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
-Fedora Extras|openbox|Openbox window manager|kaboom at oobleck.net|extras-qa at fedoraproject.org|
+Fedora Extras|openbox|Openbox window manager|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|opencdk|Provides basic parts of the OpenPGP message format|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|openct|Middleware framework for smart card terminals|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|opencv|Collection of algorithms for computer vision|nomis80 at nomis80.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Apr  3 16:45:28 2006
From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom))
Date: Mon,  3 Apr 2006 09:45:28 -0700
Subject: owners owners.list,1.800,1.801
Message-ID: <200604031645.k33GjU0r023012@cvs-int.fedora.redhat.com>

Author: kaboom

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22993

Modified Files:
	owners.list 
Log Message:
owning cgoban



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.800
retrieving revision 1.801
diff -u -r1.800 -r1.801
--- owners.list	3 Apr 2006 16:22:06 -0000	1.800
+++ owners.list	3 Apr 2006 16:45:28 -0000	1.801
@@ -119,7 +119,7 @@
 Fedora Extras|cfitsio|Library for manipulating FITS data files|matt at truch.net|extras-qa at fedoraproject.org|
 Fedora Extras|cfs|An userspace crypto-filesystem|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|cfv|A checksum creation and verification utility|a.kurtz at hardsun.net|extras-qa at fedoraproject.org|
-Fedora Extras|cgoban|X board for playing go|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|cgoban|X board for playing go|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|charis-fonts|Charis SIL fonts|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|check|A unit test framework for C|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|chkrootkit|A tool to locally check for signs of a rootkit|bugs.michael at gmx.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Apr  3 17:00:08 2006
From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom))
Date: Mon,  3 Apr 2006 10:00:08 -0700
Subject: rpms/cgoban/FC-5 cgoban.spec,1.10,1.11
Message-ID: <200604031700.k33H0AkW023066@cvs-int.fedora.redhat.com>

Author: kaboom

Update of /cvs/extras/rpms/cgoban/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23040

Modified Files:
	cgoban.spec 
Log Message:
rebuilding for fe5



Index: cgoban.spec
===================================================================
RCS file: /cvs/extras/rpms/cgoban/FC-5/cgoban.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cgoban.spec	2 Mar 2006 21:28:23 -0000	1.10
+++ cgoban.spec	3 Apr 2006 17:00:07 -0000	1.11
@@ -1,17 +1,14 @@
-Name:           cgoban
-Version:        1.9.14
-Release:        6%{?dist}
-
-Summary:        X board for playing go
-
-Group:          Amusements/Games
-License:        GPL
-URL:            http://cgoban1.sourceforge.net/
-Source0:	http://download.sourceforge.net/cgoban1/cgoban-1.9.14.tar.gz
-Source1:        cgoban.desktop
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	desktop-file-utils
+Name: cgoban
+Version: 1.9.14
+Release: 7%{?dist}
+Summary: X board for playing go
+Group: Amusements/Games
+License: GPL
+URL: http://cgoban1.sourceforge.net/
+Source0: http://download.sourceforge.net/cgoban1/cgoban-1.9.14.tar.gz
+Source1: cgoban.desktop
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: desktop-file-utils
 BuildRequires: libICE-devel, libXmu-devel, libSM-devel, xorg-x11-proto-devel
 BuildRequires: libXext-devel, libXaw-devel, libXt-devel
 
@@ -20,26 +17,16 @@
 to be a computerized go board, view and edit smart-go files, and connect to
 go servers on the Internet.
 
-
 %prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
-
 rm -rf ${RPM_BUILD_ROOT}
 %setup -q
 
-
 %build
 %configure
 perl -pi -e "s/-O2 -fomit-frame-pointer/$RPM_OPT_FLAGS/" config.status
 ./config.status
 make %{?_smp_mflags}
 
-
 %install
 rm -rf ${RPM_BUILD_ROOT}
 %makeinstall
@@ -50,11 +37,9 @@
   --add-category X-Fedora                          \
   %{SOURCE1}
 
-
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
-
 %files
 %defattr(-,root,root,-)
 %doc COPYING README TODO
@@ -65,6 +50,10 @@
 
 
 %changelog
+* Mon Apr  3 2006 Chris Ricker <kaboom at oobleck.net> 1.9.14-7
+- Rebuild again for FE5
+- die, tabs, die!
+
 * Wed Mar  1 2006 Chris Ricker <kaboom at oobleck.net> 1.9.14-6
 - Rebuild for FE5
 - add dist tag



From fedora-extras-commits at redhat.com  Mon Apr  3 17:04:37 2006
From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom))
Date: Mon,  3 Apr 2006 10:04:37 -0700
Subject: devel/cgoban cgoban.spec,1.10,1.11
Message-ID: <200604031704.k33H4dHI025135@cvs-int.fedora.redhat.com>

Author: kaboom

Update of /cvs/extras/devel/cgoban
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25118

Modified Files:
	cgoban.spec 
Log Message:
build for devel



Index: cgoban.spec
===================================================================
RCS file: /cvs/extras/devel/cgoban/cgoban.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cgoban.spec	2 Mar 2006 21:28:23 -0000	1.10
+++ cgoban.spec	3 Apr 2006 17:04:37 -0000	1.11
@@ -1,17 +1,14 @@
-Name:           cgoban
-Version:        1.9.14
-Release:        6%{?dist}
-
-Summary:        X board for playing go
-
-Group:          Amusements/Games
-License:        GPL
-URL:            http://cgoban1.sourceforge.net/
-Source0:	http://download.sourceforge.net/cgoban1/cgoban-1.9.14.tar.gz
-Source1:        cgoban.desktop
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:	desktop-file-utils
+Name: cgoban
+Version: 1.9.14
+Release: 7%{?dist}
+Summary: X board for playing go
+Group: Amusements/Games
+License: GPL
+URL: http://cgoban1.sourceforge.net/
+Source0: http://download.sourceforge.net/cgoban1/cgoban-1.9.14.tar.gz
+Source1: cgoban.desktop
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: desktop-file-utils
 BuildRequires: libICE-devel, libXmu-devel, libSM-devel, xorg-x11-proto-devel
 BuildRequires: libXext-devel, libXaw-devel, libXt-devel
 
@@ -20,26 +17,16 @@
 to be a computerized go board, view and edit smart-go files, and connect to
 go servers on the Internet.
 
-
 %prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
-
 rm -rf ${RPM_BUILD_ROOT}
 %setup -q
 
-
 %build
 %configure
 perl -pi -e "s/-O2 -fomit-frame-pointer/$RPM_OPT_FLAGS/" config.status
 ./config.status
 make %{?_smp_mflags}
 
-
 %install
 rm -rf ${RPM_BUILD_ROOT}
 %makeinstall
@@ -50,11 +37,9 @@
   --add-category X-Fedora                          \
   %{SOURCE1}
 
-
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
-
 %files
 %defattr(-,root,root,-)
 %doc COPYING README TODO
@@ -65,6 +50,10 @@
 
 
 %changelog
+* Mon Apr  3 2006 Chris Ricker <kaboom at oobleck.net> 1.9.14-7
+- Rebuild again for FE5
+- die, tabs, die!
+
 * Wed Mar  1 2006 Chris Ricker <kaboom at oobleck.net> 1.9.14-6
 - Rebuild for FE5
 - add dist tag



From fedora-extras-commits at redhat.com  Mon Apr  3 17:05:10 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Mon,  3 Apr 2006 10:05:10 -0700
Subject: rpms/azureus/FC-5 azureus.script,1.8,1.9 azureus.spec,1.21,1.22
Message-ID: <200604031705.k33H5C6V025160@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/azureus/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25141

Modified Files:
	azureus.script azureus.spec 
Log Message:
_3 revision.  One more fix to LD_LIBRARY_PATH.



Index: azureus.script
===================================================================
RCS file: /cvs/extras/rpms/azureus/FC-5/azureus.script,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- azureus.script	2 Apr 2006 03:34:32 -0000	1.8
+++ azureus.script	3 Apr 2006 17:05:09 -0000	1.9
@@ -15,4 +15,4 @@
 done;
 popd > /dev/null 2>&1
 
-LD_LIBRARY_PATH=/usr/lib/eclipse CLASSPATH=`build-classpath jakarta-commons-cli log4j swt-gtk-3.1.1 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=`build-classpath jakarta-commons-cli log4j swt-gtk-3.1.1 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-5/azureus.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- azureus.spec	2 Apr 2006 03:34:32 -0000	1.21
+++ azureus.spec	3 Apr 2006 17:05:10 -0000	1.22
@@ -1,6 +1,6 @@
 Name:		azureus
 Version:	2.4.0.3
-Release:	0.20060328cvs_2%{?dist}
+Release:	0.20060328cvs_3%{?dist}
 Summary:	A BitTorrent Client
 
 Group:		Applications/Internet
@@ -204,6 +204,9 @@
 %{_libdir}/gcj/*
 
 %changelog
+* Mon Apr 03 2006 Anthony Green <green at redhat.com> - 2.4.0.3-0.20060328cvs_3
+- One more correction to LD_LIBRARY_PATH.  Bugzilla #186152.
+
 * Sat Apr 01 2006 Anthony Green <green at redhat.com> - 2.4.0.3-0.20060328cvs_2
 - Set LD_LIBRARY_PATH for Sun java alternative.  Bugzilla #186152.
 - Remove pushd/popd noise from startup script.



From fedora-extras-commits at redhat.com  Mon Apr  3 18:24:37 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Mon,  3 Apr 2006 11:24:37 -0700
Subject: rpms/gdesklets/FC-5 gdesklets.spec,1.11,1.12
Message-ID: <200604031824.k33IOdw0031029@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31012

Modified Files:
	gdesklets.spec 
Log Message:

updated gdesklets.spec for ppc64




Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-5/gdesklets.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gdesklets.spec	28 Feb 2006 21:15:09 -0000	1.11
+++ gdesklets.spec	3 Apr 2006 18:24:37 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           gdesklets
 Version:        0.35.3
-Release:        4%{?dist}
+Release:        6%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
@@ -18,7 +18,7 @@
 #							    #
 #############################################################
 
-BuildRequires:  python-devel >= 2.0.0, pyorbit-devel >= 2.0.1, pygtk2-devel >= 2.4.0, 
+BuildRequires:  python-devel > 2.0.0, pyorbit-devel > 2.0.1, pygtk2-devel > 2.4.0, 
 BuildRequires:  librsvg2-devel, libgtop2-devel >= 2.8.0, gettext   
 BuildRequires:  libXau-devel, libXdmcp-devel
 BuildRequires:  gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0, desktop-file-utils
@@ -96,6 +96,12 @@
 
 
 %changelog
+* Mon Apr 03 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-6
+- Bump 
+
+* Mon Apr 03 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-5
+- Ajusted pyorbit requirement for ppc64
+
 * Thu Jan 19 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-4
 - Rebuild for Fedora Extras 5
 



From fedora-extras-commits at redhat.com  Mon Apr  3 18:33:39 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Mon,  3 Apr 2006 11:33:39 -0700
Subject: rpms/gdesklets/FC-5 gdesklets.spec,1.12,1.13
Message-ID: <200604031833.k33IXfwQ031104@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31087

Modified Files:
	gdesklets.spec 
Log Message:

update gdesklets.spec



Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-5/gdesklets.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gdesklets.spec	3 Apr 2006 18:24:37 -0000	1.12
+++ gdesklets.spec	3 Apr 2006 18:33:39 -0000	1.13
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Mon Apr 03 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-7
+- Bump 
+
 * Mon Apr 03 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-6
 - Bump 
 



From fedora-extras-commits at redhat.com  Mon Apr  3 18:39:40 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon,  3 Apr 2006 11:39:40 -0700
Subject: comps comps-fe5.xml.in,1.32,1.33
Message-ID: <200604031839.k33Idgm6031174@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31157

Modified Files:
	comps-fe5.xml.in 
Log Message:
Added njam and shippy to the games group.




Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- comps-fe5.xml.in	30 Mar 2006 18:04:10 -0000	1.32
+++ comps-fe5.xml.in	3 Apr 2006 18:39:40 -0000	1.33
@@ -225,6 +225,7 @@
         <packagereq type="optional">nethack-vultures</packagereq>
         <packagereq type="optional">neverball</packagereq>
         <packagereq type="optional">nexuiz</packagereq>
+        <packagereq type="optional">njam</packagereq>
         <packagereq type="optional">overgod</packagereq>
         <packagereq type="optional">powermanga</packagereq>
         <packagereq type="optional">ppracer</packagereq>
@@ -233,6 +234,7 @@
         <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>



From fedora-extras-commits at redhat.com  Mon Apr  3 19:23:34 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon,  3 Apr 2006 12:23:34 -0700
Subject: rpms/zasx - New directory
Message-ID: <200604031923.k33JNaiC000865@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/zasx
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv839/zasx

Log Message:
Directory /cvs/extras/rpms/zasx added to the repository




From fedora-extras-commits at redhat.com  Mon Apr  3 19:23:34 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon,  3 Apr 2006 12:23:34 -0700
Subject: rpms/zasx/devel - New directory
Message-ID: <200604031923.k33JNabV000868@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/zasx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv839/zasx/devel

Log Message:
Directory /cvs/extras/rpms/zasx/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Apr  3 19:23:50 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon,  3 Apr 2006 12:23:50 -0700
Subject: rpms/zasx Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604031923.k33JNq7T000919@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/zasx
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv886

Added Files:
	Makefile import.log 
Log Message:
Setup of module zasx


--- NEW FILE Makefile ---
# Top level Makefile for module zasx
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr  3 19:23:50 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon,  3 Apr 2006 12:23:50 -0700
Subject: rpms/zasx/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200604031923.k33JNqom000922@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/zasx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv886/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module zasx


--- 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 Apr  3 19:24:54 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon,  3 Apr 2006 12:24:54 -0700
Subject: rpms/zasx import.log,1.1,1.2
Message-ID: <200604031925.k33JPQdE001031@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/zasx
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv976

Modified Files:
	import.log 
Log Message:
auto-import zasx-1.30-1 on branch devel from zasx-1.30-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/zasx/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	3 Apr 2006 19:23:50 -0000	1.1
+++ import.log	3 Apr 2006 19:24:54 -0000	1.2
@@ -0,0 +1 @@
+zasx-1_30-1:HEAD:zasx-1.30-1.src.rpm:1144092122



From fedora-extras-commits at redhat.com  Mon Apr  3 19:24:55 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon,  3 Apr 2006 12:24:55 -0700
Subject: rpms/zasx/devel zasx-1.30-datadir.patch, NONE,
	1.1 zasx-1.30-fixes.patch, NONE, 1.1 zasx.desktop, NONE,
	1.1 zasx.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604031925.k33JPRBT001035@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/zasx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv976/devel

Modified Files:
	.cvsignore sources 
Added Files:
	zasx-1.30-datadir.patch zasx-1.30-fixes.patch zasx.desktop 
	zasx.spec 
Log Message:
auto-import zasx-1.30-1 on branch devel from zasx-1.30-1.src.rpm

zasx-1.30-datadir.patch:

--- NEW FILE zasx-1.30-datadir.patch ---
--- Zasx/src/weapon.c~	2006-04-02 22:47:23.000000000 +0200
+++ Zasx/src/weapon.c	2006-04-02 22:52:03.000000000 +0200
@@ -260,6 +260,22 @@
 				c->Image[i]= NULL;
 
 				sscanf(temp, "%[^ \n\t;]", buf2);
+				/* Move temp to the next image before we
+				   "fix" buf2 */
+				temp += strlen(buf2) + 1;
+#ifdef DATADIR
+				/* Image names usually start with "data/",
+				   this should be replaced with DATADIR */
+				if (strncmp(buf2, "data/", 5) == 0)
+				{
+					/* move the rest of the string back */
+					memmove(buf2 + strlen(DATADIR),
+						buf2 + 5,
+						strlen(buf2 + 5) + 1);
+					/* and put DATADIR in front */
+					memcpy(buf2, DATADIR, strlen(DATADIR));
+				}
+#endif
 
 				/* Attempt to load it as a datafile object */
 				if ((g = strstr(buf2, "#"))) {
@@ -299,7 +313,6 @@
 					c->Image[i] = load_bitmap(buf2, pal);
 				}
 
-				temp += strlen(buf2) + 1;
 			}
 			continue;
 		}
@@ -324,7 +324,19 @@
 			DATAFILE *d;
 			char oldg;
 			char *g;
-
+#ifdef DATADIR
+			/* Sound names usually start with "data/",
+			   this should be replaced with DATADIR */
+			if (strncmp(buf2, "data/", 5) == 0)
+			{
+				/* move the rest of the string back */
+				memmove(buf2 + strlen(DATADIR),
+					buf2 + 5,
+					strlen(buf2 + 5) + 1);
+				/* and put DATADIR in front */
+				memcpy(buf2, DATADIR, strlen(DATADIR));
+			}
+#endif
 			g = strstr(buf2, "#");
 			if (g) {
 				oldg = *g;

zasx-1.30-fixes.patch:

--- NEW FILE zasx-1.30-fixes.patch ---
diff -urN Zasx.org/Makefile Zasx/Makefile
--- Zasx.org/Makefile	1970-01-01 01:00:00.000000000 +0100
+++ Zasx/Makefile	2006-04-02 20:16:58.000000000 +0200
@@ -0,0 +1,25 @@
+PREFIX  = /usr/local
+DATADIR = $(PREFIX)/share/$(TARGET)
+CFLAGS  = -g -Wall -Wno-deprecated-declarations -O2 -fsigned-char
+LDFLAGS = `allegro-config --libs` -ldumb -laldmb
+DEFINES = -DDATADIR=\"$(DATADIR)/\" -Iinclude
+OBJS    = obj/anim.o obj/dataload.o obj/gamemenu.o obj/input.o obj/log.o \
+ obj/particle.o obj/scorer.o obj/asteroid.o obj/drs.o obj/gametimer.o \
+ obj/player.o obj/star.o obj/config.o obj/effect.o obj/gfx.o obj/main.o \
+ obj/ppcol.o obj/weapon.o obj/jgmod.o obj/unix.o
+TARGET  = zasx
+
+$(TARGET): $(OBJS)
+	$(CC) $(LDFLAGS) -o $@ $^
+
+obj/%.o: src/%.c
+	$(CC) $(CFLAGS) $(DEFINES) -o $@ -c $<
+
+install: $(TARGET)
+	mkdir -p $(PREFIX)/bin
+	mkdir -p $(DATADIR)
+	install -p -m 755 $(TARGET) $(PREFIX)/bin
+	install -p -m 644 data/*.dat $(DATADIR)
+	
+clean:
+	rm -f $(OBJS) $(TARGET) src/*~ include/*~
diff -urN Zasx.org/include/anim.h Zasx/include/anim.h
--- Zasx.org/include/anim.h	2001-08-09 01:18:44.000000000 +0200
+++ Zasx/include/anim.h	2006-04-02 20:16:58.000000000 +0200
@@ -1,3 +1,3 @@
 void load_anim_bank(char *key, char *filename);
 struct PARTICLE *make_anim_particle(char *key);
-void remove_anim();
\ No newline at end of file
+void remove_anim();
diff -urN Zasx.org/include/asteroid.h Zasx/include/asteroid.h
--- Zasx.org/include/asteroid.h	2001-04-10 17:32:02.000000000 +0200
+++ Zasx/include/asteroid.h	2006-04-02 20:16:58.000000000 +0200
@@ -9,4 +9,4 @@
 } ASTEROID;
 
 ASTEROID *create_asteroid(int family, int size);
-void destroy_asteroid(ASTEROID *a);
\ No newline at end of file
+void destroy_asteroid(ASTEROID *a);
diff -urN Zasx.org/include/config.h Zasx/include/config.h
--- Zasx.org/include/config.h	2001-04-14 16:31:28.000000000 +0200
+++ Zasx/include/config.h	2006-04-02 20:16:58.000000000 +0200
@@ -5,4 +5,4 @@
 
 extern const char *config_get_input_name(int type);
 extern const char *config_get_key_name(int n);
-extern void get_default_player_config(int n, INPUT *dev);
\ No newline at end of file
+extern void get_default_player_config(int n, INPUT *dev);
diff -urN Zasx.org/include/game.h Zasx/include/game.h
--- Zasx.org/include/game.h	2001-08-09 01:04:14.000000000 +0200
+++ Zasx/include/game.h	2006-04-02 20:16:58.000000000 +0200
@@ -42,3 +42,4 @@
 
 extern void DoGame(int n);
 
+extern int FullscreenToggleRequested;
diff -urN Zasx.org/include/gamemenu.h Zasx/include/gamemenu.h
--- Zasx.org/include/gamemenu.h	2001-04-14 16:55:02.000000000 +0200
+++ Zasx/include/gamemenu.h	2006-04-02 20:16:58.000000000 +0200
@@ -1 +1 @@
-extern void DoMenu();
\ No newline at end of file
+extern void DoMenu();
diff -urN Zasx.org/include/gametimer.h Zasx/include/gametimer.h
--- Zasx.org/include/gametimer.h	2001-04-14 16:03:48.000000000 +0200
+++ Zasx/include/gametimer.h	2006-04-02 20:16:58.000000000 +0200
@@ -37,4 +37,4 @@
 #endif
 
 
-#endif
\ No newline at end of file
+#endif
diff -urN Zasx.org/include/gfx.h Zasx/include/gfx.h
--- Zasx.org/include/gfx.h	2001-05-20 22:28:12.000000000 +0200
+++ Zasx/include/gfx.h	2006-04-02 20:16:58.000000000 +0200
@@ -8,8 +8,11 @@
 
 
 extern BITMAP *BackBuffer;
+extern int display_w;
+extern int display_h;
+extern int fullscreen;
 
-extern int GFX_Init(int w, int h, int c, int f);
+extern int GFX_Init(void);
 extern int GFX_Shutdown();
 
 extern BITMAP *GFX_CreateAccelBitmap(int w, int h);
@@ -17,8 +20,8 @@
 
 extern void GFX_HQ_RotateSprite(BITMAP *dest, BITMAP *src, int x, int y, fixed angle);
 
-#define DISPLAY_W 640
-#define DISPLAY_H 480
+#define DISPLAY_W display_w
+#define DISPLAY_H display_h
 
 
 #ifdef __cplusplus
@@ -26,4 +29,4 @@
 #endif
 
 
-#endif
\ No newline at end of file
+#endif
diff -urN Zasx.org/include/jgmod.h Zasx/include/jgmod.h
--- Zasx.org/include/jgmod.h	1970-01-01 01:00:00.000000000 +0100
+++ Zasx/include/jgmod.h	2006-04-02 20:16:58.000000000 +0200
@@ -0,0 +1,40 @@
+/*  incomplete DUMB JGMOD compatibility wrapper, because JGMOD's license is
+    not opensource / GPL compatible and because there are already enough mod
+    playing libs.
+   
+    Copyright 2006 Hans de Goede <j.w.r.degoede at hhs.nl>
+   
+    This wrapper is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public   
+    License as published by the Free Software Foundation; either 
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of 
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA   
+*/
+   
+#ifndef __JGMOD_H
+#define __JGMOD_H
+
+#include <aldumb.h>
+
+#define JGMOD DUH
+
+void install_mod(int channels); /* ignored */
+void remove_mod(void);
+
+JGMOD *load_mod(const char *path); /* path may be a packfile # index */
+void destroy_mod(JGMOD *mod);
+
+void play_mod(JGMOD *mod, int loop);
+void stop_mod(void);
+
+void set_mod_volume(int volume); /* 0 - 255 */
+
+#endif
diff -urN Zasx.org/include/log.h Zasx/include/log.h
--- Zasx.org/include/log.h	2001-04-18 13:34:38.000000000 +0200
+++ Zasx/include/log.h	2006-04-02 20:16:58.000000000 +0200
@@ -53,10 +53,10 @@
 #else
 
 
-#define ERROR(n, x) {}
-#define ERROR2(n, x, y) {}
-#define VERROR(n, x) {}
-#define LOG {}
+#define ERROR(n, x)
+#define ERROR2(n, x, y)
+#define VERROR(n, x)
+#define LOG(format, arg...)
 
 #endif
 
diff -urN Zasx.org/include/particle.h Zasx/include/particle.h
--- Zasx.org/include/particle.h	2001-05-13 22:56:30.000000000 +0200
+++ Zasx/include/particle.h	2006-04-02 20:16:58.000000000 +0200
@@ -94,4 +94,4 @@
 void clear_particles();
 int install_particle();
 
-#endif
\ No newline at end of file
+#endif
diff -urN Zasx.org/include/star.h Zasx/include/star.h
--- Zasx.org/include/star.h	2001-05-13 16:42:06.000000000 +0200
+++ Zasx/include/star.h	2006-04-02 20:16:58.000000000 +0200
@@ -18,4 +18,4 @@
 void clear_stars();
 void destroy_star(STAR *star);
 int install_star();
-void add_ray();
\ No newline at end of file
+void add_ray();
diff -urN Zasx.org/include/weapon.h Zasx/include/weapon.h
--- Zasx.org/include/weapon.h	2001-04-21 20:05:48.000000000 +0200
+++ Zasx/include/weapon.h	2006-04-02 20:16:58.000000000 +0200
@@ -52,4 +52,4 @@
 extern WEAPON *load_weapon(char *filename);
 
 extern int get_ship_weapon_ammo(SHIP_WEAPON *w);
-extern int get_weapon_ammo(WEAPON *w);
\ No newline at end of file
+extern int get_weapon_ammo(WEAPON *w);
diff -urN Zasx.org/src/anim.c Zasx/src/anim.c
--- Zasx.org/src/anim.c	2001-08-09 01:20:10.000000000 +0200
+++ Zasx/src/anim.c	2006-04-02 20:16:58.000000000 +0200
@@ -328,4 +328,4 @@
 	AnimKeys = NULL;
 
 	return;
-}
\ No newline at end of file
+}
diff -urN Zasx.org/src/asteroid.c Zasx/src/asteroid.c
--- Zasx.org/src/asteroid.c	2001-08-02 01:38:10.000000000 +0200
+++ Zasx/src/asteroid.c	2006-04-02 20:16:58.000000000 +0200
@@ -52,4 +52,4 @@
 	free(a);
 
 	return;
-}
\ No newline at end of file
+}
diff -urN Zasx.org/src/config.c Zasx/src/config.c
--- Zasx.org/src/config.c	2001-08-02 01:38:08.000000000 +0200
+++ Zasx/src/config.c	2006-04-02 20:16:58.000000000 +0200
@@ -26,6 +26,11 @@
 	{"W", "S", "D", "A", "LControl"}
 };
 
+const char *default_joy[NUM_PLAYERS][NUM_KEYS] = {
+	{"Joy0 0 -2", "Joy0 0 1", "Joy0 0 0", "Joy0 0 -1", "Joy0 0 0"},
+	{"Joy1 0 -2", "Joy1 0 1", "Joy1 0 0", "Joy1 0 -1", "Joy1 0 0"}
+};
+
 
 INPUT *load_player_input_config(int n) {
 
@@ -41,7 +46,9 @@
 		return NULL;
 	}
 
+#ifndef __unix__
 	set_config_file("zasx.cfg");
+#endif
 
 	sprintf(keyname, "Player%i_Type", n);
 	type = get_config_string("controls", keyname, "keyboard");
@@ -57,7 +64,10 @@
 
 		for (i = 0; i < NUM_KEYS; i++) {
 			sprintf(keyname, "Player%i_%s", n, control_name[i]);
-			new_key = get_config_string("controls", keyname, default_key[n - 1][i]);
+			new_key = get_config_string("controls", keyname,
+				(itype== INPUT_TYPE_JOYSTICK)?
+				default_joy[n - 1][i]:
+				default_key[n - 1][i]);
 			set_input(ret, input_names[i], new_key);
 		}
 	}
@@ -90,7 +100,9 @@
 		return;
 	}
 
+#ifndef __unix__
 	set_config_file("zasx.cfg");
+#endif
 
 	sprintf(keyname, "Player%i_Type", n);
 	type = get_input_type_name(in);
@@ -99,7 +111,7 @@
 
 	for (i = 0; i < NUM_KEYS; i++) {
 		sprintf(keyname, "Player%i_%s", n, control_name[i]);
-		set_config_string("controls", keyname, get_input_name(in, input_names[i], buf, 11));
+		set_config_string("controls", keyname, get_input_name(in, input_names[i], buf, 0));
 	}		
 
 	return;
@@ -119,8 +131,29 @@
 		return;
 	}
 
-	for (i = 0; i < NUM_KEYS; i++)
-		set_input(dev, input_names[i], default_key[n - 1][i]);
+	if (get_input_type(dev) == INPUT_TYPE_JOYSTICK)
+	{
+		/* <sigh> broken by design get the full name to find the
+		   joystick number, after this use player 1 defaults as base
+		   and replace the joystick number with the device joy number.
+		   */
+		char buf[16], *p = get_input_type_full_name(dev);
+		int joynum;
+
+		p += strlen("Joystick ");
+		joynum = atoi(p) - 1;
+		
+		for (i = 0; i < NUM_KEYS; i++)
+		{
+			/* replace the joystick number */
+			snprintf(buf, sizeof(buf), "Joy%d %s", joynum,
+				default_joy[0][i] + strlen("Joy0 "));
+			set_input(dev, input_names[i], buf);
+		}
+	}
+	else
+		for (i = 0; i < NUM_KEYS; i++)
+			set_input(dev, input_names[i], default_key[n - 1][i]);
 
 	return;
-}
\ No newline at end of file
+}
diff -urN Zasx.org/src/dataload.c Zasx/src/dataload.c
--- Zasx.org/src/dataload.c	2001-08-09 01:20:16.000000000 +0200
+++ Zasx/src/dataload.c	2006-04-02 20:16:58.000000000 +0200
@@ -7,15 +7,17 @@
  */
 
 #include "allegro.h"
-#include "game.h"
-
 #include "gfx.h"
 #include "demo.h"
 #include "jgmod.h"
 #include "weapon.h"
 #include "anim.h"
+#include "game.h"
 
 
+#ifndef DATADIR
+#define DATADIR "data/"
+#endif
 
 int LoadData() {
 	
@@ -42,10 +44,10 @@
 		set_color_conversion(COLORCONV_NONE);
 
 	/* Load Demo data file, convert to color depth, scale if necessary */
-	demodata = load_datafile("data/demo.dat");
+	demodata = load_datafile(DATADIR "demo.dat");
 	if (!demodata) {
 		set_gfx_mode(GFX_TEXT, 0, 0, 0, 0);
-		allegro_message("Can't load Datafile!\ndata/demo.dat\n");
+		allegro_message("Can't load datafile demo.dat!\n");
 		return -2;
 	}
 
@@ -61,7 +63,7 @@
 
 	UPDATE_LOAD_BAR("Color mapping tables     ");
 
-	if (!exists("data/colormap.bin")) {
+	if (!exists(DATADIR "colormap.bin")) {
 		PACKFILE *file;
 		create_rgb_table(&palette_map, GamePal, NULL);
 
@@ -82,7 +84,7 @@
 
 		set_add_blender(128, 128, 128, 255);
 
-		file = pack_fopen("data/colormap.bin", "wp");
+		file = pack_fopen(DATADIR "colormap.bin", "wp");
 
 		if (file) {
 			pack_fwrite(&palette_map, sizeof(RGB_MAP), file);
@@ -96,7 +98,7 @@
 	else {
 		PACKFILE *file;
 
-		file = pack_fopen("data/colormap.bin", "rp");
+		file = pack_fopen(DATADIR "colormap.bin", "rp");
 
 		if (file) {
 			pack_fread(&palette_map, sizeof(RGB_MAP), file);
@@ -174,22 +176,22 @@
 
 	UPDATE_LOAD_BAR("Music                    ");
 
-	Music = load_mod("data/demo.dat#ZASX_XM");
+	Music = load_mod(DATADIR "demo.dat#ZASX_XM");
 
 	UPDATE_LOAD_BAR("Weapons                  ");
 
-	NormalGun = load_weapon("data/demo.dat#NORMALGUN_WPN");
-	RapidFireGun = load_weapon("data/demo.dat#RAPIDFIRE_WPN");
-	LaserGun =  load_weapon("data/demo.dat#LASER_WPN");	
-	Laser2Gun = load_weapon("data/demo.dat#LASER2_WPN");	
-	Laser3Gun = load_weapon("data/demo.dat#LASER3_WPN");	
+	NormalGun = load_weapon(DATADIR "demo.dat#NORMALGUN_WPN");
+	RapidFireGun = load_weapon(DATADIR "demo.dat#RAPIDFIRE_WPN");
+	LaserGun =  load_weapon(DATADIR "demo.dat#LASER_WPN");	
+	Laser2Gun = load_weapon(DATADIR "demo.dat#LASER2_WPN");	
+	Laser3Gun = load_weapon(DATADIR "demo.dat#LASER3_WPN");	
 
 	UPDATE_LOAD_BAR("Health power-up          ");	
-	load_anim_bank("Health", "data/health.dat");
+	load_anim_bank("Health", DATADIR "health.dat");
 	UPDATE_LOAD_BAR("RapidFire power-up       ");
-	load_anim_bank("RapidFire", "data/rapid.dat");
+	load_anim_bank("RapidFire", DATADIR "rapid.dat");
 	UPDATE_LOAD_BAR("Laser power-up           ");
-	load_anim_bank("LaserGun", "data/laser.dat");
+	load_anim_bank("LaserGun", DATADIR "laser.dat");
 	UPDATE_LOAD_BAR("Done.                    ");
 
 #undef UPDATE_LOAD_BAR
@@ -209,4 +211,4 @@
 	remove_anim();
 
 	return 0;
-}
\ No newline at end of file
+}
diff -urN Zasx.org/src/drs.c Zasx/src/drs.c
--- Zasx.org/src/drs.c	2001-05-12 22:52:12.000000000 +0200
+++ Zasx/src/drs.c	2006-04-02 20:16:58.000000000 +0200
@@ -24,6 +24,7 @@
 #include <allegro.h>
 
 #include "drs.h"
+#include "gfx.h"
 
 /* Rectangle.  */
 typedef struct __DRS_rect_t
@@ -89,9 +90,9 @@
   __DRS_size = 2 * _size;
 
   /* Allocate memory.  */
-  DRS_work = create_bitmap (SCREEN_W, SCREEN_H);
-  __DRS_bank = (int*) malloc (sizeof (int) * SCREEN_H);
-  __DRS_span = (__DRS_span_t*) malloc (sizeof (__DRS_span_t) * SCREEN_W);
+  DRS_work = create_bitmap (DISPLAY_W, DISPLAY_H);
+  __DRS_bank = (int*) malloc (sizeof (int) * DISPLAY_H);
+  __DRS_span = (__DRS_span_t*) malloc (sizeof (__DRS_span_t) * DISPLAY_W);
   __DRS_omem = (__DRS_rect_t*) malloc (sizeof (__DRS_rect_t) * __DRS_size);
   __DRS_nmem = (__DRS_rect_t*) malloc (sizeof (__DRS_rect_t) * __DRS_size);
 
@@ -122,10 +123,10 @@
   /* Calculate bank starts.  */
   {
     int i;
-    int next_bank_line = SCREEN_H;
+    int next_bank_line = DISPLAY_H;
 
-    __DRS_bank[SCREEN_H - 1] = SCREEN_H;
-    for (i = SCREEN_H - 2; i >= 0; i--)
+    __DRS_bank[DISPLAY_H - 1] = DISPLAY_H;
+    for (i = DISPLAY_H - 2; i >= 0; i--)
       {
 	if (screen->line[i] >= screen->line[i + 1])
 	  next_bank_line = i + 1;
@@ -263,7 +264,7 @@
       if (__DRS_bbmp == 0)
 	clear_to_color (DRS_work, __DRS_bcol);
       else
-	blit (__DRS_bbmp, DRS_work, __DRS_xoff, __DRS_yoff, 0, 0, SCREEN_W, SCREEN_H);
+	blit (__DRS_bbmp, DRS_work, __DRS_xoff, __DRS_yoff, 0, 0, DISPLAY_W, DISPLAY_H);
       __DRS_nnum = 0;
     }
   else
@@ -288,7 +289,7 @@
 	  ybeg = (rbeg->y <= yend) ? yend : rbeg->y;
 	  yend = rbeg->y + rbeg->h;
 
-	  if (ybeg >= SCREEN_H)
+	  if (ybeg >= DISPLAY_H)
 	    break;
 
 	  /* Add more rectangles to the strip.  */
@@ -389,8 +390,8 @@
 
   if (__DRS_dbuf != 0)
     return;
-  else if ((_w > 0) && (x < SCREEN_W) && ((x + _w) > 0)
-	   && (_h > 0) && (y < SCREEN_H) && ((y + _h) > 0))
+  else if ((_w > 0) && (x < DISPLAY_W) && ((x + _w) > 0)
+	   && (_h > 0) && (y < DISPLAY_H) && ((y + _h) > 0))
     {
       /* Rectangle is visible on screen.  */
       if ((__DRS_onum >= __DRS_size) || (__DRS_nnum >= __DRS_size))
@@ -427,8 +428,8 @@
 
   if (__DRS_dbuf != 0)
     return;
-  else if ((_w > 0) && (x < SCREEN_W) && ((x + _w) > 0)
-	   && (_h > 0) && (y < SCREEN_H) && ((y + _h) > 0))
+  else if ((_w > 0) && (x < DISPLAY_W) && ((x + _w) > 0)
+	   && (_h > 0) && (y < DISPLAY_H) && ((y + _h) > 0))
     {
       /* Rectangle is visible on screen.  */
       if (__DRS_nnum >= __DRS_size)
@@ -459,8 +460,8 @@
 
   if (__DRS_dbuf != 0)
     return;
-  else if ((_w > 0) && (x < SCREEN_W) && ((x + _w) > 0)
-	   && (_h > 0) && (y < SCREEN_H) && ((y + _h) > 0))
+  else if ((_w > 0) && (x < DISPLAY_W) && ((x + _w) > 0)
+	   && (_h > 0) && (y < DISPLAY_H) && ((y + _h) > 0))
     {
       /* Rectangle is visible on screen.  */
       if (__DRS_onum >= __DRS_size)
@@ -493,7 +494,7 @@
 	vsync ();
 
       /* Update the whole screen.  */
-      blit (DRS_work, screen, 0, 0, 0, 0, SCREEN_W, SCREEN_H);
+      blit (DRS_work, screen, 0, 0, 0, 0, DISPLAY_W, DISPLAY_H);
 
       /* If double-buffering, then do full update always.  */
       __DRS_full = __DRS_dbuf;
@@ -523,7 +524,7 @@
 	  ybeg = (rbeg->y <= yend) ? yend : rbeg->y;
 	  yend = rbeg->y + rbeg->h;
 
-	  if (ybeg >= SCREEN_H)
+	  if (ybeg >= DISPLAY_H)
 	    break;
 
 	  /* Limit height of the strip to fit in one bank.  */
diff -urN Zasx.org/src/gamemenu.c Zasx/src/gamemenu.c
--- Zasx.org/src/gamemenu.c	2001-08-02 01:37:52.000000000 +0200
+++ Zasx/src/gamemenu.c	2006-04-02 20:16:58.000000000 +0200
@@ -300,10 +300,7 @@
 
 			SEND_MESSAGE(&ZasxDialog[0], MSG_DRAW, 0);
 
-			if (DISPLAY_W != SCREEN_W || DISPLAY_H != SCREEN_H)
-				stretch_blit(BackBuffer, screen, 0, 0, BackBuffer->w, BackBuffer->h, 0, 0, SCREEN_W, SCREEN_H);
-			else
-				blit(BackBuffer, screen, 0, 0, 0, 0, SCREEN_W, SCREEN_H);
+			blit(BackBuffer, screen, 0, 0, 0, 0, DISPLAY_W, DISPLAY_H);
 
 		} while (1);
 
diff -urN Zasx.org/src/gametimer.c Zasx/src/gametimer.c
--- Zasx.org/src/gametimer.c	2001-08-02 01:37:50.000000000 +0200
+++ Zasx/src/gametimer.c	2006-04-02 20:25:10.000000000 +0200
@@ -6,9 +6,9 @@
  * Please refer to the accompanying file 'copying.txt' for details.
  */
 #include "allegro.h"
-
+#include "gfx.h"
 #include "gametimer.h"
-
+#include "game.h"
 #include "log.h"
 
 
@@ -150,9 +150,28 @@
 
 int GTIME_Poll() {
 
-	int the_time = GameTime;
-	int i, r;
+	int the_time, i, r, timers_elapsed = 0;
 
+	/* We have todo this in a function which gets called from both
+	   the game loop and the menu loop hence we do it here. Not a logical
+	   place or pretty, but it works. */
+	if (FullscreenToggleRequested)
+	{
+		fullscreen = !fullscreen;
+		if (set_gfx_mode(fullscreen? GFX_AUTODETECT_FULLSCREEN:
+				GFX_AUTODETECT_WINDOWED,
+				DISPLAY_W, DISPLAY_H, 0, 0))
+		{
+			fprintf(stderr,
+				"FATAL error switching Fullscreen<->Window\n");
+			exit(1);
+		}
+		set_palette(GamePal);
+		FullscreenToggleRequested = 0;
+	}
+	
+	the_time = GameTime;
+	
 	for (i = 0; i < NumPolled; i++) {
 
 		GTIME_POLL *p = Polled + i;		
@@ -187,8 +206,13 @@
 				i--;
 				continue;
 			}
+			timers_elapsed++;
 		}
 	}
+
+	if (timers_elapsed == 0)
+		rest(1);
+		
 	return GTIME_OK;
 }
 
@@ -206,4 +230,4 @@
 
 int GTIME_IsFrozen() {
 	return GTIME_FreezeFlag;
-}
\ No newline at end of file
+}
diff -urN Zasx.org/src/gfx.c Zasx/src/gfx.c
--- Zasx.org/src/gfx.c	2001-08-02 20:08:04.000000000 +0200
+++ Zasx/src/gfx.c	2006-04-02 20:16:58.000000000 +0200
@@ -10,31 +10,22 @@
 #include "gfx.h"
 
 
-static BITMAP *oldscreen = NULL;
 BITMAP *BackBuffer = NULL;
+int display_w = 640;
+int display_h = 480;
+int fullscreen = 1;
 
 
-int GFX_Init(int w, int h, int c, int f) {
-
-	int mode = GFX_AUTODETECT;
-
-	if (oldscreen)
-		destroy_bitmap(oldscreen);
-	if (BackBuffer)
-		destroy_bitmap(BackBuffer);	
-
-	set_color_depth(c);
-
-	if (!f)
-		mode = GFX_AUTODETECT_WINDOWED;
-
-	if (set_gfx_mode(mode, w, h, 0, 0)) {	
+int GFX_Init(void)
+{
+	set_color_depth(8);
+	if (set_gfx_mode(fullscreen?
+			GFX_AUTODETECT_FULLSCREEN:GFX_AUTODETECT_WINDOWED,
+			display_w, display_h, 0, 0)) {
 		allegro_message("Can't set graphics mode!\n");
 		return -1;
 	}
 
-	oldscreen = create_video_bitmap(w, h);
-
 	return 0;
 }
 
@@ -42,12 +33,8 @@
 
 int GFX_Shutdown() {
 
-	if (oldscreen)
-		destroy_bitmap(oldscreen);
-
 	set_gfx_mode(GFX_TEXT, 0, 0, 0, 0);
 
-	oldscreen = NULL;
 	BackBuffer = NULL;
 
 	return 0;
diff -urN Zasx.org/src/input.c Zasx/src/input.c
--- Zasx.org/src/input.c	2001-08-02 01:37:42.000000000 +0200
+++ Zasx/src/input.c	2006-04-02 20:16:58.000000000 +0200
@@ -23,7 +23,7 @@
    "T",          "U",          "V",          "W",
    "X",          "Y",          "Z",          "0",
    "1",          "2",          "3",          "4",
-   "5",          "6",          "7",          "_8",
+   "5",          "6",          "7",          "8",
    "9",          "0_PAD",      "1_PAD",      "2_PAD",
    "3_PAD",      "4_PAD",      "5_PAD",      "6_PAD",
    "7_PAD",      "8_PAD",      "9_PAD",      "F1",
@@ -40,7 +40,10 @@
    "MINUS_PAD",  "PLUS_PAD",   "DEL_PAD",    "ENTER_PAD",
    "PRTSCR",     "PAUSE",      "ABNT_C1",    "YEN",
    "KANA",       "CONVERT",    "NOCONVERT",  "AT",
-   "CIRCUMFLEX", "COLON2",     "KANJI",
+   "CIRCUMFLEX", "COLON2",     "KANJI",	     
+   "EQUALS_PAD", "BACKQUOTE",  "SEMICOLON",  "COMMAND",
+   "UNKNOWN1",   "UNKNOWN2",   "UNKNOWN3",   "UNKNOWN4",
+   "UNKNOWN5",   "UNKNOWN6",   "UNKNOWN7",   "UNKNOWN8",
    "LSHIFT",     "RSHIFT",     "LCONTROL",   "RCONTROL",
    "ALT",        "ALTGR",      "LWIN",       "RWIN",
    "MENU",       "SCRLOCK",    "NUMLOCK",    "CAPSLOCK",
@@ -48,7 +51,7 @@
 };
 
 static char *input_name[] = {
-	"(none)", "Keyboard", "Mouse", "Joystick  "
+	"(none)", "Keyboard", "Mouse", "Joystick"
 };
 
 
@@ -305,21 +308,12 @@
 		return 0;
 	}
 
-	if (dev->InputType == INPUT_TYPE_JOYSTICK) {
-		INPUT_JOY *joys = dev->InputData;
-
-		if (joys)
-			sprintf(input_name[dev->InputType], "Joystick");
-	}
-
 	return input_name[dev->InputType];
 }
 
 
 char* get_input_type_full_name(INPUT *dev) {
 
-	char *ret;
-
 	if (!dev) {
 		LOG("--== Error ==-- Input::get_input_type: Null argument 'dev'\n");
 		return 0;
@@ -330,16 +324,18 @@
 		return 0;
 	}
 
-	ret = input_name[dev->InputType];
-
 	if (dev->InputType == INPUT_TYPE_JOYSTICK) {
 		INPUT_JOY *joys = dev->InputData;
 
-		if (joys)
-			sprintf(ret, "Joystick %i", joys->JoystickNum + 1);
+		if (joys) {
+			static char buf[16];
+			snprintf(buf, sizeof(buf), "Joystick %i",
+				joys->JoystickNum + 1);
+			return buf;
+		}
 	}
 
-	return ret;
+	return input_name[dev->InputType];
 }
 
 
@@ -478,7 +474,7 @@
 	}
 
 
-	if (length < 11) {
+	if (length && length < 11) {
 		LOG("--== Error ==-- Input::get_input_name: Buffer length (%i) must be at least 11 bytes long.\n");
 		return NULL;
 	}
@@ -510,8 +506,13 @@
 			return NULL;
 		}
 
-		sprintf(buf, "%*s", length - 1, r);
-		return buf;
+		if (length)
+		{
+			sprintf(buf, "%*s", length - 1, r);
+			return buf;
+		}
+		else
+			return r;
 	}
 
 	else if (dev->InputType == INPUT_TYPE_JOYSTICK) {
@@ -560,7 +561,7 @@
 		}
 
 		/* Print minimal form? */
-		if (length < 12)
+		if (length == 0)
 			sprintf(buf, "Joy%i %i %i", joys->JoystickNum, sn, an);
 		else
 			sprintf(buf, "%*s%c", length - 1, r, nse ? 0 : ((an < 0) ? '+' : '-'));
diff -urN Zasx.org/src/jgmod.c Zasx/src/jgmod.c
--- Zasx.org/src/jgmod.c	1970-01-01 01:00:00.000000000 +0100
+++ Zasx/src/jgmod.c	2006-04-02 20:16:58.000000000 +0200
@@ -0,0 +1,146 @@
+/*  incomplete DUMB JGMOD compatibility wrapper, because JGMOD's license is
+    not opensource / GPL compatible and because there are already enough mod
+    playing libs.
+   
+    Copyright 2006 Hans de Goede <j.w.r.degoede at hhs.nl>
+   
+    This wrapper is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public   
+    License as published by the Free Software Foundation; either 
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of 
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA   
+*/
+#include <unistd.h>
+#include <pthread.h>
+#include <string.h>
+#include <strings.h>
+#include "jgmod.h"
+
+static AL_DUH_PLAYER *duh_player = NULL;
+static pthread_t duh_player_thread;
+static pthread_mutex_t duh_player_mutex;
+static int pattern = 0; /* from t3ss implementation, might need it someday */
+static int mod_volume = 255;
+
+void install_mod(int channels) /* ignored */
+{
+    dumb_register_packfiles();
+    pthread_mutex_init(&duh_player_mutex, NULL);
+}
+
+void remove_mod(void)
+{
+    stop_mod();
+    dumb_exit();
+}
+
+JGMOD *load_mod(const char *path) /* path may be a packfile # index */
+{
+    char *p, ext[64];
+
+    snprintf(ext, sizeof(ext), "%s", get_extension(path));
+    if ((p = strrchr(ext, '_')))
+        memmove(ext, p+1, strlen(p));
+    
+    if (!strcasecmp(ext, "it"))
+        return dumb_load_it_quick(path);
+    if (!strcasecmp(ext, "xm"))
+        return dumb_load_xm_quick(path);
+    if (!strcasecmp(ext, "s3m"))
+        return dumb_load_s3m_quick(path);
+    if (!strcasecmp(ext, "mod"))
+        return dumb_load_mod_quick(path);
+    return NULL;                
+}
+
+void destroy_mod(JGMOD *mod)
+{
+    unload_duh(mod);
+}
+
+static void *duh_player_thread_function(void *arg)
+{
+    while(1)
+    {
+        pthread_mutex_lock(&duh_player_mutex);
+        al_poll_duh(duh_player);
+        pthread_mutex_unlock(&duh_player_mutex);
+        pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
+        usleep(10000);
+        pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL);
+    }
+}
+
+void play_mod(JGMOD *mod, int loop)
+{
+    DUMB_IT_SIGDATA *sigdata;
+    DUH_SIGRENDERER *renderer;
+    int num_patterns;
+    
+    if (duh_player)
+        stop_mod();
+    
+    if (!mod)
+        return;
+    
+    sigdata = duh_get_it_sigdata(mod);
+    if (sigdata)
+        num_patterns = dumb_it_sd_get_n_orders(sigdata);
+    else
+        num_patterns = 0;
+        
+    if (pattern >= num_patterns)
+        pattern = 0;
+        
+    renderer = dumb_it_start_at_order(mod, 2, pattern);
+    if (!renderer)
+        return;
+
+    duh_player = al_duh_encapsulate_sigrenderer(renderer, mod_volume/255.0f,
+        2048, 44100);
+    if (!duh_player)
+    {
+        duh_end_sigrenderer(renderer);
+        return;
+    }
+    
+    if (pthread_create(&duh_player_thread, NULL,
+            duh_player_thread_function, NULL))
+    {
+        al_stop_duh(duh_player);
+        duh_player = NULL;
+    }
+}
+
+
+void stop_mod(void)
+{
+    if (duh_player)
+    {
+        /* stop the player thread */
+        pthread_cancel(duh_player_thread);
+        pthread_join(duh_player_thread, NULL);
+        /* and clean up everything */
+        al_stop_duh(duh_player);
+        duh_player = NULL;
+    }
+}
+
+void set_mod_volume(int volume) /* 0 - 255 */
+{
+    mod_volume = volume;
+    if (duh_player)
+    {
+        pthread_mutex_lock(&duh_player_mutex);
+        al_duh_set_volume(duh_player, mod_volume/255.0f);
+        pthread_mutex_unlock(&duh_player_mutex);
+    }
+}
diff -urN Zasx.org/src/main.c Zasx/src/main.c
--- Zasx.org/src/main.c	2001-10-06 13:13:28.000000000 +0200
+++ Zasx/src/main.c	2006-04-02 20:33:36.000000000 +0200
@@ -34,11 +34,10 @@
 
 #define DIST(x, y) sqrt((x)*(x) + (y)*(y))
 
-int ShowFPS = 0, WaitForVSync = 0;
-int Redraw = 0;
+static int ShowFPS = 0;
+static int Redraw = 0;
 
 BITMAP *Ast[9];
-BITMAP *BackBuffer;
 DATAFILE *demodata;
 BITMAP *Smoke, *Bullet, *Dust;
 BITMAP *PlayerBitmap[NUM_PLAYERS];
@@ -60,6 +59,7 @@
 RGB* GamePal;
 
 int GamePaused = 0;
+int FullscreenToggleRequested = 0;
 
 #ifndef M_PI
 #define M_PI 3.14159
@@ -217,9 +217,6 @@
 
 
 int play_game(void* dummy) {
-
-	static int smokecount = 0;
-
 	int d, i, j, k;
 	float vx, vy;
 
@@ -807,7 +804,7 @@
 		}
 		x += DISPLAY_W / 2;
 			
-		if (x >= SCREEN_W) {
+		if (x >= DISPLAY_W) {
 			x = 0;
 			y += 60;
 		}
@@ -828,8 +825,15 @@
 
 	poll_joystick();
 
+	if (key[KEY_F11]) {
+		/* Don't toggle twice (or more) for the same keypress */
+		key[KEY_F11] = 0;
+		ShowFPS = !ShowFPS;
+	}
+
 	if (key[KEY_F12]) {
-		clear_keybuf();
+		/* Don't toggle twice (or more) for the same keypress */
+		key[KEY_F12] = 0;
 		GamePaused ^= 1;
 	}
 
@@ -934,6 +938,7 @@
 	GTIME_AddFunction(play_game, 20, NULL, GTIME_NORMAL);
 	GTIME_AddFunction(game_input, 50, NULL, GTIME_NORMAL);
 
+	GamePaused = 0;
 	LOG("Starting game...NOW!\n");
 	
 	do {
@@ -950,13 +955,10 @@
 				frame_start_time = GameTime;
 				frame_count = 0;
 			}
-			textprintf(BackBuffer, font, 0, SCREEN_H - 10, makecol(255, 255, 255), "FPS: %.2f", frame_rate);
-			DRS_add_rectangle(0, SCREEN_H - 10, 128, 8);
+			textprintf(BackBuffer, font, 0, DISPLAY_H - 10, makecol(255, 255, 255), "FPS: %.2f", frame_rate);
+			DRS_add_rectangle(0, DISPLAY_H - 10, 128, 8);
 		}
 
-		if (WaitForVSync)
-			vsync();
-
 		acquire_screen();
 
 		if (frame_timer != GameTime / 1000) {
@@ -1033,24 +1035,49 @@
 	return;
 }
 
+/* We use a keyboard_callback handler to detect left-alt + enter for
+   fullscreen toggle, by doing this in the callback handler we can
+   make sure that enter with alt pressed doesn't get into the buffer and thus
+   doesn't cause any menu choices to be made. */
+static int ZasxKeyboardCallback(int keypress)
+{
+	if (key[KEY_ALT] && ((keypress >> 8) == KEY_ENTER))
+	{
+		FullscreenToggleRequested = 1;
+		return 0;
+	}
+	return keypress;
+}
+
 
 int main() {
 
 	int r;
-	int w, h, c, mvol, muvol, fullscreen;
+	int mvol, muvol;
+
+#ifdef __unix__
+	char *get_home_dir(void);
+	char config_file_name[512];
+	char *home_dir = get_home_dir();
+	
+	allegro_init();	
+	
+	snprintf(config_file_name, sizeof(config_file_name)/sizeof(char),
+		"%s/.%s", home_dir? home_dir:".", "zasx.cfg");
+      
+	override_config_file(config_file_name);
+#else
 	allegro_init();	
+	override_config_file("zasx.cfg");
+#endif
 
-	set_config_file("zasx.cfg");
-	w = get_config_int("[screen]", "width", 640);
-	h = get_config_int("[screen]", "height", 480);
-	c = get_config_int("[screen]", "color", 8);
+	display_w = get_config_int("[screen]", "width", 640);
+	display_h = get_config_int("[screen]", "height", 480);
 	fullscreen = get_config_int("[screen]", "full_screen", 1);
 	ShowFPS = get_config_int("[screen]", "show_fps", 0);
-	WaitForVSync = get_config_int("[screen]", "vsync", 0);
 	mvol = get_config_int("[sound]", "master_volume", 255);
 	muvol = get_config_int("[sound]", "music_volume", 255);
 	
-
 	/* Log init */
 	LOG("\n\n\n");
 	LOG("******************************************\n");
@@ -1061,11 +1088,12 @@
 
 
 	/* Init */
-	GFX_Init(w, h, c, fullscreen);
+	GFX_Init();
 	set_window_title("Zasx v" VERSION);	
 	set_display_switch_callback(SWITCH_IN, SwitchCallback);
 
 
+	keyboard_callback = ZasxKeyboardCallback;
 	install_keyboard();
 	install_joystick(JOY_TYPE_AUTODETECT);
 	install_timer();
@@ -1110,6 +1138,16 @@
 
 	GFX_Shutdown();
 
+	/* fullscreen and ShowFPS may have been changed, remember them. For
+	   the others make sure we write them to the config file if they were
+	   not there to give the user a clue howto change these settings :) */
+	set_config_int("[screen]", "full_screen", fullscreen);
+	set_config_int("[screen]", "show_fps", ShowFPS);
+	set_config_int("[screen]", "width", display_w);
+	set_config_int("[screen]", "height", display_h);
+	set_config_int("[sound]", "master_volume", mvol);
+	set_config_int("[sound]", "music_volume", muvol);	
+
 	return 0;
 } END_OF_MAIN();
 
diff -urN Zasx.org/src/scorer.c Zasx/src/scorer.c
--- Zasx.org/src/scorer.c	2001-10-06 12:38:38.000000000 +0200
+++ Zasx/src/scorer.c	2006-04-02 20:16:58.000000000 +0200
@@ -66,7 +66,7 @@
 
 		textprintf_centre(BackBuffer, font, DISPLAY_W / 2, DISPLAY_H - text_height(font), makecol(255, 255, 255), "Press any key to continue...");
 
-		stretch_blit(BackBuffer, screen, 0, 0, BackBuffer->w, BackBuffer->h, 0, 0, SCREEN_W, SCREEN_H);
+		blit(BackBuffer, screen, 0, 0, 0, 0, DISPLAY_W, DISPLAY_H);
 	} while (!keypressed());
 
 	readkey();
@@ -93,7 +93,7 @@
 		sprintf(t, "Name%0i", i);
 		best_name = get_config_string("[scores]", t, "Bob");
 		sprintf(t, "Score%0i", i);
-		score = get_config_int("[scores]", t, 0);
+		score = get_config_int("[scores]", t, 128000/(1<<i));
 
 		textprintf(BackBuffer, DigitFont, 5, i * (text_height(DigitFont) + 3) + 50, color, "%2i.", i + 1);
 		textprintf_right(BackBuffer, DigitFont, DISPLAY_W - 10, i * (text_height(DigitFont) + 3) + 50, color, "%01i", (i == p) ? this_score : score);
@@ -109,17 +109,21 @@
 
 void ViewHighScore() {
 
+#ifndef __unix__
 	push_config_state();
 	set_config_file("data/zasx.hsc");
+#endif
 
 	DrawBG();
 	DrawScore(-1, -1, -1);
 
+#ifndef __unix__
 	pop_config_state();
+#endif
 
 	textprintf_centre(BackBuffer, font, DISPLAY_W / 2, DISPLAY_H - text_height(font), makecol(255, 255, 255), "Press any key to continue");
 
-	stretch_blit(BackBuffer, screen, 0, 0, BackBuffer->w, BackBuffer->h, 0, 0, SCREEN_W, SCREEN_H);
+	blit(BackBuffer, screen, 0, 0, 0, 0, DISPLAY_W, DISPLAY_H);
 
 	while (keypressed()) readkey();
 	readkey();
@@ -210,7 +214,7 @@
 	    text_mode(rtm);
 	    x += w;
 	 }
-	 stretch_blit(BackBuffer, screen, 0, 0, BackBuffer->w, BackBuffer->h, 0, 0, SCREEN_W, SCREEN_H);
+	 blit(BackBuffer, screen, 0, 0, 0, 0, DISPLAY_W, DISPLAY_H);
 	 break;
 
       case MSG_WANTFOCUS:
@@ -289,8 +293,10 @@
 
 	int i, p = -1;
 
+#ifndef __unix__
 	push_config_state();
 	set_config_file("data/zasx.hsc");
+#endif
 
 	for (i = 0; i < 10; i++) {
 		char t[80];
@@ -300,7 +306,7 @@
 		sprintf(t, "Name%0i", i);
 		best_name = get_config_string("[scores]", t, "Bob");
 		sprintf(t, "Score%0i", i);
-		score = get_config_int("[scores]", t, 0);
+		score = get_config_int("[scores]", t, 128000/(1<<i));
 
 		if (this_score > score) {
 			p = i;
@@ -319,7 +325,7 @@
 			sprintf(t, "Name%0i", i);
 			name = get_config_string("[scores]", t, "Bob");
 			sprintf(t, "Score%0i", i);
-			score = get_config_int("[scores]", t, 0);
+			score = get_config_int("[scores]", t, 128000/(1<<i));
 
 			sprintf(t, "Name%0i", i + 1);
 			set_config_string("[scores]", t, name);
@@ -338,7 +344,7 @@
 				{NULL}
 			};
 			memset(name, 0, 80);
-			stretch_blit(BackBuffer, screen, 0, 0, BackBuffer->w, BackBuffer->h, 0, 0, SCREEN_W, SCREEN_H);
+			blit(BackBuffer, screen, 0, 0, 0, 0, DISPLAY_W, DISPLAY_H);
 
 			while (keypressed())
 				readkey();
@@ -356,7 +362,9 @@
 		}
 	}
 
+#ifndef __unix__
 	pop_config_state();
+#endif
 
 	return p;
 }
diff -urN Zasx.org/src/star.c Zasx/src/star.c
--- Zasx.org/src/star.c	2001-08-02 01:38:44.000000000 +0200
+++ Zasx/src/star.c	2006-04-02 20:16:58.000000000 +0200
@@ -148,8 +148,6 @@
 
 
 void clear_stars() {
-	int i = 0;
-
 	while (NumStars)
 		destroy_star(Star[0]);
 
diff -urN Zasx.org/src/unix.c Zasx/src/unix.c
--- Zasx.org/src/unix.c	1970-01-01 01:00:00.000000000 +0100
+++ Zasx/src/unix.c	2006-04-02 20:16:58.000000000 +0200
@@ -0,0 +1,38 @@
+/* Function(s) to find the homedir of a user under Unix */
+#ifdef __unix__
+#include <pwd.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/types.h>
+#if defined(__DECC) && defined(VMS)
+#include <unixlib.h>
+static char *vms_to_unix_buffer = NULL;
+static int convert_vms_to_unix(char *vms_dir_name)
+{
+	vms_to_unix_buffer = vms_dir_name;
+}
+#endif
+
+/* 
+ * Locate user's home directory.
+ */
+char *get_home_dir(void)
+{
+	struct passwd *pw;
+
+	if (!(pw = getpwuid(getuid())))
+	{ 
+		fprintf(stderr, "Who are you? Not found in passwd database!!\n");
+		return NULL;
+	}
+
+#if defined(__DECC) && defined(VMS)
+	/* Convert The OpenVMS Formatted "$HOME" Directory Path Into Unix
+	   Format. */
+	decc$from_vms(pw->pw_dir, convert_vms_to_unix, 1);
+	return vms_to_unix_buffer;
+#else
+	return pw->pw_dir;
+#endif
+}
+#endif /* defined __unix__ */
diff -urN Zasx.org/src/weapon.c Zasx/src/weapon.c
--- Zasx.org/src/weapon.c	2001-08-09 01:13:06.000000000 +0200
+++ Zasx/src/weapon.c	2006-04-02 20:16:58.000000000 +0200
@@ -67,19 +67,6 @@
 }
 
 
-static void strip_leading_whitespace(char *buf) {
-
-
-	char *cur = buf;
-
-	if (!buf)
-		return;
-
-	//sscanf(buf, "%[^\n]", buf);
-
-	return;
-}
-
 static void dup_sample(SAMPLE **dest, SAMPLE *src) {
 
 	SAMPLE *d;
@@ -159,8 +146,6 @@
 		int r, i;
 		float x, y;
 
-		strip_leading_whitespace(buf);
-
 		if (buf[0] == '#')
 			continue;
 


--- NEW FILE zasx.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Zasx
GenericName=Asteroid like game
Comment=Asteroid with powerups!
Exec=zasx
Icon=zasx.png
Terminal=false
StartupNotify=false
Type=Application
Categories=Application;Game;ArcadeGame;
Version=1.30


--- NEW FILE zasx.spec ---
Name:           zasx
Version:        1.30
Release:        1%{?dist}
Summary:        Asteroid like game with powerups
Group:          Amusements/Games
License:        GPL and freely distributable content
URL:            http://www.bob.allegronetwork.com/zasx/index.html
Source0:        http://www.bob.allegronetwork.com/zasx/zasx130s.zip
Source1:        zasx.desktop
Patch0:         zasx-1.30-fixes.patch
Patch1:         zasx-1.30-datadir.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  dumb-devel ImageMagick desktop-file-utils

%description
Shoot the asteroids before they hit your ship and collect power ups to restore
your shields and improve your weapons. The game features single and dualplayer 
mode, joystick, music and sound.


%prep
%setup -q -n Zasx
%patch0 -p1 -z .fix
%patch1 -p1 -z .datadir
%{__sed} -i 's/\r//' copying.txt readme.txt docs/index.html docs/%{name}.css
mv docs html


%build
make %{?_smp_mflags} PREFIX=%{_prefix} \
  CFLAGS="$RPM_OPT_FLAGS -fsigned-char -Wno-deprecated-declarations"
convert -transparent black %{name}.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.txt readme.txt html
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png


%changelog
* Sun Apr  2 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.30-1
- initial Fedora Extras package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zasx/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Apr 2006 19:23:50 -0000	1.1
+++ .cvsignore	3 Apr 2006 19:24:55 -0000	1.2
@@ -0,0 +1 @@
+zasx130s.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zasx/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Apr 2006 19:23:50 -0000	1.1
+++ sources	3 Apr 2006 19:24:55 -0000	1.2
@@ -0,0 +1 @@
+8706050ad5e54b673c2e2a987c581d67  zasx130s.zip



From fedora-extras-commits at redhat.com  Mon Apr  3 19:25:33 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Mon,  3 Apr 2006 12:25:33 -0700
Subject: fedora-security/audit fc4,1.183,1.184 fc5,1.96,1.97
Message-ID: <200604031925.k33JPXXP001083@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1028

Modified Files:
	fc4 fc5 
Log Message:
Note the struts information.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- fc4	31 Mar 2006 14:50:28 -0000	1.183
+++ fc4	3 Apr 2006 19:25:31 -0000	1.184
@@ -4,9 +4,9 @@
 ** are items that need attention
 
 CVE-2006-1550 VULNERABLE (dia) bz#187402
-CVE-2006-1548 ** struts
-CVE-2006-1547 ** struts
-CVE-2006-1546 ** struts
+CVE-2006-1548 VULNERABLE (struts, fixed 1.2.9) bz#187544
+CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) bz#187544
+CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1368 ** kernel
 CVE-2006-1354 VULNERABLE (freeradius) bz#186084
 CVE-2006-1343 ** kernel


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- fc5	31 Mar 2006 14:50:28 -0000	1.96
+++ fc5	3 Apr 2006 19:25:31 -0000	1.97
@@ -3,9 +3,9 @@
 
 ** are items that need attention
 
-CVE-2006-1548 ** struts
-CVE-2006-1547 ** struts
-CVE-2006-1546 ** struts
+CVE-2006-1548 VULNERABLE (struts, fixed 1.2.9) bz#187544
+CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) bz#187544
+CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1368 ** kernel
 CVE-2006-1354 VULNERABLE (freeradius) bz#186084
 CVE-2006-1343 ** kernel



From fedora-extras-commits at redhat.com  Mon Apr  3 19:31:03 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon,  3 Apr 2006 12:31:03 -0700
Subject: rpms/shippy/devel shippy-merged.patch, NONE, 1.1 shippy.spec, 1.1, 
	1.2 shippy-fixes.patch, 1.1, NONE shippy-fullscreen.patch, 1.1,
	NONE shippy-joy.patch, 1.1, NONE shippy-lcdfix.patch, 1.1,
	NONE shippy-warnings.patch, 1.1, NONE
Message-ID: <200604031931.k33JV5tv001163@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/shippy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1143

Modified Files:
	shippy.spec 
Added Files:
	shippy-merged.patch 
Removed Files:
	shippy-fixes.patch shippy-fullscreen.patch shippy-joy.patch 
	shippy-lcdfix.patch shippy-warnings.patch 
Log Message:
* Mon Apr  3 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.3.3.7-unreleased
- Merged all patches into one and put a few parts between #ifdef __unix__
  (I send this upstream for merging).


shippy-merged.patch:

--- NEW FILE shippy-merged.patch ---
Only in shippy-1.3.3.7.orig/data: scores.lst
diff -ur shippy-1.3.3.7.orig/externs.h shippy-1.3.3.7/externs.h
--- shippy-1.3.3.7.orig/externs.h	2004-01-17 21:57:50.000000000 +0100
+++ shippy-1.3.3.7/externs.h	2006-04-01 13:45:54.000000000 +0200
@@ -10,5 +10,9 @@
 extern int done;
 extern int gscale;
 extern volatile int objectsynch;
+extern int start_windowed;
+extern int use_arcade_mode;
+extern int screen_width;
+extern int screen_height;
 
 #endif
diff -ur shippy-1.3.3.7.orig/shipall.c shippy-1.3.3.7/shipall.c
--- shippy-1.3.3.7.orig/shipall.c	2004-03-04 00:52:10.000000000 +0100
+++ shippy-1.3.3.7/shipall.c	2006-04-01 13:45:54.000000000 +0200
@@ -1,3 +1,4 @@
+#include <string.h>
 #include <allegro.h>
 #include <aldumb.h>
 #include "shippy.h"
@@ -9,6 +10,11 @@
 
 volatile int objectsynch = 0;
 
+#ifndef ALLEGRO_DOS
+static int vidmode;
+#endif
+static RGB mypal[256];    
+
 DUH *music=NULL;
 AL_DUH_PLAYER *dp=NULL;
 
@@ -171,7 +177,6 @@
 {
     int GraphicsFlag;
     BITMAP *mytest2;
-    RGB mypal[256];    
     set_color_depth(8);
     bitsperpixel = 8;
 	set_color_conversion(COLORCONV_TOTAL);
@@ -188,18 +193,22 @@
 	
 
 #else
-    GraphicsFlag=set_gfx_mode(GFX_AUTODETECT_WINDOWED, 480, 320, 0, 0);    
+    GraphicsFlag=set_gfx_mode(start_windowed? GFX_AUTODETECT_WINDOWED:
+        GFX_AUTODETECT_FULLSCREEN, screen_width, screen_height, 0, 0);    
     if(GraphicsFlag!=0)
     {
-        GraphicsFlag=set_gfx_mode(GFX_SAFE, 480, 320, 0, 0);
+        GraphicsFlag=set_gfx_mode(GFX_SAFE, screen_width, screen_height, 0, 0);
         if(GraphicsFlag!=0) exit(-1);
+        else vidmode = GFX_SAFE;
     }
+    else
+        vidmode = GFX_AUTODETECT_FULLSCREEN;
 #endif
 
     BackBuffer=create_system_bitmap(240,160);
     Graphics=create_system_bitmap(320,128);
 
-    mytest2 = load_bmp("data/graphics.bmp",mypal);
+    mytest2 = load_bmp(DATADIR "graphics.bmp",mypal);
     if(mytest2==NULL) return;
 	blit(mytest2,Graphics,0,0,0,0,320,128);
 	destroy_bitmap(mytest2);
@@ -215,7 +224,7 @@
     set_palette(mypal);
 }
 
-int SYSTEM_BG(char *bmp)
+void SYSTEM_BG(char *bmp)
 {
     BITMAP *mytest2;
   	mytest2 = load_bmp(bmp,NULL);
@@ -227,12 +236,8 @@
 }
 int SYSTEM_INIT()
 {
-    int AllegroInitFlag;
-    int GraphicsFlag;
-    int width,height;
-    BITMAP *mytest2;
-
-    AllegroInitFlag = allegro_init();
+    if (allegro_init())
+        return -1;
 
     atexit(&dumb_exit);
     dumb_register_stdfiles();
@@ -279,13 +284,13 @@
     return key[scancode];
 }
 
-int SYSTEM_FINISHRENDER()
+void SYSTEM_FINISHRENDER()
 {
 #ifdef ALLEGRO_DOS
     blit(BackBuffer,screen,0,0,40,20,240,160);
 #else
     acquire_screen();
-    stretch_blit(BackBuffer,screen,0,0,240,160,0,0,480,320);
+    stretch_blit(BackBuffer,screen,0,0,240,160,0,0,screen_width,screen_height);
     release_screen();
 #endif
 }
@@ -295,14 +300,13 @@
     return 0;
 }
 
-int SYSTEM_BLIT(int sx, int sy, int x, int y, int szx, int szy)
+void SYSTEM_BLIT(int sx, int sy, int x, int y, int szx, int szy)
 {
     masked_blit(Graphics,BackBuffer,sx,sy,x,y,szx,szy);
 }
 
 void SYSTEM_POLLINPUT()
 {
-    int tx,ty;
     jaction = 0;
     jsecond = 0;
     jdirx = 0;
@@ -310,6 +314,25 @@
 
 
     if(SYSTEM_GETKEY(KEY_ESC)) done = 1;
+
+#ifndef ALLEGRO_DOS
+    if (key[KEY_ENTER] && key[KEY_ALT] && (vidmode != GFX_SAFE))
+    {
+        vidmode = (vidmode == GFX_AUTODETECT_FULLSCREEN)?
+            GFX_AUTODETECT_WINDOWED:GFX_AUTODETECT_FULLSCREEN;
+        if(set_gfx_mode(vidmode, screen_width, screen_height, 0, 0))
+        {
+            vidmode = GFX_SAFE;
+            if(set_gfx_mode(vidmode, screen_width, screen_height, 0, 0))
+            {
+                fprintf(stderr, "FATAL error switching Fullscreen <-> Window\n");
+	        exit(1);
+	    }
+	}
+        set_palette(mypal);
+    }
+#endif
+
     if(waitforkey>0)
     {
         --waitforkey;
@@ -321,8 +344,8 @@
         poll_joystick();
         jaction = joy[0].button[0].b;
         jsecond = joy[0].button[1].b;
-        jdirx = (joy[0].stick[0].axis[0].d1 - joy[0].stick[0].axis[0].d2)*2;
-        jdiry = (joy[0].stick[0].axis[1].d1 - joy[0].stick[0].axis[1].d2);
+        jdirx = joy[0].stick[0].axis[0].pos / 50;
+        jdiry = joy[0].stick[0].axis[1].pos / 65;
     }
     if(jdirx == 0) jdirx=(SYSTEM_GETKEY(KEY_LEFT) - SYSTEM_GETKEY(KEY_RIGHT)) * 2;
     if(jdiry == 0) jdiry=SYSTEM_GETKEY(KEY_UP) - SYSTEM_GETKEY(KEY_DOWN);
@@ -332,12 +355,12 @@
 
 void SYSTEM_IDLE()
 {
-
+    if (objectsynch == 0)
+        rest(1);
 }
 
 int main(int argc, char*argv[])
 {
-	SHIPPY_MAIN();
-
+	return SHIPPY_MAIN(argc, argv);
 }
 END_OF_MAIN()
diff -ur shippy-1.3.3.7.orig/shippy.c shippy-1.3.3.7/shippy.c
--- shippy-1.3.3.7.orig/shippy.c	2004-03-08 06:41:30.000000000 +0100
+++ shippy-1.3.3.7/shippy.c	2006-04-01 13:57:04.000000000 +0200
@@ -4,7 +4,15 @@
 http://ship84.sourceforge.net
 */
 
+#ifdef __unix__
+/* this must be done before the first include of unistd.h for setresgid */
+#define _GNU_SOURCE 
+#include <unistd.h>
+#endif
+#include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
 #include "shippy.h"
 
 #define TEXT_WHITE 0
@@ -98,6 +106,13 @@
 int missedshots = 0;
 int firedshots = 0;
 
+FILE *highscore_fp;
+
+int start_windowed  = 0;
+int use_arcade_mode = 0;
+int screen_width  = 640;
+int screen_height = 480;
+
 int compare(const void *a, const void *b)
 {
     struct HISCORE *test = (struct HISCORE *)a;
@@ -299,10 +314,7 @@
 {
     int increment;
     int adder;
-    int accuracy;
-    int courage;
     int bonus;
-    float floatop;
 
     shots = 0;
     powerupframe = 0;
@@ -590,7 +602,6 @@
     if(ShippyObjects[number].used==0) return;
     int increment;
     int runsim;
-    int tx,ty;
 
     switch(ShippyObjects[number].type)
     {
@@ -656,7 +667,7 @@
                                     if(shots<10)
                                     {
                                         AddObject(BULLET, ShippyObjects[number].x, ShippyObjects[number].y,0,0,0,NULL,0,0);
-                                        audio_play("data/shot.wav");
+                                        audio_play(DATADIR "shot.wav");
                                         ++shots;
                                         ++firedshots;
                                     }
@@ -670,7 +681,7 @@
                                 {
                                     if(shots<6)
                                     {
-                                        audio_play("data/helix.wav");
+                                        audio_play(DATADIR "helix.wav");
                                         AddObject(BULLWAVE, ShippyObjects[number].x-6, ShippyObjects[number].y-8,0,-16,0,NULL,0,0);
                                         AddObject(BULLWAVE, ShippyObjects[number].x+6, ShippyObjects[number].y-8,0,16,0,NULL,0,0);
                                         shots+=2;
@@ -693,7 +704,7 @@
                             if(shots<3)
                             {
                                 AddObject(BULLET, ShippyObjects[number].x, ShippyObjects[number].y,0,0,0,NULL,0,0);
-                                audio_play("data/shot.wav");
+                                audio_play(DATADIR "shot.wav");
                                 ++shots;
                                 ++firedshots;
                             }
@@ -802,7 +813,7 @@
                 --ShippyObjects[number].special;
             }
 
-            if(ShippyObjects[number].x<-7 || ShippyObjects[number].x>247 && ShippyObjects[number].type==ENEMYSHIPPY)
+            if(ShippyObjects[number].x<-7 || (ShippyObjects[number].x>247 && ShippyObjects[number].type==ENEMYSHIPPY))
             {
                 ShippyObjects[number].y+=16;
                 ShippyObjects[number].level=-ShippyObjects[number].level;
@@ -837,7 +848,7 @@
                         }
                         diedlast = 1;
                     
-                        audio_play("data/die.wav");
+                        audio_play(DATADIR "die.wav");
                         ShippyObjects[number].type=EXPLOSION;
                         ShippyObjects[number].special=4;
                     }
@@ -937,7 +948,7 @@
                                                  0);
                                          
                                      }
-                                    audio_play("data/hit.wav");
+                                    audio_play(DATADIR "hit.wav");
                                 break;
 
                                 case ENEMYSHIPPY:
@@ -955,7 +966,7 @@
                                                  0,
                                                  0);
                                      }
-                                    audio_play("data/hit.wav");
+                                    audio_play(DATADIR "hit.wav");
                                      break;
 
 				 case FEZBOMB:
@@ -976,7 +987,7 @@
                                                  0,
                                                  0);
                                      }
-                                    audio_play("data/hit.wav");
+                                    audio_play(DATADIR "hit.wav");
                                     break;
                             
                             }
@@ -1059,7 +1070,7 @@
                         }
 
                         diedlast = 1;                    
-                        audio_play("data/die.wav");
+                        audio_play(DATADIR "die.wav");
                         ShippyObjects[number].type=EXPLOSION;
                         ShippyObjects[number].special=4;
                         return;
@@ -1097,43 +1108,28 @@
 
 void StoreHS()
 {
-    FILE *savehs = NULL;
-    savehs = fopen("data/scores.lst","wb");
-
-    if(savehs==NULL) return;
-
-    fwrite(winners,sizeof(struct HISCORE), 14, savehs);
-    fclose(savehs);
-    return;
-
+    size_t silence_warnings;
+    
+    if(highscore_fp==NULL) return;
 
+    rewind(highscore_fp);
+    silence_warnings = fwrite(winners,sizeof(struct HISCORE), 14, highscore_fp);
 }
 
 
 void RestoreHS()
 {
     int i;    
-    FILE *loadhs = NULL;
-    
-    loadhs = fopen("data/scores.lst","rb");
 
-    if(loadhs!=NULL)
+    if(highscore_fp!=NULL)
     {
-        if(fread(winners,sizeof(struct HISCORE), 14, loadhs)==14)
+        if(fread(winners,sizeof(struct HISCORE), 14, highscore_fp)==14)
         {
-            fclose(loadhs);
             highscore=winners[0].score;
             return;
         }
-        else
-        {
-            fclose(loadhs);
-        }
-    
-    
     }
 
-
     strcpy(winners[0].name,"RAB");
     winners[0].level = 14;
     winners[0].score = 250000;
@@ -1225,17 +1221,17 @@
 
             if(operational==600)
             {
-                SYSTEM_BG("data/splash.bmp");
+                SYSTEM_BG(DATADIR "splash.bmp");
             }
             
             if(operational>0)
             {
                 --operational;
-                if(operational==0) audio_play("data/splash.wav");
+                if(operational==0) audio_play(DATADIR "splash.wav");
             }
             if(operational==120)
             {
-                SYSTEM_BG("data/splash2.bmp");
+                SYSTEM_BG(DATADIR "splash2.bmp");
             }
             if(waitforkey==0)
             {
@@ -1287,13 +1283,13 @@
             }
             
            
-            if(jdirx == -2)
+            if(jdirx <= -1)
             {
                 --currchar;
                 if(currchar<'A') currchar = 'Z';
                 waitforkey=15;
             }
-            if(jdirx == 2)
+            if(jdirx >= 1)
             {
                 ++currchar;
                 if(currchar>'Z') currchar = 'A';
@@ -1339,7 +1335,7 @@
         {
             ShippyObjects[0].lives++;
             extralife *= 2;
-            audio_play("data/fanfare.wav");
+            audio_play(DATADIR "fanfare.wav");
         
         }
         if(leftmonsters>0 && done == 0 && gameover==0)
@@ -1388,7 +1384,7 @@
 		}
 		for(increment=0;increment<14;++increment) winners[increment].last=0;
                 gamestate = INITIALS;
-                audio_music("data/score.xm");
+                audio_music(DATADIR "score.xm");
                 waitforkey=30;
                 operational = 0;
             }
@@ -1401,7 +1397,7 @@
             {
                 NewGame(-1);
                 operational = 1;
-                if(gamestate==TITLE) audio_music("data/title.xm");
+                if(gamestate==TITLE) audio_music(DATADIR "title.xm");
             }
             
             if(done==0 && operational==1)
@@ -1429,7 +1425,7 @@
                     else
                     {
     
-                        audio_music("data/shippy.xm");
+                        audio_music(DATADIR "shippy.xm");
                         gamestate = GAME;
                         operational = 0;
                     }
@@ -1467,7 +1463,7 @@
         {
             ShippyObjects[0].lives++;
             extralife *= 2;
-            audio_play("data/fanfare.wav");
+            audio_play(DATADIR "fanfare.wav");
         
         }
 
@@ -1510,11 +1506,61 @@
     }
 }
 
-void SHIPPY_MAIN()
+static void show_usage(char *name, FILE *f)
 {
-    int increment;
+    fprintf(f,
+        "Usage: %s [-w] [-a] [-h]\n\n"
+        "Options:\n"
+        "-w\tWindowed, start in a window (default fullscreen)\n"
+        "-a\tArcade, use an arcade-ish video mode with scanlines (CRT only!)\n"
+        "-h\tHelp, display this help and exit\n", name);
+}
+
+int SHIPPY_MAIN(int argc, char *argv[])
+{
+    int i;
+#ifdef __unix__
+    gid_t realgid;
+
+    highscore_fp = fopen("/var/lib/games/shippy.hs", "r+");
+    
+    realgid = getgid();
+    if (setresgid(-1, realgid, realgid) != 0) {
+        perror("Could not drop setgid privileges.  Aborting.");
+        return 1;
+    }
+#else
+    highscore_fp = fopen("data/scores.lst","r+b");
+#endif
+    
+    for (i = 1; i < argc; i++)
+    {
+        if (!strcmp(argv[i], "-w"))
+            start_windowed = 1;
+        else if (!strcmp(argv[i], "-a"))
+        {
+            use_arcade_mode = 1;
+            screen_width  = 480;
+            screen_height = 320;
+        }
+        else if (!strcmp(argv[i], "-h") ||
+            !strcmp(argv[i], "-?") ||
+            !strcmp(argv[i], "-help") ||
+            !strcmp(argv[i], "--help"))
+        {
+            show_usage(argv[0], stdout);
+            return 0;
+        }
+        else
+        {
+            fprintf(stderr, "Error: unknown argument: %s\n", argv[i]);
+            show_usage(argv[0], stderr);
+            return 1;
+        }
+    }
+        
     srand(time(0));
-    if(SYSTEM_INIT()!=0) return;
+    if(SYSTEM_INIT()!=0) return 1;
     InitShippy();
     while(done==0)
     {
@@ -1533,9 +1579,9 @@
                 countframes=0;
         	}
 
-            for(increment=0;increment<MAXSHIPPY;++increment)
+            for(i=0;i<MAXSHIPPY;++i)
             {
-                if(gamestate!=INITIALS) RenderShippy(increment);
+                if(gamestate!=INITIALS) RenderShippy(i);
             }
             DrawOverlay();
             SYSTEM_FINISHRENDER();
@@ -1544,6 +1590,7 @@
     }
     StoreHS();
     SYSTEM_CLEAN();
+    return 0;
 }
 
 
Only in shippy-1.3.3.7: shippy.c.orig
Only in shippy-1.3.3.7: shippy.c~
diff -ur shippy-1.3.3.7.orig/shippy.h shippy-1.3.3.7/shippy.h
--- shippy-1.3.3.7.orig/shippy.h	2004-02-03 21:10:00.000000000 +0100
+++ shippy-1.3.3.7/shippy.h	2006-04-01 13:45:54.000000000 +0200
@@ -3,6 +3,10 @@
 
 #include "externs.h"
 
+#ifndef DATADIR
+#define DATADIR "data/"
+#endif
+
 void Start_Audio();
 void audio_start();
 void audio_play(char *wav);
@@ -14,13 +18,13 @@
 void SCRAPPABLE_CLOSE();
 void SYSTEM_CLEANBMP();
 void SYSTEM_SETVID();
-int SYSTEM_BG();
+void SYSTEM_BG();
 int SYSTEM_INIT();
 int SYSTEM_CLEAN();
 int SYSTEM_GETKEY(int scancode);
-int SYSTEM_FINISHRENDER();
+void SYSTEM_FINISHRENDER();
 int SYSTEM_CLEARSCREEN();
-int SYSTEM_BLIT(int sx, int sy, int x, int y, int szx, int szy);
+void SYSTEM_BLIT(int sx, int sy, int x, int y, int szx, int szy);
 void SYSTEM_POLLINPUT();
 void SYSTEM_IDLE();
 int compare(const void *a, const void *b);
@@ -36,7 +40,6 @@
 void RestoreHS();
 void InitShippy();
 void ExecShippy();
-void SHIPPY_MAIN();
-
+int SHIPPY_MAIN(int argc, char *argv[]);
 
 #endif
diff -ur shippy-1.3.3.7.orig/shipsdl.c shippy-1.3.3.7/shipsdl.c
--- shippy-1.3.3.7.orig/shipsdl.c	2004-03-04 00:53:02.000000000 +0100
+++ shippy-1.3.3.7/shipsdl.c	2006-04-01 13:58:59.000000000 +0200
@@ -1,3 +1,5 @@
+#include <string.h>
+#include <stdlib.h>
 #include <SDL/SDL.h>
 #include <SDL/SDL_mixer.h>
 #include "shippy.h"
@@ -5,6 +7,7 @@
 SDL_Surface *screen = NULL;
 SDL_Surface *BackBuffer = NULL;
 SDL_Surface *Graphics = NULL;
+SDL_Joystick *Joystick = NULL;
 Uint8 key[1337];
 
 Uint32 CLEARCOLOR = 0;
@@ -164,9 +167,9 @@
     
 void End_Audio()
 {
+    audio_end();
     Mix_HaltMusic();
     Mix_CloseAudio();
-    audio_end();
 }
 
     
@@ -186,7 +189,11 @@
 
 void SYSTEM_SETVID()
 {
-    screen = SDL_SetVideoMode(480, 320, 8, SDL_SWSURFACE | SDL_HWPALETTE);
+    Uint32 flags = SDL_SWSURFACE | SDL_HWPALETTE | SDL_FULLSCREEN;
+    if (start_windowed)
+        flags &= ~SDL_FULLSCREEN;
+    SDL_ShowCursor(SDL_DISABLE);
+    screen = SDL_SetVideoMode(screen_width, screen_height, 8, flags);
     if ( screen == NULL )
     {
         return;
@@ -194,8 +201,8 @@
 
     SYSTEM_CLEANBMP();
 
-    Graphics = CreateSurfaceFromBitmap("data/graphics.bmp",SDL_SWSURFACE|SDL_SRCCOLORKEY);
-    BackBuffer= CreateSurfaceFromBitmap("data/splash.bmp",SDL_SWSURFACE|SDL_SRCCOLORKEY);
+    Graphics = CreateSurfaceFromBitmap(DATADIR "graphics.bmp",SDL_SWSURFACE|SDL_SRCCOLORKEY);
+    BackBuffer= CreateSurfaceFromBitmap(DATADIR "splash.bmp",SDL_SWSURFACE|SDL_SRCCOLORKEY);
     SDL_SetColors(screen, Graphics->format->palette->colors, 0,Graphics->format->palette->ncolors);
     SDL_SetColorKey(Graphics,SDL_SRCCOLORKEY, SDL_MapRGB(Graphics->format, 255, 0, 255));
     SDL_SetColorKey(BackBuffer,SDL_SRCCOLORKEY, SDL_MapRGB(Graphics->format, 255, 0, 255));
@@ -208,7 +215,7 @@
 int SYSTEM_INIT()
 {
    
-    if((SDL_Init(SDL_INIT_VIDEO|SDL_INIT_AUDIO)==-1))
+    if((SDL_Init(SDL_INIT_VIDEO|SDL_INIT_AUDIO|SDL_INIT_JOYSTICK)==-1))
     { 
         return 1;
     }
@@ -219,6 +226,8 @@
     SDL_WM_SetCaption("Shippy1984 by Ryan Broomfield SDL VERSION", NULL);
 
     audio_start();
+    
+    Joystick = SDL_JoystickOpen(0);
 
     return 0;
 }
@@ -227,6 +236,8 @@
 {
     SYSTEM_CLEANBMP();
     End_Audio();
+    if (Joystick)
+        SDL_JoystickClose(Joystick);
     return 0;
 }
 
@@ -236,7 +247,7 @@
 
 }
 
-int SYSTEM_BG(char *bmp)
+void SYSTEM_BG(char *bmp)
 {
     if(BackBuffer!=NULL) SDL_FreeSurface(BackBuffer);
     BackBuffer= CreateSurfaceFromBitmap(bmp,SDL_SWSURFACE|SDL_SRCCOLORKEY);
@@ -247,38 +258,24 @@
 
 
 /* NEW SYSTEM_FINISHRENDER() BY JONATHAN GILBERT 1-28-2004 */ 
-int SYSTEM_FINISHRENDER()
+void SYSTEM_FINISHRENDER()
 {
-  int x, y, w;
-  Uint8 *in;
-  Uint16 *out;
- 
+  src.x = 0;
+  src.y = 0;
+  src.w = 240;
+  src.h = 160;
+  
+  dest.x = 0;
+  dest.y = 0;
+  dest.w = screen_width;
+  dest.h = screen_height;
+  
   if (SDL_MUSTLOCK(BackBuffer))
     SDL_LockSurface(BackBuffer);
   if (SDL_MUSTLOCK(screen))
     SDL_LockSurface(screen);
- 
-  in = BackBuffer->pixels;
-  out = (Uint16 *)screen->pixels;
- 
-  w = BackBuffer->pitch;
- 
-  for (y=0; y<160; y++)
-  {
-    for (x=0; x<w; x += 2)
-    {
-      Uint32 sample = *(Uint16 *)&in[x];
- 
-      sample = (sample & 0xFF) | (sample >> 8 << 16);
-      sample *= 257;
- 
-      *(Uint32 *)(&out[x]) = sample;
-      *(Uint32 *)(&out[x + w]) = sample;
-    }
- 
-    in += w;
-    out += w + w;
-  }
+
+  SDL_SoftStretch(BackBuffer, &src, screen, &dest);
  
   if (SDL_MUSTLOCK(BackBuffer))
     SDL_UnlockSurface(BackBuffer);
@@ -294,10 +291,12 @@
     if(SDL_FillRect(BackBuffer, NULL, CLEARCOLOR)==-1)
     {
         printf("CLS ERROR! \n");
+        return 1;
     }
+    return 0;
 }
 
-int SYSTEM_BLIT(int sx, int sy, int x, int y, int szx, int szy)
+void SYSTEM_BLIT(int sx, int sy, int x, int y, int szx, int szy)
 {
     src.x = sx;
     src.y = sy;
@@ -316,7 +315,6 @@
 
 void SYSTEM_POLLINPUT()
 {
-    int tx,ty;
     jaction = 0;
     jsecond = 0;
     jdirx = 0;
@@ -324,27 +322,29 @@
 
 
     if(key[SDLK_ESCAPE]) done = 1;
+    if(key[SDLK_RETURN] && key[SDLK_LALT])
+        SDL_WM_ToggleFullScreen(screen);
+    
     if(waitforkey>0)
     {
         --waitforkey;
         return;
     }
 
-/*    if(num_joysticks>0)
-    {
-        poll_joystick();
-        jaction = joy[0].button[0].b;
-        jsecond = joy[0].button[1].b;
-        jdirx = (joy[0].stick[0].axis[0].d1 - joy[0].stick[0].axis[0].d2)*2;
-        jdiry = (joy[0].stick[0].axis[1].d1 - joy[0].stick[0].axis[1].d2);
-    }
-*/
-
     jdirx = 0;
     jdiry = 0;
     jaction = 0;
     jsecond = 0;
 
+    if(Joystick)
+    {
+        SDL_JoystickUpdate();
+        jaction = SDL_JoystickGetButton(Joystick, 0);
+        jsecond = SDL_JoystickGetButton(Joystick, 1);
+        jdirx = SDL_JoystickGetAxis(Joystick, 0) / (50 * 256);
+        jdiry = SDL_JoystickGetAxis(Joystick, 1) / (65 * 256);
+    }
+
     if(jdirx == 0) jdirx=(key[SDLK_RIGHT] - key[SDLK_LEFT]) * 2;
     if(jdiry == 0) jdiry=key[SDLK_DOWN] - key[SDLK_UP];
     if(jaction == 0) jaction = key[SDLK_LCTRL];
@@ -356,6 +356,10 @@
 void SYSTEM_IDLE()
 {
     Uint32 test = SDL_GetTicks();
+
+    if (test < timing)
+        SDL_Delay(1);
+
     while(test>timing)
     {
         timing+=14;
@@ -387,7 +391,5 @@
 
 int main(int argc, char*argv[])
 {
-
-	SHIPPY_MAIN();
-
+	return SHIPPY_MAIN(argc, argv);
 }
Only in shippy-1.3.3.7: shipsdl.c~


Index: shippy.spec
===================================================================
RCS file: /cvs/extras/rpms/shippy/devel/shippy.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- shippy.spec	31 Mar 2006 08:18:18 -0000	1.1
+++ shippy.spec	3 Apr 2006 19:31:03 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           shippy
 Version:        1.3.3.7
-Release:        2%{?dist}
+Release:        unreleased(last 2)%{?dist}
 Summary:        Space invaders / Galaxians like game with powerups
 Group:          Amusements/Games
 License:        GPL
@@ -9,11 +9,7 @@
 Source1:        shippy.png
 Source2:        shippy.desktop
 Source3:        shippy.sh
-Patch0:         shippy-fixes.patch
-Patch1:         shippy-warnings.patch
-Patch2:         shippy-fullscreen.patch
-Patch3:         shippy-lcdfix.patch
-Patch4:         shippy-joy.patch
+Patch0:         shippy-merged.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  dumb-devel SDL_mixer-devel desktop-file-utils
 Requires:	%{name}-common = %{version}
@@ -49,11 +45,7 @@
 
 %prep
 %setup -q -c
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+%patch0 -p1 -z .merged
 %{__sed} -i 's/\r//' NOTES.txt LICENSE.txt docs/manual.html
 mv docs html
 #see comment in %%install
@@ -133,6 +125,10 @@
 
 
 %changelog
+* Mon Apr  3 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.3.3.7-unreleased
+- Merged all patches into one and put a few parts between #ifdef __unix__
+  (I send this upstream for merging).
+
 * Thu Mar 30 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.3.3.7-2
 - Fix reversed joy directions in allegro version
 - Improve support for analog joysticks in the allegro version


--- shippy-fixes.patch DELETED ---


--- shippy-fullscreen.patch DELETED ---


--- shippy-joy.patch DELETED ---


--- shippy-lcdfix.patch DELETED ---


--- shippy-warnings.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Apr  3 20:16:39 2006
From: fedora-extras-commits at redhat.com (Mike Bonnet (mikeb))
Date: Mon,  3 Apr 2006 13:16:39 -0700
Subject: krbVmodule krbVmodule.spec.in,1.9,1.10
Message-ID: <200604032016.k33KGduP003372@cvs-int.fedora.redhat.com>

Author: mikeb

Update of /cvs/devel/krbVmodule
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3355

Modified Files:
	krbVmodule.spec.in 
Log Message:
add a %defattr


Index: krbVmodule.spec.in
===================================================================
RCS file: /cvs/devel/krbVmodule/krbVmodule.spec.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- krbVmodule.spec.in	25 Mar 2006 01:02:23 -0000	1.9
+++ krbVmodule.spec.in	3 Apr 2006 20:16:36 -0000	1.10
@@ -37,6 +37,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
+%defattr(-,root,root,-)
 %doc README
 %{_libdir}/python%{pyver}/site-packages/krbVmodule.so
 



From fedora-extras-commits at redhat.com  Mon Apr  3 20:33:29 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon,  3 Apr 2006 13:33:29 -0700
Subject: owners owners.list,1.801,1.802
Message-ID: <200604032033.k33KXVBS003417@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3400/owners

Modified Files:
	owners.list 
Log Message:
Add zasx, fix alphabet sort


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.801
retrieving revision 1.802
diff -u -r1.801 -r1.802
--- owners.list	3 Apr 2006 16:45:28 -0000	1.801
+++ owners.list	3 Apr 2006 20:33:29 -0000	1.802
@@ -239,6 +239,7 @@
 Fedora Extras|fedora-rpmdevtools|Fedora RPM Development Tools|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|fedora-usermgmt|Fedora tools for user management|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|feh|Fast command line image viewer using Imlib2|a.kurtz at hardsun.net|extras-qa at fedoraproject.org|
+Fedora Extras|fetchlog|The fetchlog utility displays the last new messages of a logfile|paul at xtdnet.nl|extras-qa at fedoraproject.org|
 Fedora Extras|fftw2|Fast Fourier Transform library|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|fftw|Fast Fourier Transform library|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|fig2ps|Utility for converting xfig pictures to PS/PDF|qspencer at ieee.org|extras-qa at fedoraproject.org|
@@ -649,6 +650,7 @@
 Fedora Extras|libxfcegui4|GTK widgets for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|libxml++|libxml++ is a C++ wrapper for the libxml2 XML parser library|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|libzvt|ZVT - Zed's Virtual Terminal|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|licq|An ICQ clone for online messaging|pvrabec at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|liferea|An RSS/RDF feed reader|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|lighttpd|Lightning fast webserver with light system requirements|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|lincity-ng|City Simulation Game|tcallawa at redhat.com|extras-qa at fedoraproject.org|
@@ -1576,10 +1578,9 @@
 Fedora Extras|yumex|A GUI for Yum|tla at rasmil.dk|extras-qa at fedoraproject.org|
 Fedora Extras|yum-utils|Utilities based around the yum package manager|skvidal at phy.duke.edu|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)|michel.salim at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|zile|Zile Is Lossy Emacs|jeff at ultimateevil.org|extras-qa at fedoraproject.org|
 Fedora Extras|zoo|File archiving utility with compression|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org|
 Fedora Extras|zope|Application server in Python|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|zziplib|Lightweight library to easily extract data from zip files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|licq|An ICQ clone for online messaging|pvrabec at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|fetchlog|The fetchlog utility displays the last new messages of a logfile|paul at xtdnet.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Apr  3 20:37:21 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon,  3 Apr 2006 13:37:21 -0700
Subject: rpms/gtkterm/FC-4 .cvsignore, 1.2, 1.3 gtkterm.desktop, 1.1,
	1.2 gtkterm.spec, 1.6, 1.7 sources, 1.2, 1.3
Message-ID: <200604032037.k33KbNxZ003454@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gtkterm/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3428

Modified Files:
	.cvsignore gtkterm.desktop gtkterm.spec sources 
Log Message:
* Fri Mar 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.99.5-1
- Taking over as new FE maintainer
- Bump to new upstream 0.99.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkterm/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:31:34 -0000	1.2
+++ .cvsignore	3 Apr 2006 20:37:21 -0000	1.3
@@ -1 +1,2 @@
-gtkterm-0.99.4.tar.gz
+gtkterm-0.99.5.tar.gz
+gtkterm.png


Index: gtkterm.desktop
===================================================================
RCS file: /cvs/extras/rpms/gtkterm/FC-4/gtkterm.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtkterm.desktop	8 Nov 2004 04:31:34 -0000	1.1
+++ gtkterm.desktop	3 Apr 2006 20:37:21 -0000	1.2
@@ -1,7 +1,12 @@
 [Desktop Entry]
+Encoding=UTF-8
 Name=GTKTerm
-Comment=Serial port terminal
+GenericName=Serial port terminalemulator
+Comment=Targeted at developers, with hexview, etc.
 Exec=gtkterm
+Icon=gtkterm.png
 Terminal=false
+StartupNotify=false
 Type=Application
-Categories=Utility;Application;
+Categories=Application;Utility;
+Version=0.99.5


Index: gtkterm.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkterm/FC-4/gtkterm.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gtkterm.spec	6 Apr 2005 22:12:00 -0000	1.6
+++ gtkterm.spec	3 Apr 2006 20:37:21 -0000	1.7
@@ -1,52 +1,81 @@
 Name:           gtkterm
-Version:        0.99.4
-Release:        4
-
+Version:        0.99.5
+Release:        1%{?dist}
 Summary:        Serial port terminal
-
 Group:          Applications/Communications
 License:        GPL
 URL:            http://www.jls-info.com/julien/linux
-Source0:        http://www.jls-info.com/julien/linux/gtkterm-0.99.4.tar.gz
+Source0:        http://www.jls-info.com/julien/linux/%{name}-%{version}.tar.gz
 Source1:        gtkterm.desktop
+Source2:        gtkterm.png
+Patch0:         gtkterm-0.99.5-fixes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  gtk2-devel gettext bison desktop-file-utils vte-devel zlib-devel ncurses-devel
+BuildRequires:  gtk2-devel gettext bison desktop-file-utils vte-devel
+BuildRequires:  zlib-devel ncurses-devel
 
 %description
 Simple GUI terminal used to communicate with the serial port.
 Similar to minicom or hyperterminal.
 
+
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
 %configure
 make %{?_smp_mflags}
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
-install -d -m0755 $RPM_BUILD_ROOT/%{_datadir}/applications
-desktop-file-install --vendor fedora \
-        --add-category X-Fedora      \
-        --dir $RPM_BUILD_ROOT/%{_datadir}/applications  \
-%SOURCE1
+
+# below is the desktop file and icon stuff.
+mkdir $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/48x48/apps
+install -p -m 644 %{SOURCE2} \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
 
 %find_lang %{name}
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
-%{_bindir}/*
-%{_mandir}/man1/*
-%{_datadir}/applications/*
+%{_bindir}/%{name}
+%{_mandir}/man1/%{name}.1.gz
+%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+
 
 %changelog
+* Fri Mar 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.99.5-1
+- Taking over as new FE maintainer
+- Bump to new upstream 0.99.5
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkterm/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:31:34 -0000	1.2
+++ sources	3 Apr 2006 20:37:21 -0000	1.3
@@ -1 +1,2 @@
-5539c7e2aaf56bfd551a72552f1ff146  gtkterm-0.99.4.tar.gz
+007ce7810466396b6452dea9c57c5f02  gtkterm-0.99.5.tar.gz
+9e25fa8914f415a1d9f6d60801752b6a  gtkterm.png



From fedora-extras-commits at redhat.com  Mon Apr  3 20:40:35 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon,  3 Apr 2006 13:40:35 -0700
Subject: rpms/gtkterm/FC-4 gtkterm-0.99.5-fixes.patch,NONE,1.1
Message-ID: <200604032040.k33Kebhm003551@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gtkterm/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3533

Added Files:
	gtkterm-0.99.5-fixes.patch 
Log Message:
* Fri Mar 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.99.5-1
- Taking over as new FE maintainer
- Bump to new upstream 0.99.5


gtkterm-0.99.5-fixes.patch:

--- NEW FILE gtkterm-0.99.5-fixes.patch ---
--- gtkterm-0.99.5/src/macros.c~	2006-03-31 22:04:21.000000000 +0200
+++ gtkterm-0.99.5/src/macros.c	2006-03-31 22:04:21.000000000 +0200
@@ -59,7 +59,7 @@
   guchar a;
   guint val_read;
   
-  string = macros[(gint)number].action;
+  string = macros[(long)number].action;
   length = strlen(string);
   
   for(i = 0; i < length; i++)
@@ -140,7 +140,7 @@
 	}
     }
 
-  str = g_strdup_printf(_("Macro \"%s\" sent !"), macros[(gint)number].shortcut);
+  str = g_strdup_printf(_("Macro \"%s\" sent !"), macros[(long)number].shortcut);
   Put_temp_message(str, 800);
   g_free(str);
 }
@@ -160,7 +160,7 @@
 
 void add_shortcuts(void)
 {
-  gint i = 0;
+  long i = 0;
   guint acc_key;
   GdkModifierType mod;
 
--- gtkterm-0.99.5/src/fichier.c~	2006-03-31 22:02:49.000000000 +0200
+++ gtkterm-0.99.5/src/fichier.c	2006-03-31 22:02:49.000000000 +0200
@@ -153,7 +153,7 @@
   else
     {
       g_free(str);
-      str = g_strdup_printf(_("Cannot read file %s : %s\n"), NomFichier, strerror_utf8(errno));
+      str = g_strdup_printf(_("Cannot read file %s : %s\n"), NomFichier, strerror(errno));
       show_message(str, MSG_ERR);
     }
   return FALSE;
@@ -202,7 +202,7 @@
 	{
 	  /* Problem while writing, stop file transfer */
 	  g_free(str);
-	  str = g_strdup_printf(_("Cannot write file %s\n"), strerror_utf8(errno));
+	  str = g_strdup_printf(_("Cannot write file %s\n"), strerror(errno));
 	  show_message(str, MSG_ERR);
 	  close_all();
 	  return;
@@ -298,7 +298,7 @@
   if(Fic == NULL)
     {
       g_free(str);
-      str = g_strdup_printf(_("Cannot open file %s : %s\n"), NomFichier, strerror_utf8(errno));
+      str = g_strdup_printf(_("Cannot open file %s : %s\n"), NomFichier, strerror(errno));
       show_message(str, MSG_ERR);
     }
   else



From fedora-extras-commits at redhat.com  Mon Apr  3 21:13:33 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  3 Apr 2006 14:13:33 -0700
Subject: rpms/perl-AnyData - New directory
Message-ID: <200604032113.k33LDZej005750@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-AnyData
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5724/perl-AnyData

Log Message:
Directory /cvs/extras/rpms/perl-AnyData added to the repository




From fedora-extras-commits at redhat.com  Mon Apr  3 21:13:34 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  3 Apr 2006 14:13:34 -0700
Subject: rpms/perl-AnyData/devel - New directory
Message-ID: <200604032113.k33LDauq005753@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-AnyData/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5724/perl-AnyData/devel

Log Message:
Directory /cvs/extras/rpms/perl-AnyData/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Apr  3 21:13:46 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  3 Apr 2006 14:13:46 -0700
Subject: rpms/perl-AnyData Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604032113.k33LDm4i005802@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-AnyData
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5769

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-AnyData


--- NEW FILE Makefile ---
# Top level Makefile for module perl-AnyData
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr  3 21:13:47 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  3 Apr 2006 14:13:47 -0700
Subject: rpms/perl-AnyData/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604032113.k33LDnD8005805@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-AnyData/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5769/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-AnyData


--- 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 Apr  3 21:14:14 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  3 Apr 2006 14:14:14 -0700
Subject: rpms/perl-AnyData import.log,1.1,1.2
Message-ID: <200604032114.k33LEkFY005867@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-AnyData
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5833

Modified Files:
	import.log 
Log Message:
auto-import perl-AnyData-0.10-2 on branch devel from perl-AnyData-0.10-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-AnyData/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	3 Apr 2006 21:13:46 -0000	1.1
+++ import.log	3 Apr 2006 21:14:14 -0000	1.2
@@ -0,0 +1 @@
+perl-AnyData-0_10-2:HEAD:perl-AnyData-0.10-2.src.rpm:1144098851



From fedora-extras-commits at redhat.com  Mon Apr  3 21:14:15 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  3 Apr 2006 14:14:15 -0700
Subject: rpms/perl-AnyData/devel perl-AnyData.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604032114.k33LElM0005871@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-AnyData/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5833/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-AnyData.spec 
Log Message:
auto-import perl-AnyData-0.10-2 on branch devel from perl-AnyData-0.10-2.src.rpm


--- NEW FILE perl-AnyData.spec ---
Name:           perl-AnyData
Version:        0.10
Release:        2%{?dist}
Summary:        Easy access to data in many formats
Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/AnyData
Source0:        http://search.cpan.org/CPAN/authors/id/J/JZ/JZUCKER/AnyData-%{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
The AnyData modules provide simple and uniform access to data from
many sources -- perl arrays, local files, remote files retrievable via
http or ftp -- and in many formats including flat files (CSV, Fixed
Length, Tab Delimited, etc), standard format files (Web Logs,
Passwd files, etc.),  structured files (XML, HTML Tables) and binary 
files with parseable headers (mp3s, jpgs, pngs, etc).  

There are two separate modules, each providing a different interface:
AnyData.pm provides a simple tied hash interface and DBD::AnyData
provides a DBI/SQL interface.  You can use either or both depending on
your needs.

%prep
%setup -q -n AnyData-%{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
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/AnyData.pm
%{perl_vendorlib}/AnyData/
%{_mandir}/man3/*.3*


%changelog
* Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.10-2
- minor cleanups

* Sun Jan  8 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.10-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-AnyData/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	3 Apr 2006 21:13:47 -0000	1.1
+++ .cvsignore	3 Apr 2006 21:14:15 -0000	1.2
@@ -0,0 +1 @@
+AnyData-0.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-AnyData/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	3 Apr 2006 21:13:47 -0000	1.1
+++ sources	3 Apr 2006 21:14:15 -0000	1.2
@@ -0,0 +1 @@
+ff9fb4c7d8b99d63a773e66f0ccba788  AnyData-0.10.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr  3 21:17:42 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon,  3 Apr 2006 14:17:42 -0700
Subject: owners owners.list,1.802,1.803
Message-ID: <200604032117.k33LHid9005936@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5918

Modified Files:
	owners.list 
Log Message:

perl-AnyData



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.802
retrieving revision 1.803
diff -u -r1.802 -r1.803
--- owners.list	3 Apr 2006 20:33:29 -0000	1.802
+++ owners.list	3 Apr 2006 21:17:42 -0000	1.803
@@ -825,6 +825,7 @@
 Fedora Extras|pdsh|Parallel remote shell program|woodard at redhat.com|extras-qa at fedoraproject.org|
 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-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|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Apache-Session|Apache::Session Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Apache-Session-Wrapper|A simple wrapper around Apache::Session|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Mon Apr  3 21:52:10 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Mon,  3 Apr 2006 14:52:10 -0700
Subject: fedora-security/audit fc4,1.184,1.185 fc5,1.97,1.98
Message-ID: <200604032152.k33LqAVl006531@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6511

Modified Files:
	fc4 fc5 
Log Message:
Add a freeradius CVE id.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -r1.184 -r1.185
--- fc4	3 Apr 2006 19:25:31 -0000	1.184
+++ fc4	3 Apr 2006 21:52:08 -0000	1.185
@@ -105,6 +105,7 @@
 CVE-2006-0019 version (kdelibs, fixed 3.5.1) [since FEDORA-2006-090] was backport since FEDORA-2006-050
 CVE-2005-4746 version (freeradius) we don't build vulnerable bits
 CVE-2005-4745 version (freeradius) we don't build vulnerable bits
+CVE-2005-4744 VULNERABLE (freeradius, fixed 1.0.5) bz#167677
 CVE-2005-4720 VULNERABLE (thunderbird)
 CVE-2005-4720 VULNERABLE (mozilla)
 CVE-2005-4720 VULNERABLE (firefox)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- fc5	3 Apr 2006 19:25:31 -0000	1.97
+++ fc5	3 Apr 2006 21:52:08 -0000	1.98
@@ -107,6 +107,7 @@
 CVE-2006-0019 version (kdelibs, fixed 3.5.1)
 CVE-2005-4746 version (freeradius) we don't build vulnerable bits
 CVE-2005-4745 version (freeradius) we don't build vulnerable bits
+CVE-2005-4744 version (freeradius, fixed 1.0.5)
 CVE-2005-4720 version (thunderbird, fixed 1.5)
 CVE-2005-4720 version (firefox, fixed 1.5)
 CVE-2005-4720 VULNERABLE (mozilla) not fixed upstream plus only DoS



From fedora-extras-commits at redhat.com  Mon Apr  3 23:40:30 2006
From: fedora-extras-commits at redhat.com (Mike Bonnet (mikeb))
Date: Mon,  3 Apr 2006 16:40:30 -0700
Subject: krbVmodule python-krbV.spec.in, NONE, 1.1 Makefile.am, 1.8,
	1.9 configure.in, 1.14, 1.15 krbVmodule.spec.in, 1.10, NONE
Message-ID: <200604032340.k33NeUH6010947@cvs-int.fedora.redhat.com>

Author: mikeb

Update of /cvs/devel/krbVmodule
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10927

Modified Files:
	Makefile.am configure.in 
Added Files:
	python-krbV.spec.in 
Removed Files:
	krbVmodule.spec.in 
Log Message:
further changes to make the package more Extras-friendly


--- NEW FILE python-krbV.spec.in ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(plat_specific=True)")} 

Name: python-krbV
Version: @VERSION@
Release: 2%{?dist}
Summary: Python extension module for Kerberos 5

Group: Development/Languages
License: LGPL

Source: python-krbV-%{version}.tar.gz

Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: python-devel
BuildRequires: krb5-devel >= 1.2.2
BuildRequires: /bin/awk

Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
Requires: krb5-libs >= 1.2.2

%description
python-krbV allows python programs to use Kerberos 5 authentication/security.

%prep
%setup -q -n python-krbV-%{version}

%build
export LIBNAME=%{_lib}
%configure
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf $RPM_BUILD_ROOT
%{__mkdir_p} %{python_sitelib}
%makeinstall
%{__rm} -f $RPM_BUILD_ROOT%{python_sitelib}/*.la

%clean
%{__rm} -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README
%{python_sitelib}/krbVmodule.so

%changelog
* Fri Mar 24 2006 Mike Bonnet <mikeb at redhat.com>
- fix typo in error definition
- change the return value of recvauth() from ac to (ac, princ), where princ is the principal sent by sendauth()
- rename the package and reorganize the BuildRequires, to be more Extras-friendly

* Tue Sep 25 2001 Elliot Lee <sopwith at redhat.com>
- Initial version


Index: Makefile.am
===================================================================
RCS file: /cvs/devel/krbVmodule/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.am	14 Jan 2004 17:51:50 -0000	1.8
+++ Makefile.am	3 Apr 2006 23:40:28 -0000	1.9
@@ -13,9 +13,9 @@
 krb5defines.h: $(DEFFILES) gendefines.awk
 	awk -f $(srcdir)/gendefines.awk $(DEFFILES) > $@
 
-EXTRA_DIST=gendefines.awk krbVmodule.spec.in krbV-code-snippets.py
+EXTRA_DIST=gendefines.awk python-krbV.spec.in krbV-code-snippets.py
 BUILT_SOURCES=krb5defines.h
 CLEANFILES=krb5defines.h
 
-dist-hook: krbVmodule.spec
-	cp krbVmodule.spec $(distdir)
+dist-hook: python-krbV.spec
+	cp python-krbV.spec $(distdir)


Index: configure.in
===================================================================
RCS file: /cvs/devel/krbVmodule/configure.in,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- configure.in	14 Jan 2004 17:51:50 -0000	1.14
+++ configure.in	3 Apr 2006 23:40:28 -0000	1.15
@@ -1,6 +1,6 @@
 AC_INIT
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(krbVmodule, 1.0.11)
+AM_INIT_AUTOMAKE(python-krbV, 1.0.11)
 
 AC_PREFIX_DEFAULT(/usr)
 
@@ -31,5 +31,5 @@
 
 AC_OUTPUT([
 Makefile
-krbVmodule.spec
+python-krbV.spec
 ])


--- krbVmodule.spec.in DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr  4 03:58:38 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon,  3 Apr 2006 20:58:38 -0700
Subject: rpms/perl-Want/devel .cvsignore, 1.3, 1.4 perl-Want.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200604040358.k343we0U019499@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Want/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19478

Modified Files:
	.cvsignore perl-Want.spec sources 
Log Message:
* Tue Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.10-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Want/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Jul 2005 05:29:55 -0000	1.3
+++ .cvsignore	4 Apr 2006 03:58:38 -0000	1.4
@@ -1 +1 @@
-Want-0.09.tar.gz
+Want-0.10.tar.gz


Index: perl-Want.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Want/devel/perl-Want.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Want.spec	20 Feb 2006 06:11:00 -0000	1.4
+++ perl-Want.spec	4 Apr 2006 03:58:38 -0000	1.5
@@ -1,6 +1,6 @@
 Name: 		perl-Want
-Version: 	0.09
-Release: 	3%{?dist}
+Version: 	0.10
+Release: 	1%{?dist}
 Summary: 	Perl module implementing a generalisation of wantarray
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -8,7 +8,6 @@
 Source0: 	http://search.cpan.org/CPAN/authors/id/R/RO/ROBIN/Want-%{version}.tar.gz
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	perl
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -46,6 +45,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.10-1
+- Upstream update.
+
 * Mon Feb 20 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-3
 - Rebuild.
 
@@ -54,13 +56,3 @@
 
 * Sat Jul 02 2005 Ralf Corsepius <ralf at links2linux.de> - 0.09-1
 - Upstream update to 0.09.
-
-* Fri Jul 01 2005 Ralf Corsepius <ralf at links2linux.de> - 0.08-3
-- Remove ||: in %%check.
-
-* Fri Jul 01 2005 Ralf Corsepius <ralf at links2linux.de> - 0.08-2
-- Pass OPTIMIZE during generation of Makefile.
-- Use perl instead of %%__perl.
-
-* Fri Jul 01 2005 Ralf Corsepius <ralf at links2linux.de> - 0.08-1
-- FE submission.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Want/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Jul 2005 05:29:55 -0000	1.3
+++ sources	4 Apr 2006 03:58:38 -0000	1.4
@@ -1 +1 @@
-90ab551867c986b748128609f95b3666  Want-0.09.tar.gz
+bc2836bd8fe4bcb6044334d54a08c686  Want-0.10.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr  4 03:59:30 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon,  3 Apr 2006 20:59:30 -0700
Subject: rpms/perl-Want/FC-5 .cvsignore, 1.3, 1.4 perl-Want.spec, 1.4,
	1.5 sources, 1.3, 1.4
Message-ID: <200604040359.k343xWQ4019567@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Want/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19546

Modified Files:
	.cvsignore perl-Want.spec sources 
Log Message:
* Tue Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.10-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Want/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Jul 2005 05:29:55 -0000	1.3
+++ .cvsignore	4 Apr 2006 03:59:30 -0000	1.4
@@ -1 +1 @@
-Want-0.09.tar.gz
+Want-0.10.tar.gz


Index: perl-Want.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Want/FC-5/perl-Want.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Want.spec	20 Feb 2006 06:11:00 -0000	1.4
+++ perl-Want.spec	4 Apr 2006 03:59:30 -0000	1.5
@@ -1,6 +1,6 @@
 Name: 		perl-Want
-Version: 	0.09
-Release: 	3%{?dist}
+Version: 	0.10
+Release: 	1%{?dist}
 Summary: 	Perl module implementing a generalisation of wantarray
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -8,7 +8,6 @@
 Source0: 	http://search.cpan.org/CPAN/authors/id/R/RO/ROBIN/Want-%{version}.tar.gz
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	perl
 Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -46,6 +45,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.10-1
+- Upstream update.
+
 * Mon Feb 20 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-3
 - Rebuild.
 
@@ -54,13 +56,3 @@
 
 * Sat Jul 02 2005 Ralf Corsepius <ralf at links2linux.de> - 0.09-1
 - Upstream update to 0.09.
-
-* Fri Jul 01 2005 Ralf Corsepius <ralf at links2linux.de> - 0.08-3
-- Remove ||: in %%check.
-
-* Fri Jul 01 2005 Ralf Corsepius <ralf at links2linux.de> - 0.08-2
-- Pass OPTIMIZE during generation of Makefile.
-- Use perl instead of %%__perl.
-
-* Fri Jul 01 2005 Ralf Corsepius <ralf at links2linux.de> - 0.08-1
-- FE submission.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Want/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Jul 2005 05:29:55 -0000	1.3
+++ sources	4 Apr 2006 03:59:30 -0000	1.4
@@ -1 +1 @@
-90ab551867c986b748128609f95b3666  Want-0.09.tar.gz
+bc2836bd8fe4bcb6044334d54a08c686  Want-0.10.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr  4 04:00:23 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon,  3 Apr 2006 21:00:23 -0700
Subject: rpms/perl-Want/FC-4 .cvsignore, 1.3, 1.4 perl-Want.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200604040400.k3440Pb6019644@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Want/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19623

Modified Files:
	.cvsignore perl-Want.spec sources 
Log Message:
* Tue Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.10-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Want/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Jul 2005 05:32:16 -0000	1.3
+++ .cvsignore	4 Apr 2006 04:00:22 -0000	1.4
@@ -1 +1 @@
-Want-0.09.tar.gz
+Want-0.10.tar.gz


Index: perl-Want.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Want/FC-4/perl-Want.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Want.spec	2 Jul 2005 05:32:16 -0000	1.3
+++ perl-Want.spec	4 Apr 2006 04:00:22 -0000	1.4
@@ -1,14 +1,14 @@
-Name: perl-Want
-Version: 0.09
-Release: 1%{?dist}
-Summary: Perl module implementing a generalisation of wantarray
-License: GPL or Artistic
-Group: Development/Libraries
-URL: http://search.cpan.org/dist/Want/
-Source0: http://search.cpan.org/CPAN/authors/id/R/RO/ROBIN/Want-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name: 		perl-Want
+Version: 	0.10
+Release: 	1%{?dist}
+Summary: 	Perl module implementing a generalisation of wantarray
+License: 	GPL or Artistic
+Group: 		Development/Libraries
+URL: 		http://search.cpan.org/dist/Want/
+Source0: 	http://search.cpan.org/CPAN/authors/id/R/RO/ROBIN/Want-%{version}.tar.gz
+BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 This module generalises the mechanism of the wantarray
@@ -19,19 +19,17 @@
 %setup -q -n Want-%{version}
 
 %build
-perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="${RPM_OPT_FLAGS}"
+%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="${RPM_OPT_FLAGS}"
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install \
-    PERL_INSTALL_ROOT=$RPM_BUILD_ROOT \
-    INSTALLARCHLIB=$RPM_BUILD_ROOT%{perl_archlib}
-
-find $RPM_BUILD_ROOT -type f -a \( -name .packlist \
-  -o -name perllocal.pod \
-  -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
+make 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/*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -47,15 +45,14 @@
 %{_mandir}/man3/*
 
 %changelog
-* Sat Jul 02 2005 Ralf Corsepius <ralf at links2linux.de> - 0.09-1
-- Upstream update to 0.09.
+* Tue Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.10-1
+- Upstream update.
 
-* Fri Jul 01 2005 Ralf Corsepius <ralf at links2linux.de> - 0.08-3
-- Remove ||: in %%check.
+* Mon Feb 20 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-3
+- Rebuild.
 
-* Fri Jul 01 2005 Ralf Corsepius <ralf at links2linux.de> - 0.08-2
-- Pass OPTIMIZE during generation of Makefile.
-- Use perl instead of %%__perl.
+* Sat Aug 13 2005 Ralf Corsepius <ralf at links2linux.de> - 0.09-2
+- Streamline with FE spec-template.
 
-* Fri Jul 01 2005 Ralf Corsepius <ralf at links2linux.de> - 0.08-1
-- FE submission.
+* Sat Jul 02 2005 Ralf Corsepius <ralf at links2linux.de> - 0.09-1
+- Upstream update to 0.09.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Want/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Jul 2005 05:32:16 -0000	1.3
+++ sources	4 Apr 2006 04:00:22 -0000	1.4
@@ -1 +1 @@
-90ab551867c986b748128609f95b3666  Want-0.09.tar.gz
+bc2836bd8fe4bcb6044334d54a08c686  Want-0.10.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr  4 04:01:23 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon,  3 Apr 2006 21:01:23 -0700
Subject: rpms/perl-Want/FC-3 .cvsignore, 1.3, 1.4 perl-Want.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200604040401.k3441wHl021678@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Want/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21655

Modified Files:
	.cvsignore perl-Want.spec sources 
Log Message:
* Tue Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.10-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Want/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Jul 2005 05:32:16 -0000	1.3
+++ .cvsignore	4 Apr 2006 04:01:23 -0000	1.4
@@ -1 +1 @@
-Want-0.09.tar.gz
+Want-0.10.tar.gz


Index: perl-Want.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Want/FC-3/perl-Want.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Want.spec	2 Jul 2005 05:32:16 -0000	1.3
+++ perl-Want.spec	4 Apr 2006 04:01:23 -0000	1.4
@@ -1,14 +1,14 @@
-Name: perl-Want
-Version: 0.09
-Release: 1%{?dist}
-Summary: Perl module implementing a generalisation of wantarray
-License: GPL or Artistic
-Group: Development/Libraries
-URL: http://search.cpan.org/dist/Want/
-Source0: http://search.cpan.org/CPAN/authors/id/R/RO/ROBIN/Want-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Name: 		perl-Want
+Version: 	0.10
+Release: 	1%{?dist}
+Summary: 	Perl module implementing a generalisation of wantarray
+License: 	GPL or Artistic
+Group: 		Development/Libraries
+URL: 		http://search.cpan.org/dist/Want/
+Source0: 	http://search.cpan.org/CPAN/authors/id/R/RO/ROBIN/Want-%{version}.tar.gz
+BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:  	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 This module generalises the mechanism of the wantarray
@@ -19,19 +19,17 @@
 %setup -q -n Want-%{version}
 
 %build
-perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="${RPM_OPT_FLAGS}"
+%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="${RPM_OPT_FLAGS}"
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install \
-    PERL_INSTALL_ROOT=$RPM_BUILD_ROOT \
-    INSTALLARCHLIB=$RPM_BUILD_ROOT%{perl_archlib}
-
-find $RPM_BUILD_ROOT -type f -a \( -name .packlist \
-  -o -name perllocal.pod \
-  -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
+make 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/*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -47,15 +45,14 @@
 %{_mandir}/man3/*
 
 %changelog
-* Sat Jul 02 2005 Ralf Corsepius <ralf at links2linux.de> - 0.09-1
-- Upstream update to 0.09.
+* Tue Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.10-1
+- Upstream update.
 
-* Fri Jul 01 2005 Ralf Corsepius <ralf at links2linux.de> - 0.08-3
-- Remove ||: in %%check.
+* Mon Feb 20 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.09-3
+- Rebuild.
 
-* Fri Jul 01 2005 Ralf Corsepius <ralf at links2linux.de> - 0.08-2
-- Pass OPTIMIZE during generation of Makefile.
-- Use perl instead of %%__perl.
+* Sat Aug 13 2005 Ralf Corsepius <ralf at links2linux.de> - 0.09-2
+- Streamline with FE spec-template.
 
-* Fri Jul 01 2005 Ralf Corsepius <ralf at links2linux.de> - 0.08-1
-- FE submission.
+* Sat Jul 02 2005 Ralf Corsepius <ralf at links2linux.de> - 0.09-1
+- Upstream update to 0.09.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Want/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Jul 2005 05:32:16 -0000	1.3
+++ sources	4 Apr 2006 04:01:23 -0000	1.4
@@ -1 +1 @@
-90ab551867c986b748128609f95b3666  Want-0.09.tar.gz
+bc2836bd8fe4bcb6044334d54a08c686  Want-0.10.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr  4 06:23:12 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon,  3 Apr 2006 23:23:12 -0700
Subject: rpms/perl-Tree-Simple/devel .cvsignore, 1.2,
	1.3 perl-Tree-Simple.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200604040623.k346NEJf025958@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Tree-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25935

Modified Files:
	.cvsignore perl-Tree-Simple.spec sources 
Log Message:
* Tue Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.16-1
- Upsteam update.
- BR: Scalar::Util >= 1.18.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Tree-Simple/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Aug 2005 01:08:39 -0000	1.2
+++ .cvsignore	4 Apr 2006 06:23:12 -0000	1.3
@@ -1 +1 @@
-Tree-Simple-1.15.tar.gz
+Tree-Simple-1.16.tar.gz


Index: perl-Tree-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Tree-Simple/devel/perl-Tree-Simple.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Tree-Simple.spec	28 Feb 2006 22:41:42 -0000	1.3
+++ perl-Tree-Simple.spec	4 Apr 2006 06:23:12 -0000	1.4
@@ -1,6 +1,6 @@
 Name: 		perl-Tree-Simple
-Version: 	1.15
-Release: 	3%{?dist}
+Version: 	1.16
+Release: 	1%{?dist}
 Summary: 	Tree::Simple Perl module
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -9,6 +9,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: 	noarch
 
+BuildRequires:	perl(Scalar::Util) >= 1.18
 BuildRequires: 	perl(Test::Exception) >= 0.15 
 BuildRequires: 	perl(Test::Pod) >=  1.14
 BuildRequires: 	perl(Test::Pod::Coverage) >= 1.04
@@ -49,6 +50,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.16-1
+- Upsteam update.
+- BR: Scalar::Util >= 1.18.
+
 * Tue Feb 28 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.15-3
 - Rebuild for perl-5.8.8.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Tree-Simple/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Aug 2005 01:08:39 -0000	1.2
+++ sources	4 Apr 2006 06:23:12 -0000	1.3
@@ -1 +1 @@
-f4bb1afd402186952ea0b87ceeb3bc41  Tree-Simple-1.15.tar.gz
+7f003a9af1aea6a9931c3de8fc49b3ab  Tree-Simple-1.16.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr  4 06:24:14 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon,  3 Apr 2006 23:24:14 -0700
Subject: rpms/perl-Tree-Simple/FC-5 .cvsignore, 1.2,
	1.3 perl-Tree-Simple.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200604040624.k346OG7p026029@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Tree-Simple/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26006

Modified Files:
	.cvsignore perl-Tree-Simple.spec sources 
Log Message:
* Tue Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.16-1
- Upsteam update.
- BR: Scalar::Util >= 1.18.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Tree-Simple/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Aug 2005 01:08:39 -0000	1.2
+++ .cvsignore	4 Apr 2006 06:24:14 -0000	1.3
@@ -1 +1 @@
-Tree-Simple-1.15.tar.gz
+Tree-Simple-1.16.tar.gz


Index: perl-Tree-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Tree-Simple/FC-5/perl-Tree-Simple.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Tree-Simple.spec	28 Feb 2006 22:41:42 -0000	1.3
+++ perl-Tree-Simple.spec	4 Apr 2006 06:24:14 -0000	1.4
@@ -1,6 +1,6 @@
 Name: 		perl-Tree-Simple
-Version: 	1.15
-Release: 	3%{?dist}
+Version: 	1.16
+Release: 	1%{?dist}
 Summary: 	Tree::Simple Perl module
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -9,6 +9,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: 	noarch
 
+BuildRequires:	perl(Scalar::Util) >= 1.18
 BuildRequires: 	perl(Test::Exception) >= 0.15 
 BuildRequires: 	perl(Test::Pod) >=  1.14
 BuildRequires: 	perl(Test::Pod::Coverage) >= 1.04
@@ -49,6 +50,10 @@
 %{_mandir}/man3/*
 
 %changelog
+* Tue Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.16-1
+- Upsteam update.
+- BR: Scalar::Util >= 1.18.
+
 * Tue Feb 28 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.15-3
 - Rebuild for perl-5.8.8.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Tree-Simple/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Aug 2005 01:08:39 -0000	1.2
+++ sources	4 Apr 2006 06:24:14 -0000	1.3
@@ -1 +1 @@
-f4bb1afd402186952ea0b87ceeb3bc41  Tree-Simple-1.15.tar.gz
+7f003a9af1aea6a9931c3de8fc49b3ab  Tree-Simple-1.16.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr  4 07:23:28 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  4 Apr 2006 00:23:28 -0700
Subject: rpms/perl-Params-Validate/devel .cvsignore, 1.4,
	1.5 perl-Params-Validate.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <200604040723.k347NUqs028198@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Validate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28177

Modified Files:
	.cvsignore perl-Params-Validate.spec sources 
Log Message:
* Wed Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.81-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Validate/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Feb 2006 05:53:20 -0000	1.4
+++ .cvsignore	4 Apr 2006 07:23:28 -0000	1.5
@@ -1 +1 @@
-Params-Validate-0.80.tar.gz
+Params-Validate-0.81.tar.gz


Index: perl-Params-Validate.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Validate/devel/perl-Params-Validate.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Params-Validate.spec	20 Feb 2006 06:40:04 -0000	1.5
+++ perl-Params-Validate.spec	4 Apr 2006 07:23:28 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: 	Params-Validate Perl module
 Name: 		perl-Params-Validate
-Version: 	0.80
-Release: 	2%{?dist}
+Version: 	0.81
+Release: 	1%{?dist}
 License: 	GPL or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Params-Validate/
@@ -54,6 +54,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.81-1
+- Upstream update.
+
 * Wed Feb 20 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.80-2
 - Rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Validate/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Feb 2006 05:53:20 -0000	1.4
+++ sources	4 Apr 2006 07:23:28 -0000	1.5
@@ -1 +1 @@
-37acde17038290becdef848f566698d6  Params-Validate-0.80.tar.gz
+033d043c4764b800722b9d7442bc4530  Params-Validate-0.81.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr  4 07:28:11 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  4 Apr 2006 00:28:11 -0700
Subject: rpms/perl-Devel-StackTrace/devel .cvsignore, 1.3,
	1.4 perl-Devel-StackTrace.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200604040728.k347SDE4028281@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Devel-StackTrace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28260

Modified Files:
	.cvsignore perl-Devel-StackTrace.spec sources 
Log Message:
* Wed Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.13-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-StackTrace/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Oct 2005 16:22:28 -0000	1.3
+++ .cvsignore	4 Apr 2006 07:28:11 -0000	1.4
@@ -1 +1 @@
-Devel-StackTrace-1.12.tar.gz
+Devel-StackTrace-1.13.tar.gz


Index: perl-Devel-StackTrace.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-StackTrace/devel/perl-Devel-StackTrace.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Devel-StackTrace.spec	28 Feb 2006 23:20:17 -0000	1.4
+++ perl-Devel-StackTrace.spec	4 Apr 2006 07:28:11 -0000	1.5
@@ -1,7 +1,7 @@
 Name:      	perl-Devel-StackTrace
 Summary:   	Perl module implementing stack trace and stack trace frame objects
-Version:	1.12
-Release: 	2%{?dist}
+Version:	1.13
+Release: 	1%{?dist}
 License:   	Artistic or GPL
 Group: 		Development/Libraries
 URL:       	http://search.cpan.org/dist/Devel-StackTrace
@@ -51,20 +51,11 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.13-1
+- Upstream update.
+
 * Wed Mar 01 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.12-2
 - Rebuild for perl-5.8.8.
 
 * Sun Oct 02 2005 Ralf Corsepius <rc040203 at freenet.de> - 1.12-1
 - Upstream update.
-
-* Wed Aug 10 2005 Ralf Corsepius <ralf at links2linux.de> - 1.11-4
-- Spec cleanup.
-
-* Wed Aug 10 2005 Ralf Corsepius <ralf at links2linux.de> - 1.11-3
-- Add %%defattr.
-
-* Wed Aug 10 2005 Ralf Corsepius <ralf at links2linux.de> - 1.11-2
-- FE re-submission.
-
-* Fri Jul 01 2005 Ralf Corsepius <ralf at links2linux.de> - 1.11-1
-- FE submission.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-StackTrace/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Oct 2005 16:22:28 -0000	1.3
+++ sources	4 Apr 2006 07:28:11 -0000	1.4
@@ -1 +1 @@
-1ba3c261e798dbd52517b458c415b6e4  Devel-StackTrace-1.12.tar.gz
+35d85c3f2c91c1de389b13436659551a  Devel-StackTrace-1.13.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr  4 07:29:10 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  4 Apr 2006 00:29:10 -0700
Subject: rpms/perl-Devel-StackTrace/FC-5 .cvsignore, 1.3,
	1.4 perl-Devel-StackTrace.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200604040729.k347TCYE028346@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Devel-StackTrace/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28325

Modified Files:
	.cvsignore perl-Devel-StackTrace.spec sources 
Log Message:
* Wed Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.13-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-StackTrace/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	2 Oct 2005 16:22:28 -0000	1.3
+++ .cvsignore	4 Apr 2006 07:29:09 -0000	1.4
@@ -1 +1 @@
-Devel-StackTrace-1.12.tar.gz
+Devel-StackTrace-1.13.tar.gz


Index: perl-Devel-StackTrace.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-StackTrace/FC-5/perl-Devel-StackTrace.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Devel-StackTrace.spec	28 Feb 2006 23:20:17 -0000	1.4
+++ perl-Devel-StackTrace.spec	4 Apr 2006 07:29:09 -0000	1.5
@@ -1,7 +1,7 @@
 Name:      	perl-Devel-StackTrace
 Summary:   	Perl module implementing stack trace and stack trace frame objects
-Version:	1.12
-Release: 	2%{?dist}
+Version:	1.13
+Release: 	1%{?dist}
 License:   	Artistic or GPL
 Group: 		Development/Libraries
 URL:       	http://search.cpan.org/dist/Devel-StackTrace
@@ -51,20 +51,11 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.13-1
+- Upstream update.
+
 * Wed Mar 01 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.12-2
 - Rebuild for perl-5.8.8.
 
 * Sun Oct 02 2005 Ralf Corsepius <rc040203 at freenet.de> - 1.12-1
 - Upstream update.
-
-* Wed Aug 10 2005 Ralf Corsepius <ralf at links2linux.de> - 1.11-4
-- Spec cleanup.
-
-* Wed Aug 10 2005 Ralf Corsepius <ralf at links2linux.de> - 1.11-3
-- Add %%defattr.
-
-* Wed Aug 10 2005 Ralf Corsepius <ralf at links2linux.de> - 1.11-2
-- FE re-submission.
-
-* Fri Jul 01 2005 Ralf Corsepius <ralf at links2linux.de> - 1.11-1
-- FE submission.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-StackTrace/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	2 Oct 2005 16:22:28 -0000	1.3
+++ sources	4 Apr 2006 07:29:09 -0000	1.4
@@ -1 +1 @@
-1ba3c261e798dbd52517b458c415b6e4  Devel-StackTrace-1.12.tar.gz
+35d85c3f2c91c1de389b13436659551a  Devel-StackTrace-1.13.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr  4 07:31:09 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  4 Apr 2006 00:31:09 -0700
Subject: rpms/perl-Devel-StackTrace/FC-4 .cvsignore, 1.3,
	1.4 perl-Devel-StackTrace.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200604040731.k347VBBO028423@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Devel-StackTrace/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28402

Modified Files:
	.cvsignore perl-Devel-StackTrace.spec sources 
Log Message:
* Wed Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.13-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-StackTrace/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Oct 2005 03:25:57 -0000	1.3
+++ .cvsignore	4 Apr 2006 07:31:08 -0000	1.4
@@ -1 +1 @@
-Devel-StackTrace-1.12.tar.gz
+Devel-StackTrace-1.13.tar.gz


Index: perl-Devel-StackTrace.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-StackTrace/FC-4/perl-Devel-StackTrace.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Devel-StackTrace.spec	6 Oct 2005 03:23:03 -0000	1.3
+++ perl-Devel-StackTrace.spec	4 Apr 2006 07:31:08 -0000	1.4
@@ -1,6 +1,6 @@
 Name:      	perl-Devel-StackTrace
 Summary:   	Perl module implementing stack trace and stack trace frame objects
-Version:	1.12
+Version:	1.13
 Release: 	1%{?dist}
 License:   	Artistic or GPL
 Group: 		Development/Libraries
@@ -51,17 +51,8 @@
 %{_mandir}/man3/*
 
 %changelog
-* Sun Oct 02 2005 Ralf Corsepius <rc040203 at freenet.de> - 1.12-1
+* Wed Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.13-1
 - Upstream update.
 
-* Wed Aug 10 2005 Ralf Corsepius <ralf at links2linux.de> - 1.11-4
-- Spec cleanup.
-
-* Wed Aug 10 2005 Ralf Corsepius <ralf at links2linux.de> - 1.11-3
-- Add %%defattr.
-
-* Wed Aug 10 2005 Ralf Corsepius <ralf at links2linux.de> - 1.11-2
-- FE re-submission.
-
-* Fri Jul 01 2005 Ralf Corsepius <ralf at links2linux.de> - 1.11-1
-- FE submission.
+* Sun Oct 02 2005 Ralf Corsepius <rc040203 at freenet.de> - 1.12-1
+- Upstream update.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-StackTrace/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Oct 2005 03:25:57 -0000	1.3
+++ sources	4 Apr 2006 07:31:09 -0000	1.4
@@ -1 +1 @@
-1ba3c261e798dbd52517b458c415b6e4  Devel-StackTrace-1.12.tar.gz
+35d85c3f2c91c1de389b13436659551a  Devel-StackTrace-1.13.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr  4 07:34:35 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Tue,  4 Apr 2006 00:34:35 -0700
Subject: rpms/perl-Devel-StackTrace/FC-3 .cvsignore, 1.2,
	1.3 perl-Devel-StackTrace.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200604040734.k347YbOh028498@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Devel-StackTrace/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28477

Modified Files:
	.cvsignore perl-Devel-StackTrace.spec sources 
Log Message:
* Wed Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.13-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-StackTrace/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Aug 2005 03:28:50 -0000	1.2
+++ .cvsignore	4 Apr 2006 07:34:35 -0000	1.3
@@ -1 +1 @@
-Devel-StackTrace-1.11.tar.gz
+Devel-StackTrace-1.13.tar.gz


Index: perl-Devel-StackTrace.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-StackTrace/FC-3/perl-Devel-StackTrace.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Devel-StackTrace.spec	14 Aug 2005 03:32:06 -0000	1.2
+++ perl-Devel-StackTrace.spec	4 Apr 2006 07:34:35 -0000	1.3
@@ -1,7 +1,7 @@
 Name:      	perl-Devel-StackTrace
 Summary:   	Perl module implementing stack trace and stack trace frame objects
-Version:	1.11
-Release: 	4%{?dist}
+Version:	1.13
+Release: 	1%{?dist}
 License:   	Artistic or GPL
 Group: 		Development/Libraries
 URL:       	http://search.cpan.org/dist/Devel-StackTrace
@@ -51,14 +51,8 @@
 %{_mandir}/man3/*
 
 %changelog
-* Wed Aug 10 2005 Ralf Corsepius <ralf at links2linux.de> - 1.11-4
-- Spec cleanup.
+* Wed Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.13-1
+- Upstream update.
 
-* Wed Aug 10 2005 Ralf Corsepius <ralf at links2linux.de> - 1.11-3
-- Add %%defattr.
-
-* Wed Aug 10 2005 Ralf Corsepius <ralf at links2linux.de> - 1.11-2
-- FE re-submission.
-
-* Fri Jul 01 2005 Ralf Corsepius <ralf at links2linux.de> - 1.11-1
-- FE submission.
+* Sun Oct 02 2005 Ralf Corsepius <rc040203 at freenet.de> - 1.12-1
+- Upstream update.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Devel-StackTrace/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Aug 2005 03:28:50 -0000	1.2
+++ sources	4 Apr 2006 07:34:35 -0000	1.3
@@ -1 +1 @@
-a5d2088a531ceeec82b989c742f9382e  Devel-StackTrace-1.11.tar.gz
+35d85c3f2c91c1de389b13436659551a  Devel-StackTrace-1.13.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr  4 09:20:37 2006
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Tue,  4 Apr 2006 02:20:37 -0700
Subject: rpms/sloccount - New directory
Message-ID: <200604040920.k349Kd0V000417@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/extras/rpms/sloccount
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv391/sloccount

Log Message:
Directory /cvs/extras/rpms/sloccount added to the repository




From fedora-extras-commits at redhat.com  Tue Apr  4 09:20:38 2006
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Tue,  4 Apr 2006 02:20:38 -0700
Subject: rpms/sloccount/devel - New directory
Message-ID: <200604040920.k349Ke1M000420@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/extras/rpms/sloccount/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv391/sloccount/devel

Log Message:
Directory /cvs/extras/rpms/sloccount/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Apr  4 09:20:52 2006
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Tue,  4 Apr 2006 02:20:52 -0700
Subject: rpms/sloccount Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604040920.k349KtVx000469@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/extras/rpms/sloccount
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv436

Added Files:
	Makefile import.log 
Log Message:
Setup of module sloccount


--- NEW FILE Makefile ---
# Top level Makefile for module sloccount
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr  4 09:20:53 2006
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Tue,  4 Apr 2006 02:20:53 -0700
Subject: rpms/sloccount/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604040920.k349Ktw6000472@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/extras/rpms/sloccount/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv436/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module sloccount


--- 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 Apr  4 09:21:22 2006
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Tue,  4 Apr 2006 02:21:22 -0700
Subject: rpms/sloccount import.log,1.1,1.2
Message-ID: <200604040921.k349LOVc000533@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/extras/rpms/sloccount
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv500

Modified Files:
	import.log 
Log Message:
auto-import sloccount-2.26-3 on branch devel from sloccount-2.26-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/sloccount/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	4 Apr 2006 09:20:52 -0000	1.1
+++ import.log	4 Apr 2006 09:21:22 -0000	1.2
@@ -0,0 +1 @@
+sloccount-2_26-3:HEAD:sloccount-2.26-3.src.rpm:1144142475



From fedora-extras-commits at redhat.com  Tue Apr  4 09:21:23 2006
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Tue,  4 Apr 2006 02:21:23 -0700
Subject: rpms/sloccount/devel sloccount.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604040921.k349LPrZ000538@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/extras/rpms/sloccount/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv500/devel

Modified Files:
	.cvsignore sources 
Added Files:
	sloccount.spec 
Log Message:
auto-import sloccount-2.26-3 on branch devel from sloccount-2.26-3.src.rpm


--- NEW FILE sloccount.spec ---
Name: sloccount
Summary: Measures source lines of code (SLOC) in programs
Version: 2.26
Release: 3
License: GPL
Group: Development/Tools
Source: http://www.dwheeler.com/sloccount/sloccount-%{version}.tar.gz
URL: http://www.dwheeler.com/sloccount
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
SLOCCount (pronounced "sloc-count") is a suite of programs for counting
physical source lines of code (SLOC) in potentially large software systems.

SLOCCount can be used to generate reports in different formats for use
by report-generating tools.

%prep
%setup -q

%build
make

%install
rm -rf ${RPM_BUILD_ROOT}
mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/man1
make install_programs PREFIX=${RPM_BUILD_ROOT}%{_prefix}
make install_man PREFIX=${RPM_BUILD_ROOT}%{_prefix}

%clean
rm -rf ${RPM_BUILD_ROOT}

%files
%defattr(-, root, root)
%doc sloccount.html README ChangeLog COPYING TODO
%{_bindir}/*
%{_mandir}/*/*

%changelog
* Tue Apr 04 2006 - Bastien Nocera <hadess at hadess.net> - 2.26-3
- shorten description, and quieten setup

* Mon Apr 03 2006 - Bastien Nocera <hadess at hadess.net> - 2.26-2
- Update source to match upstream vanilla
  change BuildRoot to match preferred value

* Thu Nov 10 2005 - Bastien Nocera <hadess at hadess.net> - 2.26-1
- First version for Fedora Extras



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sloccount/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	4 Apr 2006 09:20:53 -0000	1.1
+++ .cvsignore	4 Apr 2006 09:21:23 -0000	1.2
@@ -0,0 +1 @@
+sloccount-2.26.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sloccount/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	4 Apr 2006 09:20:53 -0000	1.1
+++ sources	4 Apr 2006 09:21:23 -0000	1.2
@@ -0,0 +1 @@
+09abd6e2a016ebaf7552068a1dba1249  sloccount-2.26.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr  4 09:25:39 2006
From: fedora-extras-commits at redhat.com (Bastien Nocera (hadess))
Date: Tue,  4 Apr 2006 02:25:39 -0700
Subject: owners owners.list,1.803,1.804
Message-ID: <200604040925.k349PfOC000609@cvs-int.fedora.redhat.com>

Author: hadess

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv592

Modified Files:
	owners.list 
Log Message:
- added sloccount



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.803
retrieving revision 1.804
diff -u -r1.803 -r1.804
--- owners.list	3 Apr 2006 21:17:42 -0000	1.803
+++ owners.list	4 Apr 2006 09:25:39 -0000	1.804
@@ -1325,6 +1325,7 @@
 Fedora Extras|sirius|Othello for Gnome|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|skencil|A vector drawing program|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|skkdic|Japanese dictionaries for skk input|petersen at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|sloccount|Measures source lines of code (SLOC) in programs|bnocera at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|smb4k|The SMB/CIFS Share Browser for KDE|mgarski at post.pl|extras-qa at fedoraproject.org|
 Fedora Extras|smbldap-tools|User and group administration tools for Samba/OpenLDAP|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|smeg|Simple menu editor for GNOME|jpmahowald at gmail.com|extras-qa at fedoraproject.org|foolish at guezz.net



From fedora-extras-commits at redhat.com  Tue Apr  4 10:07:10 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Tue,  4 Apr 2006 03:07:10 -0700
Subject: rpms/python-imaging/FC-4 python-imaging-giftrans.patch, 1.2,
	1.3 python-imaging.spec, 1.8, 1.9
Message-ID: <200604041007.k34A7CxZ002799@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/python-imaging/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2777

Modified Files:
	python-imaging.spec 
Added Files:
	python-imaging-giftrans.patch 
Log Message:
* Tue Apr  4 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-3
- Restore gif transparency patch. (bug #187875)


python-imaging-giftrans.patch:

Index: python-imaging-giftrans.patch
===================================================================
RCS file: python-imaging-giftrans.patch
diff -N python-imaging-giftrans.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ python-imaging-giftrans.patch	4 Apr 2006 10:07:10 -0000	1.3
@@ -0,0 +1,17 @@
+See http://bugs.debian.org/159693
+
+diff -Naru Imaging-1.1.4.orig/PIL/GifImagePlugin.py Imaging-1.1.4/PIL/GifImagePlugin.py
+--- Imaging-1.1.4.orig/PIL/GifImagePlugin.py	2003-05-06 23:44:16.000000000 +0300
++++ Imaging-1.1.4/PIL/GifImagePlugin.py	2004-10-09 21:12:12.635957206 +0300
+@@ -346,6 +346,11 @@
+         for i in range(maxcolor):
+             s.append(chr(i) * 3)
+ 
++    if im.info.has_key('transparency'):
++        transparentIndex = im.info['transparency']
++        s.append('!' + chr(0xf9) + chr(4) + chr(1) + chr(0) + chr(0) +
++                 chr(transparentIndex) + chr(0))
++
+     return s
+ 
+ def getdata(im, offset = (0, 0), **params):


Index: python-imaging.spec
===================================================================
RCS file: /cvs/extras/rpms/python-imaging/FC-4/python-imaging.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-imaging.spec	2 Apr 2006 21:59:25 -0000	1.8
+++ python-imaging.spec	4 Apr 2006 10:07:10 -0000	1.9
@@ -5,13 +5,14 @@
 Summary: Python's own image processing library
 Name: python-imaging
 Version: 1.1.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: Distributable
 Group: Development/Languages
 Source0: http://effbot.org/downloads/Imaging-%{version}.tar.gz
 Patch0: %{name}-no-xv.patch
 Patch1: %{name}-lib64.patch
+Patch2: %{name}-giftrans.patch
 URL: http://www.pythonware.com/products/pil/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -50,6 +51,7 @@
 %setup -q -n Imaging-%{version}
 %patch0 -p1
 %patch1 -p0
+%patch2 -p1
 
 # fix the interpreter path for Scripts/*.py
 cd Scripts
@@ -104,6 +106,9 @@
 
 
 %changelog
+* Tue Apr  4 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-3
+- Restore gif transparency patch. (bug #187875)
+
 * Sun Apr  2 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-2
 - Fix bug #185203 (Thanks to Rick L Vinyard Jr)
 



From fedora-extras-commits at redhat.com  Tue Apr  4 10:08:33 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Tue,  4 Apr 2006 03:08:33 -0700
Subject: rpms/python-imaging/FC-5 python-imaging.spec,1.8,1.9
Message-ID: <200604041008.k34A8Zqs002868@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/python-imaging/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2850

Modified Files:
	python-imaging.spec 
Log Message:
* Tue Apr  4 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-3
- Restore gif transparency patch. (bug #187875)



Index: python-imaging.spec
===================================================================
RCS file: /cvs/extras/rpms/python-imaging/FC-5/python-imaging.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-imaging.spec	2 Apr 2006 21:57:26 -0000	1.8
+++ python-imaging.spec	4 Apr 2006 10:08:33 -0000	1.9
@@ -5,13 +5,14 @@
 Summary: Python's own image processing library
 Name: python-imaging
 Version: 1.1.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: Distributable
 Group: Development/Languages
 Source0: http://effbot.org/downloads/Imaging-%{version}.tar.gz
 Patch0: %{name}-no-xv.patch
 Patch1: %{name}-lib64.patch
+Patch2: %{name}-giftrans.patch
 URL: http://www.pythonware.com/products/pil/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -50,6 +51,7 @@
 %setup -q -n Imaging-%{version}
 %patch0 -p1
 %patch1 -p0
+%patch2 -p1
 
 # fix the interpreter path for Scripts/*.py
 cd Scripts
@@ -104,6 +106,9 @@
 
 
 %changelog
+* Tue Apr  4 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-3
+- Restore gif transparency patch. (bug #187875)
+
 * Sun Apr  2 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-2
 - Fix bug #185203 (Thanks to Rick L Vinyard Jr)
 



From fedora-extras-commits at redhat.com  Tue Apr  4 10:27:26 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Tue,  4 Apr 2006 03:27:26 -0700
Subject: rpms/python-imaging/FC-4 python-imaging.spec,1.9,1.10
Message-ID: <200604041027.k34ARSWY003010@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/python-imaging/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2993

Modified Files:
	python-imaging.spec 
Log Message:
sync with FC-5 and devel


Index: python-imaging.spec
===================================================================
RCS file: /cvs/extras/rpms/python-imaging/FC-4/python-imaging.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- python-imaging.spec	4 Apr 2006 10:07:10 -0000	1.9
+++ python-imaging.spec	4 Apr 2006 10:27:26 -0000	1.10
@@ -5,7 +5,7 @@
 Summary: Python's own image processing library
 Name: python-imaging
 Version: 1.1.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: Distributable
 Group: Development/Languages
@@ -106,6 +106,9 @@
 
 
 %changelog
+* Tue Apr  4 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-4
+- Rebuild
+
 * Tue Apr  4 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-3
 - Restore gif transparency patch. (bug #187875)
 



From fedora-extras-commits at redhat.com  Tue Apr  4 10:28:14 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Tue,  4 Apr 2006 03:28:14 -0700
Subject: rpms/python-imaging/FC-5 python-imaging-giftrans.patch, 1.2,
	1.3 python-imaging.spec, 1.9, 1.10
Message-ID: <200604041028.k34ASGIv003044@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/python-imaging/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3022

Modified Files:
	python-imaging.spec 
Added Files:
	python-imaging-giftrans.patch 
Log Message:
* Tue Apr  4 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-4
- Rebuild


python-imaging-giftrans.patch:

Index: python-imaging-giftrans.patch
===================================================================
RCS file: python-imaging-giftrans.patch
diff -N python-imaging-giftrans.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ python-imaging-giftrans.patch	4 Apr 2006 10:28:14 -0000	1.3
@@ -0,0 +1,17 @@
+See http://bugs.debian.org/159693
+
+diff -Naru Imaging-1.1.4.orig/PIL/GifImagePlugin.py Imaging-1.1.4/PIL/GifImagePlugin.py
+--- Imaging-1.1.4.orig/PIL/GifImagePlugin.py	2003-05-06 23:44:16.000000000 +0300
++++ Imaging-1.1.4/PIL/GifImagePlugin.py	2004-10-09 21:12:12.635957206 +0300
+@@ -346,6 +346,11 @@
+         for i in range(maxcolor):
+             s.append(chr(i) * 3)
+ 
++    if im.info.has_key('transparency'):
++        transparentIndex = im.info['transparency']
++        s.append('!' + chr(0xf9) + chr(4) + chr(1) + chr(0) + chr(0) +
++                 chr(transparentIndex) + chr(0))
++
+     return s
+ 
+ def getdata(im, offset = (0, 0), **params):


Index: python-imaging.spec
===================================================================
RCS file: /cvs/extras/rpms/python-imaging/FC-5/python-imaging.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- python-imaging.spec	4 Apr 2006 10:08:33 -0000	1.9
+++ python-imaging.spec	4 Apr 2006 10:28:14 -0000	1.10
@@ -5,7 +5,7 @@
 Summary: Python's own image processing library
 Name: python-imaging
 Version: 1.1.5
-Release: 3%{?dist}
+Release: 4%{?dist}
 
 License: Distributable
 Group: Development/Languages
@@ -106,6 +106,9 @@
 
 
 %changelog
+* Tue Apr  4 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-4
+- Rebuild
+
 * Tue Apr  4 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-3
 - Restore gif transparency patch. (bug #187875)
 



From fedora-extras-commits at redhat.com  Tue Apr  4 10:33:30 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Tue,  4 Apr 2006 03:33:30 -0700
Subject: rpms/python-imaging/devel python-imaging-giftrans.patch, 1.2,
	1.3 python-imaging.spec, 1.8, 1.9
Message-ID: <200604041033.k34AXWnJ003127@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/python-imaging/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3105

Modified Files:
	python-imaging.spec 
Added Files:
	python-imaging-giftrans.patch 
Log Message:
* Tue Apr  4 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-4
- Rebuild


python-imaging-giftrans.patch:

Index: python-imaging-giftrans.patch
===================================================================
RCS file: python-imaging-giftrans.patch
diff -N python-imaging-giftrans.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ python-imaging-giftrans.patch	4 Apr 2006 10:33:30 -0000	1.3
@@ -0,0 +1,17 @@
+See http://bugs.debian.org/159693
+
+diff -Naru Imaging-1.1.4.orig/PIL/GifImagePlugin.py Imaging-1.1.4/PIL/GifImagePlugin.py
+--- Imaging-1.1.4.orig/PIL/GifImagePlugin.py	2003-05-06 23:44:16.000000000 +0300
++++ Imaging-1.1.4/PIL/GifImagePlugin.py	2004-10-09 21:12:12.635957206 +0300
+@@ -346,6 +346,11 @@
+         for i in range(maxcolor):
+             s.append(chr(i) * 3)
+ 
++    if im.info.has_key('transparency'):
++        transparentIndex = im.info['transparency']
++        s.append('!' + chr(0xf9) + chr(4) + chr(1) + chr(0) + chr(0) +
++                 chr(transparentIndex) + chr(0))
++
+     return s
+ 
+ def getdata(im, offset = (0, 0), **params):


Index: python-imaging.spec
===================================================================
RCS file: /cvs/extras/rpms/python-imaging/devel/python-imaging.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-imaging.spec	2 Apr 2006 21:44:44 -0000	1.8
+++ python-imaging.spec	4 Apr 2006 10:33:30 -0000	1.9
@@ -5,13 +5,14 @@
 Summary: Python's own image processing library
 Name: python-imaging
 Version: 1.1.5
-Release: 2%{?dist}
+Release: 4%{?dist}
 
 License: Distributable
 Group: Development/Languages
 Source0: http://effbot.org/downloads/Imaging-%{version}.tar.gz
 Patch0: %{name}-no-xv.patch
 Patch1: %{name}-lib64.patch
+Patch2: %{name}-giftrans.patch
 URL: http://www.pythonware.com/products/pil/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -50,6 +51,7 @@
 %setup -q -n Imaging-%{version}
 %patch0 -p1
 %patch1 -p0
+%patch2 -p1
 
 # fix the interpreter path for Scripts/*.py
 cd Scripts
@@ -104,6 +106,12 @@
 
 
 %changelog
+* Tue Apr  4 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-4
+- Rebuild
+
+* Tue Apr  4 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-3
+- Restore gif transparency patch. (bug #187875)
+
 * Sun Apr  2 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1.5-2
 - Fix bug #185203 (Thanks to Rick L Vinyard Jr)
 



From fedora-extras-commits at redhat.com  Tue Apr  4 12:36:50 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Tue,  4 Apr 2006 05:36:50 -0700
Subject: fedora-security/audit fc4,1.185,1.186 fc5,1.98,1.99
Message-ID: <200604041236.k34CaoUQ007905@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7885

Modified Files:
	fc4 fc5 
Log Message:
Add a new(ish) python issue.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- fc4	3 Apr 2006 21:52:08 -0000	1.185
+++ fc4	4 Apr 2006 12:36:47 -0000	1.186
@@ -7,6 +7,7 @@
 CVE-2006-1548 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) bz#187544
+CVE-2006-1542 VULNERABLE (python) bz#169046
 CVE-2006-1368 ** kernel
 CVE-2006-1354 VULNERABLE (freeradius) bz#186084
 CVE-2006-1343 ** kernel


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -r1.98 -r1.99
--- fc5	3 Apr 2006 21:52:08 -0000	1.98
+++ fc5	4 Apr 2006 12:36:47 -0000	1.99
@@ -6,6 +6,7 @@
 CVE-2006-1548 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) bz#187544
+CVE-2006-1542 VULNERABLE (python) bz#169046
 CVE-2006-1368 ** kernel
 CVE-2006-1354 VULNERABLE (freeradius) bz#186084
 CVE-2006-1343 ** kernel



From fedora-extras-commits at redhat.com  Tue Apr  4 13:07:51 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Tue,  4 Apr 2006 06:07:51 -0700
Subject: rpms/scim-fcitx/devel scim-fcitx.spec,1.4,1.5
Message-ID: <200604041307.k34D7raV010011@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim-fcitx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9994

Modified Files:
	scim-fcitx.spec 
Log Message:
rebuild without libstdc++so7



Index: scim-fcitx.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-fcitx/devel/scim-fcitx.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- scim-fcitx.spec	2 Mar 2006 07:40:47 -0000	1.4
+++ scim-fcitx.spec	4 Apr 2006 13:07:51 -0000	1.5
@@ -1,8 +1,8 @@
-%define with_libstdc_preview 1 
+%define with_libstdc_preview 0
 
 Name:           scim-fcitx
 Version:        3.1.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        FCITX Input Method Engine for SCIM
 
 Group:          System Environment/Libraries
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Tue Apr  4 2006 Jens Petersen <petersen at redhat.com> - 3.1.1-5
+- rebuild without libstdc++so7
+
 * Thu Mar  2 2006 Jens Petersen <petersen at redhat.com> - 3.1.1-4
 - rebuild for FE5
 



From fedora-extras-commits at redhat.com  Tue Apr  4 13:10:09 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Tue,  4 Apr 2006 06:10:09 -0700
Subject: rpms/scim-input-pad/devel scim-input-pad.spec,1.5,1.6
Message-ID: <200604041310.k34DABue010101@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim-input-pad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10079

Modified Files:
	scim-input-pad.spec 
Log Message:
rebuild without libstdc++so7



Index: scim-input-pad.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-input-pad/devel/scim-input-pad.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- scim-input-pad.spec	13 Feb 2006 06:21:12 -0000	1.5
+++ scim-input-pad.spec	4 Apr 2006 13:10:08 -0000	1.6
@@ -1,8 +1,8 @@
-%define with_libstdc_preview 1 
+%define with_libstdc_preview 0
 
 Name:           scim-input-pad
 Version:        0.1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        On-screen Input Pad for SCIM
 
 Group:          System Environment/Libraries
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Tue Apr  4 2006 Jens Petersen <petersen at redhat.com> - 0.1.1-4
+- rebuild without libstdc++so7
+
 * Mon Feb 13 2006 Jens Petersen <petersen at redhat.com> - 0.1.1-3
 - build conditionally with libstdc++so7 preview library (#166041)
   - add with_libstdc_preview switch and tweak libtool to link against it



From fedora-extras-commits at redhat.com  Tue Apr  4 13:12:52 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Tue,  4 Apr 2006 06:12:52 -0700
Subject: rpms/scim-skk/devel scim-skk.spec,1.11,1.12
Message-ID: <200604041312.k34DCsp3010179@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim-skk/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10162

Modified Files:
	scim-skk.spec 
Log Message:
rebuild without libstdc++so7



Index: scim-skk.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-skk/devel/scim-skk.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- scim-skk.spec	13 Feb 2006 06:31:14 -0000	1.11
+++ scim-skk.spec	4 Apr 2006 13:12:52 -0000	1.12
@@ -1,8 +1,8 @@
-%define with_libstdc_preview 1 
+%define with_libstdc_preview 0
 
 Name:		scim-skk
 Version:	0.5.2
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	SCIM IMEngine module for skk
 
 Group:		System Environment/Libraries
@@ -62,6 +62,9 @@
 
 
 %changelog
+* Tue Apr  4 2006 Jens Petersen <petersen at redhat.com> - 0.5.2-4
+- rebuild without libstdc++so7
+
 * Mon Feb 13 2006 Jens Petersen <petersen at redhat.com> - 0.5.2-3
 - build conditionally with libstdc++so7 preview library (#166041)
   - add with_libstdc_preview switch and tweak libtool to link against it



From fedora-extras-commits at redhat.com  Tue Apr  4 13:15:33 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Tue,  4 Apr 2006 06:15:33 -0700
Subject: rpms/scim-tomoe/devel scim-tomoe.spec,1.9,1.10
Message-ID: <200604041315.k34DFZgh010252@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/scim-tomoe/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10231

Modified Files:
	scim-tomoe.spec 
Log Message:
rebuild without libstdc++so7



Index: scim-tomoe.spec
===================================================================
RCS file: /cvs/extras/rpms/scim-tomoe/devel/scim-tomoe.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- scim-tomoe.spec	1 Mar 2006 14:41:15 -0000	1.9
+++ scim-tomoe.spec	4 Apr 2006 13:15:33 -0000	1.10
@@ -1,8 +1,8 @@
-%define with_libstdc_preview 1 
+%define with_libstdc_preview 0
 
 Name:           scim-tomoe
 Version:        0.2.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Tomoe module for SCIM for Japanese handwritten input
 
 Group:          System Environment/Libraries
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Tue Apr  4 2006 Jens Petersen <petersen at redhat.com> - 0.2.0-4
+- rebuild without libstdc++so7
+
 * Wed Mar  1 2006 Ryo Dairiki <ryo-dairiki at users.sourceforge.net> - 0.2-3
 - update to 0.2
 



From fedora-extras-commits at redhat.com  Tue Apr  4 13:43:15 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Tue,  4 Apr 2006 06:43:15 -0700
Subject: kadischi/livecd_generator kadischi.py, 1.8, 1.9 livecd-mkinitrd.sh,
	1.6, 1.7
Message-ID: <200604041343.k34DhjPb010437@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi/livecd_generator
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10402/kadischi/livecd_generator

Modified Files:
	kadischi.py livecd-mkinitrd.sh 
Log Message:
Tighten up some small loose ends, reflect new filesystem option in the manual


Index: kadischi.py
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/kadischi.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kadischi.py	31 Mar 2006 21:03:36 -0000	1.8
+++ kadischi.py	4 Apr 2006 13:43:13 -0000	1.9
@@ -259,7 +259,12 @@
 
 flc_log ('making initrd image')
 
-run ("%s %s %s" % (normalize_path([bindir, 'livecd-mkinitrd.sh']), sysdir, kernel_version), builddir)
+if options.filesystem == 'squashfs':
+    kmods = 'fs/squashfs drivers/block/loop.ko'
+else:
+    kmods = ''
+
+run ("KMODULES='%s' %s %s %s" % (kmods, normalize_path([bindir, 'livecd-mkinitrd.sh']), sysdir, kernel_version), builddir)
 
 # move files 
 


Index: livecd-mkinitrd.sh
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/livecd-mkinitrd.sh,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- livecd-mkinitrd.sh	30 Mar 2006 05:46:06 -0000	1.6
+++ livecd-mkinitrd.sh	4 Apr 2006 13:43:13 -0000	1.7
@@ -23,6 +23,7 @@
 rc=0
 
 IMAGESIZE=10000
+KMODULES="drivers/parport $KMODULES"
 
  . /etc/kadischi/kadischi.conf
 
@@ -256,7 +257,7 @@
 inst $rootdir/etc/modprobe.d/modprobe.conf.dist "$MNTIMAGE/etc/modprobe.d/modprobe.conf.dist"
 inst $rootdir/lib/modules/$kernel/modules.dep "$MNTIMAGE/lib/modules/$kernel/modules.dep"
 
-MODULES=$(findmodules drivers/parport fs/squashfs drivers/block/loop.ko)
+MODULES=$(findmodules $KMODULES)
 for MODULE in $MODULES; do
     instmodule $MODULE
 done



From fedora-extras-commits at redhat.com  Tue Apr  4 13:43:15 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Tue,  4 Apr 2006 06:43:15 -0700
Subject: kadischi/man kadischi.1,1.1,1.2
Message-ID: <200604041343.k34DhkoF010440@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi/man
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10402/kadischi/man

Modified Files:
	kadischi.1 
Log Message:
Tighten up some small loose ends, reflect new filesystem option in the manual


Index: kadischi.1
===================================================================
RCS file: /cvs/devel/kadischi/man/kadischi.1,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kadischi.1	30 Mar 2006 05:51:46 -0000	1.1
+++ kadischi.1	4 Apr 2006 13:43:13 -0000	1.2
@@ -6,7 +6,7 @@
 kadischi - generate a live ISO9660 CDROM image from an RPM repository
 .SH SYNOPSIS
 kadischi [--text|--graphical] [--kickstart=<ks-file>] [-C|--cmdline]
-REPOSITORY [-f] IMAGE
+[--filesystem=<fstype>] REPOSITORY [-f] IMAGE
 .SH DESCRIPTION
 .B kadischi(1)
 generates a live ISO9660 CDROM image from an RPM repository tree by invoking
@@ -29,6 +29,10 @@
 Run strictly in command line mode requiring no user input.
 .IP --cmdline
 Same as -C
+.IP --filesystem
+The filesystem type which should be used for the root filesystem of the LiveCD,
+where fstype is one of 'zisofs' or 'squashfs'.
+The default is zisofs.
 .IP -f
 Overwrite an existing ISO9660 image, if it already exists.
 .SH FILES
@@ -44,9 +48,8 @@
 .BR kadischi.conf(5)
 for more information.
 .SH BUGS
-The module shvarFile is not always imported properly or is not imported
-sometimes at all, resulting in the build directory needing to be
-manually cleaned up.
+Probably many. If you happen to run across one not listed in the
+current bugzilla database you can report it via http://bugzilla.redhat.com
 .SH AVAILABILITY
 Kadischi is available via anonymous CVS:
 .nf



From fedora-extras-commits at redhat.com  Tue Apr  4 17:28:58 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue,  4 Apr 2006 10:28:58 -0700
Subject: rpms/edb/devel .cvsignore, 1.5, 1.6 edb.spec, 1.12, 1.13 sources,
	1.5, 1.6
Message-ID: <200604041729.k34HT0vK024837@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/edb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24816

Modified Files:
	.cvsignore edb.spec sources 
Log Message:
Buh-bye GTK+ 1.x


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/edb/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Feb 2006 08:12:28 -0000	1.5
+++ .cvsignore	4 Apr 2006 17:28:58 -0000	1.6
@@ -1 +1 @@
-edb-1.0.5.005.tar.gz
+edb-1.0.5.007.tar.gz


Index: edb.spec
===================================================================
RCS file: /cvs/extras/rpms/edb/devel/edb.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- edb.spec	14 Feb 2006 05:00:20 -0000	1.12
+++ edb.spec	4 Apr 2006 17:28:58 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           edb
-Version:        1.0.5.005
+Version:        1.0.5.007
 Release:        1%{?dist}
 
 Summary:        A database convenience library wrapped around BDB
@@ -8,7 +8,7 @@
 URL:            http://enlightenment.org/index.php?id=23
 Source0:        http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  gtk+-devel, ncurses-devel zlib-devel which
+BuildRequires:  ncurses-devel zlib-devel which
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
@@ -34,19 +34,11 @@
 %description    ncurses
 edb-ncurses is a frontend for edb that uses ncurses
 
-%package        gtk
-Summary:        GTK+ 1.x frontend for edb
-Group:          Applications/Databases
-Requires:       %{name} = %{version}-%{release}
-
-%description    gtk
-edb-gtk is a frontend for edb that uses GTK+ 1.x
-
 %prep
 %setup -q
 
 %build
-%configure --disable-static
+%configure --disable-static --disable-gtk
 make %{?_smp_mflags}
 
 %install
@@ -79,11 +71,11 @@
 %defattr(-,root,root,-)
 %{_bindir}/edb_vt_ed
 
-%files gtk
-%defattr(-,root,root,-)
-%{_bindir}/edb_gtk_ed
-
 %changelog
+* Tue Apr  4 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5.007-1
+- Upstream update
+- Drop GTK+ 1.x requirement
+
 * Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5.005-1
 - Upstream update
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/edb/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Feb 2006 08:12:28 -0000	1.5
+++ sources	4 Apr 2006 17:28:58 -0000	1.6
@@ -1 +1 @@
-6b6eaa69ea05bf4b4972554f34fd8919  edb-1.0.5.005.tar.gz
+e5d8dcb5995913ae6b7f205e7ac28dbe  edb-1.0.5.007.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr  4 17:38:20 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue,  4 Apr 2006 10:38:20 -0700
Subject: rpms/gdl/devel .cvsignore, 1.3, 1.4 gdl.spec, 1.10, 1.11 sources,
	1.3, 1.4
Message-ID: <200604041738.k34HcMpe024931@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/gdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24910

Modified Files:
	.cvsignore gdl.spec sources 
Log Message:
Update to 0.9pre



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gdl/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Nov 2005 18:26:29 -0000	1.3
+++ .cvsignore	4 Apr 2006 17:38:20 -0000	1.4
@@ -1 +1 @@
-gdl-0.8.11.tar.gz
+gdl-0.9pre.tar.gz


Index: gdl.spec
===================================================================
RCS file: /cvs/extras/rpms/gdl/devel/gdl.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gdl.spec	24 Feb 2006 20:10:58 -0000	1.10
+++ gdl.spec	4 Apr 2006 17:38:20 -0000	1.11
@@ -1,12 +1,12 @@
 Name:           gdl
-Version:        0.8.11
-Release:        4%{?dist}
+Version:        0.9
+Release:        0.pre%{?dist}
 Summary:        GNU Data Language
 
 Group:          Applications/Engineering
 License:        GPL
 URL:            http://gnudatalanguage.sourceforge.net/
-Source0:        http://dl.sf.net/gnudata/%{name}-%{version}.tar.gz
+Source0:        http://dl.sf.net/gnudata/%{name}-%{version}pre.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  readline-devel, ncurses-devel
@@ -23,11 +23,11 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}pre
 
 
 %build
-%configure --disable-static --with-fftw \
+%configure --disable-dependency-tracking --disable-static --with-fftw \
            INCLUDES="-I/usr/include/netcdf-3 -I/usr/include/hdf" \
            LIBS="-L%{_libdir}/netcdf-3 -L%{_libdir}/hdf"
 make %{?_smp_mflags}
@@ -49,6 +49,9 @@
 
 
 %changelog
+* Mon Apr  3 2006 - Orion Poplawski <orion at cora.nwra.com> - 0.9-0.pre
+- Update to 0.9pre
+
 * Fri Feb 24 2006 - Orion Poplawski <orion at cora.nwra.com> - 0.8.11-4
 - Add --with-fftw to configure
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gdl/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Nov 2005 18:26:29 -0000	1.3
+++ sources	4 Apr 2006 17:38:20 -0000	1.4
@@ -1 +1 @@
-837365b860889de03483cf84ae15b9b3  gdl-0.8.11.tar.gz
+b05a9eea1bad9fef0b386f16231a4140  gdl-0.9pre.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr  4 17:44:46 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue,  4 Apr 2006 10:44:46 -0700
Subject: rpms/xemacs/FC-5 xemacs-21.4.19-find-paths-pkgdir.patch, NONE,
	1.1 xemacs.spec, 1.21, 1.22 menubar-games.patch, 1.1,
	NONE xemacs-21.4.10-find-paths-pkgdir.patch, 1.1,
	NONE xemacs-21.4.12-find-paths-libexec-lib64.patch, 1.1, NONE
Message-ID: <200604041744.k34Himd8025039@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25019

Modified Files:
	xemacs.spec 
Added Files:
	xemacs-21.4.19-find-paths-pkgdir.patch 
Removed Files:
	menubar-games.patch xemacs-21.4.10-find-paths-pkgdir.patch 
	xemacs-21.4.12-find-paths-libexec-lib64.patch 
Log Message:
* Fri Mar 31 2006 Ville Skytt?? <ville.skytta at iki.fi> - 21.4.19-4
- Build with gcc 3.2.x (#183643).
- Don't ship patch backup files.


xemacs-21.4.19-find-paths-pkgdir.patch:

--- NEW FILE xemacs-21.4.19-find-paths-pkgdir.patch ---
--- xemacs-21.4.19/lisp/find-paths.el~	2005-12-28 17:58:54.000000000 +0200
+++ xemacs-21.4.19/lisp/find-paths.el	2006-03-31 00:03:36.000000000 +0300
@@ -103,8 +103,8 @@
   (or
    ;; installed
    (paths-file-readable-directory-p (paths-construct-path (list directory
-								"lib"
-								emacs-program-name)))
+								"share"
+								(construct-emacs-version-name))))
    ;; in-place or windows-nt
    (and
     (paths-file-readable-directory-p (paths-construct-path (list directory "lisp")))
@@ -216,7 +216,7 @@
   (paths-find-emacs-directory roots
 			      (file-name-as-directory
 			       (paths-construct-path (list
-						      "lib"
+						      "share"
 						      emacs-program-name)))
 			      base
 			      envvar default


Index: xemacs.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs/FC-5/xemacs.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xemacs.spec	19 Mar 2006 09:47:24 -0000	1.21
+++ xemacs.spec	4 Apr 2006 17:44:46 -0000	1.22
@@ -3,13 +3,14 @@
 %bcond_without  debug
 %bcond_without  mule
 %bcond_with     stackprot
+%bcond_without  gcc32
 
 %define pkgdir  %{_datadir}/xemacs
 %define exectop %{_libdir}/xemacs-%{version}
 
 Name:           xemacs
 Version:        21.4.19
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -24,10 +25,8 @@
 Source23:       dotxemacs-init.el
 Source24:       default.el
 Patch1:         xemacs-21.4.19-x-paths.patch
-Patch10:        xemacs-21.4.10-find-paths-pkgdir.patch
+Patch10:        xemacs-21.4.19-find-paths-pkgdir.patch
 Patch11:        movemail-mktemp.patch
-Patch14:        menubar-games.patch
-Patch15:        xemacs-21.4.12-find-paths-libexec-lib64.patch
 Patch16:        xemacs-21.4.12-mk-nochk-features.patch
 Patch18:        xemacs-21.4.13-dump-paths-lispdir.patch
 Patch19:        xemacs-21.4.18-utf8-fonts.patch
@@ -64,6 +63,9 @@
 %endif # xaw3d
 %endif # gtk
 BuildRequires:  xmkmf
+%if %{with gcc32}
+BuildRequires:  compat-gcc-32
+%endif
 BuildRequires:  libXau-devel
 # TODO: verify these build deps wrt gtk/xaw3d builds
 BuildRequires:  xorg-x11-xbitmaps
@@ -156,11 +158,9 @@
 # make find-paths.el look in datadir
 %patch10 -p1
 # fix "libexec" on multilib
-%ifarch x86_64 s390x
-%patch15 -p1 -b .lib64
-%endif
+sed -i -e 's/"lib"/"%{_lib}"/' lisp/find-paths.el
 # remove game we shouldn't ship
-%patch14 -p1
+sed -i -e /tetris/d lisp/menubar-items.el
 # make lisp dir and mule-lisp dir be the source lisp dirs (not in datadir)
 %patch18 -p1
 sed -i -e "s|\@srcdir\@|$PWD|" lisp/dump-paths.el
@@ -192,6 +192,13 @@
 CFLAGS="$(echo $CFLAGS | sed -e 's/-fstack-protector\s*//g')"
 CFLAGS="$(echo $CFLAGS | sed -e 's/--param=ssp-buffer-size=[0-9]\+\s*//')"
 %endif
+%if %{with gcc32}
+CFLAGS="$(echo $CFLAGS | sed -e 's/mtune/mcpu/')"
+CFLAGS="$(echo $CFLAGS | sed -e 's/-mcpu=generic//')"
+CFLAGS="$(echo $CFLAGS | sed -e 's/-fstack-protector\s*//g')"
+CFLAGS="$(echo $CFLAGS | sed -e 's/--param=ssp-buffer-size=[0-9]\+\s*//')"
+export CC=gcc32
+%endif
 export CFLAGS
 
 # XEmacs still uses Autoconf 2.13 and doesn't know --sbindir, --sysconfdir,
@@ -455,6 +462,10 @@
 
 
 %changelog
+* Fri Mar 31 2006 Ville Skytt?? <ville.skytta at iki.fi> - 21.4.19-4
+- Build with gcc 3.2.x (#183643).
+- Don't ship patch backup files.
+
 * Sat Mar 18 2006 Ville Skytt?? <ville.skytta at iki.fi> - 21.4.19-3
 - Build without -fstack-protector by default for now (#183643).
 


--- menubar-games.patch DELETED ---


--- xemacs-21.4.10-find-paths-pkgdir.patch DELETED ---


--- xemacs-21.4.12-find-paths-libexec-lib64.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr  4 19:18:07 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Tue,  4 Apr 2006 12:18:07 -0700
Subject: fedora-security/audit fc4,1.186,1.187 fc5,1.99,1.100
Message-ID: <200604041918.k34JI7AX029466@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29446

Modified Files:
	fc4 fc5 
Log Message:
Note a new OOo CVE id.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -r1.186 -r1.187
--- fc4	4 Apr 2006 12:36:47 -0000	1.186
+++ fc4	4 Apr 2006 19:18:05 -0000	1.187
@@ -1447,6 +1447,7 @@
 
 older, happened to deal with at same time:
 
+CVE-2002-2210 ignore (openoffice) binary install only (not rpm install)
 CVE-2002-2204 ignore (rpm) by design
 CVE-2002-2196 version (samba, fixed 2.2.5)
 CVE-2002-2185 version (kernel, fixed 2.6.15) [since FEODRA-2006-077]


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- fc5	4 Apr 2006 12:36:47 -0000	1.99
+++ fc5	4 Apr 2006 19:18:05 -0000	1.100
@@ -1443,6 +1443,7 @@
 
 older, happened to deal with at same time:
 
+CVE-2002-2210 ignore (openoffice) binary install only (not rpm install)
 CVE-2002-2204 ignore (rpm) by design
 CVE-2002-2196 version (samba, fixed 2.2.5)
 CVE-2002-2185 version (kernel, fixed 2.6.15)



From fedora-extras-commits at redhat.com  Tue Apr  4 19:39:43 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  4 Apr 2006 12:39:43 -0700
Subject: rpms/k3b-extras/devel k3b-extras.spec,1.2,1.3
Message-ID: <200604041939.k34Jdjd2029601@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/k3b-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29584

Modified Files:
	k3b-extras.spec 
Log Message:
* Tue Apr 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.12.14-4
- Conflicts: k3b-extras-nonfree < 0.12.14-2



Index: k3b-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/k3b-extras/devel/k3b-extras.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- k3b-extras.spec	1 Apr 2006 23:57:38 -0000	1.2
+++ k3b-extras.spec	4 Apr 2006 19:39:43 -0000	1.3
@@ -2,7 +2,7 @@
 Name:           k3b-extras
 Summary:        Free codec plugins for k3b
 Version:        0.12.14
-Release:        2%{?dist}
+Release:        4%{?dist}
 
 Group:          Applications/Multimedia
 License:        GPL
@@ -20,6 +20,9 @@
 # It already Requires: libk3b.so.2 libk3bdevice.so.2, isn't that enough?  -- Rex
 Requires:       k3b >= 0.12 
 
+# older versions contained sndfile_decoder
+Conflicts: k3b-extras-nonfree < 0.12.14-2
+
 %description
 Free decoder/encoder plugins for k3b, including:
 musepack decoder (libmpcdec)
@@ -68,6 +71,9 @@
 
 
 %changelog
+* Tue Apr 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.12.14-4
+- Conflicts: k3b-extras-nonfree < 0.12.14-2
+
 * Sat Apr 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.12.14-2
 - drop extraneous BR: taglib-devel, libmusicbrainz-devel
 - Requires: k3b >= 0.12



From fedora-extras-commits at redhat.com  Tue Apr  4 19:49:45 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  4 Apr 2006 12:49:45 -0700
Subject: rpms/k3b-extras/FC-5 k3b-extras.spec,1.2,1.3
Message-ID: <200604041949.k34Jnmkw029680@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/k3b-extras/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29663

Modified Files:
	k3b-extras.spec 
Log Message:
* Tue Apr 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.12.14-4
- Conflicts: k3b-extras-nonfree < 0.12.14-2



Index: k3b-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/k3b-extras/FC-5/k3b-extras.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- k3b-extras.spec	1 Apr 2006 23:57:38 -0000	1.2
+++ k3b-extras.spec	4 Apr 2006 19:49:45 -0000	1.3
@@ -2,7 +2,7 @@
 Name:           k3b-extras
 Summary:        Free codec plugins for k3b
 Version:        0.12.14
-Release:        2%{?dist}
+Release:        4%{?dist}
 
 Group:          Applications/Multimedia
 License:        GPL
@@ -20,6 +20,9 @@
 # It already Requires: libk3b.so.2 libk3bdevice.so.2, isn't that enough?  -- Rex
 Requires:       k3b >= 0.12 
 
+# older versions contained sndfile_decoder
+Conflicts: k3b-extras-nonfree < 0.12.14-2
+
 %description
 Free decoder/encoder plugins for k3b, including:
 musepack decoder (libmpcdec)
@@ -68,6 +71,9 @@
 
 
 %changelog
+* Tue Apr 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.12.14-4
+- Conflicts: k3b-extras-nonfree < 0.12.14-2
+
 * Sat Apr 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.12.14-2
 - drop extraneous BR: taglib-devel, libmusicbrainz-devel
 - Requires: k3b >= 0.12



From fedora-extras-commits at redhat.com  Tue Apr  4 19:51:33 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue,  4 Apr 2006 12:51:33 -0700
Subject: rpms/k3b-extras/FC-4 k3b-extras.spec,1.2,1.3
Message-ID: <200604041951.k34JpZJ6029742@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/k3b-extras/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29725

Modified Files:
	k3b-extras.spec 
Log Message:
* Tue Apr 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.12.14-4
- Conflicts: k3b-extras-nonfree < 0.12.14-2



Index: k3b-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/k3b-extras/FC-4/k3b-extras.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- k3b-extras.spec	1 Apr 2006 23:57:38 -0000	1.2
+++ k3b-extras.spec	4 Apr 2006 19:51:33 -0000	1.3
@@ -2,7 +2,7 @@
 Name:           k3b-extras
 Summary:        Free codec plugins for k3b
 Version:        0.12.14
-Release:        2%{?dist}
+Release:        4%{?dist}
 
 Group:          Applications/Multimedia
 License:        GPL
@@ -20,6 +20,9 @@
 # It already Requires: libk3b.so.2 libk3bdevice.so.2, isn't that enough?  -- Rex
 Requires:       k3b >= 0.12 
 
+# older versions contained sndfile_decoder
+Conflicts: k3b-extras-nonfree < 0.12.14-2
+
 %description
 Free decoder/encoder plugins for k3b, including:
 musepack decoder (libmpcdec)
@@ -68,6 +71,9 @@
 
 
 %changelog
+* Tue Apr 04 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.12.14-4
+- Conflicts: k3b-extras-nonfree < 0.12.14-2
+
 * Sat Apr 01 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.12.14-2
 - drop extraneous BR: taglib-devel, libmusicbrainz-devel
 - Requires: k3b >= 0.12



From fedora-extras-commits at redhat.com  Tue Apr  4 20:03:39 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Tue,  4 Apr 2006 13:03:39 -0700
Subject: rpms/exim/devel exim-4.61-c-before-d.patch, NONE, 1.1 .cvsignore,
	1.8, 1.9 exim.spec, 1.16, 1.17 sources, 1.8,
	1.9 exim-4.60-mon-overflow.patch, 1.1, NONE
Message-ID: <200604042003.k34K3fqE031844@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/exim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31820

Modified Files:
	.cvsignore exim.spec sources 
Added Files:
	exim-4.61-c-before-d.patch 
Removed Files:
	exim-4.60-mon-overflow.patch 
Log Message:
4.61

exim-4.61-c-before-d.patch:

--- NEW FILE exim-4.61-c-before-d.patch ---
Index: src/acl.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/acl.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- src/acl.c	6 Mar 2006 16:05:12 -0000	1.57
+++ src/acl.c	4 Apr 2006 17:05:45 -0000	1.58
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/acl.c,v 1.57 2006/03/06 16:05:12 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/acl.c,v 1.58 2006/04/04 17:05:45 fanf2 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -202,8 +202,8 @@ at the outer level. In the other cases, 
 checking functions. */
 
 static uschar cond_expand_at_top[] = {
-  TRUE,    /* add_header */
   TRUE,    /* acl */
+  TRUE,    /* add_header */
   FALSE,   /* authenticated */
 #ifdef EXPERIMENTAL_BRIGHTMAIL
   TRUE,    /* bmi_optin */
@@ -260,8 +260,8 @@ static uschar cond_expand_at_top[] = {
 /* Flags to identify the modifiers */
 
 static uschar cond_modifiers[] = {
-  TRUE,    /* add_header */
   FALSE,   /* acl */
+  TRUE,    /* add_header */
   FALSE,   /* authenticated */
 #ifdef EXPERIMENTAL_BRIGHTMAIL
   TRUE,    /* bmi_optin */


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/exim/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	29 Nov 2005 11:41:06 -0000	1.8
+++ .cvsignore	4 Apr 2006 20:03:39 -0000	1.9
@@ -1,2 +1,2 @@
 sa-exim-4.2.tar.gz
-exim-4.60.tar.bz2
+exim-4.61.tar.bz2


Index: exim.spec
===================================================================
RCS file: /cvs/extras/rpms/exim/devel/exim.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- exim.spec	23 Mar 2006 12:28:38 -0000	1.16
+++ exim.spec	4 Apr 2006 20:03:39 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: The exim mail transfer agent
 Name: exim
-Version: 4.60
-Release: 5%{?dist}
+Version: 4.61
+Release: 1%{?dist}
 License: GPL
 Url: http://www.exim.org/
 Group: System Environment/Daemons
@@ -25,7 +25,7 @@
 Patch13: exim-4.43-pamconfig.patch
 Patch14: exim-4.50-spamdconf.patch
 Patch15: exim-4.52-dynamic-pcre.patch
-Patch16: exim-4.60-mon-overflow.patch
+Patch16: exim-4.61-c-before-d.patch
 
 Requires: /etc/aliases
 BuildRequires: db4-devel openssl-devel openldap-devel pam-devel
@@ -80,7 +80,7 @@
 %patch13 -p1 -b .pam
 %patch14 -p1 -b .spamd
 %patch15 -p1 -b .pcre
-%patch16 -p1
+%patch16 -p0
 
 %build
 %ifnarch s390 s390x
@@ -289,6 +289,9 @@
 %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO}
 
 %changelog
+* Tue Apr  4 2006 David Woodhouse <dwmw2 at redhat.com> 4.61-1
+- Update to 4.61
+
 * Thu Mar 23 2006 David Woodhouse <dwmw2 at redhat.com> 4.60-5
 - Fix eximon buffer overflow (#186303)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/exim/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	29 Nov 2005 11:41:06 -0000	1.8
+++ sources	4 Apr 2006 20:03:39 -0000	1.9
@@ -1,2 +1,2 @@
 ad76f73c6b3d01caa88078e3e622745a  sa-exim-4.2.tar.gz
-eed3c8fc393cf7ccc9c1079b28516128  exim-4.60.tar.bz2
+f6bbf99a6f63c0f5045a1779e7e810c4  exim-4.61.tar.bz2


--- exim-4.60-mon-overflow.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr  4 20:05:58 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Tue,  4 Apr 2006 13:05:58 -0700
Subject: rpms/exim/FC-5 exim-4.61-c-before-d.patch, NONE, 1.1 .cvsignore, 1.8,
	1.9 exim.spec, 1.16, 1.17 sources, 1.8,
	1.9 exim-4.60-mon-overflow.patch, 1.1, NONE
Message-ID: <200604042006.k34K60Ow031926@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/exim/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31902

Modified Files:
	.cvsignore exim.spec sources 
Added Files:
	exim-4.61-c-before-d.patch 
Removed Files:
	exim-4.60-mon-overflow.patch 
Log Message:
4.61

exim-4.61-c-before-d.patch:

--- NEW FILE exim-4.61-c-before-d.patch ---
Index: src/acl.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/acl.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- src/acl.c	6 Mar 2006 16:05:12 -0000	1.57
+++ src/acl.c	4 Apr 2006 17:05:45 -0000	1.58
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/acl.c,v 1.57 2006/03/06 16:05:12 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/acl.c,v 1.58 2006/04/04 17:05:45 fanf2 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -202,8 +202,8 @@ at the outer level. In the other cases, 
 checking functions. */
 
 static uschar cond_expand_at_top[] = {
-  TRUE,    /* add_header */
   TRUE,    /* acl */
+  TRUE,    /* add_header */
   FALSE,   /* authenticated */
 #ifdef EXPERIMENTAL_BRIGHTMAIL
   TRUE,    /* bmi_optin */
@@ -260,8 +260,8 @@ static uschar cond_expand_at_top[] = {
 /* Flags to identify the modifiers */
 
 static uschar cond_modifiers[] = {
-  TRUE,    /* add_header */
   FALSE,   /* acl */
+  TRUE,    /* add_header */
   FALSE,   /* authenticated */
 #ifdef EXPERIMENTAL_BRIGHTMAIL
   TRUE,    /* bmi_optin */


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/exim/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	29 Nov 2005 11:41:06 -0000	1.8
+++ .cvsignore	4 Apr 2006 20:05:57 -0000	1.9
@@ -1,2 +1,2 @@
 sa-exim-4.2.tar.gz
-exim-4.60.tar.bz2
+exim-4.61.tar.bz2


Index: exim.spec
===================================================================
RCS file: /cvs/extras/rpms/exim/FC-5/exim.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- exim.spec	23 Mar 2006 12:27:47 -0000	1.16
+++ exim.spec	4 Apr 2006 20:05:57 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: The exim mail transfer agent
 Name: exim
-Version: 4.60
-Release: 5%{?dist}
+Version: 4.61
+Release: 1%{?dist}
 License: GPL
 Url: http://www.exim.org/
 Group: System Environment/Daemons
@@ -25,7 +25,7 @@
 Patch13: exim-4.43-pamconfig.patch
 Patch14: exim-4.50-spamdconf.patch
 Patch15: exim-4.52-dynamic-pcre.patch
-Patch16: exim-4.60-mon-overflow.patch
+Patch16: exim-4.61-c-before-d.patch
 
 Requires: /etc/aliases
 BuildRequires: db4-devel openssl-devel openldap-devel pam-devel
@@ -80,7 +80,7 @@
 %patch13 -p1 -b .pam
 %patch14 -p1 -b .spamd
 %patch15 -p1 -b .pcre
-%patch16 -p1
+%patch16 -p0
 
 %build
 %ifnarch s390 s390x
@@ -289,6 +289,9 @@
 %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO}
 
 %changelog
+* Tue Apr  4 2006 David Woodhouse <dwmw2 at redhat.com> 4.61-1
+- Update to 4.61
+
 * Thu Mar 23 2006 David Woodhouse <dwmw2 at redhat.com> 4.60-5
 - Fix eximon buffer overflow (#186303)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/exim/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	29 Nov 2005 11:41:06 -0000	1.8
+++ sources	4 Apr 2006 20:05:57 -0000	1.9
@@ -1,2 +1,2 @@
 ad76f73c6b3d01caa88078e3e622745a  sa-exim-4.2.tar.gz
-eed3c8fc393cf7ccc9c1079b28516128  exim-4.60.tar.bz2
+f6bbf99a6f63c0f5045a1779e7e810c4  exim-4.61.tar.bz2


--- exim-4.60-mon-overflow.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr  4 20:18:14 2006
From: fedora-extras-commits at redhat.com (Elliot Lee (sopwith))
Date: Tue,  4 Apr 2006 13:18:14 -0700
Subject: CVSROOT avail, 1.11, 1.12 config, 1.3, 1.4 loginfo, 1.11,
	1.12 modules, 1.3, 1.4
Message-ID: <200604042018.k34KIEaR032640@cvs-int.fedora.redhat.com>

Author: sopwith

Update of /cvs/eclipse/CVSROOT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32617

Modified Files:
	avail config loginfo modules 
Log Message:
misc tweaks


Index: avail
===================================================================
RCS file: /cvs/eclipse/CVSROOT/avail,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- avail	17 Aug 2005 13:56:54 -0000	1.11
+++ avail	4 Apr 2006 20:18:12 -0000	1.12
@@ -13,6 +13,6 @@
 # Lock down the CVSROOT directory so ACLs make sense
 unavail | | CVSROOT
 # Access to all files to policy setters
-avail | notting,sopwith,wtogami,katzj | CVSROOT
+avail | ifoox,notting,sopwith,wtogami,katzj | CVSROOT
 # trusted developers that can add modules
 avail | | CVSROOT/modules


Index: config
===================================================================
RCS file: /cvs/eclipse/CVSROOT/config,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- config	13 Jul 2005 15:47:14 -0000	1.3
+++ config	4 Apr 2006 20:18:12 -0000	1.4
@@ -2,7 +2,7 @@
 #SystemAuth=no
 
 # Put CVS lock files in this directory rather than directly in the repository.
-LockDir=/var/lock/cvs/devel
+LockDir=/var/lock/cvs/eclipse
 
 # Set `TopLevelAdmin' to `yes' to create a CVS directory at the top
 # level of the new working directory when using the `cvs checkout'


Index: loginfo
===================================================================
RCS file: /cvs/eclipse/CVSROOT/loginfo,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- loginfo	13 Jul 2005 15:47:14 -0000	1.11
+++ loginfo	4 Apr 2006 20:18:12 -0000	1.12
@@ -26,5 +26,5 @@
 # or
 #DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog
 
-ALL	$CVSROOT/CVSROOT/syncmail %{sVv} cvsextras at fedora.redhat.com
+ALL	$CVSROOT/CVSROOT/syncmail %{sVv} cvseclipse at fedora.redhat.com
 ALL /cvs/extras/CVSROOT/dolog.pl -r /cvs/devel localdelivery at cvs-int.fedora.redhat.com


Index: modules
===================================================================
RCS file: /cvs/eclipse/CVSROOT/modules,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- modules	13 Jul 2005 15:47:38 -0000	1.3
+++ modules	4 Apr 2006 20:18:12 -0000	1.4
@@ -25,4 +25,4 @@
 # can be useful for creating a module that consists of many directories
 # spread out over the entire source repository.
 
-devel .
+eclipse .



From fedora-extras-commits at redhat.com  Tue Apr  4 20:27:21 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Tue,  4 Apr 2006 13:27:21 -0700
Subject: rpms/exim/FC-4 exim-4.61-c-before-d.patch, NONE, 1.1 .cvsignore, 1.6,
	1.7 exim.spec, 1.11, 1.12 sources, 1.7,
	1.8 exim-4.60-mon-overflow.patch, 1.1, NONE
Message-ID: <200604042027.k34KRNKV032693@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/exim/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32669

Modified Files:
	.cvsignore exim.spec sources 
Added Files:
	exim-4.61-c-before-d.patch 
Removed Files:
	exim-4.60-mon-overflow.patch 
Log Message:
4.61

exim-4.61-c-before-d.patch:

--- NEW FILE exim-4.61-c-before-d.patch ---
Index: src/acl.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/acl.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- src/acl.c	6 Mar 2006 16:05:12 -0000	1.57
+++ src/acl.c	4 Apr 2006 17:05:45 -0000	1.58
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/acl.c,v 1.57 2006/03/06 16:05:12 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/acl.c,v 1.58 2006/04/04 17:05:45 fanf2 Exp $ */
 
 /*************************************************
 *     Exim - an Internet mail transport agent    *
@@ -202,8 +202,8 @@ at the outer level. In the other cases, 
 checking functions. */
 
 static uschar cond_expand_at_top[] = {
-  TRUE,    /* add_header */
   TRUE,    /* acl */
+  TRUE,    /* add_header */
   FALSE,   /* authenticated */
 #ifdef EXPERIMENTAL_BRIGHTMAIL
   TRUE,    /* bmi_optin */
@@ -260,8 +260,8 @@ static uschar cond_expand_at_top[] = {
 /* Flags to identify the modifiers */
 
 static uschar cond_modifiers[] = {
-  TRUE,    /* add_header */
   FALSE,   /* acl */
+  TRUE,    /* add_header */
   FALSE,   /* authenticated */
 #ifdef EXPERIMENTAL_BRIGHTMAIL
   TRUE,    /* bmi_optin */


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/exim/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	5 Oct 2005 10:13:18 -0000	1.6
+++ .cvsignore	4 Apr 2006 20:27:21 -0000	1.7
@@ -1,2 +1,2 @@
 sa-exim-4.2.tar.gz
-exim-4.54.tar.bz2
+exim-4.61.tar.bz2


Index: exim.spec
===================================================================
RCS file: /cvs/extras/rpms/exim/FC-4/exim.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- exim.spec	23 Mar 2006 12:26:42 -0000	1.11
+++ exim.spec	4 Apr 2006 20:27:21 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: The exim mail transfer agent
 Name: exim
-Version: 4.60
-Release: 5%{?dist}
+Version: 4.61
+Release: 1%{?dist}
 License: GPL
 Url: http://www.exim.org/
 Group: System Environment/Daemons
@@ -25,7 +25,7 @@
 Patch13: exim-4.43-pamconfig.patch
 Patch14: exim-4.50-spamdconf.patch
 Patch15: exim-4.52-dynamic-pcre.patch
-Patch16: exim-4.60-mon-overflow.patch
+Patch16: exim-4.61-c-before-d.patch
 
 Requires: /etc/aliases
 BuildRequires: db4-devel openssl-devel openldap-devel pam-devel
@@ -79,7 +79,7 @@
 %patch13 -p1 -b .pam
 %patch14 -p1 -b .spamd
 %patch15 -p1 -b .pcre
-%patch16 -p1
+%patch16 -p0
 
 %build
 %ifnarch s390 s390x
@@ -288,6 +288,9 @@
 %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO}
 
 %changelog
+* Tue Apr  4 2006 David Woodhouse <dwmw2 at redhat.com> 4.61-1
+- Update to 4.61
+
 * Thu Mar 23 2006 David Woodhouse <dwmw2 at redhat.com> 4.60-5
 - Fix eximon buffer overflow (#186303)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/exim/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	19 Mar 2006 11:57:24 -0000	1.7
+++ sources	4 Apr 2006 20:27:21 -0000	1.8
@@ -1,2 +1,2 @@
 ad76f73c6b3d01caa88078e3e622745a  sa-exim-4.2.tar.gz
-eed3c8fc393cf7ccc9c1079b28516128  exim-4.60.tar.bz2
+f6bbf99a6f63c0f5045a1779e7e810c4  exim-4.61.tar.bz2


--- exim-4.60-mon-overflow.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr  4 20:38:45 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Tue,  4 Apr 2006 13:38:45 -0700
Subject: rpms/exim-doc/FC-5 .cvsignore, 1.3, 1.4 exim-doc.spec, 1.2,
	1.3 sources, 1.4, 1.5
Message-ID: <200604042038.k34Kcl9P000307@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/exim-doc/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32754

Modified Files:
	.cvsignore exim-doc.spec sources 
Log Message:
4.61


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/exim-doc/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Nov 2005 11:35:29 -0000	1.3
+++ .cvsignore	4 Apr 2006 20:38:45 -0000	1.4
@@ -1,6 +1,6 @@
 FAQ-html-20050415.tar.bz2
 config.samples-20050415.tar.bz2
-exim-html-4.60.tar.bz2
-exim-pdf-4.60.tar.bz2
-exim-postscript-4.60.tar.bz2
-exim-texinfo-4.60.tar.bz2
+exim-html-4.61.tar.bz2
+exim-pdf-4.61.tar.bz2
+exim-postscript-4.61.tar.bz2
+exim-texinfo-4.61.tar.bz2


Index: exim-doc.spec
===================================================================
RCS file: /cvs/extras/rpms/exim-doc/FC-5/exim-doc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- exim-doc.spec	29 Nov 2005 11:35:29 -0000	1.2
+++ exim-doc.spec	4 Apr 2006 20:38:45 -0000	1.3
@@ -1,6 +1,6 @@
 Summary: Documentation for the exim mail transfer agent
 Name: exim-doc
-Version: 4.60
+Version: 4.61
 Release: 1
 License: GPL
 Url: http://www.exim.org/
@@ -45,6 +45,9 @@
 %doc faq html ps pdf texinfo config.samples
 
 %changelog
+* Tue Apr  4 2006 David Woodhouse <dwmw2 at redhat.com> 4.61-1
+- Update to 4.61
+
 * Tue Nov 29 2005 David Woodhouse <dwmw2 at redhat.com> 4.60-1
 - Update to 4.60
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/exim-doc/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Nov 2005 11:35:29 -0000	1.4
+++ sources	4 Apr 2006 20:38:45 -0000	1.5
@@ -1,6 +1,6 @@
 ecceef7c8d1a352caf6c2992a6f4cb69  FAQ-html-20050415.tar.bz2
 4b93321938a800caa6127c48ad60a42b  config.samples-20050415.tar.bz2
-4c49f68d0b3dbff8f81db3e6b212c961  exim-html-4.60.tar.bz2
-eb2b6536e42e476240686de8c86a40f3  exim-pdf-4.60.tar.bz2
-99b5cd2874f083003ddb8e56dc4ba45d  exim-postscript-4.60.tar.bz2
-ba88e4814472be8de8deed36ec80877a  exim-texinfo-4.60.tar.bz2
+77d042dad6b4ebcb757ec2b02a7761f8  exim-html-4.61.tar.bz2
+5ac27708c9aef892f199e9b769d15300  exim-pdf-4.61.tar.bz2
+84dc0c3154a432bfea2afc59c46000ce  exim-postscript-4.61.tar.bz2
+f86c26fda8871c72892b3ff586677310  exim-texinfo-4.61.tar.bz2



From fedora-extras-commits at redhat.com  Tue Apr  4 20:39:10 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Tue,  4 Apr 2006 13:39:10 -0700
Subject: rpms/exim-doc/FC-5 exim-doc.spec,1.3,1.4
Message-ID: <200604042039.k34KdCXT000328@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/exim-doc/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv311

Modified Files:
	exim-doc.spec 
Log Message:
dist tag


Index: exim-doc.spec
===================================================================
RCS file: /cvs/extras/rpms/exim-doc/FC-5/exim-doc.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- exim-doc.spec	4 Apr 2006 20:38:45 -0000	1.3
+++ exim-doc.spec	4 Apr 2006 20:39:10 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Documentation for the exim mail transfer agent
 Name: exim-doc
 Version: 4.61
-Release: 1
+Release: 1%{?dist}
 License: GPL
 Url: http://www.exim.org/
 Group: Documentation



From fedora-extras-commits at redhat.com  Tue Apr  4 20:40:01 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Tue,  4 Apr 2006 13:40:01 -0700
Subject: rpms/exim-doc/devel .cvsignore, 1.3, 1.4 exim-doc.spec, 1.2,
	1.3 sources, 1.4, 1.5
Message-ID: <200604042040.k34Ke34i000386@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/exim-doc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv365

Modified Files:
	.cvsignore exim-doc.spec sources 
Log Message:
4.61


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/exim-doc/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Nov 2005 11:35:29 -0000	1.3
+++ .cvsignore	4 Apr 2006 20:40:01 -0000	1.4
@@ -1,6 +1,6 @@
 FAQ-html-20050415.tar.bz2
 config.samples-20050415.tar.bz2
-exim-html-4.60.tar.bz2
-exim-pdf-4.60.tar.bz2
-exim-postscript-4.60.tar.bz2
-exim-texinfo-4.60.tar.bz2
+exim-html-4.61.tar.bz2
+exim-pdf-4.61.tar.bz2
+exim-postscript-4.61.tar.bz2
+exim-texinfo-4.61.tar.bz2


Index: exim-doc.spec
===================================================================
RCS file: /cvs/extras/rpms/exim-doc/devel/exim-doc.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- exim-doc.spec	29 Nov 2005 11:35:29 -0000	1.2
+++ exim-doc.spec	4 Apr 2006 20:40:01 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Documentation for the exim mail transfer agent
 Name: exim-doc
-Version: 4.60
-Release: 1
+Version: 4.61
+Release: 1%{?dist}
 License: GPL
 Url: http://www.exim.org/
 Group: Documentation
@@ -45,6 +45,9 @@
 %doc faq html ps pdf texinfo config.samples
 
 %changelog
+* Tue Apr  4 2006 David Woodhouse <dwmw2 at redhat.com> 4.61-1
+- Update to 4.61
+
 * Tue Nov 29 2005 David Woodhouse <dwmw2 at redhat.com> 4.60-1
 - Update to 4.60
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/exim-doc/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	29 Nov 2005 11:35:29 -0000	1.4
+++ sources	4 Apr 2006 20:40:01 -0000	1.5
@@ -1,6 +1,6 @@
 ecceef7c8d1a352caf6c2992a6f4cb69  FAQ-html-20050415.tar.bz2
 4b93321938a800caa6127c48ad60a42b  config.samples-20050415.tar.bz2
-4c49f68d0b3dbff8f81db3e6b212c961  exim-html-4.60.tar.bz2
-eb2b6536e42e476240686de8c86a40f3  exim-pdf-4.60.tar.bz2
-99b5cd2874f083003ddb8e56dc4ba45d  exim-postscript-4.60.tar.bz2
-ba88e4814472be8de8deed36ec80877a  exim-texinfo-4.60.tar.bz2
+77d042dad6b4ebcb757ec2b02a7761f8  exim-html-4.61.tar.bz2
+5ac27708c9aef892f199e9b769d15300  exim-pdf-4.61.tar.bz2
+84dc0c3154a432bfea2afc59c46000ce  exim-postscript-4.61.tar.bz2
+f86c26fda8871c72892b3ff586677310  exim-texinfo-4.61.tar.bz2



From fedora-extras-commits at redhat.com  Tue Apr  4 20:40:15 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Tue,  4 Apr 2006 13:40:15 -0700
Subject: rpms/exim-doc/FC-4 .cvsignore, 1.2, 1.3 exim-doc.spec, 1.1,
	1.2 sources, 1.3, 1.4
Message-ID: <200604042040.k34KeHXp000447@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/exim-doc/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv426

Modified Files:
	.cvsignore exim-doc.spec sources 
Log Message:
4.61


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/exim-doc/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	19 Apr 2005 03:57:27 -0000	1.2
+++ .cvsignore	4 Apr 2006 20:40:15 -0000	1.3
@@ -1,6 +1,6 @@
 FAQ-html-20050415.tar.bz2
 config.samples-20050415.tar.bz2
-exim-html-4.50.tar.bz2
-exim-pdf-4.50.tar.bz2
-exim-postscript-4.50.tar.bz2
-exim-texinfo-4.50.tar.bz2
+exim-html-4.61.tar.bz2
+exim-pdf-4.61.tar.bz2
+exim-postscript-4.61.tar.bz2
+exim-texinfo-4.61.tar.bz2


Index: exim-doc.spec
===================================================================
RCS file: /cvs/extras/rpms/exim-doc/FC-4/exim-doc.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- exim-doc.spec	19 Apr 2005 02:39:21 -0000	1.1
+++ exim-doc.spec	4 Apr 2006 20:40:15 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Documentation for the exim mail transfer agent
 Name: exim-doc
-Version: 4.50
-Release: 1
+Version: 4.61
+Release: 1%{?dist}
 License: GPL
 Url: http://www.exim.org/
 Group: Documentation
@@ -45,5 +45,11 @@
 %doc faq html ps pdf texinfo config.samples
 
 %changelog
+* Tue Apr  4 2006 David Woodhouse <dwmw2 at redhat.com> 4.61-1
+- Update to 4.61
+
+* Tue Nov 29 2005 David Woodhouse <dwmw2 at redhat.com> 4.60-1
+- Update to 4.60
+
 * Tue Feb 22 2005 David Woodhouse <dwmw2 at redhat.com> 4.50-1
 - Move exim-doc into a separate package


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/exim-doc/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Apr 2005 03:57:27 -0000	1.3
+++ sources	4 Apr 2006 20:40:15 -0000	1.4
@@ -1,6 +1,6 @@
 ecceef7c8d1a352caf6c2992a6f4cb69  FAQ-html-20050415.tar.bz2
 4b93321938a800caa6127c48ad60a42b  config.samples-20050415.tar.bz2
-cf0fdf161523646716c734135260f5b3  exim-html-4.50.tar.bz2
-edfb7348c849a4981d86dfca41800960  exim-pdf-4.50.tar.bz2
-f34025260098e1f37e9bc3146d6e13c7  exim-postscript-4.50.tar.bz2
-a12993436e9943083e3ce5b76cf96b11  exim-texinfo-4.50.tar.bz2
+77d042dad6b4ebcb757ec2b02a7761f8  exim-html-4.61.tar.bz2
+5ac27708c9aef892f199e9b769d15300  exim-pdf-4.61.tar.bz2
+84dc0c3154a432bfea2afc59c46000ce  exim-postscript-4.61.tar.bz2
+f86c26fda8871c72892b3ff586677310  exim-texinfo-4.61.tar.bz2



From fedora-extras-commits at redhat.com  Fri Apr  7 06:19:07 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu,  6 Apr 2006 23:19:07 -0700
Subject: rpms/nessus-core - New directory
Message-ID: <200604070619.k376J9qx004659@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/nessus-core
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4638/nessus-core

Log Message:
Directory /cvs/extras/rpms/nessus-core added to the repository




From fedora-extras-commits at redhat.com  Fri Apr  7 06:19:08 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu,  6 Apr 2006 23:19:08 -0700
Subject: rpms/nessus-core/devel - New directory
Message-ID: <200604070619.k376JAlR004662@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/nessus-core/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4638/nessus-core/devel

Log Message:
Directory /cvs/extras/rpms/nessus-core/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Apr  7 06:19:30 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu,  6 Apr 2006 23:19:30 -0700
Subject: rpms/nessus-core/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604070619.k376JWAE004719@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/nessus-core/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4683/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module nessus-core


--- 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 Apr  7 06:19:30 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu,  6 Apr 2006 23:19:30 -0700
Subject: rpms/nessus-core Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604070619.k376JWOQ004716@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/nessus-core
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4683

Added Files:
	Makefile import.log 
Log Message:
Setup of module nessus-core


--- NEW FILE Makefile ---
# Top level Makefile for module nessus-core
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Apr  7 06:21:25 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu,  6 Apr 2006 23:21:25 -0700
Subject: rpms/nessus-core import.log,1.1,1.2
Message-ID: <200604070621.k376LRs1004866@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/nessus-core
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4819

Modified Files:
	import.log 
Log Message:
auto-import nessus-core-2.2.6-3 on branch devel from nessus-core-2.2.6-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/nessus-core/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Apr 2006 06:19:30 -0000	1.1
+++ import.log	7 Apr 2006 06:21:25 -0000	1.2
@@ -0,0 +1 @@
+nessus-core-2_2_6-3:HEAD:nessus-core-2.2.6-3.src.rpm:1144390874



From fedora-extras-commits at redhat.com  Fri Apr  7 06:21:26 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Thu,  6 Apr 2006 23:21:26 -0700
Subject: rpms/nessus-core/devel nessus-core-2.2.4.Makefile.patch, NONE,
	1.1 nessus-core-2.2.4.config.h.in.patch, NONE,
	1.1 nessus-core-2.2.4.configure.in.patch, NONE,
	1.1 nessus-core-2.2.4.configure.patch, NONE,
	1.1 nessus-core-2.2.4.gd.patch, NONE,
	1.1 nessus-core-2.2.4.nessus-adduser.in.patch, NONE,
	1.1 nessus-core-2.2.4.nessus-mkcert.patch, NONE,
	1.1 nessus-core-2.2.4.nessus-rmuser.in.patch, NONE,
	1.1 nessus-core-2.2.4.nessus.tmpl.in.patch, NONE,
	1.1 nessus-core-2.2.4.pid.patch, NONE,
	1.1 nessus-core-2.2.4.pki.patch, NONE, 1.1 nessus-core.spec,
	NONE, 1.1 nessus.desktop, NONE, 1.1 nessusd.init, NONE,
	1.1 nessusd.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604070621.k376LS7Y004893@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/nessus-core/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4819/devel

Modified Files:
	.cvsignore sources 
Added Files:
	nessus-core-2.2.4.Makefile.patch 
	nessus-core-2.2.4.config.h.in.patch 
	nessus-core-2.2.4.configure.in.patch 
	nessus-core-2.2.4.configure.patch nessus-core-2.2.4.gd.patch 
	nessus-core-2.2.4.nessus-adduser.in.patch 
	nessus-core-2.2.4.nessus-mkcert.patch 
	nessus-core-2.2.4.nessus-rmuser.in.patch 
	nessus-core-2.2.4.nessus.tmpl.in.patch 
	nessus-core-2.2.4.pid.patch nessus-core-2.2.4.pki.patch 
	nessus-core.spec nessus.desktop nessusd.init nessusd.log 
Log Message:
auto-import nessus-core-2.2.6-3 on branch devel from nessus-core-2.2.6-3.src.rpm

nessus-core-2.2.4.Makefile.patch:

--- NEW FILE nessus-core-2.2.4.Makefile.patch ---
diff -Nrup nessus-core.orig/Makefile nessus-core/Makefile
--- nessus-core.orig/Makefile	2005-03-14 23:33:13.000000000 +0100
+++ nessus-core/Makefile	2005-07-05 19:40:57.000000000 +0200
@@ -34,7 +34,7 @@ install-bin:
 	test -d $(DESTDIR)${localstatedir} || $(INSTALL_DIR) -m 755 $(DESTDIR)${localstatedir}
 	test -d $(DESTDIR)${NESSUSD_STATEDIR} || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR}
 	test -d $(DESTDIR)${NESSUSD_STATEDIR}/users || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR}/users
-	test -d $(DESTDIR)${NESSUSD_STATEDIR}/logs  || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR}/logs
+	test -d $(DESTDIR)${NESSUSD_LOGDIR}  || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_LOGDIR}
 	test -d $(DESTDIR)${NESSUSD_STATEDIR}/tmp || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR}/tmp
 	test -d $(DESTDIR)${NESSUSD_STATEDIR}/jobs  || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_STATEDIR}/jobs
 	test -d $(DESTDIR)${NESSUSD_LOGDIR} || $(INSTALL_DIR) -m 755 $(DESTDIR)${NESSUSD_LOGDIR}

nessus-core-2.2.4.config.h.in.patch:

--- NEW FILE nessus-core-2.2.4.config.h.in.patch ---
--- nessus-core.orig/include/config.h.in	2004-10-07 16:46:32.000000000 +0200
+++ nessus-core/include/config.h.in	2005-07-03 13:10:59.000000000 +0200
@@ -74,9 +74,9 @@
 #define NESSUSD_LOGS     NESSUSD_LOGDIR
 #define NESSUSD_LOGINS   NESSUSD_STATEDIR "/users"
 #define NESSUSD_JOBS	NESSUSD_STATEDIR  "/jobs"
-#define NESSUSD_CERTS	NESSUSD_STATEDIR "/certs"
+#define NESSUSD_CERTS	NESSUSD_PKIDIR "/certs"
 
-#define NESSUSD_CA	NESSUSD_SHAREDSTATEDIR "/CA"
+#define NESSUSD_CA	NESSUSD_PKIDIR "/CA"
 
 
 

nessus-core-2.2.4.configure.in.patch:

--- NEW FILE nessus-core-2.2.4.configure.in.patch ---
--- nessus-core.orig/configure.in	2005-02-08 02:40:42.000000000 +0100
+++ nessus-core/configure.in	2005-07-03 16:43:12.000000000 +0200
@@ -705,14 +705,16 @@
 dnl Final step : substitute what we want to
 
 NESSUSD_CONFDIR='${sysconfdir}'
-NESSUSD_STATEDIR='${localstatedir}/nessus'
+NESSUSD_STATEDIR='${localstatedir}/lib/nessus'
 NESSUSD_SHAREDSTATEDIR='${sharedstatedir}/nessus'
+NESSUSD_PIDDIR='${localstatedir}/run'
+NESSUSD_PKIDIR='${sysconfdir}/pki/nessus'
 NESSUSD_DATADIR='${sysconfdir}/nessus'
 NESSUSD_LIBDIR='${libdir}/nessus'
-NESSUSD_LOGDIR='${localstatedir}/nessus/logs'
+NESSUSD_LOGDIR='${localstatedir}/log/nessus'
 
 NESSUSD_PLUGINS='${NESSUSD_LIBDIR}/plugins'
-NESSUSD_REPORTS='${NESSUSD_LIBDIR}/reports'
+NESSUSD_REPORTS='${NESSUSD_LOGDIR}/reports'
 
  
 # The following directories are now passed into the compile
@@ -721,11 +723,11 @@
 # everything works okay.
 #
 #AC_DEFINE_UNQUOTED(NESSUSD_CONFDIR,   "${sysconfdir}")
-#AC_DEFINE(NESSUSD_STATEDIR,  "${localstatedir}/nessus'")
+#AC_DEFINE(NESSUSD_STATEDIR,  "${localstatedir}/lib/nessus'")
 #AC_DEFINE(NESSUSD_DATADIR,   "'${sysconfdir}/nessus")
 #AC_DEFINE(NESSUSD_LIBDIR,    "${libdir}/nessus")
 #AC_DEFINE(NESSUSD_PLUGINS,   "${libdir}/nessus/plugins")
-#AC_DEFINE(NESSUSD_REPORTS,   "${libdir}/nessus/reports")
+#AC_DEFINE(NESSUSD_REPORTS,   "${localstatedir}/log/nessus/reports")
 man_nessus_1=doc/nessus.1
 man_nessusd_8=doc/nessusd.8
 
@@ -751,6 +753,8 @@
 AC_SUBST(NESSUSD_CONFDIR)
 AC_SUBST(NESSUSD_STATEDIR)
 AC_SUBST(NESSUSD_SHAREDSTATEDIR)
+AC_SUBST(NESSUSD_PIDDIR)
+AC_SUBST(NESSUSD_PKIDIR)
 AC_SUBST(NESSUSD_DATADIR)
 AC_SUBST(NESSUSD_LIBDIR)
 AC_SUBST(NESSUSD_PLUGINS)

nessus-core-2.2.4.configure.patch:

--- NEW FILE nessus-core-2.2.4.configure.patch ---
--- nessus-core.orig/configure	2005-02-08 02:40:42.000000000 +0100
+++ nessus-core/configure	2005-07-03 16:41:03.000000000 +0200
@@ -5671,14 +5671,16 @@
 
 
 NESSUSD_CONFDIR='${sysconfdir}'
-NESSUSD_STATEDIR='${localstatedir}/nessus'
+NESSUSD_STATEDIR='${localstatedir}/lib/nessus'
 NESSUSD_SHAREDSTATEDIR='${sharedstatedir}/nessus'
+NESSUSD_PIDDIR='${localstatedir}/run'
+NESSUSD_PKIDIR='${sysconfdir}/pki/nessus'
 NESSUSD_DATADIR='${sysconfdir}/nessus'
 NESSUSD_LIBDIR='${libdir}/nessus'
-NESSUSD_LOGDIR='${localstatedir}/nessus/logs'
+NESSUSD_LOGDIR='${localstatedir}/log/nessus'
 
 NESSUSD_PLUGINS='${NESSUSD_LIBDIR}/plugins'
-NESSUSD_REPORTS='${NESSUSD_LIBDIR}/reports'
+NESSUSD_REPORTS='${NESSUSD_LOGDIR}/reports'
 
  
 # The following directories are now passed into the compile
@@ -5687,11 +5689,11 @@
 # everything works okay.
 #
 #AC_DEFINE_UNQUOTED(NESSUSD_CONFDIR,   "${sysconfdir}")
-#AC_DEFINE(NESSUSD_STATEDIR,  "${localstatedir}/nessus'")
+#AC_DEFINE(NESSUSD_STATEDIR,  "${localstatedir}/lib/nessus'")
 #AC_DEFINE(NESSUSD_DATADIR,   "'${sysconfdir}/nessus")
 #AC_DEFINE(NESSUSD_LIBDIR,    "${libdir}/nessus")
 #AC_DEFINE(NESSUSD_PLUGINS,   "${libdir}/nessus/plugins")
-#AC_DEFINE(NESSUSD_REPORTS,   "${libdir}/nessus/reports")
+#AC_DEFINE(NESSUSD_REPORTS,   "${localstatedir}/log/nessus/reports")
 man_nessus_1=doc/nessus.1
 man_nessusd_8=doc/nessusd.8
 
@@ -5967,6 +5969,8 @@
 s%@NESSUSD_CONFDIR@%$NESSUSD_CONFDIR%g
 s%@NESSUSD_STATEDIR@%$NESSUSD_STATEDIR%g
 s%@NESSUSD_SHAREDSTATEDIR@%$NESSUSD_SHAREDSTATEDIR%g
+s%@NESSUSD_PIDDIR@%$NESSUSD_PIDDIR%g
+s%@NESSUSD_PKIDIR@%$NESSUSD_PKIDIR%g
 s%@NESSUSD_DATADIR@%$NESSUSD_DATADIR%g
 s%@NESSUSD_LIBDIR@%$NESSUSD_LIBDIR%g
 s%@NESSUSD_PLUGINS@%$NESSUSD_PLUGINS%g

nessus-core-2.2.4.gd.patch:

--- NEW FILE nessus-core-2.2.4.gd.patch ---
diff -ur nessus-core.orig/nessus/gdchart0.94b/makefile nessus-core/nessus/gdchart0.94b/makefile
--- nessus-core.orig/nessus/gdchart0.94b/makefile	2002-09-10 09:32:55.000000000 +0200
+++ nessus-core/nessus/gdchart0.94b/makefile	2005-07-03 16:04:50.000000000 +0200
@@ -1,27 +1,27 @@
 include ../../nessus.tmpl
 GDC_INCL = .
-GD_INCL  = gd1.3
-GD_LIB   = gd1.3
+GD_INCL  = /usr/include
+GD_LIB   = /usr/lib
 IINCL    = $(CFLAGS) `sh ../cflags`
 
 
 
-all: gdc.o gdchart.o price_conv.o gdc_pie.o $(GD_LIB)/libgd.a
+all: gdc.o gdchart.o price_conv.o gdc_pie.o
 
 # compile the samples
-gdc_samp1: gdc.o gdchart.o price_conv.o gdc_samp1.o $(GD_LIB)/libgd.a
+gdc_samp1: gdc.o gdchart.o price_conv.o gdc_samp1.o
 	$(CC) -o gdc_samp1 gdc.o gdchart.o price_conv.o gdc_samp1.o -L$(GD_LIB) -lgd -lm
 
 gdc_samp1.o: $(GDC_INCL)/gdc.h $(GDC_INCL)/gdchart.h gdc_samp1.c
 	$(CC) $(IINCL) -I$(GDC_INCL) -c gdc_samp1.c
 
-gdc_samp2: gdc.o gdchart.o price_conv.o gdc_samp2.o $(GD_LIB)/libgd.a
+gdc_samp2: gdc.o gdchart.o price_conv.o gdc_samp2.o
 	$(CC) $(IINCL) -o gdc_samp2 gdc.o gdchart.o price_conv.o gdc_samp2.o -L$(GD_LIB) -lgd -lm
 
 gdc_samp2.o: $(GDC_INCL)/gdc.h $(GDC_INCL)/gdchart.h gdc_samp2.c
 	$(CC) $(IINCL) -I$(GDC_INCL) -c gdc_samp2.c
 
-gdc_pie_samp: gdc.o gdc_pie.o price_conv.o gdc_pie_samp.o $(GD_LIB)/libgd.a
+gdc_pie_samp: gdc.o gdc_pie.o price_conv.o gdc_pie_samp.o
 	$(CC) $(IINCL) -o gdc_pie_samp gdc.o gdc_pie.o price_conv.o gdc_pie_samp.o -L$(GD_LIB) -lgd -lm
 
 gdc_pie_samp.o: $(GDC_INCL)/gdc.h $(GDC_INCL)/gdcpie.h gdc_pie_samp.c
@@ -40,11 +40,7 @@
 gdchart.o: $(GDC_INCL)/gdc.h $(GDC_INCL)/gdchart.h gdchart.c
 	$(CC) $(IINCL) -I$(GD_INCL) -I$(GDC_INCL) -c gdchart.c
 
-$(GD_LIB)/libgd.a:
-	cd $(GD_LIB) ; $(MAKE) -f Makefile libgd.a
-
 # --- clean ---
 clean:
 	rm -f *.o gdc_samp1 gdc_samp2 gdc_pie_samp
-	cd $(GD_LIB) ; $(MAKE) -f Makefile clean
 
diff -ur nessus-core.orig/nessus/Makefile nessus-core/nessus/Makefile
--- nessus-core.orig/nessus/Makefile	2003-02-22 14:47:43.000000000 +0100
+++ nessus-core/nessus/Makefile	2005-07-03 16:18:55.000000000 +0200
@@ -1,9 +1,9 @@
 include ../nessus.tmpl
 
 GTKLIBS= $(GTKCONFIG_LIBS) $(GLIBCONFIG_LIBS)
-INCLUDE = ${include} $(GTKCONFIG_CFLAGS) $(GLIBCONFIG_CFLAGS) -Igdchart0.94b -Igdchart0.94b/gd1.3
+INCLUDE = ${include} $(GTKCONFIG_CFLAGS) $(GLIBCONFIG_CFLAGS) -Igdchart0.94b
 LIBS = `$(NESSUSCONFIG) --libs` $(X_LIBS) $(X_CFLAGS) $(GTKLIBS) \
-	$(RUN_LIBS) $(C_R_LIB) gdchart0.94b/gd1.3/libgd.a -lm 
+	$(RUN_LIBS) $(C_R_LIB) -lgd -lm 
 
 NESSUS_INCLUDE=`sh ./cflags`	
 

nessus-core-2.2.4.nessus-adduser.in.patch:

--- NEW FILE nessus-core-2.2.4.nessus-adduser.in.patch ---
--- nessus-core.orig/nessus-adduser.in	2004-12-10 20:40:20.000000000 +0100
+++ nessus-core/nessus-adduser.in	2005-07-03 15:13:23.000000000 +0200
@@ -124,7 +124,7 @@
 do
  echo $Xn "Login : $Xc"
  read login
- if [ -d $localstatedir/nessus/users/$login ];
+ if [ -d $localstatedir/lib/nessus/users/$login ];
  then
    echo "This login already exists. Choose another one"
  else
@@ -250,9 +250,7 @@
 #echo "$login:$password" > $TMPDIR/adduser.$$
 	
 
-chmod 0700 "$localstatedir/nessus/"
-mkdir -p "$localstatedir/nessus/users/$login"
-chmod 0700 "$localstatedir/nessus/users/$login"
+mkdir -m 0700 -p "$localstatedir/lib/nessus/users/$login"
 
 
 
@@ -263,14 +261,12 @@
 # Create the auth. dir, which contains the user rules,
 # password, and plugin acl
 #
-mkdir -p "$localstatedir/nessus/users/$login/auth"
-chmod 0700 "$localstatedir/nessus/users/$login/auth"
+mkdir -m 0700 -p "$localstatedir/lib/nessus/users/$login/auth"
 
 #
 # Create the plugins dir, which contains the user plugins
 #
-mkdir -p "$localstatedir/nessus/users/$login/plugins"
-chmod 0700 "$localstatedir/nessus/users/$login/plugins"
+mkdir -m 0700 -p "$localstatedir/lib/nessus/users/$login/plugins"
 
 
 
@@ -282,17 +278,17 @@
 	}
 	SEED=`(echo $SEED; date; df; ls -l; echo $URANDOM) | $MD5CMD | awk '{print $1}'`
 	H=`echo $Xn $SEED$password$Xc | $MD5CMD | awk '{print $1}'`
-	echo $H $SEED > "$localstatedir/nessus/users/$login/auth/hash"
+	echo $H $SEED > "$localstatedir/lib/nessus/users/$login/auth/hash"
     else
-	echo "$password" > "$localstatedir/nessus/users/$login/auth/password"
+	echo "$password" > "$localstatedir/lib/nessus/users/$login/auth/password"
     fi
 elif [ "$auth" = "cert" ]; then
-	echo "$dn" > "$localstatedir/nessus/users/$login/auth/dname"
+	echo "$dn" > "$localstatedir/lib/nessus/users/$login/auth/dname"
 fi
 
 
 
-cp $TMPDIR/nessus-adduser.$$/rules.$$ "$localstatedir/nessus/users/$login/auth/rules"
+cp $TMPDIR/nessus-adduser.$$/rules.$$ "$localstatedir/lib/nessus/users/$login/auth/rules"
 
 
 

nessus-core-2.2.4.nessus-mkcert.patch:

--- NEW FILE nessus-core-2.2.4.nessus-mkcert.patch ---
--- nessus-core.orig/nessus-mkcert-client.in	2004-12-10 20:40:20.000000000 +0100
+++ nessus-core/nessus-mkcert-client.in	2005-07-03 14:31:27.000000000 +0200
@@ -84,8 +84,8 @@
 
 
 
-NESSUSPRIV="$localstatedir/nessus/CA"
-NESSUSPUB="$sharedstatedir/nessus/CA"
+NESSUSPRIV="@NESSUSD_PKIDIR@/private/CA"
+NESSUSPUB="@NESSUSD_PKIDIR@/CA"
 
 while [ ! -d "$NESSUSPRIV" ]; do
     echo_no_nl "Nessus server 'private' directory: "
@@ -126,7 +126,7 @@
 done
 
 if [ "$R" = "y" ]; then
-    USERSDIR=$localstatedir/nessus/users
+    USERSDIR=$localstatedir/lib/nessus/users
     while [ ! -d "$USERSDIR" ]; do
 	echo "$USERSDIR: not a directory"
 	echo_no_nl "Users directory? "
--- nessus-core.orig/nessus-mkcert.in	2004-12-10 20:40:22.000000000 +0100
+++ nessus-core/nessus-mkcert.in	2005-07-03 15:01:34.000000000 +0200
@@ -92,8 +92,8 @@
    exit 1
 esac
      
-NESSUSPRIV="$localstatedir/nessus/CA"
-NESSUSPUB="$sharedstatedir/nessus/CA"
+NESSUSPRIV="@NESSUSD_PKIDIR@/private/CA"
+NESSUSPUB="@NESSUSD_PKIDIR@/CA"
 if [ ! -d "$NESSUSPRIV" ]; then
     mkdir -p "$NESSUSPRIV"
     chmod 0700 "$NESSUSPRIV"

nessus-core-2.2.4.nessus-rmuser.in.patch:

--- NEW FILE nessus-core-2.2.4.nessus-rmuser.in.patch ---
--- nessus-core.orig/nessus-rmuser.in	2005-03-17 23:09:39.000000000 +0100
+++ nessus-core/nessus-rmuser.in	2005-07-03 14:57:03.000000000 +0200
@@ -55,9 +55,9 @@
 	exit 1
 	}
 
-if [ -d "$localstatedir/nessus/users/$login" ];
+if [ -d "$localstatedir/lib/nessus/users/$login" ];
 then
- rm -rf "$localstatedir/nessus/users/$login"
+ rm -rf "$localstatedir/lib/nessus/users/$login"
  echo "user removed."
 else
  echo "This user does not exist"

nessus-core-2.2.4.nessus.tmpl.in.patch:

--- NEW FILE nessus-core-2.2.4.nessus.tmpl.in.patch ---
--- nessus-core.orig/nessus.tmpl.in	2003-01-21 11:52:47.000000000 +0100
+++ nessus-core/nessus.tmpl.in	2005-07-03 13:37:06.000000000 +0200
@@ -46,6 +46,8 @@
 NESSUSD_CONFDIR=@NESSUSD_CONFDIR@
 NESSUSD_STATEDIR=@NESSUSD_STATEDIR@
 NESSUSD_SHAREDSTATEDIR=@NESSUSD_SHAREDSTATEDIR@
+NESSUSD_PIDDIR=@NESSUSD_PIDDIR@
+NESSUSD_PKIDIR=@NESSUSD_PKIDIR@
 NESSUSD_DATADIR=@NESSUSD_DATADIR@
 NESSUSD_LIBDIR=@NESSUSD_LIBDIR@
 NESSUSD_LOGDIR=@NESSUSD_LOGDIR@
@@ -54,7 +56,7 @@
 NESSUSD_PLUGINS=@NESSUSD_PLUGINS@
 NESSUSD_REPORTS=@NESSUSD_REPORTS@
 
-NESSUS_DIRECTORIES="-DNESSUSD_CONFDIR=\"$(NESSUSD_CONFDIR)\"" "-DNESSUSD_STATEDIR=\"$(NESSUSD_STATEDIR)\"" "-DNESSUSD_DATADIR=\"$(NESSUSD_DATADIR)\"" "-DNESSUSD_LIBDIR=\"${NESSUSD_LIBDIR}\"" "-DNESSUSD_PLUGINS=\"${NESSUSD_PLUGINS}\"" "-DNESSUSD_REPORTS=\"${NESSUSD_REPORTS}\"" -DNESSUSD_SHAREDSTATEDIR=\"${NESSUSD_SHAREDSTATEDIR}\" -DNESSUSD_LOGDIR=\"${NESSUSD_LOGDIR}\"
+NESSUS_DIRECTORIES="-DNESSUSD_CONFDIR=\"$(NESSUSD_CONFDIR)\"" "-DNESSUSD_STATEDIR=\"$(NESSUSD_STATEDIR)\"" "-DNESSUSD_DATADIR=\"$(NESSUSD_DATADIR)\"" "-DNESSUSD_LIBDIR=\"${NESSUSD_LIBDIR}\"" "-DNESSUSD_PLUGINS=\"${NESSUSD_PLUGINS}\"" "-DNESSUSD_REPORTS=\"${NESSUSD_REPORTS}\"" -DNESSUSD_SHAREDSTATEDIR=\"${NESSUSD_SHAREDSTATEDIR}\" -DNESSUSD_LOGDIR=\"${NESSUSD_LOGDIR}\" -DNESSUSD_PIDDIR=\"${NESSUSD_PIDDIR}\" -DNESSUSD_PKIDIR=\"${NESSUSD_PKIDIR}\"
 
 #
 # The server / client modes do not make a lot of sense

nessus-core-2.2.4.pid.patch:

--- NEW FILE nessus-core-2.2.4.pid.patch ---
diff -ur nessus-core.orig/nessusd/utils.c nessus-core/nessusd/utils.c
--- nessus-core.orig/nessusd/utils.c	2005-03-21 23:55:19.000000000 +0100
+++ nessus-core/nessusd/utils.c	2005-07-03 16:30:53.000000000 +0200
@@ -322,8 +322,8 @@
 create_pid_file()
 {
  FILE * f;
- char * fname = malloc(strlen(NESSUSD_STATEDIR) + strlen("/nessusd.pid") + 1);
- strcpy(fname, NESSUSD_STATEDIR);
+ char * fname = malloc(strlen(NESSUSD_PIDDIR) + strlen("/nessusd.pid") + 1);
+ strcpy(fname, NESSUSD_PIDDIR);
  strcat(fname, "/nessusd.pid");
  
  f = fopen(fname, "w");
@@ -341,8 +341,8 @@
 void
 delete_pid_file()
 {
- char * fname = malloc(strlen(NESSUSD_STATEDIR) + strlen("/nessusd.pid") + 1);
- strcpy(fname, NESSUSD_STATEDIR);
+ char * fname = malloc(strlen(NESSUSD_PIDDIR) + strlen("/nessusd.pid") + 1);
+ strcpy(fname, NESSUSD_PIDDIR);
  strcat(fname, "/nessusd.pid");
  unlink(fname);
  free(fname);

nessus-core-2.2.4.pki.patch:

--- NEW FILE nessus-core-2.2.4.pki.patch ---
diff -Naurp nessus-core.orig/nessusd/nessus-check-signature.c nessus-core/nessusd/nessus-check-signature.c
--- nessus-core.orig/nessusd/nessus-check-signature.c	2005-03-16 19:50:43.000000000 +0100
+++ nessus-core/nessusd/nessus-check-signature.c	2005-07-06 15:45:42.000000000 +0200
@@ -36,7 +36,7 @@
 int generate_signature(char * filename)
 {
  RSA * rsa = NULL;
- FILE * fp = fopen(NESSUSD_STATEDIR "/nessus_org.priv.pem", "r");
+ FILE * fp = fopen(NESSUSD_PKIDIR "/nessus_org.priv.pem", "r");
  unsigned char  * result;
  int len;
  int i;
@@ -116,7 +116,7 @@ int verify_signature(char * filename, ch
 {
  unsigned char md[SHA_DIGEST_LENGTH+1];
  RSA * rsa = NULL;
- FILE * fp = fopen(NESSUSD_STATEDIR "/nessus_org.pem", "r");
+ FILE * fp = fopen(NESSUSD_PKIDIR "/nessus_org.pem", "r");
 
  char sig[16384];
  unsigned char bin_sig[8192];
@@ -134,7 +134,7 @@ int verify_signature(char * filename, ch
 
  if ( fp == NULL )
  {
-  fprintf(stderr, "Open %s/nessus_org.pem : %s\n", NESSUSD_STATEDIR, strerror(errno));
+  fprintf(stderr, "Open %s/nessus_org.pem : %s\n", NESSUSD_PKIDIR, strerror(errno));
   return -1;
  }
 


--- NEW FILE nessus-core.spec ---
Name:           nessus-core
Version:        2.2.6
Release:        3%{?dist}
Summary:        Network vulnerability scanner

Group:          Applications/System
License:        GPL
URL:            http://www.nessus.org
Source0:        ftp://ftp.nessus.org/pub/nessus/nessus-2.2.6/src/nessus-core-2.2.6.tar.gz
Source1:        nessusd.init
Source2:        nessusd.log
Source3:        nessus.desktop
# force nessus into fedora dir structure
# and use system gd
# Thanks to Dawid Gajownik for providing these patches =)
Patch0:         nessus-core-2.2.4.Makefile.patch
Patch1:         nessus-core-2.2.4.config.h.in.patch
Patch2:         nessus-core-2.2.4.configure.in.patch
Patch3:         nessus-core-2.2.4.configure.patch
Patch4:         nessus-core-2.2.4.gd.patch
Patch5:         nessus-core-2.2.4.nessus-adduser.in.patch
Patch6:         nessus-core-2.2.4.nessus-mkcert.patch
Patch7:         nessus-core-2.2.4.nessus-rmuser.in.patch
Patch8:         nessus-core-2.2.4.nessus.tmpl.in.patch
Patch9:         nessus-core-2.2.4.pid.patch
Patch10:        nessus-core-2.2.4.pki.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  nessus-libraries-devel
BuildRequires:  libnasl-devel
BuildRequires:  gtk2-devel
BuildRequires:  glib2-devel
BuildRequires:  libICE-devel
BuildRequires:  gd-devel
BuildRequires:  tcp_wrappers
BuildRequires:  desktop-file-utils


%define pkidir %{_sysconfdir}/pki/nessus

%description
Nessus is the world's most popular vulnerability scanner used in over 75,000
organizations world-wide. Many of the world's largest organizations are
realizing significant cost savings by using Nessus to audit business-critical
enterprise devices and applications.

The "Nessus" Project was started by Renaud Deraison in 1998 to provide to the
internet community a free, powerful, up-to-date and easy to use remote
security scanner. Nessus is currently rated among the top products of its type
throughout the security industry and is endorsed by professional information
security organizations such as the SANS Institute.

%package devel
Summary: Header files for plugin development
Group: Development/Libraries

%description devel
%{summary}

%package -n nessus-server
Summary: nessusd is the server part of the nessus client-server model
Group: System Environment/Daemons
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig
Requires(preun): /sbin/service
Requires: nessus-core = %{version}-%{release}

%description -n nessus-server
%{summary}

%package -n nessus-client
Summary: Text client interface for nessusd
Group: Applications/Internet
Requires: nessus-core = %{version}-%{release}

%description -n nessus-client
%{summary}

%package -n nessus-gui
Summary: GTK client interface for nessusd
Group: Applications/Internet
Requires: nessus-core = %{version}-%{release}

%description -n nessus-gui
%{summary}

%prep
%setup -q -n %{name}

%patch0  -p1
%patch1  -p1
%patch2  -p1
# You cannot compile against system gd, because nessus-text client
# will require X.org X11
%patch3  -p1
%patch4  -p1
%patch5  -p1
%patch6  -p1
%patch7  -p1
%patch8  -p1
%patch9  -p1
%patch10 -p1

%build
# libdir is used by plugins
# smpflags will break builds sometime...
%configure \
	--libdir=%{_localstatedir}/lib \
	--disable-gtk \
	--enable-syslog \
	--enable-tcpwrappers \
	--without-x
make -C nessus

mv -f nessus/nessus nessus-text
make distclean

%configure \
	--libdir=%{_localstatedir}/lib \
	--enable-gtk \
	--enable-syslog \
	--enable-tcpwrappers \
	--with-x
make

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

install -p -m 0755 nessus-text $RPM_BUILD_ROOT/%{_bindir}

install -D -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT/%{_initrddir}/nessusd

install -D -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/nessusd
install -D -p -m 644 nessus/xpm/nessus.xpm \
	$RPM_BUILD_ROOT/%{_datadir}/pixmaps/nessus.xpm

desktop-file-install --vendor fedora \
	--dir $RPM_BUILD_ROOT/%{_datadir}/applications\
	%{SOURCE3}

# generate ghost .pem files
mkdir -m 0755 -p $RPM_BUILD_ROOT/%{pkidir}/{private,}/CA
chmod 700 $RPM_BUILD_ROOT/%{pkidir}/private/CA
touch $RPM_BUILD_ROOT/%{pkidir}/private/CA/{cakey,serverkey}.pem
chmod 600 $RPM_BUILD_ROOT/%{pkidir}/private/CA/{cakey,serverkey}.pem
touch $RPM_BUILD_ROOT/%{pkidir}/CA/{cacert,servercert}.pem
chmod 644 $RPM_BUILD_ROOT/%{pkidir}/CA/{cacert,servercert}.pem

# generate ghost config files
touch $RPM_BUILD_ROOT/%{_sysconfdir}/nessus/nessusd.{conf,rules}
chmod 600 $RPM_BUILD_ROOT/%{_sysconfdir}/nessus/nessusd.conf

mkdir -m 0755 $RPM_BUILD_ROOT/%{_localstatedir}/lib/nessus/plugins/.desc

%clean
rm -rf $RPM_BUILD_ROOT

%post -n nessus-server
# This adds the proper /etc/rc*.d links for the script
if [ $1 = 1 ]; then
/sbin/chkconfig --add nessusd
fi

%preun -n nessus-server
if [ $1 = 0 ]; then
        /sbin/service nessusd stop >/dev/null 2>&1
        /sbin/chkconfig --del nessusd
fi

%postun -n nessus-server
if [ "$1" -ge "1" ]; then
        /sbin/service nessusd condrestart >/dev/null 2>&1
fi

%files
%defattr(-,root,root,-)
%doc TODO CHANGES README_SSL doc/*txt doc/WARNING.* nessus/COPYING
%{_bindir}/nessus-mkrand
%{_bindir}/nessus-mkcert-client
%{_mandir}/man1/nessus.1*
%{_mandir}/man1/nessus-mkcert-client.1*
%{_mandir}/man1/nessus-mkrand.1*

%files devel
%defattr(-,root,root,-)
%doc doc/ntp/*
%{_includedir}/nessus/*
%exclude %{_includedir}/nessus/includes.h

%files -n nessus-client
%defattr(-,root,root,-)
%{_bindir}/nessus-text

%files -n nessus-gui
%defattr(-,root,root,-)
%{_bindir}/nessus
%{_datadir}/pixmaps/nessus.xpm
%{_datadir}/applications/*

%files -n nessus-server
%defattr(-,root,root,-)
%{_bindir}/nessus-fetch
%{_sbindir}/nessusd
%{_sbindir}/nessus-mkcert
%{_sbindir}/nessus-adduser
%{_sbindir}/nessus-rmuser
%{_sbindir}/nessus-check-signature
%{_mandir}/man1/nessus-fetch.1*
%{_mandir}/man8/*
%{_initrddir}/nessusd
%dir %{_localstatedir}/log/nessus
%dir %{_sysconfdir}/nessus
%dir %{_sysconfdir}/pki/nessus
%config(noreplace) %{_sysconfdir}/logrotate.d/nessusd
%ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{pkidir}/CA/*
%ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{pkidir}/private/CA/*
%ghost %config(missingok,noreplace) %verify(not md5 size mtime) %{_sysconfdir}/nessus/*

%changelog
* Mon Apr 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
2.2.6-3
- fix description
- create and own log dir
- include copying

* Sun Feb 26 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
2.2.6-2
- fix buildroot
- add source0 url

* Fri Feb 24 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
2.2.6-1
- initial version


--- NEW FILE nessus.desktop ---
[Desktop Entry]
Categories=Application;Security;System;X-Fedora;
Name=Nessus
GenericName=Security scanner
Comment=Nessus client
Exec=nessus
Icon=nessus.xpm
StartupNotify=true
Terminal=false
Type=Application
Encoding=UTF-8


--- NEW FILE nessusd.init ---
#!/bin/sh
#
# nessusd      Starts and stops the Nessus daemon
#
# chkconfig:   - 93 12
# description: Nessus is a security auditing tool
#
# processname: nessusd
# config:      /etc/nessus/nessusd.conf
# pidfile:     /var/run/nessusd.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/nessusd"
prog=nessusd

[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog

lockfile=/var/lock/subsys/$prog

start() {
    echo -n $"Starting $prog: "
    daemon $exec -D
    retval=$?
    echo
    [ $retval -eq 0 ] && touch $lockfile
    return $retval
}

stop() {
    echo -n $"Stopping $prog: "
    killproc $prog
    retval=$?
    echo
    [ $retval -eq 0 ] && rm -f $lockfile
    return $retval
}

restart() {
    stop
    start
}

reload() {
    restart
}

force_reload() {
    restart
}

fdr_status() {
    status $prog
}

case "$1" in
    start|stop|restart|reload)
        $1
        ;;
    force-reload)
        force_reload
        ;;
    status)
        fdr_status
        ;;
    condrestart|try-restart)
  	[ ! -f $lockfile ] || restart
	;;
    *)
        echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
        exit 2
esac


--- NEW FILE nessusd.log ---
/var/log/nessus/nessusd.messages {
  missingok
  notifempty
  create 0600 root root
  postrotate
      /sbin/service nessusd condrestart 2> /dev/null > /dev/null || true
  endscript
}


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nessus-core/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2006 06:19:30 -0000	1.1
+++ .cvsignore	7 Apr 2006 06:21:26 -0000	1.2
@@ -0,0 +1 @@
+nessus-core-2.2.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nessus-core/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2006 06:19:30 -0000	1.1
+++ sources	7 Apr 2006 06:21:26 -0000	1.2
@@ -0,0 +1 @@
+616dd7727b90df1ac978b5e736c0a960  nessus-core-2.2.6.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr  7 07:07:33 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Fri,  7 Apr 2006 00:07:33 -0700
Subject: fedora-security/audit fc4,1.191,1.192 fc5,1.104,1.105
Message-ID: <200604070707.k3777Xmb007196@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7176

Modified Files:
	fc4 fc5 
Log Message:
Updates based on latest mails



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- fc4	6 Apr 2006 20:45:47 -0000	1.191
+++ fc4	7 Apr 2006 07:07:30 -0000	1.192
@@ -1,11 +1,10 @@
-Up to date CVE as of CVE email 20060330
-Up to date FC4 as of 20060330
-Up to date kernel as of 20060405
+Up to date CVE as of CVE email 20060504
+Up to date FC4 as of 20060504
 
 ** are items that need attention
 
 CVE-2006-1646 ignore (ipsec-tools) KAME racoon, not ipsec-tools racoon
-CVE-2006-1550 VULNERABLE (dia) bz#187402
+CVE-2006-1550 backport (dia) bz#187402 [since FEDORA-2006-261]
 CVE-2006-1548 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) bz#187544


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- fc5	6 Apr 2006 20:45:47 -0000	1.104
+++ fc5	7 Apr 2006 07:07:30 -0000	1.105
@@ -1,6 +1,5 @@
-Up to date CVE as of CVE email 20060330
-Up to date FC5 as of 20060330
-Up to date kernel as of 20060405
+Up to date CVE as of CVE email 20060405
+Up to date FC5 as of 20060405
 
 ** are items that need attention
 
@@ -586,7 +585,7 @@
 CVE-2005-0705 version (ethereal, fixed after 0.10.9)
 CVE-2005-0704 version (ethereal, fixed after 0.10.9)
 CVE-2005-0698 version (ethereal, fixed after 0.10.9)
-CVE-2005-0670 ** hcidump
+CVE-2005-0670 VULNERABLE (hcidump) bz#187946
 CVE-2005-0664 version (libexif, fixed 0.6.12)
 CVE-2005-0654 ignore (gimp, not fixed 2.2) upstream considers harmless
 CVE-2005-0627 version (qt, fixed 3.3.4)



From fedora-extras-commits at redhat.com  Fri Apr  7 09:26:34 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Fri,  7 Apr 2006 02:26:34 -0700
Subject: rpms/pikdev/FC-4 pikdev-0.8.4.ppcbuild, NONE, 1.1 pikdev.spec, 1.6,
	1.7
Message-ID: <200604070926.k379QaAR011593@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/pikdev/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11575

Modified Files:
	pikdev.spec 
Added Files:
	pikdev-0.8.4.ppcbuild 
Log Message:
Add patch to try to build ppc arch


--- NEW FILE pikdev-0.8.4.ppcbuild ---
--- pikdev/uparport.hh.orig	2005-01-07 22:26:24.000000000 +0100
+++ pikdev/uparport.hh	2006-04-07 11:20:27.000000000 +0200
@@ -18,7 +18,6 @@
 // in RedHat & Mandrake distro, ppdev.h is into /usr/include/linux 
 #include <linux/ppdev.h>   
 #include <sys/time.h>
-#include <sys/io.h> 
 #include <fcntl.h>
 }           
 


Index: pikdev.spec
===================================================================
RCS file: /cvs/extras/rpms/pikdev/FC-4/pikdev.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pikdev.spec	5 Apr 2006 11:17:00 -0000	1.6
+++ pikdev.spec	7 Apr 2006 09:26:34 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		pikdev
 Version:	0.8.4
-Release:	8%{?dist}
+Release:	9%{?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
 
@@ -11,14 +11,13 @@
 Source1:	%{name}.desktop
 Source2:	README.Fedora
 Source3:	LISEZMOI.Fedora
+Patch:		uparport.hh.ppcbuild
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils, kdelibs-devel
 
 Requires:	gputils
 
-ExcludeArch:	ppc
-
 %description
 PiKdev is a simple IDE dedicated to the development of PIC
 based applications under KDE.
@@ -54,6 +53,8 @@
 
 %setup -q
 
+%patch
+
 %{__cp} -p %{SOURCE2} .
 %{__cp} -p %{SOURCE3} .
 
@@ -105,6 +106,9 @@
 %{_datadir}/icons/*
 
 %changelog
+* Fri Apr 07 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-9
+  - Add patch to try to build ppc arch
+  - Contributions of David Woodhouse <dwmw2[AT]redhat[DOT]com>
 * Wed Apr 05 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-8
   - New try to build x86_64 arch for FC-4
   - Unset $QTDIR before sourcing qt.sh



From fedora-extras-commits at redhat.com  Fri Apr  7 09:29:39 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Fri,  7 Apr 2006 02:29:39 -0700
Subject: rpms/pikdev/FC-4 pikdev.spec,1.7,1.8
Message-ID: <200604070929.k379Tf5O011654@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/pikdev/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11637

Modified Files:
	pikdev.spec 
Log Message:
This is the good spec file


Index: pikdev.spec
===================================================================
RCS file: /cvs/extras/rpms/pikdev/FC-4/pikdev.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pikdev.spec	7 Apr 2006 09:26:34 -0000	1.7
+++ pikdev.spec	7 Apr 2006 09:29:39 -0000	1.8
@@ -11,7 +11,7 @@
 Source1:	%{name}.desktop
 Source2:	README.Fedora
 Source3:	LISEZMOI.Fedora
-Patch:		uparport.hh.ppcbuild
+Patch:		%{name}-%{version}.ppcbuild
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils, kdelibs-devel



From fedora-extras-commits at redhat.com  Fri Apr  7 09:32:02 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Fri,  7 Apr 2006 02:32:02 -0700
Subject: rpms/pikdev/FC-4 pikdev.spec,1.8,1.9
Message-ID: <200604070932.k379W4Vw011688@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/pikdev/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11671

Modified Files:
	pikdev.spec 
Log Message:
Fix patch name


Index: pikdev.spec
===================================================================
RCS file: /cvs/extras/rpms/pikdev/FC-4/pikdev.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pikdev.spec	7 Apr 2006 09:29:39 -0000	1.8
+++ pikdev.spec	7 Apr 2006 09:32:02 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		pikdev
 Version:	0.8.4
-Release:	9%{?dist}
+Release:	10%{?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
 
@@ -106,6 +106,8 @@
 %{_datadir}/icons/*
 
 %changelog
+* Fri Apr 07 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-10
+  - Fix patch name
 * Fri Apr 07 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-9
   - Add patch to try to build ppc arch
   - Contributions of David Woodhouse <dwmw2[AT]redhat[DOT]com>



From fedora-extras-commits at redhat.com  Fri Apr  7 10:53:07 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Fri,  7 Apr 2006 03:53:07 -0700
Subject: rpms/pikdev/FC-5 pikdev-0.8.4.ppcbuild, NONE, 1.1 pikdev.spec, 1.2,
	1.3
Message-ID: <200604071053.k37Ar9LN014242@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/pikdev/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14224

Modified Files:
	pikdev.spec 
Added Files:
	pikdev-0.8.4.ppcbuild 
Log Message:
Add patch to try to build ppc arch


--- NEW FILE pikdev-0.8.4.ppcbuild ---
--- pikdev/uparport.hh.orig	2005-01-07 22:26:24.000000000 +0100
+++ pikdev/uparport.hh	2006-04-07 11:20:27.000000000 +0200
@@ -18,7 +18,6 @@
 // in RedHat & Mandrake distro, ppdev.h is into /usr/include/linux 
 #include <linux/ppdev.h>   
 #include <sys/time.h>
-#include <sys/io.h> 
 #include <fcntl.h>
 }           
 


Index: pikdev.spec
===================================================================
RCS file: /cvs/extras/rpms/pikdev/FC-5/pikdev.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pikdev.spec	15 Mar 2006 10:31:35 -0000	1.2
+++ pikdev.spec	7 Apr 2006 10:53:07 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		pikdev
 Version:	0.8.4
-Release:	4%{?dist}
+Release:	10%{?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
 
@@ -11,14 +11,13 @@
 Source1:	%{name}.desktop
 Source2:	README.Fedora
 Source3:	LISEZMOI.Fedora
+Patch:		%{name}-%{version}.ppcbuild
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils, kdelibs-devel
 
 Requires:	gputils
 
-ExcludeArch:	ppc
-
 %description
 PiKdev is a simple IDE dedicated to the development of PIC
 based applications under KDE.
@@ -54,11 +53,16 @@
 
 %setup -q
 
+%patch
+
 %{__cp} -p %{SOURCE2} .
 %{__cp} -p %{SOURCE3} .
 
 %build
 
+unset QTDIR || : ; . /etc/profile.d/qt.sh
+export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
+
 %configure --disable-rpath
 
 rm -rf pkp
@@ -102,6 +106,24 @@
 %{_datadir}/icons/*
 
 %changelog
+* Fri Apr 07 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-10
+  - Fix patch name
+* Fri Apr 07 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-9
+  - Add patch to try to build ppc arch
+  - Contributions of David Woodhouse <dwmw2[AT]redhat[DOT]com>
+* Wed Apr 05 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-8
+  - New try to build x86_64 arch for FC-4
+  - Unset $QTDIR before sourcing qt.sh
+  - Thanks to Rex Dieter <rdieter[AT]math[DOT]unl[DOT]edu>
+    and Michael Schwendt <bugs[DOT]michael[AT]gmx[DOT]net>
+* Thu Mar 23 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-7
+  - No fix. So, remove the previous change
+  - Definitely exclude arch x86_64 for FC-4
+* Thu Mar 23 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-6
+  - $QTDIR is set. So, remove the previous change
+  - Try to fix x86_64 build failure by adding BR qt-devel
+* Wed Mar 15 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-5
+  - Source qt.sh if $QTDIR isn't set. Always Ralf...
 * Wed Mar 15 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-4
   - Exclude temporarily ppc arch because <sys/io.h> don't exist
     in ppc glibc headers
@@ -111,13 +133,13 @@
     Thanks to him.
 * Wed Mar 08 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-3
   - Remove useless BuildRequires qt-devel, xorg-x11-devel for FE5
-  - Package must own %{_datadir}/apps/%{name} directory
+  - Package must own %%{_datadir}/apps/%%{name} directory
 * Tue Jan 31 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-2
   - Don't use the precompiled version of pkp
 * Mon Jan 30 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-1
   - New upstream version
 * Tue Jan 10 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.2-2
-  - Add the %{?dist} macro
+  - Add the %%{?dist} macro
 * Fri Dec 16 2005 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.2-1
   - New version
   - Add french summary and description



From fedora-extras-commits at redhat.com  Fri Apr  7 10:54:20 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Fri,  7 Apr 2006 03:54:20 -0700
Subject: rpms/pikdev/devel pikdev-0.8.4.ppcbuild, NONE, 1.1 pikdev.spec, 1.2,
	1.3
Message-ID: <200604071054.k37AsMEN014305@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/pikdev/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14287

Modified Files:
	pikdev.spec 
Added Files:
	pikdev-0.8.4.ppcbuild 
Log Message:
Add patch to try to build ppc arch


--- NEW FILE pikdev-0.8.4.ppcbuild ---
--- pikdev/uparport.hh.orig	2005-01-07 22:26:24.000000000 +0100
+++ pikdev/uparport.hh	2006-04-07 11:20:27.000000000 +0200
@@ -18,7 +18,6 @@
 // in RedHat & Mandrake distro, ppdev.h is into /usr/include/linux 
 #include <linux/ppdev.h>   
 #include <sys/time.h>
-#include <sys/io.h> 
 #include <fcntl.h>
 }           
 


Index: pikdev.spec
===================================================================
RCS file: /cvs/extras/rpms/pikdev/devel/pikdev.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pikdev.spec	15 Mar 2006 10:31:35 -0000	1.2
+++ pikdev.spec	7 Apr 2006 10:54:20 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		pikdev
 Version:	0.8.4
-Release:	4%{?dist}
+Release:	10%{?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
 
@@ -11,14 +11,13 @@
 Source1:	%{name}.desktop
 Source2:	README.Fedora
 Source3:	LISEZMOI.Fedora
+Patch:		%{name}-%{version}.ppcbuild
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils, kdelibs-devel
 
 Requires:	gputils
 
-ExcludeArch:	ppc
-
 %description
 PiKdev is a simple IDE dedicated to the development of PIC
 based applications under KDE.
@@ -54,11 +53,16 @@
 
 %setup -q
 
+%patch
+
 %{__cp} -p %{SOURCE2} .
 %{__cp} -p %{SOURCE3} .
 
 %build
 
+unset QTDIR || : ; . /etc/profile.d/qt.sh
+export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
+
 %configure --disable-rpath
 
 rm -rf pkp
@@ -102,6 +106,24 @@
 %{_datadir}/icons/*
 
 %changelog
+* Fri Apr 07 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-10
+  - Fix patch name
+* Fri Apr 07 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-9
+  - Add patch to try to build ppc arch
+  - Contributions of David Woodhouse <dwmw2[AT]redhat[DOT]com>
+* Wed Apr 05 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-8
+  - New try to build x86_64 arch for FC-4
+  - Unset $QTDIR before sourcing qt.sh
+  - Thanks to Rex Dieter <rdieter[AT]math[DOT]unl[DOT]edu>
+    and Michael Schwendt <bugs[DOT]michael[AT]gmx[DOT]net>
+* Thu Mar 23 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-7
+  - No fix. So, remove the previous change
+  - Definitely exclude arch x86_64 for FC-4
+* Thu Mar 23 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-6
+  - $QTDIR is set. So, remove the previous change
+  - Try to fix x86_64 build failure by adding BR qt-devel
+* Wed Mar 15 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-5
+  - Source qt.sh if $QTDIR isn't set. Always Ralf...
 * Wed Mar 15 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-4
   - Exclude temporarily ppc arch because <sys/io.h> don't exist
     in ppc glibc headers
@@ -111,13 +133,13 @@
     Thanks to him.
 * Wed Mar 08 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-3
   - Remove useless BuildRequires qt-devel, xorg-x11-devel for FE5
-  - Package must own %{_datadir}/apps/%{name} directory
+  - Package must own %%{_datadir}/apps/%%{name} directory
 * Tue Jan 31 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-2
   - Don't use the precompiled version of pkp
 * Mon Jan 30 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-1
   - New upstream version
 * Tue Jan 10 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.2-2
-  - Add the %{?dist} macro
+  - Add the %%{?dist} macro
 * Fri Dec 16 2005 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.2-1
   - New version
   - Add french summary and description



From fedora-extras-commits at redhat.com  Fri Apr  7 11:10:54 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  7 Apr 2006 04:10:54 -0700
Subject: rpms/pipenightdreams - New directory
Message-ID: <200604071110.k37BAu8b016844@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/pipenightdreams
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16818/pipenightdreams

Log Message:
Directory /cvs/extras/rpms/pipenightdreams added to the repository




From fedora-extras-commits at redhat.com  Fri Apr  7 11:10:55 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  7 Apr 2006 04:10:55 -0700
Subject: rpms/pipenightdreams/devel - New directory
Message-ID: <200604071110.k37BAval016847@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/pipenightdreams/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16818/pipenightdreams/devel

Log Message:
Directory /cvs/extras/rpms/pipenightdreams/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Apr  7 11:11:11 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  7 Apr 2006 04:11:11 -0700
Subject: rpms/pipenightdreams Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604071111.k37BBDUD016890@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/pipenightdreams
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16868

Added Files:
	Makefile import.log 
Log Message:
Setup of module pipenightdreams


--- NEW FILE Makefile ---
# Top level Makefile for module pipenightdreams
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr  7 11:11:13 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  7 Apr 2006 04:11:13 -0700
Subject: rpms/pipenightdreams/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604071111.k37BBFgC016935@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/pipenightdreams/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16868/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pipenightdreams


--- 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 Apr  7 11:12:45 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  7 Apr 2006 04:12:45 -0700
Subject: rpms/pipenightdreams import.log,1.1,1.2
Message-ID: <200604071112.k37BCl6Q017019@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/pipenightdreams
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16983

Modified Files:
	import.log 
Log Message:
auto-import pipenightdreams-0.10.0-1 on branch devel from pipenightdreams-0.10.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pipenightdreams/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Apr 2006 11:11:11 -0000	1.1
+++ import.log	7 Apr 2006 11:12:45 -0000	1.2
@@ -0,0 +1 @@
+pipenightdreams-0_10_0-1:HEAD:pipenightdreams-0.10.0-1.src.rpm:1144408208



From fedora-extras-commits at redhat.com  Fri Apr  7 11:12:46 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  7 Apr 2006 04:12:46 -0700
Subject: rpms/pipenightdreams/devel pipenightdreams-0.10.0-datadir.patch,
	NONE, 1.1 pipenightdreams-0.10.0-gcc41.patch, NONE,
	1.1 pipenightdreams.desktop, NONE, 1.1 pipenightdreams.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604071112.k37BCmWX017028@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/pipenightdreams/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16983/devel

Modified Files:
	.cvsignore sources 
Added Files:
	pipenightdreams-0.10.0-datadir.patch 
	pipenightdreams-0.10.0-gcc41.patch pipenightdreams.desktop 
	pipenightdreams.spec 
Log Message:
auto-import pipenightdreams-0.10.0-1 on branch devel from pipenightdreams-0.10.0-1.src.rpm

pipenightdreams-0.10.0-datadir.patch:

--- NEW FILE pipenightdreams-0.10.0-datadir.patch ---
--- pipenightdreams-0.10.0/configure.datadir	2006-04-05 19:46:59.000000000 +0200
+++ pipenightdreams-0.10.0/configure	2006-04-05 19:47:18.000000000 +0200
@@ -1613,7 +1613,7 @@
 
 #Thanks to Ingo Ruhnke <grumbel at gmx.de>
 
-	game_datadir="$datadir/games/$PACKAGE"
+	game_datadir="$datadir/$PACKAGE"
 	game_datadir=`(
 		test "x$prefix" = xNONE && prefix=${ac_default_prefix}
 		test "x$exec_prefix" = xNONE && exec_prefix=${prefix}

pipenightdreams-0.10.0-gcc41.patch:

--- NEW FILE pipenightdreams-0.10.0-gcc41.patch ---
diff -ur pipenightdreams-0.10.0.orig/src/eventmanager.cpp pipenightdreams-0.10.0/src/eventmanager.cpp
--- pipenightdreams-0.10.0.orig/src/eventmanager.cpp	2002-01-17 20:56:26.000000000 +0100
+++ pipenightdreams-0.10.0/src/eventmanager.cpp	2006-04-04 21:32:53.000000000 +0200
@@ -40,7 +40,7 @@
   lista_streams->remove(lista_streams->indexOf(s));
 }
 
-void EventManager::pumpEvents(bool wait=false){
+void EventManager::pumpEvents(bool wait){
   SDL_Event event;
   Index * stream;
   bool got=false;
diff -ur pipenightdreams-0.10.0.orig/src/graphic.cpp pipenightdreams-0.10.0/src/graphic.cpp
--- pipenightdreams-0.10.0.orig/src/graphic.cpp	2002-01-17 20:56:29.000000000 +0100
+++ pipenightdreams-0.10.0/src/graphic.cpp	2006-04-04 21:32:34.000000000 +0200
@@ -44,11 +44,11 @@
   if (pixels) free(pixels);
 }
 
-void Graphic::setAlpha(char value=OPAQUE){
+void Graphic::setAlpha(char value){
   SDL_SetAlpha(surface, SDL_SRCALPHA, value);
 }
 
-void Graphic::enableClipping(bool flag=true){
+void Graphic::enableClipping(bool flag){
 
   if (flag){
     SDL_Rect rect;
@@ -68,7 +68,7 @@
   clip_height=height;
 }
 
-void Graphic::flip(Axis a=HAxis){
+void Graphic::flip(Axis a){
   if (surface){
     if (SDL_MUSTLOCK(surface))
       if (SDL_LockSurface(surface)<0) return;
diff -ur pipenightdreams-0.10.0.orig/src/hash.cpp pipenightdreams-0.10.0/src/hash.cpp
--- pipenightdreams-0.10.0.orig/src/hash.cpp	2002-01-17 20:56:30.000000000 +0100
+++ pipenightdreams-0.10.0/src/hash.cpp	2006-04-04 21:32:00.000000000 +0200
@@ -55,10 +55,10 @@
   return(sum % nbuckets);
 }
 
-Hash::Hash(int bs=256){
+Hash::Hash(int bs){
  int i;
  nbuckets=bs;
- lbuckets=new (List *)[nbuckets];
+ lbuckets=new List *[nbuckets];
 
  for (i=0;i<nbuckets;i++)
    lbuckets[i]=new List();
@@ -99,7 +99,7 @@
   return NotAdded;
 }
 
-Hash::Result Hash::remove(Str * str, bool del=false){
+Hash::Result Hash::remove(Str * str, bool del){
   if (str){
     Index * i;
     List * list=lbuckets[function(str)];
@@ -135,7 +135,7 @@
   return NULL;
 }
 
-void Hash::empty(bool del=true){
+void Hash::empty(bool del){
   int i;
   List * list;
   for (i=0;i<nbuckets;i++){
diff -ur pipenightdreams-0.10.0.orig/src/image.cpp pipenightdreams-0.10.0/src/image.cpp
--- pipenightdreams-0.10.0.orig/src/image.cpp	2002-01-17 20:56:32.000000000 +0100
+++ pipenightdreams-0.10.0/src/image.cpp	2006-04-04 21:30:44.000000000 +0200
@@ -19,7 +19,7 @@
 #include "SDL_image.h"
 #include <stdio.h>
 
-Image::Image(Str * filename=NULL):Graphic(){
+Image::Image(Str * filename):Graphic(){
   if (filename) load(filename);
 }
 
diff -ur pipenightdreams-0.10.0.orig/src/list.cpp pipenightdreams-0.10.0/src/list.cpp
--- pipenightdreams-0.10.0.orig/src/list.cpp	2002-01-17 20:56:35.000000000 +0100
+++ pipenightdreams-0.10.0/src/list.cpp	2006-04-04 21:30:27.000000000 +0200
@@ -125,7 +125,7 @@
   return (insert(indexOf(i), obj));
 }
 
-List::Result List::remove(Index * index, bool del=false){
+List::Result List::remove(Index * index, bool del){
   if (isEmpty()) return EmptyList;
   if (!index) return NullIndex;
 
@@ -155,7 +155,7 @@
   return Removed;
 }
 
-void List::empty(bool del=true){
+void List::empty(bool del){
   while (!isEmpty())
     remove(getFirst(), del);
 }
diff -ur pipenightdreams-0.10.0.orig/src/pipe.cpp pipenightdreams-0.10.0/src/pipe.cpp
--- pipenightdreams-0.10.0.orig/src/pipe.cpp	2002-01-21 05:08:13.000000000 +0100
+++ pipenightdreams-0.10.0/src/pipe.cpp	2006-04-04 21:29:23.000000000 +0200
@@ -43,11 +43,11 @@
   return !(full_level>0) && !fixed;
 }
 
-void Pipe::setFixed(bool flag=true){
+void Pipe::setFixed(bool flag){
   fixed=flag;
 }
 
-void Pipe::setBonus(Bonus bonus=NormalBonus){
+void Pipe::setBonus(Bonus bonus){
   this->bonus=bonus;
 }
 
diff -ur pipenightdreams-0.10.0.orig/src/player.h pipenightdreams-0.10.0/src/player.h
--- pipenightdreams-0.10.0.orig/src/player.h	2002-01-17 20:56:40.000000000 +0100
+++ pipenightdreams-0.10.0/src/player.h	2006-04-04 21:29:52.000000000 +0200
@@ -47,8 +47,8 @@
     void setStartRowColumn(int row, int column);
     void setBoard(Board * bd);
 
-    inline void setRestrictionCoef(unsigned int coef);
-    inline void setFixedCoef(unsigned int coef);
+    void setRestrictionCoef(unsigned int coef);
+    void setFixedCoef(unsigned int coef);
 
     void incLives();
     void decLives();
diff -ur pipenightdreams-0.10.0.orig/src/pointer.cpp pipenightdreams-0.10.0/src/pointer.cpp
--- pipenightdreams-0.10.0.orig/src/pointer.cpp	2002-01-17 20:56:41.000000000 +0100
+++ pipenightdreams-0.10.0/src/pointer.cpp	2006-04-04 21:28:25.000000000 +0200
@@ -17,7 +17,7 @@
 
 #include "pointer.h"
 
-Pointer::Pointer(int row=0, int column=0){
+Pointer::Pointer(int row, int column){
   this->row=row;
   this->column=column;
   this->moved_flag=true;
diff -ur pipenightdreams-0.10.0.orig/src/score.cpp pipenightdreams-0.10.0/src/score.cpp
--- pipenightdreams-0.10.0.orig/src/score.cpp	2002-01-17 20:56:42.000000000 +0100
+++ pipenightdreams-0.10.0/src/score.cpp	2006-04-04 21:28:07.000000000 +0200
@@ -18,7 +18,7 @@
 #include "score.h"
 #include <math.h>
 
-Score::Score(int value=0){
+Score::Score(int value){
   this->value=value;
   delta=0;
   changed=true;
diff -ur pipenightdreams-0.10.0.orig/src/str.cpp pipenightdreams-0.10.0/src/str.cpp
--- pipenightdreams-0.10.0.orig/src/str.cpp	2002-01-17 20:56:42.000000000 +0100
+++ pipenightdreams-0.10.0/src/str.cpp	2006-04-04 21:27:43.000000000 +0200
@@ -11,7 +11,7 @@
 
 const char Str::nul = '\0';
 
-Str::Str(const char * string=NULL){
+Str::Str(const char * string){
   s=NULL;
   set(string);
 }
@@ -25,7 +25,7 @@
   if (s) delete[] s;
 }
 
-void Str::set(const char * string=NULL){
+void Str::set(const char * string){
   if (s) delete[] s;
   if (string){
     s=new char[strlen(string)+1];
@@ -71,7 +71,7 @@
   return (strlen(s));
 }
 
-bool Str::isEqual(Str * str, bool case_sensitive = true){
+bool Str::isEqual(Str * str, bool case_sensitive){
   if (case_sensitive){
     return (!strcmp(s, str->s));
   }
--- pipenightdreams-0.10.0/src/pointer.h~	2006-04-04 21:58:38.000000000 +0200
+++ pipenightdreams-0.10.0/src/pointer.h	2006-04-04 21:58:38.000000000 +0200
@@ -43,11 +43,11 @@
 
     friend class Board;
 
-    inline void setRow(int row);
-    inline void setColumn(int column);
-    inline void setRowColumn(int row, int column);
-    inline void setMoved(bool flag);
-    inline bool moved();
+    void setRow(int row);
+    void setColumn(int column);
+    void setRowColumn(int row, int column);
+    void setMoved(bool flag);
+    bool moved();
 
     Str * image_name;
     Image * ima;


--- NEW FILE pipenightdreams.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Pipe Night Dreams
GenericName=Pipe Puzzle Game
Comment=Connect the waterpipes to create a proper pipeline
Exec=pipenightdreams
Icon=pipenightdreams.png
Terminal=false
StartupNotify=false
Type=Application
Categories=Application;Game;
Version=0.10.0


--- NEW FILE pipenightdreams.spec ---
Name:           pipenightdreams
Version:        0.10.0
Release:        1%{?dist}
Summary:        Connect the waterpipes to create a proper pipeline
Group:          Amusements/Games
License:        GPL
URL:            http://www.libsdl.org/projects/pipenightdreams/
Source0:        http://www.libsdl.org/projects/pipenightdreams/packages/pipenightdreams-0.10.0.tar.gz
Source1:        %{name}.desktop
Patch0:         pipenightdreams-0.10.0-gcc41.patch
Patch1:         pipenightdreams-0.10.0-datadir.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  SDL_image-devel desktop-file-utils

%description
PipeNightDreams is a game similar to the classic PipeDream. It has 25 levels
with increasing difficulty, and you can create your own by just editing
text files. It has a lot of cool graphics, score, lives, required pipes
per level and an easy and fast interface.


%prep
%setup -q
%patch0 -p1 -z .gcc41
%patch1 -p1 -z .gcc41


%build
%configure
make %{?_smp_mflags} CXXFLAGS="$RPM_OPT_FLAGS -I/usr/include/SDL"


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# fix up the broken datadir install (its this or patch a zillion makefiles)
mv $RPM_BUILD_ROOT%{_datadir}/games/%{name} $RPM_BUILD_ROOT%{_datadir}
rmdir $RPM_BUILD_ROOT%{_datadir}/games

# 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/64x64/apps
install -p -m 644 images/pipes_space/horizontal.png \
  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/%{name}.png


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi

%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi


%files
%defattr(-,root,root,-)
%doc README TODO COPYING ChangeLog
%{_bindir}/%{name}
%{_datadir}/%{name}
%{_mandir}/man6/pipenightdreams.6.gz
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/64x64/apps/%{name}.png


%changelog
* Wed Apr  5 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.0-1
- initial Fedora Extras package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pipenightdreams/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2006 11:11:13 -0000	1.1
+++ .cvsignore	7 Apr 2006 11:12:45 -0000	1.2
@@ -0,0 +1 @@
+pipenightdreams-0.10.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pipenightdreams/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2006 11:11:13 -0000	1.1
+++ sources	7 Apr 2006 11:12:45 -0000	1.2
@@ -0,0 +1 @@
+f22f23649852f54cca43de775e691de6  pipenightdreams-0.10.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr  7 11:21:44 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  7 Apr 2006 04:21:44 -0700
Subject: owners owners.list,1.806,1.807
Message-ID: <200604071121.k37BLkSf017173@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17156/owners

Modified Files:
	owners.list 
Log Message:
add pipenightdreams


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.806
retrieving revision 1.807
diff -u -r1.806 -r1.807
--- owners.list	6 Apr 2006 18:29:19 -0000	1.806
+++ owners.list	7 Apr 2006 11:21:43 -0000	1.807
@@ -1133,6 +1133,7 @@
 Fedora Extras|physfs|Library to provide abstract access to various archives|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|pikdev|IDE for development of PICmicro based application (under Linux/KDE)|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
 Fedora Extras|pinentry|Collection of simple PIN or passphrase entry dialogs|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|pipenightdreams|Connect the waterpipes to create a proper pipeline|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|pitivi|Non-linear video editor|redhat at flyn.org|extras-qa at fedoraproject.org|
 Fedora Extras|plague|Distributed build system for RPMs|dcbw at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|planet|Flexible RDF/RSS/Atom feed aggregator|rich at phekda.gotadsl.co.uk|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Apr  7 11:31:26 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  7 Apr 2006 04:31:26 -0700
Subject: comps comps-fe5.xml.in,1.33,1.34
Message-ID: <200604071131.k37BVSfw017912@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17889/comps

Modified Files:
	comps-fe5.xml.in 
Log Message:
add raidem,zasx to games


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- comps-fe5.xml.in	3 Apr 2006 18:39:40 -0000	1.33
+++ comps-fe5.xml.in	7 Apr 2006 11:31:26 -0000	1.34
@@ -231,6 +231,7 @@
         <packagereq type="optional">ppracer</packagereq>
         <packagereq type="optional">qascade</packagereq>
         <packagereq type="optional">qqo</packagereq>
+        <packagereq type="optional">raidem</packagereq>
         <packagereq type="optional">rocksndiamonds</packagereq>
         <packagereq type="optional">rogue</packagereq>
         <packagereq type="optional">scorched3d</packagereq>
@@ -250,6 +251,7 @@
         <packagereq type="optional">xpilot-ng</packagereq>
         <packagereq type="optional">xplanet</packagereq>
         <packagereq type="optional">xscorch</packagereq>
+        <packagereq type="optional">zasx</packagereq>
     </packagelist>
   </group>
 



From fedora-extras-commits at redhat.com  Fri Apr  7 13:36:22 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Fri,  7 Apr 2006 06:36:22 -0700
Subject: rpms/i8kutils/FC-5 i8kutils.spec,1.9,1.10
Message-ID: <200604071336.k37DaP7h000944@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/i8kutils/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv897/FC-5

Modified Files:
	i8kutils.spec 
Log Message:
Requires tk (#188199) and sync all FC-4+ branches.



Index: i8kutils.spec
===================================================================
RCS file: /cvs/extras/rpms/i8kutils/FC-5/i8kutils.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- i8kutils.spec	14 Mar 2006 11:04:10 -0000	1.9
+++ i8kutils.spec	7 Apr 2006 13:36:22 -0000	1.10
@@ -4,7 +4,7 @@
 Summary: Dell laptop (Inspiron 8000 and others) SMM BIOS support tools
 Name: i8kutils
 Version: 1.25
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: System Environment/Base
 URL: http://people.debian.org/~dz/i8k/
@@ -12,7 +12,7 @@
 Source1: http://www.coding-zone.com/i8krellm-%{gkrellmpluginver}.tar.gz
 Source2: i8kbuttons.init
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: alsa-utils, gkrellm >= 2.0.0
+Requires: alsa-utils, gkrellm >= 2.0.0, tk
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig, /sbin/service
 BuildRequires: gkrellm-devel >= 2.0.0
@@ -53,7 +53,7 @@
     %{__cp} -a i8krellm.so %{buildroot}%{_libdir}/gkrellm2/plugins/
 popd
 
-%{__install} -D -m 755 %{SOURCE2} \
+%{__install} -D -m 0755 %{SOURCE2} \
     %{buildroot}%{_sysconfdir}/rc.d/init.d/i8kbuttons
 
 
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Fri Apr  7 2006 Matthias Saou <http://freshrpms.net/> 1.25-6
+- Add tk requirement, since the included i8kmon utility requires it.
+
 * Tue Mar 14 2006 Matthias Saou <http://freshrpms.net/> 1.25-6
 - FC5 rebuild.
 - Silence possible kernel module insertion error in the init script.



From fedora-extras-commits at redhat.com  Fri Apr  7 13:36:23 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Fri,  7 Apr 2006 06:36:23 -0700
Subject: rpms/i8kutils/devel i8kutils.spec,1.9,1.10
Message-ID: <200604071336.k37DaPe0000948@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/i8kutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv897/devel

Modified Files:
	i8kutils.spec 
Log Message:
Requires tk (#188199) and sync all FC-4+ branches.



Index: i8kutils.spec
===================================================================
RCS file: /cvs/extras/rpms/i8kutils/devel/i8kutils.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- i8kutils.spec	14 Mar 2006 11:04:10 -0000	1.9
+++ i8kutils.spec	7 Apr 2006 13:36:23 -0000	1.10
@@ -4,7 +4,7 @@
 Summary: Dell laptop (Inspiron 8000 and others) SMM BIOS support tools
 Name: i8kutils
 Version: 1.25
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: System Environment/Base
 URL: http://people.debian.org/~dz/i8k/
@@ -12,7 +12,7 @@
 Source1: http://www.coding-zone.com/i8krellm-%{gkrellmpluginver}.tar.gz
 Source2: i8kbuttons.init
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: alsa-utils, gkrellm >= 2.0.0
+Requires: alsa-utils, gkrellm >= 2.0.0, tk
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig, /sbin/service
 BuildRequires: gkrellm-devel >= 2.0.0
@@ -53,7 +53,7 @@
     %{__cp} -a i8krellm.so %{buildroot}%{_libdir}/gkrellm2/plugins/
 popd
 
-%{__install} -D -m 755 %{SOURCE2} \
+%{__install} -D -m 0755 %{SOURCE2} \
     %{buildroot}%{_sysconfdir}/rc.d/init.d/i8kbuttons
 
 
@@ -83,6 +83,9 @@
 
 
 %changelog
+* Fri Apr  7 2006 Matthias Saou <http://freshrpms.net/> 1.25-6
+- Add tk requirement, since the included i8kmon utility requires it.
+
 * Tue Mar 14 2006 Matthias Saou <http://freshrpms.net/> 1.25-6
 - FC5 rebuild.
 - Silence possible kernel module insertion error in the init script.



From fedora-extras-commits at redhat.com  Fri Apr  7 13:36:22 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Fri,  7 Apr 2006 06:36:22 -0700
Subject: rpms/i8kutils/FC-4 i8kbuttons.init,1.4,1.5 i8kutils.spec,1.7,1.8
Message-ID: <200604071336.k37Dasak000953@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/i8kutils/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv897/FC-4

Modified Files:
	i8kbuttons.init i8kutils.spec 
Log Message:
Requires tk (#188199) and sync all FC-4+ branches.



Index: i8kbuttons.init
===================================================================
RCS file: /cvs/extras/rpms/i8kutils/FC-4/i8kbuttons.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- i8kbuttons.init	16 Aug 2005 12:42:33 -0000	1.4
+++ i8kbuttons.init	7 Apr 2006 13:36:21 -0000	1.5
@@ -1,16 +1,16 @@
 #!/bin/bash
 #
-# i8kbuttons       Make the multimedia buttons (volume up/down, mute)
-#                  on dell inspiron work
+# i8kbuttons   Make the multimedia buttons (volume up/down, mute) on Dell
+#              Inspiron laptops work
 #
 # chkconfig: 2345 10 90
-# description: Make the multimedia buttons (volume up/down, mute) on dell
-#              inspiron work
+# description: Make the multimedia buttons (volume up/down, mute) on Dell \
+#              Inspiron laptops work
 #
 # ChangeLog: 2003/9/9 Jeremy Brand <jeremy at nirvani.net>
 # - Amount of 8 was quite dynamic, changed to 4.
 # - Also added PCM changes in addition to master volume.
-# 
+#
 
 # Source function library.
 . /etc/init.d/functions
@@ -23,26 +23,26 @@
 # See how we were called.
 case "$1" in
   start)
-        echo -n $"Starting $prog: "
-	/sbin/modprobe i8k force=1
+	echo -n $"Starting $prog: "
+	/sbin/modprobe i8k force=1 &>/dev/null
 	if pidofproc $prog &>/dev/null; then
 		echo_failure
 		RETVAL=1
 	else
 		$prog --up "$amixer -q set Master $amount+" --down "$amixer -q set Master $amount-" --mute "$amixer -q set Master 0" &
 		echo_success
-	    	touch /var/lock/subsys/$prog
+		touch /var/lock/subsys/$prog
 		RETVAL=0
 	fi
 	echo
-        ;;
+	;;
   stop)
-        echo -n $"Shutting down $prog: "
+	echo -n $"Shutting down $prog: "
 	killproc $prog
 	RETVAL=$?
-        echo
-        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
-        ;;
+	echo
+	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog
+	;;
   status)
 	status $prog
 	RETVAL=$?
@@ -53,8 +53,8 @@
 	RETVAL=$?
 	;;
   *)
-        echo $"Usage: $0 {start|stop|restart|reload|status}"
-        exit 1
+	echo $"Usage: $0 {start|stop|restart|reload|status}"
+	exit 1
 esac
 
 exit $RETVAL


Index: i8kutils.spec
===================================================================
RCS file: /cvs/extras/rpms/i8kutils/FC-4/i8kutils.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- i8kutils.spec	16 Aug 2005 12:42:33 -0000	1.7
+++ i8kutils.spec	7 Apr 2006 13:36:21 -0000	1.8
@@ -1,9 +1,10 @@
+# http://www.coding-zone.com/?page=i8krellm
 %define gkrellmpluginver 2.5
 
 Summary: Dell laptop (Inspiron 8000 and others) SMM BIOS support tools
 Name: i8kutils
 Version: 1.25
-Release: 4%{?dist}
+Release: 7%{?dist}
 License: GPL
 Group: System Environment/Base
 URL: http://people.debian.org/~dz/i8k/
@@ -11,7 +12,7 @@
 Source1: http://www.coding-zone.com/i8krellm-%{gkrellmpluginver}.tar.gz
 Source2: i8kbuttons.init
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: alsa-utils, gkrellm >= 2.0.0
+Requires: alsa-utils, gkrellm >= 2.0.0, tk
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig, /sbin/service
 BuildRequires: gkrellm-devel >= 2.0.0
@@ -52,7 +53,7 @@
     %{__cp} -a i8krellm.so %{buildroot}%{_libdir}/gkrellm2/plugins/
 popd
 
-%{__install} -D -m 755 %{SOURCE2} \
+%{__install} -D -m 0755 %{SOURCE2} \
     %{buildroot}%{_sysconfdir}/rc.d/init.d/i8kbuttons
 
 
@@ -82,6 +83,16 @@
 
 
 %changelog
+* Fri Apr  7 2006 Matthias Saou <http://freshrpms.net/> 1.25-6
+- Add tk requirement, since the included i8kmon utility requires it.
+
+* Tue Mar 14 2006 Matthias Saou <http://freshrpms.net/> 1.25-6
+- FC5 rebuild.
+- Silence possible kernel module insertion error in the init script.
+
+* Thu Feb  9 2006 Matthias Saou <http://freshrpms.net/> 1.25-5
+- Rebuild for new gcc/glibc.
+
 * Tue Aug 16 2005 Matthias Saou <http://freshrpms.net/> 1.25-4
 - Fix init script to use amixer instead of no longer provided aumix (#165555).
 - Fix init script to not use obsolete initlog anymore.



From fedora-extras-commits at redhat.com  Fri Apr  7 14:11:26 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 07:11:26 -0700
Subject: comps comps-fe5.xml,1.3,1.4 comps-fe5.xml.in,1.34,1.35
Message-ID: <200604071411.k37EBSd5003422@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3396

Modified Files:
	comps-fe5.xml comps-fe5.xml.in 
Log Message:

Rename git-core to git in comps



Index: comps-fe5.xml
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- comps-fe5.xml	13 Mar 2006 18:33:21 -0000	1.3
+++ comps-fe5.xml	7 Apr 2006 14:11:26 -0000	1.4
@@ -40,7 +40,7 @@
         <packagereq type="optional">fpc</packagereq>
         <packagereq type="optional">gforth</packagereq>
         <packagereq type="optional">ghc</packagereq>
-        <packagereq type="optional">git-core</packagereq>
+        <packagereq type="optional">git</packagereq>
         <packagereq type="optional">lincvs</packagereq>
         <packagereq type="optional">lua</packagereq>
         <packagereq type="optional">mach</packagereq>
@@ -785,4 +785,4 @@
       <groupid>network-server</groupid>
     </grouplist>
   </category>
-</comps>
\ No newline at end of file
+</comps>


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- comps-fe5.xml.in	7 Apr 2006 11:31:26 -0000	1.34
+++ comps-fe5.xml.in	7 Apr 2006 14:11:26 -0000	1.35
@@ -40,7 +40,7 @@
         <packagereq type="optional">fpc</packagereq>
         <packagereq type="optional">gforth</packagereq>
         <packagereq type="optional">ghc</packagereq>
-        <packagereq type="optional">git-core</packagereq>
+        <packagereq type="optional">git</packagereq>
         <packagereq type="optional">highlight</packagereq>
         <packagereq type="optional">lincvs</packagereq>
         <packagereq type="optional">lua</packagereq>



From fedora-extras-commits at redhat.com  Fri Apr  7 14:23:48 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Fri,  7 Apr 2006 07:23:48 -0700
Subject: fedora-security/audit fc4,1.192,1.193 fc5,1.105,1.106
Message-ID: <200604071423.k37ENmtw004817@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4466

Modified Files:
	fc4 fc5 
Log Message:
Add a note about a sysklogd issue.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -r1.192 -r1.193
--- fc4	7 Apr 2006 07:07:30 -0000	1.192
+++ fc4	7 Apr 2006 14:23:46 -0000	1.193
@@ -4,6 +4,7 @@
 ** are items that need attention
 
 CVE-2006-1646 ignore (ipsec-tools) KAME racoon, not ipsec-tools racoon
+CVE-2006-1624 ignore (sysklogd) Silly configuration is not a security issue
 CVE-2006-1550 backport (dia) bz#187402 [since FEDORA-2006-261]
 CVE-2006-1548 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) bz#187544


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- fc5	7 Apr 2006 07:07:30 -0000	1.105
+++ fc5	7 Apr 2006 14:23:46 -0000	1.106
@@ -4,6 +4,7 @@
 ** are items that need attention
 
 CVE-2006-1646 ignore (ipsec-tools) KAME racoon, not ipsec-tools racoon
+CVE-2006-1624 ignore (sysklogd) Silly configuration is not a security issue
 CVE-2006-1548 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) bz#187544



From fedora-extras-commits at redhat.com  Fri Apr  7 14:53:34 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 07:53:34 -0700
Subject: rpms/perl-Template-Toolkit/FC-5 perl-Template-Toolkit.spec,1.3,1.4
Message-ID: <200604071453.k37Era0E005007@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Template-Toolkit/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4943/FC-5

Modified Files:
	perl-Template-Toolkit.spec 
Log Message:

Resolve BZ 173756



Index: perl-Template-Toolkit.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Template-Toolkit/FC-5/perl-Template-Toolkit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Template-Toolkit.spec	28 Feb 2006 23:42:16 -0000	1.3
+++ perl-Template-Toolkit.spec	7 Apr 2006 14:53:34 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Template-Toolkit
 Version:        2.14
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Template processing system
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -51,7 +51,7 @@
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor \
-  TT_PREFIX=%{_datadir}/tt2 TT_DBI=n TT_ACCEPT=y
+  TT_PREFIX=$RPM_BUILD_ROOT%{_datadir}/tt2 TT_DBI=n TT_ACCEPT=y
 make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
 
 %install
@@ -94,6 +94,9 @@
 %{_datadir}/tt2/examples
 
 %changelog
+* Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.14-7
+- use proper TT_PREFIX setting everywhere, resolve bug 173756
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.14-6
 - bump for FC-5
 



From fedora-extras-commits at redhat.com  Fri Apr  7 14:53:35 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 07:53:35 -0700
Subject: rpms/perl-Template-Toolkit/devel perl-Template-Toolkit.spec, 1.3,
	1.4
Message-ID: <200604071453.k37ErbYj005011@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Template-Toolkit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4943/devel

Modified Files:
	perl-Template-Toolkit.spec 
Log Message:

Resolve BZ 173756



Index: perl-Template-Toolkit.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Template-Toolkit/devel/perl-Template-Toolkit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Template-Toolkit.spec	28 Feb 2006 23:42:16 -0000	1.3
+++ perl-Template-Toolkit.spec	7 Apr 2006 14:53:35 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Template-Toolkit
 Version:        2.14
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Template processing system
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -51,7 +51,7 @@
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor \
-  TT_PREFIX=%{_datadir}/tt2 TT_DBI=n TT_ACCEPT=y
+  TT_PREFIX=$RPM_BUILD_ROOT%{_datadir}/tt2 TT_DBI=n TT_ACCEPT=y
 make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
 
 %install
@@ -94,6 +94,9 @@
 %{_datadir}/tt2/examples
 
 %changelog
+* Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.14-7
+- use proper TT_PREFIX setting everywhere, resolve bug 173756
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.14-6
 - bump for FC-5
 



From fedora-extras-commits at redhat.com  Fri Apr  7 14:53:34 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 07:53:34 -0700
Subject: rpms/perl-Template-Toolkit/FC-4 perl-Template-Toolkit.spec,1.3,1.4
Message-ID: <200604071453.k37EraLM005003@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Template-Toolkit/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4943/FC-4

Modified Files:
	perl-Template-Toolkit.spec 
Log Message:

Resolve BZ 173756



Index: perl-Template-Toolkit.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Template-Toolkit/FC-4/perl-Template-Toolkit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Template-Toolkit.spec	28 Feb 2006 23:42:11 -0000	1.3
+++ perl-Template-Toolkit.spec	7 Apr 2006 14:53:34 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Template-Toolkit
 Version:        2.14
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Template processing system
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -51,7 +51,7 @@
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor \
-  TT_PREFIX=%{_datadir}/tt2 TT_DBI=n TT_ACCEPT=y
+  TT_PREFIX=$RPM_BUILD_ROOT%{_datadir}/tt2 TT_DBI=n TT_ACCEPT=y
 make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
 
 %install
@@ -94,6 +94,9 @@
 %{_datadir}/tt2/examples
 
 %changelog
+* Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.14-7
+- use proper TT_PREFIX setting everywhere, resolve bug 173756
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.14-6
 - bump for FC-5
 



From fedora-extras-commits at redhat.com  Fri Apr  7 14:53:33 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 07:53:33 -0700
Subject: rpms/perl-Template-Toolkit/FC-3 perl-Template-Toolkit.spec,1.3,1.4
Message-ID: <200604071454.k37Es5lE005014@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Template-Toolkit/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4943/FC-3

Modified Files:
	perl-Template-Toolkit.spec 
Log Message:

Resolve BZ 173756



Index: perl-Template-Toolkit.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Template-Toolkit/FC-3/perl-Template-Toolkit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Template-Toolkit.spec	28 Feb 2006 23:42:05 -0000	1.3
+++ perl-Template-Toolkit.spec	7 Apr 2006 14:53:33 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-Template-Toolkit
 Version:        2.14
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Template processing system
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -51,7 +51,7 @@
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor \
-  TT_PREFIX=%{_datadir}/tt2 TT_DBI=n TT_ACCEPT=y
+  TT_PREFIX=$RPM_BUILD_ROOT%{_datadir}/tt2 TT_DBI=n TT_ACCEPT=y
 make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
 
 %install
@@ -94,6 +94,9 @@
 %{_datadir}/tt2/examples
 
 %changelog
+* Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.14-7
+- use proper TT_PREFIX setting everywhere, resolve bug 173756
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.14-6
 - bump for FC-5
 



From fedora-extras-commits at redhat.com  Fri Apr  7 15:04:50 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Fri,  7 Apr 2006 08:04:50 -0700
Subject: rpms/exim/FC-5 exim-4.61-ldap-deprecated.patch, NONE, 1.1 exim.spec,
	1.17, 1.18
Message-ID: <200604071504.k37F4qYK007253@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/exim/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7233

Modified Files:
	exim.spec 
Added Files:
	exim-4.61-ldap-deprecated.patch 
Log Message:
fix ldap build

exim-4.61-ldap-deprecated.patch:

--- NEW FILE exim-4.61-ldap-deprecated.patch ---
--- exim-4.61/src/lookups/ldap.c.orig	2006-04-07 16:02:48.000000000 +0100
+++ exim-4.61/src/lookups/ldap.c	2006-04-07 16:02:00.000000000 +0100
@@ -33,6 +33,7 @@ static void dummy(int x) { dummy(x-1); }
 
 /* Include LDAP headers */
 
+#define LDAP_DEPRECATED 1
 #include <lber.h>
 #include <ldap.h>
 


Index: exim.spec
===================================================================
RCS file: /cvs/extras/rpms/exim/FC-5/exim.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- exim.spec	4 Apr 2006 20:05:57 -0000	1.17
+++ exim.spec	7 Apr 2006 15:04:50 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: The exim mail transfer agent
 Name: exim
 Version: 4.61
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Url: http://www.exim.org/
 Group: System Environment/Daemons
@@ -26,6 +26,7 @@
 Patch14: exim-4.50-spamdconf.patch
 Patch15: exim-4.52-dynamic-pcre.patch
 Patch16: exim-4.61-c-before-d.patch
+Patch17: exim-4.61-ldap-deprecated.patch
 
 Requires: /etc/aliases
 BuildRequires: db4-devel openssl-devel openldap-devel pam-devel
@@ -81,6 +82,7 @@
 %patch14 -p1 -b .spamd
 %patch15 -p1 -b .pcre
 %patch16 -p0
+%patch17 -p1 -b .ldap
 
 %build
 %ifnarch s390 s390x
@@ -289,6 +291,9 @@
 %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO}
 
 %changelog
+* Fri Apr  7 2006 David Woodhouse <dwmw2 at redhat.com> 4.61-2
+- Define LDAP_DEPRECATED to ensure ldap functions are all declared.
+
 * Tue Apr  4 2006 David Woodhouse <dwmw2 at redhat.com> 4.61-1
 - Update to 4.61
 



From fedora-extras-commits at redhat.com  Fri Apr  7 15:05:18 2006
From: fedora-extras-commits at redhat.com (David Woodhouse (dwmw2))
Date: Fri,  7 Apr 2006 08:05:18 -0700
Subject: rpms/exim/devel exim-4.61-ldap-deprecated.patch, NONE, 1.1 exim.spec,
	1.17, 1.18
Message-ID: <200604071505.k37F5KsE007280@cvs-int.fedora.redhat.com>

Author: dwmw2

Update of /cvs/extras/rpms/exim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7260

Modified Files:
	exim.spec 
Added Files:
	exim-4.61-ldap-deprecated.patch 
Log Message:
fix ldap build

exim-4.61-ldap-deprecated.patch:

--- NEW FILE exim-4.61-ldap-deprecated.patch ---
--- exim-4.61/src/lookups/ldap.c.orig	2006-04-07 16:02:48.000000000 +0100
+++ exim-4.61/src/lookups/ldap.c	2006-04-07 16:02:00.000000000 +0100
@@ -33,6 +33,7 @@ static void dummy(int x) { dummy(x-1); }
 
 /* Include LDAP headers */
 
+#define LDAP_DEPRECATED 1
 #include <lber.h>
 #include <ldap.h>
 


Index: exim.spec
===================================================================
RCS file: /cvs/extras/rpms/exim/devel/exim.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- exim.spec	4 Apr 2006 20:03:39 -0000	1.17
+++ exim.spec	7 Apr 2006 15:05:18 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: The exim mail transfer agent
 Name: exim
 Version: 4.61
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Url: http://www.exim.org/
 Group: System Environment/Daemons
@@ -26,6 +26,7 @@
 Patch14: exim-4.50-spamdconf.patch
 Patch15: exim-4.52-dynamic-pcre.patch
 Patch16: exim-4.61-c-before-d.patch
+Patch17: exim-4.61-ldap-deprecated.patch
 
 Requires: /etc/aliases
 BuildRequires: db4-devel openssl-devel openldap-devel pam-devel
@@ -81,6 +82,7 @@
 %patch14 -p1 -b .spamd
 %patch15 -p1 -b .pcre
 %patch16 -p0
+%patch17 -p1 -b .ldap
 
 %build
 %ifnarch s390 s390x
@@ -289,6 +291,9 @@
 %doc sa-exim*/{ACKNOWLEDGEMENTS,INSTALL,LICENSE,TODO}
 
 %changelog
+* Fri Apr  7 2006 David Woodhouse <dwmw2 at redhat.com> 4.61-2
+- Define LDAP_DEPRECATED to ensure ldap functions are all declared.
+
 * Tue Apr  4 2006 David Woodhouse <dwmw2 at redhat.com> 4.61-1
 - Update to 4.61
 



From fedora-extras-commits at redhat.com  Fri Apr  7 15:19:42 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 08:19:42 -0700
Subject: rpms/xsupplicant/FC-4 sources, 1.6,
	1.7 xsupplicant-1.2.3-fixincludes.patch, 1.1,
	1.2 xsupplicant.spec, 1.16, 1.17
Message-ID: <200604071519.k37FJi1Y007461@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xsupplicant/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7389/FC-4

Modified Files:
	sources xsupplicant-1.2.3-fixincludes.patch xsupplicant.spec 
Log Message:

bump to 1.2.4



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Mar 2006 02:11:38 -0000	1.6
+++ sources	7 Apr 2006 15:19:41 -0000	1.7
@@ -1 +1 @@
-f583f13d5bb91f98dab106d3610a677f  xsupplicant-1.2.3.tar.gz
+45c5bc08ae38152ba892a0923e0399cb  xsupplicant-1.2.4.tar.gz

xsupplicant-1.2.3-fixincludes.patch:

Index: xsupplicant-1.2.3-fixincludes.patch
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-4/xsupplicant-1.2.3-fixincludes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xsupplicant-1.2.3-fixincludes.patch	1 Mar 2006 02:13:49 -0000	1.1
+++ xsupplicant-1.2.3-fixincludes.patch	7 Apr 2006 15:19:41 -0000	1.2
@@ -53,13 +53,3 @@
  #include <stdlib.h>
  #include <string.h>
  #include <unistd.h>
---- xsupplicant-1.2.3/lib/libxsupconfcheck/Makefile.am.BAD	2006-02-28 20:00:00.000000000 -0600
-+++ xsupplicant-1.2.3/lib/libxsupconfcheck/Makefile.am	2006-02-28 20:00:13.000000000 -0600
-@@ -1,6 +1,6 @@
- AUTOMAKE_OPTIONS=foreign no-dependencies
- 
--INCLUDES                = -I ${top_srcdir}/src
-+INCLUDES                = -I ${top_srcdir}/src -I ${top_srcdir}/lib/libxsupconfig
- include_HEADERS         = xsupconfcheck.h
- lib_LIBRARIES           = libxsupconfcheck.a
- libxsupconfcheck_a_SOURCES = xsupconfcheck.c


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-4/xsupplicant.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xsupplicant.spec	1 Mar 2006 02:15:46 -0000	1.16
+++ xsupplicant.spec	7 Apr 2006 15:19:41 -0000	1.17
@@ -1,7 +1,7 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
-Version:	1.2.3
-Release:	2%{?dist}
+Version:	1.2.4
+Release:	1%{?dist}
 License:	GPL
 Group:		System Environment/Base
 URL:		http://www.open1x.org/
@@ -76,6 +76,9 @@
 %{_libdir}/libxsup*.a
 
 %changelog
+* Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.4-1
+- bump to 1.2.4
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.3-2
 - whoops. missed a file.
 



From fedora-extras-commits at redhat.com  Fri Apr  7 15:19:42 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 08:19:42 -0700
Subject: rpms/xsupplicant/FC-5 sources, 1.6,
	1.7 xsupplicant-1.2.3-fixincludes.patch, 1.1,
	1.2 xsupplicant.spec, 1.17, 1.18
Message-ID: <200604071519.k37FJifm007470@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xsupplicant/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7389/FC-5

Modified Files:
	sources xsupplicant-1.2.3-fixincludes.patch xsupplicant.spec 
Log Message:

bump to 1.2.4



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Mar 2006 02:11:46 -0000	1.6
+++ sources	7 Apr 2006 15:19:42 -0000	1.7
@@ -1 +1 @@
-f583f13d5bb91f98dab106d3610a677f  xsupplicant-1.2.3.tar.gz
+45c5bc08ae38152ba892a0923e0399cb  xsupplicant-1.2.4.tar.gz

xsupplicant-1.2.3-fixincludes.patch:

Index: xsupplicant-1.2.3-fixincludes.patch
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-5/xsupplicant-1.2.3-fixincludes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xsupplicant-1.2.3-fixincludes.patch	1 Mar 2006 02:11:46 -0000	1.1
+++ xsupplicant-1.2.3-fixincludes.patch	7 Apr 2006 15:19:42 -0000	1.2
@@ -53,13 +53,3 @@
  #include <stdlib.h>
  #include <string.h>
  #include <unistd.h>
---- xsupplicant-1.2.3/lib/libxsupconfcheck/Makefile.am.BAD	2006-02-28 20:00:00.000000000 -0600
-+++ xsupplicant-1.2.3/lib/libxsupconfcheck/Makefile.am	2006-02-28 20:00:13.000000000 -0600
-@@ -1,6 +1,6 @@
- AUTOMAKE_OPTIONS=foreign no-dependencies
- 
--INCLUDES                = -I ${top_srcdir}/src
-+INCLUDES                = -I ${top_srcdir}/src -I ${top_srcdir}/lib/libxsupconfig
- include_HEADERS         = xsupconfcheck.h
- lib_LIBRARIES           = libxsupconfcheck.a
- libxsupconfcheck_a_SOURCES = xsupconfcheck.c


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-5/xsupplicant.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xsupplicant.spec	1 Mar 2006 02:16:06 -0000	1.17
+++ xsupplicant.spec	7 Apr 2006 15:19:42 -0000	1.18
@@ -1,7 +1,7 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
-Version:	1.2.3
-Release:	2%{?dist}
+Version:	1.2.4
+Release:	1%{?dist}
 License:	GPL
 Group:		System Environment/Base
 URL:		http://www.open1x.org/
@@ -76,6 +76,9 @@
 %{_libdir}/libxsup*.a
 
 %changelog
+* Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.4-1
+- bump to 1.2.4
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.3-2
 - whoops. missed a file.
 



From fedora-extras-commits at redhat.com  Fri Apr  7 15:19:43 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 08:19:43 -0700
Subject: rpms/xsupplicant/devel .cvsignore, 1.4, 1.5 sources, 1.6,
	1.7 xsupplicant-1.2.3-fixincludes.patch, 1.1,
	1.2 xsupplicant.spec, 1.17, 1.18
Message-ID: <200604071519.k37FJjwQ007480@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xsupplicant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7389/devel

Modified Files:
	.cvsignore sources xsupplicant-1.2.3-fixincludes.patch 
	xsupplicant.spec 
Log Message:

bump to 1.2.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Mar 2006 02:11:46 -0000	1.4
+++ .cvsignore	7 Apr 2006 15:19:43 -0000	1.5
@@ -1,3 +1,4 @@
 xsupplicant-1.2.tar.gz
 xsupplicant-1.2.2.tar.gz
 xsupplicant-1.2.3.tar.gz
+xsupplicant-1.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Mar 2006 02:11:46 -0000	1.6
+++ sources	7 Apr 2006 15:19:43 -0000	1.7
@@ -1 +1 @@
-f583f13d5bb91f98dab106d3610a677f  xsupplicant-1.2.3.tar.gz
+45c5bc08ae38152ba892a0923e0399cb  xsupplicant-1.2.4.tar.gz

xsupplicant-1.2.3-fixincludes.patch:

Index: xsupplicant-1.2.3-fixincludes.patch
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/devel/xsupplicant-1.2.3-fixincludes.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xsupplicant-1.2.3-fixincludes.patch	1 Mar 2006 02:11:46 -0000	1.1
+++ xsupplicant-1.2.3-fixincludes.patch	7 Apr 2006 15:19:43 -0000	1.2
@@ -53,13 +53,3 @@
  #include <stdlib.h>
  #include <string.h>
  #include <unistd.h>
---- xsupplicant-1.2.3/lib/libxsupconfcheck/Makefile.am.BAD	2006-02-28 20:00:00.000000000 -0600
-+++ xsupplicant-1.2.3/lib/libxsupconfcheck/Makefile.am	2006-02-28 20:00:13.000000000 -0600
-@@ -1,6 +1,6 @@
- AUTOMAKE_OPTIONS=foreign no-dependencies
- 
--INCLUDES                = -I ${top_srcdir}/src
-+INCLUDES                = -I ${top_srcdir}/src -I ${top_srcdir}/lib/libxsupconfig
- include_HEADERS         = xsupconfcheck.h
- lib_LIBRARIES           = libxsupconfcheck.a
- libxsupconfcheck_a_SOURCES = xsupconfcheck.c


Index: xsupplicant.spec
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/devel/xsupplicant.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xsupplicant.spec	1 Mar 2006 02:16:06 -0000	1.17
+++ xsupplicant.spec	7 Apr 2006 15:19:43 -0000	1.18
@@ -1,7 +1,7 @@
 Name:		xsupplicant
 Summary:	Open Source Implementation of IEEE 802.1x
-Version:	1.2.3
-Release:	2%{?dist}
+Version:	1.2.4
+Release:	1%{?dist}
 License:	GPL
 Group:		System Environment/Base
 URL:		http://www.open1x.org/
@@ -76,6 +76,9 @@
 %{_libdir}/libxsup*.a
 
 %changelog
+* Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.4-1
+- bump to 1.2.4
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.2.3-2
 - whoops. missed a file.
 



From fedora-extras-commits at redhat.com  Fri Apr  7 15:19:41 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 08:19:41 -0700
Subject: rpms/xsupplicant/FC-3 sources,1.5,1.6
Message-ID: <200604071520.k37FKDxb007483@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/xsupplicant/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7389/FC-3

Modified Files:
	sources 
Log Message:

bump to 1.2.4



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xsupplicant/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Oct 2005 14:20:16 -0000	1.5
+++ sources	7 Apr 2006 15:19:41 -0000	1.6
@@ -1 +1 @@
-0e9aaf83a11f8eaff7c6564a53c25d8e  xsupplicant-1.2.2.tar.gz
+45c5bc08ae38152ba892a0923e0399cb  xsupplicant-1.2.4.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr  7 15:36:56 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri,  7 Apr 2006 08:36:56 -0700
Subject: rpms/pipenightdreams/devel pipenightdreams-0.10.0-sanitize.patch,
	NONE, 1.1 pipenightdreams.spec, 1.1, 1.2
Message-ID: <200604071536.k37Faw81008238@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/pipenightdreams/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8218

Modified Files:
	pipenightdreams.spec 
Added Files:
	pipenightdreams-0.10.0-sanitize.patch 
Log Message:
* Fri Apr  7 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.0-2
- Remove use of a trademarked term from %description, manpage and docs


pipenightdreams-0.10.0-sanitize.patch:

--- NEW FILE pipenightdreams-0.10.0-sanitize.patch ---
diff -ur pipenightdreams-0.10.0.orig/README pipenightdreams-0.10.0/README
--- pipenightdreams-0.10.0.orig/README	2001-10-12 22:02:34.000000000 +0200
+++ pipenightdreams-0.10.0/README	2006-04-07 17:15:52.000000000 +0200
@@ -9,7 +9,7 @@
               http:://www.libsdl.org/projects/pipenightdreams
 
 
-This game is a pseudo-clon of an old game called PipeDream. I say pseudo-clon
+This game is a pseudo-clon of an old pipeline arcade game. I say pseudo-clon
 because I don't have the original one so I've been working just with the facts
 I remember. I've written it in my spare time during the last twelve months (as you
 can see my spare time is not much).
diff -ur pipenightdreams-0.10.0.orig/man/pipenightdreams.6 pipenightdreams-0.10.0/man/pipenightdreams.6
--- pipenightdreams-0.10.0.orig/man/pipenightdreams.6	2002-03-23 22:17:05.000000000 +0100
+++ pipenightdreams-0.10.0/man/pipenightdreams.6	2006-04-07 17:30:39.000000000 +0200
@@ -6,23 +6,19 @@
 
 .SH SYNOPSIS 
 
-\fB pipenightdreams\fP [\--datadir <DATADIR>] [\--fullscreen]
+\fBpipenightdreams\fP [\--datadir <DATADIR>] [\--fullscreen]
 
 .SH DESCRIPTION
 
-\fB pipenightdreams\fP is a PipeDream style game. The objetive of the game is to carry
-liquid from some point to the exit using different kinds of pipes. On each level
-there is a minimum number of required pipes that should be at least reached for it
+\fBpipenightdreams\fP is a puzzle-game where the objective is to carry liquid
+from some point to the exit using different kinds of pipes. On each level there
+is a minimum number of required pipes that should be at least reached for it
 to be completed.
 
 The score is increased by using as many pipes as possible an by collecting various bonus
 tokens making the liquid pass through their pipes. There are also life bonus and,
 hopefully soon, "freeze tokens".
 
-The game is not exactly a copy of PipeDream. It's based only on the facts
-I remember and on many other things which have been added, or changed hoping for making
-it better.
-
 .SS KEYS
 The game is entirely played using the keyboard and the key layout is as follows:
 .IP SPACE
@@ -49,9 +45,7 @@
 
 .SH OPTIONS
 \fB --datadir <CUSTOM DATA DIR> \fP is used when
-the data directory is not the default one (\fB /usr/share/games/pipenightdreams\fP
-if installed from a rpm package and \fB /usr/local/share/games/pipenightdreams\fP
-when installed by compiling the source package).
+the data directory is not the default one (\fB/usr/share/pipenightdreams\fP).
 
 \fB --fullscreen \fP switchs to fullscreen mode.
 


Index: pipenightdreams.spec
===================================================================
RCS file: /cvs/extras/rpms/pipenightdreams/devel/pipenightdreams.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pipenightdreams.spec	7 Apr 2006 11:12:45 -0000	1.1
+++ pipenightdreams.spec	7 Apr 2006 15:36:56 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           pipenightdreams
 Version:        0.10.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Connect the waterpipes to create a proper pipeline
 Group:          Amusements/Games
 License:        GPL
@@ -9,20 +9,23 @@
 Source1:        %{name}.desktop
 Patch0:         pipenightdreams-0.10.0-gcc41.patch
 Patch1:         pipenightdreams-0.10.0-datadir.patch
+Patch2:         pipenightdreams-0.10.0-sanitize.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL_image-devel desktop-file-utils
 
 %description
-PipeNightDreams is a game similar to the classic PipeDream. It has 25 levels
-with increasing difficulty, and you can create your own by just editing
-text files. It has a lot of cool graphics, score, lives, required pipes
-per level and an easy and fast interface.
+PipeNightDreams is a puzzle-game where you must race against the clock to
+connect the waterpipes to create a proper pipeline before the water starts
+flowing. It has 25 levels with increasing difficulty, and you can create
+your own by just editing text files. It has a lot of cool graphics, score,
+lives, required pipes per level and an easy and fast interface.
 
 
 %prep
 %setup -q
 %patch0 -p1 -z .gcc41
-%patch1 -p1 -z .gcc41
+%patch1 -p1 -z .datadir
+%patch2 -p1 -z .sanitize
 
 
 %build
@@ -77,5 +80,8 @@
 
 
 %changelog
+* Fri Apr  7 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.0-2
+- Remove use of a trademarked term from %%description, manpage and docs
+
 * Wed Apr  5 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.0-1
 - initial Fedora Extras package



From fedora-extras-commits at redhat.com  Fri Apr  7 16:50:59 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri,  7 Apr 2006 09:50:59 -0700
Subject: rpms/svn2cl - New directory
Message-ID: <200604071651.k37Gp1aw010720@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/svn2cl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10694/svn2cl

Log Message:
Directory /cvs/extras/rpms/svn2cl added to the repository




From fedora-extras-commits at redhat.com  Fri Apr  7 16:51:00 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri,  7 Apr 2006 09:51:00 -0700
Subject: rpms/svn2cl/devel - New directory
Message-ID: <200604071651.k37Gp2Lr010723@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/svn2cl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10694/svn2cl/devel

Log Message:
Directory /cvs/extras/rpms/svn2cl/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Apr  7 16:51:15 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri,  7 Apr 2006 09:51:15 -0700
Subject: rpms/svn2cl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604071651.k37GpHFN010775@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/svn2cl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10739/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module svn2cl


--- 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 Apr  7 16:51:15 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri,  7 Apr 2006 09:51:15 -0700
Subject: rpms/svn2cl Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604071651.k37GpHed010772@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/svn2cl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10739

Added Files:
	Makefile import.log 
Log Message:
Setup of module svn2cl


--- NEW FILE Makefile ---
# Top level Makefile for module svn2cl
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr  7 16:51:43 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri,  7 Apr 2006 09:51:43 -0700
Subject: rpms/svn2cl import.log,1.1,1.2
Message-ID: <200604071651.k37Gpjx8010836@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/svn2cl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10803

Modified Files:
	import.log 
Log Message:
auto-import svn2cl-0.6-0.1 on branch devel from svn2cl-0.6-0.1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/svn2cl/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	7 Apr 2006 16:51:14 -0000	1.1
+++ import.log	7 Apr 2006 16:51:43 -0000	1.2
@@ -0,0 +1 @@
+svn2cl-0_6-0_1:HEAD:svn2cl-0.6-0.1.src.rpm:1144428695



From fedora-extras-commits at redhat.com  Fri Apr  7 16:51:43 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri,  7 Apr 2006 09:51:43 -0700
Subject: rpms/svn2cl/devel svn2cl.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604071651.k37GpjlM010841@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/svn2cl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10803/devel

Modified Files:
	.cvsignore sources 
Added Files:
	svn2cl.spec 
Log Message:
auto-import svn2cl-0.6-0.1 on branch devel from svn2cl-0.6-0.1.src.rpm


--- NEW FILE svn2cl.spec ---
Name:           svn2cl
Version:        0.6
Release:        0.1%{?dist}
Summary:        Create a ChangeLog from a Subversion log

Group:          Development/Tools
License:        BSD
URL:            http://ch.tudelft.nl/~arthur/svn2cl/
Source0:        http://ch.tudelft.nl/~arthur/svn2cl/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
Requires:       libxslt
Requires:       subversion

%description
svn2cl is a simple xsl transformation and shellscript wrapper for
generating a classic GNU-style ChangeLog from a subversion repository
log.  It is made from several changelog-like scripts using common xslt
constructs found in different places.


%prep
%setup -q
sed -i -e 's|^XSL="$dir/|XSL="%{_datadir}/svn2cl/|' svn2cl.sh


%install
rm -rf $RPM_BUILD_ROOT
install -Dpm 755 svn2cl.sh $RPM_BUILD_ROOT%{_bindir}/svn2cl
install -dm 755 $RPM_BUILD_ROOT%{_datadir}/svn2cl
install -pm 644 *.xsl $RPM_BUILD_ROOT%{_datadir}/svn2cl
install -Dpm 644 svn2cl.1 $RPM_BUILD_ROOT%{_mandir}/man1/svn2cl.1


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog NEWS README TODO authors.xml svn2html.css
%{_bindir}/svn2cl
%{_datadir}/svn2cl/
%{_mandir}/man1/svn2cl.1*


%changelog
* Thu Mar 23 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.6-0.1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/svn2cl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	7 Apr 2006 16:51:15 -0000	1.1
+++ .cvsignore	7 Apr 2006 16:51:43 -0000	1.2
@@ -0,0 +1 @@
+svn2cl-0.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/svn2cl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	7 Apr 2006 16:51:15 -0000	1.1
+++ sources	7 Apr 2006 16:51:43 -0000	1.2
@@ -0,0 +1 @@
+2458aeed899959f0c79319acd49c8e86  svn2cl-0.6.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr  7 16:53:36 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri,  7 Apr 2006 09:53:36 -0700
Subject: rpms/svn2cl/devel svn2cl.spec,1.1,1.2
Message-ID: <200604071653.k37GrciY010900@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/svn2cl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10883

Modified Files:
	svn2cl.spec 
Log Message:
* Fri Apr  7 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.6-1
- First FE build (#186632).



Index: svn2cl.spec
===================================================================
RCS file: /cvs/extras/rpms/svn2cl/devel/svn2cl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- svn2cl.spec	7 Apr 2006 16:51:43 -0000	1.1
+++ svn2cl.spec	7 Apr 2006 16:53:36 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           svn2cl
 Version:        0.6
-Release:        0.1%{?dist}
+Release:        1%{?dist}
 Summary:        Create a ChangeLog from a Subversion log
 
 Group:          Development/Tools
@@ -46,5 +46,8 @@
 
 
 %changelog
+* Fri Apr  7 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.6-1
+- First FE build (#186632).
+
 * Thu Mar 23 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.6-0.1
 - First build.



From fedora-extras-commits at redhat.com  Fri Apr  7 16:58:51 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri,  7 Apr 2006 09:58:51 -0700
Subject: owners owners.list,1.807,1.808
Message-ID: <200604071658.k37GwrAQ010991@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10974

Modified Files:
	owners.list 
Log Message:
Add svn2cl (#186632).


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.807
retrieving revision 1.808
diff -u -r1.807 -r1.808
--- owners.list	7 Apr 2006 11:21:43 -0000	1.807
+++ owners.list	7 Apr 2006 16:58:51 -0000	1.808
@@ -1359,6 +1359,7 @@
 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|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|swatch|A tool for actively monitoring log files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|sweep|An audio editor and live playback tool|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|sword|Free Bible Software Project|mpeters at mac.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Apr  7 17:39:28 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri,  7 Apr 2006 10:39:28 -0700
Subject: rpms/apt/devel .cvsignore, 1.6, 1.7 apt.spec, 1.21, 1.22 sources,
	1.6, 1.7
Message-ID: <200604071739.k37HdUPI013429@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/apt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13408

Modified Files:
	.cvsignore apt.spec sources 
Log Message:
* Fri Apr  7 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.15lorg3-0.2.pre4
- 0.5.15lorg3-pre4.

* Fri Mar 24 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.15lorg3-0.2.pre3
- 0.5.15lorg3-pre3.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	23 Mar 2006 06:33:58 -0000	1.6
+++ .cvsignore	7 Apr 2006 17:39:27 -0000	1.7
@@ -1 +1 @@
-apt-0.5.15lorg3-pre2.tar.bz2
+apt-0.5.15lorg3-pre4.tar.bz2


Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- apt.spec	23 Mar 2006 06:33:58 -0000	1.21
+++ apt.spec	7 Apr 2006 17:39:27 -0000	1.22
@@ -6,12 +6,12 @@
 Summary:        Debian's Advanced Packaging Tool with RPM support
 Name:           apt
 Version:        0.5.15lorg3
-Release:        0.2.pre2%{?dist}
+Release:        0.2.pre4%{?dist}
 Group:          System Environment/Base
-URL:            https://moin.conectiva.com.br/AptRpm
+URL:            http://laiskiainen.org/
 License:        GPL
 
-Source0:        http://laiskiainen.org/apt/testing/%{name}-%{version}-pre2.tar.bz2
+Source0:        http://laiskiainen.org/apt/testing/%{name}-%{version}-pre4.tar.bz2
 
 # user editable template configs
 Source1:        apt.conf
@@ -126,7 +126,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-pre2
+%setup -q -n %{name}-%{version}-pre4
 
 # fix docs to reference correct paths
 perl -pi -e \
@@ -311,6 +311,12 @@
 
 
 %changelog
+* Fri Apr  7 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.15lorg3-0.2.pre4
+- 0.5.15lorg3-pre4.
+
+* Fri Mar 24 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.15lorg3-0.2.pre3
+- 0.5.15lorg3-pre3.
+
 * Wed Mar 22 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.15lorg3-0.2.pre2
 - Don't ship our copies of GPG keys, use ones in /etc/pki/rpm-gpg instead.
 - Don't import the "Old RHL key" by default.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Mar 2006 06:33:58 -0000	1.6
+++ sources	7 Apr 2006 17:39:27 -0000	1.7
@@ -1 +1 @@
-530456d62eb62d980ebb0d057260a7f1  apt-0.5.15lorg3-pre2.tar.bz2
+8c46b74a7e844c7e40017bdad59cee6c  apt-0.5.15lorg3-pre4.tar.bz2



From fedora-extras-commits at redhat.com  Fri Apr  7 18:11:28 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 11:11:28 -0700
Subject: rpms/perl-Template-Toolkit/FC-4 perl-Template-Toolkit.spec,1.4,1.5
Message-ID: <200604071811.k37IBUCI015786@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Template-Toolkit/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15726/FC-4

Modified Files:
	perl-Template-Toolkit.spec 
Log Message:

Really fix 173756



Index: perl-Template-Toolkit.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Template-Toolkit/FC-4/perl-Template-Toolkit.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Template-Toolkit.spec	7 Apr 2006 14:53:34 -0000	1.4
+++ perl-Template-Toolkit.spec	7 Apr 2006 18:11:28 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Template-Toolkit
 Version:        2.14
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Template processing system
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -68,6 +68,9 @@
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 mkdir _docs ; mv $RPM_BUILD_ROOT%{_datadir}/tt2/docs _docs
+# Nuke buildroot where it hides
+sed -i "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT%{_datadir}/tt2/examples/ttree.cfg
+sed -i "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT%{perl_vendorarch}/Template/Config.pm
 
 %check
 make test
@@ -94,6 +97,9 @@
 %{_datadir}/tt2/examples
 
 %changelog
+* Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.14-8
+- really resolve bug 173756
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.14-7
 - use proper TT_PREFIX setting everywhere, resolve bug 173756
 



From fedora-extras-commits at redhat.com  Fri Apr  7 18:11:29 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 11:11:29 -0700
Subject: rpms/perl-Template-Toolkit/FC-5 perl-Template-Toolkit.spec,1.4,1.5
Message-ID: <200604071811.k37IBVJ2015788@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Template-Toolkit/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15726/FC-5

Modified Files:
	perl-Template-Toolkit.spec 
Log Message:

Really fix 173756



Index: perl-Template-Toolkit.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Template-Toolkit/FC-5/perl-Template-Toolkit.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Template-Toolkit.spec	7 Apr 2006 14:53:34 -0000	1.4
+++ perl-Template-Toolkit.spec	7 Apr 2006 18:11:29 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Template-Toolkit
 Version:        2.14
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Template processing system
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -68,6 +68,9 @@
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 mkdir _docs ; mv $RPM_BUILD_ROOT%{_datadir}/tt2/docs _docs
+# Nuke buildroot where it hides
+sed -i "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT%{_datadir}/tt2/examples/ttree.cfg
+sed -i "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT%{perl_vendorarch}/Template/Config.pm
 
 %check
 make test
@@ -94,6 +97,9 @@
 %{_datadir}/tt2/examples
 
 %changelog
+* Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.14-8
+- really resolve bug 173756
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.14-7
 - use proper TT_PREFIX setting everywhere, resolve bug 173756
 



From fedora-extras-commits at redhat.com  Fri Apr  7 18:11:30 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 11:11:30 -0700
Subject: rpms/perl-Template-Toolkit/devel perl-Template-Toolkit.spec, 1.4,
	1.5
Message-ID: <200604071811.k37IBWU9015792@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Template-Toolkit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15726/devel

Modified Files:
	perl-Template-Toolkit.spec 
Log Message:

Really fix 173756



Index: perl-Template-Toolkit.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Template-Toolkit/devel/perl-Template-Toolkit.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Template-Toolkit.spec	7 Apr 2006 14:53:35 -0000	1.4
+++ perl-Template-Toolkit.spec	7 Apr 2006 18:11:30 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Template-Toolkit
 Version:        2.14
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Template processing system
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -68,6 +68,9 @@
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 mkdir _docs ; mv $RPM_BUILD_ROOT%{_datadir}/tt2/docs _docs
+# Nuke buildroot where it hides
+sed -i "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT%{_datadir}/tt2/examples/ttree.cfg
+sed -i "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT%{perl_vendorarch}/Template/Config.pm
 
 %check
 make test
@@ -94,6 +97,9 @@
 %{_datadir}/tt2/examples
 
 %changelog
+* Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.14-8
+- really resolve bug 173756
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.14-7
 - use proper TT_PREFIX setting everywhere, resolve bug 173756
 



From fedora-extras-commits at redhat.com  Fri Apr  7 18:11:28 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 11:11:28 -0700
Subject: rpms/perl-Template-Toolkit/FC-3 perl-Template-Toolkit.spec,1.4,1.5
Message-ID: <200604071812.k37IC0cL015797@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Template-Toolkit/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15726/FC-3

Modified Files:
	perl-Template-Toolkit.spec 
Log Message:

Really fix 173756



Index: perl-Template-Toolkit.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Template-Toolkit/FC-3/perl-Template-Toolkit.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Template-Toolkit.spec	7 Apr 2006 14:53:33 -0000	1.4
+++ perl-Template-Toolkit.spec	7 Apr 2006 18:11:27 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           perl-Template-Toolkit
 Version:        2.14
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Template processing system
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -68,6 +68,10 @@
 find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
 chmod -R u+w $RPM_BUILD_ROOT/*
 mkdir _docs ; mv $RPM_BUILD_ROOT%{_datadir}/tt2/docs _docs
+# Nuke buildroot where it hides
+sed -i "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT%{_datadir}/tt2/examples/ttree.cfg
+sed -i "s|$RPM_BUILD_ROOT||g" $RPM_BUILD_ROOT%{perl_vendorarch}/Template/Config.pm
+
 
 %check
 make test
@@ -94,6 +98,9 @@
 %{_datadir}/tt2/examples
 
 %changelog
+* Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.14-8
+- really resolve bug 173756
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> - 2.14-7
 - use proper TT_PREFIX setting everywhere, resolve bug 173756
 



From fedora-extras-commits at redhat.com  Fri Apr  7 18:27:32 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 11:27:32 -0700
Subject: rpms/blacs/devel blacs.spec,1.16,1.17
Message-ID: <200604071827.k37IRYdV016039@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/blacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15977/devel

Modified Files:
	blacs.spec 
Log Message:

Resolve lam BR, fix bz 181775



Index: blacs.spec
===================================================================
RCS file: /cvs/extras/rpms/blacs/devel/blacs.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- blacs.spec	28 Feb 2006 21:22:29 -0000	1.16
+++ blacs.spec	7 Apr 2006 18:27:31 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -19,8 +19,8 @@
 # Lam before 7.1.1-5 is missing:
 # -shared library support
 # -fPIC compilation flag
-BuildRequires: lapack, blas, lam >= 7.1.1-5
-Requires: lapack, blas, lam >= 7.1.1-5
+BuildRequires: lapack, blas, lam >= 2:7.1.1-5
+Requires: lapack, blas, lam >= 2:7.1.1-5
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0: blacs-shared.patch
 
@@ -109,6 +109,9 @@
 %{_libdir}/libmpiblacs*.so
 
 %changelog
+* Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-20
+- fix lam BR
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-19
 - fix broken bits in shared lib (no -fstack-protector for us)
 



From fedora-extras-commits at redhat.com  Fri Apr  7 18:27:25 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 11:27:25 -0700
Subject: rpms/blacs/FC-3 blacs.spec,1.16,1.17
Message-ID: <200604071827.k37IRvFv016042@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/blacs/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15977/FC-3

Modified Files:
	blacs.spec 
Log Message:

Resolve lam BR, fix bz 181775



Index: blacs.spec
===================================================================
RCS file: /cvs/extras/rpms/blacs/FC-3/blacs.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- blacs.spec	28 Feb 2006 21:22:17 -0000	1.16
+++ blacs.spec	7 Apr 2006 18:27:24 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -19,8 +19,8 @@
 # Lam before 7.1.1-5 is missing:
 # -shared library support
 # -fPIC compilation flag
-BuildRequires: lapack, blas, lam >= 7.1.1-5
-Requires: lapack, blas, lam >= 7.1.1-5
+BuildRequires: lapack, blas, lam >= 2:7.1.1-5
+Requires: lapack, blas, lam >= 2:7.1.1-5
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0: blacs-shared.patch
 
@@ -109,6 +109,9 @@
 %{_libdir}/libmpiblacs*.so
 
 %changelog
+* Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-20
+- fix lam BR
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-19
 - fix broken bits in shared lib (no -fstack-protector for us)
 



From fedora-extras-commits at redhat.com  Fri Apr  7 18:27:25 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 11:27:25 -0700
Subject: rpms/blacs/FC-4 blacs.spec,1.16,1.17
Message-ID: <200604071827.k37IRvTr016045@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/blacs/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15977/FC-4

Modified Files:
	blacs.spec 
Log Message:

Resolve lam BR, fix bz 181775



Index: blacs.spec
===================================================================
RCS file: /cvs/extras/rpms/blacs/FC-4/blacs.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- blacs.spec	28 Feb 2006 21:22:23 -0000	1.16
+++ blacs.spec	7 Apr 2006 18:27:25 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -19,8 +19,8 @@
 # Lam before 7.1.1-5 is missing:
 # -shared library support
 # -fPIC compilation flag
-BuildRequires: lapack, blas, lam >= 7.1.1-5
-Requires: lapack, blas, lam >= 7.1.1-5
+BuildRequires: lapack, blas, lam >= 2:7.1.1-5
+Requires: lapack, blas, lam >= 2:7.1.1-5
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0: blacs-shared.patch
 
@@ -109,6 +109,9 @@
 %{_libdir}/libmpiblacs*.so
 
 %changelog
+* Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-20
+- fix lam BR
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-19
 - fix broken bits in shared lib (no -fstack-protector for us)
 



From fedora-extras-commits at redhat.com  Fri Apr  7 18:27:26 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 11:27:26 -0700
Subject: rpms/blacs/FC-5 blacs.spec,1.16,1.17
Message-ID: <200604071828.k37IRwEN016048@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/blacs/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15977/FC-5

Modified Files:
	blacs.spec 
Log Message:

Resolve lam BR, fix bz 181775



Index: blacs.spec
===================================================================
RCS file: /cvs/extras/rpms/blacs/FC-5/blacs.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- blacs.spec	28 Feb 2006 21:22:29 -0000	1.16
+++ blacs.spec	7 Apr 2006 18:27:26 -0000	1.17
@@ -1,7 +1,7 @@
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 19%{?dist}
+Release: 20%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -19,8 +19,8 @@
 # Lam before 7.1.1-5 is missing:
 # -shared library support
 # -fPIC compilation flag
-BuildRequires: lapack, blas, lam >= 7.1.1-5
-Requires: lapack, blas, lam >= 7.1.1-5
+BuildRequires: lapack, blas, lam >= 2:7.1.1-5
+Requires: lapack, blas, lam >= 2:7.1.1-5
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0: blacs-shared.patch
 
@@ -109,6 +109,9 @@
 %{_libdir}/libmpiblacs*.so
 
 %changelog
+* Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-20
+- fix lam BR
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-19
 - fix broken bits in shared lib (no -fstack-protector for us)
 



From fedora-extras-commits at redhat.com  Fri Apr  7 18:53:22 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 11:53:22 -0700
Subject: rpms/blacs/devel Bmake.inc, 1.3, 1.4 Bmake.inc.64bit, 1.3,
	1.4 blacs.spec, 1.17, 1.18
Message-ID: <200604071853.k37IrOnN016583@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/blacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16515/devel

Modified Files:
	Bmake.inc Bmake.inc.64bit blacs.spec 
Log Message:

Fix lam includes



Index: Bmake.inc
===================================================================
RCS file: /cvs/extras/rpms/blacs/devel/Bmake.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Bmake.inc	29 Jul 2005 22:08:23 -0000	1.3
+++ Bmake.inc	7 Apr 2006 18:53:22 -0000	1.4
@@ -55,7 +55,7 @@
 #  -------------------------------------
    MPIdir = /usr
    MPILIBdir = $(MPIdir)/lib
-   MPIINCdir = $(MPIdir)/include
+   MPIINCdir = $(MPIdir)/include/lam
    MPILIB = -lmpi
    LAMLIBS = -llam -llamf77mpi
    EXTRALIBS = -ldl -lpthread -lutil


Index: Bmake.inc.64bit
===================================================================
RCS file: /cvs/extras/rpms/blacs/devel/Bmake.inc.64bit,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Bmake.inc.64bit	29 Jul 2005 22:08:23 -0000	1.3
+++ Bmake.inc.64bit	7 Apr 2006 18:53:22 -0000	1.4
@@ -55,7 +55,7 @@
 #  -------------------------------------
    MPIdir = /usr
    MPILIBdir = $(MPIdir)/lib64
-   MPIINCdir = $(MPIdir)/include
+   MPIINCdir = $(MPIdir)/include/lam
    MPILIB = -lmpi
    LAMLIBS = -llam -llamf77mpi
    EXTRALIBS = -ldl -lpthread -lutil


Index: blacs.spec
===================================================================
RCS file: /cvs/extras/rpms/blacs/devel/blacs.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- blacs.spec	7 Apr 2006 18:27:31 -0000	1.17
+++ blacs.spec	7 Apr 2006 18:53:22 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -109,6 +109,9 @@
 %{_libdir}/libmpiblacs*.so
 
 %changelog
+* Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-21
+- FC-5+ needs includedir/lam
+
 * Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-20
 - fix lam BR
 



From fedora-extras-commits at redhat.com  Fri Apr  7 18:53:15 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 11:53:15 -0700
Subject: rpms/blacs/FC-4 blacs.spec,1.17,1.18
Message-ID: <200604071853.k37Irl4P016588@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/blacs/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16515/FC-4

Modified Files:
	blacs.spec 
Log Message:

Fix lam includes



Index: blacs.spec
===================================================================
RCS file: /cvs/extras/rpms/blacs/FC-4/blacs.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- blacs.spec	7 Apr 2006 18:27:25 -0000	1.17
+++ blacs.spec	7 Apr 2006 18:53:15 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -109,6 +109,9 @@
 %{_libdir}/libmpiblacs*.so
 
 %changelog
+* Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-21
+- FC-5+ needs includedir/lam
+
 * Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-20
 - fix lam BR
 



From fedora-extras-commits at redhat.com  Fri Apr  7 18:53:16 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 11:53:16 -0700
Subject: rpms/blacs/FC-5 Bmake.inc, 1.3, 1.4 Bmake.inc.64bit, 1.3,
	1.4 blacs.spec, 1.17, 1.18
Message-ID: <200604071853.k37IrmP5016595@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/blacs/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16515/FC-5

Modified Files:
	Bmake.inc Bmake.inc.64bit blacs.spec 
Log Message:

Fix lam includes



Index: Bmake.inc
===================================================================
RCS file: /cvs/extras/rpms/blacs/FC-5/Bmake.inc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Bmake.inc	29 Jul 2005 22:08:23 -0000	1.3
+++ Bmake.inc	7 Apr 2006 18:53:16 -0000	1.4
@@ -55,7 +55,7 @@
 #  -------------------------------------
    MPIdir = /usr
    MPILIBdir = $(MPIdir)/lib
-   MPIINCdir = $(MPIdir)/include
+   MPIINCdir = $(MPIdir)/include/lam
    MPILIB = -lmpi
    LAMLIBS = -llam -llamf77mpi
    EXTRALIBS = -ldl -lpthread -lutil


Index: Bmake.inc.64bit
===================================================================
RCS file: /cvs/extras/rpms/blacs/FC-5/Bmake.inc.64bit,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Bmake.inc.64bit	29 Jul 2005 22:08:23 -0000	1.3
+++ Bmake.inc.64bit	7 Apr 2006 18:53:16 -0000	1.4
@@ -55,7 +55,7 @@
 #  -------------------------------------
    MPIdir = /usr
    MPILIBdir = $(MPIdir)/lib64
-   MPIINCdir = $(MPIdir)/include
+   MPIINCdir = $(MPIdir)/include/lam
    MPILIB = -lmpi
    LAMLIBS = -llam -llamf77mpi
    EXTRALIBS = -ldl -lpthread -lutil


Index: blacs.spec
===================================================================
RCS file: /cvs/extras/rpms/blacs/FC-5/blacs.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- blacs.spec	7 Apr 2006 18:27:26 -0000	1.17
+++ blacs.spec	7 Apr 2006 18:53:16 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -109,6 +109,9 @@
 %{_libdir}/libmpiblacs*.so
 
 %changelog
+* Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-21
+- FC-5+ needs includedir/lam
+
 * Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-20
 - fix lam BR
 



From fedora-extras-commits at redhat.com  Fri Apr  7 18:53:15 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 11:53:15 -0700
Subject: rpms/blacs/FC-3 blacs.spec,1.17,1.18
Message-ID: <200604071853.k37IrlJW016587@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/blacs/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16515/FC-3

Modified Files:
	blacs.spec 
Log Message:

Fix lam includes



Index: blacs.spec
===================================================================
RCS file: /cvs/extras/rpms/blacs/FC-3/blacs.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- blacs.spec	7 Apr 2006 18:27:24 -0000	1.17
+++ blacs.spec	7 Apr 2006 18:53:15 -0000	1.18
@@ -1,7 +1,7 @@
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -109,6 +109,9 @@
 %{_libdir}/libmpiblacs*.so
 
 %changelog
+* Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-21
+- FC-5+ needs includedir/lam
+
 * Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-20
 - fix lam BR
 



From fedora-extras-commits at redhat.com  Fri Apr  7 18:57:58 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 11:57:58 -0700
Subject: rpms/blacs/FC-5 Bmake.inc,1.4,1.5 Bmake.inc.64bit,1.4,1.5
Message-ID: <200604071858.k37Iw0Yp016651@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/blacs/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16617/FC-5

Modified Files:
	Bmake.inc Bmake.inc.64bit 
Log Message:

lib fix



Index: Bmake.inc
===================================================================
RCS file: /cvs/extras/rpms/blacs/FC-5/Bmake.inc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Bmake.inc	7 Apr 2006 18:53:16 -0000	1.4
+++ Bmake.inc	7 Apr 2006 18:57:58 -0000	1.5
@@ -54,7 +54,7 @@
 #  Name and location of the MPI library.
 #  -------------------------------------
    MPIdir = /usr
-   MPILIBdir = $(MPIdir)/lib
+   MPILIBdir = $(MPIdir)/lib/lam
    MPIINCdir = $(MPIdir)/include/lam
    MPILIB = -lmpi
    LAMLIBS = -llam -llamf77mpi


Index: Bmake.inc.64bit
===================================================================
RCS file: /cvs/extras/rpms/blacs/FC-5/Bmake.inc.64bit,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Bmake.inc.64bit	7 Apr 2006 18:53:16 -0000	1.4
+++ Bmake.inc.64bit	7 Apr 2006 18:57:58 -0000	1.5
@@ -54,7 +54,7 @@
 #  Name and location of the MPI library.
 #  -------------------------------------
    MPIdir = /usr
-   MPILIBdir = $(MPIdir)/lib64
+   MPILIBdir = $(MPIdir)/lib64/lam
    MPIINCdir = $(MPIdir)/include/lam
    MPILIB = -lmpi
    LAMLIBS = -llam -llamf77mpi



From fedora-extras-commits at redhat.com  Fri Apr  7 18:57:59 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 11:57:59 -0700
Subject: rpms/blacs/devel Bmake.inc,1.4,1.5 Bmake.inc.64bit,1.4,1.5
Message-ID: <200604071858.k37Iw1kJ016656@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/blacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16617/devel

Modified Files:
	Bmake.inc Bmake.inc.64bit 
Log Message:

lib fix



Index: Bmake.inc
===================================================================
RCS file: /cvs/extras/rpms/blacs/devel/Bmake.inc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Bmake.inc	7 Apr 2006 18:53:22 -0000	1.4
+++ Bmake.inc	7 Apr 2006 18:57:59 -0000	1.5
@@ -54,7 +54,7 @@
 #  Name and location of the MPI library.
 #  -------------------------------------
    MPIdir = /usr
-   MPILIBdir = $(MPIdir)/lib
+   MPILIBdir = $(MPIdir)/lib/lam
    MPIINCdir = $(MPIdir)/include/lam
    MPILIB = -lmpi
    LAMLIBS = -llam -llamf77mpi


Index: Bmake.inc.64bit
===================================================================
RCS file: /cvs/extras/rpms/blacs/devel/Bmake.inc.64bit,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Bmake.inc.64bit	7 Apr 2006 18:53:22 -0000	1.4
+++ Bmake.inc.64bit	7 Apr 2006 18:57:59 -0000	1.5
@@ -54,7 +54,7 @@
 #  Name and location of the MPI library.
 #  -------------------------------------
    MPIdir = /usr
-   MPILIBdir = $(MPIdir)/lib64
+   MPILIBdir = $(MPIdir)/lib64/lam
    MPIINCdir = $(MPIdir)/include/lam
    MPILIB = -lmpi
    LAMLIBS = -llam -llamf77mpi



From fedora-extras-commits at redhat.com  Fri Apr  7 19:37:22 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 12:37:22 -0700
Subject: rpms/blacs/devel Bmake.inc, 1.5, 1.6 Bmake.inc.64bit, 1.5,
	1.6 blacs.spec, 1.18, 1.19
Message-ID: <200604071937.k37JbOLu020550@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/blacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20308/devel

Modified Files:
	Bmake.inc Bmake.inc.64bit blacs.spec 
Log Message:

Fix FC5+ lam libs



Index: Bmake.inc
===================================================================
RCS file: /cvs/extras/rpms/blacs/devel/Bmake.inc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Bmake.inc	7 Apr 2006 18:57:59 -0000	1.5
+++ Bmake.inc	7 Apr 2006 19:37:22 -0000	1.6
@@ -63,7 +63,7 @@
 #  -------------------------------------
 #  All libraries required by the tester.
 #  -------------------------------------
-   BTLIBS = -L$(BLACSdir) $(BLACSFINITSL) $(BLACSLIBSL) $(BLACSCINITSL) $(MPILIB) $(LAMLIBS) $(EXTRALIBS)
+   BTLIBS = -L$(BLACSdir) $(BLACSFINITSL) $(BLACSLIBSL) $(BLACSCINITSL) -L$(MPILIBdir) $(MPILIB) $(LAMLIBS) $(EXTRALIBS)
 
 #  ----------------------------------------------------------------
 #  The directory to put the installation help routines' executables


Index: Bmake.inc.64bit
===================================================================
RCS file: /cvs/extras/rpms/blacs/devel/Bmake.inc.64bit,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Bmake.inc.64bit	7 Apr 2006 18:57:59 -0000	1.5
+++ Bmake.inc.64bit	7 Apr 2006 19:37:22 -0000	1.6
@@ -63,7 +63,7 @@
 #  -------------------------------------
 #  All libraries required by the tester.
 #  -------------------------------------
-   BTLIBS = -L$(BLACSdir) $(BLACSFINITSL) $(BLACSLIBSL) $(BLACSCINITSL) $(MPILIB) $(LAMLIBS) $(EXTRALIBS)
+   BTLIBS = -L$(BLACSdir) $(BLACSFINITSL) $(BLACSLIBSL) $(BLACSCINITSL) -L$(MPILIBdir) $(MPILIB) $(LAMLIBS) $(EXTRALIBS)
 
 #  ----------------------------------------------------------------
 #  The directory to put the installation help routines' executables


Index: blacs.spec
===================================================================
RCS file: /cvs/extras/rpms/blacs/devel/blacs.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- blacs.spec	7 Apr 2006 18:53:22 -0000	1.18
+++ blacs.spec	7 Apr 2006 19:37:22 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -109,6 +109,9 @@
 %{_libdir}/libmpiblacs*.so
 
 %changelog
+* Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-22
+- FC-5+ also needs -L libdir/lam
+
 * Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-21
 - FC-5+ needs includedir/lam
 



From fedora-extras-commits at redhat.com  Fri Apr  7 19:37:15 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 12:37:15 -0700
Subject: rpms/blacs/FC-3 blacs.spec,1.18,1.19
Message-ID: <200604071937.k37JblTJ020650@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/blacs/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20308/FC-3

Modified Files:
	blacs.spec 
Log Message:

Fix FC5+ lam libs



Index: blacs.spec
===================================================================
RCS file: /cvs/extras/rpms/blacs/FC-3/blacs.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- blacs.spec	7 Apr 2006 18:53:15 -0000	1.18
+++ blacs.spec	7 Apr 2006 19:37:15 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -109,6 +109,9 @@
 %{_libdir}/libmpiblacs*.so
 
 %changelog
+* Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-22
+- FC-5+ also needs -L libdir/lam
+
 * Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-21
 - FC-5+ needs includedir/lam
 



From fedora-extras-commits at redhat.com  Fri Apr  7 19:37:16 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 12:37:16 -0700
Subject: rpms/blacs/FC-4 blacs.spec,1.18,1.19
Message-ID: <200604071937.k37JbmdW020655@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/blacs/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20308/FC-4

Modified Files:
	blacs.spec 
Log Message:

Fix FC5+ lam libs



Index: blacs.spec
===================================================================
RCS file: /cvs/extras/rpms/blacs/FC-4/blacs.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- blacs.spec	7 Apr 2006 18:53:15 -0000	1.18
+++ blacs.spec	7 Apr 2006 19:37:16 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -109,6 +109,9 @@
 %{_libdir}/libmpiblacs*.so
 
 %changelog
+* Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-22
+- FC-5+ also needs -L libdir/lam
+
 * Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-21
 - FC-5+ needs includedir/lam
 



From fedora-extras-commits at redhat.com  Fri Apr  7 19:37:16 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Fri,  7 Apr 2006 12:37:16 -0700
Subject: rpms/blacs/FC-5 Bmake.inc, 1.5, 1.6 Bmake.inc.64bit, 1.5,
	1.6 blacs.spec, 1.18, 1.19
Message-ID: <200604071937.k37Jbmpn020662@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/blacs/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20308/FC-5

Modified Files:
	Bmake.inc Bmake.inc.64bit blacs.spec 
Log Message:

Fix FC5+ lam libs



Index: Bmake.inc
===================================================================
RCS file: /cvs/extras/rpms/blacs/FC-5/Bmake.inc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Bmake.inc	7 Apr 2006 18:57:58 -0000	1.5
+++ Bmake.inc	7 Apr 2006 19:37:16 -0000	1.6
@@ -63,7 +63,7 @@
 #  -------------------------------------
 #  All libraries required by the tester.
 #  -------------------------------------
-   BTLIBS = -L$(BLACSdir) $(BLACSFINITSL) $(BLACSLIBSL) $(BLACSCINITSL) $(MPILIB) $(LAMLIBS) $(EXTRALIBS)
+   BTLIBS = -L$(BLACSdir) $(BLACSFINITSL) $(BLACSLIBSL) $(BLACSCINITSL) -L$(MPILIBdir) $(MPILIB) $(LAMLIBS) $(EXTRALIBS)
 
 #  ----------------------------------------------------------------
 #  The directory to put the installation help routines' executables


Index: Bmake.inc.64bit
===================================================================
RCS file: /cvs/extras/rpms/blacs/FC-5/Bmake.inc.64bit,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Bmake.inc.64bit	7 Apr 2006 18:57:58 -0000	1.5
+++ Bmake.inc.64bit	7 Apr 2006 19:37:16 -0000	1.6
@@ -63,7 +63,7 @@
 #  -------------------------------------
 #  All libraries required by the tester.
 #  -------------------------------------
-   BTLIBS = -L$(BLACSdir) $(BLACSFINITSL) $(BLACSLIBSL) $(BLACSCINITSL) $(MPILIB) $(LAMLIBS) $(EXTRALIBS)
+   BTLIBS = -L$(BLACSdir) $(BLACSFINITSL) $(BLACSLIBSL) $(BLACSCINITSL) -L$(MPILIBdir) $(MPILIB) $(LAMLIBS) $(EXTRALIBS)
 
 #  ----------------------------------------------------------------
 #  The directory to put the installation help routines' executables


Index: blacs.spec
===================================================================
RCS file: /cvs/extras/rpms/blacs/FC-5/blacs.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- blacs.spec	7 Apr 2006 18:53:16 -0000	1.18
+++ blacs.spec	7 Apr 2006 19:37:16 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Basic Linear Algebra Communication Subprograms
 Name: blacs
 Version: 1.1
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: Freely distributable
 Group: Development/Libraries
 URL: http://www.netlib.org/blacs
@@ -109,6 +109,9 @@
 %{_libdir}/libmpiblacs*.so
 
 %changelog
+* Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-22
+- FC-5+ also needs -L libdir/lam
+
 * Fri Apr  7 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-21
 - FC-5+ needs includedir/lam
 



From fedora-extras-commits at redhat.com  Fri Apr  7 20:56:18 2006
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Fri,  7 Apr 2006 13:56:18 -0700
Subject: rpms/perl-Imager/FC-4 .cvsignore, 1.3, 1.4 perl-Imager.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200604072056.k37KuK0Y023342@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/perl-Imager/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23321

Modified Files:
	.cvsignore perl-Imager.spec sources 
Log Message:
Updated to 0.50


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Imager/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Feb 2006 12:05:31 -0000	1.3
+++ .cvsignore	7 Apr 2006 20:56:17 -0000	1.4
@@ -1 +1 @@
-Imager-0.47.tar.gz
+Imager-0.50.tar.gz


Index: perl-Imager.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Imager/FC-4/perl-Imager.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Imager.spec	28 Feb 2006 12:05:33 -0000	1.2
+++ perl-Imager.spec	7 Apr 2006 20:56:17 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-Imager
-Version:        0.47
+Version:        0.50
 Release:        1%{?dist}
 Summary:        Imager - Perl extension for Generating 24 bit Images
 
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Fri Apr 07 2006 Gavin Henry <ghenry[AT]suretecsystems.com> - 0.50-1
+- Updated version for security fix
+
 * Tue Feb 28 2006 Gavin Henry <ghenry[AT]suretecsystems.com> - 0.47-1
 - Updated version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Imager/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Feb 2006 12:05:33 -0000	1.3
+++ sources	7 Apr 2006 20:56:17 -0000	1.4
@@ -1 +1 @@
-45e46bcf5cabdf5d7d0820226274b565  Imager-0.47.tar.gz
+19cfffe047909599226f76694155f996  Imager-0.50.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr  7 20:57:57 2006
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Fri,  7 Apr 2006 13:57:57 -0700
Subject: rpms/perl-Imager/FC-5 .cvsignore, 1.3, 1.4 perl-Imager.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200604072057.k37Kvx5x023413@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/perl-Imager/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23392

Modified Files:
	.cvsignore perl-Imager.spec sources 
Log Message:
Updated to 0.50


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Imager/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Feb 2006 12:03:03 -0000	1.3
+++ .cvsignore	7 Apr 2006 20:57:57 -0000	1.4
@@ -1 +1 @@
-Imager-0.47.tar.gz
+Imager-0.50.tar.gz


Index: perl-Imager.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Imager/FC-5/perl-Imager.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Imager.spec	28 Feb 2006 12:03:03 -0000	1.2
+++ perl-Imager.spec	7 Apr 2006 20:57:57 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-Imager
-Version:        0.47
+Version:        0.50
 Release:        1%{?dist}
 Summary:        Imager - Perl extension for Generating 24 bit Images
 
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Fri Apr 07 2006 Gavin Henry <ghenry[AT]suretecsystems.com> - 0.50-1
+- Updated version for security fix
+
 * Tue Feb 28 2006 Gavin Henry <ghenry[AT]suretecsystems.com> - 0.47-1
 - Updated version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Imager/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Feb 2006 12:03:03 -0000	1.3
+++ sources	7 Apr 2006 20:57:57 -0000	1.4
@@ -1 +1 @@
-45e46bcf5cabdf5d7d0820226274b565  Imager-0.47.tar.gz
+19cfffe047909599226f76694155f996  Imager-0.50.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr  7 20:59:45 2006
From: fedora-extras-commits at redhat.com (Gavin Henry (ghenry))
Date: Fri,  7 Apr 2006 13:59:45 -0700
Subject: rpms/perl-Imager/devel .cvsignore, 1.3, 1.4 perl-Imager.spec, 1.2, 
	1.3 sources, 1.3, 1.4
Message-ID: <200604072059.k37KxlAO023489@cvs-int.fedora.redhat.com>

Author: ghenry

Update of /cvs/extras/rpms/perl-Imager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23468

Modified Files:
	.cvsignore perl-Imager.spec sources 
Log Message:
Updated to 0.50


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Imager/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Feb 2006 12:03:03 -0000	1.3
+++ .cvsignore	7 Apr 2006 20:59:45 -0000	1.4
@@ -1 +1 @@
-Imager-0.47.tar.gz
+Imager-0.50.tar.gz


Index: perl-Imager.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Imager/devel/perl-Imager.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Imager.spec	28 Feb 2006 12:03:03 -0000	1.2
+++ perl-Imager.spec	7 Apr 2006 20:59:45 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-Imager
-Version:        0.47
+Version:        0.50
 Release:        1%{?dist}
 Summary:        Imager - Perl extension for Generating 24 bit Images
 
@@ -64,6 +64,9 @@
 
 
 %changelog
+* Fri Apr 07 2006 Gavin Henry <ghenry[AT]suretecsystems.com> - 0.50-1
+- Updated version for security fix
+
 * Tue Feb 28 2006 Gavin Henry <ghenry[AT]suretecsystems.com> - 0.47-1
 - Updated version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Imager/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Feb 2006 12:03:03 -0000	1.3
+++ sources	7 Apr 2006 20:59:45 -0000	1.4
@@ -1 +1 @@
-45e46bcf5cabdf5d7d0820226274b565  Imager-0.47.tar.gz
+19cfffe047909599226f76694155f996  Imager-0.50.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr  7 23:40:43 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri,  7 Apr 2006 16:40:43 -0700
Subject: rpms/celestia/devel .cvsignore, 1.5, 1.6 celestia.spec, 1.14,
	1.15 sources, 1.5, 1.6
Message-ID: <200604072340.k37NejjV030433@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/celestia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30412

Modified Files:
	.cvsignore celestia.spec sources 
Log Message:
Update to 1.4.1.
Use "pkg-config --libs gtkglext-x11-1.0 libgnomeui-2.0" instead of
"pkg-config --libs gtk+-2.0".



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/celestia/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Feb 2006 18:59:50 -0000	1.5
+++ .cvsignore	7 Apr 2006 23:40:43 -0000	1.6
@@ -1 +1 @@
-celestia-1.4.0.20060210cvs.tar.gz
+celestia-1.4.1.tar.gz


Index: celestia.spec
===================================================================
RCS file: /cvs/extras/rpms/celestia/devel/celestia.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- celestia.spec	11 Feb 2006 18:59:50 -0000	1.14
+++ celestia.spec	7 Apr 2006 23:40:43 -0000	1.15
@@ -1,13 +1,10 @@
 Name:           celestia
-Version:        1.4.0.20060210cvs
+Version:        1.4.1
 Release:        1%{?dist}
-
 Summary:        OpenGL real-time visual space simulation
-
 Group:          Amusements/Graphics
 License:        GPL
-#Source0:        http://dl.sf.net/celestia/celestia-%{version}.tar.gz
-Source0:        celestia-%{version}.tar.gz
+Source0:        http://dl.sf.net/celestia/celestia-%{version}.tar.gz
 Source3:        celestia.desktop
 Patch0:         celestia-1.4.0-compile.patch
 URL:            http://www.shatters.net/celestia/
@@ -22,9 +19,6 @@
 BuildRequires:  libGLU-devel
 BuildRequires:  libXt-devel
 BuildRequires:  libXmu-devel
-# For the CVS snapshot.
-BuildRequires:  gettext-devel
-
 Requires(post): GConf2
 Requires(preun): GConf2
 
@@ -47,9 +41,7 @@
 %patch0 -p0
 
 %build
-make -f Makefile.cvs
-
-export GTK_LIBS="$( pkg-config --libs gtk+-2.0 ) -lpangox-1.0"
+export GTK_LIBS="$( pkg-config --libs gtkglext-x11-1.0 libgnomeui-2.0 )"
 %configure --with-gnome
 make %{?_smp_mflags}
 
@@ -108,6 +100,11 @@
 
 
 %changelog
+* Tue Mar 28 2006 Steven Pritchard <steve at kspei.com> 1.4.1-1
+- Update to 1.4.1
+- Use "pkg-config --libs gtkglext-x11-1.0 libgnomeui-2.0" instead of
+  "pkg-config --libs gtk+-2.0"
+
 * Fri Feb 10 2006 Steven Pritchard <steve at kspei.com> 1.4.0.20060210cvs-1
 - Update to today's CVS snapshot
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/celestia/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Feb 2006 18:59:50 -0000	1.5
+++ sources	7 Apr 2006 23:40:43 -0000	1.6
@@ -1 +1 @@
-3ce623baf6113ddf6425f0ab31b2dd37  celestia-1.4.0.20060210cvs.tar.gz
+be1d36fc97a13b9a276249dbc0efac41  celestia-1.4.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  8 00:05:31 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri,  7 Apr 2006 17:05:31 -0700
Subject: rpms/perl-Kwiki-RecentChanges/devel .cvsignore, 1.2,
	1.3 perl-Kwiki-RecentChanges.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200604080005.k3805X95032562@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Kwiki-RecentChanges/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32541

Modified Files:
	.cvsignore perl-Kwiki-RecentChanges.spec sources 
Log Message:
Upgrade to 0.14.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Kwiki-RecentChanges/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Mar 2006 23:27:03 -0000	1.2
+++ .cvsignore	8 Apr 2006 00:05:30 -0000	1.3
@@ -1 +1 @@
-Kwiki-RecentChanges-0.13.tar.gz
+Kwiki-RecentChanges-0.14.tar.gz


Index: perl-Kwiki-RecentChanges.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Kwiki-RecentChanges/devel/perl-Kwiki-RecentChanges.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Kwiki-RecentChanges.spec	11 Mar 2006 00:10:45 -0000	1.2
+++ perl-Kwiki-RecentChanges.spec	8 Apr 2006 00:05:30 -0000	1.3
@@ -1,11 +1,11 @@
 Name:           perl-Kwiki-RecentChanges
-Version:        0.13
-Release:        3%{?dist}
+Version:        0.14
+Release:        1%{?dist}
 Summary:        Kwiki Recent Changes plugin
 License:        GPL or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Kwiki-RecentChanges/
-Source0:        http://www.cpan.org/authors/id/I/IN/INGY/Kwiki-RecentChanges-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/G/GU/GUGOD/Kwiki-RecentChanges-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(Kwiki) >= 0.37
@@ -52,6 +52,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Apr 07 2006 Steven Pritchard <steve at kspei.com> 0.14-1
+- Upgrade to 0.14.
+
 * Fri Mar 10 2006 Steven Pritchard <steve at kspei.com> 0.13-3
 - Cleanup.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Kwiki-RecentChanges/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Mar 2006 23:27:03 -0000	1.2
+++ sources	8 Apr 2006 00:05:30 -0000	1.3
@@ -1 +1 @@
-393c2a606b3574b775c2ce5b23fc7b8d  Kwiki-RecentChanges-0.13.tar.gz
+5c1978bffd0412d573f382e9355f7202  Kwiki-RecentChanges-0.14.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  8 00:30:24 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Fri,  7 Apr 2006 17:30:24 -0700
Subject: rpms/cgi-util - New directory
Message-ID: <200604080030.k380UQ1f032701@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/cgi-util
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32675/cgi-util

Log Message:
Directory /cvs/extras/rpms/cgi-util added to the repository




From fedora-extras-commits at redhat.com  Sat Apr  8 00:30:25 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Fri,  7 Apr 2006 17:30:25 -0700
Subject: rpms/cgi-util/devel - New directory
Message-ID: <200604080030.k380URKb032704@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/cgi-util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32675/cgi-util/devel

Log Message:
Directory /cvs/extras/rpms/cgi-util/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Apr  8 00:30:34 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Fri,  7 Apr 2006 17:30:34 -0700
Subject: rpms/cgi-util Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604080030.k380Uap0032753@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/cgi-util
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32720

Added Files:
	Makefile import.log 
Log Message:
Setup of module cgi-util


--- NEW FILE Makefile ---
# Top level Makefile for module cgi-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  Sat Apr  8 00:30:35 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Fri,  7 Apr 2006 17:30:35 -0700
Subject: rpms/cgi-util/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604080030.k380UbF8032756@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/cgi-util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32720/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cgi-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  Sat Apr  8 00:31:39 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Fri,  7 Apr 2006 17:31:39 -0700
Subject: rpms/cgi-util import.log,1.1,1.2
Message-ID: <200604080032.k380WBLs000358@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/cgi-util
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv321

Modified Files:
	import.log 
Log Message:
auto-import cgi-util-2.2.1-7 on branch devel from cgi-util-2.2.1-7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/cgi-util/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Apr 2006 00:30:34 -0000	1.1
+++ import.log	8 Apr 2006 00:31:39 -0000	1.2
@@ -0,0 +1 @@
+cgi-util-2_2_1-7:HEAD:cgi-util-2.2.1-7.src.rpm:1144456258



From fedora-extras-commits at redhat.com  Sat Apr  8 00:31:40 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Fri,  7 Apr 2006 17:31:40 -0700
Subject: rpms/cgi-util/devel cgi-util-2.2.1-autotools.patch, NONE,
	1.1 cgi-util.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604080032.k380WCQw000362@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/cgi-util/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv321/devel

Modified Files:
	.cvsignore sources 
Added Files:
	cgi-util-2.2.1-autotools.patch cgi-util.spec 
Log Message:
auto-import cgi-util-2.2.1-7 on branch devel from cgi-util-2.2.1-7.src.rpm

cgi-util-2.2.1-autotools.patch:

--- NEW FILE cgi-util-2.2.1-autotools.patch ---
diff -u --recursive --new-file cgi-util-2.2.1-vanilla/aclocal.m4 cgi-util-2.2.1/aclocal.m4
--- cgi-util-2.2.1-vanilla/aclocal.m4	1969-12-31 18:00:00.000000000 -0600
+++ cgi-util-2.2.1/aclocal.m4	2006-03-09 17:17:45.000000000 -0600
@@ -0,0 +1,7043 @@
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005  Free Software Foundation, Inc.
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+
+# serial 47 AC_PROG_LIBTOOL
+
+
+# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+# -----------------------------------------------------------
+# If this macro is not defined by Autoconf, define it here.
+m4_ifdef([AC_PROVIDE_IFELSE],
+         [],
+         [m4_define([AC_PROVIDE_IFELSE],
+	         [m4_ifdef([AC_PROVIDE_$1],
+		           [$2], [$3])])])
+
+
+# AC_PROG_LIBTOOL
+# ---------------
+AC_DEFUN([AC_PROG_LIBTOOL],
+[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
+dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
+dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
+  AC_PROVIDE_IFELSE([AC_PROG_CXX],
+    [AC_LIBTOOL_CXX],
+    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
+  ])])
+dnl And a similar setup for Fortran 77 support
+  AC_PROVIDE_IFELSE([AC_PROG_F77],
+    [AC_LIBTOOL_F77],
+    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
+])])
+
+dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
+dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
+dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
+  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
+    [AC_LIBTOOL_GCJ],
+    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
+      [AC_LIBTOOL_GCJ],
+      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
+	[AC_LIBTOOL_GCJ],
+      [ifdef([AC_PROG_GCJ],
+	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+       ifdef([A][M_PROG_GCJ],
+	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
+       ifdef([LT_AC_PROG_GCJ],
+	     [define([LT_AC_PROG_GCJ],
+		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
+])])# AC_PROG_LIBTOOL
+
+
+# _AC_PROG_LIBTOOL
+# ----------------
+AC_DEFUN([_AC_PROG_LIBTOOL],
+[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
+AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
+
+# This can be used to rebuild libtool when needed
+LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+
+# Always use our own libtool.
+LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+AC_SUBST(LIBTOOL)dnl
+
+# Prevent multiple expansion
+define([AC_PROG_LIBTOOL], [])
+])# _AC_PROG_LIBTOOL
+
+
+# AC_LIBTOOL_SETUP
+# ----------------
+AC_DEFUN([AC_LIBTOOL_SETUP],
+[AC_PREREQ(2.50)dnl
+AC_REQUIRE([AC_ENABLE_SHARED])dnl
+AC_REQUIRE([AC_ENABLE_STATIC])dnl
+AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
+AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_LD])dnl
+AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
+AC_REQUIRE([AC_PROG_NM])dnl
+
+AC_REQUIRE([AC_PROG_LN_S])dnl
+AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
+# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
+AC_REQUIRE([AC_OBJEXT])dnl
+AC_REQUIRE([AC_EXEEXT])dnl
+dnl
+
+AC_LIBTOOL_SYS_MAX_CMD_LEN
+AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
+AC_LIBTOOL_OBJDIR
+
+AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+_LT_AC_PROG_ECHO_BACKSLASH
+
+case $host_os in
+aix3*)
+  # AIX sometimes has problems with the GCC collect2 program.  For some
+  # reason, if we set the COLLECT_NAMES environment variable, the problems
+  # vanish in a puff of smoke.
+  if test "X${COLLECT_NAMES+set}" != Xset; then
+    COLLECT_NAMES=
+    export COLLECT_NAMES
+  fi
+  ;;
+esac
+
+# Sed substitution that helps us do robust quoting.  It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='sed -e 1s/^X//'
+[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+
+# Same as above, but do not quote variable references.
+[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+# Constants:
+rm="rm -f"
+
+# Global variables:
+default_ofile=libtool
+can_build_shared=yes
+
+# All known linkers require a `.a' archive for static linking (except MSVC,
+# which needs '.lib').
+libext=a
+ltmain="$ac_aux_dir/ltmain.sh"
+ofile="$default_ofile"
+with_gnu_ld="$lt_cv_prog_gnu_ld"
+
+AC_CHECK_TOOL(AR, ar, false)
+AC_CHECK_TOOL(RANLIB, ranlib, :)
+AC_CHECK_TOOL(STRIP, strip, :)
+
+old_CC="$CC"
+old_CFLAGS="$CFLAGS"
+
+# Set sane defaults for various variables
+test -z "$AR" && AR=ar
+test -z "$AR_FLAGS" && AR_FLAGS=cru
+test -z "$AS" && AS=as
+test -z "$CC" && CC=cc
+test -z "$LTCC" && LTCC=$CC
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+test -z "$LD" && LD=ld
+test -z "$LN_S" && LN_S="ln -s"
+test -z "$MAGIC_CMD" && MAGIC_CMD=file
+test -z "$NM" && NM=nm
+test -z "$SED" && SED=sed
+test -z "$OBJDUMP" && OBJDUMP=objdump
+test -z "$RANLIB" && RANLIB=:
+test -z "$STRIP" && STRIP=:
+test -z "$ac_objext" && ac_objext=o
+
+# Determine commands to create old-style static archives.
+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
+old_postinstall_cmds='chmod 644 $oldlib'
+old_postuninstall_cmds=
+
+if test -n "$RANLIB"; then
+  case $host_os in
+  openbsd*)
+    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+    ;;
+  *)
+    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+    ;;
+  esac
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+fi
+
+_LT_CC_BASENAME([$compiler])
+
[...42037 lines suppressed...]
-
-      However, if it cannot open the file, rather than return with an
-      error code, this function sends HTML text out stating that it can't
-      open the file, including the C "strerror()" description of the error.
-      It then aborts your CGI by calling "exit(0);".
-
-      Since most of the time you will be including HTML files which are
-      under your control (ie, they are part of the CGI package you are
-      creating), you will most often wish to use this function, since it
-      is simpler than "cgi_dump_no_abort()" and your HTML files should
-      always be available to your CGI.
-
-    void cgi_error(char * reason)
-    -----------------------------
-      This function displays an HTML error message, starting with the word
-      "Error" as a level one header ("<h1>") and followed by the string you
-      provide (the actual reason an error occured).
-
-      This function then calls "exit(0);" to abort your CGI.
-
-    int cgi_goodemailaddress(char * addr)
-    -------------------------------------
-      This function does its best to make sure that a string contains
-      a valid-looking e-mail address.  (This is useful for when you
-      get users who fill out a form and refuse to enter their e-mail
-      address, or they don't understand what their own e-mail address is.
-      For example, someone with the address "abc at aol.com" might think
-      their address is "abc" or "abc at aol" or "abc.aol.col" or even
-      "http://abc at aol.com".  A good rule: never trust users.)
-
-      A valid e-mail address is in the form:
-
-        text at text.text[.text...]
-
-      In other words, alphanumeric characters ("a-z", "A-Z", "0-9"),
-      'dashes' ("-"), underscores ("_") and 'dots' ("."), with exactly one
-      'at' ("@") in the middle, and at least one 'dot' appearing after
-      the 'at.'  'Dots' and 'ats' are not allowed at the beginning or
-      end of the string.
-
-      "cgi_goodemailaddress" returns a "1" if the address appears to be
-      in the right format (this does NOT necessarily mean it is a VALID
-      address), or "0" if it is not.
-
-    char * cgi_strerror(int err)
-    ----------------------------
-      Like C's "strerror()" function which returns the text equivalent of
-      an "errno" error code, this function returns the text equivalent of
-      one of cgi-util's "cgi_errno" error code.
-
-
-ERROR CODES
------------
-  The many error codes that cgi-util will set "cgi_errno" to are described
-  above, but here's a reference:
-
-    CGIERR_NONE
-    -----------
-      No error occured
-
-    CGIERR_NOT_INTEGER
-    ------------------
-      The field looked-up by cgi_getentryint() did not exist, or its
-      value was not an integer.
-
-    CGIERR_NOT_DOUBLE
-    -----------------
-      The field looked-up by cgi_getentrydouble() did not exist, or its
-      value was not a double.
-
-    CGIERR_NOT_BOOL
-    ---------------
-      The field looked-up by cgi_getentrybool() did not exist, or its
-      value was not "yes", "on", "no" or "off".
-
-    CGIERR_UNKNOWN_METHOD
-    ---------------------
-      The "REQUEST_METHOD" environment variable was not set to
-      "POST" or "GET" (the two understood by cgi-util).
-
-    CGIERR_INCORRECT_TYPE
-    ---------------------
-      The "CONTENT_TYPE" environment variable was not set to
-      "application/x-www-form-urlencoded".
-
-    CGIERR_BAD_CONTENT_LENGTH
-    -------------------------
-      The "CONTENT_LENGTH" environment variable was not set to
-      an integer value.
-
-    CGIERR_CONTENT_LENGTH_DISCREPANCY
-    ---------------------------------
-      The "CONTENT_LENGTH" environment variable was set to a value
-      different from the actual size of data received by cgi_init().
-
-    CGIERR_CANT_OPEN
-    ----------------
-      The cgi_dump_no_abort() function could not open the file
-      specified.  (Check C's "errno" value for the exact reason.)
-
-    CGIERR_OUT_OF_MEMORY
-    --------------------
-      Space could not be allocated for the data being received by
-      cgi_init().
-
-
-THE TEST PROGRAMS
------------------
-  To understand the test program, first open the "test.html" or
-  "filetest.html" HTML file in a web browser.  (You need to open it via the
-  HTTP protocol, not simply opening it as a file!)
-
-  With "test.html", you'll notice the following on the page:
-
-    * A type-in field labelled "Name?"
-    * A type-in field labelled "Age?"
-    * A pull-down menu labelled "Sex?"
-    * A submit button labelled "Ok"
-
-  I won't go into the details of creating a form here, since there are
-  many, many places where you can learn this.  (If you look at the source
-  of "test.html", you'll see some comments which explain what is going on.)
-
-  When you fill out the form and click the "Ok" submit button, the CGI
-  will be invoked and you'll see something similar to:
-
-    Hello.
-    name=john doe
-    age=55
-    sex=Male
-    Goodbye!
-
-  As you can see, the input you place into the form is echoed back to you
-  by this CGI.  To see how this is done, simply look at the source code:
-  "test.c"!
-
-
-  With "filetest.html", you'll see a simpler form:
-
-    * A type-in filed labelled "Name?"
-    * A file browse field labelled "File?" (typically these fields appear as
-      a type-in form with a "Browse" button next to it)
-    * A sumbit button labelled "Ok"
-
-  Select a file from your local filesystem (type it into the type-in field
-  or use the "Browse" button, for example), and then submit the form.
-  The CGI will be invoked and you'll see something similar to:
-
-    Hello.
-    name=john doe
-    filename=foo.bar
-    This file is 10234 bytes long.
-    Goodbye!
-
-  As you can see, the file you uploaded using the form has been processed,
-  and the size of the file (in bytes) is displayed by the CGI.  See
-  "filetest.c" to see how this CGI works.
-
-
-THE END
--------
-  Hopefully this library will come in useful.  If you have questions or
-  comments, please direct them to me:
-
-    bill at newbreedsoftware.com
-
-
-THANKS FOR USING cgi-util!
-
-End of README.txt
diff -u --recursive --new-file cgi-util-2.2.1-vanilla/TODO cgi-util-2.2.1/TODO
--- cgi-util-2.2.1-vanilla/TODO	1969-12-31 18:00:00.000000000 -0600
+++ cgi-util-2.2.1/TODO	2006-03-09 17:17:46.000000000 -0600
@@ -0,0 +1,11 @@
+TODO.txt for cgi-util
+
+* Fix file upload.
+* Handle shell invoked CGI's again.
+* Handle grabbing multiple values from a singularly-named set of fields.
+  (ie, checkboxes and multiple select fields)
+* Create cgi-util 1.x backwards-compatible API.
+* Handle multiple file upload (maybe).
+* Better tutorials (eg, more info. on using cookies!)
+
+End of TODO.txt
diff -u --recursive --new-file cgi-util-2.2.1-vanilla/TODO.txt cgi-util-2.2.1/TODO.txt
--- cgi-util-2.2.1-vanilla/TODO.txt	2000-11-01 17:36:33.000000000 -0600
+++ cgi-util-2.2.1/TODO.txt	1969-12-31 18:00:00.000000000 -0600
@@ -1,11 +0,0 @@
-TODO.txt for cgi-util
-
-* Fix file upload.
-* Handle shell invoked CGI's again.
-* Handle grabbing multiple values from a singularly-named set of fields.
-  (ie, checkboxes and multiple select fields)
-* Create cgi-util 1.x backwards-compatible API.
-* Handle multiple file upload (maybe).
-* Better tutorials (eg, more info. on using cookies!)
-
-End of TODO.txt


--- NEW FILE cgi-util.spec ---
Summary: A C library for creating Common Gateway Interface ("CGI") programs
Name: cgi-util
Version: 2.2.1
Release: 7
License: LGPL
Group: System Environment/Libraries
Source: ftp://ftp.billsgames.com/unix/www/%name/%{name}-%{version}.tar.gz
Patch0: cgi-util-2.2.1-autotools.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL: http://www.newbreedsoftware.com/cgi-util/

%description
cgi-util is a library which provides a set of C functions you can
use to create Common Gateway Interface ("CGI") programs.  Simply call
cgi-util's initialization function and send HTML (or any other kind of
data) out from your program and to the user's web browser.

%package devel
Summary: Files needed to develop applications using cgi-util
Group: Development/Libraries
Requires: cgi-util = %{version}-%{release}

%description devel
This package provides the libraries, include files, and other resources
needed for developing applications using the cgi-util library.

%prep
%setup
%patch0 -p1
chmod +x configure

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
%makeinstall
rm -f ${RPM_BUILD_ROOT}/%{_libdir}/libcgi-util.la
rm -f ${RPM_BUILD_ROOT}/%{_bindir}/*.cgi

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-, root, root)
%{_libdir}/lib*.so.*
%doc ChangeLog COPYING INSTALL TODO test.cgi filetest.cgi test.html filetest.html

%files devel
%{_libdir}/lib*.so
%{_includedir}/cgi-util.h
%doc README test.c filetest.c

%changelog
* Tue Apr 04 2006 W. Michael Petullo <mike[@]flyn.org> - 2.2.1-7
   - Remove *.cgi from bindir.

* Thu Mar 09 2006 W. Michael Petullo <mike[@]flyn.org> - 2.2.1-6
   - Move test.cgi and filetest.cgi to %doc.
   - Move README to -devel %doc and add test.c and filetest.c.
   - Pass --disable-static to configure.

* Thu Feb 23 2006 W. Michael Petullo <mike[@]flyn.org> - 2.2.1-5
   - Remove Werror from Makefile.in.
   - Remove --gnu from autotools options.
   - Revert patch that renames, for example, README.txt to README
     as this is required for automake.

* Wed Feb 22 2006 W. Michael Petullo <mike[@]flyn.org> - 2.2.1-4
   - Turn off -Werror.

* Tue Feb 21 2006 W. Michael Petullo <mike[@]flyn.org> - 2.2.1-3
   - Simplify project descriptions.
   - Do not change filenames in autotools patch.

* Tue Dec 13 2005 W. Michael Petullo <mike[@]flyn.org> - 2.2.1-2
   - Split out -devel package.

* Wed Nov 30 2005 W. Michael Petullo <mike[@]flyn.org> - 2.2.1-1
   - Initial RPM.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cgi-util/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Apr 2006 00:30:34 -0000	1.1
+++ .cvsignore	8 Apr 2006 00:31:40 -0000	1.2
@@ -0,0 +1 @@
+cgi-util-2.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cgi-util/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Apr 2006 00:30:34 -0000	1.1
+++ sources	8 Apr 2006 00:31:40 -0000	1.2
@@ -0,0 +1 @@
+f48531a2b24b880ed6a87c801a8643fc  cgi-util-2.2.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  8 00:37:07 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Fri,  7 Apr 2006 17:37:07 -0700
Subject: owners owners.list,1.808,1.809
Message-ID: <200604080037.k380b9OA000421@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv404

Modified Files:
	owners.list 
Log Message:
Add enter for cgi-util.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.808
retrieving revision 1.809
diff -u -r1.808 -r1.809
--- owners.list	7 Apr 2006 16:58:51 -0000	1.808
+++ owners.list	8 Apr 2006 00:37:07 -0000	1.809
@@ -120,6 +120,7 @@
 Fedora Extras|cfitsio|Library for manipulating FITS data files|matt at truch.net|extras-qa at fedoraproject.org|
 Fedora Extras|cfs|An userspace crypto-filesystem|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|cfv|A checksum creation and verification utility|a.kurtz at hardsun.net|extras-qa at fedoraproject.org|
+Fedora Extras|cgi-util|A C library for creating Common Gateway Interface ("CGI") programs|redhat at flyn.org|extras-qa at fedoraproject.org|
 Fedora Extras|cgoban|X board for playing go|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|charis-fonts|Charis SIL fonts|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|check|A unit test framework for C|tcallawa at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Apr  8 01:03:06 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri,  7 Apr 2006 18:03:06 -0700
Subject: rpms/celestia/FC-5 .cvsignore, 1.5, 1.6 celestia.spec, 1.14,
	1.15 sources, 1.5, 1.6
Message-ID: <200604080103.k3813874002530@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/celestia/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2504

Modified Files:
	.cvsignore celestia.spec sources 
Log Message:
Sync with devel.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/celestia/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Feb 2006 18:59:50 -0000	1.5
+++ .cvsignore	8 Apr 2006 01:03:06 -0000	1.6
@@ -1 +1 @@
-celestia-1.4.0.20060210cvs.tar.gz
+celestia-1.4.1.tar.gz


Index: celestia.spec
===================================================================
RCS file: /cvs/extras/rpms/celestia/FC-5/celestia.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- celestia.spec	11 Feb 2006 18:59:50 -0000	1.14
+++ celestia.spec	8 Apr 2006 01:03:06 -0000	1.15
@@ -1,13 +1,10 @@
 Name:           celestia
-Version:        1.4.0.20060210cvs
+Version:        1.4.1
 Release:        1%{?dist}
-
 Summary:        OpenGL real-time visual space simulation
-
 Group:          Amusements/Graphics
 License:        GPL
-#Source0:        http://dl.sf.net/celestia/celestia-%{version}.tar.gz
-Source0:        celestia-%{version}.tar.gz
+Source0:        http://dl.sf.net/celestia/celestia-%{version}.tar.gz
 Source3:        celestia.desktop
 Patch0:         celestia-1.4.0-compile.patch
 URL:            http://www.shatters.net/celestia/
@@ -22,9 +19,6 @@
 BuildRequires:  libGLU-devel
 BuildRequires:  libXt-devel
 BuildRequires:  libXmu-devel
-# For the CVS snapshot.
-BuildRequires:  gettext-devel
-
 Requires(post): GConf2
 Requires(preun): GConf2
 
@@ -47,9 +41,7 @@
 %patch0 -p0
 
 %build
-make -f Makefile.cvs
-
-export GTK_LIBS="$( pkg-config --libs gtk+-2.0 ) -lpangox-1.0"
+export GTK_LIBS="$( pkg-config --libs gtkglext-x11-1.0 libgnomeui-2.0 )"
 %configure --with-gnome
 make %{?_smp_mflags}
 
@@ -108,6 +100,11 @@
 
 
 %changelog
+* Tue Mar 28 2006 Steven Pritchard <steve at kspei.com> 1.4.1-1
+- Update to 1.4.1
+- Use "pkg-config --libs gtkglext-x11-1.0 libgnomeui-2.0" instead of
+  "pkg-config --libs gtk+-2.0"
+
 * Fri Feb 10 2006 Steven Pritchard <steve at kspei.com> 1.4.0.20060210cvs-1
 - Update to today's CVS snapshot
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/celestia/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Feb 2006 18:59:50 -0000	1.5
+++ sources	8 Apr 2006 01:03:06 -0000	1.6
@@ -1 +1 @@
-3ce623baf6113ddf6425f0ab31b2dd37  celestia-1.4.0.20060210cvs.tar.gz
+be1d36fc97a13b9a276249dbc0efac41  celestia-1.4.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  8 04:04:30 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Fri,  7 Apr 2006 21:04:30 -0700
Subject: rpms/fortune-firefly/FC-4 firefly, 1.5, 1.6 fortune-firefly.spec,
	1.5, 1.6
Message-ID: <200604080404.k3844WiV009071@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/fortune-firefly/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9018/FC-4

Modified Files:
	firefly fortune-firefly.spec 
Log Message:
Latest bugfixes.




Index: firefly
===================================================================
RCS file: /cvs/extras/rpms/fortune-firefly/FC-4/firefly,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- firefly	8 Jan 2006 21:11:21 -0000	1.5
+++ firefly	8 Apr 2006 04:04:30 -0000	1.6
@@ -1588,8 +1588,7 @@
 Wash: (gags)
 
 Jayne: "All the protien, vitamins and carbs of you grandma's best 
-turkey dinner... plus 15				--Episode #7, "Jaynestown"
-% alcohol." 
+turkey dinner... plus 15 percent alcohol.
 				--Episode #7, "Jaynestown"
 %
 Contact: "Last week, the factory foreman and his prod crew heard he was


Index: fortune-firefly.spec
===================================================================
RCS file: /cvs/extras/rpms/fortune-firefly/FC-4/fortune-firefly.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fortune-firefly.spec	8 Jan 2006 21:11:21 -0000	1.5
+++ fortune-firefly.spec	8 Apr 2006 04:04:30 -0000	1.6
@@ -1,5 +1,5 @@
 Name:		fortune-firefly
-Version:	2.1.0
+Version:	2.1.1
 Release:        1%{?dist}
 Summary:	Quotes from the TV series "Firefly"
 
@@ -49,6 +49,9 @@
 
 %changelog
 
+* Fri Apr 07 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.1
+- Manually merged in some fixes from Robert Mohr (mohr.42 at osu.edu)
+
 * Mon Jan 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.0
 - Incorporated some great organization and labeling by John Bianchi (John.Bianchi at usa.net)
 - Added quotes from unfilmed episode, "Dead or Alive"



From fedora-extras-commits at redhat.com  Sat Apr  8 04:04:31 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Fri,  7 Apr 2006 21:04:31 -0700
Subject: rpms/fortune-firefly/devel firefly, 1.6, 1.7 fortune-firefly.spec,
	1.8, 1.9
Message-ID: <200604080404.k3844XFe009076@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/fortune-firefly/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9018/devel

Modified Files:
	firefly fortune-firefly.spec 
Log Message:
Latest bugfixes.




Index: firefly
===================================================================
RCS file: /cvs/extras/rpms/fortune-firefly/devel/firefly,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- firefly	8 Jan 2006 21:11:28 -0000	1.6
+++ firefly	8 Apr 2006 04:04:31 -0000	1.7
@@ -36,6 +36,8 @@
 Mal: "I don't believe there's a power in the 'verse that can stop Kaylee
 from being cheerful." (he smiles at her, never stopping working) "Sometimes
 you just wanna duct tape her mouth and dump her in the hold for a month."
+
+Kaylee: (kisses Mal) "I love my captain."
 				--Episode #1, "Serenity"
 %
 Zoe: "Something ain't right."
@@ -95,7 +97,7 @@
 Zoe: "Oh yeah, this is going to go great."
 				--Episode #1, "Serenity"
 %
-Mal: "If anyone gets nosy, just...you know... shoot 'em. "
+Mal: "If anyone gets nosy, just...you know... shoot 'em."
 
 Zoe: "Shoot 'em?"
 
@@ -185,7 +187,7 @@
 
 Jayne: "You're coming through good and loud."
 
-Mal: " 'Cause I'm standing right here."
+Mal: "'Cause I'm standing right here."
 				--Episode #1, "Serenity"
 %
 Zoe: "Don't think its a good spot sir, she still has the advantage over us."
@@ -259,8 +261,7 @@
 Jayne: "Hey, I didn't fight in no war. Best of luck, though."
 				--Episode #2, "The Train Job"
 %
-Mal: 
-(into com) "Wash, we've got some local color happening. Your grand
+Mal: (into com) "Wash, we've got some local color happening. Your grand
 entrance would not go amiss right now."
 				--Episode #2, "The Train Job"
 %
@@ -452,7 +453,7 @@
 Zoe: "I... I was weak."
 				--Episode #2, "The Train Job"
 %
-Sherrif: "His story had kind of an odor to it."
+Sheriff: "His story had kind of an odor to it."
 
 Inara: "Yes. It's not the only thing about him that does."
 				--Episode #2, "The Train Job"
@@ -462,7 +463,7 @@
 Jayne: "I was aiming for his head."
 				--Episode #2, "The Train Job"
 %
-Sherrif: "You were truthful back in town -- these are tough times. A man can get
+Sheriff: "You were truthful back in town -- these are tough times. A man can get
 a job, he might not look too close at what that job is. But a man learns all
 the details of a situation like ours.... well, then he has a choice. "
 
@@ -573,7 +574,7 @@
 				--Episode #3, "Bushwacked"
 %
 Jayne: "You saved his gorram life, he still takes the cargo. Hwoon dahn."
-[Hwoon dahn = "jerk"] 
+[jerk] 
 
 Mal: "He had to.... Couldn't let us profit. Wouldn't be civilized." 
 				--Episode #3, "Bushwacked"
@@ -713,6 +714,26 @@
 Kaylee: "Well, how can we be sure, unless we question it?"
 				--Episode #4, "Shindig"
 %
+Kaylee: "I'm not saying the 80-04's hard to repair, it just ain't worth it."
+
+Older Farmer: "It's a fine machine, you just keep it tuned."
+
+Kaylee: "Tsai boo shr." [That's not it.] "The extenders ain't braced."
+
+Murphy: "I've been telling him to buy the 80-10 for years."
+
+Kaylee: "Those 'tenders snap off, don't matter how good the engine's
+cycling."
+
+Younger Farmer: "Miss Kaylee, I wonder if I could request the honor of...."
+
+Murphy: (interrupting) "Wait a minute. Let her talk. She's talking. Dance
+later."
+
+Kaylee: "By the way, the 80-10's the same machine, they just changed the
+plating and hope no one noticed."
+				--Episode #4, "Shindig"
+%
 Zoe: (sighs) "I thought you wanted to spend more time off ship this visit."
 
 Wash: "I don't know.  Out there it seems like all fancy parties. I like our 
@@ -868,9 +889,9 @@
 Mal: "See how I'm not punching him? I think I've grown."
 				--Episode #4, "Shindig"
 %
-Atherton: "Well, get ready to starve! I'll see to it you never work again.
+Atherton: "Well, get ready to starve! I'll see to it you never work again."
 
-Inara: Actually, that's not how it works. You see, you've earned yourself a
+Inara: "Actually, that's not how it works. You see, you've earned yourself a
 black mark in the client registry. No Companion is going to contact with you
 ever again."
 
@@ -1168,15 +1189,15 @@
 Bandit #1: "And I think maybe you're gonna give me a little one-on-one
 time with the missus." 
 
-(Husband) Jayne: "Oh, I think you might wanna reconsider that last part.
+Jayne/Husband: "Oh, I think you might wanna reconsider that last part.
 See, I married me a powerful ugly creature." 
 
-(Wife) Mal: "How can you say that? How can you shame me in front of new
+Mal/Wife: "How can you say that? How can you shame me in front of new
 people?" 
 
-(Husband) Jayne: "If I could make you purtier, I would." 
+Jayne/Husband: "If I could make you purtier, I would." 
 
-(Wife) Mal: "You are not the man I met a year ago." 
+Mal/Wife: "You are not the man I met a year ago." 
 				--Episode #6, "Our Mrs Reynolds"
 %
 Mal: "Now think real hard. You been bird-dogging this township a while now.
@@ -1588,8 +1609,7 @@
 Wash: (gags)
 
 Jayne: "All the protien, vitamins and carbs of you grandma's best 
-turkey dinner... plus 15				--Episode #7, "Jaynestown"
-% alcohol." 
+turkey dinner... plus 15 percent alcohol.
 				--Episode #7, "Jaynestown"
 %
 Contact: "Last week, the factory foreman and his prod crew heard he was
@@ -1764,7 +1784,7 @@
 
 Mal: "Freedom, that's what."
 
-Zoe: "I meant, what's that?"
+Zoe: (pointing) "I meant, what's that?"
 
 Mal: "Oh. Yeah, just step around that. I think something must have been living
 in here."
@@ -1994,9 +2014,9 @@
 %
 Mal: "Pupils were fixed and dilapidated-"
 
-Simon: "Dialated-"
+Simon: "Dilated-"
 
-Mal: "Dialated! Dialated! Ching-wao tsao duh liou mahng!" [Frog-humping sonofabitch]
+Mal: "Dilated! Dilated! Ching-wao tsao duh liou mahng!" [Frog-humping sonofabitch]
 				--Episode #9, "Ariel"
 %
 Jayne: "Hell, I don't know.  If I'd wanted schooling, I'd have gone to school."
@@ -2115,7 +2135,7 @@
 
 Jayne: "What?  I got pinched!"
 
-Mal: "What is what happens when you call the Feds."
+Mal: "Which is what happens when you call the Feds."
 				--Episode #9, "Ariel"
 %
 Mal: "You know, I hear tell they used to keelhaul traitors back in the day. 
@@ -2204,9 +2224,9 @@
 Wash: "I am a large, semi-muscular man. I can take it. Don't hide behind Mal
 because you know he'll shoot it down!"
 
-Zoe: "Right. Becaue what this marriage needs is one more shouting match.
+Zoe: "Right. Becaue what this marriage needs is one more shouting match."
 
-Wash: No, what this marriage needs is one less husband. Right now it's kind of
+Wash: "No, what this marriage needs is one less husband. Right now it's kind of
 crowded."
 				--Episode #10, "War Stories"
 %
@@ -2588,7 +2608,7 @@
 Zoe: "Well, at least they covered 'Dropping your weapon so you can eat beans
 and get yourself shot'."
 
-Tracey: "Yea, I got a badge in that."
+Tracey: "Yeah, I got a badge in that."
 				--Episode #12, "The Message"
 %
 Mal: "Vitelli's out of it. That bumblebee laid down arms at the first sign
@@ -2708,9 +2728,11 @@
 
 Wash: "Were I unwed, I would take you in a manly fashion."
 
-Kaylee: " 'Cause I'm pretty?"
+Kaylee: "'Cause I'm pretty?"
+
+Wash: "'Cause you're pretty."
 
-Wash: " 'Cause you're pretty."
+Kaylee: "Thank you.  That was very restorative."
 				--Episode #13, "Heart of Gold"
 %
 Mal: "Inara, think you could stoop to being on my arm?"
@@ -3362,7 +3384,7 @@
 Mostly if i'm gettin' paid."
 				--"Serenity"
 %
-Kaylee (to Simon, as he leaves): "Don't ride in antyhing with a Capissen 38 
+Kaylee (to Simon, as he leaves): "Don't ride in kanything with a Capissen 38 
 engine, they fall right out of the sky!"
 				--"Serenity"
 %


Index: fortune-firefly.spec
===================================================================
RCS file: /cvs/extras/rpms/fortune-firefly/devel/fortune-firefly.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fortune-firefly.spec	8 Jan 2006 21:11:28 -0000	1.8
+++ fortune-firefly.spec	8 Apr 2006 04:04:31 -0000	1.9
@@ -1,5 +1,5 @@
 Name:		fortune-firefly
-Version:	2.1.0
+Version:	2.1.1
 Release:        1%{?dist}
 Summary:	Quotes from the TV series "Firefly"
 
@@ -49,6 +49,9 @@
 
 %changelog
 
+* Fri Apr 07 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.1
+- Manually merged in some fixes from Robert Mohr (mohr.42 at osu.edu)
+
 * Mon Jan 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.0
 - Incorporated some great organization and labeling by John Bianchi (John.Bianchi at usa.net)
 - Added quotes from unfilmed episode, "Dead or Alive"



From fedora-extras-commits at redhat.com  Sat Apr  8 04:04:29 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Fri,  7 Apr 2006 21:04:29 -0700
Subject: rpms/fortune-firefly/FC-3 firefly, 1.5, 1.6 fortune-firefly.spec,
	1.4, 1.5
Message-ID: <200604080405.k38451qf009080@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/fortune-firefly/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9018/FC-3

Modified Files:
	firefly fortune-firefly.spec 
Log Message:
Latest bugfixes.




Index: firefly
===================================================================
RCS file: /cvs/extras/rpms/fortune-firefly/FC-3/firefly,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- firefly	8 Jan 2006 21:10:57 -0000	1.5
+++ firefly	8 Apr 2006 04:04:29 -0000	1.6
@@ -1588,8 +1588,7 @@
 Wash: (gags)
 
 Jayne: "All the protien, vitamins and carbs of you grandma's best 
-turkey dinner... plus 15				--Episode #7, "Jaynestown"
-% alcohol." 
+turkey dinner... plus 15 percent alcohol.
 				--Episode #7, "Jaynestown"
 %
 Contact: "Last week, the factory foreman and his prod crew heard he was


Index: fortune-firefly.spec
===================================================================
RCS file: /cvs/extras/rpms/fortune-firefly/FC-3/fortune-firefly.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fortune-firefly.spec	8 Jan 2006 21:10:57 -0000	1.4
+++ fortune-firefly.spec	8 Apr 2006 04:04:29 -0000	1.5
@@ -1,5 +1,5 @@
 Name:		fortune-firefly
-Version:	2.1.0
+Version:	2.1.1
 Release:        1%{?dist}
 Summary:	Quotes from the TV series "Firefly"
 
@@ -49,6 +49,9 @@
 
 %changelog
 
+* Fri Apr 07 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.1
+- Manually merged in some fixes from Robert Mohr (mohr.42 at osu.edu)
+
 * Mon Jan 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.0
 - Incorporated some great organization and labeling by John Bianchi (John.Bianchi at usa.net)
 - Added quotes from unfilmed episode, "Dead or Alive"



From fedora-extras-commits at redhat.com  Sat Apr  8 07:03:11 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sat,  8 Apr 2006 00:03:11 -0700
Subject: rpms/xmms-cdread/devel xmms-cdread.spec,1.10,1.11
Message-ID: <200604080703.k3873DeI015510@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/xmms-cdread/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15493

Modified Files:
	xmms-cdread.spec 
Log Message:
* Sat Apr  8 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.14-10
- changed Requires xmms -> xmms-libs



Index: xmms-cdread.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-cdread/devel/xmms-cdread.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xmms-cdread.spec	5 Mar 2006 10:00:28 -0000	1.10
+++ xmms-cdread.spec	8 Apr 2006 07:03:11 -0000	1.11
@@ -3,14 +3,14 @@
 Summary:	Digital audio CD input plugin for XMMS
 Name:		xmms-cdread
 Version:	0.14
-Release:        9%{?dist}
+Release:        10%{?dist}
 License:	GPL
 Group:		Applications/Multimedia
 URL:		http://www.xmms.org/
 Source:		ftp://ftp.stack.nl/pub/users/willem/xmms-cdread-0.14a.tar.gz
 Patch1:		xmms-cdread-shuffle.patch
 Patch2:		xmms-cdread-x86_64.patch
-Requires:	xmms = %xmmsdep
+Requires:	xmms-libs
 BuildRequires:	gtk+-devel glib-devel xmms-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -47,6 +47,9 @@
 %exclude %{xmmsinputdir}/libcdread.la
 
 %changelog
+* Sat Apr  8 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.14-10
+- changed Requires xmms -> xmms-libs
+
 * Sun Mar  5 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.14-9
 - x86_64 fixes 
 
@@ -55,7 +58,7 @@
 - added dist after release
 
 * Wed Mar  1 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.14-7
-- Rebuild for Fedora Extras 5
+- rebuild for Fedora Extras 5
 
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 0.14-6.a
 - rebuild on all arches



From fedora-extras-commits at redhat.com  Sat Apr  8 08:15:53 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat,  8 Apr 2006 01:15:53 -0700
Subject: owners owners.list,1.809,1.810
Message-ID: <200604080815.k388FtBb017704@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17687

Modified Files:
	owners.list 
Log Message:
- add nessus-core



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.809
retrieving revision 1.810
diff -u -r1.809 -r1.810
--- owners.list	8 Apr 2006 00:37:07 -0000	1.809
+++ owners.list	8 Apr 2006 08:15:53 -0000	1.810
@@ -748,6 +748,7 @@
 Fedora Extras|nco|Suite of programs for manipulating NetCDF/HDF4 files|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|ncview|A visual browser for netCDF format files|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|nedit|A GUI text editor for systems with X and Motif|jnovy at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|nessus-core|Network vulnerability scanner|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|nessus-libraries|Support libraries for nessus|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|net6|A TCP protocol abstraction for library C++|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|netcdf|Libraries for the Unidata network Common Data Form (NetCDF v3)|ed at eh3.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Apr  8 09:18:04 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat,  8 Apr 2006 02:18:04 -0700
Subject: rpms/gnumeric/devel gnumeric.spec,1.16,1.17
Message-ID: <200604080918.k389I6o9019861@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gnumeric/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19842

Modified Files:
	gnumeric.spec 
Log Message:
* Sat Apr  8 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.2-3
- drop bogus mc stuff (bz 169332)



Index: gnumeric.spec
===================================================================
RCS file: /cvs/extras/rpms/gnumeric/devel/gnumeric.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- gnumeric.spec	21 Mar 2006 19:35:35 -0000	1.16
+++ gnumeric.spec	8 Apr 2006 09:18:04 -0000	1.17
@@ -1,7 +1,7 @@
-Summary:          A spreadsheet program for GNOME.
+Summary:          Spreadsheet program for GNOME
 Name:             gnumeric
 Version:          1.6.2
-Release:          2%{?dist}
+Release:          3%{?dist}
 Epoch:            1
 License:          GPL
 Group:            Applications/Productivity
@@ -96,6 +96,9 @@
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/libspreadsheet.la
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/gnumeric/%{version}/plugins/*/*.la
 
+#remove bogus mc stuff
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/mc
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -152,7 +155,6 @@
 %dir %{_datadir}/gnumeric/%{version}
 %{_datadir}/gnumeric/%{version}/*
 %{_datadir}/mime-info
-%{_datadir}/mc
 %{_datadir}/applications/*
 %{_datadir}/omf
 %{_mandir}/man1/*
@@ -164,6 +166,9 @@
 
 
 %changelog
+* Sat Apr  8 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.2-3
+- drop bogus mc stuff (bz 169332)
+
 * Tue Mar 21 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.2-2
 - rebuild for new libgsf
 



From fedora-extras-commits at redhat.com  Sat Apr  8 09:21:12 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat,  8 Apr 2006 02:21:12 -0700
Subject: rpms/gnumeric/FC-5 gnumeric.spec,1.15,1.16
Message-ID: <200604080921.k389LEBw019926@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gnumeric/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19909

Modified Files:
	gnumeric.spec 
Log Message:
* Sat Apr  8 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.2-3
- drop bogus mc stuff (bz 169332)



Index: gnumeric.spec
===================================================================
RCS file: /cvs/extras/rpms/gnumeric/FC-5/gnumeric.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gnumeric.spec	17 Feb 2006 00:25:39 -0000	1.15
+++ gnumeric.spec	8 Apr 2006 09:21:12 -0000	1.16
@@ -1,7 +1,7 @@
-Summary:          A spreadsheet program for GNOME.
+Summary:          Spreadsheet program for GNOME
 Name:             gnumeric
 Version:          1.6.2
-Release:          1%{?dist}
+Release:          3%{?dist}
 Epoch:            1
 License:          GPL
 Group:            Applications/Productivity
@@ -96,6 +96,9 @@
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/libspreadsheet.la
 rm -rf $RPM_BUILD_ROOT/%{_libdir}/gnumeric/%{version}/plugins/*/*.la
 
+#remove bogus mc stuff
+rm -rf $RPM_BUILD_ROOT/%{_datadir}/mc
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -152,7 +155,6 @@
 %dir %{_datadir}/gnumeric/%{version}
 %{_datadir}/gnumeric/%{version}/*
 %{_datadir}/mime-info
-%{_datadir}/mc
 %{_datadir}/applications/*
 %{_datadir}/omf
 %{_mandir}/man1/*
@@ -164,6 +166,12 @@
 
 
 %changelog
+* Sat Apr  8 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.2-3
+- drop bogus mc stuff (bz 169332)
+
+* Tue Mar 21 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.2-2
+- rebuild for new libgsf
+
 * Thu Feb 16 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.6.2-1
 - New upstream version
 - Rebuild for new gcc4.1 and glibc



From fedora-extras-commits at redhat.com  Sat Apr  8 09:54:26 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sat,  8 Apr 2006 02:54:26 -0700
Subject: rpms/xmms-sid/devel xmms-sid.spec,1.9,1.10
Message-ID: <200604080954.k389sSQV020021@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/rpms/xmms-sid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20004

Modified Files:
	xmms-sid.spec 
Log Message:
* Sat Apr  8 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.8.0-0.2.beta15
- remove explicit dep on "xmms" and rely on soname dep



Index: xmms-sid.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-sid/devel/xmms-sid.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xmms-sid.spec	18 Feb 2006 16:25:14 -0000	1.9
+++ xmms-sid.spec	8 Apr 2006 09:54:25 -0000	1.10
@@ -3,14 +3,13 @@
 Summary: SIDPlay input plugin for X MultiMedia System (XMMS)
 Name: xmms-sid
 Version: 0.8.0
-Release: 0.1.beta15%{?dist}
+Release: 0.2.beta15%{?dist}
 URL: http://www.tnsp.org/xmms-sid.php
 License: GPL
 Group: Applications/Multimedia
 Source0: http://www.tnsp.org/xs-files/%{name}-0.8.0beta15.tar.bz2
 Source1: http://www.tnsp.org/xs-files/%{name}-0.8.0beta15.tar.bz2.asc
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: xmms
 BuildRequires: xmms-devel libsidplay-devel
 BuildRequires: glib-devel gtk+-devel
 
@@ -53,6 +52,9 @@
 
 
 %changelog
+* Sat Apr  8 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.8.0-0.2.beta15
+- remove explicit dep on "xmms" and rely on soname dep
+
 * Sat Feb 18 2006 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.8.0-0.1.beta15
 - upgrade to 0.8.0beta15 which upstream has declared as stable
 



From fedora-extras-commits at redhat.com  Sat Apr  8 09:58:00 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat,  8 Apr 2006 02:58:00 -0700
Subject: rpms/qca/devel qca.spec,1.5,1.6
Message-ID: <200604080958.k389w2U7020129@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/qca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20082/devel

Modified Files:
	qca.spec 
Log Message:
disable stripping (bug 186648)


Index: qca.spec
===================================================================
RCS file: /cvs/extras/rpms/qca/devel/qca.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qca.spec	21 Feb 2006 18:42:18 -0000	1.5
+++ qca.spec	8 Apr 2006 09:57:59 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           qca
 Version:        1.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 
 Summary:        Qt Cryptographic Architecture
 
@@ -40,6 +40,7 @@
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
 ./configure --prefix=%{_prefix} --qtdir=$QTDIR
+sed -i -e /strip/d Makefile
 make %{?_smp_mflags}
 
 
@@ -68,6 +69,9 @@
 
 
 %changelog
+* Sat Apr 08 2006 Aurelien Bompard <gauret[AT]free.fr> 1.0-7
+- disable stripping (bug 186648)
+
 * Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 1.0-6
 - rebuild for FC5
 



From fedora-extras-commits at redhat.com  Sat Apr  8 09:57:53 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat,  8 Apr 2006 02:57:53 -0700
Subject: rpms/qca/FC-4 qca.spec,1.4,1.5
Message-ID: <200604080958.k389wP90020132@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/qca/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20082/FC-4

Modified Files:
	qca.spec 
Log Message:
disable stripping (bug 186648)


Index: qca.spec
===================================================================
RCS file: /cvs/extras/rpms/qca/FC-4/qca.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- qca.spec	22 May 2005 23:43:51 -0000	1.4
+++ qca.spec	8 Apr 2006 09:57:53 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           qca
 Version:        1.0
-Release: 5
+Release:        7%{?dist}
 
 Summary:        Qt Cryptographic Architecture
 
@@ -40,6 +40,7 @@
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
 ./configure --prefix=%{_prefix} --qtdir=$QTDIR
+sed -i -e /strip/d Makefile
 make %{?_smp_mflags}
 
 
@@ -68,6 +69,12 @@
 
 
 %changelog
+* Sat Apr 08 2006 Aurelien Bompard <gauret[AT]free.fr> 1.0-7
+- disable stripping (bug 186648)
+
+* Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 1.0-6
+- rebuild for FC5
+
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 1.0-5
 - rebuild on all arches
 



From fedora-extras-commits at redhat.com  Sat Apr  8 09:57:54 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat,  8 Apr 2006 02:57:54 -0700
Subject: rpms/qca/FC-5 qca.spec,1.5,1.6
Message-ID: <200604080958.k389wQ5X020135@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/qca/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20082/FC-5

Modified Files:
	qca.spec 
Log Message:
disable stripping (bug 186648)


Index: qca.spec
===================================================================
RCS file: /cvs/extras/rpms/qca/FC-5/qca.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- qca.spec	21 Feb 2006 18:42:18 -0000	1.5
+++ qca.spec	8 Apr 2006 09:57:54 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           qca
 Version:        1.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 
 Summary:        Qt Cryptographic Architecture
 
@@ -40,6 +40,7 @@
 %build
 [ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
 ./configure --prefix=%{_prefix} --qtdir=$QTDIR
+sed -i -e /strip/d Makefile
 make %{?_smp_mflags}
 
 
@@ -68,6 +69,9 @@
 
 
 %changelog
+* Sat Apr 08 2006 Aurelien Bompard <gauret[AT]free.fr> 1.0-7
+- disable stripping (bug 186648)
+
 * Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 1.0-6
 - rebuild for FC5
 



From fedora-extras-commits at redhat.com  Sat Apr  8 21:12:41 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat,  8 Apr 2006 14:12:41 -0700
Subject: owners owners.list,1.810,1.811
Message-ID: <200604082112.k38LChxJ014480@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14463

Modified Files:
	owners.list 
Log Message:
add perl-Text-CHM


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.810
retrieving revision 1.811
diff -u -r1.810 -r1.811
--- owners.list	8 Apr 2006 08:15:53 -0000	1.810
+++ owners.list	8 Apr 2006 21:12:40 -0000	1.811
@@ -1072,6 +1072,7 @@
 Fedora Extras|perl-Test-WWW-Mechanize|Testing-specific WWW::Mechanize subclass|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-TeX-Hyphen|Hyphenate words using TeX's patterns|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Autoformat|Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Text-CHM|Perl extension for handling MS Compiled HtmlHelp Files|pertusus at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-CSV_XS|Comma-separated values manipulation routines|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Diff|Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Glob|Perl module to match globbing patterns against text|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Sat Apr  8 21:54:37 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat,  8 Apr 2006 14:54:37 -0700
Subject: rpms/gnochm - New directory
Message-ID: <200604082154.k38Lsd54014699@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/gnochm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14678/gnochm

Log Message:
Directory /cvs/extras/rpms/gnochm added to the repository




From fedora-extras-commits at redhat.com  Sat Apr  8 21:54:38 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat,  8 Apr 2006 14:54:38 -0700
Subject: rpms/gnochm/devel - New directory
Message-ID: <200604082154.k38Lse1f014702@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/gnochm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14678/gnochm/devel

Log Message:
Directory /cvs/extras/rpms/gnochm/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Apr  8 21:54:58 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat,  8 Apr 2006 14:54:58 -0700
Subject: rpms/gnochm Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604082155.k38Lt0iO014756@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/gnochm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14723

Added Files:
	Makefile import.log 
Log Message:
Setup of module gnochm


--- NEW FILE Makefile ---
# Top level Makefile for module gnochm
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr  8 21:54:58 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat,  8 Apr 2006 14:54:58 -0700
Subject: rpms/gnochm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604082155.k38Lt0Wr014759@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/gnochm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14723/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gnochm


--- 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 Apr  8 21:55:34 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat,  8 Apr 2006 14:55:34 -0700
Subject: rpms/gnochm import.log,1.1,1.2
Message-ID: <200604082156.k38Lu6WU014823@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/gnochm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14787

Modified Files:
	import.log 
Log Message:
auto-import gnochm-0.9.7-2 on branch devel from gnochm-0.9.7-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnochm/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	8 Apr 2006 21:54:58 -0000	1.1
+++ import.log	8 Apr 2006 21:55:34 -0000	1.2
@@ -0,0 +1 @@
+gnochm-0_9_7-2:HEAD:gnochm-0.9.7-2.src.rpm:1144533320



From fedora-extras-commits at redhat.com  Sat Apr  8 21:55:35 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat,  8 Apr 2006 14:55:35 -0700
Subject: rpms/gnochm/devel gnochm.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604082156.k38Lu7si014827@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/gnochm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14787/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gnochm.spec 
Log Message:
auto-import gnochm-0.9.7-2 on branch devel from gnochm-0.9.7-2.src.rpm


--- NEW FILE gnochm.spec ---
Name:           gnochm
Version:        0.9.7
Release:        2%{?dist}
Summary:        CHM file viewer

Group:          Applications/Publishing
License:        GPL
URL:            http://gnochm.sourceforge.net/
Source0:        http://dl.sf.net/gnochm/gnochm-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  gettext
Requires:       python-chm

Requires(pre): GConf2
Requires(post): GConf2
Requires(preun): GConf2
BuildRequires:  scrollkeeper
Requires(post): scrollkeeper
Requires(postun): scrollkeeper
BuildRequires: desktop-file-utils

%description
A CHM file viewer for Gnome. Features are:
  
  * Full text search
  * Bookmarks
  * Support for external ms-its links
  * Configurable support for http links 
  * Internationalisation
  * Displays HTML page source


%prep
%setup -q
iconv -f ISO8859-1 -t UTF8 < data/gnochm.1.it > gnochm.1.it.new && mv -f gnochm.1.it.new data/gnochm.1.it

%build
%configure --disable-mime-update
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --vendor fedora                            \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
        --add-category X-Fedora                                 \
        --delete-original                                       \
        $RPM_BUILD_ROOT%{_datadir}/applications/gnochm.desktop

%find_lang %{name}

%clean
rm -rf $RPM_BUILD_ROOT

%pre
if [ "$1" -gt 1 ]; then
    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
    gconftool-2 --makefile-uninstall-rule \
      %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
    # If the schema file has ever been renamed::
    #gconftool-2 --makefile-uninstall-rule \
    #  %{_sysconfdir}/gconf/schemas/[OLDNAME].schemas > /dev/null || :
    killall -HUP gconfd-2 || :
fi

%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 || :

scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :

update-mime-database %{_datadir}/mime &> /dev/null || :

%preun
if [ "$1" -eq 0 ]; then
    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
    gconftool-2 --makefile-uninstall-rule \
      %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
    killall -HUP gconfd-2 || :
fi

%postun
scrollkeeper-update -q || :

update-mime-database %{_datadir}/mime &> /dev/null || :

%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README
%config %{_sysconfdir}/gconf/schemas/*.schemas
%{_bindir}/gnochm
%{_datadir}/gnochm/
%{_datadir}/gnome/help/gnochm/
%{_datadir}/application-registry/gnochm.*
%{_datadir}/applications/fedora-gnochm.desktop
%{_datadir}/mime/packages/gnochm.xml
%{_mandir}/man*/gnochm.1*
%{_mandir}/*/man*/gnochm.1*
%{_datadir}/mime-info/gnochm.*
%{_datadir}/omf/gnochm/
%{_datadir}/pixmaps/chmfile.png
%{_datadir}/pixmaps/gnochm*.png

%changelog
* Sun Mar 12 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-2
- Fedora Extras submission, loosely based on Dag.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnochm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	8 Apr 2006 21:54:58 -0000	1.1
+++ .cvsignore	8 Apr 2006 21:55:34 -0000	1.2
@@ -0,0 +1 @@
+gnochm-0.9.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnochm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	8 Apr 2006 21:54:58 -0000	1.1
+++ sources	8 Apr 2006 21:55:34 -0000	1.2
@@ -0,0 +1 @@
+799cd06cc44f2380266b2172277ce217  gnochm-0.9.7.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr  8 23:44:48 2006
From: fedora-extras-commits at redhat.com (Ryo Dairiki (ryo))
Date: Sat,  8 Apr 2006 16:44:48 -0700
Subject: owners owners.list,1.811,1.812
Message-ID: <200604082344.k38Nio2u019254@cvs-int.fedora.redhat.com>

Author: ryo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19237

Modified Files:
	owners.list 
Log Message:
add libtomoe-gtk



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.811
retrieving revision 1.812
diff -u -r1.811 -r1.812
--- owners.list	8 Apr 2006 21:12:40 -0000	1.811
+++ owners.list	8 Apr 2006 23:44:47 -0000	1.812
@@ -640,6 +640,7 @@
 Fedora Extras|libtabe|Chinese lexicons library for xcin-2.5.3|llch at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|libtar|Tar file manipulation API|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|libtasn1|This is the ASN.1 library used in GNUTLS.|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
+Fedora Extras|libtomoe-gtk|Gtk library for tomoe Japanese handwritten input|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|libtorrent|BitTorrent library with a focus on high performance & good code|chabotc at xs4all.nl|extras-qa at fedoraproject.org|
 Fedora Extras|libtranslate|Natural language translation library|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|libtunepimp|A library for creating MusicBrainz enabled tagging applications|rdieter at math.unl.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Apr  9 01:39:12 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat,  8 Apr 2006 18:39:12 -0700
Subject: rpms/celestia/FC-4 celestia-1.4.0-compile.patch, NONE,
	1.1 .cvsignore, 1.4, 1.5 celestia.spec, 1.9, 1.10 sources, 1.4, 1.5
Message-ID: <200604090139.k391dE8D023514@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/celestia/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23490

Modified Files:
	.cvsignore celestia.spec sources 
Added Files:
	celestia-1.4.0-compile.patch 
Log Message:
Sync with devel branch (mostly).

celestia-1.4.0-compile.patch:

--- NEW FILE celestia-1.4.0-compile.patch ---
--- src/celengine/star.h.orig	2005-12-06 11:30:23.000000000 -0600
+++ src/celengine/star.h	2006-02-10 15:21:49.000000000 -0600
@@ -30,7 +30,7 @@
     // orbits and StarDetails objects.  Currently, it's assumed that they
     // have lifetimes that continue until program termination.
  public:
-    StarDetails::StarDetails();
+    StarDetails();
 
     inline float getRadius() const;
     inline float getTemperature() const;
--- src/celengine/command.h.orig	2004-12-22 16:07:15.000000000 -0600
+++ src/celengine/command.h	2006-02-10 18:46:25.000000000 -0600
@@ -94,10 +94,10 @@
 class CommandGotoLongLat : public InstantaneousCommand
 {
  public:
-    CommandGotoLongLat::CommandGotoLongLat(double t,
-                                           double dist,
-                                           float _longitude, float _latitude,
-                                           Vec3f _up);
+    CommandGotoLongLat(double t,
+                       double dist,
+                       float _longitude, float _latitude,
+                       Vec3f _up);
     ~CommandGotoLongLat();
     void process(ExecutionEnvironment&);
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/celestia/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	26 Dec 2005 23:51:51 -0000	1.4
+++ .cvsignore	9 Apr 2006 01:39:12 -0000	1.5
@@ -1 +1 @@
-celestia-1.4.0.tar.gz
+celestia-1.4.1.tar.gz


Index: celestia.spec
===================================================================
RCS file: /cvs/extras/rpms/celestia/FC-4/celestia.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- celestia.spec	26 Dec 2005 23:51:51 -0000	1.9
+++ celestia.spec	9 Apr 2006 01:39:12 -0000	1.10
@@ -1,13 +1,12 @@
 Name:           celestia
-Version:        1.4.0
-Release:        1%{?dist}
-
+Version:        1.4.1
+Release:        0.1%{?dist}
 Summary:        OpenGL real-time visual space simulation
-
 Group:          Amusements/Graphics
 License:        GPL
 Source0:        http://dl.sf.net/celestia/celestia-%{version}.tar.gz
 Source3:        celestia.desktop
+Patch0:         celestia-1.4.0-compile.patch
 URL:            http://www.shatters.net/celestia/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -17,7 +16,7 @@
 BuildRequires:  libpng-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  desktop-file-utils
-BuildRequires:  libGL-devel
+BuildRequires:  libGLU-devel
 Requires(post): GConf2
 Requires(preun): GConf2
 
@@ -37,9 +36,10 @@
 
 %prep
 %setup -q
-
+%patch0 -p0
 
 %build
+export GTK_LIBS="$( pkg-config --libs gtkglext-x11-1.0 libgnomeui-2.0 )"
 %configure --with-gnome
 make %{?_smp_mflags}
 
@@ -55,7 +55,7 @@
   $RPM_BUILD_ROOT%{_datadir}/pixmaps/celestia.png
 rm $RPM_BUILD_ROOT%{_datadir}/celestia/{controls.txt,COPYING}
 ln -s ../doc/%{name}-%{version}/controls.txt $RPM_BUILD_ROOT%{_datadir}/%{name}/
-rm -r $RPM_BUILD_ROOT%{_datadir}/celestia/manual
+#rm -r $RPM_BUILD_ROOT%{_datadir}/celestia/manual
 
 rm $RPM_BUILD_ROOT%{_datadir}/applications/celestia.desktop
 
@@ -87,7 +87,9 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO controls.txt manual/*.html manual/*.css
+%doc AUTHORS ChangeLog COPYING README TODO controls.txt
+# Seem to have gone away in post-1.4.0 CVS...
+#%doc manual/*.html manual/*.css
 %{_bindir}/*
 %{_sysconfdir}/gconf/schemas/*
 %{_datadir}/applications/*%{name}.desktop
@@ -96,6 +98,9 @@
 
 
 %changelog
+* Sat Apr 08 2006 Steven Pritchard <steve at kspei.com> 1.4.1-0.1
+- Sync with devel branch (mostly)
+
 * Mon Dec 26 2005 Steven Pritchard <steve at kspei.com> 1.4.0-1
 - Update to 1.4.0
 - Remove celestia-1.3.2-compile.patch (seems to be applied upstream)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/celestia/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	26 Dec 2005 23:51:51 -0000	1.4
+++ sources	9 Apr 2006 01:39:12 -0000	1.5
@@ -1 +1 @@
-d4bd0029af87fdd9cb4a0828cf62a025  celestia-1.4.0.tar.gz
+be1d36fc97a13b9a276249dbc0efac41  celestia-1.4.1.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr  9 03:05:12 2006
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Sat,  8 Apr 2006 20:05:12 -0700
Subject: rpms/ratpoison - New directory
Message-ID: <200604090305.k3935E1x027778@cvs-int.fedora.redhat.com>

Author: jwb

Update of /cvs/extras/rpms/ratpoison
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27752/ratpoison

Log Message:
Directory /cvs/extras/rpms/ratpoison added to the repository




From fedora-extras-commits at redhat.com  Sun Apr  9 03:05:12 2006
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Sat,  8 Apr 2006 20:05:12 -0700
Subject: rpms/ratpoison/devel - New directory
Message-ID: <200604090305.k3935Ewm027781@cvs-int.fedora.redhat.com>

Author: jwb

Update of /cvs/extras/rpms/ratpoison/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27752/ratpoison/devel

Log Message:
Directory /cvs/extras/rpms/ratpoison/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Apr  9 03:05:21 2006
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Sat,  8 Apr 2006 20:05:21 -0700
Subject: rpms/ratpoison Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604090305.k3935Nmj027831@cvs-int.fedora.redhat.com>

Author: jwb

Update of /cvs/extras/rpms/ratpoison
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27798

Added Files:
	Makefile import.log 
Log Message:
Setup of module ratpoison


--- NEW FILE Makefile ---
# Top level Makefile for module ratpoison
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr  9 03:05:21 2006
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Sat,  8 Apr 2006 20:05:21 -0700
Subject: rpms/ratpoison/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604090305.k3935NNL027834@cvs-int.fedora.redhat.com>

Author: jwb

Update of /cvs/extras/rpms/ratpoison/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27798/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ratpoison


--- 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 Apr  9 03:05:46 2006
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Sat,  8 Apr 2006 20:05:46 -0700
Subject: rpms/ratpoison import.log,1.1,1.2
Message-ID: <200604090306.k3936Ix1027902@cvs-int.fedora.redhat.com>

Author: jwb

Update of /cvs/extras/rpms/ratpoison
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27867

Modified Files:
	import.log 
Log Message:
auto-import ratpoison-1.4.0-3 on branch devel from ratpoison-1.4.0-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ratpoison/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Apr 2006 03:05:21 -0000	1.1
+++ import.log	9 Apr 2006 03:05:46 -0000	1.2
@@ -0,0 +1 @@
+ratpoison-1_4_0-3:HEAD:ratpoison-1.4.0-3.src.rpm:1144552011



From fedora-extras-commits at redhat.com  Sun Apr  9 03:05:47 2006
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Sat,  8 Apr 2006 20:05:47 -0700
Subject: rpms/ratpoison/devel ratpoison.desktop, NONE, 1.1 ratpoison.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604090306.k3936Jhe027906@cvs-int.fedora.redhat.com>

Author: jwb

Update of /cvs/extras/rpms/ratpoison/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27867/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ratpoison.desktop ratpoison.spec 
Log Message:
auto-import ratpoison-1.4.0-3 on branch devel from ratpoison-1.4.0-3.src.rpm


--- NEW FILE ratpoison.desktop ---
[Desktop Entry]
Encoding=UTF-8
Type=XSession
Exec=ratpoison
TryExec=ratpoison
Name=Ratpoison
Comment=A minimal Window Manager with no mouse support.


--- NEW FILE ratpoison.spec ---
%define xsessiondir %{_datadir}/xsessions

Name:           ratpoison
Version:        1.4.0
Release:        3%{?dist}
Summary:        Minimalistic window manager
Group:          Applications/Productivity
License:        GPL
URL:            http://www.nongnu.org/ratpoison/
Source0:        http://savannah.nongnu.org/download/ratpoison/%{name}-%{version}.tar.gz
Source1:	%{name}.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%if "%fedora" <= "4" 
BuildRequires:  xorg-x11-devel, readline-devel
%else
BuildRequires: libX11-devel, readline-devel, libXtst-devel
%endif
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info

%description
Ratpoison is a simple window manager that relies solely on keyboard input as
opposed to keyboard and mouse input.

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf ${RPM_BUILD_ROOT}
make install DESTDIR=${RPM_BUILD_ROOT}
mkdir -p ${RPM_BUILD_ROOT}%{xsessiondir}
install -m 755 %{SOURCE1} ${RPM_BUILD_ROOT}%{xsessiondir}/
rm -f ${RPM_BUILD_ROOT}/%{_infodir}/dir
chmod 755 ${RPM_BUILD_ROOT}/%{_datadir}/ratpoison/allwindows.sh
chmod 755 ${RPM_BUILD_ROOT}/%{_datadir}/ratpoison/clickframe.pl
chmod 755 ${RPM_BUILD_ROOT}/%{_datadir}/ratpoison/genrpbindings
chmod 755 ${RPM_BUILD_ROOT}/%{_datadir}/ratpoison/rpshowall.sh
chmod 755 ${RPM_BUILD_ROOT}/%{_datadir}/ratpoison/rpws
chmod 755 ${RPM_BUILD_ROOT}/%{_datadir}/ratpoison/split.sh

%clean
rm -rf $RPM_BUILD_ROOT

%post
/sbin/install-info %{_infodir}/%{name}.info.gz %{_infodir}/dir || :

%preun
if [ $1 = 0 ] ; then
    /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
fi

%files
%defattr(-,root,root,-)
%{_bindir}/ratpoison
%{_bindir}/rpws
%doc %{_datadir}/doc/ratpoison/
%{_infodir}/ratpoison.info.gz
%{_mandir}/man1/ratpoison.1.gz
%{_datadir}/ratpoison/
%{_datadir}/xsessions/ratpoison.desktop

%changelog
* Sat Apr  8 2006 John Berninger <johnw at berningeronline dot net> - 1.4.0-3
- Permissions fixes

* Sat Apr  8 2006 John Berninger <johnw at berningeronline dot net> - 1.4.0-2
- install-info fixup
- BuildRequires fixup

* Fri Apr  7 2006 John Berninger <johnw at berningeronline dot net> - 1.4.0-1
- Bumped to 1.4.0-1 from 1.3.0-2
- Conditional BuildRequires for FC4-- versus FC5++
- Various fixes per bugzilla review

* Mon Mar 13 2006 John Berninger <johnw at berningeronline dot net> - 1.3.0-2
- Added ratpoison.desktop file

* Sun Feb 19 2006 John Berninger <johnw at berningeronline dot net> - 1.3.0-1
- Initial specfile build for FE(4)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ratpoison/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2006 03:05:21 -0000	1.1
+++ .cvsignore	9 Apr 2006 03:05:46 -0000	1.2
@@ -0,0 +1 @@
+ratpoison-1.4.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ratpoison/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2006 03:05:21 -0000	1.1
+++ sources	9 Apr 2006 03:05:46 -0000	1.2
@@ -0,0 +1 @@
+358abef81387f2d554f4a397dee968b1  ratpoison-1.4.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr  9 03:08:02 2006
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Sat,  8 Apr 2006 20:08:02 -0700
Subject: owners owners.list,1.812,1.813
Message-ID: <200604090308.k3938422027960@cvs-int.fedora.redhat.com>

Author: jwb

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27943

Modified Files:
	owners.list 
Log Message:
Adding ratpoison package



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.812
retrieving revision 1.813
diff -u -r1.812 -r1.813
--- owners.list	8 Apr 2006 23:44:47 -0000	1.812
+++ owners.list	9 Apr 2006 03:08:02 -0000	1.813
@@ -1250,6 +1250,7 @@
 Fedora Extras|quilt|Patch management tool|jwboyer at jdub.homelinux.org|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|raidem|2d top-down shoot'em up|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
+Fedora Extras|ratpoison|Simplified window manager with no mouse support|jwb at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|rblcheck|A command-line interface to RBL-style listings|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
 Fedora Extras|rbldnsd|Small, fast daemon to serve DNSBLs|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|rdiff-backup|Convenient and transparent local/remote incremental mirror/backup|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Apr  9 05:10:55 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat,  8 Apr 2006 22:10:55 -0700
Subject: rpms/lucidlife/FC-4 lucidlife.spec,1.6,1.7
Message-ID: <200604090510.k395Avlm006468@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/lucidlife/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6314/FC-4

Modified Files:
	lucidlife.spec 
Log Message:

Use desktop-file-install's "--delete-original" option instead of doing it
manually.




Index: lucidlife.spec
===================================================================
RCS file: /cvs/extras/rpms/lucidlife/FC-4/lucidlife.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lucidlife.spec	29 Mar 2006 06:18:33 -0000	1.6
+++ lucidlife.spec	9 Apr 2006 05:10:55 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           lucidlife
 Version:        0.9
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A Conway's Life simulator
 
 Group:          Amusements/Games
@@ -41,8 +41,8 @@
 desktop-file-install --vendor fedora	\
 	--dir %{buildroot}%{_datadir}/applications	\
 	--add-category X-Fedora	\
+	--delete-original	\
 	%{buildroot}%{_datadir}/applications/lucidlife.desktop
-rm -f %{buildroot}%{_datadir}/applications/lucidlife.desktop
 
 %clean
 rm -rf %{buildroot}
@@ -59,6 +59,10 @@
 
 
 %changelog
+* Sat Apr 8 2006 Peter Gordon <peter at thecodergeek.com> - 0.9-6
+- Use desktop-file-install's "--delete-original" option instead pf doing
+  it manually.
+
 * Tue Mar 28 2006 Peter Gordon <peter at thecodergeek.com> - 0.9-5
 - Add patch to put the documentation and %%doc stuff in the same directory.
 



From fedora-extras-commits at redhat.com  Sun Apr  9 05:10:56 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat,  8 Apr 2006 22:10:56 -0700
Subject: rpms/lucidlife/FC-5 lucidlife.spec,1.7,1.8
Message-ID: <200604090510.k395AwuJ006476@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/lucidlife/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6314/FC-5

Modified Files:
	lucidlife.spec 
Log Message:

Use desktop-file-install's "--delete-original" option instead of doing it
manually.




Index: lucidlife.spec
===================================================================
RCS file: /cvs/extras/rpms/lucidlife/FC-5/lucidlife.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- lucidlife.spec	29 Mar 2006 06:18:33 -0000	1.7
+++ lucidlife.spec	9 Apr 2006 05:10:56 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           lucidlife
 Version:        0.9
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A Conway's Life simulator
 
 Group:          Amusements/Games
@@ -41,8 +41,8 @@
 desktop-file-install --vendor fedora	\
 	--dir %{buildroot}%{_datadir}/applications	\
 	--add-category X-Fedora	\
+	--delete-original	\
 	%{buildroot}%{_datadir}/applications/lucidlife.desktop
-rm -f %{buildroot}%{_datadir}/applications/lucidlife.desktop
  
 
 %clean
@@ -60,6 +60,10 @@
 
 
 %changelog
+* Sat Apr 8 2006 Peter Gordon <peter at thecodergeek.com> - 0.9-7
+- Use desktop-file-install's "--delete-original" option instead pf doing
+  it manually.
+
 * Tue Mar 28 2006 Peter Gordon <peter at thecodergeek.com> - 0.9-6
 - Add patch to put the documentation and %%doc stuff in the same directory.
 



From fedora-extras-commits at redhat.com  Sun Apr  9 05:10:56 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat,  8 Apr 2006 22:10:56 -0700
Subject: rpms/lucidlife/devel lucidlife.spec,1.8,1.9
Message-ID: <200604090510.k395Awj2006480@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/lucidlife/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6314/devel

Modified Files:
	lucidlife.spec 
Log Message:

Use desktop-file-install's "--delete-original" option instead of doing it
manually.




Index: lucidlife.spec
===================================================================
RCS file: /cvs/extras/rpms/lucidlife/devel/lucidlife.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- lucidlife.spec	29 Mar 2006 06:18:33 -0000	1.8
+++ lucidlife.spec	9 Apr 2006 05:10:56 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           lucidlife
 Version:        0.9
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A Conway's Life simulator
 
 Group:          Amusements/Games
@@ -41,8 +41,8 @@
 desktop-file-install --vendor fedora	\
 	--dir %{buildroot}%{_datadir}/applications	\
 	--add-category X-Fedora	\
+	--delete-original	\
 	%{buildroot}%{_datadir}/applications/lucidlife.desktop
-rm -f %{buildroot}%{_datadir}/applications/lucidlife.desktop
  
 
 %clean
@@ -60,6 +60,10 @@
 
 
 %changelog
+* Sat Apr 8 2006 Peter Gordon <peter at thecodergeek.com> - 0.9-8
+- Use desktop-file-install's "--delete-original" option instead pf doing
+  it manually.
+
 * Tue Mar 28 2006 Peter Gordon <peter at thecodergeek.com> - 0.9-7
 - Add patch to put the documentation and %%doc stuff in the same directory.
 



From fedora-extras-commits at redhat.com  Sun Apr  9 05:13:24 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat,  8 Apr 2006 22:13:24 -0700
Subject: rpms/lucidlife/FC-4 lucidlife.spec,1.7,1.8
Message-ID: <200604090513.k395DQGT006916@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/lucidlife/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6739/FC-4

Modified Files:
	lucidlife.spec 
Log Message:

Fix a minor spelling issue in my previous commit. 




Index: lucidlife.spec
===================================================================
RCS file: /cvs/extras/rpms/lucidlife/FC-4/lucidlife.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- lucidlife.spec	9 Apr 2006 05:10:55 -0000	1.7
+++ lucidlife.spec	9 Apr 2006 05:13:23 -0000	1.8
@@ -60,7 +60,7 @@
 
 %changelog
 * Sat Apr 8 2006 Peter Gordon <peter at thecodergeek.com> - 0.9-6
-- Use desktop-file-install's "--delete-original" option instead pf doing
+- Use desktop-file-install's "--delete-original" option instead of doing
   it manually.
 
 * Tue Mar 28 2006 Peter Gordon <peter at thecodergeek.com> - 0.9-5



From fedora-extras-commits at redhat.com  Sun Apr  9 05:13:24 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat,  8 Apr 2006 22:13:24 -0700
Subject: rpms/lucidlife/FC-5 lucidlife.spec,1.8,1.9
Message-ID: <200604090513.k395DQhu006921@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/lucidlife/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6739/FC-5

Modified Files:
	lucidlife.spec 
Log Message:

Fix a minor spelling issue in my previous commit. 




Index: lucidlife.spec
===================================================================
RCS file: /cvs/extras/rpms/lucidlife/FC-5/lucidlife.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- lucidlife.spec	9 Apr 2006 05:10:56 -0000	1.8
+++ lucidlife.spec	9 Apr 2006 05:13:24 -0000	1.9
@@ -61,7 +61,7 @@
 
 %changelog
 * Sat Apr 8 2006 Peter Gordon <peter at thecodergeek.com> - 0.9-7
-- Use desktop-file-install's "--delete-original" option instead pf doing
+- Use desktop-file-install's "--delete-original" option instead of doing
   it manually.
 
 * Tue Mar 28 2006 Peter Gordon <peter at thecodergeek.com> - 0.9-6



From fedora-extras-commits at redhat.com  Sun Apr  9 05:13:25 2006
From: fedora-extras-commits at redhat.com (Peter Gordon (pgordon))
Date: Sat,  8 Apr 2006 22:13:25 -0700
Subject: rpms/lucidlife/devel lucidlife.spec,1.9,1.10
Message-ID: <200604090513.k395DR1i006928@cvs-int.fedora.redhat.com>

Author: pgordon

Update of /cvs/extras/rpms/lucidlife/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6739/devel

Modified Files:
	lucidlife.spec 
Log Message:

Fix a minor spelling issue in my previous commit. 




Index: lucidlife.spec
===================================================================
RCS file: /cvs/extras/rpms/lucidlife/devel/lucidlife.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- lucidlife.spec	9 Apr 2006 05:10:56 -0000	1.9
+++ lucidlife.spec	9 Apr 2006 05:13:25 -0000	1.10
@@ -61,7 +61,7 @@
 
 %changelog
 * Sat Apr 8 2006 Peter Gordon <peter at thecodergeek.com> - 0.9-8
-- Use desktop-file-install's "--delete-original" option instead pf doing
+- Use desktop-file-install's "--delete-original" option instead of doing
   it manually.
 
 * Tue Mar 28 2006 Peter Gordon <peter at thecodergeek.com> - 0.9-7



From fedora-extras-commits at redhat.com  Sun Apr  9 07:26:15 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun,  9 Apr 2006 00:26:15 -0700
Subject: rpms/pipenightdreams/FC-5 pipenightdreams-0.10.0-sanitize.patch,
	NONE, 1.1 pipenightdreams.spec, 1.1, 1.2
Message-ID: <200604090726.k397QHoT020412@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/pipenightdreams/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20392

Modified Files:
	pipenightdreams.spec 
Added Files:
	pipenightdreams-0.10.0-sanitize.patch 
Log Message:
* Fri Apr  7 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.0-2
- Remove use of a trademarked term from %description, manpage and docs


pipenightdreams-0.10.0-sanitize.patch:

--- NEW FILE pipenightdreams-0.10.0-sanitize.patch ---
diff -ur pipenightdreams-0.10.0.orig/README pipenightdreams-0.10.0/README
--- pipenightdreams-0.10.0.orig/README	2001-10-12 22:02:34.000000000 +0200
+++ pipenightdreams-0.10.0/README	2006-04-07 17:15:52.000000000 +0200
@@ -9,7 +9,7 @@
               http:://www.libsdl.org/projects/pipenightdreams
 
 
-This game is a pseudo-clon of an old game called PipeDream. I say pseudo-clon
+This game is a pseudo-clon of an old pipeline arcade game. I say pseudo-clon
 because I don't have the original one so I've been working just with the facts
 I remember. I've written it in my spare time during the last twelve months (as you
 can see my spare time is not much).
diff -ur pipenightdreams-0.10.0.orig/man/pipenightdreams.6 pipenightdreams-0.10.0/man/pipenightdreams.6
--- pipenightdreams-0.10.0.orig/man/pipenightdreams.6	2002-03-23 22:17:05.000000000 +0100
+++ pipenightdreams-0.10.0/man/pipenightdreams.6	2006-04-07 17:30:39.000000000 +0200
@@ -6,23 +6,19 @@
 
 .SH SYNOPSIS 
 
-\fB pipenightdreams\fP [\--datadir <DATADIR>] [\--fullscreen]
+\fBpipenightdreams\fP [\--datadir <DATADIR>] [\--fullscreen]
 
 .SH DESCRIPTION
 
-\fB pipenightdreams\fP is a PipeDream style game. The objetive of the game is to carry
-liquid from some point to the exit using different kinds of pipes. On each level
-there is a minimum number of required pipes that should be at least reached for it
+\fBpipenightdreams\fP is a puzzle-game where the objective is to carry liquid
+from some point to the exit using different kinds of pipes. On each level there
+is a minimum number of required pipes that should be at least reached for it
 to be completed.
 
 The score is increased by using as many pipes as possible an by collecting various bonus
 tokens making the liquid pass through their pipes. There are also life bonus and,
 hopefully soon, "freeze tokens".
 
-The game is not exactly a copy of PipeDream. It's based only on the facts
-I remember and on many other things which have been added, or changed hoping for making
-it better.
-
 .SS KEYS
 The game is entirely played using the keyboard and the key layout is as follows:
 .IP SPACE
@@ -49,9 +45,7 @@
 
 .SH OPTIONS
 \fB --datadir <CUSTOM DATA DIR> \fP is used when
-the data directory is not the default one (\fB /usr/share/games/pipenightdreams\fP
-if installed from a rpm package and \fB /usr/local/share/games/pipenightdreams\fP
-when installed by compiling the source package).
+the data directory is not the default one (\fB/usr/share/pipenightdreams\fP).
 
 \fB --fullscreen \fP switchs to fullscreen mode.
 


Index: pipenightdreams.spec
===================================================================
RCS file: /cvs/extras/rpms/pipenightdreams/FC-5/pipenightdreams.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pipenightdreams.spec	7 Apr 2006 11:12:45 -0000	1.1
+++ pipenightdreams.spec	9 Apr 2006 07:26:15 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           pipenightdreams
 Version:        0.10.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Connect the waterpipes to create a proper pipeline
 Group:          Amusements/Games
 License:        GPL
@@ -9,20 +9,23 @@
 Source1:        %{name}.desktop
 Patch0:         pipenightdreams-0.10.0-gcc41.patch
 Patch1:         pipenightdreams-0.10.0-datadir.patch
+Patch2:         pipenightdreams-0.10.0-sanitize.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL_image-devel desktop-file-utils
 
 %description
-PipeNightDreams is a game similar to the classic PipeDream. It has 25 levels
-with increasing difficulty, and you can create your own by just editing
-text files. It has a lot of cool graphics, score, lives, required pipes
-per level and an easy and fast interface.
+PipeNightDreams is a puzzle-game where you must race against the clock to
+connect the waterpipes to create a proper pipeline before the water starts
+flowing. It has 25 levels with increasing difficulty, and you can create
+your own by just editing text files. It has a lot of cool graphics, score,
+lives, required pipes per level and an easy and fast interface.
 
 
 %prep
 %setup -q
 %patch0 -p1 -z .gcc41
-%patch1 -p1 -z .gcc41
+%patch1 -p1 -z .datadir
+%patch2 -p1 -z .sanitize
 
 
 %build
@@ -77,5 +80,8 @@
 
 
 %changelog
+* Fri Apr  7 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.0-2
+- Remove use of a trademarked term from %%description, manpage and docs
+
 * Wed Apr  5 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.0-1
 - initial Fedora Extras package



From fedora-extras-commits at redhat.com  Sun Apr  9 07:26:52 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun,  9 Apr 2006 00:26:52 -0700
Subject: rpms/pipenightdreams/FC-4 pipenightdreams-0.10.0-sanitize.patch,
	NONE, 1.1 pipenightdreams.spec, 1.1, 1.2
Message-ID: <200604090726.k397Qs5j020481@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/pipenightdreams/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20461

Modified Files:
	pipenightdreams.spec 
Added Files:
	pipenightdreams-0.10.0-sanitize.patch 
Log Message:
* Fri Apr  7 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.0-2
- Remove use of a trademarked term from %description, manpage and docs


pipenightdreams-0.10.0-sanitize.patch:

--- NEW FILE pipenightdreams-0.10.0-sanitize.patch ---
diff -ur pipenightdreams-0.10.0.orig/README pipenightdreams-0.10.0/README
--- pipenightdreams-0.10.0.orig/README	2001-10-12 22:02:34.000000000 +0200
+++ pipenightdreams-0.10.0/README	2006-04-07 17:15:52.000000000 +0200
@@ -9,7 +9,7 @@
               http:://www.libsdl.org/projects/pipenightdreams
 
 
-This game is a pseudo-clon of an old game called PipeDream. I say pseudo-clon
+This game is a pseudo-clon of an old pipeline arcade game. I say pseudo-clon
 because I don't have the original one so I've been working just with the facts
 I remember. I've written it in my spare time during the last twelve months (as you
 can see my spare time is not much).
diff -ur pipenightdreams-0.10.0.orig/man/pipenightdreams.6 pipenightdreams-0.10.0/man/pipenightdreams.6
--- pipenightdreams-0.10.0.orig/man/pipenightdreams.6	2002-03-23 22:17:05.000000000 +0100
+++ pipenightdreams-0.10.0/man/pipenightdreams.6	2006-04-07 17:30:39.000000000 +0200
@@ -6,23 +6,19 @@
 
 .SH SYNOPSIS 
 
-\fB pipenightdreams\fP [\--datadir <DATADIR>] [\--fullscreen]
+\fBpipenightdreams\fP [\--datadir <DATADIR>] [\--fullscreen]
 
 .SH DESCRIPTION
 
-\fB pipenightdreams\fP is a PipeDream style game. The objetive of the game is to carry
-liquid from some point to the exit using different kinds of pipes. On each level
-there is a minimum number of required pipes that should be at least reached for it
+\fBpipenightdreams\fP is a puzzle-game where the objective is to carry liquid
+from some point to the exit using different kinds of pipes. On each level there
+is a minimum number of required pipes that should be at least reached for it
 to be completed.
 
 The score is increased by using as many pipes as possible an by collecting various bonus
 tokens making the liquid pass through their pipes. There are also life bonus and,
 hopefully soon, "freeze tokens".
 
-The game is not exactly a copy of PipeDream. It's based only on the facts
-I remember and on many other things which have been added, or changed hoping for making
-it better.
-
 .SS KEYS
 The game is entirely played using the keyboard and the key layout is as follows:
 .IP SPACE
@@ -49,9 +45,7 @@
 
 .SH OPTIONS
 \fB --datadir <CUSTOM DATA DIR> \fP is used when
-the data directory is not the default one (\fB /usr/share/games/pipenightdreams\fP
-if installed from a rpm package and \fB /usr/local/share/games/pipenightdreams\fP
-when installed by compiling the source package).
+the data directory is not the default one (\fB/usr/share/pipenightdreams\fP).
 
 \fB --fullscreen \fP switchs to fullscreen mode.
 


Index: pipenightdreams.spec
===================================================================
RCS file: /cvs/extras/rpms/pipenightdreams/FC-4/pipenightdreams.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pipenightdreams.spec	7 Apr 2006 11:12:45 -0000	1.1
+++ pipenightdreams.spec	9 Apr 2006 07:26:52 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           pipenightdreams
 Version:        0.10.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Connect the waterpipes to create a proper pipeline
 Group:          Amusements/Games
 License:        GPL
@@ -9,20 +9,23 @@
 Source1:        %{name}.desktop
 Patch0:         pipenightdreams-0.10.0-gcc41.patch
 Patch1:         pipenightdreams-0.10.0-datadir.patch
+Patch2:         pipenightdreams-0.10.0-sanitize.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL_image-devel desktop-file-utils
 
 %description
-PipeNightDreams is a game similar to the classic PipeDream. It has 25 levels
-with increasing difficulty, and you can create your own by just editing
-text files. It has a lot of cool graphics, score, lives, required pipes
-per level and an easy and fast interface.
+PipeNightDreams is a puzzle-game where you must race against the clock to
+connect the waterpipes to create a proper pipeline before the water starts
+flowing. It has 25 levels with increasing difficulty, and you can create
+your own by just editing text files. It has a lot of cool graphics, score,
+lives, required pipes per level and an easy and fast interface.
 
 
 %prep
 %setup -q
 %patch0 -p1 -z .gcc41
-%patch1 -p1 -z .gcc41
+%patch1 -p1 -z .datadir
+%patch2 -p1 -z .sanitize
 
 
 %build
@@ -77,5 +80,8 @@
 
 
 %changelog
+* Fri Apr  7 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.0-2
+- Remove use of a trademarked term from %%description, manpage and docs
+
 * Wed Apr  5 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.10.0-1
 - initial Fedora Extras package



From fedora-extras-commits at redhat.com  Sun Apr  9 07:28:28 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun,  9 Apr 2006 00:28:28 -0700
Subject: comps comps-fe5.xml.in,1.35,1.36
Message-ID: <200604090728.k397SUoc020542@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20525/comps

Modified Files:
	comps-fe5.xml.in 
Log Message:
add pipenightdreams


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- comps-fe5.xml.in	7 Apr 2006 14:11:26 -0000	1.35
+++ comps-fe5.xml.in	9 Apr 2006 07:28:28 -0000	1.36
@@ -227,6 +227,7 @@
         <packagereq type="optional">nexuiz</packagereq>
         <packagereq type="optional">njam</packagereq>
         <packagereq type="optional">overgod</packagereq>
+        <packagereq type="optional">pipenightdreams</packagereq>
         <packagereq type="optional">powermanga</packagereq>
         <packagereq type="optional">ppracer</packagereq>
         <packagereq type="optional">qascade</packagereq>



From fedora-extras-commits at redhat.com  Sun Apr  9 07:29:33 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun,  9 Apr 2006 00:29:33 -0700
Subject: rpms/crystal-stacker - New directory
Message-ID: <200604090729.k397TZMf020612@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/crystal-stacker
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20591/crystal-stacker

Log Message:
Directory /cvs/extras/rpms/crystal-stacker added to the repository




From fedora-extras-commits at redhat.com  Sun Apr  9 07:29:34 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun,  9 Apr 2006 00:29:34 -0700
Subject: rpms/crystal-stacker/devel - New directory
Message-ID: <200604090729.k397TaCf020615@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/crystal-stacker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20591/crystal-stacker/devel

Log Message:
Directory /cvs/extras/rpms/crystal-stacker/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Apr  9 07:29:52 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun,  9 Apr 2006 00:29:52 -0700
Subject: rpms/crystal-stacker Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604090729.k397TsVB020669@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/crystal-stacker
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20636

Added Files:
	Makefile import.log 
Log Message:
Setup of module crystal-stacker


--- NEW FILE Makefile ---
# Top level Makefile for module crystal-stacker
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr  9 07:29:53 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun,  9 Apr 2006 00:29:53 -0700
Subject: rpms/crystal-stacker/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604090729.k397TtLD020672@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/crystal-stacker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20636/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module crystal-stacker


--- 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 Apr  9 07:30:54 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun,  9 Apr 2006 00:30:54 -0700
Subject: rpms/crystal-stacker/devel crystal-stacker-1.5-fixes.patch, NONE,
	1.1 crystal-stacker-theme-editor.desktop, NONE,
	1.1 crystal-stacker.desktop, NONE, 1.1 crystal-stacker.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604090731.k397VQuY020762@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/crystal-stacker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20718/devel

Modified Files:
	.cvsignore sources 
Added Files:
	crystal-stacker-1.5-fixes.patch 
	crystal-stacker-theme-editor.desktop crystal-stacker.desktop 
	crystal-stacker.spec 
Log Message:
auto-import crystal-stacker-1.5-0.pre.2 on branch devel from crystal-stacker-1.5-0.pre.2.src.rpm

crystal-stacker-1.5-fixes.patch:

--- NEW FILE crystal-stacker-1.5-fixes.patch ---
--- crystal-stacker-1.5/cs/source/Makefile.unix.fixes	2006-03-21 19:07:56.000000000 +0100
+++ crystal-stacker-1.5/cs/source/Makefile.unix	2006-04-07 00:25:54.000000000 +0200
@@ -1,6 +1,6 @@
-PREFIX  = /home/opt
+PREFIX  = /usr/local
 DATADIR = $(PREFIX)/share/$(TARGET)
-CFLAGS  = -g -Wall  -Wno-deprecated-declarations -O2 
+CFLAGS  = -g -Wall -O2 -fsigned-char
 LDFLAGS = `allegro-config --libs` -laldmb -ldumb
 DEFINES = -DDATADIR=\"$(DATADIR)/\"
 OBJS    =    animate.o  misc.o   cs2bd.o     cs2ns.o    game.o      keys.o   \
@@ -21,9 +21,9 @@
 	mkdir -p $(PREFIX)/bin
 	install -p -m 755 $(TARGET) $(PREFIX)/bin
 	mkdir -p $(DATADIR)
-	install -p -m 644 ../../distro/cs.dat $(DATADIR)
-	install -p -m 644 ../../distro/cs.cth $(DATADIR)
-	install -p -m 644 ../../distro/cs.xm $(DATADIR)
+	install -p -m 644 ../cs.dat $(DATADIR)
+	install -p -m 644 ../cs.cth $(DATADIR)
+	install -p -m 644 ../cs.xm $(DATADIR)
 	
 clean:
 	rm -f $(OBJS) $(TARGET) *~
--- crystal-stacker-1.5/cs/source/t3ssal.c.fixes	2006-03-24 20:24:54.000000000 +0100
+++ crystal-stacker-1.5/cs/source/t3ssal.c	2006-04-07 00:25:54.000000000 +0200
@@ -7,13 +7,12 @@
 #define __USE_GNU
 #include <allegro.h>
 #include <aldumb.h> 
-#include <unistd.h>
-#ifndef ALLEGRO_WINDOWS
-	#include <pthread.h>
-#endif
 #include "t3ssal.h"
 #include "mywav.h"
-
+#ifdef T3SS_PTHREADS
+#include <unistd.h>
+#include <pthread.h>
+#endif
 
 
 int t3ss_effects_channels =  4; // how many channels for sound effects
@@ -31,14 +30,12 @@
 int t3ss_music_pattern =     0;
 
 /* dumb / mod(music) playing related vars */
-static char t3ss_mod_fn[128];
 static DUH *t3ss_duh = NULL;
 static AL_DUH_PLAYER *t3ss_duh_player = NULL;
-static DUH_SIGRENDERER * t3ss_sigrenderer = NULL;
 
-#ifndef ALLEGRO_WINDOWS
-	static pthread_t t3ss_duh_player_thread;
-	static pthread_mutex_t t3ss_duh_player_mutex;
+#ifdef T3SS_PTHREADS
+static pthread_t t3ss_duh_player_thread;
+static pthread_mutex_t t3ss_duh_player_mutex;
 #endif
 
 
@@ -63,9 +60,9 @@
 
         /* init dumb */
         dumb_register_packfiles();
-        #ifndef ALLEGRO_WINDOWS
-        	pthread_mutex_init(&t3ss_duh_player_mutex, NULL);
-        #endif
+#ifdef T3SS_PTHREADS
+        pthread_mutex_init(&t3ss_duh_player_mutex, NULL);
+#endif
         
         t3ss_initialized = 1;
     }
@@ -109,16 +106,6 @@
 void t3ss_enable_music(void)
 {
     t3ss_music_on = 1;
-    if (t3ss_duh) {
-	    #ifndef ALLEGRO_WINDOWS
-        	pthread_mutex_lock(&t3ss_duh_player_mutex);
-        #endif
-        al_resume_duh(t3ss_duh_player);
-        #ifndef ALLEGRO_WINDOWS
-	        pthread_mutex_unlock(&t3ss_duh_player_mutex);
-	    #endif
-        t3ss_music_playing = 1;
-    }
 }
 
 void t3ss_disable_effects(void)
@@ -128,26 +115,21 @@
 
 void t3ss_disable_music(void)
 {
+    if (t3ss_duh_player)
+        t3ss_stop_mod();
     t3ss_music_on = 0;
-    if (t3ss_duh) {
-	    #ifndef ALLEGRO_WINDOWS
-        	pthread_mutex_lock(&t3ss_duh_player_mutex);
-        #endif
-        al_pause_duh(t3ss_duh_player);
-	    #ifndef ALLEGRO_WINDOWS
-	        pthread_mutex_unlock(&t3ss_duh_player_mutex);
-	    #endif
-        t3ss_music_playing = 0;
-    }
 }
 
-#ifndef ALLEGRO_WINDOWS
+
+#ifdef T3SS_PTHREADS
 static void *t3ss_duh_player_thread_function(void *arg)
 {
     while(1)
     {
         pthread_mutex_lock(&t3ss_duh_player_mutex);
-        al_poll_duh(t3ss_duh_player);
+        /* this may be nuked if things fail in t3ss_set_music_pattern */
+        if (t3ss_duh_player)
+            al_poll_duh(t3ss_duh_player);
         pthread_mutex_unlock(&t3ss_duh_player_mutex);
         pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
         usleep(10000);
@@ -162,10 +144,10 @@
     DUMB_IT_SIGDATA *sigdata;
     DUH_SIGRENDERER *renderer;
     
-    if (!t3ss_initialized)
+    if (!t3ss_initialized || !t3ss_music_on)
         return 0;
         
-    if (t3ss_duh)
+    if (t3ss_duh_player)
         t3ss_stop_mod();
     
     t3ss_duh = dumb_load_xm_quick(fn);
@@ -191,7 +173,7 @@
     }
 
     t3ss_duh_player = al_duh_encapsulate_sigrenderer(renderer,
-        t3ss_music_volume/100.0f, 2048, t3ss_freq);
+        t3ss_music_volume/100.0f, 4096, t3ss_freq);
     if (!t3ss_duh_player)
     {
         duh_end_sigrenderer(renderer);
@@ -199,24 +181,19 @@
         t3ss_duh = NULL;
         return 0;
     }
-    
-    if (!t3ss_music_on)
-        al_pause_duh(t3ss_duh_player);
-    
-	#ifndef ALLEGRO_WINDOWS
+        
+#ifdef T3SS_PTHREADS
     if (pthread_create(&t3ss_duh_player_thread, NULL,
             t3ss_duh_player_thread_function, NULL))
     {
         al_stop_duh(t3ss_duh_player);
-        unload_duh(t3ss_duh);
         t3ss_duh_player = NULL;
+        unload_duh(t3ss_duh);
         t3ss_duh = NULL;
         return 0;
     }
-	#endif
+#endif
 
-    if (fn != t3ss_mod_fn)
-        snprintf(t3ss_mod_fn, sizeof(t3ss_mod_fn), "%s", fn);
     t3ss_music_playing = 1;
     return 1;
 }
@@ -225,35 +202,36 @@
 /* stop sound playback */
 void t3ss_stop_mod(void)
 {
-    if (t3ss_duh)
+    if (t3ss_duh_player)
     {
         /* stop the player thread */
-        #ifndef ALLEGRO_WINDOWS
+#ifdef T3SS_PTHREADS
         pthread_cancel(t3ss_duh_player_thread);
         pthread_join(t3ss_duh_player_thread, NULL);
-        #endif
+#endif
         /* and clean up everything */
         al_stop_duh(t3ss_duh_player);
-        unload_duh(t3ss_duh);
         t3ss_duh_player = NULL;
+        unload_duh(t3ss_duh);
         t3ss_duh = NULL;
         t3ss_music_playing = 0;
     }
 }
 
+
 /* set the music volume */
 void t3ss_set_music_volume(int volume)
 {
     t3ss_music_volume = volume;
-    if (t3ss_duh)
+    if (t3ss_duh_player)
     {
-	    #ifndef ALLEGRO_WINDOWS
-        	pthread_mutex_lock(&t3ss_duh_player_mutex);
-        #endif
+#ifdef T3SS_PTHREADS
+        pthread_mutex_lock(&t3ss_duh_player_mutex);
+#endif
         al_duh_set_volume(t3ss_duh_player, t3ss_music_volume/100.0f);
-	    #ifndef ALLEGRO_WINDOWS
-	        pthread_mutex_unlock(&t3ss_duh_player_mutex);
-	    #endif
+#ifdef T3SS_PTHREADS
+        pthread_mutex_unlock(&t3ss_duh_player_mutex);
+#endif
     }
 }
 
@@ -269,13 +247,39 @@
 void t3ss_set_music_pattern(int patnum)
 {
     t3ss_music_pattern = patnum;
-    if (t3ss_duh)
+    if (t3ss_duh_player)
     {
-		al_stop_duh(t3ss_duh_player);
-		t3ss_sigrenderer = dumb_it_start_at_order(t3ss_duh, 2, patnum);
-		t3ss_duh_player = al_duh_encapsulate_sigrenderer(t3ss_sigrenderer, 1.0, 4096, 22050);
-		t3ss_set_music_volume(t3ss_music_volume);
-	}
+        DUH_SIGRENDERER *renderer;
+        if (t3ss_music_pattern >= t3ss_num_patterns)
+            t3ss_music_pattern = 0;
+#ifdef T3SS_PTHREADS
+        pthread_mutex_lock(&t3ss_duh_player_mutex);
+#endif
+        al_stop_duh(t3ss_duh_player);
+        t3ss_duh_player = NULL;
+
+        renderer = dumb_it_start_at_order(t3ss_duh, 2, t3ss_music_pattern);
+        if (renderer)
+            t3ss_duh_player = al_duh_encapsulate_sigrenderer(renderer,
+                t3ss_music_volume/100.0f, 4096, t3ss_freq);
+
+        if (!t3ss_duh_player)
+        {
+            if (renderer)
+                duh_end_sigrenderer(renderer);
+            unload_duh(t3ss_duh);
+            t3ss_duh = NULL;
+        }
+#ifdef T3SS_PTHREADS
+        pthread_mutex_unlock(&t3ss_duh_player_mutex);
+        /* stop the player thread? */
+        if (!t3ss_duh_player)
+        {
+            pthread_cancel(t3ss_duh_player_thread);
+            pthread_join(t3ss_duh_player_thread, NULL);
+        }
+#endif
+    }
 }
 
 
@@ -413,24 +417,40 @@
 
 void t3ss_pause_music(void)
 {
-	if(t3ss_duh_player)
-	{
-		al_pause_duh(t3ss_duh_player);
-	}
+    if(t3ss_duh_player)
+    {
+#ifdef T3SS_PTHREADS
+        pthread_mutex_lock(&t3ss_duh_player_mutex);
+#endif
+        al_pause_duh(t3ss_duh_player);
+#ifdef T3SS_PTHREADS
+        pthread_mutex_unlock(&t3ss_duh_player_mutex);
+#endif
+        t3ss_music_playing = 0;
+    }
 }
 
 void t3ss_resume_music(void)
 {
-	if(t3ss_duh_player)
-	{
-		al_resume_duh(t3ss_duh_player);
-	}
+    if (t3ss_duh_player)
+    {
+#ifdef T3SS_PTHREADS
+        pthread_mutex_lock(&t3ss_duh_player_mutex);
+#endif
+        al_resume_duh(t3ss_duh_player);
+#ifdef T3SS_PTHREADS
+        pthread_mutex_unlock(&t3ss_duh_player_mutex);
+#endif
+        t3ss_music_playing = 1;
+    }
 }
 
+#ifndef T3SS_PTHREADS
 void t3ss_poll(void)
 {
-	if(t3ss_duh_player && t3ss_duh)
-	{
-		al_poll_duh(t3ss_duh_player);
-	}
+    if(t3ss_duh_player)
+    {
+        al_poll_duh(t3ss_duh_player);
+    }
 }
+#endif
--- crystal-stacker-1.5/cs/source/cs.c.fixes	2006-03-24 19:41:48.000000000 +0100
+++ crystal-stacker-1.5/cs/source/cs.c	2006-04-07 00:25:54.000000000 +0200
@@ -127,7 +127,6 @@
 /* handle graphics mode switching */
 void cs_gfx_mode(int w, int h, PALETTE mpal)
 {
-    int rrate;
     int dw, dh;
 
     /* don't think this works */
@@ -207,7 +206,6 @@
 /* same as above, but sets the mode every time instead of by necessity */
 void cs_gfx_mode_force(int w, int h, PALETTE mpal)
 {
-    int rrate;
     int dw, dh;
 
     /* don't think this works */
--- crystal-stacker-1.5/cs/source/menu.c.fixes	2006-04-07 10:25:04.000000000 +0200
+++ crystal-stacker-1.5/cs/source/menu.c	2006-04-07 10:26:00.000000000 +0200
@@ -1441,9 +1441,13 @@
 /* select a new theme */
 void select_theme(void)
 {
-	t3ss_pause_music();
+#ifndef T3SS_PTHREADS
+    t3ss_pause_music();
+#endif	
     file_select_ex("Select theme file...", cs_options.theme_name, "CTH", 256, 320, 240);
-	t3ss_resume_music();
+#ifndef T3SS_PTHREADS
+    t3ss_resume_music();
+#endif
     update_theme_filenames(cs_options.theme_name);
     update_menu_screen();
     while((key[KEY_ESC] || key[KEY_ENTER] || key[KEY_SPACE]));
--- crystal-stacker-1.5/cs/source/t3ssal.h.fixes	2001-07-18 04:55:56.000000000 +0200
+++ crystal-stacker-1.5/cs/source/t3ssal.h	2006-04-07 00:25:54.000000000 +0200
@@ -7,6 +7,11 @@
 extern "C" {
 #endif
 
+/* Do we want to use pthreads? */
+#if !defined(ALLEGRO_WINDOWS) && !defined(T3SS_PTHREADS)
+#define T3SS_PTHREADS
+#endif
+
 #define I_NULL -1 /* provide NULL value for signed integers */
 #define MSAMPLE SAMPLE
 
@@ -39,6 +44,14 @@
 void t3ss_play_sound_ex(MSAMPLE * sp, int chan, int vol, int pan, int freq);
 void t3ss_play_sound_reserved(MSAMPLE * sp, int chan, int pan, int freq);
 int t3ss_place_sound(int x, int width);
+void t3ss_pause_music(void);
+void t3ss_resume_music(void);
+
+#ifdef T3SS_PTHREADS
+#define t3ss_poll()
+#else
+void t3ss_poll(void);
+#endif
 
 #ifdef __cplusplus
 }
--- crystal-stacker-1.5/cs/readme.txt.fixes	2006-03-24 19:02:38.000000000 +0100
+++ crystal-stacker-1.5/cs/readme.txt	2006-04-07 10:27:16.000000000 +0200
@@ -6,6 +6,7 @@
 Please see the "Contacting Us" section of this document if you need to contact
 us for any reason.
 
+
 Disclaimer
 ----------
 
--- crystal-stacker-1.5/ce/source/Makefile.unix.fixes	2006-03-21 19:07:56.000000000 +0100
+++ crystal-stacker-1.5/ce/source/Makefile.unix	2006-04-07 00:25:54.000000000 +0200
@@ -1,6 +1,6 @@
-PREFIX  = /home/opt
+PREFIX  = /usr/local
 DATADIR = $(PREFIX)/share/crystal-stacker
-CFLAGS  = -g -Wall -Wno-deprecated-declarations -Wno-char-subscripts -O2
+CFLAGS  = -g -Wall -Wno-char-subscripts -O2 -fsigned-char
 LDFLAGS = `allegro-config --libs`
 DEFINES = -DDATADIR=\"$(DATADIR)/\"
 OBJS    = gui.o gtools.o itools.o theme.o font.o palette.o settings.o \
@@ -17,7 +17,7 @@
 	mkdir -p $(PREFIX)/bin
 	install -p -m 755 $(TARGET) $(PREFIX)/bin
 	mkdir -p $(DATADIR)
-	install -p -m 644 ../../distro/ce.dat $(DATADIR)
+	install -p -m 644 ../ce.dat $(DATADIR)
 	
 clean:
 	rm -f $(OBJS) $(TARGET) *~
--- crystal-stacker-1.5/ce/ce.txt.fixes	2002-01-09 02:02:36.000000000 +0100
+++ crystal-stacker-1.5/ce/ce.txt	2006-04-07 10:27:18.000000000 +0200
@@ -1,11 +1,10 @@
-Crystal Edit (c) 2001 NewCreature Design
+Crystal Edit (c) 2006 NewCreature Design
 ----------------------------------------
 
-
-Crystal Edit is freeware. This means you can pass copies around freely as long
-as no money is to be made from it. If you'd like to include Crystal Edit on
-your freeware/shareware CD, you should contact us via e-mail at the address in
-the "Contacting Us" section of this document to make sure it's okay.
+Crystal Edit is freeware. This means you can pass copies around freely
+provided you include this document in it's original form in your distribution.
+Please see the "Contacting Us" section of this document if you need to contact
+us for any reason.
 
 
 Disclaimer
--- /dev/null	2006-04-07 10:13:42.899697500 +0200
+++ crystal-stacker-1.5/ce/ce-license-change.txt	2006-04-07 10:27:49.000000000 +0200
@@ -0,0 +1,122 @@
+On my (Hans de Goede <j.w.r.degoede at hhs.nl>) request Todd Cope has changed
+the license text for crystal-stacker. However he forgot to change the
+license text (which used to be identical) for the cs theme-editor ce.
+
+The license part of ce.txt has been modified by my to once again match that
+of cs (as found in cs/readme.txt). This was done with permission of Todd:
+
+
+Message-ID: <44339CF1.60204 at hhs.nl>
+Date: Wed, 05 Apr 2006 12:33:21 +0200
+From: Hans de Goede <j.w.r.degoede at hhs.nl>
+User-Agent: Thunderbird 1.5 (X11/20060210)
+MIME-Version: 1.0
+To:  todd at t3-i.com
+Subject: Re: Crsytal Stacker License Clarification needed
+References: <20060404203453.c1bf2b7c2c1de069cff39b794cd5d62e.ff21a1ecfd.wbe at email.secureserver.net>
+In-Reply-To: <20060404203453.c1bf2b7c2c1de069cff39b794cd5d62e.ff21a1ecfd.wbe at email.secureserver.net>
+Content-Type: text/plain; charset=ISO-8859-1; format=flowed
+Content-Transfer-Encoding: 7bit
+
+todd at t3-i.com wrote:
+> Hi there,
+> 
+> Sorry it's taking so long. I've been really busy.
+
+No problem! And many thanks for al the great work on a great game!
+
+> I have uploaded the
+> latest source package with the updated license information and all the
+> fixes you made. I changed the layout of the archive because I didn't
+> like the way the old layout was. Now when you compile the executables
+> they are placed in the "ce" and "cs" folders along with the game data.
+> Just thought I would inform you in case your makefile needs to be
+> updated to reflect this change. Here's the link:
+> 
+> http://ncdgames.t3-i.com/cs15src.zip
+> 
+> I will await word from you before officially releasing this source
+> package to the public that way if you have any more changes to submit I
+> can apply them. If you have things working the way you want and
+> everything looks good in the licensing and such you can go ahead and
+> release your FC version. I'm in the process of moving so I might not be
+> able to get back with you for a while.
+> 
+
+I've looked through the new source and I've got a number of remarks:
+
+1) you seem to have forgotten to update ce/ce.txt the license there 
+still reads:
+"Crystal Edit is freeware. This means you can pass copies around freely
+  as long as no money is to be made from it. If you'd like to include
+  Crystal Edit on your freeware/shareware CD, you should contact us via
+  e-mail at the address in the "Contacting Us" section of this document
+  to make sure it's okay."
+
+Where as in cs/readme.txt (which used to be distro/readme.txt) where you 
+had the exact same text you changed it to:
+"Crystal Stacker is freeware. This means you can pass copies around 
+freely provided you include this document in it's original form in your 
+distribution."
+
+I assume you wanted / meant todo the same change for ce? If you did mean 
+to make this change please let me know I understand if you don't have 
+the time todo a new release now, but without atleast a mail from you 
+saying that this is indeed what you wanted I still cannot distribute cs 
+:| (or atleast not ce).
+
+Many thanks for the license change BTW, the new license is good.
+
+2) Some remarks regarding the new t3ssal.c:
+
+---
+
+The rest of the mail has been deleted because of non relevance
+
+---
+
+Return-Path: <todd at t3-i.com>
+Received: from koko.hhs.nl ([145.52.2.16] verified)
+  by hhs.nl (CommuniGate Pro SMTP 4.3.6)
+  with ESMTP id 46263002 for j.w.r.degoede at hhs.nl; Wed, 05 Apr 2006 23:34:57 +0200
+Received: from exim by koko.hhs.nl with spam-scanned (Exim 4.41)
+	id 1FRFeS-0003oO-Ag
+	for j.w.r.degoede at hhs.nl; Wed, 05 Apr 2006 23:34:57 +0200
+X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on koko.hhs.nl
+X-Spam-Level: 
+X-Spam-Status: No, score=-1.4 required=5.0 tests=AWL,BAYES_00,NO_REAL_NAME 
+	autolearn=no version=3.1.0
+Received: from exim (helo=koko)
+	by koko.hhs.nl with local-smtp (Exim 4.41)
+	id 1FRFeS-0003oL-6o
+	for j.w.r.degoede at hhs.nl; Wed, 05 Apr 2006 23:34:56 +0200
+Received: from [68.178.232.2] (port=36111 helo=smtpout11-02.prod.mesa1.secureserver.net)
+	by koko.hhs.nl with smtp (Exim 4.41)
+	id 1FRFeR-0003oG-Ml
+	for j.w.r.degoede at hhs.nl; Wed, 05 Apr 2006 23:34:56 +0200
+Received: (qmail 21425 invoked from network); 5 Apr 2006 21:34:54 -0000
+Received: from unknown (HELO gem-wbe05.mesa1.secureserver.net) (64.202.189.37)
+  by smtpout11-02.prod.mesa1.secureserver.net with SMTP; 5 Apr 2006 21:34:54 -0000
+Received: (qmail 596 invoked by uid 99); 5 Apr 2006 21:34:53 -0000
+Date: Wed, 05 Apr 2006 14:34:53 -0700
+From: todd at t3-i.com
+Subject: RE: Crsytal Stacker License Clarification needed
+To: Hans de Goede <j.w.r.degoede at hhs.nl>
+Message-ID: <20060405143453.c1bf2b7c2c1de069cff39b794cd5d62e.f78207bcfb.wbe at email.secureserver.net>
+MIME-Version: 1.0
+Content-Type: TEXT/plain; CHARSET=US-ASCII
+User-Agent: Web-Based Email 4.0.17
+X-Originating-IP: 66.190.177.177
+X-Anti-Virus: Kaspersky Anti-Virus for MailServers 5.5.2/RELEASE, bases: 05042006 #175178, status: clean
+
+1) you seem to have forgotten to update ce/ce.txt the license there 
+> still reads:...
+
+Yeah, I forgot about that file. I wanted it to have the same license as
+CS.
+
+2) Some remarks regarding the new t3ssal.c:...
+
+---
+
+Once again the rest of the mail has been deleted because of non relevance.


--- NEW FILE crystal-stacker-theme-editor.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Crystal Stacker Theme Editor
GenericName=Themes editor for Crystal Stacker
Comment=Create new Themes for Crystal Stacker
Exec=crystal-stacker-theme-editor
Icon=crystal-stacker-theme-editor.png
Terminal=false
StartupNotify=false
Type=Application
Categories=Application;Game;
Version=1.5


--- NEW FILE crystal-stacker.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Crystal Stacker
GenericName=Falling blocks 3 in a row
Comment=Match 3 or more crystals of the same color in a row
Exec=crystal-stacker
Icon=crystal-stacker.png
Terminal=false
StartupNotify=false
Type=Application
Categories=Application;Game;
Version=1.5


--- NEW FILE crystal-stacker.spec ---
Name:           crystal-stacker
Version:        1.5
Release:        0.pre.2%{?dist}
Summary:        Falling blocks, match 3 or more of the same color crystals
Group:          Amusements/Games
License:        Freeware
URL:            http://www.t3-i.com/cstacker.htm
Source0:        http://www.t3-i.com/ncdgames/cs15src.zip
Source1:	%{name}.desktop
Source2:	%{name}-theme-editor.desktop
Patch0:         crystal-stacker-1.5-fixes.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  allegro-devel dumb-devel ImageMagick desktop-file-utils

%description
If you've played Columns then you know what Crystal Stacker is all about. Match
3 or more of the same color crystals either horizontally, vertically, or dia-
gonally to destroy them. For every 45 crystals you destroy, the level increases
and the crystals fall faster. The higher the level, the more points you are   
awarded for destroying crystals.


%package theme-editor
Summary:	Themes editor for Crystal Stacker
Group:		Amusements/Games
Requires:	%{name} = %{version}

%description theme-editor
Create new Themes for Crystal Stacker


%prep
%setup -q -c
%patch0 -p1 -z .fixes
%{__sed} -i 's/\r//' ce/*.txt cs/*.txt


%build
pushd cs/source
make %{?_smp_mflags} -f Makefile.unix PREFIX=%{_prefix} \
  CFLAGS="$RPM_OPT_FLAGS -fsigned-char"
popd

pushd ce/source
make %{?_smp_mflags} -f Makefile.unix PREFIX=%{_prefix} \
  CFLAGS="$RPM_OPT_FLAGS -fsigned-char -Wno-char-subscripts"
popd

convert cs/cs.ico %{name}.png
convert ce/ce.ico %{name}-theme-editor.png


%install
rm -rf $RPM_BUILD_ROOT
pushd cs/source
make -f Makefile.unix install PREFIX=$RPM_BUILD_ROOT%{_prefix}
popd

pushd ce/source
make -f Makefile.unix install PREFIX=$RPM_BUILD_ROOT%{_prefix}
popd

# 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}
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 %{name}.png %{name}-theme-editor.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

%post theme-editor
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 theme-editor
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 cs/*.txt
%{_bindir}/crystal-stacker
%dir %{_datadir}/crystal-stacker
%{_datadir}/crystal-stacker/cs.*
%{_datadir}/applications/fedora-%{name}.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}.png

%files theme-editor
%defattr(-,root,root,-)
%doc ce/*.txt
%{_bindir}/crystal-stacker-theme-editor
%{_datadir}/crystal-stacker/ce.dat
%{_datadir}/applications/fedora-%{name}-theme-editor.desktop
%{_datadir}/icons/hicolor/32x32/apps/%{name}-theme-editor.png


%changelog
* Fri Apr  8 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.5-0.pre.2
- Updated Patch0 to not unnescesarry pause the music when selecting
  a new theme and using pthreads to play the music.

* Thu Apr  7 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.5-0.pre.1
- Initial Fedora Extras package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/crystal-stacker/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2006 07:29:53 -0000	1.1
+++ .cvsignore	9 Apr 2006 07:30:54 -0000	1.2
@@ -0,0 +1 @@
+cs15src.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/crystal-stacker/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2006 07:29:53 -0000	1.1
+++ sources	9 Apr 2006 07:30:54 -0000	1.2
@@ -0,0 +1 @@
+d961dfdc859267b2763f4b585a732f3e  cs15src.zip



From fedora-extras-commits at redhat.com  Sun Apr  9 07:30:53 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun,  9 Apr 2006 00:30:53 -0700
Subject: rpms/crystal-stacker import.log,1.1,1.2
Message-ID: <200604090731.k397VP5L020758@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/crystal-stacker
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20718

Modified Files:
	import.log 
Log Message:
auto-import crystal-stacker-1.5-0.pre.2 on branch devel from crystal-stacker-1.5-0.pre.2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/crystal-stacker/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Apr 2006 07:29:52 -0000	1.1
+++ import.log	9 Apr 2006 07:30:53 -0000	1.2
@@ -0,0 +1 @@
+crystal-stacker-1_5-0_pre_2:HEAD:crystal-stacker-1.5-0.pre.2.src.rpm:1144567703



From fedora-extras-commits at redhat.com  Sun Apr  9 07:32:11 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun,  9 Apr 2006 00:32:11 -0700
Subject: owners owners.list,1.813,1.814
Message-ID: <200604090732.k397WDqK020812@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20794/owners

Modified Files:
	owners.list 
Log Message:
add crystal-stacker


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.813
retrieving revision 1.814
diff -u -r1.813 -r1.814
--- owners.list	9 Apr 2006 03:08:02 -0000	1.813
+++ owners.list	9 Apr 2006 07:32:11 -0000	1.814
@@ -155,6 +155,7 @@
 Fedora Extras|cproto|Generates function prototypes and variable declarations from C code|jnovy at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|crack|Password cracker|Christian.Iseli at licr.org|extras-qa at fedoraproject.org|
 Fedora Extras|cryptplug|Cryptography plugin for mutt & kmail|dennis at ausil.us|extras-qa at fedoraproject.org|
+Fedora Extras|crystal-stacker|Falling blocks, match 3 or more of the same color crystals|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|csmash|3D tabletennis game|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|ctrlproxy|IRC server with multiserver support|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|cvs2cl|Utility which generates ChangeLogs from CVS working copies|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Apr  9 08:47:38 2006
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Sun,  9 Apr 2006 01:47:38 -0700
Subject: rpms/subversion-api-docs - New directory
Message-ID: <200604090847.k398le0U023717@cvs-int.fedora.redhat.com>

Author: bojan

Update of /cvs/extras/rpms/subversion-api-docs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23696/subversion-api-docs

Log Message:
Directory /cvs/extras/rpms/subversion-api-docs added to the repository




From fedora-extras-commits at redhat.com  Sun Apr  9 08:47:38 2006
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Sun,  9 Apr 2006 01:47:38 -0700
Subject: rpms/subversion-api-docs/devel - New directory
Message-ID: <200604090847.k398leDT023720@cvs-int.fedora.redhat.com>

Author: bojan

Update of /cvs/extras/rpms/subversion-api-docs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23696/subversion-api-docs/devel

Log Message:
Directory /cvs/extras/rpms/subversion-api-docs/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Apr  9 08:48:09 2006
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Sun,  9 Apr 2006 01:48:09 -0700
Subject: rpms/subversion-api-docs Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604090848.k398mBHd023774@cvs-int.fedora.redhat.com>

Author: bojan

Update of /cvs/extras/rpms/subversion-api-docs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23741

Added Files:
	Makefile import.log 
Log Message:
Setup of module subversion-api-docs


--- NEW FILE Makefile ---
# Top level Makefile for module subversion-api-docs
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr  9 08:48:10 2006
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Sun,  9 Apr 2006 01:48:10 -0700
Subject: rpms/subversion-api-docs/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604090848.k398mCp1023777@cvs-int.fedora.redhat.com>

Author: bojan

Update of /cvs/extras/rpms/subversion-api-docs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23741/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module subversion-api-docs


--- 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 Apr  9 08:49:09 2006
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Sun,  9 Apr 2006 01:49:09 -0700
Subject: rpms/subversion-api-docs import.log,1.1,1.2
Message-ID: <200604090849.k398nBMM023841@cvs-int.fedora.redhat.com>

Author: bojan

Update of /cvs/extras/rpms/subversion-api-docs
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23808

Modified Files:
	import.log 
Log Message:
auto-import subversion-api-docs-1.3.0-1 on branch devel from subversion-api-docs-1.3.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/subversion-api-docs/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Apr 2006 08:48:09 -0000	1.1
+++ import.log	9 Apr 2006 08:49:09 -0000	1.2
@@ -0,0 +1 @@
+subversion-api-docs-1_3_0-1:HEAD:subversion-api-docs-1.3.0-1.src.rpm:1144572531



From fedora-extras-commits at redhat.com  Sun Apr  9 08:49:10 2006
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Sun,  9 Apr 2006 01:49:10 -0700
Subject: rpms/subversion-api-docs/devel COPYING, NONE, 1.1 doxygen.conf, NONE,
	1.1 subversion-api-docs.spec, NONE, 1.1
Message-ID: <200604090849.k398nC4P023844@cvs-int.fedora.redhat.com>

Author: bojan

Update of /cvs/extras/rpms/subversion-api-docs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23808/devel

Added Files:
	COPYING doxygen.conf subversion-api-docs.spec 
Log Message:
auto-import subversion-api-docs-1.3.0-1 on branch devel from subversion-api-docs-1.3.0-1.src.rpm


--- NEW FILE COPYING ---
This license applies to all portions of Subversion which are not
externally-maintained libraries (e.g. apr/, apr-util/, and neon/).
Such libraries have their own licenses; we recommend you read them, as
their terms may differ from the terms below.

This is version 1 of this license.  It is also available online at
http://subversion.tigris.org/license-1.html.  If newer versions of
this license are posted there (the same URL, but with the version
number incremented: .../license-2.html, .../license-3.html, and so
on), you may use a newer version instead, at your option.

====================================================================
Copyright (c) 2000-2004 CollabNet.  All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:

1. Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.

3. The end-user documentation included with the redistribution, if
any, must include the following acknowledgment: "This product includes
software developed by CollabNet (http://www.Collab.Net/)."
Alternately, this acknowledgment may appear in the software itself, if
and wherever such third-party acknowledgments normally appear.

4. The hosted project names must not be used to endorse or promote
products derived from this software without prior written
permission. For written permission, please contact info at collab.net.

5. Products derived from this software may not use the "Tigris" name
nor may "Tigris" appear in their names without prior written
permission of CollabNet.

THIS SOFTWARE IS PROVIDED ``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 COLLABNET 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 CollabNet.



--- NEW FILE doxygen.conf ---
# Doxyfile 1.4.1

# This file describes the settings to be used by the documentation system
# doxygen (www.doxygen.org) for a project
#
# All text after a hash (#) is considered a comment and will be ignored
# The format is:
#       TAG = value [value, ...]
# For lists items can also be appended using:
#       TAG += value [value, ...]
# Values that contain spaces should be placed between quotes (" ")

#---------------------------------------------------------------------------
# Project related configuration options
#---------------------------------------------------------------------------

# The PROJECT_NAME tag is a single word (or a sequence of words surrounded 
# by quotes) that should identify the project.

PROJECT_NAME           = Subversion

# The PROJECT_NUMBER tag can be used to enter a project or revision number. 
# This could be handy for archiving the generated documentation or 
# if some version control system is used.

PROJECT_NUMBER         = 

# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
# base path where the generated documentation will be put. 
# If a relative path is entered, it will be relative to the location 
# where doxygen was started. If left blank the current directory will be used.

OUTPUT_DIRECTORY       = doc/doxygen

# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
# 4096 sub-directories (in 2 levels) under the output directory of each output 
# format and will distribute the generated files over these directories. 
# Enabling this option can be useful when feeding doxygen a huge amount of 
# source files, where putting all generated files in the same directory would 
# otherwise cause performance problems for the file system.

CREATE_SUBDIRS         = NO

# The OUTPUT_LANGUAGE tag is used to specify the language in which all 
# documentation generated by doxygen is written. Doxygen will use this 
# information to generate all constant output in the proper language. 
# The default language is English, other supported languages are: 
# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, 
# Dutch, Finnish, French, German, Greek, Hungarian, Italian, Japanese, 
# Japanese-en (Japanese with English messages), Korean, Korean-en, Norwegian, 
# Polish, Portuguese, Romanian, Russian, Serbian, Slovak, Slovene, Spanish, 
# Swedish, and Ukrainian.

OUTPUT_LANGUAGE        = English

# This tag can be used to specify the encoding used in the generated output. 
# The encoding is not always determined by the language that is chosen, 
# but also whether or not the output is meant for Windows or non-Windows users. 
# In case there is a difference, setting the USE_WINDOWS_ENCODING tag to YES 
# forces the Windows encoding (this is the default for the Windows binary), 
# whereas setting the tag to NO uses a Unix-style encoding (the default for 
# all platforms other than Windows).

USE_WINDOWS_ENCODING   = YES

# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will 
# include brief member descriptions after the members that are listed in 
# the file and class documentation (similar to JavaDoc). 
# Set to NO to disable this.

BRIEF_MEMBER_DESC      = YES

# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend 
# the brief description of a member or function before the detailed description. 
# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the 
# brief descriptions will be completely suppressed.

REPEAT_BRIEF           = YES

# This tag implements a quasi-intelligent brief description abbreviator 
# that is used to form the text in various listings. Each string 
# in this list, if found as the leading text of the brief description, will be 
# stripped from the text and the result after processing the whole list, is 
# used as the annotated text. Otherwise, the brief description is used as-is. 
# If left blank, the following values are used ("$name" is automatically 
# replaced with the name of the entity): "The $name class" "The $name widget" 
# "The $name file" "is" "provides" "specifies" "contains" 
# "represents" "a" "an" "the"

ABBREVIATE_BRIEF       = 

# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then 
# Doxygen will generate a detailed section even if there is only a brief 
# description.

ALWAYS_DETAILED_SEC    = NO

# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all 
# inherited members of a class in the documentation of that class as if those 
# members were ordinary class members. Constructors, destructors and assignment 
# operators of the base classes will not be shown.

INLINE_INHERITED_MEMB  = NO

# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full 
# path before files name in the file list and in the header files. If set 
# to NO the shortest path that makes the file name unique will be used.

FULL_PATH_NAMES        = NO

# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
# can be used to strip a user-defined part of the path. Stripping is 
# only done if one of the specified strings matches the left-hand part of 
# the path. The tag can be used to show relative paths in the file list. 
# If left blank the directory from which doxygen is run is used as the 
# path to strip.

STRIP_FROM_PATH        = 

# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
# the path mentioned in the documentation of a class, which tells 
# the reader which header file to include in order to use a class. 
# If left blank only the name of the header file containing the class 
# definition is used. Otherwise one should specify the include paths that 
# are normally passed to the compiler using the -I flag.

STRIP_FROM_INC_PATH    = 

# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter 
# (but less readable) file names. This can be useful is your file systems 
# doesn't support long names like on DOS, Mac, or CD-ROM.

SHORT_NAMES            = NO

# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen 
# will interpret the first line (until the first dot) of a JavaDoc-style 
# comment as the brief description. If set to NO, the JavaDoc 
# comments will behave just like the Qt-style comments (thus requiring an 
# explicit @brief command for a brief description.

JAVADOC_AUTOBRIEF      = YES

# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen 
# treat a multi-line C++ special comment block (i.e. a block of //! or /// 
# comments) as a brief description. This used to be the default behaviour. 
# The new default is to treat a multi-line C++ comment block as a detailed 
# description. Set this tag to YES if you prefer the old behaviour instead.

MULTILINE_CPP_IS_BRIEF = NO

# If the DETAILS_AT_TOP tag is set to YES then Doxygen 
# will output the detailed description near the top, like JavaDoc.
# If set to NO, the detailed description appears after the member 
# documentation.

DETAILS_AT_TOP         = NO

# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
# member inherits the documentation from any documented member that it 
# re-implements.

INHERIT_DOCS           = YES

# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC 
# tag is set to YES, then doxygen will reuse the documentation of the first 
# member in the group (if any) for the other members of the group. By default 
# all members of a group must be documented explicitly.

DISTRIBUTE_GROUP_DOC   = NO

# The TAB_SIZE tag can be used to set the number of spaces in a tab. 
# Doxygen uses this value to replace tabs by spaces in code fragments.

TAB_SIZE               = 8

# This tag can be used to specify a number of aliases that acts 
# as commands in the documentation. An alias has the form "name=value". 
# For example adding "sideeffect=\par Side Effects:\n" will allow you to 
# put the command \sideeffect (or @sideeffect) in the documentation, which 
# will result in a user-defined paragraph with heading "Side Effects:". 
# You can put \n's in the value part of an alias to insert newlines.

ALIASES                = "copyright=@if copyrights" \
                         endcopyright=@endif

# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C 
# sources only. Doxygen will then generate output that is more tailored for C. 
# For instance, some of the names that are used will be different. The list 
# of all members will be omitted, etc.

OPTIMIZE_OUTPUT_FOR_C  = YES

# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources 
# only. Doxygen will then generate output that is more tailored for Java. 
# For instance, namespaces will be presented as packages, qualified scopes 
# will look different, etc.

OPTIMIZE_OUTPUT_JAVA   = NO

# Set the SUBGROUPING tag to YES (the default) to allow class member groups of 
# the same type (for instance a group of public functions) to be put as a 
# subgroup of that type (e.g. under the Public Functions section). Set it to 
# NO to prevent subgrouping. Alternatively, this can be done per class using 
# the \nosubgrouping command.

SUBGROUPING            = YES

#---------------------------------------------------------------------------
# Build related configuration options
#---------------------------------------------------------------------------

# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in 
# documentation are documented, even if no documentation was available. 
# Private class members and static file members will be hidden unless 
# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES

EXTRACT_ALL            = NO

# If the EXTRACT_PRIVATE tag is set to YES all private members of a class 
# will be included in the documentation.

EXTRACT_PRIVATE        = NO

# If the EXTRACT_STATIC tag is set to YES all static members of a file 
# will be included in the documentation.

EXTRACT_STATIC         = NO

# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) 
# defined locally in source files will be included in the documentation. 
# If set to NO only classes defined in header files are included.

EXTRACT_LOCAL_CLASSES  = YES

# This flag is only useful for Objective-C code. When set to YES local 
# methods, which are defined in the implementation section but not in 
# the interface are included in the documentation. 
# If set to NO (the default) only methods in the interface are included.

EXTRACT_LOCAL_METHODS  = NO

# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all 
# undocumented members of documented classes, files or namespaces. 
# If set to NO (the default) these members will be included in the 
# various overviews, but no documentation section is generated. 
# This option has no effect if EXTRACT_ALL is enabled.

HIDE_UNDOC_MEMBERS     = NO

# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all 
# undocumented classes that are normally visible in the class hierarchy. 
# If set to NO (the default) these classes will be included in the various 
# overviews. This option has no effect if EXTRACT_ALL is enabled.

HIDE_UNDOC_CLASSES     = NO

# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all 
# friend (class|struct|union) declarations. 
# If set to NO (the default) these declarations will be included in the 
# documentation.

HIDE_FRIEND_COMPOUNDS  = NO

# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any 
# documentation blocks found inside the body of a function. 
# If set to NO (the default) these blocks will be appended to the 
# function's detailed documentation block.

HIDE_IN_BODY_DOCS      = NO

# The INTERNAL_DOCS tag determines if documentation 
# that is typed after a \internal command is included. If the tag is set 
# to NO (the default) then the documentation will be excluded. 
# Set it to YES to include the internal documentation.

INTERNAL_DOCS          = NO

# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate 
# file names in lower-case letters. If set to YES upper-case letters are also 
# allowed. This is useful if you have classes or files whose names only differ 
# in case and if your file system supports case sensitive file names. Windows 
# and Mac users are advised to set this option to NO.

CASE_SENSE_NAMES       = YES

# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen 
# will show members with their full class and namespace scopes in the 
# documentation. If set to YES the scope will be hidden.

HIDE_SCOPE_NAMES       = NO

# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen 
# will put a list of the files that are included by a file in the documentation 
# of that file.

SHOW_INCLUDE_FILES     = YES

# If the INLINE_INFO tag is set to YES (the default) then a tag [inline] 
# is inserted in the documentation for inline members.

INLINE_INFO            = YES

# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen 
# will sort the (detailed) documentation of file and class members 
# alphabetically by member name. If set to NO the members will appear in 
# declaration order.

SORT_MEMBER_DOCS       = YES

# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
# brief documentation of file, namespace and class members alphabetically 
# by member name. If set to NO (the default) the members will appear in 
# declaration order.

SORT_BRIEF_DOCS        = NO

# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be 
# sorted by fully-qualified names, including namespaces. If set to 
# NO (the default), the class list will be sorted only by class name, 
# not including the namespace part. 
# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
# Note: This option applies only to the class list, not to the 
# alphabetical list.

SORT_BY_SCOPE_NAME     = NO

# The GENERATE_TODOLIST tag can be used to enable (YES) or 
# disable (NO) the todo list. This list is created by putting \todo 
# commands in the documentation.

GENERATE_TODOLIST      = YES

# The GENERATE_TESTLIST tag can be used to enable (YES) or 
# disable (NO) the test list. This list is created by putting \test 
# commands in the documentation.

GENERATE_TESTLIST      = YES

# The GENERATE_BUGLIST tag can be used to enable (YES) or 
# disable (NO) the bug list. This list is created by putting \bug 
# commands in the documentation.

GENERATE_BUGLIST       = YES

# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or 
# disable (NO) the deprecated list. This list is created by putting 
# \deprecated commands in the documentation.

GENERATE_DEPRECATEDLIST= YES

# The ENABLED_SECTIONS tag can be used to enable conditional 
# documentation sections, marked by \if sectionname ... \endif.

ENABLED_SECTIONS       = 

# The MAX_INITIALIZER_LINES tag determines the maximum number of lines 
# the initial value of a variable or define consists of for it to appear in 
# the documentation. If the initializer consists of more lines than specified 
# here it will be hidden. Use a value of 0 to hide initializers completely. 
# The appearance of the initializer of individual variables and defines in the 
# documentation can be controlled using \showinitializer or \hideinitializer 
# command in the documentation regardless of this setting.

MAX_INITIALIZER_LINES  = 30

# Set the SHOW_USED_FILES tag to NO to disable the list of files generated 
# at the bottom of the documentation of classes and structs. If set to YES the 
# list will mention the files that were used to generate the documentation.

SHOW_USED_FILES        = YES

# If the sources in your project are distributed over multiple directories 
# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
# in the documentation.

SHOW_DIRECTORIES       = YES

# 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 
# version control system). Doxygen will invoke the program by executing (via 
# popen()) the command <command> <input-file>, where <command> is the value of 
# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file 
# provided by doxygen. Whatever the progam writes to standard output 
# is used as the file version. See the manual for examples.

FILE_VERSION_FILTER    = 

#---------------------------------------------------------------------------
# configuration options related to warning and progress messages
#---------------------------------------------------------------------------

# The QUIET tag can be used to turn on/off the messages that are generated 
# by doxygen. Possible values are YES and NO. If left blank NO is used.

QUIET                  = NO

# The WARNINGS tag can be used to turn on/off the warning messages that are 
# generated by doxygen. Possible values are YES and NO. If left blank 
# NO is used.

WARNINGS               = YES

# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings 
# for undocumented members. If EXTRACT_ALL is set to YES then this flag will 
# automatically be disabled.

WARN_IF_UNDOCUMENTED   = YES

# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for 
# potential errors in the documentation, such as not documenting some 
# parameters in a documented function, or documenting parameters that 
# don't exist or using markup commands wrongly.

WARN_IF_DOC_ERROR      = YES

# This WARN_NO_PARAMDOC option can be abled to get warnings for 
# functions that are documented, but have no documentation for their parameters 
# or return value. If set to NO (the default) doxygen will only warn about 
# wrong or incomplete parameter documentation, but not about the absence of 
# documentation.

WARN_NO_PARAMDOC       = NO

# The WARN_FORMAT tag determines the format of the warning messages that 
# doxygen can produce. The string should contain the $file, $line, and $text 
# tags, which will be replaced by the file and line number from which the 
# warning originated and the warning text. Optionally the format may contain 
# $version, which will be replaced by the version of the file (if it could 
# be obtained via FILE_VERSION_FILTER)

WARN_FORMAT            = "$file:$line: $text"

# The WARN_LOGFILE tag can be used to specify a file to which warning 
# and error messages should be written. If left blank the output is written 
# to stderr.

WARN_LOGFILE           = 

#---------------------------------------------------------------------------
# configuration options related to the input files
#---------------------------------------------------------------------------

# The INPUT tag can be used to specify the files and/or directories that contain 
# documented source files. You may enter file names like "myfile.cpp" or 
# directories like "/usr/src/myproject". Separate the files or directories 
# with spaces.

INPUT                  = subversion/include

# If the value of the INPUT tag contains directories, you can use the 
# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
# and *.h) to filter out the source-files in the directories. If left 
# blank the following patterns are tested: 
# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm

FILE_PATTERNS          = *.h

# The RECURSIVE tag can be used to turn specify whether or not subdirectories 
# should be searched for input files as well. Possible values are YES and NO. 
# If left blank NO is used.

RECURSIVE              = NO

# The EXCLUDE tag can be used to specify files and/or directories that should 
# excluded from the INPUT source files. This way you can easily exclude a 
# subdirectory from a directory tree whose root is specified with the INPUT tag.

EXCLUDE                = 

# The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
# directories that are symbolic links (a Unix filesystem feature) are excluded 
# from the input.

EXCLUDE_SYMLINKS       = NO

# If the value of the INPUT tag contains directories, you can use the 
# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude 
# certain files from those directories.

EXCLUDE_PATTERNS       = 

# The EXAMPLE_PATH tag can be used to specify one or more files or 
# directories that contain example code fragments that are included (see 
# the \include command).

EXAMPLE_PATH           = 

# If the value of the EXAMPLE_PATH tag contains directories, you can use the 
# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
# and *.h) to filter out the source-files in the directories. If left 
# blank all files are included.

EXAMPLE_PATTERNS       = 

# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 
# searched for input files to be used with the \include or \dontinclude 
# commands irrespective of the value of the RECURSIVE tag. 
# Possible values are YES and NO. If left blank NO is used.

EXAMPLE_RECURSIVE      = NO

# The IMAGE_PATH tag can be used to specify one or more files or 
# directories that contain image that are included in the documentation (see 
# the \image command).

IMAGE_PATH             = 

# The INPUT_FILTER tag can be used to specify a program that doxygen should 
# invoke to filter for each input file. Doxygen will invoke the filter program 
# by executing (via popen()) the command <filter> <input-file>, where <filter> 
# is the value of the INPUT_FILTER tag, and <input-file> is the name of an 
# input file. Doxygen will then use the output that the filter program writes 
# to standard output.  If FILTER_PATTERNS is specified, this tag will be 
# ignored.

INPUT_FILTER           = 

# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern 
# basis.  Doxygen will compare the file name with each pattern and apply the 
# filter if there is a match.  The filters are a list of the form: 
# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further 
# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER 
# is applied to all files.

FILTER_PATTERNS        = 

# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using 
# INPUT_FILTER) will be used to filter the input files when producing source 
# files to browse (i.e. when SOURCE_BROWSER is set to YES).

FILTER_SOURCE_FILES    = NO

#---------------------------------------------------------------------------
# configuration options related to source browsing
#---------------------------------------------------------------------------

# If the SOURCE_BROWSER tag is set to YES then a list of source files will 
# be generated. Documented entities will be cross-referenced with these sources. 
# Note: To get rid of all source code in the generated output, make sure also 
# VERBATIM_HEADERS is set to NO.

SOURCE_BROWSER         = YES

# Setting the INLINE_SOURCES tag to YES will include the body 
# of functions and classes directly in the documentation.

INLINE_SOURCES         = NO

# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct 
# doxygen to hide any special comment blocks from generated source code 
# fragments. Normal C and C++ comments will always remain visible.

STRIP_CODE_COMMENTS    = NO

# If the REFERENCED_BY_RELATION tag is set to YES (the default) 
# then for each documented function all documented 
# functions referencing it will be listed.

REFERENCED_BY_RELATION = YES

# If the REFERENCES_RELATION tag is set to YES (the default) 
# then for each documented function all documented entities 
# called/used by that function will be listed.

REFERENCES_RELATION    = YES

# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen 
# will generate a verbatim copy of the header file for each class for 
# which an include is specified. Set to NO to disable this.

VERBATIM_HEADERS       = YES

#---------------------------------------------------------------------------
# configuration options related to the alphabetical class index
#---------------------------------------------------------------------------

# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index 
# of all compounds will be generated. Enable this if the project 
# contains a lot of classes, structs, unions or interfaces.

ALPHABETICAL_INDEX     = NO

# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then 
# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns 
# in which this list will be split (can be a number in the range [1..20])

COLS_IN_ALPHA_INDEX    = 5

# In case all classes in a project start with a common prefix, all 
# classes will be put under the same header in the alphabetical index. 
# The IGNORE_PREFIX tag can be used to specify one or more prefixes that 
# should be ignored while generating the index headers.

IGNORE_PREFIX          = 

#---------------------------------------------------------------------------
# configuration options related to the HTML output
#---------------------------------------------------------------------------

# If the GENERATE_HTML tag is set to YES (the default) Doxygen will 
# generate HTML output.

GENERATE_HTML          = YES

# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. 
# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
# put in front of it. If left blank `html' will be used as the default path.

HTML_OUTPUT            = html

# The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
# each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
# doxygen will generate files with .html extension.

HTML_FILE_EXTENSION    = .html

# The HTML_HEADER tag can be used to specify a personal HTML header for 
# each generated HTML page. If it is left blank doxygen will generate a 
# standard header.

HTML_HEADER            = 

# The HTML_FOOTER tag can be used to specify a personal HTML footer for 
# each generated HTML page. If it is left blank doxygen will generate a 
# standard footer.

HTML_FOOTER            = 

# The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
# style sheet that is used by each HTML page. It can be used to 
# fine-tune the look of the HTML output. If the tag is left blank doxygen 
# will generate a default style sheet. Note that doxygen will try to copy 
# the style sheet file to the HTML output directory, so don't put your own 
# stylesheet in the HTML output directory as well, or it will be erased!

HTML_STYLESHEET        = 

# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
# files or namespaces will be aligned in HTML using tables. If set to 
# NO a bullet list will be used.

HTML_ALIGN_MEMBERS     = YES

# If the GENERATE_HTMLHELP tag is set to YES, additional index files 
# will be generated that can be used as input for tools like the 
# Microsoft HTML help workshop to generate a compressed HTML help file (.chm) 
# of the generated HTML documentation.

GENERATE_HTMLHELP      = NO

# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can 
# be used to specify the file name of the resulting .chm file. You 
# can add a path in front of the file if the result should not be 
# written to the html output directory.

CHM_FILE               = 

# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can 
# be used to specify the location (absolute path including file name) of 
# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run 
# the HTML help compiler on the generated index.hhp.

HHC_LOCATION           = 

# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag 
# controls if a separate .chi index file is generated (YES) or that 
# it should be included in the master .chm file (NO).

GENERATE_CHI           = NO

# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag 
# controls whether a binary table of contents is generated (YES) or a 
# normal table of contents (NO) in the .chm file.

BINARY_TOC             = NO

# The TOC_EXPAND flag can be set to YES to add extra items for group members 
# to the contents of the HTML help documentation and to the tree view.

TOC_EXPAND             = NO

# The DISABLE_INDEX tag can be used to turn on/off the condensed index at 
# top of each HTML page. The value NO (the default) enables the index and 
# the value YES disables it.

DISABLE_INDEX          = NO

# This tag can be used to set the number of enum values (range [1..20]) 
# that doxygen will group on one line in the generated HTML documentation.

ENUM_VALUES_PER_LINE   = 1

# If the GENERATE_TREEVIEW tag is set to YES, a side panel will be
# generated containing a tree-like index structure (just like the one that 
# is generated for HTML Help). For this to work a browser that supports 
# JavaScript, DHTML, CSS and frames is required (for instance Mozilla 1.0+, 
# Netscape 6.0+, Internet explorer 5.0+, or Konqueror). Windows users are 
# probably better off using the HTML help feature.

GENERATE_TREEVIEW      = NO

# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be 
# used to set the initial width (in pixels) of the frame in which the tree 
# is shown.

TREEVIEW_WIDTH         = 250

#---------------------------------------------------------------------------
# configuration options related to the LaTeX output
#---------------------------------------------------------------------------

# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will 
# generate Latex output.

GENERATE_LATEX         = NO

# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. 
# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
# put in front of it. If left blank `latex' will be used as the default path.

LATEX_OUTPUT           = latex

# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be 
# invoked. If left blank `latex' will be used as the default command name.

LATEX_CMD_NAME         = latex

# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to 
# generate index for LaTeX. If left blank `makeindex' will be used as the 
# default command name.

MAKEINDEX_CMD_NAME     = makeindex

# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact 
# LaTeX documents. This may be useful for small projects and may help to 
# save some trees in general.

COMPACT_LATEX          = NO

# The PAPER_TYPE tag can be used to set the paper type that is used 
# by the printer. Possible values are: a4, a4wide, letter, legal and 
# executive. If left blank a4wide will be used.

PAPER_TYPE             = a4wide

# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX 
# packages that should be included in the LaTeX output.

EXTRA_PACKAGES         = 

# The LATEX_HEADER tag can be used to specify a personal LaTeX header for 
# the generated latex document. The header should contain everything until 
# the first chapter. If it is left blank doxygen will generate a 
# standard header. Notice: only use this tag if you know what you are doing!

LATEX_HEADER           = 

# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated 
# is prepared for conversion to pdf (using ps2pdf). The pdf file will 
# contain links (just like the HTML output) instead of page references 
# This makes the output suitable for online browsing using a pdf viewer.

PDF_HYPERLINKS         = NO

# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of 
# plain latex in the generated Makefile. Set this option to YES to get a 
# higher quality PDF documentation.

USE_PDFLATEX           = NO

# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode. 
# command to the generated LaTeX files. This will instruct LaTeX to keep 
# running if errors occur, instead of asking the user for help. 
# This option is also used when generating formulas in HTML.

LATEX_BATCHMODE        = NO

# If LATEX_HIDE_INDICES is set to YES then doxygen will not 
# include the index chapters (such as File Index, Compound Index, etc.) 
# in the output.

LATEX_HIDE_INDICES     = NO

#---------------------------------------------------------------------------
# configuration options related to the RTF output
#---------------------------------------------------------------------------

# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output 
# The RTF output is optimized for Word 97 and may not look very pretty with 
# other RTF readers or editors.

GENERATE_RTF           = NO

# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. 
# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
# put in front of it. If left blank `rtf' will be used as the default path.

RTF_OUTPUT             = rtf

# If the COMPACT_RTF tag is set to YES Doxygen generates more compact 
# RTF documents. This may be useful for small projects and may help to 
# save some trees in general.

COMPACT_RTF            = NO

# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated 
# will contain hyperlink fields. The RTF file will 
# contain links (just like the HTML output) instead of page references. 
# This makes the output suitable for online browsing using WORD or other 
# programs which support those fields. 
# Note: wordpad (write) and others do not support links.

RTF_HYPERLINKS         = NO

# Load stylesheet definitions from file. Syntax is similar to doxygen's 
# config file, i.e. a series of assignments. You only have to provide 
# replacements, missing definitions are set to their default value.

RTF_STYLESHEET_FILE    = 

# Set optional variables used in the generation of an rtf document. 
# Syntax is similar to doxygen's config file.

RTF_EXTENSIONS_FILE    = 

#---------------------------------------------------------------------------
# configuration options related to the man page output
#---------------------------------------------------------------------------

# If the GENERATE_MAN tag is set to YES (the default) Doxygen will 
# generate man pages

GENERATE_MAN           = NO

# The MAN_OUTPUT tag is used to specify where the man pages will be put. 
# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
# put in front of it. If left blank `man' will be used as the default path.

MAN_OUTPUT             = man

# The MAN_EXTENSION tag determines the extension that is added to 
# the generated man pages (default is the subroutine's section .3)

MAN_EXTENSION          = .3

# If the MAN_LINKS tag is set to YES and Doxygen generates man output, 
# then it will generate one additional man file for each entity 
# documented in the real man page(s). These additional files 
# only source the real man page, but without them the man command 
# would be unable to find the correct page. The default is NO.

MAN_LINKS              = NO

#---------------------------------------------------------------------------
# configuration options related to the XML output
#---------------------------------------------------------------------------

# If the GENERATE_XML tag is set to YES Doxygen will 
# generate an XML file that captures the structure of 
# the code including all documentation.

GENERATE_XML           = NO

# The XML_OUTPUT tag is used to specify where the XML pages will be put. 
# If a relative path is entered the value of OUTPUT_DIRECTORY will be 
# put in front of it. If left blank `xml' will be used as the default path.

XML_OUTPUT             = xml

# The XML_SCHEMA tag can be used to specify an XML schema, 
# which can be used by a validating XML parser to check the 
# syntax of the XML files.

XML_SCHEMA             = 

# The XML_DTD tag can be used to specify an XML DTD, 
# which can be used by a validating XML parser to check the 
# syntax of the XML files.

XML_DTD                = 

# If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
# dump the program listings (including syntax highlighting 
# and cross-referencing information) to the XML output. Note that 
# enabling this will significantly increase the size of the XML output.

XML_PROGRAMLISTING     = YES

#---------------------------------------------------------------------------
# configuration options for the AutoGen Definitions output
#---------------------------------------------------------------------------

# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will 
# generate an AutoGen Definitions (see autogen.sf.net) file 
# that captures the structure of the code including all 
# documentation. Note that this feature is still experimental 
# and incomplete at the moment.

GENERATE_AUTOGEN_DEF   = NO

#---------------------------------------------------------------------------
# configuration options related to the Perl module output
#---------------------------------------------------------------------------

# If the GENERATE_PERLMOD tag is set to YES Doxygen will 
# generate a Perl module file that captures the structure of 
# the code including all documentation. Note that this 
# feature is still experimental and incomplete at the 
# moment.

GENERATE_PERLMOD       = NO

# If the PERLMOD_LATEX tag is set to YES Doxygen will generate 
# the necessary Makefile rules, Perl scripts and LaTeX code to be able 
# to generate PDF and DVI output from the Perl module output.

PERLMOD_LATEX          = NO

# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be 
# nicely formatted so it can be parsed by a human reader.  This is useful 
# if you want to understand what is going on.  On the other hand, if this 
# tag is set to NO the size of the Perl module output will be much smaller 
# and Perl will parse it just the same.

PERLMOD_PRETTY         = YES

# The names of the make variables in the generated doxyrules.make file 
# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. 
# This is useful so different doxyrules.make files included by the same 
# Makefile don't overwrite each other's variables.

PERLMOD_MAKEVAR_PREFIX = 

#---------------------------------------------------------------------------
# Configuration options related to the preprocessor   
#---------------------------------------------------------------------------

# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will 
# evaluate all C-preprocessor directives found in the sources and include 
# files.

ENABLE_PREPROCESSING   = YES

# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro 
# names in the source code. If set to NO (the default) only conditional 
# compilation will be performed. Macro expansion can be done in a controlled 
# way by setting EXPAND_ONLY_PREDEF to YES.

MACRO_EXPANSION        = YES

# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES 
# then the macro expansion is limited to the macros specified with the 
# PREDEFINED and EXPAND_AS_PREDEFINED tags.

EXPAND_ONLY_PREDEF     = NO

# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files 
# in the INCLUDE_PATH (see below) will be search if a #include is found.

SEARCH_INCLUDES        = YES

# The INCLUDE_PATH tag can be used to specify one or more directories that 
# contain include files that are not input files but should be processed by 
# the preprocessor.

INCLUDE_PATH           = 

# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard 
# patterns (like *.h and *.hpp) to filter out the header-files in the 
# directories. If left blank, the patterns specified with FILE_PATTERNS will 
# be used.

INCLUDE_FILE_PATTERNS  = 

# The PREDEFINED tag can be used to specify one or more macro names that 
# are defined before the preprocessor is started (similar to the -D option of 
# gcc). The argument of the tag is a list of macros of the form: name 
# or name=definition (no spaces). If the definition and the = are 
# omitted =1 is assumed. To prevent a macro definition from being 
# undefined via #undef or recursively expanded use the := operator 
# instead of the = operator.

PREDEFINED             = DOXYGEN \
                         DOXYGEN_SHOULD_SKIP_THIS \
                         __attribute__(x)= \
                         "SVN_ERROR_START=typedef enum svn_errno_t { \
                         SVN_WARNING = APR_OS_START_USERERR + 1," \
                         "SVN_ERRDEF(num,offset,str)=/** str */ num = offset," \
                         "SVN_ERROR_END=SVN_ERR_LAST } svn_errno_t;"


# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then 
# this tag can be used to specify a list of macro names that should be expanded. 
# The macro definition that is found in the sources will be used. 
# Use the PREDEFINED tag if you want to use a different macro definition.

EXPAND_AS_DEFINED      = 

# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then 
# doxygen's preprocessor will remove all function-like macros that are alone 
# on a line, have an all uppercase name, and do not end with a semicolon. Such 
# function macros are typically used for boiler-plate code, and will confuse 
# the parser if not removed.

SKIP_FUNCTION_MACROS   = YES

#---------------------------------------------------------------------------
# Configuration::additions related to external references   
#---------------------------------------------------------------------------

# The TAGFILES option can be used to specify one or more tagfiles. 
# Optionally an initial location of the external documentation 
# can be added for each tagfile. The format of a tag file without 
# this location is as follows: 
#   TAGFILES = file1 file2 ... 
# Adding location for the tag files is done as follows: 
#   TAGFILES = file1=loc1 "file2 = loc2" ... 
# where "loc1" and "loc2" can be relative or absolute paths or 
# URLs. If a location is present for each tag, the installdox tool 
# does not have to be run to correct the links.
# Note that each tag file must have a unique name
# (where the name does NOT include the path)
# If a tag file is not located in the directory in which doxygen 
# is run, you must also specify the path to the tagfile here.

TAGFILES               = 

# When a file name is specified after GENERATE_TAGFILE, doxygen will create 
# a tag file that is based on the input files it reads.

GENERATE_TAGFILE       = 

# If the ALLEXTERNALS tag is set to YES all external classes will be listed 
# in the class index. If set to NO only the inherited external classes 
# will be listed.

ALLEXTERNALS           = NO

# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed 
# in the modules index. If set to NO, only the current project's groups will 
# be listed.

EXTERNAL_GROUPS        = YES

# The PERL_PATH should be the absolute path and name of the perl script 
# interpreter (i.e. the result of `which perl').

PERL_PATH              = /usr/bin/perl

#---------------------------------------------------------------------------
# Configuration options related to the dot tool   
#---------------------------------------------------------------------------

# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will 
# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base 
# or super classes. Setting the tag to NO turns the diagrams off. Note that 
# this option is superseded by the HAVE_DOT option below. This is only a 
# fallback. It is recommended to install and use dot, since it yields more 
# powerful graphs.

CLASS_DIAGRAMS         = YES

# If set to YES, the inheritance and collaboration graphs will hide 
# inheritance and usage relations if the target is undocumented 
# or is not a class.

HIDE_UNDOC_RELATIONS   = YES

# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is 
# available from the path. This tool is part of Graphviz, a graph visualization 
# toolkit from AT&T and Lucent Bell Labs. The other options in this section 
# have no effect if this option is set to NO (the default)

HAVE_DOT               = NO

# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
# will generate a graph for each documented class showing the direct and 
# indirect inheritance relations. Setting this tag to YES will force the 
# the CLASS_DIAGRAMS tag to NO.

CLASS_GRAPH            = YES

# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen 
# will generate a graph for each documented class showing the direct and 
# indirect implementation dependencies (inheritance, containment, and 
# class references variables) of the class with other documented classes.

COLLABORATION_GRAPH    = YES

# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen 
# will generate a graph for groups, showing the direct groups dependencies

GROUP_GRAPHS           = YES

# If the UML_LOOK tag is set to YES doxygen will generate inheritance and 
# collaboration diagrams in a style similar to the OMG's Unified Modeling 
# Language.

UML_LOOK               = NO

# If set to YES, the inheritance and collaboration graphs will show the 
# relations between templates and their instances.

TEMPLATE_RELATIONS     = YES

# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT 
# tags are set to YES then doxygen will generate a graph for each documented 
# file showing the direct and indirect include dependencies of the file with 
# other documented files.

INCLUDE_GRAPH          = YES

# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and 
# HAVE_DOT tags are set to YES then doxygen will generate a graph for each 
# documented header file showing the documented files that directly or 
# indirectly include this file.

INCLUDED_BY_GRAPH      = YES

# If the CALL_GRAPH and HAVE_DOT tags are set to YES then doxygen will 
# generate a call dependency graph for every global function or class method. 
# Note that enabling this option will significantly increase the time of a run. 
# So in most cases it will be better to enable call graphs for selected 
# functions only using the \callgraph command.

CALL_GRAPH             = NO

# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
# will graphical hierarchy of all classes instead of a textual one.

GRAPHICAL_HIERARCHY    = YES

# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES 
# then doxygen will show the dependencies a directory has on other directories 
# in a graphical way. The dependency relations are determined by the #include
# relations between the files in the directories.

DIRECTORY_GRAPH        = YES

# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images 
# generated by dot. Possible values are png, jpg, or gif
# If left blank png will be used.

DOT_IMAGE_FORMAT       = png

# The tag DOT_PATH can be used to specify the path where the dot tool can be 
# found. If left blank, it is assumed the dot tool can be found in the path.

DOT_PATH               = 

# The DOTFILE_DIRS tag can be used to specify one or more directories that 
# contain dot files that are included in the documentation (see the 
# \dotfile command).

DOTFILE_DIRS           = 

# The MAX_DOT_GRAPH_WIDTH tag can be used to set the maximum allowed width 
# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
# this value, doxygen will try to truncate the graph, so that it fits within 
# the specified constraint. Beware that most browsers cannot cope with very 
# large images.

MAX_DOT_GRAPH_WIDTH    = 1024

# The MAX_DOT_GRAPH_HEIGHT tag can be used to set the maximum allows height 
# (in pixels) of the graphs generated by dot. If a graph becomes larger than 
# this value, doxygen will try to truncate the graph, so that it fits within 
# the specified constraint. Beware that most browsers cannot cope with very 
# large images.

MAX_DOT_GRAPH_HEIGHT   = 1024

# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the 
# graphs generated by dot. A depth value of 3 means that only nodes reachable 
# from the root by following a path via at most 3 edges will be shown. Nodes 
# that lay further from the root node will be omitted. Note that setting this 
# option to 1 or 2 may greatly reduce the computation time needed for large 
# code bases. Also note that a graph may be further truncated if the graph's 
# image dimensions are not sufficient to fit the graph (see MAX_DOT_GRAPH_WIDTH 
# and MAX_DOT_GRAPH_HEIGHT). If 0 is used for the depth value (the default), 
# the graph is not depth-constrained.

MAX_DOT_GRAPH_DEPTH    = 0

# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent 
# background. This is disabled by default, which results in a white background. 
# Warning: Depending on the platform used, enabling this option may lead to 
# badly anti-aliased labels on the edges of a graph (i.e. they become hard to 
# read).

DOT_TRANSPARENT        = NO

# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output 
# files in one run (i.e. multiple -o and -T options on the command line). This 
# makes dot run faster, but since only newer versions of dot (>1.8.10) 
# support this, this feature is disabled by default.

DOT_MULTI_TARGETS      = NO

# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will 
# generate a legend page explaining the meaning of the various boxes and 
# arrows in the dot generated graphs.

GENERATE_LEGEND        = YES

# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will 
# remove the intermediate dot files that are used to generate 
# the various graphs.

DOT_CLEANUP            = YES

#---------------------------------------------------------------------------
# Configuration::additions related to the search engine   
#---------------------------------------------------------------------------

# The SEARCHENGINE tag specifies whether or not a search engine should be 
# used. If set to NO the values of all tags below this one will be ignored.

SEARCHENGINE           = NO


--- NEW FILE subversion-api-docs.spec ---
Name:		subversion-api-docs
Version:	1.3.0
Release:	1%{?dist}
Summary:	Subversion API documentation

Group:		Development/Tools
License:	BSD
URL:		http://subversion.tigris.org/
Source0:        http://svn.collab.net/repos/svn/tags/%{version}/doc/doxygen.conf
Source1:        http://svn.collab.net/repos/svn/tags/%{version}/COPYING
BuildRequires:	subversion-devel = %{version}, doxygen
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:	noarch

Requires:	subversion-devel >= %{version}

%description
Subversion is a concurrent version control system which enables one or more
users to collaborate in developing and maintaining a hierarchy of files and
directories while keeping a history of all changes. This package provides
Subversion API documentation for developers.

%prep
rm -rf %{name}-%{version}
mkdir -p %{name}-%{version}
cd %{name}-%{version}
cp %{SOURCE0} doxygen.conf

%build
cd %{name}-%{version}
sed -e 's,\(INPUT *= *\).*$,\1%{_includedir}/subversion-1', \
    -e 's,\(OUTPUT_DIRECTORY *= *\).*$,\1docs,' \
    -e 's,\(GENERATE_TAGFILE *= *\).*$,\1docs/svn.tag,' \
doxygen.conf | doxygen -

%install
cd %{name}-%{version}
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_docdir}/subversion-%{version}/api-docs 
install -m 644 docs/svn.tag $RPM_BUILD_ROOT%{_docdir}/subversion-%{version}/api-docs
install -m 644 docs/html/* $RPM_BUILD_ROOT%{_docdir}/subversion-%{version}/api-docs
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_docdir}/subversion-%{version}/api-docs

%clean
rm -rf %{name}-%{version}
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc %dir %{_docdir}/subversion-%{version}
%doc %dir %{_docdir}/subversion-%{version}/api-docs
%doc %{_docdir}/subversion-%{version}/api-docs/*

%changelog
* Wed Jan 11 2006 Bojan Smojver <bojan at rexursive.com> 1.3.0-1
- initial package



From fedora-extras-commits at redhat.com  Sun Apr  9 08:55:23 2006
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Sun,  9 Apr 2006 01:55:23 -0700
Subject: owners owners.list,1.814,1.815
Message-ID: <200604090855.k398tPd9023906@cvs-int.fedora.redhat.com>

Author: bojan

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23884

Modified Files:
	owners.list 
Log Message:
Add subversion-api-docs package to the list.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.814
retrieving revision 1.815
diff -u -r1.814 -r1.815
--- owners.list	9 Apr 2006 07:32:11 -0000	1.814
+++ owners.list	9 Apr 2006 08:55:22 -0000	1.815
@@ -1361,6 +1361,7 @@
 Fedora Extras|straw|GNOME desktop news aggregator|byte at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|streamtuner|A stream directory browser|endur at bennewitz.com|extras-qa at fedoraproject.org|
 Fedora Extras|stripesnoop|Magnetic Stripe Reader|tcallawa at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|subversion-api-docs|Subversion API documentation|bojan at rexursive.com|extras-qa at fedoraproject.org|
 Fedora Extras|suck|Suck - download news from remote NNTP server|Jochen at herr-schmitt.de|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|



From fedora-extras-commits at redhat.com  Sun Apr  9 09:29:28 2006
From: fedora-extras-commits at redhat.com (Bojan Smojver (bojan))
Date: Sun,  9 Apr 2006 02:29:28 -0700
Subject: rpms/subversion-api-docs/devel subversion-api-docs.spec,1.1,1.2
Message-ID: <200604090929.k399TUiU026025@cvs-int.fedora.redhat.com>

Author: bojan

Update of /cvs/extras/rpms/subversion-api-docs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26008/devel

Modified Files:
	subversion-api-docs.spec 
Log Message:
Bump up to 1.3.1.



Index: subversion-api-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/subversion-api-docs/devel/subversion-api-docs.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- subversion-api-docs.spec	9 Apr 2006 08:49:09 -0000	1.1
+++ subversion-api-docs.spec	9 Apr 2006 09:29:28 -0000	1.2
@@ -1,5 +1,5 @@
 Name:		subversion-api-docs
-Version:	1.3.0
+Version:	1.3.1
 Release:	1%{?dist}
 Summary:	Subversion API documentation
 
@@ -52,5 +52,8 @@
 %doc %{_docdir}/subversion-%{version}/api-docs/*
 
 %changelog
+* Sun Apr 09 2006 Bojan Smojver <bojan at rexursive.com> 1.3.1-1
+- bump up to 1.3.1
+
 * Wed Jan 11 2006 Bojan Smojver <bojan at rexursive.com> 1.3.0-1
 - initial package



From fedora-extras-commits at redhat.com  Sun Apr  9 09:39:55 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun,  9 Apr 2006 02:39:55 -0700
Subject: extras-buildsys/utils extras-sign-move.py,1.8,1.9
Message-ID: <200604090939.k399dtfu026092@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26074

Modified Files:
	extras-sign-move.py 
Log Message:
Copy lcms.i386 to x86_64 for wine-cms.


Index: extras-sign-move.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/extras-sign-move.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- extras-sign-move.py	19 Mar 2006 22:42:27 -0000	1.8
+++ extras-sign-move.py	9 Apr 2006 09:39:53 -0000	1.9
@@ -53,6 +53,9 @@
              'wine-nas.i386': ['x86_64'],
              'wine-tools.i386': ['x86_64'],
              'wine-twain.i386': ['x86_64'],
+             # lcms for wine-cms in FE-3 and FE-4
+             'lcms.i386': ['x86_64'],
+             'lcms-debuginfo.i386': ['x86_64'],
              }
 ts = rpmUtils.transaction.initReadOnlyTransaction()
 



From fedora-extras-commits at redhat.com  Sun Apr  9 10:10:45 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Sun,  9 Apr 2006 03:10:45 -0700
Subject: rpms/mach/FC-5 .cvsignore, 1.3, 1.4 mach.spec, 1.6, 1.7 sources, 1.3,
	1.4
Message-ID: <200604091010.k39AAlsm028238@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/mach/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28217

Modified Files:
	.cvsignore mach.spec sources 
Log Message:
new upstream version


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mach/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	25 Nov 2005 19:11:37 -0000	1.3
+++ .cvsignore	9 Apr 2006 10:10:45 -0000	1.4
@@ -1 +1 @@
-mach-0.4.8.tar.bz2
+mach-0.4.9.tar.bz2


Index: mach.spec
===================================================================
RCS file: /cvs/extras/rpms/mach/FC-5/mach.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mach.spec	25 Nov 2005 19:11:37 -0000	1.6
+++ mach.spec	9 Apr 2006 10:10:45 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           mach
-Version:        0.4.8
+Version:        0.4.9
 Release:        1%{?dist}
 Summary:        make a chroot
 
@@ -82,7 +82,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING README AUTHORS BUGS TODO FORGETMENOT RELEASE
+%doc ChangeLog COPYING README AUTHORS BUGS TODO FORGETMENOT RELEASE mach.doap
 %dir %{_sysconfdir}/mach
 %config %{_sysconfdir}/mach/conf
 %config(noreplace) %{_sysconfdir}/mach/location
@@ -97,8 +97,12 @@
 %attr(04750,root,mach) %{_sbindir}/mach-helper
 
 %changelog
+* Sun Apr 09 2006 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.4.9-1
+- new release
+
 * Fri Nov 25 2005 Thomas Vander Stichele <thomas at apestaart dot org>
-- 0.4.8
+- 0.4.8-1
 - new release
 
 * Mon Aug  9 2004 Ville Skytt?? <ville.skytta at iki.fi>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mach/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Nov 2005 19:11:37 -0000	1.3
+++ sources	9 Apr 2006 10:10:45 -0000	1.4
@@ -1 +1 @@
-3fc32634295ea1cb859d67b5df8e0e65  mach-0.4.8.tar.bz2
+5216b92764580bfa79a5852f9384533b  mach-0.4.9.tar.bz2



From fedora-extras-commits at redhat.com  Sun Apr  9 10:11:32 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Sun,  9 Apr 2006 03:11:32 -0700
Subject: rpms/mach/devel mach.spec,1.6,1.7 sources,1.3,1.4
Message-ID: <200604091011.k39ABYGh028300@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/mach/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28281

Modified Files:
	mach.spec sources 
Log Message:
new release


Index: mach.spec
===================================================================
RCS file: /cvs/extras/rpms/mach/devel/mach.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mach.spec	25 Nov 2005 19:11:37 -0000	1.6
+++ mach.spec	9 Apr 2006 10:11:32 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           mach
-Version:        0.4.8
+Version:        0.4.9
 Release:        1%{?dist}
 Summary:        make a chroot
 
@@ -82,7 +82,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING README AUTHORS BUGS TODO FORGETMENOT RELEASE
+%doc ChangeLog COPYING README AUTHORS BUGS TODO FORGETMENOT RELEASE mach.doap
 %dir %{_sysconfdir}/mach
 %config %{_sysconfdir}/mach/conf
 %config(noreplace) %{_sysconfdir}/mach/location
@@ -97,8 +97,12 @@
 %attr(04750,root,mach) %{_sbindir}/mach-helper
 
 %changelog
+* Sun Apr 09 2006 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.4.9-1
+- new release
+
 * Fri Nov 25 2005 Thomas Vander Stichele <thomas at apestaart dot org>
-- 0.4.8
+- 0.4.8-1
 - new release
 
 * Mon Aug  9 2004 Ville Skytt?? <ville.skytta at iki.fi>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mach/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	25 Nov 2005 19:11:37 -0000	1.3
+++ sources	9 Apr 2006 10:11:32 -0000	1.4
@@ -1 +1 @@
-3fc32634295ea1cb859d67b5df8e0e65  mach-0.4.8.tar.bz2
+5216b92764580bfa79a5852f9384533b  mach-0.4.9.tar.bz2



From fedora-extras-commits at redhat.com  Sun Apr  9 10:12:09 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Sun,  9 Apr 2006 03:12:09 -0700
Subject: rpms/mach/FC-4 mach.spec,1.8,1.9 sources,1.4,1.5
Message-ID: <200604091012.k39ACBHD028366@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/mach/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28347

Modified Files:
	mach.spec sources 
Log Message:
new release


Index: mach.spec
===================================================================
RCS file: /cvs/extras/rpms/mach/FC-4/mach.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mach.spec	25 Nov 2005 19:47:50 -0000	1.8
+++ mach.spec	9 Apr 2006 10:12:08 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           mach
-Version:        0.4.8
+Version:        0.4.9
 Release:        1%{?dist}
 Summary:        make a chroot
 
@@ -82,7 +82,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING README AUTHORS BUGS TODO FORGETMENOT RELEASE
+%doc ChangeLog COPYING README AUTHORS BUGS TODO FORGETMENOT RELEASE mach.doap
 %dir %{_sysconfdir}/mach
 %config %{_sysconfdir}/mach/conf
 %config(noreplace) %{_sysconfdir}/mach/location
@@ -97,8 +97,12 @@
 %attr(04750,root,mach) %{_sbindir}/mach-helper
 
 %changelog
+* Sun Apr 09 2006 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.4.9-1
+- new release
+
 * Fri Nov 25 2005 Thomas Vander Stichele <thomas at apestaart dot org>
-- 0.4.8
+- 0.4.8-1
 - new release
 
 * Mon Aug  9 2004 Ville Skytt?? <ville.skytta at iki.fi>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mach/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	25 Nov 2005 19:47:50 -0000	1.4
+++ sources	9 Apr 2006 10:12:08 -0000	1.5
@@ -1 +1 @@
-3fc32634295ea1cb859d67b5df8e0e65  mach-0.4.8.tar.bz2
+5216b92764580bfa79a5852f9384533b  mach-0.4.9.tar.bz2



From fedora-extras-commits at redhat.com  Sun Apr  9 10:12:37 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Sun,  9 Apr 2006 03:12:37 -0700
Subject: rpms/mach/FC-3 mach.spec,1.4,1.5 sources,1.2,1.3
Message-ID: <200604091012.k39ACdiE028427@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/mach/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28408

Modified Files:
	mach.spec sources 
Log Message:
new release


Index: mach.spec
===================================================================
RCS file: /cvs/extras/rpms/mach/FC-3/mach.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mach.spec	26 Nov 2004 13:22:50 -0000	1.4
+++ mach.spec	9 Apr 2006 10:12:37 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           mach
-Version:        0.4.5
-Release:        0.fdr.1.1
+Version:        0.4.9
+Release:        1%{?dist}
 Summary:        make a chroot
 
 Group:          Applications/System
@@ -11,19 +11,23 @@
 
 Requires:	python
 Requires:	rpm
+Requires:	rpm-build
 Requires:	rpm-python
-Requires:	apt
+Requires:	yum
+Requires:	createrepo
 Requires:	sed
 Requires:	cpio
 
 BuildRequires:	python
+BuildRequires:	gcc-c++
+BuildRequires:	libselinux-devel
 
 %{!?builduser:  %define builduser  machbuild}
 %{!?buildgroup: %define buildgroup machbuild}
 
 %description
 mach makes a chroot.
-Using apt-get and a suid binary, it manages to install clean chroot
+Using yum or apt-get and a suid binary, it manages to install clean chroot
 environments based on the original packages for that distribution.
 
 The clean root can be used to run jail roots, to create image files, or
@@ -34,19 +38,13 @@
 Thomas Vander Stichele (thomas (at) apestaart (dot) org)
 
 %prep
-echo "
---------------------------------------------------------------
-Update needed. The changes in mach-0.4.6-0.fdr.1.2.src.rpm
-would be insufficient for FC3.
---------------------------------------------------------------" > /dev/null
-exit 1
 %setup -q
 
 %build
 %configure \
 	--enable-builduser=%{builduser} \
 	--enable-buildgroup=%{buildgroup} \
-	--with-flavor=fedora-stable
+	--with-flavor=extras
 make
 
 %install
@@ -59,13 +57,13 @@
 install -d -m 775 $RPM_BUILD_ROOT%{_localstatedir}/cache/mach/packages
 install -d -m 775 $RPM_BUILD_ROOT%{_localstatedir}/cache/mach/archives
 
+find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \;
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-# create user and group mach
-/usr/sbin/useradd -c "mach user" \
-	-r -m mach -d %{_localstatedir}/lib/mach > /dev/null 2>&1 || :
+groupadd -r mach >/dev/null 2>&1 || :
 
 %preun
 if [ "$1" == 0 ];
@@ -73,7 +71,7 @@
   # last removal
   # be a good boy and clean out the dirs we filled with junk
   rm -rf %{_localstatedir}/lib/mach/states/*
-  umount %{_localstatedir}/lib/mach/roots/*/proc > /dev/null 2>%1 || :
+  umount %{_localstatedir}/lib/mach/roots/*/proc > /dev/null 2>&1 || :
   rm -rf %{_localstatedir}/lib/mach/roots/*
   rm -rf %{_localstatedir}/cache/mach/* > /dev/null 2>&1 || :
   rmdir %{_localstatedir}/lib/mach/states > /dev/null 2>&1 || :
@@ -82,31 +80,44 @@
   rm -rf %{_localstatedir}/tmp/mach > /dev/null 2>&1 || :
 fi
 
-%postun
-if [ "$1" == 0 ];
-then
-  # last removal
-  userdel mach > /dev/null 2>&1 || : 
-  groupdel mach > /dev/null 2>&1 || :
-fi
-
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING README AUTHORS BUGS TODO FORGETMENOT RELEASE
+%doc ChangeLog COPYING README AUTHORS BUGS TODO FORGETMENOT RELEASE mach.doap
 %dir %{_sysconfdir}/mach
 %config %{_sysconfdir}/mach/conf
-%config %{_sysconfdir}/mach/location
+%config(noreplace) %{_sysconfdir}/mach/location
 %config %{_sysconfdir}/mach/dist.d
-%attr(2775,mach,mach) %dir %{_localstatedir}/lib/mach
-%attr(2775,mach,mach) %dir %{_localstatedir}/lib/mach/states
-%attr(2775,mach,mach) %dir %{_localstatedir}/lib/mach/roots
-%ghost %attr(2775,mach,mach) %dir %{_localstatedir}/tmp/mach
-%attr(2775,mach,mach) %dir %{_localstatedir}/cache/mach/packages
-%attr(2775,mach,mach) %dir %{_localstatedir}/cache/mach/archives
+%attr(2775,root,mach) %dir %{_localstatedir}/lib/mach
+%attr(2775,root,mach) %dir %{_localstatedir}/lib/mach/states
+%attr(2775,root,mach) %dir %{_localstatedir}/lib/mach/roots
+%ghost %attr(2775,root,mach) %dir %{_localstatedir}/tmp/mach
+%attr(2775,root,mach) %{_localstatedir}/cache/mach
 %{_bindir}/mach
+%{_libdir}/libselinux-mach.*
 %attr(04750,root,mach) %{_sbindir}/mach-helper
 
 %changelog
+* Sun Apr 09 2006 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.4.9-1
+- new release
+
+* Fri Nov 25 2005 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.4.8-1
+- new release
+
+* Mon Aug  9 2004 Ville Skytt?? <ville.skytta at iki.fi>
+- Create only the "mach" group, and do not remove it on erase.  The
+  "mach" user is not really needed for anything.
+
+* Sun Jun  6 2004 Ville Skytt?? <ville.skytta at iki.fi>
+- Properly redirect STDERR from umount to /dev/null at erase time.
+
+* Wed Apr 14 2004 Ville Skytt?? <ville.skytta at iki.fi>
+- Own %%{_localstatedir}/mach, thanks to John Dalbec for the catch.
+
+* Thu Apr  8 2004 Ville Skytt?? <ville.skytta at iki.fi>
+- Require apt >= 0.5.5cnc2 due to internal use of the "rpm-dir" index type.
+
 * Tue Mar 16 2004 Thomas Vander Stichele <thomas at apestaart dot org>
 - package dist.d and location
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mach/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:50:34 -0000	1.2
+++ sources	9 Apr 2006 10:12:37 -0000	1.3
@@ -1 +1 @@
-5faad3c80423ee11ede5924c32331176  mach-0.4.5.tar.bz2
+5216b92764580bfa79a5852f9384533b  mach-0.4.9.tar.bz2



From fedora-extras-commits at redhat.com  Sun Apr  9 11:28:19 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Sun,  9 Apr 2006 04:28:19 -0700
Subject: owners owners.list,1.815,1.816
Message-ID: <200604091128.k39BSLvB030917@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30900

Modified Files:
	owners.list 
Log Message:
Take ownership of:
* perl-Convert-BinHex
* perl-IO-stringy
* perl-MailTools
* perl-MIME-tools



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.815
retrieving revision 1.816
diff -u -r1.815 -r1.816
--- owners.list	9 Apr 2006 08:55:22 -0000	1.815
+++ owners.list	9 Apr 2006 11:28:19 -0000	1.816
@@ -884,7 +884,7 @@
 Fedora Extras|perl-Config-Record|Perl module for Configuration file access|dgregor at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Config-Tiny|Perl module for reading and writing .ini style configuration files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Convert-ASCII-Armour|Convert::ASCII::Armour Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Convert-BinHex|Macintosh BinHex extractor library for Perl|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Convert-BinHex|Macintosh BinHex extractor library for Perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Convert-PEM|Convert::PEM Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Convert-TNEF|Perl module to read TNEF files|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Convert-UUlib|A perl interface to the uulib library|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -969,7 +969,7 @@
 Fedora Extras|perl-IO-Multiplex|Manage IO on many file handles|lmb at biosci.ki.se|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-Socket-SSL|Perl library for transparent SSL|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-String|Emulate file interface for in-core strings|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-IO-stringy|I/O on in-core objects like strings and arrays|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-IO-stringy|I/O on in-core objects like strings and arrays|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-Tty|Perl interface to pseudo tty's|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-Zlib|For bugs related to the perl-IO-Zlib component|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IPC-Run|Perl module for interacting with child processes|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1003,10 +1003,10 @@
 Fedora Extras|perl-Mail-Sender|Module for sending mails with attachments through an SMTP server|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Mail-Sendmail|Simple platform independent mailer for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Mail-SPF-Query|Mail::SPF::Query determines the legitimacy of an SMTP client IP|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-MailTools|MailTools module for Perl|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-MailTools|MailTools module for Perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Math-GMP|High speed arbitrary size integer math|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MIME-Lite|MIME-Lite - low-calorie MIME generator|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-MIME-tools|Modules for parsing and creating MIME entities in Perl|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-MIME-tools|Modules for parsing and creating MIME entities in Perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MIME-Types|MIME types module for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MLDBM|Store multi-level hash structure in single level tied hash|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Build|Perl module for building and installing Perl modules|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Sun Apr  9 11:52:48 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun,  9 Apr 2006 04:52:48 -0700
Subject: owners owners.list,1.816,1.817
Message-ID: <200604091152.k39BqoYA030973@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30956

Modified Files:
	owners.list 
Log Message:
add gnochm


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.816
retrieving revision 1.817
diff -u -r1.816 -r1.817
--- owners.list	9 Apr 2006 11:28:19 -0000	1.816
+++ owners.list	9 Apr 2006 11:52:48 -0000	1.817
@@ -347,6 +347,7 @@
 Fedora Extras|gmime|GMime library -- creation and parsing of MIME-messages|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|gmpc|GNOME frontend for the MPD|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|gnet2|A simple network library built upon glib|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
+Fedora Extras|gnochm|CHM file viewer|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|gnofract4d|Gnofract 4D is a Gnome-based program to draw fractals|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnokii|Mobile phone management program|triad at df.lth.se|extras-qa at fedoraproject.org|
 Fedora Extras|gnomad2|Manager for digital audio players|triad at df.lth.se|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Apr  9 15:23:32 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun,  9 Apr 2006 08:23:32 -0700
Subject: rpms/apt/devel .cvsignore, 1.7, 1.8 apt.spec, 1.22, 1.23 sources,
	1.7, 1.8
Message-ID: <200604091523.k39FNYIF007022@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/apt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7001

Modified Files:
	.cvsignore apt.spec sources 
Log Message:
* Sun Apr  9 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.15lorg3-0.3.rc1
- 0.5.15lorg3-rc1.
- Trim pre-2005 changelog entries.

* Sun Apr 09 2006 Panu Matilainen <pmatilai at laiskianen.org>
- use /var/lib/apt instead of obsolete /var/state/apt
- support FC4 as well



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	7 Apr 2006 17:39:27 -0000	1.7
+++ .cvsignore	9 Apr 2006 15:23:31 -0000	1.8
@@ -1 +1 @@
-apt-0.5.15lorg3-pre4.tar.bz2
+apt-0.5.15lorg3-rc1.tar.bz2


Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- apt.spec	7 Apr 2006 17:39:27 -0000	1.22
+++ apt.spec	9 Apr 2006 15:23:32 -0000	1.23
@@ -6,12 +6,12 @@
 Summary:        Debian's Advanced Packaging Tool with RPM support
 Name:           apt
 Version:        0.5.15lorg3
-Release:        0.2.pre4%{?dist}
+Release:        0.3.rc1%{?dist}
 Group:          System Environment/Base
 URL:            http://laiskiainen.org/
 License:        GPL
 
-Source0:        http://laiskiainen.org/apt/testing/%{name}-%{version}-pre4.tar.bz2
+Source0:        http://laiskiainen.org/apt/testing/%{name}-%{version}-rc1.tar.bz2
 
 # user editable template configs
 Source1:        apt.conf
@@ -70,7 +70,7 @@
 Requires:       bzip2
 # wget needed by the mirror-selector script
 Requires:       wget
-Requires:       fedora-release >= 5
+Requires:       fedora-release >= 4
 Requires(post): chkconfig
 Requires(post): ldconfig
 Requires(preun): chkconfig
@@ -126,7 +126,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-pre4
+%setup -q -n %{name}-%{version}-rc1
 
 # fix docs to reference correct paths
 perl -pi -e \
@@ -165,7 +165,7 @@
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/apt/archives/partial
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/apt/genpkglist
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/cache/apt/gensrclist
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/state/apt/lists/partial
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/apt/lists/partial
 
 # The config files
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/apt
@@ -284,7 +284,7 @@
 %{_datadir}/apt/scripts/preserve-conf.lua
 %{_datadir}/apt/scripts/upgradevirt.lua
 %{_localstatedir}/cache/apt/
-%{_localstatedir}/state/apt/
+%{_localstatedir}/lib/apt/
 %{_mandir}/man[58]/*.[58]*
 
 %files devel
@@ -311,6 +311,14 @@
 
 
 %changelog
+* Sun Apr  9 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.15lorg3-0.3.rc1
+- 0.5.15lorg3-rc1.
+- Trim pre-2005 changelog entries.
+
+* Sun Apr 09 2006 Panu Matilainen <pmatilai at laiskianen.org>
+- use /var/lib/apt instead of obsolete /var/state/apt
+- support FC4 as well
+
 * Fri Apr  7 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.15lorg3-0.2.pre4
 - 0.5.15lorg3-pre4.
 
@@ -388,474 +396,3 @@
 - "Revert" rpmpriorities and libselinux build-dep stuff to Panu's version.
 - Add experimental auto-generation of rpmpriorities, but don't use it yet.
 - Fix up mirror-select.conf creation.
-
-* Wed Nov 10 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 0.5.15cnc6-11
-- TODO: Somebody with access to www.fedora.us would need to update
-  Source151 (mirror-select.conf) and update it for FC3.
-- Only make this build for FC3 (fix installation of rpmpriorities file
-  and fixed the inaccurate conditional BR libselinux-devel which could
-  be made unconditional).
-
-* Tue Nov 09 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.19.r362
-- add rpmpriorities for fc3
-
-* Tue Sep 14 2004 Panu Matilainen <pmatilai at welho.com>
-- don't check rpm's sublevel for selinux-devel requirement
-
-* Wed Aug 18 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.18.r362
-- revision r362
-- add rpmpriorities file for rawhide
-
-* Sat Aug 14 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.18.r361
-- update to revision r361
-- automated updates from cron are now configurable through /etc/sysconfig/apt
-- provide apt-mirrorselect so repo-configs can depend on it
-- preliminary fixes for x86_64:
-  - put scripts to /usr/share/apt/scripts instead of /usr/lib
-  - build python bindings with -fPIC
-
-* Thu Aug 12 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.17.r360
-- update to revision r360
-- revert back to print() in upgradevirt kernel-module-warning (see #1524/c18)
-
-* Wed Aug 11 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.17.r358
-- update to revision r358
-
-* Tue Jul 13 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.17.r355
-- update to revision r355 for native SELinux support
-
-* Fri Jul 9 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.16.r354
-- fix a typo in apt.cron
-
-* Fri Jul 9 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.15.r354
-- don't run kernel-module magic if no kernel was installed in (dist-)upgrade
-- improve description a bit
-- update to svn r354 (improved virtual package handling in apt-cache)
-
-* Mon Jul 5 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.14.r353
-- add optional script to automatically update from cron
-- use updated gpg checker (with progress reporting) from contrib
-- add new subpackage for groupinstall (to avoid dependening on comps and rhpl
-  for core apt)
-- update to revision 353 from upstream for various bugfixes and enhancements,
-  drop merged patches
-- remove NOISY=1 from make, hasn't done anything in ages..
-
-* Thu Jun 17 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.13
-- fix grubby handling wrt non-UP kernels
-- never change default kernel if the current default is non-linux system
-- include upstream patch to allow setting custom md5cache path for genbasedir
-
-* Tue Jun 15 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.12
-- don't fiddle with grubby unless a new kernel was actually installed
-- include kernel-sourcecode in allow-duplicated
-- include rpmpriorities for fc2 final
-
-* Fri May 14 2004 Panu Matilainen <pmatilai at welho.com>
-- use rpm's ordering algorithm, not apt's internal
-
-* Mon May 10 2004 Panu Matilainen <pmatilai at welho.com>
-- remove ash from rpmpriorities (#1562)
-- updated version of upgradevirt.lua (#1514)
-
-* Tue May 04 2004 Panu Matilainen <pmatilai at welho.com>
-- set APT::Cache::AllNames to false to make "apt-cache pkgnames" less scary
-
-* Thu Apr 29 2004 Panu Matilainen <pmatilai at welho.com>
-- check for rpm 4.3.1
-
-* Fri Apr 09 2004 Panu Matilainen <pmatilai at welho.com>
-- remove kernel from rpmpriorities, allow-duplicated packages don't work
-  nicely with any higher than standard priority which is the default anyway
-
-* Fri Apr 09 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.11
-- revert the ctrl-c workaroound, the "cure" is worse than the disease
-
-* Thu Apr 08 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.10
-- take readonly rpmdb lock initially, not exclusive
-
-* Thu Apr 08 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.9
-- patch from upstream to plug segfault if ctrl-c'ing while downloading
-- apt isn't multilib-safe, exclude arch x86_64 (bug #1464)
-
-* Tue Apr 06 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.8
-- fix build-dep issue reported in #1429
-
-* Mon Apr 05 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.7
-- don't run gpg-import at all as a normal user
-
-* Mon Apr 05 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.6
-- don't fail in gpg-checker if directory / files don't exist
-- don't spit out spurious error messages if importing fails (#1398)
-- allow turning off the gpg-import via true/false configuration item
-- explicitly list GPG-Check and GPG-Import config options in default.conf
-- generate mirror-select.conf based on FC release automatically
-- buildrequires fedora-release for version detection
-- rename Upgrade-Kernel -> Upgrade-Virtual in sample apt.conf
-
-* Sat Apr 03 2004 Warren Togami <wtogami at redhat.com> 0.5.15cnc6-0.fdr.5
-- Ville's docbook building fix
-
-* Tue Mar 30 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.4
-- add upgrade-virtual=true back to default.conf
-- updated version of upgradevirt.lua, fixed kernel-module package handling
-
-* Mon Mar 29 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.3
-- remember to include upgradevirt.lua..
-
-* Mon Mar 29 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.2
-- allow-duplicated lua script was getting incorrectly copied to scripts/
-- fix some permissions of source files to make rpmlint happy
-- don't copy source53 twice
-- in gpg-import check that the file is called gpg-pubkey* and ignore others
-
-* Sun Mar 28 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.1
-- move back to upgradevirt.lua, allow-duplicated from contrib doesn't like
-  RH kernel packages
-- remember to set kernel::module-prefix in default.conf
-- add upgradevirt.lua to all the necessary new slot
-- move kernel from Essential priority to Important in rpmpriorities, allow-
-  duplicated packages don't behave well with Essential priority
-
-* Mon Mar 22 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.1
-- update to 0.5.15cnc6
-- fix the source url
-
-* Sat Mar 20 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc6-0.fdr.0.r309.1
-- update to revision r309 snapshot
-- remove patches merged upstream
-- drop upgradevirt.lua, use allow-duplicated from contrib instead
-- updated gpg-checker scripts (fix #1398)
-- updated mirror-select scripts
-
-* Sun Feb 29 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.10
-- re-add promoteepoch patch, it got accidentally left out of the upstream-patch
-
-* Wed Feb 25 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.9
-- Change the comments mirror-select writes as requested in #1180
-
-* Fri Feb 13 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.8
-- Pull patch for revs 266-274 from upstream, containing various important
-  fixes (epoch handling, build system related etc)
-
-* Thu Feb 09 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.7
-- Fix build on FC2-test1 (conditional libselinux-devel buildreq)
-
-* Mon Feb 09 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.6
-- automatically handle fedora.us style kernel-module packages with kernel
-  updates
-- don't run mirror-selector if quiet mode set (== non-interactive)
-- don't trash sources.list on upgrade, only if user chooses to do so
-
-* Wed Feb 04 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.5
-- don't break sources.list on upgrade from %%post
-
-* Wed Jan 28 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.4
-- updated mirror-selector:
-  * write to /etc/apt/sources.list.d/mirror-select.list, not main sources.list
-  * some cosmetic improvements
-- move main sources.list out of the way on first upgrade to force user to
-  choose a mirror
-
-* Tue Jan 27 2004 Panu Matilainen <pmatilai at welho.com>
-- Always initialize rpm transaction rootdir (hope to fix #1238)
-
-* Mon Jan 19 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.3
-- make rpm manifest usage configurable per Enricos request (patch 4)
-- use mirror lists on fedora.us
-- include Fedora Legacy gpg key
-
-* Tue Jan 06 2004 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.2
-- make newly installed kernel default by default
-- clean up old cruft (sources.list editing etc)
-- stricter python dependency for apt-python
-- set all files in contrib non-executable, not just *.py
-- fix couple of buglets in mirror-select.lua
-
-* Sat Dec 27 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc5-0.fdr.1
-- don't fail from mirror-select if /proc isn't mounted
-
-* Sat Dec 27 2003 Panu Matilainen <pmatilai at welho.com>
-- don't create unneeded duplicate provides for virtualized packages (patch 3)
-
-* Fri Dec 26 2003 Panu Matilainen <pmatilai at welho.com>
-- add missing dependency on wget for mirror-selector
-
-* Wed Dec 24 2003 Panu Matilainen <pmatilai at welho.com>
-- update to 0.5.15cnc5
-- drop patches merged upstream
-
-* Tue Dec 23 2003 Panu Matilainen <pmatilai at welho.com>
-- remove extraneous mirror-select configs from default.conf
-- updated mirror-select script
-
-* Fri Dec 12 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc4-0.fdr.4
-- replace kernel-upgrade.lua with a more generic script which automatically
-  upgrades all virtualized (usually allow-duplicated) packages
-
-* Wed Dec 10 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc4-0.fdr.3
-- add missing gettext build dependency
-
-* Mon Dec 08 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc4-0.fdr.2
-- updated mirror-selector:
-  * download mirrorlist off the net
-  * support several mirror lists
-  * separate steps for choosing repositories and mirrors
-- revert gensrclist change breaking older apts
-
-* Wed Dec 03 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc4-0.fdr.1
-- update to 0.5.15cnc4
-- drop obsolete "oldpkg" patch
-- drop patches merged upstream
-- remove default-release setting, causes unnecessary confusion among users
-- remove reduntant stuff from fedora.conf, rename to default.conf
-- no default repositories included
-- add old RHL GPG key back, a few FC packages appear to be signed by it still
-
-* Tue Dec 02 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc3-0.fdr.5
-- fix default config wrt Lua scripts (various slot-names changed in cnc3)
-- better handling of default config in lua-scripts
-- turn kernel upgrading on by default in fedora.conf
-
-* Mon Dec 01 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc3-0.fdr.4
-- don't drag in dependency on external lua
-
-* Mon Dec 01 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc3-0.fdr.3
-- much improved mirror-selector script
-- add various important upstream fixes (patches 6-8)
-- add kernel*unsupported-modules to fedora.conf for 2.6 kernels
-
-* Tue Nov 25 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc3-0.fdr.2
-- trim rpmpriorities a bit
-- add a "first-time druid" script to prompt user for nearest mirror
-- no default fedora sources.list entry at all
-- use sluglug.ucsc.edu mirror for macromedia instead of mplug.org
-
-* Mon Nov 24 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc3-0.fdr.1
-- update to official 0.5.15cnc3
-- move old apt.conf out of the way on upgrade to new-style config
-- saner error messages in gpg-checker.lua
-
-* Mon Nov 24 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc2-0.fdr.2.r224.1
-- oops, some local cruft got included in previous version
-
-* Mon Nov 24 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc2-0.fdr.2.r224
-- update to revision 224
-
-* Sat Nov 22 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc2-0.fdr.2.r213
-- update to revision 213
-
-* Fri Nov 21 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc2-0.fdr.2.r210
-- snapshot of revision 210 from svn repo
-- default to internal package manager (== rpmlib)
-- remove old rpmlib-patch related logic from spec
-- move default configs to sources.list.d, apt.conf.d and vendors.list.d,
-  leaving the apt.conf and sources.list for user localizations
-
-* Wed Nov 12 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc2-0.fdr.1
-- update rpmlib patch to -7 which has more sensible error reporting
-
-* Wed Nov 12 2003 Panu Matilainen <pmatilai at welho.com>
-- update to 0.5.15cnc2
-- remove patches 6-9, they're merged upstream now
-- use fedora-style buildroot
-- drop the ugly apt.conf tweaking from post, wont fix everything anyway
-  if upgrading from old RHL's.
-- add URL to spec (wake up QA, been missing all this time and nobody noticed :)
-- remove rpm version checking, not needed anymore
-
-* Tue Nov 11 2003 Panu Matilainen <pmatilai at welho.com>
-- drop the build-dep patches altogether, they're .. umm, borked
-
-* Tue Nov 11 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc1-0.fdr.3
-- stricter python dependency on -python
-- remove out-of-date mirror list from sources.list, add pointer to
-  official mirror list URL
-- drop all rawhide and test keys - we don't want those automatically imported
-
-* Mon Nov 10 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc1-0.fdr.2
-- add patch 11 from Gustavo to fix package pinning
-
-* Sat Nov 08 2003 Panu Matilainen <pmatilai at welho.com> 0.5.15cnc1-0.fdr.1
-- update to 0.5.15cnc1
-- back to 0.fdr.x releases...
-- redhat -> fedora fixes in rpmpriorities.1
-
-* Fri Nov 07 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc7-1
-- update to cnc7
-- drop patches 9 + 10 for now (re-evaluation needed)
-- Fedora-keys added, old RH keys removed
-
-* Sun Nov 02 2003 Panu Matilainen <pmatilai at welho.com>
-- update rpmlib patch to allow compiling against rpm-4.2.1
-- scrap old RHL version checking + deps
-- buildroot -> RPM_BUILD_ROOT
-- fix source lists for new repository layout
-
-* Thu Oct 23 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc6-0.fdr.11
-- add rpmpriorities for 0.95, drop 0.93
-
-* Thu Oct 16 2003 Panu Matilainen <pmatilai at welho.com>
-- update rpmlib patch to rev -5 (which actually works again :)
-
-* Wed Oct 01 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc6-0.fdr.10
-- include rpmpriorities for 0.94
-- more fixes for #667 (handle builddeps on versioned provides)
-
-* Tue Sep 30 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc6-0.fdr.9
-- add patch 10 to support build dependencies on files (#682)
-- add new rawhide gpg key (#696)
-- add distrel mangling for Fedora Core
-
-* Wed Sep 03 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc6-0.fdr.8
-- add patch 9 to support build dependencies on virtual packages (#667)
-- config(noreplace) for /etc/apt/rpmpriorities (#629)
-- better reporting of signature problems in gpg-checker.lua
-
-* Fri Aug 29 2003 Panu Matilainen <pmatilai at welho.com>
-- add contrib stuff as docs
-- add bzip2 dependency (#629)
-
-* Tue Aug 19 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc6-0.fdr.7
-- use apterror() instead of exit in gpg-checker.lua to allow smoother
-  operation with synaptic
-- support pkg=ver syntax for virtual packages (patch 8)
-- strict version-release dependency in apt-python
-- when built with --with rpmlib add .rpmlib to release string
-
-* Tue Aug 19 2003 Panu Matilainen <pmatilai at welho.com>
-- fix #558, #611
-
-* Mon Jul 21 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc6-0.fdr.6
-- fix build on RH 9.0.93
-- detect rpm-related buildreqs from rpm version, not distro version
-- some spec rearrangements
-- comment the patches
-
-* Sat Jul 19 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc6-0.fdr.5
-- use -p option with install
-- add beecrypt-devel buildreq for rpm-4.2.1
-
-* Mon Jul 14 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc6-0.fdr.4
-- fix typos in gpg-checker script
-
-* Mon Jul 07 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc6-0.fdr.3
-- fix apt.conf for gpg checking with lua in post
-
-* Fri Jun 13 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc6-0.fdr.2
-- add patch to allow build against rpm-4.2.1
-- add --with rpmlib build option
-
-* Thu Jun 12 2003 Panu Matilainen <pmatilai at welho.com>
-- EXPERIMENTAL patch to make apt use only rpmlib
-
-* Tue Jun 10 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc6-0.fdr.1
-- update to 0.5.5cnc6
-- drop patches merged upstream
-
-* Tue Jun 10 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc5-0.fdr.9
-- patch from upstream to fix a security problem where lua-scripts can get
-  accidentally executed from cwd
-
-* Mon Jun 09 2003 Panu Matilainen <pmatilai at welho.com>
-- apt doesn't like build deps on versioned virtual provides -> only RH7.3
-  package buildrequires python2-devel, newer ones have python-devel
-
-* Thu Jun 05 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc5-0.fdr.8
-- fix the proxy template format in apt.conf
-- fix hang when reading package lists on duplicate packages
-
-* Thu May 22 2003 Panu Matilainen <pmatilai at welho.com>
-- automatically handle installing older allowdup pkgs with new rpms
-
-* Mon May 19 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc5-0.fdr.7
-- fix thinkos/typos in gpg-checker + config
-
-* Mon May 19 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc5-0.fdr.6
-- import some of the changes in #149:
-  - detect distrel, rhrel automatically
-  - rename GPG keys to their rpmdb names for easier checking
-  - use install instead of cp
-- use Lua GPG-sigchecker, split importing them to another script
-- include kernel-upgrade and preserve-conf Lua-scripts
-- move lua scripts from /etc/apt to /usr/lib/apt (upstream change in svn tree)
-- list explicitly binaries so we know if something fails
-- fix #259
-- add missing ncurses-devel buildreq (for apt-shell)
-
-* Sat May 03 2003 Panu Matilainen <pmatilai at welho.com>
-- add missing libelf-devel buildreq for RH8.0 (#254)
-- add missing readline-devel buildreq (for apt-shell)
-
-* Thu Apr 24 2003 Panu Matilainen <pmatilai at welho.com>
-- add /etc/apt/scripts directory (for Lua scripts)
-
-* Tue Apr 22 2003 Warren Togami <warren at togami.com> 0.5.5cnc5-0.fdr.5
-- Bug #172 comment #18 apt.conf proxy syntax
-
-* Tue Apr 22 2003 Warren Togami <warren at togami.com> 0.5.5cnc5-0.fdr.4
-- elfutils-devel exists only in RH9
-
-* Tue Apr 22 2003 Warren Togami <warren at togami.com> 0.5.5cnc5-0.fdr.3
-- Patch epoch comparison behavior, rpmvercmp.warren.patch
-  http://www.fedora.us/pipermail/fedora-devel/2003-April/001043.html
-
-* Thu Apr 17 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc5-0.fdr.2
-- add missing buildreq elfutils-devel
-- rpmpriorities for non %{distrel} wasn't getting included in src.rpm
-
-* Wed Apr 16 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc5-0.fdr.1
-- patch to speed up apt startup and genbasedir
-- drop "counting sheep" patch, not needed anymore
-- include current mirrors in sources.list
-- autodetect RH version
-
-* Tue Apr 15 2003 Panu Matilainen <pmatilai at welho.com>
-- update to official 0.5.5cnc5
-- use g++ not gcc to build python bindings
-- more selected merging from #149
-- include Fedora GPG fingerprint in vendors.list "just in case"
-
-* Mon Apr 14 2003 Panu Matilainen <pmatilai at welho.com>
-- update to newer snapshot (new make system, lua interface ...)
-- rearrange spec accordingly, use %find_lang etc
-- drop unneeded patches (filedeps..)
-- only look at .list files in sources.list.d
-- merge selected patches by Rex Dieter / #149
-- include French mirror in sources.list (commented out)
-
-* Mon Apr 07 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc4.1-0.fdr.7
-- optional patch to ignore signals while rpmdb lock is held to avoid stale locks
-- add epoch to requires =, >= too
-
-* Thu Apr 03 2003 Panu Matilainen <pmatilai at welho.com>
-- fix segfault if rpm-dir index is a broken symlink
-- rpmpriorities generated from comps.xml
-- dont tag the various keys as %dir :-/
-
-* Mon Mar 31 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc4.1-0.fdr.5
-- add Ville's suggested fixes from #12 (doc paths, stricter regexps in apt.conf)
-
-* Mon Mar 31 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc4.1-0.fdr.4
-- use 7.x instead of 7.3 in macromedia repository
-- add Epoch 0
-- add patch from svn for massive file dependency breakage on certain situations
-- add patch4 to tell something is happening when apt is counting packages
-  on startup
-
-* Fri Mar 27 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc4.1-0.fdr.3
-- dont bother building translations since we're not installing them anyway
-  which fixes build on RH7.x (7.3 at least)
-
-* Thu Mar 27 2003 Panu Matilainen <pmatilai at welho.com> 0.5.5cnc4.1.0.fdr.2
-- add macromedia.list
-- import GPG keys on first run, not from %post
-- require gnupg (needed with authenticated repositories)
-
-* Tue Mar 25 2003 Panu Matilainen <pmatilai at welho.com>
-- import GPG keys from %post
-- drop the -kernel$ entries from apt.conf
-- add Default-Release = stable to apt.conf
-
-* Sat Mar 23 2003 Panu Matilainen <pmatilai at welho.com>
-- Initial Fedora packaging (reset changelog)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	7 Apr 2006 17:39:27 -0000	1.7
+++ sources	9 Apr 2006 15:23:32 -0000	1.8
@@ -1 +1 @@
-8c46b74a7e844c7e40017bdad59cee6c  apt-0.5.15lorg3-pre4.tar.bz2
+d0f4b875b7d65c5a8b6563cf854a6247  apt-0.5.15lorg3-rc1.tar.bz2



From fedora-extras-commits at redhat.com  Sun Apr  9 15:30:30 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun,  9 Apr 2006 08:30:30 -0700
Subject: rpms/awstats/FC-5 awstats.spec,1.10,1.11
Message-ID: <200604091530.k39FUWpc007109@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/awstats/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7078/FC-5

Modified Files:
	awstats.spec 
Log Message:
selinux support


Index: awstats.spec
===================================================================
RCS file: /cvs/extras/rpms/awstats/FC-5/awstats.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- awstats.spec	23 Feb 2006 10:17:11 -0000	1.10
+++ awstats.spec	9 Apr 2006 15:30:30 -0000	1.11
@@ -1,6 +1,6 @@
 Name:       awstats
 Version:    6.5
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    Advanced Web Statistics
 License:    GPL
 Group:      Applications/Internet
@@ -13,6 +13,7 @@
 Requires:   perl
 Requires(post): perl
 Requires(postun): /sbin/service
+Requires(pre):  policycoreutils
 
 %description
 Advanced Web Statistics is a powerful and featureful tool that generates
@@ -112,6 +113,14 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
+%pre
+# Set SELinux types
+semanage fcontext -a -t httpd_sys_script_exec_t \
+    '/usr/share/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || :
+semanage fcontext -a -t httpd_sys_script_rw_t '/var/lib/awstats(/.*)?' 2>/dev/null || :
+
+
 %post
 if [ $1 -eq 1 ]; then
   if [ ! -f %{_sysconfdir}/%{name}/%{name}.`hostname`.conf ]; then
@@ -122,10 +131,15 @@
   fi
 fi
 
+
 %postun
 if [ $1 -ne 0 ]; then
   /sbin/service httpd condrestart >/dev/null 2>&1
 fi
+if [ $1 -eq 0 ]; then
+  semanage fcontext -d -t httpd_sys_script_exec_t \
+    '/usr/share/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || :
+fi
 
 
 %files
@@ -151,6 +165,9 @@
 %{_datadir}/%{name}/wwwroot/js
 
 %changelog
+* 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
+
 * Thu Feb 23 2006 Aurelien Bompard <gauret[AT]free.fr> 6.5-2
 - rebuild for FC5
 



From fedora-extras-commits at redhat.com  Sun Apr  9 15:30:31 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun,  9 Apr 2006 08:30:31 -0700
Subject: rpms/awstats/devel awstats.spec,1.10,1.11
Message-ID: <200604091530.k39FUX8E007113@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/awstats/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7078/devel

Modified Files:
	awstats.spec 
Log Message:
selinux support


Index: awstats.spec
===================================================================
RCS file: /cvs/extras/rpms/awstats/devel/awstats.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- awstats.spec	23 Feb 2006 10:17:11 -0000	1.10
+++ awstats.spec	9 Apr 2006 15:30:31 -0000	1.11
@@ -1,6 +1,6 @@
 Name:       awstats
 Version:    6.5
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    Advanced Web Statistics
 License:    GPL
 Group:      Applications/Internet
@@ -13,6 +13,7 @@
 Requires:   perl
 Requires(post): perl
 Requires(postun): /sbin/service
+Requires(pre):  policycoreutils
 
 %description
 Advanced Web Statistics is a powerful and featureful tool that generates
@@ -112,6 +113,14 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
+%pre
+# Set SELinux types
+semanage fcontext -a -t httpd_sys_script_exec_t \
+    '/usr/share/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || :
+semanage fcontext -a -t httpd_sys_script_rw_t '/var/lib/awstats(/.*)?' 2>/dev/null || :
+
+
 %post
 if [ $1 -eq 1 ]; then
   if [ ! -f %{_sysconfdir}/%{name}/%{name}.`hostname`.conf ]; then
@@ -122,10 +131,15 @@
   fi
 fi
 
+
 %postun
 if [ $1 -ne 0 ]; then
   /sbin/service httpd condrestart >/dev/null 2>&1
 fi
+if [ $1 -eq 0 ]; then
+  semanage fcontext -d -t httpd_sys_script_exec_t \
+    '/usr/share/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || :
+fi
 
 
 %files
@@ -151,6 +165,9 @@
 %{_datadir}/%{name}/wwwroot/js
 
 %changelog
+* 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
+
 * Thu Feb 23 2006 Aurelien Bompard <gauret[AT]free.fr> 6.5-2
 - rebuild for FC5
 



From fedora-extras-commits at redhat.com  Sun Apr  9 15:39:17 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun,  9 Apr 2006 08:39:17 -0700
Subject: rpms/pure-ftpd/FC-5 pure-ftpd-1.0.21-config.patch, 1.1,
	1.2 pure-ftpd.spec, 1.7, 1.8
Message-ID: <200604091539.k39FdJEE007179@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/pure-ftpd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7142/FC-5

Modified Files:
	pure-ftpd-1.0.21-config.patch pure-ftpd.spec 
Log Message:
fix mysql socket location (bug 188426)

pure-ftpd-1.0.21-config.patch:

Index: pure-ftpd-1.0.21-config.patch
===================================================================
RCS file: /cvs/extras/rpms/pure-ftpd/FC-5/pure-ftpd-1.0.21-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pure-ftpd-1.0.21-config.patch	21 Feb 2006 18:57:46 -0000	1.1
+++ pure-ftpd-1.0.21-config.patch	9 Apr 2006 15:39:17 -0000	1.2
@@ -1,5 +1,5 @@
 --- ./configuration-file/pure-ftpd.conf.in.config	2006-02-15 14:15:47.000000000 +0100
-+++ ./configuration-file/pure-ftpd.conf.in	2006-02-21 19:50:18.000000000 +0100
++++ ./configuration-file/pure-ftpd.conf.in	2006-04-09 17:31:03.000000000 +0200
 @@ -9,7 +9,7 @@
  # instead of command-line options, please run the
  # following command :
@@ -89,3 +89,14 @@
  
  
  
+--- ./pureftpd-mysql.conf.config	2006-04-09 17:33:04.000000000 +0200
++++ ./pureftpd-mysql.conf	2006-04-09 17:33:27.000000000 +0200
+@@ -19,7 +19,7 @@
+ 
+ # Optional : define the location of mysql.sock if the server runs on this host.
+ 
+-MYSQLSocket     /tmp/mysql.sock
++MYSQLSocket     /var/lib/mysql/mysql.sock
+ 
+ 
+ # Mandatory : user to bind the server as.


Index: pure-ftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/pure-ftpd/FC-5/pure-ftpd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pure-ftpd.spec	22 Feb 2006 10:35:42 -0000	1.7
+++ pure-ftpd.spec	9 Apr 2006 15:39:17 -0000	1.8
@@ -1,6 +1,6 @@
 Name:       pure-ftpd
 Version:    1.0.21
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    Lightweight, fast and secure FTP server
 
 Group:      System Environment/Daemons
@@ -178,6 +178,9 @@
 
 
 %changelog
+* Sun Apr 09 2006 Aurelien Bompard <gauret[AT]free.fr> 1.0.21-3
+- fix mysql socket location (bug 188426)
+
 * Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 1.0.21-2
 - build option rendezvous has been renamed to bonjour
 - add --with-cork



From fedora-extras-commits at redhat.com  Sun Apr  9 15:39:18 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sun,  9 Apr 2006 08:39:18 -0700
Subject: rpms/pure-ftpd/devel pure-ftpd-1.0.21-config.patch, 1.1,
	1.2 pure-ftpd.spec, 1.7, 1.8
Message-ID: <200604091539.k39FdKoB007187@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/pure-ftpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7142/devel

Modified Files:
	pure-ftpd-1.0.21-config.patch pure-ftpd.spec 
Log Message:
fix mysql socket location (bug 188426)

pure-ftpd-1.0.21-config.patch:

Index: pure-ftpd-1.0.21-config.patch
===================================================================
RCS file: /cvs/extras/rpms/pure-ftpd/devel/pure-ftpd-1.0.21-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pure-ftpd-1.0.21-config.patch	21 Feb 2006 18:57:46 -0000	1.1
+++ pure-ftpd-1.0.21-config.patch	9 Apr 2006 15:39:18 -0000	1.2
@@ -1,5 +1,5 @@
 --- ./configuration-file/pure-ftpd.conf.in.config	2006-02-15 14:15:47.000000000 +0100
-+++ ./configuration-file/pure-ftpd.conf.in	2006-02-21 19:50:18.000000000 +0100
++++ ./configuration-file/pure-ftpd.conf.in	2006-04-09 17:31:03.000000000 +0200
 @@ -9,7 +9,7 @@
  # instead of command-line options, please run the
  # following command :
@@ -89,3 +89,14 @@
  
  
  
+--- ./pureftpd-mysql.conf.config	2006-04-09 17:33:04.000000000 +0200
++++ ./pureftpd-mysql.conf	2006-04-09 17:33:27.000000000 +0200
+@@ -19,7 +19,7 @@
+ 
+ # Optional : define the location of mysql.sock if the server runs on this host.
+ 
+-MYSQLSocket     /tmp/mysql.sock
++MYSQLSocket     /var/lib/mysql/mysql.sock
+ 
+ 
+ # Mandatory : user to bind the server as.


Index: pure-ftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/pure-ftpd/devel/pure-ftpd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pure-ftpd.spec	22 Feb 2006 10:35:42 -0000	1.7
+++ pure-ftpd.spec	9 Apr 2006 15:39:18 -0000	1.8
@@ -1,6 +1,6 @@
 Name:       pure-ftpd
 Version:    1.0.21
-Release:    2%{?dist}
+Release:    3%{?dist}
 Summary:    Lightweight, fast and secure FTP server
 
 Group:      System Environment/Daemons
@@ -178,6 +178,9 @@
 
 
 %changelog
+* Sun Apr 09 2006 Aurelien Bompard <gauret[AT]free.fr> 1.0.21-3
+- fix mysql socket location (bug 188426)
+
 * Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 1.0.21-2
 - build option rendezvous has been renamed to bonjour
 - add --with-cork



From fedora-extras-commits at redhat.com  Sun Apr  9 17:15:20 2006
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Sun,  9 Apr 2006 10:15:20 -0700
Subject: rpms/ratpoison/devel ratpoison.spec,1.1,1.2
Message-ID: <200604091715.k39HFMLm011482@cvs-int.fedora.redhat.com>

Author: jwb

Update of /cvs/extras/rpms/ratpoison/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11465

Modified Files:
	ratpoison.spec 
Log Message:
Fix up BuildRequires for devel



Index: ratpoison.spec
===================================================================
RCS file: /cvs/extras/rpms/ratpoison/devel/ratpoison.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ratpoison.spec	9 Apr 2006 03:05:46 -0000	1.1
+++ ratpoison.spec	9 Apr 2006 17:15:20 -0000	1.2
@@ -13,7 +13,7 @@
 %if "%fedora" <= "4" 
 BuildRequires:  xorg-x11-devel, readline-devel
 %else
-BuildRequires: libX11-devel, readline-devel, libXtst-devel
+BuildRequires: libX11-devel, readline-devel, xorg-x11-proto-devel
 %endif
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info



From fedora-extras-commits at redhat.com  Sun Apr  9 17:55:29 2006
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Sun,  9 Apr 2006 10:55:29 -0700
Subject: rpms/ratpoison/devel ratpoison.spec,1.2,1.3
Message-ID: <200604091755.k39HtVql011706@cvs-int.fedora.redhat.com>

Author: jwb

Update of /cvs/extras/rpms/ratpoison/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11688

Modified Files:
	ratpoison.spec 
Log Message:
BuildRequires, take two.



Index: ratpoison.spec
===================================================================
RCS file: /cvs/extras/rpms/ratpoison/devel/ratpoison.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ratpoison.spec	9 Apr 2006 17:15:20 -0000	1.2
+++ ratpoison.spec	9 Apr 2006 17:55:29 -0000	1.3
@@ -10,10 +10,10 @@
 Source0:        http://savannah.nongnu.org/download/ratpoison/%{name}-%{version}.tar.gz
 Source1:	%{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if "%fedora" <= "4" 
+%if %{fedora} <= 4 
 BuildRequires:  xorg-x11-devel, readline-devel
 %else
-BuildRequires: libX11-devel, readline-devel, xorg-x11-proto-devel
+BuildRequires: libX11-devel, readline-devel, libXtst-devel
 %endif
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info



From fedora-extras-commits at redhat.com  Sun Apr  9 19:04:14 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Sun,  9 Apr 2006 12:04:14 -0700
Subject: rpms/emacs-auctex/FC-4 .cvsignore, 1.3, 1.4 emacs-auctex.spec, 1.4, 
	1.5 sources, 1.3, 1.4
Message-ID: <200604091904.k39J4kqY017562@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/emacs-auctex/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17507/FC-4

Modified Files:
	.cvsignore emacs-auctex.spec sources 
Log Message:
new upstream 11.82 and fix two duplicated files



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/emacs-auctex/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Oct 2005 01:53:37 -0000	1.3
+++ .cvsignore	9 Apr 2006 19:04:14 -0000	1.4
@@ -1 +1 @@
-auctex-11.81.tar.gz
+auctex-11.82.tar.gz


Index: emacs-auctex.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-auctex/FC-4/emacs-auctex.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- emacs-auctex.spec	1 Oct 2005 01:53:37 -0000	1.4
+++ emacs-auctex.spec	9 Apr 2006 19:04:14 -0000	1.5
@@ -3,7 +3,7 @@
 
 Summary: 	Enhanced TeX modes for Emacsen
 Name: 		emacs-auctex
-Version: 	11.81
+Version: 	11.82
 Release: 	1%{?dist}
 License: 	GPL
 Group: 		Applications/Editors
@@ -81,13 +81,16 @@
 %doc doc/tex-ref.pdf
 %doc %{_infodir}/*.info*
 %exclude %{_infodir}/dir
-%{_datadir}/emacs/site-lisp/site-start.d
-%{_datadir}/emacs/site-lisp/site-start.d/auctex.el
+%{startupdir}
+# %{_datadir}/emacs/site-lisp/site-start.d/auctex.el
 %{_datadir}/emacs/site-lisp/auctex
-%{startupfile}
+# %{startupfile}
 %{_datadir}/emacs/site-lisp/tex-site.el
 
 %changelog
+* Sun Apr  9 2006 Ed Hill <ed at eh3.com> - 11.82-1
+- update to 11.82
+
 * Fri Sep 30 2005 Ed Hill <ed at eh3.com> - 11.81-1
 - update to 11.81
 - disable preview for now since it needs some packaging work


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/emacs-auctex/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Oct 2005 01:53:37 -0000	1.3
+++ sources	9 Apr 2006 19:04:14 -0000	1.4
@@ -1 +1 @@
-ba1d7d3254a4d690c23ad914516710aa  auctex-11.81.tar.gz
+a18d6ac70b332f47386980f0c4df62e6  auctex-11.82.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr  9 19:04:16 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Sun,  9 Apr 2006 12:04:16 -0700
Subject: rpms/emacs-auctex/devel emacs-auctex.spec,1.5,1.6
Message-ID: <200604091904.k39J4mK8017566@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/emacs-auctex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17507/devel

Modified Files:
	emacs-auctex.spec 
Log Message:
new upstream 11.82 and fix two duplicated files



Index: emacs-auctex.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-auctex/devel/emacs-auctex.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- emacs-auctex.spec	1 Oct 2005 02:02:43 -0000	1.5
+++ emacs-auctex.spec	9 Apr 2006 19:04:16 -0000	1.6
@@ -3,8 +3,8 @@
 
 Summary: 	Enhanced TeX modes for Emacsen
 Name: 		emacs-auctex
-Version: 	11.81
-Release: 	2%{?dist}
+Version: 	11.82
+Release: 	1%{?dist}
 License: 	GPL
 Group: 		Applications/Editors
 URL: 		http://www.gnu.org/software/auctex/
@@ -81,13 +81,16 @@
 %doc doc/tex-ref.pdf
 %doc %{_infodir}/*.info*
 %exclude %{_infodir}/dir
-%{_datadir}/emacs/site-lisp/site-start.d
-%{_datadir}/emacs/site-lisp/site-start.d/auctex.el
+%{startupdir}
+# %{_datadir}/emacs/site-lisp/site-start.d/auctex.el
 %{_datadir}/emacs/site-lisp/auctex
-%{startupfile}
+# %{startupfile}
 %{_datadir}/emacs/site-lisp/tex-site.el
 
 %changelog
+* Sun Apr  9 2006 Ed Hill <ed at eh3.com> - 11.82-1
+- update to 11.82
+
 * Fri Sep 30 2005 Ed Hill <ed at eh3.com> - 11.81-2
 - fix stupid tagging mistake
 



From fedora-extras-commits at redhat.com  Sun Apr  9 19:04:15 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Sun,  9 Apr 2006 12:04:15 -0700
Subject: rpms/emacs-auctex/FC-5 emacs-auctex.spec,1.5,1.6
Message-ID: <200604091904.k39J4lSL017565@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/emacs-auctex/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17507/FC-5

Modified Files:
	emacs-auctex.spec 
Log Message:
new upstream 11.82 and fix two duplicated files



Index: emacs-auctex.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-auctex/FC-5/emacs-auctex.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- emacs-auctex.spec	1 Oct 2005 02:02:43 -0000	1.5
+++ emacs-auctex.spec	9 Apr 2006 19:04:15 -0000	1.6
@@ -3,8 +3,8 @@
 
 Summary: 	Enhanced TeX modes for Emacsen
 Name: 		emacs-auctex
-Version: 	11.81
-Release: 	2%{?dist}
+Version: 	11.82
+Release: 	1%{?dist}
 License: 	GPL
 Group: 		Applications/Editors
 URL: 		http://www.gnu.org/software/auctex/
@@ -81,13 +81,16 @@
 %doc doc/tex-ref.pdf
 %doc %{_infodir}/*.info*
 %exclude %{_infodir}/dir
-%{_datadir}/emacs/site-lisp/site-start.d
-%{_datadir}/emacs/site-lisp/site-start.d/auctex.el
+%{startupdir}
+# %{_datadir}/emacs/site-lisp/site-start.d/auctex.el
 %{_datadir}/emacs/site-lisp/auctex
-%{startupfile}
+# %{startupfile}
 %{_datadir}/emacs/site-lisp/tex-site.el
 
 %changelog
+* Sun Apr  9 2006 Ed Hill <ed at eh3.com> - 11.82-1
+- update to 11.82
+
 * Fri Sep 30 2005 Ed Hill <ed at eh3.com> - 11.81-2
 - fix stupid tagging mistake
 



From fedora-extras-commits at redhat.com  Sun Apr  9 19:13:58 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Sun,  9 Apr 2006 12:13:58 -0700
Subject: rpms/emacs-auctex/FC-5 .cvsignore, 1.3, 1.4 emacs-auctex.spec, 1.6, 
	1.7 sources, 1.3, 1.4
Message-ID: <200604091914.k39JE0QU017761@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/emacs-auctex/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17724/FC-5

Modified Files:
	.cvsignore emacs-auctex.spec sources 
Log Message:
fix silly new-sources omission



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/emacs-auctex/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Oct 2005 01:58:53 -0000	1.3
+++ .cvsignore	9 Apr 2006 19:13:58 -0000	1.4
@@ -1 +1 @@
-auctex-11.81.tar.gz
+auctex-11.82.tar.gz


Index: emacs-auctex.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-auctex/FC-5/emacs-auctex.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- emacs-auctex.spec	9 Apr 2006 19:04:15 -0000	1.6
+++ emacs-auctex.spec	9 Apr 2006 19:13:58 -0000	1.7
@@ -4,7 +4,7 @@
 Summary: 	Enhanced TeX modes for Emacsen
 Name: 		emacs-auctex
 Version: 	11.82
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License: 	GPL
 Group: 		Applications/Editors
 URL: 		http://www.gnu.org/software/auctex/
@@ -88,6 +88,9 @@
 %{_datadir}/emacs/site-lisp/tex-site.el
 
 %changelog
+* Sun Apr  9 2006 Ed Hill <ed at eh3.com> - 11.82-2
+- rebuild
+
 * Sun Apr  9 2006 Ed Hill <ed at eh3.com> - 11.82-1
 - update to 11.82
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/emacs-auctex/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Oct 2005 01:58:53 -0000	1.3
+++ sources	9 Apr 2006 19:13:58 -0000	1.4
@@ -1 +1 @@
-ba1d7d3254a4d690c23ad914516710aa  auctex-11.81.tar.gz
+a18d6ac70b332f47386980f0c4df62e6  auctex-11.82.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr  9 19:13:59 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Sun,  9 Apr 2006 12:13:59 -0700
Subject: rpms/emacs-auctex/devel .cvsignore, 1.3, 1.4 emacs-auctex.spec, 1.6,
	1.7 sources, 1.3, 1.4
Message-ID: <200604091914.k39JE1f7017767@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/emacs-auctex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17724/devel

Modified Files:
	.cvsignore emacs-auctex.spec sources 
Log Message:
fix silly new-sources omission



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/emacs-auctex/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	1 Oct 2005 01:58:53 -0000	1.3
+++ .cvsignore	9 Apr 2006 19:13:59 -0000	1.4
@@ -1 +1 @@
-auctex-11.81.tar.gz
+auctex-11.82.tar.gz


Index: emacs-auctex.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-auctex/devel/emacs-auctex.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- emacs-auctex.spec	9 Apr 2006 19:04:16 -0000	1.6
+++ emacs-auctex.spec	9 Apr 2006 19:13:59 -0000	1.7
@@ -4,7 +4,7 @@
 Summary: 	Enhanced TeX modes for Emacsen
 Name: 		emacs-auctex
 Version: 	11.82
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License: 	GPL
 Group: 		Applications/Editors
 URL: 		http://www.gnu.org/software/auctex/
@@ -88,6 +88,9 @@
 %{_datadir}/emacs/site-lisp/tex-site.el
 
 %changelog
+* Sun Apr  9 2006 Ed Hill <ed at eh3.com> - 11.82-2
+- rebuild
+
 * Sun Apr  9 2006 Ed Hill <ed at eh3.com> - 11.82-1
 - update to 11.82
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/emacs-auctex/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	1 Oct 2005 01:58:53 -0000	1.3
+++ sources	9 Apr 2006 19:13:59 -0000	1.4
@@ -1 +1 @@
-ba1d7d3254a4d690c23ad914516710aa  auctex-11.81.tar.gz
+a18d6ac70b332f47386980f0c4df62e6  auctex-11.82.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr  9 22:10:46 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun,  9 Apr 2006 15:10:46 -0700
Subject: rpms/clamav/FC-3 sources,1.12,1.13 clamav.spec,1.20,1.21
Message-ID: <200604092210.k39MAmIb027066@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27047/FC-3

Modified Files:
	sources clamav.spec 
Log Message:
updated to 0.88.1 (SECURITY)



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-3/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	9 Jan 2006 23:26:40 -0000	1.12
+++ sources	9 Apr 2006 22:10:45 -0000	1.13
@@ -1,2 +1,2 @@
-5d23205673c32e2b1b6db95000e6da74  clamav-0.88.tar.gz
-12816c52cf4434f861c1c7faa196361a  clamav-0.88.tar.gz.sig
+9fe8c47037051e350077513dd94fb76a  clamav-0.88.1.tar.gz
+bc06324bf070679854689235df5042d8  clamav-0.88.1.tar.gz.sig


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-3/clamav.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- clamav.spec	9 Jan 2006 23:26:40 -0000	1.20
+++ clamav.spec	9 Apr 2006 22:10:45 -0000	1.21
@@ -21,7 +21,7 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.88
+Version:	0.88.1
 Release:	%release_func 1
 
 License:	GPL
@@ -426,6 +426,9 @@
 %endif	# _without_milter
 
 %changelog
+* Mon Apr 10 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88.1-1
+- updated to 0.88.1 (SECURITY)
+
 * Tue Jan 10 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88-1
 - updated to 0.88
 - added pseudo-versions for the 'init(...)' provides as a first step



From fedora-extras-commits at redhat.com  Sun Apr  9 23:03:48 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  9 Apr 2006 16:03:48 -0700
Subject: rpms/perl-DBD-AnyData/devel - New directory
Message-ID: <200604092303.k39N3p96029401@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-DBD-AnyData/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29374/perl-DBD-AnyData/devel

Log Message:
Directory /cvs/extras/rpms/perl-DBD-AnyData/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Apr  9 23:03:47 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  9 Apr 2006 16:03:47 -0700
Subject: rpms/perl-DBD-AnyData - New directory
Message-ID: <200604092303.k39N3n4r029395@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-DBD-AnyData
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29374/perl-DBD-AnyData

Log Message:
Directory /cvs/extras/rpms/perl-DBD-AnyData added to the repository




From fedora-extras-commits at redhat.com  Sun Apr  9 23:04:02 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  9 Apr 2006 16:04:02 -0700
Subject: rpms/perl-DBD-AnyData Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604092304.k39N44s1029447@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-DBD-AnyData
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29419

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-DBD-AnyData


--- NEW FILE Makefile ---
# Top level Makefile for module perl-DBD-AnyData
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr  9 23:04:04 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  9 Apr 2006 16:04:04 -0700
Subject: rpms/perl-DBD-AnyData/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604092304.k39N46lH029453@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-DBD-AnyData/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29419/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-DBD-AnyData


--- 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 Apr  9 23:04:33 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  9 Apr 2006 16:04:33 -0700
Subject: rpms/perl-DBD-AnyData/devel perl-DBD-AnyData.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604092304.k39N4ZRp029522@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-DBD-AnyData/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29487/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-DBD-AnyData.spec 
Log Message:
auto-import perl-DBD-AnyData-0.08-2 on branch devel from perl-DBD-AnyData-0.08-2.src.rpm


--- NEW FILE perl-DBD-AnyData.spec ---
Name:           perl-DBD-AnyData
Version:        0.08
Release:        2%{?dist}
Summary:        DBI access to XML, CSV and other formats 
Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/DBD-AnyData
Source0:        http://search.cpan.org/CPAN/authors/id/J/JZ/JZUCKER/DBD-AnyData-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:	perl(DBI), perl(SQL::Statement), perl(DBD::File), perl(AnyData)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
The DBD::AnyData module provides a DBI (Perl Database Interface) and SQL 
(Structured Query Language) interface to data in many formats and from many 
sources.

%prep
%setup -q -n DBD-AnyData-%{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
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/DBD/*
%{_mandir}/man3/*.3*


%changelog
* Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.08-2
- minor cleanups

* Fri Jan  6 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.08-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-AnyData/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2006 23:04:03 -0000	1.1
+++ .cvsignore	9 Apr 2006 23:04:32 -0000	1.2
@@ -0,0 +1 @@
+DBD-AnyData-0.08.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-AnyData/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2006 23:04:03 -0000	1.1
+++ sources	9 Apr 2006 23:04:32 -0000	1.2
@@ -0,0 +1 @@
+3434afdade1e2c9d79e85eca4bd8df17  DBD-AnyData-0.08.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr  9 23:04:31 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  9 Apr 2006 16:04:31 -0700
Subject: rpms/perl-DBD-AnyData import.log,1.1,1.2
Message-ID: <200604092305.k39N537W029532@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-DBD-AnyData
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29487

Modified Files:
	import.log 
Log Message:
auto-import perl-DBD-AnyData-0.08-2 on branch devel from perl-DBD-AnyData-0.08-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-AnyData/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Apr 2006 23:04:02 -0000	1.1
+++ import.log	9 Apr 2006 23:04:31 -0000	1.2
@@ -0,0 +1 @@
+perl-DBD-AnyData-0_08-2:HEAD:perl-DBD-AnyData-0.08-2.src.rpm:1144623864



From fedora-extras-commits at redhat.com  Sun Apr  9 23:06:58 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  9 Apr 2006 16:06:58 -0700
Subject: owners owners.list,1.817,1.818
Message-ID: <200604092307.k39N706Q029602@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29584

Modified Files:
	owners.list 
Log Message:

perl-DBD-AnyData



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.817
retrieving revision 1.818
diff -u -r1.817 -r1.818
--- owners.list	9 Apr 2006 11:52:48 -0000	1.817
+++ owners.list	9 Apr 2006 23:06:58 -0000	1.818
@@ -903,6 +903,7 @@
 Fedora Extras|perl-Date-Pcalc|Gregorian calendar date calculations|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Date-Simple|Simple date object for perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DateTime|DateTime Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-DBD-AnyData|DBI access to XML, CSV and other formats|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBD-CSV|DBI driver for CSV files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBD-SQLite2|Self Contained RDBMS in a DBI Driver (sqlite 2.x)|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBD-SQLite|Self Contained RDBMS in a DBI Driver|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Sun Apr  9 23:09:27 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  9 Apr 2006 16:09:27 -0700
Subject: owners owners.list,1.818,1.819
Message-ID: <200604092309.k39N9TWu029630@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29613

Modified Files:
	owners.list 
Log Message:

perl-SQL-AbstractLimit



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.818
retrieving revision 1.819
diff -u -r1.818 -r1.819
--- owners.list	9 Apr 2006 23:06:58 -0000	1.818
+++ owners.list	9 Apr 2006 23:09:27 -0000	1.819
@@ -1052,6 +1052,7 @@
 Fedora Extras|perl-Spoon|Spoon Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 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-AbstractLimit|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.comPortable LIMIT Emulation
 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-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



From fedora-extras-commits at redhat.com  Sun Apr  9 23:10:30 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  9 Apr 2006 16:10:30 -0700
Subject: rpms/perl-SQL-Abstract-Limit - New directory
Message-ID: <200604092310.k39NAWUA029728@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-SQL-Abstract-Limit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29685/perl-SQL-Abstract-Limit

Log Message:
Directory /cvs/extras/rpms/perl-SQL-Abstract-Limit added to the repository




From fedora-extras-commits at redhat.com  Sun Apr  9 23:10:30 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  9 Apr 2006 16:10:30 -0700
Subject: rpms/perl-SQL-Abstract-Limit/devel - New directory
Message-ID: <200604092310.k39NAWxR029731@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-SQL-Abstract-Limit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29685/perl-SQL-Abstract-Limit/devel

Log Message:
Directory /cvs/extras/rpms/perl-SQL-Abstract-Limit/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Apr  9 23:10:36 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  9 Apr 2006 16:10:36 -0700
Subject: rpms/nethack-vultures/FC-4 nethack-vultures-1.10.1-config.patch, 1.1,
	1.2 nethack-vultures-1.10.1-optflags.patch, 1.1,
	1.2 nethack-vultures-1.11.0-config.patch, 1.1,
	1.2 nethack-vultures-1.11.0-optflags.patch, 1.3,
	1.4 nethack-vultures.spec, 1.19, 1.20
Message-ID: <200604092310.k39NAds9029798@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-serv29672/FC-4

Modified Files:
	nethack-vultures-1.10.1-config.patch 
	nethack-vultures-1.10.1-optflags.patch 
	nethack-vultures-1.11.0-config.patch 
	nethack-vultures-1.11.0-optflags.patch nethack-vultures.spec 
Log Message:
Upgraded to 2.0



nethack-vultures-1.10.1-config.patch:

Index: nethack-vultures-1.10.1-config.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures-1.10.1-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nethack-vultures-1.10.1-config.patch	22 Nov 2005 02:16:56 -0000	1.1
+++ nethack-vultures-1.10.1-config.patch	9 Apr 2006 23:10:36 -0000	1.2
@@ -1,5 +1,5 @@
---- vultures-1.10.1/nethack/include/config.h~	2005-11-11 10:47:33.000000000 +0200
-+++ vultures-1.10.1/nethack/include/config.h	2005-11-15 21:44:26.000000000 +0200
+--- vultures-2.0.0/nethack/include/config.h~	2005-11-11 10:47:33.000000000 +0200
++++ vultures-2.0.0/nethack/include/config.h	2005-11-15 21:44:26.000000000 +0200
 @@ -150,10 +150,10 @@
  
  #ifndef WIZARD		/* allow for compile-time or Makefile changes */
@@ -60,8 +60,8 @@
  
  /*
   * Section 5:  EXPERIMENTAL STUFF
---- vultures-1.10.1/nethack/include/unixconf.h~	2005-11-11 10:47:32.000000000 +0200
-+++ vultures-1.10.1/nethack/include/unixconf.h	2005-11-15 21:45:42.000000000 +0200
+--- vultures-2.0.0/nethack/include/unixconf.h~	2005-11-11 10:47:32.000000000 +0200
++++ vultures-2.0.0/nethack/include/unixconf.h	2005-11-15 21:45:42.000000000 +0200
 @@ -37,7 +37,7 @@
  #define NETWORK		/* if running on a networked system */
  			/* e.g. Suns sharing a playground through NFS */
@@ -89,8 +89,8 @@
  #endif
  
  #define FCMASK	0660	/* file creation mask */
---- vultures-1.10.1/slashem/include/config.h~	2005-11-11 10:47:39.000000000 +0200
-+++ vultures-1.10.1/slashem/include/config.h	2005-11-15 21:46:27.000000000 +0200
+--- vultures-2.0.0/slashem/include/config.h~	2005-11-11 10:47:39.000000000 +0200
++++ vultures-2.0.0/slashem/include/config.h	2005-11-15 21:46:27.000000000 +0200
 @@ -206,10 +206,10 @@
  
  #ifndef WIZARD		/* allow for compile-time or Makefile changes */
@@ -160,8 +160,8 @@
  /* #define BORG */            /* Works only under DOS */
  /* #define KEEP_SAVE */       /* Keep savefiles after Restore (wac at intergate.bc.ca)*/
  /* #define CHARON */	/* Charon's boat, enables Cerebus - not implemented */
---- vultures-1.10.1/slashem/include/unixconf.h~	2005-11-11 10:47:39.000000000 +0200
-+++ vultures-1.10.1/slashem/include/unixconf.h	2005-11-15 21:46:58.000000000 +0200
+--- vultures-2.0.0/slashem/include/unixconf.h~	2005-11-11 10:47:39.000000000 +0200
++++ vultures-2.0.0/slashem/include/unixconf.h	2005-11-15 21:46:58.000000000 +0200
 @@ -38,7 +38,7 @@
  #define NETWORK		/* if running on a networked system */
  			/* e.g. Suns sharing a playground through NFS */

nethack-vultures-1.10.1-optflags.patch:

Index: nethack-vultures-1.10.1-optflags.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures-1.10.1-optflags.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nethack-vultures-1.10.1-optflags.patch	22 Nov 2005 02:16:56 -0000	1.1
+++ nethack-vultures-1.10.1-optflags.patch	9 Apr 2006 23:10:36 -0000	1.2
@@ -1,5 +1,5 @@
---- vultures-1.10.1/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.10.1/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
+--- vultures-2.0.0/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-2.0.0/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
 @@ -164,7 +164,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -9,8 +9,8 @@
  LFLAGS = 
  
  # The Qt and Be window systems are written in C++, while the rest of
---- vultures-1.10.1/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.10.1/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
+--- vultures-2.0.0/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-2.0.0/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -20,8 +20,8 @@
  LFLAGS =
  
  LIBS =
---- vultures-1.10.1/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.10.1/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
+--- vultures-2.0.0/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-2.0.0/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
 @@ -157,7 +157,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -31,8 +31,8 @@
  LFLAGS =
  
  # Only used for the Gnome interface.
---- vultures-1.10.1/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.10.1/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
+--- vultures-2.0.0/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-2.0.0/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include

nethack-vultures-1.11.0-config.patch:

Index: nethack-vultures-1.11.0-config.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures-1.11.0-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nethack-vultures-1.11.0-config.patch	15 Dec 2005 22:38:32 -0000	1.1
+++ nethack-vultures-1.11.0-config.patch	9 Apr 2006 23:10:36 -0000	1.2
@@ -1,5 +1,5 @@
---- vultures-1.11.0/nethack/include/config.h~	2005-11-11 10:47:33.000000000 +0200
-+++ vultures-1.11.0/nethack/include/config.h	2005-11-15 21:44:26.000000000 +0200
+--- vultures-2.0.0/nethack/include/config.h~	2005-11-11 10:47:33.000000000 +0200
++++ vultures-2.0.0/nethack/include/config.h	2005-11-15 21:44:26.000000000 +0200
 @@ -150,10 +150,10 @@
  
  #ifndef WIZARD		/* allow for compile-time or Makefile changes */
@@ -60,8 +60,8 @@
  
  /*
   * Section 5:  EXPERIMENTAL STUFF
---- vultures-1.11.0/nethack/include/unixconf.h~	2005-11-11 10:47:32.000000000 +0200
-+++ vultures-1.11.0/nethack/include/unixconf.h	2005-11-15 21:45:42.000000000 +0200
+--- vultures-2.0.0/nethack/include/unixconf.h~	2005-11-11 10:47:32.000000000 +0200
++++ vultures-2.0.0/nethack/include/unixconf.h	2005-11-15 21:45:42.000000000 +0200
 @@ -37,7 +37,7 @@
  #define NETWORK		/* if running on a networked system */
  			/* e.g. Suns sharing a playground through NFS */
@@ -89,8 +89,8 @@
  #endif
  
  #define FCMASK	0660	/* file creation mask */
---- vultures-1.11.0/slashem/include/config.h~	2005-11-11 10:47:39.000000000 +0200
-+++ vultures-1.11.0/slashem/include/config.h	2005-11-15 21:46:27.000000000 +0200
+--- vultures-2.0.0/slashem/include/config.h~	2005-11-11 10:47:39.000000000 +0200
++++ vultures-2.0.0/slashem/include/config.h	2005-11-15 21:46:27.000000000 +0200
 @@ -206,10 +206,10 @@
  
  #ifndef WIZARD		/* allow for compile-time or Makefile changes */
@@ -160,8 +160,8 @@
  /* #define BORG */            /* Works only under DOS */
  /* #define KEEP_SAVE */       /* Keep savefiles after Restore (wac at intergate.bc.ca)*/
  /* #define CHARON */	/* Charon's boat, enables Cerebus - not implemented */
---- vultures-1.11.0/slashem/include/unixconf.h~	2005-11-11 10:47:39.000000000 +0200
-+++ vultures-1.11.0/slashem/include/unixconf.h	2005-11-15 21:46:58.000000000 +0200
+--- vultures-2.0.0/slashem/include/unixconf.h~	2005-11-11 10:47:39.000000000 +0200
++++ vultures-2.0.0/slashem/include/unixconf.h	2005-11-15 21:46:58.000000000 +0200
 @@ -38,7 +38,7 @@
  #define NETWORK		/* if running on a networked system */
  			/* e.g. Suns sharing a playground through NFS */

nethack-vultures-1.11.0-optflags.patch:

Index: nethack-vultures-1.11.0-optflags.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures-1.11.0-optflags.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nethack-vultures-1.11.0-optflags.patch	15 Dec 2005 20:47:02 -0000	1.3
+++ nethack-vultures-1.11.0-optflags.patch	9 Apr 2006 23:10:36 -0000	1.4
@@ -1,16 +1,16 @@
---- vultures-1.11.0/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.11.0/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
-@@ -153,7 +153,7 @@
- 
- # VULTURESCFLAGS will be passed to the sub-makefile for vultures
+--- vultures-2.0.0/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-2.0.0/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
+@@ -161,7 +161,7 @@
+ 	SDLMAIN = -lSDLmain
+ endif
  VULTURESCFLAGS = -Wall -g
--CFLAGS = -g -I../include -I ../win/vultures
-+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures/
+-CFLAGS = -g -I../include -I ../win/vultures $(shell $(SDL_CONFIG) --cflags)
++CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures/  $(shell $(SDL_CONFIG) --cflags)
  LFLAGS = 
  
  # The Qt and Be window systems are written in C++, while the rest of
---- vultures-1.11.0/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.11.0/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
+--- vultures-2.0.0/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-2.0.0/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -20,19 +20,19 @@
  LFLAGS =
  
  LIBS =
---- vultures-1.11.0/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.11.0/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
-@@ -147,7 +157,7 @@
-
- # VULTURESCFLAGS will be passed to the sub-makefile for vultures
- VULTURESCFLAGS = -g -O -Wall
--CFLAGS = -g -O -I../include -I../win/vultures
-+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures
+--- vultures-2.0.0/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-2.0.0/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
+@@ -155,7 +155,7 @@
+         SDLMAIN = -lSDLmain
+ endif
+ VULTURESCFLAGS = -Wall -O -g
+-CFLAGS = -g -O -I../include -I ../win/vultures $(shell $(SDL_CONFIG) --cflags)
++CFLAGS = $(RPM_OPT_FLAGS) -I../include -I ../win/vultures $(shell $(SDL_CONFIG) --cflags)
  LFLAGS =
  
  # Only used for the Gnome interface.
---- vultures-1.11.0/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.11.0/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
+--- vultures-2.0.0/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-2.0.0/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- nethack-vultures.spec	2 Feb 2006 17:30:31 -0000	1.19
+++ nethack-vultures.spec	9 Apr 2006 23:10:36 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
-Version:        1.11.2
-Release:        4%{?dist}
+Version:        2.0.0
+Release:        1%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -13,8 +13,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
-BuildRequires:  SDL_mixer-devel
+BuildRequires:  SDL_mixer-devel >= 1.2.6
 BuildRequires:  SDL_image-devel
+BuildRequires:  SDL_ttf-devel
 BuildRequires:  libpng-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  byacc
@@ -164,6 +165,9 @@
 
 
 %changelog
+* Sat Apr 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-1
+- Upgraded to 2.0.0
+
 * Sun Feb 02 2006 Frank Arnold <frank at scirocco-5v-turbo.de> - 1.11.2-4
 - Got a working plague build by working around util-linux bug #176441.
 



From fedora-extras-commits at redhat.com  Sun Apr  9 23:10:37 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  9 Apr 2006 16:10:37 -0700
Subject: rpms/nethack-vultures/devel .cvsignore, 1.6,
	1.7 nethack-vultures-1.10.1-config.patch, 1.1,
	1.2 nethack-vultures-1.10.1-optflags.patch, 1.1,
	1.2 nethack-vultures-1.11.0-config.patch, 1.1,
	1.2 nethack-vultures-1.11.0-optflags.patch, 1.3,
	1.4 nethack-vultures.spec, 1.20, 1.21 sources, 1.5, 1.6
Message-ID: <200604092310.k39NAeGc029822@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29672/devel

Modified Files:
	.cvsignore nethack-vultures-1.10.1-config.patch 
	nethack-vultures-1.10.1-optflags.patch 
	nethack-vultures-1.11.0-config.patch 
	nethack-vultures-1.11.0-optflags.patch nethack-vultures.spec 
	sources 
Log Message:
Upgraded to 2.0




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 Jan 2006 04:36:31 -0000	1.6
+++ .cvsignore	9 Apr 2006 23:10:37 -0000	1.7
@@ -1 +0,0 @@
-vultures-1.11.2-full.tar.bz2

nethack-vultures-1.10.1-config.patch:

Index: nethack-vultures-1.10.1-config.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures-1.10.1-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nethack-vultures-1.10.1-config.patch	22 Nov 2005 02:16:56 -0000	1.1
+++ nethack-vultures-1.10.1-config.patch	9 Apr 2006 23:10:37 -0000	1.2
@@ -1,5 +1,5 @@
---- vultures-1.10.1/nethack/include/config.h~	2005-11-11 10:47:33.000000000 +0200
-+++ vultures-1.10.1/nethack/include/config.h	2005-11-15 21:44:26.000000000 +0200
+--- vultures-2.0.0/nethack/include/config.h~	2005-11-11 10:47:33.000000000 +0200
++++ vultures-2.0.0/nethack/include/config.h	2005-11-15 21:44:26.000000000 +0200
 @@ -150,10 +150,10 @@
  
  #ifndef WIZARD		/* allow for compile-time or Makefile changes */
@@ -60,8 +60,8 @@
  
  /*
   * Section 5:  EXPERIMENTAL STUFF
---- vultures-1.10.1/nethack/include/unixconf.h~	2005-11-11 10:47:32.000000000 +0200
-+++ vultures-1.10.1/nethack/include/unixconf.h	2005-11-15 21:45:42.000000000 +0200
+--- vultures-2.0.0/nethack/include/unixconf.h~	2005-11-11 10:47:32.000000000 +0200
++++ vultures-2.0.0/nethack/include/unixconf.h	2005-11-15 21:45:42.000000000 +0200
 @@ -37,7 +37,7 @@
  #define NETWORK		/* if running on a networked system */
  			/* e.g. Suns sharing a playground through NFS */
@@ -89,8 +89,8 @@
  #endif
  
  #define FCMASK	0660	/* file creation mask */
---- vultures-1.10.1/slashem/include/config.h~	2005-11-11 10:47:39.000000000 +0200
-+++ vultures-1.10.1/slashem/include/config.h	2005-11-15 21:46:27.000000000 +0200
+--- vultures-2.0.0/slashem/include/config.h~	2005-11-11 10:47:39.000000000 +0200
++++ vultures-2.0.0/slashem/include/config.h	2005-11-15 21:46:27.000000000 +0200
 @@ -206,10 +206,10 @@
  
  #ifndef WIZARD		/* allow for compile-time or Makefile changes */
@@ -160,8 +160,8 @@
  /* #define BORG */            /* Works only under DOS */
  /* #define KEEP_SAVE */       /* Keep savefiles after Restore (wac at intergate.bc.ca)*/
  /* #define CHARON */	/* Charon's boat, enables Cerebus - not implemented */
---- vultures-1.10.1/slashem/include/unixconf.h~	2005-11-11 10:47:39.000000000 +0200
-+++ vultures-1.10.1/slashem/include/unixconf.h	2005-11-15 21:46:58.000000000 +0200
+--- vultures-2.0.0/slashem/include/unixconf.h~	2005-11-11 10:47:39.000000000 +0200
++++ vultures-2.0.0/slashem/include/unixconf.h	2005-11-15 21:46:58.000000000 +0200
 @@ -38,7 +38,7 @@
  #define NETWORK		/* if running on a networked system */
  			/* e.g. Suns sharing a playground through NFS */

nethack-vultures-1.10.1-optflags.patch:

Index: nethack-vultures-1.10.1-optflags.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures-1.10.1-optflags.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nethack-vultures-1.10.1-optflags.patch	22 Nov 2005 02:16:56 -0000	1.1
+++ nethack-vultures-1.10.1-optflags.patch	9 Apr 2006 23:10:37 -0000	1.2
@@ -1,5 +1,5 @@
---- vultures-1.10.1/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.10.1/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
+--- vultures-2.0.0/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-2.0.0/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
 @@ -164,7 +164,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -9,8 +9,8 @@
  LFLAGS = 
  
  # The Qt and Be window systems are written in C++, while the rest of
---- vultures-1.10.1/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.10.1/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
+--- vultures-2.0.0/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-2.0.0/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -20,8 +20,8 @@
  LFLAGS =
  
  LIBS =
---- vultures-1.10.1/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.10.1/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
+--- vultures-2.0.0/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-2.0.0/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
 @@ -157,7 +157,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -31,8 +31,8 @@
  LFLAGS =
  
  # Only used for the Gnome interface.
---- vultures-1.10.1/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.10.1/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
+--- vultures-2.0.0/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-2.0.0/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include

nethack-vultures-1.11.0-config.patch:

Index: nethack-vultures-1.11.0-config.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures-1.11.0-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nethack-vultures-1.11.0-config.patch	15 Dec 2005 22:38:37 -0000	1.1
+++ nethack-vultures-1.11.0-config.patch	9 Apr 2006 23:10:37 -0000	1.2
@@ -1,5 +1,5 @@
---- vultures-1.11.0/nethack/include/config.h~	2005-11-11 10:47:33.000000000 +0200
-+++ vultures-1.11.0/nethack/include/config.h	2005-11-15 21:44:26.000000000 +0200
+--- vultures-2.0.0/nethack/include/config.h~	2005-11-11 10:47:33.000000000 +0200
++++ vultures-2.0.0/nethack/include/config.h	2005-11-15 21:44:26.000000000 +0200
 @@ -150,10 +150,10 @@
  
  #ifndef WIZARD		/* allow for compile-time or Makefile changes */
@@ -60,8 +60,8 @@
  
  /*
   * Section 5:  EXPERIMENTAL STUFF
---- vultures-1.11.0/nethack/include/unixconf.h~	2005-11-11 10:47:32.000000000 +0200
-+++ vultures-1.11.0/nethack/include/unixconf.h	2005-11-15 21:45:42.000000000 +0200
+--- vultures-2.0.0/nethack/include/unixconf.h~	2005-11-11 10:47:32.000000000 +0200
++++ vultures-2.0.0/nethack/include/unixconf.h	2005-11-15 21:45:42.000000000 +0200
 @@ -37,7 +37,7 @@
  #define NETWORK		/* if running on a networked system */
  			/* e.g. Suns sharing a playground through NFS */
@@ -89,8 +89,8 @@
  #endif
  
  #define FCMASK	0660	/* file creation mask */
---- vultures-1.11.0/slashem/include/config.h~	2005-11-11 10:47:39.000000000 +0200
-+++ vultures-1.11.0/slashem/include/config.h	2005-11-15 21:46:27.000000000 +0200
+--- vultures-2.0.0/slashem/include/config.h~	2005-11-11 10:47:39.000000000 +0200
++++ vultures-2.0.0/slashem/include/config.h	2005-11-15 21:46:27.000000000 +0200
 @@ -206,10 +206,10 @@
  
  #ifndef WIZARD		/* allow for compile-time or Makefile changes */
@@ -160,8 +160,8 @@
  /* #define BORG */            /* Works only under DOS */
  /* #define KEEP_SAVE */       /* Keep savefiles after Restore (wac at intergate.bc.ca)*/
  /* #define CHARON */	/* Charon's boat, enables Cerebus - not implemented */
---- vultures-1.11.0/slashem/include/unixconf.h~	2005-11-11 10:47:39.000000000 +0200
-+++ vultures-1.11.0/slashem/include/unixconf.h	2005-11-15 21:46:58.000000000 +0200
+--- vultures-2.0.0/slashem/include/unixconf.h~	2005-11-11 10:47:39.000000000 +0200
++++ vultures-2.0.0/slashem/include/unixconf.h	2005-11-15 21:46:58.000000000 +0200
 @@ -38,7 +38,7 @@
  #define NETWORK		/* if running on a networked system */
  			/* e.g. Suns sharing a playground through NFS */

nethack-vultures-1.11.0-optflags.patch:

Index: nethack-vultures-1.11.0-optflags.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures-1.11.0-optflags.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nethack-vultures-1.11.0-optflags.patch	15 Dec 2005 20:47:07 -0000	1.3
+++ nethack-vultures-1.11.0-optflags.patch	9 Apr 2006 23:10:37 -0000	1.4
@@ -1,16 +1,16 @@
---- vultures-1.11.0/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.11.0/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
-@@ -153,7 +153,7 @@
- 
- # VULTURESCFLAGS will be passed to the sub-makefile for vultures
+--- vultures-2.0.0/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-2.0.0/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
+@@ -161,7 +161,7 @@
+ 	SDLMAIN = -lSDLmain
+ endif
  VULTURESCFLAGS = -Wall -g
--CFLAGS = -g -I../include -I ../win/vultures
-+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures/
+-CFLAGS = -g -I../include -I ../win/vultures $(shell $(SDL_CONFIG) --cflags)
++CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures/  $(shell $(SDL_CONFIG) --cflags)
  LFLAGS = 
  
  # The Qt and Be window systems are written in C++, while the rest of
---- vultures-1.11.0/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.11.0/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
+--- vultures-2.0.0/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-2.0.0/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -20,19 +20,19 @@
  LFLAGS =
  
  LIBS =
---- vultures-1.11.0/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.11.0/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
-@@ -147,7 +157,7 @@
-
- # VULTURESCFLAGS will be passed to the sub-makefile for vultures
- VULTURESCFLAGS = -g -O -Wall
--CFLAGS = -g -O -I../include -I../win/vultures
-+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures
+--- vultures-2.0.0/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-2.0.0/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
+@@ -155,7 +155,7 @@
+         SDLMAIN = -lSDLmain
+ endif
+ VULTURESCFLAGS = -Wall -O -g
+-CFLAGS = -g -O -I../include -I ../win/vultures $(shell $(SDL_CONFIG) --cflags)
++CFLAGS = $(RPM_OPT_FLAGS) -I../include -I ../win/vultures $(shell $(SDL_CONFIG) --cflags)
  LFLAGS =
  
  # Only used for the Gnome interface.
---- vultures-1.11.0/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.11.0/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
+--- vultures-2.0.0/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-2.0.0/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- nethack-vultures.spec	2 Mar 2006 01:19:46 -0000	1.20
+++ nethack-vultures.spec	9 Apr 2006 23:10:37 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
-Version:        1.11.2
-Release:        5%{?dist}
+Version:        2.0.0
+Release:        1%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -13,8 +13,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
-BuildRequires:  SDL_mixer-devel
+BuildRequires:  SDL_mixer-devel >= 1.2.6
 BuildRequires:  SDL_image-devel
+BuildRequires:  SDL_ttf-devel
 BuildRequires:  libpng-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  byacc
@@ -164,6 +165,9 @@
 
 
 %changelog
+* Sat Apr 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-1
+- Upgraded to 2.0.0
+
 * Sun Mar 01 2006 Karen Pease <meme at daughtersoftiresias.org> - 1.11.2-5
 - Rebuilt for FC5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Jan 2006 04:36:31 -0000	1.5
+++ sources	9 Apr 2006 23:10:37 -0000	1.6
@@ -1 +0,0 @@
-2de11c2fdb1c2eaffbb5738e3babba7f  vultures-1.11.2-full.tar.bz2



From fedora-extras-commits at redhat.com  Sun Apr  9 23:10:46 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  9 Apr 2006 16:10:46 -0700
Subject: rpms/perl-SQL-Abstract-Limit Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604092310.k39NAmKc029867@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-SQL-Abstract-Limit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29834

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-SQL-Abstract-Limit


--- NEW FILE Makefile ---
# Top level Makefile for module perl-SQL-Abstract-Limit
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr  9 23:10:47 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  9 Apr 2006 16:10:47 -0700
Subject: rpms/perl-SQL-Abstract-Limit/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200604092310.k39NAnAp029870@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-SQL-Abstract-Limit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29834/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-SQL-Abstract-Limit


--- 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 Apr  9 23:10:31 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  9 Apr 2006 16:10:31 -0700
Subject: rpms/nethack-vultures/FC-3 nethack-vultures-1.10.1-clawguide.patch, 
	1.1, 1.2 nethack-vultures-1.10.1-config.patch, 1.1,
	1.2 nethack-vultures-1.10.1-optflags.patch, 1.1,
	1.2 nethack-vultures-1.11.0-config.patch, 1.1,
	1.2 nethack-vultures-1.11.0-optflags.patch, 1.3,
	1.4 nethack-vultures.spec, 1.17, 1.18
Message-ID: <200604092311.k39NB31s029910@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-serv29672/FC-3

Modified Files:
	nethack-vultures-1.10.1-clawguide.patch 
	nethack-vultures-1.10.1-config.patch 
	nethack-vultures-1.10.1-optflags.patch 
	nethack-vultures-1.11.0-config.patch 
	nethack-vultures-1.11.0-optflags.patch nethack-vultures.spec 
Log Message:
Upgraded to 2.0



nethack-vultures-1.10.1-clawguide.patch:

Index: nethack-vultures-1.10.1-clawguide.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures-1.10.1-clawguide.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nethack-vultures-1.10.1-clawguide.patch	22 Nov 2005 02:16:56 -0000	1.1
+++ nethack-vultures-1.10.1-clawguide.patch	9 Apr 2006 23:10:31 -0000	1.2
@@ -5,7 +5,7 @@
  # GUIDECMD = type Guidebook.txt
  # The following work better with groff-1.18, eg on Linux
 -# GUIDECMD = tbl tmac.n Guidebook.mn | nroff -c -Tascii | $(COLCMD)
-+GUIDECMD = tbl tmac.n Guidebook.mn | nroff -c -Tascii | $(COLCMD)
++GUIDECMD = tbl tmac.n Guidebook.mn | nroff -c -Tascii | $(COLCMD) | cat
  # GUIDECMD = tbl tmac.n Guidebook.mn | groff -Wall -mtty-char -Tascii -P-u -P-b 
 -GUIDECMD = tbl tmac.n Guidebook.mn | nroff | $(COLCMD)
 +# GUIDECMD = tbl tmac.n Guidebook.mn | nroff | $(COLCMD)

nethack-vultures-1.10.1-config.patch:

Index: nethack-vultures-1.10.1-config.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures-1.10.1-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nethack-vultures-1.10.1-config.patch	22 Nov 2005 02:16:56 -0000	1.1
+++ nethack-vultures-1.10.1-config.patch	9 Apr 2006 23:10:31 -0000	1.2
@@ -1,5 +1,5 @@
---- vultures-1.10.1/nethack/include/config.h~	2005-11-11 10:47:33.000000000 +0200
-+++ vultures-1.10.1/nethack/include/config.h	2005-11-15 21:44:26.000000000 +0200
+--- vultures-2.0.0/nethack/include/config.h~	2005-11-11 10:47:33.000000000 +0200
++++ vultures-2.0.0/nethack/include/config.h	2005-11-15 21:44:26.000000000 +0200
 @@ -150,10 +150,10 @@
  
  #ifndef WIZARD		/* allow for compile-time or Makefile changes */
@@ -60,8 +60,8 @@
  
  /*
   * Section 5:  EXPERIMENTAL STUFF
---- vultures-1.10.1/nethack/include/unixconf.h~	2005-11-11 10:47:32.000000000 +0200
-+++ vultures-1.10.1/nethack/include/unixconf.h	2005-11-15 21:45:42.000000000 +0200
+--- vultures-2.0.0/nethack/include/unixconf.h~	2005-11-11 10:47:32.000000000 +0200
++++ vultures-2.0.0/nethack/include/unixconf.h	2005-11-15 21:45:42.000000000 +0200
 @@ -37,7 +37,7 @@
  #define NETWORK		/* if running on a networked system */
  			/* e.g. Suns sharing a playground through NFS */
@@ -89,8 +89,8 @@
  #endif
  
  #define FCMASK	0660	/* file creation mask */
---- vultures-1.10.1/slashem/include/config.h~	2005-11-11 10:47:39.000000000 +0200
-+++ vultures-1.10.1/slashem/include/config.h	2005-11-15 21:46:27.000000000 +0200
+--- vultures-2.0.0/slashem/include/config.h~	2005-11-11 10:47:39.000000000 +0200
++++ vultures-2.0.0/slashem/include/config.h	2005-11-15 21:46:27.000000000 +0200
 @@ -206,10 +206,10 @@
  
  #ifndef WIZARD		/* allow for compile-time or Makefile changes */
@@ -160,8 +160,8 @@
  /* #define BORG */            /* Works only under DOS */
  /* #define KEEP_SAVE */       /* Keep savefiles after Restore (wac at intergate.bc.ca)*/
  /* #define CHARON */	/* Charon's boat, enables Cerebus - not implemented */
---- vultures-1.10.1/slashem/include/unixconf.h~	2005-11-11 10:47:39.000000000 +0200
-+++ vultures-1.10.1/slashem/include/unixconf.h	2005-11-15 21:46:58.000000000 +0200
+--- vultures-2.0.0/slashem/include/unixconf.h~	2005-11-11 10:47:39.000000000 +0200
++++ vultures-2.0.0/slashem/include/unixconf.h	2005-11-15 21:46:58.000000000 +0200
 @@ -38,7 +38,7 @@
  #define NETWORK		/* if running on a networked system */
  			/* e.g. Suns sharing a playground through NFS */

nethack-vultures-1.10.1-optflags.patch:

Index: nethack-vultures-1.10.1-optflags.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures-1.10.1-optflags.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nethack-vultures-1.10.1-optflags.patch	22 Nov 2005 02:16:56 -0000	1.1
+++ nethack-vultures-1.10.1-optflags.patch	9 Apr 2006 23:10:31 -0000	1.2
@@ -1,5 +1,5 @@
---- vultures-1.10.1/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.10.1/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
+--- vultures-2.0.0/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-2.0.0/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
 @@ -164,7 +164,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -9,8 +9,8 @@
  LFLAGS = 
  
  # The Qt and Be window systems are written in C++, while the rest of
---- vultures-1.10.1/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.10.1/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
+--- vultures-2.0.0/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-2.0.0/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -20,8 +20,8 @@
  LFLAGS =
  
  LIBS =
---- vultures-1.10.1/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.10.1/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
+--- vultures-2.0.0/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-2.0.0/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
 @@ -157,7 +157,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -31,8 +31,8 @@
  LFLAGS =
  
  # Only used for the Gnome interface.
---- vultures-1.10.1/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.10.1/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
+--- vultures-2.0.0/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-2.0.0/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include

nethack-vultures-1.11.0-config.patch:

Index: nethack-vultures-1.11.0-config.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures-1.11.0-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nethack-vultures-1.11.0-config.patch	15 Dec 2005 22:38:26 -0000	1.1
+++ nethack-vultures-1.11.0-config.patch	9 Apr 2006 23:10:31 -0000	1.2
@@ -1,5 +1,5 @@
---- vultures-1.11.0/nethack/include/config.h~	2005-11-11 10:47:33.000000000 +0200
-+++ vultures-1.11.0/nethack/include/config.h	2005-11-15 21:44:26.000000000 +0200
+--- vultures-2.0.0/nethack/include/config.h~	2005-11-11 10:47:33.000000000 +0200
++++ vultures-2.0.0/nethack/include/config.h	2005-11-15 21:44:26.000000000 +0200
 @@ -150,10 +150,10 @@
  
  #ifndef WIZARD		/* allow for compile-time or Makefile changes */
@@ -60,8 +60,8 @@
  
  /*
   * Section 5:  EXPERIMENTAL STUFF
---- vultures-1.11.0/nethack/include/unixconf.h~	2005-11-11 10:47:32.000000000 +0200
-+++ vultures-1.11.0/nethack/include/unixconf.h	2005-11-15 21:45:42.000000000 +0200
+--- vultures-2.0.0/nethack/include/unixconf.h~	2005-11-11 10:47:32.000000000 +0200
++++ vultures-2.0.0/nethack/include/unixconf.h	2005-11-15 21:45:42.000000000 +0200
 @@ -37,7 +37,7 @@
  #define NETWORK		/* if running on a networked system */
  			/* e.g. Suns sharing a playground through NFS */
@@ -89,8 +89,8 @@
  #endif
  
  #define FCMASK	0660	/* file creation mask */
---- vultures-1.11.0/slashem/include/config.h~	2005-11-11 10:47:39.000000000 +0200
-+++ vultures-1.11.0/slashem/include/config.h	2005-11-15 21:46:27.000000000 +0200
+--- vultures-2.0.0/slashem/include/config.h~	2005-11-11 10:47:39.000000000 +0200
++++ vultures-2.0.0/slashem/include/config.h	2005-11-15 21:46:27.000000000 +0200
 @@ -206,10 +206,10 @@
  
  #ifndef WIZARD		/* allow for compile-time or Makefile changes */
@@ -160,8 +160,8 @@
  /* #define BORG */            /* Works only under DOS */
  /* #define KEEP_SAVE */       /* Keep savefiles after Restore (wac at intergate.bc.ca)*/
  /* #define CHARON */	/* Charon's boat, enables Cerebus - not implemented */
---- vultures-1.11.0/slashem/include/unixconf.h~	2005-11-11 10:47:39.000000000 +0200
-+++ vultures-1.11.0/slashem/include/unixconf.h	2005-11-15 21:46:58.000000000 +0200
+--- vultures-2.0.0/slashem/include/unixconf.h~	2005-11-11 10:47:39.000000000 +0200
++++ vultures-2.0.0/slashem/include/unixconf.h	2005-11-15 21:46:58.000000000 +0200
 @@ -38,7 +38,7 @@
  #define NETWORK		/* if running on a networked system */
  			/* e.g. Suns sharing a playground through NFS */

nethack-vultures-1.11.0-optflags.patch:

Index: nethack-vultures-1.11.0-optflags.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures-1.11.0-optflags.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nethack-vultures-1.11.0-optflags.patch	15 Dec 2005 20:46:56 -0000	1.3
+++ nethack-vultures-1.11.0-optflags.patch	9 Apr 2006 23:10:31 -0000	1.4
@@ -1,16 +1,16 @@
---- vultures-1.11.0/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.11.0/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
-@@ -153,7 +153,7 @@
- 
- # VULTURESCFLAGS will be passed to the sub-makefile for vultures
+--- vultures-2.0.0/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-2.0.0/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
+@@ -161,7 +161,7 @@
+ 	SDLMAIN = -lSDLmain
+ endif
  VULTURESCFLAGS = -Wall -g
--CFLAGS = -g -I../include -I ../win/vultures
-+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures/
+-CFLAGS = -g -I../include -I ../win/vultures $(shell $(SDL_CONFIG) --cflags)
++CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures/  $(shell $(SDL_CONFIG) --cflags)
  LFLAGS = 
  
  # The Qt and Be window systems are written in C++, while the rest of
---- vultures-1.11.0/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.11.0/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
+--- vultures-2.0.0/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-2.0.0/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -20,19 +20,19 @@
  LFLAGS =
  
  LIBS =
---- vultures-1.11.0/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.11.0/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
-@@ -147,7 +157,7 @@
-
- # VULTURESCFLAGS will be passed to the sub-makefile for vultures
- VULTURESCFLAGS = -g -O -Wall
--CFLAGS = -g -O -I../include -I../win/vultures
-+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures
+--- vultures-2.0.0/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-2.0.0/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
+@@ -155,7 +155,7 @@
+         SDLMAIN = -lSDLmain
+ endif
+ VULTURESCFLAGS = -Wall -O -g
+-CFLAGS = -g -O -I../include -I ../win/vultures $(shell $(SDL_CONFIG) --cflags)
++CFLAGS = $(RPM_OPT_FLAGS) -I../include -I ../win/vultures $(shell $(SDL_CONFIG) --cflags)
  LFLAGS =
  
  # Only used for the Gnome interface.
---- vultures-1.11.0/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.11.0/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
+--- vultures-2.0.0/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-2.0.0/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- nethack-vultures.spec	8 Jan 2006 16:31:53 -0000	1.17
+++ nethack-vultures.spec	9 Apr 2006 23:10:31 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
-Version:        1.11.2
-Release:        3%{?dist}
+Version:        2.0.0
+Release:        1%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -13,8 +13,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
-BuildRequires:  SDL_mixer-devel
+BuildRequires:  SDL_mixer-devel >= 1.2.6
 BuildRequires:  SDL_image-devel
+BuildRequires:  SDL_ttf-devel
 BuildRequires:  libpng-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  byacc
@@ -163,6 +164,9 @@
 
 
 %changelog
+* Sat Apr 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-1
+- Upgraded to 2.0.0
+
 * Sun Jan 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 1.11.2-3
 - Upped revision for consistancy with FC-4 and devel builds.
 



From fedora-extras-commits at redhat.com  Sun Apr  9 23:11:07 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  9 Apr 2006 16:11:07 -0700
Subject: rpms/perl-SQL-Abstract-Limit/devel perl-SQL-Abstract-Limit.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604092311.k39NB9BK029956@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-SQL-Abstract-Limit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29918/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-SQL-Abstract-Limit.spec 
Log Message:
auto-import perl-SQL-Abstract-Limit-0.12-2 on branch devel from perl-SQL-Abstract-Limit-0.12-2.src.rpm


--- NEW FILE perl-SQL-Abstract-Limit.spec ---
Name:           perl-SQL-Abstract-Limit
Version:        0.12
Release:        2%{?dist}
Summary:        Portable LIMIT Emulation
Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/SQL-Abstract-Limit
Source0:        http://search.cpan.org/CPAN/authors/id/D/DA/DAVEBAIRD/SQL-Abstract-Limit-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:	perl(SQL::Abstract) >= 1.2, perl(Test::Exception)
BuildRequires:	perl(Class::DBI), perl(DBD::AnyData)
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Portable SQL LIMIT emulation, with support for multiple dialects and syntax 
models.

%prep
%setup -q -n SQL-Abstract-Limit-%{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
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/SQL
%{_mandir}/man3/*.3*

%changelog
* Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.12-2
- minor cleanups

* Fri Jan  6 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.12-1
- Initial package for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Abstract-Limit/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	9 Apr 2006 23:10:47 -0000	1.1
+++ .cvsignore	9 Apr 2006 23:11:07 -0000	1.2
@@ -0,0 +1 @@
+SQL-Abstract-Limit-0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Abstract-Limit/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	9 Apr 2006 23:10:47 -0000	1.1
+++ sources	9 Apr 2006 23:11:07 -0000	1.2
@@ -0,0 +1 @@
+127285b0a59f2a671fd4c411371d4877  SQL-Abstract-Limit-0.12.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr  9 23:11:06 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  9 Apr 2006 16:11:06 -0700
Subject: rpms/perl-SQL-Abstract-Limit import.log,1.1,1.2
Message-ID: <200604092311.k39NB81m029951@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-SQL-Abstract-Limit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29918

Modified Files:
	import.log 
Log Message:
auto-import perl-SQL-Abstract-Limit-0.12-2 on branch devel from perl-SQL-Abstract-Limit-0.12-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-SQL-Abstract-Limit/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	9 Apr 2006 23:10:46 -0000	1.1
+++ import.log	9 Apr 2006 23:11:06 -0000	1.2
@@ -0,0 +1 @@
+perl-SQL-Abstract-Limit-0_12-2:HEAD:perl-SQL-Abstract-Limit-0.12-2.src.rpm:1144624261



From fedora-extras-commits at redhat.com  Sun Apr  9 23:11:45 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  9 Apr 2006 16:11:45 -0700
Subject: owners owners.list,1.819,1.820
Message-ID: <200604092311.k39NBlBx030010@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29988

Modified Files:
	owners.list 
Log Message:

typo



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.819
retrieving revision 1.820
diff -u -r1.819 -r1.820
--- owners.list	9 Apr 2006 23:09:27 -0000	1.819
+++ owners.list	9 Apr 2006 23:11:45 -0000	1.820
@@ -1052,7 +1052,7 @@
 Fedora Extras|perl-Spoon|Spoon Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 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-AbstractLimit|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.comPortable LIMIT Emulation
+Fedora Extras|perl-SQL-Abstract-Limit|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.comPortable LIMIT Emulation
 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-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



From fedora-extras-commits at redhat.com  Sun Apr  9 23:14:01 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  9 Apr 2006 16:14:01 -0700
Subject: rpms/fortune-firefly/FC-5 firefly, 1.6, 1.7 fortune-firefly.spec,
	1.8, 1.9
Message-ID: <200604092314.k39NE3l1030664@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/fortune-firefly/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30630/FC-5

Modified Files:
	firefly fortune-firefly.spec 
Log Message:
Updated FC-5.




Index: firefly
===================================================================
RCS file: /cvs/extras/rpms/fortune-firefly/FC-5/firefly,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- firefly	8 Jan 2006 21:11:28 -0000	1.6
+++ firefly	9 Apr 2006 23:14:01 -0000	1.7
@@ -1588,8 +1588,7 @@
 Wash: (gags)
 
 Jayne: "All the protien, vitamins and carbs of you grandma's best 
-turkey dinner... plus 15				--Episode #7, "Jaynestown"
-% alcohol." 
+turkey dinner... plus 15 percent alcohol.
 				--Episode #7, "Jaynestown"
 %
 Contact: "Last week, the factory foreman and his prod crew heard he was


Index: fortune-firefly.spec
===================================================================
RCS file: /cvs/extras/rpms/fortune-firefly/FC-5/fortune-firefly.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fortune-firefly.spec	8 Jan 2006 21:11:28 -0000	1.8
+++ fortune-firefly.spec	9 Apr 2006 23:14:01 -0000	1.9
@@ -1,5 +1,5 @@
 Name:		fortune-firefly
-Version:	2.1.0
+Version:	2.1.1
 Release:        1%{?dist}
 Summary:	Quotes from the TV series "Firefly"
 
@@ -49,6 +49,9 @@
 
 %changelog
 
+* Fri Apr 07 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.1
+- Manually merged in some fixes from Robert Mohr (mohr.42 at osu.edu)
+
 * Mon Jan 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.0
 - Incorporated some great organization and labeling by John Bianchi (John.Bianchi at usa.net)
 - Added quotes from unfilmed episode, "Dead or Alive"



From fedora-extras-commits at redhat.com  Sun Apr  9 23:15:06 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  9 Apr 2006 16:15:06 -0700
Subject: rpms/fortune-firefly/FC-5 fortune-firefly.spec,1.9,1.10
Message-ID: <200604092315.k39NF8tO030841@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/fortune-firefly/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30822

Modified Files:
	fortune-firefly.spec 
Log Message:
Upped the revision to make it work right.




Index: fortune-firefly.spec
===================================================================
RCS file: /cvs/extras/rpms/fortune-firefly/FC-5/fortune-firefly.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fortune-firefly.spec	9 Apr 2006 23:14:01 -0000	1.9
+++ fortune-firefly.spec	9 Apr 2006 23:15:06 -0000	1.10
@@ -1,6 +1,6 @@
 Name:		fortune-firefly
 Version:	2.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:	Quotes from the TV series "Firefly"
 
 Group:		Amusements/Games



From fedora-extras-commits at redhat.com  Sun Apr  9 23:16:16 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  9 Apr 2006 16:16:16 -0700
Subject: rpms/fortune-firefly/FC-5 fortune-firefly.spec,1.10,1.11
Message-ID: <200604092316.k39NGI6G030866@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/fortune-firefly/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30847

Modified Files:
	fortune-firefly.spec 
Log Message:
Upped the revision to make tag




Index: fortune-firefly.spec
===================================================================
RCS file: /cvs/extras/rpms/fortune-firefly/FC-5/fortune-firefly.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- fortune-firefly.spec	9 Apr 2006 23:15:06 -0000	1.10
+++ fortune-firefly.spec	9 Apr 2006 23:16:16 -0000	1.11
@@ -49,6 +49,9 @@
 
 %changelog
 
+* Sun Apr 09 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.1.2
+- Upped the revision to make tag
+
 * Fri Apr 07 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.1.1
 - Manually merged in some fixes from Robert Mohr (mohr.42 at osu.edu)
 



From fedora-extras-commits at redhat.com  Sun Apr  9 23:17:56 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  9 Apr 2006 16:17:56 -0700
Subject: rpms/nethack-vultures/FC-5 nethack-vultures-1.10.1-config.patch, 1.1,
	1.2 nethack-vultures-1.10.1-optflags.patch, 1.1,
	1.2 nethack-vultures-1.11.0-config.patch, 1.1,
	1.2 nethack-vultures-1.11.0-optflags.patch, 1.3,
	1.4 nethack-vultures.spec, 1.20, 1.21
Message-ID: <200604092317.k39NHxPa030952@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-serv30915

Modified Files:
	nethack-vultures-1.10.1-config.patch 
	nethack-vultures-1.10.1-optflags.patch 
	nethack-vultures-1.11.0-config.patch 
	nethack-vultures-1.11.0-optflags.patch nethack-vultures.spec 
Log Message:
Updated to 2.0.0



nethack-vultures-1.10.1-config.patch:

Index: nethack-vultures-1.10.1-config.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-5/nethack-vultures-1.10.1-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nethack-vultures-1.10.1-config.patch	22 Nov 2005 02:16:56 -0000	1.1
+++ nethack-vultures-1.10.1-config.patch	9 Apr 2006 23:17:56 -0000	1.2
@@ -1,5 +1,5 @@
---- vultures-1.10.1/nethack/include/config.h~	2005-11-11 10:47:33.000000000 +0200
-+++ vultures-1.10.1/nethack/include/config.h	2005-11-15 21:44:26.000000000 +0200
+--- vultures-2.0.0/nethack/include/config.h~	2005-11-11 10:47:33.000000000 +0200
++++ vultures-2.0.0/nethack/include/config.h	2005-11-15 21:44:26.000000000 +0200
 @@ -150,10 +150,10 @@
  
  #ifndef WIZARD		/* allow for compile-time or Makefile changes */
@@ -60,8 +60,8 @@
  
  /*
   * Section 5:  EXPERIMENTAL STUFF
---- vultures-1.10.1/nethack/include/unixconf.h~	2005-11-11 10:47:32.000000000 +0200
-+++ vultures-1.10.1/nethack/include/unixconf.h	2005-11-15 21:45:42.000000000 +0200
+--- vultures-2.0.0/nethack/include/unixconf.h~	2005-11-11 10:47:32.000000000 +0200
++++ vultures-2.0.0/nethack/include/unixconf.h	2005-11-15 21:45:42.000000000 +0200
 @@ -37,7 +37,7 @@
  #define NETWORK		/* if running on a networked system */
  			/* e.g. Suns sharing a playground through NFS */
@@ -89,8 +89,8 @@
  #endif
  
  #define FCMASK	0660	/* file creation mask */
---- vultures-1.10.1/slashem/include/config.h~	2005-11-11 10:47:39.000000000 +0200
-+++ vultures-1.10.1/slashem/include/config.h	2005-11-15 21:46:27.000000000 +0200
+--- vultures-2.0.0/slashem/include/config.h~	2005-11-11 10:47:39.000000000 +0200
++++ vultures-2.0.0/slashem/include/config.h	2005-11-15 21:46:27.000000000 +0200
 @@ -206,10 +206,10 @@
  
  #ifndef WIZARD		/* allow for compile-time or Makefile changes */
@@ -160,8 +160,8 @@
  /* #define BORG */            /* Works only under DOS */
  /* #define KEEP_SAVE */       /* Keep savefiles after Restore (wac at intergate.bc.ca)*/
  /* #define CHARON */	/* Charon's boat, enables Cerebus - not implemented */
---- vultures-1.10.1/slashem/include/unixconf.h~	2005-11-11 10:47:39.000000000 +0200
-+++ vultures-1.10.1/slashem/include/unixconf.h	2005-11-15 21:46:58.000000000 +0200
+--- vultures-2.0.0/slashem/include/unixconf.h~	2005-11-11 10:47:39.000000000 +0200
++++ vultures-2.0.0/slashem/include/unixconf.h	2005-11-15 21:46:58.000000000 +0200
 @@ -38,7 +38,7 @@
  #define NETWORK		/* if running on a networked system */
  			/* e.g. Suns sharing a playground through NFS */

nethack-vultures-1.10.1-optflags.patch:

Index: nethack-vultures-1.10.1-optflags.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-5/nethack-vultures-1.10.1-optflags.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nethack-vultures-1.10.1-optflags.patch	22 Nov 2005 02:16:56 -0000	1.1
+++ nethack-vultures-1.10.1-optflags.patch	9 Apr 2006 23:17:56 -0000	1.2
@@ -1,5 +1,5 @@
---- vultures-1.10.1/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.10.1/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
+--- vultures-2.0.0/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-2.0.0/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
 @@ -164,7 +164,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -9,8 +9,8 @@
  LFLAGS = 
  
  # The Qt and Be window systems are written in C++, while the rest of
---- vultures-1.10.1/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.10.1/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
+--- vultures-2.0.0/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-2.0.0/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -20,8 +20,8 @@
  LFLAGS =
  
  LIBS =
---- vultures-1.10.1/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.10.1/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
+--- vultures-2.0.0/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-2.0.0/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
 @@ -157,7 +157,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -31,8 +31,8 @@
  LFLAGS =
  
  # Only used for the Gnome interface.
---- vultures-1.10.1/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.10.1/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
+--- vultures-2.0.0/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-2.0.0/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include

nethack-vultures-1.11.0-config.patch:

Index: nethack-vultures-1.11.0-config.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-5/nethack-vultures-1.11.0-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nethack-vultures-1.11.0-config.patch	15 Dec 2005 22:38:37 -0000	1.1
+++ nethack-vultures-1.11.0-config.patch	9 Apr 2006 23:17:56 -0000	1.2
@@ -1,5 +1,5 @@
---- vultures-1.11.0/nethack/include/config.h~	2005-11-11 10:47:33.000000000 +0200
-+++ vultures-1.11.0/nethack/include/config.h	2005-11-15 21:44:26.000000000 +0200
+--- vultures-2.0.0/nethack/include/config.h~	2005-11-11 10:47:33.000000000 +0200
++++ vultures-2.0.0/nethack/include/config.h	2005-11-15 21:44:26.000000000 +0200
 @@ -150,10 +150,10 @@
  
  #ifndef WIZARD		/* allow for compile-time or Makefile changes */
@@ -60,8 +60,8 @@
  
  /*
   * Section 5:  EXPERIMENTAL STUFF
---- vultures-1.11.0/nethack/include/unixconf.h~	2005-11-11 10:47:32.000000000 +0200
-+++ vultures-1.11.0/nethack/include/unixconf.h	2005-11-15 21:45:42.000000000 +0200
+--- vultures-2.0.0/nethack/include/unixconf.h~	2005-11-11 10:47:32.000000000 +0200
++++ vultures-2.0.0/nethack/include/unixconf.h	2005-11-15 21:45:42.000000000 +0200
 @@ -37,7 +37,7 @@
  #define NETWORK		/* if running on a networked system */
  			/* e.g. Suns sharing a playground through NFS */
@@ -89,8 +89,8 @@
  #endif
  
  #define FCMASK	0660	/* file creation mask */
---- vultures-1.11.0/slashem/include/config.h~	2005-11-11 10:47:39.000000000 +0200
-+++ vultures-1.11.0/slashem/include/config.h	2005-11-15 21:46:27.000000000 +0200
+--- vultures-2.0.0/slashem/include/config.h~	2005-11-11 10:47:39.000000000 +0200
++++ vultures-2.0.0/slashem/include/config.h	2005-11-15 21:46:27.000000000 +0200
 @@ -206,10 +206,10 @@
  
  #ifndef WIZARD		/* allow for compile-time or Makefile changes */
@@ -160,8 +160,8 @@
  /* #define BORG */            /* Works only under DOS */
  /* #define KEEP_SAVE */       /* Keep savefiles after Restore (wac at intergate.bc.ca)*/
  /* #define CHARON */	/* Charon's boat, enables Cerebus - not implemented */
---- vultures-1.11.0/slashem/include/unixconf.h~	2005-11-11 10:47:39.000000000 +0200
-+++ vultures-1.11.0/slashem/include/unixconf.h	2005-11-15 21:46:58.000000000 +0200
+--- vultures-2.0.0/slashem/include/unixconf.h~	2005-11-11 10:47:39.000000000 +0200
++++ vultures-2.0.0/slashem/include/unixconf.h	2005-11-15 21:46:58.000000000 +0200
 @@ -38,7 +38,7 @@
  #define NETWORK		/* if running on a networked system */
  			/* e.g. Suns sharing a playground through NFS */

nethack-vultures-1.11.0-optflags.patch:

Index: nethack-vultures-1.11.0-optflags.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-5/nethack-vultures-1.11.0-optflags.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nethack-vultures-1.11.0-optflags.patch	15 Dec 2005 20:47:07 -0000	1.3
+++ nethack-vultures-1.11.0-optflags.patch	9 Apr 2006 23:17:56 -0000	1.4
@@ -1,16 +1,16 @@
---- vultures-1.11.0/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.11.0/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
-@@ -153,7 +153,7 @@
- 
- # VULTURESCFLAGS will be passed to the sub-makefile for vultures
+--- vultures-2.0.0/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-2.0.0/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
+@@ -161,7 +161,7 @@
+ 	SDLMAIN = -lSDLmain
+ endif
  VULTURESCFLAGS = -Wall -g
--CFLAGS = -g -I../include -I ../win/vultures
-+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures/
+-CFLAGS = -g -I../include -I ../win/vultures $(shell $(SDL_CONFIG) --cflags)
++CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures/  $(shell $(SDL_CONFIG) --cflags)
  LFLAGS = 
  
  # The Qt and Be window systems are written in C++, while the rest of
---- vultures-1.11.0/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.11.0/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
+--- vultures-2.0.0/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-2.0.0/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -20,19 +20,19 @@
  LFLAGS =
  
  LIBS =
---- vultures-1.11.0/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.11.0/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
-@@ -147,7 +157,7 @@
-
- # VULTURESCFLAGS will be passed to the sub-makefile for vultures
- VULTURESCFLAGS = -g -O -Wall
--CFLAGS = -g -O -I../include -I../win/vultures
-+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures
+--- vultures-2.0.0/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-2.0.0/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
+@@ -155,7 +155,7 @@
+         SDLMAIN = -lSDLmain
+ endif
+ VULTURESCFLAGS = -Wall -O -g
+-CFLAGS = -g -O -I../include -I ../win/vultures $(shell $(SDL_CONFIG) --cflags)
++CFLAGS = $(RPM_OPT_FLAGS) -I../include -I ../win/vultures $(shell $(SDL_CONFIG) --cflags)
  LFLAGS =
  
  # Only used for the Gnome interface.
---- vultures-1.11.0/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.11.0/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
+--- vultures-2.0.0/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-2.0.0/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-5/nethack-vultures.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- nethack-vultures.spec	2 Mar 2006 01:19:46 -0000	1.20
+++ nethack-vultures.spec	9 Apr 2006 23:17:56 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
-Version:        1.11.2
-Release:        5%{?dist}
+Version:        2.0.0
+Release:        1%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -13,8 +13,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
-BuildRequires:  SDL_mixer-devel
+BuildRequires:  SDL_mixer-devel >= 1.2.6
 BuildRequires:  SDL_image-devel
+BuildRequires:  SDL_ttf-devel
 BuildRequires:  libpng-devel
 BuildRequires:  ncurses-devel
 BuildRequires:  byacc
@@ -164,6 +165,9 @@
 
 
 %changelog
+* Sat Apr 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-1
+- Upgraded to 2.0.0
+
 * Sun Mar 01 2006 Karen Pease <meme at daughtersoftiresias.org> - 1.11.2-5
 - Rebuilt for FC5
 



From fedora-extras-commits at redhat.com  Mon Apr 10 00:21:33 2006
From: fedora-extras-commits at redhat.com (Zing Zing Shishak (shishz))
Date: Sun,  9 Apr 2006 17:21:33 -0700
Subject: rpms/mmv/FC-5 mmv.spec,1.4,1.5
Message-ID: <200604100021.k3A0LZDG000930@cvs-int.fedora.redhat.com>

Author: shishz

Update of /cvs/extras/rpms/mmv/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv913

Modified Files:
	mmv.spec 
Log Message:
* Sun Apr  9 2006 Zing <shishz at hotpop.com> - 1.01b-6
- fix permissions on doc files



Index: mmv.spec
===================================================================
RCS file: /cvs/extras/rpms/mmv/FC-5/mmv.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mmv.spec	14 Feb 2006 01:19:57 -0000	1.4
+++ mmv.spec	10 Apr 2006 00:21:33 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		mmv
 Version:	1.01b
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Move/copy/append/link multiple files
 
 Group:          Applications/File
@@ -49,8 +49,10 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
+%defattr(0644,root,root,-)
+%doc copyright changelog
 %defattr(-,root,root,-)
-%doc ANNOUNCE ARTICLE READ.ME copyright changelog
+%doc ANNOUNCE ARTICLE READ.ME
 %{_bindir}/mmv
 %{_bindir}/mcp
 %{_bindir}/mad
@@ -58,6 +60,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Apr  9 2006 Zing <shishz at hotpop.com> - 1.01b-6
+- fix permissions on doc files
+
 * Mon Feb 13 2006 Zing <shishz at hotpop.com> - 1.01b-5
 - sync with debian mmv_1.01b-14
 - symlink man page for mcp/mad/mln



From fedora-extras-commits at redhat.com  Mon Apr 10 00:23:57 2006
From: fedora-extras-commits at redhat.com (Zing Zing Shishak (shishz))
Date: Sun,  9 Apr 2006 17:23:57 -0700
Subject: rpms/mmv/FC-4 mmv-1.01b-debian-14.patch,NONE,1.1 mmv.spec,1.3,1.4
Message-ID: <200604100023.k3A0NxAN001025@cvs-int.fedora.redhat.com>

Author: shishz

Update of /cvs/extras/rpms/mmv/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1005

Modified Files:
	mmv.spec 
Added Files:
	mmv-1.01b-debian-14.patch 
Log Message:
* Sun Apr  9 2006 Zing <shishz at hotpop.com> - 1.01b-4
- fix permissions on doc files
- sync with debian mmv_1.01b-14
- symlink man page for mcp/mad/mln


mmv-1.01b-debian-14.patch:

--- NEW FILE mmv-1.01b-debian-14.patch ---
--- mmv-1.01b.orig/mmv.c.orig	2006-02-13 19:07:32.000000000 -0500
+++ mmv-1.01b.orig/mmv.c	2006-02-13 19:11:34.000000000 -0500
@@ -439,7 +439,9 @@
 static int badreps = 0, paterr = 0, direrr, failed = 0, gotsig = 0, repbad;
 static FILE *outfile;
 
+#ifdef IS_MSDOS
 static char IDF[] = "$$mmvdid.";
+#endif
 static char TEMP[] = "$$mmvtmp.";
 static char TOOLONG[] = "(too long)";
 static char EMPTY[] = "(empty)";
@@ -457,12 +459,12 @@
 char fullrep[MAXPATH + 1];
 static char *(start[MAXWILD]);
 static int len[MAXWILD];
-static char hasdot[MAXWILD];
 static REP mistake;
 #define MISTAKE (&mistake)
 
 #ifdef IS_MSDOS
 
+static char hasdot[MAXWILD];
 static int olddevflag, curdisk, maxdisk;
 static struct {
 	char ph_banner[30];
@@ -627,7 +629,7 @@
 		}
 
 endargs:
-	if (op == DFLT)
+	if (op == DFLT) {
 		if (strcmp(cmdname, MOVENAME) == 0)
 			op = XMOVE;
 		else if (strcmp(cmdname, COPYNAME) == 0)
@@ -638,6 +640,8 @@
 			op = HARDLINK;
 		else
 			op = DFLTOP;
+	}
+	
 	if (
 		op & DIRMOVE &&
 #ifdef IS_MSDOS
@@ -784,7 +788,7 @@
 static int parsepat()
 {
 	char *p, *lastname, c;
-	int totwilds, instage, x, havedot;
+	int totwilds, instage, x;
 	static char TRAILESC[] = "%s -> %s : trailing %c is superfluous.\n";
 
 	lastname = from;
@@ -1047,7 +1051,7 @@
 	DIRINFO *di;
 	HANDLE *h, *hto;
 	int prelen, litlen, nfils, i, k, flags, try;
-	FILEINFO **pf, *fdel;
+	FILEINFO **pf, *fdel = NULL;
 	char *nto, *firstesc;
 	REP *p;
 	int wantdirs, ret = 1, laststage = (stage + 1 == nstages);
@@ -1177,11 +1181,12 @@
 	if (*p == '.' || (!matchall && ffrom->fi_attrib & (FA_HIDDEN | FA_SYSTEM)))
 		return(strcmp(pat, p) == 0);
 #else
-	if (*p == '.')
+	if (*p == '.') {
 		if (p[1] == '\0' || (p[1] == '.' && p[2] == '\0'))
 			return(strcmp(pat, p) == 0);
 		else if (!matchall && *pat != '.')
 			return(0);
+	}
 #endif
 	return(-1);
 }
@@ -1317,7 +1322,7 @@
 {
 	char tpath[MAXPATH + 1];
 	char *pathend;
-	FILEINFO *fdel;
+	FILEINFO *fdel = NULL;
 	int hlen, tlen;
 
 	if (op & DIRMOVE) {
@@ -1410,7 +1415,9 @@
 static int badname(s)
 	char *s;
 {
+#ifdef IS_MSDOS
 	char *ext;
+#endif
 
 	return (
 #ifdef IS_MSDOS
@@ -1720,20 +1727,19 @@
 	struct stat dstat;
 	DIRID d;
 	DEVID v;
-	DIRINFO **newdirs, *di;
-	int nfils;
-	FILEINFO **fils;
+	DIRINFO *di = NULL;
 	char *myp, *lastslash = NULL;
 	int sticky;
 	HANDLE *h;
 
-	if (hsearch(p, which, &h))
+	if (hsearch(p, which, &h)) {
 		if (h->h_di == NULL) {
 			direrr = h->h_err;
 			return(NULL);
 		}
 		else
 			return(h);
+	}
 
 	if (*p == '\0')
 		myp = ".";
@@ -1904,7 +1910,10 @@
 	char *pat, *s, **start1;
 	int *len1;
 {
-	char c, *olds;
+	char c;
+#ifdef IS_MSDOS
+	char *olds;
+#endif
 
 	*start1 = 0;
 	for(;;)
@@ -2381,9 +2390,9 @@
 static void doreps()
 {
 	char *fstart;
-	int k, printaliased = 0, alias;
+	int k, printaliased = 0, alias = 0;
 	REP *first, *p;
-	long aliaslen;
+	long aliaslen = 0l;
 
 #ifdef IS_MSDOS
 	ctrlbrk(breakrep);
@@ -2401,11 +2410,12 @@
 			}
 			strcpy(fullrep, p->r_hto->h_name);
 			strcat(fullrep, p->r_nto);
-			if (!noex && (p->r_flags & R_ISCYCLE))
+			if (!noex && (p->r_flags & R_ISCYCLE)) {
 				if (op & APPEND)
 					aliaslen = appendalias(first, p, &printaliased);
 				else
 					alias = movealias(first, p, &printaliased);
+			}
 			strcpy(pathbuf, p->r_hfrom->h_name);
 			fstart = pathbuf + strlen(pathbuf);
 			if ((p->r_flags & R_ISALIASED) && !(op & APPEND))
@@ -2464,7 +2474,7 @@
 	REP *first, *p;
 	int *pprintaliased;
 {
-	long ret;
+	long ret = 0l;
 
 #ifdef IS_MSDOS
 	int fd;
@@ -2631,9 +2641,10 @@
 	FILEINFO *ff;
 	off_t len;
 {
-	char buf[BUFSIZE], c;
+	char buf[BUFSIZE];
 	int f, t, k, mode, perm;
 #ifdef IS_MSDOS
+        char c;
 	struct ftime tim;
 #else
 #ifdef IS_SYSV


Index: mmv.spec
===================================================================
RCS file: /cvs/extras/rpms/mmv/FC-4/mmv.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mmv.spec	1 Oct 2005 23:13:47 -0000	1.3
+++ mmv.spec	10 Apr 2006 00:23:57 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		mmv
 Version:	1.01b
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Move/copy/append/link multiple files
 
 Group:          Applications/File
@@ -11,6 +11,7 @@
 Source2:	changelog
 Patch0:		mmv-1.01b-debian.patch
 Patch1:		mmv-1.01b-makefile.patch
+Patch2:		mmv-1.01b-debian-14.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -27,6 +28,7 @@
 %setup -q -n mmv-1.01b.orig
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 cp -p %{SOURCE1} . 
 cp -p %{SOURCE2} .
 
@@ -39,13 +41,18 @@
 ln -s mmv $RPM_BUILD_ROOT/%{_bindir}/mcp
 ln -s mmv $RPM_BUILD_ROOT/%{_bindir}/mad
 ln -s mmv $RPM_BUILD_ROOT/%{_bindir}/mln
+ln -s mmv.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/mcp.1.gz
+ln -s mmv.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/mad.1.gz
+ln -s mmv.1.gz $RPM_BUILD_ROOT/%{_mandir}/man1/mln.1.gz
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
+%defattr(0644,root,root,-)
+%doc copyright changelog
 %defattr(-,root,root,-)
-%doc ANNOUNCE ARTICLE READ.ME copyright changelog
+%doc ANNOUNCE ARTICLE READ.ME
 %{_bindir}/mmv
 %{_bindir}/mcp
 %{_bindir}/mad
@@ -53,6 +60,11 @@
 %{_mandir}/man1/*
 
 %changelog
+* Sun Apr  9 2006 Zing <shishz at hotpop.com> - 1.01b-4
+- fix permissions on doc files
+- sync with debian mmv_1.01b-14
+- symlink man page for mcp/mad/mln
+
 * Sat Oct  1 2005 Zing <shishz at hotpop.com> - 1.01b-3
 - cleanup changelog
 - use dist tag



From fedora-extras-commits at redhat.com  Mon Apr 10 00:24:53 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  9 Apr 2006 17:24:53 -0700
Subject: rpms/perl-Class-DBI-AbstractSearch/FC-4
	perl-Class-DBI-AbstractSearch.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200604100025.k3A0PPDW001210@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-AbstractSearch/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1085/FC-4

Modified Files:
	perl-Class-DBI-AbstractSearch.spec sources 
Log Message:

Bump to 0.07



Index: perl-Class-DBI-AbstractSearch.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-AbstractSearch/FC-4/perl-Class-DBI-AbstractSearch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-AbstractSearch.spec	8 Sep 2005 15:15:23 -0000	1.1
+++ perl-Class-DBI-AbstractSearch.spec	10 Apr 2006 00:24:52 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-AbstractSearch
-Version:        0.05
-Release:        3%{?dist}
+Version:        0.07
+Release:        1%{?dist}
 Summary:        Abstract Class::DBI's SQL with SQL::Abstract
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -10,6 +10,7 @@
 
 BuildArch:      noarch
 BuildRequires:	perl(Class::DBI), perl(DBD::SQLite), perl(SQL::Abstract)
+BuildRequires:	perl(SQL::Abstract::Limit)
 Requires:  perl(Class::DBI)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -46,6 +47,9 @@
 
 
 %changelog
+* Fri Jan  6 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.07-1
+- bump to 0.07
+
 * Tue Sep  6 2005 Paul Howarth <paul at city-fan.org> 0.05-3
 - remove redundant BR: perl
 - honor %%{?_smp_mflags}


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-AbstractSearch/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Sep 2005 15:15:23 -0000	1.2
+++ sources	10 Apr 2006 00:24:52 -0000	1.3
@@ -1 +1 @@
-34e35114a22f1281f86c57a4ae54c62e  Class-DBI-AbstractSearch-0.05.tar.gz
+d40e7301201135fe0246251097132a54  Class-DBI-AbstractSearch-0.07.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 00:24:53 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  9 Apr 2006 17:24:53 -0700
Subject: rpms/perl-Class-DBI-AbstractSearch/FC-5
	perl-Class-DBI-AbstractSearch.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200604100025.k3A0PPto001214@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-AbstractSearch/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1085/FC-5

Modified Files:
	perl-Class-DBI-AbstractSearch.spec sources 
Log Message:

Bump to 0.07



Index: perl-Class-DBI-AbstractSearch.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-AbstractSearch/FC-5/perl-Class-DBI-AbstractSearch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-AbstractSearch.spec	8 Sep 2005 15:15:23 -0000	1.1
+++ perl-Class-DBI-AbstractSearch.spec	10 Apr 2006 00:24:53 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-AbstractSearch
-Version:        0.05
-Release:        3%{?dist}
+Version:        0.07
+Release:        1%{?dist}
 Summary:        Abstract Class::DBI's SQL with SQL::Abstract
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -10,6 +10,7 @@
 
 BuildArch:      noarch
 BuildRequires:	perl(Class::DBI), perl(DBD::SQLite), perl(SQL::Abstract)
+BuildRequires:	perl(SQL::Abstract::Limit)
 Requires:  perl(Class::DBI)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -46,6 +47,9 @@
 
 
 %changelog
+* Fri Jan  6 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.07-1
+- bump to 0.07
+
 * Tue Sep  6 2005 Paul Howarth <paul at city-fan.org> 0.05-3
 - remove redundant BR: perl
 - honor %%{?_smp_mflags}


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-AbstractSearch/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Sep 2005 15:15:23 -0000	1.2
+++ sources	10 Apr 2006 00:24:53 -0000	1.3
@@ -1 +1 @@
-34e35114a22f1281f86c57a4ae54c62e  Class-DBI-AbstractSearch-0.05.tar.gz
+d40e7301201135fe0246251097132a54  Class-DBI-AbstractSearch-0.07.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 00:24:54 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun,  9 Apr 2006 17:24:54 -0700
Subject: rpms/perl-Class-DBI-AbstractSearch/devel .cvsignore, 1.2,
	1.3 perl-Class-DBI-AbstractSearch.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200604100025.k3A0PQ1i001219@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-AbstractSearch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1085/devel

Modified Files:
	.cvsignore perl-Class-DBI-AbstractSearch.spec sources 
Log Message:

Bump to 0.07



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-AbstractSearch/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Sep 2005 15:15:23 -0000	1.2
+++ .cvsignore	10 Apr 2006 00:24:54 -0000	1.3
@@ -1 +1,2 @@
 Class-DBI-AbstractSearch-0.05.tar.gz
+Class-DBI-AbstractSearch-0.07.tar.gz


Index: perl-Class-DBI-AbstractSearch.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-AbstractSearch/devel/perl-Class-DBI-AbstractSearch.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Class-DBI-AbstractSearch.spec	8 Sep 2005 15:15:23 -0000	1.1
+++ perl-Class-DBI-AbstractSearch.spec	10 Apr 2006 00:24:54 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Class-DBI-AbstractSearch
-Version:        0.05
-Release:        3%{?dist}
+Version:        0.07
+Release:        1%{?dist}
 Summary:        Abstract Class::DBI's SQL with SQL::Abstract
 Group:          Development/Libraries
 License:        GPL or Artistic
@@ -10,6 +10,7 @@
 
 BuildArch:      noarch
 BuildRequires:	perl(Class::DBI), perl(DBD::SQLite), perl(SQL::Abstract)
+BuildRequires:	perl(SQL::Abstract::Limit)
 Requires:  perl(Class::DBI)
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -46,6 +47,9 @@
 
 
 %changelog
+* Fri Jan  6 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.07-1
+- bump to 0.07
+
 * Tue Sep  6 2005 Paul Howarth <paul at city-fan.org> 0.05-3
 - remove redundant BR: perl
 - honor %%{?_smp_mflags}


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-AbstractSearch/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Sep 2005 15:15:23 -0000	1.2
+++ sources	10 Apr 2006 00:24:54 -0000	1.3
@@ -1 +1 @@
-34e35114a22f1281f86c57a4ae54c62e  Class-DBI-AbstractSearch-0.05.tar.gz
+d40e7301201135fe0246251097132a54  Class-DBI-AbstractSearch-0.07.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 00:25:15 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  9 Apr 2006 17:25:15 -0700
Subject: rpms/nethack-vultures/FC-3 .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <200604100025.k3A0PllW001228@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-serv1148/FC-3

Modified Files:
	.cvsignore sources 
Log Message:
Committing modified source files.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Jan 2006 04:36:18 -0000	1.5
+++ .cvsignore	10 Apr 2006 00:25:15 -0000	1.6
@@ -1 +1 @@
-vultures-1.11.2-full.tar.bz2
+vultures-2.0.0-full.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Jan 2006 04:36:18 -0000	1.5
+++ sources	10 Apr 2006 00:25:15 -0000	1.6
@@ -1 +1 @@
-2de11c2fdb1c2eaffbb5738e3babba7f  vultures-1.11.2-full.tar.bz2
+556863034d868dfebbbad6b7fbaec4f9  vultures-2.0.0-full.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 10 00:25:15 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  9 Apr 2006 17:25:15 -0700
Subject: rpms/nethack-vultures/FC-4 .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <200604100025.k3A0PmpE001232@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-serv1148/FC-4

Modified Files:
	.cvsignore sources 
Log Message:
Committing modified source files.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Jan 2006 04:36:25 -0000	1.5
+++ .cvsignore	10 Apr 2006 00:25:15 -0000	1.6
@@ -1 +1 @@
-vultures-1.11.2-full.tar.bz2
+vultures-2.0.0-full.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Jan 2006 04:36:25 -0000	1.5
+++ sources	10 Apr 2006 00:25:15 -0000	1.6
@@ -1 +1 @@
-2de11c2fdb1c2eaffbb5738e3babba7f  vultures-1.11.2-full.tar.bz2
+556863034d868dfebbbad6b7fbaec4f9  vultures-2.0.0-full.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 10 00:25:21 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  9 Apr 2006 17:25:21 -0700
Subject: rpms/nethack-vultures/FC-5 .cvsignore,1.6,1.7 sources,1.5,1.6
Message-ID: <200604100025.k3A0PrwT001236@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-serv1148/FC-5

Modified Files:
	.cvsignore sources 
Log Message:
Committing modified source files.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 Jan 2006 04:36:31 -0000	1.6
+++ .cvsignore	10 Apr 2006 00:25:21 -0000	1.7
@@ -1 +1 @@
-vultures-1.11.2-full.tar.bz2
+vultures-2.0.0-full.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Jan 2006 04:36:31 -0000	1.5
+++ sources	10 Apr 2006 00:25:21 -0000	1.6
@@ -1 +1 @@
-2de11c2fdb1c2eaffbb5738e3babba7f  vultures-1.11.2-full.tar.bz2
+556863034d868dfebbbad6b7fbaec4f9  vultures-2.0.0-full.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 10 00:25:22 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  9 Apr 2006 17:25:22 -0700
Subject: rpms/nethack-vultures/devel .cvsignore,1.7,1.8 sources,1.6,1.7
Message-ID: <200604100025.k3A0PsgB001241@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1148/devel

Modified Files:
	.cvsignore sources 
Log Message:
Committing modified source files.




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	9 Apr 2006 23:10:37 -0000	1.7
+++ .cvsignore	10 Apr 2006 00:25:22 -0000	1.8
@@ -0,0 +1 @@
+vultures-2.0.0-full.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Apr 2006 23:10:37 -0000	1.6
+++ sources	10 Apr 2006 00:25:22 -0000	1.7
@@ -0,0 +1 @@
+556863034d868dfebbbad6b7fbaec4f9  vultures-2.0.0-full.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 10 00:35:02 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  9 Apr 2006 17:35:02 -0700
Subject: rpms/nethack-vultures/FC-3 nethack-vultures.spec,1.18,1.19
Message-ID: <200604100035.k3A0ZYSW001510@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-serv1436/FC-3

Modified Files:
	nethack-vultures.spec 
Log Message:
Upped the release to try and get the plague server to use the right
tarball.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- nethack-vultures.spec	9 Apr 2006 23:10:31 -0000	1.18
+++ nethack-vultures.spec	10 Apr 2006 00:35:01 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        2.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -164,6 +164,9 @@
 
 
 %changelog
+* Sat Apr 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-2
+- Upped the release to try and make the plague server use the right source tarball.
+
 * Sat Apr 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-1
 - Upgraded to 2.0.0
 



From fedora-extras-commits at redhat.com  Mon Apr 10 00:35:02 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  9 Apr 2006 17:35:02 -0700
Subject: rpms/nethack-vultures/FC-4 nethack-vultures.spec,1.20,1.21
Message-ID: <200604100035.k3A0ZYIU001513@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-serv1436/FC-4

Modified Files:
	nethack-vultures.spec 
Log Message:
Upped the release to try and get the plague server to use the right
tarball.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- nethack-vultures.spec	9 Apr 2006 23:10:36 -0000	1.20
+++ nethack-vultures.spec	10 Apr 2006 00:35:02 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        2.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -165,6 +165,9 @@
 
 
 %changelog
+* Sat Apr 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-2
+- Upped the release to try and make the plague server use the right source tarball.
+
 * Sat Apr 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-1
 - Upgraded to 2.0.0
 



From fedora-extras-commits at redhat.com  Mon Apr 10 00:35:08 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  9 Apr 2006 17:35:08 -0700
Subject: rpms/nethack-vultures/FC-5 nethack-vultures.spec,1.21,1.22
Message-ID: <200604100035.k3A0ZexP001516@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-serv1436/FC-5

Modified Files:
	nethack-vultures.spec 
Log Message:
Upped the release to try and get the plague server to use the right
tarball.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-5/nethack-vultures.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- nethack-vultures.spec	9 Apr 2006 23:17:56 -0000	1.21
+++ nethack-vultures.spec	10 Apr 2006 00:35:08 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        2.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -165,6 +165,9 @@
 
 
 %changelog
+* Sat Apr 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-2
+- Upped the release to try and make the plague server use the right source tarball.
+
 * Sat Apr 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-1
 - Upgraded to 2.0.0
 



From fedora-extras-commits at redhat.com  Mon Apr 10 00:35:09 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Sun,  9 Apr 2006 17:35:09 -0700
Subject: rpms/nethack-vultures/devel nethack-vultures.spec,1.21,1.22
Message-ID: <200604100035.k3A0ZfLX001519@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1436/devel

Modified Files:
	nethack-vultures.spec 
Log Message:
Upped the release to try and get the plague server to use the right
tarball.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- nethack-vultures.spec	9 Apr 2006 23:10:37 -0000	1.21
+++ nethack-vultures.spec	10 Apr 2006 00:35:08 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        2.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -165,6 +165,9 @@
 
 
 %changelog
+* Sat Apr 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-2
+- Upped the release to try and make the plague server use the right source tarball.
+
 * Sat Apr 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-1
 - Upgraded to 2.0.0
 



From fedora-extras-commits at redhat.com  Mon Apr 10 03:25:53 2006
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Sun,  9 Apr 2006 20:25:53 -0700
Subject: owners owners.list,1.820,1.821
Message-ID: <200604100325.k3A3PtOE008259@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8242

Modified Files:
	owners.list 
Log Message:
Add lcov package.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.820
retrieving revision 1.821
diff -u -r1.820 -r1.821
--- owners.list	9 Apr 2006 23:11:45 -0000	1.820
+++ owners.list	10 Apr 2006 03:25:53 -0000	1.821
@@ -548,6 +548,7 @@
 Fedora Extras|lapack|The LAPACK libraries for numerical linear algebra.|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|lcdf-typetools|Tools for manipulating Postscript fonts|mpeters at mac.com|extras-qa at fedoraproject.org|
 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|roland at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|ldns|Lowlevel DNS(SEC) library with API|paul at xtdnet.nl|extras-qa at fedoraproject.org|
 Fedora Extras|leafnode|A leafsite NNTP server|davidhart at tqmcube.com|extras-qa at fedoraproject.org|
 Fedora Extras|leafpad|GTK+ based simple text editor|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Apr 10 05:22:13 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun,  9 Apr 2006 22:22:13 -0700
Subject: rpms/crystal-stacker-themes - New directory
Message-ID: <200604100522.k3A5MFvI012555@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/crystal-stacker-themes
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12534/crystal-stacker-themes

Log Message:
Directory /cvs/extras/rpms/crystal-stacker-themes added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 10 05:22:14 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun,  9 Apr 2006 22:22:14 -0700
Subject: rpms/crystal-stacker-themes/devel - New directory
Message-ID: <200604100522.k3A5MGmP012558@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/crystal-stacker-themes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12534/crystal-stacker-themes/devel

Log Message:
Directory /cvs/extras/rpms/crystal-stacker-themes/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 10 05:22:32 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun,  9 Apr 2006 22:22:32 -0700
Subject: rpms/crystal-stacker-themes Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604100522.k3A5MYVt012607@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/crystal-stacker-themes
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12579

Added Files:
	Makefile import.log 
Log Message:
Setup of module crystal-stacker-themes


--- NEW FILE Makefile ---
# Top level Makefile for module crystal-stacker-themes
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 10 05:22:33 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun,  9 Apr 2006 22:22:33 -0700
Subject: rpms/crystal-stacker-themes/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200604100522.k3A5MZFk012610@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/crystal-stacker-themes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12579/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module crystal-stacker-themes


--- 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 Apr 10 05:23:47 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun,  9 Apr 2006 22:23:47 -0700
Subject: rpms/crystal-stacker-themes import.log,1.1,1.2
Message-ID: <200604100523.k3A5NnYq012702@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/crystal-stacker-themes
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12667

Modified Files:
	import.log 
Log Message:
auto-import crystal-stacker-themes-1.0-1 on branch devel from crystal-stacker-themes-1.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/crystal-stacker-themes/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Apr 2006 05:22:32 -0000	1.1
+++ import.log	10 Apr 2006 05:23:47 -0000	1.2
@@ -0,0 +1 @@
+crystal-stacker-themes-1_0-1:HEAD:crystal-stacker-themes-1.0-1.src.rpm:1144646480



From fedora-extras-commits at redhat.com  Mon Apr 10 05:23:47 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun,  9 Apr 2006 22:23:47 -0700
Subject: rpms/crystal-stacker-themes/devel crystal-stacker-theme-license.txt,
	NONE, 1.1 crystal-stacker-themes.spec, NONE, 1.1 cs-readme.txt,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604100523.k3A5NnYq012707@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/crystal-stacker-themes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12667/devel

Modified Files:
	.cvsignore sources 
Added Files:
	crystal-stacker-theme-license.txt crystal-stacker-themes.spec 
	cs-readme.txt 
Log Message:
auto-import crystal-stacker-themes-1.0-1 on branch devel from crystal-stacker-themes-1.0-1.src.rpm


--- NEW FILE crystal-stacker-theme-license.txt ---
The theme files available for crystal stacker do not come with any license
of their own. Therefor I (Hans de Goede <j.w.r.degoede at hhs.nl>) have asked
the Author and Copyright holder (Todd Cope) of crystal stacker who are the
Authors and Copyright holders of the themes.

It turns out that he (Todd Cope) is the Author and Copyright holder of all
themes but 2 and he has given permission to distribute his themes under the
same license as crystal stacker.

For the other 2 themes Travis Cope is the Author and Copyright holder and he
too has given permission to distribute his themes under the    
same license as crystal stacker.

The crystal stacker license can be found at the top of crystal stackers
readme, included in this package as cs-readme.txt

Below is a copy of the mail exchange between me (Hans de Goede
<j.w.r.degoede at hhs.nl>), Todd Cope and Travis Cope including the permission
notices:

Return-Path: <todd at t3-i.com>
Received: from koko.hhs.nl ([145.52.2.16] verified)
  by hhs.nl (CommuniGate Pro SMTP 4.3.6)
  with ESMTP id 45919533 for j.w.r.degoede at hhs.nl; Fri, 24 Mar 2006 23:21:49 +0100
Received: from exim by koko.hhs.nl with spam-scanned (Exim 4.41)
	id 1FMufF-0004Va-EH
	for j.w.r.degoede at hhs.nl; Fri, 24 Mar 2006 23:21:49 +0100
X-Spam-Checker-Version: SpamAssassin 3.1.0 (2005-09-13) on koko.hhs.nl
X-Spam-Level: 
X-Spam-Status: No, score=-1.6 required=5.0 tests=BAYES_00,NO_REAL_NAME 
	autolearn=no version=3.1.0
Received: from exim (helo=koko)
	by koko.hhs.nl with local-smtp (Exim 4.41)
	id 1FMufF-0004VX-AU
	for j.w.r.degoede at hhs.nl; Fri, 24 Mar 2006 23:21:49 +0100
Received: from [68.178.232.4] (port=54779 helo=smtpout12-02.prod.mesa1.secureserver.net)
	by koko.hhs.nl with smtp (Exim 4.41)
	id 1FMufE-0004VS-Ov
	for j.w.r.degoede at hhs.nl; Fri, 24 Mar 2006 23:21:49 +0100
Received: (qmail 19361 invoked from network); 24 Mar 2006 22:21:47 -0000
Received: from unknown (HELO gem-wbe03.mesa1.secureserver.net) (64.202.189.35)
  by smtpout12-02.prod.mesa1.secureserver.net with SMTP; 24 Mar 2006 22:21:47 -0000
Received: (qmail 24606 invoked by uid 99); 24 Mar 2006 22:21:47 -0000
Date: Fri, 24 Mar 2006 15:21:47 -0700
From: todd at t3-i.com
Subject: RE: Crsytal Stacker License Clarification needed
To: Hans de Goede <j.w.r.degoede at hhs.nl>
Message-ID: <20060324152147.c1bf2b7c2c1de069cff39b794cd5d62e.8dd40e2b74.wbe at email.email.secureserver.net>
MIME-Version: 1.0
Content-Type: TEXT/plain; CHARSET=US-ASCII
X-Originating-IP: 66.190.177.177
X-Anti-Virus: Kaspersky Anti-Virus for MailServers 5.5.2/RELEASE, bases: 24032006 #172764, status: clean

I will add a polling function to t3ssal. I need to check the code to
make sure there are no blocking situations that would cause the music
to stutter. I also need to fix t3ss_set_music_pattern to actually skip
to the correct pattern in the music as this is used by some of the
themes.

About the themes, all of them are made by me with the exception of "Food
Stacker" and "Matrix" which are made by Travis Cope. They fall under the
same license as the game and you can even include them in the Linux
package if you want. Speaking of license, I've been looking at those
licenses but I can't decide on one. I'm going to rewrite my license,
however, to clarify the issues you raised.

Thanks for all the work you've put in. I will e-mail you when I have
everything done. Also, if you haven't done so already, I'm going to add
you to the credits for the Linux port.

Thanks,

Todd Cope

> -------- Original Message --------
> Subject: Re: Crsytal Stacker License Clarification needed
> From: Hans de Goede <j.w.r.degoede at hhs.nl>
> Date: Wed, March 22, 2006 1:13 am
> To: todd at t3-i.com
> 

---

The rest of the mail has been deleted because of non relevance

---

Message-ID: <4435990F.4070400 at hhs.nl>
Date: Fri, 07 Apr 2006 00:41:19 +0200
From: Hans de Goede <j.w.r.degoede at hhs.nl>
User-Agent: Thunderbird 1.5 (X11/20060313)
MIME-Version: 1.0
To:  enden at t3-i.com
Subject: Crystal Stacker Themes
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit

Hi David,

First a short intro: I've been working lately with Todd on the Linux 
port of crystal stacker. I'm currently in the process of packaging it 
for inclusion into Fedora a well known linux distribution.

I would also like to create a package with all themes in it, including 
yours. Todd has sais that his themes are under the same license as CS 
itself and that that probably applied to your themes to, but that to be 
certain I should ask you, so here I am: What is the license under which 
your themes may be distributed?

Thanks & Regards,

Hans

---

Return-Path: <enden at t3-i.com>
Received: from koko.hhs.nl ([145.52.2.16] verified)
  by hhs.nl (CommuniGate Pro SMTP 4.3.6)
  with ESMTP id 46326822 for j.w.r.degoede at hhs.nl; Fri, 07 Apr 2006 23:01:53 +0200
Received: from exim by koko.hhs.nl with spam-scanned (Exim 4.41)
	id 1FRy5X-0002Pz-ID
	for j.w.r.degoede at hhs.nl; Fri, 07 Apr 2006 23:01:53 +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.41)
	id 1FRy5X-0002Pq-C7
	for j.w.r.degoede at hhs.nl; Fri, 07 Apr 2006 23:01:51 +0200
Received: from [68.178.232.10] (port=40819 helo=smtpout15-02.prod.mesa1.secureserver.net)
	by koko.hhs.nl with smtp (Exim 4.41)
	id 1FRy5W-0002PY-Rx
	for j.w.r.degoede at hhs.nl; Fri, 07 Apr 2006 23:01:51 +0200
Received: (qmail 30428 invoked from network); 7 Apr 2006 21:01:49 -0000
Received: from unknown (HELO webmail10.mesa1.secureserver.net) (64.202.189.47)
  by smtpout15-02.prod.mesa1.secureserver.net with SMTP; 7 Apr 2006 21:01:49 -0000
Received: (qmail 22348 invoked by uid 99); 7 Apr 2006 21:01:49 -0000
Date: Fri, 07 Apr 2006 14:01:49 -0700
From: Travis Cope <enden at t3-i.com>
Subject: RE: Crystal Stacker Themes
To: Hans de Goede <j.w.r.degoede at hhs.nl>
Message-ID: <20060407140149.e23bf89adcf3efedfb931dbdea8a905d.bdfe31ab1e.wbe at email.secureserver.net>
MIME-Version: 1.0
Content-Type: TEXT/plain; CHARSET=US-ASCII
User-Agent: Web-Based Email 4.0.19
X-Originating-IP: 65.114.125.11
X-Anti-Virus: Kaspersky Anti-Virus for MailServers 5.5.2/RELEASE, bases: 07042006 #175560, status: clean

The themes I made for Crystal Stacker are under the same license as the game.  I never really sat down and thought about the licensing, etc., I just kind of assumed it would use whatever Todd was using for Crystal Stacker.

Have a good day
-Travis



--- NEW FILE crystal-stacker-themes.spec ---
Name:           crystal-stacker-themes
Version:        1.0
Release:        1%{?dist}
Summary:        Themes for the Crystal Stacker game
Group:          Amusements/Games
License:        Freeware
URL:            http://www.t3-i.com/cstacker.htm
Source0:        http://ncdgames.t3-i.com/csdream.zip
Source1:        http://ncdgames.t3-i.com/csfood.zip
Source2:        http://ncdgames.t3-i.com/csgems.zip
Source3:        http://ncdgames.t3-i.com/cslcd.zip
Source4:        http://ncdgames.t3-i.com/csmatrix.zip
Source5:        http://ncdgames.t3-i.com/csoldcs.zip
Source6:        http://ncdgames.t3-i.com/csstone.zip
Source7:        crystal-stacker-theme-license.txt
Source8:        cs-readme.txt
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       crystal-stacker

%description
7 new / extra themes for the Crystal Stacker game.


%prep
%setup -q -c -a5 -a6
# don't pass these to %setup, their filenames must be forced to lowercase
unzip -qqLL %{SOURCE1}
unzip -qqLL %{SOURCE2}
unzip -qqLL %{SOURCE3}
unzip -qqLL %{SOURCE4}
# put these somewhere were %%doc can find them
cp -a %{SOURCE7} %{SOURCE8} .


%build
# nothing to build datafiles only


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/crystal-stacker
install -p -m 644 *.xm *.cth $RPM_BUILD_ROOT%{_datadir}/crystal-stacker


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc crystal-stacker-theme-license.txt cs-readme.txt
%{_datadir}/crystal-stacker/*.xm
%{_datadir}/crystal-stacker/*.cth


%changelog
* Sun Apr  9 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-1
- initial Fedora Extras package


--- NEW FILE cs-readme.txt ---
Crystal Stacker (c) 2006 NewCreature Design
-------------------------------------------

Crystal Stacker is freeware. This means you can pass copies around freely
provided you include this document in it's original form in your distribution.
Please see the "Contacting Us" section of this document if you need to contact
us for any reason.


Disclaimer
----------

NewCreature Design makes no guarantees regarding the Crystal Stacker software.
We are not responsible for damages caused by it, though the software is not
known to cause any problems. If you have trouble with the software, see the
"Contacting Us" section of this document.


Description
-----------

If you've played Columns then you know what Crystal Stacker is all about. Match
3 or more of the same color crystals either horizontally, vertically, or dia-
gonally to destroy them. For every 45 crystals you destroy, the level increases
and the crystals fall faster. The higher the level, the more points you are
awarded for destroying crystals.


System Requirements
-------------------

A 486 or higher PC.
VGA or better graphics card.


===============================================================================


How To Play
-----------

When the game starts, you have an empty board and a stack of crytals falling
from the top. Your job is to keep the board as empty as possible by creating
runs. A run is where the board contains 3 or more of the same color crystal
connected either horizontally, vertically, or diagonally. When you create runs
those crystals are destroyed and you play on. Once you run out of room for the
falling stack of crystals you top out and the game ends.


Combos
------

A combo occurs when crystals are destroyed and more runs are created as a
result. When a combo occurs a message will scroll in the message bar indicating
the size of the combo. The larger the combo, the more points you are awarded.


Wild Cards
----------

A wild card is a crystal that will match any color. In tight situations where
you don't have time to think, these can be very valuable.

You can distinguish a wild card from the other crystals because its color
changes continually.


Bombs
-----

A bomb is a special stack of crystals that specializes in removing a certain
color from the board. All crystals the same color as the crystal the bomb lands
on will be removed from the board. Landing on a wild card will cause all
crystals to be removed. If the bomb doesn't land on a crystal, it will become
randomly colored crystals.

Bombs have the appearance of a bright flashing stack of crystals.


===============================================================================


Game Modes
----------

Crystal Stacker offers a number of game modes for 1 or 2 players, each with a
different objective. 1 Player mode scores are stored in a table which can be
viewed from the main menu.

2 player modes can either be played in normal or battle mode. These modes are
essentially the same, but battle mode allows attacks, which add indestructible
blocks to the opposing players board. In order to attack the other player you
have to destroy at least 7 crystals at once. An attack can add up to 3 rows of
solid blocks at a time.


1 Player - Classic
------------------

This mode plays like classic Columns. Just try to get the high score.


1 Player - Destroyer
--------------------

You must destroy a set number of crystals to try to beat the best time.


1 Player - Frenzy
-----------------

This mode is like classic mode, except you have a time limit.


2 Player - Top Score
--------------------

Play until both players top out. The player with the highest score at the end
wins.


2 Player - Last Out
-------------------

The last surviving player wins.


2 Player - Destroyer
--------------------

The first player to destroy the specified number of crystals wins.


===============================================================================


Themes
------

Themes are used to give a new look to the game. They can be loaded from the
options menu. New themes can be downloaded from our web site or you can create
new themes with the editor.


Command Line Arguments
----------------------

-v             Display the current version number

-nosound       Disable sound support


Contacting Us
-------------

If you have general questions about our programs or anything else you can
contact us via e-mail. Please report any bugs you find in our software as well.
Visit our web sites for the latest updates and releases.


E-mail Address
--------------

todd at t3-i.com


Web Address
-----------

http://www.t3-i.com

Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/crystal-stacker-themes/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Apr 2006 05:22:33 -0000	1.1
+++ .cvsignore	10 Apr 2006 05:23:47 -0000	1.2
@@ -0,0 +1,7 @@
+csdream.zip
+csfood.zip
+csgems.zip
+cslcd.zip
+csmatrix.zip
+csoldcs.zip
+csstone.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/crystal-stacker-themes/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Apr 2006 05:22:33 -0000	1.1
+++ sources	10 Apr 2006 05:23:47 -0000	1.2
@@ -0,0 +1,7 @@
+de59b772b4683cd09b2302c1fa638b46  csdream.zip
+5273a28db94d61eedfa3c0bf65c2f107  csfood.zip
+a7534dec94cd5d141c77df4ea5a6d19d  csgems.zip
+f84b75c649eb1c2c88cc90fa2d4b1c99  cslcd.zip
+bac5ea214401a9dcbb1ffb8ef390702c  csmatrix.zip
+27fdacb7b28336547b1c7eee5fcdc06a  csoldcs.zip
+9ea8e39a439c927f7bb29046a6639ba2  csstone.zip



From fedora-extras-commits at redhat.com  Mon Apr 10 05:28:13 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun,  9 Apr 2006 22:28:13 -0700
Subject: owners owners.list,1.821,1.822
Message-ID: <200604100528.k3A5SFK9012799@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12782/owners

Modified Files:
	owners.list 
Log Message:
add crystal-stacker-themes


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.821
retrieving revision 1.822
diff -u -r1.821 -r1.822
--- owners.list	10 Apr 2006 03:25:53 -0000	1.821
+++ owners.list	10 Apr 2006 05:28:13 -0000	1.822
@@ -156,6 +156,7 @@
 Fedora Extras|crack|Password cracker|Christian.Iseli at licr.org|extras-qa at fedoraproject.org|
 Fedora Extras|cryptplug|Cryptography plugin for mutt & kmail|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|crystal-stacker|Falling blocks, match 3 or more of the same color crystals|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
+Fedora Extras|crystal-stacker-themes|Themes for the Crystal Stacker game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|csmash|3D tabletennis game|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|ctrlproxy|IRC server with multiserver support|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|cvs2cl|Utility which generates ChangeLogs from CVS working copies|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Apr 10 06:43:36 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun,  9 Apr 2006 23:43:36 -0700
Subject: owners owners.list,1.822,1.823
Message-ID: <200604100643.k3A6hcpi015155@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15138

Modified Files:
	owners.list 
Log Message:
fix perl-SQL-Abstract-Limit entry


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.822
retrieving revision 1.823
diff -u -r1.822 -r1.823
--- owners.list	10 Apr 2006 05:28:13 -0000	1.822
+++ owners.list	10 Apr 2006 06:43:36 -0000	1.823
@@ -1054,7 +1054,7 @@
 Fedora Extras|perl-Spoon|Spoon Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 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|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.comPortable LIMIT Emulation
+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-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-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



From fedora-extras-commits at redhat.com  Mon Apr 10 08:10:30 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon, 10 Apr 2006 01:10:30 -0700
Subject: fedora-security/audit fc4,1.193,1.194 fc5,1.106,1.107
Message-ID: <200604100810.k3A8AUpn019414@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19394

Modified Files:
	fc4 fc5 
Log Message:
Bring up to date with weekend



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194
--- fc4	7 Apr 2006 14:23:46 -0000	1.193
+++ fc4	10 Apr 2006 08:10:27 -0000	1.194
@@ -1,5 +1,5 @@
-Up to date CVE as of CVE email 20060504
-Up to date FC4 as of 20060504
+Up to date CVE as of CVE email 20060509
+Up to date FC4 as of 20060509
 
 ** are items that need attention
 
@@ -23,6 +23,7 @@
 CVE-2006-1066 version (kernel, fixed 2.6.16) [since FEDORA-2006-245]
 CVE-2006-1061 version (curl, 7.15.0 - 7.15.2 only)
 CVE-2006-1059 version (samba)
+CVE-2006-1058 VULNERABLE (busybox) bz#187386
 CVE-2006-1052 version (kernel, fixed 2.6.16) patch-2.6.16-rc6 [since FEDORA-2006-245]
 CVE-2006-1045 VULNERABLE (thunderbird)
 CVE-2006-1015 ignore (php) safe mode isn't safe
@@ -765,6 +766,7 @@
 CVE-2005-0004 version (mysql, fixed 4.1.10)
 CVE-2005-0003 version (kernel, fixed 2.6.10)
 CVE-2005-0001 version (kernel, fixed 2.6.10)
+CVE-2004-2655 version (xscreensaver)
 CVE-2004-2654 version (squid, fixed 2.6STABLE6)
 CVE-2004-2607 version (kernel, fixed 2.6.5)
 CVE-2004-2589 version (gaim, fixed 0.82)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- fc5	7 Apr 2006 14:23:46 -0000	1.106
+++ fc5	10 Apr 2006 08:10:27 -0000	1.107
@@ -1,5 +1,5 @@
-Up to date CVE as of CVE email 20060405
-Up to date FC5 as of 20060405
+Up to date CVE as of CVE email 20060409
+Up to date FC5 as of 20060409
 
 ** are items that need attention
 
@@ -24,6 +24,7 @@
 CVE-2006-1066 version (kernel, fixed 2.6.16) [since FEDORA-2006-233]
 CVE-2006-1061 backport (curl, fixed 7.15.3) [since FEDORA-2006-189]
 CVE-2006-1059 version (samba, fixed 3.0.22 at least) bz#187170 [since FEDORA-2006-259]
+CVE-2006-1058 VULNERABLE (busybox) bz#187386
 CVE-2006-1052 version (kernel, fixed 2.6.16) patch-2.6.16-rc6 [since FEDORA-2006-233]
 CVE-2006-1045 VULNERABLE (thunderbird)
 CVE-2006-1015 ignore (php) safe mode isn't safe
@@ -764,6 +765,7 @@
 CVE-2005-0004 version (mysql, fixed 4.1.10)
 CVE-2005-0003 version (kernel, fixed 2.6.10)
 CVE-2005-0001 version (kernel, fixed 2.6.10)
+CVE-2004-2655 version (xscreensaver)
 CVE-2004-2654 version (squid, fixed 2.6STABLE6)
 CVE-2004-2607 version (kernel, fixed 2.6.5)
 CVE-2004-2589 version (gaim, fixed 0.82)



From fedora-extras-commits at redhat.com  Mon Apr 10 09:07:06 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 10 Apr 2006 02:07:06 -0700
Subject: rpms/adime/devel adime.spec,1.1,1.2
Message-ID: <200604100907.k3A978iS021559@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/adime/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21542

Modified Files:
	adime.spec 
Log Message:
move install-info reqs to devel subpackage


Index: adime.spec
===================================================================
RCS file: /cvs/extras/rpms/adime/devel/adime.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- adime.spec	13 Mar 2006 20:17:07 -0000	1.1
+++ adime.spec	10 Apr 2006 09:07:06 -0000	1.2
@@ -2,7 +2,6 @@
 Version:        2.2.1
 Release:        3%{?dist}
 Summary:        Allegro Dialogs Made Easy
-
 Group:          System Environment/Libraries
 License:        zlib License
 URL:            http://adime.sourceforge.net/
@@ -10,8 +9,6 @@
 Patch0:         adime-2.2.1-so-fixes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  allegro-devel texinfo
-Requires(post): /sbin/install-info
-Requires(preun): /sbin/install-info
 
 %description
 Adime is a portable add-on library for Allegro with functions for generating
@@ -25,6 +22,8 @@
 Group: Development/Libraries
 Requires: %{name} = %{version}
 Requires: allegro-devel
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
 
 %description devel
 The developmental files that must be installed in order to compile



From fedora-extras-commits at redhat.com  Mon Apr 10 10:35:13 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Mon, 10 Apr 2006 03:35:13 -0700
Subject: owners owners.list,1.823,1.824
Message-ID: <200604101035.k3AAZFVm023835@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23818

Modified Files:
	owners.list 
Log Message:

 	owners.list 



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.823
retrieving revision 1.824
diff -u -r1.823 -r1.824
--- owners.list	10 Apr 2006 06:43:36 -0000	1.823
+++ owners.list	10 Apr 2006 10:35:13 -0000	1.824
@@ -284,6 +284,7 @@
 Fedora Extras|fuse|File System in Userspace|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
 Fedora Extras|fuse-encfs|Encrypted pass-thru filesystem in userspace|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
 Fedora Extras|fuse-sshfs|FUSE-Filesystem to access remote filesystems via SSH|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
+Fedora Extras|fuse-emulator|A Sinclair ZX Spectrum emulator|paul at all-the-johnsons.co.uk|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|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
@@ -470,6 +471,7 @@
 Fedora Extras|ifplugd|Detect and take action when an ethernet cable is unplugged|aaron.bennett at olin.edu|extras-qa at fedoraproject.org|
 Fedora Extras|iftop|Command line tool that displays bandwidth usage on an interface|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|iiimf-le-simplehangul|Romanized Korean Hangul language engine for IIIMF|wtogami at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|ikvm|A Java compatibility layer for Mono|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|imlib2|A graphic library for file loading, saving, rendering, and manipulation|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|inadyn|A Dynamic DNS Client|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|inkscape|A vector-based drawing program using SVG|denis at poolshark.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Apr 10 10:40:41 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Mon, 10 Apr 2006 03:40:41 -0700
Subject: rpms/gdeskcal import.log,1.4,1.5
Message-ID: <200604101040.k3AAehMZ023892@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gdeskcal
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23861

Modified Files:
	import.log 
Log Message:
auto-import gdeskcal-0.57.1-5 on branch devel from gdeskcal-0.57.1-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	8 Nov 2004 04:22:59 -0000	1.4
+++ import.log	10 Apr 2006 10:40:41 -0000	1.5
@@ -1,3 +1,4 @@
 gdeskcal-0_55-0_fdr_1_rh90:HEAD:gdeskcal-0.55-0.fdr.1.rh90.src.rpm:1099887757
 gdeskcal-0_57_1-0_fdr_2_1:HEAD:gdeskcal-0.57.1-0.fdr.2.1.src.rpm:1099887763
 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



From fedora-extras-commits at redhat.com  Mon Apr 10 10:40:41 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Mon, 10 Apr 2006 03:40:41 -0700
Subject: rpms/gdeskcal/devel gdeskcal.spec,1.8,1.9
Message-ID: <200604101040.k3AAehnN023896@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gdeskcal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23861/devel

Modified Files:
	gdeskcal.spec 
Log Message:
auto-import gdeskcal-0.57.1-5 on branch devel from gdeskcal-0.57.1-5.src.rpm


Index: gdeskcal.spec
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/devel/gdeskcal.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gdeskcal.spec	2 Mar 2006 21:29:10 -0000	1.8
+++ gdeskcal.spec	10 Apr 2006 10:40:41 -0000	1.9
@@ -1,9 +1,7 @@
 Name:           gdeskcal
 Version:        0.57.1
-Release:        4
-
+Release:        5%{?dist}
 Summary:        Eye-candy calendar for your desktop
-
 Group:          User Interface/Desktops
 License:        GPL
 URL:            http://www.pycage.de/software_gdeskcal.html
@@ -26,22 +24,13 @@
 
 
 %prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
-
 %setup -q -n gDeskCal-%{version}
 
-
 %build
 
 
 %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}/
@@ -72,6 +61,10 @@
 
 
 %changelog
+* Fri Apr 7 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.5.7.1-5
+- rebuilt
+- minor spec changes
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 



From fedora-extras-commits at redhat.com  Mon Apr 10 10:42:39 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Mon, 10 Apr 2006 03:42:39 -0700
Subject: rpms/gdeskcal import.log,1.5,1.6
Message-ID: <200604101042.k3AAgfN8023990@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gdeskcal
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23959

Modified Files:
	import.log 
Log Message:
auto-import gdeskcal-0.57.1-5 on branch FC-5 from gdeskcal-0.57.1-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	10 Apr 2006 10:40:41 -0000	1.5
+++ import.log	10 Apr 2006 10:42:39 -0000	1.6
@@ -2,3 +2,4 @@
 gdeskcal-0_57_1-0_fdr_2_1:HEAD:gdeskcal-0.57.1-0.fdr.2.1.src.rpm:1099887763
 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



From fedora-extras-commits at redhat.com  Mon Apr 10 10:42:40 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Mon, 10 Apr 2006 03:42:40 -0700
Subject: rpms/gdeskcal/FC-5 gdeskcal.spec,1.8,1.9
Message-ID: <200604101042.k3AAggm3023994@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gdeskcal/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23959/FC-5

Modified Files:
	gdeskcal.spec 
Log Message:
auto-import gdeskcal-0.57.1-5 on branch FC-5 from gdeskcal-0.57.1-5.src.rpm


Index: gdeskcal.spec
===================================================================
RCS file: /cvs/extras/rpms/gdeskcal/FC-5/gdeskcal.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gdeskcal.spec	2 Mar 2006 21:29:10 -0000	1.8
+++ gdeskcal.spec	10 Apr 2006 10:42:40 -0000	1.9
@@ -1,9 +1,7 @@
 Name:           gdeskcal
 Version:        0.57.1
-Release:        4
-
+Release:        5%{?dist}
 Summary:        Eye-candy calendar for your desktop
-
 Group:          User Interface/Desktops
 License:        GPL
 URL:            http://www.pycage.de/software_gdeskcal.html
@@ -26,22 +24,13 @@
 
 
 %prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
-
 %setup -q -n gDeskCal-%{version}
 
-
 %build
 
 
 %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}/
@@ -72,6 +61,10 @@
 
 
 %changelog
+* Fri Apr 7 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.5.7.1-5
+- rebuilt
+- minor spec changes
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 



From fedora-extras-commits at redhat.com  Mon Apr 10 10:45:11 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Mon, 10 Apr 2006 03:45:11 -0700
Subject: owners owners.list,1.824,1.825
Message-ID: <200604101045.k3AAjEMt024153@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24131

Modified Files:
	owners.list 
Log Message:

	owners.list 



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.824
retrieving revision 1.825
diff -u -r1.824 -r1.825
--- owners.list	10 Apr 2006 10:35:13 -0000	1.824
+++ owners.list	10 Apr 2006 10:45:11 -0000	1.825
@@ -306,7 +306,7 @@
 Fedora Extras|gcombust|Powerful GTK+ front-end for mkisofs and cdrecord|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 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|gdeskcal|Eye-candy calendar for your desktop.|extras-orphan at fedoraproject.org|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|luya256 at yahoo.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdl|GNU Data Language|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|gdome2|DOM level 2 library for accessing XML files|ville.skytta at iki.fi|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Apr 10 11:18:35 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Mon, 10 Apr 2006 04:18:35 -0700
Subject: rpms/gonvert/FC-5 gonvert.glade, NONE, 1.1 .cvsignore, 1.5,
	1.6 gonvert.spec, 1.7, 1.8 sources, 1.5, 1.6
Message-ID: <200604101119.k3ABJ8cS026711@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gonvert/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26671/FC-5

Modified Files:
	.cvsignore gonvert.spec sources 
Added Files:
	gonvert.glade 
Log Message:
auto-import gonvert-0.2.15-1 on branch FC-5 from gonvert-0.2.15-1.src.rpm


--- NEW FILE gonvert.glade ---
<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">

<glade-interface>

<widget class="GtkWindow" id="app1">
  <property name="visible">True</property>
  <property name="title" translatable="yes">window1</property>
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
  <property name="window_position">GTK_WIN_POS_NONE</property>
  <property name="modal">False</property>
  <property name="resizable">True</property>
  <property name="destroy_with_parent">False</property>
  <property name="decorated">True</property>
  <property name="skip_taskbar_hint">False</property>
  <property name="skip_pager_hint">False</property>
  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
  <signal name="destroy" handler="on_app1_destroy"/>
  <signal name="size_allocate" handler="on_app1_size_allocate" last_modification_time="Sat, 03 Jul 2004 00:43:38 GMT"/>

  <child>
    <widget class="GtkVBox" id="vbox2">
      <property name="visible">True</property>
      <property name="homogeneous">False</property>
      <property name="spacing">0</property>

      <child>
	<widget class="GtkMenuBar" id="menubar1">
	  <property name="visible">True</property>

	  <child>
	    <widget class="GtkMenuItem" id="file1">
	      <property name="visible">True</property>
	      <property name="label" translatable="yes">_File</property>
	      <property name="use_underline">True</property>

	      <child>
		<widget class="GtkMenu" id="file1_menu">

		  <child>
		    <widget class="GtkMenuItem" id="exit1">
		      <property name="visible">True</property>
		      <property name="label" translatable="yes">_Exit</property>
		      <property name="use_underline">True</property>
		      <signal name="activate" handler="on_exit1_activate"/>
		      <accelerator key="q" modifiers="GDK_CONTROL_MASK" signal="activate"/>
		    </widget>
		  </child>
		</widget>
	      </child>
	    </widget>
	  </child>

	  <child>
	    <widget class="GtkMenuItem" id="tools1">
	      <property name="visible">True</property>
	      <property name="label" translatable="yes">_Tools</property>
	      <property name="use_underline">True</property>

	      <child>
		<widget class="GtkMenu" id="tools1_menu">

		  <child>
		    <widget class="GtkCheckMenuItem" id="edit_shortlist1">
		      <property name="visible">True</property>
		      <property name="tooltip" translatable="yes">Show shortlist selections</property>
		      <property name="label" translatable="yes">_Edit shortlist</property>
		      <property name="use_underline">True</property>
		      <property name="active">False</property>
		      <signal name="activate" handler="on_edit_shortlist1_activate" last_modification_time="Fri, 27 May 2005 01:07:57 GMT"/>
		    </widget>
		  </child>

		  <child>
		    <widget class="GtkMenuItem" id="clear_selections1">
		      <property name="visible">True</property>
		      <property name="tooltip" translatable="yes">Clear saved selections</property>
		      <property name="label" translatable="yes">_Clear selections</property>
		      <property name="use_underline">True</property>
		      <signal name="activate" handler="on_clear_selections1_activate" last_modification_time="Sun, 20 Jun 2004 15:41:04 GMT"/>
		    </widget>
		  </child>

		  <child>
		    <widget class="GtkMenuItem" id="write_units1">
		      <property name="visible">True</property>
		      <property name="tooltip" translatable="yes">Writes all categories and units to STDOUT</property>
		      <property name="label" translatable="yes">_Write Units</property>
		      <property name="use_underline">True</property>
		      <signal name="activate" handler="on_write_units1_activate"/>
		    </widget>
		  </child>
		</widget>
	      </child>
	    </widget>
	  </child>

	  <child>
	    <widget class="GtkMenuItem" id="help1">
	      <property name="visible">True</property>
	      <property name="label" translatable="yes">_Help</property>
	      <property name="use_underline">True</property>

	      <child>
		<widget class="GtkMenu" id="help1_menu">

		  <child>
		    <widget class="GtkMenuItem" id="about1">
		      <property name="visible">True</property>
		      <property name="label" translatable="yes">_About</property>
		      <property name="use_underline">True</property>
		      <signal name="activate" handler="on_about1_activate"/>
		    </widget>
		  </child>
		</widget>
	      </child>
	    </widget>
	  </child>
	</widget>
	<packing>
	  <property name="padding">0</property>
	  <property name="expand">False</property>
	  <property name="fill">False</property>
	</packing>
      </child>

      <child>
	<widget class="GtkHPaned" id="hpaned1">
	  <property name="visible">True</property>
	  <property name="can_focus">True</property>
	  <property name="position">0</property>

	  <child>
	    <widget class="GtkScrolledWindow" id="scrolledwindow4">
	      <property name="width_request">223</property>
	      <property name="visible">True</property>
	      <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
	      <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
	      <property name="shadow_type">GTK_SHADOW_IN</property>
	      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>

	      <child>
		<widget class="GtkTreeView" id="cat_clist">
		  <property name="width_request">200</property>
		  <property name="visible">True</property>
		  <property name="can_focus">True</property>
		  <property name="headers_visible">False</property>
		  <property name="rules_hint">False</property>
		  <property name="reorderable">False</property>
		  <property name="enable_search">True</property>
		  <signal name="cursor_changed" handler="on_cat_clist_select_row" last_modification_time="Wed, 19 Feb 2003 00:08:35 GMT"/>
		</widget>
	      </child>
	    </widget>
	    <packing>
	      <property name="shrink">False</property>
	      <property name="resize">False</property>
	    </packing>
	  </child>

	  <child>
	    <widget class="GtkVBox" id="vbox1">
	      <property name="visible">True</property>
	      <property name="homogeneous">False</property>
	      <property name="spacing">0</property>

	      <child>
		<widget class="GtkHBox" id="hbox1">
		  <property name="visible">True</property>
		  <property name="homogeneous">False</property>
		  <property name="spacing">0</property>

		  <child>
		    <widget class="GtkEntry" id="entry1">
		      <property name="visible">True</property>
		      <property name="editable">False</property>
		      <property name="visibility">True</property>
		      <property name="max_length">0</property>
		      <property name="text" translatable="yes"></property>
		      <property name="has_frame">True</property>
		      <property name="invisible_char">*</property>
		      <property name="activates_default">False</property>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">True</property>
		      <property name="fill">True</property>
		    </packing>
		  </child>

		  <child>
		    <widget class="GtkEntry" id="entry2">
		      <property name="visible">True</property>
		      <property name="can_focus">True</property>
		      <property name="editable">True</property>
		      <property name="visibility">True</property>
		      <property name="max_length">0</property>
		      <property name="text" translatable="yes"></property>
		      <property name="has_frame">True</property>
		      <property name="invisible_char">*</property>
		      <property name="activates_default">False</property>
		      <signal name="changed" handler="on_entry2_changed"/>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">True</property>
		      <property name="fill">True</property>
		    </packing>
		  </child>

		  <child>
		    <widget class="GtkLabel" id="label1">
		      <property name="width_request">60</property>
		      <property name="visible">True</property>
		      <property name="label" translatable="yes"></property>
		      <property name="use_underline">False</property>
		      <property name="use_markup">False</property>
		      <property name="justify">GTK_JUSTIFY_LEFT</property>
		      <property name="wrap">False</property>
		      <property name="selectable">False</property>
		      <property name="xalign">0.10000000149</property>
		      <property name="yalign">0.5</property>
		      <property name="xpad">0</property>
		      <property name="ypad">0</property>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">False</property>
		      <property name="fill">False</property>
		    </packing>
		  </child>
		</widget>
		<packing>
		  <property name="padding">0</property>
		  <property name="expand">False</property>
		  <property name="fill">True</property>
		</packing>
	      </child>

	      <child>
		<widget class="GtkHBox" id="hbox2">
		  <property name="visible">True</property>
		  <property name="homogeneous">False</property>
		  <property name="spacing">0</property>

		  <child>
		    <widget class="GtkEntry" id="entry3">
		      <property name="visible">True</property>
		      <property name="editable">False</property>
		      <property name="visibility">True</property>
		      <property name="max_length">0</property>
		      <property name="text" translatable="yes"></property>
		      <property name="has_frame">True</property>
		      <property name="invisible_char">*</property>
		      <property name="activates_default">False</property>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">True</property>
		      <property name="fill">True</property>
		    </packing>
		  </child>

		  <child>
		    <widget class="GtkEntry" id="entry4">
		      <property name="visible">True</property>
		      <property name="can_focus">True</property>
		      <property name="editable">True</property>
		      <property name="visibility">True</property>
		      <property name="max_length">0</property>
		      <property name="text" translatable="yes"></property>
		      <property name="has_frame">True</property>
		      <property name="invisible_char">*</property>
		      <property name="activates_default">False</property>
		      <signal name="changed" handler="on_entry4_changed"/>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">True</property>
		      <property name="fill">True</property>
		    </packing>
		  </child>

		  <child>
		    <widget class="GtkLabel" id="label2">
		      <property name="width_request">60</property>
		      <property name="visible">True</property>
		      <property name="label" translatable="yes"></property>
		      <property name="use_underline">False</property>
		      <property name="use_markup">False</property>
		      <property name="justify">GTK_JUSTIFY_LEFT</property>
		      <property name="wrap">False</property>
		      <property name="selectable">False</property>
		      <property name="xalign">0.10000000149</property>
		      <property name="yalign">0.5</property>
		      <property name="xpad">0</property>
		      <property name="ypad">0</property>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">False</property>
		      <property name="fill">False</property>
		    </packing>
		  </child>
		</widget>
		<packing>
		  <property name="padding">0</property>
		  <property name="expand">False</property>
		  <property name="fill">True</property>
		</packing>
	      </child>

	      <child>
		<widget class="GtkVPaned" id="vpaned1">
		  <property name="visible">True</property>

		  <child>
		    <widget class="GtkScrolledWindow" id="scrolledwindow1">
		      <property name="height_request">300</property>
		      <property name="visible">True</property>
		      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
		      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
		      <property name="shadow_type">GTK_SHADOW_IN</property>
		      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>

		      <child>
			<widget class="GtkTreeView" id="clist1">
			  <property name="visible">True</property>
			  <property name="can_focus">True</property>
			  <property name="headers_visible">True</property>
			  <property name="rules_hint">False</property>
			  <property name="reorderable">False</property>
			  <property name="enable_search">True</property>
			  <signal name="button_release_event" handler="on_clist1_button_released" last_modification_time="Thu, 24 Jun 2004 01:11:55 GMT"/>
			  <signal name="cursor_changed" handler="on_clist1_cursor_changed" last_modification_time="Thu, 24 Jun 2004 01:11:42 GMT"/>
			</widget>
		      </child>
		    </widget>
		    <packing>
		      <property name="shrink">False</property>
		      <property name="resize">True</property>
		    </packing>
		  </child>

		  <child>
		    <widget class="GtkScrolledWindow" id="scrolledwindow3">
		      <property name="visible">True</property>
		      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
		      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
		      <property name="shadow_type">GTK_SHADOW_IN</property>
		      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>

		      <child>
			<widget class="GtkTextView" id="text1">
			  <property name="visible">True</property>
			  <property name="can_focus">True</property>
			  <property name="editable">False</property>
			  <property name="overwrite">False</property>
			  <property name="accepts_tab">True</property>
			  <property name="justification">GTK_JUSTIFY_LEFT</property>
			  <property name="wrap_mode">GTK_WRAP_WORD</property>
			  <property name="cursor_visible">True</property>
			  <property name="pixels_above_lines">0</property>
			  <property name="pixels_below_lines">0</property>
			  <property name="pixels_inside_wrap">0</property>
			  <property name="left_margin">0</property>
			  <property name="right_margin">0</property>
			  <property name="indent">0</property>
			  <property name="text" translatable="yes"></property>
			</widget>
		      </child>
		    </widget>
		    <packing>
		      <property name="shrink">False</property>
		      <property name="resize">False</property>
		    </packing>
		  </child>
		</widget>
		<packing>
		  <property name="padding">0</property>
		  <property name="expand">True</property>
		  <property name="fill">True</property>
		</packing>
	      </child>

	      <child>
		<widget class="GtkHBox" id="hbox3">
		  <property name="visible">True</property>
		  <property name="homogeneous">False</property>
		  <property name="spacing">0</property>

		  <child>
		    <widget class="GtkEntry" id="find_entry">
		      <property name="visible">True</property>
		      <property name="tooltip" translatable="yes">Enter unit to find here</property>
		      <property name="can_focus">True</property>
		      <property name="editable">True</property>
		      <property name="visibility">True</property>
		      <property name="max_length">0</property>
		      <property name="text" translatable="yes"></property>
		      <property name="has_frame">True</property>
		      <property name="invisible_char">*</property>
		      <property name="activates_default">False</property>
		      <signal name="key_press_event" handler="on_find_entry_key_press_event"/>
		      <signal name="changed" handler="on_find_entry_changed"/>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">False</property>
		      <property name="fill">True</property>
		    </packing>
		  </child>

		  <child>
		    <widget class="GtkButton" id="find_button">
		      <property name="visible">True</property>
		      <property name="can_focus">True</property>
		      <property name="label" translatable="yes">Find</property>
		      <property name="use_underline">True</property>
		      <property name="relief">GTK_RELIEF_NORMAL</property>
		      <property name="focus_on_click">True</property>
		      <signal name="clicked" handler="on_find_button_clicked"/>
		      <accelerator key="F6" modifiers="0" signal="clicked"/>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">False</property>
		      <property name="fill">False</property>
		    </packing>
		  </child>

		  <child>
		    <widget class="GtkLabel" id="find_label">
		      <property name="visible">True</property>
		      <property name="label" translatable="yes">Press to find text.</property>
		      <property name="use_underline">False</property>
		      <property name="use_markup">False</property>
		      <property name="justify">GTK_JUSTIFY_CENTER</property>
		      <property name="wrap">False</property>
		      <property name="selectable">False</property>
		      <property name="xalign">0.5</property>
		      <property name="yalign">0.5</property>
		      <property name="xpad">0</property>
		      <property name="ypad">0</property>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">False</property>
		      <property name="fill">False</property>
		    </packing>
		  </child>

		  <child>
		    <widget class="GtkVSeparator" id="vseparator1">
		      <property name="visible">True</property>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">False</property>
		      <property name="fill">False</property>
		    </packing>
		  </child>

		  <child>
		    <widget class="GtkCheckButton" id="shortlistcheck">
		      <property name="visible">True</property>
		      <property name="can_focus">True</property>
		      <property name="label" translatable="yes">Shortlist</property>
		      <property name="use_underline">True</property>
		      <property name="relief">GTK_RELIEF_NORMAL</property>
		      <property name="focus_on_click">True</property>
		      <property name="active">False</property>
		      <property name="inconsistent">False</property>
		      <property name="draw_indicator">True</property>
		      <signal name="toggled" handler="on_shortlistcheck_toggled" last_modification_time="Wed, 18 May 2005 23:00:18 GMT"/>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">False</property>
		      <property name="fill">False</property>
		      <property name="pack_type">GTK_PACK_END</property>
		    </packing>
		  </child>
		</widget>
		<packing>
		  <property name="padding">0</property>
		  <property name="expand">False</property>
		  <property name="fill">False</property>
		</packing>
	      </child>
	    </widget>
	    <packing>
	      <property name="shrink">False</property>
	      <property name="resize">True</property>
	    </packing>
	  </child>
	</widget>
	<packing>
	  <property name="padding">0</property>
	  <property name="expand">True</property>
	  <property name="fill">True</property>
	</packing>
      </child>
    </widget>
  </child>
</widget>

<widget class="GtkDialog" id="about_box">
  <property name="title" translatable="yes">About</property>
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
  <property name="window_position">GTK_WIN_POS_NONE</property>
  <property name="modal">False</property>
  <property name="resizable">False</property>
  <property name="destroy_with_parent">False</property>
  <property name="decorated">True</property>
  <property name="skip_taskbar_hint">False</property>
  <property name="skip_pager_hint">False</property>
  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
  <property name="has_separator">True</property>
  <signal name="delete_event" handler="on_about_close_clicked" last_modification_time="Mon, 28 Jun 2004 23:42:53 GMT"/>

  <child internal-child="vbox">
    <widget class="GtkVBox" id="dialog-vbox1">
      <property name="visible">True</property>
      <property name="homogeneous">False</property>
      <property name="spacing">0</property>

      <child internal-child="action_area">
	<widget class="GtkHButtonBox" id="dialog-action_area1">
	  <property name="visible">True</property>
	  <property name="layout_style">GTK_BUTTONBOX_END</property>

	  <child>
	    <widget class="GtkButton" id="about_close">
	      <property name="visible">True</property>
	      <property name="can_default">True</property>
	      <property name="can_focus">True</property>
	      <property name="label">gtk-close</property>
	      <property name="use_stock">True</property>
	      <property name="relief">GTK_RELIEF_NORMAL</property>
	      <property name="focus_on_click">True</property>
	      <property name="response_id">-7</property>
	      <signal name="clicked" handler="on_about_close_clicked" last_modification_time="Sat, 22 Feb 2003 14:35:51 GMT"/>
	      <accelerator key="Escape" modifiers="0" signal="clicked"/>
	    </widget>
	  </child>
	</widget>
	<packing>
	  <property name="padding">0</property>
	  <property name="expand">False</property>
	  <property name="fill">True</property>
	  <property name="pack_type">GTK_PACK_END</property>
	</packing>
      </child>

      <child>
	<widget class="GtkImage" id="about_image">
	  <property name="visible">True</property>
	  <property name="xalign">0.5</property>
	  <property name="yalign">0.5</property>
	  <property name="xpad">0</property>
	  <property name="ypad">0</property>
	</widget>
	<packing>
	  <property name="padding">0</property>
	  <property name="expand">True</property>
	  <property name="fill">True</property>
	</packing>
      </child>

      <child>
	<widget class="GtkTable" id="table1">
	  <property name="visible">True</property>
	  <property name="n_rows">3</property>
	  <property name="n_columns">2</property>
	  <property name="homogeneous">False</property>
	  <property name="row_spacing">0</property>
	  <property name="column_spacing">0</property>

	  <child>
	    <widget class="GtkLabel" id="label7">
	      <property name="visible">True</property>
	      <property name="label" translatable="yes">Version:</property>
	      <property name="use_underline">False</property>
	      <property name="use_markup">False</property>
	      <property name="justify">GTK_JUSTIFY_LEFT</property>
	      <property name="wrap">False</property>
	      <property name="selectable">False</property>
	      <property name="xalign">1</property>
	      <property name="yalign">0.5</property>
	      <property name="xpad">0</property>
	      <property name="ypad">0</property>
	    </widget>
	    <packing>
	      <property name="left_attach">0</property>
	      <property name="right_attach">1</property>
	      <property name="top_attach">0</property>
	      <property name="bottom_attach">1</property>
	      <property name="x_options">fill</property>
	      <property name="y_options"></property>
	    </packing>
	  </child>

	  <child>
	    <widget class="GtkEntry" id="versionlabel">
	      <property name="visible">True</property>
	      <property name="can_focus">True</property>
	      <property name="editable">False</property>
	      <property name="visibility">True</property>
	      <property name="max_length">0</property>
	      <property name="text" translatable="yes">x.x.x</property>
	      <property name="has_frame">True</property>
	      <property name="invisible_char">*</property>
	      <property name="activates_default">False</property>
	    </widget>
	    <packing>
	      <property name="left_attach">1</property>
	      <property name="right_attach">2</property>
	      <property name="top_attach">0</property>
	      <property name="bottom_attach">1</property>
	      <property name="y_options"></property>
	    </packing>
	  </child>

	  <child>
	    <widget class="GtkLabel" id="label5">
	      <property name="visible">True</property>
	      <property name="label" translatable="yes">Website:</property>
	      <property name="use_underline">False</property>
	      <property name="use_markup">False</property>
	      <property name="justify">GTK_JUSTIFY_LEFT</property>
	      <property name="wrap">False</property>
	      <property name="selectable">False</property>
	      <property name="xalign">1</property>
	      <property name="yalign">0.5</property>
	      <property name="xpad">0</property>
	      <property name="ypad">0</property>
	    </widget>
	    <packing>
	      <property name="left_attach">0</property>
	      <property name="right_attach">1</property>
	      <property name="top_attach">1</property>
	      <property name="bottom_attach">2</property>
	      <property name="x_options">fill</property>
	      <property name="y_options"></property>
	    </packing>
	  </child>

	  <child>
	    <widget class="GtkEntry" id="entry6">
	      <property name="width_request">363</property>
	      <property name="visible">True</property>
	      <property name="can_focus">True</property>
	      <property name="editable">False</property>
	      <property name="visibility">True</property>
	      <property name="max_length">0</property>
	      <property name="text" translatable="yes">http://unihedron.com/projects/gonvert/gonvert.php</property>
	      <property name="has_frame">True</property>
	      <property name="invisible_char">*</property>
	      <property name="activates_default">False</property>
	    </widget>
	    <packing>
	      <property name="left_attach">1</property>
	      <property name="right_attach">2</property>
	      <property name="top_attach">1</property>
	      <property name="bottom_attach">2</property>
	      <property name="y_options"></property>
	    </packing>
	  </child>

	  <child>
	    <widget class="GtkLabel" id="label6">
	      <property name="visible">True</property>
	      <property name="label" translatable="yes">Author:</property>
	      <property name="use_underline">False</property>
	      <property name="use_markup">False</property>
	      <property name="justify">GTK_JUSTIFY_LEFT</property>
	      <property name="wrap">False</property>
	      <property name="selectable">False</property>
	      <property name="xalign">1</property>
	      <property name="yalign">0.5</property>
	      <property name="xpad">0</property>
	      <property name="ypad">0</property>
	    </widget>
	    <packing>
	      <property name="left_attach">0</property>
	      <property name="right_attach">1</property>
	      <property name="top_attach">2</property>
	      <property name="bottom_attach">3</property>
	      <property name="x_options">fill</property>
	      <property name="y_options"></property>
	    </packing>
	  </child>

	  <child>
	    <widget class="GtkEntry" id="entry7">
	      <property name="visible">True</property>
	      <property name="can_focus">True</property>
	      <property name="editable">False</property>
	      <property name="visibility">True</property>
	      <property name="max_length">0</property>
	      <property name="text" translatable="yes">Anthony Tekatch    anthony at unihedron.com</property>
	      <property name="has_frame">True</property>
	      <property name="invisible_char">*</property>
	      <property name="activates_default">False</property>
	    </widget>
	    <packing>
	      <property name="left_attach">1</property>
	      <property name="right_attach">2</property>
	      <property name="top_attach">2</property>
	      <property name="bottom_attach">3</property>
	      <property name="y_options"></property>
	    </packing>
	  </child>
	</widget>
	<packing>
	  <property name="padding">0</property>
	  <property name="expand">True</property>
	  <property name="fill">True</property>
	</packing>
      </child>
    </widget>
  </child>
</widget>

<widget class="GtkDialog" id="msgbox">
  <property name="title" translatable="yes">message box</property>
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
  <property name="window_position">GTK_WIN_POS_NONE</property>
  <property name="modal">False</property>
  <property name="resizable">True</property>
  <property name="destroy_with_parent">False</property>
  <property name="decorated">True</property>
  <property name="skip_taskbar_hint">False</property>
  <property name="skip_pager_hint">False</property>
  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
  <property name="has_separator">True</property>

  <child internal-child="vbox">
    <widget class="GtkVBox" id="dialog-vbox2">
      <property name="visible">True</property>
      <property name="homogeneous">False</property>
      <property name="spacing">0</property>

      <child internal-child="action_area">
	<widget class="GtkHButtonBox" id="dialog-action_area2">
	  <property name="visible">True</property>
	  <property name="layout_style">GTK_BUTTONBOX_END</property>

	  <child>
	    <widget class="GtkButton" id="okbutton1">
	      <property name="visible">True</property>
	      <property name="can_default">True</property>
	      <property name="can_focus">True</property>
	      <property name="label">gtk-ok</property>
	      <property name="use_stock">True</property>
	      <property name="relief">GTK_RELIEF_NORMAL</property>
	      <property name="focus_on_click">True</property>
	      <property name="response_id">-5</property>
	      <signal name="clicked" handler="on_messagebox_ok_clicked" last_modification_time="Mon, 24 Feb 2003 03:40:09 GMT"/>
	      <accelerator key="Escape" modifiers="0" signal="clicked"/>
	    </widget>
	  </child>
	</widget>
	<packing>
	  <property name="padding">0</property>
	  <property name="expand">False</property>
	  <property name="fill">True</property>
	  <property name="pack_type">GTK_PACK_END</property>
	</packing>
      </child>

      <child>
	<widget class="GtkScrolledWindow" id="scrolledwindow6">
	  <property name="width_request">300</property>
	  <property name="visible">True</property>
	  <property name="can_focus">True</property>
	  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
	  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
	  <property name="shadow_type">GTK_SHADOW_NONE</property>
	  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>

	  <child>
	    <widget class="GtkTextView" id="msgboxtext">
	      <property name="visible">True</property>
	      <property name="can_focus">True</property>
	      <property name="editable">False</property>
	      <property name="overwrite">False</property>
	      <property name="accepts_tab">True</property>
	      <property name="justification">GTK_JUSTIFY_LEFT</property>
	      <property name="wrap_mode">GTK_WRAP_WORD</property>
	      <property name="cursor_visible">False</property>
	      <property name="pixels_above_lines">0</property>
	      <property name="pixels_below_lines">0</property>
	      <property name="pixels_inside_wrap">0</property>
	      <property name="left_margin">0</property>
	      <property name="right_margin">0</property>
	      <property name="indent">0</property>
	      <property name="text" translatable="yes"></property>
	    </widget>
	  </child>
	</widget>
	<packing>
	  <property name="padding">0</property>
	  <property name="expand">True</property>
	  <property name="fill">True</property>
	</packing>
      </child>
    </widget>
  </child>
</widget>

</glade-interface>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gonvert/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Nov 2004 18:35:05 -0000	1.5
+++ .cvsignore	10 Apr 2006 11:18:35 -0000	1.6
@@ -1 +1 @@
-gonvert-0.2.11.tar.gz
+gonvert-0.2.15.tar.gz


Index: gonvert.spec
===================================================================
RCS file: /cvs/extras/rpms/gonvert/FC-5/gonvert.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gonvert.spec	2 Mar 2006 21:30:03 -0000	1.7
+++ gonvert.spec	10 Apr 2006 11:18:35 -0000	1.8
@@ -1,13 +1,12 @@
 Name:           gonvert
-Version:        0.2.11
-Release:        2
-
+Version:        0.2.15
+Release:        1%{?dist}
 Summary:        Units conversion utility
-
 Group:          Applications/Engineering
 License:        GPL
 URL:            http://unihedron.com/projects/gonvert/gonvert.php
-Source0:        http://www.unihedron.com/projects/gonvert/downloads/gonvert-0.2.11.tar.gz
+Source0:        http://www.unihedron.com/projects/gonvert/downloads/%{name}-%{version}.tar.gz
+Source1:	gonvert.glade
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -25,13 +24,6 @@
 
 
 %prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
-
 %setup -q
 
 
@@ -41,18 +33,26 @@
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-%makeinstall
 
+mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
+mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/python2.4/site-packages/share/gonvert
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/gonvert
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/doc/gonvert
+
+install -m0755 %{SOURCE1} ${RPM_BUILD_ROOT}%{_libdir}/python2.4/site-packages/share/gonvert
+install -m0644 pixmaps/gonvert.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/gonvert.png
+install -m0644 pixmaps/gonvert_picture.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/gonvert_picture.png
+install -m0755 gonvert ${RPM_BUILD_ROOT}%{_bindir}/gonvert
+cp doc/* ${RPM_BUILD_ROOT}%{_datadir}/doc/gonvert
 chmod 0644 doc/*
 rm -rf ${RPM_BUILD_ROOT}%{_prefix}/doc
-
 rm -rf ${RPM_BUILD_ROOT}%{_datadir}/gnome
 desktop-file-install --vendor fedora                    \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications       \
   --add-category X-Fedora                               \
   gonvert.desktop
 
-
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -60,14 +60,20 @@
 %files
 %defattr(-,root,root,-)
 %doc doc/CHANGELOG doc/COPYING doc/FAQ doc/THANKS doc/TODO
-%{_bindir}/*
+%{_bindir}/gonvert
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/gonvert
-%{_datadir}/pixmaps/*
+%{_datadir}/pixmaps/gonvert.png
+%{_datadir}/pixmaps/gonvert_picture.png
+%{_libdir}/python2.4/site-packages/share/gonvert/gonvert.glade
 %exclude %{_docdir}/gonvert
 
 
 %changelog
+* Fri Apr 7 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.2.15-1
+- Bump to 0.2.15
+- spec file altered
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gonvert/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Nov 2004 18:35:05 -0000	1.5
+++ sources	10 Apr 2006 11:18:35 -0000	1.6
@@ -1 +1 @@
-82e9f6d52214ae37999634d818098ae0  gonvert-0.2.11.tar.gz
+f8e184cc1a77c790fcb404f3f17bebea  gonvert-0.2.15.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 11:18:35 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Mon, 10 Apr 2006 04:18:35 -0700
Subject: rpms/gonvert import.log,1.4,1.5
Message-ID: <200604101119.k3ABJ7oj026706@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gonvert
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26671

Modified Files:
	import.log 
Log Message:
auto-import gonvert-0.2.15-1 on branch FC-5 from gonvert-0.2.15-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gonvert/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- import.log	8 Nov 2004 04:30:10 -0000	1.4
+++ import.log	10 Apr 2006 11:18:34 -0000	1.5
@@ -1,3 +1,4 @@
 gonvert-0_1_6-0_fdr_2_rh90:HEAD:gonvert-0.1.6-0.fdr.2.rh90.src.rpm:1099888198
 gonvert-0_1_9-0_fdr_1_1:HEAD:gonvert-0.1.9-0.fdr.1.1.src.rpm:1099888204
 gonvert-0_2_10-0_fdr_1_2:HEAD:gonvert-0.2.10-0.fdr.1.2.src.rpm:1099888210
+gonvert-0_2_15-1:FC-5:gonvert-0.2.15-1.src.rpm:1144667901



From fedora-extras-commits at redhat.com  Mon Apr 10 11:20:16 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Mon, 10 Apr 2006 04:20:16 -0700
Subject: rpms/gonvert import.log,1.5,1.6
Message-ID: <200604101120.k3ABKICt026811@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gonvert
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26777

Modified Files:
	import.log 
Log Message:
auto-import gonvert-0.2.15-1 on branch devel from gonvert-0.2.15-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gonvert/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	10 Apr 2006 11:18:34 -0000	1.5
+++ import.log	10 Apr 2006 11:20:16 -0000	1.6
@@ -2,3 +2,4 @@
 gonvert-0_1_9-0_fdr_1_1:HEAD:gonvert-0.1.9-0.fdr.1.1.src.rpm:1099888204
 gonvert-0_2_10-0_fdr_1_2:HEAD:gonvert-0.2.10-0.fdr.1.2.src.rpm:1099888210
 gonvert-0_2_15-1:FC-5:gonvert-0.2.15-1.src.rpm:1144667901
+gonvert-0_2_15-1:HEAD:gonvert-0.2.15-1.src.rpm:1144668002



From fedora-extras-commits at redhat.com  Mon Apr 10 11:20:17 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Mon, 10 Apr 2006 04:20:17 -0700
Subject: rpms/gonvert/devel gonvert.glade, NONE, 1.1 .cvsignore, 1.5,
	1.6 gonvert.spec, 1.7, 1.8 sources, 1.5, 1.6
Message-ID: <200604101120.k3ABKJLY026817@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/gonvert/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26777/devel

Modified Files:
	.cvsignore gonvert.spec sources 
Added Files:
	gonvert.glade 
Log Message:
auto-import gonvert-0.2.15-1 on branch devel from gonvert-0.2.15-1.src.rpm


--- NEW FILE gonvert.glade ---
<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">

<glade-interface>

<widget class="GtkWindow" id="app1">
  <property name="visible">True</property>
  <property name="title" translatable="yes">window1</property>
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
  <property name="window_position">GTK_WIN_POS_NONE</property>
  <property name="modal">False</property>
  <property name="resizable">True</property>
  <property name="destroy_with_parent">False</property>
  <property name="decorated">True</property>
  <property name="skip_taskbar_hint">False</property>
  <property name="skip_pager_hint">False</property>
  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
  <signal name="destroy" handler="on_app1_destroy"/>
  <signal name="size_allocate" handler="on_app1_size_allocate" last_modification_time="Sat, 03 Jul 2004 00:43:38 GMT"/>

  <child>
    <widget class="GtkVBox" id="vbox2">
      <property name="visible">True</property>
      <property name="homogeneous">False</property>
      <property name="spacing">0</property>

      <child>
	<widget class="GtkMenuBar" id="menubar1">
	  <property name="visible">True</property>

	  <child>
	    <widget class="GtkMenuItem" id="file1">
	      <property name="visible">True</property>
	      <property name="label" translatable="yes">_File</property>
	      <property name="use_underline">True</property>

	      <child>
		<widget class="GtkMenu" id="file1_menu">

		  <child>
		    <widget class="GtkMenuItem" id="exit1">
		      <property name="visible">True</property>
		      <property name="label" translatable="yes">_Exit</property>
		      <property name="use_underline">True</property>
		      <signal name="activate" handler="on_exit1_activate"/>
		      <accelerator key="q" modifiers="GDK_CONTROL_MASK" signal="activate"/>
		    </widget>
		  </child>
		</widget>
	      </child>
	    </widget>
	  </child>

	  <child>
	    <widget class="GtkMenuItem" id="tools1">
	      <property name="visible">True</property>
	      <property name="label" translatable="yes">_Tools</property>
	      <property name="use_underline">True</property>

	      <child>
		<widget class="GtkMenu" id="tools1_menu">

		  <child>
		    <widget class="GtkCheckMenuItem" id="edit_shortlist1">
		      <property name="visible">True</property>
		      <property name="tooltip" translatable="yes">Show shortlist selections</property>
		      <property name="label" translatable="yes">_Edit shortlist</property>
		      <property name="use_underline">True</property>
		      <property name="active">False</property>
		      <signal name="activate" handler="on_edit_shortlist1_activate" last_modification_time="Fri, 27 May 2005 01:07:57 GMT"/>
		    </widget>
		  </child>

		  <child>
		    <widget class="GtkMenuItem" id="clear_selections1">
		      <property name="visible">True</property>
		      <property name="tooltip" translatable="yes">Clear saved selections</property>
		      <property name="label" translatable="yes">_Clear selections</property>
		      <property name="use_underline">True</property>
		      <signal name="activate" handler="on_clear_selections1_activate" last_modification_time="Sun, 20 Jun 2004 15:41:04 GMT"/>
		    </widget>
		  </child>

		  <child>
		    <widget class="GtkMenuItem" id="write_units1">
		      <property name="visible">True</property>
		      <property name="tooltip" translatable="yes">Writes all categories and units to STDOUT</property>
		      <property name="label" translatable="yes">_Write Units</property>
		      <property name="use_underline">True</property>
		      <signal name="activate" handler="on_write_units1_activate"/>
		    </widget>
		  </child>
		</widget>
	      </child>
	    </widget>
	  </child>

	  <child>
	    <widget class="GtkMenuItem" id="help1">
	      <property name="visible">True</property>
	      <property name="label" translatable="yes">_Help</property>
	      <property name="use_underline">True</property>

	      <child>
		<widget class="GtkMenu" id="help1_menu">

		  <child>
		    <widget class="GtkMenuItem" id="about1">
		      <property name="visible">True</property>
		      <property name="label" translatable="yes">_About</property>
		      <property name="use_underline">True</property>
		      <signal name="activate" handler="on_about1_activate"/>
		    </widget>
		  </child>
		</widget>
	      </child>
	    </widget>
	  </child>
	</widget>
	<packing>
	  <property name="padding">0</property>
	  <property name="expand">False</property>
	  <property name="fill">False</property>
	</packing>
      </child>

      <child>
	<widget class="GtkHPaned" id="hpaned1">
	  <property name="visible">True</property>
	  <property name="can_focus">True</property>
	  <property name="position">0</property>

	  <child>
	    <widget class="GtkScrolledWindow" id="scrolledwindow4">
	      <property name="width_request">223</property>
	      <property name="visible">True</property>
	      <property name="hscrollbar_policy">GTK_POLICY_ALWAYS</property>
	      <property name="vscrollbar_policy">GTK_POLICY_ALWAYS</property>
	      <property name="shadow_type">GTK_SHADOW_IN</property>
	      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>

	      <child>
		<widget class="GtkTreeView" id="cat_clist">
		  <property name="width_request">200</property>
		  <property name="visible">True</property>
		  <property name="can_focus">True</property>
		  <property name="headers_visible">False</property>
		  <property name="rules_hint">False</property>
		  <property name="reorderable">False</property>
		  <property name="enable_search">True</property>
		  <signal name="cursor_changed" handler="on_cat_clist_select_row" last_modification_time="Wed, 19 Feb 2003 00:08:35 GMT"/>
		</widget>
	      </child>
	    </widget>
	    <packing>
	      <property name="shrink">False</property>
	      <property name="resize">False</property>
	    </packing>
	  </child>

	  <child>
	    <widget class="GtkVBox" id="vbox1">
	      <property name="visible">True</property>
	      <property name="homogeneous">False</property>
	      <property name="spacing">0</property>

	      <child>
		<widget class="GtkHBox" id="hbox1">
		  <property name="visible">True</property>
		  <property name="homogeneous">False</property>
		  <property name="spacing">0</property>

		  <child>
		    <widget class="GtkEntry" id="entry1">
		      <property name="visible">True</property>
		      <property name="editable">False</property>
		      <property name="visibility">True</property>
		      <property name="max_length">0</property>
		      <property name="text" translatable="yes"></property>
		      <property name="has_frame">True</property>
		      <property name="invisible_char">*</property>
		      <property name="activates_default">False</property>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">True</property>
		      <property name="fill">True</property>
		    </packing>
		  </child>

		  <child>
		    <widget class="GtkEntry" id="entry2">
		      <property name="visible">True</property>
		      <property name="can_focus">True</property>
		      <property name="editable">True</property>
		      <property name="visibility">True</property>
		      <property name="max_length">0</property>
		      <property name="text" translatable="yes"></property>
		      <property name="has_frame">True</property>
		      <property name="invisible_char">*</property>
		      <property name="activates_default">False</property>
		      <signal name="changed" handler="on_entry2_changed"/>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">True</property>
		      <property name="fill">True</property>
		    </packing>
		  </child>

		  <child>
		    <widget class="GtkLabel" id="label1">
		      <property name="width_request">60</property>
		      <property name="visible">True</property>
		      <property name="label" translatable="yes"></property>
		      <property name="use_underline">False</property>
		      <property name="use_markup">False</property>
		      <property name="justify">GTK_JUSTIFY_LEFT</property>
		      <property name="wrap">False</property>
		      <property name="selectable">False</property>
		      <property name="xalign">0.10000000149</property>
		      <property name="yalign">0.5</property>
		      <property name="xpad">0</property>
		      <property name="ypad">0</property>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">False</property>
		      <property name="fill">False</property>
		    </packing>
		  </child>
		</widget>
		<packing>
		  <property name="padding">0</property>
		  <property name="expand">False</property>
		  <property name="fill">True</property>
		</packing>
	      </child>

	      <child>
		<widget class="GtkHBox" id="hbox2">
		  <property name="visible">True</property>
		  <property name="homogeneous">False</property>
		  <property name="spacing">0</property>

		  <child>
		    <widget class="GtkEntry" id="entry3">
		      <property name="visible">True</property>
		      <property name="editable">False</property>
		      <property name="visibility">True</property>
		      <property name="max_length">0</property>
		      <property name="text" translatable="yes"></property>
		      <property name="has_frame">True</property>
		      <property name="invisible_char">*</property>
		      <property name="activates_default">False</property>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">True</property>
		      <property name="fill">True</property>
		    </packing>
		  </child>

		  <child>
		    <widget class="GtkEntry" id="entry4">
		      <property name="visible">True</property>
		      <property name="can_focus">True</property>
		      <property name="editable">True</property>
		      <property name="visibility">True</property>
		      <property name="max_length">0</property>
		      <property name="text" translatable="yes"></property>
		      <property name="has_frame">True</property>
		      <property name="invisible_char">*</property>
		      <property name="activates_default">False</property>
		      <signal name="changed" handler="on_entry4_changed"/>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">True</property>
		      <property name="fill">True</property>
		    </packing>
		  </child>

		  <child>
		    <widget class="GtkLabel" id="label2">
		      <property name="width_request">60</property>
		      <property name="visible">True</property>
		      <property name="label" translatable="yes"></property>
		      <property name="use_underline">False</property>
		      <property name="use_markup">False</property>
		      <property name="justify">GTK_JUSTIFY_LEFT</property>
		      <property name="wrap">False</property>
		      <property name="selectable">False</property>
		      <property name="xalign">0.10000000149</property>
		      <property name="yalign">0.5</property>
		      <property name="xpad">0</property>
		      <property name="ypad">0</property>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">False</property>
		      <property name="fill">False</property>
		    </packing>
		  </child>
		</widget>
		<packing>
		  <property name="padding">0</property>
		  <property name="expand">False</property>
		  <property name="fill">True</property>
		</packing>
	      </child>

	      <child>
		<widget class="GtkVPaned" id="vpaned1">
		  <property name="visible">True</property>

		  <child>
		    <widget class="GtkScrolledWindow" id="scrolledwindow1">
		      <property name="height_request">300</property>
		      <property name="visible">True</property>
		      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
		      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
		      <property name="shadow_type">GTK_SHADOW_IN</property>
		      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>

		      <child>
			<widget class="GtkTreeView" id="clist1">
			  <property name="visible">True</property>
			  <property name="can_focus">True</property>
			  <property name="headers_visible">True</property>
			  <property name="rules_hint">False</property>
			  <property name="reorderable">False</property>
			  <property name="enable_search">True</property>
			  <signal name="button_release_event" handler="on_clist1_button_released" last_modification_time="Thu, 24 Jun 2004 01:11:55 GMT"/>
			  <signal name="cursor_changed" handler="on_clist1_cursor_changed" last_modification_time="Thu, 24 Jun 2004 01:11:42 GMT"/>
			</widget>
		      </child>
		    </widget>
		    <packing>
		      <property name="shrink">False</property>
		      <property name="resize">True</property>
		    </packing>
		  </child>

		  <child>
		    <widget class="GtkScrolledWindow" id="scrolledwindow3">
		      <property name="visible">True</property>
		      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
		      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
		      <property name="shadow_type">GTK_SHADOW_IN</property>
		      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>

		      <child>
			<widget class="GtkTextView" id="text1">
			  <property name="visible">True</property>
			  <property name="can_focus">True</property>
			  <property name="editable">False</property>
			  <property name="overwrite">False</property>
			  <property name="accepts_tab">True</property>
			  <property name="justification">GTK_JUSTIFY_LEFT</property>
			  <property name="wrap_mode">GTK_WRAP_WORD</property>
			  <property name="cursor_visible">True</property>
			  <property name="pixels_above_lines">0</property>
			  <property name="pixels_below_lines">0</property>
			  <property name="pixels_inside_wrap">0</property>
			  <property name="left_margin">0</property>
			  <property name="right_margin">0</property>
			  <property name="indent">0</property>
			  <property name="text" translatable="yes"></property>
			</widget>
		      </child>
		    </widget>
		    <packing>
		      <property name="shrink">False</property>
		      <property name="resize">False</property>
		    </packing>
		  </child>
		</widget>
		<packing>
		  <property name="padding">0</property>
		  <property name="expand">True</property>
		  <property name="fill">True</property>
		</packing>
	      </child>

	      <child>
		<widget class="GtkHBox" id="hbox3">
		  <property name="visible">True</property>
		  <property name="homogeneous">False</property>
		  <property name="spacing">0</property>

		  <child>
		    <widget class="GtkEntry" id="find_entry">
		      <property name="visible">True</property>
		      <property name="tooltip" translatable="yes">Enter unit to find here</property>
		      <property name="can_focus">True</property>
		      <property name="editable">True</property>
		      <property name="visibility">True</property>
		      <property name="max_length">0</property>
		      <property name="text" translatable="yes"></property>
		      <property name="has_frame">True</property>
		      <property name="invisible_char">*</property>
		      <property name="activates_default">False</property>
		      <signal name="key_press_event" handler="on_find_entry_key_press_event"/>
		      <signal name="changed" handler="on_find_entry_changed"/>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">False</property>
		      <property name="fill">True</property>
		    </packing>
		  </child>

		  <child>
		    <widget class="GtkButton" id="find_button">
		      <property name="visible">True</property>
		      <property name="can_focus">True</property>
		      <property name="label" translatable="yes">Find</property>
		      <property name="use_underline">True</property>
		      <property name="relief">GTK_RELIEF_NORMAL</property>
		      <property name="focus_on_click">True</property>
		      <signal name="clicked" handler="on_find_button_clicked"/>
		      <accelerator key="F6" modifiers="0" signal="clicked"/>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">False</property>
		      <property name="fill">False</property>
		    </packing>
		  </child>

		  <child>
		    <widget class="GtkLabel" id="find_label">
		      <property name="visible">True</property>
		      <property name="label" translatable="yes">Press to find text.</property>
		      <property name="use_underline">False</property>
		      <property name="use_markup">False</property>
		      <property name="justify">GTK_JUSTIFY_CENTER</property>
		      <property name="wrap">False</property>
		      <property name="selectable">False</property>
		      <property name="xalign">0.5</property>
		      <property name="yalign">0.5</property>
		      <property name="xpad">0</property>
		      <property name="ypad">0</property>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">False</property>
		      <property name="fill">False</property>
		    </packing>
		  </child>

		  <child>
		    <widget class="GtkVSeparator" id="vseparator1">
		      <property name="visible">True</property>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">False</property>
		      <property name="fill">False</property>
		    </packing>
		  </child>

		  <child>
		    <widget class="GtkCheckButton" id="shortlistcheck">
		      <property name="visible">True</property>
		      <property name="can_focus">True</property>
		      <property name="label" translatable="yes">Shortlist</property>
		      <property name="use_underline">True</property>
		      <property name="relief">GTK_RELIEF_NORMAL</property>
		      <property name="focus_on_click">True</property>
		      <property name="active">False</property>
		      <property name="inconsistent">False</property>
		      <property name="draw_indicator">True</property>
		      <signal name="toggled" handler="on_shortlistcheck_toggled" last_modification_time="Wed, 18 May 2005 23:00:18 GMT"/>
		    </widget>
		    <packing>
		      <property name="padding">0</property>
		      <property name="expand">False</property>
		      <property name="fill">False</property>
		      <property name="pack_type">GTK_PACK_END</property>
		    </packing>
		  </child>
		</widget>
		<packing>
		  <property name="padding">0</property>
		  <property name="expand">False</property>
		  <property name="fill">False</property>
		</packing>
	      </child>
	    </widget>
	    <packing>
	      <property name="shrink">False</property>
	      <property name="resize">True</property>
	    </packing>
	  </child>
	</widget>
	<packing>
	  <property name="padding">0</property>
	  <property name="expand">True</property>
	  <property name="fill">True</property>
	</packing>
      </child>
    </widget>
  </child>
</widget>

<widget class="GtkDialog" id="about_box">
  <property name="title" translatable="yes">About</property>
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
  <property name="window_position">GTK_WIN_POS_NONE</property>
  <property name="modal">False</property>
  <property name="resizable">False</property>
  <property name="destroy_with_parent">False</property>
  <property name="decorated">True</property>
  <property name="skip_taskbar_hint">False</property>
  <property name="skip_pager_hint">False</property>
  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
  <property name="has_separator">True</property>
  <signal name="delete_event" handler="on_about_close_clicked" last_modification_time="Mon, 28 Jun 2004 23:42:53 GMT"/>

  <child internal-child="vbox">
    <widget class="GtkVBox" id="dialog-vbox1">
      <property name="visible">True</property>
      <property name="homogeneous">False</property>
      <property name="spacing">0</property>

      <child internal-child="action_area">
	<widget class="GtkHButtonBox" id="dialog-action_area1">
	  <property name="visible">True</property>
	  <property name="layout_style">GTK_BUTTONBOX_END</property>

	  <child>
	    <widget class="GtkButton" id="about_close">
	      <property name="visible">True</property>
	      <property name="can_default">True</property>
	      <property name="can_focus">True</property>
	      <property name="label">gtk-close</property>
	      <property name="use_stock">True</property>
	      <property name="relief">GTK_RELIEF_NORMAL</property>
	      <property name="focus_on_click">True</property>
	      <property name="response_id">-7</property>
	      <signal name="clicked" handler="on_about_close_clicked" last_modification_time="Sat, 22 Feb 2003 14:35:51 GMT"/>
	      <accelerator key="Escape" modifiers="0" signal="clicked"/>
	    </widget>
	  </child>
	</widget>
	<packing>
	  <property name="padding">0</property>
	  <property name="expand">False</property>
	  <property name="fill">True</property>
	  <property name="pack_type">GTK_PACK_END</property>
	</packing>
      </child>

      <child>
	<widget class="GtkImage" id="about_image">
	  <property name="visible">True</property>
	  <property name="xalign">0.5</property>
	  <property name="yalign">0.5</property>
	  <property name="xpad">0</property>
	  <property name="ypad">0</property>
	</widget>
	<packing>
	  <property name="padding">0</property>
	  <property name="expand">True</property>
	  <property name="fill">True</property>
	</packing>
      </child>

      <child>
	<widget class="GtkTable" id="table1">
	  <property name="visible">True</property>
	  <property name="n_rows">3</property>
	  <property name="n_columns">2</property>
	  <property name="homogeneous">False</property>
	  <property name="row_spacing">0</property>
	  <property name="column_spacing">0</property>

	  <child>
	    <widget class="GtkLabel" id="label7">
	      <property name="visible">True</property>
	      <property name="label" translatable="yes">Version:</property>
	      <property name="use_underline">False</property>
	      <property name="use_markup">False</property>
	      <property name="justify">GTK_JUSTIFY_LEFT</property>
	      <property name="wrap">False</property>
	      <property name="selectable">False</property>
	      <property name="xalign">1</property>
	      <property name="yalign">0.5</property>
	      <property name="xpad">0</property>
	      <property name="ypad">0</property>
	    </widget>
	    <packing>
	      <property name="left_attach">0</property>
	      <property name="right_attach">1</property>
	      <property name="top_attach">0</property>
	      <property name="bottom_attach">1</property>
	      <property name="x_options">fill</property>
	      <property name="y_options"></property>
	    </packing>
	  </child>

	  <child>
	    <widget class="GtkEntry" id="versionlabel">
	      <property name="visible">True</property>
	      <property name="can_focus">True</property>
	      <property name="editable">False</property>
	      <property name="visibility">True</property>
	      <property name="max_length">0</property>
	      <property name="text" translatable="yes">x.x.x</property>
	      <property name="has_frame">True</property>
	      <property name="invisible_char">*</property>
	      <property name="activates_default">False</property>
	    </widget>
	    <packing>
	      <property name="left_attach">1</property>
	      <property name="right_attach">2</property>
	      <property name="top_attach">0</property>
	      <property name="bottom_attach">1</property>
	      <property name="y_options"></property>
	    </packing>
	  </child>

	  <child>
	    <widget class="GtkLabel" id="label5">
	      <property name="visible">True</property>
	      <property name="label" translatable="yes">Website:</property>
	      <property name="use_underline">False</property>
	      <property name="use_markup">False</property>
	      <property name="justify">GTK_JUSTIFY_LEFT</property>
	      <property name="wrap">False</property>
	      <property name="selectable">False</property>
	      <property name="xalign">1</property>
	      <property name="yalign">0.5</property>
	      <property name="xpad">0</property>
	      <property name="ypad">0</property>
	    </widget>
	    <packing>
	      <property name="left_attach">0</property>
	      <property name="right_attach">1</property>
	      <property name="top_attach">1</property>
	      <property name="bottom_attach">2</property>
	      <property name="x_options">fill</property>
	      <property name="y_options"></property>
	    </packing>
	  </child>

	  <child>
	    <widget class="GtkEntry" id="entry6">
	      <property name="width_request">363</property>
	      <property name="visible">True</property>
	      <property name="can_focus">True</property>
	      <property name="editable">False</property>
	      <property name="visibility">True</property>
	      <property name="max_length">0</property>
	      <property name="text" translatable="yes">http://unihedron.com/projects/gonvert/gonvert.php</property>
	      <property name="has_frame">True</property>
	      <property name="invisible_char">*</property>
	      <property name="activates_default">False</property>
	    </widget>
	    <packing>
	      <property name="left_attach">1</property>
	      <property name="right_attach">2</property>
	      <property name="top_attach">1</property>
	      <property name="bottom_attach">2</property>
	      <property name="y_options"></property>
	    </packing>
	  </child>

	  <child>
	    <widget class="GtkLabel" id="label6">
	      <property name="visible">True</property>
	      <property name="label" translatable="yes">Author:</property>
	      <property name="use_underline">False</property>
	      <property name="use_markup">False</property>
	      <property name="justify">GTK_JUSTIFY_LEFT</property>
	      <property name="wrap">False</property>
	      <property name="selectable">False</property>
	      <property name="xalign">1</property>
	      <property name="yalign">0.5</property>
	      <property name="xpad">0</property>
	      <property name="ypad">0</property>
	    </widget>
	    <packing>
	      <property name="left_attach">0</property>
	      <property name="right_attach">1</property>
	      <property name="top_attach">2</property>
	      <property name="bottom_attach">3</property>
	      <property name="x_options">fill</property>
	      <property name="y_options"></property>
	    </packing>
	  </child>

	  <child>
	    <widget class="GtkEntry" id="entry7">
	      <property name="visible">True</property>
	      <property name="can_focus">True</property>
	      <property name="editable">False</property>
	      <property name="visibility">True</property>
	      <property name="max_length">0</property>
	      <property name="text" translatable="yes">Anthony Tekatch    anthony at unihedron.com</property>
	      <property name="has_frame">True</property>
	      <property name="invisible_char">*</property>
	      <property name="activates_default">False</property>
	    </widget>
	    <packing>
	      <property name="left_attach">1</property>
	      <property name="right_attach">2</property>
	      <property name="top_attach">2</property>
	      <property name="bottom_attach">3</property>
	      <property name="y_options"></property>
	    </packing>
	  </child>
	</widget>
	<packing>
	  <property name="padding">0</property>
	  <property name="expand">True</property>
	  <property name="fill">True</property>
	</packing>
      </child>
    </widget>
  </child>
</widget>

<widget class="GtkDialog" id="msgbox">
  <property name="title" translatable="yes">message box</property>
  <property name="type">GTK_WINDOW_TOPLEVEL</property>
  <property name="window_position">GTK_WIN_POS_NONE</property>
  <property name="modal">False</property>
  <property name="resizable">True</property>
  <property name="destroy_with_parent">False</property>
  <property name="decorated">True</property>
  <property name="skip_taskbar_hint">False</property>
  <property name="skip_pager_hint">False</property>
  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
  <property name="has_separator">True</property>

  <child internal-child="vbox">
    <widget class="GtkVBox" id="dialog-vbox2">
      <property name="visible">True</property>
      <property name="homogeneous">False</property>
      <property name="spacing">0</property>

      <child internal-child="action_area">
	<widget class="GtkHButtonBox" id="dialog-action_area2">
	  <property name="visible">True</property>
	  <property name="layout_style">GTK_BUTTONBOX_END</property>

	  <child>
	    <widget class="GtkButton" id="okbutton1">
	      <property name="visible">True</property>
	      <property name="can_default">True</property>
	      <property name="can_focus">True</property>
	      <property name="label">gtk-ok</property>
	      <property name="use_stock">True</property>
	      <property name="relief">GTK_RELIEF_NORMAL</property>
	      <property name="focus_on_click">True</property>
	      <property name="response_id">-5</property>
	      <signal name="clicked" handler="on_messagebox_ok_clicked" last_modification_time="Mon, 24 Feb 2003 03:40:09 GMT"/>
	      <accelerator key="Escape" modifiers="0" signal="clicked"/>
	    </widget>
	  </child>
	</widget>
	<packing>
	  <property name="padding">0</property>
	  <property name="expand">False</property>
	  <property name="fill">True</property>
	  <property name="pack_type">GTK_PACK_END</property>
	</packing>
      </child>

      <child>
	<widget class="GtkScrolledWindow" id="scrolledwindow6">
	  <property name="width_request">300</property>
	  <property name="visible">True</property>
	  <property name="can_focus">True</property>
	  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
	  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
	  <property name="shadow_type">GTK_SHADOW_NONE</property>
	  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>

	  <child>
	    <widget class="GtkTextView" id="msgboxtext">
	      <property name="visible">True</property>
	      <property name="can_focus">True</property>
	      <property name="editable">False</property>
	      <property name="overwrite">False</property>
	      <property name="accepts_tab">True</property>
	      <property name="justification">GTK_JUSTIFY_LEFT</property>
	      <property name="wrap_mode">GTK_WRAP_WORD</property>
	      <property name="cursor_visible">False</property>
	      <property name="pixels_above_lines">0</property>
	      <property name="pixels_below_lines">0</property>
	      <property name="pixels_inside_wrap">0</property>
	      <property name="left_margin">0</property>
	      <property name="right_margin">0</property>
	      <property name="indent">0</property>
	      <property name="text" translatable="yes"></property>
	    </widget>
	  </child>
	</widget>
	<packing>
	  <property name="padding">0</property>
	  <property name="expand">True</property>
	  <property name="fill">True</property>
	</packing>
      </child>
    </widget>
  </child>
</widget>

</glade-interface>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gonvert/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	27 Nov 2004 18:35:05 -0000	1.5
+++ .cvsignore	10 Apr 2006 11:20:17 -0000	1.6
@@ -1 +1 @@
-gonvert-0.2.11.tar.gz
+gonvert-0.2.15.tar.gz


Index: gonvert.spec
===================================================================
RCS file: /cvs/extras/rpms/gonvert/devel/gonvert.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gonvert.spec	2 Mar 2006 21:30:03 -0000	1.7
+++ gonvert.spec	10 Apr 2006 11:20:17 -0000	1.8
@@ -1,13 +1,12 @@
 Name:           gonvert
-Version:        0.2.11
-Release:        2
-
+Version:        0.2.15
+Release:        1%{?dist}
 Summary:        Units conversion utility
-
 Group:          Applications/Engineering
 License:        GPL
 URL:            http://unihedron.com/projects/gonvert/gonvert.php
-Source0:        http://www.unihedron.com/projects/gonvert/downloads/gonvert-0.2.11.tar.gz
+Source0:        http://www.unihedron.com/projects/gonvert/downloads/%{name}-%{version}.tar.gz
+Source1:	gonvert.glade
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -25,13 +24,6 @@
 
 
 %prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
-
 %setup -q
 
 
@@ -41,18 +33,26 @@
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-%makeinstall
 
+mkdir -p ${RPM_BUILD_ROOT}%{_bindir}
+mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/python2.4/site-packages/share/gonvert
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/gonvert
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/doc/gonvert
+
+install -m0755 %{SOURCE1} ${RPM_BUILD_ROOT}%{_libdir}/python2.4/site-packages/share/gonvert
+install -m0644 pixmaps/gonvert.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/gonvert.png
+install -m0644 pixmaps/gonvert_picture.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/gonvert_picture.png
+install -m0755 gonvert ${RPM_BUILD_ROOT}%{_bindir}/gonvert
+cp doc/* ${RPM_BUILD_ROOT}%{_datadir}/doc/gonvert
 chmod 0644 doc/*
 rm -rf ${RPM_BUILD_ROOT}%{_prefix}/doc
-
 rm -rf ${RPM_BUILD_ROOT}%{_datadir}/gnome
 desktop-file-install --vendor fedora                    \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications       \
   --add-category X-Fedora                               \
   gonvert.desktop
 
-
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
@@ -60,14 +60,20 @@
 %files
 %defattr(-,root,root,-)
 %doc doc/CHANGELOG doc/COPYING doc/FAQ doc/THANKS doc/TODO
-%{_bindir}/*
+%{_bindir}/gonvert
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/gonvert
-%{_datadir}/pixmaps/*
+%{_datadir}/pixmaps/gonvert.png
+%{_datadir}/pixmaps/gonvert_picture.png
+%{_libdir}/python2.4/site-packages/share/gonvert/gonvert.glade
 %exclude %{_docdir}/gonvert
 
 
 %changelog
+* Fri Apr 7 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.2.15-1
+- Bump to 0.2.15
+- spec file altered
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gonvert/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	27 Nov 2004 18:35:05 -0000	1.5
+++ sources	10 Apr 2006 11:20:17 -0000	1.6
@@ -1 +1 @@
-82e9f6d52214ae37999634d818098ae0  gonvert-0.2.11.tar.gz
+f8e184cc1a77c790fcb404f3f17bebea  gonvert-0.2.15.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 12:07:40 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 10 Apr 2006 05:07:40 -0700
Subject: rpms/d4x/devel .cvsignore, 1.7, 1.8 d4x.spec, 1.11, 1.12 sources,
	1.7, 1.8
Message-ID: <200604101207.k3AC7gJS030686@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/d4x/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30655

Modified Files:
	.cvsignore d4x.spec sources 
Log Message:
Update to 2.5.7.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/d4x/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	2 Nov 2005 13:11:56 -0000	1.7
+++ .cvsignore	10 Apr 2006 12:07:40 -0000	1.8
@@ -1 +1 @@
-d4x-2.5.6.tar.gz
+d4x-2.5.7.tar.bz2


Index: d4x.spec
===================================================================
RCS file: /cvs/extras/rpms/d4x/devel/d4x.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- d4x.spec	14 Mar 2006 16:30:39 -0000	1.11
+++ d4x.spec	10 Apr 2006 12:07:40 -0000	1.12
@@ -3,15 +3,15 @@
 
 Summary: Downloader for X that supports resuming and many other features
 Name: d4x
-Version: 2.5.6
-Release: 2%{?pre:.%{pre}}%{?dist}
+Version: 2.5.7
+Release: 1%{?pre:.%{pre}}%{?dist}
 Group: Applications/Internet
 License: Artistic
 URL: http://www.krasu.ru/soft/chuchelo/
-Source: http://www.krasu.ru/soft/chuchelo/files/d4x-%{version}%{?pre}%{?final}.tar.gz
+Source: http://d4x.krasu.ru/files/d4x-%{version}%{?pre}%{?final}.tar.bz2
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gtk2-devel, glib2-devel >= 2.4.0, gcc-c++, libstdc++-devel
-BuildRequires: libao-devel, esound-devel, desktop-file-utils, openssl-devel
+BuildRequires: libao-devel, desktop-file-utils, openssl-devel, boost-devel
 # Use modular X for FC5+ and non-Fedora
 %if %{!?fedora:5}%{?fedora} >= 5
 BuildRequires: libXt-devel
@@ -30,7 +30,7 @@
 %setup -n %{name}-%{version}%{?pre}%{?final}
 
 %build
-%configure
+%configure --enable-libao
 %{__make} %{?_smp_mflags}
 
 
@@ -70,6 +70,12 @@
 
 
 %changelog
+* Mon Apr 10 2006 Matthias Saou <http://freshrpms.net/> 2.5.7-1
+- Update to 2.5.7.
+- Update source URL and s/gz/bz2/ again.
+- Add new bost-devel build requirement.
+- Enable libao instead of esd and oss.
+
 * Tue Mar 14 2006 Matthias Saou <http://freshrpms.net/> 2.5.6-2
 - FC5 rebuild... the build error that kept this rebuild pending was only X
   not being detected by configure (libXt-devel missing) that was not making


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/d4x/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 Nov 2005 13:11:56 -0000	1.7
+++ sources	10 Apr 2006 12:07:40 -0000	1.8
@@ -1 +1 @@
-2cbaf9d4f466ba48d2ecb73518c76c78  d4x-2.5.6.tar.gz
+16e27032bf1d3396b93453afde3266dd  d4x-2.5.7.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 10 12:27:38 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 10 Apr 2006 05:27:38 -0700
Subject: rpms/d4x/FC-4 .cvsignore,1.6,1.7 d4x.spec,1.9,1.10 sources,1.6,1.7
Message-ID: <200604101227.k3ACReYv030928@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/d4x/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30891/FC-4

Modified Files:
	.cvsignore d4x.spec sources 
Log Message:
Update to 2.5.7.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/d4x/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	2 Nov 2005 13:11:51 -0000	1.6
+++ .cvsignore	10 Apr 2006 12:27:38 -0000	1.7
@@ -1 +1 @@
-d4x-2.5.6.tar.gz
+d4x-2.5.7.tar.bz2


Index: d4x.spec
===================================================================
RCS file: /cvs/extras/rpms/d4x/FC-4/d4x.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- d4x.spec	2 Nov 2005 13:11:51 -0000	1.9
+++ d4x.spec	10 Apr 2006 12:27:38 -0000	1.10
@@ -3,15 +3,19 @@
 
 Summary: Downloader for X that supports resuming and many other features
 Name: d4x
-Version: 2.5.6
+Version: 2.5.7
 Release: 1%{?pre:.%{pre}}%{?dist}
 Group: Applications/Internet
 License: Artistic
 URL: http://www.krasu.ru/soft/chuchelo/
-Source: http://www.krasu.ru/soft/chuchelo/files/d4x-%{version}%{?pre}%{?final}.tar.gz
+Source: http://d4x.krasu.ru/files/d4x-%{version}%{?pre}%{?final}.tar.bz2
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gtk2-devel, glib2-devel >= 2.4.0, gcc-c++, libstdc++-devel
-BuildRequires: libao-devel, esound-devel, desktop-file-utils, openssl-devel
+BuildRequires: libao-devel, desktop-file-utils, openssl-devel, boost-devel
+# Use modular X for FC5+ and non-Fedora
+%if %{!?fedora:5}%{?fedora} >= 5
+BuildRequires: libXt-devel
+%endif
 
 %description
 This program lets you download files from the internet using either the ftp
@@ -26,7 +30,7 @@
 %setup -n %{name}-%{version}%{?pre}%{?final}
 
 %build
-%configure
+%configure --enable-libao
 %{__make} %{?_smp_mflags}
 
 
@@ -66,6 +70,17 @@
 
 
 %changelog
+* Mon Apr 10 2006 Matthias Saou <http://freshrpms.net/> 2.5.7-1
+- Update to 2.5.7.
+- Update source URL and s/gz/bz2/ again.
+- Add new bost-devel build requirement.
+- Enable libao instead of esd and oss.
+
+* Tue Mar 14 2006 Matthias Saou <http://freshrpms.net/> 2.5.6-2
+- FC5 rebuild... the build error that kept this rebuild pending was only X
+  not being detected by configure (libXt-devel missing) that was not making
+  configure exit... because make then failed miserably.
+
 * Wed Nov  2 2005 Matthias Saou <http://freshrpms.net/> 2.5.6-1
 - Update to 2.5.6.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/d4x/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	2 Nov 2005 13:11:51 -0000	1.6
+++ sources	10 Apr 2006 12:27:38 -0000	1.7
@@ -1 +1 @@
-2cbaf9d4f466ba48d2ecb73518c76c78  d4x-2.5.6.tar.gz
+16e27032bf1d3396b93453afde3266dd  d4x-2.5.7.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 10 12:27:39 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Mon, 10 Apr 2006 05:27:39 -0700
Subject: rpms/d4x/FC-5 .cvsignore, 1.7, 1.8 d4x.spec, 1.11, 1.12 sources, 1.7,
	1.8
Message-ID: <200604101227.k3ACRfOq030934@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/d4x/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30891/FC-5

Modified Files:
	.cvsignore d4x.spec sources 
Log Message:
Update to 2.5.7.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/d4x/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	2 Nov 2005 13:11:56 -0000	1.7
+++ .cvsignore	10 Apr 2006 12:27:39 -0000	1.8
@@ -1 +1 @@
-d4x-2.5.6.tar.gz
+d4x-2.5.7.tar.bz2


Index: d4x.spec
===================================================================
RCS file: /cvs/extras/rpms/d4x/FC-5/d4x.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- d4x.spec	14 Mar 2006 16:30:39 -0000	1.11
+++ d4x.spec	10 Apr 2006 12:27:39 -0000	1.12
@@ -3,15 +3,15 @@
 
 Summary: Downloader for X that supports resuming and many other features
 Name: d4x
-Version: 2.5.6
-Release: 2%{?pre:.%{pre}}%{?dist}
+Version: 2.5.7
+Release: 1%{?pre:.%{pre}}%{?dist}
 Group: Applications/Internet
 License: Artistic
 URL: http://www.krasu.ru/soft/chuchelo/
-Source: http://www.krasu.ru/soft/chuchelo/files/d4x-%{version}%{?pre}%{?final}.tar.gz
+Source: http://d4x.krasu.ru/files/d4x-%{version}%{?pre}%{?final}.tar.bz2
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: gtk2-devel, glib2-devel >= 2.4.0, gcc-c++, libstdc++-devel
-BuildRequires: libao-devel, esound-devel, desktop-file-utils, openssl-devel
+BuildRequires: libao-devel, desktop-file-utils, openssl-devel, boost-devel
 # Use modular X for FC5+ and non-Fedora
 %if %{!?fedora:5}%{?fedora} >= 5
 BuildRequires: libXt-devel
@@ -30,7 +30,7 @@
 %setup -n %{name}-%{version}%{?pre}%{?final}
 
 %build
-%configure
+%configure --enable-libao
 %{__make} %{?_smp_mflags}
 
 
@@ -70,6 +70,12 @@
 
 
 %changelog
+* Mon Apr 10 2006 Matthias Saou <http://freshrpms.net/> 2.5.7-1
+- Update to 2.5.7.
+- Update source URL and s/gz/bz2/ again.
+- Add new bost-devel build requirement.
+- Enable libao instead of esd and oss.
+
 * Tue Mar 14 2006 Matthias Saou <http://freshrpms.net/> 2.5.6-2
 - FC5 rebuild... the build error that kept this rebuild pending was only X
   not being detected by configure (libXt-devel missing) that was not making


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/d4x/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	2 Nov 2005 13:11:56 -0000	1.7
+++ sources	10 Apr 2006 12:27:39 -0000	1.8
@@ -1 +1 @@
-2cbaf9d4f466ba48d2ecb73518c76c78  d4x-2.5.6.tar.gz
+16e27032bf1d3396b93453afde3266dd  d4x-2.5.7.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 10 14:27:26 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Mon, 10 Apr 2006 07:27:26 -0700
Subject: fedora-security/audit fc4,1.194,1.195 fc5,1.107,1.108
Message-ID: <200604101427.k3AERQxh003066@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3046

Modified Files:
	fc4 fc5 
Log Message:
Add a new PHP cve id.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- fc4	10 Apr 2006 08:10:27 -0000	1.194
+++ fc4	10 Apr 2006 14:27:23 -0000	1.195
@@ -28,6 +28,7 @@
 CVE-2006-1045 VULNERABLE (thunderbird)
 CVE-2006-1015 ignore (php) safe mode isn't safe
 CVE-2006-1014 ignore (php) safe mode isn't safe
+CVE-2006-0996 VULNERABLE (php) bz#187511
 CVE-2006-0903 VULNERABLE (mysql) bz#183261
 CVE-2006-0884 ** thunderbird
 CVE-2006-0836 version (thunderbird, 1.5 only)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- fc5	10 Apr 2006 08:10:27 -0000	1.107
+++ fc5	10 Apr 2006 14:27:23 -0000	1.108
@@ -29,6 +29,7 @@
 CVE-2006-1045 VULNERABLE (thunderbird)
 CVE-2006-1015 ignore (php) safe mode isn't safe
 CVE-2006-1014 ignore (php) safe mode isn't safe
+CVE-2006-0996 VULNERABLE (php) bz#187511
 CVE-2006-0903 VULNERABLE (mysql) low/not upstream yet
 CVE-2006-0884 VULNERABLE (thunderbird)
 CVE-2006-0836 VULNERABLE (thunderbird)



From fedora-extras-commits at redhat.com  Mon Apr 10 14:44:05 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 10 Apr 2006 07:44:05 -0700
Subject: rpms/Macaulay2/devel Macaulay2.spec,1.11,1.12
Message-ID: <200604101444.k3AEi7Ho003158@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/Macaulay2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3141

Modified Files:
	Macaulay2.spec 
Log Message:
* Mon Apr 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.2-22
- fix icon location (#188384)



Index: Macaulay2.spec
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/devel/Macaulay2.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Macaulay2.spec	31 Mar 2006 13:00:38 -0000	1.11
+++ Macaulay2.spec	10 Apr 2006 14:44:05 -0000	1.12
@@ -6,7 +6,7 @@
 Summary: System for algebraic geometry and commutative algebra
 Name:    Macaulay2
 Version: 0.9.2
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: GPL
 Group:   Applications/Engineering
 URL:     http://www.math.uiuc.edu/Macaulay2/
@@ -93,7 +93,7 @@
 
 # app img
 install -p -m644 -D %{SOURCE1} \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/apps/32x32/Macaulay2.png
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/Macaulay2.png
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install \
@@ -154,6 +154,9 @@
 
 
 %changelog
+* Mon Apr 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.2-22
+- fix icon location (#188384)
+
 * Thu Mar 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.2-21
 - *really* disable %%check (fails on fc5+ anyway) 
 



From fedora-extras-commits at redhat.com  Mon Apr 10 14:46:05 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Mon, 10 Apr 2006 07:46:05 -0700
Subject: rpms/nethack-vultures/devel nethack-vultures.spec,1.22,1.23
Message-ID: <200604101446.k3AEk7wN003673@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3470/devel

Modified Files:
	nethack-vultures.spec 
Log Message:
Added extra fonts




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- nethack-vultures.spec	10 Apr 2006 00:35:08 -0000	1.22
+++ nethack-vultures.spec	10 Apr 2006 14:46:05 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        2.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -137,6 +137,7 @@
 %{_prefix}/games/vultureseye/music/
 %{_prefix}/games/vultureseye/nhdat
 %{_prefix}/games/vultureseye/sound/
+%{_prefix}/games/vultureseye/fonts/
 %attr(2755,root,games) %{_prefix}/games/vultureseye/vultureseye
 %dir %{_prefix}/games/vulturesclaw/
 %{_prefix}/games/vulturesclaw/config/
@@ -147,6 +148,7 @@
 %{_prefix}/games/vulturesclaw/music/
 %{_prefix}/games/vulturesclaw/nh*share
 %{_prefix}/games/vulturesclaw/sound/
+%{_prefix}/games/vulturesclaw/fonts/
 %attr(2755,root,games) %{_prefix}/games/vulturesclaw/vulturesclaw
 %{_datadir}/applications/*vultures*.desktop
 %{_datadir}/icons/hicolor/48x48/apps/vultures*.png
@@ -165,7 +167,10 @@
 
 
 %changelog
-* Sat Apr 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-2
+* Sun Apr 09 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-3
+- Packaged extra fonts
+
+* Sun Apr 09 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-2
 - Upped the release to try and make the plague server use the right source tarball.
 
 * Sat Apr 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-1



From fedora-extras-commits at redhat.com  Mon Apr 10 14:45:58 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Mon, 10 Apr 2006 07:45:58 -0700
Subject: rpms/nethack-vultures/FC-3 nethack-vultures.spec,1.19,1.20
Message-ID: <200604101446.k3AEkU4k003830@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-serv3470/FC-3

Modified Files:
	nethack-vultures.spec 
Log Message:
Added extra fonts




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- nethack-vultures.spec	10 Apr 2006 00:35:01 -0000	1.19
+++ nethack-vultures.spec	10 Apr 2006 14:45:58 -0000	1.20
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        2.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -13,7 +13,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
-BuildRequires:  SDL_mixer-devel >= 1.2.6
+BuildRequires:  SDL_mixer-devel
 BuildRequires:  SDL_image-devel
 BuildRequires:  SDL_ttf-devel
 BuildRequires:  libpng-devel
@@ -136,6 +136,7 @@
 %{_prefix}/games/vultureseye/music/
 %{_prefix}/games/vultureseye/nhdat
 %{_prefix}/games/vultureseye/sound/
+%{_prefix}/games/vultureseye/fonts/
 %attr(2755,root,games) %{_prefix}/games/vultureseye/vultureseye
 %dir %{_prefix}/games/vulturesclaw/
 %{_prefix}/games/vulturesclaw/config/
@@ -146,6 +147,7 @@
 %{_prefix}/games/vulturesclaw/music/
 %{_prefix}/games/vulturesclaw/nh*share
 %{_prefix}/games/vulturesclaw/sound/
+%{_prefix}/games/vulturesclaw/fonts/
 %attr(2755,root,games) %{_prefix}/games/vulturesclaw/vulturesclaw
 %{_datadir}/applications/*vultures*.desktop
 %{_datadir}/icons/hicolor/48x48/apps/vultures*.png
@@ -164,7 +166,10 @@
 
 
 %changelog
-* Sat Apr 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-2
+* Sun Apr 09 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-3
+- Packaged extra fonts
+
+* Sun Apr 09 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-2
 - Upped the release to try and make the plague server use the right source tarball.
 
 * Sat Apr 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-1



From fedora-extras-commits at redhat.com  Mon Apr 10 14:46:00 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Mon, 10 Apr 2006 07:46:00 -0700
Subject: rpms/nethack-vultures/FC-5 nethack-vultures.spec,1.22,1.23
Message-ID: <200604101446.k3AEkW02003834@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-serv3470/FC-5

Modified Files:
	nethack-vultures.spec 
Log Message:
Added extra fonts




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-5/nethack-vultures.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- nethack-vultures.spec	10 Apr 2006 00:35:08 -0000	1.22
+++ nethack-vultures.spec	10 Apr 2006 14:45:59 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        2.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -137,6 +137,7 @@
 %{_prefix}/games/vultureseye/music/
 %{_prefix}/games/vultureseye/nhdat
 %{_prefix}/games/vultureseye/sound/
+%{_prefix}/games/vultureseye/fonts/
 %attr(2755,root,games) %{_prefix}/games/vultureseye/vultureseye
 %dir %{_prefix}/games/vulturesclaw/
 %{_prefix}/games/vulturesclaw/config/
@@ -147,6 +148,7 @@
 %{_prefix}/games/vulturesclaw/music/
 %{_prefix}/games/vulturesclaw/nh*share
 %{_prefix}/games/vulturesclaw/sound/
+%{_prefix}/games/vulturesclaw/fonts/
 %attr(2755,root,games) %{_prefix}/games/vulturesclaw/vulturesclaw
 %{_datadir}/applications/*vultures*.desktop
 %{_datadir}/icons/hicolor/48x48/apps/vultures*.png
@@ -165,7 +167,10 @@
 
 
 %changelog
-* Sat Apr 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-2
+* Sun Apr 09 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-3
+- Packaged extra fonts
+
+* Sun Apr 09 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-2
 - Upped the release to try and make the plague server use the right source tarball.
 
 * Sat Apr 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-1



From fedora-extras-commits at redhat.com  Mon Apr 10 14:45:59 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Mon, 10 Apr 2006 07:45:59 -0700
Subject: rpms/nethack-vultures/FC-4 nethack-vultures.spec,1.21,1.22
Message-ID: <200604101446.k3AEkV6b003833@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-serv3470/FC-4

Modified Files:
	nethack-vultures.spec 
Log Message:
Added extra fonts




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- nethack-vultures.spec	10 Apr 2006 00:35:02 -0000	1.21
+++ nethack-vultures.spec	10 Apr 2006 14:45:59 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        2.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -137,6 +137,7 @@
 %{_prefix}/games/vultureseye/music/
 %{_prefix}/games/vultureseye/nhdat
 %{_prefix}/games/vultureseye/sound/
+%{_prefix}/games/vultureseye/fonts/
 %attr(2755,root,games) %{_prefix}/games/vultureseye/vultureseye
 %dir %{_prefix}/games/vulturesclaw/
 %{_prefix}/games/vulturesclaw/config/
@@ -147,6 +148,7 @@
 %{_prefix}/games/vulturesclaw/music/
 %{_prefix}/games/vulturesclaw/nh*share
 %{_prefix}/games/vulturesclaw/sound/
+%{_prefix}/games/vulturesclaw/fonts/
 %attr(2755,root,games) %{_prefix}/games/vulturesclaw/vulturesclaw
 %{_datadir}/applications/*vultures*.desktop
 %{_datadir}/icons/hicolor/48x48/apps/vultures*.png
@@ -165,7 +167,10 @@
 
 
 %changelog
-* Sat Apr 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-2
+* Sun Apr 09 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-3
+- Packaged extra fonts
+
+* Sun Apr 09 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-2
 - Upped the release to try and make the plague server use the right source tarball.
 
 * Sat Apr 08 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-1



From fedora-extras-commits at redhat.com  Mon Apr 10 14:51:22 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon, 10 Apr 2006 07:51:22 -0700
Subject: rpms/yadex - New directory
Message-ID: <200604101451.k3AEpOqZ003943@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/yadex
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3916/yadex

Log Message:
Directory /cvs/extras/rpms/yadex added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 10 14:51:23 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon, 10 Apr 2006 07:51:23 -0700
Subject: rpms/yadex/devel - New directory
Message-ID: <200604101451.k3AEpPPu003946@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/yadex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3916/yadex/devel

Log Message:
Directory /cvs/extras/rpms/yadex/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 10 14:51:36 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon, 10 Apr 2006 07:51:36 -0700
Subject: rpms/yadex Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604101451.k3AEpcKZ004022@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/yadex
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3989

Added Files:
	Makefile import.log 
Log Message:
Setup of module yadex


--- NEW FILE Makefile ---
# Top level Makefile for module yadex
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 10 14:51:37 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon, 10 Apr 2006 07:51:37 -0700
Subject: rpms/yadex/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200604101451.k3AEpdDB004025@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/yadex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3989/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module yadex


--- 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 Apr 10 14:52:26 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon, 10 Apr 2006 07:52:26 -0700
Subject: rpms/yadex import.log,1.1,1.2
Message-ID: <200604101452.k3AEqSn8004164@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/yadex
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4123

Modified Files:
	import.log 
Log Message:
auto-import yadex-1.7.0-3 on branch devel from yadex-1.7.0-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/yadex/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Apr 2006 14:51:36 -0000	1.1
+++ import.log	10 Apr 2006 14:52:26 -0000	1.2
@@ -0,0 +1 @@
+yadex-1_7_0-3:HEAD:yadex-1.7.0-3.src.rpm:1144680736



From fedora-extras-commits at redhat.com  Mon Apr 10 14:52:27 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon, 10 Apr 2006 07:52:27 -0700
Subject: rpms/yadex/devel Yadex_170_ALL.diff, NONE, 1.1 Yadex_170_Hexen.diff,
	NONE, 1.1 yadex-1.7.0-64bit.patch, NONE,
	1.1 yadex-1.7.0-datadir.patch, NONE,
	1.1 yadex-1.7.0-destdir.patch, NONE, 1.1 yadex-1.7.0-gcc41.patch,
	NONE, 1.1 yadex.desktop, NONE, 1.1 yadex.png, NONE,
	1.1 yadex.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604101452.k3AEqTcj004181@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/yadex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4123/devel

Modified Files:
	.cvsignore sources 
Added Files:
	Yadex_170_ALL.diff Yadex_170_Hexen.diff 
	yadex-1.7.0-64bit.patch yadex-1.7.0-datadir.patch 
	yadex-1.7.0-destdir.patch yadex-1.7.0-gcc41.patch 
	yadex.desktop yadex.png yadex.spec 
Log Message:
auto-import yadex-1.7.0-3 on branch devel from yadex-1.7.0-3.src.rpm

Yadex_170_ALL.diff:

--- NEW FILE Yadex_170_ALL.diff ---
diff -u -r -N yadex-1.7.0/atclib/al_adigits.c yadex-1.7.0-all/atclib/al_adigits.c
--- yadex-1.7.0/atclib/al_adigits.c	1999-08-02 00:52:00.000000000 +1000
+++ yadex-1.7.0-all/atclib/al_adigits.c	2005-01-10 14:30:53.000000000 +1100
@@ -29,5 +29,11 @@
 #include "atclib.h"
 
 
-const char al_adigits[36] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";
+const char al_adigits[36] =
+{
+'0', '1', '2', '3', '4', '5', '6', '7', '8', '9',
+'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J',
+'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T',
+'U', 'V', 'W', 'X', 'Y', 'Z'
+};
 
diff -u -r -N yadex-1.7.0/docsrc/index.html yadex-1.7.0-all/docsrc/index.html
--- yadex-1.7.0/docsrc/index.html	2002-05-09 23:36:06.000000000 +1000
+++ yadex-1.7.0-all/docsrc/index.html	2005-01-10 14:30:53.000000000 +1100
@@ -34,6 +34,7 @@
 
 <ul>
 <li><a href="palette.html">Palette viewer</a>
+<li><a href="preview.html">3D Level Preview</a>
 <li><a href="advanced.html">Advanced user's guide</a>
 <li><a href="../TODO"><code>TODO</code></a>
 <li><a href="yadex.6">The man page for Yadex</a>
diff -u -r -N yadex-1.7.0/docsrc/preview.html yadex-1.7.0-all/docsrc/preview.html
--- yadex-1.7.0/docsrc/preview.html	1970-01-01 10:00:00.000000000 +1000
+++ yadex-1.7.0-all/docsrc/preview.html	2005-01-10 14:34:20.000000000 +1100
@@ -0,0 +1,108 @@
+<html>
+<head>
+<title>Yadex 3D level preview</title>
+</head>
+<body>
+
+<div align="center">
+<img src="logo_small.png" alt="Fancy logo">
+<br>Yadex $VERSION ($SOURCE_DATE)
+<h1>3D Level Preview</h1>
+</div>
+<br>
+<br>
+<br>
+
+	<h2>What's it for</h2>
+
+<p>The 3D level preview function lets you get a rough idea of what
+your level looks like, quickly, without all the hassle of saving,
+building nodes and starting DOOM. It is activated by pressing the
+`R' key while editing a level, and draws the player's view that
+you would see within DOOM (with some limitations). While the
+rendering window is up, you can move around the level using the
+cursor keys and toggle things like texturing and sprites on/off.
+
+	<h2>Key bindings</h2>
+
+<dl>
+<dt>[<kbd>Left</kbd>]
+<br>[<kbd>Right</kbd>]
+<dd>Turn the view left or right. Use the SHIFT key to
+turn a greater amount.
+
+<dt>[<kbd>Up</kbd>]
+<br>[<kbd>Down</kbd>]
+<dd>Move the view forward or back. Use the SHIFT key to
+move a greater distance.
+
+<dt>[<kbd>n</kbd>]
+<br>[<kbd>m</kbd>]
+<dd>Move the view sideways left or right (strafing). Uppercase `N'
+and `M' (i.e. with the SHIFT key) will move a greater distance.
+
+<dt>[<kbd>c</kbd>]
+<br>[<kbd>d</kbd>]
+<dd>Move the view upwards or downwards (flying). Uppercase `C' and
+`D' (i.e. with the SHIFT key) will move a greater distance. Note
+that you cannot move up or down when "walking" mode is enabled.
+
+<dt>[<kbd>t</kbd>]
+<dd>Toggle texture mapping. When disabled (the default), all walls,
+ceilings and floors are drawn with solid (somewhat random) colours.
+
+<dt>[<kbd>s</kbd>]
+<dd>Toggle sprites.
+
+<dt>[<kbd>w</kbd>]
+<dd>Toggle walking mode. When enabled, the view height is always
+above the current floor. For example, if you move forward over a
+cliff, the view will drop down.  When disabled (the default), you can
+fly about the level at any height.
+
+<dt>[<kbd>Esc</kbd>]
+<br>[<kbd>q</kbd>]
+<dd>Exit the 3D level preview. The current viewing state (position,
+direction, etc) are remembered, and will be used next time the 3D
+preview is activated (unless the player object has been moved, or a
+different level was loaded).
+
+</dl>
+
+	<h2>Features</h2>
+
+<ul>
+<li>No BSP (nodes) required !
+<li>Textures and flats are drawn exactly like DOOM, including X/Y
+offsets and upper/lower unpegging flags.
+<li>Sky is handled just like in DOOM (but drawn in solid blue).
+</ul>
+
+	<h2>Limitations</h2>
+
+<ul>
+<li>No lighting, the level appears full-bright all the time.
+<li>No mid-masked textures (rails, gratings) are drawn.
+<li>Thing sprites (especially monsters) are always drawn facing
+you, even when their direction is away from you.
+<li>Sprite positioning may be inaccurate, because their X and
+Y offsets are not honoured.
+<li>Things that are supposed to hang from the ceiling
+(hanging body parts, chandeliers, etc) will appear on the floor.
+<li>There are some glitches in the current renderer, which look like
+"slimetrails" (vertical lines).
+</ul>
+
+	<h2>Caveats</h2>
+
+One last thing. The 3D preview function can use a huge amount of
+memory when texturing and sprites are both enabled (and a large amount
+even when texturing and sprites are both disabled). If your computer
+has a very low amount of memory (e.g. less than 16 MB), then Yadex may
+crash with an out of memory error. I think you are unlikely to hit
+this problem, but if in doubt, save your work first.
+
+
+<p><hr>AJA $SELF_DATE
+</body>
+</html>
diff -u -r -N yadex-1.7.0/GNUmakefile yadex-1.7.0-all/GNUmakefile
--- yadex-1.7.0/GNUmakefile	2003-12-29 04:23:56.000000000 +1100
+++ yadex-1.7.0-all/GNUmakefile	2005-01-10 14:30:53.000000000 +1100
@@ -160,6 +160,7 @@
 	s_swapf		s_vertices	sanity		scrnshot	\
 	selbox		selectn		selpath		selrect		\
 	serialnum	spritdir	sticker		swapmem		\
+ 	r_render	r_images					\
 	t_centre	t_flags		t_prop		t_spin		\
 	textures	things		trace		v_centre	\
 	v_merge		v_polyg		vectext		verbmsg		\
@@ -237,6 +238,7 @@
 	docsrc/legal.html		\
 	docsrc/packagers_guide.html	\
 	docsrc/palette.html		\
+	docsrc/preview.html		\
 	docsrc/reporting.html		\
 	docsrc/tips.html		\
 	docsrc/trivia.html		\
@@ -609,8 +611,9 @@
 #
 ########################################################################
 
-# If Makefile.config doesn't exist, give a hint...
+# If Makefile.config or config.h don't exist, give a hint...
 $(OBJDIR)/Makefile.config:
+$(OBJDIR)/config.h:
 	@echo "Sorry guv'nor, but... did you run ./configure ?" >&2
 	@false
 
@@ -637,7 +640,7 @@
 # Note: the modules of Atclib are not scanned as they all
 # depend on $(HEADERS_ATCLIB) and nothing else.
 
-yadex.dep: $(SRC_NON_GEN)
+yadex.dep: $(SRC_NON_GEN) src/config.h
 	@echo "Generating $@"
 	@makedepend -f- -Y -Iatclib $(SRC_NON_GEN) 2>/dev/null	\
 		| awk 'sub (/^src/, "") == 1 {				\
diff -u -r -N yadex-1.7.0/src/editloop.cc yadex-1.7.0-all/src/editloop.cc
--- yadex-1.7.0/src/editloop.cc	2003-07-05 21:12:32.000000000 +1000
+++ yadex-1.7.0-all/src/editloop.cc	2005-01-10 14:30:53.000000000 +1100
@@ -70,6 +70,7 @@
 #include "x_exchng.h"
 #include "x_hover.h"
 #include "xref.h"
+#include "r_render.h"
 
 #ifdef Y_X11
 #include <X11/Xlib.h>
@@ -304,8 +305,8 @@
 
 e.mb_menu[MBM_EDIT] = new Menu (NULL,
    "~Copy object(s)",          'o',    0,
-   "~Add object",              YK_INS, 0,
-   "~Delete object(s)",        YK_DEL, 0,
+   "~Add object",              'I', 0,
+   "~Delete object(s)",        '\b', 0,
    "~Exchange object numbers", 24,     0,
    "~Preferences...",          YK_F5,  0,
[...2426 lines suppressed...]
+   {
+      int model = super_find_sector_model (ld_side1, ld_side2);
+      InsertObject (OBJ_SECTORS, model, 0, 0);
+      new_sec = NumSectors - 1;
+   }
+   
+   for (line=0; line < NumLineDefs; line++)
+   {
+      if (ld_side1.get (line))
+         super_set_sector_on_side (line, LineDefs[line].sidedef1,
+            LineDefs[line].sidedef2, 1, new_sec);
+
+      else if (ld_side2.get (line))
+         super_set_sector_on_side (line, LineDefs[line].sidedef2,
+            LineDefs[line].sidedef1, 2, new_sec);
+   }
+}
+
 /* end of file */
diff -u -r -N yadex-1.7.0/src/s_prop.cc yadex-1.7.0-all/src/s_prop.cc
--- yadex-1.7.0/src/s_prop.cc	2003-03-28 23:37:32.000000000 +1100
+++ yadex-1.7.0-all/src/s_prop.cc	2005-01-10 14:30:53.000000000 +1100
@@ -259,4 +259,67 @@
   }
 }
 
+/*
+ * 	InputSectorType
+ * 	Let the user select a sector type number and return it
+ * 	Returns 0 if OK, <>0 if cancelled
+ */
+int InputSectorType (int x0, int y0, int *number)
+{
+  int	val;
+  val = 0;
+  *number = 0;
+  Menu_data_st menudata (stdef);
+	if (DisplayMenuList (x0 , y0, "Select type", menudata, &val)
+	  < 0)
+	  return 1;
+  // KLUDGE last element of stdef means "enter value"
+  if (val == al_lcount (stdef) - 1)
+  	{
+	  val = InputIntegerValue (x0 + 84,
+	    y0 + BOX_BORDER + (3 + val) * FONTH,
+	    -32768, 32767, 0);
+	  if (val == IIV_CANCEL)  // [Esc]
+	    return 1;
+	}
+	else
+	{
+	  if (al_lseek (stdef, val, SEEK_SET))
+	    fatal_error ("%s SP1 (%s)\n",
+	      msg_unexpected, al_astrerror (al_aerrno));
+	  val = CUR_STDEF->number;
+	}
+  if (val < 0) return 1;  //unsuccessful
+  *number = val;
+  return 0;               //successful
+}
+
+/*
+ *   TransferSectorProperties
+ *
+ *   -AJA- 2001-05-27
+ */
+void TransferSectorProperties (int src_sector, SelPtr sectors)
+{
+   SelPtr cur;
+
+   for (cur=sectors; cur; cur=cur->next)
+   {
+      if (! is_obj(cur->objnum))
+         continue;
+
+      strncpy (Sectors[cur->objnum].floort, Sectors[src_sector].floort,
+            WAD_FLAT_NAME);
+      strncpy (Sectors[cur->objnum].ceilt, Sectors[src_sector].ceilt,
+            WAD_FLAT_NAME);
+
+      Sectors[cur->objnum].floorh  = Sectors[src_sector].floorh;
+      Sectors[cur->objnum].ceilh   = Sectors[src_sector].ceilh;
+      Sectors[cur->objnum].light   = Sectors[src_sector].light;
+      Sectors[cur->objnum].special = Sectors[src_sector].special;
+      Sectors[cur->objnum].tag     = Sectors[src_sector].tag;
+
+      MadeChanges = 1;
+   }
+}
 
diff -u -r -N yadex-1.7.0/src/s_split.cc yadex-1.7.0-all/src/s_split.cc
--- yadex-1.7.0/src/s_split.cc	2003-03-28 23:37:32.000000000 +1100
+++ yadex-1.7.0-all/src/s_split.cc	2005-01-10 14:30:53.000000000 +1100
@@ -36,6 +36,7 @@
 #include "s_linedefs.h"
 #include "selectn.h"
 #include "x_hover.h"
+#include "entry.h"
 
 
 /*
diff -u -r -N yadex-1.7.0/src/t_prop.cc yadex-1.7.0-all/src/t_prop.cc
--- yadex-1.7.0/src/t_prop.cc	2003-03-28 23:37:32.000000000 +1100
+++ yadex-1.7.0-all/src/t_prop.cc	2005-01-10 14:30:53.000000000 +1100
@@ -36,16 +36,17 @@
 #include "gfx.h"
 #include "levels.h"
 #include "oldmenus.h"
+#include "objid.h"
+#include "objects.h"
 #include "selectn.h"
 #include "things.h"
 
-
 /*
  *	Private functions prototypes
  */
-static int InputThingType (int x0, int y0, int *number);
 static const char *PrintThinggroup (void *ptr);
 static const char *PrintThingdef (void *ptr);
+int InputThingType (int x0, int y0, int *number);
 
 
 /*
@@ -250,7 +251,7 @@
  *	Let the user select a thing number and return it.
  *	Returns 0 if OK, <>0 if cancelled
  */
-static int InputThingType (int x0, int y0, int *number)
+int InputThingType (int x0, int y0, int *number)
 {
 int         r;
 int         tgno = 0;
@@ -331,4 +332,30 @@
 }
 
 
+/*
+ *   TransferThingProperties
+ *
+ *   -AJA- 2001-05-27
+ */
+void TransferThingProperties (int src_thing, SelPtr things)
+{
+   SelPtr cur;
+
+   for (cur=things; cur; cur=cur->next)
+   {
+      if (! is_obj(cur->objnum))
+         continue;
+
+      Things[cur->objnum].angle = Things[src_thing].angle;
+      Things[cur->objnum].type  = Things[src_thing].type;
+      Things[cur->objnum].when  = Things[src_thing].when;
+
+      MadeChanges = 1;
+
+      things_types++;
+      things_angles++;
+   }
+}
+
+
 /* end of file */
diff -u -r -N yadex-1.7.0/src/yadex.h yadex-1.7.0-all/src/yadex.h
--- yadex-1.7.0/src/yadex.h	2003-12-15 11:37:45.000000000 +1100
+++ yadex-1.7.0-all/src/yadex.h	2005-01-10 14:30:53.000000000 +1100
@@ -479,6 +479,7 @@
 
 // l_prop.cc (previously in editobj.cc)
 void LinedefProperties (int x0, int y0, SelPtr obj);
+void TransferLinedefProperties (int src_linedef, SelPtr linedefs);
 
 // l_unlink.cc
 void unlink_sidedef (SelPtr linedefs, int side1, int side2);
@@ -541,13 +542,16 @@
 void DistributeSectorCeilings (SelPtr); /* SWAP! */
 void RaiseOrLowerSectors (SelPtr obj);
 void BrightenOrDarkenSectors (SelPtr obj);
+void SuperSectorSelector (int map_x, int map_y, int new_sec);
 
 // s_prop.cc (previously in editobj.cc)
 void SectorProperties (int x0, int y0, SelPtr obj);
+void TransferSectorProperties (int src_sector, SelPtr sectors);
 
 // s_split.cc (previously in objects.cc)
 void SplitSector (int, int); /* SWAP! */
 void SplitLineDefsAndSector (int, int); /* SWAP! */
+void MultiSplitLineDefsAndSector (int, int); /* SWAP! */
 
 // swapmem.cc
 void InitSwap (void);
@@ -560,6 +564,7 @@
 // selrect.cc
 // t_prop.c (previously in editobj.c)
 void ThingProperties (int x0, int y0, SelPtr obj);
+void TransferThingProperties (int src_thing, SelPtr things);
 
 // v_merge.cc
 void DeleteVerticesJoinLineDefs (SelPtr ); /* SWAP! */

Yadex_170_Hexen.diff:

--- NEW FILE Yadex_170_Hexen.diff ---
diff -N -p -r -u yadex-1.7.0-orig/src/editloop.cc yadex-1.7.0/src/editloop.cc
--- yadex-1.7.0-orig/src/editloop.cc	Tue Oct 19 20:53:55 2004
+++ yadex-1.7.0/src/editloop.cc	Wed Oct 20 00:54:28 2004
@@ -43,6 +43,7 @@ Place, Suite 330, Boston, MA 02111-1307,
 #include "entry.h"
 #include "entry2.h"
 #include "events.h"
+#include "game.h"
 #include "gfx.h"
 #include "gfx2.h"	// show_character_set() show_pcolours()
 #include "gfx3.h"
@@ -94,6 +95,7 @@ static int menubar_out_y1;	/* FIXME */
 
 /* prototypes of private functions */
 static int SortLevels (const void *item1, const void *item2);
+static char *GetBehaviorFileName (const char *levelname);
 
 /*
  *	SelectLevel
@@ -303,15 +305,28 @@ e.mb_menu[MBM_FILE] = new Menu (NULL,
    "~Quit",       'q',   0,
    NULL);
 
-e.mb_menu[MBM_EDIT] = new Menu (NULL,
-   "~Copy object(s)",          'o',    0,
-   "~Add object",              YK_INS, 0,
-   "~Delete object(s)",        YK_DEL, 0,
-   "~Exchange object numbers", 24,     0,
-   "~Preferences...",          YK_F5,  0,
-   "~Snap to grid",            'y',    MIF_VTICK, &e.grid_snap,		     0,
-   "~Lock grid step",          'z',    MIF_VTICK, &e.grid_step_locked,	     0,
-   NULL);
+
+if (yg_level_format == YGLF_HEXEN)
+   e.mb_menu[MBM_EDIT] = new Menu (NULL,
+     "~Copy object(s)",          'o',    0,
+      "~Add object",              YK_INS, 0,
+      "~Delete object(s)",        YK_DEL, 0,
+      "~Exchange object numbers", 24,     0,
+      "~Preferences...",          YK_F5,  0,
+      "~Snap to grid",            'y',    MIF_VTICK, &e.grid_snap,		     0,
+      "~Lock grid step",          'z',    MIF_VTICK, &e.grid_step_locked,	     0,
+      "Load ~BEHAVIOR lump",      'b',    0,
+      NULL);
+else
+   e.mb_menu[MBM_EDIT] = new Menu (NULL,
+      "~Copy object(s)",          'o',    0,
+      "~Add object",              YK_INS, 0,
+      "~Delete object(s)",        YK_DEL, 0,
+      "~Exchange object numbers", 24,     0,
+      "~Preferences...",          YK_F5,  0,
+      "~Snap to grid",            'y',    MIF_VTICK, &e.grid_snap,		     0,
+      "~Lock grid step",          'z',    MIF_VTICK, &e.grid_step_locked,	     0,
+      NULL);
 
 // If you change the order of modes here, don't forget
 // to modify the <modes> array.
@@ -2357,6 +2372,30 @@ cancel_save_as:
 	 RedrawMap = 1;
 	 }
 
+      // Load BEHAVIOR lump (JL)
+      else if (is.key == 'b')
+         {
+         char *acsfile;
+         const char *acsname;
+         if (levelname)
+            acsname = levelname;
+         else
+            acsname = "behavior";
+         acsfile = GetBehaviorFileName (acsname);
+         FILE* f = fopen(acsfile, "rb");
+         if (f)
+            {
+            FreeFarMemory(Behavior);
+            fseek(f, 0, SEEK_END);
+            BehaviorSize = ftell(f);
+            Behavior = (u8*)GetFarMemory(BehaviorSize);
+            fseek(f, 0, SEEK_SET);
+            fread(Behavior, BehaviorSize, 1, f);
+            fclose(f);
+            }
+         RedrawMap = 1;
+      }
+
       /* user likes music */
       else if (is.key)
 	 {
@@ -2504,6 +2543,34 @@ static int zoom_fit (edit_t& e)
     return 1;
   CenterMapAroundCoords ((MapMinX + MapMaxX) / 2, (MapMinY + MapMaxY) / 2);
   return 0;
+}
+
+/*
+   get the name of the BEHAVIOR lump file (returns NULL on Esc)
+*/
+
+static char *GetBehaviorFileName (const char *levelname)
+{
+#define BUFSZ 79
+  char *outfile = (char *) GetMemory (BUFSZ + 1);
+
+  /* get the file name */
+  // If no name, find a default one
+  if (! levelname)
+  {
+    levelname = "behavior";
+  }
+
+  al_scpslower (outfile, levelname, BUFSZ);
+  al_saps (outfile, ".o", BUFSZ);
+  InputFileName (-1, -1, "Name of the BEHAVIOR script file:", BUFSZ, outfile);
+  /* escape */
+  if (outfile[0] == '\0')
+  {
+    FreeMemory (outfile);
+    return 0;
+  }
+  return outfile;
 }
 
 
diff -N -p -r -u yadex-1.7.0-orig/src/l_prop.cc yadex-1.7.0/src/l_prop.cc
--- yadex-1.7.0-orig/src/l_prop.cc	Tue Oct 19 20:53:55 2004
+++ yadex-1.7.0/src/l_prop.cc	Tue Oct 19 23:16:01 2004
@@ -111,7 +111,7 @@ static const char *PrintLdtgroup (void *
 
 void LinedefProperties (int x0, int y0, SelPtr obj)
 {
-  char  *menustr[8];
+  char  *menustr[12];
   char   texname[WAD_TEX_NAME + 1];
   int    n, val;
   SelPtr cur, sdlist;
@@ -132,9 +132,9 @@ void LinedefProperties (int x0, int y0, 
   switch (val)
   {
     case 1:
-      for (n = 0; n < 8; n++)
+      for (n = 0; n < 12; n++)
 	menustr[n] = (char *) GetMemory (60);
-      sprintf (menustr[7], "Edit linedef #%d", obj->objnum);
+      sprintf (menustr[11], "Edit linedef #%d", obj->objnum);
       sprintf (menustr[0], "Change flags            (Current: %d)",
 	LineDefs[obj->objnum].flags);
       sprintf (menustr[1], "Change type             (Current: %d)",
@@ -149,7 +149,16 @@ void LinedefProperties (int x0, int y0, 
 	LineDefs[obj->objnum].sidedef1);
       sprintf (menustr[6], "Change 2nd sidedef ref. (Current: #%d)",
 	LineDefs[obj->objnum].sidedef2);
-      val = vDisplayMenu (x0 + 42, subwin_y0, menustr[7],
+      sprintf (menustr[7], "Change special arg2     (Current: %d)",
+	LineDefs[obj->objnum].arg2);
+      sprintf (menustr[8], "Change special arg3     (Current: %d)",
+	LineDefs[obj->objnum].arg3);
+      sprintf (menustr[9], "Change special arg4     (Current: %d)",
+	LineDefs[obj->objnum].arg4);
+      sprintf (menustr[10], "Change special arg5     (Current: %d)",
+	LineDefs[obj->objnum].arg5);
+      if (yg_level_format == YGLF_HEXEN)
+         val = vDisplayMenu (x0 + 42, subwin_y0, menustr[11],
 	menustr[0], YK_, 0,
 	menustr[1], YK_, 0,
 	menustr[2], YK_, 0,
@@ -157,8 +166,22 @@ void LinedefProperties (int x0, int y0, 
 	menustr[4], YK_, 0,
 	menustr[5], YK_, 0,
 	menustr[6], YK_, 0,
+	menustr[7], YK_, 0,
+	menustr[8], YK_, 0,
+	menustr[9], YK_, 0,
+	menustr[10], YK_, 0,
 	NULL);
-      for (n = 0; n < 8; n++)
+	  else
+         val = vDisplayMenu (x0 + 42, subwin_y0, menustr[11],
+	menustr[0], YK_, 0,
+	menustr[1], YK_, 0,
+	menustr[2], YK_, 0,
+	menustr[3], YK_, 0,
+	menustr[4], YK_, 0,
+	menustr[5], YK_, 0,
+	menustr[6], YK_, 0,
+	NULL);
+      for (n = 0; n < 12; n++)
 	FreeMemory (menustr[n]);
       subsubwin_y0 = subwin_y0 + BOX_BORDER + (2 + val) * FONTH;
       switch (val)
@@ -267,6 +290,50 @@ void LinedefProperties (int x0, int y0, 
 	      LineDefs[cur->objnum].sidedef2 = val;
 	    MadeChanges = 1;
 	    MadeMapChanges = 1;
+	  }
+	  break;
+
+	case 8:
+	  val = InputIntegerValue (x0 + 84, subsubwin_y0,
+	    0, 255, LineDefs[obj->objnum].arg2);
+	  if (val != IIV_CANCEL)  // Not [esc]
+	  {
+	    for (cur = obj; cur; cur = cur->next)
+	      LineDefs[cur->objnum].arg2 = val;
+	    MadeChanges = 1;
+	  }
+	  break;
+
+	case 9:
+	  val = InputIntegerValue (x0 + 84, subsubwin_y0,
+	    0, 255, LineDefs[obj->objnum].arg3);
+	  if (val != IIV_CANCEL)  // Not [esc]
+	  {
+	    for (cur = obj; cur; cur = cur->next)
+	      LineDefs[cur->objnum].arg3 = val;
+	    MadeChanges = 1;
+	  }
+	  break;
+
+	case 10:
+	  val = InputIntegerValue (x0 + 84, subsubwin_y0,
+	    0, 255, LineDefs[obj->objnum].arg4);
+	  if (val != IIV_CANCEL)  // Not [esc]
+	  {
+	    for (cur = obj; cur; cur = cur->next)
+	      LineDefs[cur->objnum].arg4 = val;
+	    MadeChanges = 1;
+	  }
+	  break;
+
+	case 11:
+	  val = InputIntegerValue (x0 + 84, subsubwin_y0,
+	    0, 255, LineDefs[obj->objnum].arg5);
+	  if (val != IIV_CANCEL)  // Not [esc]
+	  {
+	    for (cur = obj; cur; cur = cur->next)
+	      LineDefs[cur->objnum].arg5 = val;
+	    MadeChanges = 1;
 	  }
 	  break;
      }
diff -N -p -r -u yadex-1.7.0-orig/src/levels.cc yadex-1.7.0/src/levels.cc
--- yadex-1.7.0-orig/src/levels.cc	Tue Oct 19 20:53:55 2004
+++ yadex-1.7.0/src/levels.cc	Wed Oct 20 00:04:05 2004
@@ -58,6 +58,8 @@ int NumVertices;		/* number of vertexes 
 VPtr Vertices;			/* vertex data */
 int NumSectors;			/* number of sectors */
 SPtr Sectors;			/* sectors data */
+u8* Behavior;
+int BehaviorSize;
 
 // FIXME should be somewhere else
 int NumWTexture;		/* number of wall textures */
@@ -95,6 +97,10 @@ y_file_name_t Level_file_name_saved;  /*
 				   the Level has never been saved yet,
 				   an empty string. */
 
+static u8 DefaultBehavior[16] = {
+	'A', 'C', 'S', 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
+};
+
 void EmptyLevelData (const char *levelname)
 {
 Things = 0;
@@ -109,6 +115,12 @@ Sectors = 0;
 NumSectors = 0;
 Vertices = 0;
 NumVertices = 0;
+if (yg_level_format == YGLF_HEXEN)
+   {
+      BehaviorSize = sizeof(DefaultBehavior);
+      Behavior = (u8*) GetFarMemory ((unsigned long) BehaviorSize );
+      memcpy(Behavior, DefaultBehavior, BehaviorSize);
+   }
 }
 
 
@@ -199,7 +211,7 @@ else
    {
    offset = dir->dir.start;
    length = dir->dir.size;
-   if (MainWad == Iwad4)  // Hexen mode
+   if (yg_level_format == YGLF_HEXEN)  // Hexen mode
       {
       NumThings = (int) (length / WAD_HEXEN_THING_BYTES);
       if ((i32) (NumThings * WAD_HEXEN_THING_BYTES) != length)
@@ -234,18 +246,23 @@ if (NumThings > 0)
       rc = 1;
       goto byebye;
       }
-   if (MainWad == Iwad4)		// Hexen mode
+   if (yg_level_format == YGLF_HEXEN)		// Hexen mode
       for (long n = 0; n < NumThings; n++)
 	 {
          u8 dummy2[6];
-	 wf->read_i16   ();					// Tid
+	 wf->read_i16   (&Things[n].tid  );
 	 wf->read_i16   (&Things[n].xpos );
 	 wf->read_i16   (&Things[n].ypos );
-	 wf->read_i16   ();					// Height
+	 wf->read_i16   (&Things[n].height);
 	 wf->read_i16   (&Things[n].angle);
 	 wf->read_i16   (&Things[n].type );
 	 wf->read_i16   (&Things[n].when );
-         wf->read_bytes (dummy2, sizeof dummy2);
+	 wf->read_u8    (Things[n].special);
+	 wf->read_u8    (Things[n].arg1  );
+	 wf->read_u8    (Things[n].arg2  );
+	 wf->read_u8    (Things[n].arg3  );
+	 wf->read_u8    (Things[n].arg4  );
+	 wf->read_u8    (Things[n].arg5  );
 	 if (wf->error ())
 	    {
 	    err ("%s: error reading thing #%ld", lump_name, n);
@@ -283,7 +300,7 @@ if (yg_level_format != YGLF_ALPHA)
       NumLineDefs = 0;
    else
       {
-      if (MainWad == Iwad4)  // Hexen mode
+      if (yg_level_format == YGLF_HEXEN)  // Hexen mode
 	 {
 	 NumLineDefs = (int) (dir->dir.size / WAD_HEXEN_LINEDEF_BYTES);
 	 if ((i32) (NumLineDefs * WAD_HEXEN_LINEDEF_BYTES) != dir->dir.size)
@@ -310,7 +327,7 @@ if (yg_level_format != YGLF_ALPHA)
 	 rc = 1;
 	 goto byebye;
 	 }
-      if (MainWad == Iwad4)  // Hexen mode
+      if (yg_level_format == YGLF_HEXEN)  // Hexen mode
 	 for (long n = 0; n < NumLineDefs; n++)
 	    {
 	    u8 dummy[6];
@@ -322,6 +339,10 @@ if (yg_level_format != YGLF_ALPHA)
 	    wf->read_i16   (&LineDefs[n].sidedef2);
 	    LineDefs[n].type = dummy[0];
 	    LineDefs[n].tag  = dummy[1];  // arg1 often contains a tag
+		LineDefs[n].arg2 = dummy[2];
+		LineDefs[n].arg3 = dummy[3];
+		LineDefs[n].arg4 = dummy[4];
+		LineDefs[n].arg5 = dummy[5];
 	    if (wf->error ())
 	       {
 	       err ("%s: error reading linedef #%ld", lump_name, n);
@@ -907,6 +928,37 @@ else  // Doom alpha--a wholly different 
    }
 }
 
+// Read BEHAVIOR
+if (yg_level_format == YGLF_HEXEN)
+{
+const char *lump_name = "BEHAVIOR";
+verbmsg (" behavior\n");
+dir = FindMasterDir (Level, lump_name);
+if (dir)
+   {
+   BehaviorSize = (int)dir->dir.size;
+   if (BehaviorSize > 0)
+      {
+      Behavior = (u8*) GetFarMemory ((unsigned long) BehaviorSize );
+      const Wad_file *wf = dir->wadfile;
+      wf->seek (dir->dir.start);
+      if (wf->error ())
+         {
+         err ("%s: seek error", lump_name);
+         rc = 1;
+         goto byebye;
+         }
+      wf->read_bytes (Behavior, BehaviorSize);
+      if (wf->error ())
+         {
+         err ("%s: error behavior lump", lump_name);
+         rc = 1;
+         goto byebye;
+         }
+      }
+   }
+}
+
 /* Sanity checking on sidedefs: the sector must exist. I don't
    make this a fatal error, though, because it's not exceptional
    to find wads with unused sidedefs with a sector# of -1. Well
@@ -1011,16 +1063,10 @@ int SaveLevelData (const char *outfile, 
 FILE   *file;
 MDirPtr dir;
 int     n;
-long	lump_offset[WAD_LL__];
-size_t	lump_size[WAD_LL__];
+long	lump_offset[WAD_LL__MAX];
+size_t	lump_size[WAD_LL__MAX];
 wad_level_lump_no_t l;
 
-if (yg_level_format == YGLF_HEXEN || ! strcmp (Game, "hexen"))
-   {
-   Notify (-1, -1, "I refuse to save. Hexen mode is still",
-                   "too badly broken. You would lose data.");
-   return 1;
-   }
 if (! level_name || ! levelname2levelno (level_name))
    {
    nf_bug ("SaveLevelData: bad level_name \"%s\", using \"E1M1\" instead.",
@@ -1047,9 +1093,15 @@ bool reuse_nodes = Level
   && ! MadeMapChanges
   && yg_level_format != YGLF_ALPHA;
 
+int NumLumps;
+if (yg_level_format == YGLF_HEXEN)
+   NumLumps = WAD_LL__HEXEN;
+else
+   NumLumps = WAD_LL__DOOM;
+
 // Write the pwad header
 WriteBytes (file, "PWAD", 4);		// Pwad file
-file_write_i32 (file, WAD_LL__);	// Number of entries = 11
+file_write_i32 (file, NumLumps);	// Number of entries = 11
 file_write_i32 (file, 0);		// Fix this up later
 if (Level)
    dir = Level->next;
@@ -1067,11 +1119,30 @@ lump_offset[l] = ftell (file);
 ObjectsNeeded (OBJ_THINGS, 0);
 for (n = 0; n < NumThings; n++)
    {
-   file_write_i16 (file, Things[n].xpos );
-   file_write_i16 (file, Things[n].ypos );
-   file_write_i16 (file, Things[n].angle);
-   file_write_i16 (file, Things[n].type );
-   file_write_i16 (file, Things[n].when );
+   if (yg_level_format == YGLF_HEXEN)
+      {
+      file_write_i16 (file, Things[n].tid  );
+      file_write_i16 (file, Things[n].xpos );
+      file_write_i16 (file, Things[n].ypos );
+      file_write_i16 (file, Things[n].height);
+      file_write_i16 (file, Things[n].angle);
+      file_write_i16 (file, Things[n].type );
+      file_write_i16 (file, Things[n].when );
+      WriteBytes     (file, &Things[n].special, 1);
+      WriteBytes     (file, &Things[n].arg1, 1 );
+      WriteBytes     (file, &Things[n].arg2, 1 );
+      WriteBytes     (file, &Things[n].arg3, 1 );
+      WriteBytes     (file, &Things[n].arg4, 1 );
+      WriteBytes     (file, &Things[n].arg5, 1 );
+	  }
+   else
+      {
+      file_write_i16 (file, Things[n].xpos );
+      file_write_i16 (file, Things[n].ypos );
+      file_write_i16 (file, Things[n].angle);
+      file_write_i16 (file, Things[n].type );
+      file_write_i16 (file, Things[n].when );
+      }
    }
 lump_size[l] = ftell (file) - lump_offset[l];
 if (Level)
@@ -1083,13 +1154,32 @@ lump_offset[WAD_LL_LINEDEFS] = ftell (fi
 ObjectsNeeded (OBJ_LINEDEFS, 0);
 for (n = 0; n < NumLineDefs; n++)
    {
-   file_write_i16 (file, LineDefs[n].start   );
-   file_write_i16 (file, LineDefs[n].end     );
-   file_write_i16 (file, LineDefs[n].flags   );
-   file_write_i16 (file, LineDefs[n].type    );
-   file_write_i16 (file, LineDefs[n].tag     );
-   file_write_i16 (file, LineDefs[n].sidedef1);
-   file_write_i16 (file, LineDefs[n].sidedef2);
+   if (yg_level_format == YGLF_HEXEN)
+      {
+      u8 dummy[6];
+      dummy[0] = LineDefs[n].type;
+      dummy[1] = LineDefs[n].tag;
+      dummy[2] = LineDefs[n].arg2;
+      dummy[3] = LineDefs[n].arg3;
+      dummy[4] = LineDefs[n].arg4;
+      dummy[5] = LineDefs[n].arg5;
+      file_write_i16 (file, LineDefs[n].start   );
+      file_write_i16 (file, LineDefs[n].end     );
+      file_write_i16 (file, LineDefs[n].flags   );
+      WriteBytes     (file, dummy, 6);
+      file_write_i16 (file, LineDefs[n].sidedef1);
+      file_write_i16 (file, LineDefs[n].sidedef2);
+	  }
+   else
+      {
+      file_write_i16 (file, LineDefs[n].start   );
+      file_write_i16 (file, LineDefs[n].end     );
+      file_write_i16 (file, LineDefs[n].flags   );
+      file_write_i16 (file, LineDefs[n].type    );
+      file_write_i16 (file, LineDefs[n].tag     );
+      file_write_i16 (file, LineDefs[n].sidedef1);
+      file_write_i16 (file, LineDefs[n].sidedef2);
+	  }
    }
 lump_size[l] = ftell (file) - lump_offset[l];
 if (Level)
@@ -1221,9 +1311,21 @@ lump_size[l] = ftell (file) - lump_offse
 if (Level)
    dir = dir->next;
 
+ 
+// Write the BEHAVIOR lump
+if (yg_level_format == YGLF_HEXEN)
+{
+   l = WAD_LL_BEHAVIOR;
+   lump_offset[l] = ftell (file);
+   WriteBytes(file, Behavior, BehaviorSize);
+   lump_size[l] = BehaviorSize;
+   if (Level)
+      dir = dir->next;
+}
+
 // Write the actual directory
 long dir_offset = ftell (file);
-for (int L = 0; L < (int) WAD_LL__; L++)
+for (int L = 0; L < (int) NumLumps; L++)
    {
    file_write_i32 (file, lump_offset[L]);
    file_write_i32 (file, lump_size[L]);
diff -N -p -r -u yadex-1.7.0-orig/src/levels.h yadex-1.7.0/src/levels.h
--- yadex-1.7.0-orig/src/levels.h	Tue Oct 19 20:53:55 2004
+++ yadex-1.7.0/src/levels.h	Tue Oct 19 22:22:49 2004
@@ -28,6 +28,8 @@ extern VPtr  Vertices;		/* vertices data
 extern int   NumSegs;		/* number of segments */
 extern int   NumSectors;	/* number of sectors */
 extern SPtr  Sectors;		/* sectors data */
+extern u8*   Behavior;
+extern int   BehaviorSize;
 
 // FIXME should be somewhere else
 extern int   NumWTexture;	/* number of wall textures */
diff -N -p -r -u yadex-1.7.0-orig/src/objects.cc yadex-1.7.0/src/objects.cc
--- yadex-1.7.0-orig/src/objects.cc	Tue Oct 19 20:53:55 2004
+++ yadex-1.7.0/src/objects.cc	Tue Oct 19 23:53:42 2004
@@ -465,12 +465,28 @@ switch (objtype)
 	 Things[last].type  = Things[copyfrom].type;
 	 Things[last].angle = Things[copyfrom].angle;
 	 Things[last].when  = Things[copyfrom].when;
+	 Things[last].tid   = Things[copyfrom].tid;
+	 Things[last].height = Things[copyfrom].height;
+	 Things[last].special = Things[copyfrom].special;
+	 Things[last].arg1  = Things[copyfrom].arg1;
+	 Things[last].arg2  = Things[copyfrom].arg2;
+	 Things[last].arg3  = Things[copyfrom].arg3;
+	 Things[last].arg4  = Things[copyfrom].arg4;
+	 Things[last].arg5  = Things[copyfrom].arg5;
 	 }
       else
 	 {
 	 Things[last].type = default_thing;
 	 Things[last].angle = 0;
 	 Things[last].when  = 0x07;
+	 Things[last].tid   = 0;
+	 Things[last].height = 0;
+	 Things[last].special = 0;
+	 Things[last].arg1  = 0;
+	 Things[last].arg2  = 0;
+	 Things[last].arg3  = 0;
+	 Things[last].arg4  = 0;
+	 Things[last].arg5  = 0;
 	 }
       break;
 
@@ -508,6 +524,10 @@ switch (objtype)
 	 LineDefs[last].flags = LineDefs[copyfrom].flags;
 	 LineDefs[last].type  = LineDefs[copyfrom].type;
 	 LineDefs[last].tag   = LineDefs[copyfrom].tag;
+	 LineDefs[last].arg2  = LineDefs[copyfrom].arg2;
+	 LineDefs[last].arg3  = LineDefs[copyfrom].arg3;
+	 LineDefs[last].arg4  = LineDefs[copyfrom].arg4;
+	 LineDefs[last].arg5  = LineDefs[copyfrom].arg5;
 	 }
       else
 	 {
@@ -516,6 +536,10 @@ switch (objtype)
 	 LineDefs[last].flags = 1;
 	 LineDefs[last].type  = 0;
 	 LineDefs[last].tag   = 0;
+	 LineDefs[last].arg2  = 0;
+	 LineDefs[last].arg3  = 0;
+	 LineDefs[last].arg4  = 0;
+	 LineDefs[last].arg5  = 0;
 	 }
       LineDefs[last].sidedef1 = OBJ_NO_NONE;
       LineDefs[last].sidedef2 = OBJ_NO_NONE;
diff -N -p -r -u yadex-1.7.0-orig/src/sanity.cc yadex-1.7.0/src/sanity.cc
--- yadex-1.7.0-orig/src/sanity.cc	Tue Oct 19 20:53:55 2004
+++ yadex-1.7.0/src/sanity.cc	Tue Oct 19 22:11:08 2004
@@ -67,10 +67,10 @@ void check_types ()
   assert_size (i16, 2);
   assert_size (u32, 4);
   assert_size (i32, 4);
-  assert_size (struct LineDef, 14);
+  assert_size (struct LineDef, 18);
   assert_size (struct Sector,  26);
   assert_size (struct SideDef, 30);
-  assert_size (struct Thing,   10);
+  assert_size (struct Thing,   20);
   assert_size (struct Vertex,   4);
   assert_wrap (u8,          255,           0);
   assert_wrap (i8,          127,        -128);
diff -N -p -r -u yadex-1.7.0-orig/src/t_prop.cc yadex-1.7.0/src/t_prop.cc
--- yadex-1.7.0-orig/src/t_prop.cc	Tue Oct 19 20:53:55 2004
+++ yadex-1.7.0/src/t_prop.cc	Tue Oct 19 23:43:46 2004
@@ -45,6 +45,7 @@ Place, Suite 330, Boston, MA 02111-1307,
 static const char *PrintThinggroup (void *ptr);
 static const char *PrintThingdef (void *ptr);
 int InputThingType (int x0, int y0, int *number);
+int InputLinedefType (int x0, int y0, int *number);
 
 
 /*
@@ -59,9 +60,9 @@ int    n, val;
 SelPtr cur;
 int    subwin_y0;
 
-for (n = 0; n < 6; n++)
+for (n = 0; n < 14; n++)
    menustr[n] = (char *) GetMemory (60);
-sprintf (menustr[5], "Edit thing #%d", obj->objnum);
+sprintf (menustr[13], "Edit thing #%d", obj->objnum);
 sprintf (menustr[0], "Change type          (Current: %s)",
          get_thing_name (Things[obj->objnum].type));
 sprintf (menustr[1], "Change angle         (Current: %s)",
@@ -72,14 +73,47 @@ sprintf (menustr[3], "Change X position 
          Things[obj->objnum].xpos);
 sprintf (menustr[4], "Change Y position    (Current: %d)",
          Things[obj->objnum].ypos);
-val = vDisplayMenu (x0, y0, menustr[5],
+sprintf (menustr[5], "Change Z position    (Current: %d)",
+         Things[obj->objnum].height);
+sprintf (menustr[6], "Change TID           (Current: %d)",
+         Things[obj->objnum].tid);
+sprintf (menustr[7], "Change special       (Current: %d)",
+         Things[obj->objnum].special);
+sprintf (menustr[8], "Change arg1          (Current: %d)",
+         Things[obj->objnum].arg1);
+sprintf (menustr[9], "Change arg2          (Current: %d)",
+         Things[obj->objnum].arg2);
+sprintf (menustr[10], "Change arg3          (Current: %d)",
+         Things[obj->objnum].arg3);
+sprintf (menustr[11], "Change arg4          (Current: %d)",
+         Things[obj->objnum].arg4);
+sprintf (menustr[12], "Change arg5          (Current: %d)",
+         Things[obj->objnum].arg5);
+if (yg_level_format == YGLF_HEXEN)		// Hexen mode
+val = vDisplayMenu (x0, y0, menustr[13],
    menustr[0], YK_, 0,
    menustr[1], YK_, 0,
    menustr[2], YK_, 0,
    menustr[3], YK_, 0,
    menustr[4], YK_, 0,
+   menustr[5], YK_, 0,
+   menustr[6], YK_, 0,
+   menustr[7], YK_, 0,
+   menustr[8], YK_, 0,
+   menustr[9], YK_, 0,
+   menustr[10], YK_, 0,
+   menustr[11], YK_, 0,
+   menustr[12], YK_, 0,
    NULL);
-for (n = 0; n < 6; n++)
+else
+val = vDisplayMenu (x0, y0, menustr[13],
+   menustr[0], YK_, 0,
+   menustr[1], YK_, 0,
+   menustr[2], YK_, 0,
+   menustr[3], YK_, 0,
+   menustr[4], YK_, 0,
+   NULL);
+for (n = 0; n < 14; n++)
    FreeMemory (menustr[n]);
 subwin_y0 = y0 + BOX_BORDER + (2 + val) * FONTH;
 switch (val)
@@ -237,6 +271,93 @@ switch (val)
 	n = val - Things[obj->objnum].ypos;
 	for (cur = obj; cur; cur = cur->next)
 	   Things[cur->objnum].ypos += n;
+	MadeChanges = 1;
+        }
+     break;
+
+  case 6:
+     val = InputIntegerValue (x0 + 42, subwin_y0, -32768, 32767,
+                              Things[obj->objnum].height);
+     if (val != IIV_CANCEL)
+        {
+	n = val - Things[obj->objnum].height;
+	for (cur = obj; cur; cur = cur->next)
+	   Things[cur->objnum].height += n;
+	MadeChanges = 1;
+        }
+     break;
+
+  case 7:
+     val = InputIntegerValue (x0 + 42, subwin_y0, -32768, 32767,
+                              Things[obj->objnum].tid);
+     if (val != IIV_CANCEL)
+        {
+	for (cur = obj; cur; cur = cur->next)
+	   Things[cur->objnum].tid = val;
+	MadeChanges = 1;
+        }
+     break;
+
+  case 8:
+     if (! InputLinedefType (x0 + 42, subwin_y0, &val))
+        {
+	for (cur = obj; cur; cur = cur->next)
+	   Things[cur->objnum].special = val;
+	MadeChanges = 1;
+        }
+     break;
+
+  case 9:
+     val = InputIntegerValue (x0 + 42, subwin_y0, 0, 255,
+                              Things[obj->objnum].arg1);
+     if (val != IIV_CANCEL)
+        {
+	for (cur = obj; cur; cur = cur->next)
+	   Things[cur->objnum].arg1 = val;
+	MadeChanges = 1;
+        }
+     break;
+
+  case 10:
+     val = InputIntegerValue (x0 + 42, subwin_y0, 0, 255,
+                              Things[obj->objnum].arg2);
+     if (val != IIV_CANCEL)
+        {
+	for (cur = obj; cur; cur = cur->next)
+	   Things[cur->objnum].arg2 = val;
+	MadeChanges = 1;
+        }
+     break;
+
+  case 11:
+     val = InputIntegerValue (x0 + 42, subwin_y0, 0, 255,
+                              Things[obj->objnum].arg3);
+     if (val != IIV_CANCEL)
+        {
+	for (cur = obj; cur; cur = cur->next)
+	   Things[cur->objnum].arg3 = val;
+	MadeChanges = 1;
+        }
+     break;
+
+  case 12:
+     val = InputIntegerValue (x0 + 42, subwin_y0, 0, 255,
+                              Things[obj->objnum].arg4);
+     if (val != IIV_CANCEL)
+        {
+	for (cur = obj; cur; cur = cur->next)
+	   Things[cur->objnum].arg4 = val;
+	MadeChanges = 1;
+        }
+     break;
+
+  case 13:
+     val = InputIntegerValue (x0 + 42, subwin_y0, 0, 255,
+                              Things[obj->objnum].arg5);
+     if (val != IIV_CANCEL)
+        {
+	for (cur = obj; cur; cur = cur->next)
+	   Things[cur->objnum].arg5 = val;
 	MadeChanges = 1;
         }
      break;
diff -N -p -r -u yadex-1.7.0-orig/src/wstructs.h yadex-1.7.0/src/wstructs.h
--- yadex-1.7.0-orig/src/wstructs.h	Tue Oct 19 20:53:55 2004
+++ yadex-1.7.0/src/wstructs.h	Tue Oct 19 22:45:16 2004
@@ -84,14 +84,30 @@ typedef i16 wad_tangle_t;
 typedef i16 wad_tflags_t;
 struct Thing
 {
+  i16              tid;
   wad_coord_t      xpos;		// FIXME rename to "x"
   wad_coord_t      ypos;		// FIXME rename to "y"
+  wad_z_t          height;
   wad_tangle_t     angle;
   wad_ttype_t      type;
   wad_tflags_t     when;		// FIXME rename to "flags"
+  u8               special;
+  u8               arg1;
+  u8               arg2;
+  u8               arg3;
+  u8               arg4;
+  u8               arg5;
 };
 typedef struct
 {
+  wad_coord_t      xpos;		// FIXME rename to "x"
+  wad_coord_t      ypos;		// FIXME rename to "y"
+  wad_tangle_t     angle;
+  wad_ttype_t      type;
+  wad_tflags_t     when;		// FIXME rename to "flags"
+} wad_doom_thing_t;
+typedef struct
+{
   i16              tid;
   wad_coord_t      x;
   wad_coord_t      y;
@@ -121,11 +137,25 @@ struct LineDef
   wad_ldflags_t flags;
   wad_ldtype_t  type;
   wad_tag_t     tag;
+  u8            arg2;
+  u8            arg3;
+  u8            arg4;
+  u8            arg5;
   wad_sdn_t     sidedef1;		// # of first (right) sidedef
   wad_sdn_t     sidedef2;		// # of second (left) sidedef or 0xffff
 };
 typedef struct
 {
+  wad_vn_t      start;			// # of start vertex
+  wad_vn_t      end;			// # of end vertex
+  wad_ldflags_t flags;
+  wad_ldtype_t  type;
+  wad_tag_t     tag;
+  wad_sdn_t     sidedef1;		// # of first (right) sidedef
+  wad_sdn_t     sidedef2;		// # of second (left) sidedef or 0xffff
+} wad_doom_linedef_t;
+typedef struct
+{
   wad_vn_t      start;
   wad_vn_t      end;
   wad_ldflags_t flags;
@@ -197,8 +227,11 @@ typedef enum
   WAD_LL_SECTORS,
   WAD_LL_REJECT,
   WAD_LL_BLOCKMAP,
-		      // Hexen has a BEHAVIOR lump here
-  WAD_LL__
+  WAD_LL_BEHAVIOR,
+
+  WAD_LL__MAX,
+  WAD_LL__HEXEN = WAD_LL__MAX,
+  WAD_LL__DOOM = WAD_LL_BEHAVIOR
 } wad_level_lump_no_t;
 
 typedef struct
@@ -207,7 +240,7 @@ typedef struct
   size_t item_size;
 } wad_level_lump_def_t;
 
-const wad_level_lump_def_t wad_level_lump[WAD_LL__] =
+const wad_level_lump_def_t wad_level_lump[WAD_LL__MAX] =
 {
   { 0,          0                 },  // Label -- no fixed name
   { "THINGS",   WAD_THING_BYTES   },
@@ -219,8 +252,8 @@ const wad_level_lump_def_t wad_level_lum
   { "NODES",    0                 },
   { "SECTORS",  WAD_SECTOR_BYTES  },
   { "REJECT",   0                 },
-  { "BLOCKMAP", 0                 }
-				      // Hexen has a BEHAVIOR lump here
+  { "BLOCKMAP", 0                 },
+  { "BEHAVIOR", 0                 }
 };
 
 
--- yadex-1.7.0-orig/ygd/hexen.ygd	Tue Oct 19 20:53:55 2004
+++ yadex-1.7.0/ygd/hexen.ygd	Wed Oct 20 23:55:14 2004
@@ -108,6 +108,7 @@ ldt 100 x "?? Scroll left"   "??  Scroll
 ldt 101 x "?? Scroll right"  "??  Scroll_Texture_Right"
 ldt 102 x "?? Scroll up"     "??  Scroll_Texture_Up"
 ldt 103 x "?? Scroll down"   "??  Scroll_Texture_Down"
+ldt 109 L "?? Force lightng" "??  Light_ForceLightning"
 ldt 110 L "?? Raise light"   "??  Light_RaiseByValue"
 ldt 111 L "?? Lower light"   "??  Light_LowerByValue"
 ldt 112 L "?? Set light"     "??  Light_ChangeToValue"
@@ -136,25 +137,12 @@ ldt 140 x "?? Change sound"  "??  Sector
 #
 
 st   0 "  Normal"       "Normal"
-st   1 "  Phased light" "light phased"           # FIXME
-st   2 "  Light start"  "lightsequencestart"     # FIXME
-st   3 "  Light specl1" "lightsequencespecial1"  # FIXME
-st   4 "  Light specl2" "lightsequencespecial2"  # FIXME
-st   9 "  Secret"       "Sector counts toward secret count"
+st   1 "  Phased light" "light phased"
+st   2 "  Light start"  "lightsequencestart"
+st   3 "  Light specl1" "lightsequencespecial1"
+st   4 "  Light specl2" "lightsequencespecial2"
 st  26 "  Stairs1"      "Stairs special 1"
 st  27 "  Stairs2"      "Stairs special 2"
-st  40 "  Wind east 1"  "Wind east force 1"
-st  41 "  Wind east 2"  "Wind east force 2"
-st  42 "  Wind east 3"  "Wind east force 3"
-st  43 "  Wind north 1" "Wind north force 1"
-st  44 "  Wind north 2" "Wind north force 2"
-st  45 "  Wind north 3" "Wind north force 3"
-st  46 "  Wind south 1" "Wind south force 1"
-st  47 "  Wind south 2" "Wind south force 2"
-st  48 "  Wind south 3" "Wind south force 3"
-st  49 "  Wind west 1"  "Wind west force 1"
-st  50 "  Wind west 2"  "Wind west force 2"
-st  51 "  Wind west 3"  "Wind west force 3"
 st 198 "  Lightning 64" "Indoor lightning, +64 units"
 st 199 "  Lightning 32" "Indoor lightning, +32 units"
 st 200 "  Sky2"         "Use MAPINFO sky2"
@@ -191,17 +179,21 @@ st 224 "  Scroll SW F"  "Scroll southwes
 thinggroup p rgb:4/f/4 "Player"
 thinggroup m rgb:f/0/0 "Monster"
 thinggroup w rgb:f/a/0 "Weapon"
-thinggroup a rgb:8/5/0 "Ammunition"
+thinggroup a rgb:8/5/0 "Mana"
 thinggroup h rgb:2/8/0 "Health & armour"
+thinggroup A rgb:2/8/0 "Artifacts"
+thinggroup q rgb:2/8/0 "Quest items"
 thinggroup b rgb:2/8/0 "Misc. bonus"
 thinggroup k rgb:f/0/f "Key"
 thinggroup P rgb:6/6/c "Plants"
+thinggroup t rgb:6/6/c "Stalagm. & stalact."
+thinggroup g rgb:6/6/c "Gargoyle statues"
+thinggroup T rgb:6/6/c "Table stuff"
+thinggroup D rgb:6/6/c "Dungeon stuff"
 thinggroup d rgb:6/6/c "Misc. decoration"
 thinggroup l rgb:6/6/c "Light source"
-#thinggroup g rgb:6/6/c "Gory decoration"
-#thinggroup c rgb:6/6/c "Corpse"
-thinggroup e rgb:0/b/d "Environment sound"
-thinggroup s rgb:0/b/d "Ambient sound"
+thinggroup s rgb:0/b/d "Sound"
+thinggroup S rgb:0/b/d "Special"
 
 #
 #	Definition of things
@@ -210,56 +202,268 @@ thinggroup s rgb:0/b/d "Ambient sound"
 #	<desc> must not exceed 19 characters.
 #
 
-thing     1 p -   16 "Player 1 start"		PLAY
-thing     2 p -   16 "Player 2 start"		PLAY
-thing     3 p -   16 "Player 3 start"		PLAY
-thing     4 p -   16 "Player 4 start"		PLAY
+thing     1 p -   16 "Player 1 start *"		PLAY
+thing     2 p -   16 "Player 2 start *"		PLAY
+thing     3 p -   16 "Player 3 start *"		PLAY
+thing     4 p -   16 "Player 4 start *"		PLAY
 thing    11 p -   16 "Deathmatch start"		PLAYF1
 thing    14 p -   16 "Teleport exit"		TELE
+thing  9100 p -   16 "Player 5 start *"		PLAY
+thing  9101 p -   16 "Player 6 start *"		PLAY
+thing  9102 p -   16 "Player 7 start *"		PLAY
+thing  9103 p -   16 "Player 8 start *"		PLAY
 
-thing    31 m -   32 "Demon"			DEMN
+thing    31 m -   32 "Chaos serpent"		DEMN
+thing    34 m -   40 "Reiver"			WRTH
 thing   107 m -   20 "Centaur"			CENT
+thing   114 m -   44 "Dark bishop"		BISH
 thing   115 m -   20 "Centaur leader"		CENTF
-thing   120 m -   17 "Serpent leader"		SSPTK	# Not too sure...
-thing   121 m -   17 "Serpent"			SSDV	# Not too sure...
-thing  8020 m -   22 "Ice guy"			ICEY
+thing   120 m -   17 "Stalker leader"		SSPTK
+thing   121 m -   17 "Stalker"			SSDV
+thing   254 m -   40 "Death wyvern *"		DRAG
+thing  8020 m -   22 "Wendigo"			ICEY
+thing  8080 m -   64 "Chaos serpent (gas)"	DEM2
+thing 10011 m -   40 "Reiver leader"		WRTH
 thing 10030 m -   25 "Ettin"			ETTN
-thing 10060 m -   20 "Fire demon"		FDMN
-
-thing    10 w -   17 "Serpent staff"		WCSS   # Cleric
-thing    53 w -   17 "Frost chards"		WMCS   # Mage
-thing  8010 w -   17 "Timon's axe"		WFAX   # Fighter
+thing 10060 m -   20 "Fire gargoyle"		FDMN
+thing 10080 m -   80 "Heresiarch"		SORC
+thing 10100 m -   32 "Zedek (fighter)"		PLAYA8
+thing 10101 m -   32 "Traductus (cleric)"	CLERA8
+thing 10102 m -   32 "Menelkir (mage)"		MAGEA8
+thing 10200 m -   20 "Korax"			KORX
+
+thing    10 w -   17 "Serpent staff"		WCSS
+thing    12 w -   20 "Quietus blade"		WFR1
+thing    13 w -   20 "Quietus guard"		WFR2
+thing    16 w -   20 "Quietus hilt"		WFR3
+thing    18 w -   20 "Wraithverge head"		WCH1
+thing    19 w -   20 "Wraithverge center"	WCH2
+thing    20 w -   20 "Wraithverge grip"		WCH3
+thing    21 w -   20 "Bloodscourge head"	WMS1
+thing    22 w -   20 "Bloodscourge center"	WMS2
+thing    23 w -   20 "Bloodscourge grip"	WMS3
+thing    53 w -   17 "Frost chards"		WMCS
+thing   123 w -   10 "Hammer of retributn"	WFHM
+thing  8009 w -   10 "Firestorm"		WCFM
+thing  8010 w -   17 "Timon's axe"		WFAX
+thing  8040 w -   20 "Arc of death"		WMLG
 
 thing   122 a -   17 "Blue manna"		MAN1
 thing   124 a -   17 "Green manna"		MAN2
 thing  8004 a -   17 "Combined manna"		MAN3
 
 thing    81 h -   17 "Crystal vial"		PTN1
-thing    82 h -   17 "Quartz flask"		PTN2
-thing  8000 h -   17 "Flechette"		PSBG
+thing  8005 h -   10 "Mesh armor"		ARM1
+thing  8006 h -   20 "Falcon shield"		ARM2
 thing  8007 h -   17 "Platinum helmet"		ARM3
+thing  8008 h -   20 "Amulet of warding"	ARM4
 
-thing   314 k -   17 "Stone (?) key"		KEY7
+thing    30 A -   20 "Porkalator"		ARTIPORK
+thing    32 A -   20 "Mystic urn"		ARTISPHL
+thing    33 A -   20 "Torch"			ARTITRCH
+thing    36 A -   20 "Chaos device"		ARTIATLP
+thing    82 A -   17 "Quartz flask"		PTN2
+thing    83 A -   20 "Wings of wrath"		SOAR
+thing    84 A -   20 "Icon of defender"		INVU
+thing    86 A -   15 "Dark servant"		ARTISUMN
+thing  8000 A -   17 "Flechette"		PSBG
+thing  8002 A -   20 "Boots of speed"		ARTISPED
+thing  8003 A -   20 "Krater of might"		ARTIBMAN
+thing  8041 A -   20 "Dragonskin bracers"	ARTIBRAC
+thing 10040 A -   20 "Banishment device"	ARTITELO
+thing 10110 A -   20 "Disc of repulsion"	ARTIBLST
+thing 10120 A -   20 "Mystic ambient inc"	ARTIHRAD
+
+thing  9002 q -   20 "Yorick's skull"		ARTISKLL
+thing  9003 q -   20 "Heart of D'Sparil"	ARTIBGEM
+thing  9004 q -   20 "Ruby planet"		ARTIGEMR
+thing  9005 q -   20 "Emerald planet 1"		ARTIGEMG
+thing  9006 q -   20 "Sapphire planet 1"	ARTIGEMB
+thing  9007 q -   20 "Daemon codex"		ABK1
+thing  9008 q -   20 "Liber oscura"		ABK2
+thing  9009 q -   20 "Emerald planet 2"		ARTIGMG2
+thing  9010 q -   20 "Sapphire planet 2"	ARTIGMB2
+thing  9014 q -   20 "Flame mask"		ARTISKL2
+thing  9015 q -   20 "Glaive seal"		ARTIFWEP
+thing  9016 q -   20 "Holy relic"		ARTICWEP
+thing  9017 q -   20 "Sigil of the Magus"	ARTIMWEP
+thing  9018 q -   20 "Clock gear 1"		ARTIGEAR
+thing  9019 q -   20 "Clock gear 2"		ARTIGER2
+thing  9020 q -   20 "Clock gear 3"		ARTIGER3
+thing  9021 q -   20 "Clock gear 4"		ARTIGER4
+
+thing  8030 k -   10 "Steel key"		KEY1
+thing  8031 k -   10 "Cave key"			KEY2
+thing  8032 k -   10 "Axe key"			KEY3
+thing  8033 k -   10 "Fire key"			KEY4
+thing  8034 k -   10 "Emerald key"		KEY5
+thing  8035 k -   10 "Dungeon key"		KEY6
+thing  8036 k -   10 "Silver key"		KEY7
+thing  8037 k -   10 "Rusted key"		KEY8
+thing  8038 k -   10 "Horn key"			KEY9
+thing  8039 k -   10 "Swamp key"		KEYA
+thing  8200 k -   10 "Castle key"		KEYB
 
+thing    24 P -   20 "Tree trunk (brown)"	TRE1
+thing    25 P -   20 "Tree trunk (brownD)"	TRE1
 thing    26 P -   17 "Swamp tree tall"		TRE2
 thing    27 P -   17 "Swamp tree short"		TRE3
+thing    28 P -   20 "Tree stump (splint)"	STM1
+thing    29 P -   20 "Tree stump"		STM2
+thing    39 P -   20 "Mushroom (large, L)"	MSH1
+thing    40 P -   20 "Mushroom (large, R)"	MSH2
+thing    41 P -   20 "Mushroom (med, L)"	MSH3
+thing    42 P -   20 "Mushroom (small, R)"	MSH4
+thing    44 P -   20 "Mushroom (small)"		MSH5
+thing    45 P -   20 "Mushroom (small, F)"	MSH6
+thing    46 P -   20 "Mushroom (small, B)"	MSH7
+thing    47 P -   20 "Mushroom (small, M)"	MSH8
+thing    60 P -   20 "Vine"			TRE3
 thing    78 P -   17 "Tree leaning right"	TRE4
 thing    79 P -   17 "Tree leaning left"	TRE5
 thing    80 P -   17 "Gnarled tree right"	TRE6
 thing    87 P -   17 "Gnarled tree left"	TRE7
+thing   113 P -   10 "Blowing leaves"		LEF1
 thing  8062 P -   17 "Dead tree"		TRDT
 thing  8068 P -   17 "Conic tree"		XMAS
-
-thing    48 d -   17 "Stalactite+gmite"		SGMP
-thing    72 d -   17 "Statue"			STT2
-thing    74 d -   17 "Short statue"		STT4
+thing  8101 P -   20 "Shrub (small)"		SHB1
+thing  8102 P -   20 "Shrub (large)"		SHB2
+thing  8103 P -   20 "Bucket (hanging)"		BCKT
+thing  8104 P -   20 "Mushroom (explodng)"	SHRM
+
+thing    48 t -   17 "Stalactite+gmite"		SGMP
+thing    49 t -   20 "Stalagmite (large)"	SGM1
+thing    50 t -   20 "Stalagmite (medium)"	SGM2
+thing    51 t -   20 "Stalagmite (small)"	SGM3
+thing    52 t -   20 "Stalactite (large)"	SLC1
+thing    56 t -   20 "Stalactite (medium)"	SLC2
+thing    57 t -   20 "Stalactite (small)"	SLC3
+thing    89 t -   20 "Ice stalactite(lrg)"	ICT1
+thing    90 t -   20 "Ice stalactite(med)"	ICT2
+thing    91 t -   20 "Ice stalactite(sml)"	ICT3
+thing    92 t -   20 "Ice stalactite(tny)"	ICT4
+thing    93 t -   20 "Ice stalagmite(lrg)"	ICM1
+thing    94 t -   20 "Ice stalagmite(med)"	ICM2
+thing    95 t -   20 "Ice stalagmite(sml)"	ICM3
+thing    96 t -   20 "Ice stalagmite(tny)"	ICM4
+
+thing     5 g -   20 "Gargoyle statue w/s"	STTW
+thing    72 g -   17 "Stone gargoyle tall"	STT2
+thing    73 g -   20 "Ice gargoyle tall"	STT3
+thing    74 g -   17 "Stone gargoyle shrt"	STT4
+thing    76 g -   20 "Ice gargoyle short"	STT5
+thing  8044 g -   20 "Wooden gargoyle tal"	GAR1
+thing  8045 g -   20 "Fire gargoyle tall"	GAR2
+thing  8046 g -   20 "Red gargoyle tall"	GAR3
+thing  8047 g -   20 "Wooden gargoyle tal"	GAR4
+thing  8048 g -   20 "Metal gargoyle tall"	GAR5
+thing  8049 g -   20 "Fire gargoyle short"	GAR6
+thing  8050 g -   20 "Red gargoyle short"	GAR7
+thing  8051 g -   20 "Wooden gargoyle srt"	GAR8
+thing  8052 g -   20 "Metal gargoyle shrt"	GAR9
+thing  9011 g -   20 "Gargoyle statue"		STWN
+
+thing  8500 T -   20 "Stein (tall)"		TST1
+thing  8501 T -   20 "Stein (short)"		TST2
+thing  8502 T -   20 "Candle w/spider web"	TST3
+thing  8503 T -   20 "Candle (short)"		TST4
+thing  8504 T -   20 "Candle (tall)"		TST5
+thing  8505 T -   20 "Goblet (spilled)"		TST6
+thing  8506 T -   20 "Goblet (tall)"		TST7
+thing  8507 T -   20 "Goblet (short)"		TST8
+thing  8508 T -   20 "Goblet w/silver bnd"	TST9
+thing  8509 T -   20 "Meat cleaver"		TST0
+
+thing    61 D -   20 "Corpse impaled"		CPS1
+thing    62 D -   20 "Corpse sleeping"		CPS2
+thing    71 D -   20 "Corpse hung legs"		CPS3
+thing   108 D -   20 "Corpse hung"		CPS4
+thing   109 D -   20 "Corpse bleeding"		CPS5
+thing   110 D -   20 "Corpse chained"		CPS6
+thing   111 D -   10 "Pool of blood"		BDPL
+thing  8067 D -   20 "Iron maiden"		IRON
+thing  8071 D -   20 "Chain (short)"		CHNS
+thing  8072 D -   20 "Chain (long)"		CHNSB0
+thing  8073 D -   20 "Chain heart on hook"	CHNSC0
+thing  8074 D -   20 "Chain w/large hook"	CHNSD0
+thing  8075 D -   20 "Chain w/small hook"	CHNSE0
+thing  8076 D -   20 "Chain w/spiked ball"	CHNSF0
+thing  8077 D -   20 "Chain skull on hook"	CHNSG0
+
+thing     6 d -   20 "Rock w/moss (tiny)"	RCK1
+thing     7 d -   20 "Rock w/moss (small)"	RCK2
+thing     9 d -   20 "Rock w/moss (medium)"	RCK3
+thing    15 d -   20 "Rock w/moss (large)"	RCK4
+thing    37 d -   20 "Stump w/moss (short)"	STM3
+thing    38 d -   20 "Stump w/moss (tall)"	STM4
+thing    58 d -   20 "Moss (three strands)"	MSS1
+thing    59 d -   20 "Moss (one strand)"	MSS2
+thing    63 d -   20 "Tombstone (R.I.P.)"	TMS1
+thing    64 d -   20 "Tombstone (Shane)"	TMS2
+thing    65 d -   20 "Tombstone (large cross)"	TMS3
+thing    66 d -   20 "Tombstone (Brian R.)"	TMS4
+thing    67 d -   20 "Tombstone (circular cross)"	TMS5
+thing    68 d -   20 "Tombstone (small cross on pedestal)"	TMS6
+thing    69 d -   20 "Tombstone (Brian P.)"	TMS7
 thing    77 d -   17 "Banner"			BNR1
-
-thing    54 l -   17 "Torch"			WLTR
-thing  8061 l -   17 "FIXME"			BRTR
-
-thing   314 e -   17 "Bogus sound"
-
-thing   314 s -   17 "Bogus sound"
-
-
+thing    88 d -   20 "Log"			LOGG
+thing    97 d -   20 "Rock formation (large, brown)"	RKBL
+thing    98 d -   20 "Rock formation (small, brown)"	RKBS
+thing    99 d -   20 "Rock formation (small, gray)"	RKBK
+thing   100 d -   20 "Rubble (large)"		RBL1
+thing   101 d -   20 "Rubble (small)"		RBL2
+thing   102 d -   20 "Rubble (medium)"		RBL3
+thing   103 d -   20 "Vase on pedestal"		VASE
+thing   104 d -   20 "Pot (tall, skinny) *"	POT1
+thing   105 d -   20 "Pot (medium, skinny) *"	POT2
+thing   106 d -   20 "Pot (short, chipped) *"	POT3
+thing   140 d -   20 "Sparkling red smoke"	TSMK
+thing  8064 d -   20 "Suit of armor *"		SUIT
+thing  8065 d -   40 "Bell"			BBLL
+thing  8100 d -   20 "Barrel"			BARL
+thing  9012 d -   20 "Pedestal"			GMPD
+thing 10001 d -   20 "Fog (small) *"		FOGS
+thing 10002 d -   20 "Fog (medium) *"		FOGM
+thing 10003 d -   20 "Fog (large) *"		FOGL
+thing 10090 d -   20 "Spike (down)"		TSPKC0
+thing 10091 d -   20 "Spike (up)"		TSPK
+
+thing    17 l -   20 "Chandelier w/flame"	CDLR
+thing    54 l -   17 "Wall torch w/flame"	WLTR
+thing    55 l -   20 "Wall torch"		WLTRI0
+thing   116 l -   10 "Brazier w/flame"		TWTR
+thing   117 l -   10 "Brazier"			TWTRI0
+thing   119 l -   20 "Candles"			CNDL
+thing  8042 l -   20 "Minotaur statue f"	FBUL
+thing  8043 l -   20 "Minotaur statue"		FBULH0
+thing  8060 l -   20 "Fire skull"		FSKL
+thing  8061 l -   17 "Brazier w/flame sm"	BRTR
+thing  8063 l -   20 "Chandelier"		CDLRD0
+thing  8066 l -   20 "Candle (blue)"		CAND
+thing  8069 l -   20 "Cauldron (w/flame)"	CDRNB0
+thing  8070 l -   20 "Cauldron"			CDRN
+thing 10500 l -   20 "Flame (small, t) *"	FFSM
+thing 10501 l -   20 "Flame (small, cnt)"	FFSMC0
+thing 10502 l -   20 "Flame (large, t) *"	FFLG
+thing 10503 l -   20 "Flame (large, cnt)"	FFLGF0
+
+thing  1400 s -   20 "Stone"			TELE
+thing  1401 s -   20 "Heavy"			TELE
+thing  1402 s -   20 "Metal"			TELE
+thing  1403 s -   20 "Creak"			TELE
+thing  1404 s -   20 "Silent"			TELE
+thing  1405 s -   20 "Lava"			TELE
+thing  1406 s -   20 "Water"			TELE
+thing  1407 s -   20 "Ice"			TELE
+thing  1408 s -   20 "Earth crack"		TELE
+thing  1409 s -   20 "Metal2"			TELE
+thing  1410 s -   20 "Wind blowing"		TELE
+
+thing   118 S -   10 "Magic step"		TLGL
+thing  3000 S -   20 "Polyobject anchor"	ICPRD0
+thing  3001 S -   20 "Start spot"		SBFXH0
+thing  3002 S -   20 "Start spot w/crush"	SBFXC0
+thing  9001 S -   10 "Map spot *"		TELEC0
+thing  9013 S -   10 "Map spot w/gravity"	TELED0
+thing 10000 S -   20 "Spawn fog *"		SPIRK0
+thing 10225 S -   20 "Spawn bat *"		ABATC3C7

yadex-1.7.0-64bit.patch:

--- NEW FILE yadex-1.7.0-64bit.patch ---
diff -Naur yadex-1.7.0/GNUmakefile yadex-1.7.0.new/GNUmakefile
--- yadex-1.7.0/GNUmakefile	2006-03-16 20:33:36.000000000 -0800
+++ yadex-1.7.0.new/GNUmakefile	2006-03-16 18:37:50.000000000 -0800
@@ -53,6 +53,7 @@
 
 # Which OS ?
 OS := $(shell uname -s | tr A-Z a-z)
+ARCH := $(shell uname -i | tr A-Z a-z)
 
 # Where your X11 libraries and headers reside.
 # Current rule:
@@ -67,7 +68,11 @@
     X11LIBDIR     = /usr/openwin/lib
     X11INCLUDEDIR = /usr/openwin/include
   else
-    X11LIBDIR     = /usr/X11R6/lib
+    ifeq ($(findstring $(ARCH), x86_64), $(ARCH))
+        X11LIBDIR     = /usr/X11R6/lib64
+    else
+        X11LIBDIR     = /usr/X11R6/lib
+    endif
     X11INCLUDEDIR = /usr/X11R6/include
   endif
 endif
diff -Naur yadex-1.7.0/src/levels.cc yadex-1.7.0.new/src/levels.cc
--- yadex-1.7.0/src/levels.cc	2003-03-28 04:37:32.000000000 -0800
+++ yadex-1.7.0.new/src/levels.cc	2006-03-16 20:38:01.000000000 -0800
@@ -1387,7 +1387,7 @@
       }
    NumWTexture = (int) val + 1;
    /* read in the offsets for texture1 names */
-   offsets = (i32 *) GetMemory ((long) NumWTexture * 4);
+   offsets = (i32 *) GetMemory ((long) NumWTexture * (sizeof(i32)));
    wf->read_i32 (offsets + 1, NumWTexture - 1);
    if (wf->error ())
       {
@@ -1445,7 +1445,7 @@
       }
       NumWTexture = (int) val + 1;
       /* read in the offsets for texture1 names */
-      offsets = (i32 *) GetMemory ((long) NumWTexture * 4);
+      offsets = (i32 *) GetMemory ((long) NumWTexture * sizeof(i32));
       wf->read_i32 (offsets + 1, NumWTexture - 1);
       {
 	// FIXME
@@ -1489,7 +1489,7 @@
 	// FIXME
       }
       /* read in the offsets for texture2 names */
-      offsets = (i32 *) GetMemory ((long) val * 4);
+      offsets = (i32 *) GetMemory ((long) val * sizeof(i32));
       wf->read_i32 (offsets, val);
       if (wf->error ())
       {
diff -Naur yadex-1.7.0/src/pic2img.cc yadex-1.7.0.new/src/pic2img.cc
--- yadex-1.7.0/src/pic2img.cc	2003-03-28 04:37:32.000000000 -0800
+++ yadex-1.7.0.new/src/pic2img.cc	2006-03-16 20:30:40.000000000 -0800
@@ -192,7 +192,7 @@
 
 ColumnData    = (u8 *) GetMemory (TEX_COLUMNBUFFERSIZE);
 /* FIXME DOS and pic_width_ > 16000 */
-NeededOffsets = (i32 *) GetMemory ((long) pic_width_ * 4);
+NeededOffsets = (i32 *) GetMemory ((long) pic_width_ * (sizeof(i32)));
 
 if (long_offsets)
    dir->wadfile->read_i32 (NeededOffsets, pic_width_);
diff -Naur yadex-1.7.0/src/r_images.cc yadex-1.7.0.new/src/r_images.cc
--- yadex-1.7.0/src/r_images.cc	2006-03-16 20:33:12.000000000 -0800
+++ yadex-1.7.0.new/src/r_images.cc	2006-03-16 20:39:17.000000000 -0800
@@ -182,7 +182,7 @@
       dir->wadfile->seek (dir->dir.start);
       dir->wadfile->read_i32 (&numtex);
       /* read in the offsets for texture1 names and info. */
-      offsets = (i32 *) GetMemory ((long) numtex * 4);
+      offsets = (i32 *) GetMemory ((long) numtex * sizeof(i32));
       dir->wadfile->read_i32 (offsets, numtex);
       for (n = 0; n < numtex && !texofs; n++)
          {
@@ -205,7 +205,7 @@
       dir->wadfile->seek (dir->dir.start);
       dir->wadfile->read_i32 (&numtex);
       /* read in the offsets for texture1 names and info. */
-      offsets = (i32 *) GetMemory ((long) numtex * 4);
+      offsets = (i32 *) GetMemory ((long) numtex * sizeof(i32));
       dir->wadfile->read_i32 (offsets, numtex);
       for (n = 0; n < numtex && !texofs; n++)
          {
@@ -225,7 +225,7 @@
          dir->wadfile->seek (dir->dir.start);
          dir->wadfile->read_i32 (&numtex);
          /* read in the offsets for texture2 names */
-         offsets = (i32 *) GetMemory ((long) numtex * 4);
+         offsets = (i32 *) GetMemory ((long) numtex * sizeof(i32));
          dir->wadfile->read_i32 (offsets, numtex);
          for (n = 0; n < numtex && !texofs; n++)
             {
diff -Naur yadex-1.7.0/src/textures.cc yadex-1.7.0.new/src/textures.cc
--- yadex-1.7.0/src/textures.cc	2003-04-24 13:50:36.000000000 -0700
+++ yadex-1.7.0.new/src/textures.cc	2006-03-16 20:38:44.000000000 -0800
@@ -177,7 +177,7 @@
 	 goto textures_done;
 	 }
       // Read in the offsets for texture1 names and info
-      offsets = (i32 *) GetMemory ((long) numtex * 4);
+      offsets = (i32 *) GetMemory ((long) numtex * sizeof(i32));
       wf->read_i32 (offsets, numtex);
       if (wf->error ())
 	 {
@@ -233,7 +233,7 @@
 	 goto texture1_done;
 	 }
       // Read in the offsets for texture1 names and info
-      offsets = (i32 *) GetMemory ((long) numtex * 4);
+      offsets = (i32 *) GetMemory ((long) numtex * sizeof(i32));
       wf->read_i32 (offsets, numtex);
       if (wf->error ())
 	 {
@@ -286,7 +286,7 @@
 	    goto texture2_done;
 	    }
 	 // Read in the offsets for TEXTURE2 names
-	 offsets = (i32 *) GetMemory ((long) numtex * 4);
+	 offsets = (i32 *) GetMemory ((long) numtex * sizeof(i32));
 	 wf->read_i32 (offsets, numtex);
 	 if (wf->error ())
 	    {
@@ -514,7 +514,7 @@
       dir->wadfile->seek (dir->dir.start);
       dir->wadfile->read_i32 (&numtex);
       // Read in the offsets for texture1 names and info
-      offsets = (i32 *) GetMemory ((long) numtex * 4);
+      offsets = (i32 *) GetMemory ((long) numtex * sizeof(i32));
       dir->wadfile->read_i32 (offsets, numtex);
       for (n = 0; n < numtex && !texofs; n++)
 	 {
@@ -534,7 +534,7 @@
 	 dir->wadfile->seek (dir->dir.start);
 	 dir->wadfile->read_i32 (&numtex);
 	 // Read in the offsets for texture2 names
-	 offsets = (i32 *) GetMemory ((long) numtex * 4);
+	 offsets = (i32 *) GetMemory ((long) numtex * sizeof(i32));
 	 dir->wadfile->read_i32 (offsets);
 	 for (n = 0; n < numtex && !texofs; n++)
 	    {
diff -Naur yadex-1.7.0/src/yadex.h yadex-1.7.0.new/src/yadex.h
--- yadex-1.7.0/src/yadex.h	2006-03-16 20:33:12.000000000 -0800
+++ yadex-1.7.0.new/src/yadex.h	2006-03-16 20:29:15.000000000 -0800
@@ -98,11 +98,11 @@
 #define F_I16_D "hd"
 #define F_I16_H "hX"
 
-typedef unsigned long  u32;
+typedef unsigned int  u32;
 #define F_U32_D "lu"
 #define F_U32_H "lX"
 
-typedef signed   long  i32;
+typedef signed   int  i32;
 #define F_I32_D "ld"
 #define F_I32_H "lX"
 

yadex-1.7.0-datadir.patch:

--- NEW FILE yadex-1.7.0-datadir.patch ---
diff -Naur yadex-1.7.0/configure yadex-1.7.0.new/configure
--- yadex-1.7.0/configure	2006-03-16 18:49:20.000000000 -0800
+++ yadex-1.7.0.new/configure	2006-03-16 16:36:21.000000000 -0800
@@ -408,16 +408,16 @@
   ETCDIR=/etc/$APPNAME/%v
   ETCDIRNV=/etc/$APPNAME
   MANDIR=/usr/share/man
-  SHAREDIR=/usr/share/games/$APPNAME/%v
-  SHAREDIRNV=/usr/share/games/$APPNAME
+  SHAREDIR=/usr/share/$APPNAME/%v
+  SHAREDIRNV=/usr/share/$APPNAME
 elif expr "$PREFIX" : '//*usr//*local/*$' >/dev/null
 then
   BINDIR=/usr/local/bin		# FHS-ly correct is /usr/local/games
   ETCDIR=/etc/$APPNAME/%v
   ETCDIRNV=/etc/$APPNAME
   MANDIR=/usr/local/man
-  SHAREDIR=/usr/local/share/games/$APPNAME/%v
-  SHAREDIRNV=/usr/local/share/games/$APPNAME
+  SHAREDIR=/usr/local/share/$APPNAME/%v
+  SHAREDIRNV=/usr/local/share/$APPNAME
 elif expr "$PREFIX" : '//*opt/*$' >/dev/null
 then
   echo '/opt ? Surely you mean /opt/something, Mr. Feynman !' 1>&2
diff -Naur yadex-1.7.0/yadex.cfg yadex-1.7.0.new/yadex.cfg
--- yadex-1.7.0/yadex.cfg	2006-03-16 18:49:20.000000000 -0800
+++ yadex-1.7.0.new/yadex.cfg	2006-03-16 18:49:43.000000000 -0800
@@ -20,16 +20,17 @@
 #  9 doompr   Doom press release pre-beta (/pub/idgames/historic/doomprbt.zip)
 # 10 strife10 Strife 1.0 (demo or commercial)
 
-  iwad1  = /usr/local/share/games/doom/doom.wad
-  iwad2  = /usr/local/share/games/doom2/doom2.wad
-  iwad3  = /usr/local/share/games/heretic/heretic.wad
-  iwad4  = /usr/local/share/games/hexen/hexen.wad
-  iwad5  = /usr/local/share/games/strife/strife1.wad
-  iwad6  = /usr/local/share/games/doom02/doom.wad
-  iwad7  = /usr/local/share/games/doom04/doom.wad
-  iwad8  = /usr/local/share/games/doom05/doom.wad
-  iwad9  = /usr/local/share/games/doompr/doompres.wad
-  iwad10 = /usr/local/share/games/strife10/strife1.wad
+  iwad1  = /usr/share/doom/doom.wad
+#  iwad2  = /usr/share/doom/doom2.wad
+  iwad2  = /usr/share/doom/freedoom.wad
+  iwad3  = /usr/share/doom/heretic.wad
+  iwad4  = /usr/share/doom/hexen.wad
+  iwad5  = /usr/share/doom/strife1.wad
+  iwad6  = /usr/share/doom/doom.wad
+  iwad7  = /usr/share/doom/doom.wad
+  iwad8  = /usr/share/doom/doom.wad
+  iwad9  = /usr/share/doom/doompres.wad
+  iwad10 = /usr/share/doom/strife1.wad
 
 # Name of the patch wads you want to load. None by default.
 

yadex-1.7.0-destdir.patch:

--- NEW FILE yadex-1.7.0-destdir.patch ---
diff -Naur yadex-1.7.0/GNUmakefile yadex-1.7.0.new/GNUmakefile
--- yadex-1.7.0/GNUmakefile	2006-03-16 16:08:10.000000000 -0800
+++ yadex-1.7.0.new/GNUmakefile	2006-03-16 16:11:32.000000000 -0800
@@ -392,19 +392,19 @@
 
 .PHONY: install
 install: $(OBJDIR)/install
-	@scripts/mkinstalldirs $(BINDIR)
-	@scripts/mkinstalldirs $(ETCDIR)
-	@scripts/mkinstalldirs $(MANDIR)
-	@scripts/mkinstalldirs $(MANDIR)/man6
-	@scripts/mkinstalldirs $(SHAREDIR)
-	$(OBJDIR)/install -m 755 $(OBJDIR)/yadex $(BINDIR)/yadex-$(VERSION)
-	rm -f $(BINDIR)/yadex
-	ln -s yadex-$(VERSION) $(BINDIR)/yadex
-	$(OBJDIR)/install -m 644 doc/yadex.6 $(MANDIR)/man6/yadex-$(VERSION).6
-	rm -f $(MANDIR)/man6/yadex.6
-	ln -s yadex-$(VERSION).6 $(MANDIR)/man6/yadex.6
-	$(OBJDIR)/install -m 644 -d $(SHAREDIR) $(YGD)
-	$(OBJDIR)/install -m 644 -d $(ETCDIR) yadex.cfg
+	@scripts/mkinstalldirs $(DESTDIR)$(BINDIR)
+	@scripts/mkinstalldirs $(DESTDIR)$(ETCDIR)
+	@scripts/mkinstalldirs $(DESTDIR)$(MANDIR)
+	@scripts/mkinstalldirs $(DESTDIR)$(MANDIR)/man6
+	@scripts/mkinstalldirs $(DESTDIR)$(SHAREDIR)
+	$(OBJDIR)/install -m 755 $(OBJDIR)/yadex $(DESTDIR)$(BINDIR)/yadex-$(VERSION)
+	rm -f $(DESTDIR)$(BINDIR)/yadex
+	ln -s yadex-$(VERSION) $(DESTDIR)$(BINDIR)/yadex
+	$(OBJDIR)/install -m 644 doc/yadex.6 $(DESTDIR)$(MANDIR)/man6/yadex-$(VERSION).6
+	rm -f $(DESTDIR)$(MANDIR)/man6/yadex.6
+	ln -s yadex-$(VERSION).6 $(DESTDIR)$(MANDIR)/man6/yadex.6
+	$(OBJDIR)/install -m 644 -d $(DESTDIR)$(SHAREDIR) $(YGD)
+	$(OBJDIR)/install -m 644 -d $(DESTDIR)$(ETCDIR) yadex.cfg
 	@echo "---------------------------------------------------------------"
 	@echo "  Yadex is now installed."
 	@echo

yadex-1.7.0-gcc41.patch:

--- NEW FILE yadex-1.7.0-gcc41.patch ---
--- yadex-1.7.0/src/wadlist.cc~	2006-03-17 11:53:10.000000000 +0100
+++ yadex-1.7.0/src/wadlist.cc	2006-03-17 11:57:06.000000000 +0100
@@ -52,6 +52,7 @@
 
 Wad_list_priv::Wad_list_priv ()
 {
+  iter = list.begin ();
   rewound = true;
 }
 
@@ -80,6 +81,7 @@
  */
 void Wad_list::rewind () const
 {
+  priv->iter = priv->list.begin ();
   priv->rewound = true;
 }
 
@@ -98,10 +100,7 @@
 bool Wad_list::get (Wad_file *& wf)
 {
   if (priv->rewound)
-  {
-    priv->iter = priv->list.begin ();
     priv->rewound = false;
-  }
   else
     ++priv->iter;
 
@@ -119,10 +118,7 @@
 bool Wad_list::get (const Wad_file *& wf) const
 {
   if (priv->rewound)
-  {
-    priv->iter = priv->list.begin ();
     priv->rewound = false;
-  }
   else
     ++priv->iter;
 
@@ -157,26 +153,12 @@
  */
 void Wad_list::del ()
 {
-  list_t::iterator i;
-
-  if (priv->rewound)
-  {
-    i = priv->list.begin ();
-  }
-  else
-  {
-    i = priv->iter;
-  }
-  if (i == priv->list.end ())
+  if (priv->iter == priv->list.end ())
   {
     nf_bug ("Wad_list::del: attempt to delete last item");
     return;
   }
-  priv->iter = priv->list.erase (i);
+  priv->iter = priv->list.erase (priv->iter);
   if (priv->iter == priv->list.begin ())
-  {
-    priv->iter = 0;			// Catch bugs
     priv->rewound = true;
-  }
 }
-


--- NEW FILE yadex.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Yadex
GenericName=Doom level editor
Comment=Doom level editor
Exec=yadex -i2 /usr/share/doom/freedoom.wad
Icon=yadex.png
Terminal=true
Type=Application
Categories=Application;GUIDesigner;Graphics;
Version=1.7.0


--- NEW FILE yadex.spec ---
Name:           yadex
Version:        1.7.0
Release:        3%{?dist}
Summary:        Doom level editor

Group:          Amusements/Graphics
License:        GPL
URL:            http://www.teaser.fr/~amajorel/yadex
Source0:        http://www.teaser.fr/~amajorel/yadex/yadex-1.7.0.tar.gz
Source1:        yadex.desktop
Source2:        yadex.png
Patch0:         http://glbsp.sourceforge.net/yadex/Yadex_170_ALL.diff
Patch1:         http://glbsp.sourceforge.net/yadex/Yadex_170_Hexen.diff
Patch2:         yadex-1.7.0-64bit.patch
Patch3:         yadex-1.7.0-destdir.patch
Patch4:         yadex-1.7.0-datadir.patch
Patch5:         yadex-1.7.0-gcc41.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  desktop-file-utils
BuildRequires:  xorg-x11-devel
# For FC-5's modular xorg
#BuildRequires:  libX11-devel
# Yadex needs an iwad to run.  freedoom provides a free iwad that we can use.
Requires:       freedoom

%description
Yadex is a Doom level (wad) editor for Unix systems running X, including Linux.
It supports Doom alpha, Doom beta, Doom, Ultimate Doom, Final Doom, Doom II,
Heretic and also, in a more or less limited way, Hexen and Strife.

Yadex is descended from DEU 5.21. Therefore, as you might expect, it's a rather
low-level editor that requires you to take care of a lot of detail but on the
flip side allows you to control very precisely what you are doing. In addition,
it has many advanced functions that DEU didn't have, to make certain
tedious tasks easy.


%prep
%setup -q
%patch0 -p1
# Omitted. Patch fails to apply. Used for Hexen maps only. Needs investigation.
#%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1


%build
# Don't use %%configure because this is not an autotools-generated
# configure script and will choke on some of the default configure switches.
./configure --prefix=%{_prefix}
make CXXFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# Remove the duplicate man pages
rm -f $RPM_BUILD_ROOT%{_mandir}/man6/%{name}*
iconv --from=ISO-8859-1 --to=UTF-8 docsrc/%{name}.6 > docsrc/%{name}.6.new
install -p -m644 docsrc/%{name}.6.new $RPM_BUILD_ROOT/%{_mandir}/man6/

# .desktop file integration
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/
install -p -m 644 %{SOURCE2} $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,-)
%{_bindir}/%{name}
%{_bindir}/%{name}-%{version}
%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/%{version}/%{name}.cfg
%{_datadir}/%{name}
%{_mandir}/man6/*
%{_datadir}/applications/*.desktop
%{_datadir}/icons/hicolor/48x48/apps/yadex.png
%doc COPYING COPYING.LIB doc/*.html docsrc/*.png


%changelog
* Fri Mar 17 2006 Wart <wart at kobold.org> 1.7.0-3
- Added patch for gcc 4.1

* Thu Mar 16 2006 Wart <wart at kobold.org> 1.7.0-2
- Added .desktop file

* Thu Mar 16 2006 Wart <wart at kobold.org> 1.7.0-1
- Initial submission to Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yadex/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Apr 2006 14:51:37 -0000	1.1
+++ .cvsignore	10 Apr 2006 14:52:26 -0000	1.2
@@ -0,0 +1 @@
+yadex-1.7.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yadex/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Apr 2006 14:51:37 -0000	1.1
+++ sources	10 Apr 2006 14:52:26 -0000	1.2
@@ -0,0 +1 @@
+d341abe066525394082edfd520af86ae  yadex-1.7.0.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 15:16:15 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 10 Apr 2006 08:16:15 -0700
Subject: rpms/Macaulay2/FC-5 Macaulay2.spec,1.13,1.14
Message-ID: <200604101516.k3AFGHEh006522@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/Macaulay2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6505

Modified Files:
	Macaulay2.spec 
Log Message:
* Mon Apr 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.2-22
- fix icon location (#188384)



Index: Macaulay2.spec
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/FC-5/Macaulay2.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Macaulay2.spec	30 Mar 2006 21:41:20 -0000	1.13
+++ Macaulay2.spec	10 Apr 2006 15:16:14 -0000	1.14
@@ -6,7 +6,7 @@
 Summary: System for algebraic geometry and commutative algebra
 Name:    Macaulay2
 Version: 0.9.2
-Release: 21%{?dist}
+Release: 22%{?dist}
 License: GPL
 Group:   Applications/Engineering
 URL:     http://www.math.uiuc.edu/Macaulay2/
@@ -93,7 +93,7 @@
 
 # app img
 install -p -m644 -D %{SOURCE1} \
-  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/apps/32x32/Macaulay2.png
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps/Macaulay2.png
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install \
@@ -154,6 +154,9 @@
 
 
 %changelog
+* Mon Apr 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.2-22
+- fix icon location (#188384)
+
 * Thu Mar 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.2-21
 - *really* disable %%check (fails on fc5+ anyway) 
 



From fedora-extras-commits at redhat.com  Mon Apr 10 15:35:57 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon, 10 Apr 2006 08:35:57 -0700
Subject: rpms/yadex/devel yadex.spec,1.1,1.2
Message-ID: <200604101535.k3AFZxuS006653@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/yadex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6636

Modified Files:
	yadex.spec 
Log Message:
Update BR: for modular x.org




Index: yadex.spec
===================================================================
RCS file: /cvs/extras/rpms/yadex/devel/yadex.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- yadex.spec	10 Apr 2006 14:52:26 -0000	1.1
+++ yadex.spec	10 Apr 2006 15:35:56 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           yadex
 Version:        1.7.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Doom level editor
 
 Group:          Amusements/Graphics
@@ -18,9 +18,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
-BuildRequires:  xorg-x11-devel
+#BuildRequires:  xorg-x11-devel
 # For FC-5's modular xorg
-#BuildRequires:  libX11-devel
+BuildRequires:  libX11-devel
 # Yadex needs an iwad to run.  freedoom provides a free iwad that we can use.
 Requires:       freedoom
 
@@ -101,6 +101,9 @@
 
 
 %changelog
+* Mon Apr 10 2006 Wart <wart at kobold.org> 1.7.0-4
+- Update for modular x.org
+
 * Fri Mar 17 2006 Wart <wart at kobold.org> 1.7.0-3
 - Added patch for gcc 4.1
 



From fedora-extras-commits at redhat.com  Mon Apr 10 15:55:52 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Mon, 10 Apr 2006 08:55:52 -0700
Subject: rpms/gnome-sudoku/FC-5 gnome-sudoku.spec,1.4,1.5
Message-ID: <200604101555.k3AFtsTX006873@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/gnome-sudoku/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6824/FC-5

Modified Files:
	gnome-sudoku.spec 
Log Message:
Fix boolean problem in spec file (#188484); will not rebuild for now


Index: gnome-sudoku.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/FC-5/gnome-sudoku.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-sudoku.spec	25 Jan 2006 05:54:35 -0000	1.4
+++ gnome-sudoku.spec	10 Apr 2006 15:55:52 -0000	1.5
@@ -3,14 +3,14 @@
 
 Name:           gnome-sudoku
 Version:        0.4.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        GNOME based Sudoku, a logic puzzle game
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://gnome-sudoku.sourceforge.net
 Source0:        http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-%if %{fedora} <= 4
+%if "%{fedora}" <= "4"
 Patch0:		gnome-sudoku-0.4.0-pygtk2-nofs.patch
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,7 +31,7 @@
 
 %prep
 %setup -q
-%if %{fedora} <= 4
+%if "%{fedora}" <= "4"
 %patch0 -p1
 %endif
 # Fix one hardcoding instance
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Mon Apr 10 2006 Paul W. Frields <stickster at gmail.com> - 0.4.0-6
+- Correct for boolean problem in spec
+
 * Tue Jan 24 2006 Paul W. Frields <stickster at gmail.com> - 0.4.0-5
 - Fix missing Requires: gnome-python2-canvas
 - Enable conditional to synchronize spec



From fedora-extras-commits at redhat.com  Mon Apr 10 15:55:53 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Mon, 10 Apr 2006 08:55:53 -0700
Subject: rpms/gnome-sudoku/devel gnome-sudoku.spec,1.4,1.5
Message-ID: <200604101555.k3AFttMt006877@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/gnome-sudoku/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6824/devel

Modified Files:
	gnome-sudoku.spec 
Log Message:
Fix boolean problem in spec file (#188484); will not rebuild for now


Index: gnome-sudoku.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/devel/gnome-sudoku.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnome-sudoku.spec	25 Jan 2006 05:54:35 -0000	1.4
+++ gnome-sudoku.spec	10 Apr 2006 15:55:53 -0000	1.5
@@ -3,14 +3,14 @@
 
 Name:           gnome-sudoku
 Version:        0.4.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        GNOME based Sudoku, a logic puzzle game
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://gnome-sudoku.sourceforge.net
 Source0:        http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-%if %{fedora} <= 4
+%if "%{fedora}" <= "4"
 Patch0:		gnome-sudoku-0.4.0-pygtk2-nofs.patch
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,7 +31,7 @@
 
 %prep
 %setup -q
-%if %{fedora} <= 4
+%if "%{fedora}" <= "4"
 %patch0 -p1
 %endif
 # Fix one hardcoding instance
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Mon Apr 10 2006 Paul W. Frields <stickster at gmail.com> - 0.4.0-6
+- Correct for boolean problem in spec
+
 * Tue Jan 24 2006 Paul W. Frields <stickster at gmail.com> - 0.4.0-5
 - Fix missing Requires: gnome-python2-canvas
 - Enable conditional to synchronize spec



From fedora-extras-commits at redhat.com  Mon Apr 10 15:55:52 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Mon, 10 Apr 2006 08:55:52 -0700
Subject: rpms/gnome-sudoku/FC-4 gnome-sudoku.spec,1.6,1.7
Message-ID: <200604101555.k3AFtsMV006869@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/gnome-sudoku/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6824/FC-4

Modified Files:
	gnome-sudoku.spec 
Log Message:
Fix boolean problem in spec file (#188484); will not rebuild for now


Index: gnome-sudoku.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/FC-4/gnome-sudoku.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnome-sudoku.spec	25 Jan 2006 05:53:42 -0000	1.6
+++ gnome-sudoku.spec	10 Apr 2006 15:55:51 -0000	1.7
@@ -3,14 +3,14 @@
 
 Name:           gnome-sudoku
 Version:        0.4.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        GNOME based Sudoku, a logic puzzle game
 
 Group:          Amusements/Games
 License:        GPL
 URL:            http://gnome-sudoku.sourceforge.net
 Source0:        http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-%if %{fedora} <= 4
+%if "%{fedora}" <= "4"
 Patch0:		gnome-sudoku-0.4.0-pygtk2-nofs.patch
 %endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,7 +31,7 @@
 
 %prep
 %setup -q
-%if %{fedora} <= 4
+%if "%{fedora}" <= "4"
 %patch0 -p1
 %endif
 # Fix one hardcoding instance
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Mon Apr 10 2006 Paul W. Frields <stickster at gmail.com> - 0.4.0-6
+- Correct for boolean problem in spec
+
 * Tue Jan 24 2006 Paul W. Frields <stickster at gmail.com> - 0.4.0-5
 - Fix missing Requires: gnome-python2-canvas
 - Enable conditional to synchronize spec



From fedora-extras-commits at redhat.com  Mon Apr 10 16:12:39 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Mon, 10 Apr 2006 09:12:39 -0700
Subject: fedora-security/audit fc4,1.195,1.196 fc5,1.108,1.109
Message-ID: <200604101612.k3AGCdgt009239@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9219/audit

Modified Files:
	fc4 fc5 
Log Message:
Add CVE-2006-1522



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -r1.195 -r1.196
--- fc4	10 Apr 2006 14:27:23 -0000	1.195
+++ fc4	10 Apr 2006 16:12:36 -0000	1.196
@@ -10,6 +10,7 @@
 CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1542 VULNERABLE (python) bz#169046
+CVE-2006-1522 VULNERABLE (kernel)
 CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-245]
 CVE-2006-1354 VULNERABLE (freeradius) bz#186084
 CVE-2006-1343 VULNERABLE (kernel)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -r1.108 -r1.109
--- fc5	10 Apr 2006 14:27:23 -0000	1.108
+++ fc5	10 Apr 2006 16:12:36 -0000	1.109
@@ -9,6 +9,7 @@
 CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1542 VULNERABLE (python) bz#169046
+CVE-2006-1522 VULNERABLE (kernel)
 CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-233]
 CVE-2006-1354 VULNERABLE (freeradius) bz#186084
 CVE-2006-1343 VULNERABLE (kernel)



From fedora-extras-commits at redhat.com  Mon Apr 10 16:34:29 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon, 10 Apr 2006 09:34:29 -0700
Subject: rpms/yadex/FC-4 yadex.spec,1.2,1.3
Message-ID: <200604101634.k3AGYVu6009362@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/yadex/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9345

Modified Files:
	yadex.spec 
Log Message:
Revert BR: to back out modular x.org changes.




Index: yadex.spec
===================================================================
RCS file: /cvs/extras/rpms/yadex/FC-4/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	10 Apr 2006 16:34:29 -0000	1.3
@@ -18,9 +18,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
-#BuildRequires:  xorg-x11-devel
+BuildRequires:  xorg-x11-devel
 # For FC-5's modular xorg
-BuildRequires:  libX11-devel
+#BuildRequires:  libX11-devel
 # Yadex needs an iwad to run.  freedoom provides a free iwad that we can use.
 Requires:       freedoom
 
@@ -102,7 +102,7 @@
 
 %changelog
 * Mon Apr 10 2006 Wart <wart at kobold.org> 1.7.0-4
-- Update for modular x.org
+- Revert BR: to back out modular x.org changes.
 
 * Fri Mar 17 2006 Wart <wart at kobold.org> 1.7.0-3
 - Added patch for gcc 4.1



From fedora-extras-commits at redhat.com  Mon Apr 10 16:43:46 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon, 10 Apr 2006 09:43:46 -0700
Subject: owners owners.list,1.825,1.826
Message-ID: <200604101643.k3AGhmIL009453@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9436

Modified Files:
	owners.list 
Log Message:
Rename git-core to git



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.825
retrieving revision 1.826
diff -u -r1.825 -r1.826
--- owners.list	10 Apr 2006 10:45:11 -0000	1.825
+++ owners.list	10 Apr 2006 16:43:45 -0000	1.826
@@ -133,7 +133,7 @@
 Fedora Extras|cln|Class Library for Numbers|qspencer at ieee.org|extras-qa at fedoraproject.org|
 Fedora Extras|cmake|Cross-platform make system|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|cmucl|CMU Common Lisp|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
-Fedora Extras|cogito|Cogito SCM based on git-core|chrisw at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|cogito|Cogito SCM based on git|chrisw at redhat.com|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|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|
@@ -327,7 +327,7 @@
 Fedora Extras|gift|Daemon for communicating with filesharing protocols|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|gift-openft|Openft plugin for giFT|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|ginac|C++ library for symbolic calculation|qspencer at ieee.org|extras-qa at fedoraproject.org|
-Fedora Extras|git-core|A distributed SCM|chrisw at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|git|A distributed SCM|chrisw at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|gjots2|Simple jotter application for your desktop - an outline processor|rvokal at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-aclock|Analog clock plugin for GKrellM|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-freq|CPU frequency display plugin for GKrellM|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Apr 10 16:47:49 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon, 10 Apr 2006 09:47:49 -0700
Subject: rpms/git/devel Makefile,1.1,1.2
Message-ID: <200604101647.k3AGlpv6009496@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9479

Modified Files:
	Makefile 
Log Message:
rename git-core to git


Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/git/devel/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	30 Aug 2005 00:36:41 -0000	1.1
+++ Makefile	10 Apr 2006 16:47:48 -0000	1.2
@@ -1,6 +1,6 @@
-# Makefile for source rpm: git-core
+# Makefile for source rpm: git
 # $Id$
-NAME := git-core
+NAME := git
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common



From fedora-extras-commits at redhat.com  Mon Apr 10 16:48:26 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon, 10 Apr 2006 09:48:26 -0700
Subject: rpms/git/devel .cvsignore, 1.23, 1.24 git.spec, 1.11, 1.12 sources, 
	1.23, 1.24
Message-ID: <200604101648.k3AGmSBn009528@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9507

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.2.6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/devel/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	5 Apr 2006 23:25:25 -0000	1.23
+++ .cvsignore	10 Apr 2006 16:48:25 -0000	1.24
@@ -1 +1 @@
-git-1.2.5.tar.gz
+git-1.2.6.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/devel/git.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- git.spec	5 Apr 2006 23:25:25 -0000	1.11
+++ git.spec	10 Apr 2006 16:48:25 -0000	1.12
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.2.5
+Version: 	1.2.6
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Mon Apr 10 2006 Chris Wright <chrisw at redhat.com> 1.2.6-1
+- git-1.2.6
+
 * Wed Apr 5 2006 Chris Wright <chrisw at redhat.com> 1.2.5-1
 - git-1.2.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	5 Apr 2006 23:25:25 -0000	1.23
+++ sources	10 Apr 2006 16:48:25 -0000	1.24
@@ -1 +1 @@
-30b4c8b1765636f3c0f9f7d69e8b286c  git-1.2.5.tar.gz
+f10a13074e849ff8670f5dba07bfe5c1  git-1.2.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 16:50:18 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon, 10 Apr 2006 09:50:18 -0700
Subject: rpms/git/FC-5 Makefile,1.1,1.2
Message-ID: <200604101650.k3AGoKs9009589@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9572

Modified Files:
	Makefile 
Log Message:
rename git-core to git


Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/git/FC-5/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	30 Aug 2005 00:36:41 -0000	1.1
+++ Makefile	10 Apr 2006 16:50:17 -0000	1.2
@@ -1,6 +1,6 @@
-# Makefile for source rpm: git-core
+# Makefile for source rpm: git
 # $Id$
-NAME := git-core
+NAME := git
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common



From fedora-extras-commits at redhat.com  Mon Apr 10 16:50:46 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon, 10 Apr 2006 09:50:46 -0700
Subject: rpms/git/FC-5 .cvsignore, 1.23, 1.24 git.spec, 1.11, 1.12 sources, 
	1.23, 1.24
Message-ID: <200604101650.k3AGomSw009635@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9614

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.2.6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/FC-5/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	5 Apr 2006 23:26:47 -0000	1.23
+++ .cvsignore	10 Apr 2006 16:50:46 -0000	1.24
@@ -1 +1 @@
-git-1.2.5.tar.gz
+git-1.2.6.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/FC-5/git.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- git.spec	5 Apr 2006 23:26:47 -0000	1.11
+++ git.spec	10 Apr 2006 16:50:46 -0000	1.12
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.2.5
+Version: 	1.2.6
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Mon Apr 10 2006 Chris Wright <chrisw at redhat.com> 1.2.6-1
+- git-1.2.6
+
 * Wed Apr 5 2006 Chris Wright <chrisw at redhat.com> 1.2.5-1
 - git-1.2.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/FC-5/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	5 Apr 2006 23:26:47 -0000	1.23
+++ sources	10 Apr 2006 16:50:46 -0000	1.24
@@ -1 +1 @@
-30b4c8b1765636f3c0f9f7d69e8b286c  git-1.2.5.tar.gz
+f10a13074e849ff8670f5dba07bfe5c1  git-1.2.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 16:51:13 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon, 10 Apr 2006 09:51:13 -0700
Subject: rpms/git/FC-4 Makefile,1.1,1.2
Message-ID: <200604101651.k3AGpFA7009696@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9679

Modified Files:
	Makefile 
Log Message:
rename git-core to git


Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/git/FC-4/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	30 Aug 2005 00:36:41 -0000	1.1
+++ Makefile	10 Apr 2006 16:51:13 -0000	1.2
@@ -1,6 +1,6 @@
-# Makefile for source rpm: git-core
+# Makefile for source rpm: git
 # $Id$
-NAME := git-core
+NAME := git
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common



From fedora-extras-commits at redhat.com  Mon Apr 10 16:51:39 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon, 10 Apr 2006 09:51:39 -0700
Subject: rpms/git/FC-4 .cvsignore, 1.23, 1.24 git.spec, 1.11, 1.12 sources, 
	1.23, 1.24
Message-ID: <200604101651.k3AGpfIs009739@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9718

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.2.6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/FC-4/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	5 Apr 2006 23:27:32 -0000	1.23
+++ .cvsignore	10 Apr 2006 16:51:39 -0000	1.24
@@ -1 +1 @@
-git-1.2.5.tar.gz
+git-1.2.6.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/FC-4/git.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- git.spec	5 Apr 2006 23:27:32 -0000	1.11
+++ git.spec	10 Apr 2006 16:51:39 -0000	1.12
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.2.5
+Version: 	1.2.6
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Mon Apr 10 2006 Chris Wright <chrisw at redhat.com> 1.2.6-1
+- git-1.2.6
+
 * Wed Apr 5 2006 Chris Wright <chrisw at redhat.com> 1.2.5-1
 - git-1.2.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/FC-4/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	5 Apr 2006 23:27:32 -0000	1.23
+++ sources	10 Apr 2006 16:51:39 -0000	1.24
@@ -1 +1 @@
-30b4c8b1765636f3c0f9f7d69e8b286c  git-1.2.5.tar.gz
+f10a13074e849ff8670f5dba07bfe5c1  git-1.2.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 16:52:46 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon, 10 Apr 2006 09:52:46 -0700
Subject: rpms/git/FC-3 Makefile,1.1,1.2
Message-ID: <200604101652.k3AGqmKG009805@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9788

Modified Files:
	Makefile 
Log Message:
rename git-core to git


Index: Makefile
===================================================================
RCS file: /cvs/extras/rpms/git/FC-3/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile	30 Aug 2005 00:36:41 -0000	1.1
+++ Makefile	10 Apr 2006 16:52:46 -0000	1.2
@@ -1,6 +1,6 @@
-# Makefile for source rpm: git-core
+# Makefile for source rpm: git
 # $Id$
-NAME := git-core
+NAME := git
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common



From fedora-extras-commits at redhat.com  Mon Apr 10 16:53:11 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon, 10 Apr 2006 09:53:11 -0700
Subject: rpms/git/FC-3 .cvsignore, 1.23, 1.24 git.spec, 1.11, 1.12 sources, 
	1.23, 1.24
Message-ID: <200604101653.k3AGrDtk009843@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9822

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.2.6


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/FC-3/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore	5 Apr 2006 23:28:25 -0000	1.23
+++ .cvsignore	10 Apr 2006 16:53:10 -0000	1.24
@@ -1 +1 @@
-git-1.2.5.tar.gz
+git-1.2.6.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/FC-3/git.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- git.spec	5 Apr 2006 23:28:25 -0000	1.11
+++ git.spec	10 Apr 2006 16:53:10 -0000	1.12
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.2.5
+Version: 	1.2.6
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Mon Apr 10 2006 Chris Wright <chrisw at redhat.com> 1.2.6-1
+- git-1.2.6
+
 * Wed Apr 5 2006 Chris Wright <chrisw at redhat.com> 1.2.5-1
 - git-1.2.5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/FC-3/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	5 Apr 2006 23:28:25 -0000	1.23
+++ sources	10 Apr 2006 16:53:10 -0000	1.24
@@ -1 +1 @@
-30b4c8b1765636f3c0f9f7d69e8b286c  git-1.2.5.tar.gz
+f10a13074e849ff8670f5dba07bfe5c1  git-1.2.6.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 17:04:16 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon, 10 Apr 2006 10:04:16 -0700
Subject: rpms/cogito/devel .cvsignore, 1.8, 1.9 cogito.spec, 1.11,
	1.12 sources, 1.8, 1.9
Message-ID: <200604101704.k3AH4Ipq011966@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11945

Modified Files:
	.cvsignore cogito.spec sources 
Log Message:
Update cogito to 0.17.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cogito/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	29 Mar 2006 19:34:04 -0000	1.8
+++ .cvsignore	10 Apr 2006 17:04:16 -0000	1.9
@@ -1 +1 @@
-cogito-0.17.1.tar.gz
+cogito-0.17.2.tar.gz


Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/devel/cogito.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cogito.spec	30 Mar 2006 23:48:02 -0000	1.11
+++ cogito.spec	10 Apr 2006 17:04:16 -0000	1.12
@@ -1,6 +1,6 @@
 Name: 		cogito
-Version: 	0.17.1
-Release: 	2%{?dist}
+Version: 	0.17.2
+Release: 	1%{?dist}
 Summary:  	The Cogito Version Control System
 License: 	GPL
 Group: 		Development/Tools
@@ -11,8 +11,6 @@
 BuildRequires: 	asciidoc, xmlto
 BuildArch:	noarch
 
-Patch1: cg-admin-rewritehist-fix.patch
-
 %description
 Cogito is a version control system layered on top of the git tree history
 storage system. It aims at seamless user interface and ease of use, providing
@@ -21,7 +19,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 
@@ -47,6 +44,9 @@
 %doc README COPYING Documentation/tutorial-script
 
 %changelog
+* Mon Apr 10 2006 Chris Wright <chrisw at redhat.com> 0.17.2-1
+- 0.17.2
+
 * Thu Mar 30 2006 Chris Wright <chrisw at redhat.com> 0.17.1-2
 - cg-admin-rewritehist fix
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cogito/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	29 Mar 2006 19:34:04 -0000	1.8
+++ sources	10 Apr 2006 17:04:16 -0000	1.9
@@ -1 +1 @@
-2c79629440ab0b652ebfcc1d4bae0122  cogito-0.17.1.tar.gz
+8e41b7b63319e4641f08645c59e20627  cogito-0.17.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 17:05:03 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon, 10 Apr 2006 10:05:03 -0700
Subject: rpms/cogito/FC-5 .cvsignore, 1.8, 1.9 cogito.spec, 1.11,
	1.12 sources, 1.8, 1.9
Message-ID: <200604101705.k3AH559H012057@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12034

Modified Files:
	.cvsignore cogito.spec sources 
Log Message:
Update cogito to 0.17.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	29 Mar 2006 19:35:49 -0000	1.8
+++ .cvsignore	10 Apr 2006 17:05:03 -0000	1.9
@@ -1 +1 @@
-cogito-0.17.1.tar.gz
+cogito-0.17.2.tar.gz


Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-5/cogito.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- cogito.spec	30 Mar 2006 23:49:10 -0000	1.11
+++ cogito.spec	10 Apr 2006 17:05:03 -0000	1.12
@@ -1,6 +1,6 @@
 Name: 		cogito
-Version: 	0.17.1
-Release: 	2%{?dist}
+Version: 	0.17.2
+Release: 	1%{?dist}
 Summary:  	The Cogito Version Control System
 License: 	GPL
 Group: 		Development/Tools
@@ -11,8 +11,6 @@
 BuildRequires: 	asciidoc, xmlto
 BuildArch:	noarch
 
-Patch1: cg-admin-rewritehist-fix.patch
-
 %description
 Cogito is a version control system layered on top of the git tree history
 storage system. It aims at seamless user interface and ease of use, providing
@@ -21,7 +19,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 
@@ -47,6 +44,9 @@
 %doc README COPYING Documentation/tutorial-script
 
 %changelog
+* Mon Apr 10 2006 Chris Wright <chrisw at redhat.com> 0.17.2-1
+- 0.17.2
+
 * Thu Mar 30 2006 Chris Wright <chrisw at redhat.com> 0.17.1-2
 - cg-admin-rewritehist fix
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	29 Mar 2006 19:35:49 -0000	1.8
+++ sources	10 Apr 2006 17:05:03 -0000	1.9
@@ -1 +1 @@
-2c79629440ab0b652ebfcc1d4bae0122  cogito-0.17.1.tar.gz
+8e41b7b63319e4641f08645c59e20627  cogito-0.17.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 17:05:39 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon, 10 Apr 2006 10:05:39 -0700
Subject: rpms/cogito/FC-4 .cvsignore, 1.8, 1.9 cogito.spec, 1.10,
	1.11 sources, 1.8, 1.9
Message-ID: <200604101705.k3AH5fFp012141@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12120

Modified Files:
	.cvsignore cogito.spec sources 
Log Message:
Update cogito to 0.17.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	29 Mar 2006 19:36:46 -0000	1.8
+++ .cvsignore	10 Apr 2006 17:05:39 -0000	1.9
@@ -1 +1 @@
-cogito-0.17.1.tar.gz
+cogito-0.17.2.tar.gz


Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-4/cogito.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cogito.spec	30 Mar 2006 23:51:26 -0000	1.10
+++ cogito.spec	10 Apr 2006 17:05:39 -0000	1.11
@@ -1,6 +1,6 @@
 Name: 		cogito
-Version: 	0.17.1
-Release: 	2%{?dist}
+Version: 	0.17.2
+Release: 	1%{?dist}
 Summary:  	The Cogito Version Control System
 License: 	GPL
 Group: 		Development/Tools
@@ -11,8 +11,6 @@
 BuildRequires: 	asciidoc, xmlto
 BuildArch:	noarch
 
-Patch1: cg-admin-rewritehist-fix.patch
-
 %description
 Cogito is a version control system layered on top of the git tree history
 storage system. It aims at seamless user interface and ease of use, providing
@@ -21,7 +19,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 
@@ -47,6 +44,9 @@
 %doc README COPYING Documentation/tutorial-script
 
 %changelog
+* Mon Apr 10 2006 Chris Wright <chrisw at redhat.com> 0.17.2-1
+- 0.17.2
+
 * Thu Mar 30 2006 Chris Wright <chrisw at redhat.com> 0.17.1-2
 - cg-admin-rewritehist fix
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	29 Mar 2006 19:36:46 -0000	1.8
+++ sources	10 Apr 2006 17:05:39 -0000	1.9
@@ -1 +1 @@
-2c79629440ab0b652ebfcc1d4bae0122  cogito-0.17.1.tar.gz
+8e41b7b63319e4641f08645c59e20627  cogito-0.17.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 17:06:15 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Mon, 10 Apr 2006 10:06:15 -0700
Subject: rpms/cogito/FC-3 .cvsignore, 1.8, 1.9 cogito.spec, 1.10,
	1.11 sources, 1.8, 1.9
Message-ID: <200604101706.k3AH6Htm012219@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/cogito/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12196

Modified Files:
	.cvsignore cogito.spec sources 
Log Message:
Update cogito to 0.17.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-3/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	29 Mar 2006 19:37:52 -0000	1.8
+++ .cvsignore	10 Apr 2006 17:06:15 -0000	1.9
@@ -1 +1 @@
-cogito-0.17.1.tar.gz
+cogito-0.17.2.tar.gz


Index: cogito.spec
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-3/cogito.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- cogito.spec	30 Mar 2006 23:52:19 -0000	1.10
+++ cogito.spec	10 Apr 2006 17:06:15 -0000	1.11
@@ -1,6 +1,6 @@
 Name: 		cogito
-Version: 	0.17.1
-Release: 	2%{?dist}
+Version: 	0.17.2
+Release: 	1%{?dist}
 Summary:  	The Cogito Version Control System
 License: 	GPL
 Group: 		Development/Tools
@@ -11,8 +11,6 @@
 BuildRequires: 	asciidoc, xmlto
 BuildArch:	noarch
 
-Patch1: cg-admin-rewritehist-fix.patch
-
 %description
 Cogito is a version control system layered on top of the git tree history
 storage system. It aims at seamless user interface and ease of use, providing
@@ -21,7 +19,6 @@
 
 %prep
 %setup -q
-%patch1 -p1
 
 %build
 
@@ -47,6 +44,9 @@
 %doc README COPYING Documentation/tutorial-script
 
 %changelog
+* Mon Apr 10 2006 Chris Wright <chrisw at redhat.com> 0.17.2-1
+- 0.17.2
+
 * Thu Mar 30 2006 Chris Wright <chrisw at redhat.com> 0.17.1-2
 - cg-admin-rewritehist fix
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cogito/FC-3/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	29 Mar 2006 19:37:52 -0000	1.8
+++ sources	10 Apr 2006 17:06:15 -0000	1.9
@@ -1 +1 @@
-2c79629440ab0b652ebfcc1d4bae0122  cogito-0.17.1.tar.gz
+8e41b7b63319e4641f08645c59e20627  cogito-0.17.2.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 17:09:58 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Mon, 10 Apr 2006 10:09:58 -0700
Subject: rpms/gnome-sudoku/FC-4 gnome-sudoku.spec,1.7,1.8
Message-ID: <200604101710.k3AHAUeT012325@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/gnome-sudoku/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12267/FC-4

Modified Files:
	gnome-sudoku.spec 
Log Message:
Make SRPM more portable


Index: gnome-sudoku.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/FC-4/gnome-sudoku.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gnome-sudoku.spec	10 Apr 2006 15:55:51 -0000	1.7
+++ gnome-sudoku.spec	10 Apr 2006 17:09:58 -0000	1.8
@@ -10,9 +10,7 @@
 License:        GPL
 URL:            http://gnome-sudoku.sourceforge.net
 Source0:        http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-%if "%{fedora}" <= "4"
 Patch0:		gnome-sudoku-0.4.0-pygtk2-nofs.patch
-%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch



From fedora-extras-commits at redhat.com  Mon Apr 10 17:10:00 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Mon, 10 Apr 2006 10:10:00 -0700
Subject: rpms/gnome-sudoku/devel gnome-sudoku-0.4.0-pygtk2-nofs.patch, NONE, 
	1.1 gnome-sudoku.spec, 1.5, 1.6
Message-ID: <200604101710.k3AHAWls012331@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/gnome-sudoku/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12267/devel

Modified Files:
	gnome-sudoku.spec 
Added Files:
	gnome-sudoku-0.4.0-pygtk2-nofs.patch 
Log Message:
Make SRPM more portable

gnome-sudoku-0.4.0-pygtk2-nofs.patch:

--- NEW FILE gnome-sudoku-0.4.0-pygtk2-nofs.patch ---
diff -uNr gnome-sudoku-0.4.0-original/src/lib/gnome_sudoku.py gnome-sudoku-0.4.0/src/lib/gnome_sudoku.py
--- gnome-sudoku-0.4.0-original/src/lib/gnome_sudoku.py	2005-12-16 13:03:38.000000000 -0500
+++ gnome-sudoku-0.4.0/src/lib/gnome_sudoku.py	2005-12-16 13:04:28.000000000 -0500
@@ -168,7 +168,7 @@
             ('ZoomOut',gtk.STOCK_ZOOM_OUT,'_Decrease size',
              '<Control>minus','Decrease the size of numbers and squares.',
              self.zoom_out_cb),
-            ('FullScreen',gtk.STOCK_FULLSCREEN,None,
+            ('FullScreen',None,'_Full screen',
              'F11',None,self.full_screen_cb),
             ('PuzzleInfo',gtk.STOCK_ABOUT,'Puzzle _Statistics',
              None,'Show statistics about current puzzle',


Index: gnome-sudoku.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/devel/gnome-sudoku.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-sudoku.spec	10 Apr 2006 15:55:53 -0000	1.5
+++ gnome-sudoku.spec	10 Apr 2006 17:10:00 -0000	1.6
@@ -10,9 +10,7 @@
 License:        GPL
 URL:            http://gnome-sudoku.sourceforge.net
 Source0:        http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-%if "%{fedora}" <= "4"
 Patch0:		gnome-sudoku-0.4.0-pygtk2-nofs.patch
-%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch



From fedora-extras-commits at redhat.com  Mon Apr 10 17:09:59 2006
From: fedora-extras-commits at redhat.com (Paul W. Frields (pfrields))
Date: Mon, 10 Apr 2006 10:09:59 -0700
Subject: rpms/gnome-sudoku/FC-5 gnome-sudoku-0.4.0-pygtk2-nofs.patch, NONE, 
	1.1 gnome-sudoku.spec, 1.5, 1.6
Message-ID: <200604101710.k3AHAVqc012328@cvs-int.fedora.redhat.com>

Author: pfrields

Update of /cvs/extras/rpms/gnome-sudoku/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12267/FC-5

Modified Files:
	gnome-sudoku.spec 
Added Files:
	gnome-sudoku-0.4.0-pygtk2-nofs.patch 
Log Message:
Make SRPM more portable

gnome-sudoku-0.4.0-pygtk2-nofs.patch:

--- NEW FILE gnome-sudoku-0.4.0-pygtk2-nofs.patch ---
diff -uNr gnome-sudoku-0.4.0-original/src/lib/gnome_sudoku.py gnome-sudoku-0.4.0/src/lib/gnome_sudoku.py
--- gnome-sudoku-0.4.0-original/src/lib/gnome_sudoku.py	2005-12-16 13:03:38.000000000 -0500
+++ gnome-sudoku-0.4.0/src/lib/gnome_sudoku.py	2005-12-16 13:04:28.000000000 -0500
@@ -168,7 +168,7 @@
             ('ZoomOut',gtk.STOCK_ZOOM_OUT,'_Decrease size',
              '<Control>minus','Decrease the size of numbers and squares.',
              self.zoom_out_cb),
-            ('FullScreen',gtk.STOCK_FULLSCREEN,None,
+            ('FullScreen',None,'_Full screen',
              'F11',None,self.full_screen_cb),
             ('PuzzleInfo',gtk.STOCK_ABOUT,'Puzzle _Statistics',
              None,'Show statistics about current puzzle',


Index: gnome-sudoku.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-sudoku/FC-5/gnome-sudoku.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-sudoku.spec	10 Apr 2006 15:55:52 -0000	1.5
+++ gnome-sudoku.spec	10 Apr 2006 17:09:59 -0000	1.6
@@ -10,9 +10,7 @@
 License:        GPL
 URL:            http://gnome-sudoku.sourceforge.net
 Source0:        http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-%if "%{fedora}" <= "4"
 Patch0:		gnome-sudoku-0.4.0-pygtk2-nofs.patch
-%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch



From fedora-extras-commits at redhat.com  Mon Apr 10 17:20:08 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Mon, 10 Apr 2006 10:20:08 -0700
Subject: rpms/smart - New directory
Message-ID: <200604101720.k3AHKAJV012664@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/smart
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12638/smart

Log Message:
Directory /cvs/extras/rpms/smart added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 10 17:20:09 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Mon, 10 Apr 2006 10:20:09 -0700
Subject: rpms/smart/devel - New directory
Message-ID: <200604101720.k3AHKBVl012667@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/smart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12638/smart/devel

Log Message:
Directory /cvs/extras/rpms/smart/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 10 17:20:27 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 10 Apr 2006 10:20:27 -0700
Subject: rpms/apt/devel apt.spec,1.23,1.24
Message-ID: <200604101720.k3AHKT1H012699@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/apt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12680

Modified Files:
	apt.spec 
Log Message:
* Mon Apr 10 2006 Ville Skytt?? <ville.skytta at iki.fi>
- Remove mirror select remainders (thanks to Panu).



Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- apt.spec	9 Apr 2006 15:23:32 -0000	1.23
+++ apt.spec	10 Apr 2006 17:20:27 -0000	1.24
@@ -68,13 +68,10 @@
 BuildRequires:  pkgconfig
 Requires:       gnupg
 Requires:       bzip2
-# wget needed by the mirror-selector script
-Requires:       wget
 Requires:       fedora-release >= 4
 Requires(post): chkconfig
 Requires(post): ldconfig
 Requires(preun): chkconfig
-Provides:       apt-mirrorselect
 %if 0%{!?_with_groupinstall:1}
 Obsoletes:      %{name}-groupinstall < %{version}-%{release}
 %endif
@@ -311,6 +308,9 @@
 
 
 %changelog
+* Mon Apr 10 2006 Ville Skytt?? <ville.skytta at iki.fi>
+- Remove mirror select remainders (thanks to Panu).
+
 * Sun Apr  9 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.5.15lorg3-0.3.rc1
 - 0.5.15lorg3-rc1.
 - Trim pre-2005 changelog entries.



From fedora-extras-commits at redhat.com  Mon Apr 10 17:20:35 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Mon, 10 Apr 2006 10:20:35 -0700
Subject: rpms/smart Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604101720.k3AHKb58012735@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/smart
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12706

Added Files:
	Makefile import.log 
Log Message:
Setup of module smart


--- NEW FILE Makefile ---
# Top level Makefile for module smart
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 10 17:20:36 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Mon, 10 Apr 2006 10:20:36 -0700
Subject: rpms/smart/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200604101720.k3AHKcJA012738@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/smart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12706/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module smart


--- 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 Apr 10 17:22:46 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Mon, 10 Apr 2006 10:22:46 -0700
Subject: rpms/smart import.log,1.1,1.2
Message-ID: <200604101722.k3AHMmdY012879@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/smart
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12840

Modified Files:
	import.log 
Log Message:
auto-import smart-0.41-29 on branch devel from smart-0.41-29.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/smart/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Apr 2006 17:20:35 -0000	1.1
+++ import.log	10 Apr 2006 17:22:46 -0000	1.2
@@ -0,0 +1 @@
+smart-0_41-29:HEAD:smart-0.41-29.src.rpm:1144689754



From fedora-extras-commits at redhat.com  Mon Apr 10 17:22:47 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Mon, 10 Apr 2006 10:22:47 -0700
Subject: rpms/smart/devel distro.py, NONE, 1.1 smart-0.28-mxddcl.patch, NONE,
	1.1 smart-0.41-emptydesc.patch, NONE, 1.1 smart.console, NONE,
	1.1 smart.desktop, NONE, 1.1 smart.pam, NONE, 1.1 smart.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604101722.k3AHMnEF012888@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/smart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12840/devel

Modified Files:
	.cvsignore sources 
Added Files:
	distro.py smart-0.28-mxddcl.patch smart-0.41-emptydesc.patch 
	smart.console smart.desktop smart.pam smart.spec 
Log Message:
auto-import smart-0.41-29 on branch devel from smart-0.41-29.src.rpm


--- NEW FILE distro.py ---
if not sysconf.getReadOnly():
    if not sysconf.has("channels"):
        sysconf.set(("channels", "rpm-db"),
                    {"alias": "rpm-db",
                     "type": "rpm-sys",
                     "name": "RPM Database"})

    for flavour in ("", "-smp", "-bigmem", "-hugemem", "-largesmp", "-xen0", "-xenU", "-kdump"):
        pkgconf.setFlag("multi-version", "kernel%s" % flavour)
        pkgconf.setFlag("multi-version", "kernel%s-unsupported" % flavour)
        pkgconf.setFlag("multi-version", "kernel%s-devel" % flavour)
        for clustergfs in ("GFS", "cman", "dlm", "gnbd"):
             pkgconf.setFlag("multi-version", "%s-kernel%s" % (clustergfs, flavour))
        pkgconf.setFlag("multi-version", "kernel-suspend2%s" % flavour)
        pkgconf.setFlag("multi-version", "kernel-suspend2%s-unsupported" % flavour)
        pkgconf.setFlag("multi-version", "kernel-suspend2%s-devel" % flavour)
        for clustergfs in ("GFS", "cman", "dlm", "gnbd"):
             pkgconf.setFlag("multi-version", "%s-kernel-suspend2%s" % (clustergfs, flavour))
    pkgconf.setFlag("multi-version", "kernel-source")
    pkgconf.setFlag("multi-version", "kernel-sourcecode")

import os
import os.path

DISTRODIR = "/etc/smart/distro.d"

if os.path.isdir(DISTRODIR):
    for f in map(lambda x: os.path.join(DISTRODIR, x), os.listdir(DISTRODIR)):
        if f.endswith(".py") and os.path.isfile(f):
            execfile(f, {"ctrl": ctrl, "iface": iface, "sysconf": sysconf,
                         "pkgconf": pkgconf, "hooks": hooks})

smart-0.28-mxddcl.patch:

--- NEW FILE smart-0.28-mxddcl.patch ---
--- smart-0.28/smart/ccache.c~	2004-12-06 20:50:02.000000000 +0100
+++ smart-0.28/smart/ccache.c	2004-12-18 04:31:53.201002760 +0100
@@ -1105,6 +1105,8 @@
 
     CacheObject *cache;
 
+    int found;
+
     if (!self->_cache) {
         PyErr_SetString(PyExc_TypeError, "Cache not set");
         return NULL;
@@ -1346,7 +1348,7 @@
     }
 
     /* found = False */
-    int found = 0;
+    found = 0;
     /* lst = cache._objmap.get(pkgargs) */
     lst = PyDict_GetItem(cache->_objmap, pkgargs);
     /* if lst is not None: */
@@ -1541,8 +1543,9 @@
     PyObject *state = PyDict_New();
     PyObject *self__stateversion__;
     PyMemberDef *members = Loader_Type.tp_members;
+    int i;
     if (!state) return NULL;
-    int i = 0;
+    i = 0;
     PyErr_Clear();
     while (members[i].name) {
         PyObject *obj = PyMember_GetOne((char *)self, &members[i]);
@@ -1567,6 +1570,7 @@
     PyMemberDef *members = Loader_Type.tp_members;
     PyObject *self__stateversion__;
     PyObject *__stateversion__;
+    PyObject *dict;
     if (!PyDict_Check(state)) {
         PyErr_SetString(StateVersionError, "");
         return NULL;
@@ -1581,7 +1585,7 @@
         return NULL;
     }
     Py_DECREF(self__stateversion__);
-    PyObject *dict = PyObject_GetAttrString((PyObject *)self, "__dict__");
+    dict = PyObject_GetAttrString((PyObject *)self, "__dict__");
     if (dict) {
         PyObject *keys = PyDict_Keys(state);
         int i, ilen;
@@ -1842,6 +1846,7 @@
     /* for loader in loaders: */
     ilen = PyList_GET_SIZE(self->_loaders);
     for (i = 0; i != ilen; i++) {
+        int j, jlen;
         LoaderObject *loader =
                         (LoaderObject *)PyList_GET_ITEM(self->_loaders, i);
         if (!PyObject_IsInstance((PyObject *)loader,
@@ -1852,7 +1857,6 @@
         }
 
         /* for pkg in loader._packages: */
-        int j, jlen;
         jlen = PyList_GET_SIZE(loader->_packages);
         for (j = 0; j != jlen; j++) {
             PackageObject *pkg = (PackageObject *)

smart-0.41-emptydesc.patch:

--- NEW FILE smart-0.41-emptydesc.patch ---
Index: smart/backends/rpm/metadata.py
===================================================================
--- smart/backends/rpm/metadata.py	(revision 689)
+++ smart/backends/rpm/metadata.py	(revision 690)
@@ -178,10 +178,12 @@
                                   (elem.get("ver"), elem.get("rel"))
 
                 elif tag == SUMMARY:
-                    info["summary"] = elem.text
+                    if elem.text:
+                        info["summary"] = elem.text
 
                 elif tag == DESCRIPTION:
-                    info["description"] = elem.text
+                    if elem.text:
+                        info["description"] = elem.text
 
                 elif tag == SIZE:
                     info["size"] = int(elem.get("package"))
@@ -196,7 +198,8 @@
                     info["location"] = elem.get("href")
 
                 elif tag == GROUP:
-                    info["group"] = elem.text
+                    if elem.text:
+                        info["group"] = elem.text
 
                 elif tag == FILE:
                     filedict[elem.text] = True


--- NEW FILE smart.console ---
USER=root
PROGRAM=/usr/bin/smart
SESSION=true


--- NEW FILE smart.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Smart Package Manager
Name[pt_BR]=Gerenciador de Pacotes Smart
Comment=Next generation package handling tool
Comment[pt_BR]=Gerenciador de pacotes de pr??xima gera????o
Icon=smart.png
Exec=smart-root --gui
Type=Application
Terminal=false
StartupNotify=true
Categories=Application;System;
X-Desktop-File-Install-Version=0.2


--- NEW FILE smart.pam ---
#%PAM-1.0
auth       sufficient	pam_rootok.so
auth       sufficient	pam_timestamp.so
auth       required	pam_stack.so service=system-auth
session    required	pam_permit.so
session    optional	pam_timestamp.so
session    optional	pam_xauth.so
account    required	pam_permit.so


--- NEW FILE smart.spec ---
%{!?python_sitearch: %define python_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Summary: Next generation package handling tool
Name: smart
Version: 0.41%{?dist}
Release: 29
License: GPL
Group: Applications/System
URL: http://labix.org/smart/
Source0: http://labix.org/download/smart/%{name}-%{version}.tar.bz2
Source1: smart.console
Source2: smart.pam
Source3: smart.desktop
Source4: distro.py
Patch0: smart-0.28-mxddcl.patch
Patch1: smart-0.41-emptydesc.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: python-devel >= 2.3
BuildRequires: desktop-file-utils
Requires: python-abi = %(python -c "import sys ; print sys.version[:3]")
Requires: rpm-python >= 4.4
Requires: fedora-package-config-smart

%description
Smart Package Manager is a next generation package handling tool.

%package update
Summary: Allows execution of 'smart update' by normal users (suid)
Group: Applications/System
Requires: smart = %{version}-%{release}

%description update
Allows execution of 'smart update' by normal users through a
special suid command.

%package gui
Summary: Graphical user interface for the smart package manager
Group: Applications/System
Requires: smart = %{version}-%{release}
Requires: pygtk2 >= 2.4
Requires: usermode

%description gui
Graphical user interface for the smart package manager.

%prep
%setup -q
%patch0 -p1 -b .mxddcl
%patch1 -p0 -b .emptydesc

# /usr/lib is hardcoded 
perl -pi -e's,/usr/lib/,%{_libdir}/,' smart/const.py

%build
CFLAGS="%{optflags}"
export CFLAGS
python setup.py build

make -C contrib/smart-update

%install
rm -rf %{buildroot}
python setup.py install -O1 --root=%{buildroot}

mkdir -p %{buildroot}%{_libdir}/smart/plugins
mkdir -p %{buildroot}%{_sysconfdir}/smart/channels
mkdir -p %{buildroot}%{_localstatedir}/lib/smart{/packages,/channels}

# usermode support
ln -sf consolehelper %{buildroot}%{_bindir}/smart-root

mkdir -p %{buildroot}/etc/security/console.apps
mkdir -p %{buildroot}/etc/pam.d
install -p -m 644 %{SOURCE1} %{buildroot}/etc/security/console.apps/smart-root
install -p -m 644 %{SOURCE2} %{buildroot}/etc/pam.d/smart-root

# smart-update
install -p contrib/smart-update/smart-update %{buildroot}%{_bindir}

mkdir -p %{buildroot}%{_datadir}/applications
desktop-file-install --vendor fedora                            \
        --dir %{buildroot}%{_datadir}/applications              \
        --add-category X-Fedora                                 \
        %{SOURCE3}

mkdir -p  %{buildroot}%{_datadir}/pixmaps
install -p -m 644 smart/interfaces/images/smart.png \
    %{buildroot}%{_datadir}/pixmaps/smart.png

# distro.py and distro.d support
install -p -m 644 %{SOURCE4} %{buildroot}%{_libdir}/smart/
mkdir -p %{buildroot}%{_sysconfdir}/smart/distro.d

%find_lang %{name}

# Create a list w/o smart/interfaces/gtk to avoid warbing of duplicate
# in the %files section (otherwise including all and %excluding works,
# too

echo "%%defattr(-,root,root,-)" > %{name}.fileslist
find %{buildroot}%{python_sitearch}/smart -type d \
  | grep -v %{python_sitearch}/smart/interfaces/gtk \
  | sed -e's,%{buildroot},%%dir ,' \
  >> %{name}.fileslist
find %{buildroot}%{python_sitearch}/smart \! -type d \! -name \*.pyo \
  | grep -v %{python_sitearch}/smart/interfaces/gtk \
  | sed -e's,%{buildroot},,' \
  >> %{name}.fileslist
find %{buildroot}%{python_sitearch}/smart -name \*.pyo \
  | grep -v %{python_sitearch}/smart/interfaces/gtk \
  | sed -e's,%{buildroot},%%ghost ,' \
  >> %{name}.fileslist

# %files does not take two -f arguments
cat %{name}.lang >> %{name}.fileslist

%clean
rm -rf %{buildroot}

%files -f %{name}.fileslist
%defattr(-,root,root,-)
%doc HACKING README LICENSE TODO IDEAS
%{_bindir}/smart
%{_libdir}/smart
%{_sysconfdir}/smart
%{_localstatedir}/lib/smart

%files update
%defattr(-,root,root,-)
%{_bindir}/smart-update

%files gui
%defattr(-,root,root,-)
%dir %{python_sitearch}/smart/interfaces/gtk
%{python_sitearch}/smart/interfaces/gtk/*.py
%{python_sitearch}/smart/interfaces/gtk/*.pyc
%ghost %{python_sitearch}/smart/interfaces/gtk/*.pyo
%{_datadir}/applications/*-smart.desktop
%{_datadir}/pixmaps/smart.png

%{_bindir}/smart-root
%config %{_sysconfdir}/security/console.apps/smart-root
%config %{_sysconfdir}/pam.d/smart-root

%changelog
* Mon Apr 10 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41-29
- Fix typos in distro.py, there were %% missing.
- /usr/bin/smart-root should had been %%{_bindir}/smart-root ...
- Make dependent on fedora-package-config-smart.

* Sun Apr  2 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41-28
- Move usermode support to the gui package.
- Add cluster/gfs *-kernel variants.

* Fri Mar 31 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41-27
- Sync with specfile from Ville Skytt?? <ville.skytta at iki.fi>
- Add empty-description patch (upstream issue 64).
- Update multi-version to include more kernel-* variants.
- Add distro.d support.
- Make owner of %%{_sysconfdir}/smart and %%{_localstatedir}/lib/smart{,/packages,/channels}.

* Wed Dec 21 2005 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41-26
- Update to 0.41.

* Tue Dec 13 2005 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.40-23
- Adapted to Fedora Extras guidelines for submission.

* Sun Oct  9 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
- Update to 0.40.

* Thu Sep 15 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
- Update to 0.39.

* Fri Aug 19 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
- Update to 0.37.

* Sat Jun 18 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
- Update to 0.35.

* Fri Jun 10 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
- Update to 0.35.

* Fri Apr  1 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
- Update to 0.30.2.

* Fri Mar 25 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
- Update to 0.30.

* Wed Mar 16 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
- Update to 0.29.2.

* Sat Mar  5 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
- Update to 0.29.1.

* Wed Dec 29 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
- Merge smart and smart-gui src.rpm back together again.
  (all dependencies resolved for all supported platforms)

* Mon Dec 13 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
- Split out smart-gui and ksmarttray to manage build dependencies better.

* Wed Dec  8 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
- Update to 0.28.

* Sun Dec  5 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
- Update to 0.27.1

* Fri Dec  3 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
- Initial specfile from Guilherme Manika <guilherme at zorked.net>.
- Some reordering and cleanups.
- Remove binary rpmmodule.so lib.
- Split the gui into a separate package, so the non-gui packages have
  lower requirements.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smart/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Apr 2006 17:20:36 -0000	1.1
+++ .cvsignore	10 Apr 2006 17:22:47 -0000	1.2
@@ -0,0 +1 @@
+smart-0.41.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smart/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Apr 2006 17:20:36 -0000	1.1
+++ sources	10 Apr 2006 17:22:47 -0000	1.2
@@ -0,0 +1 @@
+1460dfbfe7f739ac718525c71f46b5fc  smart-0.41.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 10 17:31:33 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 10 Apr 2006 10:31:33 -0700
Subject: rpms/maxima/FC-5 .cvsignore, 1.4, 1.5 maxima.spec, 1.20,
	1.21 sources, 1.4, 1.5
Message-ID: <200604101731.k3AHVZ5d013071@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13048

Modified Files:
	.cvsignore maxima.spec sources 
Log Message:
* Wed Apr 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-1
- 5.9.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 Oct 2005 12:40:34 -0000	1.4
+++ .cvsignore	10 Apr 2006 17:31:33 -0000	1.5
@@ -1,3 +1,3 @@
-maxima-5.9.2.tar.gz
 maximabook-19-Sept-2004.pdf
 macref.pdf
+maxima-5.9.3.tar.gz


Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-5/maxima.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- maxima.spec	30 Mar 2006 19:53:18 -0000	1.20
+++ maxima.spec	10 Apr 2006 17:31:33 -0000	1.21
@@ -1,9 +1,9 @@
 
 Summary: Symbolic Computation Program
 Name: 	 maxima
-Version: 5.9.2
+Version: 5.9.3
 
-Release: 13%{?dist}
+Release: 1%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -18,13 +18,11 @@
 %define _with_default_lisp --with-default-lisp=clisp
 
 %ifarch %{ix86}
-# cmucl review (done): http://bugzilla.redhat.com/bugzilla/166796
 %define _enable_cmucl --enable-cmucl
 %endif
 
 %ifarch %{ix86} x86_64
 %define _enable_clisp --enable-clisp 
-# gcl *was* not available for fc5/devel: http://bugzilla.redhat.com/bugzilla/177026
 %define _enable_gcl --enable-gcl 
 %define _enable_sbcl --enable-sbcl 
 %endif
@@ -71,7 +69,6 @@
 BuildRequires: desktop-file-utils
 # /usr/bin/wish
 BuildRequires: tk
-BuildRequires: automake
 
 Requires: %{name}-runtime = %{version}
 Requires: gnuplot
@@ -147,7 +144,7 @@
 %package runtime-sbcl
 Summary: Maxima compiled with SBCL 
 Group:   Applications/Engineering
-BuildRequires: sbcl >= 0.9.11
+BuildRequires: sbcl 
 # maxima requires the *same* version it was built against
 # this hack should work, even in mock (-: -- Rex
 %global sbcl_ver %(sbcl --version 2>/dev/null | cut -d' ' -f2)
@@ -185,13 +182,10 @@
 # remove CVS crud
 find -name CVS -type d | xargs rm -r
 
-%if "%{?_enable_sbcl:1}" == "1"
-%patch3 -p1 -b .sbcl-disable-debugger
-# seems to be needed only if --enable-sbcl
-aclocal
-automake --add-missing --copy
-autoconf
-%endif
+#patch3 -p1 -b .sbcl-disable-debugger
+#aclocal
+#automake --add-missing --copy
+#autoconf
 
 
 %build
@@ -362,6 +356,9 @@
 
 
 %changelog
+* Wed Apr 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-1
+- 5.9.3
+
 * Thu Mar 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-13
 - respin for sbcl-0.9.11
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	18 Oct 2005 12:40:34 -0000	1.4
+++ sources	10 Apr 2006 17:31:33 -0000	1.5
@@ -1,3 +1,3 @@
-dff996cd5c2c0c871977a26e6fb001f3  maxima-5.9.2.tar.gz
 9faa5a513de43b5e7384216a8783f620  maximabook-19-Sept-2004.pdf
 c101a1ce604d31b02bbc2f37cced280d  macref.pdf
+e6388632d91722bb0607914bdabc72f6  maxima-5.9.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 17:32:12 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 10 Apr 2006 10:32:12 -0700
Subject: rpms/maxima/FC-4 .cvsignore, 1.4, 1.5 maxima.spec, 1.18,
	1.19 sources, 1.4, 1.5
Message-ID: <200604101732.k3AHWEPA013136@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13115

Modified Files:
	.cvsignore maxima.spec sources 
Log Message:
* Wed Apr 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-1
- 5.9.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 Oct 2005 12:40:33 -0000	1.4
+++ .cvsignore	10 Apr 2006 17:32:12 -0000	1.5
@@ -1,3 +1,3 @@
-maxima-5.9.2.tar.gz
 maximabook-19-Sept-2004.pdf
 macref.pdf
+maxima-5.9.3.tar.gz


Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-4/maxima.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- maxima.spec	30 Mar 2006 20:48:19 -0000	1.18
+++ maxima.spec	10 Apr 2006 17:32:12 -0000	1.19
@@ -1,9 +1,9 @@
 
 Summary: Symbolic Computation Program
 Name: 	 maxima
-Version: 5.9.2
+Version: 5.9.3
 
-Release: 13%{?dist}
+Release: 1%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -18,13 +18,11 @@
 %define _with_default_lisp --with-default-lisp=clisp
 
 %ifarch %{ix86}
-# cmucl review (done): http://bugzilla.redhat.com/bugzilla/166796
 %define _enable_cmucl --enable-cmucl
 %endif
 
 %ifarch %{ix86} x86_64
 %define _enable_clisp --enable-clisp 
-# gcl *was* not available for fc5/devel: http://bugzilla.redhat.com/bugzilla/177026
 %define _enable_gcl --enable-gcl 
 %define _enable_sbcl --enable-sbcl 
 %endif
@@ -71,7 +69,6 @@
 BuildRequires: desktop-file-utils
 # /usr/bin/wish
 BuildRequires: tk
-BuildRequires: automake
 
 Requires: %{name}-runtime = %{version}
 Requires: gnuplot
@@ -147,7 +144,7 @@
 %package runtime-sbcl
 Summary: Maxima compiled with SBCL 
 Group:   Applications/Engineering
-BuildRequires: sbcl >= 0.9.11
+BuildRequires: sbcl 
 # maxima requires the *same* version it was built against
 # this hack should work, even in mock (-: -- Rex
 %global sbcl_ver %(sbcl --version 2>/dev/null | cut -d' ' -f2)
@@ -185,13 +182,10 @@
 # remove CVS crud
 find -name CVS -type d | xargs rm -r
 
-%if "%{?_enable_sbcl:1}" == "1"
-%patch3 -p1 -b .sbcl-disable-debugger
-# seems to be needed only if --enable-sbcl
-aclocal
-automake --add-missing --copy
-autoconf
-%endif
+#patch3 -p1 -b .sbcl-disable-debugger
+#aclocal
+#automake --add-missing --copy
+#autoconf
 
 
 %build
@@ -362,6 +356,9 @@
 
 
 %changelog
+* Wed Apr 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-1
+- 5.9.3
+
 * Thu Mar 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.2-13
 - respin for sbcl-0.9.11
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	18 Oct 2005 12:40:33 -0000	1.4
+++ sources	10 Apr 2006 17:32:12 -0000	1.5
@@ -1,3 +1,3 @@
-dff996cd5c2c0c871977a26e6fb001f3  maxima-5.9.2.tar.gz
 9faa5a513de43b5e7384216a8783f620  maximabook-19-Sept-2004.pdf
 c101a1ce604d31b02bbc2f37cced280d  macref.pdf
+e6388632d91722bb0607914bdabc72f6  maxima-5.9.3.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 17:40:30 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Mon, 10 Apr 2006 10:40:30 -0700
Subject: rpms/link-grammar/devel .cvsignore, 1.2, 1.3 link-grammar.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200604101740.k3AHeWL5013243@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/link-grammar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13217

Modified Files:
	.cvsignore link-grammar.spec sources 
Log Message:
New upstream version




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Aug 2005 13:45:41 -0000	1.2
+++ .cvsignore	10 Apr 2006 17:40:30 -0000	1.3
@@ -1 +1 @@
-link-grammar-4.1.3.tar.gz
+link-grammar.spec


Index: link-grammar.spec
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/devel/link-grammar.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- link-grammar.spec	15 Feb 2006 09:41:06 -0000	1.2
+++ link-grammar.spec	10 Apr 2006 17:40:30 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: A Grammar Checking library
 Name: link-grammar
-Version: 4.1.3
-Release: 4%{?dist}
+Version: 4.2.1
+Release: 1%{?dist}
 Group: System Environment/Libraries
 License: BSD-style 
 Source: http://www.abisource.com/downloads/link-grammar/%{version}/link-grammar-%{version}.tar.gz
@@ -55,6 +55,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 4.2.1-1
+- New upstream version
+
 * Wed Feb 15 2006 Marc Maurer <uwog at abisource.com> 4.1.3-4
 - Rebuild for Fedora Extras 5
 - Use %%{?dist} in the release name


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Aug 2005 13:45:41 -0000	1.2
+++ sources	10 Apr 2006 17:40:30 -0000	1.3
@@ -1 +1 @@
-5edbeab4b9e3f61b343e68206708703e  link-grammar-4.1.3.tar.gz
+9c0e86d3e44091fc76256034154cfd58  link-grammar.spec



From fedora-extras-commits at redhat.com  Mon Apr 10 17:41:01 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Mon, 10 Apr 2006 10:41:01 -0700
Subject: rpms/docbook2X/devel .cvsignore, 1.2, 1.3 docbook2X.spec, 1.2,
	1.3 sources, 1.2, 1.3 docbook2X-vendor_perl.diff, 1.1, NONE
Message-ID: <200604101741.k3AHf3ZM013309@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/docbook2X/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13288

Modified Files:
	.cvsignore docbook2X.spec sources 
Removed Files:
	docbook2X-vendor_perl.diff 
Log Message:
* Fri Feb 17 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.8.6-1
- update to 0.8.6
- drop patch as SGMLSpl.pm is included in the scripts, not distributed
- BR perl-XML-SAX (close 188481)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/docbook2X/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Feb 2006 21:00:11 -0000	1.2
+++ .cvsignore	10 Apr 2006 17:41:01 -0000	1.3
@@ -1 +1 @@
-docbook2X-0.8.5.tar.gz
+docbook2X-0.8.6.tar.gz


Index: docbook2X.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook2X/devel/docbook2X.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- docbook2X.spec	17 Feb 2006 22:41:35 -0000	1.2
+++ docbook2X.spec	10 Apr 2006 17:41:01 -0000	1.3
@@ -1,18 +1,19 @@
 Name:           docbook2X
-Version:        0.8.5
-Release:        2%{?dist}
+Version:        0.8.6
+Release:        1%{?dist}
 Summary:        Convert docbook into man and Texinfo
 
 Group:          Applications/Text
 License:        BSD
 URL:            http://docbook2x.sourceforge.net/
-Source0:        http://heanet.dl.sourceforge.net/sourceforge/docbook2x/docbook2X-%{version}.tar.gz
+Source0:        http://dl.sourceforge.net/sourceforge/docbook2x/docbook2X-%{version}.tar.gz
 
 # modify Makefile.in to replace make install_perl by make install_vendor
-Patch0:         docbook2X-vendor_perl.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxslt openjade
+# required by the perl -c calls during build
+BuildRequires:  perl-XML-SAX
 # rpmlint isn't happy with libxslt, but we need xsltproc
 Requires:       libxslt openjade texinfo
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -26,7 +27,6 @@
 
 %prep
 %setup -q
-%patch
 
 %build
 # to avoid clashing with docbook2* from docbook-utils
@@ -71,10 +71,14 @@
 %{_datadir}/docbook2X/
 %{_mandir}/man1/*
 %{_infodir}/docbook2*
-%{perl_vendorlib}/*
 
 
 %changelog
+* Fri Feb 17 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.8.6-1
+- update to 0.8.6
+- drop patch as SGMLSpl.pm is included in the scripts, not distributed
+- BR perl-XML-SAX (close 188481)
+
 * Fri Feb 17 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.8.5-2
 - rebuild for fc5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/docbook2X/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Feb 2006 21:00:11 -0000	1.2
+++ sources	10 Apr 2006 17:41:01 -0000	1.3
@@ -1 +1 @@
-05d549646ac11caba6c7f1e07ced33e3  docbook2X-0.8.5.tar.gz
+fd5efad56674cfb22ea4831845c3c937  docbook2X-0.8.6.tar.gz


--- docbook2X-vendor_perl.diff DELETED ---



From fedora-extras-commits at redhat.com  Mon Apr 10 17:44:12 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Mon, 10 Apr 2006 10:44:12 -0700
Subject: rpms/fedora-package-config-smart - New directory
Message-ID: <200604101744.k3AHiEfG013427@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fedora-package-config-smart
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13406/fedora-package-config-smart

Log Message:
Directory /cvs/extras/rpms/fedora-package-config-smart added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 10 17:44:12 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Mon, 10 Apr 2006 10:44:12 -0700
Subject: rpms/fedora-package-config-smart/devel - New directory
Message-ID: <200604101744.k3AHiEJE013430@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-serv13406/fedora-package-config-smart/devel

Log Message:
Directory /cvs/extras/rpms/fedora-package-config-smart/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 10 17:44:44 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Mon, 10 Apr 2006 10:44:44 -0700
Subject: rpms/fedora-package-config-smart/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200604101744.k3AHikoZ013494@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-serv13458/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module fedora-package-config-smart


--- 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 Apr 10 17:44:43 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Mon, 10 Apr 2006 10:44:43 -0700
Subject: rpms/fedora-package-config-smart Makefile, NONE, 1.1 import.log,
	NONE, 1.1
Message-ID: <200604101744.k3AHijcn013491@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fedora-package-config-smart
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13458

Added Files:
	Makefile import.log 
Log Message:
Setup of module fedora-package-config-smart


--- NEW FILE Makefile ---
# Top level Makefile for module fedora-package-config-smart
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 10 17:45:22 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Mon, 10 Apr 2006 10:45:22 -0700
Subject: rpms/fedora-package-config-smart import.log,1.1,1.2
Message-ID: <200604101745.k3AHjO6q013557@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/fedora-package-config-smart
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13524

Modified Files:
	import.log 
Log Message:
auto-import fedora-package-config-smart-5-4 on branch devel from fedora-package-config-smart-5-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-smart/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Apr 2006 17:44:43 -0000	1.1
+++ import.log	10 Apr 2006 17:45:22 -0000	1.2
@@ -0,0 +1 @@
+fedora-package-config-smart-5-4:HEAD:fedora-package-config-smart-5-4.src.rpm:1144691111



From fedora-extras-commits at redhat.com  Mon Apr 10 17:45:23 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Mon, 10 Apr 2006 10:45:23 -0700
Subject: rpms/fedora-package-config-smart/devel
	fedora-package-config-smart.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604101745.k3AHjPgR013562@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-serv13524/devel

Modified Files:
	.cvsignore sources 
Added Files:
	fedora-package-config-smart.spec 
Log Message:
auto-import fedora-package-config-smart-5-4 on branch devel from fedora-package-config-smart-5-4.src.rpm


--- NEW FILE fedora-package-config-smart.spec ---
Summary: Configuration files for the smart package manager
Name: fedora-package-config-smart
Version: 5
Release: 4
License: GPL
Group: System Environment/Base
URL: http://fedora.redhat.com/
Source0: %{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot

%description
This package contains configuration files for smart.

%prep
%setup -q
# place the proper arch in the folders
for filein in *.channel.in; do
  file=`echo $filein | sed -e's,\.in$,,'`
  sed -e's, at ARCH@,%{_target_cpu},g' < $filein > $file
done

%install
rm -rf %{buildroot}

mkdir -p %{buildroot}%{_sysconfdir}/smart/channels
install -p -m 0644 *.channel %{buildroot}%{_sysconfdir}/smart/channels

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%dir %{_sysconfdir}/smart
%dir %{_sysconfdir}/smart/channels
%config(noreplace) %{_sysconfdir}/smart/channels/*.channel

%changelog
* Sat Apr  1 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 5-4
- Update to Fedora Core 5.

* Tue Dec 13 2005 Axel Thimm <Axel.Thimm at ATrpms.net> - 4-3
- changed name to fedora-package-config-smart
- Modify to only include what fedora-release includes for yum.

* Thu Jul 14 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
- Merge srpms of atrpms-package-config and medley-package-config.

* Sat Jun 18 2005 Axel Thimm <Axel.Thimm at ATrpms.net>
- Add el3/el4/fc4 repos.

* Fri Dec 17 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
- Add smart support.

* Tue Nov 16 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
- Split yum config files for yum 2.0.x and yum >= 2.1.x.

* Tue Nov  9 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
- Add fc3 support.

* Tue Sep 28 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
- Add fedoralegacy repo for FC1.
- Prapare commented entries for fedoralegacy repo for FC2.

* Fri Sep  3 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
- Rename apt.physik.fu-berlin.de to apt.atrpms.net

* Tue Aug 17 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
- Change main dries repo to lower load on studentenweb.org.

* Thu Jul 29 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
- Fork ATrpms-only package, former atrpms-package-config
  package has been renamed to medley-package.config.

* Sat Jul 24 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
- Fix nr entries for production.
- Add freshrpms' x86_64 entries.

* Fri May 28 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
- Add RPM::Order "true" to apt.conf.

* Mon May 24 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
- Added back Gstreamer, now we know where it went to.
- New fc2 list officially published.

* Thu May  6 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
- Add fedoralegacy repos where appropriate.

* Fri Apr  2 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
- Remove nonfree sections of BIOrpms, as these were accidentially activated.

* Mon Mar 15 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
- Change in Matt's repo structure.

* Thu Mar 11 2004 Axel Thimm <Axel.Thimm at ATrpms.net>
- Interrepo problems with Dag's obsoletes.

* Fri Mar  5 2004 Axel Thimm <Axel.Thimm at physik.fu-berlin.de>
- Split off package from atrpms package (check there for prior logs).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-smart/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Apr 2006 17:44:44 -0000	1.1
+++ .cvsignore	10 Apr 2006 17:45:23 -0000	1.2
@@ -0,0 +1 @@
+fedora-package-config-smart-5.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-smart/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Apr 2006 17:44:44 -0000	1.1
+++ sources	10 Apr 2006 17:45:23 -0000	1.2
@@ -0,0 +1 @@
+5992a399b473b042ab25e2f39cbb4992  fedora-package-config-smart-5.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 10 17:46:26 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Mon, 10 Apr 2006 10:46:26 -0700
Subject: rpms/link-grammar/devel .cvsignore, 1.3, 1.4 link-grammar.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200604101746.k3AHkSrQ013619@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/link-grammar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13598

Modified Files:
	.cvsignore link-grammar.spec sources 
Log Message:
rebuild with proper source




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Apr 2006 17:40:30 -0000	1.3
+++ .cvsignore	10 Apr 2006 17:46:26 -0000	1.4
@@ -1 +1 @@
-link-grammar.spec
+link-grammar-4.2.1.tar.gz


Index: link-grammar.spec
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/devel/link-grammar.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- link-grammar.spec	10 Apr 2006 17:40:30 -0000	1.3
+++ link-grammar.spec	10 Apr 2006 17:46:26 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: A Grammar Checking library
 Name: link-grammar
 Version: 4.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Libraries
 License: BSD-style 
 Source: http://www.abisource.com/downloads/link-grammar/%{version}/link-grammar-%{version}.tar.gz
@@ -55,6 +55,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 4.2.1-2
+- Rebuild
+
 * Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 4.2.1-1
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Apr 2006 17:40:30 -0000	1.3
+++ sources	10 Apr 2006 17:46:26 -0000	1.4
@@ -1 +1 @@
-9c0e86d3e44091fc76256034154cfd58  link-grammar.spec
+c4de497b11a2eeaa93ac19f08c710f23  link-grammar-4.2.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 17:48:19 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Mon, 10 Apr 2006 10:48:19 -0700
Subject: rpms/link-grammar/FC-5 .cvsignore, 1.2, 1.3 link-grammar.spec, 1.2, 
	1.3 sources, 1.2, 1.3
Message-ID: <200604101748.k3AHmL1g013698@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/link-grammar/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13677

Modified Files:
	.cvsignore link-grammar.spec sources 
Log Message:
New upstream version




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Aug 2005 13:45:41 -0000	1.2
+++ .cvsignore	10 Apr 2006 17:48:19 -0000	1.3
@@ -1 +1 @@
-link-grammar-4.1.3.tar.gz
+link-grammar-4.2.1.tar.gz


Index: link-grammar.spec
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/FC-5/link-grammar.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- link-grammar.spec	15 Feb 2006 09:41:06 -0000	1.2
+++ link-grammar.spec	10 Apr 2006 17:48:19 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: A Grammar Checking library
 Name: link-grammar
-Version: 4.1.3
-Release: 4%{?dist}
+Version: 4.2.1
+Release: 1%{?dist}
 Group: System Environment/Libraries
 License: BSD-style 
 Source: http://www.abisource.com/downloads/link-grammar/%{version}/link-grammar-%{version}.tar.gz
@@ -55,6 +55,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 4.2.1-1
+- New upstream version
+
 * Wed Feb 15 2006 Marc Maurer <uwog at abisource.com> 4.1.3-4
 - Rebuild for Fedora Extras 5
 - Use %%{?dist} in the release name


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Aug 2005 13:45:41 -0000	1.2
+++ sources	10 Apr 2006 17:48:19 -0000	1.3
@@ -1 +1 @@
-5edbeab4b9e3f61b343e68206708703e  link-grammar-4.1.3.tar.gz
+c4de497b11a2eeaa93ac19f08c710f23  link-grammar-4.2.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 17:50:26 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Mon, 10 Apr 2006 10:50:26 -0700
Subject: rpms/link-grammar/FC-4 .cvsignore, 1.2, 1.3 link-grammar.spec, 1.5, 
	1.6 sources, 1.2, 1.3
Message-ID: <200604101750.k3AHoSiw013766@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/link-grammar/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13745

Modified Files:
	.cvsignore link-grammar.spec sources 
Log Message:
New upstream version




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Aug 2005 13:45:41 -0000	1.2
+++ .cvsignore	10 Apr 2006 17:50:26 -0000	1.3
@@ -1 +1 @@
-link-grammar-4.1.3.tar.gz
+link-grammar-4.2.1.tar.gz


Index: link-grammar.spec
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/FC-4/link-grammar.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- link-grammar.spec	2 Oct 2005 18:12:05 -0000	1.5
+++ link-grammar.spec	10 Apr 2006 17:50:26 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: A Grammar Checking library
 Name: link-grammar
-Version: 4.1.3
-Release: 4%{?dist}
+Version: 4.2.1
+Release: 1%{?dist}
 Group: System Environment/Libraries
 License: BSD-style 
 Source: http://www.abisource.com/downloads/link-grammar/%{version}/link-grammar-%{version}.tar.gz
@@ -55,6 +55,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 4.2.1-1.fc4
+- New upstream version
+
 * Sun Oct 2 2005 Marc Maurer <uwog at abisource.com> - 4.1.3-4.fc4
 - Add slashes to directory paths (cosmetic update)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Aug 2005 13:45:41 -0000	1.2
+++ sources	10 Apr 2006 17:50:26 -0000	1.3
@@ -1 +1 @@
-5edbeab4b9e3f61b343e68206708703e  link-grammar-4.1.3.tar.gz
+c4de497b11a2eeaa93ac19f08c710f23  link-grammar-4.2.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 17:58:09 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Mon, 10 Apr 2006 10:58:09 -0700
Subject: rpms/link-grammar/FC-3 .cvsignore, 1.2, 1.3 link-grammar.spec, 1.2, 
	1.3 sources, 1.2, 1.3
Message-ID: <200604101758.k3AHwBwO013835@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/link-grammar/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13814

Modified Files:
	.cvsignore link-grammar.spec sources 
Log Message:
New upstream version




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Aug 2005 13:45:41 -0000	1.2
+++ .cvsignore	10 Apr 2006 17:58:09 -0000	1.3
@@ -1 +1 @@
-link-grammar-4.1.3.tar.gz
+link-grammar-4.2.1.tar.gz


Index: link-grammar.spec
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/FC-3/link-grammar.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- link-grammar.spec	2 Oct 2005 18:06:52 -0000	1.2
+++ link-grammar.spec	10 Apr 2006 17:58:09 -0000	1.3
@@ -1,6 +1,6 @@
 Summary: A Grammar Checking library
 Name: link-grammar
-Version: 4.1.3
+Version: 4.2.1
 Release: 1%{?dist}
 Group: System Environment/Libraries
 License: BSD-style 
@@ -55,5 +55,8 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 4.2.1-1.fc3
+- New upstream version
+
 * Sun Oct 2 2005 Marc Maurer <uwog at abisource.com> - 4.1.3-1.fc3
 - Initial release for FC3


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Aug 2005 13:45:41 -0000	1.2
+++ sources	10 Apr 2006 17:58:09 -0000	1.3
@@ -1 +1 @@
-5edbeab4b9e3f61b343e68206708703e  link-grammar-4.1.3.tar.gz
+c4de497b11a2eeaa93ac19f08c710f23  link-grammar-4.2.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 18:04:39 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Mon, 10 Apr 2006 11:04:39 -0700
Subject: rpms/docbook2X/FC-4 .cvsignore, 1.2, 1.3 docbook2X.spec, 1.2,
	1.3 sources, 1.2, 1.3 docbook2X-vendor_perl.diff, 1.1, NONE
Message-ID: <200604101804.k3AI4frZ015983@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/docbook2X/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15926/FC-4

Modified Files:
	.cvsignore docbook2X.spec sources 
Removed Files:
	docbook2X-vendor_perl.diff 
Log Message:
* Fri Feb 17 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.8.6-1
- update to 0.8.6
- drop patch as SGMLSpl.pm is included in the scripts, not distributed
- BR perl-XML-SAX (close 188481)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/docbook2X/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Feb 2006 21:00:11 -0000	1.2
+++ .cvsignore	10 Apr 2006 18:04:39 -0000	1.3
@@ -1 +1 @@
-docbook2X-0.8.5.tar.gz
+docbook2X-0.8.6.tar.gz


Index: docbook2X.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook2X/FC-4/docbook2X.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- docbook2X.spec	12 Feb 2006 08:52:30 -0000	1.2
+++ docbook2X.spec	10 Apr 2006 18:04:39 -0000	1.3
@@ -1,18 +1,19 @@
 Name:           docbook2X
-Version:        0.8.5
-Release:        1%{?dist}.1
+Version:        0.8.6
+Release:        1%{?dist}
 Summary:        Convert docbook into man and Texinfo
 
 Group:          Applications/Text
 License:        BSD
 URL:            http://docbook2x.sourceforge.net/
-Source0:        http://heanet.dl.sourceforge.net/sourceforge/docbook2x/docbook2X-%{version}.tar.gz
+Source0:        http://dl.sourceforge.net/sourceforge/docbook2x/docbook2X-%{version}.tar.gz
 
 # modify Makefile.in to replace make install_perl by make install_vendor
-Patch0:         docbook2X-vendor_perl.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxslt openjade
+# required by the perl -c calls during build
+BuildRequires:  perl-XML-SAX
 # rpmlint isn't happy with libxslt, but we need xsltproc
 Requires:       libxslt openjade texinfo
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -26,7 +27,6 @@
 
 %prep
 %setup -q
-%patch
 
 %build
 # to avoid clashing with docbook2* from docbook-utils
@@ -71,9 +71,13 @@
 %{_datadir}/docbook2X/
 %{_mandir}/man1/*
 %{_infodir}/docbook2*
-%{perl_vendorlib}/*
 
 
 %changelog
-* Fri Feb  3 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.8.5-1.1
+* Fri Feb 17 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.8.6-1
+- update to 0.8.6
+- drop patch as SGMLSpl.pm is included in the scripts, not distributed
+- BR perl-XML-SAX (close 188481)
+
+* Fri Feb  3 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.8.5-1
 - FE submission


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/docbook2X/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Feb 2006 21:00:11 -0000	1.2
+++ sources	10 Apr 2006 18:04:39 -0000	1.3
@@ -1 +1 @@
-05d549646ac11caba6c7f1e07ced33e3  docbook2X-0.8.5.tar.gz
+fd5efad56674cfb22ea4831845c3c937  docbook2X-0.8.6.tar.gz


--- docbook2X-vendor_perl.diff DELETED ---



From fedora-extras-commits at redhat.com  Mon Apr 10 18:04:40 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Mon, 10 Apr 2006 11:04:40 -0700
Subject: rpms/docbook2X/FC-5 .cvsignore, 1.2, 1.3 docbook2X.spec, 1.2,
	1.3 sources, 1.2, 1.3 docbook2X-vendor_perl.diff, 1.1, NONE
Message-ID: <200604101804.k3AI4gR2015989@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/docbook2X/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15926/FC-5

Modified Files:
	.cvsignore docbook2X.spec sources 
Removed Files:
	docbook2X-vendor_perl.diff 
Log Message:
* Fri Feb 17 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.8.6-1
- update to 0.8.6
- drop patch as SGMLSpl.pm is included in the scripts, not distributed
- BR perl-XML-SAX (close 188481)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/docbook2X/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Feb 2006 21:00:11 -0000	1.2
+++ .cvsignore	10 Apr 2006 18:04:40 -0000	1.3
@@ -1 +1 @@
-docbook2X-0.8.5.tar.gz
+docbook2X-0.8.6.tar.gz


Index: docbook2X.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook2X/FC-5/docbook2X.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- docbook2X.spec	17 Feb 2006 22:41:35 -0000	1.2
+++ docbook2X.spec	10 Apr 2006 18:04:40 -0000	1.3
@@ -1,18 +1,19 @@
 Name:           docbook2X
-Version:        0.8.5
-Release:        2%{?dist}
+Version:        0.8.6
+Release:        1%{?dist}
 Summary:        Convert docbook into man and Texinfo
 
 Group:          Applications/Text
 License:        BSD
 URL:            http://docbook2x.sourceforge.net/
-Source0:        http://heanet.dl.sourceforge.net/sourceforge/docbook2x/docbook2X-%{version}.tar.gz
+Source0:        http://dl.sourceforge.net/sourceforge/docbook2x/docbook2X-%{version}.tar.gz
 
 # modify Makefile.in to replace make install_perl by make install_vendor
-Patch0:         docbook2X-vendor_perl.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxslt openjade
+# required by the perl -c calls during build
+BuildRequires:  perl-XML-SAX
 # rpmlint isn't happy with libxslt, but we need xsltproc
 Requires:       libxslt openjade texinfo
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -26,7 +27,6 @@
 
 %prep
 %setup -q
-%patch
 
 %build
 # to avoid clashing with docbook2* from docbook-utils
@@ -71,12 +71,13 @@
 %{_datadir}/docbook2X/
 %{_mandir}/man1/*
 %{_infodir}/docbook2*
-%{perl_vendorlib}/*
 
 
 %changelog
-* Fri Feb 17 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.8.5-2
-- rebuild for fc5
+* Fri Feb 17 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.8.6-1
+- update to 0.8.6
+- drop patch as SGMLSpl.pm is included in the scripts, not distributed
+- BR perl-XML-SAX (close 188481)
 
 * Fri Feb  3 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.8.5-1
 - FE submission


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/docbook2X/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Feb 2006 21:00:11 -0000	1.2
+++ sources	10 Apr 2006 18:04:40 -0000	1.3
@@ -1 +1 @@
-05d549646ac11caba6c7f1e07ced33e3  docbook2X-0.8.5.tar.gz
+fd5efad56674cfb22ea4831845c3c937  docbook2X-0.8.6.tar.gz


--- docbook2X-vendor_perl.diff DELETED ---



From fedora-extras-commits at redhat.com  Mon Apr 10 18:04:38 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Mon, 10 Apr 2006 11:04:38 -0700
Subject: rpms/docbook2X/FC-3 .cvsignore, 1.2, 1.3 docbook2X.spec, 1.2,
	1.3 sources, 1.2, 1.3 docbook2X-vendor_perl.diff, 1.1, NONE
Message-ID: <200604101804.k3AI4eHU015979@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/docbook2X/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15926/FC-3

Modified Files:
	.cvsignore docbook2X.spec sources 
Removed Files:
	docbook2X-vendor_perl.diff 
Log Message:
* Fri Feb 17 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.8.6-1
- update to 0.8.6
- drop patch as SGMLSpl.pm is included in the scripts, not distributed
- BR perl-XML-SAX (close 188481)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/docbook2X/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Feb 2006 21:00:11 -0000	1.2
+++ .cvsignore	10 Apr 2006 18:04:38 -0000	1.3
@@ -1 +1 @@
-docbook2X-0.8.5.tar.gz
+docbook2X-0.8.6.tar.gz


Index: docbook2X.spec
===================================================================
RCS file: /cvs/extras/rpms/docbook2X/FC-3/docbook2X.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- docbook2X.spec	17 Feb 2006 22:41:35 -0000	1.2
+++ docbook2X.spec	10 Apr 2006 18:04:38 -0000	1.3
@@ -1,18 +1,19 @@
 Name:           docbook2X
-Version:        0.8.5
-Release:        2%{?dist}
+Version:        0.8.6
+Release:        1%{?dist}
 Summary:        Convert docbook into man and Texinfo
 
 Group:          Applications/Text
 License:        BSD
 URL:            http://docbook2x.sourceforge.net/
-Source0:        http://heanet.dl.sourceforge.net/sourceforge/docbook2x/docbook2X-%{version}.tar.gz
+Source0:        http://dl.sourceforge.net/sourceforge/docbook2x/docbook2X-%{version}.tar.gz
 
 # modify Makefile.in to replace make install_perl by make install_vendor
-Patch0:         docbook2X-vendor_perl.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxslt openjade
+# required by the perl -c calls during build
+BuildRequires:  perl-XML-SAX
 # rpmlint isn't happy with libxslt, but we need xsltproc
 Requires:       libxslt openjade texinfo
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
@@ -26,7 +27,6 @@
 
 %prep
 %setup -q
-%patch
 
 %build
 # to avoid clashing with docbook2* from docbook-utils
@@ -71,12 +71,13 @@
 %{_datadir}/docbook2X/
 %{_mandir}/man1/*
 %{_infodir}/docbook2*
-%{perl_vendorlib}/*
 
 
 %changelog
-* Fri Feb 17 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.8.5-2
-- rebuild for fc5
+* Fri Feb 17 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.8.6-1
+- update to 0.8.6
+- drop patch as SGMLSpl.pm is included in the scripts, not distributed
+- BR perl-XML-SAX (close 188481)
 
 * Fri Feb  3 2006 Patrice Dumas <dumas at centre-cired.fr> - 0.8.5-1
 - FE submission


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/docbook2X/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Feb 2006 21:00:11 -0000	1.2
+++ sources	10 Apr 2006 18:04:38 -0000	1.3
@@ -1 +1 @@
-05d549646ac11caba6c7f1e07ced33e3  docbook2X-0.8.5.tar.gz
+fd5efad56674cfb22ea4831845c3c937  docbook2X-0.8.6.tar.gz


--- docbook2X-vendor_perl.diff DELETED ---



From fedora-extras-commits at redhat.com  Mon Apr 10 18:09:28 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 11:09:28 -0700
Subject: rpms/perl-Test-Tester/devel - New directory
Message-ID: <200604101809.k3AI9UXn016214@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-Tester/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16190/perl-Test-Tester/devel

Log Message:
Directory /cvs/extras/rpms/perl-Test-Tester/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 10 18:09:27 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 11:09:27 -0700
Subject: rpms/perl-Test-Tester - New directory
Message-ID: <200604101809.k3AI9TvF016211@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-Tester
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16190/perl-Test-Tester

Log Message:
Directory /cvs/extras/rpms/perl-Test-Tester added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 10 18:09:44 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 11:09:44 -0700
Subject: rpms/perl-Test-Tester Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604101809.k3AI9kPL016268@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-Tester
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16235

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Test-Tester


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Test-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  Mon Apr 10 18:09:44 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 11:09:44 -0700
Subject: rpms/perl-Test-Tester/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604101809.k3AI9kLo016271@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-Tester/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16235/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Test-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  Mon Apr 10 18:10:06 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 11:10:06 -0700
Subject: rpms/perl-Test-Tester import.log,1.1,1.2
Message-ID: <200604101810.k3AIA8rk016337@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-Tester
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16304a

Modified Files:
	import.log 
Log Message:
auto-import perl-Test-Tester-0.103-1 on branch devel from perl-Test-Tester-0.103-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Tester/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Apr 2006 18:09:44 -0000	1.1
+++ import.log	10 Apr 2006 18:10:06 -0000	1.2
@@ -0,0 +1 @@
+perl-Test-Tester-0_103-1:HEAD:perl-Test-Tester-0.103-1.src.rpm:1144692600



From fedora-extras-commits at redhat.com  Mon Apr 10 18:10:07 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 11:10:07 -0700
Subject: rpms/perl-Test-Tester/devel perl-Test-Tester.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604101810.k3AIA9em016344@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-Tester/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16304a/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Test-Tester.spec 
Log Message:
auto-import perl-Test-Tester-0.103-1 on branch devel from perl-Test-Tester-0.103-1.src.rpm


--- NEW FILE perl-Test-Tester.spec ---
Name:           perl-Test-Tester
Version:        0.103
Release:        1%{?dist}
Summary:        Ease testing test modules built with Test::Builder
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Test-Tester/
Source0:        http://www.cpan.org/authors/id/F/FD/FDALY/Test-Tester-%{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
If you have written a test module based on Test::Builder then Test::Tester
allows you to test it with the minimum of effort.

%prep
%setup -q -n Test-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+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc ARTISTIC CHANGES README TODO
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Apr 08 2006 Steven Pritchard <steve at kspei.com> 0.103-1
- Specfile autogenerated by cpanspec 1.64.
- Fix License.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Tester/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Apr 2006 18:09:44 -0000	1.1
+++ .cvsignore	10 Apr 2006 18:10:07 -0000	1.2
@@ -0,0 +1 @@
+Test-Tester-0.103.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Tester/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Apr 2006 18:09:44 -0000	1.1
+++ sources	10 Apr 2006 18:10:07 -0000	1.2
@@ -0,0 +1 @@
+31d58158d2a6cdb7ad9d9fe3e0aed86e  Test-Tester-0.103.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 18:14:32 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 11:14:32 -0700
Subject: rpms/perl-Test-NoWarnings - New directory
Message-ID: <200604101814.k3AIEYir016461@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-NoWarnings
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16435/perl-Test-NoWarnings

Log Message:
Directory /cvs/extras/rpms/perl-Test-NoWarnings added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 10 18:14:33 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 11:14:33 -0700
Subject: rpms/perl-Test-NoWarnings/devel - New directory
Message-ID: <200604101814.k3AIEZoq016464@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-NoWarnings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16435/perl-Test-NoWarnings/devel

Log Message:
Directory /cvs/extras/rpms/perl-Test-NoWarnings/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 10 18:14:46 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 11:14:46 -0700
Subject: rpms/perl-Test-NoWarnings Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604101814.k3AIEmBZ016514@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-NoWarnings
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16481

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Test-NoWarnings


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Test-NoWarnings
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 10 18:14:46 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 11:14:46 -0700
Subject: rpms/perl-Test-NoWarnings/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604101814.k3AIEmtC016517@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-NoWarnings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16481/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Test-NoWarnings


--- 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 Apr 10 18:15:12 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 11:15:12 -0700
Subject: rpms/perl-Test-NoWarnings import.log,1.1,1.2
Message-ID: <200604101815.k3AIFiYq016583@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-NoWarnings
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16549

Modified Files:
	import.log 
Log Message:
auto-import perl-Test-NoWarnings-0.082-1 on branch devel from perl-Test-NoWarnings-0.082-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-NoWarnings/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Apr 2006 18:14:46 -0000	1.1
+++ import.log	10 Apr 2006 18:15:12 -0000	1.2
@@ -0,0 +1 @@
+perl-Test-NoWarnings-0_082-1:HEAD:perl-Test-NoWarnings-0.082-1.src.rpm:1144692901



From fedora-extras-commits at redhat.com  Mon Apr 10 18:15:13 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 11:15:13 -0700
Subject: rpms/perl-Test-NoWarnings/devel perl-Test-NoWarnings.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604101815.k3AIFjMt016587@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-NoWarnings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16549/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Test-NoWarnings.spec 
Log Message:
auto-import perl-Test-NoWarnings-0.082-1 on branch devel from perl-Test-NoWarnings-0.082-1.src.rpm


--- NEW FILE perl-Test-NoWarnings.spec ---
Name:           perl-Test-NoWarnings
Version:        0.082
Release:        1%{?dist}
Summary:        Make sure you didn't emit any warnings while testing
License:        LGPL
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Test-NoWarnings/
Source0:        http://www.cpan.org/authors/id/F/FD/FDALY/Test-NoWarnings-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Test::Tester) >= 0.103
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
In general, your tests shouldn't produce warnings. This modules causes any
warnings to be captured and stored. It automatically adds an extra test
that will run when your script ends to check that there were no warnings.
If there were any warings, the test will give a "not ok" and diagnostics of
where, when and what the warning was, including a stack trace of what was
going on when the it occurred.

%prep
%setup -q -n Test-NoWarnings-%{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+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES LGPL README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Apr 08 2006 Steven Pritchard <steve at kspei.com> 0.082-1
- Specfile autogenerated by cpanspec 1.64.
- Fix License.
- Drop explicit dependency on perl(Test::Tester).  (Seems to be bogus.)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-NoWarnings/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Apr 2006 18:14:46 -0000	1.1
+++ .cvsignore	10 Apr 2006 18:15:13 -0000	1.2
@@ -0,0 +1 @@
+Test-NoWarnings-0.082.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-NoWarnings/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Apr 2006 18:14:46 -0000	1.1
+++ sources	10 Apr 2006 18:15:13 -0000	1.2
@@ -0,0 +1 @@
+702143eab77ffc335a08beccac47dca4  Test-NoWarnings-0.082.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 18:19:14 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 10 Apr 2006 11:19:14 -0700
Subject: rpms/denyhosts/devel denyhosts-2.4-setup.patch, NONE, 1.1 .cvsignore,
	1.18, 1.19 denyhosts.spec, 1.35, 1.36 sources, 1.18,
	1.19 denyhosts-2.3-setup.patch, 1.1, NONE
Message-ID: <200604101819.k3AIJGY8016669@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/denyhosts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16643

Modified Files:
	.cvsignore denyhosts.spec sources 
Added Files:
	denyhosts-2.4-setup.patch 
Removed Files:
	denyhosts-2.3-setup.patch 
Log Message:
* Mon Apr 10 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.4b-1
- Update to 2.4b.


denyhosts-2.4-setup.patch:

--- NEW FILE denyhosts-2.4-setup.patch ---
--- setup.py.setup	2006-04-04 18:53:02.000000000 -0500
+++ setup.py	2006-04-10 13:15:09.712246771 -0500
@@ -23,14 +23,10 @@
       scripts=['denyhosts.py'],
       package_dir={'DenyHosts': 'DenyHosts'},
       packages=["DenyHosts"],
-      data_files=[(libpath, glob("denyhosts.cfg-dist")),
-                  (libpath, glob("setup.py")),
-                  (libpath, glob("daemon-control-dist")),
-                  (libpath, glob("CHANGELOG.txt")),
-                  (libpath, glob("README.txt")),
+      data_files=[
                   (scriptspath, glob("scripts/*")),
                   (pluginspath, glob("plugins/*")),
-                  (libpath, glob("LICENSE.txt"))],
+                  ],
       license="GPL v2",
       ##extra_path='denyhosts',
       long_description="""


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	5 Apr 2006 04:32:50 -0000	1.18
+++ .cvsignore	10 Apr 2006 18:19:13 -0000	1.19
@@ -1 +1 @@
-DenyHosts-2.3.tar.gz
+DenyHosts-2.4b.tar.gz


Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- denyhosts.spec	6 Apr 2006 15:28:41 -0000	1.35
+++ denyhosts.spec	10 Apr 2006 18:19:13 -0000	1.36
@@ -1,6 +1,6 @@
 Name:           denyhosts
-Version:        2.3
-Release:	2%{?dist}
+Version:        2.4b
+Release:	1%{?dist}
 Summary:        A script to help thwart ssh server attacks
 
 Group:          Applications/System
@@ -14,7 +14,7 @@
 Source5:	denyhosts.logrotate
 Source6:	README.fedora
 Patch0:		denyhosts-2.3-config.patch
-Patch1:		denyhosts-2.3-setup.patch
+Patch1:		denyhosts-2.4-setup.patch
 Patch2:		denyhosts-2.2-daemon-control.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
@@ -150,6 +150,9 @@
 
 
 %changelog
+* Mon Apr 10 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.4b-1
+- Update to 2.4b.
+
 * Thu Apr  6 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.3-2
 - Fix uncommented MacOS X SECURE_LOG config setting.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	5 Apr 2006 04:32:50 -0000	1.18
+++ sources	10 Apr 2006 18:19:13 -0000	1.19
@@ -1 +1 @@
-a175dec03a67aff65c5471105d5a2786  DenyHosts-2.3.tar.gz
+c60df73b29baeadffbbb1ef8f130dd8d  DenyHosts-2.4b.tar.gz


--- denyhosts-2.3-setup.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Apr 10 18:22:23 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 11:22:23 -0700
Subject: rpms/perl-Test-Deep/devel - New directory
Message-ID: <200604101822.k3AIMQRg016787@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-Deep/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16763/perl-Test-Deep/devel

Log Message:
Directory /cvs/extras/rpms/perl-Test-Deep/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 10 18:22:23 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 11:22:23 -0700
Subject: rpms/perl-Test-Deep - New directory
Message-ID: <200604101822.k3AIMPSk016784@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-Deep
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16763/perl-Test-Deep

Log Message:
Directory /cvs/extras/rpms/perl-Test-Deep added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 10 18:22:39 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 11:22:39 -0700
Subject: rpms/perl-Test-Deep Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604101822.k3AIMflP016836@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-Deep
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16808

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Test-Deep


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Test-Deep
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 10 18:22:39 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 11:22:39 -0700
Subject: rpms/perl-Test-Deep/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604101822.k3AIMfPo016839@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-Deep/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16808/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Test-Deep


--- 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 Apr 10 18:23:07 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 11:23:07 -0700
Subject: rpms/perl-Test-Deep import.log,1.1,1.2
Message-ID: <200604101823.k3AIN9mZ016905@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-Deep
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16872

Modified Files:
	import.log 
Log Message:
auto-import perl-Test-Deep-0.093-1 on branch devel from perl-Test-Deep-0.093-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Deep/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Apr 2006 18:22:39 -0000	1.1
+++ import.log	10 Apr 2006 18:23:06 -0000	1.2
@@ -0,0 +1 @@
+perl-Test-Deep-0_093-1:HEAD:perl-Test-Deep-0.093-1.src.rpm:1144693379



From fedora-extras-commits at redhat.com  Mon Apr 10 18:23:07 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 11:23:07 -0700
Subject: rpms/perl-Test-Deep/devel perl-Test-Deep.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604101823.k3AIN9AM016910@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-Deep/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16872/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Test-Deep.spec 
Log Message:
auto-import perl-Test-Deep-0.093-1 on branch devel from perl-Test-Deep-0.093-1.src.rpm


--- NEW FILE perl-Test-Deep.spec ---
Name:           perl-Test-Deep
Version:        0.093
Release:        1%{?dist}
Summary:        Extremely flexible deep comparison
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Test-Deep/
Source0:        http://www.cpan.org/authors/id/F/FD/FDALY/Test-Deep-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Test::NoWarnings) >= 0.02
BuildRequires:  perl(Test::Tester) >= 0.04
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Test::Deep gives you very flexible ways to check that the result you
got is the result you were expecting. At it's simplest it compares two
structures by going through each level, ensuring that the values
match, that arrays and hashes have the same elements and that
references are blessed into the correct class. It also handles
circular data structures without getting caught in an infinite loop.

%prep
%setup -q -n Test-Deep-%{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+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES README TODO
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Apr 08 2006 Steven Pritchard <steve at kspei.com> 0.093-1
- Specfile autogenerated by cpanspec 1.64.
- Improve description.
- Fix License.
- Remove explicit dependency on Test::Tester and Test::NoWarnings.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Deep/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Apr 2006 18:22:39 -0000	1.1
+++ .cvsignore	10 Apr 2006 18:23:07 -0000	1.2
@@ -0,0 +1 @@
+Test-Deep-0.093.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Deep/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Apr 2006 18:22:39 -0000	1.1
+++ sources	10 Apr 2006 18:23:07 -0000	1.2
@@ -0,0 +1 @@
+b47659e09457a72157d3db5b5be62f75  Test-Deep-0.093.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 18:23:19 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 11:23:19 -0700
Subject: owners owners.list,1.826,1.827
Message-ID: <200604101823.k3AINLJQ016961@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16921

Modified Files:
	owners.list 
Log Message:
Add perl-Test-Tester, perl-Test-NoWarnings, and perl-Test-Deep.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.826
retrieving revision 1.827
diff -u -r1.826 -r1.827
--- owners.list	10 Apr 2006 16:43:45 -0000	1.826
+++ owners.list	10 Apr 2006 18:23:19 -0000	1.827
@@ -1067,6 +1067,7 @@
 Fedora Extras|perl-Template-Toolkit|Template processing system|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Builder-Tester|For bugs related to the perl-Test-Builder-Tester component|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-ClassAPI|Provides basic first-pass API testing for large class trees|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Test-Deep|Extremely flexible deep comparison|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Exception|Library of test functions for exception based Perl code|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Inline|Test::Inline Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-LongString|Perl module to test long strings|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1074,9 +1075,11 @@
 Fedora Extras|perl-Test-Memory-Cycle|Check for memory leaks and circular memory references|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-MockModule|Override subroutines in a module for unit testing|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-MockObject|Perl extension for emulating troublesome interfaces|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Test-NoWarnings|Make sure you didn't emit any warnings while testing|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Pod-Coverage|POD documentation coverage checker|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Pod|Perl module for checking for POD errors in files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Taint|Tools to test taintedness|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Test-Tester|Ease testing test modules built with Test::Builder|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Warn|Perl extension to test methods for warnings|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-WWW-Mechanize|Testing-specific WWW::Mechanize subclass|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-TeX-Hyphen|Hyphenate words using TeX's patterns|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Mon Apr 10 19:18:41 2006
From: fedora-extras-commits at redhat.com (Zing Zing Shishak (shishz))
Date: Mon, 10 Apr 2006 12:18:41 -0700
Subject: rpms/mmv/devel mmv.spec,1.5,1.6
Message-ID: <200604101918.k3AJIh3P020035@cvs-int.fedora.redhat.com>

Author: shishz

Update of /cvs/extras/rpms/mmv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20018

Modified Files:
	mmv.spec 
Log Message:
* Mon Apr 10 2006 Zing <shishz at hotpop.com> - 1.01b-7
- ok, now fix busted perms on doc directory



Index: mmv.spec
===================================================================
RCS file: /cvs/extras/rpms/mmv/devel/mmv.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mmv.spec	21 Mar 2006 02:07:55 -0000	1.5
+++ mmv.spec	10 Apr 2006 19:18:41 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		mmv
 Version:	1.01b
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Move/copy/append/link multiple files
 
 Group:          Applications/File
@@ -49,7 +49,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(0644,root,root,-)
+%defattr(0644,root,root,0755)
 %doc copyright changelog
 %defattr(-,root,root,-)
 %doc ANNOUNCE ARTICLE READ.ME
@@ -60,6 +60,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Apr 10 2006 Zing <shishz at hotpop.com> - 1.01b-7
+- ok, now fix busted perms on doc directory
+
 * Mon Mar 20 2006 Zing <shishz at hotpop.com> - 1.01b-6
 - fix permissions on doc files
 



From fedora-extras-commits at redhat.com  Mon Apr 10 19:20:25 2006
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 10 Apr 2006 12:20:25 -0700
Subject: rpms/mercurial/devel .cvsignore, 1.6, 1.7 mercurial.spec, 1.8,
	1.9 sources, 1.6, 1.7
Message-ID: <200604101920.k3AJKRmY020085@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/rpms/mercurial/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20064

Modified Files:
	.cvsignore mercurial.spec sources 
Log Message:
* Mon Apr 10 2006 Jeremy Katz <katzj at redhat.com> - 0.8.1-1
- update to 0.8.1
- add man pages (#188144)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mercurial/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	30 Jan 2006 16:54:55 -0000	1.6
+++ .cvsignore	10 Apr 2006 19:20:25 -0000	1.7
@@ -1 +1 @@
-mercurial-0.8.tar.gz
+mercurial-0.8.1.tar.gz


Index: mercurial.spec
===================================================================
RCS file: /cvs/extras/rpms/mercurial/devel/mercurial.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mercurial.spec	17 Mar 2006 07:02:33 -0000	1.8
+++ mercurial.spec	10 Apr 2006 19:20:25 -0000	1.9
@@ -1,13 +1,13 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
-Version: 0.8
-Release: 3%{?dist}
+Version: 0.8.1
+Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
 Source0: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: python-devel
+BuildRequires: python-devel asciidoc xmlto
 
 %description
 Mercurial is a fast, lightweight source control management system designed 
@@ -19,10 +19,19 @@
 %build
 python ./setup.py build
 
+# not built by default.  kind of lame
+pushd doc ; make man ; popd
+
 %install
 rm -rf $RPM_BUILD_ROOT
 python ./setup.py install -O1 --root=$RPM_BUILD_ROOT --record=%{name}.files
 
+# and we have to install the man pages
+mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 $RPM_BUILD_ROOT/%{_mandir}/man5
+install -m 0644 doc/hg.1 $RPM_BUILD_ROOT/%{_mandir}/man1/hg.1
+install -m 0644 doc/hgmerge.1 $RPM_BUILD_ROOT/%{_mandir}/man1/hgmerge.1
+install -m 0644 doc/hgrc.5 $RPM_BUILD_ROOT/%{_mandir}/man5/hgrc.5
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -31,9 +40,14 @@
 %files -f %{name}.files
 %defattr(-,root,root,-)
 %doc CONTRIBUTORS README doc/hg.1.txt doc/hgmerge.1.txt doc/hgrc.5.txt
+%{_mandir}/man*/*
 
 
 %changelog
+* Mon Apr 10 2006 Jeremy Katz <katzj at redhat.com> - 0.8.1-1
+- update to 0.8.1
+- add man pages (#188144)
+
 * Fri Mar 17 2006 Jeremy Katz <katzj at redhat.com> - 0.8-3
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mercurial/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	30 Jan 2006 16:54:55 -0000	1.6
+++ sources	10 Apr 2006 19:20:25 -0000	1.7
@@ -1 +1 @@
-4d418e96dd232d804799fca3458ba2b6  mercurial-0.8.tar.gz
+ffa37810cf9c48608f5172a622bef2f5  mercurial-0.8.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 19:20:57 2006
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 10 Apr 2006 12:20:57 -0700
Subject: rpms/mercurial/FC-5 mercurial.spec,1.8,1.9 sources,1.6,1.7
Message-ID: <200604101920.k3AJKxEl020192@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/rpms/mercurial/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20173

Modified Files:
	mercurial.spec sources 
Log Message:
* Mon Apr 10 2006 Jeremy Katz <katzj at redhat.com> - 0.8.1-1
- update to 0.8.1
- add man pages (#188144)



Index: mercurial.spec
===================================================================
RCS file: /cvs/extras/rpms/mercurial/FC-5/mercurial.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- mercurial.spec	17 Mar 2006 06:48:05 -0000	1.8
+++ mercurial.spec	10 Apr 2006 19:20:57 -0000	1.9
@@ -1,13 +1,13 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
-Version: 0.8
-Release: 3%{?dist}
+Version: 0.8.1
+Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
 Source0: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: python-devel
+BuildRequires: python-devel asciidoc xmlto
 
 %description
 Mercurial is a fast, lightweight source control management system designed 
@@ -19,10 +19,19 @@
 %build
 python ./setup.py build
 
+# not built by default.  kind of lame
+pushd doc ; make man ; popd
+
 %install
 rm -rf $RPM_BUILD_ROOT
 python ./setup.py install -O1 --root=$RPM_BUILD_ROOT --record=%{name}.files
 
+# and we have to install the man pages
+mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 $RPM_BUILD_ROOT/%{_mandir}/man5
+install -m 0644 doc/hg.1 $RPM_BUILD_ROOT/%{_mandir}/man1/hg.1
+install -m 0644 doc/hgmerge.1 $RPM_BUILD_ROOT/%{_mandir}/man1/hgmerge.1
+install -m 0644 doc/hgrc.5 $RPM_BUILD_ROOT/%{_mandir}/man5/hgrc.5
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -31,9 +40,14 @@
 %files -f %{name}.files
 %defattr(-,root,root,-)
 %doc CONTRIBUTORS README doc/hg.1.txt doc/hgmerge.1.txt doc/hgrc.5.txt
+%{_mandir}/man*/*
 
 
 %changelog
+* Mon Apr 10 2006 Jeremy Katz <katzj at redhat.com> - 0.8.1-1
+- update to 0.8.1
+- add man pages (#188144)
+
 * Fri Mar 17 2006 Jeremy Katz <katzj at redhat.com> - 0.8-3
 - rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mercurial/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	30 Jan 2006 16:54:55 -0000	1.6
+++ sources	10 Apr 2006 19:20:57 -0000	1.7
@@ -1 +1 @@
-4d418e96dd232d804799fca3458ba2b6  mercurial-0.8.tar.gz
+ffa37810cf9c48608f5172a622bef2f5  mercurial-0.8.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 19:21:11 2006
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 10 Apr 2006 12:21:11 -0700
Subject: rpms/mercurial/FC-4 mercurial.spec,1.5,1.6 sources,1.6,1.7
Message-ID: <200604101921.k3AJLD5C020255@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/rpms/mercurial/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20234

Modified Files:
	mercurial.spec sources 
Log Message:
* Mon Apr 10 2006 Jeremy Katz <katzj at redhat.com> - 0.8.1-1
- update to 0.8.1
- add man pages (#188144)



Index: mercurial.spec
===================================================================
RCS file: /cvs/extras/rpms/mercurial/FC-4/mercurial.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mercurial.spec	30 Jan 2006 16:56:30 -0000	1.5
+++ mercurial.spec	10 Apr 2006 19:21:11 -0000	1.6
@@ -1,13 +1,13 @@
 Summary: A fast, lightweight distributed source control management system 
 Name: mercurial
-Version: 0.8
+Version: 0.8.1
 Release: 1%{?dist}
 License: GPL
 Group: Development/Tools
 URL: http://www.selenic.com/mercurial/
 Source0: http://www.selenic.com/mercurial/release/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: python-devel
+BuildRequires: python-devel asciidoc xmlto
 
 %description
 Mercurial is a fast, lightweight source control management system designed 
@@ -19,10 +19,19 @@
 %build
 python ./setup.py build
 
+# not built by default.  kind of lame
+pushd doc ; make man ; popd
+
 %install
 rm -rf $RPM_BUILD_ROOT
 python ./setup.py install -O1 --root=$RPM_BUILD_ROOT --record=%{name}.files
 
+# and we have to install the man pages
+mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 $RPM_BUILD_ROOT/%{_mandir}/man5
+install -m 0644 doc/hg.1 $RPM_BUILD_ROOT/%{_mandir}/man1/hg.1
+install -m 0644 doc/hgmerge.1 $RPM_BUILD_ROOT/%{_mandir}/man1/hgmerge.1
+install -m 0644 doc/hgrc.5 $RPM_BUILD_ROOT/%{_mandir}/man5/hgrc.5
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -31,9 +40,20 @@
 %files -f %{name}.files
 %defattr(-,root,root,-)
 %doc CONTRIBUTORS README doc/hg.1.txt doc/hgmerge.1.txt doc/hgrc.5.txt
+%{_mandir}/man*/*
 
 
 %changelog
+* Mon Apr 10 2006 Jeremy Katz <katzj at redhat.com> - 0.8.1-1
+- update to 0.8.1
+- add man pages (#188144)
+
+* Fri Mar 17 2006 Jeremy Katz <katzj at redhat.com> - 0.8-3
+- rebuild
+
+* Fri Feb 17 2006 Jeremy Katz <katzj at redhat.com> - 0.8-2
+- rebuild
+
 * Mon Jan 30 2006 Jeremy Katz <katzj at redhat.com> - 0.8-1
 - update to 0.8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mercurial/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	30 Jan 2006 16:56:30 -0000	1.6
+++ sources	10 Apr 2006 19:21:11 -0000	1.7
@@ -1 +1 @@
-4d418e96dd232d804799fca3458ba2b6  mercurial-0.8.tar.gz
+ffa37810cf9c48608f5172a622bef2f5  mercurial-0.8.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 19:23:25 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Mon, 10 Apr 2006 12:23:25 -0700
Subject: rpms/conserver - New directory
Message-ID: <200604101923.k3AJNRTV020384@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/conserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20358/conserver

Log Message:
Directory /cvs/extras/rpms/conserver added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 10 19:23:26 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Mon, 10 Apr 2006 12:23:26 -0700
Subject: rpms/conserver/devel - New directory
Message-ID: <200604101923.k3AJNSCO020387@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/conserver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20358/conserver/devel

Log Message:
Directory /cvs/extras/rpms/conserver/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 10 19:23:46 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Mon, 10 Apr 2006 12:23:46 -0700
Subject: rpms/conserver Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604101923.k3AJNmBn020436@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/conserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20403

Added Files:
	Makefile import.log 
Log Message:
Setup of module conserver


--- NEW FILE Makefile ---
# Top level Makefile for module conserver
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 10 19:23:47 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Mon, 10 Apr 2006 12:23:47 -0700
Subject: rpms/conserver/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604101923.k3AJNno5020439@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/conserver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20403/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module conserver


--- 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 Apr 10 19:25:15 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Mon, 10 Apr 2006 12:25:15 -0700
Subject: rpms/conserver/devel conserver-8.1.14-initscript.patch, NONE,
	1.1 conserver-8.1.14-no-exampledir.patch, NONE,
	1.1 conserver.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604101925.k3AJPHhD020524@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/conserver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20480/devel

Modified Files:
	.cvsignore sources 
Added Files:
	conserver-8.1.14-initscript.patch 
	conserver-8.1.14-no-exampledir.patch conserver.spec 
Log Message:
auto-import conserver-8.1.14-1 on branch devel from conserver-8.1.14-1.src.rpm

conserver-8.1.14-initscript.patch:

--- NEW FILE conserver-8.1.14-initscript.patch ---
diff -urN conserver-8.1.14/contrib/redhat-rpm/conserver.init conserver-8.1.14-patched/contrib/redhat-rpm/conserver.init
--- conserver-8.1.14/contrib/redhat-rpm/conserver.init	2003-02-27 20:06:50.000000000 -0600
+++ conserver-8.1.14-patched/contrib/redhat-rpm/conserver.init	2006-04-07 13:52:23.000000000 -0500
@@ -2,7 +2,7 @@
 #
 # conserver -- serial-port console daemon
 #
-# chkconfig: 2345 92 08
+# chkconfig: - 92 08
 # description: conserver is a serial-port console daemon
 # config: /etc/conserver.cf
 #
@@ -19,32 +19,49 @@
 # make sure conserver is installed and executable
 [ -x /usr/sbin/conserver  ] || exit 1
 
+start()
+{
+	echo -n "Starting conserver: "
+	daemon conserver -d
+	RETVAL=$?
+	[ "$RETVAL" = 0 ] && touch /var/lock/subsys/conserver
+	echo
+}
+
+stop()
+{
+	echo -n "Shutting down conserver: "
+	killproc conserver
+	RETVAL=$?
+	[ "$RETVAL" = 0 ] && rm -f /var/lock/subsys/conserver
+	echo
+}
 
 # See how we were called.
 case "$1" in
   start)
-    echo -n "Starting conserver: "
-    daemon conserver -d
-    echo
-    touch /var/lock/subsys/conserver
+    start
     ;;
   stop)
-    echo -n "Shutting down conserver: "
-    killproc conserver
-    echo
-    rm -f /var/lock/subsys/conserver
+    stop
     ;;
   status)
     status conserver
+    RETVAL=$?
     ;;
   restart)
-    echo -n "Restarting conserver: "
+    stop
+    start
+    ;;
+  reload)
+    echo -n "Reloading conserver: "
     killproc conserver -HUP
+    RETVAL=$?
     echo
     ;;
   *)
-    echo "Usage: conserver {start|stop|restart|status}"
-    exit 1
+    echo "Usage: conserver {start|stop|restart|reload|status}"
+    RETVAL=1
 esac
 
-exit 0
+exit $RETVAL

conserver-8.1.14-no-exampledir.patch:

--- NEW FILE conserver-8.1.14-no-exampledir.patch ---
diff -urN conserver-8.1.14/conserver/Makefile.in conserver-8.1.14-patched/conserver/Makefile.in
--- conserver-8.1.14/conserver/Makefile.in	2005-06-06 10:03:06.000000000 -0500
+++ conserver-8.1.14-patched/conserver/Makefile.in	2006-04-07 12:56:44.000000000 -0500
@@ -9,7 +9,6 @@
 datadir = @datadir@
 libdir = @libdir@
 pkglibdir = $(libdir)/conserver
-exampledir = $(datadir)/examples/conserver
 
 ### Installation programs and flags
 INSTALL = @INSTALL@
@@ -63,8 +62,6 @@
 	$(INSTALL_PROGRAM) conserver $(DESTDIR)$(sbindir)
 	$(MKDIR) $(DESTDIR)$(mandir)/man8
 	$(INSTALL) conserver.man $(DESTDIR)$(mandir)/man8/conserver.8
-	$(MKDIR) $(DESTDIR)$(exampledir)
-	$(INSTALL) conserver.rc $(DESTDIR)$(exampledir)
 	$(MKDIR) $(DESTDIR)$(pkglibdir)
 	$(INSTALL) convert $(DESTDIR)$(pkglibdir)/convert
 
diff -urN conserver-8.1.14/conserver.cf/Makefile.in conserver-8.1.14-patched/conserver.cf/Makefile.in
--- conserver-8.1.14/conserver.cf/Makefile.in	2004-02-09 18:32:28.000000000 -0600
+++ conserver-8.1.14-patched/conserver.cf/Makefile.in	2006-04-07 12:57:07.000000000 -0500
@@ -4,7 +4,6 @@
 mandir = @mandir@
 sysconfdir = @sysconfdir@
 datadir = @datadir@
-exampledir = $(datadir)/examples/conserver
 
 ### Installation programs and flags
 INSTALL = @INSTALL@
@@ -26,8 +25,5 @@
 	$(MKDIR) $(DESTDIR)$(mandir)/man5
 	$(INSTALL) conserver.cf.man $(DESTDIR)$(mandir)/man5/conserver.cf.5
 	$(INSTALL) conserver.passwd.man $(DESTDIR)$(mandir)/man5/conserver.passwd.5
-	$(MKDIR) $(DESTDIR)$(exampledir)
-	$(INSTALL) -m 0644 conserver.cf $(DESTDIR)$(exampledir)
-	$(INSTALL) -m 0644 conserver.passwd $(DESTDIR)$(exampledir)
 
 .PHONY: clean distclean install


--- NEW FILE conserver.spec ---
Name:           conserver
Version:        8.1.14
Release:        1%{?dist}
Summary:        Serial console server daemon/client

Group:          System Environment/Daemons
License:        Distributable
URL:            http://www.conserver.com/
Source0:        http://www.conserver.com/%{name}-%{version}.tar.gz
Patch0:        http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-no-exampledir.patch
Patch1:        http://beer.tclug.org/fedora-extras/%{name}/%{name}-%{version}-initscript.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  pam-devel, openssl-devel, tcp_wrappers
Requires(post): /sbin/chkconfig
Requires(preun): /sbin/chkconfig
Requires(preun): /sbin/service

%description
Conserver is an application that allows multiple users to watch a serial 
console at the same time.  It can log the data, allows users to take 
write-access of a console (one at a time), and has a variety of bells 
and whistles to accentuate that basic functionality.

%prep
%setup -q
%patch0 -p1
%patch1 -p1


%build
# we don't want to install the solaris conserver.rc file
f="conserver/Makefile.in"
%{__mv} $f $f.orig
%{__sed} -e 's/^.*conserver\.rc.*$//' < $f.orig > $f

%configure --with-uds \
	--with-libwrap \
	--with-openssl \
	--with-pam

make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

# put commented copies of the sample configure files in the
# system configuration directory
%{__mkdir_p} $RPM_BUILD_ROOT/%{_sysconfdir}
%{__sed} -e 's/^/#/' \
  < conserver.cf/conserver.cf \
  > $RPM_BUILD_ROOT/%{_sysconfdir}/conserver.cf
%{__sed} -e 's/^/#/' \
  < conserver.cf/conserver.passwd \
  > $RPM_BUILD_ROOT/%{_sysconfdir}/conserver.passwd

# install copy of init script
%{__mkdir_p} $RPM_BUILD_ROOT/%{_initrddir}
%{__cp} contrib/redhat-rpm/conserver.init $RPM_BUILD_ROOT/%{_initrddir}/conserver


%clean
rm -rf $RPM_BUILD_ROOT

%post
if [ -x %{_initrddir}/conserver ]; then
  /sbin/chkconfig --add conserver
fi
# make sure /etc/services has a conserver entry
if ! egrep '\<conserver\>' /etc/services > /dev/null 2>&1 ; then
  echo "console		 782/tcp	conserver" >> /etc/services
fi


%preun
if [ "$1" = 0 ]; then
  if [ -x %{_initrddir}/conserver ]; then
    %{_initrddir}/conserver stop > /dev/null 2>&1
    /sbin/chkconfig --del conserver
  fi
fi


%files
%defattr(-,root,root,-)
%doc CHANGES FAQ LICENSE INSTALL README conserver.cf/samples/ conserver.cf/conserver.cf conserver.cf/conserver.passwd
%config(noreplace) %{_sysconfdir}/conserver.*
%{_initrddir}/conserver
%{_bindir}/console
%{_libdir}/conserver
%{_mandir}/man1/console.1.gz
%{_mandir}/man5/conserver.cf.5.gz
%{_mandir}/man5/conserver.passwd.5.gz
%{_mandir}/man8/conserver.8.gz
%{_sbindir}/conserver

%changelog
* Mon Apr 10 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 8.1.14-1
- Figures, two days after my initial Fedora Extras RPM, a new release...

* Fri Apr 07 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 8.1.13-1
- Initial Fedora Extras RPM
- Added patch to disable /usr/share/examples/conserver -- non-standard
- Added patch to correct poorly written initscript
- Cleaned up what goes in /usr/share/doc/conserver-8.1.13/ (sloppy)
- Other .spec cleanups with lots of help from Dennis Gilmore (thanks!)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/conserver/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Apr 2006 19:23:47 -0000	1.1
+++ .cvsignore	10 Apr 2006 19:25:15 -0000	1.2
@@ -0,0 +1 @@
+conserver-8.1.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/conserver/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Apr 2006 19:23:47 -0000	1.1
+++ sources	10 Apr 2006 19:25:15 -0000	1.2
@@ -0,0 +1 @@
+f7825728e5af8992ed4a99fb560a3df8  conserver-8.1.14.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 19:25:14 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Mon, 10 Apr 2006 12:25:14 -0700
Subject: rpms/conserver import.log,1.1,1.2
Message-ID: <200604101925.k3AJPGXH020515@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/conserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20480

Modified Files:
	import.log 
Log Message:
auto-import conserver-8.1.14-1 on branch devel from conserver-8.1.14-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/conserver/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Apr 2006 19:23:46 -0000	1.1
+++ import.log	10 Apr 2006 19:25:14 -0000	1.2
@@ -0,0 +1 @@
+conserver-8_1_14-1:HEAD:conserver-8.1.14-1.src.rpm:1144697077



From fedora-extras-commits at redhat.com  Mon Apr 10 19:28:34 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Mon, 10 Apr 2006 12:28:34 -0700
Subject: owners owners.list,1.827,1.828
Message-ID: <200604101928.k3AJSaLT020596@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20579

Modified Files:
	owners.list 
Log Message:

Adding conserver



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.827
retrieving revision 1.828
diff -u -r1.827 -r1.828
--- owners.list	10 Apr 2006 18:23:19 -0000	1.827
+++ owners.list	10 Apr 2006 19:28:34 -0000	1.828
@@ -146,6 +146,7 @@
 Fedora Extras|cone|CONE mail reader|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|configure-thinkpad|Graphical ThinkPad configuration utility|jcarpenter at condell.org|extras-qa at fedoraproject.org|
 Fedora Extras|conglomerate|Extensible XML Editor|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
+Fedora Extras|conserver|Serial console server daemon/client|jima at auroralinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|contact-lookup-applet|Applet which allows you to search your Evolution address book|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 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|



From fedora-extras-commits at redhat.com  Mon Apr 10 19:30:33 2006
From: fedora-extras-commits at redhat.com (Zing Zing Shishak (shishz))
Date: Mon, 10 Apr 2006 12:30:33 -0700
Subject: rpms/mmv/FC-5 mmv.spec,1.5,1.6
Message-ID: <200604101930.k3AJUZA7020633@cvs-int.fedora.redhat.com>

Author: shishz

Update of /cvs/extras/rpms/mmv/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20616

Modified Files:
	mmv.spec 
Log Message:
* Mon Apr 10 2006 Zing <shishz at hotpop.com> - 1.01b-7
- ok, now fix busted perms on doc directory



Index: mmv.spec
===================================================================
RCS file: /cvs/extras/rpms/mmv/FC-5/mmv.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- mmv.spec	10 Apr 2006 00:21:33 -0000	1.5
+++ mmv.spec	10 Apr 2006 19:30:33 -0000	1.6
@@ -1,6 +1,6 @@
 Name:		mmv
 Version:	1.01b
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Move/copy/append/link multiple files
 
 Group:          Applications/File
@@ -49,7 +49,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(0644,root,root,-)
+%defattr(0644,root,root,0755)
 %doc copyright changelog
 %defattr(-,root,root,-)
 %doc ANNOUNCE ARTICLE READ.ME
@@ -60,6 +60,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Apr 10 2006 Zing <shishz at hotpop.com> - 1.01b-7
+- ok, now fix busted perms on doc directory
+
 * Sun Apr  9 2006 Zing <shishz at hotpop.com> - 1.01b-6
 - fix permissions on doc files
 



From fedora-extras-commits at redhat.com  Mon Apr 10 19:32:05 2006
From: fedora-extras-commits at redhat.com (Zing Zing Shishak (shishz))
Date: Mon, 10 Apr 2006 12:32:05 -0700
Subject: rpms/mmv/FC-4 mmv.spec,1.4,1.5
Message-ID: <200604101932.k3AJW743020690@cvs-int.fedora.redhat.com>

Author: shishz

Update of /cvs/extras/rpms/mmv/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20673

Modified Files:
	mmv.spec 
Log Message:
* Mon Apr 10 2006 Zing <shishz at hotpop.com> - 1.01b-5
- ok, now fix busted perms on doc directory



Index: mmv.spec
===================================================================
RCS file: /cvs/extras/rpms/mmv/FC-4/mmv.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- mmv.spec	10 Apr 2006 00:23:57 -0000	1.4
+++ mmv.spec	10 Apr 2006 19:32:05 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		mmv
 Version:	1.01b
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Move/copy/append/link multiple files
 
 Group:          Applications/File
@@ -49,7 +49,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(0644,root,root,-)
+%defattr(0644,root,root,0755)
 %doc copyright changelog
 %defattr(-,root,root,-)
 %doc ANNOUNCE ARTICLE READ.ME
@@ -60,6 +60,9 @@
 %{_mandir}/man1/*
 
 %changelog
+* Mon Apr 10 2006 Zing <shishz at hotpop.com> - 1.01b-5
+- ok, now fix busted perms on doc directory
+
 * Sun Apr  9 2006 Zing <shishz at hotpop.com> - 1.01b-4
 - fix permissions on doc files
 - sync with debian mmv_1.01b-14



From fedora-extras-commits at redhat.com  Mon Apr 10 19:36:45 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 10 Apr 2006 12:36:45 -0700
Subject: rpms/denyhosts/FC-5 denyhosts-2.4-setup.patch, NONE,
	1.1 denyhosts.spec, 1.29, 1.30 sources, 1.18,
	1.19 denyhosts-2.3-setup.patch, 1.1, NONE
Message-ID: <200604101936.k3AJalTw020946@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/denyhosts/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20924

Modified Files:
	denyhosts.spec sources 
Added Files:
	denyhosts-2.4-setup.patch 
Removed Files:
	denyhosts-2.3-setup.patch 
Log Message:
* Mon Apr 10 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.4b-1
- Update to 2.4b.


denyhosts-2.4-setup.patch:

--- NEW FILE denyhosts-2.4-setup.patch ---
--- setup.py.setup	2006-04-04 18:53:02.000000000 -0500
+++ setup.py	2006-04-10 13:15:09.712246771 -0500
@@ -23,14 +23,10 @@
       scripts=['denyhosts.py'],
       package_dir={'DenyHosts': 'DenyHosts'},
       packages=["DenyHosts"],
-      data_files=[(libpath, glob("denyhosts.cfg-dist")),
-                  (libpath, glob("setup.py")),
-                  (libpath, glob("daemon-control-dist")),
-                  (libpath, glob("CHANGELOG.txt")),
-                  (libpath, glob("README.txt")),
+      data_files=[
                   (scriptspath, glob("scripts/*")),
                   (pluginspath, glob("plugins/*")),
-                  (libpath, glob("LICENSE.txt"))],
+                  ],
       license="GPL v2",
       ##extra_path='denyhosts',
       long_description="""


Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/FC-5/denyhosts.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- denyhosts.spec	6 Apr 2006 15:27:55 -0000	1.29
+++ denyhosts.spec	10 Apr 2006 19:36:45 -0000	1.30
@@ -1,6 +1,6 @@
 Name:           denyhosts
-Version:        2.3
-Release:	2%{?dist}
+Version:        2.4b
+Release:	1%{?dist}
 Summary:        A script to help thwart ssh server attacks
 
 Group:          Applications/System
@@ -14,7 +14,7 @@
 Source5:	denyhosts.logrotate
 Source6:	README.fedora
 Patch0:		denyhosts-2.3-config.patch
-Patch1:		denyhosts-2.3-setup.patch
+Patch1:		denyhosts-2.4-setup.patch
 Patch2:		denyhosts-2.2-daemon-control.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
@@ -150,6 +150,9 @@
 
 
 %changelog
+* Mon Apr 10 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.4b-1
+- Update to 2.4b.
+
 * Thu Apr  6 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.3-2
 - Fix uncommented MacOS X SECURE_LOG config setting.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/FC-5/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	5 Apr 2006 04:50:11 -0000	1.18
+++ sources	10 Apr 2006 19:36:45 -0000	1.19
@@ -1 +1 @@
-a175dec03a67aff65c5471105d5a2786  DenyHosts-2.3.tar.gz
+c60df73b29baeadffbbb1ef8f130dd8d  DenyHosts-2.4b.tar.gz


--- denyhosts-2.3-setup.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Apr 10 19:38:29 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 10 Apr 2006 12:38:29 -0700
Subject: rpms/denyhosts/FC-4 denyhosts-2.4-setup.patch, NONE,
	1.1 denyhosts.spec, 1.12, 1.13 sources, 1.11,
	1.12 denyhosts-2.3-setup.patch, 1.1, NONE
Message-ID: <200604101938.k3AJcVSF021027@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/denyhosts/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21005

Modified Files:
	denyhosts.spec sources 
Added Files:
	denyhosts-2.4-setup.patch 
Removed Files:
	denyhosts-2.3-setup.patch 
Log Message:
* Mon Apr 10 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.4b-1
- Update to 2.4b.


denyhosts-2.4-setup.patch:

--- NEW FILE denyhosts-2.4-setup.patch ---
--- setup.py.setup	2006-04-04 18:53:02.000000000 -0500
+++ setup.py	2006-04-10 13:15:09.712246771 -0500
@@ -23,14 +23,10 @@
       scripts=['denyhosts.py'],
       package_dir={'DenyHosts': 'DenyHosts'},
       packages=["DenyHosts"],
-      data_files=[(libpath, glob("denyhosts.cfg-dist")),
-                  (libpath, glob("setup.py")),
-                  (libpath, glob("daemon-control-dist")),
-                  (libpath, glob("CHANGELOG.txt")),
-                  (libpath, glob("README.txt")),
+      data_files=[
                   (scriptspath, glob("scripts/*")),
                   (pluginspath, glob("plugins/*")),
-                  (libpath, glob("LICENSE.txt"))],
+                  ],
       license="GPL v2",
       ##extra_path='denyhosts',
       long_description="""


Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/FC-4/denyhosts.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- denyhosts.spec	6 Apr 2006 15:29:53 -0000	1.12
+++ denyhosts.spec	10 Apr 2006 19:38:29 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           denyhosts
-Version:        2.3
-Release:	2%{?dist}
+Version:        2.4b
+Release:	1%{?dist}
 Summary:        A script to help thwart ssh server attacks
 
 Group:          Applications/System
@@ -14,7 +14,7 @@
 Source5:	denyhosts.logrotate
 Source6:	README.fedora
 Patch0:		denyhosts-2.3-config.patch
-Patch1:		denyhosts-2.3-setup.patch
+Patch1:		denyhosts-2.4-setup.patch
 Patch2:		denyhosts-2.2-daemon-control.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
@@ -150,6 +150,9 @@
 
 
 %changelog
+* Mon Apr 10 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.4b-1
+- Update to 2.4b.
+
 * Thu Apr  6 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.3-2
 - Fix uncommented MacOS X SECURE_LOG config setting.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/FC-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	5 Apr 2006 04:53:52 -0000	1.11
+++ sources	10 Apr 2006 19:38:29 -0000	1.12
@@ -1 +1 @@
-a175dec03a67aff65c5471105d5a2786  DenyHosts-2.3.tar.gz
+c60df73b29baeadffbbb1ef8f130dd8d  DenyHosts-2.4b.tar.gz


--- denyhosts-2.3-setup.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Apr 10 19:40:20 2006
From: fedora-extras-commits at redhat.com (Jason Tibbitts (tibbs))
Date: Mon, 10 Apr 2006 12:40:20 -0700
Subject: rpms/denyhosts/FC-3 denyhosts-2.4-setup.patch, NONE,
	1.1 denyhosts.spec, 1.12, 1.13 sources, 1.11,
	1.12 denyhosts-2.3-setup.patch, 1.1, NONE
Message-ID: <200604101940.k3AJeMjd021113@cvs-int.fedora.redhat.com>

Author: tibbs

Update of /cvs/extras/rpms/denyhosts/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21091

Modified Files:
	denyhosts.spec sources 
Added Files:
	denyhosts-2.4-setup.patch 
Removed Files:
	denyhosts-2.3-setup.patch 
Log Message:
* Mon Apr 10 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.4b-1
- Update to 2.4b.


denyhosts-2.4-setup.patch:

--- NEW FILE denyhosts-2.4-setup.patch ---
--- setup.py.setup	2006-04-04 18:53:02.000000000 -0500
+++ setup.py	2006-04-10 13:15:09.712246771 -0500
@@ -23,14 +23,10 @@
       scripts=['denyhosts.py'],
       package_dir={'DenyHosts': 'DenyHosts'},
       packages=["DenyHosts"],
-      data_files=[(libpath, glob("denyhosts.cfg-dist")),
-                  (libpath, glob("setup.py")),
-                  (libpath, glob("daemon-control-dist")),
-                  (libpath, glob("CHANGELOG.txt")),
-                  (libpath, glob("README.txt")),
+      data_files=[
                   (scriptspath, glob("scripts/*")),
                   (pluginspath, glob("plugins/*")),
-                  (libpath, glob("LICENSE.txt"))],
+                  ],
       license="GPL v2",
       ##extra_path='denyhosts',
       long_description="""


Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/FC-3/denyhosts.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- denyhosts.spec	6 Apr 2006 15:31:15 -0000	1.12
+++ denyhosts.spec	10 Apr 2006 19:40:20 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           denyhosts
-Version:        2.3
-Release:	2%{?dist}
+Version:        2.4b
+Release:	1%{?dist}
 Summary:        A script to help thwart ssh server attacks
 
 Group:          Applications/System
@@ -14,7 +14,7 @@
 Source5:	denyhosts.logrotate
 Source6:	README.fedora
 Patch0:		denyhosts-2.3-config.patch
-Patch1:		denyhosts-2.3-setup.patch
+Patch1:		denyhosts-2.4-setup.patch
 Patch2:		denyhosts-2.2-daemon-control.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
@@ -150,6 +150,9 @@
 
 
 %changelog
+* Mon Apr 10 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.4b-1
+- Update to 2.4b.
+
 * Thu Apr  6 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.3-2
 - Fix uncommented MacOS X SECURE_LOG config setting.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/FC-3/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	5 Apr 2006 04:55:18 -0000	1.11
+++ sources	10 Apr 2006 19:40:20 -0000	1.12
@@ -1 +1 @@
-a175dec03a67aff65c5471105d5a2786  DenyHosts-2.3.tar.gz
+c60df73b29baeadffbbb1ef8f130dd8d  DenyHosts-2.4b.tar.gz


--- denyhosts-2.3-setup.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Apr 10 20:02:55 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 10 Apr 2006 13:02:55 -0700
Subject: owners owners.list,1.828,1.829
Message-ID: <200604102002.k3AK2vZi023340@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23302

Modified Files:
	owners.list 
Log Message:
Auto-Cc upstream on ccid, pcsc-lite, pcsc-perl and pcsc-tools.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.828
retrieving revision 1.829
diff -u -r1.828 -r1.829
--- owners.list	10 Apr 2006 19:28:34 -0000	1.828
+++ owners.list	10 Apr 2006 20:02:55 -0000	1.829
@@ -108,7 +108,7 @@
 Fedora Extras|c-ares|A library that performs asynchronous DNS operations|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|ccache|Compiler cache|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|CCfits|A C++ interface for cfitsio|spr at astrax.fis.ucm.es|extras-qa at fedoraproject.org|
-Fedora Extras|ccid|Generic USB CCID smart card reader driver|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|ccid|Generic USB CCID smart card reader driver|ville.skytta at iki.fi|extras-qa at fedoraproject.org|ludovic.rousseau at gmail.com
 Fedora Extras|cd-discid|utility to get CDDB discid information|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|cdiff|Diff readability enhancer for color terminals|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|cdlabelgen|Generates frontcards and traycards for inserting in CD jewelcases.|harald at redhat.com|extras-qa at fedoraproject.org|
@@ -827,9 +827,9 @@
 Fedora Extras|paps|Plain Text to PostScript(TM) converter|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|parchive|Parity archive command line client|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|pbzip2|Parallel implementation of the bzip2 block-sorting file compressor|jeff.gilchrist at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|pcsc-lite|PC/SC Lite smart card framework and applications|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|pcsc-perl|Perl interface to the PC/SC smart card library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|pcsc-tools|Tools to be used with smart cards and PC/SC|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|pcsc-lite|PC/SC Lite smart card framework and applications|ville.skytta at iki.fi|extras-qa at fedoraproject.org|ludovic.rousseau at gmail.com
+Fedora Extras|pcsc-perl|Perl interface to the PC/SC smart card library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com,ludovic.rousseau at gmail.com
+Fedora Extras|pcsc-tools|Tools to be used with smart cards and PC/SC|ville.skytta at iki.fi|extras-qa at fedoraproject.org|ludovic.rousseau at gmail.com
 Fedora Extras|pdfjam|Utilities for join, rotate and align PDFs|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 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|



From fedora-extras-commits at redhat.com  Mon Apr 10 20:25:41 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 13:25:41 -0700
Subject: rpms/perl-Test-NoWarnings/FC-5 perl-Test-NoWarnings.spec,1.1,1.2
Message-ID: <200604102025.k3AKPh7t024916@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-NoWarnings/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24869/FC-5

Modified Files:
	perl-Test-NoWarnings.spec 
Log Message:
Fix typo.


Index: perl-Test-NoWarnings.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-NoWarnings/FC-5/perl-Test-NoWarnings.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Test-NoWarnings.spec	10 Apr 2006 18:15:13 -0000	1.1
+++ perl-Test-NoWarnings.spec	10 Apr 2006 20:25:41 -0000	1.2
@@ -12,7 +12,7 @@
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
-In general, your tests shouldn't produce warnings. This modules causes any
+In general, your tests shouldn't produce warnings. This module causes any
 warnings to be captured and stored. It automatically adds an extra test
 that will run when your script ends to check that there were no warnings.
 If there were any warings, the test will give a "not ok" and diagnostics of



From fedora-extras-commits at redhat.com  Mon Apr 10 20:25:42 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 13:25:42 -0700
Subject: rpms/perl-Test-NoWarnings/devel perl-Test-NoWarnings.spec,1.1,1.2
Message-ID: <200604102025.k3AKPiFs024920@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-NoWarnings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24869/devel

Modified Files:
	perl-Test-NoWarnings.spec 
Log Message:
Fix typo.


Index: perl-Test-NoWarnings.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-NoWarnings/devel/perl-Test-NoWarnings.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Test-NoWarnings.spec	10 Apr 2006 18:15:13 -0000	1.1
+++ perl-Test-NoWarnings.spec	10 Apr 2006 20:25:41 -0000	1.2
@@ -12,7 +12,7 @@
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
-In general, your tests shouldn't produce warnings. This modules causes any
+In general, your tests shouldn't produce warnings. This module causes any
 warnings to be captured and stored. It automatically adds an extra test
 that will run when your script ends to check that there were no warnings.
 If there were any warings, the test will give a "not ok" and diagnostics of



From fedora-extras-commits at redhat.com  Mon Apr 10 20:25:40 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Mon, 10 Apr 2006 13:25:40 -0700
Subject: rpms/perl-Test-NoWarnings/FC-4 perl-Test-NoWarnings.spec,1.1,1.2
Message-ID: <200604102025.k3AKPgt6024914@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-NoWarnings/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24869/FC-4

Modified Files:
	perl-Test-NoWarnings.spec 
Log Message:
Fix typo.


Index: perl-Test-NoWarnings.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-NoWarnings/FC-4/perl-Test-NoWarnings.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Test-NoWarnings.spec	10 Apr 2006 18:15:13 -0000	1.1
+++ perl-Test-NoWarnings.spec	10 Apr 2006 20:25:40 -0000	1.2
@@ -12,7 +12,7 @@
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
-In general, your tests shouldn't produce warnings. This modules causes any
+In general, your tests shouldn't produce warnings. This module causes any
 warnings to be captured and stored. It automatically adds an extra test
 that will run when your script ends to check that there were no warnings.
 If there were any warings, the test will give a "not ok" and diagnostics of



From fedora-extras-commits at redhat.com  Mon Apr 10 20:46:06 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Mon, 10 Apr 2006 13:46:06 -0700
Subject: owners owners.list,1.829,1.830
Message-ID: <200604102046.k3AKk8Br025120@cvs-int.fedora.redhat.com>

Author: kengert

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25100

Modified Files:
	owners.list 
Log Message:
Adding seamonkey



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.829
retrieving revision 1.830
diff -u -r1.829 -r1.830
--- owners.list	10 Apr 2006 20:02:55 -0000	1.829
+++ owners.list	10 Apr 2006 20:46:05 -0000	1.830
@@ -1333,6 +1333,7 @@
 Fedora Extras|SDL_net|SDL portable network library|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|SDL_ttf|Simple DirectMedia Layer - Sample TrueType Font Library|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|seahorse|GNOME2 interface for gnupg|skvidal at phy.duke.edu|extras-qa at fedoraproject.org|
+Fedora Extras|seamonkey|Web browser, e-mail, news, IRC client, HTML editor|kengert 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|shapelib|API in "C" for Shapefile handling|mccann0011 at hotmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|shippy|Space invaders / Galaxians like game with powerups|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Apr 10 21:06:03 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Mon, 10 Apr 2006 14:06:03 -0700
Subject: rpms/enchant/FC-5 enchant.spec,1.9,1.10
Message-ID: <200604102106.k3AL651m027280@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/enchant/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27194

Modified Files:
	enchant.spec 
Log Message:
Packages all installed files




Index: enchant.spec
===================================================================
RCS file: /cvs/extras/rpms/enchant/FC-5/enchant.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- enchant.spec	14 Feb 2006 18:05:47 -0000	1.9
+++ enchant.spec	10 Apr 2006 21:06:03 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: An Enchanting Spell Checking Library
 Name: enchant
 Version: 1.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 1
 Group: System Environment/Libraries
 License: LGPL
@@ -44,6 +44,7 @@
 %dir %{_libdir}/enchant
 %{_libdir}/enchant/lib*.so*
 %{_mandir}/man1/enchant.1.gz
+%{_datadir}/enchant
 
 %files devel
 %defattr(-,root,root)
@@ -61,6 +62,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 1:1.2.2-3.fc5
+- Package the data dir as well (bug 188516)
+
 * Tue Feb 14 2006 Marc Maurer <uwog at abisource.com> 1:1.2.2-2.fc5
 - Rebuild for Fedora Extras 5
 



From fedora-extras-commits at redhat.com  Mon Apr 10 21:21:38 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Mon, 10 Apr 2006 14:21:38 -0700
Subject: rpms/enchant/devel enchant.spec,1.9,1.10
Message-ID: <200604102121.k3ALLePo027424@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/enchant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27407

Modified Files:
	enchant.spec 
Log Message:
Bug 188516, new upstream version, hspell support




Index: enchant.spec
===================================================================
RCS file: /cvs/extras/rpms/enchant/devel/enchant.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- enchant.spec	14 Feb 2006 18:05:47 -0000	1.9
+++ enchant.spec	10 Apr 2006 21:21:38 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: An Enchanting Spell Checking Library
 Name: enchant
-Version: 1.2.2
-Release: 2%{?dist}
+Version: 1.2.5
+Release: 1%{?dist}
 Epoch: 1
 Group: System Environment/Libraries
 License: LGPL
@@ -9,6 +9,7 @@
 URL: http://www.abisource.com/
 BuildRequires: glib2-devel >= 2.0.0
 BuildRequires: aspell-devel
+BuildRequires: hspell-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -44,6 +45,7 @@
 %dir %{_libdir}/enchant
 %{_libdir}/enchant/lib*.so*
 %{_mandir}/man1/enchant.1.gz
+%{_datadir}/enchant
 
 %files devel
 %defattr(-,root,root)
@@ -61,6 +63,11 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 1:1.2.5-1.fc6
+- Package the data dir as well (bug 188516)
+- New upstream version
+- Add hspell requirement/support
+
 * Tue Feb 14 2006 Marc Maurer <uwog at abisource.com> 1:1.2.2-2.fc5
 - Rebuild for Fedora Extras 5
 



From fedora-extras-commits at redhat.com  Mon Apr 10 21:23:52 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Mon, 10 Apr 2006 14:23:52 -0700
Subject: rpms/enchant/devel .cvsignore, 1.7, 1.8 enchant.spec, 1.10,
	1.11 sources, 1.7, 1.8
Message-ID: <200604102123.k3ALNswG027493@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/enchant/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27472

Modified Files:
	.cvsignore enchant.spec sources 
Log Message:
rebuild




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/enchant/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	5 Feb 2006 21:32:46 -0000	1.7
+++ .cvsignore	10 Apr 2006 21:23:52 -0000	1.8
@@ -1 +1 @@
-enchant-1.2.2.tar.gz
+enchant-1.2.5.tar.gz


Index: enchant.spec
===================================================================
RCS file: /cvs/extras/rpms/enchant/devel/enchant.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- enchant.spec	10 Apr 2006 21:21:38 -0000	1.10
+++ enchant.spec	10 Apr 2006 21:23:52 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: An Enchanting Spell Checking Library
 Name: enchant
 Version: 1.2.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 Group: System Environment/Libraries
 License: LGPL
@@ -63,6 +63,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 1:1.2.5-2.fc6
+- Rebuild
+
 * Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 1:1.2.5-1.fc6
 - Package the data dir as well (bug 188516)
 - New upstream version


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/enchant/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	5 Feb 2006 21:32:46 -0000	1.7
+++ sources	10 Apr 2006 21:23:52 -0000	1.8
@@ -1 +1 @@
-ee7f8261bc607015633206f710671239  enchant-1.2.2.tar.gz
+e64ec808ed2cb687c242ebb835faeb61  enchant-1.2.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 21:34:56 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Mon, 10 Apr 2006 14:34:56 -0700
Subject: rpms/moodss/devel .cvsignore,1.8,1.9 sources,1.9,1.10
Message-ID: <200604102134.k3ALYw0D027567@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moodss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27543

Modified Files:
	.cvsignore sources 
Log Message:
21.2 upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	7 Mar 2006 02:27:24 -0000	1.8
+++ .cvsignore	10 Apr 2006 21:34:56 -0000	1.9
@@ -1,2 +1,3 @@
 moodss-21.0.tar.bz2
 moodss-21.1.tar.bz2
+moodss-21.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	7 Mar 2006 02:27:24 -0000	1.9
+++ sources	10 Apr 2006 21:34:56 -0000	1.10
@@ -1,2 +1,3 @@
 1366c31bfbda443103dcd7f53e10e3a8  moodss-21.0.tar.bz2
 f4563adcfe077b0c9716f7bf86ac94e0  moodss-21.1.tar.bz2
+8e48defc0f98a1346292d31ab9d226c2  moodss-21.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 10 21:37:06 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Mon, 10 Apr 2006 14:37:06 -0700
Subject: rpms/moomps/devel .cvsignore,1.7,1.8 sources,1.7,1.8
Message-ID: <200604102137.k3ALb8VN027611@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moomps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27592

Modified Files:
	.cvsignore sources 
Log Message:
5.6 upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moomps/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	7 Mar 2006 02:37:09 -0000	1.7
+++ .cvsignore	10 Apr 2006 21:37:06 -0000	1.8
@@ -1,2 +1,3 @@
 moomps-5.4.tar.bz2
 moomps-5.5.tar.bz2
+moomps-5.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moomps/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	7 Mar 2006 02:37:09 -0000	1.7
+++ sources	10 Apr 2006 21:37:06 -0000	1.8
@@ -1,2 +1,3 @@
 37045d89b50a78f5f6f445cc4d897c62  moomps-5.4.tar.bz2
 249a456d2db2dbc5ed95f31d926d063d  moomps-5.5.tar.bz2
+f2cf3e281df6e004889672dc11b1d505  moomps-5.6.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 10 21:38:44 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Mon, 10 Apr 2006 14:38:44 -0700
Subject: rpms/enchant/FC-5 enchant.spec,1.10,1.11
Message-ID: <200604102138.k3ALckEM027639@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/enchant/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27622

Modified Files:
	enchant.spec 
Log Message:
New upstream version / add hspell support




Index: enchant.spec
===================================================================
RCS file: /cvs/extras/rpms/enchant/FC-5/enchant.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- enchant.spec	10 Apr 2006 21:06:03 -0000	1.10
+++ enchant.spec	10 Apr 2006 21:38:44 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: An Enchanting Spell Checking Library
 Name: enchant
-Version: 1.2.2
-Release: 3%{?dist}
+Version: 1.2.5
+Release: 1%{?dist}
 Epoch: 1
 Group: System Environment/Libraries
 License: LGPL
@@ -62,6 +62,10 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 1:1.2.5-1.fc5
+- New upstream version
+- Add hspell requirement/support
+
 * Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 1:1.2.2-3.fc5
 - Package the data dir as well (bug 188516)
 



From fedora-extras-commits at redhat.com  Mon Apr 10 21:39:17 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Mon, 10 Apr 2006 14:39:17 -0700
Subject: rpms/enchant/FC-5 .cvsignore,1.7,1.8 sources,1.7,1.8
Message-ID: <200604102139.k3ALdJC4027671@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/enchant/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27651

Modified Files:
	.cvsignore sources 
Log Message:
New upstream version




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/enchant/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	5 Feb 2006 21:32:46 -0000	1.7
+++ .cvsignore	10 Apr 2006 21:39:17 -0000	1.8
@@ -1 +1 @@
-enchant-1.2.2.tar.gz
+enchant-1.2.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/enchant/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	5 Feb 2006 21:32:46 -0000	1.7
+++ sources	10 Apr 2006 21:39:17 -0000	1.8
@@ -1 +1 @@
-ee7f8261bc607015633206f710671239  enchant-1.2.2.tar.gz
+e64ec808ed2cb687c242ebb835faeb61  enchant-1.2.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 21:40:55 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Mon, 10 Apr 2006 14:40:55 -0700
Subject: rpms/seamonkey - New directory
Message-ID: <200604102140.k3ALevwW027780@cvs-int.fedora.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/seamonkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27754/seamonkey

Log Message:
Directory /cvs/extras/rpms/seamonkey added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 10 21:40:55 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Mon, 10 Apr 2006 14:40:55 -0700
Subject: rpms/seamonkey/devel - New directory
Message-ID: <200604102140.k3ALevDt027783@cvs-int.fedora.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/seamonkey/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27754/seamonkey/devel

Log Message:
Directory /cvs/extras/rpms/seamonkey/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 10 21:41:14 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Mon, 10 Apr 2006 14:41:14 -0700
Subject: rpms/seamonkey Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604102141.k3ALfGPa027832@cvs-int.fedora.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/seamonkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27799

Added Files:
	Makefile import.log 
Log Message:
Setup of module seamonkey


--- NEW FILE Makefile ---
# Top level Makefile for module seamonkey
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 10 21:41:15 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Mon, 10 Apr 2006 14:41:15 -0700
Subject: rpms/seamonkey/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604102141.k3ALfHLO027835@cvs-int.fedora.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/seamonkey/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27799/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module seamonkey


--- 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 Apr 10 21:43:15 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Mon, 10 Apr 2006 14:43:15 -0700
Subject: rpms/enchant/FC-5 enchant.spec,1.11,1.12
Message-ID: <200604102143.k3ALhHdG027959@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/enchant/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27935

Modified Files:
	enchant.spec 
Log Message:
Really add hspell support :X




Index: enchant.spec
===================================================================
RCS file: /cvs/extras/rpms/enchant/FC-5/enchant.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- enchant.spec	10 Apr 2006 21:38:44 -0000	1.11
+++ enchant.spec	10 Apr 2006 21:43:15 -0000	1.12
@@ -1,7 +1,7 @@
 Summary: An Enchanting Spell Checking Library
 Name: enchant
 Version: 1.2.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 Group: System Environment/Libraries
 License: LGPL
@@ -9,6 +9,7 @@
 URL: http://www.abisource.com/
 BuildRequires: glib2-devel >= 2.0.0
 BuildRequires: aspell-devel
+BuildRequires: hspell-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -62,6 +63,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 1:1.2.5-2.fc5
+- Really add hspell support :X
+
 * Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 1:1.2.5-1.fc5
 - New upstream version
 - Add hspell requirement/support



From fedora-extras-commits at redhat.com  Mon Apr 10 21:43:55 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Mon, 10 Apr 2006 14:43:55 -0700
Subject: rpms/moodss/devel moodss.spec,1.21,1.22
Message-ID: <200604102143.k3ALhvLd028051@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moodss/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28017

Modified Files:
	moodss.spec 
Log Message:
21.2 upstream release.



Index: moodss.spec
===================================================================
RCS file: /cvs/extras/rpms/moodss/devel/moodss.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- moodss.spec	7 Mar 2006 02:27:24 -0000	1.21
+++ moodss.spec	10 Apr 2006 21:43:55 -0000	1.22
@@ -1,10 +1,10 @@
 Name: moodss
-Version: 21.1
+Version: 21.2
 Release: 1%{?dist}
 Summary: Powerful modular monitoring graphical application
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moodss-21.1.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moodss-21.2.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
+* Sat Mar 18 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.2-1
+- 21.2 upstream release
+
 * Mon Feb 27 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.1-1
 - 21.1 upstream release
 



From fedora-extras-commits at redhat.com  Mon Apr 10 21:51:17 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Mon, 10 Apr 2006 14:51:17 -0700
Subject: rpms/moodss/FC-5 .cvsignore, 1.8, 1.9 moodss.spec, 1.21,
	1.22 sources, 1.9, 1.10
Message-ID: <200604102151.k3ALpJa6028198@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moodss/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28177

Modified Files:
	.cvsignore moodss.spec sources 
Log Message:
21.2 upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	7 Mar 2006 02:27:24 -0000	1.8
+++ .cvsignore	10 Apr 2006 21:51:17 -0000	1.9
@@ -1,2 +1,3 @@
 moodss-21.0.tar.bz2
 moodss-21.1.tar.bz2
+moodss-21.2.tar.bz2


Index: moodss.spec
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-5/moodss.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- moodss.spec	7 Mar 2006 02:27:24 -0000	1.21
+++ moodss.spec	10 Apr 2006 21:51:17 -0000	1.22
@@ -1,10 +1,10 @@
 Name: moodss
-Version: 21.1
+Version: 21.2
 Release: 1%{?dist}
 Summary: Powerful modular monitoring graphical application
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moodss-21.1.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moodss-21.2.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
+* Sat Mar 18 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.2-1
+- 21.2 upstream release
+
 * Mon Feb 27 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.1-1
 - 21.1 upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	7 Mar 2006 02:27:24 -0000	1.9
+++ sources	10 Apr 2006 21:51:17 -0000	1.10
@@ -1,2 +1,3 @@
 1366c31bfbda443103dcd7f53e10e3a8  moodss-21.0.tar.bz2
 f4563adcfe077b0c9716f7bf86ac94e0  moodss-21.1.tar.bz2
+8e48defc0f98a1346292d31ab9d226c2  moodss-21.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 10 21:53:46 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Mon, 10 Apr 2006 14:53:46 -0700
Subject: rpms/moodss/FC-4 .cvsignore, 1.9, 1.10 moodss.spec, 1.20,
	1.21 sources, 1.9, 1.10
Message-ID: <200604102153.k3ALrmYu028277@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moodss/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28256

Modified Files:
	.cvsignore moodss.spec sources 
Log Message:
21.2 upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-4/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	7 Mar 2006 02:48:25 -0000	1.9
+++ .cvsignore	10 Apr 2006 21:53:46 -0000	1.10
@@ -1,2 +1,3 @@
 moodss-21.0.tar.bz2
 moodss-21.1.tar.bz2
+moodss-21.2.tar.bz2


Index: moodss.spec
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-4/moodss.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- moodss.spec	7 Mar 2006 02:48:25 -0000	1.20
+++ moodss.spec	10 Apr 2006 21:53:46 -0000	1.21
@@ -1,10 +1,10 @@
 Name: moodss
-Version: 21.1
+Version: 21.2
 Release: 1%{?dist}
 Summary: Powerful modular monitoring graphical application
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moodss-21.1.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moodss-21.2.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
 BuildRequires: tcl-devel >= 8.4.8
@@ -57,9 +57,15 @@
 
 
 %changelog
+* Sat Mar 18 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.2-1
+- 21.2 upstream release
+
 * Mon Feb 27 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.1-1
 - 21.1 upstream release
 
+* Wed Feb 15 2006 Jean-Luc Fontaine <jfontain at free.fr> 21.0-2
+- rebuild for Fedora Extras 5
+
 * Fri Nov 11 2005 Jean-Luc Fontaine <jfontain at free.fr> 21.0-1
 - 21.0 upstream release
 - added R dependency


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moodss/FC-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	7 Mar 2006 02:48:25 -0000	1.9
+++ sources	10 Apr 2006 21:53:46 -0000	1.10
@@ -1,2 +1,3 @@
 1366c31bfbda443103dcd7f53e10e3a8  moodss-21.0.tar.bz2
 f4563adcfe077b0c9716f7bf86ac94e0  moodss-21.1.tar.bz2
+8e48defc0f98a1346292d31ab9d226c2  moodss-21.2.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 10 21:58:25 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Mon, 10 Apr 2006 14:58:25 -0700
Subject: rpms/seamonkey import.log,1.1,1.2
Message-ID: <200604102158.k3ALwRs0028396@cvs-int.fedora.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/seamonkey
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28333

Modified Files:
	import.log 
Log Message:
auto-import seamonkey-1.0-9 on branch devel from seamonkey-1.0-9.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	10 Apr 2006 21:41:14 -0000	1.1
+++ import.log	10 Apr 2006 21:58:25 -0000	1.2
@@ -0,0 +1 @@
+seamonkey-1_0-9:HEAD:seamonkey-1.0-9.src.rpm:1144706280



From fedora-extras-commits at redhat.com  Mon Apr 10 21:58:25 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Mon, 10 Apr 2006 14:58:25 -0700
Subject: rpms/seamonkey/devel find-external-requires, NONE,
	1.1 firefox-0.7.3-default-plugin-less-annoying.patch, NONE,
	1.1 firefox-0.7.3-psfonts.patch, NONE,
	1.1 firefox-1.0-prdtoa.patch, NONE,
	1.1 firefox-1.1-nss-system-nspr.patch, NONE,
	1.1 firefox-1.1-uriloader.patch, NONE,
	1.1 firefox-1.5-with-system-nss.patch, NONE,
	1.1 firefox-1.5.0.1-dumpstack.patch, NONE,
	1.1 mozilla-1.4.1-ppc64.patch, NONE,
	1.1 mozilla-1.7.3-gnome-vfs-default-app.patch, NONE,
	1.1 mozilla-1.7.5-g-application-name.patch, NONE,
	1.1 mozilla-nspr-packages.patch, NONE,
	1.1 mozilla-psm-exclude-list, NONE,
	1.1 mozilla-xpcom-exclude-list, NONE, 1.1 pango-cairo.patch,
	NONE, 1.1 seamonkey-cairo-bug5136.patch, NONE,
	1.1 seamonkey-configure.patch, NONE,
	1.1 seamonkey-disable-visibility.patch, NONE,
	1.1 seamonkey-fedora-default-bookmarks.html, NONE,
	1.1 seamonkey-fedora-default-prefs.js, NONE,
	1.1 seamonkey-fedora-home-page.patch, NONE,
	1.1 seamonkey-icon.png, NONE, 1.1 seamonkey-mail-icon.png, NONE,
	1.1 seamonkey-mail.desktop, NONE, 1.1 seamonkey-make-package.pl,
	NONE, 1.1 seamonkey-mozconfig, NONE, 1.1 seamonkey.desktop, NONE,
	1.1 seamonkey.sh.in, NONE, 1.1 seamonkey.spec, NONE,
	1.1 thunderbird-0.7.3-gnome-uriloader.patch, NONE,
	1.1 thunderbird-1.5-bug304720.patch, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604102158.k3ALwSoh028437@cvs-int.fedora.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/seamonkey/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28333/devel

Modified Files:
	.cvsignore sources 
Added Files:
	find-external-requires 
	firefox-0.7.3-default-plugin-less-annoying.patch 
	firefox-0.7.3-psfonts.patch firefox-1.0-prdtoa.patch 
	firefox-1.1-nss-system-nspr.patch firefox-1.1-uriloader.patch 
	firefox-1.5-with-system-nss.patch 
	firefox-1.5.0.1-dumpstack.patch mozilla-1.4.1-ppc64.patch 
	mozilla-1.7.3-gnome-vfs-default-app.patch 
	mozilla-1.7.5-g-application-name.patch 
	mozilla-nspr-packages.patch mozilla-psm-exclude-list 
	mozilla-xpcom-exclude-list pango-cairo.patch 
	seamonkey-cairo-bug5136.patch seamonkey-configure.patch 
	seamonkey-disable-visibility.patch 
	seamonkey-fedora-default-bookmarks.html 
	seamonkey-fedora-default-prefs.js 
	seamonkey-fedora-home-page.patch seamonkey-icon.png 
	seamonkey-mail-icon.png seamonkey-mail.desktop 
	seamonkey-make-package.pl seamonkey-mozconfig 
	seamonkey.desktop seamonkey.sh.in seamonkey.spec 
	thunderbird-0.7.3-gnome-uriloader.patch 
	thunderbird-1.5-bug304720.patch 
Log Message:
auto-import seamonkey-1.0-9 on branch devel from seamonkey-1.0-9.src.rpm


--- NEW FILE find-external-requires ---
#!/bin/sh

# Finds requirements provided outside of the current file set

filelist=`sed "s/[]['\"*?{}]/\\\\\&/g"`

provides=`echo $filelist | /usr/lib/rpm/find-provides`

{
for f in $filelist ; do
	echo $f | /usr/lib/rpm/find-requires | while read req ; do
		found=0
		for p in $provides ; do
			if [ "$req" = "$p" ]; then
				found=1
			fi
		done
		if [ "$found" = "0" ]; then
			echo $req
		fi
	done
done
} | sort -u
firefox-0.7.3-default-plugin-less-annoying.patch:

--- NEW FILE firefox-0.7.3-default-plugin-less-annoying.patch ---
--- mozilla/modules/plugin/samples/default/unix/npshell.c.foo	Tue May  7 14:18:45 2002
+++ mozilla/modules/plugin/samples/default/unix/npshell.c	Tue May  7 14:49:55 2002
@@ -224,7 +224,7 @@
       This->depth = ws_info->depth;
       This->colormap = ws_info->colormap;
       makePixmap(This);
-      makeWidget(This);
+      /* makeWidget(This); */
     }
     return NPERR_NO_ERROR;
 }
--- mozilla/modules/plugin/samples/default/unix/nullplugin.c.foo	Tue May  7 14:18:45 2002
+++ mozilla/modules/plugin/samples/default/unix/nullplugin.c	Tue May  7 14:48:33 2002
@@ -70,6 +70,8 @@
 
     gtk_object_remove_data(GTK_OBJECT(button), DIALOGID);
 
+#if 0
+
     if (This->pluginsFileUrl != NULL)
     {
         /* Get the JavaScript command string */
@@ -110,6 +112,7 @@
             NPN_MemFree(url);
         }
     }
+#endif
     destroyWidget(This);
 }
 
@@ -265,14 +268,14 @@
                    GTK_DIALOG(dialogWindow)->action_area);
     gtk_object_set_data(GTK_OBJECT(okButton), DIALOGID, dialogWindow);
 
-    cancelButton= AddWidget(gtk_button_new_with_label (CANCEL_BUTTON), 
-                   GTK_DIALOG(dialogWindow)->action_area);
+    /*    cancelButton= AddWidget(gtk_button_new_with_label (CANCEL_BUTTON), 
+          GTK_DIALOG(dialogWindow)->action_area); */
 
     gtk_signal_connect (GTK_OBJECT(okButton),  "clicked",
                         GTK_SIGNAL_FUNC(DialogOKClicked), This);
 
-    gtk_signal_connect (GTK_OBJECT(cancelButton),  "clicked",
-                        GTK_SIGNAL_FUNC(DialogCancelClicked), This);
+    /*    gtk_signal_connect (GTK_OBJECT(cancelButton),  "clicked",
+          GTK_SIGNAL_FUNC(DialogCancelClicked), This); */
 
     /* hookup to when the dialog is destroyed */
     gtk_signal_connect(GTK_OBJECT(dialogWindow), "destroy",
--- mozilla/modules/plugin/samples/default/unix/nullplugin.h.foo	Tue May  7 14:46:48 2002
+++ mozilla/modules/plugin/samples/default/unix/nullplugin.h	Tue May  7 14:47:08 2002
@@ -53,9 +53,7 @@
 #define JVM_MINETYPE        "application/x-java-vm"
 #define MESSAGE "\
 This page contains information of a type (%s) that can\n\
-only be viewed with the appropriate Plug-in.\n\
-\n\
-Click OK to download Plugin."
+only be viewed with the appropriate Plug-in."
 
 #define GET 1
 #define REFRESH 2

firefox-0.7.3-psfonts.patch:

--- NEW FILE firefox-0.7.3-psfonts.patch ---
--- mozilla/modules/libpref/src/init/all.js.foo	2004-06-18 13:16:32.000000000 -0400
+++ mozilla/modules/libpref/src/init/all.js	2004-06-18 13:17:28.000000000 -0400
@@ -1776,8 +1776,10 @@
 pref("print.postscript.nativefont.ar",             "");
 pref("print.postscript.nativefont.el",             "");
 pref("print.postscript.nativefont.he",             "");
-pref("print.postscript.nativefont.ja",             "");
-pref("print.postscript.nativefont.ko",             "");
+pref("print.postscript.nativecode.ja",             "euc-jp");
+pref("print.postscript.nativefont.ja",             "Ryumin-Light-EUC-H");
+pref("print.postscript.nativecode.ko",             "euc-kr");
+pref("print.postscript.nativefont.ko",             "Baekmuk-Gulim-KSC-EUC-H");
 pref("print.postscript.nativefont.th",             "");
 pref("print.postscript.nativefont.tr",             "");
 pref("print.postscript.nativefont.x-baltic",       "");
@@ -1786,8 +1788,10 @@
 pref("print.postscript.nativefont.x-unicode",      "");
 pref("print.postscript.nativefont.x-user-def",     "");
 pref("print.postscript.nativefont.x-western",      "");
-pref("print.postscript.nativefont.zh-CN",          "");
-pref("print.postscript.nativefont.zh-TW",          "");
+pref("print.postscript.nativecode.zh-CN", "gb18030");
+pref("print.postscript.nativefont.zh-CN", "MSungGBK-Light-GBK2K-H");
+pref("print.postscript.nativecode.zh-TW", "big5");
+pref("print.postscript.nativefont.zh-TW", "ShanHeiSun-Light-B5-H");
 pref("print.postscript.nativefont.zh-HK",          "");
 
 # XP_UNIX

firefox-1.0-prdtoa.patch:

--- NEW FILE firefox-1.0-prdtoa.patch ---
Index: nsprpub/pr/src/misc/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/nsprpub/pr/src/misc/Makefile.in,v
retrieving revision 1.15.2.2
diff -u -r1.15.2.2 Makefile.in
--- nsprpub/pr/src/misc/Makefile.in	6 Jun 2003 03:09:17 -0000	1.15.2.2
+++ nsprpub/pr/src/misc/Makefile.in	19 Nov 2004 00:58:35 -0000
@@ -82,6 +82,15 @@
 
 include $(topsrcdir)/config/rules.mk
 
+ifneq (,$(filter Linuxs390 Linuxs390x,$(OS_ARCH)$(OS_TEST)))
+
+NONOPT_CFLAGS=$(filter-out -O%, $(CFLAGS))
+
+$(OBJDIR)/prdtoa.$(OBJ_SUFFIX): prdtoa.c
+	@$(MAKE_OBJDIR)
+	$(CC) -o $@ -c $(NONOPT_CFLAGS) -ffloat-store $<
+endif
+
 # Prevent floating point errors caused by MSVC 6.0 Processor Pack
 # optimizations (bug 207421).  This disables optimizations that
 # could change the precision of floating-point calculations for

firefox-1.1-nss-system-nspr.patch:

--- NEW FILE firefox-1.1-nss-system-nspr.patch ---
Index: mozilla/security/coreconf/location.mk
===================================================================
RCS file: /cvsroot/mozilla/security/coreconf/location.mk,v
retrieving revision 1.9
diff -u -r1.9 location.mk
--- mozilla/security/coreconf/location.mk	25 Apr 2004 15:02:17 -0000	1.9
+++ mozilla/security/coreconf/location.mk	11 Apr 2005 20:21:57 -0000
@@ -61,6 +61,8 @@
 
 DIST          = $(SOURCE_PREFIX)/$(PLATFORM)
 
+NSPR_LIBDIR   = $(DIST)/lib
+
 ifdef BUILD_DEBUG_GC
     DEFINES += -DDEBUG_GC
 endif
Index: mozilla/security/manager/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/security/manager/Makefile.in,v
retrieving revision 1.56
diff -u -r1.56 Makefile.in
--- mozilla/security/manager/Makefile.in	14 Mar 2005 10:00:58 -0000	1.56
+++ mozilla/security/manager/Makefile.in	11 Apr 2005 20:21:57 -0000
@@ -76,12 +76,23 @@
 endif
 endif
 
+ABS_DIST := $(shell cd $(DIST) && pwd)
+ifeq ($(OS_ARCH),WINNT)
+ABS_DIST := $(shell cygpath -w $(ABS_DIST) | sed -e 's|\\\\|/|g')
+endif
+NSPR_LIBDIR = $(firstword $(filter -L%,$(NSPR_LIBS)))
+ifneq (,$(strip $(NSPR_LIBDIR)))
+NSPR_LIBDIR := $(subst -L,,$(subst -L$(DIST),-L$(ABS_DIST),$(NSPR_LIBDIR)))
+else
+NSPR_LIBDIR = $(ABS_DIST)/lib
+endif
 # NSS makefiles are not safe for parallel execution.
 DEFAULT_GMAKE_FLAGS = MAKE="$(MAKE) -j1" -j1
 DEFAULT_GMAKE_FLAGS += CC="$(CC)"
-DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="-I$(MOZ_BUILD_ROOT)/dist/include/nspr -I$(MOZ_BUILD_ROOT)/dist/include/dbm"
-DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(MOZ_BUILD_ROOT)/dist
-DEFAULT_GMAKE_FLAGS += DIST=$(MOZ_BUILD_ROOT)/dist
+DEFAULT_GMAKE_FLAGS += MOZILLA_INCLUDES="$(subst -I$(DIST),-I$(ABS_DIST),$(NSPR_CFLAGS) -I$(DIST)/include/dbm)"
+DEFAULT_GMAKE_FLAGS += SOURCE_MD_DIR=$(ABS_DIST)
+DEFAULT_GMAKE_FLAGS += DIST=$(ABS_DIST)
+DEFAULT_GMAKE_FLAGS += NSPR_LIBDIR=$(NSPR_LIBDIR)
 DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1
 DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1
 ABS_topsrcdir   := $(shell cd $(topsrcdir); pwd)
Index: mozilla/security/nss/lib/ckfw/builtins/Makefile
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/ckfw/builtins/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- mozilla/security/nss/lib/ckfw/builtins/Makefile	20 Jan 2005 02:25:46 -0000	1.14
+++ mozilla/security/nss/lib/ckfw/builtins/Makefile	11 Apr 2005 20:21:57 -0000
@@ -53,23 +53,23 @@
 # This is merely an expedient hack and not the right solution.
 ifdef NS_USE_GCC
 EXTRA_LIBS += \
-	-L$(DIST)/lib \
+	-L$(NSPR_LIBDIR) \
 	-lplc4 \
 	-lplds4 \
 	-lnspr4 \
 	$(NULL)
 else
 EXTRA_LIBS += \
-	$(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4_s.lib \
-	$(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4_s.lib \
+	$(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plc4_s.lib \
+	$(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plds4_s.lib \
 	$(NULL)
 endif
 
 else
 
 EXTRA_LIBS += \
-	$(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
-	$(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
+	$(NSPR_LIBDIR)/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
+	$(NSPR_LIBDIR)/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
 	$(NULL)
 
 endif
Index: mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile
===================================================================
RCS file: /cvsroot/mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile	25 Apr 2004 15:03:08 -0000	1.18
+++ mozilla/security/nss/lib/fortcrypt/swfort/pkcs11/Makefile	11 Apr 2005 20:21:57 -0000
@@ -63,7 +63,7 @@
 	$(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
 	$(CRYPTO_LIB) \
 	$(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \
-	-L$(DIST)/lib \
+	-L$(NSPR_LIBDIR) \
 	-lplc4 \
 	-lplds4 \
 	-lnspr4 \
@@ -76,8 +76,8 @@
 	$(DIST)/lib/softokn.lib \
 	$(CRYPTO_LIB) \
 	$(DIST)/lib/secutil.lib \
-	$(DIST)/lib/$(NSPR31_LIB_PREFIX)plc4_s.lib \
-	$(DIST)/lib/$(NSPR31_LIB_PREFIX)plds4_s.lib \
+	$(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plc4_s.lib \
+	$(NSPR_LIBDIR)/$(NSPR31_LIB_PREFIX)plds4_s.lib \
 	wsock32.lib \
 	winmm.lib \
 	$(NULL)
@@ -98,8 +98,8 @@
 	$(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
 	$(CRYPTO_LIB) \
 	$(DIST)/lib/$(LIB_PREFIX)secutil.$(LIB_SUFFIX) \
-	$(DIST)/lib/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
-	$(DIST)/lib/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
+	$(NSPR_LIBDIR)/$(LIB_PREFIX)plc4.$(LIB_SUFFIX) \
+	$(NSPR_LIBDIR)/$(LIB_PREFIX)plds4.$(LIB_SUFFIX) \
 	$(NULL)
 
 endif

firefox-1.1-uriloader.patch:

--- NEW FILE firefox-1.1-uriloader.patch ---
Index: uriloader/exthandler/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/uriloader/exthandler/Makefile.in,v
retrieving revision 1.60
diff -d -u -p -r1.60 Makefile.in
--- uriloader/exthandler/Makefile.in	2 May 2005 16:30:03 -0000	1.60
+++ uriloader/exthandler/Makefile.in	21 Jul 2005 03:07:39 -0000
@@ -102,7 +102,7 @@ endif
 LOCAL_INCLUDES = -I$(srcdir)
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-OSHELPER	+= nsGNOMERegistry.cpp
+OSHELPER	+= nsMIMEInfoUnix.cpp nsGNOMERegistry.cpp
 endif
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
Index: uriloader/exthandler/unix/nsGNOMERegistry.cpp
===================================================================
RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsGNOMERegistry.cpp,v
retrieving revision 1.10
diff -d -u -p -r1.10 nsGNOMERegistry.cpp
--- uriloader/exthandler/unix/nsGNOMERegistry.cpp	16 Oct 2004 13:46:17 -0000	1.10
+++ uriloader/exthandler/unix/nsGNOMERegistry.cpp	21 Jul 2005 03:07:40 -0000
@@ -42,7 +42,7 @@
 #include "nsString.h"
 #include "nsIComponentManager.h"
 #include "nsILocalFile.h"
-#include "nsMIMEInfoImpl.h"
+#include "nsMIMEInfoUnix.h"
 #include "nsAutoPtr.h"
 
 #include <glib.h>
@@ -56,12 +56,12 @@ typedef struct _GConfClient GConfClient;
 typedef struct _GnomeProgram GnomeProgram;
 typedef struct _GnomeModuleInfo GnomeModuleInfo;
 
-typedef struct {
+struct GnomeVFSMimeApplication {
   char *id;
   char *name;
   char *command;
   /* there is more here, but we don't need it */
-} GnomeVFSMimeApplication;
+};
 
 typedef GConfClient * (*_gconf_client_get_default_fn)();
 typedef gchar * (*_gconf_client_get_string_fn)(GConfClient *,
@@ -264,7 +264,7 @@ nsGNOMERegistry::GetAppDescForScheme(con
 }
 
 
-/* static */ already_AddRefed<nsMIMEInfoBase>
+/* static */ already_AddRefed<nsMIMEInfoUnix>
 nsGNOMERegistry::GetFromExtension(const char *aFileExt)
 {
   if (!gconfLib)
@@ -286,7 +286,7 @@ nsGNOMERegistry::GetFromExtension(const 
   return GetFromType(mimeType);
 }
 
-/* static */ already_AddRefed<nsMIMEInfoBase>
+/* static */ already_AddRefed<nsMIMEInfoUnix>
 nsGNOMERegistry::GetFromType(const char *aMIMEType)
 {
   if (!gconfLib)
@@ -296,9 +296,11 @@ nsGNOMERegistry::GetFromType(const char 
   if (!handlerApp)
     return nsnull;
 
-  nsRefPtr<nsMIMEInfoImpl> mimeInfo = new nsMIMEInfoImpl(aMIMEType);
+  nsRefPtr<nsMIMEInfoUnix> mimeInfo = new nsMIMEInfoUnix(aMIMEType);
   NS_ENSURE_TRUE(mimeInfo, nsnull);
 
+  mimeInfo->SetDefaultGnomeVFSMimeApplication(handlerApp);
+
   // Get the list of extensions and append then to the mimeInfo.
   GList *extensions = _gnome_vfs_mime_get_extensions_list(aMIMEType);
   for (GList *extension = extensions; extension; extension = extension->next)
@@ -320,11 +322,21 @@ nsGNOMERegistry::GetFromType(const char 
     return nsnull;
   }
 
-  gchar *commandPath = g_find_program_in_path(nativeCommand);
+  gchar **argv;
+  gboolean res = g_shell_parse_argv(nativeCommand, NULL, &argv, NULL);
+  if (!res) {
+    NS_ERROR("Could not convert helper app command to filesystem encoding");
+    _gnome_vfs_mime_application_free(handlerApp);
+    return nsnull;
+  }
+
+  gchar *commandPath = g_find_program_in_path(argv[0]);
 
   g_free(nativeCommand);
+  g_strfreev(argv);
 
   if (!commandPath) {
+    NS_WARNING("could not find command in path");
     _gnome_vfs_mime_application_free(handlerApp);
     return nsnull;
   }
@@ -342,7 +354,7 @@ nsGNOMERegistry::GetFromType(const char 
 
   _gnome_vfs_mime_application_free(handlerApp);
 
-  nsMIMEInfoBase* retval;
+  nsMIMEInfoUnix* retval;
   NS_ADDREF((retval = mimeInfo));
   return retval;
 }
Index: uriloader/exthandler/unix/nsGNOMERegistry.h
===================================================================
RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsGNOMERegistry.h,v
retrieving revision 1.3
diff -d -u -p -r1.3 nsGNOMERegistry.h
--- uriloader/exthandler/unix/nsGNOMERegistry.h	16 Oct 2004 13:46:17 -0000	1.3
+++ uriloader/exthandler/unix/nsGNOMERegistry.h	21 Jul 2005 03:07:40 -0000
@@ -35,10 +35,13 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
+#ifndef nsGNOMERegistry_h__
+#define nsGNOMERegistry_h__
+
 #include "nsIURI.h"
 #include "nsCOMPtr.h"
 
-class nsMIMEInfoBase;
+class nsMIMEInfoUnix;
 
 class nsGNOMERegistry
 {
@@ -52,7 +55,9 @@ class nsGNOMERegistry
   static void GetAppDescForScheme(const nsACString& aScheme,
                                   nsAString& aDesc);
 
-  static already_AddRefed<nsMIMEInfoBase> GetFromExtension(const char *aFileExt);
+  static already_AddRefed<nsMIMEInfoUnix> GetFromExtension(const char *aFileExt);
 
-  static already_AddRefed<nsMIMEInfoBase> GetFromType(const char *aMIMEType);
+  static already_AddRefed<nsMIMEInfoUnix> GetFromType(const char *aMIMEType);
 };
+
+#endif // nsGNOMERegistry_h__
Index: uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
===================================================================
RCS file: uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
diff -N uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ uriloader/exthandler/unix/nsMIMEInfoUnix.cpp	21 Jul 2005 03:07:40 -0000
@@ -0,0 +1,196 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org Code.
+ *
+ * The Initial Developer of the Original Code is
+ * Red Hat, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2005
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Christopher Aillon <caillon at redhat.com> (Original author)
+ *
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#include "nsMIMEInfoUnix.h"
+#include "prlink.h"
+#include "prmem.h"
+#include <glib.h>
+#include <glib-object.h>
+
+static PRLibrary *gnomeLib;
+static PRLibrary *vfsLib;
+
+typedef struct _GnomeProgram GnomeProgram;
+typedef struct _GnomeModuleInfo GnomeModuleInfo;
+
+typedef enum {
+  GNOME_VFS_OK // there's more but we don't care about them.
+} GnomeVFSResult;
+
+typedef GnomeVFSResult (*_gnome_vfs_mime_application_launch_fn)
+                              (GnomeVFSMimeApplication *app,
+                               GList *uris);
+typedef void (*_gnome_vfs_mime_application_free_fn)(GnomeVFSMimeApplication *);
+typedef GnomeVFSMimeApplication * (*_gnome_vfs_mime_application_copy_fn)(GnomeVFSMimeApplication *);
+typedef GnomeProgram * (*_gnome_program_init_fn)(const char *, const char *,
+						 const GnomeModuleInfo *, int,
+						 char **, const char *, ...);
+typedef const char * (*_gnome_vfs_mime_application_get_name_fn)(GnomeVFSMimeApplication *);
+typedef const GnomeModuleInfo * (*_libgnome_module_info_get_fn)();
+typedef GnomeProgram * (*_gnome_program_get_fn)();
+typedef char * (*_gnome_vfs_make_uri_from_input_fn)(const char *);
+
+#define DECL_FUNC_PTR(func) static _##func##_fn _##func
+
+DECL_FUNC_PTR(gnome_vfs_mime_application_launch);
+DECL_FUNC_PTR(gnome_vfs_mime_application_free);
+DECL_FUNC_PTR(gnome_vfs_mime_application_copy);
+DECL_FUNC_PTR(gnome_vfs_mime_application_get_name);
+DECL_FUNC_PTR(gnome_program_init);
+DECL_FUNC_PTR(gnome_program_get);
+DECL_FUNC_PTR(libgnome_module_info_get);
+DECL_FUNC_PTR(gnome_vfs_make_uri_from_input);
+
+static PRLibrary *
+LoadVersionedLibrary(const char* libName, const char* libVersion)
+{
+  char *platformLibName = PR_GetLibraryName(nsnull, libName);
+  nsCAutoString versionLibName(platformLibName);
+  versionLibName.Append(libVersion);
+  PR_Free(platformLibName);
+  return PR_LoadLibrary(versionLibName.get());
+}
+
+static void
+Cleanup()
+{
+  // Unload all libraries
+  if (gnomeLib)
+    PR_UnloadLibrary(gnomeLib);
+  if (vfsLib)
+    PR_UnloadLibrary(vfsLib);
+
+  gnomeLib = vfsLib = nsnull;
+}
+
+static void
+InitGnomeVFS()
+{
+  static PRBool initialized = PR_FALSE;
+
+  if (initialized)
+    return;
+
+  #define ENSURE_LIB(lib) \
+    PR_BEGIN_MACRO \
+    if (!lib) { \
+      Cleanup(); \
+      return; \
+    } \
+    PR_END_MACRO
+
+  #define GET_LIB_FUNCTION(lib, func, failure) \
+    PR_BEGIN_MACRO \
+    _##func = (_##func##_fn) PR_FindFunctionSymbol(lib##Lib, #func); \
+    if (!_##func) { \
+      failure; \
+    } \
+    PR_END_MACRO
+
+  // Attempt to open libgnome
+  gnomeLib = LoadVersionedLibrary("gnome-2", ".0");
+  ENSURE_LIB(gnomeLib);
+
+  GET_LIB_FUNCTION(gnome, gnome_program_init, return Cleanup());
+  GET_LIB_FUNCTION(gnome, libgnome_module_info_get, return Cleanup());
+  GET_LIB_FUNCTION(gnome, gnome_program_get, return Cleanup());
+
+  // Attempt to open libgnomevfs
+  vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0");
+  ENSURE_LIB(vfsLib);
+
+  GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_launch, /* do nothing */);
+  GET_LIB_FUNCTION(vfs, gnome_vfs_make_uri_from_input, return Cleanup());
+  GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_get_name, return Cleanup());
+  GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_free, return Cleanup());
+  GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_copy, return Cleanup());
+
+  // Initialize GNOME, if it's not already initialized.  It's not
+  // necessary to tell GNOME about our actual command line arguments.
+
+  if (!_gnome_program_get()) {
+    char *argv[1] = { "gecko" };
+    _gnome_program_init("Gecko", "1.0", _libgnome_module_info_get(),
+                        1, argv, NULL);
+  }
+
+  // Note: after GNOME has been initialized, do not ever unload these
+  // libraries.  They register atexit handlers, so if they are unloaded, we'll
+  // crash on exit.  
+}
+
+void
+nsMIMEInfoUnix::SetDefaultGnomeVFSMimeApplication(GnomeVFSMimeApplication* app)
+{
+  if (_gnome_vfs_mime_application_copy && _gnome_vfs_mime_application_free) {
+    mDefaultVFSApplication = _gnome_vfs_mime_application_copy(app);
+
+    mPreferredAction = nsIMIMEInfo::useSystemDefault;
+
+    const gchar * name = _gnome_vfs_mime_application_get_name(mDefaultVFSApplication);
+    if (name) 
+      mDefaultAppDescription = NS_ConvertUTF8toUCS2(name);
+  }
+}
+
+nsMIMEInfoUnix::~nsMIMEInfoUnix()
+{
+  if (mDefaultVFSApplication)
+    _gnome_vfs_mime_application_free(mDefaultVFSApplication);
+}
+
+nsresult
+nsMIMEInfoUnix::LaunchDefaultWithFile(nsIFile* aFile)
+{
+  NS_ENSURE_ARG_POINTER(aFile);
+
+  InitGnomeVFS();
+
+  if (_gnome_vfs_mime_application_launch && mDefaultVFSApplication) {
+    nsCAutoString nativePath;
+    aFile->GetNativePath(nativePath);
+
+    gchar *uri = _gnome_vfs_make_uri_from_input(nativePath.get());
+
+    GList *uris = NULL;
+    uris = g_list_append(uris, uri);
+
+    GnomeVFSResult result = _gnome_vfs_mime_application_launch(mDefaultVFSApplication, uris);
+
+    g_free(uri);
+    g_list_free(uris);
+
+    if (result != GNOME_VFS_OK)
+      return NS_ERROR_FAILURE;
+
+    return NS_OK;
+  }
+
+  if (!mDefaultApplication)
+    return NS_ERROR_FILE_NOT_FOUND;
+
+  return LaunchWithIProcess(mDefaultApplication, aFile);
+}
Index: uriloader/exthandler/unix/nsMIMEInfoUnix.h
===================================================================
RCS file: uriloader/exthandler/unix/nsMIMEInfoUnix.h
diff -N uriloader/exthandler/unix/nsMIMEInfoUnix.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ uriloader/exthandler/unix/nsMIMEInfoUnix.h	21 Jul 2005 03:07:40 -0000
@@ -0,0 +1,50 @@
+/* ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is mozilla.org Code.
+ *
+ * The Initial Developer of the Original Code is
+ * Red Hat, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2005
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *   Christopher Aillon <caillon at redhat.com> (Original author)
+ *
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+#ifndef nsMimeInfoUnix_h__
+#define nsMimeInfoUnix_h__
+
+#include "nsMIMEInfoImpl.h"
+
+struct GnomeVFSMimeApplication;
+
+class nsMIMEInfoUnix : public nsMIMEInfoImpl
+{
+public:
+  nsMIMEInfoUnix(const char* aType = "") : nsMIMEInfoImpl(aType), mDefaultVFSApplication(nsnull) {}
+  nsMIMEInfoUnix(const nsACString& aMIMEType) : nsMIMEInfoImpl(aMIMEType) {};
+
+  virtual ~nsMIMEInfoUnix();
+
+  void SetDefaultGnomeVFSMimeApplication(GnomeVFSMimeApplication *app);
+
+protected:
+  virtual NS_HIDDEN_(nsresult) LaunchDefaultWithFile(nsIFile* aFile);
+
+  GnomeVFSMimeApplication *mDefaultVFSApplication;
+};
+ 
+#endif // nsMimeInfoUnix_h__
Index: uriloader/exthandler/unix/nsOSHelperAppService.cpp
===================================================================
RCS file: /cvsroot/mozilla/uriloader/exthandler/unix/nsOSHelperAppService.cpp,v
retrieving revision 1.58
diff -d -u -p -r1.58 nsOSHelperAppService.cpp
--- uriloader/exthandler/unix/nsOSHelperAppService.cpp	25 Oct 2004 07:46:01 -0000	1.58
+++ uriloader/exthandler/unix/nsOSHelperAppService.cpp	21 Jul 2005 03:07:40 -0000
@@ -44,6 +44,7 @@
 #include "nsOSHelperAppService.h"
 #ifdef MOZ_WIDGET_GTK2
 #include "nsGNOMERegistry.h"
+#include "nsMIMEInfoUnix.h"
 #endif
 #include "nsISupports.h"
 #include "nsString.h"
@@ -1486,6 +1487,17 @@ nsOSHelperAppService::GetFromType(const 
   
   LOG(("Here we do a mimetype lookup for '%s'\n", aMIMEType.get()));
 
+#ifdef MOZ_WIDGET_GTK2
+  // Look in GNOME registry first since it is the preferred method in GNOME,
+  // should trump the mailcap entry
+  LOG(("Looking in GNOME registry\n"));
+  nsMIMEInfoBase *gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType.get()).get();
+  if (gnomeInfo) {
+    LOG(("Got MIMEInfo from GNOME registry\n"));
+    return gnomeInfo;
+  }
+#endif
+
   // extract the major and minor types
   NS_ConvertASCIItoUTF16 mimeType(aMIMEType);
   nsAString::const_iterator start_iter, end_iter,
@@ -1522,21 +1534,6 @@ nsOSHelperAppService::GetFromType(const 
                                 mozillaFlags,
                                 PR_TRUE);
 
-  
-  if (handler.IsEmpty() && extensions.IsEmpty() &&
-      mailcap_description.IsEmpty() && mime_types_description.IsEmpty()) {
-    // No useful data yet
-    
-#ifdef MOZ_WIDGET_GTK2
-    LOG(("Looking in GNOME registry\n"));
-    nsMIMEInfoBase *gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType.get()).get();
-    if (gnomeInfo) {
-      LOG(("Got MIMEInfo from GNOME registry\n"));
-      return gnomeInfo;
-    }
-#endif
-  }
-
   if (handler.IsEmpty() && mailcap_description.IsEmpty()) {
     DoLookUpHandlerAndDescription(majorType,
                                   minorType,

firefox-1.5-with-system-nss.patch:

--- NEW FILE firefox-1.5-with-system-nss.patch ---
Index: mozilla/configure.in
===================================================================
RCS file: /cvsroot/mozilla/configure.in,v
retrieving revision 1.1503.2.15
diff -u -r1.1503.2.15 configure.in
--- mozilla/configure.in	4 Oct 2005 05:53:49 -0000	1.1503.2.15
+++ mozilla/configure.in	15 Dec 2005 05:40:40 -0000
@@ -86,6 +86,7 @@
 MOZPNG=10207
 MOZZLIB=1.2.3
 NSPR_VERSION=4
+NSS_VERSION=3
 
 dnl Set the minimum version of toolkit libs used by mozilla
 dnl ========================================================
@@ -3472,6 +3473,19 @@
     fi
 fi
 
+dnl ========================================================
+dnl = If NSS was not detected in the system, 
+dnl = use the one in the source tree (mozilla/security/nss)
+dnl ========================================================
+
+MOZ_ARG_WITH_BOOL(system-nss,
+[  --with-system-nss      Use system installed NSS],
+    _USE_SYSTEM_NSS=1 )
+
+if test -n "$_USE_SYSTEM_NSS"; then
+    AM_PATH_NSS(3.0.0, [MOZ_NATIVE_NSS=1], [MOZ_NATIVE_NSS=])
+fi
+
 if test -z "$SKIP_LIBRARY_CHECKS"; then
 dnl system JPEG support
 dnl ========================================================
@@ -6698,6 +6712,10 @@
 AC_SUBST(NSPR_LIBS)
 AC_SUBST(MOZ_NATIVE_NSPR)
 
+AC_SUBST(NSS_CFLAGS)
+AC_SUBST(NSS_LIBS)
+AC_SUBST(MOZ_NATIVE_NSS)
+
 AC_SUBST(CFLAGS)
 AC_SUBST(CXXFLAGS)
 AC_SUBST(CPPFLAGS)
Index: mozilla/configure
===================================================================
RCS file: /cvsroot/mozilla/configure,v
retrieving revision 1.1492.2.17
diff -u -r1.1492.2.17 configure
--- mozilla/configure	4 Oct 2005 06:01:48 -0000	1.1492.2.17
+++ mozilla/configure	15 Dec 2005 05:40:53 -0000
@@ -44,6 +44,13 @@
   --with-nspr-exec-prefix=PFX
                           Exec prefix where NSPR is installed"
 ac_help="$ac_help
+  --with-system-nss      Use system installed NSS"
+ac_help="$ac_help
+  --with-nss-prefix=PFX  Prefix where NSS is installed"
+ac_help="$ac_help
+  --with-nss-exec-prefix=PFX
+                          Exec prefix where NSS is installed"
+ac_help="$ac_help
   --with-system-jpeg[=PFX]
                           Use system libjpeg [installed at prefix PFX]"
 ac_help="$ac_help
@@ -1020,6 +1027,7 @@
 MOZPNG=10207
 MOZZLIB=1.2.3
 NSPR_VERSION=4
+NSS_VERSION=3
 
 GLIB_VERSION=1.2.0
 GTK_VERSION=1.2.0
@@ -11300,6 +11308,123 @@
     fi
 fi
 
+
+# Check whether --with-system-nss or --without-system-nss was given.
+if test "${with_system_nss+set}" = set; then
+  withval="$with_system_nss"
+  if test "$withval" = "yes"; then
+    _USE_SYSTEM_NSS=1 
+  elif test "$withval" = "no"; then
+    :
+  else
+    { echo "configure: error: Option, system-nss, does not take an argument ($withval)." 1>&2; exit 1; }
+  fi
+fi
+
+
+if test -n "$_USE_SYSTEM_NSS"; then
+    
+# Check whether --with-nss-prefix or --without-nss-prefix was given.
+if test "${with_nss_prefix+set}" = set; then
+  withval="$with_nss_prefix"
+  nss_config_prefix="$withval"
+else
+  nss_config_prefix=""
+fi
+
+
+# Check whether --with-nss-exec-prefix or --without-nss-exec-prefix was given.
+if test "${with_nss_exec_prefix+set}" = set; then
+  withval="$with_nss_exec_prefix"
+  nss_config_exec_prefix="$withval"
+else
+  nss_config_exec_prefix=""
+fi
+
+
+	if test -n "$nss_config_exec_prefix"; then
+		nss_config_args="$nss_config_args --exec-prefix=$nss_config_exec_prefix"
+		if test -z "$NSS_CONFIG"; then
+			NSS_CONFIG=$nss_config_exec_prefix/bin/nss-config
+		fi
+	fi
+	if test -n "$nss_config_prefix"; then
+		nss_config_args="$nss_config_args --prefix=$nss_config_prefix"
+		if test -z "$NSS_CONFIG"; then
+			NSS_CONFIG=$nss_config_prefix/bin/nss-config
+		fi
+	fi
+
+	unset ac_cv_path_NSS_CONFIG
+	# Extract the first word of "nss-config", so it can be a program name with args.
+set dummy nss-config; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:11363: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_NSS_CONFIG'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  case "$NSS_CONFIG" in
+  /*)
+  ac_cv_path_NSS_CONFIG="$NSS_CONFIG" # Let the user override the test with a path.
+  ;;
+  ?:/*)			 
+  ac_cv_path_NSS_CONFIG="$NSS_CONFIG" # Let the user override the test with a dos path.
+  ;;
+  *)
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do 
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_path_NSS_CONFIG="$ac_dir/$ac_word"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+  test -z "$ac_cv_path_NSS_CONFIG" && ac_cv_path_NSS_CONFIG="no"
+  ;;
+esac
+fi
+NSS_CONFIG="$ac_cv_path_NSS_CONFIG"
+if test -n "$NSS_CONFIG"; then
+  echo "$ac_t""$NSS_CONFIG" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+	min_nss_version=3.0.0
+	echo $ac_n "checking for NSS - version >= $min_nss_version (skipping)""... $ac_c" 1>&6
+echo "configure:11398: checking for NSS - version >= $min_nss_version (skipping)" >&5
+
+	no_nss=""
+	if test "$NSS_CONFIG" = "no"; then
+		no_nss="yes"
+	else
+		NSS_CFLAGS=`$NSS_CONFIG $nss_config_args --cflags`
+		NSS_LIBS=`$NSS_CONFIG $nss_config_args --libs`
+
+				nss_config_major_version=`$NSS_CONFIG $nss_config_args --version | \
+			sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
+		nss_config_minor_version=`$NSS_CONFIG $nss_config_args --version | \
+			sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
+		nss_config_micro_version=`$NSS_CONFIG $nss_config_args --version | \
+			sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
+	fi
+
+	if test -z "$no_nss"; then
+		echo "$ac_t""yes" 1>&6
+		MOZ_NATIVE_NSS=1     
+	else
+		echo "$ac_t""no" 1>&6
+	fi
+
+
+	
+	
+
+
+fi
+
 if test -z "$SKIP_LIBRARY_CHECKS"; then
 # Check whether --with-system-jpeg or --without-system-jpeg was given.
 if test "${with_system_jpeg+set}" = set; then
@@ -19473,6 +19602,9 @@
 s%@NSPR_CONFIG@%$NSPR_CONFIG%g
 s%@NSPR_CFLAGS@%$NSPR_CFLAGS%g
 s%@NSPR_LIBS@%$NSPR_LIBS%g
+s%@NSS_CONFIG@%$NSS_CONFIG%g
+s%@NSS_CFLAGS@%$NSS_CFLAGS%g
+s%@NSS_LIBS@%$NSS_LIBS%g
 s%@GTK_CONFIG@%$GTK_CONFIG%g
 s%@GTK_CFLAGS@%$GTK_CFLAGS%g
 s%@GTK_LIBS@%$GTK_LIBS%g
@@ -19753,6 +19885,7 @@
 s%@MOZ_PNG_CFLAGS@%$MOZ_PNG_CFLAGS%g
 s%@MOZ_PNG_LIBS@%$MOZ_PNG_LIBS%g
 s%@MOZ_NATIVE_NSPR@%$MOZ_NATIVE_NSPR%g
+s%@MOZ_NATIVE_NSS@%$MOZ_NATIVE_NSS%g
 s%@COMPILE_CFLAGS@%$COMPILE_CFLAGS%g
 s%@COMPILE_CXXFLAGS@%$COMPILE_CXXFLAGS%g
 s%@CROSS_COMPILE@%$CROSS_COMPILE%g
Index: mozilla/aclocal.m4
===================================================================
RCS file: /cvsroot/mozilla/aclocal.m4,v
retrieving revision 1.14
diff -u -r1.14 aclocal.m4
--- mozilla/aclocal.m4	13 May 2004 03:12:47 -0000	1.14
+++ mozilla/aclocal.m4	15 Dec 2005 05:40:53 -0000
@@ -8,6 +8,7 @@
 builtin(include, build/autoconf/libIDL.m4)dnl
 builtin(include, build/autoconf/libIDL-2.m4)dnl
 builtin(include, build/autoconf/nspr.m4)dnl
+builtin(include, build/autoconf/nss.m4)dnl
 builtin(include, build/autoconf/libart.m4)dnl
 builtin(include, build/autoconf/pkg.m4)dnl
 builtin(include, build/autoconf/freetype2.m4)dnl
Index: mozilla/config/autoconf.mk.in
===================================================================
RCS file: /cvsroot/mozilla/config/autoconf.mk.in,v
retrieving revision 3.363.2.1
diff -u -r3.363.2.1 autoconf.mk.in
--- mozilla/config/autoconf.mk.in	17 Aug 2005 17:17:17 -0000	3.363.2.1
+++ mozilla/config/autoconf.mk.in	15 Dec 2005 05:40:53 -0000
@@ -229,6 +229,7 @@
 MOZ_INSURE_EXCLUDE_DIRS = @MOZ_INSURE_EXCLUDE_DIRS@
 
 MOZ_NATIVE_NSPR = @MOZ_NATIVE_NSPR@
+MOZ_NATIVE_NSS = @MOZ_NATIVE_NSS@
 
 CROSS_COMPILE   = @CROSS_COMPILE@
 
@@ -384,6 +385,48 @@
 NSPR_CFLAGS	= @NSPR_CFLAGS@
 NSPR_LIBS	= @NSPR_LIBS@
 
+NSS_CONFIG	= @NSS_CONFIG@
+NSS_CFLAGS	= @NSS_CFLAGS@
+NSS_LIBS	= @NSS_LIBS@
+
+ifdef MOZ_NATIVE_NSS
+NSS_DEP_LIBS	= \
+	$(NULL)
+NSS_LIBS += \
+	-lcrmf \
+	$(NULL)
+else
+NSS_DEP_LIBS	= \
+	$(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \
+	$(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \
+	$(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \
+	$(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \
+	$(NULL)
+NSS_LIBS = \
+	$(LIBS_DIR) \
+	$(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
+	-lsmime3 \
+	-lssl3 \
+	-lnss3 \
+	-lsoftokn3 \
+	$(NULL)
+endif
+
+ifneq (,$(filter OS2 WINNT WINCE, $(OS_ARCH)))
+ifndef GNU_CC
+ifndef MOZ_NATIVE_NSS
+NSS_LIBS	= \
+	$(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)smime3.$(IMPORT_LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)ssl3.$(IMPORT_LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)nss3.$(IMPORT_LIB_SUFFIX) \
+	$(DIST)/lib/$(LIB_PREFIX)softokn3.$(IMPORT_LIB_SUFFIX) \
+	$(NULL)
+endif
+endif
+endif
+
 LDAP_CFLAGS	= @LDAP_CFLAGS@
 LDAP_LIBS	= @LDAP_LIBS@
 XPCOM_GLUE_LDOPTS = @XPCOM_GLUE_LDOPTS@
Index: mozilla/config/config.mk
===================================================================
RCS file: /cvsroot/mozilla/config/config.mk,v
retrieving revision 3.337
diff -u -r3.337 config.mk
--- mozilla/config/config.mk	28 Jul 2005 19:48:11 -0000	3.337
+++ mozilla/config/config.mk	15 Dec 2005 05:40:54 -0000
@@ -138,39 +138,6 @@
 FINAL_LINK_COMPS = $(DEPTH)/config/final-link-comps
 FINAL_LINK_COMP_NAMES = $(DEPTH)/config/final-link-comp-names
 
-# 
-# NSS libs needed for final link in static build
-# 
-
-NSS_LIBS	= \
-	$(LIBS_DIR) \
-	$(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
-	-lsmime3 \
-	-lssl3 \
-	-lnss3 \
-	-lsoftokn3 \
-	$(NULL)
-
-ifneq (,$(filter OS2 WINNT WINCE, $(OS_ARCH)))
-ifndef GNU_CC
-NSS_LIBS	= \
-	$(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
-	$(DIST)/lib/$(LIB_PREFIX)smime3.$(IMPORT_LIB_SUFFIX) \
-	$(DIST)/lib/$(LIB_PREFIX)ssl3.$(IMPORT_LIB_SUFFIX) \
-	$(DIST)/lib/$(LIB_PREFIX)nss3.$(IMPORT_LIB_SUFFIX) \
-	$(DIST)/lib/$(LIB_PREFIX)softokn3.$(IMPORT_LIB_SUFFIX) \
-	$(NULL)
-endif
-endif
-
-NSS_DEP_LIBS	= \
-	$(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
-	$(DIST)/lib/$(DLL_PREFIX)smime3$(DLL_SUFFIX) \
-	$(DIST)/lib/$(DLL_PREFIX)ssl3$(DLL_SUFFIX) \
-	$(DIST)/lib/$(DLL_PREFIX)nss3$(DLL_SUFFIX) \
-	$(DIST)/lib/$(DLL_PREFIX)softokn3$(DLL_SUFFIX) \
-	$(NULL)
-
 MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX)
 MOZ_REGISTRY_LIBS          = $(DIST)/lib/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX)
 MOZ_WIDGET_SUPPORT_LIBS    = $(DIST)/lib/$(LIB_PREFIX)widgetsupport_s.$(LIB_SUFFIX)
Index: mozilla/build/autoconf/nss.m4
===================================================================
RCS file: mozilla/build/autoconf/nss.m4
diff -N mozilla/build/autoconf/nss.m4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ mozilla/build/autoconf/nss.m4	15 Dec 2005 05:40:54 -0000
@@ -0,0 +1,67 @@
+# -*- tab-width: 4; -*-
+# Configure paths for NSS
+# Public domain - Chris Seawood <cls at seawood.org> 2001-04-05
+# Based upon gtk.m4 (also PD) by Owen Taylor
+
+dnl AM_PATH_NSS([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
+dnl Test for NSS, and define NSS_CFLAGS and NSS_LIBS
+AC_DEFUN(AM_PATH_NSS,
+[dnl
+
+AC_ARG_WITH(nss-prefix,
+	[  --with-nss-prefix=PFX  Prefix where NSS is installed],
+	nss_config_prefix="$withval",
+	nss_config_prefix="")
+
+AC_ARG_WITH(nss-exec-prefix,
+	[  --with-nss-exec-prefix=PFX
+                          Exec prefix where NSS is installed],
+	nss_config_exec_prefix="$withval",
+	nss_config_exec_prefix="")
+
+	if test -n "$nss_config_exec_prefix"; then
+		nss_config_args="$nss_config_args --exec-prefix=$nss_config_exec_prefix"
+		if test -z "$NSS_CONFIG"; then
+			NSS_CONFIG=$nss_config_exec_prefix/bin/nss-config
+		fi
+	fi
+	if test -n "$nss_config_prefix"; then
+		nss_config_args="$nss_config_args --prefix=$nss_config_prefix"
+		if test -z "$NSS_CONFIG"; then
+			NSS_CONFIG=$nss_config_prefix/bin/nss-config
+		fi
+	fi
+
+	unset ac_cv_path_NSS_CONFIG
+	AC_PATH_PROG(NSS_CONFIG, nss-config, no)
+	min_nss_version=ifelse([$1], ,3.0.0,$1)
+	AC_MSG_CHECKING(for NSS - version >= $min_nss_version (skipping))
+
+	no_nss=""
+	if test "$NSS_CONFIG" = "no"; then
+		no_nss="yes"
+	else
+		NSS_CFLAGS=`$NSS_CONFIG $nss_config_args --cflags`
+		NSS_LIBS=`$NSS_CONFIG $nss_config_args --libs`
+
+		dnl Skip version check for now
+		nss_config_major_version=`$NSS_CONFIG $nss_config_args --version | \
+			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+		nss_config_minor_version=`$NSS_CONFIG $nss_config_args --version | \
+			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+		nss_config_micro_version=`$NSS_CONFIG $nss_config_args --version | \
+			sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+	fi
+
+	if test -z "$no_nss"; then
+		AC_MSG_RESULT(yes)
+		ifelse([$2], , :, [$2])     
+	else
+		AC_MSG_RESULT(no)
+	fi
+
+
+	AC_SUBST(NSS_CFLAGS)
+	AC_SUBST(NSS_LIBS)
+
+])
Index: mozilla/security/manager/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/security/manager/Makefile.in,v
retrieving revision 1.57
diff -u -r1.57 Makefile.in
--- mozilla/security/manager/Makefile.in	2 Jun 2005 02:03:05 -0000	1.57
+++ mozilla/security/manager/Makefile.in	15 Dec 2005 05:40:54 -0000
@@ -46,6 +46,8 @@
 MODULE = psm
 
 PACKAGE_FILE = psm.pkg
+
+ifndef MOZ_NATIVE_NSS
 PACKAGE_VARS += \
 	NSS3_LIB \
 	SMIME3_LIB \
@@ -57,6 +59,7 @@
 	$(NULL)
 
 LOADABLE_ROOT_MODULE = $(DLL_PREFIX)nssckbi$(DLL_SUFFIX)
+endif
 
 NSS3_LIB = $(DLL_PREFIX)nss3$(DLL_SUFFIX)
 SMIME3_LIB = $(DLL_PREFIX)smime3$(DLL_SUFFIX)
@@ -147,6 +150,7 @@
 export:: .nss.cleaned
 
 .nss.cleaned: .nss.checkout
+ifndef MOZ_NATIVE_NSS
 	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
 	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
 ifndef SKIP_CHK
@@ -154,9 +158,12 @@
 	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
 endif
 	touch $@
+endif
 
 .nss.checkout:
+ifndef MOZ_NATIVE_NSS
 	touch $(srcdir)/$@
+endif
 
 dependclean export packages chrome::
 	$(MAKE) -C boot $@
@@ -167,12 +174,15 @@
 endif
 
 libs::
+ifndef MOZ_NATIVE_NSS
 	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
+endif
 ifeq ($(OS_ARCH),WINNT)
 	cd $(DIST)/lib; cp -f $(LIB_PREFIX)dbm$(MOZ_BITS).$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
 else
 	cd $(DIST)/lib; cp -f $(LIB_PREFIX)mozdbm_s.$(LIB_SUFFIX) $(LIB_PREFIX)dbm.$(LIB_SUFFIX); $(RANLIB) $(LIB_PREFIX)dbm.$(LIB_SUFFIX)
 endif
+ifndef MOZ_NATIVE_NSS
 	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS)
 ifndef SKIP_CHK
 	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS)
@@ -210,6 +220,7 @@
 	$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DIST)/bin
 endif
 endif
+endif
 	$(MAKE) -C boot $@
 	$(MAKE) -C ssl $@
 	$(MAKE) -C locales $@
@@ -218,6 +229,7 @@
 endif
 
 install::
+ifndef MOZ_NATIVE_NSS
 	$(SYSINSTALL) -m 755 $(DIST)/lib/$(LOADABLE_ROOT_MODULE) $(DESTDIR)$(mozappdir)
 ifndef SKIP_CHK
 	$(SYSINSTALL) -m 644 $(DIST)/lib/$(SOFTOKEN3_CHK) $(DESTDIR)$(mozappdir)
@@ -232,6 +244,7 @@
 	$(SYSINSTALL) -m 644 $(DIST)/lib/$(FREEBL_HYBRID_CHK) $(DESTDIR)$(mozappdir)
 	$(SYSINSTALL) -m 755 $(DIST)/lib/$(FREEBL_HYBRID_MODULE) $(DESTDIR)$(mozappdir)
 endif
+endif
 	$(MAKE) -C boot $@
 	$(MAKE) -C ssl $@
 	$(MAKE) -C locales $@
@@ -246,15 +259,18 @@
 ifdef MOZ_XUL
 	$(MAKE) -C pki $@
 endif
+ifndef MOZ_NATIVE_NSS
 	$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
 	$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean
 ifndef SKIP_CHK
 	$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
 	$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
 endif
+endif
 
 echo-requires-recursive::
 	$(MAKE) -C boot $@
 	$(MAKE) -C ssl $@
 	$(MAKE) -C pki $@
 	$(MAKE) -C locales $@
+
Index: mozilla/security/manager/ssl/src/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/security/manager/ssl/src/Makefile.in,v
retrieving revision 1.67
diff -u -r1.67 Makefile.in
--- mozilla/security/manager/ssl/src/Makefile.in	3 Aug 2005 05:24:18 -0000	1.67
+++ mozilla/security/manager/ssl/src/Makefile.in	15 Dec 2005 05:40:56 -0000
@@ -123,8 +123,13 @@
 
 # Use local includes because they are inserted before INCLUDES
 # so that Mozilla's nss.h is used, not glibc's
+ifdef MOZ_NATIVE_NSS
+LOCAL_INCLUDES += $(NSS_CFLAGS) \
+                  $(NULL)
+else
 LOCAL_INCLUDES += -I$(DIST)/public/nss \
                   $(NULL)
+endif
 
 EXTRA_DSO_LDOPTS += \
 		$(MOZ_UNICHARUTIL_LIBS) \
Index: mozilla/security/manager/ssl/src/nsNSSComponent.cpp
===================================================================
RCS file: /cvsroot/mozilla/security/manager/ssl/src/nsNSSComponent.cpp,v
retrieving revision 1.126.2.1
diff -u -r1.126.2.1 nsNSSComponent.cpp
--- mozilla/security/manager/ssl/src/nsNSSComponent.cpp	26 Aug 2005 06:41:50 -0000	1.126.2.1
+++ mozilla/security/manager/ssl/src/nsNSSComponent.cpp	15 Dec 2005 05:41:00 -0000
@@ -488,14 +488,6 @@
 }
 
 
-#ifdef XP_MAC
-#ifdef DEBUG
-#define LOADABLE_CERTS_MODULE NS_LITERAL_CSTRING("NSSckbiDebug.shlb")
-#else
-#define LOADABLE_CERTS_MODULE NS_LITERAL_CSTRING("NSSckbi.shlb")
-#endif /*DEBUG*/ 
-#endif /*XP_MAC*/
-
 static void setOCSPOptions(nsIPrefBranch * pref);
 
 NS_IMETHODIMP
@@ -689,40 +681,40 @@
 
     const char *possible_ckbi_locations[] = {
       NS_GRE_DIR,
-      NS_XPCOM_CURRENT_PROCESS_DIR
+      NS_XPCOM_CURRENT_PROCESS_DIR,
+      0
     };
-    
+
     for (size_t il = 0; il < sizeof(possible_ckbi_locations)/sizeof(const char*); ++il) {
       nsCOMPtr<nsILocalFile> mozFile;
-      directoryService->Get( possible_ckbi_locations[il],
-                             NS_GET_IID(nsILocalFile), 
-                             getter_AddRefs(mozFile));
+      char *fullModuleName = nsnull;
+
+      if (!possible_ckbi_locations[il])
+      {
+        fullModuleName = PR_GetLibraryName(nsnull, "nssckbi");
+      }
+      else
+      {
+        directoryService->Get( possible_ckbi_locations[il],
+                               NS_GET_IID(nsILocalFile), 
+                               getter_AddRefs(mozFile));
     
-      if (!mozFile) {
-        continue;
+        if (!mozFile) {
+          continue;
+        }
+
+        nsCAutoString processDir;
+        mozFile->GetNativePath(processDir);
+        fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi");
       }
 
-      char *fullModuleName = nsnull;
-#ifdef XP_MAC
-      nsCAutoString nativePath;
-      mozFile->AppendNative(NS_LITERAL_CSTRING("Essential Files"));
-      mozFile->AppendNative(LOADABLE_CERTS_MODULE);
-      mozFile->GetNativePath(nativePath);    
-      fullModuleName = (char *) nativePath.get();
-#else
-      nsCAutoString processDir;
-      mozFile->GetNativePath(processDir);
-      fullModuleName = PR_GetLibraryName(processDir.get(), "nssckbi");
-#endif
       /* If a module exists with the same name, delete it. */
       NS_ConvertUCS2toUTF8 modNameUTF8(modName);
       int modType;
       SECMOD_DeleteModule(NS_CONST_CAST(char*, modNameUTF8.get()), &modType);
       SECStatus rv_add = 
         SECMOD_AddNewModule(NS_CONST_CAST(char*, modNameUTF8.get()), fullModuleName, 0, 0);
-#ifndef XP_MAC
-      PR_Free(fullModuleName); // allocated by NSPR
-#endif
+      PR_FreeLibraryName(fullModuleName); // allocated by NSPR
       if (SECSuccess == rv_add) {
         // found a module, no need to try other directories
         break;

firefox-1.5.0.1-dumpstack.patch:

--- NEW FILE firefox-1.5.0.1-dumpstack.patch ---
Index: mozilla/xpcom/base/nsStackFrameUnix.cpp
===================================================================
RCS file: /cvsroot/mozilla/xpcom/base/nsStackFrameUnix.cpp,v
retrieving revision 1.12
diff -d -u -p -r1.12 nsStackFrameUnix.cpp
--- mozilla/xpcom/base/nsStackFrameUnix.cpp	18 Apr 2004 14:18:12 -0000	1.12
+++ mozilla/xpcom/base/nsStackFrameUnix.cpp	2 Feb 2006 05:29:00 -0000
@@ -90,6 +90,9 @@ void DemangleSymbol(const char * aSymbol
 
 void DumpStackToFile(FILE* aStream)
 {
+  fprintf(aStream, "Stacktrace disabled for now.\n"
+                   "See https://bugzilla.mozilla.org/show_bug.cgi?id=323853\n");
+#if 0
   jmp_buf jb;
   setjmp(jb);
 
@@ -138,6 +141,7 @@ void DumpStackToFile(FILE* aStream)
               symbol, off, info.dli_fname, foff);
     }
   }
+#endif
 }
 
 #elif defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386))

mozilla-1.4.1-ppc64.patch:

--- NEW FILE mozilla-1.4.1-ppc64.patch ---
--- mozilla/security/coreconf/Linux.mk.foo	2003-10-01 13:06:30.000000000 -0400
+++ mozilla/security/coreconf/Linux.mk	2003-10-01 13:07:22.000000000 -0400
@@ -53,7 +53,11 @@
 ifeq ($(OS_TEST),m68k)
 	OS_REL_CFLAGS	= -DLINUX1_2 -D_XOPEN_SOURCE
 	CPU_ARCH	= m68k
-else		
+else
+ifeq ($(OS_TEST),ppc64)
+	OS_REL_CFLAGS	= -DLINUX1_2 -D_XOPEN_SOURCE
+	CPU_ARCH	= ppc64
+else
 ifeq ($(OS_TEST),ppc)
 	OS_REL_CFLAGS	= -DLINUX1_2 -D_XOPEN_SOURCE
 	CPU_ARCH	= ppc
@@ -112,6 +116,7 @@
 endif
 endif
 endif
+endif
 
 
 LIBC_TAG		= _glibc

mozilla-1.7.3-gnome-vfs-default-app.patch:

--- NEW FILE mozilla-1.7.3-gnome-vfs-default-app.patch ---
--- mozilla/uriloader/exthandler/unix/nsGNOMERegistry.cpp.foo	2004-03-06 09:41:00.000000000 -0500
+++ mozilla/uriloader/exthandler/unix/nsGNOMERegistry.cpp	2004-10-18 18:55:55.000000000 -0400
@@ -283,6 +283,11 @@
 
   gchar *nativeCommand = g_filename_from_utf8(handlerApp->command,
                                               -1, NULL, NULL, NULL);
+
+  // Some versions of the mime stuff will add whitespace to the end or
+  // beginning of the command
+  nativeCommand = g_strstrip(nativeCommand);
+
   if (!nativeCommand) {
     NS_ERROR("Could not convert helper app command to filesystem encoding");
     _gnome_vfs_mime_application_free(handlerApp);

mozilla-1.7.5-g-application-name.patch:

--- NEW FILE mozilla-1.7.5-g-application-name.patch ---
Index: xpfe/bootstrap/nsAppRunner.cpp
===================================================================
RCS file: /cvsroot/mozilla/xpfe/bootstrap/nsAppRunner.cpp,v
retrieving revision 1.428
diff -d -u -p -r1.428 nsAppRunner.cpp
--- xpfe/bootstrap/nsAppRunner.cpp	20 Dec 2004 21:53:33 -0000	1.428
+++ xpfe/bootstrap/nsAppRunner.cpp	5 Mar 2005 08:39:12 -0000
@@ -1612,6 +1612,11 @@ static PRBool GetWantSplashScreen(int ar
   return dosplash;
 }
 
+#ifdef MOZ_WIDGET_GTK2
+#include "prlink.h"
+typedef void (*_g_set_application_name_fn)(const gchar *application_name);
+#endif
+
 int main(int argc, char* argv[])
 {
   NS_TIMELINE_MARK("enter main");
@@ -1712,6 +1717,19 @@ int main(int argc, char* argv[])
 #endif
   gtk_init(&argc, &argv);
 
+#if defined(MOZ_WIDGET_GTK2)
+  // g_set_application_name () is only defined in glib2.2 and higher.
+  PRLibrary *glib2;
+  _g_set_application_name_fn _g_set_application_name =
+      (_g_set_application_name_fn)PR_FindFunctionSymbolAndLibrary("g_set_application_name", &glib2);
+  if (_g_set_application_name) {
+    _g_set_application_name("seamonkey"); /* MOZ_APP_NAME */
+  }
+  if (glib2) {
+    PR_UnloadLibrary(glib2);
+  }
+#endif
+
   gtk_widget_set_default_visual(gdk_rgb_get_visual());
   gtk_widget_set_default_colormap(gdk_rgb_get_cmap());
 #endif /* MOZ_WIDGET_GTK || MOZ_WIDGET_GTK2 */

mozilla-nspr-packages.patch:

--- NEW FILE mozilla-nspr-packages.patch ---
--- mozilla/xpinstall/packager/packages-unix.smp5	2005-12-22 16:29:39.000000000 +0100
+++ mozilla/xpinstall/packager/packages-unix	2006-01-21 09:03:04.000000000 +0100
@@ -45,9 +45,6 @@
 
 [xpcom]
 bin/libmozjs.so
-bin/libnspr4.so
-bin/libplc4.so
-bin/libplds4.so
 bin/cpu/sparcv8plus/libnspr_flt4.so
 bin/libxpcom.so
 bin/libxpcom_core.so
@@ -463,18 +460,13 @@
 bin/components/talkback/*
 
 [psm]
-bin/libnssckbi.so
 bin/components/libpipboot.so
 bin/components/pipboot.xpt
 bin/components/libpipnss.so
 bin/components/pipnss.xpt
 bin/components/libpippki.so
 bin/components/pippki.xpt
-bin/libnss3.so
-bin/libsmime3.so
 bin/libsoftokn3.chk
-bin/libsoftokn3.so
-bin/libssl3.so
 bin/chrome/pipnss.jar
 bin/chrome/pippki.jar
 ; These are required for solaris 32-bit builds
@@ -499,5 +491,17 @@
 bin/components/spellchecker.xpt
 bin/components/myspell/*
 
+[nspr]
+bin/libnspr4.so
+bin/libplc4.so
+bin/libplds4.so
+
+[nss]
+bin/libnssckbi.so
+bin/libnss3.so
+bin/libsmime3.so
+bin/libsoftokn3.so
+bin/libssl3.so
+
 [reporter]
 bin/chrome/reporter.jar


--- NEW FILE mozilla-psm-exclude-list ---
libnss3.so
libsmime3.so
libsoftokn3.so
libssl3.so


--- NEW FILE mozilla-xpcom-exclude-list ---
libnspr4.so
libplc4.so
libplds4.so

pango-cairo.patch:

--- NEW FILE pango-cairo.patch ---
Index: config/autoconf.mk.in
===================================================================
RCS file: /cvsroot/mozilla/config/autoconf.mk.in,v
retrieving revision 3.363.2.1
diff -u -p -6 -r3.363.2.1 autoconf.mk.in
--- config/autoconf.mk.in	17 Aug 2005 17:17:17 -0000	3.363.2.1
+++ config/autoconf.mk.in	27 Aug 2005 19:57:29 -0000
@@ -456,12 +456,13 @@ MOZ_XFT_CFLAGS		= @MOZ_XFT_CFLAGS@
 MOZ_XFT_LIBS		= @MOZ_XFT_LIBS@
 MOZ_ENABLE_COREXFONTS	= @MOZ_ENABLE_COREXFONTS@
 
 MOZ_ENABLE_PANGO        = @MOZ_ENABLE_PANGO@
 MOZ_PANGO_CFLAGS        = @MOZ_PANGO_CFLAGS@
 MOZ_PANGO_LIBS          = @MOZ_PANGO_LIBS@
+MOZ_PANGOCAIRO          = @MOZ_PANGOCAIRO@
 
 MOZ_EXTRA_X11CONVERTERS	= @MOZ_EXTRA_X11CONVERTERS@
 
 MOZ_ENABLE_XINERAMA	= @MOZ_ENABLE_XINERAMA@
 MOZ_XINERAMA_LIBS	= @MOZ_XINERAMA_LIBS@
 
Index: gfx/src/gtk/mozilla-decoder.cpp
===================================================================
RCS file: /cvsroot/mozilla/gfx/src/gtk/mozilla-decoder.cpp,v
retrieving revision 1.3
diff -u -p -6 -r1.3 mozilla-decoder.cpp
--- gfx/src/gtk/mozilla-decoder.cpp	7 Nov 2004 23:59:23 -0000	1.3
+++ gfx/src/gtk/mozilla-decoder.cpp	27 Aug 2005 19:57:49 -0000
@@ -37,13 +37,17 @@
  * ***** END LICENSE BLOCK ***** */
 
 #define PANGO_ENABLE_BACKEND
 #define PANGO_ENABLE_ENGINE
 
 #include "mozilla-decoder.h"
+#ifdef MOZ_PANGOCAIRO
+#include <pango/pangocairo.h>
+#else
 #include <pango/pangoxft.h>
+#endif
 #include <pango/pangofc-fontmap.h>
 #include <pango/pangofc-font.h>
 #include <gdk/gdkx.h>
 
 #include "nsString.h"
 #include "nsIPersistentProperties2.h"
@@ -205,13 +209,17 @@ mozilla_decoders_init(void)
         }
         else {
             printf("unknown suffix used for mapping\n");
         }
     }
 
+#ifdef MOZ_PANGOCAIRO
+    pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_cairo_font_map_get_default()),
+#else
     pango_fc_font_map_add_decoder_find_func(PANGO_FC_FONT_MAP(pango_xft_get_font_map(GDK_DISPLAY(),gdk_x11_get_default_screen())),
+#endif
                                             mozilla_find_decoder,
                                             NULL,
                                             NULL);
 
     initialized = PR_TRUE;
 
Index: configure.in
===================================================================
RCS file: /cvsroot/mozilla/configure.in,v
retrieving revision 1.1503.2.6
diff -u -p -6 -r1.1503.2.6 configure.in
--- configure.in	25 Aug 2005 19:05:34 -0000	1.1503.2.6
+++ configure.in	29 Aug 2005 08:03:32 -0000
@@ -3707,14 +3707,14 @@ gtk)
     ;;
 
 gtk2)
     MOZ_ENABLE_GTK2=1
     MOZ_ENABLE_XREMOTE=1
     MOZ_ENABLE_COREXFONTS=${MOZ_ENABLE_COREXFONTS-}
-    TK_CFLAGS='$(MOZ_GTK2_CFLAGS)'
-    TK_LIBS='$(MOZ_GTK2_LIBS)'
+    TK_CFLAGS='$(MOZ_GTK2_CFLAGS) $(MOZ_PANGO_CFLAGS)'
+    TK_LIBS='$(MOZ_GTK2_LIBS) $(MOZ_PANGO_LIBS)'
     AC_DEFINE(MOZ_WIDGET_GTK2)
     ;;
 
 xlib)
 	MOZ_ENABLE_XLIB=1
     if test "$_HAVE_FREETYPE2"; then
@@ -4277,33 +4277,44 @@ if test "$MOZ_ENABLE_XFT" && test "$MOZ_
 fi
 
 if test "$MOZ_ENABLE_XFT"
 then
     AC_DEFINE(MOZ_ENABLE_XFT)
     PKG_CHECK_MODULES(MOZ_XFT, xft)
-    PKG_CHECK_MODULES(_PANGOCHK, pango >= 1.1.0)
+    PKG_CHECK_MODULES(MOZ_PANGO, pangoxft >= 1.1.0 pangox)
 fi
 
 AC_SUBST(MOZ_ENABLE_XFT)
 AC_SUBST(MOZ_XFT_CFLAGS)
 AC_SUBST(MOZ_XFT_LIBS)
+AC_SUBST(MOZ_PANGO_CFLAGS)
+AC_SUBST(MOZ_PANGO_LIBS)
 
 dnl ========================================================
 dnl = pango font rendering
 dnl ========================================================
 MOZ_ARG_ENABLE_BOOL(pango,
 [  --enable-pango          Enable Pango font rendering support],
     MOZ_ENABLE_PANGO=1,
     MOZ_ENABLE_PANGO=)
 
 if test "$MOZ_ENABLE_PANGO"
 then
     AC_DEFINE(MOZ_ENABLE_PANGO)
-    PKG_CHECK_MODULES(MOZ_PANGO, pango >= 1.6.0 pangoft2 >= 1.6.0)
+    PKG_CHECK_MODULES(MOZ_PANGO, pangoxft >= 1.6.0)
+    PKG_CHECK_MODULES(PANGOCAIRO_CHK, pangocairo >= 1.10.0,
+    [ 
+      MOZ_PANGOCAIRO=1
+      AC_DEFINE(MOZ_PANGOCAIRO)
+      MOZ_PANGO_CFLAGS="$PANGOCAIRO_CHK_CFLAGS $MOZ_PANGO_CFLAGS"
+      MOZ_PANGO_LIBS="$PANGOCAIRO_CHK_LIBS $MOZ_PANGO_LIBS"
+    ],
+    [:])
 
     AC_SUBST(MOZ_ENABLE_PANGO)
+    AC_SUBST(MOZ_PANGOCAIRO)
     AC_SUBST(MOZ_PANGO_CFLAGS)
     AC_SUBST(MOZ_PANGO_LIBS)
 fi
 
 dnl ========================================================
 dnl = x11 core font support (default and ability to enable depend on toolkit)

seamonkey-cairo-bug5136.patch:

--- NEW FILE seamonkey-cairo-bug5136.patch ---
Index: mozilla/gfx/cairo/libpixman/src/pixman-remap.h
===================================================================
RCS file: /cvsroot/mozilla/gfx/cairo/libpixman/src/pixman-remap.h,v
retrieving revision 1.1.6.2
diff -u -p -r1.1.6.2 pixman-remap.h
--- mozilla/gfx/cairo/libpixman/src/pixman-remap.h	27 Sep 2005 23:09:03 -0000	1.1.6.2
+++ mozilla/gfx/cairo/libpixman/src/pixman-remap.h	21 Nov 2005 02:35:24 -0000
@@ -1,9 +1,7 @@
 #define pixman_add_trapezoids _cairo_pixman_add_trapezoids
-#define INT_pixman_color_to_pixel _cairo_pixman_color_to_pixel
 #define pixman_color_to_pixel _cairo_pixman_color_to_pixel
 #define composeFunctions _cairo_pixman_compose_functions
 #define fbComposeSetupMMX _cairo_pixman_compose_setup_mmx
-#define INT_pixman_composite _cairo_pixman_composite
 #define pixman_composite _cairo_pixman_composite
 #define fbCompositeCopyAreammx _cairo_pixman_composite_copy_area_mmx
 #define fbCompositeSolidMask_nx8888x0565Cmmx _cairo_pixman_composite_solid_mask_nx8888x0565Cmmx


seamonkey-configure.patch:

--- NEW FILE seamonkey-configure.patch ---
--- mozilla/configure.ac213	2006-02-10 09:14:59.000000000 +0100
+++ mozilla/configure	2006-02-10 09:15:01.000000000 +0100
@@ -941,7 +941,7 @@
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:938: checking host system type" >&5
+echo "configure:945: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -962,7 +962,7 @@
 echo "$ac_t""$host" 1>&6
 
 echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:959: checking target system type" >&5
+echo "configure:966: checking target system type" >&5
 
 target_alias=$target
 case "$target_alias" in
@@ -980,7 +980,7 @@
 echo "$ac_t""$target" 1>&6
 
 echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:977: checking build system type" >&5
+echo "configure:984: checking build system type" >&5
 
 build_alias=$build
 case "$build_alias" in
@@ -1050,12 +1050,12 @@
 LIBGNOME_VERSION=2.0
 
 MISSING_X=
-for ac_prog in mawk gawk nawk awk
+for ac_prog in gawk mawk nawk awk
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1051: checking for $ac_word" >&5
+echo "configure:1059: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1153,7 +1153,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1149: checking for $ac_word" >&5
+echo "configure:1157: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_NSINSTALL_BIN'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1226,13 +1226,13 @@
     _SAVE_LDFLAGS="$LDFLAGS"
 
     echo $ac_n "checking for host c compiler""... $ac_c" 1>&6
-echo "configure:1222: checking for host c compiler" >&5
+echo "configure:1230: checking for host c compiler" >&5
     for ac_prog in $HOST_CC gcc cc /usr/ucb/cc cl icc
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1228: checking for $ac_word" >&5
+echo "configure:1236: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_HOST_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1267,13 +1267,13 @@
     fi
     echo "$ac_t""$HOST_CC" 1>&6
     echo $ac_n "checking for host c++ compiler""... $ac_c" 1>&6
-echo "configure:1263: checking for host c++ compiler" >&5
+echo "configure:1271: checking for host c++ compiler" >&5
     for ac_prog in $HOST_CXX $CCC c++ g++ gcc CC cxx cc++ cl icc
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1269: checking for $ac_word" >&5
+echo "configure:1277: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_HOST_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1322,7 +1322,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1318: checking for $ac_word" >&5
+echo "configure:1326: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_HOST_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1357,7 +1357,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1353: checking for $ac_word" >&5
+echo "configure:1361: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_HOST_AR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1392,16 +1392,16 @@
     LDFLAGS="$HOST_LDFLAGS"
 
     echo $ac_n "checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1388: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5
+echo "configure:1396: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5
     cat > conftest.$ac_ext <<EOF
-#line 1390 "configure"
+#line 1398 "configure"
 #include "confdefs.h"
 
 int main() {
 return(0);
 ; return 0; }
 EOF
-if { (eval echo configure:1397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_prog_hostcc_works=1 echo "$ac_t""yes" 1>&6
 else
@@ -1416,16 +1416,16 @@
     CFLAGS="$HOST_CXXFLAGS"
 
     echo $ac_n "checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1412: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5
+echo "configure:1420: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5
     cat > conftest.$ac_ext <<EOF
-#line 1414 "configure"
+#line 1422 "configure"
 #include "confdefs.h"
 
 int main() {
 return(0);
 ; return 0; }
 EOF
-if { (eval echo configure:1421: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1429: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_prog_hostcxx_works=1 echo "$ac_t""yes" 1>&6
 else
@@ -1445,7 +1445,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1441: checking for $ac_word" >&5
+echo "configure:1449: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1479,7 +1479,7 @@
     # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1475: checking for $ac_word" >&5
+echo "configure:1483: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1509,7 +1509,7 @@
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1505: checking for $ac_word" >&5
+echo "configure:1513: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1560,7 +1560,7 @@
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1556: checking for $ac_word" >&5
+echo "configure:1564: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1592,7 +1592,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1588: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1596: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1603,12 +1603,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 1599 "configure"
+#line 1607 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
[...5344 lines suppressed...]
+if { (eval echo configure:18458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -18292,7 +18481,7 @@
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:18171: checking stack direction for C alloca" >&5
+echo "configure:18485: checking stack direction for C alloca" >&5
 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -18300,7 +18489,7 @@
   ac_cv_c_stack_direction=0
 else
   cat > conftest.$ac_ext <<EOF
-#line 18179 "configure"
+#line 18493 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -18319,7 +18508,7 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:18198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:18512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   ac_cv_c_stack_direction=1
 else
@@ -18368,17 +18557,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:18247: checking for $ac_hdr" >&5
+echo "configure:18561: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 18252 "configure"
+#line 18566 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:18257: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:18571: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -18458,7 +18647,7 @@
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:18337: checking for $ac_word" >&5
+echo "configure:18651: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -18502,19 +18691,19 @@
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
         echo $ac_n "checking for cairo >= $CAIRO_VERSION""... $ac_c" 1>&6
-echo "configure:18381: checking for cairo >= $CAIRO_VERSION" >&5
+echo "configure:18695: checking for cairo >= $CAIRO_VERSION" >&5
 
         if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION" ; then
             echo "$ac_t""yes" 1>&6
             succeeded=yes
 
             echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6
-echo "configure:18388: checking CAIRO_CFLAGS" >&5
+echo "configure:18702: checking CAIRO_CFLAGS" >&5
             CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION"`
             echo "$ac_t""$CAIRO_CFLAGS" 1>&6
 
             echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6
-echo "configure:18393: checking CAIRO_LIBS" >&5
+echo "configure:18707: checking CAIRO_LIBS" >&5
             ## don't use --libs since that can do evil things like add
             ## -Wl,--export-dynamic
             CAIRO_LIBS="`$PKG_CONFIG --libs-only-L \"cairo >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo >= $CAIRO_VERSION\"`"
@@ -18579,7 +18768,7 @@
         # Extract the first word of "python", so it can be a program name with args.
 set dummy python; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:18458: checking for $ac_word" >&5
+echo "configure:18772: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -18840,14 +19029,14 @@
 cross_compiling=$ac_cv_prog_cc_cross
 
     cat > conftest.$ac_ext <<EOF
-#line 18719 "configure"
+#line 19033 "configure"
 #include "confdefs.h"
 #include <gmodule.h>
 int main() {
  int x = 1; x++; 
 ; return 0; }
 EOF
-if { (eval echo configure:18726: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:19040: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -19113,6 +19302,10 @@
 
 
 
+
+
+
+
 cat >> confdefs.h <<EOF
 #define MOZ_DLL_SUFFIX "$DLL_SUFFIX"
 EOF
@@ -19140,7 +19333,7 @@
                 _SAVE_CFLAGS=$CFLAGS
     CFLAGS="$CFLAGS $XCFLAGS"
     cat > conftest.$ac_ext <<EOF
-#line 19019 "configure"
+#line 19337 "configure"
 #include "confdefs.h"
 
         #include <stdio.h>
@@ -19156,7 +19349,7 @@
     
 ; return 0; }
 EOF
-if { (eval echo configure:19035: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:19353: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   :
 else
   echo "configure: failed program was:" >&5
@@ -19373,15 +19566,34 @@
 # Transform confdefs.h into DEFS.
 # Protect against shell expansion while executing Makefile rules.
 # Protect against Makefile macro expansion.
-cat > conftest.defs <<\EOF
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g
-s%[ 	`~#$^&*(){}\\|;'"<>?]%\\&%g
-s%\[%\\&%g
-s%\]%\\&%g
-s%\$%$$%g
-EOF
-DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '`
-rm -f conftest.defs
+#
+# If the first sed substitution is executed (which looks for macros that
+# take arguments), then we branch to the quote section.  Otherwise,
+# look for a macro that doesn't take arguments.
+cat >confdef2opt.sed <<\_ACEOF
+t clear
+: clear
+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	(][^ 	(]*([^)]*)\)[ 	]*\(.*\),-D\1=\2,g
+t quote
+s,^[ 	]*#[ 	]*define[ 	][ 	]*\([^ 	][^ 	]*\)[ 	]*\(.*\),-D\1=\2,g
+t quote
+d
+: quote
+s,[ 	`~#$^&*(){}\\|;'"<>?],\\&,g
+s,\[,\\&,g
+s,\],\\&,g
+s,\$,$$,g
+p
+_ACEOF
+# We use echo to avoid assuming a particular line-breaking character.
+# The extra dot is to prevent the shell from consuming trailing
+# line-breaks from the sub-command output.  A line-break within
+# single-quotes doesn't work because, if this script is created in a
+# platform that uses two characters for line-breaks (e.g., DOS), tr
+# would break.
+ac_LF_and_DOT=`echo; echo .`
+DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'`
+rm -f confdef2opt.sed
 
 MOZ_DEFINES=$DEFS
 
@@ -19663,12 +19875,13 @@
 s%@MOZ_ENABLE_FREETYPE2@%$MOZ_ENABLE_FREETYPE2%g
 s%@MOZ_XFT_CFLAGS@%$MOZ_XFT_CFLAGS%g
 s%@MOZ_XFT_LIBS@%$MOZ_XFT_LIBS%g
-s%@_PANGOCHK_CFLAGS@%$_PANGOCHK_CFLAGS%g
-s%@_PANGOCHK_LIBS@%$_PANGOCHK_LIBS%g
-s%@MOZ_ENABLE_XFT@%$MOZ_ENABLE_XFT%g
 s%@MOZ_PANGO_CFLAGS@%$MOZ_PANGO_CFLAGS%g
 s%@MOZ_PANGO_LIBS@%$MOZ_PANGO_LIBS%g
+s%@MOZ_ENABLE_XFT@%$MOZ_ENABLE_XFT%g
+s%@PANGOCAIRO_CHK_CFLAGS@%$PANGOCAIRO_CHK_CFLAGS%g
+s%@PANGOCAIRO_CHK_LIBS@%$PANGOCAIRO_CHK_LIBS%g
 s%@MOZ_ENABLE_PANGO@%$MOZ_ENABLE_PANGO%g
+s%@MOZ_PANGOCAIRO@%$MOZ_PANGOCAIRO%g
 s%@MOZ_ENABLE_COREXFONTS@%$MOZ_ENABLE_COREXFONTS%g
 s%@MOZ_GNOMEVFS_CFLAGS@%$MOZ_GNOMEVFS_CFLAGS%g
 s%@MOZ_GNOMEVFS_LIBS@%$MOZ_GNOMEVFS_LIBS%g

seamonkey-disable-visibility.patch:

--- NEW FILE seamonkey-disable-visibility.patch ---
Index: mozilla/configure.in
===================================================================
RCS file: /cvsroot/mozilla/configure.in,v
retrieving revision 1.1503.2.15.2.3
diff -u -r1.1503.2.15.2.3 configure.in
--- mozilla/configure.in	10 Jan 2006 03:11:42 -0000	1.1503.2.15.2.3
+++ mozilla/configure.in	21 Jan 2006 09:00:24 -0000
@@ -2383,7 +2383,7 @@
 dnl Check for .hidden assembler directive and visibility attribute.
 dnl Borrowed from glibc configure.in
 dnl ===============================================================
-if test "$GNU_CC"; then
+if /bin/false; then
   AC_CACHE_CHECK(for visibility(hidden) attribute,
                  ac_cv_visibility_hidden,
                  [cat > conftest.c <<EOF


--- NEW FILE seamonkey-fedora-default-bookmarks.html ---
<!DOCTYPE NETSCAPE-Bookmark-file-1>
<!-- This is an automatically generated file.
     It will be read and overwritten.
     DO NOT EDIT! -->
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
<TITLE>Bookmarks</TITLE>
<H1 LAST_MODIFIED="1130967916">Bookmarks</H1>

<DL><p>
    <DT><H3 ADD_DATE="961112773" LAST_MODIFIED="1130967903" PERSONAL_TOOLBAR_FOLDER="true" ID="NC:PersonalToolbarFolder">Personal Toolbar Folder</H3>
    <DL><p>
        <DT><A HREF="http://fedoraproject.org/" ADD_DATE="1130967459" LAST_MODIFIED="1130967615" LAST_CHARSET="UTF-8" ID="rdf:#$x80oc3">Fedora Project Portal</A>
        <DT><A HREF="http://fedora.redhat.com/docs/release-notes/" ADD_DATE="1130967140" LAST_VISIT="1130968088" ICON="data:image/x-icon;base64,AAABAAIAEBAQAAAAAAAoAQAAJgAAACAgEAAAAAAA6AIAAE4BAAAoAAAAEAAAACAAAAABAAQAAAAAAMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP///wCne2YAbjMWAOy/qgDHmoUAhl5KAMrFwgDu6eYAtot2ANKolACtlYkAlmpUAFsqEgDMurAA4rWgAAAAAAAAAAAACVVVqqr/REAJMzPdMzMzQAkzIY0zMzNACTNhEzMzM/ACMzEW0zMz8AIzNxvTMzOgAjM+Ht3dM/ACMzkREb0zoAwzPBF3ozOgAjMzEW3d01AMMzOBERjTUAwzM+ERETNQDDMzMzMzM1AMzMLCKSmZUAAAAAAAAAAAgAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAEAACgAAAAgAAAAQAAAAAEABAAAAAAAgAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA////AICAgABuMxYA57qlAMCXhADn39sAmGxXAHxKMgDWysMAsIRvANOmkQBXKhQAzbuyAN+ynQDuwa0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAApVVbW1u7vr7u5ERP//8AAFpaVVW1tbvr7u5ORPT/AAClMzMzM8zDMzMzMzMz/wAAWjMzMzzMzDMzMzMzM/8AAKUzMzkRHcwzMzMzMzNPAACqMzMyERnMMzMzMzMzRAAApTMzOhERzDMzMzMzM08AAKozMzgREYwzMzMzMzNEAACqMzMzYRF8wzMzMzMz5AAAqjMzM5ERXMMzMzMzM+4AAKozM!
 zNREZzDMzMzMzPkAACnMzMzoRFszDMzMzMz7gAAejMzM4ERGMzMzDMzM+4AAKczMzMxERjMzMzDMzPrAAB6MzMzORERERGcwzMzvgAApzMzMzsRERERHDMzM7sAAHozMzM1ERERERczMzO+AAB3MzMzOBERVVVYMzMzuwAAejMzMzMREYzDMzMzM7sAAHczMzMzYRGszMzMzDO7AAB3MzMzM9ERaZmZmswzWwAAdzMzMzNRERERER3MM7UAAHczMzMzcRERERERMzNbAAB3MzMzM4ERERERETMzVQAAdzMzMzMzMzMzMzMzM1UAAHczMzMzMzMzMzMzMzNVAAB3d3d6enqqqqqlpaVVVQAAd3d3d3d3p6enqqqqWlUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAQ==" LAST_CHARSET="UTF-8" ID="rdf:#$v80oc3">Latest Release Notes</A>
        <DT><H3 ADD_DATE="1130967903" LAST_MODIFIED="1130967916" ID="rdf:#$A80oc3">Fedora Community</H3>
        <DL><p>
            <DT><A HREF="http://fedoranews.org/mediawiki/index.php/Main_Page" ADD_DATE="1130967815" LAST_CHARSET="UTF-8" ID="rdf:#$y80oc3">Fedora Weekly News</A>
            <DT><A HREF="http://forum.fedoraforum.org/" ADD_DATE="1130967896" LAST_MODIFIED="1130968100" LAST_CHARSET="ISO-8859-1" ID="rdf:#$z80oc3">Fedora Forum.org</A>
        </DL><p>
        <DT><A HREF="http://www.redhat.com/magazine/" ADD_DATE="1130967439" LAST_CHARSET="ISO-8859-1" ID="rdf:#$w80oc3">Red Hat Magazine</A>
    </DL><p>
</DL><p>


--- NEW FILE seamonkey-fedora-default-prefs.js ---
pref("browser.display.use_system_colors",   true);
pref("general.smoothScroll",                true);
pref("general.useragent.vendor", "Fedora");
pref("general.useragent.vendorSub", "SEAMONKEY_RPM_VR");

seamonkey-fedora-home-page.patch:

--- NEW FILE seamonkey-fedora-home-page.patch ---
--- mozilla/xpfe/browser/resources/locale/en-US/region.properties.smp4	2005-12-05 13:43:59.000000000 +0100
+++ mozilla/xpfe/browser/resources/locale/en-US/region.properties	2006-01-21 08:58:49.000000000 +0100
@@ -1,5 +1,5 @@
 # navigator.properties
-homePageDefault=http://www.mozilla.org/
+homePageDefault=file:///usr/share/doc/HTML/index.html
 shopKeyword=keyword:shop [Product]
 quoteKeyword=keyword:quote [Enter symbol here]
 localKeyword=keyword:zip [Your zip code]
@@ -11,7 +11,7 @@
 #
 # all.js
 #
-browser.startup.homepage=http://www.mozilla.org/projects/seamonkey/start/
+browser.startup.homepage=file:///usr/share/doc/HTML/index.html
 browser.throbber.url=http://www.mozilla.org/projects/seamonkey/
 browser.search.defaulturl=http://www.google.com/search?q=
 general.useragent.contentlocale=US
@@ -21,4 +21,4 @@
 
 #config.js
 #
-startup.homepage_override_url=http://www.mozilla.org/projects/seamonkey/start/
+startup.homepage_override_url=file:///usr/share/doc/HTML/index.html


--- NEW FILE seamonkey-mail.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Seamonkey Mail
Comment=Read Mail with Seamonkey
Exec=/usr/bin/seamonkey -mail
Icon=seamonkey-mail-icon
Terminal=0
Type=Application
Categories=X-Red-Hat-Extra;Application;Network;


--- NEW FILE seamonkey-make-package.pl ---
#!/usr/bin/perl -w
# 
# The contents of this file are subject to the Mozilla Public
# License Version 1.1 (the "License"); you may not use this file
# except in compliance with the License. You may obtain a copy of
# the License at http://www.mozilla.org/MPL/
# 
# Software distributed under the License is distributed on an "AS
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
# implied. See the License for the specific language governing
# rights and limitations under the License.
# 
# The Original Code is mozilla.org code.
# 
# The Initial Developer of the Original Code is Christopher Blizzard.
# Portions created by Christopher Blizzard are Copyright (C)
# Christopher Blizzard.  All Rights Reserved.
#
# Contributor(s):

# This script will read one of the mozilla packages- file on unix and
# copy it to a target directory.  It's for unix only and is really
# designed for use in building rpms or other packages.

use Getopt::Long;
use File::Find;

use strict;

# global vars
my $install_dir  = "";
my $install_root = "";
my $package_name = "";
my $package_file = "";
my $output_file  = "";
my $exclude_file = "";
my $retval;

# std return val

$retval = GetOptions('install-dir=s',  \$install_dir,
		     'install-root=s', \$install_root,
		     'package=s',      \$package_name,
		     'package-file=s', \$package_file,
		     'output-file=s',  \$output_file,
                     'exclude-file=s', \$exclude_file);

# make sure that all of the values are specific on the command line
if (!$retval || !$install_dir || !$install_root || !$package_name || 
    !$package_file || !$output_file) {
    print_usage();
    exit 1;
}

# try to open the packages file

open (PACKAGE_FILE, $package_file) || die("$0: Failed to open file $package_file for reading.");

print "chdir to $install_dir\n";
chdir($install_dir);

my @file_list;
my @exclude_list;
my @final_file_list;
my $reading_package = 0;

LINE: while (<PACKAGE_FILE>) {
    s/\;.*//;			# it's a comment, kill it.
    s/^\s+//;			# nuke leading whitespace
    s/\s+$//;			# nuke trailing whitespace
    
    # it's a blank line, skip it.
    if (/^$/) {
	next LINE;
    }

    # it's a new component
    if (/^\[/) {
	my $this_package;
	( $this_package ) = /^\[(.+)\]$/;
	if ($this_package eq $package_name) {
	    $reading_package = 1;
	}
	else {
	    $reading_package = 0;
	}
	next LINE;
    }

    # read this line
    if ($reading_package) {
	# see if it's a deletion
	if (/^-/) {
	    my $this_file;
	    ( $this_file ) = /^-(.+)$/;
	    push (@exclude_list, $this_file);
	}
	else {
	    push (@file_list, $_);
	}
    }
}

close PACKAGE_FILE;

# check if we have an exclude file

if ($exclude_file) {
    print "reading exclude file $exclude_file\n";

    open (EXCLUDE_FILE, $exclude_file) || die("$0: Failed to open exclude file $exclude_file for reading.");

    while (<EXCLUDE_FILE>) {
	chomp;
	print "Ignoring $_\n";
	push (@exclude_list, $_);
    }

    close EXCLUDE_FILE;
}

# Expand our file list

expand_file_list(\@file_list, \@exclude_list, \@final_file_list);

print "final file list\n";
foreach (@final_file_list) {
    print $_ . "\n";
}

open (OUTPUT_FILE, ">>$output_file") || die("Failed to open output file\n");
foreach (@final_file_list) {
    # strip off the bin/
    s/^bin\///;

    if ( ! -f $_ ) {
	print("Skipping $_ because it doesn't exist\n");
    }
    else {
	print ("Adding $_\n");
	print (OUTPUT_FILE $install_root . "/" . $_ . "\n");
    }
}
close OUTPUT_FILE;

#print "\nexlude list\n";
#foreach (@exclude_list) {
#    print $_ . "\n";
#}

# this function expands a list of files

sub expand_file_list {
    my $file_list_ref = shift;
    my $exclude_list_ref = shift;
    my $final_file_list_ref = shift;
    my $this_file;
    foreach $this_file (@{$file_list_ref}) {
	# strip off the bin/
	$this_file =~ s/^bin\///;

	# is it a wild card?
	if ($this_file =~ /\*/) {
	    print "Wild card $this_file\n";
	    # expand that wild card, removing anything in the exclude
	    # list
	    my @temp_list;
	    printf ("Expanding $this_file\n");
	    @temp_list = glob($this_file);
	    foreach $this_file (@temp_list) {
		if (!in_exclude_list($this_file, $exclude_list_ref)) {
		    push (@{$final_file_list_ref}, $this_file);
		}
	    }
	}
	else {
	    if (!in_exclude_list($this_file, $exclude_list_ref)) {
		push (@{$final_file_list_ref}, $this_file);
	    }
	}
    }
}

# is this file in the exlude list?

sub in_exclude_list {
    my $file = shift;
    my $exclude_list_ref = shift;
    my $this_file;
    foreach $this_file (@{$exclude_list_ref}) {
	if ($file eq $this_file) {
	    return 1;
	}
    }
    return 0;
}

# print out a usage message

sub print_usage {
    print ("$0: --install-dir dir --install-root dir --package name --package-file file --output-file file\n");
    print ("\t install-dir is the directory where the files are installed.\n");
    print ("\t install-root is the directory that should prefix files in the package file.\n");
    print ("\t package is the name of the package to list\n");
    print ("\t package-file is the file that contains the list of packages\n");
    print ("\t output-file is the file which will contain the list of files\n");
}


--- NEW FILE seamonkey-mozconfig ---
ac_add_options --with-system-nspr
ac_add_options --with-system-nss
ac_add_options --with-system-jpeg
ac_add_options --with-system-zlib
ac_add_options --with-system-png
ac_add_options --with-pthreads
ac_add_options --disable-tests
ac_add_options --disable-debug
ac_add_options --disable-installer
ac_add_options --enable-optimize="$RPM_OPT_FLAGS"
ac_add_options --enable-xinerama
ac_add_options --enable-default-toolkit=gtk2
ac_add_options --disable-xprint
ac_add_options --disable-strip
ac_add_options --enable-pango
#ac_add_options --enable-system-cairo
ac_add_options --enable-svg
ac_add_options --enable-canvas
ac_add_options --enable-extensions=default,irc
ac_add_options --enable-application=suite
ac_add_options --enable-crypto

export BUILD_OFFICIAL=1
export MOZILLA_OFFICIAL=1
mk_add_options BUILD_OFFICIAL=1
mk_add_options MOZILLA_OFFICIAL=1


--- NEW FILE seamonkey.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Seamonkey Web Browser
Comment=Browse the web with Seamonkey
Exec=seamonkey %u
Icon=seamonkey-icon
Terminal=0
Type=Application
MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;
Categories=Network;Application;X-Fedora;
X-Desktop-File-Install-Version=0.10



--- NEW FILE seamonkey.sh.in ---
#!/bin/sh
#
# The contents of this file are subject to the Netscape Public
# License Version 1.1 (the "License"); you may not use this file
# except in compliance with the License. You may obtain a copy of
# the License at http://www.mozilla.org/NPL/
#
# Software distributed under the License is distributed on an "AS
# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
# implied. See the License for the specific language governing
# rights and limitations under the License.
#
# The Original Code is mozilla.org code.
#
# The Initial Developer of the Original Code is Netscape
# Communications Corporation.  Portions created by Netscape are
# Copyright (C) 1998 Netscape Communications Corporation. All
# Rights Reserved.
#
# Contributor(s): 
#

## 
## Usage:
##
## $ mozilla
##
## This script is meant to run a mozilla program from the mozilla
## rpm installation.
##
## The script will setup all the environment voodoo needed to make
## mozilla work.

cmdname=`basename $0`

## don't leave any core files around
ulimit -c 0

##
## Variables
##
MOZ_DIST_BIN="LIBDIR/seamonkey-MOZILLA_VERSION"
MOZ_PROGRAM="LIBDIR/seamonkey-MOZILLA_VERSION/seamonkey-bin"
MOZ_CLIENT_PROGRAM="LIBDIR/seamonkey-MOZILLA_VERSION/mozilla-xremote-client -a seamonkey"

##
## Set MOZILLA_FIVE_HOME
##
MOZILLA_FIVE_HOME="LIBDIR/seamonkey-MOZILLA_VERSION"

export MOZILLA_FIVE_HOME

##
## Set LD_LIBRARY_PATH
##
if [ "$LD_LIBRARY_PATH" ]
then
  LD_LIBRARY_PATH=LIBDIR/seamonkey-MOZILLA_VERSION:LIBDIR/seamonkey-MOZILLA_VERSION/plugins:$LD_LIBRARY_PATH
else
  LD_LIBRARY_PATH=LIBDIR/seamonkey-MOZILLA_VERSION:LIBDIR/seamonkey-MOZILLA_VERSION/plugins
fi

export LD_LIBRARY_PATH

##
## Make sure that we set the plugin path for backwards compatibility
##
if [ "$MOZ_PLUGIN_PATH" ]
then
  MOZ_PLUGIN_PATH=$MOZ_PLUGIN_PATH:LIBDIR/mozilla/plugins:LIBDIR/seamonkey-MOZILLA_VERSION/plugins
else
  MOZ_PLUGIN_PATH=LIBDIR/mozilla/plugins:LIBDIR/seamonkey-MOZILLA_VERSION/plugins
fi
export MOZ_PLUGIN_PATH

##
## Set MOZ_ENABLE_PANGO is no longer used because Pango is enabled by default
## you may use MOZ_DISABLE_PANGO=1 to force disabling of pango
##
#MOZ_DISABLE_PANGO=1
#export MOZ_DISABLE_PANGO

function check_running() {
    $MOZ_CLIENT_PROGRAM 'ping()' 2>/dev/null >/dev/null
    RETURN_VAL=$?
    if [ "$RETURN_VAL" -eq "2" ]; then
      echo 0
      return 0
    else
      echo 1
      return 1
    fi
}

function open_mail() {
    if [ "${ALREADY_RUNNING}" -eq "1" ]; then
      exec $MOZ_CLIENT_PROGRAM 'xfeDoCommand(openInbox)' \
        2>/dev/null >/dev/null
    else
      exec $MOZ_PROGRAM $*
    fi
}

function open_compose() {
    if [ "${ALREADY_RUNNING}" -eq "1" ]; then
      exec $MOZ_CLIENT_PROGRAM 'xfeDoCommand(composeMessage)' \
        2>/dev/null >/dev/null
    else
      exec $MOZ_PROGRAM $*
    fi
}

# OK, here's where all the real work gets done

# check to see if there's an already running instance or not
ALREADY_RUNNING=`check_running`

# If there is no command line argument at all then try to open a new
# window in an already running instance.
if [ "${ALREADY_RUNNING}" -eq "1" ] && [ -z "$1" ]; then
  exec $MOZ_CLIENT_PROGRAM "xfeDoCommand(openBrowser)" 2>/dev/null >/dev/null
fi

# check system locale
MOZARGS=
MOZLOCALE=`echo $LANG | sed "s|_\([^.]*\).*|-\1|g"`
[ -f $MOZILLA_FIVE_HOME/chrome/$MOZLOCALE.jar ] && MOZARGS="-UILocale $MOZLOCALE"


# if there's no command line argument and there's not a running
# instance then just fire up a new copy of the browser
if [ -z "$1" ]; then
  exec $MOZ_PROGRAM $MOZARGS 2>/dev/null >/dev/null
fi

unset RETURN_VAL

# If there's a command line argument but it doesn't begin with a -
# it's probably a url.  Try to send it to a running instance.

USE_EXIST=0
opt="$1"
case "$opt" in
  -mail)
      open_mail ${1+"$@"}
      ;;
  -compose)
      open_compose ${1+"$@"}
      ;;
  -*) ;;
  *) USE_EXIST=1 ;;
esac

if [ "${USE_EXIST}" -eq "1" ] && [ "${ALREADY_RUNNING}" -eq "1" ]; then
  # check to make sure that the command contains at least a :/ in it.
  echo $opt | grep -e ':/' 2>/dev/null > /dev/null
  RETURN_VAL=$?
  if [ "$RETURN_VAL" -eq "1" ]; then
    # if it doesn't begin with a '/' and it exists when the pwd is
    # prepended to it then append the full path
    echo $opt | grep -e '^/' 2>/dev/null > /dev/null
    if [ "${RETURN_VAL}" -ne "0" ] && [ -e "`pwd`/$opt" ]; then
      opt="`pwd`/$opt"
    fi
    exec $MOZ_CLIENT_PROGRAM "openurl($opt)" 2>/dev/null >/dev/null
  fi
  # just pass it off if it looks like a url
  exec $MOZ_CLIENT_PROGRAM "openurl($opt,new-window)" 2>/dev/null >/dev/null
fi

exec $MOZ_PROGRAM $MOZARGS ${1+"$@"}


--- NEW FILE seamonkey.spec ---
%define desktop_file_utils_version 0.9
%define nspr_version 4.6
%define nss_version 3.11
%define pango_version 1.6.0

%define _unpackaged_files_terminate_build 0
%define builddir %{_builddir}/mozilla
%define mozdir %{_libdir}/seamonkey-%{version}

Name:           seamonkey
Summary:        Web browser, e-mail, news, IRC client, HTML editor
Version:        1.0
Release:        9%{?dist}
URL:            http://www.mozilla.org/projects/seamonkey/
License:        MPL
Group:          Applications/Internet

Source0:        seamonkey-%{version}.source.tar.bz2
Source1:        seamonkey.sh.in
Source2:        seamonkey-icon.png
Source4:        seamonkey.desktop
Source7:        seamonkey-make-package.pl
Source10:       seamonkey-mozconfig
Source12:       seamonkey-mail.desktop
Source13:       seamonkey-mail-icon.png
Source17:       mozilla-psm-exclude-list
Source18:       mozilla-xpcom-exclude-list
Source19:       seamonkey-fedora-default-bookmarks.html
Source20:       seamonkey-fedora-default-prefs.js
Source100:      find-external-requires

Patch1:         firefox-1.0-prdtoa.patch
Patch3:         firefox-1.1-nss-system-nspr.patch
Patch4:         firefox-1.5-with-system-nss.patch
Patch5:         seamonkey-disable-visibility.patch
Patch6:         firefox-1.5.0.1-dumpstack.patch
Patch21:        firefox-0.7.3-default-plugin-less-annoying.patch
Patch22:        firefox-0.7.3-psfonts.patch
Patch42:        firefox-1.1-uriloader.patch
Patch82:        pango-cairo.patch
Patch83:        seamonkey-cairo-bug5136.patch
Patch101:       thunderbird-0.7.3-gnome-uriloader.patch
Patch102:       thunderbird-1.5-bug304720.patch
Patch220:       seamonkey-fedora-home-page.patch
Patch225:       mozilla-nspr-packages.patch
Patch227:       mozilla-1.4.1-ppc64.patch
Patch301:       mozilla-1.7.3-gnome-vfs-default-app.patch
Patch304:       mozilla-1.7.5-g-application-name.patch
Patch999:       seamonkey-configure.patch

Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  libpng-devel
BuildRequires:  libjpeg-devel
BuildRequires:  zlib-devel
BuildRequires:  zip
BuildRequires:  perl
BuildRequires:  libIDL-devel
BuildRequires:  glib2-devel
BuildRequires:  gtk2-devel
BuildRequires:  pango-devel >= %{pango_version}
BuildRequires:  nspr-devel >= %{nspr_version}
BuildRequires:  nss-devel >= %{nss_version}
Prereq:         fileutils perl
Prereq:         /usr/bin/killall
PreReq:         desktop-file-utils >= %{desktop_file_utils_version}

AutoProv: 0
%define _use_internal_dependency_generator 0
%define __find_requires %{SOURCE100}


%description
SeaMonkey is an all-in-one Internet application suite. It includes 
a browser, mail/news client, IRC client, JavaScript debugger, and 
a tool to inspect the DOM for web pages. It is derived from the 
application formerly known as Mozilla Application Suite.
 

%prep

%setup -q -n mozilla
%patch1  -p0
%patch3  -p1
%patch4  -p1

# Pragma visibility is broken on most platforms for some reason.
# It works on i386 so leave it alone there.  Disable elsewhere.
# See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=20297
%ifnarch i386
%patch5  -p1
%endif

%patch6 -p1
%patch21 -p1
%patch22 -p1
%patch42 -p0
%patch82 -p0
%patch83 -p1
%patch101 -p1 -b .gnome-uriloader
%patch102 -p1
%patch220 -p1
%patch225 -p1
%patch227 -p1
%patch301 -p1
%patch304 -p0
%patch999 -p1

%{__rm} -f .mozconfig
%{__cp} %{SOURCE10} .mozconfig

# set up our default bookmarks
%{__cp} %{SOURCE19} $RPM_BUILD_DIR/mozilla/profile/defaults/bookmarks.html


%build

XCFLAGS=-g \
CFLAGS=-g \
%ifarch ia64 ppc
CXXFLAGS="-fno-inline -g" \
%else
CXXFLAGS=-g \
%endif
BUILD_OFFICIAL=1 MOZILLA_OFFICIAL=1 \
./configure --prefix=%{_prefix} --libdir=%{_libdir} \
--with-default-mozilla-five-home=%{mozdir} \
--mandir=%{_mandir}

BUILD_OFFICIAL=1 MOZILLA_OFFICIAL=1 make export
BUILD_OFFICIAL=1 MOZILLA_OFFICIAL=1 make %{?_smp_mflags} libs


%install
%{__rm} -rf $RPM_BUILD_ROOT

BUILD_OFFICIAL=1 MOZILLA_OFFICIAL=1 \
	DESTDIR=$RPM_BUILD_ROOT \
	make install

# create a list of all of the different package and the files that
# will hold them

%{__rm} -f %{builddir}/seamonkey.list

echo %defattr\(-,root,root\) > %{builddir}/seamonkey.list

# we don't want to ship mozilla's default sidebar components
%{__rm} -f $RPM_BUILD_ROOT/%{mozdir}/searchplugins/bugzilla.gif
%{__rm} -f $RPM_BUILD_ROOT/%{mozdir}/searchplugins/bugzilla.src
%{__rm} -f $RPM_BUILD_ROOT/%{mozdir}/searchplugins/dmoz.gif
%{__rm} -f $RPM_BUILD_ROOT/%{mozdir}/searchplugins/dmoz.src
%{__rm} -f $RPM_BUILD_ROOT/%{mozdir}/searchplugins/lxrmozilla.gif
%{__rm} -f $RPM_BUILD_ROOT/%{mozdir}/searchplugins/lxrmozilla.src
%{__rm} -f $RPM_BUILD_ROOT/%{mozdir}/searchplugins/mozilla.gif
%{__rm} -f $RPM_BUILD_ROOT/%{mozdir}/searchplugins/mozilla.src

# build all of the default browser components
# base Seamonkey package (seamonkey.list)
%{SOURCE7} --package langenus --output-file %{builddir}/seamonkey.list \
    --package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
    --install-dir $RPM_BUILD_ROOT/%{mozdir} \
    --install-root %{mozdir}

%{SOURCE7} --package regus --output-file %{builddir}/seamonkey.list \
    --package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
    --install-dir $RPM_BUILD_ROOT/%{mozdir} \
    --install-root %{mozdir}

%{SOURCE7} --package deflenus --output-file %{builddir}/seamonkey.list \
    --package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
    --install-dir $RPM_BUILD_ROOT/%{mozdir} \
    --install-root %{mozdir}

%{SOURCE7} --package xpcom --output-file %{builddir}/seamonkey.list \
    --package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
    --install-dir $RPM_BUILD_ROOT/%{mozdir} \
    --install-root %{mozdir} \
    --exclude-file=%{SOURCE18}

%{SOURCE7} --package browser --output-file %{builddir}/seamonkey.list \
    --package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
    --install-dir $RPM_BUILD_ROOT/%{mozdir} \
    --install-root %{mozdir}

%{SOURCE7} --package spellcheck --output-file %{builddir}/seamonkey.list \
    --package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
    --install-dir $RPM_BUILD_ROOT/%{mozdir} \
    --install-root %{mozdir}

%{SOURCE7} --package psm --output-file %{builddir}/seamonkey.list \
    --package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
    --install-dir $RPM_BUILD_ROOT/%{mozdir} \
    --install-root %{mozdir} \
    --exclude-file=%{SOURCE17}

%{SOURCE7} --package mail --output-file %{builddir}/seamonkey.list \
    --package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
    --install-dir $RPM_BUILD_ROOT/%{mozdir} \
    --install-root %{mozdir}

%{SOURCE7} --package chatzilla --output-file %{builddir}/seamonkey.list \
    --package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
    --install-dir $RPM_BUILD_ROOT/%{mozdir} \
    --install-root %{mozdir}

%{SOURCE7} --package venkman --output-file %{builddir}/seamonkey.list \
    --package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
    --install-dir $RPM_BUILD_ROOT/%{mozdir} \
    --install-root %{mozdir}

%{SOURCE7} --package inspector --output-file %{builddir}/seamonkey.list \
    --package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
    --install-dir $RPM_BUILD_ROOT/%{mozdir} \
    --install-root %{mozdir}

# build our initial component and chrome registry

pushd `pwd`
  cd $RPM_BUILD_ROOT/%{mozdir}

  # save a copy of the default installed-chrome.txt file before we
  # muck with it
  mkdir chrome/lang
  cp chrome/installed-chrome.txt chrome/lang/

  # set up the default skin and locale to trigger the generation of
  # the user-locales and users-skins.rdf
  echo "skin,install,select,classic/1.0" >> chrome/installed-chrome.txt
  echo "locale,install,select,en-US" >> chrome/installed-chrome.txt

  # save the defaults in a file that will be used later to rebuild the
  # installed-chrome.txt file
  echo "skin,install,select,classic/1.0" >> chrome/lang/default.txt
  echo "locale,install,select,en-US" >> chrome/lang/default.txt

  # set up the chrome rdf files
  LD_LIBRARY_PATH=`pwd`:`pwd`/.. MOZILLA_FIVE_HOME=`pwd` MOZ_DISABLE_GNOME=1 ./regchrome

  # fix permissions of the chrome directories
  /usr/bin/find . -type d -perm 0700 -exec chmod 755 {} \; || :

  # We don't want JS files to be executable
  /usr/bin/find . -type f -name \*.js -exec chmod 644 {} \; || :
popd

# set up our desktop files
%{__mkdir_p} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/

# install desktop files in correct directory
%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/applications/
desktop-file-install --vendor mozilla \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
    --add-category X-Fedora \
    --add-category Application \
    --add-category Network \
    %{SOURCE4}
desktop-file-install --vendor mozilla \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
    --add-category X-Fedora \
    --add-category Application \
    --add-category Network \
    %{SOURCE12}

install -c -m 644 %{SOURCE2} %{SOURCE13} \
  $RPM_BUILD_ROOT/%{_datadir}/pixmaps/

if [ ! -d $RPM_BUILD_ROOT/%{mozdir}/plugins/ ]; then
  mkdir -m 755 $RPM_BUILD_ROOT/%{mozdir}/plugins
fi

# install our seamonkey.sh file
cat %{SOURCE1} | sed -e 's/MOZILLA_VERSION/%{version}/g' \
		     -e 's,LIBDIR,%{_libdir},g' > \
  $RPM_BUILD_ROOT/usr/bin/seamonkey

chmod 755 $RPM_BUILD_ROOT/usr/bin/seamonkey

# set up our default preferences
%{__cat} %{SOURCE20} | %{__sed} -e 's,SEAMONKEY_RPM_VR,%{version}-%{release},g' > \
        $RPM_BUILD_ROOT/fc-default-prefs
%{__cp} $RPM_BUILD_ROOT/fc-default-prefs $RPM_BUILD_ROOT/%{mozdir}/defaults/pref/all-fedora.js
%{__rm} $RPM_BUILD_ROOT/fc-default-prefs

# we use /usr/lib/mozilla/plugins which is the version-independent
# place that plugins can be installed
%{__mkdir_p} $RPM_BUILD_ROOT/%{_libdir}/mozilla/plugins

# ghost files
touch $RPM_BUILD_ROOT%{mozdir}/chrome/chrome.rdf
for overlay in {"browser","communicator","cookie","editor","global","inspector","messenger","navigator"}; do
   %{__mkdir_p} $RPM_BUILD_ROOT%{mozdir}/chrome/overlayinfo/$overlay/content
  touch $RPM_BUILD_ROOT%{mozdir}/chrome/overlayinfo/$overlay/content/overlays.rdf
done
for overlay in {"browser","global"}; do
   %{__mkdir_p} $RPM_BUILD_ROOT%{mozdir}/chrome/overlayinfo/$overlay/skin
  touch $RPM_BUILD_ROOT%{mozdir}/chrome/overlayinfo/$overlay/skin/stylesheets.rdf
done
touch $RPM_BUILD_ROOT%{mozdir}/chrome/chrome.rdf
%{__mkdir_p} $RPM_BUILD_ROOT%{mozdir}/components/myspell


%clean
%{__rm} -rf $RPM_BUILD_ROOT


%post
update-desktop-database %{_datadir}/applications


%postun
update-desktop-database %{_datadir}/applications


%files -f seamonkey.list
%defattr(-,root,root)
%{_bindir}/seamonkey
%{_datadir}/pixmaps/seamonkey-icon.png
%{_datadir}/pixmaps/seamonkey-mail-icon.png

%verify (not md5 mtime size) %{mozdir}/components/compreg.dat
%verify (not md5 mtime size) %{mozdir}/components/xpti.dat

%{_mandir}/man1/seamonkey.1.gz

%dir %{_libdir}/mozilla/plugins

%dir %{mozdir}
%dir %{mozdir}/init.d
%dir %{mozdir}/defaults/pref
%dir %{mozdir}/defaults/profile
%dir %{mozdir}/defaults/profile/US
%dir %{mozdir}/defaults/wallet
%dir %{mozdir}/defaults/autoconfig
%dir %{mozdir}/defaults/messenger/US
%dir %{mozdir}/defaults/messenger
%dir %{mozdir}/defaults

%dir %{mozdir}/chrome/icons/default
%dir %{mozdir}/chrome/icons
%dir %{mozdir}/chrome/lang
%dir %{mozdir}/chrome

%dir %{mozdir}/res/dtd
%dir %{mozdir}/res/fonts
%dir %{mozdir}/res

%dir %{mozdir}/components/myspell
%dir %{mozdir}/components
%dir %{mozdir}/searchplugins

%dir %{mozdir}/plugins
%dir %{mozdir}/res/html
%dir %{mozdir}/res/samples
%dir %{mozdir}/res/entityTables

%verify (not md5 mtime size) %{mozdir}/chrome/installed-chrome.txt
%{mozdir}/chrome/lang/installed-chrome.txt
%{mozdir}/chrome/lang/default.txt

%{mozdir}/defaults/pref/all-fedora.js


%ghost %{mozdir}/chrome/chrome.rdf
%ghost %{mozdir}/chrome/overlays.rdf
%ghost %{mozdir}/chrome/stylesheets.rdf


%ghost %{mozdir}/chrome/overlayinfo/browser/skin/stylesheets.rdf
%ghost %{mozdir}/chrome/overlayinfo/global/skin/stylesheets.rdf

%ghost %{mozdir}/chrome/overlayinfo/browser/content/overlays.rdf
%ghost %{mozdir}/chrome/overlayinfo/communicator/content/overlays.rdf
%ghost %{mozdir}/chrome/overlayinfo/global/content/overlays.rdf
%ghost %{mozdir}/chrome/overlayinfo/editor/content/overlays.rdf
%ghost %{mozdir}/chrome/overlayinfo/navigator/content/overlays.rdf
%ghost %{mozdir}/chrome/overlayinfo/cookie/content/overlays.rdf

%ghost %{mozdir}/chrome/overlayinfo/messenger/content/overlays.rdf
%ghost %{mozdir}/chrome/overlayinfo/inspector/content/overlays.rdf

%dir %{mozdir}/chrome/overlayinfo/browser/content
%dir %{mozdir}/chrome/overlayinfo/browser/skin
%dir %{mozdir}/chrome/overlayinfo/browser
%dir %{mozdir}/chrome/overlayinfo/global/content
%dir %{mozdir}/chrome/overlayinfo/global/skin
%dir %{mozdir}/chrome/overlayinfo/global
%dir %{mozdir}/chrome/overlayinfo/communicator/content
%dir %{mozdir}/chrome/overlayinfo/communicator
%dir %{mozdir}/chrome/overlayinfo/editor/content
%dir %{mozdir}/chrome/overlayinfo/editor
%dir %{mozdir}/chrome/overlayinfo/navigator/content
%dir %{mozdir}/chrome/overlayinfo/navigator
%dir %{mozdir}/chrome/overlayinfo/cookie/content
%dir %{mozdir}/chrome/overlayinfo/cookie

%dir %{mozdir}/chrome/overlayinfo/messenger/content
%dir %{mozdir}/chrome/overlayinfo/messenger

%dir %{mozdir}/chrome/overlayinfo/inspector/content
%dir %{mozdir}/chrome/overlayinfo/inspector

%dir %{mozdir}/chrome/overlayinfo
%dir %{mozdir}/greprefs

%{_datadir}/applications/mozilla-%{name}.desktop
%{_datadir}/applications/mozilla-%{name}-mail.desktop


%changelog
* Mon Apr 10 2006 Kai Engert <kengert at redhat.com> 1.0-9
- Added dist suffix to release
* Fri Mar 17 2006 Kai Engert <kengert at redhat.com> 1.0-8
- Changed license to MPL
* Tue Mar 14 2006 Kai Engert <kengert at redhat.com> 1.0-7
- updated %files section, removed %preun,
- removed explicit nspr/nss requires
* Thu Mar 02 2006 Kai Engert <kengert at redhat.com> 1.0-6
- Use a single package for all included applications.
- Make sure installed JavaScript files are not executable.
- Disable AutoProv, use find-external-requires.
* Fri Feb 10 2006 Kai Engert <kengert at redhat.com> 1.0-4
- Addressed several review comments, see bugzilla.redhat.com #179802.
* Sat Jan 28 2006 Kai Engert <kengert at redhat.com> 1.0-1
- Initial version based on Seamonkey 1.0, using a combination of patches 
  from Mozilla 1.7.x, Firefox 1.5 and Thunderbird 1.5 RPM packages.

thunderbird-0.7.3-gnome-uriloader.patch:

--- NEW FILE thunderbird-0.7.3-gnome-uriloader.patch ---
--- mozilla/uriloader/exthandler/unix/nsGNOMERegistry.cpp.foo	2004-01-05 18:38:48.000000000 -0500
+++ mozilla/uriloader/exthandler/unix/nsGNOMERegistry.cpp	2004-01-05 19:14:51.000000000 -0500
@@ -39,6 +39,7 @@
 #include "nsGNOMERegistry.h"
 #include "prlink.h"
 #include "prmem.h"
+#include "prenv.h"
 #include "nsString.h"
 #include "nsIComponentManager.h"
 #include "nsILocalFile.h"
@@ -137,6 +138,10 @@
     } \
     PR_END_MACRO
 
+  // Don't even use this code if an env var is set
+  if (PR_GetEnv("MOZ_DISABLE_GNOME"))
+    return;
+
   // Attempt to open libgconf
   gconfLib = LoadVersionedLibrary("gconf-2", ".4");
   ENSURE_LIB(gconfLib);

thunderbird-1.5-bug304720.patch:

--- NEW FILE thunderbird-1.5-bug304720.patch ---
Index: mozilla/editor/txtsvc/src/nsTextServicesDocument.cpp
===================================================================
RCS file: /cvsroot/mozilla/editor/txtsvc/src/nsTextServicesDocument.cpp,v
retrieving revision 1.59
diff -u -w -r1.59 nsTextServicesDocument.cpp
--- mozilla/editor/txtsvc/src/nsTextServicesDocument.cpp	22 Aug 2005 03:00:03 -0000	1.59
+++ mozilla/editor/txtsvc/src/nsTextServicesDocument.cpp	21 Nov 2005 23:37:13 -0000
@@ -2494,6 +2494,8 @@
 nsresult
 nsTextServicesDocument::DeleteNode(nsIDOMNode *aChild)
 {
+  NS_ENSURE_TRUE(mIterator, NS_ERROR_FAILURE);
+
   //**** KDEBUG ****
   // printf("** DeleteNode: 0x%.8x\n", aChild);
   // fflush(stdout);


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	10 Apr 2006 21:41:15 -0000	1.1
+++ .cvsignore	10 Apr 2006 21:58:25 -0000	1.2
@@ -0,0 +1 @@
+seamonkey-1.0.source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	10 Apr 2006 21:41:15 -0000	1.1
+++ sources	10 Apr 2006 21:58:25 -0000	1.2
@@ -0,0 +1 @@
+e4f2edc5b2248d090303c70f5b28f210  seamonkey-1.0.source.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 10 22:01:52 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Mon, 10 Apr 2006 15:01:52 -0700
Subject: rpms/enchant/FC-4 .cvsignore, 1.7, 1.8 enchant.spec, 1.8,
	1.9 sources, 1.7, 1.8
Message-ID: <200604102202.k3AM2SsY030542@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/enchant/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30504

Modified Files:
	.cvsignore enchant.spec sources 
Log Message:
- New upstream version
- Add hspell requirement/support
- Package the data dir as well (bug 188516)




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/enchant/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	5 Feb 2006 21:35:42 -0000	1.7
+++ .cvsignore	10 Apr 2006 22:01:52 -0000	1.8
@@ -1 +1 @@
-enchant-1.2.2.tar.gz
+enchant-1.2.5.tar.gz


Index: enchant.spec
===================================================================
RCS file: /cvs/extras/rpms/enchant/FC-4/enchant.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- enchant.spec	5 Feb 2006 21:35:42 -0000	1.8
+++ enchant.spec	10 Apr 2006 22:01:52 -0000	1.9
@@ -1,6 +1,6 @@
 Summary: An Enchanting Spell Checking Library
 Name: enchant
-Version: 1.2.2
+Version: 1.2.5
 Release: 1%{?dist}
 Epoch: 1
 Group: System Environment/Libraries
@@ -9,6 +9,7 @@
 URL: http://www.abisource.com/
 BuildRequires: glib2-devel >= 2.0.0
 BuildRequires: aspell-devel
+BuildRequires: hspell-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -44,6 +45,7 @@
 %dir %{_libdir}/enchant
 %{_libdir}/enchant/lib*.so*
 %{_mandir}/man1/enchant.1.gz
+%{_datadir}/enchant
 
 %files devel
 %defattr(-,root,root)
@@ -61,6 +63,11 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 1:1.2.5-1.fc4
+- New upstream version
+- Add hspell requirement/support
+- Package the data dir as well (bug 188516)
+
 * Sun Feb 05 2006 Marc Maurer <uwog at abisource.com> 1:1.2.2-1.fc4
 - Update to 1.2.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/enchant/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	5 Feb 2006 21:35:42 -0000	1.7
+++ sources	10 Apr 2006 22:01:52 -0000	1.8
@@ -1 +1 @@
-ee7f8261bc607015633206f710671239  enchant-1.2.2.tar.gz
+e64ec808ed2cb687c242ebb835faeb61  enchant-1.2.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 22:02:48 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Mon, 10 Apr 2006 15:02:48 -0700
Subject: rpms/moomps/devel moomps.spec,1.11,1.12
Message-ID: <200604102202.k3AM2ocw030572@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moomps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30539

Modified Files:
	moomps.spec 
Log Message:
5.6 upstream release.



Index: moomps.spec
===================================================================
RCS file: /cvs/extras/rpms/moomps/devel/moomps.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- moomps.spec	7 Mar 2006 02:40:37 -0000	1.11
+++ moomps.spec	10 Apr 2006 22:02:47 -0000	1.12
@@ -1,10 +1,10 @@
 Name: moomps
-Version: 5.5
+Version: 5.6
 Release: 1%{?dist}
 Summary: Powerful modular monitoring service
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moomps-5.5.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moomps-5.6.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildArchitectures: noarch
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
@@ -13,7 +13,7 @@
 Requires(preun): /sbin/chkconfig, /sbin/service
 Requires(post): /sbin/chkconfig
 Requires(postun): /sbin/service
-Requires: moodss >= 21.1, tclx >= 8.3
+Requires: moodss >= 21.2, tclx >= 8.3
 
 %description
 moomps (Modular Object Oriented Multi-Purpose Service) is a modular
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Sat Mar 18 2006 Jean-Luc Fontaine <jfontain at free.fr> 5.6-1
+- 5.6 upstream release
+
 * Mon Mar 6 2006 Jean-Luc Fontaine <jfontain at free.fr> 5.5-1
 - 5.5 upstream release
 - in post installation stage, fix moodss modules path



From fedora-extras-commits at redhat.com  Mon Apr 10 22:05:25 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Mon, 10 Apr 2006 15:05:25 -0700
Subject: rpms/moomps/FC-5 .cvsignore, 1.7, 1.8 moomps.spec, 1.11,
	1.12 sources, 1.7, 1.8
Message-ID: <200604102205.k3AM5RIJ030754@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moomps/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30721

Modified Files:
	.cvsignore moomps.spec sources 
Log Message:
5.6 upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	7 Mar 2006 02:37:09 -0000	1.7
+++ .cvsignore	10 Apr 2006 22:05:25 -0000	1.8
@@ -1,2 +1,3 @@
 moomps-5.4.tar.bz2
 moomps-5.5.tar.bz2
+moomps-5.6.tar.bz2


Index: moomps.spec
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-5/moomps.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- moomps.spec	7 Mar 2006 02:40:37 -0000	1.11
+++ moomps.spec	10 Apr 2006 22:05:25 -0000	1.12
@@ -1,10 +1,10 @@
 Name: moomps
-Version: 5.5
+Version: 5.6
 Release: 1%{?dist}
 Summary: Powerful modular monitoring service
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moomps-5.5.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moomps-5.6.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildArchitectures: noarch
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
@@ -13,7 +13,7 @@
 Requires(preun): /sbin/chkconfig, /sbin/service
 Requires(post): /sbin/chkconfig
 Requires(postun): /sbin/service
-Requires: moodss >= 21.1, tclx >= 8.3
+Requires: moodss >= 21.2, tclx >= 8.3
 
 %description
 moomps (Modular Object Oriented Multi-Purpose Service) is a modular
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Sat Mar 18 2006 Jean-Luc Fontaine <jfontain at free.fr> 5.6-1
+- 5.6 upstream release
+
 * Mon Mar 6 2006 Jean-Luc Fontaine <jfontain at free.fr> 5.5-1
 - 5.5 upstream release
 - in post installation stage, fix moodss modules path


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	7 Mar 2006 02:37:09 -0000	1.7
+++ sources	10 Apr 2006 22:05:25 -0000	1.8
@@ -1,2 +1,3 @@
 37045d89b50a78f5f6f445cc4d897c62  moomps-5.4.tar.bz2
 249a456d2db2dbc5ed95f31d926d063d  moomps-5.5.tar.bz2
+f2cf3e281df6e004889672dc11b1d505  moomps-5.6.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 10 22:07:48 2006
From: fedora-extras-commits at redhat.com (Jean-Luc Fontaine (jfontain))
Date: Mon, 10 Apr 2006 15:07:48 -0700
Subject: rpms/moomps/FC-4 .cvsignore, 1.7, 1.8 moomps.spec, 1.9, 1.10 sources,
	1.7, 1.8
Message-ID: <200604102207.k3AM7oht030866@cvs-int.fedora.redhat.com>

Author: jfontain

Update of /cvs/extras/rpms/moomps/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30838

Modified Files:
	.cvsignore moomps.spec sources 
Log Message:
5.6 upstream release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	7 Mar 2006 02:55:30 -0000	1.7
+++ .cvsignore	10 Apr 2006 22:07:48 -0000	1.8
@@ -1,2 +1,3 @@
 moomps-5.4.tar.bz2
 moomps-5.5.tar.bz2
+moomps-5.6.tar.bz2


Index: moomps.spec
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-4/moomps.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- moomps.spec	7 Mar 2006 02:55:30 -0000	1.9
+++ moomps.spec	10 Apr 2006 22:07:48 -0000	1.10
@@ -1,10 +1,10 @@
 Name: moomps
-Version: 5.5
+Version: 5.6
 Release: 1%{?dist}
 Summary: Powerful modular monitoring service
 Group: Applications/System
 License: GPL
-Source0: http://download.sourceforge.net/moodss/moomps-5.5.tar.bz2
+Source0: http://download.sourceforge.net/moodss/moomps-5.6.tar.bz2
 URL: http://moodss.sourceforge.net/
 BuildArchitectures: noarch
 BuildRoot: %_tmppath/%name-%version-%release-root-%(%__id_u -n)
@@ -13,7 +13,7 @@
 Requires(preun): /sbin/chkconfig, /sbin/service
 Requires(post): /sbin/chkconfig
 Requires(postun): /sbin/service
-Requires: moodss >= 21.1, tclx >= 8.3
+Requires: moodss >= 21.2, tclx >= 8.3
 
 %description
 moomps (Modular Object Oriented Multi-Purpose Service) is a modular
@@ -81,6 +81,9 @@
 
 
 %changelog
+* Sat Mar 18 2006 Jean-Luc Fontaine <jfontain at free.fr> 5.6-1
+- 5.6 upstream release
+
 * Mon Mar 6 2006 Jean-Luc Fontaine <jfontain at free.fr> 5.5-1
 - 5.5 upstream release
 - in post installation stage, fix moodss modules path


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/moomps/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	7 Mar 2006 02:55:30 -0000	1.7
+++ sources	10 Apr 2006 22:07:48 -0000	1.8
@@ -1,2 +1,3 @@
 37045d89b50a78f5f6f445cc4d897c62  moomps-5.4.tar.bz2
 249a456d2db2dbc5ed95f31d926d063d  moomps-5.5.tar.bz2
+f2cf3e281df6e004889672dc11b1d505  moomps-5.6.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 10 22:20:06 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Mon, 10 Apr 2006 15:20:06 -0700
Subject: rpms/enchant/FC-3 .cvsignore, 1.6, 1.7 enchant.spec, 1.7,
	1.8 sources, 1.6, 1.7
Message-ID: <200604102220.k3AMK85b030977@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/enchant/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30956

Modified Files:
	.cvsignore enchant.spec sources 
Log Message:
- New upstream version
- Add hspell requirement/support
- Package the data dir as well (bug 188516)




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/enchant/FC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	5 Feb 2006 21:38:57 -0000	1.6
+++ .cvsignore	10 Apr 2006 22:20:05 -0000	1.7
@@ -1 +1 @@
-enchant-1.2.2.tar.gz
+enchant-1.2.5.tar.gz


Index: enchant.spec
===================================================================
RCS file: /cvs/extras/rpms/enchant/FC-3/enchant.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- enchant.spec	5 Feb 2006 21:38:57 -0000	1.7
+++ enchant.spec	10 Apr 2006 22:20:05 -0000	1.8
@@ -1,6 +1,6 @@
 Summary: An Enchanting Spell Checking Library
 Name: enchant
-Version: 1.2.2
+Version: 1.2.5
 Release: 1%{?dist}
 Epoch: 1
 Group: System Environment/Libraries
@@ -9,6 +9,7 @@
 URL: http://www.abisource.com/
 BuildRequires: glib2-devel >= 2.0.0
 BuildRequires: aspell-devel
+BuildRequires: hspell-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 %description
@@ -44,6 +45,7 @@
 %dir %{_libdir}/enchant
 %{_libdir}/enchant/lib*.so*
 %{_mandir}/man1/enchant.1.gz
+%{_datadir}/enchant
 
 %files devel
 %defattr(-,root,root)
@@ -61,6 +63,11 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 1:1.2.5-1.fc3
+- New upstream version
+- Add hspell requirement/support
+- Package the data dir as well (bug 188516)
+
 * Sun Feb 05 2006 Marc Maurer <uwog at abisource.com> 1:1.2.2-1.fc3
 - Update to 1.2.2
 - Drop redundant glib require


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/enchant/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	5 Feb 2006 21:38:57 -0000	1.6
+++ sources	10 Apr 2006 22:20:05 -0000	1.7
@@ -1 +1 @@
-ee7f8261bc607015633206f710671239  enchant-1.2.2.tar.gz
+e64ec808ed2cb687c242ebb835faeb61  enchant-1.2.5.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 10 22:53:34 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Mon, 10 Apr 2006 15:53:34 -0700
Subject: kadischi/livecd_generator kadischi.py,1.9,1.10
Message-ID: <200604102253.k3AMrY0v031509@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi/livecd_generator
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31479/kadischi/livecd_generator

Modified Files:
	kadischi.py 
Log Message:
Alleviate dependance on lokkit, allow user configuration.


Index: kadischi.py
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/kadischi.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kadischi.py	4 Apr 2006 13:43:13 -0000	1.9
+++ kadischi.py	10 Apr 2006 22:53:32 -0000	1.10
@@ -253,7 +253,7 @@
 
 for script in scripts:
     flc_log ('%s' % script)
-    run ("%s %s" % (script, sysdir), builddir)
+    run ("%s %s %s" % (script, sysdir, anaconda_args), builddir)
 
 # make initrd image
 



From fedora-extras-commits at redhat.com  Mon Apr 10 22:53:34 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Mon, 10 Apr 2006 15:53:34 -0700
Subject: kadischi/post_install_scripts 04userconfig.py, NONE, 1.1 Makefile.am,
	1.2, 1.3 04auth.sh, 1.3, NONE
Message-ID: <200604102253.k3AMrYGH031515@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi/post_install_scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31479/kadischi/post_install_scripts

Modified Files:
	Makefile.am 
Added Files:
	04userconfig.py 
Removed Files:
	04auth.sh 
Log Message:
Alleviate dependance on lokkit, allow user configuration.


--- NEW FILE 04userconfig.py ---
#!/usr/bin/python -tt
#
# Chroot, run some configuration for non kickstart and cmdline methods.

import os
import sys
import string
from functions import run
from functions import flc_log

sysdir = sys.argv[1]

try:
    anaconda_args = sys.argv[2:]
except IndexError:
    anaconda_args = None

config_done = False

if os.path.isfile("/usr/sbin/authconfig"):
    run("chroot %s %s" % (sysdir, "/usr/sbin/authconfig --kickstart --nostart --enableshadow --enablemd5 --disablecache --disablenis --disableldap --disableldapauth --disableldaptls --disablekrb5 --disablehesiod --disablesmbauth"))

while config_done == False:
    if anaconda_args != None:
        for args in anaconda_args:
            if args.startswith("--kickstart") or args.startswith("--cmdline") or args.startswith("-C"):
                flc_log("Skipping interactive user configuration..")
                config_done = True
                sys.exit(0)
            else:
                if os.path.isfile("/usr/sbin/lokkit") and os.path.isfile("/usr/sbin/ntsysv"):
                    flc_log("Taking you to interactive user configuration..")
                    run("chroot %s %s" % (sysdir, "/usr/sbin/lokkit"))
                    run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv"))
                    config_done = True   
    else:
        if os.path.isfile("/usr/sbin/lokkit") and os.path.isfile("/usr/sbin/ntsysv"):
            flc_log("Taking you to interactive user configuration..")
            run("chroot %s %s" % (sysdir, "/usr/sbin/lokkit"))
            run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv"))
            config_done = True


Index: Makefile.am
===================================================================
RCS file: /cvs/devel/kadischi/post_install_scripts/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Makefile.am	17 Mar 2006 22:42:27 -0000	1.2
+++ Makefile.am	10 Apr 2006 22:53:32 -0000	1.3
@@ -1,5 +1,5 @@
-PYTHON_FILES = 03fstab.py 05fsclean.py 06sysconfig.py
-BASH_FILES = 01prelink.sh 02install.sh 04auth.sh
+PYTHON_FILES = 03fstab.py 04userconfig.py 05fsclean.py 06sysconfig.py
+BASH_FILES = 01prelink.sh 02install.sh
 
 pisdir = $(pkgdatadir)/post_install_scripts
 pis_SCRIPTS = $(PYTHON_FILES) $(BASH_FILES)


--- 04auth.sh DELETED ---



From fedora-extras-commits at redhat.com  Mon Apr 10 23:22:23 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Mon, 10 Apr 2006 16:22:23 -0700
Subject: kadischi kadischi.spec,NONE,1.1
Message-ID: <200604102322.k3ANMNaA001187@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1159/kadischi

Added Files:
	kadischi.spec 
Log Message:
Addition of kadischi.spec file


--- NEW FILE kadischi.spec ---
%define		alphatag	%(date +%%Y%%m%%d)cvs

Name:           kadischi
Version:        0.1
Release:        6.%{alphatag}
Summary:        LiveCD generation utility 

Group:          Applications/System
License:        GPL
URL:            http://fedoraproject.org/wiki/Kadischi
Source0:        kadischi.tar.bz2
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  kudzu-devel glib2-devel intltool autoconf automake
Requires:       python anaconda busybox-anaconda syslinux mkisofs zisofs-tools squashfs-tools e2fsprogs
AutoReqProv:    off

%description
Kadischi is a LiveCD generation tool for Fedora Core systems.
Live media made with Kadischi can be written to a CD or DVD
and run without any prior installation of Fedora Core.

%prep
%setup -q -n %{name}


%build
glib-gettextize --copy --force
intltoolize --copy -f --automake
aclocal -I .
autoconf
automake --add-missing --copy
%configure
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc
%dir %{_datadir}/%{name}
%dir %{_sysconfdir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/buildstamp
%config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
%{_bindir}/%{name}
%{_datadir}/%{name}/*.sh
%{_datadir}/%{name}/*.py
%{_datadir}/%{name}/lib/*.py
%{_datadir}/%{name}/post_install_scripts/*.sh
%{_datadir}/%{name}/post_install_scripts/*.py
%{_datadir}/%{name}/initrd/find-live-cd
%{_datadir}/%{name}/initrd/livecd-linuxrc
%{_datadir}/%{name}/ks_examples/minimal-livecd.cfg
%{_datadir}/%{name}/patches/*.patch
%{_datadir}/%{name}/install/readonly-root
%{_datadir}/%{name}/install/rc.readonly-livecd
%{_datadir}/%{name}/install/readonly-halt
%{_datadir}/%{name}/install/scanswap
%{_datadir}/%{name}/bootsplash/*.msg
%{_datadir}/%{name}/bootsplash/splash.lss
%{_datadir}/%{name}/bootsplash/memtest
%{_mandir}/man1/%{name}.1.gz
%{_mandir}/man5/%{name}.conf.5.gz
%ghost %{_datadir}/%{name}/*.pyc
%ghost %{_datadir}/%{name}/*.pyo
%ghost %{_datadir}/%{name}/lib/*.pyc
%ghost %{_datadir}/%{name}/lib/*.pyo
%ghost %{_datadir}/%{name}/post_install_scripts/*.pyc
%ghost %{_datadir}/%{name}/post_install_scripts/*.pyo

%changelog
* Mon Apr 10 2006 Jasper Hartline <jasperhartline at adelphia.net>
- Rewrote .spec file to conform to standards
- Contributors: Toshio Kuratomi <toshio at tiki-lounge.com>
                Chitlesh Goorah <chitlesh at fedoraproject.org>
                Rudolf Kastl <che666 at gmail.com>



From fedora-extras-commits at redhat.com  Mon Apr 10 23:22:23 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Mon, 10 Apr 2006 16:22:23 -0700
Subject: kadischi/man Makefile.am,1.1,1.2
Message-ID: <200604102322.k3ANMNKi001193@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi/man
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1159/kadischi/man

Modified Files:
	Makefile.am 
Log Message:
Addition of kadischi.spec file


Index: Makefile.am
===================================================================
RCS file: /cvs/devel/kadischi/man/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile.am	30 Mar 2006 05:51:46 -0000	1.1
+++ Makefile.am	10 Apr 2006 23:22:21 -0000	1.2
@@ -2,6 +2,7 @@
 man_DOC = kadischi.1 kadischi.conf.5
 
 install-data-hook:
+	mkdir -p $(DESTDIR)$(mandir)/{man1,man5}
 	install -m644 kadischi.1 $(DESTDIR)$(mandir)/man1/kadischi.1
 	install -m644 kadischi.conf.5 $(DESTDIR)$(mandir)/man5/kadischi.conf.5
 



From fedora-extras-commits at redhat.com  Mon Apr 10 23:35:23 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Mon, 10 Apr 2006 16:35:23 -0700
Subject: rpms/abiword/FC-5 abiword-2.4.4-desktop.patch, NONE, 1.1 .cvsignore,
	1.13, 1.14 abiword.spec, 1.32, 1.33 sources, 1.13,
	1.14 abiword-2.4.2-desktop.patch, 1.1,
	NONE abiword-2.4.2-macros.patch, 1.1, NONE
Message-ID: <200604102335.k3ANZP1A001250@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/abiword/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1226

Modified Files:
	.cvsignore abiword.spec sources 
Added Files:
	abiword-2.4.4-desktop.patch 
Removed Files:
	abiword-2.4.2-desktop.patch abiword-2.4.2-macros.patch 
Log Message:
New upstream version



abiword-2.4.4-desktop.patch:

--- NEW FILE abiword-2.4.4-desktop.patch ---
diff -r -u abiword-2.4.4.orig/abi/abiword.desktop abiword-2.4.4/abi/abiword.desktop
--- abiword-2.4.4.orig/abi/abiword.desktop	2006-04-03 14:14:01.000000000 +0200
+++ abiword-2.4.4/abi/abiword.desktop	2006-04-11 00:12:19.000000000 +0200
@@ -7,7 +7,7 @@
 StartupNotify=true
 Encoding=UTF-8
 X-Desktop-File-Install-Version=0.9
-MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;
+MimeType=application/msword;application/vnd.sun.xml.writer;application/vnd.wordperfect;application/x-abiword;text/x-abiword;text/x-xml-abiword;application/rtf;text/plain;application/xhtml+xml;text/html;text/vnd.wap.wml;application/vnd.plain;application/vnd.stardivision.writer;application/x-mif;application/x-kword;application/x-applix-word;application/x-mswrite;application/vnd.oasis.opendocument.text;
 Name=AbiWord
 GenericName=Word Processor
 Comment=AbiWord Word Processor


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-5/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	5 Jan 2006 14:57:02 -0000	1.13
+++ .cvsignore	10 Apr 2006 23:35:23 -0000	1.14
@@ -1 +1 @@
-abiword-2.4.2.tar.bz2
+abiword-2.4.4.tar.bz2


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-5/abiword.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- abiword.spec	8 Mar 2006 22:43:40 -0000	1.32
+++ abiword.spec	10 Apr 2006 23:35:23 -0000	1.33
@@ -2,8 +2,8 @@
 
 Summary: The AbiWord word processor
 Name: abiword
-Version: 2.4.2
-Release: 7%{?dist}
+Version: 2.4.4
+Release: 1%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -30,7 +30,7 @@
 BuildRequires: librsvg2-devel
 BuildRequires: libwmf-devel
 BuildRequires: aiksaurus-gtk-devel >= 1.2.1
-BuildRequires: link-grammar-devel >= 4.1.3
+BuildRequires: link-grammar-devel >= 4.2.1
 BuildRequires: gtkmathview-devel >= 0.7.5
 BuildRequires: libgsf-devel >= 1.12.1
 
@@ -41,8 +41,7 @@
 URL: http://www.abisource.com/
 
 Patch0: abiword-2.0.9-windowshelppaths.patch
-Patch1: abiword-2.4.2-desktop.patch
-Patch2: abiword-2.4.2-macros.patch
+Patch1: abiword-2.4.4-desktop.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. The goal is to make
@@ -52,7 +51,6 @@
 %setup -q 
 %patch0 -p1 -b .windowshelppaths
 %patch1 -p1 -b .desktop
-%patch2 -p1 -b .macros
 
 %build
 cd abi
@@ -134,6 +132,10 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.4-1.fc5
+- New upstream version
+- Remove the macro patch and update the desktop patch
+
 * Wed Mar 08 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.2-7.fc5
 - Disable the collaboration plugin; it is not working in 2.4.x
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	5 Jan 2006 14:57:02 -0000	1.13
+++ sources	10 Apr 2006 23:35:23 -0000	1.14
@@ -1 +1 @@
-935f1218eab7ff96b7a23cfeba4e76d1  abiword-2.4.2.tar.bz2
+69dd69179b861a41613291afd10af9ab  abiword-2.4.4.tar.bz2


--- abiword-2.4.2-desktop.patch DELETED ---


--- abiword-2.4.2-macros.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 11 00:01:24 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon, 10 Apr 2006 17:01:24 -0700
Subject: owners owners.list,1.830,1.831
Message-ID: <200604110001.k3B01uQ1003397@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3038

Modified Files:
	owners.list 
Log Message:
Added yadex, a doom level editor




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.830
retrieving revision 1.831
diff -u -r1.830 -r1.831
--- owners.list	10 Apr 2006 20:46:05 -0000	1.830
+++ owners.list	11 Apr 2006 00:01:23 -0000	1.831
@@ -1595,6 +1595,7 @@
 Fedora Extras|xsupplicant|Open Source Implementation of IEEE 802.1x|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|xtide|A program for calculating tide all over the world|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|xvattr|Utility for getting and setting Xv attributes|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|yadex|A DOOM level editor|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|yakuake|A Quake-like terminal application|dreadyman at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|yap|High-performance Prolog Compiler|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|yasm|Complete rewrite of the NASM assembler|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Apr 11 00:44:24 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Mon, 10 Apr 2006 17:44:24 -0700
Subject: rpms/seamonkey/devel seamonkey.spec,1.1,1.2
Message-ID: <200604110044.k3B0iQE8003645@cvs-int.fedora.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/seamonkey/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3628

Modified Files:
	seamonkey.spec 
Log Message:
* Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-10
- Added libXt-devel BuildRequires



Index: seamonkey.spec
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/devel/seamonkey.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- seamonkey.spec	10 Apr 2006 21:58:25 -0000	1.1
+++ seamonkey.spec	11 Apr 2006 00:44:24 -0000	1.2
@@ -10,7 +10,7 @@
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
 Version:        1.0
-Release:        9%{?dist}
+Release:        10%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPL
 Group:          Applications/Internet
@@ -57,6 +57,7 @@
 BuildRequires:  libIDL-devel
 BuildRequires:  glib2-devel
 BuildRequires:  gtk2-devel
+BuildRequires:  libXt-devel
 BuildRequires:  pango-devel >= %{pango_version}
 BuildRequires:  nspr-devel >= %{nspr_version}
 BuildRequires:  nss-devel >= %{nss_version}
@@ -407,6 +408,8 @@
 
 
 %changelog
+* Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-10
+- Added libXt-devel BuildRequires
 * Mon Apr 10 2006 Kai Engert <kengert at redhat.com> 1.0-9
 - Added dist suffix to release
 * Fri Mar 17 2006 Kai Engert <kengert at redhat.com> 1.0-8



From fedora-extras-commits at redhat.com  Tue Apr 11 01:50:23 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon, 10 Apr 2006 18:50:23 -0700
Subject: rpms/rogue/devel rogue-5.4-setgid.patch, NONE, 1.1 rogue.png, 1.1, 
	1.2 rogue.spec, 1.3, 1.4
Message-ID: <200604110150.k3B1oP5b005833@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/rogue/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5812

Modified Files:
	rogue.png rogue.spec 
Added Files:
	rogue-5.4-setgid.patch 
Log Message:
Better setuid/setgid handling (BZ #187392)
Resize desktop icon to match directory name



rogue-5.4-setgid.patch:

--- NEW FILE rogue-5.4-setgid.patch ---
diff -Naur --exclude '*.swp' rogue/extern.c rogue.new/extern.c
--- rogue/extern.c	2006-01-03 16:17:29.000000000 -0800
+++ rogue.new/extern.c	2006-03-30 13:24:12.000000000 -0800
@@ -111,7 +111,7 @@
 };
 
 int count = 0;				/* Number of times to repeat command */
-int fd;					/* File descriptor for score file */
+FILE *scoreboard = (FILE *)NULL;	/* File descriptor for score file */
 int food_left;				/* Amount of food in hero's stomach */
 int lastscore = -1;			/* Score before this turn */
 int no_command = 0;			/* Number of turns asleep */
diff -Naur --exclude '*.swp' rogue/extern.h rogue.new/extern.h
--- rogue/extern.h	2006-03-19 11:22:14.000000000 -0800
+++ rogue.new/extern.h	2006-03-30 13:24:22.000000000 -0800
@@ -50,7 +50,7 @@
 
 extern char	fruit[], orig_dsusp, prbuf[], whoami[];
 
-extern int	fd;
+extern FILE     *scoreboard;
 
 #ifdef TIOCGLTC
 extern struct ltchars	ltc;
diff -Naur --exclude '*.swp' rogue/mach_dep.c rogue.new/mach_dep.c
--- rogue/mach_dep.c	2006-01-30 08:36:21.000000000 -0800
+++ rogue.new/mach_dep.c	2006-04-01 19:26:15.000000000 -0800
@@ -45,7 +45,9 @@
 #include <sys/stat.h>
 #include <limits.h>
 
+#include <unistd.h>
 #include <fcntl.h>
+#include <errno.h>
 
 static char scorefile[PATH_MAX] = "rogue54.scr";
 static char lockfile[PATH_MAX] = "rogue54.lck";
@@ -99,22 +101,41 @@
 {
     char *homedir = md_getroguedir();
 
+    /*
+     * We drop setgid privileges after opening the score file, so subsequent
+     * open()'s will fail.  Just reuse the earlier filehandle.
+     */
+    if (scoreboard != NULL) {
+        rewind(scoreboard);
+        return;
+    }
+
     if (homedir == NULL)
         homedir = "";
 
 #ifdef SCOREFILE
-    strcpy(scorefile, homedir);
-    if (*scorefile)
-        strcat(scorefile,"/");
-    strcat(scorefile, "rogue54.scr");
-    strcpy(lockfile, homedir);
-    if (*lockfile)
-        strcat(lockfile, "/");
-    strcat(lockfile, "rogue54.lck");
-    fd = open(scorefile, O_RDWR | O_CREAT, 0666);
+    if (*homedir) {
+        snprintf(scorefile, PATH_MAX, "%s/rogue54.scr", homedir);
+    } else {
+        strcpy(scorefile, "rogue54.scr");
+    }
+
+    if (*homedir) {
+        snprintf(lockfile, PATH_MAX, "%s/rogue54.lck", homedir);
+    } else {
+        strcpy(scorefile, "rogue54.lck");
+    }
+    scoreboard = fopen(scorefile, "r+");
+    if (scoreboard == NULL) {
+        fprintf(stderr, "Could not open %s for writing: %s\n", scorefile, strerror(errno));
+        fflush(stderr);
+    }
 #else
-    fd = -1;
+    scoreboard = NULL;
 #endif
+    /*
+     * Drop setuid/setgid after opening the scoreboard file.
+     */
     md_normaluser();
 }
 
diff -Naur --exclude '*.swp' rogue/main.c rogue.new/main.c
--- rogue/main.c	2006-01-29 16:11:32.000000000 -0800
+++ rogue.new/main.c	2006-03-30 13:40:16.000000000 -0800
@@ -24,6 +24,13 @@
     char *env;
     int lowtime;
 
+    /*
+     * Open the scoreboard file and drop setuid/setgid privileges immediately.
+     * open_score() calls md_normaluser() to drop privileges, so we don't have
+     * to do it here explicitly.
+     */
+    open_score();
+
     md_init();
 
 #ifndef DUMP
@@ -89,7 +96,6 @@
     /*
      * check for print-score option
      */
-    open_score();
     if (argc == 2)
 	if (strcmp(argv[1], "-s") == 0)
 	{
diff -Naur --exclude '*.swp' rogue/mdport.c rogue.new/mdport.c
--- rogue/mdport.c	2006-01-29 18:24:39.000000000 -0800
+++ rogue.new/mdport.c	2006-04-01 19:26:16.000000000 -0800
@@ -193,8 +193,17 @@
 md_normaluser()
 {
 #ifndef _WIN32
-    setuid(getuid());
-    setgid(getgid());
+    gid_t realgid = getgid();
+    uid_t realuid = getuid();
+
+    if (setresgid(-1, realgid, realgid) != 0) {
+        perror("Could not drop setgid privileges.  Aborting.");
+        exit(1);
+    }
+    if (setresuid(-1, realuid, realuid) != 0) {
+        perror("Could not drop setuid privileges.  Aborting.");
+        exit(1);
+    }
 #endif
 }
 
@@ -397,22 +406,31 @@
 char *
 md_getroguedir()
 {
-    static char path[1024];
+    static char path[PATH_MAX];
     char *end,*home;
 
     if ( (home = getenv("ROGUEHOME")) != NULL)
     {
         if (*home)
         {
-            strncpy(path, home, PATH_MAX - 20);
-
-            end = &path[strlen(path)-1];
-
-            while( (end >= path) && ((*end == '/') || (*end == '\\')))
-                *end-- = '\0';
-
-            if (directory_exists(path))
-                return(path);
+            if (strlen(home) > PATH_MAX-20) {
+                fprintf(stderr, "ROGUEHOME path is too long.  Ignoring.\n");
+            } else {
+                strncpy(path, home, PATH_MAX-20);
+                /* Ensure that we have a terminating NULL character.
+                 */
+                path[PATH_MAX-1] = (char)NULL;
+    
+                end = &path[strlen(path)-1];
+    
+                /* Strip off any trailing path separators from the path.
+                 */
+                while( (end >= path) && ((*end == '/') || (*end == '\\')))
+                    *end-- = '\0';
+    
+                if (directory_exists(path))
+                    return(path);
+            }
         }
     }
 
diff -Naur --exclude '*.swp' rogue/rip.c rogue.new/rip.c
--- rogue/rip.c	2006-01-03 16:17:29.000000000 -0800
+++ rogue.new/rip.c	2006-03-30 13:32:17.000000000 -0800
@@ -60,7 +60,6 @@
     int i;
     SCORE *sc2;
     SCORE *top_ten, *endp;
-    FILE *outf;
 # ifdef MASTER
     int prflags = 0;
 # endif
@@ -96,11 +95,7 @@
 	    delwin(hw);
     }
 
-    if (fd >= 0)
-	outf = (FILE *)fdopen(fd, "w");
-    else
-	return;
-
+    open_score();
     top_ten = (SCORE *) malloc(numscores * sizeof (SCORE));
     endp = &top_ten[numscores];
     for (scp = top_ten; scp < endp; scp++)
@@ -123,11 +118,9 @@
 	else if (strcmp(prbuf, "edit") == 0)
 	    prflags = 2;
 #endif
-    rd_score(top_ten, fd);
-    fclose(outf);
-    close(fd);
-    open_score(0);
-    outf = (FILE *) fdopen(fd, "w");
+    open_score();
+    rd_score(top_ten, scoreboard);
+    open_score();
     /*
      * Insert her in list if need be
      */
@@ -222,7 +215,7 @@
 	else
 	    break;
     }
-    fseek(outf, 0L, SEEK_SET);
+    fseek(scoreboard, 0L, SEEK_SET);
     /*
      * Update the list file
      */
@@ -231,12 +224,11 @@
 	if (lock_sc())
 	{
 	    fp = signal(SIGINT, SIG_IGN);
-	    wr_score(top_ten, outf);
+	    wr_score(top_ten, scoreboard);
 	    unlock_sc();
 	    signal(SIGINT, fp);
 	}
     }
-    fclose(outf);
 }
 
 /*
diff -Naur --exclude '*.swp' rogue/save.c rogue.new/save.c
--- rogue/save.c	2006-01-30 08:05:35.000000000 -0800
+++ rogue.new/save.c	2006-03-30 13:33:45.000000000 -0800
@@ -335,7 +335,40 @@
 
 /*
  * encread:
- *	Perform an encrypted read
+ *	Perform an encrypted read from a FILE stream
+ */
+size_t
+encread_fromstream(char *start, size_t size, FILE *inf)
+{
+    char *e1, *e2, fb;
+    int temp, read_size;
+    extern char statlist[];
+
+    fb = frob;
+
+    if ((read_size = fread(start, size, 1, inf)) == 0 || read_size == -1)
+	return(read_size);
+
+    e1 = encstr;
+    e2 = statlist;
+
+    while (size--)
+    {
+	*start++ ^= *e1 ^ *e2 ^ fb;
+	temp = *e1++;
+	fb += temp * *e2++;
+	if (*e1 == '\0')
+	    e1 = encstr;
+	if (*e2 == '\0')
+	    e2 = statlist;
+    }
+
+    return(read_size);
+}
+
+/*
+ * encread
+ *	Perform an encrypted read from a file descriptor
  */
 size_t
 encread(char *start, size_t size, int inf)
@@ -371,14 +404,14 @@
  * read_scrore
  *	Read in the score file
  */
-rd_score(SCORE *top_ten, int fd)
+rd_score(SCORE *top_ten, FILE *fd)
 {
     unsigned int i;
 
     for(i = 0; i < numscores; i++)
     {
-        encread(top_ten[i].sc_name, MAXSTR, fd);
-        encread(scoreline, 100, fd);
+        encread_fromstream(top_ten[i].sc_name, MAXSTR, fd);
+        encread_fromstream(scoreline, 100, fd);
         sscanf(scoreline, " %u %hu %u %hu %hu %lx \n",
             &top_ten[i].sc_uid, &top_ten[i].sc_score,
             &top_ten[i].sc_flags, &top_ten[i].sc_monster,
diff -Naur --exclude '*.swp' rogue/state.c rogue.new/state.c
--- rogue/state.c	2006-01-03 16:17:29.000000000 -0800
+++ rogue.new/state.c	2006-03-30 13:09:46.000000000 -0800
@@ -2138,7 +2138,8 @@
     rs_write_int(savef, no_food);
     rs_write_ints(savef,a_class,MAXARMORS);
     rs_write_int(savef, count);
-    rs_write_int(savef, fd);
+    // Don't bother saving the file descriptor anymore.
+    rs_write_int(savef, -1);
     rs_write_int(savef, food_left);
     rs_write_int(savef, lastscore);
     rs_write_int(savef, no_command);
@@ -2275,7 +2276,8 @@
     rs_read_int(inf, &no_food);
     rs_read_ints(inf,a_class,MAXARMORS);
     rs_read_int(inf, &count);
-    rs_read_int(inf, &fd);
+    // Read the file descriptor, but ignore it.
+    rs_read_int(inf, &junk3);
     rs_read_int(inf, &food_left);
     rs_read_int(inf, &lastscore);
     rs_read_int(inf, &no_command);


Index: rogue.spec
===================================================================
RCS file: /cvs/extras/rpms/rogue/devel/rogue.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rogue.spec	13 Mar 2006 19:45:45 -0000	1.3
+++ rogue.spec	11 Apr 2006 01:50:23 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           rogue
 Version:        5.4.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        The original graphical adventure game
 
 Group:          Amusements/Games
@@ -11,6 +11,7 @@
 Source2:        rogue.png
 Patch0:         rogue-rpmopts.patch
 Patch1:         rogue-includes.patch
+Patch2:         rogue-5.4-setgid.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -24,6 +25,7 @@
 %setup -q -c -n %{name}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 %{__sed} -i 's/\r//' rogue54.html
 %{__sed} -i 's/\r//' readme54.html
 chmod a-x *.c *.h
@@ -76,6 +78,10 @@
 
 
 %changelog
+* Thu Mar 30 2006 Wart <wart at kobold.org> 5.4.2-4
+- Better setuid/setgid handling (BZ #187392)
+- Resize desktop icon to match directory name
+
 * Mon Mar 13 2006 Wart <wart at kobold.org> 5.4.2-3
 - Added icon for .desktop file.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 02:02:20 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon, 10 Apr 2006 19:02:20 -0700
Subject: rpms/rogue/FC-5 rogue.png,1.1,1.2 rogue.spec,1.3,1.4
Message-ID: <200604110202.k3B22rip007918@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/rogue/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7897

Modified Files:
	rogue.png rogue.spec 
Log Message:
Better setuid/setgid handling (BZ #187392)
Resize desktop icon to match directory name




Index: rogue.spec
===================================================================
RCS file: /cvs/extras/rpms/rogue/FC-5/rogue.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rogue.spec	13 Mar 2006 19:45:45 -0000	1.3
+++ rogue.spec	11 Apr 2006 02:02:20 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           rogue
 Version:        5.4.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        The original graphical adventure game
 
 Group:          Amusements/Games
@@ -11,6 +11,7 @@
 Source2:        rogue.png
 Patch0:         rogue-rpmopts.patch
 Patch1:         rogue-includes.patch
+Patch2:         rogue-5.4-setgid.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -24,6 +25,7 @@
 %setup -q -c -n %{name}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 %{__sed} -i 's/\r//' rogue54.html
 %{__sed} -i 's/\r//' readme54.html
 chmod a-x *.c *.h
@@ -76,6 +78,10 @@
 
 
 %changelog
+* Thu Mar 30 2006 Wart <wart at kobold.org> 5.4.2-4
+- Better setuid/setgid handling (BZ #187392)
+- Resize desktop icon to match directory name
+
 * Mon Mar 13 2006 Wart <wart at kobold.org> 5.4.2-3
 - Added icon for .desktop file.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 02:04:46 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon, 10 Apr 2006 19:04:46 -0700
Subject: rpms/rogue/FC-5 rogue-5.4-setgid.patch,NONE,1.1
Message-ID: <200604110204.k3B24mq2007982@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/rogue/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7964

Added Files:
	rogue-5.4-setgid.patch 
Log Message:
Better setuid/setgid handling (BZ #187392)



rogue-5.4-setgid.patch:

--- NEW FILE rogue-5.4-setgid.patch ---
diff -Naur --exclude '*.swp' rogue/extern.c rogue.new/extern.c
--- rogue/extern.c	2006-01-03 16:17:29.000000000 -0800
+++ rogue.new/extern.c	2006-03-30 13:24:12.000000000 -0800
@@ -111,7 +111,7 @@
 };
 
 int count = 0;				/* Number of times to repeat command */
-int fd;					/* File descriptor for score file */
+FILE *scoreboard = (FILE *)NULL;	/* File descriptor for score file */
 int food_left;				/* Amount of food in hero's stomach */
 int lastscore = -1;			/* Score before this turn */
 int no_command = 0;			/* Number of turns asleep */
diff -Naur --exclude '*.swp' rogue/extern.h rogue.new/extern.h
--- rogue/extern.h	2006-03-19 11:22:14.000000000 -0800
+++ rogue.new/extern.h	2006-03-30 13:24:22.000000000 -0800
@@ -50,7 +50,7 @@
 
 extern char	fruit[], orig_dsusp, prbuf[], whoami[];
 
-extern int	fd;
+extern FILE     *scoreboard;
 
 #ifdef TIOCGLTC
 extern struct ltchars	ltc;
diff -Naur --exclude '*.swp' rogue/mach_dep.c rogue.new/mach_dep.c
--- rogue/mach_dep.c	2006-01-30 08:36:21.000000000 -0800
+++ rogue.new/mach_dep.c	2006-04-01 19:26:15.000000000 -0800
@@ -45,7 +45,9 @@
 #include <sys/stat.h>
 #include <limits.h>
 
+#include <unistd.h>
 #include <fcntl.h>
+#include <errno.h>
 
 static char scorefile[PATH_MAX] = "rogue54.scr";
 static char lockfile[PATH_MAX] = "rogue54.lck";
@@ -99,22 +101,41 @@
 {
     char *homedir = md_getroguedir();
 
+    /*
+     * We drop setgid privileges after opening the score file, so subsequent
+     * open()'s will fail.  Just reuse the earlier filehandle.
+     */
+    if (scoreboard != NULL) {
+        rewind(scoreboard);
+        return;
+    }
+
     if (homedir == NULL)
         homedir = "";
 
 #ifdef SCOREFILE
-    strcpy(scorefile, homedir);
-    if (*scorefile)
-        strcat(scorefile,"/");
-    strcat(scorefile, "rogue54.scr");
-    strcpy(lockfile, homedir);
-    if (*lockfile)
-        strcat(lockfile, "/");
-    strcat(lockfile, "rogue54.lck");
-    fd = open(scorefile, O_RDWR | O_CREAT, 0666);
+    if (*homedir) {
+        snprintf(scorefile, PATH_MAX, "%s/rogue54.scr", homedir);
+    } else {
+        strcpy(scorefile, "rogue54.scr");
+    }
+
+    if (*homedir) {
+        snprintf(lockfile, PATH_MAX, "%s/rogue54.lck", homedir);
+    } else {
+        strcpy(scorefile, "rogue54.lck");
+    }
+    scoreboard = fopen(scorefile, "r+");
+    if (scoreboard == NULL) {
+        fprintf(stderr, "Could not open %s for writing: %s\n", scorefile, strerror(errno));
+        fflush(stderr);
+    }
 #else
-    fd = -1;
+    scoreboard = NULL;
 #endif
+    /*
+     * Drop setuid/setgid after opening the scoreboard file.
+     */
     md_normaluser();
 }
 
diff -Naur --exclude '*.swp' rogue/main.c rogue.new/main.c
--- rogue/main.c	2006-01-29 16:11:32.000000000 -0800
+++ rogue.new/main.c	2006-03-30 13:40:16.000000000 -0800
@@ -24,6 +24,13 @@
     char *env;
     int lowtime;
 
+    /*
+     * Open the scoreboard file and drop setuid/setgid privileges immediately.
+     * open_score() calls md_normaluser() to drop privileges, so we don't have
+     * to do it here explicitly.
+     */
+    open_score();
+
     md_init();
 
 #ifndef DUMP
@@ -89,7 +96,6 @@
     /*
      * check for print-score option
      */
-    open_score();
     if (argc == 2)
 	if (strcmp(argv[1], "-s") == 0)
 	{
diff -Naur --exclude '*.swp' rogue/mdport.c rogue.new/mdport.c
--- rogue/mdport.c	2006-01-29 18:24:39.000000000 -0800
+++ rogue.new/mdport.c	2006-04-01 19:26:16.000000000 -0800
@@ -193,8 +193,17 @@
 md_normaluser()
 {
 #ifndef _WIN32
-    setuid(getuid());
-    setgid(getgid());
+    gid_t realgid = getgid();
+    uid_t realuid = getuid();
+
+    if (setresgid(-1, realgid, realgid) != 0) {
+        perror("Could not drop setgid privileges.  Aborting.");
+        exit(1);
+    }
+    if (setresuid(-1, realuid, realuid) != 0) {
+        perror("Could not drop setuid privileges.  Aborting.");
+        exit(1);
+    }
 #endif
 }
 
@@ -397,22 +406,31 @@
 char *
 md_getroguedir()
 {
-    static char path[1024];
+    static char path[PATH_MAX];
     char *end,*home;
 
     if ( (home = getenv("ROGUEHOME")) != NULL)
     {
         if (*home)
         {
-            strncpy(path, home, PATH_MAX - 20);
-
-            end = &path[strlen(path)-1];
-
-            while( (end >= path) && ((*end == '/') || (*end == '\\')))
-                *end-- = '\0';
-
-            if (directory_exists(path))
-                return(path);
+            if (strlen(home) > PATH_MAX-20) {
+                fprintf(stderr, "ROGUEHOME path is too long.  Ignoring.\n");
+            } else {
+                strncpy(path, home, PATH_MAX-20);
+                /* Ensure that we have a terminating NULL character.
+                 */
+                path[PATH_MAX-1] = (char)NULL;
+    
+                end = &path[strlen(path)-1];
+    
+                /* Strip off any trailing path separators from the path.
+                 */
+                while( (end >= path) && ((*end == '/') || (*end == '\\')))
+                    *end-- = '\0';
+    
+                if (directory_exists(path))
+                    return(path);
+            }
         }
     }
 
diff -Naur --exclude '*.swp' rogue/rip.c rogue.new/rip.c
--- rogue/rip.c	2006-01-03 16:17:29.000000000 -0800
+++ rogue.new/rip.c	2006-03-30 13:32:17.000000000 -0800
@@ -60,7 +60,6 @@
     int i;
     SCORE *sc2;
     SCORE *top_ten, *endp;
-    FILE *outf;
 # ifdef MASTER
     int prflags = 0;
 # endif
@@ -96,11 +95,7 @@
 	    delwin(hw);
     }
 
-    if (fd >= 0)
-	outf = (FILE *)fdopen(fd, "w");
-    else
-	return;
-
+    open_score();
     top_ten = (SCORE *) malloc(numscores * sizeof (SCORE));
     endp = &top_ten[numscores];
     for (scp = top_ten; scp < endp; scp++)
@@ -123,11 +118,9 @@
 	else if (strcmp(prbuf, "edit") == 0)
 	    prflags = 2;
 #endif
-    rd_score(top_ten, fd);
-    fclose(outf);
-    close(fd);
-    open_score(0);
-    outf = (FILE *) fdopen(fd, "w");
+    open_score();
+    rd_score(top_ten, scoreboard);
+    open_score();
     /*
      * Insert her in list if need be
      */
@@ -222,7 +215,7 @@
 	else
 	    break;
     }
-    fseek(outf, 0L, SEEK_SET);
+    fseek(scoreboard, 0L, SEEK_SET);
     /*
      * Update the list file
      */
@@ -231,12 +224,11 @@
 	if (lock_sc())
 	{
 	    fp = signal(SIGINT, SIG_IGN);
-	    wr_score(top_ten, outf);
+	    wr_score(top_ten, scoreboard);
 	    unlock_sc();
 	    signal(SIGINT, fp);
 	}
     }
-    fclose(outf);
 }
 
 /*
diff -Naur --exclude '*.swp' rogue/save.c rogue.new/save.c
--- rogue/save.c	2006-01-30 08:05:35.000000000 -0800
+++ rogue.new/save.c	2006-03-30 13:33:45.000000000 -0800
@@ -335,7 +335,40 @@
 
 /*
  * encread:
- *	Perform an encrypted read
+ *	Perform an encrypted read from a FILE stream
+ */
+size_t
+encread_fromstream(char *start, size_t size, FILE *inf)
+{
+    char *e1, *e2, fb;
+    int temp, read_size;
+    extern char statlist[];
+
+    fb = frob;
+
+    if ((read_size = fread(start, size, 1, inf)) == 0 || read_size == -1)
+	return(read_size);
+
+    e1 = encstr;
+    e2 = statlist;
+
+    while (size--)
+    {
+	*start++ ^= *e1 ^ *e2 ^ fb;
+	temp = *e1++;
+	fb += temp * *e2++;
+	if (*e1 == '\0')
+	    e1 = encstr;
+	if (*e2 == '\0')
+	    e2 = statlist;
+    }
+
+    return(read_size);
+}
+
+/*
+ * encread
+ *	Perform an encrypted read from a file descriptor
  */
 size_t
 encread(char *start, size_t size, int inf)
@@ -371,14 +404,14 @@
  * read_scrore
  *	Read in the score file
  */
-rd_score(SCORE *top_ten, int fd)
+rd_score(SCORE *top_ten, FILE *fd)
 {
     unsigned int i;
 
     for(i = 0; i < numscores; i++)
     {
-        encread(top_ten[i].sc_name, MAXSTR, fd);
-        encread(scoreline, 100, fd);
+        encread_fromstream(top_ten[i].sc_name, MAXSTR, fd);
+        encread_fromstream(scoreline, 100, fd);
         sscanf(scoreline, " %u %hu %u %hu %hu %lx \n",
             &top_ten[i].sc_uid, &top_ten[i].sc_score,
             &top_ten[i].sc_flags, &top_ten[i].sc_monster,
diff -Naur --exclude '*.swp' rogue/state.c rogue.new/state.c
--- rogue/state.c	2006-01-03 16:17:29.000000000 -0800
+++ rogue.new/state.c	2006-03-30 13:09:46.000000000 -0800
@@ -2138,7 +2138,8 @@
     rs_write_int(savef, no_food);
     rs_write_ints(savef,a_class,MAXARMORS);
     rs_write_int(savef, count);
-    rs_write_int(savef, fd);
+    // Don't bother saving the file descriptor anymore.
+    rs_write_int(savef, -1);
     rs_write_int(savef, food_left);
     rs_write_int(savef, lastscore);
     rs_write_int(savef, no_command);
@@ -2275,7 +2276,8 @@
     rs_read_int(inf, &no_food);
     rs_read_ints(inf,a_class,MAXARMORS);
     rs_read_int(inf, &count);
-    rs_read_int(inf, &fd);
+    // Read the file descriptor, but ignore it.
+    rs_read_int(inf, &junk3);
     rs_read_int(inf, &food_left);
     rs_read_int(inf, &lastscore);
     rs_read_int(inf, &no_command);



From fedora-extras-commits at redhat.com  Tue Apr 11 02:05:20 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon, 10 Apr 2006 19:05:20 -0700
Subject: rpms/rogue/FC-4 rogue-5.4-setgid.patch,NONE,1.1 rogue.spec,1.3,1.4
Message-ID: <200604110205.k3B25Mcq008014@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/rogue/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7993

Modified Files:
	rogue.spec 
Added Files:
	rogue-5.4-setgid.patch 
Log Message:
Better setuid/setgid handling (BZ #187392)
Resize desktop icon to match directory name



rogue-5.4-setgid.patch:

--- NEW FILE rogue-5.4-setgid.patch ---
diff -Naur --exclude '*.swp' rogue/extern.c rogue.new/extern.c
--- rogue/extern.c	2006-01-03 16:17:29.000000000 -0800
+++ rogue.new/extern.c	2006-03-30 13:24:12.000000000 -0800
@@ -111,7 +111,7 @@
 };
 
 int count = 0;				/* Number of times to repeat command */
-int fd;					/* File descriptor for score file */
+FILE *scoreboard = (FILE *)NULL;	/* File descriptor for score file */
 int food_left;				/* Amount of food in hero's stomach */
 int lastscore = -1;			/* Score before this turn */
 int no_command = 0;			/* Number of turns asleep */
diff -Naur --exclude '*.swp' rogue/extern.h rogue.new/extern.h
--- rogue/extern.h	2006-03-19 11:22:14.000000000 -0800
+++ rogue.new/extern.h	2006-03-30 13:24:22.000000000 -0800
@@ -50,7 +50,7 @@
 
 extern char	fruit[], orig_dsusp, prbuf[], whoami[];
 
-extern int	fd;
+extern FILE     *scoreboard;
 
 #ifdef TIOCGLTC
 extern struct ltchars	ltc;
diff -Naur --exclude '*.swp' rogue/mach_dep.c rogue.new/mach_dep.c
--- rogue/mach_dep.c	2006-01-30 08:36:21.000000000 -0800
+++ rogue.new/mach_dep.c	2006-04-01 19:26:15.000000000 -0800
@@ -45,7 +45,9 @@
 #include <sys/stat.h>
 #include <limits.h>
 
+#include <unistd.h>
 #include <fcntl.h>
+#include <errno.h>
 
 static char scorefile[PATH_MAX] = "rogue54.scr";
 static char lockfile[PATH_MAX] = "rogue54.lck";
@@ -99,22 +101,41 @@
 {
     char *homedir = md_getroguedir();
 
+    /*
+     * We drop setgid privileges after opening the score file, so subsequent
+     * open()'s will fail.  Just reuse the earlier filehandle.
+     */
+    if (scoreboard != NULL) {
+        rewind(scoreboard);
+        return;
+    }
+
     if (homedir == NULL)
         homedir = "";
 
 #ifdef SCOREFILE
-    strcpy(scorefile, homedir);
-    if (*scorefile)
-        strcat(scorefile,"/");
-    strcat(scorefile, "rogue54.scr");
-    strcpy(lockfile, homedir);
-    if (*lockfile)
-        strcat(lockfile, "/");
-    strcat(lockfile, "rogue54.lck");
-    fd = open(scorefile, O_RDWR | O_CREAT, 0666);
+    if (*homedir) {
+        snprintf(scorefile, PATH_MAX, "%s/rogue54.scr", homedir);
+    } else {
+        strcpy(scorefile, "rogue54.scr");
+    }
+
+    if (*homedir) {
+        snprintf(lockfile, PATH_MAX, "%s/rogue54.lck", homedir);
+    } else {
+        strcpy(scorefile, "rogue54.lck");
+    }
+    scoreboard = fopen(scorefile, "r+");
+    if (scoreboard == NULL) {
+        fprintf(stderr, "Could not open %s for writing: %s\n", scorefile, strerror(errno));
+        fflush(stderr);
+    }
 #else
-    fd = -1;
+    scoreboard = NULL;
 #endif
+    /*
+     * Drop setuid/setgid after opening the scoreboard file.
+     */
     md_normaluser();
 }
 
diff -Naur --exclude '*.swp' rogue/main.c rogue.new/main.c
--- rogue/main.c	2006-01-29 16:11:32.000000000 -0800
+++ rogue.new/main.c	2006-03-30 13:40:16.000000000 -0800
@@ -24,6 +24,13 @@
     char *env;
     int lowtime;
 
+    /*
+     * Open the scoreboard file and drop setuid/setgid privileges immediately.
+     * open_score() calls md_normaluser() to drop privileges, so we don't have
+     * to do it here explicitly.
+     */
+    open_score();
+
     md_init();
 
 #ifndef DUMP
@@ -89,7 +96,6 @@
     /*
      * check for print-score option
      */
-    open_score();
     if (argc == 2)
 	if (strcmp(argv[1], "-s") == 0)
 	{
diff -Naur --exclude '*.swp' rogue/mdport.c rogue.new/mdport.c
--- rogue/mdport.c	2006-01-29 18:24:39.000000000 -0800
+++ rogue.new/mdport.c	2006-04-01 19:26:16.000000000 -0800
@@ -193,8 +193,17 @@
 md_normaluser()
 {
 #ifndef _WIN32
-    setuid(getuid());
-    setgid(getgid());
+    gid_t realgid = getgid();
+    uid_t realuid = getuid();
+
+    if (setresgid(-1, realgid, realgid) != 0) {
+        perror("Could not drop setgid privileges.  Aborting.");
+        exit(1);
+    }
+    if (setresuid(-1, realuid, realuid) != 0) {
+        perror("Could not drop setuid privileges.  Aborting.");
+        exit(1);
+    }
 #endif
 }
 
@@ -397,22 +406,31 @@
 char *
 md_getroguedir()
 {
-    static char path[1024];
+    static char path[PATH_MAX];
     char *end,*home;
 
     if ( (home = getenv("ROGUEHOME")) != NULL)
     {
         if (*home)
         {
-            strncpy(path, home, PATH_MAX - 20);
-
-            end = &path[strlen(path)-1];
-
-            while( (end >= path) && ((*end == '/') || (*end == '\\')))
-                *end-- = '\0';
-
-            if (directory_exists(path))
-                return(path);
+            if (strlen(home) > PATH_MAX-20) {
+                fprintf(stderr, "ROGUEHOME path is too long.  Ignoring.\n");
+            } else {
+                strncpy(path, home, PATH_MAX-20);
+                /* Ensure that we have a terminating NULL character.
+                 */
+                path[PATH_MAX-1] = (char)NULL;
+    
+                end = &path[strlen(path)-1];
+    
+                /* Strip off any trailing path separators from the path.
+                 */
+                while( (end >= path) && ((*end == '/') || (*end == '\\')))
+                    *end-- = '\0';
+    
+                if (directory_exists(path))
+                    return(path);
+            }
         }
     }
 
diff -Naur --exclude '*.swp' rogue/rip.c rogue.new/rip.c
--- rogue/rip.c	2006-01-03 16:17:29.000000000 -0800
+++ rogue.new/rip.c	2006-03-30 13:32:17.000000000 -0800
@@ -60,7 +60,6 @@
     int i;
     SCORE *sc2;
     SCORE *top_ten, *endp;
-    FILE *outf;
 # ifdef MASTER
     int prflags = 0;
 # endif
@@ -96,11 +95,7 @@
 	    delwin(hw);
     }
 
-    if (fd >= 0)
-	outf = (FILE *)fdopen(fd, "w");
-    else
-	return;
-
+    open_score();
     top_ten = (SCORE *) malloc(numscores * sizeof (SCORE));
     endp = &top_ten[numscores];
     for (scp = top_ten; scp < endp; scp++)
@@ -123,11 +118,9 @@
 	else if (strcmp(prbuf, "edit") == 0)
 	    prflags = 2;
 #endif
-    rd_score(top_ten, fd);
-    fclose(outf);
-    close(fd);
-    open_score(0);
-    outf = (FILE *) fdopen(fd, "w");
+    open_score();
+    rd_score(top_ten, scoreboard);
+    open_score();
     /*
      * Insert her in list if need be
      */
@@ -222,7 +215,7 @@
 	else
 	    break;
     }
-    fseek(outf, 0L, SEEK_SET);
+    fseek(scoreboard, 0L, SEEK_SET);
     /*
      * Update the list file
      */
@@ -231,12 +224,11 @@
 	if (lock_sc())
 	{
 	    fp = signal(SIGINT, SIG_IGN);
-	    wr_score(top_ten, outf);
+	    wr_score(top_ten, scoreboard);
 	    unlock_sc();
 	    signal(SIGINT, fp);
 	}
     }
-    fclose(outf);
 }
 
 /*
diff -Naur --exclude '*.swp' rogue/save.c rogue.new/save.c
--- rogue/save.c	2006-01-30 08:05:35.000000000 -0800
+++ rogue.new/save.c	2006-03-30 13:33:45.000000000 -0800
@@ -335,7 +335,40 @@
 
 /*
  * encread:
- *	Perform an encrypted read
+ *	Perform an encrypted read from a FILE stream
+ */
+size_t
+encread_fromstream(char *start, size_t size, FILE *inf)
+{
+    char *e1, *e2, fb;
+    int temp, read_size;
+    extern char statlist[];
+
+    fb = frob;
+
+    if ((read_size = fread(start, size, 1, inf)) == 0 || read_size == -1)
+	return(read_size);
+
+    e1 = encstr;
+    e2 = statlist;
+
+    while (size--)
+    {
+	*start++ ^= *e1 ^ *e2 ^ fb;
+	temp = *e1++;
+	fb += temp * *e2++;
+	if (*e1 == '\0')
+	    e1 = encstr;
+	if (*e2 == '\0')
+	    e2 = statlist;
+    }
+
+    return(read_size);
+}
+
+/*
+ * encread
+ *	Perform an encrypted read from a file descriptor
  */
 size_t
 encread(char *start, size_t size, int inf)
@@ -371,14 +404,14 @@
  * read_scrore
  *	Read in the score file
  */
-rd_score(SCORE *top_ten, int fd)
+rd_score(SCORE *top_ten, FILE *fd)
 {
     unsigned int i;
 
     for(i = 0; i < numscores; i++)
     {
-        encread(top_ten[i].sc_name, MAXSTR, fd);
-        encread(scoreline, 100, fd);
+        encread_fromstream(top_ten[i].sc_name, MAXSTR, fd);
+        encread_fromstream(scoreline, 100, fd);
         sscanf(scoreline, " %u %hu %u %hu %hu %lx \n",
             &top_ten[i].sc_uid, &top_ten[i].sc_score,
             &top_ten[i].sc_flags, &top_ten[i].sc_monster,
diff -Naur --exclude '*.swp' rogue/state.c rogue.new/state.c
--- rogue/state.c	2006-01-03 16:17:29.000000000 -0800
+++ rogue.new/state.c	2006-03-30 13:09:46.000000000 -0800
@@ -2138,7 +2138,8 @@
     rs_write_int(savef, no_food);
     rs_write_ints(savef,a_class,MAXARMORS);
     rs_write_int(savef, count);
-    rs_write_int(savef, fd);
+    // Don't bother saving the file descriptor anymore.
+    rs_write_int(savef, -1);
     rs_write_int(savef, food_left);
     rs_write_int(savef, lastscore);
     rs_write_int(savef, no_command);
@@ -2275,7 +2276,8 @@
     rs_read_int(inf, &no_food);
     rs_read_ints(inf,a_class,MAXARMORS);
     rs_read_int(inf, &count);
-    rs_read_int(inf, &fd);
+    // Read the file descriptor, but ignore it.
+    rs_read_int(inf, &junk3);
     rs_read_int(inf, &food_left);
     rs_read_int(inf, &lastscore);
     rs_read_int(inf, &no_command);


Index: rogue.spec
===================================================================
RCS file: /cvs/extras/rpms/rogue/FC-4/rogue.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- rogue.spec	13 Mar 2006 19:45:45 -0000	1.3
+++ rogue.spec	11 Apr 2006 02:05:19 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           rogue
 Version:        5.4.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        The original graphical adventure game
 
 Group:          Amusements/Games
@@ -11,6 +11,7 @@
 Source2:        rogue.png
 Patch0:         rogue-rpmopts.patch
 Patch1:         rogue-includes.patch
+Patch2:         rogue-5.4-setgid.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -24,6 +25,7 @@
 %setup -q -c -n %{name}-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 %{__sed} -i 's/\r//' rogue54.html
 %{__sed} -i 's/\r//' readme54.html
 chmod a-x *.c *.h
@@ -76,6 +78,10 @@
 
 
 %changelog
+* Thu Mar 30 2006 Wart <wart at kobold.org> 5.4.2-4
+- Better setuid/setgid handling (BZ #187392)
+- Resize desktop icon to match directory name
+
 * Mon Mar 13 2006 Wart <wart at kobold.org> 5.4.2-3
 - Added icon for .desktop file.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 02:15:50 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Mon, 10 Apr 2006 19:15:50 -0700
Subject: fedora-security/audit fc4,1.196,1.197 fc5,1.109,1.110
Message-ID: <200604110215.k3B2Fo5G008733@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8713

Modified Files:
	fc4 fc5 
Log Message:
Add some php CVE ids.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -r1.196 -r1.197
--- fc4	10 Apr 2006 16:12:36 -0000	1.196
+++ fc4	11 Apr 2006 02:15:48 -0000	1.197
@@ -5,12 +5,15 @@
 
 CVE-2006-1646 ignore (ipsec-tools) KAME racoon, not ipsec-tools racoon
 CVE-2006-1624 ignore (sysklogd) Silly configuration is not a security issue
+CVE-2006-1608 ignore (php) safe mode isn't safe
 CVE-2006-1550 backport (dia) bz#187402 [since FEDORA-2006-261]
+CVE-2006-1549 ignore (php) this is not a security issue
 CVE-2006-1548 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1542 VULNERABLE (python) bz#169046
 CVE-2006-1522 VULNERABLE (kernel)
+CVE-2006-1494 VULNERABLE (php)
 CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-245]
 CVE-2006-1354 VULNERABLE (freeradius) bz#186084
 CVE-2006-1343 VULNERABLE (kernel)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- fc5	10 Apr 2006 16:12:36 -0000	1.109
+++ fc5	11 Apr 2006 02:15:48 -0000	1.110
@@ -5,11 +5,14 @@
 
 CVE-2006-1646 ignore (ipsec-tools) KAME racoon, not ipsec-tools racoon
 CVE-2006-1624 ignore (sysklogd) Silly configuration is not a security issue
+CVE-2006-1608 ignore (php) safe mode isn't safe
+CVE-2006-1549 ignore (php) this is not a security issue
 CVE-2006-1548 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1542 VULNERABLE (python) bz#169046
 CVE-2006-1522 VULNERABLE (kernel)
+CVE-2006-1494 VULNERABLE (php)
 CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-233]
 CVE-2006-1354 VULNERABLE (freeradius) bz#186084
 CVE-2006-1343 VULNERABLE (kernel)



From fedora-extras-commits at redhat.com  Tue Apr 11 03:11:24 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Mon, 10 Apr 2006 20:11:24 -0700
Subject: rpms/nethack/devel nethack.spec,1.13,1.14
Message-ID: <200604110311.k3B3BQVi010851@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/nethack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10830

Modified Files:
	nethack.spec 
Log Message:
* Mon Apr 10 2006 Luke Macken <lmacken at redhat.com> 3.4.3-10
- Remove $RPM_BUILD_ROOT from %post (Bug #188008)




Index: nethack.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack/devel/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	11 Apr 2006 03:11:24 -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
@@ -134,6 +134,9 @@
 
 
 %changelog
+* Mon Apr 10 2006 Luke Macken <lmacken at redhat.com> 3.4.3-10
+- 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  Tue Apr 11 06:14:30 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 10 Apr 2006 23:14:30 -0700
Subject: rpms/gwenview/FC-5 gwenview.spec,1.14,1.15
Message-ID: <200604110614.k3B6EWb1022735@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/gwenview/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22704/FC-5

Modified Files:
	gwenview.spec 
Log Message:
- fix build outside the buildsystem (bug 188486)


Index: gwenview.spec
===================================================================
RCS file: /cvs/extras/rpms/gwenview/FC-5/gwenview.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gwenview.spec	21 Feb 2006 17:15:55 -0000	1.14
+++ gwenview.spec	11 Apr 2006 06:14:30 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           gwenview
 Version:        1.3.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Simple image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -13,7 +13,7 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  libkipi-devel
 BuildRequires:  gettext
-%if %{fedora} >= 5
+%if "%{fedora}" >= "5"
 BuildRequires:  libXt-devel
 %endif
 
@@ -95,6 +95,9 @@
 
 
 %changelog
+* Tue Apr 11 2006 Aurelien Bompard <gauret[AT]free.fr> 1.3.1-5
+- fix build outside the buildsystem (bug 188486)
+
 * Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 1.3.1-4
 - rebuild for fc5
 



From fedora-extras-commits at redhat.com  Tue Apr 11 06:14:31 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 10 Apr 2006 23:14:31 -0700
Subject: rpms/gwenview/devel gwenview.spec,1.14,1.15
Message-ID: <200604110614.k3B6EXKA022739@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/gwenview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22704/devel

Modified Files:
	gwenview.spec 
Log Message:
- fix build outside the buildsystem (bug 188486)


Index: gwenview.spec
===================================================================
RCS file: /cvs/extras/rpms/gwenview/devel/gwenview.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gwenview.spec	21 Feb 2006 17:15:55 -0000	1.14
+++ gwenview.spec	11 Apr 2006 06:14:31 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           gwenview
 Version:        1.3.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Simple image viewer for KDE
 
 Group:          Applications/Multimedia
@@ -13,7 +13,7 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  libkipi-devel
 BuildRequires:  gettext
-%if %{fedora} >= 5
+%if "%{fedora}" >= "5"
 BuildRequires:  libXt-devel
 %endif
 
@@ -95,6 +95,9 @@
 
 
 %changelog
+* Tue Apr 11 2006 Aurelien Bompard <gauret[AT]free.fr> 1.3.1-5
+- fix build outside the buildsystem (bug 188486)
+
 * Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 1.3.1-4
 - rebuild for fc5
 



From fedora-extras-commits at redhat.com  Tue Apr 11 06:17:02 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 10 Apr 2006 23:17:02 -0700
Subject: rpms/colorscheme/FC-5 .cvsignore, 1.6, 1.7 colorscheme.spec, 1.8,
	1.9 sources, 1.6, 1.7
Message-ID: <200604110617.k3B6H4pV022798@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/colorscheme/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22761/FC-5

Modified Files:
	.cvsignore colorscheme.spec sources 
Log Message:
- update to 0.3.91
- fix build outside the buildsystem (bug 188480)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/colorscheme/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	23 Nov 2005 19:15:54 -0000	1.6
+++ .cvsignore	11 Apr 2006 06:17:02 -0000	1.7
@@ -1 +1 @@
-colorscheme-0.3.tar.bz2
+colorscheme-0.3.91.tar.bz2


Index: colorscheme.spec
===================================================================
RCS file: /cvs/extras/rpms/colorscheme/FC-5/colorscheme.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- colorscheme.spec	21 Feb 2006 17:08:02 -0000	1.8
+++ colorscheme.spec	11 Apr 2006 06:17:02 -0000	1.9
@@ -1,17 +1,18 @@
 Name:           colorscheme
-Version:        0.3
-Release:        3%{?dist}
+Version:        0.3.91
+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/0.3/colorscheme-0.3.tar.bz2
+Source0:        http://download.gna.org/colorscheme/releases/colorscheme-0.3.91.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# see http://home.gna.org/colorscheme/downloads.shtml for buildreqs
 BuildRequires:  gtkmm24-devel >= 2.5, libgnomeui-devel >= 2.0, desktop-file-utils
-BuildRequires:  cppunit-devel, gnome-vfsmm26-devel, boost-devel
-%if %{fedora} >= 5
+BuildRequires:  cppunit-devel, gnome-vfsmm26-devel, boost-devel, gconfmm26-devel
+%if "%{fedora}" >= "5"
 BuildRequires:  libSM-devel
 %endif
 
@@ -65,6 +66,10 @@
 
 
 %changelog
+* Tue Apr 11 2006 Aurelien Bompard <gauret[AT]free.fr> 0.3.91-1
+- update to 0.3.91
+- fix build outside the buildsystem (bug 188480)
+
 * Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 0.3-3
 - rebuild for fc5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/colorscheme/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Nov 2005 19:15:54 -0000	1.6
+++ sources	11 Apr 2006 06:17:02 -0000	1.7
@@ -1 +1 @@
-fef79d6a6a718f5a2c34a49d56b0367a  colorscheme-0.3.tar.bz2
+6474ecbc372b5bfaf15b0083a48102e3  colorscheme-0.3.91.tar.bz2



From fedora-extras-commits at redhat.com  Tue Apr 11 06:17:03 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Mon, 10 Apr 2006 23:17:03 -0700
Subject: rpms/colorscheme/devel .cvsignore, 1.6, 1.7 colorscheme.spec, 1.8, 
	1.9 sources, 1.6, 1.7
Message-ID: <200604110617.k3B6H54D022804@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/colorscheme/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22761/devel

Modified Files:
	.cvsignore colorscheme.spec sources 
Log Message:
- update to 0.3.91
- fix build outside the buildsystem (bug 188480)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/colorscheme/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	23 Nov 2005 19:15:54 -0000	1.6
+++ .cvsignore	11 Apr 2006 06:17:03 -0000	1.7
@@ -1 +1 @@
-colorscheme-0.3.tar.bz2
+colorscheme-0.3.91.tar.bz2


Index: colorscheme.spec
===================================================================
RCS file: /cvs/extras/rpms/colorscheme/devel/colorscheme.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- colorscheme.spec	21 Feb 2006 17:08:02 -0000	1.8
+++ colorscheme.spec	11 Apr 2006 06:17:03 -0000	1.9
@@ -1,17 +1,18 @@
 Name:           colorscheme
-Version:        0.3
-Release:        3%{?dist}
+Version:        0.3.91
+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/0.3/colorscheme-0.3.tar.bz2
+Source0:        http://download.gna.org/colorscheme/releases/colorscheme-0.3.91.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# see http://home.gna.org/colorscheme/downloads.shtml for buildreqs
 BuildRequires:  gtkmm24-devel >= 2.5, libgnomeui-devel >= 2.0, desktop-file-utils
-BuildRequires:  cppunit-devel, gnome-vfsmm26-devel, boost-devel
-%if %{fedora} >= 5
+BuildRequires:  cppunit-devel, gnome-vfsmm26-devel, boost-devel, gconfmm26-devel
+%if "%{fedora}" >= "5"
 BuildRequires:  libSM-devel
 %endif
 
@@ -65,6 +66,10 @@
 
 
 %changelog
+* Tue Apr 11 2006 Aurelien Bompard <gauret[AT]free.fr> 0.3.91-1
+- update to 0.3.91
+- fix build outside the buildsystem (bug 188480)
+
 * Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 0.3-3
 - rebuild for fc5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/colorscheme/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 Nov 2005 19:15:54 -0000	1.6
+++ sources	11 Apr 2006 06:17:03 -0000	1.7
@@ -1 +1 @@
-fef79d6a6a718f5a2c34a49d56b0367a  colorscheme-0.3.tar.bz2
+6474ecbc372b5bfaf15b0083a48102e3  colorscheme-0.3.91.tar.bz2



From fedora-extras-commits at redhat.com  Tue Apr 11 06:21:45 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 10 Apr 2006 23:21:45 -0700
Subject: rpms/rpmlint/devel rpmlint-0.76-debuginfo.patch, NONE,
	1.1 rpmlint-0.76-disttag.patch, NONE, 1.1 .cvsignore, 1.11,
	1.12 rpmlint-fedora-config, 1.11, 1.12 rpmlint.spec, 1.22,
	1.23 sources, 1.11, 1.12 rpmlint-0.71-disttag.patch, 1.1,
	NONE rpmlint-0.71-doc-exec.patch, 1.1,
	NONE rpmlint-0.71-la-exec.patch, 1.1,
	NONE rpmlint-0.71-prereq.patch, 1.1,
	NONE rpmlint-0.75-develdep.patch, 1.1, NONE
Message-ID: <200604110621.k3B6Ll4P022988@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/rpmlint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22911/devel

Modified Files:
	.cvsignore rpmlint-fedora-config rpmlint.spec sources 
Added Files:
	rpmlint-0.76-debuginfo.patch rpmlint-0.76-disttag.patch 
Removed Files:
	rpmlint-0.71-disttag.patch rpmlint-0.71-doc-exec.patch 
	rpmlint-0.71-la-exec.patch rpmlint-0.71-prereq.patch 
	rpmlint-0.75-develdep.patch 
Log Message:
* Tue Apr 11 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.76-1
- 0.76.

* Mon Mar 27 2006 Ville Skytt?? <ville.skytta at iki.fi>
- Don't pass -T to objdump for *.debug files (#185227).
- lib64 library path fixes (#185228).

* Wed Mar 15 2006 Ville Skytt?? <ville.skytta at iki.fi>
- Accept zlib License (#185501).

* Tue Feb 28 2006 Ville Skytt?? <ville.skytta at iki.fi>
- Accept Ruby License (#183384) and SIL Open Font License (#176405).


rpmlint-0.76-debuginfo.patch:

--- NEW FILE rpmlint-0.76-debuginfo.patch ---
Index: FilesCheck.py
===================================================================
--- FilesCheck.py	(revision 1144)
+++ FilesCheck.py	(working copy)
@@ -158,7 +158,7 @@
 includefile_regex=re.compile('\.(c|h|a|cmi)$')
 buildconfigfile_regex=re.compile('(\.pc|/bin/.+-config)$')
 sofile_regex=re.compile('/lib(64)?/[^/]+\.so$')
-devel_regex=re.compile('-(devel|source)$')
+devel_regex=re.compile('-(debug(info)?|devel|source)$')
 lib_regex=re.compile('lib(64)?/lib[^/]*\.so\..*')
 ldconfig_regex=re.compile('^[^#]*ldconfig', re.MULTILINE)
 depmod_regex=re.compile('^[^#]*depmod', re.MULTILINE)

rpmlint-0.76-disttag.patch:

--- NEW FILE rpmlint-0.76-disttag.patch ---
--- TagsCheck.py~	2006-04-05 19:21:45.000000000 +0300
+++ TagsCheck.py	2006-04-08 23:04:04.000000000 +0300
@@ -342,2 +342,3 @@
 changelog_version_regex=re.compile('[^>]([^ >]+)\s*$')
+fedora_disttag_regex=re.compile('\.(fc|rhe?l)\d+$')
 release_ext=Config.getOption('ReleaseExtension')
@@ -556,3 +557,3 @@
                             expected=str(epoch) + ':' + expected
-                        if expected != ret.group(1):
+                        if ret.group(1) not in (expected, fedora_disttag_regex.sub('', expected)):
                             printWarning(pkg, 'incoherent-version-in-changelog', ret.group(1), expected)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	12 Feb 2006 20:31:35 -0000	1.11
+++ .cvsignore	11 Apr 2006 06:21:45 -0000	1.12
@@ -1 +1 @@
-rpmlint-0.75.tar.bz2
+rpmlint-0.76.tar.bz2


Index: rpmlint-fedora-config
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint-fedora-config,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rpmlint-fedora-config	17 Jan 2006 20:33:54 -0000	1.11
+++ rpmlint-fedora-config	11 Apr 2006 06:21:45 -0000	1.12
@@ -4,9 +4,6 @@
 
 from Config import *
 
-setOption("ReleaseExtension", '')
-setOption("ValidBuildHost", ".*")
-setOption("Packager", ".*")
 setOption("UseVersionInChangeLog", 1)
 setOption("UseBzip2", 0)
 setOption("UseDefaultRunlevels", 0)
@@ -65,8 +62,11 @@
     "Public Domain",
     "Python Software Foundation License",
     "QPL",
+    "Ruby License",
     "Sun Public License",
+    "SIL Open Font License",
     "W3C Software License",
+    "zlib License",
     "Zope Public License",
 ))
 setOption("ValidShells", (
@@ -82,22 +82,23 @@
 ))
 
 # Output filters
-addFilter("W: .* source-or-patch-not-[bg]zipped .*")
-addFilter("E: .* lib-package-without-%mklibname")
-addFilter("E: .* no-dependency-on (perl|python)-base.*")
-addFilter("E: .* no-dependency-on locales-.*")
-addFilter("W: .* (python|perl5)-naming-policy-not-applied.*")
-addFilter("W: .* invalid-(distribution|vendor) .*")
-addFilter("E: .* no-(packager-tag|signature)")
-addFilter("E: .* incoherent-version-in-name.*")
-addFilter("E: .* invalid-build-requires .*")
-addFilter("W: .* ghost-files-without-postin")
-addFilter("W: .* postin-without-ghost-file-creation .*")
-addFilter("W: .* no-major-in-name .*")
-addFilter("W: .* no-provides .*")
-addFilter("E: .* executable-in-library-package .*")
-addFilter("E: .* non-versioned-file-in-library-package .*")
-addFilter("E: .* requires-on-release .*")
-addFilter("W: .* jar-not-indexed .*")
-addFilter("E: .* invalid-(lc-messages|locale-man)-dir .*")
-addFilter("E: .* outside-libdir-files .*")
+addFilter("source-or-patch-not-[bg]zipped")
+addFilter("%mklibname")
+addFilter("no-dependency-on (perl|python)-base")
+addFilter("no-dependency-on locales-")
+addFilter("(python|perl5)-naming-policy-not-applied")
+addFilter("no-(packager-tag|signature)")
+addFilter("incoherent-version-in-name")
+addFilter("invalid-build-requires")
+addFilter("ghost-files-without-postin")
+addFilter("postin-without-ghost-file-creation")
+addFilter("no-major-in-name")
+addFilter("no-provides")
+addFilter("executable-in-library-package")
+addFilter("non-versioned-file-in-library-package")
+addFilter("requires-on-release")
+addFilter("jar-not-indexed")
+addFilter("invalid-(lc-messages|locale-man)-dir")
+addFilter("outside-libdir-files")
+addFilter('-debuginfo no-documentation')
+addFilter('-debuginfo [^ ]+ /usr/lib/debug/')


Index: rpmlint.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/rpmlint.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- rpmlint.spec	17 Feb 2006 23:06:36 -0000	1.22
+++ rpmlint.spec	11 Apr 2006 06:21:45 -0000	1.23
@@ -1,19 +1,19 @@
+# TODO:
+# - don't override upstream default valid groups, just add "Development/Debug"
+# - switch to upstream valid license list?
+
 Name:           rpmlint
-Version:        0.75
+Version:        0.76
 Release:        1%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
 License:        GPL
-URL:            http://people.mandriva.com/~flepied/projects/rpmlint/
-#Source0:        http://people.mandriva.com/~flepied/projects/rpmlint/dist/%{name}-%{version}.tar.bz2
-Source0:        http://www.zarb.org/~misc/%{name}-%{version}.tar.bz2
+URL:            http://rpmlint.zarb.org/
+Source0:        http://rpmlint.zarb.org/download/%{name}-%{version}.tar.bz2
 Source1:        %{name}-fedora-config
-Patch0:         %{name}-0.71-disttag.patch
-Patch1:         %{name}-0.75-develdep.patch
-Patch2:         %{name}-0.71-prereq.patch
-Patch3:         %{name}-0.71-la-exec.patch
-Patch4:         %{name}-0.71-doc-exec.patch
+Patch0:         %{name}-0.76-disttag.patch
+Patch1:         %{name}-0.76-debuginfo.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -34,14 +34,8 @@
 %setup -q
 %patch0
 %patch1
-%patch2
-%patch3
-%patch4
 sed -i -e 's|/etc/httpd/webapps\.d|%{_sysconfdir}/httpd/conf.d|' \
   FilesCheck.py I18NCheck.py
-for f in AUTHORS ChangeLog ; do
-  iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
-done
 
 
 %build
@@ -50,15 +44,16 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_datadir}/rpmlint/check-install.py*
-install -Dpm 644 rpmlint.bash-completion \
-  $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/rpmlint
-install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config
+make install DESTDIR=$RPM_BUILD_ROOT ETCDIR=%{_sysconfdir} MANDIR=%{_mandir} \
+  LIBDIR=%{_datadir}/rpmlint BINDIR=%{_bindir}
+echo "# Add local rpmlint configuration here." \
+  > $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config
+install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/rpmlint/config
 
 # Take care of files that may be generated later.
-touch $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config{c,o}
+touch $RPM_BUILD_ROOT{%{_datadir},%{_sysconfdir}}/rpmlint/config{c,o}
 echo '%ghost %{_sysconfdir}/rpmlint/config?' > %{name}-%{version}-files.list
+echo '%ghost %{_datadir}/rpmlint/config?' >> %{name}-%{version}-files.list
 for f in `find $RPM_BUILD_ROOT%{_datadir}/rpmlint -type f -name "*.py"` ; do
   f=`echo "$f" | sed "s|^$RPM_BUILD_ROOT||"`
   echo "$f" >> %{name}-%{version}-files.list
@@ -82,13 +77,28 @@
 %doc AUTHORS COPYING ChangeLog README
 %dir %{_sysconfdir}/rpmlint/
 %config(noreplace) %{_sysconfdir}/rpmlint/config
+%{_sysconfdir}/bash_completion.d/
 %{_bindir}/rpmdiff
 %{_bindir}/rpmlint
 %dir %{_datadir}/rpmlint/
-%{_sysconfdir}/bash_completion.d/
+%{_datadir}/rpmlint/config
+%{_mandir}/man1/rpmlint.1*
 
 
 %changelog
+* Tue Apr 11 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.76-1
+- 0.76.
+
+* Mon Mar 27 2006 Ville Skytt?? <ville.skytta at iki.fi>
+- Don't pass -T to objdump for *.debug files (#185227).
+- lib64 library path fixes (#185228).
+
+* Wed Mar 15 2006 Ville Skytt?? <ville.skytta at iki.fi>
+- Accept zlib License (#185501).
+
+* Tue Feb 28 2006 Ville Skytt?? <ville.skytta at iki.fi>
+- Accept Ruby License (#183384) and SIL Open Font License (#176405).
+
 * Sat Feb 18 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.75-1
 - 0.75 + -devel Epoch version check patch from CVS.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	12 Feb 2006 20:31:35 -0000	1.11
+++ sources	11 Apr 2006 06:21:45 -0000	1.12
@@ -1 +1 @@
-22a7657bb976ee2b1df851bc3976f70a  rpmlint-0.75.tar.bz2
+f93d1e1d8adde6b97ddbda46e12169ab  rpmlint-0.76.tar.bz2


--- rpmlint-0.71-disttag.patch DELETED ---


--- rpmlint-0.71-doc-exec.patch DELETED ---


--- rpmlint-0.71-la-exec.patch DELETED ---


--- rpmlint-0.71-prereq.patch DELETED ---


--- rpmlint-0.75-develdep.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 11 06:21:39 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 10 Apr 2006 23:21:39 -0700
Subject: rpms/rpmlint/FC-5 rpmlint-0.76-debuginfo.patch, NONE,
	1.1 rpmlint-0.76-disttag.patch, NONE, 1.1 .cvsignore, 1.11,
	1.12 rpmlint-fedora-config, 1.11, 1.12 rpmlint.spec, 1.22,
	1.23 sources, 1.11, 1.12 rpmlint-0.71-disttag.patch, 1.1,
	NONE rpmlint-0.71-doc-exec.patch, 1.1,
	NONE rpmlint-0.71-la-exec.patch, 1.1,
	NONE rpmlint-0.71-prereq.patch, 1.1,
	NONE rpmlint-0.75-develdep.patch, 1.1, NONE
Message-ID: <200604110622.k3B6MBNh023013@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/rpmlint/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22911/FC-5

Modified Files:
	.cvsignore rpmlint-fedora-config rpmlint.spec sources 
Added Files:
	rpmlint-0.76-debuginfo.patch rpmlint-0.76-disttag.patch 
Removed Files:
	rpmlint-0.71-disttag.patch rpmlint-0.71-doc-exec.patch 
	rpmlint-0.71-la-exec.patch rpmlint-0.71-prereq.patch 
	rpmlint-0.75-develdep.patch 
Log Message:
* Tue Apr 11 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.76-1
- 0.76.

* Mon Mar 27 2006 Ville Skytt?? <ville.skytta at iki.fi>
- Don't pass -T to objdump for *.debug files (#185227).
- lib64 library path fixes (#185228).

* Wed Mar 15 2006 Ville Skytt?? <ville.skytta at iki.fi>
- Accept zlib License (#185501).

* Tue Feb 28 2006 Ville Skytt?? <ville.skytta at iki.fi>
- Accept Ruby License (#183384) and SIL Open Font License (#176405).


rpmlint-0.76-debuginfo.patch:

--- NEW FILE rpmlint-0.76-debuginfo.patch ---
Index: FilesCheck.py
===================================================================
--- FilesCheck.py	(revision 1144)
+++ FilesCheck.py	(working copy)
@@ -158,7 +158,7 @@
 includefile_regex=re.compile('\.(c|h|a|cmi)$')
 buildconfigfile_regex=re.compile('(\.pc|/bin/.+-config)$')
 sofile_regex=re.compile('/lib(64)?/[^/]+\.so$')
-devel_regex=re.compile('-(devel|source)$')
+devel_regex=re.compile('-(debug(info)?|devel|source)$')
 lib_regex=re.compile('lib(64)?/lib[^/]*\.so\..*')
 ldconfig_regex=re.compile('^[^#]*ldconfig', re.MULTILINE)
 depmod_regex=re.compile('^[^#]*depmod', re.MULTILINE)

rpmlint-0.76-disttag.patch:

--- NEW FILE rpmlint-0.76-disttag.patch ---
--- TagsCheck.py~	2006-04-05 19:21:45.000000000 +0300
+++ TagsCheck.py	2006-04-08 23:04:04.000000000 +0300
@@ -342,2 +342,3 @@
 changelog_version_regex=re.compile('[^>]([^ >]+)\s*$')
+fedora_disttag_regex=re.compile('\.(fc|rhe?l)\d+$')
 release_ext=Config.getOption('ReleaseExtension')
@@ -556,3 +557,3 @@
                             expected=str(epoch) + ':' + expected
-                        if expected != ret.group(1):
+                        if ret.group(1) not in (expected, fedora_disttag_regex.sub('', expected)):
                             printWarning(pkg, 'incoherent-version-in-changelog', ret.group(1), expected)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	12 Feb 2006 20:31:35 -0000	1.11
+++ .cvsignore	11 Apr 2006 06:21:39 -0000	1.12
@@ -1 +1 @@
-rpmlint-0.75.tar.bz2
+rpmlint-0.76.tar.bz2


Index: rpmlint-fedora-config
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-5/rpmlint-fedora-config,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- rpmlint-fedora-config	17 Jan 2006 20:33:54 -0000	1.11
+++ rpmlint-fedora-config	11 Apr 2006 06:21:39 -0000	1.12
@@ -4,9 +4,6 @@
 
 from Config import *
 
-setOption("ReleaseExtension", '')
-setOption("ValidBuildHost", ".*")
-setOption("Packager", ".*")
 setOption("UseVersionInChangeLog", 1)
 setOption("UseBzip2", 0)
 setOption("UseDefaultRunlevels", 0)
@@ -65,8 +62,11 @@
     "Public Domain",
     "Python Software Foundation License",
     "QPL",
+    "Ruby License",
     "Sun Public License",
+    "SIL Open Font License",
     "W3C Software License",
+    "zlib License",
     "Zope Public License",
 ))
 setOption("ValidShells", (
@@ -82,22 +82,23 @@
 ))
 
 # Output filters
-addFilter("W: .* source-or-patch-not-[bg]zipped .*")
-addFilter("E: .* lib-package-without-%mklibname")
-addFilter("E: .* no-dependency-on (perl|python)-base.*")
-addFilter("E: .* no-dependency-on locales-.*")
-addFilter("W: .* (python|perl5)-naming-policy-not-applied.*")
-addFilter("W: .* invalid-(distribution|vendor) .*")
-addFilter("E: .* no-(packager-tag|signature)")
-addFilter("E: .* incoherent-version-in-name.*")
-addFilter("E: .* invalid-build-requires .*")
-addFilter("W: .* ghost-files-without-postin")
-addFilter("W: .* postin-without-ghost-file-creation .*")
-addFilter("W: .* no-major-in-name .*")
-addFilter("W: .* no-provides .*")
-addFilter("E: .* executable-in-library-package .*")
-addFilter("E: .* non-versioned-file-in-library-package .*")
-addFilter("E: .* requires-on-release .*")
-addFilter("W: .* jar-not-indexed .*")
-addFilter("E: .* invalid-(lc-messages|locale-man)-dir .*")
-addFilter("E: .* outside-libdir-files .*")
+addFilter("source-or-patch-not-[bg]zipped")
+addFilter("%mklibname")
+addFilter("no-dependency-on (perl|python)-base")
+addFilter("no-dependency-on locales-")
+addFilter("(python|perl5)-naming-policy-not-applied")
+addFilter("no-(packager-tag|signature)")
+addFilter("incoherent-version-in-name")
+addFilter("invalid-build-requires")
+addFilter("ghost-files-without-postin")
+addFilter("postin-without-ghost-file-creation")
+addFilter("no-major-in-name")
+addFilter("no-provides")
+addFilter("executable-in-library-package")
+addFilter("non-versioned-file-in-library-package")
+addFilter("requires-on-release")
+addFilter("jar-not-indexed")
+addFilter("invalid-(lc-messages|locale-man)-dir")
+addFilter("outside-libdir-files")
+addFilter('-debuginfo no-documentation')
+addFilter('-debuginfo [^ ]+ /usr/lib/debug/')


Index: rpmlint.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-5/rpmlint.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- rpmlint.spec	17 Feb 2006 23:06:36 -0000	1.22
+++ rpmlint.spec	11 Apr 2006 06:21:39 -0000	1.23
@@ -1,19 +1,19 @@
+# TODO:
+# - don't override upstream default valid groups, just add "Development/Debug"
+# - switch to upstream valid license list?
+
 Name:           rpmlint
-Version:        0.75
+Version:        0.76
 Release:        1%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
 License:        GPL
-URL:            http://people.mandriva.com/~flepied/projects/rpmlint/
-#Source0:        http://people.mandriva.com/~flepied/projects/rpmlint/dist/%{name}-%{version}.tar.bz2
-Source0:        http://www.zarb.org/~misc/%{name}-%{version}.tar.bz2
+URL:            http://rpmlint.zarb.org/
+Source0:        http://rpmlint.zarb.org/download/%{name}-%{version}.tar.bz2
 Source1:        %{name}-fedora-config
-Patch0:         %{name}-0.71-disttag.patch
-Patch1:         %{name}-0.75-develdep.patch
-Patch2:         %{name}-0.71-prereq.patch
-Patch3:         %{name}-0.71-la-exec.patch
-Patch4:         %{name}-0.71-doc-exec.patch
+Patch0:         %{name}-0.76-disttag.patch
+Patch1:         %{name}-0.76-debuginfo.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -34,14 +34,8 @@
 %setup -q
 %patch0
 %patch1
-%patch2
-%patch3
-%patch4
 sed -i -e 's|/etc/httpd/webapps\.d|%{_sysconfdir}/httpd/conf.d|' \
   FilesCheck.py I18NCheck.py
-for f in AUTHORS ChangeLog ; do
-  iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
-done
 
 
 %build
@@ -50,15 +44,16 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_datadir}/rpmlint/check-install.py*
-install -Dpm 644 rpmlint.bash-completion \
-  $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/rpmlint
-install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config
+make install DESTDIR=$RPM_BUILD_ROOT ETCDIR=%{_sysconfdir} MANDIR=%{_mandir} \
+  LIBDIR=%{_datadir}/rpmlint BINDIR=%{_bindir}
+echo "# Add local rpmlint configuration here." \
+  > $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config
+install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/rpmlint/config
 
 # Take care of files that may be generated later.
-touch $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config{c,o}
+touch $RPM_BUILD_ROOT{%{_datadir},%{_sysconfdir}}/rpmlint/config{c,o}
 echo '%ghost %{_sysconfdir}/rpmlint/config?' > %{name}-%{version}-files.list
+echo '%ghost %{_datadir}/rpmlint/config?' >> %{name}-%{version}-files.list
 for f in `find $RPM_BUILD_ROOT%{_datadir}/rpmlint -type f -name "*.py"` ; do
   f=`echo "$f" | sed "s|^$RPM_BUILD_ROOT||"`
   echo "$f" >> %{name}-%{version}-files.list
@@ -82,13 +77,28 @@
 %doc AUTHORS COPYING ChangeLog README
 %dir %{_sysconfdir}/rpmlint/
 %config(noreplace) %{_sysconfdir}/rpmlint/config
+%{_sysconfdir}/bash_completion.d/
 %{_bindir}/rpmdiff
 %{_bindir}/rpmlint
 %dir %{_datadir}/rpmlint/
-%{_sysconfdir}/bash_completion.d/
+%{_datadir}/rpmlint/config
+%{_mandir}/man1/rpmlint.1*
 
 
 %changelog
+* Tue Apr 11 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.76-1
+- 0.76.
+
+* Mon Mar 27 2006 Ville Skytt?? <ville.skytta at iki.fi>
+- Don't pass -T to objdump for *.debug files (#185227).
+- lib64 library path fixes (#185228).
+
+* Wed Mar 15 2006 Ville Skytt?? <ville.skytta at iki.fi>
+- Accept zlib License (#185501).
+
+* Tue Feb 28 2006 Ville Skytt?? <ville.skytta at iki.fi>
+- Accept Ruby License (#183384) and SIL Open Font License (#176405).
+
 * Sat Feb 18 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.75-1
 - 0.75 + -devel Epoch version check patch from CVS.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	12 Feb 2006 20:31:35 -0000	1.11
+++ sources	11 Apr 2006 06:21:39 -0000	1.12
@@ -1 +1 @@
-22a7657bb976ee2b1df851bc3976f70a  rpmlint-0.75.tar.bz2
+f93d1e1d8adde6b97ddbda46e12169ab  rpmlint-0.76.tar.bz2


--- rpmlint-0.71-disttag.patch DELETED ---


--- rpmlint-0.71-doc-exec.patch DELETED ---


--- rpmlint-0.71-la-exec.patch DELETED ---


--- rpmlint-0.71-prereq.patch DELETED ---


--- rpmlint-0.75-develdep.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 11 06:21:38 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 10 Apr 2006 23:21:38 -0700
Subject: rpms/rpmlint/FC-4 rpmlint-0.76-debuginfo.patch, NONE,
	1.1 rpmlint-0.76-disttag.patch, NONE, 1.1 .cvsignore, 1.10,
	1.11 rpmlint-fedora-config, 1.9, 1.10 rpmlint.spec, 1.17,
	1.18 sources, 1.10, 1.11 rpmlint-0.71-disttag.patch, 1.1,
	NONE rpmlint-0.71-doc-exec.patch, 1.1,
	NONE rpmlint-0.71-la-exec.patch, 1.1,
	NONE rpmlint-0.71-prereq.patch, 1.1,
	NONE rpmlint-0.75-develdep.patch, 1.1, NONE
Message-ID: <200604110622.k3B6MAKJ023007@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/rpmlint/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22911/FC-4

Modified Files:
	.cvsignore rpmlint-fedora-config rpmlint.spec sources 
Added Files:
	rpmlint-0.76-debuginfo.patch rpmlint-0.76-disttag.patch 
Removed Files:
	rpmlint-0.71-disttag.patch rpmlint-0.71-doc-exec.patch 
	rpmlint-0.71-la-exec.patch rpmlint-0.71-prereq.patch 
	rpmlint-0.75-develdep.patch 
Log Message:
* Tue Apr 11 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.76-1
- 0.76.

* Mon Mar 27 2006 Ville Skytt?? <ville.skytta at iki.fi>
- Don't pass -T to objdump for *.debug files (#185227).
- lib64 library path fixes (#185228).

* Wed Mar 15 2006 Ville Skytt?? <ville.skytta at iki.fi>
- Accept zlib License (#185501).

* Tue Feb 28 2006 Ville Skytt?? <ville.skytta at iki.fi>
- Accept Ruby License (#183384) and SIL Open Font License (#176405).


rpmlint-0.76-debuginfo.patch:

--- NEW FILE rpmlint-0.76-debuginfo.patch ---
Index: FilesCheck.py
===================================================================
--- FilesCheck.py	(revision 1144)
+++ FilesCheck.py	(working copy)
@@ -158,7 +158,7 @@
 includefile_regex=re.compile('\.(c|h|a|cmi)$')
 buildconfigfile_regex=re.compile('(\.pc|/bin/.+-config)$')
 sofile_regex=re.compile('/lib(64)?/[^/]+\.so$')
-devel_regex=re.compile('-(devel|source)$')
+devel_regex=re.compile('-(debug(info)?|devel|source)$')
 lib_regex=re.compile('lib(64)?/lib[^/]*\.so\..*')
 ldconfig_regex=re.compile('^[^#]*ldconfig', re.MULTILINE)
 depmod_regex=re.compile('^[^#]*depmod', re.MULTILINE)

rpmlint-0.76-disttag.patch:

--- NEW FILE rpmlint-0.76-disttag.patch ---
--- TagsCheck.py~	2006-04-05 19:21:45.000000000 +0300
+++ TagsCheck.py	2006-04-08 23:04:04.000000000 +0300
@@ -342,2 +342,3 @@
 changelog_version_regex=re.compile('[^>]([^ >]+)\s*$')
+fedora_disttag_regex=re.compile('\.(fc|rhe?l)\d+$')
 release_ext=Config.getOption('ReleaseExtension')
@@ -556,3 +557,3 @@
                             expected=str(epoch) + ':' + expected
-                        if expected != ret.group(1):
+                        if ret.group(1) not in (expected, fedora_disttag_regex.sub('', expected)):
                             printWarning(pkg, 'incoherent-version-in-changelog', ret.group(1), expected)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	18 Feb 2006 13:17:19 -0000	1.10
+++ .cvsignore	11 Apr 2006 06:21:38 -0000	1.11
@@ -1 +1 @@
-rpmlint-0.75.tar.bz2
+rpmlint-0.76.tar.bz2


Index: rpmlint-fedora-config
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-4/rpmlint-fedora-config,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rpmlint-fedora-config	18 Feb 2006 13:17:19 -0000	1.9
+++ rpmlint-fedora-config	11 Apr 2006 06:21:38 -0000	1.10
@@ -4,9 +4,6 @@
 
 from Config import *
 
-setOption("ReleaseExtension", '')
-setOption("ValidBuildHost", ".*")
-setOption("Packager", ".*")
 setOption("UseVersionInChangeLog", 1)
 setOption("UseBzip2", 0)
 setOption("UseDefaultRunlevels", 0)
@@ -65,8 +62,11 @@
     "Public Domain",
     "Python Software Foundation License",
     "QPL",
+    "Ruby License",
     "Sun Public License",
+    "SIL Open Font License",
     "W3C Software License",
+    "zlib License",
     "Zope Public License",
 ))
 setOption("ValidShells", (
@@ -82,22 +82,23 @@
 ))
 
 # Output filters
-addFilter("W: .* source-or-patch-not-[bg]zipped .*")
-addFilter("E: .* lib-package-without-%mklibname")
-addFilter("E: .* no-dependency-on (perl|python)-base.*")
-addFilter("E: .* no-dependency-on locales-.*")
-addFilter("W: .* (python|perl5)-naming-policy-not-applied.*")
-addFilter("W: .* invalid-(distribution|vendor) .*")
-addFilter("E: .* no-(packager-tag|signature)")
-addFilter("E: .* incoherent-version-in-name.*")
-addFilter("E: .* invalid-build-requires .*")
-addFilter("W: .* ghost-files-without-postin")
-addFilter("W: .* postin-without-ghost-file-creation .*")
-addFilter("W: .* no-major-in-name .*")
-addFilter("W: .* no-provides .*")
-addFilter("E: .* executable-in-library-package .*")
-addFilter("E: .* non-versioned-file-in-library-package .*")
-addFilter("E: .* requires-on-release .*")
-addFilter("W: .* jar-not-indexed .*")
-addFilter("E: .* invalid-(lc-messages|locale-man)-dir .*")
-addFilter("E: .* outside-libdir-files .*")
+addFilter("source-or-patch-not-[bg]zipped")
+addFilter("%mklibname")
+addFilter("no-dependency-on (perl|python)-base")
+addFilter("no-dependency-on locales-")
+addFilter("(python|perl5)-naming-policy-not-applied")
+addFilter("no-(packager-tag|signature)")
+addFilter("incoherent-version-in-name")
+addFilter("invalid-build-requires")
+addFilter("ghost-files-without-postin")
+addFilter("postin-without-ghost-file-creation")
+addFilter("no-major-in-name")
+addFilter("no-provides")
+addFilter("executable-in-library-package")
+addFilter("non-versioned-file-in-library-package")
+addFilter("requires-on-release")
+addFilter("jar-not-indexed")
+addFilter("invalid-(lc-messages|locale-man)-dir")
+addFilter("outside-libdir-files")
+addFilter('-debuginfo no-documentation')
+addFilter('-debuginfo [^ ]+ /usr/lib/debug/')


Index: rpmlint.spec
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-4/rpmlint.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- rpmlint.spec	18 Feb 2006 13:17:19 -0000	1.17
+++ rpmlint.spec	11 Apr 2006 06:21:38 -0000	1.18
@@ -1,19 +1,19 @@
+# TODO:
+# - don't override upstream default valid groups, just add "Development/Debug"
+# - switch to upstream valid license list?
+
 Name:           rpmlint
-Version:        0.75
+Version:        0.76
 Release:        1%{?dist}
 Summary:        Tool for checking common errors in RPM packages
 
 Group:          Development/Tools
 License:        GPL
-URL:            http://people.mandriva.com/~flepied/projects/rpmlint/
-#Source0:        http://people.mandriva.com/~flepied/projects/rpmlint/dist/%{name}-%{version}.tar.bz2
-Source0:        http://www.zarb.org/~misc/%{name}-%{version}.tar.bz2
+URL:            http://rpmlint.zarb.org/
+Source0:        http://rpmlint.zarb.org/download/%{name}-%{version}.tar.bz2
 Source1:        %{name}-fedora-config
-Patch0:         %{name}-0.71-disttag.patch
-Patch1:         %{name}-0.75-develdep.patch
-Patch2:         %{name}-0.71-prereq.patch
-Patch3:         %{name}-0.71-la-exec.patch
-Patch4:         %{name}-0.71-doc-exec.patch
+Patch0:         %{name}-0.76-disttag.patch
+Patch1:         %{name}-0.76-debuginfo.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -34,14 +34,8 @@
 %setup -q
 %patch0
 %patch1
-%patch2
-%patch3
-%patch4
 sed -i -e 's|/etc/httpd/webapps\.d|%{_sysconfdir}/httpd/conf.d|' \
   FilesCheck.py I18NCheck.py
-for f in AUTHORS ChangeLog ; do
-  iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
-done
 
 
 %build
@@ -50,15 +44,16 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_datadir}/rpmlint/check-install.py*
-install -Dpm 644 rpmlint.bash-completion \
-  $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/rpmlint
-install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config
+make install DESTDIR=$RPM_BUILD_ROOT ETCDIR=%{_sysconfdir} MANDIR=%{_mandir} \
+  LIBDIR=%{_datadir}/rpmlint BINDIR=%{_bindir}
+echo "# Add local rpmlint configuration here." \
+  > $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config
+install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/rpmlint/config
 
 # Take care of files that may be generated later.
-touch $RPM_BUILD_ROOT%{_sysconfdir}/rpmlint/config{c,o}
+touch $RPM_BUILD_ROOT{%{_datadir},%{_sysconfdir}}/rpmlint/config{c,o}
 echo '%ghost %{_sysconfdir}/rpmlint/config?' > %{name}-%{version}-files.list
+echo '%ghost %{_datadir}/rpmlint/config?' >> %{name}-%{version}-files.list
 for f in `find $RPM_BUILD_ROOT%{_datadir}/rpmlint -type f -name "*.py"` ; do
   f=`echo "$f" | sed "s|^$RPM_BUILD_ROOT||"`
   echo "$f" >> %{name}-%{version}-files.list
@@ -82,13 +77,28 @@
 %doc AUTHORS COPYING ChangeLog README
 %dir %{_sysconfdir}/rpmlint/
 %config(noreplace) %{_sysconfdir}/rpmlint/config
+%{_sysconfdir}/bash_completion.d/
 %{_bindir}/rpmdiff
 %{_bindir}/rpmlint
 %dir %{_datadir}/rpmlint/
-%{_sysconfdir}/bash_completion.d/
+%{_datadir}/rpmlint/config
+%{_mandir}/man1/rpmlint.1*
 
 
 %changelog
+* Tue Apr 11 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.76-1
+- 0.76.
+
+* Mon Mar 27 2006 Ville Skytt?? <ville.skytta at iki.fi>
+- Don't pass -T to objdump for *.debug files (#185227).
+- lib64 library path fixes (#185228).
+
+* Wed Mar 15 2006 Ville Skytt?? <ville.skytta at iki.fi>
+- Accept zlib License (#185501).
+
+* Tue Feb 28 2006 Ville Skytt?? <ville.skytta at iki.fi>
+- Accept Ruby License (#183384) and SIL Open Font License (#176405).
+
 * Sat Feb 18 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.75-1
 - 0.75 + -devel Epoch version check patch from CVS.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rpmlint/FC-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	18 Feb 2006 13:17:19 -0000	1.10
+++ sources	11 Apr 2006 06:21:38 -0000	1.11
@@ -1 +1 @@
-22a7657bb976ee2b1df851bc3976f70a  rpmlint-0.75.tar.bz2
+f93d1e1d8adde6b97ddbda46e12169ab  rpmlint-0.76.tar.bz2


--- rpmlint-0.71-disttag.patch DELETED ---


--- rpmlint-0.71-doc-exec.patch DELETED ---


--- rpmlint-0.71-la-exec.patch DELETED ---


--- rpmlint-0.71-prereq.patch DELETED ---


--- rpmlint-0.75-develdep.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 11 07:56:19 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Tue, 11 Apr 2006 00:56:19 -0700
Subject: rpms/abiword/devel abiword-2.4.4-desktop.patch, NONE, 1.1 .cvsignore,
	1.13, 1.14 abiword.spec, 1.33, 1.34 sources, 1.13,
	1.14 abiword-2.4.2-macros.patch, 1.1, NONE
Message-ID: <200604110756.k3B7uLFn025406@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/abiword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25380

Modified Files:
	.cvsignore abiword.spec sources 
Added Files:
	abiword-2.4.4-desktop.patch 
Removed Files:
	abiword-2.4.2-macros.patch 
Log Message:
New upstream version



abiword-2.4.4-desktop.patch:

--- NEW FILE abiword-2.4.4-desktop.patch ---
diff -r -u abiword-2.4.4.orig/abi/abiword.desktop abiword-2.4.4/abi/abiword.desktop
--- abiword-2.4.4.orig/abi/abiword.desktop	2006-04-03 14:14:01.000000000 +0200
+++ abiword-2.4.4/abi/abiword.desktop	2006-04-11 00:12:19.000000000 +0200
@@ -7,7 +7,7 @@
 StartupNotify=true
 Encoding=UTF-8
 X-Desktop-File-Install-Version=0.9
-MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;
+MimeType=application/msword;application/vnd.sun.xml.writer;application/vnd.wordperfect;application/x-abiword;text/x-abiword;text/x-xml-abiword;application/rtf;text/plain;application/xhtml+xml;text/html;text/vnd.wap.wml;application/vnd.plain;application/vnd.stardivision.writer;application/x-mif;application/x-kword;application/x-applix-word;application/x-mswrite;application/vnd.oasis.opendocument.text;
 Name=AbiWord
 GenericName=Word Processor
 Comment=AbiWord Word Processor


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	5 Jan 2006 14:57:02 -0000	1.13
+++ .cvsignore	11 Apr 2006 07:56:19 -0000	1.14
@@ -1 +1 @@
-abiword-2.4.2.tar.bz2
+abiword-2.4.4.tar.bz2


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- abiword.spec	29 Mar 2006 11:17:06 -0000	1.33
+++ abiword.spec	11 Apr 2006 07:56:19 -0000	1.34
@@ -2,8 +2,8 @@
 
 Summary: The AbiWord word processor
 Name: abiword
-Version: 2.4.2
-Release: 8%{?dist}
+Version: 2.4.4
+Release: 1%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -30,7 +30,7 @@
 BuildRequires: librsvg2-devel
 BuildRequires: libwmf-devel
 BuildRequires: aiksaurus-gtk-devel >= 1.2.1
-BuildRequires: link-grammar-devel >= 4.1.3
+BuildRequires: link-grammar-devel >= 4.2.1
 BuildRequires: gtkmathview-devel >= 0.7.5
 BuildRequires: libgsf-devel >= 1.12.1
 
@@ -41,8 +41,7 @@
 URL: http://www.abisource.com/
 
 Patch0: abiword-2.0.9-windowshelppaths.patch
-Patch1: abiword-2.4.2-desktop.patch
-Patch2: abiword-2.4.2-macros.patch
+Patch1: abiword-2.4.4-desktop.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. The goal is to make
@@ -52,7 +51,6 @@
 %setup -q 
 %patch0 -p1 -b .windowshelppaths
 %patch1 -p1 -b .desktop
-%patch2 -p1 -b .macros
 
 %build
 cd abi
@@ -134,6 +132,10 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Tue Apr 11 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.4-1.fc6
+- New upstream version
+- Remove the macro patch and update the desktop patch
+
 * Wed Mar 29 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.2-8.fc6
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	5 Jan 2006 14:57:02 -0000	1.13
+++ sources	11 Apr 2006 07:56:19 -0000	1.14
@@ -1 +1 @@
-935f1218eab7ff96b7a23cfeba4e76d1  abiword-2.4.2.tar.bz2
+69dd69179b861a41613291afd10af9ab  abiword-2.4.4.tar.bz2


--- abiword-2.4.2-macros.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 11 08:00:53 2006
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Tue, 11 Apr 2006 01:00:53 -0700
Subject: mock/etc fedora-1-i386-core.cfg, 1.1, 1.2 fedora-2-i386-core.cfg,
	1.1, 1.2 fedora-3-i386-core.cfg, 1.3,
	1.4 fedora-3-x86_64-core.cfg, 1.3, 1.4 fedora-4-i386-core.cfg,
	1.3, 1.4 fedora-4-ppc-core.cfg, 1.4,
	1.5 fedora-4-x86_64-core.cfg, 1.3, 1.4 fedora-5-i386-core.cfg,
	1.2, 1.3 fedora-5-ppc-core.cfg, 1.3,
	1.4 fedora-5-x86_64-core.cfg, 1.2, 1.3 redhat-73-i386.cfg, 1.1,
	1.2 redhat-9-i386.cfg, 1.1, 1.2
Message-ID: <200604110800.k3B80rjT025495@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/fedora/mock/etc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25462

Modified Files:
	fedora-1-i386-core.cfg fedora-2-i386-core.cfg 
	fedora-3-i386-core.cfg fedora-3-x86_64-core.cfg 
	fedora-4-i386-core.cfg fedora-4-ppc-core.cfg 
	fedora-4-x86_64-core.cfg fedora-5-i386-core.cfg 
	fedora-5-ppc-core.cfg fedora-5-x86_64-core.cfg 
	redhat-73-i386.cfg redhat-9-i386.cfg 
Log Message:

modify all config files for chroot_dep_package option
default package name to buildsys-build



Index: fedora-1-i386-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-1-i386-core.cfg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-1-i386-core.cfg	21 Aug 2005 16:29:33 -0000	1.1
+++ fedora-1-i386-core.cfg	11 Apr 2006 08:00:51 -0000	1.2
@@ -9,7 +9,7 @@
 config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
 config_opts['yum'] = '/usr/sbin/mock-helper yum'
 config_opts['runuser'] = '/bin/su'
-config_opts['buildgroup'] = 'build'
+config_opts['chroot_dep_package'] = 'buildsys-build'
 config_opts['chrootuser'] = 'mockbuild'
 config_opts['chrootgroup'] = 'mockbuild'
 config_opts['chrootuid'] = os.geteuid()
@@ -42,6 +42,6 @@
 
 [groups]
 name=groups
-baseurl=http://fedoraproject.org/buildgroups/1/i386/
+baseurl=http://fedoraproject.org/chroot_dep_packages/1/i386/
 
 """


Index: fedora-2-i386-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-2-i386-core.cfg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-2-i386-core.cfg	21 Aug 2005 16:29:33 -0000	1.1
+++ fedora-2-i386-core.cfg	11 Apr 2006 08:00:51 -0000	1.2
@@ -9,7 +9,7 @@
 config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
 config_opts['yum'] = '/usr/sbin/mock-helper yum'
 config_opts['runuser'] = '/bin/su'
-config_opts['buildgroup'] = 'build'
+config_opts['chroot_dep_package'] = 'buildsys-build'
 config_opts['chrootuser'] = 'mockbuild'
 config_opts['chrootgroup'] = 'mockbuild'
 config_opts['chrootuid'] = os.geteuid()
@@ -42,6 +42,6 @@
 
 [groups]
 name=groups
-baseurl=http://fedoraproject.org/buildgroups/2/i386/
+baseurl=http://fedoraproject.org/chroot_dep_packages/2/i386/
 
 """


Index: fedora-3-i386-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-3-i386-core.cfg,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-3-i386-core.cfg	28 Jul 2005 14:02:59 -0000	1.3
+++ fedora-3-i386-core.cfg	11 Apr 2006 08:00:51 -0000	1.4
@@ -9,7 +9,7 @@
 config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
 config_opts['yum'] = '/usr/sbin/mock-helper yum'
 config_opts['runuser'] = '/sbin/runuser'
-config_opts['buildgroup'] = 'build'
+config_opts['chroot_dep_package'] = 'buildsys-build'
 config_opts['chrootuser'] = 'mockbuild'
 config_opts['chrootgroup'] = 'mockbuild'
 config_opts['chrootuid'] = os.geteuid()
@@ -42,7 +42,7 @@
 
 [groups]
 name=groups
-baseurl=http://fedoraproject.org/buildgroups/3/i386/
+baseurl=http://fedoraproject.org/chroot_dep_packages/3/i386/
 
 [extras]
 name=extras


Index: fedora-3-x86_64-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-3-x86_64-core.cfg,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-3-x86_64-core.cfg	28 Jul 2005 14:02:59 -0000	1.3
+++ fedora-3-x86_64-core.cfg	11 Apr 2006 08:00:51 -0000	1.4
@@ -9,7 +9,7 @@
 config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
 config_opts['yum'] = '/usr/sbin/mock-helper yum'
 config_opts['runuser'] = '/sbin/runuser'
-config_opts['buildgroup'] = 'build'
+config_opts['chroot_dep_package'] = 'buildsys-build'
 config_opts['chrootuser'] = 'mockbuild'
 config_opts['chrootgroup'] = 'mockbuild'
 config_opts['chrootuid'] = os.geteuid()
@@ -43,7 +43,7 @@
 
 [groups]
 name=groups
-baseurl=http://fedoraproject.org/buildgroups/3/x86_64/
+baseurl=http://fedoraproject.org/chroot_dep_packages/3/x86_64/
 
 [extras]
 name=extras


Index: fedora-4-i386-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-4-i386-core.cfg,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-4-i386-core.cfg	28 Jul 2005 14:02:59 -0000	1.3
+++ fedora-4-i386-core.cfg	11 Apr 2006 08:00:51 -0000	1.4
@@ -10,7 +10,7 @@
 config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
 config_opts['yum'] = '/usr/sbin/mock-helper yum'
 config_opts['runuser'] = '/sbin/runuser'
-config_opts['buildgroup'] = 'build'
+config_opts['chroot_dep_package'] = 'buildsys-build'
 config_opts['chrootuser'] = 'mockbuild'
 config_opts['chrootgroup'] = 'mockbuild'
 config_opts['chrootuid'] = os.geteuid()
@@ -45,7 +45,7 @@
 
 [groups]
 name=groups
-baseurl=http://fedoraproject.org/buildgroups/4/i386/
+baseurl=http://fedoraproject.org/chroot_dep_packages/4/i386/
 
 [extras]
 name=extras


Index: fedora-4-ppc-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-4-ppc-core.cfg,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedora-4-ppc-core.cfg	29 Jul 2005 05:11:13 -0000	1.4
+++ fedora-4-ppc-core.cfg	11 Apr 2006 08:00:51 -0000	1.5
@@ -9,7 +9,7 @@
 config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
 config_opts['yum'] = '/usr/sbin/mock-helper yum'
 config_opts['runuser'] = '/sbin/runuser'
-config_opts['buildgroup'] = 'build'
+config_opts['chroot_dep_package'] = 'buildsys-build'
 config_opts['chrootuser'] = 'mockbuild'
 config_opts['chrootgroup'] = 'mockbuild'
 config_opts['chrootuid'] = os.geteuid()
@@ -44,7 +44,7 @@
 
 [groups]
 name=groups
-baseurl=http://fedoraproject.org/buildgroups/4/ppc/
+baseurl=http://fedoraproject.org/chroot_dep_packages/4/ppc/
 
 [extras]
 name=extras


Index: fedora-4-x86_64-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-4-x86_64-core.cfg,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-4-x86_64-core.cfg	28 Jul 2005 14:02:59 -0000	1.3
+++ fedora-4-x86_64-core.cfg	11 Apr 2006 08:00:51 -0000	1.4
@@ -10,7 +10,7 @@
 config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
 config_opts['yum'] = '/usr/sbin/mock-helper yum'
 config_opts['runuser'] = '/sbin/runuser'
-config_opts['buildgroup'] = 'build'
+config_opts['chroot_dep_package'] = 'buildsys-build'
 config_opts['chrootuser'] = 'mockbuild'
 config_opts['chrootgroup'] = 'mockbuild'
 config_opts['chrootuid'] = os.geteuid()
@@ -46,7 +46,7 @@
 
 [groups]
 name=groups
-baseurl=http://fedoraproject.org/buildgroups/4/x86_64/
+baseurl=http://fedoraproject.org/chroot_dep_packages/4/x86_64/
 
 [extras]
 name=extras


Index: fedora-5-i386-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-5-i386-core.cfg,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-5-i386-core.cfg	28 Jul 2005 14:02:59 -0000	1.2
+++ fedora-5-i386-core.cfg	11 Apr 2006 08:00:51 -0000	1.3
@@ -10,7 +10,7 @@
 config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
 config_opts['yum'] = '/usr/sbin/mock-helper yum'
 config_opts['runuser'] = '/sbin/runuser'
-config_opts['buildgroup'] = 'build'
+config_opts['chroot_dep_package'] = 'buildsys-build'
 config_opts['chrootuser'] = 'mockbuild'
 config_opts['chrootgroup'] = 'mockbuild'
 config_opts['chrootuid'] = os.geteuid()
@@ -39,7 +39,7 @@
 
 [groups]
 name=groups
-baseurl=http://fedoraproject.org/buildgroups/development/i386/
+baseurl=http://fedoraproject.org/chroot_dep_packages/development/i386/
 
 [extras]
 name=extras


Index: fedora-5-ppc-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-5-ppc-core.cfg,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-5-ppc-core.cfg	29 Jul 2005 05:11:13 -0000	1.3
+++ fedora-5-ppc-core.cfg	11 Apr 2006 08:00:51 -0000	1.4
@@ -9,7 +9,7 @@
 config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
 config_opts['yum'] = '/usr/sbin/mock-helper yum'
 config_opts['runuser'] = '/sbin/runuser'
-config_opts['buildgroup'] = 'build'
+config_opts['chroot_dep_package'] = 'buildsys-build'
 config_opts['chrootuser'] = 'mockbuild'
 config_opts['chrootgroup'] = 'mockbuild'
 config_opts['chrootuid'] = os.geteuid()
@@ -39,7 +39,7 @@
 
 [groups]
 name=groups
-baseurl=http://fedoraproject.org/buildgroups/development/ppc/
+baseurl=http://fedoraproject.org/chroot_dep_packages/development/ppc/
 
 [extras]
 name=extras


Index: fedora-5-x86_64-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-5-x86_64-core.cfg,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-5-x86_64-core.cfg	28 Jul 2005 14:02:59 -0000	1.2
+++ fedora-5-x86_64-core.cfg	11 Apr 2006 08:00:51 -0000	1.3
@@ -10,7 +10,7 @@
 config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
 config_opts['yum'] = '/usr/sbin/mock-helper yum'
 config_opts['runuser'] = '/sbin/runuser'
-config_opts['buildgroup'] = 'build'
+config_opts['chroot_dep_package'] = 'buildsys-build'
 config_opts['chrootuser'] = 'mockbuild'
 config_opts['chrootgroup'] = 'mockbuild'
 config_opts['chrootuid'] = os.geteuid()
@@ -40,7 +40,7 @@
 
 [groups]
 name=groups
-baseurl=http://fedoraproject.org/buildgroups/development/x86_64/
+baseurl=http://fedoraproject.org/chroot_dep_packages/development/x86_64/
 
 [extras]
 name=extras


Index: redhat-73-i386.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/redhat-73-i386.cfg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- redhat-73-i386.cfg	21 Aug 2005 16:29:33 -0000	1.1
+++ redhat-73-i386.cfg	11 Apr 2006 08:00:51 -0000	1.2
@@ -9,7 +9,7 @@
 config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
 config_opts['yum'] = '/usr/sbin/mock-helper yum'
 config_opts['runuser'] = '/bin/su'
-config_opts['buildgroup'] = 'build'
+config_opts['chroot_dep_package'] = 'buildsys-build'
 config_opts['chrootuser'] = 'mockbuild'
 config_opts['chrootgroup'] = 'mockbuild'
 config_opts['chrootuid'] = os.geteuid()
@@ -42,6 +42,6 @@
 
 [groups]
 name=groups
-baseurl=http://fedoraproject.org/buildgroups/rh73/i386/
+baseurl=http://fedoraproject.org/chroot_dep_packages/rh73/i386/
 
 """


Index: redhat-9-i386.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/redhat-9-i386.cfg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- redhat-9-i386.cfg	21 Aug 2005 16:29:33 -0000	1.1
+++ redhat-9-i386.cfg	11 Apr 2006 08:00:51 -0000	1.2
@@ -9,7 +9,7 @@
 config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
 config_opts['yum'] = '/usr/sbin/mock-helper yum'
 config_opts['runuser'] = '/bin/su'
-config_opts['buildgroup'] = 'build'
+config_opts['chroot_dep_package'] = 'buildsys-build'
 config_opts['chrootuser'] = 'mockbuild'
 config_opts['chrootgroup'] = 'mockbuild'
 config_opts['chrootuid'] = os.geteuid()
@@ -42,6 +42,6 @@
 
 [groups]
 name=groups
-baseurl=http://fedoraproject.org/buildgroups/rh9/i386/
+baseurl=http://fedoraproject.org/chroot_dep_packages/rh9/i386/
 
 """



From fedora-extras-commits at redhat.com  Tue Apr 11 08:01:38 2006
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Tue, 11 Apr 2006 01:01:38 -0700
Subject: mock mock.py,1.39,1.40
Message-ID: <200604110801.k3B81ceU027528@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/fedora/mock
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25508

Modified Files:
	mock.py 
Log Message:

remove the 'groupinstall' need to use a buildsys dependency-only package
iterate version to 0.5
more patches to go in, though



Index: mock.py
===================================================================
RCS file: /cvs/fedora/mock/mock.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- mock.py	29 Mar 2006 06:23:21 -0000	1.39
+++ mock.py	11 Apr 2006 08:01:31 -0000	1.40
@@ -28,7 +28,7 @@
 
 from optparse import OptionParser
 
-__VERSION__ = '0.4'
+__VERSION__ = '0.5'
 
 def error(msg):
     print >> sys.stderr, msg
@@ -209,7 +209,7 @@
         
         self._prep_install()
         if self.config['clean']:
-            cmd = 'groupinstall %s' % self.config['buildgroup']
+            cmd = 'install %s' % self.config['chroot_dep_package']
         else:
             cmd = 'update'
 
@@ -694,7 +694,7 @@
     config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
     config_opts['yum'] = '/usr/sbin/mock-helper yum'
     config_opts['runuser'] = '/sbin/runuser'
-    config_opts['buildgroup'] = 'build'
+    config_opts['chroot_dep_package'] = 'buildsys-build'
     config_opts['chrootuser'] = 'mockbuild'
     config_opts['chrootgroup'] = 'mockbuild'
     config_opts['chrootuid'] = 500



From fedora-extras-commits at redhat.com  Tue Apr 11 08:26:24 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Tue, 11 Apr 2006 01:26:24 -0700
Subject: kadischi/livecd_generator create-iso.sh, 1.2, 1.3 kadischi.py, 1.10,
	1.11 livecd-mkinitrd.sh, 1.7, 1.8
Message-ID: <200604110826.k3B8QOnn027698@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi/livecd_generator
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27635/kadischi/livecd_generator

Modified Files:
	create-iso.sh kadischi.py livecd-mkinitrd.sh 
Log Message:
Use SquashFS exclusively, major tidying of kadischi.py


Index: create-iso.sh
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/create-iso.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- create-iso.sh	30 Mar 2006 04:29:22 -0000	1.2
+++ create-iso.sh	11 Apr 2006 08:26:22 -0000	1.3
@@ -3,4 +3,4 @@
 sysdir=$1
 isoimage=$2
 
-mkisofs -quiet $MKISOFSOPTION -R -o $isoimage -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table $sysdir
+mkisofs -quiet -R -o $isoimage -b boot/isolinux/isolinux.bin -c boot/isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table $sysdir


Index: kadischi.py
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/kadischi.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kadischi.py	10 Apr 2006 22:53:32 -0000	1.10
+++ kadischi.py	11 Apr 2006 08:26:22 -0000	1.11
@@ -21,35 +21,27 @@
 product_path = ''
 kernel_version = ''
 
-# OK, we`re starting
 
+# OK, we`re starting
 flc_log ('Starting kadischi...')
 
-# setup dirs
 
+# setup dirs
 bindir = sys.path [0]
 confdir = normalize_path(['/etc/kadischi'])
 
-# process command line options
 
+# process command line options
 usage = 'usage: %prog [options] <path-to-the-repository> <destination-iso-image-file>\n\npath-to-the-repository can be a path on the local file system (without any prefixes) but can also be a path to a http, ftp or some other type of repository. For details, consult the documentation at http://fedoraproject.org/wiki/Kadischi/Documentation'
 version = '%prog ' + version
 parser = optparse.OptionParser (usage=usage, version=version)
-
 parser.add_option ("-f", "--force", dest="force", action="store_true", default=False, help="overwrite destination iso image file, if such exists.")
-
 parser.add_option ("-C", "--cmdline", dest="cmdline", action="store_true", default=False, help="run anaconda in command line mode (runs without interface, but requires complete kickstart file)")
-
 parser.add_option ("-T", "--text", dest="text", action="store_true", default=False, help="run anaconda in TUI mode")
-
 parser.add_option ("", "--graphical", dest="graphical", action="store_true", default=False, help="run anaconda in GUI mode")
-
 parser.add_option ("", "--kickstart", dest="ksfile", help="supply anaconda with kickstart file")
-
 parser.add_option ("", "--buildstamp", dest="buildstamp", help="buildstamp file (if not set, using the default buildstamp from the config directory)")
 
-parser.add_option ("", "--filesystem", dest="filesystem", help="set the filesystem to use on the iso to either zisofs[default] or squashfs.")
-
 flc_log ('Parsing command line arguments')
 (options, args) = parser.parse_args ()
 
@@ -63,8 +55,8 @@
 else:
     buildstamp = normalize_path ([confdir, 'buildstamp'])
 
-# set display mode
 
+# set display mode
 display_mode = ''
 
 if options.graphical:
@@ -76,10 +68,9 @@
 
 anaconda_args = display_mode + anaconda_args
 
-### check if everything looks OK
 
+### check if everything looks OK
 # checking arguments
-
 if len (args) < 2:
     flc_log ('Not enough arguments.\n')
     parser.parse_args (['-h'])
@@ -91,22 +82,22 @@
 method = args [0]
 isoimage = normalize_path ([args [1]])
 
-# checking UID - must be root
 
+# checking UID - must be root
 flc_log ('Checking UID')
 
 if os.getuid () != 0:
     flc_log ('You have to be root to run this application. Please restart with root permissions.\n')
     sys.exit (1)
 
-# check if we can open buildstamp file
 
+# check if we can open buildstamp file
 if not os.access(buildstamp, os.R_OK):
     flc_log ('Can`t open buildstamp file %s. ' % buildstamp)
     sys.exit (1)
 
-# loading productPath from buildstamp
 
+# loading productPath from buildstamp
 flc_log ('Using buildstamp file %s. ' % buildstamp)
 
 f = open(buildstamp, "r")
@@ -118,8 +109,8 @@
     flc_log ('Product path can`t be found in buildstamp file %s (Product path should be on the 4th line of the file)' % buildstamp)
     sys.exit (1)
 
-# validating the repository
 
+# validating the repository
 flc_log ('Now we are going to try to validate your repository (for now, only http, ftp and local repositories can be checked)')
 
 valid = True
@@ -137,13 +128,13 @@
     flc_log ('Repository validation failed. Aborting execution.')
     sys.exit (1)
 
-# format method string the way anaconda likes it
 
+# format method string the way anaconda likes it
 if method.find (':') == -1:
     method = 'nfs:/' + method
 
-# checking if everything is OK with destination (iso image) file
 
+# checking if everything is OK with destination (iso image) file
 if os.path.isfile (isoimage):
     flc_log ('File %s already exists. ' % isoimage)
     if force:
@@ -154,18 +145,10 @@
 elif not os.path.isdir (os.path.dirname (isoimage)):
     os.makedirs (os.path.dirname (isoimage))
 
-# check for installed rpms
 
+# check for installed rpms
 flc_log ('Checking required packages')
-
-# Set required filesystem_tools to something appropriate depending on what is chosen
-if options.filesystem == 'squashfs':
-   filesystem_tools = 'squashfs-tools'
-else:
-   filesystem_tools = 'zisofs-tools'
-
-required_rpms = ('anaconda', 'busybox-anaconda', 'mkisofs', 'syslinux', 'e2fsprogs', filesystem_tools)
-
+required_rpms = ('anaconda', 'busybox-anaconda', 'mkisofs', 'syslinux', 'e2fsprogs', 'squashfs-tools')
 missing_rpms = check_installed_rpms ('/', required_rpms, False)
 
 if len (missing_rpms) != 0:
@@ -175,16 +158,16 @@
     flc_log ('are missing. Aborting execution.')
     sys.exit (1)
 
-# check for the config file
 
+# check for the config file
 flc_log ('Looking for config file')
 
 if not os.path.isfile (normalize_path([confdir, 'kadischi.conf'])):
     flc_log ('Can`t find config file %s.' % normalize_path([confdir, 'kadischi.conf']))
     sys.exit (1)
 
-# load config file options
 
+# load config file options
 flc_log ('Loading config file options')
 
 buildconf = shvarFile (normalize_path([confdir, 'kadischi.conf']), True)
@@ -198,21 +181,18 @@
     flc_log ('No build dir defined. Please, edit config file option BUILDDIR.')
     sys.exit(1)
 
-# prepare dirs
 
+# prepare dirs
 buildsubdir = 'livecd-build_no' + buildnum
 builddir = normalize_path ([builddir, buildsubdir])
-
 sysdir = normalize_path([builddir, 'system'])
 csysdir = normalize_path([builddir, 'compressed'])
-
 os.makedirs (sysdir)
-
 # we shouldn`t create csysdir because mkzftree wants to create it by it self
 # os.makedirs (csysdir)
 
-# Moving the buildstamp file to /tmp/product/.buildstamp so anaconda can find it
 
+# Moving the buildstamp file to /tmp/product/.buildstamp so anaconda can find it
 if not os.path.exists ('/tmp/product'):
     os.makedirs ('/tmp/product')
 elif not os.path.isdir ('/tmp/product'):
@@ -225,22 +205,19 @@
 
 shutil.copy2 (buildstamp, '/tmp/product/.buildstamp')
 
-# run anaconda
 
+# run anaconda
 flc_log ('\n  ***  running anaconda  ***  \n')
-
 run ("anaconda %s --rootpath=%s --method=%s" % (anaconda_args, sysdir, method), builddir)
-
 flc_log ('\n  ***  anaconda has finished the job ***  \n')
 
-# now`s the time to pickup kernel version cause when we move files arround, it will be late
 
+# now`s the time to pickup kernel version cause when we move files arround, it will be late
 kernel_version = get_kernel_version (sysdir)
 
-# run post_install_scripts
 
+# run post_install_scripts
 flc_log ('running post installation scripts')
-
 scripts = []
 
 for root, dirs, files in os.walk (normalize_path([bindir, 'post_install_scripts'])):
@@ -255,70 +232,50 @@
     flc_log ('%s' % script)
     run ("%s %s %s" % (script, sysdir, anaconda_args), builddir)
 
-# make initrd image
 
+# make initrd image
 flc_log ('making initrd image')
+run ("%s %s %s" % (normalize_path([bindir, 'livecd-mkinitrd.sh']), sysdir, kernel_version), builddir)
 
-if options.filesystem == 'squashfs':
-    kmods = 'fs/squashfs drivers/block/loop.ko'
-else:
-    kmods = ''
-
-run ("KMODULES='%s' %s %s %s" % (kmods, normalize_path([bindir, 'livecd-mkinitrd.sh']), sysdir, kernel_version), builddir)
 
 # move files 
-
 flc_log ('moving files that should be on tmpfs')
-
 run ("%s %s" % (normalize_path([bindir, 'movefiles.py']), sysdir), builddir)
 
-# compress the tree
 
+# compress the tree
 flc_log ('compressing the tree (order a pizza `cause this will take a while)')
+# kadischi.sqsh is a file that we mount loopback. So we need to create supporting
+# files and directories outside of the compressed tree.
+os.makedirs (os.path.join(csysdir, 'boot/isolinux'))
+os.makedirs (normalize_path([csysdir, '/livecd']))
+touch = file(normalize_path([csysdir, '.livecd']), 'w')
+touch.close()
+# Make the SquashFS image
+run("mksquashfs %s %s" % (sysdir, normalize_path([csysdir, 'kadischi.sqsh'])))
 
-if options.filesystem == 'squashfs':
-    # zisofs has a tree which can be seen; squashfs is a file that we mount
-    # loopback.  So we need to create supporting files and directories
-    # separately.
-    os.makedirs (os.path.join(csysdir, 'boot/isolinux'))
-    os.makedirs(normalize_path([csysdir, '/livecd']))
-    touch = file(normalize_path([csysdir, '.livecd']), 'w')
-    touch.close()
-    # compress a squashfs tree
-    run("mksquashfs %s %s" % (sysdir, normalize_path([csysdir, 'kadischi.sqsh'])))
-else:
-    # compress a zisofs tree
-    run ("mkzftree -z 3 %s %s" % (sysdir, csysdir), builddir)
 
 # install boot & conf files in compressed tree (they shoudn`t be compressed)
-
 flc_log ('installing boot & config files in compressed tree')
-
 run ("%s %s %s %s" % (normalize_path([bindir, 'install-boot.sh']), sysdir, csysdir, kernel_version), builddir)
-
 run ("cp -f %s %s" % (normalize_path([sysdir, '/livecd/kadischi.tar.gz']), normalize_path([csysdir, '/livecd/kadischi.tar.gz'])), builddir)
 
-# delete sysdir - we don`t need it anymore
 
+# delete sysdir - we don`t need it anymore
 flc_log ('removing uncompressed tree')
-
 clean_directory (sysdir)
 
-# create iso image
 
+# create iso image
 flc_log ('creating iso image %s' % isoimage)
+run ("%s %s %s" % (normalize_path([bindir, 'create-iso.sh']), csysdir, isoimage), builddir)
 
-if options.filesystem == 'squashfs':
-    mkisoflags=''
-else:
-    mkisoflags='MKISOFSOPTION=-z '
-run ("%s%s %s %s" % (mkisoflags, normalize_path([bindir, 'create-iso.sh']), csysdir, isoimage), builddir)
 
 # delete builddir
-
 flc_log ('removing builddir')
-
 cleanup (builddir)
 
+
+# Done!
 flc_log ('Finished.')
 sys.exit (0)


Index: livecd-mkinitrd.sh
===================================================================
RCS file: /cvs/devel/kadischi/livecd_generator/livecd-mkinitrd.sh,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- livecd-mkinitrd.sh	4 Apr 2006 13:43:13 -0000	1.7
+++ livecd-mkinitrd.sh	11 Apr 2006 08:26:22 -0000	1.8
@@ -23,7 +23,6 @@
 rc=0
 
 IMAGESIZE=10000
-KMODULES="drivers/parport $KMODULES"
 
  . /etc/kadischi/kadischi.conf
 
@@ -257,7 +256,7 @@
 inst $rootdir/etc/modprobe.d/modprobe.conf.dist "$MNTIMAGE/etc/modprobe.d/modprobe.conf.dist"
 inst $rootdir/lib/modules/$kernel/modules.dep "$MNTIMAGE/lib/modules/$kernel/modules.dep"
 
-MODULES=$(findmodules $KMODULES)
+MODULES=$(findmodules drivers/parport drivers/block/loop.ko fs/squashfs)
 for MODULE in $MODULES; do
     instmodule $MODULE
 done



From fedora-extras-commits at redhat.com  Tue Apr 11 08:26:24 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Tue, 11 Apr 2006 01:26:24 -0700
Subject: kadischi/man kadischi.1,1.2,1.3
Message-ID: <200604110826.k3B8QOE8027704@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi/man
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27635/kadischi/man

Modified Files:
	kadischi.1 
Log Message:
Use SquashFS exclusively, major tidying of kadischi.py


Index: kadischi.1
===================================================================
RCS file: /cvs/devel/kadischi/man/kadischi.1,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kadischi.1	4 Apr 2006 13:43:13 -0000	1.2
+++ kadischi.1	11 Apr 2006 08:26:22 -0000	1.3
@@ -6,13 +6,13 @@
 kadischi - generate a live ISO9660 CDROM image from an RPM repository
 .SH SYNOPSIS
 kadischi [--text|--graphical] [--kickstart=<ks-file>] [-C|--cmdline]
-[--filesystem=<fstype>] REPOSITORY [-f] IMAGE
+REPOSITORY [-f] IMAGE
 .SH DESCRIPTION
 .B kadischi(1)
 generates a live ISO9660 CDROM image from an RPM repository tree by invoking
 anaconda passing it the correct options and installing to the build
 directory specified. Kadischi will invoke 
-.BR mkzftree(1)
+.BR mksquashfs(1)
 and
 .BR mkisofs(1)
 to produce an image that can be written to a CD or DVD ROM.
@@ -29,10 +29,6 @@
 Run strictly in command line mode requiring no user input.
 .IP --cmdline
 Same as -C
-.IP --filesystem
-The filesystem type which should be used for the root filesystem of the LiveCD,
-where fstype is one of 'zisofs' or 'squashfs'.
-The default is zisofs.
 .IP -f
 Overwrite an existing ISO9660 image, if it already exists.
 .SH FILES
@@ -65,7 +61,7 @@
 .RS
 Chitlesh Goorah <chitlesh at fedoraproject.org>
 .SH "SEE ALSO"
-.BR mkzftree(1),
+.BR mksquashfs(1),
 .BR mkisofs(1),
 .BR busybox(1),
 .BR anaconda(1)



From fedora-extras-commits at redhat.com  Tue Apr 11 08:26:18 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Tue, 11 Apr 2006 01:26:18 -0700
Subject: kadischi kadischi.spec,1.1,1.2
Message-ID: <200604110826.k3B8Qm8t027707@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27635/kadischi

Modified Files:
	kadischi.spec 
Log Message:
Use SquashFS exclusively, major tidying of kadischi.py


Index: kadischi.spec
===================================================================
RCS file: /cvs/devel/kadischi/kadischi.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kadischi.spec	10 Apr 2006 23:22:21 -0000	1.1
+++ kadischi.spec	11 Apr 2006 08:26:16 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           kadischi
 Version:        0.1
-Release:        6.%{alphatag}
+Release:        7.%{alphatag}
 Summary:        LiveCD generation utility 
 
 Group:          Applications/System
@@ -12,7 +12,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kudzu-devel glib2-devel intltool autoconf automake
-Requires:       python anaconda busybox-anaconda syslinux mkisofs zisofs-tools squashfs-tools e2fsprogs
+Requires:       python anaconda busybox-anaconda syslinux mkisofs squashfs-tools e2fsprogs
 AutoReqProv:    off
 
 %description
@@ -40,7 +40,7 @@
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %files
@@ -77,6 +77,11 @@
 %ghost %{_datadir}/%{name}/post_install_scripts/*.pyo
 
 %changelog
+* Tue Apr 11 2006 Jasper Hartline <jasperhartline at adelphia.net>
+- Drop filesystem option and use SquashFS exclusively
+- Contributor: Toshio Kuratomi <toshio at tiki-lounge.com>
+
+
 * Mon Apr 10 2006 Jasper Hartline <jasperhartline at adelphia.net>
 - Rewrote .spec file to conform to standards
 - Contributors: Toshio Kuratomi <toshio at tiki-lounge.com>



From fedora-extras-commits at redhat.com  Tue Apr 11 08:26:18 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Tue, 11 Apr 2006 01:26:18 -0700
Subject: kadischi/linuxrc livecd-linuxrc,1.3,1.4
Message-ID: <200604110826.k3B8QmfK027710@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi/linuxrc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27635/kadischi/linuxrc

Modified Files:
	livecd-linuxrc 
Log Message:
Use SquashFS exclusively, major tidying of kadischi.py


Index: livecd-linuxrc
===================================================================
RCS file: /cvs/devel/kadischi/linuxrc/livecd-linuxrc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- livecd-linuxrc	30 Mar 2006 10:13:12 -0000	1.3
+++ livecd-linuxrc	11 Apr 2006 08:26:16 -0000	1.4
@@ -17,15 +17,10 @@
 # Make kernel don't mount root fs
 echo 0x100 > /proc/sys/kernel/real-root-dev
 
-# Check for squashfs file
-if [ -f /cdrom/kadischi.sqsh ]; then
-    echo "Mounting squashfs filesystem"
-    modprobe loop
-    modprobe squashfs
-    mount -t squashfs -o loop /cdrom/kadischi.sqsh /sysroot
-else
-    mount -o bind /cdrom /sysroot
-fi
+echo "Mounting root filesystem"
+modprobe loop
+modprobe squashfs
+mount -t squashfs -oloop,ro /cdrom/kadischi.sqsh /sysroot
 
 echo "Doing the pivot_root"
 cd /sysroot



From fedora-extras-commits at redhat.com  Tue Apr 11 08:35:53 2006
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Tue, 11 Apr 2006 01:35:53 -0700
Subject: mock mock.spec,1.14,1.15
Message-ID: <200604110835.k3B8ZrqU027736@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/fedora/mock
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27718

Modified Files:
	mock.spec 
Log Message:

update spec file a bit



Index: mock.spec
===================================================================
RCS file: /cvs/fedora/mock/mock.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- mock.spec	27 Dec 2005 18:30:26 -0000	1.14
+++ mock.spec	11 Apr 2006 08:35:50 -0000	1.15
@@ -1,6 +1,6 @@
 Summary: Builds packages inside chroots
 Name: mock
-Version: 0.4
+Version: 0.5
 Release: 1
 License: GPL
 Group: Development/Tools
@@ -54,6 +54,9 @@
 
 
 %changelog
+* Tue Apr 11 2006 Seth Vidal <skvidal at linux.duke.edu>
+- specfile version iterate
+
 * Tue Dec 27 2005 Seth Vidal <skvidal at phy.duke.edu>
 - add patch from Andreas Thienemann - adds man page
 



From fedora-extras-commits at redhat.com  Tue Apr 11 10:01:59 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Tue, 11 Apr 2006 03:01:59 -0700
Subject: rpms/abiword/FC-4 abiword-2.4.4-desktop.patch, NONE, 1.1 .cvsignore,
	1.10, 1.11 abiword.spec, 1.21, 1.22 sources, 1.10,
	1.11 abiword-2.4.2-desktop.patch, 1.1,
	NONE abiword-2.4.2-macros.patch, 1.1, NONE
Message-ID: <200604111002.k3BA2WRn032100@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/abiword/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32072

Modified Files:
	.cvsignore abiword.spec sources 
Added Files:
	abiword-2.4.4-desktop.patch 
Removed Files:
	abiword-2.4.2-desktop.patch abiword-2.4.2-macros.patch 
Log Message:
New upstream version



abiword-2.4.4-desktop.patch:

--- NEW FILE abiword-2.4.4-desktop.patch ---
diff -r -u abiword-2.4.4.orig/abi/abiword.desktop abiword-2.4.4/abi/abiword.desktop
--- abiword-2.4.4.orig/abi/abiword.desktop	2006-04-03 14:14:01.000000000 +0200
+++ abiword-2.4.4/abi/abiword.desktop	2006-04-11 00:12:19.000000000 +0200
@@ -7,7 +7,7 @@
 StartupNotify=true
 Encoding=UTF-8
 X-Desktop-File-Install-Version=0.9
-MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;
+MimeType=application/msword;application/vnd.sun.xml.writer;application/vnd.wordperfect;application/x-abiword;text/x-abiword;text/x-xml-abiword;application/rtf;text/plain;application/xhtml+xml;text/html;text/vnd.wap.wml;application/vnd.plain;application/vnd.stardivision.writer;application/x-mif;application/x-kword;application/x-applix-word;application/x-mswrite;application/vnd.oasis.opendocument.text;
 Name=AbiWord
 GenericName=Word Processor
 Comment=AbiWord Word Processor


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	5 Jan 2006 15:29:38 -0000	1.10
+++ .cvsignore	11 Apr 2006 10:01:59 -0000	1.11
@@ -1 +1 @@
-abiword-2.4.2.tar.bz2
+abiword-2.4.4.tar.bz2


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-4/abiword.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- abiword.spec	5 Feb 2006 16:34:49 -0000	1.21
+++ abiword.spec	11 Apr 2006 10:01:59 -0000	1.22
@@ -2,8 +2,8 @@
 
 Summary: The AbiWord word processor
 Name: abiword
-Version: 2.4.2
-Release: 2%{?dist}
+Version: 2.4.4
+Release: 1%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -30,7 +30,7 @@
 BuildRequires: librsvg2-devel
 BuildRequires: libwmf-devel
 BuildRequires: aiksaurus-gtk-devel >= 1.2.1
-BuildRequires: link-grammar-devel >= 4.1.3
+BuildRequires: link-grammar-devel >= 4.2.1
 BuildRequires: gtkmathview-devel >= 0.7.5
 BuildRequires: libgsf-devel >= 1.11.1
 
@@ -41,8 +41,7 @@
 URL: http://www.abisource.com/
 
 Patch0: abiword-2.0.9-windowshelppaths.patch
-Patch1: abiword-2.4.2-desktop.patch
-Patch2: abiword-2.4.2-macros.patch
+Patch1: abiword-2.4.4-desktop.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. The goal is to make
@@ -52,7 +51,6 @@
 %setup -q 
 %patch0 -p1 -b .windowshelppaths
 %patch1 -p1 -b .desktop
-%patch2 -p1 -b .macros
 
 %build
 cd abi
@@ -136,6 +134,10 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.4-1.fc4
+- New upstream version
+- Remove the macro patch and update the desktop patch
+
 * Sun Feb 05 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.2-2.fc4
 - Remove redundant requires
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	5 Jan 2006 15:29:38 -0000	1.10
+++ sources	11 Apr 2006 10:01:59 -0000	1.11
@@ -1 +1 @@
-935f1218eab7ff96b7a23cfeba4e76d1  abiword-2.4.2.tar.bz2
+69dd69179b861a41613291afd10af9ab  abiword-2.4.4.tar.bz2


--- abiword-2.4.2-desktop.patch DELETED ---


--- abiword-2.4.2-macros.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 11 10:25:26 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Tue, 11 Apr 2006 03:25:26 -0700
Subject: rpms/smart/FC-4 smart.spec,1.1,1.2
Message-ID: <200604111025.k3BAPSUc032523@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/smart/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32478/FC-4

Modified Files:
	smart.spec 
Log Message:
Fix disttag.


Index: smart.spec
===================================================================
RCS file: /cvs/extras/rpms/smart/FC-4/smart.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smart.spec	10 Apr 2006 17:22:47 -0000	1.1
+++ smart.spec	11 Apr 2006 10:25:26 -0000	1.2
@@ -2,8 +2,8 @@
 
 Summary: Next generation package handling tool
 Name: smart
-Version: 0.41%{?dist}
-Release: 29
+Version: 0.41
+Release: 30%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://labix.org/smart/
@@ -143,6 +143,9 @@
 %config %{_sysconfdir}/pam.d/smart-root
 
 %changelog
+* Tue Apr 11 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41
+- Move the disttag to the Release: tag.
+
 * Mon Apr 10 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41-29
 - Fix typos in distro.py, there were %% missing.
 - /usr/bin/smart-root should had been %%{_bindir}/smart-root ...



From fedora-extras-commits at redhat.com  Tue Apr 11 10:25:27 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Tue, 11 Apr 2006 03:25:27 -0700
Subject: rpms/smart/FC-5 smart.spec,1.1,1.2
Message-ID: <200604111025.k3BAPTNh032528@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/smart/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32478/FC-5

Modified Files:
	smart.spec 
Log Message:
Fix disttag.


Index: smart.spec
===================================================================
RCS file: /cvs/extras/rpms/smart/FC-5/smart.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smart.spec	10 Apr 2006 17:22:47 -0000	1.1
+++ smart.spec	11 Apr 2006 10:25:27 -0000	1.2
@@ -2,8 +2,8 @@
 
 Summary: Next generation package handling tool
 Name: smart
-Version: 0.41%{?dist}
-Release: 29
+Version: 0.41
+Release: 30%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://labix.org/smart/
@@ -143,6 +143,9 @@
 %config %{_sysconfdir}/pam.d/smart-root
 
 %changelog
+* Tue Apr 11 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41
+- Move the disttag to the Release: tag.
+
 * Mon Apr 10 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41-29
 - Fix typos in distro.py, there were %% missing.
 - /usr/bin/smart-root should had been %%{_bindir}/smart-root ...



From fedora-extras-commits at redhat.com  Tue Apr 11 10:25:27 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Tue, 11 Apr 2006 03:25:27 -0700
Subject: rpms/smart/devel smart.spec,1.1,1.2
Message-ID: <200604111025.k3BAPTjg032533@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/smart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32478/devel

Modified Files:
	smart.spec 
Log Message:
Fix disttag.


Index: smart.spec
===================================================================
RCS file: /cvs/extras/rpms/smart/devel/smart.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- smart.spec	10 Apr 2006 17:22:47 -0000	1.1
+++ smart.spec	11 Apr 2006 10:25:27 -0000	1.2
@@ -2,8 +2,8 @@
 
 Summary: Next generation package handling tool
 Name: smart
-Version: 0.41%{?dist}
-Release: 29
+Version: 0.41
+Release: 30%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://labix.org/smart/
@@ -143,6 +143,9 @@
 %config %{_sysconfdir}/pam.d/smart-root
 
 %changelog
+* Tue Apr 11 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41
+- Move the disttag to the Release: tag.
+
 * Mon Apr 10 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41-29
 - Fix typos in distro.py, there were %% missing.
 - /usr/bin/smart-root should had been %%{_bindir}/smart-root ...



From fedora-extras-commits at redhat.com  Tue Apr 11 10:26:39 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Tue, 11 Apr 2006 03:26:39 -0700
Subject: fedora-security/audit fc4,1.197,1.198 fc5,1.110,1.111
Message-ID: <200604111026.k3BAQdA4032672@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32537/audit

Modified Files:
	fc4 fc5 
Log Message:
Add CVE-2006-1055



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.197
retrieving revision 1.198
diff -u -r1.197 -r1.198
--- fc4	11 Apr 2006 02:15:48 -0000	1.197
+++ fc4	11 Apr 2006 10:26:37 -0000	1.198
@@ -28,6 +28,7 @@
 CVE-2006-1061 version (curl, 7.15.0 - 7.15.2 only)
 CVE-2006-1059 version (samba)
 CVE-2006-1058 VULNERABLE (busybox) bz#187386
+CVE-2006-1055 VULNERABLE (kernel, fixed 2.6.17-rc1)
 CVE-2006-1052 version (kernel, fixed 2.6.16) patch-2.6.16-rc6 [since FEDORA-2006-245]
 CVE-2006-1045 VULNERABLE (thunderbird)
 CVE-2006-1015 ignore (php) safe mode isn't safe


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -r1.110 -r1.111
--- fc5	11 Apr 2006 02:15:48 -0000	1.110
+++ fc5	11 Apr 2006 10:26:37 -0000	1.111
@@ -29,6 +29,7 @@
 CVE-2006-1061 backport (curl, fixed 7.15.3) [since FEDORA-2006-189]
 CVE-2006-1059 version (samba, fixed 3.0.22 at least) bz#187170 [since FEDORA-2006-259]
 CVE-2006-1058 VULNERABLE (busybox) bz#187386
+CVE-2006-1055 VULNERABLE (kernel, fixed 2.6.17-rc1)
 CVE-2006-1052 version (kernel, fixed 2.6.16) patch-2.6.16-rc6 [since FEDORA-2006-233]
 CVE-2006-1045 VULNERABLE (thunderbird)
 CVE-2006-1015 ignore (php) safe mode isn't safe



From fedora-extras-commits at redhat.com  Tue Apr 11 10:30:37 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Tue, 11 Apr 2006 03:30:37 -0700
Subject: rpms/pikdev/devel .cvsignore, 1.2, 1.3 pikdev.spec, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <200604111030.k3BAUd3T000436@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/pikdev/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv371/devel

Modified Files:
	.cvsignore pikdev.spec sources 
Log Message:
New upstream version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pikdev/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Mar 2006 08:26:13 -0000	1.2
+++ .cvsignore	11 Apr 2006 10:30:37 -0000	1.3
@@ -1 +1 @@
-pikdev-0.8.4.tar.gz
+pikdev-0.9.1-4.tar.gz


Index: pikdev.spec
===================================================================
RCS file: /cvs/extras/rpms/pikdev/devel/pikdev.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pikdev.spec	7 Apr 2006 10:54:20 -0000	1.3
+++ pikdev.spec	11 Apr 2006 10:30:37 -0000	1.4
@@ -1,17 +1,16 @@
 Name:		pikdev
-Version:	0.8.4
-Release:	10%{?dist}
+Version:	0.9.1
+Release:	1%{?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
 
 Group:		Development/Tools
 License:	GPL
 Url:		http://pikdev.free.fr
-Source0:	http://pikdev.free.fr/%{name}-%{version}.tar.gz
+Source0:	http://pikdev.free.fr/%{name}-%{version}-4.tar.gz
 Source1:	%{name}.desktop
 Source2:	README.Fedora
 Source3:	LISEZMOI.Fedora
-Patch:		%{name}-%{version}.ppcbuild
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils, kdelibs-devel
@@ -53,35 +52,32 @@
 
 %setup -q
 
-%patch
-
 %{__cp} -p %{SOURCE2} .
 %{__cp} -p %{SOURCE3} .
 
 %build
 
+# Needed for FC-4 x86_64 arch
+# See bug #169132
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
 %configure --disable-rpath
 
-rm -rf pkp
-cd pikdev
+cd src
 make -f Makefile.pkp \
 CCPP=g++ \
 LINK=g++ \
-CCPPOPT="$RPM_OPT_FLAGS -DPKP_VERSION=0.8.4" \
+CCPPOPT="$RPM_OPT_FLAGS -DPKP_VERSION=0.9.1" \
 LIBS=
 cd ..
-cp pikdev/pkp .
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
-chmod +x $RPM_BUILD_ROOT%{_bindir}/pkp
-rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Development/%{name}.desktop
+%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/%{name}.desktop
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
@@ -94,18 +90,21 @@
 %find_lang %{name}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-, root, root)
-%doc LICENSE README.Fedora LISEZMOI.Fedora
+%doc AUTHORS COPYING README.Fedora LISEZMOI.Fedora
 %{_bindir}/*
 %{_datadir}/applications/*
 %{_datadir}/apps/%{name}/
 %{_datadir}/apps/katepart/syntax/*
+%{_datadir}/doc/HTML/en/%{name}/
 %{_datadir}/icons/*
 
 %changelog
+* Tue Apr 11 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.9.1-1
+  - New upstream version
 * Fri Apr 07 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-10
   - Fix patch name
 * Fri Apr 07 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-9


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pikdev/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Mar 2006 08:26:13 -0000	1.2
+++ sources	11 Apr 2006 10:30:37 -0000	1.3
@@ -1 +1 @@
-95c6cf21241134ed684373b8176f6ea1  pikdev-0.8.4.tar.gz
+5cee6cd6c4e322efc8013bb1e7729b13  pikdev-0.9.1-4.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 10:30:36 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Tue, 11 Apr 2006 03:30:36 -0700
Subject: rpms/pikdev/FC-4 .cvsignore, 1.2, 1.3 pikdev.spec, 1.9, 1.10 sources,
	1.2, 1.3
Message-ID: <200604111030.k3BAUcNk000424@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/pikdev/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv371/FC-4

Modified Files:
	.cvsignore pikdev.spec sources 
Log Message:
New upstream version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pikdev/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Mar 2006 08:26:13 -0000	1.2
+++ .cvsignore	11 Apr 2006 10:30:35 -0000	1.3
@@ -1 +1 @@
-pikdev-0.8.4.tar.gz
+pikdev-0.9.1-4.tar.gz


Index: pikdev.spec
===================================================================
RCS file: /cvs/extras/rpms/pikdev/FC-4/pikdev.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pikdev.spec	7 Apr 2006 09:32:02 -0000	1.9
+++ pikdev.spec	11 Apr 2006 10:30:35 -0000	1.10
@@ -1,17 +1,16 @@
 Name:		pikdev
-Version:	0.8.4
-Release:	10%{?dist}
+Version:	0.9.1
+Release:	1%{?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
 
 Group:		Development/Tools
 License:	GPL
 Url:		http://pikdev.free.fr
-Source0:	http://pikdev.free.fr/%{name}-%{version}.tar.gz
+Source0:	http://pikdev.free.fr/%{name}-%{version}-4.tar.gz
 Source1:	%{name}.desktop
 Source2:	README.Fedora
 Source3:	LISEZMOI.Fedora
-Patch:		%{name}-%{version}.ppcbuild
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils, kdelibs-devel
@@ -53,35 +52,32 @@
 
 %setup -q
 
-%patch
-
 %{__cp} -p %{SOURCE2} .
 %{__cp} -p %{SOURCE3} .
 
 %build
 
+# Needed for FC-4 x86_64 arch
+# See bug #169132
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
 %configure --disable-rpath
 
-rm -rf pkp
-cd pikdev
+cd src
 make -f Makefile.pkp \
 CCPP=g++ \
 LINK=g++ \
-CCPPOPT="$RPM_OPT_FLAGS -DPKP_VERSION=0.8.4" \
+CCPPOPT="$RPM_OPT_FLAGS -DPKP_VERSION=0.9.1" \
 LIBS=
 cd ..
-cp pikdev/pkp .
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
-chmod +x $RPM_BUILD_ROOT%{_bindir}/pkp
-rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Development/%{name}.desktop
+%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/%{name}.desktop
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
@@ -94,18 +90,21 @@
 %find_lang %{name}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-, root, root)
-%doc LICENSE README.Fedora LISEZMOI.Fedora
+%doc AUTHORS COPYING README.Fedora LISEZMOI.Fedora
 %{_bindir}/*
 %{_datadir}/applications/*
 %{_datadir}/apps/%{name}/
 %{_datadir}/apps/katepart/syntax/*
+%{_datadir}/doc/HTML/en/%{name}/
 %{_datadir}/icons/*
 
 %changelog
+* Tue Apr 11 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.9.1-1
+  - New upstream version
 * Fri Apr 07 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-10
   - Fix patch name
 * Fri Apr 07 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-9


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pikdev/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Mar 2006 08:26:13 -0000	1.2
+++ sources	11 Apr 2006 10:30:35 -0000	1.3
@@ -1 +1 @@
-95c6cf21241134ed684373b8176f6ea1  pikdev-0.8.4.tar.gz
+5cee6cd6c4e322efc8013bb1e7729b13  pikdev-0.9.1-4.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 10:30:36 2006
From: fedora-extras-commits at redhat.com (Alain Portal (dionysos))
Date: Tue, 11 Apr 2006 03:30:36 -0700
Subject: rpms/pikdev/FC-5 .cvsignore, 1.2, 1.3 pikdev.spec, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <200604111030.k3BAUcGT000430@cvs-int.fedora.redhat.com>

Author: dionysos

Update of /cvs/extras/rpms/pikdev/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv371/FC-5

Modified Files:
	.cvsignore pikdev.spec sources 
Log Message:
New upstream version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pikdev/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Mar 2006 08:26:13 -0000	1.2
+++ .cvsignore	11 Apr 2006 10:30:36 -0000	1.3
@@ -1 +1 @@
-pikdev-0.8.4.tar.gz
+pikdev-0.9.1-4.tar.gz


Index: pikdev.spec
===================================================================
RCS file: /cvs/extras/rpms/pikdev/FC-5/pikdev.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pikdev.spec	7 Apr 2006 10:53:07 -0000	1.3
+++ pikdev.spec	11 Apr 2006 10:30:36 -0000	1.4
@@ -1,17 +1,16 @@
 Name:		pikdev
-Version:	0.8.4
-Release:	10%{?dist}
+Version:	0.9.1
+Release:	1%{?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
 
 Group:		Development/Tools
 License:	GPL
 Url:		http://pikdev.free.fr
-Source0:	http://pikdev.free.fr/%{name}-%{version}.tar.gz
+Source0:	http://pikdev.free.fr/%{name}-%{version}-4.tar.gz
 Source1:	%{name}.desktop
 Source2:	README.Fedora
 Source3:	LISEZMOI.Fedora
-Patch:		%{name}-%{version}.ppcbuild
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils, kdelibs-devel
@@ -53,35 +52,32 @@
 
 %setup -q
 
-%patch
-
 %{__cp} -p %{SOURCE2} .
 %{__cp} -p %{SOURCE3} .
 
 %build
 
+# Needed for FC-4 x86_64 arch
+# See bug #169132
 unset QTDIR || : ; . /etc/profile.d/qt.sh
 export QTLIB=${QTDIR}/lib QTINC=${QTDIR}/include
 
 %configure --disable-rpath
 
-rm -rf pkp
-cd pikdev
+cd src
 make -f Makefile.pkp \
 CCPP=g++ \
 LINK=g++ \
-CCPPOPT="$RPM_OPT_FLAGS -DPKP_VERSION=0.8.4" \
+CCPPOPT="$RPM_OPT_FLAGS -DPKP_VERSION=0.9.1" \
 LIBS=
 cd ..
-cp pikdev/pkp .
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 
 make install DESTDIR=$RPM_BUILD_ROOT
-chmod +x $RPM_BUILD_ROOT%{_bindir}/pkp
-rm -f $RPM_BUILD_ROOT%{_datadir}/applnk/Development/%{name}.desktop
+%{__rm} -f $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/%{name}.desktop
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 desktop-file-install --vendor fedora \
@@ -94,18 +90,21 @@
 %find_lang %{name}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%{__rm} -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-, root, root)
-%doc LICENSE README.Fedora LISEZMOI.Fedora
+%doc AUTHORS COPYING README.Fedora LISEZMOI.Fedora
 %{_bindir}/*
 %{_datadir}/applications/*
 %{_datadir}/apps/%{name}/
 %{_datadir}/apps/katepart/syntax/*
+%{_datadir}/doc/HTML/en/%{name}/
 %{_datadir}/icons/*
 
 %changelog
+* Tue Apr 11 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.9.1-1
+  - New upstream version
 * Fri Apr 07 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-10
   - Fix patch name
 * Fri Apr 07 2006 Alain Portal <aportal[AT]univ-montp2[DOT]fr> 0.8.4-9


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pikdev/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Mar 2006 08:26:13 -0000	1.2
+++ sources	11 Apr 2006 10:30:36 -0000	1.3
@@ -1 +1 @@
-95c6cf21241134ed684373b8176f6ea1  pikdev-0.8.4.tar.gz
+5cee6cd6c4e322efc8013bb1e7729b13  pikdev-0.9.1-4.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 10:31:23 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Tue, 11 Apr 2006 03:31:23 -0700
Subject: rpms/abiword/FC-3 abiword-2.4.4-desktop.patch, NONE, 1.1 .cvsignore,
	1.13, 1.14 abiword.spec, 1.33, 1.34 sources, 1.13,
	1.14 abiword-2.4.2-desktop.patch, 1.1,
	NONE abiword-2.4.2-macros.patch, 1.1, NONE
Message-ID: <200604111031.k3BAVPmY000505@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/abiword/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv477

Modified Files:
	.cvsignore abiword.spec sources 
Added Files:
	abiword-2.4.4-desktop.patch 
Removed Files:
	abiword-2.4.2-desktop.patch abiword-2.4.2-macros.patch 
Log Message:
New upstream version



abiword-2.4.4-desktop.patch:

--- NEW FILE abiword-2.4.4-desktop.patch ---
diff -r -u abiword-2.4.4.orig/abi/abiword.desktop abiword-2.4.4/abi/abiword.desktop
--- abiword-2.4.4.orig/abi/abiword.desktop	2006-04-03 14:14:01.000000000 +0200
+++ abiword-2.4.4/abi/abiword.desktop	2006-04-11 00:12:19.000000000 +0200
@@ -7,7 +7,7 @@
 StartupNotify=true
 Encoding=UTF-8
 X-Desktop-File-Install-Version=0.9
-MimeType=application/x-abiword;text/x-abiword;text/x-xml-abiword;text/plain;application/msword;application/rtf;application/vnd.plain;application/xhtml+xml;text/html;
+MimeType=application/msword;application/vnd.sun.xml.writer;application/vnd.wordperfect;application/x-abiword;text/x-abiword;text/x-xml-abiword;application/rtf;text/plain;application/xhtml+xml;text/html;text/vnd.wap.wml;application/vnd.plain;application/vnd.stardivision.writer;application/x-mif;application/x-kword;application/x-applix-word;application/x-mswrite;application/vnd.oasis.opendocument.text;
 Name=AbiWord
 GenericName=Word Processor
 Comment=AbiWord Word Processor


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-3/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	5 Jan 2006 15:53:23 -0000	1.13
+++ .cvsignore	11 Apr 2006 10:31:23 -0000	1.14
@@ -1 +1 @@
-abiword-2.4.2.tar.bz2
+abiword-2.4.4.tar.bz2


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-3/abiword.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- abiword.spec	5 Feb 2006 16:33:04 -0000	1.33
+++ abiword.spec	11 Apr 2006 10:31:23 -0000	1.34
@@ -2,8 +2,8 @@
 
 Summary: The AbiWord word processor
 Name: abiword
-Version: 2.4.2
-Release: 2%{?dist}
+Version: 2.4.4
+Release: 1%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -29,7 +29,7 @@
 BuildRequires: librsvg2-devel
 BuildRequires: libwmf-devel
 BuildRequires: aiksaurus-gtk-devel >= 1.2.1
-BuildRequires: link-grammar-devel >= 4.1.3
+BuildRequires: link-grammar-devel >= 4.2.1
 BuildRequires: gtkmathview-devel >= 0.7.5
 BuildRequires: libgsf-devel >= 1.10.1
 
@@ -40,9 +40,8 @@
 URL: http://www.abisource.com/
 
 Patch0: abiword-2.0.9-windowshelppaths.patch
-Patch1: abiword-2.4.2-desktop.patch
+Patch1: abiword-2.4.4-desktop.patch
 Patch2: abiword-2.4.2-gsf.patch
-Patch3: abiword-2.4.2-macros.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. The goal is to make
@@ -53,7 +52,6 @@
 %patch0 -p1 -b .windowshelppaths
 %patch1 -p1 -b .desktop
 %patch2 -p1 -b .gsf
-%patch3 -p1 -b .macros
 
 %build
 cd abi
@@ -137,6 +135,10 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Tue Apr 11 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.4-1.fc3
+- New upstream version
+- Remove the macro patch and update the desktop patch
+
 * Sun Feb 05 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.2-2.fc3
 - Remove redundant requires
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-3/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	5 Jan 2006 15:53:23 -0000	1.13
+++ sources	11 Apr 2006 10:31:23 -0000	1.14
@@ -1 +1 @@
-935f1218eab7ff96b7a23cfeba4e76d1  abiword-2.4.2.tar.bz2
+69dd69179b861a41613291afd10af9ab  abiword-2.4.4.tar.bz2


--- abiword-2.4.2-desktop.patch DELETED ---


--- abiword-2.4.2-macros.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 11 10:31:39 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Tue, 11 Apr 2006 03:31:39 -0700
Subject: owners owners.list,1.831,1.832
Message-ID: <200604111031.k3BAVfFA000524@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv500

Modified Files:
	owners.list 
Log Message:
Added smart and fedora-package-config-smart


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.831
retrieving revision 1.832
diff -u -r1.831 -r1.832
--- owners.list	11 Apr 2006 00:01:23 -0000	1.831
+++ owners.list	11 Apr 2006 10:31:39 -0000	1.832
@@ -242,6 +242,7 @@
 Fedora Extras|fbida|FrameBuffer Imageviewer|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|fdupes|Identifies and optionally deletes duplicate files|simonb at thoughtpolice.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|fedora-rpmdevtools|Fedora RPM Development Tools|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|fedora-package-config-smart|Configuration files for the smart package manager|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|
 Fedora Extras|fedora-usermgmt|Fedora tools for user management|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|feh|Fast command line image viewer using Imlib2|a.kurtz at hardsun.net|extras-qa at fedoraproject.org|
 Fedora Extras|fetchlog|The fetchlog utility displays the last new messages of a logfile|paul at xtdnet.nl|extras-qa at fedoraproject.org|
@@ -1346,6 +1347,7 @@
 Fedora Extras|skencil|A vector drawing program|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|skkdic|Japanese dictionaries for skk input|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|sloccount|Measures source lines of code (SLOC) in programs|bnocera at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|smart|Next generation package handling tool|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|
 Fedora Extras|smb4k|The SMB/CIFS Share Browser for KDE|mgarski at post.pl|extras-qa at fedoraproject.org|
 Fedora Extras|smbldap-tools|User and group administration tools for Samba/OpenLDAP|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|smeg|Simple menu editor for GNOME|jpmahowald at gmail.com|extras-qa at fedoraproject.org|foolish at guezz.net



From fedora-extras-commits at redhat.com  Tue Apr 11 10:42:57 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Tue, 11 Apr 2006 03:42:57 -0700
Subject: rpms/mod_security/devel .cvsignore, 1.4, 1.5 mod_security.spec, 1.12,
	1.13 sources, 1.5, 1.6
Message-ID: <200604111042.k3BAgxts000752@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_security/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv731

Modified Files:
	.cvsignore mod_security.spec sources 
Log Message:
* Tue Apr 11 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.3-1
- New upstream release
- Trivial spec tweaks



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_security/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 Jan 2006 02:14:08 -0000	1.4
+++ .cvsignore	11 Apr 2006 10:42:57 -0000	1.5
@@ -1 +1 @@
-modsecurity-apache-1.9.2.tar.gz
+modsecurity-apache_1.9.3.tar.gz


Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/devel/mod_security.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mod_security.spec	28 Feb 2006 22:45:34 -0000	1.12
+++ mod_security.spec	11 Apr 2006 10:42:57 -0000	1.13
@@ -1,11 +1,11 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 1.9.2
-Release: 3%{?dist}
+Version: 1.9.3
+Release: 1%{?dist}
 License: GPL
 URL: http://www.modsecurity.org/
 Group: System Environment/Daemons
-Source: http://www.modsecurity.org/download/modsecurity-apache-%{version}.tar.gz
+Source: http://www.modsecurity.org/download/modsecurity-apache_%{version}.tar.gz
 Source1: mod_security.conf
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: httpd  httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat %{_includedir}/httpd/.mmn || echo missing)
@@ -18,7 +18,7 @@
 
 %prep
 
-%setup -q -n modsecurity-apache-%{version}
+%setup -q -n modsecurity-apache_%{version}
 
 %build
 /usr/sbin/apxs -Wc,"%{optflags}" -c apache2/mod_security.c
@@ -37,9 +37,13 @@
 %defattr (-,root,root)
 %doc CHANGES LICENSE INSTALL README httpd* util doc
 %{_libdir}/httpd/modules/mod_security.so
-%config(noreplace) /etc/httpd/conf.d/mod_security.conf
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_security.conf
 
 %changelog
+* Tue Apr 11 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.3-1
+- New upstream release
+- Trivial spec tweaks
+
 * Wed Mar 1 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.2-3
 - Bump for FC5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_security/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	18 Jan 2006 02:14:08 -0000	1.5
+++ sources	11 Apr 2006 10:42:57 -0000	1.6
@@ -1 +1 @@
-c28b66f02adb1ddb2d0885483f6f8e0e  modsecurity-apache-1.9.2.tar.gz
+cd5585488e2499c4218a4b13419c3065  modsecurity-apache_1.9.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 11:00:33 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Tue, 11 Apr 2006 04:00:33 -0700
Subject: rpms/mod_security/FC-5 .cvsignore, 1.4, 1.5 mod_security.spec, 1.13,
	1.14 sources, 1.5, 1.6
Message-ID: <200604111100.k3BB0ZQi000864@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_security/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv843

Modified Files:
	.cvsignore mod_security.spec sources 
Log Message:
* Tue Apr 11 2006 Michael Fleming <mfleming+rpm at enlartenment.com>  1.9.3-1
- New upstream release
- Trivial spec tweaks



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 Jan 2006 02:14:08 -0000	1.4
+++ .cvsignore	11 Apr 2006 11:00:32 -0000	1.5
@@ -1 +1 @@
-modsecurity-apache-1.9.2.tar.gz
+modsecurity-apache_1.9.3.tar.gz


Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-5/mod_security.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- mod_security.spec	17 Mar 2006 23:35:58 -0000	1.13
+++ mod_security.spec	11 Apr 2006 11:00:32 -0000	1.14
@@ -1,11 +1,11 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 1.9.2
-Release: 4%{?dist}
+Version: 1.9.3
+Release: 1%{?dist}
 License: GPL
 URL: http://www.modsecurity.org/
 Group: System Environment/Daemons
-Source: http://www.modsecurity.org/download/modsecurity-apache-%{version}.tar.gz
+Source: http://www.modsecurity.org/download/modsecurity-apache_%{version}.tar.gz
 Source1: mod_security.conf
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: httpd  httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat %{_includedir}/httpd/.mmn || echo missing)
@@ -18,7 +18,7 @@
 
 %prep
 
-%setup -q -n modsecurity-apache-%{version}
+%setup -q -n modsecurity-apache_%{version}
 
 %build
 /usr/sbin/apxs -Wc,"%{optflags}" -c apache2/mod_security.c
@@ -37,9 +37,13 @@
 %defattr (-,root,root)
 %doc CHANGES LICENSE INSTALL README httpd* util doc
 %{_libdir}/httpd/modules/mod_security.so
-%config(noreplace) /etc/httpd/conf.d/mod_security.conf
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_security.conf
 
 %changelog
+* Tue Apr 11 2006 Michael Fleming <mfleming+rpm at enlartenment.com>  1.9.3-1
+- New upstream release
+- Trivial spec tweaks
+
 * Sat Mar 18 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.2-4
 - Bump for FC5 final
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	18 Jan 2006 02:14:08 -0000	1.5
+++ sources	11 Apr 2006 11:00:32 -0000	1.6
@@ -1 +1 @@
-c28b66f02adb1ddb2d0885483f6f8e0e  modsecurity-apache-1.9.2.tar.gz
+cd5585488e2499c4218a4b13419c3065  modsecurity-apache_1.9.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 11:03:32 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Tue, 11 Apr 2006 04:03:32 -0700
Subject: fedora-security/audit README,1.3,1.4
Message-ID: <200604111103.k3BB3WLU003107@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3083

Modified Files:
	README 
Log Message:
Include a bit about FC5



Index: README
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/README,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- README	11 Jul 2005 16:40:28 -0000	1.3
+++ README	11 Apr 2006 11:03:30 -0000	1.4
@@ -5,17 +5,17 @@
 A. Each time Mitre sends out a CVE update
 
         1. Look though the list for anything that might affect
-        a FC4 package
+        a FC4 or FC5 package
 
-        2. Add the CVE names to the FC4 file
+        2. Add the CVE names to the FC4 and/or FC5 file
 
-B. Is FC4 affected by the CVE name
+B. Are FC4 or FC5 affected by the CVE name
 
         1. Did we ship an upstream version that wasn't affected?
 
         2. Did we ship a backported patch?
 
-C. Each time a FC4 update comes out
+C. Each time a FC update comes out
 
         1. Did the package move to a new upstream version?  if so
         are there any flaws listed for that package as "backported"?



From fedora-extras-commits at redhat.com  Tue Apr 11 11:03:44 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Tue, 11 Apr 2006 04:03:44 -0700
Subject: rpms/mod_security/FC-4 .cvsignore, 1.5, 1.6 mod_security.spec, 1.6, 
	1.7 sources, 1.5, 1.6
Message-ID: <200604111103.k3BB3kfL003134@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_security/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3113

Modified Files:
	.cvsignore mod_security.spec sources 
Log Message:
* Tue Apr 11 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.3-1
- New upstream release
- Trivial spec tweaks



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	18 Jan 2006 03:08:08 -0000	1.5
+++ .cvsignore	11 Apr 2006 11:03:43 -0000	1.6
@@ -1 +1 @@
-modsecurity-apache-1.9.2.tar.gz
+modsecurity-apache_1.9.3.tar.gz


Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-4/mod_security.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mod_security.spec	18 Jan 2006 03:08:08 -0000	1.6
+++ mod_security.spec	11 Apr 2006 11:03:43 -0000	1.7
@@ -1,11 +1,11 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 1.9.2
+Version: 1.9.3
 Release: 1%{?dist}
 License: GPL
 URL: http://www.modsecurity.org/
 Group: System Environment/Daemons
-Source: http://www.modsecurity.org/download/modsecurity-apache-%{version}.tar.gz
+Source: http://www.modsecurity.org/download/modsecurity-apache_%{version}.tar.gz
 Source1: mod_security.conf
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: httpd  httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat %{_includedir}/httpd/.mmn || echo missing)
@@ -18,7 +18,7 @@
 
 %prep
 
-%setup -q -n modsecurity-apache-%{version}
+%setup -q -n modsecurity-apache_%{version}
 
 %build
 /usr/sbin/apxs -Wc,"%{optflags}" -c apache2/mod_security.c
@@ -37,9 +37,13 @@
 %defattr (-,root,root)
 %doc CHANGES LICENSE INSTALL README httpd* util doc
 %{_libdir}/httpd/modules/mod_security.so
-%config(noreplace) /etc/httpd/conf.d/mod_security.conf
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_security.conf
 
 %changelog
+* Tue Apr 11 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.3-1
+- New upstream release
+- Trivial spec tweaks
+
 * Wed Jan 18 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.2-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	18 Jan 2006 03:08:08 -0000	1.5
+++ sources	11 Apr 2006 11:03:43 -0000	1.6
@@ -1 +1 @@
-c28b66f02adb1ddb2d0885483f6f8e0e  modsecurity-apache-1.9.2.tar.gz
+cd5585488e2499c4218a4b13419c3065  modsecurity-apache_1.9.3.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 11:07:14 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:07:14 -0700
Subject: rpms/xfce4-clipman-plugin/devel xfce4-clipman-plugin.spec,1.2,1.3
Message-ID: <200604111107.k3BB7GII003201@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-serv3183

Modified Files:
	xfce4-clipman-plugin.spec 
Log Message:
require xfce4-panel.


Index: xfce4-clipman-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-clipman-plugin/devel/xfce4-clipman-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-clipman-plugin.spec	15 Feb 2006 22:12:56 -0000	1.2
+++ xfce4-clipman-plugin.spec	11 Apr 2006 11:07:14 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-clipman-plugin
 Version:	0.4.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Clipboard manager plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 This is a simple cliboard history for Xfce panel. It includes a "Clear 
@@ -36,6 +37,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-6
+- Require xfce4-panel.
+
 * Wed Feb 15 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:07:48 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:07:48 -0700
Subject: rpms/xfce4-clipman-plugin/FC-5 xfce4-clipman-plugin.spec,1.2,1.3
Message-ID: <200604111107.k3BB7ojA003678@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-clipman-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3448

Modified Files:
	xfce4-clipman-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-clipman-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-clipman-plugin/FC-5/xfce4-clipman-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-clipman-plugin.spec	15 Feb 2006 22:12:56 -0000	1.2
+++ xfce4-clipman-plugin.spec	11 Apr 2006 11:07:48 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-clipman-plugin
 Version:	0.4.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Clipboard manager plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 This is a simple cliboard history for Xfce panel. It includes a "Clear 
@@ -36,6 +37,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-6
+- Require xfce4-panel.
+
 * Wed Feb 15 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:08:27 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:08:27 -0700
Subject: rpms/xfce4-clipman-plugin/FC-4 xfce4-clipman-plugin.spec,1.1,1.2
Message-ID: <200604111108.k3BB8TAm005457@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-clipman-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5440

Modified Files:
	xfce4-clipman-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-clipman-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-clipman-plugin/FC-4/xfce4-clipman-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-clipman-plugin.spec	16 Dec 2005 04:32:10 -0000	1.1
+++ xfce4-clipman-plugin.spec	11 Apr 2006 11:08:27 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-clipman-plugin
 Version:	0.4.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Clipboard manager plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 This is a simple cliboard history for Xfce panel. It includes a "Clear 
@@ -36,6 +37,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 11:09:18 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:09:18 -0700
Subject: rpms/xfce4-cpugraph-plugin/devel xfce4-cpugraph-plugin.spec, 1.3,
	1.4
Message-ID: <200604111109.k3BB9KEI005487@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-serv5470

Modified Files:
	xfce4-cpugraph-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-cpugraph-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-cpugraph-plugin/devel/xfce4-cpugraph-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-cpugraph-plugin.spec	16 Feb 2006 15:46:27 -0000	1.3
+++ xfce4-cpugraph-plugin.spec	11 Apr 2006 11:09:18 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		xfce4-cpugraph-plugin
 Version:	0.2.2
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	CPU monitor for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A CPU monitor plugin for the Xfce panel. It offers multiple display modes 
@@ -37,6 +38,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.2.2-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.2.2-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:10:10 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:10:10 -0700
Subject: rpms/xfce4-cpugraph-plugin/FC-4 xfce4-cpugraph-plugin.spec,1.1,1.2
Message-ID: <200604111110.k3BBACbX005554@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-cpugraph-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5502

Modified Files:
	xfce4-cpugraph-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-cpugraph-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-cpugraph-plugin/FC-4/xfce4-cpugraph-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-cpugraph-plugin.spec	9 Dec 2005 22:52:48 -0000	1.1
+++ xfce4-cpugraph-plugin.spec	11 Apr 2006 11:10:09 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-cpugraph-plugin
 Version:	0.2.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	CPU monitor for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A CPU monitor plugin for the Xfce panel. It offers multiple display modes 
@@ -37,6 +38,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.2.2-5
+- Require xfce4-panel.
+
 * Mon Nov 28 2005 Christoph Wickert <fedora wickert at arcor de> - 0.2.2-4
 - Rebuild with new source because of md5sum mismatch.
 - Add libxfcegui4-devel BuildReqs.



From fedora-extras-commits at redhat.com  Tue Apr 11 11:11:08 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:11:08 -0700
Subject: rpms/xfce4-datetime-plugin/devel xfce4-datetime-plugin.spec, 1.3,
	1.4
Message-ID: <200604111111.k3BBBArF005583@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-serv5566

Modified Files:
	xfce4-datetime-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-datetime-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-datetime-plugin/devel/xfce4-datetime-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-datetime-plugin.spec	16 Feb 2006 15:52:21 -0000	1.3
+++ xfce4-datetime-plugin.spec	11 Apr 2006 11:11:08 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		xfce4-datetime-plugin
 Version:	0.3.1
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Date/time plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel  >= 4.2
 BuildRequires:	libxml2-devel, gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 An alternative clock plugin for the Xfce panel. A calendar appears when you 
@@ -38,6 +39,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* 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.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:11:43 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:11:43 -0700
Subject: rpms/xfce4-datetime-plugin/FC-5 xfce4-datetime-plugin.spec,1.3,1.4
Message-ID: <200604111111.k3BBBjE1005615@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-datetime-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5598

Modified Files:
	xfce4-datetime-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-datetime-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-datetime-plugin/FC-5/xfce4-datetime-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-datetime-plugin.spec	16 Feb 2006 15:52:21 -0000	1.3
+++ xfce4-datetime-plugin.spec	11 Apr 2006 11:11:43 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		xfce4-datetime-plugin
 Version:	0.3.1
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Date/time plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel  >= 4.2
 BuildRequires:	libxml2-devel, gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 An alternative clock plugin for the Xfce panel. A calendar appears when you 
@@ -38,6 +39,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* 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.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:12:08 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:12:08 -0700
Subject: rpms/xfce4-datetime-plugin/FC-4 xfce4-datetime-plugin.spec,1.2,1.3
Message-ID: <200604111112.k3BBCAMK005643@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-datetime-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5626

Modified Files:
	xfce4-datetime-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-datetime-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-datetime-plugin/FC-4/xfce4-datetime-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-datetime-plugin.spec	9 Dec 2005 23:00:51 -0000	1.2
+++ xfce4-datetime-plugin.spec	11 Apr 2006 11:12:08 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-datetime-plugin
 Version:	0.3.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Date/time plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel  >= 4.2
 BuildRequires:	libxml2-devel, gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 An alternative clock plugin for the Xfce panel. A calendar appears when you 
@@ -38,6 +39,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-6
+- Require xfce4-panel.
+
 * Tue Nov 29 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-5
 - Add libxfcegui4-devel BuildReqs.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:12:43 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:12:43 -0700
Subject: rpms/xfce4-diskperf-plugin/devel xfce4-diskperf-plugin.spec, 1.3,
	1.4
Message-ID: <200604111112.k3BBCjdT005672@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-serv5655

Modified Files:
	xfce4-diskperf-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-diskperf-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-diskperf-plugin/devel/xfce4-diskperf-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-diskperf-plugin.spec	16 Feb 2006 16:10:21 -0000	1.3
+++ xfce4-diskperf-plugin.spec	11 Apr 2006 11:12:42 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		xfce4-diskperf-plugin
 Version:	1.5
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Disk performance plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 The DiskPerf plugin displays disk/partition performance (bytes transfered per
@@ -36,6 +37,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 1.5-6
+- Require xfce4-panel.
+
 * Wed Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 1.5-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:17:23 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:17:23 -0700
Subject: rpms/xfce4-diskperf-plugin/FC-5 xfce4-diskperf-plugin.spec,1.3,1.4
Message-ID: <200604111117.k3BBHPH3005725@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-diskperf-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5708

Modified Files:
	xfce4-diskperf-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-diskperf-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-diskperf-plugin/FC-5/xfce4-diskperf-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-diskperf-plugin.spec	16 Feb 2006 16:10:21 -0000	1.3
+++ xfce4-diskperf-plugin.spec	11 Apr 2006 11:17:23 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		xfce4-diskperf-plugin
 Version:	1.5
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Disk performance plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 The DiskPerf plugin displays disk/partition performance (bytes transfered per
@@ -36,6 +37,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 1.5-6
+- Require xfce4-panel.
+
 * Wed Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 1.5-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:18:16 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:18:16 -0700
Subject: rpms/xfce4-diskperf-plugin/FC-4 xfce4-diskperf-plugin.spec,1.1,1.2
Message-ID: <200604111118.k3BBIIjU005760@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-diskperf-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5741

Modified Files:
	xfce4-diskperf-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-diskperf-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-diskperf-plugin/FC-4/xfce4-diskperf-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-diskperf-plugin.spec	28 Jan 2006 00:21:04 -0000	1.1
+++ xfce4-diskperf-plugin.spec	11 Apr 2006 11:18:16 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-diskperf-plugin
 Version:	1.5
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Disk performance plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 The DiskPerf plugin displays disk/partition performance (bytes transfered per
@@ -36,6 +37,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 1.5-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 1.5-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 11:19:09 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:19:09 -0700
Subject: rpms/xfce4-fsguard-plugin/devel xfce4-fsguard-plugin.spec,1.2,1.3
Message-ID: <200604111119.k3BBJBGW005789@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-serv5772

Modified Files:
	xfce4-fsguard-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-fsguard-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-fsguard-plugin/devel/xfce4-fsguard-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-fsguard-plugin.spec	16 Feb 2006 16:14:40 -0000	1.2
+++ xfce4-fsguard-plugin.spec	11 Apr 2006 11:19:09 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-fsguard-plugin
 Version:	0.2.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Filesystem-Guard plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 A little Xfce plugin, which checks the free space on the chosen mountpoint 
@@ -40,6 +41,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.2.1-4
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.2.1-3
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:19:36 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:19:36 -0700
Subject: rpms/xfce4-fsguard-plugin/FC-5 xfce4-fsguard-plugin.spec,1.2,1.3
Message-ID: <200604111119.k3BBJcRK005817@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-fsguard-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5800

Modified Files:
	xfce4-fsguard-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-fsguard-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-fsguard-plugin/FC-5/xfce4-fsguard-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-fsguard-plugin.spec	16 Feb 2006 16:14:40 -0000	1.2
+++ xfce4-fsguard-plugin.spec	11 Apr 2006 11:19:36 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-fsguard-plugin
 Version:	0.2.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Filesystem-Guard plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 A little Xfce plugin, which checks the free space on the chosen mountpoint 
@@ -40,6 +41,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.2.1-4
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.2.1-3
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:20:00 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:20:00 -0700
Subject: rpms/xfce4-fsguard-plugin/FC-4 xfce4-fsguard-plugin.spec,1.1,1.2
Message-ID: <200604111120.k3BBK2fc005846@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-fsguard-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5828

Modified Files:
	xfce4-fsguard-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-fsguard-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-fsguard-plugin/FC-4/xfce4-fsguard-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-fsguard-plugin.spec	22 Jan 2006 23:36:42 -0000	1.1
+++ xfce4-fsguard-plugin.spec	11 Apr 2006 11:19:59 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-fsguard-plugin
 Version:	0.2.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Filesystem-Guard plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 A little Xfce plugin, which checks the free space on the chosen mountpoint 
@@ -40,6 +41,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.2.1-3
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.2.1-2
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 11:20:36 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:20:36 -0700
Subject: rpms/xfce4-genmon-plugin/devel xfce4-genmon-plugin.spec,1.2,1.3
Message-ID: <200604111120.k3BBKcUM005876@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-serv5859

Modified Files:
	xfce4-genmon-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-genmon-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-genmon-plugin/devel/xfce4-genmon-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-genmon-plugin.spec	16 Feb 2006 16:27:23 -0000	1.2
+++ xfce4-genmon-plugin.spec	11 Apr 2006 11:20:36 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-genmon-plugin
 Version:	1.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Generic monitor plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 The GenMon plugin cyclically spawns the indicated script/program,
@@ -36,6 +37,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 1.1-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 1.1-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:21:34 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:21:34 -0700
Subject: rpms/xfce4-genmon-plugin/FC-5 xfce4-genmon-plugin.spec,1.2,1.3
Message-ID: <200604111121.k3BBLaYG005909@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-genmon-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5892

Modified Files:
	xfce4-genmon-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-genmon-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-genmon-plugin/FC-5/xfce4-genmon-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-genmon-plugin.spec	16 Feb 2006 16:27:23 -0000	1.2
+++ xfce4-genmon-plugin.spec	11 Apr 2006 11:21:34 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-genmon-plugin
 Version:	1.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Generic monitor plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 The GenMon plugin cyclically spawns the indicated script/program,
@@ -36,6 +37,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 1.1-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 1.1-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:22:13 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:22:13 -0700
Subject: rpms/xfce4-genmon-plugin/FC-4 xfce4-genmon-plugin.spec,1.1,1.2
Message-ID: <200604111122.k3BBMF5n005937@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-genmon-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5920

Modified Files:
	xfce4-genmon-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-genmon-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-genmon-plugin/FC-4/xfce4-genmon-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-genmon-plugin.spec	9 Dec 2005 22:38:04 -0000	1.1
+++ xfce4-genmon-plugin.spec	11 Apr 2006 11:22:13 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-genmon-plugin
 Version:	1.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Generic monitor plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 The GenMon plugin cyclically spawns the indicated script/program,
@@ -36,6 +37,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 1.1-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 1.1-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 11:22:42 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:22:42 -0700
Subject: rpms/xfce4-minicmd-plugin/devel xfce4-minicmd-plugin.spec,1.2,1.3
Message-ID: <200604111122.k3BBMiIE005970@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-serv5951

Modified Files:
	xfce4-minicmd-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-minicmd-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-minicmd-plugin/devel/xfce4-minicmd-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-minicmd-plugin.spec	16 Feb 2006 16:37:53 -0000	1.2
+++ xfce4-minicmd-plugin.spec	11 Apr 2006 11:22:42 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-minicmd-plugin
 Version:	0.3.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Mini command-line plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A mini command-line plugin for the Xfce panel. You can execute programs by 
@@ -38,6 +39,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:23:10 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:23:10 -0700
Subject: rpms/xfce4-minicmd-plugin/FC-5 xfce4-minicmd-plugin.spec,1.2,1.3
Message-ID: <200604111123.k3BBNCc1006012@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-minicmd-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5993

Modified Files:
	xfce4-minicmd-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-minicmd-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-minicmd-plugin/FC-5/xfce4-minicmd-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-minicmd-plugin.spec	16 Feb 2006 16:37:53 -0000	1.2
+++ xfce4-minicmd-plugin.spec	11 Apr 2006 11:23:09 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-minicmd-plugin
 Version:	0.3.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Mini command-line plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A mini command-line plugin for the Xfce panel. You can execute programs by 
@@ -38,6 +39,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:23:50 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:23:50 -0700
Subject: rpms/xfce4-minicmd-plugin/FC-4 xfce4-minicmd-plugin.spec,1.1,1.2
Message-ID: <200604111123.k3BBNqd9006051@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-minicmd-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6032

Modified Files:
	xfce4-minicmd-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-minicmd-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-minicmd-plugin/FC-4/xfce4-minicmd-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-minicmd-plugin.spec	15 Dec 2005 03:53:18 -0000	1.1
+++ xfce4-minicmd-plugin.spec	11 Apr 2006 11:23:50 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-minicmd-plugin
 Version:	0.3.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Mini command-line plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A mini command-line plugin for the Xfce panel. You can execute programs by 
@@ -38,6 +39,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 11:24:35 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:24:35 -0700
Subject: rpms/xfce4-modemlights-plugin/devel xfce4-modemlights-plugin.spec,
	1.5, 1.6
Message-ID: <200604111124.k3BBObiS006083@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-serv6066

Modified Files:
	xfce4-modemlights-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-modemlights-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-modemlights-plugin/devel/xfce4-modemlights-plugin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xfce4-modemlights-plugin.spec	16 Feb 2006 16:42:00 -0000	1.5
+++ xfce4-modemlights-plugin.spec	11 Apr 2006 11:24:35 -0000	1.6
@@ -1,6 +1,6 @@
 Name: 		xfce4-modemlights-plugin
 Version: 	0.1.1
-Release: 	6%{?dist}
+Release: 	7%{?dist}
 Summary: 	Modemlights for the XFCE panel
 
 Group: 		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	libXt-devel
+Requires:	xfce4-panel >= 4.2
 
 %description
 A Xfce4 panel applet intended to simplify establishing a ppp connection via 
@@ -39,6 +40,9 @@
 %{_datadir}/xfce4/*
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.1.1-7
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.1.1-6
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:24:56 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:24:56 -0700
Subject: rpms/xfce4-modemlights-plugin/FC-5 xfce4-modemlights-plugin.spec,
	1.5, 1.6
Message-ID: <200604111124.k3BBOw3n006111@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-modemlights-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6094

Modified Files:
	xfce4-modemlights-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-modemlights-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-modemlights-plugin/FC-5/xfce4-modemlights-plugin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xfce4-modemlights-plugin.spec	16 Feb 2006 16:42:00 -0000	1.5
+++ xfce4-modemlights-plugin.spec	11 Apr 2006 11:24:56 -0000	1.6
@@ -1,6 +1,6 @@
 Name: 		xfce4-modemlights-plugin
 Version: 	0.1.1
-Release: 	6%{?dist}
+Release: 	7%{?dist}
 Summary: 	Modemlights for the XFCE panel
 
 Group: 		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	libXt-devel
+Requires:	xfce4-panel >= 4.2
 
 %description
 A Xfce4 panel applet intended to simplify establishing a ppp connection via 
@@ -39,6 +40,9 @@
 %{_datadir}/xfce4/*
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.1.1-7
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.1.1-6
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:25:20 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:25:20 -0700
Subject: rpms/xfce4-modemlights-plugin/FC-4 xfce4-modemlights-plugin.spec,
	1.1, 1.2
Message-ID: <200604111125.k3BBPMsm006139@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-modemlights-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6122

Modified Files:
	xfce4-modemlights-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-modemlights-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-modemlights-plugin/FC-4/xfce4-modemlights-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-modemlights-plugin.spec	15 Dec 2005 03:49:55 -0000	1.1
+++ xfce4-modemlights-plugin.spec	11 Apr 2006 11:25:20 -0000	1.2
@@ -1,6 +1,6 @@
 Name: 		xfce4-modemlights-plugin
 Version: 	0.1.1
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Summary: 	Modemlights for the XFCE panel
 
 Group: 		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A Xfce4 panel applet intended to simplify establishing a ppp connection via 
@@ -38,6 +39,9 @@
 %{_datadir}/xfce4/*
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.1.1-4
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.1.1-3
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 11:25:54 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:25:54 -0700
Subject: rpms/xfce4-mount-plugin/devel xfce4-mount-plugin.spec,1.3,1.4
Message-ID: <200604111125.k3BBPuXr006168@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-serv6150

Modified Files:
	xfce4-mount-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-mount-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mount-plugin/devel/xfce4-mount-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-mount-plugin.spec	16 Feb 2006 16:44:29 -0000	1.3
+++ xfce4-mount-plugin.spec	11 Apr 2006 11:25:54 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		xfce4-mount-plugin
 Version:	0.3.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Mount/unmount utility for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 Mount and unmount filesystems from the Xfce panel.
@@ -36,6 +37,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-3
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-2
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:26:18 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:26:18 -0700
Subject: rpms/xfce4-mount-plugin/FC-5 xfce4-mount-plugin.spec,1.3,1.4
Message-ID: <200604111126.k3BBQKqe006202@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-mount-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6185

Modified Files:
	xfce4-mount-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-mount-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mount-plugin/FC-5/xfce4-mount-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-mount-plugin.spec	16 Feb 2006 16:44:29 -0000	1.3
+++ xfce4-mount-plugin.spec	11 Apr 2006 11:26:18 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		xfce4-mount-plugin
 Version:	0.3.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Mount/unmount utility for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 Mount and unmount filesystems from the Xfce panel.
@@ -36,6 +37,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-3
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-2
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:26:41 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:26:41 -0700
Subject: rpms/xfce4-mount-plugin/FC-4 xfce4-mount-plugin.spec,1.2,1.3
Message-ID: <200604111126.k3BBQhO5006234@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-mount-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6215

Modified Files:
	xfce4-mount-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-mount-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mount-plugin/FC-4/xfce4-mount-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-mount-plugin.spec	21 Jan 2006 22:24:09 -0000	1.2
+++ xfce4-mount-plugin.spec	11 Apr 2006 11:26:41 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-mount-plugin
 Version:	0.3.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Mount/unmount utility for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 Mount and unmount filesystems from the Xfce panel.
@@ -36,6 +37,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-2
+- Require xfce4-panel.
+
 * Sat Jan 21 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-1
 - Updat to 0.3.3.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:27:11 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:27:11 -0700
Subject: rpms/xfce4-netload-plugin/devel xfce4-netload-plugin.spec,1.3,1.4
Message-ID: <200604111127.k3BBRD1X006266@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-serv6249

Modified Files:
	xfce4-netload-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-netload-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-netload-plugin/devel/xfce4-netload-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-netload-plugin.spec	18 Feb 2006 22:29:49 -0000	1.3
+++ xfce4-netload-plugin.spec	11 Apr 2006 11:27:11 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		xfce4-netload-plugin
 Version:	0.3.3
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Network-load monitor for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -12,6 +12,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 A network-load monitor plugin for the Xfce panel.
@@ -39,6 +40,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-6
+- Require xfce4-panel.
+
 * Sat Feb 18 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-5
 - Rebuild for Fedora Extras 5.
 - Modify bufsize-patch.



From fedora-extras-commits at redhat.com  Tue Apr 11 11:27:35 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:27:35 -0700
Subject: rpms/xfce4-netload-plugin/FC-5 xfce4-netload-plugin.spec,1.3,1.4
Message-ID: <200604111127.k3BBRbat006294@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-netload-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6277

Modified Files:
	xfce4-netload-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-netload-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-netload-plugin/FC-5/xfce4-netload-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-netload-plugin.spec	18 Feb 2006 22:29:49 -0000	1.3
+++ xfce4-netload-plugin.spec	11 Apr 2006 11:27:34 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		xfce4-netload-plugin
 Version:	0.3.3
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Network-load monitor for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -12,6 +12,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 A network-load monitor plugin for the Xfce panel.
@@ -39,6 +40,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-6
+- Require xfce4-panel.
+
 * Sat Feb 18 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-5
 - Rebuild for Fedora Extras 5.
 - Modify bufsize-patch.



From fedora-extras-commits at redhat.com  Tue Apr 11 11:32:18 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:32:18 -0700
Subject: rpms/xfce4-netload-plugin/FC-4 xfce4-netload-plugin-bufsize.patch,
	1.1, 1.2 xfce4-netload-plugin.spec, 1.2, 1.3
Message-ID: <200604111132.k3BBWKS6006356@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-netload-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6334

Modified Files:
	xfce4-netload-plugin-bufsize.patch xfce4-netload-plugin.spec 
Log Message:
require xfce4-panel & update bufsize-patch

xfce4-netload-plugin-bufsize.patch:

Index: xfce4-netload-plugin-bufsize.patch
===================================================================
RCS file: /cvs/extras/rpms/xfce4-netload-plugin/FC-4/xfce4-netload-plugin-bufsize.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-netload-plugin-bufsize.patch	3 Feb 2006 20:14:03 -0000	1.1
+++ xfce4-netload-plugin-bufsize.patch	11 Apr 2006 11:32:17 -0000	1.2
@@ -1,17 +1,11 @@
---- panel-plugin/wormulon/linux.c.orig	2006-02-03 20:48:17.000000000 +0100
-+++ panel-plugin/wormulon/linux.c	2005-08-01 00:56:38.000000000 +0200
-@@ -101,11 +101,11 @@
- 
-     /* do not parse the first two lines as they only contain static garbage */
-     fseek(proc_net_dev, 0, SEEK_SET);
--    fgets(buffer, BUFSIZ-1, proc_net_dev);
--    fgets(buffer, BUFSIZ-1, proc_net_dev);
-+    fgets(buffer, BUFSIZE-1, proc_net_dev);
-+    fgets(buffer, BUFSIZE-1, proc_net_dev);
- 
-     interfacefound = 0;
--    while (fgets(buffer, BUFSIZ-1, proc_net_dev) != NULL)
-+    while (fgets(buffer, BUFSIZE-1, proc_net_dev) != NULL)
-     {
-         /* find the device name and substitute ':' with '\0' */
-         ptr = buffer;
+--- panel-plugin/wormulon/linux.c.orig	2005-08-01 00:56:38.000000000 +0200
++++ panel-plugin/wormulon/linux.c	2006-02-04 13:20:14.000000000 +0100
+@@ -81,7 +81,7 @@
+      * performance difference is _very_ minimal. But I don't think that it's a good
+      * idea to keep the file open for a very long time for _each_ plugin instance.
+      */
+-    char buffer[BUFSIZE];
++    char buffer[BUFSIZ];
+     char *ptr;
+     char *devname;
+     int dump;


Index: xfce4-netload-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-netload-plugin/FC-4/xfce4-netload-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-netload-plugin.spec	3 Feb 2006 20:14:03 -0000	1.2
+++ xfce4-netload-plugin.spec	11 Apr 2006 11:32:17 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-netload-plugin
 Version:	0.3.3
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Network-load monitor for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -12,6 +12,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 A network-load monitor plugin for the Xfce panel.
@@ -39,6 +40,10 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-5
+- Require xfce4-panel.
+- Modify bufsize-patch.
+
 * Thu Feb 02 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-4
 - Add bufsize-patch (#179686)
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:32:52 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:32:52 -0700
Subject: rpms/xfce4-notes-plugin/devel xfce4-notes-plugin.spec,1.2,1.3
Message-ID: <200604111132.k3BBWsvZ006391@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-serv6371

Modified Files:
	xfce4-notes-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-notes-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-notes-plugin/devel/xfce4-notes-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-notes-plugin.spec	16 Feb 2006 17:18:21 -0000	1.2
+++ xfce4-notes-plugin.spec	11 Apr 2006 11:32:51 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-notes-plugin
 Version:	0.11.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Notes plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 This plugin provides sticky notes for your desktop. You can create a note by 
@@ -39,6 +40,9 @@
 %{_datadir}/xfce4/*
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.11.1-4
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.11.1-3
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:33:17 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:33:17 -0700
Subject: rpms/xfce4-notes-plugin/FC-5 xfce4-notes-plugin.spec,1.2,1.3
Message-ID: <200604111133.k3BBXJtm006423@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-notes-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6406

Modified Files:
	xfce4-notes-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-notes-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-notes-plugin/FC-5/xfce4-notes-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-notes-plugin.spec	16 Feb 2006 17:18:21 -0000	1.2
+++ xfce4-notes-plugin.spec	11 Apr 2006 11:33:17 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-notes-plugin
 Version:	0.11.1
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Notes plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 This plugin provides sticky notes for your desktop. You can create a note by 
@@ -39,6 +40,9 @@
 %{_datadir}/xfce4/*
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.11.1-4
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.11.1-3
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:33:42 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:33:42 -0700
Subject: rpms/xfce4-notes-plugin/FC-4 xfce4-notes-plugin.spec,1.1,1.2
Message-ID: <200604111133.k3BBXiAK006453@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-notes-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6436

Modified Files:
	xfce4-notes-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-notes-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-notes-plugin/FC-4/xfce4-notes-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-notes-plugin.spec	15 Dec 2005 03:46:11 -0000	1.1
+++ xfce4-notes-plugin.spec	11 Apr 2006 11:33:42 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-notes-plugin
 Version:	0.11.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Notes plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 This plugin provides sticky notes for your desktop. You can create a note by 
@@ -39,6 +40,9 @@
 %{_datadir}/xfce4/*
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.11.1-3
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.11.1-2
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 11:34:11 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:34:11 -0700
Subject: rpms/xfce4-quicklauncher-plugin/devel
	xfce4-quicklauncher-plugin.spec, 1.2, 1.3
Message-ID: <200604111134.k3BBYDe6006481@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-serv6464

Modified Files:
	xfce4-quicklauncher-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-quicklauncher-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-quicklauncher-plugin/devel/xfce4-quicklauncher-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-quicklauncher-plugin.spec	16 Feb 2006 17:38:06 -0000	1.2
+++ xfce4-quicklauncher-plugin.spec	11 Apr 2006 11:34:11 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-quicklauncher-plugin
 Version:	0.81
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Quicklauncher plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 This plugin allows you to have lots of launchers in the Xfce panel, displaying 
@@ -40,6 +41,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.81-4
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.81-3
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:34:54 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:34:54 -0700
Subject: rpms/xfce4-quicklauncher-plugin/FC-5
	xfce4-quicklauncher-plugin.spec, 1.2, 1.3
Message-ID: <200604111134.k3BBYuUD006509@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-quicklauncher-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6492

Modified Files:
	xfce4-quicklauncher-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-quicklauncher-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-quicklauncher-plugin/FC-5/xfce4-quicklauncher-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-quicklauncher-plugin.spec	16 Feb 2006 17:38:06 -0000	1.2
+++ xfce4-quicklauncher-plugin.spec	11 Apr 2006 11:34:54 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-quicklauncher-plugin
 Version:	0.81
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Quicklauncher plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 This plugin allows you to have lots of launchers in the Xfce panel, displaying 
@@ -40,6 +41,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.81-4
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.81-3
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:35:27 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:35:27 -0700
Subject: rpms/xfce4-quicklauncher-plugin/FC-4
	xfce4-quicklauncher-plugin.spec, 1.1, 1.2
Message-ID: <200604111135.k3BBZTUP006537@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-quicklauncher-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6520

Modified Files:
	xfce4-quicklauncher-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-quicklauncher-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-quicklauncher-plugin/FC-4/xfce4-quicklauncher-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-quicklauncher-plugin.spec	27 Jan 2006 17:57:59 -0000	1.1
+++ xfce4-quicklauncher-plugin.spec	11 Apr 2006 11:35:26 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-quicklauncher-plugin
 Version:	0.81
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Quicklauncher plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 This plugin allows you to have lots of launchers in the Xfce panel, displaying 
@@ -40,6 +41,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.81-3
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.81-2
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 11:36:00 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:36:00 -0700
Subject: rpms/xfce4-screenshooter-plugin/devel
	xfce4-screenshooter-plugin.spec, 1.2, 1.3
Message-ID: <200604111136.k3BBa20e006569@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-serv6552

Modified Files:
	xfce4-screenshooter-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-screenshooter-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-screenshooter-plugin/devel/xfce4-screenshooter-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-screenshooter-plugin.spec	16 Feb 2006 17:40:28 -0000	1.2
+++ xfce4-screenshooter-plugin.spec	11 Apr 2006 11:36:00 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-screenshooter-plugin
 Version:	0.0.8
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Screenshot utility for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 The Screenshooter plugin allows you to take screenshots from the Xfce panel.
@@ -35,6 +36,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.0.8-3
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.0.8-2
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:36:30 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:36:30 -0700
Subject: rpms/xfce4-screenshooter-plugin/FC-5
	xfce4-screenshooter-plugin.spec, 1.2, 1.3
Message-ID: <200604111136.k3BBaWBn006601@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-screenshooter-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6584

Modified Files:
	xfce4-screenshooter-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-screenshooter-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-screenshooter-plugin/FC-5/xfce4-screenshooter-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-screenshooter-plugin.spec	16 Feb 2006 17:40:28 -0000	1.2
+++ xfce4-screenshooter-plugin.spec	11 Apr 2006 11:36:30 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-screenshooter-plugin
 Version:	0.0.8
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Screenshot utility for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 The Screenshooter plugin allows you to take screenshots from the Xfce panel.
@@ -35,6 +36,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.0.8-3
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.0.8-2
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:36:54 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:36:54 -0700
Subject: rpms/xfce4-screenshooter-plugin/FC-4
	xfce4-screenshooter-plugin.spec, 1.1, 1.2
Message-ID: <200604111136.k3BBauW1006633@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-screenshooter-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6616

Modified Files:
	xfce4-screenshooter-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-screenshooter-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-screenshooter-plugin/FC-4/xfce4-screenshooter-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-screenshooter-plugin.spec	29 Jan 2006 23:57:30 -0000	1.1
+++ xfce4-screenshooter-plugin.spec	11 Apr 2006 11:36:53 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-screenshooter-plugin
 Version:	0.0.8
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Screenshot utility for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 The Screenshooter plugin allows you to take screenshots from the Xfce panel.
@@ -35,5 +36,8 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.0.8-2
+- Require xfce4-panel.
+
 * Sat Jan 21 2006 Christoph Wickert <fedora wickert at arcor de> - 0.0.8-1
 - Initial Fedora Extras version.



From fedora-extras-commits at redhat.com  Tue Apr 11 11:37:27 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:37:27 -0700
Subject: rpms/xfce4-sensors-plugin/devel xfce4-sensors-plugin.spec,1.3,1.4
Message-ID: <200604111137.k3BBbTNc006664@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-serv6647

Modified Files:
	xfce4-sensors-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-sensors-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-sensors-plugin/devel/xfce4-sensors-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-sensors-plugin.spec	18 Feb 2006 22:19:53 -0000	1.3
+++ xfce4-sensors-plugin.spec	11 Apr 2006 11:37:27 -0000	1.4
@@ -1,6 +1,6 @@
 Name: 		xfce4-sensors-plugin
 Version: 	0.7.0
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 Summary: 	Sensors plugin for the Xfce panel
 
 Group: 		User Interface/Desktops
@@ -11,7 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext, lm_sensors-devel >= 2.8
-Requires:	lm_sensors >= 2.8
+Requires:	xfce4-panel >= 4.2, lm_sensors >= 2.8
 ExcludeArch:	ppc
 
 %description
@@ -39,6 +39,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.7.0-5
+- Require xfce4-panel.
+
 * Sat Feb 18 2006 Christoph Wickert <fedora wickert at arcor de> - 0.7.0-4
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:37:50 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:37:50 -0700
Subject: rpms/xfce4-sensors-plugin/FC-5 xfce4-sensors-plugin.spec,1.3,1.4
Message-ID: <200604111137.k3BBbqvq006692@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-sensors-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6675

Modified Files:
	xfce4-sensors-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-sensors-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-sensors-plugin/FC-5/xfce4-sensors-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-sensors-plugin.spec	18 Feb 2006 22:19:53 -0000	1.3
+++ xfce4-sensors-plugin.spec	11 Apr 2006 11:37:50 -0000	1.4
@@ -1,6 +1,6 @@
 Name: 		xfce4-sensors-plugin
 Version: 	0.7.0
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 Summary: 	Sensors plugin for the Xfce panel
 
 Group: 		User Interface/Desktops
@@ -11,7 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext, lm_sensors-devel >= 2.8
-Requires:	lm_sensors >= 2.8
+Requires:	xfce4-panel >= 4.2, lm_sensors >= 2.8
 ExcludeArch:	ppc
 
 %description
@@ -39,6 +39,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.7.0-5
+- Require xfce4-panel.
+
 * Sat Feb 18 2006 Christoph Wickert <fedora wickert at arcor de> - 0.7.0-4
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:38:12 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:38:12 -0700
Subject: rpms/xfce4-sensors-plugin/FC-4 xfce4-sensors-plugin.spec,1.2,1.3
Message-ID: <200604111138.k3BBcEjt006728@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-sensors-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6709

Modified Files:
	xfce4-sensors-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-sensors-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-sensors-plugin/FC-4/xfce4-sensors-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-sensors-plugin.spec	22 Jan 2006 20:24:01 -0000	1.2
+++ xfce4-sensors-plugin.spec	11 Apr 2006 11:38:11 -0000	1.3
@@ -1,6 +1,6 @@
 Name: 		xfce4-sensors-plugin
 Version: 	0.7.0
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Summary: 	Sensors plugin for the Xfce panel
 
 Group: 		User Interface/Desktops
@@ -11,7 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext, lm_sensors-devel >= 2.8
-Requires:	lm_sensors >= 2.8
+Requires:	xfce4-panel >= 4.2, lm_sensors >= 2.8
 ExcludeArch:	ppc
 
 %description
@@ -39,6 +39,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.7.0-4
+- Require xfce4-panel.
+
 * Sun Jan 22 2006 Christoph Wickert <fedora wickert at arcor de> - 0.7.0-3
 - ExcludeArch ppc.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:39:04 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:39:04 -0700
Subject: rpms/xfce4-showdesktop-plugin/devel xfce4-showdesktop-plugin.spec,
	1.2, 1.3
Message-ID: <200604111139.k3BBd6J9006767@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-serv6750

Modified Files:
	xfce4-showdesktop-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-showdesktop-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-showdesktop-plugin/devel/xfce4-showdesktop-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-showdesktop-plugin.spec	16 Feb 2006 17:45:01 -0000	1.2
+++ xfce4-showdesktop-plugin.spec	11 Apr 2006 11:39:04 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-showdesktop-plugin
 Version:	0.4.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Show-Desktop plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:  gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 This is a little Xfce plugin, to minimize and unminimize all windows on the
@@ -39,6 +40,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.0-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.0-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:39:27 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:39:27 -0700
Subject: rpms/xfce4-showdesktop-plugin/FC-5 xfce4-showdesktop-plugin.spec,
	1.2, 1.3
Message-ID: <200604111139.k3BBdTdw006795@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-showdesktop-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6778

Modified Files:
	xfce4-showdesktop-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-showdesktop-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-showdesktop-plugin/FC-5/xfce4-showdesktop-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-showdesktop-plugin.spec	16 Feb 2006 17:45:01 -0000	1.2
+++ xfce4-showdesktop-plugin.spec	11 Apr 2006 11:39:27 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-showdesktop-plugin
 Version:	0.4.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Show-Desktop plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:  gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 This is a little Xfce plugin, to minimize and unminimize all windows on the
@@ -39,6 +40,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.0-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.0-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:39:53 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:39:53 -0700
Subject: rpms/xfce4-showdesktop-plugin/FC-4 xfce4-showdesktop-plugin.spec,
	1.1, 1.2
Message-ID: <200604111139.k3BBdtTo006823@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-showdesktop-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6806

Modified Files:
	xfce4-showdesktop-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-showdesktop-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-showdesktop-plugin/FC-4/xfce4-showdesktop-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-showdesktop-plugin.spec	15 Dec 2005 03:17:47 -0000	1.1
+++ xfce4-showdesktop-plugin.spec	11 Apr 2006 11:39:53 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-showdesktop-plugin
 Version:	0.4.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Show-Desktop plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:  gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 This is a little Xfce plugin, to minimize and unminimize all windows on the
@@ -39,6 +40,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.0-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.4.0-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 11:40:24 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:40:24 -0700
Subject: rpms/xfce4-systemload-plugin/devel xfce4-systemload-plugin.spec, 1.2,
	1.3
Message-ID: <200604111140.k3BBeQ29006852@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-serv6835

Modified Files:
	xfce4-systemload-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-systemload-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-systemload-plugin/devel/xfce4-systemload-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-systemload-plugin.spec	16 Feb 2006 17:47:51 -0000	1.2
+++ xfce4-systemload-plugin.spec	11 Apr 2006 11:40:24 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-systemload-plugin
 Version:	0.3.6
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Systemload monitor for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 A system-load monitor plugin for the Xfce panel. It displays the current CPU 
@@ -38,6 +39,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.6-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.6-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:40:46 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:40:46 -0700
Subject: rpms/xfce4-systemload-plugin/FC-5 xfce4-systemload-plugin.spec, 1.2,
	1.3
Message-ID: <200604111140.k3BBem1O006881@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-systemload-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6864

Modified Files:
	xfce4-systemload-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-systemload-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-systemload-plugin/FC-5/xfce4-systemload-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-systemload-plugin.spec	16 Feb 2006 17:47:51 -0000	1.2
+++ xfce4-systemload-plugin.spec	11 Apr 2006 11:40:46 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-systemload-plugin
 Version:	0.3.6
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Systemload monitor for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 A system-load monitor plugin for the Xfce panel. It displays the current CPU 
@@ -38,6 +39,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.6-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:41:24 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:41:24 -0700
Subject: rpms/xfce4-systemload-plugin/FC-4 xfce4-systemload-plugin.spec, 1.1,
	1.2
Message-ID: <200604111141.k3BBfQXa006913@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-systemload-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6896

Modified Files:
	xfce4-systemload-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-systemload-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-systemload-plugin/FC-4/xfce4-systemload-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-systemload-plugin.spec	16 Dec 2005 22:34:40 -0000	1.1
+++ xfce4-systemload-plugin.spec	11 Apr 2006 11:41:24 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-systemload-plugin
 Version:	0.3.6
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Systemload monitor for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 A system-load monitor plugin for the Xfce panel. It displays the current CPU 
@@ -38,6 +39,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.6-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.6-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 11:42:10 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:42:10 -0700
Subject: rpms/xfce4-taskbar-plugin/devel xfce4-taskbar-plugin.spec,1.2,1.3
Message-ID: <200604111142.k3BBgCiY006942@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-serv6925

Modified Files:
	xfce4-taskbar-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-taskbar-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-taskbar-plugin/devel/xfce4-taskbar-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-taskbar-plugin.spec	16 Feb 2006 17:50:12 -0000	1.2
+++ xfce4-taskbar-plugin.spec	11 Apr 2006 11:42:10 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-taskbar-plugin
 Version:	0.2.2
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Tasklist plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A tasklist plugin for the Xfce panel. The size of the taskbar can be changed 
@@ -37,6 +38,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.2.2-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.2.2-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:42:33 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:42:33 -0700
Subject: rpms/xfce4-taskbar-plugin/FC-5 xfce4-taskbar-plugin.spec,1.2,1.3
Message-ID: <200604111142.k3BBgZcO006970@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-taskbar-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6953

Modified Files:
	xfce4-taskbar-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-taskbar-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-taskbar-plugin/FC-5/xfce4-taskbar-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-taskbar-plugin.spec	16 Feb 2006 17:50:12 -0000	1.2
+++ xfce4-taskbar-plugin.spec	11 Apr 2006 11:42:32 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-taskbar-plugin
 Version:	0.2.2
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Tasklist plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A tasklist plugin for the Xfce panel. The size of the taskbar can be changed 
@@ -37,6 +38,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.2.2-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.2.2-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:42:58 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:42:58 -0700
Subject: rpms/xfce4-taskbar-plugin/FC-4 xfce4-taskbar-plugin.spec,1.1,1.2
Message-ID: <200604111143.k3BBh0LN006998@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-taskbar-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6981

Modified Files:
	xfce4-taskbar-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-taskbar-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-taskbar-plugin/FC-4/xfce4-taskbar-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-taskbar-plugin.spec	15 Dec 2005 03:21:10 -0000	1.1
+++ xfce4-taskbar-plugin.spec	11 Apr 2006 11:42:58 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-taskbar-plugin
 Version:	0.2.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Tasklist plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A tasklist plugin for the Xfce panel. The size of the taskbar can be changed 
@@ -37,6 +38,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.2.2-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.2.2-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 11:43:52 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:43:52 -0700
Subject: rpms/xfce4-wavelan-plugin/devel xfce4-wavelan-plugin.spec,1.2,1.3
Message-ID: <200604111143.k3BBhs4O007030@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-serv7013

Modified Files:
	xfce4-wavelan-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-wavelan-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-wavelan-plugin/devel/xfce4-wavelan-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-wavelan-plugin.spec	16 Feb 2006 18:05:24 -0000	1.2
+++ xfce4-wavelan-plugin.spec	11 Apr 2006 11:43:52 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-wavelan-plugin
 Version:	0.4.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	WaveLAN plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A plugin for the Xfce panel that monitors a wireless LAN interface. It 
@@ -36,6 +37,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:44:15 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:44:15 -0700
Subject: rpms/xfce4-wavelan-plugin/FC-5 xfce4-wavelan-plugin.spec,1.2,1.3
Message-ID: <200604111144.k3BBiHHn007058@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-wavelan-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7041

Modified Files:
	xfce4-wavelan-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-wavelan-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-wavelan-plugin/FC-5/xfce4-wavelan-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-wavelan-plugin.spec	16 Feb 2006 18:05:24 -0000	1.2
+++ xfce4-wavelan-plugin.spec	11 Apr 2006 11:44:15 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-wavelan-plugin
 Version:	0.4.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	WaveLAN plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A plugin for the Xfce panel that monitors a wireless LAN interface. It 
@@ -36,6 +37,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:44:39 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:44:39 -0700
Subject: rpms/xfce4-wavelan-plugin/FC-4 xfce4-wavelan-plugin.spec,1.1,1.2
Message-ID: <200604111144.k3BBifJY007086@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-wavelan-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7069

Modified Files:
	xfce4-wavelan-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-wavelan-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-wavelan-plugin/FC-4/xfce4-wavelan-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-wavelan-plugin.spec	15 Dec 2005 04:40:53 -0000	1.1
+++ xfce4-wavelan-plugin.spec	11 Apr 2006 11:44:39 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-wavelan-plugin
 Version:	0.4.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	WaveLAN plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A plugin for the Xfce panel that monitors a wireless LAN interface. It 
@@ -36,6 +37,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 11:46:40 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:46:40 -0700
Subject: rpms/xfce4-weather-plugin/devel xfce4-weather-plugin.spec,1.2,1.3
Message-ID: <200604111146.k3BBkgaB007139@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-serv7122

Modified Files:
	xfce4-weather-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-weather-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-weather-plugin/devel/xfce4-weather-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-weather-plugin.spec	16 Feb 2006 18:12:09 -0000	1.2
+++ xfce4-weather-plugin.spec	11 Apr 2006 11:46:40 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-weather-plugin
 Version:	0.4.9
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Weather plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A weather plugin for the Xfce panel. It shows the current temperature and 
@@ -38,6 +39,9 @@
 %{_datadir}/xfce4/*
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.9-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.9-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:47:11 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Tue, 11 Apr 2006 04:47:11 -0700
Subject: rpms/fedora-package-config-smart/FC-4 .cvsignore, 1.2,
	1.3 fedora-package-config-smart.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200604111147.k3BBlDth007178@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-serv7155

Modified Files:
	.cvsignore fedora-package-config-smart.spec sources 
Log Message:
Modify package for FC4.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-smart/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Apr 2006 17:45:23 -0000	1.2
+++ .cvsignore	11 Apr 2006 11:47:11 -0000	1.3
@@ -1 +1 @@
-fedora-package-config-smart-5.tar.bz2
+fedora-package-config-smart-4.tar.bz2


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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-package-config-smart.spec	10 Apr 2006 17:45:23 -0000	1.1
+++ fedora-package-config-smart.spec	11 Apr 2006 11:47:11 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Configuration files for the smart package manager
 Name: fedora-package-config-smart
-Version: 5
-Release: 4
+Version: 4
+Release: 3
 License: GPL
 Group: System Environment/Base
 URL: http://fedora.redhat.com/
@@ -35,9 +35,6 @@
 %config(noreplace) %{_sysconfdir}/smart/channels/*.channel
 
 %changelog
-* Sat Apr  1 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 5-4
-- Update to Fedora Core 5.
-
 * Tue Dec 13 2005 Axel Thimm <Axel.Thimm at ATrpms.net> - 4-3
 - changed name to fedora-package-config-smart
 - Modify to only include what fedora-release includes for yum.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-smart/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Apr 2006 17:45:23 -0000	1.2
+++ sources	11 Apr 2006 11:47:11 -0000	1.3
@@ -1 +1 @@
-5992a399b473b042ab25e2f39cbb4992  fedora-package-config-smart-5.tar.bz2
+0623cece6bf5084642c5e154c29867aa  fedora-package-config-smart-4.tar.bz2



From fedora-extras-commits at redhat.com  Tue Apr 11 11:47:15 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:47:15 -0700
Subject: rpms/xfce4-weather-plugin/FC-5 xfce4-weather-plugin.spec,1.2,1.3
Message-ID: <200604111147.k3BBlHgX007203@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-weather-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7182

Modified Files:
	xfce4-weather-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-weather-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-weather-plugin/FC-5/xfce4-weather-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-weather-plugin.spec	16 Feb 2006 18:12:09 -0000	1.2
+++ xfce4-weather-plugin.spec	11 Apr 2006 11:47:15 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-weather-plugin
 Version:	0.4.9
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Weather plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A weather plugin for the Xfce panel. It shows the current temperature and 
@@ -38,6 +39,9 @@
 %{_datadir}/xfce4/*
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.9-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.9-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:47:34 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:47:34 -0700
Subject: rpms/xfce4-weather-plugin/FC-4 xfce4-weather-plugin.spec,1.1,1.2
Message-ID: <200604111147.k3BBlaYs007271@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-weather-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7252

Modified Files:
	xfce4-weather-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-weather-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-weather-plugin/FC-4/xfce4-weather-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-weather-plugin.spec	9 Dec 2005 22:42:43 -0000	1.1
+++ xfce4-weather-plugin.spec	11 Apr 2006 11:47:34 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-weather-plugin
 Version:	0.4.9
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Weather plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A weather plugin for the Xfce panel. It shows the current temperature and 
@@ -38,6 +39,9 @@
 %{_datadir}/xfce4/*
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.9-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.4.9-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 11:48:04 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:48:04 -0700
Subject: rpms/xfce4-websearch-plugin/devel xfce4-websearch-plugin.spec, 1.2, 
	1.3
Message-ID: <200604111148.k3BBm6KD007308@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-serv7291

Modified Files:
	xfce4-websearch-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-websearch-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-websearch-plugin/devel/xfce4-websearch-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-websearch-plugin.spec	16 Feb 2006 18:16:32 -0000	1.2
+++ xfce4-websearch-plugin.spec	11 Apr 2006 11:48:04 -0000	1.3
@@ -1,6 +1,6 @@
 Name: 		xfce4-websearch-plugin
 Version: 	0.1.0
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Summary: 	Websearch plugin from the XFCE panel
 
 Group: 		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildREquires:  gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 Access searchengines from the XFCE panel.
@@ -37,6 +38,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:48:35 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:48:35 -0700
Subject: rpms/xfce4-websearch-plugin/FC-5 xfce4-websearch-plugin.spec, 1.2,
	1.3
Message-ID: <200604111148.k3BBmbZO007336@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-websearch-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7319

Modified Files:
	xfce4-websearch-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-websearch-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-websearch-plugin/FC-5/xfce4-websearch-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-websearch-plugin.spec	16 Feb 2006 18:16:32 -0000	1.2
+++ xfce4-websearch-plugin.spec	11 Apr 2006 11:48:34 -0000	1.3
@@ -1,6 +1,6 @@
 Name: 		xfce4-websearch-plugin
 Version: 	0.1.0
-Release: 	5%{?dist}
+Release: 	6%{?dist}
 Summary: 	Websearch plugin from the XFCE panel
 
 Group: 		User Interface/Desktops
@@ -10,7 +10,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-BuildREquires:  gettext
+BuildRequires:  gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 Access searchengines from the XFCE panel.
@@ -37,6 +38,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:49:25 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:49:25 -0700
Subject: rpms/xfce4-websearch-plugin/FC-4 xfce4-websearch-plugin.spec, 1.1,
	1.2
Message-ID: <200604111149.k3BBnRKH007374@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-websearch-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7357

Modified Files:
	xfce4-websearch-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-websearch-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-websearch-plugin/FC-4/xfce4-websearch-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-websearch-plugin.spec	21 Jan 2006 20:42:55 -0000	1.1
+++ xfce4-websearch-plugin.spec	11 Apr 2006 11:49:25 -0000	1.2
@@ -1,6 +1,6 @@
 Name: 		xfce4-websearch-plugin
 Version: 	0.1.0
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 Summary: 	Websearch plugin from the XFCE panel
 
 Group: 		User Interface/Desktops
@@ -10,7 +10,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-BuildREquires:  gettext
+BuildRequires:  gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 Access searchengines from the XFCE panel.
@@ -37,6 +38,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 11:50:14 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:50:14 -0700
Subject: rpms/xfce4-websearch-plugin/devel xfce4-websearch-plugin.spec, 1.3, 
	1.4
Message-ID: <200604111150.k3BBoGWS007429@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-serv7412

Modified Files:
	xfce4-websearch-plugin.spec 
Log Message:
fix typo


Index: xfce4-websearch-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-websearch-plugin/devel/xfce4-websearch-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-websearch-plugin.spec	11 Apr 2006 11:48:04 -0000	1.3
+++ xfce4-websearch-plugin.spec	11 Apr 2006 11:50:13 -0000	1.4
@@ -10,7 +10,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-BuildREquires:  gettext
+BuildRequires:  gettext
 Requires:	xfce4-panel >= 4.2
 
 %description



From fedora-extras-commits at redhat.com  Tue Apr 11 11:50:49 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:50:49 -0700
Subject: rpms/xfce4-windowlist-plugin/devel xfce4-windowlist-plugin.spec, 1.2,
	1.3
Message-ID: <200604111150.k3BBoprb007468@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-serv7451

Modified Files:
	xfce4-windowlist-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-windowlist-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-windowlist-plugin/devel/xfce4-windowlist-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-windowlist-plugin.spec	16 Feb 2006 18:18:53 -0000	1.2
+++ xfce4-windowlist-plugin.spec	11 Apr 2006 11:50:48 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-windowlist-plugin
 Version:	0.1.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Windowlist plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 Windowlist plugin for the Xfce panel. The menubutton shows the icon of the 
@@ -37,6 +38,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:51:08 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:51:08 -0700
Subject: rpms/xfce4-windowlist-plugin/FC-5 xfce4-windowlist-plugin.spec, 1.2,
	1.3
Message-ID: <200604111151.k3BBpAY3007501@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-windowlist-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7484

Modified Files:
	xfce4-windowlist-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-windowlist-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-windowlist-plugin/FC-5/xfce4-windowlist-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-windowlist-plugin.spec	16 Feb 2006 18:18:53 -0000	1.2
+++ xfce4-windowlist-plugin.spec	11 Apr 2006 11:51:08 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-windowlist-plugin
 Version:	0.1.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Windowlist plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 Windowlist plugin for the Xfce panel. The menubutton shows the icon of the 
@@ -37,6 +38,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:51:18 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 11 Apr 2006 04:51:18 -0700
Subject: rpms/xdesktopwaves/FC-5 xdesktopwaves.spec,1.4,1.5
Message-ID: <200604111151.k3BBpKDr007529@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/xdesktopwaves/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7507

Modified Files:
	xdesktopwaves.spec 
Log Message:
* Tue Apr 11 2006 Adrian Reber <adrian at lisas.de> - 1.3-5
- rebuilt for modular X



Index: xdesktopwaves.spec
===================================================================
RCS file: /cvs/extras/rpms/xdesktopwaves/FC-5/xdesktopwaves.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xdesktopwaves.spec	10 May 2005 06:36:00 -0000	1.4
+++ xdesktopwaves.spec	11 Apr 2006 11:51:18 -0000	1.5
@@ -1,6 +1,6 @@
 Name:          xdesktopwaves
 Version:       1.3
-Release:       4%{?dist}
+Release:       5%{?dist}
 
 Summary:       Simulation of water waves on the X Window System desktop
 License:       GPL
@@ -8,7 +8,7 @@
 URL:           http://xdesktopwaves.sf.net/
 Source:        http://dl.sf.net/xdesktopwaves/xdesktopwaves-1.3.tar.gz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: xorg-x11-devel, desktop-file-utils
+BuildRequires: libX11-devel, desktop-file-utils
 
 %description
 xdesktopwaves is a cellular automata setting the background of your X
@@ -21,8 +21,7 @@
 %{__sed} -i -e "s,-s,," Makefile
 
 %build
-%{__make} CFLAGS="$RPM_OPT_FLAGS -I/usr/X11R6/include" \
-    LFLAGS="-L/usr/X11R6/%{_lib}" %{?_smp_mflags}
+%{__make} CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -62,6 +61,9 @@
 %{_datadir}/pixmaps/%{name}.xpm
 
 %changelog
+* Tue Apr 11 2006 Adrian Reber <adrian at lisas.de> - 1.3-5
+- rebuilt for modular X
+
 * Tue May 10 2005 Adrian Reber <adrian at lisas.de> - 1.3-4
 - remove stripping from Makefile so that the
   debuginfo subpackage gets build



From fedora-extras-commits at redhat.com  Tue Apr 11 11:51:35 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:51:35 -0700
Subject: rpms/xfce4-windowlist-plugin/FC-4 xfce4-windowlist-plugin.spec, 1.1,
	1.2
Message-ID: <200604111151.k3BBpbeu007554@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-windowlist-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7537

Modified Files:
	xfce4-windowlist-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-windowlist-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-windowlist-plugin/FC-4/xfce4-windowlist-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-windowlist-plugin.spec	9 Dec 2005 22:23:35 -0000	1.1
+++ xfce4-windowlist-plugin.spec	11 Apr 2006 11:51:35 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-windowlist-plugin
 Version:	0.1.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Windowlist plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 Windowlist plugin for the Xfce panel. The menubutton shows the icon of the 
@@ -37,6 +38,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 11:52:04 2006
From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec))
Date: Tue, 11 Apr 2006 04:52:04 -0700
Subject: rpms/licq/devel licq.spec,1.6,1.7
Message-ID: <200604111152.k3BBq681007582@cvs-int.fedora.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/licq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7565

Modified Files:
	licq.spec 
Log Message:
fix auto away,  it requires libXScrnSaver-devel



Index: licq.spec
===================================================================
RCS file: /cvs/extras/rpms/licq/devel/licq.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- licq.spec	3 Mar 2006 14:58:20 -0000	1.6
+++ licq.spec	11 Apr 2006 11:52:04 -0000	1.7
@@ -1,6 +1,6 @@
 Name: licq
 Version: 1.3.2
-Release: 6
+Release: 7
 License: GPL
 Source: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.bz2
 URL: http://www.licq.org/
@@ -11,6 +11,7 @@
 BuildRequires: gpgme-devel libgpg-error-devel 
 BuildRequires: openssl-devel
 BuildRequires: desktop-file-utils
+BuildRequires: libXScrnSaver-devel
 Patch1: licq-1.3.2-gcc-4_1-patch
 Patch2: licq-1.3.2-libdir.patch
 
@@ -159,6 +160,9 @@
 %doc plugins/osd*/{AUTHORS,TODO,README,changelog}
 
 %changelog
+* Mon Apr 11 2006 Peter Vrabec <pvrabec at redhat.com> 1.3.2-7
+- fix auto away,  it requires libXScrnSaver-devel
+
 * Fri Mar 03 2006 Peter Vrabec <pvrabec at redhat.com> 1.3.2-6
 - use correct lib-path for plugins on x86-64 (#182733)
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:52:16 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:52:16 -0700
Subject: rpms/xfce4-xkb-plugin/devel xfce4-xkb-plugin.spec,1.6,1.7
Message-ID: <200604111152.k3BBqIrO007605@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-serv7588

Modified Files:
	xfce4-xkb-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-xkb-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/devel/xfce4-xkb-plugin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xfce4-xkb-plugin.spec	31 Mar 2006 21:57:54 -0000	1.6
+++ xfce4-xkb-plugin.spec	11 Apr 2006 11:52:15 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		xfce4-xkb-plugin
 Version:	0.3.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	XKB layout switcher for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -14,6 +14,7 @@
 %if "%{?fedora}" > "4"
 BuildRequires:  libXext-devel, libXpm-devel
 %endif
+Requires:	xfce4-panel >= 4.2
 
 %description
 Xfce XKB layout switch plugin for the Xfce panel. It displays the current 
@@ -46,6 +47,9 @@
 %{_datadir}/xfce4/xkb/flags/*.png
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.5-2
+- Require xfce4-panel.
+
 * Fri Mar 31 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.5-1
 - Update to 0.3.5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:52:36 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:52:36 -0700
Subject: rpms/xfce4-xkb-plugin/FC-5 xfce4-xkb-plugin.spec,1.6,1.7
Message-ID: <200604111152.k3BBqc8s007638@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xkb-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7621

Modified Files:
	xfce4-xkb-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-xkb-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/FC-5/xfce4-xkb-plugin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xfce4-xkb-plugin.spec	31 Mar 2006 22:01:47 -0000	1.6
+++ xfce4-xkb-plugin.spec	11 Apr 2006 11:52:36 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		xfce4-xkb-plugin
 Version:	0.3.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	XKB layout switcher for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -14,6 +14,7 @@
 %if "%{?fedora}" > "4"
 BuildRequires:  libXext-devel, libXpm-devel
 %endif
+Requires:	xfce4-panel >= 4.2
 
 %description
 Xfce XKB layout switch plugin for the Xfce panel. It displays the current 
@@ -46,6 +47,9 @@
 %{_datadir}/xfce4/xkb/flags/*.png
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.5-2
+- Require xfce4-panel.
+
 * Fri Mar 31 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.5-1
 - Update to 0.3.5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:52:56 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:52:56 -0700
Subject: rpms/xfce4-xkb-plugin/FC-4 xfce4-xkb-plugin.spec,1.4,1.5
Message-ID: <200604111152.k3BBqwCO007670@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xkb-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7653

Modified Files:
	xfce4-xkb-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-xkb-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/FC-4/xfce4-xkb-plugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfce4-xkb-plugin.spec	31 Mar 2006 22:08:27 -0000	1.4
+++ xfce4-xkb-plugin.spec	11 Apr 2006 11:52:56 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		xfce4-xkb-plugin
 Version:	0.3.5
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	XKB layout switcher for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -14,6 +14,7 @@
 %if "%{?fedora}" > "4"
 BuildRequires:  libXext-devel, libXpm-devel
 %endif
+Requires:	xfce4-panel >= 4.2
 
 %description
 Xfce XKB layout switch plugin for the Xfce panel. It displays the current 
@@ -46,6 +47,9 @@
 %{_datadir}/xfce4/xkb/flags/*.png
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.5-2
+- Require xfce4-panel.
+
 * Fri Mar 31 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.5-1
 - Update to 0.3.5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:54:35 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:54:35 -0700
Subject: rpms/xfce4-xmms-plugin/devel xfce4-xmms-plugin.spec,1.2,1.3
Message-ID: <200604111154.k3BBsbff007737@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-serv7720

Modified Files:
	xfce4-xmms-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-xmms-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xmms-plugin/devel/xfce4-xmms-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-xmms-plugin.spec	16 Feb 2006 18:50:10 -0000	1.2
+++ xfce4-xmms-plugin.spec	11 Apr 2006 11:54:35 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-xmms-plugin
 Version:	0.3.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	XMMS plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,8 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext, xmms-devel >= 1.2
-Requires:	xmms >= 1.2
-
+Requires:	xfce4-panel >= 4.2, xmms >= 1.2
 
 %description
 Control XMMS from the Xfce panel.
@@ -40,6 +39,9 @@
 %{_datadir}/xfce4/*
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:55:28 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:55:28 -0700
Subject: rpms/xfce4-xmms-plugin/FC-5 xfce4-xmms-plugin.spec,1.2,1.3
Message-ID: <200604111155.k3BBtU6L007775@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xmms-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7755

Modified Files:
	xfce4-xmms-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-xmms-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xmms-plugin/FC-5/xfce4-xmms-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-xmms-plugin.spec	16 Feb 2006 18:50:10 -0000	1.2
+++ xfce4-xmms-plugin.spec	11 Apr 2006 11:55:27 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-xmms-plugin
 Version:	0.3.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	XMMS plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,8 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext, xmms-devel >= 1.2
-Requires:	xmms >= 1.2
-
+Requires:	xfce4-panel >= 4.2, xmms >= 1.2
 
 %description
 Control XMMS from the Xfce panel.
@@ -40,6 +39,9 @@
 %{_datadir}/xfce4/*
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 11:56:30 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 04:56:30 -0700
Subject: rpms/xfce4-xmms-plugin/FC-4 xfce4-xmms-plugin.spec,1.1,1.2
Message-ID: <200604111156.k3BBuWeY007805@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xmms-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7788

Modified Files:
	xfce4-xmms-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-xmms-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xmms-plugin/FC-4/xfce4-xmms-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-xmms-plugin.spec	9 Dec 2005 22:48:01 -0000	1.1
+++ xfce4-xmms-plugin.spec	11 Apr 2006 11:56:30 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-xmms-plugin
 Version:	0.3.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	XMMS plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,8 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext, xmms-devel >= 1.2
-Requires:	xmms >= 1.2
-
+Requires:	xfce4-panel >= 4.2, xmms >= 1.2
 
 %description
 Control XMMS from the Xfce panel.
@@ -40,6 +39,9 @@
 %{_datadir}/xfce4/*
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 12:26:31 2006
From: fedora-extras-commits at redhat.com (Peter Vrabec (pvrabec))
Date: Tue, 11 Apr 2006 05:26:31 -0700
Subject: rpms/licq/FC-5 licq.spec,1.6,1.7
Message-ID: <200604111226.k3BCQXkv010032@cvs-int.fedora.redhat.com>

Author: pvrabec

Update of /cvs/extras/rpms/licq/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10015

Modified Files:
	licq.spec 
Log Message:
fix auto away,  it requires libXScrnSaver-devel



Index: licq.spec
===================================================================
RCS file: /cvs/extras/rpms/licq/FC-5/licq.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- licq.spec	3 Mar 2006 14:58:20 -0000	1.6
+++ licq.spec	11 Apr 2006 12:26:31 -0000	1.7
@@ -1,6 +1,6 @@
 Name: licq
 Version: 1.3.2
-Release: 6
+Release: 7.FC5
 License: GPL
 Source: http://prdownloads.sourceforge.net/licq/licq-%{version}.tar.bz2
 URL: http://www.licq.org/
@@ -11,6 +11,7 @@
 BuildRequires: gpgme-devel libgpg-error-devel 
 BuildRequires: openssl-devel
 BuildRequires: desktop-file-utils
+BuildRequires: libXScrnSaver-devel
 Patch1: licq-1.3.2-gcc-4_1-patch
 Patch2: licq-1.3.2-libdir.patch
 
@@ -159,6 +160,9 @@
 %doc plugins/osd*/{AUTHORS,TODO,README,changelog}
 
 %changelog
+* Mon Apr 11 2006 Peter Vrabec <pvrabec at redhat.com> 1.3.2-7.FC5
+- fix auto away,  it requires libXScrnSaver-devel
+
 * Fri Mar 03 2006 Peter Vrabec <pvrabec at redhat.com> 1.3.2-6
 - use correct lib-path for plugins on x86-64 (#182733)
 



From fedora-extras-commits at redhat.com  Tue Apr 11 13:05:08 2006
From: fedora-extras-commits at redhat.com (Jeffrey C. Ollie (jcollie))
Date: Tue, 11 Apr 2006 06:05:08 -0700
Subject: owners owners.list,1.832,1.833
Message-ID: <200604111305.k3BD5Alr012230@cvs-int.fedora.redhat.com>

Author: jcollie

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12213

Modified Files:
	owners.list 
Log Message:
Adding JThread.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.832
retrieving revision 1.833
diff -u -r1.832 -r1.833
--- owners.list	11 Apr 2006 10:31:39 -0000	1.832
+++ owners.list	11 Apr 2006 13:05:08 -0000	1.833
@@ -504,6 +504,7 @@
 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|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|jpgraph|An OO graph drawing class library for PHP|gauret at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|jthread|JThread provides classes to make use of threads easy on different platforms|jeff at ollie.clive.ia.us|extras-qa at fedoraproject.org|
 Fedora Extras|js|JavaScript interpreter|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|juk|Jukebox and music manager for KDE|nomis80 at nomis80.org|extras-qa at fedoraproject.org|
 Fedora Extras|k3b-extras|Free codec plugins for k3b|rdieter at math.unl.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Apr 11 13:59:21 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Tue, 11 Apr 2006 06:59:21 -0700
Subject: rpms/seamonkey/devel seamonkey.spec,1.2,1.3
Message-ID: <200604111359.k3BDxNUm012413@cvs-int.fedora.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/seamonkey/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12396

Modified Files:
	seamonkey.spec 
Log Message:
* Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-11
- Fix PreReq statements



Index: seamonkey.spec
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/devel/seamonkey.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- seamonkey.spec	11 Apr 2006 00:44:24 -0000	1.2
+++ seamonkey.spec	11 Apr 2006 13:59:21 -0000	1.3
@@ -10,7 +10,7 @@
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
 Version:        1.0
-Release:        10%{?dist}
+Release:        11%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPL
 Group:          Applications/Internet
@@ -61,8 +61,8 @@
 BuildRequires:  pango-devel >= %{pango_version}
 BuildRequires:  nspr-devel >= %{nspr_version}
 BuildRequires:  nss-devel >= %{nss_version}
-Prereq:         fileutils perl
-Prereq:         /usr/bin/killall
+BuildRequires:  fileutils
+BuildRequires:  desktop-file-utils >= %{desktop_file_utils_version}
 PreReq:         desktop-file-utils >= %{desktop_file_utils_version}
 
 AutoProv: 0
@@ -408,6 +408,8 @@
 
 
 %changelog
+* Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-11
+- Fix PreReq statements
 * Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-10
 - Added libXt-devel BuildRequires
 * Mon Apr 10 2006 Kai Engert <kengert at redhat.com> 1.0-9



From fedora-extras-commits at redhat.com  Tue Apr 11 14:35:26 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 11 Apr 2006 07:35:26 -0700
Subject: rpms/lyx/devel .cvsignore, 1.10, 1.11 lyx.spec, 1.31, 1.32 sources, 
	1.11, 1.12
Message-ID: <200604111435.k3BEZSqn014703@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/lyx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14682

Modified Files:
	.cvsignore lyx.spec sources 
Log Message:
* Tue Apr 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.1-1
- 1.4.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	8 Mar 2006 19:45:52 -0000	1.10
+++ .cvsignore	11 Apr 2006 14:35:26 -0000	1.11
@@ -1,2 +1,3 @@
 lyx-1.4.0.tar.bz2
 beamer.layout
+lyx-1.4.1.tar.bz2


Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- lyx.spec	30 Mar 2006 18:42:06 -0000	1.31
+++ lyx.spec	11 Apr 2006 14:35:26 -0000	1.32
@@ -1,8 +1,8 @@
 
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
-Version: 1.4.0
-Release: 5%{?dist}
+Version: 1.4.1
+Release: 1%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -12,6 +12,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 Patch1: lyx-1.4.0-helpers.patch
+Patch2: lyx-1.4.0-boost.patch
 
 # app-wrapper for various frontends
 Source10: lyx.sh
@@ -38,6 +39,7 @@
 BuildRequires: zlib-devel
 BuildRequires: tetex-latex
 BuildRequires: tetex-fonts
+%{?_without_included_boost:BuildRequires: boost-devel >= 1.33.0}
 
 # For texhash
 Requires(post): tetex-fonts
@@ -91,6 +93,7 @@
 %setup -q -n %{name}-%{version}%{?beta}
 
 %patch1 -p1 -b .helpers
+%{?_without_included_boost:%patch2 -p1 -b .boost}
 
 
 %build
@@ -111,6 +114,7 @@
   --enable-optimization="%{optflags}" \
   --with-aiksaurus \
   --with-aspell \
+  %{?_without_included_boost} \
   --without-warnings --disable-dependency-tracking \
   --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks 
 
@@ -195,6 +199,9 @@
 
 
 %changelog
+* Tue Apr 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.1-1
+- 1.4.1
+
 * Thu Mar 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-5
 - %%trigger ImageMagick (#186319)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	8 Mar 2006 19:45:52 -0000	1.11
+++ sources	11 Apr 2006 14:35:26 -0000	1.12
@@ -1,2 +1,2 @@
-5ab37471339ff7dbc8f0c43282746cb0  lyx-1.4.0.tar.bz2
 c906271900a0627d3df2a38ad962a285  beamer.layout
+368696695a05e428773626e3b0f8ae74  lyx-1.4.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Apr 11 14:38:05 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 11 Apr 2006 07:38:05 -0700
Subject: rpms/lyx/devel .cvsignore,1.11,1.12
Message-ID: <200604111438.k3BEc7SE014764@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/lyx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14747

Modified Files:
	.cvsignore 
Log Message:
drop old bits from here too



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	11 Apr 2006 14:35:26 -0000	1.11
+++ .cvsignore	11 Apr 2006 14:38:05 -0000	1.12
@@ -1,3 +1,2 @@
-lyx-1.4.0.tar.bz2
 beamer.layout
 lyx-1.4.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Apr 11 14:39:14 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 11 Apr 2006 07:39:14 -0700
Subject: rpms/lyx/devel lyx-1.4.0-boost.patch,1.2,1.3
Message-ID: <200604111439.k3BEdHVb014800@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/lyx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14780

Added Files:
	lyx-1.4.0-boost.patch 
Log Message:
import


lyx-1.4.0-boost.patch:

Index: lyx-1.4.0-boost.patch
===================================================================
RCS file: lyx-1.4.0-boost.patch
diff -N lyx-1.4.0-boost.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lyx-1.4.0-boost.patch	11 Apr 2006 14:39:14 -0000	1.3
@@ -0,0 +1,65 @@
+--- lyx-1.4.0pre5/src/frontends/controllers/biblio.C.boost	2005-03-21 08:31:22.000000000 -0600
++++ lyx-1.4.0pre5/src/frontends/controllers/biblio.C	2006-02-14 08:59:29.000000000 -0600
+@@ -20,6 +20,7 @@
+ #include "support/lstrings.h"
+ 
+ #include <boost/regex.hpp>
++#include <boost/cregex.hpp>
+ 
+ #include <algorithm>
+ #include <sstream>
+--- lyx-1.4.0pre5/src/support/pch.h.boost	2005-04-26 05:30:24.000000000 -0500
++++ lyx-1.4.0pre5/src/support/pch.h	2006-02-14 08:55:14.000000000 -0600
+@@ -10,7 +10,12 @@
+ #include <boost/shared_ptr.hpp>
+ #include <boost/signal.hpp>
+ #include <boost/signals/trackable.hpp>
++#include <boost/version.hpp>
++#if (BOOST_VERSION >= 103300)
++#include <boost/test/utils/nullstream.hpp>
++#else
+ #include <boost/test/detail/nullstream.hpp>
++#endif
+ #include <boost/tokenizer.hpp>
+ #include <boost/utility.hpp>
+ 
+--- lyx-1.4.0pre5/src/support/filetools.C.boost	2005-09-07 04:44:58.000000000 -0500
++++ lyx-1.4.0pre5/src/support/filetools.C	2006-02-14 08:55:14.000000000 -0600
+@@ -39,6 +39,7 @@
+ #include <boost/assert.hpp>
+ #include <boost/filesystem/operations.hpp>
+ #include <boost/regex.hpp>
++#include <boost/cregex.hpp>
+ 
+ #include <fcntl.h>
+ 
+--- lyx-1.4.0pre5/src/support/debugstream.h.boost	2004-05-20 04:35:30.000000000 -0500
++++ lyx-1.4.0pre5/src/support/debugstream.h	2006-02-14 08:55:14.000000000 -0600
+@@ -14,7 +14,12 @@
+ 
+ #include <iostream>
+ 
++#include <boost/version.hpp>
++#if (BOOST_VERSION >= 103300)
++#include <boost/test/utils/nullstream.hpp>
++#else
+ #include <boost/test/detail/nullstream.hpp>
++#endif
+ 
+ #ifdef DEBUG
+ # define TEMPORARY_DEBUG_MACRO DEBUG
+--- lyx-1.4.0pre5/src/pch.h.boost	2005-04-26 05:30:24.000000000 -0500
++++ lyx-1.4.0pre5/src/pch.h	2006-02-14 08:55:14.000000000 -0600
+@@ -17,7 +17,12 @@
+ #include <boost/signals/connection.hpp>
+ #include <boost/signal.hpp>
+ #include <boost/signals/trackable.hpp>
++#include <boost/version.hpp>
++#if (BOOST_VERSION >= 103300)
++#include <boost/test/utils/nullstream.hpp>
++#else
+ #include <boost/test/detail/nullstream.hpp>
++#endif
+ #include <boost/tokenizer.hpp>
+ #include <boost/tuple/tuple.hpp>
+ #include <boost/utility.hpp>



From fedora-extras-commits at redhat.com  Tue Apr 11 14:40:06 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 11 Apr 2006 07:40:06 -0700
Subject: rpms/lyx/devel lyx.spec,1.32,1.33
Message-ID: <200604111440.k3BEe8OL014823@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/lyx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14806

Modified Files:
	lyx.spec 
Log Message:
Release++, for missing bits



Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/devel/lyx.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- lyx.spec	11 Apr 2006 14:35:26 -0000	1.32
+++ lyx.spec	11 Apr 2006 14:40:06 -0000	1.33
@@ -2,7 +2,7 @@
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
 Version: 1.4.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -199,7 +199,7 @@
 
 
 %changelog
-* Tue Apr 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.1-1
+* Tue Apr 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.1-2
 - 1.4.1
 
 * Thu Mar 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-5



From fedora-extras-commits at redhat.com  Tue Apr 11 14:42:36 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 11 Apr 2006 07:42:36 -0700
Subject: rpms/lyx/FC-5 lyx-1.4.0-boost.patch, 1.2, 1.3 .cvsignore, 1.10,
	1.11 lyx.spec, 1.31, 1.32 sources, 1.11, 1.12
Message-ID: <200604111442.k3BEgcSR014900@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/lyx/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14874

Modified Files:
	.cvsignore lyx.spec sources 
Added Files:
	lyx-1.4.0-boost.patch 
Log Message:
* Tue Apr 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.1-2
- 1.4.1


lyx-1.4.0-boost.patch:

Index: lyx-1.4.0-boost.patch
===================================================================
RCS file: lyx-1.4.0-boost.patch
diff -N lyx-1.4.0-boost.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lyx-1.4.0-boost.patch	11 Apr 2006 14:42:36 -0000	1.3
@@ -0,0 +1,65 @@
+--- lyx-1.4.0pre5/src/frontends/controllers/biblio.C.boost	2005-03-21 08:31:22.000000000 -0600
++++ lyx-1.4.0pre5/src/frontends/controllers/biblio.C	2006-02-14 08:59:29.000000000 -0600
+@@ -20,6 +20,7 @@
+ #include "support/lstrings.h"
+ 
+ #include <boost/regex.hpp>
++#include <boost/cregex.hpp>
+ 
+ #include <algorithm>
+ #include <sstream>
+--- lyx-1.4.0pre5/src/support/pch.h.boost	2005-04-26 05:30:24.000000000 -0500
++++ lyx-1.4.0pre5/src/support/pch.h	2006-02-14 08:55:14.000000000 -0600
+@@ -10,7 +10,12 @@
+ #include <boost/shared_ptr.hpp>
+ #include <boost/signal.hpp>
+ #include <boost/signals/trackable.hpp>
++#include <boost/version.hpp>
++#if (BOOST_VERSION >= 103300)
++#include <boost/test/utils/nullstream.hpp>
++#else
+ #include <boost/test/detail/nullstream.hpp>
++#endif
+ #include <boost/tokenizer.hpp>
+ #include <boost/utility.hpp>
+ 
+--- lyx-1.4.0pre5/src/support/filetools.C.boost	2005-09-07 04:44:58.000000000 -0500
++++ lyx-1.4.0pre5/src/support/filetools.C	2006-02-14 08:55:14.000000000 -0600
+@@ -39,6 +39,7 @@
+ #include <boost/assert.hpp>
+ #include <boost/filesystem/operations.hpp>
+ #include <boost/regex.hpp>
++#include <boost/cregex.hpp>
+ 
+ #include <fcntl.h>
+ 
+--- lyx-1.4.0pre5/src/support/debugstream.h.boost	2004-05-20 04:35:30.000000000 -0500
++++ lyx-1.4.0pre5/src/support/debugstream.h	2006-02-14 08:55:14.000000000 -0600
+@@ -14,7 +14,12 @@
+ 
+ #include <iostream>
+ 
++#include <boost/version.hpp>
++#if (BOOST_VERSION >= 103300)
++#include <boost/test/utils/nullstream.hpp>
++#else
+ #include <boost/test/detail/nullstream.hpp>
++#endif
+ 
+ #ifdef DEBUG
+ # define TEMPORARY_DEBUG_MACRO DEBUG
+--- lyx-1.4.0pre5/src/pch.h.boost	2005-04-26 05:30:24.000000000 -0500
++++ lyx-1.4.0pre5/src/pch.h	2006-02-14 08:55:14.000000000 -0600
+@@ -17,7 +17,12 @@
+ #include <boost/signals/connection.hpp>
+ #include <boost/signal.hpp>
+ #include <boost/signals/trackable.hpp>
++#include <boost/version.hpp>
++#if (BOOST_VERSION >= 103300)
++#include <boost/test/utils/nullstream.hpp>
++#else
+ #include <boost/test/detail/nullstream.hpp>
++#endif
+ #include <boost/tokenizer.hpp>
+ #include <boost/tuple/tuple.hpp>
+ #include <boost/utility.hpp>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	8 Mar 2006 19:45:52 -0000	1.10
+++ .cvsignore	11 Apr 2006 14:42:36 -0000	1.11
@@ -1,2 +1,2 @@
-lyx-1.4.0.tar.bz2
 beamer.layout
+lyx-1.4.1.tar.bz2


Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-5/lyx.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- lyx.spec	30 Mar 2006 18:47:02 -0000	1.31
+++ lyx.spec	11 Apr 2006 14:42:36 -0000	1.32
@@ -1,8 +1,8 @@
 
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
-Version: 1.4.0
-Release: 5%{?dist}
+Version: 1.4.1
+Release: 2%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -12,6 +12,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 Patch1: lyx-1.4.0-helpers.patch
+Patch2: lyx-1.4.0-boost.patch
 
 # app-wrapper for various frontends
 Source10: lyx.sh
@@ -38,6 +39,7 @@
 BuildRequires: zlib-devel
 BuildRequires: tetex-latex
 BuildRequires: tetex-fonts
+%{?_without_included_boost:BuildRequires: boost-devel >= 1.33.0}
 
 # For texhash
 Requires(post): tetex-fonts
@@ -91,6 +93,7 @@
 %setup -q -n %{name}-%{version}%{?beta}
 
 %patch1 -p1 -b .helpers
+%{?_without_included_boost:%patch2 -p1 -b .boost}
 
 
 %build
@@ -111,6 +114,7 @@
   --enable-optimization="%{optflags}" \
   --with-aiksaurus \
   --with-aspell \
+  %{?_without_included_boost} \
   --without-warnings --disable-dependency-tracking \
   --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks 
 
@@ -195,6 +199,9 @@
 
 
 %changelog
+* Tue Apr 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.1-2
+- 1.4.1
+
 * Thu Mar 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-5
 - %%trigger ImageMagick (#186319)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	8 Mar 2006 19:45:52 -0000	1.11
+++ sources	11 Apr 2006 14:42:36 -0000	1.12
@@ -1,2 +1,2 @@
-5ab37471339ff7dbc8f0c43282746cb0  lyx-1.4.0.tar.bz2
 c906271900a0627d3df2a38ad962a285  beamer.layout
+368696695a05e428773626e3b0f8ae74  lyx-1.4.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Apr 11 14:57:09 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Tue, 11 Apr 2006 07:57:09 -0700
Subject: rpms/seamonkey/FC-5 seamonkey.spec,1.1,1.2
Message-ID: <200604111457.k3BEvBTx015052@cvs-int.fedora.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/seamonkey/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15035

Modified Files:
	seamonkey.spec 
Log Message:
* Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-11
- Fix PreReq statements
* Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-10
- Added libXt-devel BuildRequires



Index: seamonkey.spec
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/FC-5/seamonkey.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- seamonkey.spec	10 Apr 2006 21:58:25 -0000	1.1
+++ seamonkey.spec	11 Apr 2006 14:57:09 -0000	1.2
@@ -10,7 +10,7 @@
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
 Version:        1.0
-Release:        9%{?dist}
+Release:        11%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPL
 Group:          Applications/Internet
@@ -57,11 +57,12 @@
 BuildRequires:  libIDL-devel
 BuildRequires:  glib2-devel
 BuildRequires:  gtk2-devel
+BuildRequires:  libXt-devel
 BuildRequires:  pango-devel >= %{pango_version}
 BuildRequires:  nspr-devel >= %{nspr_version}
 BuildRequires:  nss-devel >= %{nss_version}
-Prereq:         fileutils perl
-Prereq:         /usr/bin/killall
+BuildRequires:  fileutils
+BuildRequires:  desktop-file-utils >= %{desktop_file_utils_version}
 PreReq:         desktop-file-utils >= %{desktop_file_utils_version}
 
 AutoProv: 0
@@ -407,6 +408,10 @@
 
 
 %changelog
+* Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-11
+- Fix PreReq statements
+* Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-10
+- Added libXt-devel BuildRequires
 * Mon Apr 10 2006 Kai Engert <kengert at redhat.com> 1.0-9
 - Added dist suffix to release
 * Fri Mar 17 2006 Kai Engert <kengert at redhat.com> 1.0-8



From fedora-extras-commits at redhat.com  Tue Apr 11 14:57:49 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Tue, 11 Apr 2006 07:57:49 -0700
Subject: rpms/seamonkey/FC-4 seamonkey.spec,1.1,1.2
Message-ID: <200604111457.k3BEvpKF015090@cvs-int.fedora.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/seamonkey/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15068

Modified Files:
	seamonkey.spec 
Log Message:
* Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-11
- Fix PreReq statements
* Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-10
- Added libXt-devel BuildRequires



Index: seamonkey.spec
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/FC-4/seamonkey.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- seamonkey.spec	10 Apr 2006 21:58:25 -0000	1.1
+++ seamonkey.spec	11 Apr 2006 14:57:49 -0000	1.2
@@ -10,7 +10,7 @@
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
 Version:        1.0
-Release:        9%{?dist}
+Release:        11%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPL
 Group:          Applications/Internet
@@ -57,11 +57,12 @@
 BuildRequires:  libIDL-devel
 BuildRequires:  glib2-devel
 BuildRequires:  gtk2-devel
+BuildRequires:  libXt-devel
 BuildRequires:  pango-devel >= %{pango_version}
 BuildRequires:  nspr-devel >= %{nspr_version}
 BuildRequires:  nss-devel >= %{nss_version}
-Prereq:         fileutils perl
-Prereq:         /usr/bin/killall
+BuildRequires:  fileutils
+BuildRequires:  desktop-file-utils >= %{desktop_file_utils_version}
 PreReq:         desktop-file-utils >= %{desktop_file_utils_version}
 
 AutoProv: 0
@@ -407,6 +408,10 @@
 
 
 %changelog
+* Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-11
+- Fix PreReq statements
+* Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-10
+- Added libXt-devel BuildRequires
 * Mon Apr 10 2006 Kai Engert <kengert at redhat.com> 1.0-9
 - Added dist suffix to release
 * Fri Mar 17 2006 Kai Engert <kengert at redhat.com> 1.0-8



From fedora-extras-commits at redhat.com  Tue Apr 11 15:03:39 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 11 Apr 2006 08:03:39 -0700
Subject: rpms/gnome-translate/devel gnome-translate.spec,1.6,1.7
Message-ID: <200604111503.k3BF3fLK017200@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gnome-translate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17183

Modified Files:
	gnome-translate.spec 
Log Message:



Index: gnome-translate.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-translate/devel/gnome-translate.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnome-translate.spec	15 Feb 2006 12:19:02 -0000	1.6
+++ gnome-translate.spec	11 Apr 2006 15:03:39 -0000	1.7
@@ -1,7 +1,7 @@
 Name: gnome-translate
 Summary: GNOME interface to libtranslate -- Natural language translator
 Version: 0.99
-Release: 6%{?dist}
+Release: 7%{?dist}
 Group: User Interface/Desktops
 License: GPL 
 URL: http://www.nongnu.org/libtranslate/gnome-translate
@@ -43,6 +43,8 @@
 
 %build
 
+export LDFLAGS="-Wl,--export-dynamic"
+
 %configure
 make %{?_smp_mflags}
 
@@ -122,6 +124,10 @@
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
+* Tue Apr 11 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.99-7
+- use "export-dynamic" for the linker, as it is recommended
+  by upstream (Solves #188491)
+
 * Wed Feb 15 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.99-6
 - rebuild for FC5
 



From fedora-extras-commits at redhat.com  Tue Apr 11 15:05:30 2006
From: fedora-extras-commits at redhat.com (Dmitry Butskoy (buc))
Date: Tue, 11 Apr 2006 08:05:30 -0700
Subject: rpms/gnome-translate/FC-5 gnome-translate.spec,1.6,1.7
Message-ID: <200604111505.k3BF5WSt017263@cvs-int.fedora.redhat.com>

Author: buc

Update of /cvs/extras/rpms/gnome-translate/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17246

Modified Files:
	gnome-translate.spec 
Log Message:



Index: gnome-translate.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-translate/FC-5/gnome-translate.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnome-translate.spec	15 Feb 2006 12:19:02 -0000	1.6
+++ gnome-translate.spec	11 Apr 2006 15:05:30 -0000	1.7
@@ -1,7 +1,7 @@
 Name: gnome-translate
 Summary: GNOME interface to libtranslate -- Natural language translator
 Version: 0.99
-Release: 6%{?dist}
+Release: 7%{?dist}
 Group: User Interface/Desktops
 License: GPL 
 URL: http://www.nongnu.org/libtranslate/gnome-translate
@@ -43,6 +43,8 @@
 
 %build
 
+export LDFLAGS="-Wl,--export-dynamic"
+
 %configure
 make %{?_smp_mflags}
 
@@ -122,6 +124,10 @@
 %{_sysconfdir}/gconf/schemas/%{name}.schemas
 
 %changelog
+* Tue Apr 11 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.99-7
+- use "export-dynamic" for the linker, as it is recommended
+  by upstream (Solves #188491)
+
 * Wed Feb 15 2006 Dmitry Butskoy <Dmitry at Butskoy.name> - 0.99-6
 - rebuild for FC5
 



From fedora-extras-commits at redhat.com  Tue Apr 11 15:38:49 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 11 Apr 2006 08:38:49 -0700
Subject: rpms/powermanga/devel .cvsignore, 1.2, 1.3 powermanga.spec, 1.11,
	1.12 sources, 1.2, 1.3 powermanga-64bit.patch, 1.1, NONE
Message-ID: <200604111538.k3BFcpPZ017534@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/powermanga/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17513

Modified Files:
	.cvsignore powermanga.spec sources 
Removed Files:
	powermanga-64bit.patch 
Log Message:
Update to 0.80.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/powermanga/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Nov 2004 02:49:43 -0000	1.2
+++ .cvsignore	11 Apr 2006 15:38:49 -0000	1.3
@@ -1 +1 @@
-powermanga-0.79.tgz
+powermanga-0.80.tgz


Index: powermanga.spec
===================================================================
RCS file: /cvs/extras/rpms/powermanga/devel/powermanga.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- powermanga.spec	6 Mar 2006 16:23:01 -0000	1.11
+++ powermanga.spec	11 Apr 2006 15:38:49 -0000	1.12
@@ -1,18 +1,17 @@
 Summary: Arcade 2D shoot-them-up game
 Name: powermanga
-Version: 0.79
-Release: 8%{?dist}
+Version: 0.80
+Release: 1%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://linux.tlk.fr/games/Powermanga/
 Source0: http://linux.tlk.fr/games/Powermanga/download/powermanga-%{version}.tgz
 Source1: powermanga.png
-Patch0: powermanga-64bit.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: SDL-devel, SDL_mixer-devel, desktop-file-utils
+BuildRequires: SDL-devel, SDL_mixer-devel, zlib-devel, desktop-file-utils
 # Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora
 %if %{!?fedora:5}%{?fedora} >= 5
-BuildRequires: libXxf86dga-devel, libXxf86vm-devel
+BuildRequires: libXt-devel, libXxf86dga-devel, libXxf86vm-devel
 %endif
 
 %description
@@ -22,7 +21,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .64bit
 
 %{__cat} > %{name}.desktop << EOF
 [Desktop Entry]
@@ -44,7 +42,7 @@
 
 %build
 %configure
-%{__make} %{?_smp_mflags} CXXFLAGS="%{optflags}"
+%{__make} %{?_smp_mflags} CXXFLAGS="%{optflags} `sdl-config --cflags`"
 
 
 %install
@@ -54,7 +52,7 @@
 # Install wrapper script
 %{__install} -D -m 0755 %{name}.sh %{buildroot}%{_bindir}/powermanga
 
-# Allow stripping, g+s will be set in %%files
+# Allow stripping, g+s will be set back in %%files
 %{__chmod} g-s %{buildroot}%{_prefix}/games/powermanga
 
 # Fix location of the man page
@@ -63,13 +61,14 @@
         %{buildroot}%{_mandir}/man6/
 
 # Install pixmap for the menu entry
-%{__install} -D -m 0644 %{SOURCE1} \
+%{__install} -D -p -m 0644 %{SOURCE1} \
     %{buildroot}%{_datadir}/pixmaps/powermanga.png
 
 # Install menu entry
 %{__mkdir_p} %{buildroot}%{_datadir}/applications
 desktop-file-install \
     --vendor fedora \
+    --add-category X-Fedora \
     --dir %{buildroot}%{_datadir}/applications \
     %{name}.desktop
 
@@ -93,6 +92,12 @@
 
 
 %changelog
+* Tue Apr 11 2006 Matthias Saou <http://freshrpms.net/> 0.80-1
+- Update to 0.80, fixes crash at level 35 boss (#184076, Hugo Cisneiros).
+- Add new zlib-devel build requirement.
+- Add `sdl-config --cflags` to CXXFLAGS, otherwise SDL_mixer.h isn't found.
+- Add missing libXt-devel build requirement to get modular X detected.
+
 * Mon Mar  6 2006 Matthias Saou <http://freshrpms.net/> 0.79-8
 - FC5 rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/powermanga/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Nov 2004 02:49:43 -0000	1.2
+++ sources	11 Apr 2006 15:38:49 -0000	1.3
@@ -1 +1 @@
-3a4f00658496921b7327413ac476c1b7  powermanga-0.79.tgz
+8f6e8755ac88108f2f9bb4cd6feae489  powermanga-0.80.tgz


--- powermanga-64bit.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 11 15:40:11 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 11 Apr 2006 08:40:11 -0700
Subject: rpms/ntl - New directory
Message-ID: <200604111540.k3BFeDPV017657@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/ntl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17631/ntl

Log Message:
Directory /cvs/extras/rpms/ntl added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 11 15:40:12 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 11 Apr 2006 08:40:12 -0700
Subject: rpms/ntl/devel - New directory
Message-ID: <200604111540.k3BFeE4l017660@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/ntl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17631/ntl/devel

Log Message:
Directory /cvs/extras/rpms/ntl/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 11 15:40:20 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 11 Apr 2006 08:40:20 -0700
Subject: rpms/ntl Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604111540.k3BFeMIN017704@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/ntl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17676

Added Files:
	Makefile import.log 
Log Message:
Setup of module ntl


--- NEW FILE Makefile ---
# Top level Makefile for module ntl
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 11 15:40:21 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 11 Apr 2006 08:40:21 -0700
Subject: rpms/ntl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604111540.k3BFeNa9017707@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/ntl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17676/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ntl


--- 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 Apr 11 15:40:40 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 11 Apr 2006 08:40:40 -0700
Subject: rpms/ntl import.log,1.1,1.2
Message-ID: <200604111540.k3BFeghH017773@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/ntl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17740

Modified Files:
	import.log 
Log Message:
auto-import ntl-5.4-2 on branch devel from ntl-5.4-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ntl/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Apr 2006 15:40:20 -0000	1.1
+++ import.log	11 Apr 2006 15:40:40 -0000	1.2
@@ -0,0 +1 @@
+ntl-5_4-2:HEAD:ntl-5.4-2.src.rpm:1144770037



From fedora-extras-commits at redhat.com  Tue Apr 11 15:40:41 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 11 Apr 2006 08:40:41 -0700
Subject: rpms/ntl/devel ntl.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1,
	1.2
Message-ID: <200604111540.k3BFehoU017778@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/ntl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17740/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ntl.spec 
Log Message:
auto-import ntl-5.4-2 on branch devel from ntl-5.4-2.src.rpm


--- NEW FILE ntl.spec ---

Summary: High-performance algorithms for vectors, matrices, and polynomials 
Name:    ntl 
Version: 5.4 
Release: 2%{?dist}

# See doc/copying.txt
License: GPL
URL:     http://shoup.net/ntl/ 
Source:	 http://shoup.net/ntl/ntl-%{version}.tar.gz
Group:   System Environment/Libraries
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: gmp-devel

# includes no debuginfo'able bits, disable
%define debug_package %{nil}

%description
NTL is a high-performance, portable C++ library providing data structures
and algorithms for arbitrary length integers; for vectors, matrices, and
polynomials over the integers and over finite fields; and for arbitrary
precision floating point arithmetic.

NTL provides high quality implementations of state-of-the-art algorithms for:
* arbitrary length integer arithmetic and arbitrary precision floating point
  arithmetic;
* polynomial arithmetic over the integers and finite fields including basic
  arithmetic, polynomial factorization, irreducibility testing, computation
  of minimal polynomials, traces, norms, and more;
* lattice basis reduction, including very robust and fast implementations of
  Schnorr-Euchner, block Korkin-Zolotarev reduction, and the new 
  Schnorr-Horner pruning heuristic for block Korkin-Zolotarev;
* basic linear algebra over the integers, finite fields, and arbitrary
  precision floating point numbers. 

%package devel
Summary: High-performance algorithms for vectors, matrices, and polynomials 
Group:   Development/Libraries
%description devel
NTL is a high-performance, portable C++ library providing data structures
and algorithms for arbitrary length integers; for vectors, matrices, and
polynomials over the integers and over finite fields; and for arbitrary
precision floating point arithmetic.

NTL provides high quality implementations of state-of-the-art algorithms for:
* arbitrary length integer arithmetic and arbitrary precision floating point
  arithmetic;
* polynomial arithmetic over the integers and finite fields including basic
  arithmetic, polynomial factorization, irreducibility testing, computation
  of minimal polynomials, traces, norms, and more;
* lattice basis reduction, including very robust and fast implementations of
  Schnorr-Euchner, block Korkin-Zolotarev reduction, and the new
  Schnorr-Horner pruning heuristic for block Korkin-Zolotarev;
* basic linear algebra over the integers, finite fields, and arbitrary
  precision floating point numbers.


%prep
%setup -q 


%build
cd src
./configure \
  CC="%{__cc}" \
  CXX="%{__cxx}" \
  CFLAGS="%{optflags}" \
  CXXFLAGS="%{optflags}" \
  PREFIX=%{_prefix} \
  DOCDIR=%{_docdir} \
  INCLUDEDIR=%{_includedir} \
  LIBDIR=%{_libdir} \
  NTL_GMP_LIP=on
cd -

# not smp-safe
make -C src 


%check ||:
# skip by default, takes a *long, long, long* (days?) time -- Rex
%{?_with_check:make -C src check}


%install
rm -rf $RPM_BUILD_ROOT

make -C src install \
  PREFIX=$RPM_BUILD_ROOT%{_prefix} \
  DOCDIR=$RPM_BUILD_ROOT%{_docdir} \
  INCLUDEDIR=$RPM_BUILD_ROOT%{_includedir} \
  LIBDIR=$RPM_BUILD_ROOT%{_libdir} 

# Unpackaged files
rm -rf $RPM_BUILD_ROOT%{_docdir}/NTL


%clean
rm -rf $RPM_BUILD_ROOT


%files devel
%defattr(-,root,root,-)
%doc README 
%doc doc/*
%{_includedir}/*
%{_libdir}/lib*.a


%changelog
* Tue Apr 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.4-2
- Capitalize %%summary
- disable -debuginfo, includes no debuginfo'able bits 

* Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.4-1
- 5.4 (first try)




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ntl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Apr 2006 15:40:21 -0000	1.1
+++ .cvsignore	11 Apr 2006 15:40:41 -0000	1.2
@@ -0,0 +1 @@
+ntl-5.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ntl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Apr 2006 15:40:21 -0000	1.1
+++ sources	11 Apr 2006 15:40:41 -0000	1.2
@@ -0,0 +1 @@
+1d2a683ecbc12cdf03bf92dbc97c0dd4  ntl-5.4.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 15:42:41 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 11 Apr 2006 08:42:41 -0700
Subject: owners owners.list,1.833,1.834
Message-ID: <200604111542.k3BFgh0u017837@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17820

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.833
retrieving revision 1.834
diff -u -r1.833 -r1.834
--- owners.list	11 Apr 2006 13:05:08 -0000	1.833
+++ owners.list	11 Apr 2006 15:42:41 -0000	1.834
@@ -786,6 +786,7 @@
 Fedora Extras|notecase|A hierarchical note manager|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|notemeister|Notemeister is a small, simple note organizer made for the GNOME2 desktop|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|nsd|NSD is a complete implementation of an authoritative DNS name server|paul at xtdnet.nl|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|numlockx|NumLockX turns on NumLock after starting X|jpmahowald at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|numpy|A fast multidimensional array facility for Python|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|nuttcp|A network performance measurement tool intended for use by network and system managers|rvokal at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Apr 11 15:46:42 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Tue, 11 Apr 2006 08:46:42 -0700
Subject: rpms/gmpc/devel gmpc.spec,1.5,1.6
Message-ID: <200604111546.k3BFkiAb017957@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/gmpc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17922/devel

Modified Files:
	gmpc.spec 
Log Message:
fix bug 186450


Index: gmpc.spec
===================================================================
RCS file: /cvs/extras/rpms/gmpc/devel/gmpc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gmpc.spec	22 Feb 2006 16:33:07 -0000	1.5
+++ gmpc.spec	11 Apr 2006 15:46:42 -0000	1.6
@@ -1,7 +1,7 @@
 Name:           gmpc
 Summary:        GNOME frontend for the MPD
 Version:        0.11.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 License:        GPL
 Group:          Applications/Multimedia
@@ -29,7 +29,7 @@
 
 %build
 %configure
-make %{?_smp_mflags}
+make %{?_smp_mflags} LDFLAGS=-Wl,--export-dynamic
 
 
 %install
@@ -71,6 +71,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Thu Mar 23 2006 Jonathan Dieter <jdieter99[AT]gmx.net> 0.11.2-4
+- fix dynamic linking bug
+
 * Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 0.11.2-3
 - rebuild for FC5
 



From fedora-extras-commits at redhat.com  Tue Apr 11 15:46:41 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Tue, 11 Apr 2006 08:46:41 -0700
Subject: rpms/gmpc/FC-5 gmpc.spec,1.5,1.6
Message-ID: <200604111546.k3BFkhOE017953@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/gmpc/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17922/FC-5

Modified Files:
	gmpc.spec 
Log Message:
fix bug 186450


Index: gmpc.spec
===================================================================
RCS file: /cvs/extras/rpms/gmpc/FC-5/gmpc.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gmpc.spec	22 Feb 2006 16:33:07 -0000	1.5
+++ gmpc.spec	11 Apr 2006 15:46:41 -0000	1.6
@@ -1,7 +1,7 @@
 Name:           gmpc
 Summary:        GNOME frontend for the MPD
 Version:        0.11.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 
 License:        GPL
 Group:          Applications/Multimedia
@@ -29,7 +29,7 @@
 
 %build
 %configure
-make %{?_smp_mflags}
+make %{?_smp_mflags} LDFLAGS=-Wl,--export-dynamic
 
 
 %install
@@ -71,6 +71,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Thu Mar 23 2006 Jonathan Dieter <jdieter99[AT]gmx.net> 0.11.2-4
+- fix dynamic linking bug
+
 * Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 0.11.2-3
 - rebuild for FC5
 



From fedora-extras-commits at redhat.com  Tue Apr 11 15:53:34 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 11 Apr 2006 08:53:34 -0700
Subject: rpms/lyx/FC-4 lyx-1.4.0-boost.patch, NONE, 1.1 .cvsignore, 1.4,
	1.5 lyx.spec, 1.18, 1.19 sources, 1.6, 1.7
Message-ID: <200604111553.k3BFrav8018190@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/lyx/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18166

Modified Files:
	.cvsignore lyx.spec sources 
Added Files:
	lyx-1.4.0-boost.patch 
Log Message:
* Tue Apr 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.1-2
- 1.4.1


lyx-1.4.0-boost.patch:

--- NEW FILE lyx-1.4.0-boost.patch ---
--- lyx-1.4.0pre5/src/frontends/controllers/biblio.C.boost	2005-03-21 08:31:22.000000000 -0600
+++ lyx-1.4.0pre5/src/frontends/controllers/biblio.C	2006-02-14 08:59:29.000000000 -0600
@@ -20,6 +20,7 @@
 #include "support/lstrings.h"
 
 #include <boost/regex.hpp>
+#include <boost/cregex.hpp>
 
 #include <algorithm>
 #include <sstream>
--- lyx-1.4.0pre5/src/support/pch.h.boost	2005-04-26 05:30:24.000000000 -0500
+++ lyx-1.4.0pre5/src/support/pch.h	2006-02-14 08:55:14.000000000 -0600
@@ -10,7 +10,12 @@
 #include <boost/shared_ptr.hpp>
 #include <boost/signal.hpp>
 #include <boost/signals/trackable.hpp>
+#include <boost/version.hpp>
+#if (BOOST_VERSION >= 103300)
+#include <boost/test/utils/nullstream.hpp>
+#else
 #include <boost/test/detail/nullstream.hpp>
+#endif
 #include <boost/tokenizer.hpp>
 #include <boost/utility.hpp>
 
--- lyx-1.4.0pre5/src/support/filetools.C.boost	2005-09-07 04:44:58.000000000 -0500
+++ lyx-1.4.0pre5/src/support/filetools.C	2006-02-14 08:55:14.000000000 -0600
@@ -39,6 +39,7 @@
 #include <boost/assert.hpp>
 #include <boost/filesystem/operations.hpp>
 #include <boost/regex.hpp>
+#include <boost/cregex.hpp>
 
 #include <fcntl.h>
 
--- lyx-1.4.0pre5/src/support/debugstream.h.boost	2004-05-20 04:35:30.000000000 -0500
+++ lyx-1.4.0pre5/src/support/debugstream.h	2006-02-14 08:55:14.000000000 -0600
@@ -14,7 +14,12 @@
 
 #include <iostream>
 
+#include <boost/version.hpp>
+#if (BOOST_VERSION >= 103300)
+#include <boost/test/utils/nullstream.hpp>
+#else
 #include <boost/test/detail/nullstream.hpp>
+#endif
 
 #ifdef DEBUG
 # define TEMPORARY_DEBUG_MACRO DEBUG
--- lyx-1.4.0pre5/src/pch.h.boost	2005-04-26 05:30:24.000000000 -0500
+++ lyx-1.4.0pre5/src/pch.h	2006-02-14 08:55:14.000000000 -0600
@@ -17,7 +17,12 @@
 #include <boost/signals/connection.hpp>
 #include <boost/signal.hpp>
 #include <boost/signals/trackable.hpp>
+#include <boost/version.hpp>
+#if (BOOST_VERSION >= 103300)
+#include <boost/test/utils/nullstream.hpp>
+#else
 #include <boost/test/detail/nullstream.hpp>
+#endif
 #include <boost/tokenizer.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <boost/utility.hpp>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Mar 2006 18:51:26 -0000	1.4
+++ .cvsignore	11 Apr 2006 15:53:34 -0000	1.5
@@ -1,2 +1,2 @@
-lyx-1.4.0.tar.bz2
 beamer.layout
+lyx-1.4.1.tar.bz2


Index: lyx.spec
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-4/lyx.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- lyx.spec	30 Mar 2006 19:17:52 -0000	1.18
+++ lyx.spec	11 Apr 2006 15:53:34 -0000	1.19
@@ -1,8 +1,8 @@
 
 Summary: WYSIWYM (What You See Is What You Mean) document processor
 Name:	 lyx
-Version: 1.4.0
-Release: 5%{?dist}
+Version: 1.4.1
+Release: 2%{?dist}
 
 License: GPL
 Group: 	 Applications/Publishing
@@ -12,6 +12,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 
 Patch1: lyx-1.4.0-helpers.patch
+Patch2: lyx-1.4.0-boost.patch
 
 # app-wrapper for various frontends
 Source10: lyx.sh
@@ -38,6 +39,7 @@
 BuildRequires: zlib-devel
 BuildRequires: tetex-latex
 BuildRequires: tetex-fonts
+%{?_without_included_boost:BuildRequires: boost-devel >= 1.33.0}
 
 # For texhash
 Requires(post): tetex-fonts
@@ -91,6 +93,7 @@
 %setup -q -n %{name}-%{version}%{?beta}
 
 %patch1 -p1 -b .helpers
+%{?_without_included_boost:%patch2 -p1 -b .boost}
 
 
 %build
@@ -111,6 +114,7 @@
   --enable-optimization="%{optflags}" \
   --with-aiksaurus \
   --with-aspell \
+  %{?_without_included_boost} \
   --without-warnings --disable-dependency-tracking \
   --disable-debug --disable-stdlib-debug --disable-assertions --disable-concept-checks 
 
@@ -195,6 +199,9 @@
 
 
 %changelog
+* Tue Apr 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.1-2
+- 1.4.1
+
 * Thu Mar 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.4.0-5
 - %%trigger ImageMagick (#186319)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lyx/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	10 Mar 2006 18:51:26 -0000	1.6
+++ sources	11 Apr 2006 15:53:34 -0000	1.7
@@ -1,2 +1,2 @@
-5ab37471339ff7dbc8f0c43282746cb0  lyx-1.4.0.tar.bz2
 c906271900a0627d3df2a38ad962a285  beamer.layout
+368696695a05e428773626e3b0f8ae74  lyx-1.4.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Apr 11 15:54:10 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 11 Apr 2006 08:54:10 -0700
Subject: rpms/perl-Apache-Session/devel .cvsignore, 1.2,
	1.3 perl-Apache-Session.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200604111554.k3BFsC41018257@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Apache-Session/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18234

Modified Files:
	.cvsignore perl-Apache-Session.spec sources 
Log Message:
Update to 1.80.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-Session/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	13 Sep 2005 16:18:43 -0000	1.2
+++ .cvsignore	11 Apr 2006 15:54:10 -0000	1.3
@@ -1 +1 @@
-Apache-Session-1.6.tar.gz
+Apache-Session-1.80.tar.gz


Index: perl-Apache-Session.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-Session/devel/perl-Apache-Session.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Apache-Session.spec	13 Sep 2005 16:18:43 -0000	1.1
+++ perl-Apache-Session.spec	11 Apr 2006 15:54:10 -0000	1.2
@@ -1,23 +1,25 @@
 Name:           perl-Apache-Session
-Version:        1.6
-Release:        2%{?dist}
-Summary:        Apache::Session Perl module
+Version:        1.80
+Release:        1%{?dist}
+Summary:        Persistence framework for session data
 License:        Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Apache-Session/
-Source0:        http://www.cpan.org/modules/by-module/Apache/Apache-Session-1.6.tar.gz
+Source0:        http://www.cpan.org/authors/id/C/CW/CWEST/Apache-Session-%{version}.tar.gz
 # https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=118577, from Chris Grau
 Patch0:         Apache-Session-mp2.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  perl(DBI)
+BuildRequires:  perl(Test::Deep) >= 0.082
+BuildRequires:  perl(Test::Exception) >= 0.15
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
-These modules provide persistent storage for arbitrary data, in arbitrary
-backing stores.  The details of interacting with the backing store are
-abstracted to make all backing stores behave alike.  The programmer simply
-interacts with a tied hash.
+Apache::Session is a persistence framework which is particularly useful for
+tracking session data between httpd requests. Apache::Session is designed
+to work with Apache and mod_perl, but it should work under CGI and other
+web servers, and it also works outside of a web server altogether.
 
 %prep
 %setup -q -n Apache-Session-%{version}
@@ -37,8 +39,6 @@
 
 chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*
 
-perldoc -t perlartistic > Artistic
-
 %check
 make test
 
@@ -47,11 +47,15 @@
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES README TODO Artistic
+%doc CHANGES README TODO
 %{perl_vendorlib}/Apache
 %{_mandir}/man3/Apache*
 
 %changelog
+* Tue Apr 11 2006 Steven Pritchard <steve at kspei.com> 1.80-1
+- Update to 1.80.
+- Spec cleanup.
+
 * Thu Sep 08 2005 Steven Pritchard <steve at kspei.com> 1.6-2
 - Add patch for mod_perl2 compatibility from Chris Grau (#167753, comment #3).
 - Re-enable "make test".


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Apache-Session/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	13 Sep 2005 16:18:43 -0000	1.2
+++ sources	11 Apr 2006 15:54:10 -0000	1.3
@@ -1 +1 @@
-3a373102e3ba49f93a76994c6599e1ff  Apache-Session-1.6.tar.gz
+fbb26cc28250127efc24b9e745b934f3  Apache-Session-1.80.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 15:58:42 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 11 Apr 2006 08:58:42 -0700
Subject: rpms/powermanga/FC-5 .cvsignore, 1.2, 1.3 powermanga.spec, 1.11,
	1.12 sources, 1.2, 1.3 powermanga-64bit.patch, 1.1, NONE
Message-ID: <200604111558.k3BFwiFO018340@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/powermanga/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18319

Modified Files:
	.cvsignore powermanga.spec sources 
Removed Files:
	powermanga-64bit.patch 
Log Message:
Update to 0.80.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/powermanga/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Nov 2004 02:49:43 -0000	1.2
+++ .cvsignore	11 Apr 2006 15:58:42 -0000	1.3
@@ -1 +1 @@
-powermanga-0.79.tgz
+powermanga-0.80.tgz


Index: powermanga.spec
===================================================================
RCS file: /cvs/extras/rpms/powermanga/FC-5/powermanga.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- powermanga.spec	6 Mar 2006 16:23:01 -0000	1.11
+++ powermanga.spec	11 Apr 2006 15:58:42 -0000	1.12
@@ -1,18 +1,17 @@
 Summary: Arcade 2D shoot-them-up game
 Name: powermanga
-Version: 0.79
-Release: 8%{?dist}
+Version: 0.80
+Release: 1%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://linux.tlk.fr/games/Powermanga/
 Source0: http://linux.tlk.fr/games/Powermanga/download/powermanga-%{version}.tgz
 Source1: powermanga.png
-Patch0: powermanga-64bit.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: SDL-devel, SDL_mixer-devel, desktop-file-utils
+BuildRequires: SDL-devel, SDL_mixer-devel, zlib-devel, desktop-file-utils
 # Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora
 %if %{!?fedora:5}%{?fedora} >= 5
-BuildRequires: libXxf86dga-devel, libXxf86vm-devel
+BuildRequires: libXt-devel, libXxf86dga-devel, libXxf86vm-devel
 %endif
 
 %description
@@ -22,7 +21,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .64bit
 
 %{__cat} > %{name}.desktop << EOF
 [Desktop Entry]
@@ -44,7 +42,7 @@
 
 %build
 %configure
-%{__make} %{?_smp_mflags} CXXFLAGS="%{optflags}"
+%{__make} %{?_smp_mflags} CXXFLAGS="%{optflags} `sdl-config --cflags`"
 
 
 %install
@@ -54,7 +52,7 @@
 # Install wrapper script
 %{__install} -D -m 0755 %{name}.sh %{buildroot}%{_bindir}/powermanga
 
-# Allow stripping, g+s will be set in %%files
+# Allow stripping, g+s will be set back in %%files
 %{__chmod} g-s %{buildroot}%{_prefix}/games/powermanga
 
 # Fix location of the man page
@@ -63,13 +61,14 @@
         %{buildroot}%{_mandir}/man6/
 
 # Install pixmap for the menu entry
-%{__install} -D -m 0644 %{SOURCE1} \
+%{__install} -D -p -m 0644 %{SOURCE1} \
     %{buildroot}%{_datadir}/pixmaps/powermanga.png
 
 # Install menu entry
 %{__mkdir_p} %{buildroot}%{_datadir}/applications
 desktop-file-install \
     --vendor fedora \
+    --add-category X-Fedora \
     --dir %{buildroot}%{_datadir}/applications \
     %{name}.desktop
 
@@ -93,6 +92,12 @@
 
 
 %changelog
+* Tue Apr 11 2006 Matthias Saou <http://freshrpms.net/> 0.80-1
+- Update to 0.80, fixes crash at level 35 boss (#184076, Hugo Cisneiros).
+- Add new zlib-devel build requirement.
+- Add `sdl-config --cflags` to CXXFLAGS, otherwise SDL_mixer.h isn't found.
+- Add missing libXt-devel build requirement to get modular X detected.
+
 * Mon Mar  6 2006 Matthias Saou <http://freshrpms.net/> 0.79-8
 - FC5 rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/powermanga/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Nov 2004 02:49:43 -0000	1.2
+++ sources	11 Apr 2006 15:58:42 -0000	1.3
@@ -1 +1 @@
-3a4f00658496921b7327413ac476c1b7  powermanga-0.79.tgz
+8f6e8755ac88108f2f9bb4cd6feae489  powermanga-0.80.tgz


--- powermanga-64bit.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 11 16:14:24 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 11 Apr 2006 09:14:24 -0700
Subject: rpms/powermanga/FC-4 .cvsignore, 1.2, 1.3 powermanga.spec, 1.8,
	1.9 sources, 1.2, 1.3 powermanga-64bit.patch, 1.1, NONE
Message-ID: <200604111614.k3BGEQR7020484@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/powermanga/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20463

Modified Files:
	.cvsignore powermanga.spec sources 
Removed Files:
	powermanga-64bit.patch 
Log Message:
Update to 0.80.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/powermanga/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Nov 2004 02:49:43 -0000	1.2
+++ .cvsignore	11 Apr 2006 16:14:24 -0000	1.3
@@ -1 +1 @@
-powermanga-0.79.tgz
+powermanga-0.80.tgz


Index: powermanga.spec
===================================================================
RCS file: /cvs/extras/rpms/powermanga/FC-4/powermanga.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- powermanga.spec	7 Nov 2005 12:07:58 -0000	1.8
+++ powermanga.spec	11 Apr 2006 16:14:24 -0000	1.9
@@ -1,15 +1,18 @@
 Summary: Arcade 2D shoot-them-up game
 Name: powermanga
-Version: 0.79
-Release: 6%{?dist}
+Version: 0.80
+Release: 1%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://linux.tlk.fr/games/Powermanga/
 Source0: http://linux.tlk.fr/games/Powermanga/download/powermanga-%{version}.tgz
 Source1: powermanga.png
-Patch0: powermanga-64bit.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: SDL-devel, SDL_mixer-devel, desktop-file-utils
+BuildRequires: SDL-devel, SDL_mixer-devel, zlib-devel, desktop-file-utils
+# Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora
+%if %{!?fedora:5}%{?fedora} >= 5
+BuildRequires: libXt-devel, libXxf86dga-devel, libXxf86vm-devel
+%endif
 
 %description
 Powermanga is an arcade 2D shoot-them-up game with 41 levels and more than
@@ -18,7 +21,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .64bit
 
 %{__cat} > %{name}.desktop << EOF
 [Desktop Entry]
@@ -40,7 +42,7 @@
 
 %build
 %configure
-%{__make} %{?_smp_mflags} CXXFLAGS="%{optflags}"
+%{__make} %{?_smp_mflags} CXXFLAGS="%{optflags} `sdl-config --cflags`"
 
 
 %install
@@ -50,7 +52,7 @@
 # Install wrapper script
 %{__install} -D -m 0755 %{name}.sh %{buildroot}%{_bindir}/powermanga
 
-# Allow stripping, g+s will be set in %%files
+# Allow stripping, g+s will be set back in %%files
 %{__chmod} g-s %{buildroot}%{_prefix}/games/powermanga
 
 # Fix location of the man page
@@ -59,13 +61,14 @@
         %{buildroot}%{_mandir}/man6/
 
 # Install pixmap for the menu entry
-%{__install} -D -m 0644 %{SOURCE1} \
+%{__install} -D -p -m 0644 %{SOURCE1} \
     %{buildroot}%{_datadir}/pixmaps/powermanga.png
 
 # Install menu entry
 %{__mkdir_p} %{buildroot}%{_datadir}/applications
 desktop-file-install \
     --vendor fedora \
+    --add-category X-Fedora \
     --dir %{buildroot}%{_datadir}/applications \
     %{name}.desktop
 
@@ -89,6 +92,18 @@
 
 
 %changelog
+* Tue Apr 11 2006 Matthias Saou <http://freshrpms.net/> 0.80-1
+- Update to 0.80, fixes crash at level 35 boss (#184076, Hugo Cisneiros).
+- Add new zlib-devel build requirement.
+- Add `sdl-config --cflags` to CXXFLAGS, otherwise SDL_mixer.h isn't found.
+- Add missing libXt-devel build requirement to get modular X detected.
+
+* Mon Mar  6 2006 Matthias Saou <http://freshrpms.net/> 0.79-8
+- FC5 rebuild.
+
+* Thu Feb  9 2006 Matthias Saou <http://freshrpms.net/> 0.79-7
+- Rebuild for new gcc/glibc and modular X.
+
 * Mon Nov  7 2005 Matthias Saou <http://freshrpms.net/> 0.79-6
 - Fix stripping (when g+s is set, it doesn't happen) and add wrapper script in
   $PATH (#165313, Ville Skytt??).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/powermanga/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Nov 2004 02:49:43 -0000	1.2
+++ sources	11 Apr 2006 16:14:24 -0000	1.3
@@ -1 +1 @@
-3a4f00658496921b7327413ac476c1b7  powermanga-0.79.tgz
+8f6e8755ac88108f2f9bb4cd6feae489  powermanga-0.80.tgz


--- powermanga-64bit.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 11 16:16:28 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Tue, 11 Apr 2006 09:16:28 -0700
Subject: kadischi kadischi.spec,1.2,1.3
Message-ID: <200604111616.k3BGGSwA020569@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20540/kadischi

Modified Files:
	kadischi.spec 
Log Message:
Handle UP and SMP kernels on non-similar hosts


Index: kadischi.spec
===================================================================
RCS file: /cvs/devel/kadischi/kadischi.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kadischi.spec	11 Apr 2006 08:26:16 -0000	1.2
+++ kadischi.spec	11 Apr 2006 16:16:26 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           kadischi
 Version:        0.1
-Release:        7.%{alphatag}
+Release:        8.%{alphatag}
 Summary:        LiveCD generation utility 
 
 Group:          Applications/System
@@ -78,6 +78,7 @@
 
 %changelog
 * Tue Apr 11 2006 Jasper Hartline <jasperhartline at adelphia.net>
+- Handle UP and SMP kernels on SMP and UP hosts
 - Drop filesystem option and use SquashFS exclusively
 - Contributor: Toshio Kuratomi <toshio at tiki-lounge.com>
 



From fedora-extras-commits at redhat.com  Tue Apr 11 16:16:28 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Tue, 11 Apr 2006 09:16:28 -0700
Subject: kadischi/lib functions.py,1.6,1.7
Message-ID: <200604111616.k3BGGS8h020575@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi/lib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20540/kadischi/lib

Modified Files:
	functions.py 
Log Message:
Handle UP and SMP kernels on non-similar hosts


Index: functions.py
===================================================================
RCS file: /cvs/devel/kadischi/lib/functions.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- functions.py	31 Mar 2006 21:03:36 -0000	1.6
+++ functions.py	11 Apr 2006 16:16:26 -0000	1.7
@@ -78,6 +78,10 @@
             for mi in ts.dbMatch ('name', 'kernel-smp'):
                 kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'smp'
                 clear_rpm_db_files (rootdir)
+            if kernel_version == None:
+                for mi in ts.dbMatch ('name', 'kernel'):
+                    kernel_version = "%s-%s" % (mi['version'], mi['release'])
+                    clear_rpm_db_files (rootdir)
         else:
             for mi in ts.dbMatch ('name', 'kernel-xen0'):
                 kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'xen0'
@@ -85,6 +89,10 @@
             for mi in ts.dbMatch ('name', 'kernel'):
                 kernel_version = "%s-%s" % (mi['version'], mi['release'])
                 clear_rpm_db_files (rootdir)
+            if kernel_version == None:
+                for mi in ts.dbMatch ('name', 'kernel-smp'):
+                    kernel_version = "%s-%s" % (mi['version'], mi['release']) + 'smp'
+                    clear_rpm_db_files (rootdir)
     return kernel_version
 
 def clean_directory (dir, remove_when_done=True, keep_child_directories=False):



From fedora-extras-commits at redhat.com  Tue Apr 11 16:34:40 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 11 Apr 2006 09:34:40 -0700
Subject: rpms/powermanga/FC-3 .cvsignore, 1.2, 1.3 powermanga.spec, 1.4,
	1.5 sources, 1.2, 1.3 powermanga-64bit.patch, 1.1, NONE
Message-ID: <200604111634.k3BGYgq1020623@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/powermanga/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20602

Modified Files:
	.cvsignore powermanga.spec sources 
Removed Files:
	powermanga-64bit.patch 
Log Message:
Update to 0.80.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/powermanga/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	9 Nov 2004 02:49:43 -0000	1.2
+++ .cvsignore	11 Apr 2006 16:34:40 -0000	1.3
@@ -1 +1 @@
-powermanga-0.79.tgz
+powermanga-0.80.tgz


Index: powermanga.spec
===================================================================
RCS file: /cvs/extras/rpms/powermanga/FC-3/powermanga.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- powermanga.spec	7 Nov 2005 12:07:49 -0000	1.4
+++ powermanga.spec	11 Apr 2006 16:34:40 -0000	1.5
@@ -1,15 +1,18 @@
 Summary: Arcade 2D shoot-them-up game
 Name: powermanga
-Version: 0.79
-Release: 6%{?dist}
+Version: 0.80
+Release: 1%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://linux.tlk.fr/games/Powermanga/
 Source0: http://linux.tlk.fr/games/Powermanga/download/powermanga-%{version}.tgz
 Source1: powermanga.png
-Patch0: powermanga-64bit.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: SDL-devel, SDL_mixer-devel, desktop-file-utils
+BuildRequires: SDL-devel, SDL_mixer-devel, zlib-devel, desktop-file-utils
+# Use monolithic X up to FC4, and modular X for FC5+ and non-Fedora
+%if %{!?fedora:5}%{?fedora} >= 5
+BuildRequires: libXt-devel, libXxf86dga-devel, libXxf86vm-devel
+%endif
 
 %description
 Powermanga is an arcade 2D shoot-them-up game with 41 levels and more than
@@ -18,7 +21,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .64bit
 
 %{__cat} > %{name}.desktop << EOF
 [Desktop Entry]
@@ -40,7 +42,7 @@
 
 %build
 %configure
-%{__make} %{?_smp_mflags} CXXFLAGS="%{optflags}"
+%{__make} %{?_smp_mflags} CXXFLAGS="%{optflags} `sdl-config --cflags`"
 
 
 %install
@@ -50,7 +52,7 @@
 # Install wrapper script
 %{__install} -D -m 0755 %{name}.sh %{buildroot}%{_bindir}/powermanga
 
-# Allow stripping, g+s will be set in %%files
+# Allow stripping, g+s will be set back in %%files
 %{__chmod} g-s %{buildroot}%{_prefix}/games/powermanga
 
 # Fix location of the man page
@@ -59,13 +61,14 @@
         %{buildroot}%{_mandir}/man6/
 
 # Install pixmap for the menu entry
-%{__install} -D -m 0644 %{SOURCE1} \
+%{__install} -D -p -m 0644 %{SOURCE1} \
     %{buildroot}%{_datadir}/pixmaps/powermanga.png
 
 # Install menu entry
 %{__mkdir_p} %{buildroot}%{_datadir}/applications
 desktop-file-install \
     --vendor fedora \
+    --add-category X-Fedora \
     --dir %{buildroot}%{_datadir}/applications \
     %{name}.desktop
 
@@ -89,6 +92,18 @@
 
 
 %changelog
+* Tue Apr 11 2006 Matthias Saou <http://freshrpms.net/> 0.80-1
+- Update to 0.80, fixes crash at level 35 boss (#184076, Hugo Cisneiros).
+- Add new zlib-devel build requirement.
+- Add `sdl-config --cflags` to CXXFLAGS, otherwise SDL_mixer.h isn't found.
+- Add missing libXt-devel build requirement to get modular X detected.
+
+* Mon Mar  6 2006 Matthias Saou <http://freshrpms.net/> 0.79-8
+- FC5 rebuild.
+
+* Thu Feb  9 2006 Matthias Saou <http://freshrpms.net/> 0.79-7
+- Rebuild for new gcc/glibc and modular X.
+
 * Mon Nov  7 2005 Matthias Saou <http://freshrpms.net/> 0.79-6
 - Fix stripping (when g+s is set, it doesn't happen) and add wrapper script in
   $PATH (#165313, Ville Skytt??).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/powermanga/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	9 Nov 2004 02:49:43 -0000	1.2
+++ sources	11 Apr 2006 16:34:40 -0000	1.3
@@ -1 +1 @@
-3a4f00658496921b7327413ac476c1b7  powermanga-0.79.tgz
+8f6e8755ac88108f2f9bb4cd6feae489  powermanga-0.80.tgz


--- powermanga-64bit.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 11 16:36:03 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Tue, 11 Apr 2006 09:36:03 -0700
Subject: fedora-security/audit fc4,1.198,1.199 fc5,1.111,1.112
Message-ID: <200604111636.k3BGa3F0020687@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20667/audit

Modified Files:
	fc4 fc5 
Log Message:
Update CVE-2006-1522



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- fc4	11 Apr 2006 10:26:37 -0000	1.198
+++ fc4	11 Apr 2006 16:36:01 -0000	1.199
@@ -12,7 +12,7 @@
 CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1542 VULNERABLE (python) bz#169046
-CVE-2006-1522 VULNERABLE (kernel)
+CVE-2006-1522 VULNERABLE (kernel, fixed 2.6.16.3)
 CVE-2006-1494 VULNERABLE (php)
 CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-245]
 CVE-2006-1354 VULNERABLE (freeradius) bz#186084


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- fc5	11 Apr 2006 10:26:37 -0000	1.111
+++ fc5	11 Apr 2006 16:36:01 -0000	1.112
@@ -11,7 +11,7 @@
 CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1542 VULNERABLE (python) bz#169046
-CVE-2006-1522 VULNERABLE (kernel)
+CVE-2006-1522 VULNERABLE (kernel, fixed 2.6.16.3)
 CVE-2006-1494 VULNERABLE (php)
 CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-233]
 CVE-2006-1354 VULNERABLE (freeradius) bz#186084



From fedora-extras-commits at redhat.com  Tue Apr 11 16:43:01 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 11 Apr 2006 09:43:01 -0700
Subject: rpms/php-eaccelerator/devel
	eaccelerator-0.9.5-beta2-64bit_cast_warning.patch, NONE,
	1.1 eaccelerator-0.9.5-beta2-compile.patch, NONE, 1.1 .cvsignore,
	1.5, 1.6 php-eaccelerator.spec, 1.10, 1.11 sources, 1.5, 1.6
Message-ID: <200604111643.k3BGh32b020749@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/php-eaccelerator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20722

Modified Files:
	.cvsignore php-eaccelerator.spec sources 
Added Files:
	eaccelerator-0.9.5-beta2-64bit_cast_warning.patch 
	eaccelerator-0.9.5-beta2-compile.patch 
Log Message:
Update to 0.9.5-beta2.


eaccelerator-0.9.5-beta2-64bit_cast_warning.patch:

--- NEW FILE eaccelerator-0.9.5-beta2-64bit_cast_warning.patch ---
Index: opcodes.h
===================================================================
--- opcodes.h	(revision 202)
+++ opcodes.h	(working copy)
@@ -85,7 +85,7 @@
 #define OPS_STD       EXT_STD | OP1_STD | OP2_STD | RES_STD
 
 #ifdef ZEND_ENGINE_2
-#  define VAR_NUM(var) ((unsigned int)(((temp_variable *)(var))-((temp_variable *)NULL)))
+#  define VAR_NUM(var) ((unsigned int)(((temp_variable *)((intptr_t) var))-((temp_variable *)NULL)))
 #  define VAR_VAL(var) ((unsigned int)((var)*sizeof(temp_variable)))
 #else
 #  define VAR_NUM(var) ((unsigned int)(var))
Index: loader.c
===================================================================
--- loader.c	(revision 202)
+++ loader.c	(working copy)
@@ -86,7 +86,7 @@
     zend_bailout();
   }
 #ifdef ZEND_ENGINE_2
-  return (unsigned int)(((temp_variable*)NULL) + var);
+  return (unsigned int)((intptr_t) ((temp_variable*)NULL) + var);
 #else
   return var;
 #endif

eaccelerator-0.9.5-beta2-compile.patch:

--- NEW FILE eaccelerator-0.9.5-beta2-compile.patch ---
Index: optimize.c
===================================================================
--- optimize.c	(revision 199)
+++ optimize.c	(working copy)
@@ -1499,23 +1499,26 @@
   if (!EAG(encoder) ||
       (name_len == sizeof("false")-1 && strcmp(name,"false") == 0) ||
       (name_len == sizeof("true")-1 && strcmp(name,"true") == 0)) {
-    zend_constant *c;
+    union {
+      zend_constant *v;
+      void *ptr;
+    } c;
     int retval;
     char *lookup_name = do_alloca(name_len+1);
     memcpy(lookup_name, name, name_len);
     lookup_name[name_len] = '\0';
 
-    if (zend_hash_find(EG(zend_constants), lookup_name, name_len+1, (void **) &c)==SUCCESS) {
-      *result = c;
+    if (zend_hash_find(EG(zend_constants), lookup_name, name_len+1, &c.ptr)==SUCCESS) {
+      *result = c.v;
       retval=1;
     } else {
       zend_str_tolower(lookup_name, name_len);
 
-      if (zend_hash_find(EG(zend_constants), lookup_name, name_len+1, (void **) &c)==SUCCESS) {
-        if ((c->flags & CONST_CS) && (memcmp(c->name, name, name_len)!=0)) {
+      if (zend_hash_find(EG(zend_constants), lookup_name, name_len+1, &c.ptr)==SUCCESS) {
+        if ((c.v->flags & CONST_CS) && (memcmp(c.v->name, name, name_len)!=0)) {
           retval=0;
         } else {
-          *result = c;
+          *result = c.v;
           retval=1;
         }
       } else {
@@ -2543,52 +2546,49 @@
 #endif
             IS_DEFINED(op->op1)) {
           zend_op *x = DEFINED_OP(op->op1);
-          if ((x->opcode == ZEND_FETCH_W || x->opcode == ZEND_FETCH_RW) &&
-              x->op1.op_type == IS_CONST &&
-              x->op1.u.constant.type == IS_STRING) {
+          if ((x->opcode == ZEND_FETCH_W || x->opcode == ZEND_FETCH_RW) && 
+              x->op1.op_type == IS_CONST && x->op1.u.constant.type == IS_STRING) {
+            union {
+              zend_op *v;
+              void *ptr;
+            } op_copy;
             char *s = emalloc(x->op1.u.constant.value.str.len+2);
+            op_copy.v = op;
             memcpy(s,x->op1.u.constant.value.str.val,x->op1.u.constant.value.str.len);
             s[x->op1.u.constant.value.str.len] = (char)FETCH_TYPE(x);
             s[x->op1.u.constant.value.str.len+1] = '\0';
-            zend_hash_update(&assigns,
-                             s, x->op1.u.constant.value.str.len+2,
-                             (void**)&op, sizeof(void*), NULL);
+            zend_hash_update(&assigns, s, x->op1.u.constant.value.str.len+2, &op_copy.ptr, 
+                sizeof(void*), NULL);
             efree(s);
           }
         }
-      } else if ((op->opcode == ZEND_FETCH_R ||
-                  op->opcode == ZEND_FETCH_IS) &&
-                 !global[VAR_NUM(op->result.u.var)] &&
-                 op->op1.op_type == IS_CONST &&
-                 op->op1.u.constant.type == IS_STRING) {
-        zend_op *x;
+      } else if ((op->opcode == ZEND_FETCH_R || op->opcode == ZEND_FETCH_IS) && 
+          !global[VAR_NUM(op->result.u.var)] && op->op1.op_type == IS_CONST &&
+          op->op1.u.constant.type == IS_STRING) {
+        union {
+          zend_op *v;
+          void *ptr;
+        } x;
         char *s = emalloc(op->op1.u.constant.value.str.len+2);
         memcpy(s,op->op1.u.constant.value.str.val,op->op1.u.constant.value.str.len);
         s[op->op1.u.constant.value.str.len] = (char)FETCH_TYPE(op);
         s[op->op1.u.constant.value.str.len+1] = '\0';
 
-        if (zend_hash_find(&assigns,
-                           s, op->op1.u.constant.value.str.len+2,
-                           (void**)&x) == SUCCESS) {
-          x = *(zend_op**)x;
-/*
-          if (x->opcode == ZEND_ASSIGN && x->op2.op_type == IS_CONST) {
-            zend_printf("possible const propogation in %s:%s (%s,%u:%u)<br>\n",op_array->filename, op_array->function_name, op->op1.u.constant.value.str.val, x-op_array->opcodes, op-op_array->opcodes);
-          }
-*/
-          memcpy(&x->result, &op->result, sizeof(op->result));
-          x->result.u.EA.type = 0;
-          SET_DEFINED(x);
-          zend_hash_del(&assigns,
-                        s, op->op1.u.constant.value.str.len+2);
+        if (zend_hash_find(&assigns, s, op->op1.u.constant.value.str.len+2, 
+              &x.ptr) == SUCCESS) {
+          x.v = *(zend_op**)x.v;
+          memcpy(&x.v->result, &op->result, sizeof(op->result));
+          x.v->result.u.EA.type = 0;
+          SET_DEFINED(x.v);
+          zend_hash_del(&assigns, s, op->op1.u.constant.value.str.len+2);
           STR_FREE(op->op1.u.constant.value.str.val);
           SET_TO_NOP(op);
         }
         efree(s);
       } else if (op->opcode == ZEND_FETCH_DIM_R &&
-                 op->extended_value != ZEND_FETCH_ADD_LOCK &&
-                 op->op1.op_type == IS_VAR &&
-                 IS_DEFINED(op->op1)) {
+          op->extended_value != ZEND_FETCH_ADD_LOCK &&
+          op->op1.op_type == IS_VAR &&
+          IS_DEFINED(op->op1)) {
         zend_op *x = DEFINED_OP(op->op1);
         while ((x->opcode == ZEND_ASSIGN_REF ||
                 x->opcode == ZEND_ASSIGN ||
@@ -2609,32 +2609,35 @@
                 IS_DEFINED(x->op1)) {
           x = DEFINED_OP(x->op1);
         }
-        if ((x->opcode == ZEND_FETCH_R ||
-             x->opcode == ZEND_FETCH_W ||
-             x->opcode == ZEND_FETCH_RW) &&
-             x->op1.op_type == IS_CONST &&
-             x->op1.u.constant.type == IS_STRING) {
-          zend_op *y;
+        if ((x->opcode == ZEND_FETCH_R || x->opcode == ZEND_FETCH_W || 
+              x->opcode == ZEND_FETCH_RW) && x->op1.op_type == IS_CONST && 
+            x->op1.u.constant.type == IS_STRING) {
+          union {
+            zend_op *v;
+            void *ptr;
+          } y;
+          union {
+            zend_op *v;
+            void *ptr;
+          } op_copy;
           char *s = emalloc(x->op1.u.constant.value.str.len+2);
+          op_copy.v = op;
           memcpy(s,x->op1.u.constant.value.str.val,x->op1.u.constant.value.str.len);
           s[x->op1.u.constant.value.str.len] = (char)FETCH_TYPE(x);
           s[x->op1.u.constant.value.str.len+1] = '\0';
-          if (zend_hash_find(&fetch_dim,
-                             s, x->op1.u.constant.value.str.len+2,
-                             (void**)&y) == SUCCESS) {
-            y = *(zend_op**)y;
-            y->extended_value = ZEND_FETCH_ADD_LOCK;
-            zend_hash_update(&fetch_dim,
-                             s, x->op1.u.constant.value.str.len+2,
-                             (void**)&op, sizeof(void*), NULL);
+          if (zend_hash_find(&fetch_dim, s, x->op1.u.constant.value.str.len+2, 
+                &y.ptr) == SUCCESS) {
+            y.v = *(zend_op**)y.v;
+            y.v->extended_value = ZEND_FETCH_ADD_LOCK;
+            zend_hash_update(&fetch_dim, s, x->op1.u.constant.value.str.len+2, 
+                &op_copy.ptr, sizeof(void*), NULL);
             SET_UNDEFINED(x->result);
             STR_FREE(x->op1.u.constant.value.str.val);
             SET_TO_NOP(x);
-            memcpy(&op->op1,&y->op1,sizeof(op->op1));
+            memcpy(&op->op1, &y.v->op1, sizeof(op->op1));
           } else {
-            zend_hash_update(&fetch_dim,
-                             s, x->op1.u.constant.value.str.len+2,
-                             (void**)&op, sizeof(void*), NULL);
+            zend_hash_update(&fetch_dim, s, x->op1.u.constant.value.str.len+2, 
+                &op_copy.ptr, sizeof(void*), NULL);
           }
           efree(s);
         }
@@ -3170,7 +3173,9 @@
 void reassign_registers(zend_op_array *op_array, BB* p, char *global) {
   zend_uint i;
   zend_uint n = 0;
+#ifndef ZEND_ENGINE_2
   int uses_globals = 0;
+#endif
   int* assigned = do_alloca(op_array->T * sizeof(int));
   char* reg_pool = do_alloca(op_array->T * sizeof(char));
   char* used     = do_alloca(op_array->T * sizeof(char));
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 199)
+++ Makefile.in	(working copy)
@@ -2,6 +2,6 @@
 LTLIBRARY_SOURCES     = eaccelerator.c optimize.c encoder.c loader.c opcodes.c content.c mm.c session.c shm.c debug.c cache.c ea_restore.c ea_store.c ea_info.c ea_dasm.c
 LTLIBRARY_SHARED_NAME = eaccelerator.la
 
-EXTRA_CFLAGS = -O2
+EXTRA_CFLAGS = -O2 -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m32 -march=i386 -mtune=generic -fasynchronous-unwind-tables
 
 include $(top_srcdir)/build/dynlib.mk
Index: loader.c
===================================================================
--- loader.c	(revision 199)
+++ loader.c	(working copy)
@@ -212,6 +212,7 @@
   }
 }
 
+#ifndef ZEND_ENGINE_2
 static unsigned char* decode_pstr(char** p, unsigned int* l) {
   unsigned char c = decode(p, l);
   if (c == 0) {
@@ -229,6 +230,7 @@
     return str;
   }
 }
+#endif
 
 static double decode_double(char** p, unsigned int* l) {
   unsigned char sign;
@@ -250,7 +252,6 @@
 typedef void* (*decode_bucket_t)(void* to, char**, unsigned int* TSRMLS_DC);
 
 #define decode_zval_hash(to, p, l) decode_hash(to, sizeof(zval*), (decode_bucket_t)decode_zval_ptr, p, l TSRMLS_CC)
-#define decode_zval_hash_noref(to, p, l) decode_hash(to, sizeof(zval*), (decode_bucket_t)decode_zval_ptr_noref, p, l TSRMLS_CC)
 
 static HashTable* decode_hash(HashTable* to, int size, decode_bucket_t decode_bucket, char**p, unsigned int* l TSRMLS_DC);
 static zval* decode_zval_ptr(zval* to, char** p, unsigned int* l TSRMLS_DC);
@@ -315,6 +316,8 @@
   return to;
 }
 
+#ifndef ZEND_ENGINE_2
+#define decode_zval_hash_noref(to, p, l) decode_hash(to, sizeof(zval*), (decode_bucket_t)decode_zval_ptr_noref, p, l TSRMLS_CC)
 static zval* decode_zval_ptr_noref(zval* to, char** p, unsigned int* l TSRMLS_DC) {
   if (to == NULL) {
     ALLOC_ZVAL(to);
@@ -324,6 +327,7 @@
   to->refcount = 1;
   return to;
 }
+#endif
 
 static void decode_znode(znode* to, unsigned int vars_count, char** p, unsigned int* l TSRMLS_DC) {
   to->op_type = decode(p, l);
@@ -615,14 +619,19 @@
 	to->scope            = EAG(class_entry);
 	to->fn_flags         = decode32(p, l);
 	scope_name = decode_lstr((unsigned int*)&scope_name_len, p, l);
-	if (to->scope == NULL && scope_name != NULL) {
-		if (zend_hash_find(CG(class_table), (void *)scope_name, 
-                    scope_name_len, (void **)&to->scope) == SUCCESS) {
-			to->scope = *(zend_class_entry**)to->scope;
-		} else {
-            to->scope = NULL;
-        }
-	}
+    if (to->scope == NULL && scope_name != NULL) {
+      union {
+        zend_class_entry *v;
+        void *ptr;
+      } scope;
+      scope.v = to->scope;
+      if (zend_hash_find(CG(class_table), (void *)scope_name, 
+            scope_name_len, &scope.ptr) == SUCCESS) {
+        to->scope = *(zend_class_entry**)to->scope;
+      } else {
+        to->scope = NULL;
+      }
+    }
 #endif
   if (to->type == ZEND_INTERNAL_FUNCTION) {
     return to;
Index: mm.c
===================================================================
--- mm.c	(revision 199)
+++ mm.c	(working copy)
@@ -157,6 +157,7 @@
 
 #undef MM_SHM_CAN_ATTACH
 
+#if defined(MM_SEM_POSIX) || defined(MM_SEM_FCNTL) || defined(MM_SEM_FLOCK) || defined(MM_SEM_WIN32) || defined(MM_SHM_MMAP_POSIX) || defined(MM_SHM_MMAP_FILE)
 static int strxcat(char* dst, const char* src, int size) {
   int dst_len = strlen(dst);
   int src_len = strlen(src);
@@ -169,6 +170,7 @@
     return 0;
   }
 }
+#endif
 
 #if defined(MM_SEM_SPINLOCK)
 
@@ -191,9 +193,11 @@
   spinlock_t spinlock;
 } mm_mutex;
 
+/* not used 
 static int mm_attach_lock(const char* key, mm_mutex* lock) {
   return 1;
 }
+*/
 
 static int mm_init_lock(const char* key, mm_mutex* lock) {
   spinlock_init(&lock->spinlock);
Index: ea_restore.c
===================================================================
--- ea_restore.c	(revision 199)
+++ ea_restore.c	(working copy)
@@ -465,7 +465,10 @@
 zend_op_array *restore_op_array(zend_op_array * to,
 								eaccelerator_op_array * from TSRMLS_DC)
 {
-	zend_function *function;
+    union {
+    	zend_function *v;
+        void *ptr;
+    } function;
 #ifdef ZEND_ENGINE_2
 	int fname_len = 0;
 	char *fname_lc = NULL;
@@ -529,8 +532,13 @@
 	 * am I right here ? ;-(
 	 */
 	if (from->scope_name != NULL) {
+        union {
+            zend_class_entry *v;
+            void *ptr;
+        } scope;
 		char *from_scope_lc = zend_str_tolower_dup(from->scope_name, from->scope_name_len);
-		if (zend_hash_find (CG(class_table), (void *) from_scope_lc, from->scope_name_len + 1, (void **) &to->scope) != SUCCESS) {
+        scope.v = to->scope;
+		if (zend_hash_find (CG(class_table), (void *) from_scope_lc, from->scope_name_len + 1, &scope.ptr) != SUCCESS) {
 			DBG(ea_debug_pad, (EA_DEBUG TSRMLS_CC));
 			DBG(ea_debug_printf, (EA_DEBUG, "[%d]                   can't find '%s' in class_table. use EAG(class_entry).\n", getpid(), from->scope_name));
 			to->scope = EAG(class_entry);
@@ -548,11 +556,11 @@
 			for (p = EAG(class_entry)->parent; p; p = p->parent) {
 				DBG(ea_debug_pad, (EA_DEBUG TSRMLS_CC));
 				DBG(ea_debug_printf, (EA_DEBUG, "[%d]                   checking parent '%s' have '%s'\n", getpid(), p->name, fname_lc));
-				if (zend_hash_find(&p->function_table, fname_lc, fname_len + 1, (void **) &function) == SUCCESS) {
+				if (zend_hash_find(&p->function_table, fname_lc, fname_len + 1, &function.ptr) == SUCCESS) {
 					DBG(ea_debug_pad, (EA_DEBUG TSRMLS_CC));
 					DBG(ea_debug_printf, (EA_DEBUG, "[%d]                                   '%s' has '%s' of scope '%s'\n", 
-                            getpid(), p->name, fname_lc, function->common.scope->name));
-					to->scope = function->common.scope;
+                            getpid(), p->name, fname_lc, function.v->common.scope->name));
+					to->scope = function.v->common.scope;
 					break;
 				}
 			}
@@ -582,10 +590,10 @@
 #else
                 to->function_name, strlen(to->function_name) + 1,
 #endif
-				(void **) &function) == SUCCESS && function->type == ZEND_INTERNAL_FUNCTION) {
+				&function.ptr) == SUCCESS && function.v->type == ZEND_INTERNAL_FUNCTION) {
 			DBG(ea_debug_pad, (EA_DEBUG TSRMLS_CC));
 			DBG(ea_debug_printf, (EA_DEBUG, "[%d]                                       found in function table\n", getpid()));
-			((zend_internal_function *) (to))->handler = ((zend_internal_function *) function)->handler;
+			((zend_internal_function *) (to))->handler = ((zend_internal_function *) function.v)->handler;
 		} else {
 			/* FIXME. I don't know how to fix handler.
 			 * TODO: must solve this somehow, to avoid returning damaged structure...
@@ -805,7 +813,6 @@
 									  eaccelerator_class_entry * from TSRMLS_DC)
 {
 	zend_class_entry *old;
-	zend_function *f = NULL;
 
 	DBG(ea_debug_pad, (EA_DEBUG TSRMLS_CC));
 	DBG(ea_debug_printf, (EA_DEBUG, "[%d] restore_class_entry: %s\n", getpid(), from->name ? from->name : "(top)"));
Index: ea_dasm.c
===================================================================
--- ea_dasm.c	(revision 199)
+++ ea_dasm.c	(working copy)
@@ -269,7 +269,7 @@
                 } else if (opline->extended_value == ZEND_ISEMPTY) {
                     snprintf(buf, sizeof(buf), "ZEND_ISEMPTY");
                 } else {
-                    snprintf(buf, sizeof(buf), "");
+					buf[0] = '\0';
                 }
 #ifdef ZEND_ENGINE_2
             } else if ((op->ops & EXT_MASK) == EXT_ASSIGN) {
@@ -278,7 +278,7 @@
                 } else if (opline->extended_value == ZEND_ASSIGN_DIM) {
                     snprintf(buf, sizeof(buf), "ZEND_ASSIGN_DIM");
                 } else {
-                    snprintf(buf, sizeof(buf), "");
+					buf[0] = '\0';
                 }
 #ifndef ZEND_ENGINE_2_1
             } else if (opline->opcode == ZEND_UNSET_DIM_OBJ) {
@@ -287,14 +287,14 @@
                 } else if (opline->extended_value == ZEND_UNSET_OBJ) {
                     snprintf(buf, sizeof(buf), "ZEND_UNSET_OBJ");
                 } else {
-                    snprintf(buf, sizeof(buf), "");
+					buf[0] = '\0';
                 }
 #endif
 #endif
             } else if (opline->extended_value != 0) {
                 snprintf(buf, sizeof(buf), "%ld", opline->extended_value);
             } else {
-                snprintf(buf, sizeof(buf), "");
+				buf[0] = '\0';
             }
             add_assoc_string(el, "extended_value", buf, 1);
 
@@ -314,7 +314,7 @@
                 snprintf(buf, sizeof(buf), "$class%u", VAR_NUM(opline->op1.u.var));
             } else if ((op->ops & OP1_MASK) == OP1_UCLASS) {
                 if (opline->op1.op_type == IS_UNUSED) {
-                    snprintf(buf, sizeof(buf), "");
+					buf[0] = '\0';
                 } else {
                     snprintf(buf, sizeof(buf), "$class%u", VAR_NUM(opline->op1.u.var));
                 }
@@ -328,6 +328,7 @@
                         if (offset >= op_array->last_brk_cont) {
                             goto brk_failed;
                         }
+						jmp_to = &op_array->brk_cont_array[offset];
                         offset = jmp_to->parent;
                     } while (--level > 0);
                     snprintf(buf, sizeof(buf), "opline(%d)", jmp_to->brk);
@@ -367,7 +368,7 @@
                 } else if (opline->op1.op_type == IS_VAR) {
                     snprintf(buf, sizeof(buf), "$var%u", VAR_NUM(opline->op1.u.var));
                 } else if (opline->op1.op_type == IS_UNUSED) {
-                    snprintf(buf, sizeof(buf), "");
+					buf[0] = '\0';
                 } else {
                     snprintf(buf, sizeof(buf), "UNKNOWN NODE %d", opline->op1.op_type);
                 }
@@ -415,7 +416,7 @@
 				} else if (opline->op2.u.constant.value.lval == ZEND_REQUIRE_ONCE) {
 					snprintf(buf, sizeof(buf), "ZEND_REQUIRE_ONCE");
 				} else {
-                    snprintf(buf, sizeof(buf), "");
+					buf[0] = '\0';
 				}
 			} else if ((op->ops & OP2_MASK) == OP2_ARG) {
 			    snprintf(buf, sizeof(buf), "arg(%u)", opline->op2.u.opline_num);
@@ -425,7 +426,7 @@
 				} else if (opline->op2.u.constant.value.lval == ZEND_ISEMPTY) {
 					snprintf(buf, sizeof(buf), "ZEND_ISEMPTY");
 				} else {
-					snprintf(buf, sizeof(buf), "");
+					buf[0] = '\0';
 				}
 			} else {
                 if (opline->op2.op_type == IS_CONST) {
@@ -436,7 +437,7 @@
 				} else if (opline->op2.op_type == IS_VAR) {
 					snprintf(buf, sizeof(buf), "$var%u", VAR_NUM(opline->op2.u.var));
 				} else if (opline->op2.op_type == IS_UNUSED) {
-					snprintf(buf, sizeof(buf), "");
+					buf[0] = '\0';
 				} else {
 					snprintf(buf, sizeof(buf), "UNKNOWN NODE %d", opline->op2.op_type);
 				}
@@ -466,7 +467,7 @@
     						snprintf(buf, sizeof(buf), "$var%u", VAR_NUM(opline->result.u.var));
                         }
     				} else if (opline->result.op_type == IS_UNUSED) {
-                        snprintf(buf, sizeof(buf), "");
+						buf[0] = '\0';
     				} else {
     					snprintf(buf, sizeof(buf), "UNKNOWN NODE %d", opline->result.op_type);
     				}
@@ -485,7 +486,7 @@
     				}
     				break;
     			case RES_UNUSED:
-                    snprintf(buf, sizeof(buf), "");
+					buf[0] = '\0';
     				break;
     			default:
     				snprintf(buf, sizeof(buf), "UNKNOWN NODE %d", opline->result.op_type);
Index: ea_store.c
===================================================================
--- ea_store.c	(revision 199)
+++ ea_store.c	(working copy)
@@ -85,11 +85,14 @@
 #endif
 }
 
+
 /* Calculate the size of a point to a class entry */
+/* not used
 static void calc_class_entry_ptr(zend_class_entry ** from TSRMLS_DC)
 {
 	calc_class_entry(*from TSRMLS_CC);
 }
+*/
 #endif
 
 /* Calculate the size of an HashTable */
@@ -780,31 +783,37 @@
 {
 	zend_class_entry *from = from_ce;
 	zend_class_entry *parent = from->parent;
-	zend_property_info *pinfo, *cinfo = NULL;
-	zval **pprop = NULL;
-	zval **cprop = p->pData;
+    union {
+        zend_property_info *v;
+        void *ptr;
+    } pinfo, cinfo;
+    union {
+    	zval **v;
+        void *ptr;
+    } pprop, cprop;
 	char *mname, *cname = NULL;
 
+    cprop.v = p->pData;
 	/* Check if this is a parent class. If so, copy unconditionally */
 	if (parent) {
 		/* unpack the \0classname\0membername\0 style property name to seperate vars */
 		zend_unmangle_property_name(p->arKey, &cname, &mname);
 	
 		/* lookup the member's info in parent and child */
-		if((zend_hash_find(&parent->properties_info, mname, strlen(mname)+1, (void**)&pinfo) == SUCCESS) &&
-			(zend_hash_find(&from->properties_info, mname, strlen(mname)+1, (void**)&cinfo) == SUCCESS)) {
+		if((zend_hash_find(&parent->properties_info, mname, strlen(mname)+1, &pinfo.ptr) == SUCCESS) &&
+			(zend_hash_find(&from->properties_info, mname, strlen(mname)+1, &cinfo.ptr) == SUCCESS)) {
 			/* don't copy this static property if protected in parent and static public in child.
 			   inheritance will handle this properly on restore */
-			if(cinfo->flags & ZEND_ACC_STATIC && (pinfo->flags & ZEND_ACC_PROTECTED && cinfo->flags & ZEND_ACC_PUBLIC)) {
+			if(cinfo.v->flags & ZEND_ACC_STATIC && (pinfo.v->flags & ZEND_ACC_PROTECTED && cinfo.v->flags & ZEND_ACC_PUBLIC)) {
 				return ZEND_HASH_APPLY_REMOVE;
 			}
 			/* If the static member points to the same value in parent and child, remove for proper inheritance during restore */
 #  ifdef ZEND_ENGINE_2_1
-			if(zend_hash_quick_find(&parent->default_static_members, p->arKey, p->nKeyLength, p->h, (void**)&pprop) == SUCCESS) {
+			if(zend_hash_quick_find(&parent->default_static_members, p->arKey, p->nKeyLength, p->h, &pprop.ptr) == SUCCESS) {
 #  else
-			if(zend_hash_quick_find(parent->static_members, p->arKey, p->nKeyLength, p->h, (void**)&pprop) == SUCCESS) {
+			if(zend_hash_quick_find(parent->static_members, p->arKey, p->nKeyLength, p->h, &pprop.ptr) == SUCCESS) {
 #  endif
-				if(*pprop == *cprop) {
+				if(*pprop.v == *cprop.v) {
 					return ZEND_HASH_APPLY_REMOVE;
 				}
 			}
Index: cache.c
===================================================================
--- cache.c	(revision 199)
+++ cache.c	(working copy)
@@ -278,7 +278,8 @@
                 q->next = q;
                 hdr.crc32 = eaccelerator_crc32((const char *) q, q->size);
                 if (write(f, &hdr, sizeof(hdr)) == sizeof(hdr)) {
-                    write(f, q, q->size);
+                    ssize_t result = 0;
+                    result = write(f, q, q->size);
                     EACCELERATOR_FLOCK(f, LOCK_UN);
                     close(f);
                     ret = 1;
@@ -596,7 +597,7 @@
 {
     unsigned int i, xlen;
     zval *list;
-    char *xkey;
+    char *xkey = "";
     mm_user_cache_entry *p;
     time_t t = time(0);
 
Index: content.c
===================================================================
--- content.c	(revision 199)
+++ content.c	(working copy)
@@ -121,16 +121,19 @@
 
 static int eaccelerator_is_not_modified(zval* return_value TSRMLS_DC) {
   char  etag[256];
-  zval  **server_vars, **match;
+  union {
+    zval **v;
+    void *ptr;
+  } server_vars, match;
 
   if (!SG(headers_sent)) {
     sprintf(etag,"ETag: eaccelerator-%u",eaccelerator_crc32(Z_STRVAL_P(return_value),Z_STRLEN_P(return_value)));
     sapi_add_header(etag, strlen(etag), 1);
-    if (zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void **) &server_vars) == SUCCESS &&
-        Z_TYPE_PP(server_vars) == IS_ARRAY &&
-        zend_hash_find(Z_ARRVAL_PP(server_vars), "HTTP_IF_NONE_MATCH", sizeof("HTTP_IF_NONE_MATCH"), (void **) &match)==SUCCESS &&
-        Z_TYPE_PP(match) == IS_STRING) {
-      if (strcmp(etag+6,Z_STRVAL_PP(match)) == 0 &&
+    if (zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), &server_vars.ptr) == SUCCESS &&
+        Z_TYPE_PP(server_vars.v) == IS_ARRAY &&
+        zend_hash_find(Z_ARRVAL_PP(server_vars.v), "HTTP_IF_NONE_MATCH", sizeof("HTTP_IF_NONE_MATCH"), &match.ptr)==SUCCESS &&
+        Z_TYPE_PP(match.v) == IS_STRING) {
+      if (strcmp(etag+6,Z_STRVAL_PP(match.v)) == 0 &&
           sapi_add_header("HTTP/1.0 304", sizeof("HTTP/1.0 304") - 1, 1) == SUCCESS &&
           sapi_add_header("Status: 304 Not Modified", sizeof("Status: 304 Not Modified") - 1, 1) == SUCCESS) {
         zval_dtor(return_value);
@@ -183,17 +186,19 @@
 static int eaccelerator_get_page(const char* key, int key_len, zval* return_value TSRMLS_DC) {
   int   ret = 0;
   zval cache_array;
-  zval **headers;
-  zval **content;
+  union {
+    zval **v;
+    void *ptr;
+  } headers, content;
   if (eaccelerator_get(key, key_len, &cache_array, eaccelerator_content_cache_place TSRMLS_CC)) {
     if (Z_TYPE(cache_array) == IS_ARRAY) {
-      if (zend_hash_find(Z_ARRVAL(cache_array),"content",sizeof("content"),(void**)&content) == SUCCESS &&
-         Z_TYPE_PP(content) == IS_STRING) {
-        if (zend_hash_find(Z_ARRVAL(cache_array),"headers",sizeof("headers"),(void**)&headers) == SUCCESS &&
-           Z_TYPE_PP(headers) == IS_ARRAY) {
-          zend_hash_apply(Z_ARRVAL_PP(headers), (apply_func_t)eaccelerator_send_header TSRMLS_CC);
+      if (zend_hash_find(Z_ARRVAL(cache_array),"content",sizeof("content"),&content.ptr) == SUCCESS &&
+         Z_TYPE_PP(content.v) == IS_STRING) {
+        if (zend_hash_find(Z_ARRVAL(cache_array),"headers",sizeof("headers"),&headers.ptr) == SUCCESS &&
+           Z_TYPE_PP(headers.v) == IS_ARRAY) {
+          zend_hash_apply(Z_ARRVAL_PP(headers.v), (apply_func_t)eaccelerator_send_header TSRMLS_CC);
         }
-        memcpy(return_value,*content, sizeof(zval));
+        memcpy(return_value,*content.v, sizeof(zval));
         zval_copy_ctor(return_value);
         ret = 1;
       }
@@ -204,15 +209,18 @@
 }
 
 static void eaccelerator_compress(char* key, int key_len, zval* return_value, time_t ttl TSRMLS_DC) {
-  zval  **server_vars, **encoding;
+  union {
+    zval **v;
+    void *ptr;
+  } server_vars, encoding;
 
   if (EAG(compression_enabled) &&
       EAG(compress_content) &&
       !SG(headers_sent) &&
-      zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void **) &server_vars) == SUCCESS &&
-      Z_TYPE_PP(server_vars) == IS_ARRAY &&
-      zend_hash_find(Z_ARRVAL_PP(server_vars), "HTTP_ACCEPT_ENCODING", sizeof("HTTP_ACCEPT_ENCODING"), (void **) &encoding)==SUCCESS &&
-      Z_TYPE_PP(encoding) == IS_STRING &&
+      zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), &server_vars.ptr) == SUCCESS &&
+      Z_TYPE_PP(server_vars.v) == IS_ARRAY &&
+      zend_hash_find(Z_ARRVAL_PP(server_vars.v), "HTTP_ACCEPT_ENCODING", sizeof("HTTP_ACCEPT_ENCODING"), &encoding.ptr)==SUCCESS &&
+      Z_TYPE_PP(encoding.v) == IS_STRING &&
       Z_TYPE_P(return_value) == IS_STRING &&
       Z_STRLEN_P(return_value) >= EACCELERATOR_COMPRESS_MIN) {
     char* zkey = NULL;
@@ -234,7 +242,7 @@
       p = p->next;
     }
 
-    if (strstr(Z_STRVAL_PP(encoding),"x-gzip")) {
+    if (strstr(Z_STRVAL_PP(encoding.v),"x-gzip")) {
       zkey_len = sizeof("gzip_") + key_len - 1;
       zkey = emalloc(zkey_len+1);
       memcpy(zkey,"gzip_",sizeof("gzip_")-1);
@@ -243,7 +251,7 @@
       enc = "Content-Encoding: x-gzip";
       params[0] = return_value;
       gzip = 1;
-    } else if (strstr(Z_STRVAL_PP(encoding),"gzip")) {
+    } else if (strstr(Z_STRVAL_PP(encoding.v),"gzip")) {
       zkey_len = sizeof("gzip_") + key_len - 1;
       zkey = emalloc(zkey_len+1);
       memcpy(zkey,"gzip_",sizeof("gzip_")-1);
@@ -252,7 +260,7 @@
       enc = "Content-Encoding: gzip";
       params[0] = return_value;
       gzip = 1;
-    } else if (strstr(Z_STRVAL_PP(encoding),"deflate")) {
+    } else if (strstr(Z_STRVAL_PP(encoding.v),"deflate")) {
       zkey_len = sizeof("deflate_") + key_len - 1;
       zkey = emalloc(zkey_len+1);
       memcpy(zkey,"deflate_",sizeof("deflate_")-1);
@@ -379,7 +387,10 @@
   char* key;
   int   key_len;
   long  ttl = 0;
-  zval  **server_vars, **encoding;
+  union {
+    zval **v;
+    void *ptr;
+  } server_vars, encoding;
 
   if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
                           "s|l", &key, &key_len, &ttl) == FAILURE) {
@@ -394,26 +405,26 @@
   if (EAG(compression_enabled) &&
       EAG(compress_content) &&
       !SG(headers_sent) &&
-      zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void **) &server_vars) == SUCCESS &&
-      Z_TYPE_PP(server_vars) == IS_ARRAY &&
-      zend_hash_find(Z_ARRVAL_PP(server_vars), "HTTP_ACCEPT_ENCODING", sizeof("HTTP_ACCEPT_ENCODING"), (void **) &encoding)==SUCCESS &&
-      Z_TYPE_PP(encoding) == IS_STRING) {
+      zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), &server_vars.ptr) == SUCCESS &&
+      Z_TYPE_PP(server_vars.v) == IS_ARRAY &&
+      zend_hash_find(Z_ARRVAL_PP(server_vars.v), "HTTP_ACCEPT_ENCODING", sizeof("HTTP_ACCEPT_ENCODING"), &encoding.ptr)==SUCCESS &&
+      Z_TYPE_PP(encoding.v) == IS_STRING) {
     char* zkey = NULL;
     char* enc = NULL;
     int   zkey_len = 0;
-    if (strstr(Z_STRVAL_PP(encoding),"x-gzip")) {
+    if (strstr(Z_STRVAL_PP(encoding.v),"x-gzip")) {
       zkey_len = sizeof("gzip_") + key_len - 1;
       zkey = emalloc(zkey_len+1);
       memcpy(zkey,"gzip_",sizeof("gzip_")-1);
       memcpy(zkey+sizeof("gzip_")-1,key,key_len+1);
       enc = "Content-Encoding: x-gzip";
-    } else if (strstr(Z_STRVAL_PP(encoding),"gzip")) {
+    } else if (strstr(Z_STRVAL_PP(encoding.v),"gzip")) {
       zkey_len = sizeof("gzip_") + key_len - 1;
       zkey = emalloc(zkey_len+1);
       memcpy(zkey,"gzip_",sizeof("gzip_")-1);
       memcpy(zkey+sizeof("gzip_")-1,key,key_len+1);
       enc = "Content-Encoding: gzip";
-    } else if (strstr(Z_STRVAL_PP(encoding),"deflate")) {
+    } else if (strstr(Z_STRVAL_PP(encoding.v),"deflate")) {
       zkey_len = sizeof("deflate_") + key_len - 1;
       zkey = emalloc(zkey_len+1);
       memcpy(zkey,"deflate_",sizeof("deflate_")-1);
Index: encoder.c
===================================================================
--- encoder.c	(revision 199)
+++ encoder.c	(working copy)
@@ -249,26 +249,27 @@
       }
       allow = 1;
     } else if (allow && ch == '_') {
+      size_t result = 0;
       label[0] = ch = fgetc(yyin);
       if (ch == EOF) {break;}
       if (ch == '_') {
         label[1] = ch = fgetc(yyin);
-        if (ch == EOF) {fwrite(label,1,1,yyout); break;}
+        if (ch == EOF) {result = fwrite(label,1,1,yyout); break;}
         if (IEQ('f')) {
           label[2] = ch = fgetc(yyin);
-          if (ch == EOF) {fwrite(label,2,1,yyout); break;}
+          if (ch == EOF) {result = fwrite(label,2,1,yyout); break;}
           if (IEQ('i')) {
             label[3] = ch = fgetc(yyin);
-            if (ch == EOF) {fwrite(label,3,1,yyout); break;}
+            if (ch == EOF) {result = fwrite(label,3,1,yyout); break;}
             if (IEQ('l')) {
               label[4] = ch = fgetc(yyin);
-              if (ch == EOF) {fwrite(label,4,1,yyout); break;}
+              if (ch == EOF) {result = fwrite(label,4,1,yyout); break;}
               if (IEQ('e')) {
                 label[5] = ch = fgetc(yyin);
-                if (ch == EOF) {fwrite(label,5,1,yyout); break;}
+                if (ch == EOF) {result = fwrite(label,5,1,yyout); break;}
                 if (ch == '_') {
                   label[6] = ch = fgetc(yyin);
-                  if (ch == EOF) {fwrite(label,6,1,yyout); break;}
+                  if (ch == EOF) {result = fwrite(label,6,1,yyout); break;}
                   if (ch == '_') {
                     ch = fgetc(yyin);
                     repeat = 1;
@@ -277,40 +278,40 @@
                         (ch >= '0' && ch <= '9') ||
                         (ch >= '\x7f' && ch <= '\xff') ||
                         ch == '_') {
-                      fwrite(label,7,1,yyout);
+                      result = fwrite(label,7,1,yyout);
                     } else {
                       fputs("eaccelerator_loader_file()",yyout);
                     }
                   } else {
-                    fwrite(label,7,1,yyout);
+                    result = fwrite(label,7,1,yyout);
                   }
                 } else {
-                  fwrite(label,6,1,yyout);
+                  result = fwrite(label,6,1,yyout);
                 }
               } else {
-                fwrite(label,5,1,yyout);
+                result = fwrite(label,5,1,yyout);
               }
             } else {
-              fwrite(label,4,1,yyout);
+              result = fwrite(label,4,1,yyout);
             }
           } else {
-            fwrite(label,3,1,yyout);
+            result = fwrite(label,3,1,yyout);
           }
         } else if (IEQ('l')) {
           label[2] = ch = fgetc(yyin);
-          if (ch == EOF) {fwrite(label,2,1,yyout); break;}
+          if (ch == EOF) {result = fwrite(label,2,1,yyout); break;}
           if (IEQ('i')) {
             label[3] = ch = fgetc(yyin);
-            if (ch == EOF) {fwrite(label,3,1,yyout); break;}
+            if (ch == EOF) {result = fwrite(label,3,1,yyout); break;}
             if (IEQ('n')) {
               label[4] = ch = fgetc(yyin);
-              if (ch == EOF) {fwrite(label,4,1,yyout); break;}
+              if (ch == EOF) {result = fwrite(label,4,1,yyout); break;}
               if (IEQ('e')) {
                 label[5] = ch = fgetc(yyin);
-                if (ch == EOF) {fwrite(label,5,1,yyout); break;}
+                if (ch == EOF) {result = fwrite(label,5,1,yyout); break;}
                 if (ch == '_') {
                   label[6] = ch = fgetc(yyin);
-                  if (ch == EOF) {fwrite(label,6,1,yyout); break;}
+                  if (ch == EOF) {result = fwrite(label,6,1,yyout); break;}
                   if (ch == '_') {
                     ch = fgetc(yyin);
                     repeat = 1;
@@ -319,30 +320,30 @@
                         (ch >= '0' && ch <= '9') ||
                         (ch >= '\x7f' && ch <= '\xff') ||
                         ch == '_') {
-                      fwrite(label,7,1,yyout);
+                      result = fwrite(label,7,1,yyout);
                     } else {
                       fputs("eaccelerator_loader_line()",yyout);
                     }
                   } else {
-                    fwrite(label,7,1,yyout);
+                    result = fwrite(label,7,1,yyout);
                   }
                 } else {
-                  fwrite(label,6,1,yyout);
+                  result = fwrite(label,6,1,yyout);
                 }
               } else {
-                fwrite(label,5,1,yyout);
+                result = fwrite(label,5,1,yyout);
               }
             } else {
-              fwrite(label,4,1,yyout);
+              result = fwrite(label,4,1,yyout);
             }
           } else {
-            fwrite(label,3,1,yyout);
+            result = fwrite(label,3,1,yyout);
           }
         } else {
-          fwrite(label,2,1,yyout);
+          result = fwrite(label,2,1,yyout);
         }
       } else {
-        fwrite(label,1,1,yyout);
+        result = fwrite(label,1,1,yyout);
       }
       allow = 0;
     } else if ((ch >= 'a' && ch <= 'z') ||
@@ -694,9 +695,11 @@
 
 static void encode_class_entry(zend_class_entry* from);
 
+/* not used 
 static void encode_class_entry_ptr(zend_class_entry** from) {
   encode_class_entry(*from);
 }
+*/
 #endif
 
 static void encode_hash(HashTable* from, encode_bucket_t encode_bucket) {
@@ -718,6 +721,7 @@
   }
 }
 
+/* not used 
 #ifdef ZEND_ENGINE_2
 #define encode_zval_hash_ex(from,p) encode_hash_ex(from, p, (encode_bucket_t)encode_zval_ptr)
 
@@ -744,6 +748,7 @@
   }
 }
 #endif
+*/
 
 static void encode_op(zend_op_array* from, zend_op* opline, unsigned int ops) {
     encode(opline->opcode);
@@ -1182,11 +1187,12 @@
 				}
 				if (prefix != NULL)
 				{
+                    size_t result = 0;
 					prefix->type = IS_STRING;
 					prefix->value.str.len = pos;
 					prefix->value.str.val = emalloc(pos+1);
 					rewind(src_fp);
-					fread(prefix->value.str.val, pos, 1, src_fp);
+					result = fread(prefix->value.str.val, pos, 1, src_fp);
 					prefix->value.str.val[prefix->value.str.len] = '\000';
 				}
 			}
@@ -1203,9 +1209,10 @@
 				FILE *tmp_fp = tmpfile();
 				if (tmp_fp)
 				{
+                    size_t result = 0;
 					if (pre_content_len > 0)
 					{
-						fwrite(pre_content, pre_content_len, 1, tmp_fp);
+                        result = fwrite(pre_content, pre_content_len, 1, tmp_fp);
 					}
 #ifndef WITHOUT_FILE_FILTER
 					filter_file(src_fp, tmp_fp TSRMLS_CC);
@@ -1219,7 +1226,7 @@
 #endif
 					if (post_content_len > 0)
 					{
-						fwrite(post_content, post_content_len, 1, tmp_fp);
+						result = fwrite(post_content, post_content_len, 1, tmp_fp);
 					}
 					rewind(tmp_fp);
 					fclose(src_fp);
Index: eaccelerator.c
===================================================================
--- eaccelerator.c	(revision 199)
+++ eaccelerator.c	(working copy)
@@ -349,6 +349,7 @@
          (v3 & 0xff);
 }
 
+/* This function isn't used. So disable it for now
 static void decode_version(char *version, int v) {
   int t = (v & 0x000f00) >> 8;
   char c;
@@ -363,7 +364,8 @@
                                      (v & 0x0ff000) >> 12,
                                      c,
                                      (v & 0x0000ff));
-}
+} 
+*/
 
 #ifdef EACCELERATOR_USE_INODE
 static int eaccelerator_inode_key(char* s, dev_t dev, ino_t ino TSRMLS_DC) {
@@ -1033,6 +1035,7 @@
   return ok;
 }
 
+#ifndef EACCELERATOR_USE_INODE
 static char* eaccelerator_realpath(const char* name, char* realname TSRMLS_DC) {
 /* ???TODO it is possibe to cache name->realname mapping to avoid lstat() calls */
 #if ZEND_MODULE_API_NO >= 20001222
@@ -1041,6 +1044,7 @@
   return V_REALPATH(name, realname);
 #endif
 }
+#endif
 
 static int eaccelerator_stat(zend_file_handle *file_handle,
                         char* realname, struct stat* buf TSRMLS_DC) {
@@ -1226,7 +1230,9 @@
   int   nreloads;
   time_t compile_time;
   int stat_result = 0;
+#ifdef DEBUG
   struct timeval tv_start;
+#endif
 
 #ifdef EACCELERATOR_USE_INODE
   realname[0] = '\000';
@@ -2095,21 +2101,28 @@
 	/* Storing Host Name */
 	EAG(hostname)[0] = '\000';
 	{
-		zval  **server_vars, **hostname;
+        union {
+            zval **v;
+            void *ptr;
+        } server_vars;
+        union {
+            zval **v;
+            void *ptr;
+        } hostname;
 
-		if (zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void **) &server_vars) == SUCCESS &&
-			Z_TYPE_PP(server_vars) == IS_ARRAY &&
-			zend_hash_find(Z_ARRVAL_PP(server_vars), "SERVER_NAME", sizeof("SERVER_NAME"), (void **) &hostname)==SUCCESS &&
-			Z_TYPE_PP(hostname) == IS_STRING &&
-			Z_STRLEN_PP(hostname) > 0)
+		if (zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), &server_vars.ptr) == SUCCESS &&
+			Z_TYPE_PP(server_vars.v) == IS_ARRAY &&
+			zend_hash_find(Z_ARRVAL_PP(server_vars.v), "SERVER_NAME", sizeof("SERVER_NAME"), &hostname.ptr)==SUCCESS &&
+			Z_TYPE_PP(hostname.v) == IS_STRING &&
+			Z_STRLEN_PP(hostname.v) > 0)
 		{
-			if (sizeof(EAG(hostname)) > Z_STRLEN_PP(hostname))
+			if (sizeof(EAG(hostname)) > Z_STRLEN_PP(hostname.v))
 			{
-				memcpy(EAG(hostname),Z_STRVAL_PP(hostname),Z_STRLEN_PP(hostname)+1);
+				memcpy(EAG(hostname),Z_STRVAL_PP(hostname.v),Z_STRLEN_PP(hostname.v)+1);
 			}
 			else
 			{
-				memcpy(EAG(hostname),Z_STRVAL_PP(hostname),sizeof(EAG(hostname))-1);
+				memcpy(EAG(hostname),Z_STRVAL_PP(hostname.v),sizeof(EAG(hostname))-1);
 				EAG(hostname)[sizeof(EAG(hostname))-1] = '\000';
 			}
 		}


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Mar 2006 11:05:06 -0000	1.5
+++ .cvsignore	11 Apr 2006 16:43:01 -0000	1.6
@@ -1 +1 @@
-eaccelerator-svn200603090012.tar.gz
+eaccelerator-0.9.5-beta2.tar.bz2


Index: php-eaccelerator.spec
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/devel/php-eaccelerator.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- php-eaccelerator.spec	14 Mar 2006 12:08:27 -0000	1.10
+++ php-eaccelerator.spec	11 Apr 2006 16:43:01 -0000	1.11
@@ -1,8 +1,9 @@
 %define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4)
-%{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo 4.4.1)}
+%define php_apiver %(cd %{_tmppath}; echo PHP_API_VERSION | %{__cc} -E --include=php.h `php-config --includes` - | tail -1)
+%{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo 5.1.2)}
 
-%define module_version 0.9.3
-%define prever         svn200603090012
+%define module_version 0.9.5
+%define prever         beta2
 
 # This is the apache userid, only used for sysvipc semaphores which is the
 # default on ppc since spinlock is not detected
@@ -11,14 +12,16 @@
 Summary: PHP accelerator, optimizer, encoder and dynamic content cacher
 Name: php-eaccelerator
 Version: %{php_version}_%{module_version}
-Release: 0.3%{?dist}
+Release: 0.1.%{prever}%{?dist}
 License: GPL
 Group: Development/Languages
 URL: http://eaccelerator.sourceforge.net/
-#Source: http://dl.sf.net/eaccelerator/eaccelerator-%{module_version}.tar.gz
-Source: http://snapshots.eaccelerator.net/eaccelerator-%{prever}.tar.gz
+Source: http://dl.sf.net/eaccelerator/eaccelerator-%{module_version}-%{prever}.tar.bz2
+Patch0: eaccelerator-0.9.5-beta2-compile.patch
+Patch1: eaccelerator-0.9.5-beta2-64bit_cast_warning.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: php = %{php_version}
+Requires: php-api = %{php_apiver}
+#Requires: php = %{php_version}
 Provides: php-zend_extension
 Conflicts: php-mmcache
 BuildRequires: php, php-devel
@@ -32,22 +35,17 @@
 
 
 %prep
-#setup -n eaccelerator-%{module_version}
-%setup -n eaccelerator-%{prever}
+%setup -n eaccelerator-%{module_version}-%{prever}
+%patch0 -p0
+%patch1 -p0
 
 
 %build
 phpize
-%configure \
-%ifarch ppc
-    --with-eaccelerator-userid="%{userid}"
-%endif
-# Set fcntl based semaphores to avoid ipc based locking issues on x86_64
-%ifarch x86_64
-%{__perl} -pi -e 's|.*(MM_SEM_[A-Z]+).*|/* #undef $1 */|g' config.h
-%{__perl} -pi -e 's|.*(MM_SEM_FCNTL).*|#define $1 1|g' config.h
-%endif
-# Compile!
+%configure
+#ifarch ppc
+#   --with-eaccelerator-userid="%{userid}"
+#endif
 %{__make} %{?_smp_mflags}
 
 
@@ -97,6 +95,9 @@
 
 
 %changelog
+* Tue Apr 11 2006 Matthias Saou <http://freshrpms.net/> 5.1.2_0.9.5-0.1.beta2
+- Update to 0.9.5-beta2.
+
 * Tue Mar 14 2006 Matthias Saou <http://freshrpms.net/> 5.1.x_0.9.3-0.3
 - Pass userid 48 to configure script on PPC for sysvipc semaphores.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Mar 2006 11:05:06 -0000	1.5
+++ sources	11 Apr 2006 16:43:01 -0000	1.6
@@ -1 +1 @@
-762cb56c56190186e5e9a46b2fd2798d  eaccelerator-svn200603090012.tar.gz
+2516b680ce372765d24e7b64003f1e64  eaccelerator-0.9.5-beta2.tar.bz2



From fedora-extras-commits at redhat.com  Tue Apr 11 16:55:14 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 11 Apr 2006 09:55:14 -0700
Subject: rpms/python-fpconst - New directory
Message-ID: <200604111655.k3BGtGKV020893@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/python-fpconst
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20867/python-fpconst

Log Message:
Directory /cvs/extras/rpms/python-fpconst added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 11 16:55:15 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 11 Apr 2006 09:55:15 -0700
Subject: rpms/python-fpconst/devel - New directory
Message-ID: <200604111655.k3BGtHPs020896@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/python-fpconst/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20867/python-fpconst/devel

Log Message:
Directory /cvs/extras/rpms/python-fpconst/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 11 16:55:29 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 11 Apr 2006 09:55:29 -0700
Subject: rpms/python-fpconst Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604111655.k3BGtVdG020945@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/python-fpconst
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20912

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-fpconst


--- NEW FILE Makefile ---
# Top level Makefile for module python-fpconst
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 11 16:55:30 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 11 Apr 2006 09:55:30 -0700
Subject: rpms/python-fpconst/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604111655.k3BGtWhF020948@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/python-fpconst/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20912/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-fpconst


--- 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 Apr 11 16:55:54 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 11 Apr 2006 09:55:54 -0700
Subject: rpms/python-fpconst import.log,1.1,1.2
Message-ID: <200604111655.k3BGturO021009@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/python-fpconst
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20976

Modified Files:
	import.log 
Log Message:
auto-import python-fpconst-0.7.2-1 on branch devel from python-fpconst-0.7.2-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-fpconst/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Apr 2006 16:55:29 -0000	1.1
+++ import.log	11 Apr 2006 16:55:54 -0000	1.2
@@ -0,0 +1 @@
+python-fpconst-0_7_2-1:HEAD:python-fpconst-0.7.2-1.src.rpm:1144774546



From fedora-extras-commits at redhat.com  Tue Apr 11 16:55:54 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 11 Apr 2006 09:55:54 -0700
Subject: rpms/python-fpconst/devel python-fpconst.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604111655.k3BGtuLA021014@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/python-fpconst/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20976/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-fpconst.spec 
Log Message:
auto-import python-fpconst-0.7.2-1 on branch devel from python-fpconst-0.7.2-1.src.rpm


--- NEW FILE python-fpconst.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           python-fpconst
Version:        0.7.2
Release:        1%{?dist}
Summary:        A Python module for handling IEEE 754 floating point special values
Group:          Development/Languages
License:        Apache Software License
URL:            http://research.warnes.net/projects/RStatServer/fpconst/
Source0:        http://research.warnes.net/~warnes/fpconst/fpconst-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:   	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")

%description
This python module implements constants and functions for working with
IEEE754 double-precision special values.  It provides constants for
Not-a-Number (NaN), Positive Infinity (PosInf), and Negative Infinity
(NegInf), as well as functions to test for these values.

%prep
%setup -q -n fpconst-%{version}
chmod -x README pep-0754.txt

%build
CFLAGS="%{optflags}" %{__python} setup.py build

%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc CHANGELOG COPYING README pep-0754.txt
%{python_sitelib}/*.py
%{python_sitelib}/*.pyc
%ghost %{python_sitelib}/*.pyo

%changelog
* Sat Mar 18 2006 Christopher Stone <chris.stone at gmail.com> 0.7.2-1
- Initial Release of python-fpconst, changes from fpconst include:
- Renamed package from fpconst to python-fpconst
- Removed macros in URL
- Removed python-devel from BR
- Droped the second paragraph in %description
- Droped PKG-INFO from %doc
- Added pep-0754.txt to %doc


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-fpconst/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Apr 2006 16:55:30 -0000	1.1
+++ .cvsignore	11 Apr 2006 16:55:54 -0000	1.2
@@ -0,0 +1 @@
+fpconst-0.7.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-fpconst/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Apr 2006 16:55:30 -0000	1.1
+++ sources	11 Apr 2006 16:55:54 -0000	1.2
@@ -0,0 +1 @@
+0c194744ab60f3301dfda2da9f7c4068  fpconst-0.7.2.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 16:57:47 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 11 Apr 2006 09:57:47 -0700
Subject: rpms/php-eaccelerator/devel php-eaccelerator.spec,1.11,1.12
Message-ID: <200604111657.k3BGvn7k021065@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/php-eaccelerator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21048

Modified Files:
	php-eaccelerator.spec 
Log Message:
Additional configure parameter for ppc, required.



Index: php-eaccelerator.spec
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/devel/php-eaccelerator.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- php-eaccelerator.spec	11 Apr 2006 16:43:01 -0000	1.11
+++ php-eaccelerator.spec	11 Apr 2006 16:57:47 -0000	1.12
@@ -42,10 +42,11 @@
 
 %build
 phpize
-%configure
-#ifarch ppc
-#   --with-eaccelerator-userid="%{userid}"
-#endif
+%configure \
+%ifarch ppc
+%   --with-eaccelerator-userid="%{userid}"
+%endif
+
 %{__make} %{?_smp_mflags}
 
 



From fedora-extras-commits at redhat.com  Tue Apr 11 17:06:23 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Tue, 11 Apr 2006 10:06:23 -0700
Subject: owners owners.list,1.834,1.835
Message-ID: <200604111706.k3BH6Pms023186@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23169

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.834
retrieving revision 1.835
diff -u -r1.834 -r1.835
--- owners.list	11 Apr 2006 15:42:41 -0000	1.834
+++ owners.list	11 Apr 2006 17:06:23 -0000	1.835
@@ -1212,6 +1212,7 @@
 Fedora Extras|python-enchant|Python bindings for Enchant spellchecking library|roozbeh at farsiweb.info|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.|ivazquez at ivazquez.net|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|
 Fedora Extras|python-GeoIP|Python bindings for the GeoIP geographical lookup libraries|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-goopy|Google Python Utilities|pjones at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-HTMLgen|A class library for the generation of HTML documents|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Apr 11 17:16:07 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 11 Apr 2006 10:16:07 -0700
Subject: rpms/perl-HTML-TableExtract - New directory
Message-ID: <200604111716.k3BHG98e023296@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/perl-HTML-TableExtract
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23270/perl-HTML-TableExtract

Log Message:
Directory /cvs/extras/rpms/perl-HTML-TableExtract added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 11 17:16:07 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 11 Apr 2006 10:16:07 -0700
Subject: rpms/perl-HTML-TableExtract/devel - New directory
Message-ID: <200604111716.k3BHG95k023299@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/perl-HTML-TableExtract/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23270/perl-HTML-TableExtract/devel

Log Message:
Directory /cvs/extras/rpms/perl-HTML-TableExtract/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 11 17:16:14 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 11 Apr 2006 10:16:14 -0700
Subject: rpms/perl-HTML-TableExtract Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604111716.k3BHGHYJ023348@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/perl-HTML-TableExtract
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23315

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-HTML-TableExtract


--- NEW FILE Makefile ---
# Top level Makefile for module perl-HTML-TableExtract
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 11 17:16:15 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 11 Apr 2006 10:16:15 -0700
Subject: rpms/perl-HTML-TableExtract/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200604111716.k3BHGH9e023351@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/perl-HTML-TableExtract/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23315/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-HTML-TableExtract


--- 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 Apr 11 17:16:35 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 11 Apr 2006 10:16:35 -0700
Subject: rpms/perl-HTML-TableExtract import.log,1.1,1.2
Message-ID: <200604111717.k3BHH71u023420@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/perl-HTML-TableExtract
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23379

Modified Files:
	import.log 
Log Message:
auto-import perl-HTML-TableExtract-2.07-2 on branch devel from perl-HTML-TableExtract-2.07-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-TableExtract/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	11 Apr 2006 17:16:14 -0000	1.1
+++ import.log	11 Apr 2006 17:16:35 -0000	1.2
@@ -0,0 +1 @@
+perl-HTML-TableExtract-2_07-2:HEAD:perl-HTML-TableExtract-2.07-2.src.rpm:1144775780



From fedora-extras-commits at redhat.com  Tue Apr 11 17:16:36 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 11 Apr 2006 10:16:36 -0700
Subject: rpms/perl-HTML-TableExtract/devel perl-HTML-TableExtract.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604111717.k3BHH8e7023426@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/perl-HTML-TableExtract/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23379/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-HTML-TableExtract.spec 
Log Message:
auto-import perl-HTML-TableExtract-2.07-2 on branch devel from perl-HTML-TableExtract-2.07-2.src.rpm


--- NEW FILE perl-HTML-TableExtract.spec ---
Name:           perl-HTML-TableExtract
Version:        2.07
Release: 	2
Summary:        A Perl module for extracting content in HTML tables
Group:          Development/Libraries
License:        Artistic or GPL
URL:		http://www.mojotoad.com/sisk/projects/HTML-TableExtract/
Source0:        http://search.cpan.org/CPAN/authors/id/M/MS/MSISK/HTML-TableExtract-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildRequires:	perl(HTML::TreeBuilder) perl(Test::Pod) perl(Test::Pod::Coverage)

%description
HTML::TableExtract is a module that simplifies the extraction of
information contained in tables within HTML documents.

Tables of note may be specified using Headers, Depth, Count,
Attributes, or some combination of the three. See the module
documentation for details.

%prep
%setup -q -n HTML-TableExtract-%{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
make test

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/HTML/
%{_mandir}/man3/*.3*


%changelog
* Mon Apr 10 2006 Bill Nottingham <notting at redhat.com> - 2.07-2
- add some buildprereqs for testing

* Fri Apr  7 2006 Bill Nottingham <notting at redhat.com> - 2.07-1
- initial packaging



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-TableExtract/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Apr 2006 17:16:15 -0000	1.1
+++ .cvsignore	11 Apr 2006 17:16:36 -0000	1.2
@@ -0,0 +1 @@
+HTML-TableExtract-2.07.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-TableExtract/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Apr 2006 17:16:15 -0000	1.1
+++ sources	11 Apr 2006 17:16:36 -0000	1.2
@@ -0,0 +1 @@
+ad3ddfb3e25826071d1e52e336862438  HTML-TableExtract-2.07.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 17:17:36 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 11 Apr 2006 10:17:36 -0700
Subject: rpms/perl-Finance-Quote - New directory
Message-ID: <200604111717.k3BHHc2G023527@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/perl-Finance-Quote
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23501/perl-Finance-Quote

Log Message:
Directory /cvs/extras/rpms/perl-Finance-Quote added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 11 17:17:36 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 11 Apr 2006 10:17:36 -0700
Subject: rpms/perl-Finance-Quote/devel - New directory
Message-ID: <200604111717.k3BHHcx8023530@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/perl-Finance-Quote/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23501/perl-Finance-Quote/devel

Log Message:
Directory /cvs/extras/rpms/perl-Finance-Quote/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 11 17:17:44 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 11 Apr 2006 10:17:44 -0700
Subject: rpms/perl-Finance-Quote Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604111717.k3BHHk5Y023579@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/perl-Finance-Quote
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23546

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Finance-Quote


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Finance-Quote
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 11 17:17:44 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 11 Apr 2006 10:17:44 -0700
Subject: rpms/perl-Finance-Quote/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200604111717.k3BHHkSK023582@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/perl-Finance-Quote/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23546/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Finance-Quote


--- 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 Apr 11 17:17:58 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 11 Apr 2006 10:17:58 -0700
Subject: rpms/perl-Finance-Quote/devel perl-Finance-Quote.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604111718.k3BHI0Mq023630@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/perl-Finance-Quote/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23610/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Finance-Quote.spec 
Log Message:
auto-import perl-Finance-Quote-1.11-3 on branch devel from perl-Finance-Quote-1.11-3.src.rpm


--- NEW FILE perl-Finance-Quote.spec ---
Name:           perl-Finance-Quote
Version:        1.11
Release: 	3
Summary:        A Perl module that retrieves stock and mutual fund quotes
Group:          Development/Libraries
License:        GPL
URL:		http://finance-quote.sourceforge.net/
Source0:	http://search.cpan.org/CPAN/authors/id/P/PJ/PJF/Finance-Quote-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildRequires:	perl(HTML::TableExtract)

%description
This module retrieves stock and mutual fund quotes from various exchanges
using various source.

%prep
%setup -q -n Finance-Quote-%{version} 
find . -name *.pm | xargs %{__sed} -i -e '/^#!.*\/usr\/bin\/perl/d'

%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
make test

%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ChangeLog* Documentation/*
%{perl_vendorlib}/Finance/
%{_mandir}/man3/*.3*


%changelog
* Mon Apr 10 2006 Bill Nottingham <notting at redhat.com> - 1.11-3
- add buildreq for perl-HTML-TableExtract
- clean up sed

* Mon Apr 10 2006 Bill Nottingham <notting at redhat.com> - 1.11-2
- clean up spec file

* Fri Apr  7 2006 Bill Nottingham <notting at redhat.com> - 1.11-1
- initial packaging


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Finance-Quote/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	11 Apr 2006 17:17:44 -0000	1.1
+++ .cvsignore	11 Apr 2006 17:17:58 -0000	1.2
@@ -0,0 +1 @@
+Finance-Quote-1.11.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Finance-Quote/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	11 Apr 2006 17:17:44 -0000	1.1
+++ sources	11 Apr 2006 17:17:58 -0000	1.2
@@ -0,0 +1 @@
+1fd84f6524ca6e470272c94d8de441bd  Finance-Quote-1.11.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 17:18:28 2006
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Tue, 11 Apr 2006 10:18:28 -0700
Subject: rpms/ratpoison/FC-5 ratpoison.spec,1.3,1.4
Message-ID: <200604111718.k3BHIUnP023680@cvs-int.fedora.redhat.com>

Author: jwb

Update of /cvs/extras/rpms/ratpoison/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23663

Modified Files:
	ratpoison.spec 
Log Message:
BuildRequires fixes for FC-5



Index: ratpoison.spec
===================================================================
RCS file: /cvs/extras/rpms/ratpoison/FC-5/ratpoison.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ratpoison.spec	9 Apr 2006 17:55:29 -0000	1.3
+++ ratpoison.spec	11 Apr 2006 17:18:28 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           ratpoison
 Version:        1.4.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Minimalistic window manager
 Group:          Applications/Productivity
 License:        GPL
@@ -10,10 +10,10 @@
 Source0:        http://savannah.nongnu.org/download/ratpoison/%{name}-%{version}.tar.gz
 Source1:	%{name}.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if %{fedora} <= 4 
+%if "%{fedora}" <= "4" 
 BuildRequires:  xorg-x11-devel, readline-devel
 %else
-BuildRequires: libX11-devel, readline-devel, libXtst-devel
+BuildRequires: libX11-devel, readline-devel, libXt-devel, libXinerama-devel, libXtst-devel
 %endif
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -66,6 +66,9 @@
 %{_datadir}/xsessions/ratpoison.desktop
 
 %changelog
+* Tue Apr 11 2006 John Berninger <johnw at berningeronline dot net> - 1.4.0-4
+- BuildRequires fixes for FC-5
+
 * Sat Apr  8 2006 John Berninger <johnw at berningeronline dot net> - 1.4.0-3
 - Permissions fixes
 



From fedora-extras-commits at redhat.com  Tue Apr 11 17:21:41 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Tue, 11 Apr 2006 10:21:41 -0700
Subject: owners owners.list,1.835,1.836
Message-ID: <200604111721.k3BHLh9a023747@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23730

Modified Files:
	owners.list 
Log Message:

Changed gonvert to reflect change of ownership
 	owners.list 



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.835
retrieving revision 1.836
diff -u -r1.835 -r1.836
--- owners.list	11 Apr 2006 17:06:23 -0000	1.835
+++ owners.list	11 Apr 2006 17:21:41 -0000	1.836
@@ -384,7 +384,7 @@
 Fedora Extras|gnupg2|GNU utility for secure communication and data storage|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|gobby|A free collaborative editor|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|goffice|Goffice support libraries|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
-Fedora Extras|gonvert|Units conversion utility|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|gonvert|Units conversion utility|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|gossip|Gnome Jabber Client|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|gourmet|PyGTK Recipe Manager|mpeters at mac.com|extras-qa at fedoraproject.org|
 Fedora Extras|gpa|Graphical user interface for GnuPG|rdieter at math.unl.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Apr 11 17:26:59 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 11 Apr 2006 10:26:59 -0700
Subject: rpms/libtunepimp/FC-4 .cvsignore,1.2,1.3 libtunepimp.spec,1.4,1.5
Message-ID: <200604111727.k3BHR1LF023824@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libtunepimp/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23805

Modified Files:
	.cvsignore libtunepimp.spec 
Log Message:
cosmetic changes (sync'd with -devel branch)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Nov 2005 19:14:31 -0000	1.2
+++ .cvsignore	11 Apr 2006 17:26:59 -0000	1.3
@@ -1 +1 @@
-libtunepimp-0.4.0.tar.gz
+libtunepimp-0.4.2.tar.gz


Index: libtunepimp.spec
===================================================================
RCS file: /cvs/extras/rpms/libtunepimp/FC-4/libtunepimp.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libtunepimp.spec	16 Mar 2006 18:08:47 -0000	1.4
+++ libtunepimp.spec	11 Apr 2006 17:26:59 -0000	1.5
@@ -11,8 +11,6 @@
 Source:	 http://ftp.musicbrainz.org/pub/musicbrainz/libtunepimp-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-#Patch1:  libtunepimp-0.4.0-gcc41.patch
-
 BuildRequires: readline-devel
 BuildRequires: libvorbis-devel
 BuildRequires: flac-devel
@@ -43,8 +41,6 @@
 %prep
 %setup -q
 
-#patch1 -p1 -b .gcc41
-
 
 %build
 %configure \



From fedora-extras-commits at redhat.com  Tue Apr 11 17:29:16 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 11 Apr 2006 10:29:16 -0700
Subject: owners owners.list,1.836,1.837
Message-ID: <200604111729.k3BHTI93023852@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23835

Modified Files:
	owners.list 
Log Message:
add perl-Finance-Quote, perl-HTML-TableExtract



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.836
retrieving revision 1.837
diff -u -r1.836 -r1.837
--- owners.list	11 Apr 2006 17:21:41 -0000	1.836
+++ owners.list	11 Apr 2006 17:29:15 -0000	1.837
@@ -942,6 +942,7 @@
 Fedora Extras|perl-File-Remove|Convenience module for removing files and directories|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Slurp|Efficient Reading/Writing of Complete Files|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Tail|Perl extension for reading from continously updated files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Finanace-Quote|A Perl module that retrieves stock and mutual fund quotes|notting at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Font-AFM|Perl interface to Adobe Font Metrics files|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Font-TTF|Perl interface to TrueType Font files|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-FreezeThaw|Convert Perl structures to strings and back|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -959,6 +960,7 @@
 Fedora Extras|perl-HTML-Format|HTML formatter modules|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Mason|HTML::Mason Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 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-Expr|Expression support extension for HTML::Template|ville.skytta at iki.fi|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-Tree|HTML tree handling modules for Perl|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Apr 11 17:32:49 2006
From: fedora-extras-commits at redhat.com (John Berninger (jwb))
Date: Tue, 11 Apr 2006 10:32:49 -0700
Subject: rpms/ratpoison/devel ratpoison.spec,1.3,1.4
Message-ID: <200604111732.k3BHWpIW023931@cvs-int.fedora.redhat.com>

Author: jwb

Update of /cvs/extras/rpms/ratpoison/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23914

Modified Files:
	ratpoison.spec 
Log Message:
BuildRequires fixes for FC-devel (FC-6)



Index: ratpoison.spec
===================================================================
RCS file: /cvs/extras/rpms/ratpoison/devel/ratpoison.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ratpoison.spec	9 Apr 2006 17:55:29 -0000	1.3
+++ ratpoison.spec	11 Apr 2006 17:32:49 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           ratpoison
 Version:        1.4.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Minimalistic window manager
 Group:          Applications/Productivity
 License:        GPL
@@ -13,7 +13,7 @@
 %if %{fedora} <= 4 
 BuildRequires:  xorg-x11-devel, readline-devel
 %else
-BuildRequires: libX11-devel, readline-devel, libXtst-devel
+BuildRequires: libX11-devel, readline-devel, libXt-devel, libXinerama-devel, libXtst-devel
 %endif
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -66,6 +66,9 @@
 %{_datadir}/xsessions/ratpoison.desktop
 
 %changelog
+* Tue Apr 11 2006 John Berninger <johnw at berningeronline dot net> - 1.4.0-4
+- BuildRequires fixes for FC-devel (FC-6)
+
 * Sat Apr  8 2006 John Berninger <johnw at berningeronline dot net> - 1.4.0-3
 - Permissions fixes
 



From fedora-extras-commits at redhat.com  Tue Apr 11 17:40:31 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 10:40:31 -0700
Subject: rpms/xfce4-clipman-plugin/FC-3 xfce4-clipman-plugin.spec,1.1,1.2
Message-ID: <200604111740.k3BHeXCW024005@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-clipman-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23988

Modified Files:
	xfce4-clipman-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-clipman-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-clipman-plugin/FC-3/xfce4-clipman-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-clipman-plugin.spec	16 Dec 2005 04:32:10 -0000	1.1
+++ xfce4-clipman-plugin.spec	11 Apr 2006 17:40:31 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-clipman-plugin
 Version:	0.4.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Clipboard manager plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 This is a simple cliboard history for Xfce panel. It includes a "Clear 
@@ -36,6 +37,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 17:42:18 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 10:42:18 -0700
Subject: rpms/xfce4-cpugraph-plugin/FC-3 xfce4-cpugraph-plugin.spec,1.1,1.2
Message-ID: <200604111742.k3BHgKEm024037@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-cpugraph-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24020

Modified Files:
	xfce4-cpugraph-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-cpugraph-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-cpugraph-plugin/FC-3/xfce4-cpugraph-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-cpugraph-plugin.spec	9 Dec 2005 22:52:48 -0000	1.1
+++ xfce4-cpugraph-plugin.spec	11 Apr 2006 17:42:17 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-cpugraph-plugin
 Version:	0.2.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	CPU monitor for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A CPU monitor plugin for the Xfce panel. It offers multiple display modes 
@@ -37,6 +38,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.2.2-5
+- Require xfce4-panel.
+
 * Mon Nov 28 2005 Christoph Wickert <fedora wickert at arcor de> - 0.2.2-4
 - Rebuild with new source because of md5sum mismatch.
 - Add libxfcegui4-devel BuildReqs.



From fedora-extras-commits at redhat.com  Tue Apr 11 17:43:52 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 10:43:52 -0700
Subject: rpms/xfce4-datetime-plugin/FC-3 xfce4-datetime-plugin.spec,1.2,1.3
Message-ID: <200604111743.k3BHhseL024077@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-datetime-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24060

Modified Files:
	xfce4-datetime-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-datetime-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-datetime-plugin/FC-3/xfce4-datetime-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-datetime-plugin.spec	9 Dec 2005 23:00:51 -0000	1.2
+++ xfce4-datetime-plugin.spec	11 Apr 2006 17:43:52 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-datetime-plugin
 Version:	0.3.1
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Date/time plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel  >= 4.2
 BuildRequires:	libxml2-devel, gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 An alternative clock plugin for the Xfce panel. A calendar appears when you 
@@ -38,6 +39,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-6
+- Require xfce4-panel.
+
 * Tue Nov 29 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.1-5
 - Add libxfcegui4-devel BuildReqs.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 17:45:19 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 10:45:19 -0700
Subject: rpms/xfce4-diskperf-plugin/FC-3 xfce4-diskperf-plugin.spec,1.1,1.2
Message-ID: <200604111745.k3BHjLju024112@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-diskperf-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24095

Modified Files:
	xfce4-diskperf-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-diskperf-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-diskperf-plugin/FC-3/xfce4-diskperf-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-diskperf-plugin.spec	28 Jan 2006 00:21:04 -0000	1.1
+++ xfce4-diskperf-plugin.spec	11 Apr 2006 17:45:19 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-diskperf-plugin
 Version:	1.5
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Disk performance plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 The DiskPerf plugin displays disk/partition performance (bytes transfered per
@@ -36,6 +37,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 1.5-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 1.5-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 17:47:15 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 10:47:15 -0700
Subject: rpms/xfce4-fsguard-plugin/FC-3 xfce4-fsguard-plugin.spec,1.1,1.2
Message-ID: <200604111747.k3BHlHU7024142@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-fsguard-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24125

Modified Files:
	xfce4-fsguard-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-fsguard-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-fsguard-plugin/FC-3/xfce4-fsguard-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-fsguard-plugin.spec	22 Jan 2006 23:36:42 -0000	1.1
+++ xfce4-fsguard-plugin.spec	11 Apr 2006 17:47:15 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-fsguard-plugin
 Version:	0.2.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Filesystem-Guard plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 A little Xfce plugin, which checks the free space on the chosen mountpoint 
@@ -40,6 +41,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.2.1-3
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.2.1-2
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 17:48:12 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 10:48:12 -0700
Subject: rpms/xfce4-genmon-plugin/FC-3 xfce4-genmon-plugin.spec,1.1,1.2
Message-ID: <200604111748.k3BHmEV6024187@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-genmon-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24170

Modified Files:
	xfce4-genmon-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-genmon-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-genmon-plugin/FC-3/xfce4-genmon-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-genmon-plugin.spec	9 Dec 2005 22:38:04 -0000	1.1
+++ xfce4-genmon-plugin.spec	11 Apr 2006 17:48:12 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-genmon-plugin
 Version:	1.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Generic monitor plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 The GenMon plugin cyclically spawns the indicated script/program,
@@ -36,6 +37,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 1.1-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 1.1-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 17:49:47 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 10:49:47 -0700
Subject: rpms/xfce4-minicmd-plugin/FC-3 xfce4-minicmd-plugin.spec,1.1,1.2
Message-ID: <200604111749.k3BHnnEj024215@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-minicmd-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24198

Modified Files:
	xfce4-minicmd-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-minicmd-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-minicmd-plugin/FC-3/xfce4-minicmd-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-minicmd-plugin.spec	15 Dec 2005 03:53:18 -0000	1.1
+++ xfce4-minicmd-plugin.spec	11 Apr 2006 17:49:47 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-minicmd-plugin
 Version:	0.3.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Mini command-line plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A mini command-line plugin for the Xfce panel. You can execute programs by 
@@ -38,6 +39,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 17:50:35 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 10:50:35 -0700
Subject: rpms/xfce4-modemlights-plugin/FC-3 xfce4-modemlights-plugin.spec,
	1.1, 1.2
Message-ID: <200604111750.k3BHobmi024243@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-modemlights-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24226

Modified Files:
	xfce4-modemlights-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-modemlights-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-modemlights-plugin/FC-3/xfce4-modemlights-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-modemlights-plugin.spec	15 Dec 2005 03:49:55 -0000	1.1
+++ xfce4-modemlights-plugin.spec	11 Apr 2006 17:50:35 -0000	1.2
@@ -1,6 +1,6 @@
 Name: 		xfce4-modemlights-plugin
 Version: 	0.1.1
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Summary: 	Modemlights for the XFCE panel
 
 Group: 		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A Xfce4 panel applet intended to simplify establishing a ppp connection via 
@@ -38,6 +39,9 @@
 %{_datadir}/xfce4/*
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.1.1-4
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.1.1-3
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 17:51:40 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 11 Apr 2006 10:51:40 -0700
Subject: rpms/Macaulay2/devel Macaulay2-0.9.8-cout.patch, NONE,
	1.1 Macaulay2-0.9.8-gcc4.patch, NONE,
	1.1 Macaulay2-0.9.8-htmlview.patch, NONE,
	1.1 Macaulay2-0.9.8-infodir.patch, NONE,
	1.1 Macaulay2-0.9.8-optflags.patch, NONE, 1.1 etags.sh, NONE,
	1.1 Macaulay2.desktop, 1.2, 1.3 Macaulay2.spec, 1.12,
	1.13 Macaulay2-0.9-htmlview.patch, 1.1,
	NONE Macaulay2-0.9-optimize.patch, 1.1,
	NONE Macaulay2-0.9.2-gcc3.patch, 1.1,
	NONE Macaulay2-0.9.2-gcc34.patch, 1.1,
	NONE Macaulay2-0.9.2-gcc4.patch, 1.1,
	NONE Macaulay2-0.9.2-static.patch, 1.1, NONE
Message-ID: <200604111751.k3BHpgg9024294@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/Macaulay2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24259

Modified Files:
	Macaulay2.desktop Macaulay2.spec 
Added Files:
	Macaulay2-0.9.8-cout.patch Macaulay2-0.9.8-gcc4.patch 
	Macaulay2-0.9.8-htmlview.patch Macaulay2-0.9.8-infodir.patch 
	Macaulay2-0.9.8-optflags.patch etags.sh 
Removed Files:
	Macaulay2-0.9-htmlview.patch Macaulay2-0.9-optimize.patch 
	Macaulay2-0.9.2-gcc3.patch Macaulay2-0.9.2-gcc34.patch 
	Macaulay2-0.9.2-gcc4.patch Macaulay2-0.9.2-static.patch 
Log Message:
* Tue Mar 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.8-0.2.cvs20060327
- 0.9.8 (cvs, no tarball yet)
- drop -doc subpkg (in main now)


Macaulay2-0.9.8-cout.patch:

--- NEW FILE Macaulay2-0.9.8-cout.patch ---
--- M2/Macaulay2/e/x_factor.cpp.std_namespace	2005-08-31 08:28:45.000000000 -0500
+++ M2/Macaulay2/e/x_factor.cpp	2006-02-10 13:24:34.000000000 -0600
@@ -31,10 +31,11 @@
 
 // debugging display routines to be called from gdb
 // needs factory to be configured without option --disable-streamio 
-void showvar(Variable &t) { cout << t << endl; }
-void showcf(CanonicalForm &t) { cout << t << endl; }
-void showcfl(CFList &t) { cout << t << endl; }
-void showcffl(CFFList &t) { cout << t << endl; }
+//using namespace std;
+//void showvar(Variable &t) { cout << t << endl; }
+//void showcf(CanonicalForm &t) { cout << t << endl; }
+//void showcfl(CFList &t) { cout << t << endl; }
+//void showcffl(CFFList &t) { cout << t << endl; }
 
 extern "C" {
   extern void factory_setup_2();

Macaulay2-0.9.8-gcc4.patch:

--- NEW FILE Macaulay2-0.9.8-gcc4.patch ---
--- M2/Macaulay2/e/linalgGB/MonomialSet.hpp.gcc4	2006-04-10 13:22:14.000000000 -0500
+++ M2/Macaulay2/e/linalgGB/MonomialSet.hpp	2006-04-10 13:22:32.000000000 -0500
@@ -16,7 +16,7 @@
   };
   
  public:
-  MonomialSet::MonomialSet();
+  MonomialSet();
   
   static MonomialSet *make();
 
--- M2/Macaulay2/e/Eschreyer.hpp.gcc4	2006-04-10 13:28:44.000000000 -0500
+++ M2/Macaulay2/e/Eschreyer.hpp	2006-04-10 13:29:02.000000000 -0500
@@ -53,7 +53,7 @@
   int find_divisor(const MonomialIdeal * mi, const int *exponents, int &result);
   // Returns the index of the least element in the monomial order which divides.
 
-  void GBKernelComputation::wipe_unneeded_terms(gbvector * & f);
+  void wipe_unneeded_terms(gbvector * & f);
   // removes every term of f which is not a lead term of some element of gb.
 
   gbvector * s_pair(gbvector * syz);
--- M2/Macaulay2/e/x_factor.cpp.gcc4	2006-04-10 13:35:25.000000000 -0500
+++ M2/Macaulay2/e/x_factor.cpp	2006-04-10 13:35:47.000000000 -0500
@@ -56,8 +56,8 @@
     __gmp_reallocate_func = save_gmp_reallocate_func;
     __gmp_free_func = save_gmp_free_func;
   }
-  enter_factory:: enter_factory() { enter(); }
-  enter_factory::~enter_factory() { exit(); }
+  enter_factory() { enter(); }
+  ~enter_factory() { exit(); }
 };
 
 struct enter_M2 { 
@@ -75,8 +75,8 @@
     __gmp_reallocate_func = save_gmp_reallocate_func;
     __gmp_free_func = save_gmp_free_func;
   }
-  enter_M2:: enter_M2() { enter(); }
-  enter_M2::~enter_M2() { exit(); }
+  enter_M2() { enter(); }
+  ~enter_M2() { exit(); }
 };
 
 static MP_INT toInteger(CanonicalForm h) {
--- M2/Macaulay2/e/mat-symm.cpp.gcc4	2006-04-10 13:34:41.000000000 -0500
+++ M2/Macaulay2/e/mat-symm.cpp	2006-04-10 13:34:54.000000000 -0500
@@ -4,7 +4,7 @@
 class SymmMatrix
 {
 public:
-  static MatrixOrNull * SymmMatrix::symmetricPower(const Matrix *m0, int p)
+  static MatrixOrNull * symmetricPower(const Matrix *m0, int p)
   {
     if (m0->n_rows() != 1)
       {
--- M2/Macaulay2/c/compat.h.gcc4	2003-11-12 08:22:54.000000000 -0600
+++ M2/Macaulay2/c/compat.h	2006-04-10 13:27:34.000000000 -0500
@@ -99,7 +99,11 @@
 int open(const char *, int, ...);
 #endif
 
-#ifdef __STDC__
+/* ifdef __STDC__ */
+/* the following doesn't compile on linux w/gcc-4.x, so 
+   maybe use some sun-specific define instead?  -- Rex
+*/
+#if 0
 int close(int);
 int fputs(const char *,FILE *); /* needed  for sunos 4.1 */
 int fprintf(FILE *,const char *,...); /* needed  for sunos 4.1 */

Macaulay2-0.9.8-htmlview.patch:

--- NEW FILE Macaulay2-0.9.8-htmlview.patch ---
--- M2/Macaulay2/bin/M2-help.htmlview	2005-03-13 20:00:26.000000000 -0600
+++ M2/Macaulay2/bin/M2-help	2006-03-28 08:50:07.000000000 -0600
@@ -1,2 +1,2 @@
 #! /bin/sh
-${WWBROWSER:-firefox} "$HOME/.Macaulay2/index.html"
+${WWBROWSER:-htmlview} "$HOME/.Macaulay2/index.html"

Macaulay2-0.9.8-infodir.patch:

--- NEW FILE Macaulay2-0.9.8-infodir.patch ---
--- M2/include/config.Makefile.in.infodir	2006-03-27 13:47:11.000000000 -0600
+++ M2/include/config.Makefile.in	2006-03-28 07:50:32.000000000 -0600
@@ -88,8 +88,8 @@
 
 binRelDir = bin
 libRelDir = lib
-infoRelDir = info
 dataRelDir = share
+infoRelDir = $(dataRelDir)/info
 manRelDir = $(dataRelDir)/man
 man1RelDir = $(manRelDir)/man1
 man3RelDir = $(manRelDir)/man3

Macaulay2-0.9.8-optflags.patch:

--- NEW FILE Macaulay2-0.9.8-optflags.patch ---
--- Macaulay2-0.9/include/config.Makefile.in_orig	Sun Sep  9 09:55:36 2001
+++ Macaulay2-0.9/include/config.Makefile.in	Mon Oct 29 11:01:53 2001
@@ -110,8 +110,8 @@
 CFLAGS   += -O3 -fexpensive-optimizations
 CXXFLAGS += -O3 -fexpensive-optimizations
 else
-CFLAGS   += -O0
-CXXFLAGS += -O0
+CFLAGS   +=
+CXXFLAGS += 
 endif
 endif
 


--- NEW FILE etags.sh ---
#!/bin/sh

for ETAGS in etags.emacs etags ; do
 test -x /usr/bin/$ETAGS && exec $ETAGS ${1+"$@"}
done

exit 1


Index: Macaulay2.desktop
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/devel/Macaulay2.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Macaulay2.desktop	31 Mar 2006 13:00:38 -0000	1.2
+++ Macaulay2.desktop	11 Apr 2006 17:51:40 -0000	1.3
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Macaulay2
 Exec=M2
-Icon=Macaulay2.png
+Icon=Macaulay2
 SwallowTitle=Macaulay2
 Terminal=true
 Type=Application


Index: Macaulay2.spec
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/devel/Macaulay2.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Macaulay2.spec	10 Apr 2006 14:44:05 -0000	1.12
+++ Macaulay2.spec	11 Apr 2006 17:51:40 -0000	1.13
@@ -1,95 +1,98 @@
-# busted on x86_64 -- Rex
-# define m2home %{_libdir}/%{name}-%{version}
-# Makefiles hardcode "%prefix/lib" instead, ok?  -- Rex
-%define m2home %{_prefix}/lib/%{name}-%{version}
+
+%define beta cvs20060327
  
 Summary: System for algebraic geometry and commutative algebra
 Name:    Macaulay2
-Version: 0.9.2
-Release: 22%{?dist}
+Version: 0.9.8
+Release: 0.2.%{beta}%{?dist}
+
 License: GPL
 Group:   Applications/Engineering
 URL:     http://www.math.uiuc.edu/Macaulay2/
-Source:  http://www.math.uiuc.edu/Macaulay2/ftp-site/Macaulay2-0.9.2-src.tar.gz
+#Source:  http://www.math.uiuc.edu/Macaulay2/ftp-site/Macaulay2-0.9.5.beta.tar.gz
+Source:	 M2-0.9.8-%{beta}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1: Macaulay2.png
 Source2: Macaulay2.desktop
 
-Patch0: Macaulay2-0.9-optimize.patch
-Patch1: Macaulay2-0.9-htmlview.patch
-Patch2: Macaulay2-0.9.2-static.patch
-Patch3: Macaulay2-0.9.2-gcc3.patch
-Patch4: Macaulay2-0.9.2-gcc34.patch
-Patch5: Macaulay2-0.9.2-gcc4.patch
+Patch0: Macaulay2-0.9.8-optflags.patch
+Patch1: Macaulay2-0.9.8-htmlview.patch
+Patch2: Macaulay2-0.9.8-cout.patch
+Patch3: Macaulay2-0.9.8-infodir.patch
+Patch4: Macaulay2-0.9.8-gcc4.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: gc-devel
-BuildRequires: factory-devel >= 2.0.5
-BuildRequires: libfac-devel >= 2.0.5
+# See http://bugzilla.redhat.com/bugzilla/188499
+BuildRequires: ntl-devel
+BuildRequires: factory-devel 
+BuildRequires: libfac-devel 
+BuildRequires: lapack
+%if "%{?fedora}" > "3"
+BuildRequires: lapack-devel
+%endif
 BuildRequires: gdbm-devel
+BuildRequires: readline-devel
 BuildRequires: time
-#BuildRequires: lapack-devel
+BuildRequires: byacc 
+# /sbin/install-info
+BuildRequires: info
+# etags
+BuildRequires: emacs-common
+Source10: etags.sh
+# M2-help
+Requires: htmlview
+
+BuildRequires: automake
 
-Obsoletes: %{name}-emacs < %{version}-%{release}
-Provides:  %{name}-emacs = %{version}-%{release}
+Obsoletes: Macaulay2-docs < %{version}-%{release} 
+Provides:  Macaulay2-docs = %{version}-%{release}
+Obsoletes: Macaulay2-emacs < %{version}-%{release}
+Provides:  Macaulay2-emacs = %{version}-%{release}
 
 %description
 Macaulay 2 is a new software system devoted to supporting research in
 algebraic geometry and commutative algebra written by Daniel R. Grayson
 and Michael E. Stillman
 
-%package doc
-Summary: %{name} documentation
-Group: Documentation
-Requires: %{name} = %{version}
-Requires: htmlview
-%description doc
-%{name} documentation.
-
 
 %prep
-%setup -q
+%setup -q -n M2
 
-%patch0 -p1 -b .opt
+install -m755 %{SOURCE10} ./etags
+
+%patch0 -p1 -b .optflags
 %patch1 -p1 -b .htmlview
-%patch2 -p1 -b .static
-# fix gcc3 blocker, some warnings about use of deprecated headers
-%patch3 -p1 -b .gcc3
-# fc3/gcc34 fix
-%patch4 -p1 -b .gcc34
-# fc4/gcc4 fix
-%patch5 -p1 -b .gcc4
+%patch2 -p1 -b .cout
+%patch3 -p1 -b .infodir
+%patch4 -p1 -b .gcc4
 
 
 %build
 
+# We need /sbin:. in PATH to find install-info,etags
+export PATH=/sbin:`pwd`:$PATH
+
 %configure  \
   --disable-dumpdata \
-  --disable-optimize 
-
-#TODO: --with-lapacklibs 
+  --disable-optimize \
+  --disable-static \
+  --with-lapacklibs="-llapack"
 
+# Not smp-safe
 make 
 
 
 %check || :
-# NOTE: util/screen dies on fc5/buildsystem (could not open pty)
-#make check ||:
+# util/screen dies on fc5/buildsystem (could not open pty)
+#make -k check ||:
 
 
 %install
-%makeinstall
+rm -rf $RPM_BUILD_ROOT
 
-# Fix locations
-sed -i -e "s at M2HOME=.*@M2HOME=%{m2home}@" $RPM_BUILD_ROOT%{_bindir}/M2
-sed -i -e "s at M2HOME=.*@M2HOME=%{m2home}@" $RPM_BUILD_ROOT%{_bindir}/M2-help
-sed -i -e "s@$RPM_BUILD_ROOT@@g" $RPM_BUILD_ROOT%{m2home}/emacs/*
-
-## emacs files
-install -d $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp
-cp -alf $RPM_BUILD_ROOT%{m2home}/emacs/*.el \
-        $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/
+make install prefix=$RPM_BUILD_ROOT%{_prefix}
 
 # app img
 install -p -m644 -D %{SOURCE1} \
@@ -103,25 +106,12 @@
   %{SOURCE2}
 
 ## Unpackaged files
-rm -f $RPM_BUILD_ROOT%{m2home}/setup
-# %doc stuff, no need to dup in appdir
-rm -f $RPM_BUILD_ROOT%{m2home}/{README,CHANGES,COPYING}
-# created by make check
-find $RPM_BUILD_ROOT%{m2home} \( -name test.out -o -name test.out*.trim \) -exec rm -v {} \;
-# .cvsignore
-find $RPM_BUILD_ROOT%{m2home} -name .cvsignore -exec rm -v {} \;
-# unuseful files outside of build environment
-find  $RPM_BUILD_ROOT%{m2home}/packages -name "Makefile*" -exec rm -v {} \;
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
-#preun
-# Handle possibly existing dumpdata
-#rm -f %{m2home}/libexec/Macaulay2-*-data ||:
-
 %post
 touch --no-create %{_datadir}/icons/hicolor ||:
 gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
@@ -133,32 +123,26 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Macaulay2/README Macaulay2/CHANGES
+%doc Macaulay2/README Macaulay2/CHANGES Macaulay2/COPYING
 %{_bindir}/M2
+%{_bindir}/M2-emacs
+%{_bindir}/M2-help
+%{_bindir}/M2-load-libs
+%{_datadir}/Macaulay2/
+%{_datadir}/emacs/
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/*/*
-%dir %{m2home}
-%{m2home}/cache/
-%{m2home}/libexec/
-%{m2home}/m2/
-%{m2home}/packages/
-# emacs bits
-%{m2home}/emacs/
-%{_datadir}/emacs/site-lisp/
-
-%files doc
-%defattr(-,root,root,-)
-%{_bindir}/M2-help
-%{m2home}/html/
-%{m2home}/tutorial/
+# FIXME
+%{_docdir}/Macaulay2
+%{_infodir}/*
+%{_mandir}/man1/M2.1*
+%{_mandir}/man1/M2-help.1*
 
 
 %changelog
-* Mon Apr 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.2-22
-- fix icon location (#188384)
-
-* Thu Mar 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.2-21
-- *really* disable %%check (fails on fc5+ anyway) 
+* Tue Mar 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.8-0.2.cvs20060327
+- 0.9.8 (cvs, no tarball yet)
+- drop -doc subpkg (in main now)
 
 * Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.2-20
 - .desktop: drop Category=Development


--- Macaulay2-0.9-htmlview.patch DELETED ---


--- Macaulay2-0.9-optimize.patch DELETED ---


--- Macaulay2-0.9.2-gcc3.patch DELETED ---


--- Macaulay2-0.9.2-gcc34.patch DELETED ---


--- Macaulay2-0.9.2-gcc4.patch DELETED ---


--- Macaulay2-0.9.2-static.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 11 17:52:42 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 11 Apr 2006 10:52:42 -0700
Subject: rpms/Macaulay2/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200604111752.k3BHqi3q024332@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/Macaulay2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24307

Modified Files:
	.cvsignore sources 
Log Message:
update sources to 0.9.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Dec 2004 16:15:35 -0000	1.2
+++ .cvsignore	11 Apr 2006 17:52:42 -0000	1.3
@@ -1 +1 @@
-Macaulay2-0.9.2-src.tar.gz
+M2-0.9.8-cvs20060327.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Dec 2004 16:15:35 -0000	1.2
+++ sources	11 Apr 2006 17:52:42 -0000	1.3
@@ -1 +1 @@
-f2181baccdb9bbe75c4f6ee61f782533  Macaulay2-0.9.2-src.tar.gz
+b215fc27d49332879d0641cbcf5cba55  M2-0.9.8-cvs20060327.tar.bz2



From fedora-extras-commits at redhat.com  Tue Apr 11 17:55:07 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 10:55:07 -0700
Subject: rpms/xfce4-mount-plugin/FC-3 xfce4-mount-plugin.spec,1.2,1.3
Message-ID: <200604111755.k3BHt90v024428@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-mount-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24411

Modified Files:
	xfce4-mount-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-mount-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mount-plugin/FC-3/xfce4-mount-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-mount-plugin.spec	21 Jan 2006 22:24:09 -0000	1.2
+++ xfce4-mount-plugin.spec	11 Apr 2006 17:55:07 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-mount-plugin
 Version:	0.3.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Mount/unmount utility for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 Mount and unmount filesystems from the Xfce panel.
@@ -36,8 +37,11 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-2
+- Require xfce4-panel.
+
 * Sat Jan 21 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-1
-- Updat to 0.3.3.
+- Update to 0.3.3.
 
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.2-3
 - Add libxfcegui4-devel BuildReqs.



From fedora-extras-commits at redhat.com  Tue Apr 11 17:55:39 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 11 Apr 2006 10:55:39 -0700
Subject: rpms/Macaulay2/devel Macaulay2.spec,1.13,1.14
Message-ID: <200604111755.k3BHtfR0024456@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/Macaulay2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24439

Modified Files:
	Macaulay2.spec 
Log Message:
replace omitted changelog entries



Index: Macaulay2.spec
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/devel/Macaulay2.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- Macaulay2.spec	11 Apr 2006 17:51:40 -0000	1.13
+++ Macaulay2.spec	11 Apr 2006 17:55:39 -0000	1.14
@@ -144,6 +144,12 @@
 - 0.9.8 (cvs, no tarball yet)
 - drop -doc subpkg (in main now)
 
+* Mon Apr 10 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.2-22
+- fix icon location (#188384)
+
+* Thu Mar 30 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.2-21
+- really disable %%check (fails on fc5+ anyway) 
+
 * Fri Jan 20 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.2-20
 - .desktop: drop Category=Development
 - app icon: follow icon spec



From fedora-extras-commits at redhat.com  Tue Apr 11 17:55:53 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 10:55:53 -0700
Subject: rpms/xfce4-mount-plugin/FC-4 xfce4-mount-plugin.spec,1.3,1.4
Message-ID: <200604111755.k3BHttP5024479@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-mount-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24462

Modified Files:
	xfce4-mount-plugin.spec 
Log Message:
fix typo in changelog


Index: xfce4-mount-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mount-plugin/FC-4/xfce4-mount-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-mount-plugin.spec	11 Apr 2006 11:26:41 -0000	1.3
+++ xfce4-mount-plugin.spec	11 Apr 2006 17:55:53 -0000	1.4
@@ -41,7 +41,7 @@
 - Require xfce4-panel.
 
 * Sat Jan 21 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-1
-- Updat to 0.3.3.
+- Update to 0.3.3.
 
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.2-3
 - Add libxfcegui4-devel BuildReqs.



From fedora-extras-commits at redhat.com  Tue Apr 11 17:56:32 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 10:56:32 -0700
Subject: rpms/xfce4-mount-plugin/FC-5 xfce4-mount-plugin.spec,1.4,1.5
Message-ID: <200604111756.k3BHuYwf024509@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-mount-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24492

Modified Files:
	xfce4-mount-plugin.spec 
Log Message:
fix typo in changelog


Index: xfce4-mount-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mount-plugin/FC-5/xfce4-mount-plugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfce4-mount-plugin.spec	11 Apr 2006 11:26:18 -0000	1.4
+++ xfce4-mount-plugin.spec	11 Apr 2006 17:56:32 -0000	1.5
@@ -44,7 +44,7 @@
 - Rebuild for Fedora Extras 5.
 
 * Sat Jan 21 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-1
-- Updat to 0.3.3.
+- Update to 0.3.3.
 
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.2-3
 - Add libxfcegui4-devel BuildReqs.



From fedora-extras-commits at redhat.com  Tue Apr 11 17:57:07 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 10:57:07 -0700
Subject: rpms/xfce4-mount-plugin/devel xfce4-mount-plugin.spec,1.4,1.5
Message-ID: <200604111757.k3BHv93l024540@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-serv24523

Modified Files:
	xfce4-mount-plugin.spec 
Log Message:
fix typo in changelog


Index: xfce4-mount-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-mount-plugin/devel/xfce4-mount-plugin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xfce4-mount-plugin.spec	11 Apr 2006 11:25:54 -0000	1.4
+++ xfce4-mount-plugin.spec	11 Apr 2006 17:57:07 -0000	1.5
@@ -44,7 +44,7 @@
 - Rebuild for Fedora Extras 5.
 
 * Sat Jan 21 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-1
-- Updat to 0.3.3.
+- Update to 0.3.3.
 
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.2-3
 - Add libxfcegui4-devel BuildReqs.



From fedora-extras-commits at redhat.com  Tue Apr 11 18:03:24 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 11:03:24 -0700
Subject: rpms/xfce4-netload-plugin/FC-3 xfce4-netload-plugin-bufsize.patch,
	1.1, 1.2 xfce4-netload-plugin.spec, 1.2, 1.3
Message-ID: <200604111803.k3BI3Q3l026643@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-netload-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26621

Modified Files:
	xfce4-netload-plugin-bufsize.patch xfce4-netload-plugin.spec 
Log Message:
require xfce4-panel & update bufsize-patch

xfce4-netload-plugin-bufsize.patch:

Index: xfce4-netload-plugin-bufsize.patch
===================================================================
RCS file: /cvs/extras/rpms/xfce4-netload-plugin/FC-3/xfce4-netload-plugin-bufsize.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-netload-plugin-bufsize.patch	3 Feb 2006 20:20:42 -0000	1.1
+++ xfce4-netload-plugin-bufsize.patch	11 Apr 2006 18:03:24 -0000	1.2
@@ -1,17 +1,11 @@
---- panel-plugin/wormulon/linux.c.orig	2006-02-03 20:48:17.000000000 +0100
-+++ panel-plugin/wormulon/linux.c	2005-08-01 00:56:38.000000000 +0200
-@@ -101,11 +101,11 @@
- 
-     /* do not parse the first two lines as they only contain static garbage */
-     fseek(proc_net_dev, 0, SEEK_SET);
--    fgets(buffer, BUFSIZ-1, proc_net_dev);
--    fgets(buffer, BUFSIZ-1, proc_net_dev);
-+    fgets(buffer, BUFSIZE-1, proc_net_dev);
-+    fgets(buffer, BUFSIZE-1, proc_net_dev);
- 
-     interfacefound = 0;
--    while (fgets(buffer, BUFSIZ-1, proc_net_dev) != NULL)
-+    while (fgets(buffer, BUFSIZE-1, proc_net_dev) != NULL)
-     {
-         /* find the device name and substitute ':' with '\0' */
-         ptr = buffer;
+--- panel-plugin/wormulon/linux.c.orig	2005-08-01 00:56:38.000000000 +0200
++++ panel-plugin/wormulon/linux.c	2006-02-04 13:20:14.000000000 +0100
+@@ -81,7 +81,7 @@
+      * performance difference is _very_ minimal. But I don't think that it's a good
+      * idea to keep the file open for a very long time for _each_ plugin instance.
+      */
+-    char buffer[BUFSIZE];
++    char buffer[BUFSIZ];
+     char *ptr;
+     char *devname;
+     int dump;


Index: xfce4-netload-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-netload-plugin/FC-3/xfce4-netload-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-netload-plugin.spec	3 Feb 2006 20:20:42 -0000	1.2
+++ xfce4-netload-plugin.spec	11 Apr 2006 18:03:24 -0000	1.3
@@ -1,6 +1,6 @@
 Name:		xfce4-netload-plugin
 Version:	0.3.3
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Network-load monitor for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -12,6 +12,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 A network-load monitor plugin for the Xfce panel.
@@ -39,6 +40,10 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-5
+- Require xfce4-panel.
+- Modify bufsize-patch.
+
 * Thu Feb 02 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-4
 - Add bufsize-patch (#179686)
 



From fedora-extras-commits at redhat.com  Tue Apr 11 18:05:05 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 11:05:05 -0700
Subject: rpms/xfce4-notes-plugin/FC-3 xfce4-notes-plugin.spec,1.1,1.2
Message-ID: <200604111805.k3BI58rD026694@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-notes-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26674

Modified Files:
	xfce4-notes-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-notes-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-notes-plugin/FC-3/xfce4-notes-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-notes-plugin.spec	15 Dec 2005 03:46:11 -0000	1.1
+++ xfce4-notes-plugin.spec	11 Apr 2006 18:05:05 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-notes-plugin
 Version:	0.11.1
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Notes plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 This plugin provides sticky notes for your desktop. You can create a note by 
@@ -39,6 +40,9 @@
 %{_datadir}/xfce4/*
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.11.1-3
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.11.1-2
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 18:07:02 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 11:07:02 -0700
Subject: rpms/xfce4-quicklauncher-plugin/FC-3
	xfce4-quicklauncher-plugin.spec, 1.1, 1.2
Message-ID: <200604111807.k3BI74xN026725@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-quicklauncher-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26708

Modified Files:
	xfce4-quicklauncher-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-quicklauncher-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-quicklauncher-plugin/FC-3/xfce4-quicklauncher-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-quicklauncher-plugin.spec	27 Jan 2006 17:57:59 -0000	1.1
+++ xfce4-quicklauncher-plugin.spec	11 Apr 2006 18:07:02 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-quicklauncher-plugin
 Version:	0.81
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Quicklauncher plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 This plugin allows you to have lots of launchers in the Xfce panel, displaying 
@@ -40,6 +41,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.81-3
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.81-2
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 18:08:14 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 11:08:14 -0700
Subject: rpms/xfce4-screenshooter-plugin/FC-3
	xfce4-screenshooter-plugin.spec, 1.1, 1.2
Message-ID: <200604111808.k3BI8GdR026753@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-screenshooter-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26736

Modified Files:
	xfce4-screenshooter-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-screenshooter-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-screenshooter-plugin/FC-3/xfce4-screenshooter-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-screenshooter-plugin.spec	29 Jan 2006 23:57:30 -0000	1.1
+++ xfce4-screenshooter-plugin.spec	11 Apr 2006 18:08:14 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-screenshooter-plugin
 Version:	0.0.8
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Screenshot utility for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 The Screenshooter plugin allows you to take screenshots from the Xfce panel.
@@ -35,5 +36,8 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.0.8-2
+- Require xfce4-panel.
+
 * Sat Jan 21 2006 Christoph Wickert <fedora wickert at arcor de> - 0.0.8-1
 - Initial Fedora Extras version.



From fedora-extras-commits at redhat.com  Tue Apr 11 18:09:16 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 11:09:16 -0700
Subject: rpms/xfce4-sensors-plugin/FC-3 xfce4-sensors-plugin.spec,1.2,1.3
Message-ID: <200604111809.k3BI9I5I026790@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-sensors-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26773

Modified Files:
	xfce4-sensors-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-sensors-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-sensors-plugin/FC-3/xfce4-sensors-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-sensors-plugin.spec	22 Jan 2006 20:45:44 -0000	1.2
+++ xfce4-sensors-plugin.spec	11 Apr 2006 18:09:16 -0000	1.3
@@ -1,6 +1,6 @@
 Name: 		xfce4-sensors-plugin
 Version: 	0.7.0
-Release: 	3%{?dist}
+Release: 	4%{?dist}
 Summary: 	Sensors plugin for the Xfce panel
 
 Group: 		User Interface/Desktops
@@ -11,7 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext, lm_sensors-devel >= 2.8
-Requires:	lm_sensors >= 2.8
+Requires:	xfce4-panel >= 4.2, lm_sensors >= 2.8
 ExcludeArch:	ppc
 
 %description
@@ -39,6 +39,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.7.0-4
+- Require xfce4-panel.
+
 * Sun Jan 22 2006 Christoph Wickert <fedora wickert at arcor de> - 0.7.0-3
 - ExcludeArch ppc.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 18:09:55 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Tue, 11 Apr 2006 11:09:55 -0700
Subject: rpms/gdesklets/FC-5 gdesklets.spec,1.13,1.14
Message-ID: <200604111809.k3BI9v4Z026814@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26768/FC-5

Modified Files:
	gdesklets.spec 
Log Message:

gdesklets.spec updated. Attempt to solve some ppc issue.



Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-5/gdesklets.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gdesklets.spec	3 Apr 2006 18:33:39 -0000	1.13
+++ gdesklets.spec	11 Apr 2006 18:09:55 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           gdesklets
 Version:        0.35.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
@@ -24,9 +24,9 @@
 BuildRequires:  gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0, desktop-file-utils
 Requires:	gnome-python2-gconf >= 2.6.0
 Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
-Requires(post): desktop-file-utils
+#Requires(post): desktop-file-utils
 Requires(post): shared-mime-info
-Requires(postun): desktop-file-utils
+#Requires(postun): desktop-file-utils
 Requires(postun): shared-mime-info
 
 
@@ -71,12 +71,12 @@
 
 %post
 update-mime-database %{_datadir}/mime &> /dev/null || :
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+#update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %postun
 update-mime-database %{_datadir}/mime &> /dev/null || :
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+#update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %clean



From fedora-extras-commits at redhat.com  Tue Apr 11 18:10:09 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 11:10:09 -0700
Subject: rpms/xfce4-showdesktop-plugin/FC-3 xfce4-showdesktop-plugin.spec,
	1.1, 1.2
Message-ID: <200604111810.k3BIABFb026837@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-showdesktop-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26820

Modified Files:
	xfce4-showdesktop-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-showdesktop-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-showdesktop-plugin/FC-3/xfce4-showdesktop-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-showdesktop-plugin.spec	15 Dec 2005 03:17:47 -0000	1.1
+++ xfce4-showdesktop-plugin.spec	11 Apr 2006 18:10:09 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-showdesktop-plugin
 Version:	0.4.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Show-Desktop plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:  gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 This is a little Xfce plugin, to minimize and unminimize all windows on the
@@ -39,6 +40,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.0-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.4.0-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 18:10:57 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 11:10:57 -0700
Subject: rpms/xfce4-systemload-plugin/FC-3 xfce4-systemload-plugin.spec, 1.1,
	1.2
Message-ID: <200604111810.k3BIAxNP026865@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-systemload-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26848

Modified Files:
	xfce4-systemload-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-systemload-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-systemload-plugin/FC-3/xfce4-systemload-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-systemload-plugin.spec	16 Dec 2005 22:34:40 -0000	1.1
+++ xfce4-systemload-plugin.spec	11 Apr 2006 18:10:57 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-systemload-plugin
 Version:	0.3.6
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Systemload monitor for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -11,6 +11,7 @@
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
 BuildRequires:	gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 A system-load monitor plugin for the Xfce panel. It displays the current CPU 
@@ -38,6 +39,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.6-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.6-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 18:12:14 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 11:12:14 -0700
Subject: rpms/xfce4-taskbar-plugin/FC-3 xfce4-taskbar-plugin.spec,1.1,1.2
Message-ID: <200604111812.k3BICGMU026902@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-taskbar-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26885

Modified Files:
	xfce4-taskbar-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-taskbar-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-taskbar-plugin/FC-3/xfce4-taskbar-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-taskbar-plugin.spec	15 Dec 2005 03:21:10 -0000	1.1
+++ xfce4-taskbar-plugin.spec	11 Apr 2006 18:12:14 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-taskbar-plugin
 Version:	0.2.2
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Tasklist plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A tasklist plugin for the Xfce panel. The size of the taskbar can be changed 
@@ -37,6 +38,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.2.2-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.2.2-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 18:12:52 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 11:12:52 -0700
Subject: rpms/xfce4-wavelan-plugin/FC-3 xfce4-wavelan-plugin.spec,1.1,1.2
Message-ID: <200604111812.k3BICstM026940@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-wavelan-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26923

Modified Files:
	xfce4-wavelan-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-wavelan-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-wavelan-plugin/FC-3/xfce4-wavelan-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-wavelan-plugin.spec	15 Dec 2005 04:40:53 -0000	1.1
+++ xfce4-wavelan-plugin.spec	11 Apr 2006 18:12:51 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-wavelan-plugin
 Version:	0.4.1
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	WaveLAN plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A plugin for the Xfce panel that monitors a wireless LAN interface. It 
@@ -36,6 +37,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.4.1-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 18:13:15 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 11 Apr 2006 11:13:15 -0700
Subject: rpms/perl-Test-MockObject/FC-5 .cvsignore, 1.7,
	1.8 perl-Test-MockObject.spec, 1.11, 1.12 sources, 1.7, 1.8
Message-ID: <200604111813.k3BIDHl0026988@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-serv26951/FC-5

Modified Files:
	.cvsignore perl-Test-MockObject.spec sources 
Log Message:
Update to 1.05.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-MockObject/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	30 Mar 2006 16:26:54 -0000	1.7
+++ .cvsignore	11 Apr 2006 18:13:15 -0000	1.8
@@ -1 +1 @@
-Test-MockObject-1.04.tar.gz
+Test-MockObject-1.05.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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-Test-MockObject.spec	30 Mar 2006 16:26:54 -0000	1.11
+++ perl-Test-MockObject.spec	11 Apr 2006 18:13:15 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           perl-Test-MockObject
-Version:        1.04
+Version:        1.05
 Release:        1%{?dist}
 Summary:        Perl extension for emulating troublesome interfaces
 
@@ -59,6 +59,9 @@
 
 
 %changelog
+* Tue Apr 11 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.05-1
+- Update to 1.05.
+
 * Thu Mar 30 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.04-1
 - Update to 1.04.
 - Makefile.PL -> Build.PL.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-MockObject/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	30 Mar 2006 16:26:54 -0000	1.7
+++ sources	11 Apr 2006 18:13:15 -0000	1.8
@@ -1 +1 @@
-03224e5cecd7267c720994eeeb02c376  Test-MockObject-1.04.tar.gz
+f0dbe875fd3af865126ede948408dbaa  Test-MockObject-1.05.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 18:13:16 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 11 Apr 2006 11:13:16 -0700
Subject: rpms/perl-Test-MockObject/devel .cvsignore, 1.7,
	1.8 perl-Test-MockObject.spec, 1.11, 1.12 sources, 1.7, 1.8
Message-ID: <200604111813.k3BIDITi026994@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-serv26951/devel

Modified Files:
	.cvsignore perl-Test-MockObject.spec sources 
Log Message:
Update to 1.05.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	30 Mar 2006 16:26:54 -0000	1.7
+++ .cvsignore	11 Apr 2006 18:13:16 -0000	1.8
@@ -1 +1 @@
-Test-MockObject-1.04.tar.gz
+Test-MockObject-1.05.tar.gz


Index: perl-Test-MockObject.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/perl-Test-MockObject.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-Test-MockObject.spec	30 Mar 2006 16:26:54 -0000	1.11
+++ perl-Test-MockObject.spec	11 Apr 2006 18:13:16 -0000	1.12
@@ -1,5 +1,5 @@
 Name:           perl-Test-MockObject
-Version:        1.04
+Version:        1.05
 Release:        1%{?dist}
 Summary:        Perl extension for emulating troublesome interfaces
 
@@ -59,6 +59,9 @@
 
 
 %changelog
+* Tue Apr 11 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.05-1
+- Update to 1.05.
+
 * Thu Mar 30 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.04-1
 - Update to 1.04.
 - Makefile.PL -> Build.PL.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	30 Mar 2006 16:26:54 -0000	1.7
+++ sources	11 Apr 2006 18:13:16 -0000	1.8
@@ -1 +1 @@
-03224e5cecd7267c720994eeeb02c376  Test-MockObject-1.04.tar.gz
+f0dbe875fd3af865126ede948408dbaa  Test-MockObject-1.05.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 18:13:45 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 11:13:45 -0700
Subject: rpms/xfce4-weather-plugin/FC-3 xfce4-weather-plugin.spec,1.1,1.2
Message-ID: <200604111813.k3BIDlUG027022@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-weather-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27005

Modified Files:
	xfce4-weather-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-weather-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-weather-plugin/FC-3/xfce4-weather-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-weather-plugin.spec	9 Dec 2005 22:42:43 -0000	1.1
+++ xfce4-weather-plugin.spec	11 Apr 2006 18:13:45 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-weather-plugin
 Version:	0.4.9
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Weather plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A weather plugin for the Xfce panel. It shows the current temperature and 
@@ -38,6 +39,9 @@
 %{_datadir}/xfce4/*
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.4.9-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.4.9-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 18:14:52 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 11:14:52 -0700
Subject: rpms/xfce4-websearch-plugin/FC-3 xfce4-websearch-plugin.spec, 1.1,
	1.2
Message-ID: <200604111814.k3BIEs5I027126@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-websearch-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27109

Modified Files:
	xfce4-websearch-plugin.spec 
Log Message:
require xfce4-panel & fix typo


Index: xfce4-websearch-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-websearch-plugin/FC-3/xfce4-websearch-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-websearch-plugin.spec	21 Jan 2006 20:42:55 -0000	1.1
+++ xfce4-websearch-plugin.spec	11 Apr 2006 18:14:51 -0000	1.2
@@ -1,6 +1,6 @@
 Name: 		xfce4-websearch-plugin
 Version: 	0.1.0
-Release: 	4%{?dist}
+Release: 	5%{?dist}
 Summary: 	Websearch plugin from the XFCE panel
 
 Group: 		User Interface/Desktops
@@ -10,7 +10,8 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
-BuildREquires:  gettext
+BuildRequires:  gettext
+Requires:	xfce4-panel >= 4.2
 
 %description
 Access searchengines from the XFCE panel.
@@ -37,6 +38,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 18:16:29 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 11:16:29 -0700
Subject: rpms/xfce4-windowlist-plugin/FC-3 xfce4-windowlist-plugin.spec, 1.1,
	1.2
Message-ID: <200604111816.k3BIGV9l027163@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-windowlist-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27146

Modified Files:
	xfce4-windowlist-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-windowlist-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-windowlist-plugin/FC-3/xfce4-windowlist-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-windowlist-plugin.spec	9 Dec 2005 22:23:35 -0000	1.1
+++ xfce4-windowlist-plugin.spec	11 Apr 2006 18:16:29 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-windowlist-plugin
 Version:	0.1.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Windowlist plugin for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 Windowlist plugin for the Xfce panel. The menubutton shows the icon of the 
@@ -37,6 +38,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-5
+- Require xfce4-panel.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.1.0-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 18:21:23 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 11:21:23 -0700
Subject: rpms/xfce4-xkb-plugin/FC-3 .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xfce4-xkb-plugin.spec, 1.1, 1.2
Message-ID: <200604111821.k3BILP2D027259@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-xkb-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27238

Modified Files:
	.cvsignore sources xfce4-xkb-plugin.spec 
Log Message:
update to 0.3.5 & require xfce4-panel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Dec 2005 22:28:33 -0000	1.2
+++ .cvsignore	11 Apr 2006 18:21:22 -0000	1.3
@@ -1 +1 @@
-xfce4-xkb-plugin-0.3.2.tar.gz
+xfce4-xkb-plugin-0.3.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Dec 2005 22:28:33 -0000	1.2
+++ sources	11 Apr 2006 18:21:22 -0000	1.3
@@ -1 +1 @@
-b233819d685ab3b7f4a47c2da9fb6936  xfce4-xkb-plugin-0.3.2.tar.gz
+0c92dd17579e102b40289c4bc83c5505  xfce4-xkb-plugin-0.3.5.tar.gz


Index: xfce4-xkb-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-xkb-plugin/FC-3/xfce4-xkb-plugin.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce4-xkb-plugin.spec	16 Dec 2005 22:28:33 -0000	1.1
+++ xfce4-xkb-plugin.spec	11 Apr 2006 18:21:22 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		xfce4-xkb-plugin
-Version:	0.3.2
-Release:	4%{?dist}
+Version:	0.3.5
+Release:	2%{?dist}
 Summary:	XKB layout switcher for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,11 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	xfce4-panel-devel >= 4.2, libxfcegui4-devel >= 4.2, libxml2-devel
+# for modular X
+%if "%{?fedora}" > "4"
+BuildRequires:  libXext-devel, libXpm-devel
+%endif
+Requires:	xfce4-panel >= 4.2
 
 %description
 Xfce XKB layout switch plugin for the Xfce panel. It displays the current 
@@ -42,6 +47,18 @@
 %{_datadir}/xfce4/xkb/flags/*.png
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.5-2
+- Require xfce4-panel.
+
+* Fri Mar 31 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.5-1
+- Update to 0.3.5.
+
+* Fri Mar 17 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.4-1
+- Update to 0.3.4.
+
+* Fri Mar 10 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.3-1
+- Update to 0.3.3.
+
 * Thu Dec 01 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.2-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.



From fedora-extras-commits at redhat.com  Tue Apr 11 18:23:09 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 11 Apr 2006 11:23:09 -0700
Subject: rpms/perl-Gtk2/FC-5 .cvsignore, 1.12, 1.13 perl-Gtk2.spec, 1.16,
	1.17 sources, 1.12, 1.13
Message-ID: <200604111823.k3BINBHB027345@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Gtk2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27287/FC-5

Modified Files:
	.cvsignore perl-Gtk2.spec sources 
Log Message:
Update to 1.121.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	14 Mar 2006 19:16:52 -0000	1.12
+++ .cvsignore	11 Apr 2006 18:23:09 -0000	1.13
@@ -1 +1 @@
-Gtk2-1.120.tar.gz
+Gtk2-1.121.tar.gz


Index: perl-Gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-5/perl-Gtk2.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- perl-Gtk2.spec	14 Mar 2006 19:16:52 -0000	1.16
+++ perl-Gtk2.spec	11 Apr 2006 18:23:09 -0000	1.17
@@ -5,7 +5,7 @@
 #
 
 Name:           perl-Gtk2
-Version:        1.120
+Version:        1.121
 Release:        1%{?dist}
 Summary:        Perl interface to the 2.x series of the Gimp Toolkit library
 
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Tue Apr 11 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.121-1
+- Update to 1.121.
+
 * Tue Mar 14 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.120-1
 - Update to 1.120.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	14 Mar 2006 19:16:52 -0000	1.12
+++ sources	11 Apr 2006 18:23:09 -0000	1.13
@@ -1 +1 @@
-3d0eef4271bd624b284f9a23f4bdbb96  Gtk2-1.120.tar.gz
+90bd58334c49a4db9d812537de5b1620  Gtk2-1.121.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 18:23:10 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 11 Apr 2006 11:23:10 -0700
Subject: rpms/perl-Gtk2/devel .cvsignore, 1.12, 1.13 perl-Gtk2.spec, 1.16,
	1.17 sources, 1.12, 1.13
Message-ID: <200604111823.k3BINCwP027351@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27287/devel

Modified Files:
	.cvsignore perl-Gtk2.spec sources 
Log Message:
Update to 1.121.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	14 Mar 2006 19:16:52 -0000	1.12
+++ .cvsignore	11 Apr 2006 18:23:10 -0000	1.13
@@ -1 +1 @@
-Gtk2-1.120.tar.gz
+Gtk2-1.121.tar.gz


Index: perl-Gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/devel/perl-Gtk2.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- perl-Gtk2.spec	14 Mar 2006 19:16:52 -0000	1.16
+++ perl-Gtk2.spec	11 Apr 2006 18:23:10 -0000	1.17
@@ -5,7 +5,7 @@
 #
 
 Name:           perl-Gtk2
-Version:        1.120
+Version:        1.121
 Release:        1%{?dist}
 Summary:        Perl interface to the 2.x series of the Gimp Toolkit library
 
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Tue Apr 11 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.121-1
+- Update to 1.121.
+
 * Tue Mar 14 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.120-1
 - Update to 1.120.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	14 Mar 2006 19:16:52 -0000	1.12
+++ sources	11 Apr 2006 18:23:10 -0000	1.13
@@ -1 +1 @@
-3d0eef4271bd624b284f9a23f4bdbb96  Gtk2-1.120.tar.gz
+90bd58334c49a4db9d812537de5b1620  Gtk2-1.121.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 18:23:09 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 11 Apr 2006 11:23:09 -0700
Subject: rpms/perl-Gtk2/FC-4 .cvsignore, 1.8, 1.9 perl-Gtk2.spec, 1.12,
	1.13 sources, 1.8, 1.9
Message-ID: <200604111823.k3BINfrC027373@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Gtk2/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27287/FC-4

Modified Files:
	.cvsignore perl-Gtk2.spec sources 
Log Message:
Update to 1.121.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-4/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	15 Mar 2006 12:18:02 -0000	1.8
+++ .cvsignore	11 Apr 2006 18:23:09 -0000	1.9
@@ -1 +1 @@
-Gtk2-1.120.tar.gz
+Gtk2-1.121.tar.gz


Index: perl-Gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-4/perl-Gtk2.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-Gtk2.spec	15 Mar 2006 12:18:02 -0000	1.12
+++ perl-Gtk2.spec	11 Apr 2006 18:23:09 -0000	1.13
@@ -5,7 +5,7 @@
 #
 
 Name:           perl-Gtk2
-Version:        1.120
+Version:        1.121
 Release:        1%{?dist}
 Summary:        Perl interface to the 2.x series of the Gimp Toolkit library
 
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Tue Apr 11 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.121-1
+- Update to 1.121.
+
 * Tue Mar 14 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.120-1
 - Update to 1.120.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Gtk2/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	15 Mar 2006 12:18:02 -0000	1.8
+++ sources	11 Apr 2006 18:23:09 -0000	1.9
@@ -1 +1 @@
-3d0eef4271bd624b284f9a23f4bdbb96  Gtk2-1.120.tar.gz
+90bd58334c49a4db9d812537de5b1620  Gtk2-1.121.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 19:13:57 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 12:13:57 -0700
Subject: rpms/xfce4-cpugraph-plugin/FC-5 xfce4-cpugraph-plugin.spec,1.3,1.4
Message-ID: <200604111913.k3BJDxDR030514@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-cpugraph-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30497

Modified Files:
	xfce4-cpugraph-plugin.spec 
Log Message:
require xfce4-panel


Index: xfce4-cpugraph-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-cpugraph-plugin/FC-5/xfce4-cpugraph-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-cpugraph-plugin.spec	16 Feb 2006 15:46:27 -0000	1.3
+++ xfce4-cpugraph-plugin.spec	11 Apr 2006 19:13:57 -0000	1.4
@@ -1,6 +1,6 @@
 Name:		xfce4-cpugraph-plugin
 Version:	0.2.2
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	CPU monitor for the Xfce panel
 
 Group:		User Interface/Desktops
@@ -10,6 +10,7 @@
 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
 
 %description
 A CPU monitor plugin for the Xfce panel. It offers multiple display modes 
@@ -37,6 +38,9 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.2.2-6
+- Require xfce4-panel.
+
 * Thu Feb 16 2006 Christoph Wickert <fedora wickert at arcor de> - 0.2.2-5
 - Rebuild for Fedora Extras 5.
 



From fedora-extras-commits at redhat.com  Tue Apr 11 19:14:13 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Tue, 11 Apr 2006 12:14:13 -0700
Subject: fedora-security/audit fc4,1.199,1.200 fc5,1.112,1.113
Message-ID: <200604111914.k3BJEDBH030538@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30491/audit

Modified Files:
	fc4 fc5 
Log Message:
Add CVE-2006-1523



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -r1.199 -r1.200
--- fc4	11 Apr 2006 16:36:01 -0000	1.199
+++ fc4	11 Apr 2006 19:14:10 -0000	1.200
@@ -12,6 +12,7 @@
 CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1542 VULNERABLE (python) bz#169046
+CVE-2006-1523 VULNERABLE (kernel, fixed 2.6.16.4)
 CVE-2006-1522 VULNERABLE (kernel, fixed 2.6.16.3)
 CVE-2006-1494 VULNERABLE (php)
 CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-245]


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -r1.112 -r1.113
--- fc5	11 Apr 2006 16:36:01 -0000	1.112
+++ fc5	11 Apr 2006 19:14:10 -0000	1.113
@@ -11,6 +11,7 @@
 CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1542 VULNERABLE (python) bz#169046
+CVE-2006-1523 VULNERABLE (kernel, fixed 2.6.16.4)
 CVE-2006-1522 VULNERABLE (kernel, fixed 2.6.16.3)
 CVE-2006-1494 VULNERABLE (php)
 CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-233]



From fedora-extras-commits at redhat.com  Tue Apr 11 19:23:12 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Tue, 11 Apr 2006 12:23:12 -0700
Subject: rpms/gdesklets/FC-4 gdesklets.spec,1.5,1.6
Message-ID: <200604111923.k3BJNEtY030610@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30591

Modified Files:
	gdesklets.spec 
Log Message:

gdeslets.spec updated



Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-4/gdesklets.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gdesklets.spec	19 Jan 2006 19:39:37 -0000	1.5
+++ gdesklets.spec	11 Apr 2006 19:23:12 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           gdesklets
 Version:        0.35.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
@@ -17,7 +17,7 @@
 #							    #
 #############################################################
 
-BuildRequires:  python-devel >= 2.0.0, pyorbit-devel >= 2.0.1, pygtk2-devel >= 2.4.0
+BuildRequires:  python-devel >= 2.0.0, pyorbit-devel > 2.0.1, pygtk2-devel >= 2.4.0
 BuildRequires:  librsvg2-devel, libgtop2-devel >= 2.8.0, gettext   
 BuildRequires:  gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0, desktop-file-utils
 Requires:	gnome-python2-gconf >= 2.6.0
@@ -96,6 +96,10 @@
 
 
 %changelog
+* Tue Apr 11 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-3
+- Set greater than for pyorbit2. For some reason, the package set
+  to equal instead of greater and equal.
+
 * Thu Jan 19 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-2
 - Rebuilt
 



From fedora-extras-commits at redhat.com  Tue Apr 11 19:39:14 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Tue, 11 Apr 2006 12:39:14 -0700
Subject: rpms/xdesktopwaves/FC-5 xdesktopwaves.spec,1.5,1.6
Message-ID: <200604111939.k3BJdGd7030731@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/xdesktopwaves/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30714

Modified Files:
	xdesktopwaves.spec 
Log Message:
* Tue Apr 11 2006 Adrian Reber <adrian at lisas.de> - 1.3-6
- trying to fix build on x86_64



Index: xdesktopwaves.spec
===================================================================
RCS file: /cvs/extras/rpms/xdesktopwaves/FC-5/xdesktopwaves.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- xdesktopwaves.spec	11 Apr 2006 11:51:18 -0000	1.5
+++ xdesktopwaves.spec	11 Apr 2006 19:39:14 -0000	1.6
@@ -1,6 +1,6 @@
 Name:          xdesktopwaves
 Version:       1.3
-Release:       5%{?dist}
+Release:       6%{?dist}
 
 Summary:       Simulation of water waves on the X Window System desktop
 License:       GPL
@@ -21,7 +21,7 @@
 %{__sed} -i -e "s,-s,," Makefile
 
 %build
-%{__make} CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags}
+%{__make} CFLAGS="$RPM_OPT_FLAGS" LFLAGS="-L/usr/%{_lib}" %{?_smp_mflags}
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -61,6 +61,9 @@
 %{_datadir}/pixmaps/%{name}.xpm
 
 %changelog
+* Tue Apr 11 2006 Adrian Reber <adrian at lisas.de> - 1.3-6
+- trying to fix build on x86_64
+
 * Tue Apr 11 2006 Adrian Reber <adrian at lisas.de> - 1.3-5
 - rebuilt for modular X
 



From fedora-extras-commits at redhat.com  Tue Apr 11 20:06:21 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Tue, 11 Apr 2006 13:06:21 -0700
Subject: rpms/gdesklets/FC-4 gdesklets.spec,1.6,1.7
Message-ID: <200604112006.k3BK6NpF000588@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv571

Modified Files:
	gdesklets.spec 
Log Message:

gdesklets.spec updated



Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-4/gdesklets.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gdesklets.spec	11 Apr 2006 19:23:12 -0000	1.6
+++ gdesklets.spec	11 Apr 2006 20:06:20 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           gdesklets
 Version:        0.35.3
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
@@ -17,7 +17,7 @@
 #							    #
 #############################################################
 
-BuildRequires:  python-devel >= 2.0.0, pyorbit-devel > 2.0.1, pygtk2-devel >= 2.4.0
+BuildRequires:  python-devel >= 2.0.0, pyorbit-devel > 2.6.1, pygtk2-devel >= 2.4.0
 BuildRequires:  librsvg2-devel, libgtop2-devel >= 2.8.0, gettext   
 BuildRequires:  gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0, desktop-file-utils
 Requires:	gnome-python2-gconf >= 2.6.0
@@ -96,8 +96,11 @@
 
 
 %changelog
+* Tue Apr 11 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-4
+- Fixed versionning for pyorbit-devel
+
 * Tue Apr 11 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-3
-- Set greater than for pyorbit2. For some reason, the package set
+- Set greater than for pyorbit. For some reason, the package set
   to equal instead of greater and equal.
 
 * Thu Jan 19 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-2



From fedora-extras-commits at redhat.com  Tue Apr 11 20:39:31 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Tue, 11 Apr 2006 13:39:31 -0700
Subject: rpms/gdesklets/devel gdesklets.spec,1.11,1.12
Message-ID: <200604112039.k3BKdXP7001486@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1466

Modified Files:
	gdesklets.spec 
Log Message:

gdeskets.spec updated



Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/devel/gdesklets.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gdesklets.spec	28 Feb 2006 21:15:09 -0000	1.11
+++ gdesklets.spec	11 Apr 2006 20:39:31 -0000	1.12
@@ -24,9 +24,9 @@
 BuildRequires:  gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0, desktop-file-utils
 Requires:	gnome-python2-gconf >= 2.6.0
 Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
-Requires(post): desktop-file-utils
+#Requires(post): desktop-file-utils
 Requires(post): shared-mime-info
-Requires(postun): desktop-file-utils
+#Requires(postun): desktop-file-utils
 Requires(postun): shared-mime-info
 
 
@@ -71,12 +71,12 @@
 
 %post
 update-mime-database %{_datadir}/mime &> /dev/null || :
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+#update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %postun
 update-mime-database %{_datadir}/mime &> /dev/null || :
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+#update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %clean
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Tue Apr 11 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-5
+- Rebuild for development
+
 * Thu Jan 19 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-4
 - Rebuild for Fedora Extras 5
 



From fedora-extras-commits at redhat.com  Tue Apr 11 20:46:48 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 11 Apr 2006 13:46:48 -0700
Subject: rpms/raidem/devel raidem-0.3.1-syslibs.patch,NONE,1.1
Message-ID: <200604112046.k3BKkoHi001668@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/raidem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1650

Added Files:
	raidem-0.3.1-syslibs.patch 
Log Message:
raidem-0.3.1 WIP

raidem-0.3.1-syslibs.patch:

--- NEW FILE raidem-0.3.1-syslibs.patch ---
diff -ur raidem-0.3.1-src.orig/Makefile raidem-0.3.1-src/Makefile
--- raidem-0.3.1-src.orig/Makefile	2006-04-08 06:54:03.000000000 +0200
+++ raidem-0.3.1-src/Makefile	2006-04-09 20:46:18.000000000 +0200
@@ -4,8 +4,8 @@
 
 include Makefile.cfg
 
-CFLAGS += -W -Wall -Werror -Wno-deprecated-declarations \
-	-fno-strict-aliasing				\
+CFLAGS += -W -Wall -Wno-deprecated-declarations \
+	-fno-strict-aliasing			\
 	-Iinclude -Ilib
 #CFLAGS += -g3
 
diff -ur raidem-0.3.1-src.orig/configure.ac raidem-0.3.1-src/configure.ac
--- raidem-0.3.1-src.orig/configure.ac	2006-04-08 10:48:00.000000000 +0200
+++ raidem-0.3.1-src/configure.ac	2006-04-11 22:06:03.000000000 +0200
@@ -53,7 +53,8 @@
                               AC_MSG_NOTICE([===== Using lib/adime =====]) &&
                               (cd lib/adime; sh fix.sh unix --quick) &&
                               AC_MSG_NOTICE([===== Configured adime =====]),
-                              AC_MSG_ERROR([cannot find adime])))
+                              AC_MSG_ERROR([cannot find adime])),
+                [`$alcfg --libs`])
 
 
 AC_HAVE_LIBRARY([glyph-alleg],
@@ -104,7 +105,7 @@
 #----------------------------------------------------------------
 # Optional
 
-if ! ${alrand}; then
+if [ "$alrand" != "true" ]; then
 AC_SUBST(NO_ALRAND, 1)
 fi
 
@@ -124,7 +125,8 @@
                 AC_SUBST(HAVE_ALLEGROOGG, 1),
                 AC_CHECK_FILE([lib/allegroogg/Makefile],
                               AC_MSG_NOTICE([===== Using lib/allegroogg =====]),
-                              AC_SUBST(NO_OGG, 1)))
+                              AC_SUBST(NO_OGG, 1)),
+                [`$alcfg --libs`])
 else
 AC_SUBST(NO_OGG, 1)
 fi
diff -ur raidem-0.3.1-src.orig/misc/Makefile.all raidem-0.3.1-src/misc/Makefile.all
--- raidem-0.3.1-src.orig/misc/Makefile.all	2006-04-08 09:12:44.000000000 +0200
+++ raidem-0.3.1-src/misc/Makefile.all	2006-04-09 21:06:03.000000000 +0200
@@ -56,11 +56,14 @@
 # Glyph-Keeper
 ifdef HAVE_GLYPH_KEEPER
 LDLIBS += -lglyph-alleg
+CFLAGS += -DGLYPH_TARGET=GLYPH_TARGET_ALLEGRO
 else
 CFLAGS += -DGLYPH_TARGET=GLYPH_TARGET_ALLEGRO -Ilib/glyph-keeper/include
 endif # HAVE_GLYPH_KEEPER
 
-ifndef HAVE_FREETYPE
+ifdef HAVE_FREETYPE
+LDLIBS += `$(ftcfg) --libs`
+else
 CFLAGS += -Ilib/freetype/include
 endif
 
diff -ur raidem-0.3.1-src.orig/src/map-editor/map-proc.m raidem-0.3.1-src/src/map-editor/map-proc.m
--- raidem-0.3.1-src.orig/src/map-editor/map-proc.m	2006-01-20 03:33:33.000000000 +0100
+++ raidem-0.3.1-src/src/map-editor/map-proc.m	2006-04-09 20:47:00.000000000 +0200
@@ -4,7 +4,7 @@
 #include <allegro.h>
 #include <assert.h>
 #include <math.h>
-#include "adime/include/adime.h"
+#include <adime.h>
 #include "common.h"
 #include "group.h"
 #include "gui/gui-clip.h"



From fedora-extras-commits at redhat.com  Tue Apr 11 20:55:51 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Tue, 11 Apr 2006 13:55:51 -0700
Subject: rpms/qps/devel .cvsignore, 1.7, 1.8 qps.spec, 1.7, 1.8 sources, 1.7,
	1.8 qps.desktop, 1.1, NONE
Message-ID: <200604112055.k3BKtrFU001729@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/qps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1708

Modified Files:
	.cvsignore qps.spec sources 
Removed Files:
	qps.desktop 
Log Message:
Update to 1.9.15



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qps/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	22 Mar 2006 20:47:28 -0000	1.7
+++ .cvsignore	11 Apr 2006 20:55:51 -0000	1.8
@@ -1 +1 @@
-qps-1.9.14.tar.gz
+qps-1.9.15.tar.gz


Index: qps.spec
===================================================================
RCS file: /cvs/extras/rpms/qps/devel/qps.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- qps.spec	22 Mar 2006 20:47:28 -0000	1.7
+++ qps.spec	11 Apr 2006 20:55:51 -0000	1.8
@@ -1,13 +1,12 @@
 Name:           qps
-Version:        1.9.14
+Version:        1.9.15
 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/3267/qps-1.9.14.tar.gz
-Source1:        qps.desktop
+Source0:        http://kldp.net/frs/download.php/3304/qps-1.9.15.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -36,8 +35,7 @@
 
 desktop-file-install --vendor fedora \
 	--add-category=X-Fedora \
-	--dir %{buildroot}%{_datadir}/applications\
-	%{SOURCE1}
+	--dir %{buildroot}%{_datadir}/applications qps.desktop
 
 
 %clean
@@ -54,6 +52,9 @@
 
 
 %changelog
+* Tue Apr 11 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 1.9.15-1
+- Update to 1.9.15
+
 * Wed Mar 22 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 1.9.14-1
 - Update to 1.9.14
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qps/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	22 Mar 2006 20:47:28 -0000	1.7
+++ sources	11 Apr 2006 20:55:51 -0000	1.8
@@ -1 +1 @@
-6c45c290670e8dc938afad1cd013ef81  qps-1.9.14.tar.gz
+d4fd0c451598f12b8ff16e8bed58c07d  qps-1.9.15.tar.gz


--- qps.desktop DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 11 21:10:33 2006
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Tue, 11 Apr 2006 14:10:33 -0700
Subject: rpms/monotone/devel .cvsignore, 1.6, 1.7 README.monotone-server, 1.1,
	1.2 monotone-xfail-if-root.patch, 1.3, 1.4 monotone.init, 1.3,
	1.4 monotone.spec, 1.10, 1.11 monotone.sysconfig, 1.2,
	1.3 sources, 1.6, 1.7
Message-ID: <200604112110.k3BLAZpi003997@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/extras/rpms/monotone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3965

Modified Files:
	.cvsignore README.monotone-server monotone-xfail-if-root.patch 
	monotone.init monotone.spec monotone.sysconfig sources 
Log Message:
New upstream version 0.26


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Jan 2006 11:34:11 -0000	1.6
+++ .cvsignore	11 Apr 2006 21:10:32 -0000	1.7
@@ -1 +1 @@
-monotone-0.25.tar.gz
+monotone-0.26.tar.gz


Index: README.monotone-server
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/README.monotone-server,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.monotone-server	13 Dec 2005 07:35:07 -0000	1.1
+++ README.monotone-server	11 Apr 2006 21:10:32 -0000	1.2
@@ -35,7 +35,7 @@
 put a key in the server's database easily with "service monotone import",
 e.g. to import the public key for a private key in ~/.monotone/keys:
 
-	monotone pubkey me at my.com | sudo service monotone import
+	mtn pubkey me at my.com | sudo service monotone import
 
 For problems with this package or its scripts, please file bugs
 at http://bugzilla.redhat.com/ for the "monotone" component

monotone-xfail-if-root.patch:

Index: monotone-xfail-if-root.patch
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/monotone-xfail-if-root.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- monotone-xfail-if-root.patch	6 Jan 2006 11:34:11 -0000	1.3
+++ monotone-xfail-if-root.patch	11 Apr 2006 21:10:32 -0000	1.4
@@ -1,6 +1,17 @@
---- monotone-0.23/testsuite
-+++ monotone-0.23/testsuite
-@@ -67479,7 +67479,7 @@ $at_traceon
+--- monotone/tests/t_checkout_dir.at
++++ monotone/tests/t_checkout_dir.at
+@@ -20,7 +20,7 @@ AT_CHECK(MTN --branch=testbranch checkou
+ mkdir test_dir4
+ chmod 444 test_dir4
+ # XFAIL if run as root (hi Gentoo!)
+-AT_XFAIL_IF(test -O /)
++AT_XFAIL_IF(test -w test_dir4)
+ AT_CHECK(MTN --branch=testbranch checkout test_dir4,
+          [1], [ignore], [ignore])
+ AT_CHECK(MTN --branch=testbranch checkout test_dir4/subdir,
+--- monotone/testsuite
++++ monotone/testsuite
+@@ -69608,7 +69608,7 @@ $at_traceon
      at_desc='checkout validates target directory'
      $at_quiet $ECHO_N " 64: checkout validates target directory          $ECHO_C"
      at_xfail=no
@@ -9,14 +20,3 @@
      (
        echo "64. t_checkout_dir.at:1: testing ..."
        $at_traceon
---- monotone-0.23/tests/t_checkout_dir.at
-+++ monotone-0.23/tests/t_checkout_dir.at
-@@ -20,7 +20,7 @@ AT_CHECK(MONOTONE --branch=testbranch ch
- mkdir test_dir4
- chmod 444 test_dir4
- # XFAIL if run as root (hi Gentoo!)
--AT_XFAIL_IF(test -O /)
-+AT_XFAIL_IF(test -w test_dir4)
- AT_CHECK(MONOTONE --branch=testbranch checkout test_dir4,
-          [1], [ignore], [ignore])
- AT_CHECK(MONOTONE --branch=testbranch checkout test_dir4/subdir,


Index: monotone.init
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/monotone.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- monotone.init	13 Dec 2005 07:35:07 -0000	1.3
+++ monotone.init	11 Apr 2006 21:10:32 -0000	1.4
@@ -24,9 +24,10 @@
 # By default it's all good
 RETVAL=0
 
-MT=/usr/bin/monotone
+MT=/usr/bin/mtn
 MTSERVER=/usr/sbin/monotone-server
 MONOTONE_LOGFILE=${MONOTONE_LOGFILE:-/var/log/monotone.log}
+MONOTONE_OLDDB=/var/db/monotone/server.db
 
 random_passphrase()
 {
@@ -42,6 +43,11 @@
   start)
 	if [ -e $MONOTONE_DBFILE ]; then
 		$0 migrate
+	elif [ -e $MONOTONE_OLDDB ]; then
+		echo -n $"Pre-0.26 monotone database must be migrated by hand: "
+		failure
+		echo
+		false
 	else
 		$0 init
 	fi
@@ -86,7 +92,7 @@
 	RETVAL=$?
 	;;
   init)
-	echo -n $"Initializing database" "$MONOTONE_DBFILE" ": "
+	echo -n $"Initializing database" "${MONOTONE_DBFILE}: "
 	{ [ -d /var/db/monotone ] ||
  	  /usr/bin/install -o ${MONOTONE_USER:-monotone} \
 			   -g ${MONOTONE_GROUP:-monotone} \


Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/monotone.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- monotone.spec	28 Feb 2006 18:58:17 -0000	1.10
+++ monotone.spec	11 Apr 2006 21:10:32 -0000	1.11
@@ -1,6 +1,6 @@
 Name: monotone
-Version: 0.25
-Release: 3%{?dist}
+Version: 0.26
+Release: 1%{?dist}
 
 Summary: A free, distributed version control system
 Group: Development/Tools
@@ -75,6 +75,7 @@
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 rm -f %{buildroot}%{_infodir}/dir
+rm -f %{buildroot}%{_datadir}/doc/monotone/monotone.html
 
 %find_lang %{name}
 
@@ -87,7 +88,7 @@
 mkdir -p %{buildroot}/etc/init.d
 mkdir -p %{buildroot}/etc/sysconfig
 mkdir -p %{buildroot}/var/db
-ln -snf ../bin/monotone %{buildroot}%{_sbindir}/monotone-server
+ln -snf ../bin/mtn %{buildroot}%{_sbindir}/monotone-server
 %{__install} -c -m 0555 %{SOURCE1} %{buildroot}/etc/init.d/monotone
 %{__install} -c -m 0644 %{SOURCE2} %{buildroot}/etc/sysconfig/monotone
 %{__install} -d -m 0755 %{buildroot}/etc/monotone
@@ -99,7 +100,7 @@
 %{__install} -c -m 0640 /dev/null %{buildroot}/etc/monotone/read-permissions
 %{__install} -c -m 0640 /dev/null %{buildroot}/etc/monotone/write-permissions
 %{__install} -c -m 0644 /dev/null %{buildroot}/etc/monotone/monotonerc
-touch %{buildroot}/var/db/monotone/server.db
+touch %{buildroot}/var/db/monotone/server.mtn
 
 cp %{SOURCE3} .
 
@@ -124,9 +125,9 @@
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README README.changesets UPGRADE
 %doc monotone.html
 
-%{_bindir}/monotone
+%{_bindir}/mtn
 %{_infodir}/monotone.info*
-%{_mandir}/man1/monotone.1*
+%{_mandir}/man1/mtn.1*
 %{_datadir}/emacs/site-lisp/monotone*.el*
 
 
@@ -142,9 +143,8 @@
 %attr(0440,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/monotone/passphrase.lua
 %attr(0640,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/monotone/read-permissions
 %attr(0640,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/monotone/write-permissions
- %attr(0750,root,monotone) /etc/monotone/private-keys
 %dir %attr(0770,monotone,monotone) /var/db/monotone
-%attr(0660,monotone,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/db/monotone/server.db
+%attr(0660,monotone,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/db/monotone/server.mtn
 
 %pre server
 # Add the "monotone" user
@@ -166,8 +166,9 @@
 
 
 %changelog
-* Tue Feb 28 2006 Roland McGrath <roland at redhat.com> - 0.25-3
-- Rebuilt.
+* Mon Apr 10 2006 Roland McGrath <roland at redhat.com> - 0.26-1
+- Updated for 0.25 release.
+  - Major changes; see UPGRADE doc file for details.
 
 * Fri Jan  6 2006 Roland McGrath <roland at redhat.com> - 0.25-2
 - Restore testsuite fix for nonroot owner of / in build chroot.


Index: monotone.sysconfig
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/monotone.sysconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- monotone.sysconfig	13 Dec 2005 07:35:07 -0000	1.2
+++ monotone.sysconfig	11 Apr 2006 21:10:32 -0000	1.3
@@ -1,6 +1,6 @@
 MONOTONE_CONFDIR=/etc/monotone
 MONOTONE_KEYDIR=/etc/monotone/private-keys
-MONOTONE_DBFILE=/var/db/monotone/server.db
+MONOTONE_DBFILE=/var/db/monotone/server.mtn
 MONOTONE_PPFILE=/etc/monotone/passphrase.lua
 
 MONOTONE_RCOPTS="--confdir=$MONOTONE_CONFDIR"


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monotone/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Jan 2006 11:34:11 -0000	1.6
+++ sources	11 Apr 2006 21:10:32 -0000	1.7
@@ -1 +1 @@
-fb0ad449cd0093854c55dbd5c6fc07e2  monotone-0.25.tar.gz
+21b902d1b48ffb868536d04c4ad38155  monotone-0.26.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 21:12:22 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Tue, 11 Apr 2006 14:12:22 -0700
Subject: rpms/qps/FC-5 .cvsignore, 1.7, 1.8 qps.spec, 1.7, 1.8 sources, 1.7, 
	1.8 qps.desktop, 1.1, NONE
Message-ID: <200604112112.k3BLCOtH004156@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/qps/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4130

Modified Files:
	.cvsignore qps.spec sources 
Removed Files:
	qps.desktop 
Log Message:
Update to 1.9.15



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qps/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	22 Mar 2006 20:47:22 -0000	1.7
+++ .cvsignore	11 Apr 2006 21:12:22 -0000	1.8
@@ -1 +1 @@
-qps-1.9.14.tar.gz
+qps-1.9.15.tar.gz


Index: qps.spec
===================================================================
RCS file: /cvs/extras/rpms/qps/FC-5/qps.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- qps.spec	22 Mar 2006 20:47:22 -0000	1.7
+++ qps.spec	11 Apr 2006 21:12:22 -0000	1.8
@@ -1,13 +1,12 @@
 Name:           qps
-Version:        1.9.14
+Version:        1.9.15
 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/3267/qps-1.9.14.tar.gz
-Source1:        qps.desktop
+Source0:        http://kldp.net/frs/download.php/3304/qps-1.9.15.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -36,8 +35,7 @@
 
 desktop-file-install --vendor fedora \
 	--add-category=X-Fedora \
-	--dir %{buildroot}%{_datadir}/applications\
-	%{SOURCE1}
+	--dir %{buildroot}%{_datadir}/applications qps.desktop
 
 
 %clean
@@ -54,6 +52,9 @@
 
 
 %changelog
+* Tue Apr 11 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 1.9.15-1
+- Update to 1.9.15
+
 * Wed Mar 22 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 1.9.14-1
 - Update to 1.9.14
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qps/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	22 Mar 2006 20:47:22 -0000	1.7
+++ sources	11 Apr 2006 21:12:22 -0000	1.8
@@ -1 +1 @@
-6c45c290670e8dc938afad1cd013ef81  qps-1.9.14.tar.gz
+d4fd0c451598f12b8ff16e8bed58c07d  qps-1.9.15.tar.gz


--- qps.desktop DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 11 21:12:27 2006
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Tue, 11 Apr 2006 14:12:27 -0700
Subject: rpms/monotone/devel monotone-0.24-gcc41.patch,1.1,NONE
Message-ID: <200604112112.k3BLCTta004177@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/extras/rpms/monotone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4162

Removed Files:
	monotone-0.24-gcc41.patch 
Log Message:
Nuke obsolete patch


--- monotone-0.24-gcc41.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 11 21:19:30 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Tue, 11 Apr 2006 14:19:30 -0700
Subject: rpms/qps/FC-4 .cvsignore, 1.6, 1.7 qps.spec, 1.6, 1.7 sources, 1.6, 
	1.7 qps.desktop, 1.1, NONE
Message-ID: <200604112119.k3BLJWuV004279@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/qps/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4258

Modified Files:
	.cvsignore qps.spec sources 
Removed Files:
	qps.desktop 
Log Message:
Update to 1.9.15



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qps/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	22 Mar 2006 20:47:16 -0000	1.6
+++ .cvsignore	11 Apr 2006 21:19:30 -0000	1.7
@@ -1 +1 @@
-qps-1.9.14.tar.gz
+qps-1.9.15.tar.gz


Index: qps.spec
===================================================================
RCS file: /cvs/extras/rpms/qps/FC-4/qps.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- qps.spec	22 Mar 2006 20:47:16 -0000	1.6
+++ qps.spec	11 Apr 2006 21:19:30 -0000	1.7
@@ -1,13 +1,12 @@
 Name:           qps
-Version:        1.9.14
+Version:        1.9.15
 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/3267/qps-1.9.14.tar.gz
-Source1:        qps.desktop
+Source0:        http://kldp.net/frs/download.php/3304/qps-1.9.15.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -36,8 +35,7 @@
 
 desktop-file-install --vendor fedora \
 	--add-category=X-Fedora \
-	--dir %{buildroot}%{_datadir}/applications\
-	%{SOURCE1}
+	--dir %{buildroot}%{_datadir}/applications qps.desktop
 
 
 %clean
@@ -54,6 +52,9 @@
 
 
 %changelog
+* Tue Apr 11 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 1.9.15-1
+- Update to 1.9.15
+
 * Wed Mar 22 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 1.9.14-1
 - Update to 1.9.14
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qps/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	22 Mar 2006 20:47:16 -0000	1.6
+++ sources	11 Apr 2006 21:19:30 -0000	1.7
@@ -1 +1 @@
-6c45c290670e8dc938afad1cd013ef81  qps-1.9.14.tar.gz
+d4fd0c451598f12b8ff16e8bed58c07d  qps-1.9.15.tar.gz


--- qps.desktop DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 11 21:42:26 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 11 Apr 2006 14:42:26 -0700
Subject: rpms/perl-HTML-TableExtract/FC-4 perl-HTML-TableExtract.spec, 1.1,
	1.2
Message-ID: <200604112142.k3BLgSi0004574@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/perl-HTML-TableExtract/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4557

Modified Files:
	perl-HTML-TableExtract.spec 
Log Message:
bump



Index: perl-HTML-TableExtract.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-TableExtract/FC-4/perl-HTML-TableExtract.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-HTML-TableExtract.spec	11 Apr 2006 17:16:36 -0000	1.1
+++ perl-HTML-TableExtract.spec	11 Apr 2006 21:42:25 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-HTML-TableExtract
 Version:        2.07
-Release: 	2
+Release: 	1.fc4
 Summary:        A Perl module for extracting content in HTML tables
 Group:          Development/Libraries
 License:        Artistic or GPL



From fedora-extras-commits at redhat.com  Tue Apr 11 21:42:34 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 11 Apr 2006 14:42:34 -0700
Subject: rpms/perl-HTML-TableExtract/FC-5 perl-HTML-TableExtract.spec, 1.1,
	1.2
Message-ID: <200604112142.k3BLgafP004597@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/perl-HTML-TableExtract/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4580

Modified Files:
	perl-HTML-TableExtract.spec 
Log Message:
bump



Index: perl-HTML-TableExtract.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-TableExtract/FC-5/perl-HTML-TableExtract.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-HTML-TableExtract.spec	11 Apr 2006 17:16:36 -0000	1.1
+++ perl-HTML-TableExtract.spec	11 Apr 2006 21:42:33 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-HTML-TableExtract
 Version:        2.07
-Release: 	2
+Release: 	1.fc5
 Summary:        A Perl module for extracting content in HTML tables
 Group:          Development/Libraries
 License:        Artistic or GPL



From fedora-extras-commits at redhat.com  Tue Apr 11 21:43:43 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 11 Apr 2006 14:43:43 -0700
Subject: rpms/perl-Finance-Quote/FC-5 perl-Finance-Quote.spec,1.1,1.2
Message-ID: <200604112143.k3BLhjER004718@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/perl-Finance-Quote/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4683/FC-5

Modified Files:
	perl-Finance-Quote.spec 
Log Message:
bump



Index: perl-Finance-Quote.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Finance-Quote/FC-5/perl-Finance-Quote.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Finance-Quote.spec	11 Apr 2006 17:17:58 -0000	1.1
+++ perl-Finance-Quote.spec	11 Apr 2006 21:43:43 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Finance-Quote
 Version:        1.11
-Release: 	3
+Release: 	2.fc5
 Summary:        A Perl module that retrieves stock and mutual fund quotes
 Group:          Development/Libraries
 License:        GPL
@@ -45,7 +45,7 @@
 
 
 %changelog
-* Mon Apr 10 2006 Bill Nottingham <notting at redhat.com> - 1.11-3
+* Mon Apr 10 2006 Bill Nottingham <notting at redhat.com> - 1.11-2.fc5
 - add buildreq for perl-HTML-TableExtract
 - clean up sed
 



From fedora-extras-commits at redhat.com  Tue Apr 11 21:43:42 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 11 Apr 2006 14:43:42 -0700
Subject: rpms/perl-Finance-Quote/FC-4 perl-Finance-Quote.spec,1.1,1.2
Message-ID: <200604112143.k3BLhiSV004714@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/perl-Finance-Quote/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4683/FC-4

Modified Files:
	perl-Finance-Quote.spec 
Log Message:
bump



Index: perl-Finance-Quote.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Finance-Quote/FC-4/perl-Finance-Quote.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Finance-Quote.spec	11 Apr 2006 17:17:58 -0000	1.1
+++ perl-Finance-Quote.spec	11 Apr 2006 21:43:42 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Finance-Quote
 Version:        1.11
-Release: 	3
+Release: 	2.fc4
 Summary:        A Perl module that retrieves stock and mutual fund quotes
 Group:          Development/Libraries
 License:        GPL
@@ -45,7 +45,7 @@
 
 
 %changelog
-* Mon Apr 10 2006 Bill Nottingham <notting at redhat.com> - 1.11-3
+* Mon Apr 10 2006 Bill Nottingham <notting at redhat.com> - 1.11-2.fc4
 - add buildreq for perl-HTML-TableExtract
 - clean up sed
 



From fedora-extras-commits at redhat.com  Tue Apr 11 21:59:22 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 11 Apr 2006 14:59:22 -0700
Subject: rpms/libsexy/FC-4 .cvsignore, 1.4, 1.5 libsexy.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <200604112159.k3BLxPZn004782@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/libsexy/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4761

Modified Files:
	.cvsignore libsexy.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsexy/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	11 Nov 2005 05:57:22 -0000	1.4
+++ .cvsignore	11 Apr 2006 21:59:22 -0000	1.5
@@ -1 +1 @@
-libsexy-0.1.4.tar.gz
+libsexy-0.1.8.tar.gz


Index: libsexy.spec
===================================================================
RCS file: /cvs/extras/rpms/libsexy/FC-4/libsexy.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libsexy.spec	11 Nov 2005 05:57:22 -0000	1.4
+++ libsexy.spec	11 Apr 2006 21:59:22 -0000	1.5
@@ -1,19 +1,19 @@
 Name:           libsexy
-Version:        0.1.4
+Version:        0.1.8
 Release:        1%{?dist}
-Summary:        Sexy new graphical widgets for GTK+ 2
+Summary:        Funky fresh graphical widgets for GTK+ 2
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://wiki.chipx86.com/wiki/Libsexy
-Source0:        http://osiris.chipx86.com/projects/libsexy/releases/%{name}-%{version}.tar.gz
+Source0:        http://releases.chipx86.com/libsexy/libsexy/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk2-devel libxml2-devel enchant-devel
+BuildRequires:  gtk2-devel libxml2-devel
+Requires:       enchant
 
 %description
-Some sexy new graphical widgets for GTK+ 2 applications. Doing naughty things
-to good widgets!
+Some funky fresh graphical widgets for GTK+ 2 applications.
 
 %package        devel
 Summary:        Headers and libraries for developing with libsexy
@@ -28,7 +28,7 @@
 %setup -q
 
 %build
-%configure --disable-static
+%configure --disable-static --enable-gtk-doc
 make %{?_smp_mflags}
 
 %install
@@ -50,11 +50,15 @@
 
 %files devel
 %defattr(-,root,root,-)
+%{_datadir}/gtk-doc/html/%{name}
 %{_includedir}/%{name}
 %{_libdir}/%{name}.so
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Tue Apr 11 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.1.8-1
+- Upstream update
+
 * Wed Nov  9 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.1.4-1
 - Upstream update
 - Build with enchant (#172577)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsexy/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Nov 2005 05:57:22 -0000	1.4
+++ sources	11 Apr 2006 21:59:22 -0000	1.5
@@ -1 +1 @@
-2fb4072a740b9ab4ad2ff5a323f7fd3d  libsexy-0.1.4.tar.gz
+ddc52cc8196f9f0bf48a5c7569b6bb38  libsexy-0.1.8.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 22:14:54 2006
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Apr 2006 15:14:54 -0700
Subject: rpms/oddjob import.log,1.5,1.6
Message-ID: <200604112214.k3BMEul9007007@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/oddjob
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6974

Modified Files:
	import.log 
Log Message:
auto-import oddjob-0.25-1 on branch devel from oddjob-0.25-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/oddjob/import.log,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- import.log	28 Feb 2006 06:58:32 -0000	1.5
+++ import.log	11 Apr 2006 22:14:53 -0000	1.6
@@ -2,3 +2,4 @@
 oddjob-0_24-1:FC-3:oddjob-0.24-1.src.rpm:1141109637
 oddjob-0_24-2:FC-4:oddjob-0.24-2.src.rpm:1141109813
 oddjob-0_24-3:HEAD:oddjob-0.24-3.src.rpm:1141109909
+oddjob-0_25-1:HEAD:oddjob-0.25-1.src.rpm:1144793690



From fedora-extras-commits at redhat.com  Tue Apr 11 22:14:54 2006
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Apr 2006 15:14:54 -0700
Subject: rpms/oddjob/devel .cvsignore, 1.3, 1.4 oddjob.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <200604112214.k3BMEuG0007013@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/oddjob/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6974/devel

Modified Files:
	.cvsignore oddjob.spec sources 
Log Message:
auto-import oddjob-0.25-1 on branch devel from oddjob-0.25-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/oddjob/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Feb 2006 06:58:38 -0000	1.3
+++ .cvsignore	11 Apr 2006 22:14:54 -0000	1.4
@@ -1 +1 @@
-oddjob-0.24-1.tar.gz
+oddjob-0.25-1.tar.gz


Index: oddjob.spec
===================================================================
RCS file: /cvs/extras/rpms/oddjob/devel/oddjob.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- oddjob.spec	28 Feb 2006 06:58:38 -0000	1.2
+++ oddjob.spec	11 Apr 2006 22:14:54 -0000	1.3
@@ -1,8 +1,8 @@
 %define build_sample 0
 
 Name: oddjob
-Version: 0.24
-Release: 3
+Version: 0.25
+Release: 1
 Source: http://people.redhat.com/nalin/oddjob/oddjob-%{version}-1.tar.gz
 Summary: A D-BUS service which runs odd jobs on behalf of client applications
 License: BSD
@@ -102,6 +102,7 @@
 %config(noreplace) %{_sysconfdir}/dbus-*/system.d/oddjob.conf
 %config(noreplace) %{_sysconfdir}/oddjobd.conf
 %dir %{_sysconfdir}/oddjobd.conf.d
+%config %{_sysconfdir}/oddjobd.conf.d/oddjobd-introspection.conf
 %dir %{_sysconfdir}/%{name}
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/mkhomedir
@@ -142,11 +143,11 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
-* Tue Feb 28 2006 Nalin Dahyabhai <nalin at redhat.com> 0.24-3
-- rebuild
-
-* Tue Feb 28 2006 Nalin Dahyabhai <nalin at redhat.com> 0.24-2
-- rebuild
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-1
+- update to 0.25:
+  - add introspection for parents of objects specified in the configuration
+  - oddjobd can reload its configuration now
+  - add -u (umask) and -s (skeldir) flags to the mkhomedir helper
 
 * Tue Feb 28 2006 Nalin Dahyabhai <nalin at redhat.com> 0.24-1
 - update to 0.24, fixing some build errors against D-BUS 0.30-0.33


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/oddjob/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Feb 2006 06:58:38 -0000	1.3
+++ sources	11 Apr 2006 22:14:54 -0000	1.4
@@ -1 +1 @@
-c44b3161ca2e6c30107e597976cc296d  oddjob-0.24-1.tar.gz
+097d0a926874551a661f33d4c2db5169  oddjob-0.25-1.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 22:16:42 2006
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Apr 2006 15:16:42 -0700
Subject: rpms/oddjob/devel oddjob.spec,1.3,1.4
Message-ID: <200604112216.k3BMGiho007106@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/oddjob/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7071/devel

Modified Files:
	oddjob.spec 
Log Message:
auto-import oddjob-0.25-2 on branch devel from oddjob-0.25-2.src.rpm


Index: oddjob.spec
===================================================================
RCS file: /cvs/extras/rpms/oddjob/devel/oddjob.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- oddjob.spec	11 Apr 2006 22:14:54 -0000	1.3
+++ oddjob.spec	11 Apr 2006 22:16:42 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name: oddjob
 Version: 0.25
-Release: 1
+Release: 2
 Source: http://people.redhat.com/nalin/oddjob/oddjob-%{version}-1.tar.gz
 Summary: A D-BUS service which runs odd jobs on behalf of client applications
 License: BSD
@@ -143,6 +143,9 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-2
+- rebuild
+
 * Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-1
 - update to 0.25:
   - add introspection for parents of objects specified in the configuration



From fedora-extras-commits at redhat.com  Tue Apr 11 22:16:42 2006
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Apr 2006 15:16:42 -0700
Subject: rpms/oddjob import.log,1.6,1.7
Message-ID: <200604112216.k3BMGiMK007102@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/oddjob
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7071

Modified Files:
	import.log 
Log Message:
auto-import oddjob-0.25-2 on branch devel from oddjob-0.25-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/oddjob/import.log,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- import.log	11 Apr 2006 22:14:53 -0000	1.6
+++ import.log	11 Apr 2006 22:16:41 -0000	1.7
@@ -3,3 +3,4 @@
 oddjob-0_24-2:FC-4:oddjob-0.24-2.src.rpm:1141109813
 oddjob-0_24-3:HEAD:oddjob-0.24-3.src.rpm:1141109909
 oddjob-0_25-1:HEAD:oddjob-0.25-1.src.rpm:1144793690
+oddjob-0_25-2:HEAD:oddjob-0.25-2.src.rpm:1144793797



From fedora-extras-commits at redhat.com  Tue Apr 11 22:17:17 2006
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Apr 2006 15:17:17 -0700
Subject: rpms/oddjob import.log,1.7,1.8
Message-ID: <200604112217.k3BMHJ1L007192@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/oddjob
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7161

Modified Files:
	import.log 
Log Message:
auto-import oddjob-0.25-3 on branch devel from oddjob-0.25-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/oddjob/import.log,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- import.log	11 Apr 2006 22:16:41 -0000	1.7
+++ import.log	11 Apr 2006 22:17:16 -0000	1.8
@@ -4,3 +4,4 @@
 oddjob-0_24-3:HEAD:oddjob-0.24-3.src.rpm:1141109909
 oddjob-0_25-1:HEAD:oddjob-0.25-1.src.rpm:1144793690
 oddjob-0_25-2:HEAD:oddjob-0.25-2.src.rpm:1144793797
+oddjob-0_25-3:HEAD:oddjob-0.25-3.src.rpm:1144793832



From fedora-extras-commits at redhat.com  Tue Apr 11 22:17:17 2006
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Apr 2006 15:17:17 -0700
Subject: rpms/oddjob/devel oddjob.spec,1.4,1.5
Message-ID: <200604112217.k3BMHJqY007196@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/oddjob/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7161/devel

Modified Files:
	oddjob.spec 
Log Message:
auto-import oddjob-0.25-3 on branch devel from oddjob-0.25-3.src.rpm


Index: oddjob.spec
===================================================================
RCS file: /cvs/extras/rpms/oddjob/devel/oddjob.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- oddjob.spec	11 Apr 2006 22:16:42 -0000	1.4
+++ oddjob.spec	11 Apr 2006 22:17:17 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name: oddjob
 Version: 0.25
-Release: 2
+Release: 3
 Source: http://people.redhat.com/nalin/oddjob/oddjob-%{version}-1.tar.gz
 Summary: A D-BUS service which runs odd jobs on behalf of client applications
 License: BSD
@@ -143,6 +143,9 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-3
+- rebuild
+
 * Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-2
 - rebuild
 



From fedora-extras-commits at redhat.com  Tue Apr 11 22:17:48 2006
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Apr 2006 15:17:48 -0700
Subject: rpms/oddjob import.log,1.8,1.9
Message-ID: <200604112217.k3BMHoYE007282@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/oddjob
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7251

Modified Files:
	import.log 
Log Message:
auto-import oddjob-0.25-4 on branch devel from oddjob-0.25-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/oddjob/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	11 Apr 2006 22:17:16 -0000	1.8
+++ import.log	11 Apr 2006 22:17:47 -0000	1.9
@@ -5,3 +5,4 @@
 oddjob-0_25-1:HEAD:oddjob-0.25-1.src.rpm:1144793690
 oddjob-0_25-2:HEAD:oddjob-0.25-2.src.rpm:1144793797
 oddjob-0_25-3:HEAD:oddjob-0.25-3.src.rpm:1144793832
+oddjob-0_25-4:HEAD:oddjob-0.25-4.src.rpm:1144793863



From fedora-extras-commits at redhat.com  Tue Apr 11 22:17:48 2006
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Apr 2006 15:17:48 -0700
Subject: rpms/oddjob/devel oddjob.spec,1.5,1.6
Message-ID: <200604112217.k3BMHo0m007286@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/oddjob/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7251/devel

Modified Files:
	oddjob.spec 
Log Message:
auto-import oddjob-0.25-4 on branch devel from oddjob-0.25-4.src.rpm


Index: oddjob.spec
===================================================================
RCS file: /cvs/extras/rpms/oddjob/devel/oddjob.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- oddjob.spec	11 Apr 2006 22:17:17 -0000	1.5
+++ oddjob.spec	11 Apr 2006 22:17:48 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name: oddjob
 Version: 0.25
-Release: 3
+Release: 4
 Source: http://people.redhat.com/nalin/oddjob/oddjob-%{version}-1.tar.gz
 Summary: A D-BUS service which runs odd jobs on behalf of client applications
 License: BSD
@@ -143,6 +143,9 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-4
+- rebuild
+
 * Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-3
 - rebuild
 



From fedora-extras-commits at redhat.com  Tue Apr 11 22:18:57 2006
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Apr 2006 15:18:57 -0700
Subject: rpms/oddjob import.log,1.9,1.10
Message-ID: <200604112218.k3BMIxa1007390@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/oddjob
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7357

Modified Files:
	import.log 
Log Message:
auto-import oddjob-0.25-1 on branch FC-3 from oddjob-0.25-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/oddjob/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- import.log	11 Apr 2006 22:17:47 -0000	1.9
+++ import.log	11 Apr 2006 22:18:57 -0000	1.10
@@ -6,3 +6,4 @@
 oddjob-0_25-2:HEAD:oddjob-0.25-2.src.rpm:1144793797
 oddjob-0_25-3:HEAD:oddjob-0.25-3.src.rpm:1144793832
 oddjob-0_25-4:HEAD:oddjob-0.25-4.src.rpm:1144793863
+oddjob-0_25-1:FC-3:oddjob-0.25-1.src.rpm:1144793933



From fedora-extras-commits at redhat.com  Tue Apr 11 22:18:58 2006
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Apr 2006 15:18:58 -0700
Subject: rpms/oddjob/FC-3 .cvsignore, 1.3, 1.4 oddjob.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <200604112219.k3BMJ0J0007396@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/oddjob/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7357/FC-3

Modified Files:
	.cvsignore oddjob.spec sources 
Log Message:
auto-import oddjob-0.25-1 on branch FC-3 from oddjob-0.25-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/oddjob/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Feb 2006 06:54:07 -0000	1.3
+++ .cvsignore	11 Apr 2006 22:18:57 -0000	1.4
@@ -1 +1 @@
-oddjob-0.24-1.tar.gz
+oddjob-0.25-1.tar.gz


Index: oddjob.spec
===================================================================
RCS file: /cvs/extras/rpms/oddjob/FC-3/oddjob.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- oddjob.spec	28 Feb 2006 06:54:07 -0000	1.3
+++ oddjob.spec	11 Apr 2006 22:18:57 -0000	1.4
@@ -1,7 +1,7 @@
 %define build_sample 0
 
 Name: oddjob
-Version: 0.24
+Version: 0.25
 Release: 1
 Source: http://people.redhat.com/nalin/oddjob/oddjob-%{version}-1.tar.gz
 Summary: A D-BUS service which runs odd jobs on behalf of client applications
@@ -102,6 +102,7 @@
 %config(noreplace) %{_sysconfdir}/dbus-*/system.d/oddjob.conf
 %config(noreplace) %{_sysconfdir}/oddjobd.conf
 %dir %{_sysconfdir}/oddjobd.conf.d
+%config %{_sysconfdir}/oddjobd.conf.d/oddjobd-introspection.conf
 %dir %{_sysconfdir}/%{name}
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/mkhomedir
@@ -142,6 +143,12 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-1
+- update to 0.25:
+  - add introspection for parents of objects specified in the configuration
+  - oddjobd can reload its configuration now
+  - add -u (umask) and -s (skeldir) flags to the mkhomedir helper
+
 * Tue Feb 28 2006 Nalin Dahyabhai <nalin at redhat.com> 0.24-1
 - update to 0.24, fixing some build errors against D-BUS 0.30-0.33
 - require xmlto, because the generated HTML differs depending on whether


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/oddjob/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Feb 2006 06:54:07 -0000	1.3
+++ sources	11 Apr 2006 22:18:57 -0000	1.4
@@ -1 +1 @@
-c44b3161ca2e6c30107e597976cc296d  oddjob-0.24-1.tar.gz
+097d0a926874551a661f33d4c2db5169  oddjob-0.25-1.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 22:21:02 2006
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Apr 2006 15:21:02 -0700
Subject: rpms/oddjob import.log,1.10,1.11
Message-ID: <200604112221.k3BML4Lq007529@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/oddjob
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7498

Modified Files:
	import.log 
Log Message:
auto-import oddjob-0.25-5 on branch FC-3 from oddjob-0.25-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/oddjob/import.log,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- import.log	11 Apr 2006 22:18:57 -0000	1.10
+++ import.log	11 Apr 2006 22:21:01 -0000	1.11
@@ -7,3 +7,4 @@
 oddjob-0_25-3:HEAD:oddjob-0.25-3.src.rpm:1144793832
 oddjob-0_25-4:HEAD:oddjob-0.25-4.src.rpm:1144793863
 oddjob-0_25-1:FC-3:oddjob-0.25-1.src.rpm:1144793933
+oddjob-0_25-5:FC-3:oddjob-0.25-5.src.rpm:1144794057



From fedora-extras-commits at redhat.com  Tue Apr 11 22:21:02 2006
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Apr 2006 15:21:02 -0700
Subject: rpms/oddjob/FC-3 oddjob.spec,1.4,1.5
Message-ID: <200604112221.k3BML42e007533@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/oddjob/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7498/FC-3

Modified Files:
	oddjob.spec 
Log Message:
auto-import oddjob-0.25-5 on branch FC-3 from oddjob-0.25-5.src.rpm


Index: oddjob.spec
===================================================================
RCS file: /cvs/extras/rpms/oddjob/FC-3/oddjob.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- oddjob.spec	11 Apr 2006 22:18:57 -0000	1.4
+++ oddjob.spec	11 Apr 2006 22:21:02 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name: oddjob
 Version: 0.25
-Release: 1
+Release: 5
 Source: http://people.redhat.com/nalin/oddjob/oddjob-%{version}-1.tar.gz
 Summary: A D-BUS service which runs odd jobs on behalf of client applications
 License: BSD
@@ -143,6 +143,18 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-5
+- rebuild
+
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-4
+- rebuild
+
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-3
+- rebuild
+
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-2
+- rebuild
+
 * Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-1
 - update to 0.25:
   - add introspection for parents of objects specified in the configuration



From fedora-extras-commits at redhat.com  Tue Apr 11 22:22:20 2006
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Apr 2006 15:22:20 -0700
Subject: rpms/oddjob import.log,1.11,1.12
Message-ID: <200604112222.k3BMMMnx007632@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/oddjob
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7599

Modified Files:
	import.log 
Log Message:
auto-import oddjob-0.25-6 on branch FC-4 from oddjob-0.25-6.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/oddjob/import.log,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- import.log	11 Apr 2006 22:21:01 -0000	1.11
+++ import.log	11 Apr 2006 22:22:20 -0000	1.12
@@ -8,3 +8,4 @@
 oddjob-0_25-4:HEAD:oddjob-0.25-4.src.rpm:1144793863
 oddjob-0_25-1:FC-3:oddjob-0.25-1.src.rpm:1144793933
 oddjob-0_25-5:FC-3:oddjob-0.25-5.src.rpm:1144794057
+oddjob-0_25-6:FC-4:oddjob-0.25-6.src.rpm:1144794136



From fedora-extras-commits at redhat.com  Tue Apr 11 22:22:21 2006
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Apr 2006 15:22:21 -0700
Subject: rpms/oddjob/FC-4 .cvsignore, 1.3, 1.4 oddjob.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <200604112222.k3BMMNDm007638@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/oddjob/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7599/FC-4

Modified Files:
	.cvsignore oddjob.spec sources 
Log Message:
auto-import oddjob-0.25-6 on branch FC-4 from oddjob-0.25-6.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/oddjob/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Feb 2006 06:57:02 -0000	1.3
+++ .cvsignore	11 Apr 2006 22:22:20 -0000	1.4
@@ -1 +1 @@
-oddjob-0.24-1.tar.gz
+oddjob-0.25-1.tar.gz


Index: oddjob.spec
===================================================================
RCS file: /cvs/extras/rpms/oddjob/FC-4/oddjob.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- oddjob.spec	28 Feb 2006 06:57:02 -0000	1.2
+++ oddjob.spec	11 Apr 2006 22:22:20 -0000	1.3
@@ -1,8 +1,8 @@
 %define build_sample 0
 
 Name: oddjob
-Version: 0.24
-Release: 2
+Version: 0.25
+Release: 6
 Source: http://people.redhat.com/nalin/oddjob/oddjob-%{version}-1.tar.gz
 Summary: A D-BUS service which runs odd jobs on behalf of client applications
 License: BSD
@@ -102,6 +102,7 @@
 %config(noreplace) %{_sysconfdir}/dbus-*/system.d/oddjob.conf
 %config(noreplace) %{_sysconfdir}/oddjobd.conf
 %dir %{_sysconfdir}/oddjobd.conf.d
+%config %{_sysconfdir}/oddjobd.conf.d/oddjobd-introspection.conf
 %dir %{_sysconfdir}/%{name}
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/mkhomedir
@@ -142,9 +143,27 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
-* Tue Feb 28 2006 Nalin Dahyabhai <nalin at redhat.com> 0.24-2
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-6
 - rebuild
 
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-5
+- rebuild
+
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-4
+- rebuild
+
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-3
+- rebuild
+
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-2
+- rebuild
+
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-1
+- update to 0.25:
+  - add introspection for parents of objects specified in the configuration
+  - oddjobd can reload its configuration now
+  - add -u (umask) and -s (skeldir) flags to the mkhomedir helper
+
 * Tue Feb 28 2006 Nalin Dahyabhai <nalin at redhat.com> 0.24-1
 - update to 0.24, fixing some build errors against D-BUS 0.30-0.33
 - require xmlto, because the generated HTML differs depending on whether


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/oddjob/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Feb 2006 06:57:02 -0000	1.3
+++ sources	11 Apr 2006 22:22:20 -0000	1.4
@@ -1 +1 @@
-c44b3161ca2e6c30107e597976cc296d  oddjob-0.24-1.tar.gz
+097d0a926874551a661f33d4c2db5169  oddjob-0.25-1.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 22:22:54 2006
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Apr 2006 15:22:54 -0700
Subject: rpms/oddjob import.log,1.12,1.13
Message-ID: <200604112223.k3BMNQ0K007733@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/oddjob
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7699

Modified Files:
	import.log 
Log Message:
auto-import oddjob-0.25-7 on branch FC-5 from oddjob-0.25-7.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/oddjob/import.log,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- import.log	11 Apr 2006 22:22:20 -0000	1.12
+++ import.log	11 Apr 2006 22:22:54 -0000	1.13
@@ -9,3 +9,4 @@
 oddjob-0_25-1:FC-3:oddjob-0.25-1.src.rpm:1144793933
 oddjob-0_25-5:FC-3:oddjob-0.25-5.src.rpm:1144794057
 oddjob-0_25-6:FC-4:oddjob-0.25-6.src.rpm:1144794136
+oddjob-0_25-7:FC-5:oddjob-0.25-7.src.rpm:1144794170



From fedora-extras-commits at redhat.com  Tue Apr 11 22:22:54 2006
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Apr 2006 15:22:54 -0700
Subject: rpms/oddjob/FC-5 .cvsignore, 1.3, 1.4 oddjob.spec, 1.2, 1.3 sources,
	1.3, 1.4
Message-ID: <200604112223.k3BMNRi8007738@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/oddjob/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7699/FC-5

Modified Files:
	.cvsignore oddjob.spec sources 
Log Message:
auto-import oddjob-0.25-7 on branch FC-5 from oddjob-0.25-7.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/oddjob/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	28 Feb 2006 06:58:38 -0000	1.3
+++ .cvsignore	11 Apr 2006 22:22:54 -0000	1.4
@@ -1 +1 @@
-oddjob-0.24-1.tar.gz
+oddjob-0.25-1.tar.gz


Index: oddjob.spec
===================================================================
RCS file: /cvs/extras/rpms/oddjob/FC-5/oddjob.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- oddjob.spec	28 Feb 2006 06:58:38 -0000	1.2
+++ oddjob.spec	11 Apr 2006 22:22:54 -0000	1.3
@@ -1,8 +1,8 @@
 %define build_sample 0
 
 Name: oddjob
-Version: 0.24
-Release: 3
+Version: 0.25
+Release: 7
 Source: http://people.redhat.com/nalin/oddjob/oddjob-%{version}-1.tar.gz
 Summary: A D-BUS service which runs odd jobs on behalf of client applications
 License: BSD
@@ -102,6 +102,7 @@
 %config(noreplace) %{_sysconfdir}/dbus-*/system.d/oddjob.conf
 %config(noreplace) %{_sysconfdir}/oddjobd.conf
 %dir %{_sysconfdir}/oddjobd.conf.d
+%config %{_sysconfdir}/oddjobd.conf.d/oddjobd-introspection.conf
 %dir %{_sysconfdir}/%{name}
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/mkhomedir
@@ -142,12 +143,30 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
-* Tue Feb 28 2006 Nalin Dahyabhai <nalin at redhat.com> 0.24-3
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-7
 - rebuild
 
-* Tue Feb 28 2006 Nalin Dahyabhai <nalin at redhat.com> 0.24-2
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-6
 - rebuild
 
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-5
+- rebuild
+
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-4
+- rebuild
+
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-3
+- rebuild
+
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-2
+- rebuild
+
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-1
+- update to 0.25:
+  - add introspection for parents of objects specified in the configuration
+  - oddjobd can reload its configuration now
+  - add -u (umask) and -s (skeldir) flags to the mkhomedir helper
+
 * Tue Feb 28 2006 Nalin Dahyabhai <nalin at redhat.com> 0.24-1
 - update to 0.24, fixing some build errors against D-BUS 0.30-0.33
 - require xmlto, because the generated HTML differs depending on whether


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/oddjob/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Feb 2006 06:58:38 -0000	1.3
+++ sources	11 Apr 2006 22:22:54 -0000	1.4
@@ -1 +1 @@
-c44b3161ca2e6c30107e597976cc296d  oddjob-0.24-1.tar.gz
+097d0a926874551a661f33d4c2db5169  oddjob-0.25-1.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 22:23:58 2006
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Apr 2006 15:23:58 -0700
Subject: rpms/oddjob import.log,1.13,1.14
Message-ID: <200604112224.k3BMO03p007829@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/oddjob
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7798

Modified Files:
	import.log 
Log Message:
auto-import oddjob-0.25-8 on branch devel from oddjob-0.25-8.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/oddjob/import.log,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- import.log	11 Apr 2006 22:22:54 -0000	1.13
+++ import.log	11 Apr 2006 22:23:57 -0000	1.14
@@ -10,3 +10,4 @@
 oddjob-0_25-5:FC-3:oddjob-0.25-5.src.rpm:1144794057
 oddjob-0_25-6:FC-4:oddjob-0.25-6.src.rpm:1144794136
 oddjob-0_25-7:FC-5:oddjob-0.25-7.src.rpm:1144794170
+oddjob-0_25-8:HEAD:oddjob-0.25-8.src.rpm:1144794233



From fedora-extras-commits at redhat.com  Tue Apr 11 22:23:58 2006
From: fedora-extras-commits at redhat.com (Nalin Somabhai Dahyabhai (nalin))
Date: Tue, 11 Apr 2006 15:23:58 -0700
Subject: rpms/oddjob/devel oddjob.spec,1.6,1.7
Message-ID: <200604112224.k3BMO01S007833@cvs-int.fedora.redhat.com>

Author: nalin

Update of /cvs/extras/rpms/oddjob/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7798/devel

Modified Files:
	oddjob.spec 
Log Message:
auto-import oddjob-0.25-8 on branch devel from oddjob-0.25-8.src.rpm


Index: oddjob.spec
===================================================================
RCS file: /cvs/extras/rpms/oddjob/devel/oddjob.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- oddjob.spec	11 Apr 2006 22:17:48 -0000	1.6
+++ oddjob.spec	11 Apr 2006 22:23:58 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name: oddjob
 Version: 0.25
-Release: 4
+Release: 8
 Source: http://people.redhat.com/nalin/oddjob/oddjob-%{version}-1.tar.gz
 Summary: A D-BUS service which runs odd jobs on behalf of client applications
 License: BSD
@@ -143,6 +143,18 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-8
+- rebuild
+
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-7
+- rebuild
+
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-6
+- rebuild
+
+* Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-5
+- rebuild
+
 * Tue Apr 11 2006 Nalin Dahyabhai <nalin at redhat.com> 0.25-4
 - rebuild
 



From fedora-extras-commits at redhat.com  Tue Apr 11 22:28:39 2006
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Tue, 11 Apr 2006 15:28:39 -0700
Subject: rpms/monotone/FC-5 .cvsignore, 1.6, 1.7 README.monotone-server, 1.1,
	1.2 monotone-xfail-if-root.patch, 1.3, 1.4 monotone.init, 1.3,
	1.4 monotone.spec, 1.10, 1.11 monotone.sysconfig, 1.2,
	1.3 sources, 1.6, 1.7 monotone-0.24-gcc41.patch, 1.1, NONE
Message-ID: <200604112228.k3BMSf8K007945@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/extras/rpms/monotone/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7913

Modified Files:
	.cvsignore README.monotone-server monotone-xfail-if-root.patch 
	monotone.init monotone.spec monotone.sysconfig sources 
Removed Files:
	monotone-0.24-gcc41.patch 
Log Message:
New upstream version 0.26


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Jan 2006 11:34:11 -0000	1.6
+++ .cvsignore	11 Apr 2006 22:28:39 -0000	1.7
@@ -1 +1 @@
-monotone-0.25.tar.gz
+monotone-0.26.tar.gz


Index: README.monotone-server
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-5/README.monotone-server,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.monotone-server	13 Dec 2005 07:35:07 -0000	1.1
+++ README.monotone-server	11 Apr 2006 22:28:39 -0000	1.2
@@ -35,7 +35,7 @@
 put a key in the server's database easily with "service monotone import",
 e.g. to import the public key for a private key in ~/.monotone/keys:
 
-	monotone pubkey me at my.com | sudo service monotone import
+	mtn pubkey me at my.com | sudo service monotone import
 
 For problems with this package or its scripts, please file bugs
 at http://bugzilla.redhat.com/ for the "monotone" component

monotone-xfail-if-root.patch:

Index: monotone-xfail-if-root.patch
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-5/monotone-xfail-if-root.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- monotone-xfail-if-root.patch	6 Jan 2006 11:34:11 -0000	1.3
+++ monotone-xfail-if-root.patch	11 Apr 2006 22:28:39 -0000	1.4
@@ -1,6 +1,17 @@
---- monotone-0.23/testsuite
-+++ monotone-0.23/testsuite
-@@ -67479,7 +67479,7 @@ $at_traceon
+--- monotone/tests/t_checkout_dir.at
++++ monotone/tests/t_checkout_dir.at
+@@ -20,7 +20,7 @@ AT_CHECK(MTN --branch=testbranch checkou
+ mkdir test_dir4
+ chmod 444 test_dir4
+ # XFAIL if run as root (hi Gentoo!)
+-AT_XFAIL_IF(test -O /)
++AT_XFAIL_IF(test -w test_dir4)
+ AT_CHECK(MTN --branch=testbranch checkout test_dir4,
+          [1], [ignore], [ignore])
+ AT_CHECK(MTN --branch=testbranch checkout test_dir4/subdir,
+--- monotone/testsuite
++++ monotone/testsuite
+@@ -69608,7 +69608,7 @@ $at_traceon
      at_desc='checkout validates target directory'
      $at_quiet $ECHO_N " 64: checkout validates target directory          $ECHO_C"
      at_xfail=no
@@ -9,14 +20,3 @@
      (
        echo "64. t_checkout_dir.at:1: testing ..."
        $at_traceon
---- monotone-0.23/tests/t_checkout_dir.at
-+++ monotone-0.23/tests/t_checkout_dir.at
-@@ -20,7 +20,7 @@ AT_CHECK(MONOTONE --branch=testbranch ch
- mkdir test_dir4
- chmod 444 test_dir4
- # XFAIL if run as root (hi Gentoo!)
--AT_XFAIL_IF(test -O /)
-+AT_XFAIL_IF(test -w test_dir4)
- AT_CHECK(MONOTONE --branch=testbranch checkout test_dir4,
-          [1], [ignore], [ignore])
- AT_CHECK(MONOTONE --branch=testbranch checkout test_dir4/subdir,


Index: monotone.init
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-5/monotone.init,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- monotone.init	13 Dec 2005 07:35:07 -0000	1.3
+++ monotone.init	11 Apr 2006 22:28:39 -0000	1.4
@@ -24,9 +24,10 @@
 # By default it's all good
 RETVAL=0
 
-MT=/usr/bin/monotone
+MT=/usr/bin/mtn
 MTSERVER=/usr/sbin/monotone-server
 MONOTONE_LOGFILE=${MONOTONE_LOGFILE:-/var/log/monotone.log}
+MONOTONE_OLDDB=/var/db/monotone/server.db
 
 random_passphrase()
 {
@@ -42,6 +43,11 @@
   start)
 	if [ -e $MONOTONE_DBFILE ]; then
 		$0 migrate
+	elif [ -e $MONOTONE_OLDDB ]; then
+		echo -n $"Pre-0.26 monotone database must be migrated by hand: "
+		failure
+		echo
+		false
 	else
 		$0 init
 	fi
@@ -86,7 +92,7 @@
 	RETVAL=$?
 	;;
   init)
-	echo -n $"Initializing database" "$MONOTONE_DBFILE" ": "
+	echo -n $"Initializing database" "${MONOTONE_DBFILE}: "
 	{ [ -d /var/db/monotone ] ||
  	  /usr/bin/install -o ${MONOTONE_USER:-monotone} \
 			   -g ${MONOTONE_GROUP:-monotone} \


Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-5/monotone.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- monotone.spec	28 Feb 2006 18:58:17 -0000	1.10
+++ monotone.spec	11 Apr 2006 22:28:39 -0000	1.11
@@ -1,6 +1,6 @@
 Name: monotone
-Version: 0.25
-Release: 3%{?dist}
+Version: 0.26
+Release: 1%{?dist}
 
 Summary: A free, distributed version control system
 Group: Development/Tools
@@ -75,6 +75,7 @@
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 rm -f %{buildroot}%{_infodir}/dir
+rm -f %{buildroot}%{_datadir}/doc/monotone/monotone.html
 
 %find_lang %{name}
 
@@ -87,7 +88,7 @@
 mkdir -p %{buildroot}/etc/init.d
 mkdir -p %{buildroot}/etc/sysconfig
 mkdir -p %{buildroot}/var/db
-ln -snf ../bin/monotone %{buildroot}%{_sbindir}/monotone-server
+ln -snf ../bin/mtn %{buildroot}%{_sbindir}/monotone-server
 %{__install} -c -m 0555 %{SOURCE1} %{buildroot}/etc/init.d/monotone
 %{__install} -c -m 0644 %{SOURCE2} %{buildroot}/etc/sysconfig/monotone
 %{__install} -d -m 0755 %{buildroot}/etc/monotone
@@ -99,7 +100,7 @@
 %{__install} -c -m 0640 /dev/null %{buildroot}/etc/monotone/read-permissions
 %{__install} -c -m 0640 /dev/null %{buildroot}/etc/monotone/write-permissions
 %{__install} -c -m 0644 /dev/null %{buildroot}/etc/monotone/monotonerc
-touch %{buildroot}/var/db/monotone/server.db
+touch %{buildroot}/var/db/monotone/server.mtn
 
 cp %{SOURCE3} .
 
@@ -124,9 +125,9 @@
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README README.changesets UPGRADE
 %doc monotone.html
 
-%{_bindir}/monotone
+%{_bindir}/mtn
 %{_infodir}/monotone.info*
-%{_mandir}/man1/monotone.1*
+%{_mandir}/man1/mtn.1*
 %{_datadir}/emacs/site-lisp/monotone*.el*
 
 
@@ -142,9 +143,8 @@
 %attr(0440,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/monotone/passphrase.lua
 %attr(0640,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/monotone/read-permissions
 %attr(0640,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/monotone/write-permissions
- %attr(0750,root,monotone) /etc/monotone/private-keys
 %dir %attr(0770,monotone,monotone) /var/db/monotone
-%attr(0660,monotone,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/db/monotone/server.db
+%attr(0660,monotone,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/db/monotone/server.mtn
 
 %pre server
 # Add the "monotone" user
@@ -166,8 +166,9 @@
 
 
 %changelog
-* Tue Feb 28 2006 Roland McGrath <roland at redhat.com> - 0.25-3
-- Rebuilt.
+* Mon Apr 10 2006 Roland McGrath <roland at redhat.com> - 0.26-1
+- Updated for 0.25 release.
+  - Major changes; see UPGRADE doc file for details.
 
 * Fri Jan  6 2006 Roland McGrath <roland at redhat.com> - 0.25-2
 - Restore testsuite fix for nonroot owner of / in build chroot.


Index: monotone.sysconfig
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-5/monotone.sysconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- monotone.sysconfig	13 Dec 2005 07:35:07 -0000	1.2
+++ monotone.sysconfig	11 Apr 2006 22:28:39 -0000	1.3
@@ -1,6 +1,6 @@
 MONOTONE_CONFDIR=/etc/monotone
 MONOTONE_KEYDIR=/etc/monotone/private-keys
-MONOTONE_DBFILE=/var/db/monotone/server.db
+MONOTONE_DBFILE=/var/db/monotone/server.mtn
 MONOTONE_PPFILE=/etc/monotone/passphrase.lua
 
 MONOTONE_RCOPTS="--confdir=$MONOTONE_CONFDIR"


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Jan 2006 11:34:11 -0000	1.6
+++ sources	11 Apr 2006 22:28:39 -0000	1.7
@@ -1 +1 @@
-fb0ad449cd0093854c55dbd5c6fc07e2  monotone-0.25.tar.gz
+21b902d1b48ffb868536d04c4ad38155  monotone-0.26.tar.gz


--- monotone-0.24-gcc41.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 11 22:29:29 2006
From: fedora-extras-commits at redhat.com (Roland McGrath (roland))
Date: Tue, 11 Apr 2006 15:29:29 -0700
Subject: rpms/monotone/FC-4 .cvsignore, 1.6, 1.7 README.monotone-server, 1.1,
	1.2 monotone-xfail-if-root.patch, 1.3, 1.4 monotone.init, 1.6,
	1.7 monotone.spec, 1.14, 1.15 monotone.sysconfig, 1.2,
	1.3 sources, 1.6, 1.7
Message-ID: <200604112229.k3BMTVUD008026@cvs-int.fedora.redhat.com>

Author: roland

Update of /cvs/extras/rpms/monotone/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7994

Modified Files:
	.cvsignore README.monotone-server monotone-xfail-if-root.patch 
	monotone.init monotone.spec monotone.sysconfig sources 
Log Message:
New upstream version 0.26


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Jan 2006 09:29:34 -0000	1.6
+++ .cvsignore	11 Apr 2006 22:29:29 -0000	1.7
@@ -1 +1 @@
-monotone-0.25.tar.gz
+monotone-0.26.tar.gz


Index: README.monotone-server
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/README.monotone-server,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- README.monotone-server	12 Dec 2005 02:38:33 -0000	1.1
+++ README.monotone-server	11 Apr 2006 22:29:29 -0000	1.2
@@ -35,7 +35,7 @@
 put a key in the server's database easily with "service monotone import",
 e.g. to import the public key for a private key in ~/.monotone/keys:
 
-	monotone pubkey me at my.com | sudo service monotone import
+	mtn pubkey me at my.com | sudo service monotone import
 
 For problems with this package or its scripts, please file bugs
 at http://bugzilla.redhat.com/ for the "monotone" component

monotone-xfail-if-root.patch:

Index: monotone-xfail-if-root.patch
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/monotone-xfail-if-root.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- monotone-xfail-if-root.patch	6 Jan 2006 10:27:47 -0000	1.3
+++ monotone-xfail-if-root.patch	11 Apr 2006 22:29:29 -0000	1.4
@@ -1,6 +1,17 @@
---- monotone-0.23/testsuite
-+++ monotone-0.23/testsuite
-@@ -67479,7 +67479,7 @@ $at_traceon
+--- monotone/tests/t_checkout_dir.at
++++ monotone/tests/t_checkout_dir.at
+@@ -20,7 +20,7 @@ AT_CHECK(MTN --branch=testbranch checkou
+ mkdir test_dir4
+ chmod 444 test_dir4
+ # XFAIL if run as root (hi Gentoo!)
+-AT_XFAIL_IF(test -O /)
++AT_XFAIL_IF(test -w test_dir4)
+ AT_CHECK(MTN --branch=testbranch checkout test_dir4,
+          [1], [ignore], [ignore])
+ AT_CHECK(MTN --branch=testbranch checkout test_dir4/subdir,
+--- monotone/testsuite
++++ monotone/testsuite
+@@ -69608,7 +69608,7 @@ $at_traceon
      at_desc='checkout validates target directory'
      $at_quiet $ECHO_N " 64: checkout validates target directory          $ECHO_C"
      at_xfail=no
@@ -9,14 +20,3 @@
      (
        echo "64. t_checkout_dir.at:1: testing ..."
        $at_traceon
---- monotone-0.23/tests/t_checkout_dir.at
-+++ monotone-0.23/tests/t_checkout_dir.at
-@@ -20,7 +20,7 @@ AT_CHECK(MONOTONE --branch=testbranch ch
- mkdir test_dir4
- chmod 444 test_dir4
- # XFAIL if run as root (hi Gentoo!)
--AT_XFAIL_IF(test -O /)
-+AT_XFAIL_IF(test -w test_dir4)
- AT_CHECK(MONOTONE --branch=testbranch checkout test_dir4,
-          [1], [ignore], [ignore])
- AT_CHECK(MONOTONE --branch=testbranch checkout test_dir4/subdir,


Index: monotone.init
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/monotone.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- monotone.init	12 Dec 2005 02:38:33 -0000	1.6
+++ monotone.init	11 Apr 2006 22:29:29 -0000	1.7
@@ -24,9 +24,10 @@
 # By default it's all good
 RETVAL=0
 
-MT=/usr/bin/monotone
+MT=/usr/bin/mtn
 MTSERVER=/usr/sbin/monotone-server
 MONOTONE_LOGFILE=${MONOTONE_LOGFILE:-/var/log/monotone.log}
+MONOTONE_OLDDB=/var/db/monotone/server.db
 
 random_passphrase()
 {
@@ -42,6 +43,11 @@
   start)
 	if [ -e $MONOTONE_DBFILE ]; then
 		$0 migrate
+	elif [ -e $MONOTONE_OLDDB ]; then
+		echo -n $"Pre-0.26 monotone database must be migrated by hand: "
+		failure
+		echo
+		false
 	else
 		$0 init
 	fi
@@ -86,7 +92,7 @@
 	RETVAL=$?
 	;;
   init)
-	echo -n $"Initializing database" "$MONOTONE_DBFILE" ": "
+	echo -n $"Initializing database" "${MONOTONE_DBFILE}: "
 	{ [ -d /var/db/monotone ] ||
  	  /usr/bin/install -o ${MONOTONE_USER:-monotone} \
 			   -g ${MONOTONE_GROUP:-monotone} \


Index: monotone.spec
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/monotone.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- monotone.spec	6 Jan 2006 10:27:47 -0000	1.14
+++ monotone.spec	11 Apr 2006 22:29:29 -0000	1.15
@@ -1,6 +1,6 @@
 Name: monotone
-Version: 0.25
-Release: 2%{?dist}
+Version: 0.26
+Release: 1%{?dist}
 
 Summary: A free, distributed version control system
 Group: Development/Tools
@@ -75,6 +75,7 @@
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 rm -f %{buildroot}%{_infodir}/dir
+rm -f %{buildroot}%{_datadir}/doc/monotone/monotone.html
 
 %find_lang %{name}
 
@@ -87,7 +88,7 @@
 mkdir -p %{buildroot}/etc/init.d
 mkdir -p %{buildroot}/etc/sysconfig
 mkdir -p %{buildroot}/var/db
-ln -snf ../bin/monotone %{buildroot}%{_sbindir}/monotone-server
+ln -snf ../bin/mtn %{buildroot}%{_sbindir}/monotone-server
 %{__install} -c -m 0555 %{SOURCE1} %{buildroot}/etc/init.d/monotone
 %{__install} -c -m 0644 %{SOURCE2} %{buildroot}/etc/sysconfig/monotone
 %{__install} -d -m 0755 %{buildroot}/etc/monotone
@@ -99,7 +100,7 @@
 %{__install} -c -m 0640 /dev/null %{buildroot}/etc/monotone/read-permissions
 %{__install} -c -m 0640 /dev/null %{buildroot}/etc/monotone/write-permissions
 %{__install} -c -m 0644 /dev/null %{buildroot}/etc/monotone/monotonerc
-touch %{buildroot}/var/db/monotone/server.db
+touch %{buildroot}/var/db/monotone/server.mtn
 
 cp %{SOURCE3} .
 
@@ -124,9 +125,9 @@
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README README.changesets UPGRADE
 %doc monotone.html
 
-%{_bindir}/monotone
+%{_bindir}/mtn
 %{_infodir}/monotone.info*
-%{_mandir}/man1/monotone.1*
+%{_mandir}/man1/mtn.1*
 %{_datadir}/emacs/site-lisp/monotone*.el*
 
 
@@ -142,9 +143,8 @@
 %attr(0440,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/monotone/passphrase.lua
 %attr(0640,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/monotone/read-permissions
 %attr(0640,root,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /etc/monotone/write-permissions
- %attr(0750,root,monotone) /etc/monotone/private-keys
 %dir %attr(0770,monotone,monotone) /var/db/monotone
-%attr(0660,monotone,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/db/monotone/server.db
+%attr(0660,monotone,monotone) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/db/monotone/server.mtn
 
 %pre server
 # Add the "monotone" user
@@ -166,6 +166,10 @@
 
 
 %changelog
+* Mon Apr 10 2006 Roland McGrath <roland at redhat.com> - 0.26-1
+- Updated for 0.25 release.
+  - Major changes; see UPGRADE doc file for details.
+
 * Fri Jan  6 2006 Roland McGrath <roland at redhat.com> - 0.25-2
 - Restore testsuite fix for nonroot owner of / in build chroot.
 


Index: monotone.sysconfig
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/monotone.sysconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- monotone.sysconfig	12 Dec 2005 02:38:33 -0000	1.2
+++ monotone.sysconfig	11 Apr 2006 22:29:29 -0000	1.3
@@ -1,6 +1,6 @@
 MONOTONE_CONFDIR=/etc/monotone
 MONOTONE_KEYDIR=/etc/monotone/private-keys
-MONOTONE_DBFILE=/var/db/monotone/server.db
+MONOTONE_DBFILE=/var/db/monotone/server.mtn
 MONOTONE_PPFILE=/etc/monotone/passphrase.lua
 
 MONOTONE_RCOPTS="--confdir=$MONOTONE_CONFDIR"


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monotone/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Jan 2006 09:29:34 -0000	1.6
+++ sources	11 Apr 2006 22:29:29 -0000	1.7
@@ -1 +1 @@
-fb0ad449cd0093854c55dbd5c6fc07e2  monotone-0.25.tar.gz
+21b902d1b48ffb868536d04c4ad38155  monotone-0.26.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 22:45:34 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 11 Apr 2006 15:45:34 -0700
Subject: rpms/cernlib/devel 211-fix-comis-on-ia64-alpha.dpatch, NONE,
	1.1 319-work-around-imake-segfaults.dpatch, NONE,
	1.1 cernlib_2005.05.09.dfsg-5.diff, NONE, 1.1 patchy-case.patch,
	NONE, 1.1 patchy-fcasplit.patch, NONE,
	1.1 patchy-insecure_tmp_use.diff, NONE, 1.1 patchy-p4comp.patch,
	NONE, 1.1 patchy-perror.patch, NONE, 1.1 patchy-rceta.patch,
	NONE, 1.1 211-fix-comis-on-amd64.dpatch, 1.1,
	1.2 307-use-canonical-cfortran.dpatch, 1.2,
	1.3 800-implement-shared-library-rules-in-Imake.dpatch, 1.1,
	1.2 cernlib-gfortran.diff, 1.1, 1.2 cernlib.spec, 1.19,
	1.20 paw.README, 1.3, 1.4 211-fix-comis-on-ia64.dpatch, 1.1,
	NONE cernlib_2005.05.09.dfsg-3.diff, 1.1, NONE
Message-ID: <200604112245.k3BMjbkl008181@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8128

Modified Files:
	211-fix-comis-on-amd64.dpatch 
	307-use-canonical-cfortran.dpatch 
	800-implement-shared-library-rules-in-Imake.dpatch 
	cernlib-gfortran.diff cernlib.spec paw.README 
Added Files:
	211-fix-comis-on-ia64-alpha.dpatch 
	319-work-around-imake-segfaults.dpatch 
	cernlib_2005.05.09.dfsg-5.diff patchy-case.patch 
	patchy-fcasplit.patch patchy-insecure_tmp_use.diff 
	patchy-p4comp.patch patchy-perror.patch patchy-rceta.patch 
Removed Files:
	211-fix-comis-on-ia64.dpatch cernlib_2005.05.09.dfsg-3.diff 
Log Message:
* Tue Apr 11 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-14
- add patchy version 4 and build cernlib patchy. From Mattias Ellert.
- update to newer debian patchset



--- NEW FILE 211-fix-comis-on-ia64-alpha.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 211-fix-comis-on-ia64-alpha.dpatch by  <kmccarty at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Further patch building on Harald Vogt's amd64 patch attempting to
## DP: fix PAW on Itanium/Alpha Linux.  This does not yet work completely...

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/ccopys.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/ccopys.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/ccopys.c	2006-03-24 15:36:37.723420777 -0500
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/ccopys.c	2006-03-24 15:36:45.236828642 -0500
@@ -39,12 +39,45 @@
  * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005)
  */
 
+/* For Itanium and Alpha, the situation is even worse.  Itanium architecture
+ * has the data section starts at 0x6000000000000000.  The stack is
+ * supposed to be between 0x80...0 and 0xa0...0 starting at the high end
+ * and growing downwards, although on a test machine (merulo.debian.org)
+ * it seemed instead to start at 0x6000100000000000 and grow downwards.
+ * The addresses we actually get are truncated to the lowest 32 bits,
+ * so we assume that those greater than 0x80000000 are in the stack.
+ *
+ * Constant strings are in the text section starting at 0x40...0; we hope
+ * this function doesn't receive any.
+ *
+ * On Alpha, on the other hand, I couldn't find any docs for the Linux
+ * segmentation for virtual memory.  Judging by a test machine
+ * (escher.debian.org), the data section starts slightly above 0x120010000.
+ * On the other hand the stack grows downward from 0x120000000.  Here it
+ * seems safe to suppose that the variable is in the stack if the uint32
+ * truncated address received is less than 0x20000000.
+ * 
+ * -- Kevin McCarty
+ */
+	
 #if defined(CERNLIB_QMLXIA64)
      int *ja, *jb;
      int *nn;
 {
   int i,n; char *a,*b;
   n=*nn; a=*ja; b=*jb;
+# if defined (__ia64__) || defined (__alpha__)
+#  if defined (__ia64__)
+#   define autotest(_var) ((unsigned long)(_var) > 0x80000000)
+#  else /* __alpha__ */
+#   define autotest(_var) ((unsigned long)(_var) < 0x20000000)
+#  endif
+  static int dummy = 0;
+  unsigned long staticbase = ((unsigned long)&dummy) & 0xffffffff00000000L;
+  unsigned long autobase = ((unsigned long)&i) & 0xffffffff00000000L;
+  a = (unsigned long)a + (autotest(a) ? autobase : staticbase);
+  b = (unsigned long)b + (autotest(b) ? autobase : staticbase);
+# endif
 #else
      char **ja, **jb;
      int *nn;
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscald.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscald.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscald.c	2006-03-24 15:36:37.723420777 -0500
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscald.c	2006-03-24 15:51:18.796348318 -0500
@@ -74,6 +74,24 @@
 /*    printf ("cscald - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */
    long p[16];
    int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
+
+/* See relevant comments in cstrcmp.c regarding this hideous hack */
+# if defined (__ia64__) || defined (__alpha__)
+#  if defined (__ia64__)
+#   define autotest(_var) ((unsigned long)(_var) > 0x80000000)
+#  else /* __alpha__ */
+#   define autotest(_var) ((unsigned long)(_var) < 0x20000000)
+#  endif
+  static int dummy = 0;
+  unsigned long staticbase = ((unsigned long)&dummy) & 0xffffffff00000000L;
+  unsigned long autobase = ((unsigned long)&count) & 0xffffffff00000000L;
+  for (count = 0; count < 16; count++)
+    if (p[count])
+      if (autotest(p[count]))
+	p[count] += autobase;
+      else
+	p[count] += staticbase;  
+# endif
 #else
  double (type_of_call *(*name)) ();
  int *n;
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscali.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscali.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscali.c	2006-03-24 15:36:37.723420777 -0500
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscali.c	2006-03-24 15:51:05.440199025 -0500
@@ -67,6 +67,24 @@
 /*    printf ("cscali - *fptr,ptr,jumpad_ are: %p %p %p %p\n", *fptr, ptr, jumpad_); */
    long p[16];
    int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
+
+/* See relevant comments in cstrcmp.c regarding this hideous hack */
+# if defined (__ia64__) || defined (__alpha__)
+#  if defined (__ia64__)
+#   define autotest(_var) ((unsigned long)(_var) > 0x80000000)
+#  else /* __alpha__ */
+#   define autotest(_var) ((unsigned long)(_var) < 0x20000000)
+#  endif
+  static int dummy = 0;
+  unsigned long staticbase = ((unsigned long)&dummy) & 0xffffffff00000000L;
+  unsigned long autobase = ((unsigned long)&count) & 0xffffffff00000000L;
+  for (count = 0; count < 16; count++)
+    if (p[count])
+      if (autotest(p[count]))
+        p[count] += autobase;
+      else
+        p[count] += staticbase;
+# endif
 #else
  int (type_of_call *(*name)) ();
  int *n;
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscalr.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscalr.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cscalr.c	2006-03-24 15:36:37.724420566 -0500
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cscalr.c	2006-03-24 15:50:47.519024096 -0500
@@ -89,6 +89,24 @@
    long p[16];
    int  count;  for ( count=0; count<16; count++ )  p[count] = pin[count];
    double r;
+
+/* See relevant comments in cstrcmp.c regarding this hideous hack */
+# if defined (__ia64__) || defined (__alpha__)
+#  if defined (__ia64__)
+#   define autotest(_var) ((unsigned long)(_var) > 0x80000000)
+#  else /* __alpha__ */
+#   define autotest(_var) ((unsigned long)(_var) < 0x20000000)
+#  endif
+  static int dummy = 0;
+  unsigned long staticbase = ((unsigned long)&dummy) & 0xffffffff00000000L;
+  unsigned long autobase = ((unsigned long)&count) & 0xffffffff00000000L;
+  for (count = 0; count < 16; count++)
+    if (p[count])
+      if (autotest(p[count]))
+        p[count] += autobase;
+      else
+        p[count] += staticbase;
+# endif
 #else
  float (type_of_call *(*name)) ();
  int *n;
diff -urNad cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cstrcmp.c cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cstrcmp.c
--- cernlib-2005.05.09.dfsg~/src/pawlib/comis/deccc/cstrcmp.c	2006-03-24 15:36:37.724420566 -0500
+++ cernlib-2005.05.09.dfsg/src/pawlib/comis/deccc/cstrcmp.c	2006-03-24 15:36:45.236828642 -0500
@@ -42,6 +42,27 @@
  * using the CERNLIB_QMLXIA64 cpp flag (H. Vogt - Sep 2005)
  */
 
+/* For Itanium and Alpha, the situation is even worse.  Itanium architecture
+ * has the data section starts at 0x6000000000000000.  The stack is
+ * supposed to be between 0x80...0 and 0xa0...0 starting at the high end
+ * and growing downwards, although on a test machine (merulo.debian.org)
+ * it seemed instead to start at 0x6000100000000000 and grow downwards.
+ * The addresses we actually get are truncated to the lowest 32 bits,
+ * so we assume that those greater than 0x80000000 are in the stack.
+ *
+ * Constant strings are in the text section starting at 0x40...0; we hope
+ * this function doesn't receive any.
+ *
+ * On Alpha, on the other hand, I couldn't find any docs for the Linux
+ * segmentation for virtual memory.  Judging by a test machine
+ * (escher.debian.org), the data section starts slightly above 0x120010000.
+ * On the other hand the stack grows downward from 0x120000000.  Here it
+ * seems safe to suppose that the variable is in the stack if the uint32
+ * truncated address received is less than 0x20000000.
+ *
+ * -- Kevin McCarty
+ */
+
 #if defined(CERNLIB_QMLXIA64)
      int *ja, *jb;
      int *na, *nb;
@@ -56,6 +77,18 @@
     {
       a=*jb; b=*ja; la=*nb; lb=*na; k=-1;
      }
+# if defined (__ia64__) || defined (__alpha__)
+#  if defined (__ia64__)
+#   define autotest(_var) ((unsigned long)(_var) > 0x80000000)
+#  else /* __alpha__ */
+#   define autotest(_var) ((unsigned long)(_var) < 0x20000000)
+#  endif
+  static int dummy = 0;
+  unsigned long staticbase = ((unsigned long)&dummy) & 0xffffffff00000000L;
+  unsigned long autobase = ((unsigned long)&i) & 0xffffffff00000000L;
+  a = (unsigned long)a + (autotest(a) ? autobase : staticbase);
+  b = (unsigned long)b + (autotest(b) ? autobase : staticbase);
+# endif
 #else
      char **ja, **jb;
      int *na, *nb;


--- NEW FILE 319-work-around-imake-segfaults.dpatch ---
#! /bin/sh /usr/share/dpatch/dpatch-run
## 319-work-around-imake-segfaults.dpatch by  <kmccarty at debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: If at first Imake doesn't succeed, try, try again.
## DP: (Hideous workaround for non-deterministic imake segfaults on hppa.)

@DPATCH@
diff -urNad cernlib-2005.05.09.dfsg~/src/config/Imake.rules cernlib-2005.05.09.dfsg/src/config/Imake.rules
--- cernlib-2005.05.09.dfsg~/src/config/Imake.rules	2006-01-02 10:35:09.050384887 -0500
+++ cernlib-2005.05.09.dfsg/src/config/Imake.rules	2006-01-02 10:38:18.693611381 -0500
@@ -1296,7 +1296,11 @@
 	$(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) \		@@\
 	             -DPackageTop=$(PACKAGETOP)	\			@@\
 		     -DPackageName=$(PACKAGE_NAME) \			@@\
-		     imakeflags -f $<
+		     imakeflags -f $< || \				@@\
+		$(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) \	@@\
+	             -DPackageTop=$(PACKAGETOP)	\			@@\
+		     -DPackageName=$(PACKAGE_NAME) \			@@\
+		     imakeflags -f $< || exit 1
 
 #endif /* BuildMakefileTarget */
 
@@ -2127,7 +2131,11 @@
 			ImakeSubCmdHelper -DTOPDIR=$$imaketop \		@@\
 			-DCURDIR=$$curdir$$i \				@@\
 			-DPackageTop=$(PACKAGETOP) \			@@\
-			-DPackageName=$(PACKAGE_NAME); \		@@\
+			-DPackageName=$(PACKAGE_NAME) || \		@@\
+			ImakeSubCmdHelper -DTOPDIR=$$imaketop \		@@\
+			-DCURDIR=$$curdir$$i \				@@\
+			-DPackageTop=$(PACKAGETOP) \			@@\
+			-DPackageName=$(PACKAGE_NAME) || exit 1; \	@@\
 		fi; \							@@\
 		$(MAKE) $(MFLAGS) Makefiles; \				@@\
 		cd $$newtop; \						@@\
@@ -2322,7 +2330,12 @@
 			-DCURDIR=$$curdir$$i \				@@\
 			-DPackageTop=$(PACKAGETOP) \			@@\
 			-DPackageName=$(PACKAGE_NAME) \			@@\
-			-f $$imakefile; \				@@\
+			-f $$imakefile || \				@@\
+			ImakeSubCmdHelper -DTOPDIR=$$imaketop \		@@\
+			-DCURDIR=$$curdir$$i \				@@\
+			-DPackageTop=$(PACKAGETOP) \			@@\
+			-DPackageName=$(PACKAGE_NAME) \			@@\
+			-f $$imakefile || exit 1; \			@@\
 		fi; \							@@\
 	fi;
 #endif

cernlib_2005.05.09.dfsg-5.diff:

***** Error reading new file: [Errno 2] No such file or directory: 'cernlib_2005.05.09.dfsg-5.diff'
patchy-case.patch:

--- NEW FILE patchy-case.patch ---
diff -ur 2004.orig/src/patchy/Imakefile 2004/src/patchy/Imakefile
--- 2004.orig/src/patchy/Imakefile	1997-01-21 18:29:14.000000000 +0100
+++ 2004/src/patchy/Imakefile	2005-05-28 02:23:04.000000000 +0200
@@ -79,8 +79,8 @@
 	@ ln -s $< $@
 
 %.f:  $(LDIR)%.cra $(LDIR)patchy.car
-	ypatchy - $@ $< TTY .go
-	
+	ypatchy - :$@ :$< TTY .go
+
 .f.o:
 	$(FC) -c $(FORTRANOPTIONS) $(FDEBUGFLAGS) $<
 

patchy-fcasplit.patch:

--- NEW FILE patchy-fcasplit.patch ---
--- patchy/fcasplit.f.orig	2006-04-10 01:06:32.000000000 +0200
+++ patchy/fcasplit.f	2006-04-10 01:16:05.000000000 +0200
@@ -23,7 +23,7 @@
       PARAMETER   (CHIDA = ';DECK  I' )
       PARAMETER   (CHOVER= 'UNKNOWN')
  
-      PARAMETER   (CHPOF = '-c -O2 -Nx800 -Nc200')
+      PARAMETER   (CHPOF = '-c -O2')
       PARAMETER   (CHPOC = '-c -O2 -posix')
       PARAMETER   (CHPOA = ' ')
  

patchy-insecure_tmp_use.diff:

--- NEW FILE patchy-insecure_tmp_use.diff ---
diff -u patchy-orig/yindex patchy/yindex
--- patchy-orig/yindex	2006-04-11 10:33:39.000000000 +0200
+++ patchy/yindex	2006-04-11 10:44:10.000000000 +0200
@@ -11,7 +11,7 @@
    [ -z "$PATCHY_VERSION" ] && PATCHY_VERSION="4.15"
    PATCHY=$CERN/patchy/$PATCHY_VERSION/bin
  
-ftmp=/tmp/`echo $0 | awk -F/ '{ print $NF }'`$$
+#ftmp=/tmp/`echo $0 | awk -F/ '{ print $NF }'`$$
  
 if [ $# -eq 0 ] ; then
    cat << EoI
@@ -45,6 +45,8 @@
       exit 1
 fi
  
+exttmp=`echo $0 | awk -F/ '{ print $NF }'`$$
+ftmp="$file-$exttmp"
 if [ "$ext" != "pam" ] ; then
    echo " Preparing temporary binary PAM file, ...wait"
    ${PATCHY}/ytobin $pam $ftmp.pam - - ${ftmp}.lis .GO  > /dev/null
Seulement dans patchy: yindex-orig
diff -u patchy-orig/ylist patchy/ylist
--- patchy-orig/ylist	2006-04-11 10:33:48.000000000 +0200
+++ patchy/ylist	2006-04-11 10:40:17.000000000 +0200
@@ -11,7 +11,7 @@
    [ -z "$PATCHY_VERSION" ] && PATCHY_VERSION="4.15"
    PATCHY=$CERN/patchy/$PATCHY_VERSION/bin
  
-ftmp=/tmp/`echo $0 | awk -F/ '{ print $NF }'`$$
+#ftmp=/tmp/`echo $0 | awk -F/ '{ print $NF }'`$$
  
 if [ $# -eq 0 ] ; then
    cat << EoI
@@ -45,6 +45,8 @@
       exit 1
 fi
  
+exttmp=`echo $0 | awk -F/ '{ print $NF }'`$$
+ftmp="$file-$exttmp"
 if [ "$ext" != "pam" ] ; then
    echo " Preparing temporary binary PAM file, ...wait"
    ${PATCHY}/ytobin $pam $ftmp.pam - - ${ftmp}.lis .GO  > /dev/null
Seulement dans patchy: ylist-orig

patchy-p4comp.patch:

--- NEW FILE patchy-p4comp.patch ---
--- patchy/p4comp.fca.orig	2006-04-08 12:46:17.000000000 +0200
+++ patchy/p4comp.fca	2006-04-08 12:47:34.000000000 +0200
@@ -11458,7 +11458,7 @@
       IF (JCARD.GE.NTOTCC)   RETURN
       LE = LTK + KDNWT1 - 1
       DO 12 L=LTK,LE
-      IF (AND(IQ(L),'FF000000'X).EQ.0)    GO TO 14
+      IF (AND(IQ(L),X'FF000000').EQ.0)    GO TO 14
    12 CONTINUE
       NWTK = KDNWT
       NCH  = 80
@@ -12383,7 +12383,7 @@
       IF (JCARD.GE.NTOTCC)   RETURN
       LE = LTK + KDNWT1 - 1
       DO 13 L=LTK,LE
-      IF (AND(IQ(L),'FF000000'X).EQ.0)    GO TO 14
+      IF (AND(IQ(L),X'FF000000').EQ.0)    GO TO 14
    13 CONTINUE
       NWTK   = KDNWT
       NCHCCT = 80
@@ -14260,7 +14260,7 @@
 C--------------    END CDE                             --------------
 C     DIMENSION    MM(10), ITP(9)                                        A8M
       DIMENSION    MM(6),  ITP(9)                                       -A8M
-      PARAMETER   ( NBLANK = '20202000'X )
+      PARAMETER   ( NBLANK = X'20202000' )
  
       IT     = ITP(1)
       JARTPX = 0
@@ -14430,7 +14430,7 @@
  
    24 JLOW = JCH
  
-      MV(JCH) = AND (MV(JCH), 'FFFFFFDF'X)
+      MV(JCH) = AND (MV(JCH), X'FFFFFFDF')
  
    49 CONTINUE
       JCCLOW = MAX  (JCCLOW,JLOW)
@@ -14465,8 +14465,8 @@
  
  
  
-      DATA ACTION/'HOLD  ','RESUME','EOF   ','REWIND','ATTACH','DETACH'
-     +,           'EOFREW','CLOSE ' /
+      DATA ACTION/6HHOLD  ,6HRESUME,6HEOF   ,6HREWIND,6HATTACH,6HDETACH
+     +,           6HEOFREW,6HCLOSE  /
  
 C------    CODE BITS IN  IOTALL, IOTOFF, IOTON, IOTYP
  
@@ -14801,7 +14801,7 @@
       DO 31 JC=1,NCD
       J = J+1
       DO 19 JJ=1,KDNWT1
-      IF (AND(MV(J),'FF000000'X).EQ.0)   GO TO 31
+      IF (AND(MV(J),X'FF000000').EQ.0)   GO TO 31
    19 J = J+1
    31 CONTINUE
  
@@ -14825,7 +14825,7 @@
  
       DO 16 J=1,KDNWT1
       KIMA(J)= MV(J)
-      IF (AND(KIMA(J),'FF000000'X).EQ.0)    GO TO 31
+      IF (AND(KIMA(J),X'FF000000').EQ.0)    GO TO 31
    16 CONTINUE
       J = KDNWT
       KIMA(J)= MV(J)
@@ -14855,7 +14855,7 @@
  
       DO 16 J=1,KDNWT1
       KIMA(J)= MV(J)
-      IF (AND(KIMA(J),'FF000000'X).EQ.0)    GO TO 31
+      IF (AND(KIMA(J),X'FF000000').EQ.0)    GO TO 31
    16 CONTINUE
       J = KDNWT
       KIMA(J)= MV(J)
@@ -17316,6 +17316,8 @@
 /*>    ROUTINE ABEND
   CERN PROGLIB# Z035    ABEND           .VERSION KERNFOR  4.31  911111
 */
+#include <stdlib.h>
+
 void abend_()
 {
     exit(7);
@@ -17430,7 +17432,7 @@
       char *fname;
       int  *lgname;
 {
-      char *malloc();
+      void *malloc();
       char *ptalc, *pttext;
       int  fchput();
       int  nalc;
@@ -17664,7 +17666,7 @@
       char *ftext;
       int  lgtext;
 {
-      char *malloc();
+      void *malloc();
       char *ptalc, *ptuse;
       char *utext;
       int  nalc;

patchy-perror.patch:

--- NEW FILE patchy-perror.patch ---
--- 2005/src/patchy/patchy.car.orig	1996-07-15 13:46:22.000000000 +0200
+++ 2005/src/patchy/patchy.car	2006-04-09 02:18:17.000000000 +0200
@@ -3708,7 +3708,7 @@
 
    38 WRITE (IQTYPE,9038) CHLIFI(1:NN)
 +SELF, IF=QS_UNIX.
-      IF (LUNOLD.NE.0)  CALL PERRORF (' System msg')
+      IF (LUNOLD.NE.0)  CALL PERROR (' System msg')
 +SELF.
       IF (NQINIT.EQ.0)  THEN
           IF (IQPRNT.NE.IQTYPE)  WRITE (IQPRNT,9038) CHLIFI(1:NN)
@@ -4399,7 +4399,7 @@
       CHARACTER    MSG*(*)
 
 +SELF, IF=QS_UNIX.
-      CALL PERRORF (' Perror has')
+      CALL PERROR (' Perror has')
 +SELF.
       CALL P_KILL (MSG)
       END
@@ -4446,7 +4446,7 @@
       CHARACTER    MSG*(*)
 
 +SELF, IF=QS_UNIX.
-      CALL PERRORF ('Perror has')
+      CALL PERROR ('Perror has')
 +SELF.
       CALL P_FATAL (MSG)
       END
@@ -15112,7 +15112,7 @@
 +DECK, SEGVIOL, T=JOIN, IF=QDIAG, IF=QS_UNIX.
       SUBROUTINE SEGVIOL
 
-      CALL PERRORF ('perrorf has')
+      CALL PERROR ('perror has')
       CALL P_KILL ('SEGVIOL reached')
 
       END

patchy-rceta.patch:

--- NEW FILE patchy-rceta.patch ---
--- patchy/rceta.sh.orig	1995-05-04 21:23:45.000000000 +0200
+++ patchy/rceta.sh	2006-04-08 12:20:26.000000000 +0200
@@ -225,8 +225,8 @@
       RETURN
       END
 \\
- fort77 -o rceta rceta.f
- rceta    <<\\
+ f77 -o rceta rceta.f
+ ./rceta    <<\\
 CODE  INTERNAL A1 REPRESENTATION OF THE CETA SET / LNX
 CODE  CARD    1  IN HOLLERITH FOR CETA VALUES  1 - 47
 CODE  CARD    2  IN HOLLERITH FOR CETA VALUES 65 - 90


Index: 211-fix-comis-on-amd64.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/211-fix-comis-on-amd64.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 211-fix-comis-on-amd64.dpatch	14 Dec 2005 16:52:26 -0000	1.1
+++ 211-fix-comis-on-amd64.dpatch	11 Apr 2006 22:45:34 -0000	1.2
@@ -396,8 +396,8 @@
        ITMPLEN=CSTMPD(CHPATH, 256)
 -      CHF77 ='g77 -c'
 -      CHCC  ='cc -c'
-+      CHF77 ='g77 -c -fPIC'
-+      CHCC  ='cc -c -fPIC'
++      CHF77 ='g77 -g -c -fPIC'
++      CHCC  ='cc -g -c -fPIC'
  #endif
  #if (defined(CERNLIB_SGI))&&(defined(CERNLIB_SHL))
        ITMPLEN=CSTMPD(CHPATH, 256)


Index: 307-use-canonical-cfortran.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/307-use-canonical-cfortran.dpatch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 307-use-canonical-cfortran.dpatch	14 Dec 2005 16:52:26 -0000	1.2
+++ 307-use-canonical-cfortran.dpatch	11 Apr 2006 22:45:34 -0000	1.3
@@ -7,8 +7,8 @@
 
 @DPATCH@
 diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.doc cernlib-2005.05.09.dfsg/src/cfortran/cfortran.doc
---- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.doc	1998-12-11 17:17:09.000000000 +0000
-+++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.doc	2005-12-09 18:01:09.000000000 +0000
+--- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.doc	1998-12-11 12:17:09.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.doc	2005-12-27 11:33:41.183131708 -0500
 @@ -195,13 +195,13 @@
  HP9000> f77 -c cfortex.f
  HP9000> CC -o cfortest cfortest.c cfortex.o -lI77 -lF77 && cfortest
@@ -79,24 +79,25 @@
  - YOU MAY NOT RECEIVE MONEY FOR THE DISTRIBUTION OR FOR ITS MEDIA 
    (E.G. TAPE, DISK, COMPUTER, PAPER.)
 diff -urNad cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h cernlib-2005.05.09.dfsg/src/cfortran/cfortran.h
---- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h	2002-09-11 17:05:51.000000000 +0000
-+++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.h	2005-12-09 18:01:09.000000000 +0000
+--- cernlib-2005.05.09.dfsg~/src/cfortran/cfortran.h	2002-09-11 13:05:51.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/cfortran/cfortran.h	2005-12-19 08:29:41.000000000 -0500
 @@ -1,4 +1,4 @@
 -/* cfortran.h  4.4_cernlib2002 */
 +/* cfortran.h  4.4 */
  /* http://www-zeus.desy.de/~burow/cfortran/                   */
  /* Burkhard Burow  burow at desy.de                 1990 - 2002. */
  
-@@ -11,6 +11,35 @@
+@@ -11,6 +11,38 @@
     MODIFYING, COPYING AND DISTRIBUTING THE CFORTRAN.H PACKAGE.
  */
  
 +/* The following modifications were made by the authors of CFITSIO or by me. 
-+ * I've flagged them below with "(CFITSIO)" or "(KMCCARTY)".
++ * They are flagged below with CFITSIO, the author's initials, or KMCCARTY.
 + * PDW = Peter Wilson
 + * DM  = Doug Mink
-+ * LEB = ??
-+ * -- Kevin McCarty, for Debian (11/29/2003) */
++ * LEB = Lee E Brotzman
++ * MR  = Martin Reinecke
++ * -- Kevin McCarty, for Debian (19 Dec. 2005) */
 +
 +/*******
 +   Modifications:
@@ -118,12 +119,14 @@
 +      Dec 2005: If f2cFortran is defined, enforce REAL functions in FORTRAN
 +                returning "double" in C.  This was one of the items on
 +		Burkhard's TODO list. (KMCCARTY)
++      Dec 2005: Modifications to support 8-byte integers. (MR)
++		USE AT YOUR OWN RISK!
 + *******/
 +
  /* 
    Avoid symbols already used by compilers and system *.h:
    __ - OSF1 zukal06 V3.0 347 alpha, cc -c -std1 cfortest.c
-@@ -75,7 +104,8 @@
+@@ -75,7 +107,8 @@
  
  /* Remainder of cfortran.h depends on the Fortran compiler. */
  
@@ -133,7 +136,7 @@
  #define f2cFortran
  #endif
  
-@@ -90,6 +120,27 @@
+@@ -90,6 +123,27 @@
                             Support f2c or f77 with gcc, vcc with f2c. 
                             f77 with vcc works, missing link magic for f77 I/O.*/
  #endif
@@ -161,7 +164,7 @@
  #if defined(__hpux)             /* 921107: Use __hpux instead of __hp9000s300 */
  #define       hpuxFortran       /*         Should also allow hp9000s7/800 use.*/
  #endif
-@@ -131,6 +182,7 @@
+@@ -131,6 +185,7 @@
  #if !(defined(mipsFortran)||defined(DECFortran)||defined(vmsFortran)||defined(CONVEXFortran)||defined(PowerStationFortran)||defined(AbsoftUNIXFortran)||defined(AbsoftProFortran)||defined(SXFortran))
  /* If your compiler barfs on ' #error', replace # with the trigraph for #     */
   #error "cfortran.h:  Can't find your environment among:\
@@ -169,7 +172,7 @@
      - MIPS cc and f77 2.0. (e.g. Silicon Graphics, DECstations, ...)     \
      - IBM AIX XL C and FORTRAN Compiler/6000 Version 01.01.0000.0000     \
      - VAX   VMS CC 3.1 and FORTRAN 5.4.                                  \
-@@ -151,7 +203,8 @@
+@@ -151,7 +206,8 @@
      - NAG f90: Use #define NAGf90Fortran, or cc -DNAGf90Fortran          \
      - Absoft UNIX F77: Use #define AbsoftUNIXFortran or cc -DAbsoftUNIXFortran \
      - Absoft Pro Fortran: Use #define AbsoftProFortran \
@@ -179,7 +182,7 @@
  /* Compiler must throw us out at this point! */
  #endif
  #endif
-@@ -164,7 +217,8 @@
+@@ -164,7 +220,8 @@
  
  /* Throughout cfortran.h we use: UN = Uppercase Name.  LN = Lowercase Name.   */
  
@@ -189,7 +192,7 @@
  #define CFC_(UN,LN)            _(LN,_)      /* Lowercase FORTRAN symbols.     */
  #define orig_fcallsc(UN,LN)    CFC_(UN,LN)
  #else 
-@@ -268,7 +322,8 @@
+@@ -268,7 +325,8 @@
  #endif
  
  #ifndef apolloFortran
@@ -199,7 +202,7 @@
  #define CF_NULL_PROTO
  #else                                         /* HP doesn't understand #elif. */
  /* Without ANSI prototyping, Apollo promotes float functions to double.    */
-@@ -512,7 +567,7 @@
+@@ -512,7 +570,7 @@
                      *( (F).dsc$l_m[0]=(F).dsc$bounds[0].dsc$l_u=(ELEMNO)  ),   \
    (F).dsc$a_a0    =  ( (F).dsc$a_pointer=(C) ) - (F).dsc$w_length          ,(F))
  
@@ -208,8 +211,14 @@
  #define _NUM_ELEMS      -1
  #define _NUM_ELEM_ARG   -2
  #define NUM_ELEMS(A)    A,_NUM_ELEMS
-@@ -540,7 +595,8 @@
+@@ -538,9 +596,14 @@
+   if (i==(unsigned)num_term) break;
+   else strv += elem_len-i;
  }
++if (0) {  /* to prevent not used warnings in gcc (added by ROOT) */
++   c2fstrv(0, 0, 0, 0); f2cstrv(0, 0, 0, 0); kill_trailing(0, 0);
++   vkill_trailing(0, 0, 0, 0); num_elem(0, 0, 0, 0);
++}
  return (int)num;
  }
 -#endif
@@ -218,7 +227,53 @@
  /*-------------------------------------------------------------------------*/
  
  /*           UTILITIES FOR C TO USE STRINGS IN FORTRAN COMMON BLOCKS       */
-@@ -1451,7 +1507,12 @@
+@@ -1318,6 +1381,7 @@
+ #define     INTVVVVVVV_cfTYPE int
+ #define LOGICALVVVVVVV_cfTYPE int
+ #define    LONGVVVVVVV_cfTYPE long
++#define LONGLONGVVVVVVV_cfTYPE long long   /* added by MR December 2005 */
+ #define   SHORTVVVVVVV_cfTYPE short
+ #define          PBYTE_cfTYPE INTEGER_BYTE
+ #define        PDOUBLE_cfTYPE DOUBLE_PRECISION 
+@@ -1325,6 +1389,7 @@
+ #define           PINT_cfTYPE int
+ #define       PLOGICAL_cfTYPE int
+ #define          PLONG_cfTYPE long
++#define      PLONGLONG_cfTYPE long long  /* added by MR December 2005 */
+ #define         PSHORT_cfTYPE short
+ 
+ #define CFARGS0(A,T,V,W,X,Y,Z) _3(T,_cf,A)
+@@ -1342,6 +1407,7 @@
+ #define            INT_cfINT(N,A,B,X,Y,Z)        DOUBLE_cfINT(N,A,B,X,Y,Z)
+ #define        LOGICAL_cfINT(N,A,B,X,Y,Z)        DOUBLE_cfINT(N,A,B,X,Y,Z)
+ #define           LONG_cfINT(N,A,B,X,Y,Z)        DOUBLE_cfINT(N,A,B,X,Y,Z)
++#define       LONGLONG_cfINT(N,A,B,X,Y,Z)        DOUBLE_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */
+ #define          SHORT_cfINT(N,A,B,X,Y,Z)        DOUBLE_cfINT(N,A,B,X,Y,Z)
+ #define          PBYTE_cfINT(N,A,B,X,Y,Z)       PDOUBLE_cfINT(N,A,B,X,Y,Z)
+ #define        PDOUBLE_cfINT(N,A,B,X,Y,Z) _(CFARGS,N)(A,PINT,B,X,Y,Z,0)
+@@ -1349,6 +1415,7 @@
+ #define           PINT_cfINT(N,A,B,X,Y,Z)       PDOUBLE_cfINT(N,A,B,X,Y,Z)
+ #define       PLOGICAL_cfINT(N,A,B,X,Y,Z)       PDOUBLE_cfINT(N,A,B,X,Y,Z)
+ #define          PLONG_cfINT(N,A,B,X,Y,Z)       PDOUBLE_cfINT(N,A,B,X,Y,Z)
++#define      PLONGLONG_cfINT(N,A,B,X,Y,Z)       PDOUBLE_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */
+ #define         PSHORT_cfINT(N,A,B,X,Y,Z)       PDOUBLE_cfINT(N,A,B,X,Y,Z)
+ #define          BYTEV_cfINT(N,A,B,X,Y,Z)       DOUBLEV_cfINT(N,A,B,X,Y,Z)
+ #define         BYTEVV_cfINT(N,A,B,X,Y,Z)      DOUBLEVV_cfINT(N,A,B,X,Y,Z)
+@@ -1392,6 +1459,13 @@
+ #define      LONGVVVVV_cfINT(N,A,B,X,Y,Z)   DOUBLEVVVVV_cfINT(N,A,B,X,Y,Z)
+ #define     LONGVVVVVV_cfINT(N,A,B,X,Y,Z)  DOUBLEVVVVVV_cfINT(N,A,B,X,Y,Z)
+ #define    LONGVVVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVVVV_cfINT(N,A,B,X,Y,Z)
++#define      LONGLONGV_cfINT(N,A,B,X,Y,Z)       DOUBLEV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */
++#define     LONGLONGVV_cfINT(N,A,B,X,Y,Z)      DOUBLEVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */
++#define    LONGLONGVVV_cfINT(N,A,B,X,Y,Z)     DOUBLEVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */
++#define   LONGLONGVVVV_cfINT(N,A,B,X,Y,Z)    DOUBLEVVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */
++#define  LONGLONGVVVVV_cfINT(N,A,B,X,Y,Z)   DOUBLEVVVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */
++#define LONGLONGVVVVVV_cfINT(N,A,B,X,Y,Z)  DOUBLEVVVVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */
++#define LONGLONGVVVVVVV_cfINT(N,A,B,X,Y,Z) DOUBLEVVVVVVV_cfINT(N,A,B,X,Y,Z) /* added by MR December 2005 */
+ #define         SHORTV_cfINT(N,A,B,X,Y,Z)       DOUBLEV_cfINT(N,A,B,X,Y,Z)
+ #define        SHORTVV_cfINT(N,A,B,X,Y,Z)      DOUBLEVV_cfINT(N,A,B,X,Y,Z)
+ #define       SHORTVVV_cfINT(N,A,B,X,Y,Z)     DOUBLEVVV_cfINT(N,A,B,X,Y,Z)
+@@ -1451,7 +1525,12 @@
  #define      BYTE_cfPU(A)   CFextern INTEGER_BYTE      FCALLSC_QUALIFIER A
  #define    DOUBLE_cfPU(A)   CFextern DOUBLE_PRECISION  FCALLSC_QUALIFIER A
  #if ! (defined(FLOATFUNCTIONTYPE)&&defined(ASSIGNFLOAT)&&defined(RETURNFLOAT))
@@ -231,7 +286,80 @@
  #else				   	                   
  #define     FLOAT_cfPU(A)   CFextern FLOATFUNCTIONTYPE FCALLSC_QUALIFIER A
  #endif				   	                   
-@@ -2088,7 +2149,12 @@
+@@ -1589,6 +1668,7 @@
+ #define            INT_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E)
+ #define        LOGICAL_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,LOGICAL,A,B,C,D,E)
+ #define           LONG_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E)
++#define       LONGLONG_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */
+ #define          SHORT_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E)
+ #define          BYTEV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E)
+ #define         BYTEVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E)
+@@ -1632,6 +1712,13 @@
+ #define      LONGVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E)
+ #define     LONGVVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E)
+ #define    LONGVVVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E)
++#define      LONGLONGV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */
++#define     LONGLONGVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */
++#define    LONGLONGVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */
++#define   LONGLONGVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */
++#define  LONGLONGVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */
++#define LONGLONGVVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */
++#define LONGLONGVVVVVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */
+ #define         SHORTV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E)
+ #define        SHORTVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E)
+ #define       SHORTVVV_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E)
+@@ -1645,6 +1732,7 @@
+ #define           PINT_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E)
+ #define       PLOGICAL_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,PLOGICAL,A,B,C,D,E)
+ #define          PLONG_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E)
++#define      PLONGLONG_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E) /* added by MR December 2005 */
+ #define         PSHORT_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,DEFAULT,A,B,C,D,E)
+ #define         STRING_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,STRING,A,B,C,D,E)
+ #define        PSTRING_cfSTR(N,T,A,B,C,D,E) _(CFARGS,N)(T,PSTRING,A,B,C,D,E)
+@@ -1957,6 +2045,7 @@
+ #define            INT_cfT(M,I,A,B,D) *A
+ #define        LOGICAL_cfT(M,I,A,B,D)  F2CLOGICAL(*A)
+ #define           LONG_cfT(M,I,A,B,D) *A
++#define       LONGLONG_cfT(M,I,A,B,D) *A /* added by MR December 2005 */
+ #define          SHORT_cfT(M,I,A,B,D) *A
+ #define          BYTEV_cfT(M,I,A,B,D)  A
+ #define        DOUBLEV_cfT(M,I,A,B,D)  A
+@@ -1964,6 +2053,7 @@
+ #define           INTV_cfT(M,I,A,B,D)  A
+ #define       LOGICALV_cfT(M,I,A,B,D)  A
+ #define          LONGV_cfT(M,I,A,B,D)  A
++#define      LONGLONGV_cfT(M,I,A,B,D)  A /* added by MR December 2005 */
+ #define         SHORTV_cfT(M,I,A,B,D)  A
+ #define         BYTEVV_cfT(M,I,A,B,D)  (void *)A /* We have to cast to void *,*/
+ #define        BYTEVVV_cfT(M,I,A,B,D)  (void *)A /* since we don't know the   */
+@@ -2001,6 +2091,12 @@
+ #define      LONGVVVVV_cfT(M,I,A,B,D)  (void *)A
+ #define     LONGVVVVVV_cfT(M,I,A,B,D)  (void *)A
+ #define    LONGVVVVVVV_cfT(M,I,A,B,D)  (void *)A
++#define     LONGLONGVV_cfT(M,I,A,B,D)  (void *)A /* added by MR December 2005 */
++#define    LONGLONGVVV_cfT(M,I,A,B,D)  (void *)A /* added by MR December 2005 */
++#define   LONGLONGVVVV_cfT(M,I,A,B,D)  (void *)A /* added by MR December 2005 */
++#define  LONGLONGVVVVV_cfT(M,I,A,B,D)  (void *)A /* added by MR December 2005 */
++#define LONGLONGVVVVVV_cfT(M,I,A,B,D)  (void *)A /* added by MR December 2005 */
++#define LONGLONGVVVVVVV_cfT(M,I,A,B,D)  (void *)A /* added by MR December 2005 */
+ #define        SHORTVV_cfT(M,I,A,B,D)  (void *)A
+ #define       SHORTVVV_cfT(M,I,A,B,D)  (void *)A
+ #define      SHORTVVVV_cfT(M,I,A,B,D)  (void *)A
+@@ -2013,6 +2109,7 @@
+ #define           PINT_cfT(M,I,A,B,D)  A
+ #define       PLOGICAL_cfT(M,I,A,B,D)  ((*A=F2CLOGICAL(*A)),A)
+ #define          PLONG_cfT(M,I,A,B,D)  A
++#define      PLONGLONG_cfT(M,I,A,B,D)  A /* added by MR December 2005 */
+ #define         PSHORT_cfT(M,I,A,B,D)  A
+ #define          PVOID_cfT(M,I,A,B,D)  A
+ #if defined(apolloFortran) || defined(hpuxFortran800) || defined(AbsoftUNIXFortran)
+@@ -2083,12 +2180,18 @@
+ #define     INT_cfFZ(UN,LN) int   FCALLSC_QUALIFIER fcallsc(UN,LN)(
+ #define LOGICAL_cfFZ(UN,LN) int   FCALLSC_QUALIFIER fcallsc(UN,LN)(
+ #define    LONG_cfFZ(UN,LN) long  FCALLSC_QUALIFIER fcallsc(UN,LN)(
++#define LONGLONG_cfFZ(UN,LN) long long FCALLSC_QUALIFIER fcallsc(UN,LN)( /* added by MR December 2005 */
+ #define   SHORT_cfFZ(UN,LN) short FCALLSC_QUALIFIER fcallsc(UN,LN)(
+ #define    VOID_cfFZ(UN,LN) void  FCALLSC_QUALIFIER fcallsc(UN,LN)(
  #ifndef __CF__KnR
  /* The void is req'd by the Apollo, to make this an ANSI function declaration.
     The Apollo promotes K&R float functions to double. */
@@ -245,7 +373,7 @@
  #ifdef vmsFortran
  #define  STRING_cfFZ(UN,LN) void  FCALLSC_QUALIFIER fcallsc(UN,LN)(fstring *AS
  #else
-@@ -2104,7 +2170,12 @@
+@@ -2104,7 +2207,12 @@
  #endif
  #else
  #if ! (defined(FLOATFUNCTIONTYPE)&&defined(ASSIGNFLOAT)&&defined(RETURNFLOAT))
@@ -258,7 +386,7 @@
  #else
  #define   FLOAT_cfFZ(UN,LN) FLOATFUNCTIONTYPE FCALLSC_QUALIFIER fcallsc(UN,LN)(
  #endif
-@@ -2118,7 +2189,12 @@
+@@ -2118,13 +2226,19 @@
  #define    BYTE_cfF(UN,LN)     BYTE_cfFZ(UN,LN)
  #define  DOUBLE_cfF(UN,LN)   DOUBLE_cfFZ(UN,LN)
  #ifndef __CF_KnR
@@ -271,3 +399,18 @@
  #else
  #define   FLOAT_cfF(UN,LN)    FLOAT_cfFZ(UN,LN)
  #endif
+ #define     INT_cfF(UN,LN)      INT_cfFZ(UN,LN)
+ #define LOGICAL_cfF(UN,LN)  LOGICAL_cfFZ(UN,LN)
+ #define    LONG_cfF(UN,LN)     LONG_cfFZ(UN,LN)
++#define LONGLONG_cfF(UN,LN) LONGLONG_cfFZ(UN,LN) /* added by MR December 2005 */
+ #define   SHORT_cfF(UN,LN)    SHORT_cfFZ(UN,LN)
+ #define    VOID_cfF(UN,LN)     VOID_cfFZ(UN,LN)
+ #define  STRING_cfF(UN,LN)   STRING_cfFZ(UN,LN),
+@@ -2187,6 +2301,7 @@
+ #define LOGICAL_cfI  return C2FLOGICAL(A0);
+ #endif
+ #define    LONG_cfI  return A0;
++#define LONGLONG_cfI  return A0; /* added by MR December 2005 */
+ #define   SHORT_cfI  return A0;
+ #define  STRING_cfI  return   ;
+ #define    VOID_cfI  return   ;


Index: 800-implement-shared-library-rules-in-Imake.dpatch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/800-implement-shared-library-rules-in-Imake.dpatch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 800-implement-shared-library-rules-in-Imake.dpatch	30 Nov 2005 22:01:01 -0000	1.1
+++ 800-implement-shared-library-rules-in-Imake.dpatch	11 Apr 2006 22:45:34 -0000	1.2
@@ -6,8 +6,8 @@
 
 @DPATCH@
 diff -urNad cernlib-2005.05.09.dfsg~/src/config/Imake.rules cernlib-2005.05.09.dfsg/src/config/Imake.rules
---- cernlib-2005.05.09.dfsg~/src/config/Imake.rules	2005-11-29 17:07:32.035570303 +0000
-+++ cernlib-2005.05.09.dfsg/src/config/Imake.rules	2005-11-29 17:07:40.003888782 +0000
+--- cernlib-2005.05.09.dfsg~/src/config/Imake.rules	2006-01-02 10:42:00.576902424 -0500
++++ cernlib-2005.05.09.dfsg/src/config/Imake.rules	2006-01-02 10:42:08.484202137 -0500
 @@ -904,6 +904,8 @@
   * InstallSharedLibrary - generate rules to install the indicated sharable 
   * Library
@@ -27,7 +27,7 @@
  
  /*
   * InstallLinkKitLibrary - rule to install Link Kit library.
-@@ -1963,6 +1966,15 @@
+@@ -1967,6 +1970,15 @@
  #endif /* InstallSubdirs */
  
  /*
@@ -43,7 +43,7 @@
   * InstallBinSubdirs - generate rules to recursively install programs and
   *		       scripts
   */
-@@ -2341,9 +2353,12 @@
+@@ -2354,9 +2366,12 @@
   */
  #ifndef DefinePackageLibrary
  #define DefinePackageLibrary(locallib) \
@@ -57,8 +57,8 @@
  override PACKAGE_LIB:= LibraryTargetName(locallib) $(PACKAGE_LIB)	@@\
  									@@\
 diff -urNad cernlib-2005.05.09.dfsg~/src/config/biglib.rules cernlib-2005.05.09.dfsg/src/config/biglib.rules
---- cernlib-2005.05.09.dfsg~/src/config/biglib.rules	2000-04-19 10:51:01.000000000 +0000
-+++ cernlib-2005.05.09.dfsg/src/config/biglib.rules	2005-11-29 17:09:29.336812562 +0000
+--- cernlib-2005.05.09.dfsg~/src/config/biglib.rules	2000-04-19 06:51:01.000000000 -0400
++++ cernlib-2005.05.09.dfsg/src/config/biglib.rules	2006-01-02 10:42:08.485201922 -0500
 @@ -227,7 +227,7 @@
  	RanLibrary($@)
  #endif
@@ -120,8 +120,8 @@
  #ifndef SharedLibraryBuild
  #define SharedLibraryBuild(libname,version)				@@\
 diff -urNad cernlib-2005.05.09.dfsg~/src/config/lnxLib.rules cernlib-2005.05.09.dfsg/src/config/lnxLib.rules
---- cernlib-2005.05.09.dfsg~/src/config/lnxLib.rules	1995-12-20 15:26:45.000000000 +0000
-+++ cernlib-2005.05.09.dfsg/src/config/lnxLib.rules	2005-11-29 17:07:40.004888571 +0000
+--- cernlib-2005.05.09.dfsg~/src/config/lnxLib.rules	1995-12-20 10:26:45.000000000 -0500
++++ cernlib-2005.05.09.dfsg/src/config/lnxLib.rules	2006-01-02 10:42:08.485201922 -0500
 @@ -43,6 +43,9 @@
  #ifndef PositionIndependentCplusplusFlags
  #define PositionIndependentCplusplusFlags -fPIC

cernlib-gfortran.diff:

Index: cernlib-gfortran.diff
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib-gfortran.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- cernlib-gfortran.diff	16 Nov 2005 23:34:07 -0000	1.1
+++ cernlib-gfortran.diff	11 Apr 2006 22:45:34 -0000	1.2
@@ -1,6 +1,6 @@
---- src/config/linux.cf.old	2005-06-16 21:11:15.000000000 +0200
-+++ src/config/linux.cf	2005-06-16 21:09:23.000000000 +0200
-@@ -216,7 +216,7 @@
+--- 2005/src/config/linux.cf-old	2006-03-15 11:32:47.000000000 +0100
++++ 2005/src/config/linux.cf	2006-03-15 11:33:52.000000000 +0100
+@@ -478,7 +478,7 @@
      variable=value							@@\
  endif									@@\
  
@@ -9,16 +9,20 @@
  
  /* Start CERNLIB changes A.Waananen 15. Apr. 1996 */
  /*  Adapted to CERN style GF. 20-Sep-96 */
-@@ -227,10 +227,10 @@
- # define OptimizedCDebugFlags	-O1 -fomit-frame-pointer
+@@ -498,14 +498,13 @@
+ #endif
  
  #define f2cFortran	        YES
--#define FortranCmd		g77
-+#define FortranCmd		gfortran
+-#define FortranCmd		g77 -g
++#define FortranCmd		gfortran -g
  #define XargsCmd		xargs
  #define FortranSaveFlags	/* */ /* Everything static !? */
--#define DefaultFCOptions	-fno-automatic -fno-second-underscore -fugly-complex
-+#define DefaultFCOptions	-fno-second-underscore 
- #define CernlibSystem	        -DCERNLIB_LINUX -DCERNLIB_UNIX -DCERNLIB_LNX -DCERNLIB_QMGLIBC
- 
- # endif
+ #define OptimisedFortranFlags	OptimizedCDebugFlags -funroll-loops
+ /* Remove -fomit-frame-pointer since -O implies it and it inhibits debugging */
+ #ifndef DefaultFCOptions
+-# define DefaultFCOptions	-fno-automatic -fno-second-underscore \
+-				-fugly-complex
++# define DefaultFCOptions	-fno-automatic -fno-second-underscore
+ #endif
+ #define CernlibSystem	        CernlibDefaultDefines CernlibMachineDefines \
+ 				CernlibLocalDefines


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- cernlib.spec	16 Feb 2006 22:00:29 -0000	1.19
+++ cernlib.spec	11 Apr 2006 22:45:34 -0000	1.20
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       13%{?dist}
+Release:       14%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -18,6 +18,8 @@
 #BuildRequires: xorg-x11-devel lapack-devel blas-devel openmotif-devel 
 # fc devel
 BuildRequires: imake lapack-devel blas-devel openmotif-devel 
+# for patchy build scripts
+BuildRequires: tcsh
 # workaround #173530
 BuildRequires: libXau-devel
 # there are missing f2c intrinsics in gfortran so gfortran cannot be used to
@@ -45,11 +47,12 @@
 Source6: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_mathlib.tar.gz 
 Source11: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_phtools.tar.gz
 Source12: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_scripts.tar.gz
-# actually patchy isn't built, for the reason stated in
-# see http://borex.princeton.edu/~kmccarty/faq.html#36
 Source9: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_patchy.tar.gz
 Source14: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_cfortran.tar.gz
 Source16: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/lib/xsneut95.dat
+# patchy 4 source files, provided by Mattias Ellert
+Source17: patchy.tar.gz
+
 # Shell scripts that go in /etc/profile.d
 Source100: cernlib.sh.in
 Source105: cernlib.csh.in
@@ -67,7 +70,7 @@
 Source201: cernlib-deadpool.txt
 
 # debian patchset
-Patch0: cernlib_2005.05.09.dfsg-3.diff
+Patch0: cernlib_2005.05.09.dfsg-5.diff
 # change file to directory to DATADIR
 Patch1100: cernlib-enforce-FHS.diff
 Patch1: 001-fix-missing-fluka.dpatch
@@ -108,7 +111,7 @@
 Patch210: 210-improve-cfortran-header-files.dpatch
 # split in newer debian patchset
 Patch2110: 211-fix-comis-on-amd64.dpatch
-Patch2111: 211-fix-comis-on-ia64.dpatch
+Patch2111: 211-fix-comis-on-ia64-alpha.dpatch
 Patch300: 300-skip-duplicate-lenocc.dpatch
 # Use another approach, see cernlib-enforce-FHS
 # Patch33: 301-datafiles-comply-with-FHS.dpatch
@@ -135,6 +138,8 @@
 Patch314: 314-permit-using-regcomp-for-re_comp.dpatch
 Patch315: 315-fixes-for-MacOSX.dpatch
 Patch318: 318-additional-gcc-3.4-fixes.dpatch
+# certainly not needed
+Patch319: 319-work-around-imake-segfaults.dpatch
 
 Patch700: 700-remove-kernlib-from-packlib-Imakefile.dpatch
 Patch701: 701-patch-hbook-comis-Imakefiles.dpatch
@@ -190,6 +195,16 @@
 Patch1205: cernlib-gfortran.diff 
 Patch1207: cernlib-v107z0_X_before_string.diff
 
+# patchy 4
+Patch1500: patchy-rceta.patch
+Patch1501: patchy-insecure_tmp_use.diff
+Patch1502: patchy-fcasplit.patch
+Patch1503: patchy-p4comp.patch
+
+# patchy 5 (included in cernlib)
+Patch1504: patchy-case.patch
+Patch1505: patchy-perror.patch
+
 %description
 CERN program library is a large collection of general purpose libraries
 and modules maintained and offered on the CERN. Most of these programs 
@@ -279,6 +294,13 @@
 According to the responsible of the cernlib debian package, some
 of these utilities may have security flaws.
 
+%package -n patchy
+Group: Applications/Archiving
+Summary: The patchy utilities
+
+%description -n patchy
+Utilities for extracting sources from patchy cards and cradles.
+
 
 %prep
 %setup -c 
@@ -295,6 +317,20 @@
 %setup -T -D -a 12
 %setup -T -D -a 14
 %setup -T -D -a 15
+%setup -T -D -a 17
+
+# patch patchy 4 installer fortran generator script
+%patch -P 1500
+%patch -P 1501
+
+# unpack the patchy version 4 sources
+pushd patchy
+        ./rceta.sh
+popd
+
+%patch -P 1502
+%patch -P 1503
+
 
 %patch -p1
 cd %{version}
@@ -355,6 +391,7 @@
 cp src/pawlib/paw/tree/converter.h src/pawlib/paw/paw/
 
 %patch -P 318 -p1
+%patch -P 319 -p1
 
 # move kernlib out of packlib (debian 700-move-kernlib-to-top-level.sh.dpatch)
 mv src/packlib/kernlib src/kernlib
@@ -458,13 +495,15 @@
 %patch -P 805 -p1
 %patch -P 806 -p1
 
+%patch -P 1504 -p1
+%patch -P 1505 -p1
 
 %patch -P 1200
 %patch -P 1201
 %patch -P 1203
 %patch -P 1204
 # use gfortran
-#%patch -P 1205
+#%patch -P 1205 -p1
 # workaround gfortran bug
 %patch -P 1207
 
@@ -518,7 +557,8 @@
 
 # substitude the right defaults in the scripts
 sed -i -e 's:"/cern":"%{_libdir}/cernlib/":' -e 's:"pro":"%{version}":' \
-	src/scripts/paw src/scripts/cernlib src/graflib/dzdoc/dzedit/dzedit.script
+	src/scripts/paw src/scripts/cernlib src/graflib/dzdoc/dzedit/dzedit.script \
+	../patchy/ylist ../patchy/yindex
 
 # substitute version in gxint with the right version
 # substitute includedir in gxint to conform to FHS, and gxint.o to gxint.f
@@ -528,6 +568,9 @@
 sed -i -e 's:DATADIR:%{_datadir}/cernlib/%{version}:' \
   src/geant321/miface/gmorin.F src/mclibs/cojets/test/test.F src/mclibs/eurodec/eurodec/eufiles.inc src/mclibs/isajet/test/isajett.F
 
+# substitute bindir in ylist and yindex to conform to FHS
+sed -i -e 's:\$CERN/patchy/\$PATCHY_VERSION/bin:%{_bindir}:' ../patchy/ylist ../patchy/yindex
+
 # Create the build directory structure
 mkdir -p build bin lib shlib
 
@@ -546,6 +589,16 @@
 cp %{SOURCE104} bin/
 chmod a+x bin/mkdirhier
 
+PATHSAVE=$PATH
+# Build patchy version 4
+pushd ../patchy
+#        export PATH="$CERN/patchy:$CERN/patchy/p4sub:$PATH" 
+        export PATH=".:..:$PATH" 
+        p4boot.sh 0
+popd
+find ../patchy -name y* -a -perm -755 -exec install {} bin ';'
+export PATH=$PATHSAVE
+
 # Create the top level Makefile with imake
 
 cd $CERN_ROOT/build
@@ -556,6 +609,7 @@
 # Install kuipc and the scripts (cernlib, paw and gxint) in $CERN_ROOT/bin
 
 make %{?_smp_mflags} bin/kuipc
+make patchy/Makefile
 make scripts/Makefile
 cd scripts
 make install.bin
@@ -576,6 +630,10 @@
 cd $CERN_ROOT/build/packlib
 make %{?_smp_mflags} install.bin
 
+# Build patchy
+cd $CERN_ROOT/build/patchy
+make %{?_smp_mflags} install.bin
+
 %install
 
 rm -rf $RPM_BUILD_ROOT
@@ -610,7 +668,6 @@
 # to preserve symlinks
 (cd lib && tar cf - *.a) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -)
 (cd shlib && tar cf - *.so*) | (cd $RPM_BUILD_ROOT%{_libdir}/cernlib/%{version}/lib && tar xf -)
-#(cd src/include && tar cf - *) | (cd $RPM_BUILD_ROOT%{_includedir}/cernlib/%{version} && tar xf -)
 
 rm -f $RPM_BUILD_ROOT%{_bindir}/mkdirhier
 
@@ -711,7 +768,39 @@
 %{_bindir}/zftp
 %doc debian/debhelper/zftp.README.debian
 
+%files -n patchy
+%defattr(-,root,root,-)
+%{_bindir}/fcasplit
+%{_bindir}/nycheck
+%{_bindir}/nydiff
+%{_bindir}/nyindex
+%{_bindir}/nylist
+%{_bindir}/nymerge
+%{_bindir}/nypatchy
+%{_bindir}/nyshell
+%{_bindir}/nysynopt
+%{_bindir}/nytidy
+%{_bindir}/ycompar
+%{_bindir}/yedit
+%{_bindir}/yexpand
+%{_bindir}/yfrceta
+%{_bindir}/yindex
+%{_bindir}/yindexb
+%{_bindir}/ylist
+%{_bindir}/ylistb
+%{_bindir}/ypatchy
+%{_bindir}/ysearch
+%{_bindir}/yshift
+%{_bindir}/ytobcd
+%{_bindir}/ytobin
+%{_bindir}/ytoceta
+
+
 %changelog
+* Tue Apr 11 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-14
+- add patchy version 4 and build cernlib patchy. From Mattias Ellert.
+- update to newer debian patchset
+
 * Thu Feb 16 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-13
 - rebuild for fc5
 


Index: paw.README
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/paw.README,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- paw.README	14 Dec 2005 16:52:26 -0000	1.3
+++ paw.README	11 Apr 2006 22:45:34 -0000	1.4
@@ -41,6 +41,11 @@
 
 to the beginning of them.
 
+5) Shared libs
+
+PAW is linked dynamically, therefore the pawlib used is selected by the
+/etc/ld.so.conf or $LD_LIBRARY_PATH settings.
+
 -- Kevin McCarty <kmccarty at debian.org>, Tue, 22 Nov 2005
 
 Adapted to the rpm package by 


--- 211-fix-comis-on-ia64.dpatch DELETED ---


--- cernlib_2005.05.09.dfsg-3.diff DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 11 22:53:00 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 11 Apr 2006 15:53:00 -0700
Subject: rpms/cernlib/devel .cvsignore, 1.3, 1.4 cernlib.spec, 1.20,
	1.21 sources, 1.3, 1.4
Message-ID: <200604112253.k3BMr28d008270@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8249

Modified Files:
	.cvsignore cernlib.spec sources 
Log Message:
Forgot ot upload patchy source


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	30 Nov 2005 22:01:01 -0000	1.3
+++ .cvsignore	11 Apr 2006 22:53:00 -0000	1.4
@@ -13,3 +13,4 @@
 src_graflib.tar.gz
 src_packlib.tar.gz
 xsneut95.dat
+patchy.tar.gz


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- cernlib.spec	11 Apr 2006 22:45:34 -0000	1.20
+++ cernlib.spec	11 Apr 2006 22:53:00 -0000	1.21
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       14%{?dist}
+Release:       14%{?dist}.1
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -797,7 +797,7 @@
 
 
 %changelog
-* Tue Apr 11 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-14
+* Tue Apr 11 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-14.1
 - add patchy version 4 and build cernlib patchy. From Mattias Ellert.
 - update to newer debian patchset
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 Nov 2005 22:01:01 -0000	1.3
+++ sources	11 Apr 2006 22:53:00 -0000	1.4
@@ -13,3 +13,4 @@
 67228b011eac13b44499c50219e21545  src_graflib.tar.gz
 4fdcdc9f819ebbb9c6d3a04f339cdcf8  src_packlib.tar.gz
 eecb52159458ead0ee6b0d00b90aab66  xsneut95.dat
+14e6f0dbc205ec4f106093ee27578273  patchy.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 11 23:12:13 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 11 Apr 2006 16:12:13 -0700
Subject: rpms/cernlib/devel cernlib.spec,1.21,1.22
Message-ID: <200604112312.k3BNCFg6010405@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10388

Modified Files:
	cernlib.spec 
Log Message:
* Tue Apr 11 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-15
- add conditionals in spec to have only one for all fedora versions.



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- cernlib.spec	11 Apr 2006 22:53:00 -0000	1.21
+++ cernlib.spec	11 Apr 2006 23:12:13 -0000	1.22
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       14%{?dist}.1
+Release:       15%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -12,21 +12,30 @@
 #BuildRequires: gcc-g77
 #Requires:      libxorg-x11-devel lesstif-devel libblas3-devel liblapack3-devel
 # fedora core
-# fc 3
-#BuildRequires: xorg-x11-devel lapack blas openmotif-devel
-# fc 4
-#BuildRequires: xorg-x11-devel lapack-devel blas-devel openmotif-devel 
-# fc devel
-BuildRequires: imake lapack-devel blas-devel openmotif-devel 
-# for patchy build scripts
-BuildRequires: tcsh
+BuildRequires: openmotif-devel
+%if "%fedora" <= "3"
+BuildRequires: lapack blas
+%else
+BuildRequires: lapack-devel blas-devel
+%endif
+
+%if "%fedora" <= "4"
+BuildRequires: xorg-x11-devel 
+%else
+BuildRequires: imake 
 # workaround #173530
 BuildRequires: libXau-devel
+%endif
+# for patchy build scripts
+BuildRequires: tcsh
 # there are missing f2c intrinsics in gfortran so gfortran cannot be used to
 # build the cernlib
 BuildRequires: /usr/bin/g77
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+%if "%fedora" > "3"
+# f771 segfaults on x86_64
 ExcludeArch:   x86_64
+%endif
 
 # these sources are different from the upstream sources as files with 
 # GPL incompatible licences are removed. You can use cernlib-remove-deadpool
@@ -218,9 +227,17 @@
 
 %package devel
 Summary:       General purpose CERN library static libraries and headers
-Requires:      lapack-devel blas-devel openmotif-devel
+Requires:      openmotif-devel
+%if "%fedora" <= "3"
+Requires:       lapack blas
+%else
+Requires:       lapack-devel blas-devel
+%endif
+
+%if "%fedora" > "4"
 # workaround #173530
 Requires:      libXau-devel
+%endif
 Requires:      %{name} = %{version}-%{release}
 Group:         Development/Libraries
 
@@ -797,7 +814,10 @@
 
 
 %changelog
-* Tue Apr 11 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-14.1
+* Tue Apr 11 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-15
+- add conditionals in spec to have only one for all fedora versions.
+
+* Tue Apr 11 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-14
 - add patchy version 4 and build cernlib patchy. From Mattias Ellert.
 - update to newer debian patchset
 



From fedora-extras-commits at redhat.com  Tue Apr 11 23:16:48 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 11 Apr 2006 16:16:48 -0700
Subject: rpms/cernlib/devel patchy-rceta.patch,1.1,1.2
Message-ID: <200604112316.k3BNGoW5010466@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10445

Modified Files:
	patchy-rceta.patch 
Log Message:
Add -O2 -g to f77 call.


patchy-rceta.patch:

Index: patchy-rceta.patch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/patchy-rceta.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- patchy-rceta.patch	11 Apr 2006 22:45:34 -0000	1.1
+++ patchy-rceta.patch	11 Apr 2006 23:16:48 -0000	1.2
@@ -6,7 +6,7 @@
  \\
 - fort77 -o rceta rceta.f
 - rceta    <<\\
-+ f77 -o rceta rceta.f
++ f77 -g -O2 -o rceta rceta.f
 + ./rceta    <<\\
  CODE  INTERNAL A1 REPRESENTATION OF THE CETA SET / LNX
  CODE  CARD    1  IN HOLLERITH FOR CETA VALUES  1 - 47



From fedora-extras-commits at redhat.com  Tue Apr 11 23:38:11 2006
From: fedora-extras-commits at redhat.com (John Patrick Mahowald (jpmahowa))
Date: Tue, 11 Apr 2006 16:38:11 -0700
Subject: rpms/smeg/FC-3 .cvsignore, 1.4, NONE Makefile, 1.1, NONE branch, 1.1,
	NONE smeg.spec, 1.3, NONE sources, 1.4, NONE
Message-ID: <200604112338.k3BNcDL7010672@cvs-int.fedora.redhat.com>

Author: jpmahowa

Update of /cvs/extras/rpms/smeg/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10657

Removed Files:
	.cvsignore Makefile branch smeg.spec sources 
Log Message:
smeg has been renamed to alacarte


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- smeg.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 11 23:38:31 2006
From: fedora-extras-commits at redhat.com (John Patrick Mahowald (jpmahowa))
Date: Tue, 11 Apr 2006 16:38:31 -0700
Subject: rpms/smeg/FC-5 .cvsignore, 1.4, NONE Makefile, 1.1, NONE branch, 1.1,
	NONE smeg.spec, 1.4, NONE sources, 1.4, NONE
Message-ID: <200604112338.k3BNcX7K010694@cvs-int.fedora.redhat.com>

Author: jpmahowa

Update of /cvs/extras/rpms/smeg/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10679

Removed Files:
	.cvsignore Makefile branch smeg.spec sources 
Log Message:
smeg has been renamed to alacarte


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- branch DELETED ---


--- smeg.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 11 23:38:41 2006
From: fedora-extras-commits at redhat.com (John Patrick Mahowald (jpmahowa))
Date: Tue, 11 Apr 2006 16:38:41 -0700
Subject: rpms/smeg/devel .cvsignore, 1.4, NONE Makefile, 1.1, NONE smeg.spec,
	1.4, NONE sources, 1.4, NONE
Message-ID: <200604112338.k3BNchW8010715@cvs-int.fedora.redhat.com>

Author: jpmahowa

Update of /cvs/extras/rpms/smeg/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10700

Removed Files:
	.cvsignore Makefile smeg.spec sources 
Log Message:
smeg has been renamed to alacarte


--- .cvsignore DELETED ---


--- Makefile DELETED ---


--- smeg.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Wed Apr 12 00:02:08 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 17:02:08 -0700
Subject: rpms/xfce4-battery-plugin/devel LGPL, NONE,
	1.1 xfce4-battery-plugin.spec, 1.3, 1.4 GPL, 1.1, NONE
Message-ID: <200604120002.k3C02AVm012861@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-serv12795/devel

Modified Files:
	xfce4-battery-plugin.spec 
Added Files:
	LGPL 
Removed Files:
	GPL 
Log Message:
require xfce4-panel, fix license field (#173105)


--- NEW FILE LGPL ---
		  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


Index: xfce4-battery-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/devel/xfce4-battery-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-battery-plugin.spec	15 Feb 2006 22:09:07 -0000	1.3
+++ xfce4-battery-plugin.spec	12 Apr 2006 00:02:08 -0000	1.4
@@ -1,16 +1,17 @@
 Name:		xfce4-battery-plugin
 Version:	0.3.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Battery monitor for the Xfce panel
 
 Group:		User Interface/Desktops
-License:	GPL
+License:	LGPL
 URL:		http://xfce-goodies.berlios.de/
 Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
-Source1:	GPL
+Source1:	LGPL
 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
 
 %description
 A battery monitor plugin for the Xfce panel, compatible with APM and ACPI.
@@ -27,7 +28,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
-# replace wrong BSD license with a copy of GPL
+# replace wrong BSD license with a copy of LGPL
 %__cp %{SOURCE1} COPYING
 
 %clean
@@ -39,6 +40,10 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-6
+- Require xfce4-panel.
+- Change license back to LGPL (#173105).
+
 * Wed Feb 15 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-5
 - Rebuild for Fedora Extras 5.
 


--- GPL DELETED ---



From fedora-extras-commits at redhat.com  Wed Apr 12 00:01:59 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 17:01:59 -0700
Subject: rpms/xfce4-battery-plugin/FC-3 LGPL, NONE,
	1.1 xfce4-battery-plugin.spec, 1.2, 1.3 GPL, 1.1, NONE
Message-ID: <200604120002.k3C02YEB012864@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-battery-plugin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12795/FC-3

Modified Files:
	xfce4-battery-plugin.spec 
Added Files:
	LGPL 
Removed Files:
	GPL 
Log Message:
require xfce4-panel, fix license field (#173105)


--- NEW FILE LGPL ---
		  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


Index: xfce4-battery-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/FC-3/xfce4-battery-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-battery-plugin.spec	2 Jan 2006 23:33:36 -0000	1.2
+++ xfce4-battery-plugin.spec	12 Apr 2006 00:01:59 -0000	1.3
@@ -1,16 +1,17 @@
 Name:		xfce4-battery-plugin
 Version:	0.3.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Battery monitor for the Xfce panel
 
 Group:		User Interface/Desktops
-License:	GPL
+License:	LGPL
 URL:		http://xfce-goodies.berlios.de/
 Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
-Source1:	GPL
+Source1:	LGPL
 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
 
 %description
 A battery monitor plugin for the Xfce panel, compatible with APM and ACPI.
@@ -27,7 +28,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
-# replace wrong BSD license with a copy of GPL
+# replace wrong BSD license with a copy of LGPL
 %__cp %{SOURCE1} COPYING
 
 %clean
@@ -39,6 +40,10 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-5
+- Require xfce4-panel.
+- Change license back to LGPL (#173105).
+
 * Fri Dec 30 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.


--- GPL DELETED ---



From fedora-extras-commits at redhat.com  Wed Apr 12 00:02:07 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 17:02:07 -0700
Subject: rpms/xfce4-battery-plugin/FC-5 LGPL, NONE,
	1.1 xfce4-battery-plugin.spec, 1.3, 1.4 GPL, 1.1, NONE
Message-ID: <200604120002.k3C02dbl012866@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-battery-plugin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12795/FC-5

Modified Files:
	xfce4-battery-plugin.spec 
Added Files:
	LGPL 
Removed Files:
	GPL 
Log Message:
require xfce4-panel, fix license field (#173105)


--- NEW FILE LGPL ---
		  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


Index: xfce4-battery-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/FC-5/xfce4-battery-plugin.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- xfce4-battery-plugin.spec	15 Feb 2006 22:09:07 -0000	1.3
+++ xfce4-battery-plugin.spec	12 Apr 2006 00:02:07 -0000	1.4
@@ -1,16 +1,17 @@
 Name:		xfce4-battery-plugin
 Version:	0.3.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 Summary:	Battery monitor for the Xfce panel
 
 Group:		User Interface/Desktops
-License:	GPL
+License:	LGPL
 URL:		http://xfce-goodies.berlios.de/
 Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
-Source1:	GPL
+Source1:	LGPL
 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
 
 %description
 A battery monitor plugin for the Xfce panel, compatible with APM and ACPI.
@@ -27,7 +28,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
-# replace wrong BSD license with a copy of GPL
+# replace wrong BSD license with a copy of LGPL
 %__cp %{SOURCE1} COPYING
 
 %clean
@@ -39,6 +40,10 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-6
+- Require xfce4-panel.
+- Change license back to LGPL (#173105).
+
 * Wed Feb 15 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-5
 - Rebuild for Fedora Extras 5.
 


--- GPL DELETED ---



From fedora-extras-commits at redhat.com  Wed Apr 12 00:02:04 2006
From: fedora-extras-commits at redhat.com (Christoph Wickert (cwickert))
Date: Tue, 11 Apr 2006 17:02:04 -0700
Subject: rpms/xfce4-battery-plugin/FC-4 LGPL, NONE,
	1.1 xfce4-battery-plugin.spec, 1.2, 1.3 GPL, 1.1, NONE
Message-ID: <200604120002.k3C02bxC012865@cvs-int.fedora.redhat.com>

Author: cwickert

Update of /cvs/extras/rpms/xfce4-battery-plugin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12795/FC-4

Modified Files:
	xfce4-battery-plugin.spec 
Added Files:
	LGPL 
Removed Files:
	GPL 
Log Message:
require xfce4-panel, fix license field (#173105)


--- NEW FILE LGPL ---
		  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


Index: xfce4-battery-plugin.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-battery-plugin/FC-4/xfce4-battery-plugin.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xfce4-battery-plugin.spec	2 Jan 2006 23:32:22 -0000	1.2
+++ xfce4-battery-plugin.spec	12 Apr 2006 00:02:04 -0000	1.3
@@ -1,16 +1,17 @@
 Name:		xfce4-battery-plugin
 Version:	0.3.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Battery monitor for the Xfce panel
 
 Group:		User Interface/Desktops
-License:	GPL
+License:	LGPL
 URL:		http://xfce-goodies.berlios.de/
 Source0:	http://download.berlios.de/xfce-goodies/%{name}-%{version}.tar.gz
-Source1:	GPL
+Source1:	LGPL
 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
 
 %description
 A battery monitor plugin for the Xfce panel, compatible with APM and ACPI.
@@ -27,7 +28,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 
-# replace wrong BSD license with a copy of GPL
+# replace wrong BSD license with a copy of LGPL
 %__cp %{SOURCE1} COPYING
 
 %clean
@@ -39,6 +40,10 @@
 %{_libdir}/xfce4/panel-plugins/*.so
 
 %changelog
+* Tue Apr 11 2006 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-5
+- Require xfce4-panel.
+- Change license back to LGPL (#173105).
+
 * Fri Dec 30 2005 Christoph Wickert <fedora wickert at arcor de> - 0.3.0-4
 - Add libxfcegui4-devel BuildReqs.
 - Fix %defattr.


--- GPL DELETED ---



From fedora-extras-commits at redhat.com  Wed Apr 12 04:00:00 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 11 Apr 2006 21:00:00 -0700
Subject: rpms/xchat-gnome/FC-4 xchat-gnome.spec,1.2,1.3
Message-ID: <200604120400.k3C402WI019620@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/xchat-gnome/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19597

Modified Files:
	xchat-gnome.spec 
Log Message:
* Tue Apr 11 2006 Brian Pepple <bdpepple at ameritech.net> - 0.6-6
- Rebuild for new libsexy.



Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/FC-4/xchat-gnome.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xchat-gnome.spec	12 Nov 2005 14:56:10 -0000	1.2
+++ xchat-gnome.spec	12 Apr 2006 04:00:00 -0000	1.3
@@ -6,7 +6,7 @@
 
 Name:           xchat-gnome
 Version:        0.6
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
@@ -135,6 +135,9 @@
 %endif
 
 %changelog
+* Tue Apr 11 2006 Brian Pepple <bdpepple at ameritech.net> - 0.6-6
+- Rebuild for new libsexy.
+
 * Sat Nov 12 2005 Brian Pepple <bdpepple at ameritech.net> - 0.6-5
 - Add test for release version to determine if dbus is enabled.
 - Add dist tag.



From fedora-extras-commits at redhat.com  Wed Apr 12 06:36:56 2006
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Tue, 11 Apr 2006 23:36:56 -0700
Subject: rpms/NetworkManager-vpnc/devel nm-vpnc-0.6.0-rekeying.patch, NONE, 
	1.1 NetworkManager-vpnc.spec, 1.7, 1.8
Message-ID: <200604120636.k3C6awVL026122@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/NetworkManager-vpnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26102

Modified Files:
	NetworkManager-vpnc.spec 
Added Files:
	nm-vpnc-0.6.0-rekeying.patch 
Log Message:
* Wed Apr 12 2006 Christopher Aillon <caillon at redhat.com> 0.6.0-2
- Rekey every 2 hours


nm-vpnc-0.6.0-rekeying.patch:

--- NEW FILE nm-vpnc-0.6.0-rekeying.patch ---
--- NetworkManager-vpnc-0.6.0/src/nm-vpnc-service.c.rekeying	2006-03-19 07:15:48.000000000 -0500
+++ NetworkManager-vpnc-0.6.0/src/nm-vpnc-service.c	2006-03-19 07:15:51.000000000 -0500
@@ -57,6 +57,7 @@
 
 #define NM_VPNC_HELPER_PATH		BINDIR"/nm-vpnc-service-vpnc-helper"
 #define NM_VPNC_UDP_ENCAPSULATION_PORT	0 /* random port */
+#define NM_VPNC_REKEYING_INTERVAL 7200
 
 typedef struct NmVpncData
 {
@@ -444,6 +445,7 @@
 	write_config_option (vpnc_fd, "Script " NM_VPNC_HELPER_PATH "\n");
 	write_config_option (vpnc_fd, "UDP Encapsulate\n");
 	write_config_option (vpnc_fd, "UDP Encapsulation Port %d\n", NM_VPNC_UDP_ENCAPSULATION_PORT);
+	write_config_option (vpnc_fd, "Rekeying interval %d\n", NM_VPNC_REKEYING_INTERVAL);
 	write_config_option (vpnc_fd, "IPSec secret %s\n", password_items[0]);
 	write_config_option (vpnc_fd, "Xauth password %s\n", password_items[1]);
 
@@ -485,17 +487,19 @@
 static gboolean nm_vpnc_config_options_validate (char **data_items, int num_items)
 {
 	Option	allowed_opts[] = {
-					{ "IPSec gateway",			OPT_TYPE_ADDRESS },
-					{ "IPSec ID",				OPT_TYPE_ASCII },
-					{ "IPSec secret",			OPT_TYPE_ASCII },
-					{ "Xauth username",			OPT_TYPE_ASCII },
-					{ "UDP Encapsulate",		OPT_TYPE_NONE },
-					{ "UDP Encapsulation Port",	OPT_TYPE_ASCII },
-					{ "Domain",				OPT_TYPE_ASCII },
-					{ "IKE DH Group",			OPT_TYPE_ASCII },
-					{ "Perfect Forward Secrecy",	OPT_TYPE_ASCII },
-					{ "Application Version",		OPT_TYPE_ASCII },
-					{ NULL,					OPT_TYPE_UNKNOWN } };
+		{ "IPSec gateway",            OPT_TYPE_ADDRESS },
+		{ "IPSec ID",                 OPT_TYPE_ASCII },
+		{ "IPSec secret",             OPT_TYPE_ASCII },
+		{ "Xauth username",           OPT_TYPE_ASCII },
+		{ "UDP Encapsulate",          OPT_TYPE_NONE },
+		{ "UDP Encapsulation Port",   OPT_TYPE_ASCII },
+		{ "Domain",                   OPT_TYPE_ASCII },
+		{ "IKE DH Group",             OPT_TYPE_ASCII },
+		{ "Perfect Forward Secrecy",  OPT_TYPE_ASCII },
+		{ "Application Version",      OPT_TYPE_ASCII },
+		{ "Rekeying interval",        OPT_TYPE_ASCII },
+		{ NULL,                       OPT_TYPE_UNKNOWN }
+	};
 
 	unsigned int	i;
 


Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NetworkManager-vpnc.spec	14 Mar 2006 21:34:47 -0000	1.7
+++ NetworkManager-vpnc.spec	12 Apr 2006 06:36:55 -0000	1.8
@@ -7,7 +7,7 @@
 Summary: NetworkManager VPN integration for vpnc
 Name: NetworkManager-vpnc
 Version: 0.6.0
-Release: 1
+Release: 2
 License: GPL
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
@@ -32,12 +32,15 @@
 Requires: gnome-keyring
 Requires: libglade2
 
+Patch1: nm-vpnc-0.6.0-rekeying.patch
+
 %description
 This package contains software for integrating the vpnc VPN software
 with NetworkManager and the GNOME desktop
 
 %prep
 %setup -q
+%patch1 -p1 -b .rekeying
 
 %build
 %configure
@@ -50,7 +53,7 @@
 rm -f %{buildroot}%{_libdir}/lib*.la
 rm -f %{buildroot}%{_libdir}/lib*.a
 
-%find_lang %{name}
+#%find_lang %{name}
 
 %clean
 rm -rf %{buildroot}
@@ -69,7 +72,8 @@
       /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor
 fi
 
-%files -f %{name}.lang
+#%files -f %{name}.lang
+%files
 %defattr(-, root, root)
 
 %doc AUTHORS ChangeLog NEWS README
@@ -84,6 +88,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
 
 %changelog
+* Wed Apr 12 2006 Christopher Aillon <caillon at redhat.com> 0.6.0-2
+- Rekey every 2 hours
+
 * Tue Mar 14 2006 Dan Williams <dcbw at redhat.com> - 0.6.0-1
 - Update to CVS snapshot of 0.6 for NM compatibility
 



From fedora-extras-commits at redhat.com  Wed Apr 12 06:53:13 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Tue, 11 Apr 2006 23:53:13 -0700
Subject: rpms/cernlib/devel cernlib.spec,1.22,1.23
Message-ID: <200604120653.k3C6rF9h026200@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26183

Modified Files:
	cernlib.spec 
Log Message:
Try a x86_64 build to verify whether patchy builds or not


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- cernlib.spec	11 Apr 2006 23:12:13 -0000	1.22
+++ cernlib.spec	12 Apr 2006 06:53:13 -0000	1.23
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       15%{?dist}
+Release:       15%{?dist}.1
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -34,8 +34,10 @@
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if "%fedora" > "3"
 # f771 segfaults on x86_64
-ExcludeArch:   x86_64
+#ExcludeArch:   x86_64
 %endif
+# rceta segfaults on ppc
+ExcludeArch:   ppc
 
 # these sources are different from the upstream sources as files with 
 # GPL incompatible licences are removed. You can use cernlib-remove-deadpool
@@ -814,7 +816,7 @@
 
 
 %changelog
-* Tue Apr 11 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-15
+* Tue Apr 11 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-15.1
 - add conditionals in spec to have only one for all fedora versions.
 
 * Tue Apr 11 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-14



From fedora-extras-commits at redhat.com  Wed Apr 12 08:04:49 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Wed, 12 Apr 2006 01:04:49 -0700
Subject: fedora-security/audit fc4,1.200,1.201 fc5,1.113,1.114
Message-ID: <200604120804.k3C84nBE030548@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30526

Modified Files:
	fc4 fc5 
Log Message:
A few things new in CVE that need examining



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -r1.200 -r1.201
--- fc4	11 Apr 2006 19:14:10 -0000	1.200
+++ fc4	12 Apr 2006 08:04:46 -0000	1.201
@@ -1,8 +1,10 @@
-Up to date CVE as of CVE email 20060509
-Up to date FC4 as of 20060509
+Up to date CVE as of CVE email 20060411
+Up to date FC4 as of 20060411
 
 ** are items that need attention
 
+CVE-2006-1721 ** cyrus-sasl
+CVE-2006-1650 ** firefox
 CVE-2006-1646 ignore (ipsec-tools) KAME racoon, not ipsec-tools racoon
 CVE-2006-1624 ignore (sysklogd) Silly configuration is not a security issue
 CVE-2006-1608 ignore (php) safe mode isn't safe


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -r1.113 -r1.114
--- fc5	11 Apr 2006 19:14:10 -0000	1.113
+++ fc5	12 Apr 2006 08:04:46 -0000	1.114
@@ -1,8 +1,10 @@
-Up to date CVE as of CVE email 20060409
-Up to date FC5 as of 20060409
+Up to date CVE as of CVE email 20060411
+Up to date FC5 as of 20060411
 
 ** are items that need attention
 
+CVE-2006-1721 ** cyrus-sasl
+CVE-2006-1650 ** firefox
 CVE-2006-1646 ignore (ipsec-tools) KAME racoon, not ipsec-tools racoon
 CVE-2006-1624 ignore (sysklogd) Silly configuration is not a security issue
 CVE-2006-1608 ignore (php) safe mode isn't safe



From fedora-extras-commits at redhat.com  Wed Apr 12 08:08:50 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Wed, 12 Apr 2006 01:08:50 -0700
Subject: fedora-security/audit fc4,1.201,1.202 fc5,1.114,1.115
Message-ID: <200604120808.k3C88o2F030592@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30572

Modified Files:
	fc4 fc5 
Log Message:
mailman



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -r1.201 -r1.202
--- fc4	12 Apr 2006 08:04:46 -0000	1.201
+++ fc4	12 Apr 2006 08:08:47 -0000	1.202
@@ -4,6 +4,7 @@
 ** are items that need attention
 
 CVE-2006-1721 ** cyrus-sasl
+CVE-2006-1712 version (mailman, only 2.1.7)
 CVE-2006-1650 ** firefox
 CVE-2006-1646 ignore (ipsec-tools) KAME racoon, not ipsec-tools racoon
 CVE-2006-1624 ignore (sysklogd) Silly configuration is not a security issue


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -r1.114 -r1.115
--- fc5	12 Apr 2006 08:04:46 -0000	1.114
+++ fc5	12 Apr 2006 08:08:47 -0000	1.115
@@ -4,6 +4,7 @@
 ** are items that need attention
 
 CVE-2006-1721 ** cyrus-sasl
+CVE-2006-1712 version (mailman, only 2.1.7)
 CVE-2006-1650 ** firefox
 CVE-2006-1646 ignore (ipsec-tools) KAME racoon, not ipsec-tools racoon
 CVE-2006-1624 ignore (sysklogd) Silly configuration is not a security issue



From fedora-extras-commits at redhat.com  Wed Apr 12 12:37:40 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Wed, 12 Apr 2006 05:37:40 -0700
Subject: rpms/grace/devel grace.spec,1.6,1.7
Message-ID: <200604121237.k3CCbgRJ007902@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/grace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7885

Modified Files:
	grace.spec 
Log Message:
* Wed Apr 12 2006 Jos?? Matos <jamatos at fc.up.pt> - 5.1.19-5
- Add htmlview as help viewer.



Index: grace.spec
===================================================================
RCS file: /cvs/extras/rpms/grace/devel/grace.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- grace.spec	16 Feb 2006 11:03:52 -0000	1.6
+++ grace.spec	12 Apr 2006 12:37:39 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           grace
 Version:        5.1.19
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Numerical Data Processing and Visualization Tool
 
 License:        GPL
@@ -27,6 +27,7 @@
 %endif
 
 Requires:	nedit
+Requires:	htmlview
 Requires(post): chkfontpath
 Requires(postun): chkfontpath
 
@@ -60,6 +61,7 @@
 %configure \
     --enable-editres \
     --with-editor=nedit \
+    --with-helpviewer="htmlview %s" \
     --with-printcmd="lpr" \
     --enable-grace-home=%{_datadir}/%{name} \
     --disable-pdfdrv \
@@ -164,7 +166,10 @@
 
 
 %changelog
-* Thu Feb 16 2006 Jose' Matos <jamatos at fc.up.pt> - 5.1.19-4
+* Wed Apr 12 2006 Jos?? Matos <jamatos at fc.up.pt> - 5.1.19-5
+- Add htmlview as help viewer.
+
+* Thu Feb 16 2006 Jos?? Matos <jamatos at fc.up.pt> - 5.1.19-4
 - Remove stripping option from Makefiles to have meaningfull debuginfo packages.
 - Thanks to Ville Skytt?? for the fix. (bz#180106)
 



From fedora-extras-commits at redhat.com  Wed Apr 12 12:39:39 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Wed, 12 Apr 2006 05:39:39 -0700
Subject: rpms/grace/FC-5 grace.spec,1.6,1.7
Message-ID: <200604121239.k3CCdfBH007964@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/grace/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7947

Modified Files:
	grace.spec 
Log Message:
* Wed Apr 12 2006 Jos?? Matos <jamatos at fc.up.pt> - 5.1.19-5
- Add htmlview as help viewer.



Index: grace.spec
===================================================================
RCS file: /cvs/extras/rpms/grace/FC-5/grace.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- grace.spec	16 Feb 2006 11:03:52 -0000	1.6
+++ grace.spec	12 Apr 2006 12:39:39 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           grace
 Version:        5.1.19
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Numerical Data Processing and Visualization Tool
 
 License:        GPL
@@ -27,6 +27,7 @@
 %endif
 
 Requires:	nedit
+Requires:	htmlview
 Requires(post): chkfontpath
 Requires(postun): chkfontpath
 
@@ -60,6 +61,7 @@
 %configure \
     --enable-editres \
     --with-editor=nedit \
+    --with-helpviewer="htmlview %s" \
     --with-printcmd="lpr" \
     --enable-grace-home=%{_datadir}/%{name} \
     --disable-pdfdrv \
@@ -164,7 +166,10 @@
 
 
 %changelog
-* Thu Feb 16 2006 Jose' Matos <jamatos at fc.up.pt> - 5.1.19-4
+* Wed Apr 12 2006 Jos?? Matos <jamatos at fc.up.pt> - 5.1.19-5
+- Add htmlview as help viewer.
+
+* Thu Feb 16 2006 Jos?? Matos <jamatos at fc.up.pt> - 5.1.19-4
 - Remove stripping option from Makefiles to have meaningfull debuginfo packages.
 - Thanks to Ville Skytt?? for the fix. (bz#180106)
 



From fedora-extras-commits at redhat.com  Wed Apr 12 12:40:48 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Wed, 12 Apr 2006 05:40:48 -0700
Subject: rpms/grace/FC-4 grace.spec,1.5,1.6
Message-ID: <200604121240.k3CCeoPS008026@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/grace/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8009

Modified Files:
	grace.spec 
Log Message:
* Wed Apr 12 2006 Jos?? Matos <jamatos at fc.up.pt> - 5.1.19-5
- Add htmlview as help viewer.



Index: grace.spec
===================================================================
RCS file: /cvs/extras/rpms/grace/FC-4/grace.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- grace.spec	16 Feb 2006 11:06:57 -0000	1.5
+++ grace.spec	12 Apr 2006 12:40:47 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           grace
 Version:        5.1.19
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Numerical Data Processing and Visualization Tool
 
 License:        GPL
@@ -27,6 +27,7 @@
 %endif
 
 Requires:	nedit
+Requires:	htmlview
 Requires(post): chkfontpath
 Requires(postun): chkfontpath
 
@@ -60,6 +61,7 @@
 %configure \
     --enable-editres \
     --with-editor=nedit \
+    --with-helpviewer="htmlview %s" \
     --with-printcmd="lpr" \
     --enable-grace-home=%{_datadir}/%{name} \
     --disable-pdfdrv \
@@ -164,7 +166,10 @@
 
 
 %changelog
-* Thu Feb 16 2006 Jose' Matos <jamatos at fc.up.pt> - 5.1.19-4
+* Wed Apr 12 2006 Jos?? Matos <jamatos at fc.up.pt> - 5.1.19-5
+- Add htmlview as help viewer.
+
+* Thu Feb 16 2006 Jos?? Matos <jamatos at fc.up.pt> - 5.1.19-4
 - Remove stripping option from Makefiles to have meaningfull debuginfo packages.
 - Thanks to Ville Skytt?? for the fix. (bz#180106)
 



From fedora-extras-commits at redhat.com  Wed Apr 12 14:22:14 2006
From: fedora-extras-commits at redhat.com (John Clark Williams (jcwillia))
Date: Wed, 12 Apr 2006 07:22:14 -0700
Subject: mock mock.py,1.40,1.41
Message-ID: <200604121422.k3CEMEVG012476@cvs-int.fedora.redhat.com>

Author: jcwillia

Update of /cvs/fedora/mock
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12458

Modified Files:
	mock.py 
Log Message:
change to chroot command to insure /proc and /sys are mounted/unmounted


Index: mock.py
===================================================================
RCS file: /cvs/fedora/mock/mock.py,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- mock.py	11 Apr 2006 08:01:31 -0000	1.40
+++ mock.py	12 Apr 2006 14:22:11 -0000	1.41
@@ -792,7 +792,9 @@
     elif args[0] == 'chroot':
         config_opts['clean'] = config_opts['quiet'] = False
         my= Root(config_opts)
+        my._mount()
         my.do_chroot(' '.join(args[1:]), True)
+        my.close()
         print 'Finished chroot command'
         
     else:



From fedora-extras-commits at redhat.com  Wed Apr 12 14:22:47 2006
From: fedora-extras-commits at redhat.com (John Clark Williams (jcwillia))
Date: Wed, 12 Apr 2006 07:22:47 -0700
Subject: mock buildsys-build.spec,NONE,1.1
Message-ID: <200604121422.k3CEMlQo012499@cvs-int.fedora.redhat.com>

Author: jcwillia

Update of /cvs/fedora/mock
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12482

Added Files:
	buildsys-build.spec 
Log Message:
initial checkin of dependency rpm specfile


--- NEW FILE buildsys-build.spec ---
#
# Spec file for mock buildsys configuration
#
Summary: The base set of packages for a mock chroot
Name: buildsys-build
Version: 0.5
Release: 1%{?dist}
License: GPL
Group: Development/Build Tools
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch: noarch

# packages that populate a buildsys chroot
Requires: coreutils
Requires: findutils
Requires: openssh-server
Requires: which
Requires: bash
Requires: glibc
Requires: python
Requires: createrepo
Requires: rpm
Requires: rpm-python
Requires: initscripts
Requires: chkconfig
Requires: fedora-release
Requires: buildsys-macros
Requires: perl-XML-SAX
Requires: tar
Requires: diffstat
Requires: perl-XML-Parser
Requires: perl-XML-Dumper
Requires: udev
Requires: gdb
Requires: automake15
Requires: gcc
Requires: intltool
Requires: redhat-rpm-config
Requires: automake17
Requires: pkgconfig
Requires: gettext
Requires: automake
Requires: automake16
Requires: automake14
Requires: patchutils
Requires: ctags
Requires: gcc-c++
Requires: flex
Requires: unzip
Requires: bzip2
Requires: cpio
Requires: byacc
Requires: doxygen
Requires: indent
Requires: strace
Requires: rpm-build
Requires: elfutils
Requires: patch
Requires: bison
Requires: diffutils
Requires: gzip
Requires: libtool
Requires: autoconf
Requires: make
Requires: binutils

%description
The base set of packages for a mock chroot

%prep
%build
%install
%clean

%files
%defattr(-,root,root,-)
%doc



From fedora-extras-commits at redhat.com  Wed Apr 12 14:23:20 2006
From: fedora-extras-commits at redhat.com (John Clark Williams (jcwillia))
Date: Wed, 12 Apr 2006 07:23:20 -0700
Subject: mock Makefile,1.7,1.8
Message-ID: <200604121423.k3CENKTN012535@cvs-int.fedora.redhat.com>

Author: jcwillia

Update of /cvs/fedora/mock
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12512

Modified Files:
	Makefile 
Log Message:
added target for buildsys-build RPM


Index: Makefile
===================================================================
RCS file: /cvs/fedora/mock/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Makefile	20 Nov 2005 21:57:30 -0000	1.7
+++ Makefile	12 Apr 2006 14:23:17 -0000	1.8
@@ -40,3 +40,8 @@
 	rm -rf build dist
 	mkdir build dist
 	rpmbuild --define "_sourcedir $(PWD)" --define "_builddir $(PWD)/build" --define "_srcrpmdir $(PWD)/dist" --define "_rpmdir $(PWD)/dist" -ba mock.spec
+
+buildsys-rpm:
+	rm -rf buildsys
+	mkdir buildsys
+	rpmbuild --define "_sourcedir $(PWD)" --define "_builddir $(PWD)/buildsys" --define "_srcrpmdir $(PWD)/buildsys" --define "_rpmdir $(PWD)/buildsys" -ba buildsys-build.spec



From fedora-extras-commits at redhat.com  Wed Apr 12 14:30:33 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 12 Apr 2006 07:30:33 -0700
Subject: rpms/Macaulay2/devel Macaulay2.spec,1.14,1.15
Message-ID: <200604121430.k3CEUZdG012575@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/Macaulay2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12558

Modified Files:
	Macaulay2.spec 
Log Message:
* Wed Apr 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.8-0.3.cvs20060327 
- omit x86_64, for now (#188709)



Index: Macaulay2.spec
===================================================================
RCS file: /cvs/extras/rpms/Macaulay2/devel/Macaulay2.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- Macaulay2.spec	11 Apr 2006 17:55:39 -0000	1.14
+++ Macaulay2.spec	12 Apr 2006 14:30:33 -0000	1.15
@@ -4,14 +4,16 @@
 Summary: System for algebraic geometry and commutative algebra
 Name:    Macaulay2
 Version: 0.9.8
-Release: 0.2.%{beta}%{?dist}
+Release: 0.3.%{beta}%{?dist}
 
 License: GPL
 Group:   Applications/Engineering
 URL:     http://www.math.uiuc.edu/Macaulay2/
-#Source:  http://www.math.uiuc.edu/Macaulay2/ftp-site/Macaulay2-0.9.5.beta.tar.gz
+#Source:  http://www.math.uiuc.edu/Macaulay2/ftp-site/Macaulay2-%{version}.beta.tar.gz
 Source:	 M2-0.9.8-%{beta}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# "64 bit build fails", http://bugzilla.redhat.com/bugzilla/188709
+ExcludeArch: x86_64 ppc64
 
 Source1: Macaulay2.png
 Source2: Macaulay2.desktop
@@ -140,7 +142,10 @@
 
 
 %changelog
-* Tue Mar 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.8-0.2.cvs20060327
+* Wed Apr 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.8-0.3.cvs20060327 
+- omit x86_64, for now (#188709)
+
+* Tue Apr 11 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.8-0.2.cvs20060327
 - 0.9.8 (cvs, no tarball yet)
 - drop -doc subpkg (in main now)
 



From fedora-extras-commits at redhat.com  Wed Apr 12 14:34:42 2006
From: fedora-extras-commits at redhat.com (Dams Nade (anvil))
Date: Wed, 12 Apr 2006 07:34:42 -0700
Subject: rpms/libebml/devel .cvsignore, 1.7, 1.8 libebml.spec, 1.13,
	1.14 sources, 1.8, 1.9
Message-ID: <200604121434.k3CEYiLH012652@cvs-int.fedora.redhat.com>

Author: anvil

Update of /cvs/extras/rpms/libebml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12631

Modified Files:
	.cvsignore libebml.spec sources 
Log Message:
libebml/devel: updated to 0.7.7


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libebml/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	29 Nov 2005 09:46:41 -0000	1.7
+++ .cvsignore	12 Apr 2006 14:34:42 -0000	1.8
@@ -1 +1 @@
-libebml-0.7.6.tar.bz2
+libebml-0.7.7.tar.bz2


Index: libebml.spec
===================================================================
RCS file: /cvs/extras/rpms/libebml/devel/libebml.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libebml.spec	16 Mar 2006 18:38:40 -0000	1.13
+++ libebml.spec	12 Apr 2006 14:34:42 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: 	Extensible Binary Meta Language library
 Name: 		libebml
-Version: 	0.7.6
-Release: 	2%{?dist}
+Version: 	0.7.7
+Release: 	1%{?dist}
 License: 	LGPL
 Group: 		System Environment/Libraries
 URL: 		http://www.matroska.org/
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Wed Apr 12 2006 Dams <anvil[AT]livna.org> - 0.7.7-1
+- Updated to 0.7.7
+
 * Thu Mar 16 2006 Dams <anvil[AT]livna.org> - 0.7.6-2.fc5
 - Release bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libebml/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	29 Nov 2005 09:46:41 -0000	1.8
+++ sources	12 Apr 2006 14:34:42 -0000	1.9
@@ -1 +1 @@
-bb054799dfdf6bfa5dd2cf95416ff021  libebml-0.7.6.tar.bz2
+7c8456a50fd82c1c9755917d0182c49e  libebml-0.7.7.tar.bz2



From fedora-extras-commits at redhat.com  Wed Apr 12 14:35:29 2006
From: fedora-extras-commits at redhat.com (Dams Nade (anvil))
Date: Wed, 12 Apr 2006 07:35:29 -0700
Subject: rpms/libebml/FC-5 .cvsignore, 1.7, 1.8 libebml.spec, 1.13,
	1.14 sources, 1.8, 1.9
Message-ID: <200604121435.k3CEZVB1012684@cvs-int.fedora.redhat.com>

Author: anvil

Update of /cvs/extras/rpms/libebml/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12663

Modified Files:
	.cvsignore libebml.spec sources 
Log Message:
libebml/FC-5: updated to 0.7.7


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libebml/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	29 Nov 2005 09:46:41 -0000	1.7
+++ .cvsignore	12 Apr 2006 14:35:29 -0000	1.8
@@ -1 +1 @@
-libebml-0.7.6.tar.bz2
+libebml-0.7.7.tar.bz2


Index: libebml.spec
===================================================================
RCS file: /cvs/extras/rpms/libebml/FC-5/libebml.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- libebml.spec	16 Mar 2006 18:38:40 -0000	1.13
+++ libebml.spec	12 Apr 2006 14:35:29 -0000	1.14
@@ -1,7 +1,7 @@
 Summary: 	Extensible Binary Meta Language library
 Name: 		libebml
-Version: 	0.7.6
-Release: 	2%{?dist}
+Version: 	0.7.7
+Release: 	1%{?dist}
 License: 	LGPL
 Group: 		System Environment/Libraries
 URL: 		http://www.matroska.org/
@@ -67,6 +67,9 @@
 
 
 %changelog
+* Wed Apr 12 2006 Dams <anvil[AT]livna.org> - 0.7.7-1
+- Updated to 0.7.7
+
 * Thu Mar 16 2006 Dams <anvil[AT]livna.org> - 0.7.6-2.fc5
 - Release bump
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libebml/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	29 Nov 2005 09:46:41 -0000	1.8
+++ sources	12 Apr 2006 14:35:29 -0000	1.9
@@ -1 +1 @@
-bb054799dfdf6bfa5dd2cf95416ff021  libebml-0.7.6.tar.bz2
+7c8456a50fd82c1c9755917d0182c49e  libebml-0.7.7.tar.bz2



From fedora-extras-commits at redhat.com  Wed Apr 12 14:42:38 2006
From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom))
Date: Wed, 12 Apr 2006 07:42:38 -0700
Subject: devel/qgo .cvsignore,1.4,1.5 qgo.spec,1.8,1.9 sources,1.4,1.5
Message-ID: <200604121442.k3CEgf5q012877@cvs-int.fedora.redhat.com>

Author: kaboom

Update of /cvs/extras/devel/qgo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12851

Modified Files:
	.cvsignore qgo.spec sources 
Log Message:
new upstream release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/qgo/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	15 Feb 2006 18:51:37 -0000	1.4
+++ .cvsignore	12 Apr 2006 14:42:38 -0000	1.5
@@ -1 +1 @@
-qgo-1.0.4-r2.tar.gz
+qgo-1.5-r1.tar.gz


Index: qgo.spec
===================================================================
RCS file: /cvs/extras/devel/qgo/qgo.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- qgo.spec	15 Feb 2006 18:51:37 -0000	1.8
+++ qgo.spec	12 Apr 2006 14:42:38 -0000	1.9
@@ -1,11 +1,11 @@
 Summary: Graphical Go client and SGF editor
 Name: qgo
-Version: 1.0.4r2
+Version: 1.5r1
 Release: 1%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://qgo.sourceforge.net/
-Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-1.0.4-r2.tar.gz
+Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-1.5-r1.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.0.4
+%setup -q -n %{name}-1.5
 
 %build
 unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh
@@ -58,6 +58,9 @@
 %{_datadir}/mimelnk/text/sgf.desktop
 
 %changelog
+* Wed Apr 12 2006 Chris Ricker <kaboom at oobleck.net> 1.5r1
+- New upstream release
+
 * Wed Feb 15 2006 Chris Ricker <kaboom at oobleck.net> 1.0.4r2
 - New upstream release
 - Update for modular X


Index: sources
===================================================================
RCS file: /cvs/extras/devel/qgo/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	15 Feb 2006 18:51:37 -0000	1.4
+++ sources	12 Apr 2006 14:42:38 -0000	1.5
@@ -1 +1 @@
-49da743ca769d8d18fc3a4b7a6aa0bf8  qgo-1.0.4-r2.tar.gz
+1051f540aa4e1a83a29ec6be3896c2c2  qgo-1.5-r1.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 12 14:43:13 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 12 Apr 2006 07:43:13 -0700
Subject: rpms/perl-DBD-SQLite/devel
	DBD-SQLite-1.11-type-information-segv.patch, NONE,
	1.1 DBD-SQLite-1.11-VIEW-type-information-segv.patch, 1.1, NONE
Message-ID: <200604121443.k3CEhFIN012937@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-DBD-SQLite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12919

Added Files:
	DBD-SQLite-1.11-type-information-segv.patch 
Removed Files:
	DBD-SQLite-1.11-VIEW-type-information-segv.patch 
Log Message:
Rename: DBD-SQLite-1.11-VIEW-type-information-segv.patch -> DBD-SQLite-1.11-type-information-segv.patch

DBD-SQLite-1.11-type-information-segv.patch:

--- NEW FILE DBD-SQLite-1.11-type-information-segv.patch ---
diff -ur DBD-SQLite-1.11.orig/dbdimp.c DBD-SQLite-1.11/dbdimp.c
--- DBD-SQLite-1.11.orig/dbdimp.c	2005-12-02 17:28:53.000000000 +0000
+++ DBD-SQLite-1.11/dbdimp.c	2006-02-06 12:10:31.000000000 +0000
@@ -677,11 +677,15 @@
         retsv = sv_2mortal(newRV(sv_2mortal((SV*)av)));
         for (n = 0; n < i; n++) {
             const char *fieldtype = sqlite3_column_decltype(imp_sth->stmt, n);
-            int type = sqlite3_column_type(imp_sth->stmt, n);
+            /* int type = sqlite3_column_type(imp_sth->stmt, n); */
             /* warn("got type: %d = %s\n", type, fieldtype); */
-            type = type_to_odbc_type(type);
+            /* type = type_to_odbc_type(type); */
             /* av_store(av, n, newSViv(type)); */
-            av_store(av, n, newSVpv(fieldtype, 0));
+	    if (fieldtype == NULL) {
+		av_store(av, n, newSVpv("INTEGER", 0));
+	    } else {
+                av_store(av, n, newSVpv(fieldtype, 0));
+	    }
         }
     }
     else if (strEQ(key, "NULLABLE")) {


--- DBD-SQLite-1.11-VIEW-type-information-segv.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Apr 12 14:43:56 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 12 Apr 2006 07:43:56 -0700
Subject: rpms/perl-DBD-SQLite/devel .cvsignore, 1.4, 1.5 perl-DBD-SQLite.spec,
	1.9, 1.10 sources, 1.4,
	1.5 DBD-SQLite-1.11-build-with-system-sqlite-3.3.x.patch, 1.1, NONE
Message-ID: <200604121443.k3CEhw8f012974@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-DBD-SQLite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12953

Modified Files:
	.cvsignore perl-DBD-SQLite.spec sources 
Removed Files:
	DBD-SQLite-1.11-build-with-system-sqlite-3.3.x.patch 
Log Message:
Update to 1.12.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-SQLite/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Dec 2005 20:59:23 -0000	1.4
+++ .cvsignore	12 Apr 2006 14:43:56 -0000	1.5
@@ -1 +1 @@
-DBD-SQLite-1.11.tar.gz
+DBD-SQLite-1.12.tar.gz


Index: perl-DBD-SQLite.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-SQLite/devel/perl-DBD-SQLite.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- perl-DBD-SQLite.spec	5 Apr 2006 16:53:21 -0000	1.9
+++ perl-DBD-SQLite.spec	12 Apr 2006 14:43:56 -0000	1.10
@@ -1,14 +1,13 @@
 Name:           perl-DBD-SQLite
-Version:        1.11
-Release:        4%{?dist}
+Version:        1.12
+Release:        1%{?dist}
 Summary:        Self Contained RDBMS in a DBI Driver
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/DBD-SQLite/
 Source0:        http://www.cpan.org/authors/id/M/MS/MSERGEANT/DBD-SQLite-%{version}.tar.gz
-Patch0:         DBD-SQLite-1.11-build-with-system-sqlite-3.3.x.patch
-Patch1:         DBD-SQLite-1.11-VIEW-type-information-segv.patch
+Patch0:         DBD-SQLite-1.11-type-information-segv.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl-DBI >= 1.03
@@ -33,7 +32,6 @@
 %prep
 %setup -q -n DBD-SQLite-%{version}
 %patch0 -p1
-%patch1 -p1
 
 
 %build
@@ -67,9 +65,12 @@
 
 
 %changelog
+* Tue Apr 11 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.12-1
+- Update to 1.12.
+
 * Wed Apr  5 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.11-4
 - Patch to build with system sqlite 3.3.x (#183530).
-- Patch to avoid VIEW type information segv (#187873).
+- Patch to avoid type information segv (#187873).
 
 * Thu Mar  9 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.11-3
 - DBD::SQLite fails to build with the current FC-5 sqlite version (3.3.3);


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-SQLite/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Dec 2005 20:59:23 -0000	1.4
+++ sources	12 Apr 2006 14:43:56 -0000	1.5
@@ -1 +1 @@
-7f22d8789245047343e114e655571022  DBD-SQLite-1.11.tar.gz
+40b1d208d70d5d8cab7723df96fc239c  DBD-SQLite-1.12.tar.gz


--- DBD-SQLite-1.11-build-with-system-sqlite-3.3.x.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Apr 12 14:55:21 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 12 Apr 2006 07:55:21 -0700
Subject: rpms/perl-DBD-SQLite/FC-5
	DBD-SQLite-1.11-type-information-segv.patch, 
	NONE, 1.1 .cvsignore, 1.4, 1.5 perl-DBD-SQLite.spec, 1.8,
	1.9 sources, 1.4, 1.5
Message-ID: <200604121455.k3CEtNH9013130@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-DBD-SQLite/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13106

Modified Files:
	.cvsignore perl-DBD-SQLite.spec sources 
Added Files:
	DBD-SQLite-1.11-type-information-segv.patch 
Log Message:
Update to 1.12.

DBD-SQLite-1.11-type-information-segv.patch:

--- NEW FILE DBD-SQLite-1.11-type-information-segv.patch ---
diff -ur DBD-SQLite-1.11.orig/dbdimp.c DBD-SQLite-1.11/dbdimp.c
--- DBD-SQLite-1.11.orig/dbdimp.c	2005-12-02 17:28:53.000000000 +0000
+++ DBD-SQLite-1.11/dbdimp.c	2006-02-06 12:10:31.000000000 +0000
@@ -677,11 +677,15 @@
         retsv = sv_2mortal(newRV(sv_2mortal((SV*)av)));
         for (n = 0; n < i; n++) {
             const char *fieldtype = sqlite3_column_decltype(imp_sth->stmt, n);
-            int type = sqlite3_column_type(imp_sth->stmt, n);
+            /* int type = sqlite3_column_type(imp_sth->stmt, n); */
             /* warn("got type: %d = %s\n", type, fieldtype); */
-            type = type_to_odbc_type(type);
+            /* type = type_to_odbc_type(type); */
             /* av_store(av, n, newSViv(type)); */
-            av_store(av, n, newSVpv(fieldtype, 0));
+	    if (fieldtype == NULL) {
+		av_store(av, n, newSVpv("INTEGER", 0));
+	    } else {
+                av_store(av, n, newSVpv(fieldtype, 0));
+	    }
         }
     }
     else if (strEQ(key, "NULLABLE")) {


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-SQLite/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Dec 2005 20:59:23 -0000	1.4
+++ .cvsignore	12 Apr 2006 14:55:21 -0000	1.5
@@ -1 +1 @@
-DBD-SQLite-1.11.tar.gz
+DBD-SQLite-1.12.tar.gz


Index: perl-DBD-SQLite.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-SQLite/FC-5/perl-DBD-SQLite.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-DBD-SQLite.spec	9 Mar 2006 19:59:28 -0000	1.8
+++ perl-DBD-SQLite.spec	12 Apr 2006 14:55:21 -0000	1.9
@@ -1,12 +1,13 @@
 Name:           perl-DBD-SQLite
-Version:        1.11
-Release:        3%{?dist}
+Version:        1.12
+Release:        1%{?dist}
 Summary:        Self Contained RDBMS in a DBI Driver
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/DBD-SQLite/
 Source0:        http://www.cpan.org/authors/id/M/MS/MSERGEANT/DBD-SQLite-%{version}.tar.gz
+Patch0:         DBD-SQLite-1.11-type-information-segv.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  perl-DBI >= 1.03
@@ -30,10 +31,11 @@
 
 %prep
 %setup -q -n DBD-SQLite-%{version}
+%patch0 -p1
 
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor USE_LOCAL_SQLITE=1
+CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor
 make %{?_smp_mflags} OPTIMIZE="$RPM_OPT_FLAGS"
 
 
@@ -63,6 +65,13 @@
 
 
 %changelog
+* Tue Apr 11 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.12-1
+- Update to 1.12.
+
+* Wed Apr  5 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.11-4
+- Patch to build with system sqlite 3.3.x (#183530).
+- Patch to avoid type information segv (#187873).
+
 * Thu Mar  9 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.11-3
 - DBD::SQLite fails to build with the current FC-5 sqlite version (3.3.3);
   see bugzilla entry #183530.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-SQLite/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Dec 2005 20:59:23 -0000	1.4
+++ sources	12 Apr 2006 14:55:21 -0000	1.5
@@ -1 +1 @@
-7f22d8789245047343e114e655571022  DBD-SQLite-1.11.tar.gz
+40b1d208d70d5d8cab7723df96fc239c  DBD-SQLite-1.12.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 12 15:30:04 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Wed, 12 Apr 2006 08:30:04 -0700
Subject: kadischi/post_install_scripts 04userconfig.py,1.1,1.2
Message-ID: <200604121530.k3CFU4uw015293@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi/post_install_scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15274/kadischi/post_install_scripts

Modified Files:
	04userconfig.py 
Log Message:
Check target rather than host for utils


Index: 04userconfig.py
===================================================================
RCS file: /cvs/devel/kadischi/post_install_scripts/04userconfig.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 04userconfig.py	10 Apr 2006 22:53:32 -0000	1.1
+++ 04userconfig.py	12 Apr 2006 15:30:02 -0000	1.2
@@ -17,8 +17,7 @@
 
 config_done = False
 
-if os.path.isfile("/usr/sbin/authconfig"):
-    run("chroot %s %s" % (sysdir, "/usr/sbin/authconfig --kickstart --nostart --enableshadow --enablemd5 --disablecache --disablenis --disableldap --disableldapauth --disableldaptls --disablekrb5 --disablehesiod --disablesmbauth"))
+run("chroot %s %s" % (sysdir, "/usr/sbin/authconfig --kickstart --nostart --enableshadow --enablemd5 --disablecache --disablenis --disableldap --disableldapauth --disableldaptls --disablekrb5 --disablehesiod --disablesmbauth"))
 
 while config_done == False:
     if anaconda_args != None:
@@ -28,13 +27,13 @@
                 config_done = True
                 sys.exit(0)
             else:
-                if os.path.isfile("/usr/sbin/lokkit") and os.path.isfile("/usr/sbin/ntsysv"):
+                if os.path.isfile(os.path.join(sysdir, "/usr/sbin/lokkit")) and os.path.isfile(os.path.join(sysdir, "/usr/sbin/ntsysv")):
                     flc_log("Taking you to interactive user configuration..")
                     run("chroot %s %s" % (sysdir, "/usr/sbin/lokkit"))
                     run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv"))
                     config_done = True   
     else:
-        if os.path.isfile("/usr/sbin/lokkit") and os.path.isfile("/usr/sbin/ntsysv"):
+        if os.path.isfile(os.path.join(sysdir, "/usr/sbin/lokkit")) and os.path.isfile(os.path.join(sysdir, "/usr/sbin/ntsysv")):
             flc_log("Taking you to interactive user configuration..")
             run("chroot %s %s" % (sysdir, "/usr/sbin/lokkit"))
             run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv"))



From fedora-extras-commits at redhat.com  Wed Apr 12 15:49:31 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Wed, 12 Apr 2006 08:49:31 -0700
Subject: rpms/seamonkey/FC-4 seamonkey-configure.patch, 1.1,
	1.2 seamonkey-mozconfig, 1.1, 1.2 seamonkey.spec, 1.2, 1.3
Message-ID: <200604121549.k3CFnXWN015357@cvs-int.fedora.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/seamonkey/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15333

Modified Files:
	seamonkey-configure.patch seamonkey-mozconfig seamonkey.spec 
Log Message:
* Wed Apr 12 2006 Kai Engert <kengert at redhat.com> 1.0-11.fc4.1
- Fix spec and patches to work with FC-4


seamonkey-configure.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 seamonkey-configure.patch
Index: seamonkey-configure.patch
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/FC-4/seamonkey-configure.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- seamonkey-configure.patch	10 Apr 2006 21:58:25 -0000	1.1
+++ seamonkey-configure.patch	12 Apr 2006 15:49:31 -0000	1.2
@@ -1,33 +1,6 @@
---- mozilla/configure.ac213	2006-02-10 09:14:59.000000000 +0100
-+++ mozilla/configure	2006-02-10 09:15:01.000000000 +0100
-@@ -941,7 +941,7 @@
- fi
- 
- echo $ac_n "checking host system type""... $ac_c" 1>&6
--echo "configure:938: checking host system type" >&5
-+echo "configure:945: checking host system type" >&5
- 
- host_alias=$host
- case "$host_alias" in
-@@ -962,7 +962,7 @@
- echo "$ac_t""$host" 1>&6
- 
- echo $ac_n "checking target system type""... $ac_c" 1>&6
--echo "configure:959: checking target system type" >&5
-+echo "configure:966: checking target system type" >&5
- 
- target_alias=$target
- case "$target_alias" in
-@@ -980,7 +980,7 @@
- echo "$ac_t""$target" 1>&6
- 
- echo $ac_n "checking build system type""... $ac_c" 1>&6
--echo "configure:977: checking build system type" >&5
-+echo "configure:984: checking build system type" >&5
- 
- build_alias=$build
- case "$build_alias" in
-@@ -1050,12 +1050,12 @@
+--- mozilla/configure.pre1	2006-04-12 13:11:17.000000000 +0200
++++ mozilla/configure	2006-04-12 13:11:22.000000000 +0200
+@@ -1042,7 +1042,7 @@
  LIBGNOME_VERSION=2.0
  
  MISSING_X=
@@ -36,280 +9,7 @@
  do
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1051: checking for $ac_word" >&5
-+echo "configure:1059: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1153,7 +1153,7 @@
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1149: checking for $ac_word" >&5
-+echo "configure:1157: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_NSINSTALL_BIN'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1226,13 +1226,13 @@
-     _SAVE_LDFLAGS="$LDFLAGS"
- 
-     echo $ac_n "checking for host c compiler""... $ac_c" 1>&6
--echo "configure:1222: checking for host c compiler" >&5
-+echo "configure:1230: checking for host c compiler" >&5
-     for ac_prog in $HOST_CC gcc cc /usr/ucb/cc cl icc
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1228: checking for $ac_word" >&5
-+echo "configure:1236: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_HOST_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1267,13 +1267,13 @@
-     fi
-     echo "$ac_t""$HOST_CC" 1>&6
-     echo $ac_n "checking for host c++ compiler""... $ac_c" 1>&6
--echo "configure:1263: checking for host c++ compiler" >&5
-+echo "configure:1271: checking for host c++ compiler" >&5
-     for ac_prog in $HOST_CXX $CCC c++ g++ gcc CC cxx cc++ cl icc
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1269: checking for $ac_word" >&5
-+echo "configure:1277: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_HOST_CXX'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1322,7 +1322,7 @@
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1318: checking for $ac_word" >&5
-+echo "configure:1326: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_HOST_RANLIB'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1357,7 +1357,7 @@
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1353: checking for $ac_word" >&5
-+echo "configure:1361: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_HOST_AR'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1392,16 +1392,16 @@
-     LDFLAGS="$HOST_LDFLAGS"
- 
-     echo $ac_n "checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:1388: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5
-+echo "configure:1396: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5
-     cat > conftest.$ac_ext <<EOF
--#line 1390 "configure"
-+#line 1398 "configure"
- #include "confdefs.h"
- 
- int main() {
- return(0);
- ; return 0; }
- EOF
--if { (eval echo configure:1397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1405: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_prog_hostcc_works=1 echo "$ac_t""yes" 1>&6
- else
-@@ -1416,16 +1416,16 @@
-     CFLAGS="$HOST_CXXFLAGS"
- 
-     echo $ac_n "checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:1412: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5
-+echo "configure:1420: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5
-     cat > conftest.$ac_ext <<EOF
--#line 1414 "configure"
-+#line 1422 "configure"
- #include "confdefs.h"
- 
- int main() {
- return(0);
- ; return 0; }
- EOF
--if { (eval echo configure:1421: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:1429: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   ac_cv_prog_hostcxx_works=1 echo "$ac_t""yes" 1>&6
- else
-@@ -1445,7 +1445,7 @@
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1441: checking for $ac_word" >&5
-+echo "configure:1449: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1479,7 +1479,7 @@
-     # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1475: checking for $ac_word" >&5
-+echo "configure:1483: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1509,7 +1509,7 @@
-   # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1505: checking for $ac_word" >&5
-+echo "configure:1513: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1560,7 +1560,7 @@
-       # Extract the first word of "cl", so it can be a program name with args.
- set dummy cl; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1556: checking for $ac_word" >&5
-+echo "configure:1564: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1592,7 +1592,7 @@
- fi
- 
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:1588: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+echo "configure:1596: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
- 
- ac_ext=c
- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -1603,12 +1603,12 @@
[...6212 lines suppressed...]
  for ac_func in _getb67 GETB67 getb67; do
    echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 -echo "configure:18116: checking for $ac_func" >&5
-+echo "configure:18430: checking for $ac_func" >&5
++echo "configure:18305: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 18121 "configure"
-+#line 18435 "configure"
++#line 18310 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -18265,7 +18454,7 @@
+@@ -18140,7 +18329,7 @@
  
  ; return 0; }
  EOF
 -if { (eval echo configure:18144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:18458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -18292,7 +18481,7 @@
+@@ -18167,7 +18356,7 @@
  fi
  
  echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
 -echo "configure:18171: checking stack direction for C alloca" >&5
-+echo "configure:18485: checking stack direction for C alloca" >&5
++echo "configure:18360: checking stack direction for C alloca" >&5
  if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -18300,7 +18489,7 @@
+@@ -18175,7 +18364,7 @@
    ac_cv_c_stack_direction=0
  else
    cat > conftest.$ac_ext <<EOF
 -#line 18179 "configure"
-+#line 18493 "configure"
++#line 18368 "configure"
  #include "confdefs.h"
  find_stack_direction ()
  {
-@@ -18319,7 +18508,7 @@
+@@ -18194,7 +18383,7 @@
    exit (find_stack_direction() < 0);
  }
  EOF
 -if { (eval echo configure:18198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:18512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:18387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_c_stack_direction=1
  else
-@@ -18368,17 +18557,17 @@
+@@ -18243,17 +18432,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
 -echo "configure:18247: checking for $ac_hdr" >&5
-+echo "configure:18561: checking for $ac_hdr" >&5
++echo "configure:18436: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
 -#line 18252 "configure"
-+#line 18566 "configure"
++#line 18441 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
 -{ (eval echo configure:18257: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:18571: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:18446: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -18458,7 +18647,7 @@
+@@ -18333,7 +18522,7 @@
      # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:18337: checking for $ac_word" >&5
-+echo "configure:18651: checking for $ac_word" >&5
++echo "configure:18526: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -18502,19 +18691,19 @@
+@@ -18377,19 +18566,19 @@
       PKG_CONFIG_MIN_VERSION=0.9.0
       if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
          echo $ac_n "checking for cairo >= $CAIRO_VERSION""... $ac_c" 1>&6
 -echo "configure:18381: checking for cairo >= $CAIRO_VERSION" >&5
-+echo "configure:18695: checking for cairo >= $CAIRO_VERSION" >&5
++echo "configure:18570: checking for cairo >= $CAIRO_VERSION" >&5
  
          if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION" ; then
              echo "$ac_t""yes" 1>&6
@@ -5615,31 +5297,31 @@
  
              echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6
 -echo "configure:18388: checking CAIRO_CFLAGS" >&5
-+echo "configure:18702: checking CAIRO_CFLAGS" >&5
++echo "configure:18577: checking CAIRO_CFLAGS" >&5
              CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION"`
              echo "$ac_t""$CAIRO_CFLAGS" 1>&6
  
              echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6
 -echo "configure:18393: checking CAIRO_LIBS" >&5
-+echo "configure:18707: checking CAIRO_LIBS" >&5
++echo "configure:18582: checking CAIRO_LIBS" >&5
              ## don't use --libs since that can do evil things like add
              ## -Wl,--export-dynamic
              CAIRO_LIBS="`$PKG_CONFIG --libs-only-L \"cairo >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo >= $CAIRO_VERSION\"`"
-@@ -18579,7 +18768,7 @@
+@@ -18454,7 +18643,7 @@
          # Extract the first word of "python", so it can be a program name with args.
  set dummy python; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 -echo "configure:18458: checking for $ac_word" >&5
-+echo "configure:18772: checking for $ac_word" >&5
++echo "configure:18647: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -18840,14 +19029,14 @@
+@@ -18715,14 +18904,14 @@
  cross_compiling=$ac_cv_prog_cc_cross
  
      cat > conftest.$ac_ext <<EOF
 -#line 18719 "configure"
-+#line 19033 "configure"
++#line 18908 "configure"
  #include "confdefs.h"
  #include <gmodule.h>
  int main() {
@@ -5647,40 +5329,29 @@
  ; return 0; }
  EOF
 -if { (eval echo configure:18726: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:19040: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:18915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    :
  else
    echo "configure: failed program was:" >&5
-@@ -19113,6 +19302,10 @@
- 
- 
- 
-+
-+
-+
-+
- cat >> confdefs.h <<EOF
- #define MOZ_DLL_SUFFIX "$DLL_SUFFIX"
- EOF
-@@ -19140,7 +19333,7 @@
+@@ -19015,7 +19204,7 @@
                  _SAVE_CFLAGS=$CFLAGS
      CFLAGS="$CFLAGS $XCFLAGS"
      cat > conftest.$ac_ext <<EOF
 -#line 19019 "configure"
-+#line 19337 "configure"
++#line 19208 "configure"
  #include "confdefs.h"
  
          #include <stdio.h>
-@@ -19156,7 +19349,7 @@
+@@ -19031,7 +19220,7 @@
      
  ; return 0; }
  EOF
 -if { (eval echo configure:19035: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:19353: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:19224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    :
  else
    echo "configure: failed program was:" >&5
-@@ -19373,15 +19566,34 @@
+@@ -19248,15 +19437,34 @@
  # Transform confdefs.h into DEFS.
  # Protect against shell expansion while executing Makefile rules.
  # Protect against Makefile macro expansion.
@@ -5724,7 +5395,7 @@
  
  MOZ_DEFINES=$DEFS
  
-@@ -19663,12 +19875,13 @@
+@@ -19535,12 +19743,13 @@
  s%@MOZ_ENABLE_FREETYPE2@%$MOZ_ENABLE_FREETYPE2%g
  s%@MOZ_XFT_CFLAGS@%$MOZ_XFT_CFLAGS%g
  s%@MOZ_XFT_LIBS@%$MOZ_XFT_LIBS%g


Index: seamonkey-mozconfig
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/FC-4/seamonkey-mozconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- seamonkey-mozconfig	10 Apr 2006 21:58:25 -0000	1.1
+++ seamonkey-mozconfig	12 Apr 2006 15:49:31 -0000	1.2
@@ -1,5 +1,3 @@
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-zlib
 ac_add_options --with-system-png


Index: seamonkey.spec
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/FC-4/seamonkey.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- seamonkey.spec	11 Apr 2006 14:57:49 -0000	1.2
+++ seamonkey.spec	12 Apr 2006 15:49:31 -0000	1.3
@@ -1,6 +1,4 @@
 %define desktop_file_utils_version 0.9
-%define nspr_version 4.6
-%define nss_version 3.11
 %define pango_version 1.6.0
 
 %define _unpackaged_files_terminate_build 0
@@ -10,7 +8,7 @@
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
 Version:        1.0
-Release:        11%{?dist}
+Release:        11.fc4.1
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPL
 Group:          Applications/Internet
@@ -23,15 +21,11 @@
 Source10:       seamonkey-mozconfig
 Source12:       seamonkey-mail.desktop
 Source13:       seamonkey-mail-icon.png
-Source17:       mozilla-psm-exclude-list
-Source18:       mozilla-xpcom-exclude-list
 Source19:       seamonkey-fedora-default-bookmarks.html
 Source20:       seamonkey-fedora-default-prefs.js
 Source100:      find-external-requires
 
 Patch1:         firefox-1.0-prdtoa.patch
-Patch3:         firefox-1.1-nss-system-nspr.patch
-Patch4:         firefox-1.5-with-system-nss.patch
 Patch5:         seamonkey-disable-visibility.patch
 Patch6:         firefox-1.5.0.1-dumpstack.patch
 Patch21:        firefox-0.7.3-default-plugin-less-annoying.patch
@@ -42,7 +36,6 @@
 Patch101:       thunderbird-0.7.3-gnome-uriloader.patch
 Patch102:       thunderbird-1.5-bug304720.patch
 Patch220:       seamonkey-fedora-home-page.patch
-Patch225:       mozilla-nspr-packages.patch
 Patch227:       mozilla-1.4.1-ppc64.patch
 Patch301:       mozilla-1.7.3-gnome-vfs-default-app.patch
 Patch304:       mozilla-1.7.5-g-application-name.patch
@@ -57,10 +50,8 @@
 BuildRequires:  libIDL-devel
 BuildRequires:  glib2-devel
 BuildRequires:  gtk2-devel
-BuildRequires:  libXt-devel
+BuildRequires:  xorg-x11-devel
 BuildRequires:  pango-devel >= %{pango_version}
-BuildRequires:  nspr-devel >= %{nspr_version}
-BuildRequires:  nss-devel >= %{nss_version}
 BuildRequires:  fileutils
 BuildRequires:  desktop-file-utils >= %{desktop_file_utils_version}
 PreReq:         desktop-file-utils >= %{desktop_file_utils_version}
@@ -81,8 +72,6 @@
 
 %setup -q -n mozilla
 %patch1  -p0
-%patch3  -p1
-%patch4  -p1
 
 # Pragma visibility is broken on most platforms for some reason.
 # It works on i386 so leave it alone there.  Disable elsewhere.
@@ -100,7 +89,6 @@
 %patch101 -p1 -b .gnome-uriloader
 %patch102 -p1
 %patch220 -p1
-%patch225 -p1
 %patch227 -p1
 %patch301 -p1
 %patch304 -p0
@@ -175,8 +163,7 @@
 %{SOURCE7} --package xpcom --output-file %{builddir}/seamonkey.list \
     --package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
     --install-dir $RPM_BUILD_ROOT/%{mozdir} \
-    --install-root %{mozdir} \
-    --exclude-file=%{SOURCE18}
+    --install-root %{mozdir}
 
 %{SOURCE7} --package browser --output-file %{builddir}/seamonkey.list \
     --package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
@@ -191,8 +178,7 @@
 %{SOURCE7} --package psm --output-file %{builddir}/seamonkey.list \
     --package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
     --install-dir $RPM_BUILD_ROOT/%{mozdir} \
-    --install-root %{mozdir} \
-    --exclude-file=%{SOURCE17}
+    --install-root %{mozdir}
 
 %{SOURCE7} --package mail --output-file %{builddir}/seamonkey.list \
     --package-file $RPM_BUILD_DIR/mozilla/xpinstall/packager/packages-unix \
@@ -408,6 +394,8 @@
 
 
 %changelog
+* Wed Apr 12 2006 Kai Engert <kengert at redhat.com> 1.0-11.fc4.1
+- Fix spec and patches to work with FC-4
 * Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-11
 - Fix PreReq statements
 * Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-10



From fedora-extras-commits at redhat.com  Wed Apr 12 17:42:16 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 12 Apr 2006 10:42:16 -0700
Subject: rpms/cernlib/devel patchy-unpack-rceta, NONE, 1.1 cernlib.spec, 1.23,
	1.24 sources, 1.4, 1.5
Message-ID: <200604121742.k3CHgI0o019994@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19974

Modified Files:
	cernlib.spec sources 
Added Files:
	patchy-unpack-rceta 
Log Message:
* Wed Apr 12 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-16
- unpack patchy offline because the files are within an unformatted
  fortran file which won't be right on all the arches.



--- NEW FILE patchy-unpack-rceta ---
#! /bin/bash

set -e
cd .

file=patchy
script=rceta.sh
archive=$file.tar.gz
echo "Unpacking from $archive"
tar xzf $archive
echo "patching script"
sed -i -e 's/fort77/f77/' -e 's:^ rceta : ./rceta :' $file/$script
pushd $file
./$script
popd
echo "Repacking $archive"
tar czf $archive $file

exit 0



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- cernlib.spec	12 Apr 2006 06:53:13 -0000	1.23
+++ cernlib.spec	12 Apr 2006 17:42:16 -0000	1.24
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       15%{?dist}.1
+Release:       16%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -32,12 +32,12 @@
 # build the cernlib
 BuildRequires: /usr/bin/g77
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if "%fedora" > "3"
+#%if "%fedora" > "3"
 # f771 segfaults on x86_64
 #ExcludeArch:   x86_64
-%endif
+#%endif
 # rceta segfaults on ppc
-ExcludeArch:   ppc
+#ExcludeArch:   ppc
 
 # these sources are different from the upstream sources as files with 
 # GPL incompatible licences are removed. You can use cernlib-remove-deadpool
@@ -61,7 +61,15 @@
 Source9: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_patchy.tar.gz
 Source14: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_cfortran.tar.gz
 Source16: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/lib/xsneut95.dat
-# patchy 4 source files, provided by Mattias Ellert
+# The patchy version 4 sources
+Source300: patchy.tar.gz
+# this is modified with regard with what Mattias gave me. Indeed the file
+# containing some other files (p4inceta) was in fortran unformatted format, 
+# I believe it is what caused a segfault of rceta on the ppc platform.
+# I have recreated the patchy.tar.gz from Mattias tarball by running
+# sh patchy-unpack-rceta
+Source203: patchy-unpack-rceta 
+
 Source17: patchy.tar.gz
 
 # Shell scripts that go in /etc/profile.d
@@ -339,13 +347,16 @@
 %setup -T -D -a 17
 
 # patch patchy 4 installer fortran generator script
+# avtually it is unusefull, because the unpacking has been done
+# offline, see comment above.
 %patch -P 1500
 %patch -P 1501
 
-# unpack the patchy version 4 sources
-pushd patchy
-        ./rceta.sh
-popd
+# unpack the patchy version 4 sources is done offline,
+# see comment above
+#pushd patchy
+#        ./rceta.sh
+#popd
 
 %patch -P 1502
 %patch -P 1503
@@ -816,6 +827,10 @@
 
 
 %changelog
+* Wed Apr 12 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-16
+- unpack patchy offline because the files are within an unformatted
+  fortran file which won't be right on all the arches.
+
 * Tue Apr 11 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-15.1
 - add conditionals in spec to have only one for all fedora versions.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Apr 2006 22:53:00 -0000	1.4
+++ sources	12 Apr 2006 17:42:16 -0000	1.5
@@ -13,4 +13,4 @@
 67228b011eac13b44499c50219e21545  src_graflib.tar.gz
 4fdcdc9f819ebbb9c6d3a04f339cdcf8  src_packlib.tar.gz
 eecb52159458ead0ee6b0d00b90aab66  xsneut95.dat
-14e6f0dbc205ec4f106093ee27578273  patchy.tar.gz
+b1f550eedc545a02f0ab58eb7d550480  patchy.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 12 17:44:10 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 12 Apr 2006 10:44:10 -0700
Subject: rpms/openvpn/devel .cvsignore, 1.10, 1.11 openvpn.spec, 1.16,
	1.17 sources, 1.10, 1.11
Message-ID: <200604121744.k3CHiCXk020074@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/openvpn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20053

Modified Files:
	.cvsignore openvpn.spec sources 
Log Message:
Update to 2.1_beta13.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openvpn/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	5 Apr 2006 20:22:55 -0000	1.10
+++ .cvsignore	12 Apr 2006 17:44:10 -0000	1.11
@@ -1,2 +1,2 @@
-openvpn-2.1_beta12.tar.gz
-openvpn-2.1_beta12.tar.gz.asc
+openvpn-2.1_beta13.tar.gz
+openvpn-2.1_beta13.tar.gz.asc


Index: openvpn.spec
===================================================================
RCS file: /cvs/extras/rpms/openvpn/devel/openvpn.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- openvpn.spec	5 Apr 2006 20:22:55 -0000	1.16
+++ openvpn.spec	12 Apr 2006 17:44:10 -0000	1.17
@@ -1,10 +1,10 @@
-%define prerelease beta12
+%define prerelease beta13
 
 %define plugins down-root auth-pam
 
 Name:              openvpn
 Version:           2.1
-Release:           0.8%{?prerelease:.%{prerelease}}%{?dist}
+Release:           0.9%{?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
@@ -132,6 +132,9 @@
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Wed Apr 12 2006 Steven Pritchard <steve at kspei.com> 2.1-0.9.beta13
+- Update to 2.1_beta13
+
 * Wed Apr 05 2006 Steven Pritchard <steve at kspei.com> 2.1-0.8.beta12
 - Update to 2.1_beta12 (BZ#188050/CVE-2006-1629)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openvpn/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	5 Apr 2006 20:22:55 -0000	1.10
+++ sources	12 Apr 2006 17:44:10 -0000	1.11
@@ -1,2 +1,2 @@
-16c92fd8bdc13d29e99006589ab87dc8  openvpn-2.1_beta12.tar.gz
-6568f5e32367cc9c88a0eae78bfb2e1f  openvpn-2.1_beta12.tar.gz.asc
+94281c836f443aa10ef56eafb9346e98  openvpn-2.1_beta13.tar.gz
+e5bc47f1e441b2d89db90052ad0f8b12  openvpn-2.1_beta13.tar.gz.asc



From fedora-extras-commits at redhat.com  Wed Apr 12 17:44:33 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 12 Apr 2006 10:44:33 -0700
Subject: rpms/openvpn/FC-4 .cvsignore, 1.7, 1.8 openvpn.spec, 1.12,
	1.13 sources, 1.7, 1.8
Message-ID: <200604121744.k3CHiZNe020139@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/openvpn/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20118

Modified Files:
	.cvsignore openvpn.spec sources 
Log Message:
Update to 2.0.7.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openvpn/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	5 Apr 2006 23:08:10 -0000	1.7
+++ .cvsignore	12 Apr 2006 17:44:33 -0000	1.8
@@ -1,2 +1,2 @@
-openvpn-2.0.6.tar.gz
-openvpn-2.0.6.tar.gz.asc
+openvpn-2.0.7.tar.gz
+openvpn-2.0.7.tar.gz.asc


Index: openvpn.spec
===================================================================
RCS file: /cvs/extras/rpms/openvpn/FC-4/openvpn.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- openvpn.spec	5 Apr 2006 23:08:10 -0000	1.12
+++ openvpn.spec	12 Apr 2006 17:44:33 -0000	1.13
@@ -1,7 +1,7 @@
 %define plugins down-root auth-pam
 
 Name:              openvpn
-Version:           2.0.6
+Version:           2.0.7
 Release:           1%{?dist}
 Summary:           A full-featured SSL VPN solution
 URL:               http://openvpn.net/
@@ -129,6 +129,9 @@
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Wed Apr 12 2006 Steven Pritchard <steve at kspei.com> 2.0.7-1
+- Update to 2.0.7
+
 * Wed Apr 05 2006 Steven Pritchard <steve at kspei.com> 2.0.6-1
 - Update to 2.0.6 (BZ#188050/CVE-2006-1629)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openvpn/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	5 Apr 2006 23:08:10 -0000	1.7
+++ sources	12 Apr 2006 17:44:33 -0000	1.8
@@ -1,2 +1,2 @@
-8d2f95fa825e58363a676b25d4815aa7  openvpn-2.0.6.tar.gz
-1265ff8d96d50f3d3233d37658e3e516  openvpn-2.0.6.tar.gz.asc
+93528233f1f6d02fc18e2c00f82e0aca  openvpn-2.0.7.tar.gz
+f1715e85764289b5fa5f784857dcbc31  openvpn-2.0.7.tar.gz.asc



From fedora-extras-commits at redhat.com  Wed Apr 12 17:51:44 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Wed, 12 Apr 2006 10:51:44 -0700
Subject: kadischi/post_install_scripts 04userconfig.py,1.2,1.3
Message-ID: <200604121751.k3CHpiLl020220@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi/post_install_scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20203/kadischi/post_install_scripts

Modified Files:
	04userconfig.py 
Log Message:
Relly check target this time, not the host for utils


Index: 04userconfig.py
===================================================================
RCS file: /cvs/devel/kadischi/post_install_scripts/04userconfig.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 04userconfig.py	12 Apr 2006 15:30:02 -0000	1.2
+++ 04userconfig.py	12 Apr 2006 17:51:42 -0000	1.3
@@ -27,13 +27,13 @@
                 config_done = True
                 sys.exit(0)
             else:
-                if os.path.isfile(os.path.join(sysdir, "/usr/sbin/lokkit")) and os.path.isfile(os.path.join(sysdir, "/usr/sbin/ntsysv")):
+                if os.path.isfile(os.path.join(sysdir, "usr/sbin/lokkit")) and os.path.isfile(os.path.join(sysdir, "usr/sbin/ntsysv")):
                     flc_log("Taking you to interactive user configuration..")
                     run("chroot %s %s" % (sysdir, "/usr/sbin/lokkit"))
                     run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv"))
                     config_done = True   
     else:
-        if os.path.isfile(os.path.join(sysdir, "/usr/sbin/lokkit")) and os.path.isfile(os.path.join(sysdir, "/usr/sbin/ntsysv")):
+        if os.path.isfile(os.path.join(sysdir, "usr/sbin/lokkit")) and os.path.isfile(os.path.join(sysdir, "usr/sbin/ntsysv")):
             flc_log("Taking you to interactive user configuration..")
             run("chroot %s %s" % (sysdir, "/usr/sbin/lokkit"))
             run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv"))



From fedora-extras-commits at redhat.com  Wed Apr 12 18:09:24 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 12 Apr 2006 11:09:24 -0700
Subject: rpms/openvpn/FC-5 .cvsignore, 1.10, 1.11 openvpn.spec, 1.16,
	1.17 sources, 1.10, 1.11
Message-ID: <200604121809.k3CI9QuH022329@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/openvpn/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22308

Modified Files:
	.cvsignore openvpn.spec sources 
Log Message:
Update to 2.1_beta13.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openvpn/FC-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	5 Apr 2006 20:30:05 -0000	1.10
+++ .cvsignore	12 Apr 2006 18:09:23 -0000	1.11
@@ -1,2 +1,2 @@
-openvpn-2.1_beta12.tar.gz
-openvpn-2.1_beta12.tar.gz.asc
+openvpn-2.1_beta13.tar.gz
+openvpn-2.1_beta13.tar.gz.asc


Index: openvpn.spec
===================================================================
RCS file: /cvs/extras/rpms/openvpn/FC-5/openvpn.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- openvpn.spec	5 Apr 2006 20:30:05 -0000	1.16
+++ openvpn.spec	12 Apr 2006 18:09:23 -0000	1.17
@@ -1,10 +1,10 @@
-%define prerelease beta12
+%define prerelease beta13
 
 %define plugins down-root auth-pam
 
 Name:              openvpn
 Version:           2.1
-Release:           0.8%{?prerelease:.%{prerelease}}%{?dist}
+Release:           0.9%{?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
@@ -132,6 +132,9 @@
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Wed Apr 12 2006 Steven Pritchard <steve at kspei.com> 2.1-0.9.beta13
+- Update to 2.1_beta13
+
 * Wed Apr 05 2006 Steven Pritchard <steve at kspei.com> 2.1-0.8.beta12
 - Update to 2.1_beta12 (BZ#188050/CVE-2006-1629)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openvpn/FC-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	5 Apr 2006 20:30:05 -0000	1.10
+++ sources	12 Apr 2006 18:09:23 -0000	1.11
@@ -1,2 +1,2 @@
-16c92fd8bdc13d29e99006589ab87dc8  openvpn-2.1_beta12.tar.gz
-6568f5e32367cc9c88a0eae78bfb2e1f  openvpn-2.1_beta12.tar.gz.asc
+94281c836f443aa10ef56eafb9346e98  openvpn-2.1_beta13.tar.gz
+e5bc47f1e441b2d89db90052ad0f8b12  openvpn-2.1_beta13.tar.gz.asc



From fedora-extras-commits at redhat.com  Wed Apr 12 18:17:15 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 12 Apr 2006 11:17:15 -0700
Subject: rpms/openvpn/FC-3 .cvsignore, 1.7, 1.8 openvpn.spec, 1.11,
	1.12 sources, 1.7, 1.8
Message-ID: <200604121817.k3CIHHAX022419@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/openvpn/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22398

Modified Files:
	.cvsignore openvpn.spec sources 
Log Message:
Update to 2.0.7.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openvpn/FC-3/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	5 Apr 2006 23:36:50 -0000	1.7
+++ .cvsignore	12 Apr 2006 18:17:15 -0000	1.8
@@ -1,2 +1,2 @@
-openvpn-2.0.6.tar.gz
-openvpn-2.0.6.tar.gz.asc
+openvpn-2.0.7.tar.gz
+openvpn-2.0.7.tar.gz.asc


Index: openvpn.spec
===================================================================
RCS file: /cvs/extras/rpms/openvpn/FC-3/openvpn.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- openvpn.spec	5 Apr 2006 23:36:50 -0000	1.11
+++ openvpn.spec	12 Apr 2006 18:17:15 -0000	1.12
@@ -1,7 +1,7 @@
 %define plugins down-root auth-pam
 
 Name:              openvpn
-Version:           2.0.6
+Version:           2.0.7
 Release:           1%{?dist}
 Summary:           A full-featured SSL VPN solution
 URL:               http://openvpn.net/
@@ -129,6 +129,9 @@
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Wed Apr 12 2006 Steven Pritchard <steve at kspei.com> 2.0.7-1
+- Update to 2.0.7
+
 * Wed Apr 05 2006 Steven Pritchard <steve at kspei.com> 2.0.6-1
 - Update to 2.0.6 (BZ#188050/CVE-2006-1629)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openvpn/FC-3/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	5 Apr 2006 23:36:50 -0000	1.7
+++ sources	12 Apr 2006 18:17:15 -0000	1.8
@@ -1,2 +1,2 @@
-8d2f95fa825e58363a676b25d4815aa7  openvpn-2.0.6.tar.gz
-1265ff8d96d50f3d3233d37658e3e516  openvpn-2.0.6.tar.gz.asc
+93528233f1f6d02fc18e2c00f82e0aca  openvpn-2.0.7.tar.gz
+f1715e85764289b5fa5f784857dcbc31  openvpn-2.0.7.tar.gz.asc



From fedora-extras-commits at redhat.com  Wed Apr 12 19:12:29 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Wed, 12 Apr 2006 12:12:29 -0700
Subject: rpms/link-grammar/devel .cvsignore, 1.4, 1.5 link-grammar.spec, 1.4,
	1.5 sources, 1.4, 1.5
Message-ID: <200604121912.k3CJCVS0024628@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/link-grammar/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24607

Modified Files:
	.cvsignore link-grammar.spec sources 
Log Message:
New upstream version




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	10 Apr 2006 17:46:26 -0000	1.4
+++ .cvsignore	12 Apr 2006 19:12:29 -0000	1.5
@@ -1 +1 @@
-link-grammar-4.2.1.tar.gz
+link-grammar-4.2.2.tar.gz


Index: link-grammar.spec
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/devel/link-grammar.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- link-grammar.spec	10 Apr 2006 17:46:26 -0000	1.4
+++ link-grammar.spec	12 Apr 2006 19:12:29 -0000	1.5
@@ -1,7 +1,7 @@
 Summary: A Grammar Checking library
 Name: link-grammar
-Version: 4.2.1
-Release: 2%{?dist}
+Version: 4.2.2
+Release: 1%{?dist}
 Group: System Environment/Libraries
 License: BSD-style 
 Source: http://www.abisource.com/downloads/link-grammar/%{version}/link-grammar-%{version}.tar.gz
@@ -55,6 +55,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Wed Apr 12 2006 Marc Maurer <uwog at abisource.com> 4.2.2-1
+- New upstream version
+
 * Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 4.2.1-2
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	10 Apr 2006 17:46:26 -0000	1.4
+++ sources	12 Apr 2006 19:12:29 -0000	1.5
@@ -1 +1 @@
-c4de497b11a2eeaa93ac19f08c710f23  link-grammar-4.2.1.tar.gz
+798c165b7d7f26e60925c30515c45782  link-grammar-4.2.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 12 19:13:51 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Wed, 12 Apr 2006 12:13:51 -0700
Subject: rpms/link-grammar/FC-5 .cvsignore, 1.3, 1.4 link-grammar.spec, 1.3, 
	1.4 sources, 1.3, 1.4
Message-ID: <200604121913.k3CJDrFv024698@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/link-grammar/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24677

Modified Files:
	.cvsignore link-grammar.spec sources 
Log Message:
New upstream version




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Apr 2006 17:48:19 -0000	1.3
+++ .cvsignore	12 Apr 2006 19:13:51 -0000	1.4
@@ -1 +1 @@
-link-grammar-4.2.1.tar.gz
+link-grammar-4.2.2.tar.gz


Index: link-grammar.spec
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/FC-5/link-grammar.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- link-grammar.spec	10 Apr 2006 17:48:19 -0000	1.3
+++ link-grammar.spec	12 Apr 2006 19:13:51 -0000	1.4
@@ -1,6 +1,6 @@
 Summary: A Grammar Checking library
 Name: link-grammar
-Version: 4.2.1
+Version: 4.2.2
 Release: 1%{?dist}
 Group: System Environment/Libraries
 License: BSD-style 
@@ -55,6 +55,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Wed Apr 12 2006 Marc Maurer <uwog at abisource.com> 4.2.2-1.fc5
+- New upstream version
+
 * Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 4.2.1-1
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Apr 2006 17:48:19 -0000	1.3
+++ sources	12 Apr 2006 19:13:51 -0000	1.4
@@ -1 +1 @@
-c4de497b11a2eeaa93ac19f08c710f23  link-grammar-4.2.1.tar.gz
+798c165b7d7f26e60925c30515c45782  link-grammar-4.2.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 12 19:16:24 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Wed, 12 Apr 2006 12:16:24 -0700
Subject: rpms/link-grammar/FC-4 .cvsignore, 1.3, 1.4 link-grammar.spec, 1.6, 
	1.7 sources, 1.3, 1.4
Message-ID: <200604121916.k3CJGQxn024774@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/link-grammar/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24753

Modified Files:
	.cvsignore link-grammar.spec sources 
Log Message:
New upstream version




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Apr 2006 17:50:26 -0000	1.3
+++ .cvsignore	12 Apr 2006 19:16:24 -0000	1.4
@@ -1 +1 @@
-link-grammar-4.2.1.tar.gz
+link-grammar-4.2.2.tar.gz


Index: link-grammar.spec
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/FC-4/link-grammar.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- link-grammar.spec	10 Apr 2006 17:50:26 -0000	1.6
+++ link-grammar.spec	12 Apr 2006 19:16:24 -0000	1.7
@@ -1,6 +1,6 @@
 Summary: A Grammar Checking library
 Name: link-grammar
-Version: 4.2.1
+Version: 4.2.2
 Release: 1%{?dist}
 Group: System Environment/Libraries
 License: BSD-style 
@@ -55,6 +55,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Wed Apr 12 2006 Marc Maurer <uwog at abisource.com> 4.2.2-1.fc4
+- New upstream version
+
 * Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 4.2.1-1.fc4
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Apr 2006 17:50:26 -0000	1.3
+++ sources	12 Apr 2006 19:16:24 -0000	1.4
@@ -1 +1 @@
-c4de497b11a2eeaa93ac19f08c710f23  link-grammar-4.2.1.tar.gz
+798c165b7d7f26e60925c30515c45782  link-grammar-4.2.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 12 19:16:45 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Wed, 12 Apr 2006 12:16:45 -0700
Subject: rpms/awstats/devel awstats.README.SELinux, NONE, 1.1 awstats.spec, 
	1.11, 1.12
Message-ID: <200604121916.k3CJGlou024834@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/awstats/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24814

Modified Files:
	awstats.spec 
Added Files:
	awstats.README.SELinux 
Log Message:
add selinux support


--- NEW FILE awstats.README.SELinux ---
==========================
SELinux support in AWStats
==========================


What is the problem ?
---------------------

AWStats is a CGI script, and needs to be labelled correctly to be called
from Apache.
The files in ``/usr/share/awstats/wwwroot/cgi-bin`` need to have the 
``httpd_sys_script_exec_t`` type, and the databases files in 
``/var/lib/awstats`` need to have the ``httpd_sys_script_rw_t`` type.


How do we solve it ?
--------------------

You can change the type with the ``chcon`` command::

    chcon -R -t httpd_sys_script_exec_t /usr/share/awstats/wwwroot/cgi-bin
    chcon -R -t httpd_sys_script_rw_t /var/lib/awstats

But these modifications will be lost if the system is relabeled (you can
request a relabel with the system-config-security tool).

To make these changes permanent, this package sets the contexts by running
the following commands::

    semanage fcontext -a -t httpd_sys_script_exec_t \
        '/usr/share/awstats/wwwroot/cgi-bin(/.*)?'
    semanage fcontext -a -t httpd_sys_script_rw_t '/var/lib/awstats(/.*)?'


Please send your bug reports (if any ;) ) to https://bugzilla.redhat.com


Index: awstats.spec
===================================================================
RCS file: /cvs/extras/rpms/awstats/devel/awstats.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- awstats.spec	9 Apr 2006 15:30:31 -0000	1.11
+++ awstats.spec	12 Apr 2006 19:16:45 -0000	1.12
@@ -7,13 +7,13 @@
 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
+Source1:    awstats.README.SELinux
 BuildArch:  noarch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:   httpd
 Requires:   perl
-Requires(post): perl
-Requires(postun): /sbin/service
-Requires(pre):  policycoreutils
+Requires(post): perl, policycoreutils
+Requires(postun): /sbin/service, policycoreutils
 
 %description
 Advanced Web Statistics is a powerful and featureful tool that generates
@@ -31,18 +31,19 @@
 With the default configuration, the statistics are available:
 http://localhost/awstats/awstats.pl
 
+
 %prep
 %setup -q
-
 # 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
+# SELinux README
+cp -a %{SOURCE1} README.SELinux
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -80,7 +81,7 @@
 ### Commit permanent changes to default configuration
 install -p -m 644 wwwroot/cgi-bin/awstats.model.conf \
     $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.model.conf
-%{__perl} -pi -e '
+perl -pi -e '
                 s|^LogFile=.*$|LogFile="%{_localstatedir}/log/httpd/access_log"|;
                 s|^DirData=.*$|DirData="%{_localstatedir}/lib/awstats"|;
                 s|^DirCgi=.*$|DirCgi="/awstats"|;
@@ -91,16 +92,17 @@
                 s|^SaveDatabaseFilesWithPermissionsForEveryone=.*$|SaveDatabaseFilesWithPermissionsForEveryone=0|;
                 s|^SkipHosts=.*$|SkipHosts="127.0.0.1"|;
                 s|^Expires=.*$|Expires=3600|;
-        ' $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.model.conf
+            ' $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.model.conf
 install -p -m 644 $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/%{name}.{model,localhost.localdomain}.conf 
 
 # Fix scripts
-%{__perl} -pi -e 's|/usr/local/awstats|%{_datadir}/awstats|g' \
+perl -pi -e 's|/usr/local/awstats|%{_datadir}/awstats|g' \
              $RPM_BUILD_ROOT%{_datadir}/%{name}/tools/{*.pl,httpd_conf}
 
 # Apache configuration
 install -p -m 644 tools/httpd_conf $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/%{name}.conf
-%{__perl} -pi -e 's|/usr/local|%{_datadir}|g' $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/%{name}.conf
+perl -pi -e 's|/usr/local|%{_datadir}|g;s|Allow from all|Allow from 127.0.0.1|g' \
+             $RPM_BUILD_ROOT/%{_sysconfdir}/httpd/conf.d/%{name}.conf
 echo "# Additional Perl modules
 <IfModule mod_env.c>
     SetEnv PERL5LIB %{_datadir}/awstats/lib:%{_datadir}/awstats/plugins
@@ -114,13 +116,6 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%pre
-# Set SELinux types
-semanage fcontext -a -t httpd_sys_script_exec_t \
-    '/usr/share/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || :
-semanage fcontext -a -t httpd_sys_script_rw_t '/var/lib/awstats(/.*)?' 2>/dev/null || :
-
-
 %post
 if [ $1 -eq 1 ]; then
   if [ ! -f %{_sysconfdir}/%{name}/%{name}.`hostname`.conf ]; then
@@ -130,18 +125,28 @@
                       ' > %{_sysconfdir}/%{name}/%{name}.`hostname`.conf || :
   fi
 fi
+### SELinux support ###
+# Set SELinux file_context
+semanage fcontext -a -t httpd_sys_script_exec_t \
+    '%{_datadir}/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || :
+semanage fcontext -a -t httpd_sys_script_rw_t '%{_localstatedir}/lib/awstats(/.*)?' 2>/dev/null || :
+# Actually change the context
+chcon -R -t httpd_sys_script_exec_t %{_datadir}/awstats/wwwroot/cgi-bin
+chcon -R -t httpd_sys_script_rw_t %{_localstatedir}/lib/awstats
 
 
 %postun
 if [ $1 -ne 0 ]; then
   /sbin/service httpd condrestart >/dev/null 2>&1
 fi
+# SELinux support
 if [ $1 -eq 0 ]; then
   semanage fcontext -d -t httpd_sys_script_exec_t \
     '/usr/share/awstats/wwwroot/cgi-bin(/.*)?' 2>/dev/null || :
 fi
 
 
+
 %files
 %defattr(-,root,root,755)
 # Apache configuration file
@@ -155,7 +160,7 @@
 %{_datadir}/%{name}/wwwroot/cgi-bin
 # Different defattr to fix lots of files which should not be +x.
 %defattr(644,root,root,755)
-%doc README.TXT docs/*
+%doc README.TXT docs/* README.SELinux
 %{_datadir}/%{name}/lang
 %{_datadir}/%{name}/lib
 %{_datadir}/%{name}/plugins
@@ -164,9 +169,12 @@
 %{_datadir}/%{name}/wwwroot/icon
 %{_datadir}/%{name}/wwwroot/js
 
+
+
 %changelog
 * 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
+- Only allow access from localhost by default (this app has a security history)
 
 * Thu Feb 23 2006 Aurelien Bompard <gauret[AT]free.fr> 6.5-2
 - rebuild for FC5



From fedora-extras-commits at redhat.com  Wed Apr 12 19:17:24 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Wed, 12 Apr 2006 12:17:24 -0700
Subject: rpms/link-grammar/FC-3 .cvsignore, 1.3, 1.4 link-grammar.spec, 1.3, 
	1.4 sources, 1.3, 1.4
Message-ID: <200604121917.k3CJHQlT024869@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/link-grammar/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24848

Modified Files:
	.cvsignore link-grammar.spec sources 
Log Message:
New upstream version




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Apr 2006 17:58:09 -0000	1.3
+++ .cvsignore	12 Apr 2006 19:17:24 -0000	1.4
@@ -1 +1 @@
-link-grammar-4.2.1.tar.gz
+link-grammar-4.2.2.tar.gz


Index: link-grammar.spec
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/FC-3/link-grammar.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- link-grammar.spec	10 Apr 2006 17:58:09 -0000	1.3
+++ link-grammar.spec	12 Apr 2006 19:17:24 -0000	1.4
@@ -1,6 +1,6 @@
 Summary: A Grammar Checking library
 Name: link-grammar
-Version: 4.2.1
+Version: 4.2.2
 Release: 1%{?dist}
 Group: System Environment/Libraries
 License: BSD-style 
@@ -55,6 +55,9 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Wed Apr 12 2006 Marc Maurer <uwog at abisource.com> 4.2.2-1.fc3
+- New upstream version
+
 * Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> 4.2.1-1.fc3
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/link-grammar/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Apr 2006 17:58:09 -0000	1.3
+++ sources	12 Apr 2006 19:17:24 -0000	1.4
@@ -1 +1 @@
-c4de497b11a2eeaa93ac19f08c710f23  link-grammar-4.2.1.tar.gz
+798c165b7d7f26e60925c30515c45782  link-grammar-4.2.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 12 19:26:47 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 12 Apr 2006 12:26:47 -0700
Subject: rpms/xosd/FC-5 xosd-defaults.patch,1.1,1.2 xosd.spec,1.11,1.12
Message-ID: <200604121926.k3CJQnpi025013@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xosd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24976/FC-5

Modified Files:
	xosd-defaults.patch xosd.spec 
Log Message:
* Wed Apr 12 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.2.14-6
- Revert to upstream default font, require xorg-x11-fonts-base (#183971).


xosd-defaults.patch:

Index: xosd-defaults.patch
===================================================================
RCS file: /cvs/extras/rpms/xosd/FC-5/xosd-defaults.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xosd-defaults.patch	17 Mar 2005 21:57:09 -0000	1.1
+++ xosd-defaults.patch	12 Apr 2006 19:26:47 -0000	1.2
@@ -12,18 +12,6 @@
    shadow_offset = 1;
    outline_offset = 0;
    pos = XOSD_bottom;
-diff -Naru xosd-2.2.14.orig/src/libxosd/xosd.c xosd-2.2.14/src/libxosd/xosd.c
---- xosd-2.2.14.orig/src/libxosd/xosd.c	2004-11-17 21:27:11.000000000 +0200
-+++ xosd-2.2.14/src/libxosd/xosd.c	2005-03-17 23:43:48.000000000 +0200
-@@ -24,7 +24,7 @@
- #define XOFFSET 10
- 
- const char *osd_default_font =
--  "-misc-fixed-medium-r-semicondensed--*-*-*-*-c-*-*-*";
-+  "-*-luxi sans-*-r-*-*-17-*-*-*-*-*-*-*";
- #if 0
- "-adobe-helvetica-bold-r-*-*-10-*";
- #endif
 diff -Naru xosd-2.2.14.orig/src/xmms_plugin/xmms_osd.c xosd-2.2.14/src/xmms_plugin/xmms_osd.c
 --- xosd-2.2.14.orig/src/xmms_plugin/xmms_osd.c	2004-11-04 21:47:50.000000000 +0200
 +++ xosd-2.2.14/src/xmms_plugin/xmms_osd.c	2005-03-17 23:42:11.000000000 +0200


Index: xosd.spec
===================================================================
RCS file: /cvs/extras/rpms/xosd/FC-5/xosd.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xosd.spec	12 Mar 2006 11:46:18 -0000	1.11
+++ xosd.spec	12 Apr 2006 19:26:47 -0000	1.12
@@ -5,7 +5,7 @@
 
 Name:           xosd
 Version:        2.2.14
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        On-screen display library for X
 
 Group:          System Environment/Libraries
@@ -16,15 +16,11 @@
 Patch1:         %{name}-defaults.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Needed for main xosd:
 BuildRequires:  libX11-devel
 BuildRequires:  libXext-devel
 BuildRequires:  libXinerama-devel
-# ...and for the bmp and xmms plugins:
-BuildRequires:  gtk+-devel >= 1:1.2.2
-BuildRequires:  gdk-pixbuf-devel >= 1:0.22.0
-BuildRequires:  xmms-devel
-BuildRequires:  bmp-devel
+# As of 2.2.14, the default font *must* be found, even if not used (#183971)
+Requires:       xorg-x11-fonts-base
 
 %description
 XOSD displays text on your screen, sounds simple right? The difference
@@ -49,6 +45,9 @@
 %package     -n xmms-%{name}
 Summary:        XMMS plugin for on-screen display using the XOSD library
 Group:          Applications/Multimedia
+BuildRequires:  gtk+-devel >= 1:1.2.2
+BuildRequires:  gdk-pixbuf-devel >= 1:0.22.0
+BuildRequires:  xmms-devel
 Requires:       %{name} = %{version}-%{release}
 Requires:       xmms
 Obsoletes:      %{name}-xmms <= 2.2.12
@@ -60,6 +59,7 @@
 %package     -n bmp-%{name}
 Summary:        BMP plugin for on-screen display using the XOSD library
 Group:          Applications/Multimedia
+BuildRequires:  bmp-devel
 Requires:       %{name} = %{version}-%{release}
 Requires:       bmp
 
@@ -128,6 +128,9 @@
 
 
 %changelog
+* Wed Apr 12 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.2.14-6
+- Revert to upstream default font, require xorg-x11-fonts-base (#183971).
+
 * Sun Mar 12 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.2.14-5
 - Convert docs to UTF-8.
 



From fedora-extras-commits at redhat.com  Wed Apr 12 19:26:48 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 12 Apr 2006 12:26:48 -0700
Subject: rpms/xosd/devel xosd-defaults.patch,1.1,1.2 xosd.spec,1.11,1.12
Message-ID: <200604121926.k3CJQobO025021@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xosd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24976/devel

Modified Files:
	xosd-defaults.patch xosd.spec 
Log Message:
* Wed Apr 12 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.2.14-6
- Revert to upstream default font, require xorg-x11-fonts-base (#183971).


xosd-defaults.patch:

Index: xosd-defaults.patch
===================================================================
RCS file: /cvs/extras/rpms/xosd/devel/xosd-defaults.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xosd-defaults.patch	17 Mar 2005 21:57:09 -0000	1.1
+++ xosd-defaults.patch	12 Apr 2006 19:26:48 -0000	1.2
@@ -12,18 +12,6 @@
    shadow_offset = 1;
    outline_offset = 0;
    pos = XOSD_bottom;
-diff -Naru xosd-2.2.14.orig/src/libxosd/xosd.c xosd-2.2.14/src/libxosd/xosd.c
---- xosd-2.2.14.orig/src/libxosd/xosd.c	2004-11-17 21:27:11.000000000 +0200
-+++ xosd-2.2.14/src/libxosd/xosd.c	2005-03-17 23:43:48.000000000 +0200
-@@ -24,7 +24,7 @@
- #define XOFFSET 10
- 
- const char *osd_default_font =
--  "-misc-fixed-medium-r-semicondensed--*-*-*-*-c-*-*-*";
-+  "-*-luxi sans-*-r-*-*-17-*-*-*-*-*-*-*";
- #if 0
- "-adobe-helvetica-bold-r-*-*-10-*";
- #endif
 diff -Naru xosd-2.2.14.orig/src/xmms_plugin/xmms_osd.c xosd-2.2.14/src/xmms_plugin/xmms_osd.c
 --- xosd-2.2.14.orig/src/xmms_plugin/xmms_osd.c	2004-11-04 21:47:50.000000000 +0200
 +++ xosd-2.2.14/src/xmms_plugin/xmms_osd.c	2005-03-17 23:42:11.000000000 +0200


Index: xosd.spec
===================================================================
RCS file: /cvs/extras/rpms/xosd/devel/xosd.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xosd.spec	12 Mar 2006 11:46:18 -0000	1.11
+++ xosd.spec	12 Apr 2006 19:26:48 -0000	1.12
@@ -5,7 +5,7 @@
 
 Name:           xosd
 Version:        2.2.14
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        On-screen display library for X
 
 Group:          System Environment/Libraries
@@ -16,15 +16,11 @@
 Patch1:         %{name}-defaults.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Needed for main xosd:
 BuildRequires:  libX11-devel
 BuildRequires:  libXext-devel
 BuildRequires:  libXinerama-devel
-# ...and for the bmp and xmms plugins:
-BuildRequires:  gtk+-devel >= 1:1.2.2
-BuildRequires:  gdk-pixbuf-devel >= 1:0.22.0
-BuildRequires:  xmms-devel
-BuildRequires:  bmp-devel
+# As of 2.2.14, the default font *must* be found, even if not used (#183971)
+Requires:       xorg-x11-fonts-base
 
 %description
 XOSD displays text on your screen, sounds simple right? The difference
@@ -49,6 +45,9 @@
 %package     -n xmms-%{name}
 Summary:        XMMS plugin for on-screen display using the XOSD library
 Group:          Applications/Multimedia
+BuildRequires:  gtk+-devel >= 1:1.2.2
+BuildRequires:  gdk-pixbuf-devel >= 1:0.22.0
+BuildRequires:  xmms-devel
 Requires:       %{name} = %{version}-%{release}
 Requires:       xmms
 Obsoletes:      %{name}-xmms <= 2.2.12
@@ -60,6 +59,7 @@
 %package     -n bmp-%{name}
 Summary:        BMP plugin for on-screen display using the XOSD library
 Group:          Applications/Multimedia
+BuildRequires:  bmp-devel
 Requires:       %{name} = %{version}-%{release}
 Requires:       bmp
 
@@ -128,6 +128,9 @@
 
 
 %changelog
+* Wed Apr 12 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.2.14-6
+- Revert to upstream default font, require xorg-x11-fonts-base (#183971).
+
 * Sun Mar 12 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.2.14-5
 - Convert docs to UTF-8.
 



From fedora-extras-commits at redhat.com  Wed Apr 12 19:58:53 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 12 Apr 2006 12:58:53 -0700
Subject: rpms/xmms/FC-5 xmms.req,1.1,1.2 xmms.spec,1.19,1.20
Message-ID: <200604121958.k3CJwtSs025511@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xmms/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25492

Modified Files:
	xmms.req xmms.spec 
Log Message:
Sync with devel:

* Thu Apr  6 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1:1.2.10-23
- Split library and plugins to xmms-libs (#184606).
- ALSA is ubiquitous, don't filter dependencies to it.
- Avoid standard rpaths on lib64 archs.
- Tighten versioned -devel dependency to -libs.
- Drop no longer needed Obsoletes.
- Install icon to %{_datadir}/icons.
- Convert docs to UTF-8.
- Specfile rewrite/cleanup.
- Drop bogus Source0 URL.
- Don't use %exclude.



Index: xmms.req
===================================================================
RCS file: /cvs/extras/rpms/xmms/FC-5/xmms.req,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xmms.req	4 Apr 2005 17:59:12 -0000	1.1
+++ xmms.req	12 Apr 2006 19:58:53 -0000	1.2
@@ -3,5 +3,5 @@
 filelist=`sed "s/['\"]/\\\&/g"`
 
 { echo $filelist | tr [:blank:] \\n | /usr/lib/rpm/find-requires | \
-	grep -v artsc | grep -v esd | grep -v audiofile | grep -v asound
+	grep -v artsc | grep -v esd | grep -v audiofile
 } | sort -u


Index: xmms.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms/FC-5/xmms.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xmms.spec	2 Mar 2006 10:42:28 -0000	1.19
+++ xmms.spec	12 Apr 2006 19:58:53 -0000	1.20
@@ -1,63 +1,76 @@
-Summary: The X MultiMedia System, a media player
-Name: xmms
-Version: 1.2.10
-Release: 22%{?dist}
-Epoch: 1
-License: GPL
-Group: Applications/Multimedia
-URL: http://www.xmms.org/
-Source0: http://www.xmms.org/files/1.2.x/%{name}-%{version}.patched.tar.bz2
-Source2: xmms.req
-Source3: xmms.xpm
-Source5: rh_mp3.c
-Patch1: xmms-1.2.6-audio.patch
-Patch2: xmms-1.2.6-lazy.patch
-Patch3: xmms-1.2.8-default-skin.patch
-Patch4: xmms-1.2.9-nomp3.patch
-Patch5: xmms-1.2.8-arts.patch
-Patch6: xmms-1.2.8-alsalib.patch
-Patch7: xmms-cd-mountpoint.patch
-Patch9: xmms-underquoted.patch
-Patch10: xmms-alsa-backport.patch
-Patch11: xmms-1.2.10-gcc4.patch
-Patch12: xmms-1.2.10-crossfade-0.3.9.patch
-Patch13: xmms-1.2.10-extra_libs.patch
-
-Requires: unzip
-# the desktop file and redhat-menus are redundant requires really
-Requires: /usr/share/desktop-menu-patches/redhat-audio-player.desktop
-Requires: redhat-menus >= 0.11
-
-BuildRequires: gtk+-devel, esound-devel, arts-devel, alsa-lib-devel
-BuildRequires: libogg-devel, libvorbis-devel, mikmod-devel
-BuildRequires: gettext-devel, zlib-devel, libGL-devel
-# Use monolithic X up to FC4, and modular X for FC5+
-%if 0%{?fedora} < 5
-BuildRequires: xorg-x11-devel
-%else
-BuildRequires: libXt-devel, libSM-devel, libXxf86vm-devel
-%endif
+# This is to avoid requiring all of arts, esound, audiofile...
+%define _use_internal_dependency_generator 0
+%define __find_requires sh %{SOURCE1}
+
+Name:           xmms
+Version:        1.2.10
+Release:        23%{?dist}
+Epoch:          1
+Summary:        The X MultiMedia System, a media player
+
+Group:          Applications/Multimedia
+License:        GPL
+URL:            http://www.xmms.org/
+# http://www.xmms.org/download.php, to recreate the tarball:
+# $ wget http://www.xmms.org/files/1.2.x/xmms-1.2.10.tar.bz2
+# $ tar jx --exclude "mpg123*" -f xmms-1.2.10.tar.bz2
+# $ tar jcf xmms-1.2.10.patched.tar.bz2 xmms-1.2.10
+Source0:        %{name}-%{version}.patched.tar.bz2
+Source1:        xmms.req
+Source2:        xmms.xpm
+Source3:        rh_mp3.c
+Patch1:         %{name}-1.2.6-audio.patch
+Patch2:         %{name}-1.2.6-lazy.patch
+Patch3:         %{name}-1.2.8-default-skin.patch
+Patch4:         %{name}-1.2.9-nomp3.patch
+Patch5:         %{name}-1.2.8-arts.patch
+Patch6:         %{name}-1.2.8-alsalib.patch
+Patch7:         %{name}-cd-mountpoint.patch
+Patch9:         %{name}-underquoted.patch
+Patch10:        %{name}-alsa-backport.patch
+Patch11:        %{name}-1.2.10-gcc4.patch
+Patch12:        %{name}-1.2.10-crossfade-0.3.9.patch
+Patch13:        %{name}-1.2.10-extra_libs.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  gtk+-devel
+BuildRequires:  esound-devel
+BuildRequires:  arts-devel
+BuildRequires:  alsa-lib-devel
+BuildRequires:  libogg-devel
+BuildRequires:  libvorbis-devel
+BuildRequires:  mikmod-devel
+BuildRequires:  gettext-devel
+BuildRequires:  zlib-devel
+BuildRequires:  libGL-devel
+BuildRequires:  libXt-devel
+BuildRequires:  libSM-devel
+BuildRequires:  libXxf86vm-devel
+
+Requires:       unzip
+Requires:       %{_datadir}/desktop-menu-patches/redhat-audio-player.desktop
 Requires(post): desktop-file-utils >= 0.9
 Requires(postun): desktop-file-utils >= 0.9
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Obsoletes: xmms-esd xmms-gl xmms-mikmod xmms-gnome
-
-# This is to avoid requiring all of arts, esound, alsa...
-%define _use_internal_dependency_generator 0
-%define __find_requires %{SOURCE2}
 
 %description
-Xmms is a multimedia (Ogg Vorbis, CDs) player for the X Window System with
-an interface similar to Winamp's. Xmms supports playlists and
+XMMS is a multimedia (Ogg Vorbis, CDs) player for the X Window System
+with an interface similar to Winamp's.  XMMS supports playlists and
 streaming content and has a configurable interface.
 
+%package        libs
+Summary:        XMMS engine and core plugins
+Group:          System Environment/Libraries
+
+%description    libs
+The X MultiMedia System player engine and core plugins.
+
+%package        devel
+Summary:        Files required for XMMS plug-in development
+Group:          Development/Libraries
+Requires:       %{name}-libs = %{epoch}:%{version}-%{release}
+Requires:       gtk+-devel
 
-%package devel
-Summary: Files required for XMMS plug-in development
-Group: Development/Libraries
-Requires: %{name} = %{epoch}:%{version}, gtk+-devel
-
-%description devel
+%description    devel
 Files needed for building plug-ins for the X MultiMedia System.
 
 
@@ -85,9 +98,14 @@
 %patch11 -p1 -b .gcc4
 # Fix for crossfade >= 0.3.9 to work properly
 %patch12 -p1 -b .crossfade
-# Remove extra libs from xmms-config output (was only needed for static linking)
+# Remove extra libs from xmms-config output (only needed for static linking)
 %patch13 -p1 -b .extra_libs
+# Avoid standard rpaths on lib64 archs, --disable-rpath doesn't do it
+sed -i -e 's|"/lib /usr/lib"|"/%{_lib} %{_libdir}"|' configure
 
+for f in AUTHORS ChangeLog README ; do
+    iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f
+done
 
 %build
 %configure \
@@ -97,87 +115,86 @@
     --enable-ipv6 \
     --with-pic \
     --disable-static
-# Hack around old libtool and x86_64 issue
-for i in `find . -name Makefile`; do
-    cat $i | sed s/-lpthread//g > $i.tmp
-    mv $i.tmp $i
-done
-%{__make} %{?_smp_mflags}
+find . -name Makefile | xargs sed -i -e s/-lpthread//g # old libtool, x86_64
+make %{?_smp_mflags}
 
-# Compile the default mp3 "warning dialog" plugin
-%{__cc} %{optflags} -fPIC -shared -Wl,-soname -Wl,librh_mp3.so -o librh_mp3.so \
-    -I. `gtk-config --cflags gtk` %{SOURCE5}
+%{__cc} $RPM_OPT_FLAGS -fPIC -shared -Wl,-soname -Wl,librh_mp3.so \
+    -o librh_mp3.so -I. $(gtk-config --cflags gtk) %{SOURCE3}
 
 
 %install
-%{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
-%find_lang %{name}
+rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+install -pm 755 librh_mp3.so $RPM_BUILD_ROOT%{_libdir}/xmms/Input
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/xmms/Skins
+find $RPM_BUILD_ROOT -name "*.la" | xargs rm -f
 
-# Install default mp3 "warning dialog" plugin
-%{__install} -m 0755 librh_mp3.so %{buildroot}%{_libdir}/xmms/Input/
+# On FC5 x86_64, some get created even though we pass --disable-static
+rm -f $RPM_BUILD_ROOT%{_libdir}/xmms/*/*.a
 
 # Link to the desktop menu entry included in redhat-menus
-%{__mkdir_p} %{buildroot}%{_datadir}/applications
-%{__ln_s} %{_datadir}/desktop-menu-patches/redhat-audio-player.desktop \
-    %{buildroot}%{_datadir}/applications/
+install -dm 755 $RPM_BUILD_ROOT%{_datadir}/applications
+ln -s %{_datadir}/desktop-menu-patches/redhat-audio-player.desktop \
+    $RPM_BUILD_ROOT%{_datadir}/applications
+install -Dpm 644 %{SOURCE2} \
+    $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/xmms.xpm
 
-# Install xmms.xpm, the Icon= from the menu entry
-%{__install} -D -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/pixmaps/xmms.xpm
-
-# Create empty Skins directory to be included
-%{__mkdir_p} %{buildroot}%{_datadir}/xmms/Skins/
-
-# On FC5 x86_64, some get created even though we pass --disable-static
-%{__rm} -f %{buildroot}%{_libdir}/xmms/*/*.a
+%find_lang %{name}
 
 
 %clean
-%{__rm} -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 
 %post
-/sbin/ldconfig
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
 update-desktop-database -q || :
 
+%post libs -p /sbin/ldconfig
+
 %postun
-/sbin/ldconfig
+gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
 update-desktop-database -q || :
 
+%postun libs -p /sbin/ldconfig
+
 
 %files -f %{name}.lang
-%defattr(-,root,root,0755)
+%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING FAQ NEWS TODO README
 %{_bindir}/xmms
 %{_bindir}/wmxmms
-%{_libdir}/libxmms.so.*
-%dir %{_libdir}/xmms/
-%dir %{_libdir}/xmms/Effect/
-%dir %{_libdir}/xmms/General/
-%dir %{_libdir}/xmms/Input/
-%dir %{_libdir}/xmms/Output/
-%dir %{_libdir}/xmms/Visualization/
-%{_libdir}/xmms/Effect/*.so
-%{_libdir}/xmms/General/*.so
-%{_libdir}/xmms/Input/*.so
-%{_libdir}/xmms/Output/*.so
-%{_libdir}/xmms/Visualization/*.so
-%exclude %{_libdir}/xmms/*/*.la
 %{_datadir}/applications/*.desktop
-%{_datadir}/pixmaps/xmms.xpm
+%{_datadir}/icons/hicolor/*x*/apps/xmms.xpm
 %{_datadir}/xmms/
-%{_mandir}/man1/*
+%{_mandir}/man1/*xmms.1*
+
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/libxmms.so.*
+%{_libdir}/xmms/
 
 %files devel
-%defattr(-,root,root,0755)
+%defattr(-,root,root,-)
 %{_bindir}/xmms-config
 %{_includedir}/xmms/
-%exclude %{_libdir}/*.la
-%{_libdir}/*.so
+%{_libdir}/libxmms.so
 %{_datadir}/aclocal/xmms.m4
 
 
 %changelog
+* Thu Apr  6 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1:1.2.10-23
+- Split library and plugins to xmms-libs (#184606).
+- ALSA is ubiquitous, don't filter dependencies to it.
+- Avoid standard rpaths on lib64 archs.
+- Tighten versioned -devel dependency to -libs.
+- Drop no longer needed Obsoletes.
+- Install icon to %%{_datadir}/icons.
+- Convert docs to UTF-8.
+- Specfile rewrite/cleanup.
+- Drop bogus Source0 URL.
+- Don't use %%exclude.
+
 * Thu Mar  2 2006 Matthias Saou <http://freshrpms.net/> 1:1.2.10-22
 - Remove /usr/lib64/xmms/General/libsong_change.a (fix for FC5 x86_64...).
 



From fedora-extras-commits at redhat.com  Wed Apr 12 20:03:11 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Wed, 12 Apr 2006 13:03:11 -0700
Subject: rpms/xmms-cdread/FC-5 xmms-cdread.spec,1.10,1.11
Message-ID: <200604122003.k3CK3EUL027647@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/xmms-cdread/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27613/FC-5

Modified Files:
	xmms-cdread.spec 
Log Message:
changed Requires xmms -> xmms-libs


Index: xmms-cdread.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-cdread/FC-5/xmms-cdread.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xmms-cdread.spec	5 Mar 2006 10:00:28 -0000	1.10
+++ xmms-cdread.spec	12 Apr 2006 20:03:11 -0000	1.11
@@ -3,14 +3,14 @@
 Summary:	Digital audio CD input plugin for XMMS
 Name:		xmms-cdread
 Version:	0.14
-Release:        9%{?dist}
+Release:        10%{?dist}
 License:	GPL
 Group:		Applications/Multimedia
 URL:		http://www.xmms.org/
 Source:		ftp://ftp.stack.nl/pub/users/willem/xmms-cdread-0.14a.tar.gz
 Patch1:		xmms-cdread-shuffle.patch
 Patch2:		xmms-cdread-x86_64.patch
-Requires:	xmms = %xmmsdep
+Requires:	xmms-libs
 BuildRequires:	gtk+-devel glib-devel xmms-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -47,6 +47,9 @@
 %exclude %{xmmsinputdir}/libcdread.la
 
 %changelog
+* Sat Apr  8 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.14-10
+- changed Requires xmms -> xmms-libs
+
 * Sun Mar  5 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.14-9
 - x86_64 fixes 
 
@@ -55,7 +58,7 @@
 - added dist after release
 
 * Wed Mar  1 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.14-7
-- Rebuild for Fedora Extras 5
+- rebuild for Fedora Extras 5
 
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 0.14-6.a
 - rebuild on all arches



From fedora-extras-commits at redhat.com  Wed Apr 12 20:03:10 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Wed, 12 Apr 2006 13:03:10 -0700
Subject: rpms/xmms-cdread/FC-4 xmms-cdread.spec,1.8,1.9
Message-ID: <200604122003.k3CK3gAt027650@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/xmms-cdread/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27613/FC-4

Modified Files:
	xmms-cdread.spec 
Log Message:
changed Requires xmms -> xmms-libs


Index: xmms-cdread.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-cdread/FC-4/xmms-cdread.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xmms-cdread.spec	5 Mar 2006 10:01:11 -0000	1.8
+++ xmms-cdread.spec	12 Apr 2006 20:03:10 -0000	1.9
@@ -3,14 +3,14 @@
 Summary:	Digital audio CD input plugin for XMMS
 Name:		xmms-cdread
 Version:	0.14
-Release:        9%{?dist}
+Release:        10%{?dist}
 License:	GPL
 Group:		Applications/Multimedia
 URL:		http://www.xmms.org/
 Source:		ftp://ftp.stack.nl/pub/users/willem/xmms-cdread-0.14a.tar.gz
 Patch1:		xmms-cdread-shuffle.patch
 Patch2:		xmms-cdread-x86_64.patch
-Requires:	xmms = %xmmsdep
+Requires:	xmms-libs
 BuildRequires:	gtk+-devel glib-devel xmms-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -47,6 +47,9 @@
 %exclude %{xmmsinputdir}/libcdread.la
 
 %changelog
+* Sat Apr  8 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.14-10
+- changed Requires xmms -> xmms-libs
+
 * Sun Mar  5 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.14-9
 - x86_64 fixes 
 
@@ -55,7 +58,7 @@
 - added dist after release
 
 * Wed Mar  1 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.14-7
-- Rebuild for Fedora Extras 5
+- rebuild for Fedora Extras 5
 
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 0.14-6.a
 - rebuild on all arches



From fedora-extras-commits at redhat.com  Wed Apr 12 20:06:40 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 12 Apr 2006 13:06:40 -0700
Subject: rpms/perl-Locale-Maketext-Simple - New directory
Message-ID: <200604122006.k3CK6gph027812@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Locale-Maketext-Simple
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27786/perl-Locale-Maketext-Simple

Log Message:
Directory /cvs/extras/rpms/perl-Locale-Maketext-Simple added to the repository




From fedora-extras-commits at redhat.com  Wed Apr 12 20:06:41 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 12 Apr 2006 13:06:41 -0700
Subject: rpms/perl-Locale-Maketext-Simple/devel - New directory
Message-ID: <200604122006.k3CK6h94027815@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Locale-Maketext-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27786/perl-Locale-Maketext-Simple/devel

Log Message:
Directory /cvs/extras/rpms/perl-Locale-Maketext-Simple/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Apr 12 20:07:28 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 12 Apr 2006 13:07:28 -0700
Subject: rpms/perl-Locale-Maketext-Simple Makefile, NONE, 1.1 import.log,
	NONE, 1.1
Message-ID: <200604122007.k3CK7U2C027859@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Locale-Maketext-Simple
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27831

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Locale-Maketext-Simple


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Locale-Maketext-Simple
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Apr 12 20:07:29 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 12 Apr 2006 13:07:29 -0700
Subject: rpms/perl-Locale-Maketext-Simple/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200604122007.k3CK7Vsk027862@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Locale-Maketext-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27831/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Locale-Maketext-Simple


--- 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 Apr 12 20:08:30 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 12 Apr 2006 13:08:30 -0700
Subject: rpms/perl-Locale-Maketext-Simple import.log,1.1,1.2
Message-ID: <200604122008.k3CK8WrW027928@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Locale-Maketext-Simple
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27895

Modified Files:
	import.log 
Log Message:
auto-import perl-Locale-Maketext-Simple-0.12-2 on branch devel from perl-Locale-Maketext-Simple-0.12-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	12 Apr 2006 20:07:28 -0000	1.1
+++ import.log	12 Apr 2006 20:08:30 -0000	1.2
@@ -0,0 +1 @@
+perl-Locale-Maketext-Simple-0_12-2:HEAD:perl-Locale-Maketext-Simple-0.12-2.src.rpm:1144872488



From fedora-extras-commits at redhat.com  Wed Apr 12 20:08:31 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 12 Apr 2006 13:08:31 -0700
Subject: rpms/perl-Locale-Maketext-Simple/devel
	perl-Locale-Maketext-Simple.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604122008.k3CK8XtQ027933@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Locale-Maketext-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27895/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Locale-Maketext-Simple.spec 
Log Message:
auto-import perl-Locale-Maketext-Simple-0.12-2 on branch devel from perl-Locale-Maketext-Simple-0.12-2.src.rpm


--- NEW FILE perl-Locale-Maketext-Simple.spec ---
Name:           perl-Locale-Maketext-Simple
Version:        0.12
Release:        2%{?dist}
Summary:        Simple interface to Locale::Maketext::Lexicon
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Locale-Maketext-Simple/
Source0:        http://www.cpan.org/authors/id/A/AU/AUTRIJUS/Locale-Maketext-Simple-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Locale::Maketext::Lexicon) >= 0.20
Requires:       perl(Locale::Maketext::Lexicon) >= 0.20
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module is a simple wrapper around Locale::Maketext::Lexicon, designed
to alleviate the need of creating Language Classes for module authors.

%prep
%setup -q -n Locale-Maketext-Simple-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \;

chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

%check
rm -f t/0-signature.t
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Mon Apr 10 2006 Steven Pritchard <steve at kspei.com> 0.12-2
- Explicitly require perl(Locale::Maketext::Lexicon).

* Sat Apr 08 2006 Steven Pritchard <steve at kspei.com> 0.12-1
- Specfile autogenerated by cpanspec 1.64.
- Remove Module::Signature test.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	12 Apr 2006 20:07:29 -0000	1.1
+++ .cvsignore	12 Apr 2006 20:08:31 -0000	1.2
@@ -0,0 +1 @@
+Locale-Maketext-Simple-0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	12 Apr 2006 20:07:29 -0000	1.1
+++ sources	12 Apr 2006 20:08:31 -0000	1.2
@@ -0,0 +1 @@
+9a65312da2ae8d59f898151f9c044383  Locale-Maketext-Simple-0.12.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 12 22:28:56 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Wed, 12 Apr 2006 15:28:56 -0700
Subject: rpms/gparted/devel .cvsignore, 1.6, 1.7 gparted.spec, 1.7,
	1.8 sources, 1.6, 1.7
Message-ID: <200604122228.k3CMSw4e032473@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gparted/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32452

Modified Files:
	.cvsignore gparted.spec sources 
Log Message:
* Wed Apr 12 2006 Deji Akingunola <dakingun at gmail.com> - 0.2.4-1
- Update to newer version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gparted/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	30 Mar 2006 19:56:32 -0000	1.6
+++ .cvsignore	12 Apr 2006 22:28:56 -0000	1.7
@@ -1 +1 @@
-gparted-0.2.3.tar.bz2
+gparted-0.2.4.tar.bz2


Index: gparted.spec
===================================================================
RCS file: /cvs/extras/rpms/gparted/devel/gparted.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gparted.spec	30 Mar 2006 19:56:32 -0000	1.7
+++ gparted.spec	12 Apr 2006 22:28:56 -0000	1.8
@@ -1,6 +1,6 @@
 Summary: Gnome Partition Editor
 Name:    gparted
-Version: 0.2.3
+Version: 0.2.4
 Release: 1%{?dist}
 Group:   Applications/System
 License: GPL
@@ -77,6 +77,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/gparted
 
 %changelog
+* Wed Apr 12 2006 Deji Akingunola <dakingun at gmail.com> - 0.2.4-1
+- Update to newer version
+
 * Thu Mar 30 2006 Deji Akingunola <dakingun at gmail.com> - 0.2.3-1
 - Update to newer version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gparted/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	30 Mar 2006 19:56:32 -0000	1.6
+++ sources	12 Apr 2006 22:28:56 -0000	1.7
@@ -1 +1 @@
-329e7a254e82d29b67e521ec3f1906c7  gparted-0.2.3.tar.bz2
+8cee62b5980e76e8e0366660ae310f0c  gparted-0.2.4.tar.bz2



From fedora-extras-commits at redhat.com  Wed Apr 12 22:30:14 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Wed, 12 Apr 2006 15:30:14 -0700
Subject: rpms/gparted/FC-5 .cvsignore, 1.6, 1.7 gparted.spec, 1.7,
	1.8 sources, 1.6, 1.7
Message-ID: <200604122230.k3CMUGKs032552@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gparted/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32531

Modified Files:
	.cvsignore gparted.spec sources 
Log Message:
* Wed Apr 12 2006 Deji Akingunola <dakingun at gmail.com> - 0.2.4-1
- Update to newer version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gparted/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	30 Mar 2006 19:55:52 -0000	1.6
+++ .cvsignore	12 Apr 2006 22:30:14 -0000	1.7
@@ -1 +1 @@
-gparted-0.2.3.tar.bz2
+gparted-0.2.4.tar.bz2


Index: gparted.spec
===================================================================
RCS file: /cvs/extras/rpms/gparted/FC-5/gparted.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gparted.spec	30 Mar 2006 19:55:52 -0000	1.7
+++ gparted.spec	12 Apr 2006 22:30:14 -0000	1.8
@@ -1,6 +1,6 @@
 Summary: Gnome Partition Editor
 Name:    gparted
-Version: 0.2.3
+Version: 0.2.4
 Release: 1%{?dist}
 Group:   Applications/System
 License: GPL
@@ -77,6 +77,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/gparted
 
 %changelog
+* Wed Apr 12 2006 Deji Akingunola <dakingun at gmail.com> - 0.2.4-1
+- Update to newer version
+
 * Thu Mar 30 2006 Deji Akingunola <dakingun at gmail.com> - 0.2.3-1
 - Update to newer version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gparted/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	30 Mar 2006 19:55:52 -0000	1.6
+++ sources	12 Apr 2006 22:30:14 -0000	1.7
@@ -1 +1 @@
-329e7a254e82d29b67e521ec3f1906c7  gparted-0.2.3.tar.bz2
+8cee62b5980e76e8e0366660ae310f0c  gparted-0.2.4.tar.bz2



From fedora-extras-commits at redhat.com  Wed Apr 12 23:12:12 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Wed, 12 Apr 2006 16:12:12 -0700
Subject: kadischi/post_install_scripts 04userconfig.py,1.3,1.4
Message-ID: <200604122312.k3CNCCQk002245@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi/post_install_scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2227/kadischi/post_install_scripts

Modified Files:
	04userconfig.py 
Log Message:
Drop useless code pieces in loop, clean up.


Index: 04userconfig.py
===================================================================
RCS file: /cvs/devel/kadischi/post_install_scripts/04userconfig.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 04userconfig.py	12 Apr 2006 17:51:42 -0000	1.3
+++ 04userconfig.py	12 Apr 2006 23:12:10 -0000	1.4
@@ -8,33 +8,32 @@
 from functions import run
 from functions import flc_log
 
+
 sysdir = sys.argv[1]
+anaconda_args = sys.argv[2:]
 
-try:
-    anaconda_args = sys.argv[2:]
-except IndexError:
-    anaconda_args = None
+lokkit = os.path.isfile(os.path.join(sysdir, "usr/sbin/lokkit"))
+ntsysv = os.path.isfile(os.path.join(sysdir, "usr/sbin/ntsysv"))
 
-config_done = False
 
 run("chroot %s %s" % (sysdir, "/usr/sbin/authconfig --kickstart --nostart --enableshadow --enablemd5 --disablecache --disablenis --disableldap --disableldapauth --disableldaptls --disablekrb5 --disablehesiod --disablesmbauth"))
 
-while config_done == False:
-    if anaconda_args != None:
-        for args in anaconda_args:
-            if args.startswith("--kickstart") or args.startswith("--cmdline") or args.startswith("-C"):
-                flc_log("Skipping interactive user configuration..")
-                config_done = True
-                sys.exit(0)
-            else:
-                if os.path.isfile(os.path.join(sysdir, "usr/sbin/lokkit")) and os.path.isfile(os.path.join(sysdir, "usr/sbin/ntsysv")):
-                    flc_log("Taking you to interactive user configuration..")
-                    run("chroot %s %s" % (sysdir, "/usr/sbin/lokkit"))
-                    run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv"))
-                    config_done = True   
+if anaconda_args != []:
+    for args in anaconda_args:
+        if args.startswith("--kickstart") or args.startswith("--cmdline") or args.startswith("-C"):
+            flc_log("Skipping interactive user configuration..")
+            sys.exit(0)
+
+    if (lokkit and ntsysv) == True:
+        flc_log("Taking you to interactive user configuration..")
+        run("chroot %s %s" % (sysdir, "/usr/sbin/lokkit"))
+        run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv"))
+    else:
+        flc_log("Skipping interactive user configuration..")
+else:
+    if (lokkit and ntsysv) == True:
+        flc_log("Taking you to interactive user configuration..")
+        run("chroot %s %s" % (sysdir, "/usr/sbin/lokkit"))
+        run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv"))
     else:
-        if os.path.isfile(os.path.join(sysdir, "usr/sbin/lokkit")) and os.path.isfile(os.path.join(sysdir, "usr/sbin/ntsysv")):
-            flc_log("Taking you to interactive user configuration..")
-            run("chroot %s %s" % (sysdir, "/usr/sbin/lokkit"))
-            run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv"))
-            config_done = True
+        flc_log("Skipping interactive user configuration..")



From fedora-extras-commits at redhat.com  Wed Apr 12 23:23:38 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Wed, 12 Apr 2006 16:23:38 -0700
Subject: rpms/abiword/FC-5 abiword-2.4.4-docbuild.patch, NONE,
	1.1 abiword.spec, 1.33, 1.34
Message-ID: <200604122323.k3CNNeKJ002294@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/abiword/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2274

Modified Files:
	abiword.spec 
Added Files:
	abiword-2.4.4-docbuild.patch 
Log Message:
Fix documentation and charting support



abiword-2.4.4-docbuild.patch:

--- NEW FILE abiword-2.4.4-docbuild.patch ---
diff -r -u abiword-2.4.4.orig/abiword-docs/make-dbk.sh abiword-2.4.4/abiword-docs/make-dbk.sh
--- abiword-2.4.4.orig/abiword-docs/make-dbk.sh	2006-04-12 23:16:57.000000000 +0200
+++ abiword-2.4.4/abiword-docs/make-dbk.sh	2006-04-12 23:20:18.000000000 +0200
@@ -33,7 +33,7 @@
 		      echo $i
 
 		      # save to docbook, rename to .xml
-		      AbiWord-2.0 --to=dbk $i 2>/dev/null
+		      AbiWord-2.4 --to=dbk $i 2>/dev/null
 		      mv $n.dbk $n.xml
 		done
 
diff -r -u abiword-2.4.4.orig/abiword-docs/make-gnome-html.sh abiword-2.4.4/abiword-docs/make-gnome-html.sh
--- abiword-2.4.4.orig/abiword-docs/make-gnome-html.sh	2006-04-12 23:16:57.000000000 +0200
+++ abiword-2.4.4/abiword-docs/make-gnome-html.sh	2006-04-12 23:20:18.000000000 +0200
@@ -31,7 +31,7 @@
 		do
 		      n=`echo $i|cut -f1 -d .`
 		      echo $i
-		      AbiWord-2.0 --to=html $i 2>/dev/null
+		      AbiWord-2.4 --to=html $i 2>/dev/null
 		done
 
 		cd $CVS
diff -r -u abiword-2.4.4.orig/abiword-docs/make-html.sh abiword-2.4.4/abiword-docs/make-html.sh
--- abiword-2.4.4.orig/abiword-docs/make-html.sh	2006-04-12 23:16:57.000000000 +0200
+++ abiword-2.4.4/abiword-docs/make-html.sh	2006-04-12 23:20:44.000000000 +0200
@@ -30,7 +30,7 @@
 fi
 
 if [ -z "$ABI_DOC_PROG" ]; then
-ABI_DOC_PROG="AbiWord-2.2";
+ABI_DOC_PROG="AbiWord-2.4";
 fi
 
 html_export_options="html4: no; use-awml: no; embed-css: yes; embed-images:yes"
@@ -45,7 +45,7 @@
 		do
 		      n=`echo $i|cut -f1 -d .`
 		      echo $i
-		      $ABI_DOC_PROG --to=html --exp-props=$html_export_options $i 2>/dev/null
+		      $ABI_DOC_PROG --to=html --exp-props="$html_export_options" $i 2>/dev/null
 		      $CVS/make-abidoc.pl -I $n.info -S header.xhtml -F footer.xhtml > $n.xhtml
 		      cp $n.xhtml $n.html
 			rm -f $n.xhtml


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-5/abiword.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- abiword.spec	10 Apr 2006 23:35:23 -0000	1.33
+++ abiword.spec	12 Apr 2006 23:23:38 -0000	1.34
@@ -3,7 +3,7 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: 2.4.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -33,6 +33,7 @@
 BuildRequires: link-grammar-devel >= 4.2.1
 BuildRequires: gtkmathview-devel >= 0.7.5
 BuildRequires: libgsf-devel >= 1.12.1
+BuildRequires: goffice-devel >= 0.1.0
 
 # gnome build deps
 BuildRequires: libbonobo-devel
@@ -42,6 +43,7 @@
 
 Patch0: abiword-2.0.9-windowshelppaths.patch
 Patch1: abiword-2.4.4-desktop.patch
+Patch2: abiword-2.4.4-docbuild.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. The goal is to make
@@ -51,6 +53,7 @@
 %setup -q 
 %patch0 -p1 -b .windowshelppaths
 %patch1 -p1 -b .desktop
+%patch2 -p1 -b .docbuild
 
 %build
 cd abi
@@ -132,6 +135,10 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Wed Apr 12 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.4-2.fc5
+- Fix documentation generation
+- Fix charting support
+
 * Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.4-1.fc5
 - New upstream version
 - Remove the macro patch and update the desktop patch



From fedora-extras-commits at redhat.com  Wed Apr 12 23:49:06 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 12 Apr 2006 16:49:06 -0700
Subject: rpms/multitail/devel .cvsignore, 1.4, 1.5 multitail.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200604122349.k3CNn8C2002389@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/multitail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2368

Modified Files:
	.cvsignore multitail.spec sources 
Log Message:
Updated to release 4.0.0.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/multitail/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	30 Mar 2006 18:28:13 -0000	1.4
+++ .cvsignore	12 Apr 2006 23:49:05 -0000	1.5
@@ -1 +1 @@
-multitail-3.8.10.tgz
+multitail-4.0.0.tgz


Index: multitail.spec
===================================================================
RCS file: /cvs/extras/rpms/multitail/devel/multitail.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- multitail.spec	30 Mar 2006 18:28:13 -0000	1.3
+++ multitail.spec	12 Apr 2006 23:49:05 -0000	1.4
@@ -1,5 +1,5 @@
 Name: multitail
-Version: 3.8.10
+Version: 4.0.0
 Release: 1%{?dist}
 Summary: View one or multiple files like tail but with multiple windows
 
@@ -41,6 +41,8 @@
 			%{buildroot}%{_sysconfdir}
 %{__make} install DESTDIR="%{buildroot}"
 
+mv %{buildroot}%{_sysconfdir}/multitail.conf.new %{buildroot}%{_sysconfdir}/multitail.conf
+
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -48,12 +50,15 @@
 %files
 %defattr(-, root, root, 0755)
 %doc *.conf *.html Changes license.txt readme.txt
-%{_mandir}/man1/multitail.1*
 %config(noreplace) %{_sysconfdir}/multitail.conf
 %{_bindir}/multitail
+%{_mandir}/man1/multitail.1*
 
 
 %changelog
+* Wed Apr 12 2006 Folkert van Heuesden <folkert at vanheusden.com> - 4.0.0-1
+- Updated to release 4.0.0.
+
 * Thu Mar 30 2006 Folkert van Heuesden <folkert at vanheusden.com> - 3.8.10-1
 - Updated to release 3.8.10.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/multitail/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	30 Mar 2006 18:28:13 -0000	1.4
+++ sources	12 Apr 2006 23:49:05 -0000	1.5
@@ -1 +1 @@
-1b4cb6288298fe61c4c5147b50bfd48d  multitail-3.8.10.tgz
+6a86bcc65185faa37720c56a414fe5dd  multitail-4.0.0.tgz



From fedora-extras-commits at redhat.com  Thu Apr 13 01:08:42 2006
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Wed, 12 Apr 2006 18:08:42 -0700
Subject: rpms/gpsd - New directory
Message-ID: <200604130108.k3D18i0r006932@cvs-int.fedora.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/gpsd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6906/gpsd

Log Message:
Directory /cvs/extras/rpms/gpsd added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 13 01:08:42 2006
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Wed, 12 Apr 2006 18:08:42 -0700
Subject: rpms/gpsd/devel - New directory
Message-ID: <200604130108.k3D18iws006935@cvs-int.fedora.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/gpsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6906/gpsd/devel

Log Message:
Directory /cvs/extras/rpms/gpsd/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 13 01:08:59 2006
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Wed, 12 Apr 2006 18:08:59 -0700
Subject: rpms/gpsd Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604130109.k3D191TX006984@cvs-int.fedora.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/gpsd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6951

Added Files:
	Makefile import.log 
Log Message:
Setup of module gpsd


--- NEW FILE Makefile ---
# Top level Makefile for module gpsd
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 13 01:08:59 2006
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Wed, 12 Apr 2006 18:08:59 -0700
Subject: rpms/gpsd/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200604130109.k3D191ZF006987@cvs-int.fedora.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/gpsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6951/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gpsd


--- 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 Apr 13 01:09:38 2006
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Wed, 12 Apr 2006 18:09:38 -0700
Subject: rpms/gpsd import.log,1.1,1.2
Message-ID: <200604130109.k3D19eC0007060@cvs-int.fedora.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/gpsd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7025

Modified Files:
	import.log 
Log Message:
auto-import gpsd-2.32-3 on branch devel from gpsd-2.32-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gpsd/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Apr 2006 01:08:59 -0000	1.1
+++ import.log	13 Apr 2006 01:09:38 -0000	1.2
@@ -0,0 +1 @@
+gpsd-2_32-3:HEAD:gpsd-2.32-3.src.rpm:1144890599



From fedora-extras-commits at redhat.com  Thu Apr 13 01:09:39 2006
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Wed, 12 Apr 2006 18:09:39 -0700
Subject: rpms/gpsd/devel gpsd.spec, NONE, 1.1 xgps.desktop, NONE,
	1.1 xgpsspeed.desktop, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200604130109.k3D19fqQ007065@cvs-int.fedora.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/gpsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7025/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gpsd.spec xgps.desktop xgpsspeed.desktop 
Log Message:
auto-import gpsd-2.32-3 on branch devel from gpsd-2.32-3.src.rpm


--- NEW FILE gpsd.spec ---
Name:           gpsd
Version:        2.32
Release:        3%{?dist}
Summary:        Service daemon for mediating access to a GPS

Group:          System Environment/Daemons
License:        BSD
URL:            http://developer.berlios.de/projects/gpsd/
Source0:        http://download.berlios.de/gpsd/%{name}-%{version}.tar.gz
Source1:        xgps.desktop
Source2:        xgpsspeed.desktop
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: dbus-devel ncurses-devel xmlto python
BuildRequires: openmotif-devel libXaw-devel desktop-file-utils

Requires(post):    /sbin/ldconfig
Requires(postun):  /sbin/ldconfig

%description 
gpsd is a service daemon that mediates access to a GPS sensor
connected to the host computer by serial or USB interface, making its
data on the location/course/velocity of the sensor available to be
queried on TCP port 2947 of the host computer.  With gpsd, multiple
GPS client applications (such as navigational and wardriving software)
can share access to a GPS without contention or loss of data.  Also,
gpsd responds to queries with a format that is substantially easier to
parse than NMEA 0183.  

%package devel
Summary:        Client libraries in C and Python for talking to a running gpsd or GPS
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description devel
This package provides C header files for the gpsd shared libraries
that manage access to a GPS for applications; also Python modules.

%package        clients
Summary:        Clients for gpsd
Group:          Applications/System

%description clients
xgps is a simple test client for gpsd with an X interface. It displays
current GPS position/time/velocity information and (for GPSes that
support the feature) the locations of accessible satellites.

xgpsspeed is a speedometer that uses position information from the GPS.
It accepts an -h option and optional argument as for gps, or a -v option
to dump the package version and exit. Additionally, it accepts -rv
(reverse video) and -nc (needle color) options.

cgps resembles xgps, but without the pictorial satellite display.  It
can run on a serial terminal or terminal emulator.

%prep
%setup -q

%build
%configure --enable-tnt --enable-dbus --disable-static
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}

%makeinstall
# additional gpsd files
mkdir -p %{buildroot}%{_libdir}/X11/app-defaults/
cp xgps.ad %{buildroot}%{_libdir}/X11/app-defaults/xgps
cp xgpsspeed.ad %{buildroot}%{_libdir}/X11/app-defaults/xgpsspeed
mkdir -p %{buildroot}%{_sysconfdir}/hotplug/usb
cp gpsd.hotplug gpsd.usermap %{buildroot}%{_sysconfdir}/hotplug/usb/
# additional gpsd-devel files
mkdir -p %{buildroot}%{_datadir}/gpsd
PYVERSION=`python -c "import sys; print sys.version[:3]"`
mkdir -p %{buildroot}%{_libdir}/python${PYVERSION}/site-packages
cp gps.py gpsfake.py %{buildroot}%{_libdir}/python${PYVERSION}/site-packages

#remove nasty little .la files
rm -f %{buildroot}%{_libdir}/libgps.la

#Install the .desktop files
desktop-file-install --vendor fedora                        \
    --dir %{buildroot}%{_datadir}/applications              \
    --add-category X-Fedora                                 \
    %{SOURCE1}
desktop-file-install --vendor fedora                        \
    --dir %{buildroot}%{_datadir}/applications              \
    --add-category X-Fedora                                 \
    %{SOURCE2}

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc README INSTALL COPYING
%{_sbindir}/gpsd
%{_bindir}/gpsprof
%{_bindir}/sirfmon
%{_libdir}/libgps.so.*
%{_mandir}/man8/gpsd.8*
%{_mandir}/man1/gpsprof.1*
%{_mandir}/man1/sirfmon.1*
%{_sysconfdir}/hotplug/usb/gpsd.hotplug
%{_sysconfdir}/hotplug/usb/gpsd.usermap
%{_libdir}/python*/site-packages/gps.py*

%files devel
%defattr(-,root,root,-)
%doc HACKING TODO
%{_bindir}/gpsfake
%{_bindir}/rtcmdecode
%{_bindir}/gpsflash
%{_libdir}/python*/site-packages/gpsfake.py*
%{_libdir}/libgps.so
%{_includedir}/gps.h
%{_includedir}/libgpsmm.h
%{_includedir}/gpsd.h
%{_mandir}/man1/gpsfake.1*
%{_mandir}/man1/rtcmdecode.1*
%{_mandir}/man1/gpsflash.1*
%{_mandir}/man3/libgps.3*
%{_mandir}/man3/libgpsmm.3*
%{_mandir}/man3/libgpsd.3*
%{_mandir}/man5/rtcm-104.5*
%{_mandir}/man5/srec.5*

%files clients
%defattr(-,root,root,-)
%{_bindir}/xgps
%{_bindir}/xgpsspeed
%{_bindir}/cgps
%{_bindir}/gpspipe
%{_bindir}/gpxlogger
%{_bindir}/cgpxlogger
%{_mandir}/man1/gps.1*
%{_mandir}/man1/gpspipe.1*
%{_libdir}/X11/app-defaults/xgps
%{_libdir}/X11/app-defaults/xgpsspeed
%{_datadir}/applications/*.desktop

%changelog
* Sun Apr 9 2006 Matthew Truch <matt at truch.net> - 2.32-3
- Include xmlto and python in buildrequires so things build right.
- Don't package static library file.  

* Wed Apr 5 2006 Matthew Truch <matt at truch.net> - 2.32-2
- Use ye olde %%{?dist} tag.

* Wed Apr 5 2006 Matthew Truch <matt at truch.net> - 2.32-1
- Initial Fedora Extras specfile


--- NEW FILE xgps.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=xgps
GenericName=GPS information
Comment=Display GPS information from a gpsd daemon
Exec=xgps
Icon=icon-globe.png
Terminal=false
Type=Application
Categories=Application;Graphics;
Version=2.32


--- NEW FILE xgpsspeed.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=xgpsspeed
GenericName=GPS speedometer
Comment=Display GPS speed from a gpsd daemon
Exec=xgpsspeed
Icon=icon-globe.png
Terminal=false
Type=Application
Categories=Application;Graphics;
Version=2.32



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gpsd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Apr 2006 01:08:59 -0000	1.1
+++ .cvsignore	13 Apr 2006 01:09:39 -0000	1.2
@@ -0,0 +1 @@
+gpsd-2.32.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gpsd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Apr 2006 01:08:59 -0000	1.1
+++ sources	13 Apr 2006 01:09:39 -0000	1.2
@@ -0,0 +1 @@
+4bb9b0c1642d36265c807a04da3d6f60  gpsd-2.32.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 13 01:18:16 2006
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Wed, 12 Apr 2006 18:18:16 -0700
Subject: owners owners.list,1.837,1.838
Message-ID: <200604130118.k3D1IIKO007242@cvs-int.fedora.redhat.com>

Author: mtruch

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7217

Modified Files:
	owners.list 
Log Message:
Add gpsd to owners list



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.837
retrieving revision 1.838
diff -u -r1.837 -r1.838
--- owners.list	11 Apr 2006 17:29:15 -0000	1.837
+++ owners.list	13 Apr 2006 01:18:16 -0000	1.838
@@ -394,6 +394,7 @@
 Fedora Extras|gpgme|GnuPG Made Easy|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|gpp|Gnome Photo Printer|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|
 Fedora Extras|gpredict|Real-time satellite tracking and orbit prediction program|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
+Fedora Extras|gpsd|Service daemon for mediating access to a GPS|matt at truch.net|extras-qa at fedoraproject.org|
 Fedora Extras|gpsim|A simulator for Microchip (TM) PIC (TM) microcontrollers|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
 Fedora Extras|gputils|Development utilities for Microchip (TM) PIC (TM) microcontrollers|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
 Fedora Extras|gquilt|A PyGTK wrapper for quilt|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Apr 13 02:49:44 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 12 Apr 2006 19:49:44 -0700
Subject: rpms/deskbar-applet/FC-3 deskbar-applet.spec,1.4,1.5
Message-ID: <200604130249.k3D2nk1q009501@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/deskbar-applet/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9484

Modified Files:
	deskbar-applet.spec 
Log Message:
Prepare for rebuild


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/FC-3/deskbar-applet.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- deskbar-applet.spec	5 Dec 2005 17:17:32 -0000	1.4
+++ deskbar-applet.spec	13 Apr 2006 02:49:43 -0000	1.5
@@ -43,7 +43,7 @@
 %{_libdir}/bonobo/servers/DeskbarApplet.server
 
 %changelog
-* Mon Dec  5 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.2-4
+* Wed Apr 12 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.2-4
 - Updated Source0 URL (#161670)
 
 * Sat Mar 19 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.2-3



From fedora-extras-commits at redhat.com  Thu Apr 13 02:51:04 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 12 Apr 2006 19:51:04 -0700
Subject: rpms/deskbar-applet/FC-3 deskbar-applet.spec,1.5,1.6
Message-ID: <200604130251.k3D2p6gW009559@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/deskbar-applet/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9542

Modified Files:
	deskbar-applet.spec 
Log Message:
*sigh*


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/FC-3/deskbar-applet.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- deskbar-applet.spec	13 Apr 2006 02:49:43 -0000	1.5
+++ deskbar-applet.spec	13 Apr 2006 02:51:04 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           deskbar-applet
 Version:        0.2
-Release:        4
+Release:        4%{?dist}
 Summary:        A Gnome applet to allow easy access to various search engines
 Group:          Applications/Internet
 License:        GPL



From fedora-extras-commits at redhat.com  Thu Apr 13 06:42:27 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Wed, 12 Apr 2006 23:42:27 -0700
Subject: rpms/xmms-cdread/FC-4 xmms-cdread.spec,1.9,1.10
Message-ID: <200604130642.k3D6gT8T019888@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/xmms-cdread/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19871

Modified Files:
	xmms-cdread.spec 
Log Message:
revert back to Requires xmms


Index: xmms-cdread.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-cdread/FC-4/xmms-cdread.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xmms-cdread.spec	12 Apr 2006 20:03:10 -0000	1.9
+++ xmms-cdread.spec	13 Apr 2006 06:42:27 -0000	1.10
@@ -3,14 +3,14 @@
 Summary:	Digital audio CD input plugin for XMMS
 Name:		xmms-cdread
 Version:	0.14
-Release:        10%{?dist}
+Release:        11%{?dist}
 License:	GPL
 Group:		Applications/Multimedia
 URL:		http://www.xmms.org/
 Source:		ftp://ftp.stack.nl/pub/users/willem/xmms-cdread-0.14a.tar.gz
 Patch1:		xmms-cdread-shuffle.patch
 Patch2:		xmms-cdread-x86_64.patch
-Requires:	xmms-libs
+Requires:	xmms
 BuildRequires:	gtk+-devel glib-devel xmms-devel
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -47,6 +47,9 @@
 %exclude %{xmmsinputdir}/libcdread.la
 
 %changelog
+* Thu Apr 13 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.14-11
+- revert to Requires xmms
+
 * Sat Apr  8 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.14-10
 - changed Requires xmms -> xmms-libs
 



From fedora-extras-commits at redhat.com  Thu Apr 13 07:56:50 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 13 Apr 2006 00:56:50 -0700
Subject: rpms/cernlib/devel cernlib.spec,1.24,1.25
Message-ID: <200604130756.k3D7uqP7022334@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22317

Modified Files:
	cernlib.spec 
Log Message:
dont apply rceta patch, allready done in patchy-unpack-rceta


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- cernlib.spec	12 Apr 2006 17:42:16 -0000	1.24
+++ cernlib.spec	13 Apr 2006 07:56:50 -0000	1.25
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       16%{?dist}
+Release:       16%{?dist}.1
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -215,6 +215,8 @@
 Patch1207: cernlib-v107z0_X_before_string.diff
 
 # patchy 4
+# not applied as it has allready been done by the sed one-liner in 
+# patchy-unpack-rceta
 Patch1500: patchy-rceta.patch
 Patch1501: patchy-insecure_tmp_use.diff
 Patch1502: patchy-fcasplit.patch
@@ -349,7 +351,8 @@
 # patch patchy 4 installer fortran generator script
 # avtually it is unusefull, because the unpacking has been done
 # offline, see comment above.
-%patch -P 1500
+#%patch -P 1500
+
 %patch -P 1501
 
 # unpack the patchy version 4 sources is done offline,
@@ -827,7 +830,7 @@
 
 
 %changelog
-* Wed Apr 12 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-16
+* Wed Apr 12 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-16.1
 - unpack patchy offline because the files are within an unformatted
   fortran file which won't be right on all the arches.
 



From fedora-extras-commits at redhat.com  Thu Apr 13 08:55:20 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 13 Apr 2006 01:55:20 -0700
Subject: rpms/plone/devel .cvsignore, 1.8, 1.9 plone.spec, 1.12, 1.13 sources,
	1.8, 1.9
Message-ID: <200604130855.k3D8tMwk024598@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/plone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24540/devel

Modified Files:
	.cvsignore plone.spec sources 
Log Message:
fix bug 188886 (CVE-2006-1711)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plone/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	21 Feb 2006 23:58:31 -0000	1.8
+++ .cvsignore	13 Apr 2006 08:55:20 -0000	1.9
@@ -1 +1,2 @@
 Plone-2.1.2.tar.gz
+PloneHotfix20060410.tar.gz


Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/devel/plone.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- plone.spec	21 Feb 2006 23:58:31 -0000	1.12
+++ plone.spec	13 Apr 2006 08:55:20 -0000	1.13
@@ -6,12 +6,13 @@
 
 Name:           plone
 Version:        2.1.2
-Release:        1%{?dist}
+Release:        2%{?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.1.2.tar.gz
+Source1:        http://plone.org/products/plonehotfix20060410/releases/1.0/PloneHotfix20060410.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,7 +26,7 @@
 products.
 
 %prep
-%setup -q -n Plone-%{version}
+%setup -q -n Plone-%{version} -a 1
 # Clean up sources
 find . -type d -name CVS | xargs rm -rf
 find . -type f -name .cvsignore | xargs rm -rf
@@ -47,6 +48,12 @@
 rm -rf $RPM_BUILD_ROOT
 
 
+%post
+if [ "$1" -ge "2" ]; then # upgrade
+    /sbin/service zope condrestart >/dev/null 2>&1
+fi
+
+
 %files
 %defattr(644,root,root,755)
 %doc README.txt CONTENTS.txt
@@ -54,6 +61,12 @@
 
 
 %changelog
+* Thu Apr 13 2006 Aurelien Bompard <gauret[AT]free.fr> 2.1.2-2
+- apply Plone Hotfix 2006-04-10 to fix CVE-2006-1711
+- restart Zope on upgrade (will migrate it to %%postun for the
+  next release, but we need to make sure zope is restarted for
+  this one (security)
+
 * Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 2.1.2-1
 - version 2.1.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plone/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	21 Feb 2006 23:58:31 -0000	1.8
+++ sources	13 Apr 2006 08:55:20 -0000	1.9
@@ -1 +1,2 @@
 863311e29550f9b4bf6c2502fdbed1fa  Plone-2.1.2.tar.gz
+fecdb36acae4751f6a8975c2068247c3  PloneHotfix20060410.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 13 08:55:14 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 13 Apr 2006 01:55:14 -0700
Subject: rpms/plone/FC-4 .cvsignore, 1.6, 1.7 plone.spec, 1.10, 1.11 sources,
	1.6, 1.7
Message-ID: <200604130855.k3D8tkWb024607@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/plone/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24540/FC-4

Modified Files:
	.cvsignore plone.spec sources 
Log Message:
fix bug 188886 (CVE-2006-1711)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 Sep 2005 21:38:54 -0000	1.6
+++ .cvsignore	13 Apr 2006 08:55:13 -0000	1.7
@@ -1 +1,2 @@
-Plone-2.1.tar.gz
+Plone-2.1.2.tar.gz
+PloneHotfix20060410.tar.gz


Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-4/plone.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- plone.spec	8 Sep 2005 21:38:54 -0000	1.10
+++ plone.spec	13 Apr 2006 08:55:13 -0000	1.11
@@ -1,17 +1,18 @@
 %define python_minver 2.3.4
-%define zope_minver 2.7.0
+%define zope_minver 2.7.8
 
 %define zope_home      %{_libdir}/zope
 %define software_home  %{zope_home}/lib/python
 
 Name:           plone
-Version:        2.1
-Release:        1%{?dist}
+Version:        2.1.2
+Release:        2%{?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.1.tar.gz
+Source0:        http://dl.sf.net/plone/Plone-2.1.2.tar.gz
+Source1:        http://plone.org/products/plonehotfix20060410/releases/1.0/PloneHotfix20060410.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,7 +26,7 @@
 products.
 
 %prep
-%setup -q -n Plone-%{version}
+%setup -q -n Plone-%{version} -a 1
 # Clean up sources
 find . -type d -name CVS | xargs rm -rf
 find . -type f -name .cvsignore | xargs rm -rf
@@ -47,6 +48,12 @@
 rm -rf $RPM_BUILD_ROOT
 
 
+%post
+if [ "$1" -ge "2" ]; then # upgrade
+    /sbin/service zope condrestart >/dev/null 2>&1
+fi
+
+
 %files
 %defattr(644,root,root,755)
 %doc README.txt CONTENTS.txt
@@ -54,6 +61,18 @@
 
 
 %changelog
+* Thu Apr 13 2006 Aurelien Bompard <gauret[AT]free.fr> 2.1.2-2
+- apply Plone Hotfix 2006-04-10 to fix CVE-2006-1711
+- restart Zope on upgrade (will migrate it to %%postun for the
+  next release, but we need to make sure zope is restarted for
+  this one (security)
+
+* Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 2.1.2-1
+- version 2.1.2
+
+* Sat Oct 22 2005 Aurelien Bompard <gauret[AT]free.fr> 2.1.1-1
+- version 2.1.1
+
 * Thu Sep 08 2005 Aurelien Bompard <gauret[AT]free.fr> 2.1-1
 - version 2.1 final
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	8 Sep 2005 21:38:54 -0000	1.6
+++ sources	13 Apr 2006 08:55:13 -0000	1.7
@@ -1 +1,2 @@
-a72efb9aace662ac8f81f3f66ad7c44c  Plone-2.1.tar.gz
+863311e29550f9b4bf6c2502fdbed1fa  Plone-2.1.2.tar.gz
+fecdb36acae4751f6a8975c2068247c3  PloneHotfix20060410.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 13 08:55:14 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 13 Apr 2006 01:55:14 -0700
Subject: rpms/plone/FC-5 .cvsignore, 1.8, 1.9 plone.spec, 1.12, 1.13 sources,
	1.8, 1.9
Message-ID: <200604130855.k3D8tk7p024612@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/plone/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24540/FC-5

Modified Files:
	.cvsignore plone.spec sources 
Log Message:
fix bug 188886 (CVE-2006-1711)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	21 Feb 2006 23:58:31 -0000	1.8
+++ .cvsignore	13 Apr 2006 08:55:14 -0000	1.9
@@ -1 +1,2 @@
 Plone-2.1.2.tar.gz
+PloneHotfix20060410.tar.gz


Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-5/plone.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- plone.spec	21 Feb 2006 23:58:31 -0000	1.12
+++ plone.spec	13 Apr 2006 08:55:14 -0000	1.13
@@ -6,12 +6,13 @@
 
 Name:           plone
 Version:        2.1.2
-Release:        1%{?dist}
+Release:        2%{?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.1.2.tar.gz
+Source1:        http://plone.org/products/plonehotfix20060410/releases/1.0/PloneHotfix20060410.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,7 +26,7 @@
 products.
 
 %prep
-%setup -q -n Plone-%{version}
+%setup -q -n Plone-%{version} -a 1
 # Clean up sources
 find . -type d -name CVS | xargs rm -rf
 find . -type f -name .cvsignore | xargs rm -rf
@@ -47,6 +48,12 @@
 rm -rf $RPM_BUILD_ROOT
 
 
+%post
+if [ "$1" -ge "2" ]; then # upgrade
+    /sbin/service zope condrestart >/dev/null 2>&1
+fi
+
+
 %files
 %defattr(644,root,root,755)
 %doc README.txt CONTENTS.txt
@@ -54,6 +61,12 @@
 
 
 %changelog
+* Thu Apr 13 2006 Aurelien Bompard <gauret[AT]free.fr> 2.1.2-2
+- apply Plone Hotfix 2006-04-10 to fix CVE-2006-1711
+- restart Zope on upgrade (will migrate it to %%postun for the
+  next release, but we need to make sure zope is restarted for
+  this one (security)
+
 * Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 2.1.2-1
 - version 2.1.2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	21 Feb 2006 23:58:31 -0000	1.8
+++ sources	13 Apr 2006 08:55:14 -0000	1.9
@@ -1 +1,2 @@
 863311e29550f9b4bf6c2502fdbed1fa  Plone-2.1.2.tar.gz
+fecdb36acae4751f6a8975c2068247c3  PloneHotfix20060410.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 13 09:14:14 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 13 Apr 2006 02:14:14 -0700
Subject: rpms/php-json/devel .cvsignore, 1.3, 1.4 php-json.html, 1.2,
	1.3 php-json.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200604130914.k3D9EGaA026858@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/php-json/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26835

Modified Files:
	.cvsignore php-json.html php-json.spec sources 
Log Message:
- Upstream update
- Added Requires on php-api (#186903)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-json/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	14 Feb 2006 05:03:16 -0000	1.3
+++ .cvsignore	13 Apr 2006 09:14:14 -0000	1.4
@@ -1 +1 @@
-php-json-ext-1.1.1.tar.bz2
+php-json-ext-1.2.1.tar.bz2


Index: php-json.html
===================================================================
RCS file: /cvs/extras/rpms/php-json/devel/php-json.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- php-json.html	14 Feb 2006 05:03:16 -0000	1.2
+++ php-json.html	13 Apr 2006 09:14:14 -0000	1.3
@@ -28,8 +28,10 @@
 	<td valign="top" class="full_width">
 	<!-- START CONTENT -->
 	<h1>php-json</h1>
-        <p><b>php-json</b> is an extremely fast PHP C extension for <a href="http://www.json.org/">JSON</a> (JavaScript Object Notation) serialisation. <b>php-json</b> uses a forked version of <a href="http://oss.metaparadigm.com/json-c/">json-c</a>.</p>
+        <p><b>php-json</b> is an extremely fast PHP C extension for <a href="http://www.json.org/">JSON</a> (JavaScript Object Notation) serialisation.</p>
         <h2>Download</h2>
+        <p>Version <a href="/projects/php-json/php-json-ext-1.2.1.tar.bz2">1.2.1</a> (<a href="/projects/php-json/php-json-4.3.2_1.2.1-1.aurore.src.rpm">SRPM</a>, <a href="http://pecl4win.php.net/ext.php/php_json.dll">Win32</a>) - Released 2006-04-01 - Rework comma insertion during encoding.</p>
+        <p>Version <a href="/projects/php-json/php-json-ext-1.2.0.tar.bz2">1.2.0</a> (<a href="/projects/php-json/php-json-4.3.2_1.2.0-1.aurore.src.rpm">SRPM</a>, <a href="http://pecl4win.php.net/ext.php/php_json.dll">Win32</a>) - Released 2006-03-14 - Complete rewrite using <a href="http://www.json.org/JSON_checker/">JSON_checker</a> as the base for the parser. Implements the <a href="http://www.ietf.org/internet-drafts/draft-crockford-jsonorg-json-04.txt">JSON specification</a>. Significant performance improvement on encoding.</p>
         <p>Version <a href="/projects/php-json/php-json-ext-1.1.1.tar.bz2">1.1.1</a> (<a href="/projects/php-json/php-json-4.3.2_1.1.1-1.aurore.src.rpm">SRPM</a>, <a href="win32/">Win32</a>) - Released 2006-01-25 - TSRM performance improvements, changed license to version 3.01 of the PHP license, avoid a potential memory leak on invalid JSON input.</p>
         <p>Version <a href="/projects/php-json/php-json-ext-1.1.0.tar.bz2">1.1.0</a> (<a href="/projects/php-json/php-json-4.3.2_1.1.0-1.aurore.src.rpm">SRPM</a>, <b>Win32</b>: <a href="/projects/php-json/php_json-1.1.0_php-4.x.zip">PHP 4.x</a>, <a href="/projects/php-json/php_json-1.1.0_php-5.0.x.zip">PHP 5.0.x</a>, <a href="/projects/php-json/php_json-1.1.0_php-5.1.x.zip">PHP 5.1.x</a>) - Released 2005-12-04 - Port to Win32.</p>
         <p>Version <a href="/projects/php-json/php-json-ext-1.0.8.tar.bz2">1.0.8</a> (<a href="/projects/php-json/php-json-4.3.2_1.0.8-1.aurore.src.rpm">SRPM</a>) - Released 2005-12-01 - Changed license to LGPL, modified build system to allow static compilation into PHP, added strndup check for json-c.</p>


Index: php-json.spec
===================================================================
RCS file: /cvs/extras/rpms/php-json/devel/php-json.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- php-json.spec	14 Feb 2006 05:03:16 -0000	1.4
+++ php-json.spec	13 Apr 2006 09:14:14 -0000	1.5
@@ -1,8 +1,9 @@
 %define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4)
 %{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo 4.3.11)}
+%define php_apiver %({ phpize --version || echo "PHP Api Version: 0" ; } | grep -i "php api" | sed 's/[^0-9]//g')
 
 Name:           php-json
-Version:        1.1.1
+Version:        1.2.1
 Release:        1%{?dist}
 Summary:        An extremely fast PHP extension for JSON
 
@@ -14,7 +15,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  php-devel
-Requires:       php = %{php_version}
+Requires:       php-api = %{php_apiver}
 
 %description
 php-json is an extremely fast PHP C extension for JSON (JavaScript Object
@@ -63,6 +64,10 @@
 %{php_extdir}/json.so
 
 %changelog
+* Thu Apr 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.1-1
+- Upstream update
+- Added Requires on php-api (#186903)
+
 * Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.1.1-1
 - Upstream update
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-json/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	14 Feb 2006 05:03:16 -0000	1.3
+++ sources	13 Apr 2006 09:14:14 -0000	1.4
@@ -1 +1 @@
-d884a5ca7ddb420b5b261941217f6c68  php-json-ext-1.1.1.tar.bz2
+e06e701412a055f3372775216ec3d604  php-json-ext-1.2.1.tar.bz2



From fedora-extras-commits at redhat.com  Thu Apr 13 09:17:32 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 13 Apr 2006 02:17:32 -0700
Subject: rpms/php-json/FC-5 php-json.spec,1.4,1.5
Message-ID: <200604130917.k3D9HYfM026926@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/php-json/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26909

Modified Files:
	php-json.spec 
Log Message:
Added Requires on php-api (#186903)


Index: php-json.spec
===================================================================
RCS file: /cvs/extras/rpms/php-json/FC-5/php-json.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- php-json.spec	14 Feb 2006 05:03:16 -0000	1.4
+++ php-json.spec	13 Apr 2006 09:17:32 -0000	1.5
@@ -1,9 +1,10 @@
 %define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4)
 %{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo 4.3.11)}
+%define php_apiver %({ phpize --version || echo "PHP Api Version: 0" ; } | grep -i "php api" | sed 's/[^0-9]//g')
 
 Name:           php-json
 Version:        1.1.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An extremely fast PHP extension for JSON
 
 Group:          Development/Languages
@@ -14,7 +15,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  php-devel
-Requires:       php = %{php_version}
+Requires:       php-api = %{php_apiver}
 
 %description
 php-json is an extremely fast PHP C extension for JSON (JavaScript Object
@@ -63,6 +64,9 @@
 %{php_extdir}/json.so
 
 %changelog
+* Thu Apr 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.1.1-2
+- Added Requires on php-api (#186903)
+
 * Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.1.1-1
 - Upstream update
 



From fedora-extras-commits at redhat.com  Thu Apr 13 09:45:48 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Thu, 13 Apr 2006 02:45:48 -0700
Subject: kadischi/doc COPYING, 1.1, NONE CREDITS, 1.2, NONE FAQ, 1.3,
	NONE INSTALL, 1.5, NONE Makefile.am, 1.2, NONE NEWS, 1.1.1.1,
	NONE README, 1.8, NONE TODO, 1.5, NONE
Message-ID: <200604130945.k3D9jmfM027074@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi/doc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27038/kadischi/doc

Removed Files:
	COPYING CREDITS FAQ INSTALL Makefile.am NEWS README TODO 
Log Message:
Juggle doc/ files into base kadischi directory


--- COPYING DELETED ---


--- CREDITS DELETED ---


--- FAQ DELETED ---


--- INSTALL DELETED ---


--- Makefile.am DELETED ---


--- NEWS DELETED ---


--- README DELETED ---


--- TODO DELETED ---



From fedora-extras-commits at redhat.com  Thu Apr 13 09:45:47 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Thu, 13 Apr 2006 02:45:47 -0700
Subject: kadischi COPYING, NONE, 1.1 CREDITS, NONE, 1.1 FAQ, NONE,
	1.1 INSTALL, NONE, 1.1 NEWS, NONE, 1.1 README, NONE, 1.1 TODO,
	NONE, 1.1 Makefile.am, 1.3, 1.4 configure.ac, 1.4,
	1.5 kadischi.spec, 1.3, 1.4
Message-ID: <200604130945.k3D9jlUX027070@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27038/kadischi

Modified Files:
	Makefile.am configure.ac kadischi.spec 
Added Files:
	COPYING CREDITS FAQ INSTALL NEWS README TODO 
Log Message:
Juggle doc/ files into base kadischi directory


--- NEW FILE COPYING ---
		    GNU GENERAL PUBLIC LICENSE
		       Version 2, June 1991

 Copyright (C) 1989, 1991 Free Software Foundation, Inc.
 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

			    Preamble

  The licenses for most software are designed to take away your
freedom to share and change it.  By contrast, the GNU General Public
License is intended to guarantee your freedom to share and change free
software--to make sure the software is free for all its users.  This
General Public License applies to most of the Free Software
Foundation's software and to any other program whose authors commit to
using it.  (Some other Free Software Foundation software is covered by
the GNU Library General Public License instead.)  You can apply it to
your programs, too.

  When we speak of free software, we are referring to freedom, not
price.  Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
this service if you wish), that you receive source code or can get it
if you want it, that you can change the software or use pieces of it
in new free programs; and that you know you can do these things.

  To protect your rights, we need to make restrictions that forbid
anyone to deny you these rights or to ask you to surrender the rights.
These restrictions translate to certain responsibilities for you if you
distribute copies of the software, or if you modify it.

  For example, if you distribute copies of such a program, whether
gratis or for a fee, you must give the recipients all the rights that
you have.  You must make sure that they, too, receive or can get the
source code.  And you must show them these terms so they know their
rights.

  We protect your rights with two steps: (1) copyright the software, and
(2) offer you this license which gives you legal permission to copy,
distribute and/or modify the software.

  Also, for each author's protection and ours, we want to make certain
that everyone understands that there is no warranty for this free
software.  If the software is modified by someone else and passed on, we
want its recipients to know that what they have is not the original, so
that any problems introduced by others will not reflect on the original
authors' reputations.

  Finally, any free program is threatened constantly by software
patents.  We wish to avoid the danger that redistributors of a free
program will individually obtain patent licenses, in effect making the
program proprietary.  To prevent this, we have made it clear that any
patent must be licensed for everyone's free use or not licensed at all.

  The precise terms and conditions for copying, distribution and
modification follow.

		    GNU GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License applies to any program or other work which contains
a notice placed by the copyright holder saying it may be distributed
under the terms of this General Public License.  The "Program", below,
refers to any such program or work, and a "work based on the Program"
means either the Program or any derivative work under copyright law:
that is to say, a work containing the Program or a portion of it,
either verbatim or with modifications and/or translated into another
language.  (Hereinafter, translation is included without limitation in
the term "modification".)  Each licensee is addressed as "you".

Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope.  The act of
running the Program is not restricted, and the output from the Program
is covered only if its contents constitute a work based on the
Program (independent of having been made by running the Program).
Whether that is true depends on what the Program does.

  1. You may copy and distribute verbatim copies of the Program's
source code as you receive it, in any medium, provided that you
conspicuously and appropriately publish on each copy an appropriate
copyright notice and disclaimer of warranty; keep intact all the
notices that refer to this License and to the absence of any warranty;
and give any other recipients of the Program a copy of this License
along with the Program.

You may charge a fee for the physical act of transferring a copy, and
you may at your option offer warranty protection in exchange for a fee.

  2. You may modify your copy or copies of the Program or any portion
of it, thus forming a work based on the Program, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:

    a) You must cause the modified files to carry prominent notices
    stating that you changed the files and the date of any change.

    b) You must cause any work that you distribute or publish, that in
    whole or in part contains or is derived from the Program or any
    part thereof, to be licensed as a whole at no charge to all third
    parties under the terms of this License.

    c) If the modified program normally reads commands interactively
    when run, you must cause it, when started running for such
    interactive use in the most ordinary way, to print or display an
    announcement including an appropriate copyright notice and a
    notice that there is no warranty (or else, saying that you provide
    a warranty) and that users may redistribute the program under
    these conditions, and telling the user how to view a copy of this
    License.  (Exception: if the Program itself is interactive but
    does not normally print such an announcement, your work based on
    the Program is not required to print an announcement.)

These requirements apply to the modified work as a whole.  If
identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works.  But when you
distribute the same sections as part of a whole which is a work based
on the Program, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote it.

Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Program.

In addition, mere aggregation of another work not based on the Program
with the Program (or with a work based on the Program) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.

  3. You may copy and distribute the Program (or a work based on it,
under Section 2) in object code or executable form under the terms of
Sections 1 and 2 above provided that you also do one of the following:

    a) Accompany it with the complete corresponding machine-readable
    source code, which must be distributed under the terms of Sections
    1 and 2 above on a medium customarily used for software interchange; or,

    b) Accompany it with a written offer, valid for at least three
    years, to give any third party, for a charge no more than your
    cost of physically performing source distribution, a complete
    machine-readable copy of the corresponding source code, to be
    distributed under the terms of Sections 1 and 2 above on a medium
    customarily used for software interchange; or,

    c) Accompany it with the information you received as to the offer
    to distribute corresponding source code.  (This alternative is
    allowed only for noncommercial distribution and only if you
    received the program in object code or executable form with such
    an offer, in accord with Subsection b above.)

The source code for a work means the preferred form of the work for
making modifications to it.  For an executable work, complete source
code means all the source code for all modules it contains, plus any
associated interface definition files, plus the scripts used to
control compilation and installation of the executable.  However, as a
special exception, the source code distributed need not include
anything that is normally distributed (in either source or binary
form) with the major components (compiler, kernel, and so on) of the
operating system on which the executable runs, unless that component
itself accompanies the executable.

If distribution of executable or object code is made by offering
access to copy from a designated place, then offering equivalent
access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not
compelled to copy the source along with the object code.

  4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License.  Any attempt
otherwise to copy, modify, sublicense or distribute the Program is
void, and will automatically terminate your rights under this License.
However, parties who have received copies, or rights, from you under
this License will not have their licenses terminated so long as such
parties remain in full compliance.

  5. You are not required to accept this License, since you have not
signed it.  However, nothing else grants you permission to modify or
distribute the Program or its derivative works.  These actions are
prohibited by law if you do not accept this License.  Therefore, by
modifying or distributing the Program (or any work based on the
Program), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Program or works based on it.

  6. Each time you redistribute the Program (or any work based on the
Program), the recipient automatically receives a license from the
original licensor to copy, distribute or modify the Program subject to
these terms and conditions.  You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties to
this License.

  7. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License.  If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Program at all.  For example, if a patent
license would not permit royalty-free redistribution of the Program by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Program.

If any portion of this section is held invalid or unenforceable under
any particular circumstance, the balance of the section is intended to
apply and the section as a whole is intended to apply in other
circumstances.

It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system, which is
implemented by public license practices.  Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.

This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.

  8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License
may add an explicit geographical distribution limitation excluding
those countries, so that distribution is permitted only in or among
countries not thus excluded.  In such case, this License incorporates
the limitation as if written in the body of this License.

  9. The Free Software Foundation may publish revised and/or new versions
of the General Public License from time to time.  Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.

Each version is given a distinguishing version number.  If the Program
specifies a version number of this License which applies to it and "any
later version", you have the option of following the terms and conditions
either of that version or of any later version published by the Free
Software Foundation.  If the Program does not specify a version number of
this License, you may choose any version ever published by the Free Software
Foundation.

  10. If you wish to incorporate parts of the Program into other free
programs whose distribution conditions are different, write to the author
to ask for permission.  For software which is copyrighted by the Free
Software Foundation, write to the Free Software Foundation; we sometimes
make exceptions for this.  Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.

			    NO WARRANTY

  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
REPAIR OR CORRECTION.

  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.

		     END OF TERMS AND CONDITIONS

	    How to Apply These Terms to Your New Programs

  If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.

  To do so, attach the following notices to the program.  It is safest
to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.

    <one line to give the program's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>

    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2 of the License, or
    (at your option) any later version.

    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA


Also add information on how to contact you by electronic and paper mail.

If the program is interactive, make it output a short notice like this
when it starts in an interactive mode:

    Gnomovision version 69, Copyright (C) year name of author
    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
    This is free software, and you are welcome to redistribute it
    under certain conditions; type `show c' for details.

The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License.  Of course, the commands you use may
be called something other than `show w' and `show c'; they could even be
mouse-clicks or menu items--whatever suits your program.

You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the program, if
necessary.  Here is a sample; alter the names:

  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
  `Gnomovision' (which makes passes at compilers) written by James Hacker.

  <signature of Ty Coon>, 1 April 1989
  Ty Coon, President of Vice

This General Public License does not permit incorporating your program into
proprietary programs.  If your program is a subroutine library, you may
consider it more useful to permit linking proprietary applications with the
library.  If this is what you want to do, use the GNU Library General
Public License instead of this License.


--- NEW FILE CREDITS ---
Kadischi is heavily based on readonly-root
(http://people.redhat.com/dmalcolm/stateless/SRPMS/readonly-root-0.10-1.src.rpm)
package from Stateless-linux (http://fedora.redhat.com/projects/stateless/) project.

Many design decisions are collective work of people from fedora-livecd list
(https://www.redhat.com/mailman/listinfo/fedora-livecd-list/).

There are also some ideas taken from linux4all project (www.linux4all.de).

The name for the project came from Elliot Lee (sopwith at redhat.com).

Darko Ilic (darko.ilic at gmail.com) was the previous project maintainer. Now the Kadischi
Project is maintained by the community.

Since the project was started as one of the Google`s Summer of Code projects,
some credits also goes to Google ;)

Since 10 January 2005, the Kadischi Fedora Live CD Project is mainly maintained by
the community . The names of the Contributors are listed here :
(http://fedoraproject.org/wiki/Kadischi/Contributors#contributors)

--- NEW FILE FAQ ---
http://fedoraproject.org/wiki/Kadischi/FAQ

--- NEW FILE INSTALL ---
THESE ARE BASIC INSTRUCTIONS.

IT IS STRONGLY RECOMMENDED TO CONSULT KADISCHI TUTORIAL
(http://fedoraproject.org/wiki/Kadischi/Documentation) BEFORE PERFORMING THE INSTALLATION.

*******************************************************

Go to the Kadischi source directory and type

./autogen.sh
make
make install

patch -b /usr/sbin/anaconda patches/anaconda.patch
patch -b /usr/lib/anaconda/flags.py patches/flags.py.patch

Edit /etc/kadischi/build.conf and set BUILDDIR variable.

*******************************************************

BUILDDIR is a directory that will be used for storing temporary files (temporary
installation will be performed in that directory). You will need
approximately 1.5x size of desired installation available on that device. 3GB
works fine for me.

If you are using other repository than Fedora, you would have to use custom
buildstamp file or to edit the default one (/etc/kadischi/buildstamp).

For more details, check out http://fedoraproject.org/wiki/Kadischi/Documentation

--- NEW FILE NEWS ---


--- NEW FILE README ---
Kadischi : The Fedora Live CD Project

Kadischi is an application for Fedora-based Live CD generation. It takes Fedora
repository as an input and outputs a livecd iso image.

Kadischi is still in the early stage of development, but has basic functionality
and can be run successfully.

Kadischi's home page is http://fedoraproject.org/wiki/Kadischi

Kadischi tutorial can be found here http://fedoraproject.org/wiki/Kadischi/Documentation

--- NEW FILE TODO ---
Fresh TODO list can be found at http://fedoraproject.org/wiki/Kadischi/Schedule

Index: Makefile.am
===================================================================
RCS file: /cvs/devel/kadischi/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.am	30 Mar 2006 05:46:04 -0000	1.3
+++ Makefile.am	13 Apr 2006 09:45:45 -0000	1.4
@@ -2,7 +2,6 @@
 
 SUBDIRS =			\
 	conf		\
-	doc			\
 	find_live_cd	\
 	ks_examples			\
 	lib			\


Index: configure.ac
===================================================================
RCS file: /cvs/devel/kadischi/configure.ac,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- configure.ac	30 Mar 2006 05:46:04 -0000	1.4
+++ configure.ac	13 Apr 2006 09:45:45 -0000	1.5
@@ -48,7 +48,6 @@
 AC_OUTPUT([
 Makefile
 conf/Makefile
-doc/Makefile
 find_live_cd/Makefile
 ks_examples/Makefile
 lib/Makefile


Index: kadischi.spec
===================================================================
RCS file: /cvs/devel/kadischi/kadischi.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kadischi.spec	11 Apr 2006 16:16:26 -0000	1.3
+++ kadischi.spec	13 Apr 2006 09:45:45 -0000	1.4
@@ -45,7 +45,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc
+%doc FAQ README NEWS TODO COPYING CREDITS
 %dir %{_datadir}/%{name}
 %dir %{_sysconfdir}/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/buildstamp



From fedora-extras-commits at redhat.com  Thu Apr 13 09:54:33 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 13 Apr 2006 02:54:33 -0700
Subject: rpms/gnochm/devel gnochm.spec,1.1,1.2
Message-ID: <200604130954.k3D9sZYO027113@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/gnochm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27096

Modified Files:
	gnochm.spec 
Log Message:
* Thu Apr 13 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-3
- Add mimetype to .desktop file (188809)



Index: gnochm.spec
===================================================================
RCS file: /cvs/extras/rpms/gnochm/devel/gnochm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnochm.spec	8 Apr 2006 21:55:34 -0000	1.1
+++ gnochm.spec	13 Apr 2006 09:54:33 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gnochm
 Version:        0.9.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        CHM file viewer
 
 Group:          Applications/Publishing
@@ -19,6 +19,8 @@
 BuildRequires:  scrollkeeper
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 BuildRequires: desktop-file-utils
 
 %description
@@ -46,6 +48,8 @@
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 
+echo "MimeType=application/x-chm" >> $RPM_BUILD_ROOT%{_datadir}/applications/gnochm.desktop
+
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
         --add-category X-Fedora                                 \
@@ -78,6 +82,8 @@
 
 update-mime-database %{_datadir}/mime &> /dev/null || :
 
+update-desktop-database &> /dev/null ||:
+
 %preun
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -91,6 +97,8 @@
 
 update-mime-database %{_datadir}/mime &> /dev/null || :
 
+update-desktop-database &> /dev/null ||:
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README
@@ -109,5 +117,8 @@
 %{_datadir}/pixmaps/gnochm*.png
 
 %changelog
+* Thu Apr 13 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-3
+- Add mimetype to .desktop file (188809)
+
 * Sun Mar 12 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-2
 - Fedora Extras submission, loosely based on Dag.



From fedora-extras-commits at redhat.com  Thu Apr 13 09:56:36 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 13 Apr 2006 02:56:36 -0700
Subject: rpms/gnochm/devel gnochm.spec,1.2,1.3
Message-ID: <200604130956.k3D9uchY027211@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/gnochm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27194

Modified Files:
	gnochm.spec 
Log Message:
bump release


Index: gnochm.spec
===================================================================
RCS file: /cvs/extras/rpms/gnochm/devel/gnochm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnochm.spec	13 Apr 2006 09:54:33 -0000	1.2
+++ gnochm.spec	13 Apr 2006 09:56:36 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gnochm
 Version:        0.9.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        CHM file viewer
 
 Group:          Applications/Publishing
@@ -117,7 +117,7 @@
 %{_datadir}/pixmaps/gnochm*.png
 
 %changelog
-* Thu Apr 13 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-3
+* Thu Apr 13 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-4
 - Add mimetype to .desktop file (188809)
 
 * Sun Mar 12 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-2



From fedora-extras-commits at redhat.com  Thu Apr 13 10:15:11 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 13 Apr 2006 03:15:11 -0700
Subject: rpms/psi/FC-5 psi.spec,1.15,1.16 sources,1.9,1.10
Message-ID: <200604131015.k3DAFDek029410@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/psi/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29358/FC-5

Modified Files:
	psi.spec sources 
Log Message:
update translations


Index: psi.spec
===================================================================
RCS file: /cvs/extras/rpms/psi/FC-5/psi.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- psi.spec	21 Feb 2006 17:57:38 -0000	1.15
+++ psi.spec	13 Apr 2006 10:15:11 -0000	1.16
@@ -3,7 +3,7 @@
 
 Name:       psi
 Version:    0.10
-Release:    3%{?dist}
+Release:    4%{?dist}
 Summary:    Jabber client based on Qt
 License:    GPL
 Group:      Applications/Internet
@@ -165,6 +165,9 @@
 
 
 %changelog
+* Thu Apr 13 2006 Aurelien Bompard <gauret[AT]free.fr> 0.10-4
+- update translations for CS, DE, ET and VI
+
 * Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 0.10-3
 - rebuild for FC5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/psi/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	21 Feb 2006 17:57:38 -0000	1.9
+++ sources	13 Apr 2006 10:15:11 -0000	1.10
@@ -2,4 +2,4 @@
 1b4b3374c676c330c87e2ef0cd9109fa  emoticons-0.10.tar.gz
 a359e33b1f2a8a80066771ebfbf4a916  systemicons-0.9.3.tar.gz
 51386c12abbee7100f092455bfb88bf1  rostericons-0.10.tar.gz
-fcdcddda66b4e52008f832ebedae8053  psi-lang-packs-0.10.tar.gz
+621a521ccd90a1e0272081e1a5ec7620  psi-lang-packs-0.10.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 13 10:15:12 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 13 Apr 2006 03:15:12 -0700
Subject: rpms/psi/devel psi.spec,1.15,1.16 sources,1.9,1.10
Message-ID: <200604131015.k3DAFEng029415@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/psi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29358/devel

Modified Files:
	psi.spec sources 
Log Message:
update translations


Index: psi.spec
===================================================================
RCS file: /cvs/extras/rpms/psi/devel/psi.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- psi.spec	21 Feb 2006 17:57:38 -0000	1.15
+++ psi.spec	13 Apr 2006 10:15:12 -0000	1.16
@@ -3,7 +3,7 @@
 
 Name:       psi
 Version:    0.10
-Release:    3%{?dist}
+Release:    4%{?dist}
 Summary:    Jabber client based on Qt
 License:    GPL
 Group:      Applications/Internet
@@ -165,6 +165,9 @@
 
 
 %changelog
+* Thu Apr 13 2006 Aurelien Bompard <gauret[AT]free.fr> 0.10-4
+- update translations for CS, DE, ET and VI
+
 * Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 0.10-3
 - rebuild for FC5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/psi/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	21 Feb 2006 17:57:38 -0000	1.9
+++ sources	13 Apr 2006 10:15:12 -0000	1.10
@@ -2,4 +2,4 @@
 1b4b3374c676c330c87e2ef0cd9109fa  emoticons-0.10.tar.gz
 a359e33b1f2a8a80066771ebfbf4a916  systemicons-0.9.3.tar.gz
 51386c12abbee7100f092455bfb88bf1  rostericons-0.10.tar.gz
-fcdcddda66b4e52008f832ebedae8053  psi-lang-packs-0.10.tar.gz
+621a521ccd90a1e0272081e1a5ec7620  psi-lang-packs-0.10.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 13 10:15:11 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 13 Apr 2006 03:15:11 -0700
Subject: rpms/psi/FC-4 psi.spec,1.13,1.14 sources,1.7,1.8
Message-ID: <200604131015.k3DAFDYX029407@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/psi/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29358/FC-4

Modified Files:
	psi.spec sources 
Log Message:
update translations


Index: psi.spec
===================================================================
RCS file: /cvs/extras/rpms/psi/FC-4/psi.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- psi.spec	12 Jan 2006 19:03:32 -0000	1.13
+++ psi.spec	13 Apr 2006 10:15:10 -0000	1.14
@@ -3,11 +3,11 @@
 
 Name:       psi
 Version:    0.10
-Release:    1%{?dist}
+Release:    4%{?dist}
 Summary:    Jabber client based on Qt
 License:    GPL
 Group:      Applications/Internet
-URL:        http://psi.affinix.com/
+URL:        http://psi-im.org
 #Source0:    http://people.ex.ac.uk/kismith/psi/psi-0.10-test2.tar.bz2
 Source0:    http://dl.sf.net/psi/psi-0.10.tar.bz2
 Source2:    psi-uicwrapper.sh
@@ -28,12 +28,12 @@
 Requires:    gnupg
 
 # Language packs
-Source10:   psi-lang-packs-0.9.3.tar.gz
+Source10:   psi-lang-packs-0.10.tar.gz
 
 # Iconsets
-Source11:   emoticons-0.9.3.tar.gz
-Source12:   rostericons-0.9.3.tar.gz
-Source13:   systemicons-0.9.3.tar.gz
+Source11:   emoticons-0.10.tar.gz
+Source12:   rostericons-0.10.tar.gz
+#Source13:   systemicons-0.9.3.tar.gz
 
 
 
@@ -113,7 +113,7 @@
 ## Install iconsets
 tar -xzpf %{SOURCE11} -C $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
 tar -xzpf %{SOURCE12} -C $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/roster/
-tar -xzpf %{SOURCE13} -C $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/system/
+#tar -xzpf %{SOURCE13} -C $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/system/
 
 
 # Menu
@@ -165,6 +165,12 @@
 
 
 %changelog
+* Thu Apr 13 2006 Aurelien Bompard <gauret[AT]free.fr> 0.10-4
+- update translations for CS, DE, ET and VI
+
+* Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 0.10-3
+- rebuild for FC5
+
 * Thu Jan 12 2006 Aurelien Bompard <gauret[AT]free.fr> 0.10-1
 - version 0.10 final
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/psi/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	12 Jan 2006 19:03:32 -0000	1.7
+++ sources	13 Apr 2006 10:15:10 -0000	1.8
@@ -1,5 +1,5 @@
 f0fd4ccf077f7b24e236f71c22649b7b  psi-0.10.tar.bz2
-0310084bf278d59831e4cac863e9060e  emoticons-0.9.3.tar.gz
+1b4b3374c676c330c87e2ef0cd9109fa  emoticons-0.10.tar.gz
 a359e33b1f2a8a80066771ebfbf4a916  systemicons-0.9.3.tar.gz
-79ade28d67356a4bdd57c850cc2ed6c8  rostericons-0.9.3.tar.gz
-57864bcb92feda6525cfade29f12c713  psi-lang-packs-0.9.3.tar.gz
+51386c12abbee7100f092455bfb88bf1  rostericons-0.10.tar.gz
+621a521ccd90a1e0272081e1a5ec7620  psi-lang-packs-0.10.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 13 10:55:15 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Thu, 13 Apr 2006 03:55:15 -0700
Subject: rpms/abiword/devel abiword-2.4.4-docbuild.patch, NONE,
	1.1 abiword.spec, 1.34, 1.35 abiword-2.4.2-desktop.patch, 1.1, NONE
Message-ID: <200604131055.k3DAtH8B029632@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/abiword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29610

Modified Files:
	abiword.spec 
Added Files:
	abiword-2.4.4-docbuild.patch 
Removed Files:
	abiword-2.4.2-desktop.patch 
Log Message:
Fix documentation generation, and enable charting support



abiword-2.4.4-docbuild.patch:

--- NEW FILE abiword-2.4.4-docbuild.patch ---
diff -r -u abiword-2.4.4.orig/abiword-docs/make-dbk.sh abiword-2.4.4/abiword-docs/make-dbk.sh
--- abiword-2.4.4.orig/abiword-docs/make-dbk.sh	2006-04-12 23:16:57.000000000 +0200
+++ abiword-2.4.4/abiword-docs/make-dbk.sh	2006-04-12 23:20:18.000000000 +0200
@@ -33,7 +33,7 @@
 		      echo $i
 
 		      # save to docbook, rename to .xml
-		      AbiWord-2.0 --to=dbk $i 2>/dev/null
+		      AbiWord-2.4 --to=dbk $i 2>/dev/null
 		      mv $n.dbk $n.xml
 		done
 
diff -r -u abiword-2.4.4.orig/abiword-docs/make-gnome-html.sh abiword-2.4.4/abiword-docs/make-gnome-html.sh
--- abiword-2.4.4.orig/abiword-docs/make-gnome-html.sh	2006-04-12 23:16:57.000000000 +0200
+++ abiword-2.4.4/abiword-docs/make-gnome-html.sh	2006-04-12 23:20:18.000000000 +0200
@@ -31,7 +31,7 @@
 		do
 		      n=`echo $i|cut -f1 -d .`
 		      echo $i
-		      AbiWord-2.0 --to=html $i 2>/dev/null
+		      AbiWord-2.4 --to=html $i 2>/dev/null
 		done
 
 		cd $CVS
diff -r -u abiword-2.4.4.orig/abiword-docs/make-html.sh abiword-2.4.4/abiword-docs/make-html.sh
--- abiword-2.4.4.orig/abiword-docs/make-html.sh	2006-04-12 23:16:57.000000000 +0200
+++ abiword-2.4.4/abiword-docs/make-html.sh	2006-04-12 23:20:44.000000000 +0200
@@ -30,7 +30,7 @@
 fi
 
 if [ -z "$ABI_DOC_PROG" ]; then
-ABI_DOC_PROG="AbiWord-2.2";
+ABI_DOC_PROG="AbiWord-2.4";
 fi
 
 html_export_options="html4: no; use-awml: no; embed-css: yes; embed-images:yes"
@@ -45,7 +45,7 @@
 		do
 		      n=`echo $i|cut -f1 -d .`
 		      echo $i
-		      $ABI_DOC_PROG --to=html --exp-props=$html_export_options $i 2>/dev/null
+		      $ABI_DOC_PROG --to=html --exp-props="$html_export_options" $i 2>/dev/null
 		      $CVS/make-abidoc.pl -I $n.info -S header.xhtml -F footer.xhtml > $n.xhtml
 		      cp $n.xhtml $n.html
 			rm -f $n.xhtml


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/devel/abiword.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- abiword.spec	11 Apr 2006 07:56:19 -0000	1.34
+++ abiword.spec	13 Apr 2006 10:55:15 -0000	1.35
@@ -3,7 +3,7 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: 2.4.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -33,6 +33,7 @@
 BuildRequires: link-grammar-devel >= 4.2.1
 BuildRequires: gtkmathview-devel >= 0.7.5
 BuildRequires: libgsf-devel >= 1.12.1
+BuildRequires: goffice-devel >= 0.1.0
 
 # gnome build deps
 BuildRequires: libbonobo-devel
@@ -42,6 +43,7 @@
 
 Patch0: abiword-2.0.9-windowshelppaths.patch
 Patch1: abiword-2.4.4-desktop.patch
+Patch2: abiword-2.4.4-docbuild.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. The goal is to make
@@ -51,6 +53,7 @@
 %setup -q 
 %patch0 -p1 -b .windowshelppaths
 %patch1 -p1 -b .desktop
+%patch2 -p1 -b .docbuild
 
 %build
 cd abi
@@ -132,6 +135,10 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Tue Apr 13 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.4-2.fc6
+- Fix documentation generation
+- Fix charting support
+
 * Tue Apr 11 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.4-1.fc6
 - New upstream version
 - Remove the macro patch and update the desktop patch


--- abiword-2.4.2-desktop.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Apr 13 11:09:02 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 13 Apr 2006 04:09:02 -0700
Subject: owners owners.list,1.838,1.839
Message-ID: <200604131109.k3DB94MJ031942@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31853

Modified Files:
	owners.list 
Log Message:
perl-Authen-Radius added



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.838
retrieving revision 1.839
diff -u -r1.838 -r1.839
--- owners.list	13 Apr 2006 01:18:16 -0000	1.838
+++ owners.list	13 Apr 2006 11:09:02 -0000	1.839
@@ -847,6 +847,7 @@
 Fedora Extras|perl-AppConfig|Perl module for reading configuration files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Archive-Zip|Perl library for accessing Zip archives|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Array-Compare|Perl extension for comparing arrays|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Authen-Radius|Perl Authen::Radius modules|andreas at bawue.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Authen-SASL|SASL Authentication framework for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-BerkeleyDB|Perl interface to Berkeley DB|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Boulder|An API for hierarchical tag/value structures|orion at cora.nwra.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Thu Apr 13 11:10:36 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 13 Apr 2006 04:10:36 -0700
Subject: rpms/perl-Authen-Radius - New directory
Message-ID: <200604131110.k3DBAcAP032291@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/perl-Authen-Radius
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32265/perl-Authen-Radius

Log Message:
Directory /cvs/extras/rpms/perl-Authen-Radius added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 13 11:10:36 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 13 Apr 2006 04:10:36 -0700
Subject: rpms/perl-Authen-Radius/devel - New directory
Message-ID: <200604131110.k3DBAcfQ032294@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/perl-Authen-Radius/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32265/perl-Authen-Radius/devel

Log Message:
Directory /cvs/extras/rpms/perl-Authen-Radius/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 13 11:10:51 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 13 Apr 2006 04:10:51 -0700
Subject: rpms/perl-Authen-Radius Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604131110.k3DBArP4032343@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/perl-Authen-Radius
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32310

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Authen-Radius


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Authen-Radius
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 13 11:10:52 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 13 Apr 2006 04:10:52 -0700
Subject: rpms/perl-Authen-Radius/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200604131110.k3DBAsjG032346@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/perl-Authen-Radius/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32310/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Authen-Radius


--- 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 Apr 13 11:11:25 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 13 Apr 2006 04:11:25 -0700
Subject: rpms/perl-Authen-Radius import.log,1.1,1.2
Message-ID: <200604131111.k3DBBvd0032444@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/perl-Authen-Radius
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32374

Modified Files:
	import.log 
Log Message:
auto-import perl-Authen-Radius-0.12-2 on branch devel from perl-Authen-Radius-0.12-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Authen-Radius/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Apr 2006 11:10:51 -0000	1.1
+++ import.log	13 Apr 2006 11:11:25 -0000	1.2
@@ -0,0 +1 @@
+perl-Authen-Radius-0_12-2:HEAD:perl-Authen-Radius-0.12-2.src.rpm:1144926676



From fedora-extras-commits at redhat.com  Thu Apr 13 11:11:25 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 13 Apr 2006 04:11:25 -0700
Subject: rpms/perl-Authen-Radius/devel perl-Authen-Radius.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604131111.k3DBBwFR032448@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/perl-Authen-Radius/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32374/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Authen-Radius.spec 
Log Message:
auto-import perl-Authen-Radius-0.12-2 on branch devel from perl-Authen-Radius-0.12-2.src.rpm


--- NEW FILE perl-Authen-Radius.spec ---
Name:           perl-Authen-Radius
Version:        0.12
Release:        2%{?dist}
Summary:        Perl Authen::Radius modules
License:        Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/RadiusPerl/
Source0:        http://www.cpan.org/modules/by-module/Authen/RadiusPerl-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Data::HexDump) >= 0.02
BuildRequires:  perl(Digest::MD5) >= 2.20, perl(IO) >= 1.12
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This is RadiusPerl version 0.11. RadiusPerl is a Perl 5 module (Radius.pm)
which allows you to communicate with a Radius server from Perl. You can
just authenticate usernames/passwords via Radius, or completely imitate
AAA requests and process server response.

%prep
%setup -q -n Authen-Radius-%{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} -type d -depth -exec rmdir {} 2>/dev/null \;

chmod -R u+rwX,go+rX,go-w %{buildroot}/*

%check
# Disabled check, as a running Radius-server is needed
#make test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Apr 13 2006 Andreas Thienemann <andreas at bawue.net> 0.12-2
- Final cleanup for inclusion.

* Wed Mar 29 2006 Andreas Thienemann <andreas at bawue.net> 0.12-1
- Cleaned up for FE
- Specfile autogenerated by cpanspec 1.64.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Authen-Radius/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Apr 2006 11:10:52 -0000	1.1
+++ .cvsignore	13 Apr 2006 11:11:25 -0000	1.2
@@ -0,0 +1 @@
+RadiusPerl-0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Authen-Radius/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Apr 2006 11:10:52 -0000	1.1
+++ sources	13 Apr 2006 11:11:25 -0000	1.2
@@ -0,0 +1 @@
+8427f931a4e0e689ecf8ddf30e5a0ea7  RadiusPerl-0.12.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 13 11:57:11 2006
From: fedora-extras-commits at redhat.com (Marc Maurer (uwog))
Date: Thu, 13 Apr 2006 04:57:11 -0700
Subject: rpms/abiword/FC-4 abiword-2.4.4-docbuild.patch, NONE,
	1.1 abiword.spec, 1.22, 1.23
Message-ID: <200604131157.k3DBvDVi032629@cvs-int.fedora.redhat.com>

Author: uwog

Update of /cvs/extras/rpms/abiword/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32609

Modified Files:
	abiword.spec 
Added Files:
	abiword-2.4.4-docbuild.patch 
Log Message:
Fix documentation generation



abiword-2.4.4-docbuild.patch:

--- NEW FILE abiword-2.4.4-docbuild.patch ---
diff -r -u abiword-2.4.4.orig/abiword-docs/make-dbk.sh abiword-2.4.4/abiword-docs/make-dbk.sh
--- abiword-2.4.4.orig/abiword-docs/make-dbk.sh	2006-04-12 23:16:57.000000000 +0200
+++ abiword-2.4.4/abiword-docs/make-dbk.sh	2006-04-12 23:20:18.000000000 +0200
@@ -33,7 +33,7 @@
 		      echo $i
 
 		      # save to docbook, rename to .xml
-		      AbiWord-2.0 --to=dbk $i 2>/dev/null
+		      AbiWord-2.4 --to=dbk $i 2>/dev/null
 		      mv $n.dbk $n.xml
 		done
 
diff -r -u abiword-2.4.4.orig/abiword-docs/make-gnome-html.sh abiword-2.4.4/abiword-docs/make-gnome-html.sh
--- abiword-2.4.4.orig/abiword-docs/make-gnome-html.sh	2006-04-12 23:16:57.000000000 +0200
+++ abiword-2.4.4/abiword-docs/make-gnome-html.sh	2006-04-12 23:20:18.000000000 +0200
@@ -31,7 +31,7 @@
 		do
 		      n=`echo $i|cut -f1 -d .`
 		      echo $i
-		      AbiWord-2.0 --to=html $i 2>/dev/null
+		      AbiWord-2.4 --to=html $i 2>/dev/null
 		done
 
 		cd $CVS
diff -r -u abiword-2.4.4.orig/abiword-docs/make-html.sh abiword-2.4.4/abiword-docs/make-html.sh
--- abiword-2.4.4.orig/abiword-docs/make-html.sh	2006-04-12 23:16:57.000000000 +0200
+++ abiword-2.4.4/abiword-docs/make-html.sh	2006-04-12 23:20:44.000000000 +0200
@@ -30,7 +30,7 @@
 fi
 
 if [ -z "$ABI_DOC_PROG" ]; then
-ABI_DOC_PROG="AbiWord-2.2";
+ABI_DOC_PROG="AbiWord-2.4";
 fi
 
 html_export_options="html4: no; use-awml: no; embed-css: yes; embed-images:yes"
@@ -45,7 +45,7 @@
 		do
 		      n=`echo $i|cut -f1 -d .`
 		      echo $i
-		      $ABI_DOC_PROG --to=html --exp-props=$html_export_options $i 2>/dev/null
+		      $ABI_DOC_PROG --to=html --exp-props="$html_export_options" $i 2>/dev/null
 		      $CVS/make-abidoc.pl -I $n.info -S header.xhtml -F footer.xhtml > $n.xhtml
 		      cp $n.xhtml $n.html
 			rm -f $n.xhtml


Index: abiword.spec
===================================================================
RCS file: /cvs/extras/rpms/abiword/FC-4/abiword.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- abiword.spec	11 Apr 2006 10:01:59 -0000	1.22
+++ abiword.spec	13 Apr 2006 11:57:11 -0000	1.23
@@ -3,7 +3,7 @@
 Summary: The AbiWord word processor
 Name: abiword
 Version: 2.4.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 Group: Applications/Editors
 License: GPL
@@ -42,6 +42,7 @@
 
 Patch0: abiword-2.0.9-windowshelppaths.patch
 Patch1: abiword-2.4.4-desktop.patch
+Patch2: abiword-2.4.4-docbuild.patch
 
 %description
 AbiWord is a cross-platform Open Source word processor. The goal is to make
@@ -51,6 +52,7 @@
 %setup -q 
 %patch0 -p1 -b .windowshelppaths
 %patch1 -p1 -b .desktop
+%patch2 -p1 -b .docbuild
 
 %build
 cd abi
@@ -134,6 +136,9 @@
 %{_datadir}/icons/*png
 
 %changelog
+* Tue Apr 13 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.4-2.fc4
+- Fix documentation generation
+
 * Mon Apr 10 2006 Marc Maurer <uwog at abisource.com> - 1:2.4.4-1.fc4
 - New upstream version
 - Remove the macro patch and update the desktop patch



From fedora-extras-commits at redhat.com  Thu Apr 13 12:42:53 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 13 Apr 2006 05:42:53 -0700
Subject: rpms/cernlib/devel cernlib.spec, 1.25, 1.26 patchy-case.patch, 1.1,
	1.2
Message-ID: <200604131242.k3DCgtuA002459@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2437

Modified Files:
	cernlib.spec patchy-case.patch 
Log Message:
use uninstalled fcasplit for npatchy build


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- cernlib.spec	13 Apr 2006 07:56:50 -0000	1.25
+++ cernlib.spec	13 Apr 2006 12:42:53 -0000	1.26
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       16%{?dist}.1
+Release:       16%{?dist}.2
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -62,7 +62,7 @@
 Source14: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/tar/src_cfortran.tar.gz
 Source16: http://wwwasd.web.cern.ch/wwwasd/cernlib/download/2005_source/lib/xsneut95.dat
 # The patchy version 4 sources
-Source300: patchy.tar.gz
+Source17: patchy.tar.gz
 # this is modified with regard with what Mattias gave me. Indeed the file
 # containing some other files (p4inceta) was in fortran unformatted format, 
 # I believe it is what caused a segfault of rceta on the ppc platform.
@@ -70,8 +70,6 @@
 # sh patchy-unpack-rceta
 Source203: patchy-unpack-rceta 
 
-Source17: patchy.tar.gz
-
 # Shell scripts that go in /etc/profile.d
 Source100: cernlib.sh.in
 Source105: cernlib.csh.in
@@ -218,6 +216,7 @@
 # not applied as it has allready been done by the sed one-liner in 
 # patchy-unpack-rceta
 Patch1500: patchy-rceta.patch
+
 Patch1501: patchy-insecure_tmp_use.diff
 Patch1502: patchy-fcasplit.patch
 Patch1503: patchy-p4comp.patch
@@ -830,7 +829,7 @@
 
 
 %changelog
-* Wed Apr 12 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-16.1
+* Wed Apr 12 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-16.2
 - unpack patchy offline because the files are within an unformatted
   fortran file which won't be right on all the arches.
 

patchy-case.patch:

Index: patchy-case.patch
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/patchy-case.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- patchy-case.patch	11 Apr 2006 22:45:34 -0000	1.1
+++ patchy-case.patch	13 Apr 2006 12:42:53 -0000	1.2
@@ -1,6 +1,14 @@
-diff -ur 2004.orig/src/patchy/Imakefile 2004/src/patchy/Imakefile
---- 2004.orig/src/patchy/Imakefile	1997-01-21 18:29:14.000000000 +0100
-+++ 2004/src/patchy/Imakefile	2005-05-28 02:23:04.000000000 +0200
+--- 2004.orig/src/patchy/Imakefile	2006-04-13 11:15:58.000000000 +0200
++++ 2004/src/patchy/Imakefile	2006-04-13 11:27:07.000000000 +0200
+@@ -54,7 +54,7 @@
+ 
+ $(P5LIB): $(LDIR)patchy.car $(LDIR)p5lib.cra p5lib.libmake fcasplit Makefile
+ 	ypatchy - p5lib p5lib TTY .go
+-	fcasplit p5lib.f
++	./fcasplit p5lib.f
+ 	RemoveFile(p5lib.f)
+ 	cat p5lib.libmake >> p5lib.mkfca
+ 	$(MAKE) -f p5lib.mkfca $@
 @@ -79,8 +79,8 @@
  	@ ln -s $< $@
  
@@ -12,3 +20,15 @@
  .f.o:
  	$(FC) -c $(FORTRANOPTIONS) $(FDEBUGFLAGS) $<
  
+@@ -92,9 +92,9 @@
+ YMODULES=ycompar yedit yfrceta yindex yindexb ylist ypatchy \
+ 	 ysearch yshift ytobcd ytobin ytoceta
+ 
+-P4LINKS: $(foreach yp,$(YMODULES),$(CERN_BINDIR)$(yp))
++P4LINKS: $(foreach yp,$(YMODULES),$(CERN_BINDIR)/$(yp))
+ 
+-$(foreach yp,$(YMODULES),$(CERN_BINDIR)$(yp)):
++$(foreach yp,$(YMODULES),$(CERN_BINDIR)/$(yp)):
+ 	cd $(dir $@);	\ @@\
+ 	if [ -f ../../patchy/4.15/bin/$(notdir $@) ] ; then \ @@\
+ 		ln -s ../../patchy/4.15/bin/$(notdir $@) $(notdir $@); \ @@\



From fedora-extras-commits at redhat.com  Thu Apr 13 12:27:56 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Thu, 13 Apr 2006 05:27:56 -0700
Subject: rpms/gajim/devel .cvsignore, 1.5, 1.6 gajim.spec, 1.9, 1.10 sources,
	1.5, 1.6 gajim-0.9.1.modularX.patch, 1.1,
	NONE gajim-0.9.1.notify_crash.patch, 1.1, NONE
Message-ID: <200604131227.k3DCRwA0002333@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/gajim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2312

Modified Files:
	.cvsignore gajim.spec sources 
Removed Files:
	gajim-0.9.1.modularX.patch gajim-0.9.1.notify_crash.patch 
Log Message:
Update to 0.10-pre1 and drop patches



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gajim/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	15 Jan 2006 16:11:52 -0000	1.5
+++ .cvsignore	13 Apr 2006 12:27:56 -0000	1.6
@@ -1 +1 @@
-gajim-0.9.1.tar.bz2
+gajim-0.10-pre1.tar.bz2


Index: gajim.spec
===================================================================
RCS file: /cvs/extras/rpms/gajim/devel/gajim.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gajim.spec	30 Mar 2006 20:51:42 -0000	1.9
+++ gajim.spec	13 Apr 2006 12:27:56 -0000	1.10
@@ -1,14 +1,12 @@
 Name:           gajim
-Version:        0.9.1
-Release:        3%{?dist}
+Version:        0.10
+Release:        0.1.pre1%{?dist}
 Summary:        Jabber client written in PyGTK
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://gajim.org/
-Source0:        http://gajim.org/downloads/gajim-%{version}.tar.bz2
-Patch0:         gajim-0.9.1.modularX.patch
-Patch1:         gajim-0.9.1.notify_crash.patch
+Source0:        http://gajim.org/downloads/gajim-%{version}-pre1.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -35,11 +33,7 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
-# gajim wants to handle executables; why?
-sed -i -e '/MimeType/d' gajim.desktop.in
 
 %build
 make \
@@ -85,6 +79,10 @@
 %{_mandir}/man1/gajim-remote.1*
 
 %changelog
+* Thu Apr 13 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 0.10-0.1.pre1
+- Update to 0.10-pre1
+- Drop patches
+
 * Thu Mar 30 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 0.9.1-3
 - Remove Gnome dependencies
 - Fix crash with notify-daemon (#187274, Stefan Plewako)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gajim/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 Jan 2006 16:11:53 -0000	1.5
+++ sources	13 Apr 2006 12:27:56 -0000	1.6
@@ -1 +1 @@
-ca82dfb7ab5c51984357ea7bab0e99af  gajim-0.9.1.tar.bz2
+e59de6722900155e3f5644c62241c9a9  gajim-0.10-pre1.tar.bz2


--- gajim-0.9.1.modularX.patch DELETED ---


--- gajim-0.9.1.notify_crash.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Apr 13 13:27:41 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 13 Apr 2006 06:27:41 -0700
Subject: rpms/xmms-modplug/FC-5 xmms-modplug.spec,1.9,1.10
Message-ID: <200604131327.k3DDRhNg004799@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xmms-modplug/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4782

Modified Files:
	xmms-modplug.spec 
Log Message:
* Thu Apr  6 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.05-6
- Require xmms-libs instead of xmms.



Index: xmms-modplug.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-modplug/FC-5/xmms-modplug.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xmms-modplug.spec	14 Feb 2006 21:18:31 -0000	1.9
+++ xmms-modplug.spec	13 Apr 2006 13:27:41 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:           xmms-modplug
 Version:        2.05
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Modplug Plugin for XMMS
 
 License:        Public Domain
@@ -16,7 +16,7 @@
 BuildRequires:  gettext
 BuildRequires:  libmodplug-devel >= 1:0.7
 BuildConflicts: %{name} < 2.0
-Requires:       xmms
+Requires:       xmms-libs
 Provides:       modplug-xmms = %{version}-%{release}
 
 %description
@@ -63,6 +63,9 @@
 
 
 %changelog
+* Thu Apr  6 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.05-6
+- Require xmms-libs instead of xmms.
+
 * Tue Feb 14 2006 Ville Skytt?? <ville.skytta at iki.fi> - 2.05-5
 - Rebuild, cosmetics.
 



From fedora-extras-commits at redhat.com  Thu Apr 13 13:28:47 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 13 Apr 2006 06:28:47 -0700
Subject: rpms/xmms-alarm/FC-5 xmms-alarm.spec,1.9,1.10
Message-ID: <200604131328.k3DDSnNk004870@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xmms-alarm/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4853

Modified Files:
	xmms-alarm.spec 
Log Message:
* Thu Apr  6 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.3.7-3
- Add dependency on the main xmms package.



Index: xmms-alarm.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-alarm/FC-5/xmms-alarm.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xmms-alarm.spec	14 Feb 2006 20:41:51 -0000	1.9
+++ xmms-alarm.spec	13 Apr 2006 13:28:47 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:           xmms-alarm
 Version:        0.3.7
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Plugin for using XMMS as an alarm clock
 
 License:        GPL
@@ -14,6 +14,7 @@
 BuildRequires:  xmms-devel
 BuildRequires:  glib-devel >= 1:1.2.6
 BuildRequires:  gtk+-devel >= 1:1.2.6
+Requires:       xmms
 
 %description
 %{summary}.
@@ -45,6 +46,9 @@
 
 
 %changelog
+* Thu Apr  6 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.3.7-3
+- Add dependency on the main xmms package.
+
 * Tue Feb 14 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.3.7-2
 - Rebuild, cosmetics.
 



From fedora-extras-commits at redhat.com  Thu Apr 13 14:37:51 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu, 13 Apr 2006 07:37:51 -0700
Subject: rpms/python-paramiko - New directory
Message-ID: <200604131437.k3DEbrtI007258@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-paramiko
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7237/python-paramiko

Log Message:
Directory /cvs/extras/rpms/python-paramiko added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 13 14:37:52 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu, 13 Apr 2006 07:37:52 -0700
Subject: rpms/python-paramiko/devel - New directory
Message-ID: <200604131437.k3DEbsc3007261@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-paramiko/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7237/python-paramiko/devel

Log Message:
Directory /cvs/extras/rpms/python-paramiko/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 13 14:38:05 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu, 13 Apr 2006 07:38:05 -0700
Subject: rpms/python-paramiko Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604131438.k3DEc71O007315@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-paramiko
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7282

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-paramiko


--- NEW FILE Makefile ---
# Top level Makefile for module python-paramiko
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 13 14:38:05 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu, 13 Apr 2006 07:38:05 -0700
Subject: rpms/python-paramiko/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604131438.k3DEc7OE007318@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-paramiko/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7282/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-paramiko


--- 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 Apr 13 14:38:24 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu, 13 Apr 2006 07:38:24 -0700
Subject: rpms/python-paramiko import.log,1.1,1.2
Message-ID: <200604131438.k3DEcQG2007379@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-paramiko
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7346

Modified Files:
	import.log 
Log Message:
auto-import python-paramiko-1.5.3-1 on branch devel from python-paramiko-1.5.3-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-paramiko/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Apr 2006 14:38:05 -0000	1.1
+++ import.log	13 Apr 2006 14:38:23 -0000	1.2
@@ -0,0 +1 @@
+python-paramiko-1_5_3-1:HEAD:python-paramiko-1.5.3-1.src.rpm:1144939101



From fedora-extras-commits at redhat.com  Thu Apr 13 14:38:24 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu, 13 Apr 2006 07:38:24 -0700
Subject: rpms/python-paramiko/devel python-paramiko.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604131438.k3DEcQ1Y007384@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-paramiko/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7346/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-paramiko.spec 
Log Message:
auto-import python-paramiko-1.5.3-1 on branch devel from python-paramiko-1.5.3-1.src.rpm


--- NEW FILE python-paramiko.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}

%define srcname paramiko

Name:           python-paramiko
Version:        1.5.3
Release:        1%{?dist}
Summary:        A SSH2 protocol library for python

Group:          Development/Libraries
License:        LGPL
URL:            http://www.lag.net/paramiko/
Source0:        http://www.lag.net/paramiko/download/%{srcname}-%{version}.zip
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
BuildRequires:  python-setuptools
Requires:       python-abi = %{pyver}
Requires:       python-crypto >= 1.9

%description
Paramiko (a combination of the esperanto words for "paranoid" and "friend") is
a module for python 2.3 or greater that implements the SSH2 protocol for secure
(encrypted and authenticated) connections to remote machines. Unlike SSL (aka
TLS), the SSH2 protocol does not require heirarchical certificates signed by a
powerful central authority. You may know SSH2 as the protocol that replaced
telnet and rsh for secure access to remote shells, but the protocol also
includes the ability to open arbitrary channels to remote services across an
encrypted tunnel. (This is how sftp works, for example.)

%prep
%setup -q -n %{srcname}-%{version}


%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT --single-version-externally-managed


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc LICENSE PKG-INFO README docs/
%{python_sitelib}/paramiko
%{python_sitelib}/paramiko-%{version}-py%{pyver}.egg-info

%changelog
* Wed Apr 12 2006 Shahms E. King <shahms at shahms.com> 1.5.3-1
  - Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-paramiko/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Apr 2006 14:38:05 -0000	1.1
+++ .cvsignore	13 Apr 2006 14:38:24 -0000	1.2
@@ -0,0 +1 @@
+paramiko-1.5.3.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-paramiko/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Apr 2006 14:38:05 -0000	1.1
+++ sources	13 Apr 2006 14:38:24 -0000	1.2
@@ -0,0 +1 @@
+9c1389f19a331554e052a7e4e2b1471c  paramiko-1.5.3.zip



From fedora-extras-commits at redhat.com  Thu Apr 13 14:47:13 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Thu, 13 Apr 2006 07:47:13 -0700
Subject: owners owners.list,1.839,1.840
Message-ID: <200604131447.k3DElFWV007464@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7447

Modified Files:
	owners.list 
Log Message:
Added python-paramiko



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.839
retrieving revision 1.840
diff -u -r1.839 -r1.840
--- owners.list	13 Apr 2006 11:09:02 -0000	1.839
+++ owners.list	13 Apr 2006 14:47:13 -0000	1.840
@@ -1230,6 +1230,7 @@
 Fedora Extras|python-nltk|Python-based Natural Language Toolkit|michel.salim at gmail.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|
+Fedora Extras|python-paramiko|A SSH2 protocol library for python|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-protocols|PyProtocols 'adapt()' implementation|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-psycopg|Alternative high-speed Postgres DB adapter|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-psyco|Python specializing compiler|shahms at shahms.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Apr 13 15:26:57 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 13 Apr 2006 08:26:57 -0700
Subject: rpms/nethack-vultures/FC-3 nethack-vultures.spec,1.20,1.21
Message-ID: <200604131526.k3DFQxfj009774@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-serv9757

Modified Files:
	nethack-vultures.spec 
Log Message:
Patched to remove PCMUSIC for FC-3




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- nethack-vultures.spec	10 Apr 2006 14:45:58 -0000	1.20
+++ nethack-vultures.spec	13 Apr 2006 15:26:57 -0000	1.21
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        2.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -10,6 +10,7 @@
 Patch0:         %{name}-1.11.0-optflags.patch
 Patch1:         %{name}-1.11.0-config.patch
 Patch2:         %{name}-1.10.1-clawguide.patch
+Patch3:         %{name}-2.0.0-pcmusic.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
@@ -38,6 +39,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2
+%patch3 -p1
 sed -i -e 's|/usr/games/lib/nethackdir|%{_prefix}/games/vultureseye|g' \
     nethack/doc/{nethack,recover}.6 nethack/include/config.h
 sed -i -e 's|/var/lib/games/nethack|%{_var}/games/vultureseye|g' \
@@ -166,6 +168,9 @@
 
 
 %changelog
+* Thu Apr 13 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-4
+- Patched out PCMUSIC so that FC-3 can still build.
+
 * Sun Apr 09 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-3
 - Packaged extra fonts
 



From fedora-extras-commits at redhat.com  Thu Apr 13 15:28:01 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 13 Apr 2006 08:28:01 -0700
Subject: rpms/nethack-vultures/FC-3 nethack-vultures-2.0.0-pcmusic.patch,
	NONE, 1.1
Message-ID: <200604131528.k3DFS3Gi009841@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-serv9823

Added Files:
	nethack-vultures-2.0.0-pcmusic.patch 
Log Message:
Whoops, forgot to commit the new patch!



nethack-vultures-2.0.0-pcmusic.patch:

--- NEW FILE nethack-vultures-2.0.0-pcmusic.patch ---
diff -c -r vultures-2.0.0/vultures/vultures_conf.h vultures-2.0.0.new/vultures/vultures_conf.h
*** vultures-2.0.0/vultures/vultures_conf.h~	2006-04-13 15:13:28.000000000 +0000
--- vultures-2.0.0/vultures/vultures_conf.h	2006-04-13 15:14:18.000000000 +0000
***************
*** 8,12 ****
  /* PCMUSIC allows us to play notes when the player uses an instrument ingame
   * nethack only defines this if __BORLANDC__ is also defined, but we can use it 
   * anyway */ 
! #define PCMUSIC
  
--- 8,12 ----
  /* PCMUSIC allows us to play notes when the player uses an instrument ingame
   * nethack only defines this if __BORLANDC__ is also defined, but we can use it 
   * anyway */ 
! #undef PCMUSIC
  



From fedora-extras-commits at redhat.com  Thu Apr 13 15:31:50 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Thu, 13 Apr 2006 08:31:50 -0700
Subject: rpms/nethack-vultures/FC-3 nethack-vultures.spec,1.21,1.22
Message-ID: <200604131531.k3DFVqlx009916@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-serv9899

Modified Files:
	nethack-vultures.spec 
Log Message:
Upped the release to build with the forgotten patch.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-3/nethack-vultures.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- nethack-vultures.spec	13 Apr 2006 15:26:57 -0000	1.21
+++ nethack-vultures.spec	13 Apr 2006 15:31:49 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        2.0.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -168,6 +168,9 @@
 
 
 %changelog
+* Thu Apr 13 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-5
+- Upped the release; forgot to include the patch in the last commit.
+
 * Thu Apr 13 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-4
 - Patched out PCMUSIC so that FC-3 can still build.
 



From fedora-extras-commits at redhat.com  Thu Apr 13 15:34:45 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 13 Apr 2006 08:34:45 -0700
Subject: rpms/cernlib/devel cernlib.spec,1.26,1.27
Message-ID: <200604131534.k3DFYlWM010002@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9985

Modified Files:
	cernlib.spec 
Log Message:
* Tue Apr 13 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-17
- npatchy don't build on ppc.



Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- cernlib.spec	13 Apr 2006 12:42:53 -0000	1.26
+++ cernlib.spec	13 Apr 2006 15:34:44 -0000	1.27
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       16%{?dist}.2
+Release:       17%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -32,12 +32,6 @@
 # build the cernlib
 BuildRequires: /usr/bin/g77
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#%if "%fedora" > "3"
-# f771 segfaults on x86_64
-#ExcludeArch:   x86_64
-#%endif
-# rceta segfaults on ppc
-#ExcludeArch:   ppc
 
 # these sources are different from the upstream sources as files with 
 # GPL incompatible licences are removed. You can use cernlib-remove-deadpool
@@ -155,7 +149,7 @@
 Patch314: 314-permit-using-regcomp-for-re_comp.dpatch
 Patch315: 315-fixes-for-MacOSX.dpatch
 Patch318: 318-additional-gcc-3.4-fixes.dpatch
-# certainly not needed
+# certainly not needed, but who knows?
 Patch319: 319-work-around-imake-segfaults.dpatch
 
 Patch700: 700-remove-kernlib-from-packlib-Imakefile.dpatch
@@ -171,8 +165,8 @@
 Patch801: 801-non-optimized-rule-uses-fPIC-g.dpatch
 Patch802: 802-create-shared-libraries.dpatch
 # in the original cernlib kxterm is built with the C compiler, which cause
-# a failure if compiled with de cernlib debian script as -lg2c isn't found. 
-# It is corrected by
+# a failure if compiled with the cernlib debian script as -lg2c isn't found. 
+# It is corrected in
 Patch803: 803-link-binaries-dynamically.dpatch
 # 803 depends on 
 # 208-fix-redundant-packlib-dependencies.dpatch
@@ -662,9 +656,12 @@
 cd $CERN_ROOT/build/packlib
 make %{?_smp_mflags} install.bin
 
-# Build patchy
+# Build npatchy
+# The build of patchy is completly messed up on ppc
+%ifnarch ppc
 cd $CERN_ROOT/build/patchy
 make %{?_smp_mflags} install.bin
+%endif
 
 %install
 
@@ -802,6 +799,7 @@
 
 %files -n patchy
 %defattr(-,root,root,-)
+%ifnarch ppc
 %{_bindir}/fcasplit
 %{_bindir}/nycheck
 %{_bindir}/nydiff
@@ -812,6 +810,7 @@
 %{_bindir}/nyshell
 %{_bindir}/nysynopt
 %{_bindir}/nytidy
+%endif
 %{_bindir}/ycompar
 %{_bindir}/yedit
 %{_bindir}/yexpand
@@ -829,7 +828,10 @@
 
 
 %changelog
-* Wed Apr 12 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-16.2
+* Tue Apr 13 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-17
+- npatchy don't build on ppc.
+
+* Wed Apr 12 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-16
 - unpack patchy offline because the files are within an unformatted
   fortran file which won't be right on all the arches.
 



From fedora-extras-commits at redhat.com  Thu Apr 13 15:57:33 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 13 Apr 2006 08:57:33 -0700
Subject: rpms/deskbar-applet/devel deskbar-applet-2.14.1-artdir.patch, NONE, 
	1.1 deskbar-applet-2.14.1-beagleexists.patch, NONE,
	1.1 .cvsignore, 1.10, 1.11 deskbar-applet.spec, 1.21,
	1.22 sources, 1.10,
	1.11 deskbar-applet-2.14.0-beagleexists.patch, 1.1,
	NONE deskbar-applet-2.14.0-fedorabz.patch, 1.1, NONE
Message-ID: <200604131557.k3DFvZDW010126@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/deskbar-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10099

Modified Files:
	.cvsignore deskbar-applet.spec sources 
Added Files:
	deskbar-applet-2.14.1-artdir.patch 
	deskbar-applet-2.14.1-beagleexists.patch 
Removed Files:
	deskbar-applet-2.14.0-beagleexists.patch 
	deskbar-applet-2.14.0-fedorabz.patch 
Log Message:
- Upstream update
- Decoupled the BZ handler from the upstream tarball


deskbar-applet-2.14.1-artdir.patch:

--- NEW FILE deskbar-applet-2.14.1-artdir.patch ---
--- deskbar-applet-2.14.1/data/deskbar-applet.pc.in.artdir	2006-04-13 07:25:47.000000000 -0400
+++ deskbar-applet-2.14.1/data/deskbar-applet.pc.in	2006-04-13 07:26:48.000000000 -0400
@@ -2,6 +2,7 @@
 exec_prefix=@exec_prefix@
 libdir=@libdir@
 handlersdir=@libdir@/deskbar-applet/handlers
+artdir=@datadir@/deskbar-applet/art
 
 Name: Deskbar Applet Handlers Location
 Description: Providing the location of deskbar-applet system-wide handlers.

deskbar-applet-2.14.1-beagleexists.patch:

--- NEW FILE deskbar-applet-2.14.1-beagleexists.patch ---
--- deskbar-applet-2.14.0/deskbar/handlers/beagle-static.py.fedora	2006-03-12 21:24:16.000000000 -0500
+++ deskbar-applet-2.14.0/deskbar/handlers/beagle-static.py	2006-03-12 21:24:56.000000000 -0500
@@ -1,5 +1,6 @@
 import os
 from os.path import exists, join
+from glob import glob
 from gettext import gettext as _
 
 import gobject
@@ -9,7 +10,7 @@
 #FIXME: better way to detect beagle ?
 def _check_requirements():
 	for dir in get_xdg_data_dirs():
-		if exists(join(dir, "applications", "best.desktop")) or exists(join(dir, "applications", "beagle-search.desktop")):
+		if glob(join(dir, "applications", "*best.desktop")) or glob(join(dir, "applications", "*beagle-search.desktop")):
 			return (deskbar.Handler.HANDLER_IS_HAPPY, None, None)
 	
 	return (deskbar.Handler.HANDLER_IS_NOT_APPLICABLE, "Beagle does not seem to be installed, skipping", None)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	13 Mar 2006 05:49:42 -0000	1.10
+++ .cvsignore	13 Apr 2006 15:57:33 -0000	1.11
@@ -1 +1 @@
-deskbar-applet-2.14.0.tar.bz2
+deskbar-applet-2.14.1.tar.bz2


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- deskbar-applet.spec	14 Mar 2006 15:23:37 -0000	1.21
+++ deskbar-applet.spec	13 Apr 2006 15:57:33 -0000	1.22
@@ -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.14.0
-Release:        2%{?dist}
+Version:        2.14.1
+Release:        1%{?dist}
 
 Summary:        A Gnome applet to allow easy access to various search engines
 Group:          Applications/Internet
@@ -12,14 +12,15 @@
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/deskbar-applet/2.14/%{name}-%{version}.tar.bz2
 Source1:        fedorabz.py
 Source2:        fedorabz.png
-Patch0:         deskbar-applet-2.14.0-fedorabz.patch
-Patch2:         deskbar-applet-2.14.0-beagleexists.patch
+Patch0:         deskbar-applet-2.14.1-artdir.patch
+Patch1:         deskbar-applet-2.14.1-beagleexists.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk2-devel python-devel pygtk2-devel gnome-python2-extras gettext evolution-data-server-devel gnome-desktop-devel libSM-devel gnome-python2-applet
 Requires:       gnome-python2 gnome-python2-applet gnome-python2-bonobo gnome-python2-gconf pygtk2
-Requires(pre): GConf2
+Requires(pre):  GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
+Provides:       deskbar-applet-fedorabz
 
 %description
 The goal of DeskbarApplet is to provide an omnipresent versatile search
@@ -32,10 +33,8 @@
 
 %prep
 %setup -q
-cp %{SOURCE1} deskbar/handlers
-cp %{SOURCE2} data/art
-%patch -p1 -b .fedorabz
-%patch2 -p1 -b .beagleexists
+%patch -p1 -b .artdir
+%patch1 -p1 -b .beagleexists
 
 %build
 %configure
@@ -44,6 +43,12 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+hdir="$(grep "^handlersdir=" $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc)"
+hdir="${hdir#*=}"
+adir="$(grep "^artdir=" $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc)"
+adir="${adir#*=}"
+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 {} \;
 %{find_lang} %{name}
 
@@ -84,6 +89,10 @@
 %{_datadir}/pixmaps/%{name}.svg
 
 %changelog
+* Thu Apr 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.14.1-1
+- Upstream update
+- Decoupled the BZ handler from the upstream tarball
+
 * Tue Mar 14 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.14.0-2
 - Fixed bug in Fedora Bugzilla handler (#184231)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	13 Mar 2006 05:49:42 -0000	1.10
+++ sources	13 Apr 2006 15:57:33 -0000	1.11
@@ -1 +1 @@
-2c9910160c2814e6497c5d6b6887fa8e  deskbar-applet-2.14.0.tar.bz2
+040bf4dd834005142a5a716bf76c2f20  deskbar-applet-2.14.1.tar.bz2


--- deskbar-applet-2.14.0-beagleexists.patch DELETED ---


--- deskbar-applet-2.14.0-fedorabz.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Apr 13 16:43:34 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Thu, 13 Apr 2006 09:43:34 -0700
Subject: rpms/xmms-cdread/FC-5 xmms-cdread.spec,1.11,1.12
Message-ID: <200604131643.k3DGhaYF018377@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/xmms-cdread/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18338/FC-5

Modified Files:
	xmms-cdread.spec 
Log Message:
* Thu Apr 13 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.14-11
- bumped release to stay in sync with FC-4



Index: xmms-cdread.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-cdread/FC-5/xmms-cdread.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xmms-cdread.spec	12 Apr 2006 20:03:11 -0000	1.11
+++ xmms-cdread.spec	13 Apr 2006 16:43:34 -0000	1.12
@@ -3,7 +3,7 @@
 Summary:	Digital audio CD input plugin for XMMS
 Name:		xmms-cdread
 Version:	0.14
-Release:        10%{?dist}
+Release:        11%{?dist}
 License:	GPL
 Group:		Applications/Multimedia
 URL:		http://www.xmms.org/
@@ -47,6 +47,9 @@
 %exclude %{xmmsinputdir}/libcdread.la
 
 %changelog
+* Thu Apr 13 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.14-11
+- bumped release to stay in sync with FC-4
+ 
 * Sat Apr  8 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.14-10
 - changed Requires xmms -> xmms-libs
 



From fedora-extras-commits at redhat.com  Thu Apr 13 16:43:35 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Thu, 13 Apr 2006 09:43:35 -0700
Subject: rpms/xmms-cdread/devel xmms-cdread.spec,1.11,1.12
Message-ID: <200604131643.k3DGhbds018381@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/xmms-cdread/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18338/devel

Modified Files:
	xmms-cdread.spec 
Log Message:
* Thu Apr 13 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.14-11
- bumped release to stay in sync with FC-4



Index: xmms-cdread.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-cdread/devel/xmms-cdread.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xmms-cdread.spec	8 Apr 2006 07:03:11 -0000	1.11
+++ xmms-cdread.spec	13 Apr 2006 16:43:34 -0000	1.12
@@ -3,7 +3,7 @@
 Summary:	Digital audio CD input plugin for XMMS
 Name:		xmms-cdread
 Version:	0.14
-Release:        10%{?dist}
+Release:        11%{?dist}
 License:	GPL
 Group:		Applications/Multimedia
 URL:		http://www.xmms.org/
@@ -47,6 +47,9 @@
 %exclude %{xmmsinputdir}/libcdread.la
 
 %changelog
+* Thu Apr 13 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.14-11
+- bumped release to stay in sync with FC-4
+
 * Sat Apr  8 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.14-10
 - changed Requires xmms -> xmms-libs
 



From fedora-extras-commits at redhat.com  Thu Apr 13 17:10:51 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 13 Apr 2006 10:10:51 -0700
Subject: rpms/cernlib/devel cernlib.spec,1.27,1.28
Message-ID: <200604131710.k3DHArmW024755@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24730

Modified Files:
	cernlib.spec 
Log Message:
yexpand is in patchy 5


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- cernlib.spec	13 Apr 2006 15:34:44 -0000	1.27
+++ cernlib.spec	13 Apr 2006 17:10:51 -0000	1.28
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       17%{?dist}
+Release:       17%{?dist}.1
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -810,10 +810,10 @@
 %{_bindir}/nyshell
 %{_bindir}/nysynopt
 %{_bindir}/nytidy
+%{_bindir}/yexpand
 %endif
 %{_bindir}/ycompar
 %{_bindir}/yedit
-%{_bindir}/yexpand
 %{_bindir}/yfrceta
 %{_bindir}/yindex
 %{_bindir}/yindexb
@@ -828,7 +828,7 @@
 
 
 %changelog
-* Tue Apr 13 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-17
+* Tue Apr 13 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-17.1
 - npatchy don't build on ppc.
 
 * Wed Apr 12 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-16



From fedora-extras-commits at redhat.com  Thu Apr 13 17:35:48 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 10:35:48 -0700
Subject: rpms/perl-Module-Load - New directory
Message-ID: <200604131735.k3DHZolZ028995@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Load
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28958/perl-Module-Load

Log Message:
Directory /cvs/extras/rpms/perl-Module-Load added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 13 17:35:49 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 10:35:49 -0700
Subject: rpms/perl-Module-Load/devel - New directory
Message-ID: <200604131735.k3DHZpWB029000@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Load/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28958/perl-Module-Load/devel

Log Message:
Directory /cvs/extras/rpms/perl-Module-Load/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 13 17:36:12 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 10:36:12 -0700
Subject: rpms/perl-Module-Load Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604131736.k3DHaEHj029115@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Load
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29074

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Module-Load


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Module-Load
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 13 17:36:13 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 10:36:13 -0700
Subject: rpms/perl-Module-Load/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604131736.k3DHaFN7029121@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Load/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29074/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Module-Load


--- 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 Apr 13 17:36:55 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 10:36:55 -0700
Subject: rpms/perl-Module-Load import.log,1.1,1.2
Message-ID: <200604131737.k3DHbRkI029387@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Load
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29258

Modified Files:
	import.log 
Log Message:
auto-import perl-Module-Load-0.10-1 on branch devel from perl-Module-Load-0.10-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Load/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Apr 2006 17:36:12 -0000	1.1
+++ import.log	13 Apr 2006 17:36:55 -0000	1.2
@@ -0,0 +1 @@
+perl-Module-Load-0_10-1:HEAD:perl-Module-Load-0.10-1.src.rpm:1144949804



From fedora-extras-commits at redhat.com  Thu Apr 13 17:36:56 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 10:36:56 -0700
Subject: rpms/perl-Module-Load/devel perl-Module-Load.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604131737.k3DHbSi6029392@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Load/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29258/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Module-Load.spec 
Log Message:
auto-import perl-Module-Load-0.10-1 on branch devel from perl-Module-Load-0.10-1.src.rpm


--- NEW FILE perl-Module-Load.spec ---
Name:           perl-Module-Load
Version:        0.10
Release:        1%{?dist}
Summary:        Runtime require of both modules and files
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Module-Load/
Source0:        http://www.cpan.org/authors/id/K/KA/KANE/Module-Load-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Module::Load eliminates the need to know whether you are trying to
require either a file or a module.

%prep
%setup -q -n Module-Load-%{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+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Mar 23 2006 Steven Pritchard <steve at kspei.com> 0.10-1
- Specfile autogenerated by cpanspec 1.62.
- Fix License.
- Modify description slightly.
- Capitalize Summary.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Load/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Apr 2006 17:36:13 -0000	1.1
+++ .cvsignore	13 Apr 2006 17:36:56 -0000	1.2
@@ -0,0 +1 @@
+Module-Load-0.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Load/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Apr 2006 17:36:13 -0000	1.1
+++ sources	13 Apr 2006 17:36:56 -0000	1.2
@@ -0,0 +1 @@
+ee40eb2fa3059381e43d1f14d414fe67  Module-Load-0.10.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 13 18:43:14 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Apr 2006 11:43:14 -0700
Subject: rpms/kdemultimedia-extras/FC-5 kdemultimedia-extras.spec,1.1,1.2
Message-ID: <200604131843.k3DIhGfG009841@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-serv9821

Modified Files:
	kdemultimedia-extras.spec 
Log Message:
* Wed Apr 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.1-8
- -extras: Requires: kdemultimedia >= 6:3.5.1



Index: kdemultimedia-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-5/kdemultimedia-extras.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdemultimedia-extras.spec	31 Mar 2006 12:39:58 -0000	1.1
+++ kdemultimedia-extras.spec	13 Apr 2006 18:43:13 -0000	1.2
@@ -65,7 +65,7 @@
 Group:   Applications/Multimedia
 Epoch:	 6
 Version: 3.5.1
-Release: 7%{?dist}%{?kde}
+Release: 8%{?dist}%{?kde}
 
 License: GPL
 %if "%{?nonfree}" == "1"
@@ -151,7 +151,7 @@
 %if "%{?extras}" == "1"
 # debugging
 %{?debug:BuildConflicts: kdemultimedia-extras }
-Requires:  kdemultimedia = %{epoch}:%{version}
+Requires:  kdemultimedia >= %{epoch}:%{version}
 %description 
 %{summary}, including: 
 * akode_artsplugin (akode)
@@ -165,7 +165,7 @@
 %{?debug:BuildConflicts: kdemultimedia-nonfree}
 Requires: kdemultimedia = %{epoch}:%{version}
 # for main akode_artsplugins bits
-Requires: kdemultimedia-extras = %{epoch}:%{version}
+Requires: kdemultimedia-extras >= %{epoch}:%{version}
 Requires: akode-extras
 %description
 %{summary}, including:
@@ -433,6 +433,9 @@
 
 
 %changelog
+* Wed Apr 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.1-8
+- -extras: Requires: kdemultimedia >= 6:3.5.1
+
 * Thu Mar 16 2006 Rex Dieter 6:3.5.1-7
 - kfile-plugins/mp3: -extras -> -nonfree
 



From fedora-extras-commits at redhat.com  Thu Apr 13 18:45:45 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Apr 2006 11:45:45 -0700
Subject: rpms/kdemultimedia-extras/FC-4 kdemultimedia-extras.spec,1.1,1.2
Message-ID: <200604131845.k3DIjl8A010075@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdemultimedia-extras/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10054

Modified Files:
	kdemultimedia-extras.spec 
Log Message:
* Wed Apr 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.1-8
- -extras: Requires: kdemultimedia >= 6:3.5.1



Index: kdemultimedia-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia-extras/FC-4/kdemultimedia-extras.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdemultimedia-extras.spec	31 Mar 2006 12:39:58 -0000	1.1
+++ kdemultimedia-extras.spec	13 Apr 2006 18:45:45 -0000	1.2
@@ -65,7 +65,7 @@
 Group:   Applications/Multimedia
 Epoch:	 6
 Version: 3.5.1
-Release: 7%{?dist}%{?kde}
+Release: 8%{?dist}%{?kde}
 
 License: GPL
 %if "%{?nonfree}" == "1"
@@ -151,7 +151,7 @@
 %if "%{?extras}" == "1"
 # debugging
 %{?debug:BuildConflicts: kdemultimedia-extras }
-Requires:  kdemultimedia = %{epoch}:%{version}
+Requires:  kdemultimedia >= %{epoch}:%{version}
 %description 
 %{summary}, including: 
 * akode_artsplugin (akode)
@@ -165,7 +165,7 @@
 %{?debug:BuildConflicts: kdemultimedia-nonfree}
 Requires: kdemultimedia = %{epoch}:%{version}
 # for main akode_artsplugins bits
-Requires: kdemultimedia-extras = %{epoch}:%{version}
+Requires: kdemultimedia-extras >= %{epoch}:%{version}
 Requires: akode-extras
 %description
 %{summary}, including:
@@ -433,6 +433,9 @@
 
 
 %changelog
+* Wed Apr 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 6:3.5.1-8
+- -extras: Requires: kdemultimedia >= 6:3.5.1
+
 * Thu Mar 16 2006 Rex Dieter 6:3.5.1-7
 - kfile-plugins/mp3: -extras -> -nonfree
 



From fedora-extras-commits at redhat.com  Thu Apr 13 18:52:20 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 11:52:20 -0700
Subject: rpms/perl-Module-Loaded - New directory
Message-ID: <200604131852.k3DIqMck010604@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Loaded
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10574/perl-Module-Loaded

Log Message:
Directory /cvs/extras/rpms/perl-Module-Loaded added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 13 18:52:20 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 11:52:20 -0700
Subject: rpms/perl-Module-Loaded/devel - New directory
Message-ID: <200604131852.k3DIqMQO010607@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Loaded/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10574/perl-Module-Loaded/devel

Log Message:
Directory /cvs/extras/rpms/perl-Module-Loaded/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 13 18:52:59 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 11:52:59 -0700
Subject: rpms/perl-Module-Loaded Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604131853.k3DIr1jt010698@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Loaded
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10661

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Module-Loaded


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Module-Loaded
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 13 18:53:00 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 11:53:00 -0700
Subject: rpms/perl-Module-Loaded/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200604131853.k3DIr2OC010701@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Loaded/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10661/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Module-Loaded


--- 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 Apr 13 18:56:24 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 11:56:24 -0700
Subject: rpms/perl-Module-Loaded import.log,1.1,1.2
Message-ID: <200604131856.k3DIuQF6010978@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Loaded
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10941

Modified Files:
	import.log 
Log Message:
auto-import perl-Module-Loaded-0.01-1 on branch devel from perl-Module-Loaded-0.01-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Loaded/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Apr 2006 18:52:59 -0000	1.1
+++ import.log	13 Apr 2006 18:56:24 -0000	1.2
@@ -0,0 +1 @@
+perl-Module-Loaded-0_01-1:HEAD:perl-Module-Loaded-0.01-1.src.rpm:1144954561



From fedora-extras-commits at redhat.com  Thu Apr 13 18:56:24 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 11:56:24 -0700
Subject: rpms/perl-Module-Loaded/devel perl-Module-Loaded.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604131856.k3DIuQG4010985@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Loaded/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10941/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Module-Loaded.spec 
Log Message:
auto-import perl-Module-Loaded-0.01-1 on branch devel from perl-Module-Loaded-0.01-1.src.rpm


--- NEW FILE perl-Module-Loaded.spec ---
Name:           perl-Module-Loaded
Version:        0.01
Release:        1%{?dist}
Summary:        Mark modules as loaded or unloaded
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Module-Loaded/
Source0:        http://www.cpan.org/authors/id/K/KA/KANE/Module-Loaded-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
When testing applications, often you find yourself needing to provide
functionality in your test environment that would usually be provided by
external modules. Rather than munging the %INC by hand to mark these
external modules as loaded, so they are not attempted to be loaded by
perl, this module offers you a very simple way to mark modules as loaded
and/or unloaded.

%prep
%setup -q -n Module-Loaded-%{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+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Mar 23 2006 Steven Pritchard <steve at kspei.com> 0.01-1
- Specfile autogenerated by cpanspec 1.62.
- Fix License.
- Capitalize Summary.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Loaded/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Apr 2006 18:53:00 -0000	1.1
+++ .cvsignore	13 Apr 2006 18:56:24 -0000	1.2
@@ -0,0 +1 @@
+Module-Loaded-0.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Loaded/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Apr 2006 18:53:00 -0000	1.1
+++ sources	13 Apr 2006 18:56:24 -0000	1.2
@@ -0,0 +1 @@
+bf2830c75b4ce78ebeee7f5ed074ea2a  Module-Loaded-0.01.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 13 19:11:46 2006
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 13 Apr 2006 12:11:46 -0700
Subject: rpms/wxGTK/devel wxGTK-2.6.3.2-cvs.patch, NONE, 1.1 wxGTK.spec, 1.19,
	1.20
Message-ID: <200604131911.k3DJBmGP013436@cvs-int.fedora.redhat.com>

Author: mattdm

Update of /cvs/extras/rpms/wxGTK/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13416

Modified Files:
	wxGTK.spec 
Added Files:
	wxGTK-2.6.3.2-cvs.patch 
Log Message:
Patch to 2.6.3.2 subrelease (from cvs)


wxGTK-2.6.3.2-cvs.patch:

--- NEW FILE wxGTK-2.6.3.2-cvs.patch ---
diff -ur wxGTK-2.6.3/configure wxGTK-2.6.3.2/configure
--- wxGTK-2.6.3/configure	2006-03-21 18:42:05.000000000 -0500
+++ wxGTK-2.6.3.2/configure	2006-03-30 12:05:51.000000000 -0500
@@ -1669,7 +1669,7 @@
 wx_major_version_number=2
 wx_minor_version_number=6
 wx_release_number=3
-wx_subrelease_number=1
+wx_subrelease_number=2
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
 WX_VERSION=$WX_RELEASE.$wx_release_number
diff -ur wxGTK-2.6.3/configure.in wxGTK-2.6.3.2/configure.in
--- wxGTK-2.6.3/configure.in	2006-03-21 18:42:05.000000000 -0500
+++ wxGTK-2.6.3.2/configure.in	2006-03-30 12:05:49.000000000 -0500
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Id: configure.in,v 1.1063.2.15 2006/03/21 19:33:57 KO Exp $)dnl
+AC_REVISION($Id: configure.in,v 1.1063.2.16 2006/03/30 17:05:49 RD Exp $)dnl
 
 dnl ---------------------------------------------------------------------------
 dnl
@@ -8,7 +8,7 @@
 dnl
 dnl This script is under the wxWidgets licence.
 dnl
-dnl Version: $Id: configure.in,v 1.1063.2.15 2006/03/21 19:33:57 KO Exp $
+dnl Version: $Id: configure.in,v 1.1063.2.16 2006/03/30 17:05:49 RD Exp $
 dnl ---------------------------------------------------------------------------
 
 dnl ---------------------------------------------------------------------------
@@ -33,7 +33,7 @@
 wx_major_version_number=2
 wx_minor_version_number=6
 wx_release_number=3
-wx_subrelease_number=1
+wx_subrelease_number=2
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
 WX_VERSION=$WX_RELEASE.$wx_release_number
diff -ur wxGTK-2.6.3/contrib/src/deprecated/cwlex_yy.c wxGTK-2.6.3.2/contrib/src/deprecated/cwlex_yy.c
--- wxGTK-2.6.3/contrib/src/deprecated/cwlex_yy.c	2006-03-21 18:42:22.000000000 -0500
+++ wxGTK-2.6.3.2/contrib/src/deprecated/cwlex_yy.c	2005-05-04 14:57:49.000000000 -0400
@@ -3,7 +3,7 @@
 /* Licence:   wxWindows Licence */
 
 /* scanner skeleton version:
- * $Header: /pack/cvsroots/wxwindows/wxWindows/contrib/src/deprecated/cwlex_yy.c,v 1.2 2005/05/04 18:57:49 JS Exp $
+ * $Header: /pack/cvsroots/wxwidgets/wxWidgets/contrib/src/deprecated/cwlex_yy.c,v 1.2 2005/05/04 18:57:49 JS Exp $
 	Last change:  JS   13 Jul 97    6:17 pm
  */
 
diff -ur wxGTK-2.6.3/contrib/src/deprecated/doslex.c wxGTK-2.6.3.2/contrib/src/deprecated/doslex.c
--- wxGTK-2.6.3/contrib/src/deprecated/doslex.c	2006-03-21 18:42:22.000000000 -0500
+++ wxGTK-2.6.3.2/contrib/src/deprecated/doslex.c	2005-06-09 14:37:44.000000000 -0400
@@ -1,7 +1,7 @@
 /* A lexical scanner generated by flex */
 
 /* scanner skeleton version:
- * $Header: /pack/cvsroots/wxwindows/wxWindows/contrib/src/deprecated/doslex.c,v 1.6 2005/06/09 18:37:44 ABX Exp $
+ * $Header: /pack/cvsroots/wxwidgets/wxWidgets/contrib/src/deprecated/doslex.c,v 1.6 2005/06/09 18:37:44 ABX Exp $
   Last change:  JS   13 Jul 97    6:17 pm
  */
 /* Copyright: (c) Julian Smart */
diff -ur wxGTK-2.6.3/include/wx/version.h wxGTK-2.6.3.2/include/wx/version.h
--- wxGTK-2.6.3/include/wx/version.h	2006-03-21 18:42:08.000000000 -0500
+++ wxGTK-2.6.3.2/include/wx/version.h	2006-03-30 12:05:48.000000000 -0500
@@ -4,7 +4,7 @@
 *  Author:      Julian Smart
 *  Modified by: Ryan Norton (Converted to C)
 *  Created:     29/01/98
-*  RCS-ID:      $Id: version.h,v 1.69.2.2 2006/01/18 10:25:00 JS Exp $
+*  RCS-ID:      $Id: version.h,v 1.69.2.3 2006/03/30 17:05:48 RD Exp $
 *  Copyright:   (c) 1998 Julian Smart
 *  Licence:     wxWindows licence
 */
@@ -22,7 +22,7 @@
 #define wxMAJOR_VERSION      2
 #define wxMINOR_VERSION      6
 #define wxRELEASE_NUMBER     3
-#define wxSUBRELEASE_NUMBER  0
+#define wxSUBRELEASE_NUMBER  2
 #define wxVERSION_STRING   _T("wxWidgets 2.6.3")
 
 /*  nothing to update below this line when updating the version */
diff -ur wxGTK-2.6.3/locale/fr.po wxGTK-2.6.3.2/locale/fr.po
--- wxGTK-2.6.3/locale/fr.po	2006-03-21 18:42:51.000000000 -0500
+++ wxGTK-2.6.3.2/locale/fr.po	2005-09-20 11:18:55.000000000 -0400
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: wxWidgets-2.6.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-21 17:37+0200\n"
+"POT-Creation-Date: 2005-04-11 22:24+0200\n"
 "PO-Revision-Date: 2005-09-07 09:34+0200\n"
 "Last-Translator: Thomas Huriaux <thomas.huriaux at gmail.com>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -13,12 +13,12 @@
 "Content-Transfer-Encoding: 8bit\n"
 "plural-forms: nplurals=2; plural=n > 1\n"
 
-#: ../src/common/debugrpt.cpp:569
+#: ../src/common/debugrpt.cpp:547
 #, c-format
 msgid "\t%s: %s\n"
 msgstr "\t%s?: %s\n"
 
-#: ../src/common/debugrpt.cpp:572
+#: ../src/common/debugrpt.cpp:550
 msgid ""
 "\n"
 "Please send this report to the program maintainer, thank you!\n"
@@ -26,20 +26,20 @@
 "\n"
 "Veuillez envoyer ce rapport au responsable du programme.\n"
 
-#: ../src/palmos/utils.cpp:206
+#: ../src/palmos/utils.cpp:210
 msgid " "
 msgstr " "
 
-#: ../src/generic/dbgrptg.cpp:312
+#: ../src/generic/dbgrptg.cpp:293
 msgid "              Thank you and we're sorry for the inconvenience!\n"
 msgstr "              Merci et d?sol? pour le d?rangement.\n"
 
-#: ../src/common/log.cpp:321
+#: ../src/common/log.cpp:322
 #, c-format
 msgid " (error %ld: %s)"
 msgstr " (erreur %ld?: %s)"
 
-#: ../src/common/docview.cpp:1419
+#: ../src/common/docview.cpp:1380
 msgid " - "
 msgstr " - "
 
@@ -47,23 +47,23 @@
 msgid " Preview"
 msgstr " Aper?u"
 
-#: ../src/common/paper.cpp:124
+#: ../src/common/paper.cpp:134
 msgid "#10 Envelope, 4 1/8 x 9 1/2 in"
 msgstr "Enveloppe n??10 (4,125 x 9,5 pouces)"
 
-#: ../src/common/paper.cpp:125
+#: ../src/common/paper.cpp:135
 msgid "#11 Envelope, 4 1/2 x 10 3/8 in"
 msgstr "Enveloppe n??11 (4,5 x 10,375 pouces)"
 
-#: ../src/common/paper.cpp:126
+#: ../src/common/paper.cpp:136
 msgid "#12 Envelope, 4 3/4 x 11 in"
 msgstr "Enveloppe n??12 (4,75 x 11 pouces)"
 
-#: ../src/common/paper.cpp:127
+#: ../src/common/paper.cpp:137
 msgid "#14 Envelope, 5 x 11 1/2 in"
 msgstr "Enveloppe n??14 (5 x 11,5 pouces)"
 
-#: ../src/common/paper.cpp:123
+#: ../src/common/paper.cpp:133
 msgid "#9 Envelope, 3 7/8 x 8 7/8 in"
 msgstr "Enveloppe n??9 (3,875 x 8,875 pouces)"
 
@@ -74,13 +74,13 @@
 msgid "#define %s must be an integer."
 msgstr "#define %s doit ?tre un entier."
 
-#: ../src/html/helpfrm.cpp:1042 ../src/html/helpfrm.cpp:1044
-#: ../src/html/helpfrm.cpp:1703 ../src/html/helpfrm.cpp:1736
+#: ../src/html/helpfrm.cpp:1019 ../src/html/helpfrm.cpp:1021
+#: ../src/html/helpfrm.cpp:1689 ../src/html/helpfrm.cpp:1722
 #, c-format
 msgid "%i of %i"
 msgstr "%i de %i"
 
-#: ../src/generic/filedlgg.cpp:288
+#: ../src/generic/filedlgg.cpp:287
 #, c-format
 msgid "%ld bytes"
 msgstr "%ld octets"
@@ -90,27 +90,27 @@
 msgid "%s (or %s)"
 msgstr "%s (ou %s)"
 
-#: ../src/generic/logg.cpp:261
+#: ../src/generic/logg.cpp:262
 #, c-format
 msgid "%s Error"
 msgstr "%s Erreur"
 
-#: ../src/generic/logg.cpp:269
+#: ../src/generic/logg.cpp:270
 #, c-format
 msgid "%s Information"
 msgstr "%s Information"
 
[...16204 lines suppressed...]
--- wxGTK-2.6.3/src/tiff/tif_next.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_next.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_next.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_next.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_open.c wxGTK-2.6.3.2/src/tiff/tif_open.c
--- wxGTK-2.6.3/src/tiff/tif_open.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_open.c	2005-05-31 05:28:43.000000000 -0400
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_open.c,v 1.5 2005/05/31 09:28:43 JS Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_open.c,v 1.5 2005/05/31 09:28:43 JS Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_os2.c wxGTK-2.6.3.2/src/tiff/tif_os2.c
--- wxGTK-2.6.3/src/tiff/tif_os2.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_os2.c	2002-12-04 09:10:19.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_os2.c,v 1.2 2002/12/04 14:10:19 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_os2.c,v 1.2 2002/12/04 14:10:19 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_packbits.c wxGTK-2.6.3.2/src/tiff/tif_packbits.c
--- wxGTK-2.6.3/src/tiff/tif_packbits.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_packbits.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_packbits.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_packbits.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_predict.c wxGTK-2.6.3.2/src/tiff/tif_predict.c
--- wxGTK-2.6.3/src/tiff/tif_predict.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_predict.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_predict.c,v 1.6 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_predict.c,v 1.6 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_predict.h wxGTK-2.6.3.2/src/tiff/tif_predict.h
--- wxGTK-2.6.3/src/tiff/tif_predict.h	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_predict.h	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_predict.h,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_predict.h,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1995-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_print.c wxGTK-2.6.3.2/src/tiff/tif_print.c
--- wxGTK-2.6.3/src/tiff/tif_print.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_print.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_print.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_print.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_read.c wxGTK-2.6.3.2/src/tiff/tif_read.c
--- wxGTK-2.6.3/src/tiff/tif_read.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_read.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_read.c,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_read.c,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_strip.c wxGTK-2.6.3.2/src/tiff/tif_strip.c
--- wxGTK-2.6.3/src/tiff/tif_strip.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_strip.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_strip.c,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_strip.c,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1991-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_swab.c wxGTK-2.6.3.2/src/tiff/tif_swab.c
--- wxGTK-2.6.3/src/tiff/tif_swab.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_swab.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_swab.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_swab.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_thunder.c wxGTK-2.6.3.2/src/tiff/tif_thunder.c
--- wxGTK-2.6.3/src/tiff/tif_thunder.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_thunder.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_thunder.c,v 1.4 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_thunder.c,v 1.4 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_tile.c wxGTK-2.6.3.2/src/tiff/tif_tile.c
--- wxGTK-2.6.3/src/tiff/tif_tile.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_tile.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_tile.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_tile.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1991-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_unix.c wxGTK-2.6.3.2/src/tiff/tif_unix.c
--- wxGTK-2.6.3/src/tiff/tif_unix.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_unix.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_unix.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_unix.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_version.c wxGTK-2.6.3.2/src/tiff/tif_version.c
--- wxGTK-2.6.3/src/tiff/tif_version.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_version.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_version.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_version.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 /*
  * Copyright (c) 1992-1997 Sam Leffler
  * Copyright (c) 1992-1997 Silicon Graphics, Inc.
diff -ur wxGTK-2.6.3/src/tiff/tif_vms.c wxGTK-2.6.3.2/src/tiff/tif_vms.c
--- wxGTK-2.6.3/src/tiff/tif_vms.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_vms.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_vms.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_vms.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_warning.c wxGTK-2.6.3.2/src/tiff/tif_warning.c
--- wxGTK-2.6.3/src/tiff/tif_warning.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_warning.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_warning.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_warning.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_win32.c wxGTK-2.6.3.2/src/tiff/tif_win32.c
--- wxGTK-2.6.3/src/tiff/tif_win32.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_win32.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_win32.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_win32.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_win3.c wxGTK-2.6.3.2/src/tiff/tif_win3.c
--- wxGTK-2.6.3/src/tiff/tif_win3.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_win3.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_win3.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_win3.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_write.c wxGTK-2.6.3.2/src/tiff/tif_write.c
--- wxGTK-2.6.3/src/tiff/tif_write.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_write.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_write.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_write.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_zip.c wxGTK-2.6.3.2/src/tiff/tif_zip.c
--- wxGTK-2.6.3/src/tiff/tif_zip.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_zip.c	2004-11-19 17:29:47.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_zip.c,v 1.4 2004/11/19 22:29:47 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_zip.c,v 1.4 2004/11/19 22:29:47 VZ Exp $ */
 
 /*
  * Copyright (c) 1995-1997 Sam Leffler
diff -ur wxGTK-2.6.3/utils/helpview/src/helpview.cpp wxGTK-2.6.3.2/utils/helpview/src/helpview.cpp
--- wxGTK-2.6.3/utils/helpview/src/helpview.cpp	2006-03-21 18:42:49.000000000 -0500
+++ wxGTK-2.6.3.2/utils/helpview/src/helpview.cpp	2006-03-30 06:35:12.000000000 -0500
@@ -5,7 +5,7 @@
 // Author:      Vaclav Slavik, Julian Smart
 // Modified by:
 // Created:     2002-07-09
-// RCS-ID:      $Id: helpview.cpp,v 1.14 2005/05/30 09:24:08 ABX Exp $
+// RCS-ID:      $Id: helpview.cpp,v 1.14.2.1 2006/03/30 11:35:12 JS Exp $
 // Copyright:   (c) 2002 Vaclav Slavik, Julian Smart and others
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -63,7 +63,7 @@
 
 #ifdef __WXMAC__
     wxApp::s_macAboutMenuItemId = wxID_ABOUT;
-    wxFileName::MacRegisterDefaultTypeAndCreator( "htb" , 'HTBD' , 'HTBA' ) ;
+    wxFileName::MacRegisterDefaultTypeAndCreator( wxT("htb") , 'HTBD' , 'HTBA' ) ;
 #endif
 
     int istyle = wxHF_DEFAULT_STYLE;


Index: wxGTK.spec
===================================================================
RCS file: /cvs/extras/rpms/wxGTK/devel/wxGTK.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- wxGTK.spec	31 Mar 2006 18:44:56 -0000	1.19
+++ wxGTK.spec	13 Apr 2006 19:11:46 -0000	1.20
@@ -6,7 +6,7 @@
 
 Name:           wxGTK
 Version:        2.6.3
-Release:        1%{?dist}
+Release:        2.6.3.2.0%{?dist}
 Summary:        GTK2 port of the wxWidgets GUI library
 # The wxWindows licence is the LGPL with a specific exemption allowing
 # distribution of derived binaries under any terms. (This will eventually
@@ -15,12 +15,13 @@
 Group:          System Environment/Libraries
 URL:            http://www.wxwidgets.org/
 Source0:        http://dl.sf.net/wxwindows/%{name}-%{version}.tar.bz2
+Patch0:         wxGTK-2.6.3.2-cvs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel, zlib-devel >= 1.1.4
 BuildRequires:  libpng-devel, libjpeg-devel, libtiff-devel
 BuildRequires:  expat-devel, SDL-devel, libgnomeprintui22-devel
-BuildRequires:  libGL-devel, libGLU-devel
+BuildRequires:  mesa-libGL-devel, mesa-libGLU-devel
 %if %{withodbc}
 BuildRequires:  unixODBC-devel
 %endif
@@ -87,6 +88,8 @@
 %prep
 %setup -q
 
+%patch0 -p1 -b .2.6.3.2
+
 sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
 
 
@@ -190,11 +193,10 @@
 %endif
 
 %changelog
-* Fri May 31 2006 Matthwe Miller <mattdm at mattdm.org> - 2.6.3-1
-- mesa-*-devel buildrequires to just *-devel, for building on FC4 and
-  for The Future
+* Thu Apr 13 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3-2.6.3.2.0
+- patch to cvs subrelease 2.6.3.2 (matches wxPython)
 
-* Sat Mar 25 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3-0    
+* Sat Mar 25 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3-1    
 - 2.6.3 final
 - remove the locale_install thing -- that was just an issue with using the
   release candidate.
@@ -250,7 +252,7 @@
   Add dist tag.
 - From Tom Callaway: Build and include libwx_gtk2u_animate-2.6.
 
-
+* Thu Apr 28 2005 Matthew Miller <mattdm at mattdm.org> 2.6.1-0.1
 - update to 2.6.1
 - from Michael Schwendt in 2.4.2-11 package: build-require
   xorg-x11-Mesa-libGL and xorg-x11-Mesa-libGLU (the libGL and libGLU



From fedora-extras-commits at redhat.com  Thu Apr 13 19:30:29 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Apr 2006 12:30:29 -0700
Subject: rpms/kmymoney2/FC-3 kmymoney2.spec,1.6,1.7
Message-ID: <200604131930.k3DJUVHT013536@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kmymoney2/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13519

Modified Files:
	kmymoney2.spec 
Log Message:
* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
- desktop-file-install --vendor=""



Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/FC-3/kmymoney2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kmymoney2.spec	22 Feb 2006 15:32:19 -0000	1.6
+++ kmymoney2.spec	13 Apr 2006 19:30:29 -0000	1.7
@@ -17,7 +17,7 @@
 Summary: Personal finance 
 Name:	 kmymoney2
 Version: 0.8.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 Url:	 http://kmymoney2.sourceforge.net/
@@ -78,11 +78,10 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install --vendor fedora \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/appl*/*/*.desktop
+desktop-file-install \
+  --add-category X-Fedora -vendor="" \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
 
 ## File lists
 # locale's
@@ -130,8 +129,8 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/kmymoney*
-%{_datadir}/apps/kmymoney2
-%{_datadir}/applications/*.desktop
+%{_datadir}/apps/kmymoney2/
+%{_datadir}/applications/kde/*.desktop
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/icons/locolor/*/*/*
 %{_datadir}/mimelnk/*/*.desktop
@@ -154,6 +153,9 @@
 
 
 %changelog
+* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
+- desktop-file-install --vendor=""
+
 * Wed Feb 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-1
 - 0.8.3
 



From fedora-extras-commits at redhat.com  Thu Apr 13 19:30:45 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Apr 2006 12:30:45 -0700
Subject: rpms/kmymoney2/FC-4 kmymoney2.spec,1.6,1.7
Message-ID: <200604131930.k3DJUl10013597@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kmymoney2/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13580

Modified Files:
	kmymoney2.spec 
Log Message:
* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
- desktop-file-install --vendor=""



Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/FC-4/kmymoney2.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kmymoney2.spec	22 Feb 2006 15:28:24 -0000	1.6
+++ kmymoney2.spec	13 Apr 2006 19:30:44 -0000	1.7
@@ -17,7 +17,7 @@
 Summary: Personal finance 
 Name:	 kmymoney2
 Version: 0.8.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 Url:	 http://kmymoney2.sourceforge.net/
@@ -78,11 +78,10 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install --vendor fedora \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/appl*/*/*.desktop
+desktop-file-install \
+  --add-category X-Fedora -vendor="" \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
 
 ## File lists
 # locale's
@@ -130,8 +129,8 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/kmymoney*
-%{_datadir}/apps/kmymoney2
-%{_datadir}/applications/*.desktop
+%{_datadir}/apps/kmymoney2/
+%{_datadir}/applications/kde/*.desktop
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/icons/locolor/*/*/*
 %{_datadir}/mimelnk/*/*.desktop
@@ -154,6 +153,9 @@
 
 
 %changelog
+* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
+- desktop-file-install --vendor=""
+
 * Wed Feb 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-1
 - 0.8.3
 



From fedora-extras-commits at redhat.com  Thu Apr 13 19:31:07 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Apr 2006 12:31:07 -0700
Subject: rpms/kmymoney2/FC-5 kmymoney2.spec,1.11,1.12
Message-ID: <200604131931.k3DJV9FQ013658@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kmymoney2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13641

Modified Files:
	kmymoney2.spec 
Log Message:
* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
- desktop-file-install --vendor=""



Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/FC-5/kmymoney2.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kmymoney2.spec	22 Feb 2006 15:00:30 -0000	1.11
+++ kmymoney2.spec	13 Apr 2006 19:31:07 -0000	1.12
@@ -17,7 +17,7 @@
 Summary: Personal finance 
 Name:	 kmymoney2
 Version: 0.8.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 Url:	 http://kmymoney2.sourceforge.net/
@@ -78,11 +78,10 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install --vendor fedora \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/appl*/*/*.desktop
+desktop-file-install \
+  --add-category X-Fedora -vendor="" \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
 
 ## File lists
 # locale's
@@ -130,8 +129,8 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/kmymoney*
-%{_datadir}/apps/kmymoney2
-%{_datadir}/applications/*.desktop
+%{_datadir}/apps/kmymoney2/
+%{_datadir}/applications/kde/*.desktop
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/icons/locolor/*/*/*
 %{_datadir}/mimelnk/*/*.desktop
@@ -154,6 +153,9 @@
 
 
 %changelog
+* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
+- desktop-file-install --vendor=""
+
 * Wed Feb 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-1
 - 0.8.3
 



From fedora-extras-commits at redhat.com  Thu Apr 13 19:31:24 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Apr 2006 12:31:24 -0700
Subject: rpms/kmymoney2/devel kmymoney2.spec,1.11,1.12
Message-ID: <200604131931.k3DJVQmm013720@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kmymoney2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13702

Modified Files:
	kmymoney2.spec 
Log Message:
* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
- desktop-file-install --vendor=""



Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/devel/kmymoney2.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kmymoney2.spec	22 Feb 2006 15:00:30 -0000	1.11
+++ kmymoney2.spec	13 Apr 2006 19:31:24 -0000	1.12
@@ -17,7 +17,7 @@
 Summary: Personal finance 
 Name:	 kmymoney2
 Version: 0.8.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 License: GPL
 Url:	 http://kmymoney2.sourceforge.net/
@@ -78,11 +78,10 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-desktop-file-install --vendor fedora \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/appl*/*/*.desktop
+desktop-file-install \
+  --add-category X-Fedora -vendor="" \
+  --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
 
 ## File lists
 # locale's
@@ -130,8 +129,8 @@
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README TODO
 %{_bindir}/kmymoney*
-%{_datadir}/apps/kmymoney2
-%{_datadir}/applications/*.desktop
+%{_datadir}/apps/kmymoney2/
+%{_datadir}/applications/kde/*.desktop
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/icons/locolor/*/*/*
 %{_datadir}/mimelnk/*/*.desktop
@@ -154,6 +153,9 @@
 
 
 %changelog
+* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
+- desktop-file-install --vendor=""
+
 * Wed Feb 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-1
 - 0.8.3
 



From fedora-extras-commits at redhat.com  Thu Apr 13 19:47:36 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Apr 2006 12:47:36 -0700
Subject: rpms/kmymoney2/devel kmymoney2.spec,1.12,1.13
Message-ID: <200604131947.k3DJlcDQ013806@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kmymoney2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13789

Modified Files:
	kmymoney2.spec 
Log Message:
* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-3
- desktop-file-install --vendor=""



Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/devel/kmymoney2.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kmymoney2.spec	13 Apr 2006 19:31:24 -0000	1.12
+++ kmymoney2.spec	13 Apr 2006 19:47:36 -0000	1.13
@@ -17,7 +17,7 @@
 Summary: Personal finance 
 Name:	 kmymoney2
 Version: 0.8.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL
 Url:	 http://kmymoney2.sourceforge.net/
@@ -79,7 +79,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install \
-  --add-category X-Fedora -vendor="" \
+  --add-category X-Fedora --vendor="" \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
   $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
 
@@ -153,7 +153,7 @@
 
 
 %changelog
-* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
+* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-3
 - desktop-file-install --vendor=""
 
 * Wed Feb 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-1



From fedora-extras-commits at redhat.com  Thu Apr 13 20:03:21 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Apr 2006 13:03:21 -0700
Subject: rpms/kmymoney2/FC-5 kmymoney2.spec,1.12,1.13
Message-ID: <200604132003.k3DK3NSk015933@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kmymoney2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15913

Modified Files:
	kmymoney2.spec 
Log Message:
* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-3
- desktop-file-install --vendor=""



Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/FC-5/kmymoney2.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- kmymoney2.spec	13 Apr 2006 19:31:07 -0000	1.12
+++ kmymoney2.spec	13 Apr 2006 20:03:20 -0000	1.13
@@ -17,7 +17,7 @@
 Summary: Personal finance 
 Name:	 kmymoney2
 Version: 0.8.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL
 Url:	 http://kmymoney2.sourceforge.net/
@@ -79,7 +79,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install \
-  --add-category X-Fedora -vendor="" \
+  --add-category X-Fedora --vendor="" \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
   $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
 
@@ -153,7 +153,7 @@
 
 
 %changelog
-* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
+* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-3
 - desktop-file-install --vendor=""
 
 * Wed Feb 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-1



From fedora-extras-commits at redhat.com  Thu Apr 13 20:03:36 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Apr 2006 13:03:36 -0700
Subject: rpms/kmymoney2/FC-4 kmymoney2.spec,1.7,1.8
Message-ID: <200604132003.k3DK3c0X015994@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kmymoney2/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15977

Modified Files:
	kmymoney2.spec 
Log Message:
* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-3
- desktop-file-install --vendor=""



Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/FC-4/kmymoney2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kmymoney2.spec	13 Apr 2006 19:30:44 -0000	1.7
+++ kmymoney2.spec	13 Apr 2006 20:03:36 -0000	1.8
@@ -17,7 +17,7 @@
 Summary: Personal finance 
 Name:	 kmymoney2
 Version: 0.8.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL
 Url:	 http://kmymoney2.sourceforge.net/
@@ -79,7 +79,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install \
-  --add-category X-Fedora -vendor="" \
+  --add-category X-Fedora --vendor="" \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
   $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
 
@@ -153,7 +153,7 @@
 
 
 %changelog
-* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
+* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-3
 - desktop-file-install --vendor=""
 
 * Wed Feb 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-1



From fedora-extras-commits at redhat.com  Thu Apr 13 20:04:00 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Apr 2006 13:04:00 -0700
Subject: rpms/kmymoney2/FC-3 kmymoney2.spec,1.7,1.8
Message-ID: <200604132004.k3DK42Fv016057@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kmymoney2/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16040

Modified Files:
	kmymoney2.spec 
Log Message:
* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-3
- desktop-file-install --vendor=""



Index: kmymoney2.spec
===================================================================
RCS file: /cvs/extras/rpms/kmymoney2/FC-3/kmymoney2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kmymoney2.spec	13 Apr 2006 19:30:29 -0000	1.7
+++ kmymoney2.spec	13 Apr 2006 20:03:59 -0000	1.8
@@ -17,7 +17,7 @@
 Summary: Personal finance 
 Name:	 kmymoney2
 Version: 0.8.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPL
 Url:	 http://kmymoney2.sourceforge.net/
@@ -79,7 +79,7 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install \
-  --add-category X-Fedora -vendor="" \
+  --add-category X-Fedora --vendor="" \
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications/kde \
   $RPM_BUILD_ROOT%{_datadir}/applications/kde/*.desktop
 
@@ -153,7 +153,7 @@
 
 
 %changelog
-* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-2
+* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-3
 - desktop-file-install --vendor=""
 
 * Wed Feb 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.8.3-1



From fedora-extras-commits at redhat.com  Thu Apr 13 20:59:38 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Apr 2006 13:59:38 -0700
Subject: rpms/kasablanca/devel kasablanca.spec,1.15,1.16
Message-ID: <200604132059.k3DKxeV3016312@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kasablanca/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16295

Modified Files:
	kasablanca.spec 
Log Message:
* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.0.2-8
- --vendor: fedora -> kde



Index: kasablanca.spec
===================================================================
RCS file: /cvs/extras/rpms/kasablanca/devel/kasablanca.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- kasablanca.spec	1 Mar 2006 16:27:16 -0000	1.15
+++ kasablanca.spec	13 Apr 2006 20:59:37 -0000	1.16
@@ -2,7 +2,7 @@
 Name:    kasablanca
 Summary: Graphical FTP client
 Version: 0.4.0.2
-Release: 7%{?dist}.3
+Release: 8%{?dist}
 
 License: GPL
 Url: 	 http://kasablanca.berlios.de/ 
@@ -57,14 +57,14 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --vendor fedora \
-  --add-category "X-Fedora" \
-  --add-category "Network" \
-  --add-category "Application" \
-  --add-category "KDE" \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  --vendor="" \
+  --add-category="X-Fedora" \
+  --add-category="Network" \
+  --add-category="Application" \
+  --add-category="KDE" \
   --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/appl*/*/*.desktop
+  $RPM_BUILD_ROOT%{_datadir}/applnk/*/*.desktop
 
 ## File lists
 # locale's
@@ -109,13 +109,16 @@
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING NEWS README 
 %{_bindir}/*
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/kde/*.desktop
 %{_datadir}/apps/kasablanca/
 %config %{_datadir}/config*/*
 %{_datadir}/icons/hicolor/*/*/*
 
 
 %changelog
+* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.0.2-8
+- --vendor: fedora -> kde
+
 * Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net>
 - fc5: gcc/glibc respin
 



From fedora-extras-commits at redhat.com  Thu Apr 13 20:59:53 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Apr 2006 13:59:53 -0700
Subject: rpms/kasablanca/FC-5 kasablanca.spec,1.15,1.16
Message-ID: <200604132059.k3DKxtZc016373@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kasablanca/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16356

Modified Files:
	kasablanca.spec 
Log Message:
* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.0.2-8
- --vendor: fedora -> kde



Index: kasablanca.spec
===================================================================
RCS file: /cvs/extras/rpms/kasablanca/FC-5/kasablanca.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- kasablanca.spec	1 Mar 2006 16:27:16 -0000	1.15
+++ kasablanca.spec	13 Apr 2006 20:59:52 -0000	1.16
@@ -2,7 +2,7 @@
 Name:    kasablanca
 Summary: Graphical FTP client
 Version: 0.4.0.2
-Release: 7%{?dist}.3
+Release: 8%{?dist}
 
 License: GPL
 Url: 	 http://kasablanca.berlios.de/ 
@@ -57,14 +57,14 @@
 make install DESTDIR=$RPM_BUILD_ROOT
 
 desktop-file-install \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --vendor fedora \
-  --add-category "X-Fedora" \
-  --add-category "Network" \
-  --add-category "Application" \
-  --add-category "KDE" \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  --vendor="" \
+  --add-category="X-Fedora" \
+  --add-category="Network" \
+  --add-category="Application" \
+  --add-category="KDE" \
   --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/appl*/*/*.desktop
+  $RPM_BUILD_ROOT%{_datadir}/applnk/*/*.desktop
 
 ## File lists
 # locale's
@@ -109,13 +109,16 @@
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING NEWS README 
 %{_bindir}/*
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/kde/*.desktop
 %{_datadir}/apps/kasablanca/
 %config %{_datadir}/config*/*
 %{_datadir}/icons/hicolor/*/*/*
 
 
 %changelog
+* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.0.2-8
+- --vendor: fedora -> kde
+
 * Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net>
 - fc5: gcc/glibc respin
 



From fedora-extras-commits at redhat.com  Thu Apr 13 21:00:07 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Apr 2006 14:00:07 -0700
Subject: rpms/kasablanca/FC-4 kasablanca.spec,1.11,1.12
Message-ID: <200604132100.k3DL09JB016448@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kasablanca/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16431

Modified Files:
	kasablanca.spec 
Log Message:
* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.0.2-8
- --vendor: fedora -> kde



Index: kasablanca.spec
===================================================================
RCS file: /cvs/extras/rpms/kasablanca/FC-4/kasablanca.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- kasablanca.spec	19 Jan 2006 15:59:20 -0000	1.11
+++ kasablanca.spec	13 Apr 2006 21:00:07 -0000	1.12
@@ -2,7 +2,7 @@
 Name:    kasablanca
 Summary: Graphical FTP client
 Version: 0.4.0.2
-Release: 7%{?dist}
+Release: 8%{?dist}
 
 License: GPL
 Url: 	 http://kasablanca.berlios.de/ 
@@ -40,7 +40,7 @@
 
 # Needed(?) for older/legacy setups, harmless otherwise
 if pkg-config openssl ; then
-  export CPPFLAGS="$CPPFLAGS `pkg-config --cflags-only-I openssl`"
+  export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags-only-I openssl)"
 fi
 
 %configure \
@@ -56,14 +56,15 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --delete-original --vendor fedora \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category "X-Fedora" \
-  --add-category "Network" \
-  --add-category "Application" \
-  --add-category "KDE" \
-  $RPM_BUILD_ROOT%{_datadir}/appl*/*/*.desktop
+desktop-file-install \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  --vendor="" \
+  --add-category="X-Fedora" \
+  --add-category="Network" \
+  --add-category="Application" \
+  --add-category="KDE" \
+  --delete-original \
+  $RPM_BUILD_ROOT%{_datadir}/applnk/*/*.desktop
 
 ## File lists
 # locale's
@@ -108,13 +109,19 @@
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING NEWS README 
 %{_bindir}/*
-%{_datadir}/applications/*.desktop
+%{_datadir}/applications/kde/*.desktop
 %{_datadir}/apps/kasablanca/
 %config %{_datadir}/config*/*
 %{_datadir}/icons/hicolor/*/*/*
 
 
 %changelog
+* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.0.2-8
+- --vendor: fedora -> kde
+
+* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net>
+- fc5: gcc/glibc respin
+
 * Thu Jan 19 2006 Rex Dieter <rexdieter[AT]usrs.sf.net> 0.4.0.2-7
 - drop x-modular hack(s) (kdelibs-devel fixed)
 - .desktop: GenericName=FTP client



From fedora-extras-commits at redhat.com  Thu Apr 13 21:00:24 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Apr 2006 14:00:24 -0700
Subject: rpms/kasablanca/FC-3 kasablanca.spec,1.8,1.9
Message-ID: <200604132100.k3DL0QLa016515@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kasablanca/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16498

Modified Files:
	kasablanca.spec 
Log Message:
* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.0.2-8
- --vendor: fedora -> kde



Index: kasablanca.spec
===================================================================
RCS file: /cvs/extras/rpms/kasablanca/FC-3/kasablanca.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kasablanca.spec	19 Dec 2005 18:14:25 -0000	1.8
+++ kasablanca.spec	13 Apr 2006 21:00:24 -0000	1.9
@@ -2,7 +2,7 @@
 Name:    kasablanca
 Summary: Graphical FTP client
 Version: 0.4.0.2
-Release: 5%{?dist}
+Release: 8%{?dist}
 
 License: GPL
 Url: 	 http://kasablanca.berlios.de/ 
@@ -10,19 +10,29 @@
 Group: 	 Applications/Internet 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1: kasablanca-0.4.0.2-dt.patch
+
 BuildRequires: gettext 
 BuildRequires: desktop-file-utils
 BuildRequires: openssl-devel
 BuildRequires: kdelibs-devel >= 6:3.3
 
 %description
-Kasablanca is an ftp client for KDE, among its features are currently 
-encryption (auth tls) support, fxp, site bookmarks, and queued transfers.
+Kasablanca is an ftp client for KDE, among its features are currently: 
+* ftps encryption via AUTH TLS
+* fxp (direct server to server transfer), supporting alternative mode.
+* advanced bookmarking system.
+* fast responsive multithreaded engine.
+* concurrent connections to multiple hosts.
+* interactive transfer queue, movable by drag and drop.
+* small nifty features, like a skiplist.
 
 
 %prep
 %setup -q 
 
+%patch1 -p1 -b .dt
+
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -30,7 +40,7 @@
 
 # Needed(?) for older/legacy setups, harmless otherwise
 if pkg-config openssl ; then
-  export CPPFLAGS="$CPPFLAGS `pkg-config --cflags-only-I openssl`"
+  export CPPFLAGS="$CPPFLAGS $(pkg-config --cflags-only-I openssl)"
 fi
 
 %configure \
@@ -46,14 +56,15 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --delete-original --vendor fedora \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category "X-Fedora" \
-  --add-category "Network" \
-  --add-category "Application" \
-  --add-category "KDE" \
-  $RPM_BUILD_ROOT%{_datadir}/appl*/*/*.desktop
+desktop-file-install \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
+  --vendor="" \
+  --add-category="X-Fedora" \
+  --add-category="Network" \
+  --add-category="Application" \
+  --add-category="KDE" \
+  --delete-original \
+  $RPM_BUILD_ROOT%{_datadir}/applnk/*/*.desktop
 
 ## File lists
 # locale's
@@ -98,13 +109,28 @@
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING NEWS README 
 %{_bindir}/*
-%{_datadir}/applications/*.desktop
-%{_datadir}/apps/%{name}
+%{_datadir}/applications/kde/*.desktop
+%{_datadir}/apps/kasablanca/
 %config %{_datadir}/config*/*
 %{_datadir}/icons/hicolor/*/*/*
 
 
 %changelog
+* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.0.2-8
+- --vendor: fedora -> kde
+
+* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net>
+- fc5: gcc/glibc respin
+
+* Thu Jan 19 2006 Rex Dieter <rexdieter[AT]usrs.sf.net> 0.4.0.2-7
+- drop x-modular hack(s) (kdelibs-devel fixed)
+- .desktop: GenericName=FTP client
+- update %%description
+
+* Mon Dec 19 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.0.2-6
+- fix for modular X
+- workaround kdelibs-devel missing deps (#176159)
+
 * Mon Dec 19 2005 Rex Dieter <rexdieter[AT]users.sf.net> 0.4.0.2-5
 - %%post/%%postun: nicer icon bits
 



From fedora-extras-commits at redhat.com  Thu Apr 13 21:06:19 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Apr 2006 14:06:19 -0700
Subject: rpms/kasablanca/FC-3 kasablanca-0.4.0.2-dt.patch,NONE,1.1
Message-ID: <200604132106.k3DL6M3B018675@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kasablanca/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18654

Added Files:
	kasablanca-0.4.0.2-dt.patch 
Log Message:
import


kasablanca-0.4.0.2-dt.patch:

--- NEW FILE kasablanca-0.4.0.2-dt.patch ---
--- kasablanca-0.4.0.2/src/kasablanca.desktop.dt	2004-03-22 12:58:39.000000000 -0600
+++ kasablanca-0.4.0.2/src/kasablanca.desktop	2006-01-19 09:48:07.000000000 -0600
@@ -1,26 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Name=kasablanca
-Name[xx]=xxkasablancaxx
+GenericName=FTP Client
 Exec=kasablanca
 Icon=kasablanca
 Type=Application
-Comment=A simple KDE Application
-Comment[ca]=Una simple aplicaci?? KDE
-Comment[da]=Et simpelt KDE program
-Comment[de]=Eine einfache KDE-Anwendung
-Comment[el]=?????? ???????? ???????????????? ?????? KDE
-Comment[es]=Una aplicaci??n de KDE sencilla
-Comment[et]=Lihtne KDE rakendus
-Comment[fr]=Une application simple pour KDE.
-Comment[hu]=Egyszer?? KDE-alkalmaz??s
-Comment[it]=Una semplice applicazione KDE
-Comment[nl]=Een eenvoudige KDE-toepassing
-Comment[pt]=Uma aplica????o KDE simples
-Comment[pt_BR]=Um simples Aplicativo do KDE
-Comment[ru]=?????????????? ???????????????????? KDE
-Comment[sl]=Preprost program za KDE
-Comment[sr]=?????????????????????? KDE ??????????????
-Comment[sv]=Ett enkelt KDE-program
-Comment[xx]=xxA simple KDE Applicationxx
-Comment[zh_CN]=???????????????KDE????????????



From fedora-extras-commits at redhat.com  Thu Apr 13 21:08:33 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 13 Apr 2006 14:08:33 -0700
Subject: rpms/kasablanca/FC-3 kasablanca.spec,1.9,1.10
Message-ID: <200604132108.k3DL8ZcB018756@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kasablanca/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18734

Modified Files:
	kasablanca.spec 
Log Message:
fc3 respin for missing patch



Index: kasablanca.spec
===================================================================
RCS file: /cvs/extras/rpms/kasablanca/FC-3/kasablanca.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kasablanca.spec	13 Apr 2006 21:00:24 -0000	1.9
+++ kasablanca.spec	13 Apr 2006 21:08:33 -0000	1.10
@@ -2,7 +2,7 @@
 Name:    kasablanca
 Summary: Graphical FTP client
 Version: 0.4.0.2
-Release: 8%{?dist}
+Release: 8%{?dist}.1
 
 License: GPL
 Url: 	 http://kasablanca.berlios.de/ 



From fedora-extras-commits at redhat.com  Thu Apr 13 21:09:03 2006
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Thu, 13 Apr 2006 14:09:03 -0700
Subject: rpms/wxPython/devel .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 wxPython.spec, 1.10, 1.11
Message-ID: <200604132109.k3DL95MM018830@cvs-int.fedora.redhat.com>

Author: mattdm

Update of /cvs/extras/rpms/wxPython/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18727

Modified Files:
	.cvsignore sources wxPython.spec 
Log Message:
- version 2.6.3.2
- move wxversion.py _into_ lib64. Apparently that's the right thing to do.
  :)
- upstream tarball no longer includes embedded.o (since I finally got around
  to pointing that out to the developers instead of just kludging it away.)
- buildrequires to just libGLU-devel instead of mesa-libGL-devel



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wxPython/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	31 Mar 2006 02:23:27 -0000	1.4
+++ .cvsignore	13 Apr 2006 21:09:03 -0000	1.5
@@ -1 +1 @@
-wxPython-src-2.6.3.0.tar.gz
+wxPython-src-2.6.3.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wxPython/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	31 Mar 2006 02:23:27 -0000	1.4
+++ sources	13 Apr 2006 21:09:03 -0000	1.5
@@ -1 +1 @@
-2891a496f4a415179e6a231619344b27  wxPython-src-2.6.3.0.tar.gz
+a27546fab8a8d77eb6b67954e6362269  wxPython-src-2.6.3.2.tar.gz


Index: wxPython.spec
===================================================================
RCS file: /cvs/extras/rpms/wxPython/devel/wxPython.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- wxPython.spec	31 Mar 2006 18:46:12 -0000	1.10
+++ wxPython.spec	13 Apr 2006 21:09:03 -0000	1.11
@@ -4,8 +4,8 @@
 %define buildflags WXPORT=gtk2 UNICODE=1
 
 Name:           wxPython
-Version:        2.6.3.0
-Release:        5%{?dist}
+Version:        2.6.3.2
+Release:        1%{?dist}
 
 Summary:        GUI toolkit for the Python programming language
 
@@ -17,7 +17,7 @@
 
 BuildRequires:  wxGTK-devel = 2.6.3, pkgconfig
 BuildRequires:  zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel
-BuildRequires:  libGLU-devel
+BuildRequires:  libGL-devel, libGLU-devel
 BuildRequires:  python-devel, wxGTK-gl
 
 # packages should depend on "wxPython", not "wxPythonGTK2", but in case
@@ -46,9 +46,6 @@
 %prep
 %setup -q -n wxPython-src-%{version}
 
-# There's binaries included in the source tarball, resulting in bogus
-# dependencies for the package -- clean it up:
-rm wxPython/samples/embedded/embedded wxPython/samples/embedded/embedded.o
 
 %build
 # Just build the wxPython part, not all of wxWindows which we already have
@@ -64,6 +61,11 @@
 cd wxPython
 python setup.py %{buildflags} install --root=$RPM_BUILD_ROOT
 
+# this is a kludge....
+%if "%{python_sitelib}" != "%{python_sitearch}"
+mv $RPM_BUILD_ROOT%{python_sitelib}/wx.pth  $RPM_BUILD_ROOT%{python_sitearch}
+mv $RPM_BUILD_ROOT%{python_sitelib}/wxversion.py* $RPM_BUILD_ROOT%{python_sitearch}
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -73,8 +75,8 @@
 %defattr(-,root,root,-)
 %doc wxPython/docs wxPython/demo wxPython/licence/ wxPython/samples
 %{_bindir}/*
-%{python_sitelib}/wx.pth
-%{python_sitelib}/wxversion.py*
+%{python_sitearch}/wx.pth
+%{python_sitearch}/wxversion.py*
 %dir %{python_sitearch}/wx-2.6-gtk2-unicode/
 %{python_sitearch}/wx-2.6-gtk2-unicode/wx
 %{python_sitearch}/wx-2.6-gtk2-unicode/wxPython
@@ -90,8 +92,12 @@
 
 
 %changelog
-* Fri Mar 31 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3.0-5
-- mesa-libGLU-devel -> libGLU-devel, for FC4 and for The Future
+* Thu Apr 13 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3.2-1
+- version 2.6.3.2
+- move wxversion.py _into_ lib64. Apparently that's the right thing to do. :)
+- upstream tarball no longer includes embedded.o (since I finally got around
+  to pointing that out to the developers instead of just kludging it away.)
+- buildrequires to just libGLU-devel instead of mesa-libGL-devel
 
 * Fri Mar 31 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3.0-4
 - grr. bump relnumber.



From fedora-extras-commits at redhat.com  Thu Apr 13 21:50:31 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 14:50:31 -0700
Subject: rpms/perl-Params-Check - New directory
Message-ID: <200604132150.k3DLoXI9019233@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Params-Check
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19212/perl-Params-Check

Log Message:
Directory /cvs/extras/rpms/perl-Params-Check added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 13 21:50:32 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 14:50:32 -0700
Subject: rpms/perl-Params-Check/devel - New directory
Message-ID: <200604132150.k3DLoYew019236@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Params-Check/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19212/perl-Params-Check/devel

Log Message:
Directory /cvs/extras/rpms/perl-Params-Check/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 13 21:51:17 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 14:51:17 -0700
Subject: rpms/perl-Params-Check Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604132151.k3DLpJYA019285@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Params-Check
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19257

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Params-Check


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Params-Check
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 13 21:51:17 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 14:51:17 -0700
Subject: rpms/perl-Params-Check/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200604132151.k3DLpJLu019288@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Params-Check/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19257/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Params-Check


--- 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 Apr 13 21:52:38 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 14:52:38 -0700
Subject: rpms/perl-Params-Check import.log,1.1,1.2
Message-ID: <200604132152.k3DLqegR019363@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Params-Check
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19328

Modified Files:
	import.log 
Log Message:
auto-import perl-Params-Check-0.24-1 on branch devel from perl-Params-Check-0.24-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Check/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Apr 2006 21:51:16 -0000	1.1
+++ import.log	13 Apr 2006 21:52:38 -0000	1.2
@@ -0,0 +1 @@
+perl-Params-Check-0_24-1:HEAD:perl-Params-Check-0.24-1.src.rpm:1144965133



From fedora-extras-commits at redhat.com  Thu Apr 13 21:52:39 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 14:52:39 -0700
Subject: rpms/perl-Params-Check/devel perl-Params-Check.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604132152.k3DLqfxO019368@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Params-Check/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19328/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Params-Check.spec 
Log Message:
auto-import perl-Params-Check-0.24-1 on branch devel from perl-Params-Check-0.24-1.src.rpm


--- NEW FILE perl-Params-Check.spec ---
Name:           perl-Params-Check
Version:        0.24
Release:        1%{?dist}
Summary:        Generic input parsing/checking mechanism
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Params-Check/
Source0:        http://www.cpan.org/authors/id/K/KA/KANE/Params-Check-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Locale::Maketext::Simple)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Params::Check is a generic input parsing/checking mechanism.

%prep
%setup -q -n Params-Check-%{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+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Mar 23 2006 Steven Pritchard <steve at kspei.com> 0.24-1
- Specfile autogenerated by cpanspec 1.62.
- Fix License.
- Drop explicit Requires: perl(Locale::Maketext::Simple).
- Clean up Summary a little.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Check/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Apr 2006 21:51:17 -0000	1.1
+++ .cvsignore	13 Apr 2006 21:52:39 -0000	1.2
@@ -0,0 +1 @@
+Params-Check-0.24.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Check/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Apr 2006 21:51:17 -0000	1.1
+++ sources	13 Apr 2006 21:52:39 -0000	1.2
@@ -0,0 +1 @@
+3d135f26327b78adc9deb56252ce2381  Params-Check-0.24.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 13 22:00:55 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 15:00:55 -0700
Subject: rpms/perl-Module-Load-Conditional - New directory
Message-ID: <200604132200.k3DM0vlF019543@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Load-Conditional
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19515/perl-Module-Load-Conditional

Log Message:
Directory /cvs/extras/rpms/perl-Module-Load-Conditional added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 13 22:00:56 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 15:00:56 -0700
Subject: rpms/perl-Module-Load-Conditional/devel - New directory
Message-ID: <200604132200.k3DM0wiA019546@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Load-Conditional/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19515/perl-Module-Load-Conditional/devel

Log Message:
Directory /cvs/extras/rpms/perl-Module-Load-Conditional/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 13 22:01:32 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 15:01:32 -0700
Subject: rpms/perl-Module-Load-Conditional Makefile, NONE, 1.1 import.log,
	NONE, 1.1
Message-ID: <200604132201.k3DM1ZMb021598@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Load-Conditional
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21569

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Module-Load-Conditional


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Module-Load-Conditional
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 13 22:01:33 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 15:01:33 -0700
Subject: rpms/perl-Module-Load-Conditional/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200604132201.k3DM1ZeP021601@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Load-Conditional/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21569/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Module-Load-Conditional


--- 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 Apr 13 22:02:55 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 15:02:55 -0700
Subject: rpms/perl-Module-Load-Conditional/devel
	perl-Module-Load-Conditional.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604132202.k3DM2who021669@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Load-Conditional/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21634/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Module-Load-Conditional.spec 
Log Message:
auto-import perl-Module-Load-Conditional-0.08-1 on branch devel from perl-Module-Load-Conditional-0.08-1.src.rpm


--- NEW FILE perl-Module-Load-Conditional.spec ---
Name:           perl-Module-Load-Conditional
Version:        0.08
Release:        1%{?dist}
Summary:        Looking up module information / loading at runtime
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Module-Load-Conditional/
Source0:        http://www.cpan.org/authors/id/K/KA/KANE/Module-Load-Conditional-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Locale::Maketext::Simple)
BuildRequires:  perl(Module::Load)
BuildRequires:  perl(Params::Check)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Module::Load::Conditional provides simple ways to query and possibly load
any of the modules you have installed on your system during runtime.

%prep
%setup -q -n Module-Load-Conditional-%{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+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Mar 23 2006 Steven Pritchard <steve at kspei.com> 0.08-1
- Specfile autogenerated by cpanspec 1.62.
- Fix License.
- Drop explicit Requires.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Load-Conditional/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Apr 2006 22:01:33 -0000	1.1
+++ .cvsignore	13 Apr 2006 22:02:55 -0000	1.2
@@ -0,0 +1 @@
+Module-Load-Conditional-0.08.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Load-Conditional/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	13 Apr 2006 22:01:33 -0000	1.1
+++ sources	13 Apr 2006 22:02:55 -0000	1.2
@@ -0,0 +1 @@
+9e2a706b6511651ca4eb6de0c4c89a12  Module-Load-Conditional-0.08.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 13 22:02:54 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 15:02:54 -0700
Subject: rpms/perl-Module-Load-Conditional import.log,1.1,1.2
Message-ID: <200604132203.k3DM3QPT021674@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Load-Conditional
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21634

Modified Files:
	import.log 
Log Message:
auto-import perl-Module-Load-Conditional-0.08-1 on branch devel from perl-Module-Load-Conditional-0.08-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Load-Conditional/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	13 Apr 2006 22:01:32 -0000	1.1
+++ import.log	13 Apr 2006 22:02:54 -0000	1.2
@@ -0,0 +1 @@
+perl-Module-Load-Conditional-0_08-1:HEAD:perl-Module-Load-Conditional-0.08-1.src.rpm:1144965749



From fedora-extras-commits at redhat.com  Thu Apr 13 22:20:53 2006
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Thu, 13 Apr 2006 15:20:53 -0700
Subject: rpms/gpsd/FC-4 gpsd.spec,1.1,1.2
Message-ID: <200604132220.k3DMKtvF021859@cvs-int.fedora.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/gpsd/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21814/FC-4

Modified Files:
	gpsd.spec 
Log Message:
Include dbus-glib in BuildRequires so it will build in mock.



Index: gpsd.spec
===================================================================
RCS file: /cvs/extras/rpms/gpsd/FC-4/gpsd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gpsd.spec	13 Apr 2006 01:09:39 -0000	1.1
+++ gpsd.spec	13 Apr 2006 22:20:53 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gpsd
 Version:        2.32
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Service daemon for mediating access to a GPS
 
 Group:          System Environment/Daemons
@@ -11,7 +11,7 @@
 Source2:        xgpsspeed.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: dbus-devel ncurses-devel xmlto python
+BuildRequires: dbus-devel dbus-glib ncurses-devel xmlto python
 BuildRequires: openmotif-devel libXaw-devel desktop-file-utils
 
 Requires(post):    /sbin/ldconfig
@@ -146,6 +146,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Thu Apr 13 2006 Matthew Truch <matt at truch.net> - 2.32-4
+- Add dbus-glib to BuildRequires as needed for build.
+
 * Sun Apr 9 2006 Matthew Truch <matt at truch.net> - 2.32-3
 - Include xmlto and python in buildrequires so things build right.
 - Don't package static library file.  



From fedora-extras-commits at redhat.com  Thu Apr 13 22:20:54 2006
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Thu, 13 Apr 2006 15:20:54 -0700
Subject: rpms/gpsd/FC-5 gpsd.spec,1.1,1.2
Message-ID: <200604132220.k3DMKuUn021863@cvs-int.fedora.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/gpsd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21814/FC-5

Modified Files:
	gpsd.spec 
Log Message:
Include dbus-glib in BuildRequires so it will build in mock.



Index: gpsd.spec
===================================================================
RCS file: /cvs/extras/rpms/gpsd/FC-5/gpsd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gpsd.spec	13 Apr 2006 01:09:39 -0000	1.1
+++ gpsd.spec	13 Apr 2006 22:20:54 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gpsd
 Version:        2.32
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Service daemon for mediating access to a GPS
 
 Group:          System Environment/Daemons
@@ -11,7 +11,7 @@
 Source2:        xgpsspeed.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: dbus-devel ncurses-devel xmlto python
+BuildRequires: dbus-devel dbus-glib ncurses-devel xmlto python
 BuildRequires: openmotif-devel libXaw-devel desktop-file-utils
 
 Requires(post):    /sbin/ldconfig
@@ -146,6 +146,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Thu Apr 13 2006 Matthew Truch <matt at truch.net> - 2.32-4
+- Add dbus-glib to BuildRequires as needed for build.
+
 * Sun Apr 9 2006 Matthew Truch <matt at truch.net> - 2.32-3
 - Include xmlto and python in buildrequires so things build right.
 - Don't package static library file.  



From fedora-extras-commits at redhat.com  Thu Apr 13 22:20:55 2006
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Thu, 13 Apr 2006 15:20:55 -0700
Subject: rpms/gpsd/devel gpsd.spec,1.1,1.2
Message-ID: <200604132220.k3DMKvhO021869@cvs-int.fedora.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/gpsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21814/devel

Modified Files:
	gpsd.spec 
Log Message:
Include dbus-glib in BuildRequires so it will build in mock.



Index: gpsd.spec
===================================================================
RCS file: /cvs/extras/rpms/gpsd/devel/gpsd.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gpsd.spec	13 Apr 2006 01:09:39 -0000	1.1
+++ gpsd.spec	13 Apr 2006 22:20:55 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gpsd
 Version:        2.32
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Service daemon for mediating access to a GPS
 
 Group:          System Environment/Daemons
@@ -11,7 +11,7 @@
 Source2:        xgpsspeed.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: dbus-devel ncurses-devel xmlto python
+BuildRequires: dbus-devel dbus-glib ncurses-devel xmlto python
 BuildRequires: openmotif-devel libXaw-devel desktop-file-utils
 
 Requires(post):    /sbin/ldconfig
@@ -146,6 +146,9 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Thu Apr 13 2006 Matthew Truch <matt at truch.net> - 2.32-4
+- Add dbus-glib to BuildRequires as needed for build.
+
 * Sun Apr 9 2006 Matthew Truch <matt at truch.net> - 2.32-3
 - Include xmlto and python in buildrequires so things build right.
 - Don't package static library file.  



From fedora-extras-commits at redhat.com  Thu Apr 13 22:28:07 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Thu, 13 Apr 2006 15:28:07 -0700
Subject: owners owners.list,1.840,1.841
Message-ID: <200604132228.k3DMS9BS021993@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21949

Modified Files:
	owners.list 
Log Message:
Adding perl-Locale-Maketext-Simple, perl-Module-Load,
perl-Module-Loaded, perl-Module-Load-Conditional, and
perl-Params-Check.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.840
retrieving revision 1.841
diff -u -r1.840 -r1.841
--- owners.list	13 Apr 2006 14:47:13 -0000	1.840
+++ owners.list	13 Apr 2006 22:28:07 -0000	1.841
@@ -1009,6 +1009,7 @@
 Fedora Extras|perl-Lingua-EN-Inflect-Number|Force number of words to singular or plural|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Locale-Maketext-Fuzzy|Maketext from already interpolated strings|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Locale-Maketext-Lexicon|Extract translatable strings from source|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Locale-Maketext-Simple|Simple interface to Locale::Maketext::Lexicon|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Log-Dispatch|Dispatches messages to one or more outputs|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Log-Log4perl|Log4j implementation for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Mail-Alias|For bugs related to the perl-Mail-Alias component|oliver at linux-kernel.at|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1025,6 +1026,9 @@
 Fedora Extras|perl-MLDBM|Store multi-level hash structure in single level tied hash|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Build|Perl module for building and installing Perl modules|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-CoreList|Perl core modules indexed by perl versions|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Module-Load|Runtime require of both modules and files|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Module-Load-Conditional|Looking up module information / loading at runtime|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Module-Loaded|Mark modules as loaded or unloaded|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Refresh|Refresh %INC files when updated on disk|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Signature|CPAN signature management utilities and modules|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Versions-Report|Report versions of all modules in memory|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1039,6 +1043,7 @@
 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-Number-Compare|Perl module for numeric comparisons|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-OLE-Storage_Lite|Simple Class for OLE document interface|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Params-Check|Generic input parsing/checking mechanism|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Params-Util|Simple standalone param-checking functions|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Params-Validate|Params-Validate Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-PAR-Dist|Toolkit for creating and manipulating Perl PAR distributions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Thu Apr 13 22:53:01 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 13 Apr 2006 15:53:01 -0700
Subject: rpms/cernlib/devel patchy-yexpand.diff, NONE, 1.1 cernlib.spec, 1.28,
	1.29
Message-ID: <200604132253.k3DMr3si022320@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22300

Modified Files:
	cernlib.spec 
Added Files:
	patchy-yexpand.diff 
Log Message:
* Tue Apr 13 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-18
- add a patch to yexpand, to avoid using $HOME.


patchy-yexpand.diff:

--- NEW FILE patchy-yexpand.diff ---
--- 2004.orig/src/patchy/yexpand.script	2006-04-14 00:29:48.000000000 +0200
+++ 2004/src/patchy/yexpand.script	2006-04-14 00:35:13.000000000 +0200
@@ -26,8 +26,8 @@
 # CERN_ROOT=":$CERN_ROOT" ; export CERN_ROOT 
   CERN_ROOT=":$CERN/$CERN_LEVEL" ; export CERN_ROOT 
 
-  tfile="$HOME/$tfile.yexp"
-  echo "#!/bin/sh"    >$tfile
+  tfile="./$tfile.yexp"
+  echo "#! /bin/sh"    >$tfile
   echo "  cat <<EOI" >>$tfile
   cat <$ifile        >>$tfile
   cc=$?


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- cernlib.spec	13 Apr 2006 17:10:51 -0000	1.28
+++ cernlib.spec	13 Apr 2006 22:53:01 -0000	1.29
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       17%{?dist}.1
+Release:       18%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -218,6 +218,7 @@
 # patchy 5 (included in cernlib)
 Patch1504: patchy-case.patch
 Patch1505: patchy-perror.patch
+Patch1506: patchy-yexpand.diff
 
 %description
 CERN program library is a large collection of general purpose libraries
@@ -523,6 +524,7 @@
 
 %patch -P 1504 -p1
 %patch -P 1505 -p1
+%patch -P 1506 -p1
 
 %patch -P 1200
 %patch -P 1201
@@ -828,7 +830,10 @@
 
 
 %changelog
-* Tue Apr 13 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-17.1
+* Tue Apr 13 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-18
+- add a patch to yexpand, to avoid using $HOME.
+
+* Tue Apr 13 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-17
 - npatchy don't build on ppc.
 
 * Wed Apr 12 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-16



From fedora-extras-commits at redhat.com  Thu Apr 13 22:53:57 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Thu, 13 Apr 2006 15:53:57 -0700
Subject: rpms/cernlib/devel cernlib.spec,1.29,1.30
Message-ID: <200604132253.k3DMrxRp022373@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/cernlib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22356

Modified Files:
	cernlib.spec 
Log Message:
bump release


Index: cernlib.spec
===================================================================
RCS file: /cvs/extras/rpms/cernlib/devel/cernlib.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- cernlib.spec	13 Apr 2006 22:53:01 -0000	1.29
+++ cernlib.spec	13 Apr 2006 22:53:56 -0000	1.30
@@ -1,6 +1,6 @@
 Name:          cernlib
 Version:       2005
-Release:       18%{?dist}
+Release:       19%{?dist}
 Summary:       General purpose CERN library and associated binaries
 Group:         Development/Libraries
 # As explained in the cernlib on debian FAQ, cfortran can be considered LGPL.
@@ -830,7 +830,7 @@
 
 
 %changelog
-* Tue Apr 13 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-18
+* Tue Apr 13 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-19
 - add a patch to yexpand, to avoid using $HOME.
 
 * Tue Apr 13 2006 Patrice Dumas <dumas at centre-cired.fr> - 2005-17



From fedora-extras-commits at redhat.com  Fri Apr 14 02:31:35 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Thu, 13 Apr 2006 19:31:35 -0700
Subject: rpms/seamonkey/devel seamonkey-1.0.1-dumpstack.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 seamonkey-configure.patch, 1.1,
	1.2 seamonkey.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200604140231.k3E2VbBg031335@cvs-int.fedora.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/seamonkey/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31306

Modified Files:
	.cvsignore seamonkey-configure.patch seamonkey.spec sources 
Added Files:
	seamonkey-1.0.1-dumpstack.patch 
Log Message:
* Fri Apr 14 2006 Kai Engert <kengert at redhat.com> 1.0.1-1
- Update to SeaMonkey 1.0.1 release


seamonkey-1.0.1-dumpstack.patch:

--- NEW FILE seamonkey-1.0.1-dumpstack.patch ---
--- mozilla/xpcom/base/nsStackFrameUnix.cpp.prestackdisable	2006-04-14 02:30:15.000000000 +0200
+++ mozilla/xpcom/base/nsStackFrameUnix.cpp	2006-04-14 02:31:02.000000000 +0200
@@ -88,6 +88,9 @@
 
 void DumpStackToFile(FILE* aStream)
 {
+  fprintf(aStream, "Stacktrace disabled for now.\n"
+                   "See https://bugzilla.mozilla.org/show_bug.cgi?id=323853\n");
+#if 0
   // Stack walking code courtesy Kipp's "leaky".
 
   // Get the frame pointer
@@ -128,6 +131,7 @@
               symbol, off, info.dli_fname, foff);
     }
   }
+#endif
 }
 
 #elif defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386))


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Apr 2006 21:58:25 -0000	1.2
+++ .cvsignore	14 Apr 2006 02:31:35 -0000	1.3
@@ -1 +1 @@
-seamonkey-1.0.source.tar.bz2
+seamonkey-1.0.1.source.tar.bz2

seamonkey-configure.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 seamonkey-configure.patch
Index: seamonkey-configure.patch
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/devel/seamonkey-configure.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- seamonkey-configure.patch	10 Apr 2006 21:58:25 -0000	1.1
+++ seamonkey-configure.patch	14 Apr 2006 02:31:35 -0000	1.2
@@ -1,5 +1,5 @@
---- mozilla/configure.ac213	2006-02-10 09:14:59.000000000 +0100
-+++ mozilla/configure	2006-02-10 09:15:01.000000000 +0100
+--- mozilla/configure.prepatch	2006-04-14 02:46:30.000000000 +0200
++++ mozilla/configure	2006-04-14 02:52:12.000000000 +0200
 @@ -941,7 +941,7 @@
  fi
  
@@ -141,175 +141,175 @@
    rm -rf conftest*
    ac_cv_prog_hostcxx_works=1 echo "$ac_t""yes" 1>&6
  else
-@@ -1445,7 +1445,7 @@
+@@ -1454,7 +1454,7 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1441: checking for $ac_word" >&5
-+echo "configure:1449: checking for $ac_word" >&5
+-echo "configure:1450: checking for $ac_word" >&5
++echo "configure:1458: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1479,7 +1479,7 @@
+@@ -1488,7 +1488,7 @@
      # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1475: checking for $ac_word" >&5
-+echo "configure:1483: checking for $ac_word" >&5
+-echo "configure:1484: checking for $ac_word" >&5
++echo "configure:1492: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1509,7 +1509,7 @@
+@@ -1518,7 +1518,7 @@
    # Extract the first word of "cc", so it can be a program name with args.
  set dummy cc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1505: checking for $ac_word" >&5
-+echo "configure:1513: checking for $ac_word" >&5
+-echo "configure:1514: checking for $ac_word" >&5
++echo "configure:1522: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1560,7 +1560,7 @@
+@@ -1569,7 +1569,7 @@
        # Extract the first word of "cl", so it can be a program name with args.
  set dummy cl; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1556: checking for $ac_word" >&5
-+echo "configure:1564: checking for $ac_word" >&5
+-echo "configure:1565: checking for $ac_word" >&5
++echo "configure:1573: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1592,7 +1592,7 @@
+@@ -1601,7 +1601,7 @@
  fi
  
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:1588: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+echo "configure:1596: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+-echo "configure:1597: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
++echo "configure:1605: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
  
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -1603,12 +1603,12 @@
+@@ -1612,12 +1612,12 @@
  
  cat > conftest.$ac_ext << EOF
  
--#line 1599 "configure"
-+#line 1607 "configure"
+-#line 1608 "configure"
++#line 1616 "configure"
  #include "confdefs.h"
  
  main(){return(0);}
  EOF
--if { (eval echo configure:1604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:1613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    ac_cv_prog_cc_works=yes
    # If we can't run a trivial program, we are probably using a cross compiler.
    if (./conftest; exit) 2>/dev/null; then
-@@ -1634,12 +1634,12 @@
+@@ -1643,12 +1643,12 @@
    { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
  fi
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
--echo "configure:1630: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-+echo "configure:1638: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+-echo "configure:1639: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:1647: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
  echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
  cross_compiling=$ac_cv_prog_cc_cross
  
  echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
--echo "configure:1635: checking whether we are using GNU C" >&5
-+echo "configure:1643: checking whether we are using GNU C" >&5
+-echo "configure:1644: checking whether we are using GNU C" >&5
++echo "configure:1652: checking whether we are using GNU C" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1648,7 +1648,7 @@
+@@ -1657,7 +1657,7 @@
    yes;
  #endif
  EOF
--if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1644: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1652: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1653: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1661: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
    ac_cv_prog_gcc=yes
  else
    ac_cv_prog_gcc=no
-@@ -1667,7 +1667,7 @@
+@@ -1676,7 +1676,7 @@
  ac_save_CFLAGS="$CFLAGS"
  CFLAGS=
  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
--echo "configure:1663: checking whether ${CC-cc} accepts -g" >&5
-+echo "configure:1671: checking whether ${CC-cc} accepts -g" >&5
+-echo "configure:1672: checking whether ${CC-cc} accepts -g" >&5
++echo "configure:1680: checking whether ${CC-cc} accepts -g" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1703,7 +1703,7 @@
+@@ -1712,7 +1712,7 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1699: checking for $ac_word" >&5
-+echo "configure:1707: checking for $ac_word" >&5
+-echo "configure:1708: checking for $ac_word" >&5
++echo "configure:1716: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1739,7 +1739,7 @@
+@@ -1748,7 +1748,7 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1735: checking for $ac_word" >&5
-+echo "configure:1743: checking for $ac_word" >&5
+-echo "configure:1744: checking for $ac_word" >&5
++echo "configure:1752: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1771,7 +1771,7 @@
+@@ -1780,7 +1780,7 @@
  
  
  echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:1767: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
-+echo "configure:1775: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+-echo "configure:1776: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
++echo "configure:1784: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
  
  ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -1782,12 +1782,12 @@
+@@ -1791,12 +1791,12 @@
  
  cat > conftest.$ac_ext << EOF
  
--#line 1778 "configure"
-+#line 1786 "configure"
+-#line 1787 "configure"
++#line 1795 "configure"
  #include "confdefs.h"
  
  int main(){return(0);}
  EOF
--if { (eval echo configure:1783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:1792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    ac_cv_prog_cxx_works=yes
    # If we can't run a trivial program, we are probably using a cross compiler.
    if (./conftest; exit) 2>/dev/null; then
[...6776 lines suppressed...]
      which can conflict with char $ac_func(); below.  */
-@@ -18265,7 +18454,7 @@
+@@ -18289,7 +18481,7 @@
  
  ; return 0; }
  EOF
--if { (eval echo configure:18144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:18458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:18168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -18292,7 +18481,7 @@
+@@ -18316,7 +18508,7 @@
  fi
  
  echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
--echo "configure:18171: checking stack direction for C alloca" >&5
-+echo "configure:18485: checking stack direction for C alloca" >&5
+-echo "configure:18195: checking stack direction for C alloca" >&5
++echo "configure:18512: checking stack direction for C alloca" >&5
  if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -18300,7 +18489,7 @@
+@@ -18324,7 +18516,7 @@
    ac_cv_c_stack_direction=0
  else
    cat > conftest.$ac_ext <<EOF
--#line 18179 "configure"
-+#line 18493 "configure"
+-#line 18203 "configure"
++#line 18520 "configure"
  #include "confdefs.h"
  find_stack_direction ()
  {
-@@ -18319,7 +18508,7 @@
+@@ -18343,7 +18535,7 @@
    exit (find_stack_direction() < 0);
  }
  EOF
--if { (eval echo configure:18198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:18512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-if { (eval echo configure:18222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:18539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_c_stack_direction=1
  else
-@@ -18368,17 +18557,17 @@
+@@ -18392,17 +18584,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:18247: checking for $ac_hdr" >&5
-+echo "configure:18561: checking for $ac_hdr" >&5
+-echo "configure:18271: checking for $ac_hdr" >&5
++echo "configure:18588: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 18252 "configure"
-+#line 18566 "configure"
+-#line 18276 "configure"
++#line 18593 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:18257: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:18571: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (eval echo configure:18281: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:18598: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -18458,7 +18647,7 @@
+@@ -18482,7 +18674,7 @@
      # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:18337: checking for $ac_word" >&5
-+echo "configure:18651: checking for $ac_word" >&5
+-echo "configure:18361: checking for $ac_word" >&5
++echo "configure:18678: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -18502,19 +18691,19 @@
+@@ -18526,19 +18718,19 @@
       PKG_CONFIG_MIN_VERSION=0.9.0
       if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
          echo $ac_n "checking for cairo >= $CAIRO_VERSION""... $ac_c" 1>&6
--echo "configure:18381: checking for cairo >= $CAIRO_VERSION" >&5
-+echo "configure:18695: checking for cairo >= $CAIRO_VERSION" >&5
+-echo "configure:18405: checking for cairo >= $CAIRO_VERSION" >&5
++echo "configure:18722: checking for cairo >= $CAIRO_VERSION" >&5
  
          if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION" ; then
              echo "$ac_t""yes" 1>&6
              succeeded=yes
  
              echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6
--echo "configure:18388: checking CAIRO_CFLAGS" >&5
-+echo "configure:18702: checking CAIRO_CFLAGS" >&5
+-echo "configure:18412: checking CAIRO_CFLAGS" >&5
++echo "configure:18729: checking CAIRO_CFLAGS" >&5
              CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION"`
              echo "$ac_t""$CAIRO_CFLAGS" 1>&6
  
              echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6
--echo "configure:18393: checking CAIRO_LIBS" >&5
-+echo "configure:18707: checking CAIRO_LIBS" >&5
+-echo "configure:18417: checking CAIRO_LIBS" >&5
++echo "configure:18734: checking CAIRO_LIBS" >&5
              ## don't use --libs since that can do evil things like add
              ## -Wl,--export-dynamic
              CAIRO_LIBS="`$PKG_CONFIG --libs-only-L \"cairo >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo >= $CAIRO_VERSION\"`"
-@@ -18579,7 +18768,7 @@
+@@ -18603,7 +18795,7 @@
          # Extract the first word of "python", so it can be a program name with args.
  set dummy python; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:18458: checking for $ac_word" >&5
-+echo "configure:18772: checking for $ac_word" >&5
+-echo "configure:18482: checking for $ac_word" >&5
++echo "configure:18799: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -18840,14 +19029,14 @@
+@@ -18864,14 +19056,14 @@
  cross_compiling=$ac_cv_prog_cc_cross
  
      cat > conftest.$ac_ext <<EOF
--#line 18719 "configure"
-+#line 19033 "configure"
+-#line 18743 "configure"
++#line 19060 "configure"
  #include "confdefs.h"
  #include <gmodule.h>
  int main() {
   int x = 1; x++; 
  ; return 0; }
  EOF
--if { (eval echo configure:18726: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:19040: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:18750: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:19067: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    :
  else
    echo "configure: failed program was:" >&5
-@@ -19113,6 +19302,10 @@
+@@ -19137,6 +19329,10 @@
  
  
  
@@ -5662,25 +5664,25 @@
  cat >> confdefs.h <<EOF
  #define MOZ_DLL_SUFFIX "$DLL_SUFFIX"
  EOF
-@@ -19140,7 +19333,7 @@
+@@ -19164,7 +19360,7 @@
                  _SAVE_CFLAGS=$CFLAGS
      CFLAGS="$CFLAGS $XCFLAGS"
      cat > conftest.$ac_ext <<EOF
--#line 19019 "configure"
-+#line 19337 "configure"
+-#line 19043 "configure"
++#line 19364 "configure"
  #include "confdefs.h"
  
          #include <stdio.h>
-@@ -19156,7 +19349,7 @@
+@@ -19180,7 +19376,7 @@
      
  ; return 0; }
  EOF
--if { (eval echo configure:19035: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:19353: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:19059: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:19380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    :
  else
    echo "configure: failed program was:" >&5
-@@ -19373,15 +19566,34 @@
+@@ -19397,15 +19593,34 @@
  # Transform confdefs.h into DEFS.
  # Protect against shell expansion while executing Makefile rules.
  # Protect against Makefile macro expansion.
@@ -5724,7 +5726,7 @@
  
  MOZ_DEFINES=$DEFS
  
-@@ -19663,12 +19875,13 @@
+@@ -19688,12 +19903,13 @@
  s%@MOZ_ENABLE_FREETYPE2@%$MOZ_ENABLE_FREETYPE2%g
  s%@MOZ_XFT_CFLAGS@%$MOZ_XFT_CFLAGS%g
  s%@MOZ_XFT_LIBS@%$MOZ_XFT_LIBS%g


Index: seamonkey.spec
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/devel/seamonkey.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- seamonkey.spec	11 Apr 2006 13:59:21 -0000	1.3
+++ seamonkey.spec	14 Apr 2006 02:31:35 -0000	1.4
@@ -9,8 +9,8 @@
 
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
-Version:        1.0
-Release:        11%{?dist}
+Version:        1.0.1
+Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPL
 Group:          Applications/Internet
@@ -33,14 +33,13 @@
 Patch3:         firefox-1.1-nss-system-nspr.patch
 Patch4:         firefox-1.5-with-system-nss.patch
 Patch5:         seamonkey-disable-visibility.patch
-Patch6:         firefox-1.5.0.1-dumpstack.patch
+Patch6:         seamonkey-1.0.1-dumpstack.patch
 Patch21:        firefox-0.7.3-default-plugin-less-annoying.patch
 Patch22:        firefox-0.7.3-psfonts.patch
 Patch42:        firefox-1.1-uriloader.patch
 Patch82:        pango-cairo.patch
 Patch83:        seamonkey-cairo-bug5136.patch
 Patch101:       thunderbird-0.7.3-gnome-uriloader.patch
-Patch102:       thunderbird-1.5-bug304720.patch
 Patch220:       seamonkey-fedora-home-page.patch
 Patch225:       mozilla-nspr-packages.patch
 Patch227:       mozilla-1.4.1-ppc64.patch
@@ -98,7 +97,6 @@
 %patch82 -p0
 %patch83 -p1
 %patch101 -p1 -b .gnome-uriloader
-%patch102 -p1
 %patch220 -p1
 %patch225 -p1
 %patch227 -p1
@@ -408,6 +406,8 @@
 
 
 %changelog
+* Fri Apr 14 2006 Kai Engert <kengert at redhat.com> 1.0.1-1
+- Update to SeaMonkey 1.0.1 release
 * Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-11
 - Fix PreReq statements
 * Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-10


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Apr 2006 21:58:25 -0000	1.2
+++ sources	14 Apr 2006 02:31:35 -0000	1.3
@@ -1 +1 @@
-e4f2edc5b2248d090303c70f5b28f210  seamonkey-1.0.source.tar.bz2
+6921464b5251cafd529c04c2b9f98d5f  seamonkey-1.0.1.source.tar.bz2



From fedora-extras-commits at redhat.com  Fri Apr 14 02:51:10 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Thu, 13 Apr 2006 19:51:10 -0700
Subject: rpms/seamonkey/FC-5 seamonkey-1.0.1-dumpstack.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 seamonkey-configure.patch, 1.1,
	1.2 seamonkey.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200604140251.k3E2pCSN031436@cvs-int.fedora.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/seamonkey/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31407

Modified Files:
	.cvsignore seamonkey-configure.patch seamonkey.spec sources 
Added Files:
	seamonkey-1.0.1-dumpstack.patch 
Log Message:
* Fri Apr 14 2006 Kai Engert <kengert at redhat.com> 1.0.1-1
- Update to SeaMonkey 1.0.1 release


seamonkey-1.0.1-dumpstack.patch:

--- NEW FILE seamonkey-1.0.1-dumpstack.patch ---
--- mozilla/xpcom/base/nsStackFrameUnix.cpp.prestackdisable	2006-04-14 02:30:15.000000000 +0200
+++ mozilla/xpcom/base/nsStackFrameUnix.cpp	2006-04-14 02:31:02.000000000 +0200
@@ -88,6 +88,9 @@
 
 void DumpStackToFile(FILE* aStream)
 {
+  fprintf(aStream, "Stacktrace disabled for now.\n"
+                   "See https://bugzilla.mozilla.org/show_bug.cgi?id=323853\n");
+#if 0
   // Stack walking code courtesy Kipp's "leaky".
 
   // Get the frame pointer
@@ -128,6 +131,7 @@
               symbol, off, info.dli_fname, foff);
     }
   }
+#endif
 }
 
 #elif defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386))


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Apr 2006 21:58:25 -0000	1.2
+++ .cvsignore	14 Apr 2006 02:51:10 -0000	1.3
@@ -1 +1 @@
-seamonkey-1.0.source.tar.bz2
+seamonkey-1.0.1.source.tar.bz2

seamonkey-configure.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 seamonkey-configure.patch
Index: seamonkey-configure.patch
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/FC-5/seamonkey-configure.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- seamonkey-configure.patch	10 Apr 2006 21:58:25 -0000	1.1
+++ seamonkey-configure.patch	14 Apr 2006 02:51:10 -0000	1.2
@@ -1,5 +1,5 @@
---- mozilla/configure.ac213	2006-02-10 09:14:59.000000000 +0100
-+++ mozilla/configure	2006-02-10 09:15:01.000000000 +0100
+--- mozilla/configure.prepatch	2006-04-14 02:46:30.000000000 +0200
++++ mozilla/configure	2006-04-14 02:52:12.000000000 +0200
 @@ -941,7 +941,7 @@
  fi
  
@@ -141,175 +141,175 @@
    rm -rf conftest*
    ac_cv_prog_hostcxx_works=1 echo "$ac_t""yes" 1>&6
  else
-@@ -1445,7 +1445,7 @@
+@@ -1454,7 +1454,7 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1441: checking for $ac_word" >&5
-+echo "configure:1449: checking for $ac_word" >&5
+-echo "configure:1450: checking for $ac_word" >&5
++echo "configure:1458: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1479,7 +1479,7 @@
+@@ -1488,7 +1488,7 @@
      # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1475: checking for $ac_word" >&5
-+echo "configure:1483: checking for $ac_word" >&5
+-echo "configure:1484: checking for $ac_word" >&5
++echo "configure:1492: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1509,7 +1509,7 @@
+@@ -1518,7 +1518,7 @@
    # Extract the first word of "cc", so it can be a program name with args.
  set dummy cc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1505: checking for $ac_word" >&5
-+echo "configure:1513: checking for $ac_word" >&5
+-echo "configure:1514: checking for $ac_word" >&5
++echo "configure:1522: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1560,7 +1560,7 @@
+@@ -1569,7 +1569,7 @@
        # Extract the first word of "cl", so it can be a program name with args.
  set dummy cl; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1556: checking for $ac_word" >&5
-+echo "configure:1564: checking for $ac_word" >&5
+-echo "configure:1565: checking for $ac_word" >&5
++echo "configure:1573: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1592,7 +1592,7 @@
+@@ -1601,7 +1601,7 @@
  fi
  
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:1588: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+echo "configure:1596: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+-echo "configure:1597: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
++echo "configure:1605: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
  
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -1603,12 +1603,12 @@
+@@ -1612,12 +1612,12 @@
  
  cat > conftest.$ac_ext << EOF
  
--#line 1599 "configure"
-+#line 1607 "configure"
+-#line 1608 "configure"
++#line 1616 "configure"
  #include "confdefs.h"
  
  main(){return(0);}
  EOF
--if { (eval echo configure:1604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:1613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    ac_cv_prog_cc_works=yes
    # If we can't run a trivial program, we are probably using a cross compiler.
    if (./conftest; exit) 2>/dev/null; then
-@@ -1634,12 +1634,12 @@
+@@ -1643,12 +1643,12 @@
    { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
  fi
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
--echo "configure:1630: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-+echo "configure:1638: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+-echo "configure:1639: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
++echo "configure:1647: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
  echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
  cross_compiling=$ac_cv_prog_cc_cross
  
  echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
--echo "configure:1635: checking whether we are using GNU C" >&5
-+echo "configure:1643: checking whether we are using GNU C" >&5
+-echo "configure:1644: checking whether we are using GNU C" >&5
++echo "configure:1652: checking whether we are using GNU C" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1648,7 +1648,7 @@
+@@ -1657,7 +1657,7 @@
    yes;
  #endif
  EOF
--if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1644: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1652: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1653: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1661: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
    ac_cv_prog_gcc=yes
  else
    ac_cv_prog_gcc=no
-@@ -1667,7 +1667,7 @@
+@@ -1676,7 +1676,7 @@
  ac_save_CFLAGS="$CFLAGS"
  CFLAGS=
  echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
--echo "configure:1663: checking whether ${CC-cc} accepts -g" >&5
-+echo "configure:1671: checking whether ${CC-cc} accepts -g" >&5
+-echo "configure:1672: checking whether ${CC-cc} accepts -g" >&5
++echo "configure:1680: checking whether ${CC-cc} accepts -g" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1703,7 +1703,7 @@
+@@ -1712,7 +1712,7 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1699: checking for $ac_word" >&5
-+echo "configure:1707: checking for $ac_word" >&5
+-echo "configure:1708: checking for $ac_word" >&5
++echo "configure:1716: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1739,7 +1739,7 @@
+@@ -1748,7 +1748,7 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1735: checking for $ac_word" >&5
-+echo "configure:1743: checking for $ac_word" >&5
+-echo "configure:1744: checking for $ac_word" >&5
++echo "configure:1752: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1771,7 +1771,7 @@
+@@ -1780,7 +1780,7 @@
  
  
  echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:1767: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
-+echo "configure:1775: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+-echo "configure:1776: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
++echo "configure:1784: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
  
  ac_ext=C
  # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -1782,12 +1782,12 @@
+@@ -1791,12 +1791,12 @@
  
  cat > conftest.$ac_ext << EOF
  
--#line 1778 "configure"
-+#line 1786 "configure"
+-#line 1787 "configure"
++#line 1795 "configure"
  #include "confdefs.h"
  
  int main(){return(0);}
  EOF
--if { (eval echo configure:1783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:1791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:1792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    ac_cv_prog_cxx_works=yes
    # If we can't run a trivial program, we are probably using a cross compiler.
    if (./conftest; exit) 2>/dev/null; then
[...6776 lines suppressed...]
      which can conflict with char $ac_func(); below.  */
-@@ -18265,7 +18454,7 @@
+@@ -18289,7 +18481,7 @@
  
  ; return 0; }
  EOF
--if { (eval echo configure:18144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:18458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:18168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -18292,7 +18481,7 @@
+@@ -18316,7 +18508,7 @@
  fi
  
  echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
--echo "configure:18171: checking stack direction for C alloca" >&5
-+echo "configure:18485: checking stack direction for C alloca" >&5
+-echo "configure:18195: checking stack direction for C alloca" >&5
++echo "configure:18512: checking stack direction for C alloca" >&5
  if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -18300,7 +18489,7 @@
+@@ -18324,7 +18516,7 @@
    ac_cv_c_stack_direction=0
  else
    cat > conftest.$ac_ext <<EOF
--#line 18179 "configure"
-+#line 18493 "configure"
+-#line 18203 "configure"
++#line 18520 "configure"
  #include "confdefs.h"
  find_stack_direction ()
  {
-@@ -18319,7 +18508,7 @@
+@@ -18343,7 +18535,7 @@
    exit (find_stack_direction() < 0);
  }
  EOF
--if { (eval echo configure:18198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:18512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-if { (eval echo configure:18222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:18539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_c_stack_direction=1
  else
-@@ -18368,17 +18557,17 @@
+@@ -18392,17 +18584,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:18247: checking for $ac_hdr" >&5
-+echo "configure:18561: checking for $ac_hdr" >&5
+-echo "configure:18271: checking for $ac_hdr" >&5
++echo "configure:18588: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 18252 "configure"
-+#line 18566 "configure"
+-#line 18276 "configure"
++#line 18593 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:18257: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:18571: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (eval echo configure:18281: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:18598: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -18458,7 +18647,7 @@
+@@ -18482,7 +18674,7 @@
      # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:18337: checking for $ac_word" >&5
-+echo "configure:18651: checking for $ac_word" >&5
+-echo "configure:18361: checking for $ac_word" >&5
++echo "configure:18678: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -18502,19 +18691,19 @@
+@@ -18526,19 +18718,19 @@
       PKG_CONFIG_MIN_VERSION=0.9.0
       if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
          echo $ac_n "checking for cairo >= $CAIRO_VERSION""... $ac_c" 1>&6
--echo "configure:18381: checking for cairo >= $CAIRO_VERSION" >&5
-+echo "configure:18695: checking for cairo >= $CAIRO_VERSION" >&5
+-echo "configure:18405: checking for cairo >= $CAIRO_VERSION" >&5
++echo "configure:18722: checking for cairo >= $CAIRO_VERSION" >&5
  
          if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION" ; then
              echo "$ac_t""yes" 1>&6
              succeeded=yes
  
              echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6
--echo "configure:18388: checking CAIRO_CFLAGS" >&5
-+echo "configure:18702: checking CAIRO_CFLAGS" >&5
+-echo "configure:18412: checking CAIRO_CFLAGS" >&5
++echo "configure:18729: checking CAIRO_CFLAGS" >&5
              CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION"`
              echo "$ac_t""$CAIRO_CFLAGS" 1>&6
  
              echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6
--echo "configure:18393: checking CAIRO_LIBS" >&5
-+echo "configure:18707: checking CAIRO_LIBS" >&5
+-echo "configure:18417: checking CAIRO_LIBS" >&5
++echo "configure:18734: checking CAIRO_LIBS" >&5
              ## don't use --libs since that can do evil things like add
              ## -Wl,--export-dynamic
              CAIRO_LIBS="`$PKG_CONFIG --libs-only-L \"cairo >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo >= $CAIRO_VERSION\"`"
-@@ -18579,7 +18768,7 @@
+@@ -18603,7 +18795,7 @@
          # Extract the first word of "python", so it can be a program name with args.
  set dummy python; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:18458: checking for $ac_word" >&5
-+echo "configure:18772: checking for $ac_word" >&5
+-echo "configure:18482: checking for $ac_word" >&5
++echo "configure:18799: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -18840,14 +19029,14 @@
+@@ -18864,14 +19056,14 @@
  cross_compiling=$ac_cv_prog_cc_cross
  
      cat > conftest.$ac_ext <<EOF
--#line 18719 "configure"
-+#line 19033 "configure"
+-#line 18743 "configure"
++#line 19060 "configure"
  #include "confdefs.h"
  #include <gmodule.h>
  int main() {
   int x = 1; x++; 
  ; return 0; }
  EOF
--if { (eval echo configure:18726: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:19040: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:18750: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:19067: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    :
  else
    echo "configure: failed program was:" >&5
-@@ -19113,6 +19302,10 @@
+@@ -19137,6 +19329,10 @@
  
  
  
@@ -5662,25 +5664,25 @@
  cat >> confdefs.h <<EOF
  #define MOZ_DLL_SUFFIX "$DLL_SUFFIX"
  EOF
-@@ -19140,7 +19333,7 @@
+@@ -19164,7 +19360,7 @@
                  _SAVE_CFLAGS=$CFLAGS
      CFLAGS="$CFLAGS $XCFLAGS"
      cat > conftest.$ac_ext <<EOF
--#line 19019 "configure"
-+#line 19337 "configure"
+-#line 19043 "configure"
++#line 19364 "configure"
  #include "confdefs.h"
  
          #include <stdio.h>
-@@ -19156,7 +19349,7 @@
+@@ -19180,7 +19376,7 @@
      
  ; return 0; }
  EOF
--if { (eval echo configure:19035: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:19353: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:19059: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:19380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    :
  else
    echo "configure: failed program was:" >&5
-@@ -19373,15 +19566,34 @@
+@@ -19397,15 +19593,34 @@
  # Transform confdefs.h into DEFS.
  # Protect against shell expansion while executing Makefile rules.
  # Protect against Makefile macro expansion.
@@ -5724,7 +5726,7 @@
  
  MOZ_DEFINES=$DEFS
  
-@@ -19663,12 +19875,13 @@
+@@ -19688,12 +19903,13 @@
  s%@MOZ_ENABLE_FREETYPE2@%$MOZ_ENABLE_FREETYPE2%g
  s%@MOZ_XFT_CFLAGS@%$MOZ_XFT_CFLAGS%g
  s%@MOZ_XFT_LIBS@%$MOZ_XFT_LIBS%g


Index: seamonkey.spec
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/FC-5/seamonkey.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- seamonkey.spec	11 Apr 2006 14:57:09 -0000	1.2
+++ seamonkey.spec	14 Apr 2006 02:51:10 -0000	1.3
@@ -9,8 +9,8 @@
 
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
-Version:        1.0
-Release:        11%{?dist}
+Version:        1.0.1
+Release:        1%{?dist}
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPL
 Group:          Applications/Internet
@@ -33,14 +33,13 @@
 Patch3:         firefox-1.1-nss-system-nspr.patch
 Patch4:         firefox-1.5-with-system-nss.patch
 Patch5:         seamonkey-disable-visibility.patch
-Patch6:         firefox-1.5.0.1-dumpstack.patch
+Patch6:         seamonkey-1.0.1-dumpstack.patch
 Patch21:        firefox-0.7.3-default-plugin-less-annoying.patch
 Patch22:        firefox-0.7.3-psfonts.patch
 Patch42:        firefox-1.1-uriloader.patch
 Patch82:        pango-cairo.patch
 Patch83:        seamonkey-cairo-bug5136.patch
 Patch101:       thunderbird-0.7.3-gnome-uriloader.patch
-Patch102:       thunderbird-1.5-bug304720.patch
 Patch220:       seamonkey-fedora-home-page.patch
 Patch225:       mozilla-nspr-packages.patch
 Patch227:       mozilla-1.4.1-ppc64.patch
@@ -98,7 +97,6 @@
 %patch82 -p0
 %patch83 -p1
 %patch101 -p1 -b .gnome-uriloader
-%patch102 -p1
 %patch220 -p1
 %patch225 -p1
 %patch227 -p1
@@ -408,6 +406,8 @@
 
 
 %changelog
+* Fri Apr 14 2006 Kai Engert <kengert at redhat.com> 1.0.1-1
+- Update to SeaMonkey 1.0.1 release
 * Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-11
 - Fix PreReq statements
 * Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-10


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Apr 2006 21:58:25 -0000	1.2
+++ sources	14 Apr 2006 02:51:10 -0000	1.3
@@ -1 +1 @@
-e4f2edc5b2248d090303c70f5b28f210  seamonkey-1.0.source.tar.bz2
+6921464b5251cafd529c04c2b9f98d5f  seamonkey-1.0.1.source.tar.bz2



From fedora-extras-commits at redhat.com  Fri Apr 14 03:20:50 2006
From: fedora-extras-commits at redhat.com (Kai Engert (kengert))
Date: Thu, 13 Apr 2006 20:20:50 -0700
Subject: rpms/seamonkey/FC-4 seamonkey-1.0.1-dumpstack.patch, NONE,
	1.1 .cvsignore, 1.2, 1.3 seamonkey-configure.patch, 1.2,
	1.3 seamonkey.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200604140320.k3E3KqSK001196@cvs-int.fedora.redhat.com>

Author: kengert

Update of /cvs/extras/rpms/seamonkey/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1165

Modified Files:
	.cvsignore seamonkey-configure.patch seamonkey.spec sources 
Added Files:
	seamonkey-1.0.1-dumpstack.patch 
Log Message:
* Fri Apr 14 2006 Kai Engert <kengert at redhat.com> 1.0.1-1.fc4
- Update to SeaMonkey 1.0.1 release


seamonkey-1.0.1-dumpstack.patch:

--- NEW FILE seamonkey-1.0.1-dumpstack.patch ---
--- mozilla/xpcom/base/nsStackFrameUnix.cpp.prestackdisable	2006-04-14 02:30:15.000000000 +0200
+++ mozilla/xpcom/base/nsStackFrameUnix.cpp	2006-04-14 02:31:02.000000000 +0200
@@ -88,6 +88,9 @@
 
 void DumpStackToFile(FILE* aStream)
 {
+  fprintf(aStream, "Stacktrace disabled for now.\n"
+                   "See https://bugzilla.mozilla.org/show_bug.cgi?id=323853\n");
+#if 0
   // Stack walking code courtesy Kipp's "leaky".
 
   // Get the frame pointer
@@ -128,6 +131,7 @@
               symbol, off, info.dli_fname, foff);
     }
   }
+#endif
 }
 
 #elif defined(__sun) && (defined(__sparc) || defined(sparc) || defined(__i386) || defined(i386))


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Apr 2006 21:58:25 -0000	1.2
+++ .cvsignore	14 Apr 2006 03:20:50 -0000	1.3
@@ -1 +1 @@
-seamonkey-1.0.source.tar.bz2
+seamonkey-1.0.1.source.tar.bz2

seamonkey-configure.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.2 -r 1.3 seamonkey-configure.patch
Index: seamonkey-configure.patch
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/FC-4/seamonkey-configure.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- seamonkey-configure.patch	12 Apr 2006 15:49:31 -0000	1.2
+++ seamonkey-configure.patch	14 Apr 2006 03:20:50 -0000	1.3
@@ -1,5 +1,5 @@
---- mozilla/configure.pre1	2006-04-12 13:11:17.000000000 +0200
-+++ mozilla/configure	2006-04-12 13:11:22.000000000 +0200
+--- mozilla/configure.prepatch	2006-04-14 05:14:18.000000000 +0200
++++ mozilla/configure	2006-04-14 05:14:27.000000000 +0200
 @@ -1042,7 +1042,7 @@
  LIBGNOME_VERSION=2.0
  
@@ -9,7 +9,7 @@
  do
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
-@@ -1869,12 +1869,63 @@
+@@ -1878,6 +1878,57 @@
    fi
  fi
  
@@ -23,7 +23,7 @@
 +   'void exit (int);'
 +do
 +  cat > conftest.$ac_ext <<EOF
-+#line 1883 "configure"
++#line 1892 "configure"
 +#include "confdefs.h"
 +#include <stdlib.h>
 +$ac_declaration
@@ -31,7 +31,7 @@
 +exit (42);
 +; return 0; }
 +EOF
-+if { (eval echo configure:1891: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1900: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 +  :
 +else
 +  echo "configure: failed program was:" >&5
@@ -41,14 +41,14 @@
 +fi
 +rm -f conftest*
 +  cat > conftest.$ac_ext <<EOF
-+#line 1901 "configure"
++#line 1910 "configure"
 +#include "confdefs.h"
 +$ac_declaration
 +int main() {
 +exit (42);
 +; return 0; }
 +EOF
-+if { (eval echo configure:1908: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:1917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
 +  rm -rf conftest*
 +  break
 +else
@@ -64,212 +64,214 @@
 +fi
 +
 +
-     for ac_prog in $RANLIB "${target_alias}-ranlib" "${target}-ranlib"
- do
+ 
+     case "$build:$target" in
+       powerpc-apple-darwin8*:i?86-apple-darwin*)
+@@ -1891,7 +1942,7 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1878: checking for $ac_word" >&5
-+echo "configure:1929: checking for $ac_word" >&5
+-echo "configure:1895: checking for $ac_word" >&5
++echo "configure:1946: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1909,7 +1960,7 @@
+@@ -1926,7 +1977,7 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1913: checking for $ac_word" >&5
-+echo "configure:1964: checking for $ac_word" >&5
+-echo "configure:1930: checking for $ac_word" >&5
++echo "configure:1981: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1944,7 +1995,7 @@
+@@ -1961,7 +2012,7 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1948: checking for $ac_word" >&5
-+echo "configure:1999: checking for $ac_word" >&5
+-echo "configure:1965: checking for $ac_word" >&5
++echo "configure:2016: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -1985,7 +2036,7 @@
+@@ -2002,7 +2053,7 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1989: checking for $ac_word" >&5
-+echo "configure:2040: checking for $ac_word" >&5
+-echo "configure:2006: checking for $ac_word" >&5
++echo "configure:2057: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -2020,7 +2071,7 @@
+@@ -2037,7 +2088,7 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2024: checking for $ac_word" >&5
-+echo "configure:2075: checking for $ac_word" >&5
+-echo "configure:2041: checking for $ac_word" >&5
++echo "configure:2092: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -2055,7 +2106,7 @@
+@@ -2072,7 +2123,7 @@
  # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2059: checking for $ac_word" >&5
-+echo "configure:2110: checking for $ac_word" >&5
+-echo "configure:2076: checking for $ac_word" >&5
++echo "configure:2127: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -2093,7 +2144,7 @@
+@@ -2110,7 +2161,7 @@
      # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2097: checking for $ac_word" >&5
-+echo "configure:2148: checking for $ac_word" >&5
+-echo "configure:2114: checking for $ac_word" >&5
++echo "configure:2165: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -2123,7 +2174,7 @@
+@@ -2140,7 +2191,7 @@
    # Extract the first word of "cc", so it can be a program name with args.
  set dummy cc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2127: checking for $ac_word" >&5
-+echo "configure:2178: checking for $ac_word" >&5
+-echo "configure:2144: checking for $ac_word" >&5
++echo "configure:2195: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -2174,7 +2225,7 @@
+@@ -2191,7 +2242,7 @@
        # Extract the first word of "cl", so it can be a program name with args.
  set dummy cl; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2178: checking for $ac_word" >&5
-+echo "configure:2229: checking for $ac_word" >&5
+-echo "configure:2195: checking for $ac_word" >&5
++echo "configure:2246: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -2206,7 +2257,7 @@
+@@ -2223,7 +2274,7 @@
  fi
  
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:2210: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+echo "configure:2261: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+-echo "configure:2227: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
++echo "configure:2278: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
  
  ac_ext=c
  # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -2217,12 +2268,12 @@
+@@ -2234,12 +2285,12 @@
  
  cat > conftest.$ac_ext << EOF
  
--#line 2221 "configure"
-+#line 2272 "configure"
+-#line 2238 "configure"
++#line 2289 "configure"
  #include "confdefs.h"
  
  main(){return(0);}
[...6545 lines suppressed...]
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 18121 "configure"
-+#line 18310 "configure"
+-#line 18145 "configure"
++#line 18337 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
      which can conflict with char $ac_func(); below.  */
-@@ -18140,7 +18329,7 @@
+@@ -18164,7 +18356,7 @@
  
  ; return 0; }
  EOF
--if { (eval echo configure:18144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:18333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-if { (eval echo configure:18168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:18360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
  else
-@@ -18167,7 +18356,7 @@
+@@ -18191,7 +18383,7 @@
  fi
  
  echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
--echo "configure:18171: checking stack direction for C alloca" >&5
-+echo "configure:18360: checking stack direction for C alloca" >&5
+-echo "configure:18195: checking stack direction for C alloca" >&5
++echo "configure:18387: checking stack direction for C alloca" >&5
  if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -18175,7 +18364,7 @@
+@@ -18199,7 +18391,7 @@
    ac_cv_c_stack_direction=0
  else
    cat > conftest.$ac_ext <<EOF
--#line 18179 "configure"
-+#line 18368 "configure"
+-#line 18203 "configure"
++#line 18395 "configure"
  #include "confdefs.h"
  find_stack_direction ()
  {
-@@ -18194,7 +18383,7 @@
+@@ -18218,7 +18410,7 @@
    exit (find_stack_direction() < 0);
  }
  EOF
--if { (eval echo configure:18198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-+if { (eval echo configure:18387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+-if { (eval echo configure:18222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:18414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_c_stack_direction=1
  else
-@@ -18243,17 +18432,17 @@
+@@ -18267,17 +18459,17 @@
  do
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:18247: checking for $ac_hdr" >&5
-+echo "configure:18436: checking for $ac_hdr" >&5
+-echo "configure:18271: checking for $ac_hdr" >&5
++echo "configure:18463: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
--#line 18252 "configure"
-+#line 18441 "configure"
+-#line 18276 "configure"
++#line 18468 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:18257: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:18446: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+-{ (eval echo configure:18281: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:18473: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
  ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
-@@ -18333,7 +18522,7 @@
+@@ -18357,7 +18549,7 @@
      # Extract the first word of "pkg-config", so it can be a program name with args.
  set dummy pkg-config; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:18337: checking for $ac_word" >&5
-+echo "configure:18526: checking for $ac_word" >&5
+-echo "configure:18361: checking for $ac_word" >&5
++echo "configure:18553: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -18377,19 +18566,19 @@
+@@ -18401,19 +18593,19 @@
       PKG_CONFIG_MIN_VERSION=0.9.0
       if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
          echo $ac_n "checking for cairo >= $CAIRO_VERSION""... $ac_c" 1>&6
--echo "configure:18381: checking for cairo >= $CAIRO_VERSION" >&5
-+echo "configure:18570: checking for cairo >= $CAIRO_VERSION" >&5
+-echo "configure:18405: checking for cairo >= $CAIRO_VERSION" >&5
++echo "configure:18597: checking for cairo >= $CAIRO_VERSION" >&5
  
          if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION" ; then
              echo "$ac_t""yes" 1>&6
              succeeded=yes
  
              echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6
--echo "configure:18388: checking CAIRO_CFLAGS" >&5
-+echo "configure:18577: checking CAIRO_CFLAGS" >&5
+-echo "configure:18412: checking CAIRO_CFLAGS" >&5
++echo "configure:18604: checking CAIRO_CFLAGS" >&5
              CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION"`
              echo "$ac_t""$CAIRO_CFLAGS" 1>&6
  
              echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6
--echo "configure:18393: checking CAIRO_LIBS" >&5
-+echo "configure:18582: checking CAIRO_LIBS" >&5
+-echo "configure:18417: checking CAIRO_LIBS" >&5
++echo "configure:18609: checking CAIRO_LIBS" >&5
              ## don't use --libs since that can do evil things like add
              ## -Wl,--export-dynamic
              CAIRO_LIBS="`$PKG_CONFIG --libs-only-L \"cairo >= $CAIRO_VERSION\"` `$PKG_CONFIG --libs-only-l \"cairo >= $CAIRO_VERSION\"`"
-@@ -18454,7 +18643,7 @@
+@@ -18478,7 +18670,7 @@
          # Extract the first word of "python", so it can be a program name with args.
  set dummy python; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:18458: checking for $ac_word" >&5
-+echo "configure:18647: checking for $ac_word" >&5
+-echo "configure:18482: checking for $ac_word" >&5
++echo "configure:18674: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
-@@ -18715,14 +18904,14 @@
+@@ -18739,14 +18931,14 @@
  cross_compiling=$ac_cv_prog_cc_cross
  
      cat > conftest.$ac_ext <<EOF
--#line 18719 "configure"
-+#line 18908 "configure"
+-#line 18743 "configure"
++#line 18935 "configure"
  #include "confdefs.h"
  #include <gmodule.h>
  int main() {
   int x = 1; x++; 
  ; return 0; }
  EOF
--if { (eval echo configure:18726: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:18915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:18750: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:18942: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    :
  else
    echo "configure: failed program was:" >&5
-@@ -19015,7 +19204,7 @@
+@@ -19039,7 +19231,7 @@
                  _SAVE_CFLAGS=$CFLAGS
      CFLAGS="$CFLAGS $XCFLAGS"
      cat > conftest.$ac_ext <<EOF
--#line 19019 "configure"
-+#line 19208 "configure"
+-#line 19043 "configure"
++#line 19235 "configure"
  #include "confdefs.h"
  
          #include <stdio.h>
-@@ -19031,7 +19220,7 @@
+@@ -19055,7 +19247,7 @@
      
  ; return 0; }
  EOF
--if { (eval echo configure:19035: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:19224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-if { (eval echo configure:19059: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:19251: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    :
  else
    echo "configure: failed program was:" >&5
-@@ -19248,15 +19437,34 @@
+@@ -19272,15 +19464,34 @@
  # Transform confdefs.h into DEFS.
  # Protect against shell expansion while executing Makefile rules.
  # Protect against Makefile macro expansion.
@@ -5395,7 +5394,7 @@
  
  MOZ_DEFINES=$DEFS
  
-@@ -19535,12 +19743,13 @@
+@@ -19560,12 +19771,13 @@
  s%@MOZ_ENABLE_FREETYPE2@%$MOZ_ENABLE_FREETYPE2%g
  s%@MOZ_XFT_CFLAGS@%$MOZ_XFT_CFLAGS%g
  s%@MOZ_XFT_LIBS@%$MOZ_XFT_LIBS%g


Index: seamonkey.spec
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/FC-4/seamonkey.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- seamonkey.spec	12 Apr 2006 15:49:31 -0000	1.3
+++ seamonkey.spec	14 Apr 2006 03:20:50 -0000	1.4
@@ -7,8 +7,8 @@
 
 Name:           seamonkey
 Summary:        Web browser, e-mail, news, IRC client, HTML editor
-Version:        1.0
-Release:        11.fc4.1
+Version:        1.0.1
+Release:        1.fc4
 URL:            http://www.mozilla.org/projects/seamonkey/
 License:        MPL
 Group:          Applications/Internet
@@ -27,14 +27,13 @@
 
 Patch1:         firefox-1.0-prdtoa.patch
 Patch5:         seamonkey-disable-visibility.patch
-Patch6:         firefox-1.5.0.1-dumpstack.patch
+Patch6:         seamonkey-1.0.1-dumpstack.patch
 Patch21:        firefox-0.7.3-default-plugin-less-annoying.patch
 Patch22:        firefox-0.7.3-psfonts.patch
 Patch42:        firefox-1.1-uriloader.patch
 Patch82:        pango-cairo.patch
 Patch83:        seamonkey-cairo-bug5136.patch
 Patch101:       thunderbird-0.7.3-gnome-uriloader.patch
-Patch102:       thunderbird-1.5-bug304720.patch
 Patch220:       seamonkey-fedora-home-page.patch
 Patch227:       mozilla-1.4.1-ppc64.patch
 Patch301:       mozilla-1.7.3-gnome-vfs-default-app.patch
@@ -87,7 +86,6 @@
 %patch82 -p0
 %patch83 -p1
 %patch101 -p1 -b .gnome-uriloader
-%patch102 -p1
 %patch220 -p1
 %patch227 -p1
 %patch301 -p1
@@ -394,6 +392,8 @@
 
 
 %changelog
+* Fri Apr 14 2006 Kai Engert <kengert at redhat.com> 1.0.1-1.fc4
+- Update to SeaMonkey 1.0.1 release
 * Wed Apr 12 2006 Kai Engert <kengert at redhat.com> 1.0-11.fc4.1
 - Fix spec and patches to work with FC-4
 * Tue Apr 11 2006 Kai Engert <kengert at redhat.com> 1.0-11


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/seamonkey/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Apr 2006 21:58:25 -0000	1.2
+++ sources	14 Apr 2006 03:20:50 -0000	1.3
@@ -1 +1 @@
-e4f2edc5b2248d090303c70f5b28f210  seamonkey-1.0.source.tar.bz2
+6921464b5251cafd529c04c2b9f98d5f  seamonkey-1.0.1.source.tar.bz2



From fedora-extras-commits at redhat.com  Fri Apr 14 04:26:17 2006
From: fedora-extras-commits at redhat.com (Robert Marcano (robmv))
Date: Thu, 13 Apr 2006 21:26:17 -0700
Subject: rpms/shorewall/devel .cvsignore, 1.13, 1.14 shorewall.spec, 1.19,
	1.20 sources, 1.13, 1.14
Message-ID: <200604140426.k3E4QJOg003415@cvs-int.fedora.redhat.com>

Author: robmv

Update of /cvs/extras/rpms/shorewall/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3394

Modified Files:
	.cvsignore shorewall.spec sources 
Log Message:
Update to upstream 3.2.0-Beta4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	31 Mar 2006 14:52:20 -0000	1.13
+++ .cvsignore	14 Apr 2006 04:26:17 -0000	1.14
@@ -1 +1 @@
-shorewall-3.0.6.tar.bz2
+shorewall-3.2.0-Beta4.tar.bz2


Index: shorewall.spec
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/shorewall.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- shorewall.spec	31 Mar 2006 14:52:20 -0000	1.19
+++ shorewall.spec	14 Apr 2006 04:26:17 -0000	1.20
@@ -1,13 +1,16 @@
+%define beta_release Beta4
+
 Name: shorewall
-Version: 3.0.6
-Release: 1%{?dist}
+Version: 3.2.0
+Release: 0.1.%{beta_release}%{?dist}
 
 Summary: Iptables-based firewall for Linux systems
 
 Group: Applications/System
 License: GPL
 URL: http://www.shorewall.net/
-Source: http://www.shorewall.net/pub/shorewall/3.0/shorewall-%{version}/shorewall-%{version}.tar.bz2
+#Source: http://www.shorewall.net/pub/shorewall/3.0/shorewall-%{version}/shorewall-%{version}.tar.bz2
+Source: http://www.shorewall.net/pub/shorewall/development/3.2/shorewall-%{version}-%{beta_release}/shorewall-%{version}-%{beta_release}.tar.bz2
 Patch0: shorewall-3.0.3-init.patch
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -25,7 +28,7 @@
 
 %prep
 
-%setup -q
+%setup -q -n %{name}-%{version}-%{beta_release}
 %patch0 -p1
 
 %install
@@ -69,9 +72,12 @@
 %{_datadir}/shorewall/rfc1918
 %{_datadir}/shorewall/version
 %{_datadir}/shorewall/Limit
+%{_datadir}/shorewall/prog.*
 
 %attr(0754,root,root) %{_datadir}/shorewall/firewall
 %attr(0754,root,root) %{_datadir}/shorewall/functions
+%attr(0754,root,root) %{_datadir}/shorewall/compiler
+%attr(0754,root,root) %{_datadir}/shorewall/shorecap
 %attr(0754,root,root) %{_datadir}/shorewall/help
 
 %attr(0700,root,root) %dir %{_localstatedir}/lib/shorewall
@@ -80,6 +86,9 @@
 %doc COPYING INSTALL changelog.txt releasenotes.txt README.txt Samples
 
 %changelog
+* Fri Apr 14 2006 Robert Marcano <roberti at marcanoonline.com> - 3.2.0-0.1.Beta4
+- Update to upstream 3.2.0-Beta4
+
 * Fri Mar 31 2006 Robert Marcano <roberti at marcanoonline.com> - 3.0.6-1
 - Update to upstream 3.0.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/shorewall/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	31 Mar 2006 14:52:20 -0000	1.13
+++ sources	14 Apr 2006 04:26:17 -0000	1.14
@@ -1 +1 @@
-6228a86219881f015e02cefe2a6310a8  shorewall-3.0.6.tar.bz2
+37984d2c8e6f4ee220fca99ab1c451e4  shorewall-3.2.0-Beta4.tar.bz2



From fedora-extras-commits at redhat.com  Fri Apr 14 06:41:05 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 13 Apr 2006 23:41:05 -0700
Subject: rpms/amaya/FC-4 .cvsignore, 1.3, 1.4 amaya.spec, 1.14, 1.15 sources,
	1.3, 1.4
Message-ID: <200604140641.k3E6f7UW007969@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amaya/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7916/FC-4

Modified Files:
	.cvsignore amaya.spec sources 
Log Message:
upgrade to 9.5 to fix vulnerability


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amaya/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 May 2005 13:45:17 -0000	1.3
+++ .cvsignore	14 Apr 2006 06:41:05 -0000	1.4
@@ -1 +1 @@
-amaya-fullsrc-9.1.tgz
+amaya-fullsrc-9.5.tgz


Index: amaya.spec
===================================================================
RCS file: /cvs/extras/rpms/amaya/FC-4/amaya.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- amaya.spec	12 Jun 2005 11:58:52 -0000	1.14
+++ amaya.spec	14 Apr 2006 06:41:05 -0000	1.15
@@ -1,26 +1,27 @@
 Name:		amaya
-Version:	9.1
-Release:	3%{?dist}
+Version:	9.4
+Release:	1%{?dist}
 
 Summary:	W3C's browser/web authoring tool
 Group:		Applications/Internet
-Source0:	http://www.w3.org/Amaya/Distribution/amaya-fullsrc-9.1.tgz
+Source0:	http://www.w3.org/Amaya/Distribution/amaya-fullsrc-9.5.tgz
 Source1:	amaya.png
-Patch0:		amaya-9.1-configure.diff
-Patch1:		amaya-9.1-64bits.patch
 
 License:	W3C Software License
 Url:		http://www.w3.org/Amaya
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 #BuildRequires:	libjpeg-devel libpng-devel zlib-devel
 #BuildRequires:	gtk+-devel perl bison flex imlib-devel
-BuildRequires:	xorg-x11-devel, freetype-devel >= 2.0
+BuildRequires:	freetype-devel >= 2.0
 BuildRequires:	desktop-file-utils, gtk+-devel, imlib-devel
-BuildRequires:  libpng-devel
+BuildRequires:  libpng-devel, libXt-devel
 # TODO: make it link with the system's libwww. Didn't manage to build with it
 # yet. Patches accepted.
 #BuildRequires:	w3c-libwww-devel
 
+# Does not build on x86_64, see bug #182512
+ExcludeArch: x86_64
+
 %description
 Amaya is a WYSIWYG browser/web authoring tool from the W3C.
 
@@ -29,8 +30,6 @@
 
 %prep
 %setup -q -c
-%patch0 -p0
-%patch1 -p0
 
 %build
 mkdir -p Amaya/gtk-build
@@ -40,10 +39,13 @@
 export CFLAGS="$RPM_OPT_FLAGS"
 ../configure --enable-bookmarks \
              --prefix=%_libdir \
-	     --bindir=%_bindir \
-	     --exec_prefix=%_exec_prefix \
+             --bindir=%_bindir \
+             --exec_prefix=%_exec_prefix \
              --libdir=%_libdir \
+             --disable-annot \
              --with-gtk
+             
+# annotations cause build to fail
 make
 popd
 
@@ -61,7 +63,8 @@
 # fix up symlinks
 pushd ${RPM_BUILD_ROOT}%{_bindir} >/dev/null
 rm -f amaya*
-ln -s %{_libdir}/Amaya-*/gtk/bin/amaya amaya-gtk
+amayadir=`ls -d ${RPM_BUILD_ROOT}%{_libdir}/Amaya-*`
+ln -s %{_libdir}/`basename $amayadir`/gtk/bin/amaya amaya-gtk
 ln -s amaya-gtk amaya
 popd >/dev/null
 
@@ -99,6 +102,36 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Thu Apr 13 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-1
+- upgrade to 9.5 to fix vulnerability
+
+* Sun Mar 12 2006 Aurelien Bompard <gauret[AT]free.fr> 9.1-12
+- fix symlink (bug #184503)
+
+* Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 9.1-11
+- give up on x86_64 and excludearch it
+
+* Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 9.1-10
+- next try at the x86_64 patch
+
+* Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 9.1-9
+- update x86_64 patch again
+
+* Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 9.1-8
+- update x86_64 patch
+
+* Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 9.1-7
+- fix dependency on modular X11 again
+
+* Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 9.1-6
+- fix dependency on modular X11
+
+* Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 9.1-5
+- rebuild for FC5
+
+* Sun Jun 12 2005 Aurelien Bompard <gauret[AT]free.fr> 9.1-4
+- patch one more file
+
 * Sun Jun 12 2005 Aurelien Bompard <gauret[AT]free.fr> 9.1-3
 - add patch for pointer/int problem on x86_64
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amaya/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 May 2005 13:45:17 -0000	1.3
+++ sources	14 Apr 2006 06:41:05 -0000	1.4
@@ -1 +1 @@
-453fc74b79acb013e64a380865970773  amaya-fullsrc-9.1.tgz
+7b80b2fdda491a7f693b72606137f955  amaya-fullsrc-9.5.tgz



From fedora-extras-commits at redhat.com  Fri Apr 14 06:41:06 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 13 Apr 2006 23:41:06 -0700
Subject: rpms/amaya/FC-5 .cvsignore, 1.3, 1.4 amaya.spec, 1.24, 1.25 sources,
	1.3, 1.4
Message-ID: <200604140641.k3E6f8cb007975@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amaya/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7916/FC-5

Modified Files:
	.cvsignore amaya.spec sources 
Log Message:
upgrade to 9.5 to fix vulnerability


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amaya/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 May 2005 13:45:17 -0000	1.3
+++ .cvsignore	14 Apr 2006 06:41:06 -0000	1.4
@@ -1 +1 @@
-amaya-fullsrc-9.1.tgz
+amaya-fullsrc-9.5.tgz


Index: amaya.spec
===================================================================
RCS file: /cvs/extras/rpms/amaya/FC-5/amaya.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- amaya.spec	12 Mar 2006 09:42:53 -0000	1.24
+++ amaya.spec	14 Apr 2006 06:41:06 -0000	1.25
@@ -1,13 +1,11 @@
 Name:		amaya
-Version:	9.1
-Release:	12%{?dist}
+Version:	9.4
+Release:	1%{?dist}
 
 Summary:	W3C's browser/web authoring tool
 Group:		Applications/Internet
-Source0:	http://www.w3.org/Amaya/Distribution/amaya-fullsrc-9.1.tgz
+Source0:	http://www.w3.org/Amaya/Distribution/amaya-fullsrc-9.5.tgz
 Source1:	amaya.png
-Patch0:		amaya-9.1-configure.diff
-Patch1:		amaya-9.1-64bits.patch
 
 License:	W3C Software License
 Url:		http://www.w3.org/Amaya
@@ -32,8 +30,6 @@
 
 %prep
 %setup -q -c
-%patch0 -p0
-%patch1 -p0 -b .64bits
 
 %build
 mkdir -p Amaya/gtk-build
@@ -46,7 +42,10 @@
              --bindir=%_bindir \
              --exec_prefix=%_exec_prefix \
              --libdir=%_libdir \
+             --disable-annot \
              --with-gtk
+             
+# annotations cause build to fail
 make
 popd
 
@@ -103,6 +102,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Thu Apr 13 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-1
+- upgrade to 9.5 to fix vulnerability
+
 * Sun Mar 12 2006 Aurelien Bompard <gauret[AT]free.fr> 9.1-12
 - fix symlink (bug #184503)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amaya/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 May 2005 13:45:17 -0000	1.3
+++ sources	14 Apr 2006 06:41:06 -0000	1.4
@@ -1 +1 @@
-453fc74b79acb013e64a380865970773  amaya-fullsrc-9.1.tgz
+7b80b2fdda491a7f693b72606137f955  amaya-fullsrc-9.5.tgz



From fedora-extras-commits at redhat.com  Fri Apr 14 06:41:07 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Thu, 13 Apr 2006 23:41:07 -0700
Subject: rpms/amaya/devel .cvsignore, 1.3, 1.4 amaya.spec, 1.24, 1.25 sources,
	1.3, 1.4
Message-ID: <200604140641.k3E6f9Hg007981@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amaya/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7916/devel

Modified Files:
	.cvsignore amaya.spec sources 
Log Message:
upgrade to 9.5 to fix vulnerability


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amaya/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 May 2005 13:45:17 -0000	1.3
+++ .cvsignore	14 Apr 2006 06:41:07 -0000	1.4
@@ -1 +1 @@
-amaya-fullsrc-9.1.tgz
+amaya-fullsrc-9.5.tgz


Index: amaya.spec
===================================================================
RCS file: /cvs/extras/rpms/amaya/devel/amaya.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- amaya.spec	12 Mar 2006 09:42:53 -0000	1.24
+++ amaya.spec	14 Apr 2006 06:41:07 -0000	1.25
@@ -1,13 +1,11 @@
 Name:		amaya
-Version:	9.1
-Release:	12%{?dist}
+Version:	9.4
+Release:	1%{?dist}
 
 Summary:	W3C's browser/web authoring tool
 Group:		Applications/Internet
-Source0:	http://www.w3.org/Amaya/Distribution/amaya-fullsrc-9.1.tgz
+Source0:	http://www.w3.org/Amaya/Distribution/amaya-fullsrc-9.5.tgz
 Source1:	amaya.png
-Patch0:		amaya-9.1-configure.diff
-Patch1:		amaya-9.1-64bits.patch
 
 License:	W3C Software License
 Url:		http://www.w3.org/Amaya
@@ -32,8 +30,6 @@
 
 %prep
 %setup -q -c
-%patch0 -p0
-%patch1 -p0 -b .64bits
 
 %build
 mkdir -p Amaya/gtk-build
@@ -46,7 +42,10 @@
              --bindir=%_bindir \
              --exec_prefix=%_exec_prefix \
              --libdir=%_libdir \
+             --disable-annot \
              --with-gtk
+             
+# annotations cause build to fail
 make
 popd
 
@@ -103,6 +102,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Thu Apr 13 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-1
+- upgrade to 9.5 to fix vulnerability
+
 * Sun Mar 12 2006 Aurelien Bompard <gauret[AT]free.fr> 9.1-12
 - fix symlink (bug #184503)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amaya/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 May 2005 13:45:17 -0000	1.3
+++ sources	14 Apr 2006 06:41:07 -0000	1.4
@@ -1 +1 @@
-453fc74b79acb013e64a380865970773  amaya-fullsrc-9.1.tgz
+7b80b2fdda491a7f693b72606137f955  amaya-fullsrc-9.5.tgz



From fedora-extras-commits at redhat.com  Fri Apr 14 07:10:46 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 14 Apr 2006 00:10:46 -0700
Subject: rpms/amaya/FC-4 amaya.spec,1.15,1.16
Message-ID: <200604140710.k3E7AmvT010329@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amaya/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10284/FC-4

Modified Files:
	amaya.spec 
Log Message:
fix build on FC-4


Index: amaya.spec
===================================================================
RCS file: /cvs/extras/rpms/amaya/FC-4/amaya.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- amaya.spec	14 Apr 2006 06:41:05 -0000	1.15
+++ amaya.spec	14 Apr 2006 07:10:46 -0000	1.16
@@ -1,6 +1,6 @@
 Name:		amaya
 Version:	9.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Summary:	W3C's browser/web authoring tool
 Group:		Applications/Internet
@@ -10,11 +10,14 @@
 License:	W3C Software License
 Url:		http://www.w3.org/Amaya
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#BuildRequires:	libjpeg-devel libpng-devel zlib-devel
-#BuildRequires:	gtk+-devel perl bison flex imlib-devel
 BuildRequires:	freetype-devel >= 2.0
 BuildRequires:	desktop-file-utils, gtk+-devel, imlib-devel
 BuildRequires:  libpng-devel, libXt-devel
+%if "%fedora" >= "5"
+BuildRequires:  libXt-devel
+%else
+BuildRequires:  xorg-x11-devel
+%fi
 # TODO: make it link with the system's libwww. Didn't manage to build with it
 # yet. Patches accepted.
 #BuildRequires:	w3c-libwww-devel
@@ -102,6 +105,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-2
+- fix build on FC-4
+
 * Thu Apr 13 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-1
 - upgrade to 9.5 to fix vulnerability
 



From fedora-extras-commits at redhat.com  Fri Apr 14 07:10:47 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 14 Apr 2006 00:10:47 -0700
Subject: rpms/amaya/FC-5 amaya.spec,1.25,1.26
Message-ID: <200604140710.k3E7AnfT010331@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amaya/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10284/FC-5

Modified Files:
	amaya.spec 
Log Message:
fix build on FC-4


Index: amaya.spec
===================================================================
RCS file: /cvs/extras/rpms/amaya/FC-5/amaya.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- amaya.spec	14 Apr 2006 06:41:06 -0000	1.25
+++ amaya.spec	14 Apr 2006 07:10:47 -0000	1.26
@@ -1,6 +1,6 @@
 Name:		amaya
 Version:	9.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Summary:	W3C's browser/web authoring tool
 Group:		Applications/Internet
@@ -10,11 +10,14 @@
 License:	W3C Software License
 Url:		http://www.w3.org/Amaya
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#BuildRequires:	libjpeg-devel libpng-devel zlib-devel
-#BuildRequires:	gtk+-devel perl bison flex imlib-devel
 BuildRequires:	freetype-devel >= 2.0
 BuildRequires:	desktop-file-utils, gtk+-devel, imlib-devel
 BuildRequires:  libpng-devel, libXt-devel
+%if "%fedora" >= "5"
+BuildRequires:  libXt-devel
+%else
+BuildRequires:  xorg-x11-devel
+%fi
 # TODO: make it link with the system's libwww. Didn't manage to build with it
 # yet. Patches accepted.
 #BuildRequires:	w3c-libwww-devel
@@ -102,6 +105,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-2
+- fix build on FC-4
+
 * Thu Apr 13 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-1
 - upgrade to 9.5 to fix vulnerability
 



From fedora-extras-commits at redhat.com  Fri Apr 14 07:10:48 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 14 Apr 2006 00:10:48 -0700
Subject: rpms/amaya/devel amaya.spec,1.25,1.26
Message-ID: <200604140710.k3E7Ao92010335@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amaya/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10284/devel

Modified Files:
	amaya.spec 
Log Message:
fix build on FC-4


Index: amaya.spec
===================================================================
RCS file: /cvs/extras/rpms/amaya/devel/amaya.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- amaya.spec	14 Apr 2006 06:41:07 -0000	1.25
+++ amaya.spec	14 Apr 2006 07:10:47 -0000	1.26
@@ -1,6 +1,6 @@
 Name:		amaya
 Version:	9.4
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Summary:	W3C's browser/web authoring tool
 Group:		Applications/Internet
@@ -10,11 +10,14 @@
 License:	W3C Software License
 Url:		http://www.w3.org/Amaya
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#BuildRequires:	libjpeg-devel libpng-devel zlib-devel
-#BuildRequires:	gtk+-devel perl bison flex imlib-devel
 BuildRequires:	freetype-devel >= 2.0
 BuildRequires:	desktop-file-utils, gtk+-devel, imlib-devel
 BuildRequires:  libpng-devel, libXt-devel
+%if "%fedora" >= "5"
+BuildRequires:  libXt-devel
+%else
+BuildRequires:  xorg-x11-devel
+%fi
 # TODO: make it link with the system's libwww. Didn't manage to build with it
 # yet. Patches accepted.
 #BuildRequires:	w3c-libwww-devel
@@ -102,6 +105,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-2
+- fix build on FC-4
+
 * Thu Apr 13 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-1
 - upgrade to 9.5 to fix vulnerability
 



From fedora-extras-commits at redhat.com  Fri Apr 14 07:12:18 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 14 Apr 2006 00:12:18 -0700
Subject: rpms/amaya/devel amaya.spec,1.26,1.27
Message-ID: <200604140712.k3E7CK2A010410@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amaya/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10363/devel

Modified Files:
	amaya.spec 
Log Message:
typo


Index: amaya.spec
===================================================================
RCS file: /cvs/extras/rpms/amaya/devel/amaya.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- amaya.spec	14 Apr 2006 07:10:47 -0000	1.26
+++ amaya.spec	14 Apr 2006 07:12:18 -0000	1.27
@@ -17,7 +17,7 @@
 BuildRequires:  libXt-devel
 %else
 BuildRequires:  xorg-x11-devel
-%fi
+%endif
 # TODO: make it link with the system's libwww. Didn't manage to build with it
 # yet. Patches accepted.
 #BuildRequires:	w3c-libwww-devel



From fedora-extras-commits at redhat.com  Fri Apr 14 07:12:11 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 14 Apr 2006 00:12:11 -0700
Subject: rpms/amaya/FC-4 amaya.spec,1.16,1.17
Message-ID: <200604140712.k3E7Ch7t010413@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amaya/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10363/FC-4

Modified Files:
	amaya.spec 
Log Message:
typo


Index: amaya.spec
===================================================================
RCS file: /cvs/extras/rpms/amaya/FC-4/amaya.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- amaya.spec	14 Apr 2006 07:10:46 -0000	1.16
+++ amaya.spec	14 Apr 2006 07:12:11 -0000	1.17
@@ -17,7 +17,7 @@
 BuildRequires:  libXt-devel
 %else
 BuildRequires:  xorg-x11-devel
-%fi
+%endif
 # TODO: make it link with the system's libwww. Didn't manage to build with it
 # yet. Patches accepted.
 #BuildRequires:	w3c-libwww-devel



From fedora-extras-commits at redhat.com  Fri Apr 14 07:12:12 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 14 Apr 2006 00:12:12 -0700
Subject: rpms/amaya/FC-5 amaya.spec,1.26,1.27
Message-ID: <200604140712.k3E7CiaI010416@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amaya/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10363/FC-5

Modified Files:
	amaya.spec 
Log Message:
typo


Index: amaya.spec
===================================================================
RCS file: /cvs/extras/rpms/amaya/FC-5/amaya.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- amaya.spec	14 Apr 2006 07:10:47 -0000	1.26
+++ amaya.spec	14 Apr 2006 07:12:12 -0000	1.27
@@ -17,7 +17,7 @@
 BuildRequires:  libXt-devel
 %else
 BuildRequires:  xorg-x11-devel
-%fi
+%endif
 # TODO: make it link with the system's libwww. Didn't manage to build with it
 # yet. Patches accepted.
 #BuildRequires:	w3c-libwww-devel



From fedora-extras-commits at redhat.com  Fri Apr 14 07:29:14 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 14 Apr 2006 00:29:14 -0700
Subject: rpms/amarok/FC-5 .cvsignore, 1.20, 1.21 amarok.spec, 1.45,
	1.46 sources, 1.20, 1.21
Message-ID: <200604140729.k3E7TGco010582@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10544/FC-5

Modified Files:
	.cvsignore amarok.spec sources 
Log Message:
update to beta3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-5/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	14 Mar 2006 08:38:52 -0000	1.20
+++ .cvsignore	14 Apr 2006 07:29:14 -0000	1.21
@@ -1 +1 @@
-amarok-1.4-beta2.tar.bz2
+amarok-1.4-beta3c.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-5/amarok.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- amarok.spec	21 Mar 2006 23:08:40 -0000	1.45
+++ amarok.spec	14 Apr 2006 07:29:14 -0000	1.46
@@ -1,21 +1,14 @@
-# Rebuild switch: 
-#  --with nonfree    Enables nonfree plugins (xine engine, MP4 support, iPod...)
-#
-
-%{?_with_nonfree: %define use_nonfree 1}
-
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.4
-Release:    0.9.beta2%{?dist}
+Release:    0.11.beta3%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.4-beta2.tar.bz2
+Source0:    http://dl.sf.net/amarok/amarok-1.4-beta3c.tar.bz2
 Patch0:     amarok-1.4beta1-gst10.patch
-Patch1:     amarok-1.4-helix.patch
-#Patch1:     amarok-1.3.6-libtunepimp040.patch
+#Patch1:     amarok-1.4-helix.patch
 Patch2:     amarok-1.4-engines-cfg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -30,10 +23,11 @@
 BuildRequires:  libtunepimp-devel >= 0.4.0
 BuildRequires:  kdebase-devel
 BuildRequires:  alsa-lib-devel
-BuildRequires:  akode-devel
+#BuildRequires:  akode-devel
 BuildRequires:  libifp-devel, libusb-devel
 %if "%fedora" >= "5"
 BuildRequires:  gstreamer-plugins-base-devel, gstreamer-plugins-good-devel, gstreamer-devel
+BuildRequires:  libgpod-devel
 %else
 BuildRequires:  gstreamer-plugins-devel >= 0.8.4
 %endif
@@ -41,12 +35,6 @@
 BuildRequires:  HelixPlayer
 %endif
 
-%if  0%{?use_nonfree}
-BuildRequires:  xine-lib-devel >= 0:1.0.0
-BuildRequires:  libmad-devel
-BuildRequires:  faad2-devel
-%endif
-
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -79,32 +67,13 @@
 use any of xmms' visualisation plugins with Amarok.
 
 
-%if 0%{?use_nonfree}
-%package nonfree
-Summary:    Non-free plugins for Amarok
-Group:      Applications/Multimedia
-Requires:   %{name} = %{version}
-Obsoletes:  %{name}-xine < %{version}
-Provides:   %{name}-xine = %{version}
-
-%description nonfree
-This package adds the patented/non-free plugins for Amarok:
- - xine engine
- - mp4 tagging support (not yet done)
- - iPod support (not yet done)
-%endif
-
 
 %prep
-%setup -q -n %{name}-%{version}-beta2
+%setup -q -n %{name}-%{version}-beta3c
 # Discover the helix libs
-%patch1 -p1 -b .helix
-# Use libtunepimp 0.4.0 (api changed)
-#%patch1 -p1 -b .libtunepimp040
+#%patch1 -p1 -b .helix
 # Gstreamer default sink should be autoaudiosink
 %patch2 -p1 -b .engines-cfg
-# Don't use cache to detect gst 0.10 or it will fail because gst 0.8 is not present
-#%patch0 -p1 -b .gst10
 
 
 %build
@@ -118,17 +87,11 @@
      --enable-mysql \
      --enable-postgresql \
      --with-ifp \
-%ifnarch ppc64 x86_64 s390 s390x ia64
-     --with-helix=%{_libdir}/helix \
-%endif
-%if 0%{?use_nonfree}
-     --with-xine \
-#     --with-mp4v2 \  # Compile fails
-#     --with-libgpod \ # Not packaged yet
-%else
+     --with-libgpod \
      --without-xine \
      --without-mp4v2 \
-#     --without-libgpod \
+%ifnarch ppc64 x86_64 s390 s390x ia64
+     --with-helix=%{_libdir}/helix \
 %endif
 #     --enable-final \
 #     --with-nmm \
@@ -147,13 +110,6 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus
 
-# The desktop file contains both the desktop entry and the service menu, we have to split.
-# Tail from the blank line:
-perl -ne '/^$/...do{print;0}' $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop \
-    > $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus/%name.desktop
-# Head until the blank line:
-perl -pi -e '/^$/ && exit' $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
-
 desktop-file-install  --vendor "" \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
         --delete-original \
@@ -161,7 +117,7 @@
         --add-category X-Fedora \
         $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
 
-rm -f $RPM_BUILD_ROOT%{_datadir}/applications/kde/amarokapp.desktop
+#rm -f $RPM_BUILD_ROOT%{_datadir}/applications/kde/amarokapp.desktop
 # Amarok crashes without the *.la files !
 #find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 # Remove the *.la file in /usr/lib though, those are OK to delete
@@ -207,16 +163,19 @@
 %{_bindir}/amarokapp
 %{_bindir}/amarokcollectionscanner
 %{_datadir}/apps/%{name}
+%exclude %{_datadir}/apps/%{name}/images/xine_logo.png
 %{_datadir}/icons/hicolor/*/*
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/services/amarok_void-engine_plugin.desktop
 %{_datadir}/services/amarok_ifp-mediadevice.desktop
 %{_datadir}/services/amarok_vfat-mediadevice.desktop
+%{_datadir}/services/amarok_ipod-mediadevice.desktop
 %{_datadir}/servicetypes/*.desktop
 %{_datadir}/apps/konqueror/servicemenus/*.desktop
 %{_libdir}/kde3/libamarok_void-engine_plugin.*
 %{_libdir}/kde3/libamarok_ifp-mediadevice.*
 %{_libdir}/kde3/libamarok_vfat-mediadevice.*
+%{_libdir}/kde3/libamarok_ipod-mediadevice.*
 %{_libdir}/kde3/konqsidebar_universalamarok.*
 %{_libdir}/libamarok.*
 %{_datadir}/apps/konqsidebartng/*/amarok.desktop
@@ -231,9 +190,9 @@
 %{_datadir}/services/amarok_gstengine_plugin.desktop
 %{_libdir}/kde3/libamarok_gstengine_plugin.*
 %endif
-# Akode engine
-%{_datadir}/services/amarok_aKode-engine.desktop
-%{_libdir}/kde3/libamarok_aKode-engine.*
+# Akode engine - disabled in beta3
+#%{_datadir}/services/amarok_aKode-engine.desktop
+#%{_libdir}/kde3/libamarok_aKode-engine.*
 # Helix engine
 %ifnarch ppc64 x86_64 s390 s390x ia64
 %{_libdir}/kde3/libamarok_helixengine_plugin.*
@@ -241,22 +200,21 @@
 %endif
 
 
-
 %files visualisation
 %defattr(-,root,root)
 %{_bindir}/amarok_libvisual
 %{_bindir}/amarok_xmmswrapper2
 
 
-%if 0%{?use_nonfree}
-%files nonfree
-%defattr(-,root,root)
-%{_libdir}/kde3/libamarok_xine-engine.*
-%{_datadir}/services/amarok_xine-engine.desktop
-%endif
-
 
 %changelog
+* Sun Apr 09 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-0.11.beta3
+- drop the non-free bits
+- beta 3 (akode has been disabled)
+
+* Wed Mar 22 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-0.10.beta2
+- enable libgpod support
+
 * Wed Mar 22 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-0.9.beta2
 - make amarok build even with gstreamer only
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-5/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	14 Mar 2006 08:38:52 -0000	1.20
+++ sources	14 Apr 2006 07:29:14 -0000	1.21
@@ -1 +1 @@
-0c7e2a5e8ea2d73d8e73b986090cfc37  amarok-1.4-beta2.tar.bz2
+b92433b46005f0b2fc31e0ce0bf4cb3a  amarok-1.4-beta3c.tar.bz2



From fedora-extras-commits at redhat.com  Fri Apr 14 07:29:15 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 14 Apr 2006 00:29:15 -0700
Subject: rpms/amarok/devel .cvsignore, 1.20, 1.21 amarok-1.4-helix.patch, 1.1,
	1.2 amarok.spec, 1.44, 1.45 sources, 1.20, 1.21
Message-ID: <200604140729.k3E7THTZ010590@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10544/devel

Modified Files:
	.cvsignore amarok-1.4-helix.patch amarok.spec sources 
Log Message:
update to beta3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- .cvsignore	14 Mar 2006 08:38:52 -0000	1.20
+++ .cvsignore	14 Apr 2006 07:29:15 -0000	1.21
@@ -1 +1 @@
-amarok-1.4-beta2.tar.bz2
+amarok-1.4-beta3c.tar.bz2

amarok-1.4-helix.patch:

Index: amarok-1.4-helix.patch
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok-1.4-helix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- amarok-1.4-helix.patch	14 Mar 2006 08:38:52 -0000	1.1
+++ amarok-1.4-helix.patch	14 Apr 2006 07:29:15 -0000	1.2
@@ -1,11 +1,20 @@
 --- ./configure.helix	2006-03-05 20:28:13.000000000 +0100
-+++ ./configure	2006-03-13 23:04:01.000000000 +0100
++++ ./configure	2006-03-22 00:04:48.000000000 +0100
 @@ -38181,7 +38181,7 @@
  # BEGIN DO_NOT_COMPILE CHECK
  ###############################################################################
  
 -if test x$build_xine != xyes -a x$build_helix != xno; then
-+if test x$build_xine = xno -a x$build_helix = xno; then
++if test x$build_xine = xno -a x$build_helix = xno -a x$build_gstreamer10 = xno; then
  
      DO_NOT_COMPILE="$DO_NOT_COMPILE amarok"
      no_engine=yes
+@@ -40594,7 +40594,7 @@
+     echo " =================================="
+     echo " ="
+     echo " = No suitable multimedia framework was detected. You need to install at least"
+-    echo " = the Xine or Helix framework as detailed in the amaroK README."
++    echo " = the Xine, Helix framework or GStreamer as detailed in the amaroK README."
+     echo " ="
+ fi
+ 


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- amarok.spec	14 Mar 2006 08:38:52 -0000	1.44
+++ amarok.spec	14 Apr 2006 07:29:15 -0000	1.45
@@ -1,21 +1,14 @@
-# Rebuild switch: 
-#  --with nonfree    Enables nonfree plugins (xine engine, MP4 support, iPod...)
-#
-
-%{?_with_nonfree: %define use_nonfree 1}
-
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.4
-Release:    0.8.beta2%{?dist}
+Release:    0.11.beta3%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.4-beta2.tar.bz2
+Source0:    http://dl.sf.net/amarok/amarok-1.4-beta3c.tar.bz2
 Patch0:     amarok-1.4beta1-gst10.patch
-Patch1:     amarok-1.4-helix.patch
-#Patch1:     amarok-1.3.6-libtunepimp040.patch
+#Patch1:     amarok-1.4-helix.patch
 Patch2:     amarok-1.4-engines-cfg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -30,10 +23,11 @@
 BuildRequires:  libtunepimp-devel >= 0.4.0
 BuildRequires:  kdebase-devel
 BuildRequires:  alsa-lib-devel
-BuildRequires:  akode-devel
+#BuildRequires:  akode-devel
 BuildRequires:  libifp-devel, libusb-devel
 %if "%fedora" >= "5"
 BuildRequires:  gstreamer-plugins-base-devel, gstreamer-plugins-good-devel, gstreamer-devel
+BuildRequires:  libgpod-devel
 %else
 BuildRequires:  gstreamer-plugins-devel >= 0.8.4
 %endif
@@ -41,12 +35,6 @@
 BuildRequires:  HelixPlayer
 %endif
 
-%if  0%{?use_nonfree}
-BuildRequires:  xine-lib-devel >= 0:1.0.0
-BuildRequires:  libmad-devel
-BuildRequires:  faad2-devel
-%endif
-
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -79,32 +67,13 @@
 use any of xmms' visualisation plugins with Amarok.
 
 
-%if 0%{?use_nonfree}
-%package nonfree
-Summary:    Non-free plugins for Amarok
-Group:      Applications/Multimedia
-Requires:   %{name} = %{version}
-Obsoletes:  %{name}-xine < %{version}
-Provides:   %{name}-xine = %{version}
-
-%description nonfree
-This package adds the patented/non-free plugins for Amarok:
- - xine engine
- - mp4 tagging support (not yet done)
- - iPod support (not yet done)
-%endif
-
 
 %prep
-%setup -q -n %{name}-%{version}-beta2
+%setup -q -n %{name}-%{version}-beta3c
 # Discover the helix libs
-%patch1 -p1 -b .helix
-# Use libtunepimp 0.4.0 (api changed)
-#%patch1 -p1 -b .libtunepimp040
+#%patch1 -p1 -b .helix
 # Gstreamer default sink should be autoaudiosink
 %patch2 -p1 -b .engines-cfg
-# Don't use cache to detect gst 0.10 or it will fail because gst 0.8 is not present
-#%patch0 -p1 -b .gst10
 
 
 %build
@@ -118,17 +87,11 @@
      --enable-mysql \
      --enable-postgresql \
      --with-ifp \
-%ifnarch ppc64 x86_64 s390 s390x ia64
-     --with-helix=%{_libdir}/helix \
-%endif
-%if 0%{?use_nonfree}
-     --with-xine \
-#     --with-mp4v2 \  # Compile fails
-#     --with-libgpod \ # Not packaged yet
-%else
+     --with-libgpod \
      --without-xine \
      --without-mp4v2 \
-#     --without-libgpod \
+%ifnarch ppc64 x86_64 s390 s390x ia64
+     --with-helix=%{_libdir}/helix \
 %endif
 #     --enable-final \
 #     --with-nmm \
@@ -147,21 +110,14 @@
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus
 
-# The desktop file contains both the desktop entry and the service menu, we have to split.
-# Tail from the blank line:
-perl -ne '/^$/...do{print;0}' $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop \
-    > $RPM_BUILD_ROOT%{_datadir}/apps/konqueror/servicemenus/%name.desktop
-# Head until the blank line:
-perl -pi -e '/^$/ && exit' $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
-
-desktop-file-install  --vendor fedora \
+desktop-file-install  --vendor "" \
         --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
         --delete-original \
         --add-category Application \
         --add-category X-Fedora \
         $RPM_BUILD_ROOT%{_datadir}/applications/kde/%{name}.desktop
 
-rm -f $RPM_BUILD_ROOT%{_datadir}/applications/kde/amarokapp.desktop
+#rm -f $RPM_BUILD_ROOT%{_datadir}/applications/kde/amarokapp.desktop
 # Amarok crashes without the *.la files !
 #find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 # Remove the *.la file in /usr/lib though, those are OK to delete
@@ -207,16 +163,19 @@
 %{_bindir}/amarokapp
 %{_bindir}/amarokcollectionscanner
 %{_datadir}/apps/%{name}
+%exclude %{_datadir}/apps/%{name}/images/xine_logo.png
 %{_datadir}/icons/hicolor/*/*
 %{_datadir}/applications/kde/*.desktop
 %{_datadir}/services/amarok_void-engine_plugin.desktop
 %{_datadir}/services/amarok_ifp-mediadevice.desktop
 %{_datadir}/services/amarok_vfat-mediadevice.desktop
+%{_datadir}/services/amarok_ipod-mediadevice.desktop
 %{_datadir}/servicetypes/*.desktop
 %{_datadir}/apps/konqueror/servicemenus/*.desktop
 %{_libdir}/kde3/libamarok_void-engine_plugin.*
 %{_libdir}/kde3/libamarok_ifp-mediadevice.*
 %{_libdir}/kde3/libamarok_vfat-mediadevice.*
+%{_libdir}/kde3/libamarok_ipod-mediadevice.*
 %{_libdir}/kde3/konqsidebar_universalamarok.*
 %{_libdir}/libamarok.*
 %{_datadir}/apps/konqsidebartng/*/amarok.desktop
@@ -231,9 +190,9 @@
 %{_datadir}/services/amarok_gstengine_plugin.desktop
 %{_libdir}/kde3/libamarok_gstengine_plugin.*
 %endif
-# Akode engine
-%{_datadir}/services/amarok_aKode-engine.desktop
-%{_libdir}/kde3/libamarok_aKode-engine.*
+# Akode engine - disabled in beta3
+#%{_datadir}/services/amarok_aKode-engine.desktop
+#%{_libdir}/kde3/libamarok_aKode-engine.*
 # Helix engine
 %ifnarch ppc64 x86_64 s390 s390x ia64
 %{_libdir}/kde3/libamarok_helixengine_plugin.*
@@ -241,22 +200,24 @@
 %endif
 
 
-
 %files visualisation
 %defattr(-,root,root)
 %{_bindir}/amarok_libvisual
 %{_bindir}/amarok_xmmswrapper2
 
 
-%if 0%{?use_nonfree}
-%files nonfree
-%defattr(-,root,root)
-%{_libdir}/kde3/libamarok_xine-engine.*
-%{_datadir}/services/amarok_xine-engine.desktop
-%endif
-
 
 %changelog
+* Sun Apr 09 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-0.11.beta3
+- drop the non-free bits
+- beta 3 (akode has been disabled)
+
+* Wed Mar 22 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-0.10.beta2
+- enable libgpod support
+
+* Wed Mar 22 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-0.9.beta2
+- make amarok build even with gstreamer only
+
 * Sun Mar 05 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-0.8.beta2
 - version 1.4 beta2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	14 Mar 2006 08:38:52 -0000	1.20
+++ sources	14 Apr 2006 07:29:15 -0000	1.21
@@ -1 +1 @@
-0c7e2a5e8ea2d73d8e73b986090cfc37  amarok-1.4-beta2.tar.bz2
+b92433b46005f0b2fc31e0ce0bf4cb3a  amarok-1.4-beta3c.tar.bz2



From fedora-extras-commits at redhat.com  Fri Apr 14 07:46:06 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 14 Apr 2006 00:46:06 -0700
Subject: rpms/amaya/FC-4 amaya.spec,1.17,1.18
Message-ID: <200604140746.k3E7k80Y010803@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amaya/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10758/FC-4

Modified Files:
	amaya.spec 
Log Message:
drop conditional builds


Index: amaya.spec
===================================================================
RCS file: /cvs/extras/rpms/amaya/FC-4/amaya.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- amaya.spec	14 Apr 2006 07:12:11 -0000	1.17
+++ amaya.spec	14 Apr 2006 07:46:06 -0000	1.18
@@ -1,6 +1,6 @@
 Name:		amaya
 Version:	9.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 
 Summary:	W3C's browser/web authoring tool
 Group:		Applications/Internet
@@ -13,11 +13,7 @@
 BuildRequires:	freetype-devel >= 2.0
 BuildRequires:	desktop-file-utils, gtk+-devel, imlib-devel
 BuildRequires:  libpng-devel, libXt-devel
-%if "%fedora" >= "5"
-BuildRequires:  libXt-devel
-%else
 BuildRequires:  xorg-x11-devel
-%endif
 # TODO: make it link with the system's libwww. Didn't manage to build with it
 # yet. Patches accepted.
 #BuildRequires:	w3c-libwww-devel
@@ -105,6 +101,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-3
+- drop conditional build
+
 * Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-2
 - fix build on FC-4
 



From fedora-extras-commits at redhat.com  Fri Apr 14 07:46:08 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 14 Apr 2006 00:46:08 -0700
Subject: rpms/amaya/devel amaya.spec,1.27,1.28
Message-ID: <200604140746.k3E7kAS0010809@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amaya/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10758/devel

Modified Files:
	amaya.spec 
Log Message:
drop conditional builds


Index: amaya.spec
===================================================================
RCS file: /cvs/extras/rpms/amaya/devel/amaya.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- amaya.spec	14 Apr 2006 07:12:18 -0000	1.27
+++ amaya.spec	14 Apr 2006 07:46:08 -0000	1.28
@@ -1,6 +1,6 @@
 Name:		amaya
 Version:	9.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 
 Summary:	W3C's browser/web authoring tool
 Group:		Applications/Internet
@@ -13,11 +13,7 @@
 BuildRequires:	freetype-devel >= 2.0
 BuildRequires:	desktop-file-utils, gtk+-devel, imlib-devel
 BuildRequires:  libpng-devel, libXt-devel
-%if "%fedora" >= "5"
 BuildRequires:  libXt-devel
-%else
-BuildRequires:  xorg-x11-devel
-%endif
 # TODO: make it link with the system's libwww. Didn't manage to build with it
 # yet. Patches accepted.
 #BuildRequires:	w3c-libwww-devel
@@ -105,6 +101,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-3
+- drop conditional build
+
 * Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-2
 - fix build on FC-4
 



From fedora-extras-commits at redhat.com  Fri Apr 14 07:46:07 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 14 Apr 2006 00:46:07 -0700
Subject: rpms/amaya/FC-5 amaya.spec,1.27,1.28
Message-ID: <200604140746.k3E7k9ri010807@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amaya/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10758/FC-5

Modified Files:
	amaya.spec 
Log Message:
drop conditional builds


Index: amaya.spec
===================================================================
RCS file: /cvs/extras/rpms/amaya/FC-5/amaya.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- amaya.spec	14 Apr 2006 07:12:12 -0000	1.27
+++ amaya.spec	14 Apr 2006 07:46:07 -0000	1.28
@@ -1,6 +1,6 @@
 Name:		amaya
 Version:	9.4
-Release:	2%{?dist}
+Release:	3%{?dist}
 
 Summary:	W3C's browser/web authoring tool
 Group:		Applications/Internet
@@ -13,11 +13,7 @@
 BuildRequires:	freetype-devel >= 2.0
 BuildRequires:	desktop-file-utils, gtk+-devel, imlib-devel
 BuildRequires:  libpng-devel, libXt-devel
-%if "%fedora" >= "5"
 BuildRequires:  libXt-devel
-%else
-BuildRequires:  xorg-x11-devel
-%endif
 # TODO: make it link with the system's libwww. Didn't manage to build with it
 # yet. Patches accepted.
 #BuildRequires:	w3c-libwww-devel
@@ -105,6 +101,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-3
+- drop conditional build
+
 * Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-2
 - fix build on FC-4
 



From fedora-extras-commits at redhat.com  Fri Apr 14 08:18:42 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 14 Apr 2006 01:18:42 -0700
Subject: rpms/amaya/devel amaya.spec,1.28,1.29
Message-ID: <200604140818.k3E8Iinq013111@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amaya/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13060/devel

Modified Files:
	amaya.spec 
Log Message:
get buildreqs right this time


Index: amaya.spec
===================================================================
RCS file: /cvs/extras/rpms/amaya/devel/amaya.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- amaya.spec	14 Apr 2006 07:46:08 -0000	1.28
+++ amaya.spec	14 Apr 2006 08:18:42 -0000	1.29
@@ -1,6 +1,6 @@
 Name:		amaya
 Version:	9.4
-Release:	3%{?dist}
+Release:	4%{?dist}
 
 Summary:	W3C's browser/web authoring tool
 Group:		Applications/Internet
@@ -12,8 +12,12 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	freetype-devel >= 2.0
 BuildRequires:	desktop-file-utils, gtk+-devel, imlib-devel
-BuildRequires:  libpng-devel, libXt-devel
+BuildRequires:  libpng-devel
+%if "%fedora" >= "5"
 BuildRequires:  libXt-devel
+%else
+BuildRequires:  xorg-x11-devel
+%endif
 # TODO: make it link with the system's libwww. Didn't manage to build with it
 # yet. Patches accepted.
 #BuildRequires:	w3c-libwww-devel
@@ -101,6 +105,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-4
+- fix buildreqs
+
 * Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-3
 - drop conditional build
 



From fedora-extras-commits at redhat.com  Fri Apr 14 08:18:41 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 14 Apr 2006 01:18:41 -0700
Subject: rpms/amaya/FC-4 amaya.spec,1.18,1.19
Message-ID: <200604140818.k3E8Ihue013105@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amaya/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13060/FC-4

Modified Files:
	amaya.spec 
Log Message:
get buildreqs right this time


Index: amaya.spec
===================================================================
RCS file: /cvs/extras/rpms/amaya/FC-4/amaya.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- amaya.spec	14 Apr 2006 07:46:06 -0000	1.18
+++ amaya.spec	14 Apr 2006 08:18:40 -0000	1.19
@@ -1,6 +1,6 @@
 Name:		amaya
 Version:	9.4
-Release:	3%{?dist}
+Release:	4%{?dist}
 
 Summary:	W3C's browser/web authoring tool
 Group:		Applications/Internet
@@ -12,8 +12,12 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	freetype-devel >= 2.0
 BuildRequires:	desktop-file-utils, gtk+-devel, imlib-devel
-BuildRequires:  libpng-devel, libXt-devel
+BuildRequires:  libpng-devel
+%if "%fedora" >= "5"
+BuildRequires:  libXt-devel
+%else
 BuildRequires:  xorg-x11-devel
+%endif
 # TODO: make it link with the system's libwww. Didn't manage to build with it
 # yet. Patches accepted.
 #BuildRequires:	w3c-libwww-devel
@@ -101,6 +105,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-4
+- fix buildreqs
+
 * Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-3
 - drop conditional build
 



From fedora-extras-commits at redhat.com  Fri Apr 14 08:18:41 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 14 Apr 2006 01:18:41 -0700
Subject: rpms/amaya/FC-5 amaya.spec,1.28,1.29
Message-ID: <200604140818.k3E8Ihta013109@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amaya/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13060/FC-5

Modified Files:
	amaya.spec 
Log Message:
get buildreqs right this time


Index: amaya.spec
===================================================================
RCS file: /cvs/extras/rpms/amaya/FC-5/amaya.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- amaya.spec	14 Apr 2006 07:46:07 -0000	1.28
+++ amaya.spec	14 Apr 2006 08:18:41 -0000	1.29
@@ -1,6 +1,6 @@
 Name:		amaya
 Version:	9.4
-Release:	3%{?dist}
+Release:	4%{?dist}
 
 Summary:	W3C's browser/web authoring tool
 Group:		Applications/Internet
@@ -12,8 +12,12 @@
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	freetype-devel >= 2.0
 BuildRequires:	desktop-file-utils, gtk+-devel, imlib-devel
-BuildRequires:  libpng-devel, libXt-devel
+BuildRequires:  libpng-devel
+%if "%fedora" >= "5"
 BuildRequires:  libXt-devel
+%else
+BuildRequires:  xorg-x11-devel
+%endif
 # TODO: make it link with the system's libwww. Didn't manage to build with it
 # yet. Patches accepted.
 #BuildRequires:	w3c-libwww-devel
@@ -101,6 +105,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-4
+- fix buildreqs
+
 * Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 9.4-3
 - drop conditional build
 



From fedora-extras-commits at redhat.com  Fri Apr 14 08:30:45 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 14 Apr 2006 01:30:45 -0700
Subject: rpms/amarok/devel amarok-1.4-gstreamer.patch, NONE, 1.1 amarok.spec,
	1.45, 1.46 amarok-1.4-helix.patch, 1.2, NONE
Message-ID: <200604140830.k3E8UlN7013295@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13254/devel

Modified Files:
	amarok.spec 
Added Files:
	amarok-1.4-gstreamer.patch 
Removed Files:
	amarok-1.4-helix.patch 
Log Message:
make gstreamer sufficient to build on x86_64

amarok-1.4-gstreamer.patch:

--- NEW FILE amarok-1.4-gstreamer.patch ---
--- ./configure.gstreamer	2006-04-09 23:08:39.000000000 +0200
+++ ./configure	2006-04-14 10:23:09.000000000 +0200
@@ -37922,7 +37922,7 @@
 # BEGIN DO_NOT_COMPILE CHECK
 ###############################################################################
 
-if test x$build_xine = xno -a x$build_helix = xno; then
+if test x$build_xine = xno -a x$build_helix = xno -a x$build_gstreamer10 = xno; then
 
     DO_NOT_COMPILE="$DO_NOT_COMPILE amarok"
     no_engine=yes
@@ -40316,7 +40316,7 @@
     echo " =================================="
     echo " ="
     echo " = No suitable multimedia framework was detected. You need to install at least"
-    echo " = the Xine or Helix framework as detailed in the amaroK README."
+    echo " = the Xine, Helix framework or GStreamer as detailed in the amaroK README."
     echo " ="
 fi
 


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/devel/amarok.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- amarok.spec	14 Apr 2006 07:29:15 -0000	1.45
+++ amarok.spec	14 Apr 2006 08:30:45 -0000	1.46
@@ -1,14 +1,14 @@
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.4
-Release:    0.11.beta3%{?dist}
+Release:    0.12.beta3%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
 Source0:    http://dl.sf.net/amarok/amarok-1.4-beta3c.tar.bz2
 Patch0:     amarok-1.4beta1-gst10.patch
-#Patch1:     amarok-1.4-helix.patch
+Patch1:     amarok-1.4-gstreamer.patch
 Patch2:     amarok-1.4-engines-cfg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -70,8 +70,8 @@
 
 %prep
 %setup -q -n %{name}-%{version}-beta3c
-# Discover the helix libs
-#%patch1 -p1 -b .helix
+# Make Gstreamer a sufficient engine as well (only engine available on x86_64)
+%patch1 -p1 -b .gstreamer
 # Gstreamer default sink should be autoaudiosink
 %patch2 -p1 -b .engines-cfg
 
@@ -208,6 +208,10 @@
 
 
 %changelog
+* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-0.12.beta3
+- add patch to make Gstreamer sufficient to build (only engine available
+  on x86_64
+
 * Sun Apr 09 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-0.11.beta3
 - drop the non-free bits
 - beta 3 (akode has been disabled)


--- amarok-1.4-helix.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Apr 14 08:30:44 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 14 Apr 2006 01:30:44 -0700
Subject: rpms/amarok/FC-5 amarok-1.4-gstreamer.patch, NONE, 1.1 amarok.spec, 
	1.46, 1.47 amarok-1.4-helix.patch, 1.2, NONE
Message-ID: <200604140830.k3E8UkE9013289@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13254/FC-5

Modified Files:
	amarok.spec 
Added Files:
	amarok-1.4-gstreamer.patch 
Removed Files:
	amarok-1.4-helix.patch 
Log Message:
make gstreamer sufficient to build on x86_64

amarok-1.4-gstreamer.patch:

--- NEW FILE amarok-1.4-gstreamer.patch ---
--- ./configure.gstreamer	2006-04-09 23:08:39.000000000 +0200
+++ ./configure	2006-04-14 10:23:09.000000000 +0200
@@ -37922,7 +37922,7 @@
 # BEGIN DO_NOT_COMPILE CHECK
 ###############################################################################
 
-if test x$build_xine = xno -a x$build_helix = xno; then
+if test x$build_xine = xno -a x$build_helix = xno -a x$build_gstreamer10 = xno; then
 
     DO_NOT_COMPILE="$DO_NOT_COMPILE amarok"
     no_engine=yes
@@ -40316,7 +40316,7 @@
     echo " =================================="
     echo " ="
     echo " = No suitable multimedia framework was detected. You need to install at least"
-    echo " = the Xine or Helix framework as detailed in the amaroK README."
+    echo " = the Xine, Helix framework or GStreamer as detailed in the amaroK README."
     echo " ="
 fi
 


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-5/amarok.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- amarok.spec	14 Apr 2006 07:29:14 -0000	1.46
+++ amarok.spec	14 Apr 2006 08:30:44 -0000	1.47
@@ -1,14 +1,14 @@
 Name:       amarok
 Summary:    Media player for KDE
 Version:    1.4
-Release:    0.11.beta3%{?dist}
+Release:    0.12.beta3%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
 Source0:    http://dl.sf.net/amarok/amarok-1.4-beta3c.tar.bz2
 Patch0:     amarok-1.4beta1-gst10.patch
-#Patch1:     amarok-1.4-helix.patch
+Patch1:     amarok-1.4-gstreamer.patch
 Patch2:     amarok-1.4-engines-cfg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -70,8 +70,8 @@
 
 %prep
 %setup -q -n %{name}-%{version}-beta3c
-# Discover the helix libs
-#%patch1 -p1 -b .helix
+# Make Gstreamer a sufficient engine as well (only engine available on x86_64)
+%patch1 -p1 -b .gstreamer
 # Gstreamer default sink should be autoaudiosink
 %patch2 -p1 -b .engines-cfg
 
@@ -208,6 +208,10 @@
 
 
 %changelog
+* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-0.12.beta3
+- add patch to make Gstreamer sufficient to build (only engine available
+  on x86_64
+
 * Sun Apr 09 2006 Aurelien Bompard <gauret[AT]free.fr> 1.4-0.11.beta3
 - drop the non-free bits
 - beta 3 (akode has been disabled)


--- amarok-1.4-helix.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Apr 14 09:44:15 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 14 Apr 2006 02:44:15 -0700
Subject: rpms/gcl/FC-5 gcl.spec,1.18,1.19
Message-ID: <200604140944.k3E9iHlo015738@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gcl/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15721

Modified Files:
	gcl.spec 
Log Message:



Index: gcl.spec
===================================================================
RCS file: /cvs/extras/rpms/gcl/FC-5/gcl.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- gcl.spec	8 Mar 2006 20:53:23 -0000	1.18
+++ gcl.spec	14 Apr 2006 09:44:15 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           gcl
 Version:        2.6.7
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        GNU Common Lisp
 
 Group:          Development/Languages
@@ -15,8 +15,8 @@
 BuildRequires:	tcl-devel
 BuildRequires:  gmp-devel
 BuildRequires:	tetex, texinfo
-Requires(post): /sbin/install-info
-Requires(postun): /sbin/install-info
+Requires(post): /sbin/install-info, policycoreutils
+Requires(postun): /sbin/install-info, policycoreutils
 ExcludeArch:	ppc ppc64
 
 
@@ -72,14 +72,15 @@
 %post
 /sbin/install-info %{_infodir}/%{name}-si.info %{_infodir}/dir 2>/dev/null || :
 /sbin/install-info %{_infodir}/%{name}-tk.info %{_infodir}/dir 2>/dev/null || :
+/usr/sbin/semanage fcontext -a -t textrel_shlib_t "%{_libdir}/gcl-%{version}/unixport/saved_ansi_gcl" 2>/dev/null || :
+/sbin/restorecon "%{_libdir}/gcl-%{version}/unixport/saved_ansi_gcl" 2> /dev/null || :
 
 
 %postun
 if [ $1 = 0 ]; then
-  /sbin/install-info --delete %{_infodir}/%{name}-si.info \
-    %{_infodir}/dir 2>/dev/null || :
-  /sbin/install-info --delete %{_infodir}/%{name}-tk.info \
-    %{_infodir}/dir 2>/dev/null || :
+    /sbin/install-info --delete %{_infodir}/%{name}-si.info %{_infodir}/dir 2>/dev/null || :
+    /sbin/install-info --delete %{_infodir}/%{name}-tk.info %{_infodir}/dir 2>/dev/null || :
+    /usr/sbin/semanage fcontext -d -t textrel_shlib_t "%{_libdir}/gcl-%{version}/unixport/saved_ansi_gcl" 2>/dev/null || :
 fi
 
 
@@ -96,6 +97,9 @@
 
 
 %changelog
+* Fri Apr 14 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.6.7-10
+- added changes to SELinux policy
+
 * Wed Mar  8 2006 Gerard Milmeister <gemi at bluewin.ch> - 2.6.7-7
 - Patch gcl-bash.patch for configure
 



From fedora-extras-commits at redhat.com  Fri Apr 14 09:47:31 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 14 Apr 2006 02:47:31 -0700
Subject: rpms/xemacs/FC-5 xemacs.spec,1.22,1.23
Message-ID: <200604140947.k3E9lXUJ015823@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15806

Modified Files:
	xemacs.spec 
Log Message:
* Fri Apr 14 2006 Ville Skytt?? <ville.skytta at iki.fi> - 21.4.19-5
- Don't expect to find ellcc if building without modules (#188929).



Index: xemacs.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs/FC-5/xemacs.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xemacs.spec	4 Apr 2006 17:44:46 -0000	1.22
+++ xemacs.spec	14 Apr 2006 09:47:31 -0000	1.23
@@ -4,13 +4,18 @@
 %bcond_without  mule
 %bcond_with     stackprot
 %bcond_without  gcc32
+%ifarch ia64
+%bcond_with     modules
+%else
+%bcond_without  modules
+%endif
 
 %define pkgdir  %{_datadir}/xemacs
 %define exectop %{_libdir}/xemacs-%{version}
 
 Name:           xemacs
 Version:        21.4.19
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -226,7 +231,7 @@
 %ifarch alpha ia64 ppc64
   --with-system-malloc
 %endif
-%ifarch ia64
+%if ! %{with modules}
   --without-modules
 %endif
 "
@@ -436,7 +441,9 @@
 %doc INSTALL README COPYING GETTING.GNU.SOFTWARE PROBLEMS CHANGES-release
 %doc etc/NEWS etc/MAILINGLISTS BUGS README.packages etc/TUTORIAL
 %doc etc/editclient.sh
+%if ! %{with modules}
 %{_bindir}/ellcc
+%endif
 %{_bindir}/etags.xemacs
 %{_bindir}/gnuattach
 %{_bindir}/gnudoit
@@ -462,6 +469,9 @@
 
 
 %changelog
+* Fri Apr 14 2006 Ville Skytt?? <ville.skytta at iki.fi> - 21.4.19-5
+- Don't expect to find ellcc if building without modules (#188929).
+
 * Fri Mar 31 2006 Ville Skytt?? <ville.skytta at iki.fi> - 21.4.19-4
 - Build with gcc 3.2.x (#183643).
 - Don't ship patch backup files.



From fedora-extras-commits at redhat.com  Fri Apr 14 09:50:20 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 14 Apr 2006 02:50:20 -0700
Subject: rpms/ecl/FC-5 ecl.spec,1.3,1.4
Message-ID: <200604140950.k3E9oMTD015903@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/ecl/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15884

Modified Files:
	ecl.spec 
Log Message:



Index: ecl.spec
===================================================================
RCS file: /cvs/extras/rpms/ecl/FC-5/ecl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ecl.spec	15 Mar 2006 16:37:45 -0000	1.3
+++ ecl.spec	14 Apr 2006 09:50:20 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           ecl
 Version:        0.9h
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Embeddable Common-Lisp
 
 Group:          Development/Languages
@@ -12,8 +12,8 @@
 BuildRequires:	libX11-devel
 BuildRequires:	m4
 BuildRequires:	texinfo
-Requires(post): /sbin/install-info
-Requires(postun): /sbin/install-info
+Requires(post): /sbin/install-info, policycoreutils
+Requires(postun): /sbin/install-info, policycoreutils
 
 %description
 ECL (Embeddable Common-Lisp) is an interpreter of the Common-Lisp
@@ -55,12 +55,15 @@
 %post
 /sbin/install-info %{_infodir}/ecldev.info %{_infodir}/dir 2>/dev/null || :
 /sbin/install-info %{_infodir}/ecl.info %{_infodir}/dir 2>/dev/null || :
+/usr/sbin/semanage fcontext -a -t textrel_shlib_t "%{_libdir}/ecl/libecl.so" 2>/dev/null || :
+/sbin/restorecon "%{_libdir}/ecl/libecl.so" 2> /dev/null || :
 
  
 %postun
 if [ $1 = 0 ]; then
   /sbin/install-info --delete %{_infodir}/ecldev.info %{_infodir}/dir 2>/dev/null || :
   /sbin/install-info --delete %{_infodir}/ecl.info %{_infodir}/dir 2>/dev/null || :
+  /usr/sbin/semanage fcontext -d -t textrel_shlib_t "%{_libdir}/ecl/libecl.so" 2>/dev/null || :
 fi
 
 
@@ -79,6 +82,9 @@
 
 
 %changelog
+* Fri Apr 14 2006 Gerard Milmeister <gemi at bluewin.ch> - 0.9h-6
+- added changes to SELinux policy
+
 * Wed Mar 15 2006 Gerard Milmeister <gemi at bluewin.ch> - 0.9h-5
 - patch for gcc 4.1
 



From fedora-extras-commits at redhat.com  Fri Apr 14 10:08:11 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 14 Apr 2006 03:08:11 -0700
Subject: rpms/xemacs/FC-5 xemacs.spec,1.23,1.24
Message-ID: <200604141008.k3EA8EqX018038@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18021

Modified Files:
	xemacs.spec 
Log Message:
Fix thinko in previous commit.


Index: xemacs.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs/FC-5/xemacs.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xemacs.spec	14 Apr 2006 09:47:31 -0000	1.23
+++ xemacs.spec	14 Apr 2006 10:08:11 -0000	1.24
@@ -441,7 +441,7 @@
 %doc INSTALL README COPYING GETTING.GNU.SOFTWARE PROBLEMS CHANGES-release
 %doc etc/NEWS etc/MAILINGLISTS BUGS README.packages etc/TUTORIAL
 %doc etc/editclient.sh
-%if ! %{with modules}
+%if %{with modules}
 %{_bindir}/ellcc
 %endif
 %{_bindir}/etags.xemacs



From fedora-extras-commits at redhat.com  Fri Apr 14 10:37:40 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Fri, 14 Apr 2006 03:37:40 -0700
Subject: rpms/python-sqlite2/devel .cvsignore, 1.4, 1.5 python-sqlite2.spec, 
	1.7, 1.8 sources, 1.4, 1.5
Message-ID: <200604141037.k3EAbgkH018160@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/python-sqlite2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18139

Modified Files:
	.cvsignore python-sqlite2.spec sources 
Log Message:
Update to 2.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Feb 2006 01:21:15 -0000	1.4
+++ .cvsignore	14 Apr 2006 10:37:40 -0000	1.5
@@ -1 +1 @@
-pysqlite-2.1.3.tar.gz
+pysqlite-2.2.0.tar.gz


Index: python-sqlite2.spec
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/devel/python-sqlite2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-sqlite2.spec	14 Feb 2006 10:01:33 -0000	1.7
+++ python-sqlite2.spec	14 Apr 2006 10:37:40 -0000	1.8
@@ -1,21 +1,19 @@
 %{!?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:           python-sqlite2
-Version:        2.1.3
-Release:        4%{?dist}
+Version:        2.2.0
+Release:        1%{?dist}
 Epoch:          1
 Summary:        DB-API 2.0 interface for SQLite 3.x
 
 Group:          Development/Languages
 License:        zlib/libpng
 URL:            http://pysqlite.org/
-Source0:        http://initd.org/pub/software/pysqlite/releases/2.1/%{version}/pysqlite-%{version}.tar.gz
+Source0:        http://initd.org/pub/software/pysqlite/releases/2.2/%{version}/pysqlite-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dos2unix
 BuildRequires:  python-devel
-BuildRequires:  python-setuptools
 BuildRequires:  sqlite-devel >= 3.3.3
 
 Requires:       sqlite >= 3.3.3
@@ -38,7 +36,6 @@
 rm -rf %{buildroot}
 %{__python} setup.py install -O1 \
 	--skip-build \
-	--old-and-unmanageable \
 	--root %{buildroot}
 
 %{__mv} %{buildroot}%{_prefix}/pysqlite2-doc documentation
@@ -48,7 +45,10 @@
 
 
 %check
-%{__python} setup.py test
+# workaround for some strange bug (thanks to Ville Skytt??!)
+cd documentation
+PYTHONPATH="%{buildroot}%{python_sitearch}" %{__python} -c \
+	"from pysqlite2.test import test; test()"
 
 
 %clean
@@ -58,7 +58,6 @@
 %files
 %defattr(-,root,root,-)
 %doc LICENSE documentation/*
-%doc doc/pysqlite-introduction-slides/pysqlite-introduction.pdf
 %dir %{python_sitearch}/pysqlite2
 %{python_sitearch}/pysqlite2/__init__.py
 %{python_sitearch}/pysqlite2/__init__.pyc
@@ -66,30 +65,38 @@
 %{python_sitearch}/pysqlite2/dbapi2.pyc
 %{python_sitearch}/pysqlite2/_sqlite.so
 %dir %{python_sitearch}/pysqlite2/test
+%{python_sitearch}/pysqlite2/test/__init__.py
+%{python_sitearch}/pysqlite2/test/__init__.pyc
 %{python_sitearch}/pysqlite2/test/dbapi.py
 %{python_sitearch}/pysqlite2/test/dbapi.pyc
 %{python_sitearch}/pysqlite2/test/factory.py
 %{python_sitearch}/pysqlite2/test/factory.pyc
-%{python_sitearch}/pysqlite2/test/__init__.py
-%{python_sitearch}/pysqlite2/test/__init__.pyc
+%{python_sitearch}/pysqlite2/test/hooks.py
+%{python_sitearch}/pysqlite2/test/hooks.pyc
+%{python_sitearch}/pysqlite2/test/regression.py
+%{python_sitearch}/pysqlite2/test/regression.pyc
 %{python_sitearch}/pysqlite2/test/transactions.py
 %{python_sitearch}/pysqlite2/test/transactions.pyc
 %{python_sitearch}/pysqlite2/test/types.py
 %{python_sitearch}/pysqlite2/test/types.pyc
 %{python_sitearch}/pysqlite2/test/userfunctions.py
 %{python_sitearch}/pysqlite2/test/userfunctions.pyc
-%{python_sitearch}/pysqlite-%{version}-py%{pyver}.egg-info/
 %ghost %{python_sitearch}/pysqlite2/__init__.pyo
 %ghost %{python_sitearch}/pysqlite2/dbapi2.pyo
+%ghost %{python_sitearch}/pysqlite2/test/__init__.pyo
 %ghost %{python_sitearch}/pysqlite2/test/dbapi.pyo
 %ghost %{python_sitearch}/pysqlite2/test/factory.pyo
-%ghost %{python_sitearch}/pysqlite2/test/__init__.pyo
+%ghost %{python_sitearch}/pysqlite2/test/hooks.pyo
+%ghost %{python_sitearch}/pysqlite2/test/regression.pyo
 %ghost %{python_sitearch}/pysqlite2/test/transactions.pyo
 %ghost %{python_sitearch}/pysqlite2/test/types.pyo
 %ghost %{python_sitearch}/pysqlite2/test/userfunctions.pyo
 
 
 %changelog
+* Fri Apr 14 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 1:2.2.0-1
+- Update to 2.2.0
+
 * Tue Feb 14 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 1:2.1.3-4
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Feb 2006 01:21:15 -0000	1.4
+++ sources	14 Apr 2006 10:37:40 -0000	1.5
@@ -1 +1 @@
-55ef66a963ddff5540b117db0a6c085b  pysqlite-2.1.3.tar.gz
+8f68b79b2fe891e72da193cbc3a3d5e9  pysqlite-2.2.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 14 11:23:20 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Fri, 14 Apr 2006 04:23:20 -0700
Subject: rpms/python-sqlite2/FC-5 .cvsignore, 1.4, 1.5 python-sqlite2.spec,
	1.7, 1.8 sources, 1.4, 1.5
Message-ID: <200604141123.k3EBNMEm020900@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/python-sqlite2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20879

Modified Files:
	.cvsignore python-sqlite2.spec sources 
Log Message:
Update to 2.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	2 Feb 2006 01:21:15 -0000	1.4
+++ .cvsignore	14 Apr 2006 11:23:20 -0000	1.5
@@ -1 +1 @@
-pysqlite-2.1.3.tar.gz
+pysqlite-2.2.0.tar.gz


Index: python-sqlite2.spec
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/FC-5/python-sqlite2.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- python-sqlite2.spec	14 Feb 2006 10:01:33 -0000	1.7
+++ python-sqlite2.spec	14 Apr 2006 11:23:20 -0000	1.8
@@ -1,21 +1,19 @@
 %{!?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:           python-sqlite2
-Version:        2.1.3
-Release:        4%{?dist}
+Version:        2.2.0
+Release:        1%{?dist}
 Epoch:          1
 Summary:        DB-API 2.0 interface for SQLite 3.x
 
 Group:          Development/Languages
 License:        zlib/libpng
 URL:            http://pysqlite.org/
-Source0:        http://initd.org/pub/software/pysqlite/releases/2.1/%{version}/pysqlite-%{version}.tar.gz
+Source0:        http://initd.org/pub/software/pysqlite/releases/2.2/%{version}/pysqlite-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dos2unix
 BuildRequires:  python-devel
-BuildRequires:  python-setuptools
 BuildRequires:  sqlite-devel >= 3.3.3
 
 Requires:       sqlite >= 3.3.3
@@ -38,7 +36,6 @@
 rm -rf %{buildroot}
 %{__python} setup.py install -O1 \
 	--skip-build \
-	--old-and-unmanageable \
 	--root %{buildroot}
 
 %{__mv} %{buildroot}%{_prefix}/pysqlite2-doc documentation
@@ -48,7 +45,10 @@
 
 
 %check
-%{__python} setup.py test
+# workaround for a strange bug (thanks to Ville Skytt??!)
+cd documentation
+PYTHONPATH="%{buildroot}%{python_sitearch}" %{__python} -c \
+	"from pysqlite2.test import test; test()"
 
 
 %clean
@@ -58,7 +58,6 @@
 %files
 %defattr(-,root,root,-)
 %doc LICENSE documentation/*
-%doc doc/pysqlite-introduction-slides/pysqlite-introduction.pdf
 %dir %{python_sitearch}/pysqlite2
 %{python_sitearch}/pysqlite2/__init__.py
 %{python_sitearch}/pysqlite2/__init__.pyc
@@ -66,30 +65,38 @@
 %{python_sitearch}/pysqlite2/dbapi2.pyc
 %{python_sitearch}/pysqlite2/_sqlite.so
 %dir %{python_sitearch}/pysqlite2/test
+%{python_sitearch}/pysqlite2/test/__init__.py
+%{python_sitearch}/pysqlite2/test/__init__.pyc
 %{python_sitearch}/pysqlite2/test/dbapi.py
 %{python_sitearch}/pysqlite2/test/dbapi.pyc
 %{python_sitearch}/pysqlite2/test/factory.py
 %{python_sitearch}/pysqlite2/test/factory.pyc
-%{python_sitearch}/pysqlite2/test/__init__.py
-%{python_sitearch}/pysqlite2/test/__init__.pyc
+%{python_sitearch}/pysqlite2/test/hooks.py
+%{python_sitearch}/pysqlite2/test/hooks.pyc
+%{python_sitearch}/pysqlite2/test/regression.py
+%{python_sitearch}/pysqlite2/test/regression.pyc
 %{python_sitearch}/pysqlite2/test/transactions.py
 %{python_sitearch}/pysqlite2/test/transactions.pyc
 %{python_sitearch}/pysqlite2/test/types.py
 %{python_sitearch}/pysqlite2/test/types.pyc
 %{python_sitearch}/pysqlite2/test/userfunctions.py
 %{python_sitearch}/pysqlite2/test/userfunctions.pyc
-%{python_sitearch}/pysqlite-%{version}-py%{pyver}.egg-info/
 %ghost %{python_sitearch}/pysqlite2/__init__.pyo
 %ghost %{python_sitearch}/pysqlite2/dbapi2.pyo
+%ghost %{python_sitearch}/pysqlite2/test/__init__.pyo
 %ghost %{python_sitearch}/pysqlite2/test/dbapi.pyo
 %ghost %{python_sitearch}/pysqlite2/test/factory.pyo
-%ghost %{python_sitearch}/pysqlite2/test/__init__.pyo
+%ghost %{python_sitearch}/pysqlite2/test/hooks.pyo
+%ghost %{python_sitearch}/pysqlite2/test/regression.pyo
 %ghost %{python_sitearch}/pysqlite2/test/transactions.pyo
 %ghost %{python_sitearch}/pysqlite2/test/types.pyo
 %ghost %{python_sitearch}/pysqlite2/test/userfunctions.pyo
 
 
 %changelog
+* Fri Apr 14 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 1:2.2.0-1
+- Update to 2.2.0
+
 * Tue Feb 14 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 1:2.1.3-4
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	2 Feb 2006 01:21:15 -0000	1.4
+++ sources	14 Apr 2006 11:23:20 -0000	1.5
@@ -1 +1 @@
-55ef66a963ddff5540b117db0a6c085b  pysqlite-2.1.3.tar.gz
+8f68b79b2fe891e72da193cbc3a3d5e9  pysqlite-2.2.0.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 14 11:47:37 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 14 Apr 2006 04:47:37 -0700
Subject: rpms/gnochm/FC-4 gnochm.spec,1.1,1.2
Message-ID: <200604141147.k3EBldft021037@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/gnochm/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21020

Modified Files:
	gnochm.spec 
Log Message:
* Thu Apr 13 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-4
- Add mimetype to .desktop file (188809)



Index: gnochm.spec
===================================================================
RCS file: /cvs/extras/rpms/gnochm/FC-4/gnochm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnochm.spec	8 Apr 2006 21:55:34 -0000	1.1
+++ gnochm.spec	14 Apr 2006 11:47:37 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gnochm
 Version:        0.9.7
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        CHM file viewer
 
 Group:          Applications/Publishing
@@ -19,6 +19,8 @@
 BuildRequires:  scrollkeeper
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 BuildRequires: desktop-file-utils
 
 %description
@@ -46,6 +48,8 @@
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 
+echo "MimeType=application/x-chm" >> $RPM_BUILD_ROOT%{_datadir}/applications/gnochm.desktop
+
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
         --add-category X-Fedora                                 \
@@ -78,6 +82,8 @@
 
 update-mime-database %{_datadir}/mime &> /dev/null || :
 
+update-desktop-database &> /dev/null ||:
+
 %preun
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -91,6 +97,8 @@
 
 update-mime-database %{_datadir}/mime &> /dev/null || :
 
+update-desktop-database &> /dev/null ||:
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README
@@ -109,5 +117,8 @@
 %{_datadir}/pixmaps/gnochm*.png
 
 %changelog
+* Thu Apr 13 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-4
+- Add mimetype to .desktop file (188809)
+
 * Sun Mar 12 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-2
 - Fedora Extras submission, loosely based on Dag.



From fedora-extras-commits at redhat.com  Fri Apr 14 11:48:16 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 14 Apr 2006 04:48:16 -0700
Subject: rpms/gnochm/FC-5 gnochm.spec,1.1,1.2
Message-ID: <200604141148.k3EBmIl8021101@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/gnochm/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21084

Modified Files:
	gnochm.spec 
Log Message:
* Thu Apr 13 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-4
- Add mimetype to .desktop file (188809)



Index: gnochm.spec
===================================================================
RCS file: /cvs/extras/rpms/gnochm/FC-5/gnochm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gnochm.spec	8 Apr 2006 21:55:34 -0000	1.1
+++ gnochm.spec	14 Apr 2006 11:48:16 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gnochm
 Version:        0.9.7
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        CHM file viewer
 
 Group:          Applications/Publishing
@@ -19,6 +19,8 @@
 BuildRequires:  scrollkeeper
 Requires(post): scrollkeeper
 Requires(postun): scrollkeeper
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 BuildRequires: desktop-file-utils
 
 %description
@@ -46,6 +48,8 @@
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 
+echo "MimeType=application/x-chm" >> $RPM_BUILD_ROOT%{_datadir}/applications/gnochm.desktop
+
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
         --add-category X-Fedora                                 \
@@ -78,6 +82,8 @@
 
 update-mime-database %{_datadir}/mime &> /dev/null || :
 
+update-desktop-database &> /dev/null ||:
+
 %preun
 if [ "$1" -eq 0 ]; then
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -91,6 +97,8 @@
 
 update-mime-database %{_datadir}/mime &> /dev/null || :
 
+update-desktop-database &> /dev/null ||:
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING NEWS README
@@ -109,5 +117,8 @@
 %{_datadir}/pixmaps/gnochm*.png
 
 %changelog
+* Thu Apr 13 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-4
+- Add mimetype to .desktop file (188809)
+
 * Sun Mar 12 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-2
 - Fedora Extras submission, loosely based on Dag.



From fedora-extras-commits at redhat.com  Fri Apr 14 12:29:29 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 14 Apr 2006 05:29:29 -0700
Subject: rpms/kdocker/devel kdocker.spec,1.7,1.8
Message-ID: <200604141229.k3ECTVre023319@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdocker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23302

Modified Files:
	kdocker.spec 
Log Message:
* Fri Apr 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-6
- --vendor=""



Index: kdocker.spec
===================================================================
RCS file: /cvs/extras/rpms/kdocker/devel/kdocker.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kdocker.spec	10 Mar 2006 20:06:04 -0000	1.7
+++ kdocker.spec	14 Apr 2006 12:29:29 -0000	1.8
@@ -67,11 +67,10 @@
 
 make install 
 
-desktop-file-install --vendor fedora \
+desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
-  --add-category Qt \
-  --delete-original \
+  --add-category="X-Fedora" --vendor="" \
+  --add-category="Qt" \
   $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 
 # remove dup'd docs
@@ -104,6 +103,9 @@
 
 
 %changelog 
+* Fri Apr 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-6
+- --vendor=""
+
 * Fri Mar 10 2006 Rex Dieter <rexdieer[AT]users.sf.net> 1.3-5
 - build failure, useless -debuginfo (#180103)
 



From fedora-extras-commits at redhat.com  Fri Apr 14 12:30:08 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 14 Apr 2006 05:30:08 -0700
Subject: rpms/kdocker/FC-5 kdocker.spec,1.7,1.8
Message-ID: <200604141230.k3ECUAsd023389@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdocker/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23372

Modified Files:
	kdocker.spec 
Log Message:
* Fri Apr 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-6
- --vendor=""



Index: kdocker.spec
===================================================================
RCS file: /cvs/extras/rpms/kdocker/FC-5/kdocker.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kdocker.spec	10 Mar 2006 20:06:04 -0000	1.7
+++ kdocker.spec	14 Apr 2006 12:30:07 -0000	1.8
@@ -67,11 +67,10 @@
 
 make install 
 
-desktop-file-install --vendor fedora \
+desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
-  --add-category Qt \
-  --delete-original \
+  --add-category="X-Fedora" --vendor="" \
+  --add-category="Qt" \
   $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 
 # remove dup'd docs
@@ -104,6 +103,9 @@
 
 
 %changelog 
+* Fri Apr 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-6
+- --vendor=""
+
 * Fri Mar 10 2006 Rex Dieter <rexdieer[AT]users.sf.net> 1.3-5
 - build failure, useless -debuginfo (#180103)
 



From fedora-extras-commits at redhat.com  Fri Apr 14 12:31:43 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 14 Apr 2006 05:31:43 -0700
Subject: rpms/kdocker/devel kdocker.spec,1.8,1.9
Message-ID: <200604141231.k3ECVjEW023452@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdocker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23435

Modified Files:
	kdocker.spec 
Log Message:
Release++



Index: kdocker.spec
===================================================================
RCS file: /cvs/extras/rpms/kdocker/devel/kdocker.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kdocker.spec	14 Apr 2006 12:29:29 -0000	1.8
+++ kdocker.spec	14 Apr 2006 12:31:43 -0000	1.9
@@ -2,7 +2,7 @@
 Name:	 kdocker
 Summary: Dock any application in the system tray
 Version: 1.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 Group:   User Interface/Desktops
 License: GPL



From fedora-extras-commits at redhat.com  Fri Apr 14 12:32:06 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 14 Apr 2006 05:32:06 -0700
Subject: rpms/kdocker/FC-5 kdocker.spec,1.8,1.9
Message-ID: <200604141232.k3ECW9G2023518@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdocker/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23501

Modified Files:
	kdocker.spec 
Log Message:
Release++



Index: kdocker.spec
===================================================================
RCS file: /cvs/extras/rpms/kdocker/FC-5/kdocker.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kdocker.spec	14 Apr 2006 12:30:07 -0000	1.8
+++ kdocker.spec	14 Apr 2006 12:32:06 -0000	1.9
@@ -2,7 +2,7 @@
 Name:	 kdocker
 Summary: Dock any application in the system tray
 Version: 1.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 Group:   User Interface/Desktops
 License: GPL



From fedora-extras-commits at redhat.com  Fri Apr 14 12:32:45 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 14 Apr 2006 05:32:45 -0700
Subject: rpms/kdocker/FC-4 kdocker.spec,1.4,1.5
Message-ID: <200604141232.k3ECWljW023584@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdocker/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23567

Modified Files:
	kdocker.spec 
Log Message:
* Fri Apr 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-6
- --vendor=""



Index: kdocker.spec
===================================================================
RCS file: /cvs/extras/rpms/kdocker/FC-4/kdocker.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kdocker.spec	10 Mar 2006 20:04:26 -0000	1.4
+++ kdocker.spec	14 Apr 2006 12:32:45 -0000	1.5
@@ -2,7 +2,7 @@
 Name:	 kdocker
 Summary: Dock any application in the system tray
 Version: 1.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 
 Group:   User Interface/Desktops
 License: GPL
@@ -67,11 +67,10 @@
 
 make install 
 
-desktop-file-install --vendor fedora \
+desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
-  --add-category Qt \
-  --delete-original \
+  --add-category="X-Fedora" --vendor="" \
+  --add-category="Qt" \
   $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 
 # remove dup'd docs
@@ -104,6 +103,9 @@
 
 
 %changelog 
+* Fri Apr 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-6
+- --vendor=""
+
 * Fri Mar 10 2006 Rex Dieter <rexdieer[AT]users.sf.net> 1.3-5
 - build failure, useless -debuginfo (#180103)
 



From fedora-extras-commits at redhat.com  Fri Apr 14 12:33:08 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 14 Apr 2006 05:33:08 -0700
Subject: rpms/kdocker/FC-3 kdocker.spec,1.3,1.4
Message-ID: <200604141233.k3ECXAOV023652@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/kdocker/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23635

Modified Files:
	kdocker.spec 
Log Message:
* Fri Apr 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-6
- --vendor=""



Index: kdocker.spec
===================================================================
RCS file: /cvs/extras/rpms/kdocker/FC-3/kdocker.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kdocker.spec	22 Jan 2006 02:49:26 -0000	1.3
+++ kdocker.spec	14 Apr 2006 12:33:08 -0000	1.4
@@ -2,7 +2,7 @@
 Name:	 kdocker
 Summary: Dock any application in the system tray
 Version: 1.3
-Release: 4%{?dist}
+Release: 6%{?dist}
 
 Group:   User Interface/Desktops
 License: GPL
@@ -14,6 +14,10 @@
 
 BuildRequires: desktop-file-utils
 BuildRequires: qt-devel >= 1:3.3
+%if "%{?fedora}" > "4"
+BuildRequires: libXmu-devel
+BuildRequires: libXpm-devel
+%endif
 
 %description
 KDocker will help you dock any application in the system tray. This means you
@@ -56,15 +60,17 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 
+unset QTDIR || : ; . /etc/profile.d/qt.sh
+
 qmake DESTDIR=$RPM_BUILD_ROOT 
+sed -i -e '/^\s*-\?strip /d' Makefile # naughty qmake
 
 make install 
 
-desktop-file-install --vendor fedora \
+desktop-file-install \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
-  --add-category Qt \
-  --delete-original \
+  --add-category="X-Fedora" --vendor="" \
+  --add-category="Qt" \
   $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 
 # remove dup'd docs
@@ -87,7 +93,7 @@
 
 
 %files -f %{name}.lang
-%defattr(-, root, root)
+%defattr(-,root,root,-)
 %doc AUTHORS BUGS COPYING CREDITS ChangeLog HACKING README TODO VERSION
 %{_bindir}/*
 %dir %{_datadir}/kdocker/
@@ -97,6 +103,15 @@
 
 
 %changelog 
+* Fri Apr 14 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-6
+- --vendor=""
+
+* Fri Mar 10 2006 Rex Dieter <rexdieer[AT]users.sf.net> 1.3-5
+- build failure, useless -debuginfo (#180103)
+
+* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 
+- fc5: gcc/glibc respin
+
 * Sat Jan 21 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1.3-4
 - .desktop: fix path to app-icon (#178531)
 



From fedora-extras-commits at redhat.com  Fri Apr 14 12:38:56 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Fri, 14 Apr 2006 05:38:56 -0700
Subject: owners owners.list,1.841,1.842
Message-ID: <200604141238.k3ECcw87023732@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23715

Modified Files:
	owners.list 
Log Message:
Orphan carpej's packages, sponsorship revoked.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.841
retrieving revision 1.842
diff -u -r1.841 -r1.842
--- owners.list	13 Apr 2006 22:28:07 -0000	1.841
+++ owners.list	14 Apr 2006 12:38:56 -0000	1.842
@@ -144,7 +144,7 @@
 Fedora Extras|compface|Library for handling X-Faces|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|comps|The list of groups and packages displayed by yum and repoview.|notting at redhat.com|katzj at redhat.com|skvidal at phy.duke.edu,sopwith at redhat.com
 Fedora Extras|cone|CONE mail reader|steve at silug.org|extras-qa at fedoraproject.org|
-Fedora Extras|configure-thinkpad|Graphical ThinkPad configuration utility|jcarpenter at condell.org|extras-qa at fedoraproject.org|
+Fedora Extras|configure-thinkpad|Graphical ThinkPad configuration utility|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|conglomerate|Extensible XML Editor|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|conserver|Serial console server daemon/client|jima at auroralinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|contact-lookup-applet|Applet which allows you to search your Evolution address book|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
@@ -539,7 +539,7 @@
 Fedora Extras|kphone|A SIP (Session Initiation Protocol) user agent for Linux|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|krecipes|Application to manage recipes and shopping-lists|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|krusader|An advanced twin-panel (commander-style) file-manager for KDE|mgarski at post.pl|extras-qa at fedoraproject.org|
-Fedora Extras|ks3switch|KDE utility for managing the output device on S3 Savage chips|jcarpenter at condell.org|extras-qa at fedoraproject.org|
+Fedora Extras|ks3switch|KDE utility for managing the output device on S3 Savage chips|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|ksensors|An lm_sensors frontend for KDE|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|kst|Plots scientific data|matt at truch.net|extras-qa at fedoraproject.org|
 Fedora Extras|ktrack|Satellite prediction software for KDE|dennis at ausil.us|extras-qa at fedoraproject.org|
@@ -681,7 +681,7 @@
 Fedora Extras|logjam|GTK2-client for LiveJournal|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|loudmouth|Jabber programming library written in C|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|lout|A document formatting system|tcallawa at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|lrmi|Library for calling real mode BIOS routines|jcarpenter at condell.org|extras-qa at fedoraproject.org|
+Fedora Extras|lrmi|Library for calling real mode BIOS routines|extras-orphan at fedoraproject.org|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|lucidlife|A Conway's Life simulator|peter at thecodergeek.com|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|
@@ -1312,7 +1312,7 @@
 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|
 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|jcarpenter at condell.org|extras-qa at fedoraproject.org|
+Fedora Extras|s3switch|Manage the output device on S3 Savage chips|extras-orphan at fedoraproject.org|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|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|
@@ -1442,8 +1442,8 @@
 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|thinkpad-kmod|Supplemental kernel modules for ThinkPad laptop computers|jcarpenter at condell.org|extras-qa at fedoraproject.org|
-Fedora Extras|thinkpad-kmod-common|Common files for ThinkPad kernel module packages|jcarpenter at condell.org|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|
 Fedora Extras|thunderbird|thunderbird mail|wtogami at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|tidy|Utility to clean up and pretty print HTML/XHTML/XML|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
@@ -1463,8 +1463,8 @@
 Fedora Extras|torcs|An OpenGL 3d racing game|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|torcs-data|The Open Racing Car Simulator data files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|torsmo|TyopoytaORvelo System MOnitor|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
-Fedora Extras|tpb|IBM ThinkPad button support utility|jcarpenter at condell.org|extras-qa at fedoraproject.org|
-Fedora Extras|tpctl|IBM ThinkPad configuration tools|jcarpenter at condell.org|extras-qa at fedoraproject.org|
+Fedora Extras|tpb|IBM ThinkPad button support utility|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|tpctl|IBM ThinkPad configuration tools|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|trac|Trac is an integrated system for managing software projects|fedora at soeterbroek.com|extras-qa at fedoraproject.org|
 Fedora Extras|translate-toolkit|A collection of tools to assist software localization|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|treecc|Tree Compiler Compiler|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
@@ -1602,7 +1602,7 @@
 Fedora Extras|xmms-skins|Skins for the X MultiMedia System|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-speex|X MultiMedia System input plugin to play speex files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms|The X MultiMedia System, a media player which resembles Winamp|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|xosd|On-screen display library for X|jcarpenter at condell.org|extras-qa at fedoraproject.org|
+Fedora Extras|xosd|On-screen display library for X|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|xpilot-ng|Space arcade game|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|xplanet|Render a planetary image into an X window|jylitalo at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|xprobe2|An active operating system fingerprinting tool|lmacken at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Apr 14 13:26:40 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 14 Apr 2006 06:26:40 -0700
Subject: rpms/openvpn/devel .cvsignore, 1.11, 1.12 openvpn.spec, 1.17,
	1.18 sources, 1.11, 1.12
Message-ID: <200604141326.k3EDQgfa025902@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/openvpn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25881

Modified Files:
	.cvsignore openvpn.spec sources 
Log Message:
Update to 2.1_beta14.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openvpn/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	12 Apr 2006 17:44:10 -0000	1.11
+++ .cvsignore	14 Apr 2006 13:26:39 -0000	1.12
@@ -1,2 +1,2 @@
-openvpn-2.1_beta13.tar.gz
-openvpn-2.1_beta13.tar.gz.asc
+openvpn-2.1_beta14.tar.gz
+openvpn-2.1_beta14.tar.gz.asc


Index: openvpn.spec
===================================================================
RCS file: /cvs/extras/rpms/openvpn/devel/openvpn.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- openvpn.spec	12 Apr 2006 17:44:10 -0000	1.17
+++ openvpn.spec	14 Apr 2006 13:26:39 -0000	1.18
@@ -1,10 +1,10 @@
-%define prerelease beta13
+%define prerelease beta14
 
 %define plugins down-root auth-pam
 
 Name:              openvpn
 Version:           2.1
-Release:           0.9%{?prerelease:.%{prerelease}}%{?dist}
+Release:           0.10%{?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
@@ -132,6 +132,9 @@
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Fri Apr 14 2006 Steven Pritchard <steve at kspei.com> 2.1-0.10.beta14
+- Update to 2.1_beta14
+
 * Wed Apr 12 2006 Steven Pritchard <steve at kspei.com> 2.1-0.9.beta13
 - Update to 2.1_beta13
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openvpn/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	12 Apr 2006 17:44:10 -0000	1.11
+++ sources	14 Apr 2006 13:26:39 -0000	1.12
@@ -1,2 +1,2 @@
-94281c836f443aa10ef56eafb9346e98  openvpn-2.1_beta13.tar.gz
-e5bc47f1e441b2d89db90052ad0f8b12  openvpn-2.1_beta13.tar.gz.asc
+7bd96eaa834a1779755d68c9b2591583  openvpn-2.1_beta14.tar.gz
+835dab606f9f72c610b4f52e541ae5fd  openvpn-2.1_beta14.tar.gz.asc



From fedora-extras-commits at redhat.com  Fri Apr 14 13:37:48 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 14 Apr 2006 06:37:48 -0700
Subject: rpms/openvpn/FC-5 .cvsignore, 1.11, 1.12 openvpn.spec, 1.17,
	1.18 sources, 1.11, 1.12
Message-ID: <200604141337.k3EDboia026025@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/openvpn/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26004

Modified Files:
	.cvsignore openvpn.spec sources 
Log Message:
Update to 2.1_beta14.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openvpn/FC-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	12 Apr 2006 18:09:23 -0000	1.11
+++ .cvsignore	14 Apr 2006 13:37:48 -0000	1.12
@@ -1,2 +1,2 @@
-openvpn-2.1_beta13.tar.gz
-openvpn-2.1_beta13.tar.gz.asc
+openvpn-2.1_beta14.tar.gz
+openvpn-2.1_beta14.tar.gz.asc


Index: openvpn.spec
===================================================================
RCS file: /cvs/extras/rpms/openvpn/FC-5/openvpn.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- openvpn.spec	12 Apr 2006 18:09:23 -0000	1.17
+++ openvpn.spec	14 Apr 2006 13:37:48 -0000	1.18
@@ -1,10 +1,10 @@
-%define prerelease beta13
+%define prerelease beta14
 
 %define plugins down-root auth-pam
 
 Name:              openvpn
 Version:           2.1
-Release:           0.9%{?prerelease:.%{prerelease}}%{?dist}
+Release:           0.10%{?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
@@ -132,6 +132,9 @@
 %config %dir %{_sysconfdir}/%{name}/
 
 %changelog
+* Fri Apr 14 2006 Steven Pritchard <steve at kspei.com> 2.1-0.10.beta14
+- Update to 2.1_beta14
+
 * Wed Apr 12 2006 Steven Pritchard <steve at kspei.com> 2.1-0.9.beta13
 - Update to 2.1_beta13
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openvpn/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	12 Apr 2006 18:09:23 -0000	1.11
+++ sources	14 Apr 2006 13:37:48 -0000	1.12
@@ -1,2 +1,2 @@
-94281c836f443aa10ef56eafb9346e98  openvpn-2.1_beta13.tar.gz
-e5bc47f1e441b2d89db90052ad0f8b12  openvpn-2.1_beta13.tar.gz.asc
+7bd96eaa834a1779755d68c9b2591583  openvpn-2.1_beta14.tar.gz
+835dab606f9f72c610b4f52e541ae5fd  openvpn-2.1_beta14.tar.gz.asc



From fedora-extras-commits at redhat.com  Fri Apr 14 14:07:21 2006
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Fri, 14 Apr 2006 07:07:21 -0700
Subject: rpms/wxGTK/FC-5 sources, 1.4, 1.5 wxGTK.spec, 1.17,
	1.18 wxGTK-2.6.2-gcc41stringh.patch, 1.1,
	NONE wxGTK-2.6.2-intl_cpp.patch, 1.1,
	NONE wxGTK-2.6.2-socketclosefix.patch, 1.1, NONE
Message-ID: <200604141407.k3EE7NuQ028260@cvs-int.fedora.redhat.com>

Author: mattdm

Update of /cvs/extras/rpms/wxGTK/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28239

Modified Files:
	sources wxGTK.spec 
Removed Files:
	wxGTK-2.6.2-gcc41stringh.patch wxGTK-2.6.2-intl_cpp.patch 
	wxGTK-2.6.2-socketclosefix.patch 
Log Message:
Update to wxGTK 2.6.2; massive changes (see development package and
changelog for details).



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wxGTK/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	28 Nov 2005 19:57:40 -0000	1.4
+++ sources	14 Apr 2006 14:07:21 -0000	1.5
@@ -1 +1 @@
-ba2afe7bd028062c5fff6d5ef3249c67  wxGTK-2.6.2.tar.bz2
+3cd76c3c47913e52a3175dd47239c6ec  wxGTK-2.6.3.tar.bz2


Index: wxGTK.spec
===================================================================
RCS file: /cvs/extras/rpms/wxGTK/FC-5/wxGTK.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- wxGTK.spec	13 Feb 2006 19:50:49 -0000	1.17
+++ wxGTK.spec	14 Apr 2006 14:07:21 -0000	1.18
@@ -1,8 +1,12 @@
 %define x11libdir %{_prefix}/X11R6/%{_lib}
 
+# Option - build an ODBC subpackage using unixODBC. (This is currently 
+# broken; see <https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=176950>.)
+%define withodbc 0
+
 Name:           wxGTK
-Version:        2.6.2
-Release:        5%{?dist}
+Version:        2.6.3
+Release:        2.6.3.2.1%{?dist}
 Summary:        GTK2 port of the wxWidgets GUI library
 # The wxWindows licence is the LGPL with a specific exemption allowing
 # distribution of derived binaries under any terms. (This will eventually
@@ -11,15 +15,16 @@
 Group:          System Environment/Libraries
 URL:            http://www.wxwidgets.org/
 Source0:        http://dl.sf.net/wxwindows/%{name}-%{version}.tar.bz2
-Patch0:         wxGTK-2.6.2-intl_cpp.patch
-Patch1:         wxGTK-2.6.2-socketclosefix.patch
-Patch2:         wxGTK-2.6.2-gcc41stringh.patch
+Patch0:         wxGTK-2.6.3.2-cvs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel, zlib-devel >= 1.1.4
 BuildRequires:  libpng-devel, libjpeg-devel, libtiff-devel
 BuildRequires:  expat-devel, SDL-devel, libgnomeprintui22-devel
-BuildRequires:  mesa-libGL-devel, mesa-libGLU-devel
+BuildRequires:  libGL-devel, libGLU-devel
+%if %{withodbc}
+BuildRequires:  unixODBC-devel
+%endif
 
 # all of these are for previous Fedora Extras sub-packages
 Obsoletes:      wxGTK2 < 2.6.2-1
@@ -68,14 +73,22 @@
 Provides:       wxGTK2-gl = %{version}-%{release}
 
 %description gl
-OpenGL add-on for the wxWidgets library.
+OpenGL (a 3D graphics API) add-on for the wxWidgets library.
 
+%if %{withodbc}
+%package        odbc
+Summary:        ODBC add-on for the wxWidgets library
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description odbc
+ODBC (a SQL database connectivity API) add-on for the wxWidgets library.
+%endif
 
 %prep
 %setup -q
-%patch0 -p0 -b .intlcpp
-%patch1 -p1 -b .socketclose
-%patch2 -p1 -b .gcc41
+
+%patch0 -p1 -b .2.6.3.2
 
 sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
 
@@ -89,6 +102,9 @@
   --x-libraries=%{x11libdir} \
   --with-gtk=2 \
   --with-opengl \
+%if %{withodbc}
+  --with-odbc \
+%endif
   --with-sdl \
   --with-gnomeprint \
   --enable-shared \
@@ -170,8 +186,37 @@
 %defattr(-,root,root,-)
 %{_libdir}/libwx_gtk2u_gl-*.so.*
 
+%if %{withodbc}
+%files odbc
+%defattr(-,root,root,-)
+%{_libdir}/libwx_gtk2u_odbc-*.so.*
+%endif
 
 %changelog
+* Thu Apr 13 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3-2.6.3.2.1
+- oops -- forgot to change mesa-libGL*-devel -> libGL*-devel
+
+* Thu Apr 13 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3-2.6.3.2.0
+- patch to cvs subrelease 2.6.3.2 (matches wxPython)
+
+* Sat Mar 25 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3-1    
+- 2.6.3 final
+- remove the locale_install thing -- that was just an issue with using the
+  release candidate.
+
+* Tue Mar 21 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3-0.rc2
+- update to 2.6.3-rc2 package
+- all patches now upstream -- removing 'em.
+- use complete 'wxWidgets' source tarball instead of the wxGTK-subset one,
+  since that's all there is for the release candidate. I'm operating under
+  the assumption that we'll have a wxGTK source tarball in the future --
+  otherwise, I'm going to eventually have to change the name of this
+  package again. :)
+- add ODBC support via unixODBC as subpackage (see bug #176950)
+- wait, no; comment out ODBC support as it doesn't build...
+- add explicit make locale_install; apparently not done as part of
+  the general 'make install' anymore.
+
 * Mon Feb 13 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.2-5
 - rebuild in preparation for FC5
 
@@ -210,7 +255,7 @@
   Add dist tag.
 - From Tom Callaway: Build and include libwx_gtk2u_animate-2.6.
 
-
+* Thu Apr 28 2005 Matthew Miller <mattdm at mattdm.org> 2.6.1-0.1
 - update to 2.6.1
 - from Michael Schwendt in 2.4.2-11 package: build-require
   xorg-x11-Mesa-libGL and xorg-x11-Mesa-libGLU (the libGL and libGLU


--- wxGTK-2.6.2-gcc41stringh.patch DELETED ---


--- wxGTK-2.6.2-intl_cpp.patch DELETED ---


--- wxGTK-2.6.2-socketclosefix.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Apr 14 14:08:19 2006
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Fri, 14 Apr 2006 07:08:19 -0700
Subject: rpms/wxGTK/FC-5 wxGTK-2.6.3.2-cvs.patch,NONE,1.1
Message-ID: <200604141408.k3EE8LCS028289@cvs-int.fedora.redhat.com>

Author: mattdm

Update of /cvs/extras/rpms/wxGTK/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28271

Added Files:
	wxGTK-2.6.3.2-cvs.patch 
Log Message:
checking in patch -- forgot to a second ago.


wxGTK-2.6.3.2-cvs.patch:

--- NEW FILE wxGTK-2.6.3.2-cvs.patch ---
diff -ur wxGTK-2.6.3/configure wxGTK-2.6.3.2/configure
--- wxGTK-2.6.3/configure	2006-03-21 18:42:05.000000000 -0500
+++ wxGTK-2.6.3.2/configure	2006-03-30 12:05:51.000000000 -0500
@@ -1669,7 +1669,7 @@
 wx_major_version_number=2
 wx_minor_version_number=6
 wx_release_number=3
-wx_subrelease_number=1
+wx_subrelease_number=2
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
 WX_VERSION=$WX_RELEASE.$wx_release_number
diff -ur wxGTK-2.6.3/configure.in wxGTK-2.6.3.2/configure.in
--- wxGTK-2.6.3/configure.in	2006-03-21 18:42:05.000000000 -0500
+++ wxGTK-2.6.3.2/configure.in	2006-03-30 12:05:49.000000000 -0500
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Id: configure.in,v 1.1063.2.15 2006/03/21 19:33:57 KO Exp $)dnl
+AC_REVISION($Id: configure.in,v 1.1063.2.16 2006/03/30 17:05:49 RD Exp $)dnl
 
 dnl ---------------------------------------------------------------------------
 dnl
@@ -8,7 +8,7 @@
 dnl
 dnl This script is under the wxWidgets licence.
 dnl
-dnl Version: $Id: configure.in,v 1.1063.2.15 2006/03/21 19:33:57 KO Exp $
+dnl Version: $Id: configure.in,v 1.1063.2.16 2006/03/30 17:05:49 RD Exp $
 dnl ---------------------------------------------------------------------------
 
 dnl ---------------------------------------------------------------------------
@@ -33,7 +33,7 @@
 wx_major_version_number=2
 wx_minor_version_number=6
 wx_release_number=3
-wx_subrelease_number=1
+wx_subrelease_number=2
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
 WX_VERSION=$WX_RELEASE.$wx_release_number
diff -ur wxGTK-2.6.3/contrib/src/deprecated/cwlex_yy.c wxGTK-2.6.3.2/contrib/src/deprecated/cwlex_yy.c
--- wxGTK-2.6.3/contrib/src/deprecated/cwlex_yy.c	2006-03-21 18:42:22.000000000 -0500
+++ wxGTK-2.6.3.2/contrib/src/deprecated/cwlex_yy.c	2005-05-04 14:57:49.000000000 -0400
@@ -3,7 +3,7 @@
 /* Licence:   wxWindows Licence */
 
 /* scanner skeleton version:
- * $Header: /pack/cvsroots/wxwindows/wxWindows/contrib/src/deprecated/cwlex_yy.c,v 1.2 2005/05/04 18:57:49 JS Exp $
+ * $Header: /pack/cvsroots/wxwidgets/wxWidgets/contrib/src/deprecated/cwlex_yy.c,v 1.2 2005/05/04 18:57:49 JS Exp $
 	Last change:  JS   13 Jul 97    6:17 pm
  */
 
diff -ur wxGTK-2.6.3/contrib/src/deprecated/doslex.c wxGTK-2.6.3.2/contrib/src/deprecated/doslex.c
--- wxGTK-2.6.3/contrib/src/deprecated/doslex.c	2006-03-21 18:42:22.000000000 -0500
+++ wxGTK-2.6.3.2/contrib/src/deprecated/doslex.c	2005-06-09 14:37:44.000000000 -0400
@@ -1,7 +1,7 @@
 /* A lexical scanner generated by flex */
 
 /* scanner skeleton version:
- * $Header: /pack/cvsroots/wxwindows/wxWindows/contrib/src/deprecated/doslex.c,v 1.6 2005/06/09 18:37:44 ABX Exp $
+ * $Header: /pack/cvsroots/wxwidgets/wxWidgets/contrib/src/deprecated/doslex.c,v 1.6 2005/06/09 18:37:44 ABX Exp $
   Last change:  JS   13 Jul 97    6:17 pm
  */
 /* Copyright: (c) Julian Smart */
diff -ur wxGTK-2.6.3/include/wx/version.h wxGTK-2.6.3.2/include/wx/version.h
--- wxGTK-2.6.3/include/wx/version.h	2006-03-21 18:42:08.000000000 -0500
+++ wxGTK-2.6.3.2/include/wx/version.h	2006-03-30 12:05:48.000000000 -0500
@@ -4,7 +4,7 @@
 *  Author:      Julian Smart
 *  Modified by: Ryan Norton (Converted to C)
 *  Created:     29/01/98
-*  RCS-ID:      $Id: version.h,v 1.69.2.2 2006/01/18 10:25:00 JS Exp $
+*  RCS-ID:      $Id: version.h,v 1.69.2.3 2006/03/30 17:05:48 RD Exp $
 *  Copyright:   (c) 1998 Julian Smart
 *  Licence:     wxWindows licence
 */
@@ -22,7 +22,7 @@
 #define wxMAJOR_VERSION      2
 #define wxMINOR_VERSION      6
 #define wxRELEASE_NUMBER     3
-#define wxSUBRELEASE_NUMBER  0
+#define wxSUBRELEASE_NUMBER  2
 #define wxVERSION_STRING   _T("wxWidgets 2.6.3")
 
 /*  nothing to update below this line when updating the version */
diff -ur wxGTK-2.6.3/locale/fr.po wxGTK-2.6.3.2/locale/fr.po
--- wxGTK-2.6.3/locale/fr.po	2006-03-21 18:42:51.000000000 -0500
+++ wxGTK-2.6.3.2/locale/fr.po	2005-09-20 11:18:55.000000000 -0400
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: wxWidgets-2.6.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-21 17:37+0200\n"
+"POT-Creation-Date: 2005-04-11 22:24+0200\n"
 "PO-Revision-Date: 2005-09-07 09:34+0200\n"
 "Last-Translator: Thomas Huriaux <thomas.huriaux at gmail.com>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -13,12 +13,12 @@
 "Content-Transfer-Encoding: 8bit\n"
 "plural-forms: nplurals=2; plural=n > 1\n"
 
-#: ../src/common/debugrpt.cpp:569
+#: ../src/common/debugrpt.cpp:547
 #, c-format
 msgid "\t%s: %s\n"
 msgstr "\t%s?: %s\n"
 
-#: ../src/common/debugrpt.cpp:572
+#: ../src/common/debugrpt.cpp:550
 msgid ""
 "\n"
 "Please send this report to the program maintainer, thank you!\n"
@@ -26,20 +26,20 @@
 "\n"
 "Veuillez envoyer ce rapport au responsable du programme.\n"
 
-#: ../src/palmos/utils.cpp:206
+#: ../src/palmos/utils.cpp:210
 msgid " "
 msgstr " "
 
-#: ../src/generic/dbgrptg.cpp:312
+#: ../src/generic/dbgrptg.cpp:293
 msgid "              Thank you and we're sorry for the inconvenience!\n"
 msgstr "              Merci et d?sol? pour le d?rangement.\n"
 
-#: ../src/common/log.cpp:321
+#: ../src/common/log.cpp:322
 #, c-format
 msgid " (error %ld: %s)"
 msgstr " (erreur %ld?: %s)"
 
-#: ../src/common/docview.cpp:1419
+#: ../src/common/docview.cpp:1380
 msgid " - "
 msgstr " - "
 
@@ -47,23 +47,23 @@
 msgid " Preview"
 msgstr " Aper?u"
 
-#: ../src/common/paper.cpp:124
+#: ../src/common/paper.cpp:134
 msgid "#10 Envelope, 4 1/8 x 9 1/2 in"
 msgstr "Enveloppe n??10 (4,125 x 9,5 pouces)"
 
-#: ../src/common/paper.cpp:125
+#: ../src/common/paper.cpp:135
 msgid "#11 Envelope, 4 1/2 x 10 3/8 in"
 msgstr "Enveloppe n??11 (4,5 x 10,375 pouces)"
 
-#: ../src/common/paper.cpp:126
+#: ../src/common/paper.cpp:136
 msgid "#12 Envelope, 4 3/4 x 11 in"
 msgstr "Enveloppe n??12 (4,75 x 11 pouces)"
 
-#: ../src/common/paper.cpp:127
+#: ../src/common/paper.cpp:137
 msgid "#14 Envelope, 5 x 11 1/2 in"
 msgstr "Enveloppe n??14 (5 x 11,5 pouces)"
 
-#: ../src/common/paper.cpp:123
+#: ../src/common/paper.cpp:133
 msgid "#9 Envelope, 3 7/8 x 8 7/8 in"
 msgstr "Enveloppe n??9 (3,875 x 8,875 pouces)"
 
@@ -74,13 +74,13 @@
 msgid "#define %s must be an integer."
 msgstr "#define %s doit ?tre un entier."
 
-#: ../src/html/helpfrm.cpp:1042 ../src/html/helpfrm.cpp:1044
-#: ../src/html/helpfrm.cpp:1703 ../src/html/helpfrm.cpp:1736
+#: ../src/html/helpfrm.cpp:1019 ../src/html/helpfrm.cpp:1021
+#: ../src/html/helpfrm.cpp:1689 ../src/html/helpfrm.cpp:1722
 #, c-format
 msgid "%i of %i"
 msgstr "%i de %i"
 
-#: ../src/generic/filedlgg.cpp:288
+#: ../src/generic/filedlgg.cpp:287
 #, c-format
 msgid "%ld bytes"
 msgstr "%ld octets"
@@ -90,27 +90,27 @@
 msgid "%s (or %s)"
 msgstr "%s (ou %s)"
 
-#: ../src/generic/logg.cpp:261
+#: ../src/generic/logg.cpp:262
 #, c-format
 msgid "%s Error"
 msgstr "%s Erreur"
 
-#: ../src/generic/logg.cpp:269
+#: ../src/generic/logg.cpp:270
 #, c-format
 msgid "%s Information"
 msgstr "%s Information"
 
[...16204 lines suppressed...]
--- wxGTK-2.6.3/src/tiff/tif_next.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_next.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_next.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_next.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_open.c wxGTK-2.6.3.2/src/tiff/tif_open.c
--- wxGTK-2.6.3/src/tiff/tif_open.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_open.c	2005-05-31 05:28:43.000000000 -0400
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_open.c,v 1.5 2005/05/31 09:28:43 JS Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_open.c,v 1.5 2005/05/31 09:28:43 JS Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_os2.c wxGTK-2.6.3.2/src/tiff/tif_os2.c
--- wxGTK-2.6.3/src/tiff/tif_os2.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_os2.c	2002-12-04 09:10:19.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_os2.c,v 1.2 2002/12/04 14:10:19 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_os2.c,v 1.2 2002/12/04 14:10:19 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_packbits.c wxGTK-2.6.3.2/src/tiff/tif_packbits.c
--- wxGTK-2.6.3/src/tiff/tif_packbits.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_packbits.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_packbits.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_packbits.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_predict.c wxGTK-2.6.3.2/src/tiff/tif_predict.c
--- wxGTK-2.6.3/src/tiff/tif_predict.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_predict.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_predict.c,v 1.6 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_predict.c,v 1.6 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_predict.h wxGTK-2.6.3.2/src/tiff/tif_predict.h
--- wxGTK-2.6.3/src/tiff/tif_predict.h	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_predict.h	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_predict.h,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_predict.h,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1995-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_print.c wxGTK-2.6.3.2/src/tiff/tif_print.c
--- wxGTK-2.6.3/src/tiff/tif_print.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_print.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_print.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_print.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_read.c wxGTK-2.6.3.2/src/tiff/tif_read.c
--- wxGTK-2.6.3/src/tiff/tif_read.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_read.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_read.c,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_read.c,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_strip.c wxGTK-2.6.3.2/src/tiff/tif_strip.c
--- wxGTK-2.6.3/src/tiff/tif_strip.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_strip.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_strip.c,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_strip.c,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1991-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_swab.c wxGTK-2.6.3.2/src/tiff/tif_swab.c
--- wxGTK-2.6.3/src/tiff/tif_swab.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_swab.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_swab.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_swab.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_thunder.c wxGTK-2.6.3.2/src/tiff/tif_thunder.c
--- wxGTK-2.6.3/src/tiff/tif_thunder.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_thunder.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_thunder.c,v 1.4 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_thunder.c,v 1.4 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_tile.c wxGTK-2.6.3.2/src/tiff/tif_tile.c
--- wxGTK-2.6.3/src/tiff/tif_tile.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_tile.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_tile.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_tile.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1991-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_unix.c wxGTK-2.6.3.2/src/tiff/tif_unix.c
--- wxGTK-2.6.3/src/tiff/tif_unix.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_unix.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_unix.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_unix.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_version.c wxGTK-2.6.3.2/src/tiff/tif_version.c
--- wxGTK-2.6.3/src/tiff/tif_version.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_version.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_version.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_version.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 /*
  * Copyright (c) 1992-1997 Sam Leffler
  * Copyright (c) 1992-1997 Silicon Graphics, Inc.
diff -ur wxGTK-2.6.3/src/tiff/tif_vms.c wxGTK-2.6.3.2/src/tiff/tif_vms.c
--- wxGTK-2.6.3/src/tiff/tif_vms.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_vms.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_vms.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_vms.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_warning.c wxGTK-2.6.3.2/src/tiff/tif_warning.c
--- wxGTK-2.6.3/src/tiff/tif_warning.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_warning.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_warning.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_warning.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_win32.c wxGTK-2.6.3.2/src/tiff/tif_win32.c
--- wxGTK-2.6.3/src/tiff/tif_win32.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_win32.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_win32.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_win32.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_win3.c wxGTK-2.6.3.2/src/tiff/tif_win3.c
--- wxGTK-2.6.3/src/tiff/tif_win3.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_win3.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_win3.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_win3.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_write.c wxGTK-2.6.3.2/src/tiff/tif_write.c
--- wxGTK-2.6.3/src/tiff/tif_write.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_write.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_write.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_write.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_zip.c wxGTK-2.6.3.2/src/tiff/tif_zip.c
--- wxGTK-2.6.3/src/tiff/tif_zip.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_zip.c	2004-11-19 17:29:47.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_zip.c,v 1.4 2004/11/19 22:29:47 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_zip.c,v 1.4 2004/11/19 22:29:47 VZ Exp $ */
 
 /*
  * Copyright (c) 1995-1997 Sam Leffler
diff -ur wxGTK-2.6.3/utils/helpview/src/helpview.cpp wxGTK-2.6.3.2/utils/helpview/src/helpview.cpp
--- wxGTK-2.6.3/utils/helpview/src/helpview.cpp	2006-03-21 18:42:49.000000000 -0500
+++ wxGTK-2.6.3.2/utils/helpview/src/helpview.cpp	2006-03-30 06:35:12.000000000 -0500
@@ -5,7 +5,7 @@
 // Author:      Vaclav Slavik, Julian Smart
 // Modified by:
 // Created:     2002-07-09
-// RCS-ID:      $Id: helpview.cpp,v 1.14 2005/05/30 09:24:08 ABX Exp $
+// RCS-ID:      $Id: helpview.cpp,v 1.14.2.1 2006/03/30 11:35:12 JS Exp $
 // Copyright:   (c) 2002 Vaclav Slavik, Julian Smart and others
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -63,7 +63,7 @@
 
 #ifdef __WXMAC__
     wxApp::s_macAboutMenuItemId = wxID_ABOUT;
-    wxFileName::MacRegisterDefaultTypeAndCreator( "htb" , 'HTBD' , 'HTBA' ) ;
+    wxFileName::MacRegisterDefaultTypeAndCreator( wxT("htb") , 'HTBD' , 'HTBA' ) ;
 #endif
 
     int istyle = wxHF_DEFAULT_STYLE;



From fedora-extras-commits at redhat.com  Fri Apr 14 14:09:42 2006
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Fri, 14 Apr 2006 07:09:42 -0700
Subject: rpms/wxPython/FC-5 sources,1.3,1.4 wxPython.spec,1.5,1.6
Message-ID: <200604141409.k3EE9ivh028326@cvs-int.fedora.redhat.com>

Author: mattdm

Update of /cvs/extras/rpms/wxPython/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28307

Added Files:
	sources wxPython.spec 
Log Message:
Update to 2.6.x, obsolete wxPythonGTK2 package. Massive changes; see
devel tree and changelog for details.



Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	14 Apr 2006 14:09:41 -0000	1.4
@@ -0,0 +1 @@
+a27546fab8a8d77eb6b67954e6362269  wxPython-src-2.6.3.2.tar.gz


Index: wxPython.spec
===================================================================
RCS file: wxPython.spec
diff -N wxPython.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wxPython.spec	14 Apr 2006 14:09:41 -0000	1.6
@@ -0,0 +1,148 @@
+%{!?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 buildflags WXPORT=gtk2 UNICODE=1
+
+Name:           wxPython
+Version:        2.6.3.2
+Release:        1%{?dist}
+
+Summary:        GUI toolkit for the Python programming language
+
+Group:          Development/Languages
+License:        LGPL
+URL:            http://www.wxpython.org/
+Source0:        http://dl.sf.net/wxpython/wxPython-src-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  wxGTK-devel = 2.6.3, pkgconfig
+BuildRequires:  zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel
+BuildRequires:  libGL-devel, libGLU-devel
+BuildRequires:  python-devel, wxGTK-gl
+
+# packages should depend on "wxPython", not "wxPythonGTK2", but in case
+# one does, here's the provides for it.
+Provides:       wxPythonGTK2 = %{version}-%{release}
+
+%description
+wxPython is a GUI toolkit for the Python programming language. It allows
+Python programmers to create programs with a robust, highly functional
+graphical user interface, simply and easily. It is implemented as a Python
+extension module (native code) that wraps the popular wxWindows cross
+platform GUI library, which is written in C++.
+
+%package        devel
+Group:          Development/Libraries
+Summary:        Development files for wxPython add-on modules
+Requires:       %{name} = %{version}-%{release}
+Requires:       wxGTK-devel
+
+%description devel
+This package includes C++ header files and SWIG files needed for developing
+add-on modules for wxPython. It is NOT needed for development of most
+programs which use the wxPython toolkit.
+
+
+%prep
+%setup -q -n wxPython-src-%{version}
+
+
+%build
+# Just build the wxPython part, not all of wxWindows which we already have
+# in Fedora
+cd wxPython
+# included distutils is not multilib aware; use normal
+rm -rf distutils
+python setup.py %{buildflags} build
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+cd wxPython
+python setup.py %{buildflags} install --root=$RPM_BUILD_ROOT
+
+# this is a kludge....
+%if "%{python_sitelib}" != "%{python_sitearch}"
+mv $RPM_BUILD_ROOT%{python_sitelib}/wx.pth  $RPM_BUILD_ROOT%{python_sitearch}
+mv $RPM_BUILD_ROOT%{python_sitelib}/wxversion.py* $RPM_BUILD_ROOT%{python_sitearch}
+%endif
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%doc wxPython/docs wxPython/demo wxPython/licence/ wxPython/samples
+%{_bindir}/*
+%{python_sitearch}/wx.pth
+%{python_sitearch}/wxversion.py*
+%dir %{python_sitearch}/wx-2.6-gtk2-unicode/
+%{python_sitearch}/wx-2.6-gtk2-unicode/wx
+%{python_sitearch}/wx-2.6-gtk2-unicode/wxPython
+
+%files devel
+%defattr(-,root,root,-)
+%dir %{_includedir}/wx-2.6/wx/wxPython
+%{_includedir}/wx-2.6/wx/wxPython/*.h
+%dir %{_includedir}/wx-2.6/wx/wxPython/i_files
+%{_includedir}/wx-2.6/wx/wxPython/i_files/*.i
+%{_includedir}/wx-2.6/wx/wxPython/i_files/*.py*
+%{_includedir}/wx-2.6/wx/wxPython/i_files/*.swg
+
+
+%changelog
+* Thu Apr 13 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3.2-1
+- version 2.6.3.2
+- move wxversion.py _into_ lib64. Apparently that's the right thing to do. :)
+- upstream tarball no longer includes embedded.o (since I finally got around
+  to pointing that out to the developers instead of just kludging it away.)
+- buildrequires to just libGLU-devel instead of mesa-libGL-devel
+
+* Fri Mar 31 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3.0-4
+- grr. bump relnumber.
+
+* Fri Mar 31 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3.0-3
+- oh yeah -- wxversion.py not lib64.
+
+* Fri Mar 31 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3.0-2
+- buildrequires mesa-libGLU-devel
+
+* Thu Mar 30 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3.0-1
+- update to 2.6.3.0
+- wxGTK and wxPython versions are inexorably linked; make BuildRequires
+  be exact, rather than >=.
+- make devel subpackage as per comment #7 in bug #163440.
+
+* Thu Nov 24 2005 Matthew Miller <mattdm at mattdm.org> - 2.6.1.0-1
+- update to 2.6.0.0
+- merge in changes from current extras 2.4.x package
+- Happy Thanksgiving
+- build animate extention again -- works now.
+
+* Thu Apr 28 2005 Matthew Miller <mattdm at bu.edu> - 2.6.0.0-bu45.1
+- get rid of accidental binaries in source tarball -- they generates
+  spurious dependencies and serve no purpose
+- update to 2.6.0.0 and build for Velouria
+- switch to Fedora Extras base spec file
+- enable gtk2 and unicode and all the code stuff (as FE does)
+- disable BUILD_ANIMATE extension from contrib -- doesn't build
+- files are in a different location now -- adjust to that
+- zap include files (needed only for building wxPython 3rd-party modules),
+  because I don't think this is likely to be very useful. Other option
+  would be to create a -devel package, but I think that'd be confusing.
+
+* Tue Feb 08 2005 Thorsten Leemhuis <fedora at leemhuis dot info> 0:2.4.2.4-4
+- remove included disutils - it is not multilib aware; this
+  fixes build on x86_64
+
+* Tue Jan 06 2004 Panu Matilainen <pmatilai at welho.com> 0:2.4.2.4-0.fdr.3
+- rename package to wxPythonGTK2, provide wxPython (see bug 927)
+- dont ship binaries in /usr/share
+
+* Thu Nov 20 2003 Panu Matilainen <pmatilai at welho.com> 0:2.4.2.4-0.fdr.2
+- add missing buildrequires: python-devel, wxGTK2-gl
+
+* Sun Nov 02 2003 Panu Matilainen <pmatilai at welho.com> 0:2.4.2.4-0.fdr.1
+- Initial RPM release.
+~



From fedora-extras-commits at redhat.com  Fri Apr 14 15:15:54 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Fri, 14 Apr 2006 08:15:54 -0700
Subject: rpms/nethack-vultures/FC-4 nethack-vultures.spec,1.22,1.23
Message-ID: <200604141516.k3EFGQsZ030570@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-serv30516/FC-4

Modified Files:
	nethack-vultures.spec 
Log Message:
Upped tags to stop FC-3 from replacing the later distro builds.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-4/nethack-vultures.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- nethack-vultures.spec	10 Apr 2006 14:45:59 -0000	1.22
+++ nethack-vultures.spec	14 Apr 2006 15:15:53 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        2.0.0
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -167,6 +167,9 @@
 
 
 %changelog
+* Fri Apr 14 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-5
+- Upped the release tag to keep up with FC-3
+
 * Sun Apr 09 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-3
 - Packaged extra fonts
 



From fedora-extras-commits at redhat.com  Fri Apr 14 15:15:54 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Fri, 14 Apr 2006 08:15:54 -0700
Subject: rpms/nethack-vultures/FC-5 nethack-vultures.spec,1.23,1.24
Message-ID: <200604141516.k3EFGQkT030573@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-serv30516/FC-5

Modified Files:
	nethack-vultures.spec 
Log Message:
Upped tags to stop FC-3 from replacing the later distro builds.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/FC-5/nethack-vultures.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- nethack-vultures.spec	10 Apr 2006 14:45:59 -0000	1.23
+++ nethack-vultures.spec	14 Apr 2006 15:15:54 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        2.0.0
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -167,6 +167,9 @@
 
 
 %changelog
+* Fri Apr 14 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-5
+- Upped the release tag to keep up with FC-3
+
 * Sun Apr 09 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-3
 - Packaged extra fonts
 



From fedora-extras-commits at redhat.com  Fri Apr 14 15:15:55 2006
From: fedora-extras-commits at redhat.com (Karen Rei Pease (meme))
Date: Fri, 14 Apr 2006 08:15:55 -0700
Subject: rpms/nethack-vultures/devel nethack-vultures.spec,1.23,1.24
Message-ID: <200604141516.k3EFGRl5030576@cvs-int.fedora.redhat.com>

Author: meme

Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30516/devel

Modified Files:
	nethack-vultures.spec 
Log Message:
Upped tags to stop FC-3 from replacing the later distro builds.




Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- nethack-vultures.spec	10 Apr 2006 14:46:05 -0000	1.23
+++ nethack-vultures.spec	14 Apr 2006 15:15:55 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        2.0.0
-Release:        3%{?dist}
+Release:        5%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -167,6 +167,9 @@
 
 
 %changelog
+* Fri Apr 14 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-5
+- Upped the release tag to keep up with FC-3
+
 * Sun Apr 09 2006 Karen Pease <meme at daughtersoftiresias.org> - 2.0.0-3
 - Packaged extra fonts
 



From fedora-extras-commits at redhat.com  Fri Apr 14 15:37:07 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Fri, 14 Apr 2006 08:37:07 -0700
Subject: rpms/ginac/FC-5 .cvsignore, 1.3, 1.4 ginac.spec, 1.7, 1.8 sources,
	1.3, 1.4
Message-ID: <200604141537.k3EFb9U7030771@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/ginac/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30750

Modified Files:
	.cvsignore ginac.spec sources 
Log Message:
New release. Remove old patch.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ginac/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	31 Oct 2005 23:23:57 -0000	1.3
+++ .cvsignore	14 Apr 2006 15:37:06 -0000	1.4
@@ -1 +1 @@
-ginac-1.3.3.tar.bz2
+ginac-1.3.4.tar.bz2


Index: ginac.spec
===================================================================
RCS file: /cvs/extras/rpms/ginac/FC-5/ginac.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ginac.spec	13 Feb 2006 17:50:29 -0000	1.7
+++ ginac.spec	14 Apr 2006 15:37:06 -0000	1.8
@@ -1,13 +1,12 @@
 Name:           ginac
-Version:        1.3.3
-Release:        4%{?dist}
+Version:        1.3.4
+Release:        1%{?dist}
 Summary:        C++ library for symbolic calculations
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://www.ginac.de/
 Source0:        http://www.ginac.de/%{name}-%{version}.tar.bz2
-Patch0:         ginac-1.3.3-gcc41.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post): /sbin/install-info
@@ -55,7 +54,6 @@
 
 %prep
 %setup -q
-%patch0 -p0
 
 %build
 %configure --disable-dependency-tracking --disable-static
@@ -106,6 +104,9 @@
 %{_mandir}/man?/viewgar.1*
 
 %changelog
+* Fri Apr 14 2006 Quentin Spencer <qspencer at users.sf.net> 1.3.4-1
+- New release. Old patch removed.
+
 * Mon Feb 13 2006 Quentin Spencer <qspencer at users.sf.net> 1.3.3-4
 - Rebuild for Fedora Extras 5.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ginac/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 Oct 2005 23:23:57 -0000	1.3
+++ sources	14 Apr 2006 15:37:06 -0000	1.4
@@ -1 +1 @@
-6278b954d17013a4c027e4d52a4bd8b4  ginac-1.3.3.tar.bz2
+ed887e80cc119eeb07c0329990576446  ginac-1.3.4.tar.bz2



From fedora-extras-commits at redhat.com  Fri Apr 14 15:38:40 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Fri, 14 Apr 2006 08:38:40 -0700
Subject: rpms/ginac/FC-5 ginac-1.3.3-gcc41.patch,1.1,NONE
Message-ID: <200604141538.k3EFcg4I030799@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/ginac/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30784

Removed Files:
	ginac-1.3.3-gcc41.patch 
Log Message:
Forgot to remove old patch.


--- ginac-1.3.3-gcc41.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Apr 14 15:39:41 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Fri, 14 Apr 2006 08:39:41 -0700
Subject: rpms/ginac/devel .cvsignore, 1.3, 1.4 ginac.spec, 1.7, 1.8 sources, 
	1.3, 1.4 ginac-1.3.3-gcc41.patch, 1.1, NONE
Message-ID: <200604141539.k3EFdhRP030847@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/ginac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30826

Modified Files:
	.cvsignore ginac.spec sources 
Removed Files:
	ginac-1.3.3-gcc41.patch 
Log Message:
New release. Remove old patch.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ginac/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	31 Oct 2005 23:23:57 -0000	1.3
+++ .cvsignore	14 Apr 2006 15:39:41 -0000	1.4
@@ -1 +1 @@
-ginac-1.3.3.tar.bz2
+ginac-1.3.4.tar.bz2


Index: ginac.spec
===================================================================
RCS file: /cvs/extras/rpms/ginac/devel/ginac.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ginac.spec	13 Feb 2006 17:50:29 -0000	1.7
+++ ginac.spec	14 Apr 2006 15:39:41 -0000	1.8
@@ -1,13 +1,12 @@
 Name:           ginac
-Version:        1.3.3
-Release:        4%{?dist}
+Version:        1.3.4
+Release:        1%{?dist}
 Summary:        C++ library for symbolic calculations
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://www.ginac.de/
 Source0:        http://www.ginac.de/%{name}-%{version}.tar.bz2
-Patch0:         ginac-1.3.3-gcc41.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post): /sbin/install-info
@@ -55,7 +54,6 @@
 
 %prep
 %setup -q
-%patch0 -p0
 
 %build
 %configure --disable-dependency-tracking --disable-static
@@ -106,6 +104,9 @@
 %{_mandir}/man?/viewgar.1*
 
 %changelog
+* Fri Apr 14 2006 Quentin Spencer <qspencer at users.sf.net> 1.3.4-1
+- New release. Old patch removed.
+
 * Mon Feb 13 2006 Quentin Spencer <qspencer at users.sf.net> 1.3.3-4
 - Rebuild for Fedora Extras 5.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ginac/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 Oct 2005 23:23:57 -0000	1.3
+++ sources	14 Apr 2006 15:39:41 -0000	1.4
@@ -1 +1 @@
-6278b954d17013a4c027e4d52a4bd8b4  ginac-1.3.3.tar.bz2
+ed887e80cc119eeb07c0329990576446  ginac-1.3.4.tar.bz2


--- ginac-1.3.3-gcc41.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Apr 14 16:21:57 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Fri, 14 Apr 2006 09:21:57 -0700
Subject: rpms/ginac/FC-4 .cvsignore, 1.3, 1.4 ginac.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <200604141621.k3EGLxra000634@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/ginac/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv613

Modified Files:
	.cvsignore ginac.spec sources 
Log Message:
New upstream release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ginac/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	31 Oct 2005 23:22:22 -0000	1.3
+++ .cvsignore	14 Apr 2006 16:21:57 -0000	1.4
@@ -1 +1 @@
-ginac-1.3.3.tar.bz2
+ginac-1.3.4.tar.bz2


Index: ginac.spec
===================================================================
RCS file: /cvs/extras/rpms/ginac/FC-4/ginac.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ginac.spec	2 Feb 2006 22:14:04 -0000	1.4
+++ ginac.spec	14 Apr 2006 16:21:57 -0000	1.5
@@ -1,12 +1,12 @@
 Name:           ginac
-Version:        1.3.3
-Release:        2%{?dist}
+Version:        1.3.4
+Release:        1%{?dist}
 Summary:        C++ library for symbolic calculations
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://www.ginac.de/
-Source0:        ftp://ftpthep.physik.uni-mainz.de/pub/GiNaC/%{name}-%{version}.tar.bz2
+Source0:        http://www.ginac.de/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires(post): /sbin/install-info
@@ -104,7 +104,8 @@
 %{_mandir}/man1/viewgar.1*
 
 %changelog
-* Thu Feb  2 2006 Quentin Spencer <qspencer at users.sf.net> 1.3.3-3
+* Fri Apr 14 2006 Quentin Spencer <qspencer at users.sf.net> 1.3.4-1
+- New release.
 - Disable static libs, remove /usr/share/info/dir, and enable parallel build.
 
 * Mon Oct 31 2005 Quentin Spencer <qspencer at users.sf.net> 1.3.3-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ginac/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	31 Oct 2005 23:22:22 -0000	1.3
+++ sources	14 Apr 2006 16:21:57 -0000	1.4
@@ -1 +1 @@
-6278b954d17013a4c027e4d52a4bd8b4  ginac-1.3.3.tar.bz2
+ed887e80cc119eeb07c0329990576446  ginac-1.3.4.tar.bz2



From fedora-extras-commits at redhat.com  Fri Apr 14 17:03:19 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 14 Apr 2006 10:03:19 -0700
Subject: rpms/php-adodb/FC-5 .cvsignore, 1.6, 1.7 php-adodb.spec, 1.8,
	1.9 sources, 1.6, 1.7
Message-ID: <200604141703.k3EH3LTQ002878@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/php-adodb/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2817/FC-5

Modified Files:
	.cvsignore php-adodb.spec sources 
Log Message:
- update to 4.80 (minor bugfixes)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-adodb/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	22 Feb 2006 15:30:49 -0000	1.6
+++ .cvsignore	14 Apr 2006 17:03:19 -0000	1.7
@@ -1 +1 @@
-adodb472.tgz
+adodb480.tgz


Index: php-adodb.spec
===================================================================
RCS file: /cvs/extras/rpms/php-adodb/FC-5/php-adodb.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- php-adodb.spec	22 Feb 2006 15:30:49 -0000	1.8
+++ php-adodb.spec	14 Apr 2006 17:03:19 -0000	1.9
@@ -1,9 +1,9 @@
 Name:           php-adodb
 Summary:        Active Data Objects Data Base
-Version:        4.72
+Version:        4.80
 Release:        1%{?dist}
 
-Source0:        http://dl.sf.net/adodb/adodb472.tgz
+Source0:        http://dl.sf.net/adodb/adodb480.tgz
 License:        BSD
 URL:            http://adodb.sf.net
 Group:          Development/Libraries
@@ -53,6 +53,9 @@
 %{_var}/www/icons/*
 
 %changelog
+* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 4.80-1
+- version 4.80
+
 * Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 4.72-1
 - version 4.72
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-adodb/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	22 Feb 2006 15:30:49 -0000	1.6
+++ sources	14 Apr 2006 17:03:19 -0000	1.7
@@ -1 +1 @@
-10a3a94d21d56a35f9ff62b838856911  adodb472.tgz
+942164adfc953173205231b9522304e0  adodb480.tgz



From fedora-extras-commits at redhat.com  Fri Apr 14 17:03:20 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 14 Apr 2006 10:03:20 -0700
Subject: rpms/php-adodb/devel .cvsignore, 1.6, 1.7 php-adodb.spec, 1.8,
	1.9 sources, 1.6, 1.7
Message-ID: <200604141703.k3EH3MGl002885@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/php-adodb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2817/devel

Modified Files:
	.cvsignore php-adodb.spec sources 
Log Message:
- update to 4.80 (minor bugfixes)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-adodb/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	22 Feb 2006 15:30:49 -0000	1.6
+++ .cvsignore	14 Apr 2006 17:03:20 -0000	1.7
@@ -1 +1 @@
-adodb472.tgz
+adodb480.tgz


Index: php-adodb.spec
===================================================================
RCS file: /cvs/extras/rpms/php-adodb/devel/php-adodb.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- php-adodb.spec	22 Feb 2006 15:30:49 -0000	1.8
+++ php-adodb.spec	14 Apr 2006 17:03:20 -0000	1.9
@@ -1,9 +1,9 @@
 Name:           php-adodb
 Summary:        Active Data Objects Data Base
-Version:        4.72
+Version:        4.80
 Release:        1%{?dist}
 
-Source0:        http://dl.sf.net/adodb/adodb472.tgz
+Source0:        http://dl.sf.net/adodb/adodb480.tgz
 License:        BSD
 URL:            http://adodb.sf.net
 Group:          Development/Libraries
@@ -53,6 +53,9 @@
 %{_var}/www/icons/*
 
 %changelog
+* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 4.80-1
+- version 4.80
+
 * Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 4.72-1
 - version 4.72
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-adodb/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	22 Feb 2006 15:30:49 -0000	1.6
+++ sources	14 Apr 2006 17:03:20 -0000	1.7
@@ -1 +1 @@
-10a3a94d21d56a35f9ff62b838856911  adodb472.tgz
+942164adfc953173205231b9522304e0  adodb480.tgz



From fedora-extras-commits at redhat.com  Fri Apr 14 17:03:19 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 14 Apr 2006 10:03:19 -0700
Subject: rpms/php-adodb/FC-4 .cvsignore, 1.5, 1.6 php-adodb.spec, 1.7,
	1.8 sources, 1.5, 1.6
Message-ID: <200604141703.k3EH3LmI002874@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/php-adodb/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2817/FC-4

Modified Files:
	.cvsignore php-adodb.spec sources 
Log Message:
- update to 4.80 (minor bugfixes)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-adodb/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Dec 2005 08:34:17 -0000	1.5
+++ .cvsignore	14 Apr 2006 17:03:18 -0000	1.6
@@ -1 +1 @@
-adodb468.tgz
+adodb480.tgz


Index: php-adodb.spec
===================================================================
RCS file: /cvs/extras/rpms/php-adodb/FC-4/php-adodb.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- php-adodb.spec	23 Dec 2005 08:34:17 -0000	1.7
+++ php-adodb.spec	14 Apr 2006 17:03:18 -0000	1.8
@@ -1,9 +1,9 @@
 Name:           php-adodb
 Summary:        Active Data Objects Data Base
-Version:        4.68
+Version:        4.80
 Release:        1%{?dist}
 
-Source0:        http://dl.sf.net/adodb/adodb468.tgz
+Source0:        http://dl.sf.net/adodb/adodb480.tgz
 License:        BSD
 URL:            http://adodb.sf.net
 Group:          Development/Libraries
@@ -53,6 +53,12 @@
 %{_var}/www/icons/*
 
 %changelog
+* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 4.80-1
+- version 4.80
+
+* Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 4.72-1
+- version 4.72
+
 * Fri Dec 23 2005 Aurelien Bompard <gauret[AT]free.fr> 4.68-1
 - version 4.68
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-adodb/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Dec 2005 08:34:17 -0000	1.5
+++ sources	14 Apr 2006 17:03:18 -0000	1.6
@@ -1 +1 @@
-c4e8b0db2abc7181a1d3bb0621aa0c1d  adodb468.tgz
+942164adfc953173205231b9522304e0  adodb480.tgz



From fedora-extras-commits at redhat.com  Fri Apr 14 19:14:52 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Fri, 14 Apr 2006 12:14:52 -0700
Subject: rpms/net6/devel .cvsignore, 1.5, 1.6 net6.spec, 1.7, 1.8 sources,
	1.5, 1.6
Message-ID: <200604141914.k3EJEsnW007532@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/net6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7511

Modified Files:
	.cvsignore net6.spec sources 
Log Message:
1.3.0rc1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/net6/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	22 Dec 2005 08:53:09 -0000	1.5
+++ .cvsignore	14 Apr 2006 19:14:52 -0000	1.6
@@ -1 +1 @@
-net6-1.2.2.tar.gz
+net6-1.3.0rc1.tar.gz


Index: net6.spec
===================================================================
RCS file: /cvs/extras/rpms/net6/devel/net6.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- net6.spec	13 Feb 2006 22:11:29 -0000	1.7
+++ net6.spec	14 Apr 2006 19:14:52 -0000	1.8
@@ -1,15 +1,18 @@
+%define _rc rc1
+
 Name:           net6
-Version:        1.2.2
-Release:        2%{?dist}
+Version:        1.3.0
+Release:        1.rc1%{?dist}
 Summary:        A TCP protocol abstraction for library C++
 
 Group:          Development/Libraries
 License:        GPL
 URL:            http://releases.0x539.de/net6/
-Source0:        http://releases.0x539.de/net6/%{name}-%{version}.tar.gz
+Source0:        http://releases.0x539.de/net6/%{name}-%{version}%{_rc}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libsigc++20-devel
+BuildRequires:  libsigc++20-devel, gnutls-devel
+Requires:       gnutls
 
 %description
 net6 is a library which eases the development of network-based applications
@@ -33,7 +36,7 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{_rc}
 
 
 %build
@@ -70,6 +73,9 @@
 
 
 %changelog
+* Fri Apr 14 2006 Luke Macken <lmacken at redhat.com> - 1.3.0-1.rc1
+- 1.3.0rc1
+
 * Mon Feb 13 2006 Luke Macken <lmacken at redhat.com> - 1.2.2-2
 - Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/net6/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	22 Dec 2005 08:53:09 -0000	1.5
+++ sources	14 Apr 2006 19:14:52 -0000	1.6
@@ -1 +1 @@
-8a551a2d9785b2b0ed431bb9eeb6cfd6  net6-1.2.2.tar.gz
+45511815c3be246cda11a2234cc4fa7b  net6-1.3.0rc1.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 14 19:58:26 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Fri, 14 Apr 2006 12:58:26 -0700
Subject: rpms/wv/devel wv.spec,1.14,1.15
Message-ID: <200604141958.k3EJwSOV007702@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/wv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7685

Modified Files:
	wv.spec 
Log Message:
rebuild


Index: wv.spec
===================================================================
RCS file: /cvs/extras/rpms/wv/devel/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	14 Apr 2006 19:58:25 -0000	1.15
@@ -1,7 +1,7 @@
 Name:       wv
 Summary:    MSWord 6/7/8/9 binary file format to HTML converter
 Version:    1.2.0
-Release:    3%{?dist}
+Release:    4%{?dist}
 License:    GPL
 Group:      Applications/Text
 URL:        http://wvware.sourceforge.net
@@ -85,6 +85,9 @@
 
 
 %changelog
+* 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 Apr 15 01:49:16 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Fri, 14 Apr 2006 18:49:16 -0700
Subject: rpms/gphpedit - New directory
Message-ID: <200604150149.k3F1nIFE022684@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/gphpedit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22658/gphpedit

Log Message:
Directory /cvs/extras/rpms/gphpedit added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 15 01:49:17 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Fri, 14 Apr 2006 18:49:17 -0700
Subject: rpms/gphpedit/devel - New directory
Message-ID: <200604150149.k3F1nJpF022687@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/gphpedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22658/gphpedit/devel

Log Message:
Directory /cvs/extras/rpms/gphpedit/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 15 01:49:37 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Fri, 14 Apr 2006 18:49:37 -0700
Subject: rpms/gphpedit/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604150149.k3F1nd4s022739@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/gphpedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22703/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gphpedit


--- 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 Apr 15 01:49:36 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Fri, 14 Apr 2006 18:49:36 -0700
Subject: rpms/gphpedit Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604150149.k3F1ncVw022736@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/gphpedit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22703

Added Files:
	Makefile import.log 
Log Message:
Setup of module gphpedit


--- NEW FILE Makefile ---
# Top level Makefile for module gphpedit
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 15 01:51:24 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Fri, 14 Apr 2006 18:51:24 -0700
Subject: rpms/gphpedit import.log,1.1,1.2
Message-ID: <200604150151.k3F1pQpi022800@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/gphpedit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22767

Modified Files:
	import.log 
Log Message:
auto-import gphpedit-0.9.80-3 on branch devel from gphpedit-0.9.80-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gphpedit/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Apr 2006 01:49:36 -0000	1.1
+++ import.log	15 Apr 2006 01:51:24 -0000	1.2
@@ -0,0 +1 @@
+gphpedit-0_9_80-3:HEAD:gphpedit-0.9.80-3.src.rpm:1145065877



From fedora-extras-commits at redhat.com  Sat Apr 15 01:51:25 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Fri, 14 Apr 2006 18:51:25 -0700
Subject: rpms/gphpedit/devel gphpedit.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604150151.k3F1pRHL022805@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/gphpedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22767/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gphpedit.spec 
Log Message:
auto-import gphpedit-0.9.80-3 on branch devel from gphpedit-0.9.80-3.src.rpm


--- NEW FILE gphpedit.spec ---
Name:           gphpedit
Version:        0.9.80
Release:        3%{?dist}
Summary:        A PHP source editor for GNOME 2

Group:          Applications/Text
License:        GPL
URL:            http://www.gphpedit.org/
Source0:        gphpedit-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  gtkhtml2-devel libgnomeui-devel
BuildRequires:  desktop-file-utils

%description
gPHPEdit is a GNOME2 editor dedicated to editing PHP files and other 
supporting files such as HTML/CSS.

%prep
%setup -q

# This path is hardcoded and doesn't inherit from the configure
# (see upstream bug #155 )
sed -i s_/usr/local/share/pixmaps_%{_datadir}/pixmaps_ src/main.h

# The .desktop file included isn't Free Desktop compliant
# (Fixed upstream in CVS)
%{__cat} <<EOF >gphpedit.desktop
[Desktop Entry]
Encoding=UTF-8
Name=gPHPEdit
GenericName=PHP/HTML/CSS editor
Comment=Edit PHP source files
Exec=gphpedit
Icon=gphpedit.png
Terminal=false
Type=Application
Categories=Application;Development;IDE;GNOME;
Version=0.9.4
EOF

%build
%configure
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

# Remove the desktop file installed by the package itself
rm %{buildroot}%{_datadir}/applications/gphpedit.desktop

# Install our own desktop file
desktop-file-install --vendor fedora                            \
        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
        --add-category X-Fedora                                 \
        gphpedit.desktop


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README
%dir %{_datadir}/gphpedit
%{_bindir}/gphpedit
%{_datadir}/pixmaps/gphpedit.png
%{_datadir}/applications/fedora-gphpedit.desktop
%{_datadir}/gphpedit/php-gphpedit.api

%changelog
* Sat Apr 15 2006 Tim Jackson <rpm at timj.co.uk> 0.9.80-3
- Remove gtk2-devel (gtkhtml2-devel and libgnomeui-devel will pull it in)
- Remove empty NEWS file
- Remove generic INSTALL file

* Thu Apr 13 2006 Tim Jackson <rpm at timj.co.uk> 0.9.80-2
- Own datadir/gphpedit
- Macroize replacement pixmap path in main.h
- Add "GNOME" and "Application" to desktop file

* Sat Apr 08 2006 Tim Jackson <rpm at timj.co.uk> 0.9.80-1
- Initial RPM build for FE


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gphpedit/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Apr 2006 01:49:36 -0000	1.1
+++ .cvsignore	15 Apr 2006 01:51:25 -0000	1.2
@@ -0,0 +1 @@
+gphpedit-0.9.80.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gphpedit/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Apr 2006 01:49:36 -0000	1.1
+++ sources	15 Apr 2006 01:51:25 -0000	1.2
@@ -0,0 +1 @@
+f05e6354ea64c73dd7bfe020ae15ac71  gphpedit-0.9.80.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 15 01:53:38 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Fri, 14 Apr 2006 18:53:38 -0700
Subject: owners owners.list,1.842,1.843
Message-ID: <200604150153.k3F1re19022878@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22861

Modified Files:
	owners.list 
Log Message:
Add gphpedit


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.842
retrieving revision 1.843
diff -u -r1.842 -r1.843
--- owners.list	14 Apr 2006 12:38:56 -0000	1.842
+++ owners.list	15 Apr 2006 01:53:38 -0000	1.843
@@ -392,6 +392,7 @@
 Fedora Extras|gperiodic|Program for browsing the periodic table|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
 Fedora Extras|gpgme03|GnuPG Made Easy interface library|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|gpgme|GnuPG Made Easy|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|gphpedit|A PHP source editor for GNOME 2|rpm at timj.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|gpp|Gnome Photo Printer|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|
 Fedora Extras|gpredict|Real-time satellite tracking and orbit prediction program|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|gpsd|Service daemon for mediating access to a GPS|matt at truch.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Apr 15 08:29:35 2006
From: fedora-extras-commits at redhat.com (Aurelien Bompard (abompard))
Date: Sat, 15 Apr 2006 01:29:35 -0700
Subject: rpms/amarok/FC-4 .cvsignore, 1.18, 1.19 amarok.spec, 1.37,
	1.38 sources, 1.18, 1.19
Message-ID: <200604150829.k3F8Tb8c006320@cvs-int.fedora.redhat.com>

Author: abompard

Update of /cvs/extras/rpms/amarok/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6299

Modified Files:
	.cvsignore amarok.spec sources 
Log Message:
update to 1.3.9


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	22 Jan 2006 09:07:05 -0000	1.18
+++ .cvsignore	15 Apr 2006 08:29:35 -0000	1.19
@@ -1 +1 @@
-amarok-1.3.8.tar.bz2
+amarok-1.3.9.tar.bz2


Index: amarok.spec
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/amarok.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- amarok.spec	22 Jan 2006 09:07:06 -0000	1.37
+++ amarok.spec	15 Apr 2006 08:29:35 -0000	1.38
@@ -1,20 +1,13 @@
-# Rebuild switch: 
-#  --with xine    Enables xine engine
-#
-
-%{?_with_xine: %define use_xine 1}
-
 Name:       amarok
 Summary:    Media player for KDE
-Version:    1.3.8
+Version:    1.3.9
 Release:    1%{?dist}
 
 Group: 	    Applications/Multimedia
 License:    GPL
 Url:        http://amarok.kde.org
-Source0:    http://dl.sf.net/amarok/amarok-1.3.8.tar.bz2
+Source0:    http://dl.sf.net/amarok/amarok-1.3.9.tar.bz2
 #Patch0:     amarok-1.3.4-helix-libs.patch
-Patch1:     amarok-1.3.6-libtunepimp040.patch
 Patch2:     amarok-1.3-engines-cfg.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -28,20 +21,11 @@
 BuildRequires:  mysql-devel, postgresql-devel
 BuildRequires:  libtunepimp-devel >= 0.4.0
 BuildRequires:  kdebase-devel
-%if "%fedora" >= "5"
-BuildRequires:  gstreamer-plugins-base-devel, gstreamer-plugins-good-devel
-%else
 BuildRequires:  gstreamer-plugins-devel >= 0.8.4
-%endif
 %ifnarch ppc64 x86_64 s390 s390x ia64
 BuildRequires:  HelixPlayer
 %endif
 
-%if  0%{?use_xine}
-BuildRequires:  xine-lib-devel >= 0:1.0.0
-BuildRequires:  libmad-devel
-%endif
-
 Requires:   kdemultimedia >= 6:3.2
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -74,24 +58,10 @@
 use any of xmms' visualisation plugins with Amarok.
 
 
-%if 0%{?use_xine}
-%package xine
-Summary:    Xine engine for Amarok
-Group:      Applications/Multimedia
-Requires:   %{name} = %{version}
-
-%description xine
-Amarok can also use the xine engine to decode sound. This package
-enables it
-%endif
-
-
 %prep
 %setup -q
 # Discover the helix libs
 #%patch0 -p1 -b .helix-libs
-# Use libtunepimp 0.4.0 (api changed)
-%patch1 -p1 -b .libtunepimp040
 # Gstreamer default sink should be autoaudiosink
 %patch2 -p1 -b .engines-cfg
 
@@ -103,11 +73,11 @@
 %configure \
      --disable-debug \
      --disable-rpath \
-     --with-helix=%{_libdir}/helix \
      --enable-mysql \
      --enable-postgresql \
-%if %{?use_xine:0}%{!?use_xine:1}
-     --without-xine
+     --without-xine \
+%ifnarch ppc64 x86_64 s390 s390x ia64
+     --with-helix=%{_libdir}/helix \
 %endif
 #     --enable-final \
 #     --with-nmm \
@@ -210,16 +180,12 @@
 %{_bindir}/amarok_xmmswrapper2
 
 
-%if 0%{?use_xine}
-%files xine
-%defattr(-,root,root)
-%{_libdir}/kde3/libamarok_xine-engine.*
-%{_datadir}/services/amarok_xine-engine.desktop
-#%{_datadir}/services/amarok_xine-engine_plugin.desktop
-%endif
-
-
 %changelog
+* Fri Apr 14 2006 Aurelien Bompard <gauret[AT]free.fr> 1.3.9-1
+- version 1.3.9
+- drop nonfree bits
+- drop patch 1 (upstream updated)
+
 * Sat Jan 21 2006 Aurelien Bompard <gauret[AT]free.fr> 1.3.8-1
 - version 1.3.8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amarok/FC-4/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources	22 Jan 2006 09:07:23 -0000	1.18
+++ sources	15 Apr 2006 08:29:35 -0000	1.19
@@ -1 +1 @@
-fd1ee0509568e5f9f7d0aeb9af094786  amarok-1.3.8.tar.bz2
+fb4cb3dafd3d15657b78e24c33abcf76  amarok-1.3.9.tar.bz2



From fedora-extras-commits at redhat.com  Sat Apr 15 08:39:19 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 15 Apr 2006 01:39:19 -0700
Subject: rpms/milter-greylist/devel milter-greylist.spec, 1.11, 1.12 sources,
	1.6, 1.7
Message-ID: <200604150839.k3F8dL5k006391@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/milter-greylist/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6371

Modified Files:
	milter-greylist.spec sources 
Log Message:
updated to 2.1.4 development release



Index: milter-greylist.spec
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/milter-greylist.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- milter-greylist.spec	18 Feb 2006 11:01:53 -0000	1.11
+++ milter-greylist.spec	15 Apr 2006 08:39:18 -0000	1.12
@@ -22,8 +22,8 @@
 
 Summary:	Milter for greylisting, the next step in the spam control war
 Name:		milter-greylist
-Version:	2.0.2
-Release:	%release_func 3
+Version:	2.1.4
+Release:	%release_func 1
 License:	BSD w/ advertising
 Group:		System Environment/Daemons
 URL:		http://hcpnet.free.fr/milter-greylist/
@@ -232,6 +232,9 @@
 %endif
 
 %changelog
+* Sat Apr 15 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 2.1.4-1
+- updated to 2.1.4
+
 * Sat Feb 18 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 2.0.2-3
 - rebuilt for FC5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/milter-greylist/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	22 Oct 2005 00:56:35 -0000	1.6
+++ sources	15 Apr 2006 08:39:18 -0000	1.7
@@ -1 +1 @@
-3b407107760b09bd554fb7dc5c5a3854  milter-greylist-2.0.2.tgz
+55eeb97b44bfc845c177e09f837c5b9c  milter-greylist-2.1.4.tgz



From fedora-extras-commits at redhat.com  Sat Apr 15 08:42:26 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 15 Apr 2006 01:42:26 -0700
Subject: rpms/gnochm/FC-4 gnochm.spec,1.2,1.3
Message-ID: <200604150842.k3F8gSt0006492@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/gnochm/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6447/FC-4

Modified Files:
	gnochm.spec 
Log Message:
* Sat Apr 15 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-5
- add gnome related requires (189034)



Index: gnochm.spec
===================================================================
RCS file: /cvs/extras/rpms/gnochm/FC-4/gnochm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnochm.spec	14 Apr 2006 11:47:37 -0000	1.2
+++ gnochm.spec	15 Apr 2006 08:42:26 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gnochm
 Version:        0.9.7
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        CHM file viewer
 
 Group:          Applications/Publishing
@@ -11,7 +11,8 @@
 
 BuildArch:      noarch
 BuildRequires:  gettext
-Requires:       python-chm
+Requires:       python-chm gnome-python2-gconf pygtk2-libglade 
+Requires:       gnome-python2-gtkhtml2
 
 Requires(pre): GConf2
 Requires(post): GConf2
@@ -117,6 +118,9 @@
 %{_datadir}/pixmaps/gnochm*.png
 
 %changelog
+* Sat Apr 15 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-5
+- add gnome related requires (189034)
+
 * Thu Apr 13 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-4
 - Add mimetype to .desktop file (188809)
 



From fedora-extras-commits at redhat.com  Sat Apr 15 08:42:27 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 15 Apr 2006 01:42:27 -0700
Subject: rpms/gnochm/FC-5 gnochm.spec,1.2,1.3
Message-ID: <200604150842.k3F8gT5Z006496@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/gnochm/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6447/FC-5

Modified Files:
	gnochm.spec 
Log Message:
* Sat Apr 15 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-5
- add gnome related requires (189034)



Index: gnochm.spec
===================================================================
RCS file: /cvs/extras/rpms/gnochm/FC-5/gnochm.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnochm.spec	14 Apr 2006 11:48:16 -0000	1.2
+++ gnochm.spec	15 Apr 2006 08:42:27 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gnochm
 Version:        0.9.7
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        CHM file viewer
 
 Group:          Applications/Publishing
@@ -11,7 +11,8 @@
 
 BuildArch:      noarch
 BuildRequires:  gettext
-Requires:       python-chm
+Requires:       python-chm gnome-python2-gconf pygtk2-libglade 
+Requires:       gnome-python2-gtkhtml2
 
 Requires(pre): GConf2
 Requires(post): GConf2
@@ -117,6 +118,9 @@
 %{_datadir}/pixmaps/gnochm*.png
 
 %changelog
+* Sat Apr 15 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-5
+- add gnome related requires (189034)
+
 * Thu Apr 13 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-4
 - Add mimetype to .desktop file (188809)
 



From fedora-extras-commits at redhat.com  Sat Apr 15 08:42:27 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sat, 15 Apr 2006 01:42:27 -0700
Subject: rpms/gnochm/devel gnochm.spec,1.3,1.4
Message-ID: <200604150842.k3F8gTFB006500@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/gnochm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6447/devel

Modified Files:
	gnochm.spec 
Log Message:
* Sat Apr 15 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-5
- add gnome related requires (189034)



Index: gnochm.spec
===================================================================
RCS file: /cvs/extras/rpms/gnochm/devel/gnochm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gnochm.spec	13 Apr 2006 09:56:36 -0000	1.3
+++ gnochm.spec	15 Apr 2006 08:42:27 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           gnochm
 Version:        0.9.7
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        CHM file viewer
 
 Group:          Applications/Publishing
@@ -11,7 +11,8 @@
 
 BuildArch:      noarch
 BuildRequires:  gettext
-Requires:       python-chm
+Requires:       python-chm gnome-python2-gconf pygtk2-libglade 
+Requires:       gnome-python2-gtkhtml2
 
 Requires(pre): GConf2
 Requires(post): GConf2
@@ -117,6 +118,9 @@
 %{_datadir}/pixmaps/gnochm*.png
 
 %changelog
+* Sat Apr 15 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-5
+- add gnome related requires (189034)
+
 * Thu Apr 13 2006 Patrice Dumas <pertusus at free.fr> 0.9.7-4
 - Add mimetype to .desktop file (188809)
 



From fedora-extras-commits at redhat.com  Sat Apr 15 09:41:35 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 15 Apr 2006 02:41:35 -0700
Subject: comps comps-fe5.xml.in,1.36,1.37
Message-ID: <200604150941.k3F9fbBs009005@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8988/comps

Modified Files:
	comps-fe5.xml.in 
Log Message:
add crystal-stacker


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- comps-fe5.xml.in	9 Apr 2006 07:28:28 -0000	1.36
+++ comps-fe5.xml.in	15 Apr 2006 09:41:35 -0000	1.37
@@ -200,6 +200,8 @@
         <packagereq type="optional">bzflag</packagereq>
         <packagereq type="optional">celestia</packagereq>
         <packagereq type="optional">cgoban</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">fillets-ng</packagereq>



From fedora-extras-commits at redhat.com  Sat Apr 15 09:46:34 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sat, 15 Apr 2006 02:46:34 -0700
Subject: rpms/gobby/devel gobby-0.4.0rc1-nodoclist.patch, NONE,
	1.1 .cvsignore, 1.4, 1.5 gobby.spec, 1.7, 1.8 sources, 1.4, 1.5
Message-ID: <200604150946.k3F9kabh009054@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/gobby/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9030

Modified Files:
	.cvsignore gobby.spec sources 
Added Files:
	gobby-0.4.0rc1-nodoclist.patch 
Log Message:
0.4.0rc1

gobby-0.4.0rc1-nodoclist.patch:

--- NEW FILE gobby-0.4.0rc1-nodoclist.patch ---
--- Makefile.in.orig	2006-04-15 05:32:45.000000000 -0400
+++ Makefile.in	2006-04-15 05:32:48.000000000 -0400
@@ -354,7 +354,6 @@
 @WITH_GNOME_TRUE at appicondir = $(datadir)/pixmaps
 @WITH_GNOME_TRUE at appicon_DATA = contrib/artwork/gobby.png \
 @WITH_GNOME_TRUE@	contrib/artwork/userlist.png \
- at WITH_GNOME_TRUE@	contrib/artwork/doclist.png \
 @WITH_GNOME_TRUE@	contrib/artwork/chat.png
 @WITH_GNOME_TRUE at desktopdir = $(datadir)/applications
 @WITH_GNOME_TRUE at desktop_DATA = contrib/gobby.desktop
--- Makefile.am.orig	2006-04-15 05:38:23.000000000 -0400
+++ Makefile.am	2006-04-15 05:38:29.000000000 -0400
@@ -132,7 +132,6 @@
 appicondir = $(datadir)/pixmaps
 appicon_DATA  = contrib/artwork/gobby.png
 appicon_DATA += contrib/artwork/userlist.png
-appicon_DATA += contrib/artwork/doclist.png
 appicon_DATA += contrib/artwork/chat.png
 desktopdir = $(datadir)/applications
 desktop_DATA = contrib/gobby.desktop


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gobby/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Dec 2005 09:13:30 -0000	1.4
+++ .cvsignore	15 Apr 2006 09:46:34 -0000	1.5
@@ -1 +1 @@
-gobby-0.3.0.tar.gz
+gobby-0.4.0rc1.tar.gz


Index: gobby.spec
===================================================================
RCS file: /cvs/extras/rpms/gobby/devel/gobby.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gobby.spec	15 Feb 2006 22:09:21 -0000	1.7
+++ gobby.spec	15 Apr 2006 09:46:34 -0000	1.8
@@ -1,12 +1,15 @@
+%define _rc  rc1
+
 Name:           gobby
-Version:        0.3.0
-Release:        4%{?dist}
+Version:        0.4.0
+Release:        1%{?dist}
 Summary:        Free collaborative editor
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://gobby.0x539.de
-Source0:        http://releases.0x539.de/gobby/%{name}-%{version}.tar.gz
+Source0:        http://releases.0x539.de/gobby/%{name}-%{version}%{_rc}.tar.gz
+Patch0:         %{name}-%{version}%{_rc}-nodoclist.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libxml++-devel, gtksourceview-devel, gtkmm24-devel, obby-devel
@@ -25,7 +28,8 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{_rc}
+%patch0
 
 
 %build
@@ -59,13 +63,16 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc README NEWS AUTHORS COPYING ChangeLog TODO
+%doc README NEWS AUTHORS COPYING ChangeLog
 %{_bindir}/gobby
 %{_datadir}/applications/fedora-gobby.desktop
 %{_datadir}/pixmaps/*
 
 
 %changelog
+* Sat Apr 15 2006 Luke Macken <lmacken at redhat.com> - 0.4.0-1.rc1
+- 0.4.0rc1
+
 * Wed Feb 15 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-4
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gobby/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Dec 2005 09:13:30 -0000	1.4
+++ sources	15 Apr 2006 09:46:34 -0000	1.5
@@ -1 +1 @@
-1b674f42654cc1960d37e0a6a2fcff1f  gobby-0.3.0.tar.gz
+f2839d46a2dcb1efff4fe79c23b78ef1  gobby-0.4.0rc1.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 15 12:16:30 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Sat, 15 Apr 2006 05:16:30 -0700
Subject: rpms/mod_security/FC-3 .cvsignore, 1.4, 1.5 mod_security.spec, 1.9, 
	1.10 sources, 1.5, 1.6
Message-ID: <200604151216.k3FCGWcc019710@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_security/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19689

Modified Files:
	.cvsignore mod_security.spec sources 
Log Message:
* Sat Apr 15 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.3-1
- New upstream release
- Minor spec tweak.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-3/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	18 Jan 2006 03:12:42 -0000	1.4
+++ .cvsignore	15 Apr 2006 12:16:30 -0000	1.5
@@ -1 +1 @@
-modsecurity-apache-1.9.2.tar.gz
+modsecurity-apache_1.9.3.tar.gz


Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-3/mod_security.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mod_security.spec	18 Jan 2006 03:12:42 -0000	1.9
+++ mod_security.spec	15 Apr 2006 12:16:30 -0000	1.10
@@ -1,6 +1,6 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
-Version: 1.9.2
+Version: 1.9.3
 Release: 1%{?dist}
 License: GPL
 URL: http://www.modsecurity.org/
@@ -37,9 +37,13 @@
 %defattr (-,root,root)
 %doc CHANGES LICENSE INSTALL README httpd* util doc
 %{_libdir}/httpd/modules/mod_security.so
-%config(noreplace) /etc/httpd/conf.d/mod_security.conf
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_security.conf
 
 %changelog
+* Sat Apr 15 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.3-1
+- New upstream release
+- Minor spec tweak.
+
 * Wed Jan 18 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.2-1
 - New upstream release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	18 Jan 2006 03:12:42 -0000	1.5
+++ sources	15 Apr 2006 12:16:30 -0000	1.6
@@ -1 +1 @@
-c28b66f02adb1ddb2d0885483f6f8e0e  modsecurity-apache-1.9.2.tar.gz
+cd5585488e2499c4218a4b13419c3065  modsecurity-apache_1.9.3.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 15 12:22:31 2006
From: fedora-extras-commits at redhat.com (Michael G. Fleming (mfleming))
Date: Sat, 15 Apr 2006 05:22:31 -0700
Subject: rpms/mod_security/FC-3 mod_security.spec,1.10,1.11
Message-ID: <200604151222.k3FCMXJb019781@cvs-int.fedora.redhat.com>

Author: mfleming

Update of /cvs/extras/rpms/mod_security/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19764

Modified Files:
	mod_security.spec 
Log Message:
Fix braino in last commit (forgot to change "-" to "_" in tarball &
directory names hence the build failed.)



Index: mod_security.spec
===================================================================
RCS file: /cvs/extras/rpms/mod_security/FC-3/mod_security.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mod_security.spec	15 Apr 2006 12:16:30 -0000	1.10
+++ mod_security.spec	15 Apr 2006 12:22:31 -0000	1.11
@@ -1,11 +1,11 @@
 Summary: Security module for the Apache HTTP Server
 Name: mod_security 
 Version: 1.9.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 URL: http://www.modsecurity.org/
 Group: System Environment/Daemons
-Source: http://www.modsecurity.org/download/modsecurity-apache-%{version}.tar.gz
+Source: http://www.modsecurity.org/download/modsecurity-apache_%{version}.tar.gz
 Source1: mod_security.conf
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: httpd  httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat %{_includedir}/httpd/.mmn || echo missing)
@@ -18,7 +18,7 @@
 
 %prep
 
-%setup -q -n modsecurity-apache-%{version}
+%setup -q -n modsecurity-apache_%{version}
 
 %build
 /usr/sbin/apxs -Wc,"%{optflags}" -c apache2/mod_security.c
@@ -40,9 +40,9 @@
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/mod_security.conf
 
 %changelog
-* Sat Apr 15 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.3-1
+* Sat Apr 15 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.3-2
 - New upstream release
-- Minor spec tweak.
+- Minor spec tweaks.
 
 * Wed Jan 18 2006 Michael Fleming <mfleming+rpm at enlartenment.com> 1.9.2-1
 - New upstream release



From fedora-extras-commits at redhat.com  Sat Apr 15 12:26:16 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Sat, 15 Apr 2006 05:26:16 -0700
Subject: fedora-security/audit fc4,1.202,1.203 fc5,1.115,1.116
Message-ID: <200604151226.k3FCQGiE019845@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19825

Modified Files:
	fc4 fc5 
Log Message:
Add all the firefox suite issues



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -r1.202 -r1.203
--- fc4	12 Apr 2006 08:08:47 -0000	1.202
+++ fc4	15 Apr 2006 12:26:14 -0000	1.203
@@ -1,8 +1,64 @@
-Up to date CVE as of CVE email 20060411
+Up to date CVE as of CVE email 20060414
 Up to date FC4 as of 20060411
 
 ** are items that need attention
 
+CVE-2006-1790 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1790 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-1790 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1742 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-1742 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1742 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1741 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-1741 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1741 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1740 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1740 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1739 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-1739 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1739 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1738 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-1738 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1738 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1737 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-1737 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1737 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1736 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1736 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1735 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1735 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-1735 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1734 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1734 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-1734 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1733 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1733 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-1733 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1732 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1732 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-1732 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1731 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1731 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-1731 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1730 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1730 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-1730 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1729 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1729 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1728 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-1728 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1728 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1727 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-1727 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1727 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1726 version (firefox, fixed 1.5.0.2) 1.5 only
+CVE-2006-1726 version (thunderbird, fixed 1.5.0.2) 1.5 only
+CVE-2006-1725 version (firefox, fixed 1.5.0.2) 1.5 only
+CVE-2006-1724 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-1724 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1724 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1723 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-1723 VULNERABLE (firefox, fixed 1.0.8)
 CVE-2006-1721 ** cyrus-sasl
 CVE-2006-1712 version (mailman, only 2.1.7)
 CVE-2006-1650 ** firefox
@@ -15,6 +71,12 @@
 CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1542 VULNERABLE (python) bz#169046
+CVE-2006-1531 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-1531 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1530 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-1530 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1529 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-1529 VULNERABLE (firefox, fixed 1.0.8)
 CVE-2006-1523 VULNERABLE (kernel, fixed 2.6.16.4)
 CVE-2006-1522 VULNERABLE (kernel, fixed 2.6.16.3)
 CVE-2006-1494 VULNERABLE (php)
@@ -41,6 +103,12 @@
 CVE-2006-0903 VULNERABLE (mysql) bz#183261
 CVE-2006-0884 ** thunderbird
 CVE-2006-0836 version (thunderbird, 1.5 only)
+CVE-2006-0749 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-0749 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-0749 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-0748 VULNERABLE (thunderbird, fixed 1.0.8)
+CVE-2006-0748 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-0748 VULNERABLE (firefox, fixed 1.0.8)
 CVE-2006-0746 VULNERABLE (kpdf) bz#184308
 CVE-2006-0745 version (xorg-x11) not fc4
 CVE-2006-0744 VULNERABLE (kernel)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -r1.115 -r1.116
--- fc5	12 Apr 2006 08:08:47 -0000	1.115
+++ fc5	15 Apr 2006 12:26:14 -0000	1.116
@@ -1,8 +1,64 @@
-Up to date CVE as of CVE email 20060411
+Up to date CVE as of CVE email 20060414
 Up to date FC5 as of 20060411
 
 ** are items that need attention
 
+CVE-2006-1790 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1790 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-1790 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1742 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-1742 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1742 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1741 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-1741 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1741 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1740 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1740 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1739 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-1739 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1739 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1738 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-1738 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1738 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1737 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-1737 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1737 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1736 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1736 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1735 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1735 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-1735 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1734 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1734 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-1734 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1733 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1733 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-1733 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1732 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1732 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-1732 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1731 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1731 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-1731 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1730 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1730 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-1730 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1729 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1729 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1728 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-1728 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1728 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1727 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-1727 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1727 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1726 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1726 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-1725 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1724 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-1724 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-1724 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1723 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-1723 VULNERABLE (firefox, fixed 1.5.0.2)
 CVE-2006-1721 ** cyrus-sasl
 CVE-2006-1712 version (mailman, only 2.1.7)
 CVE-2006-1650 ** firefox
@@ -14,6 +70,12 @@
 CVE-2006-1547 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1546 VULNERABLE (struts, fixed 1.2.9) bz#187544
 CVE-2006-1542 VULNERABLE (python) bz#169046
+CVE-2006-1531 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-1531 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1530 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-1530 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1529 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-1529 VULNERABLE (firefox, fixed 1.5.0.2)
 CVE-2006-1523 VULNERABLE (kernel, fixed 2.6.16.4)
 CVE-2006-1522 VULNERABLE (kernel, fixed 2.6.16.3)
 CVE-2006-1494 VULNERABLE (php)
@@ -42,6 +104,12 @@
 CVE-2006-0903 VULNERABLE (mysql) low/not upstream yet
 CVE-2006-0884 VULNERABLE (thunderbird)
 CVE-2006-0836 VULNERABLE (thunderbird)
+CVE-2006-0749 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-0749 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-0749 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-0748 VULNERABLE (thunderbird, fixed 1.5.0.2)
+CVE-2006-0748 VULNERABLE (mozilla, fixed 1.7.13)
+CVE-2006-0748 VULNERABLE (firefox, fixed 1.5.0.2)
 CVE-2006-0746 version (kdegraphics, fixed 3.4)
 CVE-2006-0745 backport (xorg-x11) [since FEDORA-2006-172]
 CVE-2006-0744 VULNERABLE (kernel)



From fedora-extras-commits at redhat.com  Sat Apr 15 13:40:23 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 15 Apr 2006 06:40:23 -0700
Subject: rpms/libassetml - New directory
Message-ID: <200604151340.k3FDePo5022094@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libassetml
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22073/libassetml

Log Message:
Directory /cvs/extras/rpms/libassetml added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 15 13:40:23 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 15 Apr 2006 06:40:23 -0700
Subject: rpms/libassetml/devel - New directory
Message-ID: <200604151340.k3FDePD3022097@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libassetml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22073/libassetml/devel

Log Message:
Directory /cvs/extras/rpms/libassetml/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 15 13:40:42 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 15 Apr 2006 06:40:42 -0700
Subject: rpms/libassetml Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604151340.k3FDeijJ022156@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libassetml
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22123

Added Files:
	Makefile import.log 
Log Message:
Setup of module libassetml


--- NEW FILE Makefile ---
# Top level Makefile for module libassetml
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 15 13:40:42 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 15 Apr 2006 06:40:42 -0700
Subject: rpms/libassetml/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604151340.k3FDeieV022159@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libassetml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22123/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libassetml


--- 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 Apr 15 13:41:24 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 15 Apr 2006 06:41:24 -0700
Subject: rpms/libassetml/devel libassetml.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604151341.k3FDfunL022227@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libassetml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22189/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libassetml.spec 
Log Message:
auto-import libassetml-1.2.1-1 on branch devel from libassetml-1.2.1-1.src.rpm


--- NEW FILE libassetml.spec ---
Name:		libassetml
Version: 	1.2.1
Release:        1%{?dist}
Summary:        XML resource database library
Group:          System Environment/Libraries
License:	GPL  
URL:		http://sourceforge.net/projects/ofset/
Source0:        http://download.sourceforge.net/ofset/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	glib2-devel libxml2-devel texinfo texi2html

%description
AssetML defines an xml file that can be used by application developers as a
resource database. The idea is to have a way to search content on your hard
drive with metadata (like name, category, file type, description) instead of
just a file name. This way, users can browse content more easily and developers
can share content more easily.


%package devel
Summary:	Libraries and include files for libassetml
Group:		Development/Libraries
Requires:	%{name} = %{version}
Requires:	glib2-devel
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info

%description devel
Development libraries for libassetml


%prep
%setup -q
# make rpmlint happy
chmod -x src/tools/assetml-query.c


%build
%configure
make %{?_smp_mflags}
iconv -f ISO-8859-1 -t UTF8 docs/C/libassetml.info > docs/C/libassetml.tmp
mv docs/C/libassetml.tmp docs/C/libassetml.info


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/assetml
%find_lang %{name}
rm $RPM_BUILD_ROOT/%{_libdir}/%{name}.la
rm -f $RPM_BUILD_ROOT/%{_infodir}/dir


%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


%clean
rm -rf $RPM_BUILD_ROOT


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog README THANKS
%{_bindir}/assetml-query
%{_libdir}/*.so.*
%dir %{_datadir}/assetml

%files devel
%{_includedir}/%{name}-1.0
%{_libdir}/*.so
%{_libdir}/pkgconfig/%{name}.pc
%{_datadir}/gnome/
%{_infodir}/%{name}.info.gz


%changelog
* Mon Apr 10 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.1-1
- Initial spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libassetml/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Apr 2006 13:40:42 -0000	1.1
+++ .cvsignore	15 Apr 2006 13:41:24 -0000	1.2
@@ -0,0 +1 @@
+libassetml-1.2.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libassetml/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Apr 2006 13:40:42 -0000	1.1
+++ sources	15 Apr 2006 13:41:24 -0000	1.2
@@ -0,0 +1 @@
+4b10fd0fb8e00a4fb526665413479516  libassetml-1.2.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 15 13:41:23 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 15 Apr 2006 06:41:23 -0700
Subject: rpms/libassetml import.log,1.1,1.2
Message-ID: <200604151341.k3FDftKn022223@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libassetml
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22189

Modified Files:
	import.log 
Log Message:
auto-import libassetml-1.2.1-1 on branch devel from libassetml-1.2.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libassetml/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Apr 2006 13:40:41 -0000	1.1
+++ import.log	15 Apr 2006 13:41:23 -0000	1.2
@@ -0,0 +1 @@
+libassetml-1_2_1-1:HEAD:libassetml-1.2.1-1.src.rpm:1145108357



From fedora-extras-commits at redhat.com  Sat Apr 15 13:42:34 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 15 Apr 2006 06:42:34 -0700
Subject: owners owners.list,1.843,1.844
Message-ID: <200604151342.k3FDgaiS022276@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22259/owners

Modified Files:
	owners.list 
Log Message:
add libassetml


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.843
retrieving revision 1.844
diff -u -r1.843 -r1.844
--- owners.list	15 Apr 2006 01:53:38 -0000	1.843
+++ owners.list	15 Apr 2006 13:42:34 -0000	1.844
@@ -566,6 +566,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|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|libbinio|A binary stream interface class library for C++|triad at df.lth.se|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|



From fedora-extras-commits at redhat.com  Sat Apr 15 16:04:07 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 15 Apr 2006 09:04:07 -0700
Subject: owners owners.list,1.844,1.845
Message-ID: <200604151604.k3FG49fK028816@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28799

Modified Files:
	owners.list 
Log Message:
Use my _bugzilla_ email


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.844
retrieving revision 1.845
diff -u -r1.844 -r1.845
--- owners.list	15 Apr 2006 13:42:34 -0000	1.844
+++ owners.list	15 Apr 2006 16:04:07 -0000	1.845
@@ -1223,7 +1223,7 @@
 Fedora Extras|python-enchant|Python bindings for Enchant spellchecking library|roozbeh at farsiweb.info|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.|ivazquez at ivazquez.net|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|
+Fedora Extras|python-fpconst|A Python module for handling IEEE 754 floating point special values|tkmame at retrogames.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-GeoIP|Python bindings for the GeoIP geographical lookup libraries|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-goopy|Google Python Utilities|pjones at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-HTMLgen|A class library for the generation of HTML documents|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Apr 15 16:58:44 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 15 Apr 2006 09:58:44 -0700
Subject: rpms/xemacs/devel xemacs-21.5.26-gtk-gcc4.patch, NONE,
	1.1 xemacs-21.5.26-utf8-fonts.patch, NONE, 1.1 xemacs.spec, 1.22,
	1.23 xemacs-21.5.25-utf8-fonts.patch, 1.1, NONE
Message-ID: <200604151658.k3FGwkbQ029021@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28998

Modified Files:
	xemacs.spec 
Added Files:
	xemacs-21.5.26-gtk-gcc4.patch xemacs-21.5.26-utf8-fonts.patch 
Removed Files:
	xemacs-21.5.25-utf8-fonts.patch 
Log Message:
* Sat Apr 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 21.5.26-3
- Don't expect to find ellcc if building without modules (#188929).
- New --with/--without rpmbuild flags:
  - xft: enable/disable Xft support, default disabled.
  - nox: enable/disable building the non-X version, default enabled
  - modules: enable/disable module support, default arch-dependent.
- Re-enable XFontSet support for menubars for non-Xft builds (from openSUSE).
- Move gnuserv to -common, gnudoit to base package, drop gnuattach.
- Split ellcc and headers to -devel subpackage.
- Drop unneeded libXaw-devel build dependency.
- Move -nox "man page" to -nox subpackage.
- Fix GTK build and glade detection for it.
- Avoid -common dependency on ALSA.


xemacs-21.5.26-gtk-gcc4.patch:

--- NEW FILE xemacs-21.5.26-gtk-gcc4.patch ---
--- xemacs-21.5.26/src/glyphs-gtk.c~	2005-11-22 13:24:44.000000000 +0200
+++ xemacs-21.5.26/src/glyphs-gtk.c	2006-04-14 23:57:23.000000000 +0300
@@ -796,7 +796,7 @@
     find_keyword_in_vector (instantiator, Q_file);
 
   IMAGE_INSTANCE_GTK_PIXMAP (ii) = pixmap;
-  IMAGE_INSTANCE_GTK_MASK (ii) = 0;
+  IMAGE_INSTANCE_PIXMAP_MASK (ii) = 0;
   IMAGE_INSTANCE_PIXMAP_WIDTH (ii) = gdk_image->width;
   IMAGE_INSTANCE_PIXMAP_HEIGHT (ii) = gdk_image->height;
   IMAGE_INSTANCE_PIXMAP_DEPTH (ii) = gdk_image->depth;
@@ -837,7 +837,7 @@
 
   IMAGE_INSTANCE_PIXMAP_FILENAME (ii) = Qnil;
   IMAGE_INSTANCE_GTK_PIXMAP (ii) = gdk_pixmap;
-  IMAGE_INSTANCE_GTK_MASK (ii) = 0;
+  IMAGE_INSTANCE_PIXMAP_MASK (ii) = 0;
   IMAGE_INSTANCE_PIXMAP_WIDTH (ii) = width;
   IMAGE_INSTANCE_PIXMAP_HEIGHT (ii) = height;
   IMAGE_INSTANCE_PIXMAP_DEPTH (ii) = depth;
@@ -2972,7 +2972,7 @@
       IMAGE_INSTANCE_TYPE (p) = IMAGE_COLOR_PIXMAP;
       /* Make sure there aren't two pointers to the same mask, causing
 	 it to get freed twice. */
-      IMAGE_INSTANCE_GTK_MASK (p) = 0;
+      IMAGE_INSTANCE_PIXMAP_MASK (p) = 0;
       break;
 
     default:

xemacs-21.5.26-utf8-fonts.patch:

--- NEW FILE xemacs-21.5.26-utf8-fonts.patch ---
--- xemacs-21.5.26/etc/Emacs.ad.orig	2003-03-27 14:57:44.000000000 +0200
+++ xemacs-21.5.26/etc/Emacs.ad	2006-04-14 20:37:56.000000000 +0300
@@ -198,8 +198,12 @@
 ! *menubar*FontSet:	-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \
 !			-*-*-*-*-*-*-*-120-*-jisx0208.1983-0
 !
-*menubar*Font:			-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*
-*popup*Font:			-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*
+*menubar*Font:			-*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-*
+*popup*Font:			-*-helvetica-bold-r-*-*-*-120-*-*-*-*-*-*
+
+XEmacs*FontSet:			-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso10646-1, \
+				-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \
+				*
 *menubar*FontSet:		-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-*, \
  			        -*-*-*-*-*-*-*-120-*-iso10646-1, \
  			        -*-*-*-*-*-*-*-120-*-jisx0208.1983-0, \
@@ -211,7 +215,7 @@
 
 ! Gui elements share this font
 !
-Emacs.gui-element.attributeFont:  -*-helvetica-medium-r-*-*-*-120-*-*-*-*-iso8859-*
+Emacs.gui-element.attributeFont:  -*-helvetica-medium-r-*-*-*-120-*-*-*-*-*-*
 
 ! Font in the Motif dialog boxes.
 ! (Motif uses `fontList' while most other things use `font' - if you don't
@@ -227,7 +231,7 @@
 ! Some people use 12-point anyway because you get more text, but
 ! there's no purpose at all in doing this for dialog boxes.
 
-*Dialog*Font:			-*-helvetica-bold-r-*-*-*-140-*-*-*-*-iso8859-*
+*Dialog*Font:			-*-helvetica-bold-r-*-*-*-140-*-*-*-*-*-*
 
 ! Dialog box translations.
 ! =======================


Index: xemacs.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- xemacs.spec	6 Apr 2006 16:27:53 -0000	1.22
+++ xemacs.spec	15 Apr 2006 16:58:44 -0000	1.23
@@ -1,24 +1,26 @@
-# TODO: xft build option
-# TODO: site-modules vs site-lisp -> to same dir (are modules noarch?)
 # TODO: review desktop entry associations
-# TODO: split off -devel?
 # TODO: zero-length /usr/share/xemacs-21.5-b26/lisp/dump-paths.el
 # TODO: non-ASCII in buffer tabs
-# TODO: re-enable XFontSet support for menubars? --> see suse fontset patch
 # TODO: build issues if previous 21.5.x installed, restore finder-inf stuff?
-# TODO: gtk+ build doesn't find glade, need pkg-config libglade --cflags
-# TODO: gtk+ build fails, invalid lvalues
+# TODO: fix --without modules build (../modules/canna_api.o not found?)
 
 %bcond_with     gtk
 %bcond_with     xaw3d
+%bcond_with     xft
 %bcond_without  mule
+%bcond_without  nox
 %bcond_without  stackprot
+%ifarch ia64
+%bcond_with     modules
+%else
+%bcond_without  modules
+%endif
 
 %define xver    %(echo %{version} | sed -e 's/\\.\\([0-9]\\+\\)$/-b\\1/')
 
 Name:           xemacs
 Version:        21.5.26
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -31,13 +33,15 @@
 Source4:        default.el
 Source5:        xemacs-sitestart.el
 
-Patch0:         %{name}-21.5.25-utf8-fonts.patch
+Patch0:         %{name}-21.5.26-utf8-fonts.patch
 Patch1:         %{name}-21.5.25-x-paths.patch
 # TODO: patch2 still needed with --with-system-packages???
 Patch2:         %{name}-21.5.25-find-paths-pkgdir.patch
 Patch3:         %{name}-21.5.25-mk-nochk-features.patch
 Patch4:         %{name}-21.5.26-no-expdyn-ia64-106744.patch
 Patch5:         %{name}-21.5.25-wnnfix-128362.patch
+# http://www.archivum.info/comp.emacs.xemacs/2005-08/msg00047.html
+Patch6:         %{name}-21.5.26-gtk-gcc4.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -57,25 +61,24 @@
 BuildRequires:  Canna-devel
 BuildRequires:  FreeWnn-devel
 %endif # mule
-
 BuildRequires:  xmkmf
 BuildRequires:  libXau-devel
 BuildRequires:  libXpm-devel
 BuildRequires:  alsa-lib-devel
-# TODO: verify this wrt gtk/xaw3d build
-BuildRequires:  xorg-x11-xbitmaps
 %if %{with gtk}
 BuildRequires:  gtk+-devel
 BuildRequires:  libglade-devel
-%else
-# TODO: verify this wrt xaw3d
-BuildRequires:  libXaw-devel
+%else  # gtk
+BuildRequires:  xorg-x11-xbitmaps
 %if %{with xaw3d}
 BuildRequires:  Xaw3d-devel
-%else
+%else  # xaw3d
 BuildRequires:  neXtaw-devel
 %endif # xaw3d
 %endif # gtk
+%if %{with xft}
+BuildRequires:  libXft-devel
+%endif # xft
 Requires:       xemacs-sumo >= 20050118-2
 Requires:       xemacs-common = %{version}-%{release}
 Requires:       xorg-x11-fonts-ISO8859-1-75dpi
@@ -149,6 +152,20 @@
 
 This package contains XEmacs documentation in GNU texinfo format.
 
+%package        devel
+Summary:        Development files for XEmacs
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description    devel
+XEmacs is a highly customizable open source text editor and
+application development system.  It is protected under the GNU General
+Public License and related to other versions of Emacs, in particular
+GNU Emacs.  Its emphasis is on modern graphical user interface support
+and an open software development model, similar to Linux.
+
+This package contains XEmacs development support files.
+
 
 %prep
 %setup -q
@@ -164,6 +181,7 @@
 %patch4 -p1
 %endif
 %patch5 -p1
+%patch6 -p1
 
 for f in man/lispref/mule.texi man/xemacs-faq.texi ; do
     iconv -f iso-8859-1 -t utf-8 -o $f.utf8 $f ; mv $f.utf8 $f
@@ -179,6 +197,9 @@
 CFLAGS="$(echo $CFLAGS | sed -e 's/-fstack-protector\s*//g')"
 CFLAGS="$(echo $CFLAGS | sed -e 's/--param=ssp-buffer-size=[0-9]\+\s*//')"
 %endif
+%if %{with gtk}
+CFLAGS="$CFLAGS $(pkg-config libglade --cflags)"
+%endif
 export CFLAGS
 export EMACSLOADPATH=$PWD/lisp
 
@@ -199,15 +220,15 @@
 %ifarch alpha ia64 ppc64
     --with-system-malloc
 %endif
-%ifarch ia64
+%if ! %{with modules}
     --without-modules
 %endif
 "
 
+%if %{with nox}
 # build without X
-# note: docdir requires trailing slash # TODO: still in 21.5?
 %configure $common_options \
-    --with-docdir=%{_libdir}/xemacs-%{xver}/doc-nox/ \
+    --with-docdir=%{_libdir}/xemacs-%{xver}/doc-nox \
     --with-sound=none \
     --without-x \
     --without-canna \
@@ -220,11 +241,14 @@
 mv lib-src/DOC{,-nox}
 mv src/xemacs{,-nox-%{xver}}
 mv lib-src/config.values{,-nox}
+# grab these from -nox, the X ones may have deps on ALSA, X, etc
+for file in {e,oo}tags gnuserv {fake,move}mail yow ; do
+    mv lib-src/$file{,-mindep}
+done
+%endif # nox
 
 # build with X
-# note: docdir requires trailing slash # TODO: still in 21.5?
 %configure $common_options \
-    --with-docdir=%{_libdir}/xemacs-%{xver}/doc/ \
 %if %{with gtk}
     --with-gtk \
     --with-gnome \
@@ -236,7 +260,12 @@
     --with-scrollbars=lucid \
     --with-dialogs=athena \
 %endif
-    --without-xfs
+%if %{with xft}
+    --with-xft=all \
+%else
+    --with-xfs \
+%endif
+    --with-docdir=%{_libdir}/xemacs-%{xver}/doc
 # toplevel smp build fails
 make %{?_smp_mflags} -C lib-src
 make src/Emacs.ad.h
@@ -249,14 +278,19 @@
 
 export EMACSLOADPATH=$PWD/lisp
 
+%if %{with nox}
+# restore binaries with less dependencies; note: no -p nor move
+for file in lib-src/*-mindep ; do cp $file ${file%%-mindep} ; done
+%endif
+
 # note: no DESTDIR support
-# note: docdir requires trailing slash # TODO: still in 21.5?
 %makeinstall \
     mandir=$RPM_BUILD_ROOT%{_mandir}/man1 \
-    docdir=$RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc/
-echo ".so man1/xemacs.1" > $RPM_BUILD_ROOT%{_mandir}/man1/xemacs-nox.1
+    docdir=$RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc
 
+%if %{with nox}
 # install nox files
+echo ".so man1/xemacs.1" > $RPM_BUILD_ROOT%{_mandir}/man1/xemacs-nox.1
 install -pm 755 src/xemacs-nox-%{xver} $RPM_BUILD_ROOT%{_bindir}
 ln -s xemacs-nox-%{xver} $RPM_BUILD_ROOT%{_bindir}/xemacs-nox
 install -dm 755 $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-nox
@@ -264,6 +298,7 @@
     $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-nox/DOC
 install -pm 644 lib-src/config.values-nox \
     $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/doc-nox/config.values
+%endif # nox
 
 # these clash with GNU Emacs
 mv $RPM_BUILD_ROOT%{_bindir}/etags{,.xemacs}
@@ -309,8 +344,9 @@
 # clean up unneeded stuff (TODO: there's probably much more)
 find $RPM_BUILD_ROOT%{_prefix} -name "*~" | xargs rm
 rm $RPM_BUILD_ROOT%{_libdir}/xemacs-%{xver}/*linux/gzip-el.sh
+rm $RPM_BUILD_ROOT{%{_bindir}/gnuattach,%{_mandir}/man1/gnuattach.1}
 cd $RPM_BUILD_ROOT%{_datadir}/xemacs-%{xver}/etc
-rm -r InstallGuide sparcworks tests XKeysymDB *.sco *.1
+rm -r editclient.sh InstallGuide sparcworks tests XKeysymDB *.sco *.1
 cd -
 
 # separate files
@@ -388,53 +424,85 @@
 
 %files
 %defattr(-,root,root,-)
+# gnuclient needs X libs, so not in -common
+%{_bindir}/gnuclient
+%{_bindir}/gnudoit
 %ghost %{_bindir}/xemacs
 %{_bindir}/xemacs-%{xver}
-# gnuclient, gnuserv need X libs, so not in -common
-%{_bindir}/gnuclient
-%{_libdir}/xemacs-%{xver}/*linux/gnuserv
 %{_libdir}/xemacs-%{xver}/doc/
+%if %{with modules}
+%{_libdir}/xemacs-%{xver}/*linux/modules/canna_api.ell
+%endif
 %{_datadir}/applications/*-%{name}.desktop
 %{_datadir}/icons/hicolor/48x48/apps/xemacs.png
 %{_mandir}/man1/gnuclient.1*
-%{_mandir}/man1/gnuserv.1*
+%{_mandir}/man1/gnudoit.1*
 
+%if %{with nox}
 %files nox
 %defattr(-,root,root,-)
 %ghost %{_bindir}/xemacs
 %{_bindir}/xemacs-nox
 %{_bindir}/xemacs-nox-%{xver}
 %{_libdir}/xemacs-%{xver}/doc-nox/
+%{_mandir}/man1/xemacs-nox.1*
+%endif
 
 %files common -f base-files
 %defattr(-,root,root,-)
 %doc INSTALL README COPYING PROBLEMS CHANGES-beta etc/NEWS etc/TUTORIAL
 %doc etc/editclient.sh
-%{_bindir}/ellcc
 %{_bindir}/etags.xemacs
-%{_bindir}/gnuattach
-%{_bindir}/gnudoit
 %{_bindir}/ootags
 %{_libdir}/xemacs/
 %dir %{_libdir}/xemacs-%{xver}
 %dir %{_libdir}/xemacs-%{xver}/*linux/
-%{_libdir}/xemacs-%{xver}/*linux/[acdfhimprsvwy]*
+%{_libdir}/xemacs-%{xver}/*linux/[acdfghprsvwy]*
+%{_libdir}/xemacs-%{xver}/*linux/m[am]*
+%{_libdir}/xemacs-%{xver}/*linux/movemail
+%if %{with modules}
+%dir %{_libdir}/xemacs-%{xver}/*linux/modules/
+%{_libdir}/xemacs-%{xver}/*linux/modules/auto-autoloads.elc
+%endif
 %config(noreplace) %{_sysconfdir}/skel/.xemacs/
 %{_mandir}/man1/etags.xemacs.1*
-%{_mandir}/man1/gnuattach.1*
-%{_mandir}/man1/gnudoit.1*
-%{_mandir}/man1/xemacs*.1*
+%{_mandir}/man1/gnuserv.1*
+%{_mandir}/man1/xemacs.1*
 %dir %{_localstatedir}/lock/xemacs/
 
 %files el -f el-files
 %defattr(-,root,root,-)
+%if %{with modules}
+%{_libdir}/xemacs-%{xver}/*linux/modules/auto-autoloads.el
+%endif
 
 %files info -f info-files
 %defattr(-,root,root,-)
 %{_infodir}/*.info*
 
+%files devel
+%defattr(-,root,root,-)
+%if %{with modules}
+%{_bindir}/ellcc
+%endif
+%{_libdir}/xemacs-%{xver}/*linux/include/
+
 
 %changelog
+* Sat Apr 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 21.5.26-3
+- Don't expect to find ellcc if building without modules (#188929).
+- New --with/--without rpmbuild flags:
+  - xft: enable/disable Xft support, default disabled.
+  - nox: enable/disable building the non-X version, default enabled
+  - modules: enable/disable module support, default arch-dependent.
+- Re-enable XFontSet support for menubars for non-Xft builds (from openSUSE).
+- Move gnuserv to -common, gnudoit to base package, drop gnuattach.
+- Split ellcc and headers to -devel subpackage.
+- Drop unneeded libXaw-devel build dependency.
+- Move -nox "man page" to -nox subpackage.
+- Fix GTK build and glade detection for it.
+- Avoid -common dependency on ALSA.
+
 * Thu Apr  6 2006 Ville Skytt?? <ville.skytta at iki.fi> - 21.5.26-2
 - Borrow Mike Fabian's site-start.el work from the SuSE package.
 


--- xemacs-21.5.25-utf8-fonts.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Apr 15 18:41:11 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 15 Apr 2006 11:41:11 -0700
Subject: rpms/embryo - New directory
Message-ID: <200604151841.k3FIfDRr000947@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/embryo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv919/embryo

Log Message:
Directory /cvs/extras/rpms/embryo added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 15 18:41:12 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 15 Apr 2006 11:41:12 -0700
Subject: rpms/embryo/devel - New directory
Message-ID: <200604151841.k3FIfEW7000950@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/embryo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv919/embryo/devel

Log Message:
Directory /cvs/extras/rpms/embryo/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 15 18:41:28 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 15 Apr 2006 11:41:28 -0700
Subject: rpms/embryo Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604151841.k3FIfUvH001000@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/embryo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv966

Added Files:
	Makefile import.log 
Log Message:
Setup of module embryo


--- NEW FILE Makefile ---
# Top level Makefile for module embryo
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 15 18:41:29 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 15 Apr 2006 11:41:29 -0700
Subject: rpms/embryo/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604151841.k3FIfVlY001003@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/embryo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv966/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module embryo


--- 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 Apr 15 18:42:19 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 15 Apr 2006 11:42:19 -0700
Subject: rpms/embryo import.log,1.1,1.2
Message-ID: <200604151842.k3FIgLRg001064@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/embryo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1031

Modified Files:
	import.log 
Log Message:
auto-import embryo-0.9.1.023-1 on branch devel from embryo-0.9.1.023-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/embryo/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Apr 2006 18:41:28 -0000	1.1
+++ import.log	15 Apr 2006 18:42:19 -0000	1.2
@@ -0,0 +1 @@
+embryo-0_9_1_023-1:HEAD:embryo-0.9.1.023-1.src.rpm:1145127001



From fedora-extras-commits at redhat.com  Sat Apr 15 18:42:20 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 15 Apr 2006 11:42:20 -0700
Subject: rpms/embryo/devel embryo.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604151842.k3FIgMbL001069@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/embryo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1031/devel

Modified Files:
	.cvsignore sources 
Added Files:
	embryo.spec 
Log Message:
auto-import embryo-0.9.1.023-1 on branch devel from embryo-0.9.1.023-1.src.rpm


--- NEW FILE embryo.spec ---
Name:           embryo
Version:        0.9.1.023
Release:        1%{?dist}
Summary:        A C like scripting language

Group:          System Environment/Libraries
License:        MIT
URL:            http://www.enlightenment.org/Libraries/Embryo/
Source0:        http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

#BuildRequires:  
#Requires:       

%description
Embryo implements a C like scripting language used in various parts of the
Enlightenment project, namely Edje. Embryo's scripting language is based on
CompuPhase's Small language that was introduced in Dr Dobb's Journal in 1999.
Embryo allows scripting capabilities in places that otherwise wouldn't
support basic programming structures such as in Edje EDCs.

%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.

%prep
%setup -q

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name \*.la -exec rm {} \;

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING COPYING-PLAIN README
%{_bindir}/%{name}
%{_bindir}/%{name}_cc
%{_datadir}/%{name}
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc
%{_bindir}/*config
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*

%changelog
* Sun Feb  5 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.1.023-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/embryo/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Apr 2006 18:41:29 -0000	1.1
+++ .cvsignore	15 Apr 2006 18:42:20 -0000	1.2
@@ -0,0 +1 @@
+embryo-0.9.1.023.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/embryo/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Apr 2006 18:41:29 -0000	1.1
+++ sources	15 Apr 2006 18:42:20 -0000	1.2
@@ -0,0 +1 @@
+eb84d1c02e9063f2108bc5f72a7627ef  embryo-0.9.1.023.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 15 20:00:23 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sat, 15 Apr 2006 13:00:23 -0700
Subject: rpms/obby/devel .cvsignore, 1.4, 1.5 obby.spec, 1.14, 1.15 sources, 
	1.4, 1.5
Message-ID: <200604152000.k3FK0PJM003406@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/obby/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3385

Modified Files:
	.cvsignore obby.spec sources 
Log Message:
0.4.0rc1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/obby/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Dec 2005 08:56:58 -0000	1.4
+++ .cvsignore	15 Apr 2006 20:00:23 -0000	1.5
@@ -1 +1 @@
-obby-0.3.0.tar.gz
+obby-0.4.0rc1.tar.gz


Index: obby.spec
===================================================================
RCS file: /cvs/extras/rpms/obby/devel/obby.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- obby.spec	15 Feb 2006 20:09:55 -0000	1.14
+++ obby.spec	15 Apr 2006 20:00:23 -0000	1.15
@@ -1,12 +1,14 @@
+%define _rc rc1
+
 Name:           obby
-Version:        0.3.0
-Release:        3%{?dist}
+Version:        0.4.0
+Release:        1.%{_rc}%{?dist}
 Summary:        A library which provides synced document buffers
 
 Group:          Development/Libraries
 License:        GPL
 URL:            http://releases.0x539.de/obby
-Source0:        http://releases.0x539.de/obby/%{name}-%{version}.tar.gz
+Source0:        http://releases.0x539.de/obby/%{name}-%{version}%{_rc}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  net6-devel, gmp-devel, gettext-devel
@@ -29,7 +31,7 @@
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{_rc}
 
 
 %build
@@ -65,6 +67,9 @@
 
 
 %changelog
+* Sat Apr 15 2006 Luke Macken <lmacken at redhat.com> - 0.4.0-1.rc1
+- 0.4.0rc1
+
 * Wed Feb 15 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-3
 - Rebuild for FE5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/obby/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Dec 2005 08:56:58 -0000	1.4
+++ sources	15 Apr 2006 20:00:23 -0000	1.5
@@ -1 +1 @@
-b14135018a3093395296cf091f9f824f  obby-0.3.0.tar.gz
+cd7d8755a7854ad8d29c6d2b0457fa8f  obby-0.4.0rc1.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 15 20:51:22 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 15 Apr 2006 13:51:22 -0700
Subject: owners owners.list,1.845,1.846
Message-ID: <200604152051.k3FKpOgv005789@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5769

Modified Files:
	owners.list 
Log Message:
+embryo


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.845
retrieving revision 1.846
diff -u -r1.845 -r1.846
--- owners.list	15 Apr 2006 16:04:07 -0000	1.845
+++ owners.list	15 Apr 2006 20:51:22 -0000	1.846
@@ -220,6 +220,7 @@
 Fedora Extras|eet|A library designed to write an arbitary set of chunks of data to a file|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|elmo|Terminal-based mail client|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|emacs-auctex|Enhanced TeX modes for Emacsen|ed at eh3.com|extras-qa at fedoraproject.org|
+Fedora Extras|embryo|A C like scripting language|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|emelfm2|A file manager that implements the popular two-pane design|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|enca|Character set analyzer and detector|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|enchant|An Enchanting Spell Checking Library|uwog at uwog.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Apr 15 21:18:51 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sat, 15 Apr 2006 14:18:51 -0700
Subject: rpms/net6/devel net6.spec,1.8,1.9
Message-ID: <200604152118.k3FLIsCp008676@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/net6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8659

Modified Files:
	net6.spec 
Log Message:
add gnutls-devel to BR for -devel package


Index: net6.spec
===================================================================
RCS file: /cvs/extras/rpms/net6/devel/net6.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- net6.spec	14 Apr 2006 19:14:52 -0000	1.8
+++ net6.spec	15 Apr 2006 21:18:51 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           net6
 Version:        1.3.0
-Release:        1.rc1%{?dist}
+Release:        2.rc1%{?dist}
 Summary:        A TCP protocol abstraction for library C++
 
 Group:          Development/Libraries
@@ -24,7 +24,7 @@
 Summary:        Development libraries for net6
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
-Requires:       pkgconfig, libsigc++20-devel
+Requires:       pkgconfig, libsigc++20-devel, gnutls-devel
 
 %description devel
 net6 is a library which eases the development of network-based applications
@@ -73,6 +73,9 @@
 
 
 %changelog
+* Sat Apr 15 2006 Luke Macken <lmacken at redhat.com> - 1.3.0-2.rc1
+- Add gnutls-devel to BuildRequires for -devel package
+
 * Fri Apr 14 2006 Luke Macken <lmacken at redhat.com> - 1.3.0-1.rc1
 - 1.3.0rc1
 



From fedora-extras-commits at redhat.com  Sat Apr 15 22:13:12 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sat, 15 Apr 2006 15:13:12 -0700
Subject: rpms/gobby/devel gobby.spec,1.8,1.9
Message-ID: <200604152213.k3FMDEql010859@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/gobby/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10842

Modified Files:
	gobby.spec 
Log Message:
add gnome-vfs2-devel to buildrequires


Index: gobby.spec
===================================================================
RCS file: /cvs/extras/rpms/gobby/devel/gobby.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gobby.spec	15 Apr 2006 09:46:34 -0000	1.8
+++ gobby.spec	15 Apr 2006 22:13:12 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           gobby
 Version:        0.4.0
-Release:        1%{?dist}
+Release:        2.%{_rc}%{?dist}
 Summary:        Free collaborative editor
 
 Group:          Applications/Internet
@@ -14,6 +14,7 @@
 
 BuildRequires:  libxml++-devel, gtksourceview-devel, gtkmm24-devel, obby-devel
 BuildRequires:  desktop-file-utils, libXau-devel, libXdmcp-devel
+BuildRequires:  gnome-vfs2-devel
 
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -70,8 +71,12 @@
 
 
 %changelog
+* Sat Apr 15 2006 Luke Macken <lmacken at redhat.com> - 0.4.0-2.rc1
+- Add gnome-vfs2-devel to BuildRequires
+
 * Sat Apr 15 2006 Luke Macken <lmacken at redhat.com> - 0.4.0-1.rc1
 - 0.4.0rc1
+- gobby-0.4.0rc1-nodoclist.patch
 
 * Wed Feb 15 2006 Luke Macken <lmacken at redhat.com> - 0.3.0-4
 - Rebuild for Fedora Extras 5



From fedora-extras-commits at redhat.com  Sat Apr 15 22:20:04 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 15:20:04 -0700
Subject: rpms/perl-Module-Pluggable - New directory
Message-ID: <200604152220.k3FMK6VV010988@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Pluggable
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10962/perl-Module-Pluggable

Log Message:
Directory /cvs/extras/rpms/perl-Module-Pluggable added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 15 22:20:05 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 15:20:05 -0700
Subject: rpms/perl-Module-Pluggable/devel - New directory
Message-ID: <200604152220.k3FMK7c6010991@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Pluggable/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10962/perl-Module-Pluggable/devel

Log Message:
Directory /cvs/extras/rpms/perl-Module-Pluggable/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 15 22:20:24 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 15:20:24 -0700
Subject: rpms/perl-Module-Pluggable Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604152220.k3FMKQ9s011035@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Pluggable
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11007

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Module-Pluggable


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Module-Pluggable
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 15 22:20:25 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 15:20:25 -0700
Subject: rpms/perl-Module-Pluggable/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200604152220.k3FMKRpn011038@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Pluggable/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11007/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Module-Pluggable


--- 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 Apr 15 22:20:53 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 15:20:53 -0700
Subject: rpms/perl-Module-Pluggable import.log,1.1,1.2
Message-ID: <200604152220.k3FMKtV7011104@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Pluggable
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11071

Modified Files:
	import.log 
Log Message:
auto-import perl-Module-Pluggable-2.97-1 on branch devel from perl-Module-Pluggable-2.97-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Pluggable/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Apr 2006 22:20:24 -0000	1.1
+++ import.log	15 Apr 2006 22:20:53 -0000	1.2
@@ -0,0 +1 @@
+perl-Module-Pluggable-2_97-1:HEAD:perl-Module-Pluggable-2.97-1.src.rpm:1145139646



From fedora-extras-commits at redhat.com  Sat Apr 15 22:20:54 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 15:20:54 -0700
Subject: rpms/perl-Module-Pluggable/devel perl-Module-Pluggable.spec, NONE, 
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604152221.k3FMKuCV011109@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Module-Pluggable/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11071/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Module-Pluggable.spec 
Log Message:
auto-import perl-Module-Pluggable-2.97-1 on branch devel from perl-Module-Pluggable-2.97-1.src.rpm


--- NEW FILE perl-Module-Pluggable.spec ---
Name:           perl-Module-Pluggable
Version:        2.97
Release:        1%{?dist}
Summary:        Automatically give your module the ability to have plugins
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Module-Pluggable/
Source0:        http://www.cpan.org/authors/id/S/SI/SIMONW/Module-Pluggable-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Module::Build)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Provides a simple but, hopefully, extensible way of having 'plugins' for
your module.

%prep
%setup -q -n Module-Pluggable-%{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+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Mar 23 2006 Steven Pritchard <steve at kspei.com> 2.97-1
- Specfile autogenerated by cpanspec 1.62.
- Clean up description a little.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Pluggable/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Apr 2006 22:20:24 -0000	1.1
+++ .cvsignore	15 Apr 2006 22:20:53 -0000	1.2
@@ -0,0 +1 @@
+Module-Pluggable-2.97.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Pluggable/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Apr 2006 22:20:24 -0000	1.1
+++ sources	15 Apr 2006 22:20:53 -0000	1.2
@@ -0,0 +1 @@
+f118696802530ecb4fdaf91f9b904136  Module-Pluggable-2.97.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 15 22:42:26 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 15:42:26 -0700
Subject: owners owners.list,1.846,1.847
Message-ID: <200604152242.k3FMgS9Q011188@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11171

Modified Files:
	owners.list 
Log Message:
Add perl-Module-Pluggable.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.846
retrieving revision 1.847
diff -u -r1.846 -r1.847
--- owners.list	15 Apr 2006 20:51:22 -0000	1.846
+++ owners.list	15 Apr 2006 22:42:26 -0000	1.847
@@ -1032,6 +1032,7 @@
 Fedora Extras|perl-Module-Load|Runtime require of both modules and files|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Load-Conditional|Looking up module information / loading at runtime|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Loaded|Mark modules as loaded or unloaded|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Module-Pluggable|Automatically give your module the ability to have plugins|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Refresh|Refresh %INC files when updated on disk|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Signature|CPAN signature management utilities and modules|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Versions-Report|Report versions of all modules in memory|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Sat Apr 15 23:09:05 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 16:09:05 -0700
Subject: rpms/qtparted/devel qtparted.spec,1.12,1.13
Message-ID: <200604152309.k3FN971c013367@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/qtparted/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13350

Modified Files:
	qtparted.spec 
Log Message:
Rebuild.


Index: qtparted.spec
===================================================================
RCS file: /cvs/extras/rpms/qtparted/devel/qtparted.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- qtparted.spec	13 Feb 2006 18:16:37 -0000	1.12
+++ qtparted.spec	15 Apr 2006 23:09:05 -0000	1.13
@@ -2,7 +2,7 @@
 
 Name:           qtparted
 Version:        0.4.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Partition Magic clone written in C++ using the Qt toolkit
 
 Group:          Applications/System
@@ -107,6 +107,9 @@
 
 
 %changelog
+* Fri Apr 14 2006 Steven Pritchard <steve at kspei.com> - 0.4.5-5
+- Rebuild.
+
 * Mon Feb 13 2006 Steven Pritchard <steve at kspei.com> - 0.4.5-4
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Sat Apr 15 23:41:23 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 16:41:23 -0700
Subject: rpms/perl-IPC-Cmd - New directory
Message-ID: <200604152341.k3FNfPh7013560@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-IPC-Cmd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13534/perl-IPC-Cmd

Log Message:
Directory /cvs/extras/rpms/perl-IPC-Cmd added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 15 23:41:24 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 16:41:24 -0700
Subject: rpms/perl-IPC-Cmd/devel - New directory
Message-ID: <200604152341.k3FNfQEs013563@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-serv13534/perl-IPC-Cmd/devel

Log Message:
Directory /cvs/extras/rpms/perl-IPC-Cmd/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 15 23:41:42 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 16:41:42 -0700
Subject: rpms/perl-IPC-Cmd Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604152341.k3FNfiXl013607@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-IPC-Cmd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13579

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-IPC-Cmd


--- NEW FILE Makefile ---
# Top level Makefile for module perl-IPC-Cmd
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 15 23:41:42 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 16:41:42 -0700
Subject: rpms/perl-IPC-Cmd/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604152341.k3FNfiPe013610@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-serv13579/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-IPC-Cmd


--- 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 Apr 15 23:41:54 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 16:41:54 -0700
Subject: owners owners.list,1.847,1.848
Message-ID: <200604152341.k3FNfuZZ013643@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13623

Modified Files:
	owners.list 
Log Message:
Add perl-IPC-Cmd.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.847
retrieving revision 1.848
diff -u -r1.847 -r1.848
--- owners.list	15 Apr 2006 22:42:26 -0000	1.847
+++ owners.list	15 Apr 2006 23:41:54 -0000	1.848
@@ -989,6 +989,7 @@
 Fedora Extras|perl-IO-stringy|I/O on in-core objects like strings and arrays|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-Tty|Perl interface to pseudo tty's|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-Zlib|For bugs related to the perl-IO-Zlib component|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-IPC-Cmd|Finding and running system commands made easy|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IPC-Run|Perl module for interacting with child processes|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IPC-Shareable|Share Perl variables between processes|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IPC-SharedCache|Perl module to manage a cache in SysV IPC shared memory|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Sat Apr 15 23:42:11 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 16:42:11 -0700
Subject: rpms/perl-IPC-Cmd import.log,1.1,1.2
Message-ID: <200604152342.k3FNgDow013699@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-IPC-Cmd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13666

Modified Files:
	import.log 
Log Message:
auto-import perl-IPC-Cmd-0.24-1 on branch devel from perl-IPC-Cmd-0.24-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-IPC-Cmd/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Apr 2006 23:41:42 -0000	1.1
+++ import.log	15 Apr 2006 23:42:11 -0000	1.2
@@ -0,0 +1 @@
+perl-IPC-Cmd-0_24-1:HEAD:perl-IPC-Cmd-0.24-1.src.rpm:1145144525



From fedora-extras-commits at redhat.com  Sat Apr 15 23:42:12 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 16:42:12 -0700
Subject: rpms/perl-IPC-Cmd/devel perl-IPC-Cmd.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604152342.k3FNgEtS013704@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-serv13666/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-IPC-Cmd.spec 
Log Message:
auto-import perl-IPC-Cmd-0.24-1 on branch devel from perl-IPC-Cmd-0.24-1.src.rpm


--- NEW FILE perl-IPC-Cmd.spec ---
Name:           perl-IPC-Cmd
Version:        0.24
Release:        1%{?dist}
Summary:        Finding and running system commands made easy
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/IPC-Cmd/
Source0:        http://www.cpan.org/authors/id/K/KA/KANE/IPC-Cmd-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Locale::Maketext::Simple)
BuildRequires:  perl(Module::Load::Conditional)
BuildRequires:  perl(Params::Check)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
IPC::Cmd allows you to run commands, interactively if desired, platform
independent but have them still work.

%prep
%setup -q -n IPC-Cmd-%{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+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Mar 23 2006 Steven Pritchard <steve at kspei.com> 0.24-1
- Specfile autogenerated by cpanspec 1.62.
- Fix License.
- Drop explicit Requires.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-IPC-Cmd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Apr 2006 23:41:42 -0000	1.1
+++ .cvsignore	15 Apr 2006 23:42:12 -0000	1.2
@@ -0,0 +1 @@
+IPC-Cmd-0.24.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-IPC-Cmd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Apr 2006 23:41:42 -0000	1.1
+++ sources	15 Apr 2006 23:42:12 -0000	1.2
@@ -0,0 +1 @@
+9061bd187defad873432f91fa6de9f9b  IPC-Cmd-0.24.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 15 23:44:40 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 16:44:40 -0700
Subject: rpms/perl-Archive-Extract - New directory
Message-ID: <200604152344.k3FNigJi013811@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Archive-Extract
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13784/perl-Archive-Extract

Log Message:
Directory /cvs/extras/rpms/perl-Archive-Extract added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 15 23:44:40 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 16:44:40 -0700
Subject: rpms/perl-Archive-Extract/devel - New directory
Message-ID: <200604152344.k3FNiglP013814@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Archive-Extract/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13784/perl-Archive-Extract/devel

Log Message:
Directory /cvs/extras/rpms/perl-Archive-Extract/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 15 23:44:54 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 16:44:54 -0700
Subject: rpms/perl-Archive-Extract Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604152344.k3FNiuSp013863@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Archive-Extract
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13830

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Archive-Extract


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Archive-Extract
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Apr 15 23:44:54 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 16:44:54 -0700
Subject: rpms/perl-Archive-Extract/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604152344.k3FNiukG013866@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Archive-Extract/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13830/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Archive-Extract


--- 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 Apr 15 23:45:04 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 16:45:04 -0700
Subject: owners owners.list,1.848,1.849
Message-ID: <200604152345.k3FNj6kV013898@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13877

Modified Files:
	owners.list 
Log Message:
Add perl-Archive-Extract.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.848
retrieving revision 1.849
diff -u -r1.848 -r1.849
--- owners.list	15 Apr 2006 23:41:54 -0000	1.848
+++ owners.list	15 Apr 2006 23:45:04 -0000	1.849
@@ -848,6 +848,7 @@
 Fedora Extras|perl-Apache-Session|Apache::Session Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Apache-Session-Wrapper|A simple wrapper around Apache::Session|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-AppConfig|Perl module for reading configuration files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Archive-Extract|A generic archive extracting mechanism|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Archive-Zip|Perl library for accessing Zip archives|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Array-Compare|Perl extension for comparing arrays|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Authen-Radius|Perl Authen::Radius modules|andreas at bawue.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Sat Apr 15 23:45:21 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 16:45:21 -0700
Subject: rpms/perl-Archive-Extract import.log,1.1,1.2
Message-ID: <200604152345.k3FNjN9L013952@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Archive-Extract
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13919

Modified Files:
	import.log 
Log Message:
auto-import perl-Archive-Extract-0.08-1 on branch devel from perl-Archive-Extract-0.08-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Archive-Extract/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	15 Apr 2006 23:44:54 -0000	1.1
+++ import.log	15 Apr 2006 23:45:21 -0000	1.2
@@ -0,0 +1 @@
+perl-Archive-Extract-0_08-1:HEAD:perl-Archive-Extract-0.08-1.src.rpm:1145144715



From fedora-extras-commits at redhat.com  Sat Apr 15 23:45:22 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Sat, 15 Apr 2006 16:45:22 -0700
Subject: rpms/perl-Archive-Extract/devel perl-Archive-Extract.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604152345.k3FNjOWl013957@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Archive-Extract/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13919/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Archive-Extract.spec 
Log Message:
auto-import perl-Archive-Extract-0.08-1 on branch devel from perl-Archive-Extract-0.08-1.src.rpm


--- NEW FILE perl-Archive-Extract.spec ---
Name:           perl-Archive-Extract
Version:        0.08
Release:        1%{?dist}
Summary:        A generic archive extracting mechanism
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Archive-Extract/
Source0:        http://www.cpan.org/authors/id/K/KA/KANE/Archive-Extract-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(IPC::Cmd) >= 0.24
BuildRequires:  perl(Locale::Maketext::Simple)
BuildRequires:  perl(Module::Load::Conditional) >= 0.04
BuildRequires:  perl(Params::Check) >= 0.07
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Archive::Extract is a generic archive extraction mechanism.

%prep
%setup -q -n Archive-Extract-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \;

chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Mar 23 2006 Steven Pritchard <steve at kspei.com> 0.08-1
- Specfile autogenerated by cpanspec 1.62.
- Fix License.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Archive-Extract/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	15 Apr 2006 23:44:54 -0000	1.1
+++ .cvsignore	15 Apr 2006 23:45:22 -0000	1.2
@@ -0,0 +1 @@
+Archive-Extract-0.08.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Archive-Extract/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	15 Apr 2006 23:44:54 -0000	1.1
+++ sources	15 Apr 2006 23:45:22 -0000	1.2
@@ -0,0 +1 @@
+1e5d21e4dcd52e168eb2d660e44a48a6  Archive-Extract-0.08.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 16 01:37:48 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Sat, 15 Apr 2006 18:37:48 -0700
Subject: rpms/paraview - New directory
Message-ID: <200604160137.k3G1bo9I018314@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/paraview
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18288/paraview

Log Message:
Directory /cvs/extras/rpms/paraview added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 16 01:37:49 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Sat, 15 Apr 2006 18:37:49 -0700
Subject: rpms/paraview/devel - New directory
Message-ID: <200604160137.k3G1bpum018317@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/paraview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18288/paraview/devel

Log Message:
Directory /cvs/extras/rpms/paraview/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 16 01:38:04 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Sat, 15 Apr 2006 18:38:04 -0700
Subject: rpms/paraview Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604160138.k3G1c6Rf018366@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/paraview
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18333

Added Files:
	Makefile import.log 
Log Message:
Setup of module paraview


--- NEW FILE Makefile ---
# Top level Makefile for module paraview
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 16 01:38:05 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Sat, 15 Apr 2006 18:38:05 -0700
Subject: rpms/paraview/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604160138.k3G1c7YM018369@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/paraview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18333/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module paraview


--- 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 Apr 16 01:44:52 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Sat, 15 Apr 2006 18:44:52 -0700
Subject: rpms/paraview import.log,1.1,1.2
Message-ID: <200604160144.k3G1ism8018464@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/paraview
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18426

Modified Files:
	import.log 
Log Message:
auto-import paraview-2.4.3-5 on branch devel from paraview-2.4.3-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/paraview/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	16 Apr 2006 01:38:04 -0000	1.1
+++ import.log	16 Apr 2006 01:44:52 -0000	1.2
@@ -0,0 +1 @@
+paraview-2_4_3-5:HEAD:paraview-2.4.3-5.src.rpm:1145151884



From fedora-extras-commits at redhat.com  Sun Apr 16 01:44:53 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Sat, 15 Apr 2006 18:44:53 -0700
Subject: rpms/paraview/devel paraview-2.4.2-tcltk.patch, NONE,
	1.1 paraview-2.4.3-png.patch, NONE,
	1.1 paraview-2.4.3-python.patch, NONE, 1.1 paraview.spec, NONE,
	1.1 paraview.xml, NONE, 1.1 paraview_22x22.png, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604160144.k3G1itZE018475@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/paraview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18426/devel

Modified Files:
	.cvsignore sources 
Added Files:
	paraview-2.4.2-tcltk.patch paraview-2.4.3-png.patch 
	paraview-2.4.3-python.patch paraview.spec paraview.xml 
	paraview_22x22.png 
Log Message:
auto-import paraview-2.4.3-5 on branch devel from paraview-2.4.3-5.src.rpm

paraview-2.4.2-tcltk.patch:

--- NEW FILE paraview-2.4.2-tcltk.patch ---
--- paraview-2.4.2/CMakeLists.txt.orig	2006-03-10 10:20:16.000000000 -0700
+++ paraview-2.4.2/CMakeLists.txt	2006-03-10 10:22:08.000000000 -0700
@@ -271,10 +271,10 @@
   SET(VTK_TCL_TK_INTERNALS_DIR 
     "${ParaView_SOURCE_DIR}/VTK/Utilities/TclTk/internals")
   SET(VTK_TCL_TK_WRAPPING_DIR "${ParaView_SOURCE_DIR}/VTK/Wrapping/Tcl")
-  SET(TclTk_INSTALL_NO_RUNTIME ${PV_INSTALL_NO_RUNTIME})
-  SET(TclTk_INSTALL_BIN_DIR ${PV_INSTALL_BIN_DIR})
-  SET(TclTk_INSTALL_LIB_DIR ${PV_INSTALL_LIB_DIR})
-  SUBDIRS(Utilities/TclTk)
+  #SET(TclTk_INSTALL_NO_RUNTIME ${PV_INSTALL_NO_RUNTIME})
+  #SET(TclTk_INSTALL_BIN_DIR ${PV_INSTALL_BIN_DIR})
+  #SET(TclTk_INSTALL_LIB_DIR ${PV_INSTALL_LIB_DIR})
+  #SUBDIRS(Utilities/TclTk)
 ENDIF (PARAVIEW_BUILD_GUI)
 
 # Specify python build so that we can use vtkTkRenderWidget with no

paraview-2.4.3-png.patch:

--- NEW FILE paraview-2.4.3-png.patch ---
--- paraview-2.4.3/GUI/Widgets/CMakeLists.txt.orig	2006-03-29 10:20:37.000000000 -0700
+++ paraview-2.4.3/GUI/Widgets/CMakeLists.txt	2006-03-29 10:22:03.000000000 -0700
@@ -397,7 +397,6 @@
     TARGET_LINK_LIBRARIES (KWWidgets vtkParallel)
   ENDIF(VTK_USE_PARALLEL OR VTK_USE_PARALLEL_ISSET)
 ENDIF(VTK_WRAP_TCL)
-TARGET_LINK_LIBRARIES (KWWidgets vtkpng)
 
 # We need KWSys
 

paraview-2.4.3-python.patch:

--- NEW FILE paraview-2.4.3-python.patch ---
--- paraview-2.4.3/CMakeLists.txt.python	2006-03-29 16:13:54.000000000 -0700
+++ paraview-2.4.3/CMakeLists.txt	2006-03-29 16:14:24.000000000 -0700
@@ -472,11 +472,7 @@
 IF(PARAVIEW_WRAP_PYTHON)
   FIND_PACKAGE(PythonLibs REQUIRED)
   SUBDIRS(Utilities/VTKPythonWrapping)
-  IF(PV_INSTALL_NO_LIBRARIES)
-    SET(VTKPythonWrapping_INSTALL_LIBRARIES 0)
-  ELSE(PV_INSTALL_NO_LIBRARIES)
-    SET(VTKPythonWrapping_INSTALL_LIBRARIES 1)
-  ENDIF(PV_INSTALL_NO_LIBRARIES)
+  SET(VTKPythonWrapping_INSTALL_LIBRARIES 1)
   SET(VTKPythonWrapping_INSTALL_LIB_DIR ${PV_INSTALL_LIB_DIR})
   SET(VTKPythonWrapping_INSTALL_BIN_DIR ${PV_INSTALL_BIN_DIR})
 ENDIF(PARAVIEW_WRAP_PYTHON)


--- NEW FILE paraview.spec ---
Name:           paraview
Version:        2.4.3
Release:        5%{?dist}
Summary:        Parallel visualization application

Group:          Applications/Engineering
License:        Distributable
URL:            http://www.paraview.org/
Source0:        http://www.paraview.org/files/v2.4/paraview-%{version}.tar.gz
Source1:        paraview_22x22.png
Source2:        paraview.xml
Patch0:         paraview-2.4.2-tcltk.patch
Patch1:         paraview-2.4.3-png.patch
Patch2:         paraview-2.4.3-python.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  cmake, lam
BuildRequires:  libGLU-devel, libXt-devel
BuildRequires:  python-devel, tk-devel, hdf5-devel
BuildRequires:  freetype-devel, libjpeg-devel, libpng-devel, libtiff-devel, zlib-devel
BuildRequires:  expat-devel
BuildRequires:  /usr/bin/desktop-file-install
Requires:       %{name}-data = %{version}-%{release}
Requires(post):   /usr/bin/update-desktop-database
Requires(postun): /usr/bin/update-desktop-database


%description
ParaView is an application designed with the need to visualize large data
sets in mind. The goals of the ParaView project include the following:

    * Develop an open-source, multi-platform visualization application.
    * Support distributed computation models to process large data sets.
    * Create an open, flexible, and intuitive user interface.
    * Develop an extensible architecture based on open standards.

ParaView runs on distributed and shared memory parallel as well as single
processor systems and has been successfully tested on Windows, Linux and
various Unix workstations and clusters. Under the hood, ParaView uses the
Visualization Toolkit as the data processing and rendering engine and has a
user interface written using a unique blend of Tcl/Tk and C++.

NOTE: This version has NOT been compiled with MPI support.


%package        mpi
Summary:        Parallel visualization application
Group:          Applications/Engineering
Requires:       %{name}-data = %{version}-%{release}
Provides:       %{name}
Requires(post):   /usr/bin/update-desktop-database
Requires(postun): /usr/bin/update-desktop-database

%description    mpi
ParaView is an application designed with the need to visualize large data
sets in mind. The goals of the ParaView project include the following:

    * Develop an open-source, multi-platform visualization application.
    * Support distributed computation models to process large data sets.
    * Create an open, flexible, and intuitive user interface.
    * Develop an extensible architecture based on open standards.

ParaView runs on distributed and shared memory parallel as well as single
processor systems and has been successfully tested on Windows, Linux and
various Unix workstations and clusters. Under the hood, ParaView uses the
Visualization Toolkit as the data processing and rendering engine and has a
user interface written using a unique blend of Tcl/Tk and C++.

NOTE: This version has been compiled with LAM-MPI support and requires an
operating LAM-MPI runtime enviroment.


%package        data
Summary:        Data files for ParaView
Group:          Applications/Engineering
Requires(post):   /usr/bin/update-mime-database
Requires(postun): /usr/bin/update-mime-database

%description    data
%{summary}.


%package        demos
Summary:        Demo files for ParaView
Group:          Applications/Engineering
Requires:       %{name}-data = %{version}-%{release}

%description    demos
%{summary}.


%prep
%setup -q
%patch -p1 -b .tcltk
%patch1 -p1 -b .png
%patch2 -p1 -b .python
rm -rf Utilities/TclTk
sed -i -e 's,INSTALL_FILES(/man/,INSTALL_FILES(/share/man/,' Utilities/IceT/doc/man/CMakeLists.txt


%build
rm -rf fedora fedora-mpi
mkdir fedora
pushd fedora
export CC='gcc'
export CXX='g++'
export MAKE='make'
export CFLAGS="$RPM_OPT_FLAGS"
export CXXFLAGS="$RPM_OPT_FLAGS"
cmake .. \
        -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
        -DPV_INSTALL_LIB_DIR:PATH=/%{_lib}/paraview-2.4 \
        -DCMAKE_SKIP_RPATH:BOOL=ON \
        -DBUILD_SHARED_LIBS:BOOL=ON \
        -DCMAKE_CXX_COMPILER:FILEPATH=$CXX \
        -DCMAKE_C_COMPILER:FILEPATH=$CC \
        -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
        -DTCL_LIBRARY:PATH=tcl \
        -DTK_LIBRARY:PATH=tk \
        -DPARAVIEW_USE_SYSTEM_HDF5:BOOL=ON \
        -DVTK_USE_MAGLED_MESA:BOOL=ON \
        -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \
        -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \
        -DVTK_USE_SYSTEM_JPEG:BOOL=ON \
        -DVTK_USE_SYSTEM_PNG:BOOL=ON \
        -DVTK_USE_SYSTEM_TIFF:BOOL=ON \
        -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \
        -DBUILD_DOCUMENTATION:BOOL=ON \
        -DBUILD_EXAMPLES:BOOL=ON
# Broken at the moment
#        -DPARAVIEW_WRAP_PYTHON:BOOL=ON \
#
make
popd
mkdir fedora-mpi
pushd fedora-mpi
export CC='gcc'
export CXX='g++'
export MAKE='make'
export CFLAGS="$RPM_OPT_FLAGS"
export CXXFLAGS="$RPM_OPT_FLAGS"
cmake .. \
        -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
        -DPV_INSTALL_LIB_DIR:PATH=/%{_lib}/paraview-2.4-mpi \
        -DCMAKE_SKIP_RPATH:BOOL=ON \
        -DBUILD_SHARED_LIBS:BOOL=ON \
        -DCMAKE_CXX_COMPILER:FILEPATH=$CXX \
        -DCMAKE_C_COMPILER:FILEPATH=$CC \
        -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
        -DTCL_LIBRARY:PATH=tcl \
        -DTK_LIBRARY:PATH=tk \
        -DPARAVIEW_USE_SYSTEM_HDF5: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_USE_MAGLED_MESA:BOOL=ON \
        -DVTK_USE_SYSTEM_EXPAT:BOOL=ON \
        -DVTK_USE_SYSTEM_FREETYPE:BOOL=ON \
        -DVTK_USE_SYSTEM_JPEG:BOOL=ON \
        -DVTK_USE_SYSTEM_PNG:BOOL=ON \
        -DVTK_USE_SYSTEM_TIFF:BOOL=ON \
        -DVTK_USE_SYSTEM_ZLIB:BOOL=ON \
        -DBUILD_DOCUMENTATION:BOOL=ON \
        -DBUILD_EXAMPLES:BOOL=ON
# Broken at the moment
#        -DPARAVIEW_WRAP_PYTHON:BOOL=ON \
#
make


%install
rm -rf $RPM_BUILD_ROOT

#Fix permissions
find . \( -name \*.txt -o -name \*.xml -o -name '*.[ch]' -o -name '*.[ch][px][px]' \) -print0 | xargs -0 chmod -x

# Create some needed directories
install -d $RPM_BUILD_ROOT%{_datadir}/applications
install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -m644 %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/pixmaps
install -d $RPM_BUILD_ROOT%{_datadir}/mime/packages
install -m644 %SOURCE2 $RPM_BUILD_ROOT%{_datadir}/mime/packages

# Install mpi version
pushd fedora-mpi
make install DESTDIR=$RPM_BUILD_ROOT
#Get rid of useless man and cmake files
rm -rf $RPM_BUILD_ROOT%{_mandir}
rm $RPM_BUILD_ROOT%{_libdir}/paraview-2.4-mpi/*ICET*cmake
cat > paraview-mpi.desktop <<EOF
[Desktop Entry]
Encoding=UTF-8
Name=ParaView Viewer MPI
GenericName=Data Viewer
Comment=ParaView allows MPI enabled viewing of large data sets
Type=Application
Terminal=false
Icon=paraview_22x22.png
MimeType=application/x-paraview
Categories=Application;Graphics;
Exec=mpirun C paraview-mpi
EOF

desktop-file-install --vendor=fedora \
       --add-category=X-Fedora \
       --dir %{buildroot}%{_datadir}/applications/ \
       paraview-mpi.desktop

popd

#Move the mpi binaries out of the way
pushd $RPM_BUILD_ROOT/%{_bindir}
for f in *
do
   mv $f ${f}-mpi
done
popd

#Install the normal version
pushd fedora
make install DESTDIR=$RPM_BUILD_ROOT
cat > paraview.desktop <<EOF
[Desktop Entry]
Encoding=UTF-8
Name=ParaView Viewer
GenericName=Data Viewer
Comment=ParaView allows viewing of large data sets
Type=Application
Terminal=false
Icon=paraview_22x22.png
MimeType=application/x-paraview
Categories=Application;Graphics;
Exec=paraview
EOF

desktop-file-install --vendor=fedora \
       --add-category=X-Fedora \
       --dir %{buildroot}%{_datadir}/applications/ \
       paraview.desktop

popd


%clean
rm -rf $RPM_BUILD_ROOT


%post
update-desktop-database &> /dev/null ||:

%postun
update-desktop-database &> /dev/null ||:


%post   mpi
update-desktop-database &> /dev/null ||:

%postun mpi
update-desktop-database &> /dev/null ||:


%post   data
update-mime-database %{_datadir}/mime &> /dev/null || :

%postun data
update-mime-database %{_datadir}/mime &> /dev/null || :


%files
%defattr(-,root,root,-)
%doc Copyright.txt README.html
%{_bindir}/paraview
%{_bindir}/pvbatch
%{_bindir}/pvclient
%{_bindir}/pvdataserver
#%{_bindir}/pvpython
%{_bindir}/pvrenderserver
%{_bindir}/pvserver
%{_datadir}/applications/fedora-paraview.desktop
%{_libdir}/paraview-2.4/


%files mpi
%defattr(-,root,root,-)
%doc Copyright.txt README.html
%{_bindir}/paraview-mpi
%{_bindir}/pvbatch-mpi
%{_bindir}/pvclient-mpi
%{_bindir}/pvdataserver-mpi
#%{_bindir}/pvpython-mpi
%{_bindir}/pvrenderserver-mpi
%{_bindir}/pvserver-mpi
%{_datadir}/applications/fedora-paraview-mpi.desktop
%{_libdir}/paraview-2.4-mpi/


%files data
%defattr(-,root,root,-)
%{_datadir}/paraview-2.4/
%exclude %{_datadir}/paraview-2.4/Demos
%{_datadir}/pixmaps/paraview_22x22.png
%{_datadir}/mime/packages/paraview.xml


%files demos
%defattr(-,root,root,-)
%{_datadir}/paraview-2.4/Demos/


%changelog
* Wed Apr 12 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.3-5
- Cleanup permissions

* Mon Apr 10 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.3-4
- Add icon and cleanup desktop file

* Mon Apr 10 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.3-3
- Add VTK_USE_MANGLE_MESA for off screen rendering
- Cleanup source permisions
- Add an initial .desktop file
- Make requirement on -data specific to version
- Don't package Ice-T man pages and cmake files

* Thu Apr  6 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.3-2
- Add mpi version

* Tue Apr  4 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.3-1
- Initial Fedora Extras version


--- NEW FILE paraview.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
    <mime-type type="application/x-paraview">
        <comment xml:lang="en">ParaView Document</comment>
        <glob pattern="*.pvd" />
        <glob pattern="*.pvs" />
        <glob pattern="*.vti" />
        <glob pattern="*.vtp" />
        <glob pattern="*.vts" />
        <glob pattern="*.vtu" />
  </mime-type>
</mime-info>


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/paraview/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	16 Apr 2006 01:38:05 -0000	1.1
+++ .cvsignore	16 Apr 2006 01:44:53 -0000	1.2
@@ -0,0 +1 @@
+paraview-2.4.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/paraview/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	16 Apr 2006 01:38:05 -0000	1.1
+++ sources	16 Apr 2006 01:44:53 -0000	1.2
@@ -0,0 +1 @@
+db4e6974d8bba12de8a50748161b3f42  paraview-2.4.3.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 16 04:25:53 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 15 Apr 2006 21:25:53 -0700
Subject: rpms/ularn/devel ularn-drop-setgid.patch, 1.1, 1.2 ularn.spec, 1.2,
	1.3
Message-ID: <200604160425.k3G4PuUv025059@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/ularn/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25037

Modified Files:
	ularn-drop-setgid.patch ularn.spec 
Log Message:
Update setgid patch to prevent closing the scoreboard file after writing it.  This file might get written multiple times during the game.



ularn-drop-setgid.patch:

Index: ularn-drop-setgid.patch
===================================================================
RCS file: /cvs/extras/rpms/ularn/devel/ularn-drop-setgid.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ularn-drop-setgid.patch	17 Mar 2006 18:12:24 -0000	1.1
+++ ularn-drop-setgid.patch	16 Apr 2006 04:25:53 -0000	1.2
@@ -1,6 +1,6 @@
 diff -Naur Ularn/data.c Ularn.new/data.c
---- Ularn/data.c	2006-03-16 13:40:53.000000000 -0800
-+++ Ularn.new/data.c	2006-03-16 13:39:41.000000000 -0800
+--- Ularn/data.c	2006-04-15 20:53:51.000000000 -0700
++++ Ularn.new/data.c	2006-04-15 20:52:46.000000000 -0700
 @@ -5,6 +5,7 @@
  
  char *libdir = LIBDIR;
@@ -10,8 +10,8 @@
  /* the game save filename   */
  char savefilename[MAXPATHLEN];
 diff -Naur Ularn/extern.h Ularn.new/extern.h
---- Ularn/extern.h	2006-03-16 13:40:53.000000000 -0800
-+++ Ularn.new/extern.h	2006-03-16 13:42:26.000000000 -0800
+--- Ularn/extern.h	2006-04-15 20:53:51.000000000 -0700
++++ Ularn.new/extern.h	2006-04-15 20:52:47.000000000 -0700
 @@ -713,6 +713,7 @@
  	/************** extern decls for all data items **********/
  
@@ -21,8 +21,8 @@
  extern char ckpfile[], monstnamelist[];
  extern char larnlevels[],lastmonst[];
 diff -Naur Ularn/header.h Ularn.new/header.h
---- Ularn/header.h	2006-03-16 13:40:53.000000000 -0800
-+++ Ularn.new/header.h	2006-03-17 07:02:33.000000000 -0800
+--- Ularn/header.h	2006-04-15 20:53:51.000000000 -0700
++++ Ularn.new/header.h	2006-04-15 20:52:48.000000000 -0700
 @@ -6,6 +6,9 @@
  #include <sys/param.h>
  #include <sys/times.h>
@@ -34,8 +34,8 @@
  #  include <sys/timeb.h>
  #endif /* FTIMER */
 diff -Naur Ularn/main.c Ularn.new/main.c
---- Ularn/main.c	2006-03-16 13:40:53.000000000 -0800
-+++ Ularn.new/main.c	2006-03-17 07:02:35.000000000 -0800
+--- Ularn/main.c	2006-04-15 20:53:51.000000000 -0700
++++ Ularn.new/main.c	2006-04-15 20:52:48.000000000 -0700
 @@ -50,7 +50,22 @@
  	struct passwd *pwe,*getpwuid();
  	extern char *optarg;
@@ -69,7 +69,7 @@
  
 diff -Naur Ularn/scores.c Ularn.new/scores.c
 --- Ularn/scores.c	2001-11-16 10:13:28.000000000 -0800
-+++ Ularn.new/scores.c	2006-03-16 14:22:14.000000000 -0800
++++ Ularn.new/scores.c	2006-04-15 21:10:20.000000000 -0700
 @@ -145,8 +145,9 @@
  writeboard()
  {
@@ -81,7 +81,24 @@
  		lprcat("Can't open scorefile for writing\n"); 
  		lflush();
  		return(-1); 
-@@ -185,7 +186,7 @@
+@@ -164,7 +165,15 @@
+ 		return(-1); 
+ 	}
+ 	fflush(fp);
+-	fclose(fp);  
++	rewind(fp);
++        /* Don't close the scoreboard filehandle.  If we're running setgid
++         * then we won't be able to open it again, and we might have to
++         * write to it multiple times if the user wants to pay his taxes
++         * more than once in a game.
++         */
++	/*
++  	fclose(fp);  
++	*/
+ 	return(0);
+ }
+ 
+@@ -185,7 +194,7 @@
  	}
  	if (writeboard()) 
  		return(-1);


Index: ularn.spec
===================================================================
RCS file: /cvs/extras/rpms/ularn/devel/ularn.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ularn.spec	17 Mar 2006 18:22:17 -0000	1.2
+++ ularn.spec	16 Apr 2006 04:25:53 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           ularn
 Version:        1.5p4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Simple roguelike game
 
 Group:          Amusements/Games
@@ -92,6 +92,10 @@
 
 
 %changelog
+* Sat Apr 15 2006 Wart <wart at kobold.org> 1.5p4-5
+- Update setgid patch to prevent closing the scoreboard file after writing
+  it.  This file might get written multiple times during the game.
+
 * Fri Mar 17 2006 Wart <wart at kobold.org> 1.5p4-4
 - Updated setgid patch to prevent someone from regaining setgid
   privileges.



From fedora-extras-commits at redhat.com  Sun Apr 16 04:54:48 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 15 Apr 2006 21:54:48 -0700
Subject: rpms/ularn/FC-4 ularn-drop-setgid.patch,1.1,1.2 ularn.spec,1.2,1.3
Message-ID: <200604160454.k3G4soqV025160@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/ularn/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25123/FC-4

Modified Files:
	ularn-drop-setgid.patch ularn.spec 
Log Message:
Update setgid patch to prevent closing the scoreboard file after writing it.  This file might get written multiple times during the game.



ularn-drop-setgid.patch:

Index: ularn-drop-setgid.patch
===================================================================
RCS file: /cvs/extras/rpms/ularn/FC-4/ularn-drop-setgid.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ularn-drop-setgid.patch	17 Mar 2006 18:12:24 -0000	1.1
+++ ularn-drop-setgid.patch	16 Apr 2006 04:54:48 -0000	1.2
@@ -1,6 +1,6 @@
 diff -Naur Ularn/data.c Ularn.new/data.c
---- Ularn/data.c	2006-03-16 13:40:53.000000000 -0800
-+++ Ularn.new/data.c	2006-03-16 13:39:41.000000000 -0800
+--- Ularn/data.c	2006-04-15 20:53:51.000000000 -0700
++++ Ularn.new/data.c	2006-04-15 20:52:46.000000000 -0700
 @@ -5,6 +5,7 @@
  
  char *libdir = LIBDIR;
@@ -10,8 +10,8 @@
  /* the game save filename   */
  char savefilename[MAXPATHLEN];
 diff -Naur Ularn/extern.h Ularn.new/extern.h
---- Ularn/extern.h	2006-03-16 13:40:53.000000000 -0800
-+++ Ularn.new/extern.h	2006-03-16 13:42:26.000000000 -0800
+--- Ularn/extern.h	2006-04-15 20:53:51.000000000 -0700
++++ Ularn.new/extern.h	2006-04-15 20:52:47.000000000 -0700
 @@ -713,6 +713,7 @@
  	/************** extern decls for all data items **********/
  
@@ -21,8 +21,8 @@
  extern char ckpfile[], monstnamelist[];
  extern char larnlevels[],lastmonst[];
 diff -Naur Ularn/header.h Ularn.new/header.h
---- Ularn/header.h	2006-03-16 13:40:53.000000000 -0800
-+++ Ularn.new/header.h	2006-03-17 07:02:33.000000000 -0800
+--- Ularn/header.h	2006-04-15 20:53:51.000000000 -0700
++++ Ularn.new/header.h	2006-04-15 20:52:48.000000000 -0700
 @@ -6,6 +6,9 @@
  #include <sys/param.h>
  #include <sys/times.h>
@@ -34,8 +34,8 @@
  #  include <sys/timeb.h>
  #endif /* FTIMER */
 diff -Naur Ularn/main.c Ularn.new/main.c
---- Ularn/main.c	2006-03-16 13:40:53.000000000 -0800
-+++ Ularn.new/main.c	2006-03-17 07:02:35.000000000 -0800
+--- Ularn/main.c	2006-04-15 20:53:51.000000000 -0700
++++ Ularn.new/main.c	2006-04-15 20:52:48.000000000 -0700
 @@ -50,7 +50,22 @@
  	struct passwd *pwe,*getpwuid();
  	extern char *optarg;
@@ -69,7 +69,7 @@
  
 diff -Naur Ularn/scores.c Ularn.new/scores.c
 --- Ularn/scores.c	2001-11-16 10:13:28.000000000 -0800
-+++ Ularn.new/scores.c	2006-03-16 14:22:14.000000000 -0800
++++ Ularn.new/scores.c	2006-04-15 21:10:20.000000000 -0700
 @@ -145,8 +145,9 @@
  writeboard()
  {
@@ -81,7 +81,24 @@
  		lprcat("Can't open scorefile for writing\n"); 
  		lflush();
  		return(-1); 
-@@ -185,7 +186,7 @@
+@@ -164,7 +165,15 @@
+ 		return(-1); 
+ 	}
+ 	fflush(fp);
+-	fclose(fp);  
++	rewind(fp);
++        /* Don't close the scoreboard filehandle.  If we're running setgid
++         * then we won't be able to open it again, and we might have to
++         * write to it multiple times if the user wants to pay his taxes
++         * more than once in a game.
++         */
++	/*
++  	fclose(fp);  
++	*/
+ 	return(0);
+ }
+ 
+@@ -185,7 +194,7 @@
  	}
  	if (writeboard()) 
  		return(-1);


Index: ularn.spec
===================================================================
RCS file: /cvs/extras/rpms/ularn/FC-4/ularn.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ularn.spec	17 Mar 2006 18:22:17 -0000	1.2
+++ ularn.spec	16 Apr 2006 04:54:48 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           ularn
 Version:        1.5p4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Simple roguelike game
 
 Group:          Amusements/Games
@@ -92,6 +92,10 @@
 
 
 %changelog
+* Sat Apr 15 2006 Wart <wart at kobold.org> 1.5p4-5
+- Update setgid patch to prevent closing the scoreboard file after writing
+  it.  This file might get written multiple times during the game.
+
 * Fri Mar 17 2006 Wart <wart at kobold.org> 1.5p4-4
 - Updated setgid patch to prevent someone from regaining setgid
   privileges.



From fedora-extras-commits at redhat.com  Sun Apr 16 04:54:49 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 15 Apr 2006 21:54:49 -0700
Subject: rpms/ularn/FC-5 ularn-drop-setgid.patch,1.1,1.2 ularn.spec,1.2,1.3
Message-ID: <200604160454.k3G4spt9025168@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/ularn/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25123/FC-5

Modified Files:
	ularn-drop-setgid.patch ularn.spec 
Log Message:
Update setgid patch to prevent closing the scoreboard file after writing it.  This file might get written multiple times during the game.



ularn-drop-setgid.patch:

Index: ularn-drop-setgid.patch
===================================================================
RCS file: /cvs/extras/rpms/ularn/FC-5/ularn-drop-setgid.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ularn-drop-setgid.patch	17 Mar 2006 18:12:24 -0000	1.1
+++ ularn-drop-setgid.patch	16 Apr 2006 04:54:49 -0000	1.2
@@ -1,6 +1,6 @@
 diff -Naur Ularn/data.c Ularn.new/data.c
---- Ularn/data.c	2006-03-16 13:40:53.000000000 -0800
-+++ Ularn.new/data.c	2006-03-16 13:39:41.000000000 -0800
+--- Ularn/data.c	2006-04-15 20:53:51.000000000 -0700
++++ Ularn.new/data.c	2006-04-15 20:52:46.000000000 -0700
 @@ -5,6 +5,7 @@
  
  char *libdir = LIBDIR;
@@ -10,8 +10,8 @@
  /* the game save filename   */
  char savefilename[MAXPATHLEN];
 diff -Naur Ularn/extern.h Ularn.new/extern.h
---- Ularn/extern.h	2006-03-16 13:40:53.000000000 -0800
-+++ Ularn.new/extern.h	2006-03-16 13:42:26.000000000 -0800
+--- Ularn/extern.h	2006-04-15 20:53:51.000000000 -0700
++++ Ularn.new/extern.h	2006-04-15 20:52:47.000000000 -0700
 @@ -713,6 +713,7 @@
  	/************** extern decls for all data items **********/
  
@@ -21,8 +21,8 @@
  extern char ckpfile[], monstnamelist[];
  extern char larnlevels[],lastmonst[];
 diff -Naur Ularn/header.h Ularn.new/header.h
---- Ularn/header.h	2006-03-16 13:40:53.000000000 -0800
-+++ Ularn.new/header.h	2006-03-17 07:02:33.000000000 -0800
+--- Ularn/header.h	2006-04-15 20:53:51.000000000 -0700
++++ Ularn.new/header.h	2006-04-15 20:52:48.000000000 -0700
 @@ -6,6 +6,9 @@
  #include <sys/param.h>
  #include <sys/times.h>
@@ -34,8 +34,8 @@
  #  include <sys/timeb.h>
  #endif /* FTIMER */
 diff -Naur Ularn/main.c Ularn.new/main.c
---- Ularn/main.c	2006-03-16 13:40:53.000000000 -0800
-+++ Ularn.new/main.c	2006-03-17 07:02:35.000000000 -0800
+--- Ularn/main.c	2006-04-15 20:53:51.000000000 -0700
++++ Ularn.new/main.c	2006-04-15 20:52:48.000000000 -0700
 @@ -50,7 +50,22 @@
  	struct passwd *pwe,*getpwuid();
  	extern char *optarg;
@@ -69,7 +69,7 @@
  
 diff -Naur Ularn/scores.c Ularn.new/scores.c
 --- Ularn/scores.c	2001-11-16 10:13:28.000000000 -0800
-+++ Ularn.new/scores.c	2006-03-16 14:22:14.000000000 -0800
++++ Ularn.new/scores.c	2006-04-15 21:10:20.000000000 -0700
 @@ -145,8 +145,9 @@
  writeboard()
  {
@@ -81,7 +81,24 @@
  		lprcat("Can't open scorefile for writing\n"); 
  		lflush();
  		return(-1); 
-@@ -185,7 +186,7 @@
+@@ -164,7 +165,15 @@
+ 		return(-1); 
+ 	}
+ 	fflush(fp);
+-	fclose(fp);  
++	rewind(fp);
++        /* Don't close the scoreboard filehandle.  If we're running setgid
++         * then we won't be able to open it again, and we might have to
++         * write to it multiple times if the user wants to pay his taxes
++         * more than once in a game.
++         */
++	/*
++  	fclose(fp);  
++	*/
+ 	return(0);
+ }
+ 
+@@ -185,7 +194,7 @@
  	}
  	if (writeboard()) 
  		return(-1);


Index: ularn.spec
===================================================================
RCS file: /cvs/extras/rpms/ularn/FC-5/ularn.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ularn.spec	17 Mar 2006 18:22:17 -0000	1.2
+++ ularn.spec	16 Apr 2006 04:54:49 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           ularn
 Version:        1.5p4
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Simple roguelike game
 
 Group:          Amusements/Games
@@ -92,6 +92,10 @@
 
 
 %changelog
+* Sat Apr 15 2006 Wart <wart at kobold.org> 1.5p4-5
+- Update setgid patch to prevent closing the scoreboard file after writing
+  it.  This file might get written multiple times during the game.
+
 * Fri Mar 17 2006 Wart <wart at kobold.org> 1.5p4-4
 - Updated setgid patch to prevent someone from regaining setgid
   privileges.



From fedora-extras-commits at redhat.com  Sun Apr 16 12:30:25 2006
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Sun, 16 Apr 2006 05:30:25 -0700
Subject: rpms/wxGTK/devel wxGTK.spec,1.20,1.21
Message-ID: <200604161230.k3GCURvI010282@cvs-int.fedora.redhat.com>

Author: mattdm

Update of /cvs/extras/rpms/wxGTK/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10263

Modified Files:
	wxGTK.spec 
Log Message:
change mesa-libGL*-devel -> libGL*-devel



Index: wxGTK.spec
===================================================================
RCS file: /cvs/extras/rpms/wxGTK/devel/wxGTK.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- wxGTK.spec	13 Apr 2006 19:11:46 -0000	1.20
+++ wxGTK.spec	16 Apr 2006 12:30:24 -0000	1.21
@@ -6,7 +6,7 @@
 
 Name:           wxGTK
 Version:        2.6.3
-Release:        2.6.3.2.0%{?dist}
+Release:        2.6.3.2.1%{?dist}
 Summary:        GTK2 port of the wxWidgets GUI library
 # The wxWindows licence is the LGPL with a specific exemption allowing
 # distribution of derived binaries under any terms. (This will eventually
@@ -21,7 +21,7 @@
 BuildRequires:  gtk2-devel, zlib-devel >= 1.1.4
 BuildRequires:  libpng-devel, libjpeg-devel, libtiff-devel
 BuildRequires:  expat-devel, SDL-devel, libgnomeprintui22-devel
-BuildRequires:  mesa-libGL-devel, mesa-libGLU-devel
+BuildRequires:  libGL-devel, libGLU-devel
 %if %{withodbc}
 BuildRequires:  unixODBC-devel
 %endif
@@ -193,6 +193,9 @@
 %endif
 
 %changelog
+* Thu Apr 13 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3-2.6.3.2.1
+- oops -- forgot to change mesa-libGL*-devel -> libGL*-devel
+
 * Thu Apr 13 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3-2.6.3.2.0
 - patch to cvs subrelease 2.6.3.2 (matches wxPython)
 



From fedora-extras-commits at redhat.com  Sun Apr 16 12:36:42 2006
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Sun, 16 Apr 2006 05:36:42 -0700
Subject: rpms/wxPythonGTK2/FC-5 sources,1.2,NONE wxPython.spec,1.10,NONE
Message-ID: <200604161236.k3GCaiNC010389@cvs-int.fedora.redhat.com>

Author: mattdm

Update of /cvs/extras/rpms/wxPythonGTK2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10374

Removed Files:
	sources wxPython.spec 
Log Message:
Removing -- migrating package name back to just 'wxPython'



--- sources DELETED ---


--- wxPython.spec DELETED ---



From fedora-extras-commits at redhat.com  Sun Apr 16 16:26:55 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sun, 16 Apr 2006 09:26:55 -0700
Subject: rpms/epiphany-extensions/FC-5 .cvsignore, 1.9,
	1.10 epiphany-extensions.spec, 1.8, 1.9 sources, 1.9, 1.10
Message-ID: <200604161627.k3GGRRPn019472@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/epiphany-extensions/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19434/FC-5

Modified Files:
	.cvsignore epiphany-extensions.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	18 Feb 2006 03:18:58 -0000	1.9
+++ .cvsignore	16 Apr 2006 16:26:54 -0000	1.10
@@ -1,8 +1 @@
-epiphany-extensions-1.7.3.tar.bz2
-epiphany-extensions-1.7.4.tar.bz2
-epiphany-extensions-1.8.0.tar.bz2
-epiphany-extensions-1.8.1.tar.bz2
-epiphany-extensions-1.9.3.tar.bz2
-epiphany-extensions-1.9.4.tar.bz2
-epiphany-extensions-1.9.6.tar.bz2
-epiphany-extensions-1.9.7.tar.bz2
+epiphany-extensions-2.14.0.1.tar.bz2


Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/FC-5/epiphany-extensions.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- epiphany-extensions.spec	18 Feb 2006 03:18:58 -0000	1.8
+++ epiphany-extensions.spec	16 Apr 2006 16:26:54 -0000	1.9
@@ -1,17 +1,17 @@
-%define ephy_major 1.9
+%define ephy_major 2.14
 
 Summary: Extensions for Epiphany, the GNOME web browser.
 Name: epiphany-extensions
-Version: 1.9.7
+Version: 2.14.0.1
 Release: 1
 License: GPL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/extensions
-Source0: %{name}-%{version}.tar.bz2
+Source0: http://ftp.gnome.org/pub/GNOME/sources/epiphany-extensions/2.14/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires: epiphany-devel > %{ephy_major}
-Requires: epiphany > %{ephy_major}
+BuildRequires: epiphany-devel >= %{ephy_major}
+Requires: epiphany >= %{ephy_major}
 
 %description
 Epiphany Extensions is a collection of extensions for Epiphany, the
@@ -39,6 +39,9 @@
 %{_libdir}/epiphany
 
 %changelog
+* Sun Apr 16 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.14.0.1-1
+- Upstream update
+
 * Fri Feb 17 2006 Christopher Aillon <caillon at redhat.com> - 1.9.7-1
 - Update to 1.9.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	18 Feb 2006 03:18:58 -0000	1.9
+++ sources	16 Apr 2006 16:26:54 -0000	1.10
@@ -1 +1 @@
-e01b3e3f6226dd516f21a2f047f18c1e  epiphany-extensions-1.9.7.tar.bz2
+1b8ec450167010b25bba48295b5808cf  epiphany-extensions-2.14.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Sun Apr 16 16:26:55 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sun, 16 Apr 2006 09:26:55 -0700
Subject: rpms/epiphany-extensions/devel .cvsignore, 1.9,
	1.10 epiphany-extensions.spec, 1.8, 1.9 sources, 1.9, 1.10
Message-ID: <200604161627.k3GGRRuY019477@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/epiphany-extensions/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19434/devel

Modified Files:
	.cvsignore epiphany-extensions.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	18 Feb 2006 03:18:58 -0000	1.9
+++ .cvsignore	16 Apr 2006 16:26:55 -0000	1.10
@@ -1,8 +1 @@
-epiphany-extensions-1.7.3.tar.bz2
-epiphany-extensions-1.7.4.tar.bz2
-epiphany-extensions-1.8.0.tar.bz2
-epiphany-extensions-1.8.1.tar.bz2
-epiphany-extensions-1.9.3.tar.bz2
-epiphany-extensions-1.9.4.tar.bz2
-epiphany-extensions-1.9.6.tar.bz2
-epiphany-extensions-1.9.7.tar.bz2
+epiphany-extensions-2.14.1.tar.bz2


Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/epiphany-extensions.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- epiphany-extensions.spec	18 Feb 2006 03:18:58 -0000	1.8
+++ epiphany-extensions.spec	16 Apr 2006 16:26:55 -0000	1.9
@@ -1,17 +1,19 @@
-%define ephy_major 1.9
+%define ephy_major 2.14.1
 
 Summary: Extensions for Epiphany, the GNOME web browser.
 Name: epiphany-extensions
-Version: 1.9.7
+Version: 2.14.1
 Release: 1
 License: GPL
 Group: Applications/Internet
 URL: http://www.gnome.org/projects/epiphany/extensions
-Source0: %{name}-%{version}.tar.bz2
+Source0: http://ftp.gnome.org/pub/GNOME/sources/epiphany-extensions/2.14/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires: epiphany-devel > %{ephy_major}
-Requires: epiphany > %{ephy_major}
+BuildRequires: epiphany-devel >= %{ephy_major}
+Requires: epiphany >= %{ephy_major}
+Requires(post): scrollkeeper
+Requires(postun): scrollkeeper
 
 %description
 Epiphany Extensions is a collection of extensions for Epiphany, the
@@ -21,7 +23,7 @@
 %setup -q
 
 %build
-%configure --disable-compiler-warnings
+%configure --disable-compiler-warnings --disable-scrollkeeper
 %{__make} %{?_smp_mflags}
 
 %install
@@ -32,13 +34,24 @@
 %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
+* Sun Apr 16 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.14.1-1
+- Upstream update
+
 * Fri Feb 17 2006 Christopher Aillon <caillon at redhat.com> - 1.9.7-1
 - Update to 1.9.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/epiphany-extensions/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	18 Feb 2006 03:18:58 -0000	1.9
+++ sources	16 Apr 2006 16:26:55 -0000	1.10
@@ -1 +1 @@
-e01b3e3f6226dd516f21a2f047f18c1e  epiphany-extensions-1.9.7.tar.bz2
+8be9c522284b0a9d7ba2797e141cf26e  epiphany-extensions-2.14.1.tar.bz2



From fedora-extras-commits at redhat.com  Sun Apr 16 20:27:44 2006
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Sun, 16 Apr 2006 13:27:44 -0700
Subject: rpms/banshee/devel .cvsignore, 1.4, 1.5 banshee.spec, 1.7,
	1.8 sources, 1.4, 1.5
Message-ID: <200604162027.k3GKRkiZ028313@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/banshee/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28292

Modified Files:
	.cvsignore banshee.spec sources 
Log Message:
* Tue Mar 21 2006 Christopher Aillon <caillon at redhat.com> 0.10.9-1
- Update to 0.10.9



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/banshee/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	14 Mar 2006 16:57:31 -0000	1.4
+++ .cvsignore	16 Apr 2006 20:27:43 -0000	1.5
@@ -1 +1 @@
-banshee-0.10.8.tar.gz
+banshee-0.10.9.tar.gz


Index: banshee.spec
===================================================================
RCS file: /cvs/extras/rpms/banshee/devel/banshee.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- banshee.spec	14 Mar 2006 19:35:06 -0000	1.7
+++ banshee.spec	16 Apr 2006 20:27:43 -0000	1.8
@@ -1,5 +1,5 @@
 Name:    banshee
-Version: 0.10.8
+Version: 0.10.9
 Release: 1
 Summary: easily import, manage, and play selections from your music collection
 
@@ -96,6 +96,9 @@
 %exclude %{_libdir}/banshee/*.la
 
 %changelog
+* Tue Mar 21 2006 Christopher Aillon <caillon at redhat.com> 0.10.9-1
+- Update to 0.10.9
+
 * Tue Mar 14 2006 Christopher Aillon <caillon at redhat.com> 0.10.8-1
 - Update to 0.10.8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/banshee/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Mar 2006 16:57:31 -0000	1.4
+++ sources	16 Apr 2006 20:27:43 -0000	1.5
@@ -1 +1 @@
-cfa4051cd8aba171a09dcb9a3f34fef3  banshee-0.10.8.tar.gz
+86b67e399ea805f69a860b3e6fd4627f  banshee-0.10.9.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 16 20:30:49 2006
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Sun, 16 Apr 2006 13:30:49 -0700
Subject: rpms/banshee/FC-5 .cvsignore, 1.4, 1.5 banshee.spec, 1.7,
	1.8 sources, 1.4, 1.5
Message-ID: <200604162030.k3GKUq4i028406@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/banshee/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28385

Modified Files:
	.cvsignore banshee.spec sources 
Log Message:
* Tue Mar 21 2006 Christopher Aillon <caillon at redhat.com> 0.10.9-1
- Update to 0.10.9



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/banshee/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	14 Mar 2006 16:57:31 -0000	1.4
+++ .cvsignore	16 Apr 2006 20:30:49 -0000	1.5
@@ -1 +1 @@
-banshee-0.10.8.tar.gz
+banshee-0.10.9.tar.gz


Index: banshee.spec
===================================================================
RCS file: /cvs/extras/rpms/banshee/FC-5/banshee.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- banshee.spec	14 Mar 2006 19:35:06 -0000	1.7
+++ banshee.spec	16 Apr 2006 20:30:49 -0000	1.8
@@ -1,6 +1,6 @@
 Name:    banshee
-Version: 0.10.8
-Release: 1
+Version: 0.10.9
+Release: 1.%{?dist}
 Summary: easily import, manage, and play selections from your music collection
 
 Group:   Applications/Multimedia
@@ -96,6 +96,9 @@
 %exclude %{_libdir}/banshee/*.la
 
 %changelog
+* Tue Mar 21 2006 Christopher Aillon <caillon at redhat.com> 0.10.9-1
+- Update to 0.10.9
+
 * Tue Mar 14 2006 Christopher Aillon <caillon at redhat.com> 0.10.8-1
 - Update to 0.10.8
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/banshee/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Mar 2006 16:57:31 -0000	1.4
+++ sources	16 Apr 2006 20:30:49 -0000	1.5
@@ -1 +1 @@
-cfa4051cd8aba171a09dcb9a3f34fef3  banshee-0.10.8.tar.gz
+86b67e399ea805f69a860b3e6fd4627f  banshee-0.10.9.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 16 20:32:12 2006
From: fedora-extras-commits at redhat.com (Christopher Aillon (caillon))
Date: Sun, 16 Apr 2006 13:32:12 -0700
Subject: rpms/banshee/devel banshee.spec,1.8,1.9
Message-ID: <200604162032.k3GKWEBO028469@cvs-int.fedora.redhat.com>

Author: caillon

Update of /cvs/extras/rpms/banshee/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28452

Modified Files:
	banshee.spec 
Log Message:



Index: banshee.spec
===================================================================
RCS file: /cvs/extras/rpms/banshee/devel/banshee.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- banshee.spec	16 Apr 2006 20:27:43 -0000	1.8
+++ banshee.spec	16 Apr 2006 20:32:12 -0000	1.9
@@ -1,6 +1,6 @@
 Name:    banshee
 Version: 0.10.9
-Release: 1
+Release: 1.%{?dist}
 Summary: easily import, manage, and play selections from your music collection
 
 Group:   Applications/Multimedia



From fedora-extras-commits at redhat.com  Sun Apr 16 22:05:51 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 16 Apr 2006 15:05:51 -0700
Subject: rpms/koffice/FC-5 koffice-kexi-version.patch, NONE, 1.1 .cvsignore, 
	1.9, 1.10 koffice.spec, 1.34, 1.35 sources, 1.9, 1.10
Message-ID: <200604162205.k3GM5rRn000522@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv458/FC-5

Modified Files:
	.cvsignore koffice.spec sources 
Added Files:
	koffice-kexi-version.patch 
Log Message:
- version upgrade
- merge fc5 -> fc4


koffice-kexi-version.patch:

--- NEW FILE koffice-kexi-version.patch ---
--- kexi/kexi_version.h.orig	2006-04-14 23:09:52.000000000 +0200
+++ kexi/kexi_version.h	2006-04-14 23:16:07.000000000 +0200
@@ -30,12 +30,12 @@
 #endif
 
 #ifndef KEXI_VERSION_STRING
-# define KEXI_VERSION_STRING "1.0 rc1"
+# define KEXI_VERSION_STRING "1.0"
 #endif
 
-#define KEXI_VERSION_MAJOR 0
-#define KEXI_VERSION_MINOR 9
-#define KEXI_VERSION_RELEASE 98
+#define KEXI_VERSION_MAJOR 1
+#define KEXI_VERSION_MINOR 0
+#define KEXI_VERSION_RELEASE 0
 
 #define KEXI_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c))
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-5/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	30 Mar 2006 12:07:42 -0000	1.9
+++ .cvsignore	16 Apr 2006 22:05:51 -0000	1.10
@@ -1 +1 @@
-koffice-1.5.0-rc1.tar.bz2
+koffice-1.5.0.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-5/koffice.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- koffice.spec	31 Mar 2006 08:22:02 -0000	1.34
+++ koffice.spec	16 Apr 2006 22:05:51 -0000	1.35
@@ -1,17 +1,17 @@
 Name:           koffice
 Version:        1.5.0
-Release:        0.1.rc1%{?dist}
+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/unstable/koffice-1.5-rc1/src/koffice-1.5.0-rc1.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-1.5.0.tar.bz2
 Source100:      koshell.png
 
 # stuff for the build configuration
 Patch0:         koffice-admin-gcc4isok.patch
-Patch1:         koffice-filters-krita-tiff.patch
+Patch1:         koffice-kexi-version.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # BuildRequires: world-devel ;)
@@ -78,6 +78,8 @@
 Requires:       koffice-krita
 Requires:       koffice-kugar
 Requires:       koffice-kexi
+Requires:       koffice-kexi-driver-mysql
+Requires:       koffice-kexi-driver-pgsql
 Requires:       koffice-kchart
 Requires:       koffice-kformula
 Requires:       koffice-filters
@@ -171,6 +173,23 @@
 
 %description kexi
 %{summary}
+For additional database drivers take a look at %{name}-kexi-driver-*
+
+%package kexi-driver-mysql
+Summary:        mysql-driver for kexi
+Group:          Applications/Productivity
+Requires:       %{name}-kexi = %{version}-%{release}
+
+%description kexi-driver-mysql
+%{summary}
+
+%package kexi-driver-pgsql
+Summary:        pgsql-driver for kexi
+Group:          Applications/Productivity
+Requires:       %{name}-kexi = %{version}-%{release}
+
+%description kexi-driver-pgsql
+%{summary}
 
 %package kchart
 Summary:        An integrated graph and chart drawing tool
@@ -206,9 +225,9 @@
 %{summary}
 
 %prep
-%setup -q -n %{name}-%{version}-rc1
+%setup -q
 %patch0 -p1
-%patch1 -p4
+%patch1
 
 # this will make sure that patch0 is considered
 make -f admin/Makefile.common
@@ -221,7 +240,7 @@
 --with-qt-libraries=$QTDIR/lib --with-extra-libs=%{_libdir} \
 --with-pgsqllibdir=%{_libdir} --with-pgsqlincdir=%{_includedir} \
 --with-pqxxlibdir=%{_libdir} --with-pqxxincdir=%{_includedir} \
---enable-final --enable-kexi-reports
+--enable-final
 
 make
 
@@ -351,13 +370,6 @@
   --delete-original \
   $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kugar.desktop
 
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kudesigner.desktop
-
 #kchart
 desktop-file-install \
   --vendor=fedora \
@@ -513,6 +525,8 @@
 %{_datadir}/apps/kofficewidgets/pics/kounitdoublespinbox2.png
 %{_datadir}/apps/kofficewidgets/pics/kounitdoublespincombobox.png
 %{_datadir}/apps/kross
+%{_libdir}/kde3/krosspython.*
+%{_libdir}/kde3/krossruby.*
 # why is this still here on fc5 and not on devel?
 %exclude %{_datadir}/mimelnk/image/x-raw.desktop
 
@@ -693,6 +707,7 @@
 %{_libdir}/kde3/libkritatiffexport.*
 %{_libdir}/kde3/libkritatiffimport.*
 %{_libdir}/kde3/kritaperftest.*
+%{_libdir}/kde3/krosskritacore.*
 %{_datadir}/apps/krita
 %{_datadir}/services/krita*.desktop
 %{_datadir}/servicetypes/krita*.desktop
@@ -718,7 +733,8 @@
 %{_datadir}/doc/HTML/en/kugar
 %{_datadir}/services/kugar*.desktop
 %{_datadir}/applications/fedora-kugar.desktop
-%{_datadir}/applications/fedora-kudesigner.desktop
+# this not being fedorarized fixes #173086
+%{_datadir}/applnk/Office/kudesigner.desktop
 
 %files kexi
 %defattr(-,root,root,-)
@@ -740,13 +756,9 @@
 %{_libdir}/libkexisql3.so.*
 %{_libdir}/libkformdesigner.so.*
 %{_libdir}/libkexiutils.so.*
-%{_libdir}/libkexireportutils.so.*
-%{_libdir}/kde3/kexihandler_report.*
-%{_libdir}/kde3/kexireportwidgets.*
 %{_libdir}/kde3/kformdesigner_containers.*
 %{_libdir}/kde3/kformdesigner_kexidbwidgets.*
 %{_libdir}/kde3/kformdesigner_stdwidgets.*
-%{_libdir}/kde3/kexidb_mysqldriver.*
 %{_libdir}/kde3/kexidb_sqlite2driver.*
 %{_libdir}/kde3/kexidb_sqlite3driver.*
 %{_libdir}/kde3/kexihandler_form.*
@@ -755,16 +767,10 @@
 %{_libdir}/kde3/kexihandler_relation.*
 %{_libdir}/kde3/kexihandler_script.*
 %{_libdir}/kde3/kexihandler_table.*
-%{_libdir}/kde3/keximigrate_mysql.*
 %{_libdir}/kde3/kexi.*
-%{_libdir}/kde3/kexidb_pqxxsqldriver.*
-%{_libdir}/kde3/keximigrate_pqxx.*
 %{_libdir}/kde3/kexihandler_csv_importexport.*
 %{_libdir}/kde3/krosskexiapp.*
 %{_libdir}/kde3/krosskexidb.*
-%{_libdir}/kde3/krosskritacore.*
-%{_libdir}/kde3/krosspython.*
-%{_libdir}/kde3/krossruby.*
 %{_libdir}/libkrossapi.so.*
 %{_libdir}/libkrossmain.so.*
 %{_datadir}/config/kexirc
@@ -772,14 +778,25 @@
 %{_datadir}/mimelnk/application/*
 %{_datadir}/servicetypes/kexi*.desktop
 %{_datadir}/services/kexi
-%{_datadir}/services/kexidb*
-%{_datadir}/services/keximigrate_mysql.desktop
-%{_datadir}/services/keximigrate_pqxx.desktop
 %{_datadir}/apps/kexi
 %{_datadir}/services/kformdesigner/*
 %{_datadir}/doc/HTML/en/kexi
 %{_datadir}/applications/fedora-kexi.desktop
+%{_datadir}/services/kexidb_sqlite*driver.desktop
+
+%files kexi-driver-mysql
+%defattr(-,root,root,-)
+%{_libdir}/kde3/kexidb_mysqldriver.*
+%{_libdir}/kde3/keximigrate_mysql.*
+%{_datadir}/services/keximigrate_mysql.desktop
+%{_datadir}/services/kexidb_mysqldriver.desktop
 
+%files kexi-driver-pgsql
+%defattr(-,root,root,-)
+%{_libdir}/kde3/kexidb_pqxxsqldriver.*
+%{_libdir}/kde3/keximigrate_pqxx.*
+%{_datadir}/services/kexidb_pqxxsqldriver.desktop
+%{_datadir}/services/keximigrate_pqxx.desktop
 
 %files kchart
 %defattr(-,root,root,-)
@@ -896,6 +913,12 @@
 %{_datadir}/applications/fedora-kplato.desktop
 
 %changelog
+* Fri Apr 14 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.5.0-1
+- split out kexi-drivers  (#188746) and fix some related issues
+- fix #173086
+- upgrade to final
+
 * Thu Mar 30 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.5.0-0.1.rc1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	30 Mar 2006 12:07:42 -0000	1.9
+++ sources	16 Apr 2006 22:05:51 -0000	1.10
@@ -1 +1 @@
-e9346977d18c67185d5b50f49ee8225b  koffice-1.5.0-rc1.tar.bz2
+220b6bde28b5ebd5c6621bc87ca2c05f  koffice-1.5.0.tar.bz2



From fedora-extras-commits at redhat.com  Sun Apr 16 22:05:51 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 16 Apr 2006 15:05:51 -0700
Subject: rpms/koffice/FC-4 .cvsignore, 1.6, 1.7 koffice.spec, 1.11,
	1.12 sources, 1.6, 1.7 koffice-CAN-2005-3193.diff, 1.1,
	NONE koffice-krita-kisfilter.patch, 1.1, NONE
Message-ID: <200604162205.k3GM5rR3000516@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv458/FC-4

Modified Files:
	.cvsignore koffice.spec sources 
Removed Files:
	koffice-CAN-2005-3193.diff koffice-krita-kisfilter.patch 
Log Message:
- version upgrade
- merge fc5 -> fc4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	15 Oct 2005 23:11:32 -0000	1.6
+++ .cvsignore	16 Apr 2006 22:05:51 -0000	1.7
@@ -1 +1 @@
-koffice-1.4.2.tar.bz2
+koffice-1.5.0.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-4/koffice.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- koffice.spec	13 Dec 2005 09:55:00 -0000	1.11
+++ koffice.spec	16 Apr 2006 22:05:51 -0000	1.12
@@ -1,20 +1,17 @@
 Name:           koffice
-Version:        1.4.2
-Release:        2%{?dist}
+Version:        1.5.0
+Release:        1%{?dist}
 Summary:        A free, integrated office suite for KDE
 
 Group:          Applications/Productivity
 License:        GPL/LGPL
 URL:            http://www.koffice.org/
-Source0:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-1.4.2.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-1.5.0.tar.bz2
 Source100:      koshell.png
 
 # stuff for the build configuration
 Patch0:         koffice-admin-gcc4isok.patch
-# CAN-2005-3193 see #175260
-Patch1:         koffice-CAN-2005-3193.diff
-
-Patch100:       koffice-krita-kisfilter.patch
+Patch1:         koffice-kexi-version.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # BuildRequires: world-devel ;)
@@ -55,6 +52,12 @@
 BuildRequires:  doxygen
 BuildRequires:  graphviz-devel
 BuildRequires:  aspell-devel
+BuildRequires:  libacl-devel
+BuildRequires:  libxslt-devel
+BuildRequires:  OpenEXR-devel
+BuildRequires:  libexif-devel
+BuildRequires:  readline-devel
+BuildRequires:  ruby ruby-devel
 
 %description
 KOffice - Integrated Office Suite
@@ -74,9 +77,12 @@
 Requires:       koffice-krita
 Requires:       koffice-kugar
 Requires:       koffice-kexi
+Requires:       koffice-kexi-driver-mysql
+Requires:       koffice-kexi-driver-pgsql
 Requires:       koffice-kchart
 Requires:       koffice-kformula
 Requires:       koffice-filters
+Requires:       koffice-kplato
 
 %description suite
 KOffice - Integrated Office Suite
@@ -129,6 +135,7 @@
 Summary:        A flowcharting application
 Group:          Applications/Productivity
 Requires:       %{name}-core = %{version}-%{release}
+Requires:       kdegraphics
 Obsoletes:      kivio
 
 %description kivio
@@ -165,6 +172,23 @@
 
 %description kexi
 %{summary}
+For additional database drivers take a look at %{name}-kexi-driver-*
+
+%package kexi-driver-mysql
+Summary:        mysql-driver for kexi
+Group:          Applications/Productivity
+Requires:       %{name}-kexi = %{version}-%{release}
+
+%description kexi-driver-mysql
+%{summary}
+
+%package kexi-driver-pgsql
+Summary:        pgsql-driver for kexi
+Group:          Applications/Productivity
+Requires:       %{name}-kexi = %{version}-%{release}
+
+%description kexi-driver-pgsql
+%{summary}
 
 %package kchart
 Summary:        An integrated graph and chart drawing tool
@@ -191,11 +215,18 @@
 %description filters
 %{summary}
 
+%package kplato
+Summary:         An integrated project management and planning tool
+Group:           Applications/Productivity
+Requires:        %{name}-core = %{version}-%{release}
+
+%description kplato
+%{summary}
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1
-%patch100
 
 # this will make sure that patch0 is considered
 make -f admin/Makefile.common
@@ -207,7 +238,8 @@
 --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}
+--with-pqxxlibdir=%{_libdir} --with-pqxxincdir=%{_includedir} \
+--enable-final
 
 make
 
@@ -247,14 +279,6 @@
   --delete-original \
   $RPM_BUILD_ROOT%{_datadir}/applnk/Office/koshell.desktop
 
-# kformdesigner
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/kformdesigner.desktop
-
 #kword
 desktop-file-install \
   --vendor=fedora \
@@ -300,22 +324,50 @@
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category=X-Fedora \
   --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/krita.desktop
+  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/krita_jpeg.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
+  $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/kudesigner.desktop
+  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kugar.desktop
 
 #kchart
 desktop-file-install \
@@ -347,7 +399,17 @@
   --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
   --add-category=X-Fedora \
   --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applications/kde/kexi.desktop
+  $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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -388,33 +450,38 @@
 %post filters -p /sbin/ldconfig
 %postun filters -p /sbin/ldconfig 
 
+%post kplato -p /sbin/ldconfig
+%postun kplato -p /sbin/ldconfig
+
 %files suite
 #empty => virtual package
 
 %files core
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING.LIB README
-%{_bindir}/koscript
 %{_bindir}/koshell
 %{_bindir}/kthesaurus
 %{_bindir}/koconverter
-%{_libdir}/libkdeinit_koshell.*
-%{_libdir}/libkdeinit_kthesaurus.*
-%{_libdir}/libkdchart.*
-%{_libdir}/libkochart.*
-%{_libdir}/libkofficecore.*
-%{_libdir}/libkofficeui.*
-%{_libdir}/libkoscript.*
-%{_libdir}/libkotext.*
-%{_libdir}/libkowmf.*
-%{_libdir}/libkopainter.*
-%{_libdir}/libkstore.*
-%{_libdir}/libkwmailmerge_interface.*
-%{_libdir}/libkwmf.*
-%{_libdir}/libkdeinit_kformula.*
-%{_libdir}/libkformulalib.*
+%{_libdir}/libkdeinit_koshell.so
+%{_libdir}/libkdeinit_kthesaurus.so
+%{_libdir}/libkdchart.so.*
+%{_libdir}/libkochart.so.*
+%{_libdir}/libkofficecore.so.*
+%{_libdir}/libkofficeui.so.*
+%{_libdir}/libkotext.so.*
+%{_libdir}/libkowmf.so.*
+%{_libdir}/libkopainter.so.*
+%{_libdir}/libkstore.so.*
+%{_libdir}/libkwmailmerge_interface.so.*
+%{_libdir}/libkwmf.so.*
+%{_libdir}/libkdeinit_kformula.so
+%{_libdir}/libkformulalib.so.*
+%{_libdir}/libkopalette.so.*
+%{_libdir}/libkoproperty.so.*
 %{_libdir}/kde3/kfile_koffice.*
 %{_libdir}/kde3/kfile_ooo.*
+%{_libdir}/kde3/kfile_abiword.*
+%{_libdir}/kde3/kfile_gnumeric.*
 %{_libdir}/kde3/kodocinfopropspage.*
 %{_libdir}/kde3/kofficescan.*
 %{_libdir}/kde3/kofficethumbnail.*
@@ -452,15 +519,26 @@
 %{_datadir}/servicetypes/widgetfactory.desktop
 %{_datadir}/applications/fedora-KThesaurus.desktop
 %{_datadir}/applications/fedora-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
+%{_libdir}/kde3/krosspython.*
+%{_libdir}/kde3/krossruby.*
+# why is this still here on fc5 and not on devel?
+%exclude %{_datadir}/mimelnk/image/x-raw.desktop
 
 %files devel
 %{_includedir}/*
 %{_datadir}/doc/HTML/en/koffice-apidocs
+%{_libdir}/*.so
 
 %files kword
 %defattr(-,root,root,-)
 %{_bindir}/kword
-%{_libdir}/libkdeinit_kword.*
+%{_libdir}/libkdeinit_kword.so
+%{_libdir}/libkwordprivate.so.*
 %{_libdir}/kde3/libkwordpart.*
 %{_libdir}/kde3/kword.*
 %{_datadir}/apps/kword
@@ -474,8 +552,8 @@
 %files kspread
 %defattr(-,root,root,-)
 %{_bindir}/kspread
-%{_libdir}/libkdeinit_kspread.*
-%{_libdir}/libkspreadcommon.*
+%{_libdir}/libkdeinit_kspread.so
+%{_libdir}/libkspreadcommon.so.*
 %{_libdir}/kde3/kspread.*
 %{_libdir}/kde3/libkspreadpart.*
 %{_libdir}/kde3/kwmailmerge_kspread.*
@@ -499,10 +577,19 @@
 %defattr(-,root,root,-)
 %{_bindir}/kpresenter
 %{_bindir}/kprconverter.pl
-%{_libdir}/libkdeinit_kpresenter.*
+%{_libdir}/libkdeinit_kpresenter.so
+%{_libdir}/libkpresenterimageexport.so.*
+%{_libdir}/libkpresenterprivate.so.*
 %{_libdir}/kde3/libkpresenterpart.*
 %{_libdir}/kde3/kformula.*
 %{_libdir}/kde3/kpresenter.*
+%{_libdir}/kde3/libkpresenterbmpexport.*
+%{_libdir}/kde3/libkpresenterjpegexport.*
+%{_libdir}/kde3/libkpresentermngexport.*
+%{_libdir}/kde3/libkpresenterpngexport.*
+%{_libdir}/kde3/libkpresentersvgexport.*
+%{_libdir}/kde3/libkpresenterxbmexport.*
+%{_libdir}/kde3/libkpresenterxpmexport.*
 %{_datadir}/apps/kpresenter
 %{_datadir}/doc/HTML/en/kpresenter
 %{_datadir}/services/kpresenter*.desktop
@@ -513,9 +600,9 @@
 %files karbon
 %defattr(-,root,root,-)
 %{_bindir}/karbon
-%{_libdir}/libkdeinit_karbon.*
-%{_libdir}/libkarbonbase.*
-%{_libdir}/libkarboncommon.*
+%{_libdir}/libkdeinit_karbon.so
+%{_libdir}/libkarboncommon.so.*
+%{_libdir}/kde3/karbon_defaulttools.*
 %{_libdir}/kde3/karbon_flattenpathplugin.*
 %{_libdir}/kde3/karbon_imagetoolplugin.*
 %{_libdir}/kde3/karbon_insertknotsplugin.*
@@ -540,12 +627,25 @@
 %{_datadir}/templates/Illustration.desktop
 %{_datadir}/templates/.source/Illustration.karbon
 %{_datadir}/applications/fedora-karbon.desktop
+%{_datadir}/doc/HTML/en/karbon/
 
 %files krita
 %defattr(-,root,root,-)
 %{_bindir}/krita
-%{_libdir}/libkdeinit_krita.*
-%{_libdir}/libkritacommon.*
+%{_libdir}/libkdeinit_krita.so
+%{_libdir}/libkrita_cmyk_u16.so.*
+%{_libdir}/libkrita_gray_u16.so.*
+%{_libdir}/libkrita_lms_f32.so.*
+%{_libdir}/libkrita_rgb_f16half.so.*
+%{_libdir}/libkrita_rgb_f32.so.*
+%{_libdir}/libkrita_rgb_u16.so.*
+%{_libdir}/libkritacolor.so.*
+%{_libdir}/libkritagrayscale.so.*
+%{_libdir}/libkritaimage.so.*
+%{_libdir}/libkritargb.so.*
+%{_libdir}/libkritascripting.so.*
+%{_libdir}/libkritaui.so.*
+%{_libdir}/libkritacommon.so.*
 %{_libdir}/kde3/kritacimg.*
 %{_libdir}/kde3/kritacolorrange.*
 %{_libdir}/kde3/kritacolorsfilters.*
@@ -575,20 +675,54 @@
 %{_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.*
+%{_libdir}/kde3/krita_rgb_f16half_plugin.*
+%{_libdir}/kde3/krita_rgb_f32_plugin.*
+%{_libdir}/kde3/krita_rgb_u16_plugin.*
+%{_libdir}/kde3/kritabumpmap.*
+%{_libdir}/kde3/kritacmykplugin.*
+%{_libdir}/kde3/kritadropshadow.*
+%{_libdir}/kde3/kritafiltersgallery.*
+%{_libdir}/kde3/kritahistogramdocker.*
+%{_libdir}/kde3/kritaimageenhancement.*
+%{_libdir}/kde3/kritapixelizefilter.*
+%{_libdir}/kde3/kritaroundcornersfilter.*
+%{_libdir}/kde3/kritascripting.*
+%{_libdir}/kde3/kritaseparatechannels.*
+%{_libdir}/kde3/kritasmalltilesfilter.*
+%{_libdir}/kde3/kritasmearybrush.*
+%{_libdir}/kde3/kritasobelfilter.*
+%{_libdir}/kde3/kritatoolselectsimilar.*
+%{_libdir}/kde3/kritawetplugin.*
+%{_libdir}/kde3/libkrita_openexr_export.*
+%{_libdir}/kde3/libkrita_openexr_import.*
+%{_libdir}/kde3/libkrita_raw_import.*
+%{_libdir}/kde3/libkritajpegexport.*
+%{_libdir}/kde3/libkritajpegimport.*
+%{_libdir}/kde3/libkritapngexport.*
+%{_libdir}/kde3/libkritapngimport.*
+%{_libdir}/kde3/libkritatiffexport.*
+%{_libdir}/kde3/libkritatiffimport.*
+%{_libdir}/kde3/kritaperftest.*
+%{_libdir}/kde3/krosskritacore.*
 %{_datadir}/apps/krita
 %{_datadir}/services/krita*.desktop
 %{_datadir}/servicetypes/krita*.desktop
-%{_datadir}/applications/fedora-krita.desktop
-%{_datadir}/applications/fedora-krita_magick.desktop
+%{_datadir}/applications/fedora-krita*.desktop
+%{_datadir}/apps/kritaplugins
+%{_datadir}/doc/HTML/en/krita
+%{_datadir}/servicetypes/karbon_module.desktop
 
 %files kugar
 %defattr(-,root,root,-)
 %{_bindir}/kugar
 %{_bindir}/kudesigner
-%{_libdir}/libkdeinit_kugar.*
-%{_libdir}/libkdeinit_kudesigner.*
-%{_libdir}/libkugarlib.*
-%{_libdir}/libkudesignercore.*
+%{_libdir}/libkdeinit_kugar.so
+%{_libdir}/libkdeinit_kudesigner.so
+%{_libdir}/libkugarlib.so.*
+%{_libdir}/libkudesignercore.so
 %{_libdir}/kde3/kudesigner.*
 %{_libdir}/kde3/kugar.*
 %{_libdir}/kde3/libkudesignerpart.*
@@ -598,71 +732,86 @@
 %{_datadir}/doc/HTML/en/kugar
 %{_datadir}/services/kugar*.desktop
 %{_datadir}/applications/fedora-kugar.desktop
-%{_datadir}/applications/fedora-kudesigner.desktop
+# this not being fedorarized fixes #173086
+%{_datadir}/applnk/Office/kudesigner.desktop
 
 %files kexi
 %defattr(-,root,root,-)
 %{_bindir}/kexi
-%{_bindir}/keximigratetest
-%{_bindir}/kformdesigner
 %{_bindir}/ksqlite*
-%{_libdir}/libkdeinit_kexi.*
-%{_libdir}/libkexicore.*
-%{_libdir}/libkexidatatable.*
-%{_libdir}/libkexidbparser.*
-%{_libdir}/libkexidb.*
-%{_libdir}/libkexiextendedwidgets.*
-%{_libdir}/libkexiformutils.*
-%{_libdir}/libkexiguiutils.*
-%{_libdir}/libkeximain.*
-%{_libdir}/libkeximigrate.*
-%{_libdir}/libkexipropertyeditor.*
-%{_libdir}/libkexirelationsview.*
-%{_libdir}/libkexisql2.*
-%{_libdir}/libkexisql3.*
-%{_libdir}/libkformdesigner.*
-%{_libdir}/kde3/kexidb_mysqldriver.*
+%{_bindir}/krossrunner
+%{_libdir}/libkdeinit_kexi.so
+%{_libdir}/libkexicore.so.*
+%{_libdir}/libkexidatatable.so.*
+%{_libdir}/libkexidbparser.so.*
+%{_libdir}/libkexidb.so.*
+%{_libdir}/libkexiextendedwidgets.so.*
+%{_libdir}/libkexiformutils.so.*
+%{_libdir}/libkexiguiutils.so.*
+%{_libdir}/libkeximain.so.*
+%{_libdir}/libkeximigrate.so.*
+%{_libdir}/libkexirelationsview.so.*
+%{_libdir}/libkexisql2.so.*
+%{_libdir}/libkexisql3.so.*
+%{_libdir}/libkformdesigner.so.*
+%{_libdir}/libkexiutils.so.*
+%{_libdir}/kde3/kformdesigner_containers.*
+%{_libdir}/kde3/kformdesigner_kexidbwidgets.*
+%{_libdir}/kde3/kformdesigner_stdwidgets.*
 %{_libdir}/kde3/kexidb_sqlite2driver.*
 %{_libdir}/kde3/kexidb_sqlite3driver.*
-%{_libdir}/kde3/kexidbwidgets.*
 %{_libdir}/kde3/kexihandler_form.*
 %{_libdir}/kde3/kexihandler_migration.*
 %{_libdir}/kde3/kexihandler_query.*
 %{_libdir}/kde3/kexihandler_relation.*
 %{_libdir}/kde3/kexihandler_script.*
 %{_libdir}/kde3/kexihandler_table.*
-%{_libdir}/kde3/keximigrate_mysql.*
 %{_libdir}/kde3/kexi.*
-%{_libdir}/kde3/libkformdesigner_part.*
-%{_libdir}/kde3/kexidb_pqxxsqldriver.*
-%{_libdir}/kde3/keximigrate_pqxx.*
-%{_libdir}/kde3/containers.*
-%{_libdir}/kde3/stdwidgets.*
+%{_libdir}/kde3/kexihandler_csv_importexport.*
+%{_libdir}/kde3/krosskexiapp.*
+%{_libdir}/kde3/krosskexidb.*
+%{_libdir}/libkrossapi.so.*
+%{_libdir}/libkrossmain.so.*
 %{_datadir}/config/kexirc
 %{_datadir}/config/magic/kexi.magic
 %{_datadir}/mimelnk/application/*
 %{_datadir}/servicetypes/kexi*.desktop
 %{_datadir}/services/kexi
-%{_datadir}/services/kexidb*
-%{_datadir}/services/keximigrate_mysql.desktop
-%{_datadir}/services/keximigrate_pqxx.desktop
 %{_datadir}/apps/kexi
-%{_datadir}/apps/kformdesigner
-%{_datadir}/apps/kformdesigner_part
 %{_datadir}/services/kformdesigner/*
-%{_datadir}/services/kformdesigner_part.desktop
-%{_datadir}/applications/fedora-kformdesigner.desktop
+%{_datadir}/doc/HTML/en/kexi
 %{_datadir}/applications/fedora-kexi.desktop
+%{_datadir}/services/kexidb_sqlite*driver.desktop
+
+%files kexi-driver-mysql
+%defattr(-,root,root,-)
+%{_libdir}/kde3/kexidb_mysqldriver.*
+%{_libdir}/kde3/keximigrate_mysql.*
+%{_datadir}/services/keximigrate_mysql.desktop
+%{_datadir}/services/kexidb_mysqldriver.desktop
+
+%files kexi-driver-pgsql
+%defattr(-,root,root,-)
+%{_libdir}/kde3/kexidb_pqxxsqldriver.*
+%{_libdir}/kde3/keximigrate_pqxx.*
+%{_datadir}/services/kexidb_pqxxsqldriver.desktop
+%{_datadir}/services/keximigrate_pqxx.desktop
 
 %files kchart
 %defattr(-,root,root,-)
 %{_bindir}/kchart
-%{_libdir}/libkchartcommon.*
-%{_libdir}/libkdeinit_kchart.*
+%{_libdir}/libkchartcommon.so.*
+%{_libdir}/libkdeinit_kchart.so
+%{_libdir}/libkchartimageexport.so.*
 %{_libdir}/kde3/kchart.*
 %{_libdir}/kde3/libkchartpart.*
 %{_libdir}/kde3/libkchartpngexport.*
 %{_libdir}/kde3/libkchartsvgexport.*
+%{_libdir}/kde3/libkchartbmpexport.*
+%{_libdir}/kde3/libkchartjpegexport.*
+%{_libdir}/kde3/libkchartmngexport.*
+%{_libdir}/kde3/libkchartxbmexport.*
+%{_libdir}/kde3/libkchartxpmexport.*
 %{_datadir}/apps/kchart
 %{_datadir}/services/kchart*.desktop
 %{_datadir}/doc/HTML/en/kchart
@@ -681,16 +830,17 @@
 %files kivio
 %defattr(-,root,root,-)
 %{_bindir}/kivio
-%{_libdir}/libkdeinit_kivio.*
-%{_libdir}/libkiviocommon.*
-%{_libdir}/libkivioconnectortool.*
-%{_libdir}/libkivioselecttool.*
-%{_libdir}/libkiviotargettool.*
-%{_libdir}/libkiviotexttool.*
-%{_libdir}/libkiviozoomtool.*
+%{_libdir}/libkdeinit_kivio.so
+%{_libdir}/libkiviocommon.so.*
 %{_libdir}/kde3/kivio.*
 %{_libdir}/kde3/libkiviopart.*
 %{_libdir}/kde3/straight_connector.*
+%{_libdir}/kde3/libkivioconnectortool.*
+%{_libdir}/kde3/libkivioimageexport.*
+%{_libdir}/kde3/libkivioselecttool.*
+%{_libdir}/kde3/libkiviotargettool.*
+%{_libdir}/kde3/libkiviotexttool.*
+%{_libdir}/kde3/libkiviozoomtool.*
 %{_datadir}/apps/kivio
 %{_datadir}/config.kcfg/kivio.kcfg
 %{_datadir}/doc/HTML/en/kivio
@@ -699,7 +849,7 @@
 
 %files filters
 %defattr(-,root,root,-)
-%{_libdir}/libkwordexportfilters.*
+%{_libdir}/libkwordexportfilters.so.*
 %{_libdir}/kde3/libabiwordexport.*
 %{_libdir}/kde3/libabiwordimport.*
 %{_libdir}/kde3/libamiproexport.*
@@ -725,7 +875,6 @@
 %{_libdir}/kde3/libkwordlatexexport.*
 %{_libdir}/kde3/libmswriteexport.*
 %{_libdir}/kde3/libmswriteimport.*
-%{_libdir}/kde3/libolefilter.*
 %{_libdir}/kde3/libooimpressexport.*
 %{_libdir}/kde3/libooimpressimport.*
 %{_libdir}/kde3/liboowriterexport.*
@@ -742,25 +891,84 @@
 %{_libdir}/kde3/libmswordimport.*
 %{_libdir}/kde3/libxsltimport.*
 %{_libdir}/kde3/libxsltexport.*
+%{_libdir}/kde3/libhancomwordimport.*
+%{_libdir}/kde3/libkfosvgexport.*
+%{_libdir}/kde3/liboodrawimport.*
+%{_libdir}/kde3/libpowerpointimport.*
 %{_datadir}/apps/xsltfilter
 %{_datadir}/services/generic_filter.desktop
-%{_datadir}/services/ole*.desktop
 %{_datadir}/services/xslt*.desktop
 %{_datadir}/servicetypes/kofilter*.desktop
 
+%files kplato
+%defattr(-,root,root,-)
+%{_bindir}/kplato
+%{_libdir}/libkdeinit_kplato.so
+%{_libdir}/kde3/kplato.*
+%{_libdir}/kde3/libkplatopart.*
+%{_datadir}/apps/kplato
+%{_datadir}/doc/HTML/en/kplato
+%{_datadir}/services/kplatopart.desktop
+%{_datadir}/applications/fedora-kplato.desktop
+
 %changelog
+* Fri Apr 14 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.5.0-1
+- split out kexi-drivers  (#188746) and fix some related issues
+- fix #173086
+- upgrade to final
+
+* Thu Mar 30 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.5.0-0.1.rc1
+- version upgrade
+
+* Mon Mar 13 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.4.95-1
+- version upgrade
+
+* Sun Feb 26 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.4.90-4
+- kivio requires kdegraphics (#182289)
+
+* Wed Feb 08 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.4.90-3
+- exclude mimelnk/image/x-raw.desktop (#180335)
+
+* Mon Feb 06 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.4.90-2
+- enable ruby again (bug #179835)
+
+* Wed Feb 01 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.4.90-1
+- version upgrade
+- better split libdir/*.so -> -devel, libdir/*.so.* -> packages
+  libdir/*.la -> trash; libdir/.* -> packages
+
 * Thu Dec 08 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
-1.4.2-2
+1.4.2-3
 - fix CAN-2005-3193
-- add compile patch for krita
+- gcc 4.1.0:
+    - add krita compile fixes
+    - add kspread compile fixes
+    - add kexi compile fixes
 
-* Fri Oct 14 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+* Thu Nov 10 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.4.2-2
+- remove xorg-x11-devel BR
+- rebuild
+
+* Sun Oct 16 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.4.2-1
 - version upgrade
 
 * Wed Sep 28 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.4.1-6
+- add patch for qt-3.3.5 problem
+- get devel working
+
+* Tue Sep 27 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.4.1-5
-- rebuild
+- try to fix devel build
 
 * Tue Aug 16 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.4.1-4


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	15 Oct 2005 23:11:32 -0000	1.6
+++ sources	16 Apr 2006 22:05:51 -0000	1.7
@@ -1 +1 @@
-6b456fb7d54c84b11396b27a96ae0cf8  koffice-1.4.2.tar.bz2
+220b6bde28b5ebd5c6621bc87ca2c05f  koffice-1.5.0.tar.bz2


--- koffice-CAN-2005-3193.diff DELETED ---


--- koffice-krita-kisfilter.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Apr 16 22:05:52 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 16 Apr 2006 15:05:52 -0700
Subject: rpms/koffice/devel koffice-kexi-version.patch, NONE, 1.1 .cvsignore,
	1.9, 1.10 koffice.spec, 1.33, 1.34 sources, 1.9,
	1.10 koffice-filters-krita-tiff.patch, 1.1, NONE
Message-ID: <200604162205.k3GM5sLt000530@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv458/devel

Modified Files:
	.cvsignore koffice.spec sources 
Added Files:
	koffice-kexi-version.patch 
Removed Files:
	koffice-filters-krita-tiff.patch 
Log Message:
- version upgrade
- merge fc5 -> fc4


koffice-kexi-version.patch:

--- NEW FILE koffice-kexi-version.patch ---
--- kexi/kexi_version.h.orig	2006-04-14 23:09:52.000000000 +0200
+++ kexi/kexi_version.h	2006-04-14 23:16:07.000000000 +0200
@@ -30,12 +30,12 @@
 #endif
 
 #ifndef KEXI_VERSION_STRING
-# define KEXI_VERSION_STRING "1.0 rc1"
+# define KEXI_VERSION_STRING "1.0"
 #endif
 
-#define KEXI_VERSION_MAJOR 0
-#define KEXI_VERSION_MINOR 9
-#define KEXI_VERSION_RELEASE 98
+#define KEXI_VERSION_MAJOR 1
+#define KEXI_VERSION_MINOR 0
+#define KEXI_VERSION_RELEASE 0
 
 #define KEXI_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c))
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	30 Mar 2006 12:07:43 -0000	1.9
+++ .cvsignore	16 Apr 2006 22:05:52 -0000	1.10
@@ -1 +1 @@
-koffice-1.5.0-rc1.tar.bz2
+koffice-1.5.0.tar.bz2


Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- koffice.spec	30 Mar 2006 12:07:43 -0000	1.33
+++ koffice.spec	16 Apr 2006 22:05:52 -0000	1.34
@@ -1,17 +1,17 @@
 Name:           koffice
 Version:        1.5.0
-Release:        0.1.rc1%{?dist}
+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/unstable/koffice-1.5-rc1/src/koffice-1.5.0-rc1.tar.bz2
+Source0:        ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-1.5.0.tar.bz2
 Source100:      koshell.png
 
 # stuff for the build configuration
 Patch0:         koffice-admin-gcc4isok.patch
-Patch1:         koffice-filters-krita-tiff.patch
+Patch1:         koffice-kexi-version.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # BuildRequires: world-devel ;)
@@ -78,6 +78,8 @@
 Requires:       koffice-krita
 Requires:       koffice-kugar
 Requires:       koffice-kexi
+Requires:       koffice-kexi-driver-mysql
+Requires:       koffice-kexi-driver-pgsql
 Requires:       koffice-kchart
 Requires:       koffice-kformula
 Requires:       koffice-filters
@@ -171,6 +173,23 @@
 
 %description kexi
 %{summary}
+For additional database drivers take a look at %{name}-kexi-driver-*
+
+%package kexi-driver-mysql
+Summary:        mysql-driver for kexi
+Group:          Applications/Productivity
+Requires:       %{name}-kexi = %{version}-%{release}
+
+%description kexi-driver-mysql
+%{summary}
+
+%package kexi-driver-pgsql
+Summary:        pgsql-driver for kexi
+Group:          Applications/Productivity
+Requires:       %{name}-kexi = %{version}-%{release}
+
+%description kexi-driver-pgsql
+%{summary}
 
 %package kchart
 Summary:        An integrated graph and chart drawing tool
@@ -206,9 +225,9 @@
 %{summary}
 
 %prep
-%setup -q -n %{name}-%{version}-rc1
+%setup -q
 %patch0 -p1
-%patch1 -p4
+%patch1
 
 # this will make sure that patch0 is considered
 make -f admin/Makefile.common
@@ -221,7 +240,7 @@
 --with-qt-libraries=$QTDIR/lib --with-extra-libs=%{_libdir} \
 --with-pgsqllibdir=%{_libdir} --with-pgsqlincdir=%{_includedir} \
 --with-pqxxlibdir=%{_libdir} --with-pqxxincdir=%{_includedir} \
---enable-final --enable-kexi-reports
+--enable-final
 
 make
 
@@ -351,13 +370,6 @@
   --delete-original \
   $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kugar.desktop
 
-desktop-file-install \
-  --vendor=fedora \
-  --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category=X-Fedora \
-  --delete-original \
-  $RPM_BUILD_ROOT%{_datadir}/applnk/Office/kudesigner.desktop
-
 #kchart
 desktop-file-install \
   --vendor=fedora \
@@ -513,6 +525,10 @@
 %{_datadir}/apps/kofficewidgets/pics/kounitdoublespinbox2.png
 %{_datadir}/apps/kofficewidgets/pics/kounitdoublespincombobox.png
 %{_datadir}/apps/kross
+%{_libdir}/kde3/krosspython.*
+%{_libdir}/kde3/krossruby.*
+# why is this still here on fc5 and not on devel?
+%exclude %{_datadir}/mimelnk/image/x-raw.desktop
 
 %files devel
 %{_includedir}/*
@@ -691,6 +707,7 @@
 %{_libdir}/kde3/libkritatiffexport.*
 %{_libdir}/kde3/libkritatiffimport.*
 %{_libdir}/kde3/kritaperftest.*
+%{_libdir}/kde3/krosskritacore.*
 %{_datadir}/apps/krita
 %{_datadir}/services/krita*.desktop
 %{_datadir}/servicetypes/krita*.desktop
@@ -716,7 +733,8 @@
 %{_datadir}/doc/HTML/en/kugar
 %{_datadir}/services/kugar*.desktop
 %{_datadir}/applications/fedora-kugar.desktop
-%{_datadir}/applications/fedora-kudesigner.desktop
+# this not being fedorarized fixes #173086
+%{_datadir}/applnk/Office/kudesigner.desktop
 
 %files kexi
 %defattr(-,root,root,-)
@@ -738,13 +756,9 @@
 %{_libdir}/libkexisql3.so.*
 %{_libdir}/libkformdesigner.so.*
 %{_libdir}/libkexiutils.so.*
-%{_libdir}/libkexireportutils.so.*
-%{_libdir}/kde3/kexihandler_report.*
-%{_libdir}/kde3/kexireportwidgets.*
 %{_libdir}/kde3/kformdesigner_containers.*
 %{_libdir}/kde3/kformdesigner_kexidbwidgets.*
 %{_libdir}/kde3/kformdesigner_stdwidgets.*
-%{_libdir}/kde3/kexidb_mysqldriver.*
 %{_libdir}/kde3/kexidb_sqlite2driver.*
 %{_libdir}/kde3/kexidb_sqlite3driver.*
 %{_libdir}/kde3/kexihandler_form.*
@@ -753,16 +767,10 @@
 %{_libdir}/kde3/kexihandler_relation.*
 %{_libdir}/kde3/kexihandler_script.*
 %{_libdir}/kde3/kexihandler_table.*
-%{_libdir}/kde3/keximigrate_mysql.*
 %{_libdir}/kde3/kexi.*
-%{_libdir}/kde3/kexidb_pqxxsqldriver.*
-%{_libdir}/kde3/keximigrate_pqxx.*
 %{_libdir}/kde3/kexihandler_csv_importexport.*
 %{_libdir}/kde3/krosskexiapp.*
 %{_libdir}/kde3/krosskexidb.*
-%{_libdir}/kde3/krosskritacore.*
-%{_libdir}/kde3/krosspython.*
-%{_libdir}/kde3/krossruby.*
 %{_libdir}/libkrossapi.so.*
 %{_libdir}/libkrossmain.so.*
 %{_datadir}/config/kexirc
@@ -770,14 +778,25 @@
 %{_datadir}/mimelnk/application/*
 %{_datadir}/servicetypes/kexi*.desktop
 %{_datadir}/services/kexi
-%{_datadir}/services/kexidb*
-%{_datadir}/services/keximigrate_mysql.desktop
-%{_datadir}/services/keximigrate_pqxx.desktop
 %{_datadir}/apps/kexi
 %{_datadir}/services/kformdesigner/*
 %{_datadir}/doc/HTML/en/kexi
 %{_datadir}/applications/fedora-kexi.desktop
+%{_datadir}/services/kexidb_sqlite*driver.desktop
+
+%files kexi-driver-mysql
+%defattr(-,root,root,-)
+%{_libdir}/kde3/kexidb_mysqldriver.*
+%{_libdir}/kde3/keximigrate_mysql.*
+%{_datadir}/services/keximigrate_mysql.desktop
+%{_datadir}/services/kexidb_mysqldriver.desktop
 
+%files kexi-driver-pgsql
+%defattr(-,root,root,-)
+%{_libdir}/kde3/kexidb_pqxxsqldriver.*
+%{_libdir}/kde3/keximigrate_pqxx.*
+%{_datadir}/services/kexidb_pqxxsqldriver.desktop
+%{_datadir}/services/keximigrate_pqxx.desktop
 
 %files kchart
 %defattr(-,root,root,-)
@@ -894,6 +913,12 @@
 %{_datadir}/applications/fedora-kplato.desktop
 
 %changelog
+* Fri Apr 14 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.5.0-1
+- split out kexi-drivers  (#188746) and fix some related issues
+- fix #173086
+- upgrade to final
+
 * Thu Mar 30 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.5.0-0.1.rc1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	30 Mar 2006 12:07:43 -0000	1.9
+++ sources	16 Apr 2006 22:05:52 -0000	1.10
@@ -1 +1 @@
-e9346977d18c67185d5b50f49ee8225b  koffice-1.5.0-rc1.tar.bz2
+220b6bde28b5ebd5c6621bc87ca2c05f  koffice-1.5.0.tar.bz2


--- koffice-filters-krita-tiff.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Apr 16 22:10:10 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 16 Apr 2006 15:10:10 -0700
Subject: rpms/wine-docs/FC-5 .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 wine-docs.spec, 1.8, 1.9
Message-ID: <200604162210.k3GMAgL4000660@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-serv580/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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	3 Apr 2006 08:44:29 -0000	1.8
+++ .cvsignore	16 Apr 2006 22:10:10 -0000	1.9
@@ -1 +1 @@
-wine-docs-0.9.11.tar.bz2
+wine-docs-0.9.12.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	3 Apr 2006 08:44:29 -0000	1.8
+++ sources	16 Apr 2006 22:10:10 -0000	1.9
@@ -1 +1 @@
-a9de221c2a1442270f4eec1066379598  wine-docs-0.9.11.tar.bz2
+cc53497878f78681e85219eff2bf67ae  wine-docs-0.9.12.tar.bz2


Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-5/wine-docs.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wine-docs.spec	3 Apr 2006 08:44:29 -0000	1.8
+++ wine-docs.spec	16 Apr 2006 22:10:10 -0000	1.9
@@ -1,12 +1,12 @@
 Name:           wine-docs
-Version:        0.9.11
+Version:        0.9.12
 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.11.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.12.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
+* Fri Apr 14 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.12-1
+- version upgrade
+
 * Mon Apr 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.11-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sun Apr 16 22:10:08 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 16 Apr 2006 15:10:08 -0700
Subject: rpms/wine-docs/FC-3 .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 wine-docs.spec, 1.11, 1.12
Message-ID: <200604162210.k3GMAeiL000652@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-serv580/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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	3 Apr 2006 08:44:27 -0000	1.8
+++ .cvsignore	16 Apr 2006 22:10:08 -0000	1.9
@@ -1 +1 @@
-wine-docs-0.9.11.tar.bz2
+wine-docs-0.9.12.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-3/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	3 Apr 2006 08:44:27 -0000	1.8
+++ sources	16 Apr 2006 22:10:08 -0000	1.9
@@ -1 +1 @@
-a9de221c2a1442270f4eec1066379598  wine-docs-0.9.11.tar.bz2
+cc53497878f78681e85219eff2bf67ae  wine-docs-0.9.12.tar.bz2


Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-3/wine-docs.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- wine-docs.spec	3 Apr 2006 08:44:27 -0000	1.11
+++ wine-docs.spec	16 Apr 2006 22:10:08 -0000	1.12
@@ -1,12 +1,12 @@
 Name:           wine-docs
-Version:        0.9.11
+Version:        0.9.12
 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.11.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.12.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
+* Fri Apr 14 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.12-1
+- version upgrade
+
 * Mon Apr 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.11-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sun Apr 16 22:10:09 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 16 Apr 2006 15:10:09 -0700
Subject: rpms/wine-docs/FC-4 .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 wine-docs.spec, 1.12, 1.13
Message-ID: <200604162210.k3GMAfV6000657@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-serv580/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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	3 Apr 2006 08:44:28 -0000	1.8
+++ .cvsignore	16 Apr 2006 22:10:09 -0000	1.9
@@ -1 +1 @@
-wine-docs-0.9.11.tar.bz2
+wine-docs-0.9.12.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-4/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	3 Apr 2006 08:44:28 -0000	1.8
+++ sources	16 Apr 2006 22:10:09 -0000	1.9
@@ -1 +1 @@
-a9de221c2a1442270f4eec1066379598  wine-docs-0.9.11.tar.bz2
+cc53497878f78681e85219eff2bf67ae  wine-docs-0.9.12.tar.bz2


Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/FC-4/wine-docs.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- wine-docs.spec	3 Apr 2006 08:44:28 -0000	1.12
+++ wine-docs.spec	16 Apr 2006 22:10:09 -0000	1.13
@@ -1,12 +1,12 @@
 Name:           wine-docs
-Version:        0.9.11
+Version:        0.9.12
 Release:        0.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.11.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.12.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 BuildRequires:  docbook-utils-pdf
@@ -46,6 +46,10 @@
 %doc en/*pdf en/*ps en/*txt en/*html COPYING.LIB
 
 %changelog
+* Sat Apr 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.12-0.1
+- version upgrade
+
 * Mon Apr 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.11-0.1
 - version upgrade



From fedora-extras-commits at redhat.com  Sun Apr 16 22:10:10 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sun, 16 Apr 2006 15:10:10 -0700
Subject: rpms/wine-docs/devel .cvsignore, 1.8, 1.9 sources, 1.8,
	1.9 wine-docs.spec, 1.8, 1.9
Message-ID: <200604162210.k3GMAgu3000665@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine-docs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv580/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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	3 Apr 2006 08:44:29 -0000	1.8
+++ .cvsignore	16 Apr 2006 22:10:10 -0000	1.9
@@ -1 +1 @@
-wine-docs-0.9.11.tar.bz2
+wine-docs-0.9.12.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	3 Apr 2006 08:44:29 -0000	1.8
+++ sources	16 Apr 2006 22:10:10 -0000	1.9
@@ -1 +1 @@
-a9de221c2a1442270f4eec1066379598  wine-docs-0.9.11.tar.bz2
+cc53497878f78681e85219eff2bf67ae  wine-docs-0.9.12.tar.bz2


Index: wine-docs.spec
===================================================================
RCS file: /cvs/extras/rpms/wine-docs/devel/wine-docs.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- wine-docs.spec	3 Apr 2006 08:44:29 -0000	1.8
+++ wine-docs.spec	16 Apr 2006 22:10:10 -0000	1.9
@@ -1,12 +1,12 @@
 Name:           wine-docs
-Version:        0.9.11
+Version:        0.9.12
 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.11.tar.bz2
+Source0:        http://ibiblio.org/pub/linux/system/emulators/wine/wine-docs-0.9.12.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
+* Fri Apr 14 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.12-1
+- version upgrade
+
 * Mon Apr 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.11-1
 - version upgrade



From fedora-extras-commits at redhat.com  Mon Apr 17 04:08:44 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sun, 16 Apr 2006 21:08:44 -0700
Subject: rpms/deskbar-applet/devel .cvsignore, 1.11, 1.12 deskbar-applet.spec,
	1.22, 1.23 sources, 1.11, 1.12
Message-ID: <200604170408.k3H48kDU014170@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/deskbar-applet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14149

Modified Files:
	.cvsignore deskbar-applet.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	13 Apr 2006 15:57:33 -0000	1.11
+++ .cvsignore	17 Apr 2006 04:08:44 -0000	1.12
@@ -1 +1 @@
-deskbar-applet-2.14.1.tar.bz2
+deskbar-applet-2.14.1.1.tar.bz2


Index: deskbar-applet.spec
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/deskbar-applet.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- deskbar-applet.spec	13 Apr 2006 15:57:33 -0000	1.22
+++ deskbar-applet.spec	17 Apr 2006 04:08:44 -0000	1.23
@@ -2,7 +2,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python}%{pyver} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           deskbar-applet
-Version:        2.14.1
+Version:        2.14.1.1
 Release:        1%{?dist}
 
 Summary:        A Gnome applet to allow easy access to various search engines
@@ -12,8 +12,6 @@
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/deskbar-applet/2.14/%{name}-%{version}.tar.bz2
 Source1:        fedorabz.py
 Source2:        fedorabz.png
-Patch0:         deskbar-applet-2.14.1-artdir.patch
-Patch1:         deskbar-applet-2.14.1-beagleexists.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gtk2-devel python-devel pygtk2-devel gnome-python2-extras gettext evolution-data-server-devel gnome-desktop-devel libSM-devel gnome-python2-applet
 Requires:       gnome-python2 gnome-python2-applet gnome-python2-bonobo gnome-python2-gconf pygtk2
@@ -33,11 +31,9 @@
 
 %prep
 %setup -q
-%patch -p1 -b .artdir
-%patch1 -p1 -b .beagleexists
 
 %build
-%configure
+%configure --disable-schemas-install
 make %{_smp_mflags}
 
 %install
@@ -89,6 +85,9 @@
 %{_datadir}/pixmaps/%{name}.svg
 
 %changelog
+* Mon Apr 17 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.14.1.1-1
+- Upstream update
+
 * Thu Apr 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 2.14.1-1
 - Upstream update
 - Decoupled the BZ handler from the upstream tarball


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/deskbar-applet/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	13 Apr 2006 15:57:33 -0000	1.11
+++ sources	17 Apr 2006 04:08:44 -0000	1.12
@@ -1 +1 @@
-040bf4dd834005142a5a716bf76c2f20  deskbar-applet-2.14.1.tar.bz2
+9264c4cf5eaab4ac99009aea393d30ff  deskbar-applet-2.14.1.1.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 17 08:38:32 2006
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Mon, 17 Apr 2006 01:38:32 -0700
Subject: rpms/paps/devel paps-makefile.patch, NONE, 1.1 .cvsignore, 1.6,
	1.7 paps.spec, 1.8, 1.9 sources, 1.6,
	1.7 paps-0.6.1-makefile.patch, 1.1,
	NONE paps-0.6.3-fix-pagesize.patch, 1.1,
	NONE paps-0.6.3-goption.patch, 1.1, NONE paps-0.6.3-header.patch,
	1.2, NONE
Message-ID: <200604170838.k3H8cYIh025600@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/rpms/paps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25576

Modified Files:
	.cvsignore paps.spec sources 
Added Files:
	paps-makefile.patch 
Removed Files:
	paps-0.6.1-makefile.patch paps-0.6.3-fix-pagesize.patch 
	paps-0.6.3-goption.patch paps-0.6.3-header.patch 
Log Message:
* Mon Apr 17 2006 Akira TAGOH <tagoh at redhat.com> - 0.6.5-1
- New upstream release.
  - paps-0.6.3-fix-pagesize.patch: removed. it has been merged in upstream.
  - paps-0.6.3-goption.patch: removed. it has been merged in upstream.
  - paps-0.6.3-header.patch: removed. it has been merged in upstream.
- paps-makefile.patch: rework to be applied.

paps-makefile.patch:

--- NEW FILE paps-makefile.patch ---
diff -ruN paps-0.6.5.orig/doc/Makefile.am paps-0.6.5/doc/Makefile.am
--- paps-0.6.5.orig/doc/Makefile.am	2005-12-21 04:35:35.000000000 +0900
+++ paps-0.6.5/doc/Makefile.am	2006-04-17 17:28:52.000000000 +0900
@@ -10,7 +10,7 @@
 
 EXTRA_DIST = Doxyfile example-output.png mainpage.h
 
-htmldir = share/doc/libpaps/html
-install-data-hook:
-	mkdir -p $(prefix)/$(htmldir)
-	cp -dpR doxygen-html/* $(prefix)/$(htmldir)
+htmldir = $(datadir)/doc/paps-$(VERSION)/html
+#install-data-hook:
+#	mkdir -p $(prefix)/$(htmldir)
+#	cp -dpR doxygen-html/* $(prefix)/$(htmldir)
diff -ruN paps-0.6.5.orig/src/Makefile.am paps-0.6.5/src/Makefile.am
--- paps-0.6.5.orig/src/Makefile.am	2006-04-17 15:04:13.000000000 +0900
+++ paps-0.6.5/src/Makefile.am	2006-04-17 17:30:01.000000000 +0900
@@ -1,5 +1,5 @@
 man_MANS = paps.1
-lib_LIBRARIES = libpaps.a
+noinst_LIBRARIES = libpaps.a
 libpaps_a_SOURCES = libpaps.c
 libpaps_a_inc_HEADERS = libpaps.h
 libpaps_a_incdir = $(includedir)
@@ -7,9 +7,9 @@
 bin_PROGRAMS = paps
 paps_CFLAGS  = -Wall 
 paps_SOURCES = paps.c
-paps_LDADD = $(lib_LIBRARIES) $(all_libraries)
+paps_LDADD = $(noinst_LIBRARIES) $(all_libraries)
 paps_LDFLAGS = `pkg-config --libs pangoft2`
-paps_DEPENDENCIES = $(lib_LIBRARIES)
+paps_DEPENDENCIES = $(noinst_LIBRARIES)
 
 EXTRA_DIST = test_libpaps.c paps.1
 
@@ -21,7 +21,7 @@
 
 
 test_libpaps_SOURCES = test_libpaps.c
-test_libpaps_LDADD = $(lib_LIBRARIES) $(all_libraries)
+test_libpaps_LDADD = $(noinst_LIBRARIES) $(all_libraries)
 test_libpaps_LDFLAGS = `pkg-config --libs pangoft2`
-test_libpaps_DEPENDENCIES = $(lib_LIBRARIES) 
+test_libpaps_DEPENDENCIES = $(noinst_LIBRARIES) 
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/paps/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	11 Jan 2006 06:13:52 -0000	1.6
+++ .cvsignore	17 Apr 2006 08:38:31 -0000	1.7
@@ -6,3 +6,4 @@
 paps-0.6.1.tar.gz
 paps-0.6.2.tar.gz
 paps-0.6.3.tar.gz
+paps-0.6.5.tar.gz


Index: paps.spec
===================================================================
RCS file: /cvs/extras/rpms/paps/devel/paps.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- paps.spec	31 Mar 2006 05:21:07 -0000	1.8
+++ paps.spec	17 Apr 2006 08:38:31 -0000	1.9
@@ -1,17 +1,14 @@
 Name:		paps
-Version:	0.6.3
-Release:	4%{?dist}
+Version:	0.6.5
+Release:	1%{?dist}
 
 License:	LGPL
 URL:		http://paps.sourceforge.net/
 Source0:	http://prdownloads.sourceforge.net/paps/paps-%{version}.tar.gz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	pango-devel
-Patch0:		paps-0.6.1-makefile.patch
-Patch1:		paps-0.6.3-fix-pagesize.patch
+Patch0:		paps-makefile.patch
 Patch2:		paps-0.6.3-formfeed.patch
-Patch3:		paps-0.6.3-goption.patch
-Patch4:		paps-0.6.3-header.patch
 
 Summary:	Plain Text to PostScript converter
 Group:		Applications/Publishing
@@ -22,10 +19,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .makefile
-%patch1 -p1 -b .pagesize
 %patch2 -p1 -b .formfeed
-%patch3 -p1 -b .goption
-%patch4 -p1 -b .header
 aclocal
 automake
 autoconf
@@ -49,9 +43,17 @@
 %defattr(-, root, root, -)
 %doc AUTHORS COPYING.LIB README NEWS TODO
 %{_bindir}/paps
+%{_mandir}/man1/paps.1*
 
 
 %changelog
+* Mon Apr 17 2006 Akira TAGOH <tagoh at redhat.com> - 0.6.5-1
+- New upstream release.
+  - paps-0.6.3-fix-pagesize.patch: removed. it has been merged in upstream.
+  - paps-0.6.3-goption.patch: removed. it has been merged in upstream.
+  - paps-0.6.3-header.patch: removed. it has been merged in upstream.
+- paps-makefile.patch: rework to be applied.
+
 * Fri Mar 31 2006 Akira TAGOH <tagoh at redhat.com> - 0.6.3-4
 - paps-0.6.3-formfeed.patch: applied to deal with the formfeed mark properly.
 - paps-0.6.3-goption.patch: rewritten option parser using GOption. and segfault


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/paps/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	11 Jan 2006 06:13:52 -0000	1.6
+++ sources	17 Apr 2006 08:38:31 -0000	1.7
@@ -1 +1 @@
-6f36fd52b6254c99ac2710527ef413d6  paps-0.6.3.tar.gz
+5bb91f6358218f5cbba520376f3e3c1e  paps-0.6.5.tar.gz


--- paps-0.6.1-makefile.patch DELETED ---


--- paps-0.6.3-fix-pagesize.patch DELETED ---


--- paps-0.6.3-goption.patch DELETED ---


--- paps-0.6.3-header.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Apr 17 13:13:49 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Mon, 17 Apr 2006 06:13:49 -0700
Subject: rpms/firestarter/FC-5 firestarter-1.0.3-multicast.patch, NONE,
	1.1 firestarter.spec, 1.19, 1.20
Message-ID: <200604171313.k3HDDphA004489@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/firestarter/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4458

Modified Files:
	firestarter.spec 
Added Files:
	firestarter-1.0.3-multicast.patch 
Log Message:
Fixes bug #189067



firestarter-1.0.3-multicast.patch:

--- NEW FILE firestarter-1.0.3-multicast.patch ---
diff -ur firestarter-1.0.3/src/netfilter-script.c firestarter-1.0.3-avahi/src/netfilter-script.c
--- firestarter-1.0.3/src/netfilter-script.c	2005-01-29 04:32:08.000000000 -0800
+++ firestarter-1.0.3-avahi/src/netfilter-script.c	2006-04-17 05:58:04.000000000 -0700
@@ -738,13 +738,13 @@
 			 "	fi\n"
 			 "fi\n\n");
 
-	fprintf (script, "# Block Multicast Traffic\n"
-	                 "#  Some cable/DSL providers require their clients to accept multicast transmissions\n"
-	                 "#  you should remove the following four rules if you are affected by multicasting\n"
-	                 "$IPT -A INPUT -s 224.0.0.0/8 -d 0/0 -j DROP\n"
-	                 "$IPT -A INPUT -s 0/0 -d 224.0.0.0/8 -j DROP\n"
-	                 "$IPT -A OUTPUT -s 224.0.0.0/8 -d 0/0 -j DROP\n"
-	                 "$IPT -A OUTPUT -s 0/0 -d 224.0.0.0/8 -j DROP\n\n");
+//	fprintf (script, "# Block Multicast Traffic\n"
+//	                 "#  Some cable/DSL providers require their clients to accept multicast transmissions\n"
+//	                 "#  you should remove the following four rules if you are affected by multicasting\n"
+//	                 "$IPT -A INPUT -s 224.0.0.0/8 -d 0/0 -j DROP\n"
+//	                 "$IPT -A INPUT -s 0/0 -d 224.0.0.0/8 -j DROP\n"
+//	                 "$IPT -A OUTPUT -s 224.0.0.0/8 -d 0/0 -j DROP\n"
+//	                 "$IPT -A OUTPUT -s 0/0 -d 224.0.0.0/8 -j DROP\n\n");
 
 	fprintf (script, "# Block Traffic with Stuffed Routing\n"
                          "#  Early versions of PUMP - (the DHCP client application included in RH / Mandrake) require\n"


Index: firestarter.spec
===================================================================
RCS file: /cvs/extras/rpms/firestarter/FC-5/firestarter.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- firestarter.spec	17 Feb 2006 20:16:50 -0000	1.19
+++ firestarter.spec	17 Apr 2006 13:13:49 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		firestarter
 Version:	1.0.3
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	Firewall tool for GNOME
 
 Group:		Applications/Internet
@@ -12,7 +12,8 @@
 Patch0:		firestarter-1.0.3-pam.patch
 Patch1:		firestarter-1.0.3-services.patch
 Patch2:		firestarter-1.0.3-nobrowser.patch
-Patch3:		firestarter-1.0.3-nonroutable.patch      
+Patch3:		firestarter-1.0.3-nonroutable.patch
+Patch4:		firestarter-1.0.3-multicast.patch      
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -42,6 +43,7 @@
 %patch1 -p1 -b .services
 %patch2 -p1 -b .nobrowser
 %patch3 -p1 -b .nonroutable
+%patch4 -p1 -b .multicast
 cp %{SOURCE1} ./fs-manual.pdf
 
 %build
@@ -161,6 +163,9 @@
 
 
 %changelog
+* Mon Apr 17 2006 Michael A. Peters <mpeters at mac.com> - 1.0.3-11
+- Patch4 - Fix bug #189067 (Avahi)
+
 * Fri Feb 17 2006 Michael A. Peters <mpeters at mac.com> - 1.0.3-10
 - Devel branch rebuild
 



From fedora-extras-commits at redhat.com  Mon Apr 17 13:29:52 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 17 Apr 2006 06:29:52 -0700
Subject: rpms/leafpad/devel .cvsignore, 1.8, 1.9 leafpad.spec, 1.17,
	1.18 sources, 1.8, 1.9
Message-ID: <200604171329.k3HDTs2S004536@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/leafpad/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4511

Modified Files:
	.cvsignore leafpad.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/leafpad/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	3 Feb 2006 08:17:12 -0000	1.8
+++ .cvsignore	17 Apr 2006 13:29:52 -0000	1.9
@@ -1 +1 @@
-leafpad-0.8.7.tar.gz
+leafpad-0.8.9.tar.gz


Index: leafpad.spec
===================================================================
RCS file: /cvs/extras/rpms/leafpad/devel/leafpad.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- leafpad.spec	14 Feb 2006 05:01:06 -0000	1.17
+++ leafpad.spec	17 Apr 2006 13:29:52 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           leafpad
-Version:        0.8.7
-Release:        2%{?dist}
+Version:        0.8.9
+Release:        1%{?dist}
 
 Summary:        GTK+ based simple text editor
 
@@ -10,7 +10,7 @@
 Source0:        http://savannah.nongnu.org/download/leafpad/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk2-devel >= 2.4 desktop-file-utils
+BuildRequires:  gtk2-devel >= 2.4 desktop-file-utils libgnomeprintui22-devel
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
 
@@ -58,6 +58,9 @@
 %exclude %{_datadir}/pixmaps/%{name}.xpm
 
 %changelog
+* Mon Apr 17 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.8.9-1
+- Upstream update
+
 * Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.8.7-2
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/leafpad/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	3 Feb 2006 08:17:12 -0000	1.8
+++ sources	17 Apr 2006 13:29:52 -0000	1.9
@@ -1 +1 @@
-6dd5a0882a289a5351b08618883427a1  leafpad-0.8.7.tar.gz
+66a502c2c9e87b8f7ef0370ecb83cbbb  leafpad-0.8.9.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 17 14:59:51 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Mon, 17 Apr 2006 07:59:51 -0700
Subject: rpms/gnomesword/FC-5 gnomesword.spec,1.8,1.9
Message-ID: <200604171459.k3HExr7j006848@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gnomesword/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6831

Modified Files:
	gnomesword.spec 
Log Message:
fixes bug 188581 (187198)



Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/FC-5/gnomesword.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gnomesword.spec	18 Feb 2006 08:12:21 -0000	1.8
+++ gnomesword.spec	17 Apr 2006 14:59:51 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           gnomesword           
 Version:        2.1.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        GNOME-based Bible research tool
 
 Group:          Applications/Text
@@ -47,6 +47,7 @@
 #%%ifarch x86_64
 #libtoolize -c --force && aclocal-1.9 && autoheader && automake-1.9 && autoconf
 #%%endif
+export LDFLAGS="${LDFLAGS} -Wl,--export-dynamic"
 %configure
 make %{?_smp_mflags}
 
@@ -89,6 +90,9 @@
 
 
 %changelog
+* Mon Apr 17 2006 Michael A. Peters <mpeters at mac.com> - 2.1.5-3
+- fix bug 188581 (187198)
+
 * Sat Feb 18 2006 Michael A. Peters <mpeters at mac.com> - 2.1.5-2
 - Rebuild in devel
 



From fedora-extras-commits at redhat.com  Mon Apr 17 16:44:47 2006
From: fedora-extras-commits at redhat.com (Zack Cerza (zmc))
Date: Mon, 17 Apr 2006 09:44:47 -0700
Subject: rpms/pyspi - New directory
Message-ID: <200604171644.k3HGinOe018191@cvs-int.fedora.redhat.com>

Author: zmc

Update of /cvs/extras/rpms/pyspi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18165/pyspi

Log Message:
Directory /cvs/extras/rpms/pyspi added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 17 16:44:48 2006
From: fedora-extras-commits at redhat.com (Zack Cerza (zmc))
Date: Mon, 17 Apr 2006 09:44:48 -0700
Subject: rpms/pyspi/devel - New directory
Message-ID: <200604171644.k3HGiolP018194@cvs-int.fedora.redhat.com>

Author: zmc

Update of /cvs/extras/rpms/pyspi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18165/pyspi/devel

Log Message:
Directory /cvs/extras/rpms/pyspi/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 17 16:44:57 2006
From: fedora-extras-commits at redhat.com (Zack Cerza (zmc))
Date: Mon, 17 Apr 2006 09:44:57 -0700
Subject: rpms/pyspi Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604171644.k3HGixQ9018243@cvs-int.fedora.redhat.com>

Author: zmc

Update of /cvs/extras/rpms/pyspi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18210

Added Files:
	Makefile import.log 
Log Message:
Setup of module pyspi


--- NEW FILE Makefile ---
# Top level Makefile for module pyspi
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 17 16:44:58 2006
From: fedora-extras-commits at redhat.com (Zack Cerza (zmc))
Date: Mon, 17 Apr 2006 09:44:58 -0700
Subject: rpms/pyspi/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200604171645.k3HGj0W6018246@cvs-int.fedora.redhat.com>

Author: zmc

Update of /cvs/extras/rpms/pyspi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18210/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pyspi


--- 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 Apr 17 16:45:21 2006
From: fedora-extras-commits at redhat.com (Zack Cerza (zmc))
Date: Mon, 17 Apr 2006 09:45:21 -0700
Subject: rpms/pyspi import.log,1.1,1.2
Message-ID: <200604171645.k3HGjNSZ018309@cvs-int.fedora.redhat.com>

Author: zmc

Update of /cvs/extras/rpms/pyspi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18276

Modified Files:
	import.log 
Log Message:
auto-import pyspi-0.5.4-2 on branch devel from pyspi-0.5.4-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pyspi/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Apr 2006 16:44:57 -0000	1.1
+++ import.log	17 Apr 2006 16:45:21 -0000	1.2
@@ -0,0 +1 @@
+pyspi-0_5_4-2:HEAD:pyspi-0.5.4-2.src.rpm:1145292317



From fedora-extras-commits at redhat.com  Mon Apr 17 16:45:22 2006
From: fedora-extras-commits at redhat.com (Zack Cerza (zmc))
Date: Mon, 17 Apr 2006 09:45:22 -0700
Subject: rpms/pyspi/devel pyspi.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200604171645.k3HGjOEH018314@cvs-int.fedora.redhat.com>

Author: zmc

Update of /cvs/extras/rpms/pyspi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18276/devel

Modified Files:
	.cvsignore sources 
Added Files:
	pyspi.spec 
Log Message:
auto-import pyspi-0.5.4-2 on branch devel from pyspi-0.5.4-2.src.rpm


--- NEW FILE pyspi.spec ---
Summary: Python bindings for AT-SPI
Name: pyspi
Version: 0.5.4
Release: 2%{?dist}
License: LGPL
Group: Development/Languages
URL: http://people.redhat.com/zcerza/dogtail/
Source0: http://people.redhat.com/zcerza/dogtail/releases/pyspi-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: at-spi-devel, Pyrex

%description
AT-SPI allows assistive technologies to access GTK-based applications.  It
exposes the internals of applications for automation, so tools such as screen
readers and scripting interfaces can query and interact with GUI controls.

pyspi allows the Python language to be used to script AT-SPI-aware 
applications (currently mostly GTK+ based.)

%prep
%setup -q

%build
python ./setup.py build

%install
rm -rf $RPM_BUILD_ROOT
python ./setup.py install -O2 --root=$RPM_BUILD_ROOT --record=%{name}.files

%clean
rm -rf $RPM_BUILD_ROOT

%files -f %{name}.files
#%files
%defattr(-,root,root,-)
%doc COPYING
%doc NEWS
%doc ChangeLog

%changelog
* Tue Mar 21 2006 Zack Cerza <zcerza at redhat.com> - 0.5.4-2
- Fix URL and Source0 fields.

* Fri Mar 10 2006 Zack Cerza <zcerza at redhat.com> - 0.5.4-1
- Remove all Requires
- Add package versions to this changelog
- Add new description
- Use official Fedora Extras BuildRoot
- Change the group to Development/Languages

* Tue Feb 14 2006 Zack Cerza <zcerza at redhat.com> - 0.5.3-2
- Add missing BuildRequires on Pyrex.

* Tue Feb  7 2006 Zack Cerza <zcerza at redhat.com> - 0.5.3-1
- Initial build.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pyspi/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2006 16:44:57 -0000	1.1
+++ .cvsignore	17 Apr 2006 16:45:22 -0000	1.2
@@ -0,0 +1 @@
+pyspi-0.5.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pyspi/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2006 16:44:57 -0000	1.1
+++ sources	17 Apr 2006 16:45:22 -0000	1.2
@@ -0,0 +1 @@
+1640a0ee46d173ed1d0e0ca345f8cd14  pyspi-0.5.4.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 17 16:49:09 2006
From: fedora-extras-commits at redhat.com (Zack Cerza (zmc))
Date: Mon, 17 Apr 2006 09:49:09 -0700
Subject: owners owners.list,1.849,1.850
Message-ID: <200604171649.k3HGnBhi018377@cvs-int.fedora.redhat.com>

Author: zmc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18357/owners

Modified Files:
	owners.list 
Log Message:
Add pyspi to list



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.849
retrieving revision 1.850
diff -u -r1.849 -r1.850
--- owners.list	15 Apr 2006 23:45:04 -0000	1.849
+++ owners.list	17 Apr 2006 16:49:09 -0000	1.850
@@ -10,7 +10,6 @@
 # uppercase and lowercase letters equivalently.
 #
 # All e-mail addresses used here MUST correspond to existing bugzilla accounts!
-
 Fedora Extras|aalib|An ASCII art library|anvil at livna.org|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|
@@ -1205,6 +1204,7 @@
 Fedora Extras|pylint|Analyzes Python code looking for bugs and signs of poor quality|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|pyparsing|An object-oriented approach to text processing|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|PyRTF|Rich Text Format (RTF) Document Generation in Python|mpeters at mac.com|extras-qa at fedoraproject.org|
+Fedora Extras|pyspi|Python bindings for AT-SPI|zcerza at redhat.com|extras-qa at fedoraproject.org
 Fedora Extras|python-4Suite-XML|A collection of XML-related technologies for Python|mitr at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-adns|Python interface for the GNU adns library|byte at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|python-amara|A collection of Pythonic tools for XML data binding|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Apr 17 16:52:15 2006
From: fedora-extras-commits at redhat.com (Zack Cerza (zmc))
Date: Mon, 17 Apr 2006 09:52:15 -0700
Subject: rpms/dogtail - New directory
Message-ID: <200604171652.k3HGqHaD018452@cvs-int.fedora.redhat.com>

Author: zmc

Update of /cvs/extras/rpms/dogtail
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18431/dogtail

Log Message:
Directory /cvs/extras/rpms/dogtail added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 17 16:52:16 2006
From: fedora-extras-commits at redhat.com (Zack Cerza (zmc))
Date: Mon, 17 Apr 2006 09:52:16 -0700
Subject: rpms/dogtail/devel - New directory
Message-ID: <200604171652.k3HGqIjc018455@cvs-int.fedora.redhat.com>

Author: zmc

Update of /cvs/extras/rpms/dogtail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18431/dogtail/devel

Log Message:
Directory /cvs/extras/rpms/dogtail/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 17 16:52:29 2006
From: fedora-extras-commits at redhat.com (Zack Cerza (zmc))
Date: Mon, 17 Apr 2006 09:52:29 -0700
Subject: rpms/dogtail Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604171652.k3HGqVM9018504@cvs-int.fedora.redhat.com>

Author: zmc

Update of /cvs/extras/rpms/dogtail
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18476

Added Files:
	Makefile import.log 
Log Message:
Setup of module dogtail


--- NEW FILE Makefile ---
# Top level Makefile for module dogtail
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 17 16:52:29 2006
From: fedora-extras-commits at redhat.com (Zack Cerza (zmc))
Date: Mon, 17 Apr 2006 09:52:29 -0700
Subject: rpms/dogtail/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604171652.k3HGqVDV018507@cvs-int.fedora.redhat.com>

Author: zmc

Update of /cvs/extras/rpms/dogtail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18476/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module dogtail


--- 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 Apr 17 16:53:40 2006
From: fedora-extras-commits at redhat.com (Zack Cerza (zmc))
Date: Mon, 17 Apr 2006 09:53:40 -0700
Subject: rpms/dogtail/devel dogtail.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604171654.k3HGsCi5018578@cvs-int.fedora.redhat.com>

Author: zmc

Update of /cvs/extras/rpms/dogtail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18540/devel

Modified Files:
	.cvsignore sources 
Added Files:
	dogtail.spec 
Log Message:
auto-import dogtail-0.5.1-2 on branch devel from dogtail-0.5.1-2.src.rpm


--- NEW FILE dogtail.spec ---
Summary: GUI test tool and automation framework
Name: dogtail
Version: 0.5.1
Release: 2%{?dist}
License: GPL
Group: User Interface/X
URL: http://people.redhat.com/zcerza/dogtail/releases/
Source0: http://people.redhat.com/zcerza/dogtail/releases/dogtail-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
BuildRequires: python
BuildRequires: desktop-file-utils
Requires: pyspi >= 0.5.3
Requires: pygtk2
Requires: rpm-python
Requires: ImageMagick
Requires: Xvfb

%description
GUI test tool and automation framework that uses assistive technologies to 
communicate with desktop applications.

%prep
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%setup -q

%build
python ./setup.py build

%install
rm -rf $RPM_BUILD_ROOT
python ./setup.py install -O2 --root=$RPM_BUILD_ROOT --record=%{name}.files
rm -rf $RPM_BUILD_ROOT/%{_docdir}/dogtail
find examples -type f -exec chmod 0644 \{\} \;
desktop-file-install $RPM_BUILD_ROOT/%{_datadir}/applications/sniff.desktop \
  --vendor=fedora \
  --dir=$RPM_BUILD_ROOT/%{_datadir}/applications \
  --add-category X-Fedora \
  --delete-original

%post
touch --no-create %{_datadir}/icons/hicolor || :
[ -x /usr/bin/gtk-update-icon-cache ] && gtk-update-icon-cache --quiet -f %{_datadir}/icons/hicolor || :

%postun
touch --no-create %{_datadir}/icons/hicolor || :
[ -x /usr/bin/gtk-update-icon-cache ] && gtk-update-icon-cache --quiet -f %{_datadir}/icons/hicolor || :

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%{_bindir}/*
%{python_sitelib}/dogtail/
%{_datadir}/applications/*
%{_datadir}/dogtail/
%{_datadir}/icons/hicolor/*
%doc COPYING
%doc README
%doc examples/

%changelog
* Tue Mar 21 2006 Zack Cerza <zcerza at redhat.com> - 0.5.1-2
- Fix URL and Source0 fields.
- Fix desktop-file-utils magic; use desktop-file-install.

* Fri Feb 24 2006 Zack Cerza <zcerza at redhat.com> - 0.5.1-1
- Remove BuildRequires on at-spi-devel. Added one on python.
- Use macros instead of absolute paths.
- Touch _datadir/icons/hicolor/ before running gtk-update-icon-cache.
- Require and use desktop-file-utils.
- postun = post.
- Shorten BuildArchitectures to BuildArch. The former worked, but even vim's 
  hilighting hated it.
- Put each *Requires on a separate line.
- Remove __os_install_post definition.
- Use Fedora Extras BuildRoot.
- Instead of _libdir, which kills the build if it's /usr/lib64, use a
  python macro to define python_sitelib and use that.
- Remove the executable bit on the examples in install scriptlet.
- Remove call to /bin/rm in post scriptlet.
- Use dist in Release.

* Fri Feb 17 2006 Zack Cerza <zcerza at redhat.com> - 0.5.0-2
- It looks like xorg-x11-Xvfb changed names. Require 'Xvfb' instead.
- Remove Requires on python-elementtree, since RHEL4 didn't have it. The 
  functionality it provides is probably never used anyway, and will most likely
  be removed in the future.
- Don't run gtk-update-icon-cache if it doesn't exist.

* Fri Feb  3 2006 Zack Cerza <zcerza at redhat.com> - 0.5.0-1
- New upstream release.
- Added missing BuildRequires on at-spi-devel.
- Added Requires on pyspi >= 0.5.3.
- Added Requires on rpm-python, pygtk2, ImageMagick, xorg-x11-Xvfb, 
  python-elementtree.
- Moved documentation (including examples) to the correct place.
- Make sure /usr/share/doc/dogtail is removed.
- Added 'gtk-update-icon-cache' to %post.

* Mon Oct 24 2005 Zack Cerza <zcerza at redhat.com> - 0.4.3-1
- New upstream release.

* Sat Oct  8 2005 Jeremy Katz <katzj at redhat.com> - 0.4.2-1
- Initial build.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dogtail/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Apr 2006 16:52:29 -0000	1.1
+++ .cvsignore	17 Apr 2006 16:53:40 -0000	1.2
@@ -0,0 +1 @@
+dogtail-0.5.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dogtail/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Apr 2006 16:52:29 -0000	1.1
+++ sources	17 Apr 2006 16:53:40 -0000	1.2
@@ -0,0 +1 @@
+69269dd1eef5be141a9e5168af189978  dogtail-0.5.1.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 17 16:53:39 2006
From: fedora-extras-commits at redhat.com (Zack Cerza (zmc))
Date: Mon, 17 Apr 2006 09:53:39 -0700
Subject: rpms/dogtail import.log,1.1,1.2
Message-ID: <200604171654.k3HGsBOO018574@cvs-int.fedora.redhat.com>

Author: zmc

Update of /cvs/extras/rpms/dogtail
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18540

Modified Files:
	import.log 
Log Message:
auto-import dogtail-0.5.1-2 on branch devel from dogtail-0.5.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dogtail/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	17 Apr 2006 16:52:29 -0000	1.1
+++ import.log	17 Apr 2006 16:53:39 -0000	1.2
@@ -0,0 +1 @@
+dogtail-0_5_1-2:HEAD:dogtail-0.5.1-2.src.rpm:1145292815



From fedora-extras-commits at redhat.com  Mon Apr 17 16:54:26 2006
From: fedora-extras-commits at redhat.com (Deji Akingunola (deji))
Date: Mon, 17 Apr 2006 09:54:26 -0700
Subject: rpms/gparted/devel gparted.spec,1.8,1.9
Message-ID: <200604171654.k3HGsSWD018627@cvs-int.fedora.redhat.com>

Author: deji

Update of /cvs/extras/rpms/gparted/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18610

Modified Files:
	gparted.spec 
Log Message:
* Mon Apr 17 2006 Deji Akingunola <dakingun at gmail.com> - 0.2.4-2
- Rebuild for new parted



Index: gparted.spec
===================================================================
RCS file: /cvs/extras/rpms/gparted/devel/gparted.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gparted.spec	12 Apr 2006 22:28:56 -0000	1.8
+++ gparted.spec	17 Apr 2006 16:54:26 -0000	1.9
@@ -1,7 +1,7 @@
 Summary: Gnome Partition Editor
 Name:    gparted
 Version: 0.2.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group:   Applications/System
 License: GPL
 URL:     http://gparted.sourceforge.net
@@ -77,6 +77,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/gparted
 
 %changelog
+* Mon Apr 17 2006 Deji Akingunola <dakingun at gmail.com> - 0.2.4-2
+- Rebuild for new parted
+
 * Wed Apr 12 2006 Deji Akingunola <dakingun at gmail.com> - 0.2.4-1
 - Update to newer version
 



From fedora-extras-commits at redhat.com  Mon Apr 17 16:57:57 2006
From: fedora-extras-commits at redhat.com (Zack Cerza (zmc))
Date: Mon, 17 Apr 2006 09:57:57 -0700
Subject: owners owners.list,1.850,1.851
Message-ID: <200604171657.k3HGvx0m018714@cvs-int.fedora.redhat.com>

Author: zmc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18697/owners

Modified Files:
	owners.list 
Log Message:
Add dogtail to list



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.850
retrieving revision 1.851
diff -u -r1.850 -r1.851
--- owners.list	17 Apr 2006 16:49:09 -0000	1.850
+++ owners.list	17 Apr 2006 16:57:57 -0000	1.851
@@ -197,6 +197,7 @@
 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|docbook2X|Convert docbook into man and Texinfo|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|doctorj|Java source code analyzer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|dogtail|GUI test tool and automation framework|zcerza at redhat.com|extras-qa at fedoraproject.org
 Fedora Extras|dosbox|An x86/DOS emulator with sound/graphics|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|doulos-fonts|Doulos SIL fonts|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|drgeo-doc|html documentation for drgeo|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Apr 17 17:07:01 2006
From: fedora-extras-commits at redhat.com (Zack Cerza (zmc))
Date: Mon, 17 Apr 2006 10:07:01 -0700
Subject: rpms/dogtail/devel dogtail.spec,1.1,1.2
Message-ID: <200604171707.k3HH73cg020868@cvs-int.fedora.redhat.com>

Author: zmc

Update of /cvs/extras/rpms/dogtail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20850

Modified Files:
	dogtail.spec 
Log Message:
Fix the URL field.



Index: dogtail.spec
===================================================================
RCS file: /cvs/extras/rpms/dogtail/devel/dogtail.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dogtail.spec	17 Apr 2006 16:53:40 -0000	1.1
+++ dogtail.spec	17 Apr 2006 17:07:01 -0000	1.2
@@ -1,10 +1,10 @@
 Summary: GUI test tool and automation framework
 Name: dogtail
 Version: 0.5.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: User Interface/X
-URL: http://people.redhat.com/zcerza/dogtail/releases/
+URL: http://people.redhat.com/zcerza/dogtail/
 Source0: http://people.redhat.com/zcerza/dogtail/releases/dogtail-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
@@ -61,6 +61,9 @@
 %doc examples/
 
 %changelog
+* Mon Apr 17 2006 Zack Cerza <zcerza at redhat.com> - 0.5.1-3
+- Fix the URL field.
+
 * Tue Mar 21 2006 Zack Cerza <zcerza at redhat.com> - 0.5.1-2
 - Fix URL and Source0 fields.
 - Fix desktop-file-utils magic; use desktop-file-install.



From fedora-extras-commits at redhat.com  Mon Apr 17 17:48:38 2006
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 17 Apr 2006 10:48:38 -0700
Subject: comps comps-fe5.xml.in,1.37,1.38
Message-ID: <200604171748.k3HHmeRU021246@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21229

Modified Files:
	comps-fe5.xml.in 
Log Message:
fix syntax error



Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- comps-fe5.xml.in	15 Apr 2006 09:41:35 -0000	1.37
+++ comps-fe5.xml.in	17 Apr 2006 17:48:37 -0000	1.38
@@ -470,7 +470,7 @@
         <packagereq type="optional">ghex</packagereq>
         <packagereq type="optional">hercules</packagereq>
         <packagereq type="optional">ibmonitor</packagereq>
-	<packagereq type="optional">inadyn>/packagereq>
+	<packagereq type="optional">inadyn</packagereq>
         <packagereq type="optional">lirc</packagereq>
         <packagereq type="optional">moodss</packagereq>
         <packagereq type="optional">moomps</packagereq>



From fedora-extras-commits at redhat.com  Mon Apr 17 17:49:10 2006
From: fedora-extras-commits at redhat.com (Jeremy Katz (katzj))
Date: Mon, 17 Apr 2006 10:49:10 -0700
Subject: comps comps-fe6.xml, NONE, 1.1 comps-fe6.xml.in, NONE,
	1.1 comps-fe5.xml, 1.4, 1.5
Message-ID: <200604171749.k3HHnCx0021276@cvs-int.fedora.redhat.com>

Author: katzj

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21257

Modified Files:
	comps-fe5.xml 
Added Files:
	comps-fe6.xml comps-fe6.xml.in 
Log Message:
refresh xml file, add -fe6 files



--- NEW FILE comps-fe6.xml ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE newcomps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
<comps>

  <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">conglomerate</packagereq>
        <packagereq type="optional">kile</packagereq>
        <packagereq type="optional">scribus</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">bazaar</packagereq>
        <packagereq type="optional">bigloo</packagereq>
        <packagereq type="optional">bzr</packagereq>
        <packagereq type="optional">ccache</packagereq>
        <packagereq type="optional">clisp</packagereq>
        <packagereq type="optional">cogito</packagereq>
        <packagereq type="optional">colordiff</packagereq>
        <packagereq type="optional">cpan2rpm</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">fedora-rpmdevtools</packagereq>
        <packagereq type="optional">fpc</packagereq>
        <packagereq type="optional">gforth</packagereq>
        <packagereq type="optional">ghc</packagereq>
        <packagereq type="optional">git</packagereq>
        <packagereq type="optional">highlight</packagereq>
        <packagereq type="optional">lincvs</packagereq>
        <packagereq type="optional">lua</packagereq>
        <packagereq type="optional">mach</packagereq>
        <packagereq type="optional">meld</packagereq>
        <packagereq type="optional">mercurial</packagereq>
        <packagereq type="optional">mock</packagereq>
        <packagereq type="optional">monotone</packagereq>
        <packagereq type="optional">ocaml</packagereq>
        <packagereq type="optional">pl</packagereq>
        <packagereq type="optional">plt-scheme</packagereq>
        <packagereq type="optional">pylint</packagereq>
        <packagereq type="optional">quilt</packagereq>
        <packagereq type="optional">rpmlint</packagereq>
        <packagereq type="optional">splint</packagereq>
        <packagereq type="optional">tkcvs</packagereq>
        <packagereq type="optional">tla</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">TeXmacs</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">blacs</packagereq>
        <packagereq type="optional">blas</packagereq>
        <packagereq type="optional">cernlib-utils</packagereq>
        <packagereq type="optional">galculator</packagereq>
        <packagereq type="optional">gdl</packagereq>
        <packagereq type="optional">hmmer</packagereq>
        <packagereq type="optional">kst</packagereq>
        <packagereq type="optional">lagan</packagereq>
        <packagereq type="optional">lapack</packagereq>
        <packagereq type="optional">ncarg</packagereq>
        <packagereq type="optional">numpy</packagereq>
        <packagereq type="optional">octave</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">scalapack</packagereq>
        <packagereq type="optional">SIBsim4</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>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">byzanz</packagereq>
        <packagereq type="optional">deskbar-applet</packagereq>
        <packagereq type="optional">gdesklets</packagereq>
        <packagereq type="optional">gfontview</packagereq>
        <packagereq type="optional">glunarclock</packagereq>
        <packagereq type="optional">gmpc</packagereq>
        <packagereq type="optional">gnome-applet-rhythmbox</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">sabayon</packagereq>
        <packagereq type="optional">seahorse</packagereq>
        <packagereq type="optional">smeg</packagereq>
        <packagereq type="optional">themes-backgrounds-gnome</packagereq>
        <packagereq type="optional">wp_tray</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">gazpacho</packagereq>
        <packagereq type="optional">gconfmm26-devel</packagereq>
        <packagereq type="optional">glibmm24-devel</packagereq>
        <packagereq type="optional">gnome-common</packagereq>
        <packagereq type="optional">gtkmm24-devel</packagereq>
        <packagereq type="optional">gtkalog</packagereq>
        <packagereq type="optional">gnome-vfsmm26-devel</packagereq>
        <packagereq type="optional">gquilt</packagereq>
        <packagereq type="optional">libsexy-devel</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">bzflag</packagereq>
        <packagereq type="optional">celestia</packagereq>
        <packagereq type="optional">cgoban</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">fillets-ng</packagereq>
        <packagereq type="optional">foobillard</packagereq>
        <packagereq type="optional">fortune-mod</packagereq>
        <packagereq type="optional">freeciv</packagereq>
        <packagereq type="optional">freedoom</packagereq>
        <packagereq type="optional">freedroid</packagereq>
        <packagereq type="optional">freedroidrpg</packagereq>
        <packagereq type="optional">gl-117</packagereq>
        <packagereq type="optional">gnofract4d</packagereq>
        <packagereq type="optional">gnome-sudoku</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">nethack</packagereq>
        <packagereq type="optional">nethack-vultures</packagereq>
        <packagereq type="optional">neverball</packagereq>
        <packagereq type="optional">nexuiz</packagereq>
        <packagereq type="optional">njam</packagereq>
        <packagereq type="optional">overgod</packagereq>
        <packagereq type="optional">pipenightdreams</packagereq>
        <packagereq type="optional">powermanga</packagereq>
        <packagereq type="optional">ppracer</packagereq>
        <packagereq type="optional">qascade</packagereq>
        <packagereq type="optional">qqo</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">supertux</packagereq>
        <packagereq type="optional">tong</packagereq>
        <packagereq type="optional">torcs</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">xboard</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>education</id>
    <name>Educational Software</name>
    <description>Educational software for learning</description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
        <packagereq type="optional">drgeo</packagereq>
	<packagereq type="optional">drgeo-doc</packagereq>
        <packagereq type="optional">gperiodic</packagereq>
        <packagereq type="optional">stellarium</packagereq>
        <packagereq type="optional">tuxtype2</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">amaya</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">comical</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">fwbuilder</packagereq>
        <packagereq type="optional">gajim</packagereq>
        <packagereq type="optional">galeon</packagereq>
        <packagereq type="optional">gnome-blog</packagereq>
        <packagereq type="optional">gnome-telnet</packagereq>
        <packagereq type="optional">gossip</packagereq>
        <packagereq type="optional">gtk-gnutella</packagereq>
        <packagereq type="optional">gwget</packagereq>
        <packagereq type="optional">kickpim</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">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">silky</packagereq>
        <packagereq type="optional">straw</packagereq>
        <packagereq type="optional">sylpheed</packagereq>
        <packagereq type="optional">sylpheed-claws</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">blender</packagereq>
        <packagereq type="optional">digikam</packagereq>
        <packagereq type="optional">fontforge</packagereq>
        <packagereq type="optional">fyre</packagereq>
        <packagereq type="optional">grads</packagereq>
        <packagereq type="optional">gv</packagereq>
        <packagereq type="optional">gpp</packagereq>
        <packagereq type="optional">gqview</packagereq>
        <packagereq type="optional">graphviz</packagereq>
        <packagereq type="optional">gwenview</packagereq>
        <packagereq type="optional">inkscape</packagereq>
        <packagereq type="optional">qiv</packagereq>
        <packagereq type="optional">showimg</packagereq>
        <packagereq type="optional">skencil</packagereq>
        <packagereq type="optional">sodipodi</packagereq>
        <packagereq type="optional">tuxpaint</packagereq>
    </packagelist>
  </group>

  <group>
    <id>mail-server</id>
    <name>Mail Server</name>
    <description>These packages allow you to configure an IMAP or Postfix mail server.</description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">cyrus-imapd</packagereq>
      <packagereq type="optional">enemies-of-carlotta</packagereq>
      <packagereq type="optional">perl-Cyrus</packagereq>
      <packagereq type="optional">clamav</packagereq>
      <packagereq type="optional">clamav-data</packagereq>
      <packagereq type="optional">clamav-milter</packagereq>
      <packagereq type="optional">exim</packagereq>
      <packagereq type="optional">exim-doc</packagereq>
      <packagereq type="optional">mlmmj</packagereq>
      <packagereq type="optional">pyzor</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">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">dia</packagereq>
        <packagereq type="optional">gdeskcal</packagereq>
        <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>
        <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">MagicPoint</packagereq>
        <packagereq type="optional">pybliographer</packagereq>
        <packagereq type="optional">qcad</packagereq>
        <packagereq type="optional">texmaker</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">alsamixergui</packagereq>
        <packagereq type="optional">akode</packagereq>
        <packagereq type="optional">amarok</packagereq>
        <packagereq type="optional">audacity</packagereq>
        <packagereq type="optional">bmp</packagereq>
        <packagereq type="optional">camstream</packagereq>
        <packagereq type="optional">camE</packagereq>
        <packagereq type="optional">easytag</packagereq>
        <packagereq type="optional">gcfilms</packagereq>
        <packagereq type="optional">gcombust</packagereq>
        <packagereq type="optional">gnomad2</packagereq>
        <packagereq type="optional">gnomebaker</packagereq>
        <packagereq type="optional">graveman</packagereq>
        <packagereq type="optional">grip</packagereq>
        <packagereq type="optional">kid3</packagereq>
        <packagereq type="optional">kover</packagereq>
        <packagereq type="optional">libvisual-plugins</packagereq>
        <packagereq type="optional">soundconverter</packagereq>
        <packagereq type="optional">soundtracker</packagereq>
        <packagereq type="optional">sweep</packagereq>
	<packagereq type="optional">tagtool</packagereq>
	<packagereq type="optional">ushare</packagereq>
        <packagereq type="optional">xmms</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">cfengine</packagereq>
	<packagereq type="optional">cfs</packagereq>
	<packagereq type="optional">crack</packagereq>
	<packagereq type="optional">dkms</packagereq>
        <packagereq type="optional">environment-modules</packagereq>
        <packagereq type="optional">epylog</packagereq>
        <packagereq type="optional">fuse</packagereq>
        <packagereq type="optional">fwbuilder</packagereq>
        <packagereq type="optional">ghasher</packagereq>
        <packagereq type="optional">ghex</packagereq>
        <packagereq type="optional">hercules</packagereq>
        <packagereq type="optional">ibmonitor</packagereq>
	<packagereq type="optional">inadyn</packagereq>
        <packagereq type="optional">lirc</packagereq>
        <packagereq type="optional">moodss</packagereq>
        <packagereq type="optional">moomps</packagereq>
        <packagereq type="optional">nagios</packagereq>
        <packagereq type="optional">nfswatch</packagereq>
        <packagereq type="optional">rdiff-backup</packagereq>
        <packagereq type="optional">sabayon</packagereq>
        <packagereq type="optional">shorewall</packagereq>
        <packagereq type="optional">snort</packagereq>
        <packagereq type="optional">ttywatch</packagereq>
        <packagereq type="optional">unison</packagereq>
        <packagereq type="optional">vnstat</packagereq>
        <packagereq type="optional">vpnc</packagereq>
        <packagereq type="optional">wine</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">acpitool</packagereq>
        <packagereq type="optional">i810switch</packagereq>
        <packagereq type="optional">i8kutils</packagereq>
        <packagereq type="optional">libifp</packagereq>
        <packagereq type="optional">s3switch</packagereq>
        <packagereq type="optional">tpb</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">flumotion</packagereq>
        <packagereq type="optional">icecast</packagereq>
        <packagereq type="optional">ircd-hybrid</packagereq>
        <packagereq type="optional">jabberd</packagereq>
        <packagereq type="optional">kannel</packagereq>
	<packagereq type="optional">ushare</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">bittorrent</packagereq>
        <packagereq type="optional">centericq</packagereq>
        <packagereq type="optional">cone</packagereq>
        <packagereq type="optional">elmo</packagereq>
        <packagereq type="optional">irssi</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>
    </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_geoip</packagereq>
        <packagereq type="optional">mod_security</packagereq>
        <packagereq type="optional">moin</packagereq>
        <packagereq type="optional">plone</packagereq>
        <packagereq type="optional">thttpd</packagereq>
        <packagereq type="optional">TurboGears</packagereq>
        <packagereq type="optional">zope</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="optional">xemacs-el</packagereq>
      <packagereq type="default">xemacs-info</packagereq>
      <packagereq type="optional">xemacs-nox</packagereq>
      <packagereq type="default">xemacs-sumo</packagereq>
      <packagereq type="optional">xemacs-sumo-el</packagereq>
      <packagereq type="default">xemacs-sumo-info</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="default">xfce-mcs-manager</packagereq>
      <packagereq type="default">xfce-mcs-plugins</packagereq>
      <packagereq type="mandatory">xfce-utils</packagereq>
      <packagereq type="default">xfce4-iconbox</packagereq>
      <packagereq type="mandatory">xfce4-panel</packagereq>
      <packagereq type="default">xfce4-systray</packagereq>
      <packagereq type="mandatory">xfdesktop</packagereq>
      <packagereq type="mandatory">xffm</packagereq>
      <packagereq type="default">xffm-icons</packagereq>
      <packagereq type="default">xfprint</packagereq>
      <packagereq type="mandatory">xfwm4</packagereq>
        <packagereq type="optional">xfce4-toys</packagereq>
        <packagereq type="optional">xfwm4-themes</packagereq>
      <packagereq type="default">xfwm4-themes</packagereq>
        <packagereq type="optional">xfcalendar</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">WindowMaker</packagereq>
        <packagereq type="optional">wmx</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="default">glade2</packagereq>
      <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="default">pygtk2-devel</packagereq>
      <packagereq type="mandatory">xfce-mcs-manager-devel</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>
    </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">fonttools</packagereq>
      <packagereq type="optional">rxvt</packagereq>
      <packagereq type="optional">workrave</packagereq>
      <packagereq type="optional">xlockmore</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">kickpim</packagereq>
      <packagereq type="optional">kdissert</packagereq>
      <packagereq type="optional">kbibtex</packagereq>
      <packagereq type="optional">kiosktool</packagereq>
      <packagereq type="optional">kmymoney2</packagereq>
      <packagereq type="optional">kompose</packagereq>
      <packagereq type="optional">kyum</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>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>
    </packagelist>
  </group>

  <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">qtparted</packagereq>
      <packagereq type="optional">system-config-control</packagereq>
      <packagereq type="optional">yumex</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>

  <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>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>

  <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>xfce-software-development</groupid>
      <groupid>web-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>
</comps>

--- NEW FILE comps-fe6.xml.in ---
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE newcomps PUBLIC "-//Red Hat, Inc.//DTD Comps info//EN" "comps.dtd">
<comps>

  <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">conglomerate</packagereq>
        <packagereq type="optional">kile</packagereq>
        <packagereq type="optional">scribus</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">bazaar</packagereq>
        <packagereq type="optional">bigloo</packagereq>
        <packagereq type="optional">bzr</packagereq>
        <packagereq type="optional">ccache</packagereq>
        <packagereq type="optional">clisp</packagereq>
        <packagereq type="optional">cogito</packagereq>
        <packagereq type="optional">colordiff</packagereq>
        <packagereq type="optional">cpan2rpm</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">fedora-rpmdevtools</packagereq>
        <packagereq type="optional">fpc</packagereq>
        <packagereq type="optional">gforth</packagereq>
        <packagereq type="optional">ghc</packagereq>
        <packagereq type="optional">git</packagereq>
        <packagereq type="optional">highlight</packagereq>
        <packagereq type="optional">lincvs</packagereq>
        <packagereq type="optional">lua</packagereq>
        <packagereq type="optional">mach</packagereq>
        <packagereq type="optional">meld</packagereq>
        <packagereq type="optional">mercurial</packagereq>
        <packagereq type="optional">mock</packagereq>
        <packagereq type="optional">monotone</packagereq>
        <packagereq type="optional">ocaml</packagereq>
        <packagereq type="optional">pl</packagereq>
        <packagereq type="optional">plt-scheme</packagereq>
        <packagereq type="optional">pylint</packagereq>
        <packagereq type="optional">quilt</packagereq>
        <packagereq type="optional">rpmlint</packagereq>
        <packagereq type="optional">splint</packagereq>
        <packagereq type="optional">tkcvs</packagereq>
        <packagereq type="optional">tla</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">TeXmacs</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">blacs</packagereq>
        <packagereq type="optional">blas</packagereq>
        <packagereq type="optional">cernlib-utils</packagereq>
        <packagereq type="optional">galculator</packagereq>
        <packagereq type="optional">gdl</packagereq>
        <packagereq type="optional">hmmer</packagereq>
        <packagereq type="optional">kst</packagereq>
        <packagereq type="optional">lagan</packagereq>
        <packagereq type="optional">lapack</packagereq>
        <packagereq type="optional">ncarg</packagereq>
        <packagereq type="optional">numpy</packagereq>
        <packagereq type="optional">octave</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">scalapack</packagereq>
        <packagereq type="optional">SIBsim4</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>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">byzanz</packagereq>
        <packagereq type="optional">deskbar-applet</packagereq>
        <packagereq type="optional">gdesklets</packagereq>
        <packagereq type="optional">gfontview</packagereq>
        <packagereq type="optional">glunarclock</packagereq>
        <packagereq type="optional">gmpc</packagereq>
        <packagereq type="optional">gnome-applet-rhythmbox</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">sabayon</packagereq>
        <packagereq type="optional">seahorse</packagereq>
        <packagereq type="optional">smeg</packagereq>
        <packagereq type="optional">themes-backgrounds-gnome</packagereq>
        <packagereq type="optional">wp_tray</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">gazpacho</packagereq>
        <packagereq type="optional">gconfmm26-devel</packagereq>
        <packagereq type="optional">glibmm24-devel</packagereq>
        <packagereq type="optional">gnome-common</packagereq>
        <packagereq type="optional">gtkmm24-devel</packagereq>
        <packagereq type="optional">gtkalog</packagereq>
        <packagereq type="optional">gnome-vfsmm26-devel</packagereq>
        <packagereq type="optional">gquilt</packagereq>
        <packagereq type="optional">libsexy-devel</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">bzflag</packagereq>
        <packagereq type="optional">celestia</packagereq>
        <packagereq type="optional">cgoban</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">fillets-ng</packagereq>
        <packagereq type="optional">foobillard</packagereq>
        <packagereq type="optional">fortune-mod</packagereq>
        <packagereq type="optional">freeciv</packagereq>
        <packagereq type="optional">freedoom</packagereq>
        <packagereq type="optional">freedroid</packagereq>
        <packagereq type="optional">freedroidrpg</packagereq>
        <packagereq type="optional">gl-117</packagereq>
        <packagereq type="optional">gnofract4d</packagereq>
        <packagereq type="optional">gnome-sudoku</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">nethack</packagereq>
        <packagereq type="optional">nethack-vultures</packagereq>
        <packagereq type="optional">neverball</packagereq>
        <packagereq type="optional">nexuiz</packagereq>
        <packagereq type="optional">njam</packagereq>
        <packagereq type="optional">overgod</packagereq>
        <packagereq type="optional">pipenightdreams</packagereq>
        <packagereq type="optional">powermanga</packagereq>
        <packagereq type="optional">ppracer</packagereq>
        <packagereq type="optional">qascade</packagereq>
        <packagereq type="optional">qqo</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">supertux</packagereq>
        <packagereq type="optional">tong</packagereq>
        <packagereq type="optional">torcs</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">xboard</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>education</id>
    <_name>Educational Software</_name>
    <_description>Educational software for learning</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
        <packagereq type="optional">drgeo</packagereq>
	<packagereq type="optional">drgeo-doc</packagereq>
        <packagereq type="optional">gperiodic</packagereq>
        <packagereq type="optional">stellarium</packagereq>
        <packagereq type="optional">tuxtype2</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">amaya</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">comical</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">fwbuilder</packagereq>
        <packagereq type="optional">gajim</packagereq>
        <packagereq type="optional">galeon</packagereq>
        <packagereq type="optional">gnome-blog</packagereq>
        <packagereq type="optional">gnome-telnet</packagereq>
        <packagereq type="optional">gossip</packagereq>
        <packagereq type="optional">gtk-gnutella</packagereq>
        <packagereq type="optional">gwget</packagereq>
        <packagereq type="optional">kickpim</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">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">silky</packagereq>
        <packagereq type="optional">straw</packagereq>
        <packagereq type="optional">sylpheed</packagereq>
        <packagereq type="optional">sylpheed-claws</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">blender</packagereq>
        <packagereq type="optional">digikam</packagereq>
        <packagereq type="optional">fontforge</packagereq>
        <packagereq type="optional">fyre</packagereq>
        <packagereq type="optional">grads</packagereq>
        <packagereq type="optional">gv</packagereq>
        <packagereq type="optional">gpp</packagereq>
        <packagereq type="optional">gqview</packagereq>
        <packagereq type="optional">graphviz</packagereq>
        <packagereq type="optional">gwenview</packagereq>
        <packagereq type="optional">inkscape</packagereq>
        <packagereq type="optional">qiv</packagereq>
        <packagereq type="optional">showimg</packagereq>
        <packagereq type="optional">skencil</packagereq>
        <packagereq type="optional">sodipodi</packagereq>
        <packagereq type="optional">tuxpaint</packagereq>
    </packagelist>
  </group>

  <group>
    <id>mail-server</id>
    <_name>Mail Server</_name>
    <_description>These packages allow you to configure an IMAP or Postfix mail server.</_description>
    <default>false</default>
    <uservisible>true</uservisible>
    <packagelist>
      <packagereq type="optional">cyrus-imapd</packagereq>
      <packagereq type="optional">enemies-of-carlotta</packagereq>
      <packagereq type="optional">perl-Cyrus</packagereq>
      <packagereq type="optional">clamav</packagereq>
      <packagereq type="optional">clamav-data</packagereq>
      <packagereq type="optional">clamav-milter</packagereq>
      <packagereq type="optional">exim</packagereq>
      <packagereq type="optional">exim-doc</packagereq>
      <packagereq type="optional">mlmmj</packagereq>
      <packagereq type="optional">pyzor</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">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">dia</packagereq>
        <packagereq type="optional">gdeskcal</packagereq>
        <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>
        <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">MagicPoint</packagereq>
        <packagereq type="optional">pybliographer</packagereq>
        <packagereq type="optional">qcad</packagereq>
        <packagereq type="optional">texmaker</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">alsamixergui</packagereq>
        <packagereq type="optional">akode</packagereq>
        <packagereq type="optional">amarok</packagereq>
        <packagereq type="optional">audacity</packagereq>
        <packagereq type="optional">bmp</packagereq>
        <packagereq type="optional">camstream</packagereq>
        <packagereq type="optional">camE</packagereq>
        <packagereq type="optional">easytag</packagereq>
        <packagereq type="optional">gcfilms</packagereq>
        <packagereq type="optional">gcombust</packagereq>
        <packagereq type="optional">gnomad2</packagereq>
        <packagereq type="optional">gnomebaker</packagereq>
        <packagereq type="optional">graveman</packagereq>
        <packagereq type="optional">grip</packagereq>
        <packagereq type="optional">kid3</packagereq>
        <packagereq type="optional">kover</packagereq>
        <packagereq type="optional">libvisual-plugins</packagereq>
        <packagereq type="optional">soundconverter</packagereq>
        <packagereq type="optional">soundtracker</packagereq>
        <packagereq type="optional">sweep</packagereq>
	<packagereq type="optional">tagtool</packagereq>
	<packagereq type="optional">ushare</packagereq>
        <packagereq type="optional">xmms</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">cfengine</packagereq>
	<packagereq type="optional">cfs</packagereq>
	<packagereq type="optional">crack</packagereq>
	<packagereq type="optional">dkms</packagereq>
        <packagereq type="optional">environment-modules</packagereq>
        <packagereq type="optional">epylog</packagereq>
        <packagereq type="optional">fuse</packagereq>
        <packagereq type="optional">fwbuilder</packagereq>
        <packagereq type="optional">ghasher</packagereq>
        <packagereq type="optional">ghex</packagereq>
        <packagereq type="optional">hercules</packagereq>
        <packagereq type="optional">ibmonitor</packagereq>
	<packagereq type="optional">inadyn</packagereq>
        <packagereq type="optional">lirc</packagereq>
        <packagereq type="optional">moodss</packagereq>
        <packagereq type="optional">moomps</packagereq>
        <packagereq type="optional">nagios</packagereq>
        <packagereq type="optional">nfswatch</packagereq>
        <packagereq type="optional">rdiff-backup</packagereq>
        <packagereq type="optional">sabayon</packagereq>
        <packagereq type="optional">shorewall</packagereq>
        <packagereq type="optional">snort</packagereq>
        <packagereq type="optional">ttywatch</packagereq>
        <packagereq type="optional">unison</packagereq>
        <packagereq type="optional">vnstat</packagereq>
        <packagereq type="optional">vpnc</packagereq>
        <packagereq type="optional">wine</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">acpitool</packagereq>
        <packagereq type="optional">i810switch</packagereq>
        <packagereq type="optional">i8kutils</packagereq>
        <packagereq type="optional">libifp</packagereq>
        <packagereq type="optional">s3switch</packagereq>
        <packagereq type="optional">tpb</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">flumotion</packagereq>
        <packagereq type="optional">icecast</packagereq>
        <packagereq type="optional">ircd-hybrid</packagereq>
        <packagereq type="optional">jabberd</packagereq>
        <packagereq type="optional">kannel</packagereq>
	<packagereq type="optional">ushare</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">bittorrent</packagereq>
        <packagereq type="optional">centericq</packagereq>
        <packagereq type="optional">cone</packagereq>
        <packagereq type="optional">elmo</packagereq>
        <packagereq type="optional">irssi</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>
    </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_geoip</packagereq>
        <packagereq type="optional">mod_security</packagereq>
        <packagereq type="optional">moin</packagereq>
        <packagereq type="optional">plone</packagereq>
        <packagereq type="optional">thttpd</packagereq>
        <packagereq type="optional">TurboGears</packagereq>
        <packagereq type="optional">zope</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="optional">xemacs-el</packagereq>
      <packagereq type="default">xemacs-info</packagereq>
      <packagereq type="optional">xemacs-nox</packagereq>
      <packagereq type="default">xemacs-sumo</packagereq>
      <packagereq type="optional">xemacs-sumo-el</packagereq>
      <packagereq type="default">xemacs-sumo-info</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="default">xfce-mcs-manager</packagereq>
      <packagereq type="default">xfce-mcs-plugins</packagereq>
      <packagereq type="mandatory">xfce-utils</packagereq>
      <packagereq type="default">xfce4-iconbox</packagereq>
      <packagereq type="mandatory">xfce4-panel</packagereq>
      <packagereq type="default">xfce4-systray</packagereq>
      <packagereq type="mandatory">xfdesktop</packagereq>
      <packagereq type="mandatory">xffm</packagereq>
      <packagereq type="default">xffm-icons</packagereq>
      <packagereq type="default">xfprint</packagereq>
      <packagereq type="mandatory">xfwm4</packagereq>
        <packagereq type="optional">xfce4-toys</packagereq>
        <packagereq type="optional">xfwm4-themes</packagereq>
      <packagereq type="default">xfwm4-themes</packagereq>
        <packagereq type="optional">xfcalendar</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">WindowMaker</packagereq>
        <packagereq type="optional">wmx</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="default">glade2</packagereq>
      <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="default">pygtk2-devel</packagereq>
      <packagereq type="mandatory">xfce-mcs-manager-devel</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>
    </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">fonttools</packagereq>
      <packagereq type="optional">rxvt</packagereq>
      <packagereq type="optional">workrave</packagereq>
      <packagereq type="optional">xlockmore</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">kickpim</packagereq>
      <packagereq type="optional">kdissert</packagereq>
      <packagereq type="optional">kbibtex</packagereq>
      <packagereq type="optional">kiosktool</packagereq>
      <packagereq type="optional">kmymoney2</packagereq>
      <packagereq type="optional">kompose</packagereq>
      <packagereq type="optional">kyum</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>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>
    </packagelist>
  </group>

  <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">qtparted</packagereq>
      <packagereq type="optional">system-config-control</packagereq>
      <packagereq type="optional">yumex</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>

  <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>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>

  <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>xfce-software-development</groupid>
      <groupid>web-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>
</comps>


Index: comps-fe5.xml
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- comps-fe5.xml	7 Apr 2006 14:11:26 -0000	1.4
+++ comps-fe5.xml	17 Apr 2006 17:49:10 -0000	1.5
@@ -24,9 +24,9 @@
     <packagelist>
         <packagereq type="optional">abicheck</packagereq>
         <packagereq type="optional">bazaar</packagereq>
+        <packagereq type="optional">bigloo</packagereq>
         <packagereq type="optional">bzr</packagereq>
         <packagereq type="optional">ccache</packagereq>
-        <packagereq type="optional">cdiff</packagereq>
         <packagereq type="optional">clisp</packagereq>
         <packagereq type="optional">cogito</packagereq>
         <packagereq type="optional">colordiff</packagereq>
@@ -41,23 +41,25 @@
         <packagereq type="optional">gforth</packagereq>
         <packagereq type="optional">ghc</packagereq>
         <packagereq type="optional">git</packagereq>
+        <packagereq type="optional">highlight</packagereq>
         <packagereq type="optional">lincvs</packagereq>
         <packagereq type="optional">lua</packagereq>
         <packagereq type="optional">mach</packagereq>
-        <packagereq type="optional">mock</packagereq>
         <packagereq type="optional">meld</packagereq>
         <packagereq type="optional">mercurial</packagereq>
+        <packagereq type="optional">mock</packagereq>
         <packagereq type="optional">monotone</packagereq>
-        <packagereq type="optional">pylint</packagereq>
         <packagereq type="optional">ocaml</packagereq>
+        <packagereq type="optional">pl</packagereq>
+        <packagereq type="optional">plt-scheme</packagereq>
+        <packagereq type="optional">pylint</packagereq>
         <packagereq type="optional">quilt</packagereq>
         <packagereq type="optional">rpmlint</packagereq>
-        <packagereq type="optional">rpmproc</packagereq>
         <packagereq type="optional">splint</packagereq>
         <packagereq type="optional">tkcvs</packagereq>
         <packagereq type="optional">tla</packagereq>
+        <packagereq type="optional">yap</packagereq>
         <packagereq type="optional">yasm</packagereq>
-        <packagereq type="optional">bigloo</packagereq>
     </packagelist>
   </group>
 
@@ -101,10 +103,12 @@
         <packagereq type="optional">blas</packagereq>
         <packagereq type="optional">cernlib-utils</packagereq>
         <packagereq type="optional">galculator</packagereq>
+        <packagereq type="optional">gdl</packagereq>
         <packagereq type="optional">hmmer</packagereq>
         <packagereq type="optional">kst</packagereq>
         <packagereq type="optional">lagan</packagereq>
         <packagereq type="optional">lapack</packagereq>
+        <packagereq type="optional">ncarg</packagereq>
         <packagereq type="optional">numpy</packagereq>
         <packagereq type="optional">octave</packagereq>
         <packagereq type="optional">qalculate-gtk</packagereq>
@@ -152,6 +156,7 @@
         <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">sabayon</packagereq>
@@ -195,12 +200,15 @@
         <packagereq type="optional">bzflag</packagereq>
         <packagereq type="optional">celestia</packagereq>
         <packagereq type="optional">cgoban</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">fillets-ng</packagereq>
         <packagereq type="optional">foobillard</packagereq>
         <packagereq type="optional">fortune-mod</packagereq>
         <packagereq type="optional">freeciv</packagereq>
+        <packagereq type="optional">freedoom</packagereq>
         <packagereq type="optional">freedroid</packagereq>
         <packagereq type="optional">freedroidrpg</packagereq>
         <packagereq type="optional">gl-117</packagereq>
@@ -213,24 +221,31 @@
         <packagereq type="optional">lacewing</packagereq>
         <packagereq type="optional">lincity-ng</packagereq>
         <packagereq type="optional">lmarbles</packagereq>
-		<packagereq type="optional">lucidlife</packagereq>
+        <packagereq type="optional">lucidlife</packagereq>
         <packagereq type="optional">Maelstrom</packagereq>
         <packagereq type="optional">nethack</packagereq>
         <packagereq type="optional">nethack-vultures</packagereq>
         <packagereq type="optional">neverball</packagereq>
         <packagereq type="optional">nexuiz</packagereq>
+        <packagereq type="optional">njam</packagereq>
         <packagereq type="optional">overgod</packagereq>
+        <packagereq type="optional">pipenightdreams</packagereq>
         <packagereq type="optional">powermanga</packagereq>
         <packagereq type="optional">ppracer</packagereq>
         <packagereq type="optional">qascade</packagereq>
         <packagereq type="optional">qqo</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">supertux</packagereq>
+        <packagereq type="optional">tong</packagereq>
         <packagereq type="optional">torcs</packagereq>
+        <packagereq type="optional">ularn</packagereq>
         <packagereq type="optional">uqm</packagereq>
         <packagereq type="optional">viruskiller</packagereq>
         <packagereq type="optional">wesnoth</packagereq>
@@ -239,6 +254,7 @@
         <packagereq type="optional">xpilot-ng</packagereq>
         <packagereq type="optional">xplanet</packagereq>
         <packagereq type="optional">xscorch</packagereq>
+        <packagereq type="optional">zasx</packagereq>
     </packagelist>
   </group>
 
@@ -302,6 +318,7 @@
         <packagereq type="optional">straw</packagereq>
         <packagereq type="optional">sylpheed</packagereq>
         <packagereq type="optional">sylpheed-claws</packagereq>
+        <packagereq type="optional">valknut</packagereq>
         <packagereq type="optional">x3270-x11</packagereq>
         <packagereq type="optional">xchat-gnome</packagereq>
     </packagelist>
@@ -319,6 +336,7 @@
         <packagereq type="optional">fontforge</packagereq>
         <packagereq type="optional">fyre</packagereq>
         <packagereq type="optional">grads</packagereq>
+        <packagereq type="optional">gv</packagereq>
         <packagereq type="optional">gpp</packagereq>
         <packagereq type="optional">gqview</packagereq>
         <packagereq type="optional">graphviz</packagereq>
@@ -347,6 +365,7 @@
       <packagereq type="optional">clamav-milter</packagereq>
       <packagereq type="optional">exim</packagereq>
       <packagereq type="optional">exim-doc</packagereq>
+      <packagereq type="optional">mlmmj</packagereq>
       <packagereq type="optional">pyzor</packagereq>
     </packagelist>
   </group>
@@ -389,6 +408,7 @@
         <packagereq type="optional">MagicPoint</packagereq>
         <packagereq type="optional">pybliographer</packagereq>
         <packagereq type="optional">qcad</packagereq>
+        <packagereq type="optional">texmaker</packagereq>
     </packagelist>
   </group>
 
@@ -414,10 +434,12 @@
         <packagereq type="optional">gnomebaker</packagereq>
         <packagereq type="optional">graveman</packagereq>
         <packagereq type="optional">grip</packagereq>
+        <packagereq type="optional">kid3</packagereq>
         <packagereq type="optional">kover</packagereq>
         <packagereq type="optional">libvisual-plugins</packagereq>
         <packagereq type="optional">soundconverter</packagereq>
         <packagereq type="optional">soundtracker</packagereq>
+        <packagereq type="optional">sweep</packagereq>
 	<packagereq type="optional">tagtool</packagereq>
 	<packagereq type="optional">ushare</packagereq>
         <packagereq type="optional">xmms</packagereq>
@@ -436,11 +458,11 @@
         <packagereq type="optional">aide</packagereq>
         <packagereq type="optional">airsnort</packagereq>
         <packagereq type="optional">apcupsd</packagereq>
-        <packagereq type="optional">apt</packagereq>
         <packagereq type="optional">cfengine</packagereq>
 	<packagereq type="optional">cfs</packagereq>
 	<packagereq type="optional">crack</packagereq>
 	<packagereq type="optional">dkms</packagereq>
+        <packagereq type="optional">environment-modules</packagereq>
         <packagereq type="optional">epylog</packagereq>
         <packagereq type="optional">fuse</packagereq>
         <packagereq type="optional">fwbuilder</packagereq>
@@ -448,6 +470,7 @@
         <packagereq type="optional">ghex</packagereq>
         <packagereq type="optional">hercules</packagereq>
         <packagereq type="optional">ibmonitor</packagereq>
+	<packagereq type="optional">inadyn</packagereq>
         <packagereq type="optional">lirc</packagereq>
         <packagereq type="optional">moodss</packagereq>
         <packagereq type="optional">moomps</packagereq>
@@ -514,6 +537,7 @@
         <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>
@@ -534,6 +558,9 @@
         <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_geoip</packagereq>
+        <packagereq type="optional">mod_security</packagereq>
         <packagereq type="optional">moin</packagereq>
         <packagereq type="optional">plone</packagereq>
         <packagereq type="optional">thttpd</packagereq>
@@ -553,8 +580,9 @@
     </grouplist>
     <packagelist>
       <packagereq type="mandatory">xemacs</packagereq>
-      <packagereq type="default">xemacs-el</packagereq>
+      <packagereq type="optional">xemacs-el</packagereq>
       <packagereq type="default">xemacs-info</packagereq>
+      <packagereq type="optional">xemacs-nox</packagereq>
       <packagereq type="default">xemacs-sumo</packagereq>
       <packagereq type="optional">xemacs-sumo-el</packagereq>
       <packagereq type="default">xemacs-sumo-info</packagereq>
@@ -670,6 +698,7 @@
       <packagereq type="optional">kbibtex</packagereq>
       <packagereq type="optional">kiosktool</packagereq>
       <packagereq type="optional">kmymoney2</packagereq>
+      <packagereq type="optional">kompose</packagereq>
       <packagereq type="optional">kyum</packagereq>
     </packagelist>
   </group>
@@ -706,7 +735,6 @@
       <packagereq type="optional">gparted</packagereq>
       <packagereq type="optional">gsynaptics</packagereq>
       <packagereq type="optional">qtparted</packagereq>
-      <packagereq type="optional">synaptic</packagereq>
       <packagereq type="optional">system-config-control</packagereq>
       <packagereq type="optional">yumex</packagereq>
     </packagelist>
@@ -785,4 +813,4 @@
       <groupid>network-server</groupid>
     </grouplist>
   </category>
-</comps>
+</comps>
\ No newline at end of file



From fedora-extras-commits at redhat.com  Mon Apr 17 20:28:36 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Mon, 17 Apr 2006 13:28:36 -0700
Subject: rpms/gphpedit/devel gphpedit.spec,1.1,1.2
Message-ID: <200604172028.k3HKSc1N030094@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/gphpedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30077

Modified Files:
	gphpedit.spec 
Log Message:
Ensure bundled (modified) gtkscintilla2 library is rebuilt; don't use precompiled binaries.


Index: gphpedit.spec
===================================================================
RCS file: /cvs/extras/rpms/gphpedit/devel/gphpedit.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gphpedit.spec	15 Apr 2006 01:51:25 -0000	1.1
+++ gphpedit.spec	17 Apr 2006 20:28:36 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           gphpedit
 Version:        0.9.80
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A PHP source editor for GNOME 2
 
 Group:          Applications/Text
@@ -40,6 +40,14 @@
 EOF
 
 %build
+# Remove precompiled binaries and rebuild bundled gtkscintilla2
+# (bundling is intentional and with good cause)
+pushd src/gtkscintilla2
+make clean
+make %{?_smp_mflags}
+popd
+
+# Configure and make main binary
 %configure
 make %{?_smp_mflags}
 
@@ -72,6 +80,10 @@
 %{_datadir}/gphpedit/php-gphpedit.api
 
 %changelog
+* Mon Apr 17 2006 Tim Jackson <rpm at timj.co.uk> 0.9.80-4
+- Ensure bundled gtkscintilla2 is rebuilt instead of using precompiled
+  binaries
+
 * Sat Apr 15 2006 Tim Jackson <rpm at timj.co.uk> 0.9.80-3
 - Remove gtk2-devel (gtkhtml2-devel and libgnomeui-devel will pull it in)
 - Remove empty NEWS file



From fedora-extras-commits at redhat.com  Mon Apr 17 20:43:43 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 17 Apr 2006 13:43:43 -0700
Subject: rpms/paraview/FC-4 paraview.spec,1.1,1.2
Message-ID: <200604172043.k3HKhj5B030301@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/paraview/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30284

Modified Files:
	paraview.spec 
Log Message:
FC4 X11 packages



Index: paraview.spec
===================================================================
RCS file: /cvs/extras/rpms/paraview/FC-4/paraview.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- paraview.spec	16 Apr 2006 01:44:53 -0000	1.1
+++ paraview.spec	17 Apr 2006 20:43:43 -0000	1.2
@@ -15,7 +15,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  cmake, lam
-BuildRequires:  libGLU-devel, libXt-devel
+BuildRequires:  xorg-x11-devel
 BuildRequires:  python-devel, tk-devel, hdf5-devel
 BuildRequires:  freetype-devel, libjpeg-devel, libpng-devel, libtiff-devel, zlib-devel
 BuildRequires:  expat-devel



From fedora-extras-commits at redhat.com  Mon Apr 17 21:16:04 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Mon, 17 Apr 2006 14:16:04 -0700
Subject: owners owners.list,1.851,1.852
Message-ID: <200604172116.k3HLG6Z9032662@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32645

Modified Files:
	owners.list 
Log Message:
Take over maintainership of apt/synaptic


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.851
retrieving revision 1.852
diff -u -r1.851 -r1.852
--- owners.list	17 Apr 2006 16:57:57 -0000	1.851
+++ owners.list	17 Apr 2006 21:16:04 -0000	1.852
@@ -44,7 +44,7 @@
 Fedora Extras|apg|Automated Password Generator for random password generation|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|apmud|Power Management daemon for Apple laptops|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|apollon|Filesharing client|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
-Fedora Extras|apt|Debian's Advanced Packaging Tool with RPM support|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|pmatilai at laiskiainen.org
+Fedora Extras|apt|Debian's Advanced Packaging Tool with RPM support|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|pmatilai at laiskiainen.org
 Fedora Extras|aqhbci-qt-tools|Setup wizard and debugger for the HBCI backend for the Aqbanking library|notting at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|arc|Arc archiver|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|argus|Network transaction audit tool|somlo at cmu.edu|extras-qa at fedoraproject.org|
@@ -1408,7 +1408,7 @@
 Fedora Extras|sylpheed-claws-plugins|Additional plugins for sylpheed-claws|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|sylpheed-claws|The bleeding edge branch of Sylpheed|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|sylpheed|GTK+ based, lightweight, and fast email client|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
-Fedora Extras|synaptic|Graphical frontend for APT package manager|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|pmatilai at laiskiainen.org
+Fedora Extras|synaptic|Graphical frontend for APT package manager|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|pmatilai at laiskiainen.org
 Fedora Extras|synce|For bugs related to the synce component|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|synce-gnomevfs|Gnome-vfs module for synce|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|synce-software-manager|Software manager for use with synce|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Apr 17 22:24:33 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 17 Apr 2006 15:24:33 -0700
Subject: rpms/paraview/FC-5 paraview.spec,1.1,1.2
Message-ID: <200604172224.k3HMOZ7M002497@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/paraview/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2480

Modified Files:
	paraview.spec 
Log Message:
Exclude ppc due to gcc bug #189160



Index: paraview.spec
===================================================================
RCS file: /cvs/extras/rpms/paraview/FC-5/paraview.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- paraview.spec	16 Apr 2006 01:44:53 -0000	1.1
+++ paraview.spec	17 Apr 2006 22:24:33 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           paraview
 Version:        2.4.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Parallel visualization application
 
 Group:          Applications/Engineering
@@ -20,6 +20,8 @@
 BuildRequires:  freetype-devel, libjpeg-devel, libpng-devel, libtiff-devel, zlib-devel
 BuildRequires:  expat-devel
 BuildRequires:  /usr/bin/desktop-file-install
+ExcludeArch:    ppc
+
 Requires:       %{name}-data = %{version}-%{release}
 Requires(post):   /usr/bin/update-desktop-database
 Requires(postun): /usr/bin/update-desktop-database
@@ -308,6 +310,9 @@
 
 
 %changelog
+* Mon Apr 17 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.3-6
+- Exclude ppc due to gcc bug #189160
+
 * Wed Apr 12 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.3-5
 - Cleanup permissions
 



From fedora-extras-commits at redhat.com  Mon Apr 17 22:25:13 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Mon, 17 Apr 2006 15:25:13 -0700
Subject: rpms/paraview/devel paraview.spec,1.1,1.2
Message-ID: <200604172225.k3HMPFs3002569@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/paraview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2548

Modified Files:
	paraview.spec 
Log Message:
Exclude ppc due to gcc bug #189160



Index: paraview.spec
===================================================================
RCS file: /cvs/extras/rpms/paraview/devel/paraview.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- paraview.spec	16 Apr 2006 01:44:53 -0000	1.1
+++ paraview.spec	17 Apr 2006 22:25:13 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           paraview
 Version:        2.4.3
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Parallel visualization application
 
 Group:          Applications/Engineering
@@ -20,6 +20,8 @@
 BuildRequires:  freetype-devel, libjpeg-devel, libpng-devel, libtiff-devel, zlib-devel
 BuildRequires:  expat-devel
 BuildRequires:  /usr/bin/desktop-file-install
+ExcludeArch:    ppc
+
 Requires:       %{name}-data = %{version}-%{release}
 Requires(post):   /usr/bin/update-desktop-database
 Requires(postun): /usr/bin/update-desktop-database
@@ -308,6 +310,9 @@
 
 
 %changelog
+* Mon Apr 17 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.3-6
+- Exclude ppc due to gcc bug #189160
+
 * Wed Apr 12 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.3-5
 - Cleanup permissions
 



From fedora-extras-commits at redhat.com  Tue Apr 18 00:20:44 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Mon, 17 Apr 2006 17:20:44 -0700
Subject: kadischi/post_install_scripts 04userconfig.py, 1.4, 1.5 05fsclean.py,
	1.3, 1.4 Makefile.am, 1.3, 1.4
Message-ID: <200604180020.k3I0KiN7007344@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi/post_install_scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7323/kadischi/post_install_scripts

Modified Files:
	04userconfig.py 05fsclean.py Makefile.am 
Log Message:
Few minor changes. Additional user account creation post_install_script.


Index: 04userconfig.py
===================================================================
RCS file: /cvs/devel/kadischi/post_install_scripts/04userconfig.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 04userconfig.py	12 Apr 2006 23:12:10 -0000	1.4
+++ 04userconfig.py	18 Apr 2006 00:20:42 -0000	1.5
@@ -27,13 +27,13 @@
     if (lokkit and ntsysv) == True:
         flc_log("Taking you to interactive user configuration..")
         run("chroot %s %s" % (sysdir, "/usr/sbin/lokkit"))
-        run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv"))
+        run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv --level 35"))
     else:
         flc_log("Skipping interactive user configuration..")
 else:
     if (lokkit and ntsysv) == True:
         flc_log("Taking you to interactive user configuration..")
         run("chroot %s %s" % (sysdir, "/usr/sbin/lokkit"))
-        run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv"))
+        run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv --level 35"))
     else:
         flc_log("Skipping interactive user configuration..")


Index: 05fsclean.py
===================================================================
RCS file: /cvs/devel/kadischi/post_install_scripts/05fsclean.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 05fsclean.py	31 Mar 2006 21:03:41 -0000	1.3
+++ 05fsclean.py	18 Apr 2006 00:20:42 -0000	1.4
@@ -7,7 +7,7 @@
 
 # Directories that we want to empty but not delete
 directories_to_be_emptied = [
-    '/root',
+#   '/root',  root's files should stay.
     '/proc',
     '/lost+found',
     '/var/gdm',
@@ -49,10 +49,10 @@
             continue
         os.remove (path)
 
-def clean_up_root (rootdir):
+#def clean_up_root (rootdir):
     # FIXME: Do this nicer at some point
-    os.system ("chroot %s /usr/bin/rsync -a /etc/skel/ /root/" % rootdir)
-    os.chmod (rootdir + '/root', 0750)
+#    os.system ("chroot %s /usr/bin/rsync -a /etc/skel/ /root/" % rootdir)
+#    os.chmod (rootdir + '/root', 0750)
 
 rootdir = sys.argv[1]
 
@@ -61,4 +61,4 @@
         directories_to_be_emptied,
         directories_to_be_cleaned,
         files_to_be_removed)
-clean_up_root (rootdir)
+#clean_up_root (rootdir)


Index: Makefile.am
===================================================================
RCS file: /cvs/devel/kadischi/post_install_scripts/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.am	10 Apr 2006 22:53:32 -0000	1.3
+++ Makefile.am	18 Apr 2006 00:20:42 -0000	1.4
@@ -1,5 +1,5 @@
 PYTHON_FILES = 03fstab.py 04userconfig.py 05fsclean.py 06sysconfig.py
-BASH_FILES = 01prelink.sh 02install.sh
+BASH_FILES = 01prelink.sh 02install.sh 07accounts.sh
 
 pisdir = $(pkgdatadir)/post_install_scripts
 pis_SCRIPTS = $(PYTHON_FILES) $(BASH_FILES)



From fedora-extras-commits at redhat.com  Tue Apr 18 00:21:35 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Mon, 17 Apr 2006 17:21:35 -0700
Subject: kadischi/post_install_scripts 07accounts.sh,NONE,1.1
Message-ID: <200604180021.k3I0LZI5007373@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi/post_install_scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7357/kadischi/post_install_scripts

Added Files:
	07accounts.sh 
Log Message:
Few minor changes. Additional user account creation post_install_script.


--- NEW FILE 07accounts.sh ---
#!/bin/bash
#
# Allow creation of addition user accounts.
# UIDs start at 500, GID is 100.


 . /etc/kadischi/kadischi.conf

SYSDIR=$1
ANACONDA_ARGS=$2
USING_KICKSTART=$(echo $ANACONDA_ARGS | grep -G [--]kickstart)
USING_CMDLINE=$(echo $ANACONDA_ARGS | egrep -- "-C|--cmdline")
i=0


if [ $USING_KICKSTART ] || [ $USING_CMDLINE ]; then   
   exit 0
else
   echo "A non-root user should be created, create one now?"
   echo -n "[yes/no] "
   read CHOICE
   if [ $CHOICE == "y" ] || [ $CHOICE == "yes" ]; then
      while [ $CHOICE == "y" ] || [ $CHOICE == "yes" ]; do
         echo -n "Username: "
         read NEWUSERNAME
         echo -n "User shell: "
         read NEWSHELL
         if [ -n $NEWUSERNAME ] && [ -n $NEWSHELL ]; then
            chroot $SYSDIR /usr/sbin/useradd -d /home/$NEWUSERNAME -m -s $NEWSHELL -u 50$i -g 100 $NEWUSERNAME
            chroot $SYSDIR /usr/bin/passwd $NEWUSERNAME
            echo "User: $NEWUSERNAME, UID: 50$i, GID: 100 created successfully."
            (( i += 1 ))
         else
            echo "Username or shell wasn't specified."
         fi
         echo "Would you like to create another user?"
         echo -n "[yes/no] "
         read CHOICE
      done
   else
      exit 0
   fi
fi




From fedora-extras-commits at redhat.com  Tue Apr 18 01:38:03 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 17 Apr 2006 18:38:03 -0700
Subject: rpms/SOAPpy - New directory
Message-ID: <200604180138.k3I1c5SB009669@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/SOAPpy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9648/SOAPpy

Log Message:
Directory /cvs/extras/rpms/SOAPpy added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 18 01:38:04 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 17 Apr 2006 18:38:04 -0700
Subject: rpms/SOAPpy/devel - New directory
Message-ID: <200604180138.k3I1c6hN009672@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/SOAPpy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9648/SOAPpy/devel

Log Message:
Directory /cvs/extras/rpms/SOAPpy/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 18 01:38:28 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 17 Apr 2006 18:38:28 -0700
Subject: rpms/SOAPpy Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604180138.k3I1cUrx009726@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/SOAPpy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9693

Added Files:
	Makefile import.log 
Log Message:
Setup of module SOAPpy


--- NEW FILE Makefile ---
# Top level Makefile for module SOAPpy
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 18 01:38:28 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 17 Apr 2006 18:38:28 -0700
Subject: rpms/SOAPpy/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604180138.k3I1cUVF009729@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/SOAPpy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9693/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module SOAPpy


--- 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 Apr 18 01:39:10 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 17 Apr 2006 18:39:10 -0700
Subject: rpms/SOAPpy import.log,1.1,1.2
Message-ID: <200604180139.k3I1dCxm009790@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/SOAPpy
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9757

Modified Files:
	import.log 
Log Message:
auto-import SOAPpy-0.11.6-2 on branch devel from SOAPpy-0.11.6-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/SOAPpy/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Apr 2006 01:38:28 -0000	1.1
+++ import.log	18 Apr 2006 01:39:10 -0000	1.2
@@ -0,0 +1 @@
+SOAPpy-0_11_6-2:HEAD:SOAPpy-0.11.6-2.src.rpm:1145324339



From fedora-extras-commits at redhat.com  Tue Apr 18 01:39:11 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 17 Apr 2006 18:39:11 -0700
Subject: rpms/SOAPpy/devel SOAPpy.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604180139.k3I1dDep009795@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/SOAPpy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9757/devel

Modified Files:
	.cvsignore sources 
Added Files:
	SOAPpy.spec 
Log Message:
auto-import SOAPpy-0.11.6-2 on branch devel from SOAPpy-0.11.6-2.src.rpm


--- NEW FILE SOAPpy.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           SOAPpy
Version:        0.11.6
Release:        2%{?dist}
Summary:        Full-featured SOAP library for Python
Group:          Development/Languages
License:        Python Software Foundation License
URL:            http://pywebsvcs.sourceforge.net/
Source0:        http://dl.sourceforge.net/pywebsvcs/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  python-fpconst >= 0.6.0
Requires:       python-fpconst >= 0.6.0
Requires:       PyXML >= 0.8.3
Requires:       python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")

%description
The goal of the SOAPpy team is to provide a full-featured SOAP library
for Python that is very simple to use and that fully supports dynamic
interaction between clients and servers.


%prep
%setup -q

# remove shell bangs
pushd %{name}/wstools
for file in $(find . -type f -name "*.py"); do
  cp $file $file.orig
  grep -v "\#\! \/usr\/bin" $file.orig > $file
  rm -f $file.orig
done
popd

# remove executable flag from example scripts
chmod -x bid/* contrib/* docs/* tools/* validate/*


%build
CFLAGS="%{optflags}" %{__python} setup.py build


%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}


%check
# testTime is meant to pass, testArray is a known failure.
# ERROR: testTime (__main__.SOAPTestCase)
# FAIL: testArray (__main__.SOAPTestCase)
PYTHONPATH="%{buildroot}%{python_sitelib}" %{__python} tests/SOAPtest.py || :


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc ChangeLog LICENSE README RELEASE_INFO TODO docs/ contrib/ validate/ bid/ tools/

%dir %{python_sitelib}/%{name}
%{python_sitelib}/%{name}/*.py
%{python_sitelib}/%{name}/*.pyc
%ghost %{python_sitelib}/%{name}/*.pyo

%dir %{python_sitelib}/%{name}/wstools
%{python_sitelib}/%{name}/wstools/*.py
%{python_sitelib}/%{name}/wstools/*.pyc
%ghost %{python_sitelib}/%{name}/wstools/*.pyo


%changelog
* Mon Apr 17 2006 Christopher Stone <chris.stone at gmail.com> 0.11.6-2
- Add docs directory to %doc
- Remove PyXML BR
- Removed executable bits from doc files
- Added call to run test script in %check
- Added examples to %doc

* Sat Apr 11 2006 Christopher Stone <chris.stone at gmail.com> 0.11.6-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/SOAPpy/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Apr 2006 01:38:28 -0000	1.1
+++ .cvsignore	18 Apr 2006 01:39:11 -0000	1.2
@@ -0,0 +1 @@
+SOAPpy-0.11.6.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/SOAPpy/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Apr 2006 01:38:28 -0000	1.1
+++ sources	18 Apr 2006 01:39:11 -0000	1.2
@@ -0,0 +1 @@
+51ac835366badedd932c64f26fa8336b  SOAPpy-0.11.6.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 18 01:43:07 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Mon, 17 Apr 2006 18:43:07 -0700
Subject: owners owners.list,1.852,1.853
Message-ID: <200604180143.k3I1h9uX009854@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9837

Modified Files:
	owners.list 
Log Message:
New package: SOAPpy


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.852
retrieving revision 1.853
diff -u -r1.852 -r1.853
--- owners.list	17 Apr 2006 21:16:04 -0000	1.852
+++ owners.list	18 Apr 2006 01:43:06 -0000	1.853
@@ -1373,6 +1373,7 @@
 Fedora Extras|smeg|Simple menu editor for GNOME|jpmahowald at gmail.com|extras-qa at fedoraproject.org|foolish at guezz.net
 Fedora Extras|snort|An intrusion detection system|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|snownews|A RSS/RDF news aggregator|shishz at hotpop.com|extras-qa at fedoraproject.org|
+Fedora Extras|SOAPpy|Full-featured SOAP library for Python|tkmame at retrogames.com|extras-qa at fedoraproject.org|
 Fedora Extras|sobby|Standalone obby server|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|sodipodi|Vector-based drawing program|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|sopwith|SDL port of sopwith|adrian at lisas.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Apr 18 02:09:09 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Mon, 17 Apr 2006 19:09:09 -0700
Subject: rpms/torque - New directory
Message-ID: <200604180209.k3I29B8I012402@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12378/torque

Log Message:
Directory /cvs/extras/rpms/torque added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 18 02:09:09 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Mon, 17 Apr 2006 19:09:09 -0700
Subject: rpms/torque/devel - New directory
Message-ID: <200604180209.k3I29BPG012405@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12378/torque/devel

Log Message:
Directory /cvs/extras/rpms/torque/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 18 02:09:21 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Mon, 17 Apr 2006 19:09:21 -0700
Subject: rpms/torque Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604180209.k3I29NXc012481@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12444

Added Files:
	Makefile import.log 
Log Message:
Setup of module torque


--- NEW FILE Makefile ---
# Top level Makefile for module torque
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 18 02:09:22 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Mon, 17 Apr 2006 19:09:22 -0700
Subject: rpms/torque/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604180209.k3I29O55012484@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12444/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module torque


--- 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 Apr 18 02:10:39 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Mon, 17 Apr 2006 19:10:39 -0700
Subject: rpms/torque import.log,1.1,1.2
Message-ID: <200604180210.k3I2AfIT012693@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12651

Modified Files:
	import.log 
Log Message:
auto-import torque-2.1.0p0-0.7.200604171430cvs on branch devel from torque-2.1.0p0-0.7.200604171430cvs.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/torque/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Apr 2006 02:09:21 -0000	1.1
+++ import.log	18 Apr 2006 02:10:39 -0000	1.2
@@ -0,0 +1 @@
+torque-2_1_0p0-0_7_200604171430cvs:HEAD:torque-2.1.0p0-0.7.200604171430cvs.src.rpm:1145326134



From fedora-extras-commits at redhat.com  Tue Apr 18 02:10:40 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Mon, 17 Apr 2006 19:10:40 -0700
Subject: rpms/torque/devel torque-2.1.0-remove-rpath.path, NONE,
	1.1 torque.spec, NONE, 1.1 xpbs.desktop, NONE, 1.1 xpbs.png,
	NONE, 1.1 xpbsmon.desktop, NONE, 1.1 xpbsmon.png, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604180210.k3I2AgqJ012702@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12651/devel

Modified Files:
	.cvsignore sources 
Added Files:
	torque-2.1.0-remove-rpath.path torque.spec xpbs.desktop 
	xpbs.png xpbsmon.desktop xpbsmon.png 
Log Message:
auto-import torque-2.1.0p0-0.7.200604171430cvs on branch devel from torque-2.1.0p0-0.7.200604171430cvs.src.rpm


--- NEW FILE torque-2.1.0-remove-rpath.path ---
Remove the rpath added by libtool as-per fedora guidelines

--- torque-2.1.0p0-snap.200604071240/configure	2006-04-07 15:41:06.000000000 -0400
+++ ./configure	2006-04-08 15:53:16.000000000 -0400
@@ -5935,7 +5935,8 @@
 
   if test "$ld_shlibs" = yes; then
     runpath_var=LD_RUN_PATH
-    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
+    # hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
+    hardcode_libdir_flag_spec=''
     export_dynamic_flag_spec='${wl}--export-dynamic'
     case $host_os in
     cygwin* | mingw* | pw32*)


--- NEW FILE torque.spec ---

# comment out snap if building a real release
%define name torque
%define version 2.1.0p0
%define snap 200604171430
%define release 7

# The following options are supported:
#   --with server_name=hostname
#   --with homedir=directory
#   --with[out] rcp
#   --with[out] gui
#   --with[out] tcl


# Hrm, should we default to the name of the buildhost?  That seems only
# slightly better than picking a hostname at random.  This is exactly the kind
# of compile-time default that doesn't work well with distributable packages.
# Let's force the issue with the non-sensical "localhost".
#
# Note that "localhost" doesn't actually work.  You must either define the
# correct hostname here, pass '--with server_name=foo' to rpmbuild, or be sure
# that $PBS_SERVER_HOME/server_name contains the correct hostname.
%define server_name localhost

# change as you wish
%define use_rcp 0
%define use_tcl 1
%define build_gui 1

# these are non-defaults, but fit better into most RPM-based systems
%define torquehomedir %_localstatedir/torque



# --with/--without processing
# first, error if conflicting options are used
%{?_with_rcp: %{?_without_rcp: %{error: both _with_rcp and _without_rcp}}}
%{?_with_tcl: %{?_without_tcl: %{error: both _with_tcl and _without_tcl}}}
%{?_with_gui: %{?_without_gui: %{error: both _with_gui and _without_gui}}}

# did we find any --with options?
%{?_with_rcp: %define use_rcp 1}
%{?_with_tcl: %define use_tcl 1}
%{?_with_gui: %define build_gui 1}

%{?_with_server_name:%define server_name %(set -- %{_with_server_name}; echo $1 | grep -v with | sed 's/=//')}
%{?_with_homedir:%define torquehomedir %(set -- %{_with_homedir}; echo $1 | grep -v with | sed 's/=//')}

# did we find any --without options?
%{?_without_rcp: %define use_rcp 0}
%{?_without_tcl: %define use_tcl 0}
%{?_without_gui: %define build_gui 0}

# Set up all options as disabled
%define rcpflags    --with-rcp=/usr/bin/scp
%define tclflags    --without-tcl
%define guiflags    --disable-gui

# Enable options that we want
%if %use_rcp
%define rcpflags    --with-rcp=mom_rcp
%endif

%if %build_gui
%define guiflags   --enable-gui
%endif

%if %use_tcl
%if %build_gui
%define tclflags    --with-tcl --with-tk
%else
%define tclflags    --with-tcl --without-tk
%endif
%endif

# finish up the configs...
%define server_nameflags --with-default-server=%{server_name}


%define shared_description %(echo -e "TORQUE (Tera-scale Open-source Resource and QUEue manager) is a resource \\nmanager providing control over batch jobs and distributed compute nodes.  \\nTORQUE is based on OpenPBS version 2.3.12 and incorporates scalability, \\nfault tolerance, and feature extension patches provided by USC, NCSA, OSC, \\nthe U.S. Dept of Energy, Sandia, PNNL, U of Buffalo, TeraGrid, and many \\nother leading edge HPC organizations.\\n\\nThis build was configured with:\\n  %{server_nameflags}\\n  %{tclflags}\\n  %{guiflags}\\n  %{rcpflags}\\n")


Summary: Tera-scale Open-source Resource and QUEue manager
Name: %{name}
Version: %{version}
Release: %{?snap:0.%{release}.%{snap}cvs}%{!?snap:%{release}}%{?dist}
Source: torque-%{version}%{?snap:-snap.%snap}.tar.gz
Source2: xpbs.desktop
Source3: xpbsmon.desktop
Source4: xpbs.png
Source5: xpbsmon.png
Patch1: torque-2.1.0-remove-rpath.path
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
Conflicts: pbspro, openpbs, openpbs-oscar

%if %use_tcl
BuildRequires: tcl-devel
%endif
%if %build_gui
BuildRequires: tk-devel
%else
Obsoletes: torque-gui
%endif
%if ! %use_rcp
Requires: openssh-clients
%endif

%description
%shared_description
This package holds just a few shared files and directories.


%prep
%setup -q -n torque-%{version}%{?snap:-snap.%snap}
%patch1 -p1

%__cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} .


%build
%configure --includedir=%{_includedir}/torque --with-server-home=%{torquehomedir} \
 %{server_nameflags} %{guiflags} %{tclflags} %{rcpflags}

%__make %{?_smp_mflags}
 


%install
%__rm -rf "$RPM_BUILD_ROOT"
%__make DESTDIR=$RPM_BUILD_ROOT install

# remove files we don't need
%__rm -f $RPM_BUILD_ROOT/%_libdir/*.la
%__rm -f $RPM_BUILD_ROOT/%_libdir/*/buildindex

# install initscripts
%__mkdir_p $RPM_BUILD_ROOT%{_initrddir}
for daemon in pbs_mom pbs_sched pbs_server; do
  %__sed -e 's|^PBS_HOME=.*|PBS_HOME=%{torquehomedir}|' \
         -e 's|^PBS_DAEMON=.*|PBS_DAEMON=%{_sbindir}/'$daemon'|' \
         -e 's|chkconfig: 345|chkconfig: -|' \
        < contrib/init.d/$daemon > $RPM_BUILD_ROOT%{_initrddir}/$daemon
  %__chmod 755 $RPM_BUILD_ROOT%{_initrddir}/$daemon
done

%if %{build_gui}
# This is really trivial, but cleans up an rpmlint warning
%__sed -i -e 's|%_lib/../||' $RPM_BUILD_ROOT%{_bindir}/xpbs

# install .desktop files and my ugly icons
desktop-file-install --vendor fedora                   \
        --dir $RPM_BUILD_ROOT%{_datadir}/applications  \
        --add-category X-Fedora                        \
        xpbs.desktop
desktop-file-install --vendor fedora                   \
        --dir $RPM_BUILD_ROOT%{_datadir}/applications  \
        --add-category X-Fedora                        \
        xpbsmon.desktop
%__install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
%__install -p -m0644 xpbs.png xpbsmon.png $RPM_BUILD_ROOT%{_datadir}/pixmaps

%endif


%clean
%__rm -rf "$RPM_BUILD_ROOT"


%post
if %__grep -q "PBS services" /etc/services;then
   : PBS services already installed
else
   cat<<-__EOF__>>/etc/services
	# Standard PBS services
	pbs           15001/tcp           # pbs server (pbs_server)
	pbs           15001/udp           # pbs server (pbs_server)
	pbs_mom       15002/tcp           # mom to/from server
	pbs_mom       15002/udp           # mom to/from server
	pbs_resmom    15003/tcp           # mom resource management requests
	pbs_resmom    15003/udp           # mom resource management requests
	pbs_sched     15004/tcp           # scheduler
	pbs_sched     15004/udp           # scheduler
	__EOF__
fi


%files
%defattr(-, root, root)
%doc README.torque torque.setup Release_Notes CHANGELOG PBS_License.txt
%config(noreplace) %{torquehomedir}/pbs_environment
%config(noreplace) %{torquehomedir}/server_name
%{torquehomedir}/aux
%{torquehomedir}/spool


%package docs
Group: Documentation
Summary: Documentation files for TORQUE
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
Provides: pbs-docs
%description docs
%shared_description
This package holds the documentation files.

%files docs
%defattr(-, root, root)
%doc doc/admin_guide.ps
%{_mandir}/man*/*


%package scheduler
Group: System Environment/Daemons
Summary: Simple fifo scheduler for TORQUE
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
Provides: pbs-scheduler
%description scheduler
%shared_description
This package holds the fifo C scheduler.

%files scheduler
%defattr(-, root, root)
%attr(0755, root, root) %{_sbindir}/pbs_sched
%{_initrddir}/pbs_sched
%dir %{torquehomedir}/sched_priv
%config(noreplace) %{torquehomedir}/sched_priv/*
%{torquehomedir}/sched_logs

%post scheduler
/sbin/chkconfig --add pbs_sched

%preun scheduler
if [ $1 -eq 0 ]; then
   /sbin/service pbs_sched stop 
   /sbin/chkconfig --del pbs_sched
fi


%package server
Group: System Environment/Daemons
Summary: The main part of TORQUE
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
Provides: pbs-server
%description server
%shared_description
This package holds the server.

%files server
%defattr(-, root, root)
%attr(0755, root, root) %{_sbindir}/pbs_server
%attr(0755, root, root) %{_sbindir}/momctl
%{_initrddir}/pbs_server
%{torquehomedir}/server_logs
%{torquehomedir}/server_priv

%post server
/sbin/chkconfig --add pbs_server

%preun server
if [ $1 -eq 0 ]; then
   /sbin/service pbs_server stop 
   /sbin/chkconfig --del pbs_server
fi


%package mom
Group: System Environment/Daemons
Summary: Node execution daemon for TORQUE
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
Provides: pbs-mom
%description mom
%shared_description
This package holds the execute daemon required on every node.

%files mom
%defattr(-, root, root)
%attr(0755, root, root) %{_sbindir}/pbs_mom
%{_initrddir}/pbs_mom
%if %{use_rcp}
%attr(4755 root root) %{_sbindir}/pbs_rcp
%endif
%{torquehomedir}/mom_priv/*
%{torquehomedir}/mom_logs
%{torquehomedir}/checkpoint
%{torquehomedir}/undelivered

%post mom
/sbin/chkconfig --add pbs_mom

%preun mom
if [ $1 -eq 0 ]; then
   /sbin/service pbs_mom stop 
   /sbin/chkconfig --del pbs_mom
fi


%package client
Group: Applications/System
Summary: Client part of TORQUE
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
Provides: pbs-client
%description client
%shared_description
This package holds the command-line client programs.

%files client
%defattr(-, root, root)
%{_bindir}/q*
%{_bindir}/chk_tree
%{_bindir}/hostn
%{_bindir}/nqs2pbs
%{_bindir}/pbsdsh
%{_bindir}/pbsnodes
%{_bindir}/printjob
%{_bindir}/printtracking
%{_bindir}/tracejob
%attr(4755 root root) %{_sbindir}/pbs_iff
%{_sbindir}/pbs_demux
%if %use_tcl
%{_bindir}/pbs_tclsh
%endif

%package gui
Group: Applications/System
Summary: Graphical clients for TORQUE
Requires: %{name}-client = %{?epoch:%{epoch}:}%{version}-%{release}
Provides: xpbs xpbsmon
%description gui
%shared_description
This package holds the graphical clients.


%if %{build_gui}
%files gui
%defattr(-, root, root)
%{_bindir}/pbs_wish
%{_bindir}/xpbs
%{_bindir}/xpbsmon
%{_libdir}/xpbs
%{_libdir}/xpbsmon
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/*.png
%endif


%package localhost
Group: Applications/System
Summary: Installs and configures a minimal localhost-only batch queue system
Requires(post): %{name}-mom %{name}-server %{name}-client %{name}-scheduler

%description localhost
%shared_description
This package installs and configures a minimal localhost-only batch queue
system.

%files localhost
%defattr(-, root, root)
%pre localhost
if [ -f %{torquehomedir}/server_priv/serverdb ];then
   echo "This package wipes out the existing server configuration.  Remove" 1>&2
   echo "%{torquehomedir}/server_priv/serverdb if you really want this." 1>&2
   exit 1
fi
%post localhost
/sbin/chkconfig pbs_mom on
/sbin/chkconfig pbs_server on
/sbin/chkconfig pbs_sched on
/bin/hostname --long > %{torquehomedir}/server_priv/nodes
/bin/hostname --long > %{torquehomedir}/server_name
/bin/hostname --long > %{torquehomedir}/mom_priv/config
pbs_server -t create
qmgr -c "s s scheduling=true"
qmgr -c "c q batch queue_type=execution"
qmgr -c "s q batch started=true"
qmgr -c "s q batch enabled=true"
qmgr -c "s q batch resources_default.nodes=1"
qmgr -c "s q batch resources_default.walltime=3600"
qmgr -c "s s default_queue=batch"
%{_initrddir}/pbs_mom restart
%{_initrddir}/pbs_sched restart
%{_initrddir}/pbs_server restart
qmgr -c "s n `/bin/hostname --long` state=free" -e


%package -n lib%{name}
Summary: Run-time libs for programs which will use the %{name} library
Group: Development/Libraries
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}

%description -n lib%{name}
%shared_description
This package includes the shared libraries
necessary for running TORQUE programs.

%files -n lib%{name}
%defattr(-, root, root)
%{_libdir}/*.so.*

%post -n lib%{name} -p /sbin/ldconfig
%postun -n lib%{name} -p /sbin/ldconfig

%package -n lib%{name}-devel
Summary: Development tools for programs which will use the %{name} library
Group: Development/Libraries
Requires: lib%{name} = %{?epoch:%{epoch}:}%{version}-%{release}

%description -n lib%{name}-devel
%shared_description
This package includes the header files and static libraries
necessary for developing programs which will use %{name}.

%files -n lib%{name}-devel
%defattr(-, root, root)
%{_libdir}/*.a
%{_libdir}/*.so
%{_includedir}/torque
%{_bindir}/pbs-config


%changelog
* Mon Apr 17 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.7.200604171430cvs
- importing to fedora extras

* Mon Apr 17 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.6.200604171430cvs
- add %%{dist} tag
- cleanup the cleanups in spec
- bump to matching upstream
- move headers to /usr/include/torque/

* Wed Apr 12 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.5.200604071240cvs
- remove rpath

* Tue Apr 11 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.4.200604071240cvs
- fix release string to match fedora guidelines

* Fri Apr  7 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.3.200604071240
- spec and initscript cleanups

* Wed Apr  5 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.2.200604051756
- add .desktop files

* Wed Apr  5 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.1.200604051756
- Initial package for Fedora Extras




--- NEW FILE xpbs.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=xpbs
GenericName=PBS/TORQUE client
Comment=View job status and submit jobs
Exec=xpbs
Icon=xpbs.png
Terminal=false
Type=Application
Categories=Application;Other;
Version=1.1.12


--- NEW FILE xpbsmon.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=xpbsmon
GenericName=PBS/TORQUE cluster monitor
Comment=View node status
Exec=xpbsmon
Icon=xpbsmon.png
Terminal=false
Type=Application
Categories=Application;Other;
Version=2.3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Apr 2006 02:09:21 -0000	1.1
+++ .cvsignore	18 Apr 2006 02:10:40 -0000	1.2
@@ -0,0 +1 @@
+torque-2.1.0p0-snap.200604171430.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Apr 2006 02:09:21 -0000	1.1
+++ sources	18 Apr 2006 02:10:40 -0000	1.2
@@ -0,0 +1 @@
+00ae6cf8f95960c83022ff9037dc1d57  torque-2.1.0p0-snap.200604171430.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 18 02:20:10 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Mon, 17 Apr 2006 19:20:10 -0700
Subject: owners owners.list,1.853,1.854
Message-ID: <200604180220.k3I2KCYA012900@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12883

Modified Files:
	owners.list 
Log Message:
Adding torque



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.853
retrieving revision 1.854
diff -u -r1.853 -r1.854
--- owners.list	18 Apr 2006 01:43:06 -0000	1.853
+++ owners.list	18 Apr 2006 02:20:10 -0000	1.854
@@ -1470,6 +1470,7 @@
 Fedora Extras|tong|A game of skill|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|torcs|An OpenGL 3d racing game|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|torcs-data|The Open Racing Car Simulator data files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|torque|Tera-scale Open-source Resource and QUEue manager|garrick at usc.edu|extras-qa at fedoraproject.org|
 Fedora Extras|torsmo|TyopoytaORvelo System MOnitor|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|tpb|IBM ThinkPad button support utility|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|tpctl|IBM ThinkPad configuration tools|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Apr 18 03:20:10 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 17 Apr 2006 20:20:10 -0700
Subject: rpms/edb/FC-5 .cvsignore, 1.5, 1.6 edb.spec, 1.12, 1.13 sources, 1.5,
	1.6
Message-ID: <200604180320.k3I3KCY6015202@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/edb/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15179

Modified Files:
	.cvsignore edb.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/edb/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Feb 2006 08:12:28 -0000	1.5
+++ .cvsignore	18 Apr 2006 03:20:09 -0000	1.6
@@ -1 +1 @@
-edb-1.0.5.005.tar.gz
+edb-1.0.5.007.tar.gz


Index: edb.spec
===================================================================
RCS file: /cvs/extras/rpms/edb/FC-5/edb.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- edb.spec	14 Feb 2006 05:00:20 -0000	1.12
+++ edb.spec	18 Apr 2006 03:20:10 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           edb
-Version:        1.0.5.005
+Version:        1.0.5.007
 Release:        1%{?dist}
 
 Summary:        A database convenience library wrapped around BDB
@@ -84,6 +84,9 @@
 %{_bindir}/edb_gtk_ed
 
 %changelog
+* Mon Apr 17 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5.007-1
+- Upstream update
+
 * Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.5.005-1
 - Upstream update
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/edb/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Feb 2006 08:12:28 -0000	1.5
+++ sources	18 Apr 2006 03:20:10 -0000	1.6
@@ -1 +1 @@
-6b6eaa69ea05bf4b4972554f34fd8919  edb-1.0.5.005.tar.gz
+e5d8dcb5995913ae6b7f205e7ac28dbe  edb-1.0.5.007.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 18 04:44:33 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 17 Apr 2006 21:44:33 -0700
Subject: rpms/eet/FC-5 .cvsignore,1.4,1.5 eet.spec,1.7,1.8 sources,1.4,1.5
Message-ID: <200604180444.k3I4iZM5017495@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/eet/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17453/FC-5

Modified Files:
	.cvsignore eet.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eet/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Feb 2006 05:10:58 -0000	1.4
+++ .cvsignore	18 Apr 2006 04:44:33 -0000	1.5
@@ -1 +1 @@
-eet-0.9.10.023.tar.gz
+eet-0.9.10.026.tar.gz


Index: eet.spec
===================================================================
RCS file: /cvs/extras/rpms/eet/FC-5/eet.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- eet.spec	14 Feb 2006 05:00:26 -0000	1.7
+++ eet.spec	18 Apr 2006 04:44:33 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           eet
-Version:        0.9.10.023
-Release:        2%{?dist}
+Version:        0.9.10.026
+Release:        1%{?dist}
 Summary:        A library designed to write an arbitary set of chunks of data to a file
 
 Group:          System Environment/Libraries
@@ -60,6 +60,9 @@
 %{_libdir}/pkgconfig/eet.pc
 
 %changelog
+* Tue Apr 18 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.10-026-1
+- Upstream update
+
 * Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.10.023-2
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eet/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Feb 2006 05:10:58 -0000	1.4
+++ sources	18 Apr 2006 04:44:33 -0000	1.5
@@ -1 +1 @@
-d1862511bc2798747b85a2386fb2105a  eet-0.9.10.023.tar.gz
+82fa206da7926c0507bce22a0d916400  eet-0.9.10.026.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 18 04:44:34 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Mon, 17 Apr 2006 21:44:34 -0700
Subject: rpms/eet/devel .cvsignore,1.4,1.5 eet.spec,1.7,1.8 sources,1.4,1.5
Message-ID: <200604180444.k3I4iaHQ017501@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/eet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17453/devel

Modified Files:
	.cvsignore eet.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/eet/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Feb 2006 05:10:58 -0000	1.4
+++ .cvsignore	18 Apr 2006 04:44:33 -0000	1.5
@@ -1 +1 @@
-eet-0.9.10.023.tar.gz
+eet-0.9.10.026.tar.gz


Index: eet.spec
===================================================================
RCS file: /cvs/extras/rpms/eet/devel/eet.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- eet.spec	14 Feb 2006 05:00:26 -0000	1.7
+++ eet.spec	18 Apr 2006 04:44:34 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           eet
-Version:        0.9.10.023
-Release:        2%{?dist}
+Version:        0.9.10.026
+Release:        1%{?dist}
 Summary:        A library designed to write an arbitary set of chunks of data to a file
 
 Group:          System Environment/Libraries
@@ -60,6 +60,9 @@
 %{_libdir}/pkgconfig/eet.pc
 
 %changelog
+* Tue Apr 18 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.10-026-1
+- Upstream update
+
 * Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.10.023-2
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/eet/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Feb 2006 05:10:58 -0000	1.4
+++ sources	18 Apr 2006 04:44:34 -0000	1.5
@@ -1 +1 @@
-d1862511bc2798747b85a2386fb2105a  eet-0.9.10.023.tar.gz
+82fa206da7926c0507bce22a0d916400  eet-0.9.10.026.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 18 07:59:36 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Tue, 18 Apr 2006 00:59:36 -0700
Subject: owners owners.list,1.854,1.855
Message-ID: <200604180759.k3I7xcgL024166@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24149

Modified Files:
	owners.list 
Log Message:
fix broken entries -- missing initialcclist field separator


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.854
retrieving revision 1.855
diff -u -r1.854 -r1.855
--- owners.list	18 Apr 2006 02:20:10 -0000	1.854
+++ owners.list	18 Apr 2006 07:59:36 -0000	1.855
@@ -197,7 +197,7 @@
 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|docbook2X|Convert docbook into man and Texinfo|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|doctorj|Java source code analyzer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|dogtail|GUI test tool and automation framework|zcerza at redhat.com|extras-qa at fedoraproject.org
+Fedora Extras|dogtail|GUI test tool and automation framework|zcerza at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|dosbox|An x86/DOS emulator with sound/graphics|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|doulos-fonts|Doulos SIL fonts|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|drgeo-doc|html documentation for drgeo|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
@@ -1205,7 +1205,7 @@
 Fedora Extras|pylint|Analyzes Python code looking for bugs and signs of poor quality|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|pyparsing|An object-oriented approach to text processing|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|PyRTF|Rich Text Format (RTF) Document Generation in Python|mpeters at mac.com|extras-qa at fedoraproject.org|
-Fedora Extras|pyspi|Python bindings for AT-SPI|zcerza at redhat.com|extras-qa at fedoraproject.org
+Fedora Extras|pyspi|Python bindings for AT-SPI|zcerza at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-4Suite-XML|A collection of XML-related technologies for Python|mitr at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-adns|Python interface for the GNU adns library|byte at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|python-amara|A collection of Pythonic tools for XML data binding|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Apr 18 12:45:24 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 18 Apr 2006 05:45:24 -0700
Subject: rpms/evas/FC-5 .cvsignore, 1.2, 1.3 evas.spec, 1.3, 1.4 sources, 1.2,
	1.3
Message-ID: <200604181245.k3ICjQnq003431@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/evas/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3394/FC-5

Modified Files:
	.cvsignore evas.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/evas/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Feb 2006 18:47:45 -0000	1.2
+++ .cvsignore	18 Apr 2006 12:45:23 -0000	1.3
@@ -1 +1 @@
-evas-0.9.9.023.tar.gz
+evas-0.9.9.026.tar.gz


Index: evas.spec
===================================================================
RCS file: /cvs/extras/rpms/evas/FC-5/evas.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- evas.spec	14 Feb 2006 05:00:31 -0000	1.3
+++ evas.spec	18 Apr 2006 12:45:23 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           evas
-Version:        0.9.9.023
-Release:        2%{?dist}
+Version:        0.9.9.026
+Release:        1%{?dist}
 Summary:        A hardware-accelerated canvas API
 
 Group:          System Environment/Libraries
@@ -64,6 +64,7 @@
 %{_bindir}/*_window
 %{_datadir}/%{name}
 %{_libdir}/*.so.*
+%{_libdir}/%{name}
 
 %files devel
 %defattr(-,root,root,-)
@@ -74,6 +75,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Apr 18 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.9.026-1
+- Upstream update
+
 * Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.9.023-2
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/evas/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Feb 2006 18:47:45 -0000	1.2
+++ sources	18 Apr 2006 12:45:23 -0000	1.3
@@ -1 +1 @@
-ca5528c8894d49cbdf77873f5974c0e8  evas-0.9.9.023.tar.gz
+b2285236b8dff678a0076de2baa39095  evas-0.9.9.026.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 18 12:45:25 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 18 Apr 2006 05:45:25 -0700
Subject: rpms/evas/devel .cvsignore, 1.2, 1.3 evas.spec, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <200604181245.k3ICjR7P003437@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/evas/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3394/devel

Modified Files:
	.cvsignore evas.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/evas/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Feb 2006 18:47:45 -0000	1.2
+++ .cvsignore	18 Apr 2006 12:45:24 -0000	1.3
@@ -1 +1 @@
-evas-0.9.9.023.tar.gz
+evas-0.9.9.026.tar.gz


Index: evas.spec
===================================================================
RCS file: /cvs/extras/rpms/evas/devel/evas.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- evas.spec	14 Feb 2006 05:00:31 -0000	1.3
+++ evas.spec	18 Apr 2006 12:45:24 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           evas
-Version:        0.9.9.023
-Release:        2%{?dist}
+Version:        0.9.9.026
+Release:        1%{?dist}
 Summary:        A hardware-accelerated canvas API
 
 Group:          System Environment/Libraries
@@ -64,6 +64,7 @@
 %{_bindir}/*_window
 %{_datadir}/%{name}
 %{_libdir}/*.so.*
+%{_libdir}/%{name}
 
 %files devel
 %defattr(-,root,root,-)
@@ -74,6 +75,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Tue Apr 18 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.9.026-1
+- Upstream update
+
 * Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.9.023-2
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/evas/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Feb 2006 18:47:45 -0000	1.2
+++ sources	18 Apr 2006 12:45:24 -0000	1.3
@@ -1 +1 @@
-ca5528c8894d49cbdf77873f5974c0e8  evas-0.9.9.023.tar.gz
+b2285236b8dff678a0076de2baa39095  evas-0.9.9.026.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 18 13:54:28 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 18 Apr 2006 06:54:28 -0700
Subject: rpms/perl-Crypt-Random - New directory
Message-ID: <200604181354.k3IDsUcR006413@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-Random
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6386/perl-Crypt-Random

Log Message:
Directory /cvs/extras/rpms/perl-Crypt-Random added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 18 13:54:28 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 18 Apr 2006 06:54:28 -0700
Subject: rpms/perl-Crypt-Random/devel - New directory
Message-ID: <200604181354.k3IDsUrl006416@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-Random/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6386/perl-Crypt-Random/devel

Log Message:
Directory /cvs/extras/rpms/perl-Crypt-Random/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 18 13:55:01 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 18 Apr 2006 06:55:01 -0700
Subject: rpms/perl-Crypt-Random Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604181355.k3IDt3kh006484@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-Random
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6449

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Crypt-Random


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Crypt-Random
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 18 13:55:01 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 18 Apr 2006 06:55:01 -0700
Subject: rpms/perl-Crypt-Random/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200604181355.k3IDt3Eo006487@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-Random/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6449/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Crypt-Random


--- 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 Apr 18 13:55:52 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 18 Apr 2006 06:55:52 -0700
Subject: rpms/perl-Crypt-Random/devel perl-Crypt-Random.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604181355.k3IDts32006566@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-Random/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6530/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Crypt-Random.spec 
Log Message:
auto-import perl-Crypt-Random-1.25-1 on branch devel from perl-Crypt-Random-1.25-1.src.rpm


--- NEW FILE perl-Crypt-Random.spec ---
Summary:	Cryptographically Secure, True Random Number Generator
Name:		perl-Crypt-Random
Version:	1.25
Release:	1%{?dist}
License:	GPL or Artistic
Group:		Development/Libraries
Url:		http://search.cpan.org/dist/Crypt-Random/
Source0:	http://search.cpan.org/CPAN/authors/id/V/VI/VIPUL/Crypt-Random-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:	noarch
BuildRequires:	perl(Math::Pari)    >= 2.001804
BuildRequires:	perl(Class::Loader) >= 2.00

%description
Crypt::Random is an interface module to the /dev/random device found on most
modern unix systems. It also interfaces with egd, a user space entropy
gathering daemon, available for systems where /dev/random (or similar) devices
are not available. When Math::Pari is installed, Crypt::Random can generate
random integers of arbritary size of a given bitsize or in a specified
interval.

%prep
%setup -q -n Crypt-Random-%{version}

# Remove shellbangs to shut rpmlint up
/usr/bin/find ./lib -name '*.pm' -print | /usr/bin/xargs %{__sed} -i -e '/^#! *\/usr\/bin\/perl /d'

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
%{__make} %{?_smp_mflags}

%check
%{__make} test

%install
%{__rm} -rf %{buildroot}
%{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
/usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
/usr/bin/find %{buildroot} -type d -depth -exec /bin/rmdir {} 2>/dev/null ';'
%{__chmod} -R u+w %{buildroot}/*

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,0755)
%doc Changes README
%{_bindir}/makerandom
%{perl_vendorlib}/Crypt/
%{_mandir}/man3/Crypt::Random.3pm*

%changelog
* Mon Dec  5 2005 Paul Howarth <paul at city-fan.org> 1.25-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-Random/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Apr 2006 13:55:01 -0000	1.1
+++ .cvsignore	18 Apr 2006 13:55:52 -0000	1.2
@@ -0,0 +1 @@
+Crypt-Random-1.25.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-Random/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Apr 2006 13:55:01 -0000	1.1
+++ sources	18 Apr 2006 13:55:52 -0000	1.2
@@ -0,0 +1 @@
+5730c9d5acdd698790216d354ffb0513  Crypt-Random-1.25.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 18 13:55:50 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 18 Apr 2006 06:55:50 -0700
Subject: rpms/perl-Crypt-Random import.log,1.1,1.2
Message-ID: <200604181356.k3IDuMqr006573@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-Random
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6530

Modified Files:
	import.log 
Log Message:
auto-import perl-Crypt-Random-1.25-1 on branch devel from perl-Crypt-Random-1.25-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-Random/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Apr 2006 13:55:00 -0000	1.1
+++ import.log	18 Apr 2006 13:55:50 -0000	1.2
@@ -0,0 +1 @@
+perl-Crypt-Random-1_25-1:HEAD:perl-Crypt-Random-1.25-1.src.rpm:1145368407



From fedora-extras-commits at redhat.com  Tue Apr 18 13:56:54 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Tue, 18 Apr 2006 06:56:54 -0700
Subject: fedora-security/audit fc4,1.203,1.204 fc5,1.116,1.117
Message-ID: <200604181356.k3IDusMF006626@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6578/audit

Modified Files:
	fc4 fc5 
Log Message:
Update CVE-2006-0744



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -r1.203 -r1.204
--- fc4	15 Apr 2006 12:26:14 -0000	1.203
+++ fc4	18 Apr 2006 13:56:52 -0000	1.204
@@ -111,7 +111,7 @@
 CVE-2006-0748 VULNERABLE (firefox, fixed 1.0.8)
 CVE-2006-0746 VULNERABLE (kpdf) bz#184308
 CVE-2006-0745 version (xorg-x11) not fc4
-CVE-2006-0744 VULNERABLE (kernel)
+CVE-2006-0744 VULNERABLE (kernel, fixed 2.6.16.5)
 CVE-2006-0742 version (kernel, fixed 2.6.16) patch-2.6.16-rc6 [since FEDORA-2006-245]
 CVE-2006-0741 version (kernel, fixed 2.6.15.5) [since FEDORA-2006-245] was backport since FEDORA-2006-131
 CVE-2006-0730 version (dovecot, 1.0beta[12] only)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -r1.116 -r1.117
--- fc5	15 Apr 2006 12:26:14 -0000	1.116
+++ fc5	18 Apr 2006 13:56:52 -0000	1.117
@@ -112,7 +112,7 @@
 CVE-2006-0748 VULNERABLE (firefox, fixed 1.5.0.2)
 CVE-2006-0746 version (kdegraphics, fixed 3.4)
 CVE-2006-0745 backport (xorg-x11) [since FEDORA-2006-172]
-CVE-2006-0744 VULNERABLE (kernel)
+CVE-2006-0744 VULNERABLE (kernel, fixed 2.6.16.5)
 CVE-2006-0742 version (kernel, fixed 2.6.16) patch-2.6.16-rc6 [since FEDORA-2006-233]
 CVE-2006-0741 version (kernel, fixed 2.6.15.5) patch-2.6.16-rc6 [since FEDORA-2006-233]
 CVE-2006-0730 version (dovecot, 1.0beta[12] only)



From fedora-extras-commits at redhat.com  Tue Apr 18 13:58:48 2006
From: fedora-extras-commits at redhat.com (John Clark Williams (jcwillia))
Date: Tue, 18 Apr 2006 06:58:48 -0700
Subject: mock/etc fedora-devel-i386-core.cfg, NONE,
	1.1 fedora-devel-ppc-core.cfg, NONE,
	1.1 fedora-devel-x86_64-core.cfg, NONE,
	1.1 fedora-5-i386-core.cfg, 1.3, 1.4 fedora-5-ppc-core.cfg,
	1.4, 1.5 fedora-5-x86_64-core.cfg, 1.3, 1.4
Message-ID: <200604181358.k3IDwmGs006676@cvs-int.fedora.redhat.com>

Author: jcwillia

Update of /cvs/fedora/mock/etc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6653

Modified Files:
	fedora-5-i386-core.cfg fedora-5-ppc-core.cfg 
	fedora-5-x86_64-core.cfg 
Added Files:
	fedora-devel-i386-core.cfg fedora-devel-ppc-core.cfg 
	fedora-devel-x86_64-core.cfg 
Log Message:
fixed fc5 configs to use correct path; added devel configs


--- NEW FILE fedora-devel-i386-core.cfg ---
#!/usr/bin/python -tt

import os
config_opts['root'] = 'fedora-development-i386-core'
config_opts['basedir'] = '/var/lib/mock/'
config_opts['chroot'] = '/usr/sbin/mock-helper chroot'
config_opts['mount'] = '/usr/sbin/mock-helper mount'
config_opts['umount'] = '/usr/sbin/mock-helper umount'
config_opts['rm'] = '/usr/sbin/mock-helper rm'
config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
config_opts['yum'] = '/usr/sbin/mock-helper yum'
config_opts['runuser'] = '/sbin/runuser'
config_opts['chroot_dep_package'] = 'buildsys-build'
config_opts['chrootuser'] = 'mockbuild'
config_opts['chrootgroup'] = 'mockbuild'
config_opts['chrootuid'] = os.geteuid()
config_opts['chrootgid'] = os.getegid()
config_opts['chroothome'] = '/builddir'
config_opts['clean'] = True
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
baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/development/i386

[groups]
name=groups
baseurl=http://fedoraproject.org/chroot_dep_packages/development/i386/

[extras]
name=extras
baseurl=http://fedoraproject.org/extras/development/i386

[local]
name=local
baseurl=http://extras64.linux.duke.edu/plague-results/development/

"""





--- NEW FILE fedora-devel-ppc-core.cfg ---
#!/usr/bin/python -tt
import os
config_opts['root'] = 'fedora-development-ppc-core'
config_opts['basedir'] = '/var/lib/mock/'
config_opts['chroot'] = '/usr/sbin/mock-helper chroot'
config_opts['mount'] = '/usr/sbin/mock-helper mount'
config_opts['umount'] = '/usr/sbin/mock-helper umount'
config_opts['rm'] = '/usr/sbin/mock-helper rm'
config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
config_opts['yum'] = '/usr/sbin/mock-helper yum'
config_opts['runuser'] = '/sbin/runuser'
config_opts['chroot_dep_package'] = 'buildsys-build'
config_opts['chrootuser'] = 'mockbuild'
config_opts['chrootgroup'] = 'mockbuild'
config_opts['chrootuid'] = os.geteuid()
config_opts['chrootgid'] = os.getegid()
config_opts['chroothome'] = '/builddir'
config_opts['clean'] = True
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
baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/development/ppc

[groups]
name=groups
baseurl=http://fedoraproject.org/chroot_dep_packages/development/ppc/

[extras]
name=extras
baseurl=http://fedoraproject.org/extras/development/ppc/

[local]
name=local
baseurl=http://extras64.linux.duke.edu/plague-results/development/

"""





--- NEW FILE fedora-devel-x86_64-core.cfg ---
#!/usr/bin/python -tt
import os

config_opts['root'] = 'fedora-development-x86_64-core'
config_opts['basedir'] = '/var/lib/mock/'
config_opts['chroot'] = '/usr/sbin/mock-helper chroot'
config_opts['mount'] = '/usr/sbin/mock-helper mount'
config_opts['umount'] = '/usr/sbin/mock-helper umount'
config_opts['rm'] = '/usr/sbin/mock-helper rm'
config_opts['mknod'] = '/usr/sbin/mock-helper mknod'
config_opts['yum'] = '/usr/sbin/mock-helper yum'
config_opts['runuser'] = '/sbin/runuser'
config_opts['chroot_dep_package'] = 'buildsys-build'
config_opts['chrootuser'] = 'mockbuild'
config_opts['chrootgroup'] = 'mockbuild'
config_opts['chrootuid'] = os.geteuid()
config_opts['chrootgid'] = os.getegid()
config_opts['chroothome'] = '/builddir'
config_opts['clean'] = True
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=*.i386 *.486 *.586 *.i686 *.athlon

# repos

[core]
name=core
baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/development/x86_64

[groups]
name=groups
baseurl=http://fedoraproject.org/chroot_dep_packages/development/x86_64/

[extras]
name=extras
baseurl=http://fedoraproject.org/extras/development/x86_64/

[local]
name=local
baseurl=http://extras64.linux.duke.edu/plague-results/development/

"""





Index: fedora-5-i386-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-5-i386-core.cfg,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-5-i386-core.cfg	11 Apr 2006 08:00:51 -0000	1.3
+++ fedora-5-i386-core.cfg	18 Apr 2006 13:58:45 -0000	1.4
@@ -1,7 +1,7 @@
 #!/usr/bin/python -tt
 
 import os
-config_opts['root'] = 'fedora-development-i386-core'
+config_opts['root'] = 'fedora-5-i386-core'
 config_opts['basedir'] = '/var/lib/mock/'
 config_opts['chroot'] = '/usr/sbin/mock-helper chroot'
 config_opts['mount'] = '/usr/sbin/mock-helper mount'
@@ -35,19 +35,19 @@
 
 [core]
 name=core
-baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/development/i386
+baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/5/i386
 
 [groups]
 name=groups
-baseurl=http://fedoraproject.org/chroot_dep_packages/development/i386/
+baseurl=http://fedoraproject.org/chroot_dep_packages/5/i386/
 
 [extras]
 name=extras
-baseurl=http://fedoraproject.org/extras/development/i386
+baseurl=http://fedoraproject.org/extras/5/i386
 
 [local]
 name=local
-baseurl=http://extras64.linux.duke.edu/plague-results/development/
+baseurl=http://extras64.linux.duke.edu/plague-results/5/
 
 """
 


Index: fedora-5-ppc-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-5-ppc-core.cfg,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedora-5-ppc-core.cfg	11 Apr 2006 08:00:51 -0000	1.4
+++ fedora-5-ppc-core.cfg	18 Apr 2006 13:58:45 -0000	1.5
@@ -1,6 +1,6 @@
 #!/usr/bin/python -tt
 import os
-config_opts['root'] = 'fedora-development-ppc-core'
+config_opts['root'] = 'fedora-5-ppc-core'
 config_opts['basedir'] = '/var/lib/mock/'
 config_opts['chroot'] = '/usr/sbin/mock-helper chroot'
 config_opts['mount'] = '/usr/sbin/mock-helper mount'
@@ -35,19 +35,19 @@
 
 [core]
 name=core
-baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/development/ppc
+baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/5/ppc
 
 [groups]
 name=groups
-baseurl=http://fedoraproject.org/chroot_dep_packages/development/ppc/
+baseurl=http://fedoraproject.org/chroot_dep_packages/5/ppc/
 
 [extras]
 name=extras
-baseurl=http://fedoraproject.org/extras/development/ppc/
+baseurl=http://fedoraproject.org/extras/5/ppc/
 
 [local]
 name=local
-baseurl=http://extras64.linux.duke.edu/plague-results/development/
+baseurl=http://extras64.linux.duke.edu/plague-results/5/
 
 """
 


Index: fedora-5-x86_64-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-5-x86_64-core.cfg,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fedora-5-x86_64-core.cfg	11 Apr 2006 08:00:51 -0000	1.3
+++ fedora-5-x86_64-core.cfg	18 Apr 2006 13:58:45 -0000	1.4
@@ -1,7 +1,7 @@
 #!/usr/bin/python -tt
 import os
 
-config_opts['root'] = 'fedora-development-x86_64-core'
+config_opts['root'] = 'fedora-5-x86_64-core'
 config_opts['basedir'] = '/var/lib/mock/'
 config_opts['chroot'] = '/usr/sbin/mock-helper chroot'
 config_opts['mount'] = '/usr/sbin/mock-helper mount'
@@ -36,19 +36,19 @@
 
 [core]
 name=core
-baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/development/x86_64
+baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/5/x86_64
 
 [groups]
 name=groups
-baseurl=http://fedoraproject.org/chroot_dep_packages/development/x86_64/
+baseurl=http://fedoraproject.org/chroot_dep_packages/5/x86_64/
 
 [extras]
 name=extras
-baseurl=http://fedoraproject.org/extras/development/x86_64/
+baseurl=http://fedoraproject.org/extras/5/x86_64/
 
 [local]
 name=local
-baseurl=http://extras64.linux.duke.edu/plague-results/development/
+baseurl=http://extras64.linux.duke.edu/plague-results/5/
 
 """
 



From fedora-extras-commits at redhat.com  Tue Apr 18 14:00:00 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Tue, 18 Apr 2006 07:00:00 -0700
Subject: fedora-security/audit fc4,1.204,1.205 fc5,1.117,1.118
Message-ID: <200604181400.k3IE00qc006705@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6684/audit

Modified Files:
	fc4 fc5 
Log Message:
Add CVE-2006-1524



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- fc4	18 Apr 2006 13:56:52 -0000	1.204
+++ fc4	18 Apr 2006 13:59:57 -0000	1.205
@@ -77,6 +77,7 @@
 CVE-2006-1530 VULNERABLE (firefox, fixed 1.0.8)
 CVE-2006-1529 VULNERABLE (thunderbird, fixed 1.0.8)
 CVE-2006-1529 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1524 VULNERABLE (kernel, fixed 2.6.16.5)
 CVE-2006-1523 VULNERABLE (kernel, fixed 2.6.16.4)
 CVE-2006-1522 VULNERABLE (kernel, fixed 2.6.16.3)
 CVE-2006-1494 VULNERABLE (php)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- fc5	18 Apr 2006 13:56:52 -0000	1.117
+++ fc5	18 Apr 2006 13:59:57 -0000	1.118
@@ -76,6 +76,7 @@
 CVE-2006-1530 VULNERABLE (firefox, fixed 1.5.0.2)
 CVE-2006-1529 VULNERABLE (thunderbird, fixed 1.5.0.2)
 CVE-2006-1529 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1524 VULNERABLE (kernel, fixed 2.6.16.5)
 CVE-2006-1523 VULNERABLE (kernel, fixed 2.6.16.4)
 CVE-2006-1522 VULNERABLE (kernel, fixed 2.6.16.3)
 CVE-2006-1494 VULNERABLE (php)



From fedora-extras-commits at redhat.com  Tue Apr 18 14:03:25 2006
From: fedora-extras-commits at redhat.com (John Clark Williams (jcwillia))
Date: Tue, 18 Apr 2006 07:03:25 -0700
Subject: mock/etc fedora-5-i386-core.cfg, 1.4, 1.5 fedora-5-ppc-core.cfg, 1.5,
	1.6 fedora-5-x86_64-core.cfg, 1.4, 1.5
Message-ID: <200604181403.k3IE3PJa008852@cvs-int.fedora.redhat.com>

Author: jcwillia

Update of /cvs/fedora/mock/etc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8828

Modified Files:
	fedora-5-i386-core.cfg fedora-5-ppc-core.cfg 
	fedora-5-x86_64-core.cfg 
Log Message:
added updates-released section to fc5 configs


Index: fedora-5-i386-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-5-i386-core.cfg,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedora-5-i386-core.cfg	18 Apr 2006 13:58:45 -0000	1.4
+++ fedora-5-i386-core.cfg	18 Apr 2006 14:03:22 -0000	1.5
@@ -37,6 +37,10 @@
 name=core
 baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/5/i386
 
+[updates-released]
+name=updates
+baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/updates/5/i386/
+
 [groups]
 name=groups
 baseurl=http://fedoraproject.org/chroot_dep_packages/5/i386/


Index: fedora-5-ppc-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-5-ppc-core.cfg,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fedora-5-ppc-core.cfg	18 Apr 2006 13:58:45 -0000	1.5
+++ fedora-5-ppc-core.cfg	18 Apr 2006 14:03:22 -0000	1.6
@@ -37,6 +37,10 @@
 name=core
 baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/5/ppc
 
+[updates-released]
+name=updates
+baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/updates/5/ppc/
+
 [groups]
 name=groups
 baseurl=http://fedoraproject.org/chroot_dep_packages/5/ppc/


Index: fedora-5-x86_64-core.cfg
===================================================================
RCS file: /cvs/fedora/mock/etc/fedora-5-x86_64-core.cfg,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedora-5-x86_64-core.cfg	18 Apr 2006 13:58:45 -0000	1.4
+++ fedora-5-x86_64-core.cfg	18 Apr 2006 14:03:22 -0000	1.5
@@ -38,6 +38,10 @@
 name=core
 baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/5/x86_64
 
+[updates-released]
+name=updates
+baseurl=http://newmirror.linux.duke.edu/pub/fedora/linux/core/updates/5/x86_64/
+
 [groups]
 name=groups
 baseurl=http://fedoraproject.org/chroot_dep_packages/5/x86_64/



From fedora-extras-commits at redhat.com  Tue Apr 18 14:04:05 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 18 Apr 2006 07:04:05 -0700
Subject: rpms/perl-Crypt-Primes - New directory
Message-ID: <200604181404.k3IE47v1008882@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-Primes
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8856/perl-Crypt-Primes

Log Message:
Directory /cvs/extras/rpms/perl-Crypt-Primes added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 18 14:04:06 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 18 Apr 2006 07:04:06 -0700
Subject: rpms/perl-Crypt-Primes/devel - New directory
Message-ID: <200604181404.k3IE48Af008885@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-Primes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8856/perl-Crypt-Primes/devel

Log Message:
Directory /cvs/extras/rpms/perl-Crypt-Primes/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 18 14:05:46 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 18 Apr 2006 07:05:46 -0700
Subject: rpms/perl-Crypt-Primes Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604181405.k3IE5mrf008932@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-Primes
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8904

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Crypt-Primes


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Crypt-Primes
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 18 14:05:46 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 18 Apr 2006 07:05:46 -0700
Subject: rpms/perl-Crypt-Primes/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200604181405.k3IE5mh1008935@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-Primes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8904/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Crypt-Primes


--- 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 Apr 18 14:06:42 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 18 Apr 2006 07:06:42 -0700
Subject: rpms/perl-Crypt-Primes import.log,1.1,1.2
Message-ID: <200604181406.k3IE6ip4009003@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-Primes
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8970

Modified Files:
	import.log 
Log Message:
auto-import perl-Crypt-Primes-0.50-1 on branch devel from perl-Crypt-Primes-0.50-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-Primes/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Apr 2006 14:05:45 -0000	1.1
+++ import.log	18 Apr 2006 14:06:41 -0000	1.2
@@ -0,0 +1 @@
+perl-Crypt-Primes-0_50-1:HEAD:perl-Crypt-Primes-0.50-1.src.rpm:1145369189



From fedora-extras-commits at redhat.com  Tue Apr 18 14:06:42 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 18 Apr 2006 07:06:42 -0700
Subject: rpms/perl-Crypt-Primes/devel perl-Crypt-Primes.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604181406.k3IE6iHJ009008@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-Primes/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8970/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Crypt-Primes.spec 
Log Message:
auto-import perl-Crypt-Primes-0.50-1 on branch devel from perl-Crypt-Primes-0.50-1.src.rpm


--- NEW FILE perl-Crypt-Primes.spec ---
Summary:	Provable prime number generator for cryptographic applications
Name:		perl-Crypt-Primes
Version:	0.50
Release:	1%{?dist}
License:	GPL or Artistic
Group:		Development/Libraries
Url:		http://search.cpan.org/dist/Crypt-Primes/
Source0:	http://search.cpan.org/CPAN/authors/id/V/VI/VIPUL/Crypt-Primes-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:	noarch
BuildRequires:	perl(Math::Pari)    >= 2.001804
BuildRequires:	perl(Crypt::Random) >= 0.33

%description
This module implements Ueli Maurer's algorithm for generating large provable
primes and secure parameters for public-key cryptosystems. The generated primes
are almost uniformly distributed over the set of primes of the specified
bitsize and expected time for generation is less than the time required for
generating a pseudo-prime of the same size with Miller-Rabin tests. Detailed
description and running time analysis of the algorithm can be found in Maurer's
paper, "Fast Generation of Prime Numbers and Secure Public-Key Cryptographic
Parameters" (1994).

%prep
%setup -q -n Crypt-Primes-%{version}
%{__sed} -i -e '/^#! *\/usr\/bin\/perl /d' lib/Crypt/Primes.pm

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
%{__make} %{?_smp_mflags}

%check
%{__make} test

%install
%{__rm} -rf %{buildroot}
%{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
/usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
/usr/bin/find %{buildroot} -type d -depth -exec /bin/rmdir {} 2>/dev/null ';'
%{__chmod} -R u+w %{buildroot}/*

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,0755)
%doc Changes README docs/*
%{_bindir}/largeprimes
%{perl_vendorlib}/Crypt/Primes.pm
%{_mandir}/man1/largeprimes.1*
%{_mandir}/man3/Crypt::Primes.3pm*

%changelog
* Tue Dec  6 2005 Paul Howarth <paul at city-fan.org> 0.50-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-Primes/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Apr 2006 14:05:46 -0000	1.1
+++ .cvsignore	18 Apr 2006 14:06:42 -0000	1.2
@@ -0,0 +1 @@
+Crypt-Primes-0.50.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-Primes/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Apr 2006 14:05:46 -0000	1.1
+++ sources	18 Apr 2006 14:06:42 -0000	1.2
@@ -0,0 +1 @@
+041947b9645142615d687b89cf2e1a7b  Crypt-Primes-0.50.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 18 14:56:38 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 18 Apr 2006 07:56:38 -0700
Subject: rpms/ecore/FC-5 .cvsignore, 1.2, 1.3 ecore.spec, 1.3, 1.4 sources,
	1.2, 1.3
Message-ID: <200604181456.k3IEueMW009314@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/ecore/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9277/FC-5

Modified Files:
	.cvsignore ecore.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ecore/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Feb 2006 10:27:21 -0000	1.2
+++ .cvsignore	18 Apr 2006 14:56:38 -0000	1.3
@@ -1 +1 @@
-ecore-0.9.9.023.tar.gz
+ecore-0.9.9.026.tar.gz


Index: ecore.spec
===================================================================
RCS file: /cvs/extras/rpms/ecore/FC-5/ecore.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ecore.spec	14 Feb 2006 05:00:14 -0000	1.3
+++ ecore.spec	18 Apr 2006 14:56:38 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           ecore
-Version:        0.9.9.023
-Release:        2%{?dist}
+Version:        0.9.9.026
+Release:        1%{?dist}
 Summary:        An event and X abstraction layer
 
 Group:          System Environment/Libraries
@@ -71,6 +71,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Apr 18 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.9.026-1
+- Upstream update
+
 * Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.9.023-2
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ecore/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Feb 2006 10:27:21 -0000	1.2
+++ sources	18 Apr 2006 14:56:38 -0000	1.3
@@ -1 +1 @@
-a12d806bbf687b371cd13743faff382e  ecore-0.9.9.023.tar.gz
+c9f2eaed941c9cecc4acf5c57132c1cf  ecore-0.9.9.026.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 18 14:56:38 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 18 Apr 2006 07:56:38 -0700
Subject: rpms/ecore/devel .cvsignore, 1.2, 1.3 ecore.spec, 1.3, 1.4 sources, 
	1.2, 1.3
Message-ID: <200604181456.k3IEuevg009320@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/ecore/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9277/devel

Modified Files:
	.cvsignore ecore.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ecore/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Feb 2006 10:27:21 -0000	1.2
+++ .cvsignore	18 Apr 2006 14:56:38 -0000	1.3
@@ -1 +1 @@
-ecore-0.9.9.023.tar.gz
+ecore-0.9.9.026.tar.gz


Index: ecore.spec
===================================================================
RCS file: /cvs/extras/rpms/ecore/devel/ecore.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ecore.spec	14 Feb 2006 05:00:14 -0000	1.3
+++ ecore.spec	18 Apr 2006 14:56:38 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           ecore
-Version:        0.9.9.023
-Release:        2%{?dist}
+Version:        0.9.9.026
+Release:        1%{?dist}
 Summary:        An event and X abstraction layer
 
 Group:          System Environment/Libraries
@@ -71,6 +71,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Apr 18 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.9.026-1
+- Upstream update
+
 * Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.9.023-2
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ecore/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Feb 2006 10:27:21 -0000	1.2
+++ sources	18 Apr 2006 14:56:38 -0000	1.3
@@ -1 +1 @@
-a12d806bbf687b371cd13743faff382e  ecore-0.9.9.023.tar.gz
+c9f2eaed941c9cecc4acf5c57132c1cf  ecore-0.9.9.026.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 18 14:59:50 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 18 Apr 2006 07:59:50 -0700
Subject: owners owners.list,1.855,1.856
Message-ID: <200604181459.k3IExqEZ009712@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9688

Modified Files:
	owners.list 
Log Message:
perl-Crypt-Primes
perl-Crypt-Random



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.855
retrieving revision 1.856
diff -u -r1.855 -r1.856
--- owners.list	18 Apr 2006 07:59:36 -0000	1.855
+++ owners.list	18 Apr 2006 14:59:49 -0000	1.856
@@ -910,6 +910,8 @@
 Fedora Extras|perl-Crypt-DES_EDE3|Crypt::DES_EDE3 Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Crypt-DH|Perl module implementing the Diffie-Hellman key exchange system|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Crypt-DSA|Perl module for DSA signatures and key generation|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Crypt-Primes|Provable prime number generator for cryptographic applications|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Crypt-Random|Cryptographically Secure, True Random Number Generator|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Crypt-SmbHash|Pure-perl Lanman and NT MD4 hash functions|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Data-Buffer|Read/write buffer class for perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Data-HexDump|Hexadecial Dumper|andreas at bawue.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Apr 18 15:21:34 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 18 Apr 2006 08:21:34 -0700
Subject: rpms/embryo/FC-5 .cvsignore, 1.2, 1.3 embryo.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200604181521.k3IFLau9012042@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/embryo/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12005/FC-5

Modified Files:
	.cvsignore embryo.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/embryo/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Apr 2006 18:42:20 -0000	1.2
+++ .cvsignore	18 Apr 2006 15:21:34 -0000	1.3
@@ -1 +1 @@
-embryo-0.9.1.023.tar.gz
+embryo-0.9.1.026.tar.gz


Index: embryo.spec
===================================================================
RCS file: /cvs/extras/rpms/embryo/FC-5/embryo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- embryo.spec	15 Apr 2006 18:42:20 -0000	1.1
+++ embryo.spec	18 Apr 2006 15:21:34 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           embryo
-Version:        0.9.1.023
+Version:        0.9.1.026
 Release:        1%{?dist}
 Summary:        A C like scripting language
 
@@ -64,5 +64,8 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Apr 18 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.1.026-1
+- Upstream update
+
 * Sun Feb  5 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.1.023-1
 - Initial RPM release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/embryo/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Apr 2006 18:42:20 -0000	1.2
+++ sources	18 Apr 2006 15:21:34 -0000	1.3
@@ -1 +1 @@
-eb84d1c02e9063f2108bc5f72a7627ef  embryo-0.9.1.023.tar.gz
+814379fa15cd5396bc279f4ea90bac2f  embryo-0.9.1.026.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 18 15:21:35 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Tue, 18 Apr 2006 08:21:35 -0700
Subject: rpms/embryo/devel .cvsignore, 1.2, 1.3 embryo.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200604181521.k3IFLb96012048@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/embryo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12005/devel

Modified Files:
	.cvsignore embryo.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/embryo/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Apr 2006 18:42:20 -0000	1.2
+++ .cvsignore	18 Apr 2006 15:21:35 -0000	1.3
@@ -1 +1 @@
-embryo-0.9.1.023.tar.gz
+embryo-0.9.1.026.tar.gz


Index: embryo.spec
===================================================================
RCS file: /cvs/extras/rpms/embryo/devel/embryo.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- embryo.spec	15 Apr 2006 18:42:20 -0000	1.1
+++ embryo.spec	18 Apr 2006 15:21:35 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           embryo
-Version:        0.9.1.023
+Version:        0.9.1.026
 Release:        1%{?dist}
 Summary:        A C like scripting language
 
@@ -64,5 +64,8 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Apr 18 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.1.026-1
+- Upstream update
+
 * Sun Feb  5 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.1.023-1
 - Initial RPM release


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/embryo/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Apr 2006 18:42:20 -0000	1.2
+++ sources	18 Apr 2006 15:21:35 -0000	1.3
@@ -1 +1 @@
-eb84d1c02e9063f2108bc5f72a7627ef  embryo-0.9.1.023.tar.gz
+814379fa15cd5396bc279f4ea90bac2f  embryo-0.9.1.026.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 18 15:25:23 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 18 Apr 2006 08:25:23 -0700
Subject: rpms/jed/devel .cvsignore, 1.3, 1.4 jed.spec, 1.9, 1.10 sources, 1.3,
	1.4 jed-info.patch, 1.1, NONE
Message-ID: <200604181525.k3IFPP67012166@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/jed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12145

Modified Files:
	.cvsignore jed.spec sources 
Removed Files:
	jed-info.patch 
Log Message:
update to 0.99.18



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/jed/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	30 Nov 2005 21:54:31 -0000	1.3
+++ .cvsignore	18 Apr 2006 15:25:23 -0000	1.4
@@ -1 +1 @@
-jed-B0.99-17.135.tar.bz2
+jed-0.99-18.tar.bz2


Index: jed.spec
===================================================================
RCS file: /cvs/extras/rpms/jed/devel/jed.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jed.spec	13 Feb 2006 19:50:35 -0000	1.9
+++ jed.spec	18 Apr 2006 15:25:23 -0000	1.10
@@ -1,12 +1,12 @@
 Summary: Fast, compact editor based on the S-Lang screen library
 Name: jed
-Version: 0.99.17
-Release: 0.pre135.3
+Version: 0.99.18
+Release: 1
 License: GPL
 Group: Applications/Editors
-Source0: ftp://space.mit.edu/pub/davis/jed/v0.99/pre-0.99-17/jed-B0.99-17.135.tar.bz2
+Source0: ftp://space.mit.edu/pub/davis/jed/v0.99/jed-0.99-18.tar.bz2
 Patch1: jed-0.99.12-xkeys.patch
-Patch2: jed-info.patch
+URL: http://www.jedsoft.org/jed/
 Patch3: jed-multilib.patch
 Patch4: jed-selinux.patch
 Prereq: /sbin/install-info
@@ -26,9 +26,8 @@
 what you'd like to use.
 
 %prep
-%setup -q -n jed-B0.99-17.135
+%setup -q -n jed-0.99-18
 %patch1 -p1 -b .xkeys
-%patch2 -p1
 #%patch3 -p1
 %patch4 -p1 -b .selinux
 cd autoconf
@@ -68,6 +67,9 @@
 %{_datadir}/jed
 
 %changelog
+* Tue Apr 18 2006 Bill Nottingham <notting at redhat.com> - 0.99.18-1
+- update to 0.99.18
+
 * Mon Feb 13 2006 Bill Nottingham <notting at redhat.com> - 0.99.17-0.pre135.3
 - bump for rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jed/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 Nov 2005 21:54:31 -0000	1.3
+++ sources	18 Apr 2006 15:25:23 -0000	1.4
@@ -1 +1 @@
-8f9d3d6fa8805f0c10f14936600077c4  jed-B0.99-17.135.tar.bz2
+5378c8e7805854018d9ec5c3cfadf637  jed-0.99-18.tar.bz2


--- jed-info.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 18 15:26:38 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 18 Apr 2006 08:26:38 -0700
Subject: rpms/jed/FC-5 jed.spec, 1.9, 1.10 sources, 1.3, 1.4 jed-info.patch, 
	1.1, NONE
Message-ID: <200604181526.k3IFQeRH012206@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/jed/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12187

Modified Files:
	jed.spec sources 
Removed Files:
	jed-info.patch 
Log Message:
update to 0.99.18



Index: jed.spec
===================================================================
RCS file: /cvs/extras/rpms/jed/FC-5/jed.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- jed.spec	13 Feb 2006 19:50:35 -0000	1.9
+++ jed.spec	18 Apr 2006 15:26:38 -0000	1.10
@@ -1,12 +1,12 @@
 Summary: Fast, compact editor based on the S-Lang screen library
 Name: jed
-Version: 0.99.17
-Release: 0.pre135.3
+Version: 0.99.18
+Release: 0.fc5
 License: GPL
 Group: Applications/Editors
-Source0: ftp://space.mit.edu/pub/davis/jed/v0.99/pre-0.99-17/jed-B0.99-17.135.tar.bz2
+Source0: ftp://space.mit.edu/pub/davis/jed/v0.99/jed-0.99-18.tar.bz2
 Patch1: jed-0.99.12-xkeys.patch
-Patch2: jed-info.patch
+URL: http://www.jedsoft.org/jed/
 Patch3: jed-multilib.patch
 Patch4: jed-selinux.patch
 Prereq: /sbin/install-info
@@ -26,9 +26,8 @@
 what you'd like to use.
 
 %prep
-%setup -q -n jed-B0.99-17.135
+%setup -q -n jed-0.99-18
 %patch1 -p1 -b .xkeys
-%patch2 -p1
 #%patch3 -p1
 %patch4 -p1 -b .selinux
 cd autoconf
@@ -68,6 +67,9 @@
 %{_datadir}/jed
 
 %changelog
+* Tue Apr 18 2006 Bill Nottingham <notting at redhat.com> - 0.99.18-0.fc5
+- update to 0.99.18
+
 * Mon Feb 13 2006 Bill Nottingham <notting at redhat.com> - 0.99.17-0.pre135.3
 - bump for rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jed/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 Nov 2005 21:54:31 -0000	1.3
+++ sources	18 Apr 2006 15:26:38 -0000	1.4
@@ -1 +1 @@
-8f9d3d6fa8805f0c10f14936600077c4  jed-B0.99-17.135.tar.bz2
+5378c8e7805854018d9ec5c3cfadf637  jed-0.99-18.tar.bz2


--- jed-info.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 18 15:27:36 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 18 Apr 2006 08:27:36 -0700
Subject: rpms/jed/FC-4 jed-selinux.patch, 1.1, 1.2 jed.spec, 1.6, 1.7 sources,
	1.2, 1.3 jed-info.patch, 1.1, NONE
Message-ID: <200604181527.k3IFRc6o012243@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/jed/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12219

Modified Files:
	jed-selinux.patch jed.spec sources 
Removed Files:
	jed-info.patch 
Log Message:
update to 0.99.18


jed-selinux.patch:

Index: jed-selinux.patch
===================================================================
RCS file: /cvs/extras/rpms/jed/FC-4/jed-selinux.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jed-selinux.patch	4 Mar 2005 22:37:55 -0000	1.1
+++ jed-selinux.patch	18 Apr 2006 15:27:36 -0000	1.2
@@ -1,5 +1,5 @@
---- jed-0.99-16/autoconf/configure.in.selinux	2004-09-25 01:33:25.000000000 -0400
-+++ jed-0.99-16/autoconf/configure.in	2004-09-25 01:40:05.000000000 -0400
+--- jed-0.99-16/autoconf/configure.ac.selinux	2004-09-25 01:33:25.000000000 -0400
++++ jed-0.99-16/autoconf/configure.ac	2004-09-25 01:40:05.000000000 -0400
 @@ -38,6 +38,8 @@
  
  AC_CHECK_LIB(util,openpty)


Index: jed.spec
===================================================================
RCS file: /cvs/extras/rpms/jed/FC-4/jed.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- jed.spec	10 May 2005 02:55:05 -0000	1.6
+++ jed.spec	18 Apr 2006 15:27:36 -0000	1.7
@@ -1,17 +1,17 @@
 Summary: Fast, compact editor based on the S-Lang screen library
 Name: jed
-Version: 0.99.16
-Release: 10
+Version: 0.99.18
+Release: 0.fc4
 License: GPL
 Group: Applications/Editors
-Source0: ftp://space.mit.edu/pub/davis/jed/jed-0.99-16.tar.bz2
+Source0: ftp://space.mit.edu/pub/davis/jed/v0.99/jed-0.99-18.tar.bz2
 Patch1: jed-0.99.12-xkeys.patch
-Patch2: jed-info.patch
+URL: http://www.jedsoft.org/jed/
 Patch3: jed-multilib.patch
 Patch4: jed-selinux.patch
 Prereq: /sbin/install-info
 Obsoletes: jed-common jed-xjed
-BuildPrereq: slang-devel /usr/bin/autoconf-2.13
+BuildPrereq: slang-devel >= 2.0, autoconf, libselinux-devel
 BuildRoot: /var/tmp/jed-root
 
 %description
@@ -26,13 +26,14 @@
 what you'd like to use.
 
 %prep
-%setup -q -n jed-0.99-16
+%setup -q -n jed-0.99-18
 %patch1 -p1 -b .xkeys
-%patch2 -p1
-%patch3 -p1
+#%patch3 -p1
 %patch4 -p1 -b .selinux
-autoconf-2.13 -l autoconf autoconf/configure.in > configure
-chmod +x configure
+cd autoconf
+autoconf
+mv configure ..
+cd ..
 
 %build
 export JED_ROOT="%{_datadir}/jed"
@@ -66,6 +67,12 @@
 %{_datadir}/jed
 
 %changelog
+* Tue Apr 18 2006 Bill Nottingham <notting at redhat.com> - 0.99.18-0.fc4
+- update to 0.99.18
+
+* Mon Feb 13 2006 Bill Nottingham <notting at redhat.com> - 0.99.17-0.pre135.3
+- bump for rebuild
+
 * Mon May  9 2005 Bill Nottingham <notting at redhat.com> 0.99.16-10
 - don't forcibly strip binary, fixes debuginfo generation
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jed/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Mar 2005 22:37:55 -0000	1.2
+++ sources	18 Apr 2006 15:27:36 -0000	1.3
@@ -1 +1 @@
-c2bcd89c92a120559865a539c2705999  jed-0.99-16.tar.bz2
+5378c8e7805854018d9ec5c3cfadf637  jed-0.99-18.tar.bz2


--- jed-info.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 18 15:38:54 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 18 Apr 2006 08:38:54 -0700
Subject: rpms/jed/FC-4 jed-info.patch, 1.2, 1.3 jed-selinux.patch, 1.2,
	1.3 jed.spec, 1.7, 1.8 sources, 1.3, 1.4
Message-ID: <200604181538.k3IFcuQr012456@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/extras/rpms/jed/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12427

Modified Files:
	jed-selinux.patch jed.spec sources 
Added Files:
	jed-info.patch 
Log Message:
no slang2 on FC-4 - I am an idiot. Revert.


jed-info.patch:

Index: jed-info.patch
===================================================================
RCS file: jed-info.patch
diff -N jed-info.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ jed-info.patch	18 Apr 2006 15:38:54 -0000	1.3
@@ -0,0 +1,13 @@
+--- jed/info/jed.info.entry	Sat Feb  5 11:10:19 2000
++++ jed/info/jed.info	Sat Feb  5 11:11:11 2000
+@@ -1,6 +1,10 @@
+ This is Info file jed.info, produced by Makeinfo-1.55 from the input
+ file jed.ti.
+ 
++START-INFO-DIR-ENTRY
++* JED: (jed).         The JED editor
++END-INFO-DIR-ENTRY
++
+ 
+ Indirect:
+ jed.1in: 83

jed-selinux.patch:

Index: jed-selinux.patch
===================================================================
RCS file: /cvs/extras/rpms/jed/FC-4/jed-selinux.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- jed-selinux.patch	18 Apr 2006 15:27:36 -0000	1.2
+++ jed-selinux.patch	18 Apr 2006 15:38:54 -0000	1.3
@@ -1,5 +1,5 @@
---- jed-0.99-16/autoconf/configure.ac.selinux	2004-09-25 01:33:25.000000000 -0400
-+++ jed-0.99-16/autoconf/configure.ac	2004-09-25 01:40:05.000000000 -0400
+--- jed-0.99-16/autoconf/configure.in.selinux	2004-09-25 01:33:25.000000000 -0400
++++ jed-0.99-16/autoconf/configure.in	2004-09-25 01:40:05.000000000 -0400
 @@ -38,6 +38,8 @@
  
  AC_CHECK_LIB(util,openpty)


Index: jed.spec
===================================================================
RCS file: /cvs/extras/rpms/jed/FC-4/jed.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jed.spec	18 Apr 2006 15:27:36 -0000	1.7
+++ jed.spec	18 Apr 2006 15:38:54 -0000	1.8
@@ -1,17 +1,17 @@
 Summary: Fast, compact editor based on the S-Lang screen library
 Name: jed
-Version: 0.99.18
-Release: 0.fc4
+Version: 0.99.16
+Release: 10
 License: GPL
 Group: Applications/Editors
-Source0: ftp://space.mit.edu/pub/davis/jed/v0.99/jed-0.99-18.tar.bz2
+Source0: ftp://space.mit.edu/pub/davis/jed/jed-0.99-16.tar.bz2
 Patch1: jed-0.99.12-xkeys.patch
-URL: http://www.jedsoft.org/jed/
+Patch2: jed-info.patch
 Patch3: jed-multilib.patch
 Patch4: jed-selinux.patch
 Prereq: /sbin/install-info
 Obsoletes: jed-common jed-xjed
-BuildPrereq: slang-devel >= 2.0, autoconf, libselinux-devel
+BuildPrereq: slang-devel /usr/bin/autoconf-2.13
 BuildRoot: /var/tmp/jed-root
 
 %description
@@ -26,14 +26,13 @@
 what you'd like to use.
 
 %prep
-%setup -q -n jed-0.99-18
+%setup -q -n jed-0.99-16
 %patch1 -p1 -b .xkeys
-#%patch3 -p1
+%patch2 -p1
+%patch3 -p1
 %patch4 -p1 -b .selinux
-cd autoconf
-autoconf
-mv configure ..
-cd ..
+autoconf-2.13 -l autoconf autoconf/configure.in > configure
+chmod +x configure
 
 %build
 export JED_ROOT="%{_datadir}/jed"
@@ -67,12 +66,6 @@
 %{_datadir}/jed
 
 %changelog
-* Tue Apr 18 2006 Bill Nottingham <notting at redhat.com> - 0.99.18-0.fc4
-- update to 0.99.18
-
-* Mon Feb 13 2006 Bill Nottingham <notting at redhat.com> - 0.99.17-0.pre135.3
-- bump for rebuild
-
 * Mon May  9 2005 Bill Nottingham <notting at redhat.com> 0.99.16-10
 - don't forcibly strip binary, fixes debuginfo generation
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/jed/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	18 Apr 2006 15:27:36 -0000	1.3
+++ sources	18 Apr 2006 15:38:54 -0000	1.4
@@ -1 +1 @@
-5378c8e7805854018d9ec5c3cfadf637  jed-0.99-18.tar.bz2
+c2bcd89c92a120559865a539c2705999  jed-0.99-16.tar.bz2



From fedora-extras-commits at redhat.com  Tue Apr 18 16:53:02 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Tue, 18 Apr 2006 09:53:02 -0700
Subject: owners owners.list,1.856,1.857
Message-ID: <200604181653.k3IGr43n014770@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14753

Modified Files:
	owners.list 
Log Message:
Add paraview



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.856
retrieving revision 1.857
diff -u -r1.856 -r1.857
--- owners.list	18 Apr 2006 14:59:49 -0000	1.856
+++ owners.list	18 Apr 2006 16:53:02 -0000	1.857
@@ -832,6 +832,7 @@
 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|pan|A GNOME/GTK+ news reader for X|mpeters at mac.com|extras-qa at fedoraproject.org|
 Fedora Extras|paps|Plain Text to PostScript(TM) converter|tagoh at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|paraview|Parallel visualization application|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|parchive|Parity archive command line client|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|pbzip2|Parallel implementation of the bzip2 block-sorting file compressor|jeff.gilchrist at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|pcsc-lite|PC/SC Lite smart card framework and applications|ville.skytta at iki.fi|extras-qa at fedoraproject.org|ludovic.rousseau at gmail.com



From fedora-extras-commits at redhat.com  Tue Apr 18 18:31:29 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 18 Apr 2006 11:31:29 -0700
Subject: rpms/perl-Math-Pari - New directory
Message-ID: <200604181831.k3IIVVSX019676@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Math-Pari
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19650/perl-Math-Pari

Log Message:
Directory /cvs/extras/rpms/perl-Math-Pari added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 18 18:31:29 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 18 Apr 2006 11:31:29 -0700
Subject: rpms/perl-Math-Pari/devel - New directory
Message-ID: <200604181831.k3IIVV4Y019679@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-serv19650/perl-Math-Pari/devel

Log Message:
Directory /cvs/extras/rpms/perl-Math-Pari/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 18 18:31:56 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 18 Apr 2006 11:31:56 -0700
Subject: rpms/perl-Math-Pari Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604181831.k3IIVw17019728@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Math-Pari
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19695

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Math-Pari


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Math-Pari
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 18 18:31:56 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 18 Apr 2006 11:31:56 -0700
Subject: rpms/perl-Math-Pari/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604181831.k3IIVwQH019731@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-serv19695/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Math-Pari


--- 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 Apr 18 18:33:49 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 18 Apr 2006 11:33:49 -0700
Subject: rpms/perl-Math-Pari import.log,1.1,1.2
Message-ID: <200604181833.k3IIXpEu019794@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Math-Pari
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19761

Modified Files:
	import.log 
Log Message:
auto-import perl-Math-Pari-2.010704-2.fc5 on branch devel from perl-Math-Pari-2.010704-2.fc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Pari/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	18 Apr 2006 18:31:55 -0000	1.1
+++ import.log	18 Apr 2006 18:33:49 -0000	1.2
@@ -0,0 +1 @@
+perl-Math-Pari-2_010704-2_fc5:HEAD:perl-Math-Pari-2.010704-2.fc5.src.rpm:1145385213



From fedora-extras-commits at redhat.com  Tue Apr 18 18:33:50 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 18 Apr 2006 11:33:50 -0700
Subject: rpms/perl-Math-Pari/devel perl-Math-Pari.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604181833.k3IIXqEV019799@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-serv19761/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Math-Pari.spec 
Log Message:
auto-import perl-Math-Pari-2.010704-2.fc5 on branch devel from perl-Math-Pari-2.010704-2.fc5.src.rpm


--- NEW FILE perl-Math-Pari.spec ---
# This package includes the pari library source even though that is
# being introduced to Fedora Extras in its own right (#169703). The
# rationale for this is:
# (a) This package patches the library source code
# (b) This package integrates very tightly with the library and may
#     break if the library is changed underneath it
# (c) Functionality is lost if built against an external PARI library
#     (see the INSTALL file in the distribution)

Summary:	Perl interface to PARI
Name:		perl-Math-Pari
Version:	2.010704
# 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}
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
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This package is a Perl interface to the famous library PARI for numerical/
scientific/ number-theoretic calculations. It allows use of most PARI functions
as Perl functions, and (almost) seamless merging of PARI and Perl data.

%prep
%setup -q -n Math-Pari-%{version} -a 1

# Remove redundant provides (there's also a versioned one)
%global provfilt /bin/sh -c "%{__perl_provides} | %{__grep} -Fvx 'perl(Math::Pari)'"
%define __perl_provides %{provfilt}

%build
# machine=linux-none needed to avoid breakage of 64-bit builds
# other flags cribbed from pari.spec (#169703)
export DLCFLAGS=-fPIC
%{__perl} Makefile.PL \
	INSTALLDIRS=vendor \
	OPTIMIZE="%{optflags} -fomit-frame-pointer" \
	machine=none
%{__make} %{?_smp_mflags}

%check
%{__make} test

%install
%{__rm} -rf %{buildroot}
%{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
/usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
/usr/bin/find %{buildroot} -type f -name '*.bs' -a -size 0 -exec %{__rm} -f {} ';'
/usr/bin/find %{buildroot} -type d -depth -exec /bin/rmdir {} 2>/dev/null ';'
%{__chmod} -R u+w %{buildroot}/*

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,0755)
%doc Changes README
%dir %{perl_vendorarch}/Math/
%exclude %doc %{perl_vendorarch}/Math/libPARI.dumb.pod
%doc %{perl_vendorarch}/Math/libPARI.pod
%{perl_vendorarch}/Math/*.pm
%{perl_vendorarch}/auto/Math/
%{_mandir}/man3/Math::Pari.3pm*
%{_mandir}/man3/Math::PariInit.3pm*
%{_mandir}/man3/Math::libPARI.3pm*
%exclude %{_mandir}/man3/Math::libPARI.dumb.3pm*

%changelog
* Tue Apr 18 2006 Paul Howarth <paul at city-fan.org> 2.010704-2
- Omit dumb docs (#175198)

* Mon Mar 20 2006 Paul Howarth <paul at city-fan.org> 2.010704-1
- Update to 2.010704

* Fri Mar 17 2006 Paul Howarth <paul at city-fan.org> 2.010703-2
- Simplify %%{__perl_requires} filter

* Wed Feb  1 2006 Paul Howarth <paul at city-fan.org> 2.010703-1
- Update to 2.010703
- Make pari version number calculation more robust

* Wed Dec  7 2005 Paul Howarth <paul at city-fan.org> 2.010702-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Pari/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	18 Apr 2006 18:31:56 -0000	1.1
+++ .cvsignore	18 Apr 2006 18:33:50 -0000	1.2
@@ -0,0 +1,2 @@
+Math-Pari-2.010704.tar.gz
+pari-2.1.7.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Pari/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	18 Apr 2006 18:31:56 -0000	1.1
+++ sources	18 Apr 2006 18:33:50 -0000	1.2
@@ -0,0 +1,2 @@
+0397da31fbe4f5485c4e7094c3661c5a  Math-Pari-2.010704.tar.gz
+357b7a42e89e2761a5367bbcbfcca5f2  pari-2.1.7.tgz



From fedora-extras-commits at redhat.com  Tue Apr 18 18:41:24 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Tue, 18 Apr 2006 11:41:24 -0700
Subject: owners owners.list,1.857,1.858
Message-ID: <200604181841.k3IIfQEr020017@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19999

Modified Files:
	owners.list 
Log Message:
perl-Math-Pari



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.857
retrieving revision 1.858
diff -u -r1.857 -r1.858
--- owners.list	18 Apr 2006 16:53:02 -0000	1.857
+++ owners.list	18 Apr 2006 18:41:24 -0000	1.858
@@ -1028,6 +1028,7 @@
 Fedora Extras|perl-Mail-SPF-Query|Mail::SPF::Query determines the legitimacy of an SMTP client IP|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MailTools|MailTools module for Perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Math-GMP|High speed arbitrary size integer math|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Math-Pari|Perl interface to PARI|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MIME-Lite|MIME-Lite - low-calorie MIME generator|imlinux at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MIME-tools|Modules for parsing and creating MIME entities in Perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-MIME-Types|MIME types module for Perl|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Apr 18 19:12:15 2006
From: fedora-extras-commits at redhat.com (Bill Nottingham (notting))
Date: Tue, 18 Apr 2006 12:12:15 -0700
Subject: CVSROOT avail,1.11,1.12
Message-ID: <200604181912.k3IJCFXg022477@cvs-int.fedora.redhat.com>

Author: notting

Update of /cvs/devel/CVSROOT
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22460

Modified Files:
	avail 
Log Message:
add pm-utils



Index: avail
===================================================================
RCS file: /cvs/devel/CVSROOT/avail,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- avail	17 Aug 2005 13:56:54 -0000	1.11
+++ avail	18 Apr 2006 19:12:13 -0000	1.12
@@ -16,3 +16,6 @@
 avail | notting,sopwith,wtogami,katzj | CVSROOT
 # trusted developers that can add modules
 avail | | CVSROOT/modules
+
+unavail | | pm-utils
+avail | notting,pjones,pknirsch | pm-utils



From fedora-extras-commits at redhat.com  Tue Apr 18 19:52:01 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 18 Apr 2006 12:52:01 -0700
Subject: rpms/smb4k/devel .cvsignore, 1.5, 1.6 smb4k.spec, 1.8, 1.9 sources, 
	1.5, 1.6
Message-ID: <200604181952.k3IJq3nx022751@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/smb4k/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22730

Modified Files:
	.cvsignore smb4k.spec sources 
Log Message:
- Updated to version 0.6.10



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smb4k/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Mar 2006 15:13:26 -0000	1.5
+++ .cvsignore	18 Apr 2006 19:52:01 -0000	1.6
@@ -1 +1 @@
-smb4k-0.6.9.tar.gz
+smb4k-0.6.10.tar.gz


Index: smb4k.spec
===================================================================
RCS file: /cvs/extras/rpms/smb4k/devel/smb4k.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- smb4k.spec	24 Mar 2006 15:13:26 -0000	1.8
+++ smb4k.spec	18 Apr 2006 19:52:01 -0000	1.9
@@ -1,5 +1,5 @@
 Name:		smb4k
-Version:	0.6.9
+Version:	0.6.10
 Release:	1%{?dist}
 Summary:	The SMB/CIFS Share Browser for KDE
 
@@ -107,6 +107,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Apr 18 2006 Marcin Garski <mgarski[AT]post.pl> 0.6.10-1
+- Updated to version 0.6.10
+
 * Fri Mar 24 2006 Marcin Garski <mgarski[AT]post.pl> 0.6.9-1
 - Updated to version 0.6.9
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smb4k/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Mar 2006 15:13:26 -0000	1.5
+++ sources	18 Apr 2006 19:52:01 -0000	1.6
@@ -1 +1 @@
-d11cb15febf8c55c04f5c96e14fced0b  smb4k-0.6.9.tar.gz
+8996f1f291efef48839998f75670987f  smb4k-0.6.10.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 18 20:00:23 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 18 Apr 2006 13:00:23 -0700
Subject: rpms/smb4k/FC-5 .cvsignore, 1.5, 1.6 smb4k.spec, 1.8, 1.9 sources,
	1.5, 1.6
Message-ID: <200604182000.k3IK0PKQ022862@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/smb4k/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22841

Modified Files:
	.cvsignore smb4k.spec sources 
Log Message:
- Updated to version 0.6.10



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Mar 2006 15:35:11 -0000	1.5
+++ .cvsignore	18 Apr 2006 20:00:22 -0000	1.6
@@ -1 +1 @@
-smb4k-0.6.9.tar.gz
+smb4k-0.6.10.tar.gz


Index: smb4k.spec
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-5/smb4k.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- smb4k.spec	24 Mar 2006 15:35:11 -0000	1.8
+++ smb4k.spec	18 Apr 2006 20:00:22 -0000	1.9
@@ -1,5 +1,5 @@
 Name:		smb4k
-Version:	0.6.9
+Version:	0.6.10
 Release:	1%{?dist}
 Summary:	The SMB/CIFS Share Browser for KDE
 
@@ -107,6 +107,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Apr 18 2006 Marcin Garski <mgarski[AT]post.pl> 0.6.10-1
+- Updated to version 0.6.10
+
 * Fri Mar 24 2006 Marcin Garski <mgarski[AT]post.pl> 0.6.9-1
 - Updated to version 0.6.9
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Mar 2006 15:35:11 -0000	1.5
+++ sources	18 Apr 2006 20:00:22 -0000	1.6
@@ -1 +1 @@
-d11cb15febf8c55c04f5c96e14fced0b  smb4k-0.6.9.tar.gz
+8996f1f291efef48839998f75670987f  smb4k-0.6.10.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 18 20:00:55 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Tue, 18 Apr 2006 13:00:55 -0700
Subject: rpms/smb4k/FC-4 .cvsignore, 1.5, 1.6 smb4k.spec, 1.5, 1.6 sources,
	1.5, 1.6
Message-ID: <200604182000.k3IK0vYp022927@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/smb4k/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22906

Modified Files:
	.cvsignore smb4k.spec sources 
Log Message:
- Updated to version 0.6.10



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	24 Mar 2006 15:32:58 -0000	1.5
+++ .cvsignore	18 Apr 2006 20:00:55 -0000	1.6
@@ -1 +1 @@
-smb4k-0.6.9.tar.gz
+smb4k-0.6.10.tar.gz


Index: smb4k.spec
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-4/smb4k.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- smb4k.spec	24 Mar 2006 15:32:58 -0000	1.5
+++ smb4k.spec	18 Apr 2006 20:00:55 -0000	1.6
@@ -1,5 +1,5 @@
 Name:		smb4k
-Version:	0.6.9
+Version:	0.6.10
 Release:	1%{?dist}
 Summary:	The SMB/CIFS Share Browser for KDE
 
@@ -107,6 +107,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Apr 18 2006 Marcin Garski <mgarski[AT]post.pl> 0.6.10-1
+- Updated to version 0.6.10
+
 * Fri Mar 24 2006 Marcin Garski <mgarski[AT]post.pl> 0.6.9-1
 - Updated to version 0.6.9
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	24 Mar 2006 15:32:58 -0000	1.5
+++ sources	18 Apr 2006 20:00:55 -0000	1.6
@@ -1 +1 @@
-d11cb15febf8c55c04f5c96e14fced0b  smb4k-0.6.9.tar.gz
+8996f1f291efef48839998f75670987f  smb4k-0.6.10.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 18 20:07:51 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Tue, 18 Apr 2006 13:07:51 -0700
Subject: rpms/trac/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 trac.spec,
	1.5, 1.6
Message-ID: <200604182007.k3IK7rht025071@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25050

Modified Files:
	.cvsignore sources trac.spec 
Log Message:
* Tue Apr 18 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.5-1
- bug fix release 0.9.5



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/trac/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Feb 2006 18:51:45 -0000	1.3
+++ .cvsignore	18 Apr 2006 20:07:51 -0000	1.4
@@ -1 +1 @@
-trac-0.9.4.tar.gz
+trac-0.9.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/trac/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Feb 2006 18:47:52 -0000	1.3
+++ sources	18 Apr 2006 20:07:51 -0000	1.4
@@ -1 +1 @@
-df752bd5ca8790e9735300c9e0be9bef  trac-0.9.4.tar.gz
+3b7d708eaf905cc6ba2b6b10a09a8cf4  trac-0.9.5.tar.gz


Index: trac.spec
===================================================================
RCS file: /cvs/extras/rpms/trac/devel/trac.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- trac.spec	16 Feb 2006 18:25:48 -0000	1.5
+++ trac.spec	18 Apr 2006 20:07:51 -0000	1.6
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           trac
-Version:        0.9.4
+Version:        0.9.5
 Release:        1%{?dist}
 Summary:        Enhanced wiki and issue tracking system
 
@@ -111,6 +111,9 @@
 %{_mandir}/man8/tracd.8*
 
 %changelog
+* Tue Apr 18 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.5-1
+- bug fix release 0.9.5
+
 * Wed Feb 15 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.4-1
 - 0.9.4
  * Deletion of reports has been fixed.



From fedora-extras-commits at redhat.com  Tue Apr 18 20:19:08 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Tue, 18 Apr 2006 13:19:08 -0700
Subject: rpms/trac/FC-4 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 trac.spec, 1.5,
	1.6
Message-ID: <200604182019.k3IKJAfs025183@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25146/FC-4

Modified Files:
	.cvsignore sources trac.spec 
Log Message:
bug fix release 0.9.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Feb 2006 18:51:02 -0000	1.3
+++ .cvsignore	18 Apr 2006 20:19:07 -0000	1.4
@@ -1 +1 @@
-trac-0.9.4.tar.gz
+trac-0.9.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Feb 2006 18:49:28 -0000	1.3
+++ sources	18 Apr 2006 20:19:07 -0000	1.4
@@ -1 +1 @@
-df752bd5ca8790e9735300c9e0be9bef  trac-0.9.4.tar.gz
+3b7d708eaf905cc6ba2b6b10a09a8cf4  trac-0.9.5.tar.gz


Index: trac.spec
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-4/trac.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- trac.spec	16 Feb 2006 19:26:48 -0000	1.5
+++ trac.spec	18 Apr 2006 20:19:07 -0000	1.6
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           trac
-Version:        0.9.4
-Release:        2%{?dist}
+Version:        0.9.5
+Release:        1%{?dist}
 Summary:        Enhanced wiki and issue tracking system
 
 Group:          Applications/Internet
@@ -111,8 +111,8 @@
 %{_mandir}/man8/tracd.8*
 
 %changelog
-* Thu Feb 16 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.4-2
-- bumped release to force plague build with new sources
+* Tue Apr 18 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.5-1
+- bug fix release 0.9.5
 
 * Wed Feb 15 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.4-1
 - 0.9.4
@@ -125,6 +125,9 @@
    2459, 2481, 2485, 2536, 2544, 2553, 2580, 2583, 2606, 2613, 2621, 
    2664, 2666, 2680, 2706, 2707, 2735
 
+* Mon Feb 13 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.3-5
+- Rebuild for Fedora Extras 5
+
 * Mon Jan 16 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.3-4
 - updated trac.conf to allow for trac.*cgi 
 



From fedora-extras-commits at redhat.com  Tue Apr 18 20:19:08 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Tue, 18 Apr 2006 13:19:08 -0700
Subject: rpms/trac/FC-5 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 trac.spec, 1.5,
	1.6
Message-ID: <200604182019.k3IKJAqw025189@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/trac/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25146/FC-5

Modified Files:
	.cvsignore sources trac.spec 
Log Message:
bug fix release 0.9.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	16 Feb 2006 18:51:45 -0000	1.3
+++ .cvsignore	18 Apr 2006 20:19:08 -0000	1.4
@@ -1 +1 @@
-trac-0.9.4.tar.gz
+trac-0.9.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	16 Feb 2006 18:47:52 -0000	1.3
+++ sources	18 Apr 2006 20:19:08 -0000	1.4
@@ -1 +1 @@
-df752bd5ca8790e9735300c9e0be9bef  trac-0.9.4.tar.gz
+3b7d708eaf905cc6ba2b6b10a09a8cf4  trac-0.9.5.tar.gz


Index: trac.spec
===================================================================
RCS file: /cvs/extras/rpms/trac/FC-5/trac.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- trac.spec	16 Feb 2006 18:25:48 -0000	1.5
+++ trac.spec	18 Apr 2006 20:19:08 -0000	1.6
@@ -1,7 +1,7 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           trac
-Version:        0.9.4
+Version:        0.9.5
 Release:        1%{?dist}
 Summary:        Enhanced wiki and issue tracking system
 
@@ -111,6 +111,9 @@
 %{_mandir}/man8/tracd.8*
 
 %changelog
+* Tue Apr 18 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.5-1
+- bug fix release 0.9.5
+
 * Wed Feb 15 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.9.4-1
 - 0.9.4
  * Deletion of reports has been fixed.



From fedora-extras-commits at redhat.com  Tue Apr 18 21:45:38 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 18 Apr 2006 14:45:38 -0700
Subject: rpms/abcm2ps/devel .cvsignore, 1.15, 1.16 abcm2ps.spec, 1.17,
	1.18 sources, 1.15, 1.16
Message-ID: <200604182145.k3ILjerk027999@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27978

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 4.12.14


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	30 Mar 2006 15:01:02 -0000	1.15
+++ .cvsignore	18 Apr 2006 21:45:38 -0000	1.16
@@ -1,2 +1,2 @@
-abcm2ps-4.12.12.tar.gz
+abcm2ps-4.12.14.tar.gz
 abcplus_en-1.0.4.zip


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/abcm2ps.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- abcm2ps.spec	30 Mar 2006 15:01:02 -0000	1.17
+++ abcm2ps.spec	18 Apr 2006 21:45:38 -0000	1.18
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        4.12.12
+Version:        4.12.14
 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-4.12.12.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-4.12.14.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
+* Tue Apr 18 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.14-1
+- new version 4.12.14
+
 * Thu Mar 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.12-1
 - new version 4.12.12
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	30 Mar 2006 15:01:02 -0000	1.15
+++ sources	18 Apr 2006 21:45:38 -0000	1.16
@@ -1,2 +1,2 @@
-e293f78046593cdf9073878690e80e9a  abcm2ps-4.12.12.tar.gz
+a22f4954cb3e74d04a0be34f163cc434  abcm2ps-4.12.14.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Tue Apr 18 21:48:57 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 18 Apr 2006 14:48:57 -0700
Subject: rpms/abcm2ps/FC-4 .cvsignore, 1.15, 1.16 abcm2ps.spec, 1.16,
	1.17 sources, 1.15, 1.16
Message-ID: <200604182148.k3ILmxIr028088@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28051/FC-4

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 4.12.14


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-4/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	30 Mar 2006 15:04:07 -0000	1.15
+++ .cvsignore	18 Apr 2006 21:48:57 -0000	1.16
@@ -1,2 +1,2 @@
-abcm2ps-4.12.12.tar.gz
+abcm2ps-4.12.14.tar.gz
 abcplus_en-1.0.4.zip


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-4/abcm2ps.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- abcm2ps.spec	30 Mar 2006 15:04:07 -0000	1.16
+++ abcm2ps.spec	18 Apr 2006 21:48:57 -0000	1.17
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        4.12.12
+Version:        4.12.14
 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-4.12.12.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-4.12.14.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
+* Tue Apr 18 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.14-1
+- new version 4.12.14
+
 * Thu Mar 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.12-1
 - new version 4.12.12
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-4/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	30 Mar 2006 15:04:07 -0000	1.15
+++ sources	18 Apr 2006 21:48:57 -0000	1.16
@@ -1,2 +1,2 @@
-e293f78046593cdf9073878690e80e9a  abcm2ps-4.12.12.tar.gz
+a22f4954cb3e74d04a0be34f163cc434  abcm2ps-4.12.14.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Tue Apr 18 21:48:58 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 18 Apr 2006 14:48:58 -0700
Subject: rpms/abcm2ps/FC-5 .cvsignore, 1.15, 1.16 abcm2ps.spec, 1.17,
	1.18 sources, 1.15, 1.16
Message-ID: <200604182149.k3ILn0Mm028094@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28051/FC-5

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 4.12.14


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-5/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	30 Mar 2006 15:04:07 -0000	1.15
+++ .cvsignore	18 Apr 2006 21:48:58 -0000	1.16
@@ -1,2 +1,2 @@
-abcm2ps-4.12.12.tar.gz
+abcm2ps-4.12.14.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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- abcm2ps.spec	30 Mar 2006 15:04:07 -0000	1.17
+++ abcm2ps.spec	18 Apr 2006 21:48:58 -0000	1.18
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        4.12.12
+Version:        4.12.14
 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-4.12.12.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-4.12.14.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
+* Tue Apr 18 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.14-1
+- new version 4.12.14
+
 * Thu Mar 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.12-1
 - new version 4.12.12
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-5/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	30 Mar 2006 15:04:07 -0000	1.15
+++ sources	18 Apr 2006 21:48:58 -0000	1.16
@@ -1,2 +1,2 @@
-e293f78046593cdf9073878690e80e9a  abcm2ps-4.12.12.tar.gz
+a22f4954cb3e74d04a0be34f163cc434  abcm2ps-4.12.14.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Tue Apr 18 21:49:10 2006
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Tue, 18 Apr 2006 14:49:10 -0700
Subject: pm-utils pm-action,1.1,1.2
Message-ID: <200604182149.k3ILnAVS028119@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/devel/pm-utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28100

Modified Files:
	pm-action 
Log Message:
- test cvs repo


Index: pm-action
===================================================================
RCS file: /cvs/devel/pm-utils/pm-action,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pm-action	14 Mar 2006 14:56:26 -0000	1.1
+++ pm-action	18 Apr 2006 21:49:08 -0000	1.2
@@ -1,6 +1,9 @@
 #!/bin/bash
 
 # Simple suspend script
+#
+# Copyright 2006 Red Hat, Inc.
+#
 # Based on work from:
 #    Bill Nottingham <notting at redhat.com>
 #    Peter Jones <pjones at redhat.com>



From fedora-extras-commits at redhat.com  Tue Apr 18 22:24:42 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Tue, 18 Apr 2006 15:24:42 -0700
Subject: rpms/ikvm import.log,1.2,1.3
Message-ID: <200604182225.k3IMPE6G030369@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/ikvm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30337

Modified Files:
	import.log 
Log Message:
auto-import ikvm-0.22-5 on branch devel from ikvm-0.22-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ikvm/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	8 Mar 2006 16:23:11 -0000	1.2
+++ import.log	18 Apr 2006 22:24:42 -0000	1.3
@@ -1 +1,2 @@
 ikvm-0_22-4:HEAD:ikvm-0.22-4.src.rpm:1141834969
+ikvm-0_22-5:HEAD:ikvm-0.22-5.src.rpm:1145399070



From fedora-extras-commits at redhat.com  Tue Apr 18 22:24:43 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Tue, 18 Apr 2006 15:24:43 -0700
Subject: rpms/ikvm/devel ikvm.spec,1.1,1.2
Message-ID: <200604182225.k3IMPFsK030372@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/ikvm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30337/devel

Modified Files:
	ikvm.spec 
Log Message:
auto-import ikvm-0.22-5 on branch devel from ikvm-0.22-5.src.rpm


Index: ikvm.spec
===================================================================
RCS file: /cvs/extras/rpms/ikvm/devel/ikvm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ikvm.spec	8 Mar 2006 16:23:17 -0000	1.1
+++ ikvm.spec	18 Apr 2006 22:24:43 -0000	1.2
@@ -1,16 +1,17 @@
-%define ikvmdir %{buildroot}%{_libdir}/ikvm
+%define _libdir /usr/lib
 
 Summary: An implementation of Java for Mono
 Name: ikvm
 Version: 0.22
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 Group: Development/Languages
-Source0: http://go-mono.com/sources/ikvm/ikvm-%{version}.tar.gz
+Source0: http://go-mono.com/sources/%{name}/%{name}-%{version}.tar.gz
 Patch0: ikvm-scripts.patch
 URL: http://www.ikvm.net/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: mono-core, mono-devel, dos2unix
+BuildRequires:  mono-devel, dos2unix
+Requires: mono-core
 
 %description
 This package provides IKVM.NET, an open source Java compatibility
@@ -18,15 +19,6 @@
 and various class libraries for Java, as well as tools for Java and
 Mono interoperability.
 
-%package devel
-Summary:  IKVM pkgconfig file
-Group:    Development/Languages
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-This package contains the pkgconfig configuration file for IKVM.
-
-
 %prep
 rm -rf %{RPM_BUILD_ROOT}
 %setup -q
@@ -39,32 +31,23 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%{__mkdir} -p %{buildroot}%{_libdir}/pkgconfig
-%{__mkdir} -p %{buildroot}%{_bindir}
-%{__mkdir} -p %{ikvmdir}
-%{__install} -c bin/ikvm.exe %{ikvmdir}/ikvm.exe
-%{__install} -c bin/ikvmc.exe %{ikvmdir}/ikvmc.exe
-%{__install} -c bin/ikvmstub.exe %{ikvmdir}/ikvmstub.ex
-%{__install} -c lib/IKVM.AWT.WinForms.dll %{ikvmdir}/IKVM.AWT.WinForms.dll
-%{__install} -c lib/IKVM.GNU.Classpath.dll %{ikvmdir}/IKVM.GNU.Classpath.dll
-%{__install} -c lib/IKVM.Runtime.dll %{ikvmdir}/IKVM.Runtime.dll
-%{__install} -c scripts/ikvmc %{buildroot}%{_bindir}/ikvmc
-%{__install} -c scripts/ikvm %{buildroot}%{_bindir}/ikvm
-%{__install} -c scripts/ikvmstub %{buildroot}%{_bindir}/ikvmstub
-%{__install} -c -m 644 ikvm.pc %{buildroot}%{_libdir}/pkgconfig/ikvm.pc
+make DESTDIR=%{buildroot} install
 
 %files 
 %doc LICENSE COPYING
 %{_bindir}/*
 %{_libdir}/ikvm/
-
-%files devel
 %{_libdir}/pkgconfig/ikvm.pc
 
 %clean
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Tue Apr 18 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.22-5
+- libdir is now usr-lib irrespective of architecture built on
+- removed devel as there is no point of a devel for one file
+- multiple spec file changed
+
 * Mon Mar  6 2006 Michel Salim <michel.salim at gmail.com> 0.22-4
 - Fixed summary
 - Changed URL field



From fedora-extras-commits at redhat.com  Tue Apr 18 22:27:01 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Tue, 18 Apr 2006 15:27:01 -0700
Subject: rpms/ikvm import.log,1.3,1.4
Message-ID: <200604182227.k3IMR3bK030462@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/ikvm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30431

Modified Files:
	import.log 
Log Message:
auto-import ikvm-0.22-5 on branch FC-5 from ikvm-0.22-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ikvm/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	18 Apr 2006 22:24:42 -0000	1.3
+++ import.log	18 Apr 2006 22:27:01 -0000	1.4
@@ -1,2 +1,3 @@
 ikvm-0_22-4:HEAD:ikvm-0.22-4.src.rpm:1141834969
 ikvm-0_22-5:HEAD:ikvm-0.22-5.src.rpm:1145399070
+ikvm-0_22-5:FC-5:ikvm-0.22-5.src.rpm:1145399164



From fedora-extras-commits at redhat.com  Tue Apr 18 22:27:01 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Tue, 18 Apr 2006 15:27:01 -0700
Subject: rpms/ikvm/FC-5 ikvm.spec,1.1,1.2
Message-ID: <200604182227.k3IMR39k030466@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/ikvm/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30431/FC-5

Modified Files:
	ikvm.spec 
Log Message:
auto-import ikvm-0.22-5 on branch FC-5 from ikvm-0.22-5.src.rpm


Index: ikvm.spec
===================================================================
RCS file: /cvs/extras/rpms/ikvm/FC-5/ikvm.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ikvm.spec	8 Mar 2006 16:23:17 -0000	1.1
+++ ikvm.spec	18 Apr 2006 22:27:01 -0000	1.2
@@ -1,16 +1,17 @@
-%define ikvmdir %{buildroot}%{_libdir}/ikvm
+%define _libdir /usr/lib
 
 Summary: An implementation of Java for Mono
 Name: ikvm
 Version: 0.22
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 Group: Development/Languages
-Source0: http://go-mono.com/sources/ikvm/ikvm-%{version}.tar.gz
+Source0: http://go-mono.com/sources/%{name}/%{name}-%{version}.tar.gz
 Patch0: ikvm-scripts.patch
 URL: http://www.ikvm.net/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: mono-core, mono-devel, dos2unix
+BuildRequires:  mono-devel, dos2unix
+Requires: mono-core
 
 %description
 This package provides IKVM.NET, an open source Java compatibility
@@ -18,15 +19,6 @@
 and various class libraries for Java, as well as tools for Java and
 Mono interoperability.
 
-%package devel
-Summary:  IKVM pkgconfig file
-Group:    Development/Languages
-Requires: %{name} = %{version}-%{release}
-
-%description devel
-This package contains the pkgconfig configuration file for IKVM.
-
-
 %prep
 rm -rf %{RPM_BUILD_ROOT}
 %setup -q
@@ -39,32 +31,23 @@
 
 %install
 %{__rm} -rf %{buildroot}
-%{__mkdir} -p %{buildroot}%{_libdir}/pkgconfig
-%{__mkdir} -p %{buildroot}%{_bindir}
-%{__mkdir} -p %{ikvmdir}
-%{__install} -c bin/ikvm.exe %{ikvmdir}/ikvm.exe
-%{__install} -c bin/ikvmc.exe %{ikvmdir}/ikvmc.exe
-%{__install} -c bin/ikvmstub.exe %{ikvmdir}/ikvmstub.ex
-%{__install} -c lib/IKVM.AWT.WinForms.dll %{ikvmdir}/IKVM.AWT.WinForms.dll
-%{__install} -c lib/IKVM.GNU.Classpath.dll %{ikvmdir}/IKVM.GNU.Classpath.dll
-%{__install} -c lib/IKVM.Runtime.dll %{ikvmdir}/IKVM.Runtime.dll
-%{__install} -c scripts/ikvmc %{buildroot}%{_bindir}/ikvmc
-%{__install} -c scripts/ikvm %{buildroot}%{_bindir}/ikvm
-%{__install} -c scripts/ikvmstub %{buildroot}%{_bindir}/ikvmstub
-%{__install} -c -m 644 ikvm.pc %{buildroot}%{_libdir}/pkgconfig/ikvm.pc
+make DESTDIR=%{buildroot} install
 
 %files 
 %doc LICENSE COPYING
 %{_bindir}/*
 %{_libdir}/ikvm/
-
-%files devel
 %{_libdir}/pkgconfig/ikvm.pc
 
 %clean
 %{__rm} -rf %{buildroot}
 
 %changelog
+* Tue Apr 18 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.22-5
+- libdir is now usr-lib irrespective of architecture built on
+- removed devel as there is no point of a devel for one file
+- multiple spec file changed
+
 * Mon Mar  6 2006 Michel Salim <michel.salim at gmail.com> 0.22-4
 - Fixed summary
 - Changed URL field



From fedora-extras-commits at redhat.com  Wed Apr 19 02:12:25 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 18 Apr 2006 19:12:25 -0700
Subject: rpms/libmal/devel libmal.spec,1.3,1.4
Message-ID: <200604190212.k3J2CRna007498@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libmal/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7481

Modified Files:
	libmal.spec 
Log Message:
* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.31-3 
- respin for pilot-link



Index: libmal.spec
===================================================================
RCS file: /cvs/extras/rpms/libmal/devel/libmal.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libmal.spec	31 Mar 2006 12:37:13 -0000	1.3
+++ libmal.spec	19 Apr 2006 02:12:25 -0000	1.4
@@ -4,7 +4,7 @@
 # NOTE: this isn't the latest version, but is the last version known to 
 # work with kdepim
 Version: 0.31 
-Release: 2%{?dist}.1
+Release: 3%{?dist}
 
 License: MPL	
 Url: 	 http://jasonday.home.att.net/code/libmal/ 
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.31-3 
+- respin for pilot-link
+
 * Wed Mar 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.31-2
 - capitalize summary
 - drop empty %%doc's: AUTHORS NEWS TODO



From fedora-extras-commits at redhat.com  Wed Apr 19 02:13:03 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 18 Apr 2006 19:13:03 -0700
Subject: rpms/libmal/FC-5 libmal.spec,1.2,1.3
Message-ID: <200604190213.k3J2D5VV007569@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libmal/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7552

Modified Files:
	libmal.spec 
Log Message:
* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.31-3 
- respin for pilot-link



Index: libmal.spec
===================================================================
RCS file: /cvs/extras/rpms/libmal/FC-5/libmal.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libmal.spec	22 Mar 2006 15:33:38 -0000	1.2
+++ libmal.spec	19 Apr 2006 02:13:03 -0000	1.3
@@ -4,7 +4,7 @@
 # NOTE: this isn't the latest version, but is the last version known to 
 # work with kdepim
 Version: 0.31 
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: MPL	
 Url: 	 http://jasonday.home.att.net/code/libmal/ 
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.31-3 
+- respin for pilot-link
+
 * Wed Mar 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.31-2
 - capitalize summary
 - drop empty %%doc's: AUTHORS NEWS TODO



From fedora-extras-commits at redhat.com  Wed Apr 19 02:23:11 2006
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Tue, 18 Apr 2006 19:23:11 -0700
Subject: rpms/wxGTK/FC-4 wxGTK-2.6.3.2-cvs.patch, NONE, 1.1 sources, 1.3,
	1.4 wxGTK.spec, 1.13, 1.14
Message-ID: <200604190223.k3J2NDE6007736@cvs-int.fedora.redhat.com>

Author: mattdm

Update of /cvs/extras/rpms/wxGTK/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7706

Modified Files:
	sources wxGTK.spec 
Added Files:
	wxGTK-2.6.3.2-cvs.patch 
Log Message:
Update to 2.6.3 -- massive changes. See bug #154618 for details.


wxGTK-2.6.3.2-cvs.patch:

--- NEW FILE wxGTK-2.6.3.2-cvs.patch ---
diff -ur wxGTK-2.6.3/configure wxGTK-2.6.3.2/configure
--- wxGTK-2.6.3/configure	2006-03-21 18:42:05.000000000 -0500
+++ wxGTK-2.6.3.2/configure	2006-03-30 12:05:51.000000000 -0500
@@ -1669,7 +1669,7 @@
 wx_major_version_number=2
 wx_minor_version_number=6
 wx_release_number=3
-wx_subrelease_number=1
+wx_subrelease_number=2
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
 WX_VERSION=$WX_RELEASE.$wx_release_number
diff -ur wxGTK-2.6.3/configure.in wxGTK-2.6.3.2/configure.in
--- wxGTK-2.6.3/configure.in	2006-03-21 18:42:05.000000000 -0500
+++ wxGTK-2.6.3.2/configure.in	2006-03-30 12:05:49.000000000 -0500
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_REVISION($Id: configure.in,v 1.1063.2.15 2006/03/21 19:33:57 KO Exp $)dnl
+AC_REVISION($Id: configure.in,v 1.1063.2.16 2006/03/30 17:05:49 RD Exp $)dnl
 
 dnl ---------------------------------------------------------------------------
 dnl
@@ -8,7 +8,7 @@
 dnl
 dnl This script is under the wxWidgets licence.
 dnl
-dnl Version: $Id: configure.in,v 1.1063.2.15 2006/03/21 19:33:57 KO Exp $
+dnl Version: $Id: configure.in,v 1.1063.2.16 2006/03/30 17:05:49 RD Exp $
 dnl ---------------------------------------------------------------------------
 
 dnl ---------------------------------------------------------------------------
@@ -33,7 +33,7 @@
 wx_major_version_number=2
 wx_minor_version_number=6
 wx_release_number=3
-wx_subrelease_number=1
+wx_subrelease_number=2
 
 WX_RELEASE=$wx_major_version_number.$wx_minor_version_number
 WX_VERSION=$WX_RELEASE.$wx_release_number
diff -ur wxGTK-2.6.3/contrib/src/deprecated/cwlex_yy.c wxGTK-2.6.3.2/contrib/src/deprecated/cwlex_yy.c
--- wxGTK-2.6.3/contrib/src/deprecated/cwlex_yy.c	2006-03-21 18:42:22.000000000 -0500
+++ wxGTK-2.6.3.2/contrib/src/deprecated/cwlex_yy.c	2005-05-04 14:57:49.000000000 -0400
@@ -3,7 +3,7 @@
 /* Licence:   wxWindows Licence */
 
 /* scanner skeleton version:
- * $Header: /pack/cvsroots/wxwindows/wxWindows/contrib/src/deprecated/cwlex_yy.c,v 1.2 2005/05/04 18:57:49 JS Exp $
+ * $Header: /pack/cvsroots/wxwidgets/wxWidgets/contrib/src/deprecated/cwlex_yy.c,v 1.2 2005/05/04 18:57:49 JS Exp $
 	Last change:  JS   13 Jul 97    6:17 pm
  */
 
diff -ur wxGTK-2.6.3/contrib/src/deprecated/doslex.c wxGTK-2.6.3.2/contrib/src/deprecated/doslex.c
--- wxGTK-2.6.3/contrib/src/deprecated/doslex.c	2006-03-21 18:42:22.000000000 -0500
+++ wxGTK-2.6.3.2/contrib/src/deprecated/doslex.c	2005-06-09 14:37:44.000000000 -0400
@@ -1,7 +1,7 @@
 /* A lexical scanner generated by flex */
 
 /* scanner skeleton version:
- * $Header: /pack/cvsroots/wxwindows/wxWindows/contrib/src/deprecated/doslex.c,v 1.6 2005/06/09 18:37:44 ABX Exp $
+ * $Header: /pack/cvsroots/wxwidgets/wxWidgets/contrib/src/deprecated/doslex.c,v 1.6 2005/06/09 18:37:44 ABX Exp $
   Last change:  JS   13 Jul 97    6:17 pm
  */
 /* Copyright: (c) Julian Smart */
diff -ur wxGTK-2.6.3/include/wx/version.h wxGTK-2.6.3.2/include/wx/version.h
--- wxGTK-2.6.3/include/wx/version.h	2006-03-21 18:42:08.000000000 -0500
+++ wxGTK-2.6.3.2/include/wx/version.h	2006-03-30 12:05:48.000000000 -0500
@@ -4,7 +4,7 @@
 *  Author:      Julian Smart
 *  Modified by: Ryan Norton (Converted to C)
 *  Created:     29/01/98
-*  RCS-ID:      $Id: version.h,v 1.69.2.2 2006/01/18 10:25:00 JS Exp $
+*  RCS-ID:      $Id: version.h,v 1.69.2.3 2006/03/30 17:05:48 RD Exp $
 *  Copyright:   (c) 1998 Julian Smart
 *  Licence:     wxWindows licence
 */
@@ -22,7 +22,7 @@
 #define wxMAJOR_VERSION      2
 #define wxMINOR_VERSION      6
 #define wxRELEASE_NUMBER     3
-#define wxSUBRELEASE_NUMBER  0
+#define wxSUBRELEASE_NUMBER  2
 #define wxVERSION_STRING   _T("wxWidgets 2.6.3")
 
 /*  nothing to update below this line when updating the version */
diff -ur wxGTK-2.6.3/locale/fr.po wxGTK-2.6.3.2/locale/fr.po
--- wxGTK-2.6.3/locale/fr.po	2006-03-21 18:42:51.000000000 -0500
+++ wxGTK-2.6.3.2/locale/fr.po	2005-09-20 11:18:55.000000000 -0400
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: wxWidgets-2.6.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-21 17:37+0200\n"
+"POT-Creation-Date: 2005-04-11 22:24+0200\n"
 "PO-Revision-Date: 2005-09-07 09:34+0200\n"
 "Last-Translator: Thomas Huriaux <thomas.huriaux at gmail.com>\n"
 "Language-Team: French <debian-l10n-french at lists.debian.org>\n"
@@ -13,12 +13,12 @@
 "Content-Transfer-Encoding: 8bit\n"
 "plural-forms: nplurals=2; plural=n > 1\n"
 
-#: ../src/common/debugrpt.cpp:569
+#: ../src/common/debugrpt.cpp:547
 #, c-format
 msgid "\t%s: %s\n"
 msgstr "\t%s?: %s\n"
 
-#: ../src/common/debugrpt.cpp:572
+#: ../src/common/debugrpt.cpp:550
 msgid ""
 "\n"
 "Please send this report to the program maintainer, thank you!\n"
@@ -26,20 +26,20 @@
 "\n"
 "Veuillez envoyer ce rapport au responsable du programme.\n"
 
-#: ../src/palmos/utils.cpp:206
+#: ../src/palmos/utils.cpp:210
 msgid " "
 msgstr " "
 
-#: ../src/generic/dbgrptg.cpp:312
+#: ../src/generic/dbgrptg.cpp:293
 msgid "              Thank you and we're sorry for the inconvenience!\n"
 msgstr "              Merci et d?sol? pour le d?rangement.\n"
 
-#: ../src/common/log.cpp:321
+#: ../src/common/log.cpp:322
 #, c-format
 msgid " (error %ld: %s)"
 msgstr " (erreur %ld?: %s)"
 
-#: ../src/common/docview.cpp:1419
+#: ../src/common/docview.cpp:1380
 msgid " - "
 msgstr " - "
 
@@ -47,23 +47,23 @@
 msgid " Preview"
 msgstr " Aper?u"
 
-#: ../src/common/paper.cpp:124
+#: ../src/common/paper.cpp:134
 msgid "#10 Envelope, 4 1/8 x 9 1/2 in"
 msgstr "Enveloppe n??10 (4,125 x 9,5 pouces)"
 
-#: ../src/common/paper.cpp:125
+#: ../src/common/paper.cpp:135
 msgid "#11 Envelope, 4 1/2 x 10 3/8 in"
 msgstr "Enveloppe n??11 (4,5 x 10,375 pouces)"
 
-#: ../src/common/paper.cpp:126
+#: ../src/common/paper.cpp:136
 msgid "#12 Envelope, 4 3/4 x 11 in"
 msgstr "Enveloppe n??12 (4,75 x 11 pouces)"
 
-#: ../src/common/paper.cpp:127
+#: ../src/common/paper.cpp:137
 msgid "#14 Envelope, 5 x 11 1/2 in"
 msgstr "Enveloppe n??14 (5 x 11,5 pouces)"
 
-#: ../src/common/paper.cpp:123
+#: ../src/common/paper.cpp:133
 msgid "#9 Envelope, 3 7/8 x 8 7/8 in"
 msgstr "Enveloppe n??9 (3,875 x 8,875 pouces)"
 
@@ -74,13 +74,13 @@
 msgid "#define %s must be an integer."
 msgstr "#define %s doit ?tre un entier."
 
-#: ../src/html/helpfrm.cpp:1042 ../src/html/helpfrm.cpp:1044
-#: ../src/html/helpfrm.cpp:1703 ../src/html/helpfrm.cpp:1736
+#: ../src/html/helpfrm.cpp:1019 ../src/html/helpfrm.cpp:1021
+#: ../src/html/helpfrm.cpp:1689 ../src/html/helpfrm.cpp:1722
 #, c-format
 msgid "%i of %i"
 msgstr "%i de %i"
 
-#: ../src/generic/filedlgg.cpp:288
+#: ../src/generic/filedlgg.cpp:287
 #, c-format
 msgid "%ld bytes"
 msgstr "%ld octets"
@@ -90,27 +90,27 @@
 msgid "%s (or %s)"
 msgstr "%s (ou %s)"
 
-#: ../src/generic/logg.cpp:261
+#: ../src/generic/logg.cpp:262
 #, c-format
 msgid "%s Error"
 msgstr "%s Erreur"
 
-#: ../src/generic/logg.cpp:269
+#: ../src/generic/logg.cpp:270
 #, c-format
 msgid "%s Information"
 msgstr "%s Information"
 
[...16204 lines suppressed...]
--- wxGTK-2.6.3/src/tiff/tif_next.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_next.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_next.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_next.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_open.c wxGTK-2.6.3.2/src/tiff/tif_open.c
--- wxGTK-2.6.3/src/tiff/tif_open.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_open.c	2005-05-31 05:28:43.000000000 -0400
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_open.c,v 1.5 2005/05/31 09:28:43 JS Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_open.c,v 1.5 2005/05/31 09:28:43 JS Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_os2.c wxGTK-2.6.3.2/src/tiff/tif_os2.c
--- wxGTK-2.6.3/src/tiff/tif_os2.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_os2.c	2002-12-04 09:10:19.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_os2.c,v 1.2 2002/12/04 14:10:19 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_os2.c,v 1.2 2002/12/04 14:10:19 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_packbits.c wxGTK-2.6.3.2/src/tiff/tif_packbits.c
--- wxGTK-2.6.3/src/tiff/tif_packbits.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_packbits.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_packbits.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_packbits.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_predict.c wxGTK-2.6.3.2/src/tiff/tif_predict.c
--- wxGTK-2.6.3/src/tiff/tif_predict.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_predict.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_predict.c,v 1.6 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_predict.c,v 1.6 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_predict.h wxGTK-2.6.3.2/src/tiff/tif_predict.h
--- wxGTK-2.6.3/src/tiff/tif_predict.h	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_predict.h	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_predict.h,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_predict.h,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1995-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_print.c wxGTK-2.6.3.2/src/tiff/tif_print.c
--- wxGTK-2.6.3/src/tiff/tif_print.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_print.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_print.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_print.c,v 1.4 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_read.c wxGTK-2.6.3.2/src/tiff/tif_read.c
--- wxGTK-2.6.3/src/tiff/tif_read.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_read.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_read.c,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_read.c,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_strip.c wxGTK-2.6.3.2/src/tiff/tif_strip.c
--- wxGTK-2.6.3/src/tiff/tif_strip.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_strip.c	2004-11-19 17:29:45.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_strip.c,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_strip.c,v 1.3 2004/11/19 22:29:45 VZ Exp $ */
 
 /*
  * Copyright (c) 1991-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_swab.c wxGTK-2.6.3.2/src/tiff/tif_swab.c
--- wxGTK-2.6.3/src/tiff/tif_swab.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_swab.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_swab.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_swab.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_thunder.c wxGTK-2.6.3.2/src/tiff/tif_thunder.c
--- wxGTK-2.6.3/src/tiff/tif_thunder.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_thunder.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_thunder.c,v 1.4 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_thunder.c,v 1.4 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_tile.c wxGTK-2.6.3.2/src/tiff/tif_tile.c
--- wxGTK-2.6.3/src/tiff/tif_tile.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_tile.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_tile.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_tile.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1991-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_unix.c wxGTK-2.6.3.2/src/tiff/tif_unix.c
--- wxGTK-2.6.3/src/tiff/tif_unix.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_unix.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_unix.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_unix.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_version.c wxGTK-2.6.3.2/src/tiff/tif_version.c
--- wxGTK-2.6.3/src/tiff/tif_version.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_version.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_version.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_version.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 /*
  * Copyright (c) 1992-1997 Sam Leffler
  * Copyright (c) 1992-1997 Silicon Graphics, Inc.
diff -ur wxGTK-2.6.3/src/tiff/tif_vms.c wxGTK-2.6.3.2/src/tiff/tif_vms.c
--- wxGTK-2.6.3/src/tiff/tif_vms.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_vms.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_vms.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_vms.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_warning.c wxGTK-2.6.3.2/src/tiff/tif_warning.c
--- wxGTK-2.6.3/src/tiff/tif_warning.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_warning.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_warning.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_warning.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_win32.c wxGTK-2.6.3.2/src/tiff/tif_win32.c
--- wxGTK-2.6.3/src/tiff/tif_win32.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_win32.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_win32.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_win32.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_win3.c wxGTK-2.6.3.2/src/tiff/tif_win3.c
--- wxGTK-2.6.3/src/tiff/tif_win3.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_win3.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_win3.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_win3.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_write.c wxGTK-2.6.3.2/src/tiff/tif_write.c
--- wxGTK-2.6.3/src/tiff/tif_write.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_write.c	2004-11-19 17:29:46.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_write.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_write.c,v 1.3 2004/11/19 22:29:46 VZ Exp $ */
 
 /*
  * Copyright (c) 1988-1997 Sam Leffler
diff -ur wxGTK-2.6.3/src/tiff/tif_zip.c wxGTK-2.6.3.2/src/tiff/tif_zip.c
--- wxGTK-2.6.3/src/tiff/tif_zip.c	2006-03-21 18:42:16.000000000 -0500
+++ wxGTK-2.6.3.2/src/tiff/tif_zip.c	2004-11-19 17:29:47.000000000 -0500
@@ -1,4 +1,4 @@
-/* $Header: /pack/cvsroots/wxwindows/wxWindows/src/tiff/tif_zip.c,v 1.4 2004/11/19 22:29:47 VZ Exp $ */
+/* $Header: /pack/cvsroots/wxwidgets/wxWidgets/src/tiff/tif_zip.c,v 1.4 2004/11/19 22:29:47 VZ Exp $ */
 
 /*
  * Copyright (c) 1995-1997 Sam Leffler
diff -ur wxGTK-2.6.3/utils/helpview/src/helpview.cpp wxGTK-2.6.3.2/utils/helpview/src/helpview.cpp
--- wxGTK-2.6.3/utils/helpview/src/helpview.cpp	2006-03-21 18:42:49.000000000 -0500
+++ wxGTK-2.6.3.2/utils/helpview/src/helpview.cpp	2006-03-30 06:35:12.000000000 -0500
@@ -5,7 +5,7 @@
 // Author:      Vaclav Slavik, Julian Smart
 // Modified by:
 // Created:     2002-07-09
-// RCS-ID:      $Id: helpview.cpp,v 1.14 2005/05/30 09:24:08 ABX Exp $
+// RCS-ID:      $Id: helpview.cpp,v 1.14.2.1 2006/03/30 11:35:12 JS Exp $
 // Copyright:   (c) 2002 Vaclav Slavik, Julian Smart and others
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -63,7 +63,7 @@
 
 #ifdef __WXMAC__
     wxApp::s_macAboutMenuItemId = wxID_ABOUT;
-    wxFileName::MacRegisterDefaultTypeAndCreator( "htb" , 'HTBD' , 'HTBA' ) ;
+    wxFileName::MacRegisterDefaultTypeAndCreator( wxT("htb") , 'HTBD' , 'HTBA' ) ;
 #endif
 
     int istyle = wxHF_DEFAULT_STYLE;


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wxGTK/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 05:32:41 -0000	1.3
+++ sources	19 Apr 2006 02:23:11 -0000	1.4
@@ -1 +1 @@
-cdadfe82fc93f8a65a2ae18a95b0b0e3  wxGTK-2.4.2.tar.bz2
+3cd76c3c47913e52a3175dd47239c6ec  wxGTK-2.6.3.tar.bz2


Index: wxGTK.spec
===================================================================
RCS file: /cvs/extras/rpms/wxGTK/FC-4/wxGTK.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- wxGTK.spec	8 May 2005 10:39:34 -0000	1.13
+++ wxGTK.spec	19 Apr 2006 02:23:11 -0000	1.14
@@ -1,203 +1,143 @@
 %define x11libdir %{_prefix}/X11R6/%{_lib}
 
+# Option - build an ODBC subpackage using unixODBC. (This is currently 
+# broken; see <https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=176950>.)
+%define withodbc 0
+
 Name:           wxGTK
-Version:        2.4.2
-Release:        12
-Summary:        GTK+ port of the wxWidgets GUI library
-License:        BSD
+Version:        2.6.3
+Release:        2.6.3.2.1%{?dist}
+Summary:        GTK2 port of the wxWidgets GUI library
+# The wxWindows licence is the LGPL with a specific exemption allowing
+# distribution of derived binaries under any terms. (This will eventually
+# change to be "wxWidgets License" once that is approved by OSI.)
+License:        wxWidgets Library Licence
 Group:          System Environment/Libraries
 URL:            http://www.wxwidgets.org/
 Source0:        http://dl.sf.net/wxwindows/%{name}-%{version}.tar.bz2
-Patch0:         wxGTK-2.4.2-privates.patch
-Patch1:         wxGTK-2.4.2-aclocal18.patch
-Patch2:		wxGTK-2.4.2-gcc4.patch
+Patch0:         wxGTK-2.6.3.2-cvs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk+-devel gtk2-devel zlib-devel >= 1.1.4
-BuildRequires:  libpng-devel libjpeg-devel libtiff-devel
-BuildRequires:  libGL libGLU
-Requires:       %{name}-common = %{version}-%{release}
+BuildRequires:  gtk2-devel, zlib-devel >= 1.1.4
+BuildRequires:  libpng-devel, libjpeg-devel, libtiff-devel
+BuildRequires:  expat-devel, SDL-devel, libgnomeprintui22-devel
+BuildRequires:  libGL-devel, libGLU-devel
+%if %{withodbc}
+BuildRequires:  unixODBC-devel
+%endif
+
+# all of these are for previous Fedora Extras sub-packages
+Obsoletes:      wxGTK2 < 2.6.2-1
+Provides:       wxGTK2 = %{version}-%{release}
+
+Obsoletes:      wxGTK-common < 2.6.2-1
+Provides:       wxGTK-common = %{version}-%{release}
+
+Obsoletes:      wxGTK2-xrc < 2.6.2-1
+Obsoletes:      wxGTK-xrc < 2.6.2-1
+Provides:       wxGTK2-xrc = %{version}-%{release}
+Provides:       wxGTK-xrc = %{version}-%{release}
+
+Obsoletes:      wxGTK2-stc < 2.6.2-1
+Obsoletes:      wxGTK-stc < 2.6.2-1
+Provides:       wxGTK2-stc = %{version}-%{release}
+Provides:       wxGTK-stc = %{version}-%{release}
 
 %description
-wxWidgets/GTK is the GTK+ (1.2) port of the C++ cross-platform wxWidgets
+wxWidgets/GTK2 is the GTK2 port of the C++ cross-platform wxWidgets
 GUI library, offering classes for all common GUI controls as well as a
 comprehensive set of helper classes for most common application tasks,
 ranging from networking to HTML display and image manipulation.
 
+
 %package        devel
 Group:          Development/Libraries
-Summary:        Development files for the wxGTK library
+Summary:        Development files for the wxGTK2 library
 Requires:       %{name} = %{version}-%{release}
-Requires:       %{name}-common-devel = %{version}-%{release}
 Requires:       %{name}-gl = %{version}-%{release}
-Requires:       %{name}-stc = %{version}-%{release}
-Requires:       %{name}-xrc = %{version}-%{release}
-Requires:       gtk+-devel
-Conflicts:      %{name}2-devel
-
-%description    devel
-This package includes files needed to link with the wxGTK library.
-
-%package     -n %{name}2
-Group:          System Environment/Libraries
-Summary:        %{name}2 is the GTK2 port of the wxWidgets GUI library
-Requires:       %{name}-common = %{version}-%{release}
-
-%description -n %{name}2
-wxWidgets/GTK2 is the GTK2 port of the C++ cross-platform wxWidgets
-GUI library, offering classes for all common GUI controls as well as a
-comprehensive set of helper classes for most common application tasks,
-ranging from networking to HTML display and image manipulation.
-
-%package     -n %{name}2-devel
-Group:          Development/Libraries
-Summary:        Development files for the wxGTK2 library
-Requires:       %{name}2 = %{version}-%{release}
-Requires:       %{name}-common-devel = %{version}-%{release}
-Requires:       %{name}2-gl = %{version}-%{release}
-Requires:       %{name}2-stc = %{version}-%{release}
-Requires:       %{name}2-xrc = %{version}-%{release}
 Requires:       gtk2-devel
-Conflicts:      %{name}-devel
+Obsoletes:      wxGTK2-devel < %{version}-%{release}
+Provides:       wxGTK2-devel = %{version}-%{release}
+Obsoletes:      wxGTK-common-devel < %{version}-%{release}
+Provides:       wxGTK-common-devel = %{version}-%{release}
 
-%description -n %{name}2-devel
+%description devel
 This package include files needed to link with the wxGTK2 library.
 
-%package        common
-Group:          System Environment/Libraries
-Summary:        wxGTK* common files
-
-%description    common
-Common files for wxWidgets/GTK1 and GTK2.
-
-%package        common-devel
-Group:          Development/Libraries
-Summary:        wxGTK* common development files
-
-%description    common-devel
-Common development files for wxWidgets/GTK1 and GTK2.
 
 %package        gl
 Summary:        OpenGL add-on for the wxWidgets library
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
+Obsoletes:      wxGTK2-gl < %{version}-%{release}
+Provides:       wxGTK2-gl = %{version}-%{release}
 
-%description    gl
-%{summary}.
-
-%package     -n %{name}2-gl
-Summary:        OpenGL add-on for the wxWidgets library
-Group:          System Environment/Libraries
-Requires:       %{name}2 = %{version}-%{release}
-
-%description -n %{name}2-gl
-%{summary}.
-
-%package        stc
-Summary:        Styled text control add-on for the wxWidgets library
-Group:          System Environment/Libraries
-Requires:       %{name} = %{version}-%{release}
-
-%description    stc
-Styled text control add-on for wxGTK. Based on the Scintillia project.
+%description gl
+OpenGL (a 3D graphics API) add-on for the wxWidgets library.
 
-%package     -n %{name}2-stc
-Summary:        Styled text control add-on for the wxWidgets library
-Group:          System Environment/Libraries
-Requires:       %{name}2 = %{version}-%{release}
-
-%description -n %{name}2-stc
-Styled text control add-on for wxGTK2. Based on the Scintillia project.
-
-%package        xrc
-Summary:        The XML-based resource system for the wxWidgets library
+%if %{withodbc}
+%package        odbc
+Summary:        ODBC add-on for the wxWidgets library
 Group:          System Environment/Libraries
 Requires:       %{name} = %{version}-%{release}
 
-%description    xrc
-The XML-based resource system, known as XRC, allows user interface
-elements such as dialogs, menu bars and toolbars, to be stored in
-text files and loaded into the application at run-time.
-This package is for the GTK 1.2 backend
-
-%package     -n %{name}2-xrc
-Summary:        The XML-based resource system for the wxWidgets library
-Group:          System Environment/Libraries
-Requires:       %{name}2 = %{version}-%{release}
-
-%description -n %{name}2-xrc
-The XML-based resource system, known as XRC, allows user interface
-elements such as dialogs, menu bars and toolbars, to be stored in
-text files and loaded into the application at run-time.
-This package is for the GTK2 backend.
-
+%description odbc
+ODBC (a SQL database connectivity API) add-on for the wxWidgets library.
+%endif
 
 %prep
-%setup -q -n %{name}-%{version}
-%patch0 -p1 -b .privates
-%patch1 -b .aclocal18
-%patch2 -p1 -b .gcc4
+%setup -q
+
+%patch0 -p1 -b .2.6.3.2
 
 sed -i -e 's|/usr/lib\b|%{_libdir}|' wx-config.in configure
 
 
 %build
-mkdir _gtk1 _gtk2
-export CC="%{__cc}"
-export CXX="%{__cxx}"
-export CFLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$RPM_OPT_FLAGS"
+export GDK_USE_XFT=1
+
 # --disable-optimise prevents our $RPM_OPT_FLAGS being overridden
 # (see OPTIMISE in configure).
-
-cd _gtk1
-../configure \
-  --prefix=%{_prefix} \
-  --libdir=%{_libdir} \
-  --x-libraries=%{x11libdir} \
-  --with-opengl \
-  --enable-shared \
-  --enable-soname \
-  --disable-optimise
-make %{?_smp_mflags}
-make %{?_smp_mflags} -C contrib/src/stc
-make %{?_smp_mflags} -C contrib/src/xrc
-
-cd ../_gtk2
-../configure \
-  --prefix=%{_prefix} \
-  --libdir=%{_libdir} \
+%configure \
   --x-libraries=%{x11libdir} \
+  --with-gtk=2 \
   --with-opengl \
+%if %{withodbc}
+  --with-odbc \
+%endif
+  --with-sdl \
+  --with-gnomeprint \
   --enable-shared \
   --enable-soname \
   --disable-optimise \
-  --enable-gtk2
+  --enable-debug_info \
+  --enable-unicode \
+  --enable-compat22
+
 make %{?_smp_mflags}
 make %{?_smp_mflags} -C contrib/src/stc
-make %{?_smp_mflags} -C contrib/src/xrc
-
-cd ..
-
+make %{?_smp_mflags} -C contrib/src/ogl
+make %{?_smp_mflags} -C contrib/src/gizmos
+make %{?_smp_mflags} -C contrib/src/animate
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-# Since we're not using %%configure, we would really like to use
-# "make install DESTDIR=..." instead of %%makeinstall here to keep things in
-# sync.  Unfortunately that does not work.
-cd _gtk1
-%makeinstall
-%makeinstall -C contrib/src/stc
-%makeinstall -C contrib/src/xrc
-cd ../_gtk2
 %makeinstall
+
 %makeinstall -C contrib/src/stc
-%makeinstall -C contrib/src/xrc
-cd ..
+%makeinstall -C contrib/src/ogl
+%makeinstall -C contrib/src/gizmos
+%makeinstall -C contrib/src/animate
+
+# this ends up being a symlink into the buildroot directly -- 
+# not what we want!
+rm $RPM_BUILD_ROOT%{_bindir}/wx-config
+ln -s %{_libdir}/wx/config/gtk2-unicode-release-2.6 $RPM_BUILD_ROOT%{_bindir}/wx-config
 
 %find_lang wxstd
-
+%find_lang wxmsw
+cat wxmsw.lang >> wxstd.lang
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -206,109 +146,183 @@
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%post -n %{name}2 -p /sbin/ldconfig
-%postun -n %{name}2 -p /sbin/ldconfig
-
-%post devel
-ln -sf $(basename %{_bindir}/wxgtk-*-config) %{_bindir}/wx-config
-
-%post -n %{name}2-devel
-ln -sf $(basename %{_bindir}/wxgtk2*-config) %{_bindir}/wx-config
-
 %post gl -p /sbin/ldconfig
 %postun gl -p /sbin/ldconfig
 
-%post -n %{name}2-gl -p /sbin/ldconfig
-%postun -n %{name}2-gl -p /sbin/ldconfig
-
-%post stc -p /sbin/ldconfig
-%postun stc -p /sbin/ldconfig
-
-%post -n %{name}2-stc -p /sbin/ldconfig
-%postun -n %{name}2-stc -p /sbin/ldconfig
-
-%post xrc -p /sbin/ldconfig
-%postun xrc -p /sbin/ldconfig
 
-%post -n %{name}2-xrc -p /sbin/ldconfig
-%postun -n %{name}2-xrc -p /sbin/ldconfig
-
-
-%files
+%files -f wxstd.lang
 %defattr(-,root,root,-)
-%{_libdir}/libwx_gtk-*.so.*
+%doc CHANGES*.txt COPYING.LIB LICENCE.txt README*.txt
+%{_libdir}/libwx_baseu-*.so.*
+%{_libdir}/libwx_baseu_net-*.so.*
+%{_libdir}/libwx_baseu_xml-*.so.*
+%{_libdir}/libwx_gtk2u_adv-*.so.*
+%{_libdir}/libwx_gtk2u_animate-*.so.*
+%{_libdir}/libwx_gtk2u_core-*.so.*
+%{_libdir}/libwx_gtk2u_gizmos-*.so.*
+%{_libdir}/libwx_gtk2u_gizmos_xrc*.so.*
+%{_libdir}/libwx_gtk2u_html-*.so.*
+%{_libdir}/libwx_gtk2u_media-*.so.*
+%{_libdir}/libwx_gtk2u_ogl-*.so.*
+%{_libdir}/libwx_gtk2u_xrc-*.so.*
+%{_libdir}/libwx_gtk2u_stc-*.so.*
+%{_libdir}/libwx_gtk2u_qa-*.so.*
 
 %files devel
 %defattr(-,root,root,-)
-%ghost %{_bindir}/wx-config
-%{_bindir}/wxgtk-*-config
-%{_libdir}/libwx_gtk[-_]*.so
-%{_libdir}/wx/include/gtk-*
-
-%files -n %{name}2
-%defattr(-,root,root,-)
-%{_libdir}/libwx_gtk2-*.so.*
-
-%files -n %{name}2-devel
-%defattr(-,root,root,-)
-%ghost %{_bindir}/wx-config
-%{_bindir}/wxgtk2*-config
-%{_libdir}/libwx_gtk2[-_]*.so
-%{_libdir}/wx/include/gtk2*
-
-%files common -f wxstd.lang
-%defattr(-,root,root,-)
-%doc CHANGES*.txt COPYING.LIB LICENCE.txt README*.txt
+%{_bindir}/wx-config
+%{_bindir}/wxrc*
+%{_includedir}/wx-2.6
+%{_libdir}/libwx_*.so
 %dir %{_libdir}/wx
-%{_datadir}/wx
-
-%files common-devel
-%defattr(-,root,root,-)
-%{_datadir}/aclocal/*
-%{_includedir}/wx
 %dir %{_libdir}/wx/include
+%{_libdir}/wx/include/gtk2*
+%dir %{_libdir}/wx/config
+%{_libdir}/wx/config/gtk2*
+%{_datadir}/aclocal/*
+%{_datadir}/bakefile/presets/
 
 %files gl
 %defattr(-,root,root,-)
-%{_libdir}/libwx_gtk_gl-*.so.*
-
-%files -n %{name}2-gl
-%defattr(-,root,root,-)
-%{_libdir}/libwx_gtk2_gl-*.so.*
-
-%files stc
-%defattr(-,root,root,-)
-%doc contrib/src/stc/README.txt
-%{_libdir}/libwx_gtk_stc-*.so.*
+%{_libdir}/libwx_gtk2u_gl-*.so.*
 
-%files -n %{name}2-stc
+%if %{withodbc}
+%files odbc
 %defattr(-,root,root,-)
-%doc contrib/src/stc/README.txt
-%{_libdir}/libwx_gtk2_stc-*.so.*
-
-%files xrc
-%defattr(-,root,root,-)
-%{_libdir}/libwx_gtk_xrc-*.so.*
-
-%files -n %{name}2-xrc
-%defattr(-,root,root,-)
-%{_libdir}/libwx_gtk2_xrc-*.so.*
-
+%{_libdir}/libwx_gtk2u_odbc-*.so.*
+%endif
 
 %changelog
-* Sun May  8 2005 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 2.4.2-12
-- sed -i -e 's|/usr/lib\b|%%{_libdir}|' in configure also to fix
-  x86_64
-
-* Sat May  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 2.4.2-11
-- Add BR libGL and libGLU to fix FC4 build failure
-  (alternatively use xorg-x11-Mesa-libGL xorg-x11-Mesa-libGLU).
+* Thu Apr 13 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3-2.6.3.2.1
+- oops -- forgot to change mesa-libGL*-devel -> libGL*-devel
 
-* Fri Apr 22 2005 Dams <anvil[AT]livna.org> - 2.4.2-10
-- Added patch from Ignacio and Denis to fix build with gcc4 
+* Thu Apr 13 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3-2.6.3.2.0
+- patch to cvs subrelease 2.6.3.2 (matches wxPython)
 
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
-- rebuilt
+* Sat Mar 25 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3-1    
+- 2.6.3 final
+- remove the locale_install thing -- that was just an issue with using the
+  release candidate.
+
+* Tue Mar 21 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3-0.rc2
+- update to 2.6.3-rc2 package
+- all patches now upstream -- removing 'em.
+- use complete 'wxWidgets' source tarball instead of the wxGTK-subset one,
+  since that's all there is for the release candidate. I'm operating under
+  the assumption that we'll have a wxGTK source tarball in the future --
+  otherwise, I'm going to eventually have to change the name of this
+  package again. :)
+- add ODBC support via unixODBC as subpackage (see bug #176950)
+- wait, no; comment out ODBC support as it doesn't build...
+- add explicit make locale_install; apparently not done as part of
+  the general 'make install' anymore.
+
+* Mon Feb 13 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.2-5
+- rebuild in preparation for FC5
+
+* Mon Feb 06 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.2-4
+- add wxGTK-2.6.2-socketclosefix.patch to fix aMule crashes. see
+  bugzilla bug #178184
+- add wxGTK-2.6.2-gcc41stringh.patch (pulled from CVS) to make build on 
+  FC5 devel w/ gcc-4.1.
+  
+* Wed Nov 30 2005 Matthew Miller <mattdm at mattdm.org> - 2.6.2-3
+- add wxGTK-2.6.2-intl_cpp.patch to deal with amule and probably other
+  issues (see bug #154618 comment #47)
+- obsolete wxGTK2 < 2.6.2-1 specifically, at Matthias Saou's suggestion
+
+* Mon Nov 28 2005 Matthew Miller <mattdm at mattdm.org> - 2.6.2-2
+- implemented some suggestions from Matthias Saou:
+-   removed extraneous / from last line of ./configure 
+-   removed -n from setup macro, since we're now actually using the
+    standard name
+-   don't use summary macro in opengl subpackage, as it's not clear which
+    summary should get used
+-   don't bother setting CC, CXX, etc., as configure script does that
+-   move libdir/wx to devel subpackage
+
+* Thu Nov 24 2005 Matthew Miller <mattdm at mattdm.org> - 2.6.2-1
+- ready for actually putting into Extras
+- update mesa buildreqs for new split-up xorg packaging
+- libgnomeprint22-devel -> libgnomeprintui22-devel
+
+* Tue Oct 04 2005 Toshio Kuratomi <toshio-tiki-lounge.com> - 2.6.2-0.1
+- Update to 2.6.2.
+- Include the sample wx bakefiles.
+- Include new .mo files.
+- From Paul Johnson:
+  Change license to wxWidgets due to concerns over trademark infringement.
+  Add dist tag.
+- From Tom Callaway: Build and include libwx_gtk2u_animate-2.6.
+
+* Thu Apr 28 2005 Matthew Miller <mattdm at mattdm.org> 2.6.1-0.1
+- update to 2.6.1
+- from Michael Schwendt in 2.4.2-11 package: build-require
+  xorg-x11-Mesa-libGL and xorg-x11-Mesa-libGLU (the libGL and libGLU
+  deps aren't provided in FC3, so not using that).
+- from Thorsten Leemhuis in 2.4.2-12 package: sed -i -e
+  's|/usr/lib\b|%%{_libdir}|' in configure also to fix x86_64
+- properly include older 2.4.x changelog
+
+* Wed Apr 27 2005 Matthew Miller <mattdm at mattdm.org> - 2.6.0-0.1
+- include libwx_gtk2u_gizmos_xrc in file listing
+
+* Wed Apr 27 2005 Matthew Miller <mattdm at mattdm.org> - 2.6.0-0.0
+- update to 2.6.0 final release
+- configure now wants "--with-gtk=2" instead of "--enable-gtk2".
+
+* Wed Apr 13 2005 Matthew Miller <mattdm at mattdm.org> - 2.5.5-0.2
+- removed provides: wxWidgets/wxWidgets devel -- handy for compatibility
+  with unmodified generic source packages, but not so good for 
+  repeatable builds.
+
+* Wed Apr 13 2005 Matthew Miller <mattdm at mattdm.org> - 2.5.5-0.1
+- whoops -- forgot to remove a reference to the "common" package
+- version-release for obsoletes/provides
+
+* Tue Apr 12 2005 Matthew Miller <mattdm at mattdm.org> - 2.5.5-0
+- remove BU-specific oddities for fedora an idea for a simplied future....
+
+* Tue Apr 12 2005 Matthew Miller <mattdm at bu.edu> - 2.5.5-bu45.2
+- whoops -- forgot "Provides: wxGTK2-devel".
+
+* Tue Apr 12 2005 Matthew Miller <mattdm at bu.edu> - 2.5.5-bu45.1
+- update to 2.5.5
+
+* Sat Mar  5 2005 Matthew Miller <mattdm at bu.edu> - 2.5.4-bu45.3
+- Obsolete & provide GTK-xrc, wxGTK-stc, to provide clean upgrade path
+
+* Tue Mar  1 2005 Matthew Miller <mattdm at bu.edu> - 2.5.4-bu45.2
+- enable wxWindows 2.2 compatibility (for compatibility with 2.4 rpm,
+  ironically).
+
+* Tue Mar  1 2005 Matthew Miller <mattdm at bu.edu> - 2.5.4-bu45.1
+- update to 2.5.4 -- the devel version is where all the fun is.
+- rebase to updated FE 2.4.2 package
+- license isn't "BSD" -- it's "wxWindows Library Licence".
+- make gtk2-only -- gtk 1.0.x is no longer supported, and 1.2.x is
+  being phased out. 2.x is the way to go.
+- all current patches no longer necessary (upstream)
+- roll "common" subpackage in to main package -- no longer makes sense
+  to split it out with gtk+ gone
+- use SDL, which will make this use Alsa for sound. I believe.
+- add gnomeprint support
+- add enable-debug_info for debuginfo package
+- enable unicode
+- use GDK_USE_XFT to enable Pango and fontconfig
+- xrc moved from contrib to base -- making it no longer a subpackage
+- making stc part of base too -- it's tiny, and doesn't introduce any
+  additional deps
+- leaving gl as a subpackage, though, since it's the only part that
+  requires GL libs.
+- add 'ogl' 2d drawing lib from contrib (needed for wxPython)
+- add 'gizmos' from contrib (needed for wxPython)
+- make wx-config actually part of the package, since there's no need
+  to mess with moving it around
+- the various afm fonts are gone in 2.5....
+- use configure macro
+- add provides for wxWidgets and wxWidgets-devel, because that
+  seems like a good idea.
 
 * Sun Jan 23 2005 Ville Skytt?? <ville.skytta at iki.fi> - 2.4.2-8
 - Fix wx-config for x86_64 (#145508).



From fedora-extras-commits at redhat.com  Wed Apr 19 02:24:36 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Tue, 18 Apr 2006 19:24:36 -0700
Subject: rpms/libmal/FC-4 libmal.spec,1.2,1.3
Message-ID: <200604190224.k3J2OcFK007802@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libmal/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7785

Modified Files:
	libmal.spec 
Log Message:
* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.31-3 
- respin for pilot-link



Index: libmal.spec
===================================================================
RCS file: /cvs/extras/rpms/libmal/FC-4/libmal.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libmal.spec	22 Mar 2006 15:33:38 -0000	1.2
+++ libmal.spec	19 Apr 2006 02:24:36 -0000	1.3
@@ -4,7 +4,7 @@
 # NOTE: this isn't the latest version, but is the last version known to 
 # work with kdepim
 Version: 0.31 
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: MPL	
 Url: 	 http://jasonday.home.att.net/code/libmal/ 
@@ -75,6 +75,9 @@
 
 
 %changelog
+* Thu Apr 13 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.31-3 
+- respin for pilot-link
+
 * Wed Mar 22 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.31-2
 - capitalize summary
 - drop empty %%doc's: AUTHORS NEWS TODO



From fedora-extras-commits at redhat.com  Wed Apr 19 02:31:13 2006
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Tue, 18 Apr 2006 19:31:13 -0700
Subject: rpms/wxGTK/FC-4 wxGTK-2.4.2-aclocal18.patch, 1.1,
	NONE wxGTK-2.4.2-gcc4.patch, 1.1,
	NONE wxGTK-2.4.2-privates.patch, 1.1, NONE
Message-ID: <200604190231.k3J2VFK5008082@cvs-int.fedora.redhat.com>

Author: mattdm

Update of /cvs/extras/rpms/wxGTK/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8067

Removed Files:
	wxGTK-2.4.2-aclocal18.patch wxGTK-2.4.2-gcc4.patch 
	wxGTK-2.4.2-privates.patch 
Log Message:
Oops; remove old patches.



--- wxGTK-2.4.2-aclocal18.patch DELETED ---


--- wxGTK-2.4.2-gcc4.patch DELETED ---


--- wxGTK-2.4.2-privates.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Apr 19 02:51:33 2006
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Tue, 18 Apr 2006 19:51:33 -0700
Subject: rpms/wxPython/FC-4 sources,1.3,1.4 wxPython.spec,1.5,1.6
Message-ID: <200604190251.k3J2pZZk008567@cvs-int.fedora.redhat.com>

Author: mattdm

Update of /cvs/extras/rpms/wxPython/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8540

Added Files:
	sources wxPython.spec 
Log Message:
Update to 2.6.x. See bug #163440 for details.



Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	19 Apr 2006 02:51:32 -0000	1.4
@@ -0,0 +1 @@
+a27546fab8a8d77eb6b67954e6362269  wxPython-src-2.6.3.2.tar.gz


Index: wxPython.spec
===================================================================
RCS file: wxPython.spec
diff -N wxPython.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ wxPython.spec	19 Apr 2006 02:51:32 -0000	1.6
@@ -0,0 +1,148 @@
+%{!?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 buildflags WXPORT=gtk2 UNICODE=1
+
+Name:           wxPython
+Version:        2.6.3.2
+Release:        1%{?dist}
+
+Summary:        GUI toolkit for the Python programming language
+
+Group:          Development/Languages
+License:        LGPL
+URL:            http://www.wxpython.org/
+Source0:        http://dl.sf.net/wxpython/wxPython-src-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  wxGTK-devel = 2.6.3, pkgconfig
+BuildRequires:  zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel
+BuildRequires:  libGL-devel, libGLU-devel
+BuildRequires:  python-devel, wxGTK-gl
+
+# packages should depend on "wxPython", not "wxPythonGTK2", but in case
+# one does, here's the provides for it.
+Provides:       wxPythonGTK2 = %{version}-%{release}
+
+%description
+wxPython is a GUI toolkit for the Python programming language. It allows
+Python programmers to create programs with a robust, highly functional
+graphical user interface, simply and easily. It is implemented as a Python
+extension module (native code) that wraps the popular wxWindows cross
+platform GUI library, which is written in C++.
+
+%package        devel
+Group:          Development/Libraries
+Summary:        Development files for wxPython add-on modules
+Requires:       %{name} = %{version}-%{release}
+Requires:       wxGTK-devel
+
+%description devel
+This package includes C++ header files and SWIG files needed for developing
+add-on modules for wxPython. It is NOT needed for development of most
+programs which use the wxPython toolkit.
+
+
+%prep
+%setup -q -n wxPython-src-%{version}
+
+
+%build
+# Just build the wxPython part, not all of wxWindows which we already have
+# in Fedora
+cd wxPython
+# included distutils is not multilib aware; use normal
+rm -rf distutils
+python setup.py %{buildflags} build
+
+
+%install
+rm -rf $RPM_BUILD_ROOT
+cd wxPython
+python setup.py %{buildflags} install --root=$RPM_BUILD_ROOT
+
+# this is a kludge....
+%if "%{python_sitelib}" != "%{python_sitearch}"
+mv $RPM_BUILD_ROOT%{python_sitelib}/wx.pth  $RPM_BUILD_ROOT%{python_sitearch}
+mv $RPM_BUILD_ROOT%{python_sitelib}/wxversion.py* $RPM_BUILD_ROOT%{python_sitearch}
+%endif
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+
+%files
+%defattr(-,root,root,-)
+%doc wxPython/docs wxPython/demo wxPython/licence/ wxPython/samples
+%{_bindir}/*
+%{python_sitearch}/wx.pth
+%{python_sitearch}/wxversion.py*
+%dir %{python_sitearch}/wx-2.6-gtk2-unicode/
+%{python_sitearch}/wx-2.6-gtk2-unicode/wx
+%{python_sitearch}/wx-2.6-gtk2-unicode/wxPython
+
+%files devel
+%defattr(-,root,root,-)
+%dir %{_includedir}/wx-2.6/wx/wxPython
+%{_includedir}/wx-2.6/wx/wxPython/*.h
+%dir %{_includedir}/wx-2.6/wx/wxPython/i_files
+%{_includedir}/wx-2.6/wx/wxPython/i_files/*.i
+%{_includedir}/wx-2.6/wx/wxPython/i_files/*.py*
+%{_includedir}/wx-2.6/wx/wxPython/i_files/*.swg
+
+
+%changelog
+* Thu Apr 13 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3.2-1
+- version 2.6.3.2
+- move wxversion.py _into_ lib64. Apparently that's the right thing to do. :)
+- upstream tarball no longer includes embedded.o (since I finally got around
+  to pointing that out to the developers instead of just kludging it away.)
+- buildrequires to just libGLU-devel instead of mesa-libGL-devel
+
+* Fri Mar 31 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3.0-4
+- grr. bump relnumber.
+
+* Fri Mar 31 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3.0-3
+- oh yeah -- wxversion.py not lib64.
+
+* Fri Mar 31 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3.0-2
+- buildrequires mesa-libGLU-devel
+
+* Thu Mar 30 2006 Matthew Miller <mattdm at mattdm.org> - 2.6.3.0-1
+- update to 2.6.3.0
+- wxGTK and wxPython versions are inexorably linked; make BuildRequires
+  be exact, rather than >=.
+- make devel subpackage as per comment #7 in bug #163440.
+
+* Thu Nov 24 2005 Matthew Miller <mattdm at mattdm.org> - 2.6.1.0-1
+- update to 2.6.0.0
+- merge in changes from current extras 2.4.x package
+- Happy Thanksgiving
+- build animate extention again -- works now.
+
+* Thu Apr 28 2005 Matthew Miller <mattdm at bu.edu> - 2.6.0.0-bu45.1
+- get rid of accidental binaries in source tarball -- they generates
+  spurious dependencies and serve no purpose
+- update to 2.6.0.0 and build for Velouria
+- switch to Fedora Extras base spec file
+- enable gtk2 and unicode and all the code stuff (as FE does)
+- disable BUILD_ANIMATE extension from contrib -- doesn't build
+- files are in a different location now -- adjust to that
+- zap include files (needed only for building wxPython 3rd-party modules),
+  because I don't think this is likely to be very useful. Other option
+  would be to create a -devel package, but I think that'd be confusing.
+
+* Tue Feb 08 2005 Thorsten Leemhuis <fedora at leemhuis dot info> 0:2.4.2.4-4
+- remove included disutils - it is not multilib aware; this
+  fixes build on x86_64
+
+* Tue Jan 06 2004 Panu Matilainen <pmatilai at welho.com> 0:2.4.2.4-0.fdr.3
+- rename package to wxPythonGTK2, provide wxPython (see bug 927)
+- dont ship binaries in /usr/share
+
+* Thu Nov 20 2003 Panu Matilainen <pmatilai at welho.com> 0:2.4.2.4-0.fdr.2
+- add missing buildrequires: python-devel, wxGTK2-gl
+
+* Sun Nov 02 2003 Panu Matilainen <pmatilai at welho.com> 0:2.4.2.4-0.fdr.1
+- Initial RPM release.
+~



From fedora-extras-commits at redhat.com  Wed Apr 19 02:52:45 2006
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Tue, 18 Apr 2006 19:52:45 -0700
Subject: rpms/wxPythonGTK2/FC-4 wxPython.spec,1.9,NONE
Message-ID: <200604190252.k3J2ql77008648@cvs-int.fedora.redhat.com>

Author: mattdm

Update of /cvs/extras/rpms/wxPythonGTK2/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8625

Removed Files:
	wxPython.spec 
Log Message:
renaming back to wxPython



--- wxPython.spec DELETED ---



From fedora-extras-commits at redhat.com  Wed Apr 19 02:56:48 2006
From: fedora-extras-commits at redhat.com (Matthew Miller (mattdm))
Date: Tue, 18 Apr 2006 19:56:48 -0700
Subject: rpms/wxPython/FC-4 Makefile,1.3,1.4
Message-ID: <200604190256.k3J2uoDN008899@cvs-int.fedora.redhat.com>

Author: mattdm

Update of /cvs/extras/rpms/wxPython/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8875

Added Files:
	Makefile 
Log Message:
readding missing makefile



Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	19 Apr 2006 02:56:48 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: wxPython
+# $Id$
+NAME := wxPython
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)



From fedora-extras-commits at redhat.com  Wed Apr 19 06:35:53 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 18 Apr 2006 23:35:53 -0700
Subject: rpms/perl-HTML-Template-Expr/FC-4 .cvsignore, 1.4,
	1.5 perl-HTML-Template-Expr.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <200604190635.k3J6ZtoK018890@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-HTML-Template-Expr/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18837/FC-4

Modified Files:
	.cvsignore perl-HTML-Template-Expr.spec sources 
Log Message:
* Wed Apr 19 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.07-1
- 0.07.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Mar 2006 08:31:00 -0000	1.4
+++ .cvsignore	19 Apr 2006 06:35:53 -0000	1.5
@@ -1 +1 @@
-HTML-Template-Expr-0.06.tar.gz
+HTML-Template-Expr-0.07.tar.gz


Index: perl-HTML-Template-Expr.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/FC-4/perl-HTML-Template-Expr.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-HTML-Template-Expr.spec	4 Mar 2006 08:31:00 -0000	1.4
+++ perl-HTML-Template-Expr.spec	19 Apr 2006 06:35:53 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-HTML-Template-Expr
-Version:        0.06
+Version:        0.07
 Release:        1%{?dist}
 Summary:        Expression support extension for HTML::Template
 
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Wed Apr 19 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.07-1
+- 0.07.
+
 * Sat Mar  4 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.06-1
 - 0.06.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Mar 2006 08:31:00 -0000	1.4
+++ sources	19 Apr 2006 06:35:53 -0000	1.5
@@ -1 +1 @@
-1a7a6b908d00fc71567d9c57708a7633  HTML-Template-Expr-0.06.tar.gz
+717ea56c2244b6e2d26a0e477a4d069c  HTML-Template-Expr-0.07.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 19 06:35:54 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 18 Apr 2006 23:35:54 -0700
Subject: rpms/perl-HTML-Template-Expr/FC-5 .cvsignore, 1.4,
	1.5 perl-HTML-Template-Expr.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <200604190635.k3J6ZuYp018896@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-HTML-Template-Expr/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18837/FC-5

Modified Files:
	.cvsignore perl-HTML-Template-Expr.spec sources 
Log Message:
* Wed Apr 19 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.07-1
- 0.07.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Mar 2006 08:31:06 -0000	1.4
+++ .cvsignore	19 Apr 2006 06:35:54 -0000	1.5
@@ -1 +1 @@
-HTML-Template-Expr-0.06.tar.gz
+HTML-Template-Expr-0.07.tar.gz


Index: perl-HTML-Template-Expr.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/FC-5/perl-HTML-Template-Expr.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-HTML-Template-Expr.spec	4 Mar 2006 08:31:06 -0000	1.4
+++ perl-HTML-Template-Expr.spec	19 Apr 2006 06:35:54 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-HTML-Template-Expr
-Version:        0.06
+Version:        0.07
 Release:        1%{?dist}
 Summary:        Expression support extension for HTML::Template
 
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Wed Apr 19 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.07-1
+- 0.07.
+
 * Sat Mar  4 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.06-1
 - 0.06.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Mar 2006 08:31:06 -0000	1.4
+++ sources	19 Apr 2006 06:35:54 -0000	1.5
@@ -1 +1 @@
-1a7a6b908d00fc71567d9c57708a7633  HTML-Template-Expr-0.06.tar.gz
+717ea56c2244b6e2d26a0e477a4d069c  HTML-Template-Expr-0.07.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 19 06:35:55 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Tue, 18 Apr 2006 23:35:55 -0700
Subject: rpms/perl-HTML-Template-Expr/devel .cvsignore, 1.4,
	1.5 perl-HTML-Template-Expr.spec, 1.4, 1.5 sources, 1.4, 1.5
Message-ID: <200604190635.k3J6ZvkG018902@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/perl-HTML-Template-Expr/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18837/devel

Modified Files:
	.cvsignore perl-HTML-Template-Expr.spec sources 
Log Message:
* Wed Apr 19 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.07-1
- 0.07.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	4 Mar 2006 08:31:06 -0000	1.4
+++ .cvsignore	19 Apr 2006 06:35:54 -0000	1.5
@@ -1 +1 @@
-HTML-Template-Expr-0.06.tar.gz
+HTML-Template-Expr-0.07.tar.gz


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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-HTML-Template-Expr.spec	4 Mar 2006 08:31:06 -0000	1.4
+++ perl-HTML-Template-Expr.spec	19 Apr 2006 06:35:54 -0000	1.5
@@ -1,5 +1,5 @@
 Name:           perl-HTML-Template-Expr
-Version:        0.06
+Version:        0.07
 Release:        1%{?dist}
 Summary:        Expression support extension for HTML::Template
 
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Wed Apr 19 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.07-1
+- 0.07.
+
 * Sat Mar  4 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.06-1
 - 0.06.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTML-Template-Expr/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	4 Mar 2006 08:31:06 -0000	1.4
+++ sources	19 Apr 2006 06:35:54 -0000	1.5
@@ -1 +1 @@
-1a7a6b908d00fc71567d9c57708a7633  HTML-Template-Expr-0.06.tar.gz
+717ea56c2244b6e2d26a0e477a4d069c  HTML-Template-Expr-0.07.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 19 07:05:24 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Wed, 19 Apr 2006 00:05:24 -0700
Subject: rpms/firestarter/devel firestarter.spec,1.19,1.20
Message-ID: <200604190705.k3J75QbM021480@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/firestarter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21417

Modified Files:
	firestarter.spec 
Log Message:
sync w/ fc-5 changes




Index: firestarter.spec
===================================================================
RCS file: /cvs/extras/rpms/firestarter/devel/firestarter.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- firestarter.spec	17 Feb 2006 20:16:50 -0000	1.19
+++ firestarter.spec	19 Apr 2006 07:05:24 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		firestarter
 Version:	1.0.3
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	Firewall tool for GNOME
 
 Group:		Applications/Internet
@@ -12,7 +12,8 @@
 Patch0:		firestarter-1.0.3-pam.patch
 Patch1:		firestarter-1.0.3-services.patch
 Patch2:		firestarter-1.0.3-nobrowser.patch
-Patch3:		firestarter-1.0.3-nonroutable.patch      
+Patch3:		firestarter-1.0.3-nonroutable.patch
+Patch4:		firestarter-1.0.3-multicast.patch      
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -42,6 +43,7 @@
 %patch1 -p1 -b .services
 %patch2 -p1 -b .nobrowser
 %patch3 -p1 -b .nonroutable
+%patch4 -p1 -b .multicast
 cp %{SOURCE1} ./fs-manual.pdf
 
 %build
@@ -161,6 +163,9 @@
 
 
 %changelog
+* Mon Apr 17 2006 Michael A. Peters <mpeters at mac.com> - 1.0.3-11
+- Patch4 - Fix bug #189067 (Avahi)
+
 * Fri Feb 17 2006 Michael A. Peters <mpeters at mac.com> - 1.0.3-10
 - Devel branch rebuild
 



From fedora-extras-commits at redhat.com  Wed Apr 19 07:08:41 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Wed, 19 Apr 2006 00:08:41 -0700
Subject: rpms/firestarter/devel firestarter-1.0.3-multicast.patch,NONE,1.1
Message-ID: <200604190708.k3J78hDE021763@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/firestarter/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21621

Added Files:
	firestarter-1.0.3-multicast.patch 
Log Message:
patch to fix bug #189067


firestarter-1.0.3-multicast.patch:

--- NEW FILE firestarter-1.0.3-multicast.patch ---
diff -ur firestarter-1.0.3/src/netfilter-script.c firestarter-1.0.3-avahi/src/netfilter-script.c
--- firestarter-1.0.3/src/netfilter-script.c	2005-01-29 04:32:08.000000000 -0800
+++ firestarter-1.0.3-avahi/src/netfilter-script.c	2006-04-17 05:58:04.000000000 -0700
@@ -738,13 +738,13 @@
 			 "	fi\n"
 			 "fi\n\n");
 
-	fprintf (script, "# Block Multicast Traffic\n"
-	                 "#  Some cable/DSL providers require their clients to accept multicast transmissions\n"
-	                 "#  you should remove the following four rules if you are affected by multicasting\n"
-	                 "$IPT -A INPUT -s 224.0.0.0/8 -d 0/0 -j DROP\n"
-	                 "$IPT -A INPUT -s 0/0 -d 224.0.0.0/8 -j DROP\n"
-	                 "$IPT -A OUTPUT -s 224.0.0.0/8 -d 0/0 -j DROP\n"
-	                 "$IPT -A OUTPUT -s 0/0 -d 224.0.0.0/8 -j DROP\n\n");
+//	fprintf (script, "# Block Multicast Traffic\n"
+//	                 "#  Some cable/DSL providers require their clients to accept multicast transmissions\n"
+//	                 "#  you should remove the following four rules if you are affected by multicasting\n"
+//	                 "$IPT -A INPUT -s 224.0.0.0/8 -d 0/0 -j DROP\n"
+//	                 "$IPT -A INPUT -s 0/0 -d 224.0.0.0/8 -j DROP\n"
+//	                 "$IPT -A OUTPUT -s 224.0.0.0/8 -d 0/0 -j DROP\n"
+//	                 "$IPT -A OUTPUT -s 0/0 -d 224.0.0.0/8 -j DROP\n\n");
 
 	fprintf (script, "# Block Traffic with Stuffed Routing\n"
                          "#  Early versions of PUMP - (the DHCP client application included in RH / Mandrake) require\n"



From fedora-extras-commits at redhat.com  Wed Apr 19 07:53:02 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Wed, 19 Apr 2006 00:53:02 -0700
Subject: rpms/pan/devel .cvsignore, 1.3, 1.4 pan.spec, 1.7, 1.8 sources, 1.3,
	1.4 pan-0.14.0-default-editor-80839.patch, 1.1,
	NONE pan-0.14.2.91-gcc4-2.patch, 1.1,
	NONE pan-0.14.2.91-linewrap.patch, 1.1, NONE
Message-ID: <200604190753.k3J7r40P021948@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/pan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21927

Modified Files:
	.cvsignore pan.spec sources 
Removed Files:
	pan-0.14.0-default-editor-80839.patch 
	pan-0.14.2.91-gcc4-2.patch pan-0.14.2.91-linewrap.patch 
Log Message:
Updating to new beta releases of pan
removing old 0.14.2.91 files



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Jun 2005 19:44:17 -0000	1.3
+++ .cvsignore	19 Apr 2006 07:53:02 -0000	1.4
@@ -1 +1,2 @@
 pan-0.14.2.91.tar.bz2
+pan-0.93.tar.bz2


Index: pan.spec
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- pan.spec	17 Feb 2006 20:30:55 -0000	1.7
+++ pan.spec	19 Apr 2006 07:53:02 -0000	1.8
@@ -1,21 +1,11 @@
 Summary: A GNOME/GTK+ news reader for X
 Name: pan
-Version: 0.14.2.91
-Release: 4%{?dist}
+Version: 0.93
+Release: 1%{?dist}
 Epoch: 1
 License: GPL
 Group: Applications/Internet
-Source0: http://pan.rebelbase.com/download/%{version}/%{name}-%{version}.tar.bz2
-#Source1: net-pan.desktop
-#Source2: http://www.gnetlibrary.org/src/gnet-%{gnet_vers}.tar.gz
-#Patch5: pan-0.12.1-browser.patch
-Patch7: pan-0.14.0-default-editor-80839.patch
-# disabled (see below)
-#Patch8: pan-0.14.2-gcc34.patch
-#Patch9: pan-0.14.2-gmime-crash-120007.patch
-#Patch10: pan-desktop-rh-119909.patch
-Patch11: pan-0.14.2.91-gcc4-2.patch
-Patch12: pan-0.14.2.91-linewrap.patch
+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: libxml2-devel >= 2.4.22
@@ -24,6 +14,7 @@
 BuildRequires: pcre-devel >= 4.0
 BuildRequires: gtkspell-devel >= 2.0.2
 BuildRequires: gettext
+BuildRequires: gmime-devel >= 2.1.0
 
 %description
 Pan is a newsreader which attempts to be pleasant to new and
@@ -37,17 +28,6 @@
 
 %prep
 %setup -q
-#%%patch5 -p1 -b .browser
-%patch7 -p1 -b .editor
-# this patch breaks pan (see bug 121103)
-## gcc-3.4 fix
-#%%patch8 -p1 -b .gcc34
-# fix gmime crash
-#%patch9 -p0 -b .crash
-# add rh defs to upstream desktop file
-#%patch10 -p1 -b .rh
-%patch11 -p1 -b .gcc4
-%patch12 -p0 -b .linewrap
 
 echo "StartupNotify=true" >> pan.desktop.in
 
@@ -77,12 +57,25 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS COPYING CREDITS ChangeLog README TODO ANNOUNCE.html
+%doc AUTHORS COPYING ChangeLog README TODO
 %{_bindir}/pan
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/fedora-pan.desktop
 
 %changelog
+* Wed Apr 19 2006 Michael A. Peters <mpeters at mac.com> - 1:0.93-1
+- Update to 0.93
+
+* Mon Apr 17 2006 Michael A. Peters <mpeters at mac.com> - 1:0.91-1
+- New upstream version - using spec file mods submitted by
+- Alan C. Sanderson with cleanup - Thanks :)
+- Closes bug 187874
+-
+- #* Tue Apr 04 2006 Alan C. Sanderson <Alan.C.Sanderson at gmail.com> - 1:0.90-1
+- Updated to 0.90.
+- Added gmime-devel >= 2.1.0 BuildRequires
+- Removed patches 7,11,12
+
 * Fri Feb 17 2006 Michael A. Peters <mpeters at mac.com> - 1:0.14.2.91-4
 - Devel branch rebuild
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Jun 2005 19:44:17 -0000	1.3
+++ sources	19 Apr 2006 07:53:02 -0000	1.4
@@ -1 +1 @@
-4770d899a1c1ba968ce96bc5aeb07b62  pan-0.14.2.91.tar.bz2
+ca870a8a182f68b299796d90906918ca  pan-0.93.tar.bz2


--- pan-0.14.0-default-editor-80839.patch DELETED ---


--- pan-0.14.2.91-gcc4-2.patch DELETED ---


--- pan-0.14.2.91-linewrap.patch DELETED ---



From fedora-extras-commits at redhat.com  Wed Apr 19 07:56:13 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Wed, 19 Apr 2006 00:56:13 -0700
Subject: rpms/gdesklets/FC-4 gdesklets.spec,1.7,1.8
Message-ID: <200604190756.k3J7uFEP022019@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22002

Modified Files:
	gdesklets.spec 
Log Message:

updated gdesklets.spec



Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-4/gdesklets.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gdesklets.spec	11 Apr 2006 20:06:20 -0000	1.7
+++ gdesklets.spec	19 Apr 2006 07:56:13 -0000	1.8
@@ -1,12 +1,12 @@
 Name:           gdesklets
 Version:        0.35.3
-Release:        4%{?dist}
+Release:        8%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
 License:        GPL
 
-URL:            http://gdesklets.gnomedesktop.org/
+URL:            http://www.gdesklets.org/
 Source0:        http://www.gdesklets.org/releases/gDesklets-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -14,17 +14,19 @@
 #############################################################
 #							    #
 # Starting from 0.35.x, gDesklets no longer requires GConf. #
+# Added some X development package to support modular X     #
 #							    #
 #############################################################
 
-BuildRequires:  python-devel >= 2.0.0, pyorbit-devel > 2.6.1, pygtk2-devel >= 2.4.0
+BuildRequires:  python-devel > 2.0.0, pyorbit-devel, pygtk2-devel > 2.4.0, 
 BuildRequires:  librsvg2-devel, libgtop2-devel >= 2.8.0, gettext   
+BuildRequires:  libXau-devel, libXdmcp-devel
 BuildRequires:  gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0, desktop-file-utils
 Requires:	gnome-python2-gconf >= 2.6.0
 Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
-Requires(post): desktop-file-utils
+#Requires(post): desktop-file-utils
 Requires(post): shared-mime-info
-Requires(postun): desktop-file-utils
+#Requires(postun): desktop-file-utils
 Requires(postun): shared-mime-info
 
 
@@ -69,12 +71,12 @@
 
 %post
 update-mime-database %{_datadir}/mime &> /dev/null || :
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+#update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %postun
 update-mime-database %{_datadir}/mime &> /dev/null || :
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+#update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 
 %clean
@@ -93,15 +95,21 @@
 %{_mandir}/man1/*
 
 
+%changelog
+* Wed Apr 19 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-8
+- Remove conditional sign for pyorbit-devel
 
+* Mon Apr 03 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-7
+- Bump 
 
-%changelog
-* Tue Apr 11 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-4
-- Fixed versionning for pyorbit-devel
+* Mon Apr 03 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-6
+- Bump 
 
-* Tue Apr 11 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-3
-- Set greater than for pyorbit. For some reason, the package set
-  to equal instead of greater and equal.
+* Mon Apr 03 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-5
+- Ajusted pyorbit requirement for ppc64
+
+* Thu Jan 19 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-4
+- Rebuild for Fedora Extras 5
 
 * Thu Jan 19 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-2
 - Rebuilt
@@ -111,10 +119,24 @@
 
 * Mon Jan 16 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-1
 - Updated to 0.35.3
-- Removed thumbnail schema
+- Removed thumbmail
 - Removed patch, no longer needed
 
-* Wed Dec 14 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-22
+* Thu Jan 5 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-26.fc5
+- Minor rebuilt
+
+* Thu Jan 5 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-25.fc5
+- Rebuilt against libgtop2-devel
+- Changed url of the provider
+
+* Sun Dec 18 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-24.fc5
+- Added libXdmcp-devel on BuildRequires
+
+* Sun Dec 18 2005 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.2-23.fc5
+- Added libXau-devel on BuildRequires
+
+* Wed Dec 14 2005 Luya Tshimbalanga
+ <luya_tfz at thefinalzone.com> - 0.35.2-22
 - Added desktop-file-utils for build requirement
 - Clean up
 



From fedora-extras-commits at redhat.com  Wed Apr 19 07:58:34 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Wed, 19 Apr 2006 00:58:34 -0700
Subject: rpms/gdesklets/FC-5 gdesklets.spec,1.14,1.15
Message-ID: <200604190758.k3J7wah3022086@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22069

Modified Files:
	gdesklets.spec 
Log Message:
gdeskets.spec updated


Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-5/gdesklets.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gdesklets.spec	11 Apr 2006 18:09:55 -0000	1.14
+++ gdesklets.spec	19 Apr 2006 07:58:34 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           gdesklets
 Version:        0.35.3
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
@@ -18,7 +18,7 @@
 #							    #
 #############################################################
 
-BuildRequires:  python-devel > 2.0.0, pyorbit-devel > 2.0.1, pygtk2-devel > 2.4.0, 
+BuildRequires:  python-devel > 2.0.0, pyorbit-devel, pygtk2-devel > 2.4.0, 
 BuildRequires:  librsvg2-devel, libgtop2-devel >= 2.8.0, gettext   
 BuildRequires:  libXau-devel, libXdmcp-devel
 BuildRequires:  gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0, desktop-file-utils
@@ -96,6 +96,9 @@
 
 
 %changelog
+* Wed Apr 19 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-8
+- Remove conditional sign for pyorbit-devel
+
 * Mon Apr 03 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-7
 - Bump 
 



From fedora-extras-commits at redhat.com  Wed Apr 19 08:00:50 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Wed, 19 Apr 2006 01:00:50 -0700
Subject: rpms/gdesklets/devel gdesklets.spec,1.12,1.13
Message-ID: <200604190800.k3J80qGI022159@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22142

Modified Files:
	gdesklets.spec 
Log Message:
gdeskets.spec updated


Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/devel/gdesklets.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gdesklets.spec	11 Apr 2006 20:39:31 -0000	1.12
+++ gdesklets.spec	19 Apr 2006 08:00:50 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           gdesklets
 Version:        0.35.3
-Release:        4%{?dist}
+Release:        8%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
@@ -18,7 +18,7 @@
 #							    #
 #############################################################
 
-BuildRequires:  python-devel >= 2.0.0, pyorbit-devel >= 2.0.1, pygtk2-devel >= 2.4.0, 
+BuildRequires:  python-devel > 2.0.0, pyorbit-devel, pygtk2-devel > 2.4.0, 
 BuildRequires:  librsvg2-devel, libgtop2-devel >= 2.8.0, gettext   
 BuildRequires:  libXau-devel, libXdmcp-devel
 BuildRequires:  gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0, desktop-file-utils
@@ -96,8 +96,17 @@
 
 
 %changelog
-* Tue Apr 11 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-5
-- Rebuild for development
+* Wed Apr 19 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-8
+- Remove conditional sign for pyorbit-devel
+
+* Mon Apr 03 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-7
+- Bump 
+
+* Mon Apr 03 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-6
+- Bump 
+
+* Mon Apr 03 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-5
+- Ajusted pyorbit requirement for ppc64
 
 * Thu Jan 19 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-4
 - Rebuild for Fedora Extras 5



From fedora-extras-commits at redhat.com  Wed Apr 19 08:15:12 2006
From: fedora-extras-commits at redhat.com (Luya Tshimbalanga (luya))
Date: Wed, 19 Apr 2006 01:15:12 -0700
Subject: rpms/gdesklets/FC-4 gdesklets.spec,1.8,1.9
Message-ID: <200604190815.k3J8FEWD024288@cvs-int.fedora.redhat.com>

Author: luya

Update of /cvs/extras/rpms/gdesklets/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24269

Modified Files:
	gdesklets.spec 
Log Message:
gdeskets.spec updated


Index: gdesklets.spec
===================================================================
RCS file: /cvs/extras/rpms/gdesklets/FC-4/gdesklets.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gdesklets.spec	19 Apr 2006 07:56:13 -0000	1.8
+++ gdesklets.spec	19 Apr 2006 08:15:11 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           gdesklets
 Version:        0.35.3
-Release:        8%{?dist}
+Release:        8.1%{?dist}
 Summary:        Advanced architecture for desktop applets
 
 Group:          User Interface/Desktops
@@ -20,7 +20,6 @@
 
 BuildRequires:  python-devel > 2.0.0, pyorbit-devel, pygtk2-devel > 2.4.0, 
 BuildRequires:  librsvg2-devel, libgtop2-devel >= 2.8.0, gettext   
-BuildRequires:  libXau-devel, libXdmcp-devel
 BuildRequires:  gnome-python2 >= 2.0.0, libgnome-devel > 2.6.0, desktop-file-utils
 Requires:	gnome-python2-gconf >= 2.6.0
 Requires:	python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
@@ -96,6 +95,9 @@
 
 
 %changelog
+* Wed Apr 19 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-8.1
+- Removed libXau-devel and libXdmcp-devel as they don't belong to FC-4
+
 * Wed Apr 19 2006 Luya Tshimbalanga <luya_tfz at thefinalzone.com> - 0.35.3-8
 - Remove conditional sign for pyorbit-devel
 



From fedora-extras-commits at redhat.com  Wed Apr 19 09:34:09 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 02:34:09 -0700
Subject: status-report-scripts - Imported sources
Message-ID: <200604190934.k3J9Y95d001257@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1242

Log Message:
Add parseBZbugList.

Status:

Vendor Tag:	fedora
Release Tags:	start
		
N status-report-scripts/parseBZbugList

No conflicts created by this import




From fedora-extras-commits at redhat.com  Wed Apr 19 09:49:12 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 02:49:12 -0700
Subject: status-report-scripts parseBZbugList,1.1.1.1,1.2
Message-ID: <200604190949.k3J9nCeU001302@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1284

Modified Files:
	parseBZbugList 
Log Message:
Parse wget output, parse all blockers, improve things...


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- parseBZbugList	19 Apr 2006 09:34:07 -0000	1.1.1.1
+++ parseBZbugList	19 Apr 2006 09:49:09 -0000	1.2
@@ -2,9 +2,10 @@
 # $Id$
 use strict;
 use Getopt::Long;
+use Date::Manip;
 
 my %opt;
-my @options = ( "help", "srpms=s@", "bzid=s" );
+my @options = ( "help", "core=s", "extras=s", "bzid=s", "o=s" );
 
 if( ! GetOptions( \%opt, @options ) ) { &usage(); }
 
@@ -12,12 +13,16 @@
 
 &usage() if defined $opt{'help'};
 
- at main::srpm = @{$opt{"srpms"}} if defined $opt{"srpms"};
-
-my $ACCEPT = 163779;
-my %BZ;
+my $FE_NEW = 163776;
+my $FE_REVIEW = 163778;
+my $FE_ACCEPT = 163779;
+my %BZN;
+my %BZR;
+my %BZA;
+my %CORE;
 my %SRPMS;
 my %NAME;
+my %OWN;
 if (defined $opt{"bzid"}) {
   local *IN;
   open IN, $opt{"bzid"} or die "Couldn't open $opt{'bzid'} : $!";
@@ -28,19 +33,26 @@
   }
   close IN;
 }
-if ($#main::srpm >= 0) {
-  foreach my $f (@main::srpm) {
-    local *IN;
-    open IN, $f or die "Couldn't open $f : $!";
-    while ( <IN> ) {
-      next unless /^\[   \] (\S+)/;
-      my $file = $1;
-      my ($pkg) = $file =~ /^(.*)-[^-]+-[^-]+\.src\.rpm/;
-      die "Bad file: $file" if $pkg eq "";
-      $SRPMS{$pkg} = 1;
-    }
-    close IN;
+if (defined $opt{"o"}) {
+  local *IN;
+  open IN, $opt{"o"} or die "Couldn't open $opt{'o'} : $!";
+  # Fedora Extras|aalib|An ASCII art library|anvil at livna.org|extras-qa at fedoraproject.org|
+  while ( <IN> ) {
+    next if /^#/;
+    s/\s+$//;
+    my @F = split /\|/;
+    $OWN{$F[1]} = \@F;
   }
+  close IN;
+}
+if (defined $opt{"extras"}) {
+  &grabRepoList($opt{"extras"}, \%SRPMS);
+}
+if (defined $opt{"core"}) {
+  &grabRepoList($opt{"core"}, \%CORE);
+}
+foreach my $k (keys %CORE) {
+  $SRPMS{$k} = 1;
 }
 while ( <> ) {
   s/[,\n]+$//;
@@ -72,12 +84,11 @@
     next;
   }
   $F[7] =~ s/["{}]//g;
+  $F[1] =~ s/["]//g;
+  $F[2] =~ s/["]//g;
+  $F[1] = ParseDate($F[1]);
+  $F[2] = ParseDate($F[2]);
   my @B = split /,/, $F[7];
-  my $block = 0;
-  foreach my $b (@B) {
-    $block = 1 if $b == $ACCEPT;
-  }
-  next if $block == 0;
   next if $F[8] =~ /TESTING-BUGSPAM/;
   if (defined $NAME{$F[0]}) {
     $F[8] = $NAME{$F[0]};
@@ -87,79 +98,156 @@
     $F[8] =~ s/^review\s+request:?\s+<?//i;
     $F[8] =~ s/[:.,>]?\s.*$//g;
   }
-  $BZ{$F[0]} = \@F;
+  my $block = 0;
+  my $bzb;
+  foreach my $b (@B) {
+    if ($b == $FE_NEW) {
+      $block += 1;
+      $bzb = \%BZN;
+    }
+    if ($b == $FE_REVIEW) {
+      $block += 1;
+      $bzb = \%BZR;
+    }
+    if ($b == $FE_ACCEPT) {
+      $block += 1;
+      $bzb = \%BZA;
+    }
+  }
+  if ($block > 1) {
+    print "Warning: bug $F[0] blocks several FE_ blockers.\n";
+    next;
+  }
+  $bzb->{$F[0]} = \@F if $block == 1;
 }
-&checkClosed();
-&checkOpen();
+print "=== About owners file ===\n\n";
+&checkOwners;
+print "\n\n=== About FE-ACCEPT packages ===\n";
+&checkAcceptClosed(\%BZA);
+&checkAcceptOpen(\%BZA);
+print "\n\n=== About FE-NEW packages ===\n";
+&checkNotClosed(\%BZN, "FE-NEW");
+print "\n\n=== About FE-REVIEW packages ===\n";
+&checkNotClosed(\%BZR, "FE-REVIEW");
 
 exit 0;
 
-sub checkClosed {
+sub checkOwners {
+  my %O;
+  my $orphan = 0;
+  my $cnt = 0;
+  foreach my $k (keys %OWN) {
+    my $a = $OWN{$k};
+    next if $$a[0] ne "Fedora Extras";
+    $cnt += 1;
+    if ($$a[3] eq 'extras-orphan at fedoraproject.org') {
+      $orphan += 1;
+      next;
+    }
+    $O{$$a[3]} += 1;
+  }
+  print "We have $cnt extras packages in owners file.\n";
+  print "There are $orphan orphans.\n";
+  my @TO = sort {$O{$b} <=> $O{$a}} keys %O;
+  print "\nTop 10 package owners:\n";
+  for my $i (0 .. 9) {
+    my $n = $TO[$i];
+    $n =~ s/\@/ at /;
+    $n =~ s/\./ dot /g;
+    printf "%-50s: %d\n", $n, $O{$TO[$i]};
+  }
+}
+
+sub checkAcceptClosed {
+  my ($BZ) = @_;
   my @BL;
+  my @BLO;
   my %O;
   my %R;
   my $cnt = 0;
   my $miss = 0;
-  foreach my $b (sort(keys %BZ)) {
-    my $a = $BZ{$b};
+  my $missO = 0;
+  foreach my $b (sort(keys %$BZ)) {
+    my $a = $BZ->{$b};
     next unless $$a[5] eq "\"CLOSED\"";
     my $pkg = $$a[8];
-    unless ($SRPMS{$pkg} == 1) {
+    unless ($SRPMS{$pkg} == 1 || defined($OWN{$pkg})) {
       $pkg =~ s/-[^-]+-[^-]+$//;
     }
-    unless ($SRPMS{$pkg} == 1) {
+    unless ($SRPMS{$pkg} == 1 || defined($OWN{$pkg})) {
       $pkg = $$a[8];
       $pkg =~ s/-[^-]+$//;
     }
-    unless ($SRPMS{$pkg} == 1) {
+    unless ($SRPMS{$pkg} == 1 || defined($OWN{$pkg})) {
       $pkg = lc $$a[8];
-      unless ($SRPMS{$pkg} == 1) {
+      unless ($SRPMS{$pkg} == 1 || defined($OWN{$pkg})) {
 	$pkg =~ s/-[^-]+-[^-]+$//;
       }
     }
-    unless ($SRPMS{$pkg} == 1) {
+    unless ($SRPMS{$pkg} == 1 || defined($OWN{$pkg})) {
       $pkg = lcfirst $$a[8];
     }
     if ($SRPMS{$pkg} == 1) {
       $R{$$a[3]} += 1;
       $O{$$a[4]} += 1;
       $cnt += 1;
+      if (!defined($CORE{$pkg}) && !defined($OWN{$pkg})) {
+	push @BLO, $b;
+	$missO += 1;
+      }
     } else {
       # print "Missing pkg: ", join(" ", @$a), "\n";
       push @BL, $b;
       $miss += 1;
+      if (defined $OWN{$pkg}) {
+	$R{$$a[3]} += 1;
+	$O{$$a[4]} += 1;
+	$cnt += 1;
+      } else {
+	push @BLO, $b;
+	$missO += 1;
+      }
     }
   }
-  print "\nWe have $miss accepted, closed packages where I'm unable to find
+  if ($miss > 0) {
+    print "\nWe have $miss accepted, closed packages where I'm unable to find
 the package in the development repo:\n\n";
-  print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
-    join(",", @BL), "\n";
+    print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
+      join(",", @BL), "\n";
+  }
+  if ($missO > 0) {
+    print "\nWe have $missO accepted, closed packages where I'm unable to find
+the package in the owners file:\n\n";
+    print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
+      join(",", @BLO), "\n";
+  }
   my @TR = sort {$R{$b} <=> $R{$a}} keys %R;
   my @TO = sort {$O{$b} <=> $O{$a}} keys %O;
   print "\nWe have $cnt accepted, closed package reviews\n";
-  print "\nTop 10 packagers:\n";
+  print "\nTop 10 BZ review requests submitters:\n";
   for my $i (0 .. 9) {
     my $n = $TO[$i];
     $n =~ s/["]//g;
     $n =~ s/\@/ at /;
-    $n =~ s/\./ dot /;
-    printf "%-40s: %d\n", $n, $O{$TO[$i]};
+    $n =~ s/\./ dot /g;
+    printf "%-50s: %d\n", $n, $O{$TO[$i]};
   }
-  print "\nTop 10 reviewers:\n";
+  print "\nTop 10 BZ review requests reviewers:\n";
   for my $i (0 .. 9) {
     my $n = $TR[$i];
     $n =~ s/["]//g;
     $n =~ s/\@/ at /;
-    $n =~ s/\./ dot /;
-    printf "%-40s: %d\n", $n, $R{$TR[$i]};
+    $n =~ s/\./ dot /g;
+    printf "%-50s: %d\n", $n, $R{$TR[$i]};
   }
 }
 
-sub checkOpen {
+sub checkAcceptOpen {
+  my ($BZ) = @_;
   my @BL;
   my $cnt = 0;
-  foreach my $b (sort(keys %BZ)) {
-    my $a = $BZ{$b};
+  foreach my $b (sort(keys %$BZ)) {
+    my $a = $BZ->{$b};
     next if $$a[5] eq "\"CLOSED\"";
     my $pkg = $$a[8];
     unless ($SRPMS{$pkg} == 1) {
@@ -180,6 +268,21 @@
     join(",", @BL), "\n";
 }
 
+sub checkNotClosed {
+  my ($BZ, $cur) = @_;
+  my @BL;
+  foreach my $b (sort(keys %$BZ)) {
+    my $a = $BZ->{$b};
+    next unless $$a[5] eq "\"CLOSED\"";
+    push @BL, $b;
+  }
+  return if $#BL < 0;
+  my $cnt = $#BL + 1;
+  print "\nWe have $cnt closed tickets still blocking $cur\n";
+  print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
+    join(",", @BL), "\n";
+}
+
 sub usage {
   print STDERR "Usage: $0 [options] <bugs list>
   where options are:
@@ -188,3 +291,17 @@
    -srpms <file>  list of SRPMS\n";
   exit 1;
 }
+
+sub grabRepoList {
+  my ($f, $h) = @_;
+  local *IN;
+  open IN, "wget -nv -O - $f|" or die "Failed to wget $f : $!";
+  while ( <IN> ) {
+    next unless /^<img \S+ alt=.\[   \].> <a href=.([^"]+)/;
+    my $file = $1;
+    my ($pkg) = $file =~ /^(.*)-[^-]+-[^-]+\.src\.rpm/;
+    die "Bad file: $file" if $pkg eq "";
+    $h->{$pkg} = 1;
+  }
+  close IN;
+}



From fedora-extras-commits at redhat.com  Wed Apr 19 09:50:47 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 02:50:47 -0700
Subject: status-report-scripts parseBZbugList,1.2,1.3
Message-ID: <200604190950.k3J9olXX001337@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1319

Modified Files:
	parseBZbugList 
Log Message:
Add more owners checks.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- parseBZbugList	19 Apr 2006 09:49:09 -0000	1.2
+++ parseBZbugList	19 Apr 2006 09:50:45 -0000	1.3
@@ -20,6 +20,7 @@
 my %BZR;
 my %BZA;
 my %CORE;
+my %EXTRAS;
 my %SRPMS;
 my %NAME;
 my %OWN;
@@ -46,11 +47,12 @@
   close IN;
 }
 if (defined $opt{"extras"}) {
-  &grabRepoList($opt{"extras"}, \%SRPMS);
+  &grabRepoList($opt{"extras"}, \%EXTRAS);
 }
 if (defined $opt{"core"}) {
   &grabRepoList($opt{"core"}, \%CORE);
 }
+%SRPMS = %EXTRAS;
 foreach my $k (keys %CORE) {
   $SRPMS{$k} = 1;
 }
@@ -136,15 +138,26 @@
   my %O;
   my $orphan = 0;
   my $cnt = 0;
+  my @NP;
+  my @NPC;
+  my @OE;
   foreach my $k (keys %OWN) {
     my $a = $OWN{$k};
     next if $$a[0] ne "Fedora Extras";
     $cnt += 1;
     if ($$a[3] eq 'extras-orphan at fedoraproject.org') {
       $orphan += 1;
+      push @OE, $k if defined $EXTRAS{$k};
       next;
     }
     $O{$$a[3]} += 1;
+    unless (defined $EXTRAS{$k}) {
+      if (defined $CORE{$k}) {
+	push @NPC, $k;
+      } else {
+	push @NP, $k;
+      }
+    }
   }
   print "We have $cnt extras packages in owners file.\n";
   print "There are $orphan orphans.\n";
@@ -156,6 +169,21 @@
     $n =~ s/\./ dot /g;
     printf "%-50s: %d\n", $n, $O{$TO[$i]};
   }
+  if ($#OE >= 0) {
+    $cnt = $#OE + 1;
+    print "\nWe have $cnt orphaned packages available in extras devel:\n";
+    print &toLine(join(" ", sort @OE)), "\n";
+  }
+  if ($#NP >= 0) {
+    $cnt = $#NP + 1;
+    print "\nWe have $cnt packages not available in extras devel:\n";
+    print &toLine(join(" ", sort @NP)), "\n";
+  }
+  if ($#NPC >= 0) {
+    $cnt = $#NPC + 1;
+    print "\nWe have $cnt packages that moved to core:\n";
+    print &toLine(join(" ", sort @NPC)), "\n";
+  }
 }
 
 sub checkAcceptClosed {
@@ -305,3 +333,20 @@
   }
   close IN;
 }
+
+sub toLine {
+  my ($s) = @_;
+  my $p1 = 0;
+  my $p2 = $p1 + 78;
+  while ($p2 < length($s)) {
+    my $p3 = rindex $s, " ", $p2;
+    if ($p3 < $p1) {
+      $p2 += 1;
+      next;
+    }
+    substr $s, $p3, 1, "\n";
+    $p1 = $p3 + 1;
+    $p2 = $p1 + 78;
+  }
+  return $s;
+}



From fedora-extras-commits at redhat.com  Wed Apr 19 09:51:38 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 02:51:38 -0700
Subject: status-report-scripts parseBZbugList,1.3,1.4
Message-ID: <200604190951.k3J9pcps001373@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1355

Modified Files:
	parseBZbugList 
Log Message:
Add more checks.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- parseBZbugList	19 Apr 2006 09:50:45 -0000	1.3
+++ parseBZbugList	19 Apr 2006 09:51:36 -0000	1.4
@@ -5,11 +5,16 @@
 use Date::Manip;
 
 my %opt;
-my @options = ( "help", "core=s", "extras=s", "bzid=s", "o=s" );
+my @options = ( "help", "core=s", "extras=s", "bzid=s", "o=s", "d=s" );
+
+$main::core = "http://mirrors.kernel.org/fedora/core/development/SRPMS/";
+$main::extras = "http://mirrors.kernel.org/fedora/extras/development/SRPMS/";
 
 if( ! GetOptions( \%opt, @options ) ) { &usage(); }
 
 # Override any default settings with arguments that the user has supplied
+$main::core = $opt{"core"} if defined $opt{"core"};
+$main::extras = $opt{"extras"} if defined $opt{"extras"};
 
 &usage() if defined $opt{'help'};
 
@@ -24,6 +29,7 @@
 my %SRPMS;
 my %NAME;
 my %OWN;
+my %DISCARD;
 if (defined $opt{"bzid"}) {
   local *IN;
   open IN, $opt{"bzid"} or die "Couldn't open $opt{'bzid'} : $!";
@@ -34,6 +40,15 @@
   }
   close IN;
 }
+if (defined $opt{"d"}) {
+  local *IN;
+  open IN, $opt{"d"} or die "Couldn't open $opt{'d'} : $!";
+  while ( <IN> ) {
+    s/\s+$//;
+    $DISCARD{$_} = 1;
+  }
+  close IN;
+}
 if (defined $opt{"o"}) {
   local *IN;
   open IN, $opt{"o"} or die "Couldn't open $opt{'o'} : $!";
@@ -42,15 +57,16 @@
     next if /^#/;
     s/\s+$//;
     my @F = split /\|/;
+    next if defined $DISCARD{$F[1]};
     $OWN{$F[1]} = \@F;
   }
   close IN;
 }
-if (defined $opt{"extras"}) {
-  &grabRepoList($opt{"extras"}, \%EXTRAS);
+if ($main::extras ne "") {
+  &grabRepoList($main::extras, \%EXTRAS);
 }
-if (defined $opt{"core"}) {
-  &grabRepoList($opt{"core"}, \%CORE);
+if ($main::core ne "") {
+  &grabRepoList($main::core, \%CORE);
 }
 %SRPMS = %EXTRAS;
 foreach my $k (keys %CORE) {
@@ -124,13 +140,19 @@
 }
 print "=== About owners file ===\n\n";
 &checkOwners;
+my $fourDaysAgo = DateCalc("4 days ago", "today");
+my $fourWeeksAgo = DateCalc("4 weeks ago", "today");
+my $eightWeeksAgo = DateCalc("8 weeks ago", "today");
 print "\n\n=== About FE-ACCEPT packages ===\n";
 &checkAcceptClosed(\%BZA);
 &checkAcceptOpen(\%BZA);
 print "\n\n=== About FE-NEW packages ===\n";
 &checkNotClosed(\%BZN, "FE-NEW");
+&checkLowActivity(\%BZN, "FE-NEW");
+#&checkNoActivity(\%BZN, "FE-NEW");
 print "\n\n=== About FE-REVIEW packages ===\n";
 &checkNotClosed(\%BZR, "FE-REVIEW");
+&checkLowActivity(\%BZR, "FE-REVIEW");
 
 exit 0;
 
@@ -224,9 +246,11 @@
 	$missO += 1;
       }
     } else {
-      # print "Missing pkg: ", join(" ", @$a), "\n";
-      push @BL, $b;
-      $miss += 1;
+      if (Date_Cmp($$a[2], $fourDaysAgo) < 0) {
+	# print "Missing pkg: ", join(" ", @$a), "\n";
+	push @BL, $b;
+	$miss += 1;
+      }
       if (defined $OWN{$pkg}) {
 	$R{$$a[3]} += 1;
 	$O{$$a[4]} += 1;
@@ -239,13 +263,13 @@
   }
   if ($miss > 0) {
     print "\nWe have $miss accepted, closed packages where I'm unable to find
-the package in the development repo:\n\n";
+the package in the development repo:\n";
     print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
       join(",", @BL), "\n";
   }
   if ($missO > 0) {
     print "\nWe have $missO accepted, closed packages where I'm unable to find
-the package in the owners file:\n\n";
+the package in the owners file:\n";
     print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
       join(",", @BLO), "\n";
   }
@@ -273,6 +297,7 @@
 sub checkAcceptOpen {
   my ($BZ) = @_;
   my @BL;
+  my @LATE;
   my $cnt = 0;
   foreach my $b (sort(keys %$BZ)) {
     my $a = $BZ->{$b};
@@ -288,12 +313,20 @@
       $cnt += 1;
       push @BL, $b;
     }
+    if (Date_Cmp($$a[2], $fourWeeksAgo) < 0) {
+      push @LATE, $b;
+    }
   }
   print "\nWe have $cnt accepted, open package reviews where the package
 appears to already be in the repo...\n";
-  print "\nAll open packages already available:\n";
   print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
     join(",", @BL), "\n";
+  if ($#LATE >= 0) {
+    $cnt = $#LATE + 1;
+    print "\nWe have $cnt accepted, open package reviews older than 4 weeks\n";
+    print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
+      join(",", @LATE), "\n";
+  }
 }
 
 sub checkNotClosed {
@@ -311,12 +344,64 @@
     join(",", @BL), "\n";
 }
 
+sub checkLowActivity {
+  my ($BZ, $cur) = @_;
+  my @BL;
+  my @LATE;
+  foreach my $b (sort(keys %$BZ)) {
+    my $a = $BZ->{$b};
+    next if $$a[5] eq "\"CLOSED\"";
+    if (Date_Cmp($$a[2], $fourWeeksAgo) < 0) {
+      if (Date_Cmp($$a[2], $eightWeeksAgo) < 0) {
+	push @LATE, $b;
+      } else {
+	push @BL, $b;
+      }
+    }
+  }
+  if ($#LATE >= 0) {
+    my $cnt = $#LATE + 1;
+    print "\nWe have $cnt $cur tickets with no activity in eight weeks\n";
+    print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
+      join(",", @LATE), "\n";
+  }
+  if ($#BL >= 0) {
+    my $cnt = $#BL + 1;
+    print "\nWe have $cnt $cur tickets with no activity in four weeks\n";
+    print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
+      join(",", @BL), "\n";
+  }
+}
+
+sub checkNoActivity {
+  my ($BZ, $cur) = @_;
+  my @BL;
+  foreach my $b (sort(keys %$BZ)) {
+    my $a = $BZ->{$b};
+    next if $$a[5] eq "\"CLOSED\"";
+    next if $$a[1] ne $$a[2];
+    if (Date_Cmp($$a[2], $eightWeeksAgo) < 0) {
+      push @BL, $b;
+    }
+  }
+  if ($#BL >= 0) {
+    my $cnt = $#BL + 1;
+    print "\nWe have $cnt $cur tickets 8 weeks old with no comments\n";
+    print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
+      join(",", @BL), "\n";
+  }
+}
+
 sub usage {
   print STDERR "Usage: $0 [options] <bugs list>
   where options are:
    -help          this help note
-   -bzid  <file>  list associating bz ticket number with package name
-   -srpms <file>  list of SRPMS\n";
+   -bzid <file>   list associating bz ticket number with package name
+   -extras <url>  Fedora extras SRPMS repo
+                  [$main::extras]
+   -core <url>    Fedora core SRPMS repo
+                  [$main::core]
+   -o <file>      owners.list file\n";
   exit 1;
 }
 



From fedora-extras-commits at redhat.com  Wed Apr 19 09:52:37 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 02:52:37 -0700
Subject: status-report-scripts parseBZbugList,1.4,1.5
Message-ID: <200604190952.k3J9qbkv001431@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1413

Modified Files:
	parseBZbugList 
Log Message:
Print number of open tickets.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- parseBZbugList	19 Apr 2006 09:51:36 -0000	1.4
+++ parseBZbugList	19 Apr 2006 09:52:35 -0000	1.5
@@ -332,13 +332,18 @@
 sub checkNotClosed {
   my ($BZ, $cur) = @_;
   my @BL;
+  my $cnt = 0;
   foreach my $b (sort(keys %$BZ)) {
     my $a = $BZ->{$b};
-    next unless $$a[5] eq "\"CLOSED\"";
-    push @BL, $b;
+    if ($$a[5] eq "\"CLOSED\"") {
+      push @BL, $b;
+      next;
+    }
+    $cnt += 1;
   }
+  print "\nWe have $cnt open tickets in $cur\n";
   return if $#BL < 0;
-  my $cnt = $#BL + 1;
+  $cnt = $#BL + 1;
   print "\nWe have $cnt closed tickets still blocking $cur\n";
   print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
     join(",", @BL), "\n";



From fedora-extras-commits at redhat.com  Wed Apr 19 09:53:36 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 02:53:36 -0700
Subject: status-report-scripts parseBZbugList,1.5,1.6
Message-ID: <200604190953.k3J9rapg001470@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1452

Modified Files:
	parseBZbugList 
Log Message:
Display more info.  Handle NEEDSPONSOR.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- parseBZbugList	19 Apr 2006 09:52:35 -0000	1.5
+++ parseBZbugList	19 Apr 2006 09:53:34 -0000	1.6
@@ -21,7 +21,9 @@
 my $FE_NEW = 163776;
 my $FE_REVIEW = 163778;
 my $FE_ACCEPT = 163779;
+my $FE_NEEDSPONSOR = 177841;
 my %BZN;
+my %BZS;
 my %BZR;
 my %BZA;
 my %CORE;
@@ -117,6 +119,7 @@
     $F[8] =~ s/[:.,>]?\s.*$//g;
   }
   my $block = 0;
+  my $sponsor = 0;
   my $bzb;
   foreach my $b (@B) {
     if ($b == $FE_NEW) {
@@ -131,12 +134,20 @@
       $block += 1;
       $bzb = \%BZA;
     }
+    if ($b == $FE_NEEDSPONSOR) {
+      $sponsor = 1;
+    }
   }
   if ($block > 1) {
     print "Warning: bug $F[0] blocks several FE_ blockers.\n";
     next;
   }
-  $bzb->{$F[0]} = \@F if $block == 1;
+  if ($block == 1) {
+    $bzb->{$F[0]} = \@F;
+    if ($sponsor == 1 && $bzb == \%BZN) {
+      $BZS{$F[0]} = \@F;
+    }
+  }
 }
 print "=== About owners file ===\n\n";
 &checkOwners;
@@ -146,13 +157,18 @@
 print "\n\n=== About FE-ACCEPT packages ===\n";
 &checkAcceptClosed(\%BZA);
 &checkAcceptOpen(\%BZA);
+print "\n\n=== About FE-REVIEW packages ===\n";
+&countOpen(\%BZR, "FE-REVIEW");
+&checkNotClosed(\%BZR, "FE-REVIEW");
+&checkLowActivity(\%BZR, "FE-REVIEW");
 print "\n\n=== About FE-NEW packages ===\n";
+&countOpen(\%BZN, "FE-NEW");
 &checkNotClosed(\%BZN, "FE-NEW");
 &checkLowActivity(\%BZN, "FE-NEW");
 #&checkNoActivity(\%BZN, "FE-NEW");
-print "\n\n=== About FE-REVIEW packages ===\n";
-&checkNotClosed(\%BZR, "FE-REVIEW");
-&checkLowActivity(\%BZR, "FE-REVIEW");
+print "\n\n=== About FE-NEEDSPONSOR packages ===\n";
+&countOpen(\%BZS, "FE-NEEDSPONSOR");
+&checkLowActivity(\%BZS, "FE-NEEDSPONSOR");
 
 exit 0;
 
@@ -191,16 +207,20 @@
     $n =~ s/\./ dot /g;
     printf "%-50s: %d\n", $n, $O{$TO[$i]};
   }
+  if ($#NP >= 0) {
+    $cnt = $#NP + 1;
+    print "\nWe have $cnt packages not available in extras devel:\n";
+    foreach my $p (sort @NP) {
+      my $a = $OWN{$p};
+      my ($owner) = $$a[3] =~ /^([^@]+)/;
+      printf "%-40s %s\n", $p, $owner;
+    }
+  }
   if ($#OE >= 0) {
     $cnt = $#OE + 1;
     print "\nWe have $cnt orphaned packages available in extras devel:\n";
     print &toLine(join(" ", sort @OE)), "\n";
   }
-  if ($#NP >= 0) {
-    $cnt = $#NP + 1;
-    print "\nWe have $cnt packages not available in extras devel:\n";
-    print &toLine(join(" ", sort @NP)), "\n";
-  }
   if ($#NPC >= 0) {
     $cnt = $#NPC + 1;
     print "\nWe have $cnt packages that moved to core:\n";
@@ -262,16 +282,14 @@
     }
   }
   if ($miss > 0) {
-    print "\nWe have $miss accepted, closed packages where I'm unable to find
-the package in the development repo:\n";
-    print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
-      join(",", @BL), "\n";
+    print "\nWe have $miss accepted, closed packages where I'm unable to ",
+      "find the package in the development repo:\n";
+    &displayBL(\@BL, $BZ);
   }
   if ($missO > 0) {
-    print "\nWe have $missO accepted, closed packages where I'm unable to find
-the package in the owners file:\n";
-    print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
-      join(",", @BLO), "\n";
+    print "\nWe have $missO accepted, closed packages where I'm unable to ",
+      "find the package in the owners file:\n";
+    &displayBL(\@BLO, $BZ);
   }
   my @TR = sort {$R{$b} <=> $R{$a}} keys %R;
   my @TO = sort {$O{$b} <=> $O{$a}} keys %O;
@@ -317,36 +335,39 @@
       push @LATE, $b;
     }
   }
-  print "\nWe have $cnt accepted, open package reviews where the package
-appears to already be in the repo...\n";
-  print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
-    join(",", @BL), "\n";
+  print "\nWe have $cnt accepted, open package reviews where the package ",
+    "appears to already be in the repo...\n";
+  &displayBL(\@BL, $BZ);
   if ($#LATE >= 0) {
     $cnt = $#LATE + 1;
     print "\nWe have $cnt accepted, open package reviews older than 4 weeks\n";
-    print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
-      join(",", @LATE), "\n";
+    &displayBL(\@LATE, $BZ);
   }
 }
 
-sub checkNotClosed {
+sub countOpen {
   my ($BZ, $cur) = @_;
-  my @BL;
   my $cnt = 0;
   foreach my $b (sort(keys %$BZ)) {
     my $a = $BZ->{$b};
-    if ($$a[5] eq "\"CLOSED\"") {
-      push @BL, $b;
-      next;
-    }
+    next if $$a[5] eq "\"CLOSED\"";
     $cnt += 1;
   }
   print "\nWe have $cnt open tickets in $cur\n";
+}
+
+sub checkNotClosed {
+  my ($BZ, $cur) = @_;
+  my @BL;
+  foreach my $b (sort(keys %$BZ)) {
+    my $a = $BZ->{$b};
+    next unless $$a[5] eq "\"CLOSED\"";
+    push @BL, $b;
+  }
   return if $#BL < 0;
-  $cnt = $#BL + 1;
+  my $cnt = $#BL + 1;
   print "\nWe have $cnt closed tickets still blocking $cur\n";
-  print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
-    join(",", @BL), "\n";
+  &displayBL(\@BL, $BZ);
 }
 
 sub checkLowActivity {
@@ -367,14 +388,12 @@
   if ($#LATE >= 0) {
     my $cnt = $#LATE + 1;
     print "\nWe have $cnt $cur tickets with no activity in eight weeks\n";
-    print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
-      join(",", @LATE), "\n";
+    &displayBL(\@LATE, $BZ);
   }
   if ($#BL >= 0) {
     my $cnt = $#BL + 1;
     print "\nWe have $cnt $cur tickets with no activity in four weeks\n";
-    print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
-      join(",", @BL), "\n";
+    &displayBL(\@BL, $BZ);
   }
 }
 
@@ -392,8 +411,7 @@
   if ($#BL >= 0) {
     my $cnt = $#BL + 1;
     print "\nWe have $cnt $cur tickets 8 weeks old with no comments\n";
-    print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
-      join(",", @BL), "\n";
+    &displayBL(\@BL, $BZ);
   }
 }
 
@@ -406,6 +424,7 @@
                   [$main::extras]
    -core <url>    Fedora core SRPMS repo
                   [$main::core]
+   -d <file>      list of discarded packages
    -o <file>      owners.list file\n";
   exit 1;
 }
@@ -440,3 +459,14 @@
   }
   return $s;
 }
+
+sub displayBL {
+  my ($BL, $BZ) = @_;
+  print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
+    join(",", @$BL), "\n";
+  foreach my $b (@$BL) {
+    my $a = $BZ->{$b};
+    my ($owner) = $$a[4] =~ /^.([^@]+)/;
+    printf "  %-40s %s\n", $$a[8], $owner;
+  }
+}



From fedora-extras-commits at redhat.com  Wed Apr 19 09:54:25 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 02:54:25 -0700
Subject: status-report-scripts parseBZbugList,1.6,1.7
Message-ID: <200604190954.k3J9sPWR001507@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1489

Modified Files:
	parseBZbugList 
Log Message:
Add -extras_r.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- parseBZbugList	19 Apr 2006 09:53:34 -0000	1.6
+++ parseBZbugList	19 Apr 2006 09:54:23 -0000	1.7
@@ -5,16 +5,19 @@
 use Date::Manip;
 
 my %opt;
-my @options = ( "help", "core=s", "extras=s", "bzid=s", "o=s", "d=s" );
+my @options = ( "help", "core=s", "extras=s", "bzid=s", "o=s", "d=s",
+		"extras_r=s" );
 
 $main::core = "http://mirrors.kernel.org/fedora/core/development/SRPMS/";
 $main::extras = "http://mirrors.kernel.org/fedora/extras/development/SRPMS/";
+$main::extras_r = "http://mirrors.kernel.org/fedora/extras/4/SRPMS/";
 
 if( ! GetOptions( \%opt, @options ) ) { &usage(); }
 
 # Override any default settings with arguments that the user has supplied
 $main::core = $opt{"core"} if defined $opt{"core"};
 $main::extras = $opt{"extras"} if defined $opt{"extras"};
+$main::extras_r = $opt{"extras_r"} if defined $opt{"extras_r"};
 
 &usage() if defined $opt{'help'};
 
@@ -28,6 +31,7 @@
 my %BZA;
 my %CORE;
 my %EXTRAS;
+my %EXTRAS_R;
 my %SRPMS;
 my %NAME;
 my %OWN;
@@ -67,6 +71,9 @@
 if ($main::extras ne "") {
   &grabRepoList($main::extras, \%EXTRAS);
 }
+if ($main::extras_r ne "") {
+  &grabRepoList($main::extras_r, \%EXTRAS_R);
+}
 if ($main::core ne "") {
   &grabRepoList($main::core, \%CORE);
 }
@@ -177,6 +184,7 @@
   my $orphan = 0;
   my $cnt = 0;
   my @NP;
+  my @NP_R;
   my @NPC;
   my @OE;
   foreach my $k (keys %OWN) {
@@ -193,7 +201,11 @@
       if (defined $CORE{$k}) {
 	push @NPC, $k;
       } else {
-	push @NP, $k;
+	if (defined $EXTRAS_R{$k}) {
+	  push @NP_R, $k;
+	} else {
+	  push @NP, $k;
+	}
       }
     }
   }
@@ -209,13 +221,23 @@
   }
   if ($#NP >= 0) {
     $cnt = $#NP + 1;
-    print "\nWe have $cnt packages not available in extras devel:\n";
+    print "\nWe have $cnt packages not available in extras devel or release:\n";
     foreach my $p (sort @NP) {
       my $a = $OWN{$p};
       my ($owner) = $$a[3] =~ /^([^@]+)/;
       printf "%-40s %s\n", $p, $owner;
     }
   }
+  if ($#NP_R >= 0) {
+    $cnt = $#NP_R + 1;
+    print "\nWe have $cnt packages not available in extras devel ";
+    print "but present in release:\n";
+    foreach my $p (sort @NP_R) {
+      my $a = $OWN{$p};
+      my ($owner) = $$a[3] =~ /^([^@]+)/;
+      printf "%-40s %s\n", $p, $owner;
+    }
+  }
   if ($#OE >= 0) {
     $cnt = $#OE + 1;
     print "\nWe have $cnt orphaned packages available in extras devel:\n";
@@ -417,15 +439,17 @@
 
 sub usage {
   print STDERR "Usage: $0 [options] <bugs list>
-  where options are:
-   -help          this help note
-   -bzid <file>   list associating bz ticket number with package name
-   -extras <url>  Fedora extras SRPMS repo
+ where options are:
+  -help           this help note
+  -bzid <file>    list associating bz ticket number with package name
+  -extras <url>   Fedora extras SRPMS development repo
                   [$main::extras]
-   -core <url>    Fedora core SRPMS repo
+  -extras_r <url> Fedora extras SRPMS release repo
+                  [$main::extras_r]
+  -core <url>     Fedora core SRPMS repo
                   [$main::core]
-   -d <file>      list of discarded packages
-   -o <file>      owners.list file\n";
+  -d <file>       list of discarded packages
+  -o <file>       owners.list file\n";
   exit 1;
 }
 



From fedora-extras-commits at redhat.com  Wed Apr 19 09:55:26 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 02:55:26 -0700
Subject: status-report-scripts parseBZbugList,1.7,1.8
Message-ID: <200604190955.k3J9tQmu001538@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1520

Modified Files:
	parseBZbugList 
Log Message:
Change output for wiki.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- parseBZbugList	19 Apr 2006 09:54:23 -0000	1.7
+++ parseBZbugList	19 Apr 2006 09:55:23 -0000	1.8
@@ -36,6 +36,13 @@
 my %NAME;
 my %OWN;
 my %DISCARD;
+my %PKG_LIST;
+my %BUG_LIST;
+my %OWNER_LIST;
+my %COUNT_LIST;
+my %OWNER_CNT;
+my %BZOWN_CNT;
+my %BZREV_CNT;
 if (defined $opt{"bzid"}) {
   local *IN;
   open IN, $opt{"bzid"} or die "Couldn't open $opt{'bzid'} : $!";
@@ -117,6 +124,9 @@
   $F[2] = ParseDate($F[2]);
   my @B = split /,/, $F[7];
   next if $F[8] =~ /TESTING-BUGSPAM/;
+  $F[9] = $F[8];
+  $F[9] =~ s/^["]+//;
+  $F[9] =~ s/["]+$//;
   if (defined $NAME{$F[0]}) {
     $F[8] = $NAME{$F[0]};
   } else {
@@ -156,31 +166,31 @@
     }
   }
 }
-print "=== About owners file ===\n\n";
 &checkOwners;
 my $fourDaysAgo = DateCalc("4 days ago", "today");
 my $fourWeeksAgo = DateCalc("4 weeks ago", "today");
 my $eightWeeksAgo = DateCalc("8 weeks ago", "today");
-print "\n\n=== About FE-ACCEPT packages ===\n";
 &checkAcceptClosed(\%BZA);
 &checkAcceptOpen(\%BZA);
-print "\n\n=== About FE-REVIEW packages ===\n";
 &countOpen(\%BZR, "FE-REVIEW");
 &checkNotClosed(\%BZR, "FE-REVIEW");
 &checkLowActivity(\%BZR, "FE-REVIEW");
-print "\n\n=== About FE-NEW packages ===\n";
 &countOpen(\%BZN, "FE-NEW");
 &checkNotClosed(\%BZN, "FE-NEW");
 &checkLowActivity(\%BZN, "FE-NEW");
 #&checkNoActivity(\%BZN, "FE-NEW");
-print "\n\n=== About FE-NEEDSPONSOR packages ===\n";
 &countOpen(\%BZS, "FE-NEEDSPONSOR");
 &checkLowActivity(\%BZS, "FE-NEEDSPONSOR");
+print "[[TableOfContents]]\n\n= FE Package Status of <date> =\n";
+&displayOwnersWiki;
+&displayAcceptWiki(\%BZA);
+&displayNewReviewWiki(\%BZR, "FE-REVIEW");
+&displayNewReviewWiki(\%BZN, "FE-NEW");
+&displayNewReviewWiki(\%BZS, "FE-NEEDSPONSOR");
 
 exit 0;
 
 sub checkOwners {
-  my %O;
   my $orphan = 0;
   my $cnt = 0;
   my @NP;
@@ -196,7 +206,7 @@
       push @OE, $k if defined $EXTRAS{$k};
       next;
     }
-    $O{$$a[3]} += 1;
+    $OWNER_CNT{$$a[3]} += 1;
     unless (defined $EXTRAS{$k}) {
       if (defined $CORE{$k}) {
 	push @NPC, $k;
@@ -209,56 +219,94 @@
       }
     }
   }
-  print "We have $cnt extras packages in owners file.\n";
-  print "There are $orphan orphans.\n";
-  my @TO = sort {$O{$b} <=> $O{$a}} keys %O;
-  print "\nTop 10 package owners:\n";
+  my @TO = sort {$OWNER_CNT{$b} <=> $OWNER_CNT{$a}} keys %OWNER_CNT;
+  $COUNT_LIST{"owner"} = $cnt;
+  $COUNT_LIST{"orphan"} = $orphan;
+  $OWNER_LIST{"package"} = \@TO;
+  $PKG_LIST{"NotDevelNotRel"} = \@NP;
+  $PKG_LIST{"NotDevel"} = \@NP_R;
+  $PKG_LIST{"OrphanDevel"} = \@OE;
+  $PKG_LIST{"MovedToCore"} = \@NPC;
+}
+
+sub displayOwnersWiki {
+  print "== About owners file ==\n\n";
+  print "=== Package count ===\n\n";
+  print "We have $COUNT_LIST{'owner'} extras packages in owners file.[[BR]]\n";
+  print "There are $COUNT_LIST{'orphan'} orphans.\n";
+  print "\n=== Top 10 package owners ===\n";
+  my $a = $OWNER_LIST{"package"};
+  &displayOwnerCntWiki($a, \%OWNER_CNT);
+  print "\n=== Packages not present in the development repo ===\n";
+  $a = $PKG_LIST{"NotDevelNotRel"};
+  if ($#$a >= 0) {
+    my $cnt = $#$a + 1;
+    print "\nWe have $cnt packages not available in extras devel or release:\n";
+    &displayPkgListByOwnerWiki($a);
+  }
+  $a = $PKG_LIST{"NotDevel"};
+  if ($#$a >= 0) {
+    my $cnt = $#$a + 1;
+    print "\nWe have $cnt packages not available in extras devel ";
+    print "but present in release:\n";
+    &displayPkgListByOwnerWiki($a);
+  }
+  $a = $PKG_LIST{"OrphanDevel"};
+  print "\n=== Orphaned packages present in the development repo ===\n";
+  if ($#$a >= 0) {
+    my $cnt = $#$a + 1;
+    print "\nWe have $cnt orphaned packages available in extras devel:{{{\n";
+    print &toLine(join(" ", sort @$a)), "\n";
+    print "}}}\n";
+  }
+  print "\n=== FE packages that moved to Fedora Core ===\n";
+  $a = $PKG_LIST{"MovedToCore"};
+  if ($#$a >= 0) {
+    my $cnt = $#$a + 1;
+    print "\nWe have $cnt packages that moved to core:{{{\n";
+    print &toLine(join(" ", sort @$a)), "\n";
+    print "}}}\n";
+  }
+}
+
+sub displayOwnerCntWiki {
+  my ($a, $c) = @_;
   for my $i (0 .. 9) {
-    my $n = $TO[$i];
+    my $n = $$a[$i];
+    $n =~ s/["]//g;
     $n =~ s/\@/ at /;
     $n =~ s/\./ dot /g;
-    printf "%-50s: %d\n", $n, $O{$TO[$i]};
+    print "||$n||$c->{$$a[$i]}||\n";
   }
-  if ($#NP >= 0) {
-    $cnt = $#NP + 1;
-    print "\nWe have $cnt packages not available in extras devel or release:\n";
-    foreach my $p (sort @NP) {
-      my $a = $OWN{$p};
-      my ($owner) = $$a[3] =~ /^([^@]+)/;
-      printf "%-40s %s\n", $p, $owner;
+}
+
+sub displayPkgListByOwnerWiki {
+  my ($a) = @_;
+  my %PO;
+  foreach my $p (@$a) {
+    my $oa = $OWN{$p};
+    my $owner = $$oa[3];
+    my $e = $PO{$owner};
+    if (defined $e) {
+      push @$e, $p;
+    } else {
+      $PO{$owner} = [ $p ];
     }
   }
-  if ($#NP_R >= 0) {
-    $cnt = $#NP_R + 1;
-    print "\nWe have $cnt packages not available in extras devel ";
-    print "but present in release:\n";
-    foreach my $p (sort @NP_R) {
-      my $a = $OWN{$p};
-      my ($owner) = $$a[3] =~ /^([^@]+)/;
-      printf "%-40s %s\n", $p, $owner;
+  foreach my $owner (sort(keys %PO)) {
+    my $e = $PO{$owner};
+    $owner =~ s/\@/ at /;
+    $owner =~ s/\./ dot /g;
+    foreach my $p (@$e) {
+      print "||$owner||`$p`||\n";
     }
   }
-  if ($#OE >= 0) {
-    $cnt = $#OE + 1;
-    print "\nWe have $cnt orphaned packages available in extras devel:\n";
-    print &toLine(join(" ", sort @OE)), "\n";
-  }
-  if ($#NPC >= 0) {
-    $cnt = $#NPC + 1;
-    print "\nWe have $cnt packages that moved to core:\n";
-    print &toLine(join(" ", sort @NPC)), "\n";
-  }
 }
 
 sub checkAcceptClosed {
   my ($BZ) = @_;
   my @BL;
   my @BLO;
-  my %O;
-  my %R;
-  my $cnt = 0;
-  my $miss = 0;
-  my $missO = 0;
   foreach my $b (sort(keys %$BZ)) {
     my $a = $BZ->{$b};
     next unless $$a[5] eq "\"CLOSED\"";
@@ -280,57 +328,67 @@
       $pkg = lcfirst $$a[8];
     }
     if ($SRPMS{$pkg} == 1) {
-      $R{$$a[3]} += 1;
-      $O{$$a[4]} += 1;
-      $cnt += 1;
+      $BZREV_CNT{$$a[3]} += 1;
+      $BZOWN_CNT{$$a[4]} += 1;
+      $COUNT_LIST{"acceptedClosed"} += 1;
       if (!defined($CORE{$pkg}) && !defined($OWN{$pkg})) {
 	push @BLO, $b;
-	$missO += 1;
+	$COUNT_LIST{"missingOwner"} += 1;
       }
     } else {
       if (Date_Cmp($$a[2], $fourDaysAgo) < 0) {
 	# print "Missing pkg: ", join(" ", @$a), "\n";
 	push @BL, $b;
-	$miss += 1;
+	$COUNT_LIST{"missing"} += 1;
       }
       if (defined $OWN{$pkg}) {
-	$R{$$a[3]} += 1;
-	$O{$$a[4]} += 1;
-	$cnt += 1;
+	$BZREV_CNT{$$a[3]} += 1;
+	$BZOWN_CNT{$$a[4]} += 1;
+	$COUNT_LIST{"acceptedClosed"} += 1;
       } else {
 	push @BLO, $b;
-	$missO += 1;
+	$COUNT_LIST{"missingOwner"} += 1;
       }
     }
   }
-  if ($miss > 0) {
-    print "\nWe have $miss accepted, closed packages where I'm unable to ",
+  my @TR = sort {$BZREV_CNT{$b} <=> $BZREV_CNT{$a}} keys %BZREV_CNT;
+  my @TO = sort {$BZOWN_CNT{$b} <=> $BZOWN_CNT{$a}} keys %BZOWN_CNT;
+  $BUG_LIST{"acceptedNoDevel"} = \@BL;
+  $BUG_LIST{"acceptedNoOwn"} = \@BLO;
+  $OWNER_LIST{"BZOwner"} = \@TO;
+  $OWNER_LIST{"BZReviewer"} = \@TR;
+}
+
+sub displayAcceptWiki {
+  my ($BZ) = @_;
+  print "\n\n== About FE-ACCEPT packages ==\n";
+  print "\n\n=== Package count ===\n";
+  print "\nWe have $COUNT_LIST{'acceptedClosed'} accepted, closed package reviews\n";
+  print "\n=== Top 10 BZ review requests submitters ===\n";
+  &displayOwnerCntWiki($OWNER_LIST{"BZOwner"}, \%BZOWN_CNT);
+  print "\n=== Top 10 BZ review requests reviewers ===\n";
+  &displayOwnerCntWiki($OWNER_LIST{"BZReviewer"}, \%BZREV_CNT);
+  print "\n\n=== Potential problems ===\n";
+  if ($COUNT_LIST{"missing"} > 0) {
+    print "\nWe have $COUNT_LIST{'missing'} accepted, closed packages where I'm unable to ",
       "find the package in the development repo:\n";
-    &displayBL(\@BL, $BZ);
+    &displayBLWiki($BUG_LIST{"acceptedNoDevel"}, $BZ);
   }
-  if ($missO > 0) {
-    print "\nWe have $missO accepted, closed packages where I'm unable to ",
+  if ($COUNT_LIST{"missingOwner"} > 0) {
+    print "\nWe have $COUNT_LIST{'missingOwner'} accepted, closed packages where I'm unable to ",
       "find the package in the owners file:\n";
-    &displayBL(\@BLO, $BZ);
+    &displayBLWiki($BUG_LIST{"acceptedNoOwn"}, $BZ);
   }
-  my @TR = sort {$R{$b} <=> $R{$a}} keys %R;
-  my @TO = sort {$O{$b} <=> $O{$a}} keys %O;
-  print "\nWe have $cnt accepted, closed package reviews\n";
-  print "\nTop 10 BZ review requests submitters:\n";
-  for my $i (0 .. 9) {
-    my $n = $TO[$i];
-    $n =~ s/["]//g;
-    $n =~ s/\@/ at /;
-    $n =~ s/\./ dot /g;
-    printf "%-50s: %d\n", $n, $O{$TO[$i]};
-  }
-  print "\nTop 10 BZ review requests reviewers:\n";
-  for my $i (0 .. 9) {
-    my $n = $TR[$i];
-    $n =~ s/["]//g;
-    $n =~ s/\@/ at /;
-    $n =~ s/\./ dot /g;
-    printf "%-50s: %d\n", $n, $R{$TR[$i]};
+  if ($COUNT_LIST{"acceptOpenInactive"} >= 0) {
+    print "\n\n=== Inactivity notice ===\n";
+    print "\nWe have $COUNT_LIST{'acceptOpenInactive'} accepted, open package reviews older than 4 weeks\n";
+    &displayBLWiki($BUG_LIST{"acceptOpenInactive"}, $BZ);
+  }
+  if ($COUNT_LIST{"acceptOpenInDevel"} > 0) {
+    print "\n\n=== Some cleanup needed ===\n";
+    print "\nWe have $COUNT_LIST{'acceptOpenInDevel'} accepted, open package reviews where the package ",
+      "appears to already be in the repo...\n";
+    &displayBLWiki($BUG_LIST{"acceptOpenInDevel"}, $BZ);
   }
 }
 
@@ -338,7 +396,6 @@
   my ($BZ) = @_;
   my @BL;
   my @LATE;
-  my $cnt = 0;
   foreach my $b (sort(keys %$BZ)) {
     my $a = $BZ->{$b};
     next if $$a[5] eq "\"CLOSED\"";
@@ -350,32 +407,25 @@
       $pkg = lcfirst $$a[8];
     }
     if ($SRPMS{$pkg} == 1) {
-      $cnt += 1;
+      $COUNT_LIST{"acceptOpenInDevel"} += 1;
       push @BL, $b;
     }
     if (Date_Cmp($$a[2], $fourWeeksAgo) < 0) {
       push @LATE, $b;
     }
   }
-  print "\nWe have $cnt accepted, open package reviews where the package ",
-    "appears to already be in the repo...\n";
-  &displayBL(\@BL, $BZ);
-  if ($#LATE >= 0) {
-    $cnt = $#LATE + 1;
-    print "\nWe have $cnt accepted, open package reviews older than 4 weeks\n";
-    &displayBL(\@LATE, $BZ);
-  }
+  $BUG_LIST{"acceptOpenInDevel"} = \@BL;
+  $BUG_LIST{"acceptOpenInactive"} = \@LATE;
+  $COUNT_LIST{"acceptOpenInactive"} = $#LATE;
 }
 
 sub countOpen {
   my ($BZ, $cur) = @_;
-  my $cnt = 0;
   foreach my $b (sort(keys %$BZ)) {
     my $a = $BZ->{$b};
     next if $$a[5] eq "\"CLOSED\"";
-    $cnt += 1;
+    $COUNT_LIST{"open$cur"} += 1;
   }
-  print "\nWe have $cnt open tickets in $cur\n";
 }
 
 sub checkNotClosed {
@@ -386,10 +436,8 @@
     next unless $$a[5] eq "\"CLOSED\"";
     push @BL, $b;
   }
-  return if $#BL < 0;
-  my $cnt = $#BL + 1;
-  print "\nWe have $cnt closed tickets still blocking $cur\n";
-  &displayBL(\@BL, $BZ);
+  $COUNT_LIST{"closed$cur"} = $#BL + 1;
+  $BUG_LIST{"closed$cur"} = \@BL;
 }
 
 sub checkLowActivity {
@@ -407,35 +455,29 @@
       }
     }
   }
-  if ($#LATE >= 0) {
-    my $cnt = $#LATE + 1;
-    print "\nWe have $cnt $cur tickets with no activity in eight weeks\n";
-    &displayBL(\@LATE, $BZ);
-  }
-  if ($#BL >= 0) {
-    my $cnt = $#BL + 1;
-    print "\nWe have $cnt $cur tickets with no activity in four weeks\n";
-    &displayBL(\@BL, $BZ);
-  }
-}
-
-sub checkNoActivity {
-  my ($BZ, $cur) = @_;
-  my @BL;
-  foreach my $b (sort(keys %$BZ)) {
-    my $a = $BZ->{$b};
-    next if $$a[5] eq "\"CLOSED\"";
-    next if $$a[1] ne $$a[2];
-    if (Date_Cmp($$a[2], $eightWeeksAgo) < 0) {
-      push @BL, $b;
-    }
-  }
-  if ($#BL >= 0) {
-    my $cnt = $#BL + 1;
-    print "\nWe have $cnt $cur tickets 8 weeks old with no comments\n";
-    &displayBL(\@BL, $BZ);
-  }
-}
+  $COUNT_LIST{"inactive8$cur"} = $#LATE + 1;
+  $COUNT_LIST{"inactive4$cur"} = $#BL + 1;
+  $BUG_LIST{"inactive8$cur"} = \@LATE;
+  $BUG_LIST{"inactive4$cur"} = \@BL;
+}
+
+#sub checkNoActivity {
+#  my ($BZ, $cur) = @_;
+#  my @BL;
+#  foreach my $b (sort(keys %$BZ)) {
+#    my $a = $BZ->{$b};
+#    next if $$a[5] eq "\"CLOSED\"";
+#    next if $$a[1] ne $$a[2];
+#    if (Date_Cmp($$a[2], $eightWeeksAgo) < 0) {
+#      push @BL, $b;
+#    }
+#  }
+#  if ($#BL >= 0) {
+#    my $cnt = $#BL + 1;
+#    print "\nWe have $cnt $cur tickets 8 weeks old with no comments\n";
+#    &displayBL(\@BL, $BZ);
+#  }
+#}
 
 sub usage {
   print STDERR "Usage: $0 [options] <bugs list>
@@ -494,3 +536,56 @@
     printf "  %-40s %s\n", $$a[8], $owner;
   }
 }
+
+sub displayBLWiki {
+  my ($BL, $BZ) = @_;
+  my %O;
+  foreach my $b (@$BL) {
+    my $a = $BZ->{$b};
+    my $e = $O{$$a[4]};
+    if (defined $e) {
+      push @$e, $a;
+    } else {
+      $O{$$a[4]} = [ $a ];
+    }
+  }
+  foreach my $n (sort(keys %O)) {
+    my $e = $O{$n};
+    $n =~ s/["]//g;
+    $n =~ s/\@/ at /;
+    $n =~ s/\./ dot /g;
+    foreach my $a (@$e) {
+      print "||$n||`$$a[8]`||[";
+      print "https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=$$a[0] $$a[0]";
+      print "]||$$a[9]||\n";
+    }
+  }
+}
+
+sub displayNewReviewWiki {
+  my ($BZ, $cur) = @_;
+  print "\n\n== About $cur packages ==\n";
+  print "\n\n=== Open ticket count ===\n";
+  my $cnt = $COUNT_LIST{"open$cur"};
+  print "\nWe have $cnt open tickets in $cur\n";
+  if ($COUNT_LIST{"inactive8$cur"} > 0
+      || $COUNT_LIST{"inactive4$cur"} > 0) {
+    print "\n\n=== Inactivity notice ===\n";
+    if ($COUNT_LIST{"inactive8$cur"} > 0) {
+      $cnt = $COUNT_LIST{"inactive8$cur"};
+      print "\nWe have $cnt $cur tickets with no activity in eight weeks\n";
+      &displayBLWiki($BUG_LIST{"inactive8$cur"}, $BZ);
+    }
+    if ($COUNT_LIST{"inactive4$cur"} > 0) {
+      $cnt = $COUNT_LIST{"inactive4$cur"};
+      print "\nWe have $cnt $cur tickets with no activity in four weeks\n";
+      &displayBLWiki($BUG_LIST{"inactive4$cur"}, $BZ);
+    }
+  }
+  if ($COUNT_LIST{"closed$cur"} > 0) {
+    print "\n\n=== Some cleanup needed ===\n";
+    $cnt = $COUNT_LIST{"closed$cur"};
+    print "\nWe have $cnt closed tickets still blocking $cur\n";
+    &displayBLWiki($BUG_LIST{"closed$cur"}, $BZ);
+  }
+}



From fedora-extras-commits at redhat.com  Wed Apr 19 09:56:21 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 02:56:21 -0700
Subject: status-report-scripts parseBZbugList,1.8,1.9
Message-ID: <200604190956.k3J9uLQU001567@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1549

Modified Files:
	parseBZbugList 
Log Message:
Start handling name changes due to upper/lower-case in owners.list.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- parseBZbugList	19 Apr 2006 09:55:23 -0000	1.8
+++ parseBZbugList	19 Apr 2006 09:56:18 -0000	1.9
@@ -197,6 +197,19 @@
   my @NP_R;
   my @NPC;
   my @OE;
+  for my $k (keys %OWN) {
+    my $l = lc $k;
+    next if $l eq $k;
+    if (defined $OWN{$l}) {
+      if (defined($EXTRAS{$l}) || defined($CORE{$l})) {
+	delete $OWN{$k};
+	next;
+      }
+      if (defined($EXTRAS{$k}) || defined($CORE{$k})) {
+	delete $OWN{$l};
+      }
+    }
+  }
   foreach my $k (keys %OWN) {
     my $a = $OWN{$k};
     next if $$a[0] ne "Fedora Extras";



From fedora-extras-commits at redhat.com  Wed Apr 19 09:57:12 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 02:57:12 -0700
Subject: status-report-scripts parseBZbugList,1.9,1.10
Message-ID: <200604190957.k3J9vCJU001599@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1578

Modified Files:
	parseBZbugList 
Log Message:
Add TODO items.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- parseBZbugList	19 Apr 2006 09:56:18 -0000	1.9
+++ parseBZbugList	19 Apr 2006 09:57:09 -0000	1.10
@@ -1,5 +1,13 @@
 #!/usr/bin/env perl
 # $Id$
+
+# TODO stuff
+# - read a moved-to-extra file
+# - check that packages listed in discarded file actually appear in owners
+# - check that open new/review packages do not appear in owners
+# - print what shoul dgo in the mailing list report
+# - fill the <Date> placeholder
+
 use strict;
 use Getopt::Long;
 use Date::Manip;



From fedora-extras-commits at redhat.com  Wed Apr 19 09:58:03 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 02:58:03 -0700
Subject: status-report-scripts parseBZbugList,1.10,1.11
Message-ID: <200604190958.k3J9w3cu001630@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1612

Modified Files:
	parseBZbugList 
Log Message:
Implement some TODO items.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- parseBZbugList	19 Apr 2006 09:57:09 -0000	1.10
+++ parseBZbugList	19 Apr 2006 09:58:01 -0000	1.11
@@ -2,11 +2,7 @@
 # $Id$
 
 # TODO stuff
-# - read a moved-to-extra file
-# - check that packages listed in discarded file actually appear in owners
-# - check that open new/review packages do not appear in owners
-# - print what shoul dgo in the mailing list report
-# - fill the <Date> placeholder
+# - print what should go in the mailing list report
 
 use strict;
 use Getopt::Long;
@@ -16,9 +12,16 @@
 my @options = ( "help", "core=s", "extras=s", "bzid=s", "o=s", "d=s",
 		"extras_r=s" );
 
-$main::core = "http://mirrors.kernel.org/fedora/core/development/SRPMS/";
-$main::extras = "http://mirrors.kernel.org/fedora/extras/development/SRPMS/";
-$main::extras_r = "http://mirrors.kernel.org/fedora/extras/4/SRPMS/";
+$main::core
+  = "http://mirrors.kernel.org/fedora/core/development/SRPMS/";
+$main::extras
+  = "http://mirrors.kernel.org/fedora/extras/development/SRPMS/";
+$main::extras_r
+  = "http://mirrors.kernel.org/fedora/extras/4/SRPMS/";
+$main::discarded
+  = "http://fedoraproject.org/wiki/Extras/PackagesNoLongerInDevel";
+$main::bzid
+  = "http://fedoraproject.org/wiki/Extras/UsefulScripts?action=AttachFile&do=get&target=bzId_pkg.txt";
 
 if( ! GetOptions( \%opt, @options ) ) { &usage(); }
 
@@ -26,6 +29,8 @@
 $main::core = $opt{"core"} if defined $opt{"core"};
 $main::extras = $opt{"extras"} if defined $opt{"extras"};
 $main::extras_r = $opt{"extras_r"} if defined $opt{"extras_r"};
+$main::discarded = $opt{"d"} if defined $opt{"d"};
+$main::bzid = $opt{"bzid"} if defined $opt{"bzid"};
 
 &usage() if defined $opt{'help'};
 
@@ -43,7 +48,9 @@
 my %SRPMS;
 my %NAME;
 my %OWN;
+my %OWN_DUP;
 my %DISCARD;
+my %FC_INTEGRATED;
 my %PKG_LIST;
 my %BUG_LIST;
 my %OWNER_LIST;
@@ -51,9 +58,10 @@
 my %OWNER_CNT;
 my %BZOWN_CNT;
 my %BZREV_CNT;
-if (defined $opt{"bzid"}) {
+if ($main::bzid ne "") {
   local *IN;
-  open IN, $opt{"bzid"} or die "Couldn't open $opt{'bzid'} : $!";
+  open IN, "wget -nv -O - \"$main::bzid\"|"
+    or die "Failed to wget $main::bzid : $!";
   while ( <IN> ) {
     s/\s+$//;
     my @F = split /\t/;
@@ -61,11 +69,32 @@
   }
   close IN;
 }
-if (defined $opt{"d"}) {
+if ($main::discarded ne "") {
   local *IN;
-  open IN, $opt{"d"} or die "Couldn't open $opt{'d'} : $!";
+  open IN, "wget -nv -O - \"$main::discarded\"|"
+    or die "Failed to wget $main::discarded : $!";
   while ( <IN> ) {
-    s/\s+$//;
+    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> ) {
+    last if /^<p>These FE packages have been retired/;
+  }
+  while ( <IN> ) {
+    last if /^<pre>/;
+  }
+  while ( <IN> ) {
+    last if /^<\/pre>/;
+    s/[\r\n]+$//;
+    s/\s.*$//;
     $DISCARD{$_} = 1;
   }
   close IN;
@@ -78,10 +107,17 @@
     next if /^#/;
     s/\s+$//;
     my @F = split /\|/;
-    next if defined $DISCARD{$F[1]};
+    if (defined $DISCARD{$F[1]}) {
+      $DISCARD{$F[1]} += 1;
+      next;
+    }
     $OWN{$F[1]} = \@F;
   }
   close IN;
+  foreach my $k (keys %DISCARD) {
+    next if $DISCARD{$k} > 1;
+    print STDERR "$k is in the list of discarded pkgs, but not in owners\n";
+  }
 }
 if ($main::extras ne "") {
   &grabRepoList($main::extras, \%EXTRAS);
@@ -174,6 +210,8 @@
     }
   }
 }
+&checkOpenInOwners(\%BZR, "FE-REVIEW");
+&checkOpenInOwners(\%BZN, "FE-NEW");
 &checkOwners;
 my $fourDaysAgo = DateCalc("4 days ago", "today");
 my $fourWeeksAgo = DateCalc("4 weeks ago", "today");
@@ -189,26 +227,39 @@
 #&checkNoActivity(\%BZN, "FE-NEW");
 &countOpen(\%BZS, "FE-NEEDSPONSOR");
 &checkLowActivity(\%BZS, "FE-NEEDSPONSOR");
-print "[[TableOfContents]]\n\n= FE Package Status of <date> =\n";
+print "[[TableOfContents]]\n\n= FE Package Status of ",
+  &UnixDate("today", "%b %e, %Y"), " =\n";
 &displayOwnersWiki;
 &displayAcceptWiki(\%BZA);
 &displayNewReviewWiki(\%BZR, "FE-REVIEW");
 &displayNewReviewWiki(\%BZN, "FE-NEW");
 &displayNewReviewWiki(\%BZS, "FE-NEEDSPONSOR");
+print "----\nCategoryExtras\n";
 
 exit 0;
 
 sub checkOwners {
   my $orphan = 0;
   my $cnt = 0;
+  my @NO;
   my @NP;
   my @NP_R;
   my @NPC;
   my @OE;
+  foreach my $k (keys %EXTRAS) {
+    next if defined $OWN{$k};
+    push @NO, $k
+  }
+  if ($#NO >= 0) {
+    $COUNT_LIST{"extrasNoOwner"} = $#NO + 1;
+    $PKG_LIST{"extrasNoOwner"} = \@NO;
+  }
   for my $k (keys %OWN) {
     my $l = lc $k;
     next if $l eq $k;
     if (defined $OWN{$l}) {
+      $OWN_DUP{$l} = $OWN{$l};
+      $OWN_DUP{$k} = $OWN{$k};
       if (defined($EXTRAS{$l}) || defined($CORE{$l})) {
 	delete $OWN{$k};
 	next;
@@ -229,7 +280,7 @@
     }
     $OWNER_CNT{$$a[3]} += 1;
     unless (defined $EXTRAS{$k}) {
-      if (defined $CORE{$k}) {
+      if (defined($CORE{$k}) || defined($FC_INTEGRATED{$k})) {
 	push @NPC, $k;
       } else {
 	if (defined $EXTRAS_R{$k}) {
@@ -272,6 +323,29 @@
     print "but present in release:\n";
     &displayPkgListByOwnerWiki($a);
   }
+  if ($COUNT_LIST{"openInOwners"} > 0) {
+    print "\n\n=== Packages that have not yet completed review ===\n";
+    print "\nWe have $COUNT_LIST{'openInOwners'} packages ",
+      "which have not yet been FE_APPROVE'd...\n";
+    &displayBLWiki($BUG_LIST{"openInOwnersFE-REVIEW"}, \%BZR);
+    &displayBLWiki($BUG_LIST{"openInOwnersFE-NEW"}, \%BZN);
+  }
+  if ($COUNT_LIST{"extrasNoOwner"} > 0) {
+    print "\n\n=== Packages missing in owners.list ===\n";
+    print "\nWe have $COUNT_LIST{'extrasNoOwner'} packages present in the ",
+      "development repo which have no entry in `owners.list`:{{{\n";
+    my $p = $PKG_LIST{"extrasNoOwner"};
+    print &toLine(join(" ", @$p)), "\n";
+    print "}}}\n";
+  }
+  my @DUP = sort(keys %OWN_DUP);
+  if ($#DUP >= 0) {
+    print "\n=== Duplicated packages ===\n";
+    my $cnt = ($#DUP + 1) / 2;
+    print "\nWe have $cnt packages which appear to be duplicated:{{{\n";
+    print &toLine(join(" ", @DUP)), "\n";
+    print "}}}\n";
+  }
   $a = $PKG_LIST{"OrphanDevel"};
   print "\n=== Orphaned packages present in the development repo ===\n";
   if ($#$a >= 0) {
@@ -504,14 +578,16 @@
   print STDERR "Usage: $0 [options] <bugs list>
  where options are:
   -help           this help note
-  -bzid <file>    list associating bz ticket number with package name
+  -bzid <url>     list associating bz ticket number with package name
+                  [$main::bzid]
   -extras <url>   Fedora extras SRPMS development repo
                   [$main::extras]
   -extras_r <url> Fedora extras SRPMS release repo
                   [$main::extras_r]
   -core <url>     Fedora core SRPMS repo
                   [$main::core]
-  -d <file>       list of discarded packages
+  -d <url>        list of migrated/discarded packages
+                  [$main::discarded]
   -o <file>       owners.list file\n";
   exit 1;
 }
@@ -519,7 +595,7 @@
 sub grabRepoList {
   my ($f, $h) = @_;
   local *IN;
-  open IN, "wget -nv -O - $f|" or die "Failed to wget $f : $!";
+  open IN, "wget -nv -O - \"$f\"|" or die "Failed to wget $f : $!";
   while ( <IN> ) {
     next unless /^<img \S+ alt=.\[   \].> <a href=.([^"]+)/;
     my $file = $1;
@@ -610,3 +686,17 @@
     &displayBLWiki($BUG_LIST{"closed$cur"}, $BZ);
   }
 }
+
+sub checkOpenInOwners {
+  my ($BZ, $cur) = @_;
+  my @BL;
+  foreach my $b (sort(keys %$BZ)) {
+    my $a = $BZ->{$b};
+    next if $$a[5] eq "\"CLOSED\"";
+    next unless defined $OWN{$$a[8]};
+    delete $OWN{$$a[8]};
+    push @BL, $b;
+  }
+  $COUNT_LIST{"openInOwners"} += $#BL + 1;
+  $BUG_LIST{"openInOwners$cur"} = \@BL;
+}



From fedora-extras-commits at redhat.com  Wed Apr 19 09:58:42 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 02:58:42 -0700
Subject: status-report-scripts parseBZbugList,1.11,1.12
Message-ID: <200604190958.k3J9wgYY001664@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1646

Modified Files:
	parseBZbugList 
Log Message:
Print mail stuff.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- parseBZbugList	19 Apr 2006 09:58:01 -0000	1.11
+++ parseBZbugList	19 Apr 2006 09:58:40 -0000	1.12
@@ -2,7 +2,6 @@
 # $Id$
 
 # TODO stuff
-# - print what should go in the mailing list report
 
 use strict;
 use Getopt::Long;
@@ -235,6 +234,15 @@
 &displayNewReviewWiki(\%BZN, "FE-NEW");
 &displayNewReviewWiki(\%BZS, "FE-NEEDSPONSOR");
 print "----\nCategoryExtras\n";
+print STDERR "\n\nFE Package Status of ",
+  &UnixDate("today", "%b %e, %Y"), "\n";
+print STDERR "\nThe full report can be found here:\n";
+print STDERR "http://fedoraproject.org/wiki/Extras/PackageStatus\n\n";
+&displayOwnersMail;
+&displayAcceptMail;
+&displayNewReviewMail("FE-REVIEW");
+&displayNewReviewMail("FE-NEW");
+&displayNewReviewMail("FE-NEEDSPONSOR");
 
 exit 0;
 
@@ -398,6 +406,46 @@
   }
 }
 
+sub displayOwnersMail {
+  print STDERR "\nOwners file stats:\n";
+  print STDERR " - $COUNT_LIST{'owner'} packages\n";
+  print STDERR " - $COUNT_LIST{'orphan'} orphans\n";
+  $a = $PKG_LIST{"NotDevelNotRel"};
+  if ($#$a >= 0) {
+    my $cnt = $#$a + 1;
+    print STDERR " - $cnt not available in extras devel or release\n";
+  }
+  $a = $PKG_LIST{"NotDevel"};
+  if ($#$a >= 0) {
+    my $cnt = $#$a + 1;
+    print STDERR " - $cnt packages not available in extras devel ";
+    print STDERR "but present in release\n";
+  }
+  if ($COUNT_LIST{"openInOwners"} > 0) {
+    print STDERR " - $COUNT_LIST{'openInOwners'} packages ",
+      "which have not yet been FE_APPROVE'd...\n";
+  }
+  if ($COUNT_LIST{"extrasNoOwner"} > 0) {
+    print STDERR " - $COUNT_LIST{'extrasNoOwner'} packages present in the ",
+      "development repo which have no owners entry\n";
+  }
+  my @DUP = sort(keys %OWN_DUP);
+  if ($#DUP >= 0) {
+    my $cnt = ($#DUP + 1) / 2;
+    print STDERR " - $cnt packages with duplicated owners entry\n";
+  }
+  $a = $PKG_LIST{"OrphanDevel"};
+  if ($#$a >= 0) {
+    my $cnt = $#$a + 1;
+    print STDERR " - $cnt orphaned packages, yet available in extras devel\n";
+  }
+  $a = $PKG_LIST{"MovedToCore"};
+  if ($#$a >= 0) {
+    my $cnt = $#$a + 1;
+    print STDERR " - $cnt packages that moved to core\n";
+  }
+}
+
 sub checkAcceptClosed {
   my ($BZ) = @_;
   my @BL;
@@ -487,6 +535,29 @@
   }
 }
 
+sub displayAcceptMail {
+  print STDERR "\nFE-ACCEPT packages stats:\n";
+  print STDERR
+    " - $COUNT_LIST{'acceptedClosed'} accepted, closed package reviews\n";
+  if ($COUNT_LIST{"missing"} > 0) {
+    print STDERR
+      " - $COUNT_LIST{'missing'} accepted, closed packages not in repo\n";
+  }
+  if ($COUNT_LIST{"missingOwner"} > 0) {
+    print STDERR
+      " - $COUNT_LIST{'missingOwner'} accepted, closed packages not in owners\n";
+  }
+  if ($COUNT_LIST{"acceptOpenInactive"} >= 0) {
+    print STDERR
+      " - $COUNT_LIST{'acceptOpenInactive'} accepted, open package reviews older than 4 weeks;\n";
+  }
+  if ($COUNT_LIST{"acceptOpenInDevel"} > 0) {
+    print STDERR
+      " - $COUNT_LIST{'acceptOpenInDevel'} accepted, open package reviews ",
+      "with a package already in the repo\n";
+  }
+}
+
 sub checkAcceptOpen {
   my ($BZ) = @_;
   my @BL;
@@ -687,6 +758,25 @@
   }
 }
 
+sub displayNewReviewMail {
+  my ($cur) = @_;
+  print STDERR "\n$cur packages stats:\n";
+  my $cnt = $COUNT_LIST{"open$cur"};
+  print STDERR " - $cnt open tickets\n";
+  if ($COUNT_LIST{"inactive8$cur"} > 0) {
+    $cnt = $COUNT_LIST{"inactive8$cur"};
+    print STDERR " - $cnt tickets with no activity in eight weeks\n";
+  }
+  if ($COUNT_LIST{"inactive4$cur"} > 0) {
+    $cnt = $COUNT_LIST{"inactive4$cur"};
+    print STDERR " - $cnt tickets with no activity in four weeks\n";
+  }
+  if ($COUNT_LIST{"closed$cur"} > 0) {
+    $cnt = $COUNT_LIST{"closed$cur"};
+    print STDERR " - $cnt closed tickets\n";
+  }
+}
+
 sub checkOpenInOwners {
   my ($BZ, $cur) = @_;
   my @BL;



From fedora-extras-commits at redhat.com  Wed Apr 19 09:59:35 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 02:59:35 -0700
Subject: status-report-scripts parseBZbugList,1.12,1.13
Message-ID: <200604190959.k3J9xZfs001709@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1691

Modified Files:
	parseBZbugList 
Log Message:
Fix broken pipe.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- parseBZbugList	19 Apr 2006 09:58:40 -0000	1.12
+++ parseBZbugList	19 Apr 2006 09:59:33 -0000	1.13
@@ -96,6 +96,9 @@
     s/\s.*$//;
     $DISCARD{$_} = 1;
   }
+  while ( <IN> ) {
+    # Read the rest to avoid a broken pipe...
+  }
   close IN;
 }
 if (defined $opt{"o"}) {



From fedora-extras-commits at redhat.com  Wed Apr 19 10:00:10 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 19 Apr 2006 03:00:10 -0700
Subject: rpms/perl-Crypt-RSA - New directory
Message-ID: <200604191000.k3JA0CLl001770@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-RSA
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1749/perl-Crypt-RSA

Log Message:
Directory /cvs/extras/rpms/perl-Crypt-RSA added to the repository




From fedora-extras-commits at redhat.com  Wed Apr 19 10:00:10 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 19 Apr 2006 03:00:10 -0700
Subject: rpms/perl-Crypt-RSA/devel - New directory
Message-ID: <200604191000.k3JA0CYq001773@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-RSA/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1749/perl-Crypt-RSA/devel

Log Message:
Directory /cvs/extras/rpms/perl-Crypt-RSA/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Apr 19 10:00:34 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 19 Apr 2006 03:00:34 -0700
Subject: rpms/perl-Crypt-RSA Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604191000.k3JA0bSN001827@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-RSA
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1794

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Crypt-RSA


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Crypt-RSA
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 19 10:00:35 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 19 Apr 2006 03:00:35 -0700
Subject: rpms/perl-Crypt-RSA/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604191000.k3JA0buk001830@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-RSA/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1794/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Crypt-RSA


--- 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 Apr 19 10:01:22 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 19 Apr 2006 03:01:22 -0700
Subject: rpms/perl-Crypt-RSA/devel perl-Crypt-RSA.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604191001.k3JA1O3W003953@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-RSA/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3912/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Crypt-RSA.spec 
Log Message:
auto-import perl-Crypt-RSA-1.57-2 on branch devel from perl-Crypt-RSA-1.57-2.src.rpm


--- NEW FILE perl-Crypt-RSA.spec ---
Summary:	RSA public-key cryptosystem
Name:		perl-Crypt-RSA
Version:	1.57
Release:	2%{?dist}
License:	GPL or Artistic
Group:		Development/Libraries
Url:		http://search.cpan.org/dist/Crypt-RSA/
Source0:	http://search.cpan.org/CPAN/authors/id/V/VI/VIPUL/Crypt-RSA-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:	noarch
BuildRequires:	perl(Class::Loader)          >= 2.00
BuildRequires:	perl(Convert::ASCII::Armour)
BuildRequires:	perl(Crypt::Random)          >= 0.34
BuildRequires:	perl(Crypt::Primes)          >= 0.38
BuildRequires:	perl(Crypt::CBC)
BuildRequires:	perl(Crypt::Blowfish)
BuildRequires:	perl(Data::Buffer)
BuildRequires:	perl(Digest::MD2)
BuildRequires:	perl(Digest::MD5)
BuildRequires:	perl(Digest::SHA1)
BuildRequires:	perl(Math::Pari)             >= 2.001804
BuildRequires:	perl(Sort::Versions)
BuildRequires:	perl(Tie::EncryptedHash)

%description
Crypt::RSA is a pure-perl, cleanroom implementation of the RSA public-key
cryptosystem. It uses Math::Pari(3), a perl interface to the blazingly fast
PARI library, for big integer arithmetic and number theoretic computations.

Crypt::RSA provides arbitrary size key-pair generation, plaintext-aware
encryption (OAEP) and digital signatures with appendix (PSS). For compatibility
with SSLv3, RSAREF2, PGP and other applications that follow the PKCS #1 v1.5
standard, it also provides PKCS #1 v1.5 encryption and signatures.

%prep
%setup -q -n Crypt-RSA-%{version}

# Remove pointless shellbangs
/usr/bin/find ./lib -name '*.pm' -print | /usr/bin/xargs %{__sed} -i -e '/^#! *\/usr\/bin\/perl /d'

# Convert documentation to UTF-8
/usr/bin/iconv -f iso-8859-1 -t utf-8 -o lib/Crypt/RSA.pm.utf-8 lib/Crypt/RSA.pm
%{__mv} -f lib/Crypt/RSA.pm.utf-8 lib/Crypt/RSA.pm

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
%{__make} %{?_smp_mflags}

%check
%{__make} test

%install
%{__rm} -rf %{buildroot}
%{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
/usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
/usr/bin/find %{buildroot} -type d -depth -exec /bin/rmdir {} 2>/dev/null ';'
%{__chmod} -R u+w %{buildroot}/*

# Additional manpages
/usr/bin/pod2man --section=3 extradocs/crypt-rsa-interoperablity.pod \
	%{buildroot}%{_mandir}/man3/crypt-rsa-interoperablity.3
/usr/bin/pod2man --section=3 extradocs/crypt-rsa-interoperablity-template.pod \
	%{buildroot}%{_mandir}/man3/crypt-rsa-interoperablity-template.3

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,0755)
%doc ARTISTIC Changes README TODO
%{perl_vendorlib}/Crypt/
%{_mandir}/man3/Crypt::RSA.3pm*
%{_mandir}/man3/Crypt::RSA::DataFormat.3pm*
%{_mandir}/man3/Crypt::RSA::Debug.3pm*
%{_mandir}/man3/Crypt::RSA::ES::OAEP.3pm*
%{_mandir}/man3/Crypt::RSA::ES::PKCS1v15.3pm*
%{_mandir}/man3/Crypt::RSA::Errorhandler.3pm*
%{_mandir}/man3/Crypt::RSA::Key.3pm*
%{_mandir}/man3/Crypt::RSA::Key::Private.3pm*
%{_mandir}/man3/Crypt::RSA::Key::Private::SSH.3pm*
%{_mandir}/man3/Crypt::RSA::Key::Public.3pm*
%{_mandir}/man3/Crypt::RSA::Key::Public::SSH.3pm*
%{_mandir}/man3/Crypt::RSA::Primitives.3pm*
%{_mandir}/man3/Crypt::RSA::SS::PKCS1v15.3pm*
%{_mandir}/man3/Crypt::RSA::SS::PSS.3pm*
%{_mandir}/man3/crypt-rsa-interoperablity.3*
%{_mandir}/man3/crypt-rsa-interoperablity-template.3*

%changelog
* Tue Apr 18 2006 Paul Howarth <paul at city-fan.org> 1.57-2
- Fix non-UTF8-encoded manpage (#183888)
- Add manpages for crypt-rsa-interoperablity(3) and
  crypt-rsa-interoperablity-template(3) (#183888)

* Mon Nov 28 2005 Paul Howarth <paul at city-fan.org> 1.57-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-RSA/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Apr 2006 10:00:35 -0000	1.1
+++ .cvsignore	19 Apr 2006 10:01:22 -0000	1.2
@@ -0,0 +1 @@
+Crypt-RSA-1.57.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-RSA/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Apr 2006 10:00:35 -0000	1.1
+++ sources	19 Apr 2006 10:01:22 -0000	1.2
@@ -0,0 +1 @@
+3fd02d3d9e398e26848a0d49bd3b8ccd  Crypt-RSA-1.57.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 19 10:01:19 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 19 Apr 2006 03:01:19 -0700
Subject: rpms/perl-Crypt-RSA import.log,1.1,1.2
Message-ID: <200604191001.k3JA1pq2003966@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Crypt-RSA
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3912

Modified Files:
	import.log 
Log Message:
auto-import perl-Crypt-RSA-1.57-2 on branch devel from perl-Crypt-RSA-1.57-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-RSA/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Apr 2006 10:00:34 -0000	1.1
+++ import.log	19 Apr 2006 10:01:19 -0000	1.2
@@ -0,0 +1 @@
+perl-Crypt-RSA-1_57-2:HEAD:perl-Crypt-RSA-1.57-2.src.rpm:1145440867



From fedora-extras-commits at redhat.com  Wed Apr 19 10:05:03 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 03:05:03 -0700
Subject: status-report-scripts parseBZbugList,1.13,1.14
Message-ID: <200604191005.k3JA53vC004086@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4068

Modified Files:
	parseBZbugList 
Log Message:
Fix some output language.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- parseBZbugList	19 Apr 2006 09:59:33 -0000	1.13
+++ parseBZbugList	19 Apr 2006 10:05:01 -0000	1.14
@@ -337,7 +337,7 @@
   if ($COUNT_LIST{"openInOwners"} > 0) {
     print "\n\n=== Packages that have not yet completed review ===\n";
     print "\nWe have $COUNT_LIST{'openInOwners'} packages ",
-      "which have not yet been FE_APPROVE'd...\n";
+      "which have not yet been FE-APPROVE'd...\n";
     &displayBLWiki($BUG_LIST{"openInOwnersFE-REVIEW"}, \%BZR);
     &displayBLWiki($BUG_LIST{"openInOwnersFE-NEW"}, \%BZN);
   }
@@ -416,7 +416,7 @@
   $a = $PKG_LIST{"NotDevelNotRel"};
   if ($#$a >= 0) {
     my $cnt = $#$a + 1;
-    print STDERR " - $cnt not available in extras devel or release\n";
+    print STDERR " - $cnt packages not available in extras devel or release\n";
   }
   $a = $PKG_LIST{"NotDevel"};
   if ($#$a >= 0) {
@@ -426,7 +426,7 @@
   }
   if ($COUNT_LIST{"openInOwners"} > 0) {
     print STDERR " - $COUNT_LIST{'openInOwners'} packages ",
-      "which have not yet been FE_APPROVE'd...\n";
+      "which have not yet been FE-APPROVE'd...\n";
   }
   if ($COUNT_LIST{"extrasNoOwner"} > 0) {
     print STDERR " - $COUNT_LIST{'extrasNoOwner'} packages present in the ",
@@ -544,11 +544,11 @@
     " - $COUNT_LIST{'acceptedClosed'} accepted, closed package reviews\n";
   if ($COUNT_LIST{"missing"} > 0) {
     print STDERR
-      " - $COUNT_LIST{'missing'} accepted, closed packages not in repo\n";
+      " - $COUNT_LIST{'missing'} accepted, closed package reviews not in repo\n";
   }
   if ($COUNT_LIST{"missingOwner"} > 0) {
     print STDERR
-      " - $COUNT_LIST{'missingOwner'} accepted, closed packages not in owners\n";
+      " - $COUNT_LIST{'missingOwner'} accepted, closed package reviews not in owners\n";
   }
   if ($COUNT_LIST{"acceptOpenInactive"} >= 0) {
     print STDERR



From fedora-extras-commits at redhat.com  Wed Apr 19 10:06:01 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 03:06:01 -0700
Subject: status-report-scripts parseBZbugList,1.14,1.15
Message-ID: <200604191006.k3JA61Zb004121@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4103

Modified Files:
	parseBZbugList 
Log Message:
Add CVS and open bugs checks.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- parseBZbugList	19 Apr 2006 10:05:01 -0000	1.14
+++ parseBZbugList	19 Apr 2006 10:05:58 -0000	1.15
@@ -1,6 +1,11 @@
 #!/usr/bin/env perl
 # $Id$
 
+# Grab BZ tickets through:
+# https://bugzilla.redhat.com/bugzilla/showdependencytree.cgi?id=FE-NEW
+# https://bugzilla.redhat.com/bugzilla/showdependencytree.cgi?id=FE-REVIEW
+# https://bugzilla.redhat.com/bugzilla/showdependencytree.cgi?id=FE-ACCEPT
+
 # TODO stuff
 
 use strict;
@@ -9,7 +14,7 @@
 
 my %opt;
 my @options = ( "help", "core=s", "extras=s", "bzid=s", "o=s", "d=s",
-		"extras_r=s" );
+		"extras_r=s", "cvs=s" );
 
 $main::core
   = "http://mirrors.kernel.org/fedora/core/development/SRPMS/";
@@ -21,6 +26,7 @@
   = "http://fedoraproject.org/wiki/Extras/PackagesNoLongerInDevel";
 $main::bzid
   = "http://fedoraproject.org/wiki/Extras/UsefulScripts?action=AttachFile&do=get&target=bzId_pkg.txt";
+$main::cvsDir = "/export/scratch/extras";
 
 if( ! GetOptions( \%opt, @options ) ) { &usage(); }
 
@@ -30,6 +36,7 @@
 $main::extras_r = $opt{"extras_r"} if defined $opt{"extras_r"};
 $main::discarded = $opt{"d"} if defined $opt{"d"};
 $main::bzid = $opt{"bzid"} if defined $opt{"bzid"};
+$main::cvsDir = $opt{"cvs"} if defined $opt{"cvs"};
 
 &usage() if defined $opt{'help'};
 
@@ -41,6 +48,7 @@
 my %BZS;
 my %BZR;
 my %BZA;
+my %BZB;
 my %CORE;
 my %EXTRAS;
 my %EXTRAS_R;
@@ -48,6 +56,8 @@
 my %NAME;
 my %OWN;
 my %OWN_DUP;
+my %OWN_CVS_RECENT;
+my %CVS_NO_OWNER;
 my %DISCARD;
 my %FC_INTEGRATED;
 my %PKG_LIST;
@@ -134,6 +144,34 @@
 foreach my $k (keys %CORE) {
   $SRPMS{$k} = 1;
 }
+# Take a look at CVS stuff
+if (-d $main::cvsDir) {
+  $main::cvsDir =~ s/\/+$//;
+  my $f = "/tmp/tstmp_$$";
+  system "touch -d '12 weeks ago' $f";
+  my $cmd = "find $main::cvsDir -name CVS -prune -o -type f -newer $f -print "
+    . "| sed 's|^$main::cvsDir/||;s|/.*||'|sort -u";
+  local *IN;
+  open IN, "$cmd |" or die "Couldn't launch find command in CVS: $!";
+  while ( <IN> ) {
+    s/\s+$//;
+    next unless defined $OWN{$_};
+    $OWN_CVS_RECENT{$_} = 1;
+  }
+  close IN;
+  unlink $f;
+  my @PL;
+  $cmd = "find $main::cvsDir -type d -name devel -print "
+    . "| sed 's|^$main::cvsDir/||;s|/.*||'";
+  open IN, "$cmd |" or die "Couldn't launch find command in CVS: $!";
+  while ( <IN> ) {
+    s/\s+$//;
+    $COUNT_LIST{"CVS"} += 1;
+    next if defined $OWN{$_};
+    $CVS_NO_OWNER{$_} = 1;
+  }
+  close IN;
+}
 while ( <> ) {
   s/[,\n]+$//;
   my @F = split /,/;
@@ -153,33 +191,36 @@
     if ($F[0] ne "bug_id"
 	|| $F[1] ne "\"opendate\""
 	|| $F[2] ne "\"changeddate\""
-	|| $F[3] ne "\"assigned_to\""
-	|| $F[4] ne "\"reporter\""
-	|| $F[5] ne "\"bug_status\""
-	|| $F[6] ne "\"resolution\""
-	|| $F[7] ne "\"blockedby\""
-	|| $F[8] ne "\"short_desc\"") {
+	|| $F[3] ne "\"bug_severity\""
+	|| $F[4] ne "\"assigned_to\""
+	|| $F[5] ne "\"reporter\""
+	|| $F[6] ne "\"bug_status\""
+	|| $F[7] ne "\"resolution\""
+	|| $F[8] ne "\"component\""
+	|| $F[9] ne "\"blockedby\""
+	|| $F[10] ne "\"short_desc\"") {
       die "Bad header: $_";
     }
     next;
   }
-  $F[7] =~ s/["{}]//g;
+  $F[9] =~ s/["{}]//g;
   $F[1] =~ s/["]//g;
   $F[2] =~ s/["]//g;
+  $F[8] =~ s/["]//g;
   $F[1] = ParseDate($F[1]);
   $F[2] = ParseDate($F[2]);
-  my @B = split /,/, $F[7];
-  next if $F[8] =~ /TESTING-BUGSPAM/;
-  $F[9] = $F[8];
-  $F[9] =~ s/^["]+//;
-  $F[9] =~ s/["]+$//;
+  my @B = split /,/, $F[9];
+  next if $F[10] =~ /TESTING-BUGSPAM/;
+  $F[11] = $F[10];
+  $F[11] =~ s/^["]+//;
+  $F[11] =~ s/["]+$//;
   if (defined $NAME{$F[0]}) {
-    $F[8] = $NAME{$F[0]};
-  } else {
+    $F[10] = $NAME{$F[0]};
+  } elsif ($F[8] eq "Package Review") {
     # Try to guess package name
-    $F[8] =~ s/["]//g;
-    $F[8] =~ s/^review\s+request:?\s+<?//i;
-    $F[8] =~ s/[:.,>]?\s.*$//g;
+    $F[10] =~ s/["]//g;
+    $F[10] =~ s/^review\s+request:?\s+<?//i;
+    $F[10] =~ s/[:.,>]?\s.*$//g;
   }
   my $block = 0;
   my $sponsor = 0;
@@ -210,7 +251,14 @@
     if ($sponsor == 1 && $bzb == \%BZN) {
       $BZS{$F[0]} = \@F;
     }
+    next;
   }
+  if (defined $OWN{$F[8]}) {
+    $COUNT_LIST{"openOPEN-BUGS"} += 1;
+    $BZB{$F[0]} = \@F;
+    next;
+  }
+  print STDERR "Not handled: ", join(" ", @F), "\n";
 }
 &checkOpenInOwners(\%BZR, "FE-REVIEW");
 &checkOpenInOwners(\%BZN, "FE-NEW");
@@ -229,6 +277,8 @@
 #&checkNoActivity(\%BZN, "FE-NEW");
 &countOpen(\%BZS, "FE-NEEDSPONSOR");
 &checkLowActivity(\%BZS, "FE-NEEDSPONSOR");
+&checkLowCVSActivity();
+&checkLowActivity(\%BZB, "OPEN-BUGS");
 print "[[TableOfContents]]\n\n= FE Package Status of ",
   &UnixDate("today", "%b %e, %Y"), " =\n";
 &displayOwnersWiki;
@@ -236,6 +286,8 @@
 &displayNewReviewWiki(\%BZR, "FE-REVIEW");
 &displayNewReviewWiki(\%BZN, "FE-NEW");
 &displayNewReviewWiki(\%BZS, "FE-NEEDSPONSOR");
+&displayNewReviewWiki(\%BZB, "OPEN-BUGS");
+&displayCVSWiki();
 print "----\nCategoryExtras\n";
 print STDERR "\n\nFE Package Status of ",
   &UnixDate("today", "%b %e, %Y"), "\n";
@@ -246,6 +298,8 @@
 &displayNewReviewMail("FE-REVIEW");
 &displayNewReviewMail("FE-NEW");
 &displayNewReviewMail("FE-NEEDSPONSOR");
+&displayNewReviewMail("OPEN-BUGS");
+&displayCVSMail();
 
 exit 0;
 
@@ -455,27 +509,27 @@
   my @BLO;
   foreach my $b (sort(keys %$BZ)) {
     my $a = $BZ->{$b};
-    next unless $$a[5] eq "\"CLOSED\"";
-    my $pkg = $$a[8];
+    next unless $$a[6] eq "\"CLOSED\"";
+    my $pkg = $$a[10];
     unless ($SRPMS{$pkg} == 1 || defined($OWN{$pkg})) {
       $pkg =~ s/-[^-]+-[^-]+$//;
     }
     unless ($SRPMS{$pkg} == 1 || defined($OWN{$pkg})) {
-      $pkg = $$a[8];
+      $pkg = $$a[10];
       $pkg =~ s/-[^-]+$//;
     }
     unless ($SRPMS{$pkg} == 1 || defined($OWN{$pkg})) {
-      $pkg = lc $$a[8];
+      $pkg = lc $$a[10];
       unless ($SRPMS{$pkg} == 1 || defined($OWN{$pkg})) {
 	$pkg =~ s/-[^-]+-[^-]+$//;
       }
     }
     unless ($SRPMS{$pkg} == 1 || defined($OWN{$pkg})) {
-      $pkg = lcfirst $$a[8];
+      $pkg = lcfirst $$a[10];
     }
     if ($SRPMS{$pkg} == 1) {
-      $BZREV_CNT{$$a[3]} += 1;
-      $BZOWN_CNT{$$a[4]} += 1;
+      $BZREV_CNT{$$a[4]} += 1;
+      $BZOWN_CNT{$$a[5]} += 1;
       $COUNT_LIST{"acceptedClosed"} += 1;
       if (!defined($CORE{$pkg}) && !defined($OWN{$pkg})) {
 	push @BLO, $b;
@@ -488,8 +542,8 @@
 	$COUNT_LIST{"missing"} += 1;
       }
       if (defined $OWN{$pkg}) {
-	$BZREV_CNT{$$a[3]} += 1;
-	$BZOWN_CNT{$$a[4]} += 1;
+	$BZREV_CNT{$$a[4]} += 1;
+	$BZOWN_CNT{$$a[5]} += 1;
 	$COUNT_LIST{"acceptedClosed"} += 1;
       } else {
 	push @BLO, $b;
@@ -567,13 +621,13 @@
   my @LATE;
   foreach my $b (sort(keys %$BZ)) {
     my $a = $BZ->{$b};
-    next if $$a[5] eq "\"CLOSED\"";
-    my $pkg = $$a[8];
+    next if $$a[6] eq "\"CLOSED\"";
+    my $pkg = $$a[10];
     unless ($SRPMS{$pkg} == 1) {
-      $pkg = lc $$a[8];
+      $pkg = lc $$a[10];
     }
     unless ($SRPMS{$pkg} == 1) {
-      $pkg = lcfirst $$a[8];
+      $pkg = lcfirst $$a[10];
     }
     if ($SRPMS{$pkg} == 1) {
       $COUNT_LIST{"acceptOpenInDevel"} += 1;
@@ -592,7 +646,7 @@
   my ($BZ, $cur) = @_;
   foreach my $b (sort(keys %$BZ)) {
     my $a = $BZ->{$b};
-    next if $$a[5] eq "\"CLOSED\"";
+    next if $$a[6] eq "\"CLOSED\"";
     $COUNT_LIST{"open$cur"} += 1;
   }
 }
@@ -602,7 +656,7 @@
   my @BL;
   foreach my $b (sort(keys %$BZ)) {
     my $a = $BZ->{$b};
-    next unless $$a[5] eq "\"CLOSED\"";
+    next unless $$a[6] eq "\"CLOSED\"";
     push @BL, $b;
   }
   $COUNT_LIST{"closed$cur"} = $#BL + 1;
@@ -615,7 +669,7 @@
   my @LATE;
   foreach my $b (sort(keys %$BZ)) {
     my $a = $BZ->{$b};
-    next if $$a[5] eq "\"CLOSED\"";
+    next if $$a[6] eq "\"CLOSED\"";
     if (Date_Cmp($$a[2], $fourWeeksAgo) < 0) {
       if (Date_Cmp($$a[2], $eightWeeksAgo) < 0) {
 	push @LATE, $b;
@@ -635,7 +689,7 @@
 #  my @BL;
 #  foreach my $b (sort(keys %$BZ)) {
 #    my $a = $BZ->{$b};
-#    next if $$a[5] eq "\"CLOSED\"";
+#    next if $$a[6] eq "\"CLOSED\"";
 #    next if $$a[1] ne $$a[2];
 #    if (Date_Cmp($$a[2], $eightWeeksAgo) < 0) {
 #      push @BL, $b;
@@ -662,7 +716,8 @@
                   [$main::core]
   -d <url>        list of migrated/discarded packages
                   [$main::discarded]
-  -o <file>       owners.list file\n";
+  -o <file>       owners.list file
+  -cvs <dir>      extras CVS directory [$main::cvsDir]\n";
   exit 1;
 }
 
@@ -703,8 +758,8 @@
     join(",", @$BL), "\n";
   foreach my $b (@$BL) {
     my $a = $BZ->{$b};
-    my ($owner) = $$a[4] =~ /^.([^@]+)/;
-    printf "  %-40s %s\n", $$a[8], $owner;
+    my ($owner) = $$a[5] =~ /^.([^@]+)/;
+    printf "  %-40s %s\n", $$a[10], $owner;
   }
 }
 
@@ -713,11 +768,11 @@
   my %O;
   foreach my $b (@$BL) {
     my $a = $BZ->{$b};
-    my $e = $O{$$a[4]};
+    my $e = $O{$$a[5]};
     if (defined $e) {
       push @$e, $a;
     } else {
-      $O{$$a[4]} = [ $a ];
+      $O{$$a[5]} = [ $a ];
     }
   }
   foreach my $n (sort(keys %O)) {
@@ -726,9 +781,9 @@
     $n =~ s/\@/ at /;
     $n =~ s/\./ dot /g;
     foreach my $a (@$e) {
-      print "||$n||`$$a[8]`||[";
+      print "||$n||`$$a[10]`||[";
       print "https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=$$a[0] $$a[0]";
-      print "]||$$a[9]||\n";
+      print "]||$$a[11]||\n";
     }
   }
 }
@@ -785,11 +840,54 @@
   my @BL;
   foreach my $b (sort(keys %$BZ)) {
     my $a = $BZ->{$b};
-    next if $$a[5] eq "\"CLOSED\"";
-    next unless defined $OWN{$$a[8]};
-    delete $OWN{$$a[8]};
+    next if $$a[6] eq "\"CLOSED\"";
+    next unless defined $OWN{$$a[10]};
+    delete $OWN{$$a[10]};
     push @BL, $b;
   }
   $COUNT_LIST{"openInOwners"} += $#BL + 1;
   $BUG_LIST{"openInOwners$cur"} = \@BL;
 }
+
+sub checkLowCVSActivity {
+  my @PL;
+  foreach my $k (keys %OWN) {
+    next if defined $OWN_CVS_RECENT{$k};
+    push @PL, $k;
+  }
+  $COUNT_LIST{"lowCVSActivity"} = $#PL + 1;
+  $PKG_LIST{"lowCVSActivity"} = \@PL;
+}
+
+sub displayCVSWiki {
+  print "\n\n== About CVS repository ==\n\n";
+  print "\n\n=== Package count ===\n";
+  print "\nWe have $COUNT_LIST{'CVS'} packages with a devel directory\n";
+  my @A = sort(keys %CVS_NO_OWNER);
+  if ($#A >= 0) {
+    my $cnt = $#A + 1;
+    print "\n=== Packages in CVS with no entry in the owners.list ===\n";
+    print "\nWe have $cnt packages in CVS with no owners entry:{{{\n";
+    print join("\n", @A), "}}}\n";
+  }
+  if ($COUNT_LIST{"lowCVSActivity"} > 0) {
+    print "\n=== Packages not touched in the last 12 weeks ===\n";
+    print "\nWe have $COUNT_LIST{'lowCVSActivity'} packages with no CVS ",
+      "activity in the last 12 weeks:\n";
+    &displayPkgListByOwnerWiki($PKG_LIST{"lowCVSActivity"});
+  }
+}
+
+sub displayCVSMail {
+  print STDERR "\nCVS stats:\n";
+  print STDERR " - $COUNT_LIST{'CVS'} packages with a devel directory\n";
+  my @A = keys %CVS_NO_OWNER;
+  if ($#A >= 0) {
+    my $cnt = $#A + 1;
+    print STDERR " - $cnt packages with no owners entry\n";
+  }
+  if ($COUNT_LIST{"lowCVSActivity"} > 0) {
+    print STDERR " - $COUNT_LIST{'lowCVSActivity'} packages with no CVS ",
+      "activity in the last 12 weeks\n";
+  }
+}



From fedora-extras-commits at redhat.com  Wed Apr 19 10:06:29 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 19 Apr 2006 03:06:29 -0700
Subject: owners owners.list,1.858,1.859
Message-ID: <200604191006.k3JA6Vlg004155@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4132

Modified Files:
	owners.list 
Log Message:
perl-Crypt-RSA



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.858
retrieving revision 1.859
diff -u -r1.858 -r1.859
--- owners.list	18 Apr 2006 18:41:24 -0000	1.858
+++ owners.list	19 Apr 2006 10:06:29 -0000	1.859
@@ -913,6 +913,7 @@
 Fedora Extras|perl-Crypt-DSA|Perl module for DSA signatures and key generation|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Crypt-Primes|Provable prime number generator for cryptographic applications|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Crypt-Random|Cryptographically Secure, True Random Number Generator|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Crypt-RSA|RSA public-key cryptosystem|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Crypt-SmbHash|Pure-perl Lanman and NT MD4 hash functions|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Data-Buffer|Read/write buffer class for perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Data-HexDump|Hexadecial Dumper|andreas at bawue.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Wed Apr 19 10:06:51 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 03:06:51 -0700
Subject: status-report-scripts parseBZbugList,1.15,1.16
Message-ID: <200604191006.k3JA6pmx004183@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4163

Modified Files:
	parseBZbugList 
Log Message:
Fix some display things.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- parseBZbugList	19 Apr 2006 10:05:58 -0000	1.15
+++ parseBZbugList	19 Apr 2006 10:06:48 -0000	1.16
@@ -221,6 +221,8 @@
     $F[10] =~ s/["]//g;
     $F[10] =~ s/^review\s+request:?\s+<?//i;
     $F[10] =~ s/[:.,>]?\s.*$//g;
+  } else {
+    $F[10] = $F[8];
   }
   my $block = 0;
   my $sponsor = 0;
@@ -283,10 +285,10 @@
   &UnixDate("today", "%b %e, %Y"), " =\n";
 &displayOwnersWiki;
 &displayAcceptWiki(\%BZA);
-&displayNewReviewWiki(\%BZR, "FE-REVIEW");
-&displayNewReviewWiki(\%BZN, "FE-NEW");
-&displayNewReviewWiki(\%BZS, "FE-NEEDSPONSOR");
-&displayNewReviewWiki(\%BZB, "OPEN-BUGS");
+&displayNewReviewWiki(\%BZR, "FE-REVIEW", 5);
+&displayNewReviewWiki(\%BZN, "FE-NEW", 5);
+&displayNewReviewWiki(\%BZS, "FE-NEEDSPONSOR", 5);
+&displayNewReviewWiki(\%BZB, "OPEN-BUGS", 4);
 &displayCVSWiki();
 print "----\nCategoryExtras\n";
 print STDERR "\n\nFE Package Status of ",
@@ -392,8 +394,8 @@
     print "\n\n=== Packages that have not yet completed review ===\n";
     print "\nWe have $COUNT_LIST{'openInOwners'} packages ",
       "which have not yet been FE-APPROVE'd...\n";
-    &displayBLWiki($BUG_LIST{"openInOwnersFE-REVIEW"}, \%BZR);
-    &displayBLWiki($BUG_LIST{"openInOwnersFE-NEW"}, \%BZN);
+    &displayBLWiki($BUG_LIST{"openInOwnersFE-REVIEW"}, \%BZR, 5);
+    &displayBLWiki($BUG_LIST{"openInOwnersFE-NEW"}, \%BZN, 5);
   }
   if ($COUNT_LIST{"extrasNoOwner"} > 0) {
     print "\n\n=== Packages missing in owners.list ===\n";
@@ -572,23 +574,23 @@
   if ($COUNT_LIST{"missing"} > 0) {
     print "\nWe have $COUNT_LIST{'missing'} accepted, closed packages where I'm unable to ",
       "find the package in the development repo:\n";
-    &displayBLWiki($BUG_LIST{"acceptedNoDevel"}, $BZ);
+    &displayBLWiki($BUG_LIST{"acceptedNoDevel"}, $BZ, 5);
   }
   if ($COUNT_LIST{"missingOwner"} > 0) {
     print "\nWe have $COUNT_LIST{'missingOwner'} accepted, closed packages where I'm unable to ",
       "find the package in the owners file:\n";
-    &displayBLWiki($BUG_LIST{"acceptedNoOwn"}, $BZ);
+    &displayBLWiki($BUG_LIST{"acceptedNoOwn"}, $BZ, 5);
   }
   if ($COUNT_LIST{"acceptOpenInactive"} >= 0) {
     print "\n\n=== Inactivity notice ===\n";
     print "\nWe have $COUNT_LIST{'acceptOpenInactive'} accepted, open package reviews older than 4 weeks\n";
-    &displayBLWiki($BUG_LIST{"acceptOpenInactive"}, $BZ);
+    &displayBLWiki($BUG_LIST{"acceptOpenInactive"}, $BZ, 5);
   }
   if ($COUNT_LIST{"acceptOpenInDevel"} > 0) {
     print "\n\n=== Some cleanup needed ===\n";
     print "\nWe have $COUNT_LIST{'acceptOpenInDevel'} accepted, open package reviews where the package ",
       "appears to already be in the repo...\n";
-    &displayBLWiki($BUG_LIST{"acceptOpenInDevel"}, $BZ);
+    &displayBLWiki($BUG_LIST{"acceptOpenInDevel"}, $BZ, 5);
   }
 }
 
@@ -764,15 +766,15 @@
 }
 
 sub displayBLWiki {
-  my ($BL, $BZ) = @_;
+  my ($BL, $BZ, $field) = @_;
   my %O;
   foreach my $b (@$BL) {
     my $a = $BZ->{$b};
-    my $e = $O{$$a[5]};
+    my $e = $O{$$a[$field]};
     if (defined $e) {
       push @$e, $a;
     } else {
-      $O{$$a[5]} = [ $a ];
+      $O{$$a[$field]} = [ $a ];
     }
   }
   foreach my $n (sort(keys %O)) {
@@ -789,7 +791,7 @@
 }
 
 sub displayNewReviewWiki {
-  my ($BZ, $cur) = @_;
+  my ($BZ, $cur, $field) = @_;
   print "\n\n== About $cur packages ==\n";
   print "\n\n=== Open ticket count ===\n";
   my $cnt = $COUNT_LIST{"open$cur"};
@@ -800,19 +802,19 @@
     if ($COUNT_LIST{"inactive8$cur"} > 0) {
       $cnt = $COUNT_LIST{"inactive8$cur"};
       print "\nWe have $cnt $cur tickets with no activity in eight weeks\n";
-      &displayBLWiki($BUG_LIST{"inactive8$cur"}, $BZ);
+      &displayBLWiki($BUG_LIST{"inactive8$cur"}, $BZ, $field);
     }
     if ($COUNT_LIST{"inactive4$cur"} > 0) {
       $cnt = $COUNT_LIST{"inactive4$cur"};
       print "\nWe have $cnt $cur tickets with no activity in four weeks\n";
-      &displayBLWiki($BUG_LIST{"inactive4$cur"}, $BZ);
+      &displayBLWiki($BUG_LIST{"inactive4$cur"}, $BZ, $field);
     }
   }
   if ($COUNT_LIST{"closed$cur"} > 0) {
     print "\n\n=== Some cleanup needed ===\n";
     $cnt = $COUNT_LIST{"closed$cur"};
     print "\nWe have $cnt closed tickets still blocking $cur\n";
-    &displayBLWiki($BUG_LIST{"closed$cur"}, $BZ);
+    &displayBLWiki($BUG_LIST{"closed$cur"}, $BZ, $field);
   }
 }
 



From fedora-extras-commits at redhat.com  Wed Apr 19 10:07:37 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 03:07:37 -0700
Subject: status-report-scripts parseBZbugList,1.16,1.17
Message-ID: <200604191007.k3JA7bUw004260@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4242

Modified Files:
	parseBZbugList 
Log Message:
Add FC_INTEGRATED to all SRPMS.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- parseBZbugList	19 Apr 2006 10:06:48 -0000	1.16
+++ parseBZbugList	19 Apr 2006 10:07:34 -0000	1.17
@@ -144,6 +144,9 @@
 foreach my $k (keys %CORE) {
   $SRPMS{$k} = 1;
 }
+foreach my $k (keys %FC_INTEGRATED) {
+  $SRPMS{$k} = 1;
+}
 # Take a look at CVS stuff
 if (-d $main::cvsDir) {
   $main::cvsDir =~ s/\/+$//;



From fedora-extras-commits at redhat.com  Wed Apr 19 10:08:17 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 03:08:17 -0700
Subject: status-report-scripts parseBZbugList,1.17,1.18
Message-ID: <200604191008.k3JA8Hqj004293@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4275

Modified Files:
	parseBZbugList 
Log Message:
Add FE-LEGAL.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- parseBZbugList	19 Apr 2006 10:07:34 -0000	1.17
+++ parseBZbugList	19 Apr 2006 10:08:14 -0000	1.18
@@ -44,8 +44,10 @@
 my $FE_REVIEW = 163778;
 my $FE_ACCEPT = 163779;
 my $FE_NEEDSPONSOR = 177841;
+my $FE_LEGAL = 182235;
 my %BZN;
 my %BZS;
+my %BZL;
 my %BZR;
 my %BZA;
 my %BZB;
@@ -229,6 +231,7 @@
   }
   my $block = 0;
   my $sponsor = 0;
+  my $legal = 0;
   my $bzb;
   foreach my $b (@B) {
     if ($b == $FE_NEW) {
@@ -246,6 +249,9 @@
     if ($b == $FE_NEEDSPONSOR) {
       $sponsor = 1;
     }
+    if ($b == $FE_LEGAL) {
+      $legal = 1;
+    }
   }
   if ($block > 1) {
     print "Warning: bug $F[0] blocks several FE_ blockers.\n";
@@ -256,6 +262,9 @@
     if ($sponsor == 1 && $bzb == \%BZN) {
       $BZS{$F[0]} = \@F;
     }
+    if ($legal == 1 && $bzb == \%BZN) {
+      $BZL{$F[0]} = \@F;
+    }
     next;
   }
   if (defined $OWN{$F[8]}) {
@@ -282,6 +291,8 @@
 #&checkNoActivity(\%BZN, "FE-NEW");
 &countOpen(\%BZS, "FE-NEEDSPONSOR");
 &checkLowActivity(\%BZS, "FE-NEEDSPONSOR");
+&countOpen(\%BZL, "FE-LEGAL");
+&checkLowActivity(\%BZL, "FE-LEGAL");
 &checkLowCVSActivity();
 &checkLowActivity(\%BZB, "OPEN-BUGS");
 print "[[TableOfContents]]\n\n= FE Package Status of ",
@@ -291,6 +302,7 @@
 &displayNewReviewWiki(\%BZR, "FE-REVIEW", 5);
 &displayNewReviewWiki(\%BZN, "FE-NEW", 5);
 &displayNewReviewWiki(\%BZS, "FE-NEEDSPONSOR", 5);
+&displayNewReviewWiki(\%BZL, "FE-LEGAL", 5);
 &displayNewReviewWiki(\%BZB, "OPEN-BUGS", 4);
 &displayCVSWiki();
 print "----\nCategoryExtras\n";



From fedora-extras-commits at redhat.com  Wed Apr 19 10:09:14 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 03:09:14 -0700
Subject: status-report-scripts parseBZbugList,1.18,1.19
Message-ID: <200604191009.k3JA9Eeb004322@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4304

Modified Files:
	parseBZbugList 
Log Message:
Start to add more owner info.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- parseBZbugList	19 Apr 2006 10:08:14 -0000	1.18
+++ parseBZbugList	19 Apr 2006 10:09:12 -0000	1.19
@@ -66,7 +66,7 @@
 my %BUG_LIST;
 my %OWNER_LIST;
 my %COUNT_LIST;
-my %OWNER_CNT;
+my %OWNER_STAT;
 my %BZOWN_CNT;
 my %BZREV_CNT;
 if ($main::bzid ne "") {
@@ -360,7 +360,15 @@
       push @OE, $k if defined $EXTRAS{$k};
       next;
     }
-    $OWNER_CNT{$$a[3]} += 1;
+    my $s = $OWNER_STAT{$$a[3]};
+    if (defined $s) {
+      $$s[0] += 1;
+    } else {
+      # We have pkg_cnt, open_bugs, touched_pkgs
+      $OWNER_STAT{$$a[3]} = [ 1, 0, 0 ];
+      $s = $OWNER_STAT{$$a[3]};
+    }
+    $$s[2] = 1 unless defined $OWN_CVS_RECENT{$k};
     unless (defined $EXTRAS{$k}) {
       if (defined($CORE{$k}) || defined($FC_INTEGRATED{$k})) {
 	push @NPC, $k;
@@ -373,7 +381,11 @@
       }
     }
   }
-  my @TO = sort {$OWNER_CNT{$b} <=> $OWNER_CNT{$a}} keys %OWNER_CNT;
+  my @TO = sort {
+    my $ca = $OWNER_STAT{$a};
+    my $cb = $OWNER_STAT{$b};
+    $$cb[0] <=> $$ca[0];
+  } keys %OWNER_STAT;
   $COUNT_LIST{"owner"} = $cnt;
   $COUNT_LIST{"orphan"} = $orphan;
   $OWNER_LIST{"package"} = \@TO;
@@ -390,7 +402,7 @@
   print "There are $COUNT_LIST{'orphan'} orphans.\n";
   print "\n=== Top 10 package owners ===\n";
   my $a = $OWNER_LIST{"package"};
-  &displayOwnerCntWiki($a, \%OWNER_CNT);
+  &displayOwnerCntWiki($a, \%OWNER_STAT);
   print "\n=== Packages not present in the development repo ===\n";
   $a = $PKG_LIST{"NotDevelNotRel"};
   if ($#$a >= 0) {
@@ -453,7 +465,8 @@
     $n =~ s/["]//g;
     $n =~ s/\@/ at /;
     $n =~ s/\./ dot /g;
-    print "||$n||$c->{$$a[$i]}||\n";
+    my $aa = $c->{$$a[$i]};
+    print "||$n||$$aa[0]||\n";
   }
 }
 



From fedora-extras-commits at redhat.com  Wed Apr 19 10:10:09 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 03:10:09 -0700
Subject: status-report-scripts parseBZbugList,1.19,1.20
Message-ID: <200604191010.k3JAA9sq004351@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4333

Modified Files:
	parseBZbugList 
Log Message:
Add more maintainer info.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- parseBZbugList	19 Apr 2006 10:09:12 -0000	1.19
+++ parseBZbugList	19 Apr 2006 10:10:06 -0000	1.20
@@ -45,6 +45,7 @@
 my $FE_ACCEPT = 163779;
 my $FE_NEEDSPONSOR = 177841;
 my $FE_LEGAL = 182235;
+my $extras_orphan = 'extras-orphan at fedoraproject.org';
 my %BZN;
 my %BZS;
 my %BZL;
@@ -64,6 +65,7 @@
 my %FC_INTEGRATED;
 my %PKG_LIST;
 my %BUG_LIST;
+my %MAINT_LIST;
 my %OWNER_LIST;
 my %COUNT_LIST;
 my %OWNER_STAT;
@@ -121,6 +123,7 @@
     next if /^#/;
     s/\s+$//;
     my @F = split /\|/;
+    next if $F[1] eq "";
     if (defined $DISCARD{$F[1]}) {
       $DISCARD{$F[1]} += 1;
       next;
@@ -172,7 +175,7 @@
   while ( <IN> ) {
     s/\s+$//;
     $COUNT_LIST{"CVS"} += 1;
-    next if defined $OWN{$_};
+    next if defined($OWN{$_}) || defined($DISCARD{$_});
     $CVS_NO_OWNER{$_} = 1;
   }
   close IN;
@@ -293,8 +296,9 @@
 &checkLowActivity(\%BZS, "FE-NEEDSPONSOR");
 &countOpen(\%BZL, "FE-LEGAL");
 &checkLowActivity(\%BZL, "FE-LEGAL");
-&checkLowCVSActivity();
 &checkLowActivity(\%BZB, "OPEN-BUGS");
+&checkBugs(\%BZB);
+&checkMaintainers();
 print "[[TableOfContents]]\n\n= FE Package Status of ",
   &UnixDate("today", "%b %e, %Y"), " =\n";
 &displayOwnersWiki;
@@ -305,6 +309,7 @@
 &displayNewReviewWiki(\%BZL, "FE-LEGAL", 5);
 &displayNewReviewWiki(\%BZB, "OPEN-BUGS", 4);
 &displayCVSWiki();
+&displayMaintainersWiki();
 print "----\nCategoryExtras\n";
 print STDERR "\n\nFE Package Status of ",
   &UnixDate("today", "%b %e, %Y"), "\n";
@@ -317,6 +322,7 @@
 &displayNewReviewMail("FE-NEEDSPONSOR");
 &displayNewReviewMail("OPEN-BUGS");
 &displayCVSMail();
+&displayMaintainersMail();
 
 exit 0;
 
@@ -351,24 +357,26 @@
       }
     }
   }
+  $OWNER_STAT{$extras_orphan} = [ 0, 0, 0, 0, {} ];
   foreach my $k (keys %OWN) {
     my $a = $OWN{$k};
     next if $$a[0] ne "Fedora Extras";
     $cnt += 1;
-    if ($$a[3] eq 'extras-orphan at fedoraproject.org') {
-      $orphan += 1;
-      push @OE, $k if defined $EXTRAS{$k};
-      next;
-    }
     my $s = $OWNER_STAT{$$a[3]};
     if (defined $s) {
       $$s[0] += 1;
     } else {
-      # We have pkg_cnt, open_bugs, touched_pkgs
-      $OWNER_STAT{$$a[3]} = [ 1, 0, 0 ];
+      # We have pkg_cnt, open_bugs, touched_pkgs, touched_bugs, bugs_hash
+      $OWNER_STAT{$$a[3]} = [ 1, 0, 0, 0, {} ];
       $s = $OWNER_STAT{$$a[3]};
     }
-    $$s[2] = 1 unless defined $OWN_CVS_RECENT{$k};
+    if ($$a[3] eq $extras_orphan) {
+      $orphan += 1;
+      push @OE, $k if defined $EXTRAS{$k};
+      next;
+    } else {
+      $$s[2] = 1 if defined $OWN_CVS_RECENT{$k};
+    }
     unless (defined $EXTRAS{$k}) {
       if (defined($CORE{$k}) || defined($FC_INTEGRATED{$k})) {
 	push @NPC, $k;
@@ -401,10 +409,9 @@
   print "We have $COUNT_LIST{'owner'} extras packages in owners file.[[BR]]\n";
   print "There are $COUNT_LIST{'orphan'} orphans.\n";
   print "\n=== Top 10 package owners ===\n";
-  my $a = $OWNER_LIST{"package"};
-  &displayOwnerCntWiki($a, \%OWNER_STAT);
+  &displayOwnerCntWiki($OWNER_LIST{"package"}, \%OWNER_STAT, 0);
   print "\n=== Packages not present in the development repo ===\n";
-  $a = $PKG_LIST{"NotDevelNotRel"};
+  my $a = $PKG_LIST{"NotDevelNotRel"};
   if ($#$a >= 0) {
     my $cnt = $#$a + 1;
     print "\nWe have $cnt packages not available in extras devel or release:\n";
@@ -459,15 +466,17 @@
 }
 
 sub displayOwnerCntWiki {
-  my ($a, $c) = @_;
+  my ($a, $c, $aref) = @_;
   for my $i (0 .. 9) {
     my $n = $$a[$i];
     $n =~ s/["]//g;
     $n =~ s/\@/ at /;
     $n =~ s/\./ dot /g;
     my $aa = $c->{$$a[$i]};
-    print "||$n||$$aa[0]||\n";
+    $aa = $$aa[$aref] if defined $aref;
+    print "||$n||$aa||\n";
   }
+  print "\n";
 }
 
 sub displayPkgListByOwnerWiki {
@@ -595,9 +604,9 @@
   print "\n\n=== Package count ===\n";
   print "\nWe have $COUNT_LIST{'acceptedClosed'} accepted, closed package reviews\n";
   print "\n=== Top 10 BZ review requests submitters ===\n";
-  &displayOwnerCntWiki($OWNER_LIST{"BZOwner"}, \%BZOWN_CNT);
+  &displayOwnerCntWiki($OWNER_LIST{"BZOwner"}, \%BZOWN_CNT, undef);
   print "\n=== Top 10 BZ review requests reviewers ===\n";
-  &displayOwnerCntWiki($OWNER_LIST{"BZReviewer"}, \%BZREV_CNT);
+  &displayOwnerCntWiki($OWNER_LIST{"BZReviewer"}, \%BZREV_CNT, undef);
   print "\n\n=== Potential problems ===\n";
   if ($COUNT_LIST{"missing"} > 0) {
     print "\nWe have $COUNT_LIST{'missing'} accepted, closed packages where I'm unable to ",
@@ -674,7 +683,7 @@
 
 sub countOpen {
   my ($BZ, $cur) = @_;
-  foreach my $b (sort(keys %$BZ)) {
+  foreach my $b (keys %$BZ) {
     my $a = $BZ->{$b};
     next if $$a[6] eq "\"CLOSED\"";
     $COUNT_LIST{"open$cur"} += 1;
@@ -879,14 +888,25 @@
   $BUG_LIST{"openInOwners$cur"} = \@BL;
 }
 
-sub checkLowCVSActivity {
+sub checkMaintainers {
   my @PL;
-  foreach my $k (keys %OWN) {
-    next if defined $OWN_CVS_RECENT{$k};
-    push @PL, $k;
+  my @BL;
+  my @O = keys %OWNER_STAT;
+  foreach my $k (@O) {
+    my $a = $OWNER_STAT{$k};
+    #next unless $$a[2] == 0 && $$a[3] == 0;
+    next unless $$a[2] == 0;
+    if ($$a[1] > 0) {
+      push @BL, $k;
+    } else {
+      push @PL, $k;
+    }
   }
-  $COUNT_LIST{"lowCVSActivity"} = $#PL + 1;
-  $PKG_LIST{"lowCVSActivity"} = \@PL;
+  $MAINT_LIST{"bugs"} = \@BL;
+  $MAINT_LIST{"packages"} = \@PL;
+  $COUNT_LIST{'maintainers'} = $#O + 1;
+  $COUNT_LIST{'maintbugs'} = $#BL + 1;
+  $COUNT_LIST{'maintpkg'} = $#PL + 1;
 }
 
 sub displayCVSWiki {
@@ -900,12 +920,6 @@
     print "\nWe have $cnt packages in CVS with no owners entry:{{{\n";
     print join("\n", @A), "}}}\n";
   }
-  if ($COUNT_LIST{"lowCVSActivity"} > 0) {
-    print "\n=== Packages not touched in the last 12 weeks ===\n";
-    print "\nWe have $COUNT_LIST{'lowCVSActivity'} packages with no CVS ",
-      "activity in the last 12 weeks:\n";
-    &displayPkgListByOwnerWiki($PKG_LIST{"lowCVSActivity"});
-  }
 }
 
 sub displayCVSMail {
@@ -916,8 +930,80 @@
     my $cnt = $#A + 1;
     print STDERR " - $cnt packages with no owners entry\n";
   }
-  if ($COUNT_LIST{"lowCVSActivity"} > 0) {
-    print STDERR " - $COUNT_LIST{'lowCVSActivity'} packages with no CVS ",
-      "activity in the last 12 weeks\n";
+}
+
+sub checkBugs {
+  my ($BZ) = @_;
+  foreach my $b (keys %$BZ) {
+    my $a = $BZ->{$b};
+    my $assignee = $$a[4];
+    $assignee =~ s/["]//g;
+    my $s = $OWNER_STAT{$assignee};
+    unless (defined $s) {
+      my $o = $OWN{$$a[10]};
+      print STDERR "Change $assignee to $$o[3]\n";
+      $s = $OWNER_STAT{$$o[3]};
+    }
+    die "Couldn't find OWNER_STAT for $assignee $$a[10]" unless defined $s;
+    $$s[1] += 1;
+    if (Date_Cmp($$a[2], $eightWeeksAgo) >= 0) {
+      $$s[3] = 1;
+    }
+    $$s[4]->{$b} = $a;
+  }
+  my @TO = sort {
+    my $ca = $OWNER_STAT{$a};
+    my $cb = $OWNER_STAT{$b};
+    $$cb[1] <=> $$ca[1];
+  } keys %OWNER_STAT;
+  $OWNER_LIST{"bugs"} = \@TO;
+}
+
+sub displayMaintainersWiki {
+  print "== About maintainers ==\n\n";
+  print "=== Maintainers count ===\n\n";
+  print "We have $COUNT_LIST{'maintainers'} maintainers in owners file.[[BR]]\n";
+  print "\n=== Top 10 bugs assignees ===\n";
+  &displayOwnerCntWiki($OWNER_LIST{"bugs"}, \%OWNER_STAT, 1);
+  if ($COUNT_LIST{'maintbugs'} > 0) {
+    print "=== Inactive maintainers with open bug reports ===\n\n";
+    print "We have $COUNT_LIST{'maintbugs'} maintainers with open bugs that ",
+      "have had no noticeable CVS activity in the last 12 weeks\n";
+    my $a = $MAINT_LIST{"bugs"};
+    foreach my $k (sort @$a) {
+      my $e = $OWNER_STAT{$k};
+      my $bugs = $$e[4];
+      my @K = keys %$bugs;
+      &displayBLWiki(\@K, $bugs, 4);
+    }
+  }
+  if ($COUNT_LIST{'maintpkg'} > 0) {
+    print "=== Inactive maintainers ===\n\n";
+    print "We have $COUNT_LIST{'maintpkg'} maintainers that ",
+      "have had no noticeable CVS activity in the last 12 weeks:\n";
+    my $a = $MAINT_LIST{"packages"};
+    foreach my $k (sort @$a) {
+      my $n = $k;
+      $n =~ s/\@/ at /;
+      $n =~ s/\./ dot /g;
+      foreach my $o (keys %OWN) {
+	my $e = $OWN{$o};
+	next unless $$e[3] eq $k;
+	print "||$n||$o||\n";
+      }
+    }
+    print "\n";
+  }
+}
+
+sub displayMaintainersMail {
+  print STDERR "\nMaintainers stats:\n";
+  print STDERR " - $COUNT_LIST{'maintainers'} maintainers\n";
+  if ($COUNT_LIST{'maintbugs'} > 0) {
+    print STDERR " - $COUNT_LIST{'maintbugs'} inactive maintainers with ",
+      "open bugs\n";
+  }
+  if ($COUNT_LIST{'maintpkg'} > 0) {
+    print STDERR " - $COUNT_LIST{'maintpkg'} inactive maintainers\n";
   }
 }



From fedora-extras-commits at redhat.com  Wed Apr 19 10:10:58 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 03:10:58 -0700
Subject: status-report-scripts parseBZbugList,1.20,1.21
Message-ID: <200604191010.k3JAAwWf004381@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4362

Modified Files:
	parseBZbugList 
Log Message:
Add some more stuff in the mail report.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- parseBZbugList	19 Apr 2006 10:10:06 -0000	1.20
+++ parseBZbugList	19 Apr 2006 10:10:56 -0000	1.21
@@ -502,6 +502,29 @@
   }
 }
 
+sub displayPkgListByOwnerMail {
+  my ($a) = @_;
+  my %PO;
+  foreach my $p (@$a) {
+    my $oa = $OWN{$p};
+    my $owner = $$oa[3];
+    my $e = $PO{$owner};
+    if (defined $e) {
+      push @$e, $p;
+    } else {
+      $PO{$owner} = [ $p ];
+    }
+  }
+  foreach my $owner (sort(keys %PO)) {
+    my $e = $PO{$owner};
+    $owner =~ s/\@/ at /;
+    $owner =~ s/\./ dot /g;
+    foreach my $p (@$e) {
+      printf STDERR "    %-42s %s\n", $owner, $p;
+    }
+  }
+}
+
 sub displayOwnersMail {
   print STDERR "\nOwners file stats:\n";
   print STDERR " - $COUNT_LIST{'owner'} packages\n";
@@ -510,12 +533,14 @@
   if ($#$a >= 0) {
     my $cnt = $#$a + 1;
     print STDERR " - $cnt packages not available in extras devel or release\n";
+    &displayPkgListByOwnerMail($a);
   }
   $a = $PKG_LIST{"NotDevel"};
   if ($#$a >= 0) {
     my $cnt = $#$a + 1;
     print STDERR " - $cnt packages not available in extras devel ";
     print STDERR "but present in release\n";
+    &displayPkgListByOwnerMail($a);
   }
   if ($COUNT_LIST{"openInOwners"} > 0) {
     print STDERR " - $COUNT_LIST{'openInOwners'} packages ",
@@ -524,6 +549,10 @@
   if ($COUNT_LIST{"extrasNoOwner"} > 0) {
     print STDERR " - $COUNT_LIST{'extrasNoOwner'} packages present in the ",
       "development repo which have no owners entry\n";
+    my $p = $PKG_LIST{"extrasNoOwner"};
+    my $s = &toLine(join(" ", @$p));
+    $s =~ s/\n/\n    /sg;
+    print STDERR "    $s\n";
   }
   my @DUP = sort(keys %OWN_DUP);
   if ($#DUP >= 0) {
@@ -534,6 +563,9 @@
   if ($#$a >= 0) {
     my $cnt = $#$a + 1;
     print STDERR " - $cnt orphaned packages, yet available in extras devel\n";
+    my $s = &toLine(join(" ", sort @$a));
+    $s =~ s/\n/\n    /sg;
+    print STDERR "    $s\n";
   }
   $a = $PKG_LIST{"MovedToCore"};
   if ($#$a >= 0) {
@@ -777,7 +809,7 @@
 sub toLine {
   my ($s) = @_;
   my $p1 = 0;
-  my $p2 = $p1 + 78;
+  my $p2 = $p1 + 72;
   while ($p2 < length($s)) {
     my $p3 = rindex $s, " ", $p2;
     if ($p3 < $p1) {
@@ -786,7 +818,7 @@
     }
     substr $s, $p3, 1, "\n";
     $p1 = $p3 + 1;
-    $p2 = $p1 + 78;
+    $p2 = $p1 + 72;
   }
   return $s;
 }



From fedora-extras-commits at redhat.com  Wed Apr 19 10:11:55 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 03:11:55 -0700
Subject: status-report-scripts parseBZbugList,1.21,1.22
Message-ID: <200604191011.k3JABtaD004417@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4397

Modified Files:
	parseBZbugList 
Log Message:
Add a few missing lines...


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- parseBZbugList	19 Apr 2006 10:10:56 -0000	1.21
+++ parseBZbugList	19 Apr 2006 10:11:52 -0000	1.22
@@ -320,6 +320,7 @@
 &displayNewReviewMail("FE-REVIEW");
 &displayNewReviewMail("FE-NEW");
 &displayNewReviewMail("FE-NEEDSPONSOR");
+&displayNewReviewMail("FE-LEGAL");
 &displayNewReviewMail("OPEN-BUGS");
 &displayCVSMail();
 &displayMaintainersMail();
@@ -550,7 +551,7 @@
     print STDERR " - $COUNT_LIST{'extrasNoOwner'} packages present in the ",
       "development repo which have no owners entry\n";
     my $p = $PKG_LIST{"extrasNoOwner"};
-    my $s = &toLine(join(" ", @$p));
+    my $s = &toLine(join(" ", sort @$p));
     $s =~ s/\n/\n    /sg;
     print STDERR "    $s\n";
   }
@@ -957,10 +958,13 @@
 sub displayCVSMail {
   print STDERR "\nCVS stats:\n";
   print STDERR " - $COUNT_LIST{'CVS'} packages with a devel directory\n";
-  my @A = keys %CVS_NO_OWNER;
+  my @A = sort(keys %CVS_NO_OWNER);
   if ($#A >= 0) {
     my $cnt = $#A + 1;
     print STDERR " - $cnt packages with no owners entry\n";
+    my $s = &toLine(join(" ", @A));
+    $s =~ s/\n/\n    /sg;
+    print STDERR "    $s\n";
   }
 }
 



From fedora-extras-commits at redhat.com  Wed Apr 19 10:13:03 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 03:13:03 -0700
Subject: status-report-scripts parseBZbugList,1.22,1.23
Message-ID: <200604191013.k3JAD3NZ004446@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4428

Modified Files:
	parseBZbugList 
Log Message:
Add a few more output.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- parseBZbugList	19 Apr 2006 10:11:52 -0000	1.22
+++ parseBZbugList	19 Apr 2006 10:13:01 -0000	1.23
@@ -546,6 +546,8 @@
   if ($COUNT_LIST{"openInOwners"} > 0) {
     print STDERR " - $COUNT_LIST{'openInOwners'} packages ",
       "which have not yet been FE-APPROVE'd...\n";
+    &displayBL($BUG_LIST{"openInOwnersFE-REVIEW"}, \%BZR, 5);
+    &displayBL($BUG_LIST{"openInOwnersFE-NEW"}, \%BZN, 5);
   }
   if ($COUNT_LIST{"extrasNoOwner"} > 0) {
     print STDERR " - $COUNT_LIST{'extrasNoOwner'} packages present in the ",
@@ -770,7 +772,7 @@
 #  if ($#BL >= 0) {
 #    my $cnt = $#BL + 1;
 #    print "\nWe have $cnt $cur tickets 8 weeks old with no comments\n";
-#    &displayBL(\@BL, $BZ);
+#    &displayBL(\@BL, $BZ, 5);
 #  }
 #}
 
@@ -825,13 +827,15 @@
 }
 
 sub displayBL {
-  my ($BL, $BZ) = @_;
-  print "https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
+  my ($BL, $BZ, $field) = @_;
+  print STDERR "   https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
     join(",", @$BL), "\n";
-  foreach my $b (@$BL) {
+  foreach my $b (sort @$BL) {
     my $a = $BZ->{$b};
-    my ($owner) = $$a[5] =~ /^.([^@]+)/;
-    printf "  %-40s %s\n", $$a[10], $owner;
+    my $owner = $$a[$field];
+    $owner =~ s/["]//g;
+    $owner =~ s/\@/ at /;
+    printf STDERR "     %-40s %s\n", $$a[10], $owner;
   }
 }
 



From fedora-extras-commits at redhat.com  Wed Apr 19 10:13:52 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 03:13:52 -0700
Subject: status-report-scripts parseBZbugList,1.23,1.24
Message-ID: <200604191013.k3JADq0Q004480@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4462

Modified Files:
	parseBZbugList 
Log Message:
Check owners in lower-case.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- parseBZbugList	19 Apr 2006 10:13:01 -0000	1.23
+++ parseBZbugList	19 Apr 2006 10:13:49 -0000	1.24
@@ -914,11 +914,15 @@
 sub checkOpenInOwners {
   my ($BZ, $cur) = @_;
   my @BL;
+  my %OL;
+  foreach my $k (keys %OWN) {
+    $OL{lc $k} = $k;
+  }
   foreach my $b (sort(keys %$BZ)) {
     my $a = $BZ->{$b};
     next if $$a[6] eq "\"CLOSED\"";
-    next unless defined $OWN{$$a[10]};
-    delete $OWN{$$a[10]};
+    next unless defined $OL{lc $$a[10]};
+#    delete $OWN{$OL{lc $$a[10]}};
     push @BL, $b;
   }
   $COUNT_LIST{"openInOwners"} += $#BL + 1;



From fedora-extras-commits at redhat.com  Wed Apr 19 10:14:29 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 03:14:29 -0700
Subject: status-report-scripts parseBZbugList,1.24,1.25
Message-ID: <200604191014.k3JAETcx004511@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4493

Modified Files:
	parseBZbugList 
Log Message:
Add TODO item.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- parseBZbugList	19 Apr 2006 10:13:49 -0000	1.24
+++ parseBZbugList	19 Apr 2006 10:14:27 -0000	1.25
@@ -7,6 +7,7 @@
 # https://bugzilla.redhat.com/bugzilla/showdependencytree.cgi?id=FE-ACCEPT
 
 # TODO stuff
+#  - check that owners list is sorted
 
 use strict;
 use Getopt::Long;



From fedora-extras-commits at redhat.com  Wed Apr 19 10:15:38 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 03:15:38 -0700
Subject: status-report-scripts parseBZbugList,1.25,1.26
Message-ID: <200604191015.k3JAFcL3004544@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4526

Modified Files:
	parseBZbugList 
Log Message:
Add some checks.  Move to FC5.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- parseBZbugList	19 Apr 2006 10:14:27 -0000	1.25
+++ parseBZbugList	19 Apr 2006 10:15:36 -0000	1.26
@@ -7,7 +7,6 @@
 # https://bugzilla.redhat.com/bugzilla/showdependencytree.cgi?id=FE-ACCEPT
 
 # TODO stuff
-#  - check that owners list is sorted
 
 use strict;
 use Getopt::Long;
@@ -15,14 +14,16 @@
 
 my %opt;
 my @options = ( "help", "core=s", "extras=s", "bzid=s", "o=s", "d=s",
-		"extras_r=s", "cvs=s" );
+		"extras_r=s", "core_r=s", "cvs=s" );
 
 $main::core
   = "http://mirrors.kernel.org/fedora/core/development/SRPMS/";
+$main::core_r
+  = "http://mirrors.kernel.org/fedora/core/5/source/SRPMS/";
 $main::extras
   = "http://mirrors.kernel.org/fedora/extras/development/SRPMS/";
 $main::extras_r
-  = "http://mirrors.kernel.org/fedora/extras/4/SRPMS/";
+  = "http://mirrors.kernel.org/fedora/extras/5/SRPMS/";
 $main::discarded
   = "http://fedoraproject.org/wiki/Extras/PackagesNoLongerInDevel";
 $main::bzid
@@ -35,6 +36,7 @@
 $main::core = $opt{"core"} if defined $opt{"core"};
 $main::extras = $opt{"extras"} if defined $opt{"extras"};
 $main::extras_r = $opt{"extras_r"} if defined $opt{"extras_r"};
+$main::extras_r = $opt{"core_r"} if defined $opt{"core_r"};
 $main::discarded = $opt{"d"} if defined $opt{"d"};
 $main::bzid = $opt{"bzid"} if defined $opt{"bzid"};
 $main::cvsDir = $opt{"cvs"} if defined $opt{"cvs"};
@@ -54,6 +56,7 @@
 my %BZA;
 my %BZB;
 my %CORE;
+my %CORE_R;
 my %EXTRAS;
 my %EXTRAS_R;
 my %SRPMS;
@@ -118,6 +121,7 @@
 }
 if (defined $opt{"o"}) {
   local *IN;
+  my $prev;
   open IN, $opt{"o"} or die "Couldn't open $opt{'o'} : $!";
   # Fedora Extras|aalib|An ASCII art library|anvil at livna.org|extras-qa at fedoraproject.org|
   while ( <IN> ) {
@@ -125,6 +129,9 @@
     s/\s+$//;
     my @F = split /\|/;
     next if $F[1] eq "";
+    if ($F[1] lt $prev) {
+      print STDERR "Sorting problem in owners.list: $F[1] lt $prev\n";
+    }
     if (defined $DISCARD{$F[1]}) {
       $DISCARD{$F[1]} += 1;
       next;
@@ -146,6 +153,9 @@
 if ($main::core ne "") {
   &grabRepoList($main::core, \%CORE);
 }
+if ($main::core_r ne "") {
+  &grabRepoList($main::core_r, \%CORE_R);
+}
 %SRPMS = %EXTRAS;
 foreach my $k (keys %CORE) {
   $SRPMS{$k} = 1;
@@ -176,9 +186,14 @@
   while ( <IN> ) {
     s/\s+$//;
     $COUNT_LIST{"CVS"} += 1;
+    if (defined($CORE{$_}) && -f "$main::cvsDir/$_/devel/$_.spec") {
+      push @PL, $_;
+    }
     next if defined($OWN{$_}) || defined($DISCARD{$_});
     $CVS_NO_OWNER{$_} = 1;
   }
+  $PKG_LIST{"CVSinCore"} = \@PL;
+  $COUNT_LIST{'CVSinCore'} = $#PL + 1;
   close IN;
 }
 while ( <> ) {
@@ -300,9 +315,12 @@
 &checkLowActivity(\%BZB, "OPEN-BUGS");
 &checkBugs(\%BZB);
 &checkMaintainers();
+&checkCoreAndExtras(\%CORE_R, \%EXTRAS_R, "release");
+&checkCoreAndExtras(\%CORE, \%EXTRAS, "devel");
 print "[[TableOfContents]]\n\n= FE Package Status of ",
   &UnixDate("today", "%b %e, %Y"), " =\n";
 &displayOwnersWiki;
+&displayCommonWiki;
 &displayAcceptWiki(\%BZA);
 &displayNewReviewWiki(\%BZR, "FE-REVIEW", 5);
 &displayNewReviewWiki(\%BZN, "FE-NEW", 5);
@@ -317,6 +335,7 @@
 print STDERR "\nThe full report can be found here:\n";
 print STDERR "http://fedoraproject.org/wiki/Extras/PackageStatus\n\n";
 &displayOwnersMail;
+&displayCommonMail;
 &displayAcceptMail;
 &displayNewReviewMail("FE-REVIEW");
 &displayNewReviewMail("FE-NEW");
@@ -787,7 +806,9 @@
                   [$main::extras]
   -extras_r <url> Fedora extras SRPMS release repo
                   [$main::extras_r]
-  -core <url>     Fedora core SRPMS repo
+  -core <url>     Fedora core SRPMS development repo
+                  [$main::core]
+  -core_r <url>   Fedora core SRPMS release repo
                   [$main::core]
   -d <url>        list of migrated/discarded packages
                   [$main::discarded]
@@ -962,6 +983,12 @@
     print "\nWe have $cnt packages in CVS with no owners entry:{{{\n";
     print join("\n", @A), "}}}\n";
   }
+  if ($COUNT_LIST{'CVSinCore'} > 0) {
+    print "\n=== Packages appearing in Core but still present in CVS devel ===\n";
+    print "\nWe have $COUNT_LIST{'CVSinCore'} packages in CVS devel which appear to have moved to Core: {{{\n";
+    my $a = $PKG_LIST{"CVSinCore"};
+    print join("\n", @$a), "}}}\n";
+  }
 }
 
 sub displayCVSMail {
@@ -975,6 +1002,13 @@
     $s =~ s/\n/\n    /sg;
     print STDERR "    $s\n";
   }
+  if ($COUNT_LIST{'CVSinCore'} > 0) {
+    print STDERR " - $COUNT_LIST{'CVSinCore'} packages in CVS devel *and* Core\n";
+    my $a = $PKG_LIST{"CVSinCore"};
+    my $s = &toLine(join(" ", @$a));
+    $s =~ s/\n/\n    /sg;
+    print STDERR "    $s\n";
+  }
 }
 
 sub checkBugs {
@@ -1052,3 +1086,43 @@
     print STDERR " - $COUNT_LIST{'maintpkg'} inactive maintainers\n";
   }
 }
+
+sub checkCoreAndExtras {
+  my ($c, $e, $tag) = @_;
+  my @PL;
+  foreach my $k (keys %$c) {
+    push @PL, $k if defined $e->{$k};
+  }
+  $PKG_LIST{"common$tag"} = \@PL;
+  $COUNT_LIST{"common$tag"} = $#PL + 1;
+}
+
+sub displayCommonWiki {
+  if ($COUNT_LIST{"commonrelease"} == 0 && $COUNT_LIST{"commondevel"} == 0) {
+    return;
+  }
+  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";
+    &displayPkgListByOwnerWiki($PKG_LIST{"commonrelease"});
+  }
+  if ($COUNT_LIST{"commondevel"} > 0) {
+    print "\nWe have $COUNT_LIST{'commondevel'} packages duplicated for devel:\n";
+    &displayPkgListByOwnerWiki($PKG_LIST{"commondevel"});
+  }
+}
+
+sub displayCommonMail {
+  if ($COUNT_LIST{"commonrelease"} == 0 && $COUNT_LIST{"commondevel"} == 0) {
+    return;
+  }
+  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";
+    &displayPkgListByOwnerMail($PKG_LIST{"commonrelease"});
+  }
+  if ($COUNT_LIST{"commondevel"} > 0) {
+    print STDERR " - $COUNT_LIST{'commondevel'} packages duplicated for devel:\n";
+    &displayPkgListByOwnerMail($PKG_LIST{"commondevel"});
+  }
+}



From fedora-extras-commits at redhat.com  Wed Apr 19 10:16:24 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 03:16:24 -0700
Subject: status-report-scripts parseBZbugList,1.26,1.27
Message-ID: <200604191016.k3JAGOUI004573@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4555

Modified Files:
	parseBZbugList 
Log Message:
Fix a couple minor issues, and add a TODO.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- parseBZbugList	19 Apr 2006 10:15:36 -0000	1.26
+++ parseBZbugList	19 Apr 2006 10:16:21 -0000	1.27
@@ -7,6 +7,7 @@
 # https://bugzilla.redhat.com/bugzilla/showdependencytree.cgi?id=FE-ACCEPT
 
 # TODO stuff
+#  See why count in "Inactive maintainers with open bug reports" is strange.
 
 use strict;
 use Getopt::Long;
@@ -245,6 +246,7 @@
     $F[10] =~ s/["]//g;
     $F[10] =~ s/^review\s+request:?\s+<?//i;
     $F[10] =~ s/[:.,>]?\s.*$//g;
+    $F[10] =~ s/:.*$//g;
   } else {
     $F[10] = $F[8];
   }
@@ -605,6 +607,7 @@
     my $a = $BZ->{$b};
     next unless $$a[6] eq "\"CLOSED\"";
     my $pkg = $$a[10];
+    next if defined $DISCARD{$pkg};
     unless ($SRPMS{$pkg} == 1 || defined($OWN{$pkg})) {
       $pkg =~ s/-[^-]+-[^-]+$//;
     }
@@ -850,6 +853,7 @@
 
 sub displayBL {
   my ($BL, $BZ, $field) = @_;
+  return if $#$BL < 0;
   print STDERR "   https://bugzilla.redhat.com/bugzilla/buglist.cgi?bug_id=",
     join(",", @$BL), "\n";
   foreach my $b (sort @$BL) {
@@ -863,6 +867,7 @@
 
 sub displayBLWiki {
   my ($BL, $BZ, $field) = @_;
+  return if $#$BL < 0;
   my %O;
   foreach my $b (@$BL) {
     my $a = $BZ->{$b};



From fedora-extras-commits at redhat.com  Wed Apr 19 10:17:13 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 03:17:13 -0700
Subject: status-report-scripts parseBZbugList,1.27,1.28
Message-ID: <200604191017.k3JAHDrd004604@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4586

Modified Files:
	parseBZbugList 
Log Message:
Add TODO item for comps.xml.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- parseBZbugList	19 Apr 2006 10:16:21 -0000	1.27
+++ parseBZbugList	19 Apr 2006 10:17:11 -0000	1.28
@@ -8,6 +8,8 @@
 
 # TODO stuff
 #  See why count in "Inactive maintainers with open bug reports" is strange.
+#  Check contents of comps.xml file (missing packages,
+#    retired/orphaned packages)
 
 use strict;
 use Getopt::Long;



From fedora-extras-commits at redhat.com  Wed Apr 19 10:18:03 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 03:18:03 -0700
Subject: status-report-scripts parseBZbugList,1.28,1.29
Message-ID: <200604191018.k3JAI38g004635@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4617

Modified Files:
	parseBZbugList 
Log Message:
Added usage doc.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- parseBZbugList	19 Apr 2006 10:17:11 -0000	1.28
+++ parseBZbugList	19 Apr 2006 10:18:01 -0000	1.29
@@ -1,11 +1,70 @@
 #!/usr/bin/env perl
 # $Id$
 
+# This script parses a CSV formatted Bug List and extract info on various
+# aspects of package review tickets. FE-ACCEPT blockers are checked to
+# determine whether closed tickets have their corresponding package in the
+# development repo and in the owners file, and whether still open ticket could
+# be closed. FE-NEW and FE-REVIEW blockers are checked to verify they are not
+# closed.
+#
+# To run this script, you will need the following data:
+#
+#   * one or more CSV formatted files containing the bug lists with the
+#     following columns:
+#    1.  ID
+#    2.  Open Date
+#    3.  Changed Date
+#    4.  Assignee
+#    5.  Reporter
+#    6.  Status
+#    7.  Resolution
+#    8.  Blocked By
+#    9.  Summary
+#   * the URL of packages available in the FE development repo (defaults to
+#     http://mirrors.kernel.org/fedora/extras/development/SRPMS/)
+#   * the URL of packages available in the FE release repo (defaults to
+#     http://mirrors.kernel.org/fedora/extras/5/SRPMS/)
+#   * the URL of packages available in the FC development repo (defaults to
+#     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)
+#   * a full CVS checkout of Fedora Extras packages
+
 # Grab BZ tickets through:
 # https://bugzilla.redhat.com/bugzilla/showdependencytree.cgi?id=FE-NEW
 # https://bugzilla.redhat.com/bugzilla/showdependencytree.cgi?id=FE-REVIEW
 # https://bugzilla.redhat.com/bugzilla/showdependencytree.cgi?id=FE-ACCEPT
 
+# Getting a CSV file from the above 3 URLs is not too hard:
+#  - once the page is loaded, select the "view as bug list" link
+#  - ensure you have the proper selection of columns to display, as detailed
+#    above, and if not adjust the selection through the "Change Columns" link
+#    at the bottom of the page
+#  - select the "CSV" link at the bottom of the page
+
+# Obtaining the list of open tickets is slightly more complex:
+#  - go to the advanced search page and select:
+#   product:    "Fedora Extras"
+#   version:    4 + 5 + devel
+#   component:  leave blank
+#   status:     NEW + ASSIGNED + REOPENED + MODIFIED
+#   resolution: leave blank
+#   severity:   select all except "enhancement"
+#   priority:   leave blank
+#   platform:   leave blank
+#  - in the "Advanced Searching Using Boolean Charts" section, add:
+#   Component is equal to Package Review, and select the "negated" box
+#  - perform the search and save the CSV as above (you can also save the query
+#    itself)
+
+
 # TODO stuff
 #  See why count in "Inactive maintainers with open bug reports" is strange.
 #  Check contents of comps.xml file (missing packages,



From fedora-extras-commits at redhat.com  Wed Apr 19 10:19:16 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 03:19:16 -0700
Subject: status-report-scripts parseBZbugList,1.29,1.30
Message-ID: <200604191019.k3JAJG22004666@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4648

Modified Files:
	parseBZbugList 
Log Message:
Actualy check owners.list is sorted...


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- parseBZbugList	19 Apr 2006 10:18:01 -0000	1.29
+++ parseBZbugList	19 Apr 2006 10:19:14 -0000	1.30
@@ -191,9 +191,10 @@
     s/\s+$//;
     my @F = split /\|/;
     next if $F[1] eq "";
-    if ($F[1] lt $prev) {
+    if (lc($F[1]) lt lc($prev)) {
       print STDERR "Sorting problem in owners.list: $F[1] lt $prev\n";
     }
+    $prev = $F[1];
     if (defined $DISCARD{$F[1]}) {
       $DISCARD{$F[1]} += 1;
       next;



From fedora-extras-commits at redhat.com  Wed Apr 19 10:20:22 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 03:20:22 -0700
Subject: status-report-scripts parseBZbugList,1.30,1.31
Message-ID: <200604191020.k3JAKM8S004698@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4680

Modified Files:
	parseBZbugList 
Log Message:
Fix BZ columns list in comment.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- parseBZbugList	19 Apr 2006 10:19:14 -0000	1.30
+++ parseBZbugList	19 Apr 2006 10:20:19 -0000	1.31
@@ -15,12 +15,14 @@
 #    1.  ID
 #    2.  Open Date
 #    3.  Changed Date
-#    4.  Assignee
-#    5.  Reporter
-#    6.  Status
-#    7.  Resolution
-#    8.  Blocked By
-#    9.  Summary
+#    4.  Severity
+#    5.  Assignee
+#    6.  Reporter
+#    7.  Status
+#    8.  Resolution
+#    9.  Component
+#    10. Blocked By
+#    11. Summary
 #   * the URL of packages available in the FE development repo (defaults to
 #     http://mirrors.kernel.org/fedora/extras/development/SRPMS/)
 #   * the URL of packages available in the FE release repo (defaults to



From fedora-extras-commits at redhat.com  Wed Apr 19 10:26:54 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Wed, 19 Apr 2006 03:26:54 -0700
Subject: rpms/apt/devel .cvsignore, 1.8, 1.9 apt.spec, 1.24, 1.25 sources,
	1.8, 1.9
Message-ID: <200604191026.k3JAQvsT004747@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/apt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4726

Modified Files:
	.cvsignore apt.spec sources 
Log Message:
* Wed Apr 19 2006 Ralf Cors??pius <rc040203 at freenet.de>
- 0.5.15lorg3-rc2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	9 Apr 2006 15:23:31 -0000	1.8
+++ .cvsignore	19 Apr 2006 10:26:54 -0000	1.9
@@ -1 +1 @@
-apt-0.5.15lorg3-rc1.tar.bz2
+apt-0.5.15lorg3-rc2.tar.bz2


Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- apt.spec	10 Apr 2006 17:20:27 -0000	1.24
+++ apt.spec	19 Apr 2006 10:26:54 -0000	1.25
@@ -6,12 +6,12 @@
 Summary:        Debian's Advanced Packaging Tool with RPM support
 Name:           apt
 Version:        0.5.15lorg3
-Release:        0.3.rc1%{?dist}
+Release:        0.3.rc2%{?dist}
 Group:          System Environment/Base
 URL:            http://laiskiainen.org/
 License:        GPL
 
-Source0:        http://laiskiainen.org/apt/testing/%{name}-%{version}-rc1.tar.bz2
+Source0:        http://laiskiainen.org/apt/testing/%{name}-%{version}-rc2.tar.bz2
 
 # user editable template configs
 Source1:        apt.conf
@@ -123,7 +123,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-rc1
+%setup -q -n %{name}-%{version}-rc2
 
 # fix docs to reference correct paths
 perl -pi -e \
@@ -308,6 +308,9 @@
 
 
 %changelog
+* Wed Apr 19 2006 Ralf Cors??pius <rc040203 at freenet.de>
+- 0.5.15lorg3-rc2.
+
 * Mon Apr 10 2006 Ville Skytt?? <ville.skytta at iki.fi>
 - Remove mirror select remainders (thanks to Panu).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	9 Apr 2006 15:23:32 -0000	1.8
+++ sources	19 Apr 2006 10:26:54 -0000	1.9
@@ -1 +1 @@
-d0f4b875b7d65c5a8b6563cf854a6247  apt-0.5.15lorg3-rc1.tar.bz2
+f6a6bcd712ad5826e92bad68a9f508c3  apt-0.5.15lorg3-rc2.tar.bz2



From fedora-extras-commits at redhat.com  Wed Apr 19 13:30:41 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 19 Apr 2006 06:30:41 -0700
Subject: rpms/gkrellmms/devel gkrellmms.spec,1.9,1.10
Message-ID: <200604191330.k3JDUhhh012034@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gkrellmms/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12017

Modified Files:
	gkrellmms.spec 
Log Message:
* Wed Apr 19 2006 Brian Pepple <bdpepple at ameritech.net> - 2.1.22-7
- Add requires for xmms due to change in xmms package.



Index: gkrellmms.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellmms/devel/gkrellmms.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gkrellmms.spec	14 Feb 2006 17:50:36 -0000	1.9
+++ gkrellmms.spec	19 Apr 2006 13:30:40 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:           gkrellmms
 Version:        2.1.22
-Release:        5%{?dist}
+Release:        7%{?dist}
 Summary:        GKrellM XMMS plugin
 
 Group:          Applications/Multimedia
@@ -15,6 +15,8 @@
 BuildRequires:  gtk+-devel >= 1.2.10, gtk2-devel >= 2.0.1, xmms-devel >= 1.2.8
 BuildRequires:  gkrellm-devel, gettext
 
+Requires:	xmms >= 1.2.8
+
 
 %description
 GKrellM plugin for controlling XMMS.
@@ -50,6 +52,9 @@
 
 
 %changelog
+* Wed Apr 19 2006 Brian Pepple <bdpepple at ameritech.net> - 2.1.22-7
+- Add requires for xmms due to change in xmms package.
+
 * Tue Feb 14 2006 Brian Pepple <bdpepple at ameritech.net> - 2.1.22-5
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-extras-commits at redhat.com  Wed Apr 19 13:40:48 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Wed, 19 Apr 2006 06:40:48 -0700
Subject: rpms/gkrellmms/FC-5 gkrellmms.spec,1.9,1.10
Message-ID: <200604191340.k3JDeoxU012121@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/gkrellmms/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12104

Modified Files:
	gkrellmms.spec 
Log Message:
* Wed Apr 19 2006 Brian Pepple <bdpepple at ameritech.net> - 2.1.22-6
- Add requires for xmms due to change in xmms package.



Index: gkrellmms.spec
===================================================================
RCS file: /cvs/extras/rpms/gkrellmms/FC-5/gkrellmms.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gkrellmms.spec	14 Feb 2006 17:50:36 -0000	1.9
+++ gkrellmms.spec	19 Apr 2006 13:40:48 -0000	1.10
@@ -2,7 +2,7 @@
 
 Name:           gkrellmms
 Version:        2.1.22
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        GKrellM XMMS plugin
 
 Group:          Applications/Multimedia
@@ -15,6 +15,8 @@
 BuildRequires:  gtk+-devel >= 1.2.10, gtk2-devel >= 2.0.1, xmms-devel >= 1.2.8
 BuildRequires:  gkrellm-devel, gettext
 
+Requires:	xmms >= 1.2.8
+
 
 %description
 GKrellM plugin for controlling XMMS.
@@ -50,6 +52,9 @@
 
 
 %changelog
+* Wed Apr 19 2006 Brian Pepple <bdpepple at ameritech.net> - 2.1.22-6
+- Add requires for xmms due to change in xmms package.
+
 * Tue Feb 14 2006 Brian Pepple <bdpepple at ameritech.net> - 2.1.22-5
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-extras-commits at redhat.com  Wed Apr 19 14:06:50 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 07:06:50 -0700
Subject: owners owners.list,1.859,1.860
Message-ID: <200604191406.k3JE6qo9014310@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14293

Modified Files:
	owners.list 
Log Message:
Sort according to POSIX.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.859
retrieving revision 1.860
diff -u -r1.859 -r1.860
--- owners.list	19 Apr 2006 10:06:29 -0000	1.859
+++ owners.list	19 Apr 2006 14:06:50 -0000	1.860
@@ -29,8 +29,8 @@
 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|alltray|Dock any application in the tray|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|alsa-firmware|Firmware for several ALSA-Supported soundcards|fedora at leemhuis.info|extras-qa at fedoraproject.org|
-Fedora Extras|alsamixergui|GUI mixer for ALSA sound devices|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|alsa-tools|The ALSA Tools|fedora at leemhuis.info|extras-qa at fedoraproject.org|
+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|
 Fedora Extras|amarok|Media player for KDE|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|amavisd-new|Email filter with virus scanner and spamassassin support|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -51,11 +51,11 @@
 Fedora Extras|artwiz-aleczapka-fonts|Set of (improved) artwiz fonts|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|asa|Convert Fortran carriage control characters|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|asciidoc|AsciiDoc text document fomatter|chrisw at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|at-poke|A tool for poking things|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|aterm|Aterm (Afterstep XVT) - a VT102 emulator for the X window system|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|athcool|Enables/disables Powersaving mode for AMD processors|gajownik at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|atitvout|ATI Rage/Radeon TV Out configuration program|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|atlas|Automatically Tuned Linear Algebra Software|qspencer at ieee.org|extras-qa at fedoraproject.org|
-Fedora Extras|at-poke|A tool for poking things|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|audacity|A multitrack audio editor|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|autossh|Utility to autorestart SSH tunnels|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|autotrace|A utility for converting bitmaps to vector graphics|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
@@ -84,8 +84,8 @@
 Fedora Extras|blogtk|Gnome application for editing/maintaining blogs|stickster at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|blt|BLT widget extension to Tcl/Tk scripting language development|jfontain at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|bluefish|A GTK2 web development application for experienced users|paul at city-fan.org|extras-qa at fedoraproject.org|
-Fedora Extras|bmp-flac2|Plugin to enable FLAC playback in the Beep Media Player|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|bmp|GTK2 based fork of the XMMS media player|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
+Fedora Extras|bmp-flac2|Plugin to enable FLAC playback in the Beep Media Player|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|
 Fedora Extras|boa|The boa web server|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|bochs|Bochs Project x86 PC Emulator|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|bonnie++|Bonnie++ filesystem and disk benchmark & burn-in suite|wtogami at redhat.com|extras-qa at fedoraproject.org|
@@ -94,17 +94,17 @@
 Fedora Extras|buildsystem|Fedora-Extras Buildsystem|skvidal at phy.duke.edu|extras-qa at fedoraproject.org|
 Fedora Extras|buoh|Online comics reader|chabotc at xs4all.nl|extras-qa at fedoraproject.org|
 Fedora Extras|bwbar|A program that generates a readout of the current bandwidth use|adrian at lisas.de|extras-qa at fedoraproject.org|
-Fedora Extras|bwm-ng|Bandwidth Monitor NG|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
 Fedora Extras|bwidget|Extended widget set for Tk|wart at kobold.org|extras-qa at fedoraproject.org|
+Fedora Extras|bwm-ng|Bandwidth Monitor NG|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
 Fedora Extras|byzanz|A desktop recorder|jeff at ollie.clive.ia.us|extras-qa at fedoraproject.org|
 Fedora Extras|bzflag|3D multi-player tank battle game|nphilipp at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|bzr|A friendly distributed version control system|shahms at shahms.com|extras-qa at fedoraproject.org|
+Fedora Extras|c-ares|A library that performs asynchronous DNS operations|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|cabextract|A Microsoft Cabinet file extractor|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|cacti|An rrd based graphing tool|imlinux at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|camE|Rewrite of the xawtv webcam app, which adds imlib2 support|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|camstream|CamStream - a set of programs to make use of your webcam|nomis80 at nomis80.org|extras-qa at fedoraproject.org|
 Fedora Extras|Canna|A Japanese character set input system|tagoh at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|c-ares|A library that performs asynchronous DNS operations|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|ccache|Compiler cache|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|CCfits|A C++ interface for cfitsio|spr at astrax.fis.ucm.es|extras-qa at fedoraproject.org|
 Fedora Extras|ccid|Generic USB CCID smart card reader driver|ville.skytta at iki.fi|extras-qa at fedoraproject.org|ludovic.rousseau at gmail.com
@@ -175,8 +175,8 @@
 Fedora Extras|darcs|David's advanced revision control system|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|dbh|Disk based hash library|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|dclib|Direct Connect file sharing library|lmacken at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|ddclient|A client to update dynamic DNS host entries|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|dd_rescue|Fault tolerant "dd" utility for rescuing data from bad media|andreas at bawue.net|extras-qa at fedoraproject.org|
+Fedora Extras|ddclient|A client to update dynamic DNS host entries|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|ddrescue|Fault tolerant "dd" utility for rescuing data from bad media|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|ddskk|Daredevil SKK - Simple Kana to Kanji conversion program for Emacs|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|dejavu-fonts|DejaVu Fonts|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org|
@@ -200,8 +200,8 @@
 Fedora Extras|dogtail|GUI test tool and automation framework|zcerza at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|dosbox|An x86/DOS emulator with sound/graphics|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|doulos-fonts|Doulos SIL fonts|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
-Fedora Extras|drgeo-doc|html documentation for drgeo|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
 Fedora Extras|drgeo|Interactive educational geometry software|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
+Fedora Extras|drgeo-doc|html documentation for drgeo|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
 Fedora Extras|driftnet|Network image sniffer|bnocera at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|drivel|A journal or "blog" client|stickster at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|drscheme|Graphical environment for developing programs using Scheme|gemi at bluewin.ch|extras-qa at fedoraproject.org|
@@ -233,8 +233,8 @@
 Fedora Extras|erlang|General-purpose programming language and runtime environment|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|esmtp|User configurable relay-only Mail Transfer Agent (MTA)|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|evas|A hardware-accelerated canvas API|ivazquez at ivazquez.net|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|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|exo|Application library for the Xfce desktop environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|ez-ipupdate|Client for Dynamic DNS Services|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|f2py|Fortran to Python interface generator|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
@@ -242,17 +242,17 @@
 Fedora Extras|fbdesk|Icon Manager for Fluxbox|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|fbida|FrameBuffer Imageviewer|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|fdupes|Identifies and optionally deletes duplicate files|simonb at thoughtpolice.co.uk|extras-qa at fedoraproject.org|
-Fedora Extras|fedora-rpmdevtools|Fedora RPM Development Tools|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|fedora-package-config-smart|Configuration files for the smart package manager|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|
+Fedora Extras|fedora-rpmdevtools|Fedora RPM Development Tools|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|fedora-usermgmt|Fedora tools for user management|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|feh|Fast command line image viewer using Imlib2|a.kurtz at hardsun.net|extras-qa at fedoraproject.org|
 Fedora Extras|fetchlog|The fetchlog utility displays the last new messages of a logfile|paul at xtdnet.nl|extras-qa at fedoraproject.org|
-Fedora Extras|fftw2|Fast Fourier Transform library|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|fftw|Fast Fourier Transform library|qspencer at ieee.org|extras-qa at fedoraproject.org|
+Fedora Extras|fftw2|Fast Fourier Transform library|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|fig2ps|Utility for converting xfig pictures to PS/PDF|qspencer at ieee.org|extras-qa at fedoraproject.org|
-Fedora Extras|fillets-ng-data-cs|Czech audio data files for Fish Fillets Next Generation|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|fillets-ng-data|Game data files for Fish Fillets Next Generation|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|fillets-ng|Fish Fillets Next Generation, a puzzle game with 70 levels|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|fillets-ng-data|Game data files for Fish Fillets Next Generation|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|fillets-ng-data-cs|Czech audio data files for Fish Fillets Next Generation|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|firefox|firefox browser|wtogami at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|firestarter|The Firestarter firewall tool for GNOME|mpeters at mac.com|extras-qa at fedoraproject.org|
 Fedora Extras|fish|A friendly interactive shell|oliver at linux-kernel.at|extras-qa at fedoraproject.org|liljencrantz at gmail.com
@@ -285,18 +285,18 @@
 Fedora Extras|fslint|FSlint - a utility to find and clean "lint" on a filesystem|P at draigBrady.com|extras-qa at fedoraproject.org|
 Fedora Extras|ftnchek|Static analyzer for Fortran 77 programs|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|fuse|File System in Userspace|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
+Fedora Extras|fuse-emulator|A Sinclair ZX Spectrum 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 newmail.ru|extras-qa at fedoraproject.org|
 Fedora Extras|fuse-sshfs|FUSE-Filesystem to access remote filesystems via SSH|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
-Fedora Extras|fuse-emulator|A Sinclair ZX Spectrum emulator|paul at all-the-johnsons.co.uk|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|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|gai|Generic Applet Interface|michel.salim at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|gai-pal|GAI Pal applet|michel.salim at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|gai-temp|GAI based applet that displays HDD and CPU temperature|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|gaim-guifications|Guifications plugin for GAIM|byte at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gaim-meanwhile| Lotus Sametime Community Client plugin for Gaim|jwboyer at jdub.homelinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|gaim-otr|Off-The-Record Messaging plugin for GAIM|paul at xtdnet.nl|extras-qa at fedoraproject.org|
-Fedora Extras|gai-pal|GAI Pal applet|michel.salim at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|gai-temp|GAI based applet that displays HDD and CPU temperature|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|gajim|Jabber client written in PyGTK|gajownik at gmail.com|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|
@@ -335,10 +335,10 @@
 Fedora Extras|gkrellm-aclock|Analog clock plugin for GKrellM|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-freq|CPU frequency display plugin for GKrellM|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-hddtemp|Hard disk temperature plugin for GKrellM|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|gkrellmms|GKrellM XMMS plugin|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-themes|Some themes for the GNU Krell Monitor|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-volume|GKrellM volume plugin|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|gkrellm-weather|GKrellWeather is a weather plugin for GKrellM|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|gkrellmms|GKrellM XMMS plugin|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|gktools|GUI utilities for KerberosV tickets|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gl-117|GL-117 is an action flight simulator|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|glabels|A program for creating labels and business cards for GNOME|jspaleta at gmail.com|extras-qa at fedoraproject.org|
@@ -356,7 +356,6 @@
 Fedora Extras|gnofract4d|Gnofract 4D is a Gnome-based program to draw fractals|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnokii|Mobile phone management program|triad at df.lth.se|extras-qa at fedoraproject.org|
 Fedora Extras|gnomad2|Manager for digital audio players|triad at df.lth.se|extras-qa at fedoraproject.org|
-Fedora Extras|gnomebaker|Gnome CD burner|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-applet-music|A GNOME panel applet to control various music players|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-applet-netmon|GNOME Network Load Applet|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-applet-netspeed|GNOME applet that shows traffic on a network device|a.kurtz at hardsun.net|extras-qa at fedoraproject.org|
@@ -369,7 +368,6 @@
 Fedora Extras|gnome-password-generator|Graphical secure password generator|extras-orphan at fedoraproject.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|gnomesword|GNOME-based Bible research tool|mpeters at mac.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|
 Fedora Extras|gnome-theme-clearlooks|An attractive GTK+ 2 engine with a focus on usability|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-theme-clearlooks-bigpack|Additional Clearlooks color schemes|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
@@ -377,6 +375,8 @@
 Fedora Extras|gnome-translate|GNOME interface to libtranslate -- Natural language translator|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-vfsmm26|C++ wrapper for gnome-vfs|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-yum|GNOME Interface for YUM|toth_bandi at users.sourceforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|gnomebaker|Gnome CD burner|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
+Fedora Extras|gnomesword|GNOME-based Bible research tool|mpeters at mac.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnonlin|GStreamer extension library for non-linear editing|redhat at flyn.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnotime|Tracks and reports time spent|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnuchess|The GNU chess program|kaboom at oobleck.net|extras-qa at fedoraproject.org|
@@ -391,8 +391,8 @@
 Fedora Extras|gpa|Graphical user interface for GnuPG|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|gparted|Gnome Partition Editor|dakingun at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|gperiodic|Program for browsing the periodic table|eric.tanguy at univ-nantes.fr|extras-qa at fedoraproject.org|
-Fedora Extras|gpgme03|GnuPG Made Easy interface library|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|gpgme|GnuPG Made Easy|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|gpgme03|GnuPG Made Easy interface library|dennis at ausil.us|extras-qa at fedoraproject.org|
 Fedora Extras|gphpedit|A PHP source editor for GNOME 2|rpm at timj.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|gpp|Gnome Photo Printer|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|
 Fedora Extras|gpredict|Real-time satellite tracking and orbit prediction program|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
@@ -416,20 +416,20 @@
 Fedora Extras|gstreamer08-python|Python bindings for GStreamer 0.8|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|gsview|PostScript and PDF previewer|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|gsynaptics|Settings tool for Synaptics touchpad driver|fedora at leemhuis.info|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|gtk+extra|A library of gtk+ widgets|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
+Fedora Extras|gtk-gnutella|GUI based Gnutella Client|dmitry at butskoy.name|extras-qa at fedoraproject.org|
+Fedora Extras|Gtk-Perl|Perl extensions for GTK+|matthias at rpmforge.net|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|GtkAda|An Ada95 graphical toolkit based on Gtk+|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|gtkglarea2|An OpenGL GTK widget|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|rc040203 at freenet.de
 Fedora Extras|gtkglext|OpenGL Extension to GTK|rc040203 at freenet.de|extras-qa at fedoraproject.org|
-Fedora Extras|gtk-gnutella|GUI based Gnutella Client|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|gtkmathview|Library for rendering MathML documents|uwog at uwog.net|extras-qa at fedoraproject.org|
 Fedora Extras|gtkmm20|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|gtkmm24|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
-Fedora Extras|Gtk-Perl|Perl extensions for GTK+|matthias at rpmforge.net|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|gtktalog|The GNOME disk catalog|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|gtkterm|Serial port terminal|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|gtkwave|Waveform viewer|paul at city-fan.org|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|gtorrentviewer|A GTK2-based viewer and editor for BitTorrent meta files|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|gtranslator|A gettext po file editor for GNOME|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|gtweakui|Extra configuration dialogs for GNOME|matthias at rpmforge.net|extras-qa at fedoraproject.org|
@@ -443,8 +443,8 @@
 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|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|hddtemp|Hard disk temperature tool|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|hdf5|A general purpose library and file format for storing scientific data|orion at cora.nwra.com|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|
 Fedora Extras|heartbeat|Heartbeat subsystem for High-Availability Linux|fedora at soeterbroek.com|extras-qa at fedoraproject.org|
 Fedora Extras|help2man|Create simple man pages from --help output|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|hercules|Hercules S/370, ESA/390, and z/Architecture emulator|matthias at rpmforge.net|extras-qa at fedoraproject.org|
@@ -469,8 +469,8 @@
 Fedora Extras|icecast|ShoutCast compatible streaming media server|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|icu|International Components for Unicode library|fedora at leemhuis.info|extras-qa at fedoraproject.org|
-Fedora Extras|id3lib|An Open-Source library for manipulating ID3v1 and ID3v2 tags|anvil at livna.org|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|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|id3v2|A command line id3v2 tag editor|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|ifm|Interactive Fiction Mapper|chris at chrisgrau.com|extras-qa at fedoraproject.org|
 Fedora Extras|ifplugd|Detect and take action when an ethernet cable is unplugged|aaron.bennett at olin.edu|extras-qa at fedoraproject.org|
@@ -507,8 +507,8 @@
 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|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|jpgraph|An OO graph drawing class library for PHP|gauret at free.fr|extras-qa at fedoraproject.org|
-Fedora Extras|jthread|JThread provides classes to make use of threads easy on different platforms|jeff at ollie.clive.ia.us|extras-qa at fedoraproject.org|
 Fedora Extras|js|JavaScript interpreter|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|jthread|JThread provides classes to make use of threads easy on different platforms|jeff at ollie.clive.ia.us|extras-qa at fedoraproject.org|
 Fedora Extras|juk|Jukebox and music manager for KDE|nomis80 at nomis80.org|extras-qa at fedoraproject.org|
 Fedora Extras|k3b-extras|Free codec plugins for k3b|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kadischi|An application for Fedora-based LiveCD generation|cgoorah at yahoo.com.au|extras-qa at fedoraproject.org|
@@ -519,8 +519,8 @@
 Fedora Extras|kasumi|Anthy dictionary management tool|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|kawa|Kawa scheme implementation|green at redhat.com|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|kdesvn|A subversion client for KDE|orion at cora.nwra.com|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|
 Fedora Extras|kdetoys|K Desktop Environment - Toys and Amusements|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kdissert|Mind-mapping-like tool for KDE|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|kdocker|Dock any application in the system tray|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
@@ -577,8 +577,8 @@
 Fedora Extras|libcmml|Library for handling Continuous Media Markup Language|thomas at apestaart.org|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|libdsk|Disc drive library for use with the Fuse emulator|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|libdnet|Simple portable interface to lowlevel networking routines|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
+Fedora Extras|libdsk|Disc drive library for use with the Fuse emulator|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|libebml|The Extensible Binary Meta Language library|anvil at livna.org|extras-qa at fedoraproject.org|
 Fedora Extras|libesmtp|SMTP client library|pawsa at theochem.kth.se|extras-qa at fedoraproject.org|
 Fedora Extras|libetpan|Portable, efficient middleware for different kinds of mail access|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
@@ -612,10 +612,10 @@
 Fedora Extras|libmodplug|Modplug mod music file format library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|libmpcdec|Musepack audio decoding library|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|libmthca|Mellanox InfiniBand HCA Userspace Driver|rolandd at cisco.com|extras-qa at fedoraproject.org|
-Fedora Extras|libnc-dap|The NetCDF interface to DAP-2 from OPeNDAP|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|libnasl|Nessus Attack Scripting Language|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
-Fedora Extras|libnet10|High-level API (toolkit) allowing the application programmer to construct and inject network packets|pertusus at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|libnc-dap|The NetCDF interface to DAP-2 from OPeNDAP|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|libnet|C library for portable packet creation and injection|pertusus at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|libnet10|High-level API (toolkit) allowing the application programmer to construct and inject network packets|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|libnjb|Library for managing digital audio players|triad at df.lth.se|extras-qa at fedoraproject.org|
 Fedora Extras|liboggz|Simple programming interface for Ogg files and streams|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|liboil|Library of Optimized Inner Loops, CPU optimized functions|matthias at rpmforge.net|extras-qa at fedoraproject.org|
@@ -629,8 +629,8 @@
 Fedora Extras|libopensync-plugin-palm|Palm plugin for libopensync|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|libopensync-plugin-python|Python plugin for libopensync|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|libopts|Options library for autogen|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
-Fedora Extras|libosip2|oSIP is an implementation of SIP|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|libosip|oSIP is an implementation of SIP|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
+Fedora Extras|libosip2|oSIP is an implementation of SIP|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|libotr|Off-The-Record Messaging library and toolkit|paul at xtdnet.nl|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|
@@ -643,8 +643,8 @@
 Fedora Extras|libsexy|Funky fresh graphical widgets for GTK+ 2|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|libshout|icecast source streaming library|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|libsidplay|A Commodore 64 music player and SID chip emulator library|bugs.michael at gmx.net|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|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|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|
@@ -671,8 +671,8 @@
 Fedora Extras|lighttpd|Lightning fast webserver with light system requirements|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|lincity-ng|City Simulation Game|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|lincvs|Graphical CVS Client|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
-Fedora Extras|linkchecker|Script that checks HTML documents for broken links|redhat at flyn.org|extras-qa at fedoraproject.org|
 Fedora Extras|link-grammar|Library that can perform grammar checking|uwog at uwog.net|extras-qa at fedoraproject.org|
+Fedora Extras|linkchecker|Script that checks HTML documents for broken links|redhat at flyn.org|extras-qa at fedoraproject.org|
 Fedora Extras|linphone|Phone anywhere in the whole world by using the Internet|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|linux-libertine-fonts|Linux Libertine Open Fonts|frank at scirocco-5v-turbo.de|extras-qa at fedoraproject.org|
 Fedora Extras|linux_logo|The linux logo - a colorful console penguin logo|matthias at rpmforge.net|extras-qa at fedoraproject.org|
@@ -729,8 +729,8 @@
 Fedora Extras|mod_geoip|GeoIP module for the Apache HTTP Server|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|
 Fedora Extras|mod_security|Security module for the Apache HTTP Server|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|
 Fedora Extras|mod_suphp|An apache2 module for executing PHP scripts with the permissions of their owners|andreas at bawue.net|extras-qa at fedoraproject.org|
-Fedora Extras|moin-latex|LaTeX plugin for the MoinMoin wiki|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|moin|MoinMoin is a Python clone of WikiWiki|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|moin-latex|LaTeX plugin for the MoinMoin wiki|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|monkey-bubble|Game in the spirit of Frozen Bubble|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|monotone|A free, distributed version control system|roland at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|moodle|A Course Management System|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
@@ -738,9 +738,9 @@
 Fedora Extras|moomps|Powerful modular monitoring service|jfontain at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|most|more, less, most|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|mpc|Command-line client for MPD|gauret at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|muine|Music Player for GNOME|foolish at guezz.net|extras-qa at fedoraproject.org|
 Fedora Extras|multisync|Calendar (and other PIM data) synchronization program|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|multitail|View one or multiple files like tail but with multiple windows|folkert at vanheusden.com|extras-qa at fedoraproject.org|
-Fedora Extras|muine|Music Player for GNOME|foolish at guezz.net|extras-qa at fedoraproject.org|
 Fedora Extras|munin|Network-wide graphing framework (grapher/gatherer)|kevin at tummy.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|nabi|Simple Hangul X Input Method|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
@@ -777,8 +777,8 @@
 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|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-data|Game data for the Nexuiz first person shooter|adrian at lisas.de|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|
 Fedora Extras|nfswatch|An NFS traffic monitoring tool|Christian.Iseli at licr.org|extras-qa at fedoraproject.org|
 Fedora Extras|nget|A utility for retrieving files using the NNTP protocol|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|ngrep|Network layer grep tool|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
@@ -810,10 +810,10 @@
 Fedora Extras|opendap|Open-source Project for a Network Data Access Protocol|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|OpenEXR|A high dynamic-range (HDR) image file format|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|openmpi|Open Message Passing Interface (LAM replacement)|jvdias 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|openoffice-extras|SOT Office presentation templates repackaged for OpenOffice.org|wtogami at redhat.com|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|openoffice.org-dict-cs_CZ|Czech spellchecker and hyphenation dictionaries for OpenOffice.org|tmraz 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|
 Fedora Extras|openvpn|A full-featured SSL VPN solution|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|orange|Squeeze out installable Microsoft cabinet files|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
@@ -864,14 +864,15 @@
 Fedora Extras|perl-Carp-Assert-More|Convenience wrappers around Carp::Assert|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Cflow|Find flows in flow files|orion at cora.nwra.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-CGI-Simple|Simple totally OO CGI interface that is CGI.pm compliant|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|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-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-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
 Fedora Extras|perl-Class-Container|Perl module for building frameworks of classes|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-Data-Inheritable|Inheritable, overridable class data|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Class-DBI|Simple Database Abstraction|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-AbstractSearch|Abstract Class::DBI's SQL with SQL::Abstract|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-AsForm|Produce HTML form elements for database columns|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-FromCGI|Update Class::DBI data using CGI::Untaint|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -883,7 +884,6 @@
 Fedora Extras|perl-Class-DBI-Plugin|Abstract base class for Class::DBI plugins|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-Plugin-RetrieveAll|More complex retrieve_all() for Class::DBI|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-Plugin-Type|Determine type information for columns|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Class-DBI|Simple Database Abstraction|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-DBI-SQLite|Extension to Class::DBI for sqlite|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-ErrorHandler|Class::ErrorHandler Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Class-Inspector|Get information about a class and its structure|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -923,8 +923,8 @@
 Fedora Extras|perl-DateTime|DateTime Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBD-AnyData|DBI access to XML, CSV and other formats|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBD-CSV|DBI driver for CSV files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-DBD-SQLite2|Self Contained RDBMS in a DBI Driver (sqlite 2.x)|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBD-SQLite|Self Contained RDBMS in a DBI Driver|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-DBD-SQLite2|Self Contained RDBMS in a DBI Driver (sqlite 2.x)|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBD-XBase|Perl module for reading and writing the dbf files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBIx-ContextualFetch|Add contextual fetches to DBI|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBIx-DBSchema|Database-independent schema objects|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -947,18 +947,18 @@
 Fedora Extras|perl-File-BOM|Utilities for reading Byte Order Marks|mpeters at mac.com|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-Flat|Implements a flat filesystem|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-FileHandle-Unget|A FileHandle that supports ungetting of multiple bytes|paul at city-fan.org|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-Remove|Convenience module for removing files and directories|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Slurp|Efficient Reading/Writing of Complete Files|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-File-Tail|Perl extension for reading from continously updated files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-FileHandle-Unget|A FileHandle that supports ungetting of multiple bytes|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Finanace-Quote|A Perl module that retrieves stock and mutual fund quotes|notting at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Font-AFM|Perl interface to Adobe Font Metrics files|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Font-TTF|Perl interface to TrueType Font files|nicolas.mailhot at laposte.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-FreezeThaw|Convert Perl structures to strings and back|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-GDGraph3d|3D graph generation package for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-GDGraph|Graph generation package for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-GD|Perl interface to the GD graphics library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-GDGraph|Graph generation package for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-GDGraph3d|3D graph generation package for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-GDTextUtil|Text utilities for use with GD|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-gettext|Interface to gettext family of functions|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Glib|Perl interface to GLib|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -971,21 +971,21 @@
 Fedora Extras|perl-HTML-Mason|HTML::Mason Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 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-Expr|Expression support extension for HTML::Template|ville.skytta at iki.fi|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|ville.skytta at iki.fi|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-BrowserDetect|HTTP::BrowserDetect Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTTP-Proxy|A pure Perl HTTP proxy|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-HTTP-Server-Simple-Mason|HTTP::Server::Simple::Mason Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTTP-Server-Simple|Very simple standalone HTTP daemon|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-HTTP-Server-Simple-Mason|HTTP::Server::Simple::Mason Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Ima-DBI|Database connection caching and organization|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Imager|A module for creating and altering images|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|perl-Image-Base|Base class for loading, manipulating and saving images in Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Image-ExifTool|Utility for reading and writing image meta info|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Image-Info|Image meta information extraction module for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Image-Size|Determine the size of images in several common formats in Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Image-Xbm|Load, create, manipulate and save xbm image files in Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Image-Xpm|Load, create, manipulate and save xpm image files in Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Imager|A module for creating and altering images|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|perl-IO-All|IO::All Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-CaptureOutput|Capture STDOUT/STDERR from subprocesses and XS/C modules|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-Multiplex|Manage IO on many file handles|lmb at biosci.ki.se|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1044,8 +1044,8 @@
 Fedora Extras|perl-Module-Signature|CPAN signature management utilities and modules|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Versions-Report|Report versions of all modules in memory|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-CIDR-Lite|Net::CIDR::Lite perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Net-IP-CMatch|Efficiently match IP addresses against IP ranges with C|orion at cora.nwra.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Net-IP|Perl module for manipulation of IPv4 and IPv6 addresses|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Net-IP-CMatch|Efficiently match IP addresses against IP ranges with C|orion at cora.nwra.com|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|extras-orphan at fedoraproject.org|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
@@ -1054,10 +1054,10 @@
 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-Number-Compare|Perl module for numeric comparisons|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-OLE-Storage_Lite|Simple Class for OLE document interface|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-PAR-Dist|Toolkit for creating and manipulating Perl PAR distributions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Params-Check|Generic input parsing/checking mechanism|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Params-Util|Simple standalone param-checking functions|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Params-Validate|Params-Validate Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-PAR-Dist|Toolkit for creating and manipulating Perl PAR distributions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Parse-CPAN-Packages|Parse::CPAN::Packages Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Parse-Yapp|Perl extension for generating and using LALR parsers|pertusus at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-PatchReader|Utilities to read and manipulate patches and CVS|stickster at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1100,8 +1100,8 @@
 Fedora Extras|perl-Test-MockModule|Override subroutines in a module for unit testing|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-MockObject|Perl extension for emulating troublesome interfaces|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-NoWarnings|Make sure you didn't emit any warnings while testing|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Test-Pod-Coverage|POD documentation coverage checker|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Pod|Perl module for checking for POD errors in files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Test-Pod-Coverage|POD documentation coverage checker|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Taint|Tools to test taintedness|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Tester|Ease testing test modules built with Test::Builder|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Warn|Perl extension to test methods for warnings|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1121,18 +1121,17 @@
 Fedora Extras|perl-Text-Unidecode|US-ASCII transliterations of Unicode text|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|perl-Text-WikiFormat|Translate Wiki formatted text into other formats|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Text-Wrapper|Simple word wrapping perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perltidy|Tool for indenting and reformatting Perl scripts|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|perl-Tie-DBI|Tie hashes to DBI relational databases|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Tie-EncryptedHash|Hashes (and objects based on hashes) with encrypting fields|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Tie-IxHash|Ordered associative arrays for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Time-modules|Perl modules for parsing dates and times|kaboom at oobleck.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Time-Piece-MySQL|MySQL-specific methods for Time::Piece|chris at chrisgrau.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Time-Piece|Time objects from localtime and gmtime|chris at chrisgrau.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Time-Piece-MySQL|MySQL-specific methods for Time::Piece|chris at chrisgrau.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Tk|Perl Graphical User Interface ToolKit|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Tree-DAG_Node|Class for representing nodes in a tree|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Tree-Simple|Tree::Simple Perl module|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
-Fedora Extras|perl-Unicode-Map8|Mapping table between 8-bit chars and Unicode for Perl|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Unicode-Map|Perl module for mapping charsets from and to utf16 unicode|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Unicode-Map8|Mapping table between 8-bit chars and Unicode for Perl|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Unicode-MapUTF8|Conversions to and from arbitrary character sets and UTF8|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Unicode-String|Perl modules to handle various Unicode issues|gauret at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-UNIVERSAL-can|Hack around people calling UNIVERSAL::can() as a function|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1154,6 +1153,7 @@
 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-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|oliver at linux-kernel.at|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perltidy|Tool for indenting and reformatting Perl scripts|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|pexpect|Expect module for Python|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|pgadmin3|Graphical client for PostgreSQL|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|pgp-tools|Collection of several utilities related to OpenPGP|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|
@@ -1161,7 +1161,6 @@
 Fedora Extras|php-eaccelerator|PHP accelerator, optimizer, encoder and dynamic content cacher|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|php-extras|Additional PHP modules from the standard PHP distribution|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|php-json|An extremely fast PHP extension for JSON|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
-Fedora Extras|phpldapadmin|Web-based tool for managing LDAP servers|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 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-DB|PEAR: Database Abstraction Layer|rpm at timj.co.uk|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|
@@ -1169,18 +1168,19 @@
 Fedora Extras|php-pecl-pdo-sqlite|PECL package for PHP Data Objects Interface to SQLite v3|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|php-pecl-sqlite|PECL package for accessing SQLite databases|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|php-Smarty|Template/Presentation Framework for PHP|orion at cora.nwra.com|extras-qa at fedoraproject.org|
+Fedora Extras|phpldapadmin|Web-based tool for managing LDAP servers|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|physfs|Library to provide abstract access to various archives|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|pikdev|IDE for development of PICmicro based application (under Linux/KDE)|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
 Fedora Extras|pinentry|Collection of simple PIN or passphrase entry dialogs|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|pipenightdreams|Connect the waterpipes to create a proper pipeline|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|pitivi|Non-linear video editor|redhat at flyn.org|extras-qa at fedoraproject.org|
+Fedora Extras|pl|SWI-Prolog - Edinburgh compatible Prolog compiler|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|plague|Distributed build system for RPMs|dcbw at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|planet|Flexible RDF/RSS/Atom feed aggregator|rich at phekda.gotadsl.co.uk|extras-qa at fedoraproject.org|
-Fedora Extras|plib16|Set of portable libraries especially useful for games|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|plib|Set of portable libraries especially useful for games|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|plib16|Set of portable libraries especially useful for games|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|plone|User friendly and powerful open source Content Management System|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|plplot|Library of functions for making scientific plots|orion at cora.nwra.com|extras-qa at fedoraproject.org|
-Fedora Extras|pl|SWI-Prolog - Edinburgh compatible Prolog compiler|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|plt-scheme|Graphical environment for developing programs using Scheme|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|polyxmass-bin|The GNU polyxmass software suite|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|polyxmass-common|Contains all textual/graphical data required for polyxmass|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
@@ -1249,8 +1249,8 @@
 Fedora Extras|python-numeric|Fast multidimensional array functions for Python|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|python-paramiko|A SSH2 protocol library for python|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-protocols|PyProtocols 'adapt()' implementation|shahms at shahms.com|extras-qa at fedoraproject.org|
-Fedora Extras|python-psycopg|Alternative high-speed Postgres DB adapter|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-psyco|Python specializing compiler|shahms at shahms.com|extras-qa at fedoraproject.org|
+Fedora Extras|python-psycopg|Alternative high-speed Postgres DB adapter|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-quixote|A highly Pythonic Web application framework|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-reportlab|Python PDF generation library|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|python-setuptools|Download, build, install, upgrade, and uninstall Python packages|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
@@ -1269,9 +1269,9 @@
 Fedora Extras|qalculate-gtk|A multi-purpose desktop calculator for GNU/Linux|dakingun at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|qalculate-kde|A multi-purpose desktop calculator for GNU/Linux|dakingun at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|qascade|QT port of classic puzzle game|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
-Fedora Extras|qcad|CAD program|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|qca|Qt Cryptographic Architecture|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|qca-tls|Qt Cryptographic Architecture, TLS plugin|gauret at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|qcad|CAD program|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|qemu|QEMU is a FAST! processor emulator|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|qgit|Browser for GIT repositories|dan at danny.cz|extras-qa at fedoraproject.org|
 Fedora Extras|qgo|Graphical Go client and SGF editor|kaboom at oobleck.net|extras-qa at fedoraproject.org|
@@ -1287,6 +1287,12 @@
 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|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|
+Fedora Extras|R-mAr|R module to evaluate functions for multivariate AutoRegressive analysis|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
+Fedora Extras|R-RScaLAPACK|An interface to perform parallel computation on linear algebra problems using ScaLAPACK|tcallawa at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|R-waveslim|R module, Basic wavelet routines for 1,2 and 3-dimensional signal processing|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
+Fedora Extras|R-wavethresh|R module, Software to perform wavelet statistics and transforms|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|raidem|2d top-down shoot'em up|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|ratpoison|Simplified window manager with no mouse support|jwb at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|rblcheck|A command-line interface to RBL-style listings|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
@@ -1298,12 +1304,9 @@
 Fedora Extras|repoml|Tools and data for working with RepoML files|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|repoview|Creates a set of static HTML pages in a yum repository|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|revelation|Password manager for GNOME 2|fedora at leemhuis.info|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|
 Fedora Extras|rinetd|TCP redirection server|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|rkhunter|Rootkit Hunter scans for rootkits, backdoors and local exploits|tamaster at pobox.com|extras-qa at fedoraproject.org|
 Fedora Extras|rlog|Runtime Logging for C++|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
-Fedora Extras|R-mAr|R module to evaluate functions for multivariate AutoRegressive analysis|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 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|
@@ -1313,14 +1316,11 @@
 Fedora Extras|rpmproc|Perl script to help manage and build RPM packages|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|rpy|Python interface to the R language|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|rrdtool|Round Robin Database Tool to store and display time-series data|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|R-RScaLAPACK|An interface to perform parallel computation on linear algebra problems using ScaLAPACK|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|rsnapshot|Local and remote filesystem snapshot utility|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|rssowl|An RSS, RDF, and Atom Newsreader|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|rt3|Request tracker 3|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 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|oliver.andrich at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|R-waveslim|R module, Basic wavelet routines for 1,2 and 3-dimensional signal processing|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
-Fedora Extras|R-wavethresh|R module, Software to perform wavelet statistics and transforms|jamatos at fc.up.pt|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|
 Fedora Extras|rzip|A large-file compression program|i at stingr.net|extras-qa at fedoraproject.org|
@@ -1333,6 +1333,7 @@
 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|scanssh|Fast SSH server and open proxy scanner|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
+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|
 Fedora Extras|scim-chewing|SCIM IMEngine for Traditional Chinese|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-fcitx|fcitx SCIM IMEngine for Simplified Chinese|petersen at redhat.com|extras-qa at fedoraproject.org|
@@ -1342,7 +1343,6 @@
 Fedora Extras|scim-pinyin|Chinese input method for SCIM|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-qtimm|SCIM Qt Input Method module|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-skk|Scim-skk is a SCIM IMEngine module for skk to support Japanese input|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|scim|Smart Common Input Method|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-tables|SCIM Generic Table IMEngine and its data files|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-tomoe|Tomoe module for SCIM for Japanese handwritten input|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|scmxx|Exchange data with Siemens mobile phones|andreas at bawue.net|extras-qa at fedoraproject.org|
@@ -1390,8 +1390,8 @@
 Fedora Extras|spicctrl|Sony Vaio laptop SPIC control program|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 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|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
-Fedora Extras|sqlite2|Embeddable SQL engine in a C library|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|sqlite|An embeddable SQL engine in a C library|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
+Fedora Extras|sqlite2|Embeddable SQL engine in a C library|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|squidGuard|Filter, redirector and access controller plugin for squid|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
 Fedora Extras|srecord|Manipulate EPROM load files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|starfighter|For bugs related to the starfighter component|matthias at rpmforge.net|extras-qa at fedoraproject.org|
@@ -1411,9 +1411,9 @@
 Fedora Extras|sweep|An audio editor and live playback tool|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|sword|Free Bible Software Project|mpeters at mac.com|extras-qa at fedoraproject.org|
 Fedora Extras|syck|YAML for C, Python, and PHP|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
-Fedora Extras|sylpheed-claws-plugins|Additional plugins for sylpheed-claws|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
-Fedora Extras|sylpheed-claws|The bleeding edge branch of Sylpheed|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|sylpheed|GTK+ based, lightweight, and fast email client|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
+Fedora Extras|sylpheed-claws|The bleeding edge branch of Sylpheed|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|sylpheed-claws-plugins|Additional plugins for sylpheed-claws|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|synaptic|Graphical frontend for APT package manager|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|pmatilai at laiskiainen.org
 Fedora Extras|synce|For bugs related to the synce component|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|synce-gnomevfs|Gnome-vfs module for synce|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
@@ -1443,8 +1443,8 @@
 Fedora Extras|tetex-eurofont|Provides a command that prints a euro symbol|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-font-cm-lgc|The CM-LGC Type1 fonts for LaTeX|paskalis at di.uoa.gr|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-font-kerkis|The Kerkis type 1 fonts for LaTeX|paskalis at di.uoa.gr|extras-qa at fedoraproject.org|
-Fedora Extras|tetex-fontools|Tools for handling fonts with LaTeX and fontinst|mpeters at mac.com|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-font-tipa|The TIPA fonts for LaTeX|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|tetex-fontools|Tools for handling fonts with LaTeX and fontinst|mpeters at mac.com|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-lgrind|Source-code pretty-printer for LaTeX|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-perltex|Define LaTeX macros in terms of Perl code|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-pgf|Create PostScript and PDF graphics in TeX|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
@@ -1485,8 +1485,8 @@
 Fedora Extras|tripwire|An IDS (Intrusion Detection System)|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|ttf2pt1|TrueType to Adobe Type 1 converter|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|ttywatch|Log output of arbitrarily many devices|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|
-Fedora Extras|tuxpaint|Drawing program designed for young children|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|TurboGears|Back-to-front web development in Python|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
+Fedora Extras|tuxpaint|Drawing program designed for young children|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|tuxtype2|Tux Typing is an educational typing tutor for children|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|ucarp|Common Address Redundancy Protocol (CARP) for Unix|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|ucl|Portable lossless data compression library|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
@@ -1519,8 +1519,8 @@
 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|wavpack|A completely open audiocodec|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
-Fedora Extras|webmin|A web-based administration interface for Unix systems.|jvdias at redhat.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|webmin|A web-based administration interface for Unix systems.|jvdias at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|wesnoth|Battle for Wesnoth is a fantasy turn-based strategy game|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|whowatch|Displays informations about the users currently logged in|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|WindowMaker|A fast, feature rich Window manager|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
@@ -1536,11 +1536,11 @@
 Fedora Extras|worminator|Sidescrolling platform and shoot'em up action-game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|worminator-data|Data for worminator the game|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|wp_tray|A wallpaper-changing applet for GNOME|ivazquez at ivazquez.net|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|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|wxGTK|GTK+ port of the wxWidgets GUI library|mattdm at mattdm.org|extras-qa at fedoraproject.org|
-Fedora Extras|wxPythonGTK2|wxPython is a GUI toolkit for the Python programming language|mattdm at mattdm.org|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|
+Fedora Extras|wxPythonGTK2|wxPython is a GUI toolkit for the Python programming language|mattdm at mattdm.org|extras-qa at fedoraproject.org|
 Fedora Extras|x3270|An X Window System based IBM 3278/3279 terminal emulator|karsten at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|xbase|XBase compatible database library and tools|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|xbindkeys|Binds keys or mouse buttons to shell commands under X|gauret at free.fr|extras-qa at fedoraproject.org|
@@ -1554,6 +1554,9 @@
 Fedora Extras|xemacs|A different version of Emacs|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|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|
+Fedora Extras|xfce-utils|Utilities for the Xfce Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-appfinder|Appfinder for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-battery-plugin|Battery monitor for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-clipman-plugin|Clipboard manager plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
@@ -1562,8 +1565,8 @@
 Fedora Extras|xfce4-diskperf-plugin|Disk performance plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-fsguard-plugin|Filesystem-Guard plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-genmon-plugin|Generic monitor plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
-Fedora Extras|xfce4-iconbox|Icon box for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-icon-theme|Icons for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-iconbox|Icon box for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-minicmd-plugin|Mini command-line plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-mixer|Volume control plugin for the Xfce4 panel|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-modemlights-plugin|Modemlights for the XFCE panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
@@ -1573,8 +1576,8 @@
 Fedora Extras|xfce4-panel|Next generation panel for Xfce|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-quicklauncher-plugin|Quicklauncher plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-screenshooter-plugin|Screenshot utility for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
-Fedora Extras|xfce4-session|Session manager for the Xfce4 desktop|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-sensors-plugin|Sensors plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
+Fedora Extras|xfce4-session|Session manager for the Xfce4 desktop|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-showdesktop-plugin|Show-Desktop plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-systemload-plugin|Systemload monitor for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-systray|Systray for the Xfce4 Desktop Environment|kevin-redhat-bugzilla at tummy.com|extras-qa at fedoraproject.org|
@@ -1588,9 +1591,6 @@
 Fedora Extras|xfce4-windowlist-plugin|Windowlist plugin for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-xkb-plugin|XKB layout switcher for the Xfce panel|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|xfce4-xmms-plugin|Control XMMS from the Xfce panel|fedora.wickert at arcor.de|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|
-Fedora Extras|xfce-utils|Utilities for the Xfce Desktop Environment|kevin-redhat-bugzilla at tummy.com|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|xforms|An X11 toolkit library|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
@@ -1604,6 +1604,7 @@
 Fedora Extras|xmlindent|A XML stream reformatter|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|xmlrpc-c|A lightweight RPC library based on XML and HTTP|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|xmlstarlet|Command line XML toolkit|stickster at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|xmms|The X MultiMedia System, a media player which resembles Winamp|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-acme|XMMS plugin to use special multimedia keys in GNOME or through acme|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-alarm|xmms General plugin for using xmms as an alarm clock|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-arts|X MultiMedia System output plugin for the aRts sound system|matthias at rpmforge.net|extras-qa at fedoraproject.org|
@@ -1615,7 +1616,6 @@
 Fedora Extras|xmms-sid|SIDPlay input plugin for X MultiMedia System (XMMS)|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-skins|Skins for the X MultiMedia System|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-speex|X MultiMedia System input plugin to play speex files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
-Fedora Extras|xmms|The X MultiMedia System, a media player which resembles Winamp|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|xosd|On-screen display library for X|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|xpilot-ng|Space arcade game|wart at kobold.org|extras-qa at fedoraproject.org|
 Fedora Extras|xplanet|Render a planetary image into an X window|jylitalo at iki.fi|extras-qa at fedoraproject.org|
@@ -1629,8 +1629,8 @@
 Fedora Extras|yap|High-performance Prolog Compiler|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|yasm|Complete rewrite of the NASM assembler|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|ytalk|A chat program for multiple users|imlinux at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|yumex|A GUI for Yum|tla at rasmil.dk|extras-qa at fedoraproject.org|
 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|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|



From fedora-extras-commits at redhat.com  Wed Apr 19 14:13:46 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Wed, 19 Apr 2006 07:13:46 -0700
Subject: rpms/gajim/devel .cvsignore, 1.6, 1.7 gajim.spec, 1.10, 1.11 sources,
	1.6, 1.7
Message-ID: <200604191413.k3JEDmvb014381@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/gajim/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14358

Modified Files:
	.cvsignore gajim.spec sources 
Log Message:
Update to 0.10-pre2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gajim/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	13 Apr 2006 12:27:56 -0000	1.6
+++ .cvsignore	19 Apr 2006 14:13:45 -0000	1.7
@@ -1 +1 @@
-gajim-0.10-pre1.tar.bz2
+gajim-0.10-pre2.tar.bz2


Index: gajim.spec
===================================================================
RCS file: /cvs/extras/rpms/gajim/devel/gajim.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gajim.spec	13 Apr 2006 12:27:56 -0000	1.10
+++ gajim.spec	19 Apr 2006 14:13:45 -0000	1.11
@@ -1,12 +1,12 @@
 Name:           gajim
 Version:        0.10
-Release:        0.1.pre1%{?dist}
+Release:        0.1.pre2%{?dist}
 Summary:        Jabber client written in PyGTK
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://gajim.org/
-Source0:        http://gajim.org/downloads/gajim-%{version}-pre1.tar.bz2
+Source0:        http://gajim.org/downloads/gajim-%{version}-pre2.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils
@@ -19,6 +19,7 @@
 BuildRequires:  python-devel
 BuildRequires:  gtkspell-devel
 
+Requires:       bind-utils
 Requires:       dbus-python
 #Requires:       gnome-python2-gconf
 Requires:       pygtk2-libglade
@@ -79,6 +80,9 @@
 %{_mandir}/man1/gajim-remote.1*
 
 %changelog
+* Wed Apr 19 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 0.10-0.1.pre2
+- Update to 0.10-pre2
+
 * Thu Apr 13 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 0.10-0.1.pre1
 - Update to 0.10-pre1
 - Drop patches


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gajim/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	13 Apr 2006 12:27:56 -0000	1.6
+++ sources	19 Apr 2006 14:13:45 -0000	1.7
@@ -1 +1 @@
-e59de6722900155e3f5644c62241c9a9  gajim-0.10-pre1.tar.bz2
+a452d0435e730a22d83393cb97ad96d3  gajim-0.10-pre2.tar.bz2



From fedora-extras-commits at redhat.com  Wed Apr 19 14:14:08 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 19 Apr 2006 07:14:08 -0700
Subject: rpms/perl-MIME-tools/devel perl-MIME-tools.spec, 1.12, 1.13 sources,
	1.5, 1.6 .cvsignore, 1.5, 1.6
Message-ID: <200604191414.k3JEEAvp014441@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-MIME-tools/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14385

Modified Files:
	perl-MIME-tools.spec sources .cvsignore 
Log Message:
Update to 5.420
Cosmetic changes reflecting new maintainer's preferences
Examples remain executable since they don't introduce new dependencies
Simplify provides filter



Index: perl-MIME-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-tools/devel/perl-MIME-tools.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-MIME-tools.spec	16 Jan 2006 20:47:22 -0000	1.12
+++ perl-MIME-tools.spec	19 Apr 2006 14:14:08 -0000	1.13
@@ -1,75 +1,74 @@
 Name:           perl-MIME-tools
-Version:        5.419
+Version:        5.420
 Release:        1%{?dist}
 Summary:        Modules for parsing and creating MIME entities in Perl
-
 Group:          Development/Libraries
 License:        Artistic or GPL
 URL:            http://search.cpan.org/dist/MIME-tools/
-Source0:        http://www.cpan.org/authors/id/D/DS/DSKOLL/MIME-tools-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-broot-%(%{__id_u} -n)
-
+Source0:        http://search.cpan.org/CPAN/authors/id/D/DS/DSKOLL/MIME-tools-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  perl(IO::Stringy)
-BuildRequires:  perl(MIME::Base64) >= 2.20
-BuildRequires:  perl-MailTools
+BuildRequires:  perl(IO::Stringy)       >= 1.211
+BuildRequires:  perl(MIME::Base64)      >= 2.20
+BuildRequires:  perl-MailTools          >= 1.50
 BuildRequires:  perl(MIME::QuotedPrint)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
-MIME-tools is a collection of Perl5 MIME:: modules for parsing,
-decoding, *and generating* single- or multipart (even nested
-multipart) MIME messages. (Yes, kids, that means you can send messages
-with attached GIF files).
+MIME-tools is a collection of Perl5 MIME:: modules for parsing, decoding, and
+generating single- or multipart (even nested multipart) MIME messages.
 
+Yes, kids, that means you can send messages with attached GIF files.
 
 %prep
 %setup -q -n MIME-tools-%{version}
-chmod 644 examples/* # avoid dependencies
-f=ChangeLog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
-cat << \EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} $* | grep -v '^perl(main)$'
-EOF
-%define __perl_provides %{_builddir}/MIME-tools-%{version}/%{name}-prov
-chmod +x %{__perl_provides}
 
+# Fix character encoding
+/usr/bin/iconv -f iso-8859-1 -t utf-8 ChangeLog > ChangeLog.utf8
+%{__mv} ChangeLog.utf8 ChangeLog
+
+# Remove redundant provides
+%global provfilt /bin/sh -c "%{__perl_provides} | %{__grep} -Fvx 'perl(main)'"
+%define __perl_provides %{provfilt}
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags}
-
+%{__make} %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
-rm -f $RPM_BUILD_ROOT%{perl_vendorlib}/set-version.pl
-chmod -R u+w $RPM_BUILD_ROOT/*
-
+%{__rm} -rf %{buildroot}
+%{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
+/usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
+/usr/bin/find %{buildroot} -type d -depth -exec /bin/rmdir {} 2>/dev/null ';'
+%{__chmod} -R u+w %{buildroot}/*
 
 %check
-if %{__perl} -e "use MIME::QuotedPrint 3.03" 2>/dev/null ; then
-  make test
+if %{__perl} -e "use MIME::QuotedPrint 3.03" 2>/dev/null; then
+  %{__make} test
 else
   # Expected failures: 4, 5 and 7-11 of t/Misc.t
-  make test || :
+  %{__make} test || :
 fi
 
-
 %clean
-rm -rf $RPM_BUILD_ROOT
-
+%{__rm} -rf %{buildroot}
 
 %files
-%defattr(-,root,root,-)
-%doc ChangeLog COPYING README README-OR-DIE examples/
+%defattr(-,root,root,0755)
+%doc README* COPYING ChangeLog
+# Adding examples introduces additional deps, but these are all satisfied by
+# perl, perl-MIME-tools, and perl-MailTools, which are all deps anyway.
+%doc examples
 %{perl_vendorlib}/MIME/
-%{_mandir}/man3/MIME::*.3*
-
+%{_mandir}/man3/MIME::*.3pm*
 
 %changelog
+* Wed Apr 19 2006 Paul Howarth <paul at city-fan.org> - 5.420-1
+- 5.420
+- Cosmetic changes reflecting new maintainer's preferences
+- Examples remain executable since they don't introduce new dependencies
+- Simplify provides filter
+
 * Mon Jan 16 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.419-1
 - 5.419.
 - Don't provide perl(main).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-tools/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	16 Jan 2006 20:47:22 -0000	1.5
+++ sources	19 Apr 2006 14:14:08 -0000	1.6
@@ -1 +1 @@
-1c033072b751e27ecb096bc155a7e406  MIME-tools-5.419.tar.gz
+4db6505cc0132c80c5a9cc54f443a21a  MIME-tools-5.420.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-tools/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	16 Jan 2006 20:47:22 -0000	1.5
+++ .cvsignore	19 Apr 2006 14:14:08 -0000	1.6
@@ -1 +1 @@
-MIME-tools-5.419.tar.gz
+MIME-tools-5.420.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 19 14:19:33 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Wed, 19 Apr 2006 07:19:33 -0700
Subject: status-report-scripts check_owners,NONE,1.1
Message-ID: <200604191419.k3JEJXcg014514@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14497

Added Files:
	check_owners 
Log Message:
Add check_owners.


***** Error reading new file: [Errno 2] No such file or directory: 'check_owners'



From fedora-extras-commits at redhat.com  Wed Apr 19 15:15:39 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Wed, 19 Apr 2006 08:15:39 -0700
Subject: fedora-security/audit fc4,1.205,1.206 fc5,1.118,1.119
Message-ID: <200604191515.k3JFFd8g016896@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16865/audit

Modified Files:
	fc4 fc5 
Log Message:
Add CVE-2006-1056



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- fc4	18 Apr 2006 13:59:57 -0000	1.205
+++ fc4	19 Apr 2006 15:15:37 -0000	1.206
@@ -95,6 +95,7 @@
 CVE-2006-1061 version (curl, 7.15.0 - 7.15.2 only)
 CVE-2006-1059 version (samba)
 CVE-2006-1058 VULNERABLE (busybox) bz#187386
+CVE-2006-1056 VULNERABLE (kernel, fixed 2.6.16.9)
 CVE-2006-1055 VULNERABLE (kernel, fixed 2.6.17-rc1)
 CVE-2006-1052 version (kernel, fixed 2.6.16) patch-2.6.16-rc6 [since FEDORA-2006-245]
 CVE-2006-1045 VULNERABLE (thunderbird)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- fc5	18 Apr 2006 13:59:57 -0000	1.118
+++ fc5	19 Apr 2006 15:15:37 -0000	1.119
@@ -96,6 +96,7 @@
 CVE-2006-1061 backport (curl, fixed 7.15.3) [since FEDORA-2006-189]
 CVE-2006-1059 version (samba, fixed 3.0.22 at least) bz#187170 [since FEDORA-2006-259]
 CVE-2006-1058 VULNERABLE (busybox) bz#187386
+CVE-2006-1056 VULNERABLE (kernel, fixed 2.6.16.9)
 CVE-2006-1055 VULNERABLE (kernel, fixed 2.6.17-rc1)
 CVE-2006-1052 version (kernel, fixed 2.6.16) patch-2.6.16-rc6 [since FEDORA-2006-233]
 CVE-2006-1045 VULNERABLE (thunderbird)



From fedora-extras-commits at redhat.com  Wed Apr 19 15:17:29 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Wed, 19 Apr 2006 08:17:29 -0700
Subject: fedora-security/audit fc4,1.206,1.207 fc5,1.119,1.120
Message-ID: <200604191517.k3JFHTdC016944@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16914/audit

Modified Files:
	fc4 fc5 
Log Message:
Add CVE-2006-1525



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.206
retrieving revision 1.207
diff -u -r1.206 -r1.207
--- fc4	19 Apr 2006 15:15:37 -0000	1.206
+++ fc4	19 Apr 2006 15:17:26 -0000	1.207
@@ -77,6 +77,7 @@
 CVE-2006-1530 VULNERABLE (firefox, fixed 1.0.8)
 CVE-2006-1529 VULNERABLE (thunderbird, fixed 1.0.8)
 CVE-2006-1529 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1525 VULNERABLE (kernel, fixed 2.6.16.8)
 CVE-2006-1524 VULNERABLE (kernel, fixed 2.6.16.5)
 CVE-2006-1523 VULNERABLE (kernel, fixed 2.6.16.4)
 CVE-2006-1522 VULNERABLE (kernel, fixed 2.6.16.3)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -r1.119 -r1.120
--- fc5	19 Apr 2006 15:15:37 -0000	1.119
+++ fc5	19 Apr 2006 15:17:26 -0000	1.120
@@ -76,6 +76,7 @@
 CVE-2006-1530 VULNERABLE (firefox, fixed 1.5.0.2)
 CVE-2006-1529 VULNERABLE (thunderbird, fixed 1.5.0.2)
 CVE-2006-1529 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1525 VULNERABLE (kernel, fixed 2.6.16.8)
 CVE-2006-1524 VULNERABLE (kernel, fixed 2.6.16.5)
 CVE-2006-1523 VULNERABLE (kernel, fixed 2.6.16.4)
 CVE-2006-1522 VULNERABLE (kernel, fixed 2.6.16.3)



From fedora-extras-commits at redhat.com  Wed Apr 19 15:43:55 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 19 Apr 2006 08:43:55 -0700
Subject: rpms/python-protocols/devel .cvsignore, 1.2,
	1.3 python-protocols.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200604191543.k3JFhvXH017121@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-protocols/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17100

Modified Files:
	.cvsignore python-protocols.spec sources 
Log Message:
Update to dev version 1.0a0dev_r2082



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-protocols/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Mar 2005 20:49:49 -0000	1.2
+++ .cvsignore	19 Apr 2006 15:43:55 -0000	1.3
@@ -1,2 +1 @@
-PyProtocols-0.9.3.tar.gz
-setuptools.tar.gz
+PyProtocols-1.0a0dev_r2082.zip


Index: python-protocols.spec
===================================================================
RCS file: /cvs/extras/rpms/python-protocols/devel/python-protocols.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- python-protocols.spec	13 Feb 2006 17:53:03 -0000	1.5
+++ python-protocols.spec	19 Apr 2006 15:43:55 -0000	1.6
@@ -1,22 +1,26 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %define python_abi %(%{__python} -c "import sys; print sys.version[:3]")
 
-%define srcname PyProtocols
+%define srcname  PyProtocols
+%define alphatag a0dev_r2082
+%define srcver   1.0%{?alphatag}
+%define eggver   1.0a0
 
 Name:           python-protocols
-Version:        0.9.3
-Release:        7%{?dist}
+Version:        1.0
+Release:        0.1.%{alphatag}%{?dist}
 
 Summary:        Open Protocols and Component Adaptation for Python
 
 Group:          Development/Libraries
 License:        PSF or ZPL
 URL:            http://peak.telecommunity.com/PyProtocols.html
-Source0:        http://peak.telecommunity.com/dist/%{srcname}-%{version}.tar.gz
+#Source0:        http://peak.telecommunity.com/dist/%{srcname}-%{version}.tar.gz
+Source0:        http://www.turbogears.org/download/eggs/%{srcname}-%{srcver}.zip
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel python-setuptools
-Requires:   python-abi = %{python_abi}
+Requires:       python-abi = %{python_abi}
 
 %description
 PyProtocols is an implementation of PEP 246 allowing Python programmers to
@@ -24,7 +28,7 @@
 fragile 'isinstance' if type() comparisons.
 
 %prep
-%setup -q -n %{srcname}-%{version}
+%setup -q -n %{srcname}-%{srcver}
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -48,10 +52,13 @@
 %{python_sitearch}/protocols/*/*.py
 %{python_sitearch}/protocols/*/*.pyc
 %ghost %{python_sitearch}/protocols/*/*.pyo
-%dir %{python_sitearch}/%{srcname}-%{version}-py%{python_abi}.egg-info
-%{python_sitearch}/%{srcname}-%{version}-py%{python_abi}.egg-info/*
+%dir %{python_sitearch}/%{srcname}-%{eggver}-py%{python_abi}.egg-info
+%{python_sitearch}/%{srcname}-%{eggver}-py%{python_abi}.egg-info/*
 
 %changelog
+* Wed Apr 19 2006 Shahms E. King <shahms at shahms.com> 1.0-0.1.a0dev_r2082
+- Update to new upstream location and snapshot version
+
 * Mon Feb 13 2006 Shahms E. King <shahms at shahms.com> 0.9.3-7
 - Rebuild for FC5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-protocols/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Feb 2006 17:53:03 -0000	1.3
+++ sources	19 Apr 2006 15:43:55 -0000	1.4
@@ -1 +1 @@
-50559c9869389e9d576b98f6382b1324  PyProtocols-0.9.3.tar.gz
+11c5871560b65cf72b45845013297b94  PyProtocols-1.0a0dev_r2082.zip



From fedora-extras-commits at redhat.com  Wed Apr 19 15:47:20 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 19 Apr 2006 08:47:20 -0700
Subject: rpms/perl-Net-SSH-Perl - New directory
Message-ID: <200604191547.k3JFlM5B017236@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Net-SSH-Perl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17215/perl-Net-SSH-Perl

Log Message:
Directory /cvs/extras/rpms/perl-Net-SSH-Perl added to the repository




From fedora-extras-commits at redhat.com  Wed Apr 19 15:47:20 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 19 Apr 2006 08:47:20 -0700
Subject: rpms/perl-Net-SSH-Perl/devel - New directory
Message-ID: <200604191547.k3JFlMxL017239@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Net-SSH-Perl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17215/perl-Net-SSH-Perl/devel

Log Message:
Directory /cvs/extras/rpms/perl-Net-SSH-Perl/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Apr 19 15:47:53 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 19 Apr 2006 08:47:53 -0700
Subject: rpms/perl-Net-SSH-Perl Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604191547.k3JFltvc017293@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Net-SSH-Perl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17260

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Net-SSH-Perl


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Net-SSH-Perl
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Wed Apr 19 15:47:54 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 19 Apr 2006 08:47:54 -0700
Subject: rpms/perl-Net-SSH-Perl/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200604191547.k3JFlu3n017296@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Net-SSH-Perl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17260/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Net-SSH-Perl


--- 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 Apr 19 15:48:42 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 19 Apr 2006 08:48:42 -0700
Subject: rpms/perl-Net-SSH-Perl import.log,1.1,1.2
Message-ID: <200604191548.k3JFmifN017359@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Net-SSH-Perl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17326

Modified Files:
	import.log 
Log Message:
auto-import perl-Net-SSH-Perl-1.30-1 on branch devel from perl-Net-SSH-Perl-1.30-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-SSH-Perl/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Apr 2006 15:47:53 -0000	1.1
+++ import.log	19 Apr 2006 15:48:41 -0000	1.2
@@ -0,0 +1 @@
+perl-Net-SSH-Perl-1_30-1:HEAD:perl-Net-SSH-Perl-1.30-1.src.rpm:1145461710



From fedora-extras-commits at redhat.com  Wed Apr 19 15:48:42 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 19 Apr 2006 08:48:42 -0700
Subject: rpms/perl-Net-SSH-Perl/devel perl-Net-SSH-Perl.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604191548.k3JFmir7017364@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-Net-SSH-Perl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17326/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Net-SSH-Perl.spec 
Log Message:
auto-import perl-Net-SSH-Perl-1.30-1 on branch devel from perl-Net-SSH-Perl-1.30-1.src.rpm


--- NEW FILE perl-Net-SSH-Perl.spec ---
# IDEA is a patent-encumbered alogorithm so default to not supporting it
# To include support for the IDEA algorithm, use: rpmbuild --with IDEA

Summary:	SSH (Secure Shell) client
Name:		perl-Net-SSH-Perl
Version:	1.30
Release:	1%{?dist}
License:	GPL or Artistic
Group:		Development/Libraries
Url:		http://search.cpan.org/dist/Net-SSH-Perl/
Source0:	http://search.cpan.org/CPAN/authors/id/D/DB/DBROBINS/Net-SSH-Perl-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
BuildArch:	noarch
BuildRequires:	perl(String::CRC32)        >= 1.2
BuildRequires:	perl(Convert::PEM)         >= 0.05
BuildRequires:	perl(Crypt::Blowfish)
BuildRequires:	perl(Crypt::DH)            >= 0.01
BuildRequires:	perl(Crypt::DSA)           >= 0.11
BuildRequires:	perl(Crypt::RSA)
BuildRequires:	perl(Digest::BubbleBabble)
BuildRequires:	perl(Digest::HMAC_MD5)
BuildRequires:	perl(Digest::HMAC_SHA1)
BuildRequires:	perl(Digest::MD5)
BuildRequires:	perl(Digest::SHA1)         >= 2.10
BuildRequires:	perl(Math::GMP)            >= 1.04
BuildRequires:	perl(Math::Pari)           >= 2.001804
BuildRequires:	perl(MIME::Base64)

%{?_with_IDEA:BuildRequires: perl(Crypt::IDEA)}

%description
Net::SSH::Perl is an all-Perl module implementing an SSH (Secure Shell)
client. It is compatible with both the SSH-1 and SSH-2 protocols.

%prep
%setup -q -n Net-SSH-Perl-%{version}

# Avoid extra deps from examples
%{__chmod} -x eg/*

# Remove Crypt::IDEA dep if we're not supporting the IDEA algorithm
%define bogusreq 'perl(Crypt::IDEA)'
%global reqfilt /bin/sh -c "%{__perl_requires} | %{__grep} -Fvx %{bogusreq}"
%{!?_with_IDEA:%define __perl_requires %{reqfilt}}

%build
(
	# Protocol support (select one)
	# 1=SSH1 2=SSH2 3=Both
	echo 3

	# Algorithm selection (select all required)
	# 1=IDEA 2=DES 3=DES3 4=Blowfish 5=RC4
	echo %{?_with_IDEA:1 }2 3 4 5
) |
%{__perl} Makefile.PL INSTALLDIRS=vendor
%{__make} %{?_smp_mflags}

%check
%{__make} test

%install
%{__rm} -rf %{buildroot}
%{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
/usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
/usr/bin/find %{buildroot} -type d -depth -exec /bin/rmdir {} 2>/dev/null ';'
%{__chmod} -R u+w %{buildroot}/*

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root,0755)
%doc Changes README LICENSE eg ToDo
%{perl_vendorlib}/Net/
%{_mandir}/man3/Net::SSH::Perl*.3pm*

%changelog
* Mon Mar 20 2006 Paul Howarth <paul at city-fan.org> 1.30-1
- Update to 1.30
- Patch for cpan rt#11674 no longer needed, fixed upstream

* Thu Mar  2 2006 Paul Howarth <paul at city-fan.org> 1.29-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-SSH-Perl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Apr 2006 15:47:54 -0000	1.1
+++ .cvsignore	19 Apr 2006 15:48:42 -0000	1.2
@@ -0,0 +1 @@
+Net-SSH-Perl-1.30.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-SSH-Perl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Apr 2006 15:47:54 -0000	1.1
+++ sources	19 Apr 2006 15:48:42 -0000	1.2
@@ -0,0 +1 @@
+063f3dc93a4fe6108b068b6d6097992d  Net-SSH-Perl-1.30.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 19 15:54:36 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 19 Apr 2006 08:54:36 -0700
Subject: owners owners.list,1.860,1.861
Message-ID: <200604191554.k3JFsc64017479@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17462

Modified Files:
	owners.list 
Log Message:
perl-Net-SSH-Perl



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.860
retrieving revision 1.861
diff -u -r1.860 -r1.861
--- owners.list	19 Apr 2006 14:06:50 -0000	1.860
+++ owners.list	19 Apr 2006 15:54:36 -0000	1.861
@@ -1051,6 +1051,7 @@
 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-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-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|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-Number-Compare|Perl module for numeric comparisons|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-OLE-Storage_Lite|Simple Class for OLE document interface|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Wed Apr 19 15:57:49 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 19 Apr 2006 08:57:49 -0700
Subject: rpms/perl-MIME-tools/FC-5 perl-MIME-tools.spec, 1.12, 1.13 sources, 
	1.5, 1.6 .cvsignore, 1.5, 1.6
Message-ID: <200604191557.k3JFvpxM017559@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-MIME-tools/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17536

Modified Files:
	perl-MIME-tools.spec sources .cvsignore 
Log Message:
resync with devel



Index: perl-MIME-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-tools/FC-5/perl-MIME-tools.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-MIME-tools.spec	16 Jan 2006 20:47:22 -0000	1.12
+++ perl-MIME-tools.spec	19 Apr 2006 15:57:49 -0000	1.13
@@ -1,75 +1,74 @@
 Name:           perl-MIME-tools
-Version:        5.419
+Version:        5.420
 Release:        1%{?dist}
 Summary:        Modules for parsing and creating MIME entities in Perl
-
 Group:          Development/Libraries
 License:        Artistic or GPL
 URL:            http://search.cpan.org/dist/MIME-tools/
-Source0:        http://www.cpan.org/authors/id/D/DS/DSKOLL/MIME-tools-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-broot-%(%{__id_u} -n)
-
+Source0:        http://search.cpan.org/CPAN/authors/id/D/DS/DSKOLL/MIME-tools-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  perl(IO::Stringy)
-BuildRequires:  perl(MIME::Base64) >= 2.20
-BuildRequires:  perl-MailTools
+BuildRequires:  perl(IO::Stringy)       >= 1.211
+BuildRequires:  perl(MIME::Base64)      >= 2.20
+BuildRequires:  perl-MailTools          >= 1.50
 BuildRequires:  perl(MIME::QuotedPrint)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
-MIME-tools is a collection of Perl5 MIME:: modules for parsing,
-decoding, *and generating* single- or multipart (even nested
-multipart) MIME messages. (Yes, kids, that means you can send messages
-with attached GIF files).
+MIME-tools is a collection of Perl5 MIME:: modules for parsing, decoding, and
+generating single- or multipart (even nested multipart) MIME messages.
 
+Yes, kids, that means you can send messages with attached GIF files.
 
 %prep
 %setup -q -n MIME-tools-%{version}
-chmod 644 examples/* # avoid dependencies
-f=ChangeLog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
-cat << \EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} $* | grep -v '^perl(main)$'
-EOF
-%define __perl_provides %{_builddir}/MIME-tools-%{version}/%{name}-prov
-chmod +x %{__perl_provides}
 
+# Fix character encoding
+/usr/bin/iconv -f iso-8859-1 -t utf-8 ChangeLog > ChangeLog.utf8
+%{__mv} ChangeLog.utf8 ChangeLog
+
+# Remove redundant provides
+%global provfilt /bin/sh -c "%{__perl_provides} | %{__grep} -Fvx 'perl(main)'"
+%define __perl_provides %{provfilt}
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags}
-
+%{__make} %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
-rm -f $RPM_BUILD_ROOT%{perl_vendorlib}/set-version.pl
-chmod -R u+w $RPM_BUILD_ROOT/*
-
+%{__rm} -rf %{buildroot}
+%{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
+/usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
+/usr/bin/find %{buildroot} -type d -depth -exec /bin/rmdir {} 2>/dev/null ';'
+%{__chmod} -R u+w %{buildroot}/*
 
 %check
-if %{__perl} -e "use MIME::QuotedPrint 3.03" 2>/dev/null ; then
-  make test
+if %{__perl} -e "use MIME::QuotedPrint 3.03" 2>/dev/null; then
+  %{__make} test
 else
   # Expected failures: 4, 5 and 7-11 of t/Misc.t
-  make test || :
+  %{__make} test || :
 fi
 
-
 %clean
-rm -rf $RPM_BUILD_ROOT
-
+%{__rm} -rf %{buildroot}
 
 %files
-%defattr(-,root,root,-)
-%doc ChangeLog COPYING README README-OR-DIE examples/
+%defattr(-,root,root,0755)
+%doc README* COPYING ChangeLog
+# Adding examples introduces additional deps, but these are all satisfied by
+# perl, perl-MIME-tools, and perl-MailTools, which are all deps anyway.
+%doc examples
 %{perl_vendorlib}/MIME/
-%{_mandir}/man3/MIME::*.3*
-
+%{_mandir}/man3/MIME::*.3pm*
 
 %changelog
+* Wed Apr 19 2006 Paul Howarth <paul at city-fan.org> - 5.420-1
+- 5.420
+- Cosmetic changes reflecting new maintainer's preferences
+- Examples remain executable since they don't introduce new dependencies
+- Simplify provides filter
+
 * Mon Jan 16 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.419-1
 - 5.419.
 - Don't provide perl(main).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-tools/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	16 Jan 2006 20:47:22 -0000	1.5
+++ sources	19 Apr 2006 15:57:49 -0000	1.6
@@ -1 +1 @@
-1c033072b751e27ecb096bc155a7e406  MIME-tools-5.419.tar.gz
+4db6505cc0132c80c5a9cc54f443a21a  MIME-tools-5.420.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-tools/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	16 Jan 2006 20:47:22 -0000	1.5
+++ .cvsignore	19 Apr 2006 15:57:49 -0000	1.6
@@ -1 +1 @@
-MIME-tools-5.419.tar.gz
+MIME-tools-5.420.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 19 15:59:31 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 19 Apr 2006 08:59:31 -0700
Subject: rpms/perl-MIME-tools/FC-4 perl-MIME-tools.spec, 1.10, 1.11 sources, 
	1.4, 1.5 .cvsignore, 1.4, 1.5
Message-ID: <200604191559.k3JFxXI9017634@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-MIME-tools/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17613

Modified Files:
	perl-MIME-tools.spec sources .cvsignore 
Log Message:
resync with devel



Index: perl-MIME-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-tools/FC-4/perl-MIME-tools.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-MIME-tools.spec	16 Jan 2006 20:50:23 -0000	1.10
+++ perl-MIME-tools.spec	19 Apr 2006 15:59:30 -0000	1.11
@@ -1,75 +1,74 @@
 Name:           perl-MIME-tools
-Version:        5.419
+Version:        5.420
 Release:        1%{?dist}
 Summary:        Modules for parsing and creating MIME entities in Perl
-
 Group:          Development/Libraries
 License:        Artistic or GPL
 URL:            http://search.cpan.org/dist/MIME-tools/
-Source0:        http://www.cpan.org/authors/id/D/DS/DSKOLL/MIME-tools-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-broot-%(%{__id_u} -n)
-
+Source0:        http://search.cpan.org/CPAN/authors/id/D/DS/DSKOLL/MIME-tools-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  perl(IO::Stringy)
-BuildRequires:  perl(MIME::Base64) >= 2.20
-BuildRequires:  perl-MailTools
+BuildRequires:  perl(IO::Stringy)       >= 1.211
+BuildRequires:  perl(MIME::Base64)      >= 2.20
+BuildRequires:  perl-MailTools          >= 1.50
 BuildRequires:  perl(MIME::QuotedPrint)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
-MIME-tools is a collection of Perl5 MIME:: modules for parsing,
-decoding, *and generating* single- or multipart (even nested
-multipart) MIME messages. (Yes, kids, that means you can send messages
-with attached GIF files).
+MIME-tools is a collection of Perl5 MIME:: modules for parsing, decoding, and
+generating single- or multipart (even nested multipart) MIME messages.
 
+Yes, kids, that means you can send messages with attached GIF files.
 
 %prep
 %setup -q -n MIME-tools-%{version}
-chmod 644 examples/* # avoid dependencies
-f=ChangeLog ; iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
-cat << \EOF > %{name}-prov
-#!/bin/sh
-%{__perl_provides} $* | grep -v '^perl(main)$'
-EOF
-%define __perl_provides %{_builddir}/MIME-tools-%{version}/%{name}-prov
-chmod +x %{__perl_provides}
 
+# Fix character encoding
+/usr/bin/iconv -f iso-8859-1 -t utf-8 ChangeLog > ChangeLog.utf8
+%{__mv} ChangeLog.utf8 ChangeLog
+
+# Remove redundant provides
+%global provfilt /bin/sh -c "%{__perl_provides} | %{__grep} -Fvx 'perl(main)'"
+%define __perl_provides %{provfilt}
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags}
-
+%{__make} %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
-rm -f $RPM_BUILD_ROOT%{perl_vendorlib}/set-version.pl
-chmod -R u+w $RPM_BUILD_ROOT/*
-
+%{__rm} -rf %{buildroot}
+%{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
+/usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
+/usr/bin/find %{buildroot} -type d -depth -exec /bin/rmdir {} 2>/dev/null ';'
+%{__chmod} -R u+w %{buildroot}/*
 
 %check
-if %{__perl} -e "use MIME::QuotedPrint 3.03" 2>/dev/null ; then
-  make test
+if %{__perl} -e "use MIME::QuotedPrint 3.03" 2>/dev/null; then
+  %{__make} test
 else
   # Expected failures: 4, 5 and 7-11 of t/Misc.t
-  make test || :
+  %{__make} test || :
 fi
 
-
 %clean
-rm -rf $RPM_BUILD_ROOT
-
+%{__rm} -rf %{buildroot}
 
 %files
-%defattr(-,root,root,-)
-%doc ChangeLog COPYING README README-OR-DIE examples/
+%defattr(-,root,root,0755)
+%doc README* COPYING ChangeLog
+# Adding examples introduces additional deps, but these are all satisfied by
+# perl, perl-MIME-tools, and perl-MailTools, which are all deps anyway.
+%doc examples
 %{perl_vendorlib}/MIME/
-%{_mandir}/man3/MIME::*.3*
-
+%{_mandir}/man3/MIME::*.3pm*
 
 %changelog
+* Wed Apr 19 2006 Paul Howarth <paul at city-fan.org> - 5.420-1
+- 5.420
+- Cosmetic changes reflecting new maintainer's preferences
+- Examples remain executable since they don't introduce new dependencies
+- Simplify provides filter
+
 * Mon Jan 16 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.419-1
 - 5.419.
 - Don't provide perl(main).


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-tools/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Jan 2006 20:50:23 -0000	1.4
+++ sources	19 Apr 2006 15:59:30 -0000	1.5
@@ -1 +1 @@
-1c033072b751e27ecb096bc155a7e406  MIME-tools-5.419.tar.gz
+4db6505cc0132c80c5a9cc54f443a21a  MIME-tools-5.420.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-tools/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	16 Jan 2006 20:50:23 -0000	1.4
+++ .cvsignore	19 Apr 2006 15:59:30 -0000	1.5
@@ -1 +1 @@
-MIME-tools-5.419.tar.gz
+MIME-tools-5.420.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 19 16:02:31 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Wed, 19 Apr 2006 09:02:31 -0700
Subject: rpms/perl-MIME-tools/FC-3 perl-MIME-tools.spec, 1.6, 1.7 sources,
	1.3, 1.4 .cvsignore, 1.3, 1.4
Message-ID: <200604191603.k3JG35PY019717@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-MIME-tools/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19688

Modified Files:
	perl-MIME-tools.spec sources .cvsignore 
Log Message:
resync with devel



Index: perl-MIME-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-tools/FC-3/perl-MIME-tools.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-MIME-tools.spec	22 Jan 2005 11:53:15 -0000	1.6
+++ perl-MIME-tools.spec	19 Apr 2006 16:02:29 -0000	1.7
@@ -1,70 +1,88 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-MIME-tools
-Version:        5.417
-Release:        1
-Epoch:          0
+Version:        5.420
+Release:        1%{?dist}
 Summary:        Modules for parsing and creating MIME entities in Perl
-
 Group:          Development/Libraries
-License:        Artistic
+License:        Artistic or GPL
 URL:            http://search.cpan.org/dist/MIME-tools/
-Source0:     http://www.cpan.org/authors/id/D/DS/DSKOLL/MIME-tools-5.417.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-broot-%(%{__id_u} -n)
-
+Source0:        http://search.cpan.org/CPAN/authors/id/D/DS/DSKOLL/MIME-tools-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
-BuildRequires:  perl(IO::Stringy) perl(MIME::Base64) >= 2.20 perl-MailTools
-BuildRequires:  perl >= 1:5.6.1 perl(MIME::QuotedPrint)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires:  perl(IO::Stringy)       >= 1.211
+BuildRequires:  perl(MIME::Base64)      >= 2.20
+BuildRequires:  perl-MailTools          >= 1.50
+BuildRequires:  perl(MIME::QuotedPrint)
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
-MIME-tools is a collection of Perl5 MIME:: modules for parsing,
-decoding, *and generating* single- or multipart (even nested
-multipart) MIME messages. (Yes, kids, that means you can send messages
-with attached GIF files).
+MIME-tools is a collection of Perl5 MIME:: modules for parsing, decoding, and
+generating single- or multipart (even nested multipart) MIME messages.
 
+Yes, kids, that means you can send messages with attached GIF files.
 
 %prep
 %setup -q -n MIME-tools-%{version}
-chmod 644 examples/* # avoid dependencies
 
+# Fix character encoding
+/usr/bin/iconv -f iso-8859-1 -t utf-8 ChangeLog > ChangeLog.utf8
+%{__mv} ChangeLog.utf8 ChangeLog
+
+# Remove redundant provides
+%global provfilt /bin/sh -c "%{__perl_provides} | %{__grep} -Fvx 'perl(main)'"
+%define __perl_provides %{provfilt}
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
-make %{?_smp_mflags}
-
+%{__make} %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
-find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
-rm -f $RPM_BUILD_ROOT%{perl_vendorlib}/set-version.pl
-chmod -R u+w $RPM_BUILD_ROOT/*
-
-
-%check || :
-if %{__perl} -MMIME::QuotedPrint \
-  -e 'exit ($MIME::QuotedPrint::VERSION < 3.03)' ; then
-  make test
+%{__rm} -rf %{buildroot}
+%{__make} pure_install PERL_INSTALL_ROOT=%{buildroot}
+/usr/bin/find %{buildroot} -type f -name .packlist -exec %{__rm} -f {} ';'
+/usr/bin/find %{buildroot} -type d -depth -exec /bin/rmdir {} 2>/dev/null ';'
+%{__chmod} -R u+w %{buildroot}/*
+
+%check
+if %{__perl} -e "use MIME::QuotedPrint 3.03" 2>/dev/null; then
+  %{__make} test
 else
   # Expected failures: 4, 5 and 7-11 of t/Misc.t
-  make test || :
+  %{__make} test || :
 fi
 
-
 %clean
-rm -rf $RPM_BUILD_ROOT
-
+%{__rm} -rf %{buildroot}
 
 %files
-%defattr(-,root,root,-)
-%doc ChangeLog COPYING README README-OR-DIE examples
-%{perl_vendorlib}/MIME
-%{_mandir}/man3/MIME::*.3*
-
+%defattr(-,root,root,0755)
+%doc README* COPYING ChangeLog
+# Adding examples introduces additional deps, but these are all satisfied by
+# perl, perl-MIME-tools, and perl-MailTools, which are all deps anyway.
+%doc examples
+%{perl_vendorlib}/MIME/
+%{_mandir}/man3/MIME::*.3pm*
 
 %changelog
+* Wed Apr 19 2006 Paul Howarth <paul at city-fan.org> - 5.420-1
+- 5.420
+- Cosmetic changes reflecting new maintainer's preferences
+- Examples remain executable since they don't introduce new dependencies
+- Simplify provides filter
+
+* Mon Jan 16 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.419-1
+- 5.419.
+- Don't provide perl(main).
+
+* Tue Oct  4 2005 Paul Howarth <paul at city-fan.org> - 5.418-2
+- License is same as perl (GPL or Artistic), not just Artistic
+
+* Mon Oct  3 2005 Ville Skytt?? <ville.skytta at iki.fi> - 5.418-1
+- 5.418.
+- Cosmetic specfile cleanups.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 5.417-2
+- rebuilt
+
 * Sat Jan 22 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:5.417-1
 - Update to 5.417.
 
@@ -100,5 +118,5 @@
 * Wed Jun 25 2003 Dams <anvil[AT]livna.org> 0:5.411-0.fdr.2.a
 - Now using roaringpenguin tarball
 
-* Sun Jun 15 2003 Dams <anvil[AT]livna.org> 
+* Sun Jun 15 2003 Dams <anvil[AT]livna.org>
 - Initial build.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-tools/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Jan 2005 11:53:15 -0000	1.3
+++ sources	19 Apr 2006 16:02:29 -0000	1.4
@@ -1 +1 @@
-a92299db8729f0f7886ada6e3539b265  MIME-tools-5.417.tar.gz
+4db6505cc0132c80c5a9cc54f443a21a  MIME-tools-5.420.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-MIME-tools/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Jan 2005 11:53:15 -0000	1.3
+++ .cvsignore	19 Apr 2006 16:02:29 -0000	1.4
@@ -1 +1 @@
-MIME-tools-5.417.tar.gz
+MIME-tools-5.420.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 19 16:51:35 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Wed, 19 Apr 2006 09:51:35 -0700
Subject: rpms/octave/devel octave-2.9.5-config.patch, NONE, 1.1 octave.spec, 
	1.36, 1.37
Message-ID: <200604191651.k3JGpb8M021162@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/octave/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21142

Modified Files:
	octave.spec 
Added Files:
	octave-2.9.5-config.patch 
Log Message:
Add new patch to configure script.

octave-2.9.5-config.patch:

--- NEW FILE octave-2.9.5-config.patch ---
--- configure.orig	2006-04-18 08:22:38.000000000 -0500
+++ configure	2006-04-18 08:30:46.000000000 -0500
@@ -3291,7 +3291,7 @@
 echo "$as_me:$LINENO: result: defining localfcnfiledir to be $localfcnfiledir" >&5
 echo "${ECHO_T}defining localfcnfiledir to be $localfcnfiledir" >&6
 
-: ${localapifcnfiledir='$(datadir)/octave/site/$(apiversion)/m'}
+: ${localapifcnfiledir='$(datadir)/octave/site/$(api_version)/m'}
 echo "$as_me:$LINENO: result: defining localapifcnfiledir to be $localapifcnfiledir" >&5
 echo "${ECHO_T}defining localapifcnfiledir to be $localapifcnfiledir" >&6
 
@@ -3327,7 +3327,7 @@
 echo "$as_me:$LINENO: result: defining localoctfiledir to be $localoctfiledir" >&5
 echo "${ECHO_T}defining localoctfiledir to be $localoctfiledir" >&6
 
-: ${localapioctfiledir='$(libexecdir)/octave/site/oct/$(apiversion)/$(canonical_host_type)'}
+: ${localapioctfiledir='$(libexecdir)/octave/site/oct/$(api_version)/$(canonical_host_type)'}
 echo "$as_me:$LINENO: result: defining localapioctfiledir to be $localapioctfiledir" >&5
 echo "${ECHO_T}defining localapioctfiledir to be $localapioctfiledir" >&6
 


Index: octave.spec
===================================================================
RCS file: /cvs/extras/rpms/octave/devel/octave.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- octave.spec	24 Mar 2006 21:19:19 -0000	1.36
+++ octave.spec	19 Apr 2006 16:51:35 -0000	1.37
@@ -1,6 +1,6 @@
 Name:           octave
 Version:        2.9.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 
@@ -8,6 +8,7 @@
 License:        GPL
 Source:         ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%{version}.tar.bz2
 Patch0:         octave-2.9.5-sparse.patch
+Patch1:         octave-2.9.5-config.patch
 URL:            http://www.octave.org
 Requires:       gnuplot less info texinfo 
 Requires(post): /sbin/install-info
@@ -51,6 +52,7 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0
 
 
 %build
@@ -133,6 +135,9 @@
 
 
 %changelog
+* Wed Apr 19 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.5-5
+- Add new patch to configure script (breaks octave-forge without it).
+
 * Fri Mar 24 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.5-4
 - Change patch again (suggested by the author on Octave mailing list).
 



From fedora-extras-commits at redhat.com  Wed Apr 19 18:32:16 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Wed, 19 Apr 2006 11:32:16 -0700
Subject: rpms/xdesktopwaves/FC-5 xdesktopwaves.spec,1.6,1.7
Message-ID: <200604191832.k3JIWITI026189@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/xdesktopwaves/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26172

Modified Files:
	xdesktopwaves.spec 
Log Message:
* Wed Apr 19 2006 Adrian Reber <adrian at lisas.de> - 1.3-7
- fixed BR



Index: xdesktopwaves.spec
===================================================================
RCS file: /cvs/extras/rpms/xdesktopwaves/FC-5/xdesktopwaves.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- xdesktopwaves.spec	11 Apr 2006 19:39:14 -0000	1.6
+++ xdesktopwaves.spec	19 Apr 2006 18:32:15 -0000	1.7
@@ -1,6 +1,6 @@
 Name:          xdesktopwaves
 Version:       1.3
-Release:       6%{?dist}
+Release:       7%{?dist}
 
 Summary:       Simulation of water waves on the X Window System desktop
 License:       GPL
@@ -8,7 +8,7 @@
 URL:           http://xdesktopwaves.sf.net/
 Source:        http://dl.sf.net/xdesktopwaves/xdesktopwaves-1.3.tar.gz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libX11-devel, desktop-file-utils
+BuildRequires: libX11-devel, desktop-file-utils, libXext-devel
 
 %description
 xdesktopwaves is a cellular automata setting the background of your X
@@ -61,6 +61,9 @@
 %{_datadir}/pixmaps/%{name}.xpm
 
 %changelog
+* Wed Apr 19 2006 Adrian Reber <adrian at lisas.de> - 1.3-7
+- fixed BR
+
 * Tue Apr 11 2006 Adrian Reber <adrian at lisas.de> - 1.3-6
 - trying to fix build on x86_64
 



From fedora-extras-commits at redhat.com  Wed Apr 19 18:53:13 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Wed, 19 Apr 2006 11:53:13 -0700
Subject: rpms/xdesktopwaves/devel xdesktopwaves.spec,1.4,1.5
Message-ID: <200604191853.k3JIrFLP027040@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/xdesktopwaves/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27023

Modified Files:
	xdesktopwaves.spec 
Log Message:
* Wed Apr 19 2006 Adrian Reber <adrian at lisas.de> - 1.3-7
- fixed BR



Index: xdesktopwaves.spec
===================================================================
RCS file: /cvs/extras/rpms/xdesktopwaves/devel/xdesktopwaves.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xdesktopwaves.spec	10 May 2005 06:36:00 -0000	1.4
+++ xdesktopwaves.spec	19 Apr 2006 18:53:13 -0000	1.5
@@ -1,6 +1,6 @@
 Name:          xdesktopwaves
 Version:       1.3
-Release:       4%{?dist}
+Release:       7%{?dist}
 
 Summary:       Simulation of water waves on the X Window System desktop
 License:       GPL
@@ -8,7 +8,7 @@
 URL:           http://xdesktopwaves.sf.net/
 Source:        http://dl.sf.net/xdesktopwaves/xdesktopwaves-1.3.tar.gz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: xorg-x11-devel, desktop-file-utils
+BuildRequires: libX11-devel, desktop-file-utils, libXext-devel
 
 %description
 xdesktopwaves is a cellular automata setting the background of your X
@@ -21,8 +21,7 @@
 %{__sed} -i -e "s,-s,," Makefile
 
 %build
-%{__make} CFLAGS="$RPM_OPT_FLAGS -I/usr/X11R6/include" \
-    LFLAGS="-L/usr/X11R6/%{_lib}" %{?_smp_mflags}
+%{__make} CFLAGS="$RPM_OPT_FLAGS" LFLAGS="-L/usr/%{_lib}" %{?_smp_mflags}
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -62,6 +61,15 @@
 %{_datadir}/pixmaps/%{name}.xpm
 
 %changelog
+* Wed Apr 19 2006 Adrian Reber <adrian at lisas.de> - 1.3-7
+- fixed BR
+
+* Tue Apr 11 2006 Adrian Reber <adrian at lisas.de> - 1.3-6
+- trying to fix build on x86_64
+
+* Tue Apr 11 2006 Adrian Reber <adrian at lisas.de> - 1.3-5
+- rebuilt for modular X
+
 * Tue May 10 2005 Adrian Reber <adrian at lisas.de> - 1.3-4
 - remove stripping from Makefile so that the
   debuginfo subpackage gets build



From fedora-extras-commits at redhat.com  Wed Apr 19 19:45:43 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Wed, 19 Apr 2006 12:45:43 -0700
Subject: fedora-security/audit fc4,1.207,1.208 fc5,1.120,1.121
Message-ID: <200604191945.k3JJjhp1029352@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29330

Modified Files:
	fc4 fc5 
Log Message:
Note a new CVE id.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- fc4	19 Apr 2006 15:17:26 -0000	1.207
+++ fc4	19 Apr 2006 19:45:41 -0000	1.208
@@ -188,6 +188,7 @@
 CVE-2006-0036 version (kernel, fixed 2.6.15.5, only 2.6.14 and 2.6.15) [since FEDORA-2006-245] was backport since FEDORA-2006-077
 CVE-2006-0035 version (kernel, fixed 2.6.15.5) [since FEDORA-2006-245] was backport since FEDORA-2006-077
 CVE-2006-0019 version (kdelibs, fixed 3.5.1) [since FEDORA-2006-090] was backport since FEDORA-2006-050
+CVE-2005-4784 ignore (glibc) struct dirent is big enough
 CVE-2005-4746 version (freeradius) we don't build vulnerable bits
 CVE-2005-4745 version (freeradius) we don't build vulnerable bits
 CVE-2005-4744 VULNERABLE (freeradius, fixed 1.0.5) bz#167677


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- fc5	19 Apr 2006 15:17:26 -0000	1.120
+++ fc5	19 Apr 2006 19:45:41 -0000	1.121
@@ -190,6 +190,7 @@
 CVE-2006-0036 version (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 [since FEDORA-2006-233]
 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-4784 ignore (glibc) struct dirent is big enough
 CVE-2005-4746 version (freeradius) we don't build vulnerable bits
 CVE-2005-4745 version (freeradius) we don't build vulnerable bits
 CVE-2005-4744 version (freeradius, fixed 1.0.5)



From fedora-extras-commits at redhat.com  Wed Apr 19 19:48:13 2006
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Wed, 19 Apr 2006 12:48:13 -0700
Subject: rpms/gpsd/FC-5 gpsd.spec,1.2,1.3
Message-ID: <200604191948.k3JJmFHB029396@cvs-int.fedora.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/gpsd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29365/FC-5

Modified Files:
	gpsd.spec 
Log Message:
Don't enable tnt gps driver as it causes havoc.  See bug 189220.



Index: gpsd.spec
===================================================================
RCS file: /cvs/extras/rpms/gpsd/FC-5/gpsd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gpsd.spec	13 Apr 2006 22:20:54 -0000	1.2
+++ gpsd.spec	19 Apr 2006 19:48:12 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gpsd
 Version:        2.32
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Service daemon for mediating access to a GPS
 
 Group:          System Environment/Daemons
@@ -57,7 +57,7 @@
 %setup -q
 
 %build
-%configure --enable-tnt --enable-dbus --disable-static
+%configure --enable-dbus --disable-static
 make %{?_smp_mflags}
 
 %install
@@ -146,6 +146,10 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Wed Apr 19 2006 Matthew Truch <matt at truch.net> - 2.32-5
+- Don't --enable-tnt in build as it causes some gpses to not work
+  properly with sattelite view mode.  See bugzilla bug 189220.
+
 * Thu Apr 13 2006 Matthew Truch <matt at truch.net> - 2.32-4
 - Add dbus-glib to BuildRequires as needed for build.
 



From fedora-extras-commits at redhat.com  Wed Apr 19 19:48:13 2006
From: fedora-extras-commits at redhat.com (Matthew D Truch (mtruch))
Date: Wed, 19 Apr 2006 12:48:13 -0700
Subject: rpms/gpsd/devel gpsd.spec,1.2,1.3
Message-ID: <200604191948.k3JJmFqL029400@cvs-int.fedora.redhat.com>

Author: mtruch

Update of /cvs/extras/rpms/gpsd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29365/devel

Modified Files:
	gpsd.spec 
Log Message:
Don't enable tnt gps driver as it causes havoc.  See bug 189220.



Index: gpsd.spec
===================================================================
RCS file: /cvs/extras/rpms/gpsd/devel/gpsd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gpsd.spec	13 Apr 2006 22:20:55 -0000	1.2
+++ gpsd.spec	19 Apr 2006 19:48:13 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gpsd
 Version:        2.32
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Service daemon for mediating access to a GPS
 
 Group:          System Environment/Daemons
@@ -57,7 +57,7 @@
 %setup -q
 
 %build
-%configure --enable-tnt --enable-dbus --disable-static
+%configure --enable-dbus --disable-static
 make %{?_smp_mflags}
 
 %install
@@ -146,6 +146,10 @@
 %{_datadir}/applications/*.desktop
 
 %changelog
+* Wed Apr 19 2006 Matthew Truch <matt at truch.net> - 2.32-5
+- Don't --enable-tnt in build as it causes some gpses to not work
+  properly with sattelite view mode.  See bugzilla bug 189220.
+
 * Thu Apr 13 2006 Matthew Truch <matt at truch.net> - 2.32-4
 - Add dbus-glib to BuildRequires as needed for build.
 



From fedora-extras-commits at redhat.com  Wed Apr 19 20:01:00 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 19 Apr 2006 13:01:00 -0700
Subject: rpms/archmage - New directory
Message-ID: <200604192001.k3JK12Mk030143@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/archmage
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29562/archmage

Log Message:
Directory /cvs/extras/rpms/archmage added to the repository




From fedora-extras-commits at redhat.com  Wed Apr 19 20:01:00 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 19 Apr 2006 13:01:00 -0700
Subject: rpms/archmage/devel - New directory
Message-ID: <200604192001.k3JK12eC030869@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/archmage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29562/archmage/devel

Log Message:
Directory /cvs/extras/rpms/archmage/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Apr 19 20:01:33 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 19 Apr 2006 13:01:33 -0700
Subject: rpms/archmage/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604192001.k3JK1ZHK031669@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/archmage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31633/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module archmage


--- 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 Apr 19 20:01:31 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 19 Apr 2006 13:01:31 -0700
Subject: rpms/archmage Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604192001.k3JK1XwK031648@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/archmage
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31633

Added Files:
	Makefile import.log 
Log Message:
Setup of module archmage


--- NEW FILE Makefile ---
# Top level Makefile for module archmage
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 19 20:02:07 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 19 Apr 2006 13:02:07 -0700
Subject: rpms/archmage import.log,1.1,1.2
Message-ID: <200604192002.k3JK2gGH031733@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/archmage
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31699

Modified Files:
	import.log 
Log Message:
auto-import archmage-0.0.7-1 on branch devel from archmage-0.0.7-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/archmage/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	19 Apr 2006 20:01:30 -0000	1.1
+++ import.log	19 Apr 2006 20:02:07 -0000	1.2
@@ -0,0 +1 @@
+archmage-0_0_7-1:HEAD:archmage-0.0.7-1.src.rpm:1145476892



From fedora-extras-commits at redhat.com  Wed Apr 19 20:02:15 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 19 Apr 2006 13:02:15 -0700
Subject: rpms/archmage/devel archmage.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604192002.k3JK2n3N031735@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/archmage/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31699/devel

Modified Files:
	.cvsignore sources 
Added Files:
	archmage.spec 
Log Message:
auto-import archmage-0.0.7-1 on branch devel from archmage-0.0.7-1.src.rpm


--- NEW FILE archmage.spec ---
%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}

Name:           archmage
Version:        0.0.7
Release:        1%{?dist}
Summary:        Extensible reader/decompiler of files in CHM format

Group:          Development/Tools
License:        GPL
URL:            http://archmage.sourceforge.net/
Source0:        http://dl.sourceforge.net/sourceforge/archmage/archmage-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
Requires:       python-chm
BuildRequires:  python-devel
Requires:   python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")

%description
arCHMage - extensible reader/decompiler of files in CHM format 
(Microsoft HTML help, also known as Compiled HTML).
arCHMage is based on chmlib by Jed Wing and is written on python.


%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
install -d $RPM_BUILD_ROOT%{_mandir}/man1/
install -m644 debian/archmage.1 $RPM_BUILD_ROOT%{_mandir}/man1/


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING README
%dir %{_sysconfdir}/archmage/
%config(noreplace) %{_sysconfdir}/archmage/arch.conf
%{_bindir}/archmage
%dir %{python_sitelib}/archmod/
%{python_sitelib}/archmod/*.py
%{python_sitelib}/archmod/*.pyc
%ghost %{python_sitelib}/archmod/*.pyo
%{_datadir}/archmage/
%{_mandir}/man*/archmage*

%changelog
* Mon Mar 20 2006 Patrice Dumas <pertusus at free.fr> 0.0.7-1
- initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/archmage/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	19 Apr 2006 20:01:33 -0000	1.1
+++ .cvsignore	19 Apr 2006 20:02:14 -0000	1.2
@@ -0,0 +1 @@
+archmage-0.0.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/archmage/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	19 Apr 2006 20:01:33 -0000	1.1
+++ sources	19 Apr 2006 20:02:14 -0000	1.2
@@ -0,0 +1 @@
+7535427b04c6f6f504ecd2fccc6dd268  archmage-0.0.7.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 19 20:36:15 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 19 Apr 2006 13:36:15 -0700
Subject: rpms/multitail/devel .cvsignore, 1.5, 1.6 multitail.spec, 1.4,
	1.5 sources, 1.5, 1.6
Message-ID: <200604192036.k3JKaHLO032036@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/multitail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32015

Modified Files:
	.cvsignore multitail.spec sources 
Log Message:
Update to 4.0.3.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/multitail/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	12 Apr 2006 23:49:05 -0000	1.5
+++ .cvsignore	19 Apr 2006 20:36:14 -0000	1.6
@@ -1 +1 @@
-multitail-4.0.0.tgz
+multitail-4.0.3.tgz


Index: multitail.spec
===================================================================
RCS file: /cvs/extras/rpms/multitail/devel/multitail.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- multitail.spec	12 Apr 2006 23:49:05 -0000	1.4
+++ multitail.spec	19 Apr 2006 20:36:14 -0000	1.5
@@ -1,5 +1,5 @@
 Name: multitail
-Version: 4.0.0
+Version: 4.0.3
 Release: 1%{?dist}
 Summary: View one or multiple files like tail but with multiple windows
 
@@ -56,6 +56,9 @@
 
 
 %changelog
+* Wed Apr 19 2006 Folkert van Heuesden <folkert at vanheusden.com> - 4.0.3-1
+- Updated to release 4.0.3.
+
 * Wed Apr 12 2006 Folkert van Heuesden <folkert at vanheusden.com> - 4.0.0-1
 - Updated to release 4.0.0.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/multitail/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	12 Apr 2006 23:49:05 -0000	1.5
+++ sources	19 Apr 2006 20:36:14 -0000	1.6
@@ -1 +1 @@
-6a86bcc65185faa37720c56a414fe5dd  multitail-4.0.0.tgz
+b6017e19aa7cf7e2b4fddd75a596a1a7  multitail-4.0.3.tgz



From fedora-extras-commits at redhat.com  Wed Apr 19 20:45:42 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 19 Apr 2006 13:45:42 -0700
Subject: rpms/compat-wxPythonGTK2/devel compat-wxPython.spec,1.1,1.2
Message-ID: <200604192045.k3JKji68032290@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/compat-wxPythonGTK2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32233/devel

Modified Files:
	compat-wxPython.spec 
Log Message:

Get rid of unnecessary Provides



Index: compat-wxPython.spec
===================================================================
RCS file: /cvs/extras/rpms/compat-wxPythonGTK2/devel/compat-wxPython.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- compat-wxPython.spec	6 Jan 2006 16:23:11 -0000	1.1
+++ compat-wxPython.spec	19 Apr 2006 20:45:42 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:           compat-wxPythonGTK2
 Version:        2.4.2.4
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Compatibility version of the wxWidgets GUI toolkit for Python
 Group:          Development/Languages
 License:        LGPL
@@ -16,8 +16,6 @@
 BuildRequires:  zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel
 BuildRequires:  python-devel
 
-# This is what other packages should depend on, NOT the package name!
-Provides:       wxPython = %{version}-%{release}
 Obsoletes:      wxPythonGTK2 <= 2.4.2.4-7
 Obsoletes:      wxPython <= 2.4.2.4-7
 
@@ -66,6 +64,9 @@
 %{python_sitearch}/wx/
 
 %changelog
+* Wed Apr 19 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.2.4-10
+- get rid of unnecessary provides
+
 * Fri Jan  6 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.2.4-9
 - spec cleanups
 



From fedora-extras-commits at redhat.com  Wed Apr 19 20:45:36 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 19 Apr 2006 13:45:36 -0700
Subject: rpms/compat-wxPythonGTK2/FC-4 compat-wxPython.spec,1.1,1.2
Message-ID: <200604192046.k3JKk806032300@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/compat-wxPythonGTK2/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32233/FC-4

Modified Files:
	compat-wxPython.spec 
Log Message:

Get rid of unnecessary Provides



Index: compat-wxPython.spec
===================================================================
RCS file: /cvs/extras/rpms/compat-wxPythonGTK2/FC-4/compat-wxPython.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- compat-wxPython.spec	6 Jan 2006 16:23:11 -0000	1.1
+++ compat-wxPython.spec	19 Apr 2006 20:45:36 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:           compat-wxPythonGTK2
 Version:        2.4.2.4
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Compatibility version of the wxWidgets GUI toolkit for Python
 Group:          Development/Languages
 License:        LGPL
@@ -16,8 +16,6 @@
 BuildRequires:  zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel
 BuildRequires:  python-devel
 
-# This is what other packages should depend on, NOT the package name!
-Provides:       wxPython = %{version}-%{release}
 Obsoletes:      wxPythonGTK2 <= 2.4.2.4-7
 Obsoletes:      wxPython <= 2.4.2.4-7
 
@@ -66,6 +64,9 @@
 %{python_sitearch}/wx/
 
 %changelog
+* Wed Apr 19 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.2.4-10
+- get rid of unnecessary provides
+
 * Fri Jan  6 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.2.4-9
 - spec cleanups
 



From fedora-extras-commits at redhat.com  Wed Apr 19 20:45:37 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 19 Apr 2006 13:45:37 -0700
Subject: rpms/compat-wxPythonGTK2/FC-5 compat-wxPython.spec,1.1,1.2
Message-ID: <200604192046.k3JKk9nK032305@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/compat-wxPythonGTK2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32233/FC-5

Modified Files:
	compat-wxPython.spec 
Log Message:

Get rid of unnecessary Provides



Index: compat-wxPython.spec
===================================================================
RCS file: /cvs/extras/rpms/compat-wxPythonGTK2/FC-5/compat-wxPython.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- compat-wxPython.spec	6 Jan 2006 16:23:11 -0000	1.1
+++ compat-wxPython.spec	19 Apr 2006 20:45:37 -0000	1.2
@@ -4,7 +4,7 @@
 
 Name:           compat-wxPythonGTK2
 Version:        2.4.2.4
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Compatibility version of the wxWidgets GUI toolkit for Python
 Group:          Development/Languages
 License:        LGPL
@@ -16,8 +16,6 @@
 BuildRequires:  zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel
 BuildRequires:  python-devel
 
-# This is what other packages should depend on, NOT the package name!
-Provides:       wxPython = %{version}-%{release}
 Obsoletes:      wxPythonGTK2 <= 2.4.2.4-7
 Obsoletes:      wxPython <= 2.4.2.4-7
 
@@ -66,6 +64,9 @@
 %{python_sitearch}/wx/
 
 %changelog
+* Wed Apr 19 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.2.4-10
+- get rid of unnecessary provides
+
 * Fri Jan  6 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.2.4-9
 - spec cleanups
 



From fedora-extras-commits at redhat.com  Wed Apr 19 20:49:21 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 19 Apr 2006 13:49:21 -0700
Subject: rpms/multitail/FC-4 .cvsignore, 1.4, 1.5 multitail.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200604192049.k3JKnNRw032488@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/multitail/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32451/FC-4

Modified Files:
	.cvsignore multitail.spec sources 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/multitail/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	30 Mar 2006 18:28:12 -0000	1.4
+++ .cvsignore	19 Apr 2006 20:49:21 -0000	1.5
@@ -1 +1 @@
-multitail-3.8.10.tgz
+multitail-4.0.3.tgz


Index: multitail.spec
===================================================================
RCS file: /cvs/extras/rpms/multitail/FC-4/multitail.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- multitail.spec	30 Mar 2006 18:28:12 -0000	1.3
+++ multitail.spec	19 Apr 2006 20:49:21 -0000	1.4
@@ -1,5 +1,5 @@
 Name: multitail
-Version: 3.8.10
+Version: 4.0.3
 Release: 1%{?dist}
 Summary: View one or multiple files like tail but with multiple windows
 
@@ -41,6 +41,8 @@
 			%{buildroot}%{_sysconfdir}
 %{__make} install DESTDIR="%{buildroot}"
 
+mv %{buildroot}%{_sysconfdir}/multitail.conf.new %{buildroot}%{_sysconfdir}/multitail.conf
+
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -48,12 +50,18 @@
 %files
 %defattr(-, root, root, 0755)
 %doc *.conf *.html Changes license.txt readme.txt
-%{_mandir}/man1/multitail.1*
 %config(noreplace) %{_sysconfdir}/multitail.conf
 %{_bindir}/multitail
+%{_mandir}/man1/multitail.1*
 
 
 %changelog
+* Wed Apr 19 2006 Folkert van Heuesden <folkert at vanheusden.com> - 4.0.3-1
+- Updated to release 4.0.3.
+
+* Wed Apr 12 2006 Folkert van Heuesden <folkert at vanheusden.com> - 4.0.0-1
+- Updated to release 4.0.0.
+
 * Thu Mar 30 2006 Folkert van Heuesden <folkert at vanheusden.com> - 3.8.10-1
 - Updated to release 3.8.10.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/multitail/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	30 Mar 2006 18:28:12 -0000	1.4
+++ sources	19 Apr 2006 20:49:21 -0000	1.5
@@ -1 +1 @@
-1b4cb6288298fe61c4c5147b50bfd48d  multitail-3.8.10.tgz
+b6017e19aa7cf7e2b4fddd75a596a1a7  multitail-4.0.3.tgz



From fedora-extras-commits at redhat.com  Wed Apr 19 20:49:21 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 19 Apr 2006 13:49:21 -0700
Subject: rpms/multitail/FC-5 .cvsignore, 1.4, 1.5 multitail.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200604192049.k3JKnNRU032494@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/multitail/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32451/FC-5

Modified Files:
	.cvsignore multitail.spec sources 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/multitail/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	30 Mar 2006 18:28:13 -0000	1.4
+++ .cvsignore	19 Apr 2006 20:49:21 -0000	1.5
@@ -1 +1 @@
-multitail-3.8.10.tgz
+multitail-4.0.3.tgz


Index: multitail.spec
===================================================================
RCS file: /cvs/extras/rpms/multitail/FC-5/multitail.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- multitail.spec	30 Mar 2006 18:28:13 -0000	1.3
+++ multitail.spec	19 Apr 2006 20:49:21 -0000	1.4
@@ -1,5 +1,5 @@
 Name: multitail
-Version: 3.8.10
+Version: 4.0.3
 Release: 1%{?dist}
 Summary: View one or multiple files like tail but with multiple windows
 
@@ -41,6 +41,8 @@
 			%{buildroot}%{_sysconfdir}
 %{__make} install DESTDIR="%{buildroot}"
 
+mv %{buildroot}%{_sysconfdir}/multitail.conf.new %{buildroot}%{_sysconfdir}/multitail.conf
+
 %clean
 %{__rm} -rf %{buildroot}
 
@@ -48,12 +50,18 @@
 %files
 %defattr(-, root, root, 0755)
 %doc *.conf *.html Changes license.txt readme.txt
-%{_mandir}/man1/multitail.1*
 %config(noreplace) %{_sysconfdir}/multitail.conf
 %{_bindir}/multitail
+%{_mandir}/man1/multitail.1*
 
 
 %changelog
+* Wed Apr 19 2006 Folkert van Heuesden <folkert at vanheusden.com> - 4.0.3-1
+- Updated to release 4.0.3.
+
+* Wed Apr 12 2006 Folkert van Heuesden <folkert at vanheusden.com> - 4.0.0-1
+- Updated to release 4.0.0.
+
 * Thu Mar 30 2006 Folkert van Heuesden <folkert at vanheusden.com> - 3.8.10-1
 - Updated to release 3.8.10.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/multitail/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	30 Mar 2006 18:28:13 -0000	1.4
+++ sources	19 Apr 2006 20:49:21 -0000	1.5
@@ -1 +1 @@
-1b4cb6288298fe61c4c5147b50bfd48d  multitail-3.8.10.tgz
+b6017e19aa7cf7e2b4fddd75a596a1a7  multitail-4.0.3.tgz



From fedora-extras-commits at redhat.com  Wed Apr 19 21:00:41 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Wed, 19 Apr 2006 14:00:41 -0700
Subject: rpms/perl-Error/devel .cvsignore, 1.2, 1.3 perl-Error.spec, 1.6,
	1.7 sources, 1.2, 1.3
Message-ID: <200604192100.k3JL0hk0032690@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Error/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32669

Modified Files:
	.cvsignore perl-Error.spec sources 
Log Message:
Update to 0.15008.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Dec 2004 16:29:48 -0000	1.2
+++ .cvsignore	19 Apr 2006 21:00:40 -0000	1.3
@@ -1 +1 @@
-Error-0.15.tar.gz
+Error-0.15008.tar.gz


Index: perl-Error.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/devel/perl-Error.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Error.spec	17 Feb 2006 19:03:52 -0000	1.6
+++ perl-Error.spec	19 Apr 2006 21:00:40 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Error
-Version:        0.15
-Release:        4%{?dist}
+Version:        0.15008
+Release:        1%{?dist}
 Summary:        Error Perl module
 
 License:        GPL or Artistic
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Wed Apr 19 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.15008-1
+- Update to 0.15008.
+
 * Fri Feb 17 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.15-4
 - Rebuild for FC5 (perl 5.8.8).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Dec 2004 16:29:48 -0000	1.2
+++ sources	19 Apr 2006 21:00:40 -0000	1.3
@@ -1 +1 @@
-81b4847fb893f18a4e85186bca5f4380  Error-0.15.tar.gz
+e66c11a0b7a501391643321f86f2171e  Error-0.15008.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 19 21:06:02 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 19 Apr 2006 14:06:02 -0700
Subject: rpms/compat-wxPythonGTK2/FC-5 compat-wxPython.spec,1.2,1.3
Message-ID: <200604192106.k3JL64Bs002376@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/compat-wxPythonGTK2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2345/FC-5

Modified Files:
	compat-wxPython.spec 
Log Message:

Fix missing BR



Index: compat-wxPython.spec
===================================================================
RCS file: /cvs/extras/rpms/compat-wxPythonGTK2/FC-5/compat-wxPython.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- compat-wxPython.spec	19 Apr 2006 20:45:37 -0000	1.2
+++ compat-wxPython.spec	19 Apr 2006 21:06:02 -0000	1.3
@@ -4,7 +4,7 @@
 
 Name:           compat-wxPythonGTK2
 Version:        2.4.2.4
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Compatibility version of the wxWidgets GUI toolkit for Python
 Group:          Development/Languages
 License:        LGPL
@@ -14,7 +14,7 @@
 
 BuildRequires:  compat-wxGTK2-devel >= 2.4.2, compat-wxGTK2-gl, pkgconfig
 BuildRequires:  zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel
-BuildRequires:  python-devel
+BuildRequires:  python-devel, mesa-libGLU-devel
 
 Obsoletes:      wxPythonGTK2 <= 2.4.2.4-7
 Obsoletes:      wxPython <= 2.4.2.4-7
@@ -64,6 +64,9 @@
 %{python_sitearch}/wx/
 
 %changelog
+* Wed Apr 19 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.2.4-11
+- add missing BuildRequires: mesa-libGLU-devel
+
 * Wed Apr 19 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.2.4-10
 - get rid of unnecessary provides
 



From fedora-extras-commits at redhat.com  Wed Apr 19 21:06:02 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 19 Apr 2006 14:06:02 -0700
Subject: rpms/compat-wxPythonGTK2/devel compat-wxPython.spec,1.2,1.3
Message-ID: <200604192106.k3JL64Yq002380@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/compat-wxPythonGTK2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2345/devel

Modified Files:
	compat-wxPython.spec 
Log Message:

Fix missing BR



Index: compat-wxPython.spec
===================================================================
RCS file: /cvs/extras/rpms/compat-wxPythonGTK2/devel/compat-wxPython.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- compat-wxPython.spec	19 Apr 2006 20:45:42 -0000	1.2
+++ compat-wxPython.spec	19 Apr 2006 21:06:02 -0000	1.3
@@ -4,7 +4,7 @@
 
 Name:           compat-wxPythonGTK2
 Version:        2.4.2.4
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Compatibility version of the wxWidgets GUI toolkit for Python
 Group:          Development/Languages
 License:        LGPL
@@ -14,7 +14,7 @@
 
 BuildRequires:  compat-wxGTK2-devel >= 2.4.2, compat-wxGTK2-gl, pkgconfig
 BuildRequires:  zlib-devel, libpng-devel, libjpeg-devel, libtiff-devel
-BuildRequires:  python-devel
+BuildRequires:  python-devel, mesa-libGLU-devel
 
 Obsoletes:      wxPythonGTK2 <= 2.4.2.4-7
 Obsoletes:      wxPython <= 2.4.2.4-7
@@ -64,6 +64,9 @@
 %{python_sitearch}/wx/
 
 %changelog
+* Wed Apr 19 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.2.4-11
+- add missing BuildRequires: mesa-libGLU-devel
+
 * Wed Apr 19 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.4.2.4-10
 - get rid of unnecessary provides
 



From fedora-extras-commits at redhat.com  Wed Apr 19 21:15:12 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 19 Apr 2006 14:15:12 -0700
Subject: rpms/lincity-ng/devel .cvsignore, 1.3, 1.4 lincity-ng.spec, 1.6,
	1.7 sources, 1.3, 1.4
Message-ID: <200604192115.k3JLFEb5002556@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/lincity-ng/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2483/devel

Modified Files:
	.cvsignore lincity-ng.spec sources 
Log Message:

Bump to 1.0.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Jan 2006 22:10:07 -0000	1.3
+++ .cvsignore	19 Apr 2006 21:15:12 -0000	1.4
@@ -1,2 +1,3 @@
 lincity-ng-1.0.1.tar.bz2
 lincity-ng-1.0.2.tar.bz2
+lincity-ng-1.0.3.tar.bz2


Index: lincity-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/devel/lincity-ng.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lincity-ng.spec	24 Mar 2006 22:09:57 -0000	1.6
+++ lincity-ng.spec	19 Apr 2006 21:15:12 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		lincity-ng
-Version:	1.0.2
-Release:	4%{?dist}
+Version:	1.0.3
+Release:	1%{?dist}
 License:	GPL
 Group:		Amusements/Games
 Summary:	City Simulation Game
@@ -13,7 +13,6 @@
 BuildRequires:	xorg-x11-proto-devel, libX11-devel, mesa-libGL-devel, mesa-libGLU-devel
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	kdelibs
-Patch0:		lincity-ng-1.0.2-gcc4.patch
 
 %description
 LinCity-NG is a City Simulation Game. It is a polished and improved version
@@ -31,7 +30,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 sed -i "s/CFLAGS += -O3 -g -Wall/CFLAGS += $RPM_OPT_FLAGS/" Jamrules
 sed -i "s/CXXFLAGS += -O3 -g -Wall/CXXFLAGS += $RPM_OPT_FLAGS/" Jamrules
 
@@ -65,6 +63,9 @@
 %{_datadir}/lincity-ng/
 
 %changelog
+* Wed Apr 19 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.3-1
+- bump to 1.0.3
+
 * Fri Mar 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.2-4
 - -O3 optimization makes the code cry
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Jan 2006 22:10:07 -0000	1.3
+++ sources	19 Apr 2006 21:15:12 -0000	1.4
@@ -1 +1 @@
-3cf29d581fca58f13faad12c126390ba  lincity-ng-1.0.2.tar.bz2
+2624857ed9437ac30445884d8593850e  lincity-ng-1.0.3.tar.bz2



From fedora-extras-commits at redhat.com  Wed Apr 19 21:15:05 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 19 Apr 2006 14:15:05 -0700
Subject: rpms/lincity-ng/FC-3 lincity-ng.spec,1.6,1.7 sources,1.3,1.4
Message-ID: <200604192115.k3JLFbgl002562@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/lincity-ng/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2483/FC-3

Modified Files:
	lincity-ng.spec sources 
Log Message:

Bump to 1.0.3



Index: lincity-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/FC-3/lincity-ng.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lincity-ng.spec	24 Mar 2006 22:09:23 -0000	1.6
+++ lincity-ng.spec	19 Apr 2006 21:15:05 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		lincity-ng
-Version:	1.0.2
-Release:	4%{?dist}
+Version:	1.0.3
+Release:	1%{?dist}
 License:	GPL
 Group:		Amusements/Games
 Summary:	City Simulation Game
@@ -12,7 +12,6 @@
 BuildRequires:	SDL_ttf-devel, xorg-x11-devel, desktop-file-utils
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	kdelibs
-Patch0:		lincity-ng-1.0.2-gcc4.patch
 
 %description
 LinCity-NG is a City Simulation Game. It is a polished and improved version
@@ -30,7 +29,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 sed -i "s/CFLAGS += -O3 -g -Wall/CFLAGS += $RPM_OPT_FLAGS/" Jamrules
 sed -i "s/CXXFLAGS += -O3 -g -Wall/CXXFLAGS += $RPM_OPT_FLAGS/" Jamrules
 
@@ -64,6 +62,9 @@
 %{_datadir}/lincity-ng/
 
 %changelog
+* Wed Apr 19 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.3-1
+- bump to 1.0.3
+
 * Fri Mar 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.2-4
 - -O3 optimization makes the code cry
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Jan 2006 22:09:28 -0000	1.3
+++ sources	19 Apr 2006 21:15:05 -0000	1.4
@@ -1 +1 @@
-3cf29d581fca58f13faad12c126390ba  lincity-ng-1.0.2.tar.bz2
+2624857ed9437ac30445884d8593850e  lincity-ng-1.0.3.tar.bz2



From fedora-extras-commits at redhat.com  Wed Apr 19 21:15:06 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 19 Apr 2006 14:15:06 -0700
Subject: rpms/lincity-ng/FC-4 lincity-ng.spec,1.6,1.7 sources,1.3,1.4
Message-ID: <200604192115.k3JLFcGO002566@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/lincity-ng/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2483/FC-4

Modified Files:
	lincity-ng.spec sources 
Log Message:

Bump to 1.0.3



Index: lincity-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/FC-4/lincity-ng.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lincity-ng.spec	24 Mar 2006 22:09:44 -0000	1.6
+++ lincity-ng.spec	19 Apr 2006 21:15:06 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		lincity-ng
-Version:	1.0.2
-Release:	4%{?dist}
+Version:	1.0.3
+Release:	1%{?dist}
 License:	GPL
 Group:		Amusements/Games
 Summary:	City Simulation Game
@@ -12,7 +12,6 @@
 BuildRequires:	SDL_ttf-devel, xorg-x11-devel, desktop-file-utils
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	kdelibs
-Patch0:		lincity-ng-1.0.2-gcc4.patch
 
 %description
 LinCity-NG is a City Simulation Game. It is a polished and improved version
@@ -30,7 +29,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 sed -i "s/CFLAGS += -O3 -g -Wall/CFLAGS += $RPM_OPT_FLAGS/" Jamrules
 sed -i "s/CXXFLAGS += -O3 -g -Wall/CXXFLAGS += $RPM_OPT_FLAGS/" Jamrules
 
@@ -64,6 +62,9 @@
 %{_datadir}/lincity-ng/
 
 %changelog
+* Wed Apr 19 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.3-1
+- bump to 1.0.3
+
 * Fri Mar 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.2-4
 - -O3 optimization makes the code cry
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Jan 2006 22:09:49 -0000	1.3
+++ sources	19 Apr 2006 21:15:06 -0000	1.4
@@ -1 +1 @@
-3cf29d581fca58f13faad12c126390ba  lincity-ng-1.0.2.tar.bz2
+2624857ed9437ac30445884d8593850e  lincity-ng-1.0.3.tar.bz2



From fedora-extras-commits at redhat.com  Wed Apr 19 21:15:07 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Wed, 19 Apr 2006 14:15:07 -0700
Subject: rpms/lincity-ng/FC-5 lincity-ng.spec,1.6,1.7 sources,1.3,1.4
Message-ID: <200604192115.k3JLFd9m002570@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/lincity-ng/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2483/FC-5

Modified Files:
	lincity-ng.spec sources 
Log Message:

Bump to 1.0.3



Index: lincity-ng.spec
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/FC-5/lincity-ng.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lincity-ng.spec	24 Mar 2006 22:09:51 -0000	1.6
+++ lincity-ng.spec	19 Apr 2006 21:15:06 -0000	1.7
@@ -1,6 +1,6 @@
 Name:		lincity-ng
-Version:	1.0.2
-Release:	4%{?dist}
+Version:	1.0.3
+Release:	1%{?dist}
 License:	GPL
 Group:		Amusements/Games
 Summary:	City Simulation Game
@@ -13,7 +13,6 @@
 BuildRequires:	xorg-x11-proto-devel, libX11-devel, mesa-libGL-devel, mesa-libGLU-devel
 Requires:	%{name}-data = %{version}-%{release}
 Requires:	kdelibs
-Patch0:		lincity-ng-1.0.2-gcc4.patch
 
 %description
 LinCity-NG is a City Simulation Game. It is a polished and improved version
@@ -31,7 +30,6 @@
 
 %prep
 %setup -q
-%patch0 -p1
 sed -i "s/CFLAGS += -O3 -g -Wall/CFLAGS += $RPM_OPT_FLAGS/" Jamrules
 sed -i "s/CXXFLAGS += -O3 -g -Wall/CXXFLAGS += $RPM_OPT_FLAGS/" Jamrules
 
@@ -65,6 +63,9 @@
 %{_datadir}/lincity-ng/
 
 %changelog
+* Wed Apr 19 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.3-1
+- bump to 1.0.3
+
 * Fri Mar 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.0.2-4
 - -O3 optimization makes the code cry
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/lincity-ng/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Jan 2006 22:10:07 -0000	1.3
+++ sources	19 Apr 2006 21:15:06 -0000	1.4
@@ -1 +1 @@
-3cf29d581fca58f13faad12c126390ba  lincity-ng-1.0.2.tar.bz2
+2624857ed9437ac30445884d8593850e  lincity-ng-1.0.3.tar.bz2



From fedora-extras-commits at redhat.com  Wed Apr 19 21:21:07 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Wed, 19 Apr 2006 14:21:07 -0700
Subject: rpms/octave-forge/devel .cvsignore, 1.7, 1.8 octave-forge.spec, 1.21,
	1.22 sources, 1.7, 1.8
Message-ID: <200604192121.k3JLL99s002781@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/octave-forge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2760

Modified Files:
	.cvsignore octave-forge.spec sources 
Log Message:
New patches so it works with octave 2.9.5


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	22 Mar 2006 15:29:05 -0000	1.7
+++ .cvsignore	19 Apr 2006 21:21:07 -0000	1.8
@@ -1 +1,2 @@
 octave-forge-2006.03.17.patched.tar.gz
+octave-forge-system.patch.gz


Index: octave-forge.spec
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- octave-forge.spec	22 Mar 2006 15:29:05 -0000	1.21
+++ octave-forge.spec	19 Apr 2006 21:21:07 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           octave-forge
 Version:        2006.03.17
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -15,9 +15,10 @@
 ## tar czf octave-forge-%{version}.patched.tar.gz octave-forge-%{version}
 ## rm -Rf octave-forge-%{version}
 Source0:        %{name}-%{version}.patched.tar.gz
+Patch0:         %{name}-system.patch.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	octave >= 2.9.4 ImageMagick
+Requires:	octave >= 2.9.5 ImageMagick
 BuildRequires:  octave-devel tetex gcc-gfortran ginac-devel qhull-devel
 BuildRequires:  ImageMagick-c++-devel netcdf-devel pcre-devel gsl-devel
 BuildRequires:  libjpeg-devel libpng-devel ncurses-devel libtermcap-devel
@@ -32,6 +33,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 # The sparse matrix functions are in octave 2.9.x so don't install them
 touch main/sparse/NOINSTALL
 
@@ -67,6 +69,10 @@
 
 
 %changelog
+* Wed Apr 19 2006 Quentin Spencer <qspencer at users.sf.net> 2006.03.17-2
+- New release for octave 2.9.5.
+- Patch added for incompatibilities between octave 2.9.4 and 2.9.5.
+
 * Fri Mar 17 2006 Quentin Spencer <qspencer at users.sf.net> 2006.03.17-1
 - New release. Remove old patches.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	22 Mar 2006 15:29:05 -0000	1.7
+++ sources	19 Apr 2006 21:21:07 -0000	1.8
@@ -1 +1,2 @@
 a1e76ab52fb9894586d6a7a0dc15e603  octave-forge-2006.03.17.patched.tar.gz
+c50919d0790c7873a82c2da09d419142  octave-forge-system.patch.gz



From fedora-extras-commits at redhat.com  Wed Apr 19 21:29:13 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 19 Apr 2006 14:29:13 -0700
Subject: owners owners.list,1.861,1.862
Message-ID: <200604192129.k3JLTFhW002976@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2958

Modified Files:
	owners.list 
Log Message:
add archmage


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.861
retrieving revision 1.862
diff -u -r1.861 -r1.862
--- owners.list	19 Apr 2006 15:54:36 -0000	1.861
+++ owners.list	19 Apr 2006 21:29:13 -0000	1.862
@@ -47,6 +47,7 @@
 Fedora Extras|apt|Debian's Advanced Packaging Tool with RPM support|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|pmatilai at laiskiainen.org
 Fedora Extras|aqhbci-qt-tools|Setup wizard and debugger for the HBCI backend for the Aqbanking library|notting at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|arc|Arc archiver|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|archmod|Extensible reader/decompiler of files in CHM format|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|argus|Network transaction audit tool|somlo at cmu.edu|extras-qa at fedoraproject.org|
 Fedora Extras|artwiz-aleczapka-fonts|Set of (improved) artwiz fonts|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|asa|Convert Fortran carriage control characters|pertusus at free.fr|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Apr 19 21:37:30 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Wed, 19 Apr 2006 14:37:30 -0700
Subject: rpms/python-sqlite2/devel .cvsignore, 1.5, 1.6 python-sqlite2.spec, 
	1.8, 1.9 sources, 1.5, 1.6
Message-ID: <200604192137.k3JLbWBV003045@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/python-sqlite2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3024

Modified Files:
	.cvsignore python-sqlite2.spec sources 
Log Message:
Update to 2.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Apr 2006 10:37:40 -0000	1.5
+++ .cvsignore	19 Apr 2006 21:37:30 -0000	1.6
@@ -1 +1 @@
-pysqlite-2.2.0.tar.gz
+pysqlite-2.2.1.tar.gz


Index: python-sqlite2.spec
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/devel/python-sqlite2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-sqlite2.spec	14 Apr 2006 10:37:40 -0000	1.8
+++ python-sqlite2.spec	19 Apr 2006 21:37:30 -0000	1.9
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-sqlite2
-Version:        2.2.0
+Version:        2.2.1
 Release:        1%{?dist}
 Epoch:          1
 Summary:        DB-API 2.0 interface for SQLite 3.x
@@ -26,6 +26,9 @@
 
 %prep
 %setup -q -n pysqlite-%{version}
+sed -i -e '
+/\/usr\/local\/include/d
+/\/usr\/local\/lib/d' setup.cfg
 
 
 %build
@@ -45,7 +48,7 @@
 
 
 %check
-# workaround for some strange bug (thanks to Ville Skytt??!)
+# workaround for a strange bug (thanks to Ville Skytt??!)
 cd documentation
 PYTHONPATH="%{buildroot}%{python_sitearch}" %{__python} -c \
 	"from pysqlite2.test import test; test()"
@@ -94,6 +97,9 @@
 
 
 %changelog
+* Wed Apr 19 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 1:2.2.1-1
+- Update to 2.2.1
+
 * Fri Apr 14 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 1:2.2.0-1
 - Update to 2.2.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Apr 2006 10:37:40 -0000	1.5
+++ sources	19 Apr 2006 21:37:30 -0000	1.6
@@ -1 +1 @@
-8f68b79b2fe891e72da193cbc3a3d5e9  pysqlite-2.2.0.tar.gz
+3d9fe353420fdea44e368afd982c9786  pysqlite-2.2.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 19 21:53:22 2006
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Wed, 19 Apr 2006 14:53:22 -0700
Subject: fedora-release indexhtml-head,1.5,1.6
Message-ID: <200604192153.k3JLrMDW003162@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/fedora-release
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3131

Modified Files:
	indexhtml-head 
Log Message:
Resolving bz#182342, committing the new Fedora (TM) logo header in place of the ol' White-n-Blue F.


Index: indexhtml-head
===================================================================
RCS file: /cvs/fedora/fedora-release/indexhtml-head,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- indexhtml-head	28 Feb 2006 07:21:50 -0000	1.5
+++ indexhtml-head	19 Apr 2006 21:53:19 -0000	1.6
@@ -17,7 +17,7 @@
 		<!-- header BEGIN -->
 		<div id="fedora-header">
 			<div id="fedora-header-logo">
-				<a href="http://fedora.redhat.com/" id="link-internal"><img src="img/header-fedora_logo01.png" alt="Fedora Project"></a>
+				<a href="http://fedora.redhat.com/" id="link-internal"><img src="img/header-fedora_logo.png" alt="Fedora Project"></a>
 			</div>
 
 			<div id="fedora-header-items">



From fedora-extras-commits at redhat.com  Wed Apr 19 21:53:23 2006
From: fedora-extras-commits at redhat.com (Karsten Wade (kwade))
Date: Wed, 19 Apr 2006 14:53:23 -0700
Subject: fedora-release/img header-fedora_logo.png, 1.1.1.1,
	1.2 header-fedora_logo01.png, 1.1, NONE
Message-ID: <200604192153.k3JLrNOu003167@cvs-int.fedora.redhat.com>

Author: kwade

Update of /cvs/fedora/fedora-release/img
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3131/img

Modified Files:
	header-fedora_logo.png 
Removed Files:
	header-fedora_logo01.png 
Log Message:
Resolving bz#182342, committing the new Fedora (TM) logo header in place of the ol' White-n-Blue F.



From fedora-extras-commits at redhat.com  Wed Apr 19 22:01:48 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Wed, 19 Apr 2006 15:01:48 -0700
Subject: owners owners.list,1.862,1.863
Message-ID: <200604192202.k3JM2Nao005286@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5265

Modified Files:
	owners.list 
Log Message:
correct name is archmage and not archmod



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.862
retrieving revision 1.863
diff -u -r1.862 -r1.863
--- owners.list	19 Apr 2006 21:29:13 -0000	1.862
+++ owners.list	19 Apr 2006 22:01:48 -0000	1.863
@@ -47,7 +47,7 @@
 Fedora Extras|apt|Debian's Advanced Packaging Tool with RPM support|Axel.Thimm at ATrpms.net|extras-qa at fedoraproject.org|pmatilai at laiskiainen.org
 Fedora Extras|aqhbci-qt-tools|Setup wizard and debugger for the HBCI backend for the Aqbanking library|notting at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|arc|Arc archiver|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
-Fedora Extras|archmod|Extensible reader/decompiler of files in CHM format|pertusus at free.fr|extras-qa at fedoraproject.org|
+Fedora Extras|archmage|Extensible reader/decompiler of files in CHM format|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|argus|Network transaction audit tool|somlo at cmu.edu|extras-qa at fedoraproject.org|
 Fedora Extras|artwiz-aleczapka-fonts|Set of (improved) artwiz fonts|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|asa|Convert Fortran carriage control characters|pertusus at free.fr|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Apr 19 22:04:29 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Wed, 19 Apr 2006 15:04:29 -0700
Subject: rpms/python-sqlite2/FC-5 .cvsignore, 1.5, 1.6 python-sqlite2.spec,
	1.8, 1.9 sources, 1.5, 1.6
Message-ID: <200604192204.k3JM4Vq7005361@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/python-sqlite2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5340

Modified Files:
	.cvsignore python-sqlite2.spec sources 
Log Message:
Update to 2.2.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	14 Apr 2006 11:23:20 -0000	1.5
+++ .cvsignore	19 Apr 2006 22:04:29 -0000	1.6
@@ -1 +1 @@
-pysqlite-2.2.0.tar.gz
+pysqlite-2.2.1.tar.gz


Index: python-sqlite2.spec
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/FC-5/python-sqlite2.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- python-sqlite2.spec	14 Apr 2006 11:23:20 -0000	1.8
+++ python-sqlite2.spec	19 Apr 2006 22:04:29 -0000	1.9
@@ -1,7 +1,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-sqlite2
-Version:        2.2.0
+Version:        2.2.1
 Release:        1%{?dist}
 Epoch:          1
 Summary:        DB-API 2.0 interface for SQLite 3.x
@@ -26,6 +26,9 @@
 
 %prep
 %setup -q -n pysqlite-%{version}
+sed -i -e '
+/\/usr\/local\/include/d
+/\/usr\/local\/lib/d' setup.cfg
 
 
 %build
@@ -94,6 +97,9 @@
 
 
 %changelog
+* Wed Apr 19 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 1:2.2.1-1
+- Update to 2.2.1
+
 * Fri Apr 14 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 1:2.2.0-1
 - Update to 2.2.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	14 Apr 2006 11:23:20 -0000	1.5
+++ sources	19 Apr 2006 22:04:29 -0000	1.6
@@ -1 +1 @@
-8f68b79b2fe891e72da193cbc3a3d5e9  pysqlite-2.2.0.tar.gz
+3d9fe353420fdea44e368afd982c9786  pysqlite-2.2.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 19 22:07:30 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Wed, 19 Apr 2006 15:07:30 -0700
Subject: fedora-release fedora-extras-development.repo,1.4,1.5
Message-ID: <200604192207.k3JM7UEe005410@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/fedora/fedora-release
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5392

Modified Files:
	fedora-extras-development.repo 
Log Message:
Add development boilerplate to extras-development repo file.



Index: fedora-extras-development.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-extras-development.repo,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedora-extras-development.repo	29 Mar 2006 23:31:22 -0000	1.4
+++ fedora-extras-development.repo	19 Apr 2006 22:07:27 -0000	1.5
@@ -1,3 +1,14 @@
+# These packages are untested and still under development. This
+# repository is used for updates to test releases, and for
+# development of new releases.
+#
+# This repository can see significant daily turnover and major
+# functionality changes which cause unexpected problems with other
+# development packages. Please use these packages if you want to work
+# with the Fedora developers by testing these new development packages.
+#
+# More information is available at http://fedoraproject.org/wiki/Testing
+
 [extras-development]
 name=Fedora Extras - Development Tree
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/development/$basearch/



From fedora-extras-commits at redhat.com  Wed Apr 19 22:20:06 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 19 Apr 2006 15:20:06 -0700
Subject: rpms/wine/FC-4 .cvsignore, 1.12, 1.13 sources, 1.13, 1.14 wine.spec,
	1.20, 1.21
Message-ID: <200604192220.k3JMK8oL005557@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5487/FC-4

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- fix rpath issues (#188905)
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	3 Apr 2006 11:07:59 -0000	1.12
+++ .cvsignore	19 Apr 2006 22:20:06 -0000	1.13
@@ -1 +1 @@
-wine-0.9.11-fe.tar.bz2
+wine-0.9.12-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	3 Apr 2006 11:07:59 -0000	1.13
+++ sources	19 Apr 2006 22:20:06 -0000	1.14
@@ -1 +1 @@
-7e67d02051dfb3671990f40734aca89a  wine-0.9.11-fe.tar.bz2
+1751147723999f1efd73d1aaba910360  wine-0.9.12-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-4/wine.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- wine.spec	5 Apr 2006 20:33:02 -0000	1.20
+++ wine.spec	19 Apr 2006 22:20:06 -0000	1.21
@@ -1,13 +1,13 @@
 Name:		wine
-Version:	0.9.11
-Release:	2%{?dist}
+Version:	0.9.12
+Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
 License:	LGPL
 URL:		http://www.winehq.org/
 # special fedora tarball without winemp3 stuff
-Source0:        wine-0.9.11-fe.tar.bz2
+Source0:        wine-0.9.12-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -19,6 +19,7 @@
 Source105:      wine-winemine.desktop
 Source106:      wine-winhelp.desktop
 Patch0:         wine-prefixfonts.patch
+Patch1:         wine-rpath.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExclusiveArch:  %{ix86}
@@ -145,6 +146,7 @@
 %prep
 %setup -q -n %{name}-%{version}-fe
 %patch0
+%patch1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -540,6 +542,8 @@
 %{_libdir}/wine/glut32.dll.so
 %{_libdir}/wine/opengl32.dll.so
 %{_libdir}/wine/wined3d.dll.so
+%{_libdir}/wine/dnsapi.dll.so
+%{_libdir}/wine/iexplore.exe.so
 %{_sysconfdir}/ld.so.conf.d/wine-32.conf
 
 %files tools
@@ -634,6 +638,11 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sat Apr 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.12-1
+- fix rpath issues (#187429,#188905)
+- version upgrade 
+ 
 * Wed Apr 05 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.11-2
 - bump for liblcms



From fedora-extras-commits at redhat.com  Wed Apr 19 22:20:07 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 19 Apr 2006 15:20:07 -0700
Subject: rpms/wine/FC-5 .cvsignore, 1.13, 1.14 sources, 1.14, 1.15 wine.spec,
	1.24, 1.25
Message-ID: <200604192220.k3JMK9mH005563@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5487/FC-5

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- fix rpath issues (#188905)
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-5/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	3 Apr 2006 11:08:00 -0000	1.13
+++ .cvsignore	19 Apr 2006 22:20:06 -0000	1.14
@@ -1 +1 @@
-wine-0.9.11-fe.tar.bz2
+wine-0.9.12-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-5/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	3 Apr 2006 11:08:00 -0000	1.14
+++ sources	19 Apr 2006 22:20:06 -0000	1.15
@@ -1 +1 @@
-7e67d02051dfb3671990f40734aca89a  wine-0.9.11-fe.tar.bz2
+1751147723999f1efd73d1aaba910360  wine-0.9.12-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-5/wine.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- wine.spec	3 Apr 2006 11:08:00 -0000	1.24
+++ wine.spec	19 Apr 2006 22:20:06 -0000	1.25
@@ -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.11
+Version:	0.9.12
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -10,7 +10,8 @@
 URL:		http://www.winehq.org/
 # special fedora tarball without winemp3 stuff
 Patch0:         wine-prefixfonts.patch
-Source0:        wine-0.9.11-fe.tar.bz2
+Patch1:         wine-rpath.patch
+Source0:        wine-0.9.12-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -24,7 +25,7 @@
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-ExclusiveArch: %{ix86}
+ExclusiveArch:  %{ix86}
 
 BuildRequires:	bison
 BuildRequires:	flex
@@ -157,6 +158,7 @@
 %prep
 %setup -q -n %{name}-%{version}-fe
 %patch0
+%patch1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -553,6 +555,8 @@
 %{_libdir}/wine/glut32.dll.so
 %{_libdir}/wine/opengl32.dll.so
 %{_libdir}/wine/wined3d.dll.so
+%{_libdir}/wine/dnsapi.dll.so
+%{_libdir}/wine/iexplore.exe.so
 %{_sysconfdir}/ld.so.conf.d/wine-32.conf
 
 %files tools
@@ -647,6 +651,11 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sat Apr 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.12-1
+- fix rpath issues (#187429,#188905)
+- version upgrade 
+
 * Mon Apr 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.11-1
 - version upgrade



From fedora-extras-commits at redhat.com  Wed Apr 19 22:20:07 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 19 Apr 2006 15:20:07 -0700
Subject: rpms/wine/devel .cvsignore, 1.13, 1.14 sources, 1.14, 1.15 wine.spec,
	1.24, 1.25
Message-ID: <200604192220.k3JMK9JH005569@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5487/devel

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- fix rpath issues (#188905)
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	3 Apr 2006 11:08:01 -0000	1.13
+++ .cvsignore	19 Apr 2006 22:20:07 -0000	1.14
@@ -1 +1 @@
-wine-0.9.11-fe.tar.bz2
+wine-0.9.12-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	3 Apr 2006 11:08:01 -0000	1.14
+++ sources	19 Apr 2006 22:20:07 -0000	1.15
@@ -1 +1 @@
-7e67d02051dfb3671990f40734aca89a  wine-0.9.11-fe.tar.bz2
+1751147723999f1efd73d1aaba910360  wine-0.9.12-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/devel/wine.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- wine.spec	3 Apr 2006 11:08:01 -0000	1.24
+++ wine.spec	19 Apr 2006 22:20:07 -0000	1.25
@@ -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.11
+Version:	0.9.12
 Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
@@ -10,7 +10,8 @@
 URL:		http://www.winehq.org/
 # special fedora tarball without winemp3 stuff
 Patch0:         wine-prefixfonts.patch
-Source0:        wine-0.9.11-fe.tar.bz2
+Patch1:         wine-rpath.patch
+Source0:        wine-0.9.12-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -24,7 +25,7 @@
 
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-ExclusiveArch: %{ix86}
+ExclusiveArch:  %{ix86}
 
 BuildRequires:	bison
 BuildRequires:	flex
@@ -157,6 +158,7 @@
 %prep
 %setup -q -n %{name}-%{version}-fe
 %patch0
+%patch1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -553,6 +555,8 @@
 %{_libdir}/wine/glut32.dll.so
 %{_libdir}/wine/opengl32.dll.so
 %{_libdir}/wine/wined3d.dll.so
+%{_libdir}/wine/dnsapi.dll.so
+%{_libdir}/wine/iexplore.exe.so
 %{_sysconfdir}/ld.so.conf.d/wine-32.conf
 
 %files tools
@@ -647,6 +651,11 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sat Apr 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.12-1
+- fix rpath issues (#187429,#188905)
+- version upgrade 
+
 * Mon Apr 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.11-1
 - version upgrade



From fedora-extras-commits at redhat.com  Wed Apr 19 22:20:05 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 19 Apr 2006 15:20:05 -0700
Subject: rpms/wine/FC-3 .cvsignore, 1.11, 1.12 sources, 1.12, 1.13 wine.spec,
	1.18, 1.19
Message-ID: <200604192220.k3JMKb7Z005574@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5487/FC-3

Modified Files:
	.cvsignore sources wine.spec 
Log Message:
- fix rpath issues (#188905)
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	3 Apr 2006 11:07:59 -0000	1.11
+++ .cvsignore	19 Apr 2006 22:20:05 -0000	1.12
@@ -1 +1 @@
-wine-0.9.11-fe.tar.bz2
+wine-0.9.12-fe.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	3 Apr 2006 11:07:59 -0000	1.12
+++ sources	19 Apr 2006 22:20:05 -0000	1.13
@@ -1 +1 @@
-7e67d02051dfb3671990f40734aca89a  wine-0.9.11-fe.tar.bz2
+1751147723999f1efd73d1aaba910360  wine-0.9.12-fe.tar.bz2


Index: wine.spec
===================================================================
RCS file: /cvs/extras/rpms/wine/FC-3/wine.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- wine.spec	5 Apr 2006 20:33:01 -0000	1.18
+++ wine.spec	19 Apr 2006 22:20:05 -0000	1.19
@@ -1,13 +1,13 @@
 Name:		wine
-Version:	0.9.11
-Release:	2%{?dist}
+Version:	0.9.12
+Release:	1%{?dist}
 Summary:	A Windows 16/32/64 bit emulator
 
 Group:		Applications/Emulators
 License:	LGPL
 URL:		http://www.winehq.org/
 # special fedora tarball without winemp3 stuff
-Source0:        wine-0.9.11-fe.tar.bz2
+Source0:        wine-0.9.12-fe.tar.bz2
 Source1:	wine.init
 Source3:        wine-README-Fedora
 Source4:        wine-32.conf
@@ -19,6 +19,7 @@
 Source105:      wine-winemine.desktop
 Source106:      wine-winhelp.desktop
 Patch0:         wine-prefixfonts.patch
+Patch1:         wine-rpath.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 ExclusiveArch:  %{ix86}
@@ -145,6 +146,7 @@
 %prep
 %setup -q -n %{name}-%{version}-fe
 %patch0
+%patch1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -540,6 +542,8 @@
 %{_libdir}/wine/glut32.dll.so
 %{_libdir}/wine/opengl32.dll.so
 %{_libdir}/wine/wined3d.dll.so
+%{_libdir}/wine/dnsapi.dll.so
+%{_libdir}/wine/iexplore.exe.so
 %{_sysconfdir}/ld.so.conf.d/wine-32.conf
 
 %files tools
@@ -634,6 +638,11 @@
 %{_libdir}/wine/*.def
 
 %changelog
+* Sat Apr 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.9.12-1
+- fix rpath issues (#187429,#188905)
+- version upgrade 
+ 
 * Wed Apr 05 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 0.9.11-2
 - bump for liblcms



From fedora-extras-commits at redhat.com  Wed Apr 19 22:21:54 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 19 Apr 2006 15:21:54 -0700
Subject: rpms/wine/FC-4 wine-rpath.patch,NONE,1.1
Message-ID: <200604192221.k3JMLu3g005660@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5600/FC-4

Added Files:
	wine-rpath.patch 
Log Message:
- add patch


wine-rpath.patch:

--- NEW FILE wine-rpath.patch ---
--- configure.orig	2006-04-15 00:02:02.000000000 +0200
+++ configure	2006-04-15 00:03:26.000000000 +0200
@@ -13375,7 +13375,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_wine_try_cflags_saved=$CFLAGS
-CFLAGS="$CFLAGS -fPIC -Wl,--rpath,\$ORIGIN/../lib"
+CFLAGS="$CFLAGS -fPIC"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -13427,9 +13427,9 @@
 echo "${ECHO_T}$ac_cv_ld_rpath" >&6
         if test "$ac_cv_ld_rpath" = "yes"
         then
-          LDEXERPATH="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
+          LDEXERPATH=""
 
-          LDDLLRPATH="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(dlldir) \$(libdir)\`"
+          LDDLLRPATH=""
 
         fi
 
--- configure.ac.orig	2006-04-15 00:15:32.000000000 +0200
+++ configure.ac	2006-04-15 00:04:51.000000000 +0200
@@ -1052,15 +1052,6 @@
           AC_SUBST(LDEXECFLAGS,["-Wl,--export-dynamic"])
         fi
 
-        AC_CACHE_CHECK([whether the linker accepts --rpath], ac_cv_ld_rpath,
-          [WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib],
-                           ac_cv_ld_rpath="yes",ac_cv_ld_rpath="no")])
-        if test "$ac_cv_ld_rpath" = "yes"
-        then
-          AC_SUBST(LDEXERPATH,["-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"])
-          AC_SUBST(LDDLLRPATH,["-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(dlldir) \$(libdir)\`"])
-        fi
-
         case $host_cpu in
           *i[[3456789]]86*)
             AC_CACHE_CHECK([whether we can relocate the executable to 0x7bf00000], ac_cv_ld_reloc_exec,



From fedora-extras-commits at redhat.com  Wed Apr 19 22:21:54 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 19 Apr 2006 15:21:54 -0700
Subject: rpms/wine/FC-5 wine-rpath.patch,NONE,1.1
Message-ID: <200604192221.k3JMLuiB005665@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5600/FC-5

Added Files:
	wine-rpath.patch 
Log Message:
- add patch


wine-rpath.patch:

--- NEW FILE wine-rpath.patch ---
--- configure.orig	2006-04-15 00:02:02.000000000 +0200
+++ configure	2006-04-15 00:03:26.000000000 +0200
@@ -13375,7 +13375,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_wine_try_cflags_saved=$CFLAGS
-CFLAGS="$CFLAGS -fPIC -Wl,--rpath,\$ORIGIN/../lib"
+CFLAGS="$CFLAGS -fPIC"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -13427,9 +13427,9 @@
 echo "${ECHO_T}$ac_cv_ld_rpath" >&6
         if test "$ac_cv_ld_rpath" = "yes"
         then
-          LDEXERPATH="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
+          LDEXERPATH=""
 
-          LDDLLRPATH="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(dlldir) \$(libdir)\`"
+          LDDLLRPATH=""
 
         fi
 
--- configure.ac.orig	2006-04-15 00:15:32.000000000 +0200
+++ configure.ac	2006-04-15 00:04:51.000000000 +0200
@@ -1052,15 +1052,6 @@
           AC_SUBST(LDEXECFLAGS,["-Wl,--export-dynamic"])
         fi
 
-        AC_CACHE_CHECK([whether the linker accepts --rpath], ac_cv_ld_rpath,
-          [WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib],
-                           ac_cv_ld_rpath="yes",ac_cv_ld_rpath="no")])
-        if test "$ac_cv_ld_rpath" = "yes"
-        then
-          AC_SUBST(LDEXERPATH,["-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"])
-          AC_SUBST(LDDLLRPATH,["-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(dlldir) \$(libdir)\`"])
-        fi
-
         case $host_cpu in
           *i[[3456789]]86*)
             AC_CACHE_CHECK([whether we can relocate the executable to 0x7bf00000], ac_cv_ld_reloc_exec,



From fedora-extras-commits at redhat.com  Wed Apr 19 22:21:55 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 19 Apr 2006 15:21:55 -0700
Subject: rpms/wine/devel wine-rpath.patch,NONE,1.1
Message-ID: <200604192221.k3JMLvjc005670@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5600/devel

Added Files:
	wine-rpath.patch 
Log Message:
- add patch


wine-rpath.patch:

--- NEW FILE wine-rpath.patch ---
--- configure.orig	2006-04-15 00:02:02.000000000 +0200
+++ configure	2006-04-15 00:03:26.000000000 +0200
@@ -13375,7 +13375,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_wine_try_cflags_saved=$CFLAGS
-CFLAGS="$CFLAGS -fPIC -Wl,--rpath,\$ORIGIN/../lib"
+CFLAGS="$CFLAGS -fPIC"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -13427,9 +13427,9 @@
 echo "${ECHO_T}$ac_cv_ld_rpath" >&6
         if test "$ac_cv_ld_rpath" = "yes"
         then
-          LDEXERPATH="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
+          LDEXERPATH=""
 
-          LDDLLRPATH="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(dlldir) \$(libdir)\`"
+          LDDLLRPATH=""
 
         fi
 
--- configure.ac.orig	2006-04-15 00:15:32.000000000 +0200
+++ configure.ac	2006-04-15 00:04:51.000000000 +0200
@@ -1052,15 +1052,6 @@
           AC_SUBST(LDEXECFLAGS,["-Wl,--export-dynamic"])
         fi
 
-        AC_CACHE_CHECK([whether the linker accepts --rpath], ac_cv_ld_rpath,
-          [WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib],
-                           ac_cv_ld_rpath="yes",ac_cv_ld_rpath="no")])
-        if test "$ac_cv_ld_rpath" = "yes"
-        then
-          AC_SUBST(LDEXERPATH,["-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"])
-          AC_SUBST(LDDLLRPATH,["-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(dlldir) \$(libdir)\`"])
-        fi
-
         case $host_cpu in
           *i[[3456789]]86*)
             AC_CACHE_CHECK([whether we can relocate the executable to 0x7bf00000], ac_cv_ld_reloc_exec,



From fedora-extras-commits at redhat.com  Wed Apr 19 22:21:53 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Wed, 19 Apr 2006 15:21:53 -0700
Subject: rpms/wine/FC-3 wine-rpath.patch,NONE,1.1
Message-ID: <200604192221.k3JMLtck005653@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wine/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5600/FC-3

Added Files:
	wine-rpath.patch 
Log Message:
- add patch


wine-rpath.patch:

--- NEW FILE wine-rpath.patch ---
--- configure.orig	2006-04-15 00:02:02.000000000 +0200
+++ configure	2006-04-15 00:03:26.000000000 +0200
@@ -13375,7 +13375,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_wine_try_cflags_saved=$CFLAGS
-CFLAGS="$CFLAGS -fPIC -Wl,--rpath,\$ORIGIN/../lib"
+CFLAGS="$CFLAGS -fPIC"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -13427,9 +13427,9 @@
 echo "${ECHO_T}$ac_cv_ld_rpath" >&6
         if test "$ac_cv_ld_rpath" = "yes"
         then
-          LDEXERPATH="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"
+          LDEXERPATH=""
 
-          LDDLLRPATH="-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(dlldir) \$(libdir)\`"
+          LDDLLRPATH=""
 
         fi
 
--- configure.ac.orig	2006-04-15 00:15:32.000000000 +0200
+++ configure.ac	2006-04-15 00:04:51.000000000 +0200
@@ -1052,15 +1052,6 @@
           AC_SUBST(LDEXECFLAGS,["-Wl,--export-dynamic"])
         fi
 
-        AC_CACHE_CHECK([whether the linker accepts --rpath], ac_cv_ld_rpath,
-          [WINE_TRY_CFLAGS([-fPIC -Wl,--rpath,\$ORIGIN/../lib],
-                           ac_cv_ld_rpath="yes",ac_cv_ld_rpath="no")])
-        if test "$ac_cv_ld_rpath" = "yes"
-        then
-          AC_SUBST(LDEXERPATH,["-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(bindir) \$(libdir)\`"])
-          AC_SUBST(LDDLLRPATH,["-Wl,--rpath,\\\$\$ORIGIN/\`\$(RELPATH) \$(dlldir) \$(libdir)\`"])
-        fi
-
         case $host_cpu in
           *i[[3456789]]86*)
             AC_CACHE_CHECK([whether we can relocate the executable to 0x7bf00000], ac_cv_ld_reloc_exec,



From fedora-extras-commits at redhat.com  Wed Apr 19 22:39:04 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Wed, 19 Apr 2006 15:39:04 -0700
Subject: rpms/python-sqlite2/devel .cvsignore, 1.6, 1.7 python-sqlite2.spec, 
	1.9, 1.10 sources, 1.6, 1.7
Message-ID: <200604192239.k3JMd6QS005917@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/python-sqlite2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5874/devel

Modified Files:
	.cvsignore python-sqlite2.spec sources 
Log Message:
Mom, I feel like kernel developer - new 2.2.2 release after two hours ;)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	19 Apr 2006 21:37:30 -0000	1.6
+++ .cvsignore	19 Apr 2006 22:39:04 -0000	1.7
@@ -1 +1 @@
-pysqlite-2.2.1.tar.gz
+pysqlite-2.2.2.tar.gz


Index: python-sqlite2.spec
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/devel/python-sqlite2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- python-sqlite2.spec	19 Apr 2006 21:37:30 -0000	1.9
+++ python-sqlite2.spec	19 Apr 2006 22:39:04 -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-sqlite2
-Version:        2.2.1
+Version:        2.2.2
 Release:        1%{?dist}
 Epoch:          1
 Summary:        DB-API 2.0 interface for SQLite 3.x
@@ -97,6 +97,9 @@
 
 
 %changelog
+* Thu Apr 20 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 1:2.2.2-1
+- Update to 2.2.2
+
 * Wed Apr 19 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 1:2.2.1-1
 - Update to 2.2.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 Apr 2006 21:37:30 -0000	1.6
+++ sources	19 Apr 2006 22:39:04 -0000	1.7
@@ -1 +1 @@
-3d9fe353420fdea44e368afd982c9786  pysqlite-2.2.1.tar.gz
+3260547d3f11c85613b2de8ed529a4fc  pysqlite-2.2.2.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 19 22:39:03 2006
From: fedora-extras-commits at redhat.com (Dawid Gajownik (gajownik))
Date: Wed, 19 Apr 2006 15:39:03 -0700
Subject: rpms/python-sqlite2/FC-5 .cvsignore, 1.6, 1.7 python-sqlite2.spec,
	1.9, 1.10 sources, 1.6, 1.7
Message-ID: <200604192239.k3JMd5FH005911@cvs-int.fedora.redhat.com>

Author: gajownik

Update of /cvs/extras/rpms/python-sqlite2/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5874/FC-5

Modified Files:
	.cvsignore python-sqlite2.spec sources 
Log Message:
Mom, I feel like kernel developer - new 2.2.2 release after two hours ;)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	19 Apr 2006 22:04:29 -0000	1.6
+++ .cvsignore	19 Apr 2006 22:39:03 -0000	1.7
@@ -1 +1 @@
-pysqlite-2.2.1.tar.gz
+pysqlite-2.2.2.tar.gz


Index: python-sqlite2.spec
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/FC-5/python-sqlite2.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- python-sqlite2.spec	19 Apr 2006 22:04:29 -0000	1.9
+++ python-sqlite2.spec	19 Apr 2006 22:39:03 -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-sqlite2
-Version:        2.2.1
+Version:        2.2.2
 Release:        1%{?dist}
 Epoch:          1
 Summary:        DB-API 2.0 interface for SQLite 3.x
@@ -97,6 +97,9 @@
 
 
 %changelog
+* Thu Apr 20 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 1:2.2.2-1
+- Update to 2.2.2
+
 * Wed Apr 19 2006 Dawid Gajownik <gajownik[AT]fedora.pl> - 1:2.2.1-1
 - Update to 2.2.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-sqlite2/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	19 Apr 2006 22:04:29 -0000	1.6
+++ sources	19 Apr 2006 22:39:03 -0000	1.7
@@ -1 +1 @@
-3d9fe353420fdea44e368afd982c9786  pysqlite-2.2.1.tar.gz
+3260547d3f11c85613b2de8ed529a4fc  pysqlite-2.2.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 20 00:34:48 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Wed, 19 Apr 2006 17:34:48 -0700
Subject: rpms/git/devel .cvsignore, 1.24, 1.25 git.spec, 1.12, 1.13 sources, 
	1.24, 1.25
Message-ID: <200604200034.k3K0YoGO010433@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10412

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	10 Apr 2006 16:48:25 -0000	1.24
+++ .cvsignore	20 Apr 2006 00:34:48 -0000	1.25
@@ -1 +1 @@
-git-1.2.6.tar.gz
+git-1.3.0.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/devel/git.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- git.spec	10 Apr 2006 16:48:25 -0000	1.12
+++ git.spec	20 Apr 2006 00:34:48 -0000	1.13
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.2.6
+Version: 	1.3.0
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Wed Apr 19 2006 Chris Wright <chrisw at redhat.com> 1.3.0-1
+- git-1.3.0
+
 * Mon Apr 10 2006 Chris Wright <chrisw at redhat.com> 1.2.6-1
 - git-1.2.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	10 Apr 2006 16:48:25 -0000	1.24
+++ sources	20 Apr 2006 00:34:48 -0000	1.25
@@ -1 +1 @@
-f10a13074e849ff8670f5dba07bfe5c1  git-1.2.6.tar.gz
+37137c9f87b0082fbf04e6b80a5144e2  git-1.3.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 20 00:36:34 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Wed, 19 Apr 2006 17:36:34 -0700
Subject: rpms/git/FC-5 .cvsignore, 1.24, 1.25 git.spec, 1.12, 1.13 sources, 
	1.24, 1.25
Message-ID: <200604200036.k3K0aaZf010509@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10488

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/FC-5/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	10 Apr 2006 16:50:46 -0000	1.24
+++ .cvsignore	20 Apr 2006 00:36:33 -0000	1.25
@@ -1 +1 @@
-git-1.2.6.tar.gz
+git-1.3.0.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/FC-5/git.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- git.spec	10 Apr 2006 16:50:46 -0000	1.12
+++ git.spec	20 Apr 2006 00:36:33 -0000	1.13
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.2.6
+Version: 	1.3.0
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Wed Apr 19 2006 Chris Wright <chrisw at redhat.com> 1.3.0-1
+- git-1.3.0
+
 * Mon Apr 10 2006 Chris Wright <chrisw at redhat.com> 1.2.6-1
 - git-1.2.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/FC-5/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	10 Apr 2006 16:50:46 -0000	1.24
+++ sources	20 Apr 2006 00:36:33 -0000	1.25
@@ -1 +1 @@
-f10a13074e849ff8670f5dba07bfe5c1  git-1.2.6.tar.gz
+37137c9f87b0082fbf04e6b80a5144e2  git-1.3.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 20 00:37:59 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Wed, 19 Apr 2006 17:37:59 -0700
Subject: rpms/git/FC-4 .cvsignore, 1.24, 1.25 git.spec, 1.12, 1.13 sources, 
	1.24, 1.25
Message-ID: <200604200038.k3K0c1NE010587@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10566

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/FC-4/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	10 Apr 2006 16:51:39 -0000	1.24
+++ .cvsignore	20 Apr 2006 00:37:58 -0000	1.25
@@ -1 +1 @@
-git-1.2.6.tar.gz
+git-1.3.0.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/FC-4/git.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- git.spec	10 Apr 2006 16:51:39 -0000	1.12
+++ git.spec	20 Apr 2006 00:37:58 -0000	1.13
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.2.6
+Version: 	1.3.0
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Wed Apr 19 2006 Chris Wright <chrisw at redhat.com> 1.3.0-1
+- git-1.3.0
+
 * Mon Apr 10 2006 Chris Wright <chrisw at redhat.com> 1.2.6-1
 - git-1.2.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/FC-4/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	10 Apr 2006 16:51:39 -0000	1.24
+++ sources	20 Apr 2006 00:37:58 -0000	1.25
@@ -1 +1 @@
-f10a13074e849ff8670f5dba07bfe5c1  git-1.2.6.tar.gz
+37137c9f87b0082fbf04e6b80a5144e2  git-1.3.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 20 00:41:34 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Wed, 19 Apr 2006 17:41:34 -0700
Subject: rpms/git/FC-3 .cvsignore, 1.24, 1.25 git.spec, 1.12, 1.13 sources, 
	1.24, 1.25
Message-ID: <200604200041.k3K0faqQ010665@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10644

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.3.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/FC-3/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	10 Apr 2006 16:53:10 -0000	1.24
+++ .cvsignore	20 Apr 2006 00:41:34 -0000	1.25
@@ -1 +1 @@
-git-1.2.6.tar.gz
+git-1.3.0.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/FC-3/git.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- git.spec	10 Apr 2006 16:53:10 -0000	1.12
+++ git.spec	20 Apr 2006 00:41:34 -0000	1.13
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.2.6
+Version: 	1.3.0
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Wed Apr 19 2006 Chris Wright <chrisw at redhat.com> 1.3.0-1
+- git-1.3.0
+
 * Mon Apr 10 2006 Chris Wright <chrisw at redhat.com> 1.2.6-1
 - git-1.2.6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/FC-3/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	10 Apr 2006 16:53:10 -0000	1.24
+++ sources	20 Apr 2006 00:41:34 -0000	1.25
@@ -1 +1 @@
-f10a13074e849ff8670f5dba07bfe5c1  git-1.2.6.tar.gz
+37137c9f87b0082fbf04e6b80a5144e2  git-1.3.0.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 20 07:17:21 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Thu, 20 Apr 2006 00:17:21 -0700
Subject: rpms/perl-Math-Pari/FC-5 perl-Math-Pari.spec,1.1,1.2
Message-ID: <200604200717.k3K7HNnH025946@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-serv25929

Modified Files:
	perl-Math-Pari.spec 
Log Message:
Bump



Index: perl-Math-Pari.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Math-Pari/FC-5/perl-Math-Pari.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Math-Pari.spec	18 Apr 2006 18:33:50 -0000	1.1
+++ perl-Math-Pari.spec	20 Apr 2006 07:17:20 -0000	1.2
@@ -14,7 +14,7 @@
 # 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:	2%{?dist}.1
 License:	Artistic or GPL
 Group:		Development/Libraries
 Url:		http://search.cpan.org/dist/Math-Pari/
@@ -73,6 +73,9 @@
 %exclude %{_mandir}/man3/Math::libPARI.dumb.3pm*
 
 %changelog
+* Thu Apr 20 2006 Paul Howarth <paul at city-fan.org> 2.010704-2.1
+- Bump for tag issue. Won't import mock-built SRPMs again!
+
 * Tue Apr 18 2006 Paul Howarth <paul at city-fan.org> 2.010704-2
 - Omit dumb docs (#175198)
 



From fedora-extras-commits at redhat.com  Thu Apr 20 09:30:51 2006
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Thu, 20 Apr 2006 02:30:51 -0700
Subject: rpms/libstatgrab/devel .cvsignore, 1.3, 1.4 libstatgrab.spec, 1.3, 
	1.4 sources, 1.3, 1.4
Message-ID: <200604200930.k3K9UrXS030678@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/extras/rpms/libstatgrab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30657

Modified Files:
	.cvsignore libstatgrab.spec sources 
Log Message:
* Update libstatgrab


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libstatgrab/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Aug 2005 08:45:32 -0000	1.3
+++ .cvsignore	20 Apr 2006 09:30:51 -0000	1.4
@@ -1 +1 @@
-libstatgrab-0.12.tar.gz
+libstatgrab-0.13.tar.gz


Index: libstatgrab.spec
===================================================================
RCS file: /cvs/extras/rpms/libstatgrab/devel/libstatgrab.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libstatgrab.spec	10 Aug 2005 08:46:59 -0000	1.3
+++ libstatgrab.spec	20 Apr 2006 09:30:51 -0000	1.4
@@ -3,10 +3,10 @@
 Summary:		Make system statistics
 Name:			libstatgrab
 
-Version:		0.12
+Version:		0.13
 Release:		1%{?dist}
 
-Source0:		ftp://ftp.i-scream.org/pub/i-scream/%{name}/%{name}-%{version}.tar.gz
+Source0:		http://ftp.i-scream.org/pub/i-scream/%{name}/%{name}-%{version}.tar.gz
 Patch0:			%{name}.nochmod.patch
 
 License:		LGPL
@@ -127,6 +127,9 @@
 %{_bindir}/vm_stats
 
 %changelog
+* Thu Apr 20 2006 Oliver Falk <oliver at linux-kernel.at>		- 0.13-1
+- Update
+
 * Wed Aug 10 2005 Oliver Falk <oliver at linux-kernel.at>		- 0.12-1
 - Update
 - Added saidar manpage


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libstatgrab/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Aug 2005 08:45:32 -0000	1.3
+++ sources	20 Apr 2006 09:30:51 -0000	1.4
@@ -1 +1 @@
-fe8bf50490e3382c29da3a553bb7ca0e  libstatgrab-0.12.tar.gz
+19818d772284c7491cdf484249890c95  libstatgrab-0.13.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 20 09:33:53 2006
From: fedora-extras-commits at redhat.com (Oliver Falk (oliver))
Date: Thu, 20 Apr 2006 02:33:53 -0700
Subject: rpms/libstatgrab/FC-5 .cvsignore, 1.3, 1.4 libstatgrab.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200604200933.k3K9XuvS030770@cvs-int.fedora.redhat.com>

Author: oliver

Update of /cvs/extras/rpms/libstatgrab/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30749

Modified Files:
	.cvsignore libstatgrab.spec sources 
Log Message:
* Update libstatgrab


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libstatgrab/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Aug 2005 08:45:32 -0000	1.3
+++ .cvsignore	20 Apr 2006 09:33:53 -0000	1.4
@@ -1 +1 @@
-libstatgrab-0.12.tar.gz
+libstatgrab-0.13.tar.gz


Index: libstatgrab.spec
===================================================================
RCS file: /cvs/extras/rpms/libstatgrab/FC-5/libstatgrab.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libstatgrab.spec	10 Aug 2005 08:46:59 -0000	1.3
+++ libstatgrab.spec	20 Apr 2006 09:33:53 -0000	1.4
@@ -3,10 +3,10 @@
 Summary:		Make system statistics
 Name:			libstatgrab
 
-Version:		0.12
+Version:		0.13
 Release:		1%{?dist}
 
-Source0:		ftp://ftp.i-scream.org/pub/i-scream/%{name}/%{name}-%{version}.tar.gz
+Source0:		http://ftp.i-scream.org/pub/i-scream/%{name}/%{name}-%{version}.tar.gz
 Patch0:			%{name}.nochmod.patch
 
 License:		LGPL
@@ -127,6 +127,9 @@
 %{_bindir}/vm_stats
 
 %changelog
+* Thu Apr 20 2006 Oliver Falk <oliver at linux-kernel.at>		- 0.13-1
+- Update
+
 * Wed Aug 10 2005 Oliver Falk <oliver at linux-kernel.at>		- 0.12-1
 - Update
 - Added saidar manpage


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libstatgrab/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Aug 2005 08:45:32 -0000	1.3
+++ sources	20 Apr 2006 09:33:53 -0000	1.4
@@ -1 +1 @@
-fe8bf50490e3382c29da3a553bb7ca0e  libstatgrab-0.12.tar.gz
+19818d772284c7491cdf484249890c95  libstatgrab-0.13.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 20 13:15:45 2006
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 20 Apr 2006 06:15:45 -0700
Subject: rpms/pcb - New directory
Message-ID: <200604201315.k3KDFl0u007841@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/pcb
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7815/pcb

Log Message:
Directory /cvs/extras/rpms/pcb added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 20 13:15:45 2006
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 20 Apr 2006 06:15:45 -0700
Subject: rpms/pcb/devel - New directory
Message-ID: <200604201315.k3KDFlSv007844@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/pcb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7815/pcb/devel

Log Message:
Directory /cvs/extras/rpms/pcb/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 20 13:16:17 2006
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 20 Apr 2006 06:16:17 -0700
Subject: rpms/pcb/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604201316.k3KDGJS0007900@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/pcb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7864/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pcb


--- 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 Apr 20 13:16:16 2006
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 20 Apr 2006 06:16:16 -0700
Subject: rpms/pcb Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604201316.k3KDGIcr007897@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/pcb
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7864

Added Files:
	Makefile import.log 
Log Message:
Setup of module pcb


--- NEW FILE Makefile ---
# Top level Makefile for module pcb
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 20 13:37:44 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Thu, 20 Apr 2006 06:37:44 -0700
Subject: rpms/octave/FC-5 octave-2.9.5-config.patch, NONE, 1.1 octave.spec, 
	1.33, 1.34
Message-ID: <200604201337.k3KDbkmv008058@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/octave/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8038

Modified Files:
	octave.spec 
Added Files:
	octave-2.9.5-config.patch 
Log Message:
Upgrade to 2.9.5 release, add some needed patches, and lots of spec file improvements.

octave-2.9.5-config.patch:

--- NEW FILE octave-2.9.5-config.patch ---
--- configure.orig	2006-04-18 08:22:38.000000000 -0500
+++ configure	2006-04-18 08:30:46.000000000 -0500
@@ -3291,7 +3291,7 @@
 echo "$as_me:$LINENO: result: defining localfcnfiledir to be $localfcnfiledir" >&5
 echo "${ECHO_T}defining localfcnfiledir to be $localfcnfiledir" >&6
 
-: ${localapifcnfiledir='$(datadir)/octave/site/$(apiversion)/m'}
+: ${localapifcnfiledir='$(datadir)/octave/site/$(api_version)/m'}
 echo "$as_me:$LINENO: result: defining localapifcnfiledir to be $localapifcnfiledir" >&5
 echo "${ECHO_T}defining localapifcnfiledir to be $localapifcnfiledir" >&6
 
@@ -3327,7 +3327,7 @@
 echo "$as_me:$LINENO: result: defining localoctfiledir to be $localoctfiledir" >&5
 echo "${ECHO_T}defining localoctfiledir to be $localoctfiledir" >&6
 
-: ${localapioctfiledir='$(libexecdir)/octave/site/oct/$(apiversion)/$(canonical_host_type)'}
+: ${localapioctfiledir='$(libexecdir)/octave/site/oct/$(api_version)/$(canonical_host_type)'}
 echo "$as_me:$LINENO: result: defining localapioctfiledir to be $localapioctfiledir" >&5
 echo "${ECHO_T}defining localapioctfiledir to be $localapioctfiledir" >&6
 


Index: octave.spec
===================================================================
RCS file: /cvs/extras/rpms/octave/FC-5/octave.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- octave.spec	23 Mar 2006 22:43:54 -0000	1.33
+++ octave.spec	20 Apr 2006 13:37:44 -0000	1.34
@@ -8,6 +8,7 @@
 License:        GPL
 Source:         ftp://ftp.octave.org/pub/octave/bleeding-edge/octave-%{version}.tar.bz2
 Patch0:         octave-2.9.5-sparse.patch
+Patch1:         octave-2.9.5-config.patch
 URL:            http://www.octave.org
 Requires:       gnuplot less info texinfo 
 Requires(post): /sbin/install-info
@@ -51,6 +52,7 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0
 
 
 %build
@@ -133,8 +135,9 @@
 
 
 %changelog
-* Thu Mar 23 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.5-1
+* Thu Apr 20 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.5-1
 - New upstream release; remove old patches; add sparse patch.
+- Add patch for configure script.
 - Add gcc-c++ as dependency for devel package.
 - Add more docs; cleanup extra files in docs.
 - Simplify configure command.



From fedora-extras-commits at redhat.com  Thu Apr 20 13:51:53 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Thu, 20 Apr 2006 06:51:53 -0700
Subject: rpms/octave-forge/FC-5 .cvsignore, 1.7, 1.8 octave-forge.spec, 1.21,
	1.22 sources, 1.7, 1.8
Message-ID: <200604201351.k3KDptLC008474@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-serv8449

Modified Files:
	.cvsignore octave-forge.spec sources 
Log Message:
Add patch so it works with octave 2.9.5.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	17 Mar 2006 16:53:38 -0000	1.7
+++ .cvsignore	20 Apr 2006 13:51:53 -0000	1.8
@@ -1 +1,2 @@
 octave-forge-2006.03.17.patched.tar.gz
+octave-forge-system.patch.gz


Index: octave-forge.spec
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/FC-5/octave-forge.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- octave-forge.spec	17 Mar 2006 16:53:38 -0000	1.21
+++ octave-forge.spec	20 Apr 2006 13:51:53 -0000	1.22
@@ -1,6 +1,6 @@
 Name:           octave-forge
 Version:        2006.03.17
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -15,9 +15,10 @@
 ## tar czf octave-forge-%{version}.patched.tar.gz octave-forge-%{version}
 ## rm -Rf octave-forge-%{version}
 Source0:        %{name}-%{version}.patched.tar.gz
+Patch0:         %{name}-system.patch.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	octave >= 2.9.4 ImageMagick
+Requires:	octave >= 2.9.5 ImageMagick
 BuildRequires:  octave-devel tetex gcc-gfortran ginac-devel qhull-devel
 BuildRequires:  ImageMagick-c++-devel netcdf-devel pcre-devel gsl-devel
 BuildRequires:  libjpeg-devel libpng-devel ncurses-devel libtermcap-devel
@@ -32,6 +33,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 # The sparse matrix functions are in octave 2.9.x so don't install them
 touch main/sparse/NOINSTALL
 
@@ -67,6 +69,9 @@
 
 
 %changelog
+* Thu Apr 20 2006 Quentin Spencer <qspencer at users.sf.net> 2006.03.17-2
+- Add patch for system function so it works with octave 2.9.5.
+
 * Fri Mar 17 2006 Quentin Spencer <qspencer at users.sf.net> 2006.03.17-1
 - New release. Remove old patches.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	17 Mar 2006 16:53:38 -0000	1.7
+++ sources	20 Apr 2006 13:51:53 -0000	1.8
@@ -1 +1,2 @@
 a1e76ab52fb9894586d6a7a0dc15e603  octave-forge-2006.03.17.patched.tar.gz
+c50919d0790c7873a82c2da09d419142  octave-forge-system.patch.gz



From fedora-extras-commits at redhat.com  Thu Apr 20 14:03:00 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 20 Apr 2006 07:03:00 -0700
Subject: rpms/fedora-package-config-smart/devel .cvsignore, 1.2,
	1.3 fedora-package-config-smart.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200604201403.k3KE32R3011455@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-serv11384/fedora-package-config-smart/devel

Modified Files:
	.cvsignore fedora-package-config-smart.spec sources 
Log Message:
Add smart-config virtual dependency


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-smart/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Apr 2006 17:45:23 -0000	1.2
+++ .cvsignore	20 Apr 2006 14:03:00 -0000	1.3
@@ -1 +1 @@
-fedora-package-config-smart-5.tar.bz2
+fedora-package-config-smart-5.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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-package-config-smart.spec	10 Apr 2006 17:45:23 -0000	1.1
+++ fedora-package-config-smart.spec	20 Apr 2006 14:03:00 -0000	1.2
@@ -1,12 +1,13 @@
 Summary: Configuration files for the smart package manager
 Name: fedora-package-config-smart
-Version: 5
-Release: 4
+Version: 5.89
+Release: 6
 License: GPL
 Group: System Environment/Base
 URL: http://fedora.redhat.com/
 Source0: %{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Provides: smart-config
 
 %description
 This package contains configuration files for smart.
@@ -35,6 +36,12 @@
 %config(noreplace) %{_sysconfdir}/smart/channels/*.channel
 
 %changelog
+* Thu Apr 20 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 5.89-6
+- Update to rawhide config.
+
+* Thu Apr 20 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 5-5
+- Add virtual smart-config provides (#175630 comment 13).
+
 * Sat Apr  1 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 5-4
 - Update to Fedora Core 5.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fedora-package-config-smart/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Apr 2006 17:45:23 -0000	1.2
+++ sources	20 Apr 2006 14:03:00 -0000	1.3
@@ -1 +1 @@
-5992a399b473b042ab25e2f39cbb4992  fedora-package-config-smart-5.tar.bz2
+248314d34eb546fde3111b3dbaaa924c  fedora-package-config-smart-5.89.tar.bz2



From fedora-extras-commits at redhat.com  Thu Apr 20 14:02:46 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 20 Apr 2006 07:02:46 -0700
Subject: rpms/fedora-package-config-smart/FC-4
	fedora-package-config-smart.spec, 1.2, 1.3
Message-ID: <200604201403.k3KE3IWO011490@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-serv11384/fedora-package-config-smart/FC-4

Modified Files:
	fedora-package-config-smart.spec 
Log Message:
Add smart-config virtual dependency


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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-package-config-smart.spec	11 Apr 2006 11:47:11 -0000	1.2
+++ fedora-package-config-smart.spec	20 Apr 2006 14:02:46 -0000	1.3
@@ -1,12 +1,13 @@
 Summary: Configuration files for the smart package manager
 Name: fedora-package-config-smart
 Version: 4
-Release: 3
+Release: 4
 License: GPL
 Group: System Environment/Base
 URL: http://fedora.redhat.com/
 Source0: %{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Provides: smart-config
 
 %description
 This package contains configuration files for smart.
@@ -35,6 +36,9 @@
 %config(noreplace) %{_sysconfdir}/smart/channels/*.channel
 
 %changelog
+* Thu Apr 20 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 4-4
+- Add virtual smart-config provides (#175630 comment 13).
+
 * Tue Dec 13 2005 Axel Thimm <Axel.Thimm at ATrpms.net> - 4-3
 - changed name to fedora-package-config-smart
 - Modify to only include what fedora-release includes for yum.



From fedora-extras-commits at redhat.com  Thu Apr 20 14:02:49 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 20 Apr 2006 07:02:49 -0700
Subject: rpms/fedora-package-config-smart/FC-5
	fedora-package-config-smart.spec, 1.1, 1.2
Message-ID: <200604201403.k3KE3N30011493@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-serv11384/fedora-package-config-smart/FC-5

Modified Files:
	fedora-package-config-smart.spec 
Log Message:
Add smart-config virtual dependency


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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-package-config-smart.spec	10 Apr 2006 17:45:23 -0000	1.1
+++ fedora-package-config-smart.spec	20 Apr 2006 14:02:49 -0000	1.2
@@ -1,12 +1,13 @@
 Summary: Configuration files for the smart package manager
 Name: fedora-package-config-smart
 Version: 5
-Release: 4
+Release: 5
 License: GPL
 Group: System Environment/Base
 URL: http://fedora.redhat.com/
 Source0: %{name}-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Provides: smart-config
 
 %description
 This package contains configuration files for smart.
@@ -35,6 +36,9 @@
 %config(noreplace) %{_sysconfdir}/smart/channels/*.channel
 
 %changelog
+* Thu Apr 20 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 5-5
+- Add virtual smart-config provides (#175630 comment 13).
+
 * Sat Apr  1 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 5-4
 - Update to Fedora Core 5.
 



From fedora-extras-commits at redhat.com  Thu Apr 20 14:03:30 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 20 Apr 2006 07:03:30 -0700
Subject: rpms/smart/FC-5 smart.spec,1.2,1.3
Message-ID: <200604201403.k3KE3XDi011548@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/smart/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11499/smart/FC-5

Modified Files:
	smart.spec 
Log Message:
Add smart-config virtual dependency


Index: smart.spec
===================================================================
RCS file: /cvs/extras/rpms/smart/FC-5/smart.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- smart.spec	11 Apr 2006 10:25:27 -0000	1.2
+++ smart.spec	20 Apr 2006 14:03:30 -0000	1.3
@@ -3,7 +3,7 @@
 Summary: Next generation package handling tool
 Name: smart
 Version: 0.41
-Release: 30%{?dist}
+Release: 31%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://labix.org/smart/
@@ -19,7 +19,7 @@
 BuildRequires: desktop-file-utils
 Requires: python-abi = %(python -c "import sys ; print sys.version[:3]")
 Requires: rpm-python >= 4.4
-Requires: fedora-package-config-smart
+Requires: smart-config
 
 %description
 Smart Package Manager is a next generation package handling tool.
@@ -143,7 +143,10 @@
 %config %{_sysconfdir}/pam.d/smart-root
 
 %changelog
-* Tue Apr 11 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41
+* Thu Apr 20 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41-31
+- Add virtual smart-config dependency (#175630 comment 13).
+
+* Tue Apr 11 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41-30
 - Move the disttag to the Release: tag.
 
 * Mon Apr 10 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41-29



From fedora-extras-commits at redhat.com  Thu Apr 20 14:03:30 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 20 Apr 2006 07:03:30 -0700
Subject: rpms/smart/FC-4 smart.spec,1.2,1.3
Message-ID: <200604201403.k3KE3WVj011544@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/smart/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11499/smart/FC-4

Modified Files:
	smart.spec 
Log Message:
Add smart-config virtual dependency


Index: smart.spec
===================================================================
RCS file: /cvs/extras/rpms/smart/FC-4/smart.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- smart.spec	11 Apr 2006 10:25:26 -0000	1.2
+++ smart.spec	20 Apr 2006 14:03:30 -0000	1.3
@@ -3,7 +3,7 @@
 Summary: Next generation package handling tool
 Name: smart
 Version: 0.41
-Release: 30%{?dist}
+Release: 31%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://labix.org/smart/
@@ -19,7 +19,7 @@
 BuildRequires: desktop-file-utils
 Requires: python-abi = %(python -c "import sys ; print sys.version[:3]")
 Requires: rpm-python >= 4.4
-Requires: fedora-package-config-smart
+Requires: smart-config
 
 %description
 Smart Package Manager is a next generation package handling tool.
@@ -143,7 +143,10 @@
 %config %{_sysconfdir}/pam.d/smart-root
 
 %changelog
-* Tue Apr 11 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41
+* Thu Apr 20 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41-31
+- Add virtual smart-config dependency (#175630 comment 13).
+
+* Tue Apr 11 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41-30
 - Move the disttag to the Release: tag.
 
 * Mon Apr 10 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41-29



From fedora-extras-commits at redhat.com  Thu Apr 20 14:03:31 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Thu, 20 Apr 2006 07:03:31 -0700
Subject: rpms/smart/devel smart.spec,1.2,1.3
Message-ID: <200604201403.k3KE3XXP011552@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/smart/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11499/smart/devel

Modified Files:
	smart.spec 
Log Message:
Add smart-config virtual dependency


Index: smart.spec
===================================================================
RCS file: /cvs/extras/rpms/smart/devel/smart.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- smart.spec	11 Apr 2006 10:25:27 -0000	1.2
+++ smart.spec	20 Apr 2006 14:03:31 -0000	1.3
@@ -3,7 +3,7 @@
 Summary: Next generation package handling tool
 Name: smart
 Version: 0.41
-Release: 30%{?dist}
+Release: 31%{?dist}
 License: GPL
 Group: Applications/System
 URL: http://labix.org/smart/
@@ -19,7 +19,7 @@
 BuildRequires: desktop-file-utils
 Requires: python-abi = %(python -c "import sys ; print sys.version[:3]")
 Requires: rpm-python >= 4.4
-Requires: fedora-package-config-smart
+Requires: smart-config
 
 %description
 Smart Package Manager is a next generation package handling tool.
@@ -143,7 +143,10 @@
 %config %{_sysconfdir}/pam.d/smart-root
 
 %changelog
-* Tue Apr 11 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41
+* Thu Apr 20 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41-31
+- Add virtual smart-config dependency (#175630 comment 13).
+
+* Tue Apr 11 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41-30
 - Move the disttag to the Release: tag.
 
 * Mon Apr 10 2006 Axel Thimm <Axel.Thimm at ATrpms.net> - 0.41-29



From fedora-extras-commits at redhat.com  Thu Apr 20 15:56:35 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu, 20 Apr 2006 08:56:35 -0700
Subject: rpms/perl-Class-Autouse/devel perl-Class-Autouse.spec,1.6,1.7
Message-ID: <200604201556.k3KFubMU014343@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-Autouse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14326

Modified Files:
	perl-Class-Autouse.spec 
Log Message:
* Thu Apr 20 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.26-1
- Upstream update.



Index: perl-Class-Autouse.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Autouse/devel/perl-Class-Autouse.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Class-Autouse.spec	28 Feb 2006 23:18:03 -0000	1.6
+++ perl-Class-Autouse.spec	20 Apr 2006 15:56:35 -0000	1.7
@@ -1,6 +1,6 @@
 Name: 		perl-Class-Autouse
-Version: 	1.21
-Release: 	3%{?dist}
+Version: 	1.26
+Release: 	1%{?dist}
 Summary: 	Run-time class loading on first method call
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -57,6 +57,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Apr 20 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.26-1
+- Upstream update.
+
 * Wed Mar 01 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.21-3
 - Rebuild for perl-5.8.8.
 



From fedora-extras-commits at redhat.com  Thu Apr 20 15:58:46 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu, 20 Apr 2006 08:58:46 -0700
Subject: rpms/perl-Class-Autouse/devel .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <200604201558.k3KFwm1N014422@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-Autouse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14403

Modified Files:
	.cvsignore sources 
Log Message:
* Thu Apr 20 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.26-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Autouse/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Feb 2006 14:35:58 -0000	1.5
+++ .cvsignore	20 Apr 2006 15:58:46 -0000	1.6
@@ -1,2 +1 @@
-Class-Autouse-1.21.tar.gz
-Class-Autouse-1.24.tar.gz
+Class-Autouse-1.26.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Autouse/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Feb 2006 14:35:58 -0000	1.5
+++ sources	20 Apr 2006 15:58:46 -0000	1.6
@@ -1,2 +1 @@
-3bf4fadd8349e57d6af0961b6565c74f  Class-Autouse-1.21.tar.gz
-6192abd3fa36d40ae40870ea66aa9b2a  Class-Autouse-1.24.tar.gz
+27d185332ff7fc18477d115802b057b2  Class-Autouse-1.26.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 20 16:12:38 2006
From: fedora-extras-commits at redhat.com (Jasper O'neal Hartline (autopsy))
Date: Thu, 20 Apr 2006 09:12:38 -0700
Subject: kadischi/post_install_scripts 04userconfig.py, 1.5,
	1.6 07accounts.sh, 1.1, 1.2
Message-ID: <200604201612.k3KGCcZF016624@cvs-int.fedora.redhat.com>

Author: autopsy

Update of /cvs/devel/kadischi/post_install_scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16605/kadischi/post_install_scripts

Modified Files:
	04userconfig.py 07accounts.sh 
Log Message:
Minor changes, break dependancy of lokkit and ntsysv both being present.


Index: 04userconfig.py
===================================================================
RCS file: /cvs/devel/kadischi/post_install_scripts/04userconfig.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 04userconfig.py	18 Apr 2006 00:20:42 -0000	1.5
+++ 04userconfig.py	20 Apr 2006 16:12:36 -0000	1.6
@@ -24,16 +24,26 @@
             flc_log("Skipping interactive user configuration..")
             sys.exit(0)
 
-    if (lokkit and ntsysv) == True:
-        flc_log("Taking you to interactive user configuration..")
+    if lokkit:
+        flc_log("Taking you to interactive firewalling configuration..")
         run("chroot %s %s" % (sysdir, "/usr/sbin/lokkit"))
+    else:
+        flc_log("lokkit can't be found, skipping firewalling configuration..")
+
+    if ntsysv:
+        flc_log("Taking you to interactive services configuration..")
         run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv --level 35"))
     else:
-        flc_log("Skipping interactive user configuration..")
+        flc_log("ntsysv can't be found, skipping services configuration..")
 else:
-    if (lokkit and ntsysv) == True:
-        flc_log("Taking you to interactive user configuration..")
+    if lokkit:
+        flc_log("Taking you to interactive firewalling configuration..")
         run("chroot %s %s" % (sysdir, "/usr/sbin/lokkit"))
+    else:
+        flc_log("lokkit can't be found, skipping firewalling configuration..")
+
+    if ntsysv:
+        flc_log("Taking you to interactive services configuration..")
         run("chroot %s %s" % (sysdir, "/usr/sbin/ntsysv --level 35"))
     else:
-        flc_log("Skipping interactive user configuration..")
+        flc_log("ntsysv can't be found, skipping interactive services configuration..")


Index: 07accounts.sh
===================================================================
RCS file: /cvs/devel/kadischi/post_install_scripts/07accounts.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 07accounts.sh	18 Apr 2006 00:21:33 -0000	1.1
+++ 07accounts.sh	20 Apr 2006 16:12:36 -0000	1.2
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # Allow creation of addition user accounts.
-# UIDs start at 500, GID is 100.
+# We will let useradd handle with defaults.
 
 
  . /etc/kadischi/kadischi.conf
@@ -10,7 +10,7 @@
 ANACONDA_ARGS=$2
 USING_KICKSTART=$(echo $ANACONDA_ARGS | grep -G [--]kickstart)
 USING_CMDLINE=$(echo $ANACONDA_ARGS | egrep -- "-C|--cmdline")
-i=0
+
 
 
 if [ $USING_KICKSTART ] || [ $USING_CMDLINE ]; then   
@@ -26,13 +26,13 @@
          echo -n "User shell: "
          read NEWSHELL
          if [ -n $NEWUSERNAME ] && [ -n $NEWSHELL ]; then
-            chroot $SYSDIR /usr/sbin/useradd -d /home/$NEWUSERNAME -m -s $NEWSHELL -u 50$i -g 100 $NEWUSERNAME
+            chroot $SYSDIR /usr/sbin/useradd -d /home/$NEWUSERNAME -m -s $NEWSHELL -g 100 $NEWUSERNAME
             chroot $SYSDIR /usr/bin/passwd $NEWUSERNAME
-            echo "User: $NEWUSERNAME, UID: 50$i, GID: 100 created successfully."
-            (( i += 1 ))
+            echo "User: $NEWUSERNAME, Home: /home/$NEWUSERNAME, GID: 100 created successfully."
          else
             echo "Username or shell wasn't specified."
          fi
+         echo "                                      "
          echo "Would you like to create another user?"
          echo -n "[yes/no] "
          read CHOICE
@@ -41,4 +41,3 @@
       exit 0
    fi
 fi
-



From fedora-extras-commits at redhat.com  Thu Apr 20 16:23:55 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Thu, 20 Apr 2006 09:23:55 -0700
Subject: rpms/deutex/devel deutex-4.4.0-freedoom.patch, NONE, 1.1 deutex.spec,
	1.1, 1.2
Message-ID: <200604201623.k3KGNvWL016782@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/deutex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16726/devel

Modified Files:
	deutex.spec 
Added Files:
	deutex-4.4.0-freedoom.patch 
Log Message:
Add freedoom to the list of known iwads.



deutex-4.4.0-freedoom.patch:

--- NEW FILE deutex-4.4.0-freedoom.patch ---
--- deutex-4.4.0/src/deutex.c	2006-04-20 08:09:14.000000000 -0700
+++ deutex-4.4.0/src/deutex.c.new	2006-04-20 08:15:33.000000000 -0700
@@ -970,14 +970,15 @@
                && MakeFileName(MainWAD,DoomDir,"","","heretic", "wad")!=TRUE
                && MakeFileName(MainWAD,DoomDir,"","","hexen",   "wad")!=TRUE
                && MakeFileName(MainWAD,DoomDir,"","","strife1", "wad")!=TRUE
+               && MakeFileName(MainWAD,DoomDir,"","","freedoom","wad")!=TRUE
                && MakeFileName(MainWAD,".",    "","","doompres","wad")!=TRUE
                && MakeFileName(MainWAD,".",    "","","doom",    "wad")!=TRUE
 	       && MakeFileName(MainWAD,".",    "","","doom2",   "wad")!=TRUE
                && MakeFileName(MainWAD,".",    "","","heretic", "wad")!=TRUE
                && MakeFileName(MainWAD,".",    "","","hexen",   "wad")!=TRUE
-               && MakeFileName(MainWAD,".",    "","","strife1", "wad")!=TRUE)
+               && MakeFileName(MainWAD,".",    "","","freedoom","wad")!=TRUE)
              ProgError("Can't find any of doom.wad, doom2.wad, doompres.wad,"
-		 " heretic.wad, hexen.wad, strife1.wad");
+		 " heretic.wad, hexen.wad, strife1.wad, freedom.wad");
          }
          /*selection bytes*/
 #if defined DeuTex


Index: deutex.spec
===================================================================
RCS file: /cvs/extras/rpms/deutex/devel/deutex.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- deutex.spec	19 Mar 2006 21:56:56 -0000	1.1
+++ deutex.spec	20 Apr 2006 16:23:55 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           deutex
 Version:        4.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        DOOM wad file manipulator
 
 Group:          Amusements/Graphics
@@ -9,6 +9,7 @@
 Source0:        http://www.teaser.fr/~amajorel/deutex/deutex-4.4.0.tar.gz
 Patch0:         deutex-4.4.0-build.patch
 Patch1:         deutex-4.4.0-64bit.patch
+Patch2:         deutex-4.4.0-freedoom.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -27,6 +28,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 # Minor permissions cleanup for rpmlint.
 chmod a-x src/picture.c
 
@@ -57,5 +59,8 @@
 
 
 %changelog
+* Sun Apr 20 2006 Wart <wart at kobold.org> 4.4.0-2
+- Add freedoom to the list of known iwads.
+
 * Sun Mar 19 2006 Wart <wart at kobold.org> 4.4.0-1
 - Initial spec file.



From fedora-extras-commits at redhat.com  Thu Apr 20 16:23:48 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Thu, 20 Apr 2006 09:23:48 -0700
Subject: rpms/deutex/FC-4 deutex-4.4.0-freedoom.patch, NONE, 1.1 deutex.spec,
	1.1, 1.2
Message-ID: <200604201624.k3KGOKPX016785@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/deutex/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16726/FC-4

Modified Files:
	deutex.spec 
Added Files:
	deutex-4.4.0-freedoom.patch 
Log Message:
Add freedoom to the list of known iwads.



deutex-4.4.0-freedoom.patch:

--- NEW FILE deutex-4.4.0-freedoom.patch ---
--- deutex-4.4.0/src/deutex.c	2006-04-20 08:09:14.000000000 -0700
+++ deutex-4.4.0/src/deutex.c.new	2006-04-20 08:15:33.000000000 -0700
@@ -970,14 +970,15 @@
                && MakeFileName(MainWAD,DoomDir,"","","heretic", "wad")!=TRUE
                && MakeFileName(MainWAD,DoomDir,"","","hexen",   "wad")!=TRUE
                && MakeFileName(MainWAD,DoomDir,"","","strife1", "wad")!=TRUE
+               && MakeFileName(MainWAD,DoomDir,"","","freedoom","wad")!=TRUE
                && MakeFileName(MainWAD,".",    "","","doompres","wad")!=TRUE
                && MakeFileName(MainWAD,".",    "","","doom",    "wad")!=TRUE
 	       && MakeFileName(MainWAD,".",    "","","doom2",   "wad")!=TRUE
                && MakeFileName(MainWAD,".",    "","","heretic", "wad")!=TRUE
                && MakeFileName(MainWAD,".",    "","","hexen",   "wad")!=TRUE
-               && MakeFileName(MainWAD,".",    "","","strife1", "wad")!=TRUE)
+               && MakeFileName(MainWAD,".",    "","","freedoom","wad")!=TRUE)
              ProgError("Can't find any of doom.wad, doom2.wad, doompres.wad,"
-		 " heretic.wad, hexen.wad, strife1.wad");
+		 " heretic.wad, hexen.wad, strife1.wad, freedom.wad");
          }
          /*selection bytes*/
 #if defined DeuTex


Index: deutex.spec
===================================================================
RCS file: /cvs/extras/rpms/deutex/FC-4/deutex.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- deutex.spec	19 Mar 2006 21:56:56 -0000	1.1
+++ deutex.spec	20 Apr 2006 16:23:48 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           deutex
 Version:        4.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        DOOM wad file manipulator
 
 Group:          Amusements/Graphics
@@ -9,6 +9,7 @@
 Source0:        http://www.teaser.fr/~amajorel/deutex/deutex-4.4.0.tar.gz
 Patch0:         deutex-4.4.0-build.patch
 Patch1:         deutex-4.4.0-64bit.patch
+Patch2:         deutex-4.4.0-freedoom.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -27,6 +28,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 # Minor permissions cleanup for rpmlint.
 chmod a-x src/picture.c
 
@@ -57,5 +59,8 @@
 
 
 %changelog
+* Sun Apr 20 2006 Wart <wart at kobold.org> 4.4.0-2
+- Add freedoom to the list of known iwads.
+
 * Sun Mar 19 2006 Wart <wart at kobold.org> 4.4.0-1
 - Initial spec file.



From fedora-extras-commits at redhat.com  Thu Apr 20 16:23:49 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Thu, 20 Apr 2006 09:23:49 -0700
Subject: rpms/deutex/FC-5 deutex-4.4.0-freedoom.patch, NONE, 1.1 deutex.spec,
	1.1, 1.2
Message-ID: <200604201624.k3KGOLq6016788@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/deutex/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16726/FC-5

Modified Files:
	deutex.spec 
Added Files:
	deutex-4.4.0-freedoom.patch 
Log Message:
Add freedoom to the list of known iwads.



deutex-4.4.0-freedoom.patch:

--- NEW FILE deutex-4.4.0-freedoom.patch ---
--- deutex-4.4.0/src/deutex.c	2006-04-20 08:09:14.000000000 -0700
+++ deutex-4.4.0/src/deutex.c.new	2006-04-20 08:15:33.000000000 -0700
@@ -970,14 +970,15 @@
                && MakeFileName(MainWAD,DoomDir,"","","heretic", "wad")!=TRUE
                && MakeFileName(MainWAD,DoomDir,"","","hexen",   "wad")!=TRUE
                && MakeFileName(MainWAD,DoomDir,"","","strife1", "wad")!=TRUE
+               && MakeFileName(MainWAD,DoomDir,"","","freedoom","wad")!=TRUE
                && MakeFileName(MainWAD,".",    "","","doompres","wad")!=TRUE
                && MakeFileName(MainWAD,".",    "","","doom",    "wad")!=TRUE
 	       && MakeFileName(MainWAD,".",    "","","doom2",   "wad")!=TRUE
                && MakeFileName(MainWAD,".",    "","","heretic", "wad")!=TRUE
                && MakeFileName(MainWAD,".",    "","","hexen",   "wad")!=TRUE
-               && MakeFileName(MainWAD,".",    "","","strife1", "wad")!=TRUE)
+               && MakeFileName(MainWAD,".",    "","","freedoom","wad")!=TRUE)
              ProgError("Can't find any of doom.wad, doom2.wad, doompres.wad,"
-		 " heretic.wad, hexen.wad, strife1.wad");
+		 " heretic.wad, hexen.wad, strife1.wad, freedom.wad");
          }
          /*selection bytes*/
 #if defined DeuTex


Index: deutex.spec
===================================================================
RCS file: /cvs/extras/rpms/deutex/FC-5/deutex.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- deutex.spec	19 Mar 2006 21:56:56 -0000	1.1
+++ deutex.spec	20 Apr 2006 16:23:49 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           deutex
 Version:        4.4.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        DOOM wad file manipulator
 
 Group:          Amusements/Graphics
@@ -9,6 +9,7 @@
 Source0:        http://www.teaser.fr/~amajorel/deutex/deutex-4.4.0.tar.gz
 Patch0:         deutex-4.4.0-build.patch
 Patch1:         deutex-4.4.0-64bit.patch
+Patch2:         deutex-4.4.0-freedoom.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -27,6 +28,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 # Minor permissions cleanup for rpmlint.
 chmod a-x src/picture.c
 
@@ -57,5 +59,8 @@
 
 
 %changelog
+* Sun Apr 20 2006 Wart <wart at kobold.org> 4.4.0-2
+- Add freedoom to the list of known iwads.
+
 * Sun Mar 19 2006 Wart <wart at kobold.org> 4.4.0-1
 - Initial spec file.



From fedora-extras-commits at redhat.com  Thu Apr 20 16:28:01 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Thu, 20 Apr 2006 09:28:01 -0700
Subject: rpms/perl-String-CRC32/FC-4 perl-String-CRC32.spec, 1.2, 1.3 sources,
	1.2, 1.3 .cvsignore, 1.2, 1.3
Message-ID: <200604201628.k3KGS3OV016859@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-String-CRC32/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16837

Modified Files:
	perl-String-CRC32.spec sources .cvsignore 
Log Message:
Update to 1.4



Index: perl-String-CRC32.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-String-CRC32/FC-4/perl-String-CRC32.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-String-CRC32.spec	6 Jan 2006 17:52:11 -0000	1.2
+++ perl-String-CRC32.spec	20 Apr 2006 16:28:00 -0000	1.3
@@ -1,6 +1,6 @@
 Summary:	Perl interface for cyclic redundancy check generation
 Name:		perl-String-CRC32
-Version:	1.3
+Version:	1.4
 Release:	1%{?dist}
 License:	Public Domain
 Group:		Development/Libraries
@@ -43,5 +43,8 @@
 %{_mandir}/man3/String::CRC32.3pm*
 
 %changelog
+* Thu Apr 20 2006 Paul Howarth <paul at city-fan.org> 1.4-1
+- Update to 1.4
+
 * Fri Nov 25 2005 Paul Howarth <paul at city-fan.org> 1.3-1
 - Initial build


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-String-CRC32/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Jan 2006 17:42:49 -0000	1.2
+++ sources	20 Apr 2006 16:28:00 -0000	1.3
@@ -1 +1 @@
-7683cd1b183a6af807f20ee5fd076d0b  String-CRC32-1.3.tar.gz
+9b241bc4a482a3aa59fbb1429bc30546  String-CRC32-1.4.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-String-CRC32/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Jan 2006 17:42:49 -0000	1.2
+++ .cvsignore	20 Apr 2006 16:28:00 -0000	1.3
@@ -1 +1 @@
-String-CRC32-1.3.tar.gz
+String-CRC32-1.4.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 20 16:29:42 2006
From: fedora-extras-commits at redhat.com (Paul Howarth (pghmcfc))
Date: Thu, 20 Apr 2006 09:29:42 -0700
Subject: rpms/perl-String-CRC32/FC-3 perl-String-CRC32.spec, 1.2, 1.3 sources,
	1.2, 1.3 .cvsignore, 1.2, 1.3
Message-ID: <200604201629.k3KGTitX017000@cvs-int.fedora.redhat.com>

Author: pghmcfc

Update of /cvs/extras/rpms/perl-String-CRC32/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16978

Modified Files:
	perl-String-CRC32.spec sources .cvsignore 
Log Message:
update to 1.4



Index: perl-String-CRC32.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-String-CRC32/FC-3/perl-String-CRC32.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-String-CRC32.spec	6 Jan 2006 17:52:11 -0000	1.2
+++ perl-String-CRC32.spec	20 Apr 2006 16:29:41 -0000	1.3
@@ -1,6 +1,6 @@
 Summary:	Perl interface for cyclic redundancy check generation
 Name:		perl-String-CRC32
-Version:	1.3
+Version:	1.4
 Release:	1%{?dist}
 License:	Public Domain
 Group:		Development/Libraries
@@ -43,5 +43,8 @@
 %{_mandir}/man3/String::CRC32.3pm*
 
 %changelog
+* Thu Apr 20 2006 Paul Howarth <paul at city-fan.org> 1.4-1
+- Update to 1.4
+
 * Fri Nov 25 2005 Paul Howarth <paul at city-fan.org> 1.3-1
 - Initial build


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-String-CRC32/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	6 Jan 2006 17:42:49 -0000	1.2
+++ sources	20 Apr 2006 16:29:41 -0000	1.3
@@ -1 +1 @@
-7683cd1b183a6af807f20ee5fd076d0b  String-CRC32-1.3.tar.gz
+9b241bc4a482a3aa59fbb1429bc30546  String-CRC32-1.4.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-String-CRC32/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	6 Jan 2006 17:42:49 -0000	1.2
+++ .cvsignore	20 Apr 2006 16:29:41 -0000	1.3
@@ -1 +1 @@
-String-CRC32-1.3.tar.gz
+String-CRC32-1.4.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 20 16:33:27 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu, 20 Apr 2006 09:33:27 -0700
Subject: rpms/perl-Params-Util/devel .cvsignore, 1.7,
	1.8 perl-Params-Util.spec, 1.7, 1.8 sources, 1.7, 1.8
Message-ID: <200604201633.k3KGXTVx017064@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-serv17043

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
* Thu Apr 20 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.11-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	18 Jan 2006 10:52:58 -0000	1.7
+++ .cvsignore	20 Apr 2006 16:33:26 -0000	1.8
@@ -1 +1 @@
-Params-Util-0.10.tar.gz
+Params-Util-0.11.tar.gz


Index: perl-Params-Util.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/perl-Params-Util.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Params-Util.spec	28 Feb 2006 23:27:52 -0000	1.7
+++ perl-Params-Util.spec	20 Apr 2006 16:33:26 -0000	1.8
@@ -1,6 +1,6 @@
 Name: 		perl-Params-Util
-Version: 	0.10
-Release: 	2%{?dist}
+Version: 	0.11
+Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Apr 20 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.11-1
+- Upstream update.
+
 * Wed Mar 01 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.10-2
 - Rebuild for perl-5.8.8.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	18 Jan 2006 10:52:58 -0000	1.7
+++ sources	20 Apr 2006 16:33:26 -0000	1.8
@@ -1 +1 @@
-1af92339a4772a20dddce7816c68cd80  Params-Util-0.10.tar.gz
+d3fce431cff46caa926ece63fda73946  Params-Util-0.11.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 20 17:13:10 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Thu, 20 Apr 2006 10:13:10 -0700
Subject: rpms/perl-Params-Validate/FC-5 .cvsignore, 1.4,
	1.5 perl-Params-Validate.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <200604201713.k3KHDCji019501@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Params-Validate/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19480

Modified Files:
	.cvsignore perl-Params-Validate.spec sources 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Validate/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	1 Feb 2006 05:53:20 -0000	1.4
+++ .cvsignore	20 Apr 2006 17:13:10 -0000	1.5
@@ -1 +1 @@
-Params-Validate-0.80.tar.gz
+Params-Validate-0.81.tar.gz


Index: perl-Params-Validate.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Validate/FC-5/perl-Params-Validate.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Params-Validate.spec	20 Feb 2006 06:40:04 -0000	1.5
+++ perl-Params-Validate.spec	20 Apr 2006 17:13:10 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: 	Params-Validate Perl module
 Name: 		perl-Params-Validate
-Version: 	0.80
-Release: 	2%{?dist}
+Version: 	0.81
+Release: 	1%{?dist}
 License: 	GPL or Artistic
 Group: 		Development/Libraries
 URL: 		http://search.cpan.org/dist/Params-Validate/
@@ -54,6 +54,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Apr 04 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.81-1
+- Upstream update.
+
 * Wed Feb 20 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.80-2
 - Rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Validate/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Feb 2006 05:53:20 -0000	1.4
+++ sources	20 Apr 2006 17:13:10 -0000	1.5
@@ -1 +1 @@
-37acde17038290becdef848f566698d6  Params-Validate-0.80.tar.gz
+033d043c4764b800722b9d7442bc4530  Params-Validate-0.81.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 20 19:26:11 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 20 Apr 2006 12:26:11 -0700
Subject: rpms/python-nose/devel - New directory
Message-ID: <200604201926.k3KJQDfZ024314@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-nose/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24285/python-nose/devel

Log Message:
Directory /cvs/extras/rpms/python-nose/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 20 19:26:11 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 20 Apr 2006 12:26:11 -0700
Subject: rpms/python-nose - New directory
Message-ID: <200604201926.k3KJQDSL024311@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-nose
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24285/python-nose

Log Message:
Directory /cvs/extras/rpms/python-nose added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 20 19:26:23 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 20 Apr 2006 12:26:23 -0700
Subject: rpms/python-nose Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604201926.k3KJQP3a024363@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-nose
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24330

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-nose


--- NEW FILE Makefile ---
# Top level Makefile for module python-nose
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 20 19:26:24 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 20 Apr 2006 12:26:24 -0700
Subject: rpms/python-nose/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604201926.k3KJQQvZ024366@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-nose/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24330/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-nose


--- 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 Apr 20 19:26:48 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 20 Apr 2006 12:26:48 -0700
Subject: rpms/python-nose import.log,1.1,1.2
Message-ID: <200604201926.k3KJQowb024429@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-nose
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24396

Modified Files:
	import.log 
Log Message:
auto-import python-nose-0.8.7.2-1 on branch devel from python-nose-0.8.7.2-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-nose/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	20 Apr 2006 19:26:23 -0000	1.1
+++ import.log	20 Apr 2006 19:26:48 -0000	1.2
@@ -0,0 +1 @@
+python-nose-0_8_7_2-1:HEAD:python-nose-0.8.7.2-1.src.rpm:1145561554



From fedora-extras-commits at redhat.com  Thu Apr 20 19:26:49 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 20 Apr 2006 12:26:49 -0700
Subject: rpms/python-nose/devel python-nose.spec, NONE, 1.1 .cvsignore, 1.1, 
	1.2 sources, 1.1, 1.2
Message-ID: <200604201926.k3KJQp1c024434@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/python-nose/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24396/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-nose.spec 
Log Message:
auto-import python-nose-0.8.7.2-1 on branch devel from python-nose-0.8.7.2-1.src.rpm


--- NEW FILE python-nose.spec ---
%{!?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:           python-nose
Version:        0.8.7.2
Release:        1%{?dist}
Summary:        A discovery-based unittest extension for Python

Group:          Development/Languages
License:        LGPL
URL:            http://somethingaboutorange.com/mrl/projects/nose/
Source0:        http://somethingaboutorange.com/mrl/projects/nose/nose-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel python-setuptools >= 0.6a9
Requires:       python-abi = %{pyver}

%description
nose: a discovery-based unittest extension.

nose provides an alternate test discovery and running process for unittest,
one that is intended to mimic the behavior of py.test as much as is
reasonably possible without resorting to too much magic.

%prep
%setup -q -n nose-%{version}

%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build

%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT --single-version-externally-managed
 
%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc AUTHORS CHANGELOG lgpl.txt NEWS README.txt
%{_bindir}/nosetests
%{python_sitelib}/nose-%{version}-py%{pyver}.egg-info
%{python_sitelib}/nose

%changelog
* Wed Apr 19 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.8.7.2-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-nose/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Apr 2006 19:26:24 -0000	1.1
+++ .cvsignore	20 Apr 2006 19:26:49 -0000	1.2
@@ -0,0 +1 @@
+nose-0.8.7.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-nose/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Apr 2006 19:26:24 -0000	1.1
+++ sources	20 Apr 2006 19:26:49 -0000	1.2
@@ -0,0 +1 @@
+400cf55994cfec7772292319f7cd195d  nose-0.8.7.2.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 20 19:35:28 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Thu, 20 Apr 2006 12:35:28 -0700
Subject: rpms/emacs-auctex/FC-5 emacs-auctex.spec,1.7,1.8
Message-ID: <200604201935.k3KJZUox024574@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/emacs-auctex/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24528/FC-5

Modified Files:
	emacs-auctex.spec 
Log Message:
fix startup file per bug# 189488



Index: emacs-auctex.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-auctex/FC-5/emacs-auctex.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- emacs-auctex.spec	9 Apr 2006 19:13:58 -0000	1.7
+++ emacs-auctex.spec	20 Apr 2006 19:35:28 -0000	1.8
@@ -4,7 +4,7 @@
 Summary: 	Enhanced TeX modes for Emacsen
 Name: 		emacs-auctex
 Version: 	11.82
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 License: 	GPL
 Group: 		Applications/Editors
 URL: 		http://www.gnu.org/software/auctex/
@@ -55,7 +55,7 @@
 echo "; Autoactivation of AUCTeX" > %{buildroot}%{startupfile}
 echo "; Created for %{name}-%{version}-%{release}.noarch.rpm" >> \
   %{buildroot}%{startupfile}
-echo "(require 'tex-site)" >> %{buildroot}%{startupfile}
+echo '(load "auctex.el" nil t t)' >> %{buildroot}%{startupfile}
 
 rm -rf %{buildroot}%{_var}
 rm -f %{buildroot}%{_datadir}/emacs/site-lisp/auctex/style/.nosearch
@@ -88,6 +88,9 @@
 %{_datadir}/emacs/site-lisp/tex-site.el
 
 %changelog
+* Thu Apr 20 2006 Ed Hill <ed at eh3.com> - 11.82-3
+- fix startup file per bug# 189488
+
 * Sun Apr  9 2006 Ed Hill <ed at eh3.com> - 11.82-2
 - rebuild
 



From fedora-extras-commits at redhat.com  Thu Apr 20 19:35:29 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Thu, 20 Apr 2006 12:35:29 -0700
Subject: rpms/emacs-auctex/devel emacs-auctex.spec,1.7,1.8
Message-ID: <200604201935.k3KJZVFq024578@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/emacs-auctex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24528/devel

Modified Files:
	emacs-auctex.spec 
Log Message:
fix startup file per bug# 189488



Index: emacs-auctex.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-auctex/devel/emacs-auctex.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- emacs-auctex.spec	9 Apr 2006 19:13:59 -0000	1.7
+++ emacs-auctex.spec	20 Apr 2006 19:35:29 -0000	1.8
@@ -4,7 +4,7 @@
 Summary: 	Enhanced TeX modes for Emacsen
 Name: 		emacs-auctex
 Version: 	11.82
-Release: 	2%{?dist}
+Release: 	3%{?dist}
 License: 	GPL
 Group: 		Applications/Editors
 URL: 		http://www.gnu.org/software/auctex/
@@ -55,7 +55,7 @@
 echo "; Autoactivation of AUCTeX" > %{buildroot}%{startupfile}
 echo "; Created for %{name}-%{version}-%{release}.noarch.rpm" >> \
   %{buildroot}%{startupfile}
-echo "(require 'tex-site)" >> %{buildroot}%{startupfile}
+echo '(load "auctex.el" nil t t)' >> %{buildroot}%{startupfile}
 
 rm -rf %{buildroot}%{_var}
 rm -f %{buildroot}%{_datadir}/emacs/site-lisp/auctex/style/.nosearch
@@ -88,6 +88,9 @@
 %{_datadir}/emacs/site-lisp/tex-site.el
 
 %changelog
+* Thu Apr 20 2006 Ed Hill <ed at eh3.com> - 11.82-3
+- fix startup file per bug# 189488
+
 * Sun Apr  9 2006 Ed Hill <ed at eh3.com> - 11.82-2
 - rebuild
 



From fedora-extras-commits at redhat.com  Thu Apr 20 19:35:27 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Thu, 20 Apr 2006 12:35:27 -0700
Subject: rpms/emacs-auctex/FC-4 emacs-auctex.spec,1.5,1.6
Message-ID: <200604201935.k3KJZxUj024581@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/emacs-auctex/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24528/FC-4

Modified Files:
	emacs-auctex.spec 
Log Message:
fix startup file per bug# 189488



Index: emacs-auctex.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-auctex/FC-4/emacs-auctex.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- emacs-auctex.spec	9 Apr 2006 19:04:14 -0000	1.5
+++ emacs-auctex.spec	20 Apr 2006 19:35:27 -0000	1.6
@@ -4,7 +4,7 @@
 Summary: 	Enhanced TeX modes for Emacsen
 Name: 		emacs-auctex
 Version: 	11.82
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License: 	GPL
 Group: 		Applications/Editors
 URL: 		http://www.gnu.org/software/auctex/
@@ -55,7 +55,7 @@
 echo "; Autoactivation of AUCTeX" > %{buildroot}%{startupfile}
 echo "; Created for %{name}-%{version}-%{release}.noarch.rpm" >> \
   %{buildroot}%{startupfile}
-echo "(require 'tex-site)" >> %{buildroot}%{startupfile}
+echo '(load "auctex.el" nil t t)' >> %{buildroot}%{startupfile}
 
 rm -rf %{buildroot}%{_var}
 rm -f %{buildroot}%{_datadir}/emacs/site-lisp/auctex/style/.nosearch
@@ -88,6 +88,9 @@
 %{_datadir}/emacs/site-lisp/tex-site.el
 
 %changelog
+* Thu Apr 20 2006 Ed Hill <ed at eh3.com> - 11.82-2
+- fix startup file per bug# 189488
+
 * Sun Apr  9 2006 Ed Hill <ed at eh3.com> - 11.82-1
 - update to 11.82
 



From fedora-extras-commits at redhat.com  Thu Apr 20 21:01:23 2006
From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom))
Date: Thu, 20 Apr 2006 14:01:23 -0700
Subject: devel/rrdtool .cvsignore, 1.4, 1.5 rrdtool.spec, 1.10, 1.11 sources,
	1.4, 1.5
Message-ID: <200604202101.k3KL1uoZ029168@cvs-int.fedora.redhat.com>

Author: kaboom

Update of /cvs/extras/devel/rrdtool
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29135

Modified Files:
	.cvsignore rrdtool.spec sources 
Log Message:
update to 1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/rrdtool/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Nov 2004 02:50:26 -0000	1.4
+++ .cvsignore	20 Apr 2006 21:01:23 -0000	1.5
@@ -1 +0,0 @@
-rrdtool-1.0.49.tar.gz


Index: rrdtool.spec
===================================================================
RCS file: /cvs/extras/devel/rrdtool/rrdtool.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rrdtool.spec	20 May 2005 15:49:47 -0000	1.10
+++ rrdtool.spec	20 Apr 2006 21:01:23 -0000	1.11
@@ -1,18 +1,17 @@
-%define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4)
-
 Summary: Round Robin Database Tool to store and display time-series data
 Name: rrdtool
-Version: 1.0.49
-Release: 5%{?dist}
+Version: 1.2.12
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Databases
 URL: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/
 Source: http://people.ee.ethz.ch/~oetiker/webtools/rrdtool/pub/rrdtool-1.0.x/rrdtool-%{version}.tar.gz
-Patch0: rrdtool-1.0.49-php_config.patch
-Patch1: rrdtool-1.0.49-fc4.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gcc-c++, php-devel >= 4.0, openssl-devel
-BuildRequires: libpng-devel, zlib-devel
+BuildRequires: gcc-c++ openssl-devel
+BuildRequires: libpng-devel, zlib-devel, libart_lgpl-devel
+BuildRequires: freetype-devel, python-devel
+
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %description
 RRD is the Acronym for Round Robin Database. RRD is a system to store and
@@ -23,7 +22,6 @@
 scripts (from shell or Perl) or via frontends that poll network devices and
 put a friendly user interface on it.
 
-
 %package devel
 Summary: RRDtool static libraries and header files
 Group: Development/Libraries
@@ -34,46 +32,22 @@
 display time-series data (i.e. network bandwidth, machine-room temperature,
 server load average). This package allow you to use directly this library.
 
-
-%package -n php-rrdtool
-Summary: RRDtool module for PHP
-Group: Development/Languages
-Requires: %{name} = %{version}, php >= 4.0
-
-%description -n php-rrdtool
-The php-%{name} package includes a dynamic shared object (DSO) that adds
-RRDtool bindings to the PHP HTML-embedded scripting language.
-
-
 %prep
 %setup
-%patch0 -p0 -b .phpfix
-%patch1 -p1 -b .fc4
 
 # Fixes to /usr/lib(64) for x86_64
 %{__perl} -pi.orig -e 's|/lib\b|/%{_lib}|g' \
-    configure contrib/php4/configure Makefile.in
-
+    configure Makefile.in
 
 %build
 %configure \
     --program-prefix="%{?_program_prefix}" \
     --enable-shared \
-    --enable-local-libpng \
-    --enable-local-zlib \
-    --with-pic
+    --with-pic \
+    --enable-perl-site-install \
+    --with-perl-options='INSTALLDIRS="vendor"'
 %{__make} %{?_smp_mflags}
 
-# Build the php4 module, the tmp install is required
-%define rrdtmpdir %{_tmppath}/%{buildsubdir}-tmpinstall
-%{__make} install DESTDIR="%{rrdtmpdir}"
-pushd contrib/php4
-    ./configure \
-        --with-rrdtool="%{rrdtmpdir}%{_prefix}"
-    %{__make} %{?_smp_mflags}
-popd
-%{__rm} -rf %{rrdtmpdir}
-
 # Fix @perl@ and @PERL@
 find examples/ -type f \
     -exec %{__perl} -pi -e 's|^#! \@perl\@|#!%{__perl}|gi' {} \;
@@ -82,73 +56,52 @@
 
 
 %install
-%{__rm} -rf %{buildroot}
-%makeinstall
-
-# Install the php4 module
-%{__install} -D -m0755 contrib/php4/modules/rrdtool.so \
-    %{buildroot}%{php_extdir}/rrdtool.so
-# Clean up the examples for inclusion as docs
-%{__rm} -rf contrib/php4/examples/CVS
-# Put the php config bit into place
-%{__mkdir_p} %{buildroot}%{_sysconfdir}/php.d
-%{__cat} > %{buildroot}%{_sysconfdir}/php.d/rrdtool.ini << EOF
-; Enable rrdtool extension module
-extension=rrdtool.so
-EOF
-
-# Put perl files back where they belong
-%{__mkdir_p} %{buildroot}%{perl_vendorarch}/
-%{__mv} %{buildroot}%{_libdir}/perl/* %{buildroot}%{perl_vendorarch}/
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR="$RPM_BUILD_ROOT" install
 
 # We only want .txt and .html files for the main documentation
 %{__mkdir_p} doc2/doc
 %{__cp} -a doc/*.txt doc/*.html doc2/doc/
 
 # Clean up the examples and contrib
-%{__rm} -f examples/Makefile*
-%{__rm} -f contrib/Makefile*
+%{__rm} -f examples/Makefile* examples/*.in
+
 # This is so rpm doesn't pick up perl module dependencies automatically
-find examples/ contrib/ -type f -exec chmod 0644 {} \;
+find examples/ -type f -exec chmod 0644 {} \;
 
 # Clean up the buildroot
-%{__rm} -rf %{buildroot}%{_prefix}/{contrib,doc,examples,html}/
-
+%{__rm} -rf %{buildroot}%{_prefix}/{doc,examples,html}/ \
+	%{buildroot}%{perl_vendorarch}/ntmake.pl \
+	%{buildroot}%{perl_archlib}/perllocal.pod \
 
 %clean
 %{__rm} -rf %{buildroot}
 
-
 %files
 %defattr(-, root, root, 0755)
-%doc CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO doc2/doc
+%doc CHANGES CONTRIBUTORS COPYING COPYRIGHT README TODO NEWS THREADS doc2/doc
 %{_bindir}/*
 %{_libdir}/*.so.*
+%{_datadir}/rrdtool/
+%{perl_vendorlib}/*.pm
 %{perl_vendorarch}/*.pm
 %{perl_vendorarch}/auto/*
+%{python_sitelib}/rrdtoolmodule.so
 %{_mandir}/man1/*
-
+%{_mandir}/man3/*
 
 %files devel
 %defattr(-, root, root, 0755)
 %doc examples/
-%doc contrib/add_ds contrib/killspike contrib/log2rrd contrib/rrdexplorer
-%doc contrib/rrdfetchnames contrib/rrd-file-icon contrib/rrdlastds
-%doc contrib/rrdproc contrib/rrdview contrib/snmpstats contrib/trytime
 %{_includedir}/*.h
 %{_libdir}/*.a
 %exclude %{_libdir}/*.la
 %{_libdir}/*.so
 
-
-%files -n php-rrdtool
-%defattr(-, root, root)
-%doc contrib/php4/examples contrib/php4/README
-%config(noreplace) %{_sysconfdir}/php.d/rrdtool.ini
-%{php_extdir}/rrdtool.so
-
-
 %changelog
+* Wed Apr 19 2006 Chris Ricker <kaboom at oobleck.net> 1.2.12-1
+- Rev to 1.2
+
 * Fri May 20 2005 Matthias Saou <http://freshrpms.net/> 1.0.49-5
 - Include patch from Michael to fix perl module compilation on FC4 (#156242).
 


Index: sources
===================================================================
RCS file: /cvs/extras/devel/rrdtool/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Nov 2004 02:50:26 -0000	1.4
+++ sources	20 Apr 2006 21:01:23 -0000	1.5
@@ -1 +0,0 @@
-fbe492dbf3d68abb1d86c2322e7ed44a  rrdtool-1.0.49.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 20 21:08:09 2006
From: fedora-extras-commits at redhat.com (Chris Ricker (kaboom))
Date: Thu, 20 Apr 2006 14:08:09 -0700
Subject: devel/rrdtool .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <200604202108.k3KL8B4m029263@cvs-int.fedora.redhat.com>

Author: kaboom

Update of /cvs/extras/devel/rrdtool
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29242

Modified Files:
	.cvsignore sources 
Log Message:
stupid expired cert!



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/devel/rrdtool/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Apr 2006 21:01:23 -0000	1.5
+++ .cvsignore	20 Apr 2006 21:08:08 -0000	1.6
@@ -0,0 +1 @@
+rrdtool-1.2.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/devel/rrdtool/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Apr 2006 21:01:23 -0000	1.5
+++ sources	20 Apr 2006 21:08:08 -0000	1.6
@@ -0,0 +1 @@
+7b544c38a818cbebcf06fe39b9f52d0d  rrdtool-1.2.12.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 20 22:12:39 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 20 Apr 2006 15:12:39 -0700
Subject: rpms/hdf/FC-5 hdf.spec,1.8,1.9
Message-ID: <200604202212.k3KMCfeB000521@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/hdf/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv504

Modified Files:
	hdf.spec 
Log Message:
Add Requires netcdf-devel for hdf-devel (bug #189337)



Index: hdf.spec
===================================================================
RCS file: /cvs/extras/rpms/hdf/FC-5/hdf.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- hdf.spec	13 Feb 2006 18:53:08 -0000	1.8
+++ hdf.spec	20 Apr 2006 22:12:38 -0000	1.9
@@ -1,6 +1,6 @@
 Name: hdf
 Version: 4.2r1
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD-ish
 Group: System Environment/Libraries
@@ -26,7 +26,7 @@
 Summary: HDF development files
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: libjpeg-devel zlib-devel
+Requires: libjpeg-devel zlib-devel netcdf-devel
 
 %description devel
 HDF development headers and libraries.
@@ -74,6 +74,9 @@
 %{_libdir}/%{name}/
 
 %changelog
+* Thu Apr 20 2006 Orion Poplawski <orion at cora.nwra.com> 4.2r1-10
+- Add Requires netcdf-devel for hdf-devel (bug #189337)
+
 * Mon Feb 13 2006 Orion Poplawski <orion at cora.nwra.com> 4.2r1-9
 - Rebuild for gcc/glibc changes
 



From fedora-extras-commits at redhat.com  Thu Apr 20 22:14:07 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 20 Apr 2006 15:14:07 -0700
Subject: rpms/hdf/FC-4 hdf.spec,1.6,1.7
Message-ID: <200604202214.k3KME9Td000579@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/hdf/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv562

Modified Files:
	hdf.spec 
Log Message:
Add Requires netcdf-devel for hdf-devel (bug #189337)



Index: hdf.spec
===================================================================
RCS file: /cvs/extras/rpms/hdf/FC-4/hdf.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- hdf.spec	20 Feb 2006 16:09:35 -0000	1.6
+++ hdf.spec	20 Apr 2006 22:14:07 -0000	1.7
@@ -1,6 +1,6 @@
 Name: hdf
 Version: 4.2r1
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD-ish
 Group: System Environment/Libraries
@@ -26,7 +26,7 @@
 Summary: HDF development files
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: libjpeg-devel zlib-devel
+Requires: libjpeg-devel zlib-devel netcdf-devel
 
 %description devel
 HDF development headers and libraries.
@@ -74,6 +74,9 @@
 %{_libdir}/%{name}/
 
 %changelog
+* Thu Apr 20 2006 Orion Poplawski <orion at cora.nwra.com> 4.2r1-7
+- Add Requires netcdf-devel for hdf-devel (bug #189337)
+
 * Mon Feb 20 2006 Orion Poplawski <orion at cora.nwra.com> 4.2r1-6
 - Compile with -DHAVE_NETCDF for gdl hdf/netcdf compatibility
 - Add patch to build on ppc



From fedora-extras-commits at redhat.com  Thu Apr 20 22:16:26 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 20 Apr 2006 15:16:26 -0700
Subject: rpms/hdf/FC-3 hdf.spec,1.10,1.11
Message-ID: <200604202216.k3KMGSpS000604@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/hdf/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv587

Modified Files:
	hdf.spec 
Log Message:
Add Requires netcdf-devel for hdf-devel (bug #189337)



Index: hdf.spec
===================================================================
RCS file: /cvs/extras/rpms/hdf/FC-3/hdf.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- hdf.spec	24 Feb 2006 23:51:25 -0000	1.10
+++ hdf.spec	20 Apr 2006 22:16:26 -0000	1.11
@@ -1,6 +1,6 @@
 Name: hdf
 Version: 4.2r1
-Release: 6%{?dist}.2
+Release: 7%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD-ish
 Group: System Environment/Libraries
@@ -26,7 +26,7 @@
 Summary: HDF development files
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: libjpeg-devel zlib-devel
+Requires: libjpeg-devel zlib-devel netcdf-devel
 
 %description devel
 HDF development headers and libraries.
@@ -74,6 +74,9 @@
 %{_libdir}/%{name}/
 
 %changelog
+* Thu Apr 20 2006 Orion Poplawski <orion at cora.nwra.com>  4.2r1-7
+- Add Requires netcdf-devel for hdf-devel (bug #189337)
+
 * Fri Feb 24 2006 Patrice Dumas <pertusus at free.fr> 4.2r1-6.2
 - use gcc-g77 instead of gcc-gfortran
 - sync with FC-4 spec file instead of devel



From fedora-extras-commits at redhat.com  Thu Apr 20 22:17:12 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Thu, 20 Apr 2006 15:17:12 -0700
Subject: rpms/hdf/devel hdf.spec,1.8,1.9
Message-ID: <200604202217.k3KMHEZv000663@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/hdf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv646

Modified Files:
	hdf.spec 
Log Message:
Add Requires netcdf-devel for hdf-devel (bug #189337)



Index: hdf.spec
===================================================================
RCS file: /cvs/extras/rpms/hdf/devel/hdf.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- hdf.spec	13 Feb 2006 18:53:08 -0000	1.8
+++ hdf.spec	20 Apr 2006 22:17:12 -0000	1.9
@@ -1,6 +1,6 @@
 Name: hdf
 Version: 4.2r1
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD-ish
 Group: System Environment/Libraries
@@ -26,7 +26,7 @@
 Summary: HDF development files
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
-Requires: libjpeg-devel zlib-devel
+Requires: libjpeg-devel zlib-devel netcdf-devel
 
 %description devel
 HDF development headers and libraries.
@@ -74,6 +74,9 @@
 %{_libdir}/%{name}/
 
 %changelog
+* Thu Apr 20 2006 Orion Poplawski <orion at cora.nwra.com> 4.2r1-10
+- Add Requires netcdf-devel for hdf-devel (bug #189337)
+
 * Mon Feb 13 2006 Orion Poplawski <orion at cora.nwra.com> 4.2r1-9
 - Rebuild for gcc/glibc changes
 



From fedora-extras-commits at redhat.com  Thu Apr 20 23:29:04 2006
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 20 Apr 2006 16:29:04 -0700
Subject: rpms/pcb/devel pcb.spec,NONE,1.1
Message-ID: <200604202329.k3KNT6EM003234@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/pcb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3214

Added Files:
	pcb.spec 
Log Message:
add a spec file.  wheeee.



--- NEW FILE pcb.spec ---
Summary:	An interactive printed circuit board editor
Name:		pcb
%define		pcbver 20060414
Version:	0.%{pcbver}
Release:	1
License:	GPL
Group:		Applications/Engineering
URL:		http://pcb.sourceforge.net
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	tcl, bison, flex, gawk, netpbm-progs, ImageMagick
BuildRequires:	m4, gtk2-devel, pkgconfig, glib2-devel, gd-devel
BuildRequires:	libpng-devel, libjpeg-devel, fontconfig-devel, freetype-devel
BuildRequires:	zlib-devel, cups, tetex-latex, libICE-devel
Source0:	http://prdownloads.sourceforge.net/pcb/pcb-%{pcbver}.tar.gz

%description
PCB is an interactive printed circuit board editor for the X window system.
PCB includes a rats nest feature, design rule checking, and can provide
industry standard RS-274-X (Gerber), NC drill, and centroid data (X-Y data)
output for use in the board fabrication and assembly process. PCB offers
high end features such as an autorouter and trace optimizer which can
tremendously reduce layout time. 

%prep
%setup -q -n pcb-%{pcbver}

%build
CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} --bindir=%{_bindir} \
	--datadir=%{_datadir} --includedir=%{_includedir} \
	--libdir=%{_libdir} --mandir=%{_mandir} --sysconfdir=%{_sysconfdir} \
	--infodir=%{_infodir}

make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make DESTDIR=$RPM_BUILD_ROOT install
rm $RPM_BUILD_ROOT/%{_datadir}/pcb/tools/gerbertotk.c
chmod 0755 $RPM_BUILD_ROOT/%{_datadir}/pcb/tools/{PCB2HPGL,Merge*,tgo2pcb.tcl}

%clean
rm -rf %{buildroot}

%post
/sbin/install-info --quiet --info-dir=%{_infodir} %{_infodir}/pcb.info.gz >/dev/null 2>&1

%preun
if [ $1 = 0 ]; then
  /sbin/install-info --quiet --info-dir=%{_infodir} --delete %{_infodir}/pcb.info.gz >/dev/null 2>&1
fi

%files
%defattr(-, root, root)
%doc AUTHORS COPYING README README.* NEWS ChangeLog
%{_mandir}/man1/*
%{_datadir}/pcb*
%{_bindir}/*
%{_infodir}/*

%changelog
* Wed Apr 19 2006 <pjones at redhat.com> - 0.20060414-1
- Let there be pcb packaging.



From fedora-extras-commits at redhat.com  Thu Apr 20 23:45:16 2006
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 20 Apr 2006 16:45:16 -0700
Subject: rpms/pcb/devel .cvsignore,1.1,1.2 sources,1.1,1.2
Message-ID: <200604202345.k3KNjIIC003876@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/pcb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3855

Modified Files:
	.cvsignore sources 
Log Message:
- add the tarball



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pcb/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	20 Apr 2006 13:16:17 -0000	1.1
+++ .cvsignore	20 Apr 2006 23:45:16 -0000	1.2
@@ -0,0 +1 @@
+pcb-20060414.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pcb/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	20 Apr 2006 13:16:17 -0000	1.1
+++ sources	20 Apr 2006 23:45:16 -0000	1.2
@@ -0,0 +1 @@
+5e471a7b80f1b5ebf21be22c9b7a2e8e  pcb-20060414.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 20 23:58:11 2006
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 20 Apr 2006 16:58:11 -0700
Subject: rpms/pcb/devel pcb.desktop,NONE,1.1 pcb.spec,1.1,1.2
Message-ID: <200604202358.k3KNwDY4003969@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/pcb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3947

Modified Files:
	pcb.spec 
Added Files:
	pcb.desktop 
Log Message:
- add desktop file



--- NEW FILE pcb.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=PCB
GenericName=PCB
Exec=pcb
Terminal=false
Type=Application
Categories=Application;Electronics;
Version=0.20060414


Index: pcb.spec
===================================================================
RCS file: /cvs/extras/rpms/pcb/devel/pcb.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pcb.spec	20 Apr 2006 23:29:04 -0000	1.1
+++ pcb.spec	20 Apr 2006 23:58:11 -0000	1.2
@@ -10,8 +10,9 @@
 BuildRequires:	tcl, bison, flex, gawk, netpbm-progs, ImageMagick
 BuildRequires:	m4, gtk2-devel, pkgconfig, glib2-devel, gd-devel
 BuildRequires:	libpng-devel, libjpeg-devel, fontconfig-devel, freetype-devel
-BuildRequires:	zlib-devel, cups, tetex-latex, libICE-devel
+BuildRequires:	zlib-devel, cups, tetex-latex, libICE-devel, desktop-file-utils
 Source0:	http://prdownloads.sourceforge.net/pcb/pcb-%{pcbver}.tar.gz
+Source1:	pcb.desktop
 
 %description
 PCB is an interactive printed circuit board editor for the X window system.
@@ -37,6 +38,10 @@
 make DESTDIR=$RPM_BUILD_ROOT install
 rm $RPM_BUILD_ROOT/%{_datadir}/pcb/tools/gerbertotk.c
 chmod 0755 $RPM_BUILD_ROOT/%{_datadir}/pcb/tools/{PCB2HPGL,Merge*,tgo2pcb.tcl}
+desktop-file-install --vendor fedora \
+	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
+	--add-category X-Fedora \
+	%{SOURCE1}
 
 %clean
 rm -rf %{buildroot}



From fedora-extras-commits at redhat.com  Fri Apr 21 00:02:02 2006
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 20 Apr 2006 17:02:02 -0700
Subject: rpms/pcb/devel pcb.spec,1.2,1.3
Message-ID: <200604210002.k3L02a79006015@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/pcb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5998

Modified Files:
	pcb.spec 
Log Message:
- add to the files section too



Index: pcb.spec
===================================================================
RCS file: /cvs/extras/rpms/pcb/devel/pcb.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pcb.spec	20 Apr 2006 23:58:11 -0000	1.2
+++ pcb.spec	21 Apr 2006 00:02:01 -0000	1.3
@@ -59,6 +59,7 @@
 %doc AUTHORS COPYING README README.* NEWS ChangeLog
 %{_mandir}/man1/*
 %{_datadir}/pcb*
+%{_datadir}/applications/fedora-pcb.desktop
 %{_bindir}/*
 %{_infodir}/*
 



From fedora-extras-commits at redhat.com  Fri Apr 21 00:10:30 2006
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Thu, 20 Apr 2006 17:10:30 -0700
Subject: rpms/pcb/devel pcb.spec,1.3,1.4
Message-ID: <200604210010.k3L0AWmB006098@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/extras/rpms/pcb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6076

Modified Files:
	pcb.spec 
Log Message:
- remove extra buildrequires



Index: pcb.spec
===================================================================
RCS file: /cvs/extras/rpms/pcb/devel/pcb.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pcb.spec	21 Apr 2006 00:02:01 -0000	1.3
+++ pcb.spec	21 Apr 2006 00:10:30 -0000	1.4
@@ -7,10 +7,9 @@
 Group:		Applications/Engineering
 URL:		http://pcb.sourceforge.net
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	tcl, bison, flex, gawk, netpbm-progs, ImageMagick
-BuildRequires:	m4, gtk2-devel, pkgconfig, glib2-devel, gd-devel
-BuildRequires:	libpng-devel, libjpeg-devel, fontconfig-devel, freetype-devel
-BuildRequires:	zlib-devel, cups, tetex-latex, libICE-devel, desktop-file-utils
+BuildRequires:	tcl, bison, flex, gawk, ImageMagick, gtk2-devel, gd-devel
+BuildRequires:	libjpeg-devel, fontconfig-devel
+BuildRequires:	cups, tetex-latex, libICE-devel, desktop-file-utils
 Source0:	http://prdownloads.sourceforge.net/pcb/pcb-%{pcbver}.tar.gz
 Source1:	pcb.desktop
 



From fedora-extras-commits at redhat.com  Fri Apr 21 00:18:09 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Thu, 20 Apr 2006 17:18:09 -0700
Subject: rpms/pygame - New directory
Message-ID: <200604210018.k3L0IBsN006319@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6296/pygame

Log Message:
Directory /cvs/extras/rpms/pygame added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 00:18:10 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Thu, 20 Apr 2006 17:18:10 -0700
Subject: rpms/pygame/devel - New directory
Message-ID: <200604210018.k3L0IC6G006322@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6296/pygame/devel

Log Message:
Directory /cvs/extras/rpms/pygame/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 00:18:29 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Thu, 20 Apr 2006 17:18:29 -0700
Subject: rpms/pygame Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604210018.k3L0IVYP006393@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6361

Added Files:
	Makefile import.log 
Log Message:
Setup of module pygame


--- NEW FILE Makefile ---
# Top level Makefile for module pygame
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 21 00:18:30 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Thu, 20 Apr 2006 17:18:30 -0700
Subject: rpms/pygame/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604210018.k3L0IW0w006396@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6361/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module pygame


--- 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 Apr 21 00:19:40 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Thu, 20 Apr 2006 17:19:40 -0700
Subject: rpms/pygame import.log,1.1,1.2
Message-ID: <200604210019.k3L0JgWa006563@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6525

Modified Files:
	import.log 
Log Message:
auto-import pygame-1.7.1-2 on branch devel from pygame-1.7.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pygame/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Apr 2006 00:18:29 -0000	1.1
+++ import.log	21 Apr 2006 00:19:40 -0000	1.2
@@ -0,0 +1 @@
+pygame-1_7_1-2:HEAD:pygame-1.7.1-2.src.rpm:1145578769



From fedora-extras-commits at redhat.com  Fri Apr 21 00:19:41 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Thu, 20 Apr 2006 17:19:41 -0700
Subject: rpms/pygame/devel pygame-1.7.1-64bit.patch, NONE,
	1.1 pygame-1.7.1-config.patch, NONE, 1.1 pygame.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604210019.k3L0JhEZ006574@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6525/devel

Modified Files:
	.cvsignore sources 
Added Files:
	pygame-1.7.1-64bit.patch pygame-1.7.1-config.patch pygame.spec 
Log Message:
auto-import pygame-1.7.1-2 on branch devel from pygame-1.7.1-2.src.rpm

pygame-1.7.1-64bit.patch:

--- NEW FILE pygame-1.7.1-64bit.patch ---
--- src/mixer.c.orig	2005-08-10 23:14:27.000000000 -0700
+++ src/mixer.c	2006-04-20 14:16:28.000000000 -0700
@@ -81,7 +81,7 @@
 	    channeldata[channel].queue = NULL;
 	    channelnum = Mix_PlayChannelTimed(channel, sound, 0, -1);
 	    if(channelnum != -1)
-	    	Mix_GroupChannel(channelnum, (int)sound);
+	    	Mix_GroupChannel(channelnum, (intptr_t)sound);
 	}
 	else
 	{
@@ -354,7 +354,7 @@
 	//make sure volume on this arbitrary channel is set to full
 	Mix_Volume(channelnum, 128);
 
-	Mix_GroupChannel(channelnum, (int)chunk);
+	Mix_GroupChannel(channelnum, (intptr_t)chunk);
 	return PyChannel_New(channelnum);
 }
 
@@ -378,7 +378,7 @@
 
 	MIXER_INIT_CHECK();
 
-	return PyInt_FromLong(Mix_GroupCount((int)chunk));
+	return PyInt_FromLong(Mix_GroupCount((intptr_t)chunk));
 }
 
 
@@ -440,7 +440,7 @@
 
 	MIXER_INIT_CHECK();
 
-	Mix_FadeOutGroup((int)chunk, time);
+	Mix_FadeOutGroup((intptr_t)chunk, time);
 	RETURN_NONE
 }
 
@@ -460,7 +460,7 @@
 
 	MIXER_INIT_CHECK();
 
-	Mix_HaltGroup((int)chunk);
+	Mix_HaltGroup((intptr_t)chunk);
 	RETURN_NONE
 }
 
@@ -661,7 +661,7 @@
 
 	channelnum = Mix_PlayChannelTimed(channelnum, chunk, loops, playtime);
 	if(channelnum != -1)
-		Mix_GroupChannel(channelnum, (int)chunk);
+		Mix_GroupChannel(channelnum, (intptr_t)chunk);
 
         Py_XDECREF(channeldata[channelnum].sound);
 	Py_XDECREF(channeldata[channelnum].queue);
@@ -705,7 +705,7 @@
 	{
 	    channelnum = Mix_PlayChannelTimed(channelnum, chunk, 0, -1);
 	    if(channelnum != -1)
-		    Mix_GroupChannel(channelnum, (int)chunk);
+		    Mix_GroupChannel(channelnum, (intptr_t)chunk);
 
             channeldata[channelnum].sound = sound;
             Py_INCREF(sound);
--- src/overlay.c.org	2005-08-09 19:45:15.000000000 -0700
+++ src/overlay.c	2006-04-20 14:16:28.000000000 -0700
@@ -85,7 +85,7 @@
 {
 	// Parse data params for frame
 	int ls_y, ls_u, ls_v, y;
-	unsigned char *dst_y, *dst_u, *dst_v, *src_y, *src_u, *src_v;
+	void *dst_y, *dst_u, *dst_v, *src_y, *src_u, *src_v;
 	if(!PyArg_ParseTuple(args, "(s#s#s#)", &src_y, &ls_y, &src_u, &ls_u, &src_v, &ls_v))
 		return NULL;
 
@@ -94,9 +94,9 @@
 		SDL_LockYUVOverlay( self->cOverlay );
 
 		// No clipping at this time( only support for YUV420 )
-		dst_y = (char*)self->cOverlay->pixels[ 0 ];
-		dst_v = (char*)self->cOverlay->pixels[ 1 ];
-		dst_u = (char*)self->cOverlay->pixels[ 2 ];
+		dst_y = (void*)self->cOverlay->pixels[ 0 ];
+		dst_v = (void*)self->cOverlay->pixels[ 1 ];
+		dst_u = (void*)self->cOverlay->pixels[ 2 ];
 		for (y=0; y< self->cOverlay->h; y++)
 		{
 			memcpy( dst_y, src_y, self->cOverlay->w );
--- src/time.c.org	2004-07-22 17:33:08.000000000 -0700
+++ src/time.c	2006-04-20 14:24:43.000000000 -0700
@@ -34,7 +34,7 @@
 	{
 		SDL_Event event;
 		memset(&event, 0, sizeof(event));
-		event.type = (int)param;
+		event.type = (intptr_t)param;
 		SDL_PushEvent(&event);
 	}
 	return interval;
@@ -193,7 +193,8 @@
 static PyObject* time_set_timer(PyObject* self, PyObject* arg)
 {
 	SDL_TimerID newtimer;
-	int ticks = 0, event = SDL_NOEVENT;
+	int ticks = 0;
+	intptr_t event = SDL_NOEVENT;
 	if(!PyArg_ParseTuple(arg, "ii", &event, &ticks))
 		return NULL;
 
--- src/surface.c.orig	2005-02-05 16:03:07.000000000 -0800
+++ src/surface.c	2006-04-20 15:01:07.000000000 -0700
@@ -35,7 +35,7 @@
                         SDL_Surface *dst, SDL_Rect *dstrect);
 
 static PyObject* surface_new(PyTypeObject *type, PyObject *args, PyObject *kwds);
-static int surface_init(PySurfaceObject *self, PyObject *args, PyObject *kwds);
+static intptr_t surface_init(PySurfaceObject *self, PyObject *args, PyObject *kwds);
 
 
 /* surface object methods */
@@ -1880,7 +1880,7 @@
     return (PyObject *)self;
 }
 
-static int surface_init(PySurfaceObject *self, PyObject *args, PyObject *kwds)
+static intptr_t surface_init(PySurfaceObject *self, PyObject *args, PyObject *kwds)
 {
 	Uint32 flags = 0;
 	int width, height;
@@ -1904,19 +1904,19 @@
 	if(depth && masks) /*all info supplied, most errorchecking needed*/
 	{
 		if(PySurface_Check(depth))
-			return (int)RAISE(PyExc_ValueError, "cannot pass surface for depth and color masks");
+			return (intptr_t)RAISE(PyExc_ValueError, "cannot pass surface for depth and color masks");
 		if(!IntFromObj(depth, &bpp))
-			return (int)RAISE(PyExc_ValueError, "invalid bits per pixel depth argument");
+			return (intptr_t)RAISE(PyExc_ValueError, "invalid bits per pixel depth argument");
 		if(!PySequence_Check(masks) || PySequence_Length(masks)!=4)
-			return (int)RAISE(PyExc_ValueError, "masks argument must be sequence of four numbers");
+			return (intptr_t)RAISE(PyExc_ValueError, "masks argument must be sequence of four numbers");
 		if(!UintFromObjIndex(masks, 0, &Rmask) || !UintFromObjIndex(masks, 1, &Gmask) ||
 					!UintFromObjIndex(masks, 2, &Bmask) || !UintFromObjIndex(masks, 3, &Amask))
-			return (int)RAISE(PyExc_ValueError, "invalid mask values in masks sequence");
+			return (intptr_t)RAISE(PyExc_ValueError, "invalid mask values in masks sequence");
 	}
 	else if(depth && PyNumber_Check(depth))/*use default masks*/
 	{
 		if(!IntFromObj(depth, &bpp))
-			return (int)RAISE(PyExc_ValueError, "invalid bits per pixel depth argument");
+			return (intptr_t)RAISE(PyExc_ValueError, "invalid bits per pixel depth argument");
 		if(flags & SDL_SRCALPHA)
 		{
 			switch(bpp)
@@ -1926,7 +1926,7 @@
 			case 32:
 				Rmask = 0xFF<<16; Gmask = 0xFF<<8; Bmask = 0xFF; Amask = 0xFF<<24; break;
 			default:
-				return (int)RAISE(PyExc_ValueError, "no standard masks exist for given bitdepth with alpha");
+				return (intptr_t)RAISE(PyExc_ValueError, "no standard masks exist for given bitdepth with alpha");
 			}
 		}
 		else
@@ -1946,7 +1946,7 @@
 			case 32:
 				Rmask = 0xFF<<16; Gmask = 0xFF<<8; Bmask = 0xFF; break;
 			default:
-				return (int)RAISE(PyExc_ValueError, "nonstandard bit depth given");
+				return (intptr_t)RAISE(PyExc_ValueError, "nonstandard bit depth given");
 			}
 		}
 	}

pygame-1.7.1-config.patch:

--- NEW FILE pygame-1.7.1-config.patch ---
--- config_unix.py.orig	2006-04-18 12:39:02.000000000 -0700
+++ config_unix.py	2006-04-18 12:38:25.000000000 -0700
@@ -17,6 +17,7 @@
 
 
 def confirm(message):
+    return 1
     "ask a yes/no question, return result"
     reply = raw_input('\n' + message + ' [Y/n]:')
     if reply and string.lower(reply[0]) == 'n':


--- NEW FILE pygame.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           pygame
Version:        1.7.1
Release:        2%{?dist}
Summary:        Python modules for writing games
Group:          Development/Languages
License:        LGPL
URL:            http://www.pygame.org/
Patch0:         %{name}-%{version}-config.patch
Patch1:         %{name}-%{version}-64bit.patch
Source0:        http://pygame.org/ftp/%{name}-%{version}release.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  python-devel python-numeric
BuildRequires:  SDL_ttf-devel SDL_image-devel SDL_mixer-devel
Requires:       python-numeric

%description
Pygame is a set of Python modules designed for writing games. It is
written on top of the excellent SDL library. This allows you to create
fully featured games and multimedia programs in the python language.
Pygame is highly portable and runs on nearly every platform and
operating system.

%package devel
Summary:        Files needed for developing programs which use pygame
Group:          Development/Libraries
Requires:       %{name} == %{version}-%{release}

%description devel
This package contains headers required to build applications that use
pygame.

%prep
%setup -q -n %{name}-%{version}release
%patch0 -p0 -b .config
%patch1 -p0 -b .64bit

# rpmlint fixes
chmod -x src/ffmovie.h
rm -f examples/.#stars.py.1.7

%build
CFLAGS="%{optflags}" %{__python} setup.py build

%install
rm -rf %{buildroot}
%{__python} setup.py install -O1 --skip-build --root %{buildroot}

%check
# base_test fails in mock, unable to find soundcard
PYTHONPATH="%{buildroot}%{python_sitearch}" %{__python} test/base_test.py || :
PYTHONPATH="%{buildroot}%{python_sitearch}" %{__python} test/image_test.py
PYTHONPATH="%{buildroot}%{python_sitearch}" %{__python} test/rect_test.py
 
%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc docs/ readme.txt WHATSNEW
%dir %{python_sitearch}/%{name}
%{python_sitearch}/%{name}/freesansbold.ttf
%{python_sitearch}/%{name}/pygame.ico
%{python_sitearch}/%{name}/pygame_icon.*
%{python_sitearch}/%{name}/*.so*
%{python_sitearch}/%{name}/*.py
%{python_sitearch}/%{name}/*.pyc
%ghost %{python_sitearch}/%{name}/*.pyo

%files devel
%defattr(-,root,root,-)
%doc examples/
%dir %{_includedir}/python*/%{name}
%{_includedir}/python*/%{name}/*.h

%changelog
* Thu Apr 20 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-2
- Added a patch to clean up some warnings on 64 bit compiles

* Tue Apr 18 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pygame/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2006 00:18:30 -0000	1.1
+++ .cvsignore	21 Apr 2006 00:19:40 -0000	1.2
@@ -0,0 +1 @@
+pygame-1.7.1release.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pygame/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2006 00:18:30 -0000	1.1
+++ sources	21 Apr 2006 00:19:40 -0000	1.2
@@ -0,0 +1 @@
+05d86d1af446f79411359400951053b7  pygame-1.7.1release.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 00:22:09 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Thu, 20 Apr 2006 17:22:09 -0700
Subject: owners owners.list,1.863,1.864
Message-ID: <200604210022.k3L0MB7j006661@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6644

Modified Files:
	owners.list 
Log Message:
Add pygame


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.863
retrieving revision 1.864
diff -u -r1.863 -r1.864
--- owners.list	19 Apr 2006 22:01:48 -0000	1.863
+++ owners.list	21 Apr 2006 00:22:09 -0000	1.864
@@ -1208,6 +1208,7 @@
 Fedora Extras|pychart|Python library for generating chart images|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|pydot|Python interface to Graphviz's Dot language|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|pyflowtools|Python bindings to OSU Flow-Tools library|i at stingr.net|extras-qa at fedoraproject.org|
+Fedora Extras|pygame|Python modules for writing games|tkmame at retrogames.com|extras-qa at fedoraproject.org|
 Fedora Extras|pygsl|GNU Scientific Library Interface for python|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|pylint|Analyzes Python code looking for bugs and signs of poor quality|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|pyparsing|An object-oriented approach to text processing|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Apr 21 00:38:35 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 20 Apr 2006 17:38:35 -0700
Subject: rpms/edje - New directory
Message-ID: <200604210038.k3L0cbpW006765@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/edje
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6739/edje

Log Message:
Directory /cvs/extras/rpms/edje added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 00:38:36 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 20 Apr 2006 17:38:36 -0700
Subject: rpms/edje/devel - New directory
Message-ID: <200604210038.k3L0ccw3006768@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/edje/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6739/edje/devel

Log Message:
Directory /cvs/extras/rpms/edje/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 00:38:49 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 20 Apr 2006 17:38:49 -0700
Subject: rpms/edje Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604210038.k3L0cpPI006812@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/edje
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6784

Added Files:
	Makefile import.log 
Log Message:
Setup of module edje


--- NEW FILE Makefile ---
# Top level Makefile for module edje
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 21 00:38:49 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 20 Apr 2006 17:38:49 -0700
Subject: rpms/edje/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200604210038.k3L0cpbg006815@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/edje/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6784/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module edje


--- 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 Apr 21 00:40:12 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 20 Apr 2006 17:40:12 -0700
Subject: rpms/edje import.log,1.1,1.2
Message-ID: <200604210040.k3L0eiFr006897@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/edje
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6859

Modified Files:
	import.log 
Log Message:
auto-import edje-0.5.0.026-1 on branch devel from edje-0.5.0.026-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/edje/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Apr 2006 00:38:49 -0000	1.1
+++ import.log	21 Apr 2006 00:40:12 -0000	1.2
@@ -0,0 +1 @@
+edje-0_5_0_026-1:HEAD:edje-0.5.0.026-1.src.rpm:1145580414



From fedora-extras-commits at redhat.com  Fri Apr 21 00:40:13 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 20 Apr 2006 17:40:13 -0700
Subject: rpms/edje/devel edje-0.5.0.023-novera.patch, NONE, 1.1 edje.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604210040.k3L0ejUm006901@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/edje/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6859/devel

Modified Files:
	.cvsignore sources 
Added Files:
	edje-0.5.0.023-novera.patch edje.spec 
Log Message:
auto-import edje-0.5.0.026-1 on branch devel from edje-0.5.0.026-1.src.rpm

edje-0.5.0.023-novera.patch:

--- NEW FILE edje-0.5.0.023-novera.patch ---
--- edje-0.5.0.023/configure.novera	2006-02-06 04:26:45.000000000 -0500
+++ edje-0.5.0.023/configure	2006-02-06 04:27:12.000000000 -0500
@@ -22506,7 +22506,7 @@
 
 
 
-                                                                                                                                                                                                                                      ac_config_files="$ac_config_files edje.pc edje.spec Makefile data/Makefile data/images/Makefile data/include/Makefile data/src/Makefile data/template/Makefile data/template/embryo/Makefile data/template/fonts/Makefile data/template/hashes/Makefile data/template/images/Makefile data/template/macros/Makefile data/template/parts/Makefile data/template/programs/Makefile data/test/Makefile data/test/fonts/Makefile data/test/images/Makefile src/Makefile src/lib/Makefile src/bin/Makefile edje-config debian/changelog"
+                                                                                                                                                                                                                                      ac_config_files="$ac_config_files edje.pc edje.spec Makefile data/Makefile data/images/Makefile data/include/Makefile data/src/Makefile data/template/Makefile data/template/embryo/Makefile data/template/fonts/Makefile data/template/hashes/Makefile data/template/images/Makefile data/template/macros/Makefile data/template/parts/Makefile data/template/programs/Makefile data/test/Makefile data/test/images/Makefile src/Makefile src/lib/Makefile src/bin/Makefile edje-config debian/changelog"
           ac_config_commands="$ac_config_commands default"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -23122,7 +23122,6 @@
   "data/template/parts/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/template/parts/Makefile" ;;
   "data/template/programs/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/template/programs/Makefile" ;;
   "data/test/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/test/Makefile" ;;
-  "data/test/fonts/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/test/fonts/Makefile" ;;
   "data/test/images/Makefile" ) CONFIG_FILES="$CONFIG_FILES data/test/images/Makefile" ;;
   "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
   "src/lib/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/lib/Makefile" ;;
--- edje-0.5.0.023/data/template/fonts/fonts.edc.novera	2006-02-06 04:50:04.000000000 -0500
+++ edje-0.5.0.023/data/template/fonts/fonts.edc	2006-02-06 04:50:22.000000000 -0500
@@ -1 +1 @@
-    font, "Vera.ttf" "Edje.Vera";
+    font, "/usr/share/fonts/bitstream-vera/Vera.ttf" "Edje.Vera";
--- edje-0.5.0.023/data/template/fonts/Makefile.in.novera	2006-02-06 04:49:18.000000000 -0500
+++ edje-0.5.0.023/data/template/fonts/Makefile.in	2006-02-06 04:49:28.000000000 -0500
@@ -154,7 +154,7 @@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 vimdir = @vimdir@
-FILES = Vera.ttf fonts.edc
+FILES = fonts.edc
 
 fontdir = $(pkgdatadir)/data/template/fonts
 font_DATA = $(FILES)
--- edje-0.5.0.023/data/test/Makefile.in.novera	2006-02-06 04:53:31.000000000 -0500
+++ edje-0.5.0.023/data/test/Makefile.in	2006-02-06 04:53:43.000000000 -0500
@@ -154,7 +154,7 @@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 vimdir = @vimdir@
-SUBDIRS = fonts images
+SUBDIRS = images
 subdir = data/test
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs


--- NEW FILE edje.spec ---
Name:           edje
Version:        0.5.0.026
Release:        1%{?dist}
Summary:        A complex graphical design and layout library

Group:          System Environment/Libraries
License:        MIT
URL:            http://www.enlightenment.org/Libraries/Edje/
Source0:        http://enlightenment.freedesktop.org/files/%{name}-%{version}.tar.gz
Patch:          edje-0.5.0.023-novera.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  eet-devel evas-devel ecore-devel embryo-devel zlib-devel
BuildRequires:  libjpeg-devel libidn-devel curl-devel
#Requires:       

%description
Edje is a complex graphical design & layout library. Its purpose is to be a
sequel to "Ebits" which to date has serviced the needs of Enlightenment
development for version 0.17. The original design parameters under which
Ebits came about were a lot more restricted than the resulting use of them,
thus Edje was born.

%package        devel
Summary:        Development files for %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description    devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.

%prep
%setup -q
%patch -p 1 -b .novera

%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 {} \;

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING COPYING-PLAIN README
%{_bindir}/%{name}
%{_bindir}/%{name}_*
%{_datadir}/%{name}
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc
%{_bindir}/*config
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/*

%changelog
* Tue Apr 18 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.5.0.026-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/edje/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2006 00:38:49 -0000	1.1
+++ .cvsignore	21 Apr 2006 00:40:13 -0000	1.2
@@ -0,0 +1 @@
+edje-0.5.0.026.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/edje/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2006 00:38:49 -0000	1.1
+++ sources	21 Apr 2006 00:40:13 -0000	1.2
@@ -0,0 +1 @@
+9907e12517b67787157cba49f863b99f  edje-0.5.0.026.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 02:02:23 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Thu, 20 Apr 2006 19:02:23 -0700
Subject: owners owners.list,1.864,1.865
Message-ID: <200604210202.k3L22v8R011242@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11222

Modified Files:
	owners.list 
Log Message:
+edje,+python-nose


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.864
retrieving revision 1.865
diff -u -r1.864 -r1.865
--- owners.list	21 Apr 2006 00:22:09 -0000	1.864
+++ owners.list	21 Apr 2006 02:02:23 -0000	1.865
@@ -218,6 +218,7 @@
 Fedora Extras|ecl|Embeddable Common-Lisp|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|ecore|An event and X abstraction layer|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|edb|A database convenience library wrapped around BDB|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
+Fedora Extras|edje|A complex graphical design and layout library|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|eet|A library designed to write an arbitary set of chunks of data to a file|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|elmo|Terminal-based mail client|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|emacs-auctex|Enhanced TeX modes for Emacsen|ed at eh3.com|extras-qa at fedoraproject.org|
@@ -1248,6 +1249,7 @@
 Fedora Extras|python-matplotlib|Python plotting library|orion at cora.nwra.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|michel.salim at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|python-nose|A discovery-based unittest extension for Python|ivazquez at ivazquez.net|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|
 Fedora Extras|python-paramiko|A SSH2 protocol library for python|shahms at shahms.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Apr 21 07:01:22 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Fri, 21 Apr 2006 00:01:22 -0700
Subject: rpms/torque/devel torque-2.1.0p0-sched-offbyone.patch, NONE,
	1.1 torque.spec, 1.1, 1.2
Message-ID: <200604210701.k3L71wQt022451@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22427

Modified Files:
	torque.spec 
Added Files:
	torque-2.1.0p0-sched-offbyone.patch 
Log Message:
fix pbs_sched error opening lockfile and immediately exiting



torque-2.1.0p0-sched-offbyone.patch:

--- NEW FILE torque-2.1.0p0-sched-offbyone.patch ---
--- torque-2.1.0p0-snap.200604171430/src/scheduler.cc/pbs_sched.c.orig 2006-04-06 23:56:37.000000000 +0200
+++ torque-2.1.0p0-snap.200604171430/src/scheduler.cc/pbs_sched.c      2006-04-20 16:52:38.000000000 +0200
@@ -992,7 +992,7 @@

         (void)sprintf(log_buffer, "%ld\n", (long)pid);

-        if (write(lockfds, log_buffer, strlen(log_buffer)+1) != strlen(log_buffer))
+        if (write(lockfds, log_buffer, strlen(log_buffer)+1) != strlen(log_buffer)+1)
           {
           perror("writing to lockfile");




Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/torque.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- torque.spec	18 Apr 2006 02:10:40 -0000	1.1
+++ torque.spec	21 Apr 2006 07:01:22 -0000	1.2
@@ -3,7 +3,7 @@
 %define name torque
 %define version 2.1.0p0
 %define snap 200604171430
-%define release 7
+%define release 8
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -91,6 +91,7 @@
 Source4: xpbs.png
 Source5: xpbsmon.png
 Patch1: torque-2.1.0-remove-rpath.path
+Patch2: torque-2.1.0p0-sched-offbyone.patch
 License: Freely redistributable (See PBS_License.txt)
 Group: System Environment/Daemons
 URL: http://www.clusterresources.com/products/torque/
@@ -119,6 +120,7 @@
 %prep
 %setup -q -n torque-%{version}%{?snap:-snap.%snap}
 %patch1 -p1
+%patch2 -p1
 
 %__cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} .
 
@@ -423,6 +425,9 @@
 
 
 %changelog
+* Thu Apr 20 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.8.200604171430cvs
+- fix pbs_sched error opening lockfile and immediately exiting
+
 * Mon Apr 17 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.7.200604171430cvs
 - importing to fedora extras
 



From fedora-extras-commits at redhat.com  Fri Apr 21 07:05:50 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Fri, 21 Apr 2006 00:05:50 -0700
Subject: rpms/torque/FC-5 torque.spec,1.1,1.2
Message-ID: <200604210705.k3L75q5i022551@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22534

Modified Files:
	torque.spec 
Log Message:
* Thu Apr 20 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.8.200604171430cvs
- fix pbs_sched error opening lockfile and immediately exiting



Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-5/torque.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- torque.spec	18 Apr 2006 02:10:40 -0000	1.1
+++ torque.spec	21 Apr 2006 07:05:50 -0000	1.2
@@ -3,7 +3,7 @@
 %define name torque
 %define version 2.1.0p0
 %define snap 200604171430
-%define release 7
+%define release 8
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -91,6 +91,7 @@
 Source4: xpbs.png
 Source5: xpbsmon.png
 Patch1: torque-2.1.0-remove-rpath.path
+Patch2: torque-2.1.0p0-sched-offbyone.patch
 License: Freely redistributable (See PBS_License.txt)
 Group: System Environment/Daemons
 URL: http://www.clusterresources.com/products/torque/
@@ -119,6 +120,7 @@
 %prep
 %setup -q -n torque-%{version}%{?snap:-snap.%snap}
 %patch1 -p1
+%patch2 -p1
 
 %__cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} .
 
@@ -423,6 +425,9 @@
 
 
 %changelog
+* Thu Apr 20 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.8.200604171430cvs
+- fix pbs_sched error opening lockfile and immediately exiting
+
 * Mon Apr 17 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.7.200604171430cvs
 - importing to fedora extras
 



From fedora-extras-commits at redhat.com  Fri Apr 21 07:06:22 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Fri, 21 Apr 2006 00:06:22 -0700
Subject: rpms/torque/FC-4 torque.spec,1.1,1.2
Message-ID: <200604210706.k3L76OZb022608@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22591

Modified Files:
	torque.spec 
Log Message:
* Thu Apr 20 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.8.200604171430cvs
- fix pbs_sched error opening lockfile and immediately exiting



Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-4/torque.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- torque.spec	18 Apr 2006 02:10:40 -0000	1.1
+++ torque.spec	21 Apr 2006 07:06:22 -0000	1.2
@@ -3,7 +3,7 @@
 %define name torque
 %define version 2.1.0p0
 %define snap 200604171430
-%define release 7
+%define release 8
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -91,6 +91,7 @@
 Source4: xpbs.png
 Source5: xpbsmon.png
 Patch1: torque-2.1.0-remove-rpath.path
+Patch2: torque-2.1.0p0-sched-offbyone.patch
 License: Freely redistributable (See PBS_License.txt)
 Group: System Environment/Daemons
 URL: http://www.clusterresources.com/products/torque/
@@ -119,6 +120,7 @@
 %prep
 %setup -q -n torque-%{version}%{?snap:-snap.%snap}
 %patch1 -p1
+%patch2 -p1
 
 %__cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} .
 
@@ -423,6 +425,9 @@
 
 
 %changelog
+* Thu Apr 20 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.8.200604171430cvs
+- fix pbs_sched error opening lockfile and immediately exiting
+
 * Mon Apr 17 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.7.200604171430cvs
 - importing to fedora extras
 



From fedora-extras-commits at redhat.com  Fri Apr 21 07:06:35 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Fri, 21 Apr 2006 00:06:35 -0700
Subject: rpms/torque/FC-3 torque.spec,1.1,1.2
Message-ID: <200604210706.k3L76bp2022633@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22614

Modified Files:
	torque.spec 
Log Message:
* Thu Apr 20 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.8.200604171430cvs
- fix pbs_sched error opening lockfile and immediately exiting



Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-3/torque.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- torque.spec	18 Apr 2006 02:10:40 -0000	1.1
+++ torque.spec	21 Apr 2006 07:06:35 -0000	1.2
@@ -3,7 +3,7 @@
 %define name torque
 %define version 2.1.0p0
 %define snap 200604171430
-%define release 7
+%define release 8
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -91,6 +91,7 @@
 Source4: xpbs.png
 Source5: xpbsmon.png
 Patch1: torque-2.1.0-remove-rpath.path
+Patch2: torque-2.1.0p0-sched-offbyone.patch
 License: Freely redistributable (See PBS_License.txt)
 Group: System Environment/Daemons
 URL: http://www.clusterresources.com/products/torque/
@@ -119,6 +120,7 @@
 %prep
 %setup -q -n torque-%{version}%{?snap:-snap.%snap}
 %patch1 -p1
+%patch2 -p1
 
 %__cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} .
 
@@ -423,6 +425,9 @@
 
 
 %changelog
+* Thu Apr 20 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.8.200604171430cvs
+- fix pbs_sched error opening lockfile and immediately exiting
+
 * Mon Apr 17 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.7.200604171430cvs
 - importing to fedora extras
 



From fedora-extras-commits at redhat.com  Fri Apr 21 07:08:09 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Fri, 21 Apr 2006 00:08:09 -0700
Subject: rpms/torque/FC-5 torque-2.1.0p0-sched-offbyone.patch,NONE,1.1
Message-ID: <200604210708.k3L78BSQ022780@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22762

Added Files:
	torque-2.1.0p0-sched-offbyone.patch 
Log Message:
* Thu Apr 20 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.8.200604171430cvs
- fix pbs_sched error opening lockfile and immediately exiting


torque-2.1.0p0-sched-offbyone.patch:

--- NEW FILE torque-2.1.0p0-sched-offbyone.patch ---
--- torque-2.1.0p0-snap.200604171430/src/scheduler.cc/pbs_sched.c.orig 2006-04-06 23:56:37.000000000 +0200
+++ torque-2.1.0p0-snap.200604171430/src/scheduler.cc/pbs_sched.c      2006-04-20 16:52:38.000000000 +0200
@@ -992,7 +992,7 @@

         (void)sprintf(log_buffer, "%ld\n", (long)pid);

-        if (write(lockfds, log_buffer, strlen(log_buffer)+1) != strlen(log_buffer))
+        if (write(lockfds, log_buffer, strlen(log_buffer)+1) != strlen(log_buffer)+1)
           {
           perror("writing to lockfile");





From fedora-extras-commits at redhat.com  Fri Apr 21 07:08:49 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Fri, 21 Apr 2006 00:08:49 -0700
Subject: rpms/torque/FC-4 torque-2.1.0p0-sched-offbyone.patch,NONE,1.1
Message-ID: <200604210708.k3L78pkk022839@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22821

Added Files:
	torque-2.1.0p0-sched-offbyone.patch 
Log Message:
* Thu Apr 20 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.8.200604171430cvs
- fix pbs_sched error opening lockfile and immediately exiting


torque-2.1.0p0-sched-offbyone.patch:

--- NEW FILE torque-2.1.0p0-sched-offbyone.patch ---
--- torque-2.1.0p0-snap.200604171430/src/scheduler.cc/pbs_sched.c.orig 2006-04-06 23:56:37.000000000 +0200
+++ torque-2.1.0p0-snap.200604171430/src/scheduler.cc/pbs_sched.c      2006-04-20 16:52:38.000000000 +0200
@@ -992,7 +992,7 @@

         (void)sprintf(log_buffer, "%ld\n", (long)pid);

-        if (write(lockfds, log_buffer, strlen(log_buffer)+1) != strlen(log_buffer))
+        if (write(lockfds, log_buffer, strlen(log_buffer)+1) != strlen(log_buffer)+1)
           {
           perror("writing to lockfile");





From fedora-extras-commits at redhat.com  Fri Apr 21 07:09:13 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Fri, 21 Apr 2006 00:09:13 -0700
Subject: rpms/torque/FC-3 torque-2.1.0p0-sched-offbyone.patch,NONE,1.1
Message-ID: <200604210709.k3L79Fvu022898@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22880

Added Files:
	torque-2.1.0p0-sched-offbyone.patch 
Log Message:
* Thu Apr 20 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.8.200604171430cvs
- fix pbs_sched error opening lockfile and immediately exiting


torque-2.1.0p0-sched-offbyone.patch:

--- NEW FILE torque-2.1.0p0-sched-offbyone.patch ---
--- torque-2.1.0p0-snap.200604171430/src/scheduler.cc/pbs_sched.c.orig 2006-04-06 23:56:37.000000000 +0200
+++ torque-2.1.0p0-snap.200604171430/src/scheduler.cc/pbs_sched.c      2006-04-20 16:52:38.000000000 +0200
@@ -992,7 +992,7 @@

         (void)sprintf(log_buffer, "%ld\n", (long)pid);

-        if (write(lockfds, log_buffer, strlen(log_buffer)+1) != strlen(log_buffer))
+        if (write(lockfds, log_buffer, strlen(log_buffer)+1) != strlen(log_buffer)+1)
           {
           perror("writing to lockfile");





From fedora-extras-commits at redhat.com  Fri Apr 21 07:59:27 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Fri, 21 Apr 2006 00:59:27 -0700
Subject: rpms/ghc/devel .cvsignore, 1.5, 1.6 ghc.spec, 1.11, 1.12 sources,
	1.5, 1.6
Message-ID: <200604210759.k3L7xTjh022999@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22978

Modified Files:
	.cvsignore ghc.spec sources 
Log Message:
update to 6.4.2 release



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Sep 2005 23:37:16 -0000	1.5
+++ .cvsignore	21 Apr 2006 07:59:27 -0000	1.6
@@ -1 +1 @@
-ghc-6.4.1-src.tar.bz2
+ghc-6.4.2-src.tar.bz2


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ghc.spec	2 Mar 2006 08:40:15 -0000	1.11
+++ ghc.spec	21 Apr 2006 07:59:27 -0000	1.12
@@ -1,12 +1,12 @@
-%define ghcver ghc641
+%define ghcver ghc642
 
 # speed up test builds by not building profiled libraries
 %define build_prof 1
 %define build_doc 1
 
 Name:		ghc
-Version:	6.4.1
-Release:	3%{?dist}
+Version:	6.4.2
+Release:	1%{?dist}
 Summary:	Glasgow Haskell Compilation system
 License:	BSD style
 Group:		Development/Languages
@@ -14,8 +14,8 @@
 URL:		http://haskell.org/ghc/
 Requires:	%{ghcver} = %{version}-%{release}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: ghc, sed
-Buildrequires: gmp-devel, readline-devel, libX11-devel, freeglut-devel, openal-devel
+BuildRequires:  ghc, sed
+Buildrequires:  gmp-devel, readline-devel, libX11-devel, freeglut-devel, openal-devel
 %if %{build_doc}
 # haddock generates libraries/ docs
 Buildrequires: libxslt, docbook-style-xsl, haddock
@@ -156,15 +156,18 @@
 %endif
 
 %changelog
-* Thu Mar  2 2006 Jens Petersen <petersen at redhat.com> - 6.4.1-3
+* Thu Apr 20 2006 Jens Petersen <petersen at redhat.com> - 6.4.2-1
+- update to 6.4.2 release
+
+* Thu Mar  2 2006 Jens Petersen <petersen at redhat.com> - 6.4.1-3.fc5
 - buildrequire libX11-devel instead of xorg-x11-devel (Kevin Fenzi, #181024)
 - make ghc-doc require ghc (Michel Salim, #180449)
 
-* Tue Oct 11 2005 Jens Petersen <petersen at redhat.com> - 6.4.1-2
+* Tue Oct 11 2005 Jens Petersen <petersen at redhat.com> - 6.4.1-2.fc5
 - turn on build_doc since haddock is now in Extras
 - no longer specify ghc version to build with (Ville Skytt??, #170176)
 
-* Tue Sep 20 2005 Jens Petersen <petersen at redhat.com> - 6.4.1-1
+* Tue Sep 20 2005 Jens Petersen <petersen at redhat.com> - 6.4.1-1.fc5
 - 6.4.1 release
   - the following patches are now upstream: ghc-6.4-powerpc.patch,
     rts-GCCompact.h-x86_64.patch, ghc-6.4-dsforeign-x86_64-1097471.patch,


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Sep 2005 23:37:16 -0000	1.5
+++ sources	21 Apr 2006 07:59:27 -0000	1.6
@@ -1 +1 @@
-fd289bc7c3afa272ff831a71a50b5b00  ghc-6.4.1-src.tar.bz2
+a394bf14e94c3bca5507d568fcc03375  ghc-6.4.2-src.tar.bz2



From fedora-extras-commits at redhat.com  Fri Apr 21 08:11:43 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 21 Apr 2006 01:11:43 -0700
Subject: rpms/libassetml/devel libassetml-gcompris.patch, NONE,
	1.1 libassetml.spec, 1.1, 1.2
Message-ID: <200604210811.k3L8Bj1b025135@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/libassetml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25115

Modified Files:
	libassetml.spec 
Added Files:
	libassetml-gcompris.patch 
Log Message:
* Mon Apr 17 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.1-2
- Add libassetml-gcompris.patch which adds a couple of fixes found in the
  version of libassetml as shipped with gcompris. Which is BTW currently our
  only user. Notice that this version is much less (annoyingly) verbose then
  the version bundled with gcompris.


libassetml-gcompris.patch:

--- NEW FILE libassetml-gcompris.patch ---
--- libassetml-1.2.1/src/assetml.c.gcompris	2003-10-07 13:22:37.000000000 +0200
+++ libassetml-1.2.1/src/assetml.c	2006-04-21 00:14:57.000000000 +0200
@@ -17,6 +17,7 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include "glib.h"
 #include "assetml.h"
 #include <config.h>
 
@@ -25,32 +26,37 @@
 #include <libxml/parser.h>
 
 #include <locale.h>
-#include <dirent.h>
 #include <string.h>
 
 #define FILE_EXT ".assetml"
 
-gchar	*assetml_get_locale(void);
-gchar	*reactivate_newline(gchar *str);
-void	 dump_asset(AssetML *assetml);
-int	 selectAssetML(const struct dirent *d);
-void	 assetml_read_xml_file(GList **gl_result, char *fname,
-			       gchar *dataset, gchar* categories, gchar* mimetype, gchar *locale, gchar* file);
-void	 assetml_load_xml(GList **gl_result, gchar *dataset, gchar* categories, gchar* mimetype, 
-			  gchar* locale, gchar* file);
-void	 free_asset(AssetML *assetml);
+const gchar	*assetml_get_locale(void);
+static gchar	*reactivate_newline(gchar *str);
+int		 selectAssetML(const gchar *dirent);
+void		 assetml_read_xml_file(GList **gl_result, char *fname,
+				       gchar *dataset, gchar* categories, gchar* mimetype, 
+				       const gchar *locale, gchar* file);
+void		 assetml_load_xml(GList **gl_result, gchar *dataset, gchar* categories, 
+				  gchar* mimetype, 
+				  const gchar* locale, gchar* file);
+void		 free_asset(AssetML *assetml);
+
+GHashTable *asset_cache = NULL;
 
 /*
  * This returns the locale for which text must be displayed
  *
  */
-gchar *assetml_get_locale()
+const gchar *assetml_get_locale()
 {
-  char *locale;
+  const char *locale;
 
-  locale = getenv("LC_ALL");
+  locale = g_getenv("LC_ALL");
+  if(locale == NULL)
+    locale = g_getenv("LC_MESSAGES");
   if(locale == NULL)
-    locale = getenv("LANG");
+    locale = g_getenv("LANG");
+
 
   if(locale!=NULL)
     return(locale);
@@ -65,7 +71,7 @@
  * \f \n \r \t \\ \" and the octal format.
  * 
  */
-gchar *reactivate_newline(gchar *str)
+static gchar *reactivate_newline(gchar *str)
 {
   gchar *newstr;
 
@@ -79,24 +85,6 @@
   return newstr;
 }
 
-void dump_asset(AssetML *assetml)
-{
-
-  printf("Dump Asset\n");
-
-  if(assetml==NULL)
-    return;
-
-  printf("  dataset     = %s\n",assetml->dataset);
-  printf("  file        = %s\n",assetml->file);
-  printf("  locale      = %s\n",assetml->locale);
-  printf("  description = %s\n",assetml->description);
-  printf("  categories  = %s\n",assetml->categories);
-  printf("  mimetype    = %s\n",assetml->mimetype);
-  printf("  credits     = %s\n",assetml->credits);
-
-}
-
 /*
  * Thanks for George Lebl <jirka at 5z.com> for his Genealogy example
  * for all the XML stuff there
@@ -131,6 +119,14 @@
     assetml->file		= NULL;
   xmlFree(tmpstr);
 
+  tmpstr = xmlGetProp(xmlnode,"name");
+  if(tmpstr && strlen(tmpstr)>0)
+  assetml->name		= g_strdup(tmpstr);
+  else
+    assetml->name		= g_path_get_basename(assetml->file);
+  xmlFree(tmpstr);
+
+
   tmpstr = xmlGetProp(xmlnode,"mimetype");
   if(tmpstr && strlen(tmpstr)>0)
   assetml->mimetype		= g_strdup(tmpstr);
@@ -138,6 +134,8 @@
     assetml->mimetype		= NULL;
   xmlFree(tmpstr);
 
+
+
   xmlnode = xmlnode->xmlChildrenNode;
   while (xmlnode != NULL) {
     gchar *lang = xmlGetProp(xmlnode,"lang");
@@ -185,22 +183,29 @@
  */
 static gboolean matching(AssetML *assetml, gchar *mydataset, 
 			 gchar *dataset, gchar* categories, gchar* mimetype, 
-			 gchar* mylocale, gchar* locale, gchar* file)
+			 const gchar* mylocale, const gchar* locale, gchar* name)
 {
   g_assert(assetml);
 
-  assetml->dataset = g_strdup(mydataset);
+  if (!assetml->locale)
+    assetml->locale = g_strdup(mylocale);
+  if (!assetml->dataset)
+    assetml->dataset = g_strdup(mydataset);
+
   if(assetml->dataset && dataset)
     if(g_ascii_strcasecmp(assetml->dataset, dataset))
       return FALSE;
 
+
   /* Check the leading locale definition matches the leading user request so that
    * File   Requested   Status
    * fr     fr_FR.UTF8  OK
    * pt     pt_BR       OK
    * pt_BR  pt          NO
    */
-  assetml->locale = g_strdup(mylocale);
+  if (!assetml->locale)
+    assetml->locale = g_strdup(mylocale);
+
   if(assetml->locale && locale)
     if(g_ascii_strncasecmp(assetml->locale, locale, strlen(assetml->locale)))
       return FALSE;
@@ -209,12 +214,16 @@
     if(g_ascii_strcasecmp(assetml->mimetype, mimetype))
       return FALSE;
 
-  if(assetml->file && file)
+  if(assetml->name && name)
+    if(g_ascii_strcasecmp(assetml->name, name))
+      return FALSE;
+
+/*  if(assetml->file && file)
     {
       gchar *str1;
       gchar *str2;
       gboolean nomatch;
-      /* We test only the basename of the file so that caller do not need to specify a full path */
+//      We test only the basename of the file so that caller do not need to specify a full path 
       str1 = g_path_get_basename(assetml->file);
       str2 = g_path_get_basename(file);
 
@@ -225,7 +234,7 @@
 
       if(nomatch)
 	return FALSE;
-    }
+    }*/
 
   if(assetml->categories && categories)
     {
@@ -247,8 +256,21 @@
 static void
 parse_doc(GList **gl_result, xmlDocPtr doc, 
 	  gchar *mydataset, gchar *rootdir, gchar* mylocale,
-	  gchar *dataset, gchar* categories, gchar* mimetype, gchar* locale, gchar* file)
+	  gchar *dataset, gchar* categories, gchar* mimetype, const gchar* locale, gchar* file, GList **cache)
 {
+  if (*cache){
+    GList *list;
+
+    for (list= *cache; list != NULL; list=list->next){
+      AssetML *assetml = (AssetML *) list->data;
+      
+      if (matching(assetml, mydataset, dataset, categories, 
+		   mimetype, mylocale, locale, file))
+	*gl_result = g_list_append (*gl_result, assetml);
+    }
+    return;
+  }
+
   xmlNodePtr node;
 
   /* find <Asset> nodes and add them to the list, this just
@@ -258,20 +280,28 @@
        we pass NULL as the node of the child */
     AssetML *assetml = assetml_add_xml_to_data(doc, node, rootdir, NULL);
 
-    if(assetml && matching(assetml, mydataset, dataset, categories, mimetype, mylocale, locale, file))
+    if(assetml && matching(assetml, mydataset, dataset, categories, 
+			   mimetype, mylocale, locale, file))
       *gl_result = g_list_append (*gl_result, assetml);
-				
+
+    if (assetml)
+      *cache = g_list_append( *cache,  assetml);
+
   }
 }
 
-
+void assetml_real_free_assetlist(GList *assetlist)
+{
+  g_list_foreach (assetlist, (GFunc) free_asset, NULL);
+  g_list_free(assetlist);
+}
 
 /* read an xml file into our memory structures and update our view,
    dump any old data we have in memory if we can load a new set
    Fill the gl_result list with all matching asseml items
 */
 void assetml_read_xml_file(GList **gl_result, char *assetmlfile,
-			   gchar *dataset, gchar* categories, gchar* mimetype, gchar *locale, gchar* file)
+			   gchar *dataset, gchar* categories, gchar* mimetype, const gchar *locale, gchar* file)
 {
   /* pointer to the new doc */
   xmlDocPtr doc;
@@ -279,82 +309,109 @@
   gchar *mylocale;
   gchar *mydataset;
 
+  GList *cache = NULL;
+
   g_return_if_fail(assetmlfile!=NULL);
 
+  /* cache asset for performance in non direct search */
+  if (!asset_cache){
+    asset_cache = g_hash_table_new_full( g_str_hash,
+					 g_str_equal,
+					 g_free,
+					 (GDestroyNotify) assetml_free_assetlist
+					 );
+  }
+
+  cache = g_hash_table_lookup (asset_cache, assetmlfile);
+
   /* parse the new file and put the result into newdoc */
-  doc = xmlParseFile(assetmlfile);
+  if (! cache){
+    doc = xmlParseFile(assetmlfile);
 
-  /* in case something went wrong */
-  if(!doc) {
-    g_warning("Oups, the parsing of %s failed", assetmlfile);
-    return;
-  }
-  
-  if(/* if there is no root element */
-     !doc->children ||
-     /* if it doesn't have a name */
-     !doc->children->name ||
-     /* if it isn't a Assetml node */
-     g_strcasecmp(doc->children->name,"AssetML")!=0) 
-    {
-      xmlFreeDoc(doc);
-      g_warning("Oups, the file %s is not of the assetml type", assetmlfile);
+    /* in case something went wrong */
+    if(!doc) {
+      g_warning("Oups, the parsing of %s failed", assetmlfile);
       return;
     }
+  
+    if(/* if there is no root element */
+       !doc->children ||
+       /* if it doesn't have a name */
+       !doc->children->name ||
+       /* if it isn't a Assetml node */
+       g_strcasecmp(doc->children->name,"AssetML")!=0) 
+      {
+	xmlFreeDoc(doc);
+	g_warning("Oups, the file %s is not of the assetml type", assetmlfile);
+	return;
+      }
+
+    rootdir   = xmlGetProp(doc->children,"rootdir");
+    mydataset = xmlGetProp(doc->children,"dataset");
+    mylocale  = xmlGetProp(doc->children,"locale");
+  }
+  else {
+    AssetML *myasset = (AssetML *) cache->data;
 
-  rootdir   = xmlGetProp(doc->children,"rootdir");
-  mydataset = xmlGetProp(doc->children,"dataset");
-  mylocale    = xmlGetProp(doc->children,"locale");
+    mylocale = myasset->locale;
+    mydataset = myasset->dataset;
+    rootdir = NULL;
+  }
 
   /* parse our document and replace old data */
-  parse_doc(gl_result, doc, mydataset, rootdir, mylocale, dataset, categories, mimetype, locale, file);
+  parse_doc(gl_result, doc, mydataset, rootdir, mylocale, dataset, categories, mimetype, locale, file, &cache);
 
-  xmlFree(rootdir);
-  xmlFree(mydataset);
+  if (rootdir)
+    g_hash_table_replace( asset_cache, g_strdup(assetmlfile), cache);
 
-  xmlFreeDoc(doc);
+  if (rootdir){
+    xmlFree(rootdir);
+    xmlFree(mydataset);
+    xmlFreeDoc(doc);
+  }
 }
 
 
 /*
  * Select only files with FILE_EXT
  */
-int selectAssetML(const struct dirent *d)
+int selectAssetML(const gchar *dirent)
 {
-  gchar *file = ((struct dirent *)d)->d_name;
   guint ext_length = strlen(FILE_EXT);
 
-  if(strlen(file)<ext_length)
+  if(strlen(dirent)<ext_length)
     return 0;
 
-  return (strncmp (&file[strlen(file)-ext_length], FILE_EXT, ext_length) == 0);
+  return (strncmp (&dirent[strlen(dirent)-ext_length], FILE_EXT, ext_length) == 0);
 }
 
 /* load all the xml files in the assetml path
  * into our memory structures.
  */
-void assetml_load_xml(GList **gl_result, gchar *dataset, gchar* categories, gchar* mimetype, gchar *locale, 
+void assetml_load_xml(GList **gl_result, gchar *dataset, gchar* categories, gchar* mimetype, const gchar *locale, 
 		      gchar* name)
 {
-  struct dirent **namelist;
-  int n;
+  const gchar  *one_dirent;
+  GDir    *dir;
 
-  n = scandir(ASSETML_DIR, &namelist, &selectAssetML, 0);
+  dir = g_dir_open(ASSETML_DIR, 0, NULL);
+  if(!dir) {
+    g_warning("opendir returns no files with extension %s in directory %s", FILE_EXT, ASSETML_DIR);
+    return;
+  }
 
-  if (n <= 0)
-    g_warning("scandir returns no files with extension %s in directory %s", FILE_EXT, ASSETML_DIR);
-  else {
-    while(n--) {
-      gchar *assetmlfile = g_strdup_printf("%s/%s", ASSETML_DIR, namelist[n]->d_name);
+  while((one_dirent = g_dir_read_name(dir)) != NULL) {
+
+    if(strstr(one_dirent, FILE_EXT)) {
+      gchar *assetmlfile = g_strdup_printf("%s/%s", ASSETML_DIR, one_dirent);
       
       assetml_read_xml_file(gl_result, assetmlfile,
-      			    dataset, categories, mimetype, locale, name);
+			    dataset, categories, mimetype, locale, name);
       
       g_free(assetmlfile);
-      free (namelist [n]);
     }
-    free (namelist);
   }
+  g_dir_close(dir);
 }
 
 
@@ -367,6 +424,7 @@
   xmlFree(assetml->description);
   xmlFree(assetml->categories);
   xmlFree(assetml->file);
+  xmlFree(assetml->name);
   xmlFree(assetml->mimetype);
   xmlFree(assetml->credits);
 
@@ -375,29 +433,25 @@
 
 void assetml_free_assetlist(GList *assetlist)
 {
-  g_list_foreach (assetlist, (GFunc) free_asset, NULL);
+  /* does not  free assets because cache */
+  //g_list_foreach (assetlist, (GFunc) free_asset, NULL);
   g_list_free(assetlist);
-
-
 }
 
-GList*	 assetml_get_asset(gchar *dataset, gchar* categories, gchar* mimetype, gchar *locale, gchar* file)
+GList*	 assetml_get_asset(gchar *dataset, gchar* categories, gchar* mimetype, const gchar *locale, gchar* file)
 {
   GList *gl_result = NULL;
 
   assetml_load_xml(&gl_result, dataset, categories, mimetype, locale, file);
 
-  if(g_list_length(gl_result)==0)
+  if(gl_result && g_list_length(gl_result)==0)
     {
       g_list_free(gl_result);
-      return NULL;
-    }
-  else
-    {
-#ifdef DEBUG
-      printf("Dumping return value of assetml_get_asset\n");
-      g_list_foreach (gl_result, (GFunc) dump_asset, NULL);
-#endif
-      return gl_result;
+      gl_result = NULL;
     }
+
+  if (!gl_result)
+    g_warning("assetml_get_asset file=%s: no match\n", file);
+
+  return gl_result;
 }
--- libassetml-1.2.1/src/assetml.h.gcompris	2003-10-07 13:22:37.000000000 +0200
+++ libassetml-1.2.1/src/assetml.h	2006-04-21 00:13:16.000000000 +0200
@@ -35,7 +35,7 @@
    \param locale is the locale to search for or NULL for the current locale
    \param file the asset file name to get or NULL for any file name
 */
-GList*	 assetml_get_asset(gchar *dataset, gchar* categories, gchar* mimetype, gchar* locale, gchar* name);
+GList*	 assetml_get_asset(gchar *dataset, gchar* categories, gchar* mimetype, const gchar* locale, gchar* name);
 
 
 void	 assetml_free_assetlist(GList *assetlist);
@@ -49,6 +49,7 @@
   gchar		*locale;
   gchar		*description;
   gchar		*file;
+  gchar		*name;
   gchar		*mimetype;
   gchar		*credits;
 };


Index: libassetml.spec
===================================================================
RCS file: /cvs/extras/rpms/libassetml/devel/libassetml.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libassetml.spec	15 Apr 2006 13:41:24 -0000	1.1
+++ libassetml.spec	21 Apr 2006 08:11:43 -0000	1.2
@@ -1,11 +1,12 @@
 Name:		libassetml
 Version: 	1.2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        XML resource database library
 Group:          System Environment/Libraries
 License:	GPL  
 URL:		http://sourceforge.net/projects/ofset/
 Source0:        http://download.sourceforge.net/ofset/%{name}-%{version}.tar.gz
+Patch0:         libassetml-gcompris.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	glib2-devel libxml2-devel texinfo texi2html
 
@@ -31,6 +32,7 @@
 
 %prep
 %setup -q
+%patch -p1 -z .gcompris
 # make rpmlint happy
 chmod -x src/tools/assetml-query.c
 
@@ -84,5 +86,11 @@
 
 
 %changelog
+* Mon Apr 17 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.1-2
+- Add libassetml-gcompris.patch which adds a couple of fixes found in the
+  version of libassetml as shipped with gcompris. Which is BTW currently our
+  only user. Notice that this version is much less (annoyingly) verbose then
+  the version bundled with gcompris.
+
 * Mon Apr 10 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.2.1-1
 - Initial spec file



From fedora-extras-commits at redhat.com  Fri Apr 21 08:23:17 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 21 Apr 2006 01:23:17 -0700
Subject: rpms/hugs98 - New directory
Message-ID: <200604210823.k3L8NJ9S025270@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/hugs98
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25244/hugs98

Log Message:
Directory /cvs/extras/rpms/hugs98 added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 08:23:18 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 21 Apr 2006 01:23:18 -0700
Subject: rpms/hugs98/devel - New directory
Message-ID: <200604210823.k3L8NK7i025273@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/hugs98/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25244/hugs98/devel

Log Message:
Directory /cvs/extras/rpms/hugs98/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 08:23:34 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 21 Apr 2006 01:23:34 -0700
Subject: rpms/hugs98/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604210823.k3L8Nax7025325@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/hugs98/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25289/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hugs98


--- 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 Apr 21 08:23:33 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 21 Apr 2006 01:23:33 -0700
Subject: rpms/hugs98 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604210823.k3L8NZPk025322@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/hugs98
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25289

Added Files:
	Makefile import.log 
Log Message:
Setup of module hugs98


--- NEW FILE Makefile ---
# Top level Makefile for module hugs98
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 21 08:25:46 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 21 Apr 2006 01:25:46 -0700
Subject: rpms/hugs98 import.log,1.1,1.2
Message-ID: <200604210826.k3L8QI2N025394@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/hugs98
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25357

Modified Files:
	import.log 
Log Message:
auto-import hugs98-2005.03-1.fc5 on branch devel from hugs98-2005.03-1.fc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/hugs98/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Apr 2006 08:23:33 -0000	1.1
+++ import.log	21 Apr 2006 08:25:46 -0000	1.2
@@ -0,0 +1 @@
+hugs98-2005_03-1_fc5:HEAD:hugs98-2005.03-1.fc5.src.rpm:1145607939



From fedora-extras-commits at redhat.com  Fri Apr 21 08:25:47 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 21 Apr 2006 01:25:47 -0700
Subject: rpms/hugs98/devel hugs98.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604210826.k3L8QJIu025398@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/hugs98/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25357/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hugs98.spec 
Log Message:
auto-import hugs98-2005.03-1.fc5 on branch devel from hugs98-2005.03-1.fc5.src.rpm


--- NEW FILE hugs98.spec ---
%define hugs_ver Mar2005-patched

Name:		hugs98
Version:	2005.03
Release:	1%{?dist}
Summary:	Haskell Interpreter

Group:		Development/Languages
License:	BSD
URL:		http://www.haskell.org/hugs
Source0:	http://cvs.haskell.org/Hugs/downloads/Mar2005/hugs98-Mar2005-patched.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	docbook-utils
BuildRequires:	freeglut-devel
BuildRequires:	libGL-devel
BuildRequires:	libGLU-devel
BuildRequires:	libICE-devel
BuildRequires:	libSM-devel
BuildRequires:	libX11-devel
BuildRequires:	libXi-devel
BuildRequires:	libXmu-devel
BuildRequires:	libXt-devel
BuildRequires:	readline-devel
BuildRequires:	xorg-x11-proto-devel
#BuildRequires:	openal-devel

%description
Hugs 98 is a functional programming system based on Haskell 98, the de
facto standard for non-strict functional programming languages. Hugs
98 provides an almost complete implementation of Haskell 98.


%package x11
Summary:	X11 package for Hugs98
Group:		Development/Languages
Requires:	%{name} = %{version}-%{release}

%description x11
X11 package for Hugs98.


%package opengl
Summary:	OpenGL package for Hugs98
Group:		Development/Languages
Requires:	%{name} = %{version}-%{release}

%description opengl
OpenGL package for Hugs98.


%package glut
Summary:	GLUT package for Hugs98
Group:		Development/Languages
Requires:	%{name} = %{version}-%{release}
Requires:	%{name}-opengl = %{version}-%{release}

%description glut
GLUT package for Hugs98.


%package hgl
Summary:	Haskell Graphics Library for Hugs98
Group:		Development/Languages
Requires:	%{name} = %{version}-%{release}
Requires:	%{name}-x11 = %{version}-%{release}

%description hgl
Haskell Graphics Library for Hugs98.


%package demos
Summary:	Demo files for Hugs98
Group:		Development/Languages
Requires:	%{name} = %{version}-%{release}
Requires:	%{name}-glut = %{version}-%{release}
Requires:	%{name}-hgl = %{version}-%{release}

%description demos
Demo files for Hugs98.


%prep
%setup -q -n %{name}-%{hugs_ver}


%build
%configure --with-pthreads
touch src/stamp-h.in
make %{_smp_mflags} CFLAGS="$RPM_OPT_FLAGS"


%install
rm -rf $RPM_BUILD_ROOT
make DESTDIR=$RPM_BUILD_ROOT install_all_but_docs
make -C docs DESTDIR=$RPM_BUILD_ROOT install_man

find $RPM_BUILD_ROOT -name '*.so' -exec chmod 0755 '{}' ';'

mv $RPM_BUILD_ROOT%{_libdir}/hugs/demos installed-demos
rm installed-demos/Makefile.in


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc License
%doc Readme
%doc Credits
%doc docs/ffi-notes.txt
%doc docs/server.html
%doc docs/libraries-notes.txt
%doc docs/users_guide/users_guide
%{_bindir}/*
%{_libdir}/hugs
%exclude %{_libdir}/hugs/packages/X11
%exclude %{_libdir}/hugs/packages/OpenGL
%exclude %{_libdir}/hugs/packages/GLUT
%exclude %{_libdir}/hugs/packages/HGL
%{_mandir}/man*/*


%files demos
%defattr(-,root,root,-)
%doc installed-demos/*


%files x11
%defattr(-,root,root,-)
%{_libdir}/hugs/packages/X11


%files opengl
%defattr(-,root,root,-)
%{_libdir}/hugs/packages/OpenGL


%files glut
%defattr(-,root,root,-)
%{_libdir}/hugs/packages/GLUT


%files hgl
%defattr(-,root,root,-)
%{_libdir}/hugs/packages/HGL


%changelog
* Tue Apr 18 2006 Gerard Milmeister <gemi at bluewin.ch> - 2005.03-1
- changed version numbering scheme
- split off demos package
- split of some packages
- do not build openal support (compile errors)
- enable pthreads

* Wed Mar 30 2005 Gerard Milmeister <gemi at bluewin.ch> - 200503-1
- New Version Mar2005

* Sun Feb 13 2005 Gerard Milmeister <gemi at bluewin.ch> - 0:200311-1
- Changed version scheme

* Mon Jan  5 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:0.0-0.fdr.1.200311
- New Version Nov2003

* Mon Oct 20 2003 Gerard Milmeister <gemi at bluewin.ch> - Nov2002-0.fdr.1
- First Fedora release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hugs98/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2006 08:23:34 -0000	1.1
+++ .cvsignore	21 Apr 2006 08:25:46 -0000	1.2
@@ -0,0 +1 @@
+hugs98-Mar2005-patched.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hugs98/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2006 08:23:34 -0000	1.1
+++ sources	21 Apr 2006 08:25:46 -0000	1.2
@@ -0,0 +1 @@
+f72c378251f0d488fff9871583d26843  hugs98-Mar2005-patched.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 08:29:55 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 21 Apr 2006 01:29:55 -0700
Subject: owners owners.list,1.865,1.866
Message-ID: <200604210829.k3L8Tv8S025610@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25591

Modified Files:
	owners.list 
Log Message:
added hugs98


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.865
retrieving revision 1.866
diff -u -r1.865 -r1.866
--- owners.list	21 Apr 2006 02:02:23 -0000	1.865
+++ owners.list	21 Apr 2006 08:29:55 -0000	1.866
@@ -462,6 +462,7 @@
 Fedora Extras|htmltmpl|Templating engine for separation of code and HTML|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|htop|Interactive process viewer|gajownik at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|http_ping|HTTP latency measuring utility|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|hugs98|Haskell Interpreter|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|hula|A calendar and mail server|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|hunky-fonts|Modified Bitstream Vera fonts with additional letters|gajownik at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|hunt|A tool for demonstrating well known weaknesses in the TCP/IP protocol suite|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Apr 21 08:58:34 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Fri, 21 Apr 2006 01:58:34 -0700
Subject: rpms/yumex/FC-5 .cvsignore, 1.19, 1.20 sources, 1.24,
	1.25 yumex.spec, 1.25, 1.26
Message-ID: <200604210859.k3L8x6el029132@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28864/FC-5

Modified Files:
	.cvsignore sources yumex.spec 
Log Message:
Release 0.99.17


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-5/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- .cvsignore	6 Apr 2006 10:43:27 -0000	1.19
+++ .cvsignore	21 Apr 2006 08:58:34 -0000	1.20
@@ -1 +1 @@
-yumex-0.99.16.tar.gz
+yumex-0.99.17.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-5/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	6 Apr 2006 10:43:27 -0000	1.24
+++ sources	21 Apr 2006 08:58:34 -0000	1.25
@@ -1 +1 @@
-97f3e881e2c721768506b2ee18f3a926  yumex-0.99.16.tar.gz
+a4d1b18e36e63b6a7605dbb76823dae8  yumex-0.99.17.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/FC-5/yumex.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- yumex.spec	6 Apr 2006 10:43:27 -0000	1.25
+++ yumex.spec	21 Apr 2006 08:58:34 -0000	1.26
@@ -1,5 +1,5 @@
 Name:     yumex
-Version:  0.99.16
+Version:  0.99.17
 Release:  1.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
@@ -65,6 +65,8 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Fri Apr 21 2006 Tim Lauridsen <tla at rasmil.dk> - 0.99.17-1.0
+- Development Release 0.99.17-1.0
 * Thu Mar 30 2006 Tim Lauridsen <tla at rasmil.dk> - 0.99.16-1.0
 - Development Release 0.99.16-1.0
 * Wed Mar 22 2006 Tim Lauridsen <tla at rasmil.dk> - 0.99.15-1.0



From fedora-extras-commits at redhat.com  Fri Apr 21 08:58:34 2006
From: fedora-extras-commits at redhat.com (Tim Lauridsen (timlau))
Date: Fri, 21 Apr 2006 01:58:34 -0700
Subject: rpms/yumex/devel sources,1.24,1.25 yumex.spec,1.25,1.26
Message-ID: <200604210859.k3L8x6Up029140@cvs-int.fedora.redhat.com>

Author: timlau

Update of /cvs/extras/rpms/yumex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28864/devel

Modified Files:
	sources yumex.spec 
Log Message:
Release 0.99.17


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources	6 Apr 2006 10:43:28 -0000	1.24
+++ sources	21 Apr 2006 08:58:34 -0000	1.25
@@ -1 +1 @@
-97f3e881e2c721768506b2ee18f3a926  yumex-0.99.16.tar.gz
+a4d1b18e36e63b6a7605dbb76823dae8  yumex-0.99.17.tar.gz


Index: yumex.spec
===================================================================
RCS file: /cvs/extras/rpms/yumex/devel/yumex.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- yumex.spec	6 Apr 2006 10:43:28 -0000	1.25
+++ yumex.spec	21 Apr 2006 08:58:34 -0000	1.26
@@ -1,5 +1,5 @@
 Name:     yumex
-Version:  0.99.16
+Version:  0.99.17
 Release:  1.0%{?dist}
 Summary:  Yum Extender graphical package management tool
 
@@ -65,6 +65,8 @@
 %{_datadir}/applications/fedora-%{name}.desktop
 
 %changelog
+* Fri Apr 21 2006 Tim Lauridsen <tla at rasmil.dk> - 0.99.17-1.0
+- Development Release 0.99.17-1.0
 * Thu Mar 30 2006 Tim Lauridsen <tla at rasmil.dk> - 0.99.16-1.0
 - Development Release 0.99.16-1.0
 * Wed Mar 22 2006 Tim Lauridsen <tla at rasmil.dk> - 0.99.15-1.0



From fedora-extras-commits at redhat.com  Fri Apr 21 09:28:41 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Fri, 21 Apr 2006 02:28:41 -0700
Subject: rpms/i8kutils/FC-4 i8kutils.spec,1.8,1.9
Message-ID: <200604210929.k3L9TDql000518@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/i8kutils/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv467/FC-4

Modified Files:
	i8kutils.spec 
Log Message:
Add tcl requirement (#189567).



Index: i8kutils.spec
===================================================================
RCS file: /cvs/extras/rpms/i8kutils/FC-4/i8kutils.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- i8kutils.spec	7 Apr 2006 13:36:21 -0000	1.8
+++ i8kutils.spec	21 Apr 2006 09:28:41 -0000	1.9
@@ -4,7 +4,7 @@
 Summary: Dell laptop (Inspiron 8000 and others) SMM BIOS support tools
 Name: i8kutils
 Version: 1.25
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group: System Environment/Base
 URL: http://people.debian.org/~dz/i8k/
@@ -12,7 +12,7 @@
 Source1: http://www.coding-zone.com/i8krellm-%{gkrellmpluginver}.tar.gz
 Source2: i8kbuttons.init
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: alsa-utils, gkrellm >= 2.0.0, tk
+Requires: alsa-utils, gkrellm >= 2.0.0, tcl, tk
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig, /sbin/service
 BuildRequires: gkrellm-devel >= 2.0.0
@@ -83,7 +83,10 @@
 
 
 %changelog
-* Fri Apr  7 2006 Matthias Saou <http://freshrpms.net/> 1.25-6
+* Fri Apr 21 2006 Matthias Saou <http://freshrpms.net/> 1.25-8
+- Add tcl requirement too... (#189567).
+
+* Fri Apr  7 2006 Matthias Saou <http://freshrpms.net/> 1.25-7
 - Add tk requirement, since the included i8kmon utility requires it.
 
 * Tue Mar 14 2006 Matthias Saou <http://freshrpms.net/> 1.25-6



From fedora-extras-commits at redhat.com  Fri Apr 21 09:28:43 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Fri, 21 Apr 2006 02:28:43 -0700
Subject: rpms/i8kutils/devel i8kutils.spec,1.10,1.11
Message-ID: <200604210929.k3L9TFJd000522@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/i8kutils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv467/devel

Modified Files:
	i8kutils.spec 
Log Message:
Add tcl requirement (#189567).



Index: i8kutils.spec
===================================================================
RCS file: /cvs/extras/rpms/i8kutils/devel/i8kutils.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- i8kutils.spec	7 Apr 2006 13:36:23 -0000	1.10
+++ i8kutils.spec	21 Apr 2006 09:28:42 -0000	1.11
@@ -4,7 +4,7 @@
 Summary: Dell laptop (Inspiron 8000 and others) SMM BIOS support tools
 Name: i8kutils
 Version: 1.25
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group: System Environment/Base
 URL: http://people.debian.org/~dz/i8k/
@@ -12,7 +12,7 @@
 Source1: http://www.coding-zone.com/i8krellm-%{gkrellmpluginver}.tar.gz
 Source2: i8kbuttons.init
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: alsa-utils, gkrellm >= 2.0.0, tk
+Requires: alsa-utils, gkrellm >= 2.0.0, tcl, tk
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig, /sbin/service
 BuildRequires: gkrellm-devel >= 2.0.0
@@ -83,7 +83,10 @@
 
 
 %changelog
-* Fri Apr  7 2006 Matthias Saou <http://freshrpms.net/> 1.25-6
+* Fri Apr 21 2006 Matthias Saou <http://freshrpms.net/> 1.25-8
+- Add tcl requirement too... (#189567).
+
+* Fri Apr  7 2006 Matthias Saou <http://freshrpms.net/> 1.25-7
 - Add tk requirement, since the included i8kmon utility requires it.
 
 * Tue Mar 14 2006 Matthias Saou <http://freshrpms.net/> 1.25-6



From fedora-extras-commits at redhat.com  Fri Apr 21 09:28:42 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Fri, 21 Apr 2006 02:28:42 -0700
Subject: rpms/i8kutils/FC-5 i8kutils.spec,1.10,1.11
Message-ID: <200604210929.k3L9TEbe000521@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/i8kutils/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv467/FC-5

Modified Files:
	i8kutils.spec 
Log Message:
Add tcl requirement (#189567).



Index: i8kutils.spec
===================================================================
RCS file: /cvs/extras/rpms/i8kutils/FC-5/i8kutils.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- i8kutils.spec	7 Apr 2006 13:36:22 -0000	1.10
+++ i8kutils.spec	21 Apr 2006 09:28:42 -0000	1.11
@@ -4,7 +4,7 @@
 Summary: Dell laptop (Inspiron 8000 and others) SMM BIOS support tools
 Name: i8kutils
 Version: 1.25
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL
 Group: System Environment/Base
 URL: http://people.debian.org/~dz/i8k/
@@ -12,7 +12,7 @@
 Source1: http://www.coding-zone.com/i8krellm-%{gkrellmpluginver}.tar.gz
 Source2: i8kbuttons.init
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: alsa-utils, gkrellm >= 2.0.0, tk
+Requires: alsa-utils, gkrellm >= 2.0.0, tcl, tk
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig, /sbin/service
 BuildRequires: gkrellm-devel >= 2.0.0
@@ -83,7 +83,10 @@
 
 
 %changelog
-* Fri Apr  7 2006 Matthias Saou <http://freshrpms.net/> 1.25-6
+* Fri Apr 21 2006 Matthias Saou <http://freshrpms.net/> 1.25-8
+- Add tcl requirement too... (#189567).
+
+* Fri Apr  7 2006 Matthias Saou <http://freshrpms.net/> 1.25-7
 - Add tk requirement, since the included i8kmon utility requires it.
 
 * Tue Mar 14 2006 Matthias Saou <http://freshrpms.net/> 1.25-6



From fedora-extras-commits at redhat.com  Fri Apr 21 09:54:02 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Fri, 21 Apr 2006 02:54:02 -0700
Subject: rpms/libfwbuilder/devel .cvsignore, 1.5, 1.6 libfwbuilder.spec, 1.10,
	1.11 sources, 1.5, 1.6 libfwbuilder-2.0.10-gcc4.patch, 1.1, NONE
Message-ID: <200604210954.k3L9s4PV001188@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/libfwbuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1167

Modified Files:
	.cvsignore libfwbuilder.spec sources 
Removed Files:
	libfwbuilder-2.0.10-gcc4.patch 
Log Message:
- Update to 2.0.12
- Drop gcc-4.1 patch and -ffriend-injection



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Feb 2006 17:16:36 -0000	1.5
+++ .cvsignore	21 Apr 2006 09:54:02 -0000	1.6
@@ -1 +1 @@
-libfwbuilder-2.0.10.tar.gz
+libfwbuilder-2.0.12.tar.gz


Index: libfwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/devel/libfwbuilder.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libfwbuilder.spec	22 Feb 2006 09:17:42 -0000	1.10
+++ libfwbuilder.spec	21 Apr 2006 09:54:02 -0000	1.11
@@ -1,12 +1,11 @@
 Name:           libfwbuilder
 Summary:        Firewall Builder API
-Version:        2.0.10
-Release:        2%{?dist}
+Version:        2.0.12
+Release:        1%{?dist}
 License:        GPL
 Group:          System Environment/Libraries
 URL:            http://www.fwbuilder.org/
 Source:         %{name}-%{version}.tar.gz
-Patch0:         libfwbuilder-2.0.10-gcc4.patch
 Buildroot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  qt-devel >= 1:3.0.0
 BuildRequires:  libxslt-devel
@@ -46,7 +45,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .gcc4
 
 
 %build
@@ -58,7 +56,7 @@
 #
 perl -pi -e 's|(QMAKE_CXXFLAGS_.*)|$1 \@CXXFLAGS\@|' qmake.inc.in
 
-CXXFLAGS="${RPM_OPT_FLAGS} -ffriend-injection"  %configure \
+%configure \
     --enable-auto-docdir \
     --with-templatedir=%{_datadir}/libfwbuilder \
     --disable-static  \
@@ -90,6 +88,10 @@
 
 
 %changelog
+* Fri Apr 21 2006 Ralf Ertzinger <ralf at skytale.net> 2.0.12-1.fc5
+- Update to 2.0.12
+- Drop gcc-4.1 patch and -ffriend-injection
+
 * Wed Feb 22 2006 Ralf Ertzinger <ralf at skytale.net> 2.0.10-2.fc5
 - Bump and rebuild for FC5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	5 Feb 2006 17:16:36 -0000	1.5
+++ sources	21 Apr 2006 09:54:02 -0000	1.6
@@ -1 +1 @@
-7f171715bd398137e832a53628642fe6  libfwbuilder-2.0.10.tar.gz
+09834a242ad0f8aaae80c44ee4937c43  libfwbuilder-2.0.12.tar.gz


--- libfwbuilder-2.0.10-gcc4.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Apr 21 09:59:29 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Fri, 21 Apr 2006 02:59:29 -0700
Subject: fedora-security/audit fc5,1.121,1.122
Message-ID: <200604210959.k3L9xTb9001264@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1246/audit

Modified Files:
	fc5 
Log Message:
Update with FEDORA-2006-421 (kernel)



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- fc5	19 Apr 2006 19:45:41 -0000	1.121
+++ fc5	21 Apr 2006 09:59:27 -0000	1.122
@@ -1,5 +1,5 @@
 Up to date CVE as of CVE email 20060414
-Up to date FC5 as of 20060411
+Up to date FC5 as of 20060419
 
 ** are items that need attention
 
@@ -76,10 +76,10 @@
 CVE-2006-1530 VULNERABLE (firefox, fixed 1.5.0.2)
 CVE-2006-1529 VULNERABLE (thunderbird, fixed 1.5.0.2)
 CVE-2006-1529 VULNERABLE (firefox, fixed 1.5.0.2)
-CVE-2006-1525 VULNERABLE (kernel, fixed 2.6.16.8)
-CVE-2006-1524 VULNERABLE (kernel, fixed 2.6.16.5)
-CVE-2006-1523 VULNERABLE (kernel, fixed 2.6.16.4)
-CVE-2006-1522 VULNERABLE (kernel, fixed 2.6.16.3)
+CVE-2006-1525 version (kernel, fixed 2.6.16.8) [since FEDORA-2006-421]
+CVE-2006-1524 version (kernel, fixed 2.6.16.5) [since FEDORA-2006-421]
+CVE-2006-1523 version (kernel, fixed 2.6.16.4) [since FEDORA-2006-421]
+CVE-2006-1522 version (kernel, fixed 2.6.16.3) [since FEDORA-2006-421]
 CVE-2006-1494 VULNERABLE (php)
 CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-233]
 CVE-2006-1354 VULNERABLE (freeradius) bz#186084
@@ -97,8 +97,8 @@
 CVE-2006-1061 backport (curl, fixed 7.15.3) [since FEDORA-2006-189]
 CVE-2006-1059 version (samba, fixed 3.0.22 at least) bz#187170 [since FEDORA-2006-259]
 CVE-2006-1058 VULNERABLE (busybox) bz#187386
-CVE-2006-1056 VULNERABLE (kernel, fixed 2.6.16.9)
-CVE-2006-1055 VULNERABLE (kernel, fixed 2.6.17-rc1)
+CVE-2006-1056 version (kernel, fixed 2.6.16.9) [since FEDORA-2006-421]
+CVE-2006-1055 version (kernel, fixed 2.6.17-rc1) [since FEDORA-2006-421]
 CVE-2006-1052 version (kernel, fixed 2.6.16) patch-2.6.16-rc6 [since FEDORA-2006-233]
 CVE-2006-1045 VULNERABLE (thunderbird)
 CVE-2006-1015 ignore (php) safe mode isn't safe
@@ -115,7 +115,7 @@
 CVE-2006-0748 VULNERABLE (firefox, fixed 1.5.0.2)
 CVE-2006-0746 version (kdegraphics, fixed 3.4)
 CVE-2006-0745 backport (xorg-x11) [since FEDORA-2006-172]
-CVE-2006-0744 VULNERABLE (kernel, fixed 2.6.16.5)
+CVE-2006-0744 version (kernel, fixed 2.6.16.5) [since FEDORA-2006-421]
 CVE-2006-0742 version (kernel, fixed 2.6.16) patch-2.6.16-rc6 [since FEDORA-2006-233]
 CVE-2006-0741 version (kernel, fixed 2.6.15.5) patch-2.6.16-rc6 [since FEDORA-2006-233]
 CVE-2006-0730 version (dovecot, 1.0beta[12] only)



From fedora-extras-commits at redhat.com  Fri Apr 21 10:09:57 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Fri, 21 Apr 2006 03:09:57 -0700
Subject: rpms/bsdiff - New directory
Message-ID: <200604211009.k3LA9xjI004124@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/bsdiff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4098/bsdiff

Log Message:
Directory /cvs/extras/rpms/bsdiff added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 10:09:57 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Fri, 21 Apr 2006 03:09:57 -0700
Subject: rpms/bsdiff/devel - New directory
Message-ID: <200604211009.k3LA9xRb004127@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/bsdiff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4098/bsdiff/devel

Log Message:
Directory /cvs/extras/rpms/bsdiff/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 10:10:13 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Fri, 21 Apr 2006 03:10:13 -0700
Subject: rpms/bsdiff Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604211010.k3LAAFGj004176@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/bsdiff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4148

Added Files:
	Makefile import.log 
Log Message:
Setup of module bsdiff


--- NEW FILE Makefile ---
# Top level Makefile for module bsdiff
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 21 10:10:14 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Fri, 21 Apr 2006 03:10:14 -0700
Subject: rpms/bsdiff/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604211010.k3LAAGLW004179@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/bsdiff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4148/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module bsdiff


--- 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 Apr 21 10:10:46 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Fri, 21 Apr 2006 03:10:46 -0700
Subject: rpms/bsdiff import.log,1.1,1.2
Message-ID: <200604211010.k3LAAmm4004250@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/bsdiff
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4214

Modified Files:
	import.log 
Log Message:
auto-import bsdiff-4.3-1 on branch devel from bsdiff-4.3-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/bsdiff/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Apr 2006 10:10:13 -0000	1.1
+++ import.log	21 Apr 2006 10:10:46 -0000	1.2
@@ -0,0 +1 @@
+bsdiff-4_3-1:HEAD:bsdiff-4.3-1.src.rpm:1145614239



From fedora-extras-commits at redhat.com  Fri Apr 21 10:10:47 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Fri, 21 Apr 2006 03:10:47 -0700
Subject: rpms/bsdiff/devel bsdiff.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604211010.k3LAAnIj004255@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/rpms/bsdiff/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4214/devel

Modified Files:
	.cvsignore sources 
Added Files:
	bsdiff.spec 
Log Message:
auto-import bsdiff-4.3-1 on branch devel from bsdiff-4.3-1.src.rpm


--- NEW FILE bsdiff.spec ---
Summary:	Binary diff/patch utility
Name:		bsdiff
Version:	4.3
Release:	1%{?dist}
License:	BSD
Group:		Development/Tools
Source0:	http://www.daemonology.net/bsdiff/bsdiff-%{version}.tar.gz
URL:		http://www.daemonology.net/bsdiff/
BuildRequires:	bzip2-devel
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
bsdiff and bspatch are tools for building and applying patches to binary files.
By using suffix sorting (specifically, Larsson and Sadakane's qsufsort) and
taking advantage of how executable files change, bsdiff routinely produces
binary patches 50-80% smaller than those produced by Xdelta, and 15% smaller
than those produced by .RTPatch.

%prep
%setup -q

%build
%{__cc} bsdiff.c -o bsdiff ${RPM_OPT_FLAGS} -lbz2
%{__cc} bspatch.c -o bspatch ${RPM_OPT_FLAGS} -lbz2

%install
rm -rf ${RPM_BUILD_ROOT}
install -d -m 755 ${RPM_BUILD_ROOT}%{_bindir}
install -d -m 755 ${RPM_BUILD_ROOT}%{_mandir}/man1
install -m 755 bsdiff bspatch ${RPM_BUILD_ROOT}%{_bindir}
install -m 644 bsdiff.1 bspatch.1 ${RPM_BUILD_ROOT}%{_mandir}/man1

%clean
rm -rf ${RPM_BUILD_ROOT}

%files
%defattr(-,root,root)
%{_bindir}/bsdiff
%{_bindir}/bspatch
%{_mandir}/man1/*

%changelog
* Fri Mar 24 2006 Jindrich Novy <jnovy at redhat.com> 4.3-1
- initial build

Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bsdiff/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2006 10:10:14 -0000	1.1
+++ .cvsignore	21 Apr 2006 10:10:47 -0000	1.2
@@ -0,0 +1 @@
+bsdiff-4.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bsdiff/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2006 10:10:14 -0000	1.1
+++ sources	21 Apr 2006 10:10:47 -0000	1.2
@@ -0,0 +1 @@
+e6d812394f0e0ecc8d5df255aa1db22a  bsdiff-4.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 11:13:18 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Fri, 21 Apr 2006 04:13:18 -0700
Subject: fedora-security/audit fc4,1.208,1.209
Message-ID: <200604211113.k3LBDID7008428@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8400/audit

Modified Files:
	fc4 
Log Message:
Update with FEDORA-2006-423 (kernel)



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- fc4	19 Apr 2006 19:45:41 -0000	1.208
+++ fc4	21 Apr 2006 11:13:16 -0000	1.209
@@ -1,5 +1,5 @@
 Up to date CVE as of CVE email 20060414
-Up to date FC4 as of 20060411
+Up to date FC4 as of 20060420
 
 ** are items that need attention
 
@@ -77,10 +77,10 @@
 CVE-2006-1530 VULNERABLE (firefox, fixed 1.0.8)
 CVE-2006-1529 VULNERABLE (thunderbird, fixed 1.0.8)
 CVE-2006-1529 VULNERABLE (firefox, fixed 1.0.8)
-CVE-2006-1525 VULNERABLE (kernel, fixed 2.6.16.8)
-CVE-2006-1524 VULNERABLE (kernel, fixed 2.6.16.5)
-CVE-2006-1523 VULNERABLE (kernel, fixed 2.6.16.4)
-CVE-2006-1522 VULNERABLE (kernel, fixed 2.6.16.3)
+CVE-2006-1525 version (kernel, fixed 2.6.16.8) [since FEDORA-2006-423]
+CVE-2006-1524 version (kernel, fixed 2.6.16.5) [since FEDORA-2006-423]
+CVE-2006-1523 version (kernel, fixed 2.6.16.4) [since FEDORA-2006-423]
+CVE-2006-1522 version (kernel, fixed 2.6.16.3) [since FEDORA-2006-423]
 CVE-2006-1494 VULNERABLE (php)
 CVE-2006-1368 version (kernel, fixed 2.6.16) [since FEDORA-2006-245]
 CVE-2006-1354 VULNERABLE (freeradius) bz#186084
@@ -96,8 +96,8 @@
 CVE-2006-1061 version (curl, 7.15.0 - 7.15.2 only)
 CVE-2006-1059 version (samba)
 CVE-2006-1058 VULNERABLE (busybox) bz#187386
-CVE-2006-1056 VULNERABLE (kernel, fixed 2.6.16.9)
-CVE-2006-1055 VULNERABLE (kernel, fixed 2.6.17-rc1)
+CVE-2006-1056 version (kernel, fixed 2.6.16.9) [since FEDORA-2006-423]
+CVE-2006-1055 version (kernel, fixed 2.6.17-rc1) [since FEDORA-2006-423]
 CVE-2006-1052 version (kernel, fixed 2.6.16) patch-2.6.16-rc6 [since FEDORA-2006-245]
 CVE-2006-1045 VULNERABLE (thunderbird)
 CVE-2006-1015 ignore (php) safe mode isn't safe
@@ -114,7 +114,7 @@
 CVE-2006-0748 VULNERABLE (firefox, fixed 1.0.8)
 CVE-2006-0746 VULNERABLE (kpdf) bz#184308
 CVE-2006-0745 version (xorg-x11) not fc4
-CVE-2006-0744 VULNERABLE (kernel, fixed 2.6.16.5)
+CVE-2006-0744 version (kernel, fixed 2.6.16.5) [since FEDORA-2006-423]
 CVE-2006-0742 version (kernel, fixed 2.6.16) patch-2.6.16-rc6 [since FEDORA-2006-245]
 CVE-2006-0741 version (kernel, fixed 2.6.15.5) [since FEDORA-2006-245] was backport since FEDORA-2006-131
 CVE-2006-0730 version (dovecot, 1.0beta[12] only)
@@ -134,7 +134,7 @@
 CVE-2006-0459 version (flex) by inspection
 CVE-2006-0457 version (kernel, fixed 2.6.15.5) [since FEDORA-2006-245] was backport since FEDORA-2006-131
 CVE-2006-0455 version (gnupg, fixed 1.4.2.1) [since FEDORA-2006-116]
-CVE-2006-0454 backport (kernel, fixed 2.6.15.3) [since FEDORA-2006-102] patch-2.6.15.3
+CVE-2006-0454 version (kernel, fixed 2.6.15.3) [since FEDORA-2006-102] patch-2.6.15.3
 CVE-2006-0405 version (libtiff, 3.8.0 only)
 CVE-2006-0377 version (squirrelmail, fixed 1.4.6) [since FEDORA-2006-133]
 CVE-2006-0369 ignore (mysql) this is not a security issue
@@ -586,8 +586,8 @@
 CVE-2005-1268 backport (httpd) [since FEDORA-2005-639]
 CVE-2005-1267 backport (tcpdump) [since FEDORA-2005-407]
 CVE-2005-1266 version (spamassassin, fixed 3.0.4) [since FEDORA-2005-428]
-CVE-2005-1265 version (kernel) [since FEDORA-2005-510] was backport (kernel) patch-2.6.12-rc5
-CVE-2005-1264 version (kernel) [since FEDORA-2005-510] was backport (kernel, fixed 2.6.11.10) ..12-rc4-git5 since re0522.0
+CVE-2005-1265 version (kernel, fixed 2.6.12-rc5) [since FEDORA-2005-510] was backport
+CVE-2005-1264 version (kernel, fixed 2.6.11.10) [since FEDORA-2005-510] was backport (..12-rc4-git5 since re0522.0)
 CVE-2005-1263 version (kernel) [since FEDORA-2005-510] was patch-2.6.12-rc4-git5 since re0522.0
 CVE-2005-1262 version (gaim, fixed 1.3.0) [since re0522.0]
 CVE-2005-1261 version (gaim, fixed 1.3.0) [since re0522.0]
@@ -656,7 +656,7 @@
 CVE-2005-0758 version (gzip, fixed 1.3.5)
 CVE-2005-0758 VULNERABLE (bzip2) by inspection bz#159819
 CVE-2005-0757 version (kernel, not 2.6)
-CVE-2005-0756 version (kernel, fixed 2.6.12) [since FEDORA-2005-510] was backport (kernel) patch-2.6.12-rc5
+CVE-2005-0756 version (kernel, fixed 2.6.12) [since FEDORA-2005-510] was backport in patch-2.6.12-rc5
 CVE-2005-0755 version (HelixPlayer, fixed 10.0.4)
 CVE-2005-0754 version (kdewebdev, fixed after 3.4.0) [since FEDORA-2005-437] was backport....4.0-CAN-2005-0754.patch
 CVE-2005-0753 backport (cvs, fixed 1.12.12) in cvs-1.11.17-CAN-2005-0753.patch



From fedora-extras-commits at redhat.com  Fri Apr 21 12:03:44 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Fri, 21 Apr 2006 05:03:44 -0700
Subject: rpms/powermanga/devel powermanga.spec,1.12,1.13
Message-ID: <200604211203.k3LC3kfR019284@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/powermanga/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17213/devel

Modified Files:
	powermanga.spec 
Log Message:
Fix complete breakage from bug #184076, reported in bug #188901.



Index: powermanga.spec
===================================================================
RCS file: /cvs/extras/rpms/powermanga/devel/powermanga.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- powermanga.spec	11 Apr 2006 15:38:49 -0000	1.12
+++ powermanga.spec	21 Apr 2006 12:03:43 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Arcade 2D shoot-them-up game
 Name: powermanga
 Version: 0.80
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://linux.tlk.fr/games/Powermanga/
@@ -72,6 +72,13 @@
     --dir %{buildroot}%{_datadir}/applications \
     %{name}.desktop
 
+# Workaround for the "texts" dir not being installed, although it's needed
+%{__mkdir_p} %{buildroot}%{_datadir}/games/powermanga/texts
+%{__install} -p -m 0644 texts/*.txt \
+    %{buildroot}%{_datadir}/games/powermanga/texts/
+echo "Lang=en" > \
+    %{buildroot}%{_datadir}/games/powermanga/texts/config.ini
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -83,6 +90,7 @@
 %{_bindir}/powermanga
 %attr(2755, root, games) %{_prefix}/games/powermanga
 %{_datadir}/games/powermanga/
+%config(noreplace) %{_datadir}/games/powermanga/texts/config.ini
 %{_datadir}/pixmaps/powermanga.png
 %{_mandir}/man6/powermanga.6*
 %config(noreplace) %attr(664, root, games) %{_var}/games/powermanga.hi
@@ -92,6 +100,10 @@
 
 
 %changelog
+* Fri Apr 21 2006 Matthias Saou <http://freshrpms.net/> 0.80-2
+- Add a workaround to include the "texts" directory and files, since the game
+  won't run without, and they don't get installed automatically! (#188901).
+
 * Tue Apr 11 2006 Matthias Saou <http://freshrpms.net/> 0.80-1
 - Update to 0.80, fixes crash at level 35 boss (#184076, Hugo Cisneiros).
 - Add new zlib-devel build requirement.



From fedora-extras-commits at redhat.com  Fri Apr 21 12:03:41 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Fri, 21 Apr 2006 05:03:41 -0700
Subject: rpms/powermanga/FC-4 powermanga.spec,1.9,1.10
Message-ID: <200604211204.k3LC4E5t019317@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/powermanga/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17213/FC-4

Modified Files:
	powermanga.spec 
Log Message:
Fix complete breakage from bug #184076, reported in bug #188901.



Index: powermanga.spec
===================================================================
RCS file: /cvs/extras/rpms/powermanga/FC-4/powermanga.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- powermanga.spec	11 Apr 2006 16:14:24 -0000	1.9
+++ powermanga.spec	21 Apr 2006 12:03:41 -0000	1.10
@@ -1,7 +1,7 @@
 Summary: Arcade 2D shoot-them-up game
 Name: powermanga
 Version: 0.80
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://linux.tlk.fr/games/Powermanga/
@@ -72,6 +72,13 @@
     --dir %{buildroot}%{_datadir}/applications \
     %{name}.desktop
 
+# Workaround for the "texts" dir not being installed, although it's needed
+%{__mkdir_p} %{buildroot}%{_datadir}/games/powermanga/texts
+%{__install} -p -m 0644 texts/*.txt \
+    %{buildroot}%{_datadir}/games/powermanga/texts/
+echo "Lang=en" > \
+    %{buildroot}%{_datadir}/games/powermanga/texts/config.ini
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -83,6 +90,7 @@
 %{_bindir}/powermanga
 %attr(2755, root, games) %{_prefix}/games/powermanga
 %{_datadir}/games/powermanga/
+%config(noreplace) %{_datadir}/games/powermanga/texts/config.ini
 %{_datadir}/pixmaps/powermanga.png
 %{_mandir}/man6/powermanga.6*
 %config(noreplace) %attr(664, root, games) %{_var}/games/powermanga.hi
@@ -92,6 +100,10 @@
 
 
 %changelog
+* Fri Apr 21 2006 Matthias Saou <http://freshrpms.net/> 0.80-2
+- Add a workaround to include the "texts" directory and files, since the game
+  won't run without, and they don't get installed automatically! (#188901).
+
 * Tue Apr 11 2006 Matthias Saou <http://freshrpms.net/> 0.80-1
 - Update to 0.80, fixes crash at level 35 boss (#184076, Hugo Cisneiros).
 - Add new zlib-devel build requirement.



From fedora-extras-commits at redhat.com  Fri Apr 21 12:03:40 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Fri, 21 Apr 2006 05:03:40 -0700
Subject: rpms/powermanga/FC-3 powermanga.spec,1.5,1.6
Message-ID: <200604211204.k3LC4Dx7019314@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/powermanga/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17213/FC-3

Modified Files:
	powermanga.spec 
Log Message:
Fix complete breakage from bug #184076, reported in bug #188901.



Index: powermanga.spec
===================================================================
RCS file: /cvs/extras/rpms/powermanga/FC-3/powermanga.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- powermanga.spec	11 Apr 2006 16:34:40 -0000	1.5
+++ powermanga.spec	21 Apr 2006 12:03:40 -0000	1.6
@@ -1,7 +1,7 @@
 Summary: Arcade 2D shoot-them-up game
 Name: powermanga
 Version: 0.80
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://linux.tlk.fr/games/Powermanga/
@@ -72,6 +72,13 @@
     --dir %{buildroot}%{_datadir}/applications \
     %{name}.desktop
 
+# Workaround for the "texts" dir not being installed, although it's needed
+%{__mkdir_p} %{buildroot}%{_datadir}/games/powermanga/texts
+%{__install} -p -m 0644 texts/*.txt \
+    %{buildroot}%{_datadir}/games/powermanga/texts/
+echo "Lang=en" > \
+    %{buildroot}%{_datadir}/games/powermanga/texts/config.ini
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -83,6 +90,7 @@
 %{_bindir}/powermanga
 %attr(2755, root, games) %{_prefix}/games/powermanga
 %{_datadir}/games/powermanga/
+%config(noreplace) %{_datadir}/games/powermanga/texts/config.ini
 %{_datadir}/pixmaps/powermanga.png
 %{_mandir}/man6/powermanga.6*
 %config(noreplace) %attr(664, root, games) %{_var}/games/powermanga.hi
@@ -92,6 +100,10 @@
 
 
 %changelog
+* Fri Apr 21 2006 Matthias Saou <http://freshrpms.net/> 0.80-2
+- Add a workaround to include the "texts" directory and files, since the game
+  won't run without, and they don't get installed automatically! (#188901).
+
 * Tue Apr 11 2006 Matthias Saou <http://freshrpms.net/> 0.80-1
 - Update to 0.80, fixes crash at level 35 boss (#184076, Hugo Cisneiros).
 - Add new zlib-devel build requirement.



From fedora-extras-commits at redhat.com  Fri Apr 21 12:03:43 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Fri, 21 Apr 2006 05:03:43 -0700
Subject: rpms/powermanga/FC-5 powermanga.spec,1.12,1.13
Message-ID: <200604211204.k3LC4FPO019320@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/powermanga/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17213/FC-5

Modified Files:
	powermanga.spec 
Log Message:
Fix complete breakage from bug #184076, reported in bug #188901.



Index: powermanga.spec
===================================================================
RCS file: /cvs/extras/rpms/powermanga/FC-5/powermanga.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- powermanga.spec	11 Apr 2006 15:58:42 -0000	1.12
+++ powermanga.spec	21 Apr 2006 12:03:42 -0000	1.13
@@ -1,7 +1,7 @@
 Summary: Arcade 2D shoot-them-up game
 Name: powermanga
 Version: 0.80
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Amusements/Games
 URL: http://linux.tlk.fr/games/Powermanga/
@@ -72,6 +72,13 @@
     --dir %{buildroot}%{_datadir}/applications \
     %{name}.desktop
 
+# Workaround for the "texts" dir not being installed, although it's needed
+%{__mkdir_p} %{buildroot}%{_datadir}/games/powermanga/texts
+%{__install} -p -m 0644 texts/*.txt \
+    %{buildroot}%{_datadir}/games/powermanga/texts/
+echo "Lang=en" > \
+    %{buildroot}%{_datadir}/games/powermanga/texts/config.ini
+
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -83,6 +90,7 @@
 %{_bindir}/powermanga
 %attr(2755, root, games) %{_prefix}/games/powermanga
 %{_datadir}/games/powermanga/
+%config(noreplace) %{_datadir}/games/powermanga/texts/config.ini
 %{_datadir}/pixmaps/powermanga.png
 %{_mandir}/man6/powermanga.6*
 %config(noreplace) %attr(664, root, games) %{_var}/games/powermanga.hi
@@ -92,6 +100,10 @@
 
 
 %changelog
+* Fri Apr 21 2006 Matthias Saou <http://freshrpms.net/> 0.80-2
+- Add a workaround to include the "texts" directory and files, since the game
+  won't run without, and they don't get installed automatically! (#188901).
+
 * Tue Apr 11 2006 Matthias Saou <http://freshrpms.net/> 0.80-1
 - Update to 0.80, fixes crash at level 35 boss (#184076, Hugo Cisneiros).
 - Add new zlib-devel build requirement.



From fedora-extras-commits at redhat.com  Fri Apr 21 13:07:28 2006
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Fri, 21 Apr 2006 06:07:28 -0700
Subject: mock mock.py,1.41,1.42
Message-ID: <200604211307.k3LD7SHn021552@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/fedora/mock
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21534

Modified Files:
	mock.py 
Log Message:
fix bug 189586
Thanks to mclasen for catching it




Index: mock.py
===================================================================
RCS file: /cvs/fedora/mock/mock.py,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- mock.py	12 Apr 2006 14:22:11 -0000	1.41
+++ mock.py	21 Apr 2006 13:07:26 -0000	1.42
@@ -229,7 +229,7 @@
         (retval, output) = self.do(command)
 
         if retval != 0:
-            raise YumError, "Error peforming yum command: %s" % command
+            raise YumError, "Error performing yum command: %s" % command
         
         return (retval, output)
         



From fedora-extras-commits at redhat.com  Fri Apr 21 14:33:19 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 21 Apr 2006 07:33:19 -0700
Subject: rpms/NetworkManager-vpnc/FC-5 nm-vpnc-0.6.0-rekeying.patch, NONE,
	1.1 NetworkManager-vpnc.spec, 1.7, 1.8
Message-ID: <200604211433.k3LEXLwM023873@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager-vpnc/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23853

Modified Files:
	NetworkManager-vpnc.spec 
Added Files:
	nm-vpnc-0.6.0-rekeying.patch 
Log Message:
Update from devel branch


nm-vpnc-0.6.0-rekeying.patch:

--- NEW FILE nm-vpnc-0.6.0-rekeying.patch ---
--- NetworkManager-vpnc-0.6.0/src/nm-vpnc-service.c.rekeying	2006-03-19 07:15:48.000000000 -0500
+++ NetworkManager-vpnc-0.6.0/src/nm-vpnc-service.c	2006-03-19 07:15:51.000000000 -0500
@@ -57,6 +57,7 @@
 
 #define NM_VPNC_HELPER_PATH		BINDIR"/nm-vpnc-service-vpnc-helper"
 #define NM_VPNC_UDP_ENCAPSULATION_PORT	0 /* random port */
+#define NM_VPNC_REKEYING_INTERVAL 7200
 
 typedef struct NmVpncData
 {
@@ -444,6 +445,7 @@
 	write_config_option (vpnc_fd, "Script " NM_VPNC_HELPER_PATH "\n");
 	write_config_option (vpnc_fd, "UDP Encapsulate\n");
 	write_config_option (vpnc_fd, "UDP Encapsulation Port %d\n", NM_VPNC_UDP_ENCAPSULATION_PORT);
+	write_config_option (vpnc_fd, "Rekeying interval %d\n", NM_VPNC_REKEYING_INTERVAL);
 	write_config_option (vpnc_fd, "IPSec secret %s\n", password_items[0]);
 	write_config_option (vpnc_fd, "Xauth password %s\n", password_items[1]);
 
@@ -485,17 +487,19 @@
 static gboolean nm_vpnc_config_options_validate (char **data_items, int num_items)
 {
 	Option	allowed_opts[] = {
-					{ "IPSec gateway",			OPT_TYPE_ADDRESS },
-					{ "IPSec ID",				OPT_TYPE_ASCII },
-					{ "IPSec secret",			OPT_TYPE_ASCII },
-					{ "Xauth username",			OPT_TYPE_ASCII },
-					{ "UDP Encapsulate",		OPT_TYPE_NONE },
-					{ "UDP Encapsulation Port",	OPT_TYPE_ASCII },
-					{ "Domain",				OPT_TYPE_ASCII },
-					{ "IKE DH Group",			OPT_TYPE_ASCII },
-					{ "Perfect Forward Secrecy",	OPT_TYPE_ASCII },
-					{ "Application Version",		OPT_TYPE_ASCII },
-					{ NULL,					OPT_TYPE_UNKNOWN } };
+		{ "IPSec gateway",            OPT_TYPE_ADDRESS },
+		{ "IPSec ID",                 OPT_TYPE_ASCII },
+		{ "IPSec secret",             OPT_TYPE_ASCII },
+		{ "Xauth username",           OPT_TYPE_ASCII },
+		{ "UDP Encapsulate",          OPT_TYPE_NONE },
+		{ "UDP Encapsulation Port",   OPT_TYPE_ASCII },
+		{ "Domain",                   OPT_TYPE_ASCII },
+		{ "IKE DH Group",             OPT_TYPE_ASCII },
+		{ "Perfect Forward Secrecy",  OPT_TYPE_ASCII },
+		{ "Application Version",      OPT_TYPE_ASCII },
+		{ "Rekeying interval",        OPT_TYPE_ASCII },
+		{ NULL,                       OPT_TYPE_UNKNOWN }
+	};
 
 	unsigned int	i;
 


Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/FC-5/NetworkManager-vpnc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- NetworkManager-vpnc.spec	14 Mar 2006 21:34:47 -0000	1.7
+++ NetworkManager-vpnc.spec	21 Apr 2006 14:33:19 -0000	1.8
@@ -7,7 +7,7 @@
 Summary: NetworkManager VPN integration for vpnc
 Name: NetworkManager-vpnc
 Version: 0.6.0
-Release: 1
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
@@ -32,12 +32,15 @@
 Requires: gnome-keyring
 Requires: libglade2
 
+Patch1: nm-vpnc-0.6.0-rekeying.patch
+
 %description
 This package contains software for integrating the vpnc VPN software
 with NetworkManager and the GNOME desktop
 
 %prep
 %setup -q
+%patch1 -p1 -b .rekeying
 
 %build
 %configure
@@ -50,7 +53,7 @@
 rm -f %{buildroot}%{_libdir}/lib*.la
 rm -f %{buildroot}%{_libdir}/lib*.a
 
-%find_lang %{name}
+#%find_lang %{name}
 
 %clean
 rm -rf %{buildroot}
@@ -69,7 +72,8 @@
       /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor
 fi
 
-%files -f %{name}.lang
+#%files -f %{name}.lang
+%files
 %defattr(-, root, root)
 
 %doc AUTHORS ChangeLog NEWS README
@@ -84,6 +88,12 @@
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
 
 %changelog
+* Fri Apr 21 2006 Dan Williams <dcbw at redhat.com> 0.6.0-3
+- Add dist tag to RPM release
+
+* Wed Apr 12 2006 Christopher Aillon <caillon at redhat.com> 0.6.0-2
+- Rekey every 2 hours
+
 * Tue Mar 14 2006 Dan Williams <dcbw at redhat.com> - 0.6.0-1
 - Update to CVS snapshot of 0.6 for NM compatibility
 



From fedora-extras-commits at redhat.com  Fri Apr 21 14:34:17 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Fri, 21 Apr 2006 07:34:17 -0700
Subject: rpms/NetworkManager-vpnc/devel NetworkManager-vpnc.spec,1.8,1.9
Message-ID: <200604211434.k3LEYJtc023932@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/extras/rpms/NetworkManager-vpnc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23915

Modified Files:
	NetworkManager-vpnc.spec 
Log Message:
Add dist tag to RPM release


Index: NetworkManager-vpnc.spec
===================================================================
RCS file: /cvs/extras/rpms/NetworkManager-vpnc/devel/NetworkManager-vpnc.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- NetworkManager-vpnc.spec	12 Apr 2006 06:36:55 -0000	1.8
+++ NetworkManager-vpnc.spec	21 Apr 2006 14:34:17 -0000	1.9
@@ -7,7 +7,7 @@
 Summary: NetworkManager VPN integration for vpnc
 Name: NetworkManager-vpnc
 Version: 0.6.0
-Release: 2
+Release: 3%{?dist}
 License: GPL
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
@@ -88,6 +88,9 @@
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-cisco-vpn-settings.png
 
 %changelog
+* Fri Apr 21 2006 Dan Williams <dcbw at redhat.com> 0.6.0-3
+- Add dist tag to RPM release
+
 * Wed Apr 12 2006 Christopher Aillon <caillon at redhat.com> 0.6.0-2
 - Rekey every 2 hours
 



From fedora-extras-commits at redhat.com  Fri Apr 21 14:52:22 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 07:52:22 -0700
Subject: rpms/splint/devel splint.spec,1.5,1.6
Message-ID: <200604211452.k3LEqOgF024077@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/splint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24060

Modified Files:
	splint.spec 
Log Message:
- Manual.pdf - file permissions corrected.
- Included a demo .splintrc file as doc (splintrc.demo == src/.splintrc).



Index: splint.spec
===================================================================
RCS file: /cvs/extras/rpms/splint/devel/splint.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- splint.spec	13 Feb 2006 19:17:27 -0000	1.5
+++ splint.spec	21 Apr 2006 14:52:22 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           splint
 Version:        3.1.1
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        An implementation of the lint program
 
 Group:          Development/Tools
@@ -20,11 +20,13 @@
 
 %prep
 %setup -q
+chmod 644 doc/manual.pdf
+cp -p src/.splintrc splintrc.demo
 
 %build
 %configure
 # Parallel builds seem to fail
-make 
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -36,13 +38,17 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README doc/manual.pdf
+%doc README doc/manual.pdf splintrc.demo
 %{_bindir}/*
 %{_mandir}/man1/*.1*
 %{_datadir}/%{name}/
 
 
 %changelog
+* Thu Apr 20 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.1.1-13
+- Manual.pdf - file permissions corrected.
+- Included a demo .splintrc file as doc (splintrc.demo == src/.splintrc).
+
 * Mon Feb 13 2006 Paul Nasrat <pnasrat at redhat.com> - 3.1.1-12
 - FC5 rebuild for new gcc
 



From fedora-extras-commits at redhat.com  Fri Apr 21 15:04:52 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 08:04:52 -0700
Subject: rpms/splint/FC-4 splint.spec,1.3,1.4
Message-ID: <200604211505.k3LF5OtG026269@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/splint/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26226/FC-4

Modified Files:
	splint.spec 
Log Message:
Sync with devel


Index: splint.spec
===================================================================
RCS file: /cvs/extras/rpms/splint/FC-4/splint.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- splint.spec	28 Jul 2005 19:12:46 -0000	1.3
+++ splint.spec	21 Apr 2006 15:04:52 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           splint
 Version:        3.1.1
-Release:        10%{?dist}
+Release:        13%{?dist}
 Summary:        An implementation of the lint program
 
 Group:          Development/Tools
@@ -20,11 +20,13 @@
 
 %prep
 %setup -q
+chmod 644 doc/manual.pdf
+cp -p src/.splintrc splintrc.demo
 
 %build
 %configure
 # Parallel builds seem to fail
-make 
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -36,13 +38,23 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README doc/manual.pdf
+%doc README doc/manual.pdf splintrc.demo
 %{_bindir}/*
 %{_mandir}/man1/*.1*
 %{_datadir}/%{name}/
 
 
 %changelog
+* Thu Apr 20 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.1.1-13
+- Manual.pdf - file permissions corrected.
+- Included a demo .splintrc file as doc (splintrc.demo == src/.splintrc).
+
+* Mon Feb 13 2006 Paul Nasrat <pnasrat at redhat.com> - 3.1.1-12
+- FC5 rebuild for new gcc
+
+* Sun Jan 15 2006 Paul Nasrat <pnasrat at redhat.com> - 3.1.1-11
+- Rebuild for FC5
+
 * Thu Jul 28 2005 Paul Nasrat <pnasrat at redhat.com> - 3.1.1-10
 - Turn off parallel builds
 



From fedora-extras-commits at redhat.com  Fri Apr 21 15:04:53 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 08:04:53 -0700
Subject: rpms/splint/FC-5 splint.spec,1.5,1.6
Message-ID: <200604211505.k3LF5PtT026272@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/splint/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26226/FC-5

Modified Files:
	splint.spec 
Log Message:
Sync with devel


Index: splint.spec
===================================================================
RCS file: /cvs/extras/rpms/splint/FC-5/splint.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- splint.spec	13 Feb 2006 19:17:27 -0000	1.5
+++ splint.spec	21 Apr 2006 15:04:53 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           splint
 Version:        3.1.1
-Release:        12%{?dist}
+Release:        13%{?dist}
 Summary:        An implementation of the lint program
 
 Group:          Development/Tools
@@ -20,11 +20,13 @@
 
 %prep
 %setup -q
+chmod 644 doc/manual.pdf
+cp -p src/.splintrc splintrc.demo
 
 %build
 %configure
 # Parallel builds seem to fail
-make 
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -36,13 +38,17 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README doc/manual.pdf
+%doc README doc/manual.pdf splintrc.demo
 %{_bindir}/*
 %{_mandir}/man1/*.1*
 %{_datadir}/%{name}/
 
 
 %changelog
+* Thu Apr 20 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.1.1-13
+- Manual.pdf - file permissions corrected.
+- Included a demo .splintrc file as doc (splintrc.demo == src/.splintrc).
+
 * Mon Feb 13 2006 Paul Nasrat <pnasrat at redhat.com> - 3.1.1-12
 - FC5 rebuild for new gcc
 



From fedora-extras-commits at redhat.com  Fri Apr 21 15:15:03 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 08:15:03 -0700
Subject: rpms/perl-Sub-Uplevel/devel .cvsignore, 1.2,
	1.3 perl-Sub-Uplevel.spec, 
	1.7, 1.8 sources, 1.2, 1.3 Sub-Uplevel-0.09-Uplevel.pm.patch,
	1.1, NONE
Message-ID: <200604211515.k3LFF5bR026458@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Sub-Uplevel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26437

Modified Files:
	.cvsignore perl-Sub-Uplevel.spec sources 
Removed Files:
	Sub-Uplevel-0.09-Uplevel.pm.patch 
Log Message:
Update to 0.10.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Mar 2005 03:05:23 -0000	1.2
+++ .cvsignore	21 Apr 2006 15:15:02 -0000	1.3
@@ -1 +1 @@
-Sub-Uplevel-0.09.tar.gz
+Sub-Uplevel-0.10.tar.gz


Index: perl-Sub-Uplevel.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/devel/perl-Sub-Uplevel.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Sub-Uplevel.spec	22 Feb 2006 21:12:16 -0000	1.7
+++ perl-Sub-Uplevel.spec	21 Apr 2006 15:15:03 -0000	1.8
@@ -1,13 +1,12 @@
 Name:           perl-Sub-Uplevel
-Version:        0.09
-Release:        4%{?dist}
+Version:        0.10
+Release:        1%{?dist}
 Summary:        Run a perl function in an upper stack frame
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Sub-Uplevel/
-Source0:        http://www.cpan.org/authors/id/M/MS/MSCHWERN/Sub-Uplevel-%{version}.tar.gz
-Patch0:         Sub-Uplevel-0.09-Uplevel.pm.patch
+Source0:        http://www.cpan.org/authors/id/D/DA/DAGOLDEN/Sub-Uplevel-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -22,7 +21,6 @@
 
 %prep
 %setup -q -n Sub-Uplevel-%{version}
-%patch0 -p1
 
 
 %build
@@ -54,6 +52,11 @@
 
 
 %changelog
+* Fri Apr 21 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.10-1
+- Update to 0.10.
+- New upstream maintainer.
+- Patch dropped.
+
 * Wed Feb 22 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.09-4
 - Uplevel.pm patch (perl 5.8.8). See bugzilla entry #182488.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Mar 2005 03:05:23 -0000	1.2
+++ sources	21 Apr 2006 15:15:03 -0000	1.3
@@ -1 +1 @@
-eb09cb38cd7a9b7bc9d3e85e61fe09dd  Sub-Uplevel-0.09.tar.gz
+1dcde4e58ee1eb623b7ee974f5d7d6da  Sub-Uplevel-0.10.tar.gz


--- Sub-Uplevel-0.09-Uplevel.pm.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Apr 21 15:31:06 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 08:31:06 -0700
Subject: rpms/perl-Sub-Uplevel/FC-5 .cvsignore, 1.2,
	1.3 perl-Sub-Uplevel.spec, 
	1.7, 1.8 sources, 1.2, 1.3 Sub-Uplevel-0.09-Uplevel.pm.patch,
	1.1, NONE
Message-ID: <200604211531.k3LFV8gR026719@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Sub-Uplevel/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26698

Modified Files:
	.cvsignore perl-Sub-Uplevel.spec sources 
Removed Files:
	Sub-Uplevel-0.09-Uplevel.pm.patch 
Log Message:
Update to 0.10.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Mar 2005 03:05:23 -0000	1.2
+++ .cvsignore	21 Apr 2006 15:31:06 -0000	1.3
@@ -1 +1 @@
-Sub-Uplevel-0.09.tar.gz
+Sub-Uplevel-0.10.tar.gz


Index: perl-Sub-Uplevel.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/FC-5/perl-Sub-Uplevel.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Sub-Uplevel.spec	22 Feb 2006 21:12:16 -0000	1.7
+++ perl-Sub-Uplevel.spec	21 Apr 2006 15:31:06 -0000	1.8
@@ -1,13 +1,12 @@
 Name:           perl-Sub-Uplevel
-Version:        0.09
-Release:        4%{?dist}
+Version:        0.10
+Release:        1%{?dist}
 Summary:        Run a perl function in an upper stack frame
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Sub-Uplevel/
-Source0:        http://www.cpan.org/authors/id/M/MS/MSCHWERN/Sub-Uplevel-%{version}.tar.gz
-Patch0:         Sub-Uplevel-0.09-Uplevel.pm.patch
+Source0:        http://www.cpan.org/authors/id/D/DA/DAGOLDEN/Sub-Uplevel-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -22,7 +21,6 @@
 
 %prep
 %setup -q -n Sub-Uplevel-%{version}
-%patch0 -p1
 
 
 %build
@@ -54,6 +52,11 @@
 
 
 %changelog
+* Fri Apr 21 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.10-1
+- Update to 0.10.
+- New upstream maintainer.
+- Patch dropped.
+
 * Wed Feb 22 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.09-4
 - Uplevel.pm patch (perl 5.8.8). See bugzilla entry #182488.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Mar 2005 03:05:23 -0000	1.2
+++ sources	21 Apr 2006 15:31:06 -0000	1.3
@@ -1 +1 @@
-eb09cb38cd7a9b7bc9d3e85e61fe09dd  Sub-Uplevel-0.09.tar.gz
+1dcde4e58ee1eb623b7ee974f5d7d6da  Sub-Uplevel-0.10.tar.gz


--- Sub-Uplevel-0.09-Uplevel.pm.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Apr 21 15:34:26 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 08:34:26 -0700
Subject: rpms/perl-Sub-Uplevel/FC-4 .cvsignore, 1.2,
	1.3 perl-Sub-Uplevel.spec, 1.4, 1.5 sources, 1.2, 1.3
Message-ID: <200604211534.k3LFYS2Z026802@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Sub-Uplevel/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26781

Modified Files:
	.cvsignore perl-Sub-Uplevel.spec sources 
Log Message:
Update to 0.10.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Mar 2005 03:05:23 -0000	1.2
+++ .cvsignore	21 Apr 2006 15:34:26 -0000	1.3
@@ -1 +1 @@
-Sub-Uplevel-0.09.tar.gz
+Sub-Uplevel-0.10.tar.gz


Index: perl-Sub-Uplevel.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/FC-4/perl-Sub-Uplevel.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Sub-Uplevel.spec	6 Apr 2005 22:13:08 -0000	1.4
+++ perl-Sub-Uplevel.spec	21 Apr 2006 15:34:26 -0000	1.5
@@ -1,20 +1,17 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-Sub-Uplevel
-Version:        0.09
-Release:        2
-
+Version:        0.10
+Release:        1%{?dist}
 Summary:        Run a perl function in an upper stack frame
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Sub-Uplevel/
-Source0:   http://www.cpan.org/authors/id/M/MS/MSCHWERN/Sub-Uplevel-0.09.tar.gz
+Source0:        http://www.cpan.org/authors/id/D/DA/DAGOLDEN/Sub-Uplevel-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
 BuildRequires:  perl >= 1:5.6.1
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 Like Tcl's uplevel() function, but not quite so dangerous.  The
@@ -39,7 +36,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -55,7 +52,18 @@
 
 
 %changelog
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Fri Apr 21 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.10-1
+- Update to 0.10.
+- New upstream maintainer.
+- Patch dropped.
+
+* Wed Feb 22 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.09-4
+- Uplevel.pm patch (perl 5.8.8). See bugzilla entry #182488.
+
+* Thu Dec 29 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.09-3
+- Dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.09-2
 - rebuilt
 
 * Thu Jul  8 2004 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.09-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Sub-Uplevel/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Mar 2005 03:05:23 -0000	1.2
+++ sources	21 Apr 2006 15:34:26 -0000	1.3
@@ -1 +1 @@
-eb09cb38cd7a9b7bc9d3e85e61fe09dd  Sub-Uplevel-0.09.tar.gz
+1dcde4e58ee1eb623b7ee974f5d7d6da  Sub-Uplevel-0.10.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 15:42:13 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 08:42:13 -0700
Subject: rpms/perl-Test-MockObject/devel .cvsignore, 1.8,
	1.9 perl-Test-MockObject.spec, 1.12, 1.13 sources, 1.8, 1.9
Message-ID: <200604211542.k3LFgFsM026915@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-serv26894

Modified Files:
	.cvsignore perl-Test-MockObject.spec sources 
Log Message:
Update to 1.06.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	11 Apr 2006 18:13:16 -0000	1.8
+++ .cvsignore	21 Apr 2006 15:42:13 -0000	1.9
@@ -1 +1 @@
-Test-MockObject-1.05.tar.gz
+Test-MockObject-1.06.tar.gz


Index: perl-Test-MockObject.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/perl-Test-MockObject.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-Test-MockObject.spec	11 Apr 2006 18:13:16 -0000	1.12
+++ perl-Test-MockObject.spec	21 Apr 2006 15:42:13 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           perl-Test-MockObject
-Version:        1.05
+Version:        1.06
 Release:        1%{?dist}
 Summary:        Perl extension for emulating troublesome interfaces
 
@@ -59,6 +59,9 @@
 
 
 %changelog
+* Fri Apr 21 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.06-1
+- Update to 1.06.
+
 * Tue Apr 11 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.05-1
 - Update to 1.05.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-MockObject/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	11 Apr 2006 18:13:16 -0000	1.8
+++ sources	21 Apr 2006 15:42:13 -0000	1.9
@@ -1 +1 @@
-f0dbe875fd3af865126ede948408dbaa  Test-MockObject-1.05.tar.gz
+3cef7884dd6fc6b15c35dd04697a8853  Test-MockObject-1.06.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 15:55:24 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 08:55:24 -0700
Subject: rpms/perl-Test-MockObject/FC-5 .cvsignore, 1.8,
	1.9 perl-Test-MockObject.spec, 1.12, 1.13 sources, 1.8, 1.9
Message-ID: <200604211555.k3LFtQDl027035@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-serv27014

Modified Files:
	.cvsignore perl-Test-MockObject.spec sources 
Log Message:
Update to 1.06.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-MockObject/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	11 Apr 2006 18:13:15 -0000	1.8
+++ .cvsignore	21 Apr 2006 15:55:23 -0000	1.9
@@ -1 +1 @@
-Test-MockObject-1.05.tar.gz
+Test-MockObject-1.06.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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-Test-MockObject.spec	11 Apr 2006 18:13:15 -0000	1.12
+++ perl-Test-MockObject.spec	21 Apr 2006 15:55:23 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           perl-Test-MockObject
-Version:        1.05
+Version:        1.06
 Release:        1%{?dist}
 Summary:        Perl extension for emulating troublesome interfaces
 
@@ -59,6 +59,9 @@
 
 
 %changelog
+* Fri Apr 21 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.06-1
+- Update to 1.06.
+
 * Tue Apr 11 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.05-1
 - Update to 1.05.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-MockObject/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	11 Apr 2006 18:13:15 -0000	1.8
+++ sources	21 Apr 2006 15:55:23 -0000	1.9
@@ -1 +1 @@
-f0dbe875fd3af865126ede948408dbaa  Test-MockObject-1.05.tar.gz
+3cef7884dd6fc6b15c35dd04697a8853  Test-MockObject-1.06.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 15:59:44 2006
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Fri, 21 Apr 2006 08:59:44 -0700
Subject: extras-buildsys/utils extras-repobuild.py, 1.12,
	1.13 extras-repoview.py, 1.2, 1.3 extras-sign-move.py, 1.9, 1.10
Message-ID: <200604211559.k3LFxixn027137@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27115

Modified Files:
	extras-repobuild.py extras-repoview.py extras-sign-move.py 
Log Message:

correct paths for extras64 re-do.



Index: extras-repobuild.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/extras-repobuild.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- extras-repobuild.py	24 Mar 2006 23:14:28 -0000	1.12
+++ extras-repobuild.py	21 Apr 2006 15:59:41 -0000	1.13
@@ -25,7 +25,7 @@
 # email to fedora-extras-list with the built packages list
 # sing, dance, romance
 
-treedir = '/rpmbuild/extras/tree/extras'
+treedir = '/srv/rpmbuild/extras/tree/extras'
 cachedir = '/tmp/repomd-cache'
 compsname = 'comps.xml'
 archdict = {'3':['x86_64', 'i386'], 


Index: extras-repoview.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/extras-repoview.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- extras-repoview.py	17 Mar 2006 07:46:49 -0000	1.2
+++ extras-repoview.py	21 Apr 2006 15:59:41 -0000	1.3
@@ -21,7 +21,7 @@
 # get the path to where to look for the packages to be signed
 # make repoview
 
-treedir = '/rpmbuild/extras/tree/extras'
+treedir = '/srv/rpmbuild/extras/tree/extras'
 archdict = {'3':['x86_64', 'i386'], 
             '4':['ppc','x86_64', 'i386'],
             '5':['ppc','x86_64', 'i386'],


Index: extras-sign-move.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/extras-sign-move.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- extras-sign-move.py	9 Apr 2006 09:39:53 -0000	1.9
+++ extras-sign-move.py	21 Apr 2006 15:59:41 -0000	1.10
@@ -31,8 +31,8 @@
 # email to fedora-extras-list with the built packages list
 
 
-stagesdir = '/rpmbuild/repodir'
-treedir = '/rpmbuild/extras/tree/extras'
+stagesdir = '/srv/rpmbuild/repodir'
+treedir = '/srv/rpmbuild/extras/tree/extras'
 cachedir = '/tmp/repomd-cache'
 compsname = 'comps.xml'
 archdict = {'3':['x86_64', 'i386'], 



From fedora-extras-commits at redhat.com  Fri Apr 21 16:05:21 2006
From: fedora-extras-commits at redhat.com (Orion Poplawski (orion))
Date: Fri, 21 Apr 2006 09:05:21 -0700
Subject: rpms/paraview/devel paraview.spec,1.2,1.3
Message-ID: <200604211605.k3LG5NrE029214@cvs-int.fedora.redhat.com>

Author: orion

Update of /cvs/extras/rpms/paraview/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29197

Modified Files:
	paraview.spec 
Log Message:
Re-enable ppc



Index: paraview.spec
===================================================================
RCS file: /cvs/extras/rpms/paraview/devel/paraview.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- paraview.spec	17 Apr 2006 22:25:13 -0000	1.2
+++ paraview.spec	21 Apr 2006 16:05:21 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           paraview
 Version:        2.4.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Parallel visualization application
 
 Group:          Applications/Engineering
@@ -20,7 +20,6 @@
 BuildRequires:  freetype-devel, libjpeg-devel, libpng-devel, libtiff-devel, zlib-devel
 BuildRequires:  expat-devel
 BuildRequires:  /usr/bin/desktop-file-install
-ExcludeArch:    ppc
 
 Requires:       %{name}-data = %{version}-%{release}
 Requires(post):   /usr/bin/update-desktop-database
@@ -310,6 +309,9 @@
 
 
 %changelog
+* Fri Apr 21 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.3-7
+- Re-enable ppc
+
 * Mon Apr 17 2006 - Orion Poplawski <orion at cora.wnra.com> - 2.4.3-6
 - Exclude ppc due to gcc bug #189160
 



From fedora-extras-commits at redhat.com  Fri Apr 21 16:33:06 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Fri, 21 Apr 2006 09:33:06 -0700
Subject: rpms/wifiroamd - New directory
Message-ID: <200604211633.k3LGX8qw029499@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/wifiroamd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29469/wifiroamd

Log Message:
Directory /cvs/extras/rpms/wifiroamd added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 16:33:06 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Fri, 21 Apr 2006 09:33:06 -0700
Subject: rpms/wifiroamd/devel - New directory
Message-ID: <200604211633.k3LGX8fZ029503@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/wifiroamd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29469/wifiroamd/devel

Log Message:
Directory /cvs/extras/rpms/wifiroamd/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 16:33:15 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Fri, 21 Apr 2006 09:33:15 -0700
Subject: rpms/wifiroamd/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604211633.k3LGXHjL029566@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/wifiroamd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29526/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module wifiroamd


--- 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 Apr 21 16:33:15 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Fri, 21 Apr 2006 09:33:15 -0700
Subject: rpms/wifiroamd Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604211633.k3LGXHmE029562@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/wifiroamd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29526

Added Files:
	Makefile import.log 
Log Message:
Setup of module wifiroamd


--- NEW FILE Makefile ---
# Top level Makefile for module wifiroamd
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 21 17:00:17 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Fri, 21 Apr 2006 10:00:17 -0700
Subject: rpms/torque/devel .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 torque.spec,
	1.2, 1.3
Message-ID: <200604211700.k3LH0J6l031307@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31286

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Fri Apr 21 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.10.200604211036cvs
- bump



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Apr 2006 02:10:40 -0000	1.2
+++ .cvsignore	21 Apr 2006 17:00:17 -0000	1.3
@@ -1 +1 @@
-torque-2.1.0p0-snap.200604171430.tar.gz
+torque-2.1.0p0-snap.200604211036.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Apr 2006 02:10:40 -0000	1.2
+++ sources	21 Apr 2006 17:00:17 -0000	1.3
@@ -1 +1 @@
-00ae6cf8f95960c83022ff9037dc1d57  torque-2.1.0p0-snap.200604171430.tar.gz
+3b40c0d81a06ef4abe14c3bb7522086d  torque-2.1.0p0-snap.200604211036.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/torque.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- torque.spec	21 Apr 2006 07:01:22 -0000	1.2
+++ torque.spec	21 Apr 2006 17:00:17 -0000	1.3
@@ -2,8 +2,8 @@
 # comment out snap if building a real release
 %define name torque
 %define version 2.1.0p0
-%define snap 200604171430
-%define release 8
+%define snap 200604211036
+%define release 10
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -91,7 +91,6 @@
 Source4: xpbs.png
 Source5: xpbsmon.png
 Patch1: torque-2.1.0-remove-rpath.path
-Patch2: torque-2.1.0p0-sched-offbyone.patch
 License: Freely redistributable (See PBS_License.txt)
 Group: System Environment/Daemons
 URL: http://www.clusterresources.com/products/torque/
@@ -120,7 +119,6 @@
 %prep
 %setup -q -n torque-%{version}%{?snap:-snap.%snap}
 %patch1 -p1
-%patch2 -p1
 
 %__cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} .
 
@@ -425,6 +423,12 @@
 
 
 %changelog
+* Fri Apr 21 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.10.200604211036cvs
+- bump
+
+* Fri Apr 21 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.9.200604171430cvs
+- fix qsub write return check
+
 * Thu Apr 20 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.8.200604171430cvs
 - fix pbs_sched error opening lockfile and immediately exiting
 



From fedora-extras-commits at redhat.com  Fri Apr 21 17:05:11 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Fri, 21 Apr 2006 10:05:11 -0700
Subject: rpms/proftpd/devel .cvsignore, 1.7, 1.8 proftpd.init, 1.4,
	1.5 proftpd.spec, 1.13, 1.14 sources, 1.7, 1.8
Message-ID: <200604211705.k3LH5DTL001073@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/proftpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1043

Modified Files:
	.cvsignore proftpd.init proftpd.spec sources 
Log Message:
Update to 1.3.0 final and add ldap, mysql and postgresql sub-packages.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	7 Mar 2006 10:34:01 -0000	1.7
+++ .cvsignore	21 Apr 2006 17:05:11 -0000	1.8
@@ -1 +1 @@
-proftpd-1.3.0rc4.tar.bz2
+proftpd-1.3.0.tar.bz2


Index: proftpd.init
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- proftpd.init	16 Nov 2004 18:34:32 -0000	1.4
+++ proftpd.init	21 Apr 2006 17:05:11 -0000	1.5
@@ -32,7 +32,7 @@
 
 start() {
 	echo -n $"Starting $prog: "
-	daemon proftpd
+	daemon proftpd 2>/dev/null
 	RETVAL=$?
 	echo
 	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/proftpd


Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- proftpd.spec	7 Mar 2006 10:34:01 -0000	1.13
+++ proftpd.spec	21 Apr 2006 17:05:11 -0000	1.14
@@ -1,11 +1,11 @@
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
 Version: 1.3.0
-Release: 0.2.rc4%{?dist}
+Release: 1%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
-Source0: ftp://ftp.proftpd.org/distrib/source/proftpd-%{version}rc4.tar.bz2
+Source0: ftp://ftp.proftpd.org/distrib/source/proftpd-%{version}.tar.bz2
 Source1: proftpd.conf
 Source2: proftpd.init
 Source3: proftpd-xinetd
@@ -13,18 +13,14 @@
 Source5: welcome.msg
 Source6: proftpd.pam
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: pam >= 0.59, /sbin/service, /sbin/chkconfig
-BuildRequires: pam-devel, perl, ncurses-devel, pkgconfig
-%{!?_without_tls:Requires: openssl}
-%{!?_without_tls:BuildRequires: openssl-devel, krb5-devel}
-%{?_with_ldap:Requires: openldap}
-%{?_with_ldap:BuildRequires: openldap-devel}
-%{?_with_mysql:Requires: mysql}
-%{?_with_mysql:BuildRequires: mysql-devel, zlib-devel}
-%{?_with_postgresql:Requires: postgresql-libs}
-%{?_with_postgresql:BuildRequires: postgresql-devel}
+Requires: pam >= 0.59
+Requires(post): /sbin/chkconfig
+Requires(preun): /sbin/service, /sbin/chkconfig
+Requires(postun): /sbin/service
+BuildRequires: pam-devel, ncurses-devel, pkgconfig
+BuildRequires: openssl-devel, krb5-devel, libacl-devel
+BuildRequires: openldap-devel, mysql-devel, zlib-devel, postgresql-devel
 Provides: ftpserver
-Conflicts: wu-ftpd, anonftp, vsftpd
 
 %description
 ProFTPD is an enhanced FTP server with a focus toward simplicity, security,
@@ -36,56 +32,73 @@
 This package defaults to the standalone behaviour of ProFTPD, but all the
 needed scripts to have it run by xinetd instead are included.
 
-Available rpmbuild rebuild options :
---without : tls
---with : ldap mysql postgresql ipv6
+
+%package ldap
+Summary: Module to add LDAP support to the ProFTPD FTP server
+Group: System Environment/Daemons
+Requires: %{name} = %{version}-%{release}
+
+%description ldap
+Module to add LDAP support to the ProFTPD FTP server.
+
+
+%package mysql
+Summary: Module to add MySQL support to the ProFTPD FTP server
+Group: System Environment/Daemons
+Requires: %{name} = %{version}-%{release}
+
+%description mysql
+Module to add MySQL support to the ProFTPD FTP server.
+
+
+%package postgresql
+Summary: Module to add PostgreSQL support to the ProFTPD FTP server
+Group: System Environment/Daemons
+Requires: %{name} = %{version}-%{release}
+
+%description postgresql
+Module to add PostgreSQL support to the ProFTPD FTP server.
 
 
 %prep
-%setup -n %{name}-%{version}rc4
+%setup
 
 
 %build
-# Workaround for the PostgreSQL include file
-%{__perl} -pi -e 's|pgsql/libpq-fe.h|libpq-fe.h|g' contrib/mod_sql_postgres.c
-
 # Disable stripping in order to get useful debuginfo packages
 %{__perl} -pi -e 's|"-s"|""|g' configure
 
-# TLS includes
-OPENSSL_INC=""
-if OPENSSL_CFLAGS=`pkg-config --cflags openssl`; then
-    for i in ${OPENSSL_CFLAGS}; do
-        INCPATH=`echo $i | perl -pi -e 's|-I([a-z/]*)|$1|g'`
-        test ! -z ${INCPATH} && OPENSSL_INC="${OPENSSL_INC}:${INCPATH}"
-    done
-fi
-
 %configure \
-    --localstatedir="/var/run" \
-    --with-includes="%{_includedir}%{!?_without_tls:${OPENSSL_INC}}%{?_with_mysql::%{_includedir}/mysql}" \
-    %{?_with_ipv6:--enable-ipv6} \
-    %{?_with_mysql:--with-libraries="%{_libdir}/mysql"} \
-    %{?_with_postgresql:--with-libraries="%{_libdir}"} \
-    --with-modules=mod_readme:mod_auth_pam%{?_with_ldap::mod_ldap}%{?_with_mysql::mod_sql:mod_sql_mysql}%{?_with_postgresql::mod_sql:mod_sql_postgres}%{!?_without_tls::mod_tls}
+    --libexecdir="%{_libexecdir}/proftpd" \
+    --localstatedir="%{_var}/run" \
+    --enable-ctrls \
+    --enable-facl \
+    --enable-dso \
+    --enable-ipv6 \
+    --with-libraries="%{_libdir}/mysql" \
+    --with-includes="%{_includedir}/mysql" \
+    --with-modules=mod_readme:mod_auth_pam:mod_tls \
+    --with-shared=mod_ldap:mod_sql:mod_sql_mysql:mod_sql_postgres
+
 %{__make} %{?_smp_mflags}
 
 
 %install
 %{__rm} -rf %{buildroot}
-%makeinstall rundir="%{buildroot}%{_localstatedir}/run/proftpd" \
+%{__make} install DESTDIR=%{buildroot} \
+    rundir="%{_var}/run/proftpd" \
     INSTALL_USER=`id -un` \
     INSTALL_GROUP=`id -gn`
-%{__install} -D -p -m 640 %{SOURCE1} \
+%{__install} -D -p -m 0640 %{SOURCE1} \
     %{buildroot}%{_sysconfdir}/proftpd.conf
-%{__install} -D -p -m 755 %{SOURCE2} \
+%{__install} -D -p -m 0755 %{SOURCE2} \
     %{buildroot}%{_sysconfdir}/rc.d/init.d/proftpd
-%{__install} -D -p -m 640 %{SOURCE3} \
+%{__install} -D -p -m 0640 %{SOURCE3} \
     %{buildroot}%{_sysconfdir}/xinetd.d/xproftpd
-%{__install} -D -p -m 644 %{SOURCE4} \
+%{__install} -D -p -m 0644 %{SOURCE4} \
     %{buildroot}%{_sysconfdir}/logrotate.d/proftpd
-%{__install} -D -p -m 644 %{SOURCE5} %{buildroot}/var/ftp/welcome.msg
-%{__install} -D -p -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/pam.d/proftpd
+%{__install} -D -p -m 0644 %{SOURCE5} %{buildroot}/var/ftp/welcome.msg
+%{__install} -D -p -m 0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/pam.d/proftpd
 %{__mkdir_p} %{buildroot}/var/ftp/uploads
 %{__mkdir_p} %{buildroot}/var/ftp/pub
 %{__mkdir_p} %{buildroot}/var/log/proftpd
@@ -97,7 +110,7 @@
 
 
 %post
-if [ $1 = 1 ]; then
+if [ $1 -eq 1 ]; then
     /sbin/chkconfig --add proftpd
     IFS=":"; cat /etc/passwd | \
     while { read username nu nu gid nu nu nu nu; }; do \
@@ -108,12 +121,12 @@
 fi
 
 %preun
-if [ $1 = 0 ]; then
+if [ $1 -eq 0 ]; then
     /sbin/service proftpd stop &>/dev/null || :
     /sbin/chkconfig --del proftpd
     /sbin/service xinetd reload &>/dev/null || :
-    if [ -d /var/run/proftpd ]; then
-        rm -rf /var/run/proftpd/*
+    if [ -d %{_var}/run/proftpd ]; then
+        rm -rf %{_var}/run/proftpd/*
     fi
 fi
 
@@ -136,6 +149,10 @@
 %{_sysconfdir}/rc.d/init.d/proftpd
 %{_mandir}/*/*
 %{_bindir}/*
+%dir %{_libexecdir}/proftpd/
+%{_libexecdir}/proftpd/mod_sql.so
+%exclude %{_libexecdir}/proftpd/*.a
+%exclude %{_libexecdir}/proftpd/*.la
 %{_sbindir}/*
 %dir /var/ftp/
 %attr(331, ftp, ftp) %dir /var/ftp/uploads/
@@ -143,8 +160,37 @@
 %config(noreplace) /var/ftp/welcome.msg
 %attr(750, root, root) %dir /var/log/proftpd/
 
+%files ldap
+%defattr(-, root, root, 0755)
+%dir %{_libexecdir}/proftpd/
+%{_libexecdir}/proftpd/mod_ldap.so
+
+%files mysql
+%defattr(-, root, root, 0755)
+%dir %{_libexecdir}/proftpd/
+%{_libexecdir}/proftpd/mod_sql_mysql.so
+
+%files postgresql
+%defattr(-, root, root, 0755)
+%dir %{_libexecdir}/proftpd/
+%{_libexecdir}/proftpd/mod_sql_postgres.so
+
 
 %changelog
+* Fri Apr 21 2006 Matthias Saou <http://freshrpms.net/> 1.3.0-1
+- Update to 1.3.0 final.
+- Remove no longer needed PostgreSQL and OpenSSL detection workarounds.
+- Remove explicit conflicts on wu-ftpd, anonftp and vsftpd to let people
+  install more than one ftp daemon (what for? hmm...) (#189023).
+- Enable LDAP, MySQL and PostgreSQL as DSOs by default, and stuff them in
+  new sub-packages. This won't introduce any regression since they weren't
+  enabled by default.
+- Remove useless explicit requirements.
+- Rearrange scriplets requirements.
+- Enable ctrls (controls via ftpdctl) and facl (POSIX ACLs).
+- Using --disable-static makes the build fail, so exclude .a files in %%files.
+- Silence harmless IPv6 failure message at startup when IPv6 isn't available.
+
 * Tue Mar  7 2006 Matthias Saou <http://freshrpms.net/> 1.3.0-0.2.rc4
 - Update to 1.3.0rc4 (bugfix release).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	7 Mar 2006 10:34:01 -0000	1.7
+++ sources	21 Apr 2006 17:05:11 -0000	1.8
@@ -1 +1 @@
-175da3e672d9f441b852259c7baee21e  proftpd-1.3.0rc4.tar.bz2
+fae47d01b52e035eb6b7190e74c17722  proftpd-1.3.0.tar.bz2



From fedora-extras-commits at redhat.com  Fri Apr 21 17:05:43 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Fri, 21 Apr 2006 10:05:43 -0700
Subject: rpms/pygame/FC-4 pygame.spec,1.1,1.2
Message-ID: <200604211705.k3LH5jEP001160@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1088/pygame/FC-4

Modified Files:
	pygame.spec 
Log Message:
Added obsolete and provides for python-pygame


Index: pygame.spec
===================================================================
RCS file: /cvs/extras/rpms/pygame/FC-4/pygame.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pygame.spec	21 Apr 2006 00:19:40 -0000	1.1
+++ pygame.spec	21 Apr 2006 17:05:43 -0000	1.2
@@ -14,6 +14,8 @@
 BuildRequires:  python-devel python-numeric
 BuildRequires:  SDL_ttf-devel SDL_image-devel SDL_mixer-devel
 Requires:       python-numeric
+Obsoletes:      python-pygame < 1.7.1
+Provides:       python-pygame = %{version}-%{release}
 
 %description
 Pygame is a set of Python modules designed for writing games. It is
@@ -25,7 +27,7 @@
 %package devel
 Summary:        Files needed for developing programs which use pygame
 Group:          Development/Libraries
-Requires:       %{name} == %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description devel
 This package contains headers required to build applications that use



From fedora-extras-commits at redhat.com  Fri Apr 21 17:05:44 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Fri, 21 Apr 2006 10:05:44 -0700
Subject: rpms/pygame/FC-5 pygame.spec,1.1,1.2
Message-ID: <200604211705.k3LH5k5P001162@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1088/pygame/FC-5

Modified Files:
	pygame.spec 
Log Message:
Added obsolete and provides for python-pygame


Index: pygame.spec
===================================================================
RCS file: /cvs/extras/rpms/pygame/FC-5/pygame.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pygame.spec	21 Apr 2006 00:19:40 -0000	1.1
+++ pygame.spec	21 Apr 2006 17:05:44 -0000	1.2
@@ -14,6 +14,8 @@
 BuildRequires:  python-devel python-numeric
 BuildRequires:  SDL_ttf-devel SDL_image-devel SDL_mixer-devel
 Requires:       python-numeric
+Obsoletes:      python-pygame < 1.7.1
+Provides:       python-pygame = %{version}-%{release}
 
 %description
 Pygame is a set of Python modules designed for writing games. It is
@@ -25,7 +27,7 @@
 %package devel
 Summary:        Files needed for developing programs which use pygame
 Group:          Development/Libraries
-Requires:       %{name} == %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description devel
 This package contains headers required to build applications that use



From fedora-extras-commits at redhat.com  Fri Apr 21 17:05:44 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Fri, 21 Apr 2006 10:05:44 -0700
Subject: rpms/pygame/devel pygame.spec,1.1,1.2
Message-ID: <200604211705.k3LH5kKE001166@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1088/pygame/devel

Modified Files:
	pygame.spec 
Log Message:
Added obsolete and provides for python-pygame


Index: pygame.spec
===================================================================
RCS file: /cvs/extras/rpms/pygame/devel/pygame.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pygame.spec	21 Apr 2006 00:19:40 -0000	1.1
+++ pygame.spec	21 Apr 2006 17:05:44 -0000	1.2
@@ -14,6 +14,8 @@
 BuildRequires:  python-devel python-numeric
 BuildRequires:  SDL_ttf-devel SDL_image-devel SDL_mixer-devel
 Requires:       python-numeric
+Obsoletes:      python-pygame < 1.7.1
+Provides:       python-pygame = %{version}-%{release}
 
 %description
 Pygame is a set of Python modules designed for writing games. It is
@@ -25,7 +27,7 @@
 %package devel
 Summary:        Files needed for developing programs which use pygame
 Group:          Development/Libraries
-Requires:       %{name} == %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
 
 %description devel
 This package contains headers required to build applications that use



From fedora-extras-commits at redhat.com  Fri Apr 21 17:09:30 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Fri, 21 Apr 2006 10:09:30 -0700
Subject: rpms/pygame/FC-4 pygame.spec,1.2,1.3
Message-ID: <200604211709.k3LH9Wrf001389@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1344/pygame/FC-4

Modified Files:
	pygame.spec 
Log Message:
Add changelog for new changes


Index: pygame.spec
===================================================================
RCS file: /cvs/extras/rpms/pygame/FC-4/pygame.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pygame.spec	21 Apr 2006 17:05:43 -0000	1.2
+++ pygame.spec	21 Apr 2006 17:09:30 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           pygame
 Version:        1.7.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python modules for writing games
 Group:          Development/Languages
 License:        LGPL
@@ -77,6 +77,11 @@
 %{_includedir}/python*/%{name}/*.h
 
 %changelog
+* Fri Apr 21 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-3
+- Obsolete linva python-pygame package
+- Added Provides for python-pygame
+- Fix equal sign in devel requires
+
 * Thu Apr 20 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-2
 - Added a patch to clean up some warnings on 64 bit compiles
 



From fedora-extras-commits at redhat.com  Fri Apr 21 17:09:31 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Fri, 21 Apr 2006 10:09:31 -0700
Subject: rpms/pygame/devel pygame.spec,1.2,1.3
Message-ID: <200604211709.k3LH9XHk001396@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1344/pygame/devel

Modified Files:
	pygame.spec 
Log Message:
Add changelog for new changes


Index: pygame.spec
===================================================================
RCS file: /cvs/extras/rpms/pygame/devel/pygame.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pygame.spec	21 Apr 2006 17:05:44 -0000	1.2
+++ pygame.spec	21 Apr 2006 17:09:31 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           pygame
 Version:        1.7.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python modules for writing games
 Group:          Development/Languages
 License:        LGPL
@@ -77,6 +77,11 @@
 %{_includedir}/python*/%{name}/*.h
 
 %changelog
+* Fri Apr 21 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-3
+- Obsolete linva python-pygame package
+- Added Provides for python-pygame
+- Fix equal sign in devel requires
+
 * Thu Apr 20 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-2
 - Added a patch to clean up some warnings on 64 bit compiles
 



From fedora-extras-commits at redhat.com  Fri Apr 21 17:09:30 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Fri, 21 Apr 2006 10:09:30 -0700
Subject: rpms/pygame/FC-5 pygame.spec,1.2,1.3
Message-ID: <200604211709.k3LH9W1a001394@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1344/pygame/FC-5

Modified Files:
	pygame.spec 
Log Message:
Add changelog for new changes


Index: pygame.spec
===================================================================
RCS file: /cvs/extras/rpms/pygame/FC-5/pygame.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- pygame.spec	21 Apr 2006 17:05:44 -0000	1.2
+++ pygame.spec	21 Apr 2006 17:09:30 -0000	1.3
@@ -2,7 +2,7 @@
 
 Name:           pygame
 Version:        1.7.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Python modules for writing games
 Group:          Development/Languages
 License:        LGPL
@@ -77,6 +77,11 @@
 %{_includedir}/python*/%{name}/*.h
 
 %changelog
+* Fri Apr 21 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-3
+- Obsolete linva python-pygame package
+- Added Provides for python-pygame
+- Fix equal sign in devel requires
+
 * Thu Apr 20 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-2
 - Added a patch to clean up some warnings on 64 bit compiles
 



From fedora-extras-commits at redhat.com  Fri Apr 21 17:10:12 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Fri, 21 Apr 2006 10:10:12 -0700
Subject: rpms/octave/FC-5 octave-2.9.5-sparse.patch, 1.1, 1.2 octave.spec,
	1.34, 1.35
Message-ID: <200604211710.k3LHAEn0001445@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/octave/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1423

Modified Files:
	octave-2.9.5-sparse.patch octave.spec 
Log Message:
Use updated sparse patch from development tree.

octave-2.9.5-sparse.patch:

Index: octave-2.9.5-sparse.patch
===================================================================
RCS file: /cvs/extras/rpms/octave/FC-5/octave-2.9.5-sparse.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- octave-2.9.5-sparse.patch	23 Mar 2006 22:43:54 -0000	1.1
+++ octave-2.9.5-sparse.patch	21 Apr 2006 17:10:12 -0000	1.2
@@ -2,60 +2,401 @@
 ===================================================================
 RCS file: /cvs/octave/liboctave/SparseCmplxQR.h,v
 retrieving revision 1.2
-diff -u -r1.2 SparseCmplxQR.h
---- liboctave/SparseCmplxQR.h   8 Mar 2006 20:17:38 -0000       1.2
-+++ liboctave/SparseCmplxQR.h   23 Mar 2006 17:56:07 -0000
+retrieving revision 1.3
+diff -u -r1.2 -r1.3
+--- liboctave/SparseCmplxQR.h	8 Mar 2006 20:17:38 -0000	1.2
++++ liboctave/SparseCmplxQR.h	23 Mar 2006 18:22:51 -0000	1.3
 @@ -137,6 +137,23 @@
  #endif
  };
-
+ 
 +
 +// Publish externally used friend functions.
 +
 +extern ComplexMatrix qrsolve (const SparseComplexMatrix &a, const Matrix &b,
-+                             octave_idx_type &info);
++			      octave_idx_type &info);
 +
-+extern SparseComplexMatrix qrsolve (const SparseComplexMatrix &a,
-+                                   const SparseMatrix &b,
-+                                   octave_idx_type &info);
-+
-+extern ComplexMatrix qrsolve (const SparseComplexMatrix &a,
-+                             const ComplexMatrix &b,
-+                             octave_idx_type &info);
-+
-+extern SparseComplexMatrix qrsolve (const SparseComplexMatrix &a,
-+                                   const SparseComplexMatrix &b,
-+                                   octave_idx_type &info);
++extern SparseComplexMatrix qrsolve (const SparseComplexMatrix &a, 
++				    const SparseMatrix &b,
++				    octave_idx_type &info);
++
++extern ComplexMatrix qrsolve (const SparseComplexMatrix &a, 
++			      const ComplexMatrix &b,
++			      octave_idx_type &info);
++
++extern SparseComplexMatrix qrsolve (const SparseComplexMatrix &a, 
++				    const SparseComplexMatrix &b,
++				    octave_idx_type &info);
  #endif
-
+ 
  /*
 Index: liboctave/SparseQR.h
 ===================================================================
 RCS file: /cvs/octave/liboctave/SparseQR.h,v
 retrieving revision 1.2
-diff -u -r1.2 SparseQR.h
---- liboctave/SparseQR.h        8 Mar 2006 20:17:38 -0000       1.2
-+++ liboctave/SparseQR.h        23 Mar 2006 17:56:07 -0000
+retrieving revision 1.3
+diff -u -r1.2 -r1.3
+--- liboctave/SparseQR.h	8 Mar 2006 20:17:38 -0000	1.2
++++ liboctave/SparseQR.h	23 Mar 2006 18:22:51 -0000	1.3
 @@ -133,6 +133,22 @@
  #endif
  };
-
+ 
 +
 +// Publish externally used friend functions.
 +
-+extern Matrix qrsolve (const SparseMatrix &a, const Matrix &b,
-+                      octave_idx_type &info);
++extern Matrix qrsolve (const SparseMatrix &a, const Matrix &b, 
++		       octave_idx_type &info);
 +
 +extern SparseMatrix qrsolve (const SparseMatrix &a, const SparseMatrix &b,
-+                            octave_idx_type &info);
++			     octave_idx_type &info);
 +
 +extern ComplexMatrix qrsolve (const SparseMatrix &a, const ComplexMatrix &b,
-+                             octave_idx_type &info);
++			      octave_idx_type &info);
 +
-+extern SparseComplexMatrix qrsolve (const SparseMatrix &a,
-+                                   const SparseComplexMatrix &b,
-+                                   octave_idx_type &info);
++extern SparseComplexMatrix qrsolve (const SparseMatrix &a, 
++				    const SparseComplexMatrix &b,
++				    octave_idx_type &info);
 +
  #endif
-
+ 
  /*
+Index: liboctave/CMatrix.cc
+===================================================================
+RCS file: /cvs/octave/liboctave/CMatrix.cc,v
+retrieving revision 1.114
+diff -u -r1.114 CMatrix.cc
+--- liboctave/CMatrix.cc	2 Mar 2006 03:40:00 -0000	1.114
++++ liboctave/CMatrix.cc	24 Mar 2006 18:53:58 -0000
+@@ -889,27 +889,6 @@
+   return retval;
+ }
+ 
+-ComplexRowVector
+-ComplexMatrix::row (char *s) const
+-{
+-  if (! s)
+-    {
+-      (*current_liboctave_error_handler) ("invalid row selection");
+-      return ComplexRowVector ();
+-    }
+-
+-  char c = *s;
+-  if (c == 'f' || c == 'F')
+-    return row (static_cast<octave_idx_type>(0));
+-  else if (c == 'l' || c == 'L')
+-    return row (rows () - 1);
+-  else
+-    {
+-      (*current_liboctave_error_handler) ("invalid row selection");
+-      return ComplexRowVector ();
+-    }
+-}
+-
+ ComplexColumnVector
+ ComplexMatrix::column (octave_idx_type i) const
+ {
+@@ -927,27 +906,6 @@
+   return retval;
+ }
+ 
+-ComplexColumnVector
+-ComplexMatrix::column (char *s) const
+-{
+-  if (! s)
+-    {
+-      (*current_liboctave_error_handler) ("invalid column selection");
+-      return ComplexColumnVector ();
+-    }
+-
+-  char c = *s;
+-  if (c == 'f' || c == 'F')
+-    return column (static_cast<octave_idx_type>(0));
+-  else if (c == 'l' || c == 'L')
+-    return column (cols () - 1);
+-  else
+-    {
+-      (*current_liboctave_error_handler) ("invalid column selection");
+-      return ComplexColumnVector ();
+-    }
+-}
+-
+ ComplexMatrix
+ ComplexMatrix::inverse (void) const
+ {
+Index: liboctave/CMatrix.h
+===================================================================
+RCS file: /cvs/octave/liboctave/CMatrix.h,v
+retrieving revision 1.55
+diff -u -r1.55 CMatrix.h
+--- liboctave/CMatrix.h	26 Oct 2005 15:24:08 -0000	1.55
++++ liboctave/CMatrix.h	24 Mar 2006 18:53:58 -0000
+@@ -130,10 +130,8 @@
+   // extract row or column i.
+ 
+   ComplexRowVector row (octave_idx_type i) const;
+-  ComplexRowVector row (char *s) const;
+ 
+   ComplexColumnVector column (octave_idx_type i) const;
+-  ComplexColumnVector column (char *s) const;
+ 
+   ComplexMatrix inverse (void) const;
+   ComplexMatrix inverse (octave_idx_type& info) const;
+Index: liboctave/dMatrix.cc
+===================================================================
+RCS file: /cvs/octave/liboctave/dMatrix.cc,v
+retrieving revision 1.120
+diff -u -r1.120 dMatrix.cc
+--- liboctave/dMatrix.cc	2 Mar 2006 03:40:01 -0000	1.120
++++ liboctave/dMatrix.cc	24 Mar 2006 18:53:59 -0000
+@@ -559,27 +559,6 @@
+   return retval;
+ }
+ 
+-RowVector
+-Matrix::row (char *s) const
+-{
+-  if (! s)
+-    {
+-      (*current_liboctave_error_handler) ("invalid row selection");
+-      return RowVector ();
+-    }
+-
+-  char c = *s;
+-  if (c == 'f' || c == 'F')
+-    return row ( static_cast<octave_idx_type>(0) );
+-  else if (c == 'l' || c == 'L')
+-    return row (rows () - 1);
+-  else
+-    {
+-      (*current_liboctave_error_handler) ("invalid row selection");
+-      return RowVector ();
+-    }
+-}
+-
+ ColumnVector
+ Matrix::column (octave_idx_type i) const
+ {
+@@ -597,27 +576,6 @@
+   return retval;
+ }
+ 
+-ColumnVector
+-Matrix::column (char *s) const
+-{
+-  if (! s)
+-    {
+-      (*current_liboctave_error_handler) ("invalid column selection");
+-      return ColumnVector ();
+-    }
+-
+-  char c = *s;
+-  if (c == 'f' || c == 'F')
+-    return column (static_cast<octave_idx_type> (0));
+-  else if (c == 'l' || c == 'L')
+-    return column (cols () - 1);
+-  else
+-    {
+-      (*current_liboctave_error_handler) ("invalid column selection");
+-      return ColumnVector ();
+-    }
+-}
+-
+ Matrix
+ Matrix::inverse (void) const
+ {
+Index: liboctave/dMatrix.h
+===================================================================
+RCS file: /cvs/octave/liboctave/dMatrix.h,v
+retrieving revision 1.61
+diff -u -r1.61 dMatrix.h
+--- liboctave/dMatrix.h	26 Oct 2005 15:24:08 -0000	1.61
++++ liboctave/dMatrix.h	24 Mar 2006 18:53:59 -0000
+@@ -102,10 +102,8 @@
+   // extract row or column i.
+ 
+   RowVector row (octave_idx_type i) const;
+-  RowVector row (char *s) const;
+ 
+   ColumnVector column (octave_idx_type i) const;
+-  ColumnVector column (char *s) const;
+ 
+   Matrix inverse (void) const;
+   Matrix inverse (octave_idx_type& info) const;
+Index: liboctave/dSparse.cc
+===================================================================
+RCS file: /cvs/octave/liboctave/dSparse.cc,v
+retrieving revision 1.21
+diff -u -r1.21 dSparse.cc
+--- liboctave/dSparse.cc	22 Mar 2006 22:58:12 -0000	1.21
++++ liboctave/dSparse.cc	24 Mar 2006 18:54:00 -0000
+@@ -4404,7 +4404,7 @@
+ 		      Array<double> z (3 * nr);
+ 		      double *pz = z.fortran_vec ();
+ 		      Array<octave_idx_type> iz (nr);
+-		      int *piz = iz.fortran_vec ();
++		      octave_idx_type *piz = iz.fortran_vec ();
+ 
+ 		      F77_XFCN (dpbcon, DGBCON, 
+ 		      	(F77_CONST_CHAR_ARG2 (&job, 1),
+@@ -4540,7 +4540,7 @@
+ 		      Array<double> z (3 * nr);
+ 		      double *pz = z.fortran_vec ();
+ 		      Array<octave_idx_type> iz (nr);
+-		      int *piz = iz.fortran_vec ();
++		      octave_idx_type *piz = iz.fortran_vec ();
+ 
+ 		      F77_XFCN (dgbcon, DGBCON, 
+ 		      	(F77_CONST_CHAR_ARG2 (&job, 1),
+@@ -4678,7 +4678,7 @@
+ 		      Array<double> z (3 * nr);
+ 		      double *pz = z.fortran_vec ();
+ 		      Array<octave_idx_type> iz (nr);
+-		      int *piz = iz.fortran_vec ();
++		      octave_idx_type *piz = iz.fortran_vec ();
+ 
+ 		      F77_XFCN (dpbcon, DGBCON, 
+ 		      	(F77_CONST_CHAR_ARG2 (&job, 1),
+@@ -4851,7 +4851,7 @@
+ 		      Array<double> z (3 * nr);
+ 		      double *pz = z.fortran_vec ();
+ 		      Array<octave_idx_type> iz (nr);
+-		      int *piz = iz.fortran_vec ();
++		      octave_idx_type *piz = iz.fortran_vec ();
+ 
+ 		      F77_XFCN (dgbcon, DGBCON, 
+ 		      	(F77_CONST_CHAR_ARG2 (&job, 1),
+@@ -5031,7 +5031,7 @@
+ 		      Array<double> z (3 * nr);
+ 		      double *pz = z.fortran_vec ();
+ 		      Array<octave_idx_type> iz (nr);
+-		      int *piz = iz.fortran_vec ();
++		      octave_idx_type *piz = iz.fortran_vec ();
+ 
+ 		      F77_XFCN (dpbcon, DGBCON, 
+ 		      	(F77_CONST_CHAR_ARG2 (&job, 1),
+@@ -5208,7 +5208,7 @@
+ 		      Array<double> z (3 * nr);
+ 		      double *pz = z.fortran_vec ();
+ 		      Array<octave_idx_type> iz (nr);
+-		      int *piz = iz.fortran_vec ();
++		      octave_idx_type *piz = iz.fortran_vec ();
+ 
+ 		      F77_XFCN (dpbcon, DGBCON, 
+ 		      	(F77_CONST_CHAR_ARG2 (&job, 1),
+@@ -5379,7 +5379,7 @@
+ 		      Array<double> z (3 * nr);
+ 		      double *pz = z.fortran_vec ();
+ 		      Array<octave_idx_type> iz (nr);
+-		      int *piz = iz.fortran_vec ();
++		      octave_idx_type *piz = iz.fortran_vec ();
+ 
+ 		      F77_XFCN (dpbcon, DGBCON, 
+ 		      	(F77_CONST_CHAR_ARG2 (&job, 1),
+@@ -5586,7 +5586,7 @@
+ 		      Array<double> z (3 * nr);
+ 		      double *pz = z.fortran_vec ();
+ 		      Array<octave_idx_type> iz (nr);
+-		      int *piz = iz.fortran_vec ();
++		      octave_idx_type *piz = iz.fortran_vec ();
+ 
+ 		      F77_XFCN (dgbcon, DGBCON, 
+ 		      	(F77_CONST_CHAR_ARG2 (&job, 1),
+Index: src/ov-cell.cc
+===================================================================
+RCS file: /cvs/octave/src/ov-cell.cc,v
+retrieving revision 1.58
+diff -u -r1.58 ov-cell.cc
+--- src/ov-cell.cc	24 Mar 2006 16:42:44 -0000	1.58
++++ src/ov-cell.cc	24 Mar 2006 19:14:32 -0000
+@@ -783,10 +783,12 @@
+   
+   for (octave_idx_type i = 0; i < dv.numel (); i++)
+     {
+-      char s[20];
+-      sprintf (s, "_%d", i);
++      OSSTREAM buf;
++      buf << "_" << i << OSSTREAM_ENDS;
++      std::string s = OSSTREAM_STR (buf);
++      OSSTREAM_FREEZE (buf);
+ 
+-      if (! add_hdf5_data(data_hid, tmp.elem (i), s, "", false,
++      if (! add_hdf5_data(data_hid, tmp.elem (i), s.c_str (), "", false,
+ 			  save_as_floats))
+ 	{
+ 	  H5Gclose (data_hid);
+Index: src/ov-list.cc
+===================================================================
+RCS file: /cvs/octave/src/ov-list.cc,v
+retrieving revision 1.44
+diff -u -r1.44 ov-list.cc
+--- src/ov-list.cc	26 Apr 2005 19:24:33 -0000	1.44
++++ src/ov-list.cc	24 Mar 2006 19:14:32 -0000
+@@ -536,9 +536,13 @@
+   for (int i = 0; i < lst.length (); ++i)
+     {
+       // should we use lst.name_tags () to label the elements?
+-      char s[20];
+-      sprintf (s, "_%d", i);
+-      bool b = save_ascii_data (os, lst (i), s, infnan_warned, 
++
++      OSSTREAM buf;
++      buf << "_" << i << OSSTREAM_ENDS;
++      std::string s = OSSTREAM_STR (buf);
++      OSSTREAM_FREEZE (buf);
++
++      bool b = save_ascii_data (os, lst (i), s.c_str (), infnan_warned, 
+ 				strip_nan_and_inf, 0, 0);
+       
+       if (! b)
+@@ -607,11 +611,15 @@
+   for (int i = 0; i < lst.length (); i++)
+     {
+       // should we use lst.name_tags () to label the elements?
+-      char s[20];
+-      sprintf (s, "_%d", i);
++
++      OSSTREAM buf;
++      buf << "_" << i << OSSTREAM_ENDS;
++      std::string s = OSSTREAM_STR (buf);
++      OSSTREAM_FREEZE (buf);
+ 
+       // Recurse to print sub-value.
+-      bool b = save_binary_data (os, lst(i), s, "", 0, save_as_floats);
++      bool b = save_binary_data (os, lst(i), s.c_str (), "", 0,
++				 save_as_floats);
+ 	      
+       if (! b)
+ 	return false;
+@@ -683,9 +691,13 @@
+   for (octave_idx_type i = 0; i < lst.length (); ++i)
+     {
+       // should we use lst.name_tags () to label the elements?
+-      char s[20];
+-      sprintf (s, "_%d", i);
+-      bool retval2 = add_hdf5_data (data_hid, lst (i), s, "",
++
++      OSSTREAM buf;
++      buf << "_" << i << OSSTREAM_ENDS;
++      std::string s = OSSTREAM_STR (buf);
++      OSSTREAM_FREEZE (buf);
++
++      bool retval2 = add_hdf5_data (data_hid, lst (i), s.c_str (), "",
+ 				    false, save_as_floats);
+       if (! retval2)
+ 	break;
+Index: src/DLD-FUNCTIONS/spchol.cc
+===================================================================
+RCS file: /cvs/octave/src/DLD-FUNCTIONS/spchol.cc,v
+retrieving revision 1.7
+diff -u -r1.7 spchol.cc
+--- src/DLD-FUNCTIONS/spchol.cc	22 Mar 2006 22:58:12 -0000	1.7
++++ src/DLD-FUNCTIONS/spchol.cc	24 Mar 2006 19:55:38 -0000
+@@ -607,7 +607,7 @@
+ 	  for (octave_idx_type k = 0 ; k < n ; k++)
+ 	    {
+ 	      // get the kth row of L and store in the columns of L
+-	      cholmod_row_subtree (A1, A2, k, Parent, R, cm) ;
++	      CHOLMOD_NAME (row_subtree) (A1, A2, k, Parent, R, cm) ;
+ 	      for (octave_idx_type p = 0 ; p < Rp [1] ; p++)
+ 		L.xridx (W [Ri [p]]++) = k ;


Index: octave.spec
===================================================================
RCS file: /cvs/extras/rpms/octave/FC-5/octave.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- octave.spec	20 Apr 2006 13:37:44 -0000	1.34
+++ octave.spec	21 Apr 2006 17:10:12 -0000	1.35
@@ -1,6 +1,6 @@
 Name:           octave
 Version:        2.9.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A high-level language for numerical computations
 Epoch:          6
 
@@ -135,6 +135,9 @@
 
 
 %changelog
+* Fri Apr 21 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.5-2
+- Use updated sparse patch from development tree.
+
 * Thu Apr 20 2006 Quentin Spencer <qspencer at users.sourceforge.net> 2.9.5-1
 - New upstream release; remove old patches; add sparse patch.
 - Add patch for configure script.



From fedora-extras-commits at redhat.com  Fri Apr 21 17:21:02 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Fri, 21 Apr 2006 10:21:02 -0700
Subject: rpms/torque/FC-5 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 torque.spec,
	1.2, 1.3
Message-ID: <200604211721.k3LHL4K3001878@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1857

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Fri Apr 21 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.10.200604211036cvs
- bump



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Apr 2006 02:10:40 -0000	1.2
+++ .cvsignore	21 Apr 2006 17:21:01 -0000	1.3
@@ -1 +1 @@
-torque-2.1.0p0-snap.200604171430.tar.gz
+torque-2.1.0p0-snap.200604211036.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Apr 2006 02:10:40 -0000	1.2
+++ sources	21 Apr 2006 17:21:01 -0000	1.3
@@ -1 +1 @@
-00ae6cf8f95960c83022ff9037dc1d57  torque-2.1.0p0-snap.200604171430.tar.gz
+3b40c0d81a06ef4abe14c3bb7522086d  torque-2.1.0p0-snap.200604211036.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-5/torque.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- torque.spec	21 Apr 2006 07:05:50 -0000	1.2
+++ torque.spec	21 Apr 2006 17:21:01 -0000	1.3
@@ -2,8 +2,8 @@
 # comment out snap if building a real release
 %define name torque
 %define version 2.1.0p0
-%define snap 200604171430
-%define release 8
+%define snap 200604211036
+%define release 10
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -91,7 +91,6 @@
 Source4: xpbs.png
 Source5: xpbsmon.png
 Patch1: torque-2.1.0-remove-rpath.path
-Patch2: torque-2.1.0p0-sched-offbyone.patch
 License: Freely redistributable (See PBS_License.txt)
 Group: System Environment/Daemons
 URL: http://www.clusterresources.com/products/torque/
@@ -120,7 +119,6 @@
 %prep
 %setup -q -n torque-%{version}%{?snap:-snap.%snap}
 %patch1 -p1
-%patch2 -p1
 
 %__cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} .
 
@@ -425,6 +423,12 @@
 
 
 %changelog
+* Fri Apr 21 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.10.200604211036cvs
+- bump
+
+* Fri Apr 21 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.9.200604171430cvs
+- fix qsub write return check
+
 * Thu Apr 20 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.8.200604171430cvs
 - fix pbs_sched error opening lockfile and immediately exiting
 



From fedora-extras-commits at redhat.com  Fri Apr 21 17:21:26 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Fri, 21 Apr 2006 10:21:26 -0700
Subject: rpms/torque/FC-4 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 torque.spec,
	1.2, 1.3
Message-ID: <200604211721.k3LHLSUC001944@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1923

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Fri Apr 21 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.10.200604211036cvs
- bump



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Apr 2006 02:10:40 -0000	1.2
+++ .cvsignore	21 Apr 2006 17:21:26 -0000	1.3
@@ -1 +1 @@
-torque-2.1.0p0-snap.200604171430.tar.gz
+torque-2.1.0p0-snap.200604211036.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Apr 2006 02:10:40 -0000	1.2
+++ sources	21 Apr 2006 17:21:26 -0000	1.3
@@ -1 +1 @@
-00ae6cf8f95960c83022ff9037dc1d57  torque-2.1.0p0-snap.200604171430.tar.gz
+3b40c0d81a06ef4abe14c3bb7522086d  torque-2.1.0p0-snap.200604211036.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-4/torque.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- torque.spec	21 Apr 2006 07:06:22 -0000	1.2
+++ torque.spec	21 Apr 2006 17:21:26 -0000	1.3
@@ -2,8 +2,8 @@
 # comment out snap if building a real release
 %define name torque
 %define version 2.1.0p0
-%define snap 200604171430
-%define release 8
+%define snap 200604211036
+%define release 10
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -91,7 +91,6 @@
 Source4: xpbs.png
 Source5: xpbsmon.png
 Patch1: torque-2.1.0-remove-rpath.path
-Patch2: torque-2.1.0p0-sched-offbyone.patch
 License: Freely redistributable (See PBS_License.txt)
 Group: System Environment/Daemons
 URL: http://www.clusterresources.com/products/torque/
@@ -120,7 +119,6 @@
 %prep
 %setup -q -n torque-%{version}%{?snap:-snap.%snap}
 %patch1 -p1
-%patch2 -p1
 
 %__cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} .
 
@@ -425,6 +423,12 @@
 
 
 %changelog
+* Fri Apr 21 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.10.200604211036cvs
+- bump
+
+* Fri Apr 21 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.9.200604171430cvs
+- fix qsub write return check
+
 * Thu Apr 20 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.8.200604171430cvs
 - fix pbs_sched error opening lockfile and immediately exiting
 



From fedora-extras-commits at redhat.com  Fri Apr 21 17:21:45 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Fri, 21 Apr 2006 10:21:45 -0700
Subject: rpms/torque/FC-3 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 torque.spec,
	1.2, 1.3
Message-ID: <200604211721.k3LHLlRo002009@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1988

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Fri Apr 21 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.10.200604211036cvs
- bump



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	18 Apr 2006 02:10:40 -0000	1.2
+++ .cvsignore	21 Apr 2006 17:21:45 -0000	1.3
@@ -1 +1 @@
-torque-2.1.0p0-snap.200604171430.tar.gz
+torque-2.1.0p0-snap.200604211036.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	18 Apr 2006 02:10:40 -0000	1.2
+++ sources	21 Apr 2006 17:21:45 -0000	1.3
@@ -1 +1 @@
-00ae6cf8f95960c83022ff9037dc1d57  torque-2.1.0p0-snap.200604171430.tar.gz
+3b40c0d81a06ef4abe14c3bb7522086d  torque-2.1.0p0-snap.200604211036.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-3/torque.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- torque.spec	21 Apr 2006 07:06:35 -0000	1.2
+++ torque.spec	21 Apr 2006 17:21:45 -0000	1.3
@@ -2,8 +2,8 @@
 # comment out snap if building a real release
 %define name torque
 %define version 2.1.0p0
-%define snap 200604171430
-%define release 8
+%define snap 200604211036
+%define release 10
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -91,7 +91,6 @@
 Source4: xpbs.png
 Source5: xpbsmon.png
 Patch1: torque-2.1.0-remove-rpath.path
-Patch2: torque-2.1.0p0-sched-offbyone.patch
 License: Freely redistributable (See PBS_License.txt)
 Group: System Environment/Daemons
 URL: http://www.clusterresources.com/products/torque/
@@ -120,7 +119,6 @@
 %prep
 %setup -q -n torque-%{version}%{?snap:-snap.%snap}
 %patch1 -p1
-%patch2 -p1
 
 %__cp -p %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} .
 
@@ -425,6 +423,12 @@
 
 
 %changelog
+* Fri Apr 21 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.10.200604211036cvs
+- bump
+
+* Fri Apr 21 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.9.200604171430cvs
+- fix qsub write return check
+
 * Thu Apr 20 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.8.200604171430cvs
 - fix pbs_sched error opening lockfile and immediately exiting
 



From fedora-extras-commits at redhat.com  Fri Apr 21 17:48:57 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Fri, 21 Apr 2006 10:48:57 -0700
Subject: rpms/wifiroamd import.log,1.1,1.2
Message-ID: <200604211748.k3LHmxdQ002266@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/wifiroamd
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2233

Modified Files:
	import.log 
Log Message:
auto-import wifiroamd-1.05-1 on branch devel from wifiroamd-1.05-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/wifiroamd/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Apr 2006 16:33:14 -0000	1.1
+++ import.log	21 Apr 2006 17:48:57 -0000	1.2
@@ -0,0 +1 @@
+wifiroamd-1_05-1:HEAD:wifiroamd-1.05-1.src.rpm:1145641734



From fedora-extras-commits at redhat.com  Fri Apr 21 17:48:58 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Fri, 21 Apr 2006 10:48:58 -0700
Subject: rpms/wifiroamd/devel wifiroamd.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604211749.k3LHn0bL002271@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/wifiroamd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2233/devel

Modified Files:
	.cvsignore sources 
Added Files:
	wifiroamd.spec 
Log Message:
auto-import wifiroamd-1.05-1 on branch devel from wifiroamd-1.05-1.src.rpm


--- NEW FILE wifiroamd.spec ---
Name:           wifiroamd
Version:        1.05
Release:        1%{?dist}
Summary:        Automatic WiFi connection (re)establishment daemon

Group:          System Environment/Base
License:        GPL
URL:            http://www.tummy.com/Community/software/wifiroamd/
Source0:        ftp://ftp.tummy.com/pub/tummy/wifiroamd/wifiroamd-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  python-devel
Requires:       dhclient
Requires:       wireless-tools
Requires:       fping

%description
WiFiRoamd is a program that monitors your wireless device to keep it
connected to a good access point.  It will scan looking for a known AP, or
will try the AP with the strongest un-encrypted signal.  If a script is
found for the specific AP ESSID or MAC address is found, that script is
run.  Otherwise, a "default" script is run.

After that script is run, scripts in the "up.d" directory are run.  These
implement extra functionality such as DHCP, ESSID "pinning" (where it
explicitly does "iwconfig $DEVICE essid $ESSID", so that you don't
accidentally wander to another AP) and other local things such as
restarting OpenVPN, etc.

%prep
%setup -q

%install
rm -rf $RPM_BUILD_ROOT
%{__mkdir} -p $RPM_BUILD_ROOT/etc/wifiroamd/scripts/
%{__cp} -a scripts/* $RPM_BUILD_ROOT/etc/wifiroamd/scripts

%{__mkdir} -p $RPM_BUILD_ROOT/etc/wifiroamd/connections/
%{__cp} -a connections/* $RPM_BUILD_ROOT/etc/wifiroamd/connections

%{__cp} config-defaults $RPM_BUILD_ROOT/etc/wifiroamd/config-defaults
%{__cp} config $RPM_BUILD_ROOT/etc/wifiroamd/config

%{__mkdir} -p $RPM_BUILD_ROOT/sbin
%{__cp} -a wifiroamd $RPM_BUILD_ROOT/sbin/wifiroamd

%{__mkdir} -p $RPM_BUILD_ROOT/etc/init.d
%{__cp} wifiroamd.init $RPM_BUILD_ROOT/etc/init.d/wifiroamd

%{__mkdir} -p $RPM_BUILD_ROOT/var/lib/wifiroamd/dhclient-leases

%{__mkdir} -p $RPM_BUILD_ROOT/etc/cron.daily
%{__cp} wifiroamd.daily $RPM_BUILD_ROOT/etc/cron.daily/wifiroamd

%{__mkdir} -p $RPM_BUILD_ROOT/etc/wifiroamd/seen

%{__mkdir} -p $RPM_BUILD_ROOT/usr/share/man/man8
%{__cp} wifiroamd.8 $RPM_BUILD_ROOT/usr/share/man/man8

%clean
rm -rf $RPM_BUILD_ROOT

%post
if [ $1 -eq 1 ]
then
   chkconfig --add wifiroamd
fi

%preun
if [ $1 -eq 0 ]
then
   chkconfig --del wifiroamd
fi

%files
%defattr(-,root,root,-)
%doc README TODO WHATSNEW
%attr(755,root,root) /sbin/wifiroamd
%attr(755,root,root) /etc/init.d/wifiroamd
%dir /etc/wifiroamd
%dir /etc/wifiroamd/scripts
%dir /etc/wifiroamd/scripts/monitor_pinggw.d
%dir /etc/wifiroamd/scripts/down.d
%dir /etc/wifiroamd/scripts/reset.d
%dir /etc/wifiroamd/scripts/up.d
%dir /etc/wifiroamd/connections
%dir /etc/wifiroamd/connections/default.d
%dir /etc/wifiroamd/connections/nowireless.d
%dir /etc/wifiroamd/seen
#  config-default should not be user-modified.
%config /etc/wifiroamd/config-defaults
%attr(755,root,root) /etc/wifiroamd/scripts/monitor_pinggw.d/*
%attr(755,root,root) /etc/wifiroamd/scripts/reset.d/*
%attr(755,root,root) /etc/wifiroamd/scripts/up.d/*
%attr(755,root,root) /etc/wifiroamd/scripts/down.d/*
/usr/share/man/man8/*
%config(noreplace) /etc/wifiroamd/config
%dir /var/lib/wifiroamd
%dir /var/lib/wifiroamd/dhclient-leases
%attr(755,root,root) /etc/cron.daily/wifiroamd
%doc examples
%doc debian/copyright

%changelog
* Sun Mar 12 2006 Sean Reifschneider <jafo at tummy.com> - 1.05-1
- Release of 1.05.

* Sun Jan 15 2006 Kevin Fenzi <kevin at tummy.com> - 0.04-1
- Inital rpm spec


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wifiroamd/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2006 16:33:15 -0000	1.1
+++ .cvsignore	21 Apr 2006 17:48:58 -0000	1.2
@@ -0,0 +1 @@
+wifiroamd-1.05.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wifiroamd/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2006 16:33:15 -0000	1.1
+++ sources	21 Apr 2006 17:48:58 -0000	1.2
@@ -0,0 +1 @@
+697166fe19c150ae312276ff0eb0fe40  wifiroamd-1.05.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 18:20:37 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Fri, 21 Apr 2006 11:20:37 -0700
Subject: owners owners.list,1.866,1.867
Message-ID: <200604211820.k3LIKd5L005484@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5467/owners

Modified Files:
	owners.list 
Log Message:
add wifiroamd



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.866
retrieving revision 1.867
diff -u -r1.866 -r1.867
--- owners.list	21 Apr 2006 08:29:55 -0000	1.866
+++ owners.list	21 Apr 2006 18:20:37 -0000	1.867
@@ -1529,6 +1529,7 @@
 Fedora Extras|webmin|A web-based administration interface for Unix systems.|jvdias at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|wesnoth|Battle for Wesnoth is a fantasy turn-based strategy game|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|whowatch|Displays informations about the users currently logged in|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|wifiroamd|Automatic WiFi connection (re)establishment daemon|ed at eh3.com|extras-qa at fedoraproject.org|
 Fedora Extras|WindowMaker|A fast, feature rich Window manager|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wine|A Windows 16/32/64 bit emulator|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wine-docs|Documentation for wine|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Apr 21 18:29:35 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 21 Apr 2006 11:29:35 -0700
Subject: rpms/hugs98/FC-5 hugs98.spec,1.1,1.2
Message-ID: <200604211829.k3LITbbP005646@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/hugs98/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5629

Modified Files:
	hugs98.spec 
Log Message:



Index: hugs98.spec
===================================================================
RCS file: /cvs/extras/rpms/hugs98/FC-5/hugs98.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hugs98.spec	21 Apr 2006 08:25:46 -0000	1.1
+++ hugs98.spec	21 Apr 2006 18:29:35 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:		hugs98
 Version:	2005.03
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Haskell Interpreter
 
 Group:		Development/Languages



From fedora-extras-commits at redhat.com  Fri Apr 21 18:33:41 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 21 Apr 2006 11:33:41 -0700
Subject: comps comps-fe5.xml.in,1.38,1.39 comps-fe6.xml.in,1.1,1.2
Message-ID: <200604211833.k3LIXhf3005786@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5767

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in 
Log Message:
added hugs98


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- comps-fe5.xml.in	17 Apr 2006 17:48:37 -0000	1.38
+++ comps-fe5.xml.in	21 Apr 2006 18:33:41 -0000	1.39
@@ -42,6 +42,7 @@
         <packagereq type="optional">ghc</packagereq>
         <packagereq type="optional">git</packagereq>
         <packagereq type="optional">highlight</packagereq>
+        <packagereq type="optional">hugs98</packagereq>	
         <packagereq type="optional">lincvs</packagereq>
         <packagereq type="optional">lua</packagereq>
         <packagereq type="optional">mach</packagereq>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- comps-fe6.xml.in	17 Apr 2006 17:49:10 -0000	1.1
+++ comps-fe6.xml.in	21 Apr 2006 18:33:41 -0000	1.2
@@ -42,6 +42,7 @@
         <packagereq type="optional">ghc</packagereq>
         <packagereq type="optional">git</packagereq>
         <packagereq type="optional">highlight</packagereq>
+        <packagereq type="optional">hugs98</packagereq>	
         <packagereq type="optional">lincvs</packagereq>
         <packagereq type="optional">lua</packagereq>
         <packagereq type="optional">mach</packagereq>



From fedora-extras-commits at redhat.com  Fri Apr 21 19:02:55 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 12:02:55 -0700
Subject: rpms/perl-IO-Interface - New directory
Message-ID: <200604211902.k3LJ2vZw007924@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-IO-Interface
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7912/perl-IO-Interface

Log Message:
Directory /cvs/extras/rpms/perl-IO-Interface added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 19:02:58 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 12:02:58 -0700
Subject: rpms/perl-IO-Interface/devel - New directory
Message-ID: <200604211903.k3LJ306A007941@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-IO-Interface/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7912/perl-IO-Interface/devel

Log Message:
Directory /cvs/extras/rpms/perl-IO-Interface/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 19:03:21 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 12:03:21 -0700
Subject: rpms/perl-IO-Interface/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200604211903.k3LJ3Njn008027@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-IO-Interface/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7984/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-IO-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  Fri Apr 21 19:03:21 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 12:03:21 -0700
Subject: rpms/perl-IO-Interface Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604211903.k3LJ3NGR008024@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-IO-Interface
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7984

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-IO-Interface


--- NEW FILE Makefile ---
# Top level Makefile for module perl-IO-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  Fri Apr 21 19:03:49 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 12:03:49 -0700
Subject: rpms/perl-IO-Interface import.log,1.1,1.2
Message-ID: <200604211903.k3LJ3pLS008088@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-IO-Interface
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8055

Modified Files:
	import.log 
Log Message:
auto-import perl-IO-Interface-0.98-1 on branch devel from perl-IO-Interface-0.98-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-Interface/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Apr 2006 19:03:20 -0000	1.1
+++ import.log	21 Apr 2006 19:03:49 -0000	1.2
@@ -0,0 +1 @@
+perl-IO-Interface-0_98-1:HEAD:perl-IO-Interface-0.98-1.src.rpm:1145646221



From fedora-extras-commits at redhat.com  Fri Apr 21 19:03:50 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 12:03:50 -0700
Subject: rpms/perl-IO-Interface/devel perl-IO-Interface.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604211903.k3LJ3qNW008093@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-IO-Interface/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8055/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-IO-Interface.spec 
Log Message:
auto-import perl-IO-Interface-0.98-1 on branch devel from perl-IO-Interface-0.98-1.src.rpm


--- NEW FILE perl-IO-Interface.spec ---
Name:           perl-IO-Interface
Version:        0.98
Release:        1%{?dist}
Summary:        Perl extension for accessing network card configuration information

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/IO-Interface/
Source0:        http://www.cpan.org/authors/id/L/LD/LDS/IO-Interface-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  perl
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
IO::Interface adds methods to IO::Socket objects that allows them to
be used to retrieve and change information about the network
interfaces on your system.  In addition to the object-oriented access
methods, you can use a function-oriented style.


%prep
%setup -q -n IO-Interface-%{version}


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorarch}/IO/
%{perl_vendorarch}/auto/IO/
%{_mandir}/man3/*.3*


%changelog
* Mon Jan 30 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.98-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-Interface/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2006 19:03:21 -0000	1.1
+++ .cvsignore	21 Apr 2006 19:03:50 -0000	1.2
@@ -0,0 +1 @@
+IO-Interface-0.98.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-IO-Interface/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2006 19:03:21 -0000	1.1
+++ sources	21 Apr 2006 19:03:50 -0000	1.2
@@ -0,0 +1 @@
+91d5029a32302aa02414c9c8e3353cec  IO-Interface-0.98.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 19:05:22 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 12:05:22 -0700
Subject: rpms/perl-GSSAPI - New directory
Message-ID: <200604211905.k3LJ5OIx008195@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-GSSAPI
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8174/perl-GSSAPI

Log Message:
Directory /cvs/extras/rpms/perl-GSSAPI added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 19:05:22 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 12:05:22 -0700
Subject: rpms/perl-GSSAPI/devel - New directory
Message-ID: <200604211905.k3LJ5OdI008198@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-GSSAPI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8174/perl-GSSAPI/devel

Log Message:
Directory /cvs/extras/rpms/perl-GSSAPI/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 19:05:43 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 12:05:43 -0700
Subject: rpms/perl-GSSAPI Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604211905.k3LJ5jpL008252@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-GSSAPI
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8219

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-GSSAPI


--- NEW FILE Makefile ---
# Top level Makefile for module perl-GSSAPI
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 21 19:05:44 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 12:05:44 -0700
Subject: rpms/perl-GSSAPI/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604211905.k3LJ5ku2008255@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-GSSAPI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8219/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-GSSAPI


--- 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 Apr 21 19:06:12 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 12:06:12 -0700
Subject: rpms/perl-GSSAPI import.log,1.1,1.2
Message-ID: <200604211906.k3LJ6EWs008317@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-GSSAPI
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8284

Modified Files:
	import.log 
Log Message:
auto-import perl-GSSAPI-0.21-1 on branch devel from perl-GSSAPI-0.21-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-GSSAPI/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Apr 2006 19:05:43 -0000	1.1
+++ import.log	21 Apr 2006 19:06:12 -0000	1.2
@@ -0,0 +1 @@
+perl-GSSAPI-0_21-1:HEAD:perl-GSSAPI-0.21-1.src.rpm:1145646364



From fedora-extras-commits at redhat.com  Fri Apr 21 19:06:13 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 12:06:13 -0700
Subject: rpms/perl-GSSAPI/devel perl-GSSAPI.spec, NONE, 1.1 .cvsignore, 1.1, 
	1.2 sources, 1.1, 1.2
Message-ID: <200604211906.k3LJ6FPk008322@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-GSSAPI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8284/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-GSSAPI.spec 
Log Message:
auto-import perl-GSSAPI-0.21-1 on branch devel from perl-GSSAPI-0.21-1.src.rpm


--- NEW FILE perl-GSSAPI.spec ---
#
# Rebuild option:
#
#   --with testsuite         - run the test suite
#

Name:           perl-GSSAPI
Version:        0.21
Release:        1%{?dist}
Summary:        Perl extension providing access to the GSSAPIv2 library

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/GSSAPI/
Source0:        http://www.cpan.org/authors/id/A/AG/AGROLMS/GSSAPI-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  perl
BuildRequires:  krb5-devel
BuildRequires:  perl(Test::Pod) >= 1.00
BuildRequires:  perl(Test::Pod::Coverage) >= 1.04
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module gives access to the routines of the GSSAPI library, as
described in rfc2743 and rfc2744 and implemented by the Kerberos-1.2
distribution from MIT.


%prep
%setup -q -n GSSAPI-%{version}
chmod a-x examples/*.pl


%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
# fails a couple of tests if network not available
%{?_with_testsuite:make test}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README examples/
%{perl_vendorarch}/GSSAPI*
%{perl_vendorarch}/auto/GSSAPI/
%{_mandir}/man3/*.3*


%changelog
* Thu Apr  6 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.21-1
- Update to 0.21.

* Fri Mar 31 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.20-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-GSSAPI/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2006 19:05:44 -0000	1.1
+++ .cvsignore	21 Apr 2006 19:06:13 -0000	1.2
@@ -0,0 +1 @@
+GSSAPI-0.21.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-GSSAPI/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2006 19:05:44 -0000	1.1
+++ sources	21 Apr 2006 19:06:13 -0000	1.2
@@ -0,0 +1 @@
+2779227c30afa412415680da54b98a10  GSSAPI-0.21.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 19:10:26 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 12:10:26 -0700
Subject: owners owners.list,1.867,1.868
Message-ID: <200604211910.k3LJASS5008399@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8378

Modified Files:
	owners.list 
Log Message:
New packages:
 - perl-IO-Interface: #187797
 - perl-GSSAPI: #187809



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.867
retrieving revision 1.868
diff -u -r1.867 -r1.868
--- owners.list	21 Apr 2006 18:20:37 -0000	1.867
+++ owners.list	21 Apr 2006 19:10:26 -0000	1.868
@@ -967,6 +967,7 @@
 Fedora Extras|perl-Glib|Perl interface to GLib|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gnome2-Canvas|Perl interface to Gnome Canvas|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|perl-GnuPG-Interface|Perl interface to GnuPG|Matt_Domsch at dell.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-GSSAPI|Perl extension providing access to the GSSAPIv2 library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gtk2|Perl interface to the 2.x series of the Gimp Toolkit library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gtk2-GladeXML|Perl interface to Gtk2 GladeXML|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|perl-Hook-LexWrap|Lexically scoped subroutine wrappers|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -991,6 +992,7 @@
 Fedora Extras|perl-Imager|A module for creating and altering images|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
 Fedora Extras|perl-IO-All|IO::All Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-CaptureOutput|Capture STDOUT/STDERR from subprocesses and XS/C modules|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-IO-Interface|Perl extension for accessing network card configuration information|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-Multiplex|Manage IO on many file handles|lmb at biosci.ki.se|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-Socket-SSL|Perl library for transparent SSL|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-IO-String|Emulate file interface for in-core strings|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Fri Apr 21 19:23:11 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Fri, 21 Apr 2006 12:23:11 -0700
Subject: rpms/argus/FC-4 argus-2.0.6.fixes.1-build.patch, 1.1,
	1.2 argus-2.0.6.fixes.1-makefile.patch, 1.1, 1.2 argus.spec, 1.2, 1.3
Message-ID: <200604211923.k3LJND9o008662@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/argus/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8635

Modified Files:
	argus-2.0.6.fixes.1-build.patch 
	argus-2.0.6.fixes.1-makefile.patch argus.spec 
Log Message:
daemon patches now eliminate unused common files: argus_parse.c, argus_util.c, and argus_auth.c


argus-2.0.6.fixes.1-build.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 argus-2.0.6.fixes.1-build.patch
Index: argus-2.0.6.fixes.1-build.patch
===================================================================
RCS file: /cvs/extras/rpms/argus/FC-4/argus-2.0.6.fixes.1-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- argus-2.0.6.fixes.1-build.patch	17 Mar 2006 19:32:36 -0000	1.1
+++ argus-2.0.6.fixes.1-build.patch	21 Apr 2006 19:23:11 -0000	1.2
@@ -1,55 +1,6649 @@
+diff -NarU5 argus-2.0.6.fixes.1.orig/common/argus_auth.c argus-2.0.6.fixes.1/common/argus_auth.c
+--- argus-2.0.6.fixes.1.orig/common/argus_auth.c	2004-02-23 10:00:36.000000000 -0500
++++ argus-2.0.6.fixes.1/common/argus_auth.c	1969-12-31 19:00:00.000000000 -0500
+@@ -1,569 +0,0 @@
+-/*
+- * Copyright (c) 2000-2004 QoSient, LLC
+- * All rights reserved.
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2, or (at your option)
+- * any later version.
+-
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+-
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+- *
+- */
+-
+-/*
+- * Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
+- *
+- * Redistribution and use in source and binary forms, with or without
+- * modification, are permitted provided that the following conditions
+- * are met:
+- *
+- * 1. Redistributions of source code must retain the above copyright
+- *    notice, this list of conditions and the following disclaimer.
+- *
+- * 2. Redistributions in binary form must reproduce the above copyright
+- *    notice, this list of conditions and the following disclaimer in
+- *    the documentation and/or other materials provided with the
+- *    distribution.
+- *
+- * 3. The name "Carnegie Mellon University" must not be used to
+- *    endorse or promote products derived from this software without
+- *    prior written permission. For permission or any other legal
+- *    details, please contact
+- *      Office of Technology Transfer
+- *      Carnegie Mellon University
+- *      5000 Forbes Avenue
+- *      Pittsburgh, PA  15213-3890
+- *      (412) 268-4387, fax: (412) 268-7395
+- *      tech-transfer at andrew.cmu.edu
+- *
+- * 4. Redistributions of any form whatsoever must retain the following
+- *    acknowledgment:
+- *    "This product includes software developed by Computing Services
+- *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+- *
+- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+- */
+-
+-/*
+- * Modified by Carter Bullard
+- * QoSient, LLC
+- *
+- */
+-
+-
+-#ifndef ArgusAuth
+-#define ArgusAuth
+-#endif
+-
+-#include <stdlib.h>
+-#include <unistd.h>
+-
+-#include <errno.h>
+-#include <string.h>
+-
+-#ifdef ARGUS_SASL
+-
+-#include <ctype.h>
+-#include <assert.h>
+-#include <sasl.h>
+-
+-#endif /* ARGUS_SASL */
+-
+-#include <netinet/in.h>
+-#include <pcap.h>
+-
+-#include <compat.h>
+-#include <interface.h>
+-
+-#include <argus_parse.h>
+-#include <argus_util.h>
+-#include <argus_out.h>
+-#include <argus_filter.h>
+-
+-
+-extern void ArgusLog (int, char *, ...);
+-
+-int ArgusInitializeAuthentication (struct ARGUS_INPUT *);
+-int ArgusAuthenticate (struct ARGUS_INPUT *);
+-
+-#ifdef ARGUS_SASL
+-
+-static int RaGetRealm(void *context, int, const char **, const char **);
+-static int RaSimple(void *context, int, const char **, unsigned *);
+-static int RaGetSecret(sasl_conn_t *, void *context, int, sasl_secret_t **);
+-
+-int RaSaslNegotiate(FILE *, FILE *, sasl_conn_t *);
+-int RaGetSaslString (FILE *, char *, int);
+-int RaSendSaslString (FILE *, const char *, int);
+-
+-/* RaCallBacks we support */
+-
+-static sasl_callback_t RaCallBacks[] = {
+-  { SASL_CB_GETREALM, &RaGetRealm,  NULL },
+-  { SASL_CB_USER,     &RaSimple,    NULL },
+-  { SASL_CB_AUTHNAME, &RaSimple,    NULL },
+-  { SASL_CB_PASS,     &RaGetSecret, NULL },
+-  { SASL_CB_LIST_END, NULL, NULL }
+-};
+-
+-char *RaSaslMech = NULL;
+-
+-#endif 
+-
+-
+-#if defined(HAVE_SOLARIS)
+-extern int getdomainname(char *name, size_t len);
+-#endif
+-
+-
+-int
+-ArgusInitializeAuthentication (struct ARGUS_INPUT *input)
+-{
+-   int retn = 1;
+-
+-#ifdef ARGUS_SASL
+-   struct sockaddr_in localaddr, remoteaddr;
+-   int salen, fd = input->fd;
+-   char *localhostname = NULL;
+-
+-   if ((retn = sasl_client_init(RaCallBacks)) != SASL_OK)
+-      ArgusLog (LOG_ERR, "ArgusInitializeAuthentication() sasl_client_init %d", retn);
+-
+-   localhostname = ArgusCalloc (1, 1024);
+-   gethostname(localhostname, 1024);
+-   if (!strchr (localhostname, '.')) {
+-      strcat (localhostname, ".");
+-      getdomainname (&localhostname[strlen(localhostname)], 1024 - strlen(localhostname));
+-   }
+-
+-   if ((retn = sasl_client_new("argus", localhostname, NULL, SASL_SECURITY_LAYER, &input->sasl_conn)) != SASL_OK)
+-      ArgusLog (LOG_ERR, "ArgusInitializeAuthentication() sasl_client_new %d", retn);
+-   
+-   /* set external properties here
+-   sasl_setprop(input->sasl_conn, SASL_SSF_EXTERNAL, &extprops); */
+-   
+-   /* set required security properties here
+-   sasl_setprop(input->sasl_conn, SASL_SEC_PROPS, &secprops); */
+-   
+-   /* set ip addresses */
+-   salen = sizeof(localaddr);
+-   if (getsockname(fd, (struct sockaddr *)&localaddr, &salen) < 0)
+-      perror("getsockname");
+-
+-   salen = sizeof(remoteaddr); 
+-   if (getpeername(fd, (struct sockaddr *)&remoteaddr, &salen) < 0)
+-      perror("getpeername");
+-
+-   if ((retn = sasl_setprop(input->sasl_conn, SASL_IP_LOCAL, &localaddr)) != SASL_OK)
+-      ArgusLog (LOG_ERR, "ArgusInitializeAuthentication() error setting localaddr %d", retn);
+-
+-   if ((retn = sasl_setprop(input->sasl_conn, SASL_IP_REMOTE, &remoteaddr)) != SASL_OK)
+-      ArgusLog (LOG_ERR, "ArgusInitializeAuthentication() error setting remoteaddr %d", retn);
+-
+-   retn = 1;
+-#endif 
+-
+-#ifdef ARGUSDEBUG
+-   ArgusDebug (2, "ArgusInitializeAuthentication () returning %d\n", retn);
+-#endif 
+-
+-   return (retn);
+-}
+-
+-
[...6308 lines suppressed...]
+-   bzero (indStr, 16);
+-   bzero (date, 128);
+-
+-   flow = &argus->argus_far.flow;
+-
+-   sprintf (srcString, "%17.17s", etheraddr_string((unsigned char *)&flow->mac_flow.ehdr.ether_shost));
+-   sprintf (dstString, "%17.17s", etheraddr_string((unsigned char *)&flow->mac_flow.ehdr.ether_dhost));
+-
+-   src_count = argus->argus_far.src.count;
+-   dst_count = argus->argus_far.dst.count;
+-
+-   if (Aflag) {
+-      src_bytes = argus->argus_far.src.appbytes;
+-      dst_bytes = argus->argus_far.dst.appbytes;
+-   } else {
+-      src_bytes = argus->argus_far.src.bytes;
+-      dst_bytes = argus->argus_far.dst.bytes;
+-   }
+-
+-   print_date (argus, date);
+-
+-   if (idflag) {
+-      if (ArgusInput->ArgusManStart.ahdr.status & ARGUS_ID_IS_IPADDR)
+-         argusIDStr = strdup (ipaddr_string (&argus->ahdr.argusid));
+-      else
+-         sprintf (argusIDStr, "%u", argus->ahdr.argusid);
+-
+-      sprintf(argus_strbuf, "%-15.15s ", argusIDStr);
+-   }
+-
+-   if (mflag) {
+-      if (ArgusThisFarStatus & ARGUS_MAC_DSR_STATUS) {
+-         struct ArgusMacStruct *mac = (struct ArgusMacStruct *) ArgusThisFarHdrs[ARGUS_MAC_DSR_INDEX];
+-
+-         esrcString = etheraddr_string ((u_char *)&mac->phys_union.ether.ethersrc);
+-         edstString = etheraddr_string ((u_char *)&mac->phys_union.ether.etherdst);
+-
+-         sprintf (srcString, "%17.17s %17.17s   %*.*s",
+-                      esrcString, edstString, hfield + 2, hfield + 2,
+-                      etheraddr_string((unsigned char *)&flow->mac_flow.ehdr.ether_shost));
+-      } else
+-         sprintf (srcString, "%17.17s %17.17s    %*.*s",
+-                      blankStr, blankStr, hfield + 2, hfield + 2, 
+-                      etheraddr_string((unsigned char *)&flow->mac_flow.ehdr.ether_shost));
+-   }
+-
+-   if (Iflag)
+-      strcpy (fmtstr, "%s%s%4s %s -   %22.22s ");
+-   else
+-      strcpy (fmtstr, "%s  %4s %s -   %22.22s ");
+-
+-   if (cflag)
+-      strcat (fmtstr, "%-8u %-8u  %-12u %-12u");
+-
+-   if ((argus->ahdr.cause & ARGUS_TIMEOUT))
+-      strcat (fmtstr, "TIM");
+-   else
+-      if (argus->argus_far.src.count && argus->argus_far.dst.count) {
+-         if ((argus->argus_far.src.count == 1) && (argus->argus_far.dst.count == 1))
+-            strcat (fmtstr, "ACC");
+-         else
+-            strcat (fmtstr, "CON");
+-      } else
+-         if (argus->ahdr.type & ARGUS_START)
+-            strcat (fmtstr, "INT");
+-
+-   proto = argus->ahdr.status & 0xFFFF;
+-
+-   sprintf (protoStr, "%s", etherproto_string(proto));
+-
+-   if (src_count)
+-      fmtstr[12 + vc] = '>'; 
+-   if (dst_count)
+-      fmtstr[10 + vc] = '<'; 
+-
+-
+-   if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0'))
+-      delim = RaFieldDelimiter;
+-   else {
+-      if (proto == 0) {
+-         delim = '.';
+-      } else {
+-         delim = ' ';
+-      }
+-   }
+-
+-   if (proto == 0) {
+-      sprintf (sportbuf, "%c%-4.4s", delim, llcsap_string((unsigned char) flow->mac_flow.ssap));
+-      sprintf (dportbuf, "%c%-4.4s", delim, llcsap_string((unsigned char) flow->mac_flow.dsap));
+-   } else {
+-      sprintf (sportbuf, "%c    ", delim);
+-      sprintf (dportbuf, "%c    ", delim);
+-
+-      if (dst_count) {
+-         if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0'))
+-            fmtstr[9 + vc] = RaFieldDelimiter;
+-      } else
+-         if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0'))
+-            fmtstr[10 + vc] = RaFieldDelimiter;
+-
+-      if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) {
+-         fmtstr[22 + vc] = RaFieldDelimiter;
+-      }
+-   }
+-
+-   strcat (srcString, sportbuf);
+-   strcat (dstString, dportbuf);
+-
+-   if ((strlen(protoStr) > 4) && !((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')))
+-      protoStr[4] = '\0';
+-
+-   ArgusGetIndicatorString (argus, indStr);
+-
+-   if (Iflag) {
+-      if (cflag)
+-         sprintf (&argus_strbuf[strlen(argus_strbuf)], fmtstr, date, indStr, protoStr,
+-               srcString, dstString, 
+-               src_count, dst_count,
+-               src_bytes, dst_bytes);
+-      else
+-         sprintf (&argus_strbuf[strlen(argus_strbuf)], fmtstr, date, indStr, protoStr,
+-               srcString, dstString);
+-   } else {
+-      if (cflag)
+-         sprintf (&argus_strbuf[strlen(argus_strbuf)], fmtstr, date, protoStr,
+-               srcString, dstString, 
+-               src_count, dst_count,
+-               src_bytes, dst_bytes);
+-      else
+-         sprintf (&argus_strbuf[strlen(argus_strbuf)], fmtstr, date, protoStr,
+-               srcString, dstString);
+-   }
+-
+-   if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) {
+-      char tmpbuf[128], *ptr = tmpbuf, *str = argus_strbuf, lastchr = ' ';
+-      int len = strlen(date) - 1;
+-      bzero (tmpbuf, sizeof(tmpbuf));
+-
+-      bcopy (str, ptr, len);
+-      str += len;
+-      ptr += len;
+-
+-      while (*str) {
+-         if (*str == ' ') {
+-            if (lastchr != RaFieldDelimiter)
+-               *ptr++ = RaFieldDelimiter;
+-            while (isspace((int)*str)) str++;
+-         }
+-         lastchr = *str;
+-
+-         *ptr++ = *str++;
+-      }
+-      bzero (argus_strbuf, MAXSTRLEN);
+-      bcopy (tmpbuf, argus_strbuf, strlen(tmpbuf));
+-   }
+-
+-   return (argus_strbuf);
+-}
+-
+-
+-
+-#ifdef NOVFPRINTF
+-/*
+- * Stock 4.3 doesn't have vfprintf. 
+- * This routine is due to Chris Torek.
+- */
+-vfprintf(f, fmt, args)
+-   FILE *f;
+-   char *fmt;
+-   va_list args;
+-{
+-   int ret;
+-
+-   if ((f->_flag & _IOWRT) == 0) {
+-      if (f->_flag & _IORW)
+-         f->_flag |= _IOWRT;
+-      else
+-         return EOF;
+-   }
+-   ret = _doprnt(fmt, args, f);
+-   return ferror(f) ? EOF : ret;
+-}
+-#endif
+-
 diff -NarU5 argus-2.0.6.fixes.1.orig/common/gencode.c argus-2.0.6.fixes.1/common/gencode.c
 --- argus-2.0.6.fixes.1.orig/common/gencode.c	2004-02-23 10:00:36.000000000 -0500
-+++ argus-2.0.6.fixes.1/common/gencode.c	2006-02-24 11:54:41.000000000 -0500
++++ argus-2.0.6.fixes.1/common/gencode.c	2006-04-21 14:57:52.000000000 -0400
 @@ -57,11 +57,11 @@
  #include <setjmp.h>
  #include <stdarg.h>
@@ -65,7 +6659,7 @@
  #include <ethertype.h>
 diff -NarU5 argus-2.0.6.fixes.1.orig/server/ArgusOutput.c argus-2.0.6.fixes.1/server/ArgusOutput.c
 --- argus-2.0.6.fixes.1.orig/server/ArgusOutput.c	2004-02-23 10:00:36.000000000 -0500
-+++ argus-2.0.6.fixes.1/server/ArgusOutput.c	2006-02-24 11:54:41.000000000 -0500
++++ argus-2.0.6.fixes.1/server/ArgusOutput.c	2006-04-21 14:57:52.000000000 -0400
 @@ -1196,11 +1196,11 @@
  void
  ArgusCheckClientStatus ()

argus-2.0.6.fixes.1-makefile.patch:

Index: argus-2.0.6.fixes.1-makefile.patch
===================================================================
RCS file: /cvs/extras/rpms/argus/FC-4/argus-2.0.6.fixes.1-makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- argus-2.0.6.fixes.1-makefile.patch	17 Mar 2006 19:32:36 -0000	1.1
+++ argus-2.0.6.fixes.1-makefile.patch	21 Apr 2006 19:23:11 -0000	1.2
@@ -1,7 +1,45 @@
 diff -NarU5 argus-2.0.6.fixes.1.orig/common/Makefile.in argus-2.0.6.fixes.1/common/Makefile.in
 --- argus-2.0.6.fixes.1.orig/common/Makefile.in	2004-02-23 10:00:36.000000000 -0500
-+++ argus-2.0.6.fixes.1/common/Makefile.in	2006-03-15 11:08:37.000000000 -0500
-@@ -144,18 +144,18 @@
++++ argus-2.0.6.fixes.1/common/Makefile.in	2006-04-21 15:03:33.000000000 -0400
+@@ -98,34 +98,28 @@
+ 
+ TAGHDR = bpf/net/bpf.h
+ 
+ TAGFILES = $(SRC) $(HDR) $(TAGHDR)
+ 
+-LIBS = @INSTALL_LIB@/argus_parse.a @INSTALL_LIB@/argus_common.a 
++LIBS = @INSTALL_LIB@/argus_common.a 
+ 
+-OBJ =	$(COMMONOBJ) $(PARSEOBJ)
++OBJ =	$(COMMONOBJ)
+ CLEANFILES = $(LIBS) $(OBJ) $(GENSRC) $(GENHDR) lex.yy.c 
+ 
+ 
+ COMMONSRC = gencode.c argus_filter.c $(GENSRC)
+ COMMONOBJ = gencode.o argus_filter.o scanner.o grammar.o version.o
+ 
+-PARSESRC = argus_parse.c argus_util.c argus_auth.c
+-PARSEOBJ = argus_parse.o argus_util.o argus_auth.o
+ 
+-SRC = $(COMMONSRC) $(PARSESRC)
++SRC = $(COMMONSRC)
+ 
+ all: $(LIBS)
+ 
+ @INSTALL_LIB@/argus_common.a: $(COMMONOBJ)
+ 	rm -f $@; ar qc $@ $(COMMONOBJ)
+ 	-$(RANLIB) $@
+ 
+- at INSTALL_LIB@/argus_parse.a: $(PARSEOBJ)
+-	rm -f $@; ar qc $@ $(PARSEOBJ)
+-	-$(RANLIB) $@
+-
+ scanner.c: scanner.l
+ 	@rm -f $@
+ 	$(LEX) -t $< > $$$$.$@; mv $$$$.$@ $@
+ 
+ scanner.o: scanner.c tokdefs.h
+@@ -144,18 +138,16 @@
  version.c: $(srcdir)/../VERSION
  	@rm -f $@
  	sed -e 's/.*/char version[] = "&";/' $(srcdir)/../VERSION > $@
@@ -15,12 +53,10 @@
 -	$(INSTALL) $(srcdir)/../lib/argus_common.a $(LIBDEST)/argus_common.a
 -	$(INSTALL) $(srcdir)/../lib/argus_parse.a  $(LIBDEST)/argus_parse.a
 +	$(INSTALL) $(srcdir)/../lib/argus_common.a $(DESTDIR)/$(LIBDEST)/argus_common.a
-+	$(INSTALL) $(srcdir)/../lib/argus_parse.a  $(DESTDIR)/$(LIBDEST)/argus_parse.a
  
 -	$(RANLIB) $(LIBDEST)/argus_common.a
 -	$(RANLIB) $(LIBDEST)/argus_parse.a
 +	$(RANLIB) $(DESTDIR)/$(LIBDEST)/argus_common.a
-+	$(RANLIB) $(DESTDIR)/$(LIBDEST)/argus_parse.a
  
  clean:
  	rm -f $(CLEANFILES)
@@ -28,7 +64,7 @@
  distclean:
 diff -NarU5 argus-2.0.6.fixes.1.orig/Makefile.in argus-2.0.6.fixes.1/Makefile.in
 --- argus-2.0.6.fixes.1.orig/Makefile.in	2004-04-13 01:32:58.000000000 -0400
-+++ argus-2.0.6.fixes.1/Makefile.in	2006-03-15 11:08:37.000000000 -0500
++++ argus-2.0.6.fixes.1/Makefile.in	2006-04-21 15:01:16.000000000 -0400
 @@ -29,14 +29,14 @@
  LIBS = @LIBS@
  
@@ -189,7 +225,7 @@
  config.status: configure
 diff -NarU5 argus-2.0.6.fixes.1.orig/server/Makefile.in argus-2.0.6.fixes.1/server/Makefile.in
 --- argus-2.0.6.fixes.1.orig/server/Makefile.in	2004-02-23 10:00:36.000000000 -0500
-+++ argus-2.0.6.fixes.1/server/Makefile.in	2006-03-15 11:09:04.000000000 -0500
++++ argus-2.0.6.fixes.1/server/Makefile.in	2006-04-21 15:01:16.000000000 -0400
 @@ -41,11 +41,11 @@
  #
  # Various configurable paths (remember to edit Makefile.in, not Makefile)


Index: argus.spec
===================================================================
RCS file: /cvs/extras/rpms/argus/FC-4/argus.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- argus.spec	20 Mar 2006 18:38:44 -0000	1.2
+++ argus.spec	21 Apr 2006 19:23:11 -0000	1.3
@@ -1,6 +1,6 @@
 Name: argus
 Version: 2.0.6.fixes.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: Network transaction audit tool
 License: GPL
 Group: Applications/Internet
@@ -123,6 +123,9 @@
 %{_mandir}/man5/ra*
 
 %changelog
+* Fri Apr 21 2006 Gabriel Somlo <somlo at cmu.edu> 2.0.6.fixes.1-9
+- daemon patches now eliminate unused common files: argus_parse.c, argus_util.c, and argus_auth.c
+
 * Mon Mar 20 2006 Gabriel Somlo <somlo at cmu.edu> 2.0.6.fixes.1-8
 - added ncurses-devel build requirement
 



From fedora-extras-commits at redhat.com  Fri Apr 21 19:23:52 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Fri, 21 Apr 2006 12:23:52 -0700
Subject: rpms/argus/devel argus-2.0.6.fixes.1-build.patch, 1.1,
	1.2 argus-2.0.6.fixes.1-makefile.patch, 1.1, 1.2 argus.spec, 1.2, 1.3
Message-ID: <200604211923.k3LJNtVI008695@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/argus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8668

Modified Files:
	argus-2.0.6.fixes.1-build.patch 
	argus-2.0.6.fixes.1-makefile.patch argus.spec 
Log Message:
daemon patches now eliminate unused common files: argus_parse.c, argus_util.c, and argus_auth.c


argus-2.0.6.fixes.1-build.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 argus-2.0.6.fixes.1-build.patch
Index: argus-2.0.6.fixes.1-build.patch
===================================================================
RCS file: /cvs/extras/rpms/argus/devel/argus-2.0.6.fixes.1-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- argus-2.0.6.fixes.1-build.patch	17 Mar 2006 19:32:36 -0000	1.1
+++ argus-2.0.6.fixes.1-build.patch	21 Apr 2006 19:23:52 -0000	1.2
@@ -1,55 +1,6649 @@
+diff -NarU5 argus-2.0.6.fixes.1.orig/common/argus_auth.c argus-2.0.6.fixes.1/common/argus_auth.c
+--- argus-2.0.6.fixes.1.orig/common/argus_auth.c	2004-02-23 10:00:36.000000000 -0500
++++ argus-2.0.6.fixes.1/common/argus_auth.c	1969-12-31 19:00:00.000000000 -0500
+@@ -1,569 +0,0 @@
+-/*
+- * Copyright (c) 2000-2004 QoSient, LLC
+- * All rights reserved.
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2, or (at your option)
+- * any later version.
+-
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+-
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+- *
+- */
+-
+-/*
+- * Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
+- *
+- * Redistribution and use in source and binary forms, with or without
+- * modification, are permitted provided that the following conditions
+- * are met:
+- *
+- * 1. Redistributions of source code must retain the above copyright
+- *    notice, this list of conditions and the following disclaimer.
+- *
+- * 2. Redistributions in binary form must reproduce the above copyright
+- *    notice, this list of conditions and the following disclaimer in
+- *    the documentation and/or other materials provided with the
+- *    distribution.
+- *
+- * 3. The name "Carnegie Mellon University" must not be used to
+- *    endorse or promote products derived from this software without
+- *    prior written permission. For permission or any other legal
+- *    details, please contact
+- *      Office of Technology Transfer
+- *      Carnegie Mellon University
+- *      5000 Forbes Avenue
+- *      Pittsburgh, PA  15213-3890
+- *      (412) 268-4387, fax: (412) 268-7395
+- *      tech-transfer at andrew.cmu.edu
+- *
+- * 4. Redistributions of any form whatsoever must retain the following
+- *    acknowledgment:
+- *    "This product includes software developed by Computing Services
+- *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+- *
+- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+- */
+-
+-/*
+- * Modified by Carter Bullard
+- * QoSient, LLC
+- *
+- */
+-
+-
+-#ifndef ArgusAuth
+-#define ArgusAuth
+-#endif
+-
+-#include <stdlib.h>
+-#include <unistd.h>
+-
+-#include <errno.h>
+-#include <string.h>
+-
+-#ifdef ARGUS_SASL
+-
+-#include <ctype.h>
+-#include <assert.h>
+-#include <sasl.h>
+-
+-#endif /* ARGUS_SASL */
+-
+-#include <netinet/in.h>
+-#include <pcap.h>
+-
+-#include <compat.h>
+-#include <interface.h>
+-
+-#include <argus_parse.h>
+-#include <argus_util.h>
+-#include <argus_out.h>
+-#include <argus_filter.h>
+-
+-
+-extern void ArgusLog (int, char *, ...);
+-
+-int ArgusInitializeAuthentication (struct ARGUS_INPUT *);
+-int ArgusAuthenticate (struct ARGUS_INPUT *);
+-
+-#ifdef ARGUS_SASL
+-
+-static int RaGetRealm(void *context, int, const char **, const char **);
+-static int RaSimple(void *context, int, const char **, unsigned *);
+-static int RaGetSecret(sasl_conn_t *, void *context, int, sasl_secret_t **);
+-
+-int RaSaslNegotiate(FILE *, FILE *, sasl_conn_t *);
+-int RaGetSaslString (FILE *, char *, int);
+-int RaSendSaslString (FILE *, const char *, int);
+-
+-/* RaCallBacks we support */
+-
+-static sasl_callback_t RaCallBacks[] = {
+-  { SASL_CB_GETREALM, &RaGetRealm,  NULL },
+-  { SASL_CB_USER,     &RaSimple,    NULL },
+-  { SASL_CB_AUTHNAME, &RaSimple,    NULL },
+-  { SASL_CB_PASS,     &RaGetSecret, NULL },
+-  { SASL_CB_LIST_END, NULL, NULL }
+-};
+-
+-char *RaSaslMech = NULL;
+-
+-#endif 
+-
+-
+-#if defined(HAVE_SOLARIS)
+-extern int getdomainname(char *name, size_t len);
+-#endif
+-
+-
+-int
+-ArgusInitializeAuthentication (struct ARGUS_INPUT *input)
+-{
+-   int retn = 1;
+-
+-#ifdef ARGUS_SASL
+-   struct sockaddr_in localaddr, remoteaddr;
+-   int salen, fd = input->fd;
+-   char *localhostname = NULL;
+-
+-   if ((retn = sasl_client_init(RaCallBacks)) != SASL_OK)
+-      ArgusLog (LOG_ERR, "ArgusInitializeAuthentication() sasl_client_init %d", retn);
+-
+-   localhostname = ArgusCalloc (1, 1024);
+-   gethostname(localhostname, 1024);
+-   if (!strchr (localhostname, '.')) {
+-      strcat (localhostname, ".");
+-      getdomainname (&localhostname[strlen(localhostname)], 1024 - strlen(localhostname));
+-   }
+-
+-   if ((retn = sasl_client_new("argus", localhostname, NULL, SASL_SECURITY_LAYER, &input->sasl_conn)) != SASL_OK)
+-      ArgusLog (LOG_ERR, "ArgusInitializeAuthentication() sasl_client_new %d", retn);
+-   
+-   /* set external properties here
+-   sasl_setprop(input->sasl_conn, SASL_SSF_EXTERNAL, &extprops); */
+-   
+-   /* set required security properties here
+-   sasl_setprop(input->sasl_conn, SASL_SEC_PROPS, &secprops); */
+-   
+-   /* set ip addresses */
+-   salen = sizeof(localaddr);
+-   if (getsockname(fd, (struct sockaddr *)&localaddr, &salen) < 0)
+-      perror("getsockname");
+-
+-   salen = sizeof(remoteaddr); 
+-   if (getpeername(fd, (struct sockaddr *)&remoteaddr, &salen) < 0)
+-      perror("getpeername");
+-
+-   if ((retn = sasl_setprop(input->sasl_conn, SASL_IP_LOCAL, &localaddr)) != SASL_OK)
+-      ArgusLog (LOG_ERR, "ArgusInitializeAuthentication() error setting localaddr %d", retn);
+-
+-   if ((retn = sasl_setprop(input->sasl_conn, SASL_IP_REMOTE, &remoteaddr)) != SASL_OK)
+-      ArgusLog (LOG_ERR, "ArgusInitializeAuthentication() error setting remoteaddr %d", retn);
+-
+-   retn = 1;
+-#endif 
+-
+-#ifdef ARGUSDEBUG
+-   ArgusDebug (2, "ArgusInitializeAuthentication () returning %d\n", retn);
+-#endif 
+-
+-   return (retn);
+-}
+-
+-
[...6308 lines suppressed...]
+-   bzero (indStr, 16);
+-   bzero (date, 128);
+-
+-   flow = &argus->argus_far.flow;
+-
+-   sprintf (srcString, "%17.17s", etheraddr_string((unsigned char *)&flow->mac_flow.ehdr.ether_shost));
+-   sprintf (dstString, "%17.17s", etheraddr_string((unsigned char *)&flow->mac_flow.ehdr.ether_dhost));
+-
+-   src_count = argus->argus_far.src.count;
+-   dst_count = argus->argus_far.dst.count;
+-
+-   if (Aflag) {
+-      src_bytes = argus->argus_far.src.appbytes;
+-      dst_bytes = argus->argus_far.dst.appbytes;
+-   } else {
+-      src_bytes = argus->argus_far.src.bytes;
+-      dst_bytes = argus->argus_far.dst.bytes;
+-   }
+-
+-   print_date (argus, date);
+-
+-   if (idflag) {
+-      if (ArgusInput->ArgusManStart.ahdr.status & ARGUS_ID_IS_IPADDR)
+-         argusIDStr = strdup (ipaddr_string (&argus->ahdr.argusid));
+-      else
+-         sprintf (argusIDStr, "%u", argus->ahdr.argusid);
+-
+-      sprintf(argus_strbuf, "%-15.15s ", argusIDStr);
+-   }
+-
+-   if (mflag) {
+-      if (ArgusThisFarStatus & ARGUS_MAC_DSR_STATUS) {
+-         struct ArgusMacStruct *mac = (struct ArgusMacStruct *) ArgusThisFarHdrs[ARGUS_MAC_DSR_INDEX];
+-
+-         esrcString = etheraddr_string ((u_char *)&mac->phys_union.ether.ethersrc);
+-         edstString = etheraddr_string ((u_char *)&mac->phys_union.ether.etherdst);
+-
+-         sprintf (srcString, "%17.17s %17.17s   %*.*s",
+-                      esrcString, edstString, hfield + 2, hfield + 2,
+-                      etheraddr_string((unsigned char *)&flow->mac_flow.ehdr.ether_shost));
+-      } else
+-         sprintf (srcString, "%17.17s %17.17s    %*.*s",
+-                      blankStr, blankStr, hfield + 2, hfield + 2, 
+-                      etheraddr_string((unsigned char *)&flow->mac_flow.ehdr.ether_shost));
+-   }
+-
+-   if (Iflag)
+-      strcpy (fmtstr, "%s%s%4s %s -   %22.22s ");
+-   else
+-      strcpy (fmtstr, "%s  %4s %s -   %22.22s ");
+-
+-   if (cflag)
+-      strcat (fmtstr, "%-8u %-8u  %-12u %-12u");
+-
+-   if ((argus->ahdr.cause & ARGUS_TIMEOUT))
+-      strcat (fmtstr, "TIM");
+-   else
+-      if (argus->argus_far.src.count && argus->argus_far.dst.count) {
+-         if ((argus->argus_far.src.count == 1) && (argus->argus_far.dst.count == 1))
+-            strcat (fmtstr, "ACC");
+-         else
+-            strcat (fmtstr, "CON");
+-      } else
+-         if (argus->ahdr.type & ARGUS_START)
+-            strcat (fmtstr, "INT");
+-
+-   proto = argus->ahdr.status & 0xFFFF;
+-
+-   sprintf (protoStr, "%s", etherproto_string(proto));
+-
+-   if (src_count)
+-      fmtstr[12 + vc] = '>'; 
+-   if (dst_count)
+-      fmtstr[10 + vc] = '<'; 
+-
+-
+-   if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0'))
+-      delim = RaFieldDelimiter;
+-   else {
+-      if (proto == 0) {
+-         delim = '.';
+-      } else {
+-         delim = ' ';
+-      }
+-   }
+-
+-   if (proto == 0) {
+-      sprintf (sportbuf, "%c%-4.4s", delim, llcsap_string((unsigned char) flow->mac_flow.ssap));
+-      sprintf (dportbuf, "%c%-4.4s", delim, llcsap_string((unsigned char) flow->mac_flow.dsap));
+-   } else {
+-      sprintf (sportbuf, "%c    ", delim);
+-      sprintf (dportbuf, "%c    ", delim);
+-
+-      if (dst_count) {
+-         if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0'))
+-            fmtstr[9 + vc] = RaFieldDelimiter;
+-      } else
+-         if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0'))
+-            fmtstr[10 + vc] = RaFieldDelimiter;
+-
+-      if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) {
+-         fmtstr[22 + vc] = RaFieldDelimiter;
+-      }
+-   }
+-
+-   strcat (srcString, sportbuf);
+-   strcat (dstString, dportbuf);
+-
+-   if ((strlen(protoStr) > 4) && !((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')))
+-      protoStr[4] = '\0';
+-
+-   ArgusGetIndicatorString (argus, indStr);
+-
+-   if (Iflag) {
+-      if (cflag)
+-         sprintf (&argus_strbuf[strlen(argus_strbuf)], fmtstr, date, indStr, protoStr,
+-               srcString, dstString, 
+-               src_count, dst_count,
+-               src_bytes, dst_bytes);
+-      else
+-         sprintf (&argus_strbuf[strlen(argus_strbuf)], fmtstr, date, indStr, protoStr,
+-               srcString, dstString);
+-   } else {
+-      if (cflag)
+-         sprintf (&argus_strbuf[strlen(argus_strbuf)], fmtstr, date, protoStr,
+-               srcString, dstString, 
+-               src_count, dst_count,
+-               src_bytes, dst_bytes);
+-      else
+-         sprintf (&argus_strbuf[strlen(argus_strbuf)], fmtstr, date, protoStr,
+-               srcString, dstString);
+-   }
+-
+-   if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) {
+-      char tmpbuf[128], *ptr = tmpbuf, *str = argus_strbuf, lastchr = ' ';
+-      int len = strlen(date) - 1;
+-      bzero (tmpbuf, sizeof(tmpbuf));
+-
+-      bcopy (str, ptr, len);
+-      str += len;
+-      ptr += len;
+-
+-      while (*str) {
+-         if (*str == ' ') {
+-            if (lastchr != RaFieldDelimiter)
+-               *ptr++ = RaFieldDelimiter;
+-            while (isspace((int)*str)) str++;
+-         }
+-         lastchr = *str;
+-
+-         *ptr++ = *str++;
+-      }
+-      bzero (argus_strbuf, MAXSTRLEN);
+-      bcopy (tmpbuf, argus_strbuf, strlen(tmpbuf));
+-   }
+-
+-   return (argus_strbuf);
+-}
+-
+-
+-
+-#ifdef NOVFPRINTF
+-/*
+- * Stock 4.3 doesn't have vfprintf. 
+- * This routine is due to Chris Torek.
+- */
+-vfprintf(f, fmt, args)
+-   FILE *f;
+-   char *fmt;
+-   va_list args;
+-{
+-   int ret;
+-
+-   if ((f->_flag & _IOWRT) == 0) {
+-      if (f->_flag & _IORW)
+-         f->_flag |= _IOWRT;
+-      else
+-         return EOF;
+-   }
+-   ret = _doprnt(fmt, args, f);
+-   return ferror(f) ? EOF : ret;
+-}
+-#endif
+-
 diff -NarU5 argus-2.0.6.fixes.1.orig/common/gencode.c argus-2.0.6.fixes.1/common/gencode.c
 --- argus-2.0.6.fixes.1.orig/common/gencode.c	2004-02-23 10:00:36.000000000 -0500
-+++ argus-2.0.6.fixes.1/common/gencode.c	2006-02-24 11:54:41.000000000 -0500
++++ argus-2.0.6.fixes.1/common/gencode.c	2006-04-21 14:57:52.000000000 -0400
 @@ -57,11 +57,11 @@
  #include <setjmp.h>
  #include <stdarg.h>
@@ -65,7 +6659,7 @@
  #include <ethertype.h>
 diff -NarU5 argus-2.0.6.fixes.1.orig/server/ArgusOutput.c argus-2.0.6.fixes.1/server/ArgusOutput.c
 --- argus-2.0.6.fixes.1.orig/server/ArgusOutput.c	2004-02-23 10:00:36.000000000 -0500
-+++ argus-2.0.6.fixes.1/server/ArgusOutput.c	2006-02-24 11:54:41.000000000 -0500
++++ argus-2.0.6.fixes.1/server/ArgusOutput.c	2006-04-21 14:57:52.000000000 -0400
 @@ -1196,11 +1196,11 @@
  void
  ArgusCheckClientStatus ()

argus-2.0.6.fixes.1-makefile.patch:

Index: argus-2.0.6.fixes.1-makefile.patch
===================================================================
RCS file: /cvs/extras/rpms/argus/devel/argus-2.0.6.fixes.1-makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- argus-2.0.6.fixes.1-makefile.patch	17 Mar 2006 19:32:36 -0000	1.1
+++ argus-2.0.6.fixes.1-makefile.patch	21 Apr 2006 19:23:52 -0000	1.2
@@ -1,7 +1,45 @@
 diff -NarU5 argus-2.0.6.fixes.1.orig/common/Makefile.in argus-2.0.6.fixes.1/common/Makefile.in
 --- argus-2.0.6.fixes.1.orig/common/Makefile.in	2004-02-23 10:00:36.000000000 -0500
-+++ argus-2.0.6.fixes.1/common/Makefile.in	2006-03-15 11:08:37.000000000 -0500
-@@ -144,18 +144,18 @@
++++ argus-2.0.6.fixes.1/common/Makefile.in	2006-04-21 15:03:33.000000000 -0400
+@@ -98,34 +98,28 @@
+ 
+ TAGHDR = bpf/net/bpf.h
+ 
+ TAGFILES = $(SRC) $(HDR) $(TAGHDR)
+ 
+-LIBS = @INSTALL_LIB@/argus_parse.a @INSTALL_LIB@/argus_common.a 
++LIBS = @INSTALL_LIB@/argus_common.a 
+ 
+-OBJ =	$(COMMONOBJ) $(PARSEOBJ)
++OBJ =	$(COMMONOBJ)
+ CLEANFILES = $(LIBS) $(OBJ) $(GENSRC) $(GENHDR) lex.yy.c 
+ 
+ 
+ COMMONSRC = gencode.c argus_filter.c $(GENSRC)
+ COMMONOBJ = gencode.o argus_filter.o scanner.o grammar.o version.o
+ 
+-PARSESRC = argus_parse.c argus_util.c argus_auth.c
+-PARSEOBJ = argus_parse.o argus_util.o argus_auth.o
+ 
+-SRC = $(COMMONSRC) $(PARSESRC)
++SRC = $(COMMONSRC)
+ 
+ all: $(LIBS)
+ 
+ @INSTALL_LIB@/argus_common.a: $(COMMONOBJ)
+ 	rm -f $@; ar qc $@ $(COMMONOBJ)
+ 	-$(RANLIB) $@
+ 
+- at INSTALL_LIB@/argus_parse.a: $(PARSEOBJ)
+-	rm -f $@; ar qc $@ $(PARSEOBJ)
+-	-$(RANLIB) $@
+-
+ scanner.c: scanner.l
+ 	@rm -f $@
+ 	$(LEX) -t $< > $$$$.$@; mv $$$$.$@ $@
+ 
+ scanner.o: scanner.c tokdefs.h
+@@ -144,18 +138,16 @@
  version.c: $(srcdir)/../VERSION
  	@rm -f $@
  	sed -e 's/.*/char version[] = "&";/' $(srcdir)/../VERSION > $@
@@ -15,12 +53,10 @@
 -	$(INSTALL) $(srcdir)/../lib/argus_common.a $(LIBDEST)/argus_common.a
 -	$(INSTALL) $(srcdir)/../lib/argus_parse.a  $(LIBDEST)/argus_parse.a
 +	$(INSTALL) $(srcdir)/../lib/argus_common.a $(DESTDIR)/$(LIBDEST)/argus_common.a
-+	$(INSTALL) $(srcdir)/../lib/argus_parse.a  $(DESTDIR)/$(LIBDEST)/argus_parse.a
  
 -	$(RANLIB) $(LIBDEST)/argus_common.a
 -	$(RANLIB) $(LIBDEST)/argus_parse.a
 +	$(RANLIB) $(DESTDIR)/$(LIBDEST)/argus_common.a
-+	$(RANLIB) $(DESTDIR)/$(LIBDEST)/argus_parse.a
  
  clean:
  	rm -f $(CLEANFILES)
@@ -28,7 +64,7 @@
  distclean:
 diff -NarU5 argus-2.0.6.fixes.1.orig/Makefile.in argus-2.0.6.fixes.1/Makefile.in
 --- argus-2.0.6.fixes.1.orig/Makefile.in	2004-04-13 01:32:58.000000000 -0400
-+++ argus-2.0.6.fixes.1/Makefile.in	2006-03-15 11:08:37.000000000 -0500
++++ argus-2.0.6.fixes.1/Makefile.in	2006-04-21 15:01:16.000000000 -0400
 @@ -29,14 +29,14 @@
  LIBS = @LIBS@
  
@@ -189,7 +225,7 @@
  config.status: configure
 diff -NarU5 argus-2.0.6.fixes.1.orig/server/Makefile.in argus-2.0.6.fixes.1/server/Makefile.in
 --- argus-2.0.6.fixes.1.orig/server/Makefile.in	2004-02-23 10:00:36.000000000 -0500
-+++ argus-2.0.6.fixes.1/server/Makefile.in	2006-03-15 11:09:04.000000000 -0500
++++ argus-2.0.6.fixes.1/server/Makefile.in	2006-04-21 15:01:16.000000000 -0400
 @@ -41,11 +41,11 @@
  #
  # Various configurable paths (remember to edit Makefile.in, not Makefile)


Index: argus.spec
===================================================================
RCS file: /cvs/extras/rpms/argus/devel/argus.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- argus.spec	20 Mar 2006 18:38:56 -0000	1.2
+++ argus.spec	21 Apr 2006 19:23:52 -0000	1.3
@@ -1,6 +1,6 @@
 Name: argus
 Version: 2.0.6.fixes.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: Network transaction audit tool
 License: GPL
 Group: Applications/Internet
@@ -123,6 +123,9 @@
 %{_mandir}/man5/ra*
 
 %changelog
+* Fri Apr 21 2006 Gabriel Somlo <somlo at cmu.edu> 2.0.6.fixes.1-9
+- daemon patches now eliminate unused common files: argus_parse.c, argus_util.c, and argus_auth.c
+
 * Mon Mar 20 2006 Gabriel Somlo <somlo at cmu.edu> 2.0.6.fixes.1-8
 - added ncurses-devel build requirement
 



From fedora-extras-commits at redhat.com  Fri Apr 21 19:24:57 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Fri, 21 Apr 2006 12:24:57 -0700
Subject: rpms/argus/FC-5 argus-2.0.6.fixes.1-build.patch, 1.1,
	1.2 argus-2.0.6.fixes.1-makefile.patch, 1.1, 1.2 argus.spec, 1.2, 1.3
Message-ID: <200604211924.k3LJOxL0008738@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/argus/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8711

Modified Files:
	argus-2.0.6.fixes.1-build.patch 
	argus-2.0.6.fixes.1-makefile.patch argus.spec 
Log Message:
daemon patches now eliminate unused common files: argus_parse.c, argus_util.c, and argus_auth.c


argus-2.0.6.fixes.1-build.patch:

View full diff with command:
/usr/bin/cvs -f diff  -kk -u -N -r 1.1 -r 1.2 argus-2.0.6.fixes.1-build.patch
Index: argus-2.0.6.fixes.1-build.patch
===================================================================
RCS file: /cvs/extras/rpms/argus/FC-5/argus-2.0.6.fixes.1-build.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- argus-2.0.6.fixes.1-build.patch	17 Mar 2006 19:32:36 -0000	1.1
+++ argus-2.0.6.fixes.1-build.patch	21 Apr 2006 19:24:57 -0000	1.2
@@ -1,55 +1,6649 @@
+diff -NarU5 argus-2.0.6.fixes.1.orig/common/argus_auth.c argus-2.0.6.fixes.1/common/argus_auth.c
+--- argus-2.0.6.fixes.1.orig/common/argus_auth.c	2004-02-23 10:00:36.000000000 -0500
++++ argus-2.0.6.fixes.1/common/argus_auth.c	1969-12-31 19:00:00.000000000 -0500
+@@ -1,569 +0,0 @@
+-/*
+- * Copyright (c) 2000-2004 QoSient, LLC
+- * All rights reserved.
+- *
+- * This program is free software; you can redistribute it and/or modify
+- * it under the terms of the GNU General Public License as published by
+- * the Free Software Foundation; either version 2, or (at your option)
+- * any later version.
+-
+- * This program is distributed in the hope that it will be useful,
+- * but WITHOUT ANY WARRANTY; without even the implied warranty of
+- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+- * GNU General Public License for more details.
+-
+- * You should have received a copy of the GNU General Public License
+- * along with this program; if not, write to the Free Software
+- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+- *
+- */
+-
+-/*
+- * Copyright (c) 2000 Carnegie Mellon University.  All rights reserved.
+- *
+- * Redistribution and use in source and binary forms, with or without
+- * modification, are permitted provided that the following conditions
+- * are met:
+- *
+- * 1. Redistributions of source code must retain the above copyright
+- *    notice, this list of conditions and the following disclaimer.
+- *
+- * 2. Redistributions in binary form must reproduce the above copyright
+- *    notice, this list of conditions and the following disclaimer in
+- *    the documentation and/or other materials provided with the
+- *    distribution.
+- *
+- * 3. The name "Carnegie Mellon University" must not be used to
+- *    endorse or promote products derived from this software without
+- *    prior written permission. For permission or any other legal
+- *    details, please contact
+- *      Office of Technology Transfer
+- *      Carnegie Mellon University
+- *      5000 Forbes Avenue
+- *      Pittsburgh, PA  15213-3890
+- *      (412) 268-4387, fax: (412) 268-7395
+- *      tech-transfer at andrew.cmu.edu
+- *
+- * 4. Redistributions of any form whatsoever must retain the following
+- *    acknowledgment:
+- *    "This product includes software developed by Computing Services
+- *     at Carnegie Mellon University (http://www.cmu.edu/computing/)."
+- *
+- * CARNEGIE MELLON UNIVERSITY DISCLAIMS ALL WARRANTIES WITH REGARD TO
+- * THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+- * AND FITNESS, IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY BE LIABLE
+- * FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
+- * AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+- */
+-
+-/*
+- * Modified by Carter Bullard
+- * QoSient, LLC
+- *
+- */
+-
+-
+-#ifndef ArgusAuth
+-#define ArgusAuth
+-#endif
+-
+-#include <stdlib.h>
+-#include <unistd.h>
+-
+-#include <errno.h>
+-#include <string.h>
+-
+-#ifdef ARGUS_SASL
+-
+-#include <ctype.h>
+-#include <assert.h>
+-#include <sasl.h>
+-
+-#endif /* ARGUS_SASL */
+-
+-#include <netinet/in.h>
+-#include <pcap.h>
+-
+-#include <compat.h>
+-#include <interface.h>
+-
+-#include <argus_parse.h>
+-#include <argus_util.h>
+-#include <argus_out.h>
+-#include <argus_filter.h>
+-
+-
+-extern void ArgusLog (int, char *, ...);
+-
+-int ArgusInitializeAuthentication (struct ARGUS_INPUT *);
+-int ArgusAuthenticate (struct ARGUS_INPUT *);
+-
+-#ifdef ARGUS_SASL
+-
+-static int RaGetRealm(void *context, int, const char **, const char **);
+-static int RaSimple(void *context, int, const char **, unsigned *);
+-static int RaGetSecret(sasl_conn_t *, void *context, int, sasl_secret_t **);
+-
+-int RaSaslNegotiate(FILE *, FILE *, sasl_conn_t *);
+-int RaGetSaslString (FILE *, char *, int);
+-int RaSendSaslString (FILE *, const char *, int);
+-
+-/* RaCallBacks we support */
+-
+-static sasl_callback_t RaCallBacks[] = {
+-  { SASL_CB_GETREALM, &RaGetRealm,  NULL },
+-  { SASL_CB_USER,     &RaSimple,    NULL },
+-  { SASL_CB_AUTHNAME, &RaSimple,    NULL },
+-  { SASL_CB_PASS,     &RaGetSecret, NULL },
+-  { SASL_CB_LIST_END, NULL, NULL }
+-};
+-
+-char *RaSaslMech = NULL;
+-
+-#endif 
+-
+-
+-#if defined(HAVE_SOLARIS)
+-extern int getdomainname(char *name, size_t len);
+-#endif
+-
+-
+-int
+-ArgusInitializeAuthentication (struct ARGUS_INPUT *input)
+-{
+-   int retn = 1;
+-
+-#ifdef ARGUS_SASL
+-   struct sockaddr_in localaddr, remoteaddr;
+-   int salen, fd = input->fd;
+-   char *localhostname = NULL;
+-
+-   if ((retn = sasl_client_init(RaCallBacks)) != SASL_OK)
+-      ArgusLog (LOG_ERR, "ArgusInitializeAuthentication() sasl_client_init %d", retn);
+-
+-   localhostname = ArgusCalloc (1, 1024);
+-   gethostname(localhostname, 1024);
+-   if (!strchr (localhostname, '.')) {
+-      strcat (localhostname, ".");
+-      getdomainname (&localhostname[strlen(localhostname)], 1024 - strlen(localhostname));
+-   }
+-
+-   if ((retn = sasl_client_new("argus", localhostname, NULL, SASL_SECURITY_LAYER, &input->sasl_conn)) != SASL_OK)
+-      ArgusLog (LOG_ERR, "ArgusInitializeAuthentication() sasl_client_new %d", retn);
+-   
+-   /* set external properties here
+-   sasl_setprop(input->sasl_conn, SASL_SSF_EXTERNAL, &extprops); */
+-   
+-   /* set required security properties here
+-   sasl_setprop(input->sasl_conn, SASL_SEC_PROPS, &secprops); */
+-   
+-   /* set ip addresses */
+-   salen = sizeof(localaddr);
+-   if (getsockname(fd, (struct sockaddr *)&localaddr, &salen) < 0)
+-      perror("getsockname");
+-
+-   salen = sizeof(remoteaddr); 
+-   if (getpeername(fd, (struct sockaddr *)&remoteaddr, &salen) < 0)
+-      perror("getpeername");
+-
+-   if ((retn = sasl_setprop(input->sasl_conn, SASL_IP_LOCAL, &localaddr)) != SASL_OK)
+-      ArgusLog (LOG_ERR, "ArgusInitializeAuthentication() error setting localaddr %d", retn);
+-
+-   if ((retn = sasl_setprop(input->sasl_conn, SASL_IP_REMOTE, &remoteaddr)) != SASL_OK)
+-      ArgusLog (LOG_ERR, "ArgusInitializeAuthentication() error setting remoteaddr %d", retn);
+-
+-   retn = 1;
+-#endif 
+-
+-#ifdef ARGUSDEBUG
+-   ArgusDebug (2, "ArgusInitializeAuthentication () returning %d\n", retn);
+-#endif 
+-
+-   return (retn);
+-}
+-
+-
[...6308 lines suppressed...]
+-   bzero (indStr, 16);
+-   bzero (date, 128);
+-
+-   flow = &argus->argus_far.flow;
+-
+-   sprintf (srcString, "%17.17s", etheraddr_string((unsigned char *)&flow->mac_flow.ehdr.ether_shost));
+-   sprintf (dstString, "%17.17s", etheraddr_string((unsigned char *)&flow->mac_flow.ehdr.ether_dhost));
+-
+-   src_count = argus->argus_far.src.count;
+-   dst_count = argus->argus_far.dst.count;
+-
+-   if (Aflag) {
+-      src_bytes = argus->argus_far.src.appbytes;
+-      dst_bytes = argus->argus_far.dst.appbytes;
+-   } else {
+-      src_bytes = argus->argus_far.src.bytes;
+-      dst_bytes = argus->argus_far.dst.bytes;
+-   }
+-
+-   print_date (argus, date);
+-
+-   if (idflag) {
+-      if (ArgusInput->ArgusManStart.ahdr.status & ARGUS_ID_IS_IPADDR)
+-         argusIDStr = strdup (ipaddr_string (&argus->ahdr.argusid));
+-      else
+-         sprintf (argusIDStr, "%u", argus->ahdr.argusid);
+-
+-      sprintf(argus_strbuf, "%-15.15s ", argusIDStr);
+-   }
+-
+-   if (mflag) {
+-      if (ArgusThisFarStatus & ARGUS_MAC_DSR_STATUS) {
+-         struct ArgusMacStruct *mac = (struct ArgusMacStruct *) ArgusThisFarHdrs[ARGUS_MAC_DSR_INDEX];
+-
+-         esrcString = etheraddr_string ((u_char *)&mac->phys_union.ether.ethersrc);
+-         edstString = etheraddr_string ((u_char *)&mac->phys_union.ether.etherdst);
+-
+-         sprintf (srcString, "%17.17s %17.17s   %*.*s",
+-                      esrcString, edstString, hfield + 2, hfield + 2,
+-                      etheraddr_string((unsigned char *)&flow->mac_flow.ehdr.ether_shost));
+-      } else
+-         sprintf (srcString, "%17.17s %17.17s    %*.*s",
+-                      blankStr, blankStr, hfield + 2, hfield + 2, 
+-                      etheraddr_string((unsigned char *)&flow->mac_flow.ehdr.ether_shost));
+-   }
+-
+-   if (Iflag)
+-      strcpy (fmtstr, "%s%s%4s %s -   %22.22s ");
+-   else
+-      strcpy (fmtstr, "%s  %4s %s -   %22.22s ");
+-
+-   if (cflag)
+-      strcat (fmtstr, "%-8u %-8u  %-12u %-12u");
+-
+-   if ((argus->ahdr.cause & ARGUS_TIMEOUT))
+-      strcat (fmtstr, "TIM");
+-   else
+-      if (argus->argus_far.src.count && argus->argus_far.dst.count) {
+-         if ((argus->argus_far.src.count == 1) && (argus->argus_far.dst.count == 1))
+-            strcat (fmtstr, "ACC");
+-         else
+-            strcat (fmtstr, "CON");
+-      } else
+-         if (argus->ahdr.type & ARGUS_START)
+-            strcat (fmtstr, "INT");
+-
+-   proto = argus->ahdr.status & 0xFFFF;
+-
+-   sprintf (protoStr, "%s", etherproto_string(proto));
+-
+-   if (src_count)
+-      fmtstr[12 + vc] = '>'; 
+-   if (dst_count)
+-      fmtstr[10 + vc] = '<'; 
+-
+-
+-   if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0'))
+-      delim = RaFieldDelimiter;
+-   else {
+-      if (proto == 0) {
+-         delim = '.';
+-      } else {
+-         delim = ' ';
+-      }
+-   }
+-
+-   if (proto == 0) {
+-      sprintf (sportbuf, "%c%-4.4s", delim, llcsap_string((unsigned char) flow->mac_flow.ssap));
+-      sprintf (dportbuf, "%c%-4.4s", delim, llcsap_string((unsigned char) flow->mac_flow.dsap));
+-   } else {
+-      sprintf (sportbuf, "%c    ", delim);
+-      sprintf (dportbuf, "%c    ", delim);
+-
+-      if (dst_count) {
+-         if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0'))
+-            fmtstr[9 + vc] = RaFieldDelimiter;
+-      } else
+-         if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0'))
+-            fmtstr[10 + vc] = RaFieldDelimiter;
+-
+-      if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) {
+-         fmtstr[22 + vc] = RaFieldDelimiter;
+-      }
+-   }
+-
+-   strcat (srcString, sportbuf);
+-   strcat (dstString, dportbuf);
+-
+-   if ((strlen(protoStr) > 4) && !((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')))
+-      protoStr[4] = '\0';
+-
+-   ArgusGetIndicatorString (argus, indStr);
+-
+-   if (Iflag) {
+-      if (cflag)
+-         sprintf (&argus_strbuf[strlen(argus_strbuf)], fmtstr, date, indStr, protoStr,
+-               srcString, dstString, 
+-               src_count, dst_count,
+-               src_bytes, dst_bytes);
+-      else
+-         sprintf (&argus_strbuf[strlen(argus_strbuf)], fmtstr, date, indStr, protoStr,
+-               srcString, dstString);
+-   } else {
+-      if (cflag)
+-         sprintf (&argus_strbuf[strlen(argus_strbuf)], fmtstr, date, protoStr,
+-               srcString, dstString, 
+-               src_count, dst_count,
+-               src_bytes, dst_bytes);
+-      else
+-         sprintf (&argus_strbuf[strlen(argus_strbuf)], fmtstr, date, protoStr,
+-               srcString, dstString);
+-   }
+-
+-   if ((RaFieldDelimiter != ' ') && (RaFieldDelimiter != '\0')) {
+-      char tmpbuf[128], *ptr = tmpbuf, *str = argus_strbuf, lastchr = ' ';
+-      int len = strlen(date) - 1;
+-      bzero (tmpbuf, sizeof(tmpbuf));
+-
+-      bcopy (str, ptr, len);
+-      str += len;
+-      ptr += len;
+-
+-      while (*str) {
+-         if (*str == ' ') {
+-            if (lastchr != RaFieldDelimiter)
+-               *ptr++ = RaFieldDelimiter;
+-            while (isspace((int)*str)) str++;
+-         }
+-         lastchr = *str;
+-
+-         *ptr++ = *str++;
+-      }
+-      bzero (argus_strbuf, MAXSTRLEN);
+-      bcopy (tmpbuf, argus_strbuf, strlen(tmpbuf));
+-   }
+-
+-   return (argus_strbuf);
+-}
+-
+-
+-
+-#ifdef NOVFPRINTF
+-/*
+- * Stock 4.3 doesn't have vfprintf. 
+- * This routine is due to Chris Torek.
+- */
+-vfprintf(f, fmt, args)
+-   FILE *f;
+-   char *fmt;
+-   va_list args;
+-{
+-   int ret;
+-
+-   if ((f->_flag & _IOWRT) == 0) {
+-      if (f->_flag & _IORW)
+-         f->_flag |= _IOWRT;
+-      else
+-         return EOF;
+-   }
+-   ret = _doprnt(fmt, args, f);
+-   return ferror(f) ? EOF : ret;
+-}
+-#endif
+-
 diff -NarU5 argus-2.0.6.fixes.1.orig/common/gencode.c argus-2.0.6.fixes.1/common/gencode.c
 --- argus-2.0.6.fixes.1.orig/common/gencode.c	2004-02-23 10:00:36.000000000 -0500
-+++ argus-2.0.6.fixes.1/common/gencode.c	2006-02-24 11:54:41.000000000 -0500
++++ argus-2.0.6.fixes.1/common/gencode.c	2006-04-21 14:57:52.000000000 -0400
 @@ -57,11 +57,11 @@
  #include <setjmp.h>
  #include <stdarg.h>
@@ -65,7 +6659,7 @@
  #include <ethertype.h>
 diff -NarU5 argus-2.0.6.fixes.1.orig/server/ArgusOutput.c argus-2.0.6.fixes.1/server/ArgusOutput.c
 --- argus-2.0.6.fixes.1.orig/server/ArgusOutput.c	2004-02-23 10:00:36.000000000 -0500
-+++ argus-2.0.6.fixes.1/server/ArgusOutput.c	2006-02-24 11:54:41.000000000 -0500
++++ argus-2.0.6.fixes.1/server/ArgusOutput.c	2006-04-21 14:57:52.000000000 -0400
 @@ -1196,11 +1196,11 @@
  void
  ArgusCheckClientStatus ()

argus-2.0.6.fixes.1-makefile.patch:

Index: argus-2.0.6.fixes.1-makefile.patch
===================================================================
RCS file: /cvs/extras/rpms/argus/FC-5/argus-2.0.6.fixes.1-makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- argus-2.0.6.fixes.1-makefile.patch	17 Mar 2006 19:32:36 -0000	1.1
+++ argus-2.0.6.fixes.1-makefile.patch	21 Apr 2006 19:24:57 -0000	1.2
@@ -1,7 +1,45 @@
 diff -NarU5 argus-2.0.6.fixes.1.orig/common/Makefile.in argus-2.0.6.fixes.1/common/Makefile.in
 --- argus-2.0.6.fixes.1.orig/common/Makefile.in	2004-02-23 10:00:36.000000000 -0500
-+++ argus-2.0.6.fixes.1/common/Makefile.in	2006-03-15 11:08:37.000000000 -0500
-@@ -144,18 +144,18 @@
++++ argus-2.0.6.fixes.1/common/Makefile.in	2006-04-21 15:03:33.000000000 -0400
+@@ -98,34 +98,28 @@
+ 
+ TAGHDR = bpf/net/bpf.h
+ 
+ TAGFILES = $(SRC) $(HDR) $(TAGHDR)
+ 
+-LIBS = @INSTALL_LIB@/argus_parse.a @INSTALL_LIB@/argus_common.a 
++LIBS = @INSTALL_LIB@/argus_common.a 
+ 
+-OBJ =	$(COMMONOBJ) $(PARSEOBJ)
++OBJ =	$(COMMONOBJ)
+ CLEANFILES = $(LIBS) $(OBJ) $(GENSRC) $(GENHDR) lex.yy.c 
+ 
+ 
+ COMMONSRC = gencode.c argus_filter.c $(GENSRC)
+ COMMONOBJ = gencode.o argus_filter.o scanner.o grammar.o version.o
+ 
+-PARSESRC = argus_parse.c argus_util.c argus_auth.c
+-PARSEOBJ = argus_parse.o argus_util.o argus_auth.o
+ 
+-SRC = $(COMMONSRC) $(PARSESRC)
++SRC = $(COMMONSRC)
+ 
+ all: $(LIBS)
+ 
+ @INSTALL_LIB@/argus_common.a: $(COMMONOBJ)
+ 	rm -f $@; ar qc $@ $(COMMONOBJ)
+ 	-$(RANLIB) $@
+ 
+- at INSTALL_LIB@/argus_parse.a: $(PARSEOBJ)
+-	rm -f $@; ar qc $@ $(PARSEOBJ)
+-	-$(RANLIB) $@
+-
+ scanner.c: scanner.l
+ 	@rm -f $@
+ 	$(LEX) -t $< > $$$$.$@; mv $$$$.$@ $@
+ 
+ scanner.o: scanner.c tokdefs.h
+@@ -144,18 +138,16 @@
  version.c: $(srcdir)/../VERSION
  	@rm -f $@
  	sed -e 's/.*/char version[] = "&";/' $(srcdir)/../VERSION > $@
@@ -15,12 +53,10 @@
 -	$(INSTALL) $(srcdir)/../lib/argus_common.a $(LIBDEST)/argus_common.a
 -	$(INSTALL) $(srcdir)/../lib/argus_parse.a  $(LIBDEST)/argus_parse.a
 +	$(INSTALL) $(srcdir)/../lib/argus_common.a $(DESTDIR)/$(LIBDEST)/argus_common.a
-+	$(INSTALL) $(srcdir)/../lib/argus_parse.a  $(DESTDIR)/$(LIBDEST)/argus_parse.a
  
 -	$(RANLIB) $(LIBDEST)/argus_common.a
 -	$(RANLIB) $(LIBDEST)/argus_parse.a
 +	$(RANLIB) $(DESTDIR)/$(LIBDEST)/argus_common.a
-+	$(RANLIB) $(DESTDIR)/$(LIBDEST)/argus_parse.a
  
  clean:
  	rm -f $(CLEANFILES)
@@ -28,7 +64,7 @@
  distclean:
 diff -NarU5 argus-2.0.6.fixes.1.orig/Makefile.in argus-2.0.6.fixes.1/Makefile.in
 --- argus-2.0.6.fixes.1.orig/Makefile.in	2004-04-13 01:32:58.000000000 -0400
-+++ argus-2.0.6.fixes.1/Makefile.in	2006-03-15 11:08:37.000000000 -0500
++++ argus-2.0.6.fixes.1/Makefile.in	2006-04-21 15:01:16.000000000 -0400
 @@ -29,14 +29,14 @@
  LIBS = @LIBS@
  
@@ -189,7 +225,7 @@
  config.status: configure
 diff -NarU5 argus-2.0.6.fixes.1.orig/server/Makefile.in argus-2.0.6.fixes.1/server/Makefile.in
 --- argus-2.0.6.fixes.1.orig/server/Makefile.in	2004-02-23 10:00:36.000000000 -0500
-+++ argus-2.0.6.fixes.1/server/Makefile.in	2006-03-15 11:09:04.000000000 -0500
++++ argus-2.0.6.fixes.1/server/Makefile.in	2006-04-21 15:01:16.000000000 -0400
 @@ -41,11 +41,11 @@
  #
  # Various configurable paths (remember to edit Makefile.in, not Makefile)


Index: argus.spec
===================================================================
RCS file: /cvs/extras/rpms/argus/FC-5/argus.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- argus.spec	20 Mar 2006 18:38:51 -0000	1.2
+++ argus.spec	21 Apr 2006 19:24:57 -0000	1.3
@@ -1,6 +1,6 @@
 Name: argus
 Version: 2.0.6.fixes.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: Network transaction audit tool
 License: GPL
 Group: Applications/Internet
@@ -123,6 +123,9 @@
 %{_mandir}/man5/ra*
 
 %changelog
+* Fri Apr 21 2006 Gabriel Somlo <somlo at cmu.edu> 2.0.6.fixes.1-9
+- daemon patches now eliminate unused common files: argus_parse.c, argus_util.c, and argus_auth.c
+
 * Mon Mar 20 2006 Gabriel Somlo <somlo at cmu.edu> 2.0.6.fixes.1-8
 - added ncurses-devel build requirement
 



From fedora-extras-commits at redhat.com  Fri Apr 21 19:37:11 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Fri, 21 Apr 2006 12:37:11 -0700
Subject: rpms/argus/FC-4 argus.spec,1.3,1.4
Message-ID: <200604211937.k3LJbDpQ009041@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/argus/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9024

Modified Files:
	argus.spec 
Log Message:
bumped release to work around botched CVS tag attempt



Index: argus.spec
===================================================================
RCS file: /cvs/extras/rpms/argus/FC-4/argus.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- argus.spec	21 Apr 2006 19:23:11 -0000	1.3
+++ argus.spec	21 Apr 2006 19:37:11 -0000	1.4
@@ -1,6 +1,6 @@
 Name: argus
 Version: 2.0.6.fixes.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: Network transaction audit tool
 License: GPL
 Group: Applications/Internet
@@ -123,6 +123,9 @@
 %{_mandir}/man5/ra*
 
 %changelog
+* Fri Apr 21 2006 Gabriel Somlo <somlo at cmu.edu> 2.0.6.fixes.1-10
+- bumped release to workaround botched CVS tag attempt
+
 * Fri Apr 21 2006 Gabriel Somlo <somlo at cmu.edu> 2.0.6.fixes.1-9
 - daemon patches now eliminate unused common files: argus_parse.c, argus_util.c, and argus_auth.c
 



From fedora-extras-commits at redhat.com  Fri Apr 21 19:38:19 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Fri, 21 Apr 2006 12:38:19 -0700
Subject: rpms/argus/FC-5 argus.spec,1.3,1.4
Message-ID: <200604211938.k3LJcLuH009099@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/argus/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9082

Modified Files:
	argus.spec 
Log Message:
bumped release to workaround botched CVS tag attempt



Index: argus.spec
===================================================================
RCS file: /cvs/extras/rpms/argus/FC-5/argus.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- argus.spec	21 Apr 2006 19:24:57 -0000	1.3
+++ argus.spec	21 Apr 2006 19:38:18 -0000	1.4
@@ -1,6 +1,6 @@
 Name: argus
 Version: 2.0.6.fixes.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: Network transaction audit tool
 License: GPL
 Group: Applications/Internet
@@ -123,6 +123,9 @@
 %{_mandir}/man5/ra*
 
 %changelog
+* Fri Apr 21 2006 Gabriel Somlo <somlo at cmu.edu> 2.0.6.fixes.1-10
+- bumped release to workaround botched CVS tag attempt
+
 * Fri Apr 21 2006 Gabriel Somlo <somlo at cmu.edu> 2.0.6.fixes.1-9
 - daemon patches now eliminate unused common files: argus_parse.c, argus_util.c, and argus_auth.c
 



From fedora-extras-commits at redhat.com  Fri Apr 21 19:38:45 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Fri, 21 Apr 2006 12:38:45 -0700
Subject: rpms/argus/devel argus.spec,1.3,1.4
Message-ID: <200604211938.k3LJclOj009156@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/argus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9139

Modified Files:
	argus.spec 
Log Message:
bumped release to workaround botched CVS tag attempt



Index: argus.spec
===================================================================
RCS file: /cvs/extras/rpms/argus/devel/argus.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- argus.spec	21 Apr 2006 19:23:52 -0000	1.3
+++ argus.spec	21 Apr 2006 19:38:45 -0000	1.4
@@ -1,6 +1,6 @@
 Name: argus
 Version: 2.0.6.fixes.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: Network transaction audit tool
 License: GPL
 Group: Applications/Internet
@@ -123,6 +123,9 @@
 %{_mandir}/man5/ra*
 
 %changelog
+* Fri Apr 21 2006 Gabriel Somlo <somlo at cmu.edu> 2.0.6.fixes.1-10
+- bumped release to workaround botched CVS tag attempt
+
 * Fri Apr 21 2006 Gabriel Somlo <somlo at cmu.edu> 2.0.6.fixes.1-9
 - daemon patches now eliminate unused common files: argus_parse.c, argus_util.c, and argus_auth.c
 



From fedora-extras-commits at redhat.com  Fri Apr 21 20:16:46 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 13:16:46 -0700
Subject: rpms/perl-Locale-Maketext-Simple/devel .cvsignore, 1.2,
	1.3 perl-Locale-Maketext-Simple.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200604212016.k3LKGmG6011586@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Locale-Maketext-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11565

Modified Files:
	.cvsignore perl-Locale-Maketext-Simple.spec sources 
Log Message:
Update to 0.13.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Apr 2006 20:08:31 -0000	1.2
+++ .cvsignore	21 Apr 2006 20:16:46 -0000	1.3
@@ -1 +1 @@
-Locale-Maketext-Simple-0.12.tar.gz
+Locale-Maketext-Simple-0.13.tar.gz


Index: perl-Locale-Maketext-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/devel/perl-Locale-Maketext-Simple.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Locale-Maketext-Simple.spec	12 Apr 2006 20:08:31 -0000	1.1
+++ perl-Locale-Maketext-Simple.spec	21 Apr 2006 20:16:46 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Locale-Maketext-Simple
-Version:        0.12
-Release:        2%{?dist}
+Version:        0.13
+Release:        1%{?dist}
 Summary:        Simple interface to Locale::Maketext::Lexicon
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Apr 21 2006 Steven Pritchard <steve at kspei.com> 0.13-1
+- Update to 0.13.
+
 * Mon Apr 10 2006 Steven Pritchard <steve at kspei.com> 0.12-2
 - Explicitly require perl(Locale::Maketext::Lexicon).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Apr 2006 20:08:31 -0000	1.2
+++ sources	21 Apr 2006 20:16:46 -0000	1.3
@@ -1 +1 @@
-9a65312da2ae8d59f898151f9c044383  Locale-Maketext-Simple-0.12.tar.gz
+bedbbbd4ca43a1c053f11abfc1e6b2e1  Locale-Maketext-Simple-0.13.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 20:18:13 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 13:18:13 -0700
Subject: rpms/perl-Locale-Maketext-Simple/FC-5 .cvsignore, 1.2,
	1.3 perl-Locale-Maketext-Simple.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200604212018.k3LKIFfw011691@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Locale-Maketext-Simple/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11670

Modified Files:
	.cvsignore perl-Locale-Maketext-Simple.spec sources 
Log Message:
Update to 0.13.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Apr 2006 20:08:31 -0000	1.2
+++ .cvsignore	21 Apr 2006 20:18:13 -0000	1.3
@@ -1 +1 @@
-Locale-Maketext-Simple-0.12.tar.gz
+Locale-Maketext-Simple-0.13.tar.gz


Index: perl-Locale-Maketext-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/FC-5/perl-Locale-Maketext-Simple.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Locale-Maketext-Simple.spec	12 Apr 2006 20:08:31 -0000	1.1
+++ perl-Locale-Maketext-Simple.spec	21 Apr 2006 20:18:13 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Locale-Maketext-Simple
-Version:        0.12
-Release:        2%{?dist}
+Version:        0.13
+Release:        1%{?dist}
 Summary:        Simple interface to Locale::Maketext::Lexicon
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Apr 21 2006 Steven Pritchard <steve at kspei.com> 0.13-1
+- Update to 0.13.
+
 * Mon Apr 10 2006 Steven Pritchard <steve at kspei.com> 0.12-2
 - Explicitly require perl(Locale::Maketext::Lexicon).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Apr 2006 20:08:31 -0000	1.2
+++ sources	21 Apr 2006 20:18:13 -0000	1.3
@@ -1 +1 @@
-9a65312da2ae8d59f898151f9c044383  Locale-Maketext-Simple-0.12.tar.gz
+bedbbbd4ca43a1c053f11abfc1e6b2e1  Locale-Maketext-Simple-0.13.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 20:18:44 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 13:18:44 -0700
Subject: rpms/perl-Locale-Maketext-Simple/FC-4 .cvsignore, 1.2,
	1.3 perl-Locale-Maketext-Simple.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200604212018.k3LKIkEr011773@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Locale-Maketext-Simple/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11752

Modified Files:
	.cvsignore perl-Locale-Maketext-Simple.spec sources 
Log Message:
Update to 0.13.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Apr 2006 20:08:31 -0000	1.2
+++ .cvsignore	21 Apr 2006 20:18:44 -0000	1.3
@@ -1 +1 @@
-Locale-Maketext-Simple-0.12.tar.gz
+Locale-Maketext-Simple-0.13.tar.gz


Index: perl-Locale-Maketext-Simple.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/FC-4/perl-Locale-Maketext-Simple.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Locale-Maketext-Simple.spec	12 Apr 2006 20:08:31 -0000	1.1
+++ perl-Locale-Maketext-Simple.spec	21 Apr 2006 20:18:44 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           perl-Locale-Maketext-Simple
-Version:        0.12
-Release:        2%{?dist}
+Version:        0.13
+Release:        1%{?dist}
 Summary:        Simple interface to Locale::Maketext::Lexicon
 License:        GPL or Artistic
 Group:          Development/Libraries
@@ -47,6 +47,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Apr 21 2006 Steven Pritchard <steve at kspei.com> 0.13-1
+- Update to 0.13.
+
 * Mon Apr 10 2006 Steven Pritchard <steve at kspei.com> 0.12-2
 - Explicitly require perl(Locale::Maketext::Lexicon).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Simple/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Apr 2006 20:08:31 -0000	1.2
+++ sources	21 Apr 2006 20:18:44 -0000	1.3
@@ -1 +1 @@
-9a65312da2ae8d59f898151f9c044383  Locale-Maketext-Simple-0.12.tar.gz
+bedbbbd4ca43a1c053f11abfc1e6b2e1  Locale-Maketext-Simple-0.13.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 20:24:34 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 13:24:34 -0700
Subject: rpms/perl-Test-Deep/devel .cvsignore, 1.2, 1.3 perl-Test-Deep.spec, 
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200604212024.k3LKOagZ011889@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-Deep/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11868

Modified Files:
	.cvsignore perl-Test-Deep.spec sources 
Log Message:
Update to 0.095.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Deep/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Apr 2006 18:23:07 -0000	1.2
+++ .cvsignore	21 Apr 2006 20:24:34 -0000	1.3
@@ -1 +1 @@
-Test-Deep-0.093.tar.gz
+Test-Deep-0.095.tar.gz


Index: perl-Test-Deep.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Deep/devel/perl-Test-Deep.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Test-Deep.spec	10 Apr 2006 18:23:07 -0000	1.1
+++ perl-Test-Deep.spec	21 Apr 2006 20:24:34 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           perl-Test-Deep
-Version:        0.093
+Version:        0.095
 Release:        1%{?dist}
 Summary:        Extremely flexible deep comparison
 License:        GPL or Artistic
@@ -50,6 +50,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Apr 21 2006 Steven Pritchard <steve at kspei.com> 0.095-1
+- Update to 0.095.
+
 * Sat Apr 08 2006 Steven Pritchard <steve at kspei.com> 0.093-1
 - Specfile autogenerated by cpanspec 1.64.
 - Improve description.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Deep/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Apr 2006 18:23:07 -0000	1.2
+++ sources	21 Apr 2006 20:24:34 -0000	1.3
@@ -1 +1 @@
-b47659e09457a72157d3db5b5be62f75  Test-Deep-0.093.tar.gz
+fb6fe44d0f6e58a0dd552f9ee958cc24  Test-Deep-0.095.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 20:36:26 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 21 Apr 2006 13:36:26 -0700
Subject: rpms/grads/FC-4 grads.spec,1.9,1.10
Message-ID: <200604212036.k3LKaStV012106@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12087

Modified Files:
	grads.spec 
Log Message:
sync with devel


Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/FC-4/grads.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- grads.spec	20 Feb 2006 23:13:02 -0000	1.9
+++ grads.spec	21 Apr 2006 20:36:26 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -104,6 +104,9 @@
 %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
+* Sat Mar 11 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-9
+- rebuild for newer libdap
+
 * Fri Feb 17 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-8
 - enable hdf for ppc, now that it is there
 - use a wrapper include file to prepend sd_ to netcdf symbols for



From fedora-extras-commits at redhat.com  Fri Apr 21 20:40:05 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 21 Apr 2006 13:40:05 -0700
Subject: rpms/grads/FC-3 gawrapsd.h, NONE, 1.1 grads-build_fixes.diff, 1.1, 
	1.2 grads.spec, 1.8, 1.9
Message-ID: <200604212040.k3LKe7CE012190@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12167

Modified Files:
	grads-build_fixes.diff grads.spec 
Added Files:
	gawrapsd.h 
Log Message:
Sync with devel (enable hdf, rebuild for newer libdap)



--- NEW FILE gawrapsd.h ---
#if USEHDF == 1
#define ncopen sd_ncopen
#define ncvarinq sd_ncvarinq
#define ncopts sd_ncopts
#define ncvarid sd_ncvarid
#define ncattinq sd_ncattinq
#define ncvarget sd_ncvarget
#define ncattget sd_ncattget
#define ncclose sd_ncclose
#define ncinquire sd_ncinquire
#define ncattname sd_ncattname
#define nctypelen sd_nctypelen
#define ncdiminq sd_ncdiminq
#endif

grads-build_fixes.diff:

Index: grads-build_fixes.diff
===================================================================
RCS file: /cvs/extras/rpms/grads/FC-3/grads-build_fixes.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- grads-build_fixes.diff	20 Dec 2005 12:16:26 -0000	1.1
+++ grads-build_fixes.diff	21 Apr 2006 20:40:05 -0000	1.2
@@ -1,6 +1,6 @@
-diff -u --recursive --exclude aclocal.m4 --exclude configure --exclude Makefile.in --exclude bootstrap grads-1.9b4-orig/acinclude.m4 grads-1.9b4/acinclude.m4
+diff -u --recursive grads-1.9b4-orig/acinclude.m4 grads-1.9b4-rpm/acinclude.m4
 --- grads-1.9b4-orig/acinclude.m4	2003-10-02 16:01:15.000000000 +0200
-+++ grads-1.9b4/acinclude.m4	2005-08-16 12:08:41.000000000 +0200
++++ grads-1.9b4-rpm/acinclude.m4	2006-02-17 15:19:32.000000000 +0100
 @@ -165,10 +165,10 @@
  dnl 		   enabled, just calls AC_CHECK_LIB. If not, checks for the presence
  dnl		   of a file "libname.a" in the supplibs directory. 
@@ -81,14 +81,9 @@
  
    ga_check_dods="no"
    AC_CHECK_HEADER(udunits.h,
-Seulement dans grads-1.9b4: autom4te.cache
-Seulement dans grads-1.9b4: autoscan.log
-Seulement dans grads-1.9b4: config.h.in
-Seulement dans grads-1.9b4: config.log
-Seulement dans grads-1.9b4: config.status
-diff -u --recursive --exclude aclocal.m4 --exclude configure --exclude Makefile.in --exclude bootstrap grads-1.9b4-orig/configure.in grads-1.9b4/configure.in
+diff -u --recursive grads-1.9b4-orig/configure.in grads-1.9b4-rpm/configure.in
 --- grads-1.9b4-orig/configure.in	2005-05-23 17:04:40.000000000 +0200
-+++ grads-1.9b4/configure.in	2005-08-16 12:05:01.000000000 +0200
++++ grads-1.9b4-rpm/configure.in	2006-02-17 15:56:16.000000000 +0100
 @@ -274,14 +274,24 @@
  
  
@@ -115,7 +110,33 @@
    gui_libs="$gui_libs -lXaw -lXmu -lXt $guilibadd"
    AC_SUBST(gui_libs)
  else
-@@ -383,15 +393,25 @@
+@@ -366,6 +376,11 @@
+ fi
+ echo
+ 
++AH_BOTTOM([
++#ifdef HDF_SD_NETCDF
++#include "gawrapsd.h"
++#endif
++])
+ 
+ use_hdf=no
+ if test "$with_hdf" != "no" ; then
+@@ -373,6 +388,13 @@
+ fi
+ if test $use_hdf = "yes" ; then
+     GA_SET_LIB_VAR(hdf_libs, [mfhdf df jpeg udunits z])
++    if test "${ga_dyn_supplibs}" = "yes"; then
++      ac_save_LIBS="$LIBS"
++      LIBS="$LIBS $hdf_libs"
++      AC_CHECK_FUNC([sd_ncopen],
++        [AC_DEFINE([HDF_SD_NETCDF],[],[prepend sd_ to netcdf symbols])])
++      LIBS="$ac_save_LIBS"
++    fi
+     AC_SUBST(hdf_libs)
+     extra_bins="$extra_bins gradshdf"
+     echo "+ gradshdf (HDF-SDS/netCDF) build enabled"
+@@ -383,15 +405,25 @@
  
  
  use_dods=no
@@ -143,7 +164,7 @@
  
      GA_CHECK_LIB(gadods, main, [use_gadods=yes], [use_gadods=no])
      if test $use_gadods = "yes" ; then	
-@@ -404,7 +424,11 @@
+@@ -404,7 +436,11 @@
         echo "+ gradsdods (OPeNDAP/netCDF) build enabled - gridded interface only"
      fi
  
@@ -156,20 +177,10 @@
      AC_SUBST(dods_libs)
      AC_SUBST(gadods_def)
  else
-Seulement dans grads-1.9b4: configure.scan
-Seulement dans grads-1.9b4: grads-1.9b4.tar.gz
-Seulement dans grads-1.9b4: grads.spec
-Seulement dans grads-1.9b4: libdap.m4
-Seulement dans grads-1.9b4: libnc-dap.m4
-Seulement dans grads-1.9b4: Makefile
-Seulement dans grads-1.9b4/src: bufrscan
-Seulement dans grads-1.9b4/src: bufrscan.o
-Seulement dans grads-1.9b4/src: bufrstn.o
-Seulement dans grads-1.9b4/src: buildinfo.h
-Seulement dans grads-1.9b4/src: config.h
-diff -u --recursive --exclude aclocal.m4 --exclude configure --exclude Makefile.in --exclude bootstrap grads-1.9b4-orig/src/config.h.in grads-1.9b4/src/config.h.in
+Seulement dans grads-1.9b4-rpm/: .configure.in.swp
+diff -u --recursive grads-1.9b4-orig/src/config.h.in grads-1.9b4-rpm/src/config.h.in
 --- grads-1.9b4-orig/src/config.h.in	2004-12-15 22:00:03.000000000 +0100
-+++ grads-1.9b4/src/config.h.in	2005-08-16 12:05:39.000000000 +0200
++++ grads-1.9b4-rpm/src/config.h.in	2006-02-17 15:19:32.000000000 +0100
 @@ -88,6 +88,9 @@
  /* Define to 1 if you have the ANSI C header files. */
  #undef STDC_HEADERS
@@ -180,37 +191,9 @@
  /* Enable GUI widgets */
  #undef USEGUI
  
-Seulement dans grads-1.9b4/src: config.h.in~
-Seulement dans grads-1.9b4/src: fgbds.o
-Seulement dans grads-1.9b4/src: fgutil.o
-Seulement dans grads-1.9b4/src: gabufr.o
-Seulement dans grads-1.9b4/src: gabufrtbl.o
-Seulement dans grads-1.9b4/src: gacfg-c.o
-Seulement dans grads-1.9b4/src: gacfg-dods.o
-Seulement dans grads-1.9b4/src: gacfg-hdf.o
-Seulement dans grads-1.9b4/src: gacfg-nc.o
-Seulement dans grads-1.9b4/src: gaddes-c.o
-Seulement dans grads-1.9b4/src: gaddes-dods.o
-Seulement dans grads-1.9b4/src: gaddes-hdf.o
-Seulement dans grads-1.9b4/src: gaddes-nc.o
-Seulement dans grads-1.9b4/src: gaddes.sa.o
-Seulement dans grads-1.9b4/src: gaexpr.o
-Seulement dans grads-1.9b4/src: gafunc.o
-Seulement dans grads-1.9b4/src: gagmap.o
-Seulement dans grads-1.9b4/src: gagui.o
-Seulement dans grads-1.9b4/src: gagx.o
-Seulement dans grads-1.9b4/src: gaio-c.o
-Seulement dans grads-1.9b4/src: gaio-dods.o
-Seulement dans grads-1.9b4/src: gaio-hdf.o
-Seulement dans grads-1.9b4/src: gaio-nc.o
-Seulement dans grads-1.9b4/src: galats.o
-Seulement dans grads-1.9b4/src: gamach.o
-Seulement dans grads-1.9b4/src: gasdf-dods.o
-Seulement dans grads-1.9b4/src: gasdf-hdf.o
-Seulement dans grads-1.9b4/src: gasdf-nc.o
-diff -u --recursive --exclude aclocal.m4 --exclude configure --exclude Makefile.in --exclude bootstrap grads-1.9b4-orig/src/gauser.c grads-1.9b4/src/gauser.c
+diff -u --recursive grads-1.9b4-orig/src/gauser.c grads-1.9b4-rpm/src/gauser.c
 --- grads-1.9b4-orig/src/gauser.c	2005-05-18 20:51:01.000000000 +0200
-+++ grads-1.9b4/src/gauser.c	2005-08-16 11:33:49.000000000 +0200
++++ grads-1.9b4-rpm/src/gauser.c	2006-02-17 15:19:32.000000000 +0100
 @@ -42,6 +42,7 @@
  #endif
  
@@ -219,29 +202,9 @@
  
  /*mf 971022 --- expose Mike Fiorino's global struct to these routines for warning level setting mf*/
  extern struct gamfcmn mfcmn;
-Seulement dans grads-1.9b4/src: gauser-c.o
-Seulement dans grads-1.9b4/src: gauser-dods.o
-Seulement dans grads-1.9b4/src: gauser-hdf.o
-Seulement dans grads-1.9b4/src: gauser-nc.o
-Seulement dans grads-1.9b4/src: gautil.o
-Seulement dans grads-1.9b4/src: gautil.sa.o
-Seulement dans grads-1.9b4/src: gd13gif.o
-Seulement dans grads-1.9b4/src: gradsc
-Seulement dans grads-1.9b4/src: gradsdods
-Seulement dans grads-1.9b4/src: gradshdf
-Seulement dans grads-1.9b4/src: gradsnc
-Seulement dans grads-1.9b4/src: grads.o
-Seulement dans grads-1.9b4/src: gribmap
-Seulement dans grads-1.9b4/src: gribmap.o
-Seulement dans grads-1.9b4/src: gribscan
-Seulement dans grads-1.9b4/src: gribscan.o
-Seulement dans grads-1.9b4/src: gscrpt.o
-Seulement dans grads-1.9b4/src: gsgui.o
-Seulement dans grads-1.9b4/src: gxchpl.o
-Seulement dans grads-1.9b4/src: gxcntr.o
-diff -u --recursive --exclude aclocal.m4 --exclude configure --exclude Makefile.in --exclude bootstrap grads-1.9b4-orig/src/gxdxwd.c grads-1.9b4/src/gxdxwd.c
+diff -u --recursive grads-1.9b4-orig/src/gxdxwd.c grads-1.9b4-rpm/src/gxdxwd.c
 --- grads-1.9b4-orig/src/gxdxwd.c	2002-10-28 20:08:33.000000000 +0100
-+++ grads-1.9b4/src/gxdxwd.c	2005-08-16 11:33:49.000000000 +0200
++++ grads-1.9b4-rpm/src/gxdxwd.c	2006-02-17 15:19:32.000000000 +0100
 @@ -6,6 +6,7 @@
  #include <config.h>
  #endif
@@ -259,12 +222,9 @@
  
  #include "X11/XWDFile.h"
  
-Seulement dans grads-1.9b4/src: gxdxwd.o
-Seulement dans grads-1.9b4/src: gxeps
-Seulement dans grads-1.9b4/src: gxeps.o
-diff -u --recursive --exclude aclocal.m4 --exclude configure --exclude Makefile.in --exclude bootstrap grads-1.9b4-orig/src/gxhpng.c grads-1.9b4/src/gxhpng.c
+diff -u --recursive grads-1.9b4-orig/src/gxhpng.c grads-1.9b4-rpm/src/gxhpng.c
 --- grads-1.9b4-orig/src/gxhpng.c	2004-03-12 17:14:04.000000000 +0100
-+++ grads-1.9b4/src/gxhpng.c	2005-08-16 11:33:49.000000000 +0200
++++ grads-1.9b4-rpm/src/gxhpng.c	2006-02-17 15:19:32.000000000 +0100
 @@ -379,6 +379,11 @@
  	
  int gdCompareInt(const void *a, const void *b);
@@ -277,29 +237,3 @@
  /* Version of gdImageFilledPolygon to invoke my local 
     version of gdImageLne.  Nothing else changed... B.Doty 5/31/01 */
  
-Seulement dans grads-1.9b4/src: gxmeta.o
-Seulement dans grads-1.9b4/src: gxmeta.sa.o
-Seulement dans grads-1.9b4/src: gxps
-Seulement dans grads-1.9b4/src: gxps.o
-Seulement dans grads-1.9b4/src: gxshad.o
-Seulement dans grads-1.9b4/src: gxstrm.o
-Seulement dans grads-1.9b4/src: gxsubs.o
-Seulement dans grads-1.9b4/src: gxtran
-Seulement dans grads-1.9b4/src: gxtran.o
-Seulement dans grads-1.9b4/src: gxwmap.o
-Seulement dans grads-1.9b4/src: gxX.o
-Seulement dans grads-1.9b4/src: latsgribmap.o
-Seulement dans grads-1.9b4/src: latsgrib.o
-Seulement dans grads-1.9b4/src: latsint.o
-Seulement dans grads-1.9b4/src: latsnc-nc.o
-Seulement dans grads-1.9b4/src: latsnc.o
-Seulement dans grads-1.9b4/src: lats.o
-Seulement dans grads-1.9b4/src: latsstat.o
-Seulement dans grads-1.9b4/src: latstime.o
-Seulement dans grads-1.9b4/src: Makefile
-Seulement dans grads-1.9b4/src: stamp-h
-Seulement dans grads-1.9b4/src: stamp-h1
-Seulement dans grads-1.9b4/src: stnmap
-Seulement dans grads-1.9b4/src: stnmap.o
-Seulement dans grads-1.9b4/src: wgrib
-Seulement dans grads-1.9b4/src: wgrib.o


Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/FC-3/grads.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- grads.spec	28 Jan 2006 15:17:40 -0000	1.8
+++ grads.spec	21 Apr 2006 20:40:05 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        6%{?dist}.1
+Release:        9%{?dist}
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -16,6 +16,8 @@
 Source6:        grads-copyright_summary
 # README telling to turn BackingStore true
 Source5:        grads-README.xorg
+# include file that changes netcdf names to netcdf hdf names
+Source7:        gawrapsd.h
 # Use these files to remove files with GPL incompatible licences. In the
 # SOURCES directory with grads tarball and grads-removed-files-list, do
 # sh grads-remove-files
@@ -26,10 +28,8 @@
 Patch1:         grads_dap-no_lats.patch
 Patch2:         grads-conditionnal_lats.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# configure fails on x86_64
-ExcludeArch:    x86_64
 
-# no hdf on FC-3
+BuildRequires:  hdf-devel 
 BuildRequires:  udunits-devel netcdf-devel 
 BuildRequires:  readline-devel
 BuildRequires:  libdap-devel libnc-dap-devel
@@ -53,6 +53,8 @@
 # copy grib notice
 cp %{SOURCE2} .
 cp %{SOURCE6} .
+# copy hdf include wrapper file
+cp %{SOURCE7} src
 # concatenate autoconf m4 files
 cat %{SOURCE3} %{SOURCE4} acinclude.m4 > acinclude.m4.new
 cp acinclude.m4.new acinclude.m4
@@ -67,7 +69,6 @@
 
 %build
 ./bootstrap
-# pass the -L and -I flags for hdf on ppc even though there is no hdf
 %configure --without-gui --without-lats LDFLAGS="-L%{_libdir}/netcdf-3/ -L/usr/X11R6/lib/ -lXaw -L%{_libdir}/hdf/" CPPFLAGS="-I%{_includedir}/netcdf-3/ -I%{_includedir}/hdf/" --enable-dyn-supplibs
 
 make %{?_smp_mflags}
@@ -89,6 +90,7 @@
 %{_bindir}/bufrscan
 %{_bindir}/gradsc
 %{_bindir}/gradsdods
+%{_bindir}/gradshdf
 %{_bindir}/gradsnc
 %{_bindir}/gribmap
 %{_bindir}/gribscan
@@ -102,7 +104,15 @@
 %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
-* Thu Jan 19 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-6.1
+* Sat Mar 11 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-9
+- rebuild for newer libdap
+
+* Fri Feb 17 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-8
+- enable hdf for ppc, now that it is there
+- use a wrapper include file to prepend sd_ to netcdf symbols for
+  hdf if it is required
+
+* Thu Jan 19 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-6
 - add BR on readline-devel close #178285
 
 * Wed Dec 21 2005 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-5



From fedora-extras-commits at redhat.com  Fri Apr 21 21:00:42 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 21 Apr 2006 14:00:42 -0700
Subject: rpms/grads/FC-5 grads.spec,1.8,1.9
Message-ID: <200604212100.k3LL0iT4012361@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12344

Modified Files:
	grads.spec 
Log Message:
* Fri Apr 21 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-10
- remove unneeded X related BR and configure flags since the gui isn't built



Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/FC-5/grads.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- grads.spec	11 Mar 2006 15:06:20 -0000	1.8
+++ grads.spec	21 Apr 2006 21:00:42 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        9%{?dist}
+Release:        10%{?dist}
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -33,7 +33,7 @@
 BuildRequires:  udunits-devel netcdf-devel 
 BuildRequires:  readline-devel
 BuildRequires:  libdap-devel libnc-dap-devel
-BuildRequires:  libsx-devel Xaw3d-devel zlib-devel libjpeg-devel gd-devel
+BuildRequires:  zlib-devel libjpeg-devel gd-devel
 BuildRequires:  ncurses-devel libpng-devel
 
 %description
@@ -69,7 +69,7 @@
 
 %build
 ./bootstrap
-%configure --without-gui --without-lats LDFLAGS="-L%{_libdir}/netcdf-3/ -L/usr/X11R6/lib/ -lXaw -L%{_libdir}/hdf/" CPPFLAGS="-I%{_includedir}/netcdf-3/ -I%{_includedir}/hdf/" --enable-dyn-supplibs
+%configure --without-gui --without-lats LDFLAGS="-L%{_libdir}/netcdf-3/ -L%{_libdir}/hdf/" CPPFLAGS="-I%{_includedir}/netcdf-3/ -I%{_includedir}/hdf/" --enable-dyn-supplibs
 
 make %{?_smp_mflags}
 cp -r doc html
@@ -104,6 +104,9 @@
 %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
+* Fri Apr 21 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-10
+- remove unneeded X related BR and configure flags since the gui isn't built
+
 * Sat Mar 11 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-9
 - rebuild for newer libdap
 



From fedora-extras-commits at redhat.com  Fri Apr 21 21:17:50 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 14:17:50 -0700
Subject: rpms/perl-Test-Deep/FC-5 .cvsignore, 1.2, 1.3 perl-Test-Deep.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200604212117.k3LLHqbG014592@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-Deep/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14571

Modified Files:
	.cvsignore perl-Test-Deep.spec sources 
Log Message:
Update to 0.095.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Deep/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Apr 2006 18:23:07 -0000	1.2
+++ .cvsignore	21 Apr 2006 21:17:50 -0000	1.3
@@ -1 +1 @@
-Test-Deep-0.093.tar.gz
+Test-Deep-0.095.tar.gz


Index: perl-Test-Deep.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Deep/FC-5/perl-Test-Deep.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Test-Deep.spec	10 Apr 2006 18:23:07 -0000	1.1
+++ perl-Test-Deep.spec	21 Apr 2006 21:17:50 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           perl-Test-Deep
-Version:        0.093
+Version:        0.095
 Release:        1%{?dist}
 Summary:        Extremely flexible deep comparison
 License:        GPL or Artistic
@@ -50,6 +50,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Apr 21 2006 Steven Pritchard <steve at kspei.com> 0.095-1
+- Update to 0.095.
+
 * Sat Apr 08 2006 Steven Pritchard <steve at kspei.com> 0.093-1
 - Specfile autogenerated by cpanspec 1.64.
 - Improve description.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Deep/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Apr 2006 18:23:07 -0000	1.2
+++ sources	21 Apr 2006 21:17:50 -0000	1.3
@@ -1 +1 @@
-b47659e09457a72157d3db5b5be62f75  Test-Deep-0.093.tar.gz
+fb6fe44d0f6e58a0dd552f9ee958cc24  Test-Deep-0.095.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 21:18:52 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 14:18:52 -0700
Subject: rpms/perl-Test-Deep/FC-4 .cvsignore, 1.2, 1.3 perl-Test-Deep.spec,
	1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200604212118.k3LLIsEF014666@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Test-Deep/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14643

Modified Files:
	.cvsignore perl-Test-Deep.spec sources 
Log Message:
Update to 0.095.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Deep/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	10 Apr 2006 18:23:07 -0000	1.2
+++ .cvsignore	21 Apr 2006 21:18:52 -0000	1.3
@@ -1 +1 @@
-Test-Deep-0.093.tar.gz
+Test-Deep-0.095.tar.gz


Index: perl-Test-Deep.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Deep/FC-4/perl-Test-Deep.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Test-Deep.spec	10 Apr 2006 18:23:07 -0000	1.1
+++ perl-Test-Deep.spec	21 Apr 2006 21:18:52 -0000	1.2
@@ -1,5 +1,5 @@
 Name:           perl-Test-Deep
-Version:        0.093
+Version:        0.095
 Release:        1%{?dist}
 Summary:        Extremely flexible deep comparison
 License:        GPL or Artistic
@@ -50,6 +50,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Fri Apr 21 2006 Steven Pritchard <steve at kspei.com> 0.095-1
+- Update to 0.095.
+
 * Sat Apr 08 2006 Steven Pritchard <steve at kspei.com> 0.093-1
 - Specfile autogenerated by cpanspec 1.64.
 - Improve description.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-Deep/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	10 Apr 2006 18:23:07 -0000	1.2
+++ sources	21 Apr 2006 21:18:52 -0000	1.3
@@ -1 +1 @@
-b47659e09457a72157d3db5b5be62f75  Test-Deep-0.093.tar.gz
+fb6fe44d0f6e58a0dd552f9ee958cc24  Test-Deep-0.095.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 21:31:05 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 21 Apr 2006 14:31:05 -0700
Subject: rpms/grads/FC-5 grads.spec,1.9,1.10
Message-ID: <200604212131.k3LLV7kt015211@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15193

Modified Files:
	grads.spec 
Log Message:
* Fri Apr 21 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-11
- Add needed X related BR



Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/FC-5/grads.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- grads.spec	21 Apr 2006 21:00:42 -0000	1.9
+++ grads.spec	21 Apr 2006 21:31:05 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -35,6 +35,7 @@
 BuildRequires:  libdap-devel libnc-dap-devel
 BuildRequires:  zlib-devel libjpeg-devel gd-devel
 BuildRequires:  ncurses-devel libpng-devel
+BuildRequires:  libXmu-devel libX11-devel
 
 %description
 The Grid Analysis and Display System (GrADS) is an interactive desktop tool
@@ -104,6 +105,9 @@
 %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
+* Fri Apr 21 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-11
+- Add needed X related BR
+
 * Fri Apr 21 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-10
 - remove unneeded X related BR and configure flags since the gui isn't built
 



From fedora-extras-commits at redhat.com  Fri Apr 21 21:37:55 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Fri, 21 Apr 2006 14:37:55 -0700
Subject: rpms/prboom/devel prboom-2.4.1-gamedir.patch, NONE, 1.1 .cvsignore, 
	1.2, 1.3 prboom.spec, 1.3, 1.4 sources, 1.2,
	1.3 prboom-2.3.1-64bit.patch, 1.1,
	NONE prboom-2.3.1-config.patch, 1.1,
	NONE prboom-2.3.1-fixpsnprintf.patch, 1.1,
	NONE prboom-2.3.1-gamedir.patch, 1.2,
	NONE prboom-2.3.1-gcc4.patch, 1.2, NONE
Message-ID: <200604212137.k3LLbvHA015558@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/prboom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15508

Modified Files:
	.cvsignore prboom.spec sources 
Added Files:
	prboom-2.4.1-gamedir.patch 
Removed Files:
	prboom-2.3.1-64bit.patch prboom-2.3.1-config.patch 
	prboom-2.3.1-fixpsnprintf.patch prboom-2.3.1-gamedir.patch 
	prboom-2.3.1-gcc4.patch 
Log Message:
Update to 2.4.1



prboom-2.4.1-gamedir.patch:

--- NEW FILE prboom-2.4.1-gamedir.patch ---
diff -Naur --exclude '*.swp' prboom-2.4.1/configure prboom-2.4.1.new/configure
--- prboom-2.4.1/configure	2006-04-06 07:00:39.000000000 -0700
+++ prboom-2.4.1.new/configure	2006-04-18 19:02:51.000000000 -0700
@@ -1871,9 +1871,9 @@
 
 
 if test "x$prefix" != xNONE; then
-  DOOMWADDIR="$prefix/share/games/doom"
+  DOOMWADDIR="$prefix/share/doom"
 else
-  DOOMWADDIR="$ac_default_prefix/share/games/doom"
+  DOOMWADDIR="$ac_default_prefix/share/doom"
 fi
 cat >>confdefs.h <<_ACEOF
 #define DOOMWADDIR "$DOOMWADDIR"
diff -Naur --exclude '*.swp' prboom-2.4.1/src/d_main.c prboom-2.4.1.new/src/d_main.c
--- prboom-2.4.1/src/d_main.c	2006-04-02 09:20:33.000000000 -0700
+++ prboom-2.4.1.new/src/d_main.c	2006-04-18 19:02:06.000000000 -0700
@@ -138,6 +138,7 @@
   "doom.wad",
   "doom1.wad",
   "doomu.wad", /* CPhipps - alow doomu.wad */
+  "freedoom.wad", /* wart at kobold.org:  added freedoom for Fedora Extras */
 };
 static const int nstandard_iwads = sizeof standard_iwads/sizeof*standard_iwads;
 
diff -Naur --exclude '*.swp' prboom-2.4.1/src/s_sound.c prboom-2.4.1.new/src/s_sound.c
--- prboom-2.4.1/src/s_sound.c	2006-04-01 06:32:50.000000000 -0800
+++ prboom-2.4.1.new/src/s_sound.c	2006-04-20 15:16:09.000000000 -0700
@@ -505,6 +505,7 @@
 
       // load & register it
       music->data = W_CacheLumpNum(music->lumpnum);
+      fprintf(stderr, "Loading music lump #%d\n", music->lumpnum);
       music->handle = I_RegisterSong(music->data, W_LumpLength(music->lumpnum));
     }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/prboom/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Mar 2006 19:30:09 -0000	1.2
+++ .cvsignore	21 Apr 2006 21:37:55 -0000	1.3
@@ -1 +1 @@
-prboom-2.3.1.tar.gz
+prboom-2.4.1.tar.gz


Index: prboom.spec
===================================================================
RCS file: /cvs/extras/rpms/prboom/devel/prboom.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- prboom.spec	19 Mar 2006 06:56:29 -0000	1.3
+++ prboom.spec	21 Apr 2006 21:37:55 -0000	1.4
@@ -1,22 +1,19 @@
 %define waddir  %{_datadir}/doom
 
 Name:           prboom
-Version:        2.3.1
-Release:        5%{?dist}
+Version:        2.4.1
+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.3.1.tar.gz
-Patch0:         prboom-2.3.1-gcc4.patch
-Patch1:         prboom-2.3.1-gamedir.patch
-Patch2:         prboom-2.3.1-config.patch
-Patch3:         prboom-2.3.1-64bit.patch
-Patch4:         prboom-2.3.1-fixpsnprintf.patch
+Source0:        http://dl.sourceforge.net/prboom/prboom-2.4.1.tar.gz
+Patch0:         prboom-2.4.1-gamedir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL_mixer-devel SDL_net-devel
+BuildRequires:  libGLU-devel
 Requires:       freedoom
 
 %description
@@ -30,13 +27,9 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
-%configure --disable-cpu-opt --program-prefix=''
+%configure --enable-gl --disable-cpu-opt --program-prefix=''
 make %{?_smp_mflags}
 
 %install
@@ -69,6 +62,12 @@
 %doc doc/README.compat doc/README.demos doc/MBF.txt doc/MBFFAQ.txt doc/boom.txt
 
 %changelog
+* Tue Apr 18 2006 Wart <wart at kobold.org> 2.4.1-1
+- Update to 2.4.1
+
+* Sun Mar 19 2006 Wart <wart at kobold.org> 2.3.1-6
+- Updated -gamedir patch to add freedoom to the in-game wad menu.
+
 * Sat Mar 18 2006 Wart <wart at kobold.org> 2.3.1-5
 - Updated patches to fix segfault on i386 (BZ #185741)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/prboom/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Mar 2006 19:30:09 -0000	1.2
+++ sources	21 Apr 2006 21:37:55 -0000	1.3
@@ -1 +1 @@
-c53231604fe6cf7352e73911ad44c90d  prboom-2.3.1.tar.gz
+5cfd46fe7e3aaccfb1840b249bf34b97  prboom-2.4.1.tar.gz


--- prboom-2.3.1-64bit.patch DELETED ---


--- prboom-2.3.1-config.patch DELETED ---


--- prboom-2.3.1-fixpsnprintf.patch DELETED ---


--- prboom-2.3.1-gamedir.patch DELETED ---


--- prboom-2.3.1-gcc4.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Apr 21 21:38:00 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 14:38:00 -0700
Subject: rpms/perl-Object-Accessor/devel - New directory
Message-ID: <200604212138.k3LLc37q015591@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-serv15562/perl-Object-Accessor/devel

Log Message:
Directory /cvs/extras/rpms/perl-Object-Accessor/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 21:38:00 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 14:38:00 -0700
Subject: rpms/perl-Object-Accessor - New directory
Message-ID: <200604212138.k3LLc24S015588@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Object-Accessor
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15562/perl-Object-Accessor

Log Message:
Directory /cvs/extras/rpms/perl-Object-Accessor added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 21:38:26 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 14:38:26 -0700
Subject: rpms/perl-Object-Accessor/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604212138.k3LLcSsl015643@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-serv15607/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Object-Accessor


--- 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 Apr 21 21:38:25 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 14:38:25 -0700
Subject: rpms/perl-Object-Accessor Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604212138.k3LLcR8L015640@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Object-Accessor
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15607

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Object-Accessor


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Object-Accessor
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 21 21:39:09 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 14:39:09 -0700
Subject: rpms/perl-Object-Accessor import.log,1.1,1.2
Message-ID: <200604212139.k3LLdfn8015715@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Object-Accessor
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15671

Modified Files:
	import.log 
Log Message:
auto-import perl-Object-Accessor-0.12-2 on branch devel from perl-Object-Accessor-0.12-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Object-Accessor/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Apr 2006 21:38:25 -0000	1.1
+++ import.log	21 Apr 2006 21:39:09 -0000	1.2
@@ -0,0 +1 @@
+perl-Object-Accessor-0_12-2:HEAD:perl-Object-Accessor-0.12-2.src.rpm:1145655535



From fedora-extras-commits at redhat.com  Fri Apr 21 21:39:10 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 14:39:10 -0700
Subject: rpms/perl-Object-Accessor/devel perl-Object-Accessor.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604212139.k3LLdgXh015719@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-serv15671/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Object-Accessor.spec 
Log Message:
auto-import perl-Object-Accessor-0.12-2 on branch devel from perl-Object-Accessor-0.12-2.src.rpm


--- NEW FILE perl-Object-Accessor.spec ---
Name:           perl-Object-Accessor
Version:        0.12
Release:        2%{?dist}
Summary:        Perl module that allows per object accessors
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Object-Accessor/
Source0:        http://www.cpan.org/authors/id/K/KA/KANE/Object-Accessor-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Params::Check) >= 0.23
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Object::Accessor provides an interface to create per object accessors (as
opposed to per Class accessors, as, for example, Class::Accessor provides).

%prep
%setup -q -n Object-Accessor-%{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+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Sat Apr 15 2006 Steven Pritchard <steve at kspei.com> 0.12-2
- Remove explicit perl(Params::Check) dependency.

* Thu Mar 23 2006 Steven Pritchard <steve at kspei.com> 0.12-1
- Specfile autogenerated by cpanspec 1.62.
- Fix Summary.
- Fix License.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Object-Accessor/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2006 21:38:26 -0000	1.1
+++ .cvsignore	21 Apr 2006 21:39:10 -0000	1.2
@@ -0,0 +1 @@
+Object-Accessor-0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Object-Accessor/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2006 21:38:26 -0000	1.1
+++ sources	21 Apr 2006 21:39:10 -0000	1.2
@@ -0,0 +1 @@
+722421fcbe2a18facd056ea6edb1be4f  Object-Accessor-0.12.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 21:48:13 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 21 Apr 2006 14:48:13 -0700
Subject: rpms/grads/FC-4 grads.spec,1.10,1.11
Message-ID: <200604212148.k3LLmF2q015980@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15958

Modified Files:
	grads.spec 
Log Message:
- Add needed X related BR
- remove unneeded Xaw related BR and configure flags since the gui isn't built




Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/FC-4/grads.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- grads.spec	21 Apr 2006 20:36:26 -0000	1.10
+++ grads.spec	21 Apr 2006 21:48:13 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        9%{?dist}
+Release:        11%{?dist}
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -33,8 +33,9 @@
 BuildRequires:  udunits-devel netcdf-devel 
 BuildRequires:  readline-devel
 BuildRequires:  libdap-devel libnc-dap-devel
-BuildRequires:  libsx-devel Xaw3d-devel zlib-devel libjpeg-devel gd-devel
+BuildRequires:  zlib-devel libjpeg-devel gd-devel
 BuildRequires:  ncurses-devel libpng-devel
+BuildRequires:  libXmu-devel libX11-devel
 
 %description
 The Grid Analysis and Display System (GrADS) is an interactive desktop tool
@@ -69,7 +70,7 @@
 
 %build
 ./bootstrap
-%configure --without-gui --without-lats LDFLAGS="-L%{_libdir}/netcdf-3/ -L/usr/X11R6/lib/ -lXaw -L%{_libdir}/hdf/" CPPFLAGS="-I%{_includedir}/netcdf-3/ -I%{_includedir}/hdf/" --enable-dyn-supplibs
+%configure --without-gui --without-lats LDFLAGS="-L%{_libdir}/netcdf-3/ -L%{_libdir}/hdf/" CPPFLAGS="-I%{_includedir}/netcdf-3/ -I%{_includedir}/hdf/" --enable-dyn-supplibs
 
 make %{?_smp_mflags}
 cp -r doc html
@@ -104,6 +105,12 @@
 %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
+* Fri Apr 21 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-11
+- Add needed X related BR
+
+* Fri Apr 21 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-10
+- remove unneeded X related BR and configure flags since the gui isn't built
+
 * Sat Mar 11 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-9
 - rebuild for newer libdap
 



From fedora-extras-commits at redhat.com  Fri Apr 21 21:51:38 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 21 Apr 2006 14:51:38 -0700
Subject: rpms/grads/devel grads.spec,1.8,1.9
Message-ID: <200604212151.k3LLpefn016170@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16153

Modified Files:
	grads.spec 
Log Message:
- Add needed X related BR
- remove unneeded Xaw related BR and configure flags since the gui isn't built




Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/devel/grads.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- grads.spec	11 Mar 2006 15:06:20 -0000	1.8
+++ grads.spec	21 Apr 2006 21:51:38 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        9%{?dist}
+Release:        11%{?dist}
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -33,8 +33,9 @@
 BuildRequires:  udunits-devel netcdf-devel 
 BuildRequires:  readline-devel
 BuildRequires:  libdap-devel libnc-dap-devel
-BuildRequires:  libsx-devel Xaw3d-devel zlib-devel libjpeg-devel gd-devel
+BuildRequires:  zlib-devel libjpeg-devel gd-devel
 BuildRequires:  ncurses-devel libpng-devel
+BuildRequires:  libXmu-devel libX11-devel
 
 %description
 The Grid Analysis and Display System (GrADS) is an interactive desktop tool
@@ -69,7 +70,7 @@
 
 %build
 ./bootstrap
-%configure --without-gui --without-lats LDFLAGS="-L%{_libdir}/netcdf-3/ -L/usr/X11R6/lib/ -lXaw -L%{_libdir}/hdf/" CPPFLAGS="-I%{_includedir}/netcdf-3/ -I%{_includedir}/hdf/" --enable-dyn-supplibs
+%configure --without-gui --without-lats LDFLAGS="-L%{_libdir}/netcdf-3/ -L%{_libdir}/hdf/" CPPFLAGS="-I%{_includedir}/netcdf-3/ -I%{_includedir}/hdf/" --enable-dyn-supplibs
 
 make %{?_smp_mflags}
 cp -r doc html
@@ -104,6 +105,12 @@
 %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
+* Fri Apr 21 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-11
+- Add needed X related BR
+
+* Fri Apr 21 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-10
+- remove unneeded X related BR and configure flags since the gui isn't built
+
 * Sat Mar 11 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-9
 - rebuild for newer libdap
 



From fedora-extras-commits at redhat.com  Fri Apr 21 21:53:12 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 14:53:12 -0700
Subject: owners owners.list,1.868,1.869
Message-ID: <200604212153.k3LLrE5J016238@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16221

Modified Files:
	owners.list 
Log Message:
Add perl-Object-Accessor.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.868
retrieving revision 1.869
diff -u -r1.868 -r1.869
--- owners.list	21 Apr 2006 19:10:26 -0000	1.868
+++ owners.list	21 Apr 2006 21:53:12 -0000	1.869
@@ -1059,6 +1059,7 @@
 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-Number-Compare|Perl module for numeric comparisons|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Object-Accessor|Perl module that allows per object accessors|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-OLE-Storage_Lite|Simple Class for OLE document interface|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-PAR-Dist|Toolkit for creating and manipulating Perl PAR distributions|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Params-Check|Generic input parsing/checking mechanism|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Fri Apr 21 21:55:04 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 14:55:04 -0700
Subject: rpms/perl-File-Fetch - New directory
Message-ID: <200604212155.k3LLt6Bh016320@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-File-Fetch
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16294/perl-File-Fetch

Log Message:
Directory /cvs/extras/rpms/perl-File-Fetch added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 21:55:05 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 14:55:05 -0700
Subject: rpms/perl-File-Fetch/devel - New directory
Message-ID: <200604212155.k3LLt7XW016323@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-File-Fetch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16294/perl-File-Fetch/devel

Log Message:
Directory /cvs/extras/rpms/perl-File-Fetch/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 21:55:20 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 14:55:20 -0700
Subject: rpms/perl-File-Fetch Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604212155.k3LLtMk8016367@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-File-Fetch
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16339

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-File-Fetch


--- NEW FILE Makefile ---
# Top level Makefile for module perl-File-Fetch
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 21 21:55:21 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 14:55:21 -0700
Subject: rpms/perl-File-Fetch/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604212155.k3LLtNxE016370@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-File-Fetch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16339/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-File-Fetch


--- 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 Apr 21 21:55:57 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 14:55:57 -0700
Subject: rpms/perl-File-Fetch import.log,1.1,1.2
Message-ID: <200604212155.k3LLtx9a016436@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-File-Fetch
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16403

Modified Files:
	import.log 
Log Message:
auto-import perl-File-Fetch-0.07-1 on branch devel from perl-File-Fetch-0.07-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Fetch/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Apr 2006 21:55:20 -0000	1.1
+++ import.log	21 Apr 2006 21:55:56 -0000	1.2
@@ -0,0 +1 @@
+perl-File-Fetch-0_07-1:HEAD:perl-File-Fetch-0.07-1.src.rpm:1145656550



From fedora-extras-commits at redhat.com  Fri Apr 21 21:55:57 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 14:55:57 -0700
Subject: rpms/perl-File-Fetch/devel perl-File-Fetch.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604212155.k3LLtxab016441@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-File-Fetch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16403/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-File-Fetch.spec 
Log Message:
auto-import perl-File-Fetch-0.07-1 on branch devel from perl-File-Fetch-0.07-1.src.rpm


--- NEW FILE perl-File-Fetch.spec ---
Name:           perl-File-Fetch
Version:        0.07
Release:        1%{?dist}
Summary:        A generic file fetching mechanism
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/File-Fetch/
Source0:        http://www.cpan.org/authors/id/K/KA/KANE/File-Fetch-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(IPC::Cmd) >= 0.04
BuildRequires:  perl(Locale::Maketext::Simple)
BuildRequires:  perl(Module::Load::Conditional) >= 0.04
BuildRequires:  perl(Params::Check) >= 0.07
Requires:       perl(IPC::Cmd) >= 0.04
Requires:       perl(Module::Load::Conditional) >= 0.04
Requires:       perl(Params::Check) >= 0.07
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
File::Fetch is a generic file fetching mechanism.

%prep
%setup -q -n File-Fetch-%{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+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

%check
%{?_with_check:make test}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc CHANGES README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Mar 23 2006 Steven Pritchard <steve at kspei.com> 0.07-1
- Specfile autogenerated by cpanspec 1.62.
- Fix License.
- Drop explicit Requires: perl(Locale::Maketext::Simple).
- Disable "make test" by default (requires Internet connectivity).


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Fetch/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2006 21:55:20 -0000	1.1
+++ .cvsignore	21 Apr 2006 21:55:57 -0000	1.2
@@ -0,0 +1 @@
+File-Fetch-0.07.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-File-Fetch/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2006 21:55:20 -0000	1.1
+++ sources	21 Apr 2006 21:55:57 -0000	1.2
@@ -0,0 +1 @@
+53135c09fa15e9cb0a980b153b9634e0  File-Fetch-0.07.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 21:59:40 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 21 Apr 2006 14:59:40 -0700
Subject: rpms/grads/devel grads.spec,1.9,1.10
Message-ID: <200604212159.k3LLxgme017016@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16941

Modified Files:
	grads.spec 
Log Message:
BR monolithic Xorg


Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/devel/grads.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- grads.spec	21 Apr 2006 21:51:38 -0000	1.9
+++ grads.spec	21 Apr 2006 21:59:40 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        11%{?dist}
+Release:        11%{?dist}.1
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -35,7 +35,7 @@
 BuildRequires:  libdap-devel libnc-dap-devel
 BuildRequires:  zlib-devel libjpeg-devel gd-devel
 BuildRequires:  ncurses-devel libpng-devel
-BuildRequires:  libXmu-devel libX11-devel
+BuildRequires:  xorg-x11-devel
 
 %description
 The Grid Analysis and Display System (GrADS) is an interactive desktop tool
@@ -105,7 +105,7 @@
 %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
-* Fri Apr 21 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-11
+* Fri Apr 21 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-11.1
 - Add needed X related BR
 
 * Fri Apr 21 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-10



From fedora-extras-commits at redhat.com  Fri Apr 21 22:03:55 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 21 Apr 2006 15:03:55 -0700
Subject: rpms/grads/devel grads.spec,1.10,1.11
Message-ID: <200604212203.k3LM3vAk019383@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19366

Modified Files:
	grads.spec 
Log Message:
revert change, use modular Xorg


Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/devel/grads.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- grads.spec	21 Apr 2006 21:59:40 -0000	1.10
+++ grads.spec	21 Apr 2006 22:03:55 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        11%{?dist}.1
+Release:        11%{?dist}.2
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -35,7 +35,7 @@
 BuildRequires:  libdap-devel libnc-dap-devel
 BuildRequires:  zlib-devel libjpeg-devel gd-devel
 BuildRequires:  ncurses-devel libpng-devel
-BuildRequires:  xorg-x11-devel
+BuildRequires:  libXmu-devel libX11-devel
 
 %description
 The Grid Analysis and Display System (GrADS) is an interactive desktop tool
@@ -105,7 +105,7 @@
 %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
-* Fri Apr 21 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-11.1
+* Fri Apr 21 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-11.2
 - Add needed X related BR
 
 * Fri Apr 21 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-10



From fedora-extras-commits at redhat.com  Fri Apr 21 22:05:26 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 21 Apr 2006 15:05:26 -0700
Subject: rpms/grads/FC-4 grads.spec,1.11,1.12
Message-ID: <200604212205.k3LM5Stq019415@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19398

Modified Files:
	grads.spec 
Log Message:
BR monolithic Xorg


Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/FC-4/grads.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- grads.spec	21 Apr 2006 21:48:13 -0000	1.11
+++ grads.spec	21 Apr 2006 22:05:25 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        11%{?dist}
+Release:        11%{?dist}.1
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -35,7 +35,7 @@
 BuildRequires:  libdap-devel libnc-dap-devel
 BuildRequires:  zlib-devel libjpeg-devel gd-devel
 BuildRequires:  ncurses-devel libpng-devel
-BuildRequires:  libXmu-devel libX11-devel
+BuildRequires:  xorg-x11-devel
 
 %description
 The Grid Analysis and Display System (GrADS) is an interactive desktop tool
@@ -105,7 +105,7 @@
 %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
-* Fri Apr 21 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-11
+* Fri Apr 21 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-11.1
 - Add needed X related BR
 
 * Fri Apr 21 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-10



From fedora-extras-commits at redhat.com  Fri Apr 21 22:19:58 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Fri, 21 Apr 2006 15:19:58 -0700
Subject: rpms/grads/FC-3 grads.spec,1.9,1.10
Message-ID: <200604212220.k3LMK0hL019816@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/grads/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19799

Modified Files:
	grads.spec 
Log Message:
- Add needed X related BR
- remove unneeded Xaw related BR and configure flags since the gui isn't built




Index: grads.spec
===================================================================
RCS file: /cvs/extras/rpms/grads/FC-3/grads.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- grads.spec	21 Apr 2006 20:40:05 -0000	1.9
+++ grads.spec	21 Apr 2006 22:19:58 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           grads
 Version:        1.9b4
-Release:        9%{?dist}
+Release:        11%{?dist}
 Summary:        Tool for easy acces, manipulation, and visualization of data
 
 Group:          Applications/Engineering
@@ -33,8 +33,9 @@
 BuildRequires:  udunits-devel netcdf-devel 
 BuildRequires:  readline-devel
 BuildRequires:  libdap-devel libnc-dap-devel
-BuildRequires:  libsx-devel Xaw3d-devel zlib-devel libjpeg-devel gd-devel
+BuildRequires:  zlib-devel libjpeg-devel gd-devel
 BuildRequires:  ncurses-devel libpng-devel
+BuildRequires:  xorg-x11-devel
 
 %description
 The Grid Analysis and Display System (GrADS) is an interactive desktop tool
@@ -69,7 +70,7 @@
 
 %build
 ./bootstrap
-%configure --without-gui --without-lats LDFLAGS="-L%{_libdir}/netcdf-3/ -L/usr/X11R6/lib/ -lXaw -L%{_libdir}/hdf/" CPPFLAGS="-I%{_includedir}/netcdf-3/ -I%{_includedir}/hdf/" --enable-dyn-supplibs
+%configure --without-gui --without-lats LDFLAGS="-L%{_libdir}/netcdf-3/ -L%{_libdir}/hdf/" CPPFLAGS="-I%{_includedir}/netcdf-3/ -I%{_includedir}/hdf/" --enable-dyn-supplibs
 
 make %{?_smp_mflags}
 cp -r doc html
@@ -104,6 +105,12 @@
 %doc COPYRIGHT NOTICE.wgrib html README.xorg grads-copyright_summary
 
 %changelog
+* Fri Apr 21 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-11
+- Add needed X related BR
+
+* Fri Apr 21 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-10
+- remove unneeded X related BR and configure flags since the gui isn't built
+
 * Sat Mar 11 2006 Patrice Dumas <dumas at centre-cired.fr> 1.9b4-9
 - rebuild for newer libdap
 



From fedora-extras-commits at redhat.com  Fri Apr 21 22:38:24 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 15:38:24 -0700
Subject: rpms/sylpheed-claws/FC-4 .cvsignore, 1.13, 1.14 sources, 1.14,
	1.15 sylpheed-claws.spec, 1.30, 1.31
Message-ID: <200604212238.k3LMcQop019982@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-serv19929/FC-4

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
- split plugins from main package to ease requirements (#189113)
- version upgrade (#183357)
- fix libpisock (#189585)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- .cvsignore	5 Apr 2006 21:37:27 -0000	1.13
+++ .cvsignore	21 Apr 2006 22:38:24 -0000	1.14
@@ -1 +1 @@
-sylpheed-claws-2.1.0.tar.bz2
+sylpheed-claws-2.1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	5 Apr 2006 21:37:27 -0000	1.14
+++ sources	21 Apr 2006 22:38:24 -0000	1.15
@@ -1 +1 @@
-03988307d87ed9d10253d35b323e5e51  sylpheed-claws-2.1.0.tar.bz2
+8d7b1d01c4f236a5e7d3e139bf43cd5a  sylpheed-claws-2.1.1.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sylpheed-claws.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sylpheed-claws.spec	5 Apr 2006 21:43:47 -0000	1.30
+++ sylpheed-claws.spec	21 Apr 2006 22:38:24 -0000	1.31
@@ -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.1.0
+Version:        2.1.1
 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.1.0.tar.bz2
+Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.1.1.tar.bz2
 Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -28,8 +28,6 @@
 BuildRequires:  gettext-devel
 BuildRequires:  libetpan-devel >= 0.45
 BuildRequires:  libgnomeprintui22-devel
-Requires:  spamassassin
-Requires:  dillo
 
 %description
 The bleeding edge branch of Sylpheed, a GTK+ based, lightweight, and fast
@@ -47,6 +45,40 @@
 The %{name}-devel package contains the header files  and pkgconfig file needed
 for development with %{name}.
 
+%package plugins-clamav
+Summary:        Clamav antivirus plugin for sylpheed-claws
+Group:          Applications/Internet
+Requires:       %{name} = %{version}-%{release}
+
+%description plugins-clamav
+%{summary}
+
+%package plugins-dillo
+Summary:        Dillo HTML viewer plugin for sylpheed-claws
+Group:          Applications/Internet
+Requires:       %{name} = %{version}-%{release}
+Requires:       dillo
+
+%description plugins-dillo
+%{summary}
+
+%package plugins-spamassassin
+Summary:        Spamassassin plugin for sylpheed-claws
+Group:          Applications/Internet
+Requires:       %{name} = %{version}-%{release}
+Requires:       spamassassin
+
+%description plugins-spamassassin
+%{summary}
+
+%package plugins-pgp
+Summary:        PGP plugin for signing and encrypting mail
+Group:          Applications/Internet
+Requires:       %{name} = %{version}-%{release}
+
+%description plugins-pgp
+%{summary}
+
 %prep
 %setup -q
 
@@ -80,6 +112,8 @@
 %{__rm} -rf ${RPM_BUILD_ROOT}%{_datadir}/gnome
 
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
+find ${RPM_BUILD_ROOT}/%{_libdir}/sylpheed-claws/plugins/ -type f -name \
+"*.a" -exec rm -f {} ';'
 
 %{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
 
@@ -97,10 +131,9 @@
 %{_bindir}/*
 %dir %{_libdir}/sylpheed-claws/
 %dir %{_libdir}/sylpheed-claws/plugins/
-%{_libdir}/sylpheed-claws/plugins/*.so
-%exclude %{_libdir}/sylpheed-claws/plugins/*.a
+%{_libdir}/sylpheed-claws/plugins/trayicon.so
 %{_datadir}/pixmaps/*
-%dir %{_datadir}/sylpheed-claws/
+%{_datadir}/sylpheed-claws/
 %{_datadir}/sylpheed-claws/*
 %{_mandir}/man1/*
 %{_datadir}/applications/*
@@ -108,12 +141,32 @@
 
 %files devel
 %defattr(-,root,root,-)
-%dir %{_includedir}/sylpheed-claws/
-%{_includedir}/sylpheed-claws/*
+%{_includedir}/sylpheed-claws/
 %{_libdir}/pkgconfig/sylpheed-claws.pc
 %{_libdir}/sylpheed-claws/plugins/*deps
 
+%files plugins-clamav
+%defattr(-,root,root,-)
+%{_libdir}/sylpheed-claws/plugins/clamav_plugin.so
+
+%files plugins-dillo
+%defattr(-,root,root,-)
+%{_libdir}/sylpheed-claws/plugins/dillo_viewer.so
+
+%files plugins-spamassassin
+%defattr(-,root,root,-)
+%{_libdir}/sylpheed-claws/plugins/spamassassin.so
+
+%files plugins-pgp
+%defattr(-,root,root,-)
+%{_libdir}/sylpheed-claws/plugins/pgp*.so
+
 %changelog
+* Sat Apr 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- split plugins from main package to ease requirements (#189113)
+- version upgrade (#183357)
+- fix libpisock (#189585)
+
 * Wed Apr 05 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.1.0-1
 - version upgrade



From fedora-extras-commits at redhat.com  Fri Apr 21 22:38:25 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 15:38:25 -0700
Subject: rpms/sylpheed-claws/FC-5 .cvsignore, 1.16, 1.17 sources, 1.17,
	1.18 sylpheed-claws.spec, 1.40, 1.41
Message-ID: <200604212238.k3LMcRP8019988@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-serv19929/FC-5

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
- split plugins from main package to ease requirements (#189113)
- version upgrade (#183357)
- fix libpisock (#189585)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-5/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	5 Apr 2006 21:37:28 -0000	1.16
+++ .cvsignore	21 Apr 2006 22:38:25 -0000	1.17
@@ -1 +1 @@
-sylpheed-claws-2.1.0.tar.bz2
+sylpheed-claws-2.1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-5/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	5 Apr 2006 21:37:28 -0000	1.17
+++ sources	21 Apr 2006 22:38:25 -0000	1.18
@@ -1 +1 @@
-03988307d87ed9d10253d35b323e5e51  sylpheed-claws-2.1.0.tar.bz2
+8d7b1d01c4f236a5e7d3e139bf43cd5a  sylpheed-claws-2.1.1.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-5/sylpheed-claws.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sylpheed-claws.spec	5 Apr 2006 21:43:48 -0000	1.40
+++ sylpheed-claws.spec	21 Apr 2006 22:38:25 -0000	1.41
@@ -1,11 +1,11 @@
 Name:           sylpheed-claws
-Version:        2.1.0
+Version:        2.1.1
 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.1.0.tar.bz2
+Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.1.1.tar.bz2
 Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -26,8 +26,6 @@
 BuildRequires:  gettext-devel
 BuildRequires:  libetpan-devel >= 0.45
 BuildRequires:  libgnomeprintui22-devel
-Requires:  spamassassin
-Requires:  dillo
 
 %description
 The bleeding edge branch of Sylpheed, a GTK+ based, lightweight, and fast
@@ -45,6 +43,40 @@
 The %{name}-devel package contains the header files  and pkgconfig file needed
 for development with %{name}.
 
+%package plugins-clamav
+Summary:        Clamav antivirus plugin for sylpheed-claws
+Group:          Applications/Internet
+Requires:       %{name} = %{version}-%{release}
+
+%description plugins-clamav
+%{summary}
+
+%package plugins-dillo
+Summary:        Dillo HTML viewer plugin for sylpheed-claws
+Group:          Applications/Internet
+Requires:       %{name} = %{version}-%{release}
+Requires:       dillo
+
+%description plugins-dillo
+%{summary}
+
+%package plugins-spamassassin
+Summary:        Spamassassin plugin for sylpheed-claws
+Group:          Applications/Internet
+Requires:       %{name} = %{version}-%{release}
+Requires:       spamassassin
+
+%description plugins-spamassassin
+%{summary}
+
+%package plugins-pgp
+Summary:        PGP plugin for signing and encrypting mail
+Group:          Applications/Internet
+Requires:       %{name} = %{version}-%{release}
+
+%description plugins-pgp
+%{summary}
+
 %prep
 %setup -q
 
@@ -74,6 +106,8 @@
 %{__rm} -rf ${RPM_BUILD_ROOT}%{_datadir}/gnome
 
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
+find ${RPM_BUILD_ROOT}/%{_libdir}/sylpheed-claws/plugins/ -type f -name \
+"*.a" -exec rm -f {} ';'
 
 %{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
 
@@ -91,8 +125,7 @@
 %{_bindir}/*
 %dir %{_libdir}/sylpheed-claws/
 %dir %{_libdir}/sylpheed-claws/plugins/
-%{_libdir}/sylpheed-claws/plugins/*.so
-%exclude %{_libdir}/sylpheed-claws/plugins/*.a
+%{_libdir}/sylpheed-claws/plugins/trayicon.so
 %{_datadir}/pixmaps/*
 %{_datadir}/sylpheed-claws
 %{_mandir}/man1/*
@@ -101,12 +134,33 @@
 
 %files devel
 %defattr(-,root,root,-)
-%dir %{_includedir}/sylpheed-claws/
-%{_includedir}/sylpheed-claws/*
+%{_includedir}/sylpheed-claws/
 %{_libdir}/pkgconfig/sylpheed-claws.pc
 %{_libdir}/sylpheed-claws/plugins/*deps
 
+%files plugins-clamav
+%defattr(-,root,root,-)
+%{_libdir}/sylpheed-claws/plugins/clamav_plugin.so
+
+%files plugins-dillo
+%defattr(-,root,root,-)
+%{_libdir}/sylpheed-claws/plugins/dillo_viewer.so
+
+%files plugins-spamassassin
+%defattr(-,root,root,-)
+%{_libdir}/sylpheed-claws/plugins/spamassassin.so
+
+%files plugins-pgp
+%defattr(-,root,root,-)
+%{_libdir}/sylpheed-claws/plugins/pgp*.so
+
 %changelog
+* Sat Apr 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.1.1-1
+- split plugins from main package to ease requirements (#189113)
+- version upgrade (#183357)
+- fix libpisock (#189585)
+
 * Wed Apr 05 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.1.0-1
 - version upgrade



From fedora-extras-commits at redhat.com  Fri Apr 21 22:38:26 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 15:38:26 -0700
Subject: rpms/sylpheed-claws/devel .cvsignore, 1.16, 1.17 sources, 1.17,
	1.18 sylpheed-claws.spec, 1.40, 1.41
Message-ID: <200604212238.k3LMcShl019994@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/sylpheed-claws/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19929/devel

Modified Files:
	.cvsignore sources sylpheed-claws.spec 
Log Message:
- split plugins from main package to ease requirements (#189113)
- version upgrade (#183357)
- fix libpisock (#189585)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	5 Apr 2006 21:37:34 -0000	1.16
+++ .cvsignore	21 Apr 2006 22:38:25 -0000	1.17
@@ -1 +1 @@
-sylpheed-claws-2.1.0.tar.bz2
+sylpheed-claws-2.1.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources	5 Apr 2006 21:37:34 -0000	1.17
+++ sources	21 Apr 2006 22:38:25 -0000	1.18
@@ -1 +1 @@
-03988307d87ed9d10253d35b323e5e51  sylpheed-claws-2.1.0.tar.bz2
+8d7b1d01c4f236a5e7d3e139bf43cd5a  sylpheed-claws-2.1.1.tar.bz2


Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/devel/sylpheed-claws.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sylpheed-claws.spec	5 Apr 2006 21:43:49 -0000	1.40
+++ sylpheed-claws.spec	21 Apr 2006 22:38:25 -0000	1.41
@@ -1,11 +1,11 @@
 Name:           sylpheed-claws
-Version:        2.1.0
+Version:        2.1.1
 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.1.0.tar.bz2
+Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-2.1.1.tar.bz2
 Source1:        sylpheed-claws.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires:  flex, bison
@@ -26,8 +26,6 @@
 BuildRequires:  gettext-devel
 BuildRequires:  libetpan-devel >= 0.45
 BuildRequires:  libgnomeprintui22-devel
-Requires:  spamassassin
-Requires:  dillo
 
 %description
 The bleeding edge branch of Sylpheed, a GTK+ based, lightweight, and fast
@@ -45,6 +43,40 @@
 The %{name}-devel package contains the header files  and pkgconfig file needed
 for development with %{name}.
 
+%package plugins-clamav
+Summary:        Clamav antivirus plugin for sylpheed-claws
+Group:          Applications/Internet
+Requires:       %{name} = %{version}-%{release}
+
+%description plugins-clamav
+%{summary}
+
+%package plugins-dillo
+Summary:        Dillo HTML viewer plugin for sylpheed-claws
+Group:          Applications/Internet
+Requires:       %{name} = %{version}-%{release}
+Requires:       dillo
+
+%description plugins-dillo
+%{summary}
+
+%package plugins-spamassassin
+Summary:        Spamassassin plugin for sylpheed-claws
+Group:          Applications/Internet
+Requires:       %{name} = %{version}-%{release}
+Requires:       spamassassin
+
+%description plugins-spamassassin
+%{summary}
+
+%package plugins-pgp
+Summary:        PGP plugin for signing and encrypting mail
+Group:          Applications/Internet
+Requires:       %{name} = %{version}-%{release}
+
+%description plugins-pgp
+%{summary}
+
 %prep
 %setup -q
 
@@ -74,6 +106,8 @@
 %{__rm} -rf ${RPM_BUILD_ROOT}%{_datadir}/gnome
 
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
+find ${RPM_BUILD_ROOT}/%{_libdir}/sylpheed-claws/plugins/ -type f -name \
+"*.a" -exec rm -f {} ';'
 
 %{__mkdir_p} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
 
@@ -91,8 +125,7 @@
 %{_bindir}/*
 %dir %{_libdir}/sylpheed-claws/
 %dir %{_libdir}/sylpheed-claws/plugins/
-%{_libdir}/sylpheed-claws/plugins/*.so
-%exclude %{_libdir}/sylpheed-claws/plugins/*.a
+%{_libdir}/sylpheed-claws/plugins/trayicon.so
 %{_datadir}/pixmaps/*
 %{_datadir}/sylpheed-claws
 %{_mandir}/man1/*
@@ -101,12 +134,33 @@
 
 %files devel
 %defattr(-,root,root,-)
-%dir %{_includedir}/sylpheed-claws/
-%{_includedir}/sylpheed-claws/*
+%{_includedir}/sylpheed-claws/
 %{_libdir}/pkgconfig/sylpheed-claws.pc
 %{_libdir}/sylpheed-claws/plugins/*deps
 
+%files plugins-clamav
+%defattr(-,root,root,-)
+%{_libdir}/sylpheed-claws/plugins/clamav_plugin.so
+
+%files plugins-dillo
+%defattr(-,root,root,-)
+%{_libdir}/sylpheed-claws/plugins/dillo_viewer.so
+
+%files plugins-spamassassin
+%defattr(-,root,root,-)
+%{_libdir}/sylpheed-claws/plugins/spamassassin.so
+
+%files plugins-pgp
+%defattr(-,root,root,-)
+%{_libdir}/sylpheed-claws/plugins/pgp*.so
+
 %changelog
+* Sat Apr 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.1.1-1
+- split plugins from main package to ease requirements (#189113)
+- version upgrade (#183357)
+- fix libpisock (#189585)
+
 * Wed Apr 05 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.1.0-1
 - version upgrade



From fedora-extras-commits at redhat.com  Fri Apr 21 22:47:14 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 15:47:14 -0700
Subject: owners owners.list,1.869,1.870
Message-ID: <200604212247.k3LMlG4f020169@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20150

Modified Files:
	owners.list 
Log Message:
Add perl-File-Fetch.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.869
retrieving revision 1.870
diff -u -r1.869 -r1.870
--- owners.list	21 Apr 2006 21:53:12 -0000	1.869
+++ owners.list	21 Apr 2006 22:47:14 -0000	1.870
@@ -948,6 +948,7 @@
 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-File-BOM|Utilities for reading Byte Order Marks|mpeters at mac.com|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-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-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



From fedora-extras-commits at redhat.com  Fri Apr 21 22:57:24 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 15:57:24 -0700
Subject: rpms/sylpheed-claws/FC-4 sylpheed-claws.spec,1.31,1.32
Message-ID: <200604212257.k3LMvQu5020221@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-serv20204

Modified Files:
	sylpheed-claws.spec 
Log Message:
- fix typo



Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sylpheed-claws.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sylpheed-claws.spec	21 Apr 2006 22:38:24 -0000	1.31
+++ sylpheed-claws.spec	21 Apr 2006 22:57:23 -0000	1.32
@@ -15,7 +15,7 @@
 BuildRequires:  gtk2-devel >= 2.4.9
 BuildRequires:  compface >= 1.4
 BuildRequires:  openssl-devel >= 0.9.7
-BuildRequires:  openldap-devel >= 2.07
+BuildRequires:  openldap-devel >= 2.0.7
 BuildRequires:  aspell-devel >= 0.50.1
 BuildRequires:  pilot-link-devel
 BuildRequires:  gdk-pixbuf-devel



From fedora-extras-commits at redhat.com  Fri Apr 21 23:02:08 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Fri, 21 Apr 2006 16:02:08 -0700
Subject: rpms/pygame/FC-5 pygame.spec,1.3,1.4
Message-ID: <200604212302.k3LN2fJR022405@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22349/pygame/FC-5

Modified Files:
	pygame.spec 
Log Message:
Fix Requires on -devel package


Index: pygame.spec
===================================================================
RCS file: /cvs/extras/rpms/pygame/FC-5/pygame.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pygame.spec	21 Apr 2006 17:09:30 -0000	1.3
+++ pygame.spec	21 Apr 2006 23:02:07 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           pygame
 Version:        1.7.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Python modules for writing games
 Group:          Development/Languages
 License:        LGPL
@@ -28,6 +28,8 @@
 Summary:        Files needed for developing programs which use pygame
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:       SDL_ttf-devel SDL_mixer-devel
+Requires:       python-devel
 
 %description devel
 This package contains headers required to build applications that use
@@ -39,9 +41,12 @@
 %patch1 -p0 -b .64bit
 
 # rpmlint fixes
-chmod -x src/ffmovie.h
 rm -f examples/.#stars.py.1.7
 
+# These files must be provided by pygame-nonfree(-devel) packages on a
+# repository that can provide patent encumbered software.
+rm -f src/ffmovie.[ch]
+
 %build
 CFLAGS="%{optflags}" %{__python} setup.py build
 
@@ -77,6 +82,10 @@
 %{_includedir}/python*/%{name}/*.h
 
 %changelog
+* Fri Apr 21 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-4
+- Add Requires to -devel package
+- Remove ffmovie.h from -devel package since it requires smpeg-devel
+
 * Fri Apr 21 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-3
 - Obsolete linva python-pygame package
 - Added Provides for python-pygame



From fedora-extras-commits at redhat.com  Fri Apr 21 23:02:05 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Fri, 21 Apr 2006 16:02:05 -0700
Subject: rpms/pygame/FC-4 pygame.spec,1.3,1.4
Message-ID: <200604212302.k3LN2bAb022404@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22349/pygame/FC-4

Modified Files:
	pygame.spec 
Log Message:
Fix Requires on -devel package


Index: pygame.spec
===================================================================
RCS file: /cvs/extras/rpms/pygame/FC-4/pygame.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pygame.spec	21 Apr 2006 17:09:30 -0000	1.3
+++ pygame.spec	21 Apr 2006 23:02:01 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           pygame
 Version:        1.7.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Python modules for writing games
 Group:          Development/Languages
 License:        LGPL
@@ -28,6 +28,8 @@
 Summary:        Files needed for developing programs which use pygame
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:       SDL_ttf-devel SDL_mixer-devel
+Requires:       python-devel
 
 %description devel
 This package contains headers required to build applications that use
@@ -39,9 +41,12 @@
 %patch1 -p0 -b .64bit
 
 # rpmlint fixes
-chmod -x src/ffmovie.h
 rm -f examples/.#stars.py.1.7
 
+# These files must be provided by pygame-nonfree(-devel) packages on a
+# repository that can provide patent encumbered software.
+rm -f src/ffmovie.[ch]
+
 %build
 CFLAGS="%{optflags}" %{__python} setup.py build
 
@@ -77,6 +82,10 @@
 %{_includedir}/python*/%{name}/*.h
 
 %changelog
+* Fri Apr 21 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-4
+- Add Requires to -devel package
+- Remove ffmovie.h from -devel package since it requires smpeg-devel
+
 * Fri Apr 21 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-3
 - Obsolete linva python-pygame package
 - Added Provides for python-pygame



From fedora-extras-commits at redhat.com  Fri Apr 21 23:02:15 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Fri, 21 Apr 2006 16:02:15 -0700
Subject: rpms/pygame/devel pygame.spec,1.3,1.4
Message-ID: <200604212302.k3LN2mie022406@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22349/pygame/devel

Modified Files:
	pygame.spec 
Log Message:
Fix Requires on -devel package


Index: pygame.spec
===================================================================
RCS file: /cvs/extras/rpms/pygame/devel/pygame.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pygame.spec	21 Apr 2006 17:09:31 -0000	1.3
+++ pygame.spec	21 Apr 2006 23:02:14 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           pygame
 Version:        1.7.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Python modules for writing games
 Group:          Development/Languages
 License:        LGPL
@@ -28,6 +28,8 @@
 Summary:        Files needed for developing programs which use pygame
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
+Requires:       SDL_ttf-devel SDL_mixer-devel
+Requires:       python-devel
 
 %description devel
 This package contains headers required to build applications that use
@@ -39,9 +41,12 @@
 %patch1 -p0 -b .64bit
 
 # rpmlint fixes
-chmod -x src/ffmovie.h
 rm -f examples/.#stars.py.1.7
 
+# These files must be provided by pygame-nonfree(-devel) packages on a
+# repository that can provide patent encumbered software.
+rm -f src/ffmovie.[ch]
+
 %build
 CFLAGS="%{optflags}" %{__python} setup.py build
 
@@ -77,6 +82,10 @@
 %{_includedir}/python*/%{name}/*.h
 
 %changelog
+* Fri Apr 21 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-4
+- Add Requires to -devel package
+- Remove ffmovie.h from -devel package since it requires smpeg-devel
+
 * Fri Apr 21 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-3
 - Obsolete linva python-pygame package
 - Added Provides for python-pygame



From fedora-extras-commits at redhat.com  Fri Apr 21 23:05:02 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 16:05:02 -0700
Subject: rpms/perl-Log-Message/devel - New directory
Message-ID: <200604212305.k3LN5434022524@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Log-Message/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22497/perl-Log-Message/devel

Log Message:
Directory /cvs/extras/rpms/perl-Log-Message/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 23:05:00 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 16:05:00 -0700
Subject: rpms/perl-Log-Message - New directory
Message-ID: <200604212305.k3LN52FF022518@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Log-Message
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22497/perl-Log-Message

Log Message:
Directory /cvs/extras/rpms/perl-Log-Message added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 23:05:23 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 16:05:23 -0700
Subject: rpms/perl-Log-Message Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604212305.k3LN5PM6022576@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Log-Message
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22543

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Log-Message


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Log-Message
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 21 23:05:24 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 16:05:24 -0700
Subject: rpms/perl-Log-Message/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604212305.k3LN5Qod022579@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Log-Message/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22543/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Log-Message


--- 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 Apr 21 23:06:03 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 16:06:03 -0700
Subject: rpms/perl-Log-Message import.log,1.1,1.2
Message-ID: <200604212306.k3LN6Z2b022647@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Log-Message
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22609

Modified Files:
	import.log 
Log Message:
auto-import perl-Log-Message-0.01-1 on branch devel from perl-Log-Message-0.01-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Message/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Apr 2006 23:05:23 -0000	1.1
+++ import.log	21 Apr 2006 23:06:03 -0000	1.2
@@ -0,0 +1 @@
+perl-Log-Message-0_01-1:HEAD:perl-Log-Message-0.01-1.src.rpm:1145660754



From fedora-extras-commits at redhat.com  Fri Apr 21 23:06:04 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 16:06:04 -0700
Subject: rpms/perl-Log-Message/devel perl-Log-Message.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604212306.k3LN6a3a022651@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Log-Message/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22609/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Log-Message.spec 
Log Message:
auto-import perl-Log-Message-0.01-1 on branch devel from perl-Log-Message-0.01-1.src.rpm


--- NEW FILE perl-Log-Message.spec ---
Name:           perl-Log-Message
Version:        0.01
Release:        1%{?dist}
Summary:        Generic message storage mechanism
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Log-Message/
Source0:        http://www.cpan.org/authors/id/K/KA/KANE/Log-Message-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Locale::Maketext::Simple)
BuildRequires:  perl(Module::Load)
BuildRequires:  perl(Params::Check)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Log::Message is a generic message storage mechanism. It allows you to store
messages on a stack -- either shared or private -- and assign meta-data to
it. Some meta-data will automatically be added for you, like a timestamp
and a stack trace, but some can be filled in by the user, like a tag by
which to identify it or group it, and a level at which to handle the
message (for example, log it, or die with it).

%prep
%setup -q -n Log-Message-%{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+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Mar 23 2006 Steven Pritchard <steve at kspei.com> 0.01-1
- Specfile autogenerated by cpanspec 1.62.
- Fix License.
- Improve Summary.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Message/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2006 23:05:24 -0000	1.1
+++ .cvsignore	21 Apr 2006 23:06:04 -0000	1.2
@@ -0,0 +1 @@
+Log-Message-0.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Message/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2006 23:05:24 -0000	1.1
+++ sources	21 Apr 2006 23:06:04 -0000	1.2
@@ -0,0 +1 @@
+f04298e81488a5a39930fd417d47656e  Log-Message-0.01.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 23:09:05 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Fri, 21 Apr 2006 16:09:05 -0700
Subject: rpms/deutex/FC-4 deutex-4.4.0-freedoom.patch,1.1,1.2
Message-ID: <200604212309.k3LN9781022980@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/deutex/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22899/FC-4

Modified Files:
	deutex-4.4.0-freedoom.patch 
Log Message:
Add freedoom to the list of known iwads.



deutex-4.4.0-freedoom.patch:

Index: deutex-4.4.0-freedoom.patch
===================================================================
RCS file: /cvs/extras/rpms/deutex/FC-4/deutex-4.4.0-freedoom.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- deutex-4.4.0-freedoom.patch	20 Apr 2006 16:23:48 -0000	1.1
+++ deutex-4.4.0-freedoom.patch	21 Apr 2006 23:09:05 -0000	1.2
@@ -1,6 +1,6 @@
 --- deutex-4.4.0/src/deutex.c	2006-04-20 08:09:14.000000000 -0700
-+++ deutex-4.4.0/src/deutex.c.new	2006-04-20 08:15:33.000000000 -0700
-@@ -970,14 +970,15 @@
++++ deutex-4.4.0/src/deutex.c.new	2006-04-20 11:19:51.000000000 -0700
+@@ -970,14 +970,16 @@
                 && MakeFileName(MainWAD,DoomDir,"","","heretic", "wad")!=TRUE
                 && MakeFileName(MainWAD,DoomDir,"","","hexen",   "wad")!=TRUE
                 && MakeFileName(MainWAD,DoomDir,"","","strife1", "wad")!=TRUE
@@ -11,6 +11,7 @@
                 && MakeFileName(MainWAD,".",    "","","heretic", "wad")!=TRUE
                 && MakeFileName(MainWAD,".",    "","","hexen",   "wad")!=TRUE
 -               && MakeFileName(MainWAD,".",    "","","strife1", "wad")!=TRUE)
++               && MakeFileName(MainWAD,".",    "","","strife1", "wad")!=TRUE
 +               && MakeFileName(MainWAD,".",    "","","freedoom","wad")!=TRUE)
               ProgError("Can't find any of doom.wad, doom2.wad, doompres.wad,"
 -		 " heretic.wad, hexen.wad, strife1.wad");



From fedora-extras-commits at redhat.com  Fri Apr 21 23:09:07 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Fri, 21 Apr 2006 16:09:07 -0700
Subject: rpms/deutex/devel deutex-4.4.0-freedoom.patch,1.1,1.2
Message-ID: <200604212309.k3LN99X3022995@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/deutex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22899/devel

Modified Files:
	deutex-4.4.0-freedoom.patch 
Log Message:
Add freedoom to the list of known iwads.



deutex-4.4.0-freedoom.patch:

Index: deutex-4.4.0-freedoom.patch
===================================================================
RCS file: /cvs/extras/rpms/deutex/devel/deutex-4.4.0-freedoom.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- deutex-4.4.0-freedoom.patch	20 Apr 2006 16:23:55 -0000	1.1
+++ deutex-4.4.0-freedoom.patch	21 Apr 2006 23:09:07 -0000	1.2
@@ -1,6 +1,6 @@
 --- deutex-4.4.0/src/deutex.c	2006-04-20 08:09:14.000000000 -0700
-+++ deutex-4.4.0/src/deutex.c.new	2006-04-20 08:15:33.000000000 -0700
-@@ -970,14 +970,15 @@
++++ deutex-4.4.0/src/deutex.c.new	2006-04-20 11:19:51.000000000 -0700
+@@ -970,14 +970,16 @@
                 && MakeFileName(MainWAD,DoomDir,"","","heretic", "wad")!=TRUE
                 && MakeFileName(MainWAD,DoomDir,"","","hexen",   "wad")!=TRUE
                 && MakeFileName(MainWAD,DoomDir,"","","strife1", "wad")!=TRUE
@@ -11,6 +11,7 @@
                 && MakeFileName(MainWAD,".",    "","","heretic", "wad")!=TRUE
                 && MakeFileName(MainWAD,".",    "","","hexen",   "wad")!=TRUE
 -               && MakeFileName(MainWAD,".",    "","","strife1", "wad")!=TRUE)
++               && MakeFileName(MainWAD,".",    "","","strife1", "wad")!=TRUE
 +               && MakeFileName(MainWAD,".",    "","","freedoom","wad")!=TRUE)
               ProgError("Can't find any of doom.wad, doom2.wad, doompres.wad,"
 -		 " heretic.wad, hexen.wad, strife1.wad");



From fedora-extras-commits at redhat.com  Fri Apr 21 23:09:06 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Fri, 21 Apr 2006 16:09:06 -0700
Subject: rpms/deutex/FC-5 deutex-4.4.0-freedoom.patch,1.1,1.2
Message-ID: <200604212309.k3LN98Tk022988@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/deutex/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22899/FC-5

Modified Files:
	deutex-4.4.0-freedoom.patch 
Log Message:
Add freedoom to the list of known iwads.



deutex-4.4.0-freedoom.patch:

Index: deutex-4.4.0-freedoom.patch
===================================================================
RCS file: /cvs/extras/rpms/deutex/FC-5/deutex-4.4.0-freedoom.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- deutex-4.4.0-freedoom.patch	20 Apr 2006 16:23:49 -0000	1.1
+++ deutex-4.4.0-freedoom.patch	21 Apr 2006 23:09:06 -0000	1.2
@@ -1,6 +1,6 @@
 --- deutex-4.4.0/src/deutex.c	2006-04-20 08:09:14.000000000 -0700
-+++ deutex-4.4.0/src/deutex.c.new	2006-04-20 08:15:33.000000000 -0700
-@@ -970,14 +970,15 @@
++++ deutex-4.4.0/src/deutex.c.new	2006-04-20 11:19:51.000000000 -0700
+@@ -970,14 +970,16 @@
                 && MakeFileName(MainWAD,DoomDir,"","","heretic", "wad")!=TRUE
                 && MakeFileName(MainWAD,DoomDir,"","","hexen",   "wad")!=TRUE
                 && MakeFileName(MainWAD,DoomDir,"","","strife1", "wad")!=TRUE
@@ -11,6 +11,7 @@
                 && MakeFileName(MainWAD,".",    "","","heretic", "wad")!=TRUE
                 && MakeFileName(MainWAD,".",    "","","hexen",   "wad")!=TRUE
 -               && MakeFileName(MainWAD,".",    "","","strife1", "wad")!=TRUE)
++               && MakeFileName(MainWAD,".",    "","","strife1", "wad")!=TRUE
 +               && MakeFileName(MainWAD,".",    "","","freedoom","wad")!=TRUE)
               ProgError("Can't find any of doom.wad, doom2.wad, doompres.wad,"
 -		 " heretic.wad, hexen.wad, strife1.wad");



From fedora-extras-commits at redhat.com  Fri Apr 21 23:09:19 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 16:09:19 -0700
Subject: rpms/perl-Log-Message-Simple - New directory
Message-ID: <200604212309.k3LN9L5E023039@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Log-Message-Simple
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23011/perl-Log-Message-Simple

Log Message:
Directory /cvs/extras/rpms/perl-Log-Message-Simple added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 23:09:20 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 16:09:20 -0700
Subject: rpms/perl-Log-Message-Simple/devel - New directory
Message-ID: <200604212309.k3LN9MJW023044@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Log-Message-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23011/perl-Log-Message-Simple/devel

Log Message:
Directory /cvs/extras/rpms/perl-Log-Message-Simple/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 23:09:35 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 16:09:35 -0700
Subject: rpms/perl-Log-Message-Simple Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604212309.k3LN9bjW023132@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Log-Message-Simple
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23071

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Log-Message-Simple


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Log-Message-Simple
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Apr 21 23:09:36 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 16:09:36 -0700
Subject: rpms/perl-Log-Message-Simple/devel .cvsignore, NONE, 1.1 Makefile, 
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200604212309.k3LN9cwk023136@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Log-Message-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23071/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Log-Message-Simple


--- 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 Apr 21 23:10:20 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 16:10:20 -0700
Subject: rpms/perl-Log-Message-Simple import.log,1.1,1.2
Message-ID: <200604212310.k3LNArdc023312@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Log-Message-Simple
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23263

Modified Files:
	import.log 
Log Message:
auto-import perl-Log-Message-Simple-0.01-1 on branch devel from perl-Log-Message-Simple-0.01-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Message-Simple/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Apr 2006 23:09:35 -0000	1.1
+++ import.log	21 Apr 2006 23:10:20 -0000	1.2
@@ -0,0 +1 @@
+perl-Log-Message-Simple-0_01-1:HEAD:perl-Log-Message-Simple-0.01-1.src.rpm:1145661007



From fedora-extras-commits at redhat.com  Fri Apr 21 23:10:21 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 16:10:21 -0700
Subject: rpms/perl-Log-Message-Simple/devel perl-Log-Message-Simple.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604212310.k3LNArmc023316@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Log-Message-Simple/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23263/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Log-Message-Simple.spec 
Log Message:
auto-import perl-Log-Message-Simple-0.01-1 on branch devel from perl-Log-Message-Simple-0.01-1.src.rpm


--- NEW FILE perl-Log-Message-Simple.spec ---
Name:           perl-Log-Message-Simple
Version:        0.01
Release:        1%{?dist}
Summary:        Simplified frontend to Log::Message
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Log-Message-Simple/
Source0:        http://www.cpan.org/authors/id/K/KA/KANE/Log-Message-Simple-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Log::Message)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module provides standardized logging facilities using the
Log::Message module.

%prep
%setup -q -n Log-Message-Simple-%{version}

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT

make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT

find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \;
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null \;

chmod -R u+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Mar 23 2006 Steven Pritchard <steve at kspei.com> 0.01-1
- Specfile autogenerated by cpanspec 1.62.
- Fix Summary.
- Drop explicit Requires: perl(Log::Message).


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Message-Simple/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2006 23:09:36 -0000	1.1
+++ .cvsignore	21 Apr 2006 23:10:21 -0000	1.2
@@ -0,0 +1 @@
+Log-Message-Simple-0.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Message-Simple/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2006 23:09:36 -0000	1.1
+++ sources	21 Apr 2006 23:10:21 -0000	1.2
@@ -0,0 +1 @@
+0c60795da495f6a79d09362e8b4f0061  Log-Message-Simple-0.01.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 23:13:31 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 16:13:31 -0700
Subject: rpms/perl-Term-UI/devel - New directory
Message-ID: <200604212313.k3LNDXVY023467@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Term-UI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23429/perl-Term-UI/devel

Log Message:
Directory /cvs/extras/rpms/perl-Term-UI/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 23:13:28 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 16:13:28 -0700
Subject: owners owners.list,1.870,1.871
Message-ID: <200604212313.k3LNDU9C023453@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23420

Modified Files:
	owners.list 
Log Message:
Adding perl-Log-Message, perl-Log-Message-Simple, and perl-Term-UI.


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.870
retrieving revision 1.871
diff -u -r1.870 -r1.871
--- owners.list	21 Apr 2006 22:47:14 -0000	1.870
+++ owners.list	21 Apr 2006 23:13:28 -0000	1.871
@@ -1027,6 +1027,8 @@
 Fedora Extras|perl-Locale-Maketext-Simple|Simple interface to Locale::Maketext::Lexicon|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Log-Dispatch|Dispatches messages to one or more outputs|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Log-Log4perl|Log4j implementation for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Log-Message|Generic message storage mechanism|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Log-Message-Simple|Simplified frontend to Log::Message|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Mail-Alias|For bugs related to the perl-Mail-Alias component|oliver at linux-kernel.at|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Mail-GnuPG|Process email with GPG|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Mail-Mbox-MessageParser|A fast and simple mbox folder reader|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
@@ -1097,6 +1099,7 @@
 Fedora Extras|perl-Taint-Runtime|Runtime enable taint checking|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Template-Plugin-Class|Allow calling of class methods on arbitrary classes|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Template-Toolkit|Template processing system|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Term-UI|Term::ReadLine UI made easy|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Builder-Tester|For bugs related to the perl-Test-Builder-Tester component|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-ClassAPI|Provides basic first-pass API testing for large class trees|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Deep|Extremely flexible deep comparison|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Fri Apr 21 23:13:29 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 16:13:29 -0700
Subject: rpms/perl-Term-UI - New directory
Message-ID: <200604212313.k3LNDV35023466@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Term-UI
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23429/perl-Term-UI

Log Message:
Directory /cvs/extras/rpms/perl-Term-UI added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 21 23:13:54 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 16:13:54 -0700
Subject: rpms/perl-Term-UI/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604212313.k3LNDufQ023541@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Term-UI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23501/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Term-UI


--- 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 Apr 21 23:13:53 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 16:13:53 -0700
Subject: rpms/perl-Term-UI Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604212313.k3LNDtKG023534@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Term-UI
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23501

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Term-UI


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Term-UI
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Fri Apr 21 23:14:31 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 16:14:31 -0700
Subject: rpms/perl-Term-UI/devel perl-Term-UI.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604212314.k3LNEXvX023607@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Term-UI/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23572/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Term-UI.spec 
Log Message:
auto-import perl-Term-UI-0.12-1 on branch devel from perl-Term-UI-0.12-1.src.rpm


--- NEW FILE perl-Term-UI.spec ---
Name:           perl-Term-UI
Version:        0.12
Release:        1%{?dist}
Summary:        Term::ReadLine UI made easy
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/Term-UI/
Source0:        http://www.cpan.org/authors/id/K/KA/KANE/Term-UI-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Locale::Maketext::Simple)
BuildRequires:  perl(Log::Message::Simple)
BuildRequires:  perl(Params::Check)
Requires:       perl(Log::Message::Simple)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Term::UI is a transparent way of eliminating the overhead of having to
format a question and then validate the reply, informing the user if the
answer was not proper and re-issuing the question.

%prep
%setup -q -n Term-UI-%{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+rwX,go+rX,go-w $RPM_BUILD_ROOT/*

%check
make test

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Mar 23 2006 Steven Pritchard <steve at kspei.com> 0.12-1
- Specfile autogenerated by cpanspec 1.62.
- Fix License.
- Drop redundant explicit Requires.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Term-UI/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	21 Apr 2006 23:13:53 -0000	1.1
+++ .cvsignore	21 Apr 2006 23:14:31 -0000	1.2
@@ -0,0 +1 @@
+Term-UI-0.12.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Term-UI/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	21 Apr 2006 23:13:53 -0000	1.1
+++ sources	21 Apr 2006 23:14:31 -0000	1.2
@@ -0,0 +1 @@
+b34442df078685f3e8b1197e1e98d1e6  Term-UI-0.12.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 21 23:14:30 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Fri, 21 Apr 2006 16:14:30 -0700
Subject: rpms/perl-Term-UI import.log,1.1,1.2
Message-ID: <200604212315.k3LNF2uH023610@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/perl-Term-UI
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23572

Modified Files:
	import.log 
Log Message:
auto-import perl-Term-UI-0.12-1 on branch devel from perl-Term-UI-0.12-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Term-UI/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	21 Apr 2006 23:13:53 -0000	1.1
+++ import.log	21 Apr 2006 23:14:29 -0000	1.2
@@ -0,0 +1 @@
+perl-Term-UI-0_12-1:HEAD:perl-Term-UI-0.12-1.src.rpm:1145661255



From fedora-extras-commits at redhat.com  Fri Apr 21 23:15:22 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Fri, 21 Apr 2006 16:15:22 -0700
Subject: rpms/pygame/FC-5 pygame.spec,1.4,1.5
Message-ID: <200604212315.k3LNFOOj023690@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23644/pygame/FC-5

Modified Files:
	pygame.spec 
Log Message:
Better wording in spec file comment


Index: pygame.spec
===================================================================
RCS file: /cvs/extras/rpms/pygame/FC-5/pygame.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pygame.spec	21 Apr 2006 23:02:07 -0000	1.4
+++ pygame.spec	21 Apr 2006 23:15:22 -0000	1.5
@@ -44,7 +44,7 @@
 rm -f examples/.#stars.py.1.7
 
 # These files must be provided by pygame-nonfree(-devel) packages on a
-# repository that can provide patent encumbered software.
+# repository that does not have restrictions on providing non-free software
 rm -f src/ffmovie.[ch]
 
 %build



From fedora-extras-commits at redhat.com  Fri Apr 21 23:15:23 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Fri, 21 Apr 2006 16:15:23 -0700
Subject: rpms/pygame/devel pygame.spec,1.4,1.5
Message-ID: <200604212315.k3LNFP9T023694@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23644/pygame/devel

Modified Files:
	pygame.spec 
Log Message:
Better wording in spec file comment


Index: pygame.spec
===================================================================
RCS file: /cvs/extras/rpms/pygame/devel/pygame.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pygame.spec	21 Apr 2006 23:02:14 -0000	1.4
+++ pygame.spec	21 Apr 2006 23:15:23 -0000	1.5
@@ -44,7 +44,7 @@
 rm -f examples/.#stars.py.1.7
 
 # These files must be provided by pygame-nonfree(-devel) packages on a
-# repository that can provide patent encumbered software.
+# repository that does not have restrictions on providing non-free software
 rm -f src/ffmovie.[ch]
 
 %build



From fedora-extras-commits at redhat.com  Fri Apr 21 23:15:21 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Fri, 21 Apr 2006 16:15:21 -0700
Subject: rpms/pygame/FC-4 pygame.spec,1.4,1.5
Message-ID: <200604212315.k3LNFrpG023704@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23644/pygame/FC-4

Modified Files:
	pygame.spec 
Log Message:
Better wording in spec file comment


Index: pygame.spec
===================================================================
RCS file: /cvs/extras/rpms/pygame/FC-4/pygame.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pygame.spec	21 Apr 2006 23:02:01 -0000	1.4
+++ pygame.spec	21 Apr 2006 23:15:21 -0000	1.5
@@ -44,7 +44,7 @@
 rm -f examples/.#stars.py.1.7
 
 # These files must be provided by pygame-nonfree(-devel) packages on a
-# repository that can provide patent encumbered software.
+# repository that does not have restrictions on providing non-free software
 rm -f src/ffmovie.[ch]
 
 %build



From fedora-extras-commits at redhat.com  Fri Apr 21 23:22:23 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 16:22:23 -0700
Subject: rpms/sylpheed-claws/FC-4 sylpheed-claws.spec,1.32,1.33
Message-ID: <200604212322.k3LNMPMx023860@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-serv23842

Modified Files:
	sylpheed-claws.spec 
Log Message:
- add missing BR



Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sylpheed-claws.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sylpheed-claws.spec	21 Apr 2006 22:57:23 -0000	1.32
+++ sylpheed-claws.spec	21 Apr 2006 23:22:23 -0000	1.33
@@ -28,6 +28,7 @@
 BuildRequires:  gettext-devel
 BuildRequires:  libetpan-devel >= 0.45
 BuildRequires:  libgnomeprintui22-devel
+BuildRequires:  xorg-x11-devel
 
 %description
 The bleeding edge branch of Sylpheed, a GTK+ based, lightweight, and fast



From fedora-extras-commits at redhat.com  Fri Apr 21 23:52:13 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 16:52:13 -0700
Subject: rpms/libopensync-plugin-palm/FC-5 libopensync-plugin-palm.spec, 1.3,
	1.4
Message-ID: <200604212352.k3LNqFL8024205@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-serv24170/FC-5

Modified Files:
	libopensync-plugin-palm.spec 
Log Message:
- bump



Index: libopensync-plugin-palm.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-palm/FC-5/libopensync-plugin-palm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libopensync-plugin-palm.spec	16 Feb 2006 23:18:36 -0000	1.3
+++ libopensync-plugin-palm.spec	21 Apr 2006 23:52:13 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-palm
 Version:        0.18
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Palm plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -60,6 +60,9 @@
 %{_includedir}/opensync-1.0/opensync/palm*.h
 
 %changelog
+* Sat Apr 22 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 
 



From fedora-extras-commits at redhat.com  Fri Apr 21 23:52:12 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 16:52:12 -0700
Subject: rpms/libopensync-plugin-palm/FC-4 libopensync-plugin-palm.spec, 1.2,
	1.3
Message-ID: <200604212352.k3LNqEfx024201@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-serv24170/FC-4

Modified Files:
	libopensync-plugin-palm.spec 
Log Message:
- bump



Index: libopensync-plugin-palm.spec
===================================================================
RCS file: /cvs/extras/rpms/libopensync-plugin-palm/FC-4/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	21 Apr 2006 23:52:12 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           libopensync-plugin-palm
 Version:        0.18
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Palm plugin for libopensync
 
 Group:          System Environment/Libraries
@@ -60,6 +60,9 @@
 %{_includedir}/opensync-1.0/opensync/palm*.h
 
 %changelog
+* Sat Apr 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-3
+- bump
+
 * Tue Dec 13 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de> 0.18-2
 - add dist
 



From fedora-extras-commits at redhat.com  Fri Apr 21 23:56:46 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 16:56:46 -0700
Subject: rpms/wmCalClock/FC-4 wmCalClock.spec,1.3,1.4
Message-ID: <200604212356.k3LNumuk024367@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmCalClock/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24305/FC-4

Modified Files:
	wmCalClock.spec 
Log Message:
- put manpage into right location (David Kovalsky)



Index: wmCalClock.spec
===================================================================
RCS file: /cvs/extras/rpms/wmCalClock/FC-4/wmCalClock.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wmCalClock.spec	26 Sep 2005 11:11:53 -0000	1.3
+++ wmCalClock.spec	21 Apr 2006 23:56:46 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           wmCalClock
 Version:        1.25
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A Calendar clock with antialiased text
 
 Group:          User Interface/X
@@ -31,7 +31,7 @@
 %{__install} -p %{_builddir}/%{name}-%{version}/Src/wmCalClock \
 ${RPM_BUILD_ROOT}%{_bindir}
 %{__install} -p -m644 %{_builddir}/%{name}-%{version}/Src/wmCalClock.1 \
-${RPM_BUILD_ROOT}%{_mandir}
+${RPM_BUILD_ROOT}%{_mandir}/man1/
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -40,9 +40,13 @@
 %defattr(-,root,root,-)
 %doc BUGS CHANGES COPYING HINTS README TODO
 %{_bindir}/wmCalClock
-%{_mandir}/wmCalClock.1
+%{_mandir}/man1/wmCalClock.1*
 
 %changelog
+* Sat Apr 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.25-5
+- put manpage into right location (David Kovalsky)
+
 * Mon Sep 26 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.25-4
 - try to fix x86_64 build (libdir)



From fedora-extras-commits at redhat.com  Fri Apr 21 23:56:47 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 16:56:47 -0700
Subject: rpms/wmCalClock/FC-5 wmCalClock.spec,1.5,1.6
Message-ID: <200604212356.k3LNunlK024371@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmCalClock/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24305/FC-5

Modified Files:
	wmCalClock.spec 
Log Message:
- put manpage into right location (David Kovalsky)



Index: wmCalClock.spec
===================================================================
RCS file: /cvs/extras/rpms/wmCalClock/FC-5/wmCalClock.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wmCalClock.spec	16 Feb 2006 23:12:55 -0000	1.5
+++ wmCalClock.spec	21 Apr 2006 23:56:47 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           wmCalClock
 Version:        1.25
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A Calendar clock with antialiased text
 
 Group:          User Interface/X
@@ -33,7 +33,7 @@
 %{__install} -p %{_builddir}/%{name}-%{version}/Src/wmCalClock \
 ${RPM_BUILD_ROOT}%{_bindir}
 %{__install} -p -m644 %{_builddir}/%{name}-%{version}/Src/wmCalClock.1 \
-${RPM_BUILD_ROOT}%{_mandir}
+${RPM_BUILD_ROOT}%{_mandir}/man1/
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -42,9 +42,13 @@
 %defattr(-,root,root,-)
 %doc BUGS CHANGES COPYING HINTS README TODO
 %{_bindir}/wmCalClock
-%{_mandir}/wmCalClock.1
+%{_mandir}/man1/wmCalClock.1*
 
 %changelog
+* Sat Apr 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.25-7
+- put manpage into right location (David Kovalsky)
+
 * Thu Feb 16 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.25-6
 - Rebuild for Fedora Extras 5



From fedora-extras-commits at redhat.com  Fri Apr 21 23:56:47 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 16:56:47 -0700
Subject: rpms/wmCalClock/devel wmCalClock.spec,1.5,1.6
Message-ID: <200604212356.k3LNun9B024375@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmCalClock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24305/devel

Modified Files:
	wmCalClock.spec 
Log Message:
- put manpage into right location (David Kovalsky)



Index: wmCalClock.spec
===================================================================
RCS file: /cvs/extras/rpms/wmCalClock/devel/wmCalClock.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wmCalClock.spec	16 Feb 2006 23:12:55 -0000	1.5
+++ wmCalClock.spec	21 Apr 2006 23:56:47 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           wmCalClock
 Version:        1.25
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A Calendar clock with antialiased text
 
 Group:          User Interface/X
@@ -33,7 +33,7 @@
 %{__install} -p %{_builddir}/%{name}-%{version}/Src/wmCalClock \
 ${RPM_BUILD_ROOT}%{_bindir}
 %{__install} -p -m644 %{_builddir}/%{name}-%{version}/Src/wmCalClock.1 \
-${RPM_BUILD_ROOT}%{_mandir}
+${RPM_BUILD_ROOT}%{_mandir}/man1/
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -42,9 +42,13 @@
 %defattr(-,root,root,-)
 %doc BUGS CHANGES COPYING HINTS README TODO
 %{_bindir}/wmCalClock
-%{_mandir}/wmCalClock.1
+%{_mandir}/man1/wmCalClock.1*
 
 %changelog
+* Sat Apr 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.25-7
+- put manpage into right location (David Kovalsky)
+
 * Thu Feb 16 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.25-6
 - Rebuild for Fedora Extras 5



From fedora-extras-commits at redhat.com  Fri Apr 21 23:56:45 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 16:56:45 -0700
Subject: rpms/wmCalClock/FC-3 wmCalClock.spec,1.3,1.4
Message-ID: <200604212357.k3LNvIeB024378@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmCalClock/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24305/FC-3

Modified Files:
	wmCalClock.spec 
Log Message:
- put manpage into right location (David Kovalsky)



Index: wmCalClock.spec
===================================================================
RCS file: /cvs/extras/rpms/wmCalClock/FC-3/wmCalClock.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- wmCalClock.spec	26 Sep 2005 11:11:53 -0000	1.3
+++ wmCalClock.spec	21 Apr 2006 23:56:45 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           wmCalClock
 Version:        1.25
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A Calendar clock with antialiased text
 
 Group:          User Interface/X
@@ -31,7 +31,7 @@
 %{__install} -p %{_builddir}/%{name}-%{version}/Src/wmCalClock \
 ${RPM_BUILD_ROOT}%{_bindir}
 %{__install} -p -m644 %{_builddir}/%{name}-%{version}/Src/wmCalClock.1 \
-${RPM_BUILD_ROOT}%{_mandir}
+${RPM_BUILD_ROOT}%{_mandir}/man1/
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -40,9 +40,13 @@
 %defattr(-,root,root,-)
 %doc BUGS CHANGES COPYING HINTS README TODO
 %{_bindir}/wmCalClock
-%{_mandir}/wmCalClock.1
+%{_mandir}/man1/wmCalClock.1*
 
 %changelog
+* Sat Apr 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.25-5
+- put manpage into right location (David Kovalsky)
+
 * Mon Sep 26 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.25-4
 - try to fix x86_64 build (libdir)



From fedora-extras-commits at redhat.com  Sat Apr 22 00:05:09 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 17:05:09 -0700
Subject: rpms/sylpheed-claws/FC-4 sylpheed-claws.spec,1.33,1.34
Message-ID: <200604220005.k3M05B8a027349@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-serv27299

Modified Files:
	sylpheed-claws.spec 
Log Message:
- work around broken libtool



Index: sylpheed-claws.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws/FC-4/sylpheed-claws.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- sylpheed-claws.spec	21 Apr 2006 23:22:23 -0000	1.33
+++ sylpheed-claws.spec	22 Apr 2006 00:05:09 -0000	1.34
@@ -28,7 +28,7 @@
 BuildRequires:  gettext-devel
 BuildRequires:  libetpan-devel >= 0.45
 BuildRequires:  libgnomeprintui22-devel
-BuildRequires:  xorg-x11-devel
+BuildRequires:  libtool
 
 %description
 The bleeding edge branch of Sylpheed, a GTK+ based, lightweight, and fast
@@ -95,7 +95,7 @@
            --enable-aspell \
            --disable-dependency-tracking 
 
-%{__make} %{?_smp_mflags}
+%{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 %{__make} check
 
 %install



From fedora-extras-commits at redhat.com  Sat Apr 22 00:13:10 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 17:13:10 -0700
Subject: rpms/wmCalClock/FC-3 wmCalClock.spec,1.4,1.5
Message-ID: <200604220013.k3M0DgTD029105@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmCalClock/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28833/FC-3

Modified Files:
	wmCalClock.spec 
Log Message:
- create man1



Index: wmCalClock.spec
===================================================================
RCS file: /cvs/extras/rpms/wmCalClock/FC-3/wmCalClock.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wmCalClock.spec	21 Apr 2006 23:56:45 -0000	1.4
+++ wmCalClock.spec	22 Apr 2006 00:13:09 -0000	1.5
@@ -26,7 +26,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %{__mkdir_p} ${RPM_BUILD_ROOT}%{_bindir}
-%{__mkdir_p} ${RPM_BUILD_ROOT}%{_mandir}
+%{__mkdir_p} ${RPM_BUILD_ROOT}%{_mandir}/man1/
 
 %{__install} -p %{_builddir}/%{name}-%{version}/Src/wmCalClock \
 ${RPM_BUILD_ROOT}%{_bindir}



From fedora-extras-commits at redhat.com  Sat Apr 22 00:13:11 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 17:13:11 -0700
Subject: rpms/wmCalClock/FC-5 wmCalClock.spec,1.6,1.7
Message-ID: <200604220013.k3M0Dh9d029114@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmCalClock/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28833/FC-5

Modified Files:
	wmCalClock.spec 
Log Message:
- create man1



Index: wmCalClock.spec
===================================================================
RCS file: /cvs/extras/rpms/wmCalClock/FC-5/wmCalClock.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wmCalClock.spec	21 Apr 2006 23:56:47 -0000	1.6
+++ wmCalClock.spec	22 Apr 2006 00:13:11 -0000	1.7
@@ -28,7 +28,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %{__mkdir_p} ${RPM_BUILD_ROOT}%{_bindir}
-%{__mkdir_p} ${RPM_BUILD_ROOT}%{_mandir}
+%{__mkdir_p} ${RPM_BUILD_ROOT}%{_mandir}/man1/
 
 %{__install} -p %{_builddir}/%{name}-%{version}/Src/wmCalClock \
 ${RPM_BUILD_ROOT}%{_bindir}



From fedora-extras-commits at redhat.com  Sat Apr 22 00:13:10 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 17:13:10 -0700
Subject: rpms/wmCalClock/FC-4 wmCalClock.spec,1.4,1.5
Message-ID: <200604220013.k3M0DgMI029108@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmCalClock/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28833/FC-4

Modified Files:
	wmCalClock.spec 
Log Message:
- create man1



Index: wmCalClock.spec
===================================================================
RCS file: /cvs/extras/rpms/wmCalClock/FC-4/wmCalClock.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- wmCalClock.spec	21 Apr 2006 23:56:46 -0000	1.4
+++ wmCalClock.spec	22 Apr 2006 00:13:10 -0000	1.5
@@ -26,7 +26,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %{__mkdir_p} ${RPM_BUILD_ROOT}%{_bindir}
-%{__mkdir_p} ${RPM_BUILD_ROOT}%{_mandir}
+%{__mkdir_p} ${RPM_BUILD_ROOT}%{_mandir}/man1/
 
 %{__install} -p %{_builddir}/%{name}-%{version}/Src/wmCalClock \
 ${RPM_BUILD_ROOT}%{_bindir}



From fedora-extras-commits at redhat.com  Sat Apr 22 00:13:12 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 17:13:12 -0700
Subject: rpms/wmCalClock/devel wmCalClock.spec,1.6,1.7
Message-ID: <200604220013.k3M0DirP029118@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/wmCalClock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28833/devel

Modified Files:
	wmCalClock.spec 
Log Message:
- create man1



Index: wmCalClock.spec
===================================================================
RCS file: /cvs/extras/rpms/wmCalClock/devel/wmCalClock.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- wmCalClock.spec	21 Apr 2006 23:56:47 -0000	1.6
+++ wmCalClock.spec	22 Apr 2006 00:13:11 -0000	1.7
@@ -28,7 +28,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %{__mkdir_p} ${RPM_BUILD_ROOT}%{_bindir}
-%{__mkdir_p} ${RPM_BUILD_ROOT}%{_mandir}
+%{__mkdir_p} ${RPM_BUILD_ROOT}%{_mandir}/man1/
 
 %{__install} -p %{_builddir}/%{name}-%{version}/Src/wmCalClock \
 ${RPM_BUILD_ROOT}%{_bindir}



From fedora-extras-commits at redhat.com  Sat Apr 22 00:30:32 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 17:30:32 -0700
Subject: rpms/w3c-libwww/FC-5 w3c-libwww-md5.patch, NONE, 1.1 w3c-libwww.spec,
	1.1, 1.2
Message-ID: <200604220031.k3M0V4Fx031440@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/w3c-libwww/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31401/FC-5

Modified Files:
	w3c-libwww.spec 
Added Files:
	w3c-libwww-md5.patch 
Log Message:
- fix md5 (#187895)


w3c-libwww-md5.patch:

--- NEW FILE w3c-libwww-md5.patch ---
--- modules/md5/md5.h.orig	2006-04-22 02:25:32.000000000 +0200
+++ modules/md5/md5.h	2006-04-22 02:25:54.000000000 +0200
@@ -42,7 +42,7 @@
 typedef unsigned short int UINT2;
 
 /* UINT4 defines a four byte word */
-typedef unsigned long int UINT4;
+typedef unsigned int UINT4;
 
 /* PROTO_LIST is defined depending on how PROTOTYPES is defined above.
    If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it


Index: w3c-libwww.spec
===================================================================
RCS file: /cvs/extras/rpms/w3c-libwww/FC-5/w3c-libwww.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- w3c-libwww.spec	28 Feb 2006 10:21:52 -0000	1.1
+++ w3c-libwww.spec	22 Apr 2006 00:30:31 -0000	1.2
@@ -1,6 +1,6 @@
 Name:          w3c-libwww
 Version:       5.4.1
-Release:       0.2.20060206cvs%{?dist}
+Release:       0.3.20060206cvs%{?dist}
 Summary:       HTTP library of common code
 
 Group:         System Environment/Libraries
@@ -13,6 +13,7 @@
 Patch0:        w3c-libwww-configure.patch
 Patch1:        w3c-libwww-5.3.2-incdir.patch
 Patch2:        w3c-libwww-ppc64.patch
+Patch3:        w3c-libwww-md5.patch
 #external expat
 Patch100:      w3c-libwww-expat.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -58,6 +59,7 @@
 %patch0
 %patch1 -p1 
 %patch2 -p1 -b .ppc64
+%patch3
 %patch100
 
 # we don't want the libwww version
@@ -119,6 +121,10 @@
 %{_includedir}/w3c-libwww
 
 %changelog
+* Sat Apr 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+5.4.1-0.3.20060206cvs
+- fix md5 (#187895)
+
 * Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 5.4.1-0.2.20060206cvs
 - readd wwwconfig.h to fix internal header errors



From fedora-extras-commits at redhat.com  Sat Apr 22 00:30:32 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 17:30:32 -0700
Subject: rpms/w3c-libwww/devel w3c-libwww-md5.patch, NONE,
	1.1 w3c-libwww.spec, 1.1, 1.2
Message-ID: <200604220031.k3M0V4Pp031443@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/w3c-libwww/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31401/devel

Modified Files:
	w3c-libwww.spec 
Added Files:
	w3c-libwww-md5.patch 
Log Message:
- fix md5 (#187895)


w3c-libwww-md5.patch:

--- NEW FILE w3c-libwww-md5.patch ---
--- modules/md5/md5.h.orig	2006-04-22 02:25:32.000000000 +0200
+++ modules/md5/md5.h	2006-04-22 02:25:54.000000000 +0200
@@ -42,7 +42,7 @@
 typedef unsigned short int UINT2;
 
 /* UINT4 defines a four byte word */
-typedef unsigned long int UINT4;
+typedef unsigned int UINT4;
 
 /* PROTO_LIST is defined depending on how PROTOTYPES is defined above.
    If using PROTOTYPES, then PROTO_LIST returns the list, otherwise it


Index: w3c-libwww.spec
===================================================================
RCS file: /cvs/extras/rpms/w3c-libwww/devel/w3c-libwww.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- w3c-libwww.spec	28 Feb 2006 10:21:52 -0000	1.1
+++ w3c-libwww.spec	22 Apr 2006 00:30:32 -0000	1.2
@@ -1,6 +1,6 @@
 Name:          w3c-libwww
 Version:       5.4.1
-Release:       0.2.20060206cvs%{?dist}
+Release:       0.3.20060206cvs%{?dist}
 Summary:       HTTP library of common code
 
 Group:         System Environment/Libraries
@@ -13,6 +13,7 @@
 Patch0:        w3c-libwww-configure.patch
 Patch1:        w3c-libwww-5.3.2-incdir.patch
 Patch2:        w3c-libwww-ppc64.patch
+Patch3:        w3c-libwww-md5.patch
 #external expat
 Patch100:      w3c-libwww-expat.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -58,6 +59,7 @@
 %patch0
 %patch1 -p1 
 %patch2 -p1 -b .ppc64
+%patch3
 %patch100
 
 # we don't want the libwww version
@@ -119,6 +121,10 @@
 %{_includedir}/w3c-libwww
 
 %changelog
+* Sat Apr 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+5.4.1-0.3.20060206cvs
+- fix md5 (#187895)
+
 * Tue Feb 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 5.4.1-0.2.20060206cvs
 - readd wwwconfig.h to fix internal header errors



From fedora-extras-commits at redhat.com  Sat Apr 22 00:34:36 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 17:34:36 -0700
Subject: rpms/sylpheed-claws-plugins/devel
	sylpheed-claws-plugins-smime.patch, 
	NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 sylpheed-claws-plugins.spec, 1.9, 1.10
Message-ID: <200604220034.k3M0YcAC031620@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-serv31472/devel

Modified Files:
	.cvsignore sources sylpheed-claws-plugins.spec 
Added Files:
	sylpheed-claws-plugins-smime.patch 
Log Message:
- version upgrade


sylpheed-claws-plugins-smime.patch:

--- NEW FILE sylpheed-claws-plugins-smime.patch ---
--- smime-0.5/configure.ac.orig	2006-04-17 11:29:30.000000000 +0200
+++ smime-0.5/configure.ac	2006-04-17 11:29:53.000000000 +0200
@@ -41,7 +41,7 @@
 fi
 
 dnl check for sylpheed-claws
-PKG_CHECK_MODULES(SYLPHEED_CLAWS, sylpheed-claws >= 2.1.0.1)
+PKG_CHECK_MODULES(SYLPHEED_CLAWS, sylpheed-claws >= 2.1.0.0)
 SYLPHEED_CLAWS_PLUGINDIR=$( $PKG_CONFIG --variable=plugindir sylpheed-claws )
 AC_SUBST(SYLPHEED_CLAWS_CFLAGS)
 AC_SUBST(SYLPHEED_CLAWS_LIBS)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Feb 2006 09:51:40 -0000	1.4
+++ .cvsignore	22 Apr 2006 00:34:35 -0000	1.5
@@ -1 +1 @@
-sylpheed-claws-extra-plugins-2.0.0.tar.bz2
+sylpheed-claws-extra-plugins-2.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Feb 2006 09:51:40 -0000	1.4
+++ sources	22 Apr 2006 00:34:35 -0000	1.5
@@ -1 +1 @@
-77fe8e71f12c6f6ae1dfe9d55ab3d7d4  sylpheed-claws-extra-plugins-2.0.0.tar.bz2
+c15f7bd52ebed8c9c9163c8a8e593c5d  sylpheed-claws-extra-plugins-2.1.0.tar.bz2


Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/sylpheed-claws-plugins.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sylpheed-claws-plugins.spec	17 Feb 2006 08:03:31 -0000	1.9
+++ sylpheed-claws-plugins.spec	22 Apr 2006 00:34:35 -0000	1.10
@@ -1,12 +1,13 @@
 Name:           sylpheed-claws-plugins
-Version:        2.0.0
-Release:        2%{?dist}
+Version:        2.1.0
+Release:        1%{?dist}
 Summary:        Additional plugins for sylpheed-claws
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
 Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-extra-plugins-%{version}.tar.bz2
+Patch0:         sylpheed-claws-plugins-smime.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  sylpheed-claws-devel >= %{version}
@@ -17,18 +18,29 @@
 BuildRequires:  synce-devel
 BuildRequires:  curl-devel
 BuildRequires:  libxml2-devel
+BuildRequires:  gtkhtml2-devel
+BuildRequires:  libidn-devel
 
 Requires:       %{name}-acpi-notifier = %{version}-%{release}
 Requires:       %{name}-att-remover = %{version}-%{release}
 Requires:       %{name}-cachesaver = %{version}-%{release}
 Requires:       %{name}-etpan-privacy = %{version}-%{release}
 Requires:       %{name}-fetchinfo = %{version}-%{release}
+Requires:       %{name}-gtkhtml2-viewer = %{version}-%{release}
 Requires:       %{name}-maildir = %{version}-%{release}
 Requires:       %{name}-mailmbox = %{version}-%{release}
+Requires:       %{name}-newmail = %{version}-%{release}
+Requires:       %{name}-notification = %{version}-%{release}
 Requires:       %{name}-perl = %{version}-%{release}
 Requires:       %{name}-rssyl = %{version}-%{release}
+Requires:       %{name}-smime = %{version}-%{release}
 Requires:       %{name}-synce = %{version}-%{release}
 Requires:       %{name}-vcalendar = %{version}-%{release}
+# and the ones from main sylpheed-package...
+Requires:       %{name}-clamav
+Requires:       %{name}-dillo
+Requires:       %{name}-spamassassin
+Requires:       %{name}-pgp
 
 %description
 Additional plugins for sylpheed-claws
@@ -49,7 +61,6 @@
 %description att-remover
 %{summary}
 
-
 %package cachesaver
 Summary:        A cache saving plugin
 Group:          Applications/Internet
@@ -77,6 +88,14 @@
 This plugin inserts headers containing some download information:
 UIDL, Sylpheeds account name, POP server, user ID and retrieval time.
 
+%package gtkhtml2-viewer
+Summary:        GTK Html Viewer
+Group:          Applications/Internet
+Requires:       sylpheed-claws >= %{version}
+
+%description gtkhtml2-viewer
+%{summary}
+
 %package maildir
 Summary:        Provide direct access to Maildir++ Mailboxes
 Group:          Applications/Internet
@@ -96,6 +115,24 @@
 %description mailmbox
 This plugin provides direct support for mailboxes in mbox format.
 
+%package newmail
+Summary:        Write a msg header summary to a log file
+Group:          Applications/Internet
+Requires:       sylpheed-claws >= %{version}
+
+%description newmail
+Write a msg header summary to a log file (defaults to ~/Mail/NewLog) an arrival
+of new mail *after* sorting.
+
+%package notification
+Summary:        New mail notifications
+Group:          Applications/Internet
+Requires:       sylpheed-claws >= %{version}
+
+%description notification
+This plugin collects various ways to notify the user of new (and possibly unread)
+mail. Currently, a popup and a mail banner are implemented.
+
 %package perl
 Summary:        Extended filtering engine
 Group:          Applications/Internet
@@ -114,6 +151,15 @@
 %description rssyl
 %{summary}
 
+%package smime
+Summary:        S/MIME signed and/or encrypted
+Group:          Applications/Internet
+Requires:       sylpheed-claws >= %{version}
+
+%description smime
+This plugin handles S/MIME signed and/or encrypted mails. You can decrypt
+mails, verify signatures or sign and encrypt your own mails.
+
 %package synce
 Summary:        Keeping the addressbook of a Windows CE device in sync
 Group:          Applications/Internet
@@ -135,16 +181,17 @@
 
 %prep
 %setup -q -n sylpheed-claws-extra-plugins-%{version}
+%patch0
 
 %build
 
 #acpi_notifier
-cd acpi_notifier-0.8
+cd acpi_notifier-1.0
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #att_remover
-cd ../att_remover-0.4
+cd ../att_remover-1.0
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
@@ -159,49 +206,70 @@
 %{__make} %{?_smp_mflags}
 
 #fetchinfo-plugin
-cd ../fetchinfo-plugin-0.4.10
+cd ../fetchinfo-plugin-0.4.12
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
+#gtkhtml2-viewer
+cd ../gtkhtml2_viewer-0.8
+%configure --disable-static --disable-dependency-tracking --disable-rpath
+%{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
+
 #maildir
-cd ../maildir-0.19
+cd ../maildir-0.20
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #mailmbox
-cd ../mailmbox-1.10
+cd ../mailmbox-1.11
+%configure --disable-static --disable-dependency-tracking
+%{__make} %{?_smp_mflags}
+
+#newmail
+cd ../newmail-0.0.3
+%configure --disable-static --disable-dependency-tracking
+%{__make} %{?_smp_mflags}
+
+#notification-plugin
+cd ../notification_plugin-0.1
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
+
 #perl
-cd ../perl_plugin-0.6
+cd ../perl_plugin-0.9
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #rssyl
-cd ../rssyl-0.4pre
+cd ../rssyl-0.4cvs6
+%configure --disable-static --disable-dependency-tracking
+%{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
+
+#smime
+cd ../smime-0.5
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #synce
-cd ../synce_plugin-0.4
+cd ../synce_plugin-0.6
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #vcalendar
-cd ../vcalendar-1.29
+cd ../vcalendar-1.71
 %configure --disable-static --disable-dependency-tracking
-%{__make} %{?_smp_mflags}
+%{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 # acpi_notifier
-cd acpi_notifier-0.8
+cd acpi_notifier-1.0
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 # att_remover
-cd ../att_remover-0.4
+cd ../att_remover-1.0
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 # cachesaver
@@ -213,31 +281,47 @@
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #fetchinfo-plugin
-cd ../fetchinfo-plugin-0.4.10
+cd ../fetchinfo-plugin-0.4.12
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
+
+#gtkhtml2-viewer
+cd ../gtkhtml2_viewer-0.8
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #maildir
-cd ../maildir-0.19
+cd ../maildir-0.20
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #mailmbox
-cd ../mailmbox-1.10
+cd ../mailmbox-1.11
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
+
+#newmail
+cd ../newmail-0.0.3
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
+
+#notification-plugin
+cd ../notification_plugin-0.1
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #perl
-cd ../perl_plugin-0.6
+cd ../perl_plugin-0.9
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #rssyl
-cd ../rssyl-0.4pre
+cd ../rssyl-0.4cvs6
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
+
+#smime
+cd ../smime-0.5
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #synce
-cd ../synce_plugin-0.4
+cd ../synce_plugin-0.6
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #vcalendar
-cd ../vcalendar-1.29
+cd ../vcalendar-1.71
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
@@ -251,11 +335,11 @@
 
 %files acpi-notifier
 %defattr(-,root,root,-)
-%doc acpi_notifier-0.8/ChangeLog
-%doc acpi_notifier-0.8/COPYING
-%doc acpi_notifier-0.8/NEWS
-%doc acpi_notifier-0.8/AUTHORS
-%doc acpi_notifier-0.8/README
+%doc acpi_notifier-1.0/ChangeLog
+%doc acpi_notifier-1.0/COPYING
+%doc acpi_notifier-1.0/NEWS
+%doc acpi_notifier-1.0/AUTHORS
+%doc acpi_notifier-1.0/README
 %{_libdir}/sylpheed-claws/plugins/acpi_notifier*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/acpi_notifier.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/acpi_notifier.mo
@@ -270,11 +354,11 @@
 
 %files att-remover
 %defattr(-,root,root,-)
-%doc att_remover-0.4/AUTHORS
-%doc att_remover-0.4/ChangeLog
-%doc att_remover-0.4/COPYING
-%doc att_remover-0.4/NEWS
-%doc att_remover-0.4/README
+%doc att_remover-1.0/AUTHORS
+%doc att_remover-1.0/ChangeLog
+%doc att_remover-1.0/COPYING
+%doc att_remover-1.0/NEWS
+%doc att_remover-1.0/README
 %{_libdir}/sylpheed-claws/plugins/att_remover*
 
 %files cachesaver
@@ -294,43 +378,69 @@
 
 %files fetchinfo
 %defattr(-,root,root,-)
-%doc fetchinfo-plugin-0.4.10/ChangeLog
-%doc fetchinfo-plugin-0.4.10/COPYING
-%doc fetchinfo-plugin-0.4.10/README
+%doc fetchinfo-plugin-0.4.12/ChangeLog
+%doc fetchinfo-plugin-0.4.12/COPYING
+%doc fetchinfo-plugin-0.4.12/README
 %{_libdir}/sylpheed-claws/plugins/fetchinfo*
 
+%files gtkhtml2-viewer
+%defattr(-,root,root,-)
+%doc gtkhtml2_viewer-0.8/AUTHORS
+%doc gtkhtml2_viewer-0.8/COPYING
+%{_libdir}/sylpheed-claws/plugins/gtkhtml2_viewer*
+%lang(es) %{_datadir}/locale/es/LC_MESSAGES/gtkhtml2_viewer.mo
+%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/gtkhtml2_viewer.mo
+
+
 %files maildir
 %defattr(-,root,root,-)
-%doc maildir-0.19/AUTHORS
-%doc maildir-0.19/ChangeLog
-%doc maildir-0.19/COPYING
-%doc maildir-0.19/README
-%doc maildir-0.19/doc/README.xml
+%doc maildir-0.20/AUTHORS
+%doc maildir-0.20/ChangeLog
+%doc maildir-0.20/COPYING
+%doc maildir-0.20/README
+%doc maildir-0.20/doc/README.xml
 %{_libdir}/sylpheed-claws/plugins/maildir*
 
 %files mailmbox
 %defattr(-,root,root,-)
-%doc mailmbox-1.10/AUTHORS
-%doc mailmbox-1.10/ChangeLog
-%doc mailmbox-1.10/COPYING
-%doc mailmbox-1.10/README
+%doc mailmbox-1.11/AUTHORS
+%doc mailmbox-1.11/ChangeLog
+%doc mailmbox-1.11/COPYING
+%doc mailmbox-1.11/README
 %{_libdir}/sylpheed-claws/plugins/mailmbox*
 
+%files newmail
+%defattr(-,root,root,-)
+%doc newmail-0.0.3/AUTHORS
+%doc newmail-0.0.3/ChangeLog
+%doc newmail-0.0.3/COPYING
+%doc newmail-0.0.3/NEWS
+%doc newmail-0.0.3/README
+%{_libdir}/sylpheed-claws/plugins/newmail.so
+
+%files notification
+%defattr(-,root,root,-)
+%doc notification_plugin-0.1/AUTHORS
+%doc notification_plugin-0.1/ChangeLog
+%doc notification_plugin-0.1/COPYING
+%doc notification_plugin-0.1/README
+%{_libdir}/sylpheed-claws/plugins/notification_plugin.so
+
 %files perl
 %defattr(-,root,root,-)
-%doc perl_plugin-0.6/AUTHORS
-%doc perl_plugin-0.6/ChangeLog
-%doc perl_plugin-0.6/COPYING
-%doc perl_plugin-0.6/README
-%doc perl_plugin-0.6/sc_perl.pod
+%doc perl_plugin-0.9/AUTHORS
+%doc perl_plugin-0.9/ChangeLog
+%doc perl_plugin-0.9/COPYING
+%doc perl_plugin-0.9/README
+%doc perl_plugin-0.9/sc_perl.pod
 %{_libdir}/sylpheed-claws/plugins/perl_plugin.so
 
 %files rssyl
 %defattr(-,root,root,-)
-%doc rssyl-0.4pre/AUTHORS
-%doc rssyl-0.4pre/ChangeLog
-%doc rssyl-0.4pre/COPYING
-%doc rssyl-0.4pre/TODO
+%doc rssyl-0.4cvs6/AUTHORS
+%doc rssyl-0.4cvs6/ChangeLog
+%doc rssyl-0.4cvs6/COPYING
+%doc rssyl-0.4cvs6/TODO
 %{_libdir}/sylpheed-claws/plugins/rssyl*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/rssyl.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/rssyl.mo
@@ -343,21 +453,28 @@
 %lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/rssyl.mo
 %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/rssyl.mo
 
+%files smime
+%defattr(-,root,root,-)
+%doc smime-0.5/ChangeLog
+%doc smime-0.5/COPYING
+%doc smime-0.5/NEWS
+%{_libdir}/sylpheed-claws/plugins/smime.so
+
 %files synce
 %defattr(-,root,root,-)
-%doc synce_plugin-0.4/AUTHORS
-%doc synce_plugin-0.4/ChangeLog
-%doc synce_plugin-0.4/COPYING
-%doc synce_plugin-0.4/README
+%doc synce_plugin-0.6/AUTHORS
+%doc synce_plugin-0.6/ChangeLog
+%doc synce_plugin-0.6/COPYING
+%doc synce_plugin-0.6/README
 %{_libdir}/sylpheed-claws/plugins/synce*
 
 %files vcalendar
 %defattr(-,root,root,-)
-%doc vcalendar-1.29/AUTHORS
-%doc vcalendar-1.29/ChangeLog
-%doc vcalendar-1.29/COPYING
-%doc vcalendar-1.29/README
-%{_libdir}/sylpheed-claws/plugins/vcalendar.so
+%doc vcalendar-1.71/AUTHORS
+%doc vcalendar-1.71/ChangeLog
+%doc vcalendar-1.71/COPYING
+%doc vcalendar-1.71/README
+%{_libdir}/sylpheed-claws/plugins/vcalendar*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/vcalendar.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/vcalendar.mo
 %lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/vcalendar.mo
@@ -370,6 +487,10 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Sat Apr 08 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.1.0-1
+- version upgrade
+
 * Fri Feb 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.0.0-2
 - Rebuild for Fedora Extras 5



From fedora-extras-commits at redhat.com  Sat Apr 22 00:34:34 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 17:34:34 -0700
Subject: rpms/sylpheed-claws-plugins/FC-4 sylpheed-claws-plugins-smime.patch,
	NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 sylpheed-claws-plugins.spec, 1.8, 1.9
Message-ID: <200604220034.k3M0YadC031606@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-serv31472/FC-4

Modified Files:
	.cvsignore sources sylpheed-claws-plugins.spec 
Added Files:
	sylpheed-claws-plugins-smime.patch 
Log Message:
- version upgrade


sylpheed-claws-plugins-smime.patch:

--- NEW FILE sylpheed-claws-plugins-smime.patch ---
--- smime-0.5/configure.ac.orig	2006-04-17 11:29:30.000000000 +0200
+++ smime-0.5/configure.ac	2006-04-17 11:29:53.000000000 +0200
@@ -41,7 +41,7 @@
 fi
 
 dnl check for sylpheed-claws
-PKG_CHECK_MODULES(SYLPHEED_CLAWS, sylpheed-claws >= 2.1.0.1)
+PKG_CHECK_MODULES(SYLPHEED_CLAWS, sylpheed-claws >= 2.1.0.0)
 SYLPHEED_CLAWS_PLUGINDIR=$( $PKG_CONFIG --variable=plugindir sylpheed-claws )
 AC_SUBST(SYLPHEED_CLAWS_CFLAGS)
 AC_SUBST(SYLPHEED_CLAWS_LIBS)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Feb 2006 09:51:34 -0000	1.4
+++ .cvsignore	22 Apr 2006 00:34:34 -0000	1.5
@@ -1 +1 @@
-sylpheed-claws-extra-plugins-2.0.0.tar.bz2
+sylpheed-claws-extra-plugins-2.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Feb 2006 09:51:34 -0000	1.4
+++ sources	22 Apr 2006 00:34:34 -0000	1.5
@@ -1 +1 @@
-77fe8e71f12c6f6ae1dfe9d55ab3d7d4  sylpheed-claws-extra-plugins-2.0.0.tar.bz2
+c15f7bd52ebed8c9c9163c8a8e593c5d  sylpheed-claws-extra-plugins-2.1.0.tar.bz2


Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-4/sylpheed-claws-plugins.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sylpheed-claws-plugins.spec	3 Feb 2006 11:24:50 -0000	1.8
+++ sylpheed-claws-plugins.spec	22 Apr 2006 00:34:34 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           sylpheed-claws-plugins
-Version:        2.0.0
+Version:        2.1.0
 Release:        1%{?dist}
 Summary:        Additional plugins for sylpheed-claws
 
@@ -7,6 +7,7 @@
 License:        GPL
 URL:            http://claws.sylpheed.org
 Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-extra-plugins-%{version}.tar.bz2
+Patch0:         sylpheed-claws-plugins-smime.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  sylpheed-claws-devel >= %{version}
@@ -17,18 +18,29 @@
 BuildRequires:  synce-devel
 BuildRequires:  curl-devel
 BuildRequires:  libxml2-devel
+BuildRequires:  gtkhtml2-devel
+BuildRequires:  libidn-devel
 
 Requires:       %{name}-acpi-notifier = %{version}-%{release}
 Requires:       %{name}-att-remover = %{version}-%{release}
 Requires:       %{name}-cachesaver = %{version}-%{release}
 Requires:       %{name}-etpan-privacy = %{version}-%{release}
 Requires:       %{name}-fetchinfo = %{version}-%{release}
+Requires:       %{name}-gtkhtml2-viewer = %{version}-%{release}
 Requires:       %{name}-maildir = %{version}-%{release}
 Requires:       %{name}-mailmbox = %{version}-%{release}
+Requires:       %{name}-newmail = %{version}-%{release}
+Requires:       %{name}-notification = %{version}-%{release}
 Requires:       %{name}-perl = %{version}-%{release}
 Requires:       %{name}-rssyl = %{version}-%{release}
+Requires:       %{name}-smime = %{version}-%{release}
 Requires:       %{name}-synce = %{version}-%{release}
 Requires:       %{name}-vcalendar = %{version}-%{release}
+# and the ones from main sylpheed-package...
+Requires:       %{name}-clamav
+Requires:       %{name}-dillo
+Requires:       %{name}-spamassassin
+Requires:       %{name}-pgp
 
 %description
 Additional plugins for sylpheed-claws
@@ -49,7 +61,6 @@
 %description att-remover
 %{summary}
 
-
 %package cachesaver
 Summary:        A cache saving plugin
 Group:          Applications/Internet
@@ -77,6 +88,14 @@
 This plugin inserts headers containing some download information:
 UIDL, Sylpheeds account name, POP server, user ID and retrieval time.
 
+%package gtkhtml2-viewer
+Summary:        GTK Html Viewer
+Group:          Applications/Internet
+Requires:       sylpheed-claws >= %{version}
+
+%description gtkhtml2-viewer
+%{summary}
+
 %package maildir
 Summary:        Provide direct access to Maildir++ Mailboxes
 Group:          Applications/Internet
@@ -96,6 +115,24 @@
 %description mailmbox
 This plugin provides direct support for mailboxes in mbox format.
 
+%package newmail
+Summary:        Write a msg header summary to a log file
+Group:          Applications/Internet
+Requires:       sylpheed-claws >= %{version}
+
+%description newmail
+Write a msg header summary to a log file (defaults to ~/Mail/NewLog) an arrival
+of new mail *after* sorting.
+
+%package notification
+Summary:        New mail notifications
+Group:          Applications/Internet
+Requires:       sylpheed-claws >= %{version}
+
+%description notification
+This plugin collects various ways to notify the user of new (and possibly unread)
+mail. Currently, a popup and a mail banner are implemented.
+
 %package perl
 Summary:        Extended filtering engine
 Group:          Applications/Internet
@@ -114,6 +151,15 @@
 %description rssyl
 %{summary}
 
+%package smime
+Summary:        S/MIME signed and/or encrypted
+Group:          Applications/Internet
+Requires:       sylpheed-claws >= %{version}
+
+%description smime
+This plugin handles S/MIME signed and/or encrypted mails. You can decrypt
+mails, verify signatures or sign and encrypt your own mails.
+
 %package synce
 Summary:        Keeping the addressbook of a Windows CE device in sync
 Group:          Applications/Internet
@@ -135,16 +181,17 @@
 
 %prep
 %setup -q -n sylpheed-claws-extra-plugins-%{version}
+%patch0
 
 %build
 
 #acpi_notifier
-cd acpi_notifier-0.8
+cd acpi_notifier-1.0
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #att_remover
-cd ../att_remover-0.4
+cd ../att_remover-1.0
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
@@ -159,49 +206,70 @@
 %{__make} %{?_smp_mflags}
 
 #fetchinfo-plugin
-cd ../fetchinfo-plugin-0.4.10
+cd ../fetchinfo-plugin-0.4.12
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
+#gtkhtml2-viewer
+cd ../gtkhtml2_viewer-0.8
+%configure --disable-static --disable-dependency-tracking --disable-rpath
+%{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
+
 #maildir
-cd ../maildir-0.19
+cd ../maildir-0.20
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #mailmbox
-cd ../mailmbox-1.10
+cd ../mailmbox-1.11
+%configure --disable-static --disable-dependency-tracking
+%{__make} %{?_smp_mflags}
+
+#newmail
+cd ../newmail-0.0.3
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
+#notification-plugin
+cd ../notification_plugin-0.1
+%configure --disable-static --disable-dependency-tracking
+%{__make} %{?_smp_mflags}
+
+
 #perl
-cd ../perl_plugin-0.6
+cd ../perl_plugin-0.9
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #rssyl
-cd ../rssyl-0.4pre
+cd ../rssyl-0.4cvs6
+%configure --disable-static --disable-dependency-tracking
+%{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
+
+#smime
+cd ../smime-0.5
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #synce
-cd ../synce_plugin-0.4
+cd ../synce_plugin-0.6
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #vcalendar
-cd ../vcalendar-1.29
+cd ../vcalendar-1.71
 %configure --disable-static --disable-dependency-tracking
-%{__make} %{?_smp_mflags}
+%{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 # acpi_notifier
-cd acpi_notifier-0.8
+cd acpi_notifier-1.0
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 # att_remover
-cd ../att_remover-0.4
+cd ../att_remover-1.0
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 # cachesaver
@@ -213,31 +281,47 @@
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #fetchinfo-plugin
-cd ../fetchinfo-plugin-0.4.10
+cd ../fetchinfo-plugin-0.4.12
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
+
+#gtkhtml2-viewer
+cd ../gtkhtml2_viewer-0.8
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #maildir
-cd ../maildir-0.19
+cd ../maildir-0.20
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #mailmbox
-cd ../mailmbox-1.10
+cd ../mailmbox-1.11
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
+
+#newmail
+cd ../newmail-0.0.3
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
+
+#notification-plugin
+cd ../notification_plugin-0.1
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #perl
-cd ../perl_plugin-0.6
+cd ../perl_plugin-0.9
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #rssyl
-cd ../rssyl-0.4pre
+cd ../rssyl-0.4cvs6
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
+
+#smime
+cd ../smime-0.5
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #synce
-cd ../synce_plugin-0.4
+cd ../synce_plugin-0.6
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #vcalendar
-cd ../vcalendar-1.29
+cd ../vcalendar-1.71
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
@@ -251,11 +335,11 @@
 
 %files acpi-notifier
 %defattr(-,root,root,-)
-%doc acpi_notifier-0.8/ChangeLog
-%doc acpi_notifier-0.8/COPYING
-%doc acpi_notifier-0.8/NEWS
-%doc acpi_notifier-0.8/AUTHORS
-%doc acpi_notifier-0.8/README
+%doc acpi_notifier-1.0/ChangeLog
+%doc acpi_notifier-1.0/COPYING
+%doc acpi_notifier-1.0/NEWS
+%doc acpi_notifier-1.0/AUTHORS
+%doc acpi_notifier-1.0/README
 %{_libdir}/sylpheed-claws/plugins/acpi_notifier*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/acpi_notifier.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/acpi_notifier.mo
@@ -270,11 +354,11 @@
 
 %files att-remover
 %defattr(-,root,root,-)
-%doc att_remover-0.4/AUTHORS
-%doc att_remover-0.4/ChangeLog
-%doc att_remover-0.4/COPYING
-%doc att_remover-0.4/NEWS
-%doc att_remover-0.4/README
+%doc att_remover-1.0/AUTHORS
+%doc att_remover-1.0/ChangeLog
+%doc att_remover-1.0/COPYING
+%doc att_remover-1.0/NEWS
+%doc att_remover-1.0/README
 %{_libdir}/sylpheed-claws/plugins/att_remover*
 
 %files cachesaver
@@ -294,43 +378,69 @@
 
 %files fetchinfo
 %defattr(-,root,root,-)
-%doc fetchinfo-plugin-0.4.10/ChangeLog
-%doc fetchinfo-plugin-0.4.10/COPYING
-%doc fetchinfo-plugin-0.4.10/README
+%doc fetchinfo-plugin-0.4.12/ChangeLog
+%doc fetchinfo-plugin-0.4.12/COPYING
+%doc fetchinfo-plugin-0.4.12/README
 %{_libdir}/sylpheed-claws/plugins/fetchinfo*
 
+%files gtkhtml2-viewer
+%defattr(-,root,root,-)
+%doc gtkhtml2_viewer-0.8/AUTHORS
+%doc gtkhtml2_viewer-0.8/COPYING
+%{_libdir}/sylpheed-claws/plugins/gtkhtml2_viewer*
+%lang(es) %{_datadir}/locale/es/LC_MESSAGES/gtkhtml2_viewer.mo
+%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/gtkhtml2_viewer.mo
+
+
 %files maildir
 %defattr(-,root,root,-)
-%doc maildir-0.19/AUTHORS
-%doc maildir-0.19/ChangeLog
-%doc maildir-0.19/COPYING
-%doc maildir-0.19/README
-%doc maildir-0.19/doc/README.xml
+%doc maildir-0.20/AUTHORS
+%doc maildir-0.20/ChangeLog
+%doc maildir-0.20/COPYING
+%doc maildir-0.20/README
+%doc maildir-0.20/doc/README.xml
 %{_libdir}/sylpheed-claws/plugins/maildir*
 
 %files mailmbox
 %defattr(-,root,root,-)
-%doc mailmbox-1.10/AUTHORS
-%doc mailmbox-1.10/ChangeLog
-%doc mailmbox-1.10/COPYING
-%doc mailmbox-1.10/README
+%doc mailmbox-1.11/AUTHORS
+%doc mailmbox-1.11/ChangeLog
+%doc mailmbox-1.11/COPYING
+%doc mailmbox-1.11/README
 %{_libdir}/sylpheed-claws/plugins/mailmbox*
 
+%files newmail
+%defattr(-,root,root,-)
+%doc newmail-0.0.3/AUTHORS
+%doc newmail-0.0.3/ChangeLog
+%doc newmail-0.0.3/COPYING
+%doc newmail-0.0.3/NEWS
+%doc newmail-0.0.3/README
+%{_libdir}/sylpheed-claws/plugins/newmail.so
+
+%files notification
+%defattr(-,root,root,-)
+%doc notification_plugin-0.1/AUTHORS
+%doc notification_plugin-0.1/ChangeLog
+%doc notification_plugin-0.1/COPYING
+%doc notification_plugin-0.1/README
+%{_libdir}/sylpheed-claws/plugins/notification_plugin.so
+
 %files perl
 %defattr(-,root,root,-)
-%doc perl_plugin-0.6/AUTHORS
-%doc perl_plugin-0.6/ChangeLog
-%doc perl_plugin-0.6/COPYING
-%doc perl_plugin-0.6/README
-%doc perl_plugin-0.6/sc_perl.pod
+%doc perl_plugin-0.9/AUTHORS
+%doc perl_plugin-0.9/ChangeLog
+%doc perl_plugin-0.9/COPYING
+%doc perl_plugin-0.9/README
+%doc perl_plugin-0.9/sc_perl.pod
 %{_libdir}/sylpheed-claws/plugins/perl_plugin.so
 
 %files rssyl
 %defattr(-,root,root,-)
-%doc rssyl-0.4pre/AUTHORS
-%doc rssyl-0.4pre/ChangeLog
-%doc rssyl-0.4pre/COPYING
-%doc rssyl-0.4pre/TODO
+%doc rssyl-0.4cvs6/AUTHORS
+%doc rssyl-0.4cvs6/ChangeLog
+%doc rssyl-0.4cvs6/COPYING
+%doc rssyl-0.4cvs6/TODO
 %{_libdir}/sylpheed-claws/plugins/rssyl*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/rssyl.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/rssyl.mo
@@ -343,21 +453,28 @@
 %lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/rssyl.mo
 %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/rssyl.mo
 
+%files smime
+%defattr(-,root,root,-)
+%doc smime-0.5/ChangeLog
+%doc smime-0.5/COPYING
+%doc smime-0.5/NEWS
+%{_libdir}/sylpheed-claws/plugins/smime.so
+
 %files synce
 %defattr(-,root,root,-)
-%doc synce_plugin-0.4/AUTHORS
-%doc synce_plugin-0.4/ChangeLog
-%doc synce_plugin-0.4/COPYING
-%doc synce_plugin-0.4/README
+%doc synce_plugin-0.6/AUTHORS
+%doc synce_plugin-0.6/ChangeLog
+%doc synce_plugin-0.6/COPYING
+%doc synce_plugin-0.6/README
 %{_libdir}/sylpheed-claws/plugins/synce*
 
 %files vcalendar
 %defattr(-,root,root,-)
-%doc vcalendar-1.29/AUTHORS
-%doc vcalendar-1.29/ChangeLog
-%doc vcalendar-1.29/COPYING
-%doc vcalendar-1.29/README
-%{_libdir}/sylpheed-claws/plugins/vcalendar.so
+%doc vcalendar-1.71/AUTHORS
+%doc vcalendar-1.71/ChangeLog
+%doc vcalendar-1.71/COPYING
+%doc vcalendar-1.71/README
+%{_libdir}/sylpheed-claws/plugins/vcalendar*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/vcalendar.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/vcalendar.mo
 %lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/vcalendar.mo
@@ -370,6 +487,14 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Sat Apr 08 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.1.0-1
+- version upgrade
+
+* Fri Feb 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.0.0-2
+- Rebuild for Fedora Extras 5
+
 * Fri Feb 03 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.0.0-1
 - version upgrade



From fedora-extras-commits at redhat.com  Sat Apr 22 00:34:35 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 17:34:35 -0700
Subject: rpms/sylpheed-claws-plugins/FC-5 sylpheed-claws-plugins-smime.patch,
	NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4,
	1.5 sylpheed-claws-plugins.spec, 1.9, 1.10
Message-ID: <200604220034.k3M0Yb6n031614@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-serv31472/FC-5

Modified Files:
	.cvsignore sources sylpheed-claws-plugins.spec 
Added Files:
	sylpheed-claws-plugins-smime.patch 
Log Message:
- version upgrade


sylpheed-claws-plugins-smime.patch:

--- NEW FILE sylpheed-claws-plugins-smime.patch ---
--- smime-0.5/configure.ac.orig	2006-04-17 11:29:30.000000000 +0200
+++ smime-0.5/configure.ac	2006-04-17 11:29:53.000000000 +0200
@@ -41,7 +41,7 @@
 fi
 
 dnl check for sylpheed-claws
-PKG_CHECK_MODULES(SYLPHEED_CLAWS, sylpheed-claws >= 2.1.0.1)
+PKG_CHECK_MODULES(SYLPHEED_CLAWS, sylpheed-claws >= 2.1.0.0)
 SYLPHEED_CLAWS_PLUGINDIR=$( $PKG_CONFIG --variable=plugindir sylpheed-claws )
 AC_SUBST(SYLPHEED_CLAWS_CFLAGS)
 AC_SUBST(SYLPHEED_CLAWS_LIBS)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	3 Feb 2006 09:51:40 -0000	1.4
+++ .cvsignore	22 Apr 2006 00:34:35 -0000	1.5
@@ -1 +1 @@
-sylpheed-claws-extra-plugins-2.0.0.tar.bz2
+sylpheed-claws-extra-plugins-2.1.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	3 Feb 2006 09:51:40 -0000	1.4
+++ sources	22 Apr 2006 00:34:35 -0000	1.5
@@ -1 +1 @@
-77fe8e71f12c6f6ae1dfe9d55ab3d7d4  sylpheed-claws-extra-plugins-2.0.0.tar.bz2
+c15f7bd52ebed8c9c9163c8a8e593c5d  sylpheed-claws-extra-plugins-2.1.0.tar.bz2


Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-5/sylpheed-claws-plugins.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sylpheed-claws-plugins.spec	17 Feb 2006 08:03:31 -0000	1.9
+++ sylpheed-claws-plugins.spec	22 Apr 2006 00:34:35 -0000	1.10
@@ -1,12 +1,13 @@
 Name:           sylpheed-claws-plugins
-Version:        2.0.0
-Release:        2%{?dist}
+Version:        2.1.0
+Release:        1%{?dist}
 Summary:        Additional plugins for sylpheed-claws
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://claws.sylpheed.org
 Source0:        http://dl.sf.net/sylpheed-claws/sylpheed-claws-extra-plugins-%{version}.tar.bz2
+Patch0:         sylpheed-claws-plugins-smime.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  sylpheed-claws-devel >= %{version}
@@ -17,18 +18,29 @@
 BuildRequires:  synce-devel
 BuildRequires:  curl-devel
 BuildRequires:  libxml2-devel
+BuildRequires:  gtkhtml2-devel
+BuildRequires:  libidn-devel
 
 Requires:       %{name}-acpi-notifier = %{version}-%{release}
 Requires:       %{name}-att-remover = %{version}-%{release}
 Requires:       %{name}-cachesaver = %{version}-%{release}
 Requires:       %{name}-etpan-privacy = %{version}-%{release}
 Requires:       %{name}-fetchinfo = %{version}-%{release}
+Requires:       %{name}-gtkhtml2-viewer = %{version}-%{release}
 Requires:       %{name}-maildir = %{version}-%{release}
 Requires:       %{name}-mailmbox = %{version}-%{release}
+Requires:       %{name}-newmail = %{version}-%{release}
+Requires:       %{name}-notification = %{version}-%{release}
 Requires:       %{name}-perl = %{version}-%{release}
 Requires:       %{name}-rssyl = %{version}-%{release}
+Requires:       %{name}-smime = %{version}-%{release}
 Requires:       %{name}-synce = %{version}-%{release}
 Requires:       %{name}-vcalendar = %{version}-%{release}
+# and the ones from main sylpheed-package...
+Requires:       %{name}-clamav
+Requires:       %{name}-dillo
+Requires:       %{name}-spamassassin
+Requires:       %{name}-pgp
 
 %description
 Additional plugins for sylpheed-claws
@@ -49,7 +61,6 @@
 %description att-remover
 %{summary}
 
-
 %package cachesaver
 Summary:        A cache saving plugin
 Group:          Applications/Internet
@@ -77,6 +88,14 @@
 This plugin inserts headers containing some download information:
 UIDL, Sylpheeds account name, POP server, user ID and retrieval time.
 
+%package gtkhtml2-viewer
+Summary:        GTK Html Viewer
+Group:          Applications/Internet
+Requires:       sylpheed-claws >= %{version}
+
+%description gtkhtml2-viewer
+%{summary}
+
 %package maildir
 Summary:        Provide direct access to Maildir++ Mailboxes
 Group:          Applications/Internet
@@ -96,6 +115,24 @@
 %description mailmbox
 This plugin provides direct support for mailboxes in mbox format.
 
+%package newmail
+Summary:        Write a msg header summary to a log file
+Group:          Applications/Internet
+Requires:       sylpheed-claws >= %{version}
+
+%description newmail
+Write a msg header summary to a log file (defaults to ~/Mail/NewLog) an arrival
+of new mail *after* sorting.
+
+%package notification
+Summary:        New mail notifications
+Group:          Applications/Internet
+Requires:       sylpheed-claws >= %{version}
+
+%description notification
+This plugin collects various ways to notify the user of new (and possibly unread)
+mail. Currently, a popup and a mail banner are implemented.
+
 %package perl
 Summary:        Extended filtering engine
 Group:          Applications/Internet
@@ -114,6 +151,15 @@
 %description rssyl
 %{summary}
 
+%package smime
+Summary:        S/MIME signed and/or encrypted
+Group:          Applications/Internet
+Requires:       sylpheed-claws >= %{version}
+
+%description smime
+This plugin handles S/MIME signed and/or encrypted mails. You can decrypt
+mails, verify signatures or sign and encrypt your own mails.
+
 %package synce
 Summary:        Keeping the addressbook of a Windows CE device in sync
 Group:          Applications/Internet
@@ -135,16 +181,17 @@
 
 %prep
 %setup -q -n sylpheed-claws-extra-plugins-%{version}
+%patch0
 
 %build
 
 #acpi_notifier
-cd acpi_notifier-0.8
+cd acpi_notifier-1.0
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #att_remover
-cd ../att_remover-0.4
+cd ../att_remover-1.0
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
@@ -159,49 +206,70 @@
 %{__make} %{?_smp_mflags}
 
 #fetchinfo-plugin
-cd ../fetchinfo-plugin-0.4.10
+cd ../fetchinfo-plugin-0.4.12
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
+#gtkhtml2-viewer
+cd ../gtkhtml2_viewer-0.8
+%configure --disable-static --disable-dependency-tracking --disable-rpath
+%{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
+
 #maildir
-cd ../maildir-0.19
+cd ../maildir-0.20
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #mailmbox
-cd ../mailmbox-1.10
+cd ../mailmbox-1.11
+%configure --disable-static --disable-dependency-tracking
+%{__make} %{?_smp_mflags}
+
+#newmail
+cd ../newmail-0.0.3
+%configure --disable-static --disable-dependency-tracking
+%{__make} %{?_smp_mflags}
+
+#notification-plugin
+cd ../notification_plugin-0.1
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
+
 #perl
-cd ../perl_plugin-0.6
+cd ../perl_plugin-0.9
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #rssyl
-cd ../rssyl-0.4pre
+cd ../rssyl-0.4cvs6
+%configure --disable-static --disable-dependency-tracking
+%{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
+
+#smime
+cd ../smime-0.5
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #synce
-cd ../synce_plugin-0.4
+cd ../synce_plugin-0.6
 %configure --disable-static --disable-dependency-tracking
 %{__make} %{?_smp_mflags}
 
 #vcalendar
-cd ../vcalendar-1.29
+cd ../vcalendar-1.71
 %configure --disable-static --disable-dependency-tracking
-%{__make} %{?_smp_mflags}
+%{__make} %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 # acpi_notifier
-cd acpi_notifier-0.8
+cd acpi_notifier-1.0
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 # att_remover
-cd ../att_remover-0.4
+cd ../att_remover-1.0
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 # cachesaver
@@ -213,31 +281,47 @@
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #fetchinfo-plugin
-cd ../fetchinfo-plugin-0.4.10
+cd ../fetchinfo-plugin-0.4.12
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
+
+#gtkhtml2-viewer
+cd ../gtkhtml2_viewer-0.8
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #maildir
-cd ../maildir-0.19
+cd ../maildir-0.20
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #mailmbox
-cd ../mailmbox-1.10
+cd ../mailmbox-1.11
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
+
+#newmail
+cd ../newmail-0.0.3
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
+
+#notification-plugin
+cd ../notification_plugin-0.1
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #perl
-cd ../perl_plugin-0.6
+cd ../perl_plugin-0.9
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #rssyl
-cd ../rssyl-0.4pre
+cd ../rssyl-0.4cvs6
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
+
+#smime
+cd ../smime-0.5
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #synce
-cd ../synce_plugin-0.4
+cd ../synce_plugin-0.6
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 #vcalendar
-cd ../vcalendar-1.29
+cd ../vcalendar-1.71
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
@@ -251,11 +335,11 @@
 
 %files acpi-notifier
 %defattr(-,root,root,-)
-%doc acpi_notifier-0.8/ChangeLog
-%doc acpi_notifier-0.8/COPYING
-%doc acpi_notifier-0.8/NEWS
-%doc acpi_notifier-0.8/AUTHORS
-%doc acpi_notifier-0.8/README
+%doc acpi_notifier-1.0/ChangeLog
+%doc acpi_notifier-1.0/COPYING
+%doc acpi_notifier-1.0/NEWS
+%doc acpi_notifier-1.0/AUTHORS
+%doc acpi_notifier-1.0/README
 %{_libdir}/sylpheed-claws/plugins/acpi_notifier*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/acpi_notifier.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/acpi_notifier.mo
@@ -270,11 +354,11 @@
 
 %files att-remover
 %defattr(-,root,root,-)
-%doc att_remover-0.4/AUTHORS
-%doc att_remover-0.4/ChangeLog
-%doc att_remover-0.4/COPYING
-%doc att_remover-0.4/NEWS
-%doc att_remover-0.4/README
+%doc att_remover-1.0/AUTHORS
+%doc att_remover-1.0/ChangeLog
+%doc att_remover-1.0/COPYING
+%doc att_remover-1.0/NEWS
+%doc att_remover-1.0/README
 %{_libdir}/sylpheed-claws/plugins/att_remover*
 
 %files cachesaver
@@ -294,43 +378,69 @@
 
 %files fetchinfo
 %defattr(-,root,root,-)
-%doc fetchinfo-plugin-0.4.10/ChangeLog
-%doc fetchinfo-plugin-0.4.10/COPYING
-%doc fetchinfo-plugin-0.4.10/README
+%doc fetchinfo-plugin-0.4.12/ChangeLog
+%doc fetchinfo-plugin-0.4.12/COPYING
+%doc fetchinfo-plugin-0.4.12/README
 %{_libdir}/sylpheed-claws/plugins/fetchinfo*
 
+%files gtkhtml2-viewer
+%defattr(-,root,root,-)
+%doc gtkhtml2_viewer-0.8/AUTHORS
+%doc gtkhtml2_viewer-0.8/COPYING
+%{_libdir}/sylpheed-claws/plugins/gtkhtml2_viewer*
+%lang(es) %{_datadir}/locale/es/LC_MESSAGES/gtkhtml2_viewer.mo
+%lang(pt_BR) %{_datadir}/locale/pt_BR/LC_MESSAGES/gtkhtml2_viewer.mo
+
+
 %files maildir
 %defattr(-,root,root,-)
-%doc maildir-0.19/AUTHORS
-%doc maildir-0.19/ChangeLog
-%doc maildir-0.19/COPYING
-%doc maildir-0.19/README
-%doc maildir-0.19/doc/README.xml
+%doc maildir-0.20/AUTHORS
+%doc maildir-0.20/ChangeLog
+%doc maildir-0.20/COPYING
+%doc maildir-0.20/README
+%doc maildir-0.20/doc/README.xml
 %{_libdir}/sylpheed-claws/plugins/maildir*
 
 %files mailmbox
 %defattr(-,root,root,-)
-%doc mailmbox-1.10/AUTHORS
-%doc mailmbox-1.10/ChangeLog
-%doc mailmbox-1.10/COPYING
-%doc mailmbox-1.10/README
+%doc mailmbox-1.11/AUTHORS
+%doc mailmbox-1.11/ChangeLog
+%doc mailmbox-1.11/COPYING
+%doc mailmbox-1.11/README
 %{_libdir}/sylpheed-claws/plugins/mailmbox*
 
+%files newmail
+%defattr(-,root,root,-)
+%doc newmail-0.0.3/AUTHORS
+%doc newmail-0.0.3/ChangeLog
+%doc newmail-0.0.3/COPYING
+%doc newmail-0.0.3/NEWS
+%doc newmail-0.0.3/README
+%{_libdir}/sylpheed-claws/plugins/newmail.so
+
+%files notification
+%defattr(-,root,root,-)
+%doc notification_plugin-0.1/AUTHORS
+%doc notification_plugin-0.1/ChangeLog
+%doc notification_plugin-0.1/COPYING
+%doc notification_plugin-0.1/README
+%{_libdir}/sylpheed-claws/plugins/notification_plugin.so
+
 %files perl
 %defattr(-,root,root,-)
-%doc perl_plugin-0.6/AUTHORS
-%doc perl_plugin-0.6/ChangeLog
-%doc perl_plugin-0.6/COPYING
-%doc perl_plugin-0.6/README
-%doc perl_plugin-0.6/sc_perl.pod
+%doc perl_plugin-0.9/AUTHORS
+%doc perl_plugin-0.9/ChangeLog
+%doc perl_plugin-0.9/COPYING
+%doc perl_plugin-0.9/README
+%doc perl_plugin-0.9/sc_perl.pod
 %{_libdir}/sylpheed-claws/plugins/perl_plugin.so
 
 %files rssyl
 %defattr(-,root,root,-)
-%doc rssyl-0.4pre/AUTHORS
-%doc rssyl-0.4pre/ChangeLog
-%doc rssyl-0.4pre/COPYING
-%doc rssyl-0.4pre/TODO
+%doc rssyl-0.4cvs6/AUTHORS
+%doc rssyl-0.4cvs6/ChangeLog
+%doc rssyl-0.4cvs6/COPYING
+%doc rssyl-0.4cvs6/TODO
 %{_libdir}/sylpheed-claws/plugins/rssyl*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/rssyl.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/rssyl.mo
@@ -343,21 +453,28 @@
 %lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/rssyl.mo
 %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/rssyl.mo
 
+%files smime
+%defattr(-,root,root,-)
+%doc smime-0.5/ChangeLog
+%doc smime-0.5/COPYING
+%doc smime-0.5/NEWS
+%{_libdir}/sylpheed-claws/plugins/smime.so
+
 %files synce
 %defattr(-,root,root,-)
-%doc synce_plugin-0.4/AUTHORS
-%doc synce_plugin-0.4/ChangeLog
-%doc synce_plugin-0.4/COPYING
-%doc synce_plugin-0.4/README
+%doc synce_plugin-0.6/AUTHORS
+%doc synce_plugin-0.6/ChangeLog
+%doc synce_plugin-0.6/COPYING
+%doc synce_plugin-0.6/README
 %{_libdir}/sylpheed-claws/plugins/synce*
 
 %files vcalendar
 %defattr(-,root,root,-)
-%doc vcalendar-1.29/AUTHORS
-%doc vcalendar-1.29/ChangeLog
-%doc vcalendar-1.29/COPYING
-%doc vcalendar-1.29/README
-%{_libdir}/sylpheed-claws/plugins/vcalendar.so
+%doc vcalendar-1.71/AUTHORS
+%doc vcalendar-1.71/ChangeLog
+%doc vcalendar-1.71/COPYING
+%doc vcalendar-1.71/README
+%{_libdir}/sylpheed-claws/plugins/vcalendar*
 %lang(de) %{_datadir}/locale/de/LC_MESSAGES/vcalendar.mo
 %lang(es) %{_datadir}/locale/es/LC_MESSAGES/vcalendar.mo
 %lang(fi) %{_datadir}/locale/fi/LC_MESSAGES/vcalendar.mo
@@ -370,6 +487,10 @@
 %exclude %{_includedir}/ical.h
 
 %changelog
+* Sat Apr 08 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+2.1.0-1
+- version upgrade
+
 * Fri Feb 17 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 2.0.0-2
 - Rebuild for Fedora Extras 5



From fedora-extras-commits at redhat.com  Sat Apr 22 00:58:52 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 17:58:52 -0700
Subject: rpms/sylpheed-claws-plugins/FC-5 sylpheed-claws-plugins.spec, 1.10, 
	1.11
Message-ID: <200604220059.k3M0xO5G031818@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-serv31777/FC-5

Modified Files:
	sylpheed-claws-plugins.spec 
Log Message:
- add libtool



Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-5/sylpheed-claws-plugins.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sylpheed-claws-plugins.spec	22 Apr 2006 00:34:35 -0000	1.10
+++ sylpheed-claws-plugins.spec	22 Apr 2006 00:58:51 -0000	1.11
@@ -20,6 +20,7 @@
 BuildRequires:  libxml2-devel
 BuildRequires:  gtkhtml2-devel
 BuildRequires:  libidn-devel
+BuildRequires:  libtool
 
 Requires:       %{name}-acpi-notifier = %{version}-%{release}
 Requires:       %{name}-att-remover = %{version}-%{release}



From fedora-extras-commits at redhat.com  Sat Apr 22 00:58:52 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 17:58:52 -0700
Subject: rpms/sylpheed-claws-plugins/devel sylpheed-claws-plugins.spec, 1.10,
	1.11
Message-ID: <200604220059.k3M0xOYG031821@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-serv31777/devel

Modified Files:
	sylpheed-claws-plugins.spec 
Log Message:
- add libtool



Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/sylpheed-claws-plugins.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sylpheed-claws-plugins.spec	22 Apr 2006 00:34:35 -0000	1.10
+++ sylpheed-claws-plugins.spec	22 Apr 2006 00:58:52 -0000	1.11
@@ -20,6 +20,7 @@
 BuildRequires:  libxml2-devel
 BuildRequires:  gtkhtml2-devel
 BuildRequires:  libidn-devel
+BuildRequires:  libtool
 
 Requires:       %{name}-acpi-notifier = %{version}-%{release}
 Requires:       %{name}-att-remover = %{version}-%{release}



From fedora-extras-commits at redhat.com  Sat Apr 22 01:17:50 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 18:17:50 -0700
Subject: rpms/sylpheed-claws-plugins/FC-5 sylpheed-claws-plugins.spec, 1.11, 
	1.12
Message-ID: <200604220118.k3M1IMCb001745@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-serv1709/FC-5

Modified Files:
	sylpheed-claws-plugins.spec 
Log Message:
- add gpgme BR



Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/FC-5/sylpheed-claws-plugins.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sylpheed-claws-plugins.spec	22 Apr 2006 00:58:51 -0000	1.11
+++ sylpheed-claws-plugins.spec	22 Apr 2006 01:17:50 -0000	1.12
@@ -21,6 +21,7 @@
 BuildRequires:  gtkhtml2-devel
 BuildRequires:  libidn-devel
 BuildRequires:  libtool
+BuildRequires:  gpgme-devel
 
 Requires:       %{name}-acpi-notifier = %{version}-%{release}
 Requires:       %{name}-att-remover = %{version}-%{release}



From fedora-extras-commits at redhat.com  Sat Apr 22 01:17:51 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 18:17:51 -0700
Subject: rpms/sylpheed-claws-plugins/devel sylpheed-claws-plugins.spec, 1.11,
	1.12
Message-ID: <200604220118.k3M1IN20001748@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-serv1709/devel

Modified Files:
	sylpheed-claws-plugins.spec 
Log Message:
- add gpgme BR



Index: sylpheed-claws-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/sylpheed-claws-plugins/devel/sylpheed-claws-plugins.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sylpheed-claws-plugins.spec	22 Apr 2006 00:58:52 -0000	1.11
+++ sylpheed-claws-plugins.spec	22 Apr 2006 01:17:51 -0000	1.12
@@ -21,6 +21,7 @@
 BuildRequires:  gtkhtml2-devel
 BuildRequires:  libidn-devel
 BuildRequires:  libtool
+BuildRequires:  gpgme-devel
 
 Requires:       %{name}-acpi-notifier = %{version}-%{release}
 Requires:       %{name}-att-remover = %{version}-%{release}



From fedora-extras-commits at redhat.com  Sat Apr 22 01:20:55 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Fri, 21 Apr 2006 18:20:55 -0700
Subject: rpms/hugs98/devel hugs98.spec,1.1,1.2
Message-ID: <200604220120.k3M1KvBd001842@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/hugs98/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1823

Modified Files:
	hugs98.spec 
Log Message:
use hugs_ver to specify tarball too



Index: hugs98.spec
===================================================================
RCS file: /cvs/extras/rpms/hugs98/devel/hugs98.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hugs98.spec	21 Apr 2006 08:25:46 -0000	1.1
+++ hugs98.spec	22 Apr 2006 01:20:55 -0000	1.2
@@ -8,7 +8,7 @@
 Group:		Development/Languages
 License:	BSD
 URL:		http://www.haskell.org/hugs
-Source0:	http://cvs.haskell.org/Hugs/downloads/Mar2005/hugs98-Mar2005-patched.tar.gz
+Source0:	http://cvs.haskell.org/Hugs/downloads/Mar2005/%{name}-%{hugs_ver}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	docbook-utils



From fedora-extras-commits at redhat.com  Sat Apr 22 01:24:55 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 18:24:55 -0700
Subject: rpms/koffice-langpack/FC-4 .cvsignore, 1.3,
	1.4 koffice-langpack.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200604220125.k3M1PRgF002026@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-serv1971/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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Oct 2005 09:54:50 -0000	1.3
+++ .cvsignore	22 Apr 2006 01:24:55 -0000	1.4
@@ -1,29 +1,48 @@
-koffice-l10n-bg-1.4.2.tar.bz2
-koffice-l10n-ca-1.4.2.tar.bz2
-koffice-l10n-cs-1.4.2.tar.bz2
-koffice-l10n-cy-1.4.2.tar.bz2
-koffice-l10n-da-1.4.2.tar.bz2
-koffice-l10n-de-1.4.2.tar.bz2
-koffice-l10n-el-1.4.2.tar.bz2
-koffice-l10n-en_GB-1.4.2.tar.bz2
-koffice-l10n-es-1.4.2.tar.bz2
-koffice-l10n-et-1.4.2.tar.bz2
-koffice-l10n-eu-1.4.2.tar.bz2
-koffice-l10n-fi-1.4.2.tar.bz2
-koffice-l10n-nb-1.4.2.tar.bz2
-koffice-l10n-nl-1.4.2.tar.bz2
-koffice-l10n-nn-1.4.2.tar.bz2
-koffice-l10n-pl-1.4.2.tar.bz2
-koffice-l10n-pt-1.4.2.tar.bz2
-koffice-l10n-pt_BR-1.4.2.tar.bz2
-koffice-l10n-ru-1.4.2.tar.bz2
-koffice-l10n-sl-1.4.2.tar.bz2
-koffice-l10n-sr-1.4.2.tar.bz2
-koffice-l10n-sr at Latn-1.4.2.tar.bz2
-koffice-l10n-sv-1.4.2.tar.bz2
-koffice-l10n-ta-1.4.2.tar.bz2
-koffice-l10n-tg-1.4.2.tar.bz2
-koffice-l10n-zh_CN-1.4.2.tar.bz2
-koffice-l10n-fr-1.4.2.tar.bz2
-koffice-l10n-hu-1.4.2.tar.bz2
-koffice-l10n-it-1.4.2.tar.bz2
+
+koffice-l10n-af-1.5.0.tar.bz2
+koffice-l10n-ar-1.5.0.tar.bz2
+koffice-l10n-bg-1.5.0.tar.bz2
+koffice-l10n-br-1.5.0.tar.bz2
+koffice-l10n-bs-1.5.0.tar.bz2
+koffice-l10n-ca-1.5.0.tar.bz2
+koffice-l10n-cs-1.5.0.tar.bz2
+koffice-l10n-cy-1.5.0.tar.bz2
+koffice-l10n-da-1.5.0.tar.bz2
+koffice-l10n-de-1.5.0.tar.bz2
+koffice-l10n-el-1.5.0.tar.bz2
+koffice-l10n-en_GB-1.5.0.tar.bz2
+koffice-l10n-eo-1.5.0.tar.bz2
+koffice-l10n-es-1.5.0.tar.bz2
+koffice-l10n-et-1.5.0.tar.bz2
+koffice-l10n-eu-1.5.0.tar.bz2
+koffice-l10n-fi-1.5.0.tar.bz2
+koffice-l10n-fr-1.5.0.tar.bz2
+koffice-l10n-ga-1.5.0.tar.bz2
+koffice-l10n-he-1.5.0.tar.bz2
+koffice-l10n-hi-1.5.0.tar.bz2
+koffice-l10n-hu-1.5.0.tar.bz2
+koffice-l10n-is-1.5.0.tar.bz2
+koffice-l10n-it-1.5.0.tar.bz2
+koffice-l10n-ja-1.5.0.tar.bz2
+koffice-l10n-lt-1.5.0.tar.bz2
+koffice-l10n-mk-1.5.0.tar.bz2
+koffice-l10n-nb-1.5.0.tar.bz2
+koffice-l10n-nl-1.5.0.tar.bz2
+koffice-l10n-nn-1.5.0.tar.bz2
+koffice-l10n-pl-1.5.0.tar.bz2
+koffice-l10n-pt-1.5.0.tar.bz2
+koffice-l10n-pt_BR-1.5.0.tar.bz2
+koffice-l10n-ro-1.5.0.tar.bz2
+koffice-l10n-ru-1.5.0.tar.bz2
+koffice-l10n-se-1.5.0.tar.bz2
+koffice-l10n-sk-1.5.0.tar.bz2
+koffice-l10n-sl-1.5.0.tar.bz2
+koffice-l10n-sr-1.5.0.tar.bz2
+koffice-l10n-sr at Latn-1.5.0.tar.bz2
+koffice-l10n-sv-1.5.0.tar.bz2
+koffice-l10n-ta-1.5.0.tar.bz2
+koffice-l10n-tg-1.5.0.tar.bz2
+koffice-l10n-tr-1.5.0.tar.bz2
+koffice-l10n-uk-1.5.0.tar.bz2
+koffice-l10n-uz-1.5.0.tar.bz2
+koffice-l10n-zh_CN-1.5.0.tar.bz2


Index: koffice-langpack.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice-langpack/FC-4/koffice-langpack.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- koffice-langpack.spec	15 Oct 2005 09:54:50 -0000	1.3
+++ koffice-langpack.spec	22 Apr 2006 01:24:55 -0000	1.4
@@ -1,40 +1,59 @@
 Name:           koffice-langpack
-Version:        1.4.2
+Version:        1.5.0
 Release:        1%{?dist}
 Summary:        Language files for koffice
 
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://www.koffice.org
-Source0:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-bg-1.4.2.tar.bz2
-Source1:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-ca-1.4.2.tar.bz2
-Source2:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-cs-1.4.2.tar.bz2
-Source3:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-cy-1.4.2.tar.bz2
-Source4:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-da-1.4.2.tar.bz2
-Source5:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-de-1.4.2.tar.bz2
-Source6:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-el-1.4.2.tar.bz2
-Source7:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-en_GB-1.4.2.tar.bz2
-Source8:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-es-1.4.2.tar.bz2
-Source9:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-et-1.4.2.tar.bz2
-Source10:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-fi-1.4.2.tar.bz2 
-Source11:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-fr-1.4.2.tar.bz2
-Source12:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-hu-1.4.2.tar.bz2
-Source13:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-it-1.4.2.tar.bz2
-Source14:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-nb-1.4.2.tar.bz2
-Source15:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-nl-1.4.2.tar.bz2
-Source16:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-nn-1.4.2.tar.bz2
-Source17:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-pl-1.4.2.tar.bz2
-Source18:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-pt_BR-1.4.2.tar.bz2
-Source19:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-pt-1.4.2.tar.bz2
-Source20:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-ru-1.4.2.tar.bz2
-Source21:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-sl-1.4.2.tar.bz2
-Source22:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-sr at Latn-1.4.2.tar.bz2
-Source23:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-sr-1.4.2.tar.bz2
-Source24:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-sv-1.4.2.tar.bz2
-Source25:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-ta-1.4.2.tar.bz2
-Source26:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-tg-1.4.2.tar.bz2
-Source27:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-zh_CN-1.4.2.tar.bz2
-Source28:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-eu-1.4.2.tar.bz2
+Source0:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-af-1.5.0.tar.bz2
+Source1:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ar-1.5.0.tar.bz2
+Source2:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-bg-1.5.0.tar.bz2
+Source3:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-br-1.5.0.tar.bz2
+Source4:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-bs-1.5.0.tar.bz2
+Source5:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ca-1.5.0.tar.bz2
+Source6:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-cs-1.5.0.tar.bz2
+Source7:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-cy-1.5.0.tar.bz2
+Source8:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-da-1.5.0.tar.bz2
+Source9:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-de-1.5.0.tar.bz2
+Source10:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-el-1.5.0.tar.bz2
+Source11:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-en_GB-1.5.0.tar.bz2
+Source12:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-eo-1.5.0.tar.bz2
+Source13:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-es-1.5.0.tar.bz2
+Source14:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-et-1.5.0.tar.bz2
+Source15:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-eu-1.5.0.tar.bz2
+Source16:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-fi-1.5.0.tar.bz2
+Source17:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-fr-1.5.0.tar.bz2
+Source18:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ga-1.5.0.tar.bz2
+Source19:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-he-1.5.0.tar.bz2
+Source20:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-hi-1.5.0.tar.bz2
+Source21:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-hu-1.5.0.tar.bz2
+Source22:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-is-1.5.0.tar.bz2
+Source23:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-it-1.5.0.tar.bz2
+Source24:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ja-1.5.0.tar.bz2
+Source25:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-lt-1.5.0.tar.bz2
+Source26:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-mk-1.5.0.tar.bz2
+Source27:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-nb-1.5.0.tar.bz2
+Source28:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-nl-1.5.0.tar.bz2
+Source29:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-nn-1.5.0.tar.bz2
+Source30:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-pl-1.5.0.tar.bz2
+Source31:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-pt-1.5.0.tar.bz2
+Source32:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-pt_BR-1.5.0.tar.bz2
+Source33:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ro-1.5.0.tar.bz2
+Source34:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ru-1.5.0.tar.bz2
+Source35:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-se-1.5.0.tar.bz2
+Source36:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sk-1.5.0.tar.bz2
+Source37:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sl-1.5.0.tar.bz2
+Source38:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sr-1.5.0.tar.bz2
+Source39:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sr at Latn-1.5.0.tar.bz2
+Source40:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sv-1.5.0.tar.bz2
+Source41:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ta-1.5.0.tar.bz2
+Source42:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-tg-1.5.0.tar.bz2
+Source43:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-tr-1.5.0.tar.bz2
+Source44:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-uk-1.5.0.tar.bz2
+Source45:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-uz-1.5.0.tar.bz2
+Source46:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-zh_CN-1.5.0.tar.bz2
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -45,6 +64,39 @@
 %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 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
@@ -93,6 +145,14 @@
 %description de
 Provides additional german translations for koffice
 
+%package eo
+Summary:        Esperanto language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%description eo
+Provides additional esperanto translations for koffice
+
 %package el
 Summary:        Greek language pack for koffice
 Group:          Applications/Productivity
@@ -143,7 +203,6 @@
 %description fi
 Provides additional finish translations for koffice
 
-
 %package fr
 Summary:        French language pack for koffice
 Group:          Applications/Productivity
@@ -152,6 +211,30 @@
 %description fr
 Provides additional french translations for koffice
 
+%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 hi
+Provides additional hindi translations for koffice
+
 %package hu
 Summary:        Hungarian language pack for koffice
 Group:          Applications/Productivity
@@ -160,13 +243,45 @@
 %description hu
 Provides additional hungarian translations for koffice
 
+%package is
+Summary:        Icelandic language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%description is
+Provides additional icelandic translations for koffice
+
 %package it
 Summary:        Italian language pack for koffice
 Group:          Applications/Productivity
 Requires:       koffice-core >= %{version}
 
 %description it
-Provides additional italian translations for koffic
+Provides additional italian translations for koffice
+
+%package ja
+Summary:        Japanese language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%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}
+
+%description mk
+Provides additional macedonian translations for koffice
 
 %package nb
 Summary:        Bokmal language pack for koffice
@@ -224,6 +339,29 @@
 %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}
+
+%description se
+Provides additional northern sami translations for koffice
+
+%package sk
+Summary:        Slovak language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%description sk
+Provides additional slovak translations for koffice
+
 %package sl
 Summary:        Slovenian language pack for koffice
 Group:          Applications/Productivity
@@ -272,6 +410,22 @@
 %description tg
 Provides additional tajik translations for koffice
 
+%package tr
+Summary:        Turkish language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%description tr
+Provides additional turkish translations for koffice
+
+%package uk
+Summary:        Ukrainian language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%description uk
+Provides additional ukrainian translations for koffice
+
 %package zh_CN
 Summary:        Simplified Chinese language pack for koffice
 Group:          Applications/Productivity
@@ -313,10 +467,30 @@
 %{__tar} xjvf %{SOURCE26}
 %{__tar} xjvf %{SOURCE27}
 %{__tar} xjvf %{SOURCE28}
+%{__tar} xjvf %{SOURCE29}
+%{__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}
 
 %build
-for lang in bg ca cs cy da de el en_GB es et eu fi fr hu it nb nl nn pl pt pt_BR \
-ru sl sr sr at Latn sv ta tg zh_CN; do
+# 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 nb nl nn pl pt pt_BR ro ru se sk sl sr \
+sr at Latn sv ta tg tr uk zh_CN; do
     cd %{_builddir}/%{name}-%{version}/koffice-l10n-$lang-%{version}
     %configure
     make %{?_smp_mflags}
@@ -325,8 +499,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-for lang in bg ca cs cy da de el en_GB es et eu fi fr hu it nb nl nn pl pt pt_BR \
-ru sl sr sr at Latn sv ta tg zh_CN; do
+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 nb nl nn pl pt pt_BR ro ru se sk sl sr \
+sr at Latn sv ta tg tr uk zh_CN; do
     cd %{_builddir}/%{name}-%{version}/koffice-l10n-$lang-%{version}
     make install DESTDIR=$RPM_BUILD_ROOT
 done
@@ -351,10 +526,26 @@
 %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
@@ -388,6 +579,10 @@
 %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/*
@@ -413,17 +608,45 @@
 %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
+%defattr(-,root,root,-)
+%lang(lt) %{_datadir}/locale/lt/LC_MESSAGES/*
+
+%files mk
+%defattr(-,root,root,-)
+%lang(mk) %{_datadir}/locale/mk/LC_MESSAGES/*
+
 %files nb
 %defattr(-,root,root,-)
 %lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/*
@@ -451,12 +674,26 @@
 %defattr(-,root,root,-)
 %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/*
+%lang(sk) %{_datadir}/doc/HTML/sk/*
+%lang(sk) %{_datadir}/apps/koffice/autocorrect/sk.xml
+
 %files sl
 %defattr(-,root,root,-)
 %lang(sl) %{_datadir}/locale/sl/LC_MESSAGES/*
@@ -483,11 +720,27 @@
 %defattr(-,root,root,-)
 %lang(tg) %{_datadir}/locale/tg/LC_MESSAGES/*
 
+%files tr
+%defattr(-,root,root,-)
+%lang(tr) %{_datadir}/locale/tr/LC_MESSAGES/*
+
+%files uk
+%defattr(-,root,root,-)
+%lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/*
+
 %files zh_CN
 %defattr(-,root,root,-)
 %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/*
 
 %changelog
+* Sat Apr 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.5.0-1
+- version upgrade
+
+* Wed Feb 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.4.2-2
+- Rebuild for Fedora Extras 5
+
 * Sat Oct 15 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.4.2-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice-langpack/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Oct 2005 09:54:50 -0000	1.3
+++ sources	22 Apr 2006 01:24:55 -0000	1.4
@@ -1,29 +1,48 @@
-ad980947860046ca4d5e0c8b23b7d3ab  koffice-l10n-bg-1.4.2.tar.bz2
-8a546eec2897af073bb564edf7150b6d  koffice-l10n-ca-1.4.2.tar.bz2
-58e6c355e478ab459e6f0a5c86662f36  koffice-l10n-cs-1.4.2.tar.bz2
-ed0c069797a89680d49bd396f80e94e1  koffice-l10n-cy-1.4.2.tar.bz2
-f6c3b0afcb299519f0663aa5a3ff3362  koffice-l10n-da-1.4.2.tar.bz2
-2659e56e079bfdd133833a39497f80e6  koffice-l10n-de-1.4.2.tar.bz2
-1aa341393b7ade4037ddeed77c73cacf  koffice-l10n-el-1.4.2.tar.bz2
-caf59bd82ac94ccbeaa4b907c218defa  koffice-l10n-en_GB-1.4.2.tar.bz2
-0f429120c8b27d1208f020a353aeb88d  koffice-l10n-es-1.4.2.tar.bz2
-1ac8201573602a69e7d00b3332cb3bec  koffice-l10n-et-1.4.2.tar.bz2
-f8417721a49dd23f20115e102b0a8204  koffice-l10n-eu-1.4.2.tar.bz2
-b4925a3bd6db8b6b787b0313e3695371  koffice-l10n-fi-1.4.2.tar.bz2
-9d8c327b3e6567d90258cec8b0694a2c  koffice-l10n-nb-1.4.2.tar.bz2
-6328a285565add97cd55413e52541050  koffice-l10n-nl-1.4.2.tar.bz2
-2e52095b2c9c879e101d274888d49fcc  koffice-l10n-nn-1.4.2.tar.bz2
-78337154a7183cda46d34f80c6bf23e5  koffice-l10n-pl-1.4.2.tar.bz2
-61e11d48f788275389f0b75e75b8de2b  koffice-l10n-pt-1.4.2.tar.bz2
-a559487f91f9bdf7eaf608f5d88c67c1  koffice-l10n-pt_BR-1.4.2.tar.bz2
-a1527f53ed16ceed8c295614eedf7deb  koffice-l10n-ru-1.4.2.tar.bz2
-6d85c8b3f84b892471fd3cadd00aba37  koffice-l10n-sl-1.4.2.tar.bz2
-97d0fa5fdb458bbe5c8ef5317e15ed5c  koffice-l10n-sr-1.4.2.tar.bz2
-65e7e7939b3d538913ddcec261741f75  koffice-l10n-sr at Latn-1.4.2.tar.bz2
-897218187ef83afcd99406b62e352e69  koffice-l10n-sv-1.4.2.tar.bz2
-2c55f413ec8e02a667e37d967186dc86  koffice-l10n-ta-1.4.2.tar.bz2
-c10cd70d7f1a9a397f768002625ad6f9  koffice-l10n-tg-1.4.2.tar.bz2
-5733aa59661f8828c66ef0d2335d4242  koffice-l10n-zh_CN-1.4.2.tar.bz2
-5f4e1d1f360a14e4ca2d24d2d85bf061  koffice-l10n-fr-1.4.2.tar.bz2
-ba83bf5a84f1ae5e7b22c1611c89e8bd  koffice-l10n-hu-1.4.2.tar.bz2
-62609f289dc1ed216c7d075045159a04  koffice-l10n-it-1.4.2.tar.bz2
+
+03217f2f39b1a21cc685a5aa85200247  koffice-l10n-af-1.5.0.tar.bz2
+922cdc3f2de8d350deaf54c32feab117  koffice-l10n-ar-1.5.0.tar.bz2
+5e24b5028de337c2cbda323fa69d56f2  koffice-l10n-bg-1.5.0.tar.bz2
+4c5c9d834f14defd87c5580092002e51  koffice-l10n-br-1.5.0.tar.bz2
+6086121e25b243d7b5543dc15ebaf3ee  koffice-l10n-bs-1.5.0.tar.bz2
+cc24df3b6d3899b89776e2d2cabb3eb5  koffice-l10n-ca-1.5.0.tar.bz2
+193f7d66d9b5c945932ee9868721f9f1  koffice-l10n-cs-1.5.0.tar.bz2
+14c6069119fb491e6b430d6663e3a60f  koffice-l10n-cy-1.5.0.tar.bz2
+fedd3f7c0c39a40940576fb86d7262f0  koffice-l10n-da-1.5.0.tar.bz2
+fe3334c31472b006907f59f47db6cb75  koffice-l10n-de-1.5.0.tar.bz2
+d7384ecf60617aa054ec3ded25cff1ea  koffice-l10n-el-1.5.0.tar.bz2
+5f00c66613f2250babd4cb02590952df  koffice-l10n-en_GB-1.5.0.tar.bz2
+79d73a7d8e5a284e1c997cbec6bc804c  koffice-l10n-eo-1.5.0.tar.bz2
+0abef42c4ea3a0992b69933ad1e94287  koffice-l10n-es-1.5.0.tar.bz2
+149ba841f9dc322336b9c153b598dea5  koffice-l10n-et-1.5.0.tar.bz2
+af2a4e93887cd55ba0cda123362650d7  koffice-l10n-eu-1.5.0.tar.bz2
+e87c44fc8c7b10c4c44c76d90cb1ca7c  koffice-l10n-fi-1.5.0.tar.bz2
+65b9b6fd7903050c4c170af11aa94fb2  koffice-l10n-fr-1.5.0.tar.bz2
+47b453c7444e404c19cc8dc85cf56d37  koffice-l10n-ga-1.5.0.tar.bz2
+1d0810b08947f072631615ffa3260bec  koffice-l10n-he-1.5.0.tar.bz2
+82231d5c7e273d0384d04e80be228167  koffice-l10n-hi-1.5.0.tar.bz2
+9c1d2441a49eaf06a6adac3f61590076  koffice-l10n-hu-1.5.0.tar.bz2
+3fc01e0a34d0ce9a2988ef30df638f62  koffice-l10n-is-1.5.0.tar.bz2
+db8b9a1bb5114e69c3768508c09bde8d  koffice-l10n-it-1.5.0.tar.bz2
+16435cf9fd545529bea61010fb35ad03  koffice-l10n-ja-1.5.0.tar.bz2
+c306e0bfdccd60fd9f11e93828475fac  koffice-l10n-lt-1.5.0.tar.bz2
+b0469b72436e35a1101ee9ea4e981ae3  koffice-l10n-mk-1.5.0.tar.bz2
+8cffcf181366737bea12a1ae9a14c294  koffice-l10n-nb-1.5.0.tar.bz2
+f4bfc5952a2612c72443d266df034e7d  koffice-l10n-nl-1.5.0.tar.bz2
+bb3444c52bcbc33aaaad542454048c69  koffice-l10n-nn-1.5.0.tar.bz2
+442946625f984e8eb9f977c39a57749d  koffice-l10n-pl-1.5.0.tar.bz2
+285b5766d9955de0fd7c2599b25115ab  koffice-l10n-pt-1.5.0.tar.bz2
+41373317668d2d7cbc20e4a5a188daf6  koffice-l10n-pt_BR-1.5.0.tar.bz2
+35fb855cb7c18b95a11602a7c8483d2d  koffice-l10n-ro-1.5.0.tar.bz2
+f5842b78af8ba903129942dfa7f6d7d4  koffice-l10n-ru-1.5.0.tar.bz2
+d153416b1403f7e4cf8a03b5739ab6a9  koffice-l10n-se-1.5.0.tar.bz2
+400b547e0520fe769594d4f39c3ec769  koffice-l10n-sk-1.5.0.tar.bz2
+7e73b04ed5952631efa8ef9ed216ce3d  koffice-l10n-sl-1.5.0.tar.bz2
+5b7f01f22ae97c8983411b043c41a689  koffice-l10n-sr-1.5.0.tar.bz2
+5bafc53a3c3b4f863fd28fc9f0a090f9  koffice-l10n-sr at Latn-1.5.0.tar.bz2
+810dd9311472f1e60f90c9fdfcc6c84c  koffice-l10n-sv-1.5.0.tar.bz2
+2991caa710ad20da8925331a51026498  koffice-l10n-ta-1.5.0.tar.bz2
+3c9f50e64cc892cfcb840c424b2940e4  koffice-l10n-tg-1.5.0.tar.bz2
+411466bf3f0f7340431f2f6448332a89  koffice-l10n-tr-1.5.0.tar.bz2
+8e3294a78b9beab5122703d61d2e9a2c  koffice-l10n-uk-1.5.0.tar.bz2
+ace68fe74216fb0a57024fb3b750fdaf  koffice-l10n-uz-1.5.0.tar.bz2
+3b15bc617451461f9911ad316a264005  koffice-l10n-zh_CN-1.5.0.tar.bz2



From fedora-extras-commits at redhat.com  Sat Apr 22 01:24:55 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 18:24:55 -0700
Subject: rpms/koffice-langpack/FC-5 .cvsignore, 1.3,
	1.4 koffice-langpack.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200604220125.k3M1PR98002033@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-serv1971/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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Oct 2005 09:54:51 -0000	1.3
+++ .cvsignore	22 Apr 2006 01:24:55 -0000	1.4
@@ -1,29 +1,48 @@
-koffice-l10n-bg-1.4.2.tar.bz2
-koffice-l10n-ca-1.4.2.tar.bz2
-koffice-l10n-cs-1.4.2.tar.bz2
-koffice-l10n-cy-1.4.2.tar.bz2
-koffice-l10n-da-1.4.2.tar.bz2
-koffice-l10n-de-1.4.2.tar.bz2
-koffice-l10n-el-1.4.2.tar.bz2
-koffice-l10n-en_GB-1.4.2.tar.bz2
-koffice-l10n-es-1.4.2.tar.bz2
-koffice-l10n-et-1.4.2.tar.bz2
-koffice-l10n-eu-1.4.2.tar.bz2
-koffice-l10n-fi-1.4.2.tar.bz2
-koffice-l10n-nb-1.4.2.tar.bz2
-koffice-l10n-nl-1.4.2.tar.bz2
-koffice-l10n-nn-1.4.2.tar.bz2
-koffice-l10n-pl-1.4.2.tar.bz2
-koffice-l10n-pt-1.4.2.tar.bz2
-koffice-l10n-pt_BR-1.4.2.tar.bz2
-koffice-l10n-ru-1.4.2.tar.bz2
-koffice-l10n-sl-1.4.2.tar.bz2
-koffice-l10n-sr-1.4.2.tar.bz2
-koffice-l10n-sr at Latn-1.4.2.tar.bz2
-koffice-l10n-sv-1.4.2.tar.bz2
-koffice-l10n-ta-1.4.2.tar.bz2
-koffice-l10n-tg-1.4.2.tar.bz2
-koffice-l10n-zh_CN-1.4.2.tar.bz2
-koffice-l10n-fr-1.4.2.tar.bz2
-koffice-l10n-hu-1.4.2.tar.bz2
-koffice-l10n-it-1.4.2.tar.bz2
+
+koffice-l10n-af-1.5.0.tar.bz2
+koffice-l10n-ar-1.5.0.tar.bz2
+koffice-l10n-bg-1.5.0.tar.bz2
+koffice-l10n-br-1.5.0.tar.bz2
+koffice-l10n-bs-1.5.0.tar.bz2
+koffice-l10n-ca-1.5.0.tar.bz2
+koffice-l10n-cs-1.5.0.tar.bz2
+koffice-l10n-cy-1.5.0.tar.bz2
+koffice-l10n-da-1.5.0.tar.bz2
+koffice-l10n-de-1.5.0.tar.bz2
+koffice-l10n-el-1.5.0.tar.bz2
+koffice-l10n-en_GB-1.5.0.tar.bz2
+koffice-l10n-eo-1.5.0.tar.bz2
+koffice-l10n-es-1.5.0.tar.bz2
+koffice-l10n-et-1.5.0.tar.bz2
+koffice-l10n-eu-1.5.0.tar.bz2
+koffice-l10n-fi-1.5.0.tar.bz2
+koffice-l10n-fr-1.5.0.tar.bz2
+koffice-l10n-ga-1.5.0.tar.bz2
+koffice-l10n-he-1.5.0.tar.bz2
+koffice-l10n-hi-1.5.0.tar.bz2
+koffice-l10n-hu-1.5.0.tar.bz2
+koffice-l10n-is-1.5.0.tar.bz2
+koffice-l10n-it-1.5.0.tar.bz2
+koffice-l10n-ja-1.5.0.tar.bz2
+koffice-l10n-lt-1.5.0.tar.bz2
+koffice-l10n-mk-1.5.0.tar.bz2
+koffice-l10n-nb-1.5.0.tar.bz2
+koffice-l10n-nl-1.5.0.tar.bz2
+koffice-l10n-nn-1.5.0.tar.bz2
+koffice-l10n-pl-1.5.0.tar.bz2
+koffice-l10n-pt-1.5.0.tar.bz2
+koffice-l10n-pt_BR-1.5.0.tar.bz2
+koffice-l10n-ro-1.5.0.tar.bz2
+koffice-l10n-ru-1.5.0.tar.bz2
+koffice-l10n-se-1.5.0.tar.bz2
+koffice-l10n-sk-1.5.0.tar.bz2
+koffice-l10n-sl-1.5.0.tar.bz2
+koffice-l10n-sr-1.5.0.tar.bz2
+koffice-l10n-sr at Latn-1.5.0.tar.bz2
+koffice-l10n-sv-1.5.0.tar.bz2
+koffice-l10n-ta-1.5.0.tar.bz2
+koffice-l10n-tg-1.5.0.tar.bz2
+koffice-l10n-tr-1.5.0.tar.bz2
+koffice-l10n-uk-1.5.0.tar.bz2
+koffice-l10n-uz-1.5.0.tar.bz2
+koffice-l10n-zh_CN-1.5.0.tar.bz2


Index: koffice-langpack.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice-langpack/FC-5/koffice-langpack.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- koffice-langpack.spec	15 Feb 2006 08:27:47 -0000	1.4
+++ koffice-langpack.spec	22 Apr 2006 01:24:55 -0000	1.5
@@ -1,40 +1,59 @@
 Name:           koffice-langpack
-Version:        1.4.2
-Release:        2%{?dist}
+Version:        1.5.0
+Release:        1%{?dist}
 Summary:        Language files for koffice
 
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://www.koffice.org
-Source0:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-bg-1.4.2.tar.bz2
-Source1:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-ca-1.4.2.tar.bz2
-Source2:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-cs-1.4.2.tar.bz2
-Source3:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-cy-1.4.2.tar.bz2
-Source4:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-da-1.4.2.tar.bz2
-Source5:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-de-1.4.2.tar.bz2
-Source6:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-el-1.4.2.tar.bz2
-Source7:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-en_GB-1.4.2.tar.bz2
-Source8:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-es-1.4.2.tar.bz2
-Source9:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-et-1.4.2.tar.bz2
-Source10:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-fi-1.4.2.tar.bz2 
-Source11:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-fr-1.4.2.tar.bz2
-Source12:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-hu-1.4.2.tar.bz2
-Source13:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-it-1.4.2.tar.bz2
-Source14:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-nb-1.4.2.tar.bz2
-Source15:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-nl-1.4.2.tar.bz2
-Source16:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-nn-1.4.2.tar.bz2
-Source17:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-pl-1.4.2.tar.bz2
-Source18:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-pt_BR-1.4.2.tar.bz2
-Source19:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-pt-1.4.2.tar.bz2
-Source20:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-ru-1.4.2.tar.bz2
-Source21:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-sl-1.4.2.tar.bz2
-Source22:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-sr at Latn-1.4.2.tar.bz2
-Source23:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-sr-1.4.2.tar.bz2
-Source24:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-sv-1.4.2.tar.bz2
-Source25:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-ta-1.4.2.tar.bz2
-Source26:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-tg-1.4.2.tar.bz2
-Source27:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-zh_CN-1.4.2.tar.bz2
-Source28:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-eu-1.4.2.tar.bz2
+Source0:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-af-1.5.0.tar.bz2
+Source1:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ar-1.5.0.tar.bz2
+Source2:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-bg-1.5.0.tar.bz2
+Source3:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-br-1.5.0.tar.bz2
+Source4:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-bs-1.5.0.tar.bz2
+Source5:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ca-1.5.0.tar.bz2
+Source6:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-cs-1.5.0.tar.bz2
+Source7:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-cy-1.5.0.tar.bz2
+Source8:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-da-1.5.0.tar.bz2
+Source9:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-de-1.5.0.tar.bz2
+Source10:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-el-1.5.0.tar.bz2
+Source11:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-en_GB-1.5.0.tar.bz2
+Source12:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-eo-1.5.0.tar.bz2
+Source13:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-es-1.5.0.tar.bz2
+Source14:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-et-1.5.0.tar.bz2
+Source15:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-eu-1.5.0.tar.bz2
+Source16:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-fi-1.5.0.tar.bz2
+Source17:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-fr-1.5.0.tar.bz2
+Source18:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ga-1.5.0.tar.bz2
+Source19:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-he-1.5.0.tar.bz2
+Source20:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-hi-1.5.0.tar.bz2
+Source21:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-hu-1.5.0.tar.bz2
+Source22:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-is-1.5.0.tar.bz2
+Source23:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-it-1.5.0.tar.bz2
+Source24:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ja-1.5.0.tar.bz2
+Source25:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-lt-1.5.0.tar.bz2
+Source26:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-mk-1.5.0.tar.bz2
+Source27:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-nb-1.5.0.tar.bz2
+Source28:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-nl-1.5.0.tar.bz2
+Source29:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-nn-1.5.0.tar.bz2
+Source30:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-pl-1.5.0.tar.bz2
+Source31:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-pt-1.5.0.tar.bz2
+Source32:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-pt_BR-1.5.0.tar.bz2
+Source33:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ro-1.5.0.tar.bz2
+Source34:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ru-1.5.0.tar.bz2
+Source35:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-se-1.5.0.tar.bz2
+Source36:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sk-1.5.0.tar.bz2
+Source37:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sl-1.5.0.tar.bz2
+Source38:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sr-1.5.0.tar.bz2
+Source39:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sr at Latn-1.5.0.tar.bz2
+Source40:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sv-1.5.0.tar.bz2
+Source41:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ta-1.5.0.tar.bz2
+Source42:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-tg-1.5.0.tar.bz2
+Source43:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-tr-1.5.0.tar.bz2
+Source44:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-uk-1.5.0.tar.bz2
+Source45:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-uz-1.5.0.tar.bz2
+Source46:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-zh_CN-1.5.0.tar.bz2
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -45,6 +64,39 @@
 %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 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
@@ -93,6 +145,14 @@
 %description de
 Provides additional german translations for koffice
 
+%package eo
+Summary:        Esperanto language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%description eo
+Provides additional esperanto translations for koffice
+
 %package el
 Summary:        Greek language pack for koffice
 Group:          Applications/Productivity
@@ -143,7 +203,6 @@
 %description fi
 Provides additional finish translations for koffice
 
-
 %package fr
 Summary:        French language pack for koffice
 Group:          Applications/Productivity
@@ -152,6 +211,30 @@
 %description fr
 Provides additional french translations for koffice
 
+%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 hi
+Provides additional hindi translations for koffice
+
 %package hu
 Summary:        Hungarian language pack for koffice
 Group:          Applications/Productivity
@@ -160,13 +243,45 @@
 %description hu
 Provides additional hungarian translations for koffice
 
+%package is
+Summary:        Icelandic language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%description is
+Provides additional icelandic translations for koffice
+
 %package it
 Summary:        Italian language pack for koffice
 Group:          Applications/Productivity
 Requires:       koffice-core >= %{version}
 
 %description it
-Provides additional italian translations for koffic
+Provides additional italian translations for koffice
+
+%package ja
+Summary:        Japanese language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%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}
+
+%description mk
+Provides additional macedonian translations for koffice
 
 %package nb
 Summary:        Bokmal language pack for koffice
@@ -224,6 +339,29 @@
 %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}
+
+%description se
+Provides additional northern sami translations for koffice
+
+%package sk
+Summary:        Slovak language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%description sk
+Provides additional slovak translations for koffice
+
 %package sl
 Summary:        Slovenian language pack for koffice
 Group:          Applications/Productivity
@@ -272,6 +410,22 @@
 %description tg
 Provides additional tajik translations for koffice
 
+%package tr
+Summary:        Turkish language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%description tr
+Provides additional turkish translations for koffice
+
+%package uk
+Summary:        Ukrainian language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%description uk
+Provides additional ukrainian translations for koffice
+
 %package zh_CN
 Summary:        Simplified Chinese language pack for koffice
 Group:          Applications/Productivity
@@ -313,10 +467,30 @@
 %{__tar} xjvf %{SOURCE26}
 %{__tar} xjvf %{SOURCE27}
 %{__tar} xjvf %{SOURCE28}
+%{__tar} xjvf %{SOURCE29}
+%{__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}
 
 %build
-for lang in bg ca cs cy da de el en_GB es et eu fi fr hu it nb nl nn pl pt pt_BR \
-ru sl sr sr at Latn sv ta tg zh_CN; do
+# 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 nb nl nn pl pt pt_BR ro ru se sk sl sr \
+sr at Latn sv ta tg tr uk zh_CN; do
     cd %{_builddir}/%{name}-%{version}/koffice-l10n-$lang-%{version}
     %configure
     make %{?_smp_mflags}
@@ -325,8 +499,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-for lang in bg ca cs cy da de el en_GB es et eu fi fr hu it nb nl nn pl pt pt_BR \
-ru sl sr sr at Latn sv ta tg zh_CN; do
+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 nb nl nn pl pt pt_BR ro ru se sk sl sr \
+sr at Latn sv ta tg tr uk zh_CN; do
     cd %{_builddir}/%{name}-%{version}/koffice-l10n-$lang-%{version}
     make install DESTDIR=$RPM_BUILD_ROOT
 done
@@ -351,10 +526,26 @@
 %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
@@ -388,6 +579,10 @@
 %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/*
@@ -413,17 +608,45 @@
 %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
+%defattr(-,root,root,-)
+%lang(lt) %{_datadir}/locale/lt/LC_MESSAGES/*
+
+%files mk
+%defattr(-,root,root,-)
+%lang(mk) %{_datadir}/locale/mk/LC_MESSAGES/*
+
 %files nb
 %defattr(-,root,root,-)
 %lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/*
@@ -451,12 +674,26 @@
 %defattr(-,root,root,-)
 %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/*
+%lang(sk) %{_datadir}/doc/HTML/sk/*
+%lang(sk) %{_datadir}/apps/koffice/autocorrect/sk.xml
+
 %files sl
 %defattr(-,root,root,-)
 %lang(sl) %{_datadir}/locale/sl/LC_MESSAGES/*
@@ -483,11 +720,23 @@
 %defattr(-,root,root,-)
 %lang(tg) %{_datadir}/locale/tg/LC_MESSAGES/*
 
+%files tr
+%defattr(-,root,root,-)
+%lang(tr) %{_datadir}/locale/tr/LC_MESSAGES/*
+
+%files uk
+%defattr(-,root,root,-)
+%lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/*
+
 %files zh_CN
 %defattr(-,root,root,-)
 %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/*
 
 %changelog
+* Sat Apr 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.5.0-1
+- version upgrade
+
 * Wed Feb 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.4.2-2
 - Rebuild for Fedora Extras 5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice-langpack/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Oct 2005 09:54:51 -0000	1.3
+++ sources	22 Apr 2006 01:24:55 -0000	1.4
@@ -1,29 +1,48 @@
-ad980947860046ca4d5e0c8b23b7d3ab  koffice-l10n-bg-1.4.2.tar.bz2
-8a546eec2897af073bb564edf7150b6d  koffice-l10n-ca-1.4.2.tar.bz2
-58e6c355e478ab459e6f0a5c86662f36  koffice-l10n-cs-1.4.2.tar.bz2
-ed0c069797a89680d49bd396f80e94e1  koffice-l10n-cy-1.4.2.tar.bz2
-f6c3b0afcb299519f0663aa5a3ff3362  koffice-l10n-da-1.4.2.tar.bz2
-2659e56e079bfdd133833a39497f80e6  koffice-l10n-de-1.4.2.tar.bz2
-1aa341393b7ade4037ddeed77c73cacf  koffice-l10n-el-1.4.2.tar.bz2
-caf59bd82ac94ccbeaa4b907c218defa  koffice-l10n-en_GB-1.4.2.tar.bz2
-0f429120c8b27d1208f020a353aeb88d  koffice-l10n-es-1.4.2.tar.bz2
-1ac8201573602a69e7d00b3332cb3bec  koffice-l10n-et-1.4.2.tar.bz2
-f8417721a49dd23f20115e102b0a8204  koffice-l10n-eu-1.4.2.tar.bz2
-b4925a3bd6db8b6b787b0313e3695371  koffice-l10n-fi-1.4.2.tar.bz2
-9d8c327b3e6567d90258cec8b0694a2c  koffice-l10n-nb-1.4.2.tar.bz2
-6328a285565add97cd55413e52541050  koffice-l10n-nl-1.4.2.tar.bz2
-2e52095b2c9c879e101d274888d49fcc  koffice-l10n-nn-1.4.2.tar.bz2
-78337154a7183cda46d34f80c6bf23e5  koffice-l10n-pl-1.4.2.tar.bz2
-61e11d48f788275389f0b75e75b8de2b  koffice-l10n-pt-1.4.2.tar.bz2
-a559487f91f9bdf7eaf608f5d88c67c1  koffice-l10n-pt_BR-1.4.2.tar.bz2
-a1527f53ed16ceed8c295614eedf7deb  koffice-l10n-ru-1.4.2.tar.bz2
-6d85c8b3f84b892471fd3cadd00aba37  koffice-l10n-sl-1.4.2.tar.bz2
-97d0fa5fdb458bbe5c8ef5317e15ed5c  koffice-l10n-sr-1.4.2.tar.bz2
-65e7e7939b3d538913ddcec261741f75  koffice-l10n-sr at Latn-1.4.2.tar.bz2
-897218187ef83afcd99406b62e352e69  koffice-l10n-sv-1.4.2.tar.bz2
-2c55f413ec8e02a667e37d967186dc86  koffice-l10n-ta-1.4.2.tar.bz2
-c10cd70d7f1a9a397f768002625ad6f9  koffice-l10n-tg-1.4.2.tar.bz2
-5733aa59661f8828c66ef0d2335d4242  koffice-l10n-zh_CN-1.4.2.tar.bz2
-5f4e1d1f360a14e4ca2d24d2d85bf061  koffice-l10n-fr-1.4.2.tar.bz2
-ba83bf5a84f1ae5e7b22c1611c89e8bd  koffice-l10n-hu-1.4.2.tar.bz2
-62609f289dc1ed216c7d075045159a04  koffice-l10n-it-1.4.2.tar.bz2
+
+03217f2f39b1a21cc685a5aa85200247  koffice-l10n-af-1.5.0.tar.bz2
+922cdc3f2de8d350deaf54c32feab117  koffice-l10n-ar-1.5.0.tar.bz2
+5e24b5028de337c2cbda323fa69d56f2  koffice-l10n-bg-1.5.0.tar.bz2
+4c5c9d834f14defd87c5580092002e51  koffice-l10n-br-1.5.0.tar.bz2
+6086121e25b243d7b5543dc15ebaf3ee  koffice-l10n-bs-1.5.0.tar.bz2
+cc24df3b6d3899b89776e2d2cabb3eb5  koffice-l10n-ca-1.5.0.tar.bz2
+193f7d66d9b5c945932ee9868721f9f1  koffice-l10n-cs-1.5.0.tar.bz2
+14c6069119fb491e6b430d6663e3a60f  koffice-l10n-cy-1.5.0.tar.bz2
+fedd3f7c0c39a40940576fb86d7262f0  koffice-l10n-da-1.5.0.tar.bz2
+fe3334c31472b006907f59f47db6cb75  koffice-l10n-de-1.5.0.tar.bz2
+d7384ecf60617aa054ec3ded25cff1ea  koffice-l10n-el-1.5.0.tar.bz2
+5f00c66613f2250babd4cb02590952df  koffice-l10n-en_GB-1.5.0.tar.bz2
+79d73a7d8e5a284e1c997cbec6bc804c  koffice-l10n-eo-1.5.0.tar.bz2
+0abef42c4ea3a0992b69933ad1e94287  koffice-l10n-es-1.5.0.tar.bz2
+149ba841f9dc322336b9c153b598dea5  koffice-l10n-et-1.5.0.tar.bz2
+af2a4e93887cd55ba0cda123362650d7  koffice-l10n-eu-1.5.0.tar.bz2
+e87c44fc8c7b10c4c44c76d90cb1ca7c  koffice-l10n-fi-1.5.0.tar.bz2
+65b9b6fd7903050c4c170af11aa94fb2  koffice-l10n-fr-1.5.0.tar.bz2
+47b453c7444e404c19cc8dc85cf56d37  koffice-l10n-ga-1.5.0.tar.bz2
+1d0810b08947f072631615ffa3260bec  koffice-l10n-he-1.5.0.tar.bz2
+82231d5c7e273d0384d04e80be228167  koffice-l10n-hi-1.5.0.tar.bz2
+9c1d2441a49eaf06a6adac3f61590076  koffice-l10n-hu-1.5.0.tar.bz2
+3fc01e0a34d0ce9a2988ef30df638f62  koffice-l10n-is-1.5.0.tar.bz2
+db8b9a1bb5114e69c3768508c09bde8d  koffice-l10n-it-1.5.0.tar.bz2
+16435cf9fd545529bea61010fb35ad03  koffice-l10n-ja-1.5.0.tar.bz2
+c306e0bfdccd60fd9f11e93828475fac  koffice-l10n-lt-1.5.0.tar.bz2
+b0469b72436e35a1101ee9ea4e981ae3  koffice-l10n-mk-1.5.0.tar.bz2
+8cffcf181366737bea12a1ae9a14c294  koffice-l10n-nb-1.5.0.tar.bz2
+f4bfc5952a2612c72443d266df034e7d  koffice-l10n-nl-1.5.0.tar.bz2
+bb3444c52bcbc33aaaad542454048c69  koffice-l10n-nn-1.5.0.tar.bz2
+442946625f984e8eb9f977c39a57749d  koffice-l10n-pl-1.5.0.tar.bz2
+285b5766d9955de0fd7c2599b25115ab  koffice-l10n-pt-1.5.0.tar.bz2
+41373317668d2d7cbc20e4a5a188daf6  koffice-l10n-pt_BR-1.5.0.tar.bz2
+35fb855cb7c18b95a11602a7c8483d2d  koffice-l10n-ro-1.5.0.tar.bz2
+f5842b78af8ba903129942dfa7f6d7d4  koffice-l10n-ru-1.5.0.tar.bz2
+d153416b1403f7e4cf8a03b5739ab6a9  koffice-l10n-se-1.5.0.tar.bz2
+400b547e0520fe769594d4f39c3ec769  koffice-l10n-sk-1.5.0.tar.bz2
+7e73b04ed5952631efa8ef9ed216ce3d  koffice-l10n-sl-1.5.0.tar.bz2
+5b7f01f22ae97c8983411b043c41a689  koffice-l10n-sr-1.5.0.tar.bz2
+5bafc53a3c3b4f863fd28fc9f0a090f9  koffice-l10n-sr at Latn-1.5.0.tar.bz2
+810dd9311472f1e60f90c9fdfcc6c84c  koffice-l10n-sv-1.5.0.tar.bz2
+2991caa710ad20da8925331a51026498  koffice-l10n-ta-1.5.0.tar.bz2
+3c9f50e64cc892cfcb840c424b2940e4  koffice-l10n-tg-1.5.0.tar.bz2
+411466bf3f0f7340431f2f6448332a89  koffice-l10n-tr-1.5.0.tar.bz2
+8e3294a78b9beab5122703d61d2e9a2c  koffice-l10n-uk-1.5.0.tar.bz2
+ace68fe74216fb0a57024fb3b750fdaf  koffice-l10n-uz-1.5.0.tar.bz2
+3b15bc617451461f9911ad316a264005  koffice-l10n-zh_CN-1.5.0.tar.bz2



From fedora-extras-commits at redhat.com  Sat Apr 22 01:24:56 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 18:24:56 -0700
Subject: rpms/koffice-langpack/devel .cvsignore, 1.3,
	1.4 koffice-langpack.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200604220125.k3M1PSLg002038@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice-langpack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1971/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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Oct 2005 09:54:51 -0000	1.3
+++ .cvsignore	22 Apr 2006 01:24:56 -0000	1.4
@@ -1,29 +1,48 @@
-koffice-l10n-bg-1.4.2.tar.bz2
-koffice-l10n-ca-1.4.2.tar.bz2
-koffice-l10n-cs-1.4.2.tar.bz2
-koffice-l10n-cy-1.4.2.tar.bz2
-koffice-l10n-da-1.4.2.tar.bz2
-koffice-l10n-de-1.4.2.tar.bz2
-koffice-l10n-el-1.4.2.tar.bz2
-koffice-l10n-en_GB-1.4.2.tar.bz2
-koffice-l10n-es-1.4.2.tar.bz2
-koffice-l10n-et-1.4.2.tar.bz2
-koffice-l10n-eu-1.4.2.tar.bz2
-koffice-l10n-fi-1.4.2.tar.bz2
-koffice-l10n-nb-1.4.2.tar.bz2
-koffice-l10n-nl-1.4.2.tar.bz2
-koffice-l10n-nn-1.4.2.tar.bz2
-koffice-l10n-pl-1.4.2.tar.bz2
-koffice-l10n-pt-1.4.2.tar.bz2
-koffice-l10n-pt_BR-1.4.2.tar.bz2
-koffice-l10n-ru-1.4.2.tar.bz2
-koffice-l10n-sl-1.4.2.tar.bz2
-koffice-l10n-sr-1.4.2.tar.bz2
-koffice-l10n-sr at Latn-1.4.2.tar.bz2
-koffice-l10n-sv-1.4.2.tar.bz2
-koffice-l10n-ta-1.4.2.tar.bz2
-koffice-l10n-tg-1.4.2.tar.bz2
-koffice-l10n-zh_CN-1.4.2.tar.bz2
-koffice-l10n-fr-1.4.2.tar.bz2
-koffice-l10n-hu-1.4.2.tar.bz2
-koffice-l10n-it-1.4.2.tar.bz2
+
+koffice-l10n-af-1.5.0.tar.bz2
+koffice-l10n-ar-1.5.0.tar.bz2
+koffice-l10n-bg-1.5.0.tar.bz2
+koffice-l10n-br-1.5.0.tar.bz2
+koffice-l10n-bs-1.5.0.tar.bz2
+koffice-l10n-ca-1.5.0.tar.bz2
+koffice-l10n-cs-1.5.0.tar.bz2
+koffice-l10n-cy-1.5.0.tar.bz2
+koffice-l10n-da-1.5.0.tar.bz2
+koffice-l10n-de-1.5.0.tar.bz2
+koffice-l10n-el-1.5.0.tar.bz2
+koffice-l10n-en_GB-1.5.0.tar.bz2
+koffice-l10n-eo-1.5.0.tar.bz2
+koffice-l10n-es-1.5.0.tar.bz2
+koffice-l10n-et-1.5.0.tar.bz2
+koffice-l10n-eu-1.5.0.tar.bz2
+koffice-l10n-fi-1.5.0.tar.bz2
+koffice-l10n-fr-1.5.0.tar.bz2
+koffice-l10n-ga-1.5.0.tar.bz2
+koffice-l10n-he-1.5.0.tar.bz2
+koffice-l10n-hi-1.5.0.tar.bz2
+koffice-l10n-hu-1.5.0.tar.bz2
+koffice-l10n-is-1.5.0.tar.bz2
+koffice-l10n-it-1.5.0.tar.bz2
+koffice-l10n-ja-1.5.0.tar.bz2
+koffice-l10n-lt-1.5.0.tar.bz2
+koffice-l10n-mk-1.5.0.tar.bz2
+koffice-l10n-nb-1.5.0.tar.bz2
+koffice-l10n-nl-1.5.0.tar.bz2
+koffice-l10n-nn-1.5.0.tar.bz2
+koffice-l10n-pl-1.5.0.tar.bz2
+koffice-l10n-pt-1.5.0.tar.bz2
+koffice-l10n-pt_BR-1.5.0.tar.bz2
+koffice-l10n-ro-1.5.0.tar.bz2
+koffice-l10n-ru-1.5.0.tar.bz2
+koffice-l10n-se-1.5.0.tar.bz2
+koffice-l10n-sk-1.5.0.tar.bz2
+koffice-l10n-sl-1.5.0.tar.bz2
+koffice-l10n-sr-1.5.0.tar.bz2
+koffice-l10n-sr at Latn-1.5.0.tar.bz2
+koffice-l10n-sv-1.5.0.tar.bz2
+koffice-l10n-ta-1.5.0.tar.bz2
+koffice-l10n-tg-1.5.0.tar.bz2
+koffice-l10n-tr-1.5.0.tar.bz2
+koffice-l10n-uk-1.5.0.tar.bz2
+koffice-l10n-uz-1.5.0.tar.bz2
+koffice-l10n-zh_CN-1.5.0.tar.bz2


Index: koffice-langpack.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice-langpack/devel/koffice-langpack.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- koffice-langpack.spec	15 Feb 2006 08:27:47 -0000	1.4
+++ koffice-langpack.spec	22 Apr 2006 01:24:56 -0000	1.5
@@ -1,40 +1,59 @@
 Name:           koffice-langpack
-Version:        1.4.2
-Release:        2%{?dist}
+Version:        1.5.0
+Release:        1%{?dist}
 Summary:        Language files for koffice
 
 Group:          Applications/Productivity
 License:        GPL
 URL:            http://www.koffice.org
-Source0:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-bg-1.4.2.tar.bz2
-Source1:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-ca-1.4.2.tar.bz2
-Source2:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-cs-1.4.2.tar.bz2
-Source3:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-cy-1.4.2.tar.bz2
-Source4:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-da-1.4.2.tar.bz2
-Source5:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-de-1.4.2.tar.bz2
-Source6:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-el-1.4.2.tar.bz2
-Source7:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-en_GB-1.4.2.tar.bz2
-Source8:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-es-1.4.2.tar.bz2
-Source9:        http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-et-1.4.2.tar.bz2
-Source10:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-fi-1.4.2.tar.bz2 
-Source11:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-fr-1.4.2.tar.bz2
-Source12:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-hu-1.4.2.tar.bz2
-Source13:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-it-1.4.2.tar.bz2
-Source14:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-nb-1.4.2.tar.bz2
-Source15:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-nl-1.4.2.tar.bz2
-Source16:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-nn-1.4.2.tar.bz2
-Source17:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-pl-1.4.2.tar.bz2
-Source18:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-pt_BR-1.4.2.tar.bz2
-Source19:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-pt-1.4.2.tar.bz2
-Source20:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-ru-1.4.2.tar.bz2
-Source21:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-sl-1.4.2.tar.bz2
-Source22:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-sr at Latn-1.4.2.tar.bz2
-Source23:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-sr-1.4.2.tar.bz2
-Source24:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-sv-1.4.2.tar.bz2
-Source25:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-ta-1.4.2.tar.bz2
-Source26:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-tg-1.4.2.tar.bz2
-Source27:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-zh_CN-1.4.2.tar.bz2
-Source28:       http://download.kde.org/stable/koffice-1.4.2/src/koffice-l10n/koffice-l10n-eu-1.4.2.tar.bz2
+Source0:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-af-1.5.0.tar.bz2
+Source1:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ar-1.5.0.tar.bz2
+Source2:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-bg-1.5.0.tar.bz2
+Source3:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-br-1.5.0.tar.bz2
+Source4:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-bs-1.5.0.tar.bz2
+Source5:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ca-1.5.0.tar.bz2
+Source6:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-cs-1.5.0.tar.bz2
+Source7:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-cy-1.5.0.tar.bz2
+Source8:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-da-1.5.0.tar.bz2
+Source9:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-de-1.5.0.tar.bz2
+Source10:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-el-1.5.0.tar.bz2
+Source11:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-en_GB-1.5.0.tar.bz2
+Source12:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-eo-1.5.0.tar.bz2
+Source13:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-es-1.5.0.tar.bz2
+Source14:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-et-1.5.0.tar.bz2
+Source15:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-eu-1.5.0.tar.bz2
+Source16:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-fi-1.5.0.tar.bz2
+Source17:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-fr-1.5.0.tar.bz2
+Source18:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ga-1.5.0.tar.bz2
+Source19:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-he-1.5.0.tar.bz2
+Source20:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-hi-1.5.0.tar.bz2
+Source21:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-hu-1.5.0.tar.bz2
+Source22:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-is-1.5.0.tar.bz2
+Source23:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-it-1.5.0.tar.bz2
+Source24:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ja-1.5.0.tar.bz2
+Source25:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-lt-1.5.0.tar.bz2
+Source26:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-mk-1.5.0.tar.bz2
+Source27:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-nb-1.5.0.tar.bz2
+Source28:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-nl-1.5.0.tar.bz2
+Source29:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-nn-1.5.0.tar.bz2
+Source30:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-pl-1.5.0.tar.bz2
+Source31:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-pt-1.5.0.tar.bz2
+Source32:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-pt_BR-1.5.0.tar.bz2
+Source33:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ro-1.5.0.tar.bz2
+Source34:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ru-1.5.0.tar.bz2
+Source35:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-se-1.5.0.tar.bz2
+Source36:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sk-1.5.0.tar.bz2
+Source37:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sl-1.5.0.tar.bz2
+Source38:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sr-1.5.0.tar.bz2
+Source39:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sr at Latn-1.5.0.tar.bz2
+Source40:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-sv-1.5.0.tar.bz2
+Source41:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-ta-1.5.0.tar.bz2
+Source42:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-tg-1.5.0.tar.bz2
+Source43:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-tr-1.5.0.tar.bz2
+Source44:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-uk-1.5.0.tar.bz2
+Source45:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-uz-1.5.0.tar.bz2
+Source46:ftp://ftp.kde.org/pub/kde/stable/koffice-1.5.0/src/koffice-l10n/koffice-l10n-zh_CN-1.5.0.tar.bz2
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
@@ -45,6 +64,39 @@
 %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 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
@@ -93,6 +145,14 @@
 %description de
 Provides additional german translations for koffice
 
+%package eo
+Summary:        Esperanto language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%description eo
+Provides additional esperanto translations for koffice
+
 %package el
 Summary:        Greek language pack for koffice
 Group:          Applications/Productivity
@@ -143,7 +203,6 @@
 %description fi
 Provides additional finish translations for koffice
 
-
 %package fr
 Summary:        French language pack for koffice
 Group:          Applications/Productivity
@@ -152,6 +211,30 @@
 %description fr
 Provides additional french translations for koffice
 
+%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 hi
+Provides additional hindi translations for koffice
+
 %package hu
 Summary:        Hungarian language pack for koffice
 Group:          Applications/Productivity
@@ -160,13 +243,45 @@
 %description hu
 Provides additional hungarian translations for koffice
 
+%package is
+Summary:        Icelandic language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%description is
+Provides additional icelandic translations for koffice
+
 %package it
 Summary:        Italian language pack for koffice
 Group:          Applications/Productivity
 Requires:       koffice-core >= %{version}
 
 %description it
-Provides additional italian translations for koffic
+Provides additional italian translations for koffice
+
+%package ja
+Summary:        Japanese language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%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}
+
+%description mk
+Provides additional macedonian translations for koffice
 
 %package nb
 Summary:        Bokmal language pack for koffice
@@ -224,6 +339,29 @@
 %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}
+
+%description se
+Provides additional northern sami translations for koffice
+
+%package sk
+Summary:        Slovak language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%description sk
+Provides additional slovak translations for koffice
+
 %package sl
 Summary:        Slovenian language pack for koffice
 Group:          Applications/Productivity
@@ -272,6 +410,22 @@
 %description tg
 Provides additional tajik translations for koffice
 
+%package tr
+Summary:        Turkish language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%description tr
+Provides additional turkish translations for koffice
+
+%package uk
+Summary:        Ukrainian language pack for koffice
+Group:          Applications/Productivity
+Requires:       koffice-core >= %{version}
+
+%description uk
+Provides additional ukrainian translations for koffice
+
 %package zh_CN
 Summary:        Simplified Chinese language pack for koffice
 Group:          Applications/Productivity
@@ -313,10 +467,30 @@
 %{__tar} xjvf %{SOURCE26}
 %{__tar} xjvf %{SOURCE27}
 %{__tar} xjvf %{SOURCE28}
+%{__tar} xjvf %{SOURCE29}
+%{__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}
 
 %build
-for lang in bg ca cs cy da de el en_GB es et eu fi fr hu it nb nl nn pl pt pt_BR \
-ru sl sr sr at Latn sv ta tg zh_CN; do
+# 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 nb nl nn pl pt pt_BR ro ru se sk sl sr \
+sr at Latn sv ta tg tr uk zh_CN; do
     cd %{_builddir}/%{name}-%{version}/koffice-l10n-$lang-%{version}
     %configure
     make %{?_smp_mflags}
@@ -325,8 +499,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-for lang in bg ca cs cy da de el en_GB es et eu fi fr hu it nb nl nn pl pt pt_BR \
-ru sl sr sr at Latn sv ta tg zh_CN; do
+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 nb nl nn pl pt pt_BR ro ru se sk sl sr \
+sr at Latn sv ta tg tr uk zh_CN; do
     cd %{_builddir}/%{name}-%{version}/koffice-l10n-$lang-%{version}
     make install DESTDIR=$RPM_BUILD_ROOT
 done
@@ -351,10 +526,26 @@
 %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
@@ -388,6 +579,10 @@
 %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/*
@@ -413,17 +608,45 @@
 %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
+%defattr(-,root,root,-)
+%lang(lt) %{_datadir}/locale/lt/LC_MESSAGES/*
+
+%files mk
+%defattr(-,root,root,-)
+%lang(mk) %{_datadir}/locale/mk/LC_MESSAGES/*
+
 %files nb
 %defattr(-,root,root,-)
 %lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/*
@@ -451,12 +674,26 @@
 %defattr(-,root,root,-)
 %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/*
+%lang(sk) %{_datadir}/doc/HTML/sk/*
+%lang(sk) %{_datadir}/apps/koffice/autocorrect/sk.xml
+
 %files sl
 %defattr(-,root,root,-)
 %lang(sl) %{_datadir}/locale/sl/LC_MESSAGES/*
@@ -483,11 +720,23 @@
 %defattr(-,root,root,-)
 %lang(tg) %{_datadir}/locale/tg/LC_MESSAGES/*
 
+%files tr
+%defattr(-,root,root,-)
+%lang(tr) %{_datadir}/locale/tr/LC_MESSAGES/*
+
+%files uk
+%defattr(-,root,root,-)
+%lang(uk) %{_datadir}/locale/uk/LC_MESSAGES/*
+
 %files zh_CN
 %defattr(-,root,root,-)
 %lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/*
 
 %changelog
+* Sat Apr 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.5.0-1
+- version upgrade
+
 * Wed Feb 15 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.4.2-2
 - Rebuild for Fedora Extras 5


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/koffice-langpack/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Oct 2005 09:54:51 -0000	1.3
+++ sources	22 Apr 2006 01:24:56 -0000	1.4
@@ -1,29 +1,48 @@
-ad980947860046ca4d5e0c8b23b7d3ab  koffice-l10n-bg-1.4.2.tar.bz2
-8a546eec2897af073bb564edf7150b6d  koffice-l10n-ca-1.4.2.tar.bz2
-58e6c355e478ab459e6f0a5c86662f36  koffice-l10n-cs-1.4.2.tar.bz2
-ed0c069797a89680d49bd396f80e94e1  koffice-l10n-cy-1.4.2.tar.bz2
-f6c3b0afcb299519f0663aa5a3ff3362  koffice-l10n-da-1.4.2.tar.bz2
-2659e56e079bfdd133833a39497f80e6  koffice-l10n-de-1.4.2.tar.bz2
-1aa341393b7ade4037ddeed77c73cacf  koffice-l10n-el-1.4.2.tar.bz2
-caf59bd82ac94ccbeaa4b907c218defa  koffice-l10n-en_GB-1.4.2.tar.bz2
-0f429120c8b27d1208f020a353aeb88d  koffice-l10n-es-1.4.2.tar.bz2
-1ac8201573602a69e7d00b3332cb3bec  koffice-l10n-et-1.4.2.tar.bz2
-f8417721a49dd23f20115e102b0a8204  koffice-l10n-eu-1.4.2.tar.bz2
-b4925a3bd6db8b6b787b0313e3695371  koffice-l10n-fi-1.4.2.tar.bz2
-9d8c327b3e6567d90258cec8b0694a2c  koffice-l10n-nb-1.4.2.tar.bz2
-6328a285565add97cd55413e52541050  koffice-l10n-nl-1.4.2.tar.bz2
-2e52095b2c9c879e101d274888d49fcc  koffice-l10n-nn-1.4.2.tar.bz2
-78337154a7183cda46d34f80c6bf23e5  koffice-l10n-pl-1.4.2.tar.bz2
-61e11d48f788275389f0b75e75b8de2b  koffice-l10n-pt-1.4.2.tar.bz2
-a559487f91f9bdf7eaf608f5d88c67c1  koffice-l10n-pt_BR-1.4.2.tar.bz2
-a1527f53ed16ceed8c295614eedf7deb  koffice-l10n-ru-1.4.2.tar.bz2
-6d85c8b3f84b892471fd3cadd00aba37  koffice-l10n-sl-1.4.2.tar.bz2
-97d0fa5fdb458bbe5c8ef5317e15ed5c  koffice-l10n-sr-1.4.2.tar.bz2
-65e7e7939b3d538913ddcec261741f75  koffice-l10n-sr at Latn-1.4.2.tar.bz2
-897218187ef83afcd99406b62e352e69  koffice-l10n-sv-1.4.2.tar.bz2
-2c55f413ec8e02a667e37d967186dc86  koffice-l10n-ta-1.4.2.tar.bz2
-c10cd70d7f1a9a397f768002625ad6f9  koffice-l10n-tg-1.4.2.tar.bz2
-5733aa59661f8828c66ef0d2335d4242  koffice-l10n-zh_CN-1.4.2.tar.bz2
-5f4e1d1f360a14e4ca2d24d2d85bf061  koffice-l10n-fr-1.4.2.tar.bz2
-ba83bf5a84f1ae5e7b22c1611c89e8bd  koffice-l10n-hu-1.4.2.tar.bz2
-62609f289dc1ed216c7d075045159a04  koffice-l10n-it-1.4.2.tar.bz2
+
+03217f2f39b1a21cc685a5aa85200247  koffice-l10n-af-1.5.0.tar.bz2
+922cdc3f2de8d350deaf54c32feab117  koffice-l10n-ar-1.5.0.tar.bz2
+5e24b5028de337c2cbda323fa69d56f2  koffice-l10n-bg-1.5.0.tar.bz2
+4c5c9d834f14defd87c5580092002e51  koffice-l10n-br-1.5.0.tar.bz2
+6086121e25b243d7b5543dc15ebaf3ee  koffice-l10n-bs-1.5.0.tar.bz2
+cc24df3b6d3899b89776e2d2cabb3eb5  koffice-l10n-ca-1.5.0.tar.bz2
+193f7d66d9b5c945932ee9868721f9f1  koffice-l10n-cs-1.5.0.tar.bz2
+14c6069119fb491e6b430d6663e3a60f  koffice-l10n-cy-1.5.0.tar.bz2
+fedd3f7c0c39a40940576fb86d7262f0  koffice-l10n-da-1.5.0.tar.bz2
+fe3334c31472b006907f59f47db6cb75  koffice-l10n-de-1.5.0.tar.bz2
+d7384ecf60617aa054ec3ded25cff1ea  koffice-l10n-el-1.5.0.tar.bz2
+5f00c66613f2250babd4cb02590952df  koffice-l10n-en_GB-1.5.0.tar.bz2
+79d73a7d8e5a284e1c997cbec6bc804c  koffice-l10n-eo-1.5.0.tar.bz2
+0abef42c4ea3a0992b69933ad1e94287  koffice-l10n-es-1.5.0.tar.bz2
+149ba841f9dc322336b9c153b598dea5  koffice-l10n-et-1.5.0.tar.bz2
+af2a4e93887cd55ba0cda123362650d7  koffice-l10n-eu-1.5.0.tar.bz2
+e87c44fc8c7b10c4c44c76d90cb1ca7c  koffice-l10n-fi-1.5.0.tar.bz2
+65b9b6fd7903050c4c170af11aa94fb2  koffice-l10n-fr-1.5.0.tar.bz2
+47b453c7444e404c19cc8dc85cf56d37  koffice-l10n-ga-1.5.0.tar.bz2
+1d0810b08947f072631615ffa3260bec  koffice-l10n-he-1.5.0.tar.bz2
+82231d5c7e273d0384d04e80be228167  koffice-l10n-hi-1.5.0.tar.bz2
+9c1d2441a49eaf06a6adac3f61590076  koffice-l10n-hu-1.5.0.tar.bz2
+3fc01e0a34d0ce9a2988ef30df638f62  koffice-l10n-is-1.5.0.tar.bz2
+db8b9a1bb5114e69c3768508c09bde8d  koffice-l10n-it-1.5.0.tar.bz2
+16435cf9fd545529bea61010fb35ad03  koffice-l10n-ja-1.5.0.tar.bz2
+c306e0bfdccd60fd9f11e93828475fac  koffice-l10n-lt-1.5.0.tar.bz2
+b0469b72436e35a1101ee9ea4e981ae3  koffice-l10n-mk-1.5.0.tar.bz2
+8cffcf181366737bea12a1ae9a14c294  koffice-l10n-nb-1.5.0.tar.bz2
+f4bfc5952a2612c72443d266df034e7d  koffice-l10n-nl-1.5.0.tar.bz2
+bb3444c52bcbc33aaaad542454048c69  koffice-l10n-nn-1.5.0.tar.bz2
+442946625f984e8eb9f977c39a57749d  koffice-l10n-pl-1.5.0.tar.bz2
+285b5766d9955de0fd7c2599b25115ab  koffice-l10n-pt-1.5.0.tar.bz2
+41373317668d2d7cbc20e4a5a188daf6  koffice-l10n-pt_BR-1.5.0.tar.bz2
+35fb855cb7c18b95a11602a7c8483d2d  koffice-l10n-ro-1.5.0.tar.bz2
+f5842b78af8ba903129942dfa7f6d7d4  koffice-l10n-ru-1.5.0.tar.bz2
+d153416b1403f7e4cf8a03b5739ab6a9  koffice-l10n-se-1.5.0.tar.bz2
+400b547e0520fe769594d4f39c3ec769  koffice-l10n-sk-1.5.0.tar.bz2
+7e73b04ed5952631efa8ef9ed216ce3d  koffice-l10n-sl-1.5.0.tar.bz2
+5b7f01f22ae97c8983411b043c41a689  koffice-l10n-sr-1.5.0.tar.bz2
+5bafc53a3c3b4f863fd28fc9f0a090f9  koffice-l10n-sr at Latn-1.5.0.tar.bz2
+810dd9311472f1e60f90c9fdfcc6c84c  koffice-l10n-sv-1.5.0.tar.bz2
+2991caa710ad20da8925331a51026498  koffice-l10n-ta-1.5.0.tar.bz2
+3c9f50e64cc892cfcb840c424b2940e4  koffice-l10n-tg-1.5.0.tar.bz2
+411466bf3f0f7340431f2f6448332a89  koffice-l10n-tr-1.5.0.tar.bz2
+8e3294a78b9beab5122703d61d2e9a2c  koffice-l10n-uk-1.5.0.tar.bz2
+ace68fe74216fb0a57024fb3b750fdaf  koffice-l10n-uz-1.5.0.tar.bz2
+3b15bc617451461f9911ad316a264005  koffice-l10n-zh_CN-1.5.0.tar.bz2



From fedora-extras-commits at redhat.com  Sat Apr 22 01:25:51 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Fri, 21 Apr 2006 18:25:51 -0700
Subject: rpms/koffice/FC-4 koffice-kexi-version.patch,NONE,1.1
Message-ID: <200604220125.k3M1PrfB002103@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2079

Added Files:
	koffice-kexi-version.patch 
Log Message:
- add kexi patch


koffice-kexi-version.patch:

--- NEW FILE koffice-kexi-version.patch ---
--- kexi/kexi_version.h.orig	2006-04-14 23:09:52.000000000 +0200
+++ kexi/kexi_version.h	2006-04-14 23:16:07.000000000 +0200
@@ -30,12 +30,12 @@
 #endif
 
 #ifndef KEXI_VERSION_STRING
-# define KEXI_VERSION_STRING "1.0 rc1"
+# define KEXI_VERSION_STRING "1.0"
 #endif
 
-#define KEXI_VERSION_MAJOR 0
-#define KEXI_VERSION_MINOR 9
-#define KEXI_VERSION_RELEASE 98
+#define KEXI_VERSION_MAJOR 1
+#define KEXI_VERSION_MINOR 0
+#define KEXI_VERSION_RELEASE 0
 
 #define KEXI_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c))
 



From fedora-extras-commits at redhat.com  Sat Apr 22 01:28:54 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 21 Apr 2006 18:28:54 -0700
Subject: rpms/perl-Class-Autouse/FC-5 .cvsignore, 1.5,
	1.6 perl-Class-Autouse.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <200604220128.k3M1Sum0002282@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Class-Autouse/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2260

Modified Files:
	.cvsignore perl-Class-Autouse.spec sources 
Log Message:
* Thu Apr 20 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.26-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Autouse/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Feb 2006 14:35:58 -0000	1.5
+++ .cvsignore	22 Apr 2006 01:28:54 -0000	1.6
@@ -1,2 +1 @@
-Class-Autouse-1.21.tar.gz
-Class-Autouse-1.24.tar.gz
+Class-Autouse-1.26.tar.gz


Index: perl-Class-Autouse.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Autouse/FC-5/perl-Class-Autouse.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Class-Autouse.spec	28 Feb 2006 23:18:03 -0000	1.6
+++ perl-Class-Autouse.spec	22 Apr 2006 01:28:54 -0000	1.7
@@ -1,6 +1,6 @@
 Name: 		perl-Class-Autouse
-Version: 	1.21
-Release: 	3%{?dist}
+Version: 	1.26
+Release: 	1%{?dist}
 Summary: 	Run-time class loading on first method call
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -57,6 +57,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Apr 20 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.26-1
+- Upstream update.
+
 * Wed Mar 01 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.21-3
 - Rebuild for perl-5.8.8.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-Autouse/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Feb 2006 14:35:58 -0000	1.5
+++ sources	22 Apr 2006 01:28:54 -0000	1.6
@@ -1,2 +1 @@
-3bf4fadd8349e57d6af0961b6565c74f  Class-Autouse-1.21.tar.gz
-6192abd3fa36d40ae40870ea66aa9b2a  Class-Autouse-1.24.tar.gz
+27d185332ff7fc18477d115802b057b2  Class-Autouse-1.26.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 01:30:49 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 21 Apr 2006 18:30:49 -0700
Subject: rpms/perl-Params-Util/FC-5 .cvsignore, 1.7,
	1.8 perl-Params-Util.spec, 1.7, 1.8 sources, 1.7, 1.8
Message-ID: <200604220130.k3M1UpAB002355@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-serv2334

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
* Thu Apr 20 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.11-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	18 Jan 2006 10:52:58 -0000	1.7
+++ .cvsignore	22 Apr 2006 01:30:48 -0000	1.8
@@ -1 +1 @@
-Params-Util-0.10.tar.gz
+Params-Util-0.11.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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Params-Util.spec	28 Feb 2006 23:27:52 -0000	1.7
+++ perl-Params-Util.spec	22 Apr 2006 01:30:48 -0000	1.8
@@ -1,6 +1,6 @@
 Name: 		perl-Params-Util
-Version: 	0.10
-Release: 	2%{?dist}
+Version: 	0.11
+Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Apr 20 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.11-1
+- Upstream update.
+
 * Wed Mar 01 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.10-2
 - Rebuild for perl-5.8.8.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	18 Jan 2006 10:52:58 -0000	1.7
+++ sources	22 Apr 2006 01:30:48 -0000	1.8
@@ -1 +1 @@
-1af92339a4772a20dddce7816c68cd80  Params-Util-0.10.tar.gz
+d3fce431cff46caa926ece63fda73946  Params-Util-0.11.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 01:33:16 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 21 Apr 2006 18:33:16 -0700
Subject: rpms/perl-Params-Util/FC-4 .cvsignore, 1.7,
	1.8 perl-Params-Util.spec, 1.6, 1.7 sources, 1.7, 1.8
Message-ID: <200604220133.k3M1XIFR002430@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-serv2409

Modified Files:
	.cvsignore perl-Params-Util.spec sources 
Log Message:
* Thu Apr 20 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.11-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	18 Jan 2006 10:53:44 -0000	1.7
+++ .cvsignore	22 Apr 2006 01:33:15 -0000	1.8
@@ -1 +1 @@
-Params-Util-0.10.tar.gz
+Params-Util-0.11.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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Params-Util.spec	18 Jan 2006 10:53:44 -0000	1.6
+++ perl-Params-Util.spec	22 Apr 2006 01:33:16 -0000	1.7
@@ -1,5 +1,5 @@
 Name: 		perl-Params-Util
-Version: 	0.10
+Version: 	0.11
 Release: 	1%{?dist}
 Summary: 	Simple standalone param-checking functions
 License: 	GPL or Artistic
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Thu Apr 20 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.11-1
+- Upstream update.
+
 * Wed Jan 18 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.10-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Params-Util/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	18 Jan 2006 10:53:44 -0000	1.7
+++ sources	22 Apr 2006 01:33:16 -0000	1.8
@@ -1 +1 @@
-1af92339a4772a20dddce7816c68cd80  Params-Util-0.10.tar.gz
+d3fce431cff46caa926ece63fda73946  Params-Util-0.11.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 01:50:55 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Fri, 21 Apr 2006 18:50:55 -0700
Subject: rpms/prboom/FC-4 prboom-2.4.1-gamedir.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 prboom.spec, 1.2, 1.3 sources, 1.2,
	1.3 prboom-2.3.1-64bit.patch, 1.1,
	NONE prboom-2.3.1-config.patch, 1.1,
	NONE prboom-2.3.1-fixpsnprintf.patch, 1.1,
	NONE prboom-2.3.1-gamedir.patch, 1.1,
	NONE prboom-2.3.1-gcc4.patch, 1.2, NONE
Message-ID: <200604220151.k3M1pR23002655@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/prboom/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2602/FC-4

Modified Files:
	.cvsignore prboom.spec sources 
Added Files:
	prboom-2.4.1-gamedir.patch 
Removed Files:
	prboom-2.3.1-64bit.patch prboom-2.3.1-config.patch 
	prboom-2.3.1-fixpsnprintf.patch prboom-2.3.1-gamedir.patch 
	prboom-2.3.1-gcc4.patch 
Log Message:
Update to 2.4.1



prboom-2.4.1-gamedir.patch:

--- NEW FILE prboom-2.4.1-gamedir.patch ---
diff -Naur --exclude '*.swp' prboom-2.4.1/configure prboom-2.4.1.new/configure
--- prboom-2.4.1/configure	2006-04-06 07:00:39.000000000 -0700
+++ prboom-2.4.1.new/configure	2006-04-18 19:02:51.000000000 -0700
@@ -1871,9 +1871,9 @@
 
 
 if test "x$prefix" != xNONE; then
-  DOOMWADDIR="$prefix/share/games/doom"
+  DOOMWADDIR="$prefix/share/doom"
 else
-  DOOMWADDIR="$ac_default_prefix/share/games/doom"
+  DOOMWADDIR="$ac_default_prefix/share/doom"
 fi
 cat >>confdefs.h <<_ACEOF
 #define DOOMWADDIR "$DOOMWADDIR"
diff -Naur --exclude '*.swp' prboom-2.4.1/src/d_main.c prboom-2.4.1.new/src/d_main.c
--- prboom-2.4.1/src/d_main.c	2006-04-02 09:20:33.000000000 -0700
+++ prboom-2.4.1.new/src/d_main.c	2006-04-18 19:02:06.000000000 -0700
@@ -138,6 +138,7 @@
   "doom.wad",
   "doom1.wad",
   "doomu.wad", /* CPhipps - alow doomu.wad */
+  "freedoom.wad", /* wart at kobold.org:  added freedoom for Fedora Extras */
 };
 static const int nstandard_iwads = sizeof standard_iwads/sizeof*standard_iwads;
 
diff -Naur --exclude '*.swp' prboom-2.4.1/src/s_sound.c prboom-2.4.1.new/src/s_sound.c
--- prboom-2.4.1/src/s_sound.c	2006-04-01 06:32:50.000000000 -0800
+++ prboom-2.4.1.new/src/s_sound.c	2006-04-20 15:16:09.000000000 -0700
@@ -505,6 +505,7 @@
 
       // load & register it
       music->data = W_CacheLumpNum(music->lumpnum);
+      fprintf(stderr, "Loading music lump #%d\n", music->lumpnum);
       music->handle = I_RegisterSong(music->data, W_LumpLength(music->lumpnum));
     }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/prboom/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Mar 2006 19:30:09 -0000	1.2
+++ .cvsignore	22 Apr 2006 01:50:55 -0000	1.3
@@ -1 +1 @@
-prboom-2.3.1.tar.gz
+prboom-2.4.1.tar.gz


Index: prboom.spec
===================================================================
RCS file: /cvs/extras/rpms/prboom/FC-4/prboom.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- prboom.spec	19 Mar 2006 07:02:25 -0000	1.2
+++ prboom.spec	22 Apr 2006 01:50:55 -0000	1.3
@@ -1,19 +1,15 @@
 %define waddir  %{_datadir}/doom
 
 Name:           prboom
-Version:        2.3.1
-Release:        5%{?dist}
+Version:        2.4.1
+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.3.1.tar.gz
-Patch0:         prboom-2.3.1-gcc4.patch
-Patch1:         prboom-2.3.1-gamedir.patch
-Patch2:         prboom-2.3.1-config.patch
-Patch3:         prboom-2.3.1-64bit.patch
-Patch4:         prboom-2.3.1-fixpsnprintf.patch
+Source0:        http://dl.sourceforge.net/prboom/prboom-2.4.1.tar.gz
+Patch0:         prboom-2.4.1-gamedir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL_mixer-devel SDL_net-devel
@@ -30,13 +26,9 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
-%configure --disable-cpu-opt --program-prefix=''
+%configure --enable-gl --disable-cpu-opt --program-prefix=''
 make %{?_smp_mflags}
 
 %install
@@ -69,6 +61,9 @@
 %doc doc/README.compat doc/README.demos doc/MBF.txt doc/MBFFAQ.txt doc/boom.txt
 
 %changelog
+* Tue Apr 18 2006 Wart <wart at kobold.org> 2.4.1-1
+- Update to 2.4.1
+
 * Sat Mar 18 2006 Wart <wart at kobold.org> 2.3.1-5
 - Updated patches to fix segfault on i386 (BZ #185741)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/prboom/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Mar 2006 19:30:09 -0000	1.2
+++ sources	22 Apr 2006 01:50:55 -0000	1.3
@@ -1 +1 @@
-c53231604fe6cf7352e73911ad44c90d  prboom-2.3.1.tar.gz
+5cfd46fe7e3aaccfb1840b249bf34b97  prboom-2.4.1.tar.gz


--- prboom-2.3.1-64bit.patch DELETED ---


--- prboom-2.3.1-config.patch DELETED ---


--- prboom-2.3.1-fixpsnprintf.patch DELETED ---


--- prboom-2.3.1-gamedir.patch DELETED ---


--- prboom-2.3.1-gcc4.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Apr 22 01:50:56 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Fri, 21 Apr 2006 18:50:56 -0700
Subject: rpms/prboom/FC-5 prboom-2.4.1-gamedir.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 prboom.spec, 1.2, 1.3 sources, 1.2,
	1.3 prboom-2.3.1-64bit.patch, 1.1,
	NONE prboom-2.3.1-config.patch, 1.1,
	NONE prboom-2.3.1-fixpsnprintf.patch, 1.1,
	NONE prboom-2.3.1-gamedir.patch, 1.1,
	NONE prboom-2.3.1-gcc4.patch, 1.2, NONE
Message-ID: <200604220151.k3M1pSRF002660@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/prboom/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2602/FC-5

Modified Files:
	.cvsignore prboom.spec sources 
Added Files:
	prboom-2.4.1-gamedir.patch 
Removed Files:
	prboom-2.3.1-64bit.patch prboom-2.3.1-config.patch 
	prboom-2.3.1-fixpsnprintf.patch prboom-2.3.1-gamedir.patch 
	prboom-2.3.1-gcc4.patch 
Log Message:
Update to 2.4.1



prboom-2.4.1-gamedir.patch:

--- NEW FILE prboom-2.4.1-gamedir.patch ---
diff -Naur --exclude '*.swp' prboom-2.4.1/configure prboom-2.4.1.new/configure
--- prboom-2.4.1/configure	2006-04-06 07:00:39.000000000 -0700
+++ prboom-2.4.1.new/configure	2006-04-18 19:02:51.000000000 -0700
@@ -1871,9 +1871,9 @@
 
 
 if test "x$prefix" != xNONE; then
-  DOOMWADDIR="$prefix/share/games/doom"
+  DOOMWADDIR="$prefix/share/doom"
 else
-  DOOMWADDIR="$ac_default_prefix/share/games/doom"
+  DOOMWADDIR="$ac_default_prefix/share/doom"
 fi
 cat >>confdefs.h <<_ACEOF
 #define DOOMWADDIR "$DOOMWADDIR"
diff -Naur --exclude '*.swp' prboom-2.4.1/src/d_main.c prboom-2.4.1.new/src/d_main.c
--- prboom-2.4.1/src/d_main.c	2006-04-02 09:20:33.000000000 -0700
+++ prboom-2.4.1.new/src/d_main.c	2006-04-18 19:02:06.000000000 -0700
@@ -138,6 +138,7 @@
   "doom.wad",
   "doom1.wad",
   "doomu.wad", /* CPhipps - alow doomu.wad */
+  "freedoom.wad", /* wart at kobold.org:  added freedoom for Fedora Extras */
 };
 static const int nstandard_iwads = sizeof standard_iwads/sizeof*standard_iwads;
 
diff -Naur --exclude '*.swp' prboom-2.4.1/src/s_sound.c prboom-2.4.1.new/src/s_sound.c
--- prboom-2.4.1/src/s_sound.c	2006-04-01 06:32:50.000000000 -0800
+++ prboom-2.4.1.new/src/s_sound.c	2006-04-20 15:16:09.000000000 -0700
@@ -505,6 +505,7 @@
 
       // load & register it
       music->data = W_CacheLumpNum(music->lumpnum);
+      fprintf(stderr, "Loading music lump #%d\n", music->lumpnum);
       music->handle = I_RegisterSong(music->data, W_LumpLength(music->lumpnum));
     }
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/prboom/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Mar 2006 19:30:09 -0000	1.2
+++ .cvsignore	22 Apr 2006 01:50:55 -0000	1.3
@@ -1 +1 @@
-prboom-2.3.1.tar.gz
+prboom-2.4.1.tar.gz


Index: prboom.spec
===================================================================
RCS file: /cvs/extras/rpms/prboom/FC-5/prboom.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- prboom.spec	19 Mar 2006 06:59:52 -0000	1.2
+++ prboom.spec	22 Apr 2006 01:50:55 -0000	1.3
@@ -1,22 +1,19 @@
 %define waddir  %{_datadir}/doom
 
 Name:           prboom
-Version:        2.3.1
-Release:        5%{?dist}
+Version:        2.4.1
+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.3.1.tar.gz
-Patch0:         prboom-2.3.1-gcc4.patch
-Patch1:         prboom-2.3.1-gamedir.patch
-Patch2:         prboom-2.3.1-config.patch
-Patch3:         prboom-2.3.1-64bit.patch
-Patch4:         prboom-2.3.1-fixpsnprintf.patch
+Source0:        http://dl.sourceforge.net/prboom/prboom-2.4.1.tar.gz
+Patch0:         prboom-2.4.1-gamedir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL_mixer-devel SDL_net-devel
+BuildRequires:  libGLU-devel
 Requires:       freedoom
 
 %description
@@ -30,13 +27,9 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 
 %build
-%configure --disable-cpu-opt --program-prefix=''
+%configure --enable-gl --disable-cpu-opt --program-prefix=''
 make %{?_smp_mflags}
 
 %install
@@ -69,6 +62,9 @@
 %doc doc/README.compat doc/README.demos doc/MBF.txt doc/MBFFAQ.txt doc/boom.txt
 
 %changelog
+* Tue Apr 18 2006 Wart <wart at kobold.org> 2.4.1-1
+- Update to 2.4.1
+
 * Sat Mar 18 2006 Wart <wart at kobold.org> 2.3.1-5
 - Updated patches to fix segfault on i386 (BZ #185741)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/prboom/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Mar 2006 19:30:09 -0000	1.2
+++ sources	22 Apr 2006 01:50:55 -0000	1.3
@@ -1 +1 @@
-c53231604fe6cf7352e73911ad44c90d  prboom-2.3.1.tar.gz
+5cfd46fe7e3aaccfb1840b249bf34b97  prboom-2.4.1.tar.gz


--- prboom-2.3.1-64bit.patch DELETED ---


--- prboom-2.3.1-config.patch DELETED ---


--- prboom-2.3.1-fixpsnprintf.patch DELETED ---


--- prboom-2.3.1-gamedir.patch DELETED ---


--- prboom-2.3.1-gcc4.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Apr 22 01:53:18 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Fri, 21 Apr 2006 18:53:18 -0700
Subject: rpms/prboom/FC-4 prboom-2.4.1-gamedir.patch,1.1,1.2
Message-ID: <200604220153.k3M1roA1002745@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/prboom/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2682/FC-4

Modified Files:
	prboom-2.4.1-gamedir.patch 
Log Message:
Remove debugging line from patch.



prboom-2.4.1-gamedir.patch:

Index: prboom-2.4.1-gamedir.patch
===================================================================
RCS file: /cvs/extras/rpms/prboom/FC-4/prboom-2.4.1-gamedir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- prboom-2.4.1-gamedir.patch	22 Apr 2006 01:50:55 -0000	1.1
+++ prboom-2.4.1-gamedir.patch	22 Apr 2006 01:53:18 -0000	1.2
@@ -24,14 +24,3 @@
  };
  static const int nstandard_iwads = sizeof standard_iwads/sizeof*standard_iwads;
  
-diff -Naur --exclude '*.swp' prboom-2.4.1/src/s_sound.c prboom-2.4.1.new/src/s_sound.c
---- prboom-2.4.1/src/s_sound.c	2006-04-01 06:32:50.000000000 -0800
-+++ prboom-2.4.1.new/src/s_sound.c	2006-04-20 15:16:09.000000000 -0700
-@@ -505,6 +505,7 @@
- 
-       // load & register it
-       music->data = W_CacheLumpNum(music->lumpnum);
-+      fprintf(stderr, "Loading music lump #%d\n", music->lumpnum);
-       music->handle = I_RegisterSong(music->data, W_LumpLength(music->lumpnum));
-     }
- 



From fedora-extras-commits at redhat.com  Sat Apr 22 01:53:18 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Fri, 21 Apr 2006 18:53:18 -0700
Subject: rpms/prboom/FC-5 prboom-2.4.1-gamedir.patch,1.1,1.2
Message-ID: <200604220153.k3M1rpBn002748@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/prboom/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2682/FC-5

Modified Files:
	prboom-2.4.1-gamedir.patch 
Log Message:
Remove debugging line from patch.



prboom-2.4.1-gamedir.patch:

Index: prboom-2.4.1-gamedir.patch
===================================================================
RCS file: /cvs/extras/rpms/prboom/FC-5/prboom-2.4.1-gamedir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- prboom-2.4.1-gamedir.patch	22 Apr 2006 01:50:55 -0000	1.1
+++ prboom-2.4.1-gamedir.patch	22 Apr 2006 01:53:18 -0000	1.2
@@ -24,14 +24,3 @@
  };
  static const int nstandard_iwads = sizeof standard_iwads/sizeof*standard_iwads;
  
-diff -Naur --exclude '*.swp' prboom-2.4.1/src/s_sound.c prboom-2.4.1.new/src/s_sound.c
---- prboom-2.4.1/src/s_sound.c	2006-04-01 06:32:50.000000000 -0800
-+++ prboom-2.4.1.new/src/s_sound.c	2006-04-20 15:16:09.000000000 -0700
-@@ -505,6 +505,7 @@
- 
-       // load & register it
-       music->data = W_CacheLumpNum(music->lumpnum);
-+      fprintf(stderr, "Loading music lump #%d\n", music->lumpnum);
-       music->handle = I_RegisterSong(music->data, W_LumpLength(music->lumpnum));
-     }
- 



From fedora-extras-commits at redhat.com  Sat Apr 22 01:53:19 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Fri, 21 Apr 2006 18:53:19 -0700
Subject: rpms/prboom/devel prboom-2.4.1-gamedir.patch,1.1,1.2
Message-ID: <200604220153.k3M1rp9P002751@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/prboom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2682/devel

Modified Files:
	prboom-2.4.1-gamedir.patch 
Log Message:
Remove debugging line from patch.



prboom-2.4.1-gamedir.patch:

Index: prboom-2.4.1-gamedir.patch
===================================================================
RCS file: /cvs/extras/rpms/prboom/devel/prboom-2.4.1-gamedir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- prboom-2.4.1-gamedir.patch	21 Apr 2006 21:37:55 -0000	1.1
+++ prboom-2.4.1-gamedir.patch	22 Apr 2006 01:53:19 -0000	1.2
@@ -24,14 +24,3 @@
  };
  static const int nstandard_iwads = sizeof standard_iwads/sizeof*standard_iwads;
  
-diff -Naur --exclude '*.swp' prboom-2.4.1/src/s_sound.c prboom-2.4.1.new/src/s_sound.c
---- prboom-2.4.1/src/s_sound.c	2006-04-01 06:32:50.000000000 -0800
-+++ prboom-2.4.1.new/src/s_sound.c	2006-04-20 15:16:09.000000000 -0700
-@@ -505,6 +505,7 @@
- 
-       // load & register it
-       music->data = W_CacheLumpNum(music->lumpnum);
-+      fprintf(stderr, "Loading music lump #%d\n", music->lumpnum);
-       music->handle = I_RegisterSong(music->data, W_LumpLength(music->lumpnum));
-     }
- 



From fedora-extras-commits at redhat.com  Sat Apr 22 01:59:03 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 21 Apr 2006 18:59:03 -0700
Subject: rpms/perl-Authen-SASL/devel .cvsignore, 1.3,
	1.4 perl-Authen-SASL.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200604220159.k3M1x54P002851@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Authen-SASL/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2828

Modified Files:
	.cvsignore perl-Authen-SASL.spec sources 
Log Message:
Update to 2.10.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Authen-SASL/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	26 Apr 2005 17:14:22 -0000	1.3
+++ .cvsignore	22 Apr 2006 01:59:02 -0000	1.4
@@ -1 +1 @@
-Authen-SASL-2.09.tar.gz
+Authen-SASL-2.10.tar.gz


Index: perl-Authen-SASL.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Authen-SASL/devel/perl-Authen-SASL.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Authen-SASL.spec	17 Feb 2006 19:55:58 -0000	1.5
+++ perl-Authen-SASL.spec	22 Apr 2006 01:59:02 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Authen-SASL
-Version:        2.09
-Release:        4%{?dist}
+Version:        2.10
+Release:        1%{?dist}
 Summary:        SASL Authentication framework for Perl
 
 Group:          Development/Libraries
@@ -10,7 +10,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl >= 1:5.6.1, perl(Digest::HMAC)
+BuildRequires:  perl >= 1:5.6.1
+BuildRequires:  perl(Digest::HMAC)
+BuildRequires:  perl(GSSAPI)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -52,6 +54,9 @@
 
 
 %changelog
+* Sat Apr 22 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.10-1
+- Update to 2.10.
+
 * Fri Feb 17 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.09-4
 - Rebuild for FC5 (perl 5.8.8).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Authen-SASL/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Apr 2005 17:14:22 -0000	1.3
+++ sources	22 Apr 2006 01:59:02 -0000	1.4
@@ -1 +1 @@
-e11b60f58850ff6e71e6e1813c1f5e31  Authen-SASL-2.09.tar.gz
+041ce912640c5dff626a91435a359b88  Authen-SASL-2.10.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 02:13:32 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Fri, 21 Apr 2006 19:13:32 -0700
Subject: rpms/ghc/FC-5 .cvsignore, 1.5, 1.6 ghc.spec, 1.12, 1.13 sources, 1.5,
	1.6 ghc-6.4.1-gcc41.patch, 1.1, NONE
Message-ID: <200604220213.k3M2DYu0005120@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5099

Modified Files:
	.cvsignore ghc.spec sources 
Removed Files:
	ghc-6.4.1-gcc41.patch 
Log Message:
- update to 6.4.2 release
  - ghc-6.4.1-gcc41.patch no longer needed



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghc/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Sep 2005 23:37:16 -0000	1.5
+++ .cvsignore	22 Apr 2006 02:13:32 -0000	1.6
@@ -1 +1 @@
-ghc-6.4.1-src.tar.bz2
+ghc-6.4.2-src.tar.bz2


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/FC-5/ghc.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ghc.spec	22 Mar 2006 03:32:33 -0000	1.12
+++ ghc.spec	22 Apr 2006 02:13:32 -0000	1.13
@@ -1,12 +1,12 @@
-%define ghcver ghc641
+%define ghcver ghc642
 
 # speed up test builds by not building profiled libraries
 %define build_prof 1
 %define build_doc 1
 
 Name:		ghc
-Version:	6.4.1
-Release:	4%{?dist}
+Version:	6.4.2
+Release:	1%{?dist}
 Summary:	Glasgow Haskell Compilation system
 License:	BSD style
 Group:		Development/Languages
@@ -14,14 +14,13 @@
 URL:		http://haskell.org/ghc/
 Requires:	%{ghcver} = %{version}-%{release}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	ghc, sed
-Buildrequires:	gmp-devel, readline-devel, libX11-devel, freeglut-devel, openal-devel
+BuildRequires:  ghc, sed
+Buildrequires:  gmp-devel, readline-devel, libX11-devel, freeglut-devel, openal-devel
 %if %{build_doc}
 # haddock generates libraries/ docs
-Buildrequires:	libxslt, docbook-style-xsl, haddock
+Buildrequires: libxslt, docbook-style-xsl, haddock
 %endif
 Prefix:		%{_prefix}
-Patch1:		ghc-6.4.1-gcc41.patch
 
 %description
 GHC is a state-of-the-art programming suite for Haskell, a purely
@@ -79,7 +78,6 @@
 
 %prep
 %setup -q -n ghc-%{version}
-%patch1 -p1 -b .1-gcc
 
 %build
 %if !%{build_prof}
@@ -158,6 +156,10 @@
 %endif
 
 %changelog
+* Sat Apr 22 2006 Jens Petersen <petersen at redhat.com> - 6.4.2-1.fc5
+- update to 6.4.2 release
+  - ghc-6.4.1-gcc41.patch no longer needed
+
 * Wed Mar 22 2006 Jens Petersen <petersen at redhat.com> - 6.4.1-4.fc5
 - add ghc-6.4.1-gcc41.patch from gentoo-haskell to fix stage2 linking on x86_64
   (Chris Parrott, #185914)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghc/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Sep 2005 23:37:16 -0000	1.5
+++ sources	22 Apr 2006 02:13:32 -0000	1.6
@@ -1 +1 @@
-fd289bc7c3afa272ff831a71a50b5b00  ghc-6.4.1-src.tar.bz2
+a394bf14e94c3bca5507d568fcc03375  ghc-6.4.2-src.tar.bz2


--- ghc-6.4.1-gcc41.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Apr 22 02:32:55 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Fri, 21 Apr 2006 19:32:55 -0700
Subject: rpms/netcdf/FC-4 .cvsignore, 1.4, 1.5 netcdf.spec, 1.11,
	1.12 sources, 1.4, 1.5
Message-ID: <200604220232.k3M2WvdF005397@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/netcdf/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5344/FC-4

Modified Files:
	.cvsignore netcdf.spec sources 
Log Message:
update to upstream 3.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/netcdf/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Apr 2005 03:33:33 -0000	1.4
+++ .cvsignore	22 Apr 2006 02:32:55 -0000	1.5
@@ -1 +1 @@
-netcdf-3.6.0-p1.tar.gz
+netcdf-3.6.1.tar.gz


Index: netcdf.spec
===================================================================
RCS file: /cvs/extras/rpms/netcdf/FC-4/netcdf.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- netcdf.spec	16 Oct 2005 06:11:55 -0000	1.11
+++ netcdf.spec	22 Apr 2006 02:32:55 -0000	1.12
@@ -1,12 +1,12 @@
 Name:           netcdf
-Version:        3.6.0
-Release:        8.p1%{?dist}
+Version:        3.6.1
+Release:        1%{?dist}
 Summary:        Libraries for the Unidata network Common Data Form (NetCDF v3)
 
 Group:          Applications/Engineering
 License:        NetCDF
 URL:            http://my.unidata.ucar.edu/content/software/netcdf/index.html
-Source0:        ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-3.6.0-p1.tar.gz
+Source0:        ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-3.6.1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gcc-gfortran
@@ -53,13 +53,14 @@
 
 
 %prep
-%setup -q -n netcdf-3.6.0-p1
+%setup -q
 
 
 %build
 cd src
-export FC="gfortran"
-export CPPFLAGS="-fPIC"
+export FC="g77"
+export F90=
+export CPPFLAGS="-fPIC -Df2cFortran"
 export FFLAGS="-fPIC"
 %configure
 #  WARNING!
@@ -69,7 +70,9 @@
 mkdir lib_g77
 cp libsrc/libnetcdf.a lib_g77
 make clean
-CPPFLAGS="-fPIC -DpgiFortran"
+export FC="gfortran"
+export F90="gfortran"
+export CPPFLAGS="-fPIC -DpgiFortran"
 %configure
 make
 #  The below seems to work but I worry that it would lead to odd runtime
@@ -78,6 +81,7 @@
 #  one for the older g77 and one for gfortran.
 #    ar cru libsrc/libnetcdf.a lib_g77/libnetcdf.a
 unset FC
+unset F90
 unset CPPFLAGS
 unset FFLAGS
 
@@ -116,6 +120,9 @@
 
 
 %changelog
+* Fri Apr 21 2006 Ed Hill <ed at eh3.com> - 3.6.1-1
+- update to upstream 3.6.1
+
 * Sun Oct 16 2005 Ed Hill <ed at eh3.com> - 3.6.0-8.p1
 - building the library twice (once each for g77 and gfortran) 
   fixes an annoying problem for people who need both compilers


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/netcdf/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Apr 2005 03:33:33 -0000	1.4
+++ sources	22 Apr 2006 02:32:55 -0000	1.5
@@ -1 +1 @@
-27c193e0462d9979406d167a01a5ee95  netcdf-3.6.0-p1.tar.gz
+07a9db424337c5e4833fb84136e09a1e  netcdf-3.6.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 02:32:56 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Fri, 21 Apr 2006 19:32:56 -0700
Subject: rpms/netcdf/FC-5 .cvsignore, 1.4, 1.5 netcdf.spec, 1.13,
	1.14 sources, 1.4, 1.5
Message-ID: <200604220232.k3M2Wwvw005403@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/netcdf/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5344/FC-5

Modified Files:
	.cvsignore netcdf.spec sources 
Log Message:
update to upstream 3.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/netcdf/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Apr 2005 03:33:33 -0000	1.4
+++ .cvsignore	22 Apr 2006 02:32:56 -0000	1.5
@@ -1 +1 @@
-netcdf-3.6.0-p1.tar.gz
+netcdf-3.6.1.tar.gz


Index: netcdf.spec
===================================================================
RCS file: /cvs/extras/rpms/netcdf/FC-5/netcdf.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- netcdf.spec	17 Feb 2006 02:45:55 -0000	1.13
+++ netcdf.spec	22 Apr 2006 02:32:56 -0000	1.14
@@ -1,12 +1,12 @@
 Name:           netcdf
-Version:        3.6.0
-Release:        10.p1%{?dist}
+Version:        3.6.1
+Release:        1%{?dist}
 Summary:        Libraries for the Unidata network Common Data Form (NetCDF v3)
 
 Group:          Applications/Engineering
 License:        NetCDF
 URL:            http://my.unidata.ucar.edu/content/software/netcdf/index.html
-Source0:        ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-3.6.0-p1.tar.gz
+Source0:        ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-3.6.1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gcc-gfortran
@@ -53,13 +53,14 @@
 
 
 %prep
-%setup -q -n netcdf-3.6.0-p1
+%setup -q
 
 
 %build
 cd src
-export FC="gfortran"
-export CPPFLAGS="-fPIC"
+export FC="g77"
+export F90=
+export CPPFLAGS="-fPIC -Df2cFortran"
 export FFLAGS="-fPIC"
 %configure
 #  WARNING!
@@ -69,7 +70,9 @@
 mkdir lib_g77
 cp libsrc/libnetcdf.a lib_g77
 make clean
-CPPFLAGS="-fPIC -DpgiFortran"
+export FC="gfortran"
+export F90="gfortran"
+export CPPFLAGS="-fPIC -DpgiFortran"
 %configure
 make
 #  The below seems to work but I worry that it would lead to odd runtime
@@ -78,6 +81,7 @@
 #  one for the older g77 and one for gfortran.
 #    ar cru libsrc/libnetcdf.a lib_g77/libnetcdf.a
 unset FC
+unset F90
 unset CPPFLAGS
 unset FFLAGS
 
@@ -116,6 +120,9 @@
 
 
 %changelog
+* Fri Apr 21 2006 Ed Hill <ed at eh3.com> - 3.6.1-1
+- update to upstream 3.6.1
+
 * Thu Feb 16 2006 Ed Hill <ed at eh3.com> - 3.6.0-10.p1
 - rebuild for new GCC
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/netcdf/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Apr 2005 03:33:33 -0000	1.4
+++ sources	22 Apr 2006 02:32:56 -0000	1.5
@@ -1 +1 @@
-27c193e0462d9979406d167a01a5ee95  netcdf-3.6.0-p1.tar.gz
+07a9db424337c5e4833fb84136e09a1e  netcdf-3.6.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 02:32:57 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Fri, 21 Apr 2006 19:32:57 -0700
Subject: rpms/netcdf/devel .cvsignore, 1.4, 1.5 netcdf.spec, 1.13,
	1.14 sources, 1.4, 1.5
Message-ID: <200604220232.k3M2WxDp005409@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/netcdf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5344/devel

Modified Files:
	.cvsignore netcdf.spec sources 
Log Message:
update to upstream 3.6.1



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/netcdf/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	6 Apr 2005 03:33:33 -0000	1.4
+++ .cvsignore	22 Apr 2006 02:32:57 -0000	1.5
@@ -1 +1 @@
-netcdf-3.6.0-p1.tar.gz
+netcdf-3.6.1.tar.gz


Index: netcdf.spec
===================================================================
RCS file: /cvs/extras/rpms/netcdf/devel/netcdf.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- netcdf.spec	17 Feb 2006 02:45:55 -0000	1.13
+++ netcdf.spec	22 Apr 2006 02:32:57 -0000	1.14
@@ -1,12 +1,12 @@
 Name:           netcdf
-Version:        3.6.0
-Release:        10.p1%{?dist}
+Version:        3.6.1
+Release:        1%{?dist}
 Summary:        Libraries for the Unidata network Common Data Form (NetCDF v3)
 
 Group:          Applications/Engineering
 License:        NetCDF
 URL:            http://my.unidata.ucar.edu/content/software/netcdf/index.html
-Source0:        ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-3.6.0-p1.tar.gz
+Source0:        ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-3.6.1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gcc-gfortran
@@ -53,13 +53,14 @@
 
 
 %prep
-%setup -q -n netcdf-3.6.0-p1
+%setup -q
 
 
 %build
 cd src
-export FC="gfortran"
-export CPPFLAGS="-fPIC"
+export FC="g77"
+export F90=
+export CPPFLAGS="-fPIC -Df2cFortran"
 export FFLAGS="-fPIC"
 %configure
 #  WARNING!
@@ -69,7 +70,9 @@
 mkdir lib_g77
 cp libsrc/libnetcdf.a lib_g77
 make clean
-CPPFLAGS="-fPIC -DpgiFortran"
+export FC="gfortran"
+export F90="gfortran"
+export CPPFLAGS="-fPIC -DpgiFortran"
 %configure
 make
 #  The below seems to work but I worry that it would lead to odd runtime
@@ -78,6 +81,7 @@
 #  one for the older g77 and one for gfortran.
 #    ar cru libsrc/libnetcdf.a lib_g77/libnetcdf.a
 unset FC
+unset F90
 unset CPPFLAGS
 unset FFLAGS
 
@@ -116,6 +120,9 @@
 
 
 %changelog
+* Fri Apr 21 2006 Ed Hill <ed at eh3.com> - 3.6.1-1
+- update to upstream 3.6.1
+
 * Thu Feb 16 2006 Ed Hill <ed at eh3.com> - 3.6.0-10.p1
 - rebuild for new GCC
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/netcdf/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	6 Apr 2005 03:33:33 -0000	1.4
+++ sources	22 Apr 2006 02:32:57 -0000	1.5
@@ -1 +1 @@
-27c193e0462d9979406d167a01a5ee95  netcdf-3.6.0-p1.tar.gz
+07a9db424337c5e4833fb84136e09a1e  netcdf-3.6.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 02:53:07 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 21 Apr 2006 19:53:07 -0700
Subject: rpms/perl-DBIx-DBSchema/devel .cvsignore, 1.4,
	1.5 perl-DBIx-DBSchema.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <200604220253.k3M2r9F9005599@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-DBIx-DBSchema/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5578

Modified Files:
	.cvsignore perl-DBIx-DBSchema.spec sources 
Log Message:
* Sat Apr 22 2006  Ralf Cors??pius <rc040203 at freenet.de> - 0.31-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-DBSchema/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Feb 2006 09:59:16 -0000	1.4
+++ .cvsignore	22 Apr 2006 02:53:07 -0000	1.5
@@ -1 +1 @@
-DBIx-DBSchema-0.30.tar.gz
+DBIx-DBSchema-0.31.tar.gz


Index: perl-DBIx-DBSchema.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-DBSchema/devel/perl-DBIx-DBSchema.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-DBIx-DBSchema.spec	19 Feb 2006 09:59:16 -0000	1.5
+++ perl-DBIx-DBSchema.spec	22 Apr 2006 02:53:07 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           perl-DBIx-DBSchema
-Version:        0.30
+Version:        0.31
 Release:        1%{?dist}
 Summary:        Database-independent schema objects
 
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Sat Apr 22 2006  Ralf Cors??pius <rc040203 at freenet.de> - 0.31-1
+- Upstream update.
+
 * Sun Feb 19 2006  Ralf Cors??pius <rc040203 at freenet.de> - 0.30-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-DBSchema/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Feb 2006 09:59:16 -0000	1.4
+++ sources	22 Apr 2006 02:53:07 -0000	1.5
@@ -1 +1 @@
-be40b90e0e1e1bec35dbc8855351e925  DBIx-DBSchema-0.30.tar.gz
+bee0e44ff328adfea5b2c204ae5c606b  DBIx-DBSchema-0.31.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 03:07:18 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Fri, 21 Apr 2006 20:07:18 -0700
Subject: rpms/nco/FC-5 .cvsignore, 1.3, 1.4 nco.spec, 1.4,
	1.5 nco_install_C_headers.patch, 1.1, 1.2 sources, 1.3, 1.4
Message-ID: <200604220307.k3M37KgE007934@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/nco/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7873/FC-5

Modified Files:
	.cvsignore nco.spec nco_install_C_headers.patch sources 
Log Message:
update to new upstream 3.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nco/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Sep 2005 18:42:45 -0000	1.3
+++ .cvsignore	22 Apr 2006 03:07:18 -0000	1.4
@@ -1 +1 @@
-nco-3.0.2.tar.gz
+nco-3.1.2.tar.gz


Index: nco.spec
===================================================================
RCS file: /cvs/extras/rpms/nco/FC-5/nco.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nco.spec	17 Feb 2006 02:55:15 -0000	1.4
+++ nco.spec	22 Apr 2006 03:07:18 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           nco
-Version:        3.0.2
-Release:        2%{?dist}
+Version:        3.1.2
+Release:        1%{?dist}
 Summary:        Suite of programs for manipulating NetCDF/HDF4 files
 Group:          Applications/Engineering
 License:        GPL
@@ -12,9 +12,9 @@
 #    cvs -z3 -d:pserver:anonymous at cvs.sf.net:/cvsroot/nco co \
 #        -r nco-3_0_2 -d nco-3.0.2 nco
 #    tar -czf nco-3.0.2.tar.gz ./nco-3.0.2
-Source0:        nco-3.0.2.tar.gz
+Source0:        nco-3.1.2.tar.gz
 Patch0:		nco_install_C_headers.patch
-Patch1:         nco-3.0.0-fixudunits.patch
+#Patch1:         nco-3.0.0-fixudunits.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  netcdf-devel, libtool, automake, autoconf
@@ -51,19 +51,20 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+#%patch1 -p1
 
 %build
 aclocal
 autoheader
 automake --foreign
 autoconf
-export NETCDF_INC=%{_includedir}/netcdf-3 NETCDF_LIB=%{_libdir}/netcdf-3
+export CPPFLAGS=-I%{_includedir}/netcdf-3
+export LDFLAGS=-L%{_libdir}/netcdf-3
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
 export CXXFLAGS="$RPM_OPT_FLAGS -fpermissive -fPIC"
 %configure --includedir=%{_includedir}/nco
 make %{?_smp_mflags}
-unset NETCDF_INC NETCDF_LIB CPPFLAGS
+unset CPPFLAGS LDFLAGS CFLAGS CXXFLAGS
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -72,6 +73,7 @@
 make install DESTDIR=${RPM_BUILD_ROOT}
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la
 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
+rm -f ${RPM_BUILD_ROOT}%{_bindir}/mpnc*
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -106,6 +108,9 @@
 
 
 %changelog
+* Fri Apr 21 2006 Ed Hill <ed at eh3.com> - 3.1.2-1
+- update to new upstream 3.1.2
+
 * Thu Feb 16 2006 Ed Hill <ed at eh3.com> - 3.0.2-2
 - rebuild for new gcc
 

nco_install_C_headers.patch:

Index: nco_install_C_headers.patch
===================================================================
RCS file: /cvs/extras/rpms/nco/FC-5/nco_install_C_headers.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nco_install_C_headers.patch	21 Jul 2005 05:43:23 -0000	1.1
+++ nco_install_C_headers.patch	22 Apr 2006 03:07:18 -0000	1.2
@@ -1,11 +1,11 @@
---- nco-3.0.0/src/nco/Makefile.am	2004-08-06 12:44:00.000000000 -0400
-+++ nco-3.0.0_new/src/nco/Makefile.am	2005-04-18 08:54:22.000000000 -0400
-@@ -69,6 +69,8 @@
+--- nco-3.1.2/src/nco/Makefile.am.ORIG	2006-04-21 21:45:56.000000000 -0400
++++ nco-3.1.2/src/nco/Makefile.am	2006-04-21 21:46:52.000000000 -0400
+@@ -127,6 +127,8 @@
  # This creates version-stamped shared-library, e.g., libnco-2.9.4.so
  libnco_la_LDFLAGS = -release @VERSION@
  
 +include_HEADERS = $(HEADER_SRC)
 +
- libnco_la_SOURCES = nco_att_utl.c nco_bnr.c nco_cln_utl.c nco_cnf_dmn.c \
- nco_cnf_typ.c nco_cnv_arm.c nco_rth_flt.c ${NCO_GETOPT} \
- nco_cnv_csm.c nco_ctl.c nco_dbg.c nco_dmn_utl.c nco_fl_utl.c nco_lmt.c \
+ libnco_la_SOURCES = \
+ $(HEADER_SRC) \
+ ${NCO_GETOPT} \


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nco/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Sep 2005 18:42:45 -0000	1.3
+++ sources	22 Apr 2006 03:07:18 -0000	1.4
@@ -1 +1 @@
-46ddd902c9fd86e5d655ddcc8ce647c7  nco-3.0.2.tar.gz
+57164e52ae4cf67fa21edb062c746f52  nco-3.1.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 03:07:19 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Fri, 21 Apr 2006 20:07:19 -0700
Subject: rpms/nco/devel .cvsignore, 1.3, 1.4 nco.spec, 1.4,
	1.5 nco_install_C_headers.patch, 1.1, 1.2 sources, 1.3, 1.4
Message-ID: <200604220307.k3M37LBA007944@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/nco/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7873/devel

Modified Files:
	.cvsignore nco.spec nco_install_C_headers.patch sources 
Log Message:
update to new upstream 3.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nco/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Sep 2005 18:42:45 -0000	1.3
+++ .cvsignore	22 Apr 2006 03:07:19 -0000	1.4
@@ -1 +1 @@
-nco-3.0.2.tar.gz
+nco-3.1.2.tar.gz


Index: nco.spec
===================================================================
RCS file: /cvs/extras/rpms/nco/devel/nco.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- nco.spec	17 Feb 2006 02:55:15 -0000	1.4
+++ nco.spec	22 Apr 2006 03:07:19 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           nco
-Version:        3.0.2
-Release:        2%{?dist}
+Version:        3.1.2
+Release:        1%{?dist}
 Summary:        Suite of programs for manipulating NetCDF/HDF4 files
 Group:          Applications/Engineering
 License:        GPL
@@ -12,9 +12,9 @@
 #    cvs -z3 -d:pserver:anonymous at cvs.sf.net:/cvsroot/nco co \
 #        -r nco-3_0_2 -d nco-3.0.2 nco
 #    tar -czf nco-3.0.2.tar.gz ./nco-3.0.2
-Source0:        nco-3.0.2.tar.gz
+Source0:        nco-3.1.2.tar.gz
 Patch0:		nco_install_C_headers.patch
-Patch1:         nco-3.0.0-fixudunits.patch
+#Patch1:         nco-3.0.0-fixudunits.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  netcdf-devel, libtool, automake, autoconf
@@ -51,19 +51,20 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+#%patch1 -p1
 
 %build
 aclocal
 autoheader
 automake --foreign
 autoconf
-export NETCDF_INC=%{_includedir}/netcdf-3 NETCDF_LIB=%{_libdir}/netcdf-3
+export CPPFLAGS=-I%{_includedir}/netcdf-3
+export LDFLAGS=-L%{_libdir}/netcdf-3
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
 export CXXFLAGS="$RPM_OPT_FLAGS -fpermissive -fPIC"
 %configure --includedir=%{_includedir}/nco
 make %{?_smp_mflags}
-unset NETCDF_INC NETCDF_LIB CPPFLAGS
+unset CPPFLAGS LDFLAGS CFLAGS CXXFLAGS
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -72,6 +73,7 @@
 make install DESTDIR=${RPM_BUILD_ROOT}
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la
 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
+rm -f ${RPM_BUILD_ROOT}%{_bindir}/mpnc*
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -106,6 +108,9 @@
 
 
 %changelog
+* Fri Apr 21 2006 Ed Hill <ed at eh3.com> - 3.1.2-1
+- update to new upstream 3.1.2
+
 * Thu Feb 16 2006 Ed Hill <ed at eh3.com> - 3.0.2-2
 - rebuild for new gcc
 

nco_install_C_headers.patch:

Index: nco_install_C_headers.patch
===================================================================
RCS file: /cvs/extras/rpms/nco/devel/nco_install_C_headers.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nco_install_C_headers.patch	21 Jul 2005 05:43:23 -0000	1.1
+++ nco_install_C_headers.patch	22 Apr 2006 03:07:19 -0000	1.2
@@ -1,11 +1,11 @@
---- nco-3.0.0/src/nco/Makefile.am	2004-08-06 12:44:00.000000000 -0400
-+++ nco-3.0.0_new/src/nco/Makefile.am	2005-04-18 08:54:22.000000000 -0400
-@@ -69,6 +69,8 @@
+--- nco-3.1.2/src/nco/Makefile.am.ORIG	2006-04-21 21:45:56.000000000 -0400
++++ nco-3.1.2/src/nco/Makefile.am	2006-04-21 21:46:52.000000000 -0400
+@@ -127,6 +127,8 @@
  # This creates version-stamped shared-library, e.g., libnco-2.9.4.so
  libnco_la_LDFLAGS = -release @VERSION@
  
 +include_HEADERS = $(HEADER_SRC)
 +
- libnco_la_SOURCES = nco_att_utl.c nco_bnr.c nco_cln_utl.c nco_cnf_dmn.c \
- nco_cnf_typ.c nco_cnv_arm.c nco_rth_flt.c ${NCO_GETOPT} \
- nco_cnv_csm.c nco_ctl.c nco_dbg.c nco_dmn_utl.c nco_fl_utl.c nco_lmt.c \
+ libnco_la_SOURCES = \
+ $(HEADER_SRC) \
+ ${NCO_GETOPT} \


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nco/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Sep 2005 18:42:45 -0000	1.3
+++ sources	22 Apr 2006 03:07:19 -0000	1.4
@@ -1 +1 @@
-46ddd902c9fd86e5d655ddcc8ce647c7  nco-3.0.2.tar.gz
+57164e52ae4cf67fa21edb062c746f52  nco-3.1.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 03:07:17 2006
From: fedora-extras-commits at redhat.com (Ed Hill (edhill))
Date: Fri, 21 Apr 2006 20:07:17 -0700
Subject: rpms/nco/FC-4 .cvsignore, 1.3, 1.4 nco.spec, 1.3,
	1.4 nco_install_C_headers.patch, 1.1, 1.2 sources, 1.3, 1.4
Message-ID: <200604220307.k3M37nGN007953@cvs-int.fedora.redhat.com>

Author: edhill

Update of /cvs/extras/rpms/nco/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7873/FC-4

Modified Files:
	.cvsignore nco.spec nco_install_C_headers.patch sources 
Log Message:
update to new upstream 3.1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nco/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	5 Sep 2005 18:41:53 -0000	1.3
+++ .cvsignore	22 Apr 2006 03:07:17 -0000	1.4
@@ -1 +1 @@
-nco-3.0.2.tar.gz
+nco-3.1.2.tar.gz


Index: nco.spec
===================================================================
RCS file: /cvs/extras/rpms/nco/FC-4/nco.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- nco.spec	5 Sep 2005 18:41:53 -0000	1.3
+++ nco.spec	22 Apr 2006 03:07:17 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           nco
-Version:        3.0.2
+Version:        3.1.2
 Release:        1%{?dist}
 Summary:        Suite of programs for manipulating NetCDF/HDF4 files
 Group:          Applications/Engineering
@@ -12,9 +12,9 @@
 #    cvs -z3 -d:pserver:anonymous at cvs.sf.net:/cvsroot/nco co \
 #        -r nco-3_0_2 -d nco-3.0.2 nco
 #    tar -czf nco-3.0.2.tar.gz ./nco-3.0.2
-Source0:        nco-3.0.2.tar.gz
+Source0:        nco-3.1.2.tar.gz
 Patch0:		nco_install_C_headers.patch
-Patch1:         nco-3.0.0-fixudunits.patch
+#Patch1:         nco-3.0.0-fixudunits.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  netcdf-devel, libtool, automake, autoconf
@@ -51,19 +51,20 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
+#%patch1 -p1
 
 %build
 aclocal
 autoheader
 automake --foreign
 autoconf
-export NETCDF_INC=%{_includedir}/netcdf-3 NETCDF_LIB=%{_libdir}/netcdf-3
+export CPPFLAGS=-I%{_includedir}/netcdf-3
+export LDFLAGS=-L%{_libdir}/netcdf-3
 export CFLAGS="$RPM_OPT_FLAGS -fPIC"
 export CXXFLAGS="$RPM_OPT_FLAGS -fpermissive -fPIC"
 %configure --includedir=%{_includedir}/nco
 make %{?_smp_mflags}
-unset NETCDF_INC NETCDF_LIB CPPFLAGS
+unset CPPFLAGS LDFLAGS CFLAGS CXXFLAGS
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
@@ -72,6 +73,7 @@
 make install DESTDIR=${RPM_BUILD_ROOT}
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la
 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
+rm -f ${RPM_BUILD_ROOT}%{_bindir}/mpnc*
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -106,6 +108,9 @@
 
 
 %changelog
+* Fri Apr 21 2006 Ed Hill <ed at eh3.com> - 3.1.2-1
+- update to new upstream 3.1.2
+
 * Mon Sep  5 2005 Ed Hill <ed at eh3.com> - 3.0.2-1
 - update to new upstream 3.0.2
 

nco_install_C_headers.patch:

Index: nco_install_C_headers.patch
===================================================================
RCS file: /cvs/extras/rpms/nco/FC-4/nco_install_C_headers.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nco_install_C_headers.patch	21 Jul 2005 05:43:23 -0000	1.1
+++ nco_install_C_headers.patch	22 Apr 2006 03:07:17 -0000	1.2
@@ -1,11 +1,11 @@
---- nco-3.0.0/src/nco/Makefile.am	2004-08-06 12:44:00.000000000 -0400
-+++ nco-3.0.0_new/src/nco/Makefile.am	2005-04-18 08:54:22.000000000 -0400
-@@ -69,6 +69,8 @@
+--- nco-3.1.2/src/nco/Makefile.am.ORIG	2006-04-21 21:45:56.000000000 -0400
++++ nco-3.1.2/src/nco/Makefile.am	2006-04-21 21:46:52.000000000 -0400
+@@ -127,6 +127,8 @@
  # This creates version-stamped shared-library, e.g., libnco-2.9.4.so
  libnco_la_LDFLAGS = -release @VERSION@
  
 +include_HEADERS = $(HEADER_SRC)
 +
- libnco_la_SOURCES = nco_att_utl.c nco_bnr.c nco_cln_utl.c nco_cnf_dmn.c \
- nco_cnf_typ.c nco_cnv_arm.c nco_rth_flt.c ${NCO_GETOPT} \
- nco_cnv_csm.c nco_ctl.c nco_dbg.c nco_dmn_utl.c nco_fl_utl.c nco_lmt.c \
+ libnco_la_SOURCES = \
+ $(HEADER_SRC) \
+ ${NCO_GETOPT} \


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nco/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Sep 2005 18:41:53 -0000	1.3
+++ sources	22 Apr 2006 03:07:17 -0000	1.4
@@ -1 +1 @@
-46ddd902c9fd86e5d655ddcc8ce647c7  nco-3.0.2.tar.gz
+57164e52ae4cf67fa21edb062c746f52  nco-3.1.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 03:10:59 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 21 Apr 2006 20:10:59 -0700
Subject: rpms/perl-DBIx-DBSchema/FC-5 .cvsignore, 1.4,
	1.5 perl-DBIx-DBSchema.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <200604220311.k3M3B1SC008113@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-DBIx-DBSchema/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8092

Modified Files:
	.cvsignore perl-DBIx-DBSchema.spec sources 
Log Message:
* Sat Apr 22 2006  Ralf Cors??pius <rc040203 at freenet.de> - 0.31-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-DBSchema/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Feb 2006 09:59:16 -0000	1.4
+++ .cvsignore	22 Apr 2006 03:10:59 -0000	1.5
@@ -1 +1 @@
-DBIx-DBSchema-0.30.tar.gz
+DBIx-DBSchema-0.31.tar.gz


Index: perl-DBIx-DBSchema.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-DBSchema/FC-5/perl-DBIx-DBSchema.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-DBIx-DBSchema.spec	19 Feb 2006 09:59:16 -0000	1.5
+++ perl-DBIx-DBSchema.spec	22 Apr 2006 03:10:59 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           perl-DBIx-DBSchema
-Version:        0.30
+Version:        0.31
 Release:        1%{?dist}
 Summary:        Database-independent schema objects
 
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Sat Apr 22 2006  Ralf Cors??pius <rc040203 at freenet.de> - 0.31-1
+- Upstream update.
+
 * Sun Feb 19 2006  Ralf Cors??pius <rc040203 at freenet.de> - 0.30-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-DBSchema/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Feb 2006 09:59:16 -0000	1.4
+++ sources	22 Apr 2006 03:10:59 -0000	1.5
@@ -1 +1 @@
-be40b90e0e1e1bec35dbc8855351e925  DBIx-DBSchema-0.30.tar.gz
+bee0e44ff328adfea5b2c204ae5c606b  DBIx-DBSchema-0.31.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 03:12:34 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 21 Apr 2006 20:12:34 -0700
Subject: rpms/perl-DBIx-DBSchema/FC-4 .cvsignore, 1.4,
	1.5 perl-DBIx-DBSchema.spec, 1.5, 1.6 sources, 1.4, 1.5
Message-ID: <200604220312.k3M3Ca88008183@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-DBIx-DBSchema/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8162

Modified Files:
	.cvsignore perl-DBIx-DBSchema.spec sources 
Log Message:
* Sat Apr 22 2006  Ralf Cors??pius <rc040203 at freenet.de> - 0.31-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-DBSchema/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Feb 2006 10:00:30 -0000	1.4
+++ .cvsignore	22 Apr 2006 03:12:34 -0000	1.5
@@ -1 +1 @@
-DBIx-DBSchema-0.30.tar.gz
+DBIx-DBSchema-0.31.tar.gz


Index: perl-DBIx-DBSchema.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-DBSchema/FC-4/perl-DBIx-DBSchema.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-DBIx-DBSchema.spec	19 Feb 2006 10:00:30 -0000	1.5
+++ perl-DBIx-DBSchema.spec	22 Apr 2006 03:12:34 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           perl-DBIx-DBSchema
-Version:        0.30
+Version:        0.31
 Release:        1%{?dist}
 Summary:        Database-independent schema objects
 
@@ -65,6 +65,9 @@
 
 
 %changelog
+* Sat Apr 22 2006  Ralf Cors??pius <rc040203 at freenet.de> - 0.31-1
+- Upstream update.
+
 * Sun Feb 19 2006  Ralf Cors??pius <rc040203 at freenet.de> - 0.30-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-DBSchema/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Feb 2006 10:00:30 -0000	1.4
+++ sources	22 Apr 2006 03:12:34 -0000	1.5
@@ -1 +1 @@
-be40b90e0e1e1bec35dbc8855351e925  DBIx-DBSchema-0.30.tar.gz
+bee0e44ff328adfea5b2c204ae5c606b  DBIx-DBSchema-0.31.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 03:46:34 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 21 Apr 2006 20:46:34 -0700
Subject: rpms/perl-DBIx-SearchBuilder/devel .cvsignore, 1.5,
	1.6 perl-DBIx-SearchBuilder.spec, 1.8, 1.9 sources, 1.5, 1.6
Message-ID: <200604220346.k3M3kaRa008417@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-serv8396

Modified Files:
	.cvsignore perl-DBIx-SearchBuilder.spec sources 
Log Message:
* Sat Apr 22 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.43-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Jan 2006 14:56:40 -0000	1.5
+++ .cvsignore	22 Apr 2006 03:46:34 -0000	1.6
@@ -1 +1 @@
-DBIx-SearchBuilder-1.38.tar.gz
+DBIx-SearchBuilder-1.43.tar.gz


Index: perl-DBIx-SearchBuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/devel/perl-DBIx-SearchBuilder.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-DBIx-SearchBuilder.spec	28 Feb 2006 23:19:32 -0000	1.8
+++ perl-DBIx-SearchBuilder.spec	22 Apr 2006 03:46:34 -0000	1.9
@@ -6,8 +6,8 @@
 #
 
 Name: 		perl-DBIx-SearchBuilder
-Version: 	1.38
-Release: 	2%{?dist}
+Version: 	1.43
+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
+* Sat Apr 22 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.43-1
+- Upstream update.
+
 * Wed Mar 01 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.38-2
 - Rebuild for perl-5.8.8.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Jan 2006 14:56:40 -0000	1.5
+++ sources	22 Apr 2006 03:46:34 -0000	1.6
@@ -1 +1 @@
-409f13913799709b890583535cd18446  DBIx-SearchBuilder-1.38.tar.gz
+3d4c4dfc46617f87f53645241288505f  DBIx-SearchBuilder-1.43.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 03:58:06 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 21 Apr 2006 20:58:06 -0700
Subject: rpms/perl-DBIx-SearchBuilder/FC-5 .cvsignore, 1.5,
	1.6 perl-DBIx-SearchBuilder.spec, 1.8, 1.9 sources, 1.5, 1.6
Message-ID: <200604220358.k3M3w8xM008501@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-serv8480

Modified Files:
	.cvsignore perl-DBIx-SearchBuilder.spec sources 
Log Message:
clog


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Jan 2006 14:56:40 -0000	1.5
+++ .cvsignore	22 Apr 2006 03:58:06 -0000	1.6
@@ -1 +1 @@
-DBIx-SearchBuilder-1.38.tar.gz
+DBIx-SearchBuilder-1.43.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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- perl-DBIx-SearchBuilder.spec	28 Feb 2006 23:19:32 -0000	1.8
+++ perl-DBIx-SearchBuilder.spec	22 Apr 2006 03:58:06 -0000	1.9
@@ -6,8 +6,8 @@
 #
 
 Name: 		perl-DBIx-SearchBuilder
-Version: 	1.38
-Release: 	2%{?dist}
+Version: 	1.43
+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
+* Sat Apr 22 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.43-1
+- Upstream update.
+
 * Wed Mar 01 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.38-2
 - Rebuild for perl-5.8.8.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Jan 2006 14:56:40 -0000	1.5
+++ sources	22 Apr 2006 03:58:06 -0000	1.6
@@ -1 +1 @@
-409f13913799709b890583535cd18446  DBIx-SearchBuilder-1.38.tar.gz
+3d4c4dfc46617f87f53645241288505f  DBIx-SearchBuilder-1.43.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 04:01:57 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 21 Apr 2006 21:01:57 -0700
Subject: rpms/perl-DBIx-SearchBuilder/FC-4 .cvsignore, 1.3,
	1.4 perl-DBIx-SearchBuilder.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200604220402.k3M42U7i010642@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-DBIx-SearchBuilder/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10619

Modified Files:
	.cvsignore perl-DBIx-SearchBuilder.spec sources 
Log Message:
* Sat Apr 22 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.43-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Jan 2006 06:24:51 -0000	1.3
+++ .cvsignore	22 Apr 2006 04:01:54 -0000	1.4
@@ -1 +1 @@
-DBIx-SearchBuilder-1.38.tar.gz
+DBIx-SearchBuilder-1.43.tar.gz


Index: perl-DBIx-SearchBuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/FC-4/perl-DBIx-SearchBuilder.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-DBIx-SearchBuilder.spec	15 Jan 2006 06:24:51 -0000	1.3
+++ perl-DBIx-SearchBuilder.spec	22 Apr 2006 04:01:54 -0000	1.4
@@ -6,7 +6,7 @@
 #
 
 Name: 		perl-DBIx-SearchBuilder
-Version: 	1.38
+Version: 	1.43
 Release: 	1%{?dist}
 Summary: 	Encapsulate SQL queries and rows in simple perl objects
 License: 	GPL or Artistic
@@ -94,6 +94,9 @@
 %endif
 
 %changelog
+* Sat Apr 22 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.43-1
+- Upstream update.
+
 * Sun Jan 15 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.38-1
 - Update to 1.38.
 - Add a private copy of Test-Simple-0.62 to work around PR #166475.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBIx-SearchBuilder/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Jan 2006 06:24:51 -0000	1.3
+++ sources	22 Apr 2006 04:01:54 -0000	1.4
@@ -1 +1 @@
-409f13913799709b890583535cd18446  DBIx-SearchBuilder-1.38.tar.gz
+3d4c4dfc46617f87f53645241288505f  DBIx-SearchBuilder-1.43.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 04:23:12 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Fri, 21 Apr 2006 21:23:12 -0700
Subject: rpms/perl-Locale-Maketext-Lexicon/devel .cvsignore, 1.5,
	1.6 perl-Locale-Maketext-Lexicon.spec, 1.7, 1.8 sources, 1.5, 1.6
Message-ID: <200604220423.k3M4NE5g010801@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10780

Modified Files:
	.cvsignore perl-Locale-Maketext-Lexicon.spec sources 
Log Message:
* Sat Apr 22 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.60-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	19 Mar 2006 02:52:18 -0000	1.5
+++ .cvsignore	22 Apr 2006 04:23:12 -0000	1.6
@@ -1 +1 @@
-Locale-Maketext-Lexicon-0.54.tar.gz
+Locale-Maketext-Lexicon-0.60.tar.gz


Index: perl-Locale-Maketext-Lexicon.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel/perl-Locale-Maketext-Lexicon.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Locale-Maketext-Lexicon.spec	19 Mar 2006 02:52:18 -0000	1.7
+++ perl-Locale-Maketext-Lexicon.spec	22 Apr 2006 04:23:12 -0000	1.8
@@ -1,5 +1,5 @@
 Name: 		perl-Locale-Maketext-Lexicon
-Version: 	0.54
+Version: 	0.60
 Release: 	1%{?dist}
 Summary: 	Extract translatable strings from source
 License:	GPL or Artistic
@@ -55,6 +55,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Sat Apr 22 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.60-1
+- Upstream update.
+
 * Sun Mar 19 2006 Ralf Cors??pius <rc040203 at freenet.de> - 0.54-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Locale-Maketext-Lexicon/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	19 Mar 2006 02:52:18 -0000	1.5
+++ sources	22 Apr 2006 04:23:12 -0000	1.6
@@ -1 +1 @@
-2adcb8651081bcb07629305f8b5e8f71  Locale-Maketext-Lexicon-0.54.tar.gz
+242998c3f513999d2e57c396647f0bd2  Locale-Maketext-Lexicon-0.60.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 07:07:31 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sat, 22 Apr 2006 00:07:31 -0700
Subject: owners owners.list,1.871,1.872
Message-ID: <200604220707.k3M77XRW017475@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17458

Modified Files:
	owners.list 
Log Message:
Echoping added



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.871
retrieving revision 1.872
diff -u -r1.871 -r1.872
--- owners.list	21 Apr 2006 23:13:28 -0000	1.871
+++ owners.list	22 Apr 2006 07:07:30 -0000	1.872
@@ -215,6 +215,7 @@
 Fedora Extras|dynamite|Extract data compressed with PKWARE Data Compression Library|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|easytag|Tag editor for MP3, MP2, FLAC and OGG files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|ebtables|Ethernet Bridge frame table administration tool|tcallawa at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|echoping|TCP "echo" performance test|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|ecl|Embeddable Common-Lisp|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|ecore|An event and X abstraction layer|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|edb|A database convenience library wrapped around BDB|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Apr 22 07:08:51 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sat, 22 Apr 2006 00:08:51 -0700
Subject: rpms/echoping - New directory
Message-ID: <200604220708.k3M78rT8017550@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/echoping
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17529/echoping

Log Message:
Directory /cvs/extras/rpms/echoping added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 22 07:08:51 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sat, 22 Apr 2006 00:08:51 -0700
Subject: rpms/echoping/devel - New directory
Message-ID: <200604220708.k3M78rCB017553@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/echoping/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17529/echoping/devel

Log Message:
Directory /cvs/extras/rpms/echoping/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 22 07:09:10 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sat, 22 Apr 2006 00:09:10 -0700
Subject: rpms/echoping Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604220709.k3M79CUg017607@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/echoping
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17574

Added Files:
	Makefile import.log 
Log Message:
Setup of module echoping


--- NEW FILE Makefile ---
# Top level Makefile for module echoping
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 22 07:09:11 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sat, 22 Apr 2006 00:09:11 -0700
Subject: rpms/echoping/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604220709.k3M79DIc017610@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/echoping/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17574/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module echoping


--- 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 Apr 22 07:09:40 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sat, 22 Apr 2006 00:09:40 -0700
Subject: rpms/echoping import.log,1.1,1.2
Message-ID: <200604220709.k3M79gIG017673@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/echoping
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17638

Modified Files:
	import.log 
Log Message:
auto-import echoping-5.2.0-1 on branch devel from echoping-5.2.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/echoping/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Apr 2006 07:09:10 -0000	1.1
+++ import.log	22 Apr 2006 07:09:40 -0000	1.2
@@ -0,0 +1 @@
+echoping-5_2_0-1:HEAD:echoping-5.2.0-1.src.rpm:1145689773



From fedora-extras-commits at redhat.com  Sat Apr 22 07:09:41 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sat, 22 Apr 2006 00:09:41 -0700
Subject: rpms/echoping/devel echoping.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604220709.k3M79hMx017678@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/echoping/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17638/devel

Modified Files:
	.cvsignore sources 
Added Files:
	echoping.spec 
Log Message:
auto-import echoping-5.2.0-1 on branch devel from echoping-5.2.0-1.src.rpm


--- NEW FILE echoping.spec ---
Summary: TCP "echo" performance test
Name: echoping
Version: 5.2.0
Release: 1%{?dist}
License: GPL
Group: Applications/Internet
Source0: ftp://ftp.internatif.org/pub/unix/echoping/echoping-%{version}.tar.gz
URL: http://echoping.sourceforge.net/
BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: openssl-devel, libidn-devel

%description
"echoping" is a small program to test (approximatively) performances of a
remote host by sending it TCP "echo" (or other protocol, such as HTTP)
packets.

%prep
%setup -q

%build
%configure \
	--enable-icp \
	--enable-http \
	--enable-smtp \
	--disable-ttcp \
	--enable-tos \
	--enable-priority \
 	--with-libidn \
	--with-ssl \
	--without-gnutls

%{__make} %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

%clean
rm -rf %{buildroot}

%files
%defattr(-, root, root, -)
%doc AUTHORS COPYING ChangeLog README TODO DETAILS
%{_bindir}/echoping
%{_mandir}/man1/echoping.1*

%changelog
* Wed Mar 13 2006 Andreas Thienemann <andreas at bawue.net> 5.2.0-1
- Initial FE release.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/echoping/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Apr 2006 07:09:11 -0000	1.1
+++ .cvsignore	22 Apr 2006 07:09:41 -0000	1.2
@@ -0,0 +1 @@
+echoping-5.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/echoping/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Apr 2006 07:09:11 -0000	1.1
+++ sources	22 Apr 2006 07:09:41 -0000	1.2
@@ -0,0 +1 @@
+aef46a1d09a1083e99eb5e18e9184af2  echoping-5.2.0.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 07:13:00 2006
From: fedora-extras-commits at redhat.com (Jindrich Novy (jnovy))
Date: Sat, 22 Apr 2006 00:13:00 -0700
Subject: owners owners.list,1.872,1.873
Message-ID: <200604220713.k3M7D2Ek017790@cvs-int.fedora.redhat.com>

Author: jnovy

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17766/owners

Modified Files:
	owners.list 
Log Message:
Add bsdiff



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.872
retrieving revision 1.873
diff -u -r1.872 -r1.873
--- owners.list	22 Apr 2006 07:07:30 -0000	1.872
+++ owners.list	22 Apr 2006 07:13:00 -0000	1.873
@@ -91,6 +91,7 @@
 Fedora Extras|bochs|Bochs Project x86 PC Emulator|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|bonnie++|Bonnie++ filesystem and disk benchmark & burn-in suite|wtogami at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|brightside|Add reactivity to the corners and edges of your GNOME desktop|fedora at leemhuis.info|extras-qa at fedoraproject.org|
+Fedora Extras|bsdiff|Binary diff/patch utility|jnovy at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|bubblemon|A system monitoring dockapp|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|buildsystem|Fedora-Extras Buildsystem|skvidal at phy.duke.edu|extras-qa at fedoraproject.org|
 Fedora Extras|buoh|Online comics reader|chabotc at xs4all.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Apr 22 07:41:24 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 22 Apr 2006 00:41:24 -0700
Subject: rpms/koffice/FC-4 koffice.spec,1.12,1.13
Message-ID: <200604220741.k3M7fQWd017985@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17935/FC-4

Modified Files:
	koffice.spec 
Log Message:
- fix exclude



Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-4/koffice.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- koffice.spec	16 Apr 2006 22:05:51 -0000	1.12
+++ koffice.spec	22 Apr 2006 07:41:24 -0000	1.13
@@ -526,8 +526,6 @@
 %{_datadir}/apps/kross
 %{_libdir}/kde3/krosspython.*
 %{_libdir}/kde3/krossruby.*
-# why is this still here on fc5 and not on devel?
-%exclude %{_datadir}/mimelnk/image/x-raw.desktop
 
 %files devel
 %{_includedir}/*



From fedora-extras-commits at redhat.com  Sat Apr 22 07:41:25 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 22 Apr 2006 00:41:25 -0700
Subject: rpms/koffice/devel koffice.spec,1.34,1.35
Message-ID: <200604220741.k3M7fR7h017991@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17935/devel

Modified Files:
	koffice.spec 
Log Message:
- fix exclude



Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/devel/koffice.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- koffice.spec	16 Apr 2006 22:05:52 -0000	1.34
+++ koffice.spec	22 Apr 2006 07:41:25 -0000	1.35
@@ -527,8 +527,6 @@
 %{_datadir}/apps/kross
 %{_libdir}/kde3/krosspython.*
 %{_libdir}/kde3/krossruby.*
-# why is this still here on fc5 and not on devel?
-%exclude %{_datadir}/mimelnk/image/x-raw.desktop
 
 %files devel
 %{_includedir}/*



From fedora-extras-commits at redhat.com  Sat Apr 22 07:41:25 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 22 Apr 2006 00:41:25 -0700
Subject: rpms/koffice/FC-5 koffice.spec,1.35,1.36
Message-ID: <200604220741.k3M7fRmL017989@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/koffice/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17935/FC-5

Modified Files:
	koffice.spec 
Log Message:
- fix exclude



Index: koffice.spec
===================================================================
RCS file: /cvs/extras/rpms/koffice/FC-5/koffice.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- koffice.spec	16 Apr 2006 22:05:51 -0000	1.35
+++ koffice.spec	22 Apr 2006 07:41:24 -0000	1.36
@@ -527,8 +527,6 @@
 %{_datadir}/apps/kross
 %{_libdir}/kde3/krosspython.*
 %{_libdir}/kde3/krossruby.*
-# why is this still here on fc5 and not on devel?
-%exclude %{_datadir}/mimelnk/image/x-raw.desktop
 
 %files devel
 %{_includedir}/*



From fedora-extras-commits at redhat.com  Sat Apr 22 09:30:51 2006
From: fedora-extras-commits at redhat.com (Andreas Bierfert (awjb))
Date: Sat, 22 Apr 2006 02:30:51 -0700
Subject: rpms/scribus/devel .cvsignore, 1.8, 1.9 scribus.spec, 1.18,
	1.19 sources, 1.8, 1.9
Message-ID: <200604220930.k3M9Ursb022697@cvs-int.fedora.redhat.com>

Author: awjb

Update of /cvs/extras/rpms/scribus/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22676

Modified Files:
	.cvsignore scribus.spec sources 
Log Message:
- version upgrade



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/scribus/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	30 Mar 2006 05:39:42 -0000	1.8
+++ .cvsignore	22 Apr 2006 09:30:51 -0000	1.9
@@ -1 +1 @@
-scribus-1.3.3.tar.bz2
+scribus-1.3.3.1.tar.bz2


Index: scribus.spec
===================================================================
RCS file: /cvs/extras/rpms/scribus/devel/scribus.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- scribus.spec	30 Mar 2006 07:10:48 -0000	1.18
+++ scribus.spec	22 Apr 2006 09:30:51 -0000	1.19
@@ -1,5 +1,5 @@
 Name:           scribus
-Version:        1.3.3
+Version:        1.3.3.1
 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://www.scribus.org.uk/downloads/1.3.3/scribus-1.3.3.tar.bz2
+Source0:        http://dl.sf.net/scribus/scribus-1.3.3.1.tar.bz2
 Source1:        scribus.xml
 Source2:	scribus.desktop
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -137,6 +137,10 @@
 
 
 %changelog
+* Sat Apr 22 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+1.3.3.1-1
+- version upgrade
+
 * Tue Mar 28 2006 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 1.3.3-1
 - version upgrade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/scribus/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	30 Mar 2006 05:39:42 -0000	1.8
+++ sources	22 Apr 2006 09:30:51 -0000	1.9
@@ -1 +1 @@
-3d1dc7f13573243569b18239149b4e6c  scribus-1.3.3.tar.bz2
+73864eea86de686904f4741ef35152ca  scribus-1.3.3.1.tar.bz2



From fedora-extras-commits at redhat.com  Sat Apr 22 13:08:42 2006
From: fedora-extras-commits at redhat.com (Gijs Hollestelle (gijs))
Date: Sat, 22 Apr 2006 06:08:42 -0700
Subject: rpms/python-cherrypy/devel .cvsignore, 1.5,
	1.6 python-cherrypy-regression-test.patch, 1.2,
	1.3 python-cherrypy-tutorial-doc.patch, 1.4,
	1.5 python-cherrypy.spec, 1.6, 1.7 sources, 1.5, 1.6
Message-ID: <200604221308.k3MD8jwc032358@cvs-int.fedora.redhat.com>

Author: gijs

Update of /cvs/extras/rpms/python-cherrypy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32327

Modified Files:
	.cvsignore python-cherrypy-regression-test.patch 
	python-cherrypy-tutorial-doc.patch python-cherrypy.spec 
	sources 
Log Message:
* Sat Apr 22 2006 Gijs Hollestelle <gijs at gewis.nl> 2.2.0-1
- Update to 2.2.0




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-cherrypy/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	21 Feb 2006 22:36:02 -0000	1.5
+++ .cvsignore	22 Apr 2006 13:08:42 -0000	1.6
@@ -1 +1 @@
-CherryPy-2.1.1.tar.gz
+CherryPy-2.2.0.tar.gz

python-cherrypy-regression-test.patch:

Index: python-cherrypy-regression-test.patch
===================================================================
RCS file: /cvs/extras/rpms/python-cherrypy/devel/python-cherrypy-regression-test.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-cherrypy-regression-test.patch	1 Nov 2005 11:58:15 -0000	1.2
+++ python-cherrypy-regression-test.patch	22 Apr 2006 13:08:42 -0000	1.3
@@ -1,11 +1,10 @@
---- CherryPy-2.1.0/cherrypy/test/test.py-orig	2005-10-21 15:43:04.000000000 +0200
-+++ CherryPy-2.1.0/cherrypy/test/test.py	2005-11-01 12:06:51.000000000 +0100
-@@ -350,7 +350,7 @@
-     CPTestHarness(testList).run()
-     
-     print
--    raw_input('hit enter')
-+
- 
- 
- if __name__ == '__main__':
+--- CherryPy-2.2.0/cherrypy/test/test.py.orig	2006-03-30 17:36:26.000000000 +0200
++++ CherryPy-2.2.0/cherrypy/test/test.py	2006-04-22 14:55:47.000000000 +0200
+@@ -311,7 +311,6 @@
+     CommandLineParser(testList).run()
+     
+     print
+-    raw_input('hit enter')
+ 
+ 
+ if __name__ == '__main__':

python-cherrypy-tutorial-doc.patch:

Index: python-cherrypy-tutorial-doc.patch
===================================================================
RCS file: /cvs/extras/rpms/python-cherrypy/devel/python-cherrypy-tutorial-doc.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- python-cherrypy-tutorial-doc.patch	21 Feb 2006 22:36:02 -0000	1.4
+++ python-cherrypy-tutorial-doc.patch	22 Apr 2006 13:08:42 -0000	1.5
@@ -1,11 +1,13 @@
---- CherryPy-2.1.1-orig/setup.py	2006-02-22 00:28:44.000000000 +0100
-+++ CherryPy-2.1.1/setup.py	2006-02-22 00:31:11.000000000 +0100
-@@ -35,21 +35,9 @@
+--- CherryPy-2.2.0/setup.py.orig	2006-04-22 15:04:08.000000000 +0200
++++ CherryPy-2.2.0/setup.py	2006-04-22 15:04:27.000000000 +0200
+@@ -36,23 +36,11 @@
  cp_license="BSD"
  packages=[
      "cherrypy", "cherrypy.lib", "cherrypy.lib.filter",
--    "cherrypy.tutorial", "cherrypy.test",
+-    "cherrypy.tutorial", "cherrypy.test", "cherrypy.filters",
++    "cherrypy.filters",
  ]
+ download_url="http://sourceforge.net/project/showfiles.php?group_id=56099"
  data_files=[
 -    ('cherrypy/tutorial',
 -        [
@@ -18,7 +20,8 @@
      ('cherrypy', ['cherrypy/favicon.ico',]),
 -    ('cherrypy/test', ['cherrypy/test/style.css',]),
 -    ('cherrypy/test/static', ['cherrypy/test/static/index.html',
--                              'cherrypy/test/static/has space.html',]),
+-                              'cherrypy/test/static/has space.html',
+-                              'cherrypy/test/static/dirback.jpg',]),
  ]
  ###############################################################################
  # end arguments for setup


Index: python-cherrypy.spec
===================================================================
RCS file: /cvs/extras/rpms/python-cherrypy/devel/python-cherrypy.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-cherrypy.spec	21 Feb 2006 22:36:02 -0000	1.6
+++ python-cherrypy.spec	22 Apr 2006 13:08:42 -0000	1.7
@@ -2,13 +2,13 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           python-cherrypy
-Version:        2.1.1
+Version:        2.2.0
 Release:        1%{?dist}
 Summary:        A pythonic, object-oriented web development framework
 Group:          Development/Libraries
 License:        BSD
 URL:            http://www.cherrypy.org/
-Source0:        http://dl.sf.net/cherrypy/CherryPy-2.1.1.tar.gz
+Source0:        http://dl.sf.net/cherrypy/CherryPy-2.2.0.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Patch0:         python-cherrypy-tutorial-doc.patch
 Patch1:         python-cherrypy-regression-test.patch
@@ -22,7 +22,7 @@
 results in smaller source code developed in less time.
 
 %prep
-%setup -q -n CherryPy-2.1.1
+%setup -q -n CherryPy-2.2.0
 %patch0 -p1 
 %patch1 -p1
 
@@ -58,8 +58,14 @@
 %{python_sitelib}/cherrypy/lib/filter/*.py
 %{python_sitelib}/cherrypy/lib/filter/*.pyc
 %ghost %{python_sitelib}/cherrypy/lib/filter/*.pyo
+%{python_sitelib}/cherrypy/filters/*.py
+%{python_sitelib}/cherrypy/filters/*.pyc
+%ghost %{python_sitelib}/cherrypy/filters/*.pyo
 
 %changelog
+* Sat Apr 22 2006 Gijs Hollestelle <gijs at gewis.nl> 2.2.0-1
+- Update to 2.2.0
+
 * Wed Feb 22 2006 Gijs Hollestelle <gijs at gewis.nl> 2.1.1-1
 - Update to 2.1.1 (Security fix)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-cherrypy/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	21 Feb 2006 22:36:02 -0000	1.5
+++ sources	22 Apr 2006 13:08:42 -0000	1.6
@@ -1 +1 @@
-f36d73a8c38c1444285b37c3451dce86  CherryPy-2.1.1.tar.gz
+13ea297f2f0c650cca856276a45ed29a  CherryPy-2.2.0.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 14:13:13 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sat, 22 Apr 2006 07:13:13 -0700
Subject: rpms/liferea/devel .cvsignore, 1.25, 1.26 liferea.spec, 1.37,
	1.38 sources, 1.26, 1.27
Message-ID: <200604221413.k3MEDFhR002292@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/liferea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2271

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
* Sat Apr 22 2006 Brian Pepple <bdpepple at ameritech.net> - 1.0.10-3
- Update to 1.0.10,
- Delete origianl desktop file with desktop-file-install call.
- Remove *.la, instead of excluding.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	5 Apr 2006 17:38:50 -0000	1.25
+++ .cvsignore	22 Apr 2006 14:13:13 -0000	1.26
@@ -1 +1 @@
-liferea-1.0.9.tar.gz
+liferea-1.0.10.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/liferea.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- liferea.spec	5 Apr 2006 17:38:50 -0000	1.37
+++ liferea.spec	22 Apr 2006 14:13:13 -0000	1.38
@@ -1,7 +1,7 @@
 %define with_dbus 1
 
 Name:           liferea
-Version:        1.0.9
+Version:        1.0.10
 Release:        3%{?dist}
 Summary:        An RSS/RDF feed reader
 
@@ -56,11 +56,12 @@
 make install DESTDIR=${RPM_BUILD_ROOT}
 %find_lang %{name}
 
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
-desktop-file-install --vendor fedora			\
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
+
+desktop-file-install --vendor fedora --delete-original	\
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications   	\
   --add-category X-Fedora			        \
-  %{name}.desktop
+  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
 
 %clean
@@ -101,10 +102,14 @@
 %{_datadir}/pixmaps/%{name}.png
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/*.so*
-%exclude %{_libdir}/%{name}/*.la
 
 
 %changelog
+* Sat Apr 22 2006 Brian Pepple <bdpepple at ameritech.net> - 1.0.10-3
+- Update to 1.0.10,
+- Delete origianl desktop file with desktop-file-install call.
+- Remove *.la, instead of excluding.
+
 * Wed Apr  5 2006 Brian Pepple <bdpepple at ameritech.net> - 1.0.9-3
 - Update to 1.0.9.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liferea/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	5 Apr 2006 17:38:50 -0000	1.26
+++ sources	22 Apr 2006 14:13:13 -0000	1.27
@@ -1 +1 @@
-60f743fcb41876ad2d02f6da88251c31  liferea-1.0.9.tar.gz
+41201991b4d7a113169ebda3e7dc54ef  liferea-1.0.10.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 14:17:53 2006
From: fedora-extras-commits at redhat.com (Damian Myerscough (damian))
Date: Sat, 22 Apr 2006 07:17:53 -0700
Subject: hwtracker - Imported sources
Message-ID: <200604221417.k3MEHrMH002468@cvs-int.fedora.redhat.com>

Author: damian

Update of /cvs/devel/hwtracker
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2442

Log Message:
Hardware Tracker

Status:

Vendor Tag:	hwtracker
Release Tags:	start
		
N hwtracker/main.c
N hwtracker/xml.c
N hwtracker/hal-device
N hwtracker/.devs.xml.swo
N hwtracker/.devs.xml.swp
N hwtracker/devs.xml
N hwtracker/.xml.h.swp
N hwtracker/xml.h

No conflicts created by this import




From fedora-extras-commits at redhat.com  Sat Apr 22 14:21:26 2006
From: fedora-extras-commits at redhat.com (Damian Myerscough (damian))
Date: Sat, 22 Apr 2006 07:21:26 -0700
Subject: hwtracker hal-device,1.1.1.1,NONE
Message-ID: <200604221421.k3MELQSh002789@cvs-int.fedora.redhat.com>

Author: damian

Update of /cvs/devel/hwtracker
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2743

Removed Files:
	hal-device 
Log Message:



--- hal-device DELETED ---



From fedora-extras-commits at redhat.com  Sat Apr 22 14:48:25 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 22 Apr 2006 07:48:25 -0700
Subject: rpms/poker-eval - New directory
Message-ID: <200604221448.k3MEmRS6003337@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/poker-eval
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3311/poker-eval

Log Message:
Directory /cvs/extras/rpms/poker-eval added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 22 14:48:26 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 22 Apr 2006 07:48:26 -0700
Subject: rpms/poker-eval/devel - New directory
Message-ID: <200604221448.k3MEmSOs003340@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/poker-eval/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3311/poker-eval/devel

Log Message:
Directory /cvs/extras/rpms/poker-eval/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 22 14:48:45 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 22 Apr 2006 07:48:45 -0700
Subject: rpms/poker-eval Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604221448.k3MEmloo003385@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/poker-eval
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3357

Added Files:
	Makefile import.log 
Log Message:
Setup of module poker-eval


--- NEW FILE Makefile ---
# Top level Makefile for module poker-eval
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 22 14:48:46 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 22 Apr 2006 07:48:46 -0700
Subject: rpms/poker-eval/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604221448.k3MEmm7G003388@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/poker-eval/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3357/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module poker-eval


--- 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 Apr 22 14:49:20 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 22 Apr 2006 07:49:20 -0700
Subject: rpms/poker-eval import.log,1.1,1.2
Message-ID: <200604221449.k3MEnqeu003463@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/poker-eval
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3426

Modified Files:
	import.log 
Log Message:
auto-import poker-eval-130.0-2 on branch devel from poker-eval-130.0-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/poker-eval/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Apr 2006 14:48:45 -0000	1.1
+++ import.log	22 Apr 2006 14:49:19 -0000	1.2
@@ -0,0 +1 @@
+poker-eval-130_0-2:HEAD:poker-eval-130.0-2.src.rpm:1145717353



From fedora-extras-commits at redhat.com  Sat Apr 22 14:49:20 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 22 Apr 2006 07:49:20 -0700
Subject: rpms/poker-eval/devel poker-eval.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604221449.k3MEnqt1003467@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/poker-eval/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3426/devel

Modified Files:
	.cvsignore sources 
Added Files:
	poker-eval.spec 
Log Message:
auto-import poker-eval-130.0-2 on branch devel from poker-eval-130.0-2.src.rpm


--- NEW FILE poker-eval.spec ---
Name:           poker-eval
Version:	130.0
Release:        2%{?dist}
Summary:        Poker hand evaluator library
Group:          Development/Libraries
License:        GPL
URL:            https://gna.org/projects/pokersource/
Source0:        http://download.gna.org/pokersource/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
This package is a free (GPL) toolkit for writing programs which
simulate or analyze poker games.

%package devel
Summary:        Poker hand evaluator library development files
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}

%description devel
This package contains headers and libraries required to build applications that
use poker-eval.

%prep
%setup -q
chmod -x examples/five_card_hands.c

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

%check
make %{?_smp_mflags} check

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING NEWS README TODO
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc examples/*.c
%{_includedir}/%{name}
%{_libdir}/*.so
%{_libdir}/pkgconfig/%{name}.pc
%exclude %{_libdir}/*.la

%changelog
* Tue Apr 18 2006 Christopher Stone <chris.stone at gmail.com> 130.0-2
- Added %check section
- Removed make build_tables
- Updated Source0 and URL

* Thu Mar 30 2006 Loic Dachary <loic at gnu.org> - 130.0-1
- upstream sync

* Sat Mar 18 2006 Christopher Stone <chris.stone at gmail.com> 129.0-1
- Initial RPM release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/poker-eval/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Apr 2006 14:48:46 -0000	1.1
+++ .cvsignore	22 Apr 2006 14:49:20 -0000	1.2
@@ -0,0 +1 @@
+poker-eval-130.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/poker-eval/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Apr 2006 14:48:46 -0000	1.1
+++ sources	22 Apr 2006 14:49:20 -0000	1.2
@@ -0,0 +1 @@
+b6feea367ba1c49d85fb04cf5913e2d9  poker-eval-130.0.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 14:52:48 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 22 Apr 2006 07:52:48 -0700
Subject: owners owners.list,1.873,1.874
Message-ID: <200604221452.k3MEqoN3003534@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3517

Modified Files:
	owners.list 
Log Message:
Add poker-eval


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.873
retrieving revision 1.874
diff -u -r1.873 -r1.874
--- owners.list	22 Apr 2006 07:13:00 -0000	1.873
+++ owners.list	22 Apr 2006 14:52:47 -0000	1.874
@@ -1195,6 +1195,7 @@
 Fedora Extras|plone|User friendly and powerful open source Content Management System|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|plplot|Library of functions for making scientific plots|orion at cora.nwra.com|extras-qa at fedoraproject.org|
 Fedora Extras|plt-scheme|Graphical environment for developing programs using Scheme|gemi at bluewin.ch|extras-qa at fedoraproject.org|
+Fedora Extras|poker-eval|Poker hand evaluator library|tkmame at retrogames.com|extras-qa at fedoraproject.org|loic at gnu.org
 Fedora Extras|polyxmass-bin|The GNU polyxmass software suite|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|polyxmass-common|Contains all textual/graphical data required for polyxmass|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|polyxmass-data|Contains configuration files describing polymer chemistry|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Apr 22 15:42:38 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 22 Apr 2006 08:42:38 -0700
Subject: rpms/evas/FC-5 evas.spec,1.4,1.5
Message-ID: <200604221543.k3MFhAAs005785@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/evas/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5753/FC-5

Modified Files:
	evas.spec 
Log Message:
- Split out edb and directfb packages
- Added upstream Provides
- Enabled fontconfig font searching



Index: evas.spec
===================================================================
RCS file: /cvs/extras/rpms/evas/FC-5/evas.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- evas.spec	18 Apr 2006 12:45:23 -0000	1.4
+++ evas.spec	22 Apr 2006 15:42:38 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           evas
 Version:        0.9.9.026
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A hardware-accelerated canvas API
 
 Group:          System Environment/Libraries
@@ -14,7 +14,20 @@
 BuildRequires:  libjpeg-devel
 BuildRequires:  xorg-x11-proto-devel libX11-devel libXext-devel
 BuildRequires:  libXrender-devel mesa-libGL-devel mesa-libGLU-devel
-BuildRequires:  libICE-devel
+BuildRequires:  libICE-devel fontconfig-devel
+#BuildRequires:  cairo-devel
+
+Provides:       %{name}-module_loader_eet = %{version}-%{release}
+Provides:       %{name}-module_saver_eet = %{version}-%{release}
+Provides:       %{name}-module_loader_jpeg = %{version}-%{release}
+Provides:       %{name}-module_saver_jpeg = %{version}-%{release}
+Provides:       %{name}-module_loader_png = %{version}-%{release}
+Provides:       %{name}-module_saver_png = %{version}-%{release}
+#Provides:       %{name}-module_engine_cairo_x11 = %{version}-%{release}
+Provides:       %{name}-module_engine_fb = %{version}-%{release}
+Provides:       %{name}-module_engine_gl_x11 = %{version}-%{release}
+Provides:       %{name}-module_engine_software_x11 = %{version}-%{release}
+Provides:       %{name}-module_engine_xrender_x11 = %{version}-%{release}
 
 %description
 Evas is a hardware-accelerated canvas API for X-Windows that can draw
@@ -36,6 +49,25 @@
 The evas-devel package contains libraries and header files for developing
 evas applications.
 
+%package        directfb
+Summary:        evas support for DirectFB
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+Provides:       %{name}-module_engine_directfb = %{version}-%{release}
+
+%description    directfb
+This package contains the DirectFB engine for evas.
+
+%package        edb
+Summary:        evas support for edb
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+Provides:       %{name}-module_loader_edb = %{version}-%{release}
+Provides:       %{name}-module_saver_edb = %{version}-%{release}
+
+%description    edb
+This package contains the edb loader and saver for evas.
+
 %prep
 %setup -q
 %patch -p 1 -b .novera
@@ -59,12 +91,30 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING-PLAIN README
-%{_bindir}/*_load
-%{_bindir}/*_test
-%{_bindir}/*_window
+%{_bindir}/%{name}_buffer*
+%{_bindir}/%{name}_fb*
+%{_bindir}/%{name}_gl_x11*
+%{_bindir}/%{name}_software_x11*
+%{_bindir}/%{name}_xrender_x11*
 %{_datadir}/%{name}
 %{_libdir}/*.so.*
-%{_libdir}/%{name}
+%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/modules
+%dir %{_libdir}/%{name}/modules/engines
+%dir %{_libdir}/%{name}/modules/loaders
+%dir %{_libdir}/%{name}/modules/savers
+%{_libdir}/%{name}/modules/engines/buffer
+%{_libdir}/%{name}/modules/engines/fb
+%{_libdir}/%{name}/modules/engines/gl_x11
+%{_libdir}/%{name}/modules/engines/software_generic
+%{_libdir}/%{name}/modules/engines/software_x11
+%{_libdir}/%{name}/modules/engines/xrender_x11
+%{_libdir}/%{name}/modules/loaders/eet
+%{_libdir}/%{name}/modules/loaders/jpeg
+%{_libdir}/%{name}/modules/loaders/png
+%{_libdir}/%{name}/modules/savers/eet
+%{_libdir}/%{name}/modules/savers/jpeg
+%{_libdir}/%{name}/modules/savers/png
 
 %files devel
 %defattr(-,root,root,-)
@@ -74,7 +124,24 @@
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 
+%files directfb
+%defattr(-,root,root,-)
+%doc
+%{_bindir}/evas_directfb*
+%{_libdir}/%{name}/modules/engines/directfb
+
+%files edb
+%defattr(-,root,root,-)
+%doc
+%{_libdir}/%{name}/modules/loaders/edb
+%{_libdir}/%{name}/modules/savers/edb
+
 %changelog
+* Sat Apr 22 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.9.026-2
+- Split out edb and directfb packages
+- Added upstream Provides
+- Enabled fontconfig font searching
+
 * Tue Apr 18 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.9.026-1
 - Upstream update
 



From fedora-extras-commits at redhat.com  Sat Apr 22 15:42:39 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 22 Apr 2006 08:42:39 -0700
Subject: rpms/evas/devel evas.spec,1.4,1.5
Message-ID: <200604221543.k3MFhBSO005788@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/evas/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5753/devel

Modified Files:
	evas.spec 
Log Message:
- Split out edb and directfb packages
- Added upstream Provides
- Enabled fontconfig font searching



Index: evas.spec
===================================================================
RCS file: /cvs/extras/rpms/evas/devel/evas.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- evas.spec	18 Apr 2006 12:45:24 -0000	1.4
+++ evas.spec	22 Apr 2006 15:42:39 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           evas
 Version:        0.9.9.026
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A hardware-accelerated canvas API
 
 Group:          System Environment/Libraries
@@ -14,7 +14,20 @@
 BuildRequires:  libjpeg-devel
 BuildRequires:  xorg-x11-proto-devel libX11-devel libXext-devel
 BuildRequires:  libXrender-devel mesa-libGL-devel mesa-libGLU-devel
-BuildRequires:  libICE-devel
+BuildRequires:  libICE-devel fontconfig-devel
+#BuildRequires:  cairo-devel
+
+Provides:       %{name}-module_loader_eet = %{version}-%{release}
+Provides:       %{name}-module_saver_eet = %{version}-%{release}
+Provides:       %{name}-module_loader_jpeg = %{version}-%{release}
+Provides:       %{name}-module_saver_jpeg = %{version}-%{release}
+Provides:       %{name}-module_loader_png = %{version}-%{release}
+Provides:       %{name}-module_saver_png = %{version}-%{release}
+#Provides:       %{name}-module_engine_cairo_x11 = %{version}-%{release}
+Provides:       %{name}-module_engine_fb = %{version}-%{release}
+Provides:       %{name}-module_engine_gl_x11 = %{version}-%{release}
+Provides:       %{name}-module_engine_software_x11 = %{version}-%{release}
+Provides:       %{name}-module_engine_xrender_x11 = %{version}-%{release}
 
 %description
 Evas is a hardware-accelerated canvas API for X-Windows that can draw
@@ -36,6 +49,25 @@
 The evas-devel package contains libraries and header files for developing
 evas applications.
 
+%package        directfb
+Summary:        evas support for DirectFB
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+Provides:       %{name}-module_engine_directfb = %{version}-%{release}
+
+%description    directfb
+This package contains the DirectFB engine for evas.
+
+%package        edb
+Summary:        evas support for edb
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+Provides:       %{name}-module_loader_edb = %{version}-%{release}
+Provides:       %{name}-module_saver_edb = %{version}-%{release}
+
+%description    edb
+This package contains the edb loader and saver for evas.
+
 %prep
 %setup -q
 %patch -p 1 -b .novera
@@ -59,12 +91,30 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYING-PLAIN README
-%{_bindir}/*_load
-%{_bindir}/*_test
-%{_bindir}/*_window
+%{_bindir}/%{name}_buffer*
+%{_bindir}/%{name}_fb*
+%{_bindir}/%{name}_gl_x11*
+%{_bindir}/%{name}_software_x11*
+%{_bindir}/%{name}_xrender_x11*
 %{_datadir}/%{name}
 %{_libdir}/*.so.*
-%{_libdir}/%{name}
+%dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/modules
+%dir %{_libdir}/%{name}/modules/engines
+%dir %{_libdir}/%{name}/modules/loaders
+%dir %{_libdir}/%{name}/modules/savers
+%{_libdir}/%{name}/modules/engines/buffer
+%{_libdir}/%{name}/modules/engines/fb
+%{_libdir}/%{name}/modules/engines/gl_x11
+%{_libdir}/%{name}/modules/engines/software_generic
+%{_libdir}/%{name}/modules/engines/software_x11
+%{_libdir}/%{name}/modules/engines/xrender_x11
+%{_libdir}/%{name}/modules/loaders/eet
+%{_libdir}/%{name}/modules/loaders/jpeg
+%{_libdir}/%{name}/modules/loaders/png
+%{_libdir}/%{name}/modules/savers/eet
+%{_libdir}/%{name}/modules/savers/jpeg
+%{_libdir}/%{name}/modules/savers/png
 
 %files devel
 %defattr(-,root,root,-)
@@ -74,7 +124,24 @@
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 
+%files directfb
+%defattr(-,root,root,-)
+%doc
+%{_bindir}/evas_directfb*
+%{_libdir}/%{name}/modules/engines/directfb
+
+%files edb
+%defattr(-,root,root,-)
+%doc
+%{_libdir}/%{name}/modules/loaders/edb
+%{_libdir}/%{name}/modules/savers/edb
+
 %changelog
+* Sat Apr 22 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.9.026-2
+- Split out edb and directfb packages
+- Added upstream Provides
+- Enabled fontconfig font searching
+
 * Tue Apr 18 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.9.026-1
 - Upstream update
 



From fedora-extras-commits at redhat.com  Sat Apr 22 19:52:31 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Sat, 22 Apr 2006 12:52:31 -0700
Subject: rpms/iperf/devel - New directory
Message-ID: <200604221952.k3MJqXKU015041@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/iperf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15017/iperf/devel

Log Message:
Directory /cvs/extras/rpms/iperf/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 22 19:52:30 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Sat, 22 Apr 2006 12:52:30 -0700
Subject: rpms/iperf - New directory
Message-ID: <200604221952.k3MJqWkK015038@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/iperf
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15017/iperf

Log Message:
Directory /cvs/extras/rpms/iperf added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 22 19:52:42 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Sat, 22 Apr 2006 12:52:42 -0700
Subject: rpms/iperf Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604221952.k3MJqici015097@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/iperf
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15064

Added Files:
	Makefile import.log 
Log Message:
Setup of module iperf


--- NEW FILE Makefile ---
# Top level Makefile for module iperf
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 22 19:52:43 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Sat, 22 Apr 2006 12:52:43 -0700
Subject: rpms/iperf/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200604221952.k3MJqjsS015102@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/iperf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15064/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module iperf


--- 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 Apr 22 19:52:56 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Sat, 22 Apr 2006 12:52:56 -0700
Subject: rpms/iperf import.log,1.1,1.2
Message-ID: <200604221952.k3MJqwjM015179@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/iperf
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15146

Modified Files:
	import.log 
Log Message:
auto-import iperf-2.0.2-1 on branch devel from iperf-2.0.2-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/iperf/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	22 Apr 2006 19:52:42 -0000	1.1
+++ import.log	22 Apr 2006 19:52:56 -0000	1.2
@@ -0,0 +1 @@
+iperf-2_0_2-1:HEAD:iperf-2.0.2-1.src.rpm:1145735573



From fedora-extras-commits at redhat.com  Sat Apr 22 19:52:57 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Sat, 22 Apr 2006 12:52:57 -0700
Subject: rpms/iperf/devel iperf.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200604221953.k3MJqxD2015184@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/rpms/iperf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15146/devel

Modified Files:
	.cvsignore sources 
Added Files:
	iperf.spec 
Log Message:
auto-import iperf-2.0.2-1 on branch devel from iperf-2.0.2-1.src.rpm


--- NEW FILE iperf.spec ---
Name: iperf
Version: 2.0.2
Release: 1%{?dist}
Summary: Measurement tool for TCP/UDP bandwidth performance
License: BSD
Group: Applications/Internet
URL: http://dast.nlanr.net/Projects/Iperf/
Source: http://dast.nlanr.net/Projects/Iperf2.0/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Iperf is a tool to measure maximum TCP bandwidth, allowing the tuning of
various parameters and UDP characteristics. Iperf reports bandwidth, delay
jitter, datagram loss.

%prep
%setup -q

%build
%configure
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
%makeinstall -C src INSTALL_DIR="%{buildroot}%{_bindir}"

%clean
%{__rm} -rf %{buildroot}

%files
%defattr(-,root,root)
%doc README doc/*.gif doc/*.html
%{_bindir}/iperf

%changelog
* Wed Apr 19 2006 Gabriel Somlo <somlo at cmu.edu> 2.0.2-1
- initial build for fedora extras (based on Dag Wieers SRPM)
- fixed license tag: BSD (U. of IL / NCSA), not GPL


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/iperf/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	22 Apr 2006 19:52:43 -0000	1.1
+++ .cvsignore	22 Apr 2006 19:52:57 -0000	1.2
@@ -0,0 +1 @@
+iperf-2.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/iperf/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	22 Apr 2006 19:52:43 -0000	1.1
+++ sources	22 Apr 2006 19:52:57 -0000	1.2
@@ -0,0 +1 @@
+bb658aba58a5af0356f5b1342dfe8f53  iperf-2.0.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 19:52:45 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 22 Apr 2006 12:52:45 -0700
Subject: rpms/poker-eval/devel poker-eval.spec,1.1,1.2
Message-ID: <200604221953.k3MJrH1I015213@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/poker-eval/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15101

Modified Files:
	poker-eval.spec 
Log Message:
Move .c files in samples/ dir for devel %doc


Index: poker-eval.spec
===================================================================
RCS file: /cvs/extras/rpms/poker-eval/devel/poker-eval.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- poker-eval.spec	22 Apr 2006 14:49:20 -0000	1.1
+++ poker-eval.spec	22 Apr 2006 19:52:45 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           poker-eval
 Version:	130.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Poker hand evaluator library
 Group:          Development/Libraries
 License:        GPL
@@ -23,8 +23,13 @@
 
 %prep
 %setup -q
+
+# rpmlint fix
 chmod -x examples/five_card_hands.c
 
+# use samples/ directory for devel package %doc section
+mkdir samples/ && cp examples/*.c samples/
+
 %build
 %configure --disable-static
 make %{?_smp_mflags}
@@ -49,13 +54,16 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc examples/*.c
+%doc samples
 %{_includedir}/%{name}
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/%{name}.pc
 %exclude %{_libdir}/*.la
 
 %changelog
+* Sat Apr 22 2006 Christopher Stone <chris.stone at gmail.com> 130.0-3
+- Copy .c files in samples directory and use this for devel's %doc
+
 * Tue Apr 18 2006 Christopher Stone <chris.stone at gmail.com> 130.0-2
 - Added %check section
 - Removed make build_tables



From fedora-extras-commits at redhat.com  Sat Apr 22 19:56:07 2006
From: fedora-extras-commits at redhat.com (Gabriel L. Somlo (somlo))
Date: Sat, 22 Apr 2006 12:56:07 -0700
Subject: owners owners.list,1.874,1.875
Message-ID: <200604221956.k3MJu9sJ015268@cvs-int.fedora.redhat.com>

Author: somlo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15247/owners

Modified Files:
	owners.list 
Log Message:
added entry for iperf



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.874
retrieving revision 1.875
diff -u -r1.874 -r1.875
--- owners.list	22 Apr 2006 14:52:47 -0000	1.874
+++ owners.list	22 Apr 2006 19:56:07 -0000	1.875
@@ -490,6 +490,7 @@
 Fedora Extras|Inventor|SGI Open Inventor (TM)|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|iozone|A file system performance analysis tool|nhorman at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|ip-sentinel|Tool to prevent unauthorized usage of IP addresses|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
+Fedora Extras|iperf|Measurement tool for TCP/UDP bandwidth performance|somlo at cmu.edu|extras-qa at fedoraproject.org|
 Fedora Extras|ipod-sharp|Provides high-level feature support for Apple's iPod and binds libipoddevice|caillon at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|ipxripd|IPX RIP/SAP daemon - routing for IPX networks|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|ipython|An enhanced interactive Python shell|shahms at shahms.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Apr 22 20:32:57 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 22 Apr 2006 13:32:57 -0700
Subject: rpms/pcsc-lite/FC-5 .cvsignore, 1.3, 1.4 pcsc-lite.spec, 1.8,
	1.9 sources, 1.3, 1.4
Message-ID: <200604222032.k3MKWxPS017560@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/pcsc-lite/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17523/FC-5

Modified Files:
	.cvsignore pcsc-lite.spec sources 
Log Message:
* Sat Apr 22 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.1-1
- 1.3.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pcsc-lite/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Mar 2006 15:27:11 -0000	1.3
+++ .cvsignore	22 Apr 2006 20:32:57 -0000	1.4
@@ -1 +1 @@
-pcsc-lite-1.3.0.tar.gz
+pcsc-lite-1.3.1.tar.gz


Index: pcsc-lite.spec
===================================================================
RCS file: /cvs/extras/rpms/pcsc-lite/FC-5/pcsc-lite.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pcsc-lite.spec	6 Mar 2006 15:27:15 -0000	1.8
+++ pcsc-lite.spec	22 Apr 2006 20:32:57 -0000	1.9
@@ -1,12 +1,12 @@
 Name:           pcsc-lite
-Version:        1.3.0
+Version:        1.3.1
 Release:        1%{?dist}
 Summary:        PC/SC Lite smart card framework and applications
 
 Group:          System Environment/Daemons
 License:        BSD
 URL:            http://pcsclite.alioth.debian.org/
-Source0:        https://alioth.debian.org/download.php/1472/%{name}-%{version}.tar.gz
+Source0:        http://alioth.debian.org/download.php/1565/%{name}-%{version}.tar.gz
 Patch0:         %{name}-docinst.patch
 Patch1:         %{name}-1.3.0-rpath64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -142,6 +142,9 @@
 
 
 %changelog
+* Sat Apr 22 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.1-1
+- 1.3.1.
+
 * Sun Mar  5 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.0-1
 - 1.3.0, init script and reader.conf updater included upstream.
 - Split developer docs into a -doc subpackage, include API docs.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pcsc-lite/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Mar 2006 15:27:15 -0000	1.3
+++ sources	22 Apr 2006 20:32:57 -0000	1.4
@@ -1 +1 @@
-ccbb595be0e1d47c9f9f449f183bea6c  pcsc-lite-1.3.0.tar.gz
+90fa7e9cdfdfe88fdf6644ca8b60a681  pcsc-lite-1.3.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 20:32:58 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 22 Apr 2006 13:32:58 -0700
Subject: rpms/pcsc-lite/devel .cvsignore, 1.3, 1.4 pcsc-lite.spec, 1.8,
	1.9 sources, 1.3, 1.4
Message-ID: <200604222033.k3MKX09q017566@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/pcsc-lite/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17523/devel

Modified Files:
	.cvsignore pcsc-lite.spec sources 
Log Message:
* Sat Apr 22 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.1-1
- 1.3.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pcsc-lite/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Mar 2006 15:27:11 -0000	1.3
+++ .cvsignore	22 Apr 2006 20:32:58 -0000	1.4
@@ -1 +1 @@
-pcsc-lite-1.3.0.tar.gz
+pcsc-lite-1.3.1.tar.gz


Index: pcsc-lite.spec
===================================================================
RCS file: /cvs/extras/rpms/pcsc-lite/devel/pcsc-lite.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pcsc-lite.spec	6 Mar 2006 15:27:15 -0000	1.8
+++ pcsc-lite.spec	22 Apr 2006 20:32:58 -0000	1.9
@@ -1,12 +1,12 @@
 Name:           pcsc-lite
-Version:        1.3.0
+Version:        1.3.1
 Release:        1%{?dist}
 Summary:        PC/SC Lite smart card framework and applications
 
 Group:          System Environment/Daemons
 License:        BSD
 URL:            http://pcsclite.alioth.debian.org/
-Source0:        https://alioth.debian.org/download.php/1472/%{name}-%{version}.tar.gz
+Source0:        http://alioth.debian.org/download.php/1565/%{name}-%{version}.tar.gz
 Patch0:         %{name}-docinst.patch
 Patch1:         %{name}-1.3.0-rpath64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -142,6 +142,9 @@
 
 
 %changelog
+* Sat Apr 22 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.1-1
+- 1.3.1.
+
 * Sun Mar  5 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.3.0-1
 - 1.3.0, init script and reader.conf updater included upstream.
 - Split developer docs into a -doc subpackage, include API docs.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pcsc-lite/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Mar 2006 15:27:15 -0000	1.3
+++ sources	22 Apr 2006 20:32:58 -0000	1.4
@@ -1 +1 @@
-ccbb595be0e1d47c9f9f449f183bea6c  pcsc-lite-1.3.0.tar.gz
+90fa7e9cdfdfe88fdf6644ca8b60a681  pcsc-lite-1.3.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 20:33:58 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 22 Apr 2006 13:33:58 -0700
Subject: rpms/ccid/FC-5 .cvsignore, 1.3, 1.4 ccid.spec, 1.6, 1.7 sources, 1.3,
	1.4
Message-ID: <200604222034.k3MKY0dC017685@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/ccid/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17648/FC-5

Modified Files:
	.cvsignore ccid.spec sources 
Log Message:
* Sat Apr 22 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.0.1-1
- 1.0.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ccid/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Mar 2006 15:39:09 -0000	1.3
+++ .cvsignore	22 Apr 2006 20:33:57 -0000	1.4
@@ -1 +1 @@
-ccid-1.0.0.tar.gz
+ccid-1.0.1.tar.gz


Index: ccid.spec
===================================================================
RCS file: /cvs/extras/rpms/ccid/FC-5/ccid.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ccid.spec	6 Mar 2006 15:39:09 -0000	1.6
+++ ccid.spec	22 Apr 2006 20:33:57 -0000	1.7
@@ -1,14 +1,14 @@
-%define dropdir %(pkg-config libpcsclite --variable usbdropdir)
+%define dropdir %(pkg-config libpcsclite --variable usbdropdir 2>/dev/null)
 
 Name:           ccid
-Version:        1.0.0
+Version:        1.0.1
 Release:        1%{?dist}
 Summary:        Generic USB CCID smart card reader driver
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://pcsclite.alioth.debian.org/ccid.html
-Source0:        https://alioth.debian.org/download.php/1474/%{name}-%{version}.tar.gz
+Source0:        http://alioth.debian.org/download.php/1563/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libusb-devel >= 0.1.7
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Sat Apr 22 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.0.1-1
+- 1.0.1.
+
 * Mon Mar  6 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.0.0-1
 - 1.0.0, license changed to LGPL.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ccid/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Mar 2006 15:39:09 -0000	1.3
+++ sources	22 Apr 2006 20:33:57 -0000	1.4
@@ -1 +1 @@
-cae1d55c3361d6202adfdbea9d4e94d7  ccid-1.0.0.tar.gz
+858bd7d680cdaf0ac53c70d43974a2df  ccid-1.0.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 20:33:58 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 22 Apr 2006 13:33:58 -0700
Subject: rpms/ccid/devel .cvsignore, 1.3, 1.4 ccid.spec, 1.6, 1.7 sources,
	1.3, 1.4
Message-ID: <200604222034.k3MKY0AG017691@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/ccid/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17648/devel

Modified Files:
	.cvsignore ccid.spec sources 
Log Message:
* Sat Apr 22 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.0.1-1
- 1.0.1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ccid/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Mar 2006 15:39:09 -0000	1.3
+++ .cvsignore	22 Apr 2006 20:33:58 -0000	1.4
@@ -1 +1 @@
-ccid-1.0.0.tar.gz
+ccid-1.0.1.tar.gz


Index: ccid.spec
===================================================================
RCS file: /cvs/extras/rpms/ccid/devel/ccid.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ccid.spec	6 Mar 2006 15:39:09 -0000	1.6
+++ ccid.spec	22 Apr 2006 20:33:58 -0000	1.7
@@ -1,14 +1,14 @@
-%define dropdir %(pkg-config libpcsclite --variable usbdropdir)
+%define dropdir %(pkg-config libpcsclite --variable usbdropdir 2>/dev/null)
 
 Name:           ccid
-Version:        1.0.0
+Version:        1.0.1
 Release:        1%{?dist}
 Summary:        Generic USB CCID smart card reader driver
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://pcsclite.alioth.debian.org/ccid.html
-Source0:        https://alioth.debian.org/download.php/1474/%{name}-%{version}.tar.gz
+Source0:        http://alioth.debian.org/download.php/1563/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libusb-devel >= 0.1.7
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Sat Apr 22 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.0.1-1
+- 1.0.1.
+
 * Mon Mar  6 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1.0.0-1
 - 1.0.0, license changed to LGPL.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ccid/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Mar 2006 15:39:09 -0000	1.3
+++ sources	22 Apr 2006 20:33:58 -0000	1.4
@@ -1 +1 @@
-cae1d55c3361d6202adfdbea9d4e94d7  ccid-1.0.0.tar.gz
+858bd7d680cdaf0ac53c70d43974a2df  ccid-1.0.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 20:35:04 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 22 Apr 2006 13:35:04 -0700
Subject: rpms/openct/devel .cvsignore, 1.4, 1.5 openct.spec, 1.9,
	1.10 sources, 1.4, 1.5 openct-0.6.6-rpath64.patch, 1.1,
	NONE openct-reader.conf, 1.1, NONE openct.rules, 1.1, NONE
Message-ID: <200604222035.k3MKZ6iU017728@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/openct/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17707

Modified Files:
	.cvsignore openct.spec sources 
Removed Files:
	openct-0.6.6-rpath64.patch openct-reader.conf openct.rules 
Log Message:
* Sat Apr 22 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.6.7-0.1.rc1
- 0.6.7-rc1, udev rules and reader.conf included upstream.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Sep 2005 07:06:13 -0000	1.4
+++ .cvsignore	22 Apr 2006 20:35:04 -0000	1.5
@@ -1 +1 @@
-openct-0.6.6.tar.gz
+openct-0.6.7-rc1.tar.gz


Index: openct.spec
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/openct.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- openct.spec	6 Mar 2006 15:50:50 -0000	1.9
+++ openct.spec	22 Apr 2006 20:35:04 -0000	1.10
@@ -1,25 +1,22 @@
 %define dropdir %(pkg-config libpcsclite --variable=usbdropdir)
 
 Name:           openct
-Version:        0.6.6
-Release:        5%{?dist}
+Version:        0.6.7
+Release:        0.1.rc1%{?dist}
 Summary:        Middleware framework for smart card terminals
 
 Group:          System Environment/Libraries
-License:        BSD
-URL:            http://www.opensc.org/
-Source0:        http://www.opensc.org/files/%{name}-%{version}.tar.gz
+License:        LGPL
+URL:            http://www.opensc-project.org/
+Source0:        http://www.opensc-project.org/files/openct/testing/%{name}-%{version}-rc1.tar.gz
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
-Source3:        %{name}-reader.conf
-Source4:        %{name}.rules
-Patch0:         %{name}-0.6.6-rpath64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pcsc-lite-devel >= 1.3.0
 BuildRequires:  libusb-devel
 BuildRequires:  libtool-ltdl-devel
-BuildRequires:  sed
+BuildRequires:  libtool
 # TODO: verify minimum udev version
 Requires:       udev >= 062
 Requires(post): /sbin/chkconfig
@@ -56,17 +53,14 @@
 
 
 %prep
-%setup -q
-# patch0: --disable-rpath doesn't appear to do its job
-%patch0 -p1
-sed 's|__LIBDIR__|%{_libdir}|' < %{SOURCE3} > %{name}-reader.conf
+%setup -q -n %{name}-%{version}-rc1
+sh bootstrap # avoid standard rpaths on lib64 archs
+sed -ie 's|LIBDIR|%{dropdir}|' etc/reader.conf.in
+sed -ie 's|/etc/hotplug/usb/openct|%{_libdir}/openct/hotplug|' etc/openct.udev
 
 
 %build
-%configure \
-  --disable-dependency-tracking \
-  --disable-static \
-  --with-bundle-dir=%{dropdir}
+%configure --disable-dependency-tracking --disable-static
 make %{?_smp_mflags}
 
 
@@ -74,16 +68,20 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-install -Dpm 644 \
-  %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-openct.rules
+install -dm 755 $RPM_BUILD_ROOT%{dropdir}
+mv $RPM_BUILD_ROOT%{_libdir}/openct-ifd.so $RPM_BUILD_ROOT%{dropdir}
 
-ln -sf %{_libdir}/openct-ifd.so \
-  $RPM_BUILD_ROOT%{dropdir}/openct-ifd.bundle/Contents/*/
+install -Dpm 644 etc/openct.udev \
+  $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-openct.rules
+install -Dpm 755 etc/hotplug.openct $RPM_BUILD_ROOT%{_libdir}/openct/hotplug
 
 install -pm 644 etc/openct.conf $RPM_BUILD_ROOT%{_sysconfdir}/openct.conf
+
 install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/openct
+
 install -Dpm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/openct
-install -Dpm 644 %{name}-reader.conf \
+
+install -Dpm 644 etc/reader.conf \
   $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/%{name}.conf
 
 install -dm 755 $RPM_BUILD_ROOT%{_localstatedir}/run/openct
@@ -124,7 +122,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc ANNOUNCE NEWS TODO doc/*.html doc/*.css
+%doc NEWS TODO doc/*.html doc/*.css
 %config(noreplace) %{_sysconfdir}/openct.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/openct
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*openct.rules
@@ -135,6 +133,7 @@
 %{_sbindir}/openct-control
 %{_libdir}/libopenct.so.*
 %{_libdir}/libopenctapi.so
+%{_libdir}/openct/
 %dir %{_localstatedir}/run/openct/
 %ghost %{_localstatedir}/run/openct/status
 %{_mandir}/man1/openct-tool.1*
@@ -149,11 +148,13 @@
 %files -n pcsc-lite-%{name}
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/reader.conf.d/%{name}.conf
-%{_libdir}/openct-ifd.so
-%{dropdir}/openct-ifd.bundle/
+%{dropdir}/openct-ifd.so
 
 
 %changelog
+* Sat Apr 22 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.6.7-0.1.rc1
+- 0.6.7-rc1, udev rules and reader.conf included upstream.
+
 * Mon Mar  6 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.6.6-5
 - Rebuild with new pcsc-lite.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Sep 2005 07:06:13 -0000	1.4
+++ sources	22 Apr 2006 20:35:04 -0000	1.5
@@ -1 +1 @@
-a9de3bef8e5e2827b8d72a2a50d0bc66  openct-0.6.6.tar.gz
+8ad0e54afa2c3ac0073cfd12238e6c48  openct-0.6.7-rc1.tar.gz


--- openct-0.6.6-rpath64.patch DELETED ---


--- openct-reader.conf DELETED ---


--- openct.rules DELETED ---



From fedora-extras-commits at redhat.com  Sat Apr 22 20:35:55 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 22 Apr 2006 13:35:55 -0700
Subject: rpms/opensc/devel .cvsignore, 1.5, 1.6 opensc.spec, 1.10,
	1.11 sources, 1.5, 1.6 opensc-0.10.1-rpath64.patch, 1.1, NONE
Message-ID: <200604222035.k3MKZv96017765@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/opensc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17744

Modified Files:
	.cvsignore opensc.spec sources 
Removed Files:
	opensc-0.10.1-rpath64.patch 
Log Message:
* Sat Apr 22 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.11.0-0.1.rc1
- 0.11.0-rc1.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/opensc/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	8 Jan 2006 22:14:15 -0000	1.5
+++ .cvsignore	22 Apr 2006 20:35:55 -0000	1.6
@@ -1 +1 @@
-opensc-0.10.1.tar.gz
+opensc-0.11.0-rc1.tar.gz


Index: opensc.spec
===================================================================
RCS file: /cvs/extras/rpms/opensc/devel/opensc.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- opensc.spec	6 Mar 2006 16:03:01 -0000	1.10
+++ opensc.spec	22 Apr 2006 20:35:55 -0000	1.11
@@ -1,15 +1,14 @@
 %define plugindir %{_libdir}/mozilla/plugins
 
 Name:           opensc
-Version:        0.10.1
-Release:        3%{?dist}
+Version:        0.11.0
+Release:        0.1.rc1%{?dist}
 Summary:        Smart card library and applications
 
 Group:          System Environment/Libraries
 License:        LGPL
-URL:            http://www.opensc.org/
-Source0:        http://www.opensc.org/files/opensc/%{name}-%{version}.tar.gz
-Patch0:         %{name}-0.10.1-rpath64.patch
+URL:            http://www.opensc-project.org/
+Source0:        http://www.opensc-project.org/files/opensc/testing/%{name}-%{version}-rc1.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pcsc-lite-devel >= 1.1.1
@@ -17,6 +16,7 @@
 BuildRequires:  openct-devel
 BuildRequires:  openssl-devel >= 0.9.7a
 BuildRequires:  libtool-ltdl-devel
+BuildRequires:  libtool
 
 %description
 OpenSC is a package for for accessing smart card devices.  Basic
@@ -50,9 +50,8 @@
 
 
 %prep
-%setup -q
-# patch0: --disable-rpath doesn't seem to do what it implies
-%patch0 -p1
+%setup -q -n %{name}-%{version}-rc1
+sh bootstrap # avoid standard rpaths on lib64 archs
 cp -p src/pkcs15init/README ./README.pkcs15init
 cp -p src/scconf/README.scconf .
 
@@ -74,14 +73,12 @@
 install -dm 755 _docs/openssh
 install -pm 644 src/openssh/README src/openssh/ask-for-pin.diff _docs/openssh
 cp -pR doc _docs
-rm -r _docs/doc/{*.sh,*.xsl,old,Makefile*,tools}
+rm -r _docs/doc/{*.sh,*.xsl,api,Makefile*,tools}
 
 find $RPM_BUILD_ROOT%{_libdir} -type f -name "*.la" | xargs rm
 
 rm $RPM_BUILD_ROOT%{plugindir}/opensc-signer.so
-mv $RPM_BUILD_ROOT%{_libdir}/opensc/opensc-signer.so \
-  $RPM_BUILD_ROOT%{plugindir}
-rmdir $RPM_BUILD_ROOT%{_libdir}/opensc
+mv $RPM_BUILD_ROOT%{_libdir}/opensc-signer.so $RPM_BUILD_ROOT%{plugindir}
 
 
 %clean
@@ -103,6 +100,7 @@
 %{_bindir}/netkey-tool
 %{_bindir}/opensc-explorer
 %{_bindir}/opensc-tool
+%{_bindir}/piv-tool
 %{_bindir}/pkcs11-tool
 %{_bindir}/pkcs15-crypt
 %{_bindir}/pkcs15-init
@@ -138,6 +136,9 @@
 
 
 %changelog
+* Sat Apr 22 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.11.0-0.1.rc1
+- 0.11.0-rc1.
+
 * Mon Mar  6 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.10.1-3
 - Rebuild.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/opensc/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	8 Jan 2006 22:14:15 -0000	1.5
+++ sources	22 Apr 2006 20:35:55 -0000	1.6
@@ -1 +1 @@
-5549c7c339775356784837887750d232  opensc-0.10.1.tar.gz
+a911854594332241b62e5ed07b2e3a21  opensc-0.11.0-rc1.tar.gz


--- opensc-0.10.1-rpath64.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Apr 22 20:57:06 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 22 Apr 2006 13:57:06 -0700
Subject: rpms/perl-Authen-SASL/FC-5 .cvsignore, 1.3,
	1.4 perl-Authen-SASL.spec, 1.5, 1.6 sources, 1.3, 1.4
Message-ID: <200604222057.k3MKv867018116@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Authen-SASL/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18073/FC-5

Modified Files:
	.cvsignore perl-Authen-SASL.spec sources 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Authen-SASL/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	26 Apr 2005 17:14:22 -0000	1.3
+++ .cvsignore	22 Apr 2006 20:57:06 -0000	1.4
@@ -1 +1 @@
-Authen-SASL-2.09.tar.gz
+Authen-SASL-2.10.tar.gz


Index: perl-Authen-SASL.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Authen-SASL/FC-5/perl-Authen-SASL.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Authen-SASL.spec	17 Feb 2006 19:55:58 -0000	1.5
+++ perl-Authen-SASL.spec	22 Apr 2006 20:57:06 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           perl-Authen-SASL
-Version:        2.09
-Release:        4%{?dist}
+Version:        2.10
+Release:        1%{?dist}
 Summary:        SASL Authentication framework for Perl
 
 Group:          Development/Libraries
@@ -10,7 +10,9 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl >= 1:5.6.1, perl(Digest::HMAC)
+BuildRequires:  perl >= 1:5.6.1
+BuildRequires:  perl(Digest::HMAC)
+BuildRequires:  perl(GSSAPI)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
@@ -52,6 +54,9 @@
 
 
 %changelog
+* Sat Apr 22 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.10-1
+- Update to 2.10.
+
 * Fri Feb 17 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.09-4
 - Rebuild for FC5 (perl 5.8.8).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Authen-SASL/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Apr 2005 17:14:22 -0000	1.3
+++ sources	22 Apr 2006 20:57:06 -0000	1.4
@@ -1 +1 @@
-e11b60f58850ff6e71e6e1813c1f5e31  Authen-SASL-2.09.tar.gz
+041ce912640c5dff626a91435a359b88  Authen-SASL-2.10.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 20:57:06 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 22 Apr 2006 13:57:06 -0700
Subject: rpms/perl-Authen-SASL/FC-4 .cvsignore, 1.3,
	1.4 perl-Authen-SASL.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200604222057.k3MKv8C9018110@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Authen-SASL/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18073/FC-4

Modified Files:
	.cvsignore perl-Authen-SASL.spec sources 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Authen-SASL/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	26 Apr 2005 17:14:22 -0000	1.3
+++ .cvsignore	22 Apr 2006 20:57:06 -0000	1.4
@@ -1 +1 @@
-Authen-SASL-2.09.tar.gz
+Authen-SASL-2.10.tar.gz


Index: perl-Authen-SASL.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Authen-SASL/FC-4/perl-Authen-SASL.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Authen-SASL.spec	14 May 2005 02:12:44 -0000	1.4
+++ perl-Authen-SASL.spec	22 Apr 2006 20:57:06 -0000	1.5
@@ -1,17 +1,19 @@
 Name:           perl-Authen-SASL
-Version:        2.09
-Release:        3%{?dist}
+Version:        2.10
+Release:        1%{?dist}
 Summary:        SASL Authentication framework for Perl
 
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Authen-SASL/
-Source0:      http://www.cpan.org/authors/id/G/GB/GBARR/Authen-SASL-2.09.tar.gz
+Source0:        http://www.cpan.org/authors/id/G/GB/GBARR/Authen-SASL-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-BuildRequires:  perl >= 1:5.6.1, perl(Digest::HMAC)
-Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+BuildRequires:  perl >= 1:5.6.1
+BuildRequires:  perl(Digest::HMAC)
+BuildRequires:  perl(GSSAPI)
+Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
 %description
 SASL is a generic mechanism for authentication used by several network
@@ -36,7 +38,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 
-%check || :
+%check
 make test
 
 
@@ -47,11 +49,17 @@
 %files
 %defattr(-,root,root,-)
 %doc api.txt Changes
-%{perl_vendorlib}/Authen
+%{perl_vendorlib}/Authen/
 %{_mandir}/man3/*.3*
 
 
 %changelog
+* Sat Apr 22 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.10-1
+- Update to 2.10.
+
+* Fri Feb 17 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.09-4
+- Rebuild for FC5 (perl 5.8.8).
+
 * Sat May 14 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.09-3
 - Add dist tag.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Authen-SASL/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Apr 2005 17:14:22 -0000	1.3
+++ sources	22 Apr 2006 20:57:06 -0000	1.4
@@ -1 +1 @@
-e11b60f58850ff6e71e6e1813c1f5e31  Authen-SASL-2.09.tar.gz
+041ce912640c5dff626a91435a359b88  Authen-SASL-2.10.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 21:07:39 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 22 Apr 2006 14:07:39 -0700
Subject: rpms/perl-Config-Tiny/devel .cvsignore, 1.7,
	1.8 perl-Config-Tiny.spec, 1.12, 1.13 sources, 1.7, 1.8
Message-ID: <200604222107.k3ML7gdF020431@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-serv20376/devel

Modified Files:
	.cvsignore perl-Config-Tiny.spec sources 
Log Message:
Updated to 2.06.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	6 Mar 2006 20:02:06 -0000	1.7
+++ .cvsignore	22 Apr 2006 21:07:39 -0000	1.8
@@ -1 +1 @@
-Config-Tiny-2.05.tar.gz
+Config-Tiny-2.06.tar.gz


Index: perl-Config-Tiny.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/perl-Config-Tiny.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-Config-Tiny.spec	6 Mar 2006 20:02:06 -0000	1.12
+++ perl-Config-Tiny.spec	22 Apr 2006 21:07:39 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           perl-Config-Tiny
-Version:        2.05
+Version:        2.06
 Release:        1%{?dist}
 Summary:        Perl module for reading and writing .ini style configuration files
 
@@ -50,10 +50,13 @@
 %defattr(-,root,root,-)
 %doc Changes LICENSE README
 %{perl_vendorlib}/Config/
-%{_mandir}/man3/*.3*
+%{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Sat Apr 22 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.06-1
+- Updated to 2.06.
+
 * Mon Mar  6 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.05-1
 - Updated to 2.05.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	6 Mar 2006 20:02:06 -0000	1.7
+++ sources	22 Apr 2006 21:07:39 -0000	1.8
@@ -1 +1 @@
-bac7f9eda771593c869313859fe45ff7  Config-Tiny-2.05.tar.gz
+40b5ce184ee6307b5a9ce1f588f824d6  Config-Tiny-2.06.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 21:07:33 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 22 Apr 2006 14:07:33 -0700
Subject: rpms/perl-Config-Tiny/FC-4 .cvsignore, 1.6,
	1.7 perl-Config-Tiny.spec, 1.10, 1.11 sources, 1.6, 1.7
Message-ID: <200604222108.k3ML85DR020436@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Config-Tiny/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20376/FC-4

Modified Files:
	.cvsignore perl-Config-Tiny.spec sources 
Log Message:
Updated to 2.06.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	6 Mar 2006 20:02:00 -0000	1.6
+++ .cvsignore	22 Apr 2006 21:07:33 -0000	1.7
@@ -1 +1 @@
-Config-Tiny-2.05.tar.gz
+Config-Tiny-2.06.tar.gz


Index: perl-Config-Tiny.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-4/perl-Config-Tiny.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Config-Tiny.spec	6 Mar 2006 20:02:00 -0000	1.10
+++ perl-Config-Tiny.spec	22 Apr 2006 21:07:33 -0000	1.11
@@ -1,5 +1,5 @@
 Name:           perl-Config-Tiny
-Version:        2.05
+Version:        2.06
 Release:        1%{?dist}
 Summary:        Perl module for reading and writing .ini style configuration files
 
@@ -50,10 +50,13 @@
 %defattr(-,root,root,-)
 %doc Changes LICENSE README
 %{perl_vendorlib}/Config/
-%{_mandir}/man3/*.3*
+%{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Sat Apr 22 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.06-1
+- Updated to 2.06.
+
 * Mon Mar  6 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.05-1
 - Updated to 2.05.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	6 Mar 2006 20:02:00 -0000	1.6
+++ sources	22 Apr 2006 21:07:33 -0000	1.7
@@ -1 +1 @@
-bac7f9eda771593c869313859fe45ff7  Config-Tiny-2.05.tar.gz
+40b5ce184ee6307b5a9ce1f588f824d6  Config-Tiny-2.06.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 21:07:34 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 22 Apr 2006 14:07:34 -0700
Subject: rpms/perl-Config-Tiny/FC-5 .cvsignore, 1.7,
	1.8 perl-Config-Tiny.spec, 1.12, 1.13 sources, 1.7, 1.8
Message-ID: <200604222108.k3ML86qW020441@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Config-Tiny/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20376/FC-5

Modified Files:
	.cvsignore perl-Config-Tiny.spec sources 
Log Message:
Updated to 2.06.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	6 Mar 2006 20:02:06 -0000	1.7
+++ .cvsignore	22 Apr 2006 21:07:34 -0000	1.8
@@ -1 +1 @@
-Config-Tiny-2.05.tar.gz
+Config-Tiny-2.06.tar.gz


Index: perl-Config-Tiny.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-5/perl-Config-Tiny.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- perl-Config-Tiny.spec	6 Mar 2006 20:02:06 -0000	1.12
+++ perl-Config-Tiny.spec	22 Apr 2006 21:07:34 -0000	1.13
@@ -1,5 +1,5 @@
 Name:           perl-Config-Tiny
-Version:        2.05
+Version:        2.06
 Release:        1%{?dist}
 Summary:        Perl module for reading and writing .ini style configuration files
 
@@ -50,10 +50,13 @@
 %defattr(-,root,root,-)
 %doc Changes LICENSE README
 %{perl_vendorlib}/Config/
-%{_mandir}/man3/*.3*
+%{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Sat Apr 22 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.06-1
+- Updated to 2.06.
+
 * Mon Mar  6 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 2.05-1
 - Updated to 2.05.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Config-Tiny/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	6 Mar 2006 20:02:06 -0000	1.7
+++ sources	22 Apr 2006 21:07:34 -0000	1.8
@@ -1 +1 @@
-bac7f9eda771593c869313859fe45ff7  Config-Tiny-2.05.tar.gz
+40b5ce184ee6307b5a9ce1f588f824d6  Config-Tiny-2.06.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 21:13:59 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 22 Apr 2006 14:13:59 -0700
Subject: rpms/perl-Error/FC-4 .cvsignore, 1.2, 1.3 perl-Error.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200604222114.k3MLEWk0020631@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Error/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20593/FC-4

Modified Files:
	.cvsignore perl-Error.spec sources 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Dec 2004 16:29:48 -0000	1.2
+++ .cvsignore	22 Apr 2006 21:13:59 -0000	1.3
@@ -1 +1 @@
-Error-0.15.tar.gz
+Error-0.15008.tar.gz


Index: perl-Error.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/FC-4/perl-Error.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Error.spec	6 Apr 2005 22:12:44 -0000	1.4
+++ perl-Error.spec	22 Apr 2006 21:13:59 -0000	1.5
@@ -1,15 +1,14 @@
-%{!?perl_vendorlib: %define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)}
-
 Name:           perl-Error
-Version:        0.15
-Release:        2
-
+Version:        0.15008
+Release:        1%{?dist}
 Summary:        Error Perl module
+
 License:        GPL or Artistic
 Group:          Development/Libraries
 URL:            http://search.cpan.org/dist/Error/
-Source0:        http://www.cpan.org/modules/by-module/Error/Error-0.15.tar.gz
+Source0:        http://www.cpan.org/modules/by-module/Error/Error-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
 BuildArch:      noarch
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
@@ -19,6 +18,7 @@
 for errors/exceptions that can either be thrown, for subsequent catch, or
 can simply be recorded.
 
+
 %prep
 %setup -q -n Error-%{version}
 
@@ -28,28 +28,36 @@
 
 %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+rwX,go+rX,go-w $RPM_BUILD_ROOT/*
 
-%check || :
+%check
 make test
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog README example
 %{perl_vendorlib}/*
 %{_mandir}/man3/*
 
+
 %changelog
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Wed Apr 19 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.15008-1
+- Update to 0.15008.
+
+* Fri Feb 17 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.15-4
+- Rebuild for FC5 (perl 5.8.8).
+
+* Thu Dec 29 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.15-3
+- Dist tag.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.15-2
 - rebuilt
 
 * Fri Jun 11 2004 Steven Pritchard <steve at kspei.com> 0:0.15-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Dec 2004 16:29:48 -0000	1.2
+++ sources	22 Apr 2006 21:13:59 -0000	1.3
@@ -1 +1 @@
-81b4847fb893f18a4e85186bca5f4380  Error-0.15.tar.gz
+e66c11a0b7a501391643321f86f2171e  Error-0.15008.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 21:14:00 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 22 Apr 2006 14:14:00 -0700
Subject: rpms/perl-Error/FC-5 .cvsignore, 1.2, 1.3 perl-Error.spec, 1.6,
	1.7 sources, 1.2, 1.3
Message-ID: <200604222114.k3MLEWQJ020636@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-serv20593/FC-5

Modified Files:
	.cvsignore perl-Error.spec sources 
Log Message:
Sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	21 Dec 2004 16:29:48 -0000	1.2
+++ .cvsignore	22 Apr 2006 21:14:00 -0000	1.3
@@ -1 +1 @@
-Error-0.15.tar.gz
+Error-0.15008.tar.gz


Index: perl-Error.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/FC-5/perl-Error.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- perl-Error.spec	17 Feb 2006 19:03:52 -0000	1.6
+++ perl-Error.spec	22 Apr 2006 21:14:00 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           perl-Error
-Version:        0.15
-Release:        4%{?dist}
+Version:        0.15008
+Release:        1%{?dist}
 Summary:        Error Perl module
 
 License:        GPL or Artistic
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Wed Apr 19 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.15008-1
+- Update to 0.15008.
+
 * Fri Feb 17 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.15-4
 - Rebuild for FC5 (perl 5.8.8).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	21 Dec 2004 16:29:48 -0000	1.2
+++ sources	22 Apr 2006 21:14:00 -0000	1.3
@@ -1 +1 @@
-81b4847fb893f18a4e85186bca5f4380  Error-0.15.tar.gz
+e66c11a0b7a501391643321f86f2171e  Error-0.15008.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 22 22:18:03 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 22 Apr 2006 15:18:03 -0700
Subject: rpms/ecore/FC-5 ecore.spec,1.4,1.5
Message-ID: <200604222218.k3MMIZXt023211@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/ecore/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23143/FC-5

Modified Files:
	ecore.spec 
Log Message:
Split out DirectFB support


Index: ecore.spec
===================================================================
RCS file: /cvs/extras/rpms/ecore/FC-5/ecore.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ecore.spec	18 Apr 2006 14:56:38 -0000	1.4
+++ ecore.spec	22 Apr 2006 22:18:02 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           ecore
 Version:        0.9.9.026
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An event and X abstraction layer
 
 Group:          System Environment/Libraries
@@ -32,6 +32,14 @@
 The ecore-devel package contains libraries and header files for developing
 ecore applications.
 
+%package        directfb
+Summary:        ecore support for DirectFB
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description    directfb
+This package adds DirectFB support to ecore.
+
 %prep
 %setup -q
 %patch -p 1 -b .novera
@@ -59,7 +67,11 @@
 %doc AUTHORS ChangeLog COPYING COPYING-PLAIN README
 %{_bindir}/*_test
 %{_datadir}/%{name}
-%{_libdir}/*.so.*
+#%{_libdir}/*.so.*
+%{_libdir}/libecore.so.*
+%{_libdir}/libecore_[a-c]*.so.*
+%{_libdir}/libecore_dbus.so.*
+%{_libdir}/libecore_[e-z]*.so.*
 
 %files devel
 %defattr(-,root,root,-)
@@ -70,7 +82,15 @@
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
 
+%files directfb
+%defattr(-,root,root,-)
+%doc
+%{_libdir}/libecore_directfb.so.*
+
 %changelog
+* Sat Apr 22 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.9.026-2
+- Split out DirectFB support
+
 * Tue Apr 18 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.9.026-1
 - Upstream update
 



From fedora-extras-commits at redhat.com  Sat Apr 22 22:18:03 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Sat, 22 Apr 2006 15:18:03 -0700
Subject: rpms/ecore/devel ecore.spec,1.4,1.5
Message-ID: <200604222218.k3MMIZw7023214@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/ecore/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23143/devel

Modified Files:
	ecore.spec 
Log Message:
Split out DirectFB support


Index: ecore.spec
===================================================================
RCS file: /cvs/extras/rpms/ecore/devel/ecore.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ecore.spec	18 Apr 2006 14:56:38 -0000	1.4
+++ ecore.spec	22 Apr 2006 22:18:03 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           ecore
 Version:        0.9.9.026
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        An event and X abstraction layer
 
 Group:          System Environment/Libraries
@@ -32,6 +32,14 @@
 The ecore-devel package contains libraries and header files for developing
 ecore applications.
 
+%package        directfb
+Summary:        ecore support for DirectFB
+Group:          System Environment/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description    directfb
+This package adds DirectFB support to ecore.
+
 %prep
 %setup -q
 %patch -p 1 -b .novera
@@ -59,7 +67,11 @@
 %doc AUTHORS ChangeLog COPYING COPYING-PLAIN README
 %{_bindir}/*_test
 %{_datadir}/%{name}
-%{_libdir}/*.so.*
+#%{_libdir}/*.so.*
+%{_libdir}/libecore.so.*
+%{_libdir}/libecore_[a-c]*.so.*
+%{_libdir}/libecore_dbus.so.*
+%{_libdir}/libecore_[e-z]*.so.*
 
 %files devel
 %defattr(-,root,root,-)
@@ -70,7 +82,15 @@
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
 
+%files directfb
+%defattr(-,root,root,-)
+%doc
+%{_libdir}/libecore_directfb.so.*
+
 %changelog
+* Sat Apr 22 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.9.026-2
+- Split out DirectFB support
+
 * Tue Apr 18 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.9.026-1
 - Upstream update
 



From fedora-extras-commits at redhat.com  Sat Apr 22 22:38:37 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 22 Apr 2006 15:38:37 -0700
Subject: rpms/prboom/FC-4 prboom.spec,1.3,1.4
Message-ID: <200604222238.k3MMcdHM023366@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/prboom/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23321/FC-4

Modified Files:
	prboom.spec 
Log Message:
Build both opengl and non-gl versions of the binary.




Index: prboom.spec
===================================================================
RCS file: /cvs/extras/rpms/prboom/FC-4/prboom.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- prboom.spec	22 Apr 2006 01:50:55 -0000	1.3
+++ prboom.spec	22 Apr 2006 22:38:37 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           prboom
 Version:        2.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Open source port of the DOOM game engine
 
 Group:          Amusements/Games
@@ -28,8 +28,15 @@
 %patch0 -p1
 
 %build
+# Build twice.  The first time with opengl support, the second time without.
 %configure --enable-gl --disable-cpu-opt --program-prefix=''
 make %{?_smp_mflags}
+mv src/prboom src/prboom-gl
+
+make clean
+
+%configure --disable-cpu-opt --program-prefix=''
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -41,6 +48,9 @@
 mkdir -p $RPM_BUILD_ROOT/%{waddir}
 mv $RPM_BUILD_ROOT/%{_datadir}/games/doom/%{name}.wad $RPM_BUILD_ROOT/%{waddir}
 
+# Copy the renamed OpenGL binary to the bindir
+install -p -m 755 src/prboom-gl $RPM_BUILD_ROOT/%{_bindir}
+
 # Remove the doc files that will get picked up in the files
 # section below.
 rm -rf $RPM_BUILD_ROOT/%{_docdir}
@@ -51,6 +61,7 @@
 
 %files
 %defattr(-,root,root,-)
+%{_bindir}/prboom-gl
 %{_bindir}/prboom
 %{_bindir}/prboom-game-server
 %dir %{waddir}
@@ -61,6 +72,9 @@
 %doc doc/README.compat doc/README.demos doc/MBF.txt doc/MBFFAQ.txt doc/boom.txt
 
 %changelog
+* Sat Apr 22 2006 Wart <wart at kobold.org> 2.4.1-2
+- Build both opengl and non-opengl binaries.
+
 * Tue Apr 18 2006 Wart <wart at kobold.org> 2.4.1-1
 - Update to 2.4.1
 



From fedora-extras-commits at redhat.com  Sat Apr 22 22:38:38 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 22 Apr 2006 15:38:38 -0700
Subject: rpms/prboom/FC-5 prboom.spec,1.3,1.4
Message-ID: <200604222238.k3MMceZ4023370@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/prboom/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23321/FC-5

Modified Files:
	prboom.spec 
Log Message:
Build both opengl and non-gl versions of the binary.




Index: prboom.spec
===================================================================
RCS file: /cvs/extras/rpms/prboom/FC-5/prboom.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- prboom.spec	22 Apr 2006 01:50:55 -0000	1.3
+++ prboom.spec	22 Apr 2006 22:38:37 -0000	1.4
@@ -2,7 +2,7 @@
 
 Name:           prboom
 Version:        2.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Open source port of the DOOM game engine
 
 Group:          Amusements/Games
@@ -29,8 +29,15 @@
 %patch0 -p1
 
 %build
+# Build twice.  The first time with opengl support, the second time without.
 %configure --enable-gl --disable-cpu-opt --program-prefix=''
 make %{?_smp_mflags}
+mv src/prboom src/prboom-gl
+
+make clean
+
+%configure --disable-cpu-opt --program-prefix=''
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -42,6 +49,9 @@
 mkdir -p $RPM_BUILD_ROOT/%{waddir}
 mv $RPM_BUILD_ROOT/%{_datadir}/games/doom/%{name}.wad $RPM_BUILD_ROOT/%{waddir}
 
+# Copy the renamed OpenGL binary to the bindir
+install -p -m 755 src/prboom-gl $RPM_BUILD_ROOT/%{_bindir}
+
 # Remove the doc files that will get picked up in the files
 # section below.
 rm -rf $RPM_BUILD_ROOT/%{_docdir}
@@ -52,6 +62,7 @@
 
 %files
 %defattr(-,root,root,-)
+%{_bindir}/prboom-gl
 %{_bindir}/prboom
 %{_bindir}/prboom-game-server
 %dir %{waddir}
@@ -62,6 +73,9 @@
 %doc doc/README.compat doc/README.demos doc/MBF.txt doc/MBFFAQ.txt doc/boom.txt
 
 %changelog
+* Sat Apr 22 2006 Wart <wart at kobold.org> 2.4.1-2
+- Build both opengl and non-opengl binaries.
+
 * Tue Apr 18 2006 Wart <wart at kobold.org> 2.4.1-1
 - Update to 2.4.1
 



From fedora-extras-commits at redhat.com  Sat Apr 22 22:38:38 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 22 Apr 2006 15:38:38 -0700
Subject: rpms/prboom/devel prboom.spec,1.4,1.5
Message-ID: <200604222238.k3MMcenk023374@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/prboom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23321/devel

Modified Files:
	prboom.spec 
Log Message:
Build both opengl and non-gl versions of the binary.




Index: prboom.spec
===================================================================
RCS file: /cvs/extras/rpms/prboom/devel/prboom.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- prboom.spec	21 Apr 2006 21:37:55 -0000	1.4
+++ prboom.spec	22 Apr 2006 22:38:38 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:           prboom
 Version:        2.4.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Open source port of the DOOM game engine
 
 Group:          Amusements/Games
@@ -29,8 +29,15 @@
 %patch0 -p1
 
 %build
+# Build twice.  The first time with opengl support, the second time without.
 %configure --enable-gl --disable-cpu-opt --program-prefix=''
 make %{?_smp_mflags}
+mv src/prboom src/prboom-gl
+
+make clean
+
+%configure --disable-cpu-opt --program-prefix=''
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -42,6 +49,9 @@
 mkdir -p $RPM_BUILD_ROOT/%{waddir}
 mv $RPM_BUILD_ROOT/%{_datadir}/games/doom/%{name}.wad $RPM_BUILD_ROOT/%{waddir}
 
+# Copy the renamed OpenGL binary to the bindir
+install -p -m 755 src/prboom-gl $RPM_BUILD_ROOT/%{_bindir}
+
 # Remove the doc files that will get picked up in the files
 # section below.
 rm -rf $RPM_BUILD_ROOT/%{_docdir}
@@ -52,6 +62,7 @@
 
 %files
 %defattr(-,root,root,-)
+%{_bindir}/prboom-gl
 %{_bindir}/prboom
 %{_bindir}/prboom-game-server
 %dir %{waddir}
@@ -62,6 +73,9 @@
 %doc doc/README.compat doc/README.demos doc/MBF.txt doc/MBFFAQ.txt doc/boom.txt
 
 %changelog
+* Sat Apr 22 2006 Wart <wart at kobold.org> 2.4.1-2
+- Build both opengl and non-opengl binaries.
+
 * Tue Apr 18 2006 Wart <wart at kobold.org> 2.4.1-1
 - Update to 2.4.1
 



From fedora-extras-commits at redhat.com  Sat Apr 22 22:50:48 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sat, 22 Apr 2006 15:50:48 -0700
Subject: rpms/perl-DBD-XBase/devel DBD-XBase-0.241-dbfdump-rename.patch, NONE,
	1.1 perl-DBD-XBase.spec, 1.3, 1.4
Message-ID: <200604222250.k3MMooJ2023555@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-DBD-XBase/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23535

Modified Files:
	perl-DBD-XBase.spec 
Added Files:
	DBD-XBase-0.241-dbfdump-rename.patch 
Log Message:
dbfdump renamed to dbfdump.pl to avoid file conflict with shapelib.


DBD-XBase-0.241-dbfdump-rename.patch:

--- NEW FILE DBD-XBase-0.241-dbfdump-rename.patch ---
diff -ruN DBD-XBase-0.241-orig/bin/dbfdump.PL DBD-XBase-0.241/bin/dbfdump.PL
--- DBD-XBase-0.241-orig/bin/dbfdump.PL	2002-03-07 07:36:02.000000000 +0000
+++ DBD-XBase-0.241/bin/dbfdump.PL	1970-01-01 01:00:00.000000000 +0100
@@ -1,189 +0,0 @@
-
-use Config;
-my $filename = $0;
-
-$filename =~ s/\.PL$//;
-open OUT,">$filename" or die "Can't create $filename: $!";
-chmod(0755, $filename);
-print "Extracting $filename (with #! and variable substitution)\n";
-
-print OUT <<"EOHEADER";
-$Config{'startperl'} -w
-
-EOHEADER
-
-print OUT <<'EOBODY';
-
-use XBase;
-use Getopt::Long;
-use strict;
-$^W = 1;
-
-my $stdin = 0;
-
-if (defined $ARGV[$#ARGV] and $ARGV[$#ARGV] eq '-') {
-	$stdin = 1; pop @ARGV;
-}
-
-my %options;
-Getopt::Long::GetOptions( \%options,
-	'help', 'version', 'info', 'rs=s', 'fs=s', 'undef=s', 'fields=s',
-	'nomemo', 'memofile=s', 'memosep=s', 'table',
-	'SQL',
-	) or exit;
-
-if (defined $options{'version'}) {
-	print "This is dbfdump version $XBase::VERSION.\n";
-	exit;
-}
-
-if ($stdin) {
-	push @ARGV, '-';
-	$options{'nomemo'} = 1;
-}
-
-if (@ARGV == 0 or defined $options{'help'}) {
-	die <<'EOF';
-Usage: dbfdump [ options ] files
-    where the options specify
-	--rs		output record separator (default newline)
-	--fs		output field separator (default colon)
-	--fields	comma separated list of fields to print (default all)
-	--undef		what to print for NULL values (default empty string)
-	--memofile	specifies unstandard name of attached memo file
-	--memosep	separator for dBase III dbt's (default \x1a\x1a)
-	--table		output in nice table format (needs Data::ShowTable)
-    all having as parameter a string; and also
-	--nomemo	do not try to read the memo (dbt/fpt) file 
-	--info		only print info about the file and fields
-	--version	print version of the XBase library
-EOF
-}
-
-my %addopts = ();
-if (defined $options{'nomemo'} or defined $options{'info'}) {
-	$addopts{'ignorememo'} = 1;
-}
-
-$addopts{'memosep'} = $options{'memosep'};
-$addopts{'memofile'} = $options{'memofile'};
-
-if (defined $options{'info'}) {
-	$addopts{'ignorebadheader'} = 1;
-}
-
-my $file;
-for $file (@ARGV) {
-	my $table = new XBase 'name' => $file, %addopts;
-
-	if (not defined $table) {
-		print STDERR XBase->errstr;
-		next;
-	}
-	if (defined $options{'info'}) {
-		if (not defined $options{'SQL'}) {
-			print $table->header_info;
-		} else {
-			my $name = $file;
-			$name =~ s!^.*/|\.dbf$!!ig;
-			print "create table $name (\n";
-			my @names = $table->field_names;
-			my %conv = qw!
-				C varchar
-				N numeric
-				F numeric
-				L boolean
-				M blob
-				D date
-				T time
-				!;
-			my @types = map { $conv{$_} } $table->field_types;
-			my @lengths = $table->field_lengths;
-			my @decimals = $table->field_decimals;
-			for (my $i = 0; $i < @names; $i++) {
-				print "\t$names[$i] $types[$i]";
-				if ($types[$i] eq 'blob') {
-					$lengths[$i] = $decimals[$i] = undef;
-				}
-				if ($lengths[$i] or $decimals[$i]) {
-					print "($lengths[$i]";
-					print ", $decimals[$i]" if $decimals[$i];
-					print ")";
-				}
-				if (defined $names[$i+1]) {
-					print ',';
-				}
-				print "\n";
-			}
-			print ")\n";
-		}
-	} else {
-		$table->dump_records(%options) or print STDERR $table->errstr;
-	}
-	$table->close;
-}
-
-1;
-
-__END__
-
-=head1 NAME
-
-dbfdump - Dump the record of the dbf file
-
-=head1 FORMAT
-
-	dbfdump [options] files
-
-where options are
-
-	--rs		output record separator (default newline)
-	--fs		output field separator (default colon)
-	--fields	comma separated list of fields to print (default all)
-	--undef		string to print for NULL values (default empty)
-	--memofile	specifies unstandard name of attached memo file
-	--memosep	separator for dBase III dbt's (default \x1a\x1a)
-
-	--nomemo	do not try to read the memo (dbt/fpt) file
-	--info		print info about the file and fields
-		with additional --SQL parameter, outputs the SQL create table
-	--version	print version of the XBase library
-	--table		output in nice table format (only available when
-		Data::ShowTable is installed, overrides rs and fs)
-
-=head1 SYNOPSIS
-
-	dbfdump -fields id,msg table.dbf
-	dbfdump -fs=' : ' table
-	dbfdump --nomemo file.dbf
-
-	ssh user at host 'cat file.dbf.gz' | gunzip - | dbfdump -
-
-=head1 DESCRIPTION
-
-Dbfdump prints to standard output the content of dbf files listed. By
-default, it prints all fields, separated by colons, one record on
-a line. The output record and column separators can be changed by
-switches on the command line. You can also ask only for some fields to
-be printed.
-
-The content of associated memo files (dbf, fpt) is printed for memo
-fields, unless you use the C<--nomemo> option.
-
-You can specify reading the standard input by putting dash (-) instead
-of file name.
-
-=head1 AUTHOR
-
-(c) 1998--1999 Jan Pazdziora, adelton at fi.muni.cz,
-http://www.fi.muni.cz/~adelton/
-at Faculty of Informatics, Masaryk University in Brno, Czech Republic
-
-=head1 SEE ALSO
-
-perl(1); XBase(3)
-
-=cut
-
-EOBODY
-
diff -ruN DBD-XBase-0.241-orig/bin/dbfdump.pl.PL DBD-XBase-0.241/bin/dbfdump.pl.PL
--- DBD-XBase-0.241-orig/bin/dbfdump.pl.PL	1970-01-01 01:00:00.000000000 +0100
+++ DBD-XBase-0.241/bin/dbfdump.pl.PL	2006-03-16 22:17:24.000000000 +0000
@@ -0,0 +1,189 @@
+
+use Config;
+my $filename = $0;
+
+$filename =~ s/\.PL$//;
+open OUT,">$filename" or die "Can't create $filename: $!";
+chmod(0755, $filename);
+print "Extracting $filename (with #! and variable substitution)\n";
+
+print OUT <<"EOHEADER";
+$Config{'startperl'} -w
+
+EOHEADER
+
+print OUT <<'EOBODY';
+
+use XBase;
+use Getopt::Long;
+use strict;
+$^W = 1;
+
+my $stdin = 0;
+
+if (defined $ARGV[$#ARGV] and $ARGV[$#ARGV] eq '-') {
+	$stdin = 1; pop @ARGV;
+}
+
+my %options;
+Getopt::Long::GetOptions( \%options,
+	'help', 'version', 'info', 'rs=s', 'fs=s', 'undef=s', 'fields=s',
+	'nomemo', 'memofile=s', 'memosep=s', 'table',
+	'SQL',
+	) or exit;
+
+if (defined $options{'version'}) {
+	print "This is dbfdump.pl version $XBase::VERSION.\n";
+	exit;
+}
+
+if ($stdin) {
+	push @ARGV, '-';
+	$options{'nomemo'} = 1;
+}
+
+if (@ARGV == 0 or defined $options{'help'}) {
+	die <<'EOF';
+Usage: dbfdump.pl [ options ] files
+    where the options specify
+	--rs		output record separator (default newline)
+	--fs		output field separator (default colon)
+	--fields	comma separated list of fields to print (default all)
+	--undef		what to print for NULL values (default empty string)
+	--memofile	specifies unstandard name of attached memo file
+	--memosep	separator for dBase III dbt's (default \x1a\x1a)
+	--table		output in nice table format (needs Data::ShowTable)
+    all having as parameter a string; and also
+	--nomemo	do not try to read the memo (dbt/fpt) file 
+	--info		only print info about the file and fields
+	--version	print version of the XBase library
+EOF
+}
+
+my %addopts = ();
+if (defined $options{'nomemo'} or defined $options{'info'}) {
+	$addopts{'ignorememo'} = 1;
+}
+
+$addopts{'memosep'} = $options{'memosep'};
+$addopts{'memofile'} = $options{'memofile'};
+
+if (defined $options{'info'}) {
+	$addopts{'ignorebadheader'} = 1;
+}
+
+my $file;
+for $file (@ARGV) {
+	my $table = new XBase 'name' => $file, %addopts;
+
+	if (not defined $table) {
+		print STDERR XBase->errstr;
+		next;
+	}
+	if (defined $options{'info'}) {
+		if (not defined $options{'SQL'}) {
+			print $table->header_info;
+		} else {
+			my $name = $file;
+			$name =~ s!^.*/|\.dbf$!!ig;
+			print "create table $name (\n";
+			my @names = $table->field_names;
+			my %conv = qw!
+				C varchar
+				N numeric
+				F numeric
+				L boolean
+				M blob
+				D date
+				T time
+				!;
+			my @types = map { $conv{$_} } $table->field_types;
+			my @lengths = $table->field_lengths;
+			my @decimals = $table->field_decimals;
+			for (my $i = 0; $i < @names; $i++) {
+				print "\t$names[$i] $types[$i]";
+				if ($types[$i] eq 'blob') {
+					$lengths[$i] = $decimals[$i] = undef;
+				}
+				if ($lengths[$i] or $decimals[$i]) {
+					print "($lengths[$i]";
+					print ", $decimals[$i]" if $decimals[$i];
+					print ")";
+				}
+				if (defined $names[$i+1]) {
+					print ',';
+				}
+				print "\n";
+			}
+			print ")\n";
+		}
+	} else {
+		$table->dump_records(%options) or print STDERR $table->errstr;
+	}
+	$table->close;
+}
+
+1;
+
+__END__
+
+=head1 NAME
+
+dbfdump.pl - Dump the record of the dbf file
+
+=head1 FORMAT
+
+	dbfdump.pl [options] files
+
+where options are
+
+	--rs		output record separator (default newline)
+	--fs		output field separator (default colon)
+	--fields	comma separated list of fields to print (default all)
+	--undef		string to print for NULL values (default empty)
+	--memofile	specifies unstandard name of attached memo file
+	--memosep	separator for dBase III dbt's (default \x1a\x1a)
+
+	--nomemo	do not try to read the memo (dbt/fpt) file
+	--info		print info about the file and fields
+		with additional --SQL parameter, outputs the SQL create table
+	--version	print version of the XBase library
+	--table		output in nice table format (only available when
+		Data::ShowTable is installed, overrides rs and fs)
+
+=head1 SYNOPSIS
+
+	dbfdump.pl -fields id,msg table.dbf
+	dbfdump.pl -fs=' : ' table
+	dbfdump.pl --nomemo file.dbf
+
+	ssh user at host 'cat file.dbf.gz' | gunzip - | dbfdump.pl -
+
+=head1 DESCRIPTION
+
+Dbfdump prints to standard output the content of dbf files listed. By
+default, it prints all fields, separated by colons, one record on
+a line. The output record and column separators can be changed by
+switches on the command line. You can also ask only for some fields to
+be printed.
+
+The content of associated memo files (dbf, fpt) is printed for memo
+fields, unless you use the C<--nomemo> option.
+
+You can specify reading the standard input by putting dash (-) instead
+of file name.
+
+=head1 AUTHOR
+
+(c) 1998--1999 Jan Pazdziora, adelton at fi.muni.cz,
+http://www.fi.muni.cz/~adelton/
+at Faculty of Informatics, Masaryk University in Brno, Czech Republic
+
+=head1 SEE ALSO
+
+perl(1); XBase(3)
+
+=cut
+
+EOBODY
+
diff -ruN DBD-XBase-0.241-orig/Changes DBD-XBase-0.241/Changes
--- DBD-XBase-0.241-orig/Changes	2003-11-21 14:13:43.000000000 +0000
+++ DBD-XBase-0.241/Changes	2006-03-16 22:09:11.000000000 +0000
@@ -136,7 +136,7 @@
 
 0.1551 Sat Jan  9 19:21:16 CET 2000
 
-	dbfdump: Accepts --SQL modifier to --info, prints structure
+	dbfdump.pl: Accepts --SQL modifier to --info, prints structure
 	of the table as a create table SQL.
 
 0.155 Sun Nov  7 15:43:59 CET 1999
@@ -272,7 +272,7 @@
 	XBase::Memo: we now reset next_for_append to point behind the
 	end of the file, problem pointed out by Artem Belevich.
 
-	dbfdump: option --table, --fields now handles intervals.
+	dbfdump.pl: option --table, --fields now handles intervals.
 
 	t/2_read.t: fixed problem with order of fields in hash, patch
 	by Andreas J. Koenig.
@@ -301,7 +301,7 @@
 
 	XBase::SQL: fix of handling of double quoted strings.
 
-	dbfdump: memosep and memofile options fixed.
+	dbfdump.pl: memosep and memofile options fixed.
 
 	t/4_dbfdump.t: avoided using cat.
 
@@ -427,7 +427,7 @@
 
 0.0632 Wed May 27 12:27:04 MET DST 1998
 
-	Added --nomemo option to dbfdump. The list of entires is made
+	Added --nomemo option to dbfdump.pl. The list of entires is made
 	longer in any non-leaf page in ndx. Added check for the magic
 	"FFFF0800" tag in dBaseIV dbt file when reading it.
 
@@ -479,7 +479,7 @@
 	long selects. Method dump_records now prints directly,
 	doesn't use get_all_records.
 
-	Added parameter --info into the script dbfdump to print the
+	Added parameter --info into the script dbfdump.pl to print the
 	header info.
 
 	Changed way of determining the type of the dbt file after
diff -ruN DBD-XBase-0.241-orig/INSTALL DBD-XBase-0.241/INSTALL
--- DBD-XBase-0.241-orig/INSTALL	2003-04-03 18:02:37.000000000 +0100
+++ DBD-XBase-0.241/INSTALL	2006-03-16 22:08:17.000000000 +0000
@@ -43,7 +43,7 @@
 If you do not have make or you cannot run it (do you really want to
 use Perl on that machine?), just copy the content of the
 DBD-XBase-x.xxx/lib directory to wherever you want to have it. That
-should work, even if it won't give you man pages and dbfdump/indexdump
+should work, even if it won't give you man pages and dbfdump.pl/indexdump
 scripts.
 
 If you use a platform supported by ActiveState and run ActiveState
diff -ruN DBD-XBase-0.241-orig/lib/XBase/FAQ.pod DBD-XBase-0.241/lib/XBase/FAQ.pod
--- DBD-XBase-0.241-orig/lib/XBase/FAQ.pod	2002-08-16 10:38:53.000000000 +0100
+++ DBD-XBase-0.241/lib/XBase/FAQ.pod	2006-03-16 22:06:06.000000000 +0000
@@ -175,11 +175,11 @@
 
 to your script and you will see that it's not B<DBD::XBase> problem.
 
-=item The B<XBase.pm/dbfdump> stops after reading I<n> records ...
+=item The B<XBase.pm/dbfdump.pl> stops after reading I<n> records ...
 
 ... why doesn't it read all I<10 x n> records?
 
-Check if the file isn't truncated. C<dbfdump -i file.dbf> will tell
+Check if the file isn't truncated. C<dbfdump.pl -i file.dbf> will tell
 you the expected number of records and length of one record, like
 
 	Filename:       file.dbf
@@ -191,7 +191,7 @@
 	Num fields:     40
 
 So the expected length of the file is at least I<1313 + 65 * 1117>. If
-it's shorter, you've got damaged file and B<XBase.pm/dbfdump> only
+it's shorter, you've got damaged file and B<XBase.pm/dbfdump.pl> only
 reads as much rows as it can find in the dbf.
 
 =item How is this B<DBD::XBase> related to B<DBD::ODBC>?
diff -ruN DBD-XBase-0.241-orig/lib/XBase.pm DBD-XBase-0.241/lib/XBase.pm
--- DBD-XBase-0.241-orig/lib/XBase.pm	2003-11-21 14:17:49.000000000 +0000
+++ DBD-XBase-0.241/lib/XBase.pm	2006-03-16 22:05:32.000000000 +0000
@@ -1341,7 +1341,7 @@
     $table->dump_records("fs" => " | ", "rs" => " <-+\n",
 			"fields" => [ "id", "msg" ]);'
 
-Also note that there is a script dbfdump(1) that does the printing.
+Also note that there is a script dbfdump.pl(1) that does the printing.
 
 =head2 Errors and debugging
 
@@ -1423,7 +1423,7 @@
 =head1 SEE ALSO
 
 perl(1); XBase::FAQ(3); DBD::XBase(3) and DBI(3) for DBI interface;
-dbfdump(1)
+dbfdump.pl(1)
 
 =cut
 
diff -ruN DBD-XBase-0.241-orig/Makefile.PL DBD-XBase-0.241/Makefile.PL
--- DBD-XBase-0.241-orig/Makefile.PL	2003-04-03 17:37:19.000000000 +0100
+++ DBD-XBase-0.241/Makefile.PL	2006-03-16 22:20:20.000000000 +0000
@@ -41,11 +41,11 @@
 	'AUTHOR'	=> 'Jan Pazdziora (adelton at fi.muni.cz)',
 	'ABSTRACT'	=> 'Reads and writes XBase (dbf) files, includes DBI support',
 		) : ()),
-	'PL_FILES'	=> { 'bin/dbfdump.PL' => 'bin/dbfdump',
+	'PL_FILES'	=> { 'bin/dbfdump.pl.PL' => 'bin/dbfdump.pl',
 				'bin/indexdump.PL' => 'bin/indexdump' },
-	'EXE_FILES'	=> [ 'bin/dbfdump', ' bin/indexdump' ],
+	'EXE_FILES'	=> [ 'bin/dbfdump.pl', ' bin/indexdump' ],
         'dist'		=> { COMPRESS => 'gzip -9f', SUFFIX => 'gz',
 		POSTOP => 'mv $(DISTNAME)-$(VERSION).tar.gz ../' },
-	'clean'		=> { FILES => 'bin/dbfdump bin/indexdump t/newtable.dbf t/newtable.dbt t/write.dbf t/write.dbt t/rooms1.dbf t/rooms1.cdx '},	
+	'clean'		=> { FILES => 'bin/dbfdump.pl bin/indexdump t/newtable.dbf t/newtable.dbt t/write.dbf t/write.dbt t/rooms1.dbf t/rooms1.cdx '},	
 	);
 
diff -ruN DBD-XBase-0.241-orig/MANIFEST DBD-XBase-0.241/MANIFEST
--- DBD-XBase-0.241-orig/MANIFEST	2003-07-07 19:30:41.000000000 +0100
+++ DBD-XBase-0.241/MANIFEST	2006-03-16 22:20:06.000000000 +0000
@@ -4,7 +4,7 @@
 Makefile.PL
 README
 ToDo
-bin/dbfdump.PL
+bin/dbfdump.pl.PL
 bin/indexdump.PL
 dbit/00base.t
 dbit/10dsnlist.t
diff -ruN DBD-XBase-0.241-orig/new-XBase DBD-XBase-0.241/new-XBase
--- DBD-XBase-0.241-orig/new-XBase	2001-02-06 10:44:13.000000000 +0000
+++ DBD-XBase-0.241/new-XBase	2006-03-16 22:09:55.000000000 +0000
@@ -395,7 +395,7 @@
     $table->dump_records("fs" => " | ", "rs" => " <-+\n",
 			"fields" => [ "id", "msg" ]);'
 
-Also note that there is a command line script dbfdump(1) that does
+Also note that there is a command line script dbfdump.pl(1) that does
 the printing.
 
 =head1 Writing the data
@@ -597,7 +597,7 @@
 
 XBase::FAQ(3); XBase::Index(3);
 DBD::XBase(3) and DBI(3) for DBI interface;
-dbfdump(1); perl(1)
+dbfdump.pl(1); perl(1)
 
 =cut
 
diff -ruN DBD-XBase-0.241-orig/README DBD-XBase-0.241/README
--- DBD-XBase-0.241-orig/README	2003-04-03 18:02:47.000000000 +0100
+++ DBD-XBase-0.241/README	2006-03-16 22:09:29.000000000 +0000
@@ -48,7 +48,7 @@
 		my $table = new XBase 'table.dbf';
 		my @data = $table->get_record(0);
 
-	The distribution also includes a dbfdump script that prints
+	The distribution also includes a dbfdump.pl script that prints
 	the content of the table in readable form.
 
 
@@ -75,7 +75,7 @@
 	native XBase engines produce data incompatible with this
 	module.
 
-	Man pages for XBase, DBD::XBase, dbfdump, XBase::Index and
+	Man pages for XBase, DBD::XBase, dbfdump.pl, XBase::Index and
 	XBase::SDBM are included, examples of little scripts can also
 	be found in eg/ directory of the distribution. Read the DBI
 	man page for DBI specific issues, and the XBase::FAQ page.
diff -ruN DBD-XBase-0.241-orig/t/4_dbfdump.t DBD-XBase-0.241/t/4_dbfdump.t
--- DBD-XBase-0.241-orig/t/4_dbfdump.t	2002-05-15 17:18:09.000000000 +0100
+++ DBD-XBase-0.241/t/4_dbfdump.t	2006-03-16 22:07:14.000000000 +0000
@@ -9,13 +9,13 @@
 use ExtUtils::testlib;
 my $libs = join " -I", '', @INC;
 
-my $dbfdump = "$dir/blib/script/dbfdump";
+my $dbfdump = "$dir/blib/script/dbfdump.pl";
 
 my $expected = join '', <DATA>;
 my $result = '';
 
 my $command = qq!$^X $libs $dbfdump "$dir/t/rooms.dbf"!;
-print "Running dbfdump rooms.dbf: $command\n";
+print "Running dbfdump.pl rooms.dbf: $command\n";
 $result = `$command`;
 
 if ($result ne $expected)
@@ -23,7 +23,7 @@
 print "ok 1\n";
 
 $command = qq!$^X $libs $dbfdump -- - < "$dir/t/rooms.dbf"!;
-print "Running stdin dbfdump < rooms.dbf: $command\n";
+print "Running stdin dbfdump.pl < rooms.dbf: $command\n";
 $result = `$command`;
 
 if ($result ne $expected)


Index: perl-DBD-XBase.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-DBD-XBase/devel/perl-DBD-XBase.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-DBD-XBase.spec	17 Feb 2006 18:33:17 -0000	1.3
+++ perl-DBD-XBase.spec	22 Apr 2006 22:50:48 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           perl-DBD-XBase
 Version:        0.241
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Perl module for reading and writing the dbf files
 
 Group:          Development/Libraries
@@ -8,6 +8,7 @@
 URL:            http://search.cpan.org/dist/DBD-XBase/
 Source0:        http://www.cpan.org/authors/id/J/JA/JANPAZ/DBD-XBase-%{version}.tar.gz
 Patch0:         DBD-XBase-0.241-indexdump.PL.patch
+Patch1:         DBD-XBase-0.241-dbfdump-rename.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -26,6 +27,7 @@
 %prep
 %setup -q -n DBD-XBase-%{version}
 %patch0 -p1
+%patch1 -p1
 chmod a-x eg/*table
 
 %build
@@ -61,6 +63,9 @@
 
 
 %changelog
+* Thu Mar 16 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.241-4
+- dbfdump renamed to dbfdump.pl to avoid file conflict with shapelib.
+
 * Fri Feb 17 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.241-3
 - Rebuild for FC5 (perl 5.8.8).
 



From fedora-extras-commits at redhat.com  Sun Apr 23 02:16:40 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Sat, 22 Apr 2006 19:16:40 -0700
Subject: rpms/libedit - New directory
Message-ID: <200604230216.k3N2Ggx5032558@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/libedit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32532/libedit

Log Message:
Directory /cvs/extras/rpms/libedit added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 23 02:16:41 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Sat, 22 Apr 2006 19:16:41 -0700
Subject: rpms/libedit/devel - New directory
Message-ID: <200604230216.k3N2GhRl032561@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/libedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32532/libedit/devel

Log Message:
Directory /cvs/extras/rpms/libedit/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 23 02:17:08 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Sat, 22 Apr 2006 19:17:08 -0700
Subject: rpms/libedit Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604230217.k3N2HA13032610@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/libedit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32577

Added Files:
	Makefile import.log 
Log Message:
Setup of module libedit


--- NEW FILE Makefile ---
# Top level Makefile for module libedit
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 23 02:17:09 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Sat, 22 Apr 2006 19:17:09 -0700
Subject: rpms/libedit/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604230217.k3N2HBcA032613@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/libedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32577/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libedit


--- 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 Apr 23 02:18:21 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Sat, 22 Apr 2006 19:18:21 -0700
Subject: rpms/libedit import.log,1.1,1.2
Message-ID: <200604230218.k3N2IN3j032676@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/libedit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32643

Modified Files:
	import.log 
Log Message:
auto-import libedit-2.9-2.20060213cvs on branch devel from libedit-2.9-2.20060213cvs.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libedit/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	23 Apr 2006 02:17:08 -0000	1.1
+++ import.log	23 Apr 2006 02:18:21 -0000	1.2
@@ -0,0 +1 @@
+libedit-2_9-2_20060213cvs:HEAD:libedit-2.9-2.20060213cvs.src.rpm:1145758688



From fedora-extras-commits at redhat.com  Sun Apr 23 02:18:22 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Sat, 22 Apr 2006 19:18:22 -0700
Subject: rpms/libedit/devel libedit.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604230218.k3N2IOGk032681@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/libedit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32643/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libedit.spec 
Log Message:
auto-import libedit-2.9-2.20060213cvs on branch devel from libedit-2.9-2.20060213cvs.src.rpm


--- NEW FILE libedit.spec ---
%define	snap	20060213

Name:           libedit
Version:        2.9
Release:        2.%{snap}cvs%{?dist}
Summary:        The NetBSD Editline library (libedit)

Group:          System Environment/Libraries
License:        BSD
URL:            http://www.thrysoee.dk/editline/
Source0:        http://www.thrysoee.dk/editline/%{name}-%{snap}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ncurses-devel 

%description
This is an autotool- and libtoolized port of the NetBSD Editline
library (libedit). This Berkeley-style licensed command line
editor library provides generic line editing, history, and
tokenization functions, similar to those found in GNU Readline.

%package	devel
Summary:	Development files for %{name}
Group:		System Environment/Libraries
Requires:	%{name} = %{version}-%{release}
Requires:	ncurses-devel

%description	devel
This is an autotool- and libtoolized port of the NetBSD Editline
library (libedit). This Berkeley-style licensed command line
editor library provides generic line editing, history, and
tokenization functions, similar to those found in GNU Readline.

This package contains development files for %{name}.

%prep
%setup -q -n %{name}-%{snap}-%{version}

%build
%configure
make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'

%clean
rm -rf %{buildroot}

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%post devel -p /sbin/ldconfig
%postun devel -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc ChangeLog INSTALL THANKS
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc examples/*.c
%{_includedir}/*
%{_libdir}/*.so
%{_libdir}/*.a
%{_mandir}/man3/*
%{_mandir}/man5/*

%changelog
* Thu Mar 23 2006 Michael J Knox <michael at knox.net.nz> 2.9-2.20060213cvs
- removed licence file I supplied, have requested upstream to provide one
- removed unrequire build dep

* Tue Mar 14 2006 Michael J Knox <michael at knox.net.nz> 2.9-1.20060213cvs
- removed .la
- added post and postun calls.
- fixed package groups and release.
- added %{name}.COPYING to include NetBSD BSD license.

* Tue Feb 14 2006 Michael J Knox <michael at knox.net.nz> 2.9-20060103cvs
- initial package for NetBSD's editline.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libedit/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2006 02:17:09 -0000	1.1
+++ .cvsignore	23 Apr 2006 02:18:21 -0000	1.2
@@ -0,0 +1 @@
+libedit-20060213-2.9.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libedit/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2006 02:17:09 -0000	1.1
+++ sources	23 Apr 2006 02:18:21 -0000	1.2
@@ -0,0 +1 @@
+adda2335413c044ae89af8b0a4bd3b69  libedit-20060213-2.9.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 23 02:24:05 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Sat, 22 Apr 2006 19:24:05 -0700
Subject: owners owners.list,1.875,1.876
Message-ID: <200604230224.k3N2O7kf032735@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32718

Modified Files:
	owners.list 
Log Message:
added entry for libedit



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.875
retrieving revision 1.876
diff -u -r1.875 -r1.876
--- owners.list	22 Apr 2006 19:56:07 -0000	1.875
+++ owners.list	23 Apr 2006 02:24:05 -0000	1.876
@@ -586,6 +586,7 @@
 Fedora Extras|libdnet|Simple portable interface to lowlevel networking routines|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
 Fedora Extras|libdsk|Disc drive library for use with the Fuse emulator|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|libebml|The Extensible Binary Meta Language library|anvil at livna.org|extras-qa at fedoraproject.org|
+Fedora Extras|libedit|The NetBSD Editline library|michael at knox.net.nz|extras-qa at fedoraproject.org|
 Fedora Extras|libesmtp|SMTP client library|pawsa at theochem.kth.se|extras-qa at fedoraproject.org|
 Fedora Extras|libetpan|Portable, efficient middleware for different kinds of mail access|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|libevent|Abstract asynchronous event notification library|redhat-bugzilla at camperquake.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Apr 23 06:54:59 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 22 Apr 2006 23:54:59 -0700
Subject: rpms/poker-eval/devel poker-eval.spec,1.2,1.3
Message-ID: <200604230655.k3N6t17b009304@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/poker-eval/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9287

Modified Files:
	poker-eval.spec 
Log Message:
Rename samples/ to examples/


Index: poker-eval.spec
===================================================================
RCS file: /cvs/extras/rpms/poker-eval/devel/poker-eval.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- poker-eval.spec	22 Apr 2006 19:52:45 -0000	1.2
+++ poker-eval.spec	23 Apr 2006 06:54:59 -0000	1.3
@@ -27,12 +27,14 @@
 # rpmlint fix
 chmod -x examples/five_card_hands.c
 
-# use samples/ directory for devel package %doc section
-mkdir samples/ && cp examples/*.c samples/
+#  use examples/ directory for devel package %doc section
+mkdir -p tmp/examples/ && cp examples/*.c tmp/examples
+rm -f tmp/examples/getopt_w32.c
 
 %build
 %configure --disable-static
 make %{?_smp_mflags}
+cp examples/Makefile tmp/examples
 
 %install
 rm -rf %{buildroot}
@@ -54,7 +56,7 @@
 
 %files devel
 %defattr(-,root,root,-)
-%doc samples
+%doc tmp/examples
 %{_includedir}/%{name}
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/%{name}.pc
@@ -62,7 +64,7 @@
 
 %changelog
 * Sat Apr 22 2006 Christopher Stone <chris.stone at gmail.com> 130.0-3
-- Copy .c files in samples directory and use this for devel's %doc
+- Copy .c files in tmp/examples directory and use this for devel's %doc
 
 * Tue Apr 18 2006 Christopher Stone <chris.stone at gmail.com> 130.0-2
 - Added %check section



From fedora-extras-commits at redhat.com  Sun Apr 23 06:56:36 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sat, 22 Apr 2006 23:56:36 -0700
Subject: rpms/poker-eval/devel poker-eval.spec,1.3,1.4
Message-ID: <200604230656.k3N6ucQJ009333@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/poker-eval/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9316

Modified Files:
	poker-eval.spec 
Log Message:
oops dont want this


Index: poker-eval.spec
===================================================================
RCS file: /cvs/extras/rpms/poker-eval/devel/poker-eval.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- poker-eval.spec	23 Apr 2006 06:54:59 -0000	1.3
+++ poker-eval.spec	23 Apr 2006 06:56:36 -0000	1.4
@@ -34,7 +34,6 @@
 %build
 %configure --disable-static
 make %{?_smp_mflags}
-cp examples/Makefile tmp/examples
 
 %install
 rm -rf %{buildroot}



From fedora-extras-commits at redhat.com  Sun Apr 23 09:18:26 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 23 Apr 2006 02:18:26 -0700
Subject: rpms/poker-eval/devel poker-eval.spec,1.4,1.5
Message-ID: <200604230918.k3N9ISTv016251@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/poker-eval/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16234

Modified Files:
	poker-eval.spec 
Log Message:
Fix % in changelog


Index: poker-eval.spec
===================================================================
RCS file: /cvs/extras/rpms/poker-eval/devel/poker-eval.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- poker-eval.spec	23 Apr 2006 06:56:36 -0000	1.4
+++ poker-eval.spec	23 Apr 2006 09:18:25 -0000	1.5
@@ -63,10 +63,10 @@
 
 %changelog
 * Sat Apr 22 2006 Christopher Stone <chris.stone at gmail.com> 130.0-3
-- Copy .c files in tmp/examples directory and use this for devel's %doc
+- Copy .c files in tmp/examples directory and use this for devel's %%doc
 
 * Tue Apr 18 2006 Christopher Stone <chris.stone at gmail.com> 130.0-2
-- Added %check section
+- Added %%check section
 - Removed make build_tables
 - Updated Source0 and URL
 



From fedora-extras-commits at redhat.com  Sun Apr 23 13:16:35 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun, 23 Apr 2006 06:16:35 -0700
Subject: rpms/ltsp-utils - New directory
Message-ID: <200604231316.k3NDGbg6025417@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/ltsp-utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25391/ltsp-utils

Log Message:
Directory /cvs/extras/rpms/ltsp-utils added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 23 13:16:35 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun, 23 Apr 2006 06:16:35 -0700
Subject: rpms/ltsp-utils/devel - New directory
Message-ID: <200604231316.k3NDGbxA025420@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/ltsp-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25391/ltsp-utils/devel

Log Message:
Directory /cvs/extras/rpms/ltsp-utils/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 23 13:16:55 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun, 23 Apr 2006 06:16:55 -0700
Subject: rpms/ltsp-utils Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604231316.k3NDGvID025469@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/ltsp-utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25436

Added Files:
	Makefile import.log 
Log Message:
Setup of module ltsp-utils


--- NEW FILE Makefile ---
# Top level Makefile for module ltsp-utils
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Apr 23 13:16:56 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun, 23 Apr 2006 06:16:56 -0700
Subject: rpms/ltsp-utils/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604231316.k3NDGw1c025472@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/ltsp-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25436/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ltsp-utils


--- 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 Apr 23 13:17:24 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun, 23 Apr 2006 06:17:24 -0700
Subject: rpms/ltsp-utils import.log,1.1,1.2
Message-ID: <200604231317.k3NDHQrO025533@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/ltsp-utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25500

Modified Files:
	import.log 
Log Message:
auto-import ltsp-utils-0.25-2 on branch devel from ltsp-utils-0.25-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ltsp-utils/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	23 Apr 2006 13:16:55 -0000	1.1
+++ import.log	23 Apr 2006 13:17:24 -0000	1.2
@@ -0,0 +1 @@
+ltsp-utils-0_25-2:HEAD:ltsp-utils-0.25-2.src.rpm:1145798237



From fedora-extras-commits at redhat.com  Sun Apr 23 13:17:25 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun, 23 Apr 2006 06:17:25 -0700
Subject: rpms/ltsp-utils/devel ltsp-utils.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604231317.k3NDHRT7025538@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/ltsp-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25500/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ltsp-utils.spec 
Log Message:
auto-import ltsp-utils-0.25-2 on branch devel from ltsp-utils-0.25-2.src.rpm


--- NEW FILE ltsp-utils.spec ---
Summary:   Linux Terminal Server Project (ltsp.org) utilities
Name:      ltsp-utils
Version:   0.25
Release:   2
License:   GPL
URL:       http://www.ltsp.org
Group:     Applications/System
Source:    http://ltsp.mirrors.tds.net/pub/ltsp/utils/%{name}-%{version}-0.tgz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n )
BuildArch: noarch
Requires:  dhcp
Requires:  nfs-utils
Requires:  tftp-server
Requires:  perl(LWP), perl(URI), perl(Digest::MD5), perl(Term::Cap)

%description
This package includes the following utilities for LTSP server:
  ltspadmin   For installing and managing the packages
              on an LTSP server.
  ltspcfg     For configuring the services on an LTSP server.
  ltspinfo    For querying the workstation, to learn things,
              such as which sound daemon is being used.

%prep
%setup -n %{name}

%build

%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_sbindir}
mkdir -p $RPM_BUILD_ROOT%{_bindir}
install ltspadmin ltspcfg $RPM_BUILD_ROOT%{_sbindir}
install ltspinfo $RPM_BUILD_ROOT%{_bindir}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root,-)
%doc ChangeLog notes.txt COPYING
%{_bindir}/ltspinfo
%{_sbindir}/ltspadmin
%{_sbindir}/ltspcfg

%changelog
* Sun Apr 23 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.25-2
- applied patch pertusus at free.fr
* Sat Apr 22 2006 <fedora at soeterbroek.com> - 0.25-1
- rebuild for upstream version 0.25
* Wed Apr 12 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.22-3
- removed Requires for perl-libwww-perl, perl-URI
* Wed Apr 12 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.22-2
- added Requires for perl(LWP), perl(URI), perl(Digest::MD5), perl(Term::Cap)
* Tue Apr 11 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.22-1
- rebuild for FE
* Mon Apr 10 2006 Jim McQuillan <jam at Ltsp.org>
- ltaspadmin - Fixed a problem handling non-numeric version/release numbers
* Sun Apr 9 2006 Jim McQuillan <jam at Ltsp.org>
- ltspcfg - Fixed problems with GDM and KDM on both Fedora FC5 and Ubuntu
- ltspadmin - Fixed problem with missing Termcap entries
- ltspadmin - Made it handle ltspcfg croaking a little nicer.
* Tue Apr 4 2006 Jim McQuillan <jam at Ltsp.org>
- ltspcfg - Changed the content that we write to dhcpd.conf, to include
  the auto-hostname stuff.
- ltspadmin - Added support for LTSP-4.2.  Also, it looks out for older
  versions of ltsp, to make sure you can't overwrite an existing installation.
- ltspcfg - fixed the problem with xdmcp showing up as NOT enabled.
- ltspadmin - Updated the pkgformat to 0.5, to support the new LTSP-4.2
  packages.
- ltspcfg - fixed autodetection of ubuntu/Breezy, and cleaned up the
  message about portmap on Debian.
* Wed Mar 16 2005 Jim McQuillan <jam at Ltsp.org>
- Changed the default url to be: http://ltsp.mirrors.tds.net/pub/ltsp/ltsp-4.1/
- Changed it to use a package.list file, rather than downloading each .ltsp
  file separately.
* Wed Aug 25 2004 Jim McQuillan <jam at Ltsp.org>
- Added code to deal with missing perl modules more gracefully.
- Added filtering of of multiple versions of the same program,
  so that only the latest version will get installed.
* Mon Aug 16 2004 Jim McQuillan <jam at Ltsp.org>
- Fixed problem with the version number in ltspadmin. It was being
  treated as a floating point number, so 0.10 was coming out as
  0.1.  I changed it to a string, and now it appears correct.
* Fri Aug 13 2004 Jim McQuillan <jam at Ltsp.org>
- Added binmode() to the download function. This fixes problems with
  md5sum mismatches that some people were having.  Thanks to
  Scott Chapman.
- Added testing for the LWP module, along with a reasonable message
  displays if LWP is not found.
* Wed Aug 4 2004 Jim McQuillan <jam at Ltsp.org>
- Fixed LANG problem in ltspadmin. It was causing md5 mismatches
* Tue Aug 3 2004 Jim McQuillan <jam at Ltsp.org>
- Added progress indicator to download screens
* Tue Jul 27 2004 Jim McQuillan <jam at Ltsp.org>
- Fixed problem in ltspcfg where it was missing the "disable" line
  in /etc/xinetd.d/tftp.
- Added progress indicator in ltspadmin
* Tue Jul 13 2004 Jim McQuillan <jam at Ltsp.org>
- Fixed testing of root in install.sh
- Moved ltspinfo to /usr/bin, instead of /usr/sbin
* Mon Jul 12 2004 Jim McQuillan <jam at Ltsp.org>
- Added ltspinfo
- Lots of fixes to ltspcfg contributed by Emiliano Gabrielli, mostly
  for Debian things.
- Fix to the Languange environment variables, to work better internationally
* Sat Jun 26 2004 Jim McQuillan <jam at Ltsp.org>
- Fixed accumulating of component size. It wasn't zeroing the total, so
  returning to the component list window would keep adding to the total.
* Thu Jun 24 2004 Jim McQuillan <jam at Ltsp.org>
- First build of the RPM package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ltsp-utils/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2006 13:16:56 -0000	1.1
+++ .cvsignore	23 Apr 2006 13:17:25 -0000	1.2
@@ -0,0 +1 @@
+ltsp-utils-0.25-0.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ltsp-utils/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2006 13:16:56 -0000	1.1
+++ sources	23 Apr 2006 13:17:25 -0000	1.2
@@ -0,0 +1 @@
+cb8197dddb83df25b70abd93a0dbd865  ltsp-utils-0.25-0.tgz



From fedora-extras-commits at redhat.com  Sun Apr 23 13:21:10 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun, 23 Apr 2006 06:21:10 -0700
Subject: owners owners.list,1.876,1.877
Message-ID: <200604231321.k3NDLC0E025603@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25586

Modified Files:
	owners.list 
Log Message:
added ltsp-utils


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.876
retrieving revision 1.877
diff -u -r1.876 -r1.877
--- owners.list	23 Apr 2006 02:24:05 -0000	1.876
+++ owners.list	23 Apr 2006 13:21:10 -0000	1.877
@@ -692,6 +692,7 @@
 Fedora Extras|loudmouth|Jabber programming library written in C|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|lout|A document formatting system|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|lrmi|Library for calling real mode BIOS routines|extras-orphan at fedoraproject.org|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|lucidlife|A Conway's Life simulator|peter at thecodergeek.com|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|



From fedora-extras-commits at redhat.com  Sun Apr 23 13:44:09 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sun, 23 Apr 2006 06:44:09 -0700
Subject: rpms/perl-List-MoreUtils - New directory
Message-ID: <200604231344.k3NDiBu0025767@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-List-MoreUtils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25741/perl-List-MoreUtils

Log Message:
Directory /cvs/extras/rpms/perl-List-MoreUtils added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 23 13:44:10 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sun, 23 Apr 2006 06:44:10 -0700
Subject: rpms/perl-List-MoreUtils/devel - New directory
Message-ID: <200604231344.k3NDiCpu025770@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-List-MoreUtils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25741/perl-List-MoreUtils/devel

Log Message:
Directory /cvs/extras/rpms/perl-List-MoreUtils/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 23 13:44:26 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sun, 23 Apr 2006 06:44:26 -0700
Subject: rpms/perl-List-MoreUtils Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604231344.k3NDiSYJ025819@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-List-MoreUtils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25786

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-List-MoreUtils


--- NEW FILE Makefile ---
# Top level Makefile for module perl-List-MoreUtils
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 23 13:44:39 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 23 Apr 2006 06:44:39 -0700
Subject: extras-buildsys/utils extras-repobuild.py, 1.13,
	1.14 extras-repoview.py, 1.3, 1.4 extras-sign-move.py, 1.10, 1.11
Message-ID: <200604231344.k3NDidak025855@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25830

Modified Files:
	extras-repobuild.py extras-repoview.py extras-sign-move.py 
Log Message:
Make stuff a bit easier to adapt to other distros/projects.


Index: extras-repobuild.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/extras-repobuild.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- extras-repobuild.py	21 Apr 2006 15:59:41 -0000	1.13
+++ extras-repobuild.py	23 Apr 2006 13:44:36 -0000	1.14
@@ -25,7 +25,9 @@
 # email to fedora-extras-list with the built packages list
 # sing, dance, romance
 
-treedir = '/srv/rpmbuild/extras/tree/extras'
+distro = 'fedora'
+project = 'extras'
+treedir = '/srv/rpmbuild/%s/tree/%s' % (project, project)
 cachedir = '/tmp/repomd-cache'
 compsname = 'comps.xml'
 archdict = {'3':['x86_64', 'i386'], 
@@ -92,7 +94,7 @@
     if not archdict.has_key(dist):
         print "No Distribution named %s found" % dist
         sys.exit(1)
-    distdir = 'fedora-%s-extras' % dist        
+    distdir = '%s-%s-%s' % (distro, dist, project)
     destdir = os.path.join(treedir, dist)
     keep = (dist == 'development') and 1 or 2
 


Index: extras-repoview.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/extras-repoview.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- extras-repoview.py	21 Apr 2006 15:59:41 -0000	1.3
+++ extras-repoview.py	23 Apr 2006 13:44:36 -0000	1.4
@@ -21,7 +21,8 @@
 # get the path to where to look for the packages to be signed
 # make repoview
 
-treedir = '/srv/rpmbuild/extras/tree/extras'
+project = 'extras'
+treedir = '/srv/rpmbuild/%s/tree/%s' % (project, project)
 archdict = {'3':['x86_64', 'i386'], 
             '4':['ppc','x86_64', 'i386'],
             '5':['ppc','x86_64', 'i386'],


Index: extras-sign-move.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/extras-sign-move.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- extras-sign-move.py	21 Apr 2006 15:59:41 -0000	1.10
+++ extras-sign-move.py	23 Apr 2006 13:44:36 -0000	1.11
@@ -30,9 +30,19 @@
 # move pkgs into repo
 # email to fedora-extras-list with the built packages list
 
+distro = 'fedora'
+project = 'extras'
+project_hr = 'Fedora Extras'
+mail_from = 'buildsys at fedoraproject.org'
+mail_to = 'fedora-extras-list at redhat.com'
+mail_footer = """
 
+For more information about the built packages please see the repository
+or the fedora Info Feed: http://fedoraproject.org/infofeed/
+
+"""
 stagesdir = '/srv/rpmbuild/repodir'
-treedir = '/srv/rpmbuild/extras/tree/extras'
+treedir = '/srv/rpmbuild/%s/tree/%s' % (project, project)
 cachedir = '/tmp/repomd-cache'
 compsname = 'comps.xml'
 archdict = {'3':['x86_64', 'i386'], 
@@ -115,27 +125,19 @@
 
 
 def email_list(pkglist, dist):
-    """email extras list with the new package listing"""
-    mail_from = 'buildsys at fedoraproject.org'
-    mail_to = 'fedora-extras-list at redhat.com'
+    """email mailing list with the new package listing"""
 
     uniqued = rpmUtils.miscutils.unique(pkglist)
     uniqued.sort()
     
-    output = "\nPackages built and released for Fedora Extras %s: %s \n\n" % (dist, len(uniqued))
+    output = "\nPackages built and released for %s %s: %s \n\n" % (project_hr, dist, len(uniqued))
     for pkg in uniqued:
         add = '%s\n' % (pkg)
         output = output + add
     
-    end = """
-
-For more information about the built packages please see the repository
-or the fedora Info Feed: http://fedoraproject.org/infofeed/
-
-"""
-    output = output + end
+    output = output + mail_footer
     msg = MIMEText(output)
-    subject = 'Fedora Extras %s Package Build Report' % dist
+    subject = '%s %s Package Build Report' % (project_hr, dist)
     msg['Subject'] = subject
     msg['From'] = mail_from
     msg['To'] = mail_to
@@ -171,7 +173,7 @@
     if not archdict.has_key(dist):
         print "No Distribution named %s found" % dist
         sys.exit(5)
-    distdir = 'fedora-%s-extras' % dist    
+    distdir = '%s-%s-%s' % (distro, dist, project)
     needsign = os.path.join(stagesdir, distdir)
     files = find_files(needsign)
     rpms = files['rpm'] + files['srpm'] + files['debuginfo']    
@@ -275,7 +277,7 @@
             shutil.move(package, rpmloc)
 
     # email the list
-    if not DEBUG:
+    if not DEBUG and mail_to:
         print "Emailing info"
         email_list(infolist, dist)
     



From fedora-extras-commits at redhat.com  Sun Apr 23 13:44:26 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sun, 23 Apr 2006 06:44:26 -0700
Subject: rpms/perl-List-MoreUtils/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604231344.k3NDiSGU025822@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-List-MoreUtils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25786/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-List-MoreUtils


--- 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 Apr 23 13:45:00 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sun, 23 Apr 2006 06:45:00 -0700
Subject: rpms/perl-List-MoreUtils import.log,1.1,1.2
Message-ID: <200604231345.k3NDj2n3025911@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-List-MoreUtils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25878

Modified Files:
	import.log 
Log Message:
auto-import perl-List-MoreUtils-0.19-1 on branch devel from perl-List-MoreUtils-0.19-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-List-MoreUtils/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	23 Apr 2006 13:44:26 -0000	1.1
+++ import.log	23 Apr 2006 13:45:00 -0000	1.2
@@ -0,0 +1 @@
+perl-List-MoreUtils-0_19-1:HEAD:perl-List-MoreUtils-0.19-1.src.rpm:1145799892



From fedora-extras-commits at redhat.com  Sun Apr 23 13:45:00 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sun, 23 Apr 2006 06:45:00 -0700
Subject: rpms/perl-List-MoreUtils/devel perl-List-MoreUtils.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604231345.k3NDj21h025916@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-List-MoreUtils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25878/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-List-MoreUtils.spec 
Log Message:
auto-import perl-List-MoreUtils-0.19-1 on branch devel from perl-List-MoreUtils-0.19-1.src.rpm


--- NEW FILE perl-List-MoreUtils.spec ---
Name:           perl-List-MoreUtils
Version:        0.19
Release:        1%{?dist}
Summary:        Provide the stuff missing in List::Util

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/List-MoreUtils/
Source0:        http://www.cpan.org/authors/id/V/VP/VPARSEVAL/List-MoreUtils-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  perl(Test::Pod)
BuildRequires:  perl(Test::Pod::Coverage)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
List::MoreUtils provides some trivial but commonly needed functionality
on lists which is not going to go into List::Util.


%prep
%setup -q -n List-MoreUtils-%{version}


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorarch}/List/
%{perl_vendorarch}/auto/List/
%{_mandir}/man3/*.3pm*


%changelog
* Sat Apr 22 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.19-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-List-MoreUtils/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2006 13:44:26 -0000	1.1
+++ .cvsignore	23 Apr 2006 13:45:00 -0000	1.2
@@ -0,0 +1 @@
+List-MoreUtils-0.19.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-List-MoreUtils/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2006 13:44:26 -0000	1.1
+++ sources	23 Apr 2006 13:45:00 -0000	1.2
@@ -0,0 +1 @@
+2cbcb4a96b4570cb28dfcbb2d0c6b08c  List-MoreUtils-0.19.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 23 13:53:34 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Sun, 23 Apr 2006 06:53:34 -0700
Subject: owners owners.list,1.877,1.878
Message-ID: <200604231353.k3NDrat8026026@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26009

Modified Files:
	owners.list 
Log Message:
New package: perl-List-MoreUtils (#189678)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.877
retrieving revision 1.878
diff -u -r1.877 -r1.878
--- owners.list	23 Apr 2006 13:21:10 -0000	1.877
+++ owners.list	23 Apr 2006 13:53:34 -0000	1.878
@@ -1027,6 +1027,7 @@
 Fedora Extras|perl-libintl|Internationalization library for Perl, compatible with gettext|matthias at rpmforge.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Lingua-EN-Inflect|Convert singular to plural, select "a" or "an"|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Lingua-EN-Inflect-Number|Force number of words to singular or plural|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-List-MoreUtils|Provide the stuff missing in List::Util|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Locale-Maketext-Fuzzy|Maketext from already interpolated strings|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Locale-Maketext-Lexicon|Extract translatable strings from source|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Locale-Maketext-Simple|Simple interface to Locale::Maketext::Lexicon|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Sun Apr 23 15:53:19 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 23 Apr 2006 08:53:19 -0700
Subject: rpms/SDL_mixer/devel SDL_mixer-1.2.6-64bit.patch, NONE,
	1.1 SDL_mixer.spec, 1.12, 1.13
Message-ID: <200604231553.k3NFrLuA031448@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/SDL_mixer/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31423

Modified Files:
	SDL_mixer.spec 
Added Files:
	SDL_mixer-1.2.6-64bit.patch 
Log Message:
* Sun Apr 23 2006 Brian Pepple <bdpepple at ameritech.net> - 1.2.6-8
- Add patch to fix sound on x86_64. Bug #175672.


SDL_mixer-1.2.6-64bit.patch:

--- NEW FILE SDL_mixer-1.2.6-64bit.patch ---
diff -ur SDL_mixer-1.2.6.OLD/timidity/config.h SDL_mixer-1.2.6/timidity/config.h
--- SDL_mixer-1.2.6.OLD/timidity/config.h	2004-12-16 00:20:14.000000000 -0500
+++ SDL_mixer-1.2.6/timidity/config.h	2006-04-23 11:28:44.000000000 -0400
@@ -185,14 +185,8 @@
 #define LITTLE_ENDIAN
 #endif
 
-/* DEC MMS has 64 bit long words */
-#ifdef DEC
 typedef unsigned int uint32;
 typedef int int32; 
-#else
-typedef unsigned long uint32;
-typedef long int32; 
-#endif
 typedef unsigned short uint16;
 typedef short int16;
 typedef unsigned char uint8;


Index: SDL_mixer.spec
===================================================================
RCS file: /cvs/extras/rpms/SDL_mixer/devel/SDL_mixer.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SDL_mixer.spec	13 Feb 2006 17:29:47 -0000	1.12
+++ SDL_mixer.spec	23 Apr 2006 15:53:19 -0000	1.13
@@ -1,6 +1,6 @@
 Name:		SDL_mixer
 Version:	1.2.6
-Release:	6%{?dist}
+Release:	8%{?dist}
 Summary:	Simple DirectMedia Layer - Sample Mixer Library
 
 Group:		System Environment/Libraries
@@ -10,6 +10,7 @@
 Patch1:		%{name}-1.0.6-redhat.patch
 Patch2:		%{name}-1.2.6-libmikmod.patch
 Patch4:		%{name}-1.2.5-bad_code.patch
+Patch5:		%{name}-1.2.6-64bit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Prefix:		%{_prefix}
@@ -48,6 +49,7 @@
 %patch1 -p1 -b .redhat
 %patch2 -p1 -b .libmikmod
 %patch4 -p1 -b .bad_code
+%patch5 -p1 -b .64bit
 
 
 %build
@@ -90,6 +92,9 @@
 
 
 %changelog
+* Sun Apr 23 2006 Brian Pepple <bdpepple at ameritech.net> - 1.2.6-8
+- Add patch to fix sound on x86_64. Bug #175672.
+
 * Mon Feb 13 2006 Brian Pepple <bdpepple at ameritech.net> - 1.2.6-6
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-extras-commits at redhat.com  Sun Apr 23 15:55:52 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Sun, 23 Apr 2006 08:55:52 -0700
Subject: rpms/SDL_mixer/FC-5 SDL_mixer-1.2.6-64bit.patch, NONE,
	1.1 SDL_mixer.spec, 1.12, 1.13
Message-ID: <200604231555.k3NFts9N031934@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/SDL_mixer/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31909

Modified Files:
	SDL_mixer.spec 
Added Files:
	SDL_mixer-1.2.6-64bit.patch 
Log Message:
* Sun Apr 23 2006 Brian Pepple <bdpepple at ameritech.net> - 1.2.6-7
- Add patch to fix sound on x86_64. Bug #175672.


SDL_mixer-1.2.6-64bit.patch:

--- NEW FILE SDL_mixer-1.2.6-64bit.patch ---
diff -ur SDL_mixer-1.2.6.OLD/timidity/config.h SDL_mixer-1.2.6/timidity/config.h
--- SDL_mixer-1.2.6.OLD/timidity/config.h	2004-12-16 00:20:14.000000000 -0500
+++ SDL_mixer-1.2.6/timidity/config.h	2006-04-23 11:28:44.000000000 -0400
@@ -185,14 +185,8 @@
 #define LITTLE_ENDIAN
 #endif
 
-/* DEC MMS has 64 bit long words */
-#ifdef DEC
 typedef unsigned int uint32;
 typedef int int32; 
-#else
-typedef unsigned long uint32;
-typedef long int32; 
-#endif
 typedef unsigned short uint16;
 typedef short int16;
 typedef unsigned char uint8;


Index: SDL_mixer.spec
===================================================================
RCS file: /cvs/extras/rpms/SDL_mixer/FC-5/SDL_mixer.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SDL_mixer.spec	13 Feb 2006 17:29:47 -0000	1.12
+++ SDL_mixer.spec	23 Apr 2006 15:55:52 -0000	1.13
@@ -1,6 +1,6 @@
 Name:		SDL_mixer
 Version:	1.2.6
-Release:	6%{?dist}
+Release:	7%{?dist}
 Summary:	Simple DirectMedia Layer - Sample Mixer Library
 
 Group:		System Environment/Libraries
@@ -10,6 +10,7 @@
 Patch1:		%{name}-1.0.6-redhat.patch
 Patch2:		%{name}-1.2.6-libmikmod.patch
 Patch4:		%{name}-1.2.5-bad_code.patch
+Patch5:		%{name}-1.2.6-64bit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Prefix:		%{_prefix}
@@ -48,6 +49,7 @@
 %patch1 -p1 -b .redhat
 %patch2 -p1 -b .libmikmod
 %patch4 -p1 -b .bad_code
+%patch5 -p1 -b .64bit
 
 
 %build
@@ -90,6 +92,9 @@
 
 
 %changelog
+* Sun Apr 23 2006 Brian Pepple <bdpepple at ameritech.net> - 1.2.6-7
+- Add patch to fix sound on x86_64. Bug #175672.
+
 * Mon Feb 13 2006 Brian Pepple <bdpepple at ameritech.net> - 1.2.6-6
 - rebuilt for new gcc4.1 snapshot and glibc changes
 



From fedora-extras-commits at redhat.com  Sun Apr 23 17:11:24 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun, 23 Apr 2006 10:11:24 -0700
Subject: rpms/dejavu-fonts import.log,1.45,1.46
Message-ID: <200604231711.k3NHBQLB005540@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5505

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.5.0-1.fc6 on branch devel from dejavu-fonts-2.5.0-1.fc6.src.rpm
2.5.0


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- import.log	30 Mar 2006 17:49:15 -0000	1.45
+++ import.log	23 Apr 2006 17:11:24 -0000	1.46
@@ -42,3 +42,4 @@
 dejavu-fonts-2_4_1-1_fc5:FC-5:dejavu-fonts-2.4.1-1.fc5.src.rpm:1143660631
 dejavu-fonts-2_4_1-1_fc4:FC-4:dejavu-fonts-2.4.1-1.fc4.src.rpm:1143660926
 dejavu-fonts-2_4_1-2_fc6:HEAD:dejavu-fonts-2.4.1-2.fc6.src.rpm:1143740939
+dejavu-fonts-2_5_0-1_fc6:HEAD:dejavu-fonts-2.5.0-1.fc6.src.rpm:1145812262



From fedora-extras-commits at redhat.com  Sun Apr 23 17:11:25 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun, 23 Apr 2006 10:11:25 -0700
Subject: rpms/dejavu-fonts/devel .cvsignore, 1.12, 1.13 dejavu-fonts.spec,
	1.19, 1.20 sources, 1.12, 1.13
Message-ID: <200604231711.k3NHBRKa005546@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5505/devel

Modified Files:
	.cvsignore dejavu-fonts.spec sources 
Log Message:
auto-import dejavu-fonts-2.5.0-1.fc6 on branch devel from dejavu-fonts-2.5.0-1.fc6.src.rpm
2.5.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	29 Mar 2006 19:25:23 -0000	1.12
+++ .cvsignore	23 Apr 2006 17:11:24 -0000	1.13
@@ -1 +1 @@
-dejavu-sfd-2.4.1.tar.gz
+dejavu-sfd-2.5.tar.gz


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/dejavu-fonts.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- dejavu-fonts.spec	30 Mar 2006 17:49:16 -0000	1.19
+++ dejavu-fonts.spec	23 Apr 2006 17:11:24 -0000	1.20
@@ -1,6 +1,6 @@
 %define archivename     dejavu-sfd
 # This macro has the same value as %{version}, except when testing pre-release snapshots
-%define archiveversion  %{version}
+%define archiveversion  2.5
 %define fontdir         %{_datadir}/fonts/%{name}
 %define xsldir          %{_datadir}/xml/%{name}
 
@@ -9,8 +9,8 @@
 %define UnicodeData	%(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt
 
 Name:      dejavu-fonts
-Version:   2.4.1
-Release:   2%{?dist}
+Version:   2.5.0
+Release:   1%{?dist}
 Summary:   DejaVu fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions
@@ -60,7 +60,7 @@
 
 
 %prep
-%setup -q -n %{archivename}-%{version}
+%setup -q -n %{archivename}-%{archiveversion}
 
 
 %build
@@ -161,10 +161,13 @@
 
 
 %changelog
-* Wed Mar 29 2006  Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.4.1-1
+* Sun Apr 23 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.5.0-1
+- 2.5.0
+
+* Wed Mar 29 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.4.1-1
 - 2.4.1 (workaround pango problems)
 
-* Wed Mar 22 2006  Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.4-1
+* Wed Mar 22 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.4-1
 - 2.4 A big thanks to Stepan Roh for getting the project there
 - split out experimental typefaces
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	29 Mar 2006 19:25:23 -0000	1.12
+++ sources	23 Apr 2006 17:11:25 -0000	1.13
@@ -1 +1 @@
-ea7ee1cd16880a8ce5b3e70d97c41fc8  dejavu-sfd-2.4.1.tar.gz
+402d2f846caa83c8067e281b3c5fa8c0  dejavu-sfd-2.5.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 23 17:12:22 2006
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu))
Date: Sun, 23 Apr 2006 10:12:22 -0700
Subject: rpms/muse - New directory
Message-ID: <200604231712.k3NHCORp005669@cvs-int.fedora.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/muse
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5642/muse

Log Message:
Directory /cvs/extras/rpms/muse added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 23 17:12:23 2006
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu))
Date: Sun, 23 Apr 2006 10:12:23 -0700
Subject: rpms/muse/devel - New directory
Message-ID: <200604231712.k3NHCPio005672@cvs-int.fedora.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/muse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5642/muse/devel

Log Message:
Directory /cvs/extras/rpms/muse/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 23 17:12:37 2006
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu))
Date: Sun, 23 Apr 2006 10:12:37 -0700
Subject: rpms/muse Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604231712.k3NHCd6g005741@cvs-int.fedora.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/muse
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5695

Added Files:
	Makefile import.log 
Log Message:
Setup of module muse


--- NEW FILE Makefile ---
# Top level Makefile for module muse
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 23 17:12:38 2006
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu))
Date: Sun, 23 Apr 2006 10:12:38 -0700
Subject: rpms/muse/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200604231712.k3NHCeOt005744@cvs-int.fedora.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/muse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5695/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module muse


--- 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 Apr 23 17:12:44 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun, 23 Apr 2006 10:12:44 -0700
Subject: rpms/dejavu-fonts/FC-5 .cvsignore, 1.12, 1.13 dejavu-fonts.spec,
	1.18, 1.19 sources, 1.12, 1.13
Message-ID: <200604231712.k3NHCkkO005778@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-serv5709/FC-5

Modified Files:
	.cvsignore dejavu-fonts.spec sources 
Log Message:
auto-import dejavu-fonts-2.5.0-1.fc5 on branch FC-5 from dejavu-fonts-2.5.0-1.fc5.src.rpm
2.5.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	29 Mar 2006 19:30:48 -0000	1.12
+++ .cvsignore	23 Apr 2006 17:12:44 -0000	1.13
@@ -1 +1 @@
-dejavu-sfd-2.4.1.tar.gz
+dejavu-sfd-2.5.tar.gz


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/dejavu-fonts.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- dejavu-fonts.spec	29 Mar 2006 19:30:48 -0000	1.18
+++ dejavu-fonts.spec	23 Apr 2006 17:12:44 -0000	1.19
@@ -1,6 +1,6 @@
 %define archivename     dejavu-sfd
 # This macro has the same value as %{version}, except when testing pre-release snapshots
-%define archiveversion  %{version}
+%define archiveversion  2.5
 %define fontdir         %{_datadir}/fonts/%{name}
 %define xsldir          %{_datadir}/xml/%{name}
 
@@ -9,7 +9,7 @@
 %define UnicodeData	%(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt
 
 Name:      dejavu-fonts
-Version:   2.4.1
+Version:   2.5.0
 Release:   1%{?dist}
 Summary:   DejaVu fonts
 Group:     User Interface/X
@@ -60,7 +60,7 @@
 
 
 %prep
-%setup -q -n %{archivename}-%{version}
+%setup -q -n %{archivename}-%{archiveversion}
 
 
 %build
@@ -161,10 +161,13 @@
 
 
 %changelog
-* Wed Mar 29 2006  Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.4.1-1
+* Sun Apr 23 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.5.0-1
+- 2.5.0
+
+* Wed Mar 29 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.4.1-1
 - 2.4.1 (workaround pango problems)
 
-* Wed Mar 22 2006  Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.4-1
+* Wed Mar 22 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.4-1
 - 2.4 A big thanks to Stepan Roh for getting the project there
 - split out experimental typefaces
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	29 Mar 2006 19:30:48 -0000	1.12
+++ sources	23 Apr 2006 17:12:44 -0000	1.13
@@ -1 +1 @@
-ea7ee1cd16880a8ce5b3e70d97c41fc8  dejavu-sfd-2.4.1.tar.gz
+402d2f846caa83c8067e281b3c5fa8c0  dejavu-sfd-2.5.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 23 17:13:10 2006
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu))
Date: Sun, 23 Apr 2006 10:13:10 -0700
Subject: rpms/muse import.log,1.1,1.2
Message-ID: <200604231713.k3NHDClW005834@cvs-int.fedora.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/muse
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5799

Modified Files:
	import.log 
Log Message:
auto-import muse-3.02.6b-4 on branch devel from muse-3.02.6b-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/muse/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	23 Apr 2006 17:12:37 -0000	1.1
+++ import.log	23 Apr 2006 17:13:10 -0000	1.2
@@ -0,0 +1 @@
+muse-3_02_6b-4:HEAD:muse-3.02.6b-4.src.rpm:1145812383



From fedora-extras-commits at redhat.com  Sun Apr 23 17:13:11 2006
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu))
Date: Sun, 23 Apr 2006 10:13:11 -0700
Subject: rpms/muse/devel muse.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200604231713.k3NHDDJj005839@cvs-int.fedora.redhat.com>

Author: jgu

Update of /cvs/extras/rpms/muse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5799/devel

Modified Files:
	.cvsignore sources 
Added Files:
	muse.spec 
Log Message:
auto-import muse-3.02.6b-4 on branch devel from muse-3.02.6b-4.src.rpm


--- NEW FILE muse.spec ---
%define pkg muse
%define xemacs 1

%define emacs_sitelisp %{_datadir}/emacs/site-lisp
%define emacs_ver 21.4

%if %{xemacs}
%define xemacs_sitelisp %{_datadir}/xemacs/xemacs-packages/lisp
%define xemacs_ver 21.4.18
%endif

Name: muse
Version: 3.02.6b       
Release: 4%{?dist}
Summary: Emacs Muse is an authoring and publishing environment for Emacs
Group: Applications/Editors
License: GPL        
URL: http://www.mwolson.org/projects/MuseMode.html           
BuildArch: noarch

Source0: http://download.gna.org/muse-el/%{pkg}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: emacs >= %{emacs_ver}, texinfo
Requires: /sbin/install-info 

%if %{xemacs}
BuildRequires: xemacs >= %{xemacs_ver}
%endif

%description 
Muse is an authoring and publishing environment for (X)Emacs. It simplifies
the process of writings documents and publishing them to various output
formats. Muse uses a very simple Wiki-like format as input.

Muse can publish to the following formats.

    * Blosxom
    * DocBook
    * HTML
    * LaTeX
    * PDF
    * Texinfo
    * XHTML
    * XML

This package contains the files common to both the Emacs and XEmacs
installations of Muse. You need to install either (or both) of emacs-%{pkg}
and xemacs-%{pkg} to use Muse.

%package -n emacs-%{pkg}
Summary: Compiled Muse lisp files for Emacs
Group: Applications/Editors
Requires: %{name} = %{version}
Requires: emacs >= %{emacs_ver}
Requires: tetex-latex

%description -n emacs-%{pkg}
This package contains the files required to use Muse with Emacs.

%package -n emacs-%{pkg}-el
Summary: Muse lisp source files for Emacs
Group: Applications/Editors
Requires: %{name} = %{version}
Requires: emacs-%{pkg} = %{version}

%description -n emacs-%{pkg}-el
This package contains the source lisp files for Muse for Emacs.

%if %{xemacs}
%package -n xemacs-%{pkg}
Summary: Compiled Muse lisp files for XEmacs
Group: Applications/Editors
Requires: %{name} = %{version}
Requires: xemacs >= %{xemacs_ver}
Requires: tetex-latex

%description -n xemacs-%{pkg}
This package contains the files required to use Muse with XEmacs.

%package -n xemacs-%{pkg}-el
Summary: Muse lisp source files for XEmacs
Group: Applications/Editors
Requires: %{name} = %{version}
Requires: xemacs-%{pkg} = %{version}

%description -n xemacs-%{pkg}-el
This package contains the source lisp files for Muse for XEmacs.
%endif

%prep
%setup -q -n %{pkg}-%{version}

%build #Note that %{_smp_mflags} causes make to hang sometimes here.
make all muse.html

%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_infodir}

make install \
  PREFIX=%{buildroot}/%{_usr} \
  INFODIR=%{buildroot}/%{_infodir} \
  INSTALLINFO="/sbin/install-info --infodir=%{buildroot}/%{_infodir}"

# Create startup file.
mkdir -p %{buildroot}/%{emacs_sitelisp}/site-start.d

cat > muse-init.el << EOF
;; Load muse-mode
(require 'muse-mode)

;; Load publishing styles
(require 'muse-html)
(require 'muse-latex)
(require 'muse-texinfo)
(require 'muse-docbook)
(require 'muse-wiki)
(require 'muse-journal)
EOF

cp muse-init.el %{buildroot}/%{emacs_sitelisp}/site-start.d/

# Xemacs files
%if %{xemacs}
make clean
make lisp EMACS=xemacs SITEFLAG=-no-site-file 
make install-bin ELISPDIR=%{buildroot}/%{xemacs_sitelisp}/%{pkg}
mkdir -p %{buildroot}/%{xemacs_sitelisp}/site-start.d
cp muse-init.el %{buildroot}/%{xemacs_sitelisp}/site-start.d/
%endif 

# Remove info dir creating by make install
rm -f %{buildroot}/usr/share/info/dir

%clean
rm -rf %{buildroot}

%post
/sbin/install-info %{_infodir}/muse.info %{_infodir}/dir 2>/dev/null || :

%preun
if [ $1 -eq 0 ]; then
  /sbin/install-info --delete %{_infodir}/muse.info %{_infodir}/dir 2>/dev/null || :
fi

%files
%defattr(-,root,root,-)
%doc README NEWS AUTHORS ChangeLog ChangeLog.2004 ChangeLog.main examples muse.html
%doc %{_infodir}/*

%files -n emacs-%{pkg}
%defattr(-,root,root,-)
%{emacs_sitelisp}/%{pkg}/*.elc
%dir %{emacs_sitelisp}/%{pkg}
%{emacs_sitelisp}/site-start.d/muse-init.el

%files -n emacs-%{pkg}-el
%defattr(-,root,root,-)
%{emacs_sitelisp}/%{pkg}/*.el

%if %{xemacs}
%files -n xemacs-%{pkg}
%defattr(-,root,root,-)
%{xemacs_sitelisp}/%{pkg}/*.elc
%dir %{xemacs_sitelisp}/%{pkg}
%{xemacs_sitelisp}/site-start.d/muse-init.el

%files -n xemacs-%{pkg}-el
%defattr(-,root,root,-)
%{xemacs_sitelisp}/%{pkg}/*.el
%endif

%changelog
* Sun Apr 23 2006 RPM building account <jonathan.underwood at gmail.com> - 3.02.6b-4
- Update to version 3.02.6b

* Sun Mar  5 2006 Jonathan Underwood <jonathan.underwood at gmail.com> - 3.02.6a-3
- Added BuildRequires: texinfo
- Remove info dir from buildroot (created by make install)

* Fri Feb 10 2006 Jonathan Underwood <jonathan.underwood at gmail.com> - 3.02.6a-1
- Initial package build



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/muse/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2006 17:12:38 -0000	1.1
+++ .cvsignore	23 Apr 2006 17:13:11 -0000	1.2
@@ -0,0 +1 @@
+muse-3.02.6b.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/muse/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2006 17:12:38 -0000	1.1
+++ sources	23 Apr 2006 17:13:11 -0000	1.2
@@ -0,0 +1 @@
+98fd1e6f5e6211f375561705854d4809  muse-3.02.6b.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 23 17:12:39 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun, 23 Apr 2006 10:12:39 -0700
Subject: rpms/dejavu-fonts import.log,1.46,1.47
Message-ID: <200604231713.k3NHDB2K005812@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5709

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.5.0-1.fc5 on branch FC-5 from dejavu-fonts-2.5.0-1.fc5.src.rpm
2.5.0


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- import.log	23 Apr 2006 17:11:24 -0000	1.46
+++ import.log	23 Apr 2006 17:12:38 -0000	1.47
@@ -43,3 +43,4 @@
 dejavu-fonts-2_4_1-1_fc4:FC-4:dejavu-fonts-2.4.1-1.fc4.src.rpm:1143660926
 dejavu-fonts-2_4_1-2_fc6:HEAD:dejavu-fonts-2.4.1-2.fc6.src.rpm:1143740939
 dejavu-fonts-2_5_0-1_fc6:HEAD:dejavu-fonts-2.5.0-1.fc6.src.rpm:1145812262
+dejavu-fonts-2_5_0-1_fc5:FC-5:dejavu-fonts-2.5.0-1.fc5.src.rpm:1145812342



From fedora-extras-commits at redhat.com  Sun Apr 23 17:16:05 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun, 23 Apr 2006 10:16:05 -0700
Subject: rpms/dejavu-fonts import.log,1.47,1.48
Message-ID: <200604231716.k3NHGbrD005976@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5942

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.5.0-1.fc4 on branch FC-4 from dejavu-fonts-2.5.0-1.fc4.src.rpm
2.5.0


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- import.log	23 Apr 2006 17:12:38 -0000	1.47
+++ import.log	23 Apr 2006 17:16:05 -0000	1.48
@@ -44,3 +44,4 @@
 dejavu-fonts-2_4_1-2_fc6:HEAD:dejavu-fonts-2.4.1-2.fc6.src.rpm:1143740939
 dejavu-fonts-2_5_0-1_fc6:HEAD:dejavu-fonts-2.5.0-1.fc6.src.rpm:1145812262
 dejavu-fonts-2_5_0-1_fc5:FC-5:dejavu-fonts-2.5.0-1.fc5.src.rpm:1145812342
+dejavu-fonts-2_5_0-1_fc4:FC-4:dejavu-fonts-2.5.0-1.fc4.src.rpm:1145812549



From fedora-extras-commits at redhat.com  Sun Apr 23 17:16:06 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun, 23 Apr 2006 10:16:06 -0700
Subject: rpms/dejavu-fonts/FC-4 .cvsignore, 1.12, 1.13 dejavu-fonts.spec,
	1.13, 1.14 sources, 1.12, 1.13
Message-ID: <200604231716.k3NHGccA005981@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5942/FC-4

Modified Files:
	.cvsignore dejavu-fonts.spec sources 
Log Message:
auto-import dejavu-fonts-2.5.0-1.fc4 on branch FC-4 from dejavu-fonts-2.5.0-1.fc4.src.rpm
2.5.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- .cvsignore	29 Mar 2006 19:35:42 -0000	1.12
+++ .cvsignore	23 Apr 2006 17:16:06 -0000	1.13
@@ -1 +1 @@
-dejavu-sfd-2.4.1.tar.gz
+dejavu-sfd-2.5.tar.gz


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/dejavu-fonts.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- dejavu-fonts.spec	29 Mar 2006 19:35:42 -0000	1.13
+++ dejavu-fonts.spec	23 Apr 2006 17:16:06 -0000	1.14
@@ -1,6 +1,6 @@
 %define archivename     dejavu-sfd
 # This macro has the same value as %{version}, except when testing pre-release snapshots
-%define archiveversion  %{version}
+%define archiveversion  2.5
 %define fontdir         %{_datadir}/fonts/%{name}
 
 # Let the perl Maintainer worry about Unicode.org data files (updates, licensing)
@@ -8,7 +8,7 @@
 %define UnicodeData    %(eval "$(%{__perl} -V:privlibexp)"; echo $privlibexp)/unicore/UnicodeData.txt
 
 Name:      dejavu-fonts
-Version:   2.4.1
+Version:   2.5.0
 Release:   1%{?dist}
 Summary:   DejaVu fonts
 Group:     User Interface/X
@@ -45,7 +45,7 @@
 
 
 %prep
-%setup -q -n %{archivename}-%{version}
+%setup -q -n %{archivename}-%{archiveversion}
 
 
 %build
@@ -127,10 +127,13 @@
 
 
 %changelog
-* Wed Mar 29 2006  Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.4.1-1
+* Sun Apr 23 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.5.0-1
+- 2.5.0
+
+* Wed Mar 29 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.4.1-1
 - 2.4.1 (workaround pango problems)
 
-* Wed Mar 22 2006  Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.4-1
+* Wed Mar 22 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 2.4-1
 - 2.4 A big thanks to Stepan Roh for getting the project there
 - split out experimental typefaces
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-4/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	29 Mar 2006 19:35:42 -0000	1.12
+++ sources	23 Apr 2006 17:16:06 -0000	1.13
@@ -1 +1 @@
-ea7ee1cd16880a8ce5b3e70d97c41fc8  dejavu-sfd-2.4.1.tar.gz
+402d2f846caa83c8067e281b3c5fa8c0  dejavu-sfd-2.5.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 23 17:20:28 2006
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu))
Date: Sun, 23 Apr 2006 10:20:28 -0700
Subject: owners owners.list,1.878,1.879
Message-ID: <200604231720.k3NHKUuA006033@cvs-int.fedora.redhat.com>

Author: jgu

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6016/owners

Modified Files:
	owners.list 
Log Message:
Added entry for emacs-muse package.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.878
retrieving revision 1.879
diff -u -r1.878 -r1.879
--- owners.list	23 Apr 2006 13:53:34 -0000	1.878
+++ owners.list	23 Apr 2006 17:20:28 -0000	1.879
@@ -224,6 +224,7 @@
 Fedora Extras|eet|A library designed to write an arbitary set of chunks of data to a file|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|elmo|Terminal-based mail client|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|emacs-auctex|Enhanced TeX modes for Emacsen|ed at eh3.com|extras-qa at fedoraproject.org|
+Fedora Extras|emacs-muse|Emacs Muse is an authoring and publishing environment for Emacsen|jonathan.underwood at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|embryo|A C like scripting language|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|emelfm2|A file manager that implements the popular two-pane design|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|enca|Character set analyzer and detector|dmitry at butskoy.name|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Apr 23 17:59:48 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun, 23 Apr 2006 10:59:48 -0700
Subject: rpms/ltsp-utils/devel ltsp-utils.spec,1.1,1.2
Message-ID: <200604231759.k3NHxoO1006354@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/ltsp-utils/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6337

Modified Files:
	ltsp-utils.spec 
Log Message:
* Sun Apr 23 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.25-3
- added %dist  macro to Release



Index: ltsp-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/ltsp-utils/devel/ltsp-utils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ltsp-utils.spec	23 Apr 2006 13:17:25 -0000	1.1
+++ ltsp-utils.spec	23 Apr 2006 17:59:48 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:   Linux Terminal Server Project (ltsp.org) utilities
 Name:      ltsp-utils
 Version:   0.25
-Release:   2
+Release:   3%{?dist}
 License:   GPL
 URL:       http://www.ltsp.org
 Group:     Applications/System
@@ -44,6 +44,8 @@
 %{_sbindir}/ltspcfg
 
 %changelog
+* Sun Apr 23 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.25-3
+- added %dist  macro to Release
 * Sun Apr 23 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.25-2
 - applied patch pertusus at free.fr
 * Sat Apr 22 2006 <fedora at soeterbroek.com> - 0.25-1



From fedora-extras-commits at redhat.com  Sun Apr 23 18:02:43 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun, 23 Apr 2006 11:02:43 -0700
Subject: rpms/ltsp-utils/FC-4 ltsp-utils.spec,1.1,1.2
Message-ID: <200604231803.k3NI3GME008513@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/ltsp-utils/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8457/FC-4

Modified Files:
	ltsp-utils.spec 
Log Message:
* Sun Apr 23 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.25-3
- added %dist  macro to Release



Index: ltsp-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/ltsp-utils/FC-4/ltsp-utils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ltsp-utils.spec	23 Apr 2006 13:17:25 -0000	1.1
+++ ltsp-utils.spec	23 Apr 2006 18:02:43 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:   Linux Terminal Server Project (ltsp.org) utilities
 Name:      ltsp-utils
 Version:   0.25
-Release:   2
+Release:   3%{?dist}
 License:   GPL
 URL:       http://www.ltsp.org
 Group:     Applications/System
@@ -44,6 +44,8 @@
 %{_sbindir}/ltspcfg
 
 %changelog
+* Sun Apr 23 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.25-3
+- added %dist  macro to Release
 * Sun Apr 23 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.25-2
 - applied patch pertusus at free.fr
 * Sat Apr 22 2006 <fedora at soeterbroek.com> - 0.25-1



From fedora-extras-commits at redhat.com  Sun Apr 23 18:02:50 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun, 23 Apr 2006 11:02:50 -0700
Subject: rpms/ltsp-utils/FC-5 ltsp-utils.spec,1.1,1.2
Message-ID: <200604231803.k3NI3MUA008526@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/ltsp-utils/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8457/FC-5

Modified Files:
	ltsp-utils.spec 
Log Message:
* Sun Apr 23 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.25-3
- added %dist  macro to Release



Index: ltsp-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/ltsp-utils/FC-5/ltsp-utils.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ltsp-utils.spec	23 Apr 2006 13:17:25 -0000	1.1
+++ ltsp-utils.spec	23 Apr 2006 18:02:50 -0000	1.2
@@ -1,7 +1,7 @@
 Summary:   Linux Terminal Server Project (ltsp.org) utilities
 Name:      ltsp-utils
 Version:   0.25
-Release:   2
+Release:   3%{?dist}
 License:   GPL
 URL:       http://www.ltsp.org
 Group:     Applications/System
@@ -44,6 +44,8 @@
 %{_sbindir}/ltspcfg
 
 %changelog
+* Sun Apr 23 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.25-3
+- added %dist  macro to Release
 * Sun Apr 23 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.25-2
 - applied patch pertusus at free.fr
 * Sat Apr 22 2006 <fedora at soeterbroek.com> - 0.25-1



From fedora-extras-commits at redhat.com  Sun Apr 23 18:05:29 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sun, 23 Apr 2006 11:05:29 -0700
Subject: rpms/xemacs/devel xemacs.desktop,1.2,1.3 xemacs.spec,1.23,1.24
Message-ID: <200604231805.k3NI5Vew008647@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/xemacs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8628

Modified Files:
	xemacs.desktop xemacs.spec 
Log Message:
* Sun Apr 23 2006 Ville Skytt?? <ville.skytta at iki.fi> - 21.5.26-4
- Bring StartupWMClass in desktop entry up to date.
- Fix non-MULE build.



Index: xemacs.desktop
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/xemacs.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xemacs.desktop	29 Jun 2005 21:35:00 -0000	1.2
+++ xemacs.desktop	23 Apr 2006 18:05:29 -0000	1.3
@@ -31,4 +31,4 @@
 Terminal=false
 Categories=Application;Development;TextEditor;
 Encoding=UTF-8
-StartupWMClass=Emacs
+StartupWMClass=XEmacs


Index: xemacs.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs/devel/xemacs.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xemacs.spec	15 Apr 2006 16:58:44 -0000	1.23
+++ xemacs.spec	23 Apr 2006 18:05:29 -0000	1.24
@@ -20,7 +20,7 @@
 
 Name:           xemacs
 Version:        21.5.26
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Different version of Emacs
 
 Group:          Applications/Editors
@@ -431,8 +431,10 @@
 %{_bindir}/xemacs-%{xver}
 %{_libdir}/xemacs-%{xver}/doc/
 %if %{with modules}
+%if %{with mule}
 %{_libdir}/xemacs-%{xver}/*linux/modules/canna_api.ell
 %endif
+%endif
 %{_datadir}/applications/*-%{name}.desktop
 %{_datadir}/icons/hicolor/48x48/apps/xemacs.png
 %{_mandir}/man1/gnuclient.1*
@@ -489,6 +491,10 @@
 
 
 %changelog
+* Sun Apr 23 2006 Ville Skytt?? <ville.skytta at iki.fi> - 21.5.26-4
+- Bring StartupWMClass in desktop entry up to date.
+- Fix non-MULE build.
+
 * Sat Apr 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 21.5.26-3
 - Don't expect to find ellcc if building without modules (#188929).
 - New --with/--without rpmbuild flags:



From fedora-extras-commits at redhat.com  Sun Apr 23 18:18:44 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun, 23 Apr 2006 11:18:44 -0700
Subject: rpms/dejavu-fonts import.log,1.48,1.49
Message-ID: <200604231818.k3NIIkI9008814@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/dejavu-fonts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8783

Modified Files:
	import.log 
Log Message:
auto-import dejavu-fonts-2.5.0-2.fc5 on branch FC-5 from dejavu-fonts-2.5.0-2.fc5.src.rpm
2.5.0


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/import.log,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- import.log	23 Apr 2006 17:16:05 -0000	1.48
+++ import.log	23 Apr 2006 18:18:43 -0000	1.49
@@ -45,3 +45,4 @@
 dejavu-fonts-2_5_0-1_fc6:HEAD:dejavu-fonts-2.5.0-1.fc6.src.rpm:1145812262
 dejavu-fonts-2_5_0-1_fc5:FC-5:dejavu-fonts-2.5.0-1.fc5.src.rpm:1145812342
 dejavu-fonts-2_5_0-1_fc4:FC-4:dejavu-fonts-2.5.0-1.fc4.src.rpm:1145812549
+dejavu-fonts-2_5_0-2_fc5:FC-5:dejavu-fonts-2.5.0-2.fc5.src.rpm:1145816306



From fedora-extras-commits at redhat.com  Sun Apr 23 18:18:44 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun, 23 Apr 2006 11:18:44 -0700
Subject: rpms/dejavu-fonts/FC-5 dejavu-fonts.spec,1.19,1.20
Message-ID: <200604231818.k3NIIkFY008818@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-serv8783/FC-5

Modified Files:
	dejavu-fonts.spec 
Log Message:
auto-import dejavu-fonts-2.5.0-2.fc5 on branch FC-5 from dejavu-fonts-2.5.0-2.fc5.src.rpm
2.5.0


Index: dejavu-fonts.spec
===================================================================
RCS file: /cvs/extras/rpms/dejavu-fonts/FC-5/dejavu-fonts.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- dejavu-fonts.spec	23 Apr 2006 17:12:44 -0000	1.19
+++ dejavu-fonts.spec	23 Apr 2006 18:18:44 -0000	1.20
@@ -10,7 +10,7 @@
 
 Name:      dejavu-fonts
 Version:   2.5.0
-Release:   1%{?dist}
+Release:   2%{?dist}
 Summary:   DejaVu fonts
 Group:     User Interface/X
 License:   Redistributable, with restrictions



From fedora-extras-commits at redhat.com  Sun Apr 23 18:39:34 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun, 23 Apr 2006 11:39:34 -0700
Subject: rpms/perl-Net-Server import.log,1.8,1.9
Message-ID: <200604231839.k3NIdaHS009036@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Net-Server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9003

Modified Files:
	import.log 
Log Message:
auto-import perl-Net-Server-0.93-1.fc6 on branch devel from perl-Net-Server-0.93-1.fc6.src.rpm
0.93


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/import.log,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- import.log	13 Feb 2006 21:41:37 -0000	1.8
+++ import.log	23 Apr 2006 18:39:34 -0000	1.9
@@ -5,3 +5,4 @@
 perl-Net-Server-0_90-1_fc4:FC-4:perl-Net-Server-0.90-1.fc4.src.rpm:1136724876
 perl-Net-Server-0_90-1_fc3:FC-3:perl-Net-Server-0.90-1.fc3.src.rpm:1136724984
 perl-Net-Server-0_90-2_fc5:HEAD:perl-Net-Server-0.90-2.fc5.src.rpm:1139866865
+perl-Net-Server-0_93-1_fc6:HEAD:perl-Net-Server-0.93-1.fc6.src.rpm:1145817558



From fedora-extras-commits at redhat.com  Sun Apr 23 18:39:35 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun, 23 Apr 2006 11:39:35 -0700
Subject: rpms/perl-Net-Server/devel .cvsignore, 1.4, 1.5 perl-Net-Server.spec,
	1.11, 1.12 sources, 1.4, 1.5
Message-ID: <200604231839.k3NIdbei009042@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Net-Server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9003/devel

Modified Files:
	.cvsignore perl-Net-Server.spec sources 
Log Message:
auto-import perl-Net-Server-0.93-1.fc6 on branch devel from perl-Net-Server-0.93-1.fc6.src.rpm
0.93


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Jan 2006 12:52:38 -0000	1.4
+++ .cvsignore	23 Apr 2006 18:39:34 -0000	1.5
@@ -1 +1 @@
-Net-Server-0.90.tar.gz
+Net-Server-0.93.tar.gz


Index: perl-Net-Server.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/devel/perl-Net-Server.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-Net-Server.spec	13 Feb 2006 21:41:43 -0000	1.11
+++ perl-Net-Server.spec	23 Apr 2006 18:39:34 -0000	1.12
@@ -1,8 +1,8 @@
 %define rname Net-Server
 
 Name:    perl-%{rname}
-Version: 0.90
-Release: 2%{?dist}
+Version: 0.93
+Release: 1%{?dist}
 Summary: Extensible, general Perl server engine
 
 Group:     Development/Libraries
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Sun Apr 23 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 0.93-1
+- 0.93
+
 * Mon Feb 13 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 0.90-2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Jan 2006 12:52:38 -0000	1.4
+++ sources	23 Apr 2006 18:39:34 -0000	1.5
@@ -1 +1 @@
-6874fc7b37ee2969aba03f1ccebbe6a3  Net-Server-0.90.tar.gz
+52f10776f695ea2ea94f656aa900dd0e  Net-Server-0.93.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 23 18:40:03 2006
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Sun, 23 Apr 2006 11:40:03 -0700
Subject: extras-buildsys/utils extras-sign-move.py,1.11,1.12
Message-ID: <200604231840.k3NIe3Xv009102@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9077

Modified Files:
	extras-sign-move.py 
Log Message:

if the file already exists, unlink it - this lets us sneak out silent
changes



Index: extras-sign-move.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/extras-sign-move.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- extras-sign-move.py	23 Apr 2006 13:44:36 -0000	1.11
+++ extras-sign-move.py	23 Apr 2006 18:40:01 -0000	1.12
@@ -243,6 +243,8 @@
                 rpmloc = os.path.join(destdir, arch, pkg_fn)
                 debugprint("Copying %s to %s" % (package, rpmloc))
                 if not DEBUG:                
+                    if os.path.exists(rpmloc):
+                        os.unlink(rpmloc)
                     shutil.copy2(package, rpmloc)
             
             if not DEBUG:



From fedora-extras-commits at redhat.com  Sun Apr 23 18:40:43 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun, 23 Apr 2006 11:40:43 -0700
Subject: rpms/perl-Net-Server import.log,1.9,1.10
Message-ID: <200604231840.k3NIejgt009165@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Net-Server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9132

Modified Files:
	import.log 
Log Message:
auto-import perl-Net-Server-0.93-1.fc5 on branch FC-5 from perl-Net-Server-0.93-1.fc5.src.rpm
0.93


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- import.log	23 Apr 2006 18:39:34 -0000	1.9
+++ import.log	23 Apr 2006 18:40:43 -0000	1.10
@@ -6,3 +6,4 @@
 perl-Net-Server-0_90-1_fc3:FC-3:perl-Net-Server-0.90-1.fc3.src.rpm:1136724984
 perl-Net-Server-0_90-2_fc5:HEAD:perl-Net-Server-0.90-2.fc5.src.rpm:1139866865
 perl-Net-Server-0_93-1_fc6:HEAD:perl-Net-Server-0.93-1.fc6.src.rpm:1145817558
+perl-Net-Server-0_93-1_fc5:FC-5:perl-Net-Server-0.93-1.fc5.src.rpm:1145817628



From fedora-extras-commits at redhat.com  Sun Apr 23 18:40:44 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun, 23 Apr 2006 11:40:44 -0700
Subject: rpms/perl-Net-Server/FC-5 .cvsignore, 1.4, 1.5 perl-Net-Server.spec,
	1.11, 1.12 sources, 1.4, 1.5
Message-ID: <200604231840.k3NIekuI009171@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Net-Server/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9132/FC-5

Modified Files:
	.cvsignore perl-Net-Server.spec sources 
Log Message:
auto-import perl-Net-Server-0.93-1.fc5 on branch FC-5 from perl-Net-Server-0.93-1.fc5.src.rpm
0.93


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Jan 2006 12:52:38 -0000	1.4
+++ .cvsignore	23 Apr 2006 18:40:44 -0000	1.5
@@ -1 +1 @@
-Net-Server-0.90.tar.gz
+Net-Server-0.93.tar.gz


Index: perl-Net-Server.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/FC-5/perl-Net-Server.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- perl-Net-Server.spec	13 Feb 2006 21:41:43 -0000	1.11
+++ perl-Net-Server.spec	23 Apr 2006 18:40:44 -0000	1.12
@@ -1,8 +1,8 @@
 %define rname Net-Server
 
 Name:    perl-%{rname}
-Version: 0.90
-Release: 2%{?dist}
+Version: 0.93
+Release: 1%{?dist}
 Summary: Extensible, general Perl server engine
 
 Group:     Development/Libraries
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Sun Apr 23 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 0.93-1
+- 0.93
+
 * Mon Feb 13 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 0.90-2
 - rebuilt for new gcc4.1 snapshot and glibc changes
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Jan 2006 12:52:38 -0000	1.4
+++ sources	23 Apr 2006 18:40:44 -0000	1.5
@@ -1 +1 @@
-6874fc7b37ee2969aba03f1ccebbe6a3  Net-Server-0.90.tar.gz
+52f10776f695ea2ea94f656aa900dd0e  Net-Server-0.93.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 23 18:40:59 2006
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Sun, 23 Apr 2006 11:40:59 -0700
Subject: extras-buildsys/utils extras-sign-move.py,1.12,1.13
Message-ID: <200604231840.k3NIexBA009230@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9184

Modified Files:
	extras-sign-move.py 
Log Message:

same for debuginfo



Index: extras-sign-move.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/extras-sign-move.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- extras-sign-move.py	23 Apr 2006 18:40:01 -0000	1.12
+++ extras-sign-move.py	23 Apr 2006 18:40:57 -0000	1.13
@@ -234,6 +234,8 @@
                 rpmloc = os.path.join(destdir, arch, pkg_fn)
                 debugprint("Copying %s to %s" % (package, rpmloc))
                 if not DEBUG:
+                    if os.path.exists(rpmloc):
+                        os.unlink(rpmloc)
                     shutil.copy2(package, rpmloc)
 
         if a == 'noarch':



From fedora-extras-commits at redhat.com  Sun Apr 23 18:41:52 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun, 23 Apr 2006 11:41:52 -0700
Subject: rpms/perl-Net-Server import.log,1.10,1.11
Message-ID: <200604231841.k3NIfspM009308@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Net-Server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9275

Modified Files:
	import.log 
Log Message:
auto-import perl-Net-Server-0.93-1.fc4 on branch FC-4 from perl-Net-Server-0.93-1.fc4.src.rpm
0.93


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/import.log,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- import.log	23 Apr 2006 18:40:43 -0000	1.10
+++ import.log	23 Apr 2006 18:41:52 -0000	1.11
@@ -7,3 +7,4 @@
 perl-Net-Server-0_90-2_fc5:HEAD:perl-Net-Server-0.90-2.fc5.src.rpm:1139866865
 perl-Net-Server-0_93-1_fc6:HEAD:perl-Net-Server-0.93-1.fc6.src.rpm:1145817558
 perl-Net-Server-0_93-1_fc5:FC-5:perl-Net-Server-0.93-1.fc5.src.rpm:1145817628
+perl-Net-Server-0_93-1_fc4:FC-4:perl-Net-Server-0.93-1.fc4.src.rpm:1145817696



From fedora-extras-commits at redhat.com  Sun Apr 23 18:41:53 2006
From: fedora-extras-commits at redhat.com (Nicolas Mailhot (nim))
Date: Sun, 23 Apr 2006 11:41:53 -0700
Subject: rpms/perl-Net-Server/FC-4 .cvsignore, 1.4, 1.5 perl-Net-Server.spec,
	1.10, 1.11 sources, 1.4, 1.5
Message-ID: <200604231841.k3NIftY4009314@cvs-int.fedora.redhat.com>

Author: nim

Update of /cvs/extras/rpms/perl-Net-Server/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9275/FC-4

Modified Files:
	.cvsignore perl-Net-Server.spec sources 
Log Message:
auto-import perl-Net-Server-0.93-1.fc4 on branch FC-4 from perl-Net-Server-0.93-1.fc4.src.rpm
0.93


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	8 Jan 2006 12:54:53 -0000	1.4
+++ .cvsignore	23 Apr 2006 18:41:52 -0000	1.5
@@ -1 +1 @@
-Net-Server-0.90.tar.gz
+Net-Server-0.93.tar.gz


Index: perl-Net-Server.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/FC-4/perl-Net-Server.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- perl-Net-Server.spec	8 Jan 2006 12:54:53 -0000	1.10
+++ perl-Net-Server.spec	23 Apr 2006 18:41:52 -0000	1.11
@@ -1,7 +1,7 @@
 %define rname Net-Server
 
 Name:    perl-%{rname}
-Version: 0.90
+Version: 0.93
 Release: 1%{?dist}
 Summary: Extensible, general Perl server engine
 
@@ -61,6 +61,12 @@
 
 
 %changelog
+* Sun Apr 23 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 0.93-1
+- 0.93
+
+* Mon Feb 13 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 0.90-2
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
 * Sun Jan 8 2006 Nicolas Mailhot <nicolas.mailhot at laposte.net> - 0.90-1
 - Updated to 0.90
 - add IO::Multiplex dep


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Net-Server/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	8 Jan 2006 12:54:53 -0000	1.4
+++ sources	23 Apr 2006 18:41:52 -0000	1.5
@@ -1 +1 @@
-6874fc7b37ee2969aba03f1ccebbe6a3  Net-Server-0.90.tar.gz
+52f10776f695ea2ea94f656aa900dd0e  Net-Server-0.93.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 23 19:03:34 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 23 Apr 2006 12:03:34 -0700
Subject: rpms/poker-eval/FC-4 poker-eval.spec,1.5,1.6
Message-ID: <200604231903.k3NJ3aGL011624@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/poker-eval/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11579/poker-eval/FC-4

Modified Files:
	poker-eval.spec 
Log Message:
bump release for rebuild


Index: poker-eval.spec
===================================================================
RCS file: /cvs/extras/rpms/poker-eval/FC-4/poker-eval.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- poker-eval.spec	23 Apr 2006 09:18:25 -0000	1.5
+++ poker-eval.spec	23 Apr 2006 19:03:34 -0000	1.6
@@ -1,10 +1,10 @@
 Name:           poker-eval
 Version:	130.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Poker hand evaluator library
 Group:          Development/Libraries
 License:        GPL
-URL:            https://gna.org/projects/pokersource/
+URL:            http://pokersource.org/poker-eval.php
 Source0:        http://download.gna.org/pokersource/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -27,8 +27,8 @@
 # rpmlint fix
 chmod -x examples/five_card_hands.c
 
-#  use examples/ directory for devel package %doc section
-mkdir -p tmp/examples/ && cp examples/*.c tmp/examples
+# use examples/ directory for devel package %doc section
+mkdir -p tmp/examples && cp examples/*.c tmp/examples
 rm -f tmp/examples/getopt_w32.c
 
 %build
@@ -62,6 +62,11 @@
 %exclude %{_libdir}/*.la
 
 %changelog
+* Sun Apr 23 2006 Christopher Stone <chris.stone at gmail.com> 130.0-4
+- Update URL tag to new home page
+- Minor spec file cleanups
+- Bump release number for rebuild on devel
+
 * Sat Apr 22 2006 Christopher Stone <chris.stone at gmail.com> 130.0-3
 - Copy .c files in tmp/examples directory and use this for devel's %%doc
 



From fedora-extras-commits at redhat.com  Sun Apr 23 19:03:34 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 23 Apr 2006 12:03:34 -0700
Subject: rpms/poker-eval/FC-5 poker-eval.spec,1.5,1.6
Message-ID: <200604231903.k3NJ3aL4011628@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-serv11579/poker-eval/FC-5

Modified Files:
	poker-eval.spec 
Log Message:
bump release for rebuild


Index: poker-eval.spec
===================================================================
RCS file: /cvs/extras/rpms/poker-eval/FC-5/poker-eval.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- poker-eval.spec	23 Apr 2006 09:18:25 -0000	1.5
+++ poker-eval.spec	23 Apr 2006 19:03:34 -0000	1.6
@@ -1,10 +1,10 @@
 Name:           poker-eval
 Version:	130.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Poker hand evaluator library
 Group:          Development/Libraries
 License:        GPL
-URL:            https://gna.org/projects/pokersource/
+URL:            http://pokersource.org/poker-eval.php
 Source0:        http://download.gna.org/pokersource/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -27,8 +27,8 @@
 # rpmlint fix
 chmod -x examples/five_card_hands.c
 
-#  use examples/ directory for devel package %doc section
-mkdir -p tmp/examples/ && cp examples/*.c tmp/examples
+# use examples/ directory for devel package %doc section
+mkdir -p tmp/examples && cp examples/*.c tmp/examples
 rm -f tmp/examples/getopt_w32.c
 
 %build
@@ -62,6 +62,11 @@
 %exclude %{_libdir}/*.la
 
 %changelog
+* Sun Apr 23 2006 Christopher Stone <chris.stone at gmail.com> 130.0-4
+- Update URL tag to new home page
+- Minor spec file cleanups
+- Bump release number for rebuild on devel
+
 * Sat Apr 22 2006 Christopher Stone <chris.stone at gmail.com> 130.0-3
 - Copy .c files in tmp/examples directory and use this for devel's %%doc
 



From fedora-extras-commits at redhat.com  Sun Apr 23 19:03:35 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 23 Apr 2006 12:03:35 -0700
Subject: rpms/poker-eval/devel poker-eval.spec,1.5,1.6
Message-ID: <200604231903.k3NJ3bwa011632@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/poker-eval/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11579/poker-eval/devel

Modified Files:
	poker-eval.spec 
Log Message:
bump release for rebuild


Index: poker-eval.spec
===================================================================
RCS file: /cvs/extras/rpms/poker-eval/devel/poker-eval.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- poker-eval.spec	23 Apr 2006 09:18:25 -0000	1.5
+++ poker-eval.spec	23 Apr 2006 19:03:35 -0000	1.6
@@ -1,10 +1,10 @@
 Name:           poker-eval
 Version:	130.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Poker hand evaluator library
 Group:          Development/Libraries
 License:        GPL
-URL:            https://gna.org/projects/pokersource/
+URL:            http://pokersource.org/poker-eval.php
 Source0:        http://download.gna.org/pokersource/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -27,8 +27,8 @@
 # rpmlint fix
 chmod -x examples/five_card_hands.c
 
-#  use examples/ directory for devel package %doc section
-mkdir -p tmp/examples/ && cp examples/*.c tmp/examples
+# use examples/ directory for devel package %doc section
+mkdir -p tmp/examples && cp examples/*.c tmp/examples
 rm -f tmp/examples/getopt_w32.c
 
 %build
@@ -62,6 +62,11 @@
 %exclude %{_libdir}/*.la
 
 %changelog
+* Sun Apr 23 2006 Christopher Stone <chris.stone at gmail.com> 130.0-4
+- Update URL tag to new home page
+- Minor spec file cleanups
+- Bump release number for rebuild on devel
+
 * Sat Apr 22 2006 Christopher Stone <chris.stone at gmail.com> 130.0-3
 - Copy .c files in tmp/examples directory and use this for devel's %%doc
 



From fedora-extras-commits at redhat.com  Sun Apr 23 19:17:23 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Sun, 23 Apr 2006 12:17:23 -0700
Subject: rpms/perl-Curses - New directory
Message-ID: <200604231917.k3NJHPxC011867@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/perl-Curses
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11846/perl-Curses

Log Message:
Directory /cvs/extras/rpms/perl-Curses added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 23 19:17:24 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Sun, 23 Apr 2006 12:17:24 -0700
Subject: rpms/perl-Curses/devel - New directory
Message-ID: <200604231917.k3NJHQPL011870@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/perl-Curses/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11846/perl-Curses/devel

Log Message:
Directory /cvs/extras/rpms/perl-Curses/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 23 19:17:35 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Sun, 23 Apr 2006 12:17:35 -0700
Subject: rpms/perl-Curses Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604231917.k3NJHbq5011919@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/perl-Curses
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11891

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Curses


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Curses
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 23 19:17:36 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Sun, 23 Apr 2006 12:17:36 -0700
Subject: rpms/perl-Curses/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604231917.k3NJHcH6011922@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/perl-Curses/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11891/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Curses


--- 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 Apr 23 19:17:55 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Sun, 23 Apr 2006 12:17:55 -0700
Subject: rpms/perl-Curses import.log,1.1,1.2
Message-ID: <200604231917.k3NJHvVa011988@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/perl-Curses
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11955

Modified Files:
	import.log 
Log Message:
auto-import perl-Curses-1.13-3 on branch devel from perl-Curses-1.13-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Curses/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	23 Apr 2006 19:17:35 -0000	1.1
+++ import.log	23 Apr 2006 19:17:55 -0000	1.2
@@ -0,0 +1 @@
+perl-Curses-1_13-3:HEAD:perl-Curses-1.13-3.src.rpm:1145819760



From fedora-extras-commits at redhat.com  Sun Apr 23 19:17:55 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Sun, 23 Apr 2006 12:17:55 -0700
Subject: rpms/perl-Curses/devel perl-Curses.spec, NONE, 1.1 .cvsignore, 1.1, 
	1.2 sources, 1.1, 1.2
Message-ID: <200604231918.k3NJHvgQ011993@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/perl-Curses/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11955/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Curses.spec 
Log Message:
auto-import perl-Curses-1.13-3 on branch devel from perl-Curses-1.13-3.src.rpm


--- NEW FILE perl-Curses.spec ---
Name:           perl-Curses
Version:        1.13
Release:        3%{?dist}
Summary:        Perl bindings for ncurses

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Curses/
Source0:        http://search.cpan.org/CPAN/authors/id/G/GI/GIRAFFED/Curses-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  ncurses-devel
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Perl bindings for ncurses, bringing terminal-independent character
handling capabilities to Perl.


%prep
%setup -q -n Curses-%{version}
sed -i -e 's|/usr/local/bin/perl|%{__perl}|' demo*


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" \
   PANELS MENUS FORMS
make %{?_smp_mflags}

# A note about the following alarming output...
#
#  WARNING: Your Curses form.h file appears to be in the default
#  system search path, which will not work for us because of
#  the conflicting Perl form.h file.  This means your 'make' will
#  probably fail unless you fix this, as described in the INSTALL
#  file.
#
#... can be ignored because /usr/include/form.h is a symlink to
#/usr/include/ncurses/form.h, which the Makefile.PL finds and
#uses quite happily.


%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/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Copying Artistic README demo*
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/Curses.pm
%{_mandir}/man3/*.3*


%changelog
* Fri Apr 21 2006 Garrick Staples <garrick at usc.edu> 1.13-3
- add a note about the falsely alarming warning
- don't remove execute bit from demos

* Thu Apr 20 2006 Garrick Staples <garrick at usc.edu> 1.13-2
- spec cleanups
- add doc files

* Wed Apr 19 2006 Garrick Staples <garrick at usc.edu> 1.13-1
- Initial spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Curses/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2006 19:17:36 -0000	1.1
+++ .cvsignore	23 Apr 2006 19:17:55 -0000	1.2
@@ -0,0 +1 @@
+Curses-1.13.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Curses/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2006 19:17:36 -0000	1.1
+++ sources	23 Apr 2006 19:17:55 -0000	1.2
@@ -0,0 +1 @@
+33f6a17f9ece7efda2dde3431e1540f6  Curses-1.13.tgz



From fedora-extras-commits at redhat.com  Sun Apr 23 19:21:05 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Sun, 23 Apr 2006 12:21:05 -0700
Subject: owners owners.list,1.879,1.880
Message-ID: <200604231921.k3NJL7cc012053@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12036

Modified Files:
	owners.list 
Log Message:
Added perl-Curses



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.879
retrieving revision 1.880
diff -u -r1.879 -r1.880
--- owners.list	23 Apr 2006 17:20:28 -0000	1.879
+++ owners.list	23 Apr 2006 19:21:05 -0000	1.880
@@ -924,6 +924,7 @@
 Fedora Extras|perl-Crypt-Random|Cryptographically Secure, True Random Number Generator|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Crypt-RSA|RSA public-key cryptosystem|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Crypt-SmbHash|Pure-perl Lanman and NT MD4 hash functions|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Curses|Perl bindings for ncurses|garrick at usc.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Data-Buffer|Read/write buffer class for perl|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Data-HexDump|Hexadecial Dumper|andreas at bawue.net|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Data-Page|Help when paging through sets of results|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Sun Apr 23 19:59:54 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 23 Apr 2006 12:59:54 -0700
Subject: rpms/poker-eval/devel poker-eval.spec,1.6,1.7
Message-ID: <200604231959.k3NJxuaX012307@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/poker-eval/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12260/poker-eval/devel

Modified Files:
	poker-eval.spec 
Log Message:
Update to new permanent URL


Index: poker-eval.spec
===================================================================
RCS file: /cvs/extras/rpms/poker-eval/devel/poker-eval.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- poker-eval.spec	23 Apr 2006 19:03:35 -0000	1.6
+++ poker-eval.spec	23 Apr 2006 19:59:53 -0000	1.7
@@ -1,10 +1,10 @@
 Name:           poker-eval
 Version:	130.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Poker hand evaluator library
 Group:          Development/Libraries
 License:        GPL
-URL:            http://pokersource.org/poker-eval.php
+URL:            http://pokersource.org/poker-eval/
 Source0:        http://download.gna.org/pokersource/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -62,6 +62,9 @@
 %exclude %{_libdir}/*.la
 
 %changelog
+* Sun Apr 23 2006 Christopher Stone <chris.stone at gmail.com> 130.0-5
+- Update URL to new permanent URL
+
 * Sun Apr 23 2006 Christopher Stone <chris.stone at gmail.com> 130.0-4
 - Update URL tag to new home page
 - Minor spec file cleanups



From fedora-extras-commits at redhat.com  Sun Apr 23 19:59:47 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 23 Apr 2006 12:59:47 -0700
Subject: rpms/poker-eval/FC-4 poker-eval.spec,1.6,1.7
Message-ID: <200604232000.k3NK0Jtj012321@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/poker-eval/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12260/poker-eval/FC-4

Modified Files:
	poker-eval.spec 
Log Message:
Update to new permanent URL


Index: poker-eval.spec
===================================================================
RCS file: /cvs/extras/rpms/poker-eval/FC-4/poker-eval.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- poker-eval.spec	23 Apr 2006 19:03:34 -0000	1.6
+++ poker-eval.spec	23 Apr 2006 19:59:47 -0000	1.7
@@ -1,10 +1,10 @@
 Name:           poker-eval
 Version:	130.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Poker hand evaluator library
 Group:          Development/Libraries
 License:        GPL
-URL:            http://pokersource.org/poker-eval.php
+URL:            http://pokersource.org/poker-eval/
 Source0:        http://download.gna.org/pokersource/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -62,6 +62,9 @@
 %exclude %{_libdir}/*.la
 
 %changelog
+* Sun Apr 23 2006 Christopher Stone <chris.stone at gmail.com> 130.0-5
+- Update URL to new permanent URL
+
 * Sun Apr 23 2006 Christopher Stone <chris.stone at gmail.com> 130.0-4
 - Update URL tag to new home page
 - Minor spec file cleanups



From fedora-extras-commits at redhat.com  Sun Apr 23 19:59:48 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Sun, 23 Apr 2006 12:59:48 -0700
Subject: rpms/poker-eval/FC-5 poker-eval.spec,1.6,1.7
Message-ID: <200604232000.k3NK0KXJ012324@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-serv12260/poker-eval/FC-5

Modified Files:
	poker-eval.spec 
Log Message:
Update to new permanent URL


Index: poker-eval.spec
===================================================================
RCS file: /cvs/extras/rpms/poker-eval/FC-5/poker-eval.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- poker-eval.spec	23 Apr 2006 19:03:34 -0000	1.6
+++ poker-eval.spec	23 Apr 2006 19:59:48 -0000	1.7
@@ -1,10 +1,10 @@
 Name:           poker-eval
 Version:	130.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Poker hand evaluator library
 Group:          Development/Libraries
 License:        GPL
-URL:            http://pokersource.org/poker-eval.php
+URL:            http://pokersource.org/poker-eval/
 Source0:        http://download.gna.org/pokersource/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -62,6 +62,9 @@
 %exclude %{_libdir}/*.la
 
 %changelog
+* Sun Apr 23 2006 Christopher Stone <chris.stone at gmail.com> 130.0-5
+- Update URL to new permanent URL
+
 * Sun Apr 23 2006 Christopher Stone <chris.stone at gmail.com> 130.0-4
 - Update URL tag to new home page
 - Minor spec file cleanups



From fedora-extras-commits at redhat.com  Sun Apr 23 21:20:11 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 23 Apr 2006 14:20:11 -0700
Subject: rpms/hugs98/FC-4 hugs98.spec,1.2,1.3
Message-ID: <200604232120.k3NLKDiH016902@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/hugs98/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16885

Modified Files:
	hugs98.spec 
Log Message:



Index: hugs98.spec
===================================================================
RCS file: /cvs/extras/rpms/hugs98/FC-4/hugs98.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hugs98.spec	22 Apr 2006 01:20:55 -0000	1.2
+++ hugs98.spec	23 Apr 2006 21:20:11 -0000	1.3
@@ -15,14 +15,7 @@
 BuildRequires:	freeglut-devel
 BuildRequires:	libGL-devel
 BuildRequires:	libGLU-devel
-BuildRequires:	libICE-devel
-BuildRequires:	libSM-devel
-BuildRequires:	libX11-devel
-BuildRequires:	libXi-devel
-BuildRequires:	libXmu-devel
-BuildRequires:	libXt-devel
-BuildRequires:	readline-devel
-BuildRequires:	xorg-x11-proto-devel
+BuildRequires:	xorg-x11-devel
 #BuildRequires:	openal-devel
 
 %description



From fedora-extras-commits at redhat.com  Sun Apr 23 21:31:46 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun, 23 Apr 2006 14:31:46 -0700
Subject: rpms/stripesnoop/devel stripesnoop.spec,1.4,1.5
Message-ID: <200604232131.k3NLVn54017029@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/stripesnoop/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16967/devel

Modified Files:
	stripesnoop.spec 
Log Message:

Fix broken dependencies



Index: stripesnoop.spec
===================================================================
RCS file: /cvs/extras/rpms/stripesnoop/devel/stripesnoop.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- stripesnoop.spec	5 Aug 2005 19:36:49 -0000	1.4
+++ stripesnoop.spec	23 Apr 2006 21:31:46 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		stripesnoop
 Version:	1.5
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL
 Group:		Applications/System
 Summary:	Magnetic Stripe Reader
@@ -11,6 +11,8 @@
 Patch1:		stripesnoop-1.5-deflinux.patch
 Patch2:		stripesnoop-1.5-asmio.patch
 Patch3:		stripesnoop-1.5-pathing.patch
+Provides:	stripesnoop-devel = %{version}-%{release}
+Obsoletes:	stripesnoop-devel
 
 %description
 Stripe Snoop is a suite of research tools that captures, modifies, validates, 
@@ -53,6 +55,9 @@
 %{_datadir}/%{name}/
 
 %changelog
+* Sun Apr 23 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.5-5
+- provide/obsolete old -devel package to keep the repo clean
+
 * Fri Aug  5 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.5-4
 - only use asm/io.h for ppc
 - get rid of devel package (unnecessary)



From fedora-extras-commits at redhat.com  Sun Apr 23 21:31:40 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun, 23 Apr 2006 14:31:40 -0700
Subject: rpms/stripesnoop/FC-4 stripesnoop.spec,1.4,1.5
Message-ID: <200604232132.k3NLWCYL017035@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/stripesnoop/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16967/FC-4

Modified Files:
	stripesnoop.spec 
Log Message:

Fix broken dependencies



Index: stripesnoop.spec
===================================================================
RCS file: /cvs/extras/rpms/stripesnoop/FC-4/stripesnoop.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- stripesnoop.spec	5 Aug 2005 19:36:44 -0000	1.4
+++ stripesnoop.spec	23 Apr 2006 21:31:40 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		stripesnoop
 Version:	1.5
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL
 Group:		Applications/System
 Summary:	Magnetic Stripe Reader
@@ -11,6 +11,8 @@
 Patch1:		stripesnoop-1.5-deflinux.patch
 Patch2:		stripesnoop-1.5-asmio.patch
 Patch3:		stripesnoop-1.5-pathing.patch
+Provides:	stripesnoop-devel = %{version}-%{release}
+Obsoletes:	stripesnoop-devel
 
 %description
 Stripe Snoop is a suite of research tools that captures, modifies, validates, 
@@ -53,6 +55,9 @@
 %{_datadir}/%{name}/
 
 %changelog
+* Sun Apr 23 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.5-5
+- provide/obsolete old -devel package to keep the repo clean
+
 * Fri Aug  5 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.5-4
 - only use asm/io.h for ppc
 - get rid of devel package (unnecessary)



From fedora-extras-commits at redhat.com  Sun Apr 23 21:31:39 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun, 23 Apr 2006 14:31:39 -0700
Subject: rpms/stripesnoop/FC-3 stripesnoop.spec,1.4,1.5
Message-ID: <200604232132.k3NLWBqh017032@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/stripesnoop/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16967/FC-3

Modified Files:
	stripesnoop.spec 
Log Message:

Fix broken dependencies



Index: stripesnoop.spec
===================================================================
RCS file: /cvs/extras/rpms/stripesnoop/FC-3/stripesnoop.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- stripesnoop.spec	5 Aug 2005 19:36:43 -0000	1.4
+++ stripesnoop.spec	23 Apr 2006 21:31:39 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		stripesnoop
 Version:	1.5
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL
 Group:		Applications/System
 Summary:	Magnetic Stripe Reader
@@ -11,6 +11,8 @@
 Patch1:		stripesnoop-1.5-deflinux.patch
 Patch2:		stripesnoop-1.5-asmio.patch
 Patch3:		stripesnoop-1.5-pathing.patch
+Provides:	stripesnoop-devel = %{version}-%{release}
+Obsoletes:	stripesnoop-devel
 
 %description
 Stripe Snoop is a suite of research tools that captures, modifies, validates, 
@@ -53,6 +55,9 @@
 %{_datadir}/%{name}/
 
 %changelog
+* Sun Apr 23 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.5-5
+- provide/obsolete old -devel package to keep the repo clean
+
 * Fri Aug  5 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.5-4
 - only use asm/io.h for ppc
 - get rid of devel package (unnecessary)



From fedora-extras-commits at redhat.com  Sun Apr 23 21:31:41 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Sun, 23 Apr 2006 14:31:41 -0700
Subject: rpms/stripesnoop/FC-5 stripesnoop.spec,1.4,1.5
Message-ID: <200604232132.k3NLWD1o017038@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/stripesnoop/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16967/FC-5

Modified Files:
	stripesnoop.spec 
Log Message:

Fix broken dependencies



Index: stripesnoop.spec
===================================================================
RCS file: /cvs/extras/rpms/stripesnoop/FC-5/stripesnoop.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- stripesnoop.spec	5 Aug 2005 19:36:49 -0000	1.4
+++ stripesnoop.spec	23 Apr 2006 21:31:41 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		stripesnoop
 Version:	1.5
-Release:	4%{?dist}
+Release:	5%{?dist}
 License:	GPL
 Group:		Applications/System
 Summary:	Magnetic Stripe Reader
@@ -11,6 +11,8 @@
 Patch1:		stripesnoop-1.5-deflinux.patch
 Patch2:		stripesnoop-1.5-asmio.patch
 Patch3:		stripesnoop-1.5-pathing.patch
+Provides:	stripesnoop-devel = %{version}-%{release}
+Obsoletes:	stripesnoop-devel
 
 %description
 Stripe Snoop is a suite of research tools that captures, modifies, validates, 
@@ -53,6 +55,9 @@
 %{_datadir}/%{name}/
 
 %changelog
+* Sun Apr 23 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.5-5
+- provide/obsolete old -devel package to keep the repo clean
+
 * Fri Aug  5 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.5-4
 - only use asm/io.h for ppc
 - get rid of devel package (unnecessary)



From fedora-extras-commits at redhat.com  Sun Apr 23 22:06:41 2006
From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken))
Date: Sun, 23 Apr 2006 15:06:41 -0700
Subject: rpms/aspell-he - New directory
Message-ID: <200604232206.k3NM6hq1019449@cvs-int.fedora.redhat.com>

Author: danken

Update of /cvs/extras/rpms/aspell-he
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19428/aspell-he

Log Message:
Directory /cvs/extras/rpms/aspell-he added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 23 22:06:42 2006
From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken))
Date: Sun, 23 Apr 2006 15:06:42 -0700
Subject: rpms/aspell-he/devel - New directory
Message-ID: <200604232206.k3NM6iCW019452@cvs-int.fedora.redhat.com>

Author: danken

Update of /cvs/extras/rpms/aspell-he/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19428/aspell-he/devel

Log Message:
Directory /cvs/extras/rpms/aspell-he/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 23 22:07:04 2006
From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken))
Date: Sun, 23 Apr 2006 15:07:04 -0700
Subject: rpms/aspell-he Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604232207.k3NM766V019501@cvs-int.fedora.redhat.com>

Author: danken

Update of /cvs/extras/rpms/aspell-he
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19473

Added Files:
	Makefile import.log 
Log Message:
Setup of module aspell-he


--- NEW FILE Makefile ---
# Top level Makefile for module aspell-he
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 23 22:07:05 2006
From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken))
Date: Sun, 23 Apr 2006 15:07:05 -0700
Subject: rpms/aspell-he/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604232207.k3NM77iZ019504@cvs-int.fedora.redhat.com>

Author: danken

Update of /cvs/extras/rpms/aspell-he/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19473/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module aspell-he


--- 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 Apr 23 22:08:09 2006
From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken))
Date: Sun, 23 Apr 2006 15:08:09 -0700
Subject: rpms/aspell-he import.log,1.1,1.2
Message-ID: <200604232208.k3NM8B18019571@cvs-int.fedora.redhat.com>

Author: danken

Update of /cvs/extras/rpms/aspell-he
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19538

Modified Files:
	import.log 
Log Message:
auto-import aspell-he-0.9-2 on branch devel from aspell-he-0.9-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/aspell-he/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	23 Apr 2006 22:07:04 -0000	1.1
+++ import.log	23 Apr 2006 22:08:09 -0000	1.2
@@ -0,0 +1 @@
+aspell-he-0_9-2:HEAD:aspell-he-0.9-2.src.rpm:1145830015



From fedora-extras-commits at redhat.com  Sun Apr 23 22:08:10 2006
From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken))
Date: Sun, 23 Apr 2006 15:08:10 -0700
Subject: rpms/aspell-he/devel aspell-he.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604232208.k3NM8CE4019576@cvs-int.fedora.redhat.com>

Author: danken

Update of /cvs/extras/rpms/aspell-he/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19538/devel

Modified Files:
	.cvsignore sources 
Added Files:
	aspell-he.spec 
Log Message:
auto-import aspell-he-0.9-2 on branch devel from aspell-he-0.9-2.src.rpm


--- NEW FILE aspell-he.spec ---
%define lang he
%define langrelease 0
Summary: Hebrew dictionary for Aspell
Name: aspell-%{lang}
Version: 0.9
Release: 2%{?dist}
License: GPL
Group: Applications/Text
URL: http://aspell.net/
Source: ftp://ftp.gnu.org/gnu/aspell/dict/%{lang}/aspell6-%{lang}-%{version}-%{langrelease}.tar.bz2
Buildrequires: aspell >= 12:0.60
Requires: aspell >= 12:0.60
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%define debug_package %{nil}

%description
Provides the word list/dictionaries for Hebrew.

# Note that this package, like other aspell's language packs, does not come up
# cleanly through rpmlint, but with the following errors:
# E: aspell-he no-binary
# E: aspell-he only-non-binary-in-usr-lib
# This is because the package contains only data files which sit under /usr/lib.
# They have to stay there, as they are architecture-dependent (due to
# byte-ordering issues).

%prep
%setup -q -n aspell6-%{lang}-%{version}-%{langrelease}

%build
cat > Makefile <<EOF
ASPELL = aspell
DEST_DIR = $RPM_BUILD_ROOT
WORD_LIST_COMPRESS = word-list-compress
PREZIP = prezip
dictdir = ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60
datadir = ${RPM_BUILD_ROOT}%{_libdir}/aspell-0.60
EOF
cat Makefile.pre >> Makefile
make

%install
make install

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-,root,root)
%doc COPYING Copyright
%{_libdir}/aspell-0.60/*

%changelog
* Sun Apr 23 2006 Dan Kenigsberg <danken at cs.technion.ac.il> 0.9-2
- Cleaned the spec file according to Bug 189157.
- Added a comment explaining why the rpmlint gives Errors for this package.
* Sun Apr 16 2006 Dan Kenigsberg <danken at cs.technion.ac.il> 0.9-1
- Stolen from the French spec file 50:0.50-9.2.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/aspell-he/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2006 22:07:05 -0000	1.1
+++ .cvsignore	23 Apr 2006 22:08:10 -0000	1.2
@@ -0,0 +1 @@
+aspell6-he-0.9-0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/aspell-he/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2006 22:07:05 -0000	1.1
+++ sources	23 Apr 2006 22:08:10 -0000	1.2
@@ -0,0 +1 @@
+f453989e1df364af9479e893c16ac9d8  aspell6-he-0.9-0.tar.bz2



From fedora-extras-commits at redhat.com  Sun Apr 23 22:12:27 2006
From: fedora-extras-commits at redhat.com (Dan Kenigsberg (danken))
Date: Sun, 23 Apr 2006 15:12:27 -0700
Subject: owners owners.list,1.880,1.881
Message-ID: <200604232212.k3NMCTPS019645@cvs-int.fedora.redhat.com>

Author: danken

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19628

Modified Files:
	owners.list 
Log Message:
added aspell-he (Hebrew dictionary for Aspell)



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.880
retrieving revision 1.881
diff -u -r1.880 -r1.881
--- owners.list	23 Apr 2006 19:21:05 -0000	1.880
+++ owners.list	23 Apr 2006 22:12:26 -0000	1.881
@@ -52,6 +52,7 @@
 Fedora Extras|artwiz-aleczapka-fonts|Set of (improved) artwiz fonts|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|asa|Convert Fortran carriage control characters|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|asciidoc|AsciiDoc text document fomatter|chrisw at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|aspell-he|Hebrew dictionary for Aspell (Hspell-based)|danken at cs.technion.ac.il|extras-qa at fedoraproject.org|
 Fedora Extras|at-poke|A tool for poking things|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|aterm|Aterm (Afterstep XVT) - a VT102 emulator for the X window system|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|athcool|Enables/disables Powersaving mode for AMD processors|gajownik at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Apr 23 22:33:58 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun, 23 Apr 2006 15:33:58 -0700
Subject: rpms/anjuta-gdl - New directory
Message-ID: <200604232234.k3NMY0sj019806@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta-gdl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19785/anjuta-gdl

Log Message:
Directory /cvs/extras/rpms/anjuta-gdl added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 23 22:33:59 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun, 23 Apr 2006 15:33:59 -0700
Subject: rpms/anjuta-gdl/devel - New directory
Message-ID: <200604232234.k3NMY1Dd019809@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta-gdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19785/anjuta-gdl/devel

Log Message:
Directory /cvs/extras/rpms/anjuta-gdl/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 23 22:34:33 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun, 23 Apr 2006 15:34:33 -0700
Subject: rpms/anjuta-gdl Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604232234.k3NMYZBg019866@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta-gdl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19833

Added Files:
	Makefile import.log 
Log Message:
Setup of module anjuta-gdl


--- NEW FILE Makefile ---
# Top level Makefile for module anjuta-gdl
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 23 22:34:33 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun, 23 Apr 2006 15:34:33 -0700
Subject: rpms/anjuta-gdl/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604232234.k3NMYZiL019869@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta-gdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19833/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module anjuta-gdl


--- 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 Apr 23 22:35:29 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun, 23 Apr 2006 15:35:29 -0700
Subject: rpms/anjuta-gdl import.log,1.1,1.2
Message-ID: <200604232236.k3NMa1fQ019935@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta-gdl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19899

Modified Files:
	import.log 
Log Message:
auto-import anjuta-gdl-0.6.0-5 on branch devel from anjuta-gdl-0.6.0-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/anjuta-gdl/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	23 Apr 2006 22:34:32 -0000	1.1
+++ import.log	23 Apr 2006 22:35:29 -0000	1.2
@@ -0,0 +1 @@
+anjuta-gdl-0_6_0-5:HEAD:anjuta-gdl-0.6.0-5.src.rpm:1145831749



From fedora-extras-commits at redhat.com  Sun Apr 23 22:35:30 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun, 23 Apr 2006 15:35:30 -0700
Subject: rpms/anjuta-gdl/devel anjuta-gdl.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604232236.k3NMa2Kp019939@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta-gdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19899/devel

Modified Files:
	.cvsignore sources 
Added Files:
	anjuta-gdl.spec 
Log Message:
auto-import anjuta-gdl-0.6.0-5 on branch devel from anjuta-gdl-0.6.0-5.src.rpm


--- NEW FILE anjuta-gdl.spec ---
Name:		anjuta-gdl
Summary:	Components and library for GNOME development tools
Version:	0.6.0
Release:	5%{?dist}
License:	GPL
Group:		Development/Libraries
Source:		http://ftp.gnome.org/pub/GNOME/sources/gdl/0.6/gdl-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
URL:		http://www.gnome.org
BuildRequires: 	gtk2-devel, libgnomeui-devel, libbonoboui-devel, libxml2-devel, librsvg2-devel

%description
This package contains components and libraries that are intended to be
shared between GNOME development tools, including gnome-build and anjuta2.


%package devel
Summary:	Libraries and include files for gdl
Group:		Development/Libraries
Requires:	%{name} = %{version}

%description devel
Libraries and header files if you want to make use of the gdl library in your
own programs.

%prep
%setup -q -n gdl-%{version}

%build
%configure --disable-static
make %{?_smp_mflags}

%install
rm -rf ${RPM_BUILD_ROOT}
mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/gdl/images
make DESTDIR=${RPM_BUILD_ROOT} install
find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
%find_lang gdl-1

%clean
rm -rf ${RPM_BUILD_ROOT}

%post
/sbin/ldconfig

%postun
/sbin/ldconfig

%files -f gdl-1.lang
%doc AUTHORS COPYING ChangeLog NEWS README
%defattr (-, root, root)
%{_libdir}/libgdl-1.so.*
%{_datadir}/gdl

%files devel
%defattr (-, root, root)
%{_includedir}/libgdl-1.0
%{_libdir}/*so
%{_libdir}/pkgconfig/gdl-1.0.pc

%changelog
* Sun Apr 23 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.6.0-5
- added --disable-static and removed the .a delete line
- very minor spec changes
- added find_lang again
- Thanks to rc040203 -at- freenet.de for spec changes

* Sat Apr 22 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.6.0-4
- Added %%find_lang
- Altered all buildreqs to be -devel
- Added requires gtk2

* Mon Apr 03 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.6.0-3
- Fixes to Requires (made to BuildRequires)

* Tue Feb 21 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.6.0-2
- Multiple fixes to the spec file
- Renamed rpm to anjuta-gdl to avoid conflict with another package called gdl

* Sat Feb 18 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 0.6.0-1
- Inital import for FC
- Large changes to the original spec file provided in the src file

* Tue Aug 10 2004 Pierre Sarrazin <http://sarrazip.com/>
- Update for version 0.4.0

* Tue Oct 24 2002 Jean Schurger <jschurger at schurger.org>
- Update for gnome 2 version

* Wed Aug 8 2001 Jens Finke <jens at gnome.org>
- created spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/anjuta-gdl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2006 22:34:33 -0000	1.1
+++ .cvsignore	23 Apr 2006 22:35:30 -0000	1.2
@@ -0,0 +1 @@
+gdl-0.6.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/anjuta-gdl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2006 22:34:33 -0000	1.1
+++ sources	23 Apr 2006 22:35:30 -0000	1.2
@@ -0,0 +1 @@
+527555a617fd670a0d4b7d03cae03dad  gdl-0.6.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 23 22:40:45 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun, 23 Apr 2006 15:40:45 -0700
Subject: owners owners.list,1.881,1.882
Message-ID: <200604232240.k3NMelpi020033@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20014/owners

Modified Files:
	owners.list 
Log Message:


Added : anjuta-gdl. Components and lib for Gnome dev tools
 
 	owners/owners.list 



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.881
retrieving revision 1.882
diff -u -r1.881 -r1.882
--- owners.list	23 Apr 2006 22:12:26 -0000	1.881
+++ owners.list	23 Apr 2006 22:40:45 -0000	1.882
@@ -36,6 +36,7 @@
 Fedora Extras|amavisd-new|Email filter with virus scanner and spamassassin support|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|amaya|W3C's browser/web authoring tool|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|anjuta|GNOME IDE for C and C++|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
+Fedora Extras|anjuta-gdl|Components and library for GNOME development tools|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|anthy|A Japanese character set input library|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|antiword|MS Word to ASCII/Postscript converter|adrian at lisas.de|extras-qa at fedoraproject.org|
 Fedora Extras|apachetop|A top-like display of Apache logs|gauret at free.fr|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Apr 23 23:06:40 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 23 Apr 2006 16:06:40 -0700
Subject: rpms/munin/devel munin-1.2.4-conf.patch, NONE,
	1.1 munin-1.2.4-cron.patch, NONE, 1.1 munin.spec, 1.6, 1.7
Message-ID: <200604232306.k3NN6gqq022243@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/munin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22220

Modified Files:
	munin.spec 
Added Files:
	munin-1.2.4-conf.patch munin-1.2.4-cron.patch 
Log Message:
add patch to remove unneeded munin-nagios in cron.
add patch to remove buildhostname in munin.conf (fixes #188928)
clean up prep section of spec.


munin-1.2.4-conf.patch:

--- NEW FILE munin-1.2.4-conf.patch ---
diff -Nur munin-1.2.4.orig/server/munin.conf.in munin-1.2.4/server/munin.conf.in
--- munin-1.2.4.orig/server/munin.conf.in	2005-10-08 04:11:02.000000000 -0600
+++ munin-1.2.4/server/munin.conf.in	2006-04-22 14:17:46.000000000 -0600
@@ -24,7 +24,7 @@
 #contact.nagios.command /usr/sbin/send_nsca -H nagios.host.com -c /etc/send_nsca.cfg
 
 # a simple host tree
-[@@HOSTNAME@@]
+[localhost]
     address 127.0.0.1
     use_node_name yes
 

munin-1.2.4-cron.patch:

--- NEW FILE munin-1.2.4-cron.patch ---
diff -Nur munin-1.2.4.orig/dists/redhat/munin.cron.d munin-1.2.4/dists/redhat/munin.cron.d
--- munin-1.2.4.orig/dists/redhat/munin.cron.d	2005-10-08 04:11:01.000000000 -0600
+++ munin-1.2.4/dists/redhat/munin.cron.d	2006-04-22 14:10:48.000000000 -0600
@@ -5,4 +5,3 @@
 MAILTO=root
 
 */5 * * * *     munin test -x /usr/bin/munin-cron && /usr/bin/munin-cron
-10 10 * * *     munin test -x /usr/share/munin/munin-nagios && /usr/share/munin/munin-nagios --removeok


Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/devel/munin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- munin.spec	24 Feb 2006 18:59:04 -0000	1.6
+++ munin.spec	23 Apr 2006 23:06:40 -0000	1.7
@@ -1,6 +1,6 @@
 Name:      munin
 Version:   1.2.4
-Release:   7%{?dist}
+Release:   8%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPL
 Group:     System Environment/Daemons
@@ -9,6 +9,8 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: http://download.sourceforge.net/sourceforge/munin/%{name}_%{version}.tar.gz
+Patch0: munin-1.2.4-cron.patch
+Patch1: munin-1.2.4-conf.patch
 BuildArchitectures: noarch
 Requires: perl-HTML-Template
 Requires: perl-Net-Server
@@ -66,8 +68,8 @@
 
 %prep
 %setup -q
-rm -rf %{buildroot}
-mkdir -p %{buildroot}
+%patch0 -p1
+%patch1 -p1
 
 %build
 
@@ -221,6 +223,11 @@
 %doc %{_mandir}/man5/munin-node*
 
 %changelog
+* Sat Apr 22 2006 Kevin Fenzi <kevin at tummy.com> - 1.2.4-8
+- add patch to remove unneeded munin-nagios in cron. 
+- add patch to remove buildhostname in munin.conf (fixes #188928)
+- clean up prep section of spec. 
+
 * Fri Feb 24 2006 Kevin Fenzi <kevin at scrye.com> - 1.2.4-7
 - Remove bogus Provides for perl RRDs (fixes #182702)
 



From fedora-extras-commits at redhat.com  Sun Apr 23 23:17:15 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 23 Apr 2006 16:17:15 -0700
Subject: rpms/munin/FC-5 munin-1.2.4-conf.patch, NONE,
	1.1 munin-1.2.4-cron.patch, NONE, 1.1 munin.spec, 1.6, 1.7
Message-ID: <200604232317.k3NNHHZS022371@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/munin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22346

Modified Files:
	munin.spec 
Added Files:
	munin-1.2.4-conf.patch munin-1.2.4-cron.patch 
Log Message:
add patch to remove unneeded munin-nagios in cron.
add patch to remove buildhostname in munin.conf (fixes #188928)
clean up prep section of spec.


munin-1.2.4-conf.patch:

--- NEW FILE munin-1.2.4-conf.patch ---
diff -Nur munin-1.2.4.orig/server/munin.conf.in munin-1.2.4/server/munin.conf.in
--- munin-1.2.4.orig/server/munin.conf.in	2005-10-08 04:11:02.000000000 -0600
+++ munin-1.2.4/server/munin.conf.in	2006-04-22 14:17:46.000000000 -0600
@@ -24,7 +24,7 @@
 #contact.nagios.command /usr/sbin/send_nsca -H nagios.host.com -c /etc/send_nsca.cfg
 
 # a simple host tree
-[@@HOSTNAME@@]
+[localhost]
     address 127.0.0.1
     use_node_name yes
 

munin-1.2.4-cron.patch:

--- NEW FILE munin-1.2.4-cron.patch ---
diff -Nur munin-1.2.4.orig/dists/redhat/munin.cron.d munin-1.2.4/dists/redhat/munin.cron.d
--- munin-1.2.4.orig/dists/redhat/munin.cron.d	2005-10-08 04:11:01.000000000 -0600
+++ munin-1.2.4/dists/redhat/munin.cron.d	2006-04-22 14:10:48.000000000 -0600
@@ -5,4 +5,3 @@
 MAILTO=root
 
 */5 * * * *     munin test -x /usr/bin/munin-cron && /usr/bin/munin-cron
-10 10 * * *     munin test -x /usr/share/munin/munin-nagios && /usr/share/munin/munin-nagios --removeok


Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/FC-5/munin.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- munin.spec	24 Feb 2006 18:59:04 -0000	1.6
+++ munin.spec	23 Apr 2006 23:17:15 -0000	1.7
@@ -1,6 +1,6 @@
 Name:      munin
 Version:   1.2.4
-Release:   7%{?dist}
+Release:   8%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPL
 Group:     System Environment/Daemons
@@ -9,6 +9,8 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: http://download.sourceforge.net/sourceforge/munin/%{name}_%{version}.tar.gz
+Patch0: munin-1.2.4-cron.patch
+Patch1: munin-1.2.4-conf.patch
 BuildArchitectures: noarch
 Requires: perl-HTML-Template
 Requires: perl-Net-Server
@@ -66,8 +68,8 @@
 
 %prep
 %setup -q
-rm -rf %{buildroot}
-mkdir -p %{buildroot}
+%patch0 -p1
+%patch1 -p1
 
 %build
 
@@ -221,6 +223,11 @@
 %doc %{_mandir}/man5/munin-node*
 
 %changelog
+* Sat Apr 22 2006 Kevin Fenzi <kevin at tummy.com> - 1.2.4-8
+- add patch to remove unneeded munin-nagios in cron. 
+- add patch to remove buildhostname in munin.conf (fixes #188928)
+- clean up prep section of spec. 
+
 * Fri Feb 24 2006 Kevin Fenzi <kevin at scrye.com> - 1.2.4-7
 - Remove bogus Provides for perl RRDs (fixes #182702)
 



From fedora-extras-commits at redhat.com  Sun Apr 23 23:21:26 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 23 Apr 2006 16:21:26 -0700
Subject: rpms/munin/FC-4 munin-1.2.4-conf.patch, NONE,
	1.1 munin-1.2.4-cron.patch, NONE, 1.1 munin.spec, 1.5, 1.6
Message-ID: <200604232321.k3NNLSrg022464@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/munin/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22441

Modified Files:
	munin.spec 
Added Files:
	munin-1.2.4-conf.patch munin-1.2.4-cron.patch 
Log Message:
add patch to remove unneeded munin-nagios in cron.
add patch to remove buildhostname in munin.conf (fixes #188928)
clean up prep section of spec.


munin-1.2.4-conf.patch:

--- NEW FILE munin-1.2.4-conf.patch ---
diff -Nur munin-1.2.4.orig/server/munin.conf.in munin-1.2.4/server/munin.conf.in
--- munin-1.2.4.orig/server/munin.conf.in	2005-10-08 04:11:02.000000000 -0600
+++ munin-1.2.4/server/munin.conf.in	2006-04-22 14:17:46.000000000 -0600
@@ -24,7 +24,7 @@
 #contact.nagios.command /usr/sbin/send_nsca -H nagios.host.com -c /etc/send_nsca.cfg
 
 # a simple host tree
-[@@HOSTNAME@@]
+[localhost]
     address 127.0.0.1
     use_node_name yes
 

munin-1.2.4-cron.patch:

--- NEW FILE munin-1.2.4-cron.patch ---
diff -Nur munin-1.2.4.orig/dists/redhat/munin.cron.d munin-1.2.4/dists/redhat/munin.cron.d
--- munin-1.2.4.orig/dists/redhat/munin.cron.d	2005-10-08 04:11:01.000000000 -0600
+++ munin-1.2.4/dists/redhat/munin.cron.d	2006-04-22 14:10:48.000000000 -0600
@@ -5,4 +5,3 @@
 MAILTO=root
 
 */5 * * * *     munin test -x /usr/bin/munin-cron && /usr/bin/munin-cron
-10 10 * * *     munin test -x /usr/share/munin/munin-nagios && /usr/share/munin/munin-nagios --removeok


Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/FC-4/munin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- munin.spec	24 Feb 2006 19:02:54 -0000	1.5
+++ munin.spec	23 Apr 2006 23:21:26 -0000	1.6
@@ -1,6 +1,6 @@
 Name:      munin
 Version:   1.2.4
-Release:   7%{?dist}
+Release:   8%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPL
 Group:     System Environment/Daemons
@@ -9,6 +9,8 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: http://download.sourceforge.net/sourceforge/munin/%{name}_%{version}.tar.gz
+Patch0: munin-1.2.4-cron.patch
+Patch1: munin-1.2.4-conf.patch
 BuildArchitectures: noarch
 Requires: perl-HTML-Template
 Requires: perl-Net-Server
@@ -66,8 +68,8 @@
 
 %prep
 %setup -q
-rm -rf %{buildroot}
-mkdir -p %{buildroot}
+%patch0 -p1
+%patch1 -p1
 
 %build
 
@@ -221,6 +223,11 @@
 %doc %{_mandir}/man5/munin-node*
 
 %changelog
+* Sat Apr 22 2006 Kevin Fenzi <kevin at tummy.com> - 1.2.4-8
+- add patch to remove unneeded munin-nagios in cron.
+- add patch to remove buildhostname in munin.conf (fixes #188928)
+- clean up prep section of spec.
+
 * Fri Feb 24 2006 Kevin Fenzi <kevin at tummy.com> - 1.2.4-7
 - Remove bogus Provides for perl RRDs (fixes #182702)
 



From fedora-extras-commits at redhat.com  Sun Apr 23 23:24:24 2006
From: fedora-extras-commits at redhat.com (Kevin Fenzi (kevin))
Date: Sun, 23 Apr 2006 16:24:24 -0700
Subject: rpms/munin/FC-3 munin-1.2.4-conf.patch, NONE,
	1.1 munin-1.2.4-cron.patch, NONE, 1.1 munin.spec, 1.5, 1.6
Message-ID: <200604232324.k3NNOQbi022614@cvs-int.fedora.redhat.com>

Author: kevin

Update of /cvs/extras/rpms/munin/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22574

Modified Files:
	munin.spec 
Added Files:
	munin-1.2.4-conf.patch munin-1.2.4-cron.patch 
Log Message:
add patch to remove unneeded munin-nagios in cron.
add patch to remove buildhostname in munin.conf (fixes #188928)
clean up prep section of spec.


munin-1.2.4-conf.patch:

--- NEW FILE munin-1.2.4-conf.patch ---
diff -Nur munin-1.2.4.orig/server/munin.conf.in munin-1.2.4/server/munin.conf.in
--- munin-1.2.4.orig/server/munin.conf.in	2005-10-08 04:11:02.000000000 -0600
+++ munin-1.2.4/server/munin.conf.in	2006-04-22 14:17:46.000000000 -0600
@@ -24,7 +24,7 @@
 #contact.nagios.command /usr/sbin/send_nsca -H nagios.host.com -c /etc/send_nsca.cfg
 
 # a simple host tree
-[@@HOSTNAME@@]
+[localhost]
     address 127.0.0.1
     use_node_name yes
 

munin-1.2.4-cron.patch:

--- NEW FILE munin-1.2.4-cron.patch ---
diff -Nur munin-1.2.4.orig/dists/redhat/munin.cron.d munin-1.2.4/dists/redhat/munin.cron.d
--- munin-1.2.4.orig/dists/redhat/munin.cron.d	2005-10-08 04:11:01.000000000 -0600
+++ munin-1.2.4/dists/redhat/munin.cron.d	2006-04-22 14:10:48.000000000 -0600
@@ -5,4 +5,3 @@
 MAILTO=root
 
 */5 * * * *     munin test -x /usr/bin/munin-cron && /usr/bin/munin-cron
-10 10 * * *     munin test -x /usr/share/munin/munin-nagios && /usr/share/munin/munin-nagios --removeok


Index: munin.spec
===================================================================
RCS file: /cvs/extras/rpms/munin/FC-3/munin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- munin.spec	24 Feb 2006 19:07:33 -0000	1.5
+++ munin.spec	23 Apr 2006 23:24:24 -0000	1.6
@@ -1,6 +1,6 @@
 Name:      munin
 Version:   1.2.4
-Release:   7%{?dist}
+Release:   8%{?dist}
 Summary:   Network-wide graphing framework (grapher/gatherer)
 License:   GPL
 Group:     System Environment/Daemons
@@ -9,6 +9,8 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: http://download.sourceforge.net/sourceforge/munin/%{name}_%{version}.tar.gz
+Patch0: munin-1.2.4-cron.patch
+Patch1: munin-1.2.4-conf.patch
 BuildArchitectures: noarch
 Provides: perl(RRDs)
 Requires: perl-HTML-Template
@@ -67,8 +69,8 @@
 
 %prep
 %setup -q
-rm -rf %{buildroot}
-mkdir -p %{buildroot}
+%patch0 -p1
+%patch1 -p1
 
 %build
 
@@ -222,6 +224,11 @@
 %doc %{_mandir}/man5/munin-node*
 
 %changelog
+* Sat Apr 22 2006 Kevin Fenzi <kevin at tummy.com> - 1.2.4-8
+- add patch to remove unneeded munin-nagios in cron.
+- add patch to remove buildhostname in munin.conf (fixes #188928)
+- clean up prep section of spec.
+
 * Fri Feb 24 2006 Kevin Fenzi <kevin at tummy.com> - 1.2.4-7
 - Remove bogus Provides for perl RRDs (fixes #182702)
 



From fedora-extras-commits at redhat.com  Sun Apr 23 23:24:38 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 23 Apr 2006 16:24:38 -0700
Subject: rpms/libchmxx - New directory
Message-ID: <200604232324.k3NNOeAi022693@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/libchmxx
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22664/libchmxx

Log Message:
Directory /cvs/extras/rpms/libchmxx added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 23 23:24:38 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 23 Apr 2006 16:24:38 -0700
Subject: rpms/libchmxx/devel - New directory
Message-ID: <200604232324.k3NNOenf022697@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/libchmxx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22664/libchmxx/devel

Log Message:
Directory /cvs/extras/rpms/libchmxx/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 23 23:24:55 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 23 Apr 2006 16:24:55 -0700
Subject: rpms/libchmxx Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604232324.k3NNOv7p022747@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/libchmxx
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22714

Added Files:
	Makefile import.log 
Log Message:
Setup of module libchmxx


--- NEW FILE Makefile ---
# Top level Makefile for module libchmxx
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 23 23:24:56 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 23 Apr 2006 16:24:56 -0700
Subject: rpms/libchmxx/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604232324.k3NNOwDC022750@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/libchmxx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22714/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module libchmxx


--- 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 Apr 23 23:25:37 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 23 Apr 2006 16:25:37 -0700
Subject: rpms/libchmxx import.log,1.1,1.2
Message-ID: <200604232325.k3NNPdZE022817@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/libchmxx
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22783

Modified Files:
	import.log 
Log Message:
auto-import libchmxx-0.1-2 on branch devel from libchmxx-0.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/libchmxx/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	23 Apr 2006 23:24:55 -0000	1.1
+++ import.log	23 Apr 2006 23:25:37 -0000	1.2
@@ -0,0 +1 @@
+libchmxx-0_1-2:HEAD:libchmxx-0.1-2.src.rpm:1145834696



From fedora-extras-commits at redhat.com  Sun Apr 23 23:25:38 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 23 Apr 2006 16:25:38 -0700
Subject: rpms/libchmxx/devel libchmxx-kchm-fixes.diff, NONE,
	1.1 libchmxx.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604232325.k3NNPeG0022824@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/rpms/libchmxx/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22783/devel

Modified Files:
	.cvsignore sources 
Added Files:
	libchmxx-kchm-fixes.diff libchmxx.spec 
Log Message:
auto-import libchmxx-0.1-2 on branch devel from libchmxx-0.1-2.src.rpm

libchmxx-kchm-fixes.diff:

--- NEW FILE libchmxx-kchm-fixes.diff ---
diff -u --recursive libchmxx-0.1-orig/src/chm.cpp libchmxx-0.1/src/chm.cpp
--- libchmxx-0.1-orig/src/chm.cpp	2003-10-03 13:34:19.000000000 +0200
+++ libchmxx-0.1/src/chm.cpp	2006-03-13 10:15:16.000000000 +0100
@@ -14,6 +14,8 @@
 using std::vector;
 using std::list;
 using std::map;
+using std::find;
+using std::transform;
 using namespace chm;
 
 namespace {
@@ -29,7 +31,7 @@
       if ( buf_size == file_size ) underflow(); // force loading of entire buffer, no more loads are done
     }
 
-    chmstreambuf (const char *b, size_t buf_size) : buf((char *)buf), buf_size(buf_size)
+    chmstreambuf (const char *b, size_t buf_size) : buf((char *)b), buf_size(buf_size)
     {
       is_cached = true;
       setg (buf, buf, buf + buf_size);
@@ -177,6 +179,7 @@
             if ( topics_file.empty() )
               {
                 string t = string(data.begin(), data.end() - 1);
+//				std::cout << t << std::endl;
                 if ( file_exists (t + ".hhc") )
                     topics_file = "/" + t + ".hhc";
                 if ( file_exists (t + ".hhk") )
@@ -247,11 +250,12 @@
                         last->title = value;
                     } else if ( name == "Local" ) {
                         last->path = "/" + value;
+                    } else if ( name == "local" ) {
+                        last->path = "/" + value;
                     }
                 }
                 if ( !tr.has_next () ) break; // faulty file
                 s = tr.get_next();
-
             }
             continue;
           }
diff -u --recursive libchmxx-0.1-orig/src/chmxx.h libchmxx-0.1/src/chmxx.h
--- libchmxx-0.1-orig/src/chmxx.h	2003-10-03 13:29:08.000000000 +0200
+++ libchmxx-0.1/src/chmxx.h	2006-03-13 10:14:54.000000000 +0100
@@ -9,6 +9,22 @@
 #include <list>
 #include <map>
 
+#ifndef __BYTE_ORDER
+	#ifndef BYTE_ORDER
+		#error: define proper byte order
+	#endif
+
+	#if BYTE_ORDER == LITTLE_ENDIAN
+		#define __LITTLE_ENDIAN LITTLE_ENDIAN
+		#define __BYTE_ORDER __LITTLE_ENDIAN
+	#elif BYTE_ORDER == BIG_ENDIAN
+		#define __BIG_ENDIAN BIG_ENDIAN
+		#define __BYTE_ORDER __BIG_ENDIAN
+	#else
+		#error: define proper byte order
+	#endif
+#endif
+
 /**
  * @mainpage
  * This is a c++ library for accessing the Microsoft(TM)
@@ -179,7 +195,7 @@
     unsigned long res = 0;  // long guatanteed to be 4 bytes
     read ((char *)&res, 4);
     return res;
-#else
+#elif __BYTE_ORDER == __BIG_ENDIAN
     char buf[4];
     read (buf, 4);
     size_t res = buf[0];
@@ -187,6 +203,8 @@
     res |= buf[2] << 16;
     res |= buf[3] << 24;
     return res;
+#else
+#error: define proper byte order
 #endif
   }
 
@@ -198,19 +216,21 @@
     unsigned int res = 0;   // int guaranteed to be 2 bytes
     read ((char *)&res, 2);
     return res;
-#else
+#elif __BYTE_ORDER == __BIG_ENDIAN
     char buf[2];
     read (buf, 2);
     unsigned int res = buf[0];
     res |= buf[1] << 8;
     return res;
+#else
+#error: define proper byte order
 #endif
   }
 
   /** Get a s-r encoded value from the stream. Scale must alwqays be 2.
     * Use 0 for initial pos. When finished reading an entry of sr-s
     * call the get_sr_finish(pos).*/
-  inline unsigned long get_sr (int s, int r, int& pos)
+  inline unsigned long get_sr (int , int r, int& pos)
   {
     int b = peek();
     int p = 0;


--- NEW FILE libchmxx.spec ---
Name:           libchmxx
Version:        0.1
Release:        2%{?dist}
Summary:        C++ bindings for chmlib

Group:          System Environment/Libraries
License:        LGPL/GPL
URL:            http://www.mare.ee/indrek/libchmxx/
Source0:        http://www.mare.ee/indrek/libchmxx/libchmxx-%{version}.tar.gz
Patch0:         libchmxx-kchm-fixes.diff
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  chmlib-devel
#Requires:       

%description
This is a C++ library for accessing Microsoft(tm) help
files (usually with extension chm).

%package devel
Summary:       Headers and development libraries for libchmxx
Group:         Development/Libraries
Requires:      %{name} = %{version}-%{release}
Requires:      chmlib-devel

%description devel
The libchmxx-devel package contains headers and development libraries
necessary for building programs against libchmxx.

%prep
%setup -q
%patch -p1

%build
%configure --disable-static
# fails with %{?_smp_mflags}
#make %{?_smp_mflags}
make

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT%{_libdir}/libchmxx.la

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS README COPYING COPYING.LIB
%{_bindir}/chmdissect
%{_libdir}/libchmxx.so.*

%files devel
%defattr(-,root,root,-)
%doc html/
%{_libdir}/libchmxx.so
%{_includedir}/chmxx.h

%changelog
* Mon Mar 13 2006 Patrice Dumas <pertusus at free.fr> 0.1-2
- disable static libs

* Mon Mar 13 2006 Patrice Dumas <pertusus at free.fr> 0.1-1
- initial release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libchmxx/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	23 Apr 2006 23:24:56 -0000	1.1
+++ .cvsignore	23 Apr 2006 23:25:38 -0000	1.2
@@ -0,0 +1 @@
+libchmxx-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libchmxx/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	23 Apr 2006 23:24:56 -0000	1.1
+++ sources	23 Apr 2006 23:25:38 -0000	1.2
@@ -0,0 +1 @@
+e2987a503d4d49ec4019b67c99921372  libchmxx-0.1.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 23 23:26:25 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun, 23 Apr 2006 16:26:25 -0700
Subject: rpms/anjuta/devel .cvsignore, 1.5, 1.6 anjuta.spec, 1.16,
	1.17 sources, 1.5, 1.6
Message-ID: <200604232326.k3NNQR0W022910@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22871/devel

Modified Files:
	.cvsignore anjuta.spec sources 
Log Message:
auto-import anjuta-1.2.4a-1 on branch devel from anjuta-1.2.4a-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/anjuta/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Feb 2006 23:24:25 -0000	1.5
+++ .cvsignore	23 Apr 2006 23:26:25 -0000	1.6
@@ -1 +1 @@
-anjuta-1.2.4.tar.gz
+anjuta-1.2.4a.tar.gz


Index: anjuta.spec
===================================================================
RCS file: /cvs/extras/rpms/anjuta/devel/anjuta.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- anjuta.spec	24 Mar 2006 23:50:46 -0000	1.16
+++ anjuta.spec	23 Apr 2006 23:26:25 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           anjuta
-Version:        1.2.4
-Release:        5%{?dist}
+Version:        1.2.4a
+Release:        1%{?dist}
 Summary:        GNOME IDE for C and C++
 
 Group:          Development/Tools
@@ -114,6 +114,9 @@
 %{_datadir}/omf/%{name}
 
 %changelog
+* Mon Apr 24 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.2.4a-1
+- Bump to newer version
+
 * Fri Mar 24 2006 Michael Schwendt <bugs.michael at gmx.net> - 1.2.4-5
 - Added export dynamic
 - trivial spec changes


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/anjuta/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Feb 2006 23:24:25 -0000	1.5
+++ sources	23 Apr 2006 23:26:25 -0000	1.6
@@ -1 +1 @@
-5a709fbaedc816a88fd8b9ad5276a47b  anjuta-1.2.4.tar.gz
+7e6af289b4bfd1ec2ca72e2017efc4d3  anjuta-1.2.4a.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 23 23:26:24 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun, 23 Apr 2006 16:26:24 -0700
Subject: rpms/anjuta import.log,1.9,1.10
Message-ID: <200604232326.k3NNQQeD022904@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22871

Modified Files:
	import.log 
Log Message:
auto-import anjuta-1.2.4a-1 on branch devel from anjuta-1.2.4a-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/anjuta/import.log,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- import.log	2 Apr 2006 23:38:47 -0000	1.9
+++ import.log	23 Apr 2006 23:26:24 -0000	1.10
@@ -6,3 +6,4 @@
 anjuta-1_2_4-5:HEAD:anjuta-1.2.4-5.src.rpm:1143244226
 anjuta-1_2_4-5:FC-5:anjuta-1.2.4-5.src.rpm:1144021011
 anjuta-1_2_4-5:FC-4:anjuta-1.2.4-5.src.rpm:1144021115
+anjuta-1_2_4a-1:HEAD:anjuta-1.2.4a-1.src.rpm:1145834807



From fedora-extras-commits at redhat.com  Sun Apr 23 23:27:31 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun, 23 Apr 2006 16:27:31 -0700
Subject: rpms/anjuta import.log,1.10,1.11
Message-ID: <200604232327.k3NNRXP4023082@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23045

Modified Files:
	import.log 
Log Message:
auto-import anjuta-1.2.4a-1 on branch FC-5 from anjuta-1.2.4a-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/anjuta/import.log,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- import.log	23 Apr 2006 23:26:24 -0000	1.10
+++ import.log	23 Apr 2006 23:27:31 -0000	1.11
@@ -7,3 +7,4 @@
 anjuta-1_2_4-5:FC-5:anjuta-1.2.4-5.src.rpm:1144021011
 anjuta-1_2_4-5:FC-4:anjuta-1.2.4-5.src.rpm:1144021115
 anjuta-1_2_4a-1:HEAD:anjuta-1.2.4a-1.src.rpm:1145834807
+anjuta-1_2_4a-1:FC-5:anjuta-1.2.4a-1.src.rpm:1145834875



From fedora-extras-commits at redhat.com  Sun Apr 23 23:27:32 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun, 23 Apr 2006 16:27:32 -0700
Subject: rpms/anjuta/FC-5 .cvsignore, 1.5, 1.6 anjuta.spec, 1.16,
	1.17 sources, 1.5, 1.6
Message-ID: <200604232327.k3NNRYqB023092@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23045/FC-5

Modified Files:
	.cvsignore anjuta.spec sources 
Log Message:
auto-import anjuta-1.2.4a-1 on branch FC-5 from anjuta-1.2.4a-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/anjuta/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Feb 2006 23:24:25 -0000	1.5
+++ .cvsignore	23 Apr 2006 23:27:32 -0000	1.6
@@ -1 +1 @@
-anjuta-1.2.4.tar.gz
+anjuta-1.2.4a.tar.gz


Index: anjuta.spec
===================================================================
RCS file: /cvs/extras/rpms/anjuta/FC-5/anjuta.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- anjuta.spec	2 Apr 2006 23:37:04 -0000	1.16
+++ anjuta.spec	23 Apr 2006 23:27:32 -0000	1.17
@@ -1,6 +1,6 @@
 Name:           anjuta
-Version:        1.2.4
-Release:        5%{?dist}
+Version:        1.2.4a
+Release:        1%{?dist}
 Summary:        GNOME IDE for C and C++
 
 Group:          Development/Tools
@@ -114,6 +114,9 @@
 %{_datadir}/omf/%{name}
 
 %changelog
+* Mon Apr 24 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.2.4a-1
+- Bump to newer version
+
 * Fri Mar 24 2006 Michael Schwendt <bugs.michael at gmx.net> - 1.2.4-5
 - Added export dynamic
 - trivial spec changes


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/anjuta/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Feb 2006 23:24:25 -0000	1.5
+++ sources	23 Apr 2006 23:27:32 -0000	1.6
@@ -1 +1 @@
-5a709fbaedc816a88fd8b9ad5276a47b  anjuta-1.2.4.tar.gz
+7e6af289b4bfd1ec2ca72e2017efc4d3  anjuta-1.2.4a.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 23 23:28:29 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun, 23 Apr 2006 16:28:29 -0700
Subject: rpms/anjuta import.log,1.11,1.12
Message-ID: <200604232329.k3NNT1IP023397@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23279

Modified Files:
	import.log 
Log Message:
auto-import anjuta-1.2.4a-1 on branch FC-4 from anjuta-1.2.4a-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/anjuta/import.log,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- import.log	23 Apr 2006 23:27:31 -0000	1.11
+++ import.log	23 Apr 2006 23:28:29 -0000	1.12
@@ -8,3 +8,4 @@
 anjuta-1_2_4-5:FC-4:anjuta-1.2.4-5.src.rpm:1144021115
 anjuta-1_2_4a-1:HEAD:anjuta-1.2.4a-1.src.rpm:1145834807
 anjuta-1_2_4a-1:FC-5:anjuta-1.2.4a-1.src.rpm:1145834875
+anjuta-1_2_4a-1:FC-4:anjuta-1.2.4a-1.src.rpm:1145834931



From fedora-extras-commits at redhat.com  Sun Apr 23 23:28:30 2006
From: fedora-extras-commits at redhat.com (Paul F. Johnson (pfj))
Date: Sun, 23 Apr 2006 16:28:30 -0700
Subject: rpms/anjuta/FC-4 .cvsignore, 1.5, 1.6 anjuta.spec, 1.11,
	1.12 sources, 1.5, 1.6
Message-ID: <200604232329.k3NNT29e023404@cvs-int.fedora.redhat.com>

Author: pfj

Update of /cvs/extras/rpms/anjuta/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23279/FC-4

Modified Files:
	.cvsignore anjuta.spec sources 
Log Message:
auto-import anjuta-1.2.4a-1 on branch FC-4 from anjuta-1.2.4a-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/anjuta/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	2 Apr 2006 23:38:48 -0000	1.5
+++ .cvsignore	23 Apr 2006 23:28:29 -0000	1.6
@@ -1 +1 @@
-anjuta-1.2.4.tar.gz
+anjuta-1.2.4a.tar.gz


Index: anjuta.spec
===================================================================
RCS file: /cvs/extras/rpms/anjuta/FC-4/anjuta.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- anjuta.spec	2 Apr 2006 23:38:48 -0000	1.11
+++ anjuta.spec	23 Apr 2006 23:28:29 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           anjuta
-Version:        1.2.4
-Release:        5%{?dist}
+Version:        1.2.4a
+Release:        1%{?dist}
 Summary:        GNOME IDE for C and C++
 
 Group:          Development/Tools
@@ -114,6 +114,9 @@
 %{_datadir}/omf/%{name}
 
 %changelog
+* Mon Apr 24 2006 Paul F. Johnson <paul at all-the-johnsons.co.uk> 1.2.4a-1
+- Bump to newer version
+
 * Fri Mar 24 2006 Michael Schwendt <bugs.michael at gmx.net> - 1.2.4-5
 - Added export dynamic
 - trivial spec changes


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/anjuta/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	2 Apr 2006 23:38:48 -0000	1.5
+++ sources	23 Apr 2006 23:28:29 -0000	1.6
@@ -1 +1 @@
-5a709fbaedc816a88fd8b9ad5276a47b  anjuta-1.2.4.tar.gz
+7e6af289b4bfd1ec2ca72e2017efc4d3  anjuta-1.2.4a.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 23 23:32:46 2006
From: fedora-extras-commits at redhat.com (Patrice Dumas (pertusus))
Date: Sun, 23 Apr 2006 16:32:46 -0700
Subject: owners owners.list,1.882,1.883
Message-ID: <200604232332.k3NNWmsX024123@cvs-int.fedora.redhat.com>

Author: pertusus

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24098

Modified Files:
	owners.list 
Log Message:
add libchmxx


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.882
retrieving revision 1.883
diff -u -r1.882 -r1.883
--- owners.list	23 Apr 2006 22:40:45 -0000	1.882
+++ owners.list	23 Apr 2006 23:32:45 -0000	1.883
@@ -583,6 +583,7 @@
 Fedora Extras|libcddb|A library (C API) for accessing a CDDB server|anvil at livna.org|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|libchewing|Traditional Chinese phonetic input method library|petersen at redhat.com|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|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|



From fedora-extras-commits at redhat.com  Mon Apr 24 01:27:12 2006
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Sun, 23 Apr 2006 18:27:12 -0700
Subject: rpms/anthy/FC-5 README, NONE, 1.1 Makefile, 1.1, NONE anthy-init.el,
	1.1, NONE anthy.spec, 1.9, NONE sources, 1.5, NONE
Message-ID: <200604240127.k3O1REmH031692@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/rpms/anthy/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31676

Added Files:
	README 
Removed Files:
	Makefile anthy-init.el anthy.spec sources 
Log Message:



--- NEW FILE README ---
anthy has moved to Fedora Core.


--- Makefile DELETED ---


--- anthy-init.el DELETED ---


--- anthy.spec DELETED ---


--- sources DELETED ---



From fedora-extras-commits at redhat.com  Mon Apr 24 01:33:18 2006
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Sun, 23 Apr 2006 18:33:18 -0700
Subject: rpms/anthy/FC-4 anthy-gcanna-nakaguro.patch, NONE, 1.1 anthy.spec, 
	1.12, 1.13
Message-ID: <200604240133.k3O1XKnY031872@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/rpms/anthy/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31852

Modified Files:
	anthy.spec 
Added Files:
	anthy-gcanna-nakaguro.patch 
Log Message:
* Mon Apr 24 2006 Akira TAGOH <tagoh at redhat.com> - 7500b-1
- New upstream release.
- anthy-gcanna-nakaguro.patch: added a word to dictionary to convert nakaguro to slash.
- run ldconfig in %%post and %%postun.

anthy-gcanna-nakaguro.patch:

--- NEW FILE anthy-gcanna-nakaguro.patch ---
diff -ruN anthy-7500.orig/anthy_gcanna_ut-20051002/gcanna.ctd anthy-7500/anthy_gcanna_ut-20051002/gcanna.ctd
--- anthy-7500.orig/anthy_gcanna_ut-20051002/gcanna.ctd	2005-10-02 17:56:27.000000000 +0900
+++ anthy-7500/anthy_gcanna_ut-20051002/gcanna.ctd	2006-03-17 22:19:17.000000000 +0900
@@ -1,5 +1,6 @@
 ?? #KJ ?? ??
 ?? #KJ / ?? ??
+?? #KJ ?? /
 ?? #KJ*40 ?? #KJ*4 ?? #KJ ?? ?? ??
 ???? #KJ*40 ???? #KJ*38 ???? #KJ*26 ???? #KJ*12 ???? ????
 ?? #KJ*40 ?? #KJ*4 ?? #KJ ?? ?? ??


Index: anthy.spec
===================================================================
RCS file: /cvs/extras/rpms/anthy/FC-4/anthy.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- anthy.spec	4 Nov 2005 20:33:18 -0000	1.12
+++ anthy.spec	24 Apr 2006 01:33:17 -0000	1.13
@@ -1,4 +1,4 @@
-%define	version		7100b
+%define	version		7500b
 %define	gcanna_ver	20051002
 
 Name:		anthy
@@ -12,6 +12,7 @@
 Source0:	http://prdownloads.sourceforge.jp/anthy/9723/anthy-%{version}.tar.gz
 Source1:	anthy-init.el
 Source2:	http://www.geocities.jp/ep3797/snapshot/tmp/anthy_gcanna_ut-%{gcanna_ver}.tar.bz2
+Patch2:		anthy-gcanna-nakaguro.patch
 
 Summary:	Japanese character set input library
 Group:		System Environment/Libraries
@@ -51,6 +52,7 @@
 
 %prep
 %setup -q -a 2
+%patch2 -p1
 
 %build
 %configure
@@ -78,6 +80,10 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
 %files
 %defattr (-, root, root)
 %doc AUTHORS COPYING ChangeLog DIARY NEWS README doc
@@ -105,6 +111,11 @@
 %{_datadir}/xemacs/site-packages/lisp/site-start.d/anthy-init.el
 
 %changelog
+* Mon Apr 24 2006 Akira TAGOH <tagoh at redhat.com> - 7500b-1
+- New upstream release.
+- anthy-gcanna-nakaguro.patch: added a word to dictionary to convert nakaguro to slash.
+- run ldconfig in %%post and %%postun.
+
 * Sat Nov  5 2005 Akira TAGOH <tagoh at redhat.com> - 7100b-1
 - New upstream release.
 - use a optimized gcanna dictionary.



From fedora-extras-commits at redhat.com  Mon Apr 24 01:36:02 2006
From: fedora-extras-commits at redhat.com (Akira Tagoh (tagoh))
Date: Sun, 23 Apr 2006 18:36:02 -0700
Subject: rpms/anthy/FC-4 .cvsignore,1.7,1.8 sources,1.7,1.8
Message-ID: <200604240136.k3O1a4Om031957@cvs-int.fedora.redhat.com>

Author: tagoh

Update of /cvs/extras/rpms/anthy/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31938

Modified Files:
	.cvsignore sources 
Log Message:



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/anthy/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	4 Nov 2005 20:33:18 -0000	1.7
+++ .cvsignore	24 Apr 2006 01:36:02 -0000	1.8
@@ -8,3 +8,4 @@
 anthy-6700b.tar.gz
 anthy-7100b.tar.gz
 anthy_gcanna_ut-20051002.tar.bz2
+anthy-7500b.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/anthy/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	4 Nov 2005 20:33:18 -0000	1.7
+++ sources	24 Apr 2006 01:36:02 -0000	1.8
@@ -1,2 +1,2 @@
-099514a261b1c3757f95de034a4fbc0d  anthy-7100b.tar.gz
 d0f6128b6e000e85764abbc030399db7  anthy_gcanna_ut-20051002.tar.bz2
+ed3ce5d4332751ee3f4befe843c8ebb8  anthy-7500b.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 24 03:25:49 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Sun, 23 Apr 2006 20:25:49 -0700
Subject: rpms/hugs98/FC-5 hugs98.spec,1.2,1.3
Message-ID: <200604240325.k3O3Ppjr004247@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/hugs98/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4220

Modified Files:
	hugs98.spec 
Log Message:
use hugs_version in source0



Index: hugs98.spec
===================================================================
RCS file: /cvs/extras/rpms/hugs98/FC-5/hugs98.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hugs98.spec	21 Apr 2006 18:29:35 -0000	1.2
+++ hugs98.spec	24 Apr 2006 03:25:49 -0000	1.3
@@ -8,7 +8,7 @@
 Group:		Development/Languages
 License:	BSD
 URL:		http://www.haskell.org/hugs
-Source0:	http://cvs.haskell.org/Hugs/downloads/Mar2005/hugs98-Mar2005-patched.tar.gz
+Source0:	http://cvs.haskell.org/Hugs/downloads/Mar2005/%{name}-%{hugs_ver}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	docbook-utils



From fedora-extras-commits at redhat.com  Mon Apr 24 06:19:55 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Sun, 23 Apr 2006 23:19:55 -0700
Subject: rpms/fbida/FC-3 CVE-2006-1695-fbgs.mktemp.patch, NONE,
	1.1 fbida.spec, 1.5, 1.6
Message-ID: <200604240619.k3O6JvPo011281@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/fbida/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11261

Modified Files:
	fbida.spec 
Added Files:
	CVE-2006-1695-fbgs.mktemp.patch 
Log Message:
* Mon Apr 24 2006 Adrian Reber <adrian at lisas.de> - 2.03-4
- security fix for #189721


CVE-2006-1695-fbgs.mktemp.patch:

--- NEW FILE CVE-2006-1695-fbgs.mktemp.patch ---
diff -ru fbida-2.01.orig/fbgs fbida-2.01/fbgs
--- fbida-2.01.orig/fbgs	2004-03-28 13:32:16.000000000 +0200
+++ fbida-2.01/fbgs	2006-04-08 02:49:37.000000000 +0200
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 # tmp dir
-DIR="${TMPDIR-/var/tmp}/fbps-$$"
-mkdir -p $DIR	|| exit 1
+DIR=`mktemp -dtp /tmp fbgs-XXXXXX`
+[ -d $DIR ]  || exit 1
 trap "rm -rf $DIR" EXIT
 
 # parse options


Index: fbida.spec
===================================================================
RCS file: /cvs/extras/rpms/fbida/FC-3/fbida.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fbida.spec	21 Feb 2005 17:19:10 -0000	1.5
+++ fbida.spec	24 Apr 2006 06:19:55 -0000	1.6
@@ -1,13 +1,12 @@
-# $Id$
-
 Summary:        FrameBuffer Imageviewer
 Name:           fbida
 Version:        2.03
-Release:        3
+Release:        4%{?dist}
 License:        GPL
 Group:          Applications/Multimedia
 URL:            http://linux.bytesex.org/fbida/
 Source:         http://dl.bytesex.org/releases/fbida/fbida-2.03.tar.gz
+Patch:          CVE-2006-1695-fbgs.mktemp.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libexif-devel fontconfig-devel libjpeg-devel
 BuildRequires:  libpng-devel libtiff-devel pkgconfig
@@ -39,6 +38,7 @@
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 LIB=%{_lib} prefix=%{_prefix} CFLAGS=$RPM_OPT_FLAGS %{__make} %{?_smp_mflags}
@@ -78,6 +78,9 @@
 %{_bindir}/fbgs
 
 %changelog
+* Mon Apr 24 2006 Adrian Reber <adrian at lisas.de> - 2.03-4
+- security fix for #189721
+
 * Mon Feb 21 2005 Thorsten Leemhuis <fedora at leemhuis dot info> - 2.03-3
 - Fix typo; must be LIB=%%{_lib}; really fixes x86_64
 



From fedora-extras-commits at redhat.com  Mon Apr 24 06:21:52 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Sun, 23 Apr 2006 23:21:52 -0700
Subject: rpms/fbida/FC-3 fbida.CVE-2006-1695.patch, NONE, 1.1 fbida.spec, 1.6,
	1.7 CVE-2006-1695-fbgs.mktemp.patch, 1.1, NONE
Message-ID: <200604240621.k3O6Lsot011319@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/fbida/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11299

Modified Files:
	fbida.spec 
Added Files:
	fbida.CVE-2006-1695.patch 
Removed Files:
	CVE-2006-1695-fbgs.mktemp.patch 
Log Message:
doing some renaming


fbida.CVE-2006-1695.patch:

--- NEW FILE fbida.CVE-2006-1695.patch ---
diff -ru fbida-2.01.orig/fbgs fbida-2.01/fbgs
--- fbida-2.01.orig/fbgs	2004-03-28 13:32:16.000000000 +0200
+++ fbida-2.01/fbgs	2006-04-08 02:49:37.000000000 +0200
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 # tmp dir
-DIR="${TMPDIR-/var/tmp}/fbps-$$"
-mkdir -p $DIR	|| exit 1
+DIR=`mktemp -dtp /tmp fbgs-XXXXXX`
+[ -d $DIR ]  || exit 1
 trap "rm -rf $DIR" EXIT
 
 # parse options


Index: fbida.spec
===================================================================
RCS file: /cvs/extras/rpms/fbida/FC-3/fbida.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- fbida.spec	24 Apr 2006 06:19:55 -0000	1.6
+++ fbida.spec	24 Apr 2006 06:21:52 -0000	1.7
@@ -6,7 +6,7 @@
 Group:          Applications/Multimedia
 URL:            http://linux.bytesex.org/fbida/
 Source:         http://dl.bytesex.org/releases/fbida/fbida-2.03.tar.gz
-Patch:          CVE-2006-1695-fbgs.mktemp.patch
+Patch:          fbida.CVE-2006-1695.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libexif-devel fontconfig-devel libjpeg-devel
 BuildRequires:  libpng-devel libtiff-devel pkgconfig


--- CVE-2006-1695-fbgs.mktemp.patch DELETED ---



From fedora-extras-commits at redhat.com  Mon Apr 24 06:30:07 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Sun, 23 Apr 2006 23:30:07 -0700
Subject: rpms/fbida/FC-4 fbida.CVE-2006-1695.patch, NONE, 1.1 fbida.spec, 1.8,
	1.9
Message-ID: <200604240630.k3O6U9WM011411@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/fbida/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11391

Modified Files:
	fbida.spec 
Added Files:
	fbida.CVE-2006-1695.patch 
Log Message:
* Mon Apr 24 2006 Adrian Reber <adrian at lisas.de> - 2.03-6
- security fix for #189721


fbida.CVE-2006-1695.patch:

--- NEW FILE fbida.CVE-2006-1695.patch ---
diff -ru fbida-2.01.orig/fbgs fbida-2.01/fbgs
--- fbida-2.01.orig/fbgs	2004-03-28 13:32:16.000000000 +0200
+++ fbida-2.01/fbgs	2006-04-08 02:49:37.000000000 +0200
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 # tmp dir
-DIR="${TMPDIR-/var/tmp}/fbps-$$"
-mkdir -p $DIR	|| exit 1
+DIR=`mktemp -dtp /tmp fbgs-XXXXXX`
+[ -d $DIR ]  || exit 1
 trap "rm -rf $DIR" EXIT
 
 # parse options


Index: fbida.spec
===================================================================
RCS file: /cvs/extras/rpms/fbida/FC-4/fbida.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fbida.spec	10 May 2005 07:08:12 -0000	1.8
+++ fbida.spec	24 Apr 2006 06:30:07 -0000	1.9
@@ -1,11 +1,12 @@
 Summary:        FrameBuffer Imageviewer
 Name:           fbida
 Version:        2.03
-Release:        5%{?dist}
+Release:        6%{?dist}
 License:        GPL
 Group:          Applications/Multimedia
 URL:            http://linux.bytesex.org/fbida/
 Source:         http://dl.bytesex.org/releases/fbida/fbida-2.03.tar.gz
+Patch:          fbida.CVE-2006-1695.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libexif-devel fontconfig-devel libjpeg-devel
 BuildRequires:  libpng-devel libtiff-devel pkgconfig
@@ -37,6 +38,7 @@
 
 %prep
 %setup -q
+%patch -p1
 %{__sed} -i -e "s,(INSTALL) -s,(INSTALL) ," mk/Variables.mk
 
 %build
@@ -77,6 +79,9 @@
 %{_bindir}/fbgs
 
 %changelog
+* Mon Apr 24 2006 Adrian Reber <adrian at lisas.de> - 2.03-6
+- security fix for #189721
+
 * Tue May 10 2005 Adrian Reber <adrian at lisas.de> - 2.03-5
 - fix debuginfo subpackage creation
 



From fedora-extras-commits at redhat.com  Mon Apr 24 06:35:12 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Sun, 23 Apr 2006 23:35:12 -0700
Subject: rpms/fbida/FC-5 fbida.CVE-2006-1695.patch, NONE, 1.1 fbida.spec,
	1.13, 1.14
Message-ID: <200604240635.k3O6ZFad011505@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/fbida/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11485

Modified Files:
	fbida.spec 
Added Files:
	fbida.CVE-2006-1695.patch 
Log Message:
* Mon Apr 24 2006 Adrian Reber <adrian at lisas.de> - 2.03-11
- security fix for #189721


fbida.CVE-2006-1695.patch:

--- NEW FILE fbida.CVE-2006-1695.patch ---
diff -ru fbida-2.01.orig/fbgs fbida-2.01/fbgs
--- fbida-2.01.orig/fbgs	2004-03-28 13:32:16.000000000 +0200
+++ fbida-2.01/fbgs	2006-04-08 02:49:37.000000000 +0200
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 # tmp dir
-DIR="${TMPDIR-/var/tmp}/fbps-$$"
-mkdir -p $DIR	|| exit 1
+DIR=`mktemp -dtp /tmp fbgs-XXXXXX`
+[ -d $DIR ]  || exit 1
 trap "rm -rf $DIR" EXIT
 
 # parse options


Index: fbida.spec
===================================================================
RCS file: /cvs/extras/rpms/fbida/FC-5/fbida.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fbida.spec	13 Feb 2006 21:01:11 -0000	1.13
+++ fbida.spec	24 Apr 2006 06:35:12 -0000	1.14
@@ -1,11 +1,12 @@
 Summary:        FrameBuffer Imageviewer
 Name:           fbida
 Version:        2.03
-Release:        10%{?dist}
+Release:        11%{?dist}
 License:        GPL
 Group:          Applications/Multimedia
 URL:            http://linux.bytesex.org/fbida/
 Source:         http://dl.bytesex.org/releases/fbida/fbida-2.03.tar.gz
+Patch:          fbida.CVE-2006-1695.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libexif-devel fontconfig-devel libjpeg-devel
 BuildRequires:  libpng-devel libtiff-devel pkgconfig
@@ -38,6 +39,7 @@
 
 %prep
 %setup -q
+%patch -p1
 %{__sed} -i -e "s,(INSTALL) -s,(INSTALL) ," mk/Variables.mk
 %{__sed} -i -e "s,/X11R6,,g" GNUmakefile
 %{__sed} -i -e "s,/usr/X11R6/lib/X11,%{_datadir}/X11,g" mk/Autoconf.mk
@@ -80,6 +82,9 @@
 %{_bindir}/fbgs
 
 %changelog
+* Mon Apr 24 2006 Adrian Reber <adrian at lisas.de> - 2.03-11
+- security fix for #189721
+
 * Mon Feb 13 2006 Adrian Reber <adrian at lisas.de> - 2.03-10
 - rebuilt
 



From fedora-extras-commits at redhat.com  Mon Apr 24 06:49:04 2006
From: fedora-extras-commits at redhat.com (Adrian Reber (adrian))
Date: Sun, 23 Apr 2006 23:49:04 -0700
Subject: rpms/fbida/devel fbida.CVE-2006-1695.patch, NONE, 1.1 fbida.spec,
	1.13, 1.14
Message-ID: <200604240649.k3O6n6m7011604@cvs-int.fedora.redhat.com>

Author: adrian

Update of /cvs/extras/rpms/fbida/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11584

Modified Files:
	fbida.spec 
Added Files:
	fbida.CVE-2006-1695.patch 
Log Message:
* Mon Apr 24 2006 Adrian Reber <adrian at lisas.de> - 2.03-11
- security fix for #189721


fbida.CVE-2006-1695.patch:

--- NEW FILE fbida.CVE-2006-1695.patch ---
diff -ru fbida-2.01.orig/fbgs fbida-2.01/fbgs
--- fbida-2.01.orig/fbgs	2004-03-28 13:32:16.000000000 +0200
+++ fbida-2.01/fbgs	2006-04-08 02:49:37.000000000 +0200
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 # tmp dir
-DIR="${TMPDIR-/var/tmp}/fbps-$$"
-mkdir -p $DIR	|| exit 1
+DIR=`mktemp -dtp /tmp fbgs-XXXXXX`
+[ -d $DIR ]  || exit 1
 trap "rm -rf $DIR" EXIT
 
 # parse options


Index: fbida.spec
===================================================================
RCS file: /cvs/extras/rpms/fbida/devel/fbida.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- fbida.spec	13 Feb 2006 21:01:11 -0000	1.13
+++ fbida.spec	24 Apr 2006 06:49:04 -0000	1.14
@@ -1,11 +1,12 @@
 Summary:        FrameBuffer Imageviewer
 Name:           fbida
 Version:        2.03
-Release:        10%{?dist}
+Release:        11%{?dist}
 License:        GPL
 Group:          Applications/Multimedia
 URL:            http://linux.bytesex.org/fbida/
 Source:         http://dl.bytesex.org/releases/fbida/fbida-2.03.tar.gz
+Patch:          fbida.CVE-2006-1695.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libexif-devel fontconfig-devel libjpeg-devel
 BuildRequires:  libpng-devel libtiff-devel pkgconfig
@@ -38,6 +39,7 @@
 
 %prep
 %setup -q
+%patch -p1
 %{__sed} -i -e "s,(INSTALL) -s,(INSTALL) ," mk/Variables.mk
 %{__sed} -i -e "s,/X11R6,,g" GNUmakefile
 %{__sed} -i -e "s,/usr/X11R6/lib/X11,%{_datadir}/X11,g" mk/Autoconf.mk
@@ -80,6 +82,9 @@
 %{_bindir}/fbgs
 
 %changelog
+* Mon Apr 24 2006 Adrian Reber <adrian at lisas.de> - 2.03-11
+- security fix for #189721
+
 * Mon Feb 13 2006 Adrian Reber <adrian at lisas.de> - 2.03-10
 - rebuilt
 



From fedora-extras-commits at redhat.com  Mon Apr 24 07:38:39 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon, 24 Apr 2006 00:38:39 -0700
Subject: fedora-security/audit fc4,1.209,1.210 fc5,1.122,1.123
Message-ID: <200604240738.k3O7cd6v013918@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13898

Modified Files:
	fc4 fc5 
Log Message:
Some updates from my mailbox, still to deal with
Fedora Core 5 Update: beagle-0.2.4-1.f
Fedora Core 5 Update: gtkhtml3-3.10.1
Fedora Core 4 Update: kdegraphics-3.5.
Fedora Core 5 Update: kdegraphics-3.5.
[SECURITY] Fedora Core 5 Update: gdm-2
[SECURITY] Fedora Core 5 Update: beagl



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- fc4	21 Apr 2006 11:13:16 -0000	1.209
+++ fc4	24 Apr 2006 07:38:36 -0000	1.210
@@ -3,48 +3,48 @@
 
 ** are items that need attention
 
-CVE-2006-1790 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1790 version (firefox, fixed 1.0.8) [since FEDORA-2006-410]
 CVE-2006-1790 VULNERABLE (thunderbird, fixed 1.0.8)
 CVE-2006-1790 VULNERABLE (mozilla, fixed 1.7.13)
 CVE-2006-1742 VULNERABLE (thunderbird, fixed 1.0.8)
 CVE-2006-1742 VULNERABLE (mozilla, fixed 1.7.13)
-CVE-2006-1742 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1742 version (firefox, fixed 1.0.8) [since FEDORA-2006-410]
 CVE-2006-1741 VULNERABLE (thunderbird, fixed 1.0.8)
 CVE-2006-1741 VULNERABLE (mozilla, fixed 1.7.13)
-CVE-2006-1741 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1741 version (firefox, fixed 1.0.8) [since FEDORA-2006-410]
 CVE-2006-1740 VULNERABLE (mozilla, fixed 1.7.13)
-CVE-2006-1740 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1740 version (firefox, fixed 1.0.8) [since FEDORA-2006-410]
 CVE-2006-1739 VULNERABLE (thunderbird, fixed 1.0.8)
 CVE-2006-1739 VULNERABLE (mozilla, fixed 1.7.13)
-CVE-2006-1739 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1739 version (firefox, fixed 1.0.8) [since FEDORA-2006-410]
 CVE-2006-1738 VULNERABLE (thunderbird, fixed 1.0.8)
 CVE-2006-1738 VULNERABLE (mozilla, fixed 1.7.13)
-CVE-2006-1738 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1738 version (firefox, fixed 1.0.8) [since FEDORA-2006-410]
 CVE-2006-1737 VULNERABLE (thunderbird, fixed 1.0.8)
 CVE-2006-1737 VULNERABLE (mozilla, fixed 1.7.13)
-CVE-2006-1737 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1737 version (firefox, fixed 1.0.8) [since FEDORA-2006-410]
 CVE-2006-1736 VULNERABLE (mozilla, fixed 1.7.13)
 CVE-2006-1736 VULNERABLE (firefox, fixed 1.0.8)
 CVE-2006-1735 VULNERABLE (mozilla, fixed 1.7.13)
 CVE-2006-1735 VULNERABLE (thunderbird, fixed 1.0.8)
-CVE-2006-1735 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1735 version (firefox, fixed 1.0.8) [since FEDORA-2006-410]
 CVE-2006-1734 VULNERABLE (mozilla, fixed 1.7.13)
 CVE-2006-1734 VULNERABLE (thunderbird, fixed 1.0.8)
-CVE-2006-1734 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1734 version (firefox, fixed 1.0.8) [since FEDORA-2006-410]
 CVE-2006-1733 VULNERABLE (mozilla, fixed 1.7.13)
 CVE-2006-1733 VULNERABLE (thunderbird, fixed 1.0.8)
-CVE-2006-1733 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1733 version (firefox, fixed 1.0.8) [since FEDORA-2006-410]
 CVE-2006-1732 VULNERABLE (mozilla, fixed 1.7.13)
 CVE-2006-1732 VULNERABLE (thunderbird, fixed 1.0.8)
-CVE-2006-1732 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1732 version (firefox, fixed 1.0.8) [since FEDORA-2006-410]
 CVE-2006-1731 VULNERABLE (mozilla, fixed 1.7.13)
 CVE-2006-1731 VULNERABLE (thunderbird, fixed 1.0.8)
-CVE-2006-1731 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1731 version (firefox, fixed 1.0.8) [since FEDORA-2006-410]
 CVE-2006-1730 VULNERABLE (mozilla, fixed 1.7.13)
 CVE-2006-1730 VULNERABLE (thunderbird, fixed 1.0.8)
-CVE-2006-1730 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1730 version (firefox, fixed 1.0.8) [since FEDORA-2006-410]
 CVE-2006-1729 VULNERABLE (mozilla, fixed 1.7.13)
-CVE-2006-1729 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1729 version (firefox, fixed 1.0.8) [since FEDORA-2006-410]
 CVE-2006-1728 VULNERABLE (thunderbird, fixed 1.0.8)
 CVE-2006-1728 VULNERABLE (mozilla, fixed 1.7.13)
 CVE-2006-1728 VULNERABLE (firefox, fixed 1.0.8)
@@ -56,7 +56,7 @@
 CVE-2006-1725 version (firefox, fixed 1.5.0.2) 1.5 only
 CVE-2006-1724 VULNERABLE (thunderbird, fixed 1.0.8)
 CVE-2006-1724 VULNERABLE (mozilla, fixed 1.7.13)
-CVE-2006-1724 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-1724 version (firefox, fixed 1.0.8) [since FEDORA-2006-410]
 CVE-2006-1723 VULNERABLE (thunderbird, fixed 1.0.8)
 CVE-2006-1723 VULNERABLE (firefox, fixed 1.0.8)
 CVE-2006-1721 ** cyrus-sasl
@@ -108,7 +108,7 @@
 CVE-2006-0836 version (thunderbird, 1.5 only)
 CVE-2006-0749 VULNERABLE (thunderbird, fixed 1.0.8)
 CVE-2006-0749 VULNERABLE (mozilla, fixed 1.7.13)
-CVE-2006-0749 VULNERABLE (firefox, fixed 1.0.8)
+CVE-2006-0749 version (firefox, fixed 1.0.8) [since FEDORA-2006-410]
 CVE-2006-0748 VULNERABLE (thunderbird, fixed 1.0.8)
 CVE-2006-0748 VULNERABLE (mozilla, fixed 1.7.13)
 CVE-2006-0748 VULNERABLE (firefox, fixed 1.0.8)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- fc5	21 Apr 2006 09:59:27 -0000	1.122
+++ fc5	24 Apr 2006 07:38:36 -0000	1.123
@@ -3,60 +3,60 @@
 
 ** are items that need attention
 
-CVE-2006-1790 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1790 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1790 VULNERABLE (thunderbird, fixed 1.5.0.2)
 CVE-2006-1790 VULNERABLE (mozilla, fixed 1.7.13)
 CVE-2006-1742 VULNERABLE (thunderbird, fixed 1.5.0.2)
 CVE-2006-1742 VULNERABLE (mozilla, fixed 1.7.13)
-CVE-2006-1742 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1742 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1741 VULNERABLE (thunderbird, fixed 1.5.0.2)
 CVE-2006-1741 VULNERABLE (mozilla, fixed 1.7.13)
-CVE-2006-1741 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1741 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1740 VULNERABLE (mozilla, fixed 1.7.13)
-CVE-2006-1740 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1740 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1739 VULNERABLE (thunderbird, fixed 1.5.0.2)
 CVE-2006-1739 VULNERABLE (mozilla, fixed 1.7.13)
-CVE-2006-1739 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1739 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1738 VULNERABLE (thunderbird, fixed 1.5.0.2)
 CVE-2006-1738 VULNERABLE (mozilla, fixed 1.7.13)
-CVE-2006-1738 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1738 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1737 VULNERABLE (thunderbird, fixed 1.5.0.2)
 CVE-2006-1737 VULNERABLE (mozilla, fixed 1.7.13)
-CVE-2006-1737 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1737 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1736 VULNERABLE (mozilla, fixed 1.7.13)
 CVE-2006-1736 VULNERABLE (firefox, fixed 1.5.0.2)
 CVE-2006-1735 VULNERABLE (mozilla, fixed 1.7.13)
 CVE-2006-1735 VULNERABLE (thunderbird, fixed 1.5.0.2)
-CVE-2006-1735 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1735 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1734 VULNERABLE (mozilla, fixed 1.7.13)
 CVE-2006-1734 VULNERABLE (thunderbird, fixed 1.5.0.2)
-CVE-2006-1734 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1734 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1733 VULNERABLE (mozilla, fixed 1.7.13)
 CVE-2006-1733 VULNERABLE (thunderbird, fixed 1.5.0.2)
-CVE-2006-1733 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1733 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1732 VULNERABLE (mozilla, fixed 1.7.13)
 CVE-2006-1732 VULNERABLE (thunderbird, fixed 1.5.0.2)
-CVE-2006-1732 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1732 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1731 VULNERABLE (mozilla, fixed 1.7.13)
 CVE-2006-1731 VULNERABLE (thunderbird, fixed 1.5.0.2)
-CVE-2006-1731 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1731 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1730 VULNERABLE (mozilla, fixed 1.7.13)
 CVE-2006-1730 VULNERABLE (thunderbird, fixed 1.5.0.2)
-CVE-2006-1730 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1730 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1729 VULNERABLE (mozilla, fixed 1.7.13)
-CVE-2006-1729 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1729 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1728 VULNERABLE (thunderbird, fixed 1.5.0.2)
 CVE-2006-1728 VULNERABLE (mozilla, fixed 1.7.13)
-CVE-2006-1728 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1728 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1727 VULNERABLE (thunderbird, fixed 1.5.0.2)
 CVE-2006-1727 VULNERABLE (mozilla, fixed 1.7.13)
-CVE-2006-1727 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1727 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1726 VULNERABLE (firefox, fixed 1.5.0.2)
 CVE-2006-1726 VULNERABLE (thunderbird, fixed 1.5.0.2)
 CVE-2006-1725 VULNERABLE (firefox, fixed 1.5.0.2)
 CVE-2006-1724 VULNERABLE (thunderbird, fixed 1.5.0.2)
 CVE-2006-1724 VULNERABLE (mozilla, fixed 1.7.13)
-CVE-2006-1724 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-1724 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1723 VULNERABLE (thunderbird, fixed 1.5.0.2)
 CVE-2006-1723 VULNERABLE (firefox, fixed 1.5.0.2)
 CVE-2006-1721 ** cyrus-sasl
@@ -109,7 +109,7 @@
 CVE-2006-0836 VULNERABLE (thunderbird)
 CVE-2006-0749 VULNERABLE (thunderbird, fixed 1.5.0.2)
 CVE-2006-0749 VULNERABLE (mozilla, fixed 1.7.13)
-CVE-2006-0749 VULNERABLE (firefox, fixed 1.5.0.2)
+CVE-2006-0749 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-0748 VULNERABLE (thunderbird, fixed 1.5.0.2)
 CVE-2006-0748 VULNERABLE (mozilla, fixed 1.7.13)
 CVE-2006-0748 VULNERABLE (firefox, fixed 1.5.0.2)



From fedora-extras-commits at redhat.com  Mon Apr 24 07:46:19 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon, 24 Apr 2006 00:46:19 -0700
Subject: fedora-security/audit fc4,1.210,1.211 fc5,1.123,1.124
Message-ID: <200604240746.k3O7kJ89014008@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13988

Modified Files:
	fc4 fc5 
Log Message:
Catch up with new CVEs



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.210
retrieving revision 1.211
diff -u -r1.210 -r1.211
--- fc4	24 Apr 2006 07:38:36 -0000	1.210
+++ fc4	24 Apr 2006 07:46:17 -0000	1.211
@@ -1,8 +1,11 @@
-Up to date CVE as of CVE email 20060414
+Up to date CVE as of CVE email 20060423
 Up to date FC4 as of 20060420
 
 ** are items that need attention
 
+CVE-2006-1942 ** firefox
+CVE-2006-1931 ** ruby
+CVE-2006-1902 ignore (gcc) not a vulnerability
 CVE-2006-1790 version (firefox, fixed 1.0.8) [since FEDORA-2006-410]
 CVE-2006-1790 VULNERABLE (thunderbird, fixed 1.0.8)
 CVE-2006-1790 VULNERABLE (mozilla, fixed 1.7.13)
@@ -848,6 +851,7 @@
 CVE-2005-0004 version (mysql, fixed 4.1.10)
 CVE-2005-0003 version (kernel, fixed 2.6.10)
 CVE-2005-0001 version (kernel, fixed 2.6.10)
+CVE-2004-2657 ** firefox
 CVE-2004-2655 version (xscreensaver)
 CVE-2004-2654 version (squid, fixed 2.6STABLE6)
 CVE-2004-2607 version (kernel, fixed 2.6.5)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- fc5	24 Apr 2006 07:38:36 -0000	1.123
+++ fc5	24 Apr 2006 07:46:17 -0000	1.124
@@ -1,8 +1,12 @@
-Up to date CVE as of CVE email 20060414
+Up to date CVE as of CVE email 20060423
 Up to date FC5 as of 20060419
 
 ** are items that need attention
 
+CVE-2006-1942 ** firefox
+CVE-2006-1931 ** ruby
+CVE-2006-1902 ignore (gcc) not a vulnerability
+CVE-2006-1865 version (beagle, fixed 0.2.5) [since FEDORA-2006-440]
 CVE-2006-1790 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1790 VULNERABLE (thunderbird, fixed 1.5.0.2)
 CVE-2006-1790 VULNERABLE (mozilla, fixed 1.7.13)
@@ -847,6 +851,7 @@
 CVE-2005-0004 version (mysql, fixed 4.1.10)
 CVE-2005-0003 version (kernel, fixed 2.6.10)
 CVE-2005-0001 version (kernel, fixed 2.6.10)
+CVE-2004-2657 ** firefox
 CVE-2004-2655 version (xscreensaver)
 CVE-2004-2654 version (squid, fixed 2.6STABLE6)
 CVE-2004-2607 version (kernel, fixed 2.6.5)



From fedora-extras-commits at redhat.com  Mon Apr 24 08:05:45 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon, 24 Apr 2006 01:05:45 -0700
Subject: fedora-security/audit fc5,1.124,1.125
Message-ID: <200604240805.k3O85jFB016185@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16165

Modified Files:
	fc5 
Log Message:
Deal with the beagle; check that the fix for CVE-2006-1296 made it upstream
(it did, in 0.2.4)



Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- fc5	24 Apr 2006 07:46:17 -0000	1.124
+++ fc5	24 Apr 2006 08:05:43 -0000	1.125
@@ -90,7 +90,7 @@
 CVE-2006-1343 VULNERABLE (kernel)
 CVE-2006-1342 version (kernel, not 2.6) not vulnerable
 CVE-2006-1335 version (gnome-screensaver, fixed 2.14)
-CVE-2006-1296 backport (beagle) bz#185981 [since FEDORA-2006-188]
+CVE-2006-1296 version (beagle, fixed 0.2.4) bz#185981 [since FEDORA-2006-305] was backport since FEDORA-2006-188
 CVE-2006-1273 ignore (firefox) this issue only affects IE
 CVE-2006-1244 ignore (xpdf) duplicate of other cve named issues
 CVE-2006-1242 VULNERABLE (kernel)



From fedora-extras-commits at redhat.com  Mon Apr 24 08:17:34 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon, 24 Apr 2006 01:17:34 -0700
Subject: fedora-security/audit fc4,1.211,1.212 fc5,1.125,1.126
Message-ID: <200604240817.k3O8HYKs016228@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16208

Modified Files:
	fc4 fc5 
Log Message:
Finish off my fc4/fc5 catchup, check in the source that kdegraphics 3.5.2
fixed this cve upstream now (it does)



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -r1.211 -r1.212
--- fc4	24 Apr 2006 07:46:17 -0000	1.211
+++ fc4	24 Apr 2006 08:17:31 -0000	1.212
@@ -1,5 +1,5 @@
 Up to date CVE as of CVE email 20060423
-Up to date FC4 as of 20060420
+Up to date FC4 as of 20060423
 
 ** are items that need attention
 
@@ -99,6 +99,7 @@
 CVE-2006-1061 version (curl, 7.15.0 - 7.15.2 only)
 CVE-2006-1059 version (samba)
 CVE-2006-1058 VULNERABLE (busybox) bz#187386
+CVE-2006-1057 VULNERABLE (gdm, fixed 2.14.1) bz#188303
 CVE-2006-1056 version (kernel, fixed 2.6.16.9) [since FEDORA-2006-423]
 CVE-2006-1055 version (kernel, fixed 2.6.17-rc1) [since FEDORA-2006-423]
 CVE-2006-1052 version (kernel, fixed 2.6.16) patch-2.6.16-rc6 [since FEDORA-2006-245]
@@ -144,7 +145,7 @@
 CVE-2006-0321 version (fetchmail, fixed 6.3.2) 6.3.X only affected
 CVE-2006-0301 version (poppler, fixed 0.4.5) [since FEDORA-2006-103]
 CVE-2006-0301 backport (xpdf) [since FEDORA-2006-104]
-CVE-2006-0301 backport (kdegraphics) [since FEDORA-2006-105]
+CVE-2006-0301 version (kdegraphics, fixed 3.5.2) [since FEDORA-2006-385] was backport since FEDORA-2006-105
 CVE-2006-0300 VULNERABLE (tar) bz#181773
 CVE-2006-0299 version (thunderbird, 1.5 only)
 CVE-2006-0299 version (mozilla, 1.8 branch only)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- fc5	24 Apr 2006 08:05:43 -0000	1.125
+++ fc5	24 Apr 2006 08:17:31 -0000	1.126
@@ -1,5 +1,5 @@
 Up to date CVE as of CVE email 20060423
-Up to date FC5 as of 20060419
+Up to date FC5 as of 20060423
 
 ** are items that need attention
 
@@ -101,6 +101,7 @@
 CVE-2006-1061 backport (curl, fixed 7.15.3) [since FEDORA-2006-189]
 CVE-2006-1059 version (samba, fixed 3.0.22 at least) bz#187170 [since FEDORA-2006-259]
 CVE-2006-1058 VULNERABLE (busybox) bz#187386
+CVE-2006-1057 version (gdm, fixed 2.14.1) bz#188303 [since FEDORA-2006-338]
 CVE-2006-1056 version (kernel, fixed 2.6.16.9) [since FEDORA-2006-421]
 CVE-2006-1055 version (kernel, fixed 2.6.17-rc1) [since FEDORA-2006-421]
 CVE-2006-1052 version (kernel, fixed 2.6.16) patch-2.6.16-rc6 [since FEDORA-2006-233]
@@ -146,7 +147,7 @@
 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 backport (kdegraphics) post-3.5.1-kdegraphics-CVE-2006-0301.diff
+CVE-2006-0301 version (kdegraphics, fixed 3.5.2) [since FEDORA-2006-352] was backport since GA
 CVE-2006-0300 VULNERABLE (tar) [fixed rawhide in tar-1.15.1-13]
 CVE-2006-0299 version (thunderbird, fixed 1.5)
 CVE-2006-0299 version (mozilla, 1.8 branch only)
@@ -189,7 +190,7 @@
 CVE-2006-0058 version (sendmail, fixed 8.13.6) [since FEDORA-2006-193]
 CVE-2006-0052 version (mailman, fixed 2.1.6)
 CVE-2006-0049 version (gnupg, fixed 1.4.2.2)
-CVE-2006-0040 VULNERABLE (gtkhtml) no upstream fix
+CVE-2006-0040 ** VULNERABLE (gtkhtml) no upstream fix
 CVE-2006-0037 version (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 [since FEDORA-2006-233]
 CVE-2006-0036 version (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 [since FEDORA-2006-233]
 CVE-2006-0035 version (kernel, only 2.6.14 and 2.6.15) patch-2.6.16-rc6 [since FEDORA-2006-233]



From fedora-extras-commits at redhat.com  Mon Apr 24 08:26:06 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Mon, 24 Apr 2006 01:26:06 -0700
Subject: fedora-security/audit fc4,1.212,1.213 fc5,1.126,1.127
Message-ID: <200604240826.k3O8Q6kd016267@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16247

Modified Files:
	fc4 fc5 
Log Message:
Few minor corrections



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -r1.212 -r1.213
--- fc4	24 Apr 2006 08:17:31 -0000	1.212
+++ fc4	24 Apr 2006 08:26:03 -0000	1.213
@@ -102,7 +102,7 @@
 CVE-2006-1057 VULNERABLE (gdm, fixed 2.14.1) bz#188303
 CVE-2006-1056 version (kernel, fixed 2.6.16.9) [since FEDORA-2006-423]
 CVE-2006-1055 version (kernel, fixed 2.6.17-rc1) [since FEDORA-2006-423]
-CVE-2006-1052 version (kernel, fixed 2.6.16) patch-2.6.16-rc6 [since FEDORA-2006-245]
+CVE-2006-1052 version (kernel, fixed 2.6.16) [since FEDORA-2006-423] was backport since FEDORA-2006-245
 CVE-2006-1045 VULNERABLE (thunderbird)
 CVE-2006-1015 ignore (php) safe mode isn't safe
 CVE-2006-1014 ignore (php) safe mode isn't safe
@@ -138,7 +138,7 @@
 CVE-2006-0459 version (flex) by inspection
 CVE-2006-0457 version (kernel, fixed 2.6.15.5) [since FEDORA-2006-245] was backport since FEDORA-2006-131
 CVE-2006-0455 version (gnupg, fixed 1.4.2.1) [since FEDORA-2006-116]
-CVE-2006-0454 version (kernel, fixed 2.6.15.3) [since FEDORA-2006-102] patch-2.6.15.3
+CVE-2006-0454 version (kernel, fixed 2.6.15.3) [since FEDORA-2006-423] was backport since FEDORA-2006-102
 CVE-2006-0405 version (libtiff, 3.8.0 only)
 CVE-2006-0377 version (squirrelmail, fixed 1.4.6) [since FEDORA-2006-133]
 CVE-2006-0369 ignore (mysql) this is not a security issue
@@ -590,8 +590,8 @@
 CVE-2005-1268 backport (httpd) [since FEDORA-2005-639]
 CVE-2005-1267 backport (tcpdump) [since FEDORA-2005-407]
 CVE-2005-1266 version (spamassassin, fixed 3.0.4) [since FEDORA-2005-428]
-CVE-2005-1265 version (kernel, fixed 2.6.12-rc5) [since FEDORA-2005-510] was backport
-CVE-2005-1264 version (kernel, fixed 2.6.11.10) [since FEDORA-2005-510] was backport (..12-rc4-git5 since re0522.0)
+CVE-2005-1265 version (kernel, fixed 2.6.12-rc5) [since FEDORA-2005-510] was backport since GA
+CVE-2005-1264 version (kernel, fixed 2.6.11.10) [since FEDORA-2005-510] was backport since GA
 CVE-2005-1263 version (kernel) [since FEDORA-2005-510] was patch-2.6.12-rc4-git5 since re0522.0
 CVE-2005-1262 version (gaim, fixed 1.3.0) [since re0522.0]
 CVE-2005-1261 version (gaim, fixed 1.3.0) [since re0522.0]
@@ -660,9 +660,9 @@
 CVE-2005-0758 version (gzip, fixed 1.3.5)
 CVE-2005-0758 VULNERABLE (bzip2) by inspection bz#159819
 CVE-2005-0757 version (kernel, not 2.6)
-CVE-2005-0756 version (kernel, fixed 2.6.12) [since FEDORA-2005-510] was backport in patch-2.6.12-rc5
+CVE-2005-0756 version (kernel, fixed 2.6.12) [since FEDORA-2005-510] was backport since GA
 CVE-2005-0755 version (HelixPlayer, fixed 10.0.4)
-CVE-2005-0754 version (kdewebdev, fixed after 3.4.0) [since FEDORA-2005-437] was backport....4.0-CAN-2005-0754.patch
+CVE-2005-0754 version (kdewebdev, fixed after 3.4.0) [since FEDORA-2005-437] was backport since GA
 CVE-2005-0753 backport (cvs, fixed 1.12.12) in cvs-1.11.17-CAN-2005-0753.patch
 CVE-2005-0752 version (firefox, fixed 1.0.3)
 CVE-2005-0750 version (kernel, fixed 2.6.11.6) was backport in patch-2.6.12-rc3


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- fc5	24 Apr 2006 08:17:31 -0000	1.126
+++ fc5	24 Apr 2006 08:26:03 -0000	1.127
@@ -104,7 +104,7 @@
 CVE-2006-1057 version (gdm, fixed 2.14.1) bz#188303 [since FEDORA-2006-338]
 CVE-2006-1056 version (kernel, fixed 2.6.16.9) [since FEDORA-2006-421]
 CVE-2006-1055 version (kernel, fixed 2.6.17-rc1) [since FEDORA-2006-421]
-CVE-2006-1052 version (kernel, fixed 2.6.16) patch-2.6.16-rc6 [since FEDORA-2006-233]
+CVE-2006-1052 version (kernel, fixed 2.6.16) [since FEDORA-2006-421] was patch-2.6.16-rc6 since FEDORA-2006-233
 CVE-2006-1045 VULNERABLE (thunderbird)
 CVE-2006-1015 ignore (php) safe mode isn't safe
 CVE-2006-1014 ignore (php) safe mode isn't safe



From fedora-extras-commits at redhat.com  Mon Apr 24 08:34:21 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Mon, 24 Apr 2006 01:34:21 -0700
Subject: rpms/ghc/FC-4 .cvsignore,1.5,1.6 ghc.spec,1.7,1.8 sources,1.5,1.6
Message-ID: <200604240834.k3O8YNQ8016325@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16295

Modified Files:
	.cvsignore ghc.spec sources 
Log Message:
sync with fe5:
- update to 6.4.2 release
- make ghc-doc require ghc (Michel Salim, #180449)
- turn on build_doc since haddock is now in Extras
- no longer specify ghc version to build with (Ville Skytta, #170176)
: ----------------------------------------------------------------------



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ghc/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	20 Sep 2005 23:50:02 -0000	1.5
+++ .cvsignore	24 Apr 2006 08:34:21 -0000	1.6
@@ -1 +1 @@
-ghc-6.4.1-src.tar.bz2
+ghc-6.4.2-src.tar.bz2


Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/FC-4/ghc.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ghc.spec	20 Sep 2005 23:50:02 -0000	1.7
+++ ghc.spec	24 Apr 2006 08:34:21 -0000	1.8
@@ -1,12 +1,11 @@
-%define build_version 6.4
-%define ghcver ghc641
+%define ghcver ghc642
 
 # speed up test builds by not building profiled libraries
 %define build_prof 1
-%define build_doc 0
+%define build_doc 1
 
 Name:		ghc
-Version:	6.4.1
+Version:	6.4.2
 Release:	1%{?dist}
 Summary:	Glasgow Haskell Compilation system
 License:	BSD style
@@ -21,7 +20,7 @@
 # haddock generates libraries/ docs
 Buildrequires: libxslt, docbook-style-xsl, haddock
 %endif
-Prefix: %{_prefix}
+Prefix:		%{_prefix}
 
 %description
 GHC is a state-of-the-art programming suite for Haskell, a purely
@@ -66,6 +65,7 @@
 %package doc
 Summary:	Documentation for GHC
 Group:		Development/Languages
+Requires:	%{name}
 
 %description doc
 Preformatted documentation for the Glorious Glasgow Haskell
@@ -85,7 +85,7 @@
 echo "GhcRTSWays=thr debug" >> mk/build.mk
 %endif
 
-./configure --prefix=%{_prefix} --libdir=%{_libdir} --with-ghc=ghc-%{build_version}
+./configure --prefix=%{_prefix} --libdir=%{_libdir}
 
 make all
 %if %{build_doc}
@@ -156,7 +156,17 @@
 %endif
 
 %changelog
-* Tue Sep 20 2005 Jens Petersen <petersen at redhat.com> - 6.4.1-1
+* Sat Apr 22 2006 Jens Petersen <petersen at redhat.com> - 6.4.2-1.fc4
+- update to 6.4.2 release
+
+* Thu Mar  2 2006 Jens Petersen <petersen at redhat.com>
+- make ghc-doc require ghc (Michel Salim, #180449)
+
+* Tue Oct 11 2005 Jens Petersen <petersen at redhat.com>
+- turn on build_doc since haddock is now in Extras
+- no longer specify ghc version to build with (Ville Skytt??, #170176)
+
+* Tue Sep 20 2005 Jens Petersen <petersen at redhat.com> - 6.4.1-1.fc4
 - 6.4.1 release
   - the following patches are now upstream: ghc-6.4-powerpc.patch,
     rts-GCCompact.h-x86_64.patch, ghc-6.4-dsforeign-x86_64-1097471.patch,


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ghc/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	20 Sep 2005 23:50:02 -0000	1.5
+++ sources	24 Apr 2006 08:34:21 -0000	1.6
@@ -1 +1 @@
-fd289bc7c3afa272ff831a71a50b5b00  ghc-6.4.1-src.tar.bz2
+a394bf14e94c3bca5507d568fcc03375  ghc-6.4.2-src.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 24 08:51:04 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Mon, 24 Apr 2006 01:51:04 -0700
Subject: owners owners.list,1.883,1.884
Message-ID: <200604240851.k3O8p69s016421@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16404

Modified Files:
	owners.list 
Log Message:
ices added



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.883
retrieving revision 1.884
diff -u -r1.883 -r1.884
--- owners.list	23 Apr 2006 23:32:45 -0000	1.883
+++ owners.list	24 Apr 2006 08:51:04 -0000	1.884
@@ -475,6 +475,7 @@
 Fedora Extras|i8kutils|Dell laptop (Inspiron 8000 and others) SMM BIOS support tools|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 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|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|



From fedora-extras-commits at redhat.com  Mon Apr 24 08:52:18 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Mon, 24 Apr 2006 01:52:18 -0700
Subject: rpms/ices/devel - New directory
Message-ID: <200604240852.k3O8qKt1016503@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ices/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16474/ices/devel

Log Message:
Directory /cvs/extras/rpms/ices/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 24 08:52:17 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Mon, 24 Apr 2006 01:52:17 -0700
Subject: rpms/ices - New directory
Message-ID: <200604240852.k3O8qJJ6016500@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ices
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16474/ices

Log Message:
Directory /cvs/extras/rpms/ices added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 24 08:52:35 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Mon, 24 Apr 2006 01:52:35 -0700
Subject: rpms/ices Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604240852.k3O8qbeq016553@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ices
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16520

Added Files:
	Makefile import.log 
Log Message:
Setup of module ices


--- NEW FILE Makefile ---
# Top level Makefile for module ices
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 24 08:52:36 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Mon, 24 Apr 2006 01:52:36 -0700
Subject: rpms/ices/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200604240852.k3O8qc7j016556@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ices/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16520/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ices


--- 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 Apr 24 08:53:23 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Mon, 24 Apr 2006 01:53:23 -0700
Subject: rpms/ices import.log,1.1,1.2
Message-ID: <200604240853.k3O8rtQZ016630@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ices
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16594

Modified Files:
	import.log 
Log Message:
auto-import ices-2.0.1-2 on branch devel from ices-2.0.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ices/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Apr 2006 08:52:35 -0000	1.1
+++ import.log	24 Apr 2006 08:53:23 -0000	1.2
@@ -0,0 +1 @@
+ices-2_0_1-2:HEAD:ices-2.0.1-2.src.rpm:1145868800



From fedora-extras-commits at redhat.com  Mon Apr 24 08:53:24 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Mon, 24 Apr 2006 01:53:24 -0700
Subject: rpms/ices/devel ices.init, NONE, 1.1 ices.logrotate, NONE,
	1.1 ices.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604240853.k3O8ruEB016634@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ices/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16594/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ices.init ices.logrotate ices.spec 
Log Message:
auto-import ices-2.0.1-2 on branch devel from ices-2.0.1-2.src.rpm


--- NEW FILE ices.init ---
#!/bin/sh
#
# ices		This shellscript takes care of starting and stopping
#		the ices client
#
# chkconfig: 345 40 60
# description: IceS is a source client for broadcasting in Ogg Vorbis format \
#              to an icecast2 server
# processname: ices
#
# Source function library.
. /etc/init.d/functions

# Source networking configuration.
[ -f /etc/sysconfig/network ] && . /etc/sysconfig/network

# Check that networking is up.
[ ${NETWORKING} = "no" ] && exit 0

LOCKFILE=/var/lock/subsys/ices
RETVAL=0

start() {
	export TMPDIR="/var/tmp"

	echo -n "Starting ices: "
	daemon --user ices /usr/bin/ices /etc/ices.conf
	RETVAL=$?
	echo
	[ $RETVAL -eq 0 ] && touch $LOCKFILE
}	
stop() {
	echo -n "Shutting down ices: "
	killproc ices
	RETVAL=$?
	echo
	[ $RETVAL -eq 0 ] && rm -f $LOCKFILE
}	


case "$1" in
  start)
  	start
	;;
  stop)
  	stop
	;;
  restart|reload)
	stop
	start
	;;
  status)
	status $PROCESS
	RETVAL=$?
	;;
  condrestart)
  	[ -f $LOCKFILE ] && restart
	;;
  *)
	echo "Usage: $0 {start|stop|restart|status|condrestart}"
	RETVAL=1
esac

exit $?


--- NEW FILE ices.logrotate ---
/var/log/ices.log {
    weekly
    notifempty
    missingok
}


--- NEW FILE ices.spec ---
Name: ices
Version: 2.0.1
Release: 2%{?dist}
Summary: Source streaming for Icecast
Group: System Environment/Daemons
License: GPL
URL: http://www.icecast.org
Source0: http://downloads.us.xiph.org/releases/ices/ices-2.0.1.tar.bz2
Source1: ices.init
Source2: ices.logrotate
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libxml2-devel, libshout-devel >= 2.0, libvorbis-devel,
BuildRequires: alsa-lib-devel, pkgconfig, zlib-devel, libogg-devel
BuildRequires: libtheora-devel, speex-devel
Requires: streaming-server
Requires(post): /sbin/chkconfig
Requires(post): /sbin/service
Requires(preun): /sbin/chkconfig
Requires(preun): /sbin/service

%description
IceS is a source client for a streaming server. The purpose of this client is
to provide an audio stream to a streaming server such that one or more
listeners can access the stream. With this layout, this source client can be
situated remotely from the icecast server.

The primary example of a streaming server used is Icecast 2, although others
could be used if certain conditions are met.

%prep
%setup -q
perl -pi -e 's|<background>0</background>|<background>1</background>|' conf/*.xml

%build
%configure \
	--with-ogg \
	--with-vorbis

%{__make} %{?_smp_mflags}

%install
rm -rf %{buildroot}

install -D -m 755 src/ices %{buildroot}%{_bindir}/ices
install -D -m 644 conf/ices-playlist.xml %{buildroot}%{_sysconfdir}/ices.conf
install -D -m 755 %{SOURCE1} %{buildroot}%{_initrddir}/ices
install -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/ices
install -d -m 755 %{buildroot}%{_var}/log/ices

%clean 
rm -rf %{buildroot}

%pre
/usr/sbin/useradd -c "IceS Shoutcast source" \
        -s /sbin/nologin -r -d /dev/null ices 2> /dev/null || :

%post
if [ $1 = 1 ]; then
   /sbin/chkconfig --add ices
fi

%preun
if [ $1 = 0 ]; then
        /sbin/service ices stop >/dev/null 2>&1
        /sbin/chkconfig --del ices
fi

%postun
if [ "$1" -ge "1" ]; then
        /sbin/service ices condrestart >/dev/null 2>&1
fi

%files
%defattr(-,root,root)
%doc AUTHORS COPYING README TODO doc/*.html doc/*.css conf/*.xml
%{_bindir}/ices
%config(noreplace) %{_sysconfdir}/ices.conf
%config %{_sysconfdir}/logrotate.d/ices
%{_initrddir}/ices
%attr(0770,root,ices) %{_var}/log/ices

%changelog
* Tue Mar 28 2006 Andreas Thienemann <andreas at bawue.net> 2.0.1-2
- Cleaned up the specfile for FE

* Thu Nov 17 2005 Matt Domsch <Matt_Domsch at dell.com> 2.0.1-1
- add dist tag
- rebuild for FC4

* Mon Jan 31 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:2.0.1-0.iva.0
- Upstream update

* Fri Jan  7 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0:2.0.0-0.iva.0
- Retooled for Fedora Core 3


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ices/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Apr 2006 08:52:36 -0000	1.1
+++ .cvsignore	24 Apr 2006 08:53:24 -0000	1.2
@@ -0,0 +1 @@
+ices-2.0.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ices/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Apr 2006 08:52:36 -0000	1.1
+++ sources	24 Apr 2006 08:53:24 -0000	1.2
@@ -0,0 +1 @@
+8c7be81b304c4ce588f43b9d02603f6e  ices-2.0.1.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 24 09:42:20 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 24 Apr 2006 02:42:20 -0700
Subject: rpms/perl-Algorithm-Dependency/devel .cvsignore, 1.3,
	1.4 perl-Algorithm-Dependency.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200604240942.k3O9gMkY019330@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Algorithm-Dependency/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19309

Modified Files:
	.cvsignore perl-Algorithm-Dependency.spec sources 
Log Message:
* Mon Apr 24 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.102-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-Dependency/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Oct 2005 02:59:40 -0000	1.3
+++ .cvsignore	24 Apr 2006 09:42:20 -0000	1.4
@@ -1 +1 @@
-Algorithm-Dependency-1.101.tar.gz
+Algorithm-Dependency-1.102.tar.gz


Index: perl-Algorithm-Dependency.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-Dependency/devel/perl-Algorithm-Dependency.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Algorithm-Dependency.spec	28 Feb 2006 23:15:38 -0000	1.4
+++ perl-Algorithm-Dependency.spec	24 Apr 2006 09:42:20 -0000	1.5
@@ -1,5 +1,5 @@
 Name: 		perl-Algorithm-Dependency
-Version: 	1.101
+Version: 	1.102
 Release: 	2%{?dist}
 Summary: 	Algorithmic framework for implementing dependency trees
 License: 	GPL or Artistic
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Apr 24 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.102-1
+- Upstream update.
+
 * Wed Mar 01 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.101-2
 - Rebuild for perl-5.8.8.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-Dependency/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Oct 2005 02:59:40 -0000	1.3
+++ sources	24 Apr 2006 09:42:20 -0000	1.4
@@ -1 +1 @@
-d6187a17fa90cbf4d1c513ea2c500269  Algorithm-Dependency-1.101.tar.gz
+971111997767dd456cb4a4e967c97ca3  Algorithm-Dependency-1.102.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 24 09:43:12 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 24 Apr 2006 02:43:12 -0700
Subject: rpms/perl-Algorithm-Dependency/devel perl-Algorithm-Dependency.spec,
	1.5, 1.6
Message-ID: <200604240943.k3O9hEjL019369@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Algorithm-Dependency/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19352

Modified Files:
	perl-Algorithm-Dependency.spec 
Log Message:
Fix typo in spec


Index: perl-Algorithm-Dependency.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-Dependency/devel/perl-Algorithm-Dependency.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Algorithm-Dependency.spec	24 Apr 2006 09:42:20 -0000	1.5
+++ perl-Algorithm-Dependency.spec	24 Apr 2006 09:43:11 -0000	1.6
@@ -1,6 +1,6 @@
 Name: 		perl-Algorithm-Dependency
 Version: 	1.102
-Release: 	2%{?dist}
+Release: 	1%{?dist}
 Summary: 	Algorithmic framework for implementing dependency trees
 License: 	GPL or Artistic
 Group: 		Development/Libraries



From fedora-extras-commits at redhat.com  Mon Apr 24 10:49:34 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 24 Apr 2006 03:49:34 -0700
Subject: rpms/hugs98/FC-5 openal-1.0_1.2.patch,NONE,1.1 hugs98.spec,1.3,1.4
Message-ID: <200604241049.k3OAnauh021767@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/hugs98/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21747

Modified Files:
	hugs98.spec 
Added Files:
	openal-1.0_1.2.patch 
Log Message:
added openal support

openal-1.0_1.2.patch:

--- NEW FILE openal-1.0_1.2.patch ---
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/LICENSE ghc-6.4.2/libraries/OpenAL/LICENSE
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/LICENSE	2004-01-03 04:03:07.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/LICENSE	2006-03-22 00:58:03.000000000 +0900
@@ -1,4 +1,4 @@
-Copyright (c) 2003-2004, Sven Panne
+Copyright (c) 2003-2005, Sven Panne
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/Makefile ghc-6.4.2/libraries/OpenAL/Makefile
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/Makefile	2005-03-03 01:39:55.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/Makefile	2006-03-22 00:58:03.000000000 +0900
@@ -4,6 +4,12 @@
 include $(TOP)/mk/boilerplate.mk
 -include config.mk
 
+ifneq "$(findstring clean, $(MAKECMDGOALS))" ""
+# if we're cleaning, then config.mk might have been cleaned already
+AL_BUILD_PACKAGE=yes
+PACKAGE=OpenAL
+endif
+
 ifneq "$(AL_BUILD_PACKAGE)" "no"
 
 # -----------------------------------------------------------------------------
@@ -18,19 +24,17 @@
 	Sound \
 	Sound/OpenAL \
 	Sound/OpenAL/AL \
-	Sound/OpenAL/ALC \
-	Sound/OpenAL/ALUT
+	Sound/OpenAL/ALC
 
 PACKAGE_DEPS = base OpenGL
 
 SRC_HC_OPTS += -Wall -fffi -Iinclude '-\#include "HsOpenAL.h"' -cpp
 
 # WinDoze DLL hell
+# NOTE: For some obscure/unknown reason, OpenAL uses ccall, even on WinDoze...
+SRC_HC_OPTS += -DCALLCONV=ccall
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-SRC_HC_OPTS += -DCALLCONV=stdcall
 SRC_HC_OPTS := $(subst -mno-cygwin,,$(SRC_HC_OPTS))
-else
-SRC_HC_OPTS += -DCALLCONV=ccall
 endif
 
 PACKAGE_CPP_OPTS += -DMAINTAINER=$(MAINTAINER)
@@ -41,18 +45,14 @@
 
 package.conf.inplace \
 package.conf.installed \
-Sound/OpenAL/AL/BasicTypes.$(way_)o \
-Sound/OpenAL/AL/Format.$(way_)o \
-Sound/OpenAL/ALC/BasicTypes.$(way_)o \
-Sound/OpenAL/ALC/Errors.$(way_)o \
-Sound/OpenAL/ALC/Queries.$(way_)o : include/HsOpenALConfig.h
+Sound/OpenAL/Config.$(way_)o \
+Sound/OpenAL/Constants.$(way_)o : include/HsOpenALConfig.h
 
 endif
 
 # -----------------------------------------------------------------------------
 
-DIST_CLEAN_FILES += OpenAL.buildinfo config.cache config.status
-LATE_DIST_CLEAN_FILES += config.mk
+DIST_CLEAN_FILES += OpenAL.buildinfo config.cache config.status config.mk
 
 extraclean::
 	$(RM) -rf autom4te.cache
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/OpenAL.buildinfo.in ghc-6.4.2/libraries/OpenAL/OpenAL.buildinfo.in
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/OpenAL.buildinfo.in	2005-01-16 22:13:05.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/OpenAL.buildinfo.in	2006-03-22 00:58:03.000000000 +0900
@@ -2,6 +2,7 @@
 -- System-dependent values used by Distribution.Simple.defaultUserHooks
 --
 buildable: @BUILD_PACKAGE_BOOL@
+ghc-options: -DCALLCONV=@CALLCONV@
 cc-options: -DCALLCONV=@CALLCONV@
 ld-options: @AL_LIBS@
 frameworks: @AL_FRAMEWORKS@
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/OpenAL.cabal ghc-6.4.2/libraries/OpenAL/OpenAL.cabal
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/OpenAL.cabal	2005-02-11 10:55:55.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/OpenAL.cabal	2006-03-22 00:58:03.000000000 +0900
@@ -1,5 +1,5 @@
 name:		OpenAL
-version:	1.0
+version:	1.2
 license:	BSD3
 license-file:	LICENSE
 maintainer:	Sven Panne <sven.panne at aedion.de>
@@ -10,27 +10,36 @@
 exposed-modules:
 	Sound.OpenAL,
 	Sound.OpenAL.AL,
+	Sound.OpenAL.AL.ALboolean,
+	Sound.OpenAL.AL.Attenuation,
 	Sound.OpenAL.AL.BasicTypes,
 	Sound.OpenAL.AL.Buffer,
+	Sound.OpenAL.AL.BufferInternal,
+	Sound.OpenAL.AL.Doppler,
+	Sound.OpenAL.AL.Errors,
+	Sound.OpenAL.AL.Extensions,
+	Sound.OpenAL.AL.Format,
 	Sound.OpenAL.AL.Listener,
 	Sound.OpenAL.AL.Source,
+	Sound.OpenAL.AL.StringQueries,
 	Sound.OpenAL.ALC,
+	Sound.OpenAL.ALC.BasicTypes,
+	Sound.OpenAL.ALC.Capture,
 	Sound.OpenAL.ALC.Context,
 	Sound.OpenAL.ALC.Device,
 	Sound.OpenAL.ALC.Errors,
-	Sound.OpenAL.ALC.Extensions,
-	Sound.OpenAL.ALUT,
-	Sound.OpenAL.ALUT.Initialization,
-	Sound.OpenAL.ALUT.WAV
+	Sound.OpenAL.ALC.Extensions
 other-modules:
-	Sound.OpenAL.AL.ALboolean,
-	Sound.OpenAL.AL.Format,
 	Sound.OpenAL.AL.PeekPoke,
 	Sound.OpenAL.AL.QueryUtils,
-	Sound.OpenAL.ALC.BasicTypes,
-	Sound.OpenAL.ALC.Queries,
-	Sound.OpenAL.ALUT.Exception
+	Sound.OpenAL.AL.SourceState,
+	Sound.OpenAL.AL.String,
+	Sound.OpenAL.ALC.ALCboolean,
+	Sound.OpenAL.ALC.QueryUtils,
+	Sound.OpenAL.ALC.String,
+	Sound.OpenAL.Config,
+	Sound.OpenAL.Constants
 include-dirs:	include
 includes:	"HsOpenAL.h"
 build-depends:	base, OpenGL
-extensions:	CPP
+extensions:	CPP, ForeignFunctionInterface
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/Sound/OpenAL/AL/ALboolean.hs ghc-6.4.2/libraries/OpenAL/Sound/OpenAL/AL/ALboolean.hs
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/Sound/OpenAL/AL/ALboolean.hs	2004-01-03 04:03:08.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/Sound/OpenAL/AL/ALboolean.hs	2006-03-22 00:58:03.000000000 +0900
@@ -2,7 +2,7 @@
 --------------------------------------------------------------------------------
 -- |
 -- Module      :  Sound.OpenAL.AL.ALboolean
--- Copyright   :  (c) Sven Panne 2003-2004
+-- Copyright   :  (c) Sven Panne 2003-2005
 -- License     :  BSD-style (see the file libraries/OpenAL/LICENSE)
 -- 
 -- Maintainer  :  sven.panne at aedion.de
@@ -14,16 +14,17 @@
 --------------------------------------------------------------------------------
 
 module Sound.OpenAL.AL.ALboolean (
-   ALboolean, marshalALboolean, unmarshalALboolean
+   marshalALboolean, unmarshalALboolean
 ) where
 
 import Sound.OpenAL.AL.BasicTypes ( ALboolean )
+import Sound.OpenAL.Constants ( al_FALSE, al_TRUE )
 
 --------------------------------------------------------------------------------
 
 marshalALboolean :: Bool -> ALboolean
-marshalALboolean False = 0
-marshalALboolean True  = 1
+marshalALboolean False = al_FALSE
+marshalALboolean True  = al_TRUE
 
 unmarshalALboolean :: ALboolean -> Bool
-unmarshalALboolean = (/= 0)
+unmarshalALboolean = (/= al_FALSE)
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/Sound/OpenAL/AL/Attenuation.hs ghc-6.4.2/libraries/OpenAL/Sound/OpenAL/AL/Attenuation.hs
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/Sound/OpenAL/AL/Attenuation.hs	1970-01-01 09:00:00.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/Sound/OpenAL/AL/Attenuation.hs	2006-03-22 00:58:03.000000000 +0900
@@ -0,0 +1,211 @@
+--------------------------------------------------------------------------------
+-- |
+-- Module      :  Sound.OpenAL.AL.Attenuation
+-- Copyright   :  (c) Sven Panne 2005
+-- License     :  BSD-style (see the file libraries/OpenAL/LICENSE)
+-- 
+-- Maintainer  :  sven.panne at aedion.de
+-- Stability   :  provisional
+-- Portability :  portable
+--
+-- This module corresponds to section 3.4 (Attenuation By Distance) of the
+-- OpenAL Specification and Reference (version 1.1).
+-- 
+--------------------------------------------------------------------------------
+
+module Sound.OpenAL.AL.Attenuation (
+   -- * Introduction
+   -- $Introduction
+
+   -- * Handling the Distance Model
+   DistanceModel(..), distanceModel
+
+   -- * Evaluation of Gain\/Attenuation Related State
[...9030 lines suppressed...]
+#undef CONST_AL_ORIENTATION
+
+/* The value of AL_OUT_OF_MEMORY. */
+#undef CONST_AL_OUT_OF_MEMORY
+
+/* The value of AL_PAUSED. */
+#undef CONST_AL_PAUSED
+
+/* The value of AL_PITCH. */
+#undef CONST_AL_PITCH
+
+/* The value of AL_PLAYING. */
+#undef CONST_AL_PLAYING
+
+/* The value of AL_POSITION. */
+#undef CONST_AL_POSITION
+
+/* The value of AL_REFERENCE_DISTANCE. */
+#undef CONST_AL_REFERENCE_DISTANCE
+
+/* The value of AL_RENDERER. */
+#undef CONST_AL_RENDERER
+
+/* The value of AL_ROLLOFF_FACTOR. */
+#undef CONST_AL_ROLLOFF_FACTOR
+
+/* The value of AL_SAMPLE_OFFSET. */
+#undef CONST_AL_SAMPLE_OFFSET
+
+/* The value of AL_SEC_OFFSET. */
+#undef CONST_AL_SEC_OFFSET
+
+/* The value of AL_SIZE. */
+#undef CONST_AL_SIZE
+
+/* The value of AL_SOURCE_RELATIVE. */
+#undef CONST_AL_SOURCE_RELATIVE
+
+/* The value of AL_SOURCE_STATE. */
+#undef CONST_AL_SOURCE_STATE
+
+/* The value of AL_SOURCE_TYPE. */
+#undef CONST_AL_SOURCE_TYPE
+
+/* The value of AL_SPEED_OF_SOUND. */
+#undef CONST_AL_SPEED_OF_SOUND
+
+/* The value of AL_STATIC. */
+#undef CONST_AL_STATIC
+
+/* The value of AL_STOPPED. */
+#undef CONST_AL_STOPPED
+
+/* The value of AL_STREAMING. */
+#undef CONST_AL_STREAMING
+
+/* The value of AL_TRUE. */
+#undef CONST_AL_TRUE
+
+/* The value of AL_UNDETERMINED. */
+#undef CONST_AL_UNDETERMINED
+
+/* The value of AL_VELOCITY. */
+#undef CONST_AL_VELOCITY
+
+/* The value of AL_VENDOR. */
+#undef CONST_AL_VENDOR
+
+/* The value of AL_VERSION. */
+#undef CONST_AL_VERSION
 
 /* Define to 1 if you have the <AL/alc.h> header file. */
 #undef HAVE_AL_ALC_H
@@ -63,6 +279,9 @@
 /* Define to 1 if you have the <AL/alext.h> header file. */
 #undef HAVE_AL_ALEXT_H
 
+/* Define to 1 if you have the <AL/al.h> header file. */
+#undef HAVE_AL_AL_H
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
@@ -75,6 +294,9 @@
 /* Define to 1 if you have the <OpenAL/alext.h> header file. */
 #undef HAVE_OPENAL_ALEXT_H
 
+/* Define to 1 if you have the <OpenAL/al.h> header file. */
+#undef HAVE_OPENAL_AL_H
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
@@ -96,23 +318,50 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Define to Haskell type for ALbitfield */
-#undef HTYPE_ALBITFIELD
-
 /* Define to Haskell type for ALboolean */
 #undef HTYPE_ALBOOLEAN
 
 /* Define to Haskell type for ALbyte */
 #undef HTYPE_ALBYTE
 
+/* Define to Haskell type for ALCboolean */
+#undef HTYPE_ALCBOOLEAN
+
+/* Define to Haskell type for ALCbyte */
+#undef HTYPE_ALCBYTE
+
+/* Define to Haskell type for ALCchar */
+#undef HTYPE_ALCCHAR
+
+/* Define to Haskell type for ALCdouble */
+#undef HTYPE_ALCDOUBLE
+
 /* Define to Haskell type for ALCenum */
 #undef HTYPE_ALCENUM
 
-/* Define to Haskell type for ALclampd */
-#undef HTYPE_ALCLAMPD
+/* Define to Haskell type for ALCfloat */
+#undef HTYPE_ALCFLOAT
+
+/* Define to Haskell type for ALchar */
+#undef HTYPE_ALCHAR
+
+/* Define to Haskell type for ALCint */
+#undef HTYPE_ALCINT
+
+/* Define to Haskell type for ALCshort */
+#undef HTYPE_ALCSHORT
+
+/* Define to Haskell type for ALCsizei */
+#undef HTYPE_ALCSIZEI
+
+/* Define to Haskell type for ALCubyte */
+#undef HTYPE_ALCUBYTE
+
+/* Define to Haskell type for ALCuint */
+#undef HTYPE_ALCUINT
 
-/* Define to Haskell type for ALclampf */
-#undef HTYPE_ALCLAMPF
+/* Define to Haskell type for ALCushort */
+#undef HTYPE_ALCUSHORT
 
 /* Define to Haskell type for ALdouble */
 #undef HTYPE_ALDOUBLE
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/package.conf.in ghc-6.4.2/libraries/OpenAL/package.conf.in
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/package.conf.in	2005-02-19 00:06:43.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/package.conf.in	2006-03-22 00:58:03.000000000 +0900
@@ -9,27 +9,36 @@
 exposed-modules:
 	Sound.OpenAL,
 	Sound.OpenAL.AL,
+	Sound.OpenAL.AL.ALboolean,
+	Sound.OpenAL.AL.Attenuation,
 	Sound.OpenAL.AL.BasicTypes,
 	Sound.OpenAL.AL.Buffer,
+	Sound.OpenAL.AL.BufferInternal,
+	Sound.OpenAL.AL.Doppler,
+	Sound.OpenAL.AL.Errors,
+	Sound.OpenAL.AL.Extensions,
+	Sound.OpenAL.AL.Format,
 	Sound.OpenAL.AL.Listener,
 	Sound.OpenAL.AL.Source,
+	Sound.OpenAL.AL.StringQueries,
 	Sound.OpenAL.ALC,
+	Sound.OpenAL.ALC.BasicTypes,
+	Sound.OpenAL.ALC.Capture,
 	Sound.OpenAL.ALC.Context,
 	Sound.OpenAL.ALC.Device,
 	Sound.OpenAL.ALC.Errors,
-	Sound.OpenAL.ALC.Extensions,
-	Sound.OpenAL.ALUT,
-	Sound.OpenAL.ALUT.Initialization,
-	Sound.OpenAL.ALUT.WAV
+	Sound.OpenAL.ALC.Extensions
 
 hidden-modules:
-	Sound.OpenAL.AL.ALboolean,
-	Sound.OpenAL.AL.Format,
 	Sound.OpenAL.AL.PeekPoke,
 	Sound.OpenAL.AL.QueryUtils,
-	Sound.OpenAL.ALC.BasicTypes,
-	Sound.OpenAL.ALC.Queries,
-	Sound.OpenAL.ALUT.Exception
+	Sound.OpenAL.AL.SourceState,
+	Sound.OpenAL.AL.String,
+	Sound.OpenAL.ALC.ALCboolean,
+	Sound.OpenAL.ALC.QueryUtils,
+	Sound.OpenAL.ALC.String,
+	Sound.OpenAL.Config,
+	Sound.OpenAL.Constants
 
 import-dirs:	IMPORT_DIR
 


Index: hugs98.spec
===================================================================
RCS file: /cvs/extras/rpms/hugs98/FC-5/hugs98.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hugs98.spec	24 Apr 2006 03:25:49 -0000	1.3
+++ hugs98.spec	24 Apr 2006 10:49:34 -0000	1.4
@@ -2,13 +2,14 @@
 
 Name:		hugs98
 Version:	2005.03
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Haskell Interpreter
 
 Group:		Development/Languages
 License:	BSD
 URL:		http://www.haskell.org/hugs
 Source0:	http://cvs.haskell.org/Hugs/downloads/Mar2005/%{name}-%{hugs_ver}.tar.gz
+Patch0:		openal-1.0_1.2.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	docbook-utils
@@ -23,7 +24,7 @@
 BuildRequires:	libXt-devel
 BuildRequires:	readline-devel
 BuildRequires:	xorg-x11-proto-devel
-#BuildRequires:	openal-devel
+BuildRequires:	openal-devel
 
 %description
 Hugs 98 is a functional programming system based on Haskell 98, the de
@@ -31,6 +32,15 @@
 98 provides an almost complete implementation of Haskell 98.
 
 
+%package openal
+Summary:	OpenAL package for Hugs98
+Group:		Development/Languages
+Requires:	%{name} = %{version}-%{release}
+
+%description openal
+OpenAL package for Hugs98.
+
+
 %package x11
 Summary:	X11 package for Hugs98
 Group:		Development/Languages
@@ -82,6 +92,7 @@
 
 %prep
 %setup -q -n %{name}-%{hugs_ver}
+%patch0 -p1
 
 
 %build
@@ -116,6 +127,7 @@
 %doc docs/users_guide/users_guide
 %{_bindir}/*
 %{_libdir}/hugs
+%exclude %{_libdir}/hugs/packages/OpenAL
 %exclude %{_libdir}/hugs/packages/X11
 %exclude %{_libdir}/hugs/packages/OpenGL
 %exclude %{_libdir}/hugs/packages/GLUT
@@ -128,6 +140,11 @@
 %doc installed-demos/*
 
 
+%files openal
+%defattr(-,root,root,-)
+%{_libdir}/hugs/packages/OpenAL
+
+
 %files x11
 %defattr(-,root,root,-)
 %{_libdir}/hugs/packages/X11
@@ -149,6 +166,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Gerard Milmeister <gemi at bluewin.ch> - 2005.03-3
+- added patch provided by Jens Petersen to build OpenAL package
+
 * Tue Apr 18 2006 Gerard Milmeister <gemi at bluewin.ch> - 2005.03-1
 - changed version numbering scheme
 - split off demos package



From fedora-extras-commits at redhat.com  Mon Apr 24 10:49:57 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 24 Apr 2006 03:49:57 -0700
Subject: rpms/hugs98/FC-5 hugs98.spec,1.4,1.5
Message-ID: <200604241049.k3OAnxwi021820@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/hugs98/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21803

Modified Files:
	hugs98.spec 
Log Message:



Index: hugs98.spec
===================================================================
RCS file: /cvs/extras/rpms/hugs98/FC-5/hugs98.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hugs98.spec	24 Apr 2006 10:49:34 -0000	1.4
+++ hugs98.spec	24 Apr 2006 10:49:57 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:		hugs98
 Version:	2005.03
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Haskell Interpreter
 
 Group:		Development/Languages



From fedora-extras-commits at redhat.com  Mon Apr 24 11:08:51 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 24 Apr 2006 04:08:51 -0700
Subject: rpms/hugs98/devel openal-1.0_1.2.patch, NONE, 1.1 hugs98.spec, 1.2,
	1.3
Message-ID: <200604241108.k3OB8rv0024483@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/hugs98/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24453

Modified Files:
	hugs98.spec 
Added Files:
	openal-1.0_1.2.patch 
Log Message:
added openal support

openal-1.0_1.2.patch:

--- NEW FILE openal-1.0_1.2.patch ---
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/LICENSE ghc-6.4.2/libraries/OpenAL/LICENSE
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/LICENSE	2004-01-03 04:03:07.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/LICENSE	2006-03-22 00:58:03.000000000 +0900
@@ -1,4 +1,4 @@
-Copyright (c) 2003-2004, Sven Panne
+Copyright (c) 2003-2005, Sven Panne
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/Makefile ghc-6.4.2/libraries/OpenAL/Makefile
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/Makefile	2005-03-03 01:39:55.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/Makefile	2006-03-22 00:58:03.000000000 +0900
@@ -4,6 +4,12 @@
 include $(TOP)/mk/boilerplate.mk
 -include config.mk
 
+ifneq "$(findstring clean, $(MAKECMDGOALS))" ""
+# if we're cleaning, then config.mk might have been cleaned already
+AL_BUILD_PACKAGE=yes
+PACKAGE=OpenAL
+endif
+
 ifneq "$(AL_BUILD_PACKAGE)" "no"
 
 # -----------------------------------------------------------------------------
@@ -18,19 +24,17 @@
 	Sound \
 	Sound/OpenAL \
 	Sound/OpenAL/AL \
-	Sound/OpenAL/ALC \
-	Sound/OpenAL/ALUT
+	Sound/OpenAL/ALC
 
 PACKAGE_DEPS = base OpenGL
 
 SRC_HC_OPTS += -Wall -fffi -Iinclude '-\#include "HsOpenAL.h"' -cpp
 
 # WinDoze DLL hell
+# NOTE: For some obscure/unknown reason, OpenAL uses ccall, even on WinDoze...
+SRC_HC_OPTS += -DCALLCONV=ccall
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-SRC_HC_OPTS += -DCALLCONV=stdcall
 SRC_HC_OPTS := $(subst -mno-cygwin,,$(SRC_HC_OPTS))
-else
-SRC_HC_OPTS += -DCALLCONV=ccall
 endif
 
 PACKAGE_CPP_OPTS += -DMAINTAINER=$(MAINTAINER)
@@ -41,18 +45,14 @@
 
 package.conf.inplace \
 package.conf.installed \
-Sound/OpenAL/AL/BasicTypes.$(way_)o \
-Sound/OpenAL/AL/Format.$(way_)o \
-Sound/OpenAL/ALC/BasicTypes.$(way_)o \
-Sound/OpenAL/ALC/Errors.$(way_)o \
-Sound/OpenAL/ALC/Queries.$(way_)o : include/HsOpenALConfig.h
+Sound/OpenAL/Config.$(way_)o \
+Sound/OpenAL/Constants.$(way_)o : include/HsOpenALConfig.h
 
 endif
 
 # -----------------------------------------------------------------------------
 
-DIST_CLEAN_FILES += OpenAL.buildinfo config.cache config.status
-LATE_DIST_CLEAN_FILES += config.mk
+DIST_CLEAN_FILES += OpenAL.buildinfo config.cache config.status config.mk
 
 extraclean::
 	$(RM) -rf autom4te.cache
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/OpenAL.buildinfo.in ghc-6.4.2/libraries/OpenAL/OpenAL.buildinfo.in
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/OpenAL.buildinfo.in	2005-01-16 22:13:05.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/OpenAL.buildinfo.in	2006-03-22 00:58:03.000000000 +0900
@@ -2,6 +2,7 @@
 -- System-dependent values used by Distribution.Simple.defaultUserHooks
 --
 buildable: @BUILD_PACKAGE_BOOL@
+ghc-options: -DCALLCONV=@CALLCONV@
 cc-options: -DCALLCONV=@CALLCONV@
 ld-options: @AL_LIBS@
 frameworks: @AL_FRAMEWORKS@
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/OpenAL.cabal ghc-6.4.2/libraries/OpenAL/OpenAL.cabal
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/OpenAL.cabal	2005-02-11 10:55:55.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/OpenAL.cabal	2006-03-22 00:58:03.000000000 +0900
@@ -1,5 +1,5 @@
 name:		OpenAL
-version:	1.0
+version:	1.2
 license:	BSD3
 license-file:	LICENSE
 maintainer:	Sven Panne <sven.panne at aedion.de>
@@ -10,27 +10,36 @@
 exposed-modules:
 	Sound.OpenAL,
 	Sound.OpenAL.AL,
+	Sound.OpenAL.AL.ALboolean,
+	Sound.OpenAL.AL.Attenuation,
 	Sound.OpenAL.AL.BasicTypes,
 	Sound.OpenAL.AL.Buffer,
+	Sound.OpenAL.AL.BufferInternal,
+	Sound.OpenAL.AL.Doppler,
+	Sound.OpenAL.AL.Errors,
+	Sound.OpenAL.AL.Extensions,
+	Sound.OpenAL.AL.Format,
 	Sound.OpenAL.AL.Listener,
 	Sound.OpenAL.AL.Source,
+	Sound.OpenAL.AL.StringQueries,
 	Sound.OpenAL.ALC,
+	Sound.OpenAL.ALC.BasicTypes,
+	Sound.OpenAL.ALC.Capture,
 	Sound.OpenAL.ALC.Context,
 	Sound.OpenAL.ALC.Device,
 	Sound.OpenAL.ALC.Errors,
-	Sound.OpenAL.ALC.Extensions,
-	Sound.OpenAL.ALUT,
-	Sound.OpenAL.ALUT.Initialization,
-	Sound.OpenAL.ALUT.WAV
+	Sound.OpenAL.ALC.Extensions
 other-modules:
-	Sound.OpenAL.AL.ALboolean,
-	Sound.OpenAL.AL.Format,
 	Sound.OpenAL.AL.PeekPoke,
 	Sound.OpenAL.AL.QueryUtils,
-	Sound.OpenAL.ALC.BasicTypes,
-	Sound.OpenAL.ALC.Queries,
-	Sound.OpenAL.ALUT.Exception
+	Sound.OpenAL.AL.SourceState,
+	Sound.OpenAL.AL.String,
+	Sound.OpenAL.ALC.ALCboolean,
+	Sound.OpenAL.ALC.QueryUtils,
+	Sound.OpenAL.ALC.String,
+	Sound.OpenAL.Config,
+	Sound.OpenAL.Constants
 include-dirs:	include
 includes:	"HsOpenAL.h"
 build-depends:	base, OpenGL
-extensions:	CPP
+extensions:	CPP, ForeignFunctionInterface
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/Sound/OpenAL/AL/ALboolean.hs ghc-6.4.2/libraries/OpenAL/Sound/OpenAL/AL/ALboolean.hs
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/Sound/OpenAL/AL/ALboolean.hs	2004-01-03 04:03:08.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/Sound/OpenAL/AL/ALboolean.hs	2006-03-22 00:58:03.000000000 +0900
@@ -2,7 +2,7 @@
 --------------------------------------------------------------------------------
 -- |
 -- Module      :  Sound.OpenAL.AL.ALboolean
--- Copyright   :  (c) Sven Panne 2003-2004
+-- Copyright   :  (c) Sven Panne 2003-2005
 -- License     :  BSD-style (see the file libraries/OpenAL/LICENSE)
 -- 
 -- Maintainer  :  sven.panne at aedion.de
@@ -14,16 +14,17 @@
 --------------------------------------------------------------------------------
 
 module Sound.OpenAL.AL.ALboolean (
-   ALboolean, marshalALboolean, unmarshalALboolean
+   marshalALboolean, unmarshalALboolean
 ) where
 
 import Sound.OpenAL.AL.BasicTypes ( ALboolean )
+import Sound.OpenAL.Constants ( al_FALSE, al_TRUE )
 
 --------------------------------------------------------------------------------
 
 marshalALboolean :: Bool -> ALboolean
-marshalALboolean False = 0
-marshalALboolean True  = 1
+marshalALboolean False = al_FALSE
+marshalALboolean True  = al_TRUE
 
 unmarshalALboolean :: ALboolean -> Bool
-unmarshalALboolean = (/= 0)
+unmarshalALboolean = (/= al_FALSE)
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/Sound/OpenAL/AL/Attenuation.hs ghc-6.4.2/libraries/OpenAL/Sound/OpenAL/AL/Attenuation.hs
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/Sound/OpenAL/AL/Attenuation.hs	1970-01-01 09:00:00.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/Sound/OpenAL/AL/Attenuation.hs	2006-03-22 00:58:03.000000000 +0900
@@ -0,0 +1,211 @@
+--------------------------------------------------------------------------------
+-- |
+-- Module      :  Sound.OpenAL.AL.Attenuation
+-- Copyright   :  (c) Sven Panne 2005
+-- License     :  BSD-style (see the file libraries/OpenAL/LICENSE)
+-- 
+-- Maintainer  :  sven.panne at aedion.de
+-- Stability   :  provisional
+-- Portability :  portable
+--
+-- This module corresponds to section 3.4 (Attenuation By Distance) of the
+-- OpenAL Specification and Reference (version 1.1).
+-- 
+--------------------------------------------------------------------------------
+
+module Sound.OpenAL.AL.Attenuation (
+   -- * Introduction
+   -- $Introduction
+
+   -- * Handling the Distance Model
+   DistanceModel(..), distanceModel
+
+   -- * Evaluation of Gain\/Attenuation Related State
[...9030 lines suppressed...]
+#undef CONST_AL_ORIENTATION
+
+/* The value of AL_OUT_OF_MEMORY. */
+#undef CONST_AL_OUT_OF_MEMORY
+
+/* The value of AL_PAUSED. */
+#undef CONST_AL_PAUSED
+
+/* The value of AL_PITCH. */
+#undef CONST_AL_PITCH
+
+/* The value of AL_PLAYING. */
+#undef CONST_AL_PLAYING
+
+/* The value of AL_POSITION. */
+#undef CONST_AL_POSITION
+
+/* The value of AL_REFERENCE_DISTANCE. */
+#undef CONST_AL_REFERENCE_DISTANCE
+
+/* The value of AL_RENDERER. */
+#undef CONST_AL_RENDERER
+
+/* The value of AL_ROLLOFF_FACTOR. */
+#undef CONST_AL_ROLLOFF_FACTOR
+
+/* The value of AL_SAMPLE_OFFSET. */
+#undef CONST_AL_SAMPLE_OFFSET
+
+/* The value of AL_SEC_OFFSET. */
+#undef CONST_AL_SEC_OFFSET
+
+/* The value of AL_SIZE. */
+#undef CONST_AL_SIZE
+
+/* The value of AL_SOURCE_RELATIVE. */
+#undef CONST_AL_SOURCE_RELATIVE
+
+/* The value of AL_SOURCE_STATE. */
+#undef CONST_AL_SOURCE_STATE
+
+/* The value of AL_SOURCE_TYPE. */
+#undef CONST_AL_SOURCE_TYPE
+
+/* The value of AL_SPEED_OF_SOUND. */
+#undef CONST_AL_SPEED_OF_SOUND
+
+/* The value of AL_STATIC. */
+#undef CONST_AL_STATIC
+
+/* The value of AL_STOPPED. */
+#undef CONST_AL_STOPPED
+
+/* The value of AL_STREAMING. */
+#undef CONST_AL_STREAMING
+
+/* The value of AL_TRUE. */
+#undef CONST_AL_TRUE
+
+/* The value of AL_UNDETERMINED. */
+#undef CONST_AL_UNDETERMINED
+
+/* The value of AL_VELOCITY. */
+#undef CONST_AL_VELOCITY
+
+/* The value of AL_VENDOR. */
+#undef CONST_AL_VENDOR
+
+/* The value of AL_VERSION. */
+#undef CONST_AL_VERSION
 
 /* Define to 1 if you have the <AL/alc.h> header file. */
 #undef HAVE_AL_ALC_H
@@ -63,6 +279,9 @@
 /* Define to 1 if you have the <AL/alext.h> header file. */
 #undef HAVE_AL_ALEXT_H
 
+/* Define to 1 if you have the <AL/al.h> header file. */
+#undef HAVE_AL_AL_H
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
@@ -75,6 +294,9 @@
 /* Define to 1 if you have the <OpenAL/alext.h> header file. */
 #undef HAVE_OPENAL_ALEXT_H
 
+/* Define to 1 if you have the <OpenAL/al.h> header file. */
+#undef HAVE_OPENAL_AL_H
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
@@ -96,23 +318,50 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Define to Haskell type for ALbitfield */
-#undef HTYPE_ALBITFIELD
-
 /* Define to Haskell type for ALboolean */
 #undef HTYPE_ALBOOLEAN
 
 /* Define to Haskell type for ALbyte */
 #undef HTYPE_ALBYTE
 
+/* Define to Haskell type for ALCboolean */
+#undef HTYPE_ALCBOOLEAN
+
+/* Define to Haskell type for ALCbyte */
+#undef HTYPE_ALCBYTE
+
+/* Define to Haskell type for ALCchar */
+#undef HTYPE_ALCCHAR
+
+/* Define to Haskell type for ALCdouble */
+#undef HTYPE_ALCDOUBLE
+
 /* Define to Haskell type for ALCenum */
 #undef HTYPE_ALCENUM
 
-/* Define to Haskell type for ALclampd */
-#undef HTYPE_ALCLAMPD
+/* Define to Haskell type for ALCfloat */
+#undef HTYPE_ALCFLOAT
+
+/* Define to Haskell type for ALchar */
+#undef HTYPE_ALCHAR
+
+/* Define to Haskell type for ALCint */
+#undef HTYPE_ALCINT
+
+/* Define to Haskell type for ALCshort */
+#undef HTYPE_ALCSHORT
+
+/* Define to Haskell type for ALCsizei */
+#undef HTYPE_ALCSIZEI
+
+/* Define to Haskell type for ALCubyte */
+#undef HTYPE_ALCUBYTE
+
+/* Define to Haskell type for ALCuint */
+#undef HTYPE_ALCUINT
 
-/* Define to Haskell type for ALclampf */
-#undef HTYPE_ALCLAMPF
+/* Define to Haskell type for ALCushort */
+#undef HTYPE_ALCUSHORT
 
 /* Define to Haskell type for ALdouble */
 #undef HTYPE_ALDOUBLE
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/package.conf.in ghc-6.4.2/libraries/OpenAL/package.conf.in
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/package.conf.in	2005-02-19 00:06:43.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/package.conf.in	2006-03-22 00:58:03.000000000 +0900
@@ -9,27 +9,36 @@
 exposed-modules:
 	Sound.OpenAL,
 	Sound.OpenAL.AL,
+	Sound.OpenAL.AL.ALboolean,
+	Sound.OpenAL.AL.Attenuation,
 	Sound.OpenAL.AL.BasicTypes,
 	Sound.OpenAL.AL.Buffer,
+	Sound.OpenAL.AL.BufferInternal,
+	Sound.OpenAL.AL.Doppler,
+	Sound.OpenAL.AL.Errors,
+	Sound.OpenAL.AL.Extensions,
+	Sound.OpenAL.AL.Format,
 	Sound.OpenAL.AL.Listener,
 	Sound.OpenAL.AL.Source,
+	Sound.OpenAL.AL.StringQueries,
 	Sound.OpenAL.ALC,
+	Sound.OpenAL.ALC.BasicTypes,
+	Sound.OpenAL.ALC.Capture,
 	Sound.OpenAL.ALC.Context,
 	Sound.OpenAL.ALC.Device,
 	Sound.OpenAL.ALC.Errors,
-	Sound.OpenAL.ALC.Extensions,
-	Sound.OpenAL.ALUT,
-	Sound.OpenAL.ALUT.Initialization,
-	Sound.OpenAL.ALUT.WAV
+	Sound.OpenAL.ALC.Extensions
 
 hidden-modules:
-	Sound.OpenAL.AL.ALboolean,
-	Sound.OpenAL.AL.Format,
 	Sound.OpenAL.AL.PeekPoke,
 	Sound.OpenAL.AL.QueryUtils,
-	Sound.OpenAL.ALC.BasicTypes,
-	Sound.OpenAL.ALC.Queries,
-	Sound.OpenAL.ALUT.Exception
+	Sound.OpenAL.AL.SourceState,
+	Sound.OpenAL.AL.String,
+	Sound.OpenAL.ALC.ALCboolean,
+	Sound.OpenAL.ALC.QueryUtils,
+	Sound.OpenAL.ALC.String,
+	Sound.OpenAL.Config,
+	Sound.OpenAL.Constants
 
 import-dirs:	IMPORT_DIR
 


Index: hugs98.spec
===================================================================
RCS file: /cvs/extras/rpms/hugs98/devel/hugs98.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hugs98.spec	22 Apr 2006 01:20:55 -0000	1.2
+++ hugs98.spec	24 Apr 2006 11:08:51 -0000	1.3
@@ -2,13 +2,14 @@
 
 Name:		hugs98
 Version:	2005.03
-Release:	1%{?dist}
+Release:	4%{?dist}
 Summary:	Haskell Interpreter
 
 Group:		Development/Languages
 License:	BSD
 URL:		http://www.haskell.org/hugs
 Source0:	http://cvs.haskell.org/Hugs/downloads/Mar2005/%{name}-%{hugs_ver}.tar.gz
+Patch0:		openal-1.0_1.2.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	docbook-utils
@@ -23,7 +24,7 @@
 BuildRequires:	libXt-devel
 BuildRequires:	readline-devel
 BuildRequires:	xorg-x11-proto-devel
-#BuildRequires:	openal-devel
+BuildRequires:	openal-devel
 
 %description
 Hugs 98 is a functional programming system based on Haskell 98, the de
@@ -31,6 +32,15 @@
 98 provides an almost complete implementation of Haskell 98.
 
 
+%package openal
+Summary:	OpenAL package for Hugs98
+Group:		Development/Languages
+Requires:	%{name} = %{version}-%{release}
+
+%description openal
+OpenAL package for Hugs98.
+
+
 %package x11
 Summary:	X11 package for Hugs98
 Group:		Development/Languages
@@ -82,6 +92,7 @@
 
 %prep
 %setup -q -n %{name}-%{hugs_ver}
+%patch0 -p1
 
 
 %build
@@ -116,6 +127,7 @@
 %doc docs/users_guide/users_guide
 %{_bindir}/*
 %{_libdir}/hugs
+%exclude %{_libdir}/hugs/packages/OpenAL
 %exclude %{_libdir}/hugs/packages/X11
 %exclude %{_libdir}/hugs/packages/OpenGL
 %exclude %{_libdir}/hugs/packages/GLUT
@@ -128,6 +140,11 @@
 %doc installed-demos/*
 
 
+%files openal
+%defattr(-,root,root,-)
+%{_libdir}/hugs/packages/OpenAL
+
+
 %files x11
 %defattr(-,root,root,-)
 %{_libdir}/hugs/packages/X11
@@ -149,6 +166,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Gerard Milmeister <gemi at bluewin.ch> - 2005.03-3
+- added patch provided by Jens Petersen to build OpenAL package
+
 * Tue Apr 18 2006 Gerard Milmeister <gemi at bluewin.ch> - 2005.03-1
 - changed version numbering scheme
 - split off demos package



From fedora-extras-commits at redhat.com  Mon Apr 24 11:10:55 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Mon, 24 Apr 2006 04:10:55 -0700
Subject: rpms/hugs98/FC-4 openal-1.0_1.2.patch,NONE,1.1 hugs98.spec,1.3,1.4
Message-ID: <200604241110.k3OBAv6T024591@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/hugs98/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24571

Modified Files:
	hugs98.spec 
Added Files:
	openal-1.0_1.2.patch 
Log Message:
added openal support

openal-1.0_1.2.patch:

--- NEW FILE openal-1.0_1.2.patch ---
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/LICENSE ghc-6.4.2/libraries/OpenAL/LICENSE
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/LICENSE	2004-01-03 04:03:07.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/LICENSE	2006-03-22 00:58:03.000000000 +0900
@@ -1,4 +1,4 @@
-Copyright (c) 2003-2004, Sven Panne
+Copyright (c) 2003-2005, Sven Panne
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/Makefile ghc-6.4.2/libraries/OpenAL/Makefile
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/Makefile	2005-03-03 01:39:55.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/Makefile	2006-03-22 00:58:03.000000000 +0900
@@ -4,6 +4,12 @@
 include $(TOP)/mk/boilerplate.mk
 -include config.mk
 
+ifneq "$(findstring clean, $(MAKECMDGOALS))" ""
+# if we're cleaning, then config.mk might have been cleaned already
+AL_BUILD_PACKAGE=yes
+PACKAGE=OpenAL
+endif
+
 ifneq "$(AL_BUILD_PACKAGE)" "no"
 
 # -----------------------------------------------------------------------------
@@ -18,19 +24,17 @@
 	Sound \
 	Sound/OpenAL \
 	Sound/OpenAL/AL \
-	Sound/OpenAL/ALC \
-	Sound/OpenAL/ALUT
+	Sound/OpenAL/ALC
 
 PACKAGE_DEPS = base OpenGL
 
 SRC_HC_OPTS += -Wall -fffi -Iinclude '-\#include "HsOpenAL.h"' -cpp
 
 # WinDoze DLL hell
+# NOTE: For some obscure/unknown reason, OpenAL uses ccall, even on WinDoze...
+SRC_HC_OPTS += -DCALLCONV=ccall
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-SRC_HC_OPTS += -DCALLCONV=stdcall
 SRC_HC_OPTS := $(subst -mno-cygwin,,$(SRC_HC_OPTS))
-else
-SRC_HC_OPTS += -DCALLCONV=ccall
 endif
 
 PACKAGE_CPP_OPTS += -DMAINTAINER=$(MAINTAINER)
@@ -41,18 +45,14 @@
 
 package.conf.inplace \
 package.conf.installed \
-Sound/OpenAL/AL/BasicTypes.$(way_)o \
-Sound/OpenAL/AL/Format.$(way_)o \
-Sound/OpenAL/ALC/BasicTypes.$(way_)o \
-Sound/OpenAL/ALC/Errors.$(way_)o \
-Sound/OpenAL/ALC/Queries.$(way_)o : include/HsOpenALConfig.h
+Sound/OpenAL/Config.$(way_)o \
+Sound/OpenAL/Constants.$(way_)o : include/HsOpenALConfig.h
 
 endif
 
 # -----------------------------------------------------------------------------
 
-DIST_CLEAN_FILES += OpenAL.buildinfo config.cache config.status
-LATE_DIST_CLEAN_FILES += config.mk
+DIST_CLEAN_FILES += OpenAL.buildinfo config.cache config.status config.mk
 
 extraclean::
 	$(RM) -rf autom4te.cache
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/OpenAL.buildinfo.in ghc-6.4.2/libraries/OpenAL/OpenAL.buildinfo.in
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/OpenAL.buildinfo.in	2005-01-16 22:13:05.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/OpenAL.buildinfo.in	2006-03-22 00:58:03.000000000 +0900
@@ -2,6 +2,7 @@
 -- System-dependent values used by Distribution.Simple.defaultUserHooks
 --
 buildable: @BUILD_PACKAGE_BOOL@
+ghc-options: -DCALLCONV=@CALLCONV@
 cc-options: -DCALLCONV=@CALLCONV@
 ld-options: @AL_LIBS@
 frameworks: @AL_FRAMEWORKS@
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/OpenAL.cabal ghc-6.4.2/libraries/OpenAL/OpenAL.cabal
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/OpenAL.cabal	2005-02-11 10:55:55.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/OpenAL.cabal	2006-03-22 00:58:03.000000000 +0900
@@ -1,5 +1,5 @@
 name:		OpenAL
-version:	1.0
+version:	1.2
 license:	BSD3
 license-file:	LICENSE
 maintainer:	Sven Panne <sven.panne at aedion.de>
@@ -10,27 +10,36 @@
 exposed-modules:
 	Sound.OpenAL,
 	Sound.OpenAL.AL,
+	Sound.OpenAL.AL.ALboolean,
+	Sound.OpenAL.AL.Attenuation,
 	Sound.OpenAL.AL.BasicTypes,
 	Sound.OpenAL.AL.Buffer,
+	Sound.OpenAL.AL.BufferInternal,
+	Sound.OpenAL.AL.Doppler,
+	Sound.OpenAL.AL.Errors,
+	Sound.OpenAL.AL.Extensions,
+	Sound.OpenAL.AL.Format,
 	Sound.OpenAL.AL.Listener,
 	Sound.OpenAL.AL.Source,
+	Sound.OpenAL.AL.StringQueries,
 	Sound.OpenAL.ALC,
+	Sound.OpenAL.ALC.BasicTypes,
+	Sound.OpenAL.ALC.Capture,
 	Sound.OpenAL.ALC.Context,
 	Sound.OpenAL.ALC.Device,
 	Sound.OpenAL.ALC.Errors,
-	Sound.OpenAL.ALC.Extensions,
-	Sound.OpenAL.ALUT,
-	Sound.OpenAL.ALUT.Initialization,
-	Sound.OpenAL.ALUT.WAV
+	Sound.OpenAL.ALC.Extensions
 other-modules:
-	Sound.OpenAL.AL.ALboolean,
-	Sound.OpenAL.AL.Format,
 	Sound.OpenAL.AL.PeekPoke,
 	Sound.OpenAL.AL.QueryUtils,
-	Sound.OpenAL.ALC.BasicTypes,
-	Sound.OpenAL.ALC.Queries,
-	Sound.OpenAL.ALUT.Exception
+	Sound.OpenAL.AL.SourceState,
+	Sound.OpenAL.AL.String,
+	Sound.OpenAL.ALC.ALCboolean,
+	Sound.OpenAL.ALC.QueryUtils,
+	Sound.OpenAL.ALC.String,
+	Sound.OpenAL.Config,
+	Sound.OpenAL.Constants
 include-dirs:	include
 includes:	"HsOpenAL.h"
 build-depends:	base, OpenGL
-extensions:	CPP
+extensions:	CPP, ForeignFunctionInterface
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/Sound/OpenAL/AL/ALboolean.hs ghc-6.4.2/libraries/OpenAL/Sound/OpenAL/AL/ALboolean.hs
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/Sound/OpenAL/AL/ALboolean.hs	2004-01-03 04:03:08.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/Sound/OpenAL/AL/ALboolean.hs	2006-03-22 00:58:03.000000000 +0900
@@ -2,7 +2,7 @@
 --------------------------------------------------------------------------------
 -- |
 -- Module      :  Sound.OpenAL.AL.ALboolean
--- Copyright   :  (c) Sven Panne 2003-2004
+-- Copyright   :  (c) Sven Panne 2003-2005
 -- License     :  BSD-style (see the file libraries/OpenAL/LICENSE)
 -- 
 -- Maintainer  :  sven.panne at aedion.de
@@ -14,16 +14,17 @@
 --------------------------------------------------------------------------------
 
 module Sound.OpenAL.AL.ALboolean (
-   ALboolean, marshalALboolean, unmarshalALboolean
+   marshalALboolean, unmarshalALboolean
 ) where
 
 import Sound.OpenAL.AL.BasicTypes ( ALboolean )
+import Sound.OpenAL.Constants ( al_FALSE, al_TRUE )
 
 --------------------------------------------------------------------------------
 
 marshalALboolean :: Bool -> ALboolean
-marshalALboolean False = 0
-marshalALboolean True  = 1
+marshalALboolean False = al_FALSE
+marshalALboolean True  = al_TRUE
 
 unmarshalALboolean :: ALboolean -> Bool
-unmarshalALboolean = (/= 0)
+unmarshalALboolean = (/= al_FALSE)
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/Sound/OpenAL/AL/Attenuation.hs ghc-6.4.2/libraries/OpenAL/Sound/OpenAL/AL/Attenuation.hs
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/Sound/OpenAL/AL/Attenuation.hs	1970-01-01 09:00:00.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/Sound/OpenAL/AL/Attenuation.hs	2006-03-22 00:58:03.000000000 +0900
@@ -0,0 +1,211 @@
+--------------------------------------------------------------------------------
+-- |
+-- Module      :  Sound.OpenAL.AL.Attenuation
+-- Copyright   :  (c) Sven Panne 2005
+-- License     :  BSD-style (see the file libraries/OpenAL/LICENSE)
+-- 
+-- Maintainer  :  sven.panne at aedion.de
+-- Stability   :  provisional
+-- Portability :  portable
+--
+-- This module corresponds to section 3.4 (Attenuation By Distance) of the
+-- OpenAL Specification and Reference (version 1.1).
+-- 
+--------------------------------------------------------------------------------
+
+module Sound.OpenAL.AL.Attenuation (
+   -- * Introduction
+   -- $Introduction
+
+   -- * Handling the Distance Model
+   DistanceModel(..), distanceModel
+
+   -- * Evaluation of Gain\/Attenuation Related State
[...9030 lines suppressed...]
+#undef CONST_AL_ORIENTATION
+
+/* The value of AL_OUT_OF_MEMORY. */
+#undef CONST_AL_OUT_OF_MEMORY
+
+/* The value of AL_PAUSED. */
+#undef CONST_AL_PAUSED
+
+/* The value of AL_PITCH. */
+#undef CONST_AL_PITCH
+
+/* The value of AL_PLAYING. */
+#undef CONST_AL_PLAYING
+
+/* The value of AL_POSITION. */
+#undef CONST_AL_POSITION
+
+/* The value of AL_REFERENCE_DISTANCE. */
+#undef CONST_AL_REFERENCE_DISTANCE
+
+/* The value of AL_RENDERER. */
+#undef CONST_AL_RENDERER
+
+/* The value of AL_ROLLOFF_FACTOR. */
+#undef CONST_AL_ROLLOFF_FACTOR
+
+/* The value of AL_SAMPLE_OFFSET. */
+#undef CONST_AL_SAMPLE_OFFSET
+
+/* The value of AL_SEC_OFFSET. */
+#undef CONST_AL_SEC_OFFSET
+
+/* The value of AL_SIZE. */
+#undef CONST_AL_SIZE
+
+/* The value of AL_SOURCE_RELATIVE. */
+#undef CONST_AL_SOURCE_RELATIVE
+
+/* The value of AL_SOURCE_STATE. */
+#undef CONST_AL_SOURCE_STATE
+
+/* The value of AL_SOURCE_TYPE. */
+#undef CONST_AL_SOURCE_TYPE
+
+/* The value of AL_SPEED_OF_SOUND. */
+#undef CONST_AL_SPEED_OF_SOUND
+
+/* The value of AL_STATIC. */
+#undef CONST_AL_STATIC
+
+/* The value of AL_STOPPED. */
+#undef CONST_AL_STOPPED
+
+/* The value of AL_STREAMING. */
+#undef CONST_AL_STREAMING
+
+/* The value of AL_TRUE. */
+#undef CONST_AL_TRUE
+
+/* The value of AL_UNDETERMINED. */
+#undef CONST_AL_UNDETERMINED
+
+/* The value of AL_VELOCITY. */
+#undef CONST_AL_VELOCITY
+
+/* The value of AL_VENDOR. */
+#undef CONST_AL_VENDOR
+
+/* The value of AL_VERSION. */
+#undef CONST_AL_VERSION
 
 /* Define to 1 if you have the <AL/alc.h> header file. */
 #undef HAVE_AL_ALC_H
@@ -63,6 +279,9 @@
 /* Define to 1 if you have the <AL/alext.h> header file. */
 #undef HAVE_AL_ALEXT_H
 
+/* Define to 1 if you have the <AL/al.h> header file. */
+#undef HAVE_AL_AL_H
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
@@ -75,6 +294,9 @@
 /* Define to 1 if you have the <OpenAL/alext.h> header file. */
 #undef HAVE_OPENAL_ALEXT_H
 
+/* Define to 1 if you have the <OpenAL/al.h> header file. */
+#undef HAVE_OPENAL_AL_H
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
@@ -96,23 +318,50 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Define to Haskell type for ALbitfield */
-#undef HTYPE_ALBITFIELD
-
 /* Define to Haskell type for ALboolean */
 #undef HTYPE_ALBOOLEAN
 
 /* Define to Haskell type for ALbyte */
 #undef HTYPE_ALBYTE
 
+/* Define to Haskell type for ALCboolean */
+#undef HTYPE_ALCBOOLEAN
+
+/* Define to Haskell type for ALCbyte */
+#undef HTYPE_ALCBYTE
+
+/* Define to Haskell type for ALCchar */
+#undef HTYPE_ALCCHAR
+
+/* Define to Haskell type for ALCdouble */
+#undef HTYPE_ALCDOUBLE
+
 /* Define to Haskell type for ALCenum */
 #undef HTYPE_ALCENUM
 
-/* Define to Haskell type for ALclampd */
-#undef HTYPE_ALCLAMPD
+/* Define to Haskell type for ALCfloat */
+#undef HTYPE_ALCFLOAT
+
+/* Define to Haskell type for ALchar */
+#undef HTYPE_ALCHAR
+
+/* Define to Haskell type for ALCint */
+#undef HTYPE_ALCINT
+
+/* Define to Haskell type for ALCshort */
+#undef HTYPE_ALCSHORT
+
+/* Define to Haskell type for ALCsizei */
+#undef HTYPE_ALCSIZEI
+
+/* Define to Haskell type for ALCubyte */
+#undef HTYPE_ALCUBYTE
+
+/* Define to Haskell type for ALCuint */
+#undef HTYPE_ALCUINT
 
-/* Define to Haskell type for ALclampf */
-#undef HTYPE_ALCLAMPF
+/* Define to Haskell type for ALCushort */
+#undef HTYPE_ALCUSHORT
 
 /* Define to Haskell type for ALdouble */
 #undef HTYPE_ALDOUBLE
diff -uNr --exclude=autom4te.cache --exclude=.cvsignore hugs98-Mar2005-patched/fptools/libraries/OpenAL/package.conf.in ghc-6.4.2/libraries/OpenAL/package.conf.in
--- hugs98-Mar2005-patched/fptools/libraries/OpenAL/package.conf.in	2005-02-19 00:06:43.000000000 +0900
+++ ghc-6.4.2/libraries/OpenAL/package.conf.in	2006-03-22 00:58:03.000000000 +0900
@@ -9,27 +9,36 @@
 exposed-modules:
 	Sound.OpenAL,
 	Sound.OpenAL.AL,
+	Sound.OpenAL.AL.ALboolean,
+	Sound.OpenAL.AL.Attenuation,
 	Sound.OpenAL.AL.BasicTypes,
 	Sound.OpenAL.AL.Buffer,
+	Sound.OpenAL.AL.BufferInternal,
+	Sound.OpenAL.AL.Doppler,
+	Sound.OpenAL.AL.Errors,
+	Sound.OpenAL.AL.Extensions,
+	Sound.OpenAL.AL.Format,
 	Sound.OpenAL.AL.Listener,
 	Sound.OpenAL.AL.Source,
+	Sound.OpenAL.AL.StringQueries,
 	Sound.OpenAL.ALC,
+	Sound.OpenAL.ALC.BasicTypes,
+	Sound.OpenAL.ALC.Capture,
 	Sound.OpenAL.ALC.Context,
 	Sound.OpenAL.ALC.Device,
 	Sound.OpenAL.ALC.Errors,
-	Sound.OpenAL.ALC.Extensions,
-	Sound.OpenAL.ALUT,
-	Sound.OpenAL.ALUT.Initialization,
-	Sound.OpenAL.ALUT.WAV
+	Sound.OpenAL.ALC.Extensions
 
 hidden-modules:
-	Sound.OpenAL.AL.ALboolean,
-	Sound.OpenAL.AL.Format,
 	Sound.OpenAL.AL.PeekPoke,
 	Sound.OpenAL.AL.QueryUtils,
-	Sound.OpenAL.ALC.BasicTypes,
-	Sound.OpenAL.ALC.Queries,
-	Sound.OpenAL.ALUT.Exception
+	Sound.OpenAL.AL.SourceState,
+	Sound.OpenAL.AL.String,
+	Sound.OpenAL.ALC.ALCboolean,
+	Sound.OpenAL.ALC.QueryUtils,
+	Sound.OpenAL.ALC.String,
+	Sound.OpenAL.Config,
+	Sound.OpenAL.Constants
 
 import-dirs:	IMPORT_DIR
 


Index: hugs98.spec
===================================================================
RCS file: /cvs/extras/rpms/hugs98/FC-4/hugs98.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hugs98.spec	23 Apr 2006 21:20:11 -0000	1.3
+++ hugs98.spec	24 Apr 2006 11:10:55 -0000	1.4
@@ -2,13 +2,14 @@
 
 Name:		hugs98
 Version:	2005.03
-Release:	1%{?dist}
+Release:	4%{?dist}
 Summary:	Haskell Interpreter
 
 Group:		Development/Languages
 License:	BSD
 URL:		http://www.haskell.org/hugs
 Source0:	http://cvs.haskell.org/Hugs/downloads/Mar2005/%{name}-%{hugs_ver}.tar.gz
+Patch0:		openal-1.0_1.2.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	docbook-utils
@@ -16,7 +17,7 @@
 BuildRequires:	libGL-devel
 BuildRequires:	libGLU-devel
 BuildRequires:	xorg-x11-devel
-#BuildRequires:	openal-devel
+BuildRequires:	openal-devel
 
 %description
 Hugs 98 is a functional programming system based on Haskell 98, the de
@@ -24,6 +25,15 @@
 98 provides an almost complete implementation of Haskell 98.
 
 
+%package openal
+Summary:	OpenAL package for Hugs98
+Group:		Development/Languages
+Requires:	%{name} = %{version}-%{release}
+
+%description openal
+OpenAL package for Hugs98.
+
+
 %package x11
 Summary:	X11 package for Hugs98
 Group:		Development/Languages
@@ -75,6 +85,7 @@
 
 %prep
 %setup -q -n %{name}-%{hugs_ver}
+%patch0 -p1
 
 
 %build
@@ -109,6 +120,7 @@
 %doc docs/users_guide/users_guide
 %{_bindir}/*
 %{_libdir}/hugs
+%exclude %{_libdir}/hugs/packages/OpenAL
 %exclude %{_libdir}/hugs/packages/X11
 %exclude %{_libdir}/hugs/packages/OpenGL
 %exclude %{_libdir}/hugs/packages/GLUT
@@ -121,6 +133,11 @@
 %doc installed-demos/*
 
 
+%files openal
+%defattr(-,root,root,-)
+%{_libdir}/hugs/packages/OpenAL
+
+
 %files x11
 %defattr(-,root,root,-)
 %{_libdir}/hugs/packages/X11
@@ -142,6 +159,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Gerard Milmeister <gemi at bluewin.ch> - 2005.03-3
+- added patch provided by Jens Petersen to build OpenAL package
+
 * Tue Apr 18 2006 Gerard Milmeister <gemi at bluewin.ch> - 2005.03-1
 - changed version numbering scheme
 - split off demos package



From fedora-extras-commits at redhat.com  Mon Apr 24 12:04:49 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 24 Apr 2006 05:04:49 -0700
Subject: rpms/perl-Algorithm-Dependency/FC-5 .cvsignore, 1.3,
	1.4 perl-Algorithm-Dependency.spec, 1.4, 1.5 sources, 1.3, 1.4
Message-ID: <200604241204.k3OC4poW026981@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Algorithm-Dependency/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26960

Modified Files:
	.cvsignore perl-Algorithm-Dependency.spec sources 
Log Message:
* Mon Apr 24 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.102-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-Dependency/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Oct 2005 02:59:40 -0000	1.3
+++ .cvsignore	24 Apr 2006 12:04:49 -0000	1.4
@@ -1 +1 @@
-Algorithm-Dependency-1.101.tar.gz
+Algorithm-Dependency-1.102.tar.gz


Index: perl-Algorithm-Dependency.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-Dependency/FC-5/perl-Algorithm-Dependency.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Algorithm-Dependency.spec	28 Feb 2006 23:15:38 -0000	1.4
+++ perl-Algorithm-Dependency.spec	24 Apr 2006 12:04:49 -0000	1.5
@@ -1,6 +1,6 @@
 Name: 		perl-Algorithm-Dependency
-Version: 	1.101
-Release: 	2%{?dist}
+Version: 	1.102
+Release: 	1%{?dist}
 Summary: 	Algorithmic framework for implementing dependency trees
 License: 	GPL or Artistic
 Group: 		Development/Libraries
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Apr 24 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.102-1
+- Upstream update.
+
 * Wed Mar 01 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.101-2
 - Rebuild for perl-5.8.8.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-Dependency/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Oct 2005 02:59:40 -0000	1.3
+++ sources	24 Apr 2006 12:04:49 -0000	1.4
@@ -1 +1 @@
-d6187a17fa90cbf4d1c513ea2c500269  Algorithm-Dependency-1.101.tar.gz
+971111997767dd456cb4a4e967c97ca3  Algorithm-Dependency-1.102.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 24 12:05:31 2006
From: fedora-extras-commits at redhat.com (Ralf Corsépius (corsepiu))
Date: Mon, 24 Apr 2006 05:05:31 -0700
Subject: rpms/perl-Algorithm-Dependency/FC-4 .cvsignore, 1.3,
	1.4 perl-Algorithm-Dependency.spec, 1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200604241205.k3OC5XSb027046@cvs-int.fedora.redhat.com>

Author: corsepiu

Update of /cvs/extras/rpms/perl-Algorithm-Dependency/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27025

Modified Files:
	.cvsignore perl-Algorithm-Dependency.spec sources 
Log Message:
* Mon Apr 24 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.102-1
- Upstream update.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-Dependency/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	12 Oct 2005 02:59:40 -0000	1.3
+++ .cvsignore	24 Apr 2006 12:05:31 -0000	1.4
@@ -1 +1 @@
-Algorithm-Dependency-1.101.tar.gz
+Algorithm-Dependency-1.102.tar.gz


Index: perl-Algorithm-Dependency.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-Dependency/FC-4/perl-Algorithm-Dependency.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Algorithm-Dependency.spec	12 Oct 2005 02:59:40 -0000	1.3
+++ perl-Algorithm-Dependency.spec	24 Apr 2006 12:05:31 -0000	1.4
@@ -1,5 +1,5 @@
 Name: 		perl-Algorithm-Dependency
-Version: 	1.101
+Version: 	1.102
 Release: 	1%{?dist}
 Summary: 	Algorithmic framework for implementing dependency trees
 License: 	GPL or Artistic
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*
 
 %changelog
+* Mon Apr 24 2006 Ralf Cors??pius <rc040203 at freenet.de> - 1.102-1
+- Upstream update.
+
 * Wed Oct 12 2005 Ralf Corsepius <rc040203 at freenet.de> - 1.101-1
 - Upstream update.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Algorithm-Dependency/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	12 Oct 2005 02:59:40 -0000	1.3
+++ sources	24 Apr 2006 12:05:31 -0000	1.4
@@ -1 +1 @@
-d6187a17fa90cbf4d1c513ea2c500269  Algorithm-Dependency-1.101.tar.gz
+971111997767dd456cb4a4e967c97ca3  Algorithm-Dependency-1.102.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 24 14:37:06 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 24 Apr 2006 07:37:06 -0700
Subject: rpms/glib - New directory
Message-ID: <200604241437.k3OEb8n2031963@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/glib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31937/glib

Log Message:
Directory /cvs/extras/rpms/glib added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 24 14:37:07 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 24 Apr 2006 07:37:07 -0700
Subject: rpms/glib/devel - New directory
Message-ID: <200604241437.k3OEb9eI031966@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/glib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31937/glib/devel

Log Message:
Directory /cvs/extras/rpms/glib/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 24 14:37:15 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 24 Apr 2006 07:37:15 -0700
Subject: rpms/glib Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604241437.k3OEbHGx032015@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/glib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31982

Added Files:
	Makefile import.log 
Log Message:
Setup of module glib


--- NEW FILE Makefile ---
# Top level Makefile for module glib
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Apr 24 14:37:16 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 24 Apr 2006 07:37:16 -0700
Subject: rpms/glib/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200604241437.k3OEbIlZ032018@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/glib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31982/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module glib


--- 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 Apr 24 14:37:42 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 24 Apr 2006 07:37:42 -0700
Subject: rpms/glib import.log,1.1,1.2
Message-ID: <200604241438.k3OEcEKA032106@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/glib
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32063

Modified Files:
	import.log 
Log Message:
auto-import glib-1.2.10-20 on branch devel from glib-1.2.10-20.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/glib/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Apr 2006 14:37:15 -0000	1.1
+++ import.log	24 Apr 2006 14:37:42 -0000	1.2
@@ -0,0 +1 @@
+glib-1_2_10-20:HEAD:glib-1.2.10-20.src.rpm:1145889458



From fedora-extras-commits at redhat.com  Mon Apr 24 14:37:42 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 24 Apr 2006 07:37:42 -0700
Subject: rpms/glib/devel glib-1.2.10-gcc34.patch, NONE,
	1.1 glib-1.2.10-isowarning.patch, NONE,
	1.1 glib-1.2.10-underquoted.patch, NONE, 1.1 glib.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604241438.k3OEcEs0032110@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/glib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32063/devel

Modified Files:
	.cvsignore sources 
Added Files:
	glib-1.2.10-gcc34.patch glib-1.2.10-isowarning.patch 
	glib-1.2.10-underquoted.patch glib.spec 
Log Message:
auto-import glib-1.2.10-20 on branch devel from glib-1.2.10-20.src.rpm

glib-1.2.10-gcc34.patch:

--- NEW FILE glib-1.2.10-gcc34.patch ---
--- glib-1.2.10/glib.h.gcc34	2004-06-21 09:15:12.000000000 -0400
+++ glib-1.2.10/glib.h	2004-06-21 09:15:22.000000000 -0400
@@ -272,7 +272,7 @@
 /* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with
  * macros, so we can refer to them as strings unconditionally.
  */
-#ifdef	__GNUC__
+#if defined (__GNUC__) && (__GNUC__ < 3)
 #define	G_GNUC_FUNCTION		__FUNCTION__
 #define	G_GNUC_PRETTY_FUNCTION	__PRETTY_FUNCTION__
 #else	/* !__GNUC__ */

glib-1.2.10-isowarning.patch:

--- NEW FILE glib-1.2.10-isowarning.patch ---
--- glib-1.2.10/glib.h.isowarning	Mon Feb 26 22:44:38 2001
+++ glib-1.2.10/glib.h	Sat Jul 21 19:36:31 2001
@@ -1291,6 +1291,13 @@
 #ifndef	G_LOG_DOMAIN
 #define	G_LOG_DOMAIN	((gchar*) 0)
 #endif	/* G_LOG_DOMAIN */
+
+/* Suppress warnings when GCC is in -pedantic mode and not -std=c99
+ */
+#if (__GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96))
+#pragma GCC system_header
+#endif
+
 #if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 #define	g_error(...)	g_log (G_LOG_DOMAIN,         \
 			       G_LOG_LEVEL_ERROR,    \

glib-1.2.10-underquoted.patch:

--- NEW FILE glib-1.2.10-underquoted.patch ---
--- glib-1.2.10/glib.m4.underquoted	2004-08-09 09:10:44.497000620 +0100
+++ glib-1.2.10/glib.m4	2004-08-09 09:11:01.446759680 +0100
@@ -5,7 +5,7 @@
 dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if "gmodule" or 
 dnl gthread is specified in MODULES, pass to glib-config
 dnl
-AC_DEFUN(AM_PATH_GLIB,
+AC_DEFUN([AM_PATH_GLIB],
 [dnl 
 dnl Get the cflags and libraries from the glib-config script
 dnl


--- NEW FILE glib.spec ---

Summary: A library of handy utility functions
Name: 	 glib
Epoch:	 1
Version: 1.2.10
Release: 20%{?dist}

License: LGPL
Group:	 System Environment/Libraries
URL:	 http://www.gtk.org/
Source:  ftp://ftp.gimp.org/pub/gtk/v1.2/glib-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

# Suppress warnings about varargs macros for -pedantic
Patch1: glib-1.2.10-isowarning.patch
Patch2: glib-1.2.10-gcc34.patch
Patch3: glib-1.2.10-underquoted.patch

%description
GLib is a handy library of utility functions. This C library is
designed to solve some portability problems and provide other useful
functionality which most programs require.

%package devel
Summary: Libraries and header files for %{name} development 
Group:	 Development/Libraries
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: pkgconfig
%description devel
%{summary}.


%prep
%setup -q 

%patch1 -p1 -b .isowarning
%patch2 -p1 -b .gcc34
%patch3 -p1 -b .underquoted


%build
%configure --disable-static

make %{?_smp_mflags}


# I *know* ||: isn't needed, but this *is* a legacy pkg afterall.
%check || :
make check


%install
rm -rf $RPM_BUILD_ROOT

%makeinstall

rm -rf $RPM_BUILD_ROOT%{_infodir}
rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
# libgmodule-1.2.so.0* missing eXecute bit
chmod a+x $RPM_BUILD_ROOT%{_libdir}/lib*.so


%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,-)
%{_bindir}/glib-config
%{_libdir}/lib*.so
%{_libdir}/glib/
%{_libdir}/pkgconfig/*
%{_includedir}/*
%{_mandir}/man1/*
%{_datadir}/aclocal/*


%changelog
* Wed Apr 12 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1:1.2.10-20
- cleanup %%description
- libgmodule-1.2.so.0* missing eXecute bit
- utf-8'ize specfile

* Thu Apr 06 2006 Rex Dieter <rexdieter[AT]users.sf.net> 1:1.2.10-19
- cleanup for Extras
- -devel: Requires: pkgconfig

* Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 1:1.2.10-18.2.2
- bump again for double-long bug on ppc(64)

* Tue Feb 07 2006 Jesse Keating <jkeating at redhat.com> - 1:1.2.10-18.2.1
- rebuilt for new gcc4.1 snapshot and glibc changes

* Tue Jan  3 2006 Jesse Keating <jkeating at redhat.com> 1:1.2.10-18.2
- rebuilt again

* Fri Dec 09 2005 Jesse Keating <jkeating at redhat.com>
- rebuilt

* Mon Nov 21 2005 Matthias Clasen <mclasen at redhat.com> 1:1.2.10-18
- Make sure all libraries are stripped

* Mon Nov  7 2005 Matthias Clasen <mclasen at redhat.com> 1:1.2.10-17
- Remove .la files and static libs from the -devel package.

* Wed Mar  2 2005 Matthias Clasen <mclasen at redhat.com> 1:1.2.10-16
- Rebuild with gcc4

* Mon Aug  9 2004 Tim Waugh <twaugh at redhat.com> 1:1.2.10-15
- Fixed underquoted m4 definitions.

* Mon Jun 20 2004 Matthias Clasen <mclasen at redhat.com> 1:1.2.10-14
- Make it build with gcc 3.4

* 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:1.2.10-11.1
- build for RHEL

* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt

* Tue Jun  3 2003 Jeff Johnson <jbj at redhat.com>
- add explicit epoch's where needed.

* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt

* Fri Nov 29 2002 Tim Powers <timp at redhat.com> 1:1.2.10-9
- remove unpackaged files from the buildroot

* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Thu May 23 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Wed Jan 09 2002 Tim Powers <timp at redhat.com>
- automated rebuild

* Sat Jul 21 2001 Owen Taylor <otaylor at redhat.com>
- Add #pragma GCC system_header to supress warnings when in -pedantic
  mode. (41271)

* Tue Jul 10 2001 Trond Eivind Glomsrod <teg at redhat.com>
- s/Copyright/License/
- Make the devel subpackage depend on the main package

* Sun Jun 24 2001 Elliot Lee <sopwith at redhat.com>
- Bump release + rebuild.

* Sun Apr 22 2001  <jrb at redhat.com>
- Include pc files.

* Tue Apr 17 2001 Jonathan Blandford <jrb at redhat.com>
- Version 1.2.10

* Mon Mar 05 2001 Owen Taylor <otaylor at redhat.com>
- Version 1.2.9

* Wed Feb 28 2001 Owen Taylor <otaylor at redhat.com>
- Version 1.2.9pre3

* Tue Feb 27 2001 Owen Taylor <otaylor at redhat.com>
- Version 1.2.9pre2

* Tue Feb 13 2001 Owen Taylor <otaylor at redhat.com>
- Version 1.2.9pre1

* Sat Oct 28 2000 Owen Taylor <otaylor at redhat.com>
- Add patch to suppress warnings from GCC by using
  C99 standard varargs macros

* 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

* Mon Jun 19 2000 Preston Brown <pbrown at redhat.com>
- FHS paths

* Thu May 25 2000 Owen Taylor <otaylor at redhat.com>
- Version 1.2.8

* Mon May  1 2000 Matt Wilson <msw at redhat.com>
- version 1.2.7

* Fri Feb 04 2000 Owen Taylor <otaylor at redhat.com>
- Added fixes from stable branch of CVS

* Thu Oct 7  1999 Owen Taylor <otaylor at redhat.com>
- version 1.2.6

* Fri Sep 24 1999 Owen Taylor <otaylor at redhat.com>
- version 1.2.5

* Fri Sep 17 1999 Owen Taylor <otaylor at redhat.com>
- version 1.2.4

* Mon Jun 7 1999 Owen Taylor <otaylor at redhat.com>
- version 1.2.3

* Thu Mar 25 1999 Michael Fulbright <drmike at redhat.com>
- version 1.2.1

* Fri Feb 26 1999 Michael Fulbright <drmike at redhat.com>
- Version 1.2

* Thu Feb 25 1999 Michael Fulbright <drmike at redhat.com>
- version 1.2.0pre1

* Tue Feb 23 1999 Cristian Gafton <gafton at redhat.com>
- new description tags 

* Sun Feb 21 1999 Michael Fulbright <drmike at redhat.com>
- removed libtoolize from %build

* Thu Feb 11 1999 Michael Fulbright <drmike at redhat.com>
- added libgthread to file list

* Fri Feb 05 1999 Michael Fulbright <drmike at redhat.com>
- version 1.1.15

* Wed Feb 03 1999 Michael Fulbright <drmike at redhat.com>
- version 1.1.14

* Mon Jan 18 1999 Michael Fulbright <drmike at redhat.com>
- version 1.1.13

* Wed Jan 06 1999 Michael Fulbright <drmike at redhat.com>
- version 1.1.12

* Wed Dec 16 1998 Michael Fulbright <drmike at redhat.com>
- updated in preparation for the GNOME freeze

* Mon Apr 13 1998 Marc Ewing <marc at redhat.com>
- Split out glib package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/glib/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Apr 2006 14:37:16 -0000	1.1
+++ .cvsignore	24 Apr 2006 14:37:42 -0000	1.2
@@ -0,0 +1 @@
+glib-1.2.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/glib/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Apr 2006 14:37:16 -0000	1.1
+++ sources	24 Apr 2006 14:37:42 -0000	1.2
@@ -0,0 +1 @@
+6fe30dad87c77b91b632def29dd69ef9  glib-1.2.10.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 24 14:40:38 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 24 Apr 2006 07:40:38 -0700
Subject: owners owners.list,1.884,1.885
Message-ID: <200604241440.k3OEeeVs032176@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32159

Modified Files:
	owners.list 
Log Message:
+glib



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.884
retrieving revision 1.885
diff -u -r1.884 -r1.885
--- owners.list	24 Apr 2006 08:51:04 -0000	1.884
+++ owners.list	24 Apr 2006 14:40:38 -0000	1.885
@@ -349,6 +349,7 @@
 Fedora Extras|gktools|GUI utilities for KerberosV tickets|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gl-117|GL-117 is an action flight simulator|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|glabels|A program for creating labels and business cards for GNOME|jspaleta at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|glib|Summary: A library of handy utility functions|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|glibmm24|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|Glide3|Glide3 runtime for the 3Dfx Voodoo family of cards|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|Glide3-libGL|Glide3 OpenGL library for use with 3Dfx Voodoo 1 & 2 cards|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Apr 24 14:46:19 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Mon, 24 Apr 2006 07:46:19 -0700
Subject: rpms/swh-plugins - New directory
Message-ID: <200604241446.k3OEkLHj032328@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/swh-plugins
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32302/swh-plugins

Log Message:
Directory /cvs/extras/rpms/swh-plugins added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 24 14:46:19 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Mon, 24 Apr 2006 07:46:19 -0700
Subject: rpms/swh-plugins/devel - New directory
Message-ID: <200604241446.k3OEkLwO032331@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/swh-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32302/swh-plugins/devel

Log Message:
Directory /cvs/extras/rpms/swh-plugins/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 24 14:46:59 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Mon, 24 Apr 2006 07:46:59 -0700
Subject: rpms/swh-plugins Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604241447.k3OEl1ZZ032377@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/swh-plugins
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32349

Added Files:
	Makefile import.log 
Log Message:
Setup of module swh-plugins


--- NEW FILE Makefile ---
# Top level Makefile for module swh-plugins
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Mon Apr 24 14:46:59 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Mon, 24 Apr 2006 07:46:59 -0700
Subject: rpms/swh-plugins/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604241447.k3OEl1Lb032380@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/swh-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32349/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module swh-plugins


--- 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 Apr 24 14:48:16 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Mon, 24 Apr 2006 07:48:16 -0700
Subject: rpms/swh-plugins import.log,1.1,1.2
Message-ID: <200604241448.k3OEmmvV032453@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/swh-plugins
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32417

Modified Files:
	import.log 
Log Message:
auto-import swh-plugins-0.4.14-2 on branch devel from swh-plugins-0.4.14-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/swh-plugins/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Apr 2006 14:46:59 -0000	1.1
+++ import.log	24 Apr 2006 14:48:16 -0000	1.2
@@ -0,0 +1 @@
+swh-plugins-0_4_14-2:HEAD:swh-plugins-0.4.14-2.src.rpm:1145890074



From fedora-extras-commits at redhat.com  Mon Apr 24 14:48:16 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Mon, 24 Apr 2006 07:48:16 -0700
Subject: rpms/swh-plugins/devel swh-plugins.spec, NONE, 1.1 .cvsignore, 1.1, 
	1.2 sources, 1.1, 1.2
Message-ID: <200604241448.k3OEmmwq032457@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/swh-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32417/devel

Modified Files:
	.cvsignore sources 
Added Files:
	swh-plugins.spec 
Log Message:
auto-import swh-plugins-0.4.14-2 on branch devel from swh-plugins-0.4.14-2.src.rpm


--- NEW FILE swh-plugins.spec ---
Summary:      A set of audio plugins for LADSPA
Name:         swh-plugins
Version:      0.4.14
Release:      2%{?dist}
License:      GPL
Group:        Applications/Multimedia
Source:       http://plugin.org.uk/releases/0.4.14/swh-plugins-0.4.14.tar.gz
URL:          http://plugin.org.uk/
BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires: fftw3-devel ladspa-devel libxml2-devel

%description
A set of audio plugins for LADSPA (see http://plugin.org.uk/ for more
details).

%prep
%setup -q

%build
CFLAGS="$RPM_OPT_FLAGS" %configure
%{__make} %{?_smp_mflags} static

%install
%{__rm} -rf %{buildroot}
%{__make} DESTDIR=%{buildroot} install
%find_lang swh-plugins

%clean
%{__rm} -rf %{buildroot}

%files -f swh-plugins.lang
%defattr(-,root,root)
%doc AUTHORS ChangeLog COPYING README
%{_libdir}/ladspa/*.so
%{_datadir}/ladspa/rdf/*

%changelog
* Mon Apr 24 2006 Anthony Green <green at redhat.com> 0.4.14-2
- Fix Summary.
- Don't install INSTALL or the empty NEWS file.
- Remove some BuildRequirements.

* Sat Apr 22 2006 Anthony Green <green at redhat.com> 0.4.14-1
- Build for Fedora Extras.
- Use %find_lang.
- Don't own the ladspa dir.

* Fri Jun 24 2005 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.4.13
- removed ps_in and ps_out external declarations in pitchscale.h,
  otherwise build fails in fc4/gcc4
* Fri Mar 25 2005 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.4.13-1
- updated to 0.4.13
* Mon Jan 24 2005 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.4.12-1
- updated to 0.4.12
* Mon Dec 20 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu>  
- spec file cleanup
* Mon Nov 15 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.4.11-1
- updated to 0.4.11
* Tue Jul 20 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.4.7-1
- updated to 0.4.7
- multiarch build, up optimization to original -O6
* Sun Jul  4 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.4.4-1
- updated to 0.4.4
* Fri May 14 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.4.3-3
- more buildrequires, fixed file list
- patch for gcc3.3 happiness
* Sat May  8 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 
- added proper buildrequires
* Wed Feb 18 2004 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.4.3-2
- changed name of ladspa package, do not depend on it explicitly
* Tue Dec  2 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.4.3-1
- updated to 0.4.3
* Sat Oct 11 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.4.2-2
- updated to snapshot of 2003-08-19, jackEq requires dj_eq_1901
* Mon Jun  2 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.4.2-1
- updated to 0.4.2
* Tue Apr  8 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.4.0-2
- rebuilt for newer version of fftw
* Tue Apr  8 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.4.0-1
- updated to 0.4.0
* Fri Mar  7 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.7-1
- updated to 0.3.7
* Mon Jan 13 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.6-1
- updated to 0.3.6... boy, this is movin fast :-)
* Fri Jan 10 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.5
- updated to 0.3.5... should have waited :-)
* Thu Jan  9 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.4
- updated to 0.3.4
* Wed Dec 06 2002 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.3
- updated to 0.3.3
* Wed Dec 04 2002 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.2
- updated to 0.3.2
* Fri Nov  1 2002 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 0.3.0
- updated to 0.3.0
* Fri Sep 06 2002 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu>
- updated to 0.2.8
* Fri Jan 18 2002 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu>
- updated to 0.2.3
- changed to globbing of .so files
* Thu Aug 23 2001 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu>
- added prefix, cleanup


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/swh-plugins/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Apr 2006 14:46:59 -0000	1.1
+++ .cvsignore	24 Apr 2006 14:48:16 -0000	1.2
@@ -0,0 +1 @@
+swh-plugins-0.4.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/swh-plugins/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Apr 2006 14:46:59 -0000	1.1
+++ sources	24 Apr 2006 14:48:16 -0000	1.2
@@ -0,0 +1 @@
+1d8418b85034ee9153c726c4c7188a1a  swh-plugins-0.4.14.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 24 14:52:18 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Mon, 24 Apr 2006 07:52:18 -0700
Subject: owners owners.list,1.885,1.886
Message-ID: <200604241452.k3OEqK0R032517@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32498

Modified Files:
	owners.list 
Log Message:
Add swh-plugins.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.885
retrieving revision 1.886
diff -u -r1.885 -r1.886
--- owners.list	24 Apr 2006 14:40:38 -0000	1.885
+++ owners.list	24 Apr 2006 14:52:17 -0000	1.886
@@ -1436,6 +1436,7 @@
 Fedora Extras|svn2cl|Create a ChangeLog from a Subversion log|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|swatch|A tool for actively monitoring log files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|sweep|An audio editor and live playback tool|gemi at bluewin.ch|extras-qa at fedoraproject.org|
+Fedora Extras|swh-plugins|A set of audio plugins for LADSPA|green at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|sword|Free Bible Software Project|mpeters at mac.com|extras-qa at fedoraproject.org|
 Fedora Extras|syck|YAML for C, Python, and PHP|oliver at linux-kernel.at|extras-qa at fedoraproject.org|
 Fedora Extras|sylpheed|GTK+ based, lightweight, and fast email client|bugs.michael at gmx.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Apr 24 15:08:58 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Mon, 24 Apr 2006 08:08:58 -0700
Subject: owners owners.list,1.886,1.887
Message-ID: <200604241509.k3OF90jY002553@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2530

Modified Files:
	owners.list 
Log Message:
drop extraneous Summary: from bad cut-n-paste



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.886
retrieving revision 1.887
diff -u -r1.886 -r1.887
--- owners.list	24 Apr 2006 14:52:17 -0000	1.886
+++ owners.list	24 Apr 2006 15:08:58 -0000	1.887
@@ -349,7 +349,7 @@
 Fedora Extras|gktools|GUI utilities for KerberosV tickets|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gl-117|GL-117 is an action flight simulator|steve at silug.org|extras-qa at fedoraproject.org|
 Fedora Extras|glabels|A program for creating labels and business cards for GNOME|jspaleta at gmail.com|extras-qa at fedoraproject.org|
-Fedora Extras|glib|Summary: A library of handy utility functions|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|glib|A library of handy utility functions|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|glibmm24|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|Glide3|Glide3 runtime for the 3Dfx Voodoo family of cards|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|Glide3-libGL|Glide3 OpenGL library for use with 3Dfx Voodoo 1 & 2 cards|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Mon Apr 24 15:12:40 2006
From: fedora-extras-commits at redhat.com (Mike Bonnet (mikeb))
Date: Mon, 24 Apr 2006 08:12:40 -0700
Subject: krbVmodule configure.in,1.16,1.17 python-krbV.spec,1.1,1.2
Message-ID: <200604241512.k3OFCeU0002596@cvs-int.fedora.redhat.com>

Author: mikeb

Update of /cvs/devel/krbVmodule
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2577

Modified Files:
	configure.in python-krbV.spec 
Log Message:
bump version number due to API changes, and remove version-number parsing from the spec file


Index: configure.in
===================================================================
RCS file: /cvs/devel/krbVmodule/configure.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- configure.in	5 Apr 2006 07:17:08 -0000	1.16
+++ configure.in	24 Apr 2006 15:12:38 -0000	1.17
@@ -1,6 +1,6 @@
 AC_INIT
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(python-krbV, 1.0.11)
+AM_INIT_AUTOMAKE(python-krbV, 1.0.12)
 
 AC_PREFIX_DEFAULT(/usr)
 


Index: python-krbV.spec
===================================================================
RCS file: /cvs/devel/krbVmodule/python-krbV.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-krbV.spec	5 Apr 2006 07:17:08 -0000	1.1
+++ python-krbV.spec	24 Apr 2006 15:12:38 -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(plat_specific=True)")} 
 
 Name: python-krbV
-Version: %(/bin/awk '/AM_INIT_AUTOMAKE/ { print substr($2, 0, length($2)-1) }' configure.in)
-Release: 3%{?dist}
+Version: 1.0.12
+Release: 1%{?dist}
 Summary: Python extension module for Kerberos 5
 
 Group: Development/Languages
@@ -47,6 +47,9 @@
 %{python_sitelib}/krbVmodule.so
 
 %changelog
+* Mon Apr 24 2006 Michael Bonnet <mikeb at redhat.com> - 1.0.12
+- bump version number due to API changes
+
 * Fri Mar 24 2006 Mike Bonnet <mikeb at redhat.com>
 - fix typo in error definition
 - change the return value of recvauth() from ac to (ac, princ), where princ is the principal sent by sendauth()



From fedora-extras-commits at redhat.com  Mon Apr 24 15:27:34 2006
From: fedora-extras-commits at redhat.com (Mike Bonnet (mikeb))
Date: Mon, 24 Apr 2006 08:27:34 -0700
Subject: krbVmodule autogen.sh,1.3,1.4
Message-ID: <200604241527.k3OFRYxd003001@cvs-int.fedora.redhat.com>

Author: mikeb

Update of /cvs/devel/krbVmodule
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2984

Modified Files:
	autogen.sh 
Log Message:
move autoheader to enable autogen.sh from clean sources


Index: autogen.sh
===================================================================
RCS file: /cvs/devel/krbVmodule/autogen.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- autogen.sh	20 Feb 2003 18:37:46 -0000	1.3
+++ autogen.sh	24 Apr 2006 15:27:32 -0000	1.4
@@ -53,9 +53,9 @@
 	(cd $I
 	libtoolize --force
 	aclocal -I $TOPDIR
+	autoheader
 	automake --add-missing
 	autoconf
-	autoheader
 	)
 done
 



From fedora-extras-commits at redhat.com  Mon Apr 24 15:39:24 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Mon, 24 Apr 2006 08:39:24 -0700
Subject: rpms/swh-plugins/devel swh-plugins-0.4.14-configure.patch, NONE,
	1.1 swh-plugins.spec, 1.1, 1.2
Message-ID: <200604241539.k3OFdQEf003101@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/swh-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3075

Modified Files:
	swh-plugins.spec 
Added Files:
	swh-plugins-0.4.14-configure.patch 
Log Message:
Revision -3.  Add configure patch.


swh-plugins-0.4.14-configure.patch:

--- NEW FILE swh-plugins-0.4.14-configure.patch ---
--- configure~	2005-09-07 09:12:36.000000000 -0400
+++ configure	2006-04-24 11:20:26.000000000 -0400
@@ -23242,23 +23242,6 @@
 
 CFLAGS=$lrintf_save_CFLAGS -I at top_srcdir@/intl -I at top_srcdir@
 
-if  echo ${CFLAGS} | grep "\-march=" ; then
-  { echo "$as_me:$LINENO: WARNING: CFLAGS appears to allready contain architecture specifaction, using exiting one" >&5
-echo "$as_me: WARNING: CFLAGS appears to allready contain architecture specifaction, using exiting one" >&2;}
-else
-  { echo "$as_me:$LINENO: WARNING: Can't fine architecture specifaction in CFLAGS, picking one from build host CPU type" >&5
-echo "$as_me: WARNING: Can't fine architecture specifaction in CFLAGS, picking one from build host CPU type" >&2;}
-  { echo "$as_me:$LINENO: WARNING: May result in non-portable code" >&5
-echo "$as_me: WARNING: May result in non-portable code" >&2;}
-    MACHINE="-march=${build_cpu}"
-  if test ${build_cpu} = "powerpc"; then MACHINE=""; fi
-
-  CFLAGS="$CFLAGS -Wall -O3 -fomit-frame-pointer -fstrength-reduce -funroll-loops -ffast-math -fPIC -DPIC ${MACHINE} ${USE_SSE} ${DARWIN_CFLAGS}"
-
-
-    fi
-
-
 # Check whether --with-gnu-ld or --without-gnu-ld was given.
 if test "${with_gnu_ld+set}" = set; then
   withval="$with_gnu_ld"


Index: swh-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/swh-plugins/devel/swh-plugins.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- swh-plugins.spec	24 Apr 2006 14:48:16 -0000	1.1
+++ swh-plugins.spec	24 Apr 2006 15:39:24 -0000	1.2
@@ -1,10 +1,11 @@
 Summary:      A set of audio plugins for LADSPA
 Name:         swh-plugins
 Version:      0.4.14
-Release:      2%{?dist}
+Release:      3%{?dist}
 License:      GPL
 Group:        Applications/Multimedia
 Source:       http://plugin.org.uk/releases/0.4.14/swh-plugins-0.4.14.tar.gz
+Patch0:       swh-plugins-0.4.14-configure.patch
 URL:          http://plugin.org.uk/
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -16,9 +17,10 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %configure
+CFLAGS="$RPM_OPT_FLAGS" %configure --disable-static
 %{__make} %{?_smp_mflags} static
 
 %install
@@ -36,6 +38,9 @@
 %{_datadir}/ladspa/rdf/*
 
 %changelog
+* Mon Apr 24 2006 Anthony Green <green at redhat.com> 0.4.14-3
+- Add -configure patch.  Configure with --disable-static.
+
 * Mon Apr 24 2006 Anthony Green <green at redhat.com> 0.4.14-2
 - Fix Summary.
 - Don't install INSTALL or the empty NEWS file.



From fedora-extras-commits at redhat.com  Mon Apr 24 15:41:16 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Mon, 24 Apr 2006 08:41:16 -0700
Subject: rpms/swh-plugins/FC-5 swh-plugins-0.4.14-configure.patch, NONE,
	1.1 swh-plugins.spec, 1.1, 1.2
Message-ID: <200604241541.k3OFfI39003175@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/swh-plugins/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3155

Modified Files:
	swh-plugins.spec 
Added Files:
	swh-plugins-0.4.14-configure.patch 
Log Message:
Update to revision -3.  Add configure patch.


swh-plugins-0.4.14-configure.patch:

--- NEW FILE swh-plugins-0.4.14-configure.patch ---
--- configure~	2005-09-07 09:12:36.000000000 -0400
+++ configure	2006-04-24 11:20:26.000000000 -0400
@@ -23242,23 +23242,6 @@
 
 CFLAGS=$lrintf_save_CFLAGS -I at top_srcdir@/intl -I at top_srcdir@
 
-if  echo ${CFLAGS} | grep "\-march=" ; then
-  { echo "$as_me:$LINENO: WARNING: CFLAGS appears to allready contain architecture specifaction, using exiting one" >&5
-echo "$as_me: WARNING: CFLAGS appears to allready contain architecture specifaction, using exiting one" >&2;}
-else
-  { echo "$as_me:$LINENO: WARNING: Can't fine architecture specifaction in CFLAGS, picking one from build host CPU type" >&5
-echo "$as_me: WARNING: Can't fine architecture specifaction in CFLAGS, picking one from build host CPU type" >&2;}
-  { echo "$as_me:$LINENO: WARNING: May result in non-portable code" >&5
-echo "$as_me: WARNING: May result in non-portable code" >&2;}
-    MACHINE="-march=${build_cpu}"
-  if test ${build_cpu} = "powerpc"; then MACHINE=""; fi
-
-  CFLAGS="$CFLAGS -Wall -O3 -fomit-frame-pointer -fstrength-reduce -funroll-loops -ffast-math -fPIC -DPIC ${MACHINE} ${USE_SSE} ${DARWIN_CFLAGS}"
-
-
-    fi
-
-
 # Check whether --with-gnu-ld or --without-gnu-ld was given.
 if test "${with_gnu_ld+set}" = set; then
   withval="$with_gnu_ld"


Index: swh-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/swh-plugins/FC-5/swh-plugins.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- swh-plugins.spec	24 Apr 2006 14:48:16 -0000	1.1
+++ swh-plugins.spec	24 Apr 2006 15:41:16 -0000	1.2
@@ -1,10 +1,11 @@
 Summary:      A set of audio plugins for LADSPA
 Name:         swh-plugins
 Version:      0.4.14
-Release:      2%{?dist}
+Release:      3%{?dist}
 License:      GPL
 Group:        Applications/Multimedia
 Source:       http://plugin.org.uk/releases/0.4.14/swh-plugins-0.4.14.tar.gz
+Patch0:       swh-plugins-0.4.14-configure.patch
 URL:          http://plugin.org.uk/
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -16,9 +17,10 @@
 
 %prep
 %setup -q
+%patch0 -p0
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %configure
+CFLAGS="$RPM_OPT_FLAGS" %configure --disable-static
 %{__make} %{?_smp_mflags} static
 
 %install
@@ -36,6 +38,9 @@
 %{_datadir}/ladspa/rdf/*
 
 %changelog
+* Mon Apr 24 2006 Anthony Green <green at redhat.com> 0.4.14-3
+- Add -configure patch.  Configure with --disable-static.
+
 * Mon Apr 24 2006 Anthony Green <green at redhat.com> 0.4.14-2
 - Fix Summary.
 - Don't install INSTALL or the empty NEWS file.



From fedora-extras-commits at redhat.com  Mon Apr 24 15:52:24 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Mon, 24 Apr 2006 08:52:24 -0700
Subject: rpms/swh-plugins/devel swh-plugins.spec,1.2,1.3
Message-ID: <200604241552.k3OFqQmc003292@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/swh-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3275

Modified Files:
	swh-plugins.spec 
Log Message:
Revision -4.  Force -fPIC and -DPIC.



Index: swh-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/swh-plugins/devel/swh-plugins.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- swh-plugins.spec	24 Apr 2006 15:39:24 -0000	1.2
+++ swh-plugins.spec	24 Apr 2006 15:52:24 -0000	1.3
@@ -1,7 +1,7 @@
 Summary:      A set of audio plugins for LADSPA
 Name:         swh-plugins
 Version:      0.4.14
-Release:      3%{?dist}
+Release:      4%{?dist}
 License:      GPL
 Group:        Applications/Multimedia
 Source:       http://plugin.org.uk/releases/0.4.14/swh-plugins-0.4.14.tar.gz
@@ -20,7 +20,7 @@
 %patch0 -p0
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %configure --disable-static
+CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" %configure --disable-static
 %{__make} %{?_smp_mflags} static
 
 %install
@@ -38,6 +38,10 @@
 %{_datadir}/ladspa/rdf/*
 
 %changelog
+* Mon Apr 24 2006 Anthony Green <green at redhat.com> 0.4.14-4
+- Force -fPIC and -DPIC.  This is required for x86_64.  Why doesn't
+libtool do this?
+
 * Mon Apr 24 2006 Anthony Green <green at redhat.com> 0.4.14-3
 - Add -configure patch.  Configure with --disable-static.
 



From fedora-extras-commits at redhat.com  Mon Apr 24 16:24:14 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Mon, 24 Apr 2006 09:24:14 -0700
Subject: rpms/quilt/FC-5 .cvsignore, 1.6, 1.7 quilt.spec, 1.10, 1.11 sources,
	1.6, 1.7
Message-ID: <200604241624.k3OGOGZT005639@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/quilt/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5565/FC-5

Modified Files:
	.cvsignore quilt.spec sources 
Log Message:

Update to latest release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quilt/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Feb 2006 03:00:03 -0000	1.6
+++ .cvsignore	24 Apr 2006 16:24:14 -0000	1.7
@@ -1 +1 @@
-quilt-0.44.tar.gz
+quilt-0.45.tar.gz


Index: quilt.spec
===================================================================
RCS file: /cvs/extras/rpms/quilt/FC-5/quilt.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- quilt.spec	16 Feb 2006 03:00:03 -0000	1.10
+++ quilt.spec	24 Apr 2006 16:24:14 -0000	1.11
@@ -6,7 +6,7 @@
 Summary:	Scripts for working with series of patches
 License:	GPL
 Group:		Development/Tools
-Version:	0.44
+Version:	0.45
 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
+* Mon Apr 24 2006 - jwboyer at jdub.homelinux.org 0.45-1
+- Update to latest release
+
 * Wed Feb 15 2006 - jwboyer at jdub.homelinux.org 0.44-1
 - Update to latest release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quilt/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	16 Feb 2006 03:00:03 -0000	1.6
+++ sources	24 Apr 2006 16:24:14 -0000	1.7
@@ -1 +1 @@
-90ec3740a590d86af40f81792885f446  quilt-0.44.tar.gz
+5f8dd5a041ca7c700b16620228f922aa  quilt-0.45.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 24 16:24:13 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Mon, 24 Apr 2006 09:24:13 -0700
Subject: rpms/quilt/FC-4 .cvsignore, 1.6, 1.7 quilt.spec, 1.10, 1.11 sources,
	1.6, 1.7
Message-ID: <200604241624.k3OGOF9l005635@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/quilt/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5565/FC-4

Modified Files:
	.cvsignore quilt.spec sources 
Log Message:

Update to latest release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quilt/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Feb 2006 02:59:58 -0000	1.6
+++ .cvsignore	24 Apr 2006 16:24:13 -0000	1.7
@@ -1 +1 @@
-quilt-0.44.tar.gz
+quilt-0.45.tar.gz


Index: quilt.spec
===================================================================
RCS file: /cvs/extras/rpms/quilt/FC-4/quilt.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- quilt.spec	16 Feb 2006 02:59:58 -0000	1.10
+++ quilt.spec	24 Apr 2006 16:24:13 -0000	1.11
@@ -6,7 +6,7 @@
 Summary:	Scripts for working with series of patches
 License:	GPL
 Group:		Development/Tools
-Version:	0.44
+Version:	0.45
 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
+* Mon Apr 24 2006 - jwboyer at jdub.homelinux.org 0.45-1
+- Update to latest release
+
 * Wed Feb 15 2006 - jwboyer at jdub.homelinux.org 0.44-1
 - Update to latest release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quilt/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	16 Feb 2006 02:59:58 -0000	1.6
+++ sources	24 Apr 2006 16:24:13 -0000	1.7
@@ -1 +1 @@
-90ec3740a590d86af40f81792885f446  quilt-0.44.tar.gz
+5f8dd5a041ca7c700b16620228f922aa  quilt-0.45.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 24 16:24:15 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Mon, 24 Apr 2006 09:24:15 -0700
Subject: rpms/quilt/devel .cvsignore, 1.6, 1.7 quilt.spec, 1.10, 1.11 sources,
	1.6, 1.7
Message-ID: <200604241624.k3OGOHFn005645@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/quilt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5565/devel

Modified Files:
	.cvsignore quilt.spec sources 
Log Message:

Update to latest release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quilt/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Feb 2006 03:00:03 -0000	1.6
+++ .cvsignore	24 Apr 2006 16:24:14 -0000	1.7
@@ -1 +1 @@
-quilt-0.44.tar.gz
+quilt-0.45.tar.gz


Index: quilt.spec
===================================================================
RCS file: /cvs/extras/rpms/quilt/devel/quilt.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- quilt.spec	16 Feb 2006 03:00:03 -0000	1.10
+++ quilt.spec	24 Apr 2006 16:24:14 -0000	1.11
@@ -6,7 +6,7 @@
 Summary:	Scripts for working with series of patches
 License:	GPL
 Group:		Development/Tools
-Version:	0.44
+Version:	0.45
 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
+* Mon Apr 24 2006 - jwboyer at jdub.homelinux.org 0.45-1
+- Update to latest release
+
 * Wed Feb 15 2006 - jwboyer at jdub.homelinux.org 0.44-1
 - Update to latest release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quilt/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	16 Feb 2006 03:00:03 -0000	1.6
+++ sources	24 Apr 2006 16:24:14 -0000	1.7
@@ -1 +1 @@
-90ec3740a590d86af40f81792885f446  quilt-0.44.tar.gz
+5f8dd5a041ca7c700b16620228f922aa  quilt-0.45.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 24 16:24:13 2006
From: fedora-extras-commits at redhat.com (Joshua W. Boyer (jwboyer))
Date: Mon, 24 Apr 2006 09:24:13 -0700
Subject: rpms/quilt/FC-3 .cvsignore, 1.6, 1.7 quilt.spec, 1.10, 1.11 sources,
	1.6, 1.7
Message-ID: <200604241624.k3OGOjoB005656@cvs-int.fedora.redhat.com>

Author: jwboyer

Update of /cvs/extras/rpms/quilt/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5565/FC-3

Modified Files:
	.cvsignore quilt.spec sources 
Log Message:

Update to latest release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/quilt/FC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	16 Feb 2006 02:59:51 -0000	1.6
+++ .cvsignore	24 Apr 2006 16:24:12 -0000	1.7
@@ -1 +1 @@
-quilt-0.44.tar.gz
+quilt-0.45.tar.gz


Index: quilt.spec
===================================================================
RCS file: /cvs/extras/rpms/quilt/FC-3/quilt.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- quilt.spec	16 Feb 2006 02:59:51 -0000	1.10
+++ quilt.spec	24 Apr 2006 16:24:12 -0000	1.11
@@ -6,7 +6,7 @@
 Summary:	Scripts for working with series of patches
 License:	GPL
 Group:		Development/Tools
-Version:	0.44
+Version:	0.45
 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
+* Mon Apr 24 2006 - jwboyer at jdub.homelinux.org 0.45-1
+- Update to latest release
+
 * Wed Feb 15 2006 - jwboyer at jdub.homelinux.org 0.44-1
 - Update to latest release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/quilt/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	16 Feb 2006 02:59:51 -0000	1.6
+++ sources	24 Apr 2006 16:24:12 -0000	1.7
@@ -1 +1 @@
-90ec3740a590d86af40f81792885f446  quilt-0.44.tar.gz
+5f8dd5a041ca7c700b16620228f922aa  quilt-0.45.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 24 16:35:16 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Mon, 24 Apr 2006 09:35:16 -0700
Subject: rpms/swh-plugins/devel swh-plugins-0.4.14-Makefile.in.patch, NONE, 
	1.1 swh-plugins.spec, 1.3, 1.4
Message-ID: <200604241635.k3OGZIEp005876@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/swh-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5856

Modified Files:
	swh-plugins.spec 
Added Files:
	swh-plugins-0.4.14-Makefile.in.patch 
Log Message:
Revision -5.  Fix install problem for x86_64.


swh-plugins-0.4.14-Makefile.in.patch:

--- NEW FILE swh-plugins-0.4.14-Makefile.in.patch ---
--- Makefile.in~	2006-04-24 12:30:33.000000000 -0400
+++ Makefile.in	2006-04-24 12:31:45.000000000 -0400
@@ -609,7 +609,7 @@
 	@top_srcdir@/*.dtd @top_srcdir@/*.pl @top_srcdir@/*.css \
 	@top_srcdir@/impulses/*.h autogen.sh bozosoity-checker.pl
 
-plugindir = @libdir@/ladspa
+plugindir = $(libdir)/ladspa
 
 # Uncomment below for Darwin support.  Or add a conditional for this.
 #AM_CFLAGS = -fno-common -flat_namespace -bundle -undefined suppress -lbundle1.o


Index: swh-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/swh-plugins/devel/swh-plugins.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- swh-plugins.spec	24 Apr 2006 15:52:24 -0000	1.3
+++ swh-plugins.spec	24 Apr 2006 16:35:16 -0000	1.4
@@ -1,11 +1,12 @@
 Summary:      A set of audio plugins for LADSPA
 Name:         swh-plugins
 Version:      0.4.14
-Release:      4%{?dist}
+Release:      5%{?dist}
 License:      GPL
 Group:        Applications/Multimedia
 Source:       http://plugin.org.uk/releases/0.4.14/swh-plugins-0.4.14.tar.gz
 Patch0:       swh-plugins-0.4.14-configure.patch
+Patch1:       swh-plugins-0.4.14-Makefile.in.patch
 URL:          http://plugin.org.uk/
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -18,6 +19,7 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" %configure --disable-static
@@ -38,6 +40,9 @@
 %{_datadir}/ladspa/rdf/*
 
 %changelog
+* Mon Apr 24 2006 Anthony Green <green at redhat.com> 0.4.14-5
+- Add Makefile.in patch to install in /usrr/lib64 for x86_64.
+
 * Mon Apr 24 2006 Anthony Green <green at redhat.com> 0.4.14-4
 - Force -fPIC and -DPIC.  This is required for x86_64.  Why doesn't
 libtool do this?



From fedora-extras-commits at redhat.com  Mon Apr 24 17:31:10 2006
From: fedora-extras-commits at redhat.com (Ralf Ertzinger (ertzing))
Date: Mon, 24 Apr 2006 10:31:10 -0700
Subject: rpms/libfwbuilder/devel libfwbuilder.spec,1.11,1.12
Message-ID: <200604241731.k3OHVCQF008251@cvs-int.fedora.redhat.com>

Author: ertzing

Update of /cvs/extras/rpms/libfwbuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8234

Modified Files:
	libfwbuilder.spec 
Log Message:
Retagging


Index: libfwbuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/libfwbuilder/devel/libfwbuilder.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libfwbuilder.spec	21 Apr 2006 09:54:02 -0000	1.11
+++ libfwbuilder.spec	24 Apr 2006 17:31:10 -0000	1.12
@@ -1,7 +1,7 @@
 Name:           libfwbuilder
 Summary:        Firewall Builder API
 Version:        2.0.12
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPL
 Group:          System Environment/Libraries
 URL:            http://www.fwbuilder.org/
@@ -88,6 +88,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Ralf Ertzinger <ralf at skytale.net> 2.0.12-2.fc6
+- Retagging
+
 * Fri Apr 21 2006 Ralf Ertzinger <ralf at skytale.net> 2.0.12-1.fc5
 - Update to 2.0.12
 - Drop gcc-4.1 patch and -ffriend-injection



From fedora-extras-commits at redhat.com  Mon Apr 24 17:43:48 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Mon, 24 Apr 2006 10:43:48 -0700
Subject: extras-buildsys/utils extras-sign-move.py,1.13,1.14
Message-ID: <200604241743.k3OHhmxG008351@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8331

Modified Files:
	extras-sign-move.py 
Log Message:
Let's not overwrite any packages already in the repo.


Index: extras-sign-move.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/extras-sign-move.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- extras-sign-move.py	23 Apr 2006 18:40:57 -0000	1.13
+++ extras-sign-move.py	24 Apr 2006 17:43:46 -0000	1.14
@@ -204,16 +204,17 @@
     infolist = []
     for package in files['srpm']:
         (n,a,e,v,r) = naevr(package)
-        infolist.append('%s-%s-%s' % (n,v,r))
         pkg_fn = os.path.basename(package)
         srpmloc = os.path.join(destdir, 'SRPMS', pkg_fn)
+        debugprint('Moving %s to %s' % (package, srpmloc))
         if os.path.exists(srpmloc):
-            debugprint('Deleting %s' % srpmloc)
+            debugprint('%s already exists, ignoring new one' % srpmloc)
             if not DEBUG:
-                os.unlink(srpmloc)
-        debugprint('Moving %s to %s' % (package, srpmloc))
-        if not DEBUG:
-            shutil.move(package, srpmloc)
+                os.unlink(package)
+        else:
+            infolist.append('%s-%s-%s' % (n,v,r))
+            if not DEBUG:
+                shutil.move(package, srpmloc)
 
     # go through each package and move it to the right arch location.
     # if it is a noarch package, copy2 it to all arch locations and unlink it
@@ -233,9 +234,9 @@
                     arch = '%s/debug' % arch
                 rpmloc = os.path.join(destdir, arch, pkg_fn)
                 debugprint("Copying %s to %s" % (package, rpmloc))
-                if not DEBUG:
-                    if os.path.exists(rpmloc):
-                        os.unlink(rpmloc)
+                if os.path.exists(rpmloc):
+                    debugprint('%s already exists, ignoring new one' % rpmloc)
+                elif not DEBUG:
                     shutil.copy2(package, rpmloc)
 
         if a == 'noarch':
@@ -244,9 +245,9 @@
                     arch = '%s/debug' % arch
                 rpmloc = os.path.join(destdir, arch, pkg_fn)
                 debugprint("Copying %s to %s" % (package, rpmloc))
-                if not DEBUG:                
-                    if os.path.exists(rpmloc):
-                        os.unlink(rpmloc)
+                if os.path.exists(rpmloc):
+                    debugprint('%s already exists, ignoring new one' % rpmloc)
+                elif not DEBUG:
                     shutil.copy2(package, rpmloc)
             
             if not DEBUG:
@@ -277,7 +278,11 @@
 
         rpmloc = os.path.join(destdir, arch, pkg_fn)
         debugprint('Moving %s to %s' % (package, rpmloc))        
-        if not DEBUG:
+        if os.path.exists(rpmloc):
+            debugprint('%s already exists, ignoring new one' % rpmloc)
+            if not DEBUG:
+                os.unlink(package)
+        elif not DEBUG:
             shutil.move(package, rpmloc)
 
     # email the list



From fedora-extras-commits at redhat.com  Mon Apr 24 18:00:01 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 24 Apr 2006 11:00:01 -0700
Subject: rpms/perl-Log-Dispatch-FileRotate - New directory
Message-ID: <200604241800.k3OI03xJ008586@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch-FileRotate
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8555/perl-Log-Dispatch-FileRotate

Log Message:
Directory /cvs/extras/rpms/perl-Log-Dispatch-FileRotate added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 24 18:00:02 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 24 Apr 2006 11:00:02 -0700
Subject: rpms/perl-Log-Dispatch-FileRotate/devel - New directory
Message-ID: <200604241800.k3OI04VT008592@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8555/perl-Log-Dispatch-FileRotate/devel

Log Message:
Directory /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/devel added to the repository




From fedora-extras-commits at redhat.com  Mon Apr 24 18:00:18 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 24 Apr 2006 11:00:18 -0700
Subject: rpms/perl-Log-Dispatch-FileRotate Makefile, NONE, 1.1 import.log,
	NONE, 1.1
Message-ID: <200604241800.k3OI0KPd008640@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch-FileRotate
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8610

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Log-Dispatch-FileRotate


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Log-Dispatch-FileRotate
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 24 18:00:18 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 24 Apr 2006 11:00:18 -0700
Subject: rpms/perl-Log-Dispatch-FileRotate/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200604241800.k3OI0KqP008643@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8610/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Log-Dispatch-FileRotate


--- 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 Apr 24 18:00:51 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 24 Apr 2006 11:00:51 -0700
Subject: rpms/perl-Log-Dispatch-FileRotate import.log,1.1,1.2
Message-ID: <200604241800.k3OI0rJH008711@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch-FileRotate
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8678

Modified Files:
	import.log 
Log Message:
auto-import perl-Log-Dispatch-FileRotate-1.14-1 on branch devel from perl-Log-Dispatch-FileRotate-1.14-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	24 Apr 2006 18:00:18 -0000	1.1
+++ import.log	24 Apr 2006 18:00:51 -0000	1.2
@@ -0,0 +1 @@
+perl-Log-Dispatch-FileRotate-1_14-1:HEAD:perl-Log-Dispatch-FileRotate-1.14-1.src.rpm:1145901643



From fedora-extras-commits at redhat.com  Mon Apr 24 18:00:52 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 24 Apr 2006 11:00:52 -0700
Subject: rpms/perl-Log-Dispatch-FileRotate/devel
	perl-Log-Dispatch-FileRotate.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604241800.k3OI0sds008716@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8678/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Log-Dispatch-FileRotate.spec 
Log Message:
auto-import perl-Log-Dispatch-FileRotate-1.14-1 on branch devel from perl-Log-Dispatch-FileRotate-1.14-1.src.rpm


--- NEW FILE perl-Log-Dispatch-FileRotate.spec ---
Name:           perl-Log-Dispatch-FileRotate
Version:        1.14
Release:        1%{?dist}
Summary:        Log to files that archive/rotate themselves

Group:          Development/Libraries
License:        Artistic
URL:            http://search.cpan.org/dist/Log-Dispatch-FileRotate/
Source0:        http://www.cpan.org/authors/id/M/MA/MARKPF/Log-Dispatch-FileRotate-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(Date::Manip)
BuildRequires:  perl(Log::Dispatch)
# See comment in the %check section
# BuildRequires:  perl(Log::Log4perl) >= 0.23
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module provides a simple object for logging to files under the
Log::Dispatch::* system, and automatically rotating them according to
different constraints. This is basically a Log::Dispatch::File wrapper
with additions.


%prep
%setup -q -n Log-Dispatch-FileRotate-%{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
# Test suite disabled: circular dependencies with Log::Log4perl
# make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/Log/Dispatch/
%{_mandir}/man3/*.3pm*


%changelog
* Mon Apr 24 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.14-1
- Update to 1.14.
- License: Artistic.

* Mon Apr 24 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.13-2
- The license is: GPL or Artistic.
  License information: http://rt.cpan.org/Public/Bug/Display.html?id=14563.

* Sun Sep 11 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.13-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Apr 2006 18:00:18 -0000	1.1
+++ .cvsignore	24 Apr 2006 18:00:52 -0000	1.2
@@ -0,0 +1 @@
+Log-Dispatch-FileRotate-1.14.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Apr 2006 18:00:18 -0000	1.1
+++ sources	24 Apr 2006 18:00:52 -0000	1.2
@@ -0,0 +1 @@
+b7cc69172d5c8b1a34c429d738bc3fa5  Log-Dispatch-FileRotate-1.14.tar.gz



From fedora-extras-commits at redhat.com  Mon Apr 24 18:06:26 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 24 Apr 2006 11:06:26 -0700
Subject: owners owners.list,1.887,1.888
Message-ID: <200604241806.k3OI6Ssc011068@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11050

Modified Files:
	owners.list 
Log Message:
New package: perl-Log-Dispatch-FileRotate (#171640)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.887
retrieving revision 1.888
diff -u -r1.887 -r1.888
--- owners.list	24 Apr 2006 15:08:58 -0000	1.887
+++ owners.list	24 Apr 2006 18:06:26 -0000	1.888
@@ -1039,6 +1039,7 @@
 Fedora Extras|perl-Locale-Maketext-Lexicon|Extract translatable strings from source|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Locale-Maketext-Simple|Simple interface to Locale::Maketext::Lexicon|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Log-Dispatch|Dispatches messages to one or more outputs|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Log-Dispatch-FileRotate|Log to files that archive/rotate themselves|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Log-Log4perl|Log4j implementation for Perl|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Log-Message|Generic message storage mechanism|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Log-Message-Simple|Simplified frontend to Log::Message|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Mon Apr 24 18:25:44 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Mon, 24 Apr 2006 11:25:44 -0700
Subject: fedora-security/audit fc4,1.213,1.214 fc5,1.127,1.128
Message-ID: <200604241825.k3OIPirs011148@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11126

Modified Files:
	fc4 fc5 
Log Message:
Note what the ruby issue affects.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.213
retrieving revision 1.214
diff -u -r1.213 -r1.214
--- fc4	24 Apr 2006 08:26:03 -0000	1.213
+++ fc4	24 Apr 2006 18:25:42 -0000	1.214
@@ -4,7 +4,7 @@
 ** are items that need attention
 
 CVE-2006-1942 ** firefox
-CVE-2006-1931 ** ruby
+CVE-2006-1931 version (ruby, fixed 1.8.3)
 CVE-2006-1902 ignore (gcc) not a vulnerability
 CVE-2006-1790 version (firefox, fixed 1.0.8) [since FEDORA-2006-410]
 CVE-2006-1790 VULNERABLE (thunderbird, fixed 1.0.8)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- fc5	24 Apr 2006 08:26:03 -0000	1.127
+++ fc5	24 Apr 2006 18:25:42 -0000	1.128
@@ -4,7 +4,7 @@
 ** are items that need attention
 
 CVE-2006-1942 ** firefox
-CVE-2006-1931 ** ruby
+CVE-2006-1931 version (ruby, fixed 1.8.3)
 CVE-2006-1902 ignore (gcc) not a vulnerability
 CVE-2006-1865 version (beagle, fixed 0.2.5) [since FEDORA-2006-440]
 CVE-2006-1790 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]



From fedora-extras-commits at redhat.com  Mon Apr 24 18:47:21 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Mon, 24 Apr 2006 11:47:21 -0700
Subject: rpms/swh-plugins/devel swh-plugins-0.4.14-Makefile.in.patch, 1.1,
	1.2
Message-ID: <200604241847.k3OIlNdm011320@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/swh-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11299

Modified Files:
	swh-plugins-0.4.14-Makefile.in.patch 
Log Message:
Fix Makefile.in patch


swh-plugins-0.4.14-Makefile.in.patch:

Index: swh-plugins-0.4.14-Makefile.in.patch
===================================================================
RCS file: /cvs/extras/rpms/swh-plugins/devel/swh-plugins-0.4.14-Makefile.in.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- swh-plugins-0.4.14-Makefile.in.patch	24 Apr 2006 16:35:16 -0000	1.1
+++ swh-plugins-0.4.14-Makefile.in.patch	24 Apr 2006 18:47:21 -0000	1.2
@@ -4,7 +4,7 @@
  	@top_srcdir@/*.dtd @top_srcdir@/*.pl @top_srcdir@/*.css \
  	@top_srcdir@/impulses/*.h autogen.sh bozosoity-checker.pl
  
--plugindir = @libdir@/ladspa
+-plugindir = @prefix@/lib/ladspa
 +plugindir = $(libdir)/ladspa
  
  # Uncomment below for Darwin support.  Or add a conditional for this.



From fedora-extras-commits at redhat.com  Mon Apr 24 18:48:19 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Mon, 24 Apr 2006 11:48:19 -0700
Subject: rpms/swh-plugins/devel swh-plugins.spec,1.4,1.5
Message-ID: <200604241848.k3OImLPK011349@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/swh-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11328

Modified Files:
	swh-plugins.spec 
Log Message:
Release -6.  Fix typo in last patch.



Index: swh-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/swh-plugins/devel/swh-plugins.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- swh-plugins.spec	24 Apr 2006 16:35:16 -0000	1.4
+++ swh-plugins.spec	24 Apr 2006 18:48:19 -0000	1.5
@@ -1,7 +1,7 @@
 Summary:      A set of audio plugins for LADSPA
 Name:         swh-plugins
 Version:      0.4.14
-Release:      5%{?dist}
+Release:      6%{?dist}
 License:      GPL
 Group:        Applications/Multimedia
 Source:       http://plugin.org.uk/releases/0.4.14/swh-plugins-0.4.14.tar.gz
@@ -40,6 +40,9 @@
 %{_datadir}/ladspa/rdf/*
 
 %changelog
+* Mon Apr 24 2006 Anthony Green <green at redhat.com> 0.4.14-6
+- Fix typo in last patch.
+
 * Mon Apr 24 2006 Anthony Green <green at redhat.com> 0.4.14-5
 - Add Makefile.in patch to install in /usrr/lib64 for x86_64.
 



From fedora-extras-commits at redhat.com  Mon Apr 24 19:04:39 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Mon, 24 Apr 2006 12:04:39 -0700
Subject: rpms/swh-plugins/FC-5 swh-plugins-0.4.14-Makefile.in.patch, NONE,
	1.1 swh-plugins.spec, 1.2, 1.3
Message-ID: <200604241904.k3OJ4fun013208@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/swh-plugins/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13188

Modified Files:
	swh-plugins.spec 
Added Files:
	swh-plugins-0.4.14-Makefile.in.patch 
Log Message:
Release -6.  Many patches.  Builds fine in devel.


swh-plugins-0.4.14-Makefile.in.patch:

--- NEW FILE swh-plugins-0.4.14-Makefile.in.patch ---
--- Makefile.in~	2006-04-24 12:30:33.000000000 -0400
+++ Makefile.in	2006-04-24 12:31:45.000000000 -0400
@@ -609,7 +609,7 @@
 	@top_srcdir@/*.dtd @top_srcdir@/*.pl @top_srcdir@/*.css \
 	@top_srcdir@/impulses/*.h autogen.sh bozosoity-checker.pl
 
-plugindir = @prefix@/lib/ladspa
+plugindir = $(libdir)/ladspa
 
 # Uncomment below for Darwin support.  Or add a conditional for this.
 #AM_CFLAGS = -fno-common -flat_namespace -bundle -undefined suppress -lbundle1.o


Index: swh-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/swh-plugins/FC-5/swh-plugins.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- swh-plugins.spec	24 Apr 2006 15:41:16 -0000	1.2
+++ swh-plugins.spec	24 Apr 2006 19:04:39 -0000	1.3
@@ -1,11 +1,12 @@
 Summary:      A set of audio plugins for LADSPA
 Name:         swh-plugins
 Version:      0.4.14
-Release:      3%{?dist}
+Release:      6%{?dist}
 License:      GPL
 Group:        Applications/Multimedia
 Source:       http://plugin.org.uk/releases/0.4.14/swh-plugins-0.4.14.tar.gz
 Patch0:       swh-plugins-0.4.14-configure.patch
+Patch1:       swh-plugins-0.4.14-Makefile.in.patch
 URL:          http://plugin.org.uk/
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -18,9 +19,10 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0
 
 %build
-CFLAGS="$RPM_OPT_FLAGS" %configure --disable-static
+CFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" %configure --disable-static
 %{__make} %{?_smp_mflags} static
 
 %install
@@ -38,6 +40,16 @@
 %{_datadir}/ladspa/rdf/*
 
 %changelog
+* Mon Apr 24 2006 Anthony Green <green at redhat.com> 0.4.14-6
+- Fix typo in last patch.
+
+* Mon Apr 24 2006 Anthony Green <green at redhat.com> 0.4.14-5
+- Add Makefile.in patch to install in /usrr/lib64 for x86_64.
+
+* Mon Apr 24 2006 Anthony Green <green at redhat.com> 0.4.14-4
+- Force -fPIC and -DPIC.  This is required for x86_64.  Why doesn't
+libtool do this?
+
 * Mon Apr 24 2006 Anthony Green <green at redhat.com> 0.4.14-3
 - Add -configure patch.  Configure with --disable-static.
 



From fedora-extras-commits at redhat.com  Mon Apr 24 20:25:10 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Mon, 24 Apr 2006 13:25:10 -0700
Subject: rpms/azureus/FC-5 azureus-nativetabs.patch, NONE,
	1.1 azureus-themed.patch, 1.2, 1.3 azureus.spec, 1.23, 1.24
Message-ID: <200604242025.k3OKPCUd017890@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/azureus/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17792

Modified Files:
	azureus-themed.patch azureus.spec 
Added Files:
	azureus-nativetabs.patch 
Log Message:
Release -5.  GUI tweak and gcj bug fix.


azureus-nativetabs.patch:

--- NEW FILE azureus-nativetabs.patch ---
--- azureus/org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionInterfaceDisplay.java.orig	2006-04-17 16:00:58.000000000 +0200
+++ azureus/org/gudy/azureus2/ui/swt/views/configsections/ConfigSectionInterfaceDisplay.java	2006-04-17 16:01:21.000000000 +0200
@@ -78,8 +78,8 @@
 		cLook.setLayout(layout);
 
 		BooleanParameter bpCustomTab = new BooleanParameter(cLook, "useCustomTab",
-				true, MSG_PREFIX + "useCustomTabs");
-		Control cFancyTab = new BooleanParameter(cLook, "GUI_SWT_bFancyTab", true,
+				false, MSG_PREFIX + "useCustomTabs");
+		Control cFancyTab = new BooleanParameter(cLook, "GUI_SWT_bFancyTab", false,
 				MSG_PREFIX + "useFancyTabs").getControl();
 
 		Control[] controls = { cFancyTab };
--- azureus/org/gudy/azureus2/core3/config/impl/ConfigurationDefaults.java.orig	2006-04-17 17:25:18.000000000 +0200
+++ azureus/org/gudy/azureus2/core3/config/impl/ConfigurationDefaults.java	2006-04-17 17:26:19.000000000 +0200
@@ -154,7 +154,7 @@
     
     def.put("User Mode", new Long(0));
     
-    def.put("useCustomTab",TRUE);    
+    def.put("useCustomTab",FALSE);    
     def.put("GUI Refresh",new Long(1000));
     def.put("Graphics Update",new Long(4));
     def.put("ReOrder Delay",new Long(0));
@@ -167,7 +167,7 @@
     def.put("Use default data dir", FALSE);	
     def.put("Default save path", "" );
     
-    def.put("GUI_SWT_bFancyTab", TRUE);
+    def.put("GUI_SWT_bFancyTab", FALSE);
     def.put("GUI_SWT_bAlternateTablePainting", FALSE);
     def.put("update.start",TRUE);
     def.put("update.periodic",TRUE);

azureus-themed.patch:

Index: azureus-themed.patch
===================================================================
RCS file: /cvs/extras/rpms/azureus/FC-5/azureus-themed.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- azureus-themed.patch	9 Feb 2006 08:45:07 -0000	1.2
+++ azureus-themed.patch	24 Apr 2006 20:25:10 -0000	1.3
@@ -1,6 +1,6 @@
---- org/gudy/azureus2/ui/swt/ImageRepository.java~	2006-01-25 20:28:17.000000000 -0800
-+++ org/gudy/azureus2/ui/swt/ImageRepository.java	2006-01-25 20:28:27.000000000 -0800
-@@ -16,6 +16,8 @@
+--- azureus/org/gudy/azureus2/ui/swt/ImageRepository.java.orig	2006-04-22 17:48:33.000000000 +0200
++++ azureus/org/gudy/azureus2/ui/swt/ImageRepository.java	2006-04-22 17:50:33.000000000 +0200
+@@ -32,6 +32,8 @@
  import java.io.ByteArrayOutputStream;
  import java.io.File;
  import java.io.InputStream;
@@ -9,7 +9,7 @@
  import java.util.*;
  
  /**
-@@ -43,6 +45,25 @@
+@@ -59,6 +61,25 @@
      loadImage(display, "org/gudy/azureus2/ui/splash/azureus.jpg", "azureus_splash");
    }
  
@@ -22,9 +22,9 @@
 +	if (iconTheme == null)
 +	  iconTheme = org.gnu.gtk.IconTheme.getDefault();
 +
-+	return iconTheme.lookupIcon (name, 24, 
-+				     org.gnu.gtk.IconLookupFlags.NO_SVG)
-+	  .getFilename();
++	org.gnu.gtk.IconInfo icon = iconTheme.lookupIcon (name, 24, 
++	    org.gnu.gtk.IconLookupFlags.NO_SVG);
++	return icon != null ? icon.getFilename() : def;
 +      }
 +    catch (Exception ex)
 +      {
@@ -35,7 +35,7 @@
    public static void loadImages(Display display) {
      loadImage(display, "org/gudy/azureus2/ui/icons/a32.png", "azureus32");
      loadImage(display, "org/gudy/azureus2/ui/icons/a64.png", "azureus64");
-@@ -87,20 +108,44 @@
+@@ -103,20 +124,44 @@
      //ToolBar Icons
  
      loadImage(display, "org/gudy/azureus2/ui/icons/toolbar/open.gif", "cb_open");
@@ -92,7 +92,7 @@
  
      //Status icons
      loadImage(display, "org/gudy/azureus2/ui/icons/status/ok.gif", "st_ok");
-@@ -139,6 +184,16 @@
+@@ -157,6 +202,16 @@
      Image im = getImage(name,false);
      if(null == im) {
        InputStream is = loader.getResourceAsStream(res);
@@ -109,3 +109,10 @@
        if(null != is) {
        	try { 
  	        if(alpha == 255) {
+@@ -453,4 +508,4 @@
+       
+       return key;
+     }
+-}
+\ Kein Zeilenumbruch am Dateiende.
++}


Index: azureus.spec
===================================================================
RCS file: /cvs/extras/rpms/azureus/FC-5/azureus.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- azureus.spec	6 Apr 2006 16:55:28 -0000	1.23
+++ azureus.spec	24 Apr 2006 20:25:10 -0000	1.24
@@ -1,6 +1,6 @@
 Name:		azureus
 Version:	2.4.0.3
-Release:	0.20060328cvs_4%{?dist}
+Release:	0.20060328cvs_5%{?dist}
 Summary:	A BitTorrent Client
 
 Group:		Applications/Internet
@@ -46,6 +46,7 @@
 Patch23:	azureus-no-update-manager-PluginInstallerImpl-2.patch
 Patch24:	azureus-MessageSlideShell-swt-3.1.patch
 Patch25:	azureus-no-update-manager-MainStatusBar.patch
+Patch26:	azureus-nativetabs.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -76,7 +77,7 @@
 %patch4 -p0
 %patch5 -p0
 %patch6 -p0
-%patch7 -p0
+%patch7 -p1
 %patch8 -p0
 %patch9 -p0
 %patch10 -p0
@@ -95,6 +96,7 @@
 %patch23 -p0
 %patch24 -p0
 %patch25 -p0
+%patch26 -p1
 cp %{SOURCE4} License.txt
 cp %{SOURCE5} ChangeLog.txt
 
@@ -204,6 +206,10 @@
 %{_libdir}/gcj/*
 
 %changelog
+* Mon Apr 24 2006 Anthony Green <green at redhat.com> - 2.4.0.3-0.20060328cvs_5
+- Two patches from Stephan Michels: nativetabs (for native GTK+ tabs), and 
+an updated azureus-themed.patch to work around GCC PR 27271.
+
 * Thu Apr 06 2006 Anthony Green <green at redhat.com> - 2.4.0.3-0.20060328cvs_4
 - Yet another correction to LD_LIBRARY_PATH.  Bugzilla #186152.
 



From fedora-extras-commits at redhat.com  Mon Apr 24 21:34:44 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Apr 2006 14:34:44 -0700
Subject: rpms/worminator/devel worminator-3.0R2.1-speed.patch, NONE,
	1.1 worminator.spec, 1.2, 1.3
Message-ID: <200604242134.k3OLYkSa023900@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/worminator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23880

Modified Files:
	worminator.spec 
Added Files:
	worminator-3.0R2.1-speed.patch 
Log Message:
* Mon Apr 24 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 3.0R2.1-3
- Limit the framerate to 80 instead of trying to reach 160 fps,
  hopefully this fixes bug 188337.


worminator-3.0R2.1-speed.patch:

--- NEW FILE worminator-3.0R2.1-speed.patch ---
--- worminator-3.0R2.1/demo.h.speed	2006-02-24 20:05:02.000000000 +0100
+++ worminator-3.0R2.1/demo.h	2006-04-24 23:10:05.000000000 +0200
@@ -74,8 +74,15 @@
 		speed_counter--;
 		if (keypressed()) time_to_quit = TRUE;
 		}
-	render_map();
-	if (keypressed()) time_to_quit = TRUE;
+	game_is_running = TRUE;
+	if (frames_to_draw) {
+		render_map();
+		frames_to_draw--;
+		}
+	while (speed_counter == 0) {
+		rest(1);
+		if (keypressed()) time_to_quit = TRUE;
+		}
 	} while(!time_to_quit);  // End core demo loop
 
 fclose(demofile);
--- worminator-3.0R2.1/Worminator.c.speed	2006-03-03 10:29:44.000000000 +0100
+++ worminator-3.0R2.1/Worminator.c	2006-04-24 23:25:29.000000000 +0200
@@ -269,6 +269,16 @@
 }
 END_OF_FUNCTION(increment_speed_counter);
 
+/***********************************\
+|** FRAMERATE THROTTLING FUNCTION **|
+\***********************************/
+void increment_frames_to_draw()
+{
+	if (frames_to_draw < 2)
+		frames_to_draw++;
+}
+END_OF_FUNCTION(increment_frames_to_draw);
+
 /*******************\
 |** MAIN FUNCTION **|
 \*******************/
@@ -333,7 +343,12 @@
 		if (player.timer > 0) player.timer--;
 		speed_counter--;
 		}
-	render_map();
+	game_is_running = TRUE;
+	if (frames_to_draw) {
+		render_map();
+		frames_to_draw--;
+		}
+	while (speed_counter == 0) rest(1);
 } while(time_to_quit == FALSE);  // End core game loop
 add_console_line("Core loop complete, beginning shutdown.");
 
@@ -1540,10 +1555,6 @@
 frame_counter++;
 if (frame_counter > 32768) frame_counter = 32768;
 
-// game_is_running can be changed from under us by update_animations, this
-// should be fixed but just to be sure put the check for it in the while.
-while (game_is_running && speed_counter == 0) rest(1);
-
 //set_palette_range(worminator_data_file[DEFAULT_WORMINATOR_PALLETE].dat, 0, 255, FALSE);
 }
 
@@ -3253,6 +3264,11 @@
 install_int_ex(increment_speed_counter, BPS_TO_TIMER(GAME_SPEED_NORMAL));
 change_game_speed(wormy_config.game_speed);
 
+// Set up the framerate throtteling timer
+LOCK_VARIABLE(frames_to_draw);
+LOCK_FUNCTION(increment_frames_to_draw);
+install_int_ex(increment_frames_to_draw, BPS_TO_TIMER(80));
+
 // Set up the soundz
 add_console_line("Initilizing sound");
 reset_sound();
--- worminator-3.0R2.1/globals.h.speed	2006-02-26 22:30:18.000000000 +0100
+++ worminator-3.0R2.1/globals.h	2006-04-24 23:10:05.000000000 +0200
@@ -255,9 +255,10 @@
 volatile int speed_counter = 0;
 volatile int idle_counter = 0;
 volatile int idle_speed_counter = 0;
+volatile int frames_to_draw = 0;
 
 // This is used to tell the game timer when to update and when not to
-char game_is_running = FALSE;
+volatile char game_is_running = FALSE;
 
 // This is used to indicate what level we are on
 char current_level = 1;
--- worminator-3.0R2.1/player.h.speed	2006-02-25 10:33:10.000000000 +0100
+++ worminator-3.0R2.1/player.h	2006-04-24 23:10:05.000000000 +0200
@@ -2188,7 +2188,11 @@
 		if (frame_loop >= 256) done = TRUE;
 		speed_counter--;
 		}
-	render_map();
+	if (frames_to_draw) {
+		render_map();
+		frames_to_draw--;
+		}
+	while (speed_counter == 0) rest(1);
 	} while (done != TRUE);
 
 // Fade out the display and clear out some junk


Index: worminator.spec
===================================================================
RCS file: /cvs/extras/rpms/worminator/devel/worminator.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- worminator.spec	14 Mar 2006 12:33:31 -0000	1.2
+++ worminator.spec	24 Apr 2006 21:34:44 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           worminator
 Version:        3.0R2.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Sidescrolling platform and shoot'em up action-game
 Group:          Amusements/Games
 License:        GPL
@@ -8,6 +8,7 @@
 Source0:        http://download.sourceforge.net/worminator/worminator-%{version}.tar.gz
 Source1:        worminator.png
 Source2:        worminator.desktop
+Patch0:         worminator-3.0R2.1-speed.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  allegro-devel, desktop-file-utils
 Requires:       worminator-data >= 3.0R2.1-2
@@ -20,8 +21,10 @@
 
 %prep
 %setup -q
+%patch -p1 -z .speed
 %{__sed} -i 's/\r//' ReadMe.txt
 
+
 %build
 gcc $RPM_OPT_FLAGS -fsigned-char -Wno-deprecated-declarations \
   -Wno-char-subscripts -DDATADIR=\"%{_datadir}/%{name}/\" -o %{name} \
@@ -69,6 +72,10 @@
 
 
 %changelog
+* Mon Apr 24 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 3.0R2.1-3
+- Limit the framerate to 80 instead of trying to reach 160 fps,
+  hopefully this fixes bug 188337.
+
 * Tue Mar 14 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 3.0R2.1-2
 - move worminator data dir from /usr/share/games to just /usr/share to match
   the games-SIG guidelines. Sorry about the somewhat large download for



From fedora-extras-commits at redhat.com  Mon Apr 24 21:49:01 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Mon, 24 Apr 2006 14:49:01 -0700
Subject: rpms/worminator/FC-5 worminator-3.0R2.1-speed.patch, NONE,
	1.1 worminator.spec, 1.2, 1.3
Message-ID: <200604242149.k3OLn3Xj023989@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/worminator/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23969

Modified Files:
	worminator.spec 
Added Files:
	worminator-3.0R2.1-speed.patch 
Log Message:
* Mon Apr 24 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 3.0R2.1-3
- Limit the framerate to 80 instead of trying to reach 160 fps,
  hopefully this fixes bug 188337.


worminator-3.0R2.1-speed.patch:

--- NEW FILE worminator-3.0R2.1-speed.patch ---
--- worminator-3.0R2.1/demo.h.speed	2006-02-24 20:05:02.000000000 +0100
+++ worminator-3.0R2.1/demo.h	2006-04-24 23:10:05.000000000 +0200
@@ -74,8 +74,15 @@
 		speed_counter--;
 		if (keypressed()) time_to_quit = TRUE;
 		}
-	render_map();
-	if (keypressed()) time_to_quit = TRUE;
+	game_is_running = TRUE;
+	if (frames_to_draw) {
+		render_map();
+		frames_to_draw--;
+		}
+	while (speed_counter == 0) {
+		rest(1);
+		if (keypressed()) time_to_quit = TRUE;
+		}
 	} while(!time_to_quit);  // End core demo loop
 
 fclose(demofile);
--- worminator-3.0R2.1/Worminator.c.speed	2006-03-03 10:29:44.000000000 +0100
+++ worminator-3.0R2.1/Worminator.c	2006-04-24 23:25:29.000000000 +0200
@@ -269,6 +269,16 @@
 }
 END_OF_FUNCTION(increment_speed_counter);
 
+/***********************************\
+|** FRAMERATE THROTTLING FUNCTION **|
+\***********************************/
+void increment_frames_to_draw()
+{
+	if (frames_to_draw < 2)
+		frames_to_draw++;
+}
+END_OF_FUNCTION(increment_frames_to_draw);
+
 /*******************\
 |** MAIN FUNCTION **|
 \*******************/
@@ -333,7 +343,12 @@
 		if (player.timer > 0) player.timer--;
 		speed_counter--;
 		}
-	render_map();
+	game_is_running = TRUE;
+	if (frames_to_draw) {
+		render_map();
+		frames_to_draw--;
+		}
+	while (speed_counter == 0) rest(1);
 } while(time_to_quit == FALSE);  // End core game loop
 add_console_line("Core loop complete, beginning shutdown.");
 
@@ -1540,10 +1555,6 @@
 frame_counter++;
 if (frame_counter > 32768) frame_counter = 32768;
 
-// game_is_running can be changed from under us by update_animations, this
-// should be fixed but just to be sure put the check for it in the while.
-while (game_is_running && speed_counter == 0) rest(1);
-
 //set_palette_range(worminator_data_file[DEFAULT_WORMINATOR_PALLETE].dat, 0, 255, FALSE);
 }
 
@@ -3253,6 +3264,11 @@
 install_int_ex(increment_speed_counter, BPS_TO_TIMER(GAME_SPEED_NORMAL));
 change_game_speed(wormy_config.game_speed);
 
+// Set up the framerate throtteling timer
+LOCK_VARIABLE(frames_to_draw);
+LOCK_FUNCTION(increment_frames_to_draw);
+install_int_ex(increment_frames_to_draw, BPS_TO_TIMER(80));
+
 // Set up the soundz
 add_console_line("Initilizing sound");
 reset_sound();
--- worminator-3.0R2.1/globals.h.speed	2006-02-26 22:30:18.000000000 +0100
+++ worminator-3.0R2.1/globals.h	2006-04-24 23:10:05.000000000 +0200
@@ -255,9 +255,10 @@
 volatile int speed_counter = 0;
 volatile int idle_counter = 0;
 volatile int idle_speed_counter = 0;
+volatile int frames_to_draw = 0;
 
 // This is used to tell the game timer when to update and when not to
-char game_is_running = FALSE;
+volatile char game_is_running = FALSE;
 
 // This is used to indicate what level we are on
 char current_level = 1;
--- worminator-3.0R2.1/player.h.speed	2006-02-25 10:33:10.000000000 +0100
+++ worminator-3.0R2.1/player.h	2006-04-24 23:10:05.000000000 +0200
@@ -2188,7 +2188,11 @@
 		if (frame_loop >= 256) done = TRUE;
 		speed_counter--;
 		}
-	render_map();
+	if (frames_to_draw) {
+		render_map();
+		frames_to_draw--;
+		}
+	while (speed_counter == 0) rest(1);
 	} while (done != TRUE);
 
 // Fade out the display and clear out some junk


Index: worminator.spec
===================================================================
RCS file: /cvs/extras/rpms/worminator/FC-5/worminator.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- worminator.spec	14 Mar 2006 12:33:31 -0000	1.2
+++ worminator.spec	24 Apr 2006 21:49:01 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           worminator
 Version:        3.0R2.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Sidescrolling platform and shoot'em up action-game
 Group:          Amusements/Games
 License:        GPL
@@ -8,6 +8,7 @@
 Source0:        http://download.sourceforge.net/worminator/worminator-%{version}.tar.gz
 Source1:        worminator.png
 Source2:        worminator.desktop
+Patch0:         worminator-3.0R2.1-speed.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  allegro-devel, desktop-file-utils
 Requires:       worminator-data >= 3.0R2.1-2
@@ -20,8 +21,10 @@
 
 %prep
 %setup -q
+%patch -p1 -z .speed
 %{__sed} -i 's/\r//' ReadMe.txt
 
+
 %build
 gcc $RPM_OPT_FLAGS -fsigned-char -Wno-deprecated-declarations \
   -Wno-char-subscripts -DDATADIR=\"%{_datadir}/%{name}/\" -o %{name} \
@@ -69,6 +72,10 @@
 
 
 %changelog
+* Mon Apr 24 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 3.0R2.1-3
+- Limit the framerate to 80 instead of trying to reach 160 fps,
+  hopefully this fixes bug 188337.
+
 * Tue Mar 14 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 3.0R2.1-2
 - move worminator data dir from /usr/share/games to just /usr/share to match
   the games-SIG guidelines. Sorry about the somewhat large download for



From fedora-extras-commits at redhat.com  Mon Apr 24 22:05:45 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Mon, 24 Apr 2006 15:05:45 -0700
Subject: rpms/clamav/devel clamav-0.88.1-strncpy.patch, NONE,
	1.1 clamav-0.88.1-guys,
	please-read-the-compiler-warnings-before-doing-a-release.patch,
	NONE, 1.1 clamav.spec, 1.33, 1.34
Message-ID: <200604242205.k3OM5lBu026229@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26208/devel

Modified Files:
	clamav.spec 
Added Files:
	clamav-0.88.1-strncpy.patch 
	clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch 
Log Message:
- added patch which fixes some classes of compiler warnings; at least
  the using of implicitly declared functions was reported to cause
  segfaults on AMD64 (brought to my attention by Marc Perkel)
- added patch which fixes wrong usage of strncpy(3) in unrarlib.c


clamav-0.88.1-strncpy.patch:

--- NEW FILE clamav-0.88.1-strncpy.patch ---
2006-04-24  Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>

	* libclamav/unrarlib.c/stricomp(): terminate the string copied
	  with strncpy() explicitly with '\0'. Does not seem to be
	  exploitable at the moment due to deeply buried constraints
	  (function will be called for buffers with a static size of
	  260 only).

	  But it is better to fix it now than to run into problems
	  when function is used for other purposes.

--- clamav-0.88.1/libclamav/unrarlib.c.strncpy	2005-06-23 22:03:12.000000000 +0200
+++ clamav-0.88.1/libclamav/unrarlib.c	2006-04-24 23:10:07.000000000 +0200
@@ -1180,8 +1180,10 @@ int stricomp(char *Str1,char *Str2)
   char S1[512],S2[512];
   char *chptr;
 
-  strncpy(S1,Str1,sizeof(S1));
-  strncpy(S2,Str2,sizeof(S2));
+  strncpy(S1,Str1,sizeof(S1));
+  strncpy(S2,Str2,sizeof(S2));
+  S1[sizeof(S1)-1] = '\0';
+  S2[sizeof(S2)-1] = '\0';
 
   while((chptr = strchr(S1, '\\')) != NULL) /* ignore backslash             */
   {

***** Not enough context to create diffstat for file: clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch,NONE,1.1
***** Not enough context to create diff for file: clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch,NONE,1.1

Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- clamav.spec	6 Apr 2006 16:50:58 -0000	1.33
+++ clamav.spec	24 Apr 2006 22:05:44 -0000	1.34
@@ -22,7 +22,7 @@
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
 Version:	0.88.1
-Release:	%release_func 1
+Release:	%release_func 2
 
 License:	GPL
 Group:		Applications/File
@@ -36,6 +36,8 @@
 Source6:	clamav-update.logrotate
 Source7:	clamd.SERVICE.init
 Source8:	clamav-notify-servers
+Patch0:		clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch
+Patch1:		clamav-0.88.1-strncpy.patch
 Patch20:	clamav-0.70-user.patch
 Patch21:	clamav-0.70-path.patch
 Patch22:	clamav-0.80-initoff.patch
@@ -162,6 +164,9 @@
 
 %prep
 %setup -q
+%patch0  -p1 -b '.guys,please-read-the-compiler-warnings-before-doing-a-release.patch'
+%patch1  -p1 -b .strncpy
+
 %patch20 -p1 -b .user
 %patch21 -p1 -b .path
 %patch22 -p1 -b .initoff
@@ -186,6 +191,7 @@
 ## See https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 and
 ## http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0797
 ## also
+CFLAGS="$RPM_OPT_FLAGS -Wall -W -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99"
 %configure --disable-clamav --with-dbdir=/var/lib/clamav \
            --disable-zlib-vcheck \
 	   %{!?_without_milter:--enable-milter}
@@ -426,6 +432,12 @@
 %endif	# _without_milter
 
 %changelog
+* Mon Apr 24 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88.1-2
+- added patch which fixes some classes of compiler warnings; at least
+  the using of implicitly declared functions was reported to cause
+  segfaults on AMD64 (brought to my attention by Marc Perkel)
+- added patch which fixes wrong usage of strncpy(3) in unrarlib.c
+
 * Thu Apr 06 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88.1-1
 - updated to 0.88.1 (SECURITY)
 



From fedora-extras-commits at redhat.com  Mon Apr 24 22:50:39 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 24 Apr 2006 15:50:39 -0700
Subject: rpms/smb4k/devel .cvsignore, 1.6, 1.7 smb4k.spec, 1.9, 1.10 sources,
	1.6, 1.7
Message-ID: <200604242250.k3OMofat026473@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/smb4k/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26452

Modified Files:
	.cvsignore smb4k.spec sources 
Log Message:
- Updated to version 0.7.0, comment --enable-final



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smb4k/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	18 Apr 2006 19:52:01 -0000	1.6
+++ .cvsignore	24 Apr 2006 22:50:39 -0000	1.7
@@ -1 +1 @@
-smb4k-0.6.10.tar.gz
+smb4k-0.7.0.tar.bz2


Index: smb4k.spec
===================================================================
RCS file: /cvs/extras/rpms/smb4k/devel/smb4k.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- smb4k.spec	18 Apr 2006 19:52:01 -0000	1.9
+++ smb4k.spec	24 Apr 2006 22:50:39 -0000	1.10
@@ -1,12 +1,12 @@
 Name:		smb4k
-Version:	0.6.10
+Version:	0.7.0
 Release:	1%{?dist}
 Summary:	The SMB/CIFS Share Browser for KDE
 
 Group:		Applications/Internet
 License:	GPL
 URL:		http://smb4k.berlios.de/
-Source0:	http://download.berlios.de/smb4k/%{name}-%{version}.tar.gz
+Source0:	http://download.berlios.de/smb4k/%{name}-%{version}.tar.bz2
 Patch0:		smb4k-0.6.5-desktop.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -38,8 +38,9 @@
 %configure \
 	--disable-rpath \
 	--disable-debug \
-	--disable-dependency-tracking \
-	--enable-final
+	--disable-dependency-tracking
+# Broken on 0.7.0
+#	--enable-final
 make %{?_smp_mflags}
 
 %install
@@ -107,6 +108,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Apr 25 2006 Marcin Garski <mgarski[AT]post.pl> 0.7.0-1
+- Updated to version 0.7.0, comment --enable-final
+
 * Tue Apr 18 2006 Marcin Garski <mgarski[AT]post.pl> 0.6.10-1
 - Updated to version 0.6.10
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smb4k/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	18 Apr 2006 19:52:01 -0000	1.6
+++ sources	24 Apr 2006 22:50:39 -0000	1.7
@@ -1 +1 @@
-8996f1f291efef48839998f75670987f  smb4k-0.6.10.tar.gz
+a221dd7f4e206799ea52d8a249d1a2b5  smb4k-0.7.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 24 22:52:01 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 24 Apr 2006 15:52:01 -0700
Subject: rpms/smb4k/FC-5 .cvsignore, 1.6, 1.7 smb4k.spec, 1.9, 1.10 sources, 
	1.6, 1.7
Message-ID: <200604242252.k3OMq3CI026543@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/smb4k/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26522

Modified Files:
	.cvsignore smb4k.spec sources 
Log Message:
- Updated to version 0.7.0, comment --enable-final



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	18 Apr 2006 20:00:22 -0000	1.6
+++ .cvsignore	24 Apr 2006 22:52:01 -0000	1.7
@@ -1 +1 @@
-smb4k-0.6.10.tar.gz
+smb4k-0.7.0.tar.bz2


Index: smb4k.spec
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-5/smb4k.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- smb4k.spec	18 Apr 2006 20:00:22 -0000	1.9
+++ smb4k.spec	24 Apr 2006 22:52:01 -0000	1.10
@@ -1,12 +1,12 @@
 Name:		smb4k
-Version:	0.6.10
+Version:	0.7.0
 Release:	1%{?dist}
 Summary:	The SMB/CIFS Share Browser for KDE
 
 Group:		Applications/Internet
 License:	GPL
 URL:		http://smb4k.berlios.de/
-Source0:	http://download.berlios.de/smb4k/%{name}-%{version}.tar.gz
+Source0:	http://download.berlios.de/smb4k/%{name}-%{version}.tar.bz2
 Patch0:		smb4k-0.6.5-desktop.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -38,8 +38,9 @@
 %configure \
 	--disable-rpath \
 	--disable-debug \
-	--disable-dependency-tracking \
-	--enable-final
+	--disable-dependency-tracking
+# Broken on 0.7.0
+#	--enable-final
 make %{?_smp_mflags}
 
 %install
@@ -107,6 +108,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Apr 25 2006 Marcin Garski <mgarski[AT]post.pl> 0.7.0-1
+- Updated to version 0.7.0, comment --enable-final
+
 * Tue Apr 18 2006 Marcin Garski <mgarski[AT]post.pl> 0.6.10-1
 - Updated to version 0.6.10
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	18 Apr 2006 20:00:22 -0000	1.6
+++ sources	24 Apr 2006 22:52:01 -0000	1.7
@@ -1 +1 @@
-8996f1f291efef48839998f75670987f  smb4k-0.6.10.tar.gz
+a221dd7f4e206799ea52d8a249d1a2b5  smb4k-0.7.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 24 22:53:12 2006
From: fedora-extras-commits at redhat.com (Marcin Garski (mgarski))
Date: Mon, 24 Apr 2006 15:53:12 -0700
Subject: rpms/smb4k/FC-4 .cvsignore, 1.6, 1.7 smb4k.spec, 1.6, 1.7 sources,
	1.6, 1.7
Message-ID: <200604242253.k3OMrFhc026620@cvs-int.fedora.redhat.com>

Author: mgarski

Update of /cvs/extras/rpms/smb4k/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26599

Modified Files:
	.cvsignore smb4k.spec sources 
Log Message:
- Updated to version 0.7.0, comment --enable-final



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	18 Apr 2006 20:00:55 -0000	1.6
+++ .cvsignore	24 Apr 2006 22:53:12 -0000	1.7
@@ -1 +1 @@
-smb4k-0.6.10.tar.gz
+smb4k-0.7.0.tar.bz2


Index: smb4k.spec
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-4/smb4k.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- smb4k.spec	18 Apr 2006 20:00:55 -0000	1.6
+++ smb4k.spec	24 Apr 2006 22:53:12 -0000	1.7
@@ -1,12 +1,12 @@
 Name:		smb4k
-Version:	0.6.10
+Version:	0.7.0
 Release:	1%{?dist}
 Summary:	The SMB/CIFS Share Browser for KDE
 
 Group:		Applications/Internet
 License:	GPL
 URL:		http://smb4k.berlios.de/
-Source0:	http://download.berlios.de/smb4k/%{name}-%{version}.tar.gz
+Source0:	http://download.berlios.de/smb4k/%{name}-%{version}.tar.bz2
 Patch0:		smb4k-0.6.5-desktop.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -38,8 +38,9 @@
 %configure \
 	--disable-rpath \
 	--disable-debug \
-	--disable-dependency-tracking \
-	--enable-final
+	--disable-dependency-tracking
+# Broken on 0.7.0
+#	--enable-final
 make %{?_smp_mflags}
 
 %install
@@ -107,6 +108,9 @@
 %{_libdir}/*.so
 
 %changelog
+* Tue Apr 25 2006 Marcin Garski <mgarski[AT]post.pl> 0.7.0-1
+- Updated to version 0.7.0, comment --enable-final
+
 * Tue Apr 18 2006 Marcin Garski <mgarski[AT]post.pl> 0.6.10-1
 - Updated to version 0.6.10
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/smb4k/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	18 Apr 2006 20:00:55 -0000	1.6
+++ sources	24 Apr 2006 22:53:12 -0000	1.7
@@ -1 +1 @@
-8996f1f291efef48839998f75670987f  smb4k-0.6.10.tar.gz
+a221dd7f4e206799ea52d8a249d1a2b5  smb4k-0.7.0.tar.bz2



From fedora-extras-commits at redhat.com  Mon Apr 24 23:00:46 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon, 24 Apr 2006 16:00:46 -0700
Subject: rpms/tclhttpd/FC-4 tclhttpd-md5-3.5.1.patch, NONE, 1.1 tclhttpd.spec,
	1.4, 1.5
Message-ID: <200604242300.k3ON0mdi026737@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclhttpd/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26717

Modified Files:
	tclhttpd.spec 
Added Files:
	tclhttpd-md5-3.5.1.patch 
Log Message:
- Change default paths to ssl files to match Fedora default locations.
- Don't create the tclhttpd home directory when adding the user.
- Added patch for utils.tcl to prevent error due to missing md5 function.
- Don't delete the tclhttpd user when uninstalling



tclhttpd-md5-3.5.1.patch:

--- NEW FILE tclhttpd-md5-3.5.1.patch ---
Index: lib/utils.tcl
===================================================================
RCS file: /cvsroot/tclhttpd/tclhttpd/lib/utils.tcl,v
retrieving revision 1.10
retrieving revision 1.14
diff -c -r1.10 -r1.14
*** lib/utils.tcl	27 May 2004 01:25:19 -0000	1.10
--- lib/utils.tcl	22 Oct 2004 03:43:06 -0000	1.14
***************
*** 4,13 ****
  # See the file "license.terms" for information on usage and redistribution
  # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  #
! # RCS: @(#) $Id: utils.tcl,v 1.10 2004/05/27 01:25:19 coldstore Exp $
  
  package provide httpd::utils 1.0
  
  # Stderr - print to standard error
  
  proc Stderr {string} {
--- 4,15 ----
  # See the file "license.terms" for information on usage and redistribution
  # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  #
! # RCS: @(#) $Id: utils.tcl,v 1.14 2004/10/22 03:43:06 coldstore Exp $
  
  package provide httpd::utils 1.0
  
+ package require httpd::log	;# Log_SetFile
+ 
  # Stderr - print to standard error
  
  proc Stderr {string} {
***************
*** 24,30 ****
  
  proc lappendOnce {listName value} {
      upvar $listName list
!     if ![info exists list] {
  	lappend list $value
      } else {
  	set ix [lsearch $list $value]
--- 26,32 ----
  
  proc lappendOnce {listName value} {
      upvar $listName list
!     if {![info exists list]} {
  	lappend list $value
      } else {
  	set ix [lsearch $list $value]
***************
*** 106,112 ****
  
  proc ldelete {varList value} {
      upvar $varList list
!     if ![info exist list] {
  	return 0
      }
      set ix [lsearch $list $value]
--- 108,114 ----
  
  proc ldelete {varList value} {
      upvar $varList list
!     if {![info exist list]} {
  	return 0
      }
      set ix [lsearch $list $value]
***************
*** 310,316 ****
      foreach name [array names a $pat] {
  	setmax max [string length $name]
      }
!     if ![info exists max] {
  	return {}
      }
      incr max [string length $aname]
--- 312,318 ----
      foreach name [array names a $pat] {
  	setmax max [string length $name]
      }
!     if {![info exists max]} {
  	return {}
      }
      incr max [string length $aname]
***************
*** 415,421 ****
  	set hit 0
  	for {set c $limit} {$c >= 0} {incr c -1} {
  	    set char [string index $line $c]
! 	    if [regexp \[\ \t\n>/\] $char] {
  		set hit 1
  		break
  	    }
--- 417,423 ----
  	set hit 0
  	for {set c $limit} {$c >= 0} {incr c -1} {
  	    set char [string index $line $c]
! 	    if {[regexp \[\ \t\n>/\] $char]} {
  		set hit 1
  		break
  	    }
***************
*** 606,619 ****
  proc K {a b} {set a}
  proc lambda {argl body} {K [info level 0] [proc [info level 0] $argl $body]}
  
- # Tcllib 1.6 has inconsistencies with md5 1.4.3 and 2.0.0,
- # and requiring 1.0 cures later conflicts with 2.0
- # we run with whatever version is available
- # by making an aliased wrapper
- if {[package vcompare [package present md5] 2.0] > -1} {
-     # we have md5 v2 - it needs to be told to return hex
-     interp alias {} md5hex {} ::md5::md5 --hex --
- } else {
-     # we have md5 v1 - it returns hex anyway
-     interp alias {} md5hex {} ::md5::md5
- }
--- 608,610 ----


Index: tclhttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/FC-4/tclhttpd.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- tclhttpd.spec	27 Jan 2006 19:36:38 -0000	1.4
+++ tclhttpd.spec	24 Apr 2006 23:00:46 -0000	1.5
@@ -1,7 +1,7 @@
 %define contentdir %_var/www/tclhttpd
 Name: tclhttpd
 Version: 3.5.1
-Release: 8%{?dist}
+Release: 9%{?dist}
 Summary: Extensible Web+Application server written in Tcl
 
 Group: System Environment/Daemons
@@ -9,6 +9,7 @@
 URL:            http://tclhttpd.sourceforge.net/
 Source0:        http://prdownloads.sourceforge.net/tclhttpd/tclhttpd3.5.1.tar.gz
 Patch0:		tclhttpd_fedora.1.patch
+Patch1:		tclhttpd-md5-3.5.1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: tcl-devel
@@ -25,7 +26,8 @@
 
 %prep
 %setup -q -n %{name}%{version}
-%patch -p1
+%patch0 -p1
+%patch1
 
 %build
 %configure --with-serverroot=%{contentdir}
@@ -61,6 +63,10 @@
 #    It can be turned on manually if needed.
 sed -e 's/Config uid.*/Config uid tclhttpd/' \
         -e 's/Config gid.*/Config gid tclhttpd/' \
+        -e 's#Config SSL_CADIR.*#Config SSL_CADIR "/etc/pki/tls/certs/"#' \
+        -e 's#Config SSL_CAFILE.*#Config SSL_CAFILE "/etc/pki/tls/certs/ca-bundle.crt"#' \
+        -e 's#Config SSL_CERTFILE.*#Config SSL_CERTFILE     [file join [Config SSL_CADIR] tclhttpd.pem]#' \
+        -e 's#Config SSL_KEYFILE.*#Config SSL_KEYFILE     [file join [Config SSL_CADIR] tclhttpdkey.pem]#' \
         -e 's#Config LogFile.*#Config LogFile %_var/log/tclhttpd/log#' \
         -e 's/#Config Auth {}/Config Auth {}/' < bin/tclhttpd.rc > $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/tclhttpd.rc
 sed -e 's/^Debug_Url.*/#&/' < bin/httpdthread.tcl > $RPM_BUILD_ROOT/%{_datadir}/%{name}%{version}/httpdthread.tcl
@@ -90,7 +96,7 @@
 # server as "root" or "nobody".
 user_uid=`id -u tclhttpd 2>/dev/null`
 if [ x"$user_uid" = x ] ; then
-    /usr/sbin/fedora-useradd 16 -c "Tclhttpd" -s /bin/false -d %{contentdir} tclhttpd
+    /usr/sbin/fedora-useradd 16 -c "Tclhttpd" -s /bin/false -d %{contentdir} -M tclhttpd
 fi
 
 %post
@@ -104,9 +110,7 @@
 
 %postun
 
-if [ "$1" = "0" ]; then
-    /usr/sbin/fedora-userdel tclhttpd
-elif [ "$1" -ge "1" ]; then
+if [ "$1" -ge "1" ]; then
     /sbin/service tclhttpd restart >/dev/null 2>&1
 fi
 
@@ -131,32 +135,46 @@
 %ghost %{_var}/run/tclhttpd/tclhttpd.pid
 
 %changelog
+* Mon Apr 24 2006 Wart <wart at kobold.org> - 3.5.1-9
+- Change default paths to ssl files to match Fedora default locations.
+- Don't create the tclhttpd home directory when adding the user.
+- Added patch for utils.tcl to prevent error due to missing md5 function.
+- Don't delete the tclhttpd user when uninstalling
+
 * Fri Jan 27 2006 Wart <wart at kobold.org> - 3.5.1-8
 - Updated patch so that tclhttpd starts as root and then switches to
   the tclhttpd user.  This is necessary if tclhttpd is to listen
   on port 80.
+
 * Sun Jan 21 2006 Wart <wart at kobold.org> - 3.5.1-7
 - Check if the tclhttpd user exists before trying to create it
+
 * Sun Jan 15 2006 Wart <wart at kobold.org> - 3.5.1-6
 - Use ghosted files for runtime state files.
 - Update patch to remove build dependency on autoconf.
+
 * Tue Nov 22 2005 Wart <wart at kobold.org> - 3.5.1-5
 - Move bin/httpdthread.tcl out of the bin directory.
+
 * Sun Nov 20 2005 Wart <wart at kobold.org> - 3.5.1-4
 - Use fedora_useradd/fedora_userdel to create/delete the tclhttpd user.
 - Added BuildRequires: autoconf.
 - Clean up file permissions to remove many rpmlint warnings.
+
 * Thu Jul 7 2005 <wart at kobold.org> - 3.5.1-3
 - Add 'restart' in the rpm postun stage.  Add post/preun requirements
   for /sbin/chkconfig and /sbin/service.
 - Changed the default runlevel in the init script to '-' to prevent the
   service from being started by default.
+
 * Thu Jun 30 2005 <wart at kobold.org> - 3.5.1-2
 - Updated release tag to include %{dist}
 - Don't include changes to the spec in the patchfile.
 - run autoreconf in the prep stage, not the build stage.
+
 * Fri Jun 17 2005 <wart at kobold.org> - 3.5.1-1
 - Updated spec file to conform to Fedora Core 4 standards.
+
 * Sat Nov 13 2004 <wart at kobold.org> - 3.5.1-0.fdr.8
 - Change content directory again to prevent rpmlint warnings.
 - Change ownership of content directory to prevent rpmlint warnings.
@@ -164,13 +182,16 @@
 - Move crypt and limit dynamically loadable modules into the proper
   subdirectories
 - Turn off potentially insecure debug url.
+
 * Sun Nov 7 2004 <wart at kobold.org> - 3.5.1-0.fdr.7
 - Change content directory to /var/tclhttpd
 - Move logs to /var/log/tclhttpd
 - Remove the debug auth password.
+
 * Wed Nov 3 2004 <wart at kobold.org> - 3.5.1-0.fdr.6
 - Add missing #include <crypt.h> to crypt.c to fix a segfault on
   x86_64.
+
 * Sat Oct 30 2004 <wart at kobold.org> - 3.5.1-0.fdr.5
 - Add expect to the dependency list.
 - Let tclhttpd fork into the background if either one of tclx
@@ -178,15 +199,19 @@
 - Add existing docs to %doc list.
 - Move configuration file to /etc/tclhttpd.
 - Clean up some rpmlint warnings
+
 * Sun Oct 24 2004 <wart at kobold.org> - 3.5.1-0.fdr.4
 - Change package group in the specfile.  Add tcllib to dependency list.
   Remove tclhttpd user during uninstall.
+
 * Wed Oct 6 2004 <wart at kobold.org> - 3.5.1-0.fdr.3
 - Fix bug in the /etc/init.d/tclhttpd startup script that was causing
   it to kill a random tclsh process during shutdown, and misreporting
   the status of tclhttpd.
+
 * Tue Sep 21 2004 <wart at kobold.org> - 3.5.1-0.fdr.2
 - remove hardcoded path in the %build section of the rpm spec file.
+
 * Sun Sep 12 2004 <wart at kobold.org> - 3.5.1-0.fdr.1
 - Initial rpm with a Fedora-compatible spec file.  Included patch
   for better /etc/init.d script behaviour.



From fedora-extras-commits at redhat.com  Mon Apr 24 23:30:16 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon, 24 Apr 2006 16:30:16 -0700
Subject: rpms/tclhttpd/FC-5 tclhttpd.spec,1.6,1.7
Message-ID: <200604242330.k3ONUIna028973@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclhttpd/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28956

Modified Files:
	tclhttpd.spec 
Log Message:
- Change default paths to ssl files to match Fedora default locations.
- Don't delete the tclhttpd user when uninstalling




Index: tclhttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/FC-5/tclhttpd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tclhttpd.spec	2 Apr 2006 20:12:42 -0000	1.6
+++ tclhttpd.spec	24 Apr 2006 23:30:16 -0000	1.7
@@ -1,7 +1,7 @@
 %define contentdir %_var/www/tclhttpd
 Name: tclhttpd
 Version: 3.5.1
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: Extensible Web+Application server written in Tcl
 
 Group: System Environment/Daemons
@@ -63,6 +63,10 @@
 #    It can be turned on manually if needed.
 sed -e 's/Config uid.*/Config uid tclhttpd/' \
         -e 's/Config gid.*/Config gid tclhttpd/' \
+        -e 's#Config SSL_CADIR.*#Config SSL_CADIR "/etc/pki/tls/certs/"#' \
+        -e 's#Config SSL_CAFILE.*#Config SSL_CAFILE "/etc/pki/tls/certs/ca-bundle.crt"#' \
+        -e 's#Config SSL_CERTFILE.*#Config SSL_CERTFILE     [file join [Config SSL_CADIR] tclhttpd.pem]#' \
+        -e 's#Config SSL_KEYFILE.*#Config SSL_KEYFILE     [file join [Config SSL_CADIR] tclhttpdkey.pem]#' \
         -e 's#Config LogFile.*#Config LogFile %_var/log/tclhttpd/log#' \
         -e 's/#Config Auth {}/Config Auth {}/' < bin/tclhttpd.rc > $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/tclhttpd.rc
 sed -e 's/^Debug_Url.*/#&/' < bin/httpdthread.tcl > $RPM_BUILD_ROOT/%{_datadir}/%{name}%{version}/httpdthread.tcl
@@ -106,9 +110,7 @@
 
 %postun
 
-if [ "$1" = "0" ]; then
-    /usr/sbin/fedora-userdel tclhttpd
-elif [ "$1" -ge "1" ]; then
+if [ "$1" -ge "1" ]; then
     /sbin/service tclhttpd restart >/dev/null 2>&1
 fi
 
@@ -133,6 +135,10 @@
 %ghost %{_var}/run/tclhttpd/tclhttpd.pid
 
 %changelog
+* Mon Apr 24 2006 Wart <wart at kobold.org> - 3.5.1-12
+- Change default paths to ssl files to match Fedora default locations.
+- Don't delete the tclhttpd user when uninstalling
+
 * Fri Mar 31 2006 Wart <wart at kobold.org> - 3.5.1-11
 - Don't create the tclhttpd home directory when adding the user.
 - Added patch to disable [fork] if we're running in a threaded Tcl.



From fedora-extras-commits at redhat.com  Mon Apr 24 23:31:30 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Mon, 24 Apr 2006 16:31:30 -0700
Subject: rpms/tclhttpd/devel tclhttpd.spec,1.6,1.7
Message-ID: <200604242331.k3ONVWlk029044@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/tclhttpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29027

Modified Files:
	tclhttpd.spec 
Log Message:
- Change default paths to ssl files to match Fedora default locations.
- Don't delete the tclhttpd user when uninstalling




Index: tclhttpd.spec
===================================================================
RCS file: /cvs/extras/rpms/tclhttpd/devel/tclhttpd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tclhttpd.spec	2 Apr 2006 20:08:06 -0000	1.6
+++ tclhttpd.spec	24 Apr 2006 23:31:30 -0000	1.7
@@ -1,7 +1,7 @@
 %define contentdir %_var/www/tclhttpd
 Name: tclhttpd
 Version: 3.5.1
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: Extensible Web+Application server written in Tcl
 
 Group: System Environment/Daemons
@@ -37,8 +37,7 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# Override the names of the library files so that rpm does not try to think
-# that this is a library package.
+
 make install DESTDIR=$RPM_BUILD_ROOT
 install -p -D bin/redhat.init.tclhttpd $RPM_BUILD_ROOT/%{_initrddir}/tclhttpd
 mkdir -p $RPM_BUILD_ROOT%_var/run/tclhttpd
@@ -64,6 +63,10 @@
 #    It can be turned on manually if needed.
 sed -e 's/Config uid.*/Config uid tclhttpd/' \
         -e 's/Config gid.*/Config gid tclhttpd/' \
+        -e 's#Config SSL_CADIR.*#Config SSL_CADIR "/etc/pki/tls/certs/"#' \
+        -e 's#Config SSL_CAFILE.*#Config SSL_CAFILE "/etc/pki/tls/certs/ca-bundle.crt"#' \
+        -e 's#Config SSL_CERTFILE.*#Config SSL_CERTFILE     [file join [Config SSL_CADIR] tclhttpd.pem]#' \
+        -e 's#Config SSL_KEYFILE.*#Config SSL_KEYFILE     [file join [Config SSL_CADIR] tclhttpdkey.pem]#' \
         -e 's#Config LogFile.*#Config LogFile %_var/log/tclhttpd/log#' \
         -e 's/#Config Auth {}/Config Auth {}/' < bin/tclhttpd.rc > $RPM_BUILD_ROOT/%{_sysconfdir}/%{name}/tclhttpd.rc
 sed -e 's/^Debug_Url.*/#&/' < bin/httpdthread.tcl > $RPM_BUILD_ROOT/%{_datadir}/%{name}%{version}/httpdthread.tcl
@@ -107,9 +110,7 @@
 
 %postun
 
-if [ "$1" = "0" ]; then
-    /usr/sbin/fedora-userdel tclhttpd
-elif [ "$1" -ge "1" ]; then
+if [ "$1" -ge "1" ]; then
     /sbin/service tclhttpd restart >/dev/null 2>&1
 fi
 
@@ -134,6 +135,10 @@
 %ghost %{_var}/run/tclhttpd/tclhttpd.pid
 
 %changelog
+* Mon Apr 24 2006 Wart <wart at kobold.org> - 3.5.1-12
+- Change default paths to ssl files to match Fedora default locations.
+- Don't delete the tclhttpd user when uninstalling
+
 * Fri Mar 31 2006 Wart <wart at kobold.org> - 3.5.1-11
 - Don't create the tclhttpd home directory when adding the user.
 - Added patch to disable [fork] if we're running in a threaded Tcl.



From fedora-extras-commits at redhat.com  Tue Apr 25 00:29:50 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 17:29:50 -0700
Subject: rpms/perl-Lingua-EN-Inflect-Number/devel
	perl-Lingua-EN-Inflect-Number.spec, 1.1, 1.2
Message-ID: <200604250029.k3P0Tqtg031428@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Lingua-EN-Inflect-Number/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31360/devel

Modified Files:
	perl-Lingua-EN-Inflect-Number.spec 
Log Message:

Fix license, contacted author.



Index: perl-Lingua-EN-Inflect-Number.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Lingua-EN-Inflect-Number/devel/perl-Lingua-EN-Inflect-Number.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Lingua-EN-Inflect-Number.spec	30 Jul 2005 03:14:13 -0000	1.1
+++ perl-Lingua-EN-Inflect-Number.spec	25 Apr 2006 00:29:50 -0000	1.2
@@ -1,10 +1,9 @@
 Name:           perl-Lingua-EN-Inflect-Number
 Version:        1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Force number of words to singular or plural
 Group:          Development/Libraries
-License:        Distributable
-#License:        GPL or Artistic
+License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Lingua-EN-Inflect-Number/
 Source0:        http://search.cpan.org/CPAN/authors/id/S/SI/SIMON/Lingua-EN-Inflect-Number-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,6 +44,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-4
+- confirmed license with upstream author
+
 * Fri Jul 29 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-3
 - remove superfluous Requires: perl(Lingua::EN::Inflect)
 - set License to Distributable until we know better



From fedora-extras-commits at redhat.com  Tue Apr 25 00:29:49 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 17:29:49 -0700
Subject: rpms/perl-Lingua-EN-Inflect-Number/FC-4
	perl-Lingua-EN-Inflect-Number.spec, 1.1, 1.2
Message-ID: <200604250029.k3P0TpIV031420@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Lingua-EN-Inflect-Number/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31360/FC-4

Modified Files:
	perl-Lingua-EN-Inflect-Number.spec 
Log Message:

Fix license, contacted author.



Index: perl-Lingua-EN-Inflect-Number.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Lingua-EN-Inflect-Number/FC-4/perl-Lingua-EN-Inflect-Number.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Lingua-EN-Inflect-Number.spec	30 Jul 2005 03:14:13 -0000	1.1
+++ perl-Lingua-EN-Inflect-Number.spec	25 Apr 2006 00:29:49 -0000	1.2
@@ -1,10 +1,9 @@
 Name:           perl-Lingua-EN-Inflect-Number
 Version:        1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Force number of words to singular or plural
 Group:          Development/Libraries
-License:        Distributable
-#License:        GPL or Artistic
+License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Lingua-EN-Inflect-Number/
 Source0:        http://search.cpan.org/CPAN/authors/id/S/SI/SIMON/Lingua-EN-Inflect-Number-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,6 +44,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-4
+- confirmed license with upstream author
+
 * Fri Jul 29 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-3
 - remove superfluous Requires: perl(Lingua::EN::Inflect)
 - set License to Distributable until we know better



From fedora-extras-commits at redhat.com  Tue Apr 25 00:29:50 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 17:29:50 -0700
Subject: rpms/perl-Lingua-EN-Inflect-Number/FC-5
	perl-Lingua-EN-Inflect-Number.spec, 1.1, 1.2
Message-ID: <200604250029.k3P0TqV4031424@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Lingua-EN-Inflect-Number/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31360/FC-5

Modified Files:
	perl-Lingua-EN-Inflect-Number.spec 
Log Message:

Fix license, contacted author.



Index: perl-Lingua-EN-Inflect-Number.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Lingua-EN-Inflect-Number/FC-5/perl-Lingua-EN-Inflect-Number.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Lingua-EN-Inflect-Number.spec	30 Jul 2005 03:14:13 -0000	1.1
+++ perl-Lingua-EN-Inflect-Number.spec	25 Apr 2006 00:29:49 -0000	1.2
@@ -1,10 +1,9 @@
 Name:           perl-Lingua-EN-Inflect-Number
 Version:        1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Force number of words to singular or plural
 Group:          Development/Libraries
-License:        Distributable
-#License:        GPL or Artistic
+License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Lingua-EN-Inflect-Number/
 Source0:        http://search.cpan.org/CPAN/authors/id/S/SI/SIMON/Lingua-EN-Inflect-Number-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,6 +44,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-4
+- confirmed license with upstream author
+
 * Fri Jul 29 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-3
 - remove superfluous Requires: perl(Lingua::EN::Inflect)
 - set License to Distributable until we know better



From fedora-extras-commits at redhat.com  Tue Apr 25 00:29:48 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 17:29:48 -0700
Subject: rpms/perl-Lingua-EN-Inflect-Number/FC-3
	perl-Lingua-EN-Inflect-Number.spec, 1.1, 1.2
Message-ID: <200604250030.k3P0UK5u031433@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Lingua-EN-Inflect-Number/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31360/FC-3

Modified Files:
	perl-Lingua-EN-Inflect-Number.spec 
Log Message:

Fix license, contacted author.



Index: perl-Lingua-EN-Inflect-Number.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Lingua-EN-Inflect-Number/FC-3/perl-Lingua-EN-Inflect-Number.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Lingua-EN-Inflect-Number.spec	30 Jul 2005 03:14:13 -0000	1.1
+++ perl-Lingua-EN-Inflect-Number.spec	25 Apr 2006 00:29:48 -0000	1.2
@@ -1,10 +1,9 @@
 Name:           perl-Lingua-EN-Inflect-Number
 Version:        1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Force number of words to singular or plural
 Group:          Development/Libraries
-License:        Distributable
-#License:        GPL or Artistic
+License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Lingua-EN-Inflect-Number/
 Source0:        http://search.cpan.org/CPAN/authors/id/S/SI/SIMON/Lingua-EN-Inflect-Number-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,6 +44,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-4
+- confirmed license with upstream author
+
 * Fri Jul 29 2005 Tom "spot" Callaway <tcallawa at redhat.com> 1.1-3
 - remove superfluous Requires: perl(Lingua::EN::Inflect)
 - set License to Distributable until we know better



From fedora-extras-commits at redhat.com  Tue Apr 25 00:40:07 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 17:40:07 -0700
Subject: rpms/perl-Class-DBI-Loader-Relationship/devel
	perl-Class-DBI-Loader-Relationship.spec, 1.2, 1.3
Message-ID: <200604250040.k3P0e98H031681@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31617/devel

Modified Files:
	perl-Class-DBI-Loader-Relationship.spec 
Log Message:

Fix license here too.



Index: perl-Class-DBI-Loader-Relationship.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/devel/perl-Class-DBI-Loader-Relationship.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-DBI-Loader-Relationship.spec	9 Jan 2006 23:09:12 -0000	1.2
+++ perl-Class-DBI-Loader-Relationship.spec	25 Apr 2006 00:40:07 -0000	1.3
@@ -1,9 +1,9 @@
 Name:           perl-Class-DBI-Loader-Relationship
 Version:        1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Easier relationship specification in CDBI::L
 Group:          Development/Libraries
-License:        Distributable
+License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Class-DBI-Loader-Relationship/
 Source0:        http://search.cpan.org/CPAN/authors/id/S/SI/SIMON/Class-DBI-Loader-Relationship-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.3-2
+- correct license, should be GPL or Artistic
+
 * Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.3-1
 - bump to 1.3
 



From fedora-extras-commits at redhat.com  Tue Apr 25 00:40:00 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 17:40:00 -0700
Subject: rpms/perl-Class-DBI-Loader-Relationship/FC-3
	perl-Class-DBI-Loader-Relationship.spec, 1.2, 1.3
Message-ID: <200604250040.k3P0eWla031684@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31617/FC-3

Modified Files:
	perl-Class-DBI-Loader-Relationship.spec 
Log Message:

Fix license here too.



Index: perl-Class-DBI-Loader-Relationship.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/FC-3/perl-Class-DBI-Loader-Relationship.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-DBI-Loader-Relationship.spec	9 Jan 2006 23:08:17 -0000	1.2
+++ perl-Class-DBI-Loader-Relationship.spec	25 Apr 2006 00:40:00 -0000	1.3
@@ -1,9 +1,9 @@
 Name:           perl-Class-DBI-Loader-Relationship
 Version:        1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Easier relationship specification in CDBI::L
 Group:          Development/Libraries
-License:        Distributable
+License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Class-DBI-Loader-Relationship/
 Source0:        http://search.cpan.org/CPAN/authors/id/S/SI/SIMON/Class-DBI-Loader-Relationship-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.3-2
+- correct license, should be GPL or Artistic
+
 * Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.3-1
 - bump to 1.3
 



From fedora-extras-commits at redhat.com  Tue Apr 25 00:40:01 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 17:40:01 -0700
Subject: rpms/perl-Class-DBI-Loader-Relationship/FC-4
	perl-Class-DBI-Loader-Relationship.spec, 1.2, 1.3
Message-ID: <200604250040.k3P0eXBd031687@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31617/FC-4

Modified Files:
	perl-Class-DBI-Loader-Relationship.spec 
Log Message:

Fix license here too.



Index: perl-Class-DBI-Loader-Relationship.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/FC-4/perl-Class-DBI-Loader-Relationship.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-DBI-Loader-Relationship.spec	9 Jan 2006 23:08:41 -0000	1.2
+++ perl-Class-DBI-Loader-Relationship.spec	25 Apr 2006 00:40:01 -0000	1.3
@@ -1,9 +1,9 @@
 Name:           perl-Class-DBI-Loader-Relationship
 Version:        1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Easier relationship specification in CDBI::L
 Group:          Development/Libraries
-License:        Distributable
+License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Class-DBI-Loader-Relationship/
 Source0:        http://search.cpan.org/CPAN/authors/id/S/SI/SIMON/Class-DBI-Loader-Relationship-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.3-2
+- correct license, should be GPL or Artistic
+
 * Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.3-1
 - bump to 1.3
 



From fedora-extras-commits at redhat.com  Tue Apr 25 00:40:01 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 17:40:01 -0700
Subject: rpms/perl-Class-DBI-Loader-Relationship/FC-5
	perl-Class-DBI-Loader-Relationship.spec, 1.2, 1.3
Message-ID: <200604250040.k3P0eXOB031690@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31617/FC-5

Modified Files:
	perl-Class-DBI-Loader-Relationship.spec 
Log Message:

Fix license here too.



Index: perl-Class-DBI-Loader-Relationship.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Loader-Relationship/FC-5/perl-Class-DBI-Loader-Relationship.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-DBI-Loader-Relationship.spec	9 Jan 2006 23:09:12 -0000	1.2
+++ perl-Class-DBI-Loader-Relationship.spec	25 Apr 2006 00:40:01 -0000	1.3
@@ -1,9 +1,9 @@
 Name:           perl-Class-DBI-Loader-Relationship
 Version:        1.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Easier relationship specification in CDBI::L
 Group:          Development/Libraries
-License:        Distributable
+License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Class-DBI-Loader-Relationship/
 Source0:        http://search.cpan.org/CPAN/authors/id/S/SI/SIMON/Class-DBI-Loader-Relationship-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -44,6 +44,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.3-2
+- correct license, should be GPL or Artistic
+
 * Mon Jan  9 2006 Tom "spot" Callaway <tcallawa at redhat.com> 1.3-1
 - bump to 1.3
 



From fedora-extras-commits at redhat.com  Tue Apr 25 00:46:30 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 17:46:30 -0700
Subject: rpms/perl-UNIVERSAL-exports/FC-5 perl-UNIVERSAL-exports.spec, 1.1,
	1.2
Message-ID: <200604250046.k3P0kWxs031918@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-UNIVERSAL-exports/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31857/FC-5

Modified Files:
	perl-UNIVERSAL-exports.spec 
Log Message:

Trust debian on the license based on email correspondance.



Index: perl-UNIVERSAL-exports.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-UNIVERSAL-exports/FC-5/perl-UNIVERSAL-exports.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-UNIVERSAL-exports.spec	14 Aug 2005 18:50:51 -0000	1.1
+++ perl-UNIVERSAL-exports.spec	25 Apr 2006 00:46:30 -0000	1.2
@@ -1,10 +1,9 @@
 Name:           perl-UNIVERSAL-exports
 Version:        0.03
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Lightweight, universal exporting of variables
 Group:          Development/Libraries
-# This is likely GPL or Artistic, like perl, but it cannot be confirmed.
-License:        Distributable
+License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/UNIVERSAL-exports/
 Source0:        http://search.cpan.org/CPAN/authors/id/M/MS/MSCHWERN/UNIVERSAL-exports-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,6 +44,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.03-4
+- debian has license confirmation from 2002, we'll trust that
+
 * Sun Aug 14 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.03-3
 - change license to Distributable, since upstream never replied to 
   license confirmation



From fedora-extras-commits at redhat.com  Tue Apr 25 00:46:31 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 17:46:31 -0700
Subject: rpms/perl-UNIVERSAL-exports/devel perl-UNIVERSAL-exports.spec, 1.1, 
	1.2
Message-ID: <200604250046.k3P0kXqv031922@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-UNIVERSAL-exports/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31857/devel

Modified Files:
	perl-UNIVERSAL-exports.spec 
Log Message:

Trust debian on the license based on email correspondance.



Index: perl-UNIVERSAL-exports.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-UNIVERSAL-exports/devel/perl-UNIVERSAL-exports.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-UNIVERSAL-exports.spec	14 Aug 2005 18:50:51 -0000	1.1
+++ perl-UNIVERSAL-exports.spec	25 Apr 2006 00:46:31 -0000	1.2
@@ -1,10 +1,9 @@
 Name:           perl-UNIVERSAL-exports
 Version:        0.03
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Lightweight, universal exporting of variables
 Group:          Development/Libraries
-# This is likely GPL or Artistic, like perl, but it cannot be confirmed.
-License:        Distributable
+License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/UNIVERSAL-exports/
 Source0:        http://search.cpan.org/CPAN/authors/id/M/MS/MSCHWERN/UNIVERSAL-exports-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,6 +44,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.03-4
+- debian has license confirmation from 2002, we'll trust that
+
 * Sun Aug 14 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.03-3
 - change license to Distributable, since upstream never replied to 
   license confirmation



From fedora-extras-commits at redhat.com  Tue Apr 25 00:46:24 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 17:46:24 -0700
Subject: rpms/perl-UNIVERSAL-exports/FC-3 perl-UNIVERSAL-exports.spec, 1.1,
	1.2
Message-ID: <200604250046.k3P0ku0w031925@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-UNIVERSAL-exports/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31857/FC-3

Modified Files:
	perl-UNIVERSAL-exports.spec 
Log Message:

Trust debian on the license based on email correspondance.



Index: perl-UNIVERSAL-exports.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-UNIVERSAL-exports/FC-3/perl-UNIVERSAL-exports.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-UNIVERSAL-exports.spec	14 Aug 2005 18:50:51 -0000	1.1
+++ perl-UNIVERSAL-exports.spec	25 Apr 2006 00:46:24 -0000	1.2
@@ -1,10 +1,9 @@
 Name:           perl-UNIVERSAL-exports
 Version:        0.03
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Lightweight, universal exporting of variables
 Group:          Development/Libraries
-# This is likely GPL or Artistic, like perl, but it cannot be confirmed.
-License:        Distributable
+License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/UNIVERSAL-exports/
 Source0:        http://search.cpan.org/CPAN/authors/id/M/MS/MSCHWERN/UNIVERSAL-exports-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,6 +44,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.03-4
+- debian has license confirmation from 2002, we'll trust that
+
 * Sun Aug 14 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.03-3
 - change license to Distributable, since upstream never replied to 
   license confirmation



From fedora-extras-commits at redhat.com  Tue Apr 25 00:46:25 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 17:46:25 -0700
Subject: rpms/perl-UNIVERSAL-exports/FC-4 perl-UNIVERSAL-exports.spec, 1.1,
	1.2
Message-ID: <200604250046.k3P0kvFK031928@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-UNIVERSAL-exports/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31857/FC-4

Modified Files:
	perl-UNIVERSAL-exports.spec 
Log Message:

Trust debian on the license based on email correspondance.



Index: perl-UNIVERSAL-exports.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-UNIVERSAL-exports/FC-4/perl-UNIVERSAL-exports.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-UNIVERSAL-exports.spec	14 Aug 2005 18:50:51 -0000	1.1
+++ perl-UNIVERSAL-exports.spec	25 Apr 2006 00:46:24 -0000	1.2
@@ -1,10 +1,9 @@
 Name:           perl-UNIVERSAL-exports
 Version:        0.03
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Lightweight, universal exporting of variables
 Group:          Development/Libraries
-# This is likely GPL or Artistic, like perl, but it cannot be confirmed.
-License:        Distributable
+License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/UNIVERSAL-exports/
 Source0:        http://search.cpan.org/CPAN/authors/id/M/MS/MSCHWERN/UNIVERSAL-exports-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -45,6 +44,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.03-4
+- debian has license confirmation from 2002, we'll trust that
+
 * Sun Aug 14 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.03-3
 - change license to Distributable, since upstream never replied to 
   license confirmation



From fedora-extras-commits at redhat.com  Tue Apr 25 00:55:04 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 17:55:04 -0700
Subject: rpms/perl-Class-DBI-Pager/devel .cvsignore, 1.3,
	1.4 perl-Class-DBI-Pager.spec, 1.2, 1.3 sources, 1.3, 1.4
Message-ID: <200604250055.k3P0t6ZH032180@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Pager/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32111/devel

Modified Files:
	.cvsignore perl-Class-DBI-Pager.spec sources 
Log Message:

bump to 0.08



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pager/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Jan 2006 18:00:47 -0000	1.3
+++ .cvsignore	25 Apr 2006 00:55:04 -0000	1.4
@@ -1,2 +1,3 @@
 Class-DBI-Pager-0.06.tar.gz
 Class-DBI-Pager-0.07.tar.gz
+Class-DBI-Pager-0.08.tar.gz


Index: perl-Class-DBI-Pager.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pager/devel/perl-Class-DBI-Pager.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-DBI-Pager.spec	10 Jan 2006 18:00:47 -0000	1.2
+++ perl-Class-DBI-Pager.spec	25 Apr 2006 00:55:04 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-Class-DBI-Pager
-Version:        0.07
+Version:        0.08
 Release:        1%{?dist}
 Summary:        Pager utility for Class::DBI
 Group:          Development/Libraries
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.08-1
+- bump to 0.08
+
 * Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.07-1
 - bump to 0.07
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pager/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Jan 2006 18:00:47 -0000	1.3
+++ sources	25 Apr 2006 00:55:04 -0000	1.4
@@ -1 +1 @@
-611f9bc30b03b8101de4b1e45bb6cc0f  Class-DBI-Pager-0.07.tar.gz
+d6b462ecc6439728a209ec5ec0192b0c  Class-DBI-Pager-0.08.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 00:54:57 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 17:54:57 -0700
Subject: rpms/perl-Class-DBI-Pager/FC-3 perl-Class-DBI-Pager.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200604250055.k3P0tTfP032189@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Pager/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32111/FC-3

Modified Files:
	perl-Class-DBI-Pager.spec sources 
Log Message:

bump to 0.08



Index: perl-Class-DBI-Pager.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pager/FC-3/perl-Class-DBI-Pager.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-DBI-Pager.spec	10 Jan 2006 18:00:35 -0000	1.2
+++ perl-Class-DBI-Pager.spec	25 Apr 2006 00:54:57 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-Class-DBI-Pager
-Version:        0.07
+Version:        0.08
 Release:        1%{?dist}
 Summary:        Pager utility for Class::DBI
 Group:          Development/Libraries
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.08-1
+- bump to 0.08
+
 * Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.07-1
 - bump to 0.07
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pager/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Jan 2006 18:00:35 -0000	1.3
+++ sources	25 Apr 2006 00:54:57 -0000	1.4
@@ -1 +1 @@
-611f9bc30b03b8101de4b1e45bb6cc0f  Class-DBI-Pager-0.07.tar.gz
+d6b462ecc6439728a209ec5ec0192b0c  Class-DBI-Pager-0.08.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 00:54:59 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 17:54:59 -0700
Subject: rpms/perl-Class-DBI-Pager/FC-5 perl-Class-DBI-Pager.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200604250055.k3P0tVg4032198@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Pager/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32111/FC-5

Modified Files:
	perl-Class-DBI-Pager.spec sources 
Log Message:

bump to 0.08



Index: perl-Class-DBI-Pager.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pager/FC-5/perl-Class-DBI-Pager.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-DBI-Pager.spec	10 Jan 2006 18:00:47 -0000	1.2
+++ perl-Class-DBI-Pager.spec	25 Apr 2006 00:54:58 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-Class-DBI-Pager
-Version:        0.07
+Version:        0.08
 Release:        1%{?dist}
 Summary:        Pager utility for Class::DBI
 Group:          Development/Libraries
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.08-1
+- bump to 0.08
+
 * Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.07-1
 - bump to 0.07
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pager/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Jan 2006 18:00:47 -0000	1.3
+++ sources	25 Apr 2006 00:54:58 -0000	1.4
@@ -1 +1 @@
-611f9bc30b03b8101de4b1e45bb6cc0f  Class-DBI-Pager-0.07.tar.gz
+d6b462ecc6439728a209ec5ec0192b0c  Class-DBI-Pager-0.08.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 00:54:58 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 17:54:58 -0700
Subject: rpms/perl-Class-DBI-Pager/FC-4 perl-Class-DBI-Pager.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200604250055.k3P0tU40032193@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Class-DBI-Pager/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32111/FC-4

Modified Files:
	perl-Class-DBI-Pager.spec sources 
Log Message:

bump to 0.08



Index: perl-Class-DBI-Pager.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pager/FC-4/perl-Class-DBI-Pager.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-Class-DBI-Pager.spec	10 Jan 2006 18:00:41 -0000	1.2
+++ perl-Class-DBI-Pager.spec	25 Apr 2006 00:54:58 -0000	1.3
@@ -1,5 +1,5 @@
 Name:           perl-Class-DBI-Pager
-Version:        0.07
+Version:        0.08
 Release:        1%{?dist}
 Summary:        Pager utility for Class::DBI
 Group:          Development/Libraries
@@ -45,6 +45,9 @@
 
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.08-1
+- bump to 0.08
+
 * Tue Jan 10 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.07-1
 - bump to 0.07
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Class-DBI-Pager/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Jan 2006 18:00:41 -0000	1.3
+++ sources	25 Apr 2006 00:54:58 -0000	1.4
@@ -1 +1 @@
-611f9bc30b03b8101de4b1e45bb6cc0f  Class-DBI-Pager-0.07.tar.gz
+d6b462ecc6439728a209ec5ec0192b0c  Class-DBI-Pager-0.08.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 00:57:16 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Mon, 24 Apr 2006 17:57:16 -0700
Subject: owners owners.list,1.888,1.889
Message-ID: <200604250057.k3P0vIc1032317@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32214

Modified Files:
	owners.list 
Log Message:
taking ownership of screem



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.888
retrieving revision 1.889
diff -u -r1.888 -r1.889
--- owners.list	24 Apr 2006 18:06:26 -0000	1.888
+++ owners.list	25 Apr 2006 00:57:16 -0000	1.889
@@ -1377,7 +1377,7 @@
 Fedora Extras|scons|An Open Source software construction tool|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|scorched3d|A game based loosely on the classic DOS game Scorched Earth|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|scponly|Restricted shell for ssh based file services|wtogami at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|screem|A website development enviroment|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|screem|A website development enviroment|michael at knox.net.nz|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|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|scrub|Disk scrubbing program|tcallawa at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Apr 25 01:00:50 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 24 Apr 2006 18:00:50 -0700
Subject: rpms/perl-Cairo - New directory
Message-ID: <200604250100.k3P10qvS032502@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Cairo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32473/perl-Cairo

Log Message:
Directory /cvs/extras/rpms/perl-Cairo added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 25 01:00:51 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 24 Apr 2006 18:00:51 -0700
Subject: rpms/perl-Cairo/devel - New directory
Message-ID: <200604250100.k3P10rvo032505@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Cairo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32473/perl-Cairo/devel

Log Message:
Directory /cvs/extras/rpms/perl-Cairo/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 25 01:01:13 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 24 Apr 2006 18:01:13 -0700
Subject: rpms/perl-Cairo/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604250101.k3P11F2m002164@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Cairo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2109/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Cairo


--- 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 Apr 25 01:01:12 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 24 Apr 2006 18:01:12 -0700
Subject: rpms/perl-Cairo Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604250101.k3P11EQr002154@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Cairo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2109

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Cairo


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Cairo
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Tue Apr 25 01:02:21 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 24 Apr 2006 18:02:21 -0700
Subject: rpms/perl-Cairo import.log,1.1,1.2
Message-ID: <200604250102.k3P12tWL002244@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Cairo
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2210

Modified Files:
	import.log 
Log Message:
auto-import perl-Cairo-0.03-2 on branch devel from perl-Cairo-0.03-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Cairo/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Apr 2006 01:01:12 -0000	1.1
+++ import.log	25 Apr 2006 01:02:21 -0000	1.2
@@ -0,0 +1 @@
+perl-Cairo-0_03-2:HEAD:perl-Cairo-0.03-2.src.rpm:1145926925



From fedora-extras-commits at redhat.com  Tue Apr 25 01:02:24 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 24 Apr 2006 18:02:24 -0700
Subject: rpms/perl-Cairo/devel perl-Cairo.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604250102.k3P12wGH002246@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Cairo/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2210/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Cairo.spec 
Log Message:
auto-import perl-Cairo-0.03-2 on branch devel from perl-Cairo-0.03-2.src.rpm


--- NEW FILE perl-Cairo.spec ---
#
# Rebuild option:
#
#   --with testsuite         - run the test suite
#

Name:           perl-Cairo
Version:        0.03
Release:        2%{?dist}
Summary:        Perl interface to the cairo library

Group:          Development/Libraries
License:        LGPL
URL:            http://search.cpan.org/dist/Cairo/
Source0:        http://www.cpan.org/authors/id/T/TS/TSCH/Cairo-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  perl(ExtUtils::Depends), perl(ExtUtils::PkgConfig)
BuildRequires:  cairo-devel >= 1.0.0
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Cairo provides Perl bindings for the vector graphics library cairo.
It supports multiple output targets, including the X Window Systems,
PDF, and PNG.  Cairo produces identical output on all those targets
and makes use of hardware acceleration wherever possible.


%prep
%setup -q -n Cairo-%{version}
chmod 644 examples/simple.pl


%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 ChangeLog LICENSE NEWS README TODO examples/
%{perl_vendorarch}/Cairo*
%{perl_vendorarch}/auto/Cairo/
%{_mandir}/man3/*.3*


%changelog
* Tue Apr 18 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.03-2
- Disabled the test suite as it fails in mock.

* Sun Mar 19 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.03-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Cairo/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Apr 2006 01:01:13 -0000	1.1
+++ .cvsignore	25 Apr 2006 01:02:24 -0000	1.2
@@ -0,0 +1 @@
+Cairo-0.03.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Cairo/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Apr 2006 01:01:13 -0000	1.1
+++ sources	25 Apr 2006 01:02:24 -0000	1.2
@@ -0,0 +1 @@
+6ad0ab39eb8f56272373a9ea4515f37a  Cairo-0.03.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 01:04:50 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 18:04:50 -0700
Subject: rpms/perl-ExtUtils-XSBuilder/FC-3 perl-ExtUtils-XSBuilder.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200604250105.k3P15MwD002391@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-ExtUtils-XSBuilder/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2323/FC-3

Modified Files:
	perl-ExtUtils-XSBuilder.spec sources 
Log Message:

Bump to 0.28



Index: perl-ExtUtils-XSBuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-XSBuilder/FC-3/perl-ExtUtils-XSBuilder.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-ExtUtils-XSBuilder.spec	8 Jul 2005 18:43:53 -0000	1.2
+++ perl-ExtUtils-XSBuilder.spec	25 Apr 2006 01:04:50 -0000	1.3
@@ -1,11 +1,11 @@
 Name:           perl-ExtUtils-XSBuilder
-Version:        0.27
-Release:        2%{?dist}
+Version:        0.28
+Release:        1%{?dist}
 Summary:        Modules that parse C header files and create XS glue code
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/ExtUtils-XSBuilder/
-Source0:        http://search.cpan.org/CPAN/authors/id/G/GR/GRICHTER/ExtUtils-XSBuilder-0.27.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/G/GR/GRICHTER/ExtUtils-XSBuilder-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -51,6 +51,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.28-1
+- bump to 0.28
+
 * Fri Jul  8 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.27-2
 - cleanups
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-XSBuilder/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Jul 2005 18:39:17 -0000	1.2
+++ sources	25 Apr 2006 01:04:50 -0000	1.3
@@ -1 +1 @@
-6e1f1c8207b598166dc7a06d633db308  ExtUtils-XSBuilder-0.27.tar.gz
+1d33ddeacc01426a02e23c71c2e4cd04  ExtUtils-XSBuilder-0.28.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 01:04:51 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 18:04:51 -0700
Subject: rpms/perl-ExtUtils-XSBuilder/FC-4 perl-ExtUtils-XSBuilder.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200604250105.k3P15NoD002395@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-ExtUtils-XSBuilder/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2323/FC-4

Modified Files:
	perl-ExtUtils-XSBuilder.spec sources 
Log Message:

Bump to 0.28



Index: perl-ExtUtils-XSBuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-XSBuilder/FC-4/perl-ExtUtils-XSBuilder.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-ExtUtils-XSBuilder.spec	8 Jul 2005 18:43:53 -0000	1.2
+++ perl-ExtUtils-XSBuilder.spec	25 Apr 2006 01:04:50 -0000	1.3
@@ -1,11 +1,11 @@
 Name:           perl-ExtUtils-XSBuilder
-Version:        0.27
-Release:        2%{?dist}
+Version:        0.28
+Release:        1%{?dist}
 Summary:        Modules that parse C header files and create XS glue code
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/ExtUtils-XSBuilder/
-Source0:        http://search.cpan.org/CPAN/authors/id/G/GR/GRICHTER/ExtUtils-XSBuilder-0.27.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/G/GR/GRICHTER/ExtUtils-XSBuilder-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -51,6 +51,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.28-1
+- bump to 0.28
+
 * Fri Jul  8 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.27-2
 - cleanups
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-XSBuilder/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Jul 2005 18:39:17 -0000	1.2
+++ sources	25 Apr 2006 01:04:50 -0000	1.3
@@ -1 +1 @@
-6e1f1c8207b598166dc7a06d633db308  ExtUtils-XSBuilder-0.27.tar.gz
+1d33ddeacc01426a02e23c71c2e4cd04  ExtUtils-XSBuilder-0.28.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 01:04:57 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 18:04:57 -0700
Subject: rpms/perl-ExtUtils-XSBuilder/devel .cvsignore, 1.2,
	1.3 perl-ExtUtils-XSBuilder.spec, 1.2, 1.3 sources, 1.2, 1.3
Message-ID: <200604250105.k3P15Tde002404@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-ExtUtils-XSBuilder/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2323/devel

Modified Files:
	.cvsignore perl-ExtUtils-XSBuilder.spec sources 
Log Message:

Bump to 0.28



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-XSBuilder/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Jul 2005 18:39:17 -0000	1.2
+++ .cvsignore	25 Apr 2006 01:04:57 -0000	1.3
@@ -1 +1,2 @@
 ExtUtils-XSBuilder-0.27.tar.gz
+ExtUtils-XSBuilder-0.28.tar.gz


Index: perl-ExtUtils-XSBuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-XSBuilder/devel/perl-ExtUtils-XSBuilder.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-ExtUtils-XSBuilder.spec	8 Jul 2005 18:43:53 -0000	1.2
+++ perl-ExtUtils-XSBuilder.spec	25 Apr 2006 01:04:57 -0000	1.3
@@ -1,11 +1,11 @@
 Name:           perl-ExtUtils-XSBuilder
-Version:        0.27
-Release:        2%{?dist}
+Version:        0.28
+Release:        1%{?dist}
 Summary:        Modules that parse C header files and create XS glue code
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/ExtUtils-XSBuilder/
-Source0:        http://search.cpan.org/CPAN/authors/id/G/GR/GRICHTER/ExtUtils-XSBuilder-0.27.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/G/GR/GRICHTER/ExtUtils-XSBuilder-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -51,6 +51,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.28-1
+- bump to 0.28
+
 * Fri Jul  8 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.27-2
 - cleanups
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-XSBuilder/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Jul 2005 18:39:17 -0000	1.2
+++ sources	25 Apr 2006 01:04:57 -0000	1.3
@@ -1 +1 @@
-6e1f1c8207b598166dc7a06d633db308  ExtUtils-XSBuilder-0.27.tar.gz
+1d33ddeacc01426a02e23c71c2e4cd04  ExtUtils-XSBuilder-0.28.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 01:04:56 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 18:04:56 -0700
Subject: rpms/perl-ExtUtils-XSBuilder/FC-5 perl-ExtUtils-XSBuilder.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200604250105.k3P15SCP002399@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-ExtUtils-XSBuilder/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2323/FC-5

Modified Files:
	perl-ExtUtils-XSBuilder.spec sources 
Log Message:

Bump to 0.28



Index: perl-ExtUtils-XSBuilder.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-XSBuilder/FC-5/perl-ExtUtils-XSBuilder.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl-ExtUtils-XSBuilder.spec	8 Jul 2005 18:43:53 -0000	1.2
+++ perl-ExtUtils-XSBuilder.spec	25 Apr 2006 01:04:56 -0000	1.3
@@ -1,11 +1,11 @@
 Name:           perl-ExtUtils-XSBuilder
-Version:        0.27
-Release:        2%{?dist}
+Version:        0.28
+Release:        1%{?dist}
 Summary:        Modules that parse C header files and create XS glue code
 Group:          Development/Libraries
 License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/ExtUtils-XSBuilder/
-Source0:        http://search.cpan.org/CPAN/authors/id/G/GR/GRICHTER/ExtUtils-XSBuilder-0.27.tar.gz
+Source0:        http://search.cpan.org/CPAN/authors/id/G/GR/GRICHTER/ExtUtils-XSBuilder-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -51,6 +51,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.28-1
+- bump to 0.28
+
 * Fri Jul  8 2005 Tom "spot" Callaway <tcallawa at redhat.com> 0.27-2
 - cleanups
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-ExtUtils-XSBuilder/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Jul 2005 18:39:17 -0000	1.2
+++ sources	25 Apr 2006 01:04:56 -0000	1.3
@@ -1 +1 @@
-6e1f1c8207b598166dc7a06d633db308  ExtUtils-XSBuilder-0.27.tar.gz
+1d33ddeacc01426a02e23c71c2e4cd04  ExtUtils-XSBuilder-0.28.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 01:12:33 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 24 Apr 2006 18:12:33 -0700
Subject: owners owners.list,1.889,1.890
Message-ID: <200604250112.k3P1CZYJ002568@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2551

Modified Files:
	owners.list 
Log Message:
New package: perl-Cairo (#1877999


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.889
retrieving revision 1.890
diff -u -r1.889 -r1.890
--- owners.list	25 Apr 2006 00:57:16 -0000	1.889
+++ owners.list	25 Apr 2006 01:12:32 -0000	1.890
@@ -873,6 +873,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-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-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-capitalization|No capitalization on method names|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Carp-Assert|Executable comments|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Carp-Assert-More|Convenience wrappers around Carp::Assert|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Apr 25 01:23:58 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 18:23:58 -0700
Subject: rpms/perl-Image-ExifTool/FC-5 perl-Image-ExifTool.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200604250124.k3P1O04L002711@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Image-ExifTool/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2644/FC-5

Modified Files:
	perl-Image-ExifTool.spec sources 
Log Message:

bump to 6.15



Index: perl-Image-ExifTool.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-ExifTool/FC-5/perl-Image-ExifTool.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Image-ExifTool.spec	31 Mar 2006 20:21:56 -0000	1.3
+++ perl-Image-ExifTool.spec	25 Apr 2006 01:23:58 -0000	1.4
@@ -1,5 +1,5 @@
 Name:		perl-Image-ExifTool
-Version:	6.09
+Version:	6.15
 Release:	1%{?dist}
 License:	GPL or Artistic
 Group:		Applications/Multimedia
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 6.15-1
+- bump to 6.15
+
 * Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 6.09-1
 - bump to 6.09
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-ExifTool/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	31 Mar 2006 20:21:56 -0000	1.4
+++ sources	25 Apr 2006 01:23:58 -0000	1.5
@@ -1 +1 @@
-66dc6aa550799a879c66f4ceba348d6d  Image-ExifTool-6.09.tar.gz
+6e888a71b152b68aaaaf3183997e2cc2  Image-ExifTool-6.15.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 01:23:58 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 18:23:58 -0700
Subject: rpms/perl-Image-ExifTool/devel .cvsignore, 1.4,
	1.5 perl-Image-ExifTool.spec, 1.3, 1.4 sources, 1.4, 1.5
Message-ID: <200604250124.k3P1O0K7002717@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Image-ExifTool/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2644/devel

Modified Files:
	.cvsignore perl-Image-ExifTool.spec sources 
Log Message:

bump to 6.15



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-ExifTool/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	31 Mar 2006 20:21:56 -0000	1.4
+++ .cvsignore	25 Apr 2006 01:23:58 -0000	1.5
@@ -1,3 +1,4 @@
 Image-ExifTool-5.53.tar.gz
 Image-ExifTool-5.89.tar.gz
 Image-ExifTool-6.09.tar.gz
+Image-ExifTool-6.15.tar.gz


Index: perl-Image-ExifTool.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-ExifTool/devel/perl-Image-ExifTool.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Image-ExifTool.spec	31 Mar 2006 20:21:56 -0000	1.3
+++ perl-Image-ExifTool.spec	25 Apr 2006 01:23:58 -0000	1.4
@@ -1,5 +1,5 @@
 Name:		perl-Image-ExifTool
-Version:	6.09
+Version:	6.15
 Release:	1%{?dist}
 License:	GPL or Artistic
 Group:		Applications/Multimedia
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 6.15-1
+- bump to 6.15
+
 * Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 6.09-1
 - bump to 6.09
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-ExifTool/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	31 Mar 2006 20:21:56 -0000	1.4
+++ sources	25 Apr 2006 01:23:58 -0000	1.5
@@ -1 +1 @@
-66dc6aa550799a879c66f4ceba348d6d  Image-ExifTool-6.09.tar.gz
+6e888a71b152b68aaaaf3183997e2cc2  Image-ExifTool-6.15.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 01:23:52 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 18:23:52 -0700
Subject: rpms/perl-Image-ExifTool/FC-3 perl-Image-ExifTool.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200604250124.k3P1OOPF002723@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Image-ExifTool/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2644/FC-3

Modified Files:
	perl-Image-ExifTool.spec sources 
Log Message:

bump to 6.15



Index: perl-Image-ExifTool.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-ExifTool/FC-3/perl-Image-ExifTool.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Image-ExifTool.spec	31 Mar 2006 20:21:54 -0000	1.3
+++ perl-Image-ExifTool.spec	25 Apr 2006 01:23:51 -0000	1.4
@@ -1,5 +1,5 @@
 Name:		perl-Image-ExifTool
-Version:	6.09
+Version:	6.15
 Release:	1%{?dist}
 License:	GPL or Artistic
 Group:		Applications/Multimedia
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 6.15-1
+- bump to 6.15
+
 * Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 6.09-1
 - bump to 6.09
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-ExifTool/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	31 Mar 2006 20:21:54 -0000	1.4
+++ sources	25 Apr 2006 01:23:51 -0000	1.5
@@ -1 +1 @@
-66dc6aa550799a879c66f4ceba348d6d  Image-ExifTool-6.09.tar.gz
+6e888a71b152b68aaaaf3183997e2cc2  Image-ExifTool-6.15.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 01:23:52 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 18:23:52 -0700
Subject: rpms/perl-Image-ExifTool/FC-4 perl-Image-ExifTool.spec, 1.3,
	1.4 sources, 1.4, 1.5
Message-ID: <200604250124.k3P1OOsh002727@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/perl-Image-ExifTool/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2644/FC-4

Modified Files:
	perl-Image-ExifTool.spec sources 
Log Message:

bump to 6.15



Index: perl-Image-ExifTool.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-ExifTool/FC-4/perl-Image-ExifTool.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Image-ExifTool.spec	31 Mar 2006 20:21:55 -0000	1.3
+++ perl-Image-ExifTool.spec	25 Apr 2006 01:23:52 -0000	1.4
@@ -1,5 +1,5 @@
 Name:		perl-Image-ExifTool
-Version:	6.09
+Version:	6.15
 Release:	1%{?dist}
 License:	GPL or Artistic
 Group:		Applications/Multimedia
@@ -49,6 +49,9 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 6.15-1
+- bump to 6.15
+
 * Fri Mar 31 2006 Tom "spot" Callaway <tcallawa at redhat.com> 6.09-1
 - bump to 6.09
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Image-ExifTool/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	31 Mar 2006 20:21:55 -0000	1.4
+++ sources	25 Apr 2006 01:23:52 -0000	1.5
@@ -1 +1 @@
-66dc6aa550799a879c66f4ceba348d6d  Image-ExifTool-6.09.tar.gz
+6e888a71b152b68aaaaf3183997e2cc2  Image-ExifTool-6.15.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 01:32:13 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 18:32:13 -0700
Subject: rpms/R/FC-4 R.spec,1.13,1.14 sources,1.7,1.8
Message-ID: <200604250132.k3P1WFOF002830@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2754/FC-4

Modified Files:
	R.spec sources 
Log Message:

Bump to 2.3.0. Hey, what's a pirate's favorite mathematical language? ARRRRRR!



Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/FC-4/R.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- R.spec	28 Feb 2006 23:59:37 -0000	1.13
+++ R.spec	25 Apr 2006 01:32:13 -0000	1.14
@@ -1,6 +1,6 @@
 Name: R
-Version: 2.2.1
-Release: 4%{?dist}
+Version: 2.3.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.10.2
+Provides: R-cluster = 1.10.5
 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.12
+Provides: R-lattice = 0.13
 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.20
+Provides: R-survival = 2.24
 Provides: R-tcltk = %{version}
 Provides: R-tools = %{version}
 Provides: R-utils = %{version}
@@ -155,8 +155,8 @@
 %{_infodir}/R-*.info*
 %{_mandir}/man1/*
 /etc/ld.so.conf.d/*
-%doc AUTHORS CAPABILITIES COPYING COPYING.LIB COPYRIGHTS FAQ NEWS
-%doc ONEWS README RESOURCES THANKS VERSION Y2K
+%doc doc/AUTHORS CAPABILITIES doc/COPYING doc/COPYING.LIB doc/COPYRIGHTS doc/FAQ NEWS
+%doc ONEWS README doc/RESOURCES doc/THANKS VERSION
 %doc doc/manual/R-admin.pdf
 %doc doc/manual/R-FAQ.pdf
 %doc doc/manual/R-lang.pdf
@@ -219,6 +219,9 @@
 /sbin/ldconfig
 
 %changelog
+* 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-4
 - bump for FC-5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/R/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	31 Dec 2005 20:27:43 -0000	1.7
+++ sources	25 Apr 2006 01:32:13 -0000	1.8
@@ -1 +1 @@
-42542290c6d1585af7ded330f811385c  R-2.2.1.tar.gz
+11cc1e9df640ab52e608cf9e695f7354  R-2.3.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 01:32:14 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 18:32:14 -0700
Subject: rpms/R/devel .cvsignore,1.6,1.7 R.spec,1.14,1.15 sources,1.7,1.8
Message-ID: <200604250132.k3P1WGrV002841@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2754/devel

Modified Files:
	.cvsignore R.spec sources 
Log Message:

Bump to 2.3.0. Hey, what's a pirate's favorite mathematical language? ARRRRRR!



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/R/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	31 Dec 2005 20:27:49 -0000	1.6
+++ .cvsignore	25 Apr 2006 01:32:14 -0000	1.7
@@ -3,3 +3,4 @@
 R-2.1.1.tar.gz
 R-2.2.0.tar.gz
 R-2.2.1.tar.gz
+R-2.3.0.tar.gz


Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/devel/R.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- R.spec	6 Apr 2006 22:04:55 -0000	1.14
+++ R.spec	25 Apr 2006 01:32:14 -0000	1.15
@@ -1,6 +1,6 @@
 Name: R
-Version: 2.2.1
-Release: 5%{?dist}
+Version: 2.3.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.10.2
+Provides: R-cluster = 1.10.5
 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.12
+Provides: R-lattice = 0.13
 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.20
+Provides: R-survival = 2.24
 Provides: R-tcltk = %{version}
 Provides: R-tools = %{version}
 Provides: R-utils = %{version}
@@ -155,8 +155,8 @@
 %{_infodir}/R-*.info*
 %{_mandir}/man1/*
 /etc/ld.so.conf.d/*
-%doc AUTHORS CAPABILITIES COPYING COPYING.LIB COPYRIGHTS FAQ NEWS
-%doc ONEWS README RESOURCES THANKS VERSION Y2K
+%doc doc/AUTHORS CAPABILITIES doc/COPYING doc/COPYING.LIB doc/COPYRIGHTS doc/FAQ NEWS
+%doc ONEWS README doc/RESOURCES doc/THANKS VERSION
 %doc doc/manual/R-admin.pdf
 %doc doc/manual/R-FAQ.pdf
 %doc doc/manual/R-lang.pdf
@@ -219,6 +219,9 @@
 /sbin/ldconfig
 
 %changelog
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/R/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	31 Dec 2005 20:27:49 -0000	1.7
+++ sources	25 Apr 2006 01:32:14 -0000	1.8
@@ -1 +1 @@
-42542290c6d1585af7ded330f811385c  R-2.2.1.tar.gz
+11cc1e9df640ab52e608cf9e695f7354  R-2.3.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 01:32:14 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 18:32:14 -0700
Subject: rpms/R/FC-5 R.spec,1.13,1.14 sources,1.7,1.8
Message-ID: <200604250132.k3P1WGS5002837@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2754/FC-5

Modified Files:
	R.spec sources 
Log Message:

Bump to 2.3.0. Hey, what's a pirate's favorite mathematical language? ARRRRRR!



Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/FC-5/R.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- R.spec	28 Feb 2006 23:59:43 -0000	1.13
+++ R.spec	25 Apr 2006 01:32:13 -0000	1.14
@@ -1,6 +1,6 @@
 Name: R
-Version: 2.2.1
-Release: 4%{?dist}
+Version: 2.3.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.10.2
+Provides: R-cluster = 1.10.5
 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.12
+Provides: R-lattice = 0.13
 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.20
+Provides: R-survival = 2.24
 Provides: R-tcltk = %{version}
 Provides: R-tools = %{version}
 Provides: R-utils = %{version}
@@ -155,8 +155,8 @@
 %{_infodir}/R-*.info*
 %{_mandir}/man1/*
 /etc/ld.so.conf.d/*
-%doc AUTHORS CAPABILITIES COPYING COPYING.LIB COPYRIGHTS FAQ NEWS
-%doc ONEWS README RESOURCES THANKS VERSION Y2K
+%doc doc/AUTHORS CAPABILITIES doc/COPYING doc/COPYING.LIB doc/COPYRIGHTS doc/FAQ NEWS
+%doc ONEWS README doc/RESOURCES doc/THANKS VERSION
 %doc doc/manual/R-admin.pdf
 %doc doc/manual/R-FAQ.pdf
 %doc doc/manual/R-lang.pdf
@@ -219,6 +219,9 @@
 /sbin/ldconfig
 
 %changelog
+* 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-4
 - bump for FC-5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/R/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	31 Dec 2005 20:27:49 -0000	1.7
+++ sources	25 Apr 2006 01:32:13 -0000	1.8
@@ -1 +1 @@
-42542290c6d1585af7ded330f811385c  R-2.2.1.tar.gz
+11cc1e9df640ab52e608cf9e695f7354  R-2.3.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 01:32:12 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 18:32:12 -0700
Subject: rpms/R/FC-3 R.spec,1.14,1.15 sources,1.6,1.7
Message-ID: <200604250132.k3P1Wih2002858@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2754/FC-3

Modified Files:
	R.spec sources 
Log Message:

Bump to 2.3.0. Hey, what's a pirate's favorite mathematical language? ARRRRRR!



Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/FC-3/R.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- R.spec	28 Feb 2006 23:59:31 -0000	1.14
+++ R.spec	25 Apr 2006 01:32:12 -0000	1.15
@@ -1,6 +1,6 @@
 Name: R
-Version: 2.2.1
-Release: 4%{?dist}
+Version: 2.3.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.10.2
+Provides: R-cluster = 1.10.5
 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.12
+Provides: R-lattice = 0.13
 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.20
+Provides: R-survival = 2.24
 Provides: R-tcltk = %{version}
 Provides: R-tools = %{version}
 Provides: R-utils = %{version}
@@ -154,8 +154,8 @@
 %{_infodir}/R-*.info*
 %{_mandir}/man1/*
 /etc/ld.so.conf.d/*
-%doc AUTHORS CAPABILITIES COPYING COPYING.LIB COPYRIGHTS FAQ NEWS
-%doc ONEWS README RESOURCES THANKS VERSION Y2K
+%doc doc/AUTHORS CAPABILITIES doc/COPYING doc/COPYING.LIB doc/COPYRIGHTS doc/FAQ NEWS
+%doc ONEWS README doc/RESOURCES doc/THANKS VERSION
 %doc doc/manual/R-admin.pdf
 %doc doc/manual/R-FAQ.pdf
 %doc doc/manual/R-lang.pdf
@@ -218,6 +218,9 @@
 /sbin/ldconfig
 
 %changelog
+* 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-4
 - bump for FC-5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/R/FC-3/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	31 Dec 2005 20:27:36 -0000	1.6
+++ sources	25 Apr 2006 01:32:12 -0000	1.7
@@ -1 +1 @@
-42542290c6d1585af7ded330f811385c  R-2.2.1.tar.gz
+11cc1e9df640ab52e608cf9e695f7354  R-2.3.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 01:42:03 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Mon, 24 Apr 2006 18:42:03 -0700
Subject: rpms/screem/devel screem.spec,1.6,1.7
Message-ID: <200604250142.k3P1g5tR003096@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/screem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3078

Modified Files:
	screem.spec 
Log Message:
updated version, fix for miscompile



Index: screem.spec
===================================================================
RCS file: /cvs/extras/rpms/screem/devel/screem.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- screem.spec	2 Mar 2006 21:31:43 -0000	1.6
+++ screem.spec	25 Apr 2006 01:42:02 -0000	1.7
@@ -1,12 +1,13 @@
 Name:           screem
-Version:        0.14.1
+Version:        0.16.1
 Release:        1%{?dist}
 Summary:        Website development environment
 
 Group:          Development/Tools
 License:        GPL
-URL:            http://screem.sourceforge.net/
+URL:            http://www.screem.org/
 Source0:        http://download.sourceforge.net/screem/screem-%{version}.tar.gz
+Patch0:		fix_miscompile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-devel
@@ -29,7 +30,6 @@
 Requires(postun): scrollkeeper
 Requires(postun): shared-mime-info
 
-
 %description
 SCREEM is a non-WYSIWYG web site development environment with an
 advanced editor and easy access to external helper applications such
@@ -40,15 +40,9 @@
 parsing, page templates and publishing of files are also supported.
 
 %prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
 
 %setup -q
-
+%patch0	-p1 -b .mjk
 
 %build
 %configure \
@@ -58,24 +52,23 @@
            --enable-dbus
 make %{?_smp_mflags}
 
-
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DATADIRNAME=${RPM_BUILD_ROOT}%{_datadir} DESTDIR=${RPM_BUILD_ROOT}
+make install DATADIRNAME=%{buildroot}%{_datadir} DESTDIR=%{buildroot}
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
+find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
+
 desktop-file-install --delete-original --vendor fedora     \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications            \
+  --dir %{buildroot}%{_datadir}/applications            \
   --add-category X-Fedora                                  \
-  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
-%find_lang %{name}
+  %{buildroot}%{_datadir}/applications/%{name}.desktop
 
+%find_lang %{name}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
-
+rm -rf %{buildroot}
 
 %post
 export GCONF_CONFIG_SOURCE="$(gconftool-2 --get-default-source)"
@@ -84,18 +77,15 @@
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 scrollkeeper-update -q
 
-
 %preun
 export GCONF_CONFIG_SOURCE="$(gconftool-2 --get-default-source)"
 gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
 
-
 %postun
 update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 scrollkeeper-update -q
 
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS BUGS COPYING COPYING-DOCS ChangeLog NEWS README TODO
@@ -105,14 +95,18 @@
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/gnome/help/%{name}
 %{_datadir}/mime/packages/*
-%{_datadir}/mime-info
 %{_datadir}/omf
 %{_datadir}/pixmaps/*
 %{_libdir}/%{name}
+%{_libdir}/pkgconfig/*.pc
+%{_includedir}/*
 %{_sysconfdir}/gconf/schemas/*
 
-
 %changelog
+* Tue Apr 24 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.16.1-1
+- updated to 0.16.1
+- fix miscompile, patch based on debian bug report #358759
+
 * Thu Jul  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.14.1-1
 - Update to 0.14.1 (also fixes bug #153224).
 - BR gnome-menus-devel libcroco-devel



From fedora-extras-commits at redhat.com  Tue Apr 25 01:46:49 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Mon, 24 Apr 2006 18:46:49 -0700
Subject: fedora-security/audit fc4,1.214,1.215 fc5,1.128,1.129
Message-ID: <200604250146.k3P1knBZ003154@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3129

Modified Files:
	fc4 fc5 
Log Message:
Note new PHP CVE ids.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.214
retrieving revision 1.215
diff -u -r1.214 -r1.215
--- fc4	24 Apr 2006 18:25:42 -0000	1.214
+++ fc4	25 Apr 2006 01:46:46 -0000	1.215
@@ -3,6 +3,8 @@
 
 ** are items that need attention
 
+CVE-2006-1991 VULNERABLE (php)
+CVE-2006-1990 VULNERABLE (php)
 CVE-2006-1942 ** firefox
 CVE-2006-1931 version (ruby, fixed 1.8.3)
 CVE-2006-1902 ignore (gcc) not a vulnerability


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- fc5	24 Apr 2006 18:25:42 -0000	1.128
+++ fc5	25 Apr 2006 01:46:46 -0000	1.129
@@ -3,6 +3,8 @@
 
 ** are items that need attention
 
+CVE-2006-1991 VULNERABLE (php)
+CVE-2006-1990 VULNERABLE (php)
 CVE-2006-1942 ** firefox
 CVE-2006-1931 version (ruby, fixed 1.8.3)
 CVE-2006-1902 ignore (gcc) not a vulnerability



From fedora-extras-commits at redhat.com  Tue Apr 25 01:47:30 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Mon, 24 Apr 2006 18:47:30 -0700
Subject: rpms/screem/devel sources,1.4,1.5
Message-ID: <200604250147.k3P1lWao003181@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/screem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3164

Modified Files:
	sources 
Log Message:
updated source



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/screem/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Jul 2005 20:57:33 -0000	1.4
+++ sources	25 Apr 2006 01:47:30 -0000	1.5
@@ -1 +1 @@
-b23bf53698df79477f83f3d66b6eab0d  screem-0.14.1.tar.gz
+88bfc0afadb905ddbed9bdfbc869602a  screem-0.16.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 01:48:24 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Mon, 24 Apr 2006 18:48:24 -0700
Subject: rpms/screem/devel fix_miscompile.patch,NONE,1.1 .cvsignore,1.4,1.5
Message-ID: <200604250148.k3P1mQQS003214@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/screem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3193

Modified Files:
	.cvsignore 
Added Files:
	fix_miscompile.patch 
Log Message:
patch to fix miscompile


fix_miscompile.patch:

--- NEW FILE fix_miscompile.patch ---
--- screem-0.16.1/src/screem-main.c.orig	2006-04-25 13:02:00.000000000 +1200
+++ screem-0.16.1/src/screem-main.c	2006-04-25 13:06:58.000000000 +1200
@@ -54,12 +54,23 @@
 static gchar *session_filename = SESSION_LAST;
 
 /* passed parameters stuff */
+#ifndef GNOME_PARAM_GOPTION_CONTEXT
 static const struct poptOption options[] = {
 	{ "load-session", 'l', POPT_ARG_STRING, &session_filename, 0,
 	  N_("Load the given session file"),
 	  N_("FILE") },
 	{ NULL, '\0', 0, NULL, 0, NULL, NULL }
 };
+#else /* USE GOption interface */
+static const gchar **remaining_args = NULL;
+static GOptionEntry option_entries[] = {
+  { "load-session", 'l', 0, G_OPTION_ARG_STRING, &(session_filename),
+    N_("Load the given session file"), N_("FILE") },
+  { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &remaining_args,
+    "Special option that collects any remaining arguments for us" },
+  { NULL }
+};
+#endif
 
 typedef enum {
 	MISSING_GLADE,
@@ -75,8 +86,10 @@
 int main( int argc, char *argv[] )
 {
 	GnomeProgram *program;
+	const gchar** start_files;	
+#ifndef GNOME_PARAM_GOPTION_CONTEXT
 	poptContext ctx;
-	const gchar** start_files;
+#endif
 	const gchar *icon;
 	
 	gchar *dotdir;
@@ -87,12 +100,22 @@
         bindtextdomain( GETTEXT_PACKAGE, GNOMELOCALEDIR );
 	bind_textdomain_codeset( GETTEXT_PACKAGE, "UTF-8" );
         textdomain( GETTEXT_PACKAGE );
-#endif	
+#endif
+
+#ifdef GNOME_PARAM_GOPTION_CONTEXT
+	GOptionContext *option_context = g_option_context_new("screem");
+	g_option_context_add_main_entries(option_context, option_entries, NULL);
+#endif
+	
 	program = gnome_program_init( PACKAGE, VERSION, 
 			LIBGNOMEUI_MODULE,
 			argc, argv,
 			GNOME_PROGRAM_STANDARD_PROPERTIES,
+#ifndef GNOME_PARAM_GOPTION_CONTEXT
 			GNOME_PARAM_POPT_TABLE, options,
+#else
+			GNOME_PARAM_GOPTION_CONTEXT, option_context,
+#endif
 			GNOME_PARAM_APP_DATADIR, DATADIR,
 			LIBGNOMEUI_PARAM_DEFAULT_ICON,
 			DATADIR"/pixmaps/screem.png",
@@ -105,10 +128,14 @@
 	icon = DATADIR"/pixmaps/screem.png";
         gtk_window_set_default_icon_from_file( icon, NULL );
 
+#ifndef GNOME_PARAM_GOPTION_CONTEXT
 	/* parse arguments */
 	g_object_get( G_OBJECT( program ), 
 			GNOME_PARAM_POPT_CONTEXT, &ctx, NULL );
 	start_files = parse_args( ctx, argc, argv );
+#else 
+	start_files = remaining_args;
+#endif
 
         gnome_vfs_init();
 	gnome_authentication_manager_init();
@@ -160,6 +187,7 @@
 	return FALSE;
 }
 
+#ifndef GNOME_PARAM_GOPTION_CONTEXT
 static const gchar **parse_args( poptContext ctx, int argc, char *argv[] )
 {
 	const gchar** start_files;
@@ -169,6 +197,7 @@
 
 	return start_files;
 }
+#endif
 
 static void screem_main_missing( MissingType type )
 {


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/screem/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Jul 2005 20:57:33 -0000	1.4
+++ .cvsignore	25 Apr 2006 01:48:24 -0000	1.5
@@ -1 +1 @@
-screem-0.14.1.tar.gz
+screem-0.16.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 01:52:06 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Mon, 24 Apr 2006 18:52:06 -0700
Subject: rpms/screem/FC-5 fix_miscompile.patch, NONE, 1.1 .cvsignore, 1.4,
	1.5 screem.spec, 1.6, 1.7 sources, 1.4, 1.5
Message-ID: <200604250152.k3P1q8QE003315@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/screem/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3291

Modified Files:
	.cvsignore screem.spec sources 
Added Files:
	fix_miscompile.patch 
Log Message:
updated version and patch to fix miscompile 


fix_miscompile.patch:

--- NEW FILE fix_miscompile.patch ---
--- screem-0.16.1/src/screem-main.c.orig	2006-04-25 13:02:00.000000000 +1200
+++ screem-0.16.1/src/screem-main.c	2006-04-25 13:06:58.000000000 +1200
@@ -54,12 +54,23 @@
 static gchar *session_filename = SESSION_LAST;
 
 /* passed parameters stuff */
+#ifndef GNOME_PARAM_GOPTION_CONTEXT
 static const struct poptOption options[] = {
 	{ "load-session", 'l', POPT_ARG_STRING, &session_filename, 0,
 	  N_("Load the given session file"),
 	  N_("FILE") },
 	{ NULL, '\0', 0, NULL, 0, NULL, NULL }
 };
+#else /* USE GOption interface */
+static const gchar **remaining_args = NULL;
+static GOptionEntry option_entries[] = {
+  { "load-session", 'l', 0, G_OPTION_ARG_STRING, &(session_filename),
+    N_("Load the given session file"), N_("FILE") },
+  { G_OPTION_REMAINING, 0, 0, G_OPTION_ARG_FILENAME_ARRAY, &remaining_args,
+    "Special option that collects any remaining arguments for us" },
+  { NULL }
+};
+#endif
 
 typedef enum {
 	MISSING_GLADE,
@@ -75,8 +86,10 @@
 int main( int argc, char *argv[] )
 {
 	GnomeProgram *program;
+	const gchar** start_files;	
+#ifndef GNOME_PARAM_GOPTION_CONTEXT
 	poptContext ctx;
-	const gchar** start_files;
+#endif
 	const gchar *icon;
 	
 	gchar *dotdir;
@@ -87,12 +100,22 @@
         bindtextdomain( GETTEXT_PACKAGE, GNOMELOCALEDIR );
 	bind_textdomain_codeset( GETTEXT_PACKAGE, "UTF-8" );
         textdomain( GETTEXT_PACKAGE );
-#endif	
+#endif
+
+#ifdef GNOME_PARAM_GOPTION_CONTEXT
+	GOptionContext *option_context = g_option_context_new("screem");
+	g_option_context_add_main_entries(option_context, option_entries, NULL);
+#endif
+	
 	program = gnome_program_init( PACKAGE, VERSION, 
 			LIBGNOMEUI_MODULE,
 			argc, argv,
 			GNOME_PROGRAM_STANDARD_PROPERTIES,
+#ifndef GNOME_PARAM_GOPTION_CONTEXT
 			GNOME_PARAM_POPT_TABLE, options,
+#else
+			GNOME_PARAM_GOPTION_CONTEXT, option_context,
+#endif
 			GNOME_PARAM_APP_DATADIR, DATADIR,
 			LIBGNOMEUI_PARAM_DEFAULT_ICON,
 			DATADIR"/pixmaps/screem.png",
@@ -105,10 +128,14 @@
 	icon = DATADIR"/pixmaps/screem.png";
         gtk_window_set_default_icon_from_file( icon, NULL );
 
+#ifndef GNOME_PARAM_GOPTION_CONTEXT
 	/* parse arguments */
 	g_object_get( G_OBJECT( program ), 
 			GNOME_PARAM_POPT_CONTEXT, &ctx, NULL );
 	start_files = parse_args( ctx, argc, argv );
+#else 
+	start_files = remaining_args;
+#endif
 
         gnome_vfs_init();
 	gnome_authentication_manager_init();
@@ -160,6 +187,7 @@
 	return FALSE;
 }
 
+#ifndef GNOME_PARAM_GOPTION_CONTEXT
 static const gchar **parse_args( poptContext ctx, int argc, char *argv[] )
 {
 	const gchar** start_files;
@@ -169,6 +197,7 @@
 
 	return start_files;
 }
+#endif
 
 static void screem_main_missing( MissingType type )
 {


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/screem/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	7 Jul 2005 20:57:33 -0000	1.4
+++ .cvsignore	25 Apr 2006 01:52:06 -0000	1.5
@@ -1 +1 @@
-screem-0.14.1.tar.gz
+screem-0.16.1.tar.gz


Index: screem.spec
===================================================================
RCS file: /cvs/extras/rpms/screem/FC-5/screem.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- screem.spec	2 Mar 2006 21:31:43 -0000	1.6
+++ screem.spec	25 Apr 2006 01:52:06 -0000	1.7
@@ -1,12 +1,13 @@
 Name:           screem
-Version:        0.14.1
+Version:        0.16.1
 Release:        1%{?dist}
 Summary:        Website development environment
 
 Group:          Development/Tools
 License:        GPL
-URL:            http://screem.sourceforge.net/
+URL:            http://www.screem.org/
 Source0:        http://download.sourceforge.net/screem/screem-%{version}.tar.gz
+Patch0:		fix_miscompile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-devel
@@ -29,7 +30,6 @@
 Requires(postun): scrollkeeper
 Requires(postun): shared-mime-info
 
-
 %description
 SCREEM is a non-WYSIWYG web site development environment with an
 advanced editor and easy access to external helper applications such
@@ -40,15 +40,9 @@
 parsing, page templates and publishing of files are also supported.
 
 %prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
 
 %setup -q
-
+%patch0	-p1 -b .mjk
 
 %build
 %configure \
@@ -58,24 +52,23 @@
            --enable-dbus
 make %{?_smp_mflags}
 
-
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DATADIRNAME=${RPM_BUILD_ROOT}%{_datadir} DESTDIR=${RPM_BUILD_ROOT}
+make install DATADIRNAME=%{buildroot}%{_datadir} DESTDIR=%{buildroot}
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
+find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
+
 desktop-file-install --delete-original --vendor fedora     \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications            \
+  --dir %{buildroot}%{_datadir}/applications            \
   --add-category X-Fedora                                  \
-  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
-%find_lang %{name}
+  %{buildroot}%{_datadir}/applications/%{name}.desktop
 
+%find_lang %{name}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
-
+rm -rf %{buildroot}
 
 %post
 export GCONF_CONFIG_SOURCE="$(gconftool-2 --get-default-source)"
@@ -84,18 +77,15 @@
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 scrollkeeper-update -q
 
-
 %preun
 export GCONF_CONFIG_SOURCE="$(gconftool-2 --get-default-source)"
 gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null || :
 
-
 %postun
 update-mime-database %{_datadir}/mime > /dev/null 2>&1 || :
 update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 scrollkeeper-update -q
 
-
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS BUGS COPYING COPYING-DOCS ChangeLog NEWS README TODO
@@ -105,14 +95,18 @@
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/gnome/help/%{name}
 %{_datadir}/mime/packages/*
-%{_datadir}/mime-info
 %{_datadir}/omf
 %{_datadir}/pixmaps/*
 %{_libdir}/%{name}
+%{_libdir}/pkgconfig/*.pc
+%{_includedir}/*
 %{_sysconfdir}/gconf/schemas/*
 
-
 %changelog
+* Tue Apr 24 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.16.1-1
+- updated to 0.16.1
+- fix miscompile, patch based on debian bug report #358759
+
 * Thu Jul  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 0.14.1-1
 - Update to 0.14.1 (also fixes bug #153224).
 - BR gnome-menus-devel libcroco-devel


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/screem/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	7 Jul 2005 20:57:33 -0000	1.4
+++ sources	25 Apr 2006 01:52:06 -0000	1.5
@@ -1 +1 @@
-b23bf53698df79477f83f3d66b6eab0d  screem-0.14.1.tar.gz
+88bfc0afadb905ddbed9bdfbc869602a  screem-0.16.1.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 01:54:09 2006
From: fedora-extras-commits at redhat.com (Seth Vidal (skvidal))
Date: Mon, 24 Apr 2006 18:54:09 -0700
Subject: extras-buildsys/utils extras-sync,NONE,1.1
Message-ID: <200604250154.k3P1s9bL003381@cvs-int.fedora.redhat.com>

Author: skvidal

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3364

Added Files:
	extras-sync 
Log Message:

adding extras-sync as per ville's request.



--- NEW FILE extras-sync ---
#!/bin/bash
outputdir=/srv/rpmbuild/extras/tree/extras

echo "Test sync"
rsync -navH --delete -e ssh $outputdir/* \
   build at fedora.linux.duke.edu:/srv/web/docroot/extras/ | grep -v repodata

echo "Real Sync"
echo "Ctrl-C or kill to exit"
echo "Sleeping for 30s"
sleep 30
rsync -avH --delete -e ssh $outputdir/* build at fedora.linux.duke.edu:/srv/web/docroot/extras/







From fedora-extras-commits at redhat.com  Tue Apr 25 02:03:41 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 24 Apr 2006 19:03:41 -0700
Subject: rpms/perl-Log-Log4perl/devel perl-Log-Log4perl.spec,1.4,1.5
Message-ID: <200604250203.k3P23h7o005623@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-serv5606

Modified Files:
	perl-Log-Log4perl.spec 
Log Message:
With perl(Log::Dispatch::FileRotate)


Index: perl-Log-Log4perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/devel/perl-Log-Log4perl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Log-Log4perl.spec	6 Mar 2006 20:17:23 -0000	1.4
+++ perl-Log-Log4perl.spec	25 Apr 2006 02:03:41 -0000	1.5
@@ -1,16 +1,6 @@
-#
-# Rebuild options:
-#
-#  --with filerotate                 # With perl(Log::Dispatch::FileRotate)
-#
-
-%define log_dispatch_filerotate 0
-
-%{?_with_filerotate:%define log_dispatch_filerotate 1}
-
 Name:           perl-Log-Log4perl
 Version:        1.04
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Log4j implementation for Perl
 
 Group:          Development/Libraries
@@ -25,9 +15,7 @@
 BuildArch:      noarch
 BuildRequires:  perl(IPC::Shareable)
 BuildRequires:  perl(Log::Dispatch)
-%if %{log_dispatch_filerotate}
 BuildRequires:  perl(Log::Dispatch::FileRotate) >= 1.10
-%endif
 BuildRequires:  perl(SQL::Statement)
 BuildRequires:  perl(DBD::CSV)
 BuildRequires:  perl(XML::DOM)
@@ -44,24 +32,10 @@
 %prep
 %setup -q -n Log-Log4perl-%{version}
 %patch0 -p1
-%if %{log_dispatch_filerotate}
 %patch1 -p1
-%endif
 find lib -name "*.pm" -exec chmod a-x {} ';'
 chmod a-x eg/* 
 
-%if !%{log_dispatch_filerotate}
-# Requirements list: exclude perl(Log::Dispatch::FileRotate) >= 1.10
-
-cat <<__EOF__ > %{name}-perlreq
-#!/bin/sh
-/usr/lib/rpm/perl.req \$* | grep -v '^perl(Log::Dispatch::FileRotate)'
-__EOF__
-
-%define __perl_requires %{_builddir}/Log-Log4perl-%{version}/%{name}-perlreq
-chmod +x %{__perl_requires}
-%endif
-
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -92,6 +66,10 @@
 
 
 %changelog
+* Tue Apr 25 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.04-2
+- Log::Dispatch::FileRotate is no longer excluded due to licensing
+  problems (the package now includes copyright information).
+
 * Mon Mar  6 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.04-1
 - Update to 1.04.
 



From fedora-extras-commits at redhat.com  Tue Apr 25 02:04:45 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 19:04:45 -0700
Subject: rpms/comical/devel comical-0.8-jpe.patch, NONE,
	1.1 comical-0.8-optflags.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 comical.spec, 1.7, 1.8 sources, 1.3, 1.4
Message-ID: <200604250204.k3P24lK6005739@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/comical/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5629/devel

Modified Files:
	.cvsignore comical.spec sources 
Added Files:
	comical-0.8-jpe.patch comical-0.8-optflags.patch 
Log Message:

Bump comical to 0.8


comical-0.8-jpe.patch:

--- NEW FILE comical-0.8-jpe.patch ---
--- comical-0.8/src/ComicBookZIP.cpp.BAD	2006-04-24 20:41:07.000000000 -0500
+++ comical-0.8/src/ComicBookZIP.cpp	2006-04-24 20:41:30.000000000 -0500
@@ -54,7 +54,7 @@
 	do {
 		unzGetCurrentFileInfo(ZipFile, fileInfo, namebuf, 1024, NULL, 0, NULL, 0);
 		page = wxString::FromAscii(namebuf);
-		if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") ||
+		if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") || page.Right(4).Upper() == wxT(".JPE") || 
 		page.Right(4).Upper() == wxT(".GIF") ||
 		page.Right(4).Upper() == wxT(".PNG"))
 			Filenames->Add(page);
--- comical-0.8/src/ComicBookRAR.cpp.BAD	2006-04-24 20:41:56.000000000 -0500
+++ comical-0.8/src/ComicBookRAR.cpp	2006-04-24 20:42:15.000000000 -0500
@@ -67,7 +67,7 @@
 #else
 		page = wxString(header.FileName);
 #endif
-		if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") ||
+		if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") || page.Right(4).Upper() == wxT(".JPE") ||
 		page.Right(4).Upper() == wxT(".GIF") ||
 		page.Right(4).Upper() == wxT(".PNG"))
 			Filenames->Add(page);

comical-0.8-optflags.patch:

--- NEW FILE comical-0.8-optflags.patch ---
--- comical-0.8/unrar/makefile.linux.BAD	2006-02-11 10:15:09.000000000 -0600
+++ comical-0.8/unrar/makefile.linux	2006-04-24 20:43:10.000000000 -0500
@@ -7,7 +7,7 @@
 
 # Linux using GCC
 CXX=g++
-CXXFLAGS=-O2 -fPIC
+CXXFLAGS=-O2 -fPIC $(RPM_OPT_FLAGS)
 DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 STRIP=strip
 AR=ar
--- comical-0.8/src/Makefile.BAD	2006-04-24 20:44:53.000000000 -0500
+++ comical-0.8/src/Makefile	2006-04-24 20:45:04.000000000 -0500
@@ -1,5 +1,5 @@
 INCLUDE = -I../unrar -I../unzip
-CFLAGS = -O2 -Wall -pipe
+CFLAGS = -O2 -Wall -pipe $(RPM_OPT_FLAGS)
 CPPFLAGS = `wx-config --cxxflags` $(CFLAGS) -D_UNIX $(INCLUDE)
 
 .SUFFIXES: .cpp .png .h .d .o


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/comical/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Jan 2006 00:48:12 -0000	1.3
+++ .cvsignore	25 Apr 2006 02:04:44 -0000	1.4
@@ -1,2 +1,3 @@
 comical-0.4.tar.gz
 comical-0.7.tar.gz
+comical-0.8.tar.gz


Index: comical.spec
===================================================================
RCS file: /cvs/extras/rpms/comical/devel/comical.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- comical.spec	28 Feb 2006 21:36:40 -0000	1.7
+++ comical.spec	25 Apr 2006 02:04:44 -0000	1.8
@@ -1,21 +1,15 @@
 Name: comical
-Version: 0.7
-Release: 2%{?dist}
+Version: 0.8
+Release: 1%{?dist}
 Summary: GUI comic book viewer
 License: GPLv2
 Group: Applications/Multimedia
 URL: http://comical.sourceforge.net/
-Source0: http://download.sourceforge.net/comical/comical-0.7.tar.gz
+Source0: http://download.sourceforge.net/comical/comical-%{version}.tar.gz
 Source1: comical.png
 Source2: comical.desktop
-Patch0: comical-0.4-bracket.patch
-Patch1: comical-0.4-sort.patch
-Patch2: comical-0.4-nounrar.patch
-Patch3: comical-0.4-advancedsort.patch
-Patch4: comical-0.7-jpe.patch
-Patch5: comical-0.4-minfix.patch
-Patch6: comical-0.7-optflags.patch
-Patch7: comical-0.7-nostrip.patch
+Patch0: comical-0.8-jpe.patch
+Patch1: comical-0.8-optflags.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: wxGTK2-devel
 BuildRequires: desktop-file-utils
@@ -28,17 +22,11 @@
 
 %prep
 %setup -q
-#%patch0 -p1
-#%patch1 -p1
-#%patch2 -p1
-#%patch3 -p1
-%patch4 -p1
-#%patch5 -p1
-%patch6 -p1
-%patch7 -p1
+%patch0 -p1
+%patch1 -p1
 
 %build
-make %{?_smp_mflags}
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -62,6 +50,9 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.8-1
+- bump for 0.8
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.7-2
 - bump for FC5
 * Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.7-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/comical/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Jan 2006 00:48:12 -0000	1.3
+++ sources	25 Apr 2006 02:04:44 -0000	1.4
@@ -1 +1 @@
-b60c94a005c034d1db8ff349acd7acf5  comical-0.7.tar.gz
+f5808e28fd5a2a3d21b59cdad10eca3d  comical-0.8.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 02:04:40 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 19:04:40 -0700
Subject: rpms/comical/FC-4 comical-0.8-jpe.patch, NONE,
	1.1 comical-0.8-optflags.patch, NONE, 1.1 comical.spec, 1.7,
	1.8 sources, 1.3, 1.4
Message-ID: <200604250205.k3P25CuQ005743@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/comical/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5629/FC-4

Modified Files:
	comical.spec sources 
Added Files:
	comical-0.8-jpe.patch comical-0.8-optflags.patch 
Log Message:

Bump comical to 0.8


comical-0.8-jpe.patch:

--- NEW FILE comical-0.8-jpe.patch ---
--- comical-0.8/src/ComicBookZIP.cpp.BAD	2006-04-24 20:41:07.000000000 -0500
+++ comical-0.8/src/ComicBookZIP.cpp	2006-04-24 20:41:30.000000000 -0500
@@ -54,7 +54,7 @@
 	do {
 		unzGetCurrentFileInfo(ZipFile, fileInfo, namebuf, 1024, NULL, 0, NULL, 0);
 		page = wxString::FromAscii(namebuf);
-		if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") ||
+		if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") || page.Right(4).Upper() == wxT(".JPE") || 
 		page.Right(4).Upper() == wxT(".GIF") ||
 		page.Right(4).Upper() == wxT(".PNG"))
 			Filenames->Add(page);
--- comical-0.8/src/ComicBookRAR.cpp.BAD	2006-04-24 20:41:56.000000000 -0500
+++ comical-0.8/src/ComicBookRAR.cpp	2006-04-24 20:42:15.000000000 -0500
@@ -67,7 +67,7 @@
 #else
 		page = wxString(header.FileName);
 #endif
-		if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") ||
+		if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") || page.Right(4).Upper() == wxT(".JPE") ||
 		page.Right(4).Upper() == wxT(".GIF") ||
 		page.Right(4).Upper() == wxT(".PNG"))
 			Filenames->Add(page);

comical-0.8-optflags.patch:

--- NEW FILE comical-0.8-optflags.patch ---
--- comical-0.8/unrar/makefile.linux.BAD	2006-02-11 10:15:09.000000000 -0600
+++ comical-0.8/unrar/makefile.linux	2006-04-24 20:43:10.000000000 -0500
@@ -7,7 +7,7 @@
 
 # Linux using GCC
 CXX=g++
-CXXFLAGS=-O2 -fPIC
+CXXFLAGS=-O2 -fPIC $(RPM_OPT_FLAGS)
 DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 STRIP=strip
 AR=ar
--- comical-0.8/src/Makefile.BAD	2006-04-24 20:44:53.000000000 -0500
+++ comical-0.8/src/Makefile	2006-04-24 20:45:04.000000000 -0500
@@ -1,5 +1,5 @@
 INCLUDE = -I../unrar -I../unzip
-CFLAGS = -O2 -Wall -pipe
+CFLAGS = -O2 -Wall -pipe $(RPM_OPT_FLAGS)
 CPPFLAGS = `wx-config --cxxflags` $(CFLAGS) -D_UNIX $(INCLUDE)
 
 .SUFFIXES: .cpp .png .h .d .o


Index: comical.spec
===================================================================
RCS file: /cvs/extras/rpms/comical/FC-4/comical.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- comical.spec	28 Feb 2006 21:36:34 -0000	1.7
+++ comical.spec	25 Apr 2006 02:04:39 -0000	1.8
@@ -1,21 +1,15 @@
 Name: comical
-Version: 0.7
-Release: 2%{?dist}
+Version: 0.8
+Release: 1%{?dist}
 Summary: GUI comic book viewer
 License: GPLv2
 Group: Applications/Multimedia
 URL: http://comical.sourceforge.net/
-Source0: http://download.sourceforge.net/comical/comical-0.7.tar.gz
+Source0: http://download.sourceforge.net/comical/comical-%{version}.tar.gz
 Source1: comical.png
 Source2: comical.desktop
-Patch0: comical-0.4-bracket.patch
-Patch1: comical-0.4-sort.patch
-Patch2: comical-0.4-nounrar.patch
-Patch3: comical-0.4-advancedsort.patch
-Patch4: comical-0.7-jpe.patch
-Patch5: comical-0.4-minfix.patch
-Patch6: comical-0.7-optflags.patch
-Patch7: comical-0.7-nostrip.patch
+Patch0: comical-0.8-jpe.patch
+Patch1: comical-0.8-optflags.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: wxGTK2-devel
 BuildRequires: desktop-file-utils
@@ -28,17 +22,11 @@
 
 %prep
 %setup -q
-#%patch0 -p1
-#%patch1 -p1
-#%patch2 -p1
-#%patch3 -p1
-%patch4 -p1
-#%patch5 -p1
-%patch6 -p1
-%patch7 -p1
+%patch0 -p1
+%patch1 -p1
 
 %build
-make %{?_smp_mflags}
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -62,6 +50,9 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.8-1
+- bump for 0.8
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.7-2
 - bump for FC5
 * Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.7-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/comical/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Jan 2006 00:48:06 -0000	1.3
+++ sources	25 Apr 2006 02:04:39 -0000	1.4
@@ -1 +1 @@
-b60c94a005c034d1db8ff349acd7acf5  comical-0.7.tar.gz
+f5808e28fd5a2a3d21b59cdad10eca3d  comical-0.8.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 02:04:43 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 19:04:43 -0700
Subject: rpms/comical/FC-5 comical-0.8-jpe.patch, NONE,
	1.1 comical-0.8-optflags.patch, NONE, 1.1 comical.spec, 1.7,
	1.8 sources, 1.3, 1.4
Message-ID: <200604250205.k3P25F81005747@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/comical/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5629/FC-5

Modified Files:
	comical.spec sources 
Added Files:
	comical-0.8-jpe.patch comical-0.8-optflags.patch 
Log Message:

Bump comical to 0.8


comical-0.8-jpe.patch:

--- NEW FILE comical-0.8-jpe.patch ---
--- comical-0.8/src/ComicBookZIP.cpp.BAD	2006-04-24 20:41:07.000000000 -0500
+++ comical-0.8/src/ComicBookZIP.cpp	2006-04-24 20:41:30.000000000 -0500
@@ -54,7 +54,7 @@
 	do {
 		unzGetCurrentFileInfo(ZipFile, fileInfo, namebuf, 1024, NULL, 0, NULL, 0);
 		page = wxString::FromAscii(namebuf);
-		if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") ||
+		if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") || page.Right(4).Upper() == wxT(".JPE") || 
 		page.Right(4).Upper() == wxT(".GIF") ||
 		page.Right(4).Upper() == wxT(".PNG"))
 			Filenames->Add(page);
--- comical-0.8/src/ComicBookRAR.cpp.BAD	2006-04-24 20:41:56.000000000 -0500
+++ comical-0.8/src/ComicBookRAR.cpp	2006-04-24 20:42:15.000000000 -0500
@@ -67,7 +67,7 @@
 #else
 		page = wxString(header.FileName);
 #endif
-		if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") ||
+		if(page.Right(5).Upper() == wxT(".JPEG") || page.Right(4).Upper() == wxT(".JPG") || page.Right(4).Upper() == wxT(".JPE") ||
 		page.Right(4).Upper() == wxT(".GIF") ||
 		page.Right(4).Upper() == wxT(".PNG"))
 			Filenames->Add(page);

comical-0.8-optflags.patch:

--- NEW FILE comical-0.8-optflags.patch ---
--- comical-0.8/unrar/makefile.linux.BAD	2006-02-11 10:15:09.000000000 -0600
+++ comical-0.8/unrar/makefile.linux	2006-04-24 20:43:10.000000000 -0500
@@ -7,7 +7,7 @@
 
 # Linux using GCC
 CXX=g++
-CXXFLAGS=-O2 -fPIC
+CXXFLAGS=-O2 -fPIC $(RPM_OPT_FLAGS)
 DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 STRIP=strip
 AR=ar
--- comical-0.8/src/Makefile.BAD	2006-04-24 20:44:53.000000000 -0500
+++ comical-0.8/src/Makefile	2006-04-24 20:45:04.000000000 -0500
@@ -1,5 +1,5 @@
 INCLUDE = -I../unrar -I../unzip
-CFLAGS = -O2 -Wall -pipe
+CFLAGS = -O2 -Wall -pipe $(RPM_OPT_FLAGS)
 CPPFLAGS = `wx-config --cxxflags` $(CFLAGS) -D_UNIX $(INCLUDE)
 
 .SUFFIXES: .cpp .png .h .d .o


Index: comical.spec
===================================================================
RCS file: /cvs/extras/rpms/comical/FC-5/comical.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- comical.spec	28 Feb 2006 21:36:40 -0000	1.7
+++ comical.spec	25 Apr 2006 02:04:42 -0000	1.8
@@ -1,21 +1,15 @@
 Name: comical
-Version: 0.7
-Release: 2%{?dist}
+Version: 0.8
+Release: 1%{?dist}
 Summary: GUI comic book viewer
 License: GPLv2
 Group: Applications/Multimedia
 URL: http://comical.sourceforge.net/
-Source0: http://download.sourceforge.net/comical/comical-0.7.tar.gz
+Source0: http://download.sourceforge.net/comical/comical-%{version}.tar.gz
 Source1: comical.png
 Source2: comical.desktop
-Patch0: comical-0.4-bracket.patch
-Patch1: comical-0.4-sort.patch
-Patch2: comical-0.4-nounrar.patch
-Patch3: comical-0.4-advancedsort.patch
-Patch4: comical-0.7-jpe.patch
-Patch5: comical-0.4-minfix.patch
-Patch6: comical-0.7-optflags.patch
-Patch7: comical-0.7-nostrip.patch
+Patch0: comical-0.8-jpe.patch
+Patch1: comical-0.8-optflags.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: wxGTK2-devel
 BuildRequires: desktop-file-utils
@@ -28,17 +22,11 @@
 
 %prep
 %setup -q
-#%patch0 -p1
-#%patch1 -p1
-#%patch2 -p1
-#%patch3 -p1
-%patch4 -p1
-#%patch5 -p1
-%patch6 -p1
-%patch7 -p1
+%patch0 -p1
+%patch1 -p1
 
 %build
-make %{?_smp_mflags}
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -62,6 +50,9 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.8-1
+- bump for 0.8
+
 * Tue Feb 28 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.7-2
 - bump for FC5
 * Thu Jan  5 2006 Tom "spot" Callaway <tcallawa at redhat.com> 0.7-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/comical/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Jan 2006 00:48:12 -0000	1.3
+++ sources	25 Apr 2006 02:04:43 -0000	1.4
@@ -1 +1 @@
-b60c94a005c034d1db8ff349acd7acf5  comical-0.7.tar.gz
+f5808e28fd5a2a3d21b59cdad10eca3d  comical-0.8.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 02:19:32 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 19:19:32 -0700
Subject: rpms/ebtables/FC-4 ebtables.spec,1.8,1.9 sources,1.3,1.4
Message-ID: <200604250219.k3P2JY08005982@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ebtables/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5914/FC-4

Modified Files:
	ebtables.spec sources 
Log Message:

ebtables bump to rc2



Index: ebtables.spec
===================================================================
RCS file: /cvs/extras/rpms/ebtables/FC-4/ebtables.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ebtables.spec	3 Apr 2006 02:21:06 -0000	1.8
+++ ebtables.spec	25 Apr 2006 02:19:32 -0000	1.9
@@ -1,8 +1,8 @@
-%define prever	rc1
+%define prever	rc2
 
 Name:		ebtables
 Version:	2.0.8
-Release:	0.5.%{prever}%{?dist}
+Release:	0.1.%{prever}%{?dist}
 Summary:	Ethernet Bridge frame table administration tool
 License:	GPL
 Group:		System Environment/Base
@@ -76,6 +76,9 @@
 %ghost %{_sysconfdir}/ebtables.broute
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.1.rc2
+- bump to rc2
+
 * Sun Apr  2 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.5.rc1
 - learn to use "install" correctly. :/
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ebtables/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Jan 2006 16:03:54 -0000	1.3
+++ sources	25 Apr 2006 02:19:32 -0000	1.4
@@ -1 +1 @@
-e11a586a700e05309b624cf3329025b5  ebtables-v2.0.8-rc1.tar.gz
+f07111fcc1966be669278433c35dcc28  ebtables-v2.0.8-rc2.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 02:19:33 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 19:19:33 -0700
Subject: rpms/ebtables/FC-5 ebtables.spec,1.9,1.10 sources,1.3,1.4
Message-ID: <200604250219.k3P2JZWr005987@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ebtables/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5914/FC-5

Modified Files:
	ebtables.spec sources 
Log Message:

ebtables bump to rc2



Index: ebtables.spec
===================================================================
RCS file: /cvs/extras/rpms/ebtables/FC-5/ebtables.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ebtables.spec	3 Apr 2006 02:21:07 -0000	1.9
+++ ebtables.spec	25 Apr 2006 02:19:33 -0000	1.10
@@ -1,8 +1,8 @@
-%define prever	rc1
+%define prever	rc2
 
 Name:		ebtables
 Version:	2.0.8
-Release:	0.5.%{prever}%{?dist}
+Release:	0.1.%{prever}%{?dist}
 Summary:	Ethernet Bridge frame table administration tool
 License:	GPL
 Group:		System Environment/Base
@@ -76,6 +76,9 @@
 %ghost %{_sysconfdir}/ebtables.broute
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.1.rc2
+- bump to rc2
+
 * Sun Apr  2 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.5.rc1
 - learn to use "install" correctly. :/
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ebtables/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Jan 2006 16:04:01 -0000	1.3
+++ sources	25 Apr 2006 02:19:33 -0000	1.4
@@ -1 +1 @@
-e11a586a700e05309b624cf3329025b5  ebtables-v2.0.8-rc1.tar.gz
+f07111fcc1966be669278433c35dcc28  ebtables-v2.0.8-rc2.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 02:19:34 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 19:19:34 -0700
Subject: rpms/ebtables/devel .cvsignore, 1.3, 1.4 ebtables.spec, 1.9,
	1.10 sources, 1.3, 1.4
Message-ID: <200604250219.k3P2JauJ005993@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ebtables/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5914/devel

Modified Files:
	.cvsignore ebtables.spec sources 
Log Message:

ebtables bump to rc2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ebtables/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	10 Jan 2006 16:04:01 -0000	1.3
+++ .cvsignore	25 Apr 2006 02:19:34 -0000	1.4
@@ -1,2 +1,3 @@
 ebtables-v2.0.6.tar.gz
 ebtables-v2.0.8-rc1.tar.gz
+ebtables-v2.0.8-rc2.tar.gz


Index: ebtables.spec
===================================================================
RCS file: /cvs/extras/rpms/ebtables/devel/ebtables.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ebtables.spec	3 Apr 2006 02:21:13 -0000	1.9
+++ ebtables.spec	25 Apr 2006 02:19:34 -0000	1.10
@@ -1,8 +1,8 @@
-%define prever	rc1
+%define prever	rc2
 
 Name:		ebtables
 Version:	2.0.8
-Release:	0.5.%{prever}%{?dist}
+Release:	0.1.%{prever}%{?dist}
 Summary:	Ethernet Bridge frame table administration tool
 License:	GPL
 Group:		System Environment/Base
@@ -76,6 +76,9 @@
 %ghost %{_sysconfdir}/ebtables.broute
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.1.rc2
+- bump to rc2
+
 * Sun Apr  2 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.5.rc1
 - learn to use "install" correctly. :/
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ebtables/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Jan 2006 16:04:01 -0000	1.3
+++ sources	25 Apr 2006 02:19:34 -0000	1.4
@@ -1 +1 @@
-e11a586a700e05309b624cf3329025b5  ebtables-v2.0.8-rc1.tar.gz
+f07111fcc1966be669278433c35dcc28  ebtables-v2.0.8-rc2.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 02:19:32 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 19:19:32 -0700
Subject: rpms/ebtables/FC-3 ebtables.spec,1.8,1.9 sources,1.3,1.4
Message-ID: <200604250220.k3P2K4us005997@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/ebtables/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5914/FC-3

Modified Files:
	ebtables.spec sources 
Log Message:

ebtables bump to rc2



Index: ebtables.spec
===================================================================
RCS file: /cvs/extras/rpms/ebtables/FC-3/ebtables.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ebtables.spec	3 Apr 2006 02:21:05 -0000	1.8
+++ ebtables.spec	25 Apr 2006 02:19:32 -0000	1.9
@@ -1,8 +1,8 @@
-%define prever	rc1
+%define prever	rc2
 
 Name:		ebtables
 Version:	2.0.8
-Release:	0.5.%{prever}%{?dist}
+Release:	0.1.%{prever}%{?dist}
 Summary:	Ethernet Bridge frame table administration tool
 License:	GPL
 Group:		System Environment/Base
@@ -76,6 +76,9 @@
 %ghost %{_sysconfdir}/ebtables.broute
 
 %changelog
+* Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.1.rc2
+- bump to rc2
+
 * Sun Apr  2 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.0.8-0.5.rc1
 - learn to use "install" correctly. :/
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ebtables/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	10 Jan 2006 16:03:38 -0000	1.3
+++ sources	25 Apr 2006 02:19:32 -0000	1.4
@@ -1 +1 @@
-e11a586a700e05309b624cf3329025b5  ebtables-v2.0.8-rc1.tar.gz
+f07111fcc1966be669278433c35dcc28  ebtables-v2.0.8-rc2.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 02:38:19 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 24 Apr 2006 19:38:19 -0700
Subject: rpms/perl-Log-Log4perl/FC-4 perl-Log-Log4perl.spec,1.3,1.4
Message-ID: <200604250238.k3P2cLT9006195@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Log4perl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6164/FC-4

Modified Files:
	perl-Log-Log4perl.spec 
Log Message:
Sync with devel


Index: perl-Log-Log4perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/FC-4/perl-Log-Log4perl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Log-Log4perl.spec	6 Mar 2006 20:17:16 -0000	1.3
+++ perl-Log-Log4perl.spec	25 Apr 2006 02:38:19 -0000	1.4
@@ -1,16 +1,6 @@
-#
-# Rebuild options:
-#
-#  --with filerotate                 # With perl(Log::Dispatch::FileRotate)
-#
-
-%define log_dispatch_filerotate 0
-
-%{?_with_filerotate:%define log_dispatch_filerotate 1}
-
 Name:           perl-Log-Log4perl
 Version:        1.04
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Log4j implementation for Perl
 
 Group:          Development/Libraries
@@ -25,9 +15,7 @@
 BuildArch:      noarch
 BuildRequires:  perl(IPC::Shareable)
 BuildRequires:  perl(Log::Dispatch)
-%if %{log_dispatch_filerotate}
 BuildRequires:  perl(Log::Dispatch::FileRotate) >= 1.10
-%endif
 BuildRequires:  perl(SQL::Statement)
 BuildRequires:  perl(DBD::CSV)
 BuildRequires:  perl(XML::DOM)
@@ -44,24 +32,10 @@
 %prep
 %setup -q -n Log-Log4perl-%{version}
 %patch0 -p1
-%if %{log_dispatch_filerotate}
 %patch1 -p1
-%endif
 find lib -name "*.pm" -exec chmod a-x {} ';'
 chmod a-x eg/* 
 
-%if !%{log_dispatch_filerotate}
-# Requirements list: exclude perl(Log::Dispatch::FileRotate) >= 1.10
-
-cat <<__EOF__ > %{name}-perlreq
-#!/bin/sh
-/usr/lib/rpm/perl.req \$* | grep -v '^perl(Log::Dispatch::FileRotate)'
-__EOF__
-
-%define __perl_requires %{_builddir}/Log-Log4perl-%{version}/%{name}-perlreq
-chmod +x %{__perl_requires}
-%endif
-
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -92,6 +66,10 @@
 
 
 %changelog
+* Tue Apr 25 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.04-2
+- Log::Dispatch::FileRotate is no longer excluded due to licensing
+  problems (the package now includes copyright information).
+
 * Mon Mar  6 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.04-1
 - Update to 1.04.
 



From fedora-extras-commits at redhat.com  Tue Apr 25 02:38:20 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Mon, 24 Apr 2006 19:38:20 -0700
Subject: rpms/perl-Log-Log4perl/FC-5 perl-Log-Log4perl.spec,1.4,1.5
Message-ID: <200604250238.k3P2cMDS006199@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-serv6164/FC-5

Modified Files:
	perl-Log-Log4perl.spec 
Log Message:
Sync with devel


Index: perl-Log-Log4perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Log4perl/FC-5/perl-Log-Log4perl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- perl-Log-Log4perl.spec	6 Mar 2006 20:17:23 -0000	1.4
+++ perl-Log-Log4perl.spec	25 Apr 2006 02:38:20 -0000	1.5
@@ -1,16 +1,6 @@
-#
-# Rebuild options:
-#
-#  --with filerotate                 # With perl(Log::Dispatch::FileRotate)
-#
-
-%define log_dispatch_filerotate 0
-
-%{?_with_filerotate:%define log_dispatch_filerotate 1}
-
 Name:           perl-Log-Log4perl
 Version:        1.04
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Log4j implementation for Perl
 
 Group:          Development/Libraries
@@ -25,9 +15,7 @@
 BuildArch:      noarch
 BuildRequires:  perl(IPC::Shareable)
 BuildRequires:  perl(Log::Dispatch)
-%if %{log_dispatch_filerotate}
 BuildRequires:  perl(Log::Dispatch::FileRotate) >= 1.10
-%endif
 BuildRequires:  perl(SQL::Statement)
 BuildRequires:  perl(DBD::CSV)
 BuildRequires:  perl(XML::DOM)
@@ -44,24 +32,10 @@
 %prep
 %setup -q -n Log-Log4perl-%{version}
 %patch0 -p1
-%if %{log_dispatch_filerotate}
 %patch1 -p1
-%endif
 find lib -name "*.pm" -exec chmod a-x {} ';'
 chmod a-x eg/* 
 
-%if !%{log_dispatch_filerotate}
-# Requirements list: exclude perl(Log::Dispatch::FileRotate) >= 1.10
-
-cat <<__EOF__ > %{name}-perlreq
-#!/bin/sh
-/usr/lib/rpm/perl.req \$* | grep -v '^perl(Log::Dispatch::FileRotate)'
-__EOF__
-
-%define __perl_requires %{_builddir}/Log-Log4perl-%{version}/%{name}-perlreq
-chmod +x %{__perl_requires}
-%endif
-
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -92,6 +66,10 @@
 
 
 %changelog
+* Tue Apr 25 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.04-2
+- Log::Dispatch::FileRotate is no longer excluded due to licensing
+  problems (the package now includes copyright information).
+
 * Mon Mar  6 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.04-1
 - Update to 1.04.
 



From fedora-extras-commits at redhat.com  Tue Apr 25 05:18:28 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 22:18:28 -0700
Subject: rpms/R/FC-4 R.spec,1.14,1.15
Message-ID: <200604250519.k3P5J0G3013047@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12982/FC-4

Modified Files:
	R.spec 
Log Message:

Fix FC-4 ppc fPIC issue.



Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/FC-4/R.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- R.spec	25 Apr 2006 01:32:13 -0000	1.14
+++ R.spec	25 Apr 2006 05:18:27 -0000	1.15
@@ -1,6 +1,6 @@
 Name: R
 Version: 2.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -102,6 +102,13 @@
 export R_PRINTCMD="lpr"
 export R_BROWSER="%{_bindir}/firefox"
 export F77="gfortran"
+# Only broken on FC-4, ppc
+%ifarch ppc
+export CPICFLAGS="-fPIC"
+export FPICFLAGS="-fPIC"
+export FCPICFLAGS="-fPIC"
+export CXXPICFLAGS="-fPIC"
+%endif
 ( %configure \
     --with-system-zlib --with-system-bzlib --with-system-pcre \
     --with-lapack \
@@ -219,6 +226,9 @@
 /sbin/ldconfig
 
 %changelog
+* Tue Apr 25 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.3.0-2
+- fix ppc build for FC-4 (artificial bump for everyone else)
+
 * Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.3.0-1
 - bump to 2.3.0 (also, bump module revisions)
 



From fedora-extras-commits at redhat.com  Tue Apr 25 05:18:28 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 22:18:28 -0700
Subject: rpms/R/FC-5 R.spec,1.14,1.15
Message-ID: <200604250519.k3P5J0S8013050@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12982/FC-5

Modified Files:
	R.spec 
Log Message:

Fix FC-4 ppc fPIC issue.



Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/FC-5/R.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- R.spec	25 Apr 2006 01:32:13 -0000	1.14
+++ R.spec	25 Apr 2006 05:18:28 -0000	1.15
@@ -1,6 +1,6 @@
 Name: R
 Version: 2.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -219,6 +219,9 @@
 /sbin/ldconfig
 
 %changelog
+* Tue Apr 25 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.3.0-2
+- fix ppc build for FC-4 (artificial bump for everyone else)
+
 * Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.3.0-1
 - bump to 2.3.0 (also, bump module revisions)
 



From fedora-extras-commits at redhat.com  Tue Apr 25 05:18:29 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 22:18:29 -0700
Subject: rpms/R/devel R.spec,1.15,1.16
Message-ID: <200604250519.k3P5J1OB013053@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12982/devel

Modified Files:
	R.spec 
Log Message:

Fix FC-4 ppc fPIC issue.



Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/devel/R.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- R.spec	25 Apr 2006 01:32:14 -0000	1.15
+++ R.spec	25 Apr 2006 05:18:29 -0000	1.16
@@ -1,6 +1,6 @@
 Name: R
 Version: 2.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -219,6 +219,9 @@
 /sbin/ldconfig
 
 %changelog
+* Tue Apr 25 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.3.0-2
+- fix ppc build for FC-4 (artificial bump for everyone else)
+
 * Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.3.0-1
 - bump to 2.3.0 (also, bump module revisions)
 



From fedora-extras-commits at redhat.com  Tue Apr 25 05:18:27 2006
From: fedora-extras-commits at redhat.com (Tom Callaway (spot))
Date: Mon, 24 Apr 2006 22:18:27 -0700
Subject: rpms/R/FC-3 R.spec,1.15,1.16
Message-ID: <200604250518.k3P5Ixfq013044@cvs-int.fedora.redhat.com>

Author: spot

Update of /cvs/extras/rpms/R/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12982/FC-3

Modified Files:
	R.spec 
Log Message:

Fix FC-4 ppc fPIC issue.



Index: R.spec
===================================================================
RCS file: /cvs/extras/rpms/R/FC-3/R.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- R.spec	25 Apr 2006 01:32:12 -0000	1.15
+++ R.spec	25 Apr 2006 05:18:27 -0000	1.16
@@ -1,6 +1,6 @@
 Name: R
 Version: 2.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A language for data analysis and graphics
 URL: http://www.r-project.org
 Source0: ftp://cran.r-project.org/pub/R/src/base/R-2/R-%{version}.tar.gz
@@ -218,6 +218,9 @@
 /sbin/ldconfig
 
 %changelog
+* Tue Apr 25 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.3.0-2
+- fix ppc build for FC-4 (artificial bump for everyone else)
+
 * Mon Apr 24 2006 Tom "spot" Callaway <tcallawa at redhat.com> 2.3.0-1
 - bump to 2.3.0 (also, bump module revisions)
 



From fedora-extras-commits at redhat.com  Tue Apr 25 06:46:37 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Mon, 24 Apr 2006 23:46:37 -0700
Subject: rpms/pan/devel .cvsignore,1.4,1.5 pan.spec,1.8,1.9 sources,1.4,1.5
Message-ID: <200604250646.k3P6kdWm015560@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/pan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15539

Modified Files:
	.cvsignore pan.spec sources 
Log Message:
update to 0.94



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	19 Apr 2006 07:53:02 -0000	1.4
+++ .cvsignore	25 Apr 2006 06:46:36 -0000	1.5
@@ -1,2 +1,3 @@
 pan-0.14.2.91.tar.bz2
 pan-0.93.tar.bz2
+pan-0.94.tar.bz2


Index: pan.spec
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pan.spec	19 Apr 2006 07:53:02 -0000	1.8
+++ pan.spec	25 Apr 2006 06:46:36 -0000	1.9
@@ -1,6 +1,6 @@
 Summary: A GNOME/GTK+ news reader for X
 Name: pan
-Version: 0.93
+Version: 0.94
 Release: 1%{?dist}
 Epoch: 1
 License: GPL
@@ -63,6 +63,9 @@
 %{_datadir}/applications/fedora-pan.desktop
 
 %changelog
+* Mon Apr 24 2006 Michael A. Peters <mpeters at mac.com> - 1:0.94-1
+- Update to 0.94
+
 * Wed Apr 19 2006 Michael A. Peters <mpeters at mac.com> - 1:0.93-1
 - Update to 0.93
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	19 Apr 2006 07:53:02 -0000	1.4
+++ sources	25 Apr 2006 06:46:36 -0000	1.5
@@ -1 +1,2 @@
 ca870a8a182f68b299796d90906918ca  pan-0.93.tar.bz2
+1013562743c330b07b84b749ed247c66  pan-0.94.tar.bz2



From fedora-extras-commits at redhat.com  Tue Apr 25 07:41:35 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Tue, 25 Apr 2006 00:41:35 -0700
Subject: rpms/gnomesword/devel .cvsignore, 1.3, 1.4 gnomesword.spec, 1.8,
	1.9 sources, 1.4, 1.5 gnomesword-2.1.2-gettext64.patch, 1.1, NONE
Message-ID: <200604250741.k3P7fbXF017911@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gnomesword/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17890

Modified Files:
	.cvsignore gnomesword.spec sources 
Removed Files:
	gnomesword-2.1.2-gettext64.patch 
Log Message:
New upstream version



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Dec 2005 21:18:31 -0000	1.3
+++ .cvsignore	25 Apr 2006 07:41:35 -0000	1.4
@@ -1,2 +1,3 @@
 gnomesword-2.1.2.tar.gz
 gnomesword-2.1.3.tar.gz
+gnomesword-2.1.6.tar.gz


Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/devel/gnomesword.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gnomesword.spec	18 Feb 2006 08:12:21 -0000	1.8
+++ gnomesword.spec	25 Apr 2006 07:41:35 -0000	1.9
@@ -1,13 +1,12 @@
 Name:           gnomesword           
-Version:        2.1.5
-Release:        2%{?dist}
+Version:        2.1.6
+Release:        1%{?dist}
 Summary:        GNOME-based Bible research tool
 
 Group:          Applications/Text
 License:        GPL
 URL:            http://gnomesword.sourceforge.net/
 Source0:        http://easynews.dl.sourceforge.net/sourceforge/gnomesword/gnomesword-%{version}.tar.gz
-#Patch0:         gnomesword-2.1.2-gettext64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  sed >= 3.95
@@ -19,9 +18,6 @@
 BuildRequires:  curl-devel
 BuildRequires:  libgnomeui-devel
 BuildRequires:  scrollkeeper
-#%%ifarch x86_64
-#BuildRequires:  libtool automake autoconf
-#%%endif
 Requires(post):   scrollkeeper
 Requires(postun): scrollkeeper
 Obsoletes:      gnomesword2
@@ -36,17 +32,12 @@
 
 %prep
 %setup -q
-#%%ifarch x86_64
-#%%patch0 -p1 -b .gettext64 
-#%%endif
 
 %{__sed} -i 's?\r??' doc/help/C/legal.xml
 %{__sed} -i 's?\r??' doc/help/fr/legal.xml
 
 %build
-#%%ifarch x86_64
-#libtoolize -c --force && aclocal-1.9 && autoheader && automake-1.9 && autoconf
-#%%endif
+export LDFLAGS="${LDFLAGS} -Wl,--export-dynamic"
 %configure
 make %{?_smp_mflags}
 
@@ -89,6 +80,13 @@
 
 
 %changelog
+* Tue Apr 25 2006 Michael A. Peters <mpeters at mac.com> - 2.1.6-1
+- New upstream version
+- removed commented out fixes for since upstream fixed 64-bit issues
+
+* Mon Apr 17 2006 Michael A. Peters <mpeters at mac.com> - 2.1.5-3
+- fix bug 188581 (187198)
+
 * Sat Feb 18 2006 Michael A. Peters <mpeters at mac.com> - 2.1.5-2
 - Rebuild in devel
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Dec 2005 23:30:20 -0000	1.4
+++ sources	25 Apr 2006 07:41:35 -0000	1.5
@@ -1,2 +1,2 @@
-ce1171f19a40256cfdd31f42c979d91c  gnomesword-2.1.2.tar.gz
 61191b987a1cfb502841f331bad8d8cd  gnomesword-2.1.5.tar.gz
+7ef05c560c594c3bc84beeb78a611efe  gnomesword-2.1.6.tar.gz


--- gnomesword-2.1.2-gettext64.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 25 07:43:48 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Tue, 25 Apr 2006 00:43:48 -0700
Subject: rpms/gnomesword/FC-5 gnomesword.spec, 1.9, 1.10 sources, 1.4,
	1.5 gnomesword-2.1.2-gettext64.patch, 1.1, NONE
Message-ID: <200604250743.k3P7hojj017979@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gnomesword/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17960

Modified Files:
	gnomesword.spec sources 
Removed Files:
	gnomesword-2.1.2-gettext64.patch 
Log Message:
New upstream version



Index: gnomesword.spec
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/FC-5/gnomesword.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gnomesword.spec	17 Apr 2006 14:59:51 -0000	1.9
+++ gnomesword.spec	25 Apr 2006 07:43:47 -0000	1.10
@@ -1,13 +1,12 @@
 Name:           gnomesword           
-Version:        2.1.5
-Release:        3%{?dist}
+Version:        2.1.6
+Release:        1%{?dist}
 Summary:        GNOME-based Bible research tool
 
 Group:          Applications/Text
 License:        GPL
 URL:            http://gnomesword.sourceforge.net/
 Source0:        http://easynews.dl.sourceforge.net/sourceforge/gnomesword/gnomesword-%{version}.tar.gz
-#Patch0:         gnomesword-2.1.2-gettext64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  sed >= 3.95
@@ -19,9 +18,6 @@
 BuildRequires:  curl-devel
 BuildRequires:  libgnomeui-devel
 BuildRequires:  scrollkeeper
-#%%ifarch x86_64
-#BuildRequires:  libtool automake autoconf
-#%%endif
 Requires(post):   scrollkeeper
 Requires(postun): scrollkeeper
 Obsoletes:      gnomesword2
@@ -36,17 +32,11 @@
 
 %prep
 %setup -q
-#%%ifarch x86_64
-#%%patch0 -p1 -b .gettext64 
-#%%endif
 
 %{__sed} -i 's?\r??' doc/help/C/legal.xml
 %{__sed} -i 's?\r??' doc/help/fr/legal.xml
 
 %build
-#%%ifarch x86_64
-#libtoolize -c --force && aclocal-1.9 && autoheader && automake-1.9 && autoconf
-#%%endif
 export LDFLAGS="${LDFLAGS} -Wl,--export-dynamic"
 %configure
 make %{?_smp_mflags}
@@ -90,6 +80,10 @@
 
 
 %changelog
+* Tue Apr 25 2006 Michael A. Peters <mpeters at mac.com> - 2.1.6-1
+- New upstream version
+- removed commented out fixes for since upstream fixed 64-bit issues
+
 * Mon Apr 17 2006 Michael A. Peters <mpeters at mac.com> - 2.1.5-3
 - fix bug 188581 (187198)
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnomesword/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	14 Dec 2005 23:30:20 -0000	1.4
+++ sources	25 Apr 2006 07:43:47 -0000	1.5
@@ -1,2 +1,2 @@
-ce1171f19a40256cfdd31f42c979d91c  gnomesword-2.1.2.tar.gz
 61191b987a1cfb502841f331bad8d8cd  gnomesword-2.1.5.tar.gz
+7ef05c560c594c3bc84beeb78a611efe  gnomesword-2.1.6.tar.gz


--- gnomesword-2.1.2-gettext64.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 25 08:47:16 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Tue, 25 Apr 2006 01:47:16 -0700
Subject: fedora-security/audit fc4,1.215,1.216 fc5,1.129,1.130
Message-ID: <200604250847.k3P8lGRu020309@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20289/audit

Modified Files:
	fc4 fc5 
Log Message:
Add CVE-2006-1863



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -r1.215 -r1.216
--- fc4	25 Apr 2006 01:46:46 -0000	1.215
+++ fc4	25 Apr 2006 08:47:14 -0000	1.216
@@ -8,6 +8,7 @@
 CVE-2006-1942 ** firefox
 CVE-2006-1931 version (ruby, fixed 1.8.3)
 CVE-2006-1902 ignore (gcc) not a vulnerability
+CVE-2006-1863 VULNERABLE (kernel, fixed 2.6.16.11)
 CVE-2006-1790 version (firefox, fixed 1.0.8) [since FEDORA-2006-410]
 CVE-2006-1790 VULNERABLE (thunderbird, fixed 1.0.8)
 CVE-2006-1790 VULNERABLE (mozilla, fixed 1.7.13)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -r1.129 -r1.130
--- fc5	25 Apr 2006 01:46:46 -0000	1.129
+++ fc5	25 Apr 2006 08:47:14 -0000	1.130
@@ -9,6 +9,7 @@
 CVE-2006-1931 version (ruby, fixed 1.8.3)
 CVE-2006-1902 ignore (gcc) not a vulnerability
 CVE-2006-1865 version (beagle, fixed 0.2.5) [since FEDORA-2006-440]
+CVE-2006-1863 VULNERABLE (kernel, fixed 2.6.16.11)
 CVE-2006-1790 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1790 VULNERABLE (thunderbird, fixed 1.5.0.2)
 CVE-2006-1790 VULNERABLE (mozilla, fixed 1.7.13)



From fedora-extras-commits at redhat.com  Tue Apr 25 08:49:16 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 25 Apr 2006 01:49:16 -0700
Subject: rpms/d4x/FC-4 .cvsignore, 1.7, 1.8 d4x.spec, 1.10, 1.11 sources, 1.7,
	1.8
Message-ID: <200604250849.k3P8nmg4020375@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/d4x/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20320/FC-4

Modified Files:
	.cvsignore d4x.spec sources 
Log Message:
Update to 2.5.7.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/d4x/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	10 Apr 2006 12:27:38 -0000	1.7
+++ .cvsignore	25 Apr 2006 08:49:16 -0000	1.8
@@ -1 +1 @@
-d4x-2.5.7.tar.bz2
+d4x-2.5.7.1.tar.bz2


Index: d4x.spec
===================================================================
RCS file: /cvs/extras/rpms/d4x/FC-4/d4x.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- d4x.spec	10 Apr 2006 12:27:38 -0000	1.10
+++ d4x.spec	25 Apr 2006 08:49:16 -0000	1.11
@@ -3,7 +3,7 @@
 
 Summary: Downloader for X that supports resuming and many other features
 Name: d4x
-Version: 2.5.7
+Version: 2.5.7.1
 Release: 1%{?pre:.%{pre}}%{?dist}
 Group: Applications/Internet
 License: Artistic
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Tue Apr 25 2006 Matthias Saou <http://freshrpms.net/> 2.5.7.1-1
+- Update to 2.5.7.1.
+
 * Mon Apr 10 2006 Matthias Saou <http://freshrpms.net/> 2.5.7-1
 - Update to 2.5.7.
 - Update source URL and s/gz/bz2/ again.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/d4x/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	10 Apr 2006 12:27:38 -0000	1.7
+++ sources	25 Apr 2006 08:49:16 -0000	1.8
@@ -1 +1 @@
-16e27032bf1d3396b93453afde3266dd  d4x-2.5.7.tar.bz2
+68d6336c3749a7caabb0f5a5f84f4102  d4x-2.5.7.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Apr 25 08:49:17 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 25 Apr 2006 01:49:17 -0700
Subject: rpms/d4x/FC-5 .cvsignore, 1.8, 1.9 d4x.spec, 1.12, 1.13 sources, 1.8,
	1.9
Message-ID: <200604250849.k3P8nnG2020380@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/d4x/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20320/FC-5

Modified Files:
	.cvsignore d4x.spec sources 
Log Message:
Update to 2.5.7.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/d4x/FC-5/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	10 Apr 2006 12:27:39 -0000	1.8
+++ .cvsignore	25 Apr 2006 08:49:16 -0000	1.9
@@ -1 +1 @@
-d4x-2.5.7.tar.bz2
+d4x-2.5.7.1.tar.bz2


Index: d4x.spec
===================================================================
RCS file: /cvs/extras/rpms/d4x/FC-5/d4x.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- d4x.spec	10 Apr 2006 12:27:39 -0000	1.12
+++ d4x.spec	25 Apr 2006 08:49:16 -0000	1.13
@@ -3,7 +3,7 @@
 
 Summary: Downloader for X that supports resuming and many other features
 Name: d4x
-Version: 2.5.7
+Version: 2.5.7.1
 Release: 1%{?pre:.%{pre}}%{?dist}
 Group: Applications/Internet
 License: Artistic
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Tue Apr 25 2006 Matthias Saou <http://freshrpms.net/> 2.5.7.1-1
+- Update to 2.5.7.1.
+
 * Mon Apr 10 2006 Matthias Saou <http://freshrpms.net/> 2.5.7-1
 - Update to 2.5.7.
 - Update source URL and s/gz/bz2/ again.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/d4x/FC-5/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	10 Apr 2006 12:27:39 -0000	1.8
+++ sources	25 Apr 2006 08:49:16 -0000	1.9
@@ -1 +1 @@
-16e27032bf1d3396b93453afde3266dd  d4x-2.5.7.tar.bz2
+68d6336c3749a7caabb0f5a5f84f4102  d4x-2.5.7.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Apr 25 08:49:17 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Tue, 25 Apr 2006 01:49:17 -0700
Subject: rpms/d4x/devel .cvsignore, 1.8, 1.9 d4x.spec, 1.12, 1.13 sources,
	1.8, 1.9
Message-ID: <200604250849.k3P8nnrY020385@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/d4x/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20320/devel

Modified Files:
	.cvsignore d4x.spec sources 
Log Message:
Update to 2.5.7.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/d4x/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore	10 Apr 2006 12:07:40 -0000	1.8
+++ .cvsignore	25 Apr 2006 08:49:17 -0000	1.9
@@ -1 +1 @@
-d4x-2.5.7.tar.bz2
+d4x-2.5.7.1.tar.bz2


Index: d4x.spec
===================================================================
RCS file: /cvs/extras/rpms/d4x/devel/d4x.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- d4x.spec	10 Apr 2006 12:07:40 -0000	1.12
+++ d4x.spec	25 Apr 2006 08:49:17 -0000	1.13
@@ -3,7 +3,7 @@
 
 Summary: Downloader for X that supports resuming and many other features
 Name: d4x
-Version: 2.5.7
+Version: 2.5.7.1
 Release: 1%{?pre:.%{pre}}%{?dist}
 Group: Applications/Internet
 License: Artistic
@@ -70,6 +70,9 @@
 
 
 %changelog
+* Tue Apr 25 2006 Matthias Saou <http://freshrpms.net/> 2.5.7.1-1
+- Update to 2.5.7.1.
+
 * Mon Apr 10 2006 Matthias Saou <http://freshrpms.net/> 2.5.7-1
 - Update to 2.5.7.
 - Update source URL and s/gz/bz2/ again.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/d4x/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	10 Apr 2006 12:07:40 -0000	1.8
+++ sources	25 Apr 2006 08:49:17 -0000	1.9
@@ -1 +1 @@
-16e27032bf1d3396b93453afde3266dd  d4x-2.5.7.tar.bz2
+68d6336c3749a7caabb0f5a5f84f4102  d4x-2.5.7.1.tar.bz2



From fedora-extras-commits at redhat.com  Tue Apr 25 09:46:18 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Tue, 25 Apr 2006 02:46:18 -0700
Subject: rpms/gourmet/FC-5 gourmet.spec,1.4,1.5 sources,1.5,1.6
Message-ID: <200604250946.k3P9kKpa022962@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gourmet/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22943

Modified Files:
	gourmet.spec sources 
Log Message:
Try building again



Index: gourmet.spec
===================================================================
RCS file: /cvs/extras/rpms/gourmet/FC-5/gourmet.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gourmet.spec	17 Mar 2006 20:07:41 -0000	1.4
+++ gourmet.spec	25 Apr 2006 09:46:18 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:		gourmet
 Version:	0.8.5.14
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	PyGTK Recipe Manager
 
 Group:		Applications/Productivity
@@ -109,6 +109,9 @@
 %{_datadir}/gourmet
 
 %changelog
+* Tue Apr 25 2006 Michael A. Peters <mpeters at mac.com> - 0.8.5.14-2
+- try build again
+
 * Fri Mar 17 2006 Michael A. Peters <mpeters at mac.com> - 0.8.5.14-1
 - New upstream version
 - rpmlint cleanup


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gourmet/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Mar 2006 20:07:41 -0000	1.5
+++ sources	25 Apr 2006 09:46:18 -0000	1.6
@@ -1,3 +1,2 @@
-77b615493759a5a37a55589e7a24b9a9  gourmet-0.8.5.12.tar.gz
 3db64a0609bf5d97b81d8600dda559b9  gourmet-0.8.5.13.tar.gz
 f958809ea958f79a0593c3e226388faa  gourmet-0.8.5.14.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 09:48:11 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Tue, 25 Apr 2006 02:48:11 -0700
Subject: rpms/gourmet/FC-4 gourmet.spec,1.4,1.5 sources,1.5,1.6
Message-ID: <200604250948.k3P9mDxc023027@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gourmet/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23008

Modified Files:
	gourmet.spec sources 
Log Message:
FC-4 build



Index: gourmet.spec
===================================================================
RCS file: /cvs/extras/rpms/gourmet/FC-4/gourmet.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gourmet.spec	17 Mar 2006 20:01:40 -0000	1.4
+++ gourmet.spec	25 Apr 2006 09:48:11 -0000	1.5
@@ -2,7 +2,7 @@
 
 Name:		gourmet
 Version:	0.8.5.14
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	PyGTK Recipe Manager
 
 Group:		Applications/Productivity
@@ -109,6 +109,9 @@
 %{_datadir}/gourmet
 
 %changelog
+* Tue Apr 25 2006 Michael A. Peters <mpeters at mac.com> - 0.8.5.14-2
+- try build again
+
 * Fri Mar 17 2006 Michael A. Peters <mpeters at mac.com> - 0.8.5.14-1
 - New upstream version
 - rpmlint cleanup


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gourmet/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Mar 2006 20:01:40 -0000	1.5
+++ sources	25 Apr 2006 09:48:11 -0000	1.6
@@ -1,3 +1,2 @@
-77b615493759a5a37a55589e7a24b9a9  gourmet-0.8.5.12.tar.gz
 3db64a0609bf5d97b81d8600dda559b9  gourmet-0.8.5.13.tar.gz
 f958809ea958f79a0593c3e226388faa  gourmet-0.8.5.14.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 09:49:42 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Tue, 25 Apr 2006 02:49:42 -0700
Subject: rpms/gourmet/FC-3 gourmet.spec,1.3,1.4 sources,1.4,1.5
Message-ID: <200604250949.k3P9niDc023090@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gourmet/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23071

Modified Files:
	gourmet.spec sources 
Log Message:
fc3 build



Index: gourmet.spec
===================================================================
RCS file: /cvs/extras/rpms/gourmet/FC-3/gourmet.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- gourmet.spec	11 Nov 2005 23:28:07 -0000	1.3
+++ gourmet.spec	25 Apr 2006 09:49:42 -0000	1.4
@@ -1,8 +1,8 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:		gourmet
-Version:	0.8.5.13
-Release:	1%{?dist}
+Version:	0.8.5.14
+Release:	2%{?dist}
 Summary:	PyGTK Recipe Manager
 
 Group:		Applications/Productivity
@@ -33,10 +33,21 @@
 %prep
 %setup -q
 %{__sed} -i 's?\.$??g' gourmet.desktop
+%{__sed} -i 's?\r??' src/lib/defaults_sk.py
+%{__sed} -i 's?\r??' src/lib/defaults_pt.py
+chmod -x data/recipe.dtd
 # remove *.mo files - we'll regenerate them
 pushd i18n
 find -name \*.mo |xargs rm -f
 popd
+# remove shell bangs
+pushd src/lib
+for file in `find . -type f`; do
+  cp $file $file.orig
+  grep -v "\#\!\/usr\/bin" $file.orig > $file
+  rm -f $file.orig
+done
+popd
 
 %build
 pushd i18n
@@ -52,6 +63,7 @@
 %{__python} setup.py install -O1 --skip-build --root %buildroot \
 --disable-modules-check
 
+
 desktop-file-install %buildroot%_datadir/applications/gourmet.desktop \
 --vendor=fedora \
 --add-category=X-Fedora \
@@ -59,7 +71,6 @@
 --copy-name-to-generic-name \
 --delete-original
 
-
 %find_lang %{name}
 
 %clean
@@ -98,6 +109,13 @@
 %{_datadir}/gourmet
 
 %changelog
+* Tue Apr 25 2006 Michael A. Peters <mpeters at mac.com> - 0.8.5.14-2
+- try build again
+
+* Fri Mar 17 2006 Michael A. Peters <mpeters at mac.com> - 0.8.5.14-1
+- New upstream version
+- rpmlint cleanup
+
 * Fri Nov 11 2005 Michael A. Peters <mpeters at mac.com> - 0.8.5.13-1
 - New upstream version
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gourmet/FC-3/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	11 Nov 2005 23:28:07 -0000	1.4
+++ sources	25 Apr 2006 09:49:42 -0000	1.5
@@ -1,2 +1,2 @@
-77b615493759a5a37a55589e7a24b9a9  gourmet-0.8.5.12.tar.gz
 3db64a0609bf5d97b81d8600dda559b9  gourmet-0.8.5.13.tar.gz
+f958809ea958f79a0593c3e226388faa  gourmet-0.8.5.14.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 14:19:59 2006
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Tue, 25 Apr 2006 07:19:59 -0700
Subject: pm-utils Makefile,1.20,1.21
Message-ID: <200604251419.k3PEJxYC004851@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/devel/pm-utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4822

Modified Files:
	Makefile 
Log Message:
- use /etc/pm/config instead of /etc/sysconfig/pm , so this is completely
  cross-distro clean.



Index: Makefile
===================================================================
RCS file: /cvs/devel/pm-utils/Makefile,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Makefile	18 Apr 2006 01:10:33 -0000	1.20
+++ Makefile	25 Apr 2006 14:19:57 -0000	1.21
@@ -46,7 +46,6 @@
 	install -m 755 -d $(sysconfdir)/security/console.apps
 	install -m 755 -d $(sysconfdir)/pm
 	install -m 755 -d $(sysconfdir)/pm/hooks
-	install -m 755 -d $(sysconfdir)/sysconfig
 	install -m 644 pm-suspend.pam $(sysconfdir)/pam.d/pm-suspend
 	install -m 644 pm-suspend.app $(sysconfdir)/security/console.apps/pm-suspend
 	install -m 644 pm-hibernate.pam $(sysconfdir)/pam.d/pm-hibernate
@@ -54,7 +53,7 @@
 	install -m 644 pm-powersave.pam $(sysconfdir)/pam.d/pm-powersave
 	install -m 644 pm-powersave.app $(sysconfdir)/security/console.apps/pm-powersave
 
-	install -m 644 pm.sysconfig $(sysconfdir)/sysconfig/pm
+	install -m 644 pm.sysconfig $(sysconfdir)/pm/config
 	for file in pm/functions* ; do \
 		install -m 644 $$file $(sysconfdir)/pm ; \
 	done



From fedora-extras-commits at redhat.com  Tue Apr 25 14:20:00 2006
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Tue, 25 Apr 2006 07:20:00 -0700
Subject: pm-utils/pm functions,1.12,1.13
Message-ID: <200604251420.k3PEK0bj004857@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/devel/pm-utils/pm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4822/pm

Modified Files:
	functions 
Log Message:
- use /etc/pm/config instead of /etc/sysconfig/pm , so this is completely
  cross-distro clean.



Index: functions
===================================================================
RCS file: /cvs/devel/pm-utils/pm/functions,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- functions	18 Apr 2006 04:42:22 -0000	1.12
+++ functions	25 Apr 2006 14:19:58 -0000	1.13
@@ -6,7 +6,7 @@
 HIBERNATE_RESUME_POST_VIDEO=no
 SUSPEND_MODULES=""
 
-[ -f /etc/sysconfig/pm ] && . /etc/sysconfig/pm
+[ -f /etc/pm/config ] && . /etc/pm/config
 
 # export them all here
 export HIBERNATE_RESUME_POST_VIDEO



From fedora-extras-commits at redhat.com  Tue Apr 25 14:27:09 2006
From: fedora-extras-commits at redhat.com (Peter Jones (pjones))
Date: Tue, 25 Apr 2006 07:27:09 -0700
Subject: pm-utils Makefile,1.21,1.22
Message-ID: <200604251427.k3PER9UB004948@cvs-int.fedora.redhat.com>

Author: pjones

Update of /cvs/devel/pm-utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4923

Modified Files:
	Makefile 
Log Message:
- bump version for last release before moving it once again :/



Index: Makefile
===================================================================
RCS file: /cvs/devel/pm-utils/Makefile,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- Makefile	25 Apr 2006 14:19:57 -0000	1.21
+++ Makefile	25 Apr 2006 14:27:07 -0000	1.22
@@ -1,4 +1,4 @@
-VERSION:=0.17
+VERSION:=0.18
 
 CFLAGS= $(RPM_OPT_FLAGS) -Wall -D_GNU_SOURCE -g
 LDFLAGS = 



From fedora-extras-commits at redhat.com  Tue Apr 25 14:40:31 2006
From: fedora-extras-commits at redhat.com (Brian Pepple (bpepple))
Date: Tue, 25 Apr 2006 07:40:31 -0700
Subject: rpms/liferea/FC-5 .cvsignore, 1.25, 1.26 liferea.spec, 1.37,
	1.38 sources, 1.26, 1.27
Message-ID: <200604251440.k3PEeXJW005076@cvs-int.fedora.redhat.com>

Author: bpepple

Update of /cvs/extras/rpms/liferea/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5055

Modified Files:
	.cvsignore liferea.spec sources 
Log Message:
* Sat Apr 22 2006 Brian Pepple <bdpepple at ameritech.net> - 1.0.10-2
- Update to 1.0.10.
- Remove *.la, instead of excluding.
- Delete original desktop file in desktop-file-install call.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-5/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	5 Apr 2006 17:45:18 -0000	1.25
+++ .cvsignore	25 Apr 2006 14:40:30 -0000	1.26
@@ -1 +1 @@
-liferea-1.0.9.tar.gz
+liferea-1.0.10.tar.gz


Index: liferea.spec
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-5/liferea.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- liferea.spec	5 Apr 2006 17:45:18 -0000	1.37
+++ liferea.spec	25 Apr 2006 14:40:30 -0000	1.38
@@ -1,7 +1,7 @@
 %define with_dbus 1
 
 Name:           liferea
-Version:        1.0.9
+Version:        1.0.10
 Release:        2%{?dist}
 Summary:        An RSS/RDF feed reader
 
@@ -56,11 +56,12 @@
 make install DESTDIR=${RPM_BUILD_ROOT}
 %find_lang %{name}
 
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
-desktop-file-install --vendor fedora			\
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
+
+desktop-file-install --vendor fedora --delete-original	\
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications   	\
   --add-category X-Fedora			        \
-  %{name}.desktop
+  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
 
 %clean
@@ -101,10 +102,14 @@
 %{_datadir}/pixmaps/%{name}.png
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/*.so*
-%exclude %{_libdir}/%{name}/*.la
 
 
 %changelog
+* Sat Apr 22 2006 Brian Pepple <bdpepple at ameritech.net> - 1.0.10-2
+- Update to 1.0.10.
+- Remove *.la, instead of excluding.
+- Delete original desktop file in desktop-file-install call.
+
 * Wed Apr  5 2006 Brian Pepple <bdpepple at ameritech.net> - 1.0.9-2
 - Update to 1.0.9.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/liferea/FC-5/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	5 Apr 2006 17:45:18 -0000	1.26
+++ sources	25 Apr 2006 14:40:30 -0000	1.27
@@ -1 +1 @@
-60f743fcb41876ad2d02f6da88251c31  liferea-1.0.9.tar.gz
+41201991b4d7a113169ebda3e7dc54ef  liferea-1.0.10.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 15:27:50 2006
From: fedora-extras-commits at redhat.com (Chris Weyl (cweyl))
Date: Tue, 25 Apr 2006 08:27:50 -0700
Subject: owners owners.list,1.890,1.891
Message-ID: <200604251527.k3PFRqY0007459@cvs-int.fedora.redhat.com>

Author: cweyl

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7442

Modified Files:
	owners.list 
Log Message:
* Add ownership entry for perl-Gtk2-Spell



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.890
retrieving revision 1.891
diff -u -r1.890 -r1.891
--- owners.list	25 Apr 2006 01:12:32 -0000	1.890
+++ owners.list	25 Apr 2006 15:27:50 -0000	1.891
@@ -984,6 +984,7 @@
 Fedora Extras|perl-GSSAPI|Perl extension providing access to the GSSAPIv2 library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gtk2|Perl interface to the 2.x series of the Gimp Toolkit library|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Gtk2-GladeXML|Perl interface to Gtk2 GladeXML|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|
+Fedora Extras|perl-Gtk2-Spell|Perl interface to gtkspell|cweyl at alumni.drew.edu|extras-qa at fedoraproject.org|
 Fedora Extras|perl-Hook-LexWrap|Lexically scoped subroutine wrappers|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Format|HTML formatter modules|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-HTML-Mason|HTML::Mason 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  Tue Apr 25 15:34:26 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 25 Apr 2006 08:34:26 -0700
Subject: rpms/perl-Test-SubCalls - New directory
Message-ID: <200604251534.k3PFYSeI007562@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-SubCalls
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7535/perl-Test-SubCalls

Log Message:
Directory /cvs/extras/rpms/perl-Test-SubCalls added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 25 15:34:27 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 25 Apr 2006 08:34:27 -0700
Subject: rpms/perl-Test-SubCalls/devel - New directory
Message-ID: <200604251534.k3PFYTT8007565@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-SubCalls/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7535/perl-Test-SubCalls/devel

Log Message:
Directory /cvs/extras/rpms/perl-Test-SubCalls/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 25 15:34:43 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 25 Apr 2006 08:34:43 -0700
Subject: rpms/perl-Test-SubCalls Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604251534.k3PFYjPI007614@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-SubCalls
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7581

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Test-SubCalls


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Test-SubCalls
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 25 15:34:43 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 25 Apr 2006 08:34:43 -0700
Subject: rpms/perl-Test-SubCalls/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200604251534.k3PFYjTV007617@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-SubCalls/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7581/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Test-SubCalls


--- 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 Apr 25 15:35:17 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 25 Apr 2006 08:35:17 -0700
Subject: rpms/perl-Test-SubCalls import.log,1.1,1.2
Message-ID: <200604251535.k3PFZJ0B007678@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-SubCalls
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7645

Modified Files:
	import.log 
Log Message:
auto-import perl-Test-SubCalls-0.05-1 on branch devel from perl-Test-SubCalls-0.05-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-SubCalls/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Apr 2006 15:34:43 -0000	1.1
+++ import.log	25 Apr 2006 15:35:17 -0000	1.2
@@ -0,0 +1 @@
+perl-Test-SubCalls-0_05-1:HEAD:perl-Test-SubCalls-0.05-1.src.rpm:1145979309



From fedora-extras-commits at redhat.com  Tue Apr 25 15:35:18 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 25 Apr 2006 08:35:18 -0700
Subject: rpms/perl-Test-SubCalls/devel perl-Test-SubCalls.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604251535.k3PFZKoW007683@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Test-SubCalls/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7645/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Test-SubCalls.spec 
Log Message:
auto-import perl-Test-SubCalls-0.05-1 on branch devel from perl-Test-SubCalls-0.05-1.src.rpm


--- NEW FILE perl-Test-SubCalls.spec ---
Name:           perl-Test-SubCalls
Version:        0.05
Release:        1%{?dist}
Summary:        Track the number of times subs are called

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Test-SubCalls/
Source0:        http://www.cpan.org/authors/id/A/AD/ADAMK/Test-SubCalls-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(Hook::LexWrap) >= 0.20
BuildRequires:  perl(Test::Builder::Tester) >= 1.02
BuildRequires:  perl(Test::Pod) >= 1.00
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
There are a number of different situations (like testing cacheing
code) where you want to want to do a number of tests, and then verify
that some underlying subroutine deep within the code was called a
specific number of times.


%prep
%setup -q -n Test-SubCalls-%{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
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes LICENSE README
%{perl_vendorlib}/Test/
%{_mandir}/man3/*.3pm*


%changelog
* Tue Apr 25 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.05-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-SubCalls/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Apr 2006 15:34:43 -0000	1.1
+++ .cvsignore	25 Apr 2006 15:35:17 -0000	1.2
@@ -0,0 +1 @@
+Test-SubCalls-0.05.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Test-SubCalls/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Apr 2006 15:34:43 -0000	1.1
+++ sources	25 Apr 2006 15:35:17 -0000	1.2
@@ -0,0 +1 @@
+23ae21fea8a30477aba508b4a6f785b5  Test-SubCalls-0.05.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 15:36:49 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 25 Apr 2006 08:36:49 -0700
Subject: owners owners.list,1.891,1.892
Message-ID: <200604251536.k3PFapgE007753@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7736

Modified Files:
	owners.list 
Log Message:
New package: perl-Test-SubCalls (#189874)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.891
retrieving revision 1.892
diff -u -r1.891 -r1.892
--- owners.list	25 Apr 2006 15:27:50 -0000	1.891
+++ owners.list	25 Apr 2006 15:36:49 -0000	1.892
@@ -1129,6 +1129,7 @@
 Fedora Extras|perl-Test-NoWarnings|Make sure you didn't emit any warnings while testing|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Pod|Perl module for checking for POD errors in files|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Pod-Coverage|POD documentation coverage checker|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Test-SubCalls|Track the number of times subs are called|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Taint|Tools to test taintedness|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Tester|Ease testing test modules built with Test::Builder|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Test-Warn|Perl extension to test methods for warnings|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Apr 25 15:39:13 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 25 Apr 2006 08:39:13 -0700
Subject: rpms/perl-Module-Locate - New directory
Message-ID: <200604251539.k3PFdFvS007995@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Module-Locate
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7969/perl-Module-Locate

Log Message:
Directory /cvs/extras/rpms/perl-Module-Locate added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 25 15:39:14 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 25 Apr 2006 08:39:14 -0700
Subject: rpms/perl-Module-Locate/devel - New directory
Message-ID: <200604251539.k3PFdGQg007998@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Module-Locate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7969/perl-Module-Locate/devel

Log Message:
Directory /cvs/extras/rpms/perl-Module-Locate/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 25 15:39:30 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 25 Apr 2006 08:39:30 -0700
Subject: rpms/perl-Module-Locate Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604251539.k3PFdWpF008047@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Module-Locate
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8014

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Module-Locate


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Module-Locate
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 25 15:39:31 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 25 Apr 2006 08:39:31 -0700
Subject: rpms/perl-Module-Locate/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200604251539.k3PFdXlj008050@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Module-Locate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8014/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Module-Locate


--- 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 Apr 25 15:40:03 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 25 Apr 2006 08:40:03 -0700
Subject: rpms/perl-Module-Locate import.log,1.1,1.2
Message-ID: <200604251540.k3PFe5di008113@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Module-Locate
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8078

Modified Files:
	import.log 
Log Message:
auto-import perl-Module-Locate-1.7-1 on branch devel from perl-Module-Locate-1.7-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Locate/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Apr 2006 15:39:30 -0000	1.1
+++ import.log	25 Apr 2006 15:40:03 -0000	1.2
@@ -0,0 +1 @@
+perl-Module-Locate-1_7-1:HEAD:perl-Module-Locate-1.7-1.src.rpm:1145979595



From fedora-extras-commits at redhat.com  Tue Apr 25 15:40:03 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 25 Apr 2006 08:40:03 -0700
Subject: rpms/perl-Module-Locate/devel perl-Module-Locate.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604251540.k3PFe5k3008118@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Module-Locate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8078/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Module-Locate.spec 
Log Message:
auto-import perl-Module-Locate-1.7-1 on branch devel from perl-Module-Locate-1.7-1.src.rpm


--- NEW FILE perl-Module-Locate.spec ---
Name:           perl-Module-Locate
Version:        1.7
Release:        1%{?dist}
Summary:        Locate modules in the same fashion as "require" and "use"

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Module-Locate/
Source0:        http://www.cpan.org/authors/id/B/BR/BROQ/Module-Locate-%{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
Using "locate()", return the path that "require" would find for a given
module or filename (it can also return a filehandle if a reference in @INC
has been used).  This means you can test for the existence, or find the
path for, modules without having to evaluate the code they contain.

This module also comes with accompanying utility functions that are used
within the module itself (except for "get_source") and are available for
import.


%prep
%setup -q -n Module-Locate-%{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
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/Module/
%{_mandir}/man3/*.3*


%changelog
* Tue Jan 24 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.7-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Locate/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Apr 2006 15:39:30 -0000	1.1
+++ .cvsignore	25 Apr 2006 15:40:03 -0000	1.2
@@ -0,0 +1 @@
+Module-Locate-1.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Module-Locate/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Apr 2006 15:39:30 -0000	1.1
+++ sources	25 Apr 2006 15:40:03 -0000	1.2
@@ -0,0 +1 @@
+abf9f4f452243dcaa702d100b8c0b50c  Module-Locate-1.7.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 15:41:07 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 25 Apr 2006 08:41:07 -0700
Subject: owners owners.list,1.892,1.893
Message-ID: <200604251541.k3PFf9sF008176@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8159

Modified Files:
	owners.list 
Log Message:
New package: perl-Module-Locate (#189877)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.892
retrieving revision 1.893
diff -u -r1.892 -r1.893
--- owners.list	25 Apr 2006 15:36:49 -0000	1.892
+++ owners.list	25 Apr 2006 15:41:07 -0000	1.893
@@ -1063,6 +1063,7 @@
 Fedora Extras|perl-Module-Load|Runtime require of both modules and files|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Load-Conditional|Looking up module information / loading at runtime|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Loaded|Mark modules as loaded or unloaded|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Module-Locate|Locate modules in the same fashion as "require" and "use"|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Pluggable|Automatically give your module the ability to have plugins|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Refresh|Refresh %INC files when updated on disk|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Module-Signature|CPAN signature management utilities and modules|ville.skytta at iki.fi|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Apr 25 16:49:53 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 25 Apr 2006 09:49:53 -0700
Subject: rpms/dnsmasq - New directory
Message-ID: <200604251649.k3PGntWj011129@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11108/dnsmasq

Log Message:
Directory /cvs/extras/rpms/dnsmasq added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 25 16:49:54 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 25 Apr 2006 09:49:54 -0700
Subject: rpms/dnsmasq/devel - New directory
Message-ID: <200604251650.k3PGnuga011132@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11108/dnsmasq/devel

Log Message:
Directory /cvs/extras/rpms/dnsmasq/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 25 16:50:35 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 25 Apr 2006 09:50:35 -0700
Subject: rpms/dnsmasq Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604251650.k3PGobXS011186@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11153

Added Files:
	Makefile import.log 
Log Message:
Setup of module dnsmasq


--- NEW FILE Makefile ---
# Top level Makefile for module dnsmasq
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 25 16:50:36 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 25 Apr 2006 09:50:36 -0700
Subject: rpms/dnsmasq/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604251650.k3PGocfo011189@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11153/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module dnsmasq


--- 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 Apr 25 16:51:24 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 25 Apr 2006 09:51:24 -0700
Subject: rpms/dnsmasq import.log,1.1,1.2
Message-ID: <200604251651.k3PGpQmx011256@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11222

Modified Files:
	import.log 
Log Message:
auto-import dnsmasq-2.30-2 on branch devel from dnsmasq-2.30-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Apr 2006 16:50:35 -0000	1.1
+++ import.log	25 Apr 2006 16:51:24 -0000	1.2
@@ -0,0 +1 @@
+dnsmasq-2_30-2:HEAD:dnsmasq-2.30-2.src.rpm:1145983873



From fedora-extras-commits at redhat.com  Tue Apr 25 16:51:25 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 25 Apr 2006 09:51:25 -0700
Subject: rpms/dnsmasq/devel dnsmasq-2.30-fedora-extras.patch, NONE,
	1.1 dnsmasq.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604251651.k3PGpRVl011263@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11222/devel

Modified Files:
	.cvsignore sources 
Added Files:
	dnsmasq-2.30-fedora-extras.patch dnsmasq.spec 
Log Message:
auto-import dnsmasq-2.30-2 on branch devel from dnsmasq-2.30-2.src.rpm

dnsmasq-2.30-fedora-extras.patch:

--- NEW FILE dnsmasq-2.30-fedora-extras.patch ---
diff -urN dnsmasq-2.30/rpm/dnsmasq.rh dnsmasq-2.30-patched/rpm/dnsmasq.rh
--- dnsmasq-2.30/rpm/dnsmasq.rh	2006-04-23 08:26:21.000000000 -0500
+++ dnsmasq-2.30-patched/rpm/dnsmasq.rh	2006-04-24 15:06:01.000000000 -0500
@@ -2,7 +2,7 @@
 #
 # Startup script for the DNS caching server
 #
-# chkconfig: 2345 99 01
+# chkconfig: - 99 01
 # description: This script starts your DNS caching server
 # processname: dnsmasq
 # pidfile: /var/run/dnsmasq.pid
diff -urN dnsmasq-2.30/src/config.h dnsmasq-2.30-patched/src/config.h
--- dnsmasq-2.30/src/config.h	2006-04-23 13:27:20.000000000 -0500
+++ dnsmasq-2.30-patched/src/config.h	2006-04-24 15:04:28.000000000 -0500
@@ -167,8 +167,8 @@
 
 /* platform independent options- uncomment to enable */
 /* #define HAVE_BROKEN_RTC */
-/* #define HAVE_ISC_READER */
-/* #define HAVE_DBUS */
+#define HAVE_ISC_READER
+#define HAVE_DBUS
 
 #if defined(HAVE_BROKEN_RTC) && defined(HAVE_ISC_READER)
 #  error HAVE_ISC_READER is not compatible with HAVE_BROKEN_RTC


--- NEW FILE dnsmasq.spec ---
Name:           dnsmasq
Version:        2.30
Release:        2%{?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}-fedora-extras.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  dbus-devel

Requires(post):	 /sbin/chkconfig
Requires(post):  /sbin/service
Requires(preun): /sbin/chkconfig
Requires(preun): /sbin/service

%description
Dnsmasq is lightweight, easy to configure DNS forwarder and DHCP server. 
It is designed to provide DNS and, optionally, DHCP, to a small network. 
It can serve the names of local machines which are not in the global 
DNS. The DHCP server integrates with the DNS server and allows machines 
with DHCP-allocated addresses to appear in the DNS with names configured 
either in each host or in a central configuration file. Dnsmasq supports 
static and dynamic DHCP leases and BOOTP for network booting of diskless 
machines.


%prep
%setup -q
%patch0 -p1

%build
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
# normally i'd do 'make install'...it's a bit messy, though
mkdir -p $RPM_BUILD_ROOT%{_sbindir} $RPM_BUILD_ROOT%{_initrddir} \
	$RPM_BUILD_ROOT%{_mandir}/man8
install src/dnsmasq $RPM_BUILD_ROOT%{_sbindir}/dnsmasq
install dnsmasq.conf.example $RPM_BUILD_ROOT%{_sysconfdir}/dnsmasq.conf
install rpm/dnsmasq.rh $RPM_BUILD_ROOT%{_initrddir}/dnsmasq
install man/dnsmasq.8 $RPM_BUILD_ROOT%{_mandir}/man8/

%clean
rm -rf $RPM_BUILD_ROOT

%post
/sbin/chkconfig --add dnsmasq

%preun
if [ $1 = 0 ]; then     # execute this only if we are NOT doing an upgrade
    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,-)
%doc CHANGELOG COPYING FAQ doc.html setup.html UPGRADING_to_2.0
%config(noreplace) %attr(664,root,root) %{_sysconfdir}/dnsmasq.conf
%{_initrddir}/dnsmasq
%{_sbindir}/dnsmasq
%{_mandir}/man8/dnsmasq*


%changelog
* Mon Apr 24 2006 Patrick Laughton <jima at auroralinux.org> 2.30-2
- Disabled stripping of binary while installing (oops)
- Enabled HAVE_ISC_READER/HAVE_DBUS via patch
- Added BuildReq for dbus-devel

* Mon Apr 24 2006 Patrick Laughton <jima at auroralinux.org> 2.30-1
- Initial Fedora Extras RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Apr 2006 16:50:36 -0000	1.1
+++ .cvsignore	25 Apr 2006 16:51:25 -0000	1.2
@@ -0,0 +1 @@
+dnsmasq-2.30.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Apr 2006 16:50:36 -0000	1.1
+++ sources	25 Apr 2006 16:51:25 -0000	1.2
@@ -0,0 +1 @@
+91db9ef2c63269debf7794783074b751  dnsmasq-2.30.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 16:53:13 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 25 Apr 2006 09:53:13 -0700
Subject: rpms/erlang-esdl - New directory
Message-ID: <200604251653.k3PGrF7B011364@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/erlang-esdl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11338/erlang-esdl

Log Message:
Directory /cvs/extras/rpms/erlang-esdl added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 25 16:53:14 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 25 Apr 2006 09:53:14 -0700
Subject: rpms/erlang-esdl/devel - New directory
Message-ID: <200604251653.k3PGrGF2011367@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/erlang-esdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11338/erlang-esdl/devel

Log Message:
Directory /cvs/extras/rpms/erlang-esdl/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 25 16:53:34 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 25 Apr 2006 09:53:34 -0700
Subject: rpms/erlang-esdl Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604251653.k3PGraaV011428@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/erlang-esdl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11390

Added Files:
	Makefile import.log 
Log Message:
Setup of module erlang-esdl


--- NEW FILE Makefile ---
# Top level Makefile for module erlang-esdl
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 25 16:53:34 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 25 Apr 2006 09:53:34 -0700
Subject: rpms/erlang-esdl/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604251653.k3PGraiZ011432@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/erlang-esdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11390/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module erlang-esdl


--- 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 Apr 25 16:54:02 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 25 Apr 2006 09:54:02 -0700
Subject: rpms/videodog - New directory
Message-ID: <200604251654.k3PGs43Y011516@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/videodog
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11484/videodog

Log Message:
Directory /cvs/extras/rpms/videodog added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 25 16:54:02 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 25 Apr 2006 09:54:02 -0700
Subject: rpms/videodog/devel - New directory
Message-ID: <200604251654.k3PGs4ZV011522@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/videodog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11484/videodog/devel

Log Message:
Directory /cvs/extras/rpms/videodog/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 25 16:54:12 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 25 Apr 2006 09:54:12 -0700
Subject: rpms/erlang-esdl/devel erlang-esdl.spec, NONE, 1.1 .cvsignore, 1.1, 
	1.2 sources, 1.1, 1.2
Message-ID: <200604251654.k3PGsEgk011612@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/erlang-esdl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11550/devel

Modified Files:
	.cvsignore sources 
Added Files:
	erlang-esdl.spec 
Log Message:
auto-import erlang-esdl-0.95.0630-4.fc5 on branch devel from erlang-esdl-0.95.0630-4.fc5.src.rpm


--- NEW FILE erlang-esdl.spec ---
Name:           erlang-esdl
Version:        0.95.0630
Release:        4%{?dist}
Summary:        Erlang OpenGL/SDL api and utilities

Group:          Development/Libraries
License:        Distributable
URL:            http://esdl.sourceforge.net
Source:		http://download.sourceforge.net/esdl/esdl-0.95.0630.src.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  SDL-devel
BuildRequires:	libGL-devel
BuildRequires:	libGLU-devel
BuildRequires:	erlang
Requires:	erlang
Provides:	esdl = %{version}-%{release}


%description
A library that gives you access to SDL and OpenGL functionality in
your Erlang program.


%package devel
Summary:	Development files for ESDL
Group:          Development/Libraries
Requires:	%{name} = %{version}-%{release}

%description devel
Development files for ESDL.


%prep
%setup -q -n esdl-%{version}
perl -pi -e 's|INSTALLDIR = |INSTALLDIR = \$(DESTDIR)|' Makefile
perl -pi -e 's|^ERL_DIR.*|ERL_DIR:=%{_libdir}/erlang|' Makefile
find . -name '*.c' -or -name '*.h' | xargs chmod 0644


%build
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_libdir}/erlang/lib
make DESTDIR=$RPM_BUILD_ROOT install
chmod 0644 Readme
find . -name '*.html' | xargs chmod 0644
find $RPM_BUILD_ROOT%{_libdir}/erlang/lib -name 'Readme*' | xargs rm -f
find $RPM_BUILD_ROOT%{_libdir}/erlang/lib -name 'license*' | xargs rm -f
find $RPM_BUILD_ROOT%{_libdir}/erlang/lib -name '*.beam' | xargs chmod 0644
find $RPM_BUILD_ROOT%{_libdir}/erlang/lib -name '*.hrl' | xargs chmod 0644
find $RPM_BUILD_ROOT%{_libdir}/erlang/lib -name '*.erl' | xargs chmod 0644
find $RPM_BUILD_ROOT%{_libdir}/erlang/lib -name doc | xargs rm -fr
rm -rf $RPM_BUILD_ROOT%{_libdir}/erlang/lib/esdl-%{version}/c_src


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Readme license.terms
%{_libdir}/erlang/lib/esdl-%{version}
%exclude %{_libdir}/erlang/lib/esdl-%{version}/include
%exclude %{_libdir}/erlang/lib/esdl-%{version}/src


%files devel
%defattr(-,root,root,-)
%doc doc/*.html
%{_libdir}/erlang/lib/esdl-%{version}/include
%{_libdir}/erlang/lib/esdl-%{version}/src


%changelog
* Tue Apr 25 2006 Gerard Milmeister <gemi at bluewin.ch> - 0.95.0630-4
- removed c_src directory

* Mon Apr 24 2006 Gerard Milmeister <gemi at bluewin.ch> - 0.95.0630-3
- renamed package to erlang-esdl

* Mon Apr 24 2006 Gerard Milmeister <gemi at bluewin.ch> - 0.95.0630-2
- split off devel package

* Thu Sep  8 2005 Gerard Milmeister <gemi at bluewin.ch> - 0.95.0630-1
- New Version 0.95.0630

* Sun Mar  6 2005 Gerard Milmeister <gemi at bluewin.ch> - 0.94.1025-1
- New Version 0.94.1025

* Sat Jul 17 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:0.94.0615-0.fdr.1
- New Version 0.94.0615

* Sun Apr 11 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:0.94.0125-0.fdr.1
- First Fedora release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/erlang-esdl/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Apr 2006 16:53:34 -0000	1.1
+++ .cvsignore	25 Apr 2006 16:54:12 -0000	1.2
@@ -0,0 +1 @@
+esdl-0.95.0630.src.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/erlang-esdl/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Apr 2006 16:53:34 -0000	1.1
+++ sources	25 Apr 2006 16:54:12 -0000	1.2
@@ -0,0 +1 @@
+e892f64e9c5f6eca037757e5c38667ce  esdl-0.95.0630.src.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 16:54:11 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 25 Apr 2006 09:54:11 -0700
Subject: rpms/erlang-esdl import.log,1.1,1.2
Message-ID: <200604251654.k3PGsDA4011594@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/erlang-esdl
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11550

Modified Files:
	import.log 
Log Message:
auto-import erlang-esdl-0.95.0630-4.fc5 on branch devel from erlang-esdl-0.95.0630-4.fc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/erlang-esdl/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Apr 2006 16:53:33 -0000	1.1
+++ import.log	25 Apr 2006 16:54:11 -0000	1.2
@@ -0,0 +1 @@
+erlang-esdl-0_95_0630-4_fc5:HEAD:erlang-esdl-0.95.0630-4.fc5.src.rpm:1145984043



From fedora-extras-commits at redhat.com  Tue Apr 25 16:54:14 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 25 Apr 2006 09:54:14 -0700
Subject: rpms/videodog Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604251654.k3PGsGiQ011619@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/videodog
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11592

Added Files:
	Makefile import.log 
Log Message:
Setup of module videodog


--- NEW FILE Makefile ---
# Top level Makefile for module videodog
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 25 16:54:19 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 25 Apr 2006 09:54:19 -0700
Subject: rpms/videodog/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604251654.k3PGsLOB011667@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/videodog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11592/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module videodog


--- 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 Apr 25 16:54:40 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 25 Apr 2006 09:54:40 -0700
Subject: rpms/videodog import.log,1.1,1.2
Message-ID: <200604251654.k3PGsgNm011733@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/videodog
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11699

Modified Files:
	import.log 
Log Message:
auto-import videodog-0.31-2 on branch devel from videodog-0.31-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/videodog/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Apr 2006 16:54:13 -0000	1.1
+++ import.log	25 Apr 2006 16:54:40 -0000	1.2
@@ -0,0 +1 @@
+videodog-0_31-2:HEAD:videodog-0.31-2.src.rpm:1145984075



From fedora-extras-commits at redhat.com  Tue Apr 25 16:54:41 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 25 Apr 2006 09:54:41 -0700
Subject: rpms/videodog/devel videodog.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604251654.k3PGshC2011738@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/videodog/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11699/devel

Modified Files:
	.cvsignore sources 
Added Files:
	videodog.spec 
Log Message:
auto-import videodog-0.31-2 on branch devel from videodog-0.31-2.src.rpm


--- NEW FILE videodog.spec ---
Name:           videodog
Version:        0.31
Release:        2%{?dist}
Summary:        Command-line video4linux frame-grabber

Group:          Applications/Multimedia
License:        LGPL
URL:            http://paginas.terra.com.br/informatica/gleicon/video4linux/videodog.html
Source0:        http://paginas.terra.com.br/informatica/gleicon/video4linux/videodog%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	libjpeg-devel

%description
VideoDog is a command line tool to grab frames from a 
Video4linux-compliant device. It can export a file in raw, PNM, or JPG 
formats. It can also do loop capture using multiple buffers, or just be 
used to set/retrieve device data or scripts.

%prep
%setup -q -n %{name}-%{version}


%build
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_mandir}/man1 \
	$RPM_BUILD_ROOT%{_sysconfdir}
install -m 755 videodog $RPM_BUILD_ROOT%{_bindir}
install videodog.man $RPM_BUILD_ROOT%{_mandir}/man1/videodog.1
install -m 644 vd.conf $RPM_BUILD_ROOT%{_sysconfdir}


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc ALPHABLEND CHANGELOG CONFIG_FILE EFFECTS LICENSE MOTION README TODO USAGE
%config(noreplace) %{_sysconfdir}/vd.conf
%{_bindir}/videodog
%{_mandir}/man1/videodog.1*


%changelog
* Mon Apr 24 2006 Jima <jima at auroralinux.org> 0.31-2
- Cleaned up URLs as per Andreas Thienemann's recommendation

* Mon Apr 24 2006 Jima <jima at auroralinux.org> 0.31-1
- Initial Fedora Extras RPM


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/videodog/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Apr 2006 16:54:19 -0000	1.1
+++ .cvsignore	25 Apr 2006 16:54:41 -0000	1.2
@@ -0,0 +1 @@
+videodog0.31.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/videodog/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Apr 2006 16:54:19 -0000	1.1
+++ sources	25 Apr 2006 16:54:41 -0000	1.2
@@ -0,0 +1 @@
+0bdc30ad64b5bbb602b351463bc26127  videodog0.31.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 16:57:30 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 25 Apr 2006 09:57:30 -0700
Subject: owners owners.list,1.893,1.894
Message-ID: <200604251657.k3PGvWYP011844@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11823

Modified Files:
	owners.list 
Log Message:
added erlang-esdl


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.893
retrieving revision 1.894
diff -u -r1.893 -r1.894
--- owners.list	25 Apr 2006 15:41:07 -0000	1.893
+++ owners.list	25 Apr 2006 16:57:30 -0000	1.894
@@ -238,6 +238,7 @@
 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|erlang|General-purpose programming language and runtime environment|gemi at bluewin.ch|extras-qa at fedoraproject.org|
+Fedora Extras|erlang-esdl|Erlang OpenGL/SDL api and utilities|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|esmtp|User configurable relay-only Mail Transfer Agent (MTA)|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|evas|A hardware-accelerated canvas API|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|exim|The exim mail transfer agent|dwmw2 at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Tue Apr 25 17:01:53 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 25 Apr 2006 10:01:53 -0700
Subject: owners owners.list,1.894,1.895
Message-ID: <200604251702.k3PH2Tlx014126@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14107

Modified Files:
	owners.list 
Log Message:

Added dnsmasq
Added videodog



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.894
retrieving revision 1.895
diff -u -r1.894 -r1.895
--- owners.list	25 Apr 2006 16:57:30 -0000	1.894
+++ owners.list	25 Apr 2006 17:01:53 -0000	1.895
@@ -199,6 +199,7 @@
 Fedora Extras|directfb|Graphics abstraction library for the Linux Framebuffer Device|thomas at apestaart.org|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 auroralinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|docbook2X|Convert docbook into man and Texinfo|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|doctorj|Java source code analyzer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|dogtail|GUI test tool and automation framework|zcerza at redhat.com|extras-qa at fedoraproject.org|
@@ -1545,6 +1546,7 @@
 Fedora Extras|uw-imap|UW Server daemons for IMAP and POP network mail protocols|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|valknut|Direct Connect client|lmacken at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|verbiste|French conjugation system|icon at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|videodog|Command-line video4linux frame-grabber|jima at auroralinux.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|vnc-ltsp-config|Easy Enabler of VNC remote LTSP desktops|rdieter at math.unl.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  Tue Apr 25 17:13:33 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Tue, 25 Apr 2006 10:13:33 -0700
Subject: fedora-security/audit fc4,1.216,1.217 fc5,1.130,1.131
Message-ID: <200604251713.k3PHDXJQ014311@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14291

Modified Files:
	fc4 fc5 
Log Message:
Note new ethereal CVE ids.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- fc4	25 Apr 2006 08:47:14 -0000	1.216
+++ fc4	25 Apr 2006 17:13:30 -0000	1.217
@@ -6,6 +6,15 @@
 CVE-2006-1991 VULNERABLE (php)
 CVE-2006-1990 VULNERABLE (php)
 CVE-2006-1942 ** firefox
+CVE-2006-1040 VULNERABLE (ethereal, fixed 0.99.0)
+CVE-2006-1039 VULNERABLE (ethereal, fixed 0.99.0)
+CVE-2006-1038 VULNERABLE (ethereal, fixed 0.99.0)
+CVE-2006-1037 VULNERABLE (ethereal, fixed 0.99.0)
+CVE-2006-1036 VULNERABLE (ethereal, fixed 0.99.0)
+CVE-2006-1035 VULNERABLE (ethereal, fixed 0.99.0)
+CVE-2006-1034 VULNERABLE (ethereal, fixed 0.99.0)
+CVE-2006-1033 VULNERABLE (ethereal, fixed 0.99.0)
+CVE-2006-1032 VULNERABLE (ethereal, fixed 0.99.0)
 CVE-2006-1931 version (ruby, fixed 1.8.3)
 CVE-2006-1902 ignore (gcc) not a vulnerability
 CVE-2006-1863 VULNERABLE (kernel, fixed 2.6.16.11)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- fc5	25 Apr 2006 08:47:14 -0000	1.130
+++ fc5	25 Apr 2006 17:13:30 -0000	1.131
@@ -6,6 +6,15 @@
 CVE-2006-1991 VULNERABLE (php)
 CVE-2006-1990 VULNERABLE (php)
 CVE-2006-1942 ** firefox
+CVE-2006-1040 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
+CVE-2006-1039 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
+CVE-2006-1038 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
+CVE-2006-1037 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
+CVE-2006-1036 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
+CVE-2006-1035 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
+CVE-2006-1034 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
+CVE-2006-1033 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
+CVE-2006-1032 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
 CVE-2006-1931 version (ruby, fixed 1.8.3)
 CVE-2006-1902 ignore (gcc) not a vulnerability
 CVE-2006-1865 version (beagle, fixed 0.2.5) [since FEDORA-2006-440]



From fedora-extras-commits at redhat.com  Tue Apr 25 17:31:01 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Tue, 25 Apr 2006 10:31:01 -0700
Subject: rpms/libsndfile/FC-5 libsndfile.spec,1.10,1.11
Message-ID: <200604251731.k3PHV3N0014444@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/libsndfile/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14427

Modified Files:
	libsndfile.spec 
Log Message:
* Thu Mar 30 2006 Andreas Thienemann <andreas at bawue.net> - 1.0.15-1
- Updated to 1.0.15



Index: libsndfile.spec
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/FC-5/libsndfile.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- libsndfile.spec	16 Mar 2006 18:26:08 -0000	1.10
+++ libsndfile.spec	25 Apr 2006 17:31:00 -0000	1.11
@@ -1,6 +1,6 @@
 Summary:	Library for reading and writing sound files
 Name:		libsndfile
-Version:	1.0.14
+Version:	1.0.15
 Release:	1%{?dist}
 License:	LGPL
 Group:		System Environment/Libraries
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Thu Mar 30 2006 Andreas Thienemann <andreas at bawue.net> - 1.0.15-1
+- Updated to 1.0.15
+
 * Thu Mar 16 2006 Dams <anvil[AT]livna.org> - 1.0.14-1.fc5
 - Updated to 1.0.14
 - Dropped patch0



From fedora-extras-commits at redhat.com  Tue Apr 25 17:33:16 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Tue, 25 Apr 2006 10:33:16 -0700
Subject: rpms/libsndfile/FC-4 libsndfile.spec,1.9,1.10
Message-ID: <200604251733.k3PHXIWI014508@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/libsndfile/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14491

Modified Files:
	libsndfile.spec 
Log Message:
* Thu Mar 30 2006 Andreas Thienemann <andreas at bawue.net> - 1.0.15-1
- Updated to 1.0.15



Index: libsndfile.spec
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/FC-4/libsndfile.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libsndfile.spec	27 Jun 2005 18:19:24 -0000	1.9
+++ libsndfile.spec	25 Apr 2006 17:33:16 -0000	1.10
@@ -1,12 +1,11 @@
 Summary:	Library for reading and writing sound files
 Name:		libsndfile
-Version:	1.0.11
-Release:	3%{?dist}
+Version:	1.0.15
+Release:	1%{?dist}
 License:	LGPL
 Group:		System Environment/Libraries
 URL:		http://www.mega-nerd.com/libsndfile/
 Source0:	http://www.mega-nerd.com/libsndfile/libsndfile-%{version}.tar.gz
-Patch0:		libsndfile-1.0.11-svx-channels.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 BuildRequires:	alsa-lib-devel
@@ -32,8 +31,6 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .svx-channels
-
 
 %build
 %configure --disable-dependency-tracking
@@ -62,6 +59,7 @@
 %{_bindir}/sndfile-info
 %{_bindir}/sndfile-play
 %{_bindir}/sndfile-convert
+%{_bindir}/sndfile-regtest
 %{_mandir}/man1/sndfile-info.1*
 %{_mandir}/man1/sndfile-play.1*
 %{_mandir}/man1/sndfile-convert.1*
@@ -79,6 +77,13 @@
 
 
 %changelog
+* Thu Mar 30 2006 Andreas Thienemann <andreas at bawue.net> - 1.0.15-1
+- Updated to 1.0.15
+
+* Thu Mar 16 2006 Dams <anvil[AT]livna.org> - 1.0.14-1.fc5
+- Updated to 1.0.14
+- Dropped patch0
+
 * Thu May 12 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.11-3
 - rebuilt
 



From fedora-extras-commits at redhat.com  Tue Apr 25 17:34:43 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Tue, 25 Apr 2006 10:34:43 -0700
Subject: rpms/libsndfile/FC-4 libsndfile-1.0.11-svx-channels.patch,1.1,NONE
Message-ID: <200604251734.k3PHYjSE014582@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/libsndfile/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14567

Removed Files:
	libsndfile-1.0.11-svx-channels.patch 
Log Message:
Removal of unneeded patch



--- libsndfile-1.0.11-svx-channels.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 25 17:36:49 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 25 Apr 2006 10:36:49 -0700
Subject: rpms/amavisd-new/devel .cvsignore, 1.2, 1.3 amavisd-new.spec, 1.2, 
	1.3 sources, 1.2, 1.3
Message-ID: <200604251736.k3PHapB1014618@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/amavisd-new/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14597

Modified Files:
	.cvsignore amavisd-new.spec sources 
Log Message:
Update to 2.4.0.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Jan 2006 22:11:53 -0000	1.2
+++ .cvsignore	25 Apr 2006 17:36:48 -0000	1.3
@@ -1 +1 @@
-amavisd-new-2.3.3.tar.gz
+amavisd-new-2.4.0.tar.gz


Index: amavisd-new.spec
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/devel/amavisd-new.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- amavisd-new.spec	3 Feb 2006 03:25:51 -0000	1.2
+++ amavisd-new.spec	25 Apr 2006 17:36:48 -0000	1.3
@@ -2,8 +2,8 @@
 
 Summary:        Email filter with virus scanner and spamassassin support
 Name:           amavisd-new
-Version:        2.3.3
-Release:        5%{?prerelease:.%{prerelease}}%{?dist}
+Version:        2.4.0
+Release:        1%{?prerelease:.%{prerelease}}%{?dist}
 License:        GPL
 Group:          Applications/System
 URL:            http://www.ijs.si/software/amavisd/
@@ -146,6 +146,9 @@
 %ghost /var/spool/amavisd/clamd.sock
 
 %changelog
+* Tue Apr 25 2006 Steven Pritchard <steve at kspei.com> 2.4.0-1
+- Update to 2.4.0
+
 * Thu Feb 02 2006 Steven Pritchard <steve at kspei.com> 2.3.3-5
 - Add dist to Release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Jan 2006 22:11:54 -0000	1.2
+++ sources	25 Apr 2006 17:36:48 -0000	1.3
@@ -1 +1 @@
-0b02df514c1a2bf8af346bc9c7e97111  amavisd-new-2.3.3.tar.gz
+d1a3ea3244a142d8dec6dcb3e3673044  amavisd-new-2.4.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 17:41:57 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Tue, 25 Apr 2006 10:41:57 -0700
Subject: rpms/libsndfile/FC-5 sources,1.4,1.5
Message-ID: <200604251741.k3PHfxqS014689@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/libsndfile/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14672

Modified Files:
	sources 
Log Message:
* Thu Mar 30 2006 Andreas Thienemann <andreas at bawue.net> - 1.0.15-1
- Updated to 1.0.15



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	16 Mar 2006 18:26:08 -0000	1.4
+++ sources	25 Apr 2006 17:41:57 -0000	1.5
@@ -1 +1 @@
-3513c2283f4063f57615c5b9b45bf30a  libsndfile-1.0.14.tar.gz
+4171faabfad0ce550cbe9bf1b065e976  libsndfile-1.0.15.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 17:42:12 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Tue, 25 Apr 2006 10:42:12 -0700
Subject: rpms/libsndfile/FC-4 sources,1.3,1.4
Message-ID: <200604251742.k3PHgEf4014712@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/libsndfile/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14695

Modified Files:
	sources 
Log Message:
* Thu Mar 30 2006 Andreas Thienemann <andreas at bawue.net> - 1.0.15-1
- Updated to 1.0.15



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	5 Mar 2005 01:44:40 -0000	1.3
+++ sources	25 Apr 2006 17:42:12 -0000	1.4
@@ -1 +1 @@
-9ec0b3610041423a57387f284849f2fc  libsndfile-1.0.11.tar.gz
+4171faabfad0ce550cbe9bf1b065e976  libsndfile-1.0.15.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 18:39:20 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Tue, 25 Apr 2006 11:39:20 -0700
Subject: fedora-security/audit fc4,1.217,1.218 fc5,1.131,1.132
Message-ID: <200604251839.k3PIdK4q017463@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17438

Modified Files:
	fc4 fc5 
Log Message:
Note a firefox issue that only affects windows.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -r1.217 -r1.218
--- fc4	25 Apr 2006 17:13:30 -0000	1.217
+++ fc4	25 Apr 2006 18:39:17 -0000	1.218
@@ -864,7 +864,7 @@
 CVE-2005-0004 version (mysql, fixed 4.1.10)
 CVE-2005-0003 version (kernel, fixed 2.6.10)
 CVE-2005-0001 version (kernel, fixed 2.6.10)
-CVE-2004-2657 ** firefox
+CVE-2004-2657 ignore (firefox) windows only
 CVE-2004-2655 version (xscreensaver)
 CVE-2004-2654 version (squid, fixed 2.6STABLE6)
 CVE-2004-2607 version (kernel, fixed 2.6.5)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.131
retrieving revision 1.132
diff -u -r1.131 -r1.132
--- fc5	25 Apr 2006 17:13:30 -0000	1.131
+++ fc5	25 Apr 2006 18:39:17 -0000	1.132
@@ -864,7 +864,7 @@
 CVE-2005-0004 version (mysql, fixed 4.1.10)
 CVE-2005-0003 version (kernel, fixed 2.6.10)
 CVE-2005-0001 version (kernel, fixed 2.6.10)
-CVE-2004-2657 ** firefox
+CVE-2004-2657 ignore (firefox) windows only
 CVE-2004-2655 version (xscreensaver)
 CVE-2004-2654 version (squid, fixed 2.6STABLE6)
 CVE-2004-2607 version (kernel, fixed 2.6.5)



From fedora-extras-commits at redhat.com  Tue Apr 25 18:47:24 2006
From: fedora-extras-commits at redhat.com (Axel Thimm (athimm))
Date: Tue, 25 Apr 2006 11:47:24 -0700
Subject: rpms/apt/devel .cvsignore, 1.9, 1.10 apt.spec, 1.25, 1.26 sources,
	1.9, 1.10
Message-ID: <200604251847.k3PIlQrS017546@cvs-int.fedora.redhat.com>

Author: athimm

Update of /cvs/extras/rpms/apt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17525

Modified Files:
	.cvsignore apt.spec sources 
Log Message:
Update to 0.5.15lorg3 final.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	19 Apr 2006 10:26:54 -0000	1.9
+++ .cvsignore	25 Apr 2006 18:47:24 -0000	1.10
@@ -1 +1 @@
-apt-0.5.15lorg3-rc2.tar.bz2
+apt-0.5.15lorg3.tar.bz2


Index: apt.spec
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/apt.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- apt.spec	19 Apr 2006 10:26:54 -0000	1.25
+++ apt.spec	25 Apr 2006 18:47:24 -0000	1.26
@@ -6,12 +6,12 @@
 Summary:        Debian's Advanced Packaging Tool with RPM support
 Name:           apt
 Version:        0.5.15lorg3
-Release:        0.3.rc2%{?dist}
+Release:        1%{?dist}
 Group:          System Environment/Base
-URL:            http://laiskiainen.org/
+URL:            http://apt-rpm.laiskiainen.org/
 License:        GPL
 
-Source0:        http://laiskiainen.org/apt/testing/%{name}-%{version}-rc2.tar.bz2
+Source0:        http://laiskiainen.org/apt/testing/%{name}-%{version}.tar.bz2
 
 # user editable template configs
 Source1:        apt.conf
@@ -123,7 +123,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-rc2
+%setup -q
 
 # fix docs to reference correct paths
 perl -pi -e \
@@ -308,6 +308,10 @@
 
 
 %changelog
+* Tue Apr 25 2006 Axel Thimm <thimm at neu.nirvana>
+- Update to 0.5.15lorg3 final.
+- Fix URL.
+
 * Wed Apr 19 2006 Ralf Cors??pius <rc040203 at freenet.de>
 - 0.5.15lorg3-rc2.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/apt/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	19 Apr 2006 10:26:54 -0000	1.9
+++ sources	25 Apr 2006 18:47:24 -0000	1.10
@@ -1 +1 @@
-f6a6bcd712ad5826e92bad68a9f508c3  apt-0.5.15lorg3-rc2.tar.bz2
+167cfdf8dea5eb1a9873a53ff546bf6a  apt-0.5.15lorg3.tar.bz2



From fedora-extras-commits at redhat.com  Tue Apr 25 18:54:27 2006
From: fedora-extras-commits at redhat.com (Josh Bressers (bressers))
Date: Tue, 25 Apr 2006 11:54:27 -0700
Subject: fedora-security/audit fc4,1.218,1.219 fc5,1.132,1.133
Message-ID: <200604251854.k3PIsR66017619@cvs-int.fedora.redhat.com>

Author: bressers

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17599

Modified Files:
	fc4 fc5 
Log Message:
Note a kernel CVE id.



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.218
retrieving revision 1.219
diff -u -r1.218 -r1.219
--- fc4	25 Apr 2006 18:39:17 -0000	1.218
+++ fc4	25 Apr 2006 18:54:24 -0000	1.219
@@ -138,6 +138,7 @@
 CVE-2006-0645 backport (gnutls) [since FEDORA-2006-107]
 CVE-2006-0591 version (postgresql, fixed 8.0.6) [since FEDORA-2005-021]
 CVE-2006-0576 VULNERABLE (oprofile)
+CVE-2006-0558 * kernel
 CVE-2006-0557 version (kernel, fixed 2.6.15.5) [since FEDORA-2006-245] was backport since FEDORA-2006-131
 CVE-2006-0555 version (kernel, fixed 2.6.15.5) [since FEDORA-2006-245] was backport since FEDORA-2006-131
 CVE-2006-0554 version (kernel, fixed 2.6.15.5) [since FEDORA-2006-245] was backport since FEDORA-2006-131


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- fc5	25 Apr 2006 18:39:17 -0000	1.132
+++ fc5	25 Apr 2006 18:54:24 -0000	1.133
@@ -140,6 +140,7 @@
 CVE-2006-0645 version (gnutls, fixed 1.2.10)
 CVE-2006-0591 version (postgresql, fixed 8.0.6)
 CVE-2006-0576 backport (oprofile) oprofile_opcontrol.patch
+CVE-2006-0558 * kernel
 CVE-2006-0557 version (kernel, fixed 2.6.15.6) patch-2.6.16-rc6 [since FEDORA-2006-233]
 CVE-2006-0555 version (kernel, fixed 2.6.16) patch-2.6.16-rc6-git3 [since FEDORA-2006-233]
 CVE-2006-0554 version (kernel, fixed 2.6.16) patch-2.6.16-rc6 [since FEDORA-2006-233]



From fedora-extras-commits at redhat.com  Tue Apr 25 19:35:59 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 25 Apr 2006 12:35:59 -0700
Subject: rpms/amavisd-new/FC-5 .cvsignore, 1.2, 1.3 amavisd-new.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200604251936.k3PJa1v8019938@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-serv19917

Modified Files:
	.cvsignore amavisd-new.spec sources 
Log Message:
Update to 2.4.0.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Jan 2006 22:11:53 -0000	1.2
+++ .cvsignore	25 Apr 2006 19:35:59 -0000	1.3
@@ -1 +1 @@
-amavisd-new-2.3.3.tar.gz
+amavisd-new-2.4.0.tar.gz


Index: amavisd-new.spec
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/FC-5/amavisd-new.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- amavisd-new.spec	3 Feb 2006 03:25:51 -0000	1.2
+++ amavisd-new.spec	25 Apr 2006 19:35:59 -0000	1.3
@@ -2,8 +2,8 @@
 
 Summary:        Email filter with virus scanner and spamassassin support
 Name:           amavisd-new
-Version:        2.3.3
-Release:        5%{?prerelease:.%{prerelease}}%{?dist}
+Version:        2.4.0
+Release:        1%{?prerelease:.%{prerelease}}%{?dist}
 License:        GPL
 Group:          Applications/System
 URL:            http://www.ijs.si/software/amavisd/
@@ -146,6 +146,9 @@
 %ghost /var/spool/amavisd/clamd.sock
 
 %changelog
+* Tue Apr 25 2006 Steven Pritchard <steve at kspei.com> 2.4.0-1
+- Update to 2.4.0
+
 * Thu Feb 02 2006 Steven Pritchard <steve at kspei.com> 2.3.3-5
 - Add dist to Release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Jan 2006 22:11:54 -0000	1.2
+++ sources	25 Apr 2006 19:35:59 -0000	1.3
@@ -1 +1 @@
-0b02df514c1a2bf8af346bc9c7e97111  amavisd-new-2.3.3.tar.gz
+d1a3ea3244a142d8dec6dcb3e3673044  amavisd-new-2.4.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 19:37:23 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Tue, 25 Apr 2006 12:37:23 -0700
Subject: rpms/amavisd-new/FC-4 .cvsignore, 1.2, 1.3 amavisd-new.spec, 1.2,
	1.3 sources, 1.2, 1.3
Message-ID: <200604251937.k3PJbPjN020005@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/amavisd-new/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19984

Modified Files:
	.cvsignore amavisd-new.spec sources 
Log Message:
Update to 2.4.0.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	26 Jan 2006 22:11:53 -0000	1.2
+++ .cvsignore	25 Apr 2006 19:37:23 -0000	1.3
@@ -1 +1 @@
-amavisd-new-2.3.3.tar.gz
+amavisd-new-2.4.0.tar.gz


Index: amavisd-new.spec
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/FC-4/amavisd-new.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- amavisd-new.spec	3 Feb 2006 03:26:54 -0000	1.2
+++ amavisd-new.spec	25 Apr 2006 19:37:23 -0000	1.3
@@ -2,8 +2,8 @@
 
 Summary:        Email filter with virus scanner and spamassassin support
 Name:           amavisd-new
-Version:        2.3.3
-Release:        5%{?prerelease:.%{prerelease}}%{?dist}
+Version:        2.4.0
+Release:        1%{?prerelease:.%{prerelease}}%{?dist}
 License:        GPL
 Group:          Applications/System
 URL:            http://www.ijs.si/software/amavisd/
@@ -146,6 +146,9 @@
 %ghost /var/spool/amavisd/clamd.sock
 
 %changelog
+* Tue Apr 25 2006 Steven Pritchard <steve at kspei.com> 2.4.0-1
+- Update to 2.4.0
+
 * Thu Feb 02 2006 Steven Pritchard <steve at kspei.com> 2.3.3-5
 - Add dist to Release
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/amavisd-new/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	26 Jan 2006 22:11:54 -0000	1.2
+++ sources	25 Apr 2006 19:37:23 -0000	1.3
@@ -1 +1 @@
-0b02df514c1a2bf8af346bc9c7e97111  amavisd-new-2.3.3.tar.gz
+d1a3ea3244a142d8dec6dcb3e3673044  amavisd-new-2.4.0.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 19:56:20 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 25 Apr 2006 12:56:20 -0700
Subject: rpms/dia/devel .cvsignore,1.2,1.3 dia.spec,1.7,1.8 sources,1.2,1.3
Message-ID: <200604251956.k3PJuMUJ020178@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/dia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20157

Modified Files:
	.cvsignore dia.spec sources 
Log Message:
* Tue Apr 25 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.95-1
- New upstream version 0.95 (final)
- Cleanup spec even more, correctly install the desktop file and icons,
  drop unneeded scrollkeeper-update in scripts (bz 189756)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dia/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Mar 2006 18:15:44 -0000	1.2
+++ .cvsignore	25 Apr 2006 19:56:20 -0000	1.3
@@ -1 +1 @@
-dia-0.95-pre7.tar.bz2
+dia-0.95.tar.bz2


Index: dia.spec
===================================================================
RCS file: /cvs/extras/rpms/dia/devel/dia.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dia.spec	31 Mar 2006 18:15:44 -0000	1.7
+++ dia.spec	25 Apr 2006 19:56:20 -0000	1.8
@@ -1,22 +1,18 @@
 Name: 		dia
 Version:	0.95
-%define pre     pre7
-Release:	0.%{pre}.1%{?dist}
+Release:	1%{?dist}
 Epoch:		1
-Summary:	A diagram drawing program.
+Summary:	Diagram drawing program
 Group:		Applications/Multimedia
 License:	GPL
 URL:		http://www.gnome.org/projects/dia/
-Source:		ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}-%{pre}.tar.bz2
+Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
 Patch1:         dia-0.92.2-dtd.patch
 Patch2:         dia-0.95-pre6-help.patch
 Patch3:         dia-0.94-fallbacktoxpmicons.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 BuildRequires:	intltool libgnomeui-devel python-devel pygtk2-devel
 BuildRequires:	docbook-utils docbook-style-dsssl docbook-style-xsl
-Requires:       /usr/share/desktop-menu-patches/redhat-diagrams.desktop
-Requires(post): /usr/bin/scrollkeeper-update
-Requires(postun): /usr/bin/scrollkeeper-update
 
 %description
 The Dia drawing program is designed to be like the Windows(TM) Visio
@@ -28,11 +24,10 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-%{pre}
+%setup -q
 %patch1 -p1 -b .dtd
 %patch2 -p1 -b .help
 %patch3 -p1 -b .fallbacktoxpmicons
-#rm doc/*/dia.1
 
 
 %build
@@ -44,20 +39,6 @@
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-
-# We use a symlink to the desktop-menu-patches file instead.
-#desktop-file-install --vendor net --delete-original     \
-#  --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
-#  --add-category X-Red-Hat-Extra                        \
-#  --add-category Office                                 \
-#  $RPM_BUILD_ROOT%{_datadir}/gnome/apps/Applications/dia.desktop
-
-rm $RPM_BUILD_ROOT%{_datadir}/applications/dia.desktop
-# replace desktop file for -Base case
-
-ln -sf %{_datadir}/desktop-menu-patches/redhat-diagrams.desktop $RPM_BUILD_ROOT%{_datadir}/applications/redhat-diagrams.desktop
-
 # remove scrollkeeper stuff we don't include in the package
 rm -rf $RPM_BUILD_ROOT/var
 
@@ -68,12 +49,30 @@
 # kill the plugin
 rm -f $RPM_BUILD_ROOT%{_libdir}/dia/libcairo*
 
+# below is the desktop file and icon stuff.
+desktop-file-install --vendor fedora  --delete-original \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
+  --add-category X-Fedora                               \
+  --add-category Office                                 \
+  $RPM_BUILD_ROOT%{_datadir}/applications/dia.desktop
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/dia-diagram.png   \
+  $RPM_BUILD_ROOT%{_datadir}/pixmaps/dia_gnome_icon.png \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+rmdir $RPM_BUILD_ROOT%{_datadir}/pixmaps
+
 
 %post
-scrollkeeper-update
+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
-scrollkeeper-update
+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
@@ -88,13 +87,21 @@
 %{_libdir}/dia
 %{_mandir}/*/*
 %{_datadir}/dia
-%{_datadir}/applications
+%{_datadir}/applications/fedora-dia.desktop
+%dir %{_datadir}/gnome
+%dir %{_datadir}/gnome/help
 %{_datadir}/gnome/help/dia
+%dir %{_datadir}/mime-info
 %{_datadir}/mime-info/*
-%{_datadir}/pixmaps/*
+%{_datadir}/icons/hicolor/48x48/apps/*.png
 
 
 %changelog
+* Tue Apr 25 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.95-1
+- New upstream version 0.95 (final)
+- Cleanup spec even more, correctly install the desktop file and icons,
+  drop unneeded scrollkeeper-update in scripts (bz 189756)
+
 * Fri Mar 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.95-0.pre7.1
 - Taking over as FE maintainer (bz 185886)
 - Cleanup spec to match FE packaging guidelines


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dia/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Mar 2006 18:15:44 -0000	1.2
+++ sources	25 Apr 2006 19:56:20 -0000	1.3
@@ -1 +1 @@
-c0b982162764933da17fdbfa9695408b  dia-0.95-pre7.tar.bz2
+d319921a91d4600df3578a4a64416393  dia-0.95.tar.bz2



From fedora-extras-commits at redhat.com  Tue Apr 25 20:04:06 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 25 Apr 2006 13:04:06 -0700
Subject: rpms/dia/FC-5 dia-0.95-pre6-help.patch, NONE, 1.1 .cvsignore, 1.1, 
	1.2 dia.spec, 1.8, 1.9 sources, 1.1,
	1.2 dia-0.94-CVE-2006-1550.patch, 1.1, NONE dia-0.94-gcc4.patch,
	1.1, NONE dia-0.94-gnomeflags.patch, 1.1,
	NONE dia-0.94-help.patch, 1.2, NONE dia-0.94-rh165337.patch, 1.1,
	NONE dia-0.94-svgimport-fix.patch, 1.1, NONE
Message-ID: <200604252004.k3PK48WD022389@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/dia/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22365

Modified Files:
	.cvsignore dia.spec sources 
Added Files:
	dia-0.95-pre6-help.patch 
Removed Files:
	dia-0.94-CVE-2006-1550.patch dia-0.94-gcc4.patch 
	dia-0.94-gnomeflags.patch dia-0.94-help.patch 
	dia-0.94-rh165337.patch dia-0.94-svgimport-fix.patch 
Log Message:
* Tue Apr 25 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.95-1
- New upstream version 0.95 (final)
- Cleanup spec even more, correctly install the desktop file and icons,
  drop unneeded scrollkeeper-update in scripts (bz 189756)


dia-0.95-pre6-help.patch:

--- NEW FILE dia-0.95-pre6-help.patch ---
--- dia-0.95-pre6/app/commands.c.help	2006-01-27 18:48:45.000000000 +0100
+++ dia-0.95-pre6/app/commands.c	2006-03-22 16:37:25.000000000 +0100
@@ -526,7 +526,7 @@
   const char *dentry;
   GError *error = NULL;
 
-  helpdir = dia_get_data_directory("help");
+  helpdir = g_strdup ("/usr/share/gnome/help/dia");
   if (!helpdir) {
     message_warning(_("Could not find help directory"));
     return;
@@ -554,11 +554,11 @@
 			      G_DIR_SEPARATOR_S "dia-manual.chm", NULL);
       if (!g_file_test(helpindex, G_FILE_TEST_EXISTS)) {
 	helpindex = g_strconcat(helpdir, G_DIR_SEPARATOR_S, dentry,
-			      G_DIR_SEPARATOR_S "index.html", NULL);
+			      G_DIR_SEPARATOR_S "dia.xml", NULL);
       }
 #else
       helpindex = g_strconcat(helpdir, G_DIR_SEPARATOR_S, dentry,
-			      G_DIR_SEPARATOR_S "index.html", NULL);
+			      G_DIR_SEPARATOR_S "dia.xml", NULL);
 #endif
       bestscore = score;
     }
@@ -575,7 +575,7 @@
   ShellExecuteA (0, "open", helpindex, NULL, helpdir, SW_SHOWNORMAL);
 #else
   command = getenv("BROWSER");
-  command = g_strdup_printf("%s 'file://%s' &", command ? command : "gnome-open", helpindex);
+  command = g_strdup_printf("%s '%s' &", command ? command : "yelp", helpindex);
   system(command);
   g_free(command);
 #endif
--- dia-0.95-pre6/doc/en/dia.xml.help	2006-03-22 16:33:12.000000000 +0100
+++ dia-0.95-pre6/doc/en/dia.xml	2006-03-22 16:33:13.000000000 +0100
@@ -5,7 +5,7 @@
 <!DOCTYPE book
 
   PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-
+"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
   [
 
     <!ENTITY VERSION "0.95-pre6">


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/dia/FC-5/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	17 Oct 2005 10:54:39 -0000	1.1
+++ .cvsignore	25 Apr 2006 20:04:06 -0000	1.2
@@ -1 +1 @@
-dia-0.94.tar.bz2
+dia-0.95.tar.bz2


Index: dia.spec
===================================================================
RCS file: /cvs/extras/rpms/dia/FC-5/dia.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dia.spec	31 Mar 2006 21:52:11 -0000	1.8
+++ dia.spec	25 Apr 2006 20:04:06 -0000	1.9
@@ -1,40 +1,18 @@
-%define pango_version 1.1.5
-%define freetype_version 2.0.9
-%define libxml2_version 2.3.9
-
 Name: 		dia
-Summary:	A diagram drawing program.
-Version:	0.94
-Release:	21
+Version:	0.95
+Release:	1%{?dist}
 Epoch:		1
-Source:		ftp://ftp.gnome.org/pub/GNOME/stable/sources/dia/%{name}-%{version}.tar.bz2
+Summary:	Diagram drawing program
 Group:		Applications/Multimedia
 License:	GPL
-URL:		http://www.lysator.liu.se/~alla/dia/
+URL:		http://www.gnome.org/projects/dia/
+Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.bz2
+Patch1:         dia-0.92.2-dtd.patch
+Patch2:         dia-0.95-pre6-help.patch
+Patch3:         dia-0.94-fallbacktoxpmicons.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-Requires:	libxml2 >= %{libxml2_version}, pango >= %{pango_version}
-Requires:	glib2, gtk2, libgnome, libgnomeui, libart_lgpl, libxslt
-Requires:	scrollkeeper, freetype >= %{freetype_version}
-Requires:       /usr/share/desktop-menu-patches/redhat-diagrams.desktop
-Requires(post): /usr/bin/scrollkeeper-update
-Requires(postun): /usr/bin/scrollkeeper-update
-
-BuildRequires:	libxml2-devel >= %{libxml2_version}, intltool > 0.21
-BuildRequires:	pango-devel >= %{pango_version}
-BuildRequires:	freetype-devel >= %{freetype_version}
-BuildRequires:	glib2-devel, gtk2-devel, libgnome-devel, libgnomeui-devel
-BuildRequires:	docbook-utils docbook-dtds docbook-style-dsssl docbook-style-xsl
-BuildRequires:	openjade, libpng-devel, automake17, libart_lgpl-devel, 
-BuildRequires:  libxslt-devel, libgnome-devel
-
-Patch0: dia-0.94-svgimport-fix.patch
-Patch1: dia-0.92.2-dtd.patch
-Patch2: dia-0.94-help.patch
-Patch3: dia-0.94-gcc4.patch
-Patch4: dia-0.94-fallbacktoxpmicons.patch
-Patch5: dia-0.94-rh165337.patch
-Patch6: dia-0.94-gnomeflags.patch
-Patch7: dia-0.94-CVE-2006-1550.patch
+BuildRequires:	intltool libgnomeui-devel python-devel pygtk2-devel
+BuildRequires:	docbook-utils docbook-style-dsssl docbook-style-xsl
 
 %description
 The Dia drawing program is designed to be like the Windows(TM) Visio
@@ -44,48 +22,23 @@
 save diagrams to a custom file format, can load and save in .xml format,
 and can export to PostScript(TM).
 
-%prep
-%setup -q -n %{name}-%{version}
 
-%patch0 -p1 -b .svgimportfix
+%prep
+%setup -q
 %patch1 -p1 -b .dtd
 %patch2 -p1 -b .help
-%patch3 -p1 -b .gcc4
-%patch4 -p1 -b .fallbacktoxpmicons
-%patch5 -p1 -b .rh165337
-%patch6 -p1 -b .gnomeflags
-%patch7 -p1 -b .cve
+%patch3 -p1 -b .fallbacktoxpmicons
+
 
 %build
-rm doc/*/dia.1
-aclocal-1.7
-libtoolize --force
-automake-1.7
-autoconf
-%configure --enable-gnome --enable-db2html --with-cairo=no
-
-export GNOME_CFLAGS=`pkg-config --cflags libgnomeui-2.0 libgnome-2.0`
-export GNOME_LIBS=`pkg-config --libs libgnomeui-2.0 libgnome-2.0`
-CFLAGS=$RPM_OPT_FLAGS make
+%configure --enable-gnome --enable-db2html --with-python
+make %{?_smp_mflags}
  
+
 %install
 rm -rf $RPM_BUILD_ROOT
 %makeinstall
 
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-
-# We use a symlink to the desktop-menu-patches file instead.
-#desktop-file-install --vendor net --delete-original     \
-#  --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
-#  --add-category X-Red-Hat-Extra                        \
-#  --add-category Office                                 \
-#  $RPM_BUILD_ROOT%{_datadir}/gnome/apps/Applications/dia.desktop
-
-rm $RPM_BUILD_ROOT%{_datadir}/applications/dia.desktop
-# replace desktop file for -Base case
-
-ln -sf %{_datadir}/desktop-menu-patches/redhat-diagrams.desktop $RPM_BUILD_ROOT%{_datadir}/applications/redhat-diagrams.desktop
-
 # remove scrollkeeper stuff we don't include in the package
 rm -rf $RPM_BUILD_ROOT/var
 
@@ -96,15 +49,36 @@
 # kill the plugin
 rm -f $RPM_BUILD_ROOT%{_libdir}/dia/libcairo*
 
+# below is the desktop file and icon stuff.
+desktop-file-install --vendor fedora  --delete-original \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
+  --add-category X-Fedora                               \
+  --add-category Office                                 \
+  $RPM_BUILD_ROOT%{_datadir}/applications/dia.desktop
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/dia-diagram.png   \
+  $RPM_BUILD_ROOT%{_datadir}/pixmaps/dia_gnome_icon.png \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+rmdir $RPM_BUILD_ROOT%{_datadir}/pixmaps
+
+
 %post
-scrollkeeper-update
+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
-scrollkeeper-update
+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 -fr $RPM_BUILD_ROOT
 
+
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc AUTHORS COPYING ChangeLog KNOWN_BUGS INSTALL NEWS README TODO THANKS doc/custom-shapes doc/diagram.dtd doc/shape.dtd doc/sheet.dtd
@@ -113,18 +87,26 @@
 %{_libdir}/dia
 %{_mandir}/*/*
 %{_datadir}/dia
-%{_datadir}/applications
+%{_datadir}/applications/fedora-dia.desktop
+%dir %{_datadir}/gnome
+%dir %{_datadir}/gnome/help
 %{_datadir}/gnome/help/dia
+%dir %{_datadir}/mime-info
 %{_datadir}/mime-info/*
-%{_datadir}/pixmaps/*
+%{_datadir}/icons/hicolor/48x48/apps/*.png
 
-%changelog
-* Fri Mar 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.94-21
-- Fix CVE-2006-1550 (bz 187556)
 
-* Fri Mar 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.94-20
-- Taking over as new FE maintainer
-- Rebuild for bz 185886
+%changelog
+* Tue Apr 25 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.95-1
+- New upstream version 0.95 (final)
+- Cleanup spec even more, correctly install the desktop file and icons,
+  drop unneeded scrollkeeper-update in scripts (bz 189756)
+
+* Fri Mar 31 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.95-0.pre7.1
+- Taking over as FE maintainer (bz 185886)
+- Cleanup spec to match FE packaging guidelines
+- Bump to upstream 0.95-pre7 (bz 184548)
+- Enable python plugin
 
 * Tue Jan 03 2006 Caolan McNamara <caolanm at redhat.com> 1:0.94-19
 - make buildable
@@ -321,6 +303,3 @@
 
 * Wed Apr 28 1999 Preston Brown <pbrown at redhat.com>
 - initial build for Powertools 6.0
-
-
-


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/dia/FC-5/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	17 Oct 2005 10:54:39 -0000	1.1
+++ sources	25 Apr 2006 20:04:06 -0000	1.2
@@ -1 +1 @@
-63584224912dab49fed8d2cf87ea2d85  dia-0.94.tar.bz2
+d319921a91d4600df3578a4a64416393  dia-0.95.tar.bz2


--- dia-0.94-CVE-2006-1550.patch DELETED ---


--- dia-0.94-gcc4.patch DELETED ---


--- dia-0.94-gnomeflags.patch DELETED ---


--- dia-0.94-help.patch DELETED ---


--- dia-0.94-rh165337.patch DELETED ---


--- dia-0.94-svgimport-fix.patch DELETED ---



From fedora-extras-commits at redhat.com  Tue Apr 25 20:15:36 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 25 Apr 2006 13:15:36 -0700
Subject: rpms/dia/devel dia.spec,1.8,1.9
Message-ID: <200604252015.k3PKFcMs022496@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/dia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22479

Modified Files:
	dia.spec 
Log Message:
* Tue Apr 25 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.95-1
- New upstream version 0.95 (final)
- Cleanup spec even more, correctly install the desktop file and icons,
  drop unneeded scrollkeeper-update in scripts (bz 189756)



Index: dia.spec
===================================================================
RCS file: /cvs/extras/rpms/dia/devel/dia.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dia.spec	25 Apr 2006 19:56:20 -0000	1.8
+++ dia.spec	25 Apr 2006 20:15:35 -0000	1.9
@@ -11,8 +11,8 @@
 Patch2:         dia-0.95-pre6-help.patch
 Patch3:         dia-0.94-fallbacktoxpmicons.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-BuildRequires:	intltool libgnomeui-devel python-devel pygtk2-devel
-BuildRequires:	docbook-utils docbook-style-dsssl docbook-style-xsl
+BuildRequires:	libgnomeui-devel python-devel pygtk2-devel desktop-file-utils
+BuildRequires:	intltool docbook-utils docbook-style-dsssl docbook-style-xsl
 
 %description
 The Dia drawing program is designed to be like the Windows(TM) Visio



From fedora-extras-commits at redhat.com  Tue Apr 25 20:18:07 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Tue, 25 Apr 2006 13:18:07 -0700
Subject: rpms/dia/FC-5 dia.spec,1.9,1.10
Message-ID: <200604252018.k3PKI91t022591@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/dia/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22574

Modified Files:
	dia.spec 
Log Message:
* Tue Apr 25 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.95-1
- New upstream version 0.95 (final)
- Cleanup spec even more, correctly install the desktop file and icons,
  drop unneeded scrollkeeper-update in scripts (bz 189756)



Index: dia.spec
===================================================================
RCS file: /cvs/extras/rpms/dia/FC-5/dia.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- dia.spec	25 Apr 2006 20:04:06 -0000	1.9
+++ dia.spec	25 Apr 2006 20:18:06 -0000	1.10
@@ -11,8 +11,8 @@
 Patch2:         dia-0.95-pre6-help.patch
 Patch3:         dia-0.94-fallbacktoxpmicons.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-BuildRequires:	intltool libgnomeui-devel python-devel pygtk2-devel
-BuildRequires:	docbook-utils docbook-style-dsssl docbook-style-xsl
+BuildRequires:	libgnomeui-devel python-devel pygtk2-devel desktop-file-utils
+BuildRequires:	intltool docbook-utils docbook-style-dsssl docbook-style-xsl
 
 %description
 The Dia drawing program is designed to be like the Windows(TM) Visio



From fedora-extras-commits at redhat.com  Tue Apr 25 20:52:32 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Tue, 25 Apr 2006 13:52:32 -0700
Subject: owners owners.list,1.895,1.896
Message-ID: <200604252052.k3PKqYPa023712@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23695

Modified Files:
	owners.list 
Log Message:
Added perl-PBS



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.895
retrieving revision 1.896
diff -u -r1.895 -r1.896
--- owners.list	25 Apr 2006 17:01:53 -0000	1.895
+++ owners.list	25 Apr 2006 20:52:32 -0000	1.896
@@ -1090,6 +1090,7 @@
 Fedora Extras|perl-Parse-CPAN-Packages|Parse::CPAN::Packages Perl module|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Parse-Yapp|Perl extension for generating and using LALR parsers|pertusus at free.fr|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-PatchReader|Utilities to read and manipulate patches and CVS|stickster at gmail.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-PBS|Perl binding for the Portable Batch System client library|garrick at usc.edu|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-pmtools|A suite of small programs to help manage Perl modules|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Pod-Coverage|Checks if the documentation of a module is comprehensive|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Pod-Escapes|Perl module for resolving POD escape sequences|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Tue Apr 25 20:54:00 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Tue, 25 Apr 2006 13:54:00 -0700
Subject: rpms/perl-PBS - New directory
Message-ID: <200604252054.k3PKs2M3023782@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/perl-PBS
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23761/perl-PBS

Log Message:
Directory /cvs/extras/rpms/perl-PBS added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 25 20:54:00 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Tue, 25 Apr 2006 13:54:00 -0700
Subject: rpms/perl-PBS/devel - New directory
Message-ID: <200604252054.k3PKs2K3023785@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/perl-PBS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23761/perl-PBS/devel

Log Message:
Directory /cvs/extras/rpms/perl-PBS/devel added to the repository




From fedora-extras-commits at redhat.com  Tue Apr 25 20:54:14 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Tue, 25 Apr 2006 13:54:14 -0700
Subject: rpms/perl-PBS Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604252054.k3PKsGN7023839@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/perl-PBS
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23806

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-PBS


--- NEW FILE Makefile ---
# Top level Makefile for module perl-PBS
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 25 20:54:14 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Tue, 25 Apr 2006 13:54:14 -0700
Subject: rpms/perl-PBS/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604252054.k3PKsGdV023842@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/perl-PBS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23806/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-PBS


--- 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 Apr 25 20:54:34 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Tue, 25 Apr 2006 13:54:34 -0700
Subject: rpms/perl-PBS/devel perl-PBS.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604252054.k3PKsaKP023908@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/perl-PBS/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23870/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-PBS.spec 
Log Message:
auto-import perl-PBS-0.31-1 on branch devel from perl-PBS-0.31-1.src.rpm


--- NEW FILE perl-PBS.spec ---
Name:           perl-PBS
Version:        0.31
Release:        1%{?dist}
Summary:        Perl binding for the Portable Batch System client library

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://www-rcf.usc.edu/~garrick/perl-PBS/
Source0:        http://www-rcf.usc.edu/~garrick/perl-PBS/perl-PBS-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libtorque-devel
Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This is a Perl binding for the Portable Batch System client library (as from
TORQUE or OpenPBS).  This allows you to stat the server, nodes, or jobs, submit
jobs, alter jobs, etc.

Specifically, the ifl, rpp, and rm APIs are implemented here.


%package -n pbstop
Summary: Full-screen curses monitor for PBS
Group: Applications/System
Version: 4.14

# torque-client is needed for pbs_iff
Requires: torque-client

# this isn't picked up by autoreq because it is eval'd in a BEGIN block
Requires: perl(PBS)

%description -n pbstop
A highly useful way to monitor your cluster in a terminal window.


%prep
%setup -q

%build
%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"
make %{?_smp_mflags}

chmod ugo-x demos/*

%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/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README LICENSE Artistic demos CHANGELOG
%{perl_vendorarch}/auto/*
%{perl_vendorarch}/PBS
%{perl_vendorarch}/PBS.pm
%{_mandir}/man3/*.3*

%files -n pbstop
%defattr(-,root,root,-)
%{_mandir}/man1/*.1*
%{_bindir}/pbstop


%changelog
* Wed Apr 19 2006 Garrick Staples <garrick at usc.edu> 0.31-1
- Initial spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-PBS/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	25 Apr 2006 20:54:14 -0000	1.1
+++ .cvsignore	25 Apr 2006 20:54:34 -0000	1.2
@@ -0,0 +1 @@
+perl-PBS-0.31.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-PBS/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	25 Apr 2006 20:54:14 -0000	1.1
+++ sources	25 Apr 2006 20:54:34 -0000	1.2
@@ -0,0 +1 @@
+ab776b32945db7832acfeab5fd5cfbb6  perl-PBS-0.31.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 20:54:33 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Tue, 25 Apr 2006 13:54:33 -0700
Subject: rpms/perl-PBS import.log,1.1,1.2
Message-ID: <200604252054.k3PKsanr023903@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/perl-PBS
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23870

Modified Files:
	import.log 
Log Message:
auto-import perl-PBS-0.31-1 on branch devel from perl-PBS-0.31-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-PBS/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	25 Apr 2006 20:54:13 -0000	1.1
+++ import.log	25 Apr 2006 20:54:33 -0000	1.2
@@ -0,0 +1 @@
+perl-PBS-0_31-1:HEAD:perl-PBS-0.31-1.src.rpm:1145998355



From fedora-extras-commits at redhat.com  Tue Apr 25 21:34:08 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Tue, 25 Apr 2006 14:34:08 -0700
Subject: rpms/erlang-esdl/FC-5 erlang-esdl.spec,1.1,1.2
Message-ID: <200604252134.k3PLYAn6026773@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/erlang-esdl/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26756

Modified Files:
	erlang-esdl.spec 
Log Message:



Index: erlang-esdl.spec
===================================================================
RCS file: /cvs/extras/rpms/erlang-esdl/FC-5/erlang-esdl.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- erlang-esdl.spec	25 Apr 2006 16:54:12 -0000	1.1
+++ erlang-esdl.spec	25 Apr 2006 21:34:08 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           erlang-esdl
 Version:        0.95.0630
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Erlang OpenGL/SDL api and utilities
 
 Group:          Development/Libraries



From fedora-extras-commits at redhat.com  Tue Apr 25 21:54:42 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 25 Apr 2006 14:54:42 -0700
Subject: rpms/dnsmasq/FC-3 dnsmasq-2.30-fedora-extras.patch,1.1,1.2
Message-ID: <200604252154.k3PLsiPK026889@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26865/FC-3

Modified Files:
	dnsmasq-2.30-fedora-extras.patch 
Log Message:

Disabled dbus support for FC-3 branch (needs newer dbus to work, I guess)


dnsmasq-2.30-fedora-extras.patch:

Index: dnsmasq-2.30-fedora-extras.patch
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-3/dnsmasq-2.30-fedora-extras.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dnsmasq-2.30-fedora-extras.patch	25 Apr 2006 16:51:25 -0000	1.1
+++ dnsmasq-2.30-fedora-extras.patch	25 Apr 2006 21:54:41 -0000	1.2
@@ -13,14 +13,12 @@
 diff -urN dnsmasq-2.30/src/config.h dnsmasq-2.30-patched/src/config.h
 --- dnsmasq-2.30/src/config.h	2006-04-23 13:27:20.000000000 -0500
 +++ dnsmasq-2.30-patched/src/config.h	2006-04-24 15:04:28.000000000 -0500
-@@ -167,8 +167,8 @@
+@@ -167,7 +167,7 @@
  
  /* platform independent options- uncomment to enable */
  /* #define HAVE_BROKEN_RTC */
 -/* #define HAVE_ISC_READER */
--/* #define HAVE_DBUS */
 +#define HAVE_ISC_READER
-+#define HAVE_DBUS
+ /* #define HAVE_DBUS */
  
  #if defined(HAVE_BROKEN_RTC) && defined(HAVE_ISC_READER)
- #  error HAVE_ISC_READER is not compatible with HAVE_BROKEN_RTC



From fedora-extras-commits at redhat.com  Tue Apr 25 21:57:53 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 25 Apr 2006 14:57:53 -0700
Subject: rpms/dnsmasq/FC-3 dnsmasq.spec,1.1,1.2
Message-ID: <200604252157.k3PLvtnV026958@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26940/FC-3

Modified Files:
	dnsmasq.spec 
Log Message:

Disabled dbus support for FC-3 branch (needs newer dbus to work, I guess)



Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-3/dnsmasq.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dnsmasq.spec	25 Apr 2006 16:51:25 -0000	1.1
+++ dnsmasq.spec	25 Apr 2006 21:57:53 -0000	1.2
@@ -10,8 +10,6 @@
 Patch0:         http://beer.tclug.org/fedora-extras/dnsmasq/%{name}-%{version}-fedora-extras.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  dbus-devel
-
 Requires(post):	 /sbin/chkconfig
 Requires(post):  /sbin/service
 Requires(preun): /sbin/chkconfig
@@ -76,8 +74,7 @@
 %changelog
 * Mon Apr 24 2006 Patrick Laughton <jima at auroralinux.org> 2.30-2
 - Disabled stripping of binary while installing (oops)
-- Enabled HAVE_ISC_READER/HAVE_DBUS via patch
-- Added BuildReq for dbus-devel
+- Enabled HAVE_ISC_READER via patch
 
 * Mon Apr 24 2006 Patrick Laughton <jima at auroralinux.org> 2.30-1
 - Initial Fedora Extras RPM



From fedora-extras-commits at redhat.com  Tue Apr 25 22:09:27 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 25 Apr 2006 15:09:27 -0700
Subject: rpms/dnsmasq/FC-3 dnsmasq.spec,1.2,1.3
Message-ID: <200604252209.k3PM9TvQ029206@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29188/FC-3

Modified Files:
	dnsmasq.spec 
Log Message:

Bumping release tag



Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-3/dnsmasq.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dnsmasq.spec	25 Apr 2006 21:57:53 -0000	1.2
+++ dnsmasq.spec	25 Apr 2006 22:09:27 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           dnsmasq
 Version:        2.30
-Release:        2%{?dist}
+Release:        2%{?dist}.1
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons



From fedora-extras-commits at redhat.com  Tue Apr 25 22:13:57 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 25 Apr 2006 15:13:57 -0700
Subject: rpms/dnsmasq/FC-3 dnsmasq.spec,1.3,1.4
Message-ID: <200604252213.k3PMDxUO029316@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29299/FC-3

Modified Files:
	dnsmasq.spec 
Log Message:

'make tag' weirdness.



Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-3/dnsmasq.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- dnsmasq.spec	25 Apr 2006 22:09:27 -0000	1.3
+++ dnsmasq.spec	25 Apr 2006 22:13:57 -0000	1.4
@@ -1,6 +1,6 @@
 Name:           dnsmasq
 Version:        2.30
-Release:        2%{?dist}.1
+Release:        2%{?dist}.2
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons



From fedora-extras-commits at redhat.com  Tue Apr 25 22:19:50 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Tue, 25 Apr 2006 15:19:50 -0700
Subject: rpms/dnsmasq/FC-3 dnsmasq.spec,1.4,1.5
Message-ID: <200604252219.k3PMJqdN029385@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29368/FC-3

Modified Files:
	dnsmasq.spec 
Log Message:

Fixed changelog (sorry everybody)



Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-3/dnsmasq.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- dnsmasq.spec	25 Apr 2006 22:13:57 -0000	1.4
+++ dnsmasq.spec	25 Apr 2006 22:19:50 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           dnsmasq
 Version:        2.30
-Release:        2%{?dist}.2
+Release:        2%{?dist}.3
 Summary:        A lightweight DHCP/caching DNS server
 
 Group:          System Environment/Daemons
@@ -72,9 +72,13 @@
 
 
 %changelog
+* Tue Apr 25 2006 Patrick Laughton <jima at auroralinux.org> 2.30-2.fc3.3
+- Removed dbus support for FC3 (dbus version apparently too old)
+
 * Mon Apr 24 2006 Patrick Laughton <jima at auroralinux.org> 2.30-2
 - Disabled stripping of binary while installing (oops)
-- Enabled HAVE_ISC_READER via patch
+- Enabled HAVE_ISC_READER/HAVE_DBUS via patch
+- Added BuildReq for dbus-devel
 
 * Mon Apr 24 2006 Patrick Laughton <jima at auroralinux.org> 2.30-1
 - Initial Fedora Extras RPM



From fedora-extras-commits at redhat.com  Tue Apr 25 23:32:45 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 25 Apr 2006 16:32:45 -0700
Subject: rpms/perl-Log-Dispatch-FileRotate/FC-4 .cvsignore, 1.2,
	1.3 perl-Log-Dispatch-FileRotate.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200604252332.k3PNWlq9031979@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31958

Modified Files:
	.cvsignore perl-Log-Dispatch-FileRotate.spec sources 
Log Message:
- Update to 1.15.
- The author corrected the licensing terms (License: GPL or Artistic).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Apr 2006 18:00:52 -0000	1.2
+++ .cvsignore	25 Apr 2006 23:32:45 -0000	1.3
@@ -1 +1 @@
-Log-Dispatch-FileRotate-1.14.tar.gz
+Log-Dispatch-FileRotate-1.15.tar.gz


Index: perl-Log-Dispatch-FileRotate.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/FC-4/perl-Log-Dispatch-FileRotate.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Log-Dispatch-FileRotate.spec	24 Apr 2006 18:00:52 -0000	1.1
+++ perl-Log-Dispatch-FileRotate.spec	25 Apr 2006 23:32:45 -0000	1.2
@@ -1,10 +1,10 @@
 Name:           perl-Log-Dispatch-FileRotate
-Version:        1.14
+Version:        1.15
 Release:        1%{?dist}
 Summary:        Log to files that archive/rotate themselves
 
 Group:          Development/Libraries
-License:        Artistic
+License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Log-Dispatch-FileRotate/
 Source0:        http://www.cpan.org/authors/id/M/MA/MARKPF/Log-Dispatch-FileRotate-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -57,6 +57,10 @@
 
 
 %changelog
+* Wed Apr 26 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.15-1
+- Update to 1.15.
+- The author corrected the licensing terms (License: GPL or Artistic).
+
 * Mon Apr 24 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.14-1
 - Update to 1.14.
 - License: Artistic.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Apr 2006 18:00:52 -0000	1.2
+++ sources	25 Apr 2006 23:32:45 -0000	1.3
@@ -1 +1 @@
-b7cc69172d5c8b1a34c429d738bc3fa5  Log-Dispatch-FileRotate-1.14.tar.gz
+96a7984f8d55db97d676342725a6f454  Log-Dispatch-FileRotate-1.15.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 23:33:10 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 25 Apr 2006 16:33:10 -0700
Subject: rpms/perl-Log-Dispatch-FileRotate/FC-5 .cvsignore, 1.2,
	1.3 perl-Log-Dispatch-FileRotate.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200604252333.k3PNXCqi032031@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31993/FC-5

Modified Files:
	.cvsignore perl-Log-Dispatch-FileRotate.spec sources 
Log Message:
- Update to 1.15.
- The author corrected the licensing terms (License: GPL or Artistic).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Apr 2006 18:00:52 -0000	1.2
+++ .cvsignore	25 Apr 2006 23:33:10 -0000	1.3
@@ -1 +1 @@
-Log-Dispatch-FileRotate-1.14.tar.gz
+Log-Dispatch-FileRotate-1.15.tar.gz


Index: perl-Log-Dispatch-FileRotate.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/FC-5/perl-Log-Dispatch-FileRotate.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Log-Dispatch-FileRotate.spec	24 Apr 2006 18:00:52 -0000	1.1
+++ perl-Log-Dispatch-FileRotate.spec	25 Apr 2006 23:33:10 -0000	1.2
@@ -1,10 +1,10 @@
 Name:           perl-Log-Dispatch-FileRotate
-Version:        1.14
+Version:        1.15
 Release:        1%{?dist}
 Summary:        Log to files that archive/rotate themselves
 
 Group:          Development/Libraries
-License:        Artistic
+License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Log-Dispatch-FileRotate/
 Source0:        http://www.cpan.org/authors/id/M/MA/MARKPF/Log-Dispatch-FileRotate-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -57,6 +57,10 @@
 
 
 %changelog
+* Wed Apr 26 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.15-1
+- Update to 1.15.
+- The author corrected the licensing terms (License: GPL or Artistic).
+
 * Mon Apr 24 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.14-1
 - Update to 1.14.
 - License: Artistic.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Apr 2006 18:00:52 -0000	1.2
+++ sources	25 Apr 2006 23:33:10 -0000	1.3
@@ -1 +1 @@
-b7cc69172d5c8b1a34c429d738bc3fa5  Log-Dispatch-FileRotate-1.14.tar.gz
+96a7984f8d55db97d676342725a6f454  Log-Dispatch-FileRotate-1.15.tar.gz



From fedora-extras-commits at redhat.com  Tue Apr 25 23:33:11 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Tue, 25 Apr 2006 16:33:11 -0700
Subject: rpms/perl-Log-Dispatch-FileRotate/devel .cvsignore, 1.2,
	1.3 perl-Log-Dispatch-FileRotate.spec, 1.1, 1.2 sources, 1.2, 1.3
Message-ID: <200604252333.k3PNXDlf032037@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31993/devel

Modified Files:
	.cvsignore perl-Log-Dispatch-FileRotate.spec sources 
Log Message:
- Update to 1.15.
- The author corrected the licensing terms (License: GPL or Artistic).



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	24 Apr 2006 18:00:52 -0000	1.2
+++ .cvsignore	25 Apr 2006 23:33:11 -0000	1.3
@@ -1 +1 @@
-Log-Dispatch-FileRotate-1.14.tar.gz
+Log-Dispatch-FileRotate-1.15.tar.gz


Index: perl-Log-Dispatch-FileRotate.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/devel/perl-Log-Dispatch-FileRotate.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- perl-Log-Dispatch-FileRotate.spec	24 Apr 2006 18:00:52 -0000	1.1
+++ perl-Log-Dispatch-FileRotate.spec	25 Apr 2006 23:33:11 -0000	1.2
@@ -1,10 +1,10 @@
 Name:           perl-Log-Dispatch-FileRotate
-Version:        1.14
+Version:        1.15
 Release:        1%{?dist}
 Summary:        Log to files that archive/rotate themselves
 
 Group:          Development/Libraries
-License:        Artistic
+License:        GPL or Artistic
 URL:            http://search.cpan.org/dist/Log-Dispatch-FileRotate/
 Source0:        http://www.cpan.org/authors/id/M/MA/MARKPF/Log-Dispatch-FileRotate-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -57,6 +57,10 @@
 
 
 %changelog
+* Wed Apr 26 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.15-1
+- Update to 1.15.
+- The author corrected the licensing terms (License: GPL or Artistic).
+
 * Mon Apr 24 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.14-1
 - Update to 1.14.
 - License: Artistic.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Log-Dispatch-FileRotate/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Apr 2006 18:00:52 -0000	1.2
+++ sources	25 Apr 2006 23:33:11 -0000	1.3
@@ -1 +1 @@
-b7cc69172d5c8b1a34c429d738bc3fa5  Log-Dispatch-FileRotate-1.14.tar.gz
+96a7984f8d55db97d676342725a6f454  Log-Dispatch-FileRotate-1.15.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 26 00:14:55 2006
From: fedora-extras-commits at redhat.com (Jonathan G. Underwood (jgu))
Date: Tue, 25 Apr 2006 17:14:55 -0700
Subject: owners owners.list,1.896,1.897
Message-ID: <200604260014.k3Q0Evd2001952@cvs-int.fedora.redhat.com>

Author: jgu

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1935

Modified Files:
	owners.list 
Log Message:
Changed module name of emacs-muse to muse



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.896
retrieving revision 1.897
diff -u -r1.896 -r1.897
--- owners.list	25 Apr 2006 20:52:32 -0000	1.896
+++ owners.list	26 Apr 2006 00:14:55 -0000	1.897
@@ -227,7 +227,6 @@
 Fedora Extras|eet|A library designed to write an arbitary set of chunks of data to a file|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|elmo|Terminal-based mail client|gauret at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|emacs-auctex|Enhanced TeX modes for Emacsen|ed at eh3.com|extras-qa at fedoraproject.org|
-Fedora Extras|emacs-muse|Emacs Muse is an authoring and publishing environment for Emacsen|jonathan.underwood at gmail.com|extras-qa at fedoraproject.org|
 Fedora Extras|embryo|A C like scripting language|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|emelfm2|A file manager that implements the popular two-pane design|fedora.wickert at arcor.de|extras-qa at fedoraproject.org|
 Fedora Extras|enca|Character set analyzer and detector|dmitry at butskoy.name|extras-qa at fedoraproject.org|
@@ -758,6 +757,7 @@
 Fedora Extras|multisync|Calendar (and other PIM data) synchronization program|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|multitail|View one or multiple files like tail but with multiple windows|folkert at vanheusden.com|extras-qa at fedoraproject.org|
 Fedora Extras|munin|Network-wide graphing framework (grapher/gatherer)|kevin at tummy.com|extras-qa at fedoraproject.org|
+Fedora Extras|muse|Emacs Muse is an authoring and publishing environment for Emacsen|jonathan.underwood at gmail.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|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  Wed Apr 26 00:38:33 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Tue, 25 Apr 2006 17:38:33 -0700
Subject: rpms/mftrace - New directory
Message-ID: <200604260038.k3Q0cZuX002364@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/mftrace
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2343/mftrace

Log Message:
Directory /cvs/extras/rpms/mftrace added to the repository




From fedora-extras-commits at redhat.com  Wed Apr 26 00:38:34 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Tue, 25 Apr 2006 17:38:34 -0700
Subject: rpms/mftrace/devel - New directory
Message-ID: <200604260038.k3Q0cakY002367@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/mftrace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2343/mftrace/devel

Log Message:
Directory /cvs/extras/rpms/mftrace/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Apr 26 00:38:45 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Tue, 25 Apr 2006 17:38:45 -0700
Subject: rpms/mftrace Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604260038.k3Q0clAG002421@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/mftrace
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2388

Added Files:
	Makefile import.log 
Log Message:
Setup of module mftrace


--- NEW FILE Makefile ---
# Top level Makefile for module mftrace
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 26 00:38:46 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Tue, 25 Apr 2006 17:38:46 -0700
Subject: rpms/mftrace/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604260038.k3Q0cm7B002424@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/mftrace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2388/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mftrace


--- 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 Apr 26 00:39:01 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Tue, 25 Apr 2006 17:39:01 -0700
Subject: rpms/mftrace import.log,1.1,1.2
Message-ID: <200604260039.k3Q0dXRe002488@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/mftrace
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2452

Modified Files:
	import.log 
Log Message:
auto-import mftrace-1.1.19-2 on branch devel from mftrace-1.1.19-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/mftrace/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Apr 2006 00:38:45 -0000	1.1
+++ import.log	26 Apr 2006 00:39:01 -0000	1.2
@@ -0,0 +1 @@
+mftrace-1_1_19-2:HEAD:mftrace-1.1.19-2.src.rpm:1146011952



From fedora-extras-commits at redhat.com  Wed Apr 26 00:39:02 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Tue, 25 Apr 2006 17:39:02 -0700
Subject: rpms/mftrace/devel mftrace.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604260039.k3Q0dY4D002492@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/mftrace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2452/devel

Modified Files:
	.cvsignore sources 
Added Files:
	mftrace.spec 
Log Message:
auto-import mftrace-1.1.19-2 on branch devel from mftrace-1.1.19-2.src.rpm


--- NEW FILE mftrace.spec ---
Name:		mftrace
Version:	1.1.19
Release:	2%{?dist}
Summary:	Utility for converting TeX bitmap fonts to TrueType fonts

Group:		Applications/Publishing
License:	GPL
URL:		http://www.xs4all.nl/~hanwen/mftrace/
Source0:	http://www.xs4all.nl/~hanwen/mftrace/%{name}-%{version}.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	python autotrace
Requires:	autotrace fontforge t1utils tetex-fonts

%description
mftrace is a small Python program that lets you trace a TeX bitmap
font into a PFA or PFB font (A PostScript Type1 Scalable Font) or TTF
(TrueType) font.

Scalable fonts offer many advantages over bitmaps, as they allow
documents to render correctly at many printer resolutions. Moreover,
Ghostscript can generate much better PDF, if given scalable PostScript
fonts.

%prep
%setup -q


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README.txt ChangeLog
%{_bindir}/*
%{_mandir}/man1/%{name}*
%{_datadir}/%{name}
%ghost %{_datadir}/%{name}/*.pyo


%changelog
* Tue Apr 25 2006 Quentin Spencer <qspencer at users.sourceforge.net> 1.1.19-2
- ghost .pyo files

* Thu Mar 30 2006 Quentin Spencer <qspencer at users.sourceforge.net> 1.1.19-1
- First version.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mftrace/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Apr 2006 00:38:45 -0000	1.1
+++ .cvsignore	26 Apr 2006 00:39:02 -0000	1.2
@@ -0,0 +1 @@
+mftrace-1.1.19.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mftrace/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Apr 2006 00:38:45 -0000	1.1
+++ sources	26 Apr 2006 00:39:02 -0000	1.2
@@ -0,0 +1 @@
+89d5f70cdfad6ed7be146dd1b548cec1  mftrace-1.1.19.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 26 00:44:46 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Tue, 25 Apr 2006 17:44:46 -0700
Subject: owners owners.list,1.897,1.898
Message-ID: <200604260044.k3Q0im7A002619@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2602

Modified Files:
	owners.list 
Log Message:



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.897
retrieving revision 1.898
diff -u -r1.897 -r1.898
--- owners.list	26 Apr 2006 00:14:55 -0000	1.897
+++ owners.list	26 Apr 2006 00:44:46 -0000	1.898
@@ -726,6 +726,7 @@
 Fedora Extras|metakit|Embeddable database|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|mew|a great MIME mail reader for Emacs|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|mfstools|Utilities for TiVo drive upgrades|tcallawa at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|mftrace|Utility for converting TeX bitmap fonts to Type 1 or TrueType fonts|qspencer at ieee.org|extras-qa at fedoraproject.org|
 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|



From fedora-extras-commits at redhat.com  Wed Apr 26 00:47:34 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Tue, 25 Apr 2006 17:47:34 -0700
Subject: rpms/mftrace/devel mftrace.spec,1.1,1.2
Message-ID: <200604260047.k3Q0laR8002667@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/mftrace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2650

Modified Files:
	mftrace.spec 
Log Message:
Update description


Index: mftrace.spec
===================================================================
RCS file: /cvs/extras/rpms/mftrace/devel/mftrace.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mftrace.spec	26 Apr 2006 00:39:02 -0000	1.1
+++ mftrace.spec	26 Apr 2006 00:47:34 -0000	1.2
@@ -1,7 +1,7 @@
 Name:		mftrace
 Version:	1.1.19
-Release:	2%{?dist}
-Summary:	Utility for converting TeX bitmap fonts to TrueType fonts
+Release:	3%{?dist}
+Summary:	Utility for converting TeX bitmap fonts to Type 1 or TrueType fonts
 
 Group:		Applications/Publishing
 License:	GPL
@@ -50,6 +50,9 @@
 
 
 %changelog
+* Tue Apr 25 2006 Quentin Spencer <qspencer at users.sourceforge.net> 1.1.19-3
+- Update description
+
 * Tue Apr 25 2006 Quentin Spencer <qspencer at users.sourceforge.net> 1.1.19-2
 - ghost .pyo files
 



From fedora-extras-commits at redhat.com  Wed Apr 26 01:54:37 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Tue, 25 Apr 2006 18:54:37 -0700
Subject: rpms/torque/devel .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 torque.spec,
	1.3, 1.4
Message-ID: <200604260154.k3Q1sdTg005502@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5481

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Tue Apr 25 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.11.200604251602cvs
- bump to fix "mem" job resources for non-serial jobs
- rm.h is now installed



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Apr 2006 17:00:17 -0000	1.3
+++ .cvsignore	26 Apr 2006 01:54:37 -0000	1.4
@@ -1 +1 @@
-torque-2.1.0p0-snap.200604211036.tar.gz
+torque-2.1.0p0-snap.200604251602.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Apr 2006 17:00:17 -0000	1.3
+++ sources	26 Apr 2006 01:54:37 -0000	1.4
@@ -1 +1 @@
-3b40c0d81a06ef4abe14c3bb7522086d  torque-2.1.0p0-snap.200604211036.tar.gz
+e5172ea8627be8797664967cc3e66625  torque-2.1.0p0-snap.200604251602.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/devel/torque.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- torque.spec	21 Apr 2006 17:00:17 -0000	1.3
+++ torque.spec	26 Apr 2006 01:54:37 -0000	1.4
@@ -2,8 +2,8 @@
 # comment out snap if building a real release
 %define name torque
 %define version 2.1.0p0
-%define snap 200604211036
-%define release 10
+%define snap 200604251602
+%define release 11
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -423,6 +423,10 @@
 
 
 %changelog
+* Tue Apr 25 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.11.200604251602cvs
+- bump to fix "mem" job resources for non-serial jobs
+- rm.h is now installed
+
 * Fri Apr 21 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.10.200604211036cvs
 - bump
 



From fedora-extras-commits at redhat.com  Wed Apr 26 01:56:22 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Tue, 25 Apr 2006 18:56:22 -0700
Subject: rpms/torque/FC-5 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 torque.spec,
	1.3, 1.4
Message-ID: <200604260156.k3Q1uOoq005569@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5548

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Tue Apr 25 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.11.200604251602cvs
- bump to fix "mem" job resources for non-serial jobs
- rm.h is now installed



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Apr 2006 17:21:01 -0000	1.3
+++ .cvsignore	26 Apr 2006 01:56:22 -0000	1.4
@@ -1 +1 @@
-torque-2.1.0p0-snap.200604211036.tar.gz
+torque-2.1.0p0-snap.200604251602.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Apr 2006 17:21:01 -0000	1.3
+++ sources	26 Apr 2006 01:56:22 -0000	1.4
@@ -1 +1 @@
-3b40c0d81a06ef4abe14c3bb7522086d  torque-2.1.0p0-snap.200604211036.tar.gz
+e5172ea8627be8797664967cc3e66625  torque-2.1.0p0-snap.200604251602.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-5/torque.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- torque.spec	21 Apr 2006 17:21:01 -0000	1.3
+++ torque.spec	26 Apr 2006 01:56:22 -0000	1.4
@@ -2,8 +2,8 @@
 # comment out snap if building a real release
 %define name torque
 %define version 2.1.0p0
-%define snap 200604211036
-%define release 10
+%define snap 200604251602
+%define release 11
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -423,6 +423,10 @@
 
 
 %changelog
+* Tue Apr 25 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.11.200604251602cvs
+- bump to fix "mem" job resources for non-serial jobs
+- rm.h is now installed
+
 * Fri Apr 21 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.10.200604211036cvs
 - bump
 



From fedora-extras-commits at redhat.com  Wed Apr 26 01:56:49 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Tue, 25 Apr 2006 18:56:49 -0700
Subject: rpms/torque/FC-4 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 torque.spec,
	1.3, 1.4
Message-ID: <200604260156.k3Q1uplQ005637@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5615

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Tue Apr 25 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.11.200604251602cvs
- bump to fix "mem" job resources for non-serial jobs
- rm.h is now installed



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Apr 2006 17:21:26 -0000	1.3
+++ .cvsignore	26 Apr 2006 01:56:49 -0000	1.4
@@ -1 +1 @@
-torque-2.1.0p0-snap.200604211036.tar.gz
+torque-2.1.0p0-snap.200604251602.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Apr 2006 17:21:26 -0000	1.3
+++ sources	26 Apr 2006 01:56:49 -0000	1.4
@@ -1 +1 @@
-3b40c0d81a06ef4abe14c3bb7522086d  torque-2.1.0p0-snap.200604211036.tar.gz
+e5172ea8627be8797664967cc3e66625  torque-2.1.0p0-snap.200604251602.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-4/torque.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- torque.spec	21 Apr 2006 17:21:26 -0000	1.3
+++ torque.spec	26 Apr 2006 01:56:49 -0000	1.4
@@ -2,8 +2,8 @@
 # comment out snap if building a real release
 %define name torque
 %define version 2.1.0p0
-%define snap 200604211036
-%define release 10
+%define snap 200604251602
+%define release 11
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -423,6 +423,10 @@
 
 
 %changelog
+* Tue Apr 25 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.11.200604251602cvs
+- bump to fix "mem" job resources for non-serial jobs
+- rm.h is now installed
+
 * Fri Apr 21 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.10.200604211036cvs
 - bump
 



From fedora-extras-commits at redhat.com  Wed Apr 26 01:57:17 2006
From: fedora-extras-commits at redhat.com (Garrick Staples (garrick))
Date: Tue, 25 Apr 2006 18:57:17 -0700
Subject: rpms/torque/FC-3 .cvsignore, 1.3, 1.4 sources, 1.3, 1.4 torque.spec,
	1.3, 1.4
Message-ID: <200604260157.k3Q1vJRH005702@cvs-int.fedora.redhat.com>

Author: garrick

Update of /cvs/extras/rpms/torque/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5681

Modified Files:
	.cvsignore sources torque.spec 
Log Message:
* Tue Apr 25 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.11.200604251602cvs
- bump to fix "mem" job resources for non-serial jobs
- rm.h is now installed



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Apr 2006 17:21:45 -0000	1.3
+++ .cvsignore	26 Apr 2006 01:57:17 -0000	1.4
@@ -1 +1 @@
-torque-2.1.0p0-snap.200604211036.tar.gz
+torque-2.1.0p0-snap.200604251602.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Apr 2006 17:21:45 -0000	1.3
+++ sources	26 Apr 2006 01:57:17 -0000	1.4
@@ -1 +1 @@
-3b40c0d81a06ef4abe14c3bb7522086d  torque-2.1.0p0-snap.200604211036.tar.gz
+e5172ea8627be8797664967cc3e66625  torque-2.1.0p0-snap.200604251602.tar.gz


Index: torque.spec
===================================================================
RCS file: /cvs/extras/rpms/torque/FC-3/torque.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- torque.spec	21 Apr 2006 17:21:45 -0000	1.3
+++ torque.spec	26 Apr 2006 01:57:17 -0000	1.4
@@ -2,8 +2,8 @@
 # comment out snap if building a real release
 %define name torque
 %define version 2.1.0p0
-%define snap 200604211036
-%define release 10
+%define snap 200604251602
+%define release 11
 
 # The following options are supported:
 #   --with server_name=hostname
@@ -423,6 +423,10 @@
 
 
 %changelog
+* Tue Apr 25 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.11.200604251602cvs
+- bump to fix "mem" job resources for non-serial jobs
+- rm.h is now installed
+
 * Fri Apr 21 2006 Garrick Staples <garrick at usc.edu> 2.1.0p0-0.10.200604211036cvs
 - bump
 



From fedora-extras-commits at redhat.com  Wed Apr 26 02:47:26 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Tue, 25 Apr 2006 19:47:26 -0700
Subject: rpms/gnonlin import.log,1.2,1.3
Message-ID: <200604260247.k3Q2lw5L008118@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/gnonlin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8082

Modified Files:
	import.log 
Log Message:
auto-import gnonlin-0.10.3-1 on branch devel from gnonlin-0.10.3-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnonlin/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	12 Feb 2006 02:23:49 -0000	1.2
+++ import.log	26 Apr 2006 02:47:26 -0000	1.3
@@ -1 +1,2 @@
 gnonlin-0_10_0_5-3:HEAD:gnonlin-0.10.0.5-3.src.rpm:1139711025
+gnonlin-0_10_3-1:HEAD:gnonlin-0.10.3-1.src.rpm:1146019641



From fedora-extras-commits at redhat.com  Wed Apr 26 02:47:27 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Tue, 25 Apr 2006 19:47:27 -0700
Subject: rpms/gnonlin/devel .cvsignore, 1.2, 1.3 gnonlin.spec, 1.4,
	1.5 sources, 1.2, 1.3
Message-ID: <200604260248.k3Q2lxD5008123@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/gnonlin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8082/devel

Modified Files:
	.cvsignore gnonlin.spec sources 
Log Message:
auto-import gnonlin-0.10.3-1 on branch devel from gnonlin-0.10.3-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnonlin/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Feb 2006 02:23:55 -0000	1.2
+++ .cvsignore	26 Apr 2006 02:47:27 -0000	1.3
@@ -1 +1 @@
-gnonlin-0.10.0.5.tar.gz
+gnonlin-0.10.3.tar.gz


Index: gnonlin.spec
===================================================================
RCS file: /cvs/extras/rpms/gnonlin/devel/gnonlin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnonlin.spec	17 Feb 2006 21:09:08 -0000	1.4
+++ gnonlin.spec	26 Apr 2006 02:47:27 -0000	1.5
@@ -1,7 +1,7 @@
 %define		gst_req	0.10.2
 Name: 		gnonlin
-Version: 	0.10.0.5
-Release:	6
+Version: 	0.10.3
+Release:	1
 Summary: 	GStreamer extension library for non-linear editing
 
 Group: 		System Environment/Libraries
@@ -59,9 +59,12 @@
 %files devel
 %defattr(-, root, root, -)
 %{_includedir}/gnl
-%{_libdir}/pkgconfig/gnonlin.pc
 
 %changelog
+* Mon Apr 25 2006 W. Michael Petullo <mike[@]flyn.org> 0.10.3-1
+- updated package to 0.10.3
+- remove gnonlin.pc 
+
 * Fri Feb 17 2006 W. Michael Petullo <mike[@]flyn.org> 0.10.0.5-6
 - bump release because of build system problem
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnonlin/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Feb 2006 02:23:55 -0000	1.2
+++ sources	26 Apr 2006 02:47:27 -0000	1.3
@@ -1 +1 @@
-8c8d6935c7c3bdc05321ae85c6449212  gnonlin-0.10.0.5.tar.gz
+4fa1cebf048243e47cd590d4afed6dc6  gnonlin-0.10.3.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 26 06:36:08 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Tue, 25 Apr 2006 23:36:08 -0700
Subject: owners owners.list,1.898,1.899
Message-ID: <200604260636.k3Q6aAej017294@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17277

Modified Files:
	owners.list 
Log Message:
taking ownership of gnome-themes-extras



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.898
retrieving revision 1.899
diff -u -r1.898 -r1.899
--- owners.list	26 Apr 2006 00:44:46 -0000	1.898
+++ owners.list	26 Apr 2006 06:36:07 -0000	1.899
@@ -380,7 +380,7 @@
 Fedora Extras|gnome-telnet|A fancy GNOME telnet client|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-theme-clearlooks|An attractive GTK+ 2 engine with a focus on usability|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-theme-clearlooks-bigpack|Additional Clearlooks color schemes|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
-Fedora Extras|gnome-themes-extras|Collection of metathemes for the GNOME desktop environment|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|gnome-themes-extras|Collection of metathemes for the GNOME desktop environment|michael at knox.net.nz|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-translate|GNOME interface to libtranslate -- Natural language translator|dmitry at butskoy.name|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-vfsmm26|C++ wrapper for gnome-vfs|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-yum|GNOME Interface for YUM|toth_bandi at users.sourceforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Apr 26 06:45:28 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Tue, 25 Apr 2006 23:45:28 -0700
Subject: rpms/gnome-themes-extras/devel .cvsignore, 1.5,
	1.6 gnome-themes-extras.spec, 1.12, 1.13 sources, 1.5, 1.6
Message-ID: <200604260645.k3Q6jUaK017356@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gnome-themes-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17335

Modified Files:
	.cvsignore gnome-themes-extras.spec sources 
Log Message:
updated spec and sources



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes-extras/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Apr 2005 09:41:35 -0000	1.5
+++ .cvsignore	26 Apr 2006 06:45:28 -0000	1.6
@@ -1 +1 @@
-gnome-themes-extras-0.8.1.tar.bz2
+gnome-themes-extras-0.9.0.tar.gz


Index: gnome-themes-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes-extras/devel/gnome-themes-extras.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnome-themes-extras.spec	2 Mar 2006 21:29:57 -0000	1.12
+++ gnome-themes-extras.spec	26 Apr 2006 06:45:28 -0000	1.13
@@ -1,13 +1,13 @@
 Name:           gnome-themes-extras
-Version:        0.8.1
-Release:        1
+Version:        0.9.0
+Release:        1%{?dist}
 
-Summary:        Collection of metathemes for the GNOME desktop environment
+Summary:        Collection of metathemes for the Gnome desktop environment
 
 Group:          User Interface/Desktops
 License:        LGPL
 URL:            http://librsvg.sourceforge.net/theme.php
-Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/gnome-themes-extras/0.8/gnome-themes-extras-0.8.1.tar.bz2
+Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/gnome-themes-extras/0.9/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext gtk2-devel
@@ -20,19 +20,12 @@
 BuildArch:      noarch
 
 %description
-The GNOME themes extras package is a collection of metathemes for the GNOME
-desktop environment. This package requires that you use a GNOME 2.2 release or
-newer to work properly. The design goal of this package is to give GNOME users
+The Gnome themes extras package is a collection of metathemes for the Gnome
+desktop environment. This package requires that you use a Gnome 2.2 release or
+newer to work properly. The design goal of this package is to give Gnome users
 an extra set of themes that are not only functional, but also eye catching.
 
 %prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
-
 %setup -q
 
 %build
@@ -40,14 +33,15 @@
 make %{?_smp_mflags}
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf %{buildroot}
 %makeinstall
-%find_lang gnome-themes-extras
+
+%find_lang %{name}
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf %{buildroot}
 
-%files -f gnome-themes-extras.lang
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
 %dir %{_datadir}/icons
@@ -57,6 +51,10 @@
 
 
 %changelog
+* Tue Apr 24 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.9.0-1
+- updated version to 0.9.0
+- some house work
+
 * Mon Apr 11 2005 Adrian Reber <adrian at lisas.de> - 0.8.1-1
 - updated to 0.8.1
 - BuildArch: noarch


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes-extras/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Apr 2005 09:41:35 -0000	1.5
+++ sources	26 Apr 2006 06:45:28 -0000	1.6
@@ -1 +1 @@
-0dce0d3411460d39cd57cb06d0f3012f  gnome-themes-extras-0.8.1.tar.bz2
+367cd05148b3ec663a42767d108584ed  gnome-themes-extras-0.9.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 26 06:47:19 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Tue, 25 Apr 2006 23:47:19 -0700
Subject: rpms/gnome-themes-extras/FC-5 gnome-themes-extras.spec,1.12,1.13
Message-ID: <200604260647.k3Q6lLJa017417@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gnome-themes-extras/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17400

Modified Files:
	gnome-themes-extras.spec 
Log Message:
updated spec 



Index: gnome-themes-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes-extras/FC-5/gnome-themes-extras.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnome-themes-extras.spec	2 Mar 2006 21:29:57 -0000	1.12
+++ gnome-themes-extras.spec	26 Apr 2006 06:47:19 -0000	1.13
@@ -1,13 +1,13 @@
 Name:           gnome-themes-extras
-Version:        0.8.1
-Release:        1
+Version:        0.9.0
+Release:        1%{?dist}
 
-Summary:        Collection of metathemes for the GNOME desktop environment
+Summary:        Collection of metathemes for the Gnome desktop environment
 
 Group:          User Interface/Desktops
 License:        LGPL
 URL:            http://librsvg.sourceforge.net/theme.php
-Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/gnome-themes-extras/0.8/gnome-themes-extras-0.8.1.tar.bz2
+Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/gnome-themes-extras/0.9/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext gtk2-devel
@@ -20,19 +20,12 @@
 BuildArch:      noarch
 
 %description
-The GNOME themes extras package is a collection of metathemes for the GNOME
-desktop environment. This package requires that you use a GNOME 2.2 release or
-newer to work properly. The design goal of this package is to give GNOME users
+The Gnome themes extras package is a collection of metathemes for the Gnome
+desktop environment. This package requires that you use a Gnome 2.2 release or
+newer to work properly. The design goal of this package is to give Gnome users
 an extra set of themes that are not only functional, but also eye catching.
 
 %prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
-
 %setup -q
 
 %build
@@ -40,14 +33,15 @@
 make %{?_smp_mflags}
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf %{buildroot}
 %makeinstall
-%find_lang gnome-themes-extras
+
+%find_lang %{name}
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf %{buildroot}
 
-%files -f gnome-themes-extras.lang
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
 %dir %{_datadir}/icons
@@ -57,6 +51,10 @@
 
 
 %changelog
+* Tue Apr 24 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.9.0-1
+- updated version to 0.9.0
+- some house work
+
 * Mon Apr 11 2005 Adrian Reber <adrian at lisas.de> - 0.8.1-1
 - updated to 0.8.1
 - BuildArch: noarch



From fedora-extras-commits at redhat.com  Wed Apr 26 06:48:12 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Tue, 25 Apr 2006 23:48:12 -0700
Subject: rpms/gnome-themes-extras/FC-4 gnome-themes-extras.spec,1.11,1.12
Message-ID: <200604260648.k3Q6mFRk017478@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gnome-themes-extras/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17461

Modified Files:
	gnome-themes-extras.spec 
Log Message:
updated spec



Index: gnome-themes-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes-extras/FC-4/gnome-themes-extras.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gnome-themes-extras.spec	13 Apr 2005 21:50:00 -0000	1.11
+++ gnome-themes-extras.spec	26 Apr 2006 06:48:12 -0000	1.12
@@ -1,13 +1,13 @@
 Name:           gnome-themes-extras
-Version:        0.8.1
-Release:        1
+Version:        0.9.0
+Release:        1%{?dist}
 
-Summary:        Collection of metathemes for the GNOME desktop environment
+Summary:        Collection of metathemes for the Gnome desktop environment
 
 Group:          User Interface/Desktops
 License:        LGPL
 URL:            http://librsvg.sourceforge.net/theme.php
-Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/gnome-themes-extras/0.8/gnome-themes-extras-0.8.1.tar.bz2
+Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/gnome-themes-extras/0.9/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext gtk2-devel
@@ -20,9 +20,9 @@
 BuildArch:      noarch
 
 %description
-The GNOME themes extras package is a collection of metathemes for the GNOME
-desktop environment. This package requires that you use a GNOME 2.2 release or
-newer to work properly. The design goal of this package is to give GNOME users
+The Gnome themes extras package is a collection of metathemes for the Gnome
+desktop environment. This package requires that you use a Gnome 2.2 release or
+newer to work properly. The design goal of this package is to give Gnome users
 an extra set of themes that are not only functional, but also eye catching.
 
 %prep
@@ -33,14 +33,15 @@
 make %{?_smp_mflags}
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf %{buildroot}
 %makeinstall
-%find_lang gnome-themes-extras
+
+%find_lang %{name}
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf %{buildroot}
 
-%files -f gnome-themes-extras.lang
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog README TODO
 %dir %{_datadir}/icons
@@ -50,6 +51,10 @@
 
 
 %changelog
+* Tue Apr 24 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.9.0-1
+- updated version to 0.9.0
+- some house work
+
 * Mon Apr 11 2005 Adrian Reber <adrian at lisas.de> - 0.8.1-1
 - updated to 0.8.1
 - BuildArch: noarch



From fedora-extras-commits at redhat.com  Wed Apr 26 06:51:12 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Tue, 25 Apr 2006 23:51:12 -0700
Subject: rpms/gnome-themes-extras/FC-4 .cvsignore,1.5,1.6 sources,1.5,1.6
Message-ID: <200604260651.k3Q6pEvh017551@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gnome-themes-extras/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17532

Modified Files:
	.cvsignore sources 
Log Message:
updated sources



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes-extras/FC-4/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Apr 2005 09:41:35 -0000	1.5
+++ .cvsignore	26 Apr 2006 06:51:12 -0000	1.6
@@ -1 +1 @@
-gnome-themes-extras-0.8.1.tar.bz2
+gnome-themes-extras-0.9.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes-extras/FC-4/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Apr 2005 09:41:35 -0000	1.5
+++ sources	26 Apr 2006 06:51:12 -0000	1.6
@@ -1 +1 @@
-0dce0d3411460d39cd57cb06d0f3012f  gnome-themes-extras-0.8.1.tar.bz2
+367cd05148b3ec663a42767d108584ed  gnome-themes-extras-0.9.0.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 26 07:16:30 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Wed, 26 Apr 2006 00:16:30 -0700
Subject: rpms/gnome-themes-extras/devel .cvsignore, 1.6,
	1.7 gnome-themes-extras.spec, 1.13, 1.14 sources, 1.6, 1.7
Message-ID: <200604260716.k3Q7GWBZ019885@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gnome-themes-extras/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19864

Modified Files:
	.cvsignore gnome-themes-extras.spec sources 
Log Message:
use bzip2'ed file instead. I thought I was already. 



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes-extras/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	26 Apr 2006 06:45:28 -0000	1.6
+++ .cvsignore	26 Apr 2006 07:16:30 -0000	1.7
@@ -1 +1 @@
-gnome-themes-extras-0.9.0.tar.gz
+gnome-themes-extras-0.9.0.tar.bz2


Index: gnome-themes-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes-extras/devel/gnome-themes-extras.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gnome-themes-extras.spec	26 Apr 2006 06:45:28 -0000	1.13
+++ gnome-themes-extras.spec	26 Apr 2006 07:16:30 -0000	1.14
@@ -1,13 +1,13 @@
 Name:           gnome-themes-extras
 Version:        0.9.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Collection of metathemes for the Gnome desktop environment
 
 Group:          User Interface/Desktops
 License:        LGPL
 URL:            http://librsvg.sourceforge.net/theme.php
-Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/gnome-themes-extras/0.9/%{name}-%{version}.tar.gz
+Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/gnome-themes-extras/0.9/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext gtk2-devel
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Wed Apr 26 2006 Michael J. Knox <michael[AT]knxo.net.nz> - 0.9.0-2
+- use bz2 tarball
+
 * Tue Apr 24 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.9.0-1
 - updated version to 0.9.0
 - some house work


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes-extras/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	26 Apr 2006 06:45:28 -0000	1.6
+++ sources	26 Apr 2006 07:16:30 -0000	1.7
@@ -1 +1 @@
-367cd05148b3ec663a42767d108584ed  gnome-themes-extras-0.9.0.tar.gz
+bac18c11fb9de8403e27441be64d9717  gnome-themes-extras-0.9.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Apr 26 07:30:33 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Wed, 26 Apr 2006 00:30:33 -0700
Subject: rpms/gnome-themes-extras/FC-5 .cvsignore, 1.5,
	1.6 gnome-themes-extras.spec, 1.13, 1.14 sources, 1.5, 1.6
Message-ID: <200604260730.k3Q7UZKg019939@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gnome-themes-extras/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19918

Modified Files:
	.cvsignore gnome-themes-extras.spec sources 
Log Message:
updated source



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes-extras/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	11 Apr 2005 09:41:35 -0000	1.5
+++ .cvsignore	26 Apr 2006 07:30:33 -0000	1.6
@@ -1 +1 @@
-gnome-themes-extras-0.8.1.tar.bz2
+gnome-themes-extras-0.9.0.tar.bz2


Index: gnome-themes-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes-extras/FC-5/gnome-themes-extras.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gnome-themes-extras.spec	26 Apr 2006 06:47:19 -0000	1.13
+++ gnome-themes-extras.spec	26 Apr 2006 07:30:33 -0000	1.14
@@ -1,13 +1,13 @@
 Name:           gnome-themes-extras
 Version:        0.9.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Collection of metathemes for the Gnome desktop environment
 
 Group:          User Interface/Desktops
 License:        LGPL
 URL:            http://librsvg.sourceforge.net/theme.php
-Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/gnome-themes-extras/0.9/%{name}-%{version}.tar.gz
+Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/gnome-themes-extras/0.9/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext gtk2-devel
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Wed Apr 26 2006 Michael J. Knox <michael[AT]knxo.net.nz> - 0.9.0-2
+- use bz2 tarball
+
 * Tue Apr 24 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.9.0-1
 - updated version to 0.9.0
 - some house work


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes-extras/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	11 Apr 2005 09:41:35 -0000	1.5
+++ sources	26 Apr 2006 07:30:33 -0000	1.6
@@ -1 +1 @@
-0dce0d3411460d39cd57cb06d0f3012f  gnome-themes-extras-0.8.1.tar.bz2
+bac18c11fb9de8403e27441be64d9717  gnome-themes-extras-0.9.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Apr 26 08:10:21 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Wed, 26 Apr 2006 01:10:21 -0700
Subject: rpms/gnome-themes-extras/FC-4 .cvsignore, 1.6,
	1.7 gnome-themes-extras.spec, 1.12, 1.13 sources, 1.6, 1.7
Message-ID: <200604260810.k3Q8ANO5022136@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gnome-themes-extras/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22115

Modified Files:
	.cvsignore gnome-themes-extras.spec sources 
Log Message:
updated source



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes-extras/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	26 Apr 2006 06:51:12 -0000	1.6
+++ .cvsignore	26 Apr 2006 08:10:21 -0000	1.7
@@ -1 +1 @@
-gnome-themes-extras-0.9.0.tar.gz
+gnome-themes-extras-0.9.0.tar.bz2


Index: gnome-themes-extras.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes-extras/FC-4/gnome-themes-extras.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnome-themes-extras.spec	26 Apr 2006 06:48:12 -0000	1.12
+++ gnome-themes-extras.spec	26 Apr 2006 08:10:21 -0000	1.13
@@ -1,13 +1,13 @@
 Name:           gnome-themes-extras
 Version:        0.9.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 
 Summary:        Collection of metathemes for the Gnome desktop environment
 
 Group:          User Interface/Desktops
 License:        LGPL
 URL:            http://librsvg.sourceforge.net/theme.php
-Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/gnome-themes-extras/0.9/%{name}-%{version}.tar.gz
+Source0:        ftp://ftp.gnome.org/pub/GNOME/sources/gnome-themes-extras/0.9/%{name}-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext gtk2-devel
@@ -51,6 +51,9 @@
 
 
 %changelog
+* Wed Apr 26 2006 Michael J. Knox <michael[AT]knxo.net.nz> - 0.9.0-2
+- use bz2 tarball
+
 * Tue Apr 24 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.9.0-1
 - updated version to 0.9.0
 - some house work


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnome-themes-extras/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	26 Apr 2006 06:51:12 -0000	1.6
+++ sources	26 Apr 2006 08:10:21 -0000	1.7
@@ -1 +1 @@
-367cd05148b3ec663a42767d108584ed  gnome-themes-extras-0.9.0.tar.gz
+bac18c11fb9de8403e27441be64d9717  gnome-themes-extras-0.9.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Apr 26 10:55:02 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Wed, 26 Apr 2006 03:55:02 -0700
Subject: rpms/rpy/devel rpy.spec,1.7,1.8
Message-ID: <200604261055.k3QAt4bV027202@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27184

Modified Files:
	rpy.spec 
Log Message:
* Wed Apr 26 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-8
- Rebuild for R-2.3.0



Index: rpy.spec
===================================================================
RCS file: /cvs/extras/rpms/rpy/devel/rpy.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rpy.spec	17 Feb 2006 11:16:57 -0000	1.7
+++ rpy.spec	26 Apr 2006 10:55:02 -0000	1.8
@@ -3,7 +3,7 @@
 Name: 		rpy
 Summary: 	Python interface to the R language
 Version:	0.4.6
-Release:	7%{?dist}
+Release:	8%{?dist}
 Url:		http://rpy.sourceforge.net
 Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
 Patch1:         rpy-install-info.patch
@@ -14,7 +14,7 @@
 BuildRequires:	R, python-numeric, python-devel, texinfo
 
 Requires:	python-numeric
-Requires:	R = 2.2.1
+Requires:	R = 2.3.0
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -66,6 +66,9 @@
 
 
 %changelog
+* 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
 - Build info docs (bz#169002).
 - Build pdf and html documentation, clean doc directory. (jamatos)



From fedora-extras-commits at redhat.com  Wed Apr 26 10:56:21 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Wed, 26 Apr 2006 03:56:21 -0700
Subject: rpms/rpy/FC-5 rpy.spec,1.7,1.8
Message-ID: <200604261056.k3QAuNgq027285@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27267

Modified Files:
	rpy.spec 
Log Message:
* Wed Apr 26 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-8
- Rebuild for R-2.3.0



Index: rpy.spec
===================================================================
RCS file: /cvs/extras/rpms/rpy/FC-5/rpy.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rpy.spec	17 Feb 2006 11:16:57 -0000	1.7
+++ rpy.spec	26 Apr 2006 10:56:21 -0000	1.8
@@ -3,7 +3,7 @@
 Name: 		rpy
 Summary: 	Python interface to the R language
 Version:	0.4.6
-Release:	7%{?dist}
+Release:	8%{?dist}
 Url:		http://rpy.sourceforge.net
 Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
 Patch1:         rpy-install-info.patch
@@ -14,7 +14,7 @@
 BuildRequires:	R, python-numeric, python-devel, texinfo
 
 Requires:	python-numeric
-Requires:	R = 2.2.1
+Requires:	R = 2.3.0
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -66,6 +66,9 @@
 
 
 %changelog
+* 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
 - Build info docs (bz#169002).
 - Build pdf and html documentation, clean doc directory. (jamatos)



From fedora-extras-commits at redhat.com  Wed Apr 26 10:56:56 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Wed, 26 Apr 2006 03:56:56 -0700
Subject: rpms/rpy/FC-4 rpy.spec,1.7,1.8
Message-ID: <200604261056.k3QAuw8K027346@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27329

Modified Files:
	rpy.spec 
Log Message:
* Wed Apr 26 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-8
- Rebuild for R-2.3.0



Index: rpy.spec
===================================================================
RCS file: /cvs/extras/rpms/rpy/FC-4/rpy.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- rpy.spec	18 Feb 2006 10:51:44 -0000	1.7
+++ rpy.spec	26 Apr 2006 10:56:56 -0000	1.8
@@ -3,7 +3,7 @@
 Name: 		rpy
 Summary: 	Python interface to the R language
 Version:	0.4.6
-Release:	7%{?dist}
+Release:	8%{?dist}
 Url:		http://rpy.sourceforge.net
 Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
 Patch1:         rpy-install-info.patch
@@ -14,7 +14,7 @@
 BuildRequires:	R, python-numeric, python-devel, texinfo
 
 Requires:	python-numeric
-Requires:	R = 2.2.1
+Requires:	R = 2.3.0
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
 
@@ -66,6 +66,9 @@
 
 
 %changelog
+* 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
 - Build info docs (bz#169002).
 - Build pdf and html documentation, clean doc directory. (jamatos)



From fedora-extras-commits at redhat.com  Wed Apr 26 10:57:38 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Wed, 26 Apr 2006 03:57:38 -0700
Subject: rpms/rpy/FC-3 rpy.spec,1.4,1.5
Message-ID: <200604261057.k3QAveVQ027407@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27390

Modified Files:
	rpy.spec 
Log Message:
* Wed Apr 26 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-8
- Rebuild for R-2.3.0



Index: rpy.spec
===================================================================
RCS file: /cvs/extras/rpms/rpy/FC-3/rpy.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rpy.spec	3 Jan 2006 23:22:34 -0000	1.4
+++ rpy.spec	26 Apr 2006 10:57:38 -0000	1.5
@@ -3,15 +3,20 @@
 Name: 		rpy
 Summary: 	Python interface to the R language
 Version:	0.4.6
-Release:	4%{?dist}
+Release:	8%{?dist}
 Url:		http://rpy.sourceforge.net
 Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
+Patch1:         rpy-install-info.patch
 License:	GPL
 Group:		Development/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	R, python-numeric, python-devel
-Requires:	R, python-numeric
+BuildRequires:	R, python-numeric, python-devel, texinfo
+
+Requires:	python-numeric
+Requires:	R = 2.3.0
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
 
 %description
 RPy provides a robust Python interface to the R
@@ -21,36 +26,67 @@
 
 %prep
 %setup
+%patch1 -p1 -b .install-info
 
 
 %build
 env CFLAGS="$RPM_OPT_FLAGS" python setup.py build
-
+cd doc
+makeinfo --html manual.texi
+makeinfo --html manual.texi
+mv rpy manual
+make pdf
+make info
 
 %install
 rm -rf $RPM_BUILD_ROOT
 python setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
-
+cd doc
+install -d $RPM_BUILD_ROOT/%{_infodir}
+install rpy.info $RPM_BUILD_ROOT/%{_infodir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :
+
+%preun
+if [ $1 = 0 ]; then
+    /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
+fi
+
 
 %files
 %defattr(-,root,root)
-%doc COPYING NEWS README examples/ doc/
+%doc COPYING NEWS README examples/
+%doc doc/manual.pdf doc/manual/
+%{_infodir}/rpy.info*
 %{python_sitearch}/*
 
 
 %changelog
-* Tue Jan  3 2006 Jose' Matos <jamatos at fc.up.pt> - 0.4.6-4
+* 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
+- 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
+- Use a fixed value for R version.
+
+* 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
 - Update for R-2.2.1
 
-* Tue Oct 11 2005 Jose' 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 Jose' 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 Jose 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  Wed Apr 26 11:07:01 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Wed, 26 Apr 2006 04:07:01 -0700
Subject: rpms/rpy/FC-3 sources,1.2,1.3
Message-ID: <200604261107.k3QB73is029765@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29748

Modified Files:
	sources 
Log Message:
Sync with other branches


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rpy/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Sep 2005 16:17:23 -0000	1.2
+++ sources	26 Apr 2006 11:07:01 -0000	1.3
@@ -1 +1,2 @@
 8b5411b275c66a5409a4a3aad711d860  rpy-0.4.6.tar.gz
+0b964500da96785e22a9ee232c4e8b68  rpy-install-info.patch



From fedora-extras-commits at redhat.com  Wed Apr 26 11:28:29 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Wed, 26 Apr 2006 04:28:29 -0700
Subject: fedora-security/audit fc4,1.219,1.220 fc5,1.133,1.134
Message-ID: <200604261128.k3QBST49030211@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30191

Modified Files:
	fc4 fc5 
Log Message:
Bring up to date, fix ethereal cve names



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.219
retrieving revision 1.220
diff -u -r1.219 -r1.220
--- fc4	25 Apr 2006 18:54:24 -0000	1.219
+++ fc4	26 Apr 2006 11:28:27 -0000	1.220
@@ -1,20 +1,20 @@
-Up to date CVE as of CVE email 20060423
-Up to date FC4 as of 20060423
+Up to date CVE as of CVE email 20060425
+Up to date FC4 as of 20060425
 
 ** are items that need attention
 
 CVE-2006-1991 VULNERABLE (php)
 CVE-2006-1990 VULNERABLE (php)
 CVE-2006-1942 ** firefox
-CVE-2006-1040 VULNERABLE (ethereal, fixed 0.99.0)
-CVE-2006-1039 VULNERABLE (ethereal, fixed 0.99.0)
-CVE-2006-1038 VULNERABLE (ethereal, fixed 0.99.0)
-CVE-2006-1037 VULNERABLE (ethereal, fixed 0.99.0)
-CVE-2006-1036 VULNERABLE (ethereal, fixed 0.99.0)
-CVE-2006-1035 VULNERABLE (ethereal, fixed 0.99.0)
-CVE-2006-1034 VULNERABLE (ethereal, fixed 0.99.0)
-CVE-2006-1033 VULNERABLE (ethereal, fixed 0.99.0)
-CVE-2006-1032 VULNERABLE (ethereal, fixed 0.99.0)
+CVE-2006-1940 VULNERABLE (ethereal, fixed 0.99.0)
+CVE-2006-1939 VULNERABLE (ethereal, fixed 0.99.0)
+CVE-2006-1938 VULNERABLE (ethereal, fixed 0.99.0)
+CVE-2006-1937 VULNERABLE (ethereal, fixed 0.99.0)
+CVE-2006-1936 VULNERABLE (ethereal, fixed 0.99.0)
+CVE-2006-1935 VULNERABLE (ethereal, fixed 0.99.0)
+CVE-2006-1934 VULNERABLE (ethereal, fixed 0.99.0)
+CVE-2006-1933 VULNERABLE (ethereal, fixed 0.99.0)
+CVE-2006-1932 VULNERABLE (ethereal, fixed 0.99.0)
 CVE-2006-1931 version (ruby, fixed 1.8.3)
 CVE-2006-1902 ignore (gcc) not a vulnerability
 CVE-2006-1863 VULNERABLE (kernel, fixed 2.6.16.11)
@@ -693,6 +693,7 @@
 CVE-2005-0654 ignore (gimp, not fixed 2.2) upstream considers harmless
 CVE-2005-0627 version (qt, fixed 3.3.4)
 CVE-2005-0626 version (squid, fixed 2.5.STABLE10) [since FEDORA-2005-913] was backport since GA
+CVE-2005-0611 version (HelixPlayer, fixed 1.0.3)
 CVE-2005-0605 backport (xorg-x11) ...-fix-CAN-2005-0605.patch
 CVE-2005-0605 ** openmotif
 CVE-2005-0602 VULNERABLE (unzip, fixed 5.52) not in srpm
@@ -738,6 +739,7 @@
 CVE-2005-0469 backport (telnet) telnet-0.17-CAN-2005-468_469.patch
 CVE-2005-0468 version (krb5, fixed 1.4.1) [since FEDORA-2005-553] was backport since GA
 CVE-2005-0468 backport (telnet) telnet-0.17-CAN-2005-468_469.patch
+CVE-2005-0455 version (HelixPlayer, fixed 1.0.3)
 CVE-2005-0449 version (kernel, fixed 2.6.11)
 CVE-2005-0448 version (perl, fixed 5.8.6) bz#173793
 CVE-2005-0446 version (squid, fixed 2.5.STABLE9)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- fc5	25 Apr 2006 18:54:24 -0000	1.133
+++ fc5	26 Apr 2006 11:28:27 -0000	1.134
@@ -1,20 +1,20 @@
-Up to date CVE as of CVE email 20060423
-Up to date FC5 as of 20060423
+Up to date CVE as of CVE email 20060425
+Up to date FC5 as of 20060425
 
 ** are items that need attention
 
 CVE-2006-1991 VULNERABLE (php)
 CVE-2006-1990 VULNERABLE (php)
 CVE-2006-1942 ** firefox
-CVE-2006-1040 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
-CVE-2006-1039 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
-CVE-2006-1038 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
-CVE-2006-1037 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
-CVE-2006-1036 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
-CVE-2006-1035 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
-CVE-2006-1034 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
-CVE-2006-1033 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
-CVE-2006-1032 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
+CVE-2006-1940 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
+CVE-2006-1939 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
+CVE-2006-1938 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
+CVE-2006-1937 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
+CVE-2006-1936 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
+CVE-2006-1935 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
+CVE-2006-1934 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
+CVE-2006-1933 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
+CVE-2006-1932 version (ethereal, fixed 0.99.0) [since FEDORA-2006-456]
 CVE-2006-1931 version (ruby, fixed 1.8.3)
 CVE-2006-1902 ignore (gcc) not a vulnerability
 CVE-2006-1865 version (beagle, fixed 0.2.5) [since FEDORA-2006-440]
@@ -692,6 +692,7 @@
 CVE-2005-0654 ignore (gimp, not fixed 2.2) upstream considers harmless
 CVE-2005-0627 version (qt, fixed 3.3.4)
 CVE-2005-0626 version (squid, fixed 2.5.STABLE10)
+CVE-2005-0611 version (HelixPlayer, fixed 1.0.3)
 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
@@ -738,6 +739,7 @@
 CVE-2005-0469 backport (telnet) telnet-0.17-CAN-2005-468_469.patch
 CVE-2005-0468 version (krb5, fixed 1.4.1)
 CVE-2005-0468 backport (telnet) telnet-0.17-CAN-2005-468_469.patch
+CVE-2005-0455 version (HelixPlayer, fixed 1.0.3)
 CVE-2005-0449 version (kernel, fixed 2.6.11)
 CVE-2005-0448 version (perl, fixed 5.8.6) bz#173793
 CVE-2005-0446 version (squid, fixed 2.5.STABLE9)



From fedora-extras-commits at redhat.com  Wed Apr 26 11:47:36 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Wed, 26 Apr 2006 04:47:36 -0700
Subject: rpms/rpy/devel rpy-rversion.patch,NONE,1.1 rpy.spec,1.8,1.9
Message-ID: <200604261147.k3QBlcIi030268@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30248

Modified Files:
	rpy.spec 
Added Files:
	rpy-rversion.patch 
Log Message:
* Wed Apr 26 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-9
- Fix detection of R version.


rpy-rversion.patch:

--- NEW FILE rpy-rversion.patch ---
diff -ur rpy-0.4.6/rpy_tools.py rpy-0.4.6-new/rpy_tools.py
--- rpy-0.4.6/rpy_tools.py	2005-07-28 05:47:47.000000000 +0100
+++ rpy-0.4.6-new/rpy_tools.py	2006-04-26 12:37:16.000000000 +0100
@@ -93,7 +93,7 @@
     if stat or len(output)<=0:
       raise RuntimeError("Couldn't execute the R interpreter" +
                          " `%s'.\n" % rexec )
-    version = re.search("R +([0-9]\.[0-9]\.[0-9])", output)
+    version = re.search("R version +([0-9]\.[0-9]\.[0-9])", output)
     if not version:
       raise RuntimeError("Couldn't obtain version number from output\n"
                                "of `R --version'.\n")


Index: rpy.spec
===================================================================
RCS file: /cvs/extras/rpms/rpy/devel/rpy.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rpy.spec	26 Apr 2006 10:55:02 -0000	1.8
+++ rpy.spec	26 Apr 2006 11:47:36 -0000	1.9
@@ -3,10 +3,11 @@
 Name: 		rpy
 Summary: 	Python interface to the R language
 Version:	0.4.6
-Release:	8%{?dist}
+Release:	9%{?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)
@@ -27,7 +28,7 @@
 %prep
 %setup
 %patch1 -p1 -b .install-info
-
+%patch2 -p1
 
 %build
 env CFLAGS="$RPM_OPT_FLAGS" python setup.py build
@@ -66,6 +67,9 @@
 
 
 %changelog
+* 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
 - Rebuild for R-2.3.0
 



From fedora-extras-commits at redhat.com  Wed Apr 26 11:52:00 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Wed, 26 Apr 2006 04:52:00 -0700
Subject: rpms/rpy/FC-5 rpy-rversion.patch,NONE,1.1 rpy.spec,1.8,1.9
Message-ID: <200604261152.k3QBq2OB030302@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30281

Modified Files:
	rpy.spec 
Added Files:
	rpy-rversion.patch 
Log Message:
* Wed Apr 26 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-9
- Fix detection of R version.


rpy-rversion.patch:

--- NEW FILE rpy-rversion.patch ---
diff -ur rpy-0.4.6/rpy_tools.py rpy-0.4.6-new/rpy_tools.py
--- rpy-0.4.6/rpy_tools.py	2005-07-28 05:47:47.000000000 +0100
+++ rpy-0.4.6-new/rpy_tools.py	2006-04-26 12:37:16.000000000 +0100
@@ -93,7 +93,7 @@
     if stat or len(output)<=0:
       raise RuntimeError("Couldn't execute the R interpreter" +
                          " `%s'.\n" % rexec )
-    version = re.search("R +([0-9]\.[0-9]\.[0-9])", output)
+    version = re.search("R version +([0-9]\.[0-9]\.[0-9])", output)
     if not version:
       raise RuntimeError("Couldn't obtain version number from output\n"
                                "of `R --version'.\n")


Index: rpy.spec
===================================================================
RCS file: /cvs/extras/rpms/rpy/FC-5/rpy.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rpy.spec	26 Apr 2006 10:56:21 -0000	1.8
+++ rpy.spec	26 Apr 2006 11:52:00 -0000	1.9
@@ -3,10 +3,11 @@
 Name: 		rpy
 Summary: 	Python interface to the R language
 Version:	0.4.6
-Release:	8%{?dist}
+Release:	9%{?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)
@@ -27,7 +28,7 @@
 %prep
 %setup
 %patch1 -p1 -b .install-info
-
+%patch2 -p1
 
 %build
 env CFLAGS="$RPM_OPT_FLAGS" python setup.py build
@@ -66,6 +67,9 @@
 
 
 %changelog
+* 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
 - Rebuild for R-2.3.0
 



From fedora-extras-commits at redhat.com  Wed Apr 26 11:52:42 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Wed, 26 Apr 2006 04:52:42 -0700
Subject: rpms/rpy/FC-4 rpy-rversion.patch,NONE,1.1 rpy.spec,1.8,1.9
Message-ID: <200604261152.k3QBqiH5030334@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30314

Modified Files:
	rpy.spec 
Added Files:
	rpy-rversion.patch 
Log Message:
* Wed Apr 26 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-9
- Fix detection of R version.


rpy-rversion.patch:

--- NEW FILE rpy-rversion.patch ---
diff -ur rpy-0.4.6/rpy_tools.py rpy-0.4.6-new/rpy_tools.py
--- rpy-0.4.6/rpy_tools.py	2005-07-28 05:47:47.000000000 +0100
+++ rpy-0.4.6-new/rpy_tools.py	2006-04-26 12:37:16.000000000 +0100
@@ -93,7 +93,7 @@
     if stat or len(output)<=0:
       raise RuntimeError("Couldn't execute the R interpreter" +
                          " `%s'.\n" % rexec )
-    version = re.search("R +([0-9]\.[0-9]\.[0-9])", output)
+    version = re.search("R version +([0-9]\.[0-9]\.[0-9])", output)
     if not version:
       raise RuntimeError("Couldn't obtain version number from output\n"
                                "of `R --version'.\n")


Index: rpy.spec
===================================================================
RCS file: /cvs/extras/rpms/rpy/FC-4/rpy.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rpy.spec	26 Apr 2006 10:56:56 -0000	1.8
+++ rpy.spec	26 Apr 2006 11:52:42 -0000	1.9
@@ -3,10 +3,11 @@
 Name: 		rpy
 Summary: 	Python interface to the R language
 Version:	0.4.6
-Release:	8%{?dist}
+Release:	9%{?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)
@@ -27,7 +28,7 @@
 %prep
 %setup
 %patch1 -p1 -b .install-info
-
+%patch2 -p1
 
 %build
 env CFLAGS="$RPM_OPT_FLAGS" python setup.py build
@@ -66,6 +67,9 @@
 
 
 %changelog
+* 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
 - Rebuild for R-2.3.0
 



From fedora-extras-commits at redhat.com  Wed Apr 26 11:55:37 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Wed, 26 Apr 2006 04:55:37 -0700
Subject: rpms/rpy/FC-3 rpy-rversion.patch,NONE,1.1 rpy.spec,1.5,1.6
Message-ID: <200604261155.k3QBtdN8030371@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30351

Modified Files:
	rpy.spec 
Added Files:
	rpy-rversion.patch 
Log Message:
* Wed Apr 26 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-9
- Fix detection of R version.


rpy-rversion.patch:

--- NEW FILE rpy-rversion.patch ---
diff -ur rpy-0.4.6/rpy_tools.py rpy-0.4.6-new/rpy_tools.py
--- rpy-0.4.6/rpy_tools.py	2005-07-28 05:47:47.000000000 +0100
+++ rpy-0.4.6-new/rpy_tools.py	2006-04-26 12:37:16.000000000 +0100
@@ -93,7 +93,7 @@
     if stat or len(output)<=0:
       raise RuntimeError("Couldn't execute the R interpreter" +
                          " `%s'.\n" % rexec )
-    version = re.search("R +([0-9]\.[0-9]\.[0-9])", output)
+    version = re.search("R version +([0-9]\.[0-9]\.[0-9])", output)
     if not version:
       raise RuntimeError("Couldn't obtain version number from output\n"
                                "of `R --version'.\n")


Index: rpy.spec
===================================================================
RCS file: /cvs/extras/rpms/rpy/FC-3/rpy.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- rpy.spec	26 Apr 2006 10:57:38 -0000	1.5
+++ rpy.spec	26 Apr 2006 11:55:37 -0000	1.6
@@ -3,10 +3,11 @@
 Name: 		rpy
 Summary: 	Python interface to the R language
 Version:	0.4.6
-Release:	8%{?dist}
+Release:	9%{?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)
@@ -27,7 +28,7 @@
 %prep
 %setup
 %patch1 -p1 -b .install-info
-
+%patch2 -p1
 
 %build
 env CFLAGS="$RPM_OPT_FLAGS" python setup.py build
@@ -66,6 +67,9 @@
 
 
 %changelog
+* 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
 - Rebuild for R-2.3.0
 



From fedora-extras-commits at redhat.com  Wed Apr 26 14:03:56 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 26 Apr 2006 07:03:56 -0700
Subject: rpms/openct/devel .cvsignore, 1.5, 1.6 openct.spec, 1.10,
	1.11 sources, 1.5, 1.6
Message-ID: <200604261403.k3QE3wqa004861@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/openct/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4840

Modified Files:
	.cvsignore openct.spec sources 
Log Message:
* Wed Apr 26 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.6.7-0.1.rc4
- 0.6.7-rc4.
- Re-enable PCSC hotplug in pcsc-lite subpackage.
- Include license text.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	22 Apr 2006 20:35:04 -0000	1.5
+++ .cvsignore	26 Apr 2006 14:03:56 -0000	1.6
@@ -1 +1 @@
-openct-0.6.7-rc1.tar.gz
+openct-0.6.7-rc4.tar.gz


Index: openct.spec
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/openct.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- openct.spec	22 Apr 2006 20:35:04 -0000	1.10
+++ openct.spec	26 Apr 2006 14:03:56 -0000	1.11
@@ -2,13 +2,13 @@
 
 Name:           openct
 Version:        0.6.7
-Release:        0.1.rc1%{?dist}
+Release:        0.1.rc4%{?dist}
 Summary:        Middleware framework for smart card terminals
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://www.opensc-project.org/
-Source0:        http://www.opensc-project.org/files/openct/testing/%{name}-%{version}-rc1.tar.gz
+Source0:        http://www.opensc-project.org/files/openct/testing/%{name}-%{version}-rc4.tar.gz
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,14 +53,18 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-rc1
+%setup -q -n %{name}-%{version}-rc4
 sh bootstrap # avoid standard rpaths on lib64 archs
-sed -ie 's|LIBDIR|%{dropdir}|' etc/reader.conf.in
-sed -ie 's|/etc/hotplug/usb/openct|%{_libdir}/openct/hotplug|' etc/openct.udev
+sed -i -e 's|^\([A-Z]\)|# \1|' etc/reader.conf.in
+sed -i -e 's|/etc/hotplug/usb/openct|%{_libdir}/openct/hotplug|' \
+    etc/openct.udev
 
 
 %build
-%configure --disable-dependency-tracking --disable-static
+%configure \
+    --disable-dependency-tracking \
+    --disable-static \
+    --with-bundle-dir=%{dropdir}
 make %{?_smp_mflags}
 
 
@@ -68,11 +72,8 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-install -dm 755 $RPM_BUILD_ROOT%{dropdir}
-mv $RPM_BUILD_ROOT%{_libdir}/openct-ifd.so $RPM_BUILD_ROOT%{dropdir}
-
 install -Dpm 644 etc/openct.udev \
-  $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-openct.rules
+    $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/60-openct.rules
 install -Dpm 755 etc/hotplug.openct $RPM_BUILD_ROOT%{_libdir}/openct/hotplug
 
 install -pm 644 etc/openct.conf $RPM_BUILD_ROOT%{_sysconfdir}/openct.conf
@@ -81,14 +82,16 @@
 
 install -Dpm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/openct
 
+so=$(find $RPM_BUILD_ROOT%{dropdir} -name \*.so | sed "s|^$RPM_BUILD_ROOT||")
+sed -i -e "s|\\(LIBPATH\\s*\\).*|\\1$so|" etc/reader.conf
 install -Dpm 644 etc/reader.conf \
-  $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/%{name}.conf
+    $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/%{name}.conf
 
 install -dm 755 $RPM_BUILD_ROOT%{_localstatedir}/run/openct
 touch $RPM_BUILD_ROOT%{_localstatedir}/run/openct/status
 chmod 644 $RPM_BUILD_ROOT%{_localstatedir}/run/openct/status
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/{*.la,openct-ifd.so}
 
 
 %clean
@@ -101,19 +104,19 @@
 
 %preun
 if [ $1 -eq 0 ] ; then
-  %{_initrddir}/openct stop >/dev/null 2>&1 || :
-  /sbin/chkconfig --del openct
+    %{_initrddir}/openct stop >/dev/null 2>&1 || :
+    /sbin/chkconfig --del openct
 fi
 
 %postun
 /sbin/ldconfig
 if [ $1 -gt 0 ] ; then
-  %{_initrddir}/openct try-restart >/dev/null || :
+    %{_initrddir}/openct try-restart >/dev/null || :
 fi
 
 %post -n pcsc-lite-%{name}
 if [ $1 -eq 1 ] ; then
-  %{_initrddir}/pcscd try-restart >/dev/null 2>&1 || :
+    %{_initrddir}/pcscd try-restart >/dev/null 2>&1 || :
 fi
 
 %postun -n pcsc-lite-%{name}
@@ -122,7 +125,7 @@
 
 %files
 %defattr(-,root,root,-)
-%doc NEWS TODO doc/*.html doc/*.css
+%doc LGPL-2.1 NEWS TODO doc/*.html doc/*.css
 %config(noreplace) %{_sysconfdir}/openct.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/openct
 %config(noreplace) %{_sysconfdir}/udev/rules.d/*openct.rules
@@ -148,10 +151,15 @@
 %files -n pcsc-lite-%{name}
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/reader.conf.d/%{name}.conf
-%{dropdir}/openct-ifd.so
+%{dropdir}/openct-ifd.bundle/
 
 
 %changelog
+* Wed Apr 26 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.6.7-0.1.rc4
+- 0.6.7-rc4.
+- Re-enable PCSC hotplug in pcsc-lite subpackage.
+- Include license text.
+
 * Sat Apr 22 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.6.7-0.1.rc1
 - 0.6.7-rc1, udev rules and reader.conf included upstream.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/openct/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	22 Apr 2006 20:35:04 -0000	1.5
+++ sources	26 Apr 2006 14:03:56 -0000	1.6
@@ -1 +1 @@
-8ad0e54afa2c3ac0073cfd12238e6c48  openct-0.6.7-rc1.tar.gz
+261d40f71696a9a2ae168ae09e18f124  openct-0.6.7-rc4.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 26 14:44:19 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Wed, 26 Apr 2006 07:44:19 -0700
Subject: rpms/rpy/devel rpy.spec,1.9,1.10
Message-ID: <200604261444.k3QEiLnI005474@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5457

Modified Files:
	rpy.spec 
Log Message:
* Wed Apr 26 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-10
- BuildRequires tetex for "make pdf" (pdftex).



Index: rpy.spec
===================================================================
RCS file: /cvs/extras/rpms/rpy/devel/rpy.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rpy.spec	26 Apr 2006 11:47:36 -0000	1.9
+++ rpy.spec	26 Apr 2006 14:44:19 -0000	1.10
@@ -3,7 +3,7 @@
 Name: 		rpy
 Summary: 	Python interface to the R language
 Version:	0.4.6
-Release:	9%{?dist}
+Release:	10%{?dist}
 Url:		http://rpy.sourceforge.net
 Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
 Patch1:         rpy-install-info.patch
@@ -12,7 +12,7 @@
 Group:		Development/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	R, python-numeric, python-devel, texinfo
+BuildRequires:	R, python-numeric, python-devel, texinfo, tetex
 
 Requires:	python-numeric
 Requires:	R = 2.3.0
@@ -67,6 +67,9 @@
 
 
 %changelog
+* 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
 - Fix detection of R version.
 



From fedora-extras-commits at redhat.com  Wed Apr 26 14:44:52 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Wed, 26 Apr 2006 07:44:52 -0700
Subject: rpms/rpy/FC-5 rpy.spec,1.9,1.10
Message-ID: <200604261444.k3QEiswT005536@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5519

Modified Files:
	rpy.spec 
Log Message:
* Wed Apr 26 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-10
- BuildRequires tetex for "make pdf" (pdftex).



Index: rpy.spec
===================================================================
RCS file: /cvs/extras/rpms/rpy/FC-5/rpy.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rpy.spec	26 Apr 2006 11:52:00 -0000	1.9
+++ rpy.spec	26 Apr 2006 14:44:52 -0000	1.10
@@ -3,7 +3,7 @@
 Name: 		rpy
 Summary: 	Python interface to the R language
 Version:	0.4.6
-Release:	9%{?dist}
+Release:	10%{?dist}
 Url:		http://rpy.sourceforge.net
 Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
 Patch1:         rpy-install-info.patch
@@ -12,7 +12,7 @@
 Group:		Development/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	R, python-numeric, python-devel, texinfo
+BuildRequires:	R, python-numeric, python-devel, texinfo, tetex
 
 Requires:	python-numeric
 Requires:	R = 2.3.0
@@ -67,6 +67,9 @@
 
 
 %changelog
+* 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
 - Fix detection of R version.
 



From fedora-extras-commits at redhat.com  Wed Apr 26 14:45:27 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Wed, 26 Apr 2006 07:45:27 -0700
Subject: rpms/rpy/FC-4 rpy.spec,1.9,1.10
Message-ID: <200604261445.k3QEjTw8005601@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5584

Modified Files:
	rpy.spec 
Log Message:
* Wed Apr 26 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-10
- BuildRequires tetex for "make pdf" (pdftex).



Index: rpy.spec
===================================================================
RCS file: /cvs/extras/rpms/rpy/FC-4/rpy.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- rpy.spec	26 Apr 2006 11:52:42 -0000	1.9
+++ rpy.spec	26 Apr 2006 14:45:26 -0000	1.10
@@ -3,7 +3,7 @@
 Name: 		rpy
 Summary: 	Python interface to the R language
 Version:	0.4.6
-Release:	9%{?dist}
+Release:	10%{?dist}
 Url:		http://rpy.sourceforge.net
 Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
 Patch1:         rpy-install-info.patch
@@ -12,7 +12,7 @@
 Group:		Development/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	R, python-numeric, python-devel, texinfo
+BuildRequires:	R, python-numeric, python-devel, texinfo, tetex
 
 Requires:	python-numeric
 Requires:	R = 2.3.0
@@ -67,6 +67,9 @@
 
 
 %changelog
+* 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
 - Fix detection of R version.
 



From fedora-extras-commits at redhat.com  Wed Apr 26 14:45:58 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Wed, 26 Apr 2006 07:45:58 -0700
Subject: rpms/rpy/FC-3 rpy.spec,1.6,1.7
Message-ID: <200604261446.k3QEk03F005662@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/rpy/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5645

Modified Files:
	rpy.spec 
Log Message:
* Wed Apr 26 2006 Jos?? Matos <jamatos at fc.up.pt> - 0.4.6-10
- BuildRequires tetex for "make pdf" (pdftex).



Index: rpy.spec
===================================================================
RCS file: /cvs/extras/rpms/rpy/FC-3/rpy.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rpy.spec	26 Apr 2006 11:55:37 -0000	1.6
+++ rpy.spec	26 Apr 2006 14:45:58 -0000	1.7
@@ -3,7 +3,7 @@
 Name: 		rpy
 Summary: 	Python interface to the R language
 Version:	0.4.6
-Release:	9%{?dist}
+Release:	10%{?dist}
 Url:		http://rpy.sourceforge.net
 Source0:	http://dl.sf.net/%{name}/%{name}-%{version}.tar.gz
 Patch1:         rpy-install-info.patch
@@ -12,7 +12,7 @@
 Group:		Development/Libraries
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	R, python-numeric, python-devel, texinfo
+BuildRequires:	R, python-numeric, python-devel, texinfo, tetex
 
 Requires:	python-numeric
 Requires:	R = 2.3.0
@@ -67,6 +67,9 @@
 
 
 %changelog
+* 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
 - Fix detection of R version.
 



From fedora-extras-commits at redhat.com  Wed Apr 26 15:06:46 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Wed, 26 Apr 2006 08:06:46 -0700
Subject: rpms/pygame/FC-4 pygame.spec,1.5,1.6
Message-ID: <200604261506.k3QF6mP7007972@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7927/pygame/FC-4

Modified Files:
	pygame.spec 
Log Message:
Fix Bugzilla bug #189991


Index: pygame.spec
===================================================================
RCS file: /cvs/extras/rpms/pygame/FC-4/pygame.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pygame.spec	21 Apr 2006 23:15:21 -0000	1.5
+++ pygame.spec	26 Apr 2006 15:06:45 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           pygame
 Version:        1.7.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Python modules for writing games
 Group:          Development/Languages
 License:        LGPL
@@ -15,7 +15,9 @@
 BuildRequires:  SDL_ttf-devel SDL_image-devel SDL_mixer-devel
 Requires:       python-numeric
 Obsoletes:      python-pygame < 1.7.1
+Obsoletes:      python-pygame-docs < 1.7.1
 Provides:       python-pygame = %{version}-%{release}
+Provides:       python-pygame-docs = %{version}-%{release}
 
 %description
 Pygame is a set of Python modules designed for writing games. It is
@@ -30,6 +32,8 @@
 Requires:       %{name} = %{version}-%{release}
 Requires:       SDL_ttf-devel SDL_mixer-devel
 Requires:       python-devel
+Obsoletes:      python-pygame-devel < 1.7.1
+Provides:       python-pygame-devel = %{version}-%{release}
 
 %description devel
 This package contains headers required to build applications that use
@@ -82,6 +86,11 @@
 %{_includedir}/python*/%{name}/*.h
 
 %changelog
+* Wed Apr 26 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-5
+- Add Obsolete/Provides tags for python-pygame-docs
+- Add Obsolete/Provides tags for python-pygame-devel to devel package
+- Hopefully this fixes Bugzilla bug #189991
+
 * Fri Apr 21 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-4
 - Add Requires to -devel package
 - Remove ffmovie.h from -devel package since it requires smpeg-devel



From fedora-extras-commits at redhat.com  Wed Apr 26 15:06:47 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Wed, 26 Apr 2006 08:06:47 -0700
Subject: rpms/pygame/devel pygame.spec,1.5,1.6
Message-ID: <200604261506.k3QF6nmu007978@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7927/pygame/devel

Modified Files:
	pygame.spec 
Log Message:
Fix Bugzilla bug #189991


Index: pygame.spec
===================================================================
RCS file: /cvs/extras/rpms/pygame/devel/pygame.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pygame.spec	21 Apr 2006 23:15:23 -0000	1.5
+++ pygame.spec	26 Apr 2006 15:06:47 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           pygame
 Version:        1.7.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Python modules for writing games
 Group:          Development/Languages
 License:        LGPL
@@ -15,7 +15,9 @@
 BuildRequires:  SDL_ttf-devel SDL_image-devel SDL_mixer-devel
 Requires:       python-numeric
 Obsoletes:      python-pygame < 1.7.1
+Obsoletes:      python-pygame-docs < 1.7.1
 Provides:       python-pygame = %{version}-%{release}
+Provides:       python-pygame-docs = %{version}-%{release}
 
 %description
 Pygame is a set of Python modules designed for writing games. It is
@@ -30,6 +32,8 @@
 Requires:       %{name} = %{version}-%{release}
 Requires:       SDL_ttf-devel SDL_mixer-devel
 Requires:       python-devel
+Obsoletes:      python-pygame-devel < 1.7.1
+Provides:       python-pygame-devel = %{version}-%{release}
 
 %description devel
 This package contains headers required to build applications that use
@@ -82,6 +86,11 @@
 %{_includedir}/python*/%{name}/*.h
 
 %changelog
+* Wed Apr 26 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-5
+- Add Obsolete/Provides tags for python-pygame-docs
+- Add Obsolete/Provides tags for python-pygame-devel to devel package
+- Hopefully this fixes Bugzilla bug #189991
+
 * Fri Apr 21 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-4
 - Add Requires to -devel package
 - Remove ffmovie.h from -devel package since it requires smpeg-devel



From fedora-extras-commits at redhat.com  Wed Apr 26 15:06:46 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Wed, 26 Apr 2006 08:06:46 -0700
Subject: rpms/pygame/FC-5 pygame.spec,1.5,1.6
Message-ID: <200604261506.k3QF6m6v007976@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7927/pygame/FC-5

Modified Files:
	pygame.spec 
Log Message:
Fix Bugzilla bug #189991


Index: pygame.spec
===================================================================
RCS file: /cvs/extras/rpms/pygame/FC-5/pygame.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pygame.spec	21 Apr 2006 23:15:22 -0000	1.5
+++ pygame.spec	26 Apr 2006 15:06:46 -0000	1.6
@@ -2,7 +2,7 @@
 
 Name:           pygame
 Version:        1.7.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Python modules for writing games
 Group:          Development/Languages
 License:        LGPL
@@ -15,7 +15,9 @@
 BuildRequires:  SDL_ttf-devel SDL_image-devel SDL_mixer-devel
 Requires:       python-numeric
 Obsoletes:      python-pygame < 1.7.1
+Obsoletes:      python-pygame-docs < 1.7.1
 Provides:       python-pygame = %{version}-%{release}
+Provides:       python-pygame-docs = %{version}-%{release}
 
 %description
 Pygame is a set of Python modules designed for writing games. It is
@@ -30,6 +32,8 @@
 Requires:       %{name} = %{version}-%{release}
 Requires:       SDL_ttf-devel SDL_mixer-devel
 Requires:       python-devel
+Obsoletes:      python-pygame-devel < 1.7.1
+Provides:       python-pygame-devel = %{version}-%{release}
 
 %description devel
 This package contains headers required to build applications that use
@@ -82,6 +86,11 @@
 %{_includedir}/python*/%{name}/*.h
 
 %changelog
+* Wed Apr 26 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-5
+- Add Obsolete/Provides tags for python-pygame-docs
+- Add Obsolete/Provides tags for python-pygame-devel to devel package
+- Hopefully this fixes Bugzilla bug #189991
+
 * Fri Apr 21 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-4
 - Add Requires to -devel package
 - Remove ffmovie.h from -devel package since it requires smpeg-devel



From fedora-extras-commits at redhat.com  Wed Apr 26 15:17:36 2006
From: fedora-extras-commits at redhat.com (Christopher Stone (xulchris))
Date: Wed, 26 Apr 2006 08:17:36 -0700
Subject: rpms/pygame/devel pygame.spec,1.6,1.7
Message-ID: <200604261517.k3QFHcbg008122@cvs-int.fedora.redhat.com>

Author: xulchris

Update of /cvs/extras/rpms/pygame/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8105

Modified Files:
	pygame.spec 
Log Message:
Screwed up, tried a make tag before cvs commit.  Bumping release number for rebuild


Index: pygame.spec
===================================================================
RCS file: /cvs/extras/rpms/pygame/devel/pygame.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pygame.spec	26 Apr 2006 15:06:47 -0000	1.6
+++ pygame.spec	26 Apr 2006 15:17:36 -0000	1.7
@@ -2,7 +2,7 @@
 
 Name:           pygame
 Version:        1.7.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Python modules for writing games
 Group:          Development/Languages
 License:        LGPL
@@ -86,6 +86,9 @@
 %{_includedir}/python*/%{name}/*.h
 
 %changelog
+* Wed Apr 26 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-6
+- Bump release for new build on devel
+
 * Wed Apr 26 2006 Christopher Stone <chris.stone at gmail.com> 1.7.1-5
 - Add Obsolete/Provides tags for python-pygame-docs
 - Add Obsolete/Provides tags for python-pygame-devel to devel package



From fedora-extras-commits at redhat.com  Wed Apr 26 16:01:21 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Wed, 26 Apr 2006 09:01:21 -0700
Subject: owners owners.list,1.899,1.900
Message-ID: <200604261601.k3QG1woX010438@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10405

Modified Files:
	owners.list 
Log Message:
Added Metapixel



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.899
retrieving revision 1.900
diff -u -r1.899 -r1.900
--- owners.list	26 Apr 2006 06:36:07 -0000	1.899
+++ owners.list	26 Apr 2006 16:01:21 -0000	1.900
@@ -724,6 +724,7 @@
 Fedora Extras|meld|Visual diff and merge tool|bdpepple at ameritech.net|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|
 Fedora Extras|metakit|Embeddable database|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|metapixel|A Photomosaic Generator|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|mew|a great MIME mail reader for Emacs|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|mfstools|Utilities for TiVo drive upgrades|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|mftrace|Utility for converting TeX bitmap fonts to Type 1 or TrueType fonts|qspencer at ieee.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Apr 26 16:03:40 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Wed, 26 Apr 2006 09:03:40 -0700
Subject: rpms/metapixel - New directory
Message-ID: <200604261603.k3QG3glv010556@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/metapixel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10530/metapixel

Log Message:
Directory /cvs/extras/rpms/metapixel added to the repository




From fedora-extras-commits at redhat.com  Wed Apr 26 16:03:41 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Wed, 26 Apr 2006 09:03:41 -0700
Subject: rpms/metapixel/devel - New directory
Message-ID: <200604261603.k3QG3hUu010559@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/metapixel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10530/metapixel/devel

Log Message:
Directory /cvs/extras/rpms/metapixel/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Apr 26 16:03:55 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Wed, 26 Apr 2006 09:03:55 -0700
Subject: rpms/metapixel Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604261603.k3QG3vm2010608@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/metapixel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10575

Added Files:
	Makefile import.log 
Log Message:
Setup of module metapixel


--- NEW FILE Makefile ---
# Top level Makefile for module metapixel
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 26 16:03:56 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Wed, 26 Apr 2006 09:03:56 -0700
Subject: rpms/metapixel/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604261604.k3QG3w2u010611@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/metapixel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10575/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module metapixel


--- 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 Apr 26 16:04:33 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Wed, 26 Apr 2006 09:04:33 -0700
Subject: rpms/metapixel import.log,1.1,1.2
Message-ID: <200604261604.k3QG4ZgV010678@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/metapixel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10644

Modified Files:
	import.log 
Log Message:
auto-import metapixel-1.0.1-2 on branch devel from metapixel-1.0.1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/metapixel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Apr 2006 16:03:55 -0000	1.1
+++ import.log	26 Apr 2006 16:04:33 -0000	1.2
@@ -0,0 +1 @@
+metapixel-1_0_1-2:HEAD:metapixel-1.0.1-2.src.rpm:1146067465



From fedora-extras-commits at redhat.com  Wed Apr 26 16:04:34 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Wed, 26 Apr 2006 09:04:34 -0700
Subject: rpms/metapixel/devel metapixel-makefile.patch, NONE,
	1.1 metapixel.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604261604.k3QG4agY010685@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/metapixel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10644/devel

Modified Files:
	.cvsignore sources 
Added Files:
	metapixel-makefile.patch metapixel.spec 
Log Message:
auto-import metapixel-1.0.1-2 on branch devel from metapixel-1.0.1-2.src.rpm

metapixel-makefile.patch:

--- NEW FILE metapixel-makefile.patch ---
--- metapixel-1.0.1/Makefile.makefile	2006-02-19 22:30:56.000000000 +0100
+++ metapixel-1.0.1/Makefile	2006-04-26 04:18:27.000000000 +0200
@@ -1,9 +1,9 @@
-PREFIX = /usr/local
+PREFIX = /usr
 INSTALL = install
 MANPAGE_XSL = /sw/share/xml/xsl/docbook-xsl/manpages/docbook.xsl
 
 BINDIR = $(PREFIX)/bin
-MANDIR = $(PREFIX)/man
+MANDIR = $(PREFIX)/share/man
 
 VERSION = 1.0.1
 
@@ -46,12 +46,13 @@
 	$(CC) $(CCOPTS) -c $<
 
 install : metapixel metapixel.1
-	$(INSTALL) -d $(BINDIR)
-	$(INSTALL) metapixel $(BINDIR)
-	$(INSTALL) metapixel-prepare $(BINDIR)
-	$(INSTALL) metapixel.1 $(MANDIR)/man1
-	$(INSTALL) metapixel-imagesize $(BINDIR)
-	$(INSTALL) metapixel-sizesort $(BINDIR)
+	$(INSTALL) -d $(DESTDIR)$(BINDIR)
+	$(INSTALL) -d $(DESTDIR)$(MANDIR)/man1
+	$(INSTALL) metapixel $(DESTDIR)$(BINDIR)
+	$(INSTALL) metapixel-prepare $(DESTDIR)$(BINDIR)
+	$(INSTALL) metapixel.1 $(DESTDIR)$(MANDIR)/man1
+	$(INSTALL) metapixel-imagesize $(DESTDIR)$(BINDIR)
+	$(INSTALL) metapixel-sizesort $(DESTDIR)$(BINDIR)
 
 clean :
 	rm -f *.o metapixel convert metapixel-imagesize *~


--- NEW FILE metapixel.spec ---
Summary: A Photomosaic Generator
Name: metapixel
Version: 1.0.1
Release: 2%{?dist}
License: GPL
Group: Applications/Multimedia
Source0: http://www.complang.tuwien.ac.at/~schani/metapixel/metapixel-%{version}.tar.gz
Patch0: metapixel-makefile.patch
URL: http://www.complang.tuwien.ac.at/~schani/metapixel/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libjpeg-devel, libpng-devel, zlib-devel

%description
Metapixel is a program for generating photomosaics. It can generate
classical photomosaics, in which the source image is viewed as a matrix
of equally sized rectangles for each of which a matching image is
substitued, as well as collage-style photomosaics, in which rectangular
parts of the source image at arbitrary positions (i.e. not aligned to a
matrix) are substituted by matching images.

%prep
%setup -q
%patch0 -p1 -b .makefile

%build
%{__make} %{?_smp_mflags}

%install
rm -rf %{buildroot}
%{__make} install DESTDIR=%{buildroot}
chmod 644 %{buildroot}%{_mandir}/man1/metapixel.1*

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc COPYING README
%{_bindir}/metapixel
%{_bindir}/metapixel-prepare
%{_bindir}/metapixel-imagesize
%{_bindir}/metapixel-sizesort
%{_mandir}/man1/metapixel.1.gz


%changelog
* Wed Apr 26 2006 Andreas Thienemann <andreas at bawue.net> 1.0.1-2
- Fixed manpage perms

* Wed Apr 26 2006 Andreas Thienemann <andreas at bawue.net> 1.0.1-1
- Updated to 1.0.1-1

* Thu Aug 25 2005 Andreas Thienemann <andreas at bawue.net> 1.0.0-1
- Initial spec.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/metapixel/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Apr 2006 16:03:56 -0000	1.1
+++ .cvsignore	26 Apr 2006 16:04:33 -0000	1.2
@@ -0,0 +1 @@
+metapixel-1.0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/metapixel/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Apr 2006 16:03:56 -0000	1.1
+++ sources	26 Apr 2006 16:04:34 -0000	1.2
@@ -0,0 +1 @@
+b0fcb1ad62708478478218190c355fd0  metapixel-1.0.1.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 26 16:07:29 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Wed, 26 Apr 2006 09:07:29 -0700
Subject: rpms/conserver/FC-5 conserver.spec,1.1,1.2
Message-ID: <200604261607.k3QG7VA6010826@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/conserver/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10762/FC-5

Modified Files:
	conserver.spec 
Log Message:

Feature request (split 'console' out to -client subpackage)



Index: conserver.spec
===================================================================
RCS file: /cvs/extras/rpms/conserver/FC-5/conserver.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- conserver.spec	10 Apr 2006 19:25:15 -0000	1.1
+++ conserver.spec	26 Apr 2006 16:07:29 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           conserver
 Version:        8.1.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Serial console server daemon/client
 
 Group:          System Environment/Daemons
@@ -22,6 +22,13 @@
 write-access of a console (one at a time), and has a variety of bells 
 and whistles to accentuate that basic functionality.
 
+%package client
+Summary: Serial console client
+Group: Applications/Communications
+
+%description client
+This is the client package needed to interact with a Conserver daemon.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -70,7 +77,13 @@
 fi
 # make sure /etc/services has a conserver entry
 if ! egrep '\<conserver\>' /etc/services > /dev/null 2>&1 ; then
-  echo "console		 782/tcp	conserver" >> /etc/services
+  echo "console		782/tcp		conserver" >> /etc/services
+fi
+
+%post client
+# make sure /etc/services has a conserver entry
+if ! egrep '\<conserver\>' /etc/services > /dev/null 2>&1 ; then
+  echo "console		782/tcp		conserver" >> /etc/services
 fi
 
 
@@ -88,15 +101,22 @@
 %doc CHANGES FAQ LICENSE INSTALL README conserver.cf/samples/ conserver.cf/conserver.cf conserver.cf/conserver.passwd
 %config(noreplace) %{_sysconfdir}/conserver.*
 %{_initrddir}/conserver
-%{_bindir}/console
 %{_libdir}/conserver
-%{_mandir}/man1/console.1.gz
 %{_mandir}/man5/conserver.cf.5.gz
 %{_mandir}/man5/conserver.passwd.5.gz
 %{_mandir}/man8/conserver.8.gz
 %{_sbindir}/conserver
 
+%files client
+%defattr(-,root,root,-)
+%doc LICENSE
+%{_bindir}/console
+%{_mandir}/man1/console.1.gz
+
 %changelog
+* Wed Apr 26 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 8.1.14-2
+- Split 'console' out to -client subpackage, as suggested by Nate Straz
+
 * Mon Apr 10 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 8.1.14-1
 - Figures, two days after my initial Fedora Extras RPM, a new release...
 



From fedora-extras-commits at redhat.com  Wed Apr 26 16:07:30 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Wed, 26 Apr 2006 09:07:30 -0700
Subject: rpms/conserver/devel conserver.spec,1.1,1.2
Message-ID: <200604261607.k3QG7W0i010831@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/conserver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10762/devel

Modified Files:
	conserver.spec 
Log Message:

Feature request (split 'console' out to -client subpackage)



Index: conserver.spec
===================================================================
RCS file: /cvs/extras/rpms/conserver/devel/conserver.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- conserver.spec	10 Apr 2006 19:25:15 -0000	1.1
+++ conserver.spec	26 Apr 2006 16:07:30 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           conserver
 Version:        8.1.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Serial console server daemon/client
 
 Group:          System Environment/Daemons
@@ -22,6 +22,13 @@
 write-access of a console (one at a time), and has a variety of bells 
 and whistles to accentuate that basic functionality.
 
+%package client
+Summary: Serial console client
+Group: Applications/Communications
+
+%description client
+This is the client package needed to interact with a Conserver daemon.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -70,7 +77,13 @@
 fi
 # make sure /etc/services has a conserver entry
 if ! egrep '\<conserver\>' /etc/services > /dev/null 2>&1 ; then
-  echo "console		 782/tcp	conserver" >> /etc/services
+  echo "console		782/tcp		conserver" >> /etc/services
+fi
+
+%post client
+# make sure /etc/services has a conserver entry
+if ! egrep '\<conserver\>' /etc/services > /dev/null 2>&1 ; then
+  echo "console		782/tcp		conserver" >> /etc/services
 fi
 
 
@@ -88,15 +101,22 @@
 %doc CHANGES FAQ LICENSE INSTALL README conserver.cf/samples/ conserver.cf/conserver.cf conserver.cf/conserver.passwd
 %config(noreplace) %{_sysconfdir}/conserver.*
 %{_initrddir}/conserver
-%{_bindir}/console
 %{_libdir}/conserver
-%{_mandir}/man1/console.1.gz
 %{_mandir}/man5/conserver.cf.5.gz
 %{_mandir}/man5/conserver.passwd.5.gz
 %{_mandir}/man8/conserver.8.gz
 %{_sbindir}/conserver
 
+%files client
+%defattr(-,root,root,-)
+%doc LICENSE
+%{_bindir}/console
+%{_mandir}/man1/console.1.gz
+
 %changelog
+* Wed Apr 26 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 8.1.14-2
+- Split 'console' out to -client subpackage, as suggested by Nate Straz
+
 * Mon Apr 10 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 8.1.14-1
 - Figures, two days after my initial Fedora Extras RPM, a new release...
 



From fedora-extras-commits at redhat.com  Wed Apr 26 16:07:23 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Wed, 26 Apr 2006 09:07:23 -0700
Subject: rpms/conserver/FC-3 conserver.spec,1.1,1.2
Message-ID: <200604261607.k3QG7tru010872@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/conserver/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10762/FC-3

Modified Files:
	conserver.spec 
Log Message:

Feature request (split 'console' out to -client subpackage)



Index: conserver.spec
===================================================================
RCS file: /cvs/extras/rpms/conserver/FC-3/conserver.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- conserver.spec	10 Apr 2006 19:25:15 -0000	1.1
+++ conserver.spec	26 Apr 2006 16:07:23 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           conserver
 Version:        8.1.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Serial console server daemon/client
 
 Group:          System Environment/Daemons
@@ -22,6 +22,13 @@
 write-access of a console (one at a time), and has a variety of bells 
 and whistles to accentuate that basic functionality.
 
+%package client
+Summary: Serial console client
+Group: Applications/Communications
+
+%description client
+This is the client package needed to interact with a Conserver daemon.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -70,7 +77,13 @@
 fi
 # make sure /etc/services has a conserver entry
 if ! egrep '\<conserver\>' /etc/services > /dev/null 2>&1 ; then
-  echo "console		 782/tcp	conserver" >> /etc/services
+  echo "console		782/tcp		conserver" >> /etc/services
+fi
+
+%post client
+# make sure /etc/services has a conserver entry
+if ! egrep '\<conserver\>' /etc/services > /dev/null 2>&1 ; then
+  echo "console		782/tcp		conserver" >> /etc/services
 fi
 
 
@@ -88,15 +101,22 @@
 %doc CHANGES FAQ LICENSE INSTALL README conserver.cf/samples/ conserver.cf/conserver.cf conserver.cf/conserver.passwd
 %config(noreplace) %{_sysconfdir}/conserver.*
 %{_initrddir}/conserver
-%{_bindir}/console
 %{_libdir}/conserver
-%{_mandir}/man1/console.1.gz
 %{_mandir}/man5/conserver.cf.5.gz
 %{_mandir}/man5/conserver.passwd.5.gz
 %{_mandir}/man8/conserver.8.gz
 %{_sbindir}/conserver
 
+%files client
+%defattr(-,root,root,-)
+%doc LICENSE
+%{_bindir}/console
+%{_mandir}/man1/console.1.gz
+
 %changelog
+* Wed Apr 26 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 8.1.14-2
+- Split 'console' out to -client subpackage, as suggested by Nate Straz
+
 * Mon Apr 10 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 8.1.14-1
 - Figures, two days after my initial Fedora Extras RPM, a new release...
 



From fedora-extras-commits at redhat.com  Wed Apr 26 16:07:24 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Wed, 26 Apr 2006 09:07:24 -0700
Subject: rpms/conserver/FC-4 conserver.spec,1.1,1.2
Message-ID: <200604261608.k3QG7ucq010876@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/conserver/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10762/FC-4

Modified Files:
	conserver.spec 
Log Message:

Feature request (split 'console' out to -client subpackage)



Index: conserver.spec
===================================================================
RCS file: /cvs/extras/rpms/conserver/FC-4/conserver.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- conserver.spec	10 Apr 2006 19:25:15 -0000	1.1
+++ conserver.spec	26 Apr 2006 16:07:23 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           conserver
 Version:        8.1.14
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Serial console server daemon/client
 
 Group:          System Environment/Daemons
@@ -22,6 +22,13 @@
 write-access of a console (one at a time), and has a variety of bells 
 and whistles to accentuate that basic functionality.
 
+%package client
+Summary: Serial console client
+Group: Applications/Communications
+
+%description client
+This is the client package needed to interact with a Conserver daemon.
+
 %prep
 %setup -q
 %patch0 -p1
@@ -70,7 +77,13 @@
 fi
 # make sure /etc/services has a conserver entry
 if ! egrep '\<conserver\>' /etc/services > /dev/null 2>&1 ; then
-  echo "console		 782/tcp	conserver" >> /etc/services
+  echo "console		782/tcp		conserver" >> /etc/services
+fi
+
+%post client
+# make sure /etc/services has a conserver entry
+if ! egrep '\<conserver\>' /etc/services > /dev/null 2>&1 ; then
+  echo "console		782/tcp		conserver" >> /etc/services
 fi
 
 
@@ -88,15 +101,22 @@
 %doc CHANGES FAQ LICENSE INSTALL README conserver.cf/samples/ conserver.cf/conserver.cf conserver.cf/conserver.passwd
 %config(noreplace) %{_sysconfdir}/conserver.*
 %{_initrddir}/conserver
-%{_bindir}/console
 %{_libdir}/conserver
-%{_mandir}/man1/console.1.gz
 %{_mandir}/man5/conserver.cf.5.gz
 %{_mandir}/man5/conserver.passwd.5.gz
 %{_mandir}/man8/conserver.8.gz
 %{_sbindir}/conserver
 
+%files client
+%defattr(-,root,root,-)
+%doc LICENSE
+%{_bindir}/console
+%{_mandir}/man1/console.1.gz
+
 %changelog
+* Wed Apr 26 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 8.1.14-2
+- Split 'console' out to -client subpackage, as suggested by Nate Straz
+
 * Mon Apr 10 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 8.1.14-1
 - Figures, two days after my initial Fedora Extras RPM, a new release...
 



From fedora-extras-commits at redhat.com  Wed Apr 26 18:51:33 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Wed, 26 Apr 2006 11:51:33 -0700
Subject: rpms/sbcl/devel .cvsignore, 1.11, 1.12 sbcl.spec, 1.40, 1.41 sources,
	1.11, 1.12
Message-ID: <200604261851.k3QIpZxK016310@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16289

Modified Files:
	.cvsignore sbcl.spec sources 
Log Message:
* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-1
- 0.9.12



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	30 Mar 2006 18:15:23 -0000	1.11
+++ .cvsignore	26 Apr 2006 18:51:33 -0000	1.12
@@ -1,4 +1,4 @@
-sbcl-0.9.11-source.tar.bz2
+sbcl-0.9.12-source.tar.bz2
 sbcl-0.9.11-x86-64-linux-binary.tar.bz2 
 sbcl-0.9.11-x86-linux-binary.tar.bz2
-sbcl-0.8.15-powerpc-linux-binary.tar.bz2
+sbcl-0.9.8-powerpc-linux-binary.tar.bz2


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sbcl.spec	30 Mar 2006 18:15:23 -0000	1.40
+++ sbcl.spec	26 Apr 2006 18:51:33 -0000	1.41
@@ -12,7 +12,7 @@
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
-Version: 0.9.11
+Version: 0.9.12
 Release: 1%{?dist}
 
 License: BSD/MIT
@@ -26,12 +26,22 @@
 #Source1: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2
 Source2: customize-target-features.lisp 
 
+## Bootstraps
+# %{ix86}
+#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-linux-binary.tar.bz2
+# x86_64
+#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-64-linux-binary.tar.bz2
+# ppc
+#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-powerpc-linux-binary.tar.bz2
+# another possible ppc bootstrap to try
+#Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
+
+
 ## x86 section
 %ifarch %{ix86}
 %define sbcl_arch x86
 BuildRequires: sbcl
 # or
-#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-linux-binary.tar.bz2
 #define sbcl_bootstrap_src -a 10 
 %endif
 
@@ -47,16 +57,10 @@
 ## ppc section
 # Latest powerpc-linux bootstrap build fails:
 # http://bugzilla.redhat.com/bugzilla/177029 
-#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2
-# another possible ppc bootstrap to try
-#Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
 Source35: ppc-linux-mcontext.h
 %ifarch ppc 
 %define sbcl_arch ppc
 %define sbcl_bootstrap_src -a 30
-BuildRequires: setarch
-%define setarch setarch %{_target_cpu}
-%define min_bootstrap 1
 %endif
 
 Source100: my_setarch.c
@@ -65,7 +69,7 @@
 Patch2: sbcl-0.9.5-personality.patch
 Patch3: sbcl-0.9.5-optflags.patch
 Patch4: sbcl-0.9.4-LIB_DIR.patch
-Patch5: sbcl-0.9.10-make-config-ppc.patch
+#Patch5: sbcl-0.9.10-make-config-ppc.patch
 Patch6: sbcl-0.9.5-verbose-build.patch
 # Allow override of contrib test failure(s)
 Patch7: sbcl-0.9.9-permissive.patch
@@ -97,7 +101,7 @@
 %patch2 -p1 -b .personality
 %patch3 -p1 -b .optflags
 %patch4 -p1 -b .LIB_DIR
-%patch5 -p1 -b .make-config-ppc
+#patch5 -p1 -b .make-config-ppc
 %{?sbcl_verbose:%patch6 -p1 -b .verbose-build}
 %patch7 -p1 -b .permissive
 
@@ -228,6 +232,9 @@
 
 
 %changelog
+* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-1
+- 0.9.12
+
 * Mon Mar 27 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.11-1
 - 0.9.11
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	30 Mar 2006 18:15:23 -0000	1.11
+++ sources	26 Apr 2006 18:51:33 -0000	1.12
@@ -1 +1 @@
-b82c3b7cf5c351cbe97af5150c17ad27  sbcl-0.9.11-source.tar.bz2
+82eef4f47d6a72a36d4484bf503fc7db  sbcl-0.9.12-source.tar.bz2



From fedora-extras-commits at redhat.com  Wed Apr 26 19:25:40 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 26 Apr 2006 12:25:40 -0700
Subject: rpms/lft/FC-5 lft-2.5-tolower-189996.patch, NONE, 1.1 lft.spec, 1.18,
	1.19
Message-ID: <200604261925.k3QJPgm6018683@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lft/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18648/FC-5

Modified Files:
	lft.spec 
Added Files:
	lft-2.5-tolower-189996.patch 
Log Message:
* Wed Apr 26 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1:2.5-3
- Backport fix for x86_64 crash at startup from upstream 2.6b5 (#189996).


lft-2.5-tolower-189996.patch:

--- NEW FILE lft-2.5-tolower-189996.patch ---
--- lft.c~	2005-08-25 07:40:36.000000000 +0300
+++ lft.c	2006-04-26 22:07:54.000000000 +0300
@@ -310,6 +310,20 @@
   return (sum);
 }
 
+static char * 
+strtolower (char *input) {
+    char *iter = input;
+    
+    if (input == NULL)
+        return NULL;
+    
+    while (*iter) {
+        *iter = tolower (*iter);
+        iter++;
+    }
+    return input;
+}
+
 void
 do_auto_ports (char *hostname, int init_dport)
 {
@@ -328,7 +342,7 @@
 
     char *mailservers[] = { "mail", "smtp", "mx", "relay", "inbound" };
     int cnt = 0;
-    hostname = (char *) tolower(hostname);
+    hostname = (char *) strtolower(hostname);
 
   for (cnt = 0 ; cnt < 5 ; cnt++)
    {


Index: lft.spec
===================================================================
RCS file: /cvs/extras/rpms/lft/FC-5/lft.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- lft.spec	16 Feb 2006 07:24:08 -0000	1.18
+++ lft.spec	26 Apr 2006 19:25:40 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           lft
 Version:        2.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          1
 Summary:        Alternate traceroute tool
 
@@ -10,6 +10,7 @@
 # http://pwhois.org/dl/?file=lft-2.5.tar.gz
 Source0:        %{name}-%{version}.tar.gz
 Patch0:         %{name}-install.patch
+Patch1:         %{name}-2.5-tolower-189996.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libpcap
@@ -27,6 +28,7 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0
 
 
 %build
@@ -53,6 +55,9 @@
 
 
 %changelog
+* Wed Apr 26 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1:2.5-3
+- Backport fix for x86_64 crash at startup from upstream 2.6b5 (#189996).
+
 * Thu Feb 16 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1:2.5-2
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Wed Apr 26 19:25:41 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Wed, 26 Apr 2006 12:25:41 -0700
Subject: rpms/lft/devel lft-2.5-tolower-189996.patch, NONE, 1.1 lft.spec,
	1.18, 1.19
Message-ID: <200604261925.k3QJPhoq018689@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lft/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18648/devel

Modified Files:
	lft.spec 
Added Files:
	lft-2.5-tolower-189996.patch 
Log Message:
* Wed Apr 26 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1:2.5-3
- Backport fix for x86_64 crash at startup from upstream 2.6b5 (#189996).


lft-2.5-tolower-189996.patch:

--- NEW FILE lft-2.5-tolower-189996.patch ---
--- lft.c~	2005-08-25 07:40:36.000000000 +0300
+++ lft.c	2006-04-26 22:07:54.000000000 +0300
@@ -310,6 +310,20 @@
   return (sum);
 }
 
+static char * 
+strtolower (char *input) {
+    char *iter = input;
+    
+    if (input == NULL)
+        return NULL;
+    
+    while (*iter) {
+        *iter = tolower (*iter);
+        iter++;
+    }
+    return input;
+}
+
 void
 do_auto_ports (char *hostname, int init_dport)
 {
@@ -328,7 +342,7 @@
 
     char *mailservers[] = { "mail", "smtp", "mx", "relay", "inbound" };
     int cnt = 0;
-    hostname = (char *) tolower(hostname);
+    hostname = (char *) strtolower(hostname);
 
   for (cnt = 0 ; cnt < 5 ; cnt++)
    {


Index: lft.spec
===================================================================
RCS file: /cvs/extras/rpms/lft/devel/lft.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- lft.spec	16 Feb 2006 07:24:08 -0000	1.18
+++ lft.spec	26 Apr 2006 19:25:40 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           lft
 Version:        2.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Epoch:          1
 Summary:        Alternate traceroute tool
 
@@ -10,6 +10,7 @@
 # http://pwhois.org/dl/?file=lft-2.5.tar.gz
 Source0:        %{name}-%{version}.tar.gz
 Patch0:         %{name}-install.patch
+Patch1:         %{name}-2.5-tolower-189996.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libpcap
@@ -27,6 +28,7 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0
 
 
 %build
@@ -53,6 +55,9 @@
 
 
 %changelog
+* Wed Apr 26 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1:2.5-3
+- Backport fix for x86_64 crash at startup from upstream 2.6b5 (#189996).
+
 * Thu Feb 16 2006 Ville Skytt?? <ville.skytta at iki.fi> - 1:2.5-2
 - Rebuild.
 



From fedora-extras-commits at redhat.com  Wed Apr 26 21:16:37 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Wed, 26 Apr 2006 14:16:37 -0700
Subject: rpms/gnonlin import.log,1.3,1.4
Message-ID: <200604262117.k3QLH9pu023666@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/gnonlin
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23634

Modified Files:
	import.log 
Log Message:
auto-import gnonlin-0.10.3-2 on branch devel from gnonlin-0.10.3-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnonlin/import.log,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- import.log	26 Apr 2006 02:47:26 -0000	1.3
+++ import.log	26 Apr 2006 21:16:37 -0000	1.4
@@ -1,2 +1,3 @@
 gnonlin-0_10_0_5-3:HEAD:gnonlin-0.10.0.5-3.src.rpm:1139711025
 gnonlin-0_10_3-1:HEAD:gnonlin-0.10.3-1.src.rpm:1146019641
+gnonlin-0_10_3-2:HEAD:gnonlin-0.10.3-2.src.rpm:1146086192



From fedora-extras-commits at redhat.com  Wed Apr 26 21:16:38 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Wed, 26 Apr 2006 14:16:38 -0700
Subject: rpms/gnonlin/devel gnonlin.spec,1.5,1.6
Message-ID: <200604262117.k3QLHAL0023669@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/gnonlin/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23634/devel

Modified Files:
	gnonlin.spec 
Log Message:
auto-import gnonlin-0.10.3-2 on branch devel from gnonlin-0.10.3-2.src.rpm


Index: gnonlin.spec
===================================================================
RCS file: /cvs/extras/rpms/gnonlin/devel/gnonlin.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnonlin.spec	26 Apr 2006 02:47:27 -0000	1.5
+++ gnonlin.spec	26 Apr 2006 21:16:38 -0000	1.6
@@ -1,7 +1,9 @@
-%define		gst_req	0.10.2
+%define		gst_req			0.10.2
+%define		gst_plugins_base_req	0.10.2
+
 Name: 		gnonlin
 Version: 	0.10.3
-Release:	1
+Release:	2
 Summary: 	GStreamer extension library for non-linear editing
 
 Group: 		System Environment/Libraries
@@ -10,22 +12,13 @@
 Source:		http://prdownloads.sourceforge.net/gnonlin/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: 	gstreamer-devel >= %{gst_req}
+BuildRequires: 	gstreamer-devel >= %{gst_req} gstreamer-plugins-base-devel >= %{gst_plugins_base_req}
 
 %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.
 
-%package devel
-Summary: 	Development headers for the gnonlin libraries
-Group:          Development/Libraries
-Requires:       %{name} = %{version}
-
-%description devel
-This package provides the necessary development libraries and include
-files to allow you to build applications with gnonlin.
-
 %prep
 %setup -q
 
@@ -35,18 +28,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-rm -f $RPM_BUILD_ROOT/%{_libdir}/gstreamer-0.10/libgnl.la
-# Not in Makefile
-install -p -D -m 0644 gnl/gnlcomposition.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnlcomposition.h
-install -p -D -m 0644 gnl/gnlfilesource.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnlfilesource.h
-install -p -D -m 0644 gnl/gnl.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnl.h
-install -p -D -m 0644 gnl/gnlmarshal.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnlmarshal.h
-install -p -D -m 0644 gnl/gnlobject.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnlobject.h
-install -p -D -m 0644 gnl/gnloperation.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnloperation.h
-install -p -D -m 0644 gnl/gnlsource.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnlsource.h
-install -p -D -m 0644 gnl/gnltypes.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnltypes.h
-install -p -D -m 0644 gnl/gnlversion.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnlversion.h
+
+%makeinstall
+rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{gst_majorminor}/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,12 +40,13 @@
 %doc AUTHORS COPYING.LIB README
 %{_libdir}/gstreamer-0.10/libgnl*
 
-%files devel
-%defattr(-, root, root, -)
-%{_includedir}/gnl
-
 %changelog
-* Mon Apr 25 2006 W. Michael Petullo <mike[@]flyn.org> 0.10.3-1
+* Wed Apr 26 2006 W. Michael Petullo <mike[@]flyn.org> 0.10.3-2
+- simplified install
+- require gstreamer-plugins-base-devel
+- remove -devel package
+
+* Tue Apr 25 2006 W. Michael Petullo <mike[@]flyn.org> 0.10.3-1
 - updated package to 0.10.3
 - remove gnonlin.pc 
 



From fedora-extras-commits at redhat.com  Wed Apr 26 21:17:58 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Wed, 26 Apr 2006 14:17:58 -0700
Subject: rpms/pitivi import.log,1.2,1.3
Message-ID: <200604262118.k3QLIUb3023774@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/pitivi
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23738

Modified Files:
	import.log 
Log Message:
auto-import pitivi-0.10.0-1 on branch devel from pitivi-0.10.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/pitivi/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log	31 Mar 2006 22:43:47 -0000	1.2
+++ import.log	26 Apr 2006 21:17:57 -0000	1.3
@@ -1 +1,2 @@
 pitivi-0_9_9_2-3:HEAD:pitivi-0.9.9.2-3.src.rpm:1143845025
+pitivi-0_10_0-1:HEAD:pitivi-0.10.0-1.src.rpm:1146086271



From fedora-extras-commits at redhat.com  Wed Apr 26 21:17:58 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Wed, 26 Apr 2006 14:17:58 -0700
Subject: rpms/pitivi/devel .cvsignore, 1.2, 1.3 pitivi.spec, 1.1, 1.2 sources,
	1.2, 1.3
Message-ID: <200604262118.k3QLIUVs023779@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/pitivi/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23738/devel

Modified Files:
	.cvsignore pitivi.spec sources 
Log Message:
auto-import pitivi-0.10.0-1 on branch devel from pitivi-0.10.0-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pitivi/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	31 Mar 2006 22:43:48 -0000	1.2
+++ .cvsignore	26 Apr 2006 21:17:58 -0000	1.3
@@ -1 +1 @@
-pitivi-0.9.9.2.tar.bz2
+pitivi-0.10.0.tar.bz2


Index: pitivi.spec
===================================================================
RCS file: /cvs/extras/rpms/pitivi/devel/pitivi.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pitivi.spec	31 Mar 2006 22:43:48 -0000	1.1
+++ pitivi.spec	26 Apr 2006 21:17:58 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           pitivi
-Version:        0.9.9.2
-Release:        3
+Version:        0.10.0
+Release:        1
 Summary: 	Non-linear video editor
 
 Group: 		Applications/Multimedia
@@ -20,7 +20,6 @@
 BuildRequires:  pygtk2-devel
 BuildRequires:	gtk-doc
 BuildRequires:	pkgconfig
-BuildRequires:  gnonlin-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  gnome-python2
 
@@ -72,9 +71,14 @@
 %{_libdir}/pitivi/python/pitivi/ui/*.glade
 %ghost %{_libdir}/pitivi/python/pitivi/ui/*.pyo
 %{_datadir}/pitivi
-%{_datadir}/applications/fedora-pitivi.desktop
+%{_datadir}/pixmaps/*
+%{_datadir}/applications/*
 
 %changelog
+* Wed Apr 26 2006 W. Michael Petullo <mike[@]flyn.org> 0.10.0-1
+- update to 0.10.0
+- remove BuildRequires: gnonlin-devel
+
 * Wed Feb 08 2006 W. Michael Petullo <mike[@]flyn.org> 0.9.9.2-3
 - add BuildRequires
 - add %%{_libdir}/pitivi/python/pitivi/ui/*.glade


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pitivi/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	31 Mar 2006 22:43:48 -0000	1.2
+++ sources	26 Apr 2006 21:17:58 -0000	1.3
@@ -1 +1 @@
-de6076064893eda1d7bbd70b2b64b8f0  pitivi-0.9.9.2.tar.bz2
+a03b026d0784659905519f59e7abd4e1  pitivi-0.10.0.tar.bz2



From fedora-extras-commits at redhat.com  Wed Apr 26 21:22:42 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Wed, 26 Apr 2006 14:22:42 -0700
Subject: rpms/gnonlin/FC-5 gnonlin.spec,1.4,1.5
Message-ID: <200604262122.k3QLMijI023864@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/gnonlin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23847

Modified Files:
	gnonlin.spec 
Log Message:
Update gnonlin.spec for FC5.



Index: gnonlin.spec
===================================================================
RCS file: /cvs/extras/rpms/gnonlin/FC-5/gnonlin.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnonlin.spec	17 Feb 2006 21:09:08 -0000	1.4
+++ gnonlin.spec	26 Apr 2006 21:22:42 -0000	1.5
@@ -1,7 +1,9 @@
-%define		gst_req	0.10.2
+%define		gst_req			0.10.2
+%define		gst_plugins_base_req	0.10.2
+
 Name: 		gnonlin
-Version: 	0.10.0.5
-Release:	6
+Version: 	0.10.3
+Release:	2
 Summary: 	GStreamer extension library for non-linear editing
 
 Group: 		System Environment/Libraries
@@ -10,22 +12,13 @@
 Source:		http://prdownloads.sourceforge.net/gnonlin/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: 	gstreamer-devel >= %{gst_req}
+BuildRequires: 	gstreamer-devel >= %{gst_req} gstreamer-plugins-base-devel >= %{gst_plugins_base_req}
 
 %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.
 
-%package devel
-Summary: 	Development headers for the gnonlin libraries
-Group:          Development/Libraries
-Requires:       %{name} = %{version}
-
-%description devel
-This package provides the necessary development libraries and include
-files to allow you to build applications with gnonlin.
-
 %prep
 %setup -q
 
@@ -35,18 +28,9 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
-rm -f $RPM_BUILD_ROOT/%{_libdir}/gstreamer-0.10/libgnl.la
-# Not in Makefile
-install -p -D -m 0644 gnl/gnlcomposition.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnlcomposition.h
-install -p -D -m 0644 gnl/gnlfilesource.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnlfilesource.h
-install -p -D -m 0644 gnl/gnl.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnl.h
-install -p -D -m 0644 gnl/gnlmarshal.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnlmarshal.h
-install -p -D -m 0644 gnl/gnlobject.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnlobject.h
-install -p -D -m 0644 gnl/gnloperation.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnloperation.h
-install -p -D -m 0644 gnl/gnlsource.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnlsource.h
-install -p -D -m 0644 gnl/gnltypes.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnltypes.h
-install -p -D -m 0644 gnl/gnlversion.h $RPM_BUILD_ROOT%{_includedir}/gnl/gnlversion.h
+
+%makeinstall
+rm -f $RPM_BUILD_ROOT%{_libdir}/gstreamer-%{gst_majorminor}/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,12 +40,16 @@
 %doc AUTHORS COPYING.LIB README
 %{_libdir}/gstreamer-0.10/libgnl*
 
-%files devel
-%defattr(-, root, root, -)
-%{_includedir}/gnl
-%{_libdir}/pkgconfig/gnonlin.pc
-
 %changelog
+* Wed Apr 26 2006 W. Michael Petullo <mike[@]flyn.org> 0.10.3-2
+- simplified install
+- require gstreamer-plugins-base-devel
+- remove -devel package
+
+* Tue Apr 25 2006 W. Michael Petullo <mike[@]flyn.org> 0.10.3-1
+- updated package to 0.10.3
+- remove gnonlin.pc 
+
 * Fri Feb 17 2006 W. Michael Petullo <mike[@]flyn.org> 0.10.0.5-6
 - bump release because of build system problem
 



From fedora-extras-commits at redhat.com  Wed Apr 26 21:23:42 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 26 Apr 2006 14:23:42 -0700
Subject: rpms/cpanspec/devel .cvsignore, 1.7, 1.8 cpanspec.spec, 1.6,
	1.7 sources, 1.7, 1.8
Message-ID: <200604262123.k3QLNi2B023900@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/cpanspec/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23875

Modified Files:
	.cvsignore cpanspec.spec sources 
Log Message:
Update to 1.65.
cpanget requires wget.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	25 Mar 2006 02:00:47 -0000	1.7
+++ .cvsignore	26 Apr 2006 21:23:42 -0000	1.8
@@ -1 +1 @@
-cpanspec-1.64.tar.gz
+cpanspec-1.65.tar.gz


Index: cpanspec.spec
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/devel/cpanspec.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cpanspec.spec	25 Mar 2006 02:00:47 -0000	1.6
+++ cpanspec.spec	26 Apr 2006 21:23:42 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           cpanspec
-Version:        1.64
+Version:        1.65
 Release:        1%{?dist}
 Summary:        RPM spec file generation utility
 License:        GPL or Artistic
@@ -10,6 +10,7 @@
 BuildArch:      noarch
 BuildRequires:  perl(Module::Build)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       /usr/bin/wget
 
 %description
 cpanspec generates spec files for Perl modules from CPAN for Fedora
@@ -50,6 +51,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Apr 26 2006 Steven Pritchard <steve at kspei.com> 1.65-1
+- Update to 1.65.
+- cpanget requires wget.
+
 * Wed Mar 24 2006 Steven Pritchard <steve at kspei.com> 1.64-1
 - Update to 1.64.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	25 Mar 2006 02:00:47 -0000	1.7
+++ sources	26 Apr 2006 21:23:42 -0000	1.8
@@ -1 +1 @@
-a77d2b4ef27633fc551d557f459b3462  cpanspec-1.64.tar.gz
+cf3704304f5a4cb80f97881b72c2a6d3  cpanspec-1.65.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 26 21:23:53 2006
From: fedora-extras-commits at redhat.com (W. Michael Petullo (mikep))
Date: Wed, 26 Apr 2006 14:23:53 -0700
Subject: rpms/gnonlin/FC-5 sources,1.2,1.3
Message-ID: <200604262123.k3QLNto0023923@cvs-int.fedora.redhat.com>

Author: mikep

Update of /cvs/extras/rpms/gnonlin/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23904

Modified Files:
	sources 
Log Message:
Update sources for FC5 build.



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnonlin/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Feb 2006 02:23:55 -0000	1.2
+++ sources	26 Apr 2006 21:23:53 -0000	1.3
@@ -1 +1 @@
-8c8d6935c7c3bdc05321ae85c6449212  gnonlin-0.10.0.5.tar.gz
+4fa1cebf048243e47cd590d4afed6dc6  gnonlin-0.10.3.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 26 22:04:39 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 26 Apr 2006 15:04:39 -0700
Subject: rpms/python-lxml - New directory
Message-ID: <200604262204.k3QM4f2v026398@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-lxml
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26372/python-lxml

Log Message:
Directory /cvs/extras/rpms/python-lxml added to the repository




From fedora-extras-commits at redhat.com  Wed Apr 26 22:04:40 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 26 Apr 2006 15:04:40 -0700
Subject: rpms/python-lxml/devel - New directory
Message-ID: <200604262204.k3QM4gpU026401@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-lxml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26372/python-lxml/devel

Log Message:
Directory /cvs/extras/rpms/python-lxml/devel added to the repository




From fedora-extras-commits at redhat.com  Wed Apr 26 22:04:58 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 26 Apr 2006 15:04:58 -0700
Subject: rpms/python-lxml Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604262205.k3QM50gl026447@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-lxml
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26417

Added Files:
	Makefile import.log 
Log Message:
Setup of module python-lxml


--- NEW FILE Makefile ---
# Top level Makefile for module python-lxml
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 26 22:04:58 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 26 Apr 2006 15:04:58 -0700
Subject: rpms/python-lxml/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604262205.k3QM50xx026450@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-lxml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26417/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module python-lxml


--- 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 Apr 26 22:05:20 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 26 Apr 2006 15:05:20 -0700
Subject: rpms/python-lxml import.log,1.1,1.2
Message-ID: <200604262205.k3QM5Mq1026516@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-lxml
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26483

Modified Files:
	import.log 
Log Message:
auto-import python-lxml-0.9.1-3 on branch devel from python-lxml-0.9.1-3.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/python-lxml/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	26 Apr 2006 22:04:57 -0000	1.1
+++ import.log	26 Apr 2006 22:05:19 -0000	1.2
@@ -0,0 +1 @@
+python-lxml-0_9_1-3:HEAD:python-lxml-0.9.1-3.src.rpm:1146089115



From fedora-extras-commits at redhat.com  Wed Apr 26 22:05:20 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 26 Apr 2006 15:05:20 -0700
Subject: rpms/python-lxml/devel python-lxml.spec, NONE, 1.1 .cvsignore, 1.1, 
	1.2 sources, 1.1, 1.2
Message-ID: <200604262205.k3QM5M3x026521@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/rpms/python-lxml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26483/devel

Modified Files:
	.cvsignore sources 
Added Files:
	python-lxml.spec 
Log Message:
auto-import python-lxml-0.9.1-3 on branch devel from python-lxml-0.9.1-3.src.rpm


--- NEW FILE python-lxml.spec ---
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
%{!?python_version: %define python_version %(%{__python} -c "import sys ; print sys.version[:3]")}

%define srcname lxml

Name:           python-%{srcname}
Version:        0.9.1
Release:        3%{?dist}
Summary:        ElementTree-like Python bindings for libxml2 and libxslt

Group:          Development/Libraries
License:        BSD
URL:            http://codespeak.net/lxml/
Source0:        http://codespeak.net/lxml/%{srcname}-%{version}.tgz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  python-devel libxslt-devel python-setuptools
# Upstream now includes the generated .c file and the Pyrex shipped
# with FC (0.9.3.1) is broken for gcc >= 4.0
#BuildRequires: Pyrex >= 0.9.4
Requires:   python-abi = %{python_version}

%description
lxml provides a Python binding to the libxslt and libxml2 libraries.  It
follows the ElementTree API as much as possible in order to provide a more
Pythonic interface to libxml2 and libxslt than the default bindings.  In
particular, lxml deals with Python Unicode strings rather than encoded UTF-8
and handles memory management automatically, unlike the default bindings.


%prep
%setup -q -n %{srcname}-%{version}


%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build


%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT --single-version-externally-managed


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc README.txt LICENSES.txt PKG-INFO CREDITS.txt CHANGES.txt doc/
%{python_sitearch}/lxml-%{version}-py%{python_version}.egg-info/
%dir %{python_sitearch}/lxml
%{python_sitearch}/lxml/*.so
%{python_sitearch}/lxml/*.py
%{python_sitearch}/lxml/*.pyc
%ghost %{python_sitearch}/lxml/*.pyo

%changelog
* Wed Apr 26 2006 Shahms E. King <shahms at shahms.com> 0.9.1-3
- Add python-setuptools to BuildRequires
- Use dist tag

* Wed Apr 26 2006 Shahms E. King <shahms at shahms.com> 0.9.1-2
- Fix summary and description

* Tue Apr 18 2006 Shahms E. King <shahms at shahms.com> 0.9.1-1
- update the new upstream version
- remove Pyrex build req

* Tue Dec 13 2005 Shahms E. King <shahms at shahms.com> 0.8-1
- Initial package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-lxml/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	26 Apr 2006 22:04:58 -0000	1.1
+++ .cvsignore	26 Apr 2006 22:05:20 -0000	1.2
@@ -0,0 +1 @@
+lxml-0.9.1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-lxml/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	26 Apr 2006 22:04:58 -0000	1.1
+++ sources	26 Apr 2006 22:05:20 -0000	1.2
@@ -0,0 +1 @@
+25e18d86050907f3a088550fe650f841  lxml-0.9.1.tgz



From fedora-extras-commits at redhat.com  Wed Apr 26 22:07:47 2006
From: fedora-extras-commits at redhat.com (Shahms King (shahms))
Date: Wed, 26 Apr 2006 15:07:47 -0700
Subject: owners owners.list,1.900,1.901
Message-ID: <200604262207.k3QM7nJs026584@cvs-int.fedora.redhat.com>

Author: shahms

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26564

Modified Files:
	owners.list 
Log Message:
added python-lxml



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.900
retrieving revision 1.901
diff -u -r1.900 -r1.901
--- owners.list	26 Apr 2006 16:01:21 -0000	1.900
+++ owners.list	26 Apr 2006 22:07:47 -0000	1.901
@@ -1278,6 +1278,7 @@
 Fedora Extras|python-json|A JSON reader and writer for Python|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|python-kid|A simple and pythonic XML template language|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|python-logilab-common|Common libraries for Logilab projects|icon at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|python-lxml|ElementTree-like Python bindings for libxml2 and libxslt|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|python-matplotlib|Python plotting library|orion at cora.nwra.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|michel.salim at gmail.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Wed Apr 26 23:07:56 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 26 Apr 2006 16:07:56 -0700
Subject: rpms/cpanspec/FC-5 .cvsignore, 1.7, 1.8 cpanspec.spec, 1.6,
	1.7 sources, 1.7, 1.8
Message-ID: <200604262307.k3QN7wRV029050@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/cpanspec/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29029

Modified Files:
	.cvsignore cpanspec.spec sources 
Log Message:
Update to 1.65.
cpanget requires wget.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	25 Mar 2006 02:02:36 -0000	1.7
+++ .cvsignore	26 Apr 2006 23:07:56 -0000	1.8
@@ -1 +1 @@
-cpanspec-1.64.tar.gz
+cpanspec-1.65.tar.gz


Index: cpanspec.spec
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/FC-5/cpanspec.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cpanspec.spec	25 Mar 2006 02:02:36 -0000	1.6
+++ cpanspec.spec	26 Apr 2006 23:07:56 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           cpanspec
-Version:        1.64
+Version:        1.65
 Release:        1%{?dist}
 Summary:        RPM spec file generation utility
 License:        GPL or Artistic
@@ -10,6 +10,7 @@
 BuildArch:      noarch
 BuildRequires:  perl(Module::Build)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       /usr/bin/wget
 
 %description
 cpanspec generates spec files for Perl modules from CPAN for Fedora
@@ -50,6 +51,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Apr 26 2006 Steven Pritchard <steve at kspei.com> 1.65-1
+- Update to 1.65.
+- cpanget requires wget.
+
 * Wed Mar 24 2006 Steven Pritchard <steve at kspei.com> 1.64-1
 - Update to 1.64.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	25 Mar 2006 02:02:36 -0000	1.7
+++ sources	26 Apr 2006 23:07:56 -0000	1.8
@@ -1 +1 @@
-a77d2b4ef27633fc551d557f459b3462  cpanspec-1.64.tar.gz
+cf3704304f5a4cb80f97881b72c2a6d3  cpanspec-1.65.tar.gz



From fedora-extras-commits at redhat.com  Wed Apr 26 23:09:01 2006
From: fedora-extras-commits at redhat.com (Steven Pritchard (steve))
Date: Wed, 26 Apr 2006 16:09:01 -0700
Subject: rpms/cpanspec/FC-4 .cvsignore, 1.7, 1.8 cpanspec.spec, 1.6,
	1.7 sources, 1.7, 1.8
Message-ID: <200604262309.k3QN930c029122@cvs-int.fedora.redhat.com>

Author: steve

Update of /cvs/extras/rpms/cpanspec/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29101

Modified Files:
	.cvsignore cpanspec.spec sources 
Log Message:
Update to 1.65.
cpanget requires wget.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	25 Mar 2006 02:24:16 -0000	1.7
+++ .cvsignore	26 Apr 2006 23:09:00 -0000	1.8
@@ -1 +1 @@
-cpanspec-1.64.tar.gz
+cpanspec-1.65.tar.gz


Index: cpanspec.spec
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/FC-4/cpanspec.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- cpanspec.spec	25 Mar 2006 02:24:16 -0000	1.6
+++ cpanspec.spec	26 Apr 2006 23:09:00 -0000	1.7
@@ -1,5 +1,5 @@
 Name:           cpanspec
-Version:        1.64
+Version:        1.65
 Release:        1%{?dist}
 Summary:        RPM spec file generation utility
 License:        GPL or Artistic
@@ -10,6 +10,7 @@
 BuildArch:      noarch
 BuildRequires:  perl(Module::Build)
 Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       /usr/bin/wget
 
 %description
 cpanspec generates spec files for Perl modules from CPAN for Fedora
@@ -50,6 +51,10 @@
 %{_mandir}/man1/*
 
 %changelog
+* Wed Apr 26 2006 Steven Pritchard <steve at kspei.com> 1.65-1
+- Update to 1.65.
+- cpanget requires wget.
+
 * Wed Mar 24 2006 Steven Pritchard <steve at kspei.com> 1.64-1
 - Update to 1.64.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cpanspec/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	25 Mar 2006 02:24:16 -0000	1.7
+++ sources	26 Apr 2006 23:09:00 -0000	1.8
@@ -1 +1 @@
-a77d2b4ef27633fc551d557f459b3462  cpanspec-1.64.tar.gz
+cf3704304f5a4cb80f97881b72c2a6d3  cpanspec-1.65.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 00:39:37 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Wed, 26 Apr 2006 17:39:37 -0700
Subject: rpms/raptor - New directory
Message-ID: <200604270039.k3R0deHl031589@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/raptor
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31563/raptor

Log Message:
Directory /cvs/extras/rpms/raptor added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 27 00:39:38 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Wed, 26 Apr 2006 17:39:38 -0700
Subject: rpms/raptor/devel - New directory
Message-ID: <200604270039.k3R0deFT031592@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/raptor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31563/raptor/devel

Log Message:
Directory /cvs/extras/rpms/raptor/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 27 00:39:49 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Wed, 26 Apr 2006 17:39:49 -0700
Subject: rpms/raptor Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604270039.k3R0dpSH031641@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/raptor
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31608

Added Files:
	Makefile import.log 
Log Message:
Setup of module raptor


--- NEW FILE Makefile ---
# Top level Makefile for module raptor
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 27 00:39:50 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Wed, 26 Apr 2006 17:39:50 -0700
Subject: rpms/raptor/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604270039.k3R0dqAF031644@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/raptor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31608/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module raptor


--- 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 Apr 27 00:40:34 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Wed, 26 Apr 2006 17:40:34 -0700
Subject: rpms/raptor import.log,1.1,1.2
Message-ID: <200604270041.k3R0f6CE031723@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/raptor
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31682

Modified Files:
	import.log 
Log Message:
auto-import raptor-1.4.8-5 on branch devel from raptor-1.4.8-5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/raptor/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	27 Apr 2006 00:39:49 -0000	1.1
+++ import.log	27 Apr 2006 00:40:34 -0000	1.2
@@ -0,0 +1 @@
+raptor-1_4_8-5:HEAD:raptor-1.4.8-5.src.rpm:1146098434



From fedora-extras-commits at redhat.com  Thu Apr 27 00:40:34 2006
From: fedora-extras-commits at redhat.com (Anthony Green (green))
Date: Wed, 26 Apr 2006 17:40:34 -0700
Subject: rpms/raptor/devel raptor-1.4.8-config.patch, NONE,
	1.1 raptor-1.4.8-pkgconfig.patch, NONE, 1.1 raptor.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604270041.k3R0f7GG031727@cvs-int.fedora.redhat.com>

Author: green

Update of /cvs/extras/rpms/raptor/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31682/devel

Modified Files:
	.cvsignore sources 
Added Files:
	raptor-1.4.8-config.patch raptor-1.4.8-pkgconfig.patch 
	raptor.spec 
Log Message:
auto-import raptor-1.4.8-5 on branch devel from raptor-1.4.8-5.src.rpm

raptor-1.4.8-config.patch:

--- NEW FILE raptor-1.4.8-config.patch ---
diff -Nur raptor-1.4.8-orig/src/raptor-config.in raptor-1.4.8/src/raptor-config.in
--- raptor-1.4.8-orig/src/raptor-config.in	2005-08-25 00:49:15.000000000 +0200
+++ raptor-1.4.8/src/raptor-config.in	2006-04-27 00:21:09.000000000 +0200
@@ -129,7 +129,7 @@
   done
 fi
 if test "$echo_libs" = "yes"; then
-  echo -L at libdir@ -lraptor @LDFLAGS@ @LIBS@
+  echo -L at libdir@ -lraptor 
 fi
 if test "$echo_libtool_libs" = "yes"; then
   echo @libdir@/@RAPTOR_LIBTOOLLIBS@

raptor-1.4.8-pkgconfig.patch:

--- NEW FILE raptor-1.4.8-pkgconfig.patch ---
diff -Nur raptor-1.4.8-orig/raptor.pc.in raptor-1.4.8/raptor.pc.in
--- raptor-1.4.8-orig/raptor.pc.in	2003-12-16 23:24:01.000000000 +0100
+++ raptor-1.4.8/raptor.pc.in	2006-04-23 22:50:05.000000000 +0200
@@ -6,6 +6,6 @@
 Name: Raptor
 Description: RDF Parser Toolkit Library
 Version: @VERSION@
-Libs: -L${libdir} -lraptor @LDFLAGS@ @LIBS@
+Libs: -L${libdir} -lraptor
 Cflags: -I${includedir}
 


--- NEW FILE raptor.spec ---
Summary:       Raptor RDF Parser Toolkit for Redland
Name:          raptor
Version:       1.4.8
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.8.tar.gz
Patch0:        raptor-1.4.8-pkgconfig.patch
Patch1:        raptor-1.4.8-config.patch
URL:           http://www.redland.opensource.ac.uk/raptor/
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libxml2-devel libxslt-devel curl-devel

%description
Raptor is the RDF Parser Toolkit for Redland that provides
a set of standalone RDF parsers, generating triples from RDF/XML
or N-Triples.

%package devel
Summary: Libraries, includes etc to develop with Raptor RDF parser library
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}

%description devel
Libraries, includes etc to develop with Raptor RDF parser library.
It provides a set of standalone RDF parsers, generating triples from
RDF/XML or N-Triples.

%prep
%setup -q
%patch0 -p1
%patch1 -p1

%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}/*.{a,la}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-, root, root)
%doc AUTHORS COPYING COPYING.LIB ChangeLog LICENSE-2.0.txt LICENSE.html LICENSE.txt NEWS README
%doc %{_mandir}/man1/rapper.1*
%doc %{_mandir}/man3/libraptor.3*
%{_libdir}/lib*.so.*
%{_bindir}/rapper


%files devel
%defattr(-, root, root)
%doc AUTHORS COPYING COPYING.LIB ChangeLog LICENSE-2.0.txt LICENSE.html LICENSE.txt NEWS README
%doc INSTALL.html
%doc %{_mandir}/man1/raptor-config.1*
%doc %{_datadir}/gtk-doc/html/raptor
%{_libdir}/lib*.so
%{_libdir}/pkgconfig/raptor.pc
%{_prefix}/include/*
%{_bindir}/raptor-config

%changelog
* Wed Apr 26 2006 Anthony Green <green at redhat.com> 1.4.8-5
- Add raptor-1.4.8-config.patch from Michael Schwendt.
- Remove some Requires from the devel package.

* Sun Apr 23 2006 Anthony Green <green at redhat.com> 1.4.8-4
- Add raptor-1.4.8-pkgconfig.patch from Michael Schwendt.

* Sun Apr 23 2006 Anthony Green <green at redhat.com> 1.4.8-3
- Many spec file fixes from Michael Schwendt.
- Add many Requires to the -devel package.

* Tue Apr 18 2006 Anthony Green <green at redhat.com> 1.4.8-1
- Upgrade sources.  
- Install with DESTDIR.
- Build for Fedora Extras.

* Fri Nov  7 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu> 1.0.0-1
- build for Planet CCRMA, clean up spec file

* Thu Apr 17 2003 Dave Beckett <Dave.Beckett at bristol.ac.uk>

- Added pkgconfig raptor.pc, raptor-config
- Requires curl

* Mon Jan 13 2003 Dave Beckett <Dave.Beckett at bristol.ac.uk>

- rdfdump now rapper

* Thu Jan  9 2003 Fernando Lopez-Lezcano <nando at ccrma.stanford.edu>
- built for planet ccrma
- one file conflicts with rdfdump in the nasm-rdoff package, so rename
  the binary to rdf-rdfdump for now. Maybe we should make this a
  "Conflict:" with nasm-rdoff and leave the file as is...

* Fri Dec 20 2002 Dave Beckett <Dave.Beckett at bristol.ac.uk>

- Updated to have two RPMs for raptor and raptor-devel.  Depend on
  libxml2 as XML parser.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/raptor/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2006 00:39:50 -0000	1.1
+++ .cvsignore	27 Apr 2006 00:40:34 -0000	1.2
@@ -0,0 +1 @@
+raptor-1.4.8.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/raptor/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2006 00:39:50 -0000	1.1
+++ sources	27 Apr 2006 00:40:34 -0000	1.2
@@ -0,0 +1 @@
+112d8b72a37f4de8a00f840999f2d383  raptor-1.4.8.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 00:47:33 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 26 Apr 2006 17:47:33 -0700
Subject: rpms/numpy/FC-5 .cvsignore, 1.3, 1.4 numpy.spec, 1.4, 1.5 sources,
	1.3, 1.4
Message-ID: <200604270047.k3R0lZ2K031818@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/numpy/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31781/FC-5

Modified Files:
	.cvsignore numpy.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/numpy/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 Feb 2006 01:08:01 -0000	1.3
+++ .cvsignore	27 Apr 2006 00:47:33 -0000	1.4
@@ -1 +1 @@
-numpy-0.9.5.tar.gz
+numpy-0.9.6.tar.gz


Index: numpy.spec
===================================================================
RCS file: /cvs/extras/rpms/numpy/FC-5/numpy.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- numpy.spec	17 Feb 2006 01:08:01 -0000	1.4
+++ numpy.spec	27 Apr 2006 00:47:33 -0000	1.5
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           numpy
-Version:        0.9.5
+Version:        0.9.6
 Release:        1%{?dist}
 Summary:        A fast multidimensional array facility for Python
 
@@ -35,7 +35,7 @@
 %patch1 -p1 -b .gfortran
 
 %build
-BLAS=%{_libdir} LAPACK=%{_libdir} CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -64,6 +64,9 @@
 %{python_sitearch}/%{name}
 
 %changelog
+* Wed Apr 26 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.6-1
+- Upstream update
+
 * Thu Feb 16 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.5-1
 - Upstream update
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/numpy/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Feb 2006 01:08:01 -0000	1.3
+++ sources	27 Apr 2006 00:47:33 -0000	1.4
@@ -1 +1 @@
-47fe186078c5e1f68b37e0ffc4994178  numpy-0.9.5.tar.gz
+eac9ae05bd7511cecf1ffd12da0e1993  numpy-0.9.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 00:47:34 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 26 Apr 2006 17:47:34 -0700
Subject: rpms/numpy/devel .cvsignore, 1.3, 1.4 numpy.spec, 1.4, 1.5 sources, 
	1.3, 1.4
Message-ID: <200604270047.k3R0lafa031824@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/numpy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31781/devel

Modified Files:
	.cvsignore numpy.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/numpy/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	17 Feb 2006 01:08:01 -0000	1.3
+++ .cvsignore	27 Apr 2006 00:47:34 -0000	1.4
@@ -1 +1 @@
-numpy-0.9.5.tar.gz
+numpy-0.9.6.tar.gz


Index: numpy.spec
===================================================================
RCS file: /cvs/extras/rpms/numpy/devel/numpy.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- numpy.spec	17 Feb 2006 01:08:01 -0000	1.4
+++ numpy.spec	27 Apr 2006 00:47:34 -0000	1.5
@@ -2,7 +2,7 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           numpy
-Version:        0.9.5
+Version:        0.9.6
 Release:        1%{?dist}
 Summary:        A fast multidimensional array facility for Python
 
@@ -35,7 +35,7 @@
 %patch1 -p1 -b .gfortran
 
 %build
-BLAS=%{_libdir} LAPACK=%{_libdir} CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
+FFTW=%{_libdir} BLAS=%{_libdir} LAPACK=%{_libdir} CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -64,6 +64,9 @@
 %{python_sitearch}/%{name}
 
 %changelog
+* Wed Apr 26 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.6-1
+- Upstream update
+
 * Thu Feb 16 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.9.5-1
 - Upstream update
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/numpy/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	17 Feb 2006 01:08:01 -0000	1.3
+++ sources	27 Apr 2006 00:47:34 -0000	1.4
@@ -1 +1 @@
-47fe186078c5e1f68b37e0ffc4994178  numpy-0.9.5.tar.gz
+eac9ae05bd7511cecf1ffd12da0e1993  numpy-0.9.6.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 01:17:01 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 26 Apr 2006 18:17:01 -0700
Subject: rpms/alltray/FC-5 .cvsignore, 1.2, 1.3 alltray.spec, 1.6,
	1.7 sources, 1.2, 1.3
Message-ID: <200604270117.k3R1HXHw001681@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/alltray/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1642/FC-5

Modified Files:
	.cvsignore alltray.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alltray/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Dec 2005 23:02:37 -0000	1.2
+++ .cvsignore	27 Apr 2006 01:17:01 -0000	1.3
@@ -1 +1 @@
-alltray-0.65.tar.gz
+alltray-0.66.tar.gz


Index: alltray.spec
===================================================================
RCS file: /cvs/extras/rpms/alltray/FC-5/alltray.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- alltray.spec	14 Feb 2006 05:00:03 -0000	1.6
+++ alltray.spec	27 Apr 2006 01:17:01 -0000	1.7
@@ -1,16 +1,15 @@
 Name:           alltray
-Version:        0.65
-Release:        2%{?dist}
+Version:        0.66
+Release:        1%{?dist}
 Summary:        Dock any application in the tray
 
 Group:          User Interface/Desktops
 License:        GPL
 URL:            http://alltray.sourceforge.net/
 Source0:        http://dl.sourceforge.net/alltray/%{name}-%{version}.tar.gz
-Patch:          alltray-0.65-preload.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk2-devel desktop-file-utils
+BuildRequires:  gtk2-devel desktop-file-utils GConf2-devel
 #Requires:       
 
 %description
@@ -19,7 +18,6 @@
 
 %prep
 %setup -q
-%patch -p1 -b .preload
 
 %build
 export CFLAGS="-fPIC $RPM_OPT_FLAGS"
@@ -52,6 +50,9 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Wed Apr 26 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.66-1
+- Upstream update
+
 * Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.65-2
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alltray/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Dec 2005 23:02:37 -0000	1.2
+++ sources	27 Apr 2006 01:17:01 -0000	1.3
@@ -1 +1 @@
-c3b86dab94dbea416174d6e4dd82a173  alltray-0.65.tar.gz
+78b43bd2e19258b0518af99e21123561  alltray-0.66.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 01:17:02 2006
From: fedora-extras-commits at redhat.com (Ignacio Vazquez-Abrams (ivazquez))
Date: Wed, 26 Apr 2006 18:17:02 -0700
Subject: rpms/alltray/devel .cvsignore, 1.2, 1.3 alltray.spec, 1.6,
	1.7 sources, 1.2, 1.3
Message-ID: <200604270117.k3R1HYkO001686@cvs-int.fedora.redhat.com>

Author: ivazquez

Update of /cvs/extras/rpms/alltray/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1642/devel

Modified Files:
	.cvsignore alltray.spec sources 
Log Message:
Upstream update


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/alltray/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	30 Dec 2005 23:02:37 -0000	1.2
+++ .cvsignore	27 Apr 2006 01:17:02 -0000	1.3
@@ -1 +1 @@
-alltray-0.65.tar.gz
+alltray-0.66.tar.gz


Index: alltray.spec
===================================================================
RCS file: /cvs/extras/rpms/alltray/devel/alltray.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- alltray.spec	14 Feb 2006 05:00:03 -0000	1.6
+++ alltray.spec	27 Apr 2006 01:17:02 -0000	1.7
@@ -1,16 +1,15 @@
 Name:           alltray
-Version:        0.65
-Release:        2%{?dist}
+Version:        0.66
+Release:        1%{?dist}
 Summary:        Dock any application in the tray
 
 Group:          User Interface/Desktops
 License:        GPL
 URL:            http://alltray.sourceforge.net/
 Source0:        http://dl.sourceforge.net/alltray/%{name}-%{version}.tar.gz
-Patch:          alltray-0.65-preload.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk2-devel desktop-file-utils
+BuildRequires:  gtk2-devel desktop-file-utils GConf2-devel
 #Requires:       
 
 %description
@@ -19,7 +18,6 @@
 
 %prep
 %setup -q
-%patch -p1 -b .preload
 
 %build
 export CFLAGS="-fPIC $RPM_OPT_FLAGS"
@@ -52,6 +50,9 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Wed Apr 26 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.66-1
+- Upstream update
+
 * Mon Feb 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 0.65-2
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/alltray/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	30 Dec 2005 23:02:37 -0000	1.2
+++ sources	27 Apr 2006 01:17:02 -0000	1.3
@@ -1 +1 @@
-c3b86dab94dbea416174d6e4dd82a173  alltray-0.65.tar.gz
+78b43bd2e19258b0518af99e21123561  alltray-0.66.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 03:00:34 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Wed, 26 Apr 2006 20:00:34 -0700
Subject: rpms/contacts - New directory
Message-ID: <200604270300.k3R30aVb004617@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/contacts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4591/contacts

Log Message:
Directory /cvs/extras/rpms/contacts added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 27 03:00:35 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Wed, 26 Apr 2006 20:00:35 -0700
Subject: rpms/contacts/devel - New directory
Message-ID: <200604270300.k3R30b2N004620@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/contacts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4591/contacts/devel

Log Message:
Directory /cvs/extras/rpms/contacts/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 27 03:00:50 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Wed, 26 Apr 2006 20:00:50 -0700
Subject: rpms/contacts Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604270300.k3R30qJR004669@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/contacts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4636

Added Files:
	Makefile import.log 
Log Message:
Setup of module contacts


--- NEW FILE Makefile ---
# Top level Makefile for module contacts
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 27 03:00:50 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Wed, 26 Apr 2006 20:00:50 -0700
Subject: rpms/contacts/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604270300.k3R30qi9004672@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/contacts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4636/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module contacts


--- 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 Apr 27 03:01:34 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Wed, 26 Apr 2006 20:01:34 -0700
Subject: rpms/contacts import.log,1.1,1.2
Message-ID: <200604270302.k3R32757006840@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/contacts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6806

Modified Files:
	import.log 
Log Message:
auto-import contacts-0.1-1 on branch devel from contacts-0.1-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/contacts/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	27 Apr 2006 03:00:49 -0000	1.1
+++ import.log	27 Apr 2006 03:01:34 -0000	1.2
@@ -0,0 +1 @@
+contacts-0_1-1:HEAD:contacts-0.1-1.src.rpm:1146106876



From fedora-extras-commits at redhat.com  Thu Apr 27 03:01:38 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Wed, 26 Apr 2006 20:01:38 -0700
Subject: rpms/contacts/devel contacts.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604270302.k3R32CB1006844@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/rpms/contacts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6806/devel

Modified Files:
	.cvsignore sources 
Added Files:
	contacts.spec 
Log Message:
auto-import contacts-0.1-1 on branch devel from contacts-0.1-1.src.rpm


--- NEW FILE contacts.spec ---
Name:		contacts        
Version:        0.1
Release:        1
Summary:        Contacts addressbook

Group:         	Applications/Productivity
License:       	GPL 
URL:            http://projects.o-hand.com/contacts
Source0:        http://www.openedhand.com/~chris/%{name}-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  libglade2-devel >= 2.0.0
BuildRequires:  evolution-data-server-devel >= 1.2.0
BuildRequires: 	desktop-file-utils

%description
Contacts is a small, lightweight addressbook that uses libebook. 
This is the same library that GNOME Evolution uses, so all contact data that 
exists in your Evolution database is accessible via Contacts. Contacts features 
advanced vCard field type handling and is designed for use on hand-held 
devices, such as the Nokia 770 or the Sharp Zaurus series of PDAs.

%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 --delete-original	\
  --dir $RPM_BUILD_ROOT%{_datadir}/applications   	\
  --add-category X-Fedora			        \
  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc COPYING ChangeLog
%{_datadir}/pixmaps/oh-contacts.png
%{_datadir}/contacts/contacts.glade
%{_datadir}/applications/fedora-%{name}.desktop
%{_bindir}/contacts


%changelog
* Thu Apr 13 2006 David Nielsen <david at lovesunix.net> - 0.1-1
- Initial import


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/contacts/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2006 03:00:50 -0000	1.1
+++ .cvsignore	27 Apr 2006 03:01:38 -0000	1.2
@@ -0,0 +1 @@
+contacts-0.1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/contacts/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2006 03:00:50 -0000	1.1
+++ sources	27 Apr 2006 03:01:38 -0000	1.2
@@ -0,0 +1 @@
+dc5a650445f0904392039006d929f192  contacts-0.1.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 03:05:20 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Wed, 26 Apr 2006 20:05:20 -0700
Subject: owners owners.list,1.901,1.902
Message-ID: <200604270305.k3R35MDL006934@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6917

Modified Files:
	owners.list 
Log Message:
Added contacts.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.901
retrieving revision 1.902
diff -u -r1.901 -r1.902
--- owners.list	26 Apr 2006 22:07:47 -0000	1.901
+++ owners.list	27 Apr 2006 03:05:20 -0000	1.902
@@ -151,6 +151,7 @@
 Fedora Extras|conglomerate|Extensible XML Editor|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|conserver|Serial console server daemon/client|jima at auroralinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|contact-lookup-applet|Applet which allows you to search your Evolution address book|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
+Fedora Extras|contacs|Contacts addressbook|jkeating at redhat.com|extras-qa at fedoraproject.org|
 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|cpan2rpm|Perl module packager|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Thu Apr 27 11:46:39 2006
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Thu, 27 Apr 2006 04:46:39 -0700
Subject: rpms/up-imapproxy/devel up-imapproxy-openssl098a.patch, NONE,
	1.1 up-imapproxy.spec, 1.6, 1.7
Message-ID: <200604271146.k3RBkfoB029704@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29684

Modified Files:
	up-imapproxy.spec 
Added Files:
	up-imapproxy-openssl098a.patch 
Log Message:
* Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 1.2.4-6
- Patch to fix changes in OpenSSL.
- Thanks to Paul W. Frields for providing the patch.


up-imapproxy-openssl098a.patch:

--- NEW FILE up-imapproxy-openssl098a.patch ---
diff -uNr up-imapproxy-1.2.4-orig/src/imapcommon.c up-imapproxy-1.2.4/src/imapcommon.c
--- up-imapproxy-1.2.4-orig/src/imapcommon.c	2005-08-31 12:32:24.000000000 -0400
+++ up-imapproxy-1.2.4/src/imapcommon.c	2005-12-26 13:08:30.000000000 -0500
@@ -136,6 +136,7 @@
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
+#include <openssl/md5.h>
 
 #include <pthread.h>
 #include <sys/types.h>


Index: up-imapproxy.spec
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/devel/up-imapproxy.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- up-imapproxy.spec	26 Dec 2005 14:14:01 -0000	1.6
+++ up-imapproxy.spec	27 Apr 2006 11:46:38 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: University of Pittsburgh IMAP Proxy
 Name: up-imapproxy
 Version: 1.2.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.imapproxy.org
@@ -10,6 +10,7 @@
 # Source1 can be downloaded from
 # https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=118632
 Patch0: %{name}-CAN-2005-2661.patch
+Patch1: %{name}-openssl098a.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig, /sbin/service
@@ -30,6 +31,7 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p1
 
 %build
 %configure
@@ -74,6 +76,10 @@
 %{_sbindir}/*
 
 %changelog
+* Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 1.2.4-6
+- Patch to fix changes in OpenSSL.
+- Thanks to Paul W. Frields for providing the patch.
+
 * Mon Dec 26 2005 Jeff Carlson <jeff at ultimateevil.org> - 1.2.4-5
 - Rebuild against new OpenSSL in devel (fc5 only).
 



From fedora-extras-commits at redhat.com  Thu Apr 27 11:49:28 2006
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Thu, 27 Apr 2006 04:49:28 -0700
Subject: rpms/up-imapproxy/FC-5 up-imapproxy-openssl098a.patch, NONE,
	1.1 up-imapproxy.spec, 1.6, 1.7
Message-ID: <200604271149.k3RBnUd8029754@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/up-imapproxy/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29734

Modified Files:
	up-imapproxy.spec 
Added Files:
	up-imapproxy-openssl098a.patch 
Log Message:
* Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 1.2.4-6
- Patch to fix changes in OpenSSL.
- Thanks to Paul W. Frields for providing the patch.


up-imapproxy-openssl098a.patch:

--- NEW FILE up-imapproxy-openssl098a.patch ---
diff -uNr up-imapproxy-1.2.4-orig/src/imapcommon.c up-imapproxy-1.2.4/src/imapcommon.c
--- up-imapproxy-1.2.4-orig/src/imapcommon.c	2005-08-31 12:32:24.000000000 -0400
+++ up-imapproxy-1.2.4/src/imapcommon.c	2005-12-26 13:08:30.000000000 -0500
@@ -136,6 +136,7 @@
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
+#include <openssl/md5.h>
 
 #include <pthread.h>
 #include <sys/types.h>


Index: up-imapproxy.spec
===================================================================
RCS file: /cvs/extras/rpms/up-imapproxy/FC-5/up-imapproxy.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- up-imapproxy.spec	26 Dec 2005 14:14:01 -0000	1.6
+++ up-imapproxy.spec	27 Apr 2006 11:49:28 -0000	1.7
@@ -1,7 +1,7 @@
 Summary: University of Pittsburgh IMAP Proxy
 Name: up-imapproxy
 Version: 1.2.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.imapproxy.org
@@ -10,6 +10,7 @@
 # Source1 can be downloaded from
 # https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=118632
 Patch0: %{name}-CAN-2005-2661.patch
+Patch1: %{name}-openssl098a.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig, /sbin/service
@@ -30,6 +31,7 @@
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p1
 
 %build
 %configure
@@ -74,6 +76,10 @@
 %{_sbindir}/*
 
 %changelog
+* Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 1.2.4-6
+- Patch to fix changes in OpenSSL.
+- Thanks to Paul W. Frields for providing the patch.
+
 * Mon Dec 26 2005 Jeff Carlson <jeff at ultimateevil.org> - 1.2.4-5
 - Rebuild against new OpenSSL in devel (fc5 only).
 



From fedora-extras-commits at redhat.com  Thu Apr 27 11:59:33 2006
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Thu, 27 Apr 2006 04:59:33 -0700
Subject: rpms/zile/FC-5 zile.spec,1.2,1.3
Message-ID: <200604271159.k3RBxZIp029861@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/zile/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29795/FC-5

Modified Files:
	zile.spec 
Log Message:
* Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-1
- Bump to latest release.



Index: zile.spec
===================================================================
RCS file: /cvs/extras/rpms/zile/FC-5/zile.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- zile.spec	24 Aug 2005 16:26:39 -0000	1.2
+++ zile.spec	27 Apr 2006 11:59:32 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Zile Is Lossy Emacs
 Name: zile
-Version: 2.2.4
-Release: 2%{?dist}
+Version: 2.2.13
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Editors
 URL: http://zile.sourceforge.net/
@@ -40,12 +40,15 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS
-     %{_bindir}/*
-     %{_infodir}/*
-     %{_mandir}/man1/*
-     %{_datadir}/zile/
+%{_bindir}/*
+%{_infodir}/*
+%{_mandir}/man1/*
+%{_datadir}/zile/
 
 %changelog
+* Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-1
+- Bump to latest release.
+
 * Wed Aug 24 2005 Jeff Carlson <jeff at ultimateevil.org> - 2.2.4-2
 - Another BuildRequires.
 



From fedora-extras-commits at redhat.com  Thu Apr 27 11:59:32 2006
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Thu, 27 Apr 2006 04:59:32 -0700
Subject: rpms/zile/FC-4 zile.spec,1.2,1.3
Message-ID: <200604271159.k3RBxYjR029857@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/zile/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29795/FC-4

Modified Files:
	zile.spec 
Log Message:
* Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-1
- Bump to latest release.



Index: zile.spec
===================================================================
RCS file: /cvs/extras/rpms/zile/FC-4/zile.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- zile.spec	24 Aug 2005 16:26:34 -0000	1.2
+++ zile.spec	27 Apr 2006 11:59:32 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Zile Is Lossy Emacs
 Name: zile
-Version: 2.2.4
-Release: 2%{?dist}
+Version: 2.2.13
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Editors
 URL: http://zile.sourceforge.net/
@@ -40,12 +40,15 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS
-     %{_bindir}/*
-     %{_infodir}/*
-     %{_mandir}/man1/*
-     %{_datadir}/zile/
+%{_bindir}/*
+%{_infodir}/*
+%{_mandir}/man1/*
+%{_datadir}/zile/
 
 %changelog
+* Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-1
+- Bump to latest release.
+
 * Wed Aug 24 2005 Jeff Carlson <jeff at ultimateevil.org> - 2.2.4-2
 - Another BuildRequires.
 



From fedora-extras-commits at redhat.com  Thu Apr 27 11:59:33 2006
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Thu, 27 Apr 2006 04:59:33 -0700
Subject: rpms/zile/devel zile.spec,1.2,1.3
Message-ID: <200604271159.k3RBxZ4B029865@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/zile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29795/devel

Modified Files:
	zile.spec 
Log Message:
* Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-1
- Bump to latest release.



Index: zile.spec
===================================================================
RCS file: /cvs/extras/rpms/zile/devel/zile.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- zile.spec	24 Aug 2005 16:26:39 -0000	1.2
+++ zile.spec	27 Apr 2006 11:59:33 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Zile Is Lossy Emacs
 Name: zile
-Version: 2.2.4
-Release: 2%{?dist}
+Version: 2.2.13
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Editors
 URL: http://zile.sourceforge.net/
@@ -40,12 +40,15 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS
-     %{_bindir}/*
-     %{_infodir}/*
-     %{_mandir}/man1/*
-     %{_datadir}/zile/
+%{_bindir}/*
+%{_infodir}/*
+%{_mandir}/man1/*
+%{_datadir}/zile/
 
 %changelog
+* Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-1
+- Bump to latest release.
+
 * Wed Aug 24 2005 Jeff Carlson <jeff at ultimateevil.org> - 2.2.4-2
 - Another BuildRequires.
 



From fedora-extras-commits at redhat.com  Thu Apr 27 11:59:31 2006
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Thu, 27 Apr 2006 04:59:31 -0700
Subject: rpms/zile/FC-3 zile.spec,1.2,1.3
Message-ID: <200604271200.k3RC03Bq029876@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/zile/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29795/FC-3

Modified Files:
	zile.spec 
Log Message:
* Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-1
- Bump to latest release.



Index: zile.spec
===================================================================
RCS file: /cvs/extras/rpms/zile/FC-3/zile.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- zile.spec	24 Aug 2005 16:26:34 -0000	1.2
+++ zile.spec	27 Apr 2006 11:59:31 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Zile Is Lossy Emacs
 Name: zile
-Version: 2.2.4
-Release: 2%{?dist}
+Version: 2.2.13
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Editors
 URL: http://zile.sourceforge.net/
@@ -40,12 +40,15 @@
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS
-     %{_bindir}/*
-     %{_infodir}/*
-     %{_mandir}/man1/*
-     %{_datadir}/zile/
+%{_bindir}/*
+%{_infodir}/*
+%{_mandir}/man1/*
+%{_datadir}/zile/
 
 %changelog
+* Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-1
+- Bump to latest release.
+
 * Wed Aug 24 2005 Jeff Carlson <jeff at ultimateevil.org> - 2.2.4-2
 - Another BuildRequires.
 



From fedora-extras-commits at redhat.com  Thu Apr 27 12:22:53 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Thu, 27 Apr 2006 05:22:53 -0700
Subject: fedora-security/audit fc4,1.220,1.221 fc5,1.134,1.135
Message-ID: <200604271222.k3RCMrmN032264@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32244

Modified Files:
	fc4 fc5 
Log Message:
Updates for yesterday



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.220
retrieving revision 1.221
diff -u -r1.220 -r1.221
--- fc4	26 Apr 2006 11:28:27 -0000	1.220
+++ fc4	27 Apr 2006 12:22:51 -0000	1.221
@@ -1,22 +1,27 @@
-Up to date CVE as of CVE email 20060425
-Up to date FC4 as of 20060425
+Up to date CVE as of CVE email 20060426
+Up to date FC4 as of 20060426
 
 ** are items that need attention
 
+CVE-2006-2057 ** firefox
+CVE-2006-2026 VULNERABLE (libtiff, fixed 3.8.1) #189934
+CVE-2006-2025 VULNERABLE (libtiff, fixed 3.8.1) #189934
+CVE-2006-2024 VULNERABLE (libtiff, fixed 3.8.1) #189934
 CVE-2006-1991 VULNERABLE (php)
 CVE-2006-1990 VULNERABLE (php)
 CVE-2006-1942 ** firefox
-CVE-2006-1940 VULNERABLE (ethereal, fixed 0.99.0)
-CVE-2006-1939 VULNERABLE (ethereal, fixed 0.99.0)
-CVE-2006-1938 VULNERABLE (ethereal, fixed 0.99.0)
-CVE-2006-1937 VULNERABLE (ethereal, fixed 0.99.0)
-CVE-2006-1936 VULNERABLE (ethereal, fixed 0.99.0)
-CVE-2006-1935 VULNERABLE (ethereal, fixed 0.99.0)
-CVE-2006-1934 VULNERABLE (ethereal, fixed 0.99.0)
-CVE-2006-1933 VULNERABLE (ethereal, fixed 0.99.0)
-CVE-2006-1932 VULNERABLE (ethereal, fixed 0.99.0)
+CVE-2006-1940 version (ethereal, fixed 0.99.0) [since FEDORA-2006-461]
+CVE-2006-1939 version (ethereal, fixed 0.99.0) [since FEDORA-2006-461]
+CVE-2006-1938 version (ethereal, fixed 0.99.0) [since FEDORA-2006-461]
+CVE-2006-1937 version (ethereal, fixed 0.99.0) [since FEDORA-2006-461]
+CVE-2006-1936 version (ethereal, fixed 0.99.0) [since FEDORA-2006-461]
+CVE-2006-1935 version (ethereal, fixed 0.99.0) [since FEDORA-2006-461]
+CVE-2006-1934 version (ethereal, fixed 0.99.0) [since FEDORA-2006-461]
+CVE-2006-1933 version (ethereal, fixed 0.99.0) [since FEDORA-2006-461]
+CVE-2006-1932 version (ethereal, fixed 0.99.0) [since FEDORA-2006-461]
 CVE-2006-1931 version (ruby, fixed 1.8.3)
 CVE-2006-1902 ignore (gcc) not a vulnerability
+CVE-2006-1864 VULNERABLE (kernel)
 CVE-2006-1863 VULNERABLE (kernel, fixed 2.6.16.11)
 CVE-2006-1790 version (firefox, fixed 1.0.8) [since FEDORA-2006-410]
 CVE-2006-1790 VULNERABLE (thunderbird, fixed 1.0.8)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -r1.134 -r1.135
--- fc5	26 Apr 2006 11:28:27 -0000	1.134
+++ fc5	27 Apr 2006 12:22:51 -0000	1.135
@@ -1,8 +1,12 @@
-Up to date CVE as of CVE email 20060425
-Up to date FC5 as of 20060425
+Up to date CVE as of CVE email 20060426
+Up to date FC5 as of 20060426
 
 ** are items that need attention
 
+CVE-2006-2057 ** firefox
+CVE-2006-2026 VULNERABLE (libtiff, fixed 3.8.1) #189934
+CVE-2006-2025 VULNERABLE (libtiff, fixed 3.8.1) #189934
+CVE-2006-2024 VULNERABLE (libtiff, fixed 3.8.1) #189934
 CVE-2006-1991 VULNERABLE (php)
 CVE-2006-1990 VULNERABLE (php)
 CVE-2006-1942 ** firefox
@@ -18,6 +22,7 @@
 CVE-2006-1931 version (ruby, fixed 1.8.3)
 CVE-2006-1902 ignore (gcc) not a vulnerability
 CVE-2006-1865 version (beagle, fixed 0.2.5) [since FEDORA-2006-440]
+CVE-2006-1864 VULNERABLE (kernel)
 CVE-2006-1863 VULNERABLE (kernel, fixed 2.6.16.11)
 CVE-2006-1790 version (firefox, fixed 1.5.0.2) [since FEDORA-2006-411]
 CVE-2006-1790 VULNERABLE (thunderbird, fixed 1.5.0.2)



From fedora-extras-commits at redhat.com  Thu Apr 27 13:04:47 2006
From: fedora-extras-commits at redhat.com (Jesse Keating (jkeating))
Date: Thu, 27 Apr 2006 06:04:47 -0700
Subject: owners owners.list,1.902,1.903
Message-ID: <200604271304.k3RD4nfB002147@cvs-int.fedora.redhat.com>

Author: jkeating

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2126

Modified Files:
	owners.list 
Log Message:
typo in contacts.



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.902
retrieving revision 1.903
diff -u -r1.902 -r1.903
--- owners.list	27 Apr 2006 03:05:20 -0000	1.902
+++ owners.list	27 Apr 2006 13:04:46 -0000	1.903
@@ -151,7 +151,7 @@
 Fedora Extras|conglomerate|Extensible XML Editor|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|conserver|Serial console server daemon/client|jima at auroralinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|contact-lookup-applet|Applet which allows you to search your Evolution address book|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
-Fedora Extras|contacs|Contacts addressbook|jkeating at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|contacts|Contacts addressbook|jkeating at redhat.com|extras-qa at fedoraproject.org|
 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|cpan2rpm|Perl module packager|ghenry at suretecsystems.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Thu Apr 27 14:19:11 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Thu, 27 Apr 2006 07:19:11 -0700
Subject: status-report-scripts parseBZbugList,1.31,1.32
Message-ID: <200604271419.k3REJB07005018@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5000

Modified Files:
	parseBZbugList 
Log Message:
Add dropped from core info, and streamline repo querying a bit.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- parseBZbugList	19 Apr 2006 10:20:19 -0000	1.31
+++ parseBZbugList	27 Apr 2006 14:19:08 -0000	1.32
@@ -77,33 +77,27 @@
 use Date::Manip;
 
 my %opt;
-my @options = ( "help", "core=s", "extras=s", "bzid=s", "o=s", "d=s",
-		"extras_r=s", "core_r=s", "cvs=s" );
+my @options = ( "help", "repourl=s", "bzid=s", "o=s", "d=s", "cvs=s",
+		"currel=i", "firstrel=i" );
 
-$main::core
-  = "http://mirrors.kernel.org/fedora/core/development/SRPMS/";
-$main::core_r
-  = "http://mirrors.kernel.org/fedora/core/5/source/SRPMS/";
-$main::extras
-  = "http://mirrors.kernel.org/fedora/extras/development/SRPMS/";
-$main::extras_r
-  = "http://mirrors.kernel.org/fedora/extras/5/SRPMS/";
+$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::cvsDir = "/export/scratch/extras";
+$main::currel = 5;
+$main::firstrel = 1;
 
 if( ! GetOptions( \%opt, @options ) ) { &usage(); }
 
 # Override any default settings with arguments that the user has supplied
-$main::core = $opt{"core"} if defined $opt{"core"};
-$main::extras = $opt{"extras"} if defined $opt{"extras"};
-$main::extras_r = $opt{"extras_r"} if defined $opt{"extras_r"};
-$main::extras_r = $opt{"core_r"} if defined $opt{"core_r"};
+$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::currel = $opt{"currel"} if defined $opt{"currel"};
+$main::firstrel = $opt{"firstrel"} if defined $opt{"firstrel"};
 
 &usage() if defined $opt{'help'};
 
@@ -119,11 +113,12 @@
 my %BZR;
 my %BZA;
 my %BZB;
-my %CORE;
-my %CORE_R;
-my %EXTRAS;
-my %EXTRAS_R;
+my %CORE_D;
+my @CORE_R;
+my %EXTRAS_D;
+my @EXTRAS_R;
 my %SRPMS;
+my @CORE_DROPPED_SRPMS;
 my %NAME;
 my %OWN;
 my %OWN_DUP;
@@ -209,20 +204,22 @@
     print STDERR "$k is in the list of discarded pkgs, but not in owners\n";
   }
 }
-if ($main::extras ne "") {
-  &grabRepoList($main::extras, \%EXTRAS);
-}
-if ($main::extras_r ne "") {
-  &grabRepoList($main::extras_r, \%EXTRAS_R);
-}
-if ($main::core ne "") {
-  &grabRepoList($main::core, \%CORE);
-}
-if ($main::core_r ne "") {
-  &grabRepoList($main::core_r, \%CORE_R);
+&grabRepoList("$main::repourl/core/development/SRPMS/", \%CORE_D);
+&grabRepoList("$main::repourl/extras/development/SRPMS/", \%EXTRAS_D);
+for my $i ($main::firstrel .. $main::currel) {
+  $CORE_R[$i] = {};
+  if ($i >= 5) {
+    &grabRepoList("$main::repourl/core/$i/source/SRPMS/", $CORE_R[$i]);
+  } else {
+    &grabRepoList("$main::repourl/core/$i/SRPMS/", $CORE_R[$i]);
+  }
+  $EXTRAS_R[$i] = {};
+  if ($i >= 3) {
+    &grabRepoList("$main::repourl/extras/$i/SRPMS/", $EXTRAS_R[$i]);
+  }
 }
-%SRPMS = %EXTRAS;
-foreach my $k (keys %CORE) {
+%SRPMS = %EXTRAS_D;
+foreach my $k (keys %CORE_D) {
   $SRPMS{$k} = 1;
 }
 foreach my $k (keys %FC_INTEGRATED) {
@@ -251,7 +248,7 @@
   while ( <IN> ) {
     s/\s+$//;
     $COUNT_LIST{"CVS"} += 1;
-    if (defined($CORE{$_}) && -f "$main::cvsDir/$_/devel/$_.spec") {
+    if (defined($CORE_D{$_}) && -f "$main::cvsDir/$_/devel/$_.spec") {
       push @PL, $_;
     }
     next if defined($OWN{$_}) || defined($DISCARD{$_});
@@ -381,8 +378,10 @@
 &checkLowActivity(\%BZB, "OPEN-BUGS");
 &checkBugs(\%BZB);
 &checkMaintainers();
-&checkCoreAndExtras(\%CORE_R, \%EXTRAS_R, "release");
-&checkCoreAndExtras(\%CORE, \%EXTRAS, "devel");
+&checkCoreAndExtras($CORE_R[$main::currel],
+		    $EXTRAS_R[$main::currel], "release");
+&checkCoreAndExtras(\%CORE_D, \%EXTRAS_D, "devel");
+&checkDropped();
 print "[[TableOfContents]]\n\n= FE Package Status of ",
   &UnixDate("today", "%b %e, %Y"), " =\n";
 &displayOwnersWiki;
@@ -395,6 +394,7 @@
 &displayNewReviewWiki(\%BZB, "OPEN-BUGS", 4);
 &displayCVSWiki();
 &displayMaintainersWiki();
+&displayDroppedWiki();
 print "----\nCategoryExtras\n";
 print STDERR "\n\nFE Package Status of ",
   &UnixDate("today", "%b %e, %Y"), "\n";
@@ -410,6 +410,7 @@
 &displayNewReviewMail("OPEN-BUGS");
 &displayCVSMail();
 &displayMaintainersMail();
+&displayDroppedMail();
 
 exit 0;
 
@@ -421,7 +422,7 @@
   my @NP_R;
   my @NPC;
   my @OE;
-  foreach my $k (keys %EXTRAS) {
+  foreach my $k (keys %EXTRAS_D) {
     next if defined $OWN{$k};
     push @NO, $k
   }
@@ -435,11 +436,11 @@
     if (defined $OWN{$l}) {
       $OWN_DUP{$l} = $OWN{$l};
       $OWN_DUP{$k} = $OWN{$k};
-      if (defined($EXTRAS{$l}) || defined($CORE{$l})) {
+      if (defined($EXTRAS_D{$l}) || defined($CORE_D{$l})) {
 	delete $OWN{$k};
 	next;
       }
-      if (defined($EXTRAS{$k}) || defined($CORE{$k})) {
+      if (defined($EXTRAS_D{$k}) || defined($CORE_D{$k})) {
 	delete $OWN{$l};
       }
     }
@@ -459,16 +460,16 @@
     }
     if ($$a[3] eq $extras_orphan) {
       $orphan += 1;
-      push @OE, $k if defined $EXTRAS{$k};
+      push @OE, $k if defined $EXTRAS_D{$k};
       next;
     } else {
       $$s[2] = 1 if defined $OWN_CVS_RECENT{$k};
     }
-    unless (defined $EXTRAS{$k}) {
-      if (defined($CORE{$k}) || defined($FC_INTEGRATED{$k})) {
+    unless (defined $EXTRAS_D{$k}) {
+      if (defined($CORE_D{$k}) || defined($FC_INTEGRATED{$k})) {
 	push @NPC, $k;
       } else {
-	if (defined $EXTRAS_R{$k}) {
+	if (defined $EXTRAS_R[$main::currel]->{$k}) {
 	  push @NP_R, $k;
 	} else {
 	  push @NP, $k;
@@ -692,7 +693,7 @@
       $BZREV_CNT{$$a[4]} += 1;
       $BZOWN_CNT{$$a[5]} += 1;
       $COUNT_LIST{"acceptedClosed"} += 1;
-      if (!defined($CORE{$pkg}) && !defined($OWN{$pkg})) {
+      if (!defined($CORE_D{$pkg}) && !defined($OWN{$pkg})) {
 	push @BLO, $b;
 	$COUNT_LIST{"missingOwner"} += 1;
       }
@@ -869,18 +870,14 @@
   -help           this help note
   -bzid <url>     list associating bz ticket number with package name
                   [$main::bzid]
-  -extras <url>   Fedora extras SRPMS development repo
-                  [$main::extras]
-  -extras_r <url> Fedora extras SRPMS release repo
-                  [$main::extras_r]
-  -core <url>     Fedora core SRPMS development repo
-                  [$main::core]
-  -core_r <url>   Fedora core SRPMS release repo
-                  [$main::core]
+  -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
-  -cvs <dir>      extras CVS directory [$main::cvsDir]\n";
+  -repourl <url>  Fedora core and extras SRPMS development repo base
+                  [$main::repourl]\n";
   exit 1;
 }
 
@@ -1195,3 +1192,44 @@
     &displayPkgListByOwnerMail($PKG_LIST{"commondevel"});
   }
 }
+
+sub checkDropped {
+  my %D;
+  for (my $i = $main::currel - 1; $i >= $main::firstrel; $i--) {
+    print STDERR "Checking core $i\n";
+    foreach my $k (keys %{$CORE_R[$i]}) {
+      print STDERR " Checking package $k\n";
+      unless ($SRPMS{$k} or $D{$k}) {
+	$CORE_DROPPED_SRPMS[$i]->{$k} = 1;
+	$D{$k} = 1;
+      }
+    }
+  }
+  my @PL = keys %D;
+  $PKG_LIST{"Dropped"} = \@PL;
+  $COUNT_LIST{'Dropped'} = $#PL + 1;
+}
+
+sub displayDroppedWiki {
+  return if $COUNT_LIST{'Dropped'} == 0;
+  print "== About dropped packages ==\n\n";
+  print "We have a total of $COUNT_LIST{'Dropped'} dropped packages.\n";
+  for (my $i = $main::currel - 1; $i >= $main::firstrel; $i--) {
+    my @A = keys %{$CORE_DROPPED_SRPMS[$i]};
+    if ($#A >= 0) {
+      my $n = $i + 1;
+      print "\n=== FC packages dropped between release $i and $n ===\n";
+      my $cnt = $#A + 1;
+      print "\nWe have $cnt packages dropped from core:{{{\n";
+      print &toLine(join(" ", sort @A)), "\n";
+      print "}}}\n";
+    }
+  }
+}
+
+sub displayDroppedMail {
+  return if $COUNT_LIST{'Dropped'} == 0;
+  print STDERR "\nDropped FC packages:\n";
+  print STDERR " - $COUNT_LIST{'Dropped'} packages were dropped from core",
+    " since FC $main::firstrel\n";
+}



From fedora-extras-commits at redhat.com  Thu Apr 27 14:54:19 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 27 Apr 2006 07:54:19 -0700
Subject: rpms/sbcl/FC-5 .cvsignore, 1.11, 1.12 sbcl.spec, 1.40, 1.41 sources,
	1.11, 1.12
Message-ID: <200604271454.k3REsL0c005170@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5149

Modified Files:
	.cvsignore sbcl.spec sources 
Log Message:
* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-1
- 0.9.12



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-5/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	30 Mar 2006 19:04:59 -0000	1.11
+++ .cvsignore	27 Apr 2006 14:54:18 -0000	1.12
@@ -1,4 +1,4 @@
-sbcl-0.9.11-source.tar.bz2
+sbcl-0.9.12-source.tar.bz2
 sbcl-0.9.11-x86-64-linux-binary.tar.bz2 
 sbcl-0.9.11-x86-linux-binary.tar.bz2
-sbcl-0.8.15-powerpc-linux-binary.tar.bz2
+sbcl-0.9.8-powerpc-linux-binary.tar.bz2


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-5/sbcl.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- sbcl.spec	30 Mar 2006 19:04:59 -0000	1.40
+++ sbcl.spec	27 Apr 2006 14:54:18 -0000	1.41
@@ -12,7 +12,7 @@
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
-Version: 0.9.11
+Version: 0.9.12
 Release: 1%{?dist}
 
 License: BSD/MIT
@@ -26,12 +26,22 @@
 #Source1: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2
 Source2: customize-target-features.lisp 
 
+## Bootstraps
+# %{ix86}
+#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-linux-binary.tar.bz2
+# x86_64
+#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-64-linux-binary.tar.bz2
+# ppc
+#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-powerpc-linux-binary.tar.bz2
+# another possible ppc bootstrap to try
+#Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
+
+
 ## x86 section
 %ifarch %{ix86}
 %define sbcl_arch x86
 BuildRequires: sbcl
 # or
-#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-linux-binary.tar.bz2
 #define sbcl_bootstrap_src -a 10 
 %endif
 
@@ -47,16 +57,10 @@
 ## ppc section
 # Latest powerpc-linux bootstrap build fails:
 # http://bugzilla.redhat.com/bugzilla/177029 
-#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2
-# another possible ppc bootstrap to try
-#Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
 Source35: ppc-linux-mcontext.h
 %ifarch ppc 
 %define sbcl_arch ppc
 %define sbcl_bootstrap_src -a 30
-BuildRequires: setarch
-%define setarch setarch %{_target_cpu}
-%define min_bootstrap 1
 %endif
 
 Source100: my_setarch.c
@@ -65,7 +69,7 @@
 Patch2: sbcl-0.9.5-personality.patch
 Patch3: sbcl-0.9.5-optflags.patch
 Patch4: sbcl-0.9.4-LIB_DIR.patch
-Patch5: sbcl-0.9.10-make-config-ppc.patch
+#Patch5: sbcl-0.9.10-make-config-ppc.patch
 Patch6: sbcl-0.9.5-verbose-build.patch
 # Allow override of contrib test failure(s)
 Patch7: sbcl-0.9.9-permissive.patch
@@ -97,7 +101,7 @@
 %patch2 -p1 -b .personality
 %patch3 -p1 -b .optflags
 %patch4 -p1 -b .LIB_DIR
-%patch5 -p1 -b .make-config-ppc
+#patch5 -p1 -b .make-config-ppc
 %{?sbcl_verbose:%patch6 -p1 -b .verbose-build}
 %patch7 -p1 -b .permissive
 
@@ -228,6 +232,9 @@
 
 
 %changelog
+* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-1
+- 0.9.12
+
 * Mon Mar 27 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.11-1
 - 0.9.11
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-5/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	30 Mar 2006 19:04:59 -0000	1.11
+++ sources	27 Apr 2006 14:54:18 -0000	1.12
@@ -1 +1 @@
-b82c3b7cf5c351cbe97af5150c17ad27  sbcl-0.9.11-source.tar.bz2
+82eef4f47d6a72a36d4484bf503fc7db  sbcl-0.9.12-source.tar.bz2



From fedora-extras-commits at redhat.com  Thu Apr 27 14:57:59 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Thu, 27 Apr 2006 07:57:59 -0700
Subject: rpms/maxima/devel maxima-5.9.3-gcl-setarch.patch, NONE,
	1.1 maxima-5.9.3-sbcl-disable-debugger.patch, NONE,
	1.1 .cvsignore, 1.5, 1.6 maxima.spec, 1.23,
	1.24 maxima-5.9.2-sbcl-disable-debugger.patch, 1.1, NONE
Message-ID: <200604271458.k3REw1OA005278@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5253

Modified Files:
	.cvsignore maxima.spec 
Added Files:
	maxima-5.9.3-gcl-setarch.patch 
	maxima-5.9.3-sbcl-disable-debugger.patch 
Removed Files:
	maxima-5.9.2-sbcl-disable-debugger.patch 
Log Message:
* Wed Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-2
- use setarch -X hack to allow runtime-gcl to function (#187647)
- respin for sbcl-0.9.12


maxima-5.9.3-gcl-setarch.patch:

--- NEW FILE maxima-5.9.3-gcl-setarch.patch ---
--- maxima-5.9.3/src/maxima.in.setarch	2005-11-07 11:37:11.000000000 -0600
+++ maxima-5.9.3/src/maxima.in	2006-04-27 07:07:42.000000000 -0500
@@ -128,7 +128,7 @@
 	exec "@SCL_NAME@" -quiet -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
     fi
 elif [ "$MAXIMA_LISP" = "gcl" ]; then
-    exec "$maxima_image_base" -eval '(cl-user::run)' -f -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+    exec "setarch" "@ARCH@" "-X" "$maxima_image_base" -eval '(cl-user::run)' -f -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
 elif [ "$MAXIMA_LISP" = "acl6" ]; then
 # FIXME: arguments need in a manner consistent with the way they are extracted
 #        in the function get-application-args in command-line.lisp

maxima-5.9.3-sbcl-disable-debugger.patch:

--- NEW FILE maxima-5.9.3-sbcl-disable-debugger.patch ---
--- maxima-5.9.3/src/Makefile.am.sbcl-disable-debugger	2006-02-11 08:25:06.000000000 -0600
+++ maxima-5.9.3/src/Makefile.am	2006-04-26 14:30:15.000000000 -0500
@@ -151,7 +151,7 @@
 
 
 if SBCL
-EXECUTESBCL = $(SBCL_NAME) --noinform --noprint --eval
+EXECUTESBCL = $(SBCL_NAME) --noinform --noprint --disable-debugger --eval
 all-local: binary-sbcl/maxima.core
 install-exec-local: install-sbcl
 uninstall: uninstall-sbcl
--- maxima-5.9.3/src/Makefile.in.sbcl-disable-debugger	2006-03-19 09:23:40.000000000 -0600
+++ maxima-5.9.3/src/Makefile.in	2006-04-26 14:31:14.000000000 -0500
@@ -204,7 +204,7 @@
 @CMUCL_TRUE at EXECUTECMUCL = $(CMUCL_NAME) -noinit -batch
 @SCL_TRUE at EXECUTESCL = $(SCL_NAME) -noinit -batch
 @ACL6_TRUE at EXECUTEACL6 = $(ACL6_NAME) -batch
- at SBCL_TRUE@EXECUTESBCL = $(SBCL_NAME) --noinform --noprint --eval
+ at SBCL_TRUE@EXECUTESBCL = $(SBCL_NAME) --noinform --noprint --disable-debugger --eval
 @GCL_TRUE at EXECUTEGCL = $(GCL_NAME) -batch -eval
 @OPENMCL_TRUE at EXECUTEOPENMCL = $(OPENMCL_NAME) -e
 genericdir = $(instsrcdir)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	5 Apr 2006 19:05:41 -0000	1.5
+++ .cvsignore	27 Apr 2006 14:57:59 -0000	1.6
@@ -1,4 +1,3 @@
-maxima-5.9.2.tar.gz
 maximabook-19-Sept-2004.pdf
 macref.pdf
 maxima-5.9.3.tar.gz


Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- maxima.spec	5 Apr 2006 19:05:41 -0000	1.23
+++ maxima.spec	27 Apr 2006 14:57:59 -0000	1.24
@@ -1,9 +1,14 @@
 
+%if "%{?fedora}" > "4"
+# See http://bugzilla.redhat.com/bugzilla/187647
+%define setarch_hack 1
+%endif
+
 Summary: Symbolic Computation Program
 Name: 	 maxima
 Version: 5.9.3
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -15,19 +20,19 @@
 #  (sbcl:  https://bugzilla.redhat.com/bugzilla/177029)
 ExclusiveArch: %{ix86} x86_64 
 
-%define _with_default_lisp --with-default-lisp=clisp
-
 %ifarch %{ix86}
 %define _enable_cmucl --enable-cmucl
 %endif
 
 %ifarch %{ix86} x86_64
+%define default_lisp clisp
 %define _enable_clisp --enable-clisp 
 %define _enable_gcl --enable-gcl 
 %define _enable_sbcl --enable-sbcl 
 %endif
 
 %ifarch ppc
+#define default_lisp sbcl
 #define _enable_clisp --enable-clisp 
 #define _enable_cmucl --enable-cmucl 
 #define _enable_gcl --enable-gcl 
@@ -46,11 +51,13 @@
 # (mysterious?) xemacs patch (don't use, for now)
 Patch2: maxima.el-xemacs.patch
 # use sbcl --disable-debugger
-Patch3: maxima-5.9.2-sbcl-disable-debugger.patch
+Patch3: maxima-5.9.3-sbcl-disable-debugger.patch
 # ghostview -> evince (ps/pdf viewer)
 Patch4: maxima-5.9.2-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
 
 # Inhibit automatic compressing of info files. Compressed info
 # files break maxima's internal help.
@@ -71,6 +78,10 @@
 BuildRequires: tk
 
 Requires: %{name}-runtime = %{version}
+## Consider this when rpm supports it -- Rex
+#if "%{?default_lisp:1}" == "1"
+#Requires(hint): %{name}-runtime-%{default_lisp} = %{version}
+#endif
 Requires: gnuplot
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
@@ -134,8 +145,13 @@
 Group:   Applications/Engineering
 BuildRequires: gcl
 Requires:  %{name} = %{version}
+%if "%{?setarch_hack}" == "1"
+BuildRequires: setarch
+Requires:  setarch
+%endif
 Obsoletes: maxima-exec-gcl < %{version}-%{release}
 Provides:  %{name}-runtime = %{version}
+Provides:  %{name}-runtime-gcl = %{version}-%{release}
 %description runtime-gcl
 Maxima compiled with Gnu Common Lisp (gcl)
 %endif
@@ -168,10 +184,16 @@
 
 %patch1 -p1 -b .htmlview
 #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
+%endif
+
+sed -i -e 's|@ARCH@|%{_target_cpu}|' src/maxima.in
 
 sed -i -e 's:/usr/local/info:/usr/share/info:' \
   interfaces/emacs/emaxima/maxima.el
@@ -182,15 +204,10 @@
 # remove CVS crud
 find -name CVS -type d | xargs rm -r
 
-#patch3 -p1 -b .sbcl-disable-debugger
-#aclocal
-#automake --add-missing --copy
-#autoconf
-
 
 %build
 %configure \
-  %{?_with_default_lisp} \
+  %{?default_lisp:--with-default-lisp=%{default_lisp} } \
   %{?_enable_clisp} %{!?_enable_clisp: --disable-clisp } %{?_with_clisp_runtime} \
   %{?_enable_cmucl} %{!?_enable_cmucl: --disable-cmucl } %{?_with_cmucl_runtime} \
   %{?_enable_gcl}   %{!?_enable_gcl:   --disable-gcl } \
@@ -356,6 +373,10 @@
 
 
 %changelog
+* Wed Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-2
+- use setarch -X hack to allow runtime-gcl to function (#187647)
+- respin for sbcl-0.9.12
+
 * Wed Apr 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-1
 - 5.9.3
 


--- maxima-5.9.2-sbcl-disable-debugger.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Apr 27 15:06:50 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Thu, 27 Apr 2006 08:06:50 -0700
Subject: rpms/dnsmasq/devel dnsmasq.spec,1.1,1.2
Message-ID: <200604271506.k3RF6qJw007515@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7491/devel

Modified Files:
	dnsmasq.spec 
Log Message:

Implementing request from upstream, unified spec, etc



Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/devel/dnsmasq.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dnsmasq.spec	25 Apr 2006 16:51:25 -0000	1.1
+++ dnsmasq.spec	27 Apr 2006 15:06:50 -0000	1.2
@@ -1,16 +1,19 @@
 Name:           dnsmasq
 Version:        2.30
-Release:        2%{?dist}
+Release:        3%{?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}-fedora-extras.patch
+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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if "%{dist}" != ".fc3"
 BuildRequires:  dbus-devel
+%endif
 
 Requires(post):	 /sbin/chkconfig
 Requires(post):  /sbin/service
@@ -31,6 +34,9 @@
 %prep
 %setup -q
 %patch0 -p1
+%if "%{dist}" != ".fc3"
+%patch1 -p1
+%endif
 
 %build
 make %{?_smp_mflags}
@@ -74,10 +80,15 @@
 
 
 %changelog
-* Mon Apr 24 2006 Patrick Laughton <jima at auroralinux.org> 2.30-2
+* Thu Apr 27 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 2.30-3
+- Un-enabled HAVE_ISC_READER, a hack to enable a deprecated feature (request)
+- Split initscript & enable-dbus patches, conditionalized dbus for FC3
+- Tweaked name field in changelog entries (trying to be consistent)
+
+* Mon Apr 24 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 2.30-2
 - Disabled stripping of binary while installing (oops)
 - Enabled HAVE_ISC_READER/HAVE_DBUS via patch
 - Added BuildReq for dbus-devel
 
-* Mon Apr 24 2006 Patrick Laughton <jima at auroralinux.org> 2.30-1
+* Mon Apr 24 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 2.30-1
 - Initial Fedora Extras RPM



From fedora-extras-commits at redhat.com  Thu Apr 27 15:16:45 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Thu, 27 Apr 2006 08:16:45 -0700
Subject: rpms/dnsmasq/devel dnsmasq-2.30-enable-dbus.patch, NONE,
	1.1 dnsmasq-2.30-initscript.patch, NONE, 1.1
Message-ID: <200604271516.k3RFGlcd007600@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7576/devel

Added Files:
	dnsmasq-2.30-enable-dbus.patch dnsmasq-2.30-initscript.patch 
Log Message:

Implementing request from upstream, unified spec, etc


dnsmasq-2.30-enable-dbus.patch:

--- NEW FILE dnsmasq-2.30-enable-dbus.patch ---
diff -urN dnsmasq-2.30/src/config.h dnsmasq-2.30-patched/src/config.h
--- dnsmasq-2.30/src/config.h	2006-04-23 13:27:20.000000000 -0500
+++ dnsmasq-2.30-patched/src/config.h	2006-04-26 13:43:54.000000000 -0500
@@ -168,7 +168,7 @@
 /* platform independent options- uncomment to enable */
 /* #define HAVE_BROKEN_RTC */
 /* #define HAVE_ISC_READER */
-/* #define HAVE_DBUS */
+#define HAVE_DBUS
 
 #if defined(HAVE_BROKEN_RTC) && defined(HAVE_ISC_READER)
 #  error HAVE_ISC_READER is not compatible with HAVE_BROKEN_RTC

dnsmasq-2.30-initscript.patch:

--- NEW FILE dnsmasq-2.30-initscript.patch ---
diff -urN dnsmasq-2.30/rpm/dnsmasq.rh dnsmasq-2.30-patched/rpm/dnsmasq.rh
--- dnsmasq-2.30/rpm/dnsmasq.rh	2006-04-23 08:26:21.000000000 -0500
+++ dnsmasq-2.30-patched/rpm/dnsmasq.rh	2006-04-24 15:06:01.000000000 -0500
@@ -2,7 +2,7 @@
 #
 # Startup script for the DNS caching server
 #
-# chkconfig: 2345 99 01
+# chkconfig: - 99 01
 # description: This script starts your DNS caching server
 # processname: dnsmasq
 # pidfile: /var/run/dnsmasq.pid



From fedora-extras-commits at redhat.com  Thu Apr 27 15:45:50 2006
From: fedora-extras-commits at redhat.com (Christian Iseli (c4chris))
Date: Thu, 27 Apr 2006 08:45:50 -0700
Subject: status-report-scripts parseBZbugList,1.32,1.33
Message-ID: <200604271545.k3RFjoc2007817@cvs-int.fedora.redhat.com>

Author: c4chris

Update of /cvs/fedora/status-report-scripts
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7799

Modified Files:
	parseBZbugList 
Log Message:
Remove leftover debug statements.


Index: parseBZbugList
===================================================================
RCS file: /cvs/fedora/status-report-scripts/parseBZbugList,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- parseBZbugList	27 Apr 2006 14:19:08 -0000	1.32
+++ parseBZbugList	27 Apr 2006 15:45:48 -0000	1.33
@@ -1196,9 +1196,7 @@
 sub checkDropped {
   my %D;
   for (my $i = $main::currel - 1; $i >= $main::firstrel; $i--) {
-    print STDERR "Checking core $i\n";
     foreach my $k (keys %{$CORE_R[$i]}) {
-      print STDERR " Checking package $k\n";
       unless ($SRPMS{$k} or $D{$k}) {
 	$CORE_DROPPED_SRPMS[$i]->{$k} = 1;
 	$D{$k} = 1;



From fedora-extras-commits at redhat.com  Thu Apr 27 15:54:52 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Thu, 27 Apr 2006 08:54:52 -0700
Subject: rpms/dnsmasq/FC-4 dnsmasq-2.30-enable-dbus.patch, NONE,
	1.1 dnsmasq-2.30-initscript.patch, NONE, 1.1 dnsmasq.spec, 1.1,
	1.2 dnsmasq-2.30-fedora-extras.patch, 1.1, NONE
Message-ID: <200604271554.k3RFssIB007964@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7889/FC-4

Modified Files:
	dnsmasq.spec 
Added Files:
	dnsmasq-2.30-enable-dbus.patch dnsmasq-2.30-initscript.patch 
Removed Files:
	dnsmasq-2.30-fedora-extras.patch 
Log Message:

Implementing request from upstream, unified spec/patchset, cleanup


dnsmasq-2.30-enable-dbus.patch:

--- NEW FILE dnsmasq-2.30-enable-dbus.patch ---
diff -urN dnsmasq-2.30/src/config.h dnsmasq-2.30-patched/src/config.h
--- dnsmasq-2.30/src/config.h	2006-04-23 13:27:20.000000000 -0500
+++ dnsmasq-2.30-patched/src/config.h	2006-04-26 13:43:54.000000000 -0500
@@ -168,7 +168,7 @@
 /* platform independent options- uncomment to enable */
 /* #define HAVE_BROKEN_RTC */
 /* #define HAVE_ISC_READER */
-/* #define HAVE_DBUS */
+#define HAVE_DBUS
 
 #if defined(HAVE_BROKEN_RTC) && defined(HAVE_ISC_READER)
 #  error HAVE_ISC_READER is not compatible with HAVE_BROKEN_RTC

dnsmasq-2.30-initscript.patch:

--- NEW FILE dnsmasq-2.30-initscript.patch ---
diff -urN dnsmasq-2.30/rpm/dnsmasq.rh dnsmasq-2.30-patched/rpm/dnsmasq.rh
--- dnsmasq-2.30/rpm/dnsmasq.rh	2006-04-23 08:26:21.000000000 -0500
+++ dnsmasq-2.30-patched/rpm/dnsmasq.rh	2006-04-24 15:06:01.000000000 -0500
@@ -2,7 +2,7 @@
 #
 # Startup script for the DNS caching server
 #
-# chkconfig: 2345 99 01
+# chkconfig: - 99 01
 # description: This script starts your DNS caching server
 # processname: dnsmasq
 # pidfile: /var/run/dnsmasq.pid


Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-4/dnsmasq.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dnsmasq.spec	25 Apr 2006 16:51:25 -0000	1.1
+++ dnsmasq.spec	27 Apr 2006 15:54:52 -0000	1.2
@@ -1,16 +1,19 @@
 Name:           dnsmasq
 Version:        2.30
-Release:        2%{?dist}
+Release:        3%{?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}-fedora-extras.patch
+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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if "%{dist}" != ".fc3"
 BuildRequires:  dbus-devel
+%endif
 
 Requires(post):	 /sbin/chkconfig
 Requires(post):  /sbin/service
@@ -31,6 +34,9 @@
 %prep
 %setup -q
 %patch0 -p1
+%if "%{dist}" != ".fc3"
+%patch1 -p1
+%endif
 
 %build
 make %{?_smp_mflags}
@@ -74,10 +80,15 @@
 
 
 %changelog
-* Mon Apr 24 2006 Patrick Laughton <jima at auroralinux.org> 2.30-2
+* Thu Apr 27 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 2.30-3
+- Un-enabled HAVE_ISC_READER, a hack to enable a deprecated feature (request)
+- Split initscript & enable-dbus patches, conditionalized dbus for FC3
+- Tweaked name field in changelog entries (trying to be consistent)
+
+* Mon Apr 24 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 2.30-2
 - Disabled stripping of binary while installing (oops)
 - Enabled HAVE_ISC_READER/HAVE_DBUS via patch
 - Added BuildReq for dbus-devel
 
-* Mon Apr 24 2006 Patrick Laughton <jima at auroralinux.org> 2.30-1
+* Mon Apr 24 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 2.30-1
 - Initial Fedora Extras RPM


--- dnsmasq-2.30-fedora-extras.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Apr 27 15:54:52 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Thu, 27 Apr 2006 08:54:52 -0700
Subject: rpms/dnsmasq/FC-5 dnsmasq-2.30-enable-dbus.patch, NONE,
	1.1 dnsmasq-2.30-initscript.patch, NONE, 1.1 dnsmasq.spec, 1.1,
	1.2 dnsmasq-2.30-fedora-extras.patch, 1.1, NONE
Message-ID: <200604271554.k3RFssMi007972@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7889/FC-5

Modified Files:
	dnsmasq.spec 
Added Files:
	dnsmasq-2.30-enable-dbus.patch dnsmasq-2.30-initscript.patch 
Removed Files:
	dnsmasq-2.30-fedora-extras.patch 
Log Message:

Implementing request from upstream, unified spec/patchset, cleanup


dnsmasq-2.30-enable-dbus.patch:

--- NEW FILE dnsmasq-2.30-enable-dbus.patch ---
diff -urN dnsmasq-2.30/src/config.h dnsmasq-2.30-patched/src/config.h
--- dnsmasq-2.30/src/config.h	2006-04-23 13:27:20.000000000 -0500
+++ dnsmasq-2.30-patched/src/config.h	2006-04-26 13:43:54.000000000 -0500
@@ -168,7 +168,7 @@
 /* platform independent options- uncomment to enable */
 /* #define HAVE_BROKEN_RTC */
 /* #define HAVE_ISC_READER */
-/* #define HAVE_DBUS */
+#define HAVE_DBUS
 
 #if defined(HAVE_BROKEN_RTC) && defined(HAVE_ISC_READER)
 #  error HAVE_ISC_READER is not compatible with HAVE_BROKEN_RTC

dnsmasq-2.30-initscript.patch:

--- NEW FILE dnsmasq-2.30-initscript.patch ---
diff -urN dnsmasq-2.30/rpm/dnsmasq.rh dnsmasq-2.30-patched/rpm/dnsmasq.rh
--- dnsmasq-2.30/rpm/dnsmasq.rh	2006-04-23 08:26:21.000000000 -0500
+++ dnsmasq-2.30-patched/rpm/dnsmasq.rh	2006-04-24 15:06:01.000000000 -0500
@@ -2,7 +2,7 @@
 #
 # Startup script for the DNS caching server
 #
-# chkconfig: 2345 99 01
+# chkconfig: - 99 01
 # description: This script starts your DNS caching server
 # processname: dnsmasq
 # pidfile: /var/run/dnsmasq.pid


Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-5/dnsmasq.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dnsmasq.spec	25 Apr 2006 16:51:25 -0000	1.1
+++ dnsmasq.spec	27 Apr 2006 15:54:52 -0000	1.2
@@ -1,16 +1,19 @@
 Name:           dnsmasq
 Version:        2.30
-Release:        2%{?dist}
+Release:        3%{?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}-fedora-extras.patch
+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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if "%{dist}" != ".fc3"
 BuildRequires:  dbus-devel
+%endif
 
 Requires(post):	 /sbin/chkconfig
 Requires(post):  /sbin/service
@@ -31,6 +34,9 @@
 %prep
 %setup -q
 %patch0 -p1
+%if "%{dist}" != ".fc3"
+%patch1 -p1
+%endif
 
 %build
 make %{?_smp_mflags}
@@ -74,10 +80,15 @@
 
 
 %changelog
-* Mon Apr 24 2006 Patrick Laughton <jima at auroralinux.org> 2.30-2
+* Thu Apr 27 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 2.30-3
+- Un-enabled HAVE_ISC_READER, a hack to enable a deprecated feature (request)
+- Split initscript & enable-dbus patches, conditionalized dbus for FC3
+- Tweaked name field in changelog entries (trying to be consistent)
+
+* Mon Apr 24 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 2.30-2
 - Disabled stripping of binary while installing (oops)
 - Enabled HAVE_ISC_READER/HAVE_DBUS via patch
 - Added BuildReq for dbus-devel
 
-* Mon Apr 24 2006 Patrick Laughton <jima at auroralinux.org> 2.30-1
+* Mon Apr 24 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 2.30-1
 - Initial Fedora Extras RPM


--- dnsmasq-2.30-fedora-extras.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Apr 27 15:54:53 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Thu, 27 Apr 2006 08:54:53 -0700
Subject: rpms/dnsmasq/devel dnsmasq-2.30-fedora-extras.patch,1.1,NONE
Message-ID: <200604271555.k3RFstYG007975@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7889/devel

Removed Files:
	dnsmasq-2.30-fedora-extras.patch 
Log Message:

Implementing request from upstream, unified spec/patchset, cleanup



--- dnsmasq-2.30-fedora-extras.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Apr 27 15:54:51 2006
From: fedora-extras-commits at redhat.com (Patrick Laughton (jima))
Date: Thu, 27 Apr 2006 08:54:51 -0700
Subject: rpms/dnsmasq/FC-3 dnsmasq-2.30-enable-dbus.patch, NONE,
	1.1 dnsmasq-2.30-initscript.patch, NONE, 1.1 dnsmasq.spec, 1.5,
	1.6 dnsmasq-2.30-fedora-extras.patch, 1.2, NONE
Message-ID: <200604271555.k3RFtNYd007978@cvs-int.fedora.redhat.com>

Author: jima

Update of /cvs/extras/rpms/dnsmasq/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7889/FC-3

Modified Files:
	dnsmasq.spec 
Added Files:
	dnsmasq-2.30-enable-dbus.patch dnsmasq-2.30-initscript.patch 
Removed Files:
	dnsmasq-2.30-fedora-extras.patch 
Log Message:

Implementing request from upstream, unified spec/patchset, cleanup


dnsmasq-2.30-enable-dbus.patch:

--- NEW FILE dnsmasq-2.30-enable-dbus.patch ---
diff -urN dnsmasq-2.30/src/config.h dnsmasq-2.30-patched/src/config.h
--- dnsmasq-2.30/src/config.h	2006-04-23 13:27:20.000000000 -0500
+++ dnsmasq-2.30-patched/src/config.h	2006-04-26 13:43:54.000000000 -0500
@@ -168,7 +168,7 @@
 /* platform independent options- uncomment to enable */
 /* #define HAVE_BROKEN_RTC */
 /* #define HAVE_ISC_READER */
-/* #define HAVE_DBUS */
+#define HAVE_DBUS
 
 #if defined(HAVE_BROKEN_RTC) && defined(HAVE_ISC_READER)
 #  error HAVE_ISC_READER is not compatible with HAVE_BROKEN_RTC

dnsmasq-2.30-initscript.patch:

--- NEW FILE dnsmasq-2.30-initscript.patch ---
diff -urN dnsmasq-2.30/rpm/dnsmasq.rh dnsmasq-2.30-patched/rpm/dnsmasq.rh
--- dnsmasq-2.30/rpm/dnsmasq.rh	2006-04-23 08:26:21.000000000 -0500
+++ dnsmasq-2.30-patched/rpm/dnsmasq.rh	2006-04-24 15:06:01.000000000 -0500
@@ -2,7 +2,7 @@
 #
 # Startup script for the DNS caching server
 #
-# chkconfig: 2345 99 01
+# chkconfig: - 99 01
 # description: This script starts your DNS caching server
 # processname: dnsmasq
 # pidfile: /var/run/dnsmasq.pid


Index: dnsmasq.spec
===================================================================
RCS file: /cvs/extras/rpms/dnsmasq/FC-3/dnsmasq.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- dnsmasq.spec	25 Apr 2006 22:19:50 -0000	1.5
+++ dnsmasq.spec	27 Apr 2006 15:54:51 -0000	1.6
@@ -1,15 +1,20 @@
 Name:           dnsmasq
 Version:        2.30
-Release:        2%{?dist}.3
+Release:        3%{?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}-fedora-extras.patch
+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
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if "%{dist}" != ".fc3"
+BuildRequires:  dbus-devel
+%endif
+
 Requires(post):	 /sbin/chkconfig
 Requires(post):  /sbin/service
 Requires(preun): /sbin/chkconfig
@@ -29,6 +34,9 @@
 %prep
 %setup -q
 %patch0 -p1
+%if "%{dist}" != ".fc3"
+%patch1 -p1
+%endif
 
 %build
 make %{?_smp_mflags}
@@ -72,13 +80,15 @@
 
 
 %changelog
-* Tue Apr 25 2006 Patrick Laughton <jima at auroralinux.org> 2.30-2.fc3.3
-- Removed dbus support for FC3 (dbus version apparently too old)
+* Thu Apr 27 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 2.30-3
+- Un-enabled HAVE_ISC_READER, a hack to enable a deprecated feature (request)
+- Split initscript & enable-dbus patches, conditionalized dbus for FC3
+- Tweaked name field in changelog entries (trying to be consistent)
 
-* Mon Apr 24 2006 Patrick Laughton <jima at auroralinux.org> 2.30-2
+* Mon Apr 24 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 2.30-2
 - Disabled stripping of binary while installing (oops)
 - Enabled HAVE_ISC_READER/HAVE_DBUS via patch
 - Added BuildReq for dbus-devel
 
-* Mon Apr 24 2006 Patrick Laughton <jima at auroralinux.org> 2.30-1
+* Mon Apr 24 2006 Patrick "Jima" Laughton <jima at auroralinux.org> 2.30-1
 - Initial Fedora Extras RPM


--- dnsmasq-2.30-fedora-extras.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Apr 27 16:13:31 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 09:13:31 -0700
Subject: owners owners.list,1.903,1.904
Message-ID: <200604271613.k3RGDX29010412@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10394

Modified Files:
	owners.list 
Log Message:
xmms-scrobbler added


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.903
retrieving revision 1.904
diff -u -r1.903 -r1.904
--- owners.list	27 Apr 2006 13:04:46 -0000	1.903
+++ owners.list	27 Apr 2006 16:13:31 -0000	1.904
@@ -1655,6 +1655,7 @@
 Fedora Extras|xmms-flac|XMMS plugin needed to play FLAC (Free Lossless Audio Codec) files|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-lirc|Plugin to use LIRC supported infrared devices in XMMS|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-modplug|Modplug Plugin for XMMS|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
+Fedora Extras|xmms-scrobbler|Audioscrobbler plugin for XMMS|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-sid|SIDPlay input plugin for X MultiMedia System (XMMS)|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-skins|Skins for the X MultiMedia System|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|xmms-speex|X MultiMedia System input plugin to play speex files|matthias at rpmforge.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Apr 27 16:14:39 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 09:14:39 -0700
Subject: rpms/xmms-scrobbler - New directory
Message-ID: <200604271614.k3RGEfM6010498@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/xmms-scrobbler
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10472/xmms-scrobbler

Log Message:
Directory /cvs/extras/rpms/xmms-scrobbler added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 27 16:14:39 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 09:14:39 -0700
Subject: rpms/xmms-scrobbler/devel - New directory
Message-ID: <200604271614.k3RGEfkJ010502@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/xmms-scrobbler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10472/xmms-scrobbler/devel

Log Message:
Directory /cvs/extras/rpms/xmms-scrobbler/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 27 16:15:00 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 09:15:00 -0700
Subject: rpms/xmms-scrobbler/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604271615.k3RGF2vS010562@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/xmms-scrobbler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10531/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module xmms-scrobbler


--- 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 Apr 27 16:15:00 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 09:15:00 -0700
Subject: rpms/xmms-scrobbler Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604271615.k3RGF247010559@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/xmms-scrobbler
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10531

Added Files:
	Makefile import.log 
Log Message:
Setup of module xmms-scrobbler


--- NEW FILE Makefile ---
# Top level Makefile for module xmms-scrobbler
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 27 16:15:38 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 09:15:38 -0700
Subject: rpms/xmms-scrobbler import.log,1.1,1.2
Message-ID: <200604271615.k3RGFek1010639@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/xmms-scrobbler
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10606

Modified Files:
	import.log 
Log Message:
auto-import xmms-scrobbler-0.3.6-2 on branch devel from xmms-scrobbler-0.3.6-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/xmms-scrobbler/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	27 Apr 2006 16:14:59 -0000	1.1
+++ import.log	27 Apr 2006 16:15:38 -0000	1.2
@@ -0,0 +1 @@
+xmms-scrobbler-0_3_6-2:HEAD:xmms-scrobbler-0.3.6-2.src.rpm:1146154530



From fedora-extras-commits at redhat.com  Thu Apr 27 16:15:39 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 09:15:39 -0700
Subject: rpms/xmms-scrobbler/devel xmms-scrobbler.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604271615.k3RGFfLc010644@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/xmms-scrobbler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10606/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xmms-scrobbler.spec 
Log Message:
auto-import xmms-scrobbler-0.3.6-2 on branch devel from xmms-scrobbler-0.3.6-2.src.rpm


--- NEW FILE xmms-scrobbler.spec ---
%define xmms_plugindir %(xmms-config --general-plugin-dir 2>/dev/null || echo %{_libdir}/xmms/General)

Summary: Audioscrobbler plugin for XMMS
Name: xmms-scrobbler
Version: 0.3.6
Release: 2%{?dist}
License: GPL
Group: Applications/Multimedia
URL: http://www.last.fm/downloads.php
Source:  http://static.last.fm/plugins/xmms-scrobbler-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: xmms >= 1.2.4
BuildRequires: xmms-devel >= 1.2.4, libmusicbrainz-devel >= 2.0.0, curl-devel

%description
This is a audioscrobbler xmms plugin.
Audioscrobbler will send the name of every song you play on your computer
to Last.fm. This effortlessly populates your profile to play radio you like
and make personalised recommendations!

%prep
%setup -q


%build
%configure \
	--disable-bmp-plugin \
	--libdir=%{xmms_plugindir} \

make %{?_smp_mflags}


%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}

find %{buildroot} -name '*.la' -exec rm -f {} \;

%clean
rm -rf %{buildroot}


%files
%defattr(-, root, root, -)
%doc AUTHORS ChangeLog COPYING README README.tags KnownIssues TODO
%{xmms_plugindir}/libxmms_scrobbler.so


%changelog
* Thu Apr 27 2006 Andreas Thienemann <andreas at bawue.net> 0.3.6-2
- Fixed permissions

* Mon Apr 24 2006 Andreas Thienemann <andreas at bawue.net> 0.3.6-1
- Initial FE package


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xmms-scrobbler/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2006 16:15:00 -0000	1.1
+++ .cvsignore	27 Apr 2006 16:15:38 -0000	1.2
@@ -0,0 +1 @@
+xmms-scrobbler-0.3.6.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmms-scrobbler/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2006 16:15:00 -0000	1.1
+++ sources	27 Apr 2006 16:15:39 -0000	1.2
@@ -0,0 +1 @@
+eb5b53815eb91f5294f76ca424369b7f  xmms-scrobbler-0.3.6.tar.bz2



From fedora-extras-commits at redhat.com  Thu Apr 27 16:16:55 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu, 27 Apr 2006 09:16:55 -0700
Subject: rpms/gtkhtml36 - New directory
Message-ID: <200604271616.k3RGGvWr010795@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gtkhtml36
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10769/gtkhtml36

Log Message:
Directory /cvs/extras/rpms/gtkhtml36 added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 27 16:16:56 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu, 27 Apr 2006 09:16:56 -0700
Subject: rpms/gtkhtml36/devel - New directory
Message-ID: <200604271617.k3RGGwR9010798@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gtkhtml36/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10769/gtkhtml36/devel

Log Message:
Directory /cvs/extras/rpms/gtkhtml36/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 27 16:17:31 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu, 27 Apr 2006 09:17:31 -0700
Subject: rpms/gtkhtml36 Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604271617.k3RGHXS3010885@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gtkhtml36
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10850

Added Files:
	Makefile import.log 
Log Message:
Setup of module gtkhtml36


--- NEW FILE Makefile ---
# Top level Makefile for module gtkhtml36
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 27 16:17:32 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu, 27 Apr 2006 09:17:32 -0700
Subject: rpms/gtkhtml36/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604271617.k3RGHYVA010886@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gtkhtml36/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10850/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gtkhtml36


--- 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 Apr 27 16:17:47 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Thu, 27 Apr 2006 09:17:47 -0700
Subject: rpms/tetex-dvipost - New directory
Message-ID: <200604271617.k3RGHnXf010934@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/tetex-dvipost
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10908/tetex-dvipost

Log Message:
Directory /cvs/extras/rpms/tetex-dvipost added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 27 16:17:47 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Thu, 27 Apr 2006 09:17:47 -0700
Subject: rpms/tetex-dvipost/devel - New directory
Message-ID: <200604271617.k3RGHnZA010937@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/tetex-dvipost/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10908/tetex-dvipost/devel

Log Message:
Directory /cvs/extras/rpms/tetex-dvipost/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 27 16:18:03 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Thu, 27 Apr 2006 09:18:03 -0700
Subject: rpms/tetex-dvipost Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604271618.k3RGI5xg010994@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/tetex-dvipost
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10958

Added Files:
	Makefile import.log 
Log Message:
Setup of module tetex-dvipost


--- NEW FILE Makefile ---
# Top level Makefile for module tetex-dvipost
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 27 16:18:04 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Thu, 27 Apr 2006 09:18:04 -0700
Subject: rpms/tetex-dvipost/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604271618.k3RGI62K010998@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/tetex-dvipost/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10958/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module tetex-dvipost


--- 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 Apr 27 16:18:44 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Thu, 27 Apr 2006 09:18:44 -0700
Subject: rpms/tetex-dvipost import.log,1.1,1.2
Message-ID: <200604271618.k3RGIkf0011066@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/tetex-dvipost
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11032

Modified Files:
	import.log 
Log Message:
auto-import tetex-dvipost-1.1-4 on branch devel from tetex-dvipost-1.1-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/tetex-dvipost/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	27 Apr 2006 16:18:03 -0000	1.1
+++ import.log	27 Apr 2006 16:18:44 -0000	1.2
@@ -0,0 +1 @@
+tetex-dvipost-1_1-4:HEAD:tetex-dvipost-1.1-4.src.rpm:1146154714



From fedora-extras-commits at redhat.com  Thu Apr 27 16:18:45 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Thu, 27 Apr 2006 09:18:45 -0700
Subject: rpms/tetex-dvipost/devel tetex-dvipost-destdir.patch, NONE,
	1.1 tetex-dvipost.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200604271618.k3RGIlpd011073@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/rpms/tetex-dvipost/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11032/devel

Modified Files:
	.cvsignore sources 
Added Files:
	tetex-dvipost-destdir.patch tetex-dvipost.spec 
Log Message:
auto-import tetex-dvipost-1.1-4 on branch devel from tetex-dvipost-1.1-4.src.rpm

tetex-dvipost-destdir.patch:

--- NEW FILE tetex-dvipost-destdir.patch ---
diff -ur dvipost-1.1/Makefile.in dvipost-new/Makefile.in
--- dvipost-1.1/Makefile.in	2006-03-23 04:47:44.000000000 +0000
+++ dvipost-new/Makefile.in	2006-04-26 17:07:42.000000000 +0100
@@ -27,14 +27,14 @@
 INSTALL_PROGRAM= @INSTALL_PROGRAM@
 INSTALL_DATA= @INSTALL_DATA@
 
-BIN=	@bindir@
+BIN=	$(DESTDIR)@bindir@
 
 # Directory to install LaTeX styles
 
-LATEX=	@texpath@
+LATEX=	$(DESTDIR)@texpath@
 
 MANEXT=	1
-MANDIR=	@mandir@/man$(MANEXT)
+MANDIR=	$(DESTDIR)@mandir@/man$(MANEXT)
 
 # Install names
 
@@ -92,6 +92,7 @@
 	for p in $(NAME) $(ALIAS); do rm -f $(BIN)/$$p; done
 
 install-exec: uninstall-exec
+	mkdir -p $(BIN)
 	$(INSTALL_PROGRAM) $(NAME) $(BIN)/$(NAME)
 	(cd $(BIN); for p in $(ALIAS); do rm -f $$p; $(LN) $(NAME) $$p; done)
 
@@ -99,6 +100,7 @@
 	for p in $(NAME) $(ALIAS); do rm -f $(MANDIR)/$$p.$(MANEXT); done
 
 install-man: uninstall-man
+	mkdir -p $(MANDIR)
 	$(INSTALL_DATA) dvipost.man $(MANDIR)/$(NAME).$(MANEXT)
 	(cd $(MANDIR); for p in $(ALIAS); \
 		do rm -f $$p.$(MANEXT); \
@@ -107,11 +109,12 @@
 
 uninstall-data:
 	for p in $(FILES); do rm -f $(LATEX)/$$p; done
-	texhash
+	#texhash
 
 install-data: uninstall-data
+	mkdir -p $(LATEX)
 	for p in $(FILES); do $(INSTALL_DATA) $$p $(LATEX)/$$p; done
-	texhash
+	#texhash
 
 distclean:: clean
 	rm -f config.cache config.log config.status Makefile


--- NEW FILE tetex-dvipost.spec ---
%define real_name dvipost
%define texmf	%{_datadir}/texmf

Name:           tetex-%{real_name}
Version:        1.1
Release:        4%{?dist}
Summary:        LaTeX post filter command to support change bars and overstrike mode

Group:          Applications/Publishing
License:        GPL
URL:            http://efeu.cybertec.at/
Source0:        http://efeu.cybertec.at/%{real_name}.tar.gz
Patch0:		%{name}-destdir.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  tetex
BuildRequires:	tetex-latex

Requires:       tetex
Requires:	tetex-fonts
Requires:	tetex-latex

%description
The command dvipost is a post procesor for dvi files, created by latex
or tex. It is used for special modes, which normally needs the support
of dvi drivers (such as dvips). With dvipost, this features could be
implemented independent of the preferred driver. Currently, the post
processor supports layout raster, change bars and overstrike mode.

%prep
%setup -q -n %{real_name}-%{version}
%patch0 -p1


%build
%configure
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT


%clean
rm -rf $RPM_BUILD_ROOT


%post -p /usr/bin/texhash


%postun -p /usr/bin/texhash


%files
%defattr(-,root,root,-)
%{_bindir}/*
%{texmf}/tex/latex/misc/*

%doc README COPYING NOTES dvipost.html
%{_mandir}/man*/*


%changelog
* Thu Apr 27 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1-4
- Rename package to tetex-dvipost

* Thu Apr 27 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1-3
- Capitalize Summary, fix spell error in description, rework
  invocation of post and postun calls (thanks to Patrice Dumas)
- Add tetex-latex to Requires and BuildRequires.
- Add tetex-fonts to Requires to satisfy direct dependency on texhash

* Thu Apr 27 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1-2
- Add new entries to %%doc and expand description

* Wed Apr 26 2006 Jos?? Matos <jamatos at fc.up.pt> - 1.1-1
- First build



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/tetex-dvipost/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2006 16:18:04 -0000	1.1
+++ .cvsignore	27 Apr 2006 16:18:45 -0000	1.2
@@ -0,0 +1 @@
+dvipost.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/tetex-dvipost/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2006 16:18:04 -0000	1.1
+++ sources	27 Apr 2006 16:18:45 -0000	1.2
@@ -0,0 +1 @@
+2ec79283a8348312bc72831ca80ae3a2  dvipost.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 16:19:19 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu, 27 Apr 2006 09:19:19 -0700
Subject: rpms/gtkhtml36 import.log,1.1,1.2
Message-ID: <200604271619.k3RGJLNg011151@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gtkhtml36
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11117

Modified Files:
	import.log 
Log Message:
auto-import gtkhtml36-3.6.2-3.fc5 on branch devel from gtkhtml36-3.6.2-3.fc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gtkhtml36/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	27 Apr 2006 16:17:31 -0000	1.1
+++ import.log	27 Apr 2006 16:19:19 -0000	1.2
@@ -0,0 +1 @@
+gtkhtml36-3_6_2-3_fc5:HEAD:gtkhtml36-3.6.2-3.fc5.src.rpm:1146154742



From fedora-extras-commits at redhat.com  Thu Apr 27 16:19:20 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu, 27 Apr 2006 09:19:20 -0700
Subject: rpms/gtkhtml36/devel gtkhtml-3.3.0-crash.patch, NONE,
	1.1 gtkhtml36.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604271619.k3RGJM1R011158@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gtkhtml36/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11117/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gtkhtml-3.3.0-crash.patch gtkhtml36.spec 
Log Message:
auto-import gtkhtml36-3.6.2-3.fc5 on branch devel from gtkhtml36-3.6.2-3.fc5.src.rpm

gtkhtml-3.3.0-crash.patch:

--- NEW FILE gtkhtml-3.3.0-crash.patch ---
--- gtkhtml-3.3.0/src/htmlclue.c.crash	2004-08-13 15:52:27.777093526 +0100
+++ gtkhtml-3.3.0/src/htmlclue.c	2004-08-13 15:52:29.494761807 +0100
@@ -149,7 +149,7 @@
 		last = html_object_prev_not_slave (last);
 
 	g_assert (o->parent == self);
-	g_assert (last->parent == self);
+	g_assert (!last || last->parent == self);
 
 	while (o) {
 		cnext = html_object_next_not_slave (o);


--- NEW FILE gtkhtml36.spec ---
%define gtkhtml_major 3.6
%define libgnomeprint_version 2.7.1
%define gnome_icon_theme_version 1.2.3

Summary:       GtkHTML 3.6 Compatibility Library
Name:          gtkhtml36
Version:       3.6.2
Release:       3%{?dist}
License:       LGPL/GPL
Group:         System Environment/Libraries
Url:           http://www.gnome.org/
Source:        ftp://ftp.gnome.org/pub/GNOME/sources/gtkhtml/3.6/gtkhtml-%{version}.tar.bz2
BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libgnomeui-devel
BuildRequires: libgnomeprintui22-devel >= %{libgnomeprint_version}
BuildRequires: gail-devel
BuildRequires: libtool, gettext
BuildRequires: gnome-icon-theme >= %{gnome_icon_theme_version}
Requires:      gnome-icon-theme >= %{gnome_icon_theme_version}

# Partial band-aid for an editing crash (bug #129844)
# http://bugzilla.ximian.com/show_bug.cgi?id=50052
Patch1:        gtkhtml-3.3.0-crash.patch


%description
GtkHTML is a lightweight HTML rendering/printing/editing engine.  It
was originally based on KHTMLW, but is now being developed
independently of it.

This package provides GtkHTML 3.6 for software that has not yet been
ported to GtkHTML 3.8.

%package devel
Summary:       Libraries, includes, etc. to develop gtkhtml applications
Group:         Development/Libraries
Requires:      %{name} = %{version}-%{release}
Requires:      libgnomeui-devel
Requires:      libgnomeprintui22-devel >= 2.2.1

%description devel
Libraries and include files that can be used to develop GtkHTML applications
that require GtkHTML 3.6

%prep
%setup -q -n gtkhtml-%{version}

%patch1 -p1 -b .crash


%build
%configure
export tagname=CC
make LIBTOOL=%{_bindir}/libtool

%install
rm -rf $RPM_BUILD_ROOT
export tagname=CC
%makeinstall LIBTOOL=/usr/bin/libtool

rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/gtkhtml/*.la
# configure doesn't seem to respect the --disable-static flag
rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
rm -f $RPM_BUILD_ROOT%{_libdir}/gtkhtml/*.a

%find_lang gtkhtml-%{gtkhtml_major}

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files -f gtkhtml-%{gtkhtml_major}.lang
%defattr(-,root,root,-)
%doc AUTHORS BUGS ChangeLog NEWS README COPYING COPYING.LIB TODO
%{_libdir}/*.so.*
%dir %{_libdir}/gtkhtml
%{_libdir}/gtkhtml/*.so
%{_libdir}/bonobo/servers/*.server
%{_datadir}/gtkhtml-%{gtkhtml_major}

%files devel
%defattr(-,root,root,-)
%{_includedir}/libgtkhtml-%{gtkhtml_major}
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc

%changelog
* Wed Apr 26 2006 Michael A. Peters <mpeters at mac.com> - 3.6.2-3
- Fixed issues in bugzilla 171314 comment 9

* Tue Apr 25 2006 Michael A. Peters <mpeters at mac.com> - 3.6.2-2
- Don't build static libs
- Change name to gtkhtml36 per packaging guidelines

* Thu Oct 20 2005 Michael A. Peters <mpeters at mac.com> - 3.6.2-1
- Created spec file based on Fedora Core 4 gtkhtml3-3.6.2-1
- spec file - changed name to compat-gtkhtml36
- removed redundant BuildRequires
- removed redundant Requires on devel package
- removed explicit libgnomeprint22 Requires (rpm picks up library)
- Added Url tag (rpmlint), Capitalized Summary (rpmlint), aligned
-  package metadata


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gtkhtml36/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2006 16:17:32 -0000	1.1
+++ .cvsignore	27 Apr 2006 16:19:20 -0000	1.2
@@ -0,0 +1 @@
+gtkhtml-3.6.2.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gtkhtml36/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2006 16:17:32 -0000	1.1
+++ sources	27 Apr 2006 16:19:20 -0000	1.2
@@ -0,0 +1 @@
+37465fde0f1e1d7ba2284c5a4fd06fe7  gtkhtml-3.6.2.tar.bz2



From fedora-extras-commits at redhat.com  Thu Apr 27 16:23:24 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu, 27 Apr 2006 09:23:24 -0700
Subject: owners owners.list,1.904,1.905
Message-ID: <200604271623.k3RGNQEm011241@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11221

Modified Files:
	owners.list 
Log Message:
ownership of gtkhtml36



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.904
retrieving revision 1.905
diff -u -r1.904 -r1.905
--- owners.list	27 Apr 2006 16:13:31 -0000	1.904
+++ owners.list	27 Apr 2006 16:23:24 -0000	1.905
@@ -434,6 +434,7 @@
 Fedora Extras|GtkAda|An Ada95 graphical toolkit based on Gtk+|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|gtkglarea2|An OpenGL GTK widget|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|rc040203 at freenet.de
 Fedora Extras|gtkglext|OpenGL Extension to GTK|rc040203 at freenet.de|extras-qa at fedoraproject.org|
+Fedora Extras|gtkhtml36|GtkHTML 3.6 Compatibility Library|mpeters at mac.com|extras-qa at fedoraproject.org|
 Fedora Extras|gtkmathview|Library for rendering MathML documents|uwog at uwog.net|extras-qa at fedoraproject.org|
 Fedora Extras|gtkmm20|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|
 Fedora Extras|gtkmm24|A C++ interface for GTK2 (a GUI library for X)|denis at poolshark.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Apr 27 16:31:57 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 09:31:57 -0700
Subject: rpms/ser/FC-4 ser.spec,1.2,1.3
Message-ID: <200604271631.k3RGVxh4011346@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ser/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11301/FC-4

Modified Files:
	ser.spec 
Log Message:
bump to same nvr accross all releases


Index: ser.spec
===================================================================
RCS file: /cvs/extras/rpms/ser/FC-4/ser.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ser.spec	30 Mar 2006 16:34:30 -0000	1.2
+++ ser.spec	27 Apr 2006 16:31:56 -0000	1.3
@@ -1,10 +1,14 @@
 %define special_modules mysql jabber cpl-c postgres pa
 %define serweb_version 0.9.4
 
+%if "%{fedora}" >= "4"
+   %define serweb true
+%endif
+
 Summary: SIP Express Router
 Name: ser
 Version: 0.9.6
-Release: 4%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://ftp.iptel.org/pub/ser/latest/src/ser-%{version}_src.tar.gz
@@ -136,6 +140,8 @@
 ls README.* | grep -v -E '(mysql|postgres)' | sed -e 's/\(.*\)/%doc \1/' >> filelist
 
 # serweb configuration
+%if "%{serweb}" == "true"
+
 mkdir -p %{buildroot}%{_datadir}/serweb
 mkdir -p %{buildroot}%{_sysconfdir}/ser/serweb
 find serweb-%{serweb_version} -name '.cvsignore' -exec rm -f {} \;
@@ -145,6 +151,8 @@
 cp -rP serweb-%{serweb_version}/config/* %{buildroot}%{_sysconfdir}/ser/serweb/
 install -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/serweb.conf
 
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -191,16 +199,27 @@
 %{_libdir}/ser/modules/postgres.so
 %{_sbindir}/serpgctl
 
+# Only package, if dependencies can be met
+%if "%{serweb}" == "true"
+
 %files serweb
 %defattr(-,root,root,-)
 %doc serweb-%{serweb_version}/README serweb-%{serweb_version}/INSTALL serweb-%{serweb_version}/COPYING serweb-%{serweb_version}/CHANGELOG
 %dir %{_datadir}/serweb
 %{_datadir}/serweb/*
 %dir %{_sysconfdir}/ser/serweb
-%config(noreplace) %{_sysconfdir}/ser/serweb/*.php
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/serweb.conf
+%config(noreplace) %{_sysconfdir}/ser/serweb/*.php
+
+%endif
 
 %changelog
+* Thu Apr 01 2006 Andreas Thienemann <andreas at bawue.net> 0.9.6-6
+- *bump*
+
+* Thu Apr 01 2006 Andreas Thienemann <andreas at bawue.net> 0.9.6-5
+- Do not package serweb for FC-3, as we do not have MySQL 4
+
 * Thu Mar 30 2006 Andreas Thienemann <andreas at bawue.net> 0.9.6-4
 - Fix buildissue with %%{_libdir}
 



From fedora-extras-commits at redhat.com  Thu Apr 27 16:31:58 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 09:31:58 -0700
Subject: rpms/ser/devel ser.spec,1.3,1.4
Message-ID: <200604271632.k3RGW0ar011352@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ser/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11301/devel

Modified Files:
	ser.spec 
Log Message:
bump to same nvr accross all releases


Index: ser.spec
===================================================================
RCS file: /cvs/extras/rpms/ser/devel/ser.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ser.spec	30 Mar 2006 16:03:53 -0000	1.3
+++ ser.spec	27 Apr 2006 16:31:58 -0000	1.4
@@ -1,10 +1,14 @@
 %define special_modules mysql jabber cpl-c postgres pa
 %define serweb_version 0.9.4
 
+%if "%{fedora}" >= "4"
+   %define serweb true
+%endif
+
 Summary: SIP Express Router
 Name: ser
 Version: 0.9.6
-Release: 4%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://ftp.iptel.org/pub/ser/latest/src/ser-%{version}_src.tar.gz
@@ -136,6 +140,8 @@
 ls README.* | grep -v -E '(mysql|postgres)' | sed -e 's/\(.*\)/%doc \1/' >> filelist
 
 # serweb configuration
+%if "%{serweb}" == "true"
+
 mkdir -p %{buildroot}%{_datadir}/serweb
 mkdir -p %{buildroot}%{_sysconfdir}/ser/serweb
 find serweb-%{serweb_version} -name '.cvsignore' -exec rm -f {} \;
@@ -145,6 +151,8 @@
 cp -rP serweb-%{serweb_version}/config/* %{buildroot}%{_sysconfdir}/ser/serweb/
 install -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/serweb.conf
 
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -191,16 +199,27 @@
 %{_libdir}/ser/modules/postgres.so
 %{_sbindir}/serpgctl
 
+# Only package, if dependencies can be met
+%if "%{serweb}" == "true"
+
 %files serweb
 %defattr(-,root,root,-)
 %doc serweb-%{serweb_version}/README serweb-%{serweb_version}/INSTALL serweb-%{serweb_version}/COPYING serweb-%{serweb_version}/CHANGELOG
 %dir %{_datadir}/serweb
 %{_datadir}/serweb/*
 %dir %{_sysconfdir}/ser/serweb
-%config(noreplace) %{_sysconfdir}/ser/serweb/*.php
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/serweb.conf
+%config(noreplace) %{_sysconfdir}/ser/serweb/*.php
+
+%endif
 
 %changelog
+* Thu Apr 01 2006 Andreas Thienemann <andreas at bawue.net> 0.9.6-6
+- *bump*
+
+* Thu Apr 01 2006 Andreas Thienemann <andreas at bawue.net> 0.9.6-5
+- Do not package serweb for FC-3, as we do not have MySQL 4
+
 * Thu Mar 30 2006 Andreas Thienemann <andreas at bawue.net> 0.9.6-4
 - Fix buildissue with %%{_libdir}
 



From fedora-extras-commits at redhat.com  Thu Apr 27 16:31:57 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 09:31:57 -0700
Subject: rpms/ser/FC-5 ser.spec,1.2,1.3
Message-ID: <200604271632.k3RGVxrV011350@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ser/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11301/FC-5

Modified Files:
	ser.spec 
Log Message:
bump to same nvr accross all releases


Index: ser.spec
===================================================================
RCS file: /cvs/extras/rpms/ser/FC-5/ser.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ser.spec	30 Mar 2006 16:34:31 -0000	1.2
+++ ser.spec	27 Apr 2006 16:31:57 -0000	1.3
@@ -1,10 +1,14 @@
 %define special_modules mysql jabber cpl-c postgres pa
 %define serweb_version 0.9.4
 
+%if "%{fedora}" >= "4"
+   %define serweb true
+%endif
+
 Summary: SIP Express Router
 Name: ser
 Version: 0.9.6
-Release: 4%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: System Environment/Daemons
 Source0: http://ftp.iptel.org/pub/ser/latest/src/ser-%{version}_src.tar.gz
@@ -136,6 +140,8 @@
 ls README.* | grep -v -E '(mysql|postgres)' | sed -e 's/\(.*\)/%doc \1/' >> filelist
 
 # serweb configuration
+%if "%{serweb}" == "true"
+
 mkdir -p %{buildroot}%{_datadir}/serweb
 mkdir -p %{buildroot}%{_sysconfdir}/ser/serweb
 find serweb-%{serweb_version} -name '.cvsignore' -exec rm -f {} \;
@@ -145,6 +151,8 @@
 cp -rP serweb-%{serweb_version}/config/* %{buildroot}%{_sysconfdir}/ser/serweb/
 install -D -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/httpd/conf.d/serweb.conf
 
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -191,16 +199,27 @@
 %{_libdir}/ser/modules/postgres.so
 %{_sbindir}/serpgctl
 
+# Only package, if dependencies can be met
+%if "%{serweb}" == "true"
+
 %files serweb
 %defattr(-,root,root,-)
 %doc serweb-%{serweb_version}/README serweb-%{serweb_version}/INSTALL serweb-%{serweb_version}/COPYING serweb-%{serweb_version}/CHANGELOG
 %dir %{_datadir}/serweb
 %{_datadir}/serweb/*
 %dir %{_sysconfdir}/ser/serweb
-%config(noreplace) %{_sysconfdir}/ser/serweb/*.php
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/serweb.conf
+%config(noreplace) %{_sysconfdir}/ser/serweb/*.php
+
+%endif
 
 %changelog
+* Thu Apr 01 2006 Andreas Thienemann <andreas at bawue.net> 0.9.6-6
+- *bump*
+
+* Thu Apr 01 2006 Andreas Thienemann <andreas at bawue.net> 0.9.6-5
+- Do not package serweb for FC-3, as we do not have MySQL 4
+
 * Thu Mar 30 2006 Andreas Thienemann <andreas at bawue.net> 0.9.6-4
 - Fix buildissue with %%{_libdir}
 



From fedora-extras-commits at redhat.com  Thu Apr 27 16:36:02 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 09:36:02 -0700
Subject: rpms/xmms-scrobbler/devel .cvsignore, 1.2, 1.3 sources, 1.2,
	1.3 xmms-scrobbler.spec, 1.1, 1.2
Message-ID: <200604271636.k3RGa4JW011513@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/xmms-scrobbler/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11492

Modified Files:
	.cvsignore sources xmms-scrobbler.spec 
Log Message:
* Thu Apr 27 2006 Andreas Thienemann <andreas at bawue.net> 0.3.8-1
- Updated to 0.3.8



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xmms-scrobbler/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	27 Apr 2006 16:15:38 -0000	1.2
+++ .cvsignore	27 Apr 2006 16:36:01 -0000	1.3
@@ -1 +1 @@
-xmms-scrobbler-0.3.6.tar.bz2
+xmms-scrobbler-0.3.8.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xmms-scrobbler/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	27 Apr 2006 16:15:39 -0000	1.2
+++ sources	27 Apr 2006 16:36:01 -0000	1.3
@@ -1 +1 @@
-eb5b53815eb91f5294f76ca424369b7f  xmms-scrobbler-0.3.6.tar.bz2
+4ec7486e221485231072a48d9ac8d478  xmms-scrobbler-0.3.8.tar.bz2


Index: xmms-scrobbler.spec
===================================================================
RCS file: /cvs/extras/rpms/xmms-scrobbler/devel/xmms-scrobbler.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xmms-scrobbler.spec	27 Apr 2006 16:15:39 -0000	1.1
+++ xmms-scrobbler.spec	27 Apr 2006 16:36:01 -0000	1.2
@@ -2,12 +2,12 @@
 
 Summary: Audioscrobbler plugin for XMMS
 Name: xmms-scrobbler
-Version: 0.3.6
-Release: 2%{?dist}
+Version: 0.3.8
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Multimedia
 URL: http://www.last.fm/downloads.php
-Source:  http://static.last.fm/plugins/xmms-scrobbler-%{version}.tar.bz2
+Source: http://www.pipian.com/stuffforchat/xmms-scrobbler-%{version}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: xmms >= 1.2.4
 BuildRequires: xmms-devel >= 1.2.4, libmusicbrainz-devel >= 2.0.0, curl-devel
@@ -47,6 +47,9 @@
 
 
 %changelog
+* Thu Apr 27 2006 Andreas Thienemann <andreas at bawue.net> 0.3.8-1
+- Updated to 0.3.8
+
 * Thu Apr 27 2006 Andreas Thienemann <andreas at bawue.net> 0.3.6-2
 - Fixed permissions
 



From fedora-extras-commits at redhat.com  Thu Apr 27 16:45:41 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 27 Apr 2006 09:45:41 -0700
Subject: rpms/thinkpad-kmod/devel kmodtool, 1.4, 1.5 thinkpad-kmod.spec, 1.7,
	1.8
Message-ID: <200604271646.k3RGkDNQ011761@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/thinkpad-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11722/devel

Modified Files:
	kmodtool thinkpad-kmod.spec 
Log Message:
* Thu Apr 27 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.9-5
- Provide "kernel-modules" instead of "kernel-module" to match yum's config.
- s/%{kver}/%{kversion}/ for consistency with other vars.
- Allow specifying %{kversion} and %{kvariants} externally.



Index: kmodtool
===================================================================
RCS file: /cvs/extras/rpms/thinkpad-kmod/devel/kmodtool,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kmodtool	24 Mar 2006 21:17:32 -0000	1.4
+++ kmodtool	27 Apr 2006 16:45:41 -0000	1.5
@@ -24,7 +24,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 myprog="kmodtool"
-myver="0.10.6"
+myver="0.10.7"
 knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen[0U]\)'
 kmod_name=
 kver=
@@ -67,7 +67,7 @@
 %package       -n kmod-${kmod_name}${dashvariant}
 Summary:          ${kmod_name} kernel module(s)
 Group:            System Environment/Kernel
-Provides:         kernel-module = ${verrel}${variant}
+Provides:         kernel-modules = ${verrel}${variant}
 Provides:         kmod-${kmod_name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:         ${kdep}
 Requires:         ${kmod_name}-kmod-common = %{?epoch:%{epoch}:}%{version}


Index: thinkpad-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/thinkpad-kmod/devel/thinkpad-kmod.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- thinkpad-kmod.spec	15 Mar 2006 20:23:25 -0000	1.7
+++ thinkpad-kmod.spec	27 Apr 2006 16:45:41 -0000	1.8
@@ -3,22 +3,23 @@
 %define   kmodtool sh %{SOURCE10}
 # end stuff to be ...
 
-# temporarily hardcoded:
-%define kver      2.6.15-1.2054_FC5
+%{?kversion: %define kversion 2.6.16-1.2096_FC5}
+
+%define kmod_name lirc
+%define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
+
+%define upvar ""
 %ifarch i686
-%define kvariants "" xen0
-%else
-%define kvariants ""
+%define xenvar xen0
+%define kdumpvar kdump
 %endif
+%{!?kvariants: %define kvariants %{?upvar} %{?xenvar} %{?kdumpvar}}
 
-                %define kmod_name thinkpad
-                %define kverrel   %(%{kmodtool} verrel  %{?kver} 2>/dev/null)
-%{!?kvariants:  %global kvariants %(%{kmodtool} variant %{?kver} 2>/dev/null)}
 
 Name:           %{kmod_name}-kmod
 Summary:        %{kmod_name} kernel modules
 Version:        5.9
-Release:        4.%(echo %{kverrel} | tr - _)
+Release:        5.%(echo %{kverrel} | tr - _)
 
 URL:            http://tpctl.sourceforge.net/
 Source0:        http://download.sf.net/tpctl/thinkpad-%{version}.tar.gz
@@ -33,14 +34,9 @@
 %description
 This package provides %{kmod_name} kernel modules.
 
-# 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 -T -c -a 0
 %patch0 -p0
 sed -i /enable_thinkpadpm/d %{kmod_name}-%{version}/2.6/drivers/thinkpad.c
@@ -69,6 +65,11 @@
 
 
 %changelog
+* Thu Apr 27 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.9-5
+- Provide "kernel-modules" instead of "kernel-module" to match yum's config.
+- s/%%{kver}/%%{kversion}/ for consistency with other vars.
+- Allow specifying %%{kversion} and %%{kvariants} externally.
+
 * Wed Mar 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.9-4
 - Drop xenU.
 



From fedora-extras-commits at redhat.com  Thu Apr 27 16:45:40 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 27 Apr 2006 09:45:40 -0700
Subject: rpms/thinkpad-kmod/FC-5 kmodtool, 1.3, 1.4 thinkpad-kmod.spec, 1.7,
	1.8
Message-ID: <200604271646.k3RGkCnO011757@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/thinkpad-kmod/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11722/FC-5

Modified Files:
	kmodtool thinkpad-kmod.spec 
Log Message:
* Thu Apr 27 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.9-5
- Provide "kernel-modules" instead of "kernel-module" to match yum's config.
- s/%{kver}/%{kversion}/ for consistency with other vars.
- Allow specifying %{kversion} and %{kvariants} externally.



Index: kmodtool
===================================================================
RCS file: /cvs/extras/rpms/thinkpad-kmod/FC-5/kmodtool,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kmodtool	15 Mar 2006 19:52:17 -0000	1.3
+++ kmodtool	27 Apr 2006 16:45:40 -0000	1.4
@@ -24,7 +24,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 myprog="kmodtool"
-myver="0.10.5"
+myver="0.10.7"
 knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen[0U]\)'
 kmod_name=
 kver=
@@ -67,10 +67,10 @@
 %package       -n kmod-${kmod_name}${dashvariant}
 Summary:          ${kmod_name} kernel module(s)
 Group:            System Environment/Kernel
-Provides:         kernel-module = ${verrel}${variant}
-Provides:         kmod-${kmod_name} = %{version}-%{release}
+Provides:         kernel-modules = ${verrel}${variant}
+Provides:         kmod-${kmod_name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:         ${kdep}
-Requires:         ${kmod_name}-kmod-common = %{version}
+Requires:         ${kmod_name}-kmod-common = %{?epoch:%{epoch}:}%{version}
 Requires(post):   /sbin/depmod
 Requires(postun): /sbin/depmod
 BuildRequires:    kernel${dashvariant}-devel-%{_target_cpu} = ${verrel}


Index: thinkpad-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/thinkpad-kmod/FC-5/thinkpad-kmod.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- thinkpad-kmod.spec	15 Mar 2006 20:23:25 -0000	1.7
+++ thinkpad-kmod.spec	27 Apr 2006 16:45:40 -0000	1.8
@@ -3,22 +3,23 @@
 %define   kmodtool sh %{SOURCE10}
 # end stuff to be ...
 
-# temporarily hardcoded:
-%define kver      2.6.15-1.2054_FC5
+%{?kversion: %define kversion 2.6.16-1.2096_FC5}
+
+%define kmod_name lirc
+%define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
+
+%define upvar ""
 %ifarch i686
-%define kvariants "" xen0
-%else
-%define kvariants ""
+%define xenvar xen0
+%define kdumpvar kdump
 %endif
+%{!?kvariants: %define kvariants %{?upvar} %{?xenvar} %{?kdumpvar}}
 
-                %define kmod_name thinkpad
-                %define kverrel   %(%{kmodtool} verrel  %{?kver} 2>/dev/null)
-%{!?kvariants:  %global kvariants %(%{kmodtool} variant %{?kver} 2>/dev/null)}
 
 Name:           %{kmod_name}-kmod
 Summary:        %{kmod_name} kernel modules
 Version:        5.9
-Release:        4.%(echo %{kverrel} | tr - _)
+Release:        5.%(echo %{kverrel} | tr - _)
 
 URL:            http://tpctl.sourceforge.net/
 Source0:        http://download.sf.net/tpctl/thinkpad-%{version}.tar.gz
@@ -33,14 +34,9 @@
 %description
 This package provides %{kmod_name} kernel modules.
 
-# 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 -T -c -a 0
 %patch0 -p0
 sed -i /enable_thinkpadpm/d %{kmod_name}-%{version}/2.6/drivers/thinkpad.c
@@ -69,6 +65,11 @@
 
 
 %changelog
+* Thu Apr 27 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.9-5
+- Provide "kernel-modules" instead of "kernel-module" to match yum's config.
+- s/%%{kver}/%%{kversion}/ for consistency with other vars.
+- Allow specifying %%{kversion} and %%{kvariants} externally.
+
 * Wed Mar 15 2006 Ville Skytt?? <ville.skytta at iki.fi> - 5.9-4
 - Drop xenU.
 



From fedora-extras-commits at redhat.com  Thu Apr 27 16:47:45 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 27 Apr 2006 09:47:45 -0700
Subject: rpms/lirc-kmod/FC-5 kmodtool,1.3,1.4 lirc-kmod.spec,1.6,1.7
Message-ID: <200604271648.k3RGmHwE011812@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc-kmod/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11772/FC-5

Modified Files:
	kmodtool lirc-kmod.spec 
Log Message:
* Thu Apr 27 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-6
- Provide "kernel-modules" instead of "kernel-module" to match yum's config.
- s/%{kver}/%{kversion}/ for consistency with other vars.
- Allow specifying %{kversion} and %{kvariants} externally.



Index: kmodtool
===================================================================
RCS file: /cvs/extras/rpms/lirc-kmod/FC-5/kmodtool,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kmodtool	13 Mar 2006 21:06:07 -0000	1.3
+++ kmodtool	27 Apr 2006 16:47:45 -0000	1.4
@@ -24,7 +24,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 myprog="kmodtool"
-myver="0.10.5"
+myver="0.10.7"
 knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen[0U]\)'
 kmod_name=
 kver=
@@ -67,10 +67,10 @@
 %package       -n kmod-${kmod_name}${dashvariant}
 Summary:          ${kmod_name} kernel module(s)
 Group:            System Environment/Kernel
-Provides:         kernel-module = ${verrel}${variant}
-Provides:         kmod-${kmod_name} = %{version}-%{release}
+Provides:         kernel-modules = ${verrel}${variant}
+Provides:         kmod-${kmod_name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:         ${kdep}
-Requires:         ${kmod_name}-kmod-common = %{version}
+Requires:         ${kmod_name}-kmod-common = %{?epoch:%{epoch}:}%{version}
 Requires(post):   /sbin/depmod
 Requires(postun): /sbin/depmod
 BuildRequires:    kernel${dashvariant}-devel-%{_target_cpu} = ${verrel}


Index: lirc-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/lirc-kmod/FC-5/lirc-kmod.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lirc-kmod.spec	17 Mar 2006 07:33:45 -0000	1.6
+++ lirc-kmod.spec	27 Apr 2006 16:47:45 -0000	1.7
@@ -5,29 +5,25 @@
 %define   kmodtool sh %{SOURCE10}
 # end stuff to be ...
 
-# temporarily hardcoded:
-%define kver      2.6.15-1.2054_FC5
-%ifnarch i686 x86_64 ppc
-%define kvariants ""
-%else
-%ifarch i686
-%define kvariants "" smp xen0 xenU
-%endif
-%ifarch x86_64
-%define kvariants "" xen0 xenU
-%endif
-%ifarch ppc
-%define kvariants "" smp
+%{?kversion: %define kversion 2.6.16-1.2096_FC5}
+
+%define kmod_name lirc
+%define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
+
+%define upvar ""
+%ifarch i686 ppc
+%define smpvar smp
 %endif
+%ifarch i686 x86_64
+%define xenvar xen0 xenU
+%define kdumpvar kdump
 %endif
+%{!?kvariants: %define kvariants %{?upvar} %{?smpvar} %{?xenvar} %{?kdumpvar}}
 
-                %define kmod_name lirc
-                %define kverrel   %(%{kmodtool} verrel  %{?kver} 2>/dev/null)
-%{!?kvariants:  %global kvariants %(%{kmodtool} variant %{?kver} 2>/dev/null)}
 
 Name:           %{kmod_name}-kmod
 Version:        0.8.0
-Release:        5.%(echo %{kverrel} | tr - _)
+Release:        6.%(echo %{kverrel} | tr - _)
 Summary:        LIRC kernel modules
 
 Group:          System Environment/Kernel
@@ -49,14 +45,9 @@
 computer with a remote control.  This package contains additional
 kernel modules to support additional remote control units.
 
-# 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
 cd lirc-%{version}*
 %patch0 -p0
@@ -116,6 +107,11 @@
 
 
 %changelog
+* Thu Apr 27 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-6
+- Provide "kernel-modules" instead of "kernel-module" to match yum's config.
+- s/%%{kver}/%%{kversion}/ for consistency with other vars.
+- Allow specifying %%{kversion} and %%{kvariants} externally.
+
 * Fri Mar 17 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-5
 - Drop the ppc64* experiment.
 



From fedora-extras-commits at redhat.com  Thu Apr 27 16:47:45 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 27 Apr 2006 09:47:45 -0700
Subject: rpms/lirc-kmod/devel kmodtool,1.4,1.5 lirc-kmod.spec,1.6,1.7
Message-ID: <200604271648.k3RGmHSd011816@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/lirc-kmod/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11772/devel

Modified Files:
	kmodtool lirc-kmod.spec 
Log Message:
* Thu Apr 27 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-6
- Provide "kernel-modules" instead of "kernel-module" to match yum's config.
- s/%{kver}/%{kversion}/ for consistency with other vars.
- Allow specifying %{kversion} and %{kvariants} externally.



Index: kmodtool
===================================================================
RCS file: /cvs/extras/rpms/lirc-kmod/devel/kmodtool,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- kmodtool	24 Mar 2006 21:17:39 -0000	1.4
+++ kmodtool	27 Apr 2006 16:47:45 -0000	1.5
@@ -24,7 +24,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 myprog="kmodtool"
-myver="0.10.6"
+myver="0.10.7"
 knownvariants='\(BOOT\|\(big\|huge\)mem\|debug\|enterprise\|kdump\|smp\|uml\|xen[0U]\)'
 kmod_name=
 kver=
@@ -67,7 +67,7 @@
 %package       -n kmod-${kmod_name}${dashvariant}
 Summary:          ${kmod_name} kernel module(s)
 Group:            System Environment/Kernel
-Provides:         kernel-module = ${verrel}${variant}
+Provides:         kernel-modules = ${verrel}${variant}
 Provides:         kmod-${kmod_name} = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:         ${kdep}
 Requires:         ${kmod_name}-kmod-common = %{?epoch:%{epoch}:}%{version}


Index: lirc-kmod.spec
===================================================================
RCS file: /cvs/extras/rpms/lirc-kmod/devel/lirc-kmod.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lirc-kmod.spec	17 Mar 2006 07:28:47 -0000	1.6
+++ lirc-kmod.spec	27 Apr 2006 16:47:45 -0000	1.7
@@ -5,29 +5,25 @@
 %define   kmodtool sh %{SOURCE10}
 # end stuff to be ...
 
-# temporarily hardcoded:
-%define kver      2.6.15-1.2054_FC5
-%ifnarch i686 x86_64 ppc
-%define kvariants ""
-%else
-%ifarch i686
-%define kvariants "" smp xen0 xenU
-%endif
-%ifarch x86_64
-%define kvariants "" xen0 xenU
-%endif
-%ifarch ppc
-%define kvariants "" smp
+%{?kversion: %define kversion 2.6.16-1.2096_FC5}
+
+%define kmod_name lirc
+%define kverrel %(%{kmodtool} verrel %{?kversion} 2>/dev/null)
+
+%define upvar ""
+%ifarch i686 ppc
+%define smpvar smp
 %endif
+%ifarch i686 x86_64
+%define xenvar xen0 xenU
+%define kdumpvar kdump
 %endif
+%{!?kvariants: %define kvariants %{?upvar} %{?smpvar} %{?xenvar} %{?kdumpvar}}
 
-                %define kmod_name lirc
-                %define kverrel   %(%{kmodtool} verrel  %{?kver} 2>/dev/null)
-%{!?kvariants:  %global kvariants %(%{kmodtool} variant %{?kver} 2>/dev/null)}
 
 Name:           %{kmod_name}-kmod
 Version:        0.8.0
-Release:        5.%(echo %{kverrel} | tr - _)
+Release:        6.%(echo %{kverrel} | tr - _)
 Summary:        LIRC kernel modules
 
 Group:          System Environment/Kernel
@@ -49,14 +45,9 @@
 computer with a remote control.  This package contains additional
 kernel modules to support additional remote control units.
 
-# 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
 cd lirc-%{version}*
 %patch0 -p0
@@ -116,6 +107,11 @@
 
 
 %changelog
+* Thu Apr 27 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-6
+- Provide "kernel-modules" instead of "kernel-module" to match yum's config.
+- s/%%{kver}/%%{kversion}/ for consistency with other vars.
+- Allow specifying %%{kversion} and %%{kvariants} externally.
+
 * Fri Mar 17 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.8.0-5
 - Drop the ppc64* experiment.
 



From fedora-extras-commits at redhat.com  Thu Apr 27 16:52:48 2006
From: fedora-extras-commits at redhat.com (José Abílio Oliveira Matos (jamatos))
Date: Thu, 27 Apr 2006 09:52:48 -0700
Subject: owners owners.list,1.905,1.906
Message-ID: <200604271652.k3RGqoqM011878@cvs-int.fedora.redhat.com>

Author: jamatos

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11856

Modified Files:
	owners.list 
Log Message:
Added tetex-dvipost


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.905
retrieving revision 1.906
diff -u -r1.905 -r1.906
--- owners.list	27 Apr 2006 16:23:24 -0000	1.905
+++ owners.list	27 Apr 2006 16:52:48 -0000	1.906
@@ -1481,6 +1481,7 @@
 Fedora Extras|tetex-armtex|Support for typesetting Armenian with TeX and LaTeX|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-beamer|A LaTeX class for producing presentations and slides|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-bytefield|Create illustrations for network protocol specifications|jpo at di.uminho.pt|extras-qa at fedoraproject.org|
+Fedora Extras|tetex-dvipost|LaTeX post filter command to support change bars and overstrike mode|jamatos at fc.up.pt|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-eurofont|Provides a command that prints a euro symbol|aportal at univ-montp2.fr|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-font-cm-lgc|The CM-LGC Type1 fonts for LaTeX|paskalis at di.uoa.gr|extras-qa at fedoraproject.org|
 Fedora Extras|tetex-font-kerkis|The Kerkis type 1 fonts for LaTeX|paskalis at di.uoa.gr|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Apr 27 17:03:04 2006
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Thu, 27 Apr 2006 10:03:04 -0700
Subject: rpms/zile/devel .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200604271703.k3RH3asn014745@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/zile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14695

Modified Files:
	.cvsignore sources 
Log Message:
* Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-1
- Bump to latest release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zile/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Aug 2005 16:36:38 -0000	1.2
+++ .cvsignore	27 Apr 2006 17:03:04 -0000	1.3
@@ -1 +1 @@
-zile-2.2.4.tar.gz
+zile-2.2.13.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zile/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Aug 2005 16:36:38 -0000	1.2
+++ sources	27 Apr 2006 17:03:04 -0000	1.3
@@ -1 +1 @@
-4c4212d9c3bc744ef438bfdf61d976e3  zile-2.2.4.tar.gz
+d2156809cf1482c2f670d35b083babb5  zile-2.2.13.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 17:04:58 2006
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Thu, 27 Apr 2006 10:04:58 -0700
Subject: rpms/zile/FC-4 sources,1.2,1.3
Message-ID: <200604271705.k3RH50i4014808@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/zile/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14761/FC-4

Modified Files:
	sources 
Log Message:
* Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-1
- Bump to latest release.



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zile/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Aug 2005 16:36:38 -0000	1.2
+++ sources	27 Apr 2006 17:04:57 -0000	1.3
@@ -1 +1 @@
-4c4212d9c3bc744ef438bfdf61d976e3  zile-2.2.4.tar.gz
+d2156809cf1482c2f670d35b083babb5  zile-2.2.13.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 17:04:57 2006
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Thu, 27 Apr 2006 10:04:57 -0700
Subject: rpms/zile/FC-3 sources,1.2,1.3
Message-ID: <200604271705.k3RH4x5N014806@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/zile/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14761/FC-3

Modified Files:
	sources 
Log Message:
* Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-1
- Bump to latest release.



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zile/FC-3/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Aug 2005 16:36:38 -0000	1.2
+++ sources	27 Apr 2006 17:04:57 -0000	1.3
@@ -1 +1 @@
-4c4212d9c3bc744ef438bfdf61d976e3  zile-2.2.4.tar.gz
+d2156809cf1482c2f670d35b083babb5  zile-2.2.13.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 17:04:58 2006
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Thu, 27 Apr 2006 10:04:58 -0700
Subject: rpms/zile/FC-5 sources,1.2,1.3
Message-ID: <200604271705.k3RH50N5014812@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/zile/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14761/FC-5

Modified Files:
	sources 
Log Message:
* Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-1
- Bump to latest release.



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zile/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	20 Aug 2005 16:36:38 -0000	1.2
+++ sources	27 Apr 2006 17:04:58 -0000	1.3
@@ -1 +1 @@
-4c4212d9c3bc744ef438bfdf61d976e3  zile-2.2.4.tar.gz
+d2156809cf1482c2f670d35b083babb5  zile-2.2.13.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 17:06:54 2006
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Thu, 27 Apr 2006 10:06:54 -0700
Subject: rpms/zile/FC-5 .cvsignore,1.2,1.3
Message-ID: <200604271706.k3RH6u2A014968@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/zile/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14914/FC-5

Modified Files:
	.cvsignore 
Log Message:
* Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-1
- Bump to latest release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zile/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Aug 2005 16:36:38 -0000	1.2
+++ .cvsignore	27 Apr 2006 17:06:54 -0000	1.3
@@ -1 +1 @@
-zile-2.2.4.tar.gz
+zile-2.2.13.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 17:06:53 2006
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Thu, 27 Apr 2006 10:06:53 -0700
Subject: rpms/zile/FC-3 .cvsignore,1.2,1.3
Message-ID: <200604271706.k3RH6tn4014959@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/zile/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14914/FC-3

Modified Files:
	.cvsignore 
Log Message:
* Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-1
- Bump to latest release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zile/FC-3/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Aug 2005 16:36:38 -0000	1.2
+++ .cvsignore	27 Apr 2006 17:06:53 -0000	1.3
@@ -1 +1 @@
-zile-2.2.4.tar.gz
+zile-2.2.13.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 17:06:53 2006
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Thu, 27 Apr 2006 10:06:53 -0700
Subject: rpms/zile/FC-4 .cvsignore,1.2,1.3
Message-ID: <200604271706.k3RH6tDJ014963@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/zile/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14914/FC-4

Modified Files:
	.cvsignore 
Log Message:
* Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-1
- Bump to latest release.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zile/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	20 Aug 2005 16:36:38 -0000	1.2
+++ .cvsignore	27 Apr 2006 17:06:53 -0000	1.3
@@ -1 +1 @@
-zile-2.2.4.tar.gz
+zile-2.2.13.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 17:19:43 2006
From: fedora-extras-commits at redhat.com (Marcel Holtmann (holtmann))
Date: Thu, 27 Apr 2006 10:19:43 -0700
Subject: fedora-security/audit fc4,1.221,1.222 fc5,1.135,1.136
Message-ID: <200604271719.k3RHJhH4015072@cvs-int.fedora.redhat.com>

Author: holtmann

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15049/audit

Modified Files:
	fc4 fc5 
Log Message:
Add CVE-2006-2071 and correct CVE-2006-1524



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -r1.221 -r1.222
--- fc4	27 Apr 2006 12:22:51 -0000	1.221
+++ fc4	27 Apr 2006 17:19:40 -0000	1.222
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2006-2071 version (kernel, fixed 2.6.16.6) [since FEDORA-2006-423]
 CVE-2006-2057 ** firefox
 CVE-2006-2026 VULNERABLE (libtiff, fixed 3.8.1) #189934
 CVE-2006-2025 VULNERABLE (libtiff, fixed 3.8.1) #189934
@@ -98,7 +99,7 @@
 CVE-2006-1529 VULNERABLE (thunderbird, fixed 1.0.8)
 CVE-2006-1529 VULNERABLE (firefox, fixed 1.0.8)
 CVE-2006-1525 version (kernel, fixed 2.6.16.8) [since FEDORA-2006-423]
-CVE-2006-1524 version (kernel, fixed 2.6.16.5) [since FEDORA-2006-423]
+CVE-2006-1524 version (kernel, fixed 2.6.16.7) [since FEDORA-2006-423]
 CVE-2006-1523 version (kernel, fixed 2.6.16.4) [since FEDORA-2006-423]
 CVE-2006-1522 version (kernel, fixed 2.6.16.3) [since FEDORA-2006-423]
 CVE-2006-1494 VULNERABLE (php)


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -r1.135 -r1.136
--- fc5	27 Apr 2006 12:22:51 -0000	1.135
+++ fc5	27 Apr 2006 17:19:40 -0000	1.136
@@ -3,6 +3,7 @@
 
 ** are items that need attention
 
+CVE-2006-2071 version (kernel, fixed 2.6.16.6) [since FEDORA-2006-421]
 CVE-2006-2057 ** firefox
 CVE-2006-2026 VULNERABLE (libtiff, fixed 3.8.1) #189934
 CVE-2006-2025 VULNERABLE (libtiff, fixed 3.8.1) #189934
@@ -98,7 +99,7 @@
 CVE-2006-1529 VULNERABLE (thunderbird, fixed 1.5.0.2)
 CVE-2006-1529 VULNERABLE (firefox, fixed 1.5.0.2)
 CVE-2006-1525 version (kernel, fixed 2.6.16.8) [since FEDORA-2006-421]
-CVE-2006-1524 version (kernel, fixed 2.6.16.5) [since FEDORA-2006-421]
+CVE-2006-1524 version (kernel, fixed 2.6.16.7) [since FEDORA-2006-421]
 CVE-2006-1523 version (kernel, fixed 2.6.16.4) [since FEDORA-2006-421]
 CVE-2006-1522 version (kernel, fixed 2.6.16.3) [since FEDORA-2006-421]
 CVE-2006-1494 VULNERABLE (php)



From fedora-extras-commits at redhat.com  Thu Apr 27 17:29:01 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu, 27 Apr 2006 10:29:01 -0700
Subject: rpms/gtkhtml36/FC-5 gtkhtml36.spec,1.1,1.2
Message-ID: <200604271729.k3RHT3PU015184@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gtkhtml36/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15129

Modified Files:
	gtkhtml36.spec 
Log Message:
bump the release tag - it was imported into devel with the fc5 release tag,
and I can't make tag in fc5 as result




Index: gtkhtml36.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkhtml36/FC-5/gtkhtml36.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtkhtml36.spec	27 Apr 2006 16:19:20 -0000	1.1
+++ gtkhtml36.spec	27 Apr 2006 17:29:01 -0000	1.2
@@ -5,7 +5,7 @@
 Summary:       GtkHTML 3.6 Compatibility Library
 Name:          gtkhtml36
 Version:       3.6.2
-Release:       3%{?dist}
+Release:       4%{?dist}
 License:       LGPL/GPL
 Group:         System Environment/Libraries
 Url:           http://www.gnome.org/
@@ -89,6 +89,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Apr 27 2006 Michael A. Peters <mpeters at mac.com> - 3.6.2-4
+- Bump release tag for proper tagging before build
+
 * Wed Apr 26 2006 Michael A. Peters <mpeters at mac.com> - 3.6.2-3
 - Fixed issues in bugzilla 171314 comment 9
 



From fedora-extras-commits at redhat.com  Thu Apr 27 17:29:56 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Thu, 27 Apr 2006 10:29:56 -0700
Subject: rpms/gtkhtml36/devel gtkhtml36.spec,1.1,1.2
Message-ID: <200604271729.k3RHTxY4015238@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/gtkhtml36/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15221

Modified Files:
	gtkhtml36.spec 
Log Message:
bump release tag



Index: gtkhtml36.spec
===================================================================
RCS file: /cvs/extras/rpms/gtkhtml36/devel/gtkhtml36.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gtkhtml36.spec	27 Apr 2006 16:19:20 -0000	1.1
+++ gtkhtml36.spec	27 Apr 2006 17:29:56 -0000	1.2
@@ -5,7 +5,7 @@
 Summary:       GtkHTML 3.6 Compatibility Library
 Name:          gtkhtml36
 Version:       3.6.2
-Release:       3%{?dist}
+Release:       4%{?dist}
 License:       LGPL/GPL
 Group:         System Environment/Libraries
 Url:           http://www.gnome.org/
@@ -89,6 +89,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Thu Apr 27 2006 Michael A. Peters <mpeters at mac.com> - 3.6.2-4
+- Bump release tag for proper tagging before build
+
 * Wed Apr 26 2006 Michael A. Peters <mpeters at mac.com> - 3.6.2-3
 - Fixed issues in bugzilla 171314 comment 9
 



From fedora-extras-commits at redhat.com  Thu Apr 27 17:43:17 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Thu, 27 Apr 2006 10:43:17 -0700
Subject: rpms/kbibtex/FC-5 .cvsignore, 1.2, 1.3 kbibtex.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200604271743.k3RHhJXd015383@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15360

Modified Files:
	.cvsignore kbibtex.spec sources 
Log Message:
- Update to version 0.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Jan 2006 08:03:21 -0000	1.2
+++ .cvsignore	27 Apr 2006 17:43:17 -0000	1.3
@@ -1 +1 @@
-kbibtex-0.1.3.tar.bz2
+kbibtex-0.1.4.tar.bz2


Index: kbibtex.spec
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/FC-5/kbibtex.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kbibtex.spec	1 Mar 2006 12:59:06 -0000	1.3
+++ kbibtex.spec	27 Apr 2006 17:43:17 -0000	1.4
@@ -1,13 +1,12 @@
 Name:		kbibtex
-Version:	0.1.3
-Release:	4%{?dist}
+Version:	0.1.4
+Release:	1%{?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
-Patch:		kbibtex-qualifier.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdebase-devel >= 3.3 libxslt-devel desktop-file-utils
@@ -20,7 +19,6 @@
 
 %prep
 %setup -q
-%patch -p1 -b .qualifier
 
 
 %build
@@ -116,8 +114,8 @@
 %{_datadir}/applications/fedora-kbibtex_part.desktop
 
 %changelog
-* Wed Mar 01 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.3-4
-- Rebuild for Fedora Extras 5
+* Wed Apr 27 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.4-1
+- Update to the version 0.1.4
 
 * Fri Dec 23 2005 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.3-3
 - Patch to resolve an error when this package is compiled with gcc 4.1.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Jan 2006 08:03:21 -0000	1.2
+++ sources	27 Apr 2006 17:43:17 -0000	1.3
@@ -1 +1 @@
-ad603af9130ff1e0ad30ac618211bdc5  kbibtex-0.1.3.tar.bz2
+8db022a94818660dfa4c4bb08aed5e8e  kbibtex-0.1.4.tar.bz2



From fedora-extras-commits at redhat.com  Thu Apr 27 17:48:19 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Thu, 27 Apr 2006 10:48:19 -0700
Subject: rpms/fedora-usermgmt/devel macros.fedora-usermgmt, NONE,
	1.1 fedora-usermgmt.spec, 1.9, 1.10
Message-ID: <200604271748.k3RHmL8V015488@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/fedora-usermgmt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15470

Modified Files:
	fedora-usermgmt.spec 
Added Files:
	macros.fedora-usermgmt 
Log Message:
- moved most content of the base package and used directories into a
  -core subpackage; this avoids dependencies loops.
- renamed -setup into the much longer -default-fedora-setup; because
  yum's depsolver is not very smart (and choses packages with smallest
  name) it might is more difficult to provide a custom -setup package
  else
- added -devel subpackages with a /etc/rpm/macros.fedora-usermgmt file



--- NEW FILE macros.fedora-usermgmt ---
## Use these macros like
##
## =====
## %bcond_without	fedora
## 
## BuildRequires:	fedora-usermgmt-devel
## %{?FE_USERADD_REQ}
## ...
## %pre
## %__fe_groupadd <uid> -r ... &>/dev/null || :
## %__fe_useradd  <uid> -r ... &>/dev/null || :
##
## %postun
## %__fe_userdel  ... &>/dev/null || :
## %__fe_groupdel ... &>/dev/null || :


%__fe_useradd		%{?with_fedora:/usr/sbin/fedora-useradd}%{!?with_fedora:__useradd() { shift; /usr/sbin/useradd "$@"; }; __useradd}
%__fe_userdel		test "$1" != 0 || %{?with_fedora:/usr/sbin/fedora-userdel}%{!?with_fedora:/usr/sbin/userdel}

%__fe_groupadd		%{?with_fedora:/usr/sbin/fedora-groupadd}%{!?with_fedora:__groupadd() { shift; /usr/sbin/groupadd "$@"; }; __groupadd}
%__fe_groupdel		test "$1" != 0 || %{?with_fedora:/usr/sbin/fedora-groupdel}%{!?with_fedora:/usr/sbin/groupdel}

%FE_USERADD_REQ	\
Requires(pre):		%{?with_fedora:fedora-usermgmt}%{!?with_fedora:shadow-utils}	\
Requires(postun):	%{?with_fedora:fedora-usermgmt}%{!?with_fedora:shadow-utils}


Index: fedora-usermgmt.spec
===================================================================
RCS file: /cvs/extras/rpms/fedora-usermgmt/devel/fedora-usermgmt.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- fedora-usermgmt.spec	18 Feb 2006 09:39:08 -0000	1.9
+++ fedora-usermgmt.spec	27 Apr 2006 17:48:19 -0000	1.10
@@ -8,23 +8,28 @@
 
 Summary:	Fedora tools for user management
 Name:		fedora-usermgmt
-Version:	0.8
+Version:	0.8.90
 Release:	%release_func 2
 
 License:	GPL
 BuildArch:	noarch
 Group:		Applications/System
 URL:		http://fedoraproject.org/wiki/PackageUserCreation
-Source0:	fedora-usermgmt-wrapper
-Source1:	fedora-usermgmt-README
+Requires(pre):	%name-core = %version-%release
 Requires(pre):	instance(fedora-usermgmt)
 Requires(pre):	setup(fedora-usermgmt)
 BuildRoot:	%_tmppath/%name-%version-%release-root
-Requires(pre):		%_sysconfdir/fedora
-Requires(postun):	%_sysconfdir/fedora
 
 
-%package setup
+%package core
+Summary:	Core utilities for the fedora-usermgmt
+Group:		Applications/System
+Source0:	fedora-usermgmt-wrapper
+Source1:	fedora-usermgmt-README
+Requires:	%name = %version-%release
+
+
+%package default-fedora-setup
 Summary:	Default values for baseuid/basegid
 Group:		System Environment/Base
 Provides:	setup(fedora-usermgmt)
@@ -32,6 +37,8 @@
 Conflicts:	flavor(fedora-usermgmt-setup) < default
 Conflicts:	flavor(fedora-usermgmt-setup) > default
 Source2:	fedora-usermgmt-baseid
+Provides:	%name-setup = %name-%version
+Obsoletes:	%name-setup < %name-%version
 
 
 %package shadow-utils
@@ -50,12 +57,32 @@
 Requires:		shadow-utils
 
 
+%package devel
+Summary:	Enhancements for fedora-usermgmt
+Group:		Development/System
+Source30:	macros.fedora-usermgmt
+Conflicts:	%name < %version-%release
+Conflicts:	%name > %version-%release
+Requires(pre):		%_sysconfdir/rpm
+Requires(postun):	%_sysconfdir/rpm
+
+
 %description
 This package provides wrapper around the useradd/-del and groupadd/-del
 programs to allow predictable uids/gids.
 
 
-%description setup
+%description core
+This package provides wrapper around the useradd/-del and groupadd/-del
+programs to allow predictable uids/gids.
+
+
+%description devel
+This package provides wrapper around the useradd/-del and groupadd/-del
+programs to allow predictable uids/gids.
+
+
+%description default-fedora-setup
 This package contains default values for the base of relative UIDs. It
 is designed to be overridden by local customizations; you should create
 a package with
@@ -109,6 +136,12 @@
 %__install -p -m755 %SOURCE21 ${RPM_BUILD_ROOT}%confdir/scripts.legacy/useradd
 
 
+## The -devel installation
+%__install -d -m755           ${RPM_BUILD_ROOT}%_sysconfdir/rpm
+%__install -p -m444 %SOURCE30 ${RPM_BUILD_ROOT}%_sysconfdir/rpm/
+
+
+
 %post shadow-utils
 %alternatives --install %confdir/scripts %name %confdir/scripts.legacy 60
 %alternatives --install %confdir/scripts %name %confdir/scripts.shadow-utils 50
@@ -126,27 +159,44 @@
 %files
 %defattr(-,root,root,-)
 %doc README
+
+
+%files core
+%defattr(-,root,root,-)
 %dir %_sysconfdir/fedora
+%dir %confdir
 %pkgdatadir
 %_sbindir/*
 
 
-%files setup
+%files default-fedora-setup
 %defattr(-,root,root,-)
-%dir %confdir
 %config(noreplace) %confdir/base*
-## Temporary hack: /etc/fedora should be provided by a filesystem-like
-## package
-%dir %_sysconfdir/fedora
 
 
 %files shadow-utils
 %defattr(-,root,root,-)
-%dir %confdir/scripts.*
+%dir    %confdir/scripts.*
 %config %confdir/scripts.*/*
 
 
+%files devel
+%defattr(-,root,root,-)
+# do not add %config here; rpm does not ignore the generated
+# *.rpmsave/rpmnew files
+%_sysconfdir/rpm/macros.*
+
+
 %changelog
+* Thu Apr 27 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.8.90-2
+- moved most content of the base package and used directories into a
+  -core subpackage; this avoids dependencies loops.
+- renamed -setup into the much longer -default-fedora-setup; because
+  yum's depsolver is not very smart (and choses packages with smallest
+  name) it might is more difficult to provide a custom -setup package
+  else
+- added -devel subpackages with a /etc/rpm/macros.fedora-usermgmt file
+
 * Sat Feb 18 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.8-2
 - added the %%dist release-tag
 



From fedora-extras-commits at redhat.com  Thu Apr 27 18:18:56 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Thu, 27 Apr 2006 11:18:56 -0700
Subject: rpms/heartbeat/devel heartbeat-2.0.3-fedora-ccmuser.patch, 1.1,
	NONE heartbeat-2.0.3-fedora-chkconfig.patch, 1.1,
	NONE heartbeat-2.0.3-fedora-pam.patch, 1.1, NONE
Message-ID: <200604271818.k3RIIwsL020909@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/heartbeat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20885

Removed Files:
	heartbeat-2.0.3-fedora-ccmuser.patch 
	heartbeat-2.0.3-fedora-chkconfig.patch 
	heartbeat-2.0.3-fedora-pam.patch 
Log Message:
removal of patch files, should not have used version number in filename..


--- heartbeat-2.0.3-fedora-ccmuser.patch DELETED ---


--- heartbeat-2.0.3-fedora-chkconfig.patch DELETED ---


--- heartbeat-2.0.3-fedora-pam.patch DELETED ---



From fedora-extras-commits at redhat.com  Thu Apr 27 18:48:55 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Thu, 27 Apr 2006 11:48:55 -0700
Subject: rpms/kbibtex/FC-4 .cvsignore, 1.2, 1.3 kbibtex.spec, 1.1,
	1.2 sources, 1.2, 1.3
Message-ID: <200604271848.k3RImvem026712@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26655

Modified Files:
	.cvsignore kbibtex.spec sources 
Log Message:
- Update to version 0.1.4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Jan 2006 08:03:21 -0000	1.2
+++ .cvsignore	27 Apr 2006 18:48:54 -0000	1.3
@@ -1 +1 @@
-kbibtex-0.1.3.tar.bz2
+kbibtex-0.1.4.tar.bz2


Index: kbibtex.spec
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/FC-4/kbibtex.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kbibtex.spec	12 Jan 2006 08:03:21 -0000	1.1
+++ kbibtex.spec	27 Apr 2006 18:48:54 -0000	1.2
@@ -1,13 +1,12 @@
 Name:		kbibtex
-Version:	0.1.3
-Release:	3%{?dist}
+Version:	0.1.4
+Release:	1%{?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
-Patch:		kbibtex-qualifier.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdebase-devel >= 3.3 libxslt-devel desktop-file-utils
@@ -20,7 +19,6 @@
 
 %prep
 %setup -q
-%patch -p1 -b .qualifier
 
 
 %build
@@ -116,6 +114,9 @@
 %{_datadir}/applications/fedora-kbibtex_part.desktop
 
 %changelog
+* Wed Apr 27 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.4-1
+- Update to the version 0.1.4
+
 * Fri Dec 23 2005 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.3-3
 - Patch to resolve an error when this package is compiled with gcc 4.1.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Jan 2006 08:03:21 -0000	1.2
+++ sources	27 Apr 2006 18:48:54 -0000	1.3
@@ -1 +1 @@
-ad603af9130ff1e0ad30ac618211bdc5  kbibtex-0.1.3.tar.bz2
+8db022a94818660dfa4c4bb08aed5e8e  kbibtex-0.1.4.tar.bz2



From fedora-extras-commits at redhat.com  Thu Apr 27 18:53:10 2006
From: fedora-extras-commits at redhat.com (Christian Nolte (noltec))
Date: Thu, 27 Apr 2006 11:53:10 -0700
Subject: rpms/kbibtex/devel .cvsignore, 1.2, 1.3 kbibtex.spec, 1.3,
	1.4 sources, 1.2, 1.3
Message-ID: <200604271853.k3RIrCe0027681@cvs-int.fedora.redhat.com>

Author: noltec

Update of /cvs/extras/rpms/kbibtex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27650

Modified Files:
	.cvsignore kbibtex.spec sources 
Log Message:
Update to version 0.1.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	12 Jan 2006 08:03:21 -0000	1.2
+++ .cvsignore	27 Apr 2006 18:53:10 -0000	1.3
@@ -1 +1 @@
-kbibtex-0.1.3.tar.bz2
+kbibtex-0.1.4.tar.bz2


Index: kbibtex.spec
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/devel/kbibtex.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kbibtex.spec	1 Mar 2006 12:59:06 -0000	1.3
+++ kbibtex.spec	27 Apr 2006 18:53:10 -0000	1.4
@@ -1,13 +1,12 @@
 Name:		kbibtex
-Version:	0.1.3
-Release:	4%{?dist}
+Version:	0.1.4
+Release:	1%{?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
-Patch:		kbibtex-qualifier.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdebase-devel >= 3.3 libxslt-devel desktop-file-utils
@@ -20,7 +19,6 @@
 
 %prep
 %setup -q
-%patch -p1 -b .qualifier
 
 
 %build
@@ -116,8 +114,8 @@
 %{_datadir}/applications/fedora-kbibtex_part.desktop
 
 %changelog
-* Wed Mar 01 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.3-4
-- Rebuild for Fedora Extras 5
+* Wed Apr 27 2006 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.4-1
+- Update to the version 0.1.4
 
 * Fri Dec 23 2005 Christian Nolte <ch.nolte at fh-wolfenbuettel.de> - 0.1.3-3
 - Patch to resolve an error when this package is compiled with gcc 4.1.0


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kbibtex/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	12 Jan 2006 08:03:21 -0000	1.2
+++ sources	27 Apr 2006 18:53:10 -0000	1.3
@@ -1 +1 @@
-ad603af9130ff1e0ad30ac618211bdc5  kbibtex-0.1.3.tar.bz2
+8db022a94818660dfa4c4bb08aed5e8e  kbibtex-0.1.4.tar.bz2



From fedora-extras-commits at redhat.com  Thu Apr 27 19:05:36 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Thu, 27 Apr 2006 12:05:36 -0700
Subject: owners owners.list,1.906,1.907
Message-ID: <200604271905.k3RJ5cY4032110@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32021

Modified Files:
	owners.list 
Log Message:
taking ownership of gnome-password-generator



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.906
retrieving revision 1.907
diff -u -r1.906 -r1.907
--- owners.list	27 Apr 2006 16:52:48 -0000	1.906
+++ owners.list	27 Apr 2006 19:05:36 -0000	1.907
@@ -375,7 +375,7 @@
 Fedora Extras|gnome-blog|GNOME panel object for posting blog entries|bdpepple at ameritech.net|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-common|Useful things common to building gnome packages from scratch|toshio at tiki-lounge.com|extras-qa at fedoraproject.org|
 Fedora Extras|gnome-cpufreq-applet|CPU frequency scaling monitor applet|adrian at lisas.de|extras-qa at fedoraproject.org|
-Fedora Extras|gnome-password-generator|Graphical secure password generator|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|gnome-password-generator|Graphical secure password generator|michael at knox.net.nz|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  Thu Apr 27 19:06:04 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Thu, 27 Apr 2006 12:06:04 -0700
Subject: rpms/gnome-password-generator/FC-4 gnome-password-generator.spec,
	1.5, 1.6
Message-ID: <200604271906.k3RJ6aLX032337@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gnome-password-generator/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32152/FC-4

Modified Files:
	gnome-password-generator.spec 
Log Message:
updated spec, taking ownership



Index: gnome-password-generator.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-password-generator/FC-4/gnome-password-generator.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- gnome-password-generator.spec	6 Apr 2005 22:11:38 -0000	1.5
+++ gnome-password-generator.spec	27 Apr 2006 19:06:04 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           gnome-password-generator
 Version:        1.4
-Release:        3
+Release:        4%{?dist}
 
 Summary:        Graphical secure password generator
 
@@ -27,25 +27,23 @@
 
 
 %prep
-%setup -q
 
+%setup -q
 
 %build
 make %{?_smp_mflags}
 
-
 %install
-rm -rf ${RPM_BUILD_ROOT}
-make install DESTDIR=${RPM_BUILD_ROOT}
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 desktop-file-install --vendor fedora --delete-original \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications      \
+  --dir %{buildroot}%{_datadir}/applications      \
   --add-category X-Fedora                              \
-  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
+  %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
-
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
@@ -56,6 +54,9 @@
 
 
 %changelog
+* Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 1.4-4
+- taking ownership, spec clean up
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 



From fedora-extras-commits at redhat.com  Thu Apr 27 19:06:05 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Thu, 27 Apr 2006 12:06:05 -0700
Subject: rpms/gnome-password-generator/devel gnome-password-generator.spec,
	1.6, 1.7
Message-ID: <200604271906.k3RJ6bvi032345@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gnome-password-generator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32152/devel

Modified Files:
	gnome-password-generator.spec 
Log Message:
updated spec, taking ownership



Index: gnome-password-generator.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-password-generator/devel/gnome-password-generator.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnome-password-generator.spec	2 Mar 2006 21:29:27 -0000	1.6
+++ gnome-password-generator.spec	27 Apr 2006 19:06:05 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           gnome-password-generator
 Version:        1.4
-Release:        3
+Release:        4%{?dist}
 
 Summary:        Graphical secure password generator
 
@@ -27,32 +27,23 @@
 
 
 %prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
 
 %setup -q
 
-
 %build
 make %{?_smp_mflags}
 
-
 %install
-rm -rf ${RPM_BUILD_ROOT}
-make install DESTDIR=${RPM_BUILD_ROOT}
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 desktop-file-install --vendor fedora --delete-original \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications      \
+  --dir %{buildroot}%{_datadir}/applications      \
   --add-category X-Fedora                              \
-  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
+  %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
-
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
@@ -63,6 +54,9 @@
 
 
 %changelog
+* Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 1.4-4
+- taking ownership, spec clean up
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 



From fedora-extras-commits at redhat.com  Thu Apr 27 19:06:04 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Thu, 27 Apr 2006 12:06:04 -0700
Subject: rpms/gnome-password-generator/FC-5 gnome-password-generator.spec,
	1.6, 1.7
Message-ID: <200604271906.k3RJ6aAF032343@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gnome-password-generator/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32152/FC-5

Modified Files:
	gnome-password-generator.spec 
Log Message:
updated spec, taking ownership



Index: gnome-password-generator.spec
===================================================================
RCS file: /cvs/extras/rpms/gnome-password-generator/FC-5/gnome-password-generator.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gnome-password-generator.spec	2 Mar 2006 21:29:27 -0000	1.6
+++ gnome-password-generator.spec	27 Apr 2006 19:06:04 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           gnome-password-generator
 Version:        1.4
-Release:        3
+Release:        4%{?dist}
 
 Summary:        Graphical secure password generator
 
@@ -27,32 +27,23 @@
 
 
 %prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
 
 %setup -q
 
-
 %build
 make %{?_smp_mflags}
 
-
 %install
-rm -rf ${RPM_BUILD_ROOT}
-make install DESTDIR=${RPM_BUILD_ROOT}
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 desktop-file-install --vendor fedora --delete-original \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications      \
+  --dir %{buildroot}%{_datadir}/applications      \
   --add-category X-Fedora                              \
-  ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
+  %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
-
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
@@ -63,6 +54,9 @@
 
 
 %changelog
+* Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 1.4-4
+- taking ownership, spec clean up
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 



From fedora-extras-commits at redhat.com  Thu Apr 27 19:11:33 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 27 Apr 2006 12:11:33 -0700
Subject: rpms/opensc/devel .cvsignore, 1.6, 1.7 opensc.spec, 1.11,
	1.12 sources, 1.6, 1.7
Message-ID: <200604271911.k3RJBZEg000969@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/rpms/opensc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv939

Modified Files:
	.cvsignore opensc.spec sources 
Log Message:
* Thu Apr 27 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.11.0-0.1.rc2
- 0.11.0-rc2.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/opensc/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	22 Apr 2006 20:35:55 -0000	1.6
+++ .cvsignore	27 Apr 2006 19:11:33 -0000	1.7
@@ -1 +1 @@
-opensc-0.11.0-rc1.tar.gz
+opensc-0.11.0-rc2.tar.gz


Index: opensc.spec
===================================================================
RCS file: /cvs/extras/rpms/opensc/devel/opensc.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- opensc.spec	22 Apr 2006 20:35:55 -0000	1.11
+++ opensc.spec	27 Apr 2006 19:11:33 -0000	1.12
@@ -2,13 +2,13 @@
 
 Name:           opensc
 Version:        0.11.0
-Release:        0.1.rc1%{?dist}
+Release:        0.1.rc2%{?dist}
 Summary:        Smart card library and applications
 
 Group:          System Environment/Libraries
 License:        LGPL
 URL:            http://www.opensc-project.org/
-Source0:        http://www.opensc-project.org/files/opensc/testing/%{name}-%{version}-rc1.tar.gz
+Source0:        http://www.opensc-project.org/files/opensc/testing/%{name}-%{version}-rc2.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pcsc-lite-devel >= 1.1.1
@@ -50,7 +50,7 @@
 
 
 %prep
-%setup -q -n %{name}-%{version}-rc1
+%setup -q -n %{name}-%{version}-rc2
 sh bootstrap # avoid standard rpaths on lib64 archs
 cp -p src/pkcs15init/README ./README.pkcs15init
 cp -p src/scconf/README.scconf .
@@ -136,6 +136,9 @@
 
 
 %changelog
+* Thu Apr 27 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.11.0-0.1.rc2
+- 0.11.0-rc2.
+
 * Sat Apr 22 2006 Ville Skytt?? <ville.skytta at iki.fi> - 0.11.0-0.1.rc1
 - 0.11.0-rc1.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/opensc/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	22 Apr 2006 20:35:55 -0000	1.6
+++ sources	27 Apr 2006 19:11:33 -0000	1.7
@@ -1 +1 @@
-a911854594332241b62e5ed07b2e3a21  opensc-0.11.0-rc1.tar.gz
+960e33d4328bc7ee209a7a296bfc2fcc  opensc-0.11.0-rc2.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 19:28:29 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 27 Apr 2006 12:28:29 -0700
Subject: rpms/gnucap - New directory
Message-ID: <200604271928.k3RJSVrQ004351@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gnucap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4317/gnucap

Log Message:
Directory /cvs/extras/rpms/gnucap added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 27 19:28:30 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 27 Apr 2006 12:28:30 -0700
Subject: rpms/gnucap/devel - New directory
Message-ID: <200604271928.k3RJSWpg004356@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gnucap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4317/gnucap/devel

Log Message:
Directory /cvs/extras/rpms/gnucap/devel added to the repository




From fedora-extras-commits at redhat.com  Thu Apr 27 19:28:44 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 27 Apr 2006 12:28:44 -0700
Subject: rpms/gnucap Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604271928.k3RJSk9h004447@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gnucap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4406

Added Files:
	Makefile import.log 
Log Message:
Setup of module gnucap


--- NEW FILE Makefile ---
# Top level Makefile for module gnucap
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 27 19:28:45 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 27 Apr 2006 12:28:45 -0700
Subject: rpms/gnucap/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604271928.k3RJSlcP004453@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gnucap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4406/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gnucap


--- 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 Apr 27 19:29:33 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 27 Apr 2006 12:29:33 -0700
Subject: rpms/gnucap/devel gnucap-0.34-debian.patch, NONE, 1.1 gnucap.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604271929.k3RJTZJ4004684@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gnucap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4631/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gnucap-0.34-debian.patch gnucap.spec 
Log Message:
auto-import gnucap-0.34-2 on branch devel from gnucap-0.34-2.src.rpm

gnucap-0.34-debian.patch:

--- NEW FILE gnucap-0.34-debian.patch ---
--- gnucap-0.34.orig/doc/whatisit
+++ gnucap-0.34/doc/whatisit
@@ -1,4 +1,4 @@
-ACS is a general purpose circuit simulator.  It performs nonlinear
+Gnucap is a general purpose circuit simulator.  It performs nonlinear
 dc and transient analyses, fourier analysis, and ac analysis
 linearized at an operating point.  It is fully interactive and
 command driven.  It can also be run in batch mode or as a server.
@@ -6,7 +6,7 @@
 for the MOSFET (level 1-7) and diode are included in this
 release.
 
-ACS is not based on Berkeley Spice, but some of the models have been
+Gnucap is not based on Berkeley Spice, but some of the models have been
 derived from the Berleley models.
 
 Since it is fully interactive, it is possible to make changes and
@@ -19,7 +19,7 @@
 bipolar design.
 
 In batch mode it is mostly Spice compatible, so it is often possible
-to use the same file for both ACS and Spice.
+to use the same file for both Gnucap and Spice.
 
 The analog simulation is based on traditional nodal analysis with
 iteration by Newton's method and LU decomposition.  An event queue
@@ -36,11 +36,11 @@
 experimental and needs work.  There will be substantial improvements
 in future releases.
 
-ACS also has a simple behavioral modeling language that allows
+Gnucap also has a simple behavioral modeling language that allows
 simple behavioral descriptions of most components including capacitors
 and inductors.
 
-ACS uses an object oriented approach to modeling.  Complex models like
+Gnucap uses an object oriented approach to modeling.  Complex models like
 MOSFETS are made of simpler ones like resistors, capacitors, diodes,
 and any other models that may already exist.  The model designer does
 not need to worry about details like convergence checking, bypass
@@ -54,17 +54,13 @@
 If you are tired of Spice and want a second opinion, you want to
 play with the circuit and want a simulator that is interactive, or
 you want to study the source code and want something easier to
-follow than Spice, try ACS.
+follow than Spice, try Gnucap.
 
-ACS is an ongoing research project.  It is being released in a
+Gnucap is an ongoing research project.  It is being released in a
 preliminary phase in hopes that it will be useful and that others
 will use it as a thrust or base for their research.  I also hope
 for some comments that may help me direct my research.
 
-ACS ftp sites:
-	ftp://sunsite.unc.edu/pub/Linux/apps/circuits/acs-0.27.tar.gz
-	ftp://ftp.geda.seul.org/pub/geda/dist/acs-0.27.tar.gz
-	http://www.geda.seul.org/dist/acs-0.27.tar.gz
 
 Albert Davis
 aldavis at ieee.org
--- gnucap-0.34.orig/src/bm.cc
+++ gnucap-0.34/src/bm.cc
@@ -207,7 +207,8 @@
 /*--------------------------------------------------------------------------*/
 void EVAL_BM_ACTION_BASE::tr_finish_tdv(ELEMENT* d, double val)const
 {
-  d->_y0 = FPOLY1(CPOLY1(ioffset(d->_y0.x), 0., val));
+  CPOLY1 cp1(ioffset(d->_y0.x), 0., val);
+  d->_y0 = FPOLY1(cp1);
   tr_final_adjust(&(d->_y0), false);
 }
 /*--------------------------------------------------------------------------*/
--- gnucap-0.34.orig/src/e_card.h
+++ gnucap-0.34/src/e_card.h
@@ -32,6 +32,7 @@
 // external
 class CS;
 class COMMON_COMPONENT;
+CARD_LIST::fat_iterator findbranch(CS&,CARD_LIST::fat_iterator);
 /*--------------------------------------------------------------------------*/
 class CARD : public CKT_BASE {
 private:
--- gnucap-0.34.orig/src/d_vcvs.cc
+++ gnucap-0.34/src/d_vcvs.cc
@@ -58,7 +58,8 @@
     assert(_y0.f0 != LINEAR);
     store_values();
     q_load();
-    _m0 = CPOLY1(_y0);
+    CPOLY1 cp1(_y0);
+    _m0 =cp1;
     _m0 *= -_loss0;
   }else{
     assert(conchk(_loss0, 1./OPT::shortckt));
--- gnucap-0.34.orig/src/u_sdp.h
+++ gnucap-0.34/src/u_sdp.h
@@ -29,6 +29,9 @@
 #include "ap.h"
 /*--------------------------------------------------------------------------*/
 class OMSTREAM;
+class SDP;
+bool get(CS& cmd, const std::string& key, SDP* value,
+	 AP_MOD mod, double scale);
 /*--------------------------------------------------------------------------*/
 class SDP {
   friend bool get(CS& cmd, const std::string& key, SDP* value,
--- gnucap-0.34.orig/src/e_storag.cc
+++ gnucap-0.34/src/e_storag.cc
@@ -78,7 +78,8 @@
   _dt = NOT_VALID;
   _i0 = _q[0] = _q[1] = _q[2] = _q[3] = FPOLY1(0., 0., 0.);
   _it1_f0 = 0.;
-  _m1 = _m0 = CPOLY1(0., 0., 0.);
+  CPOLY1 cp1(0., 0., 0.);
+  _m1 = _m0 = cp1;
   assert(_loss0 == 0.);
   assert(_loss1 == 0.);
   if (!using_tr_eval()){
--- gnucap-0.34.orig/src/d_admit.cc
+++ gnucap-0.34/src/d_admit.cc
@@ -56,7 +56,8 @@
     assert(_y0.f0 != LINEAR);
     store_values();
     q_load();
-    _m0 = CPOLY1(_y0);
+    CPOLY1 cp1(_y0);
+    _m0 = cp1;
   }else{
     assert(_y0.f0 == LINEAR);
     assert(_y0.f1 == value());
@@ -171,7 +172,8 @@
 bool DEV_CPOLY_G::do_tr()
 {
   assert(_values);
-  _m0 = CPOLY1(0., _values[0], _values[1]);
+  CPOLY1 cp1(0., _values[0], _values[1]);
+  _m0 = cp1;
   return do_tr_con_chk_and_q();
 }
 /*--------------------------------------------------------------------------*/
@@ -193,7 +195,8 @@
     }}
   }}
   trace2("", _values[0], c0);
-  _m0 = CPOLY1(0., c0, _values[1]);
+  CPOLY1 cp1(0., c0, _values[1]);
+  _m0 = cp1;
 
   return do_tr_con_chk_and_q();
 }
--- gnucap-0.34.orig/src/e_compon.h
+++ gnucap-0.34/src/e_compon.h
@@ -43,6 +43,9 @@
 }
 /*--------------------------------------------------------------------------*/
 enum {CC_STATIC=27342}; // mid-sized arbitrary positive int
+class COMMON_COMPONENT;
+void attach_common(COMMON_COMPONENT* c, COMMON_COMPONENT** to);
+void detach_common(COMMON_COMPONENT** from);
 // pass this as an argument to a common constructor to mark it as static,
 // so it won't be deleted
 /*--------------------------------------------------------------------------*/
--- gnucap-0.34.orig/src/d_cap.cc
+++ gnucap-0.34/src/d_cap.cc
@@ -49,7 +49,8 @@
   _i0.f0 = differentiate();
   _i0.f1 = tr_c_to_g(_q[0].f1, _i0.f1);
 
-  _m0 = CPOLY1(_i0);
+  CPOLY1 cp1(_i0);
+  _m0 = cp1;
   return converged();
 }
 /*--------------------------------------------------------------------------*/
@@ -172,7 +173,8 @@
     }}
   }}
   
-  _m0 = CPOLY1(0., _vi0[0], _vi0[1]);
+  CPOLY1 cp1(0., _vi0[0], _vi0[1]);
+  _m0 = cp1;
   return do_tr_con_chk_and_q();
 }
 /*--------------------------------------------------------------------------*/
--- gnucap-0.34.orig/src/l_timer.h
+++ gnucap-0.34/src/l_timer.h
@@ -25,6 +25,8 @@
 #define U_TIMER_H
 #include "io_.h"
 /*--------------------------------------------------------------------------*/
+class TIMER;
+TIMER	operator-(const TIMER&,const TIMER&);
 class TIMER {
 private:
   enum {_T_NAME_LEN = 8};
--- gnucap-0.34.orig/ibis/model-in.cc
+++ gnucap-0.34/ibis/model-in.cc
@@ -145,23 +145,23 @@
 /*--------------------------------------------------------------------------*/
 void Model_Base::Type::parse(CS& file)
 {
-       set(file, "Terminator",	   &_type, mtTERMINATOR)
-    || set(file, "Input_ECL",	   &_type, mtINPUT_ECL)
-    || set(file, "Input",	   &_type, mtINPUT)
-    || set(file, "I/O_open_sink",  &_type, mtIO_OPEN_SINK)
-    || set(file, "I/O_open_drain", &_type, mtIO_OPEN_DRAIN)
-    || set(file, "I/O_open_source",&_type, mtIO_OPEN_SOURCE)
-    || set(file, "I/O_ECL",	   &_type, mtIO_ECL)
-    || set(file, "I/O",		   &_type, mtIO)
-    || set(file, "3-state_ECL",    &_type, mt3STATE_ECL)
-    || set(file, "3-state",	   &_type, mt3STATE)
-    || set(file, "Output_ECL",	   &_type, mtOUTPUT_ECL)
-    || set(file, "Output",	   &_type, mtOUTPUT)
-    || set(file, "Open_sink",	   &_type, mtOPEN_SINK)
-    || set(file, "Open_drain",	   &_type, mtOPEN_DRAIN)
-    || set(file, "Open_source",    &_type, mtOPEN_SOURCE)
-    || set(file, "Series_switch",  &_type, mtSERIES_SWITCH)
-    || set(file, "Series",	   &_type, mtSERIES)
+       set(file, "Terminator",	   (int*)&_type, (int)mtTERMINATOR)
+    || set(file, "Input_ECL",	   (int*)&_type, (int)mtINPUT_ECL)
+    || set(file, "Input",	   (int*)&_type, (int)mtINPUT)
+    || set(file, "I/O_open_sink",  (int*)&_type, (int)mtIO_OPEN_SINK)
+    || set(file, "I/O_open_drain", (int*)&_type, (int)mtIO_OPEN_DRAIN)
+    || set(file, "I/O_open_source",(int*)&_type, (int)mtIO_OPEN_SOURCE)
+    || set(file, "I/O_ECL",	   (int*)&_type, (int)mtIO_ECL)
+    || set(file, "I/O",		   (int*)&_type, (int)mtIO)
+    || set(file, "3-state_ECL",    (int*)&_type, (int)mt3STATE_ECL)
+    || set(file, "3-state",	   (int*)&_type, (int)mt3STATE)
+    || set(file, "Output_ECL",	   (int*)&_type, (int)mtOUTPUT_ECL)
+    || set(file, "Output",	   (int*)&_type, (int)mtOUTPUT)
+    || set(file, "Open_sink",	   (int*)&_type, (int)mtOPEN_SINK)
+    || set(file, "Open_drain",	   (int*)&_type, (int)mtOPEN_DRAIN)
+    || set(file, "Open_source",    (int*)&_type, (int)mtOPEN_SOURCE)
+    || set(file, "Series_switch",  (int*)&_type, (int)mtSERIES_SWITCH)
+    || set(file, "Series",	   (int*)&_type, (int)mtSERIES)
     || file.warn(0, "illegal model type");
 }
 /*--------------------------------------------------------------------------*/
@@ -235,8 +235,8 @@
 /*--------------------------------------------------------------------------*/
 void IO_Base::Polarity::parse(CS& file)
 {
-       set(file, "Non-Inverting", &_p, pNON_INVERTING)
-    || set(file, "Inverting",	  &_p, pINVERTING)
+       set(file, "Non-Inverting", (int*)&_p, (int)pNON_INVERTING)
+    || set(file, "Inverting",	  (int*)&_p, (int)pINVERTING)
     || file.warn(0, "need Inverting or Non-Inverting");
 }
 /*--------------------------------------------------------------------------*/
--- gnucap-0.34.orig/ibis/base.h
+++ gnucap-0.34/ibis/base.h
@@ -40,7 +40,7 @@
 class Base
 {
 private:
-  explicit Base(const Base&) {unreachable();}
+//  explicit Base(const Base&) {unreachable();}
   // This private base copy constructor inhibits generation of
   // copy constructors for its derived classes.
 protected:
--- gnucap-0.34.orig/ibis/comp-in.cc
+++ gnucap-0.34/ibis/comp-in.cc
@@ -24,8 +24,8 @@
 /*--------------------------------------------------------------------------*/
 void Component::Pin_Die::parse(CS& file)
 {
-       set(file, "Pin", &_pd, pdPIN)
-    || set(file, "Die", &_pd, pdDIE)
+       set(file, "Pin", (int*)&_pd, (int)pdPIN)
+    || set(file, "Die", (int*)&_pd, (int)pdDIE)
     || file.warn(0, "need Pin or Die");
 }
 /*--------------------------------------------------------------------------*/
--- gnucap-0.34.orig/ibis/file-in.cc
+++ gnucap-0.34/ibis/file-in.cc
@@ -25,9 +25,9 @@
 /*--------------------------------------------------------------------------*/
 void Redistribution::parse(CS& file)
 {
-       set(file, "Yes",	    &_r, dYES)
-    || set(file, "No",	    &_r, dNO)
-    || set(file, "Specific",&_r, dSPECIFIC)
+       set(file, "Yes",	    (int*)&_r, (int)dYES)
+    || set(file, "No",	    (int*)&_r, (int)dNO)
+    || set(file, "Specific",(int*)&_r, (int)dSPECIFIC)
     || file.warn(0, "need Yes, No, or Specific");
 }
 /*--------------------------------------------------------------------------*/
--- gnucap-0.34.orig/modelgen/mg_.h
+++ gnucap-0.34/modelgen/mg_.h
@@ -118,7 +118,7 @@
 	}
 	T* p = new T(file);
 	{if (!file.stuck(&here)) {
-	  _list.push_back(p);
+	  this->_list.push_back(p);
 	}else {
 	  delete p;
 	  file.warn(0, "not valid here");
@@ -137,7 +137,7 @@
     int here = file.cursor();
     T* m = new T(file);
     {if (!file.stuck(&here)) {
-      _list.push_back(m);
+      this->_list.push_back(m);
     }else{
       delete m;
       file.warn(0, "what's this??");
--- gnucap-0.34.orig/examples/runall
+++ gnucap-0.34/examples/runall
@@ -1,16 +1,16 @@
-#
-$1 -b eq2-145.ckt
-$1 -b eq2-289.ckt
-$1 -b eq2-577.ckt
-$1 -b eq3-1153.ckt
-$1 -b eq4-2305.ckt
-$1 -b eqboost.ckt
-$1 -b eqflat.ckt 
-$1 -b eqmodify.ckt
-$1 -b killzap.ckt
-$1 -b nmos100.ckt
-$1 -b nmos18.ckt 
-$1 -b nmos30.ckt 
-$1 -b nmp100.ckt 
-$1 -b opamp-ol.ckt
-$1 -b opamp-vf.ckt
+#!/bin/sh
+gnucap -b eq2-145.ckt
+gnucap -b eq2-289.ckt
+gnucap -b eq2-577.ckt
+gnucap -b eq3-1153.ckt
+gnucap -b eq4-2305.ckt
+gnucap -b eqboost.ckt
+gnucap -b eqflat.ckt 
+gnucap -b eqmodify.ckt
+gnucap -b killzap.ckt
+gnucap -b nmos100.ckt
+gnucap -b nmos18.ckt 
+gnucap -b nmos30.ckt 
+gnucap -b nmp100.ckt 
+gnucap -b opamp-ol.ckt
+gnucap -b opamp-vf.ckt


--- NEW FILE gnucap.spec ---
Name:           gnucap
Version:        0.34
Release:        2%{?dist}
Summary:        The Gnu Circuit Analysis Package
Group:          Applications/Engineering
License:        GPL
URL:            http://www.geda.seul.org/tools/gnucap
Source0:        http://www.geda.seul.org/tools/gnucap/archive/%{name}-%{version}.tar.gz
Patch0:         gnucap-0.34-debian.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  readline-devel

%description
The primary component is a general purpose circuit simulator. It performs
nonlinear dc and transient analyses, fourier analysis, and ac analysis. Spice
compatible models for the MOSFET (level 1-7), BJT, and diode are included in
this release. Gnucap is not based on Spice, but some of the models have been
derived from the Berkeley models. Unlike Spice, the engine is designed to do
true mixed-mode simulation. Most of the code is in place for future support of
event driven analog simulation, and true multi-rate simulation.


%prep
%setup -q
%patch0 -p1 -z .debian
%{__sed} -i 's!/usr/lib!%{_libdir}!g' src/configure 
%{__sed} -i 's!ln -s!ln!g' src/Make1
%{__sed} -i 's!ln -s!ln!g' src/Make.aux
mv doc/acs-tutorial doc/gnucap-tutorial


%build
# Don't use %%configure because this is not an autotools-generated
# configure script and will choke on some of the default configure switches.
./configure --prefix=%{_prefix}
make %{?_smp_mflags} \
  CCFLAGS="$RPM_OPT_FLAGS -DHAS_READLINE -DUNIX -DNDEBUG -I. -I.."


%install
# make install uses hardcoded /usr/bin etc paths, so we must do this DIY
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_mandir}/man1
install -m 755 src/O/gnucap $RPM_BUILD_ROOT%{_bindir}
install -m 755 ibis/O/gnucap-ibis $RPM_BUILD_ROOT%{_bindir}
install -m 755 modelgen/O/gnucap-modelgen $RPM_BUILD_ROOT%{_bindir}
install -m 644 doc/gnucap.1 doc/gnucap-ibis.1 $RPM_BUILD_ROOT%{_mandir}/man1


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc doc/COPYING doc/history doc/relnotes.* doc/gnucap-tutorial doc/whatisit
%doc man/gnucap-man.pdf man/html
%{_bindir}/%{name}*
%{_mandir}/man1/%{name}*.1.gz


%changelog
* Thu Apr 27 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.34-2
- add %%{?_smp_mflags} to the make command (bz 189699)

* Sun Apr 23 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.34-1
- Initial spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnucap/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Apr 2006 19:28:44 -0000	1.1
+++ .cvsignore	27 Apr 2006 19:29:32 -0000	1.2
@@ -0,0 +1 @@
+gnucap-0.34.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnucap/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Apr 2006 19:28:44 -0000	1.1
+++ sources	27 Apr 2006 19:29:32 -0000	1.2
@@ -0,0 +1 @@
+0d346f02a38c544fda6f8d7ec4f8b45e  gnucap-0.34.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 19:29:32 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Thu, 27 Apr 2006 12:29:32 -0700
Subject: rpms/gnucap import.log,1.1,1.2
Message-ID: <200604271929.k3RJTYab004673@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gnucap
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4631

Modified Files:
	import.log 
Log Message:
auto-import gnucap-0.34-2 on branch devel from gnucap-0.34-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gnucap/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	27 Apr 2006 19:28:44 -0000	1.1
+++ import.log	27 Apr 2006 19:29:32 -0000	1.2
@@ -0,0 +1 @@
+gnucap-0_34-2:HEAD:gnucap-0.34-2.src.rpm:1146166172



From fedora-extras-commits at redhat.com  Thu Apr 27 19:52:38 2006
From: fedora-extras-commits at redhat.com (Mike Bonnet (mikeb))
Date: Thu, 27 Apr 2006 12:52:38 -0700
Subject: krbVmodule COPYING, NONE, 1.1 AUTHORS, 1.1, 1.2 configure.in, 1.17,
	1.18 python-krbV.spec, 1.2, 1.3
Message-ID: <200604271952.k3RJqcp8008988@cvs-int.fedora.redhat.com>

Author: mikeb

Update of /cvs/devel/krbVmodule
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8958

Modified Files:
	AUTHORS configure.in python-krbV.spec 
Added Files:
	COPYING 
Log Message:
various cleanups before submitting to Extras


--- NEW FILE COPYING ---
		  GNU LESSER GENERAL PUBLIC LICENSE
		       Version 2.1, February 1999

 Copyright (C) 1991, 1999 Free Software Foundation, Inc.
 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

[This is the first released version of the Lesser GPL.  It also counts
 as the successor of the GNU Library Public License, version 2, hence
 the version number 2.1.]

			    Preamble

  The licenses for most software are designed to take away your
freedom to share and change it.  By contrast, the GNU General Public
Licenses are intended to guarantee your freedom to share and change
free software--to make sure the software is free for all its users.

  This license, the Lesser General Public License, applies to some
specially designated software packages--typically libraries--of the
Free Software Foundation and other authors who decide to use it.  You
can use it too, but we suggest you first think carefully about whether
this license or the ordinary General Public License is the better
strategy to use in any particular case, based on the explanations below.

  When we speak of free software, we are referring to freedom of use,
not price.  Our General Public Licenses are designed to make sure that
you have the freedom to distribute copies of free software (and charge
for this service if you wish); that you receive source code or can get
it if you want it; that you can change the software and use pieces of
it in new free programs; and that you are informed that you can do
these things.

  To protect your rights, we need to make restrictions that forbid
distributors to deny you these rights or to ask you to surrender these
rights.  These restrictions translate to certain responsibilities for
you if you distribute copies of the library or if you modify it.

  For example, if you distribute copies of the library, whether gratis
or for a fee, you must give the recipients all the rights that we gave
you.  You must make sure that they, too, receive or can get the source
code.  If you link other code with the library, you must provide
complete object files to the recipients, so that they can relink them
with the library after making changes to the library and recompiling
it.  And you must show them these terms so they know their rights.

  We protect your rights with a two-step method: (1) we copyright the
library, and (2) we offer you this license, which gives you legal
permission to copy, distribute and/or modify the library.

  To protect each distributor, we want to make it very clear that
there is no warranty for the free library.  Also, if the library is
modified by someone else and passed on, the recipients should know
that what they have is not the original version, so that the original
author's reputation will not be affected by problems that might be
introduced by others.

  Finally, software patents pose a constant threat to the existence of
any free program.  We wish to make sure that a company cannot
effectively restrict the users of a free program by obtaining a
restrictive license from a patent holder.  Therefore, we insist that
any patent license obtained for a version of the library must be
consistent with the full freedom of use specified in this license.

  Most GNU software, including some libraries, is covered by the
ordinary GNU General Public License.  This license, the GNU Lesser
General Public License, applies to certain designated libraries, and
is quite different from the ordinary General Public License.  We use
this license for certain libraries in order to permit linking those
libraries into non-free programs.

  When a program is linked with a library, whether statically or using
a shared library, the combination of the two is legally speaking a
combined work, a derivative of the original library.  The ordinary
General Public License therefore permits such linking only if the
entire combination fits its criteria of freedom.  The Lesser General
Public License permits more lax criteria for linking other code with
the library.

  We call this license the "Lesser" General Public License because it
does Less to protect the user's freedom than the ordinary General
Public License.  It also provides other free software developers Less
of an advantage over competing non-free programs.  These disadvantages
are the reason we use the ordinary General Public License for many
libraries.  However, the Lesser license provides advantages in certain
special circumstances.

  For example, on rare occasions, there may be a special need to
encourage the widest possible use of a certain library, so that it becomes
a de-facto standard.  To achieve this, non-free programs must be
allowed to use the library.  A more frequent case is that a free
library does the same job as widely used non-free libraries.  In this
case, there is little to gain by limiting the free library to free
software only, so we use the Lesser General Public License.

  In other cases, permission to use a particular library in non-free
programs enables a greater number of people to use a large body of
free software.  For example, permission to use the GNU C Library in
non-free programs enables many more people to use the whole GNU
operating system, as well as its variant, the GNU/Linux operating
system.

  Although the Lesser General Public License is Less protective of the
users' freedom, it does ensure that the user of a program that is
linked with the Library has the freedom and the wherewithal to run
that program using a modified version of the Library.

  The precise terms and conditions for copying, distribution and
modification follow.  Pay close attention to the difference between a
"work based on the library" and a "work that uses the library".  The
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.

		  GNU LESSER GENERAL PUBLIC LICENSE
   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

  0. This License Agreement applies to any software library or other
program which contains a notice placed by the copyright holder or
other authorized party saying it may be distributed under the terms of
this Lesser General Public License (also called "this License").
Each licensee is addressed as "you".

  A "library" means a collection of software functions and/or data
prepared so as to be conveniently linked with application programs
(which use some of those functions and data) to form executables.

  The "Library", below, refers to any such software library or work
which has been distributed under these terms.  A "work based on the
Library" means either the Library or any derivative work under
copyright law: that is to say, a work containing the Library or a
portion of it, either verbatim or with modifications and/or translated
straightforwardly into another language.  (Hereinafter, translation is
included without limitation in the term "modification".)

  "Source code" for a work means the preferred form of the work for
making modifications to it.  For a library, complete source code means
all the source code for all modules it contains, plus any associated
interface definition files, plus the scripts used to control compilation
and installation of the library.

  Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope.  The act of
running a program using the Library is not restricted, and output from
such a program is covered only if its contents constitute a work based
on the Library (independent of the use of the Library in a tool for
writing it).  Whether that is true depends on what the Library does
and what the program that uses the Library does.
  
  1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
appropriate copyright notice and disclaimer of warranty; keep intact
all the notices that refer to this License and to the absence of any
warranty; and distribute a copy of this License along with the
Library.

  You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a
fee.

  2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
above, provided that you also meet all of these conditions:

    a) The modified work must itself be a software library.

    b) You must cause the files modified to carry prominent notices
    stating that you changed the files and the date of any change.

    c) You must cause the whole of the work to be licensed at no
    charge to all third parties under the terms of this License.

    d) If a facility in the modified Library refers to a function or a
    table of data to be supplied by an application program that uses
    the facility, other than as an argument passed when the facility
    is invoked, then you must make a good faith effort to ensure that,
    in the event an application does not supply such function or
    table, the facility still operates, and performs whatever part of
    its purpose remains meaningful.

    (For example, a function in a library to compute square roots has
    a purpose that is entirely well-defined independent of the
    application.  Therefore, Subsection 2d requires that any
    application-supplied function or table used by this function must
    be optional: if the application does not supply it, the square
    root function must still compute square roots.)

These requirements apply to the modified work as a whole.  If
identifiable sections of that work are not derived from the Library,
and can be reasonably considered independent and separate works in
themselves, then this License, and its terms, do not apply to those
sections when you distribute them as separate works.  But when you
distribute the same sections as part of a whole which is a work based
on the Library, the distribution of the whole must be on the terms of
this License, whose permissions for other licensees extend to the
entire whole, and thus to each and every part regardless of who wrote
it.

Thus, it is not the intent of this section to claim rights or contest
your rights to work written entirely by you; rather, the intent is to
exercise the right to control the distribution of derivative or
collective works based on the Library.

In addition, mere aggregation of another work not based on the Library
with the Library (or with a work based on the Library) on a volume of
a storage or distribution medium does not bring the other work under
the scope of this License.

  3. You may opt to apply the terms of the ordinary GNU General Public
License instead of this License to a given copy of the Library.  To do
this, you must alter all the notices that refer to this License, so
that they refer to the ordinary GNU General Public License, version 2,
instead of to this License.  (If a newer version than version 2 of the
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.)  Do not make any other change in
these notices.

  Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.

  This option is useful when you wish to copy part of the code of
the Library into a program that is not a library.

  4. You may copy and distribute the Library (or a portion or
derivative of it, under Section 2) in object code or executable form
under the terms of Sections 1 and 2 above provided that you accompany
it with the complete corresponding machine-readable source code, which
must be distributed under the terms of Sections 1 and 2 above on a
medium customarily used for software interchange.

  If distribution of object code is made by offering access to copy
from a designated place, then offering equivalent access to copy the
source code from the same place satisfies the requirement to
distribute the source code, even though third parties are not
compelled to copy the source along with the object code.

  5. A program that contains no derivative of any portion of the
Library, but is designed to work with the Library by being compiled or
linked with it, is called a "work that uses the Library".  Such a
work, in isolation, is not a derivative work of the Library, and
therefore falls outside the scope of this License.

  However, linking a "work that uses the Library" with the Library
creates an executable that is a derivative of the Library (because it
contains portions of the Library), rather than a "work that uses the
library".  The executable is therefore covered by this License.
Section 6 states terms for distribution of such executables.

  When a "work that uses the Library" uses material from a header file
that is part of the Library, the object code for the work may be a
derivative work of the Library even though the source code is not.
Whether this is true is especially significant if the work can be
linked without the Library, or if the work is itself a library.  The
threshold for this to be true is not precisely defined by law.

  If such an object file uses only numerical parameters, data
structure layouts and accessors, and small macros and small inline
functions (ten lines or less in length), then the use of the object
file is unrestricted, regardless of whether it is legally a derivative
work.  (Executables containing this object code plus portions of the
Library will still fall under Section 6.)

  Otherwise, if the work is a derivative of the Library, you may
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.

  6. As an exception to the Sections above, you may also combine or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
under terms of your choice, provided that the terms permit
modification of the work for the customer's own use and reverse
engineering for debugging such modifications.

  You must give prominent notice with each copy of the work that the
Library is used in it and that the Library and its use are covered by
this License.  You must supply a copy of this License.  If the work
during execution displays copyright notices, you must include the
copyright notice for the Library among them, as well as a reference
directing the user to the copy of this License.  Also, you must do one
of these things:

    a) Accompany the work with the complete corresponding
    machine-readable source code for the Library including whatever
    changes were used in the work (which must be distributed under
    Sections 1 and 2 above); and, if the work is an executable linked
    with the Library, with the complete machine-readable "work that
    uses the Library", as object code and/or source code, so that the
    user can modify the Library and then relink to produce a modified
    executable containing the modified Library.  (It is understood
    that the user who changes the contents of definitions files in the
    Library will not necessarily be able to recompile the application
    to use the modified definitions.)

    b) Use a suitable shared library mechanism for linking with the
    Library.  A suitable mechanism is one that (1) uses at run time a
    copy of the library already present on the user's computer system,
    rather than copying library functions into the executable, and (2)
    will operate properly with a modified version of the library, if
    the user installs one, as long as the modified version is
    interface-compatible with the version that the work was made with.

    c) Accompany the work with a written offer, valid for at
    least three years, to give the same user the materials
    specified in Subsection 6a, above, for a charge no more
    than the cost of performing this distribution.

    d) If distribution of the work is made by offering access to copy
    from a designated place, offer equivalent access to copy the above
    specified materials from the same place.

    e) Verify that the user has already received a copy of these
    materials or that you have already sent this user a copy.

  For an executable, the required form of the "work that uses the
Library" must include any data and utility programs needed for
reproducing the executable from it.  However, as a special exception,
the materials to be distributed need not include anything that is
normally distributed (in either source or binary form) with the major
components (compiler, kernel, and so on) of the operating system on
which the executable runs, unless that component itself accompanies
the executable.

  It may happen that this requirement contradicts the license
restrictions of other proprietary libraries that do not normally
accompany the operating system.  Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.

  7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
library, provided that the separate distribution of the work based on
the Library and of the other library facilities is otherwise
permitted, and provided that you do these two things:

    a) Accompany the combined library with a copy of the same work
    based on the Library, uncombined with any other library
    facilities.  This must be distributed under the terms of the
    Sections above.

    b) Give prominent notice with the combined library of the fact
    that part of it is a work based on the Library, and explaining
    where to find the accompanying uncombined form of the same work.

  8. You may not copy, modify, sublicense, link with, or distribute
the Library except as expressly provided under this License.  Any
attempt otherwise to copy, modify, sublicense, link with, or
distribute the Library is void, and will automatically terminate your
rights under this License.  However, parties who have received copies,
or rights, from you under this License will not have their licenses
terminated so long as such parties remain in full compliance.

  9. You are not required to accept this License, since you have not
signed it.  However, nothing else grants you permission to modify or
distribute the Library or its derivative works.  These actions are
prohibited by law if you do not accept this License.  Therefore, by
modifying or distributing the Library (or any work based on the
Library), you indicate your acceptance of this License to do so, and
all its terms and conditions for copying, distributing or modifying
the Library or works based on it.

  10. Each time you redistribute the Library (or any work based on the
Library), the recipient automatically receives a license from the
original licensor to copy, distribute, link with or modify the Library
subject to these terms and conditions.  You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties with
this License.

  11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License.  If you cannot
distribute so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you
may not distribute the Library at all.  For example, if a patent
license would not permit royalty-free redistribution of the Library by
all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Library.

If any portion of this section is held invalid or unenforceable under any
particular circumstance, the balance of the section is intended to apply,
and the section as a whole is intended to apply in other circumstances.

It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
such claims; this section has the sole purpose of protecting the
integrity of the free software distribution system which is
implemented by public license practices.  Many people have made
generous contributions to the wide range of software distributed
through that system in reliance on consistent application of that
system; it is up to the author/donor to decide if he or she is willing
to distribute software through any other system and a licensee cannot
impose that choice.

This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License.

  12. If the distribution and/or use of the Library is restricted in
certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Library under this License may add
an explicit geographical distribution limitation excluding those countries,
so that distribution is permitted only in or among countries not thus
excluded.  In such case, this License incorporates the limitation as if
written in the body of this License.

  13. The Free Software Foundation may publish revised and/or new
versions of the Lesser General Public License from time to time.
Such new versions will be similar in spirit to the present version,
but may differ in detail to address new problems or concerns.

Each version is given a distinguishing version number.  If the Library
specifies a version number of this License which applies to it and
"any later version", you have the option of following the terms and
conditions either of that version or of any later version published by
the Free Software Foundation.  If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.

  14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission.  For software which is
copyrighted by the Free Software Foundation, write to the Free
Software Foundation; we sometimes make exceptions for this.  Our
decision will be guided by the two goals of preserving the free status
of all derivatives of our free software and of promoting the sharing
and reuse of software generally.

			    NO WARRANTY

  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.

  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.

		     END OF TERMS AND CONDITIONS

           How to Apply These Terms to Your New Libraries

  If you develop a new library, and you want it to be of the greatest
possible use to the public, we recommend making it free software that
everyone can redistribute and change.  You can do so by permitting
redistribution under these terms (or, alternatively, under the terms of the
ordinary General Public License).

  To apply these terms, attach the following notices to the library.  It is
safest to attach them to the start of each source file to most effectively
convey the exclusion of warranty; and each file should have at least the
"copyright" line and a pointer to where the full notice is found.

    <one line to give the library's name and a brief idea of what it does.>
    Copyright (C) <year>  <name of author>

    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
    version 2.1 of the License, or (at your option) any later version.

    This library is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    Lesser General Public License for more details.

    You should have received a copy of the GNU Lesser General Public
    License along with this library; if not, write to the Free Software
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

Also add information on how to contact you by electronic and paper mail.

You should also get your employer (if you work as a programmer) or your
school, if any, to sign a "copyright disclaimer" for the library, if
necessary.  Here is a sample; alter the names:

  Yoyodyne, Inc., hereby disclaims all copyright interest in the
  library `Frob' (a library for tweaking knobs) written by James Random Hacker.

  <signature of Ty Coon>, 1 April 1990
  Ty Coon, President of Vice

That's all there is to it!




Index: AUTHORS
===================================================================
RCS file: /cvs/devel/krbVmodule/AUTHORS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AUTHORS	24 Aug 2001 18:31:04 -0000	1.1
+++ AUTHORS	27 Apr 2006 19:52:36 -0000	1.2
@@ -1 +1,2 @@
 Elliot Lee <sopwith at redhat.com>
+Mike Bonnet <mikeb at redhat.com>


Index: configure.in
===================================================================
RCS file: /cvs/devel/krbVmodule/configure.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- configure.in	24 Apr 2006 15:12:38 -0000	1.17
+++ configure.in	27 Apr 2006 19:52:36 -0000	1.18
@@ -1,6 +1,6 @@
 AC_INIT
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(python-krbV, 1.0.12)
+AM_INIT_AUTOMAKE(python-krbV, $(/bin/awk '/^Version:/ { print $2 }' python-krbV.spec))
 
 AC_PREFIX_DEFAULT(/usr)
 


Index: python-krbV.spec
===================================================================
RCS file: /cvs/devel/krbVmodule/python-krbV.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-krbV.spec	24 Apr 2006 15:12:38 -0000	1.2
+++ python-krbV.spec	27 Apr 2006 19:52:36 -0000	1.3
@@ -2,13 +2,14 @@
 
 Name: python-krbV
 Version: 1.0.12
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Python extension module for Kerberos 5
 
 Group: Development/Languages
 License: LGPL
 
-Source: python-krbV-%{version}.tar.gz
+URL: http://people.redhat.com/mikeb/python-krbV
+Source0: http://people.redhat.com/mikeb/python-krbV/python-krbV-%{version}.tar.gz
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -18,7 +19,6 @@
 BuildRequires: /bin/awk
 
 Requires: python-abi = %(%{__python} -c "import sys ; print sys.version[:3]")
-Requires: krb5-libs >= 1.2.2
 
 %description
 python-krbV allows python programs to use Kerberos 5 authentication/security.
@@ -43,11 +43,18 @@
 
 %files
 %defattr(-,root,root,-)
-%doc README krbV-code-snippets.py
+%doc README COPYING krbV-code-snippets.py
 %{python_sitelib}/krbVmodule.so
 
 %changelog
-* Mon Apr 24 2006 Michael Bonnet <mikeb at redhat.com> - 1.0.12
+* Thu Apr 27 2006 Mike Bonnet <mikeb at redhat.com> - 1.0.12-2
+- configure.in: parse version number out of spec file
+- add URL tag
+- add LGPL text
+- remove Requires: krb5-libs, let rpm pick up library dependencies
+- bump revision
+
+* Mon Apr 24 2006 Mike Bonnet <mikeb at redhat.com> - 1.0.12-1
 - bump version number due to API changes
 
 * Fri Mar 24 2006 Mike Bonnet <mikeb at redhat.com>



From fedora-extras-commits at redhat.com  Thu Apr 27 21:28:35 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 14:28:35 -0700
Subject: rpms/perl-Crypt-Blowfish/FC-4 perl-Crypt-Blowfish.spec,1.3,1.4
Message-ID: <200604272128.k3RLSbqL030655@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/perl-Crypt-Blowfish/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30598/FC-4

Modified Files:
	perl-Crypt-Blowfish.spec 
Log Message:
* Thu Apr 27 2006 Andreas Thienemann <andreas at bawue.net> - 2.10-1
- Updated to 2.10



Index: perl-Crypt-Blowfish.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-Blowfish/FC-4/perl-Crypt-Blowfish.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Crypt-Blowfish.spec	14 Jul 2005 19:31:30 -0000	1.3
+++ perl-Crypt-Blowfish.spec	27 Apr 2006 21:28:35 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: XS Blowfish implementation for Perl
 Name: perl-Crypt-Blowfish
-Version: 2.09
-Release: 2%{?dist}
+Version: 2.10
+Release: 1%{?dist}
 License: Distributable
 Group: Development/Libraries
 URL: http://search.cpan.org/dist/Crypt-Blowfish/
@@ -46,10 +46,12 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Apr 27 2006 Andreas Thienemann <andreas at bawue.net> - 2.10-1
+- Updated to 2.10
+
 * Thu Jul 14 2005 Andreas Thienemann <andreas at bawue.net> - 2.09-2
 - Fixed find line to not shellexpand.
 
-
 * Thu Jul 14 2005 Andreas Thienemann <andreas at bawue.net> - 2.09-1
 - Initial package
 



From fedora-extras-commits at redhat.com  Thu Apr 27 21:28:36 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 14:28:36 -0700
Subject: rpms/perl-Crypt-Blowfish/FC-5 perl-Crypt-Blowfish.spec,1.3,1.4
Message-ID: <200604272128.k3RLScAU030660@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/perl-Crypt-Blowfish/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30598/FC-5

Modified Files:
	perl-Crypt-Blowfish.spec 
Log Message:
* Thu Apr 27 2006 Andreas Thienemann <andreas at bawue.net> - 2.10-1
- Updated to 2.10



Index: perl-Crypt-Blowfish.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-Blowfish/FC-5/perl-Crypt-Blowfish.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Crypt-Blowfish.spec	14 Jul 2005 19:31:30 -0000	1.3
+++ perl-Crypt-Blowfish.spec	27 Apr 2006 21:28:36 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: XS Blowfish implementation for Perl
 Name: perl-Crypt-Blowfish
-Version: 2.09
-Release: 2%{?dist}
+Version: 2.10
+Release: 1%{?dist}
 License: Distributable
 Group: Development/Libraries
 URL: http://search.cpan.org/dist/Crypt-Blowfish/
@@ -46,10 +46,12 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Apr 27 2006 Andreas Thienemann <andreas at bawue.net> - 2.10-1
+- Updated to 2.10
+
 * Thu Jul 14 2005 Andreas Thienemann <andreas at bawue.net> - 2.09-2
 - Fixed find line to not shellexpand.
 
-
 * Thu Jul 14 2005 Andreas Thienemann <andreas at bawue.net> - 2.09-1
 - Initial package
 



From fedora-extras-commits at redhat.com  Thu Apr 27 21:28:37 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 14:28:37 -0700
Subject: rpms/perl-Crypt-Blowfish/devel .cvsignore, 1.2,
	1.3 perl-Crypt-Blowfish.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200604272128.k3RLSdIb030669@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/perl-Crypt-Blowfish/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30598/devel

Modified Files:
	.cvsignore perl-Crypt-Blowfish.spec sources 
Log Message:
* Thu Apr 27 2006 Andreas Thienemann <andreas at bawue.net> - 2.10-1
- Updated to 2.10



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-Blowfish/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Jul 2005 18:49:02 -0000	1.2
+++ .cvsignore	27 Apr 2006 21:28:37 -0000	1.3
@@ -1 +1 @@
-Crypt-Blowfish-2.09.tar.gz
+Crypt-Blowfish-2.10.tar.gz


Index: perl-Crypt-Blowfish.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-Blowfish/devel/perl-Crypt-Blowfish.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-Crypt-Blowfish.spec	14 Jul 2005 19:31:30 -0000	1.3
+++ perl-Crypt-Blowfish.spec	27 Apr 2006 21:28:37 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: XS Blowfish implementation for Perl
 Name: perl-Crypt-Blowfish
-Version: 2.09
-Release: 2%{?dist}
+Version: 2.10
+Release: 1%{?dist}
 License: Distributable
 Group: Development/Libraries
 URL: http://search.cpan.org/dist/Crypt-Blowfish/
@@ -46,10 +46,12 @@
 %{_mandir}/man3/*.3*
 
 %changelog
+* Thu Apr 27 2006 Andreas Thienemann <andreas at bawue.net> - 2.10-1
+- Updated to 2.10
+
 * Thu Jul 14 2005 Andreas Thienemann <andreas at bawue.net> - 2.09-2
 - Fixed find line to not shellexpand.
 
-
 * Thu Jul 14 2005 Andreas Thienemann <andreas at bawue.net> - 2.09-1
 - Initial package
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-Blowfish/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Jul 2005 18:49:02 -0000	1.2
+++ sources	27 Apr 2006 21:28:37 -0000	1.3
@@ -1 +1 @@
-bbd037e1eb20778f3d636dff345ed02f  Crypt-Blowfish-2.09.tar.gz
+15b53308df3b29a62a9f2f718aace19a  Crypt-Blowfish-2.10.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 21:29:04 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 14:29:04 -0700
Subject: rpms/perl-Crypt-Blowfish/FC-4 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200604272129.k3RLT6RK030798@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/perl-Crypt-Blowfish/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30754/FC-4

Modified Files:
	.cvsignore sources 
Log Message:
* Thu Apr 27 2006 Andreas Thienemann <andreas at bawue.net> - 2.10-1
- Updated to 2.10



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-Blowfish/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Jul 2005 18:49:02 -0000	1.2
+++ .cvsignore	27 Apr 2006 21:29:04 -0000	1.3
@@ -1 +1 @@
-Crypt-Blowfish-2.09.tar.gz
+Crypt-Blowfish-2.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-Blowfish/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Jul 2005 18:49:02 -0000	1.2
+++ sources	27 Apr 2006 21:29:04 -0000	1.3
@@ -1 +1 @@
-bbd037e1eb20778f3d636dff345ed02f  Crypt-Blowfish-2.09.tar.gz
+15b53308df3b29a62a9f2f718aace19a  Crypt-Blowfish-2.10.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 21:29:05 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 14:29:05 -0700
Subject: rpms/perl-Crypt-Blowfish/FC-5 .cvsignore,1.2,1.3 sources,1.2,1.3
Message-ID: <200604272129.k3RLT72l030804@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/perl-Crypt-Blowfish/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30754/FC-5

Modified Files:
	.cvsignore sources 
Log Message:
* Thu Apr 27 2006 Andreas Thienemann <andreas at bawue.net> - 2.10-1
- Updated to 2.10



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-Blowfish/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	14 Jul 2005 18:49:02 -0000	1.2
+++ .cvsignore	27 Apr 2006 21:29:05 -0000	1.3
@@ -1 +1 @@
-Crypt-Blowfish-2.09.tar.gz
+Crypt-Blowfish-2.10.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Crypt-Blowfish/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	14 Jul 2005 18:49:02 -0000	1.2
+++ sources	27 Apr 2006 21:29:05 -0000	1.3
@@ -1 +1 @@
-bbd037e1eb20778f3d636dff345ed02f  Crypt-Blowfish-2.09.tar.gz
+15b53308df3b29a62a9f2f718aace19a  Crypt-Blowfish-2.10.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 21:51:15 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Thu, 27 Apr 2006 14:51:15 -0700
Subject: owners owners.list,1.907,1.908
Message-ID: <200604272151.k3RLpH51002550@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2509

Modified Files:
	owners.list 
Log Message:
+bcm43xx-fwcutter (dwmw2, #186264)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.907
retrieving revision 1.908
diff -u -r1.907 -r1.908
--- owners.list	27 Apr 2006 19:05:36 -0000	1.907
+++ owners.list	27 Apr 2006 21:51:15 -0000	1.908
@@ -75,6 +75,7 @@
 Fedora Extras|bazaar|A distributed revision control system|shahms at shahms.com|extras-qa at fedoraproject.org|
 Fedora Extras|bbkeys|Completely configurable key-combo grabber for blackbox|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|bchunk|CD image format converter from .bin/.cue to .iso/.cdr|bugs.michael at gmx.net|extras-qa at fedoraproject.org|
+Fedora Extras|bcm43xx-fwcutter|Firmware extraction tool for Broadcom wireless driver|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|BibTool|A Tool for manipulating BibTeX data bases|pertusus at free.fr|extras-qa at fedoraproject.org|
 Fedora Extras|bidiv|Display logical Hebrew on unidirectional terminals|danken at cs.technion.ac.il|extras-qa at fedoraproject.org|
 Fedora Extras|bigloo|Bigloo is compiler for the Scheme programming language|gemi at bluewin.ch|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Apr 27 22:48:28 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Thu, 27 Apr 2006 15:48:28 -0700
Subject: owners owners.list,1.908,1.909
Message-ID: <200604272248.k3RMmUMv010519@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10470

Modified Files:
	owners.list 
Log Message:
taking ownership of gurlchecker



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.908
retrieving revision 1.909
diff -u -r1.908 -r1.909
--- owners.list	27 Apr 2006 21:51:15 -0000	1.908
+++ owners.list	27 Apr 2006 22:48:28 -0000	1.909
@@ -445,7 +445,7 @@
 Fedora Extras|gtorrentviewer|A GTK2-based viewer and editor for BitTorrent meta files|paul at city-fan.org|extras-qa at fedoraproject.org|
 Fedora Extras|gtranslator|A gettext po file editor for GNOME|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|
 Fedora Extras|gtweakui|Extra configuration dialogs for GNOME|matthias at rpmforge.net|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|gurlchecker|A GNOME link validity checker|michael at knox.net.nz|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|
 Fedora Extras|gweled|Swapping gem game|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|gwenview|Simple image viewer for KDE|gauret at free.fr|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Thu Apr 27 22:48:49 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Thu, 27 Apr 2006 15:48:49 -0700
Subject: rpms/gurlchecker/FC-4 gurlchecker.spec,1.7,1.8
Message-ID: <200604272248.k3RMmpgu010614@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gurlchecker/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10547/FC-4

Modified Files:
	gurlchecker.spec 
Log Message:
updated version



Index: gurlchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/FC-4/gurlchecker.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- gurlchecker.spec	25 May 2005 21:39:31 -0000	1.7
+++ gurlchecker.spec	27 Apr 2006 22:48:49 -0000	1.8
@@ -1,65 +1,57 @@
 Name:           gurlchecker
-Version:        0.6.3
-Release: 5
+Version:        0.8.3
+Release:	1%{?dist}
 
-Summary:        A GNOME link validity checker.
+Summary:        A Gnome link validity checker
 
 Group:          Applications/Internet
 License:        GPL
-URL:            http://www.nongnu.org/gurlchecker/
-Source0:        http://savannah.nongnu.org/download/gurlchecker/stable/0.6/gurlchecker-0.6.3.tar.gz
-Source1:        gurlchecker.desktop
-Patch0: gurlchecker-gcc4.patch
+URL:            http://labs.libre-entreprise.org/projects/gurlchecker/
+Source0:        http://labs.libre-entreprise.org/frs/download.php/423/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	desktop-file-utils
-BuildRequires:  gettext
+Requires:	gnet2
+
+BuildRequires:	desktop-file-utils, gnet2-devel, gettext
 BuildRequires:  libgnomeui-devel >= 2.0
 BuildRequires:  libglade2-devel >= 2.0
 
 %description
-gURLChecker is a GNOME tool that can check links on a single web page
+gURLChecker is a Gnome tool that can check links on a single web page
 or on a whole web site in order to determine validity of each page.
 
-
 %prep
 %setup -q
-%patch0 -p1 -b .gcc4
-
 
 %build
-%configure
+%configure --disable-gtk-doc
+
 make %{?_smp_mflags}
 
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-make install DESTDIR=${RPM_BUILD_ROOT}
-%find_lang %{name}
+rm -rf %{builroot}
 
-install -p -D -m0644 ui/gURLChecker_icon.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/gurlchecker.png
-desktop-file-install --vendor fedora               \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications      \
-  --add-category X-Fedora                              \
-  --add-category Application                           \
-  --add-category Network                               \
-  %{SOURCE1}
+make install DESTDIR=%{buildroot}
 
+%find_lang %{name}
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
-
+rm -rf %{buildroot}
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO
 %{_bindir}/*
 %{_datadir}/gurlchecker/
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/*
-
+%{_mandir}/man?/*
 
 %changelog
+* Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-1
+- version update
+
 * Wed May 25 2005 Jeremy Katz <katzj at redhat.com> - 0.6.3-5
 - fix build with gcc4 (mschwendt, #156217)
 



From fedora-extras-commits at redhat.com  Thu Apr 27 22:48:50 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Thu, 27 Apr 2006 15:48:50 -0700
Subject: rpms/gurlchecker/devel gurlchecker.spec,1.8,1.9
Message-ID: <200604272248.k3RMmqSW010623@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gurlchecker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10547/devel

Modified Files:
	gurlchecker.spec 
Log Message:
updated version



Index: gurlchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/devel/gurlchecker.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gurlchecker.spec	2 Mar 2006 21:30:20 -0000	1.8
+++ gurlchecker.spec	27 Apr 2006 22:48:50 -0000	1.9
@@ -1,72 +1,57 @@
 Name:           gurlchecker
-Version:        0.6.3
-Release: 5
+Version:        0.8.3
+Release:	1%{?dist}
 
-Summary:        A GNOME link validity checker.
+Summary:        A Gnome link validity checker
 
 Group:          Applications/Internet
 License:        GPL
-URL:            http://www.nongnu.org/gurlchecker/
-Source0:        http://savannah.nongnu.org/download/gurlchecker/stable/0.6/gurlchecker-0.6.3.tar.gz
-Source1:        gurlchecker.desktop
-Patch0: gurlchecker-gcc4.patch
+URL:            http://labs.libre-entreprise.org/projects/gurlchecker/
+Source0:        http://labs.libre-entreprise.org/frs/download.php/423/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	desktop-file-utils
-BuildRequires:  gettext
+Requires:	gnet2
+
+BuildRequires:	desktop-file-utils, gnet2-devel, gettext
 BuildRequires:  libgnomeui-devel >= 2.0
 BuildRequires:  libglade2-devel >= 2.0
 
 %description
-gURLChecker is a GNOME tool that can check links on a single web page
+gURLChecker is a Gnome tool that can check links on a single web page
 or on a whole web site in order to determine validity of each page.
 
-
 %prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
-
 %setup -q
-%patch0 -p1 -b .gcc4
-
 
 %build
-%configure
+%configure --disable-gtk-doc
+
 make %{?_smp_mflags}
 
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-make install DESTDIR=${RPM_BUILD_ROOT}
-%find_lang %{name}
+rm -rf %{builroot}
 
-install -p -D -m0644 ui/gURLChecker_icon.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/gurlchecker.png
-desktop-file-install --vendor fedora               \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications      \
-  --add-category X-Fedora                              \
-  --add-category Application                           \
-  --add-category Network                               \
-  %{SOURCE1}
+make install DESTDIR=%{buildroot}
 
+%find_lang %{name}
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
-
+rm -rf %{buildroot}
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO
 %{_bindir}/*
 %{_datadir}/gurlchecker/
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/*
-
+%{_mandir}/man?/*
 
 %changelog
+* Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-1
+- version update
+
 * Wed May 25 2005 Jeremy Katz <katzj at redhat.com> - 0.6.3-5
 - fix build with gcc4 (mschwendt, #156217)
 



From fedora-extras-commits at redhat.com  Thu Apr 27 22:48:50 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Thu, 27 Apr 2006 15:48:50 -0700
Subject: rpms/gurlchecker/FC-5 gurlchecker.spec,1.8,1.9
Message-ID: <200604272248.k3RMmqsJ010618@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gurlchecker/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10547/FC-5

Modified Files:
	gurlchecker.spec 
Log Message:
updated version



Index: gurlchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/FC-5/gurlchecker.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gurlchecker.spec	2 Mar 2006 21:30:20 -0000	1.8
+++ gurlchecker.spec	27 Apr 2006 22:48:49 -0000	1.9
@@ -1,72 +1,57 @@
 Name:           gurlchecker
-Version:        0.6.3
-Release: 5
+Version:        0.8.3
+Release:	1%{?dist}
 
-Summary:        A GNOME link validity checker.
+Summary:        A Gnome link validity checker
 
 Group:          Applications/Internet
 License:        GPL
-URL:            http://www.nongnu.org/gurlchecker/
-Source0:        http://savannah.nongnu.org/download/gurlchecker/stable/0.6/gurlchecker-0.6.3.tar.gz
-Source1:        gurlchecker.desktop
-Patch0: gurlchecker-gcc4.patch
+URL:            http://labs.libre-entreprise.org/projects/gurlchecker/
+Source0:        http://labs.libre-entreprise.org/frs/download.php/423/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	desktop-file-utils
-BuildRequires:  gettext
+Requires:	gnet2
+
+BuildRequires:	desktop-file-utils, gnet2-devel, gettext
 BuildRequires:  libgnomeui-devel >= 2.0
 BuildRequires:  libglade2-devel >= 2.0
 
 %description
-gURLChecker is a GNOME tool that can check links on a single web page
+gURLChecker is a Gnome tool that can check links on a single web page
 or on a whole web site in order to determine validity of each page.
 
-
 %prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
-
 %setup -q
-%patch0 -p1 -b .gcc4
-
 
 %build
-%configure
+%configure --disable-gtk-doc
+
 make %{?_smp_mflags}
 
 
 %install
-rm -rf ${RPM_BUILD_ROOT}
-make install DESTDIR=${RPM_BUILD_ROOT}
-%find_lang %{name}
+rm -rf %{builroot}
 
-install -p -D -m0644 ui/gURLChecker_icon.png ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/gurlchecker.png
-desktop-file-install --vendor fedora               \
-  --dir ${RPM_BUILD_ROOT}%{_datadir}/applications      \
-  --add-category X-Fedora                              \
-  --add-category Application                           \
-  --add-category Network                               \
-  %{SOURCE1}
+make install DESTDIR=%{buildroot}
 
+%find_lang %{name}
 
 %clean
-rm -rf ${RPM_BUILD_ROOT}
-
+rm -rf %{buildroot}
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING NEWS README THANKS TODO
 %{_bindir}/*
 %{_datadir}/gurlchecker/
-%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/*
-
+%{_mandir}/man?/*
 
 %changelog
+* Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-1
+- version update
+
 * Wed May 25 2005 Jeremy Katz <katzj at redhat.com> - 0.6.3-5
 - fix build with gcc4 (mschwendt, #156217)
 



From fedora-extras-commits at redhat.com  Thu Apr 27 23:00:11 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Thu, 27 Apr 2006 16:00:11 -0700
Subject: rpms/gurlchecker/FC-4 .cvsignore, 1.2, 1.3 gurlchecker.spec, 1.8,
	1.9 sources, 1.2, 1.3
Message-ID: <200604272300.k3RN0DwY012151@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gurlchecker/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12029/FC-4

Modified Files:
	.cvsignore gurlchecker.spec sources 
Log Message:
bumped the release cuz I forgot to check in all the files before I tag the branchs



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:31:55 -0000	1.2
+++ .cvsignore	27 Apr 2006 23:00:11 -0000	1.3
@@ -1 +1 @@
-gurlchecker-0.6.3.tar.gz
+gurlchecker-0.8.3.tar.gz


Index: gurlchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/FC-4/gurlchecker.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gurlchecker.spec	27 Apr 2006 22:48:49 -0000	1.8
+++ gurlchecker.spec	27 Apr 2006 23:00:11 -0000	1.9
@@ -1,6 +1,6 @@
 Name:           gurlchecker
 Version:        0.8.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Summary:        A Gnome link validity checker
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:31:55 -0000	1.2
+++ sources	27 Apr 2006 23:00:11 -0000	1.3
@@ -1 +1 @@
-b2db7effe6a429f8b4435d24c88d5b3b  gurlchecker-0.6.3.tar.gz
+2c4d1c74d8044ae41db980ba7ff27e98  gurlchecker-0.8.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 23:00:11 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Thu, 27 Apr 2006 16:00:11 -0700
Subject: rpms/gurlchecker/FC-5 .cvsignore, 1.2, 1.3 gurlchecker.spec, 1.9,
	1.10 sources, 1.2, 1.3
Message-ID: <200604272300.k3RN0DHl012156@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gurlchecker/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12029/FC-5

Modified Files:
	.cvsignore gurlchecker.spec sources 
Log Message:
bumped the release cuz I forgot to check in all the files before I tag the branchs



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:31:55 -0000	1.2
+++ .cvsignore	27 Apr 2006 23:00:11 -0000	1.3
@@ -1 +1 @@
-gurlchecker-0.6.3.tar.gz
+gurlchecker-0.8.3.tar.gz


Index: gurlchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/FC-5/gurlchecker.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gurlchecker.spec	27 Apr 2006 22:48:49 -0000	1.9
+++ gurlchecker.spec	27 Apr 2006 23:00:11 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           gurlchecker
 Version:        0.8.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Summary:        A Gnome link validity checker
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:31:55 -0000	1.2
+++ sources	27 Apr 2006 23:00:11 -0000	1.3
@@ -1 +1 @@
-b2db7effe6a429f8b4435d24c88d5b3b  gurlchecker-0.6.3.tar.gz
+2c4d1c74d8044ae41db980ba7ff27e98  gurlchecker-0.8.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 23:00:12 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Thu, 27 Apr 2006 16:00:12 -0700
Subject: rpms/gurlchecker/devel .cvsignore, 1.2, 1.3 gurlchecker.spec, 1.9, 
	1.10 sources, 1.2, 1.3
Message-ID: <200604272300.k3RN0ESm012163@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gurlchecker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12029/devel

Modified Files:
	.cvsignore gurlchecker.spec sources 
Log Message:
bumped the release cuz I forgot to check in all the files before I tag the branchs



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:31:55 -0000	1.2
+++ .cvsignore	27 Apr 2006 23:00:12 -0000	1.3
@@ -1 +1 @@
-gurlchecker-0.6.3.tar.gz
+gurlchecker-0.8.3.tar.gz


Index: gurlchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/devel/gurlchecker.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gurlchecker.spec	27 Apr 2006 22:48:50 -0000	1.9
+++ gurlchecker.spec	27 Apr 2006 23:00:12 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           gurlchecker
 Version:        0.8.3
-Release:	1%{?dist}
+Release:	2%{?dist}
 
 Summary:        A Gnome link validity checker
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:31:55 -0000	1.2
+++ sources	27 Apr 2006 23:00:12 -0000	1.3
@@ -1 +1 @@
-b2db7effe6a429f8b4435d24c88d5b3b  gurlchecker-0.6.3.tar.gz
+2c4d1c74d8044ae41db980ba7ff27e98  gurlchecker-0.8.3.tar.gz



From fedora-extras-commits at redhat.com  Thu Apr 27 23:23:58 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Thu, 27 Apr 2006 16:23:58 -0700
Subject: rpms/gurlchecker/devel gurlchecker.spec,1.10,1.11
Message-ID: <200604272324.k3RNO0fr016536@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gurlchecker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16453/devel

Modified Files:
	gurlchecker.spec 
Log Message:
missed a build depend. Fixed now



Index: gurlchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/devel/gurlchecker.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gurlchecker.spec	27 Apr 2006 23:00:12 -0000	1.10
+++ gurlchecker.spec	27 Apr 2006 23:23:58 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           gurlchecker
 Version:        0.8.3
-Release:	2%{?dist}
+Release:	1%{?dist}
 
 Summary:        A Gnome link validity checker
 
@@ -10,9 +10,9 @@
 Source0:        http://labs.libre-entreprise.org/frs/download.php/423/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	gnet2
+Requires:	gnet2, gnutls
 
-BuildRequires:	desktop-file-utils, gnet2-devel, gettext
+BuildRequires:	desktop-file-utils, gnet2-devel, gettext, gnutls-devel
 BuildRequires:  libgnomeui-devel >= 2.0
 BuildRequires:  libglade2-devel >= 2.0
 
@@ -49,6 +49,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-2
+- missed some build requires.
+
 * Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-1
 - version update
 



From fedora-extras-commits at redhat.com  Thu Apr 27 23:23:51 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Thu, 27 Apr 2006 16:23:51 -0700
Subject: rpms/gurlchecker/FC-4 gurlchecker.spec,1.9,1.10
Message-ID: <200604272324.k3RNONJ8016572@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gurlchecker/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16453/FC-4

Modified Files:
	gurlchecker.spec 
Log Message:
missed a build depend. Fixed now



Index: gurlchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/FC-4/gurlchecker.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- gurlchecker.spec	27 Apr 2006 23:00:11 -0000	1.9
+++ gurlchecker.spec	27 Apr 2006 23:23:51 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           gurlchecker
 Version:        0.8.3
-Release:	2%{?dist}
+Release:	1%{?dist}
 
 Summary:        A Gnome link validity checker
 
@@ -10,9 +10,9 @@
 Source0:        http://labs.libre-entreprise.org/frs/download.php/423/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	gnet2
+Requires:	gnet2, gnutls
 
-BuildRequires:	desktop-file-utils, gnet2-devel, gettext
+BuildRequires:	desktop-file-utils, gnet2-devel, gettext, gnutls-devel
 BuildRequires:  libgnomeui-devel >= 2.0
 BuildRequires:  libglade2-devel >= 2.0
 
@@ -49,6 +49,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-2
+- missed some build requires.
+
 * Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-1
 - version update
 



From fedora-extras-commits at redhat.com  Thu Apr 27 23:23:52 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Thu, 27 Apr 2006 16:23:52 -0700
Subject: rpms/gurlchecker/FC-5 gurlchecker.spec,1.10,1.11
Message-ID: <200604272324.k3RNOObE016576@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gurlchecker/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16453/FC-5

Modified Files:
	gurlchecker.spec 
Log Message:
missed a build depend. Fixed now



Index: gurlchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/FC-5/gurlchecker.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gurlchecker.spec	27 Apr 2006 23:00:11 -0000	1.10
+++ gurlchecker.spec	27 Apr 2006 23:23:52 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           gurlchecker
 Version:        0.8.3
-Release:	2%{?dist}
+Release:	1%{?dist}
 
 Summary:        A Gnome link validity checker
 
@@ -10,9 +10,9 @@
 Source0:        http://labs.libre-entreprise.org/frs/download.php/423/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	gnet2
+Requires:	gnet2, gnutls
 
-BuildRequires:	desktop-file-utils, gnet2-devel, gettext
+BuildRequires:	desktop-file-utils, gnet2-devel, gettext, gnutls-devel
 BuildRequires:  libgnomeui-devel >= 2.0
 BuildRequires:  libglade2-devel >= 2.0
 
@@ -49,6 +49,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-2
+- missed some build requires.
+
 * Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-1
 - version update
 



From fedora-extras-commits at redhat.com  Thu Apr 27 23:26:27 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Thu, 27 Apr 2006 16:26:27 -0700
Subject: rpms/gurlchecker/devel gurlchecker.spec,1.11,1.12
Message-ID: <200604272326.k3RNQT2T016813@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gurlchecker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16736/devel

Modified Files:
	gurlchecker.spec 
Log Message:
and this bump the release tag. 



Index: gurlchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/devel/gurlchecker.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gurlchecker.spec	27 Apr 2006 23:23:58 -0000	1.11
+++ gurlchecker.spec	27 Apr 2006 23:26:27 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           gurlchecker
 Version:        0.8.3
-Release:	1%{?dist}
+Release:	3%{?dist}
 
 Summary:        A Gnome link validity checker
 
@@ -49,7 +49,7 @@
 %{_mandir}/man?/*
 
 %changelog
-* Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-2
+* Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-3
 - missed some build requires.
 
 * Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-1



From fedora-extras-commits at redhat.com  Thu Apr 27 23:26:21 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Thu, 27 Apr 2006 16:26:21 -0700
Subject: rpms/gurlchecker/FC-5 gurlchecker.spec,1.11,1.12
Message-ID: <200604272326.k3RNQrH2016853@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gurlchecker/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16736/FC-5

Modified Files:
	gurlchecker.spec 
Log Message:
and this bump the release tag. 



Index: gurlchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/FC-5/gurlchecker.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gurlchecker.spec	27 Apr 2006 23:23:52 -0000	1.11
+++ gurlchecker.spec	27 Apr 2006 23:26:21 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           gurlchecker
 Version:        0.8.3
-Release:	1%{?dist}
+Release:	3%{?dist}
 
 Summary:        A Gnome link validity checker
 
@@ -49,7 +49,7 @@
 %{_mandir}/man?/*
 
 %changelog
-* Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-2
+* Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-3
 - missed some build requires.
 
 * Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-1



From fedora-extras-commits at redhat.com  Thu Apr 27 23:26:20 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Thu, 27 Apr 2006 16:26:20 -0700
Subject: rpms/gurlchecker/FC-4 gurlchecker.spec,1.10,1.11
Message-ID: <200604272326.k3RNQquG016848@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gurlchecker/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16736/FC-4

Modified Files:
	gurlchecker.spec 
Log Message:
and this bump the release tag. 



Index: gurlchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/FC-4/gurlchecker.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- gurlchecker.spec	27 Apr 2006 23:23:51 -0000	1.10
+++ gurlchecker.spec	27 Apr 2006 23:26:20 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           gurlchecker
 Version:        0.8.3
-Release:	1%{?dist}
+Release:	3%{?dist}
 
 Summary:        A Gnome link validity checker
 
@@ -49,7 +49,7 @@
 %{_mandir}/man?/*
 
 %changelog
-* Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-2
+* Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-3
 - missed some build requires.
 
 * Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-1



From fedora-extras-commits at redhat.com  Fri Apr 28 02:40:37 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 19:40:37 -0700
Subject: owners owners.list,1.909,1.910
Message-ID: <200604280240.k3S2edBL002725@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2708

Modified Files:
	owners.list 
Log Message:
Added perl-DBM-Deep


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.909
retrieving revision 1.910
diff -u -r1.909 -r1.910
--- owners.list	27 Apr 2006 22:48:28 -0000	1.909
+++ owners.list	28 Apr 2006 02:40:37 -0000	1.910
@@ -952,6 +952,7 @@
 Fedora Extras|perl-DBIx-ContextualFetch|Add contextual fetches to DBI|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBIx-DBSchema|Database-independent schema objects|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-DBIx-SearchBuilder|Encapsulate SQL queries and rows in simple perl objects|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-DBM-Deep|A pure perl multi-level hash/array DBM|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|perl-Devel-Cycle|Find memory cycles in objects|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Devel-StackTrace|Perl module implementing stack trace and stack trace frame objects|rc040203 at freenet.de|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Digest-BubbleBabble|Create bubble-babble fingerprints|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Fri Apr 28 02:41:36 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 19:41:36 -0700
Subject: rpms/perl-DBM-Deep - New directory
Message-ID: <200604280241.k3S2fcxk002800@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/perl-DBM-Deep
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2774/perl-DBM-Deep

Log Message:
Directory /cvs/extras/rpms/perl-DBM-Deep added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 28 02:41:36 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 19:41:36 -0700
Subject: rpms/perl-DBM-Deep/devel - New directory
Message-ID: <200604280241.k3S2fcIR002803@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/perl-DBM-Deep/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2774/perl-DBM-Deep/devel

Log Message:
Directory /cvs/extras/rpms/perl-DBM-Deep/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 28 02:41:50 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 19:41:50 -0700
Subject: rpms/perl-DBM-Deep Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604280241.k3S2fqfu002857@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/perl-DBM-Deep
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2822

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-DBM-Deep


--- NEW FILE Makefile ---
# Top level Makefile for module perl-DBM-Deep
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 28 02:41:51 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 19:41:51 -0700
Subject: rpms/perl-DBM-Deep/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604280241.k3S2frNT002861@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/perl-DBM-Deep/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2822/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-DBM-Deep


--- 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 Apr 28 02:42:21 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 19:42:21 -0700
Subject: rpms/perl-DBM-Deep import.log,1.1,1.2
Message-ID: <200604280242.k3S2gNua002923@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/perl-DBM-Deep
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2890

Modified Files:
	import.log 
Log Message:
auto-import perl-DBM-Deep-0.983-1 on branch devel from perl-DBM-Deep-0.983-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-DBM-Deep/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	28 Apr 2006 02:41:50 -0000	1.1
+++ import.log	28 Apr 2006 02:42:21 -0000	1.2
@@ -0,0 +1 @@
+perl-DBM-Deep-0_983-1:HEAD:perl-DBM-Deep-0.983-1.src.rpm:1146192133



From fedora-extras-commits at redhat.com  Fri Apr 28 02:42:22 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Thu, 27 Apr 2006 19:42:22 -0700
Subject: rpms/perl-DBM-Deep/devel perl-DBM-Deep.spec, NONE, 1.1 .cvsignore,
	1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604280242.k3S2gO0m002928@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/perl-DBM-Deep/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2890/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-DBM-Deep.spec 
Log Message:
auto-import perl-DBM-Deep-0.983-1 on branch devel from perl-DBM-Deep-0.983-1.src.rpm


--- NEW FILE perl-DBM-Deep.spec ---
Name:           perl-DBM-Deep
Version:        0.983
Release:        1%{?dist}
Summary:        A pure perl multi-level hash/array DBM
License:        GPL or Artistic
Group:          Development/Libraries
URL:            http://search.cpan.org/dist/DBM-Deep/
Source0:        http://www.cpan.org/modules/by-module/DBM/DBM-Deep-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch:      noarch
BuildRequires:  perl(Module::Build), perl(Test::Exception)
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
A unique flat-file database module, written in pure perl. True multi-level
hash/array support (unlike MLDBM, which is faked), hybrid OO / tie()
interface, cross-platform FTPable files, and quite fast. Can handle
millions of keys and unlimited hash levels without significant slow-down.
Written from the ground-up in pure perl -- this is NOT a wrapper around a
C-based DBM. Out-of-the-box compatibility with Unix, Mac OS X and Windows.

%prep
%setup -q -n DBM-Deep-%{version}

%build
perl Build.PL installdirs=vendor
./Build

%install
rm -rf %{buildroot}

./Build install destdir=%{buildroot} create_packlist=0
find %{buildroot} -type d -depth -exec rmdir {} 2>/dev/null \;

chmod -R u+rwX,go+rX,go-w %{buildroot}/*

%check
./Build test

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/*
%{_mandir}/man3/*

%changelog
* Thu Apr 27 2006 Andreas Thienemann <andreas at bawue.net> 0.983-1
- Specfile autogenerated by cpanspec 1.64.
- Cleaned up for FE


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-DBM-Deep/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Apr 2006 02:41:51 -0000	1.1
+++ .cvsignore	28 Apr 2006 02:42:21 -0000	1.2
@@ -0,0 +1 @@
+DBM-Deep-0.983.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-DBM-Deep/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Apr 2006 02:41:51 -0000	1.1
+++ sources	28 Apr 2006 02:42:21 -0000	1.2
@@ -0,0 +1 @@
+09ddd163183e983bf1085688d0b25b75  DBM-Deep-0.983.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 28 03:17:42 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 27 Apr 2006 20:17:42 -0700
Subject: extras-buildsys/builder Builder.py, NONE, 1.1 BuilderMock.py, NONE,
	1.1 main.py, NONE, 1.1 Config.py, 1.2, 1.3 Makefile, 1.4,
	1.5 builder.py, 1.54, NONE
Message-ID: <200604280317.k3S3HgT2005362@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/builder
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5292/builder

Modified Files:
	Config.py Makefile 
Added Files:
	Builder.py BuilderMock.py main.py 
Removed Files:
	builder.py 
Log Message:
2006-04-27  Dan Williams  <dcbw at redhat.com>

    Commit partial rework of builder<->server communcation.




--- NEW FILE Builder.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 2006 Dan Williams <dcbw at redhat.com> and Red Hat, Inc.


import os
import sys
import socket
import time
import threading
import sha
import exceptions
import xmlrpclib
import OpenSSL
from plague import Commands
from plague import AuthedXMLRPCServer
from plague import HTTPServer
from plague import XMLRPCServerProxy

import Config
import BuilderMock


class BuilderInitException(Exception): pass

def get_hostname(cfg, bind_all):
    cfg_hostname = cfg.get_str("Passive", "hostname")
    if cfg_hostname and len(cfg_hostname):
        return cfg_hostname
    elif bind_all:
        return ''
    return socket.gethostname()

def determine_max_jobs(cfg):
    """ Simple max job calculator based on number of CPUs """

    import commands
    max_jobs = 1
    cmd = "/usr/bin/getconf _NPROCESSORS_ONLN"
    (s, o) = commands.getstatusoutput(cmd)
    if s == 0:
        try:
            max_jobs = int(o)
        except ValueError:
            pass
    return max_jobs

def log(string):
    sys.stdout.write(string + "\n")
    sys.stdout.flush()


class PassiveBuilderRequestHandler:
    def __init__(self, cfg, builder):
        self._builder = builder
        self._all_jobs = {} # unique id => awclass instance
        self._building_jobs_lock = threading.Lock()
        self._building_jobs = []
        self._cfg = cfg

    def _log(self, string):
        if self._cfg.get_bool("General", "debug"):
            print string

    def notify_job_done(self, archjob):
        self._building_jobs_lock.acquire()
        if archjob in self._building_jobs:
            self._building_jobs.remove(archjob)
        self._building_jobs_lock.release()

    def die(self, uniqid):
        try:
            job = self._all_jobs[uniqid]
            job.die()
        except KeyError:
            pass
        return 0

    def files(self, uniqid):
        try:
            job = self._all_jobs[uniqid]
            return job.files()
        except KeyError:
            pass
        return []
    
    def repo_unlocked(self, uniqid):
        try:
            job = self._all_jobs[uniqid]
            job.repo_unlocked()
        except KeyError:
            pass
        return 0

    def building_jobs(self):
        jobs = {}
        self._building_jobs_lock.acquire()
        building = 0
        for job in self._building_jobs:
            jobs[job.uniqid()] = job.status()
            building = building + 1
        free = self._max_jobs - building
        self._building_jobs_lock.release()
        return (jobs, free)

    def num_slots(self):
        (free_slots, max_slots) = self._builder.slots()
        return max_slots

    def job_status(self, uniqid):
        try:
            job = self._all_jobs[uniqid]
            return job.status()
        except KeyError:
            pass
        return ''

    def supported_targets(self):
        return self._builder.supported_targets()
            

class Builder(object):
    """ Abstract builder base object """
    def __init__(self, cfg):
        self._cfg = cfg
        self._certs = None
        self._max_slots = determine_max_jobs(cfg)
        self._seq_gen = Commands.SequenceGenerator()

        self._building_jobs_lock = threading.Lock()
        self._building_jobs = []
        self._all_jobs = {}

        if cfg.get_bool("SSL", "use_ssl"):
            hostname = get_hostname(self._cfg, False)
            key_file = os.path.join(cfg.get_str("SSL", "builder_key_and_cert_dir"), "%s.pem" % hostname)
            self._certs = {}
            self._certs['key_and_cert'] = key_file
            self._certs['ca_cert'] = cfg.get_str("SSL", "ca_cert")
            self._certs['peer_ca_cert'] = self._certs['ca_cert']

    def _log(self, string):
        if self._cfg.get_bool("General", "debug"):
            log(string)

    def new_builder(cfg, btype):
        if btype == 'passive':
            return PassiveBuilder(cfg)
        elif btype == 'active':
            return ActiveBuilder(cfg)
        else:
            return None
    new_builder = staticmethod(new_builder)

    def stop(self):
        pass

    def cleanup(self):
        return
        (building_jobs, free) = bcs.building_jobs()
        for jobid in building_jobs.keys():
            bcs.die(jobid)

        # wait for the jobs to clean up before quitting
        log("Waiting for running jobs to stop...")
        while True:
            (building_jobs, free) = bcs.building_jobs()
            if len(building_jobs.keys()) == 0:
                break
            try:
                log(".")
                time.sleep(0.5)
            except KeyboardInterrupt:
                break

    def slots(self):
        self._building_jobs_lock.acquire()
        free_slots = self._max_slots - len(self._building_jobs)
        self._building_jobs_lock.release()
        return (free_slots, self._max_slots)

    def supported_targets(self):
        targets = []
        for t in self._cfg.targets():
            td = t.target_dict()
            td['supported_arches'] = t.arches()
            targets.append(td)
        return targets

    def _get_target_cfg(self, target_dict):
        target_cfg = None

        # First try to find a target for buildarch specifically
        try:
            target_cfg = self._cfg.get_target(target_dict)
        except Config.InvalidTargetException:
            pass

        if not target_cfg:
            # If that doesn't work, just get a target that can build the arch
            try:
                target_cfg = self._cfg.get_target(target_dict, True)
            except Config.InvalidTargetException:
                pass

        return target_cfg

    def _new_job_for_arch(self, target_cfg, buildarch, srpm_url):
        """Creates a new mock build job given a particular build architecture."""

        if buildarch != 'noarch' and not BuilderMock.BuilderClassDict.has_key(buildarch):
            # we know nothing about the architecture 'buildarch'
            return None

        builder_class = None
        if buildarch == 'noarch':
            # Just grab the first available architecture from the ones we support
            builder_class = BuilderMock.BuilderClassDict[target_cfg.arches()[0]]
        elif buildarch in target_cfg.arches():
            builder_class = BuilderMock.BuilderClassDict[buildarch]

        # We'll throw a TypeError here if there's no available builder_class for this arch
        return builder_class(self, target_cfg, buildarch, srpm_url)

    def _start_new_job(self, target_dict, srpm_url):
        target_str = Config.make_target_string(target_dict['distro'], target_dict['target'], target_dict['arch'], target_dict['repo'])

        uniqid = -1
        msg = "Success"
        (free, max) = self.slots()
        if free <= 0:
            msg = "Error: Tried to build '%s' on target %s when already building" \
                        " maximum (%d) jobs" % (srpm_url, target_str, max)
            self._log(msg)
            return (uniqid, msg)

        target_cfg = self._get_target_cfg(target_dict)
        if not target_cfg:
            msg = "Error: Tried to build '%s' on target %s which isn't supported" % (srpm_url, target_str)
            self._log(msg)
            return (uniqid, msg)

        archjob = None
        try:
            archjob = self._new_job_for_arch(target_cfg, target_dict['arch'], srpm_url)
            uniqid = archjob.uniqid()
            self._all_jobs[uniqid] = archjob
            self._building_jobs_lock.acquire()
            self._building_jobs.append(archjob)
            self._building_jobs_lock.release()
            filename = os.path.basename(srpm_url)
            msg = "%s: started %s on %s arch %s at time %d" % (uniqid, filename,
                        target_str, target_dict['arch'], archjob.starttime())
#            job.start()
        except (OSError, TypeError), err:
            msg = "Failed request for %s on %s: '%s'" % (srpm_url,
                    target_str, err)

        self._log(msg)
        return (uniqid, msg)


class PassiveBuilder(Builder):
    """
    Passive builders initiate no communication of their own.  They wait
    for the build server to contact them, and therefore may not be used
    behind a firewall without holes being punched through it.
    """
    def __init__(self, cfg):
        Builder.__init__(self, cfg)
        self._http_server = None
        self._xmlrpc_server = None

    def _start_servers(self):
        # Start up the HTTP server thread which the build server
        # pulls completed RPMs from
        hostname = get_hostname(self._cfg, True)
        port = cfg.get_int("Passive", "fileserver_port")
        self._http_server = HTTPServer.PlgHTTPServerManager((hostname, port), work_dir, self._certs)
        self._http_server.start()

        log("Binding to address '%s' with arches: [%s]\n" % (hostname, string.join(build_arches, ",")))
        xmlrpc_port = cfg.get_int("Passive", "xmlrpc_port")
        try:
            if cfg.get_bool("SSL", "use_ssl") == True:
                self._xmlrpc_server = AuthedXMLRPCServer.AuthedSSLXMLRPCServer((hostname, xmlrpc_port), None, self._certs)
            else:
                self._xmlrpc_server = AuthedXMLRPCServer.AuthedXMLRPCServer((hostname, xmlrpc_port), None)
        except socket.error, e:
            if e[0] == 98:
                raise BuilderInitException("Error: couldn't bind to address '%s:%s'.  "  \
                           "Is the builder already running?\n" % (hostname, xmlrpc_port))

        brh = PassiveBuilderRequestHandler(cfg, self)
        self._xmlrpc_server.register_instance(brh)

    def work(self):
        self._start_servers()
        try:
            self._xmlrpc_server.serve_forever()
        except KeyboardInterrupt:
            pass

    def _stop_servers(self):
        self._http_server.stop()
        self._xmlrpc_server.stop()
        try:
            time.sleep(1)
        except KeyboardInterrupt:
            pass
        self._xmlrpc_server.server_close()

    def stop(self):
        Builder.stop(self)
        self._stop_servers()



# HACK: This class is a hack to work around SSL hanging issues,
# which cause the whole server to grind to a halt
class ActiveBuilderRequest(threading.Thread):
    def __init__(self, server, address, cmds):
        self._server = server
        self._address = address
        self._cmds = cmds
        self.done = False
        self.failed = False
        self.response = None
        threading.Thread.__init__(self)

    def run(self):
        self.setName("ActiveBuilderRequest: %s" % self._address)
        try:
            cmd_stream = Commands.serialize_to_command_stream(self._cmds)
            self.response = self._server.request(cmd_stream)
        except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, OpenSSL.SSL.Error, xmlrpclib.ProtocolError):
            self.failed = True
        except xmlrpclib.Fault, e:
            print "Builder Error (%s) in request(): server replied '%s'" % (self._address, e)
            self.failed = True
        self.done = True

class ActiveBuilder(Builder, threading.Thread):
    """
    Active builders initiate all communication to the builder server, and
    therefore may be used from behind a firewall.
    """
    _SERVER_CONTACT_INTERVAL = 20

    def __init__(self, cfg):
        Builder.__init__(self, cfg)
        self._stop = False
        self._last_comm = time.time() - self._SERVER_CONTACT_INTERVAL - 1
        self._queued_cmds = []
        self._xmlrpc_address = self._get_server_address(cfg.get_str("Active", "xmlrpc_port"))
        self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._xmlrpc_address, self._certs, timeout=20)
        threading.Thread.__init__(self)

    def _get_server_address(self, port):
        addr = self._cfg.get_str("Active", "server")
        if addr.startswith("http://"):
            addr = addr[7:]
        elif addr.startswith("https://"):
            addr = addr[8:]
        if self._cfg.get_bool("SSL", "use_ssl"):
            addr = "https://" + addr
        else:
            addr = "http://" + addr
        return addr + ":" + port

    def work(self):
        self.start()
        try:
            while not self._stop:
                time.sleep(60)
        except KeyboardInterrupt:
            pass

    def _get_default_commands(self):
        """Return a python list of serialized commands that the builder
        sends to the server every time it contacts the server."""

        defcmds = []

        # always send a target list
        next_seq = self._seq_gen.next()
        cmd = Commands.PlgCommandTargets(self.supported_targets(), next_seq)
        defcmds.append(cmd)

        # always send free & max slots
        next_seq = self._seq_gen.next()
        (free, max) = self.slots()
        cmd = Commands.PlgCommandSlots(free, max, next_seq)
        defcmds.append(cmd)

        return defcmds

    def _send_commands(self):
        """Send default commands, and any commands that we've queued up
        since the last time we sent commands to the server."""

        cmds = self._get_default_commands()
        cmds = cmds + self._queued_cmds

        # The actual XML-RPC request runs in a different thread because SSL
        # calls sometimes hang 
        req = ActiveBuilderRequest(self._server, self._xmlrpc_address, cmds)
        curtime = time.time()
        req.start()

        # Give the request 10s, otherwise forget about it
        while time.time() - curtime < 10:
            if req.done:
                break
            time.sleep(0.5)

        if req.done and not req.failed:
            self.queued_cmds = []
            return req.response
        return None

    def _dispatch_server_command(self, cmd):
        """Process a single command from the server."""

        if isinstance(cmd, Commands.PlgCommandNewJobReq):
            (uniqid, msg) = self._start_new_job(cmd.target_dict(), cmd.srpm_url())
            ack = Commands.PlgCommandNewJobAck(uniqid, msg, cmd.seq(), self._seq_gen.next())
            self._queued_cmds.append(ack)

    def _process_server_response(self, response):
        """Process the server's response."""

        if not response:
            # Something went wrong...
            return

        cmds = Commands.deserialize_command_stream(response)
        for cmd in cmds:
            self._dispatch_server_command(cmd)

    def run(self):
        """Main builder loop, send commands to and receive commands from
        the server every so often."""

        while not self._stop:
            if self._last_comm < time.time() - self._SERVER_CONTACT_INTERVAL:
                self._last_comm = time.time()
                resp = self._send_commands()
                self._process_server_response(resp)
            time.sleep(1)

    def stop(self):
        self._stop = True


--- NEW FILE BuilderMock.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 Dan Williams <dcbw at redhat.com> and Red Hat, Inc.


import threading
import sys
import os


import socket
import shutil
import string
import fcntl
import urllib
import errno
import exceptions
import threading
import sha
import time

from plague import ExecUtils
from plague import FileDownloader


def log(string):
    sys.stdout.write(string)
    sys.stdout.flush()

def get_url_for_file(cfg, file_path):
    """ Return a URL pointing to a particular file in our work dir """

    # Ensure the file we're turning into a URL lives in our builder work dir
    work_dir = cfg.get_str("Directories", "builder_work_dir")
    if not file_path.startswith(work_dir):
        return None
    file_part = file_path[len(work_dir) + 1:]
    port = "%s" % cfg.get_int("Network", "fileserver_port")
    if cfg.get_bool("SSL", "use_ssl"):
        method = "https://"
    else:
        method = "http://"
    hostname = get_hostname(cfg, False)
    full_url = "%s%s:%s/%s" % (method, hostname, port, file_part)
    return urllib.quote(full_url)

def _generate_uniqid(target_str, srpm_url):
    sum = sha.new()
    sum.update('%d %s %s' % (time.time(), target_str, srpm_url))
    return sum.hexdigest()


class BuilderMock(threading.Thread):
    """puts things together for an arch - baseclass for handling builds for 
       other arches"""

    def __init__(self, controller, target_cfg, buildarch, srpm_url):
        self._controller = controller
        self.buildarch = buildarch
        self._starttime = time.time()
        self._endtime = 0
        self._mockstarttime = 0
        self._uniqid = _generate_uniqid(str(target_cfg), srpm_url)
        self._status = 'init'
        self._die = False
        self._repo_locked = True
        self._repo_wait_start = 0
        self._files = []
        self._childpid = 0
        self._target_cfg = target_cfg
        self._builder_cfg = target_cfg.parent_cfg()
        self._srpm_url = srpm_url
        self._srpm_tries = 0
        self._log_fd = None
        self._mock_config = None
        self._done_status = ''
        self._mock_log = None
        self.buildroot = self._target_cfg.mock_config()

        self._work_dir = self._builder_cfg.get_str("Directories", "builder_work_dir")
        self._result_dir = os.path.join(self._work_dir, self._uniqid, "result")
        if not os.path.exists(self._result_dir):
            os.makedirs(self._result_dir)

        self._state_dir = os.path.join(self._work_dir, self._uniqid, "mock-state")
        if not os.path.exists(self._state_dir):
            os.makedirs(self._state_dir)

        logfile = os.path.join(self._result_dir, "job.log")
        self._log_fd = open(logfile, "w+")

        threading.Thread.__init__(self)

    def starttime(self):
        return self._starttime

    def endtime(self):
        return self._endtime

    def die(self):
        if self.is_done_status() or self._done_status == 'killed':
            return True
        self._die = True
        return True

    def _handle_death(self):
        self._die = False
        self._done_status = 'killed'
        self._log("Killing build process...\n")

        # Don't try to kill a running cleanup process
        if self._status != 'cleanup':
            # Kill a running non-cleanup mock process, if any
            if self._childpid:
                child_pgroup = 0 - self._childpid
                try:
                    # Kill all members of the child's process group
                    os.kill(child_pgroup, 9)
                except OSError, e:
                    self._log("ERROR: Couldn't kill child process group %d: %s\n" % (child_pgroup, e))
                else:
                    # Ensure child process is reaped
                    self._log("Waiting for mock process %d to exit...\n" % self._childpid)
                    try:
                        (pid, status) = os.waitpid(self._childpid, 0)
                    except OSError, e:
                        pass
                    self._log("Mock process %d exited.\n" % self._childpid)
                self._childpid = 0

            # Start cleanup up the job
            self._start_cleanup()

        self._log("Killed.\n");

    def _log(self, string):
        if string and self._log_fd:
            self._log_fd.write(string)
            self._log_fd.flush()
            os.fsync(self._log_fd.fileno())
            if self._builder_cfg.get_bool("General", "debug"):
                s = "%s: " % self._uniqid
                sys.stdout.write(s + string)
                sys.stdout.flush()

    def dl_callback(self, dl_status, cb_data, err_msg):
        url = cb_data
        if dl_status == 'done':
            self._status = 'downloaded'
            self._log("Retrieved %s.\n" % url)
        elif dl_status == 'failed':
            # If job was cancelled, just return
            if self.is_done_status():
                return

            # Retry up to 5 times
            self._srpm_tries = self._srpm_tries + 1
            if self._srpm_tries >= 5:
                self._status = 'failed'
                self._log("ERROR: Failed to retrieve %s.\n" % url)
            else:
                # retry the download
                self._status = 'init'
                self._log("ERROR: Failed to retrieve %s on attempt %d (%s).  Trying again...\n" % (url, self._srpm_tries, err_msg))

    def _copy_mock_output_to_log(self):
        if self._mock_log and os.path.exists(self._mock_log):
            ml = open(self._mock_log, "r")
            line = "foo"
            while len(line):
                line = ml.readline()
                if len(line):
                    self._log_fd.write(line)
            ml.close()
            os.remove(self._mock_log)
            self._mock_log = None

    def _start_build(self):
        self._log("Starting step 'building' with command:\n")
        if not os.path.exists(self._result_dir):
            os.makedirs(self._result_dir)
        if not os.path.exists(self._result_dir):
            os.makedirs(self._result_dir)

        # Set up build process arguments
        args = []
        builder_cmd = os.path.abspath(self._builder_cfg.get_str("General", "builder_cmd"))
        cmd = builder_cmd
        if self.arch_command and len(self.arch_command):
            arg_list = self.arch_command.split()
            for arg in arg_list:
                args.append(arg)
            cmd = os.path.abspath(arg_list[0])
        args.append(builder_cmd)
        args.append("-r")
        args.append(self.buildroot)
        args.append("--arch")
        args.append(self.buildarch)
        args.append("--resultdir=%s" % self._result_dir)
        args.append("--statedir=%s" % self._state_dir)
        args.append("--uniqueext=%s" % self._uniqid)
        args.append(self._srpm_path)
        self._log("   %s\n" % string.join(args))

        self._mock_log = os.path.join(self._result_dir, "mock-output.log")
        self._childpid = ExecUtils.exec_with_redirect(cmd, args, None, self._mock_log, self._mock_log)
        self._mockstarttime = time.time()
        self._status = 'prepping'

    def _start_cleanup(self):
        self._log("Cleaning up the buildroot...\n")

        args = []
        builder_cmd = os.path.abspath(self._builder_cfg.get_str("General", "builder_cmd"))
        cmd = builder_cmd
        if self.arch_command and len(self.arch_command):
            arg_list = self.arch_command.split()
            for arg in arg_list:
                args.append(arg)
            cmd = os.path.abspath(arg_list[0])
        args.append(builder_cmd)
        args.append("clean")
        args.append("--uniqueext=%s" % self._uniqid)
        args.append("-r")
        args.append(self.buildroot)

        self._log("   %s\n" % string.join(args))
        self._childpid = ExecUtils.exec_with_redirect(cmd, args, None, None, None)
        self._status = 'cleanup'

    def _mock_is_prepping(self):
        mock_status = self._get_mock_status()
        if mock_status:
            if mock_status == 'prep':
                return True
            elif mock_status == 'setu':
                return True
        return False

    def _mock_using_repo(self):
        mock_status = self._get_mock_status()
        if mock_status:
            if mock_status == 'init':
                return True
            elif mock_status == 'clea':
                return True
            elif mock_status == 'prep':
                return True
            elif mock_status == 'setu':
                return True
        return False

    def _mock_is_closed(self):
        mock_status = self._get_mock_status()
        if mock_status and mock_status == "done":
            return True
        return False

    def _get_mock_status(self):
        mockstatusfile = os.path.join(self._state_dir, 'status')
        if not os.path.exists(mockstatusfile):
            return None

        f = open(mockstatusfile, "r")
        fcntl.fcntl(f.fileno(), fcntl.F_SETFL, os.O_NONBLOCK)
        
        while True:
            try:
                f.seek(0, 0)
                string = f.read(4)
            except OSError, e:
                if e.errno == errno.EAGAIN:
                    try:
                        time.sleep(0.25)
                    except KeyboardInterrupt:
                        pass
                    continue
            else:
                if len(string) < 4:
                    continue
                break
        f.close()
        string = string.lower()
        return string

    def _read_mock_config(self):
        mockconfigfile = os.path.join(self._result_dir, 'mockconfig.log')
        if not os.path.exists(mockconfigfile):
            return None

        f = open(mockconfigfile, "r")
        contents = {}
        for line in f:
            (item, loc) = line.split('=')
            item = item.strip()
            loc = loc.strip()
            contents[item] = loc
        f.close()
        return contents

    def _status_init(self):
        self._log("Starting download of %s.\n" % self._srpm_url)
        self._status = 'downloading'
        target_dir = os.path.dirname(self._srpm_path)
        try:
            dl_thread = FileDownloader.FileDownloader(self.dl_callback, self._srpm_url, self._srpm_url,
                        target_dir, ['.src.rpm'], certs)
            dl_thread.start()
        except FileDownloader.FileNameException, e:
            self._status = 'failed'
            self._log("ERROR: Failed to begin SRPM download.  Error: '%s'   URL: %s\n" % (e, self._srpm_url))
            
    def _status_downloading(self):
        pass

    def _status_downloaded(self):
        # We can't start doing anything with yum until the build
        # server tells us the repo is unlocked.
        if not self._repo_locked:
            self._start_build()
        else:
            # Only show this message once
            if self._repo_wait_start <= 0:
                self._log("Waiting for repository to unlock before starting the build...\n")
                self._repo_wait_start = time.time()

            # Kill a job in 'downloaded' state after 30 minutes because
            # it's likely orphaned
            if time.time() > (self._repo_wait_start + (60 * 30)):
                self._log("Job waited too long for repo to unlock. Killing it...\n")
                self.die()

    def _watch_mock(self, good_exit, bad_exit):
        (aux_pid, status) = os.waitpid(self._childpid, os.WNOHANG)
        status = os.WEXITSTATUS(status)
        if aux_pid:
            self._childpid = 0
            if status == 0:
                self._done_status = good_exit
            elif status > 0:
                self._done_status = bad_exit

            self._copy_mock_output_to_log()
            self._start_cleanup()

    def _status_prepping(self):
        # Mock shouldn't exit at all during the prepping stage, if it does
        # something is wrong
        self._watch_mock('failed', 'failed')
        if self._status != 'prepping':
               return

        # We need to make sure that mock has dumped the status file withing a certain
        # amount of time, otherwise we can't tell what it's doing
        mockstatusfile = os.path.join(self._state_dir, 'status')
        if not os.path.exists(mockstatusfile):
            # something is wrong if mock takes more than 15s to write the status file
            if time.time() > self._mockstarttime + 15:
                self._mockstarttime = 0
                self._log("ERROR: Timed out waiting for the mock status file!  %s\n" % mockstatusfile)
                self.die()
        else:
            if not self._mock_config and self._mock_is_prepping():
                self._mock_config = self._read_mock_config()
            if not self._mock_using_repo():
                self._status = 'building'

    def _status_building(self):
        self._watch_mock('done', 'failed')

    def _status_cleanup(self):
        (aux_pid, status) = os.waitpid(self._childpid, os.WNOHANG)
        if aux_pid:
            self._childpid = 0
            # Mock exited
            if self._mock_config:
                if self._mock_config.has_key('rootdir'):
                    mock_root_dir = os.path.abspath(os.path.join(self._mock_config['rootdir'], "../"))
                    # Ensure we're actually deleteing the job's rootdir
                    if mock_root_dir.endswith(self._uniqid):
                        shutil.rmtree(mock_root_dir, ignore_errors=True)

                if self._mock_config.has_key('statedir'):
                    shutil.rmtree(self._mock_config['statedir'], ignore_errors=True)

                source_dir = os.path.abspath(os.path.join(self._mock_config['rootdir'], "../source"))
                # Ensure we're actually deleteing the job's sourcedir
                if source_dir.endswith(os.path.join(self._uniqid, "source")):
                    shutil.rmtree(source_dir, ignore_errors=True)

        # Ensure child process is reaped, if any
        if self._childpid:
            try:
                self._log("Waiting for child process %d to exit.\n" % self._childpid)
                (pid, status) = os.waitpid(self._childpid, 0)
            except OSError, e:
                self._childpid = 0
                pass

        self._copy_mock_output_to_log()

        self._files = self._find_files()
        self._status = self._done_status

    def _job_done(self):
        self._log("-----------------------\n")
        if self._status == 'done':
            self._log("Job completed successfully.\n")
        elif self._status == 'failed':
            self._log("Job failed due to build errors!  Please see build logs.\n")
        elif self._status == 'killed':
            self._log("Job failed because it was killed.\n")
        self._log("\n\n")

        if self._log_fd:
            self._log_fd.close()
            self._log_fd = None

    def run(self):
        # Print out a nice message at the start of the job
        target_dict = self._target_cfg.target_dict()
        target_str = "%s-%s-%s-%s" % (target_dict['distro'], target_dict['target'], target_dict['arch'], target_dict['repo'])
        self._log("""Starting job:
   Time: %s
   Target: %s
   UID: %s
   Architecture: %s
   SRPM: %s\n\n""" % (time.asctime(time.localtime(self._starttime)), target_str, self._uniqid, self.buildarch, self._srpm_url))

        try:
            srpm_filename = FileDownloader.get_base_filename_from_url(self._srpm_url, ['.src.rpm'])
            self._srpm_path = os.path.join(self._work_dir, self._uniqid, "source", srpm_filename)
        except FileDownloader.FileNameException, e:
            self._log("ERROR: SRPM file name was invalid.  Message: '%s'\n" % e)
            self._status = 'failed'

        # Main build job work loop
        while not self.is_done_status():
            if self._die:
                self._handle_death()

            # Execute operations for our current status
            try:
                func = getattr(self, "_status_%s" % self._status)
            except AttributeError:
                self._log("ERROR: internal builder inconsistency, didn't recognize status '%s'.\n" % self._status)
                self._status = 'failed'
            else:
                func()
            time.sleep(3)

        self._job_done()
        self._endtime = time.time()
        if self._childpid:
            self._log("ERROR: childpid was !NULL  (%d)" % self._childpid)
        self._controller.notify_job_done(self)

    def _find_files(self):
        # Grab the list of files in our job's result dir and URL encode them
        files_in_dir = os.listdir(self._result_dir)
        file_list = []
        self._log("\n")
        self._log("Output File List:\n")
        self._log("-----------------\n")
        for f in files_in_dir:
            file_url = get_url_for_file(self._builder_cfg, os.path.join(self._result_dir, f))
            if file_url:
                file_list.append(file_url)
                self._log("  Output File: %s\n" % urllib.unquote(file_url))
            else:
                self._log("  Error: Couldn't get file URL for file %s\n" % f)
        self._log("-----------------\n")
        return file_list

    def status(self):
        return self._status

    def uniqid(self):
        return self._uniqid

    def files(self):
        return self._files

    def repo_unlocked(self):
        self._repo_locked = False

    def is_done_status(self):
        if (self._status is 'done') or (self._status is 'killed') or (self._status is 'failed'):
            return True
        return False


class InvalidTargetError(exceptions.Exception): pass

class i386Arch(BuilderMock):
    def __init__(self, controller, target_cfg, buildarch, srpm_url):
        self.arch_command = '/usr/bin/setarch i686'
        BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url)

class x86_64Arch(BuilderMock):
    def __init__(self, controller, target_cfg, buildarch, srpm_url):
        self.arch_command = ''
        BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url)

class PPCArch(BuilderMock):
    def __init__(self, controller, target_cfg, buildarch, srpm_url):
        self.arch_command = '/usr/bin/setarch ppc32'
        BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url)

class PPC64Arch(BuilderMock):
    def __init__(self, controller, target_cfg, buildarch, srpm_url):
        self.arch_command = ''
        BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url)

class SparcArch(BuilderMock):
    def __init__(self, controller, target_cfg, buildarch, srpm_url):
        self.arch_command = '/usr/bin/sparc32'
        BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url)

class Sparc64Arch(BuilderMock):
    def __init__(self, controller, target_cfg, buildarch, srpm_url):
        self.arch_command = '/usr/bin/sparc64'
        BuilderMock.__init__(self, controller, target_cfg, buildarch, srpm_url)


BuilderClassDict = {
                'i386':     i386Arch,
                'i486':     i386Arch,
                'i586':     i386Arch,
                'i686':     i386Arch,
                'athlon':   i386Arch,
                'x86_64':   x86_64Arch,
                'amd64':    x86_64Arch,
                'ia32e':    x86_64Arch,
                'ppc':      PPCArch,
                'ppc32':    PPCArch,
                'ppc64':    PPC64Arch,
                'sparc':    SparcArch,
                'sparcv8':  SparcArch,
                'sparcv9':  SparcArch,
                'sparc64':  Sparc64Arch
               }


--- NEW FILE main.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 Dan Williams <dcbw at redhat.com> and Red Hat, Inc.


import os
import time
import sys
import signal
from plague import ArchUtils
from plague import daemonize
from optparse import OptionParser


sys.path.append('/usr/share/plague/builder')

import Config
import Builder
import BuilderMock

def log(string):
    sys.stdout.write(string)
    sys.stdout.flush()


def drop_privs(user):
    """
    We can't and shouldn't run mock as root, so we drop privs.
    We have to run the HTTP server as root though so it can chroot
    to the fileserver directory.
    """

    if os.getuid() != 0:
        return

    import pwd
    import grp

    eu = user
    try:
        uid = int(eu)
    except ValueError:
        try:
            pwrec = pwd.getpwnam(eu)
        except KeyError:
            print "Username '%s' does not exist." % eu
            return -1
        uid = pwrec[2]
    else:
        try:
            pwrec = pwd.getpwuid(uid)
        except KeyError:
            print "User ID %d doesn't exist." % uid
            return -1
    gid = pwrec[3]

    if uid == 0:
        print "You cannot use the superuser as the 'builder_user' option."
        return -1

    # Make ourself members of the mock group build_user's group
    try:
        mock_req = grp.getgrnam('mock')
    except KeyError:
        print "Mock group doesn't exist."
        return -1
    groups = [mock_req[2], gid]
    os.setgroups(groups)

    try:
        os.setgid(gid)
    except OSError:
        print "Could drop group privileges. Error: '%s'" % sys.exc_info()
        return -1

    os.setuid(uid)
    return 0


def determine_build_arches(cfg):
    """
    Attempt to autodetect what architectures this machine can build for,
    based on the kernel's uname.  If that fails, fall back to options in
    the config file.
    """

    machine_arch = os.uname()[4]
    arches = []
    try:
        arches = ArchUtils.supported_arches[machine_arch]
    except KeyError:
        print "Unknown machine type.  Please update plague's ArchUtils.py file."

    # Ok, grab from config file if we can't autodetermine
    if not len(arches):
        arches = cfg.get_list("General", "build_arches")

    for arch in arches:
        if not arch in BuilderMock.BuilderClassDict.keys():
            print "Unknown arch '%s' is not supported." % arch
            sys.exit(1)

    return arches


builder = None

def exit_handler(signum, frame):
    global builder
    log("Received SIGTERM, quitting...\n")
    builder.stop()

def main():
    global builder

    usage = "Usage: %s  [-p <pidfile>] [-l <logfile>] [-d] -c <configfile>" % sys.argv[0]
    parser = OptionParser(usage=usage)
    parser.add_option("-p", "--pidfile", default=None,
        help='file to write the PID to')
    parser.add_option("-l", "--logfile", default=None,
        help="location of file to write log output to")
    parser.add_option("-d", "--daemon", default=False, action="store_true",
        help="daemonize (i.e., detach from the terminal)")
    parser.add_option("-c", "--configfile", default=None,
        help="location of the builder config file")
    (opts, args) = parser.parse_args()

    if not opts.configfile:
        log("Must specify a config file.\n")
        sys.exit(1)

    # Load in the config
    cfg = Config.BuilderConfig(opts.configfile)
    btype = cfg.get_str("General", "comm_type")
    if btype != 'passive' and btype != 'active':
        log("Builder communication type must be 'active' or 'passive', not '%s'.  Exiting...\n" % btype)
        sys.exit(1)

    build_arches = determine_build_arches(cfg)
    if not len(build_arches):
        log("Cannot determine buildable arches for this builder.  Exiting...\n")
        sys.exit(1)

    cfg.load_target_configs(build_arches)
    if len(cfg.targets()) == 0:
        log("No useable mock buildroots configured.  Exiting...\n")
        sys.exit(1)

    if opts.daemon:
        ret=daemonize.createDaemon()
        if ret:
            log("Daemonizing failed!\n")
            sys.exit(2)

    if opts.pidfile:
        f = open(opts.pidfile, 'w', 1)
        f.write('%d\n' % os.getpid())
        f.flush()
        f.close()

    if opts.logfile:
        logf=open(opts.logfile, 'a')
        sys.stdout=logf
        sys.stderr=logf

    work_dir = cfg.get_str("Directories", "builder_work_dir")
    if not os.path.exists(work_dir) or not os.access(work_dir, os.R_OK):
        log("%s does not exist or is not readable.\n" % work_dir)
        os._exit(1)

    # Stop running as root
    if drop_privs(cfg.get_str("General", "builder_user")) == -1:
        builder.cleanup()
        os._exit(1)

    # Set up our termination handler
    signal.signal(signal.SIGTERM, exit_handler)

    builder = Builder.Builder.new_builder(cfg, btype)

    # Start doing stuff
    builder.work()

    log("Shutting down...\n")
    builder.stop()
    builder.cleanup()
    time.sleep(2)
    log(" done.\n");

    sys.stdout.flush()
    os._exit(0)


if __name__ == '__main__':
    main()


Index: Config.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/Config.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Config.py	31 Aug 2005 14:13:02 -0000	1.2
+++ Config.py	28 Apr 2006 03:17:35 -0000	1.3
@@ -22,6 +22,10 @@
 
 class InvalidTargetException(Exception): pass
 
+def make_target_string(distro, target, arch, repo):
+    return "%s-%s-%s-%s" % (distro, target, arch, repo)
+
+
 class BuilderConfig(BaseConfig.BaseConfig):
     def __init__(self, filename):
         BaseConfig.BaseConfig.__init__(self, filename)
@@ -77,15 +81,21 @@
         self.set_option("General", "debug", "yes")
         self.set_option("General", "builder_cmd", "/usr/bin/mock")
         self.set_option("General", "builder_user", "plague-builder")
+        self.set_option("General", "comm_type", "active")
 
         self.add_section("Directories")
         self.set_option("Directories", "builder_work_dir", "/tmp/builder_work")
         self.set_option("Directories", "target_configs_dir", "/etc/plague/builder/targets")
 
-        self.add_section("Network")
-        self.set_option("Network", "fileserver_port", "8889")
-        self.set_option("Network", "xmlrpc_port", "8888")
-        self.set_option("Network", "hostname", "")
+        self.add_section("Active")
+        self.set_option("Active", "server", "")
+        self.set_option("Active", "xmlrpc_port", "8886")
+        self.set_option("Active", "fileserver_port", "8887")
+
+        self.add_section("Passive")
+        self.set_option("Passive", "hostname", "")
+        self.set_option("Passive", "xmlrpc_port", "8888")
+        self.set_option("Passive", "fileserver_port", "8889")
 
         self.add_section("SSL")
         self.set_option("SSL", "use_ssl", "yes")
@@ -159,6 +169,10 @@
     def parent_cfg(self):
         return self._parent_cfg
 
+    def __repr__(self):
+        return make_target_string(self._distro, self._target, self._basearch, self._repo)
+    __str__ = __repr__
+
     def save_default_config(self, filename=None):
         self.add_section("General")
         self.set_option("General", "distro", "fedora")


Index: Makefile
===================================================================
RCS file: /cvs/fedora/extras-buildsys/builder/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile	25 Aug 2005 18:15:13 -0000	1.4
+++ Makefile	28 Apr 2006 03:17:35 -0000	1.5
@@ -14,11 +14,13 @@
 CONFIGDIR=$(DESTDIR)$(ETCDIR)/$(PKGNAME)/builder
 
 FILES = \
-	Config.py
+	Config.py \
+	Builder.py \
+	BuilderMock.py
 
 install:
 	$(MKDIR) -p $(DESTDIR)$(BINDIR)
-	$(INSTALL) -m 755 builder.py $(DESTDIR)/$(BINDIR)/$(PKGNAME)-builder
+	$(INSTALL) -m 755 main.py $(DESTDIR)/$(BINDIR)/$(PKGNAME)-builder
 	$(MKDIR) -p $(OTHERINSTDIR)
 	for file in $(FILES); do $(INSTALL) -m 644 $$file $(OTHERINSTDIR)/$$file; done
 	$(MKDIR) -p $(CONFIGDIR)


--- builder.py DELETED ---



From fedora-extras-commits at redhat.com  Fri Apr 28 03:17:43 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 27 Apr 2006 20:17:43 -0700
Subject: extras-buildsys/common Commands.py, NONE, 1.1 HTTPServer.py, 1.12,
	1.13 Makefile, 1.11, 1.12 URLopener.py, 1.1, 1.2
Message-ID: <200604280317.k3S3HhW9005370@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/common
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5292/common

Modified Files:
	HTTPServer.py Makefile URLopener.py 
Added Files:
	Commands.py 
Log Message:
2006-04-27  Dan Williams  <dcbw at redhat.com>

    Commit partial rework of builder<->server communcation.




--- NEW FILE Commands.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 2006 Dan Williams <dcbw at redhat.com> and Red Hat, Inc.


""" Common functions and constants for command parsing, receiving, and sending """


import threading



CMD_NAME_ERROR = "Error"
CMD_NAME_NOP = "NOP"
CMD_NAME_TARGETS = "Targets"
CMD_NAME_SLOTS = "Slots"
CMD_NAME_NEW_JOB_REQ = "NewJob"
CMD_NAME_NEW_JOB_ACK = "NewJobAck"


class SequenceGenerator(object):
    """An class that atomically increments a number."""
    def __init__(self):
        self._lock = threading.Lock()
        self._seq = 0

    def __del__(self):
        del self._lock
        del self._seq

    def next(self):
        """Returns the next number in the object's sequence."""
        self._lock.acquire()
        num = self._seq = self._seq + 1
        self._lock.release()
        return num


def serialize_to_command_stream(cmds):
    stream = []
    for cmd in cmds:
        stream.append(cmd.serialize())
    return stream


def deserialize_command_stream(cmd_stream):
    """ Converts a command stream into a list of command objects.

    Argument is a python list of serialized command objects, each
    represented by a python dict.
    
    Return value is a python list of command objects.
    """

    cmds = []
    for item in cmd_stream:
        cmd = PlgCommand.deserialize(item)
        cmds.append(cmd)
    return cmds


class PlgCommand(object):
    """Abstract base class for all builder<->server command
    objects."""

    _need_ack = False

    def __init__(self, name, seq=0):
        """Initialize the command object.  Not used directly,
        but called by subclasses.
        
        The NAME argument is the name (type) of the command.
        
        The SEQ argument is the command's sequence number, which
        should be unique among all commands the program sends.
        """
        self._name = name
        self._seq = seq

    def deserialize(cmd_stream):
        """Class method that deserializes a command stream into
        a particular subclass of command object.
        
        The CMD_STREAM argument is a python dict representing the
        serialized state of the command.

        Return value is the command object.
        """
        cmd = name = args = seq = None
        try:
            # Pull out required fields
            name = cmd_stream['name']
            args = cmd_stream['args']
            seq = cmd_stream['sequence']
        except (KeyError, TypeError), e:
            print "PlgCommand deserialize error: %s" % e
            return None

        # Create the specific command object from the command's name
        if name == CMD_NAME_ERROR:
            cmd = PlgCommandError._deserialize(args)
        elif name == CMD_NAME_TARGETS:
            cmd = PlgCommandTargets._deserialize(args)
        elif name == CMD_NAME_SLOTS:
            cmd = PlgCommandSlots._deserialize(args)
        elif name == CMD_NAME_NEW_JOB_REQ:
            cmd = PlgCommandNewJobReq._deserialize(args)
        elif name == CMD_NAME_NEW_JOB_ACK:
            cmd = PlgCommandNewJobAck._deserialize(args)

        # If command creation was successful, set the sequence
        # number from the command stream on the command.  We don't
        # want to expose the sequence number to subclasses because
        # they should never need it.
        if cmd:
            cmd._seq = seq

        return cmd

    deserialize = staticmethod(deserialize)

    def name(self):
        """Returns the command's name."""
        return self._name

    def seq(self):
        """Returns the command's sequece number."""
        return self._seq

    def need_ack(self):
        """Returns a boolean stating whether this command requires
        an acknowledgement command or not."""
        return self._need_ack

    def _serialize(self, args):
        """Serializes the basic command information into the command
        stream, returning a python dict.  Should only be called by
        subclasses, after determining the arguments the subclass wishes
        to serialize into the command.
        
        Argument ARGS is a python dict containing the subclass-specific
        command's arguments.
        """
        if not args:
            raise ValueError("args cannot be None")
        cmd = {}
        cmd['name'] = self._name
        cmd['sequence'] = self._seq
        cmd['args'] = args
        return cmd

    def __str__(self):
        return "%s(seq: %d)" % (self._name, self._seq)
    __repr__ = __str__


class PlgCommandAck(PlgCommand):
    """Abstract base class for acknowledgement commands."""

    def __init__(self, name, acked_seq, seq=0):
        PlgCommand.__init__(self, name, seq)
        self._acked_seq = acked_seq

    def _deserialize_acked_seq(args):
        try:
            acked_seq = args['acked_seq']
        except KeyError, TypeError:
            raise ValueError("No 'acked_seq' argument found.")
        return acked_seq

    _deserialize_acked_seq = staticmethod(_deserialize_acked_seq)

    def _serialize(self, args):
        args['acked_seq'] = self._acked_seq
        return PlgCommand._serialize(self, args)

    def acked_seq(self):
        return self._acked_seq


class PlgCommandNop(PlgCommand):
    def __init__(self, seq=0):
        PlgCommand.__init__(self, CMD_NAME_NOP, seq)

    def _deserialize(args):
        return PlgCommandNop()

    _deserialize = staticmethod(_deserialize)

    def serialize(self):
        return PlgCommand._serialize(self, {})


class PlgCommandError(PlgCommand):
    def __init__(self, reason, seq=0):
        PlgCommand.__init__(self, CMD_NAME_ERROR, seq)
        self._reason = reason

    def _deserialize(args):
        try:
            reason = args['reason']
        except KeyError, TypeError:
            raise ValueError("No 'reason' argument found.")
        return PlgCommandError(reason)

    _deserialize = staticmethod(_deserialize)

    def serialize(self):
        args = {}
        args['reason'] = self._reason
        return PlgCommand._serialize(self, args)

    def reason(self):
        return self._reason

    def __str__(self):
        return "%s(seq: %d, reason: %s)" % (self._name, self._seq, self._reason)


class PlgCommandSlots(PlgCommand):
    def __init__(self, free, maximum, seq=0):
        PlgCommand.__init__(self, CMD_NAME_SLOTS, seq)
        self._free_slots = free
        self._max_slots = maximum

    def _deserialize(args):
        try:
            free = args['free']
        except ValueError, TypeError:
            raise ValueError("No 'free' argument found.")
        try:
            maximum = args['max']
        except KeyError, TypeError:
            raise ValueError("No 'max' argument found.")
        return PlgCommandSlots(free, maximum)

    _deserialize = staticmethod(_deserialize)

    def serialize(self):
        args = {}
        args['free'] = self._free_slots
        args['max'] = self._max_slots
        return PlgCommand._serialize(self, args)

    def free_slots(self):
        return self._free_slots

    def max_slots(self):
        return self._max_slots

    def __str__(self):
        return "%s(seq: %d, slots: (%d of %d))" % (self._name, self._seq, self._free_slots, self._max_slots)


class PlgCommandTargets(PlgCommand):
    def __init__(self, targets, seq=0):
        PlgCommand.__init__(self, CMD_NAME_TARGETS, seq)
        self._targets = targets

    def _deserialize(args):
        try:
            targets = args['targets']
        except KeyError, TypeError:
            raise ValueError("No 'targets' argument found.")

        # Sanity checking on targets argument
        if type(targets) != type([]):
            raise ValueError("'targets' argument was not a list.")
        for target in targets:
            try:
                distro = target['distro']
                tg = target['target']
                basearch = target['arch']
                repo = target['repo']
                suparch = target['supported_arches']
            except KeyError, e:
                raise ValueError("Required item '%s' not found in a target." % e)

        return PlgCommandTargets(targets)

    _deserialize = staticmethod(_deserialize)

    def serialize(self):
        args = {}
        args['targets'] = self._targets
        return PlgCommand._serialize(self, args)

    def targets(self):
        return self._targets

    def __str__(self):
        return "%s(seq: %d, targets: %s)" % (self._name, self._seq, self._targets)


class PlgCommandNewJobReq(PlgCommand):

    _need_ack = True

    def __init__(self, parent_job, target_dict, srpm_url, seq=0):
        PlgCommand.__init__(self, CMD_NAME_NEW_JOB_REQ, seq)
        self._parent_job = parent_job  # doesn't get serialized
        self._target_dict = target_dict
        self._srpm_url = srpm_url

    def _deserialize(args):
        try:
            target_dict = args['target_dict']
        except KeyError, TypeError:
            raise ValueError("No 'target_dict' argument found.")
        try:
            srpm_url = args['srpm_url']
        except KeyError, TypeError:
            raise ValueError("No 'srpm_url' argument found.")

        return PlgCommandNewJobReq(None, target_dict, srpm_url)

    _deserialize = staticmethod(_deserialize)

    def serialize(self):
        args = {}
        args['target_dict'] = self._target_dict
        args['srpm_url'] = self._srpm_url
        return PlgCommand._serialize(self, args)

    def parent_job(self):
        return self._parent_job

    def target_dict(self):
        return self._target_dict

    def srpm_url(self):
        return self._srpm_url

    def __str__(self):
        return "%s(seq: %d, target_dict: %s, srpm_url: %s)" % (self._name, self._seq, self._target_dict, self._srpm_url)


class PlgCommandNewJobAck(PlgCommandAck):
    def __init__(self, archjob_id, msg, req_seq, seq=0):
        PlgCommandAck.__init__(self, CMD_NAME_NEW_JOB_ACK, req_seq, seq)
        self._archjob_id = archjob_id
        self._msg = msg

    def _deserialize(args):
        try:
            archjob_id = args['archjob_id']
            msg = args['msg']
        except KeyError, TypeError:
            raise ValueError("No 'archjob_id' argument found.")
        req_seq = PlgCommandAck._deserialize_acked_seq(args)
        return PlgCommandNewJobAck(archjob_id, msg, req_seq)

    _deserialize = staticmethod(_deserialize)

    def serialize(self):
        args = {}
        args['archjob_id'] = self._archjob_id
        args['msg'] = self._msg
        return PlgCommandAck._serialize(self, args)

    def archjob_id(self):
        return self._archjob_id

    def message(self):
        return self._msg



Index: HTTPServer.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/HTTPServer.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- HTTPServer.py	27 Mar 2006 15:45:39 -0000	1.12
+++ HTTPServer.py	28 Apr 2006 03:17:40 -0000	1.13
@@ -183,8 +183,11 @@
         self._server.stop()
         t = time.time()
         while not self._stopped:
-            if time.time() > t + 2:
-                break
+            try:
+                if time.time() > t + 2:
+                    break
+            except KeyboardInterrupt:
+                pass
 
 
 ###########################################################


Index: Makefile
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- Makefile	22 Jan 2006 02:08:56 -0000	1.11
+++ Makefile	28 Apr 2006 03:17:40 -0000	1.12
@@ -9,18 +9,20 @@
 
 FILES = \
 	ArchUtils.py \
+	AuthedXMLRPCServer.py \
 	BaseConfig.py \
+	Commands.py \
 	CommonErrors.py \
+	daemonize.py \
 	DebugUtils.py \
 	ExecUtils.py \
 	FileDownloader.py \
-	HTTPSURLopener.py \
+    FileUploader.py \
 	HTTPServer.py \
-	AuthedXMLRPCServer.py \
 	SSLCommon.py \
 	SSLConnection.py \
+	URLopener.py \
 	XMLRPCServerProxy.py \
-	daemonize.py \
 	__init__.py
 
 clean:


Index: URLopener.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/common/URLopener.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- URLopener.py	27 Mar 2006 04:12:11 -0000	1.1
+++ URLopener.py	28 Apr 2006 03:17:40 -0000	1.2
@@ -40,7 +40,7 @@
         buffer += '\r\n'
         buffer += str(v) + '\r\n'
         if sock:
-        	sock.send(buffer)
+            sock.send(buffer)
         l += len(buffer)
     for (k, v) in v_files:
         fd = v
@@ -49,7 +49,7 @@
         buffer=''
         buffer += '--%s\r\n' % boundary
         buffer += 'Content-Disposition: form-data; name="%s"; filename="%s"\r\n' \
-        		  % (k, name)
+                  % (k, name)
         buffer += 'Content-Type: %s\r\n' % get_content_type(name)
         buffer += 'Content-Length: %s\r\n' % file_size
         buffer += '\r\n'
@@ -163,14 +163,14 @@
             raise IOError(e)
 
         if data is not None:
-			if len(v_files) > 0:
-				l = send_data(v_vars, v_files, boundary, h)
-			elif len(v_vars) > 0:
-				# if data is passed as dict ...
-				data = urllib.urlencode(v_vars)
-				h.send(data)
-			else:
-				h.send(data)
+            if len(v_files) > 0:
+                l = send_data(v_vars, v_files, boundary, h)
+            elif len(v_vars) > 0:
+                # if data is passed as dict ...
+                data = urllib.urlencode(v_vars)
+                h.send(data)
+            else:
+                h.send(data)
 
         # close files
         if data is not None:



From fedora-extras-commits at redhat.com  Fri Apr 28 03:17:43 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 27 Apr 2006 20:17:43 -0700
Subject: extras-buildsys/server BuildMaster.py, 1.39, 1.40 Builder.py, 1.33,
	1.34 BuilderManager.py, 1.21, 1.22 Config.py, 1.16,
	1.17 main.py, 1.20, 1.21
Message-ID: <200604280317.k3S3Hio7005379@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys/server
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5292/server

Modified Files:
	BuildMaster.py Builder.py BuilderManager.py Config.py main.py 
Log Message:
2006-04-27  Dan Williams  <dcbw at redhat.com>

    Commit partial rework of builder<->server communcation.




Index: BuildMaster.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/BuildMaster.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- BuildMaster.py	24 Mar 2006 19:13:41 -0000	1.39
+++ BuildMaster.py	28 Apr 2006 03:17:41 -0000	1.40
@@ -375,9 +375,6 @@
                 have_work = True
             self._archjob_status_updates_lock.release()
 
-        if not have_work and self.builder_manager.have_work(self._paused):
-            have_work = True
-
         return have_work
 
     def get_job(self, uid):
@@ -401,9 +398,6 @@
             # Write update status for jobs to the database
             self._save_job_status()
 
-            if self.builder_manager.have_work(self._paused):
-                self.builder_manager.process(self._paused)
-
             # Clean up jobs that have finished
             self._process_finished_jobs()
 


Index: Builder.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Builder.py,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- Builder.py	20 Mar 2006 12:43:21 -0000	1.33
+++ Builder.py	28 Apr 2006 03:17:41 -0000	1.34
@@ -22,6 +22,7 @@
 import os
 import urllib
 import threading
+from plague import Commands
 from plague import XMLRPCServerProxy
 from plague import CommonErrors
 import OpenSSL
@@ -34,6 +35,152 @@
 SUSPEND_TIMEOUT = 'timeout'
 SUSPEND_HARD_ERROR = 'hard-error'
 
+TYPE_PASSIVE = 1
+TYPE_ACTIVE = 2
+
+
+class Builder(threading.Thread):
+    """ Tracks all jobs on a builder instance """
+
+    def __init__(self, manager, cfg, address, weight, btype):
+        self._manager = manager
+        self._jobs = {}
+        self._free_slots = 0
+        self._num_slots = 0
+        self._address = address
+        self._available = False
+        self._suspend_reason = SUSPEND_NONE
+        self._stop = False
+        self._prepping_jobs = False
+        self._unavail_count = 0
+        self._target_list = []
+        self._when_died = 0
+        self._server_cfg = cfg
+        self._weight = weight
+        self._type = btype
+        self._seq_gen = Commands.SequenceGenerator()
+
+        try:
+            type, rest = urllib.splittype(address)
+            host, ignore = urllib.splithost(rest)
+            host, port = urllib.splitport(host)
+            self._ip = socket.gethostbyname(host)
+        except Exception, e:
+            print "Builder Error(%s): couldn't lookup builder's IP address." % address
+            raise Exception(e)
+
+        threading.Thread.__init__(self)
+        self.setName("Builder: %s" % address)
+
+    def _match_target_dict(self, td1, td2):
+        if td1['distro'] == td2['distro']:
+            if td1['target'] == td2['target']:
+                if td1['repo'] == td2['repo']:
+                    return True
+        return False
+
+    def arches(self, target_dict):
+        for td in self._target_list:
+            if self._match_target_dict(td, target_dict):
+                arches = []
+                for arch in td['supported_arches']:
+                    if not arch in arches:
+                        arches.append(arch)
+                return arches
+        return None
+
+    def can_build_for_target(self, target_dict):
+        for td in self._target_list:
+            if self._match_target_dict(td, target_dict):
+                if target_dict['arch'] in td['supported_arches']:
+                    return True
+        return False
+
+    def address(self):
+        return (self._ip, self._address)
+
+    def available(self):
+        """ Is the builder responding to requests? """
+        return self._available
+
+    def free_slots(self):
+        return self._free_slots
+
+    def weight(self):
+        return self._weight
+
+    def type(self):
+        return self._type
+
+    def stop(self):
+        self._stop = True
+
+    def _handle_builder_suspend(self, reason, msg):
+        for jobid in self._jobs.keys():
+            job = self._jobs[jobid]
+            job.builder_gone()
+            del self._jobs[jobid]
+        self._jobs = {}
+        self._available = False
+        self._suspend_reason = reason
+        self._unavail_count = 0
+        self._prepping_jobs = False
+        self._when_died = time.time()
+
+        # Notify admins
+        print "Suspending builder '%s'.  Reason: %s - %s." % (self._address, reason, msg)
+        subject = "Builder Suspended: %s" % self._address
+        msg = "The builder '%s' was suspended.  Reason: %s - %s." % (self._address, reason, msg)
+        sender = self._server_cfg.get_str("Email", "email_from")
+        for addr in self._server_cfg.get_list("Email", "admin_emails"):
+            EmailUtils.email_result(sender, addr, msg, subject)
+
+    def _handle_builder_reactivate(self, mail=False):
+        self._available = True
+        self._suspend_reason = SUSPEND_NONE
+
+        print "Re-activating builder '%s'." % self._address
+
+        if mail:
+            subject = "Builder Re-activated: %s" % self._address
+            msg = """The builder '%s' was re-activated.
+
+  Suspended at: %s
+  Re-Enabled at: %s
+""" % (self._address, time.ctime(self._when_died), time.ctime(time.time()))
+            sender = self._server_cfg.get_str("Email", "email_from")
+            for addr in self._server_cfg.get_list("Email", "admin_emails"):
+                EmailUtils.email_result(sender, addr, msg, subject)
+        self._when_died = 0
+
+    def any_prepping_jobs(self):
+        return self._prepping_jobs
+
+    def to_dict(self):
+        builder_dict = {}
+
+        addr = self._address
+        # for some reason, splithost doesn't like the protocol
+        # method, you have to give it a string starting with "//"
+        if addr.startswith("http"):
+            idx = addr.find('//')
+            addr = addr[idx:]
+        host_port, path = urllib.splithost(addr)
+        host, port = urllib.splitport(host_port)
+        builder_dict['address'] = host
+
+        arches = []
+        for td in self._target_list:
+            for arch in td['supported_arches']:
+                if not arch in arches:
+                    arches.append(arch)
+        builder_dict['arches'] = arches
+
+        builder_dict['available'] = self._available
+        builder_dict['num_slots'] = self._num_slots
+        builder_dict['free_slots'] = self._free_slots
+        return builder_dict
+
 # HACK: This class is a hack to work around SSL hanging issues,
 # which cause the whole server to grind to a halt
 class BuildingJobsCheck(threading.Thread):
@@ -61,31 +208,21 @@
         self.free_slots = free_slots
         self.done = True
 
-
-class Builder(threading.Thread):
-    """ Tracks all jobs on a builder instance """
+class PassiveBuilder(Builder):
+    """
+    Passive builders are ones that do not initiate connections.  They
+    wait for the server to contact them, and therefore cannot be behind
+    a firewall without having holes punched through it.
+    """
 
     _BUILDER_PING_INTERVAL = 60 * 5      # In seconds
 
-    def __init__(self, manager, cfg, address, weight):
-        self._cur_jobid = None
-        self._manager = manager
-        self._jobs = {}
-        self._free_slots = 0
-        self._num_slots = 0
-        self._address = address
-        self._alive = True
-        self._suspend_reason = SUSPEND_NONE
-        self._stop = False
-        self._prepping_jobs = False
-        self._unavail_count = 0
-        self._target_list = []
+    def __init__(self, manager, cfg, address, weight, btype):
+        Builder.__init__(self, manager, cfg, address, weight, btype)
+
         self._ping_timeout = 0
         self._cur_ping_interval = self._BUILDER_PING_INTERVAL
         self._ping_now = False
-        self._when_died = 0
-        self._server_cfg = cfg
-        self._weight = weight
 
         certs = None
         if self._server_cfg.get_bool("Builders", "use_ssl"):
@@ -97,17 +234,26 @@
         self._server = XMLRPCServerProxy.PlgXMLRPCServerProxy(self._address, certs, timeout=20)
         self._server_lock = threading.Lock()
 
-        threading.Thread.__init__(self)
-        self.setName("Builder: %s" % address)
-
-        (self._alive, target_list) = self._ping_builder()
-        if self._alive:
+        (self._available, target_list) = self._ping_builder()
+        if self._available:
             self._init_builder(target_list)
         else:
             # Treat the builder as timed out and ping it periodically
             self._ping_timeout = time.time()
             self._suspend_reason = SUSPEND_TIMEOUT
 
+    def _ping_builder(self):
+        target_list = []
+        try:
+            target_list = self._server.supported_targets()
+            alive = True
+        except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, OpenSSL.SSL.Error, xmlrpclib.ProtocolError):
+            alive = False
+        except xmlrpclib.Fault, e:
+            print "Builder Error (%s) in _ping_builder(): builder replied '%s'" % (self._address, e)
+            alive = False
+        return (alive, target_list)
+
     def _init_builder(self, target_list):
         self._target_list = target_list
 
@@ -146,7 +292,7 @@
         if bjc.done:
             if not bjc.failed:
                 self._unavail_count = 0
-                self._alive = True
+                self._available = True
                 self._free_slots = bjc.free_slots
                 return bjc.jobs
             else:
@@ -157,55 +303,22 @@
 
         return {}
 
-    def _ping_builder(self):
-        target_list = []
-        try:
-            target_list = self._server.supported_targets()
-            alive = True
-        except (socket.error, socket.timeout, OpenSSL.SSL.SysCallError, OpenSSL.SSL.Error, xmlrpclib.ProtocolError):
-            alive = False
-        except xmlrpclib.Fault, e:
-            print "Builder Error (%s) in _ping_builder(): builder replied '%s'" % (self._address, e)
-            alive = False
-        return (alive, target_list)
-
-    def _match_target_dict(self, td1, td2):
-        if td1['distro'] == td2['distro']:
-            if td1['target'] == td2['target']:
-                if td1['repo'] == td2['repo']:
-                    return True
-        return False
-
-    def arches(self, target_dict):
-        for td in self._target_list:
-            if self._match_target_dict(td, target_dict):
-                arches = []
-                for arch in td['supported_arches']:
-                    if not arch in arches:
-                        arches.append(arch)
-                return arches
-        return None
-
-    def can_build_for_target(self, target_dict):
-        for td in self._target_list:
-            if self._match_target_dict(td, target_dict):
-                if target_dict['arch'] in td['supported_arches']:
-                    return True
-        return False
-
-    def address(self):
-        return self._address
+    def ping_asap(self):
+        # Reduce the ping interval to ping the builder right away
+        self._cur_ping_interval = 0
+        self._ping_now = True
 
-    def alive(self):
-        """ Is the builder responding to requests? """
-        return self._alive
+    def _handle_builder_suspend(self, reason, msg):
+        Builder._handle_builder_suspend(self, reason, msg)
+        # Reset current ping interval to default
+        self._cur_ping_interval = self._BUILDER_PING_INTERVAL
+        self._ping_timeout = time.time()
 
-    def free_slots(self):
-        return self._free_slots
+    def _handle_builder_reactivate(self):
+        Builder._handle_builder_reactivate(self)
+        self._ping_timeout = 0
+        self._init_builder(target_list)
 
-    def weight(self):
-        return self._weight
-    
     def start_job(self, par_job, target_dict, srpm_url):
         if not self.available():
             raise RuntimeError
@@ -285,63 +398,12 @@
             pass
         return status
 
-    def stop(self):
-        self._stop = True
-
-    def ping_asap(self):
-        # Reduce the ping interval to ping the builder right away
-        self._cur_ping_interval = 0
-        self._ping_now = True
-
-    def _handle_builder_suspend(self, reason, msg):
-        for jobid in self._jobs.keys():
-            job = self._jobs[jobid]
-            job.builder_gone()
-            del self._jobs[jobid]
-        self._jobs = {}
-        self._alive = False
-        self._suspend_reason = reason
-        self._unavail_count = 0
-        self._prepping_jobs = False
-        self._when_died = time.time()
-
-        # Reset current ping interval to default
-        self._cur_ping_interval = self._BUILDER_PING_INTERVAL
-        self._ping_timeout = time.time()
-
-        # Notify admins
-        print "Suspending builder '%s'.  Reason: %s - %s." % (self._address, reason, msg)
-        subject = "Builder Suspended: %s" % self._address
-        msg = "The builder '%s' was suspended.  Reason: %s - %s." % (self._address, reason, msg)
-        sender = self._server_cfg.get_str("Email", "email_from")
-        for addr in self._server_cfg.get_list("Email", "admin_emails"):
-            EmailUtils.email_result(sender, addr, msg, subject)
-
-    def _handle_builder_reactivate(self, target_list):
-        self._alive = True
-        self._suspend_reason = SUSPEND_NONE
-        self._ping_timeout = 0
-
-        self._init_builder(target_list)
-
-        print "Re-activating builder '%s'." % self._address
-        subject = "Builder Re-activated: %s" % self._address
-        msg = """The builder '%s' was re-activated.
-
-  Suspended at: %s
-  Re-Enabled at: %s
-""" % (self._address, time.ctime(self._when_died), time.ctime(time.time()))
-        sender = self._server_cfg.get_str("Email", "email_from")
-        for addr in self._server_cfg.get_list("Email", "admin_emails"):
-            EmailUtils.email_result(sender, addr, msg, subject)
-        self._when_died = 0
-
     def run(self):
         DebugUtils.registerThreadName(self)
         while not self._stop:
             self._server_lock.acquire()
 
-            if self._alive:
+            if self._available:
                 self._update_building_jobs()
 
                 if self._unavail_count > 2:
@@ -351,12 +413,12 @@
                     # Update status of all archjobs on this builder
                     for j in self._jobs.values():
                         j.process()
-            elif not self._alive and (self._suspend_reason == SUSPEND_TIMEOUT or self._ping_now):
+            elif not self._available and (self._suspend_reason == SUSPEND_TIMEOUT or self._ping_now):
                 # Ping the builder every so often to see if it responds again
                 if time.time() > (self._ping_timeout + self._cur_ping_interval):
                     (alive, target_list) = self._ping_builder()
                     if alive:
-                        self._handle_builder_reactivate(target_list)
+                        self._handle_builder_reactivate()
                     else:
                         # Wait and ping again
                         self._ping_timeout = time.time()
@@ -368,40 +430,131 @@
             self._server_lock.release()
 
             time.sleep(20)
-    
-    def available(self):
-        """
-        Can the builder start a new job right now?
-        """
-        if self._unavail_count > 2 or not self._alive or self.free_slots() <= 0:
-            return False
-        return True
 
-    def any_prepping_jobs(self):
-        return self._prepping_jobs
 
-    def to_dict(self):
-        builder_dict = {}
+class ActiveBuilder(Builder):
+    """
+    Active builders are ones which attempt to contact the build server
+    by themselves.  Therefore, they can be behind a firewall without
+    punching holes through it.
+    """
+
+    _REQUIRED_CONTACT_INTERVAL = 20
+
+    def __init__(self, manager, cfg, address, weight, btype):
+        Builder.__init__(self, manager, cfg, address, weight, btype)
+        self._last_contact = 0
+        self._lock = threading.Lock()
+        self._cmd_queue = []
 
-        addr = self._address
-        # for some reason, splithost doesn't like the protocol
-        # method, you have to give it a string starting with "//"
-        if addr.startswith("http"):
-            idx = addr.find('//')
-            addr = addr[idx:]
-        host_port, path = urllib.splithost(addr)
-        host, port = urllib.splitport(host_port)
-        builder_dict['address'] = host
+    def _init_builder(self, target_list):
+        self._target_list = target_list
 
-        arches = []
-        for td in self._target_list:
-            for arch in td['supported_arches']:
-                if not arch in arches:
-                    arches.append(arch)
-        builder_dict['arches'] = arches
+    def _handle_new_job_ack(self, ack):
+        """Handle a NewJobAck command by finding the original command
+        sent to the builder, removing it from the command queue, and notifying
+        the parent job that this archjob is now in progress."""
+
+        old_cmd = None
+        self._lock.acquire()
+        for old_cmd in self._cmd_queue:
+            if old_cmd.seq() == ack.acked_seq() and isinstance(old_cmd, Commands.PlgCommandNewJobReq):
+                self._cmd_queue.remove(old_cmd)
+                break
+        self._lock.release()
 
-        builder_dict['alive'] = self._alive
-        builder_dict['num_slots'] = self._num_slots
-        builder_dict['free_slots'] = self._free_slots
-        return builder_dict
+        if old_cmd:
+            parent = old_cmd.parent_job()
+            archjob = ArchJob.ArchJob(self, parent, ack.archjob_id(), old_cmd.target_dict())
+            self._jobs[jobid] = archjob
+            parent.add_arch_job(archjob)
+
+    def _dispatch_command(self, cmd):
+        name = cmd.name()
+        if isinstance(cmd, Commands.PlgCommandSlots):
+            self._lock.acquire()
+            self._free_slots = cmd.free_slots()
+            self._num_slots = cmd.max_slots()
+            self._lock.release()
+        elif isinstance(cmd, Commands.PlgCommandTargets):
+            self._lock.acquire()
+            self._target_list = cmd.targets()
+            self._lock.release()
+        elif isinstance(cmd, Commands.PlgCommandNewJobAck):
+            self._handle_new_job_ack(cmd)
+        else:
+            print "Builder Error (%s): unhandled command '%s'" % (self._address, cmd.name())
+
+    def request(self, cmd_list):
+        """Process and respond to an active builder's request.  Called
+        from the BuildMaster's XML-RPC server."""
+
+        self._last_contact = time.time()
+        if not self._available:
+            self._handle_builder_reactivate(cmd_list)
+
+        # Process the commands the builder sent us
+        for cmd in cmd_list:
+            self._dispatch_command(cmd)
+
+        # Grab some work for the builder if any is available
+        new_cmds = []
+        if self._free_slots > 0:
+            req = self._manager.claim_arch_job(self)
+            if req:
+                next_seq = self._seq_gen.next()
+                cmd = Commands.PlgCommandNewJobReq(req['parent'], req['target_dict'], req['srpm_url'], next_seq)
+                new_cmds.append(cmd)
+
+        self._lock.acquire()
+        # Copy command queue
+        self._cmd_queue = self._cmd_queue + new_cmds
+        cmd_list = self._cmd_queue[:]
+        self._lock.release()
+        return cmd_list
+
+    _SLEEP_INTERVAL = 10
+    def run(self):
+        """Main builder loop.  Since the builder contacts us,
+        we don't have to do much here except handle builders
+        going away."""
 
+        DebugUtils.registerThreadName(self)
+        while not self._stop:
+            if not self._available:
+                time.sleep(self._SLEEP_INTERVAL)
+                continue
+
+            self._lock.acquire()
+            if self._unavail_count > 2:
+                self._handle_builder_suspend(SUSPEND_TIMEOUT, "the builder timed out")
+            elif self._last_contact + self._REQUIRED_CONTACT_INTERVAL < time.time():
+                self._unavail_count = self._unavail_count + 1
+            self._lock.release()
+
+            time.sleep(self._SLEEP_INTERVAL)
+
+    def _handle_builder_suspend(self, reason, msg):
+        Builder._handle_builder_suspend(self, reason, msg)
+        self._last_contact = 0
+
+    def _handle_builder_reactivate(self, cmd_list):
+        # Grab an updated target list from the command stream when
+        # the builder contacts us
+        target_list = None
+        for cmd in cmd_list:
+            if isinstance(cmd, Commands.PlgCommandTargets):
+                target_list = cmd.targets()
+        if not target_list:
+            target_list = self._target_list
+
+        mail = True
+        if self._suspend_reason == SUSPEND_NONE:
+            # Don't send mail saying the builder has been reactivated if
+            # this is the first time the builder has contacted us
+            mail = False
+
+        self._lock.acquire()
+        Builder._handle_builder_reactivate(self, mail=mail)
+        self._init_builder(target_list)
+        self._lock.release()


Index: BuilderManager.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/BuilderManager.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- BuilderManager.py	20 Mar 2006 20:05:11 -0000	1.21
+++ BuilderManager.py	28 Apr 2006 03:17:41 -0000	1.22
@@ -24,91 +24,230 @@
 import Builder
 import EmailUtils
 import Config
+import time
+from plague import DebugUtils
+from plague import AuthedXMLRPCServer
+from plague import HTTPServer
+from plague import Commands
+
+
+class AddrCache(object):
+    def __init__(self):
+        self._cache = {}
+
+    def get(self, name):
+        # Expire cache entry if one exists and is old
+        time = ip = None
+        try:
+            (time, ip) = self._cache[name]
+            if time < time.time() - (60 * 60):
+                del self._cache[name]
+                time = ip = None
+        except KeyError:
+            pass
+
+        # Do a lookup and cache it
+        if not ip:
+            try:
+                ip = socket.gethostbyname(name)
+                self._cache[name] = (time.time(), ip)
+            except:
+                pass
+
+        return ip
+
+class AuthedSSLBuilderServer(AuthedXMLRPCServer.AuthedSSLXMLRPCServer):
+    """ SSL XMLRPC server that authenticates builders based on their certificate. """
+    def __init__(self, address, certs, builder_manager):
+        AuthedXMLRPCServer.AuthedSSLXMLRPCServer.__init__(self, address, self.auth_cb, certs)
+        self.authenticator = builder_manager
+        self._addr_cache = AddrCache()
+
+    def auth_cb(self, request, con_addr_pair):
+        peer_cert = request.get_peer_certificate()
+        cert_address = peer_cert.get_subject().commonName        
+        try:
+            (con_address, con_port) = con_addr_pair
+            cert_ip = self._addr_cache.get(cert_address)
+            con_ip = self._addr_cache.get(con_address)
+            builder = self.authenticator.get_builder(cert_ip, con_ip)
+            if builder.type() is not Builder.TYPE_ACTIVE:
+                builder = None
+        except Exception:
+            builder = None
+        return builder
+
+class AuthedBuilderServer(AuthedXMLRPCServer.AuthedXMLRPCServer):
+    """ Authenticates builders based on their IP address. """
+    def __init__(self, address, builder_manager):
+        AuthedXMLRPCServer.AuthedXMLRPCServer.__init__(self, address, self.auth_cb)
+        self.authenticator = builder_manager
+        self._addr_cache = AddrCache()
+
+    def auth_cb(self, request, con_addr_pair):
+        try:
+            (con_address, con_port) = con_addr_pair
+            ip = self._addr_cache.get(con_address)
+            builder = self.authenticator.get_builder(ip, ip)
+            if builder.type() is not Builder.TYPE_ACTIVE:
+                builder = None
+        except Exception:
+            builder = None
+        return builder
+
+
+class BuilderDispatcher(object):
+    def request(self, cmd_list):
+        # Authorize the builder, then pass the request
+        # to the correct builder object
+
+        builder = AuthedXMLRPCServer.get_authinfo()
+        if not builder:
+            cmd = Commands.PlgCommandError("Builder is not authorized")
+            return [cmd.serialize()]
+
+        cmds = Commands.deserialize_command_stream(cmd_list)
+        cmds_for_server = builder.request(cmds)
+        cmd_stream = Commands.serialize_to_command_stream(cmds_for_server)
+        return cmd_stream
 
 
-class BuilderManager:
+class BuilderServerThread(threading.Thread):
     """
-    Tracks individual builder instances.
+    Object to serve active builder requests in a separate thread.
+    Can't block the main BuilderManager object by sitting in
+    serve_forever().
     """
+    def __init__(self, cfg, bm):
+        self._cfg = cfg
+        self._bm = bm
+        self._stopped = False
+        threading.Thread.__init__(self)
+        self.setName("BuilderServerThread")
+
+        hostname = cfg.get_str("General", "hostname")
+        port = cfg.get_int("Active Builders", "xmlrpc_server_port")
+        if cfg.get_bool("Builders", "use_ssl") == True:
+            certs = {}
+            certs['key_and_cert'] = cfg.get_str("SSL", "server_key_and_cert")
+            certs['ca_cert'] = cfg.get_str("SSL", "ca_cert")
+            certs['peer_ca_cert'] = cfg.get_str("SSL", "ca_cert")
+            self._server = AuthedSSLBuilderServer((hostname, port), certs, self._bm)
+        else:
+            self._server = AuthedBuilderServer((hostname, port), self._bm)
+        self._dispatcher = BuilderDispatcher()
+        self._server.register_instance(self._dispatcher)
+
+    def run(self):
+        DebugUtils.registerThreadName(self)
+        self._server.serve_forever()
+        self._stopped = True
+
+    def stop(self):
+        self._server.stop()
+        t = time.time()
+        while not self._stopped:
+            try:
+                if time.time() > t + 2:
+                    break
+            except KeyboardInterrupt:
+                pass
+
+
+class BuilderManager:
+    """ Tracks individual builder instances. """
 
     def __init__(self, cfg):
         self._cfg = cfg
         self._builders_lock = threading.Lock()
 
         self._builders = []
-        self.add_new_builders()
+        any_active = self._load_builders()
+        self._print_builders()
+
+        self._queue_lock = threading.Lock()
+        self._queue = []
+
+        self._xmlrpc_server = None
+        if any_active:
+            # Builder XMLRPC server
+            # Only start it when there are active-type builders listed
+            # in the config file
+            self._xmlrpc_server = BuilderServerThread(cfg, self)
+            self._xmlrpc_server.start()
+
+        # Builder HTTP fileserver
+        hostname = cfg.get_str("General", "hostname")
+        port = cfg.get_int("Active Builders", "file_server_port")
+        http_dir = os.path.join(cfg.get_str("Directories", "server_work_dir"), "srpm_http_dir")
+        certs = {}
+        if cfg.get_bool("Builders", "use_ssl"):
+            certs['key_and_cert'] = cfg.get_str("SSL", "server_key_and_cert")
+            certs['ca_cert'] = cfg.get_str("SSL", "ca_cert")
+            certs['peer_ca_cert'] = cfg.get_str("SSL", "ca_cert")
+        self._srpm_server = HTTPServer.PlgHTTPServerManager((hostname, port), http_dir, certs)
+        self._srpm_server.start()
 
+    def _print_builders(self):
         # Print out builder list when starting up
-        print "\nBuilders:"
+        print "\nAuthorized Builders:"
         print "-" * 90
         for builder in self._builders:
-            string = "  " + builder.address()
-            string = string + " " * (40 - len(builder.address()))
+            (ip, addr) = builder.address()
+            string = "  " + addr
+            string = string + " " * (40 - len(addr))
             builder_dict = builder.to_dict()
             for arch in builder_dict['arches']:
                 string = string + arch + " "
             string = string + " " * (80 - len(string))
             status = "unavailable"
-            if builder_dict['alive']:
-                status = "alive"
+            if builder_dict['available']:
+                status = "available"
             string = string + status
             del builder_dict
             print string
         print ""
 
-        self._queue_lock = threading.Lock()
-        self._queue = []
-
-        self._have_work = False
-
-    def __del__(self):
+    def stop(self):
         for builder in self._builders:
             builder.stop()
-        time.sleep(2)
+        if self._xmlrpc_server:
+            self._xmlrpc_server.stop()
+        self._srpm_server.stop()
 
-    def set_build_master(self, build_master):
-        self._build_master = build_master
-
-    def add_new_builders(self):
+    def _load_builders(self):
         self._builders_lock.acquire()
-
-        tmp_list = self._cfg.builders()
-        prefix = "http://"
-        if self._cfg.get_bool("Builders", "use_ssl") == True:
-            prefix = "https://"
-
-        builder_list = {}
-        for addr in tmp_list.keys():
-            new_addr = addr
-            # Rewrite addresses to match current builder connection method
-            if addr.startswith("http://"):
-                new_addr = addr[7:]
-            elif addr.startswith("https://"):
-                new_addr = addr[8:]
-            if new_addr:
-                builder_list[prefix + new_addr] = tmp_list[addr]
-
-        for address in builder_list.keys():
+        any_active = False
+        builders = self._cfg.builders()
+        for address in builders:
+            (weight, btype) = builders[address]
+            if btype == Builder.TYPE_ACTIVE:
+                any_active = True
             # If the address is already in our _builders list, skip it
             skip = False
             for builder in self._builders:
-                if address == builder.address():
+                (ip, addr) = builder.address()
+                if address == addr:
                     skip = True
+                    break
             if skip == True:
                 continue
 
             # Add the builder to our build list
-            weight = builder_list[address]
-            builder = Builder.Builder(self, self._cfg, address, weight)
+            if btype == Builder.TYPE_ACTIVE:
+                builder = Builder.ActiveBuilder(self, self._cfg, address, weight, btype)
+            else:
+                builder = Builder.PassiveBuilder(self, self._cfg, address, weight, btype)
             builder.start()
             self._builders.append(builder)
-
         self._builders_lock.release()
+        return any_active
 
     def ping_suspended_builders(self):
         self._builders_lock.acquire()
         for builder in self._builders:
-            if not builder.alive():
+            passive = (builder.type() == Builder.TYPE_PASSIVE)
+            if passive and not builder.alive():
                 builder.ping_asap()
         self._builders_lock.release()
 
@@ -118,14 +257,22 @@
             builder_list.append(builder.to_dict())
         return builder_list
 
-    def have_work(self, paused):
-        avail = False
-        for builder in self._builders:
-            if builder.available():
-                avail = True
-        if not paused and len(self._queue) > 0 and avail:
-            return True
-        return self._have_work
+    def get_builder(self, cert_ip, con_ip):
+        self._builders_lock.acquire()
+        builder = None
+
+        # Ensure builder's certificate (if SSL) and
+        # the remote address of its connection are the same
+        if cert_ip == con_ip:
+            # Find matching builder in our authorized builders list
+            for b in self._builders:
+                (ip, addr) = b.address()
+                if cert_ip == ip:
+                    builder = b
+                    break
+
+        self._builders_lock.release()
+        return builder
 
     def _builder_cmp_func(self, builder1, builder2):
         # If both builders have at least one free slot, sort on
@@ -150,62 +297,23 @@
             return -1
         return 1
 
-    def process(self, paused):
-        self._have_work = False
-
-        # Don't queue any new jobs if we are paused
-        if paused:
-            return
-
-        # Deal with new arch jobs
+    def claim_arch_job(self, builder):
+        archjob = None
         self._queue_lock.acquire()
-        new_jobs = {}
         for req in self._queue:
-            parent = req['parent']
-            stage = parent.cur_stage()
-            if stage != 'building' and stage != 'waiting':
-                self._queue.remove(req)
-                continue
-
-            # Find all free builders that could satisfy the request
-            possible_builders = []
-            for builder in self._builders:
-                if builder.available() and builder.can_build_for_target(req['target_dict']):
-                    possible_builders.append(builder)
-
-            # Sort builder list by free slots and weights
-            possible_builders.sort(self._builder_cmp_func)
-            possible_builders.reverse()
-
-            for builder in possible_builders:
-                try:
-                    job = builder.start_job(parent, req['target_dict'], req['srpm_url'])
-                except RuntimeError, e:
-                    print "Builder (%s) couldn't start job %s because: '%s'" % (builder.address(),
-                        req['target_dict'], e)
-                    continue
-
-                if not new_jobs.has_key(parent):
-                    new_jobs[parent] = []
-                new_jobs[parent].append(job)
+            if builder.can_build_for_target(req['target_dict']):
                 self._queue.remove(req)
+                archjob = req
                 break
         self._queue_lock.release()
-
-        # Notify the parent jobs of their new archjobs.  Have to do this outside _queue_lock
-        # for locking reasons
-        for parent in new_jobs.keys():
-            for job in new_jobs[parent]:
-                parent.add_arch_job(job)
-
-        if len(self._queue) > 0:
-            time.sleep(0.25)
+        return archjob
 
     def request_arch_job(self, par_job, target_dict, srpm_url, orphaned):
         req = {}
         req['parent'] = par_job
         req['target_dict'] = target_dict
         req['srpm_url'] = srpm_url
+        req['time_queued'] = time.time()
 
         self._queue_lock.acquire()
         if orphaned:


Index: Config.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/Config.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Config.py	20 Mar 2006 18:28:37 -0000	1.16
+++ Config.py	28 Apr 2006 03:17:41 -0000	1.17
@@ -18,6 +18,7 @@
 import fnmatch
 from ConfigParser import ConfigParser
 from plague import BaseConfig
+import Builder
 
 
 def make_target_string(distro, target, repo):
@@ -97,11 +98,21 @@
             except InvalidTargetException, e:
                 print "Error: could not add target %s because: %s" % (f, e)
 
-    def _load_builders(self):
-        if not self._config.has_section("Builders"):
+    def _get_builders_of_type(self, btype):
+        if btype == Builder.TYPE_PASSIVE:
+            section = "Passive Builders"
+        elif btype == Builder.TYPE_ACTIVE:
+            section = "Active Builders"
+        else:
+            raise Exception("Unknown builder type %d" % btype)
+
+        if not self._config.has_section(section):
             return {}
-        items = self._config.items("Builders")
-        builder_list = {}
+        prefix = "http://"
+        if self.get_bool("Builders", "use_ssl") == True:
+            prefix = "https://"
+        items = self._config.items(section)
+        list = {}
         for (tag, builder) in items:
             if not tag.startswith("builder"):
                 continue
@@ -116,8 +127,26 @@
                 weight = int(weight_str)
             except ValueError:
                 weight = 0
-            builder_list[addr] = weight
-        return builder_list
+            # Rewrite addresses to match current builder connection method
+            new_addr = addr
+            if addr.startswith("http://"):
+                new_addr = addr[7:]
+            elif addr.startswith("https://"):
+                new_addr = addr[8:]
+            if new_addr:
+                list[prefix + new_addr] = (weight, btype)
+        return list
+
+    def _load_builders(self):
+        passive_builders = self._get_builders_of_type(Builder.TYPE_PASSIVE)
+        active_builders = self._get_builders_of_type(Builder.TYPE_ACTIVE)
+
+        builders = {}
+        for key in active_builders.keys():
+            builders[key] = active_builders[key]
+        for key in passive_builders.keys():
+            builders[key] = passive_builders[key]
+        return builders
 
     def save_default_config(self, filename=None):
         self.add_section("General")
@@ -139,8 +168,15 @@
 
         self.add_section("Builders")
         self.set_option("Builders", "use_ssl", "yes")
-        self.set_option("Builders", "builder1", "20 127.0.0.1:8888")
-        self.set_option("Builders", "builder2", "0  127.0.0.2:8888")
+
+        self.add_section("Active Builders")
+        self.set_option("Active Builders", "xmlrpc_server_port", "8889")
+        self.set_option("Active Builders", "file_server_port", "8890")
+        self.set_option("Active Builders", "builder1", "20 127.0.0.1")
+        self.set_option("Active Builders", "builder2", "0  127.0.0.2")
+
+        self.add_section("Passive Builders")
+        self.set_option("Passive Builders", "builder1", "20 127.0.0.1:8888")
 
         self.add_section("SSL")
         self.set_option("SSL", "server_key_and_cert", "/etc/plague/server/certs/server_key_and_cert.pem")
@@ -152,7 +188,7 @@
         self.add_section("UI")
         self.set_option("UI", "use_ssl", "yes")
         self.set_option("UI", "client_ca_cert", "/etc/plague/server/certs/ui_ca_cert.pem")
-        self.set_option("UI", "port", "8887")
+        self.set_option("UI", "port", "8888")
         self.set_option("UI", "guest_allowed", "yes")
         self.set_option("UI", "log_url", "http://www.foo.com/logs/")
 


Index: main.py
===================================================================
RCS file: /cvs/fedora/extras-buildsys/server/main.py,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- main.py	13 Mar 2006 13:05:38 -0000	1.20
+++ main.py	28 Apr 2006 03:17:41 -0000	1.21
@@ -124,9 +124,8 @@
 
     dbm = DBManager.DBManager(cfg)
 
-    builder_manager = BuilderManager.BuilderManager(cfg)
-
     # Create the BuildMaster thread
+    builder_manager = BuilderManager.BuilderManager(cfg)
     bm = BuildMaster.BuildMaster(builder_manager, dbm, cfg)
     bm.start()
 
@@ -148,20 +147,8 @@
         if e[0] == 98:      # Address already in use
             print "Error: couldn't bind to address '%s:%s'.  Is the server already running?" % (hostname, port)
             os._exit(1)
-
     bm_server.register_instance(ui)
 
-    # SRPM fileserver
-    SRPM_SERVER_PORT = 8886
-    http_dir = os.path.join(cfg.get_str("Directories", "server_work_dir"), "srpm_http_dir")
-    srpm_server_certs = {}
-    if cfg.get_bool("Builders", "use_ssl"):
-        srpm_server_certs['key_and_cert'] = cfg.get_str("SSL", "server_key_and_cert")
-        srpm_server_certs['ca_cert'] = cfg.get_str("SSL", "ca_cert")
-        srpm_server_certs['peer_ca_cert'] = cfg.get_str("SSL", "ca_cert")
-    srpm_server = HTTPServer.PlgHTTPServerManager((hostname, SRPM_SERVER_PORT), http_dir, srpm_server_certs)
-    srpm_server.start()
-
     # Create dummy thread just to register main thread's name
     dummy = threading.Thread()
     dummy.setName("MainThread")
@@ -182,9 +169,9 @@
     # Make sure the BuildMaster thread shuts down
     print "Shutting down..."
     bm.stop()
-    srpm_server.stop()
     if use_tbs:
         tbs.stop()
+    builder_manager.stop()
 
     if opts.pidfile:
         os.unlink(opts.pidfile)



From fedora-extras-commits at redhat.com  Fri Apr 28 03:17:37 2006
From: fedora-extras-commits at redhat.com (Daniel Williams (dcbw))
Date: Thu, 27 Apr 2006 20:17:37 -0700
Subject: extras-buildsys ChangeLog,1.183,1.184
Message-ID: <200604280318.k3S3I7Q9005385@cvs-int.fedora.redhat.com>

Author: dcbw

Update of /cvs/fedora/extras-buildsys
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5292

Modified Files:
	ChangeLog 
Log Message:
2006-04-27  Dan Williams  <dcbw at redhat.com>

    Commit partial rework of builder<->server communcation.




Index: ChangeLog
===================================================================
RCS file: /cvs/fedora/extras-buildsys/ChangeLog,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -r1.183 -r1.184
--- ChangeLog	27 Mar 2006 15:45:39 -0000	1.183
+++ ChangeLog	28 Apr 2006 03:17:34 -0000	1.184
@@ -1,3 +1,7 @@
+2006-04-27  Dan Williams  <dcbw at redhat.com>
+
+    Commit partial rework of builder<->server communcation.
+
 2006-03-27  Dan Williams  <dcbw at redhat.com>
 
     * common/HTTPServer.py



From fedora-extras-commits at redhat.com  Fri Apr 28 06:06:20 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Thu, 27 Apr 2006 23:06:20 -0700
Subject: owners owners.list,1.910,1.911
Message-ID: <200604280606.k3S66MRL012202@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12181

Modified Files:
	owners.list 
Log Message:
reassign scim-pinyin to qshen



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.910
retrieving revision 1.911
diff -u -r1.910 -r1.911
--- owners.list	28 Apr 2006 02:40:37 -0000	1.910
+++ owners.list	28 Apr 2006 06:06:20 -0000	1.911
@@ -1382,7 +1382,7 @@
 Fedora Extras|scim-hangul|SCIM IMEngine for Korean Hangul|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-input-pad|SCIM On-screen Input Pad|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|scim-m17n|m17n-lib input method for SCIM|petersen at redhat.com|extras-qa at fedoraproject.org|
-Fedora Extras|scim-pinyin|Chinese input method for SCIM|petersen at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|scim-pinyin|Chinese input method for SCIM|qshen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-qtimm|SCIM Qt Input Method module|petersen at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|scim-skk|Scim-skk is a SCIM IMEngine module for skk to support Japanese input|ryo-dairiki at users.sourceforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|scim-tables|SCIM Generic Table IMEngine and its data files|petersen at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Apr 28 07:21:46 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Fri, 28 Apr 2006 00:21:46 -0700
Subject: rpms/gurlchecker/FC-5 gurlchecker.spec,1.12,1.13
Message-ID: <200604280721.k3S7LmcM014601@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gurlchecker/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14554/FC-5

Modified Files:
	gurlchecker.spec 
Log Message:
missing build depend



Index: gurlchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/FC-5/gurlchecker.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gurlchecker.spec	27 Apr 2006 23:26:21 -0000	1.12
+++ gurlchecker.spec	28 Apr 2006 07:21:46 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           gurlchecker
 Version:        0.8.3
-Release:	3%{?dist}
+Release:	4%{?dist}
 
 Summary:        A Gnome link validity checker
 
@@ -13,8 +13,7 @@
 Requires:	gnet2, gnutls
 
 BuildRequires:	desktop-file-utils, gnet2-devel, gettext, gnutls-devel
-BuildRequires:  libgnomeui-devel >= 2.0
-BuildRequires:  libglade2-devel >= 2.0
+BuildRequires:  docbook-utils, libgnomeui-devel >= 2.0, libglade2-devel >= 2.0
 
 %description
 gURLChecker is a Gnome tool that can check links on a single web page
@@ -49,6 +48,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-4
+- missed docbookutils
+
 * Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-3
 - missed some build requires.
 



From fedora-extras-commits at redhat.com  Fri Apr 28 07:21:47 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Fri, 28 Apr 2006 00:21:47 -0700
Subject: rpms/gurlchecker/devel gurlchecker.spec,1.12,1.13
Message-ID: <200604280721.k3S7Lnhb014605@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gurlchecker/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14554/devel

Modified Files:
	gurlchecker.spec 
Log Message:
missing build depend



Index: gurlchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/devel/gurlchecker.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gurlchecker.spec	27 Apr 2006 23:26:27 -0000	1.12
+++ gurlchecker.spec	28 Apr 2006 07:21:47 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           gurlchecker
 Version:        0.8.3
-Release:	3%{?dist}
+Release:	4%{?dist}
 
 Summary:        A Gnome link validity checker
 
@@ -13,8 +13,7 @@
 Requires:	gnet2, gnutls
 
 BuildRequires:	desktop-file-utils, gnet2-devel, gettext, gnutls-devel
-BuildRequires:  libgnomeui-devel >= 2.0
-BuildRequires:  libglade2-devel >= 2.0
+BuildRequires:  docbook-utils, libgnomeui-devel >= 2.0, libglade2-devel >= 2.0
 
 %description
 gURLChecker is a Gnome tool that can check links on a single web page
@@ -49,6 +48,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-4
+- missed docbookutils
+
 * Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-3
 - missed some build requires.
 



From fedora-extras-commits at redhat.com  Fri Apr 28 07:21:45 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Fri, 28 Apr 2006 00:21:45 -0700
Subject: rpms/gurlchecker/FC-4 gurlchecker.spec,1.11,1.12
Message-ID: <200604280721.k3S7LlW7014599@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/gurlchecker/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14554/FC-4

Modified Files:
	gurlchecker.spec 
Log Message:
missing build depend



Index: gurlchecker.spec
===================================================================
RCS file: /cvs/extras/rpms/gurlchecker/FC-4/gurlchecker.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gurlchecker.spec	27 Apr 2006 23:26:20 -0000	1.11
+++ gurlchecker.spec	28 Apr 2006 07:21:45 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           gurlchecker
 Version:        0.8.3
-Release:	3%{?dist}
+Release:	4%{?dist}
 
 Summary:        A Gnome link validity checker
 
@@ -13,8 +13,7 @@
 Requires:	gnet2, gnutls
 
 BuildRequires:	desktop-file-utils, gnet2-devel, gettext, gnutls-devel
-BuildRequires:  libgnomeui-devel >= 2.0
-BuildRequires:  libglade2-devel >= 2.0
+BuildRequires:  docbook-utils, libgnomeui-devel >= 2.0, libglade2-devel >= 2.0
 
 %description
 gURLChecker is a Gnome tool that can check links on a single web page
@@ -49,6 +48,9 @@
 %{_mandir}/man?/*
 
 %changelog
+* Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-4
+- missed docbookutils
+
 * Fri Apr 28 2006 Michael J. Knox <michael[AT]knox.net.nz> - 0.8.3-3
 - missed some build requires.
 



From fedora-extras-commits at redhat.com  Fri Apr 28 07:51:42 2006
From: fedora-extras-commits at redhat.com (Mark Cox (mjc))
Date: Fri, 28 Apr 2006 00:51:42 -0700
Subject: fedora-security/audit fc4,1.222,1.223 fc5,1.136,1.137
Message-ID: <200604280751.k3S7pgrI014806@cvs-int.fedora.redhat.com>

Author: mjc

Update of /cvs/fedora/fedora-security/audit
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14786

Modified Files:
	fc4 fc5 
Log Message:
updates from yesterday



Index: fc4
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc4,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- fc4	27 Apr 2006 17:19:40 -0000	1.222
+++ fc4	28 Apr 2006 07:51:39 -0000	1.223
@@ -1,13 +1,13 @@
-Up to date CVE as of CVE email 20060426
-Up to date FC4 as of 20060426
+Up to date CVE as of CVE email 20060427
+Up to date FC4 as of 20060427
 
 ** are items that need attention
 
 CVE-2006-2071 version (kernel, fixed 2.6.16.6) [since FEDORA-2006-423]
 CVE-2006-2057 ** firefox
-CVE-2006-2026 VULNERABLE (libtiff, fixed 3.8.1) #189934
-CVE-2006-2025 VULNERABLE (libtiff, fixed 3.8.1) #189934
-CVE-2006-2024 VULNERABLE (libtiff, fixed 3.8.1) #189934
+CVE-2006-2026 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-474]
+CVE-2006-2025 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-474]
+CVE-2006-2024 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-474]
 CVE-2006-1991 VULNERABLE (php)
 CVE-2006-1990 VULNERABLE (php)
 CVE-2006-1942 ** firefox


Index: fc5
===================================================================
RCS file: /cvs/fedora/fedora-security/audit/fc5,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- fc5	27 Apr 2006 17:19:40 -0000	1.136
+++ fc5	28 Apr 2006 07:51:39 -0000	1.137
@@ -1,13 +1,13 @@
-Up to date CVE as of CVE email 20060426
-Up to date FC5 as of 20060426
+Up to date CVE as of CVE email 20060427
+Up to date FC5 as of 20060427
 
 ** are items that need attention
 
 CVE-2006-2071 version (kernel, fixed 2.6.16.6) [since FEDORA-2006-421]
 CVE-2006-2057 ** firefox
-CVE-2006-2026 VULNERABLE (libtiff, fixed 3.8.1) #189934
-CVE-2006-2025 VULNERABLE (libtiff, fixed 3.8.1) #189934
-CVE-2006-2024 VULNERABLE (libtiff, fixed 3.8.1) #189934
+CVE-2006-2026 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-473]
+CVE-2006-2025 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-473]
+CVE-2006-2024 backport (libtiff, fixed 3.8.1) #189934 [since FEDORA-2006-473]
 CVE-2006-1991 VULNERABLE (php)
 CVE-2006-1990 VULNERABLE (php)
 CVE-2006-1942 ** firefox



From fedora-extras-commits at redhat.com  Fri Apr 28 07:59:55 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 28 Apr 2006 00:59:55 -0700
Subject: rpms/wings - New directory
Message-ID: <200604280759.k3S7xvX7014912@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/wings
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14886/wings

Log Message:
Directory /cvs/extras/rpms/wings added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 28 07:59:56 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 28 Apr 2006 00:59:56 -0700
Subject: rpms/wings/devel - New directory
Message-ID: <200604280759.k3S7xwsg014915@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/wings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14886/wings/devel

Log Message:
Directory /cvs/extras/rpms/wings/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 28 08:00:12 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 28 Apr 2006 01:00:12 -0700
Subject: rpms/wings Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604280800.k3S80EeB014968@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/wings
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14940

Added Files:
	Makefile import.log 
Log Message:
Setup of module wings


--- NEW FILE Makefile ---
# Top level Makefile for module wings
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 28 08:00:13 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 28 Apr 2006 01:00:13 -0700
Subject: rpms/wings/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200604280800.k3S80F8s014971@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/wings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14940/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module wings


--- 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 Apr 28 08:03:26 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 28 Apr 2006 01:03:26 -0700
Subject: rpms/wings/devel wings.png, NONE, 1.1 wings.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604280803.k3S83T9l017203@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/wings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17167/devel

Modified Files:
	.cvsignore sources 
Added Files:
	wings.png wings.spec 
Log Message:
auto-import wings-0.98.32b-5.fc5 on branch devel from wings-0.98.32b-5.fc5.src.rpm


--- NEW FILE wings.spec ---
Name:           wings
Version:        0.98.32b
Release:        5%{?dist}
Summary:        3D Subdivision Modeler

Group:          Applications/Multimedia
License:        Distributable
URL:            http://www.wings3d.com
Source0:	http://prdownloads.sourceforge.net/wings/wings-0.98.32b.tar.bz2
Source1:	http://prdownloads.sourceforge.net/wings/wings3d_manual1.6.1.pdf
Source2:	http://www.midcoast.com.au/~rgcoy/downloads/wingspov-0.98.28_v1.tgz
Source3:	wings.png
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:  erlang
BuildRequires:	erlang-esdl-devel
BuildRequires:	libGL-devel
BuildRequires:	libGLU-devel
BuildRequires:  desktop-file-utils
Requires:	erlang
Requires:	erlang-esdl

%description
Wings 3D is a subdivision modeler with an user interface that is easy
to use for both beginners and advanced users (inspired by Nendo and
Mirai from Izware). This package also includes the Povray exporter
plug-in.


%package docs
Group:		Applications/Multimedia
Summary:	Documentation for Wings 3D
Requires:	%{name} = %{version}-%{release}

%description docs
Documentation for Wings 3D.


%prep
%setup -q
cp %{SOURCE1} .
tar zxf %{SOURCE2}


%build
# %%{?_smp_mflags} breaks the build
make


%install
%define wingsdir $RPM_BUILD_ROOT%{_libdir}/wings
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p %{wingsdir}
cp -rf ebin %{wingsdir}
cp -rf plugins %{wingsdir}
cp -rf fonts %{wingsdir}

find $RPM_BUILD_ROOT -name '.cvsignore' | xargs rm -rf
find $RPM_BUILD_ROOT -name 'README' | xargs rm -f

cat > $RPM_BUILD_ROOT%{_bindir}/wings <<EOF
#!/bin/sh
exec erl -pa %{_libdir}/wings/ebin -run wings_start start_halt
EOF
chmod 755 $RPM_BUILD_ROOT%{_bindir}/wings

cat > wings.desktop <<EOF
[Desktop Entry]
Name=Wings 3D
Comment=Wings 3D polygon mesh modeler
Exec=wings
Icon=wings.png
Terminal=true
Type=Application
Encoding=UTF-8
X-Desktop-File-Install-Version=0.9
StartupNotify=true
StartupWMClass=Wings 3D
EOF

desktop-file-install --vendor fedora \
    --add-category X-Fedora \
    --add-category Application \
    --add-category Graphics \
    --dir $RPM_BUILD_ROOT%{_datadir}/applications \
    wings.desktop

mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
cp %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/pixmaps


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%{_bindir}/wings
%{_libdir}/wings
%{_datadir}/applications/*
%{_datadir}/pixmaps/*
%doc README license.terms AUTHORS


%files docs
%defattr(-,root,root,-)
%doc wings3d_manual1.6.1.pdf


%changelog
* Thu Apr 27 2006 Gerard Milmeister <gemi at bluewin.ch> - 0.98.32b-5
- split off docs package

* Tue Apr 25 2006 Gerard Milmeister <gemi at bluewin.ch> - 0.98.32b-3
- build against erlang-esdl-devel

* Sun Dec 18 2005 Gerard Milmeister <gemi at bluewin.ch> - 0.98.32b-1
- New Version 0.98.32b

* Sun Mar  6 2005 Gerard Milmeister <gemi at bluewin.ch> - 0.98.27b-1
- New Version 0.98.27b

* Sun Feb 13 2005 Gerard Milmeister <gemi at bluewin.ch> - 0:0.98.27a-1
- New Version 0.98.27a

* Mon Dec 27 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:0.98.26-0.fdr.1.b
- New Version 0.98.26b

* Sat Jul 17 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:0.98.24-0.fdr.1
- New Version 0.98.24

* Fri Jun  4 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:0.98.23a-0.fdr.1
- New Version 0.98.23a

* Thu May  6 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:0.98.22c-0.fdr.1
- New Version 0.98.22c

* Sun Apr 11 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:0.98.20c-0.fdr.1
- First Fedora release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/wings/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Apr 2006 08:00:13 -0000	1.1
+++ .cvsignore	28 Apr 2006 08:03:26 -0000	1.2
@@ -0,0 +1,3 @@
+wings-0.98.32b.tar.bz2
+wings3d_manual1.6.1.pdf
+wingspov-0.98.28_v1.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/wings/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Apr 2006 08:00:13 -0000	1.1
+++ sources	28 Apr 2006 08:03:26 -0000	1.2
@@ -0,0 +1,3 @@
+11a55f0eb81261a84a29d05dd4afa999  wings-0.98.32b.tar.bz2
+c01d19b4be79b647b8605dd32753da3a  wings3d_manual1.6.1.pdf
+791ec96aefb43ca63800324a115e99c6  wingspov-0.98.28_v1.tgz



From fedora-extras-commits at redhat.com  Fri Apr 28 08:03:26 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 28 Apr 2006 01:03:26 -0700
Subject: rpms/wings import.log,1.1,1.2
Message-ID: <200604280803.k3S83wQG017211@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/wings
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17167

Modified Files:
	import.log 
Log Message:
auto-import wings-0.98.32b-5.fc5 on branch devel from wings-0.98.32b-5.fc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/wings/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	28 Apr 2006 08:00:12 -0000	1.1
+++ import.log	28 Apr 2006 08:03:26 -0000	1.2
@@ -0,0 +1 @@
+wings-0_98_32b-5_fc5:HEAD:wings-0.98.32b-5.fc5.src.rpm:1146211394



From fedora-extras-commits at redhat.com  Fri Apr 28 08:07:24 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 28 Apr 2006 01:07:24 -0700
Subject: rpms/abcm2ps/devel .cvsignore, 1.16, 1.17 abcm2ps.spec, 1.18,
	1.19 sources, 1.16, 1.17
Message-ID: <200604280807.k3S87Qec017316@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17295

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 4.12.15


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	18 Apr 2006 21:45:38 -0000	1.16
+++ .cvsignore	28 Apr 2006 08:07:24 -0000	1.17
@@ -1,2 +1,2 @@
-abcm2ps-4.12.14.tar.gz
+abcm2ps-4.12.15.tar.gz
 abcplus_en-1.0.4.zip


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/abcm2ps.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- abcm2ps.spec	18 Apr 2006 21:45:38 -0000	1.18
+++ abcm2ps.spec	28 Apr 2006 08:07:24 -0000	1.19
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        4.12.14
+Version:        4.12.15
 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-4.12.14.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-4.12.15.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
+* Fri Apr 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.15-1
+- new version 4.12.15
+
 * Tue Apr 18 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.14-1
 - new version 4.12.14
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	18 Apr 2006 21:45:38 -0000	1.16
+++ sources	28 Apr 2006 08:07:24 -0000	1.17
@@ -1,2 +1,2 @@
-a22f4954cb3e74d04a0be34f163cc434  abcm2ps-4.12.14.tar.gz
+ebea415b7d1b82d054227343e027f820  abcm2ps-4.12.15.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Fri Apr 28 08:09:03 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 28 Apr 2006 01:09:03 -0700
Subject: rpms/abcm2ps/FC-5 .cvsignore, 1.16, 1.17 abcm2ps.spec, 1.18,
	1.19 sources, 1.16, 1.17
Message-ID: <200604280809.k3S895WD017409@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17366/FC-5

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 4.12.15


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-5/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	18 Apr 2006 21:48:58 -0000	1.16
+++ .cvsignore	28 Apr 2006 08:09:03 -0000	1.17
@@ -1,2 +1,2 @@
-abcm2ps-4.12.14.tar.gz
+abcm2ps-4.12.15.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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- abcm2ps.spec	18 Apr 2006 21:48:58 -0000	1.18
+++ abcm2ps.spec	28 Apr 2006 08:09:03 -0000	1.19
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        4.12.14
+Version:        4.12.15
 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-4.12.14.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-4.12.15.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
+* Fri Apr 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.15-1
+- new version 4.12.15
+
 * Tue Apr 18 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.14-1
 - new version 4.12.14
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-5/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	18 Apr 2006 21:48:58 -0000	1.16
+++ sources	28 Apr 2006 08:09:03 -0000	1.17
@@ -1,2 +1,2 @@
-a22f4954cb3e74d04a0be34f163cc434  abcm2ps-4.12.14.tar.gz
+ebea415b7d1b82d054227343e027f820  abcm2ps-4.12.15.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Fri Apr 28 08:09:02 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 28 Apr 2006 01:09:02 -0700
Subject: rpms/abcm2ps/FC-4 .cvsignore, 1.16, 1.17 abcm2ps.spec, 1.17,
	1.18 sources, 1.16, 1.17
Message-ID: <200604280809.k3S894Ld017403@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/abcm2ps/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17366/FC-4

Modified Files:
	.cvsignore abcm2ps.spec sources 
Log Message:
new version 4.12.15


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-4/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore	18 Apr 2006 21:48:57 -0000	1.16
+++ .cvsignore	28 Apr 2006 08:09:02 -0000	1.17
@@ -1,2 +1,2 @@
-abcm2ps-4.12.14.tar.gz
+abcm2ps-4.12.15.tar.gz
 abcplus_en-1.0.4.zip


Index: abcm2ps.spec
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-4/abcm2ps.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- abcm2ps.spec	18 Apr 2006 21:48:57 -0000	1.17
+++ abcm2ps.spec	28 Apr 2006 08:09:02 -0000	1.18
@@ -1,12 +1,12 @@
 Name:           abcm2ps
-Version:        4.12.14
+Version:        4.12.15
 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-4.12.14.tar.gz
+Source0:        http://moinejf.free.fr/abcm2ps-4.12.15.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
+* Fri Apr 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.15-1
+- new version 4.12.15
+
 * Tue Apr 18 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.12.14-1
 - new version 4.12.14
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abcm2ps/FC-4/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	18 Apr 2006 21:48:57 -0000	1.16
+++ sources	28 Apr 2006 08:09:02 -0000	1.17
@@ -1,2 +1,2 @@
-a22f4954cb3e74d04a0be34f163cc434  abcm2ps-4.12.14.tar.gz
+ebea415b7d1b82d054227343e027f820  abcm2ps-4.12.15.tar.gz
 99c819d25c4a1db906ae1f09def98e96  abcplus_en-1.0.4.zip



From fedora-extras-commits at redhat.com  Fri Apr 28 08:27:03 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 28 Apr 2006 01:27:03 -0700
Subject: owners owners.list,1.911,1.912
Message-ID: <200604280827.k3S8R5hO017574@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17557

Modified Files:
	owners.list 
Log Message:
added wings


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.911
retrieving revision 1.912
diff -u -r1.911 -r1.912
--- owners.list	28 Apr 2006 06:06:20 -0000	1.911
+++ owners.list	28 Apr 2006 08:27:03 -0000	1.912
@@ -1572,6 +1572,7 @@
 Fedora Extras|WindowMaker|A fast, feature rich Window manager|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wine|A Windows 16/32/64 bit emulator|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|wine-docs|Documentation for wine|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
+Fedora Extras|wings|3D Subdivision Modeler|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|wlassistant|Wireless network management tool|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 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|



From fedora-extras-commits at redhat.com  Fri Apr 28 09:23:46 2006
From: fedora-extras-commits at redhat.com (Matthias Saou (thias))
Date: Fri, 28 Apr 2006 02:23:46 -0700
Subject: rpms/proftpd/devel proftpd-1.3.0-rpath.patch, NONE, 1.1 proftpd.spec,
	1.14, 1.15
Message-ID: <200604280923.k3S9NmiU019923@cvs-int.fedora.redhat.com>

Author: thias

Update of /cvs/extras/rpms/proftpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19901

Modified Files:
	proftpd.spec 
Added Files:
	proftpd-1.3.0-rpath.patch 
Log Message:
Mark some more config files as noreplace, fix nasty -rpath (#190122).


proftpd-1.3.0-rpath.patch:

--- NEW FILE proftpd-1.3.0-rpath.patch ---
diff -Naupr proftpd-1.3.0.orig/configure proftpd-1.3.0/configure
--- proftpd-1.3.0.orig/configure	2006-03-09 19:20:04.000000000 +0100
+++ proftpd-1.3.0.orig/configure	2006-03-09 19:20:04.000000000 +0100
@@ -19660,7 +19660,7 @@ if test "${enable_dso+set}" = set; then
       ac_build_core_modules="$ac_build_core_modules modules/mod_dso.o"
       ac_build_addl_includes="$INCLTDL $ac_build_addl_includes"
 
-      MAIN_LDFLAGS="-L\$(top_srcdir)/lib/libltdl -dlopen self -export-dynamic -rpath \$(DESTDIR)\$(sbindir)"
+      MAIN_LDFLAGS="-L\$(top_srcdir)/lib/libltdl -dlopen self -export-dynamic"
       MAIN_LIBS="\$(LIBLTDL)"
 
       MODULE_LDFLAGS="-avoid-version -export-dynamic -module"
diff -Naupr proftpd-1.3.0.orig/configure.in proftpd-1.3.0/configure.in
--- proftpd-1.3.0.orig/configure.in	2006-03-09 19:12:35.000000000 +0100
+++ proftpd-1.3.0.orig/configure.in	2006-03-09 19:12:35.000000000 +0100
@@ -372,7 +372,7 @@ AC_ARG_ENABLE(dso,
       ac_build_core_modules="$ac_build_core_modules modules/mod_dso.o"
       ac_build_addl_includes="$INCLTDL $ac_build_addl_includes"
 
-      MAIN_LDFLAGS="-L\$(top_srcdir)/lib/libltdl -dlopen self -export-dynamic -rpath \$(DESTDIR)\$(sbindir)"
+      MAIN_LDFLAGS="-L\$(top_srcdir)/lib/libltdl -dlopen self -export-dynamic"
       MAIN_LIBS="\$(LIBLTDL)"
 
       MODULE_LDFLAGS="-avoid-version -export-dynamic -module"


Index: proftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/proftpd/devel/proftpd.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- proftpd.spec	21 Apr 2006 17:05:11 -0000	1.14
+++ proftpd.spec	28 Apr 2006 09:23:46 -0000	1.15
@@ -1,7 +1,7 @@
 Summary: Flexible, stable and highly-configurable FTP server
 Name: proftpd
 Version: 1.3.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: System Environment/Daemons
 URL: http://www.proftpd.org/
@@ -12,6 +12,7 @@
 Source4: proftpd.logrotate
 Source5: welcome.msg
 Source6: proftpd.pam
+Patch0: proftpd-1.3.0-rpath.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: pam >= 0.59
 Requires(post): /sbin/chkconfig
@@ -62,6 +63,7 @@
 
 %prep
 %setup
+%patch0 -p1 -b .rpath
 
 
 %build
@@ -144,8 +146,8 @@
 %config(noreplace) %{_sysconfdir}/proftpd.conf
 %config(noreplace) %{_sysconfdir}/xinetd.d/xproftpd
 %config %{_sysconfdir}/ftpusers
-%config %{_sysconfdir}/pam.d/proftpd
-%config %{_sysconfdir}/logrotate.d/proftpd
+%config(noreplace) %{_sysconfdir}/pam.d/proftpd
+%config(noreplace) %{_sysconfdir}/logrotate.d/proftpd
 %{_sysconfdir}/rc.d/init.d/proftpd
 %{_mandir}/*/*
 %{_bindir}/*
@@ -177,6 +179,11 @@
 
 
 %changelog
+* Fri Apr 28 2006 Matthias Saou <http://freshrpms.net/> 1.3.0-2
+- Mark pam.d and logrotate.d config files as noreplace.
+- Include patch to remove -rpath to DESTDIR/usr/sbin/ in the proftpd binary
+  when DSO is enabled (#190122).
+
 * Fri Apr 21 2006 Matthias Saou <http://freshrpms.net/> 1.3.0-1
 - Update to 1.3.0 final.
 - Remove no longer needed PostgreSQL and OpenSSL detection workarounds.



From fedora-extras-commits at redhat.com  Fri Apr 28 09:32:50 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 28 Apr 2006 02:32:50 -0700
Subject: rpms/Glide3/devel Glide3.spec,1.15,1.16
Message-ID: <200604280932.k3S9WqHb020012@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/Glide3/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19995

Modified Files:
	Glide3.spec 
Log Message:
* Fri Apr 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 20050815-4
- Add scripts to set SELinux type for the .so files to textrel_shlib_t
  on i386, because of the non PIC asm used on i386 (bz 187484).



Index: Glide3.spec
===================================================================
RCS file: /cvs/extras/rpms/Glide3/devel/Glide3.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Glide3.spec	17 Feb 2006 09:48:49 -0000	1.15
+++ Glide3.spec	28 Apr 2006 09:32:50 -0000	1.16
@@ -1,29 +1,29 @@
-Name:    Glide3
-Version: 20050815
-Release: 3%{?dist}
-Summary: Glide3 runtime for the 3Dfx Voodoo family of cards
-# Glide3 is x86/alpha/ia64/x86_64 only, ia64 is untested
-ExclusiveArch: %{ix86} alpha ia64 x86_64
-
-Group:   User Interface/X Hardware Support
-License: 3DFX GLIDE Source Code General Public License
-URL:     http://glide.sourceforge.net
-
+Name:             Glide3
+Version:          20050815
+Release:          4%{?dist}
+Summary:          Glide3 runtime for the 3Dfx Voodoo family of cards
+#                 Glide3 is x86/alpha/ia64/x86_64 only, ia64 is untested
+ExclusiveArch:    %{ix86} alpha ia64 x86_64
+Group:            User Interface/X Hardware Support
+License:          3DFX GLIDE Source Code General Public License
+URL:              http://glide.sourceforge.net
 # Create the Glide3 tarball by using:
 #   cvs -d :pserver:anonymous at cvs.glide.sourceforge.net:/cvsroot/glide \
 #     co -r glide-devel-branch Glide3
 #   pushd Glide3 ; find . -name CVS -type d |xargs rm -rf
 #   find . -name .cvsignore | xargs rm ; popd
 #   tar jcf Glide3-$(date +"%Y%m%d").tar.bz2 Glide3/
-Source0: %{name}-%{version}.tar.bz2
-Source1: glidelink.c
-Patch0: Glide3-warn.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libX11-devel xorg-x11-proto-devel 
+Source0:          %{name}-%{version}.tar.bz2
+Source1:          glidelink.c
+Patch0:           Glide3-warn.patch
+BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:    libX11-devel xorg-x11-proto-devel 
 # Add these to try the experimental DGA support and add DGA=1 to %{glide_flags}
-# BuildRequires: libXxf86dga-devel libXxf86vm-devel
+# BuildRequires:  libXxf86dga-devel libXxf86vm-devel
 %ifarch %{ix86}
-BuildRequires: nasm
+BuildRequires:    nasm
+Requires(post):   policycoreutils /sbin/ldconfig
+Requires(postun): policycoreutils /sbin/ldconfig
 %endif
 
 %description
@@ -107,9 +107,27 @@
 rm -rf $RPM_BUILD_ROOT
 
 
+%ifarch %{ix86}
+%post
+/sbin/ldconfig
+# Set SELinux file_context in the policy
+semanage fcontext -a -t textrel_shlib_t '%{_libdir}/libglide3-v.\.so' 2>/dev/null || :
+# Actually change the context
+chcon -t textrel_shlib_t %{_libdir}/libglide3-v?.so || :
+%else
 %post -p /sbin/ldconfig
+%endif
 
+%ifarch %{ix86}
+%postun
+/sbin/ldconfig
+# SELinux support
+if [ $1 -eq 0 ]; then  # final removal
+  semanage fcontext -d -t textrel_shlib_t '%{_libdir}/libglide3-v.\.so' 2>/dev/null || :
+fi
+%else
 %postun -p /sbin/ldconfig
+%endif
 
 
 %files
@@ -132,6 +150,10 @@
 
 
 %changelog
+* Fri Apr 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 20050815-4
+- Add scripts to set SELinux type for the .so files to textrel_shlib_t
+  on i386, because of the non PIC asm used on i386 (bz 187484).
+
 * Mon Feb 13 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 20050815-3
 - Bump release and rebuild for new gcc4.1 and glibc.
 - add %%{?dist} for consistency with my other packages



From fedora-extras-commits at redhat.com  Fri Apr 28 09:33:49 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Fri, 28 Apr 2006 02:33:49 -0700
Subject: rpms/Glide3/FC-5 Glide3.spec,1.15,1.16
Message-ID: <200604280933.k3S9XpPd020073@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/Glide3/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20056

Modified Files:
	Glide3.spec 
Log Message:
* Fri Apr 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 20050815-4
- Add scripts to set SELinux type for the .so files to textrel_shlib_t
  on i386, because of the non PIC asm used on i386 (bz 187484).



Index: Glide3.spec
===================================================================
RCS file: /cvs/extras/rpms/Glide3/FC-5/Glide3.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Glide3.spec	17 Feb 2006 09:48:49 -0000	1.15
+++ Glide3.spec	28 Apr 2006 09:33:49 -0000	1.16
@@ -1,29 +1,29 @@
-Name:    Glide3
-Version: 20050815
-Release: 3%{?dist}
-Summary: Glide3 runtime for the 3Dfx Voodoo family of cards
-# Glide3 is x86/alpha/ia64/x86_64 only, ia64 is untested
-ExclusiveArch: %{ix86} alpha ia64 x86_64
-
-Group:   User Interface/X Hardware Support
-License: 3DFX GLIDE Source Code General Public License
-URL:     http://glide.sourceforge.net
-
+Name:             Glide3
+Version:          20050815
+Release:          4%{?dist}
+Summary:          Glide3 runtime for the 3Dfx Voodoo family of cards
+#                 Glide3 is x86/alpha/ia64/x86_64 only, ia64 is untested
+ExclusiveArch:    %{ix86} alpha ia64 x86_64
+Group:            User Interface/X Hardware Support
+License:          3DFX GLIDE Source Code General Public License
+URL:              http://glide.sourceforge.net
 # Create the Glide3 tarball by using:
 #   cvs -d :pserver:anonymous at cvs.glide.sourceforge.net:/cvsroot/glide \
 #     co -r glide-devel-branch Glide3
 #   pushd Glide3 ; find . -name CVS -type d |xargs rm -rf
 #   find . -name .cvsignore | xargs rm ; popd
 #   tar jcf Glide3-$(date +"%Y%m%d").tar.bz2 Glide3/
-Source0: %{name}-%{version}.tar.bz2
-Source1: glidelink.c
-Patch0: Glide3-warn.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: libX11-devel xorg-x11-proto-devel 
+Source0:          %{name}-%{version}.tar.bz2
+Source1:          glidelink.c
+Patch0:           Glide3-warn.patch
+BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:    libX11-devel xorg-x11-proto-devel 
 # Add these to try the experimental DGA support and add DGA=1 to %{glide_flags}
-# BuildRequires: libXxf86dga-devel libXxf86vm-devel
+# BuildRequires:  libXxf86dga-devel libXxf86vm-devel
 %ifarch %{ix86}
-BuildRequires: nasm
+BuildRequires:    nasm
+Requires(post):   policycoreutils /sbin/ldconfig
+Requires(postun): policycoreutils /sbin/ldconfig
 %endif
 
 %description
@@ -107,9 +107,27 @@
 rm -rf $RPM_BUILD_ROOT
 
 
+%ifarch %{ix86}
+%post
+/sbin/ldconfig
+# Set SELinux file_context in the policy
+semanage fcontext -a -t textrel_shlib_t '%{_libdir}/libglide3-v.\.so' 2>/dev/null || :
+# Actually change the context
+chcon -t textrel_shlib_t %{_libdir}/libglide3-v?.so || :
+%else
 %post -p /sbin/ldconfig
+%endif
 
+%ifarch %{ix86}
+%postun
+/sbin/ldconfig
+# SELinux support
+if [ $1 -eq 0 ]; then  # final removal
+  semanage fcontext -d -t textrel_shlib_t '%{_libdir}/libglide3-v.\.so' 2>/dev/null || :
+fi
+%else
 %postun -p /sbin/ldconfig
+%endif
 
 
 %files
@@ -132,6 +150,10 @@
 
 
 %changelog
+* Fri Apr 28 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 20050815-4
+- Add scripts to set SELinux type for the .so files to textrel_shlib_t
+  on i386, because of the non PIC asm used on i386 (bz 187484).
+
 * Mon Feb 13 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 20050815-3
 - Bump release and rebuild for new gcc4.1 and glibc.
 - add %%{?dist} for consistency with my other packages



From fedora-extras-commits at redhat.com  Fri Apr 28 12:31:19 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 28 Apr 2006 05:31:19 -0700
Subject: rpms/maxima/FC-5 maxima-5.9.3-gcl-setarch.patch, NONE,
	1.1 maxima-5.9.3-sbcl-disable-debugger.patch, NONE,
	1.1 maxima.spec, 1.21,
	1.22 maxima-5.9.2-sbcl-disable-debugger.patch, 1.1, NONE
Message-ID: <200604281231.k3SCVLuv027653@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27630

Modified Files:
	maxima.spec 
Added Files:
	maxima-5.9.3-gcl-setarch.patch 
	maxima-5.9.3-sbcl-disable-debugger.patch 
Removed Files:
	maxima-5.9.2-sbcl-disable-debugger.patch 
Log Message:
* Wed Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-2
- use setarch -X hack to allow runtime-gcl to function (#187647)
- respin for sbcl-0.9.12


maxima-5.9.3-gcl-setarch.patch:

--- NEW FILE maxima-5.9.3-gcl-setarch.patch ---
--- maxima-5.9.3/src/maxima.in.setarch	2005-11-07 11:37:11.000000000 -0600
+++ maxima-5.9.3/src/maxima.in	2006-04-27 07:07:42.000000000 -0500
@@ -128,7 +128,7 @@
 	exec "@SCL_NAME@" -quiet -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
     fi
 elif [ "$MAXIMA_LISP" = "gcl" ]; then
-    exec "$maxima_image_base" -eval '(cl-user::run)' -f -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+    exec "setarch" "@ARCH@" "-X" "$maxima_image_base" -eval '(cl-user::run)' -f -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
 elif [ "$MAXIMA_LISP" = "acl6" ]; then
 # FIXME: arguments need in a manner consistent with the way they are extracted
 #        in the function get-application-args in command-line.lisp

maxima-5.9.3-sbcl-disable-debugger.patch:

--- NEW FILE maxima-5.9.3-sbcl-disable-debugger.patch ---
--- maxima-5.9.3/src/Makefile.am.sbcl-disable-debugger	2006-02-11 08:25:06.000000000 -0600
+++ maxima-5.9.3/src/Makefile.am	2006-04-26 14:30:15.000000000 -0500
@@ -151,7 +151,7 @@
 
 
 if SBCL
-EXECUTESBCL = $(SBCL_NAME) --noinform --noprint --eval
+EXECUTESBCL = $(SBCL_NAME) --noinform --noprint --disable-debugger --eval
 all-local: binary-sbcl/maxima.core
 install-exec-local: install-sbcl
 uninstall: uninstall-sbcl
--- maxima-5.9.3/src/Makefile.in.sbcl-disable-debugger	2006-03-19 09:23:40.000000000 -0600
+++ maxima-5.9.3/src/Makefile.in	2006-04-26 14:31:14.000000000 -0500
@@ -204,7 +204,7 @@
 @CMUCL_TRUE at EXECUTECMUCL = $(CMUCL_NAME) -noinit -batch
 @SCL_TRUE at EXECUTESCL = $(SCL_NAME) -noinit -batch
 @ACL6_TRUE at EXECUTEACL6 = $(ACL6_NAME) -batch
- at SBCL_TRUE@EXECUTESBCL = $(SBCL_NAME) --noinform --noprint --eval
+ at SBCL_TRUE@EXECUTESBCL = $(SBCL_NAME) --noinform --noprint --disable-debugger --eval
 @GCL_TRUE at EXECUTEGCL = $(GCL_NAME) -batch -eval
 @OPENMCL_TRUE at EXECUTEOPENMCL = $(OPENMCL_NAME) -e
 genericdir = $(instsrcdir)


Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-5/maxima.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- maxima.spec	10 Apr 2006 17:31:33 -0000	1.21
+++ maxima.spec	28 Apr 2006 12:31:19 -0000	1.22
@@ -1,9 +1,14 @@
 
+%if "%{?fedora}" > "4"
+# See http://bugzilla.redhat.com/bugzilla/187647
+%define setarch_hack 1
+%endif
+
 Summary: Symbolic Computation Program
 Name: 	 maxima
 Version: 5.9.3
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -15,19 +20,19 @@
 #  (sbcl:  https://bugzilla.redhat.com/bugzilla/177029)
 ExclusiveArch: %{ix86} x86_64 
 
-%define _with_default_lisp --with-default-lisp=clisp
-
 %ifarch %{ix86}
 %define _enable_cmucl --enable-cmucl
 %endif
 
 %ifarch %{ix86} x86_64
+%define default_lisp clisp
 %define _enable_clisp --enable-clisp 
 %define _enable_gcl --enable-gcl 
 %define _enable_sbcl --enable-sbcl 
 %endif
 
 %ifarch ppc
+#define default_lisp sbcl
 #define _enable_clisp --enable-clisp 
 #define _enable_cmucl --enable-cmucl 
 #define _enable_gcl --enable-gcl 
@@ -46,11 +51,13 @@
 # (mysterious?) xemacs patch (don't use, for now)
 Patch2: maxima.el-xemacs.patch
 # use sbcl --disable-debugger
-Patch3: maxima-5.9.2-sbcl-disable-debugger.patch
+Patch3: maxima-5.9.3-sbcl-disable-debugger.patch
 # ghostview -> evince (ps/pdf viewer)
 Patch4: maxima-5.9.2-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
 
 # Inhibit automatic compressing of info files. Compressed info
 # files break maxima's internal help.
@@ -71,6 +78,10 @@
 BuildRequires: tk
 
 Requires: %{name}-runtime = %{version}
+## Consider this when rpm supports it -- Rex
+#if "%{?default_lisp:1}" == "1"
+#Requires(hint): %{name}-runtime-%{default_lisp} = %{version}
+#endif
 Requires: gnuplot
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
@@ -134,8 +145,13 @@
 Group:   Applications/Engineering
 BuildRequires: gcl
 Requires:  %{name} = %{version}
+%if "%{?setarch_hack}" == "1"
+BuildRequires: setarch
+Requires:  setarch
+%endif
 Obsoletes: maxima-exec-gcl < %{version}-%{release}
 Provides:  %{name}-runtime = %{version}
+Provides:  %{name}-runtime-gcl = %{version}-%{release}
 %description runtime-gcl
 Maxima compiled with Gnu Common Lisp (gcl)
 %endif
@@ -168,10 +184,16 @@
 
 %patch1 -p1 -b .htmlview
 #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
+%endif
+
+sed -i -e 's|@ARCH@|%{_target_cpu}|' src/maxima.in
 
 sed -i -e 's:/usr/local/info:/usr/share/info:' \
   interfaces/emacs/emaxima/maxima.el
@@ -182,15 +204,10 @@
 # remove CVS crud
 find -name CVS -type d | xargs rm -r
 
-#patch3 -p1 -b .sbcl-disable-debugger
-#aclocal
-#automake --add-missing --copy
-#autoconf
-
 
 %build
 %configure \
-  %{?_with_default_lisp} \
+  %{?default_lisp:--with-default-lisp=%{default_lisp} } \
   %{?_enable_clisp} %{!?_enable_clisp: --disable-clisp } %{?_with_clisp_runtime} \
   %{?_enable_cmucl} %{!?_enable_cmucl: --disable-cmucl } %{?_with_cmucl_runtime} \
   %{?_enable_gcl}   %{!?_enable_gcl:   --disable-gcl } \
@@ -356,6 +373,10 @@
 
 
 %changelog
+* Wed Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-2
+- use setarch -X hack to allow runtime-gcl to function (#187647)
+- respin for sbcl-0.9.12
+
 * Wed Apr 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-1
 - 5.9.3
 


--- maxima-5.9.2-sbcl-disable-debugger.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Apr 28 12:32:46 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 28 Apr 2006 05:32:46 -0700
Subject: rpms/sbcl/FC-4 .cvsignore, 1.10, 1.11 sbcl.spec, 1.34, 1.35 sources,
	1.10, 1.11
Message-ID: <200604281232.k3SCWmjO027735@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27714

Modified Files:
	.cvsignore sbcl.spec sources 
Log Message:
* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-1
- 0.9.12



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore	30 Mar 2006 19:56:23 -0000	1.10
+++ .cvsignore	28 Apr 2006 12:32:46 -0000	1.11
@@ -1,4 +1,4 @@
-sbcl-0.9.11-source.tar.bz2
+sbcl-0.9.12-source.tar.bz2
 sbcl-0.9.11-x86-64-linux-binary.tar.bz2 
 sbcl-0.9.11-x86-linux-binary.tar.bz2
-sbcl-0.8.15-powerpc-linux-binary.tar.bz2
+sbcl-0.9.8-powerpc-linux-binary.tar.bz2


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sbcl.spec	30 Mar 2006 19:56:23 -0000	1.34
+++ sbcl.spec	28 Apr 2006 12:32:46 -0000	1.35
@@ -12,7 +12,7 @@
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
-Version: 0.9.11
+Version: 0.9.12
 Release: 1%{?dist}
 
 License: BSD/MIT
@@ -26,12 +26,22 @@
 #Source1: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2
 Source2: customize-target-features.lisp 
 
+## Bootstraps
+# %{ix86}
+#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-linux-binary.tar.bz2
+# x86_64
+#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-64-linux-binary.tar.bz2
+# ppc
+#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-powerpc-linux-binary.tar.bz2
+# another possible ppc bootstrap to try
+#Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
+
+
 ## x86 section
 %ifarch %{ix86}
 %define sbcl_arch x86
 BuildRequires: sbcl
 # or
-#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-linux-binary.tar.bz2
 #define sbcl_bootstrap_src -a 10 
 %endif
 
@@ -47,16 +57,10 @@
 ## ppc section
 # Latest powerpc-linux bootstrap build fails:
 # http://bugzilla.redhat.com/bugzilla/177029 
-#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2
-# another possible ppc bootstrap to try
-#Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
 Source35: ppc-linux-mcontext.h
 %ifarch ppc 
 %define sbcl_arch ppc
 %define sbcl_bootstrap_src -a 30
-BuildRequires: setarch
-%define setarch setarch %{_target_cpu}
-%define min_bootstrap 1
 %endif
 
 Source100: my_setarch.c
@@ -65,7 +69,7 @@
 Patch2: sbcl-0.9.5-personality.patch
 Patch3: sbcl-0.9.5-optflags.patch
 Patch4: sbcl-0.9.4-LIB_DIR.patch
-Patch5: sbcl-0.9.10-make-config-ppc.patch
+#Patch5: sbcl-0.9.10-make-config-ppc.patch
 Patch6: sbcl-0.9.5-verbose-build.patch
 # Allow override of contrib test failure(s)
 Patch7: sbcl-0.9.9-permissive.patch
@@ -97,7 +101,7 @@
 %patch2 -p1 -b .personality
 %patch3 -p1 -b .optflags
 %patch4 -p1 -b .LIB_DIR
-%patch5 -p1 -b .make-config-ppc
+#patch5 -p1 -b .make-config-ppc
 %{?sbcl_verbose:%patch6 -p1 -b .verbose-build}
 %patch7 -p1 -b .permissive
 
@@ -228,6 +232,9 @@
 
 
 %changelog
+* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-1
+- 0.9.12
+
 * Mon Mar 27 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.11-1
 - 0.9.11
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources	30 Mar 2006 19:56:23 -0000	1.10
+++ sources	28 Apr 2006 12:32:46 -0000	1.11
@@ -1 +1 @@
-b82c3b7cf5c351cbe97af5150c17ad27  sbcl-0.9.11-source.tar.bz2
+82eef4f47d6a72a36d4484bf503fc7db  sbcl-0.9.12-source.tar.bz2



From fedora-extras-commits at redhat.com  Fri Apr 28 12:34:14 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 28 Apr 2006 05:34:14 -0700
Subject: rpms/sbcl/FC-3 .cvsignore, 1.9, 1.10 sbcl.spec, 1.29, 1.30 sources, 
	1.9, 1.10
Message-ID: <200604281234.k3SCYGkn027810@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27789

Modified Files:
	.cvsignore sbcl.spec sources 
Log Message:
* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-1
- 0.9.12



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-3/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	27 Feb 2006 15:36:21 -0000	1.9
+++ .cvsignore	28 Apr 2006 12:34:14 -0000	1.10
@@ -1,4 +1,4 @@
-sbcl-0.9.10-source.tar.bz2
-sbcl-0.9.9-x86-linux-binary.tar.bz2
-sbcl-0.9.9-x86-64-linux-binary.tar.bz2
-sbcl-0.8.15-powerpc-linux-binary.tar.bz2
+sbcl-0.9.12-source.tar.bz2
+sbcl-0.9.11-x86-64-linux-binary.tar.bz2 
+sbcl-0.9.11-x86-linux-binary.tar.bz2
+sbcl-0.9.8-powerpc-linux-binary.tar.bz2


Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-3/sbcl.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sbcl.spec	27 Feb 2006 15:36:21 -0000	1.29
+++ sbcl.spec	28 Apr 2006 12:34:14 -0000	1.30
@@ -12,7 +12,7 @@
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
-Version: 0.9.10
+Version: 0.9.12
 Release: 1%{?dist}
 
 License: BSD/MIT
@@ -26,37 +26,41 @@
 #Source1: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2
 Source2: customize-target-features.lisp 
 
+## Bootstraps
+# %{ix86}
+#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-linux-binary.tar.bz2
+# x86_64
+#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-64-linux-binary.tar.bz2
+# ppc
+#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-powerpc-linux-binary.tar.bz2
+# another possible ppc bootstrap to try
+#Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
+
+
 ## x86 section
 %ifarch %{ix86}
 %define sbcl_arch x86
 BuildRequires: sbcl
 # or
-#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.9-x86-linux-binary.tar.bz2
 #define sbcl_bootstrap_src -a 10 
 %endif
 
 ## x86_64 section
 %ifarch x86_64
 %define sbcl_arch x86-64
-#BuildRequires: sbcl
+BuildRequires: sbcl
 # or
-Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.9-x86-64-linux-binary.tar.bz2
-%define sbcl_bootstrap_src -a 20 
+#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-64-linux-binary.tar.bz2
+#define sbcl_bootstrap_src -a 20 
 %endif
 
 ## ppc section
 # Latest powerpc-linux bootstrap build fails:
 # http://bugzilla.redhat.com/bugzilla/177029 
-#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.8.15-powerpc-linux-binary.tar.bz2
-# another possible ppc bootstrap to try
-#Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
 Source35: ppc-linux-mcontext.h
 %ifarch ppc 
 %define sbcl_arch ppc
 %define sbcl_bootstrap_src -a 30
-BuildRequires: setarch
-%define setarch setarch %{_target_cpu}
-%define min_bootstrap 1
 %endif
 
 Source100: my_setarch.c
@@ -65,7 +69,7 @@
 Patch2: sbcl-0.9.5-personality.patch
 Patch3: sbcl-0.9.5-optflags.patch
 Patch4: sbcl-0.9.4-LIB_DIR.patch
-Patch5: sbcl-0.9.10-make-config-ppc.patch
+#Patch5: sbcl-0.9.10-make-config-ppc.patch
 Patch6: sbcl-0.9.5-verbose-build.patch
 # Allow override of contrib test failure(s)
 Patch7: sbcl-0.9.9-permissive.patch
@@ -97,7 +101,7 @@
 %patch2 -p1 -b .personality
 %patch3 -p1 -b .optflags
 %patch4 -p1 -b .LIB_DIR
-%patch5 -p1 -b .make-config-ppc
+#patch5 -p1 -b .make-config-ppc
 %{?sbcl_verbose:%patch6 -p1 -b .verbose-build}
 %patch7 -p1 -b .permissive
 
@@ -228,6 +232,12 @@
 
 
 %changelog
+* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-1
+- 0.9.12
+
+* Mon Mar 27 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.11-1
+- 0.9.11
+
 * Mon Feb 27 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.10-1
 - 0.9.10
 - update/fix make-config-ppc patch (still broken, #177029)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-3/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	27 Feb 2006 15:36:21 -0000	1.9
+++ sources	28 Apr 2006 12:34:14 -0000	1.10
@@ -1,4 +1 @@
-58678d7081f32bdcd174c5233efba4f3  sbcl-0.9.10-source.tar.bz2
-417f524958fd7a4115902f14eaed3ab1  sbcl-0.9.9-x86-linux-binary.tar.bz2
-d9e4a6d95e255b3a24431f336fae236d  sbcl-0.9.9-x86-64-linux-binary.tar.bz2
-3a72d0785ce0a8e02f9af632c2a4f217  sbcl-0.8.15-powerpc-linux-binary.tar.bz2
+82eef4f47d6a72a36d4484bf503fc7db  sbcl-0.9.12-source.tar.bz2



From fedora-extras-commits at redhat.com  Fri Apr 28 12:36:11 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 28 Apr 2006 05:36:11 -0700
Subject: rpms/maxima/FC-4 maxima.spec,1.19,1.20
Message-ID: <200604281236.k3SCaDnu027897@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27879

Modified Files:
	maxima.spec 
Log Message:
* Wed Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-2
- use setarch -X hack to allow runtime-gcl to function (#187647)
- respin for sbcl-0.9.12



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-4/maxima.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- maxima.spec	10 Apr 2006 17:32:12 -0000	1.19
+++ maxima.spec	28 Apr 2006 12:36:11 -0000	1.20
@@ -1,9 +1,14 @@
 
+%if "%{?fedora}" > "4"
+# See http://bugzilla.redhat.com/bugzilla/187647
+%define setarch_hack 1
+%endif
+
 Summary: Symbolic Computation Program
 Name: 	 maxima
 Version: 5.9.3
 
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -15,19 +20,19 @@
 #  (sbcl:  https://bugzilla.redhat.com/bugzilla/177029)
 ExclusiveArch: %{ix86} x86_64 
 
-%define _with_default_lisp --with-default-lisp=clisp
-
 %ifarch %{ix86}
 %define _enable_cmucl --enable-cmucl
 %endif
 
 %ifarch %{ix86} x86_64
+%define default_lisp clisp
 %define _enable_clisp --enable-clisp 
 %define _enable_gcl --enable-gcl 
 %define _enable_sbcl --enable-sbcl 
 %endif
 
 %ifarch ppc
+#define default_lisp sbcl
 #define _enable_clisp --enable-clisp 
 #define _enable_cmucl --enable-cmucl 
 #define _enable_gcl --enable-gcl 
@@ -46,11 +51,13 @@
 # (mysterious?) xemacs patch (don't use, for now)
 Patch2: maxima.el-xemacs.patch
 # use sbcl --disable-debugger
-Patch3: maxima-5.9.2-sbcl-disable-debugger.patch
+Patch3: maxima-5.9.3-sbcl-disable-debugger.patch
 # ghostview -> evince (ps/pdf viewer)
 Patch4: maxima-5.9.2-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
 
 # Inhibit automatic compressing of info files. Compressed info
 # files break maxima's internal help.
@@ -71,6 +78,10 @@
 BuildRequires: tk
 
 Requires: %{name}-runtime = %{version}
+## Consider this when rpm supports it -- Rex
+#if "%{?default_lisp:1}" == "1"
+#Requires(hint): %{name}-runtime-%{default_lisp} = %{version}
+#endif
 Requires: gnuplot
 Requires(post): /sbin/install-info
 Requires(postun): /sbin/install-info
@@ -134,8 +145,13 @@
 Group:   Applications/Engineering
 BuildRequires: gcl
 Requires:  %{name} = %{version}
+%if "%{?setarch_hack}" == "1"
+BuildRequires: setarch
+Requires:  setarch
+%endif
 Obsoletes: maxima-exec-gcl < %{version}-%{release}
 Provides:  %{name}-runtime = %{version}
+Provides:  %{name}-runtime-gcl = %{version}-%{release}
 %description runtime-gcl
 Maxima compiled with Gnu Common Lisp (gcl)
 %endif
@@ -168,10 +184,16 @@
 
 %patch1 -p1 -b .htmlview
 #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
+%endif
+
+sed -i -e 's|@ARCH@|%{_target_cpu}|' src/maxima.in
 
 sed -i -e 's:/usr/local/info:/usr/share/info:' \
   interfaces/emacs/emaxima/maxima.el
@@ -182,15 +204,10 @@
 # remove CVS crud
 find -name CVS -type d | xargs rm -r
 
-#patch3 -p1 -b .sbcl-disable-debugger
-#aclocal
-#automake --add-missing --copy
-#autoconf
-
 
 %build
 %configure \
-  %{?_with_default_lisp} \
+  %{?default_lisp:--with-default-lisp=%{default_lisp} } \
   %{?_enable_clisp} %{!?_enable_clisp: --disable-clisp } %{?_with_clisp_runtime} \
   %{?_enable_cmucl} %{!?_enable_cmucl: --disable-cmucl } %{?_with_cmucl_runtime} \
   %{?_enable_gcl}   %{!?_enable_gcl:   --disable-gcl } \
@@ -356,6 +373,10 @@
 
 
 %changelog
+* Wed Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-2
+- use setarch -X hack to allow runtime-gcl to function (#187647)
+- respin for sbcl-0.9.12
+
 * Wed Apr 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-1
 - 5.9.3
 



From fedora-extras-commits at redhat.com  Fri Apr 28 12:36:44 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 28 Apr 2006 05:36:44 -0700
Subject: rpms/maxima/FC-4 maxima-5.9.3-gcl-setarch.patch, NONE,
	1.1 maxima-5.9.3-sbcl-disable-debugger.patch, NONE, 1.1
Message-ID: <200604281236.k3SCakMV027934@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27913

Added Files:
	maxima-5.9.3-gcl-setarch.patch 
	maxima-5.9.3-sbcl-disable-debugger.patch 
Log Message:
oops, missed some patches on last commit


maxima-5.9.3-gcl-setarch.patch:

--- NEW FILE maxima-5.9.3-gcl-setarch.patch ---
--- maxima-5.9.3/src/maxima.in.setarch	2005-11-07 11:37:11.000000000 -0600
+++ maxima-5.9.3/src/maxima.in	2006-04-27 07:07:42.000000000 -0500
@@ -128,7 +128,7 @@
 	exec "@SCL_NAME@" -quiet -core "$maxima_image_base.core" -eval '(cl-user::run)' -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
     fi
 elif [ "$MAXIMA_LISP" = "gcl" ]; then
-    exec "$maxima_image_base" -eval '(cl-user::run)' -f -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
+    exec "setarch" "@ARCH@" "-X" "$maxima_image_base" -eval '(cl-user::run)' -f -- "$arg1" "$arg2" "$arg3" "$arg4" "$arg5" "$arg6" "$arg7" "$arg8" "$arg9"
 elif [ "$MAXIMA_LISP" = "acl6" ]; then
 # FIXME: arguments need in a manner consistent with the way they are extracted
 #        in the function get-application-args in command-line.lisp

maxima-5.9.3-sbcl-disable-debugger.patch:

--- NEW FILE maxima-5.9.3-sbcl-disable-debugger.patch ---
--- maxima-5.9.3/src/Makefile.am.sbcl-disable-debugger	2006-02-11 08:25:06.000000000 -0600
+++ maxima-5.9.3/src/Makefile.am	2006-04-26 14:30:15.000000000 -0500
@@ -151,7 +151,7 @@
 
 
 if SBCL
-EXECUTESBCL = $(SBCL_NAME) --noinform --noprint --eval
+EXECUTESBCL = $(SBCL_NAME) --noinform --noprint --disable-debugger --eval
 all-local: binary-sbcl/maxima.core
 install-exec-local: install-sbcl
 uninstall: uninstall-sbcl
--- maxima-5.9.3/src/Makefile.in.sbcl-disable-debugger	2006-03-19 09:23:40.000000000 -0600
+++ maxima-5.9.3/src/Makefile.in	2006-04-26 14:31:14.000000000 -0500
@@ -204,7 +204,7 @@
 @CMUCL_TRUE at EXECUTECMUCL = $(CMUCL_NAME) -noinit -batch
 @SCL_TRUE at EXECUTESCL = $(SCL_NAME) -noinit -batch
 @ACL6_TRUE at EXECUTEACL6 = $(ACL6_NAME) -batch
- at SBCL_TRUE@EXECUTESBCL = $(SBCL_NAME) --noinform --noprint --eval
+ at SBCL_TRUE@EXECUTESBCL = $(SBCL_NAME) --noinform --noprint --disable-debugger --eval
 @GCL_TRUE at EXECUTEGCL = $(GCL_NAME) -batch -eval
 @OPENMCL_TRUE at EXECUTEOPENMCL = $(OPENMCL_NAME) -e
 genericdir = $(instsrcdir)



From fedora-extras-commits at redhat.com  Fri Apr 28 12:41:55 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 28 Apr 2006 05:41:55 -0700
Subject: rpms/libsigsegv/devel .cvsignore, 1.3, 1.4 libsigsegv.spec, 1.9,
	1.10 sources, 1.3, 1.4
Message-ID: <200604281241.k3SCfwmP028005@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libsigsegv/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27984

Modified Files:
	.cvsignore libsigsegv.spec sources 
Log Message:
* Fri Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.3-1
- 2.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsigsegv/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Oct 2005 18:18:13 -0000	1.3
+++ .cvsignore	28 Apr 2006 12:41:55 -0000	1.4
@@ -1 +1 @@
-libsigsegv-2.2.tar.gz
+libsigsegv-2.3.tar.gz


Index: libsigsegv.spec
===================================================================
RCS file: /cvs/extras/rpms/libsigsegv/devel/libsigsegv.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libsigsegv.spec	1 Mar 2006 16:00:06 -0000	1.9
+++ libsigsegv.spec	28 Apr 2006 12:41:55 -0000	1.10
@@ -1,12 +1,12 @@
 
 Summary: Library for handling page faults in user mode
 Name:    libsigsegv
-Version: 2.2
-Release: 1%{?dist}.2
+Version: 2.3
+Release: 1%{?dist}
 
 License: GPL
 URL:     http://libsigsegv.sourceforge.net/
-Source:  http://ftp.gnu.org/gnu/libsigsegv/libsigsegv-2.2.tar.gz
+Source:  http://ftp.gnu.org/gnu/libsigsegv/libsigsegv-%{version}.tar.gz
 Group:   System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -21,7 +21,6 @@
   - stack overflow handlers,
   - distributed shared memory,
 
-
 %package devel
 Summary: Development libraries and header files for %{name} 
 Group:   Development/Libraries
@@ -76,6 +75,9 @@
 
 
 %changelog
+* Fri Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.3-1
+- 2.3
+
 * Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 
 - fc5: gcc/glibc respin
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsigsegv/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Oct 2005 18:18:13 -0000	1.3
+++ sources	28 Apr 2006 12:41:55 -0000	1.4
@@ -1 +1 @@
-d914c40c4bf2bff9ba60b37bbc5fc226  libsigsegv-2.2.tar.gz
+81b3c50e18a29be0bc08173e74860d05  libsigsegv-2.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 28 12:52:40 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 28 Apr 2006 05:52:40 -0700
Subject: rpms/libsigsegv/FC-5 .cvsignore, 1.3, 1.4 libsigsegv.spec, 1.9,
	1.10 sources, 1.3, 1.4
Message-ID: <200604281252.k3SCqgo6028101@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libsigsegv/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28080

Modified Files:
	.cvsignore libsigsegv.spec sources 
Log Message:
* Fri Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.3-1
- 2.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsigsegv/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Oct 2005 18:18:13 -0000	1.3
+++ .cvsignore	28 Apr 2006 12:52:40 -0000	1.4
@@ -1 +1 @@
-libsigsegv-2.2.tar.gz
+libsigsegv-2.3.tar.gz


Index: libsigsegv.spec
===================================================================
RCS file: /cvs/extras/rpms/libsigsegv/FC-5/libsigsegv.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libsigsegv.spec	1 Mar 2006 16:00:06 -0000	1.9
+++ libsigsegv.spec	28 Apr 2006 12:52:40 -0000	1.10
@@ -1,12 +1,12 @@
 
 Summary: Library for handling page faults in user mode
 Name:    libsigsegv
-Version: 2.2
-Release: 1%{?dist}.2
+Version: 2.3
+Release: 1%{?dist}
 
 License: GPL
 URL:     http://libsigsegv.sourceforge.net/
-Source:  http://ftp.gnu.org/gnu/libsigsegv/libsigsegv-2.2.tar.gz
+Source:  http://ftp.gnu.org/gnu/libsigsegv/libsigsegv-%{version}.tar.gz
 Group:   System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -21,7 +21,6 @@
   - stack overflow handlers,
   - distributed shared memory,
 
-
 %package devel
 Summary: Development libraries and header files for %{name} 
 Group:   Development/Libraries
@@ -76,6 +75,9 @@
 
 
 %changelog
+* Fri Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.3-1
+- 2.3
+
 * Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 
 - fc5: gcc/glibc respin
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsigsegv/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Oct 2005 18:18:13 -0000	1.3
+++ sources	28 Apr 2006 12:52:40 -0000	1.4
@@ -1 +1 @@
-d914c40c4bf2bff9ba60b37bbc5fc226  libsigsegv-2.2.tar.gz
+81b3c50e18a29be0bc08173e74860d05  libsigsegv-2.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 28 12:53:02 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 28 Apr 2006 05:53:02 -0700
Subject: rpms/libsigsegv/FC-4 .cvsignore, 1.3, 1.4 libsigsegv.spec, 1.6,
	1.7 sources, 1.3, 1.4
Message-ID: <200604281253.k3SCr45l028168@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libsigsegv/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28147

Modified Files:
	.cvsignore libsigsegv.spec sources 
Log Message:
* Fri Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.3-1
- 2.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsigsegv/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Oct 2005 18:24:52 -0000	1.3
+++ .cvsignore	28 Apr 2006 12:53:02 -0000	1.4
@@ -1 +1 @@
-libsigsegv-2.2.tar.gz
+libsigsegv-2.3.tar.gz


Index: libsigsegv.spec
===================================================================
RCS file: /cvs/extras/rpms/libsigsegv/FC-4/libsigsegv.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libsigsegv.spec	6 Oct 2005 18:24:52 -0000	1.6
+++ libsigsegv.spec	28 Apr 2006 12:53:02 -0000	1.7
@@ -1,13 +1,12 @@
-# $Id$
 
 Summary: Library for handling page faults in user mode
 Name:    libsigsegv
-Version: 2.2
+Version: 2.3
 Release: 1%{?dist}
 
 License: GPL
 URL:     http://libsigsegv.sourceforge.net/
-Source:  http://ftp.gnu.org/gnu/libsigsegv/libsigsegv-2.2.tar.gz
+Source:  http://ftp.gnu.org/gnu/libsigsegv/libsigsegv-%{version}.tar.gz
 Group:   System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -22,7 +21,6 @@
   - stack overflow handlers,
   - distributed shared memory,
 
-
 %package devel
 Summary: Development libraries and header files for %{name} 
 Group:   Development/Libraries
@@ -77,6 +75,12 @@
 
 
 %changelog
+* Fri Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.3-1
+- 2.3
+
+* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 
+- fc5: gcc/glibc respin
+
 * Thu Oct 06 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 2.2-1
 - 2.2
 - omit .la file(s)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsigsegv/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Oct 2005 18:24:52 -0000	1.3
+++ sources	28 Apr 2006 12:53:02 -0000	1.4
@@ -1 +1 @@
-d914c40c4bf2bff9ba60b37bbc5fc226  libsigsegv-2.2.tar.gz
+81b3c50e18a29be0bc08173e74860d05  libsigsegv-2.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 28 12:53:22 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 28 Apr 2006 05:53:22 -0700
Subject: rpms/libsigsegv/FC-3 .cvsignore, 1.3, 1.4 libsigsegv.spec, 1.3,
	1.4 sources, 1.3, 1.4
Message-ID: <200604281253.k3SCrO23028233@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/libsigsegv/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28212

Modified Files:
	.cvsignore libsigsegv.spec sources 
Log Message:
* Fri Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.3-1
- 2.3



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsigsegv/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	6 Oct 2005 18:24:52 -0000	1.3
+++ .cvsignore	28 Apr 2006 12:53:22 -0000	1.4
@@ -1 +1 @@
-libsigsegv-2.2.tar.gz
+libsigsegv-2.3.tar.gz


Index: libsigsegv.spec
===================================================================
RCS file: /cvs/extras/rpms/libsigsegv/FC-3/libsigsegv.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libsigsegv.spec	6 Oct 2005 18:24:52 -0000	1.3
+++ libsigsegv.spec	28 Apr 2006 12:53:22 -0000	1.4
@@ -1,13 +1,12 @@
-# $Id$
 
 Summary: Library for handling page faults in user mode
 Name:    libsigsegv
-Version: 2.2
+Version: 2.3
 Release: 1%{?dist}
 
 License: GPL
 URL:     http://libsigsegv.sourceforge.net/
-Source:  http://ftp.gnu.org/gnu/libsigsegv/libsigsegv-2.2.tar.gz
+Source:  http://ftp.gnu.org/gnu/libsigsegv/libsigsegv-%{version}.tar.gz
 Group:   System Environment/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -22,7 +21,6 @@
   - stack overflow handlers,
   - distributed shared memory,
 
-
 %package devel
 Summary: Development libraries and header files for %{name} 
 Group:   Development/Libraries
@@ -77,6 +75,12 @@
 
 
 %changelog
+* Fri Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 2.3-1
+- 2.3
+
+* Wed Mar 1 2006 Rex Dieter <rexdieter[AT]users.sf.net> 
+- fc5: gcc/glibc respin
+
 * Thu Oct 06 2005 Rex Dieter <rexdieter[AT]users.sf.net> - 2.2-1
 - 2.2
 - omit .la file(s)


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsigsegv/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	6 Oct 2005 18:24:52 -0000	1.3
+++ sources	28 Apr 2006 12:53:22 -0000	1.4
@@ -1 +1 @@
-d914c40c4bf2bff9ba60b37bbc5fc226  libsigsegv-2.2.tar.gz
+81b3c50e18a29be0bc08173e74860d05  libsigsegv-2.3.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 28 12:59:52 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 28 Apr 2006 05:59:52 -0700
Subject: rpms/sbcl/devel sbcl.spec,1.41,1.42 sources,1.12,1.13
Message-ID: <200604281259.k3SCxsVD028310@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28291

Modified Files:
	sbcl.spec sources 
Log Message:
* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net 0.9.12-1.1
- try re-enabling ppc build



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sbcl.spec	26 Apr 2006 18:51:33 -0000	1.41
+++ sbcl.spec	28 Apr 2006 12:59:52 -0000	1.42
@@ -4,40 +4,28 @@
 #define min_bootstrap 1
 
 # define to enable verbose build for debugging
-#define sbcl_verbose 1 
-
-# shell to use
-#define sbcl_shell /bin/bash -x
-%define sbcl_shell /bin/bash 
+%define sbcl_verbose 1 
+%define sbcl_shell /bin/bash -x
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.12
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 
 License: BSD/MIT
 Group: 	 Development/Languages
 URL:	 http://sbcl.sourceforge.net/
 Source0: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: %{ix86} x86_64
+#ExclusiveArch: %{ix86} x86_64
+ExclusiveArch: ppc
 
 # Pre-generated html docs (not used)
 #Source1: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2
 Source2: customize-target-features.lisp 
 
-## Bootstraps
-# %{ix86}
-#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-linux-binary.tar.bz2
-# x86_64
-#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-64-linux-binary.tar.bz2
-# ppc
-#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-powerpc-linux-binary.tar.bz2
-# another possible ppc bootstrap to try
-#Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
-
-
 ## x86 section
+#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-linux-binary.tar.bz2
 %ifarch %{ix86}
 %define sbcl_arch x86
 BuildRequires: sbcl
@@ -46,6 +34,7 @@
 %endif
 
 ## x86_64 section
+#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-64-linux-binary.tar.bz2
 %ifarch x86_64
 %define sbcl_arch x86-64
 BuildRequires: sbcl
@@ -55,6 +44,9 @@
 %endif
 
 ## ppc section
+Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-powerpc-linux-binary.tar.bz2
+# another possible ppc bootstrap to try
+#Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
 # Latest powerpc-linux bootstrap build fails:
 # http://bugzilla.redhat.com/bugzilla/177029 
 Source35: ppc-linux-mcontext.h
@@ -232,6 +224,9 @@
 
 
 %changelog
+* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net 0.9.12-1.1
+- try re-enabling ppc build
+
 * Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-1
 - 0.9.12
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	26 Apr 2006 18:51:33 -0000	1.12
+++ sources	28 Apr 2006 12:59:52 -0000	1.13
@@ -1 +1,2 @@
 82eef4f47d6a72a36d4484bf503fc7db  sbcl-0.9.12-source.tar.bz2
+83693674395d102961b76f30b241f522  sbcl-0.9.8-powerpc-linux-binary.tar.bz2



From fedora-extras-commits at redhat.com  Fri Apr 28 13:58:48 2006
From: fedora-extras-commits at redhat.com (Thomas Vander Stichele (thomasvs))
Date: Fri, 28 Apr 2006 06:58:48 -0700
Subject: rpms/libshout/devel libshout.spec,1.11,1.12
Message-ID: <200604281358.k3SDwof2030813@cvs-int.fedora.redhat.com>

Author: thomasvs

Update of /cvs/extras/rpms/libshout/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30796

Modified Files:
	libshout.spec 
Log Message:
update to latest spec


Index: libshout.spec
===================================================================
RCS file: /cvs/extras/rpms/libshout/devel/libshout.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libshout.spec	17 Mar 2006 15:58:11 -0000	1.11
+++ libshout.spec	28 Apr 2006 13:58:48 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           libshout
 Version:        2.2
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        icecast source streaming library
 
 Group:          System Environment/Libraries
@@ -29,6 +29,11 @@
 Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 
+Requires:       libogg-devel
+Requires:       libvorbis-devel
+Requires:       libtheora-devel
+Requires:       speex-devel
+
 %description    devel
 The libshout-devel package contains the header files needed for developing
 applications that send data to an icecast server.  Install libshout-devel if
@@ -74,6 +79,14 @@
 %{_datadir}/aclocal/shout.m4
 
 %changelog
+* Fri Mar 17 2006 Thomas Vander Stichele <thomas at apestaart dot org>
+- 2.2-3
+- add Requires: to -devel package
+
+* Fri Mar 17 2006 Thomas Vander Stichele <thomas at apestaart dot org>
+- 2.2-2
+- rebuild to please the extras repository
+
 * Fri Mar 10 2006 Thomas Vander Stichele <thomas at apestaart dot org>
 - 2.2-1
 - new (incompatible) version, but deps are updated



From fedora-extras-commits at redhat.com  Fri Apr 28 13:59:34 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 28 Apr 2006 06:59:34 -0700
Subject: rpms/maxima/devel maxima.spec,1.24,1.25
Message-ID: <200604281359.k3SDxakh030881@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30864

Modified Files:
	maxima.spec 
Log Message:
* Fri Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-2.1
- try ppc build against sbcl



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- maxima.spec	27 Apr 2006 14:57:59 -0000	1.24
+++ maxima.spec	28 Apr 2006 13:59:34 -0000	1.25
@@ -1,14 +1,9 @@
 
-%if "%{?fedora}" > "4"
-# See http://bugzilla.redhat.com/bugzilla/187647
-%define setarch_hack 1
-%endif
-
 Summary: Symbolic Computation Program
 Name: 	 maxima
 Version: 5.9.3
 
-Release: 2%{?dist}
+Release: 2%{?dist}.1
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
@@ -18,7 +13,8 @@
 #  (clisp: http://bugzilla.redhat.com/bugzilla/166347) 
 #  (gcl:   http://bugzilla.redhat.com/bugzilla/167952)
 #  (sbcl:  https://bugzilla.redhat.com/bugzilla/177029)
-ExclusiveArch: %{ix86} x86_64 
+#ExclusiveArch: %{ix86} x86_64 
+ExclusiveArch: ppc
 
 %ifarch %{ix86}
 %define _enable_cmucl --enable-cmucl
@@ -32,11 +28,11 @@
 %endif
 
 %ifarch ppc
-#define default_lisp sbcl
+%define default_lisp sbcl
 #define _enable_clisp --enable-clisp 
 #define _enable_cmucl --enable-cmucl 
 #define _enable_gcl --enable-gcl 
-#define _enable_sbcl --enable-sbcl 
+%define _enable_sbcl --enable-sbcl 
 %endif
 
 Source1: maxima.png
@@ -145,7 +141,9 @@
 Group:   Applications/Engineering
 BuildRequires: gcl
 Requires:  %{name} = %{version}
-%if "%{?setarch_hack}" == "1"
+%if "%{?fedora}" > "4"
+# See http://bugzilla.redhat.com/bugzilla/187647
+%define setarch_hack 1
 BuildRequires: setarch
 Requires:  setarch
 %endif
@@ -373,6 +371,9 @@
 
 
 %changelog
+* Fri Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-2.1
+- try ppc build against sbcl
+
 * Wed Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-2
 - use setarch -X hack to allow runtime-gcl to function (#187647)
 - respin for sbcl-0.9.12



From fedora-extras-commits at redhat.com  Fri Apr 28 14:11:05 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 28 Apr 2006 07:11:05 -0700
Subject: rpms/sbcl/FC-5 sbcl.spec,1.41,1.42 sources,1.12,1.13
Message-ID: <200604281411.k3SEB74W000678@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv659

Modified Files:
	sbcl.spec sources 
Log Message:
* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net 0.9.12-1.1
- try re-enabling ppc build



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-5/sbcl.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sbcl.spec	27 Apr 2006 14:54:18 -0000	1.41
+++ sbcl.spec	28 Apr 2006 14:11:05 -0000	1.42
@@ -4,40 +4,28 @@
 #define min_bootstrap 1
 
 # define to enable verbose build for debugging
-#define sbcl_verbose 1 
-
-# shell to use
-#define sbcl_shell /bin/bash -x
-%define sbcl_shell /bin/bash 
+%define sbcl_verbose 1 
+%define sbcl_shell /bin/bash -x
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.12
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 
 License: BSD/MIT
 Group: 	 Development/Languages
 URL:	 http://sbcl.sourceforge.net/
 Source0: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: %{ix86} x86_64
+#ExclusiveArch: %{ix86} x86_64
+ExclusiveArch: ppc
 
 # Pre-generated html docs (not used)
 #Source1: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2
 Source2: customize-target-features.lisp 
 
-## Bootstraps
-# %{ix86}
-#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-linux-binary.tar.bz2
-# x86_64
-#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-64-linux-binary.tar.bz2
-# ppc
-#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-powerpc-linux-binary.tar.bz2
-# another possible ppc bootstrap to try
-#Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
-
-
 ## x86 section
+#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-linux-binary.tar.bz2
 %ifarch %{ix86}
 %define sbcl_arch x86
 BuildRequires: sbcl
@@ -46,6 +34,7 @@
 %endif
 
 ## x86_64 section
+#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-64-linux-binary.tar.bz2
 %ifarch x86_64
 %define sbcl_arch x86-64
 BuildRequires: sbcl
@@ -55,6 +44,9 @@
 %endif
 
 ## ppc section
+Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-powerpc-linux-binary.tar.bz2
+# another possible ppc bootstrap to try
+#Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
 # Latest powerpc-linux bootstrap build fails:
 # http://bugzilla.redhat.com/bugzilla/177029 
 Source35: ppc-linux-mcontext.h
@@ -232,6 +224,9 @@
 
 
 %changelog
+* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net 0.9.12-1.1
+- try re-enabling ppc build
+
 * Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-1
 - 0.9.12
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	27 Apr 2006 14:54:18 -0000	1.12
+++ sources	28 Apr 2006 14:11:05 -0000	1.13
@@ -1 +1,2 @@
 82eef4f47d6a72a36d4484bf503fc7db  sbcl-0.9.12-source.tar.bz2
+83693674395d102961b76f30b241f522  sbcl-0.9.8-powerpc-linux-binary.tar.bz2



From fedora-extras-commits at redhat.com  Fri Apr 28 14:12:01 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 28 Apr 2006 07:12:01 -0700
Subject: rpms/sbcl/FC-4 sbcl.spec,1.35,1.36 sources,1.11,1.12
Message-ID: <200604281412.k3SEC3mq000749@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv730

Modified Files:
	sbcl.spec sources 
Log Message:
* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net 0.9.12-1.1
- try re-enabling ppc build



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sbcl.spec	28 Apr 2006 12:32:46 -0000	1.35
+++ sbcl.spec	28 Apr 2006 14:12:01 -0000	1.36
@@ -4,40 +4,28 @@
 #define min_bootstrap 1
 
 # define to enable verbose build for debugging
-#define sbcl_verbose 1 
-
-# shell to use
-#define sbcl_shell /bin/bash -x
-%define sbcl_shell /bin/bash 
+%define sbcl_verbose 1 
+%define sbcl_shell /bin/bash -x
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.12
-Release: 1%{?dist}
+Release: 1%{?dist}.1
 
 License: BSD/MIT
 Group: 	 Development/Languages
 URL:	 http://sbcl.sourceforge.net/
 Source0: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-ExclusiveArch: %{ix86} x86_64
+#ExclusiveArch: %{ix86} x86_64
+ExclusiveArch: ppc
 
 # Pre-generated html docs (not used)
 #Source1: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2
 Source2: customize-target-features.lisp 
 
-## Bootstraps
-# %{ix86}
-#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-linux-binary.tar.bz2
-# x86_64
-#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-64-linux-binary.tar.bz2
-# ppc
-#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-powerpc-linux-binary.tar.bz2
-# another possible ppc bootstrap to try
-#Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
-
-
 ## x86 section
+#Source10: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-linux-binary.tar.bz2
 %ifarch %{ix86}
 %define sbcl_arch x86
 BuildRequires: sbcl
@@ -46,6 +34,7 @@
 %endif
 
 ## x86_64 section
+#Source20: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.11-x86-64-linux-binary.tar.bz2
 %ifarch x86_64
 %define sbcl_arch x86-64
 BuildRequires: sbcl
@@ -55,6 +44,9 @@
 %endif
 
 ## ppc section
+Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-powerpc-linux-binary.tar.bz2
+# another possible ppc bootstrap to try
+#Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
 # Latest powerpc-linux bootstrap build fails:
 # http://bugzilla.redhat.com/bugzilla/177029 
 Source35: ppc-linux-mcontext.h
@@ -232,6 +224,9 @@
 
 
 %changelog
+* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net 0.9.12-1.1
+- try re-enabling ppc build
+
 * Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-1
 - 0.9.12
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	28 Apr 2006 12:32:46 -0000	1.11
+++ sources	28 Apr 2006 14:12:01 -0000	1.12
@@ -1 +1,2 @@
 82eef4f47d6a72a36d4484bf503fc7db  sbcl-0.9.12-source.tar.bz2
+83693674395d102961b76f30b241f522  sbcl-0.9.8-powerpc-linux-binary.tar.bz2



From fedora-extras-commits at redhat.com  Fri Apr 28 14:17:37 2006
From: fedora-extras-commits at redhat.com (Thorsten Leemhuis (thl))
Date: Fri, 28 Apr 2006 07:17:37 -0700
Subject: rpms/mail-notification/devel mail-notification-2.0-imapauth.diff,
	NONE, 1.1 mail-notification.spec, 1.17, 1.18
Message-ID: <200604281417.k3SEHd6J000827@cvs-int.fedora.redhat.com>

Author: thl

Update of /cvs/extras/rpms/mail-notification/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv807

Modified Files:
	mail-notification.spec 
Added Files:
	mail-notification-2.0-imapauth.diff 
Log Message:
Added patch for IMAP authentication problem from project homepage (#190137, Paul Clifford)

mail-notification-2.0-imapauth.diff:

--- NEW FILE mail-notification-2.0-imapauth.diff ---
--- src/mn-imap-mailbox.c.orig	Tue Aug  9 22:01:56 2005
+++ src/mn-imap-mailbox.c	Wed Jan 25 19:22:48 2006
@@ -1646,7 +1646,12 @@
      */
     if (mn_ascii_validate(input))
       {
-	if (g_str_has_prefix(input, "+ "))
+	if (! strcmp(input, "+"))
+	  {
+	    response = g_new0(MNClientSessionResponse, 1);
+	    response->continuation = g_strdup("");
+	  }
+	else if (g_str_has_prefix(input, "+ "))
 	  {
 	    response = g_new0(MNClientSessionResponse, 1);
 	    response->continuation = g_strdup(input + 2);


Index: mail-notification.spec
===================================================================
RCS file: /cvs/extras/rpms/mail-notification/devel/mail-notification.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- mail-notification.spec	13 Feb 2006 17:31:56 -0000	1.17
+++ mail-notification.spec	28 Apr 2006 14:17:37 -0000	1.18
@@ -1,6 +1,6 @@
 Name:           mail-notification
 Version:        2.0
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Status icon that informs you if you have new mail
 
 Group:          Applications/Internet
@@ -11,6 +11,7 @@
 Patch0:		http://savannah.nongnu.org/download/mailnotify/mail-notification-2.0-buildfix.diff
 Patch1:		http://savannah.nongnu.org/download/mailnotify/mail-notification-2.0-gmail-properties-fix.diff
 Patch2:		mail-notification-evolution.patch
+Patch3:		http://savannah.nongnu.org/download/mailnotify/mail-notification-2.0-imapauth.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gettext >= 0.14.1
@@ -47,6 +48,7 @@
 %patch0 -b .patch0
 %patch1 -b .patch1
 %patch2 -p1 -b .evolution
+%patch3 -b .patch3
 
 %build
 export LDFLAGS="-Wl,--export-dynamic"
@@ -118,6 +120,9 @@
 
 
 %changelog
+* Thu Apr 27 2006 Paul Clifford <paul.clifford+fe[AT]gmail[DOT]com> 2.0-12
+- Added patch for IMAP authentication problem from project homepage (#190137)
+
 * Mon Feb 13 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info>
 - Rebuild for Fedora Extras 5
 



From fedora-extras-commits at redhat.com  Fri Apr 28 14:32:32 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 28 Apr 2006 07:32:32 -0700
Subject: rpms/sbcl/devel sbcl.spec,1.42,1.43 sources,1.13,1.14
Message-ID: <200604281432.k3SEWYRi001030@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1011

Modified Files:
	sbcl.spec sources 
Log Message:
* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-2
- respin, using new ppc bootstrap 



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sbcl.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sbcl.spec	28 Apr 2006 12:59:52 -0000	1.42
+++ sbcl.spec	28 Apr 2006 14:32:32 -0000	1.43
@@ -4,21 +4,20 @@
 #define min_bootstrap 1
 
 # define to enable verbose build for debugging
-%define sbcl_verbose 1 
-%define sbcl_shell /bin/bash -x
+#define sbcl_verbose 1 
+%define sbcl_shell /bin/bash
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.12
-Release: 1%{?dist}.1
+Release: 2%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
 URL:	 http://sbcl.sourceforge.net/
 Source0: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#ExclusiveArch: %{ix86} x86_64
-ExclusiveArch: ppc
+ExclusiveArch: %{ix86} x86_64 ppc
 
 # Pre-generated html docs (not used)
 #Source1: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2
@@ -44,15 +43,12 @@
 %endif
 
 ## ppc section
-Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-powerpc-linux-binary.tar.bz2
-# another possible ppc bootstrap to try
-#Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
-# Latest powerpc-linux bootstrap build fails:
-# http://bugzilla.redhat.com/bugzilla/177029 
-Source35: ppc-linux-mcontext.h
+#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-powerpc-linux-binary.tar.bz2
 %ifarch ppc 
 %define sbcl_arch ppc
-%define sbcl_bootstrap_src -a 30
+BuildRequires: sbcl
+# or
+#define sbcl_bootstrap_src -a 30
 %endif
 
 Source100: my_setarch.c
@@ -103,10 +99,6 @@
 cp %{SOURCE2} ./customize-target-features.lisp
 %endif
 
-%ifarch ppc
-cp %{SOURCE35} src/runtime/ppc-linux-mcontext.h.BAK
-%endif
-
 # "install" local bootstrap
 %if "%{?sbcl_bootstrap_src}" != "%{nil}"
 mkdir sbcl-bootstrap
@@ -224,7 +216,10 @@
 
 
 %changelog
-* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net 0.9.12-1.1
+* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-2
+- respin, using new ppc bootstrap 
+
+* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-1.1
 - try re-enabling ppc build
 
 * Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/devel/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	28 Apr 2006 12:59:52 -0000	1.13
+++ sources	28 Apr 2006 14:32:32 -0000	1.14
@@ -1,2 +1 @@
 82eef4f47d6a72a36d4484bf503fc7db  sbcl-0.9.12-source.tar.bz2
-83693674395d102961b76f30b241f522  sbcl-0.9.8-powerpc-linux-binary.tar.bz2



From fedora-extras-commits at redhat.com  Fri Apr 28 14:33:39 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 28 Apr 2006 07:33:39 -0700
Subject: rpms/sbcl/devel ppc-linux-mcontext.h,1.1,NONE
Message-ID: <200604281433.k3SEXfWY001096@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1081

Removed Files:
	ppc-linux-mcontext.h 
Log Message:
drop deprecated bits



--- ppc-linux-mcontext.h DELETED ---



From fedora-extras-commits at redhat.com  Fri Apr 28 15:07:20 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 28 Apr 2006 08:07:20 -0700
Subject: rpms/sbcl/FC-5 sbcl.spec, 1.42, 1.43 sources, 1.13,
	1.14 ppc-linux-mcontext.h, 1.1, NONE
Message-ID: <200604281507.k3SF7MLr003517@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3496

Modified Files:
	sbcl.spec sources 
Removed Files:
	ppc-linux-mcontext.h 
Log Message:
* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-2
- respin, using new ppc bootstrap 



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-5/sbcl.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sbcl.spec	28 Apr 2006 14:11:05 -0000	1.42
+++ sbcl.spec	28 Apr 2006 15:07:20 -0000	1.43
@@ -4,21 +4,20 @@
 #define min_bootstrap 1
 
 # define to enable verbose build for debugging
-%define sbcl_verbose 1 
-%define sbcl_shell /bin/bash -x
+#define sbcl_verbose 1 
+%define sbcl_shell /bin/bash
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.12
-Release: 1%{?dist}.1
+Release: 2%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
 URL:	 http://sbcl.sourceforge.net/
 Source0: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#ExclusiveArch: %{ix86} x86_64
-ExclusiveArch: ppc
+ExclusiveArch: %{ix86} x86_64 ppc
 
 # Pre-generated html docs (not used)
 #Source1: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2
@@ -44,15 +43,12 @@
 %endif
 
 ## ppc section
-Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-powerpc-linux-binary.tar.bz2
-# another possible ppc bootstrap to try
-#Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
-# Latest powerpc-linux bootstrap build fails:
-# http://bugzilla.redhat.com/bugzilla/177029 
-Source35: ppc-linux-mcontext.h
+#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-powerpc-linux-binary.tar.bz2
 %ifarch ppc 
 %define sbcl_arch ppc
-%define sbcl_bootstrap_src -a 30
+BuildRequires: sbcl
+# or
+#define sbcl_bootstrap_src -a 30
 %endif
 
 Source100: my_setarch.c
@@ -103,10 +99,6 @@
 cp %{SOURCE2} ./customize-target-features.lisp
 %endif
 
-%ifarch ppc
-cp %{SOURCE35} src/runtime/ppc-linux-mcontext.h.BAK
-%endif
-
 # "install" local bootstrap
 %if "%{?sbcl_bootstrap_src}" != "%{nil}"
 mkdir sbcl-bootstrap
@@ -224,7 +216,10 @@
 
 
 %changelog
-* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net 0.9.12-1.1
+* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-2
+- respin, using new ppc bootstrap 
+
+* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-1.1
 - try re-enabling ppc build
 
 * Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-5/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	28 Apr 2006 14:11:05 -0000	1.13
+++ sources	28 Apr 2006 15:07:20 -0000	1.14
@@ -1,2 +1 @@
 82eef4f47d6a72a36d4484bf503fc7db  sbcl-0.9.12-source.tar.bz2
-83693674395d102961b76f30b241f522  sbcl-0.9.8-powerpc-linux-binary.tar.bz2


--- ppc-linux-mcontext.h DELETED ---



From fedora-extras-commits at redhat.com  Fri Apr 28 15:07:37 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 28 Apr 2006 08:07:37 -0700
Subject: rpms/sbcl/FC-4 sbcl.spec, 1.36, 1.37 sources, 1.12,
	1.13 ppc-linux-mcontext.h, 1.1, NONE
Message-ID: <200604281507.k3SF7dEg003590@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/sbcl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3571

Modified Files:
	sbcl.spec sources 
Removed Files:
	ppc-linux-mcontext.h 
Log Message:
* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-2
- respin, using new ppc bootstrap 



Index: sbcl.spec
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/sbcl.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sbcl.spec	28 Apr 2006 14:12:01 -0000	1.36
+++ sbcl.spec	28 Apr 2006 15:07:37 -0000	1.37
@@ -4,21 +4,20 @@
 #define min_bootstrap 1
 
 # define to enable verbose build for debugging
-%define sbcl_verbose 1 
-%define sbcl_shell /bin/bash -x
+#define sbcl_verbose 1 
+%define sbcl_shell /bin/bash
 
 Name: 	 sbcl
 Summary: Steel Bank Common Lisp
 Version: 0.9.12
-Release: 1%{?dist}.1
+Release: 2%{?dist}
 
 License: BSD/MIT
 Group: 	 Development/Languages
 URL:	 http://sbcl.sourceforge.net/
 Source0: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-source.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-#ExclusiveArch: %{ix86} x86_64
-ExclusiveArch: ppc
+ExclusiveArch: %{ix86} x86_64 ppc
 
 # Pre-generated html docs (not used)
 #Source1: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-%{version}-html.tar.bz2
@@ -44,15 +43,12 @@
 %endif
 
 ## ppc section
-Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-powerpc-linux-binary.tar.bz2
-# another possible ppc bootstrap to try
-#Source31: http://clozure.com/openmcl/ftp/openmcl-linuxppc-all-0.14.3.tar.gz
-# Latest powerpc-linux bootstrap build fails:
-# http://bugzilla.redhat.com/bugzilla/177029 
-Source35: ppc-linux-mcontext.h
+#Source30: http://dl.sourceforge.net/sourceforge/sbcl/sbcl-0.9.8-powerpc-linux-binary.tar.bz2
 %ifarch ppc 
 %define sbcl_arch ppc
-%define sbcl_bootstrap_src -a 30
+BuildRequires: sbcl
+# or
+#define sbcl_bootstrap_src -a 30
 %endif
 
 Source100: my_setarch.c
@@ -103,10 +99,6 @@
 cp %{SOURCE2} ./customize-target-features.lisp
 %endif
 
-%ifarch ppc
-cp %{SOURCE35} src/runtime/ppc-linux-mcontext.h.BAK
-%endif
-
 # "install" local bootstrap
 %if "%{?sbcl_bootstrap_src}" != "%{nil}"
 mkdir sbcl-bootstrap
@@ -224,7 +216,10 @@
 
 
 %changelog
-* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net 0.9.12-1.1
+* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-2
+- respin, using new ppc bootstrap 
+
+* Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-1.1
 - try re-enabling ppc build
 
 * Mon Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 0.9.12-1


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/sbcl/FC-4/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sources	28 Apr 2006 14:12:01 -0000	1.12
+++ sources	28 Apr 2006 15:07:37 -0000	1.13
@@ -1,2 +1 @@
 82eef4f47d6a72a36d4484bf503fc7db  sbcl-0.9.12-source.tar.bz2
-83693674395d102961b76f30b241f522  sbcl-0.9.8-powerpc-linux-binary.tar.bz2


--- ppc-linux-mcontext.h DELETED ---



From fedora-extras-commits at redhat.com  Fri Apr 28 15:20:59 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 28 Apr 2006 08:20:59 -0700
Subject: rpms/maxima/devel maxima.spec,1.25,1.26
Message-ID: <200604281521.k3SFL1J2003932@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3911

Modified Files:
	maxima.spec 
Log Message:
* Mon Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-3 
- respin, using new ppc bootstrap



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/devel/maxima.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- maxima.spec	28 Apr 2006 13:59:34 -0000	1.25
+++ maxima.spec	28 Apr 2006 15:20:59 -0000	1.26
@@ -3,18 +3,13 @@
 Name: 	 maxima
 Version: 5.9.3
 
-Release: 2%{?dist}.1
+Release: 3%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
 Source:	 http://dl.sourceforge.net/sourceforge/maxima/maxima-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# add ppc when lisps are available:
-#  (clisp: http://bugzilla.redhat.com/bugzilla/166347) 
-#  (gcl:   http://bugzilla.redhat.com/bugzilla/167952)
-#  (sbcl:  https://bugzilla.redhat.com/bugzilla/177029)
-#ExclusiveArch: %{ix86} x86_64 
-ExclusiveArch: ppc
+ExclusiveArch: %{ix86} x86_64 ppc
 
 %ifarch %{ix86}
 %define _enable_cmucl --enable-cmucl
@@ -29,8 +24,9 @@
 
 %ifarch ppc
 %define default_lisp sbcl
+# clisp: http://bugzilla.redhat.com/bugzilla/166347
 #define _enable_clisp --enable-clisp 
-#define _enable_cmucl --enable-cmucl 
+# gcl:   http://bugzilla.redhat.com/bugzilla/167952
 #define _enable_gcl --enable-gcl 
 %define _enable_sbcl --enable-sbcl 
 %endif
@@ -113,8 +109,7 @@
 Summary: Maxima compiled with clisp
 Group:	 Applications/Engineering
 BuildRequires: clisp-devel
-#define clisp_ver %{expand:%%(clisp --version | head -n 1 | cut -d' ' -f3 )}
-Requires: clisp %{?clisp_ver: >= %{clisp_ver}}
+Requires: clisp
 Requires: %{name} = %{version}
 Obsoletes: maxima-exec-clisp < %{version}-%{release}
 Provides: %{name}-runtime = %{version}
@@ -371,6 +366,9 @@
 
 
 %changelog
+* Mon Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-3 
+- respin, using new ppc bootstrap
+
 * Fri Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-2.1
 - try ppc build against sbcl
 



From fedora-extras-commits at redhat.com  Fri Apr 28 17:24:27 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 28 Apr 2006 10:24:27 -0700
Subject: rpms/maxima/FC-5 maxima.spec,1.22,1.23
Message-ID: <200604281724.k3SHOTaI009342@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9323

Modified Files:
	maxima.spec 
Log Message:
* Mon Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-3 
- respin, using new ppc bootstrap



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-5/maxima.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- maxima.spec	28 Apr 2006 12:31:19 -0000	1.22
+++ maxima.spec	28 Apr 2006 17:24:27 -0000	1.23
@@ -1,24 +1,15 @@
 
-%if "%{?fedora}" > "4"
-# See http://bugzilla.redhat.com/bugzilla/187647
-%define setarch_hack 1
-%endif
-
 Summary: Symbolic Computation Program
 Name: 	 maxima
 Version: 5.9.3
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
 Source:	 http://dl.sourceforge.net/sourceforge/maxima/maxima-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# add ppc when lisps are available:
-#  (clisp: http://bugzilla.redhat.com/bugzilla/166347) 
-#  (gcl:   http://bugzilla.redhat.com/bugzilla/167952)
-#  (sbcl:  https://bugzilla.redhat.com/bugzilla/177029)
-ExclusiveArch: %{ix86} x86_64 
+ExclusiveArch: %{ix86} x86_64 ppc
 
 %ifarch %{ix86}
 %define _enable_cmucl --enable-cmucl
@@ -32,11 +23,12 @@
 %endif
 
 %ifarch ppc
-#define default_lisp sbcl
+%define default_lisp sbcl
+# clisp: http://bugzilla.redhat.com/bugzilla/166347
 #define _enable_clisp --enable-clisp 
-#define _enable_cmucl --enable-cmucl 
+# gcl:   http://bugzilla.redhat.com/bugzilla/167952
 #define _enable_gcl --enable-gcl 
-#define _enable_sbcl --enable-sbcl 
+%define _enable_sbcl --enable-sbcl 
 %endif
 
 Source1: maxima.png
@@ -117,8 +109,7 @@
 Summary: Maxima compiled with clisp
 Group:	 Applications/Engineering
 BuildRequires: clisp-devel
-#define clisp_ver %{expand:%%(clisp --version | head -n 1 | cut -d' ' -f3 )}
-Requires: clisp %{?clisp_ver: >= %{clisp_ver}}
+Requires: clisp
 Requires: %{name} = %{version}
 Obsoletes: maxima-exec-clisp < %{version}-%{release}
 Provides: %{name}-runtime = %{version}
@@ -145,7 +136,9 @@
 Group:   Applications/Engineering
 BuildRequires: gcl
 Requires:  %{name} = %{version}
-%if "%{?setarch_hack}" == "1"
+%if "%{?fedora}" > "4"
+# See http://bugzilla.redhat.com/bugzilla/187647
+%define setarch_hack 1
 BuildRequires: setarch
 Requires:  setarch
 %endif
@@ -373,6 +366,12 @@
 
 
 %changelog
+* Mon Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-3 
+- respin, using new ppc bootstrap
+
+* Fri Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-2.1
+- try ppc build against sbcl
+
 * Wed Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-2
 - use setarch -X hack to allow runtime-gcl to function (#187647)
 - respin for sbcl-0.9.12



From fedora-extras-commits at redhat.com  Fri Apr 28 17:24:48 2006
From: fedora-extras-commits at redhat.com (Rex Dieter (rdieter))
Date: Fri, 28 Apr 2006 10:24:48 -0700
Subject: rpms/maxima/FC-4 maxima.spec,1.20,1.21
Message-ID: <200604281724.k3SHOoka009403@cvs-int.fedora.redhat.com>

Author: rdieter

Update of /cvs/extras/rpms/maxima/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9386

Modified Files:
	maxima.spec 
Log Message:
* Mon Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-3 
- respin, using new ppc bootstrap



Index: maxima.spec
===================================================================
RCS file: /cvs/extras/rpms/maxima/FC-4/maxima.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- maxima.spec	28 Apr 2006 12:36:11 -0000	1.20
+++ maxima.spec	28 Apr 2006 17:24:48 -0000	1.21
@@ -1,24 +1,15 @@
 
-%if "%{?fedora}" > "4"
-# See http://bugzilla.redhat.com/bugzilla/187647
-%define setarch_hack 1
-%endif
-
 Summary: Symbolic Computation Program
 Name: 	 maxima
 Version: 5.9.3
 
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group:	 Applications/Engineering 
 URL: 	 http://maxima.sourceforge.net/
 Source:	 http://dl.sourceforge.net/sourceforge/maxima/maxima-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# add ppc when lisps are available:
-#  (clisp: http://bugzilla.redhat.com/bugzilla/166347) 
-#  (gcl:   http://bugzilla.redhat.com/bugzilla/167952)
-#  (sbcl:  https://bugzilla.redhat.com/bugzilla/177029)
-ExclusiveArch: %{ix86} x86_64 
+ExclusiveArch: %{ix86} x86_64 ppc
 
 %ifarch %{ix86}
 %define _enable_cmucl --enable-cmucl
@@ -32,11 +23,12 @@
 %endif
 
 %ifarch ppc
-#define default_lisp sbcl
+%define default_lisp sbcl
+# clisp: http://bugzilla.redhat.com/bugzilla/166347
 #define _enable_clisp --enable-clisp 
-#define _enable_cmucl --enable-cmucl 
+# gcl:   http://bugzilla.redhat.com/bugzilla/167952
 #define _enable_gcl --enable-gcl 
-#define _enable_sbcl --enable-sbcl 
+%define _enable_sbcl --enable-sbcl 
 %endif
 
 Source1: maxima.png
@@ -117,8 +109,7 @@
 Summary: Maxima compiled with clisp
 Group:	 Applications/Engineering
 BuildRequires: clisp-devel
-#define clisp_ver %{expand:%%(clisp --version | head -n 1 | cut -d' ' -f3 )}
-Requires: clisp %{?clisp_ver: >= %{clisp_ver}}
+Requires: clisp
 Requires: %{name} = %{version}
 Obsoletes: maxima-exec-clisp < %{version}-%{release}
 Provides: %{name}-runtime = %{version}
@@ -145,7 +136,9 @@
 Group:   Applications/Engineering
 BuildRequires: gcl
 Requires:  %{name} = %{version}
-%if "%{?setarch_hack}" == "1"
+%if "%{?fedora}" > "4"
+# See http://bugzilla.redhat.com/bugzilla/187647
+%define setarch_hack 1
 BuildRequires: setarch
 Requires:  setarch
 %endif
@@ -373,6 +366,12 @@
 
 
 %changelog
+* Mon Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-3 
+- respin, using new ppc bootstrap
+
+* Fri Apr 28 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-2.1
+- try ppc build against sbcl
+
 * Wed Apr 26 2006 Rex Dieter <rexdieter[AT]users.sf.net> 5.9.3-2
 - use setarch -X hack to allow runtime-gcl to function (#187647)
 - respin for sbcl-0.9.12



From fedora-extras-commits at redhat.com  Fri Apr 28 18:20:13 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Fri, 28 Apr 2006 11:20:13 -0700
Subject: rpms/rman - New directory
Message-ID: <200604281820.k3SIKFq3011842@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/rman
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11821/rman

Log Message:
Directory /cvs/extras/rpms/rman added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 28 18:20:14 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Fri, 28 Apr 2006 11:20:14 -0700
Subject: rpms/rman/devel - New directory
Message-ID: <200604281820.k3SIKG1Q011845@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/rman/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11821/rman/devel

Log Message:
Directory /cvs/extras/rpms/rman/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 28 18:20:48 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Fri, 28 Apr 2006 11:20:48 -0700
Subject: rpms/rman Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604281820.k3SIKo7K011901@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/rman
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11868

Added Files:
	Makefile import.log 
Log Message:
Setup of module rman


--- NEW FILE Makefile ---
# Top level Makefile for module rman
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 28 18:20:49 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Fri, 28 Apr 2006 11:20:49 -0700
Subject: rpms/rman/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200604281820.k3SIKp2a011904@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/rman/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11868/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module rman


--- 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 Apr 28 18:21:39 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Fri, 28 Apr 2006 11:21:39 -0700
Subject: rpms/rman import.log,1.1,1.2
Message-ID: <200604281821.k3SILfnZ011965@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/rman
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11932

Modified Files:
	import.log 
Log Message:
auto-import rman-3.2-2 on branch devel from rman-3.2-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/rman/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	28 Apr 2006 18:20:48 -0000	1.1
+++ import.log	28 Apr 2006 18:21:39 -0000	1.2
@@ -0,0 +1 @@
+rman-3_2-2:HEAD:rman-3.2-2.src.rpm:1146248483



From fedora-extras-commits at redhat.com  Fri Apr 28 18:21:40 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Fri, 28 Apr 2006 11:21:40 -0700
Subject: rpms/rman/devel rman.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200604281821.k3SILgt6011970@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/rman/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11932/devel

Modified Files:
	.cvsignore sources 
Added Files:
	rman.spec 
Log Message:
auto-import rman-3.2-2 on branch devel from rman-3.2-2.src.rpm


--- NEW FILE rman.spec ---
Name:		rman
Version:	3.2 
Release:	2%{?dist}
Summary:	Converts man pages to various other formats

Group:		System Environment/Base
License:	Artistic
URL:		http://sourceforge.net/projects/polyglotman
Source0:	http://easynews.dl.sourceforge.net/sourceforge/polyglotman/rman-3.2.tar.gz
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%description
Parse formatted man pages and man page source from most flavors of UNIX.
Convert to HTML, ASCII, TkMan, DocBook, and other formats.


%prep
%setup -q


%build
cp Makefile Makefile.orig
cat Makefile.orig \
|sed s?"^BINDIR =.*"?"BINDIR = %{_bindir}"? \
|sed s?"^MANDIR =.*"?"MANDIR = %{_mandir}/man1"? \
|sed s?"^CFLAGS =.*"?"CFLAGS = %{optflags} -finline-functions"? \
> Makefile

make %{?_smp_mflags}

pushd contrib
for file in `ls`; do
sed -i 's?^#!/usr/local/bin/perl?#!%{_bindir}/perl?' ${file}
sed -i 's?\r??' ${file}
done
popd


%install
rm -rf %{buildroot}
install -d -m755 %{buildroot}%{_bindir}
install -d -m755 %{buildroot}%{_mandir}/man1
install -m755 rman %{buildroot}%{_bindir}/
install -m644 rman.1 %{buildroot}%{_mandir}/man1/


%clean
rm -rf %buildroot


%files
%defattr(-,root,root,-)
%doc CHANGES README-rman.txt rman.html contrib
%{_bindir}/rman
%{_mandir}/man1/*



%changelog
* Fri Apr 28 2006 Michael A. Peters <mpeters at mac.com> - 3.2-2
- Package the contrib directory with %%doc

* Thu Apr 27 2006 Michael A. Peters <mpeters at mac.com> - 3.2-1
- Initial packaging for Fedora Extras


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/rman/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Apr 2006 18:20:49 -0000	1.1
+++ .cvsignore	28 Apr 2006 18:21:40 -0000	1.2
@@ -0,0 +1 @@
+rman-3.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/rman/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Apr 2006 18:20:49 -0000	1.1
+++ sources	28 Apr 2006 18:21:40 -0000	1.2
@@ -0,0 +1 @@
+6d1d67641c6d042595a96a62340d3cc6  rman-3.2.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 28 18:25:08 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Fri, 28 Apr 2006 11:25:08 -0700
Subject: owners owners.list,1.912,1.913
Message-ID: <200604281825.k3SIPA45012051@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12027

Modified Files:
	owners.list 
Log Message:
initial ownership of rman



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.912
retrieving revision 1.913
diff -u -r1.912 -r1.913
--- owners.list	28 Apr 2006 08:27:03 -0000	1.912
+++ owners.list	28 Apr 2006 18:25:07 -0000	1.913
@@ -1349,6 +1349,7 @@
 Fedora Extras|rinetd|TCP redirection server|kaboom at oobleck.net|extras-qa at fedoraproject.org|
 Fedora Extras|rkhunter|Rootkit Hunter scans for rootkits, backdoors and local exploits|tamaster at pobox.com|extras-qa at fedoraproject.org|
 Fedora Extras|rlog|Runtime Logging for C++|lemenkov at newmail.ru|extras-qa at fedoraproject.org|
+Fedora Extras|rman|Converts man pages to various other formats|mpeters at mac.com|extras-qa at fedoraproject.org|
 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|



From fedora-extras-commits at redhat.com  Fri Apr 28 18:47:37 2006
From: fedora-extras-commits at redhat.com (Quentin Spencer (qspencer))
Date: Fri, 28 Apr 2006 11:47:37 -0700
Subject: rpms/octave-forge/devel octave-forge-2006.03.17-octcdf.patch, NONE, 
	1.1 octave-forge.spec, 1.22, 1.23
Message-ID: <200604281847.k3SIldJG012163@cvs-int.fedora.redhat.com>

Author: qspencer

Update of /cvs/extras/rpms/octave-forge/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12143

Modified Files:
	octave-forge.spec 
Added Files:
	octave-forge-2006.03.17-octcdf.patch 
Log Message:
Add patch for octcdf and associated specfile changes.

octave-forge-2006.03.17-octcdf.patch:

--- NEW FILE octave-forge-2006.03.17-octcdf.patch ---
Index: main/octcdf/Makefile
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/octcdf/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- main/octcdf/Makefile        19 Apr 2006 19:09:51 -0000      1.6
+++ main/octcdf/Makefile        28 Apr 2006 17:51:17 -0000
@@ -34,7 +34,7 @@
        RM = rm -f
 endif

-NCTARGET = ov-netcdf.oct
+NCTARGET = netcdf.oct

 NCSOURCES = ov-netcdf.cc ov-ncfile.cc ov-ncvar.cc ov-ncatt.cc ov-ncdim.cc
 OBJECTS = $(patsubst %.cc,%.o,$(NCSOURCES))
Index: main/octcdf/configure.add
===================================================================
RCS file: /cvsroot/octave/octave-forge/main/octcdf/configure.add,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- main/octcdf/configure.add	15 Dec 2005 22:13:52 -0000	1.2
+++ main/octcdf/configure.add	25 Apr 2006 16:35:01 -0000	1.3
@@ -11,34 +11,29 @@
     OCTCDF_LIBS="$LDFLAGS"
     OCTCDF_CFLAGS="$CPPFLAGS"
 
-        dnl checking for opendap support
+    dnl first checking for opendap support
 
-        AC_MSG_CHECKING([for nc-dap])
+    AC_MSG_CHECKING([for nc-dap])
 
-        if ncdap-config --version > /dev/null 2>&1; then
+    if ncdap-config --version > /dev/null 2>&1; then
+          AC_MSG_RESULT([yes])
           OCTCDF_LIBS="$OCTCDF_LIBS `ncdap-config --libs`"
           OCTCDF_CFLAGS="$OCTCDF_CFLAGS `ncdap-config --cflags`"
-          HAVE_NCDAP=yes
-          AC_MSG_RESULT([yes])
-        else
-          HAVE_NCDAP=no
-          AC_MSG_RESULT([no])          
-        fi
-
 
-    dnl Checking if the NetCDF library exists. 
+          HAVE_NETCDF=yes
+    else
+          AC_MSG_RESULT([no])          
 
-    AC_CHECK_LIB(netcdf,nc_open, HAVE_NETCDF=yes, HAVE_NETCDF=no,)
+          dnl if no opendap, checking if the NetCDF library exists. 
 
-    if test $HAVE_NETCDF = yes ; then
-       OCTCDF_LIBS="$OCTCDF_LIBS -lnetcdf"
-    fi
+          AC_CHECK_LIB(netcdf,nc_open, HAVE_NETCDF=yes, HAVE_NETCDF=no,)
 
-    dnl if we don't have nc-dap then we have to check for netcdf.h
-    dnl otherwise it is already given by ncdap-config --cflags
+          if test $HAVE_NETCDF = yes ; then
+            OCTCDF_LIBS="$OCTCDF_LIBS -lnetcdf"
 
-    if test $HAVE_NCDAP = no ; then
-      AC_CHECK_HEADER(netcdf.h, HAVE_NETCDF=yes, HAVE_NETCDF=no)
+            dnl we have the libraries, no we have also the headers?
+            AC_CHECK_HEADER(netcdf.h, HAVE_NETCDF=yes, HAVE_NETCDF=no)
+          fi
     fi
 
     if test $HAVE_NETCDF = yes ; then


Index: octave-forge.spec
===================================================================
RCS file: /cvs/extras/rpms/octave-forge/devel/octave-forge.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- octave-forge.spec	19 Apr 2006 21:21:07 -0000	1.22
+++ octave-forge.spec	28 Apr 2006 18:47:37 -0000	1.23
@@ -1,6 +1,6 @@
 Name:           octave-forge
 Version:        2006.03.17
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Contributed functions for octave
 
 Group:          Applications/Engineering
@@ -16,12 +16,14 @@
 ## rm -Rf octave-forge-%{version}
 Source0:        %{name}-%{version}.patched.tar.gz
 Patch0:         %{name}-system.patch.gz
+Patch1:         %{name}-2006.03.17-octcdf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:	octave >= 2.9.5 ImageMagick
 BuildRequires:  octave-devel tetex gcc-gfortran ginac-devel qhull-devel
-BuildRequires:  ImageMagick-c++-devel netcdf-devel pcre-devel gsl-devel
+BuildRequires:  ImageMagick-c++-devel libnc-dap-devel pcre-devel gsl-devel
 BuildRequires:  libjpeg-devel libpng-devel ncurses-devel libtermcap-devel
+BuildRequires:  autoconf
 
 %description
 Octave-forge is a community project for collaborative development of
@@ -34,11 +36,13 @@
 %prep
 %setup -q
 %patch0 -p1
+# The following patch requires regenerating the configure script
+%patch1 -p0
 # The sparse matrix functions are in octave 2.9.x so don't install them
 touch main/sparse/NOINSTALL
 
 %build
-export CPPFLAGS=-I%{_includedir}/netcdf-3
+./autogen.sh
 %configure
 make %{?_smp_mflags}
 
@@ -69,6 +73,10 @@
 
 
 %changelog
+* Thu Apr 27 2006 Quentin Spencer <qspencer at users.sf.net> 2006.03.17-3
+- Add fixes for octcdf (from the author), which changes the dependency
+  from netcdf to libnc-dap. (This requires autoconf temporarily.)
+
 * Wed Apr 19 2006 Quentin Spencer <qspencer at users.sf.net> 2006.03.17-2
 - New release for octave 2.9.5.
 - Patch added for incompatibilities between octave 2.9.4 and 2.9.5.



From fedora-extras-commits at redhat.com  Fri Apr 28 19:05:19 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 28 Apr 2006 12:05:19 -0700
Subject: rpms/wings/FC-5 wings.spec,1.1,1.2
Message-ID: <200604281905.k3SJ5LdI014905@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/wings/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14888

Modified Files:
	wings.spec 
Log Message:



Index: wings.spec
===================================================================
RCS file: /cvs/extras/rpms/wings/FC-5/wings.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wings.spec	28 Apr 2006 08:03:26 -0000	1.1
+++ wings.spec	28 Apr 2006 19:05:19 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           wings
 Version:        0.98.32b
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        3D Subdivision Modeler
 
 Group:          Applications/Multimedia



From fedora-extras-commits at redhat.com  Fri Apr 28 19:37:12 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Fri, 28 Apr 2006 12:37:12 -0700
Subject: rpms/rman/devel rman.spec,1.1,1.2
Message-ID: <200604281937.k3SJbEpc015190@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/rman/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15143/devel

Modified Files:
	rman.spec 
Log Message:
Minor cleanup to do a couple things better



Index: rman.spec
===================================================================
RCS file: /cvs/extras/rpms/rman/devel/rman.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rman.spec	28 Apr 2006 18:21:40 -0000	1.1
+++ rman.spec	28 Apr 2006 19:37:12 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		rman
 Version:	3.2 
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Converts man pages to various other formats
 
 Group:		System Environment/Base
@@ -29,7 +29,7 @@
 make %{?_smp_mflags}
 
 pushd contrib
-for file in `ls`; do
+for file in `find . -type f`; do
 sed -i 's?^#!/usr/local/bin/perl?#!%{_bindir}/perl?' ${file}
 sed -i 's?\r??' ${file}
 done
@@ -50,13 +50,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES README-rman.txt rman.html contrib
+%doc CHANGES README-rman.txt rman.html contrib/
 %{_bindir}/rman
 %{_mandir}/man1/*
 
 
 
 %changelog
+* Fri Apr 28 2006 Michael A. Peters <mpeters at mac.com> - 3.2-3
+- Minor cleanup to packaging
+
 * Fri Apr 28 2006 Michael A. Peters <mpeters at mac.com> - 3.2-2
 - Package the contrib directory with %%doc
 



From fedora-extras-commits at redhat.com  Fri Apr 28 19:37:06 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Fri, 28 Apr 2006 12:37:06 -0700
Subject: rpms/rman/FC-4 rman.spec,1.1,1.2
Message-ID: <200604281937.k3SJbc5L015193@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/rman/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15143/FC-4

Modified Files:
	rman.spec 
Log Message:
Minor cleanup to do a couple things better



Index: rman.spec
===================================================================
RCS file: /cvs/extras/rpms/rman/FC-4/rman.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rman.spec	28 Apr 2006 18:21:40 -0000	1.1
+++ rman.spec	28 Apr 2006 19:37:06 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		rman
 Version:	3.2 
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Converts man pages to various other formats
 
 Group:		System Environment/Base
@@ -29,7 +29,7 @@
 make %{?_smp_mflags}
 
 pushd contrib
-for file in `ls`; do
+for file in `find . -type f`; do
 sed -i 's?^#!/usr/local/bin/perl?#!%{_bindir}/perl?' ${file}
 sed -i 's?\r??' ${file}
 done
@@ -50,13 +50,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES README-rman.txt rman.html contrib
+%doc CHANGES README-rman.txt rman.html contrib/
 %{_bindir}/rman
 %{_mandir}/man1/*
 
 
 
 %changelog
+* Fri Apr 28 2006 Michael A. Peters <mpeters at mac.com> - 3.2-3
+- Minor cleanup to packaging
+
 * Fri Apr 28 2006 Michael A. Peters <mpeters at mac.com> - 3.2-2
 - Package the contrib directory with %%doc
 



From fedora-extras-commits at redhat.com  Fri Apr 28 19:37:07 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Fri, 28 Apr 2006 12:37:07 -0700
Subject: rpms/rman/FC-5 rman.spec,1.1,1.2
Message-ID: <200604281937.k3SJbduu015196@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/rman/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15143/FC-5

Modified Files:
	rman.spec 
Log Message:
Minor cleanup to do a couple things better



Index: rman.spec
===================================================================
RCS file: /cvs/extras/rpms/rman/FC-5/rman.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rman.spec	28 Apr 2006 18:21:40 -0000	1.1
+++ rman.spec	28 Apr 2006 19:37:06 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		rman
 Version:	3.2 
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Converts man pages to various other formats
 
 Group:		System Environment/Base
@@ -29,7 +29,7 @@
 make %{?_smp_mflags}
 
 pushd contrib
-for file in `ls`; do
+for file in `find . -type f`; do
 sed -i 's?^#!/usr/local/bin/perl?#!%{_bindir}/perl?' ${file}
 sed -i 's?\r??' ${file}
 done
@@ -50,13 +50,16 @@
 
 %files
 %defattr(-,root,root,-)
-%doc CHANGES README-rman.txt rman.html contrib
+%doc CHANGES README-rman.txt rman.html contrib/
 %{_bindir}/rman
 %{_mandir}/man1/*
 
 
 
 %changelog
+* Fri Apr 28 2006 Michael A. Peters <mpeters at mac.com> - 3.2-3
+- Minor cleanup to packaging
+
 * Fri Apr 28 2006 Michael A. Peters <mpeters at mac.com> - 3.2-2
 - Package the contrib directory with %%doc
 



From fedora-extras-commits at redhat.com  Fri Apr 28 19:58:17 2006
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri, 28 Apr 2006 12:58:17 -0700
Subject: rpms/zile/devel zile.spec,1.3,1.4
Message-ID: <200604281958.k3SJwJ1J015431@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/zile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15369/devel

Modified Files:
	zile.spec 
Log Message:
* Fri Apr 28 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-2
- Bump to rebuild



Index: zile.spec
===================================================================
RCS file: /cvs/extras/rpms/zile/devel/zile.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zile.spec	27 Apr 2006 11:59:33 -0000	1.3
+++ zile.spec	28 Apr 2006 19:58:17 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Zile Is Lossy Emacs
 Name: zile
 Version: 2.2.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Editors
 URL: http://zile.sourceforge.net/
@@ -46,6 +46,9 @@
 %{_datadir}/zile/
 
 %changelog
+* Fri Apr 28 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-2
+- Bump to rebuild
+
 * Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-1
 - Bump to latest release.
 



From fedora-extras-commits at redhat.com  Fri Apr 28 19:58:10 2006
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri, 28 Apr 2006 12:58:10 -0700
Subject: rpms/zile/FC-3 zile.spec,1.3,1.4
Message-ID: <200604281958.k3SJwgER015434@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/zile/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15369/FC-3

Modified Files:
	zile.spec 
Log Message:
* Fri Apr 28 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-2
- Bump to rebuild



Index: zile.spec
===================================================================
RCS file: /cvs/extras/rpms/zile/FC-3/zile.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zile.spec	27 Apr 2006 11:59:31 -0000	1.3
+++ zile.spec	28 Apr 2006 19:58:10 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Zile Is Lossy Emacs
 Name: zile
 Version: 2.2.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Editors
 URL: http://zile.sourceforge.net/
@@ -46,6 +46,9 @@
 %{_datadir}/zile/
 
 %changelog
+* Fri Apr 28 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-2
+- Bump to rebuild
+
 * Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-1
 - Bump to latest release.
 



From fedora-extras-commits at redhat.com  Fri Apr 28 19:58:11 2006
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri, 28 Apr 2006 12:58:11 -0700
Subject: rpms/zile/FC-4 zile.spec,1.3,1.4
Message-ID: <200604281958.k3SJwhw9015437@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/zile/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15369/FC-4

Modified Files:
	zile.spec 
Log Message:
* Fri Apr 28 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-2
- Bump to rebuild



Index: zile.spec
===================================================================
RCS file: /cvs/extras/rpms/zile/FC-4/zile.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zile.spec	27 Apr 2006 11:59:32 -0000	1.3
+++ zile.spec	28 Apr 2006 19:58:10 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Zile Is Lossy Emacs
 Name: zile
 Version: 2.2.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Editors
 URL: http://zile.sourceforge.net/
@@ -46,6 +46,9 @@
 %{_datadir}/zile/
 
 %changelog
+* Fri Apr 28 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-2
+- Bump to rebuild
+
 * Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-1
 - Bump to latest release.
 



From fedora-extras-commits at redhat.com  Fri Apr 28 19:58:11 2006
From: fedora-extras-commits at redhat.com (Jeff Carlson (jcarlson))
Date: Fri, 28 Apr 2006 12:58:11 -0700
Subject: rpms/zile/FC-5 zile.spec,1.3,1.4
Message-ID: <200604281958.k3SJwhT3015440@cvs-int.fedora.redhat.com>

Author: jcarlson

Update of /cvs/extras/rpms/zile/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15369/FC-5

Modified Files:
	zile.spec 
Log Message:
* Fri Apr 28 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-2
- Bump to rebuild



Index: zile.spec
===================================================================
RCS file: /cvs/extras/rpms/zile/FC-5/zile.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- zile.spec	27 Apr 2006 11:59:32 -0000	1.3
+++ zile.spec	28 Apr 2006 19:58:11 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Zile Is Lossy Emacs
 Name: zile
 Version: 2.2.13
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPL
 Group: Applications/Editors
 URL: http://zile.sourceforge.net/
@@ -46,6 +46,9 @@
 %{_datadir}/zile/
 
 %changelog
+* Fri Apr 28 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-2
+- Bump to rebuild
+
 * Thu Apr 27 2006 Jeff Carlson <jeff at ultimateevil.org> - 2.2.13-1
 - Bump to latest release.
 



From fedora-extras-commits at redhat.com  Fri Apr 28 21:45:27 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Fri, 28 Apr 2006 14:45:27 -0700
Subject: rpms/qof/devel qof-x86_64.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 qof.spec, 1.12, 1.13 sources, 1.3, 1.4 qof-0.6.1-build.patch,
	1.1, NONE qof-dependencies.patch, 1.1, NONE
Message-ID: <200604282145.k3SLjTkq020490@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/qof/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20464

Modified Files:
	.cvsignore qof.spec sources 
Added Files:
	qof-x86_64.patch 
Removed Files:
	qof-0.6.1-build.patch qof-dependencies.patch 
Log Message:
- Update to qof 0.6.4.
- Drop patches which are no longer relevant upstream.
- Patch a small compile problem in building tests on x86_64.


qof-x86_64.patch:

--- NEW FILE qof-x86_64.patch ---
Index: qof-0.6.4/qof/test/test-date.c
===================================================================
--- qof-0.6.4.orig/qof/test/test-date.c
+++ qof-0.6.4/qof/test/test-date.c
@@ -93,8 +93,8 @@ check_conversion (const char * str, Time
   if ((expected_ts.tv_sec != ts.tv_sec) || (expected_ts.tv_nsec != ts.tv_nsec)) 
   {
     fprintf (stderr, 
-             "\nmis-converted \"%s\" to %lld.%09ld seconds\n"
-             "\twas expecting %lld.%09ld seconds\n", 
+             "\nmis-converted \"%s\" to %" G_GUINT64_FORMAT ".%09ld seconds\n"
+             "\twas expecting %" G_GUINT64_FORMAT ".%09ld seconds\n", 
              str, ts.tv_sec, ts.tv_nsec, 
              expected_ts.tv_sec, expected_ts.tv_nsec); 
     failure ("misconverted timespec");


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qof/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Jan 2006 18:50:01 -0000	1.3
+++ .cvsignore	28 Apr 2006 21:45:27 -0000	1.4
@@ -1 +1 @@
-qof-0.6.1.tar.gz
+qof-0.6.4.tar.gz


Index: qof.spec
===================================================================
RCS file: /cvs/extras/rpms/qof/devel/qof.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- qof.spec	13 Feb 2006 18:09:57 -0000	1.12
+++ qof.spec	28 Apr 2006 21:45:27 -0000	1.13
@@ -1,14 +1,13 @@
 Name:           qof
-Version:        0.6.1
-Release:        2%{?dist}
+Version:        0.6.4
+Release:        1%{?dist}
 Summary:        Query engine library for C objects
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://qof.sf.net
 Source0:        http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:		qof-0.6.1-build.patch
-Patch1:		qof-dependencies.patch
+Patch0: qof-x86_64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libxml2-devel
@@ -17,8 +16,6 @@
 BuildRequires: intltool
 # qof doesn't ship with pre-built documentation
 BuildRequires: doxygen
-# Patch1 modifies configure.in so we have to use autoconf
-BuildRequires: autoconf
 
 %description
 QOF - The Query Object Framework is a C library that provides a query engine
@@ -67,10 +64,8 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
-autoconf --force
 %configure --disable-static
 make
 
@@ -119,6 +114,10 @@
 %doc html
 
 %changelog
+* Mon Apr 17 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.6.4-1
+- Update to qof 0.6.4.
+- Patch a small compile problem in building tests on x86_64.
+  
 * Mon Feb 13 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.6.1-2
 - Bump and rebuild for FC5.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qof/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Jan 2006 18:50:01 -0000	1.3
+++ sources	28 Apr 2006 21:45:27 -0000	1.4
@@ -1 +1 @@
-2a1c4b231fb03e49d5d9237dc6698c3e  qof-0.6.1.tar.gz
+555787c7ea06a3412ff9119fe4127886  qof-0.6.4.tar.gz


--- qof-0.6.1-build.patch DELETED ---


--- qof-dependencies.patch DELETED ---



From fedora-extras-commits at redhat.com  Fri Apr 28 21:57:36 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Fri, 28 Apr 2006 14:57:36 -0700
Subject: owners owners.list,1.913,1.914
Message-ID: <200604282157.k3SLvcjv020591@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20574

Modified Files:
	owners.list 
Log Message:
Added ccrtp


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.913
retrieving revision 1.914
diff -u -r1.913 -r1.914
--- owners.list	28 Apr 2006 18:25:07 -0000	1.913
+++ owners.list	28 Apr 2006 21:57:36 -0000	1.914
@@ -113,6 +113,7 @@
 Fedora Extras|ccache|Compiler cache|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|CCfits|A C++ interface for cfitsio|spr at astrax.fis.ucm.es|extras-qa at fedoraproject.org|
 Fedora Extras|ccid|Generic USB CCID smart card reader driver|ville.skytta at iki.fi|extras-qa at fedoraproject.org|ludovic.rousseau at gmail.com
+Fedora Extras|ccrtp|Common C++ class framework for RTP/RTCP|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|cd-discid|utility to get CDDB discid information|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|cdiff|Diff readability enhancer for color terminals|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|cdlabelgen|Generates frontcards and traycards for inserting in CD jewelcases.|harald at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Apr 28 21:57:43 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 14:57:43 -0700
Subject: rpms/perl-HTTP-Proxy/devel .cvsignore, 1.3, 1.4 perl-HTTP-Proxy.spec,
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200604282157.k3SLvjpI020618@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-HTTP-Proxy/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20597

Modified Files:
	.cvsignore perl-HTTP-Proxy.spec sources 
Log Message:
Update 1.19.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Mar 2006 10:53:27 -0000	1.3
+++ .cvsignore	28 Apr 2006 21:57:42 -0000	1.4
@@ -1 +1 @@
-HTTP-Proxy-0.18.tar.gz
+HTTP-Proxy-0.19.tar.gz


Index: perl-HTTP-Proxy.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/devel/perl-HTTP-Proxy.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-HTTP-Proxy.spec	22 Mar 2006 10:53:27 -0000	1.3
+++ perl-HTTP-Proxy.spec	28 Apr 2006 21:57:42 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           perl-HTTP-Proxy
-Version:        0.18
+Version:        0.19
 Release:        1%{?dist}
 Summary:        A pure Perl HTTP proxy
 
@@ -52,10 +52,13 @@
 %defattr(-,root,root,-)
 %doc Changes README eg/
 %{perl_vendorlib}/HTTP/
-%{_mandir}/man3/*.3*
+%{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Fri Apr 28 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.19-1
+- Update to 0.19.
+
 * Wed Mar 22 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.18-1
 - Update to 0.18.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Mar 2006 10:53:27 -0000	1.3
+++ sources	28 Apr 2006 21:57:42 -0000	1.4
@@ -1 +1 @@
-9a7e180caf7d6854cd3dad3fe0f21365  HTTP-Proxy-0.18.tar.gz
+e702b597f546ad88eed9e3f285f1fff1  HTTP-Proxy-0.19.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 28 21:59:05 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Fri, 28 Apr 2006 14:59:05 -0700
Subject: owners owners.list,1.914,1.915
Message-ID: <200604282159.k3SLx7EX020688@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20669

Modified Files:
	owners.list 
Log Message:
taking ownership of doctorj



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.914
retrieving revision 1.915
diff -u -r1.914 -r1.915
--- owners.list	28 Apr 2006 21:57:36 -0000	1.914
+++ owners.list	28 Apr 2006 21:59:05 -0000	1.915
@@ -204,7 +204,7 @@
 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 auroralinux.org|extras-qa at fedoraproject.org|
 Fedora Extras|docbook2X|Convert docbook into man and Texinfo|pertusus at free.fr|extras-qa at fedoraproject.org|
-Fedora Extras|doctorj|Java source code analyzer|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|doctorj|Java source code analyzer|michael at knox.net.nz|extras-qa at fedoraproject.org|
 Fedora Extras|dogtail|GUI test tool and automation framework|zcerza at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|dosbox|An x86/DOS emulator with sound/graphics|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|doulos-fonts|Doulos SIL fonts|roozbeh at farsiweb.info|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Fri Apr 28 22:00:38 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Fri, 28 Apr 2006 15:00:38 -0700
Subject: rpms/ccrtp - New directory
Message-ID: <200604282200.k3SM0ewk020774@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ccrtp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20753/ccrtp

Log Message:
Directory /cvs/extras/rpms/ccrtp added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 28 22:00:38 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Fri, 28 Apr 2006 15:00:38 -0700
Subject: rpms/ccrtp/devel - New directory
Message-ID: <200604282200.k3SM0efJ020777@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ccrtp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20753/ccrtp/devel

Log Message:
Directory /cvs/extras/rpms/ccrtp/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 28 22:00:59 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Fri, 28 Apr 2006 15:00:59 -0700
Subject: rpms/ccrtp/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200604282201.k3SM11Hb020838@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ccrtp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20799/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module ccrtp


--- 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 Apr 28 22:00:58 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Fri, 28 Apr 2006 15:00:58 -0700
Subject: rpms/ccrtp Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604282201.k3SM10YD020835@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ccrtp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20799

Added Files:
	Makefile import.log 
Log Message:
Setup of module ccrtp


--- NEW FILE Makefile ---
# Top level Makefile for module ccrtp
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 28 22:02:16 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Fri, 28 Apr 2006 15:02:16 -0700
Subject: rpms/ccrtp/devel ccrtp.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200604282202.k3SM2Idh023021@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ccrtp/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22981/devel

Modified Files:
	.cvsignore sources 
Added Files:
	ccrtp.spec 
Log Message:
auto-import ccrtp-1.3.7-1 on branch devel from ccrtp-1.3.7-1.src.rpm


--- NEW FILE ccrtp.spec ---
Summary: Common C++ class framework for RTP/RTCP
Name: ccrtp
Version: 1.3.7
Release: 1%{?dist}
License: GPL
Group: System Environment/Libraries
Source0: http://download.sourceforge.net/gnutelephony/ccrtp-%{version}.tar.gz
URL: http://www.gnu.org/software/commoncpp/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: commoncpp2-devel

%description
ccRTP is a generic, extensible and efficient C++ framework for
developing applications based on the Real-Time Transport Protocol
(RTP) from the IETF. It is based on Common C++ and provides a full
RTP/RTCP stack for sending and receiving of realtime data by the use
of send and receive packet queues. ccRTP supports unicast,
multi-unicast and multicast, manages multiple sources, handles RTCP
automatically, supports different threading models and is generic as
for underlying network and transport protocols.

%package devel
Summary: Header files and libraries for %{name} development
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: pkgconfig, commoncpp2-devel
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info

%description devel
The %{name}-devel package contains the header files and libraries needed
to develop programs that use the %{name} library.


%prep
%setup -q
chmod 644 src/ccrtp/rtp.h

%build
%configure \
	--disable-static
%{__make} %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=%{buildroot}
rm -f %{buildroot}%{_infodir}/dir
find %{buildroot} -name '*.la' -exec rm -f {} \;

%clean
rm -rf $RPM_BUILD_ROOT

%post -p /sbin/ldconfig

%post devel
/sbin/install-info %{_infodir}/ccrtp.info* %{_infodir}/dir

%preun devel
if [ $1 = 0 ]; then
    /sbin/install-info --delete %{_infodir}/ccrtp.info* %{_infodir}/dir
fi

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc COPYING README COPYING.addendum
%{_libdir}/*.so.*

%files devel
%defattr(-,root,root,-)
%doc doc/html
%dir %{_includedir}/ccrtp
%{_includedir}/ccrtp/*
%{_libdir}/*.so
%{_libdir}/pkgconfig/libccrtp1.pc
%{_infodir}/ccrtp.info*

%changelog
* Mon Apr 24 2006 Andreas Thienemann <andreas at bawue.net> 1.3.7-1
- Updated to 1.3.7

* Fri Feb 03 2006 Andreas Thienemann <andreas at bawue.net> 1.3.6-1
- Initial spec.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ccrtp/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Apr 2006 22:00:59 -0000	1.1
+++ .cvsignore	28 Apr 2006 22:02:16 -0000	1.2
@@ -0,0 +1 @@
+ccrtp-1.3.7.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ccrtp/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Apr 2006 22:00:59 -0000	1.1
+++ sources	28 Apr 2006 22:02:16 -0000	1.2
@@ -0,0 +1 @@
+6621be1852bd90c3dbbafa895618d8f0  ccrtp-1.3.7.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 28 22:02:14 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Fri, 28 Apr 2006 15:02:14 -0700
Subject: rpms/ccrtp import.log,1.1,1.2
Message-ID: <200604282202.k3SM2mP2023045@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/ccrtp
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22981

Modified Files:
	import.log 
Log Message:
auto-import ccrtp-1.3.7-1 on branch devel from ccrtp-1.3.7-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/ccrtp/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	28 Apr 2006 22:00:58 -0000	1.1
+++ import.log	28 Apr 2006 22:02:13 -0000	1.2
@@ -0,0 +1 @@
+ccrtp-1_3_7-1:HEAD:ccrtp-1.3.7-1.src.rpm:1146261715



From fedora-extras-commits at redhat.com  Fri Apr 28 22:03:11 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 28 Apr 2006 15:03:11 -0700
Subject: rpms/gauche - New directory
Message-ID: <200604282203.k3SM3DGM023143@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23113/gauche

Log Message:
Directory /cvs/extras/rpms/gauche added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 28 22:03:12 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 28 Apr 2006 15:03:12 -0700
Subject: rpms/gauche/devel - New directory
Message-ID: <200604282203.k3SM3EUP023149@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23113/gauche/devel

Log Message:
Directory /cvs/extras/rpms/gauche/devel added to the repository




From fedora-extras-commits at redhat.com  Fri Apr 28 22:03:28 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 28 Apr 2006 15:03:28 -0700
Subject: rpms/gauche Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604282203.k3SM3UL9023229@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23182

Added Files:
	Makefile import.log 
Log Message:
Setup of module gauche


--- NEW FILE Makefile ---
# Top level Makefile for module gauche
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 28 22:03:28 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 15:03:28 -0700
Subject: rpms/perl-Error/devel .cvsignore, 1.3, 1.4 perl-Error.spec, 1.7,
	1.8 sources, 1.3, 1.4
Message-ID: <200604282203.k3SM3Ufo023235@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Error/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23188

Modified Files:
	.cvsignore perl-Error.spec sources 
Log Message:
Update to 0.15009.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Apr 2006 21:00:40 -0000	1.3
+++ .cvsignore	28 Apr 2006 22:03:28 -0000	1.4
@@ -1 +1 @@
-Error-0.15008.tar.gz
+Error-0.15009.tar.gz


Index: perl-Error.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/devel/perl-Error.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Error.spec	19 Apr 2006 21:00:40 -0000	1.7
+++ perl-Error.spec	28 Apr 2006 22:03:28 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           perl-Error
-Version:        0.15008
+Version:        0.15009
 Release:        1%{?dist}
 Summary:        Error Perl module
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Fri Apr 28 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.15009-1
+- Update to 0.15009.
+
 * Wed Apr 19 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.15008-1
 - Update to 0.15008.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Apr 2006 21:00:40 -0000	1.3
+++ sources	28 Apr 2006 22:03:28 -0000	1.4
@@ -1 +1 @@
-e66c11a0b7a501391643321f86f2171e  Error-0.15008.tar.gz
+758e3e2024d883095d500d91e3a65b8d  Error-0.15009.tar.gz



From fedora-extras-commits at redhat.com  Fri Apr 28 22:03:28 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 28 Apr 2006 15:03:28 -0700
Subject: rpms/gauche/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604282203.k3SM3UqO023236@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23182/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gauche


--- 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 Apr 28 22:05:17 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 28 Apr 2006 15:05:17 -0700
Subject: rpms/gauche import.log,1.1,1.2
Message-ID: <200604282205.k3SM5J9Z023351@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23317

Modified Files:
	import.log 
Log Message:
auto-import gauche-0.8.7-3.fc5 on branch devel from gauche-0.8.7-3.fc5.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gauche/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	28 Apr 2006 22:03:28 -0000	1.1
+++ import.log	28 Apr 2006 22:05:17 -0000	1.2
@@ -0,0 +1 @@
+gauche-0_8_7-3_fc5:HEAD:gauche-0.8.7-3.fc5.src.rpm:1146261910



From fedora-extras-commits at redhat.com  Fri Apr 28 22:05:18 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 28 Apr 2006 15:05:18 -0700
Subject: rpms/gauche/devel gauche-jp.patch, NONE, 1.1 gauche.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604282205.k3SM5KWG023358@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23317/devel

Modified Files:
	.cvsignore sources 
Added Files:
	gauche-jp.patch gauche.spec 
Log Message:
auto-import gauche-0.8.7-3.fc5 on branch devel from gauche-0.8.7-3.fc5.src.rpm

gauche-jp.patch:

--- NEW FILE gauche-jp.patch ---
--- Gauche-0.8.7/doc/modgauche.texi.jp	2006-04-27 21:24:49.000000000 +0200
+++ Gauche-0.8.7/doc/modgauche.texi	2006-04-27 21:25:30.000000000 +0200
@@ -8048,7 +8048,7 @@
 it finds your code referring to undefined variable.  In such case,
 you can give a list of symbols to the @var{allow-undefined}
 keyword argument; the test will excludes them from the check.
- at c COMMON
+ at c JP
 ????????????????????????????????????????????????????????
 ??????????????????????????????????????????????????????????
 ??????????????????????????????????????????????????????????
@@ -8056,7 +8056,7 @@
 ????????????????????????????????????????????????????????????
 ??????????????????????????????????????????????????????????????
 @var{allow-undefined}??????????????????????????????
- at c JP
+ at c COMMON
 @end defun
 
 @defun test-start module-name


--- NEW FILE gauche.spec ---
Name:		gauche
Version:	0.8.7
Release:	3%{?dist}
Summary:	Scheme script interpreter with multibyte character handling

Group:		Development/Languages
License:	BSD
URL:		http://www.shiro.dreamhost.com/scheme/gauche
Source:		http://download.sourceforge.net/gauche/Gauche-0.8.7.tgz
Patch0:		gauche-jp.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	gdbm-devel
BuildRequires:	texinfo
Requires(post):	/sbin/install-info, /sbin/ldconfig
Requires(postun): /sbin/install-info, /sbin/ldconfig


%description
Gauche is a Scheme interpreter conforming Revised^5 Report on
Algorithmic Language Scheme.  It is designed for rapid development of
daily tools like system management and text processing.  It can handle
multibyte character strings natively.


%package devel
Summary:	Development files for Gauche
Group:		Development/Languages
Requires:	%{name} = %{version}-%{release}

%description devel
Development files for Gauche.


%prep
%setup -q -n Gauche-%{version}
%patch0 -p1


%build
%configure --with-rpath=no --enable-threads=pthreads --enable-multibyte=utf-8
perl -pi -e "s|POSTINSTALL = TARGETLIB=|POSTINSTALL = TARGETLIB=$RPM_BUILD_ROOT/|" src/Makefile
%ifarch i386 i586 i686
LD_LIBRARY_PATH=`pwd`/src make %{?_smp_mflags} OPTFLAGS="-fomit-frame-pointer"
%else
LD_LIBRARY_PATH=`pwd`/src make %{?_smp_mflags}
%endif


%install
rm -fr $RPM_BUILD_ROOT
LD_LIBRARY_PATH=`pwd`/src make DESTDIR=$RPM_BUILD_ROOT install-pkg
LD_LIBRARY_PATH=`pwd`/src make DESTDIR=$RPM_BUILD_ROOT install-doc

# correct permissions
chmod -R u+w $RPM_BUILD_ROOT
chmod 0644 examples/grep.scm
chmod 0644 ext/template.*

# for some reason the libraries are not correctly installed
mv src/libgauche.so* $RPM_BUILD_ROOT%{_libdir}

# remove japanese doc
rm -f $RPM_BUILD_ROOT%{_infodir}/gauche-refj.*

touch $RPM_BUILD_ROOT%{_datadir}/gauche/%{version}/lib/slibcat

# this things go into the doc of the devel package
rm -f $RPM_BUILD_ROOT%{_datadir}/gauche/%{version}/template*
rm -f $RPM_BUILD_ROOT%{_datadir}/gauche/%{version}/aclocal*

# make .c files readable for debuginfo
find -name '*.c' | xargs chmod 0644


%check
cd src; LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} make test


%clean
rm -fr $RPM_BUILD_ROOT


%post
/sbin/install-info %{_infodir}/gauche-refe.info %{_infodir}/dir 2>/dev/null || :
/sbin/ldconfig
# creates slib catalog, if possible.
/usr/bin/gosh -u slib -e "(require 'logical)" -e "(exit 0)" > /dev/null 2>&1 || echo


%postun
if [ $1 = 0 ]; then
  /sbin/install-info --delete %{_infodir}/gauche-refe.info %{_infodir}/dir 2>/dev/null || :
fi
/sbin/ldconfig


%files
%defattr(-,root,root,-)
%{_bindir}/gauche-cesconv
%{_bindir}/gauche-install
%{_bindir}/gauche-package
%{_bindir}/gosh
%{_libdir}/libgauche.so.*
%{_libdir}/gauche
%{_infodir}/*
%{_mandir}/man*/gosh*
%{_datadir}/gauche
%exclude %{_libdir}/gauche/%{version}/include
%ghost %{_datadir}/gauche/%{version}/lib/slibcat
%doc ChangeLog AUTHORS VERSION README NEWS examples COPYING


%files devel
%defattr(-,root,root,-)
%{_bindir}/gauche-config
%{_libdir}/libgauche.so
%{_libdir}/gauche/%{version}/include
%{_datadir}/aclocal/gauche.m4
%{_mandir}/man*/gauche-config*
%doc ext/template.*


%changelog
* Fri Apr 28 2006 Gerard Milmeister <gemi at bluewin.ch> - 0.8.7-3
- added %%check
- included COPYING file in %%doc

* Thu Apr 27 2006 Gerard Milmeister <gemi at bluewin.ch> - 0.8.7-2
- fixes to permissions
- patch to fix jp problem in texinfo file

* Fri Apr 21 2006 Gerard Milmeister <gemi at bluewin.ch> - 0.8.7-1
- new version 0.8.7

* Sun Nov  6 2005 Gerard Milmeister <gemi at bluewin.ch> - 0.8.6-1
- New Version 0.8.6

* Fri Jul  1 2005 Gerard Milmeister <gemi at bluewin.ch> - 0.8.5-1
- New Version 0.8.5

* Wed Feb 23 2005 Gerard Milmeister <gemi at bluewin.ch> - 0:0.8.3-1
- New Version 0.8.3

* Sat Aug  7 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:0.8.1-0.fdr.1
- New Version 0.8.1

* Sun May 23 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:0.8-0.fdr.1
- New Version 0.8

* Fri Mar 19 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:0.7.4.2-0.fdr.1
- New Version 0.7.4.2

* Fri Mar 19 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:0.7.4.1-0.fdr.1
- New Version 0.7.4.1

* Sun Nov  9 2003 Gerard Milmeister <gemi at bluewin.ch> - 0:0.7.2-0.fdr.1
- First Fedora release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gauche/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	28 Apr 2006 22:03:28 -0000	1.1
+++ .cvsignore	28 Apr 2006 22:05:18 -0000	1.2
@@ -0,0 +1 @@
+Gauche-0.8.7.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gauche/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	28 Apr 2006 22:03:28 -0000	1.1
+++ sources	28 Apr 2006 22:05:18 -0000	1.2
@@ -0,0 +1 @@
+5c7cb6eba7455c9877aec884b0088a25  Gauche-0.8.7.tgz



From fedora-extras-commits at redhat.com  Fri Apr 28 23:01:36 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Fri, 28 Apr 2006 16:01:36 -0700
Subject: owners owners.list,1.915,1.916
Message-ID: <200604282302.k3SN2Abk030245@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30226

Modified Files:
	owners.list 
Log Message:
added gauche


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.915
retrieving revision 1.916
diff -u -r1.915 -r1.916
--- owners.list	28 Apr 2006 21:59:05 -0000	1.915
+++ owners.list	28 Apr 2006 23:01:36 -0000	1.916
@@ -312,6 +312,7 @@
 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|gambas|IDE based on a basic interpreter with object extensions|tcallawa at redhat.com|extras-qa at fedoraproject.org|
+Fedora Extras|gauche|Scheme script interpreter with multibyte character handling|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|gazpacho|Glade Interface Creator|icon at fedoraproject.org|extras-qa at fedoraproject.org|
 Fedora Extras|gc|C++ Garbage Collector|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|gcdmaster|A Gnome Disk-At-Once (DAO) Audio CD writer|denis at poolshark.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Apr 29 01:22:33 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 28 Apr 2006 18:22:33 -0700
Subject: rpms/git/devel .cvsignore, 1.25, 1.26 git.spec, 1.13, 1.14 sources, 
	1.25, 1.26
Message-ID: <200604290122.k3T1MZfb002537@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2516

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.3.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	20 Apr 2006 00:34:48 -0000	1.25
+++ .cvsignore	29 Apr 2006 01:22:33 -0000	1.26
@@ -1 +1 @@
-git-1.3.0.tar.gz
+git-1.3.1.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/devel/git.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- git.spec	20 Apr 2006 00:34:48 -0000	1.13
+++ git.spec	29 Apr 2006 01:22:33 -0000	1.14
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.3.0
+Version: 	1.3.1
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Fri Apr 28 2006 Chris Wright <chrisw at redhat.com> 1.3.1-1
+- git-1.3.1
+
 * Wed Apr 19 2006 Chris Wright <chrisw at redhat.com> 1.3.0-1
 - git-1.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/devel/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	20 Apr 2006 00:34:48 -0000	1.25
+++ sources	29 Apr 2006 01:22:33 -0000	1.26
@@ -1 +1 @@
-37137c9f87b0082fbf04e6b80a5144e2  git-1.3.0.tar.gz
+c925fd87f01f5ba638ff06d21578405b  git-1.3.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 29 01:24:12 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 28 Apr 2006 18:24:12 -0700
Subject: rpms/git/FC-5 .cvsignore, 1.25, 1.26 git.spec, 1.13, 1.14 sources, 
	1.25, 1.26
Message-ID: <200604290124.k3T1OEeS002615@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2594

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.3.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/FC-5/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	20 Apr 2006 00:36:33 -0000	1.25
+++ .cvsignore	29 Apr 2006 01:24:12 -0000	1.26
@@ -1 +1 @@
-git-1.3.0.tar.gz
+git-1.3.1.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/FC-5/git.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- git.spec	20 Apr 2006 00:36:33 -0000	1.13
+++ git.spec	29 Apr 2006 01:24:12 -0000	1.14
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.3.0
+Version: 	1.3.1
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Fri Apr 28 2006 Chris Wright <chrisw at redhat.com> 1.3.1-1
+- git-1.3.1
+
 * Wed Apr 19 2006 Chris Wright <chrisw at redhat.com> 1.3.0-1
 - git-1.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/FC-5/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	20 Apr 2006 00:36:33 -0000	1.25
+++ sources	29 Apr 2006 01:24:12 -0000	1.26
@@ -1 +1 @@
-37137c9f87b0082fbf04e6b80a5144e2  git-1.3.0.tar.gz
+c925fd87f01f5ba638ff06d21578405b  git-1.3.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 29 01:27:52 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 28 Apr 2006 18:27:52 -0700
Subject: rpms/git/FC-4 .cvsignore, 1.25, 1.26 git.spec, 1.13, 1.14 sources, 
	1.25, 1.26
Message-ID: <200604290127.k3T1Rsuo002709@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2688

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.3.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/FC-4/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	20 Apr 2006 00:37:58 -0000	1.25
+++ .cvsignore	29 Apr 2006 01:27:52 -0000	1.26
@@ -1 +1 @@
-git-1.3.0.tar.gz
+git-1.3.1.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/FC-4/git.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- git.spec	20 Apr 2006 00:37:58 -0000	1.13
+++ git.spec	29 Apr 2006 01:27:52 -0000	1.14
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.3.0
+Version: 	1.3.1
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Fri Apr 28 2006 Chris Wright <chrisw at redhat.com> 1.3.1-1
+- git-1.3.1
+
 * Wed Apr 19 2006 Chris Wright <chrisw at redhat.com> 1.3.0-1
 - git-1.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/FC-4/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	20 Apr 2006 00:37:58 -0000	1.25
+++ sources	29 Apr 2006 01:27:52 -0000	1.26
@@ -1 +1 @@
-37137c9f87b0082fbf04e6b80a5144e2  git-1.3.0.tar.gz
+c925fd87f01f5ba638ff06d21578405b  git-1.3.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 29 01:28:51 2006
From: fedora-extras-commits at redhat.com (Chris Wright (chrisw))
Date: Fri, 28 Apr 2006 18:28:51 -0700
Subject: rpms/git/FC-3 .cvsignore, 1.25, 1.26 git.spec, 1.13, 1.14 sources, 
	1.25, 1.26
Message-ID: <200604290128.k3T1Srup002785@cvs-int.fedora.redhat.com>

Author: chrisw

Update of /cvs/extras/rpms/git/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2764

Modified Files:
	.cvsignore git.spec sources 
Log Message:
Update to git-1.3.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/git/FC-3/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	20 Apr 2006 00:41:34 -0000	1.25
+++ .cvsignore	29 Apr 2006 01:28:51 -0000	1.26
@@ -1 +1 @@
-git-1.3.0.tar.gz
+git-1.3.1.tar.gz


Index: git.spec
===================================================================
RCS file: /cvs/extras/rpms/git/FC-3/git.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- git.spec	20 Apr 2006 00:41:34 -0000	1.13
+++ git.spec	29 Apr 2006 01:28:51 -0000	1.14
@@ -1,7 +1,7 @@
 # Pass --without docs to rpmbuild if you don't want the documentation
 # Pass --with email to rpmbuild if you want git-email (more perl dependencies)
 Name: 		git
-Version: 	1.3.0
+Version: 	1.3.1
 Release: 	1%{?dist}
 Summary:  	Git core and tools
 License: 	GPL
@@ -141,6 +141,9 @@
 %{!?_without_docs: %doc Documentation/*.html }
 
 %changelog
+* Fri Apr 28 2006 Chris Wright <chrisw at redhat.com> 1.3.1-1
+- git-1.3.1
+
 * Wed Apr 19 2006 Chris Wright <chrisw at redhat.com> 1.3.0-1
 - git-1.3.0
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/git/FC-3/sources,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- sources	20 Apr 2006 00:41:34 -0000	1.25
+++ sources	29 Apr 2006 01:28:51 -0000	1.26
@@ -1 +1 @@
-37137c9f87b0082fbf04e6b80a5144e2  git-1.3.0.tar.gz
+c925fd87f01f5ba638ff06d21578405b  git-1.3.1.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 29 01:39:29 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 18:39:29 -0700
Subject: rpms/perl-Email-Address/devel - New directory
Message-ID: <200604290139.k3T1dVjB002915@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-serv2891/perl-Email-Address/devel

Log Message:
Directory /cvs/extras/rpms/perl-Email-Address/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 29 01:39:28 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 18:39:28 -0700
Subject: rpms/perl-Email-Address - New directory
Message-ID: <200604290139.k3T1dUQb002912@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Address
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2891/perl-Email-Address

Log Message:
Directory /cvs/extras/rpms/perl-Email-Address added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 29 01:39:48 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 18:39:48 -0700
Subject: rpms/perl-Email-Address Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604290139.k3T1doHQ002968@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Address
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2937

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Email-Address


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Email-Address
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 29 01:39:49 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 18:39:49 -0700
Subject: rpms/perl-Email-Address/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200604290139.k3T1dpCa002971@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-serv2937/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Email-Address


--- 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 Apr 29 01:40:23 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 18:40:23 -0700
Subject: rpms/perl-Email-Address import.log,1.1,1.2
Message-ID: <200604290140.k3T1ePsI003040@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Address
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3006

Modified Files:
	import.log 
Log Message:
auto-import perl-Email-Address-1.80-1 on branch devel from perl-Email-Address-1.80-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Apr 2006 01:39:48 -0000	1.1
+++ import.log	29 Apr 2006 01:40:22 -0000	1.2
@@ -0,0 +1 @@
+perl-Email-Address-1_80-1:HEAD:perl-Email-Address-1.80-1.src.rpm:1146274814



From fedora-extras-commits at redhat.com  Sat Apr 29 01:40:23 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 18:40:23 -0700
Subject: rpms/perl-Email-Address/devel perl-Email-Address.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604290140.k3T1ePaR003045@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-serv3006/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Email-Address.spec 
Log Message:
auto-import perl-Email-Address-1.80-1 on branch devel from perl-Email-Address-1.80-1.src.rpm


--- NEW FILE perl-Email-Address.spec ---
Name:           perl-Email-Address
Version:        1.80
Release:        1%{?dist}
Summary:        RFC 2822 Address Parsing and Creation

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Email-Address/
Source0:        http://www.cpan.org/authors/id/C/CW/CWEST/Email-Address-%{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 class implements a complete RFC 2822 parser that locates email
addresses in strings and returns a list of "Email::Address" objects
found. Alternatley you may construct objects manually. The goal of this
software is to be correct, and very very fast.


%prep
%setup -q -n Email-Address-%{version}
%{__perl} -pi -e 's|^#!/usr/local/bin/perl\b|#!%{__perl}|' bench/ea-vs-ma.pl


%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
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README bench/
%{perl_vendorlib}/Email/
%{_mandir}/man3/*.3pm*


%changelog
* Thu Sep 08 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.80-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Apr 2006 01:39:48 -0000	1.1
+++ .cvsignore	29 Apr 2006 01:40:23 -0000	1.2
@@ -0,0 +1 @@
+Email-Address-1.80.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Address/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Apr 2006 01:39:48 -0000	1.1
+++ sources	29 Apr 2006 01:40:23 -0000	1.2
@@ -0,0 +1 @@
+b57726d9915a502bc6b52966217a453e  Email-Address-1.80.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 29 01:41:19 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 18:41:19 -0700
Subject: rpms/perl-Email-MessageID - New directory
Message-ID: <200604290141.k3T1fL83003149@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MessageID
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3123/perl-Email-MessageID

Log Message:
Directory /cvs/extras/rpms/perl-Email-MessageID added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 29 01:41:20 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 18:41:20 -0700
Subject: rpms/perl-Email-MessageID/devel - New directory
Message-ID: <200604290141.k3T1fMPj003152@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MessageID/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3123/perl-Email-MessageID/devel

Log Message:
Directory /cvs/extras/rpms/perl-Email-MessageID/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 29 01:41:36 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 18:41:36 -0700
Subject: rpms/perl-Email-MessageID Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604290141.k3T1fcSg003197@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MessageID
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3168

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Email-MessageID


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Email-MessageID
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 29 01:41:37 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 18:41:37 -0700
Subject: rpms/perl-Email-MessageID/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604290141.k3T1fdqs003200@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MessageID/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3168/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Email-MessageID


--- 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 Apr 29 01:42:08 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 18:42:08 -0700
Subject: rpms/perl-Email-MessageID import.log,1.1,1.2
Message-ID: <200604290142.k3T1gAhQ003279@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MessageID
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3238

Modified Files:
	import.log 
Log Message:
auto-import perl-Email-MessageID-1.31-1 on branch devel from perl-Email-MessageID-1.31-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MessageID/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Apr 2006 01:41:36 -0000	1.1
+++ import.log	29 Apr 2006 01:42:08 -0000	1.2
@@ -0,0 +1 @@
+perl-Email-MessageID-1_31-1:HEAD:perl-Email-MessageID-1.31-1.src.rpm:1146274919



From fedora-extras-commits at redhat.com  Sat Apr 29 01:42:09 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 18:42:09 -0700
Subject: rpms/perl-Email-MessageID/devel perl-Email-MessageID.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604290142.k3T1gBPe003284@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MessageID/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3238/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Email-MessageID.spec 
Log Message:
auto-import perl-Email-MessageID-1.31-1 on branch devel from perl-Email-MessageID-1.31-1.src.rpm


--- NEW FILE perl-Email-MessageID.spec ---
Name:           perl-Email-MessageID
Version:        1.31
Release:        1%{?dist}
Summary:        Generate world unique message-ids

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Email-MessageID/
Source0:        http://www.cpan.org/authors/id/C/CW/CWEST/Email-MessageID-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(Email::Address) >= 1.80
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
Message-ids are optional, but highly recommended, headers that identify
a message uniquely. This software generates a unique message-id.


%prep
%setup -q -n Email-MessageID-%{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
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/Email/
%{_mandir}/man3/*.3pm*


%changelog
* Thu Sep 08 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.31-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MessageID/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Apr 2006 01:41:36 -0000	1.1
+++ .cvsignore	29 Apr 2006 01:42:09 -0000	1.2
@@ -0,0 +1 @@
+Email-MessageID-1.31.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MessageID/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Apr 2006 01:41:36 -0000	1.1
+++ sources	29 Apr 2006 01:42:09 -0000	1.2
@@ -0,0 +1 @@
+578b8edbc259566ab61466e780481129  Email-MessageID-1.31.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 29 01:43:22 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 18:43:22 -0700
Subject: rpms/perl-Email-Simple - New directory
Message-ID: <200604290143.k3T1hOb4003385@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Simple
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3359/perl-Email-Simple

Log Message:
Directory /cvs/extras/rpms/perl-Email-Simple added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 29 01:43:23 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 18:43:23 -0700
Subject: rpms/perl-Email-Simple/devel - New directory
Message-ID: <200604290143.k3T1hP9Y003388@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-serv3359/perl-Email-Simple/devel

Log Message:
Directory /cvs/extras/rpms/perl-Email-Simple/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 29 01:43:44 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 18:43:44 -0700
Subject: rpms/perl-Email-Simple Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604290143.k3T1hkbv003438@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Simple
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3405

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Email-Simple


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Email-Simple
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sat Apr 29 01:43:44 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 18:43:44 -0700
Subject: rpms/perl-Email-Simple/devel .cvsignore, NONE, 1.1 Makefile, NONE, 
	1.1 sources, NONE, 1.1
Message-ID: <200604290143.k3T1hk7v003441@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-serv3405/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Email-Simple


--- 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 Apr 29 01:44:14 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 18:44:14 -0700
Subject: rpms/perl-Email-Simple import.log,1.1,1.2
Message-ID: <200604290144.k3T1iGRQ003502@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-Simple
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3469

Modified Files:
	import.log 
Log Message:
auto-import perl-Email-Simple-1.92-1 on branch devel from perl-Email-Simple-1.92-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Simple/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Apr 2006 01:43:44 -0000	1.1
+++ import.log	29 Apr 2006 01:44:13 -0000	1.2
@@ -0,0 +1 @@
+perl-Email-Simple-1_92-1:HEAD:perl-Email-Simple-1.92-1.src.rpm:1146275045



From fedora-extras-commits at redhat.com  Sat Apr 29 01:44:14 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 18:44:14 -0700
Subject: rpms/perl-Email-Simple/devel perl-Email-Simple.spec, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604290144.k3T1iG7Z003507@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-serv3469/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Email-Simple.spec 
Log Message:
auto-import perl-Email-Simple-1.92-1 on branch devel from perl-Email-Simple-1.92-1.src.rpm


--- NEW FILE perl-Email-Simple.spec ---
Name:           perl-Email-Simple
Version:        1.92
Release:        1%{?dist}
Summary:        Simple parsing of RFC2822 message format and headers

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Email-Simple/
Source0:        http://www.cpan.org/authors/id/C/CW/CWEST/Email-Simple-%{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
"Email::Simple" is the first deliverable of the "Perl Email Project", a
reaction against the complexity and increasing bugginess of the
"Mail::*" modules. In contrast, "Email::*" modules are meant to be
simple to use and to maintain, pared to the bone, fast, minimal in their
external dependencies, and correct.


%prep
%setup -q -n Email-Simple-%{version}


%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
make %{?_smp_mflags}


%install
rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';'
chmod -R u+w $RPM_BUILD_ROOT/*


%check
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/Email/
%{_mandir}/man3/*.3pm*


%changelog
* Thu Sep 08 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.92-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Simple/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Apr 2006 01:43:44 -0000	1.1
+++ .cvsignore	29 Apr 2006 01:44:14 -0000	1.2
@@ -0,0 +1 @@
+Email-Simple-1.92.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-Simple/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Apr 2006 01:43:44 -0000	1.1
+++ sources	29 Apr 2006 01:44:14 -0000	1.2
@@ -0,0 +1 @@
+e0ac39068afca5fa62f633a31a98f813  Email-Simple-1.92.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 29 01:47:41 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 18:47:41 -0700
Subject: owners owners.list,1.916,1.917
Message-ID: <200604290147.k3T1lhM9003570@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3553

Modified Files:
	owners.list 
Log Message:
New packages:
- perl-Email-Address    (#190231)
- perl-Email-MessageID  (#190233)
- perl-Email-Simple     (#190232)



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.916
retrieving revision 1.917
diff -u -r1.916 -r1.917
--- owners.list	28 Apr 2006 23:01:36 -0000	1.916
+++ owners.list	29 Apr 2006 01:47:41 -0000	1.917
@@ -961,6 +961,9 @@
 Fedora Extras|perl-Digest-MD2|Perl interface to the MD2 Algorithm|paul at city-fan.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Digest-MD4|Perl interface to the MD4 Algorithm|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Digest-Nilsimsa|Perl interface to the Nilsima Algorithm|wtogami at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Email-Address|RFC 2822 Address Parsing and Creation|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Email-MessageID|Generate world unique message-ids|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Email-Simple|Simple parsing of RFC2822 message format and headers|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Error|Error Perl module|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Exception-Class|Declare hierarchies of exception classes|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Exporter-Lite|Lightweight exporting of variables|tcallawa at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Sat Apr 29 02:22:51 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Fri, 28 Apr 2006 19:22:51 -0700
Subject: rpms/doctorj/devel .cvsignore, 1.3, 1.4 Makefile, 1.3,
	1.4 doctorj.spec, 1.12, 1.13 sources, 1.3, 1.4
Message-ID: <200604290222.k3T2Mrq8006032@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/doctorj/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6009

Added Files:
	.cvsignore Makefile doctorj.spec sources 
Log Message:
updated version 



Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	29 Apr 2006 02:22:50 -0000	1.4
@@ -0,0 +1 @@
+doctorj-5.0.0.tar.gz


Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	29 Apr 2006 02:22:50 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: doctorj
+# $Id$
+NAME := doctorj
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I 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: doctorj.spec
===================================================================
RCS file: doctorj.spec
diff -N doctorj.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ doctorj.spec	29 Apr 2006 02:22:50 -0000	1.13
@@ -0,0 +1,72 @@
+Name:           doctorj
+Version:        5.0.0
+Release:        1%{?dist}
+Summary:        Java source code analyzer
+
+Group:          Development/Tools
+License:        LGPL
+URL:            http://doctorj.sourceforge.net/
+Source:         http://download.sf.net/doctorj/%{name}-%{version}.tar.gz
+BuildRequires:	java-1.4.2-gcj-compat-devel
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+%description
+DoctorJ analyzes Java code, in the following functional areas:
+documentation verification, statistics generation and syntax analysis.
+
+%prep
+%setup -q
+
+%build
+
+make %{?_smp_mflags}
+
+%install
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README
+%{_bindir}/doctorj
+%{_mandir}/man1/doctorj.1*
+%{_datadir}/%{name}
+
+%changelog
+* Sat Apr 29 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.0.0-1
+- Updated version
+
+* Fri May 20 2005 Ville Skytt?? <ville.skytta at iki.fi> - 4.0.2-7
+- Patch to fix x86_64 build.
+
+* Thu May 19 2005 Ville Skytt?? <ville.skytta at iki.fi> - 4.0.2-6
+- Rebuild.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 4.0.2-5
+- rebuilt
+
+* Sun Feb 13 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.0.2-4
+- Apply proper build fix from Michael Schwendt.
+
+* Sun Feb 13 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.0.2-3
+- Use compat-gcc-c++ to fix build on FC3+.
+
+* Sun May 30 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.0.2-0.fdr.2
+- Fix build on FC2, thanks to Michael Schwendt (bug 1025).
+
+* Fri Aug 29 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.0.2-0.fdr.1
+- Update to 4.0.2.
+
+* Thu Aug 14 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.0.1-0.fdr.1
+- Update to 4.0.1.
+- Clean up %%doc list.
+
+* Thu Mar 20 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.0.0-0.fdr.1
+- Update to 4.0.0 and to current Fedora guidelines.
+- compat-gcc-c++ no longer required.
+
+* Fri Feb  7 2003 Ville Skytt?? <ville.skytta at iki.fi> - 3.3.9-1.fedora.1
+- First Fedora release.


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	29 Apr 2006 02:22:50 -0000	1.4
@@ -0,0 +1 @@
+43a11e483ed3524e3709794be5e13267  doctorj-5.0.0.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 29 02:24:30 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 19:24:30 -0700
Subject: rpms/perl-Error/FC-4 .cvsignore, 1.3, 1.4 perl-Error.spec, 1.5,
	1.6 sources, 1.3, 1.4
Message-ID: <200604290224.k3T2OWSl006136@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Error/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6099/FC-4

Modified Files:
	.cvsignore perl-Error.spec sources 
Log Message:
Update to 0.15009.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Apr 2006 21:13:59 -0000	1.3
+++ .cvsignore	29 Apr 2006 02:24:30 -0000	1.4
@@ -1 +1 @@
-Error-0.15008.tar.gz
+Error-0.15009.tar.gz


Index: perl-Error.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/FC-4/perl-Error.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- perl-Error.spec	22 Apr 2006 21:13:59 -0000	1.5
+++ perl-Error.spec	29 Apr 2006 02:24:30 -0000	1.6
@@ -1,5 +1,5 @@
 Name:           perl-Error
-Version:        0.15008
+Version:        0.15009
 Release:        1%{?dist}
 Summary:        Error Perl module
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Fri Apr 28 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.15009-1
+- Update to 0.15009.
+
 * Wed Apr 19 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.15008-1
 - Update to 0.15008.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Apr 2006 21:13:59 -0000	1.3
+++ sources	29 Apr 2006 02:24:30 -0000	1.4
@@ -1 +1 @@
-e66c11a0b7a501391643321f86f2171e  Error-0.15008.tar.gz
+758e3e2024d883095d500d91e3a65b8d  Error-0.15009.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 29 02:24:31 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 19:24:31 -0700
Subject: rpms/perl-Error/FC-5 .cvsignore, 1.3, 1.4 perl-Error.spec, 1.7,
	1.8 sources, 1.3, 1.4
Message-ID: <200604290224.k3T2OXoZ006142@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-serv6099/FC-5

Modified Files:
	.cvsignore perl-Error.spec sources 
Log Message:
Update to 0.15009.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Apr 2006 21:14:00 -0000	1.3
+++ .cvsignore	29 Apr 2006 02:24:31 -0000	1.4
@@ -1 +1 @@
-Error-0.15008.tar.gz
+Error-0.15009.tar.gz


Index: perl-Error.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/FC-5/perl-Error.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- perl-Error.spec	22 Apr 2006 21:14:00 -0000	1.7
+++ perl-Error.spec	29 Apr 2006 02:24:31 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           perl-Error
-Version:        0.15008
+Version:        0.15009
 Release:        1%{?dist}
 Summary:        Error Perl module
 
@@ -48,6 +48,9 @@
 
 
 %changelog
+* Fri Apr 28 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.15009-1
+- Update to 0.15009.
+
 * Wed Apr 19 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.15008-1
 - Update to 0.15008.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Error/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Apr 2006 21:14:00 -0000	1.3
+++ sources	29 Apr 2006 02:24:31 -0000	1.4
@@ -1 +1 @@
-e66c11a0b7a501391643321f86f2171e  Error-0.15008.tar.gz
+758e3e2024d883095d500d91e3a65b8d  Error-0.15009.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 29 02:38:24 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Fri, 28 Apr 2006 19:38:24 -0700
Subject: rpms/doctorj/devel classpath_fix.patch,NONE,1.1
Message-ID: <200604290238.k3T2cQEv006282@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/doctorj/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6264

Added Files:
	classpath_fix.patch 
Log Message:
export classpath


classpath_fix.patch:

--- NEW FILE classpath_fix.patch ---
--- doctorj-5.0.0/bin/doctorj	2004-06-02 11:55:18.000000000 +1200
+++ doctorj-5.0.0/bin/doctorj.mjk	2006-04-29 14:30:23.000000000 +1200
@@ -21,6 +21,8 @@
    CLASSPATH="${jarfile}"
 fi
 
+export CLASSPATH
+
 DRJ_PROPERTIES="-Ddoctorj.dir=$prefix/share/doctorj $DRJ_PROPERTIES"
 
 java $DRJ_PROPERTIES org.incava.doctorj.Main "$@"



From fedora-extras-commits at redhat.com  Sat Apr 29 02:42:46 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Fri, 28 Apr 2006 19:42:46 -0700
Subject: rpms/doctorj/devel doctorj.spec,1.13,1.14
Message-ID: <200604290242.k3T2gnbs006309@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/doctorj/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6292

Modified Files:
	doctorj.spec 
Log Message:
added patch to export classpath, included requires on java-1.4.2-gcj-compat



Index: doctorj.spec
===================================================================
RCS file: /cvs/extras/rpms/doctorj/devel/doctorj.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- doctorj.spec	29 Apr 2006 02:22:50 -0000	1.13
+++ doctorj.spec	29 Apr 2006 02:42:46 -0000	1.14
@@ -1,12 +1,14 @@
 Name:           doctorj
 Version:        5.0.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Java source code analyzer
 
 Group:          Development/Tools
 License:        LGPL
 URL:            http://doctorj.sourceforge.net/
 Source:         http://download.sf.net/doctorj/%{name}-%{version}.tar.gz
+Patch0:		classpath_fix.patch
+Requires:	java-1.4.2-gcj-compat
 BuildRequires:	java-1.4.2-gcj-compat-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -16,6 +18,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 
@@ -36,6 +39,10 @@
 %{_datadir}/%{name}
 
 %changelog
+* Sat Apr 29 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.0.0-2
+- added patch to export classpath
+- added requires on java-1.4.2-gcj-compat
+
 * Sat Apr 29 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.0.0-1
 - Updated version
 



From fedora-extras-commits at redhat.com  Sat Apr 29 02:47:55 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Fri, 28 Apr 2006 19:47:55 -0700
Subject: rpms/doctorj/FC-4 classpath_fix.patch, NONE, 1.1 .cvsignore, 1.2,
	1.3 Makefile, 1.2, 1.3 doctorj.spec, 1.11, 1.12 sources, 1.2, 1.3
Message-ID: <200604290248.k3T2mRIu006427@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/doctorj/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6381/FC-4

Modified Files:
	.cvsignore Makefile doctorj.spec sources 
Added Files:
	classpath_fix.patch 
Log Message:
updated sources and patch to export classpath


classpath_fix.patch:

--- NEW FILE classpath_fix.patch ---
--- doctorj-5.0.0/bin/doctorj	2004-06-02 11:55:18.000000000 +1200
+++ doctorj-5.0.0/bin/doctorj.mjk	2006-04-29 14:30:23.000000000 +1200
@@ -21,6 +21,8 @@
    CLASSPATH="${jarfile}"
 fi
 
+export CLASSPATH
+
 DRJ_PROPERTIES="-Ddoctorj.dir=$prefix/share/doctorj $DRJ_PROPERTIES"
 
 java $DRJ_PROPERTIES org.incava.doctorj.Main "$@"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/doctorj/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:14:14 -0000	1.2
+++ .cvsignore	29 Apr 2006 02:47:55 -0000	1.3
@@ -1 +1 @@
-doctorj-4.0.2.tar.gz
+doctorj-5.0.0.tar.gz




Index: doctorj.spec
===================================================================
RCS file: /cvs/extras/rpms/doctorj/FC-4/doctorj.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- doctorj.spec	20 May 2005 20:40:13 -0000	1.11
+++ doctorj.spec	29 Apr 2006 02:47:55 -0000	1.12
@@ -1,57 +1,51 @@
 Name:           doctorj
-Version:        4.0.2
-Release:        7
+Version:        5.0.0
+Release:        2%{?dist}
 Summary:        Java source code analyzer
 
 Group:          Development/Tools
 License:        LGPL
 URL:            http://doctorj.sourceforge.net/
 Source:         http://download.sf.net/doctorj/%{name}-%{version}.tar.gz
-Patch0:         %{name}-improperseq.patch
-Patch1:         %{name}-yagol.patch
-Patch2:         %{name}-precision.patch
+Patch0:		classpath_fix.patch
+Requires:	java-1.4.2-gcj-compat
+BuildRequires:	java-1.4.2-gcj-compat-devel
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  flex
-
 %description
 DoctorJ analyzes Java code, in the following functional areas:
 documentation verification, statistics generation and syntax analysis.
 
-
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
-
 
 %build
-%configure
-make %{?_smp_mflags}
 
+make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
-
-
-%check || :
-# make check fails as of 4.0.2...
-
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
-
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING README TODO
+%doc AUTHORS ChangeLog COPYING README
 %{_bindir}/doctorj
 %{_mandir}/man1/doctorj.1*
-
+%{_datadir}/%{name}
 
 %changelog
+* Sat Apr 29 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.0.0-2
+- added patch to export classpath
+- added requires on java-1.4.2-gcj-compat
+
+* Sat Apr 29 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.0.0-1
+- Updated version
+
 * Fri May 20 2005 Ville Skytt?? <ville.skytta at iki.fi> - 4.0.2-7
 - Patch to fix x86_64 build.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/doctorj/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:14:14 -0000	1.2
+++ sources	29 Apr 2006 02:47:55 -0000	1.3
@@ -1 +1 @@
-612aac2fd1238fe0246e364e3f884c58  doctorj-4.0.2.tar.gz
+43a11e483ed3524e3709794be5e13267  doctorj-5.0.0.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 29 02:47:56 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Fri, 28 Apr 2006 19:47:56 -0700
Subject: rpms/doctorj/FC-5 .cvsignore, 1.3, 1.4 Makefile, 1.3,
	1.4 classpath_fix.patch, NONE, 1.1 doctorj.spec, 1.12,
	1.13 sources, 1.3, 1.4
Message-ID: <200604290248.k3T2mSIx006435@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/doctorj/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6381/FC-5

Added Files:
	.cvsignore Makefile classpath_fix.patch doctorj.spec sources 
Log Message:
updated sources and patch to export classpath



Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	29 Apr 2006 02:47:56 -0000	1.4
@@ -0,0 +1 @@
+doctorj-5.0.0.tar.gz


Index: Makefile
===================================================================
RCS file: Makefile
diff -N Makefile
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile	29 Apr 2006 02:47:56 -0000	1.4
@@ -0,0 +1,21 @@
+# Makefile for source rpm: doctorj
+# $Id$
+NAME := doctorj
+SPECFILE = $(firstword $(wildcard *.spec))
+
+define find-makefile-common
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+endef
+
+MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
+
+ifeq ($(MAKEFILE_COMMON),)
+# attept a checkout
+define checkout-makefile-common
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+endef
+
+MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
+endif
+
+include $(MAKEFILE_COMMON)

classpath_fix.patch:

--- NEW FILE classpath_fix.patch ---
--- doctorj-5.0.0/bin/doctorj	2004-06-02 11:55:18.000000000 +1200
+++ doctorj-5.0.0/bin/doctorj.mjk	2006-04-29 14:30:23.000000000 +1200
@@ -21,6 +21,8 @@
    CLASSPATH="${jarfile}"
 fi
 
+export CLASSPATH
+
 DRJ_PROPERTIES="-Ddoctorj.dir=$prefix/share/doctorj $DRJ_PROPERTIES"
 
 java $DRJ_PROPERTIES org.incava.doctorj.Main "$@"


Index: doctorj.spec
===================================================================
RCS file: doctorj.spec
diff -N doctorj.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ doctorj.spec	29 Apr 2006 02:47:56 -0000	1.13
@@ -0,0 +1,79 @@
+Name:           doctorj
+Version:        5.0.0
+Release:        2%{?dist}
+Summary:        Java source code analyzer
+
+Group:          Development/Tools
+License:        LGPL
+URL:            http://doctorj.sourceforge.net/
+Source:         http://download.sf.net/doctorj/%{name}-%{version}.tar.gz
+Patch0:		classpath_fix.patch
+Requires:	java-1.4.2-gcj-compat
+BuildRequires:	java-1.4.2-gcj-compat-devel
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+%description
+DoctorJ analyzes Java code, in the following functional areas:
+documentation verification, statistics generation and syntax analysis.
+
+%prep
+%setup -q
+%patch0 -p1
+
+%build
+
+make %{?_smp_mflags}
+
+%install
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
+
+%clean
+rm -rf %{buildroot}
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING README
+%{_bindir}/doctorj
+%{_mandir}/man1/doctorj.1*
+%{_datadir}/%{name}
+
+%changelog
+* Sat Apr 29 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.0.0-2
+- added patch to export classpath
+- added requires on java-1.4.2-gcj-compat
+
+* Sat Apr 29 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.0.0-1
+- Updated version
+
+* Fri May 20 2005 Ville Skytt?? <ville.skytta at iki.fi> - 4.0.2-7
+- Patch to fix x86_64 build.
+
+* Thu May 19 2005 Ville Skytt?? <ville.skytta at iki.fi> - 4.0.2-6
+- Rebuild.
+
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 4.0.2-5
+- rebuilt
+
+* Sun Feb 13 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.0.2-4
+- Apply proper build fix from Michael Schwendt.
+
+* Sun Feb 13 2005 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.0.2-3
+- Use compat-gcc-c++ to fix build on FC3+.
+
+* Sun May 30 2004 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.0.2-0.fdr.2
+- Fix build on FC2, thanks to Michael Schwendt (bug 1025).
+
+* Fri Aug 29 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.0.2-0.fdr.1
+- Update to 4.0.2.
+
+* Thu Aug 14 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.0.1-0.fdr.1
+- Update to 4.0.1.
+- Clean up %%doc list.
+
+* Thu Mar 20 2003 Ville Skytt?? <ville.skytta at iki.fi> - 0:4.0.0-0.fdr.1
+- Update to 4.0.0 and to current Fedora guidelines.
+- compat-gcc-c++ no longer required.
+
+* Fri Feb  7 2003 Ville Skytt?? <ville.skytta at iki.fi> - 3.3.9-1.fedora.1
+- First Fedora release.


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	29 Apr 2006 02:47:56 -0000	1.4
@@ -0,0 +1 @@
+43a11e483ed3524e3709794be5e13267  doctorj-5.0.0.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 29 03:09:03 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 20:09:03 -0700
Subject: rpms/perl-HTTP-Proxy/FC-4 .cvsignore, 1.3, 1.4 perl-HTTP-Proxy.spec,
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200604290309.k3T3951A008769@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-HTTP-Proxy/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8732/FC-4

Modified Files:
	.cvsignore perl-HTTP-Proxy.spec sources 
Log Message:
Update to 0.19.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Mar 2006 10:53:15 -0000	1.3
+++ .cvsignore	29 Apr 2006 03:09:03 -0000	1.4
@@ -1 +1 @@
-HTTP-Proxy-0.18.tar.gz
+HTTP-Proxy-0.19.tar.gz


Index: perl-HTTP-Proxy.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/FC-4/perl-HTTP-Proxy.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-HTTP-Proxy.spec	22 Mar 2006 10:53:15 -0000	1.3
+++ perl-HTTP-Proxy.spec	29 Apr 2006 03:09:03 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           perl-HTTP-Proxy
-Version:        0.18
+Version:        0.19
 Release:        1%{?dist}
 Summary:        A pure Perl HTTP proxy
 
@@ -52,10 +52,13 @@
 %defattr(-,root,root,-)
 %doc Changes README eg/
 %{perl_vendorlib}/HTTP/
-%{_mandir}/man3/*.3*
+%{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Fri Apr 28 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.19-1
+- Update to 0.19.
+
 * Wed Mar 22 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.18-1
 - Update to 0.18.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Mar 2006 10:53:15 -0000	1.3
+++ sources	29 Apr 2006 03:09:03 -0000	1.4
@@ -1 +1 @@
-9a7e180caf7d6854cd3dad3fe0f21365  HTTP-Proxy-0.18.tar.gz
+e702b597f546ad88eed9e3f285f1fff1  HTTP-Proxy-0.19.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 29 03:09:04 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 20:09:04 -0700
Subject: rpms/perl-HTTP-Proxy/FC-5 .cvsignore, 1.3, 1.4 perl-HTTP-Proxy.spec,
	1.3, 1.4 sources, 1.3, 1.4
Message-ID: <200604290309.k3T396Db008775@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-HTTP-Proxy/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8732/FC-5

Modified Files:
	.cvsignore perl-HTTP-Proxy.spec sources 
Log Message:
Update to 0.19.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	22 Mar 2006 10:53:21 -0000	1.3
+++ .cvsignore	29 Apr 2006 03:09:04 -0000	1.4
@@ -1 +1 @@
-HTTP-Proxy-0.18.tar.gz
+HTTP-Proxy-0.19.tar.gz


Index: perl-HTTP-Proxy.spec
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/FC-5/perl-HTTP-Proxy.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- perl-HTTP-Proxy.spec	22 Mar 2006 10:53:21 -0000	1.3
+++ perl-HTTP-Proxy.spec	29 Apr 2006 03:09:04 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           perl-HTTP-Proxy
-Version:        0.18
+Version:        0.19
 Release:        1%{?dist}
 Summary:        A pure Perl HTTP proxy
 
@@ -52,10 +52,13 @@
 %defattr(-,root,root,-)
 %doc Changes README eg/
 %{perl_vendorlib}/HTTP/
-%{_mandir}/man3/*.3*
+%{_mandir}/man3/*.3pm*
 
 
 %changelog
+* Fri Apr 28 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.19-1
+- Update to 0.19.
+
 * Wed Mar 22 2006 Jose Pedro Oliveira <jpo at di.uminho.pt> - 0.18-1
 - Update to 0.18.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-HTTP-Proxy/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	22 Mar 2006 10:53:21 -0000	1.3
+++ sources	29 Apr 2006 03:09:04 -0000	1.4
@@ -1 +1 @@
-9a7e180caf7d6854cd3dad3fe0f21365  HTTP-Proxy-0.18.tar.gz
+e702b597f546ad88eed9e3f285f1fff1  HTTP-Proxy-0.19.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 29 03:12:38 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 20:12:38 -0700
Subject: rpms/perl-Email-MIME-ContentType - New directory
Message-ID: <200604290312.k3T3CetE008921@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MIME-ContentType
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8900/perl-Email-MIME-ContentType

Log Message:
Directory /cvs/extras/rpms/perl-Email-MIME-ContentType added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 29 03:12:39 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 20:12:39 -0700
Subject: rpms/perl-Email-MIME-ContentType/devel - New directory
Message-ID: <200604290312.k3T3Cf0F008924@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-serv8900/perl-Email-MIME-ContentType/devel

Log Message:
Directory /cvs/extras/rpms/perl-Email-MIME-ContentType/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 29 03:12:58 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 20:12:58 -0700
Subject: rpms/perl-Email-MIME-ContentType Makefile, NONE, 1.1 import.log,
	NONE, 1.1
Message-ID: <200604290313.k3T3D0L4008973@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MIME-ContentType
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8945

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Email-MIME-ContentType


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Email-MIME-ContentType
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 29 03:12:58 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 20:12:58 -0700
Subject: rpms/perl-Email-MIME-ContentType/devel .cvsignore, NONE,
	1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
Message-ID: <200604290313.k3T3D0A9008976@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-serv8945/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Email-MIME-ContentType


--- 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 Apr 29 03:13:31 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 20:13:31 -0700
Subject: rpms/perl-Email-MIME-ContentType import.log,1.1,1.2
Message-ID: <200604290314.k3T3E4tw009045@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MIME-ContentType
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9010

Modified Files:
	import.log 
Log Message:
auto-import perl-Email-MIME-ContentType-1.01-1 on branch devel from perl-Email-MIME-ContentType-1.01-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-ContentType/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Apr 2006 03:12:58 -0000	1.1
+++ import.log	29 Apr 2006 03:13:31 -0000	1.2
@@ -0,0 +1 @@
+perl-Email-MIME-ContentType-1_01-1:HEAD:perl-Email-MIME-ContentType-1.01-1.src.rpm:1146280403



From fedora-extras-commits at redhat.com  Sat Apr 29 03:13:32 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 20:13:32 -0700
Subject: rpms/perl-Email-MIME-ContentType/devel
	perl-Email-MIME-ContentType.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604290314.k3T3E40o009049@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-serv9010/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Email-MIME-ContentType.spec 
Log Message:
auto-import perl-Email-MIME-ContentType-1.01-1 on branch devel from perl-Email-MIME-ContentType-1.01-1.src.rpm


--- NEW FILE perl-Email-MIME-ContentType.spec ---
Name:           perl-Email-MIME-ContentType
Version:        1.01
Release:        1%{?dist}
Summary:        Parse a MIME Content-Type Header

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Email-MIME-ContentType/
Source0:        http://www.cpan.org/authors/id/C/CW/CWEST/Email-MIME-ContentType-%{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 responsible for parsing email content type headers
according to section 5.1 of RFC 2045. It returns a hash as above, with
entries for the discrete type, the composite type, and a hash of
attributes.


%prep
%setup -q -n Email-MIME-ContentType-%{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
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/Email/
%{_mandir}/man3/*.3pm*


%changelog
* Thu Sep 08 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.01-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-ContentType/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Apr 2006 03:12:58 -0000	1.1
+++ .cvsignore	29 Apr 2006 03:13:32 -0000	1.2
@@ -0,0 +1 @@
+Email-MIME-ContentType-1.01.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-ContentType/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Apr 2006 03:12:58 -0000	1.1
+++ sources	29 Apr 2006 03:13:32 -0000	1.2
@@ -0,0 +1 @@
+1aa682d2841f5d568416772bbaede1c9  Email-MIME-ContentType-1.01.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 29 03:17:30 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 20:17:30 -0700
Subject: owners owners.list,1.917,1.918
Message-ID: <200604290317.k3T3HWJk009152@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9135

Modified Files:
	owners.list 
Log Message:
New package: perl-Email-MIME-ContentType (#190236)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.917
retrieving revision 1.918
diff -u -r1.917 -r1.918
--- owners.list	29 Apr 2006 01:47:41 -0000	1.917
+++ owners.list	29 Apr 2006 03:17:29 -0000	1.918
@@ -963,6 +963,7 @@
 Fedora Extras|perl-Digest-Nilsimsa|Perl interface to the Nilsima Algorithm|wtogami at redhat.com|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Email-Address|RFC 2822 Address Parsing and Creation|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Email-MessageID|Generate world unique message-ids|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Email-MIME-ContentType|Parse a MIME Content-Type Header|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Email-Simple|Simple parsing of RFC2822 message format and headers|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Error|Error Perl module|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Exception-Class|Declare hierarchies of exception classes|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Sat Apr 29 03:20:11 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 20:20:11 -0700
Subject: rpms/perl-Email-MIME-Encodings - New directory
Message-ID: <200604290320.k3T3KDaq009230@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MIME-Encodings
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9204/perl-Email-MIME-Encodings

Log Message:
Directory /cvs/extras/rpms/perl-Email-MIME-Encodings added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 29 03:20:12 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 20:20:12 -0700
Subject: rpms/perl-Email-MIME-Encodings/devel - New directory
Message-ID: <200604290320.k3T3KEbr009233@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MIME-Encodings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9204/perl-Email-MIME-Encodings/devel

Log Message:
Directory /cvs/extras/rpms/perl-Email-MIME-Encodings/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 29 03:20:28 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 20:20:28 -0700
Subject: rpms/perl-Email-MIME-Encodings Makefile, NONE, 1.1 import.log, NONE,
	1.1
Message-ID: <200604290320.k3T3KUca009282@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MIME-Encodings
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9249

Added Files:
	Makefile import.log 
Log Message:
Setup of module perl-Email-MIME-Encodings


--- NEW FILE Makefile ---
# Top level Makefile for module perl-Email-MIME-Encodings
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 29 03:20:29 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 20:20:29 -0700
Subject: rpms/perl-Email-MIME-Encodings/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200604290320.k3T3KV4O009285@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MIME-Encodings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9249/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module perl-Email-MIME-Encodings


--- 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 Apr 29 03:20:56 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 20:20:56 -0700
Subject: rpms/perl-Email-MIME-Encodings import.log,1.1,1.2
Message-ID: <200604290320.k3T3Kw5w009346@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MIME-Encodings
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9313

Modified Files:
	import.log 
Log Message:
auto-import perl-Email-MIME-Encodings-1.3-1 on branch devel from perl-Email-MIME-Encodings-1.3-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-Encodings/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Apr 2006 03:20:28 -0000	1.1
+++ import.log	29 Apr 2006 03:20:56 -0000	1.2
@@ -0,0 +1 @@
+perl-Email-MIME-Encodings-1_3-1:HEAD:perl-Email-MIME-Encodings-1.3-1.src.rpm:1146280847



From fedora-extras-commits at redhat.com  Sat Apr 29 03:20:56 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 20:20:56 -0700
Subject: rpms/perl-Email-MIME-Encodings/devel perl-Email-MIME-Encodings.spec,
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604290320.k3T3Kwg4009351@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/rpms/perl-Email-MIME-Encodings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9313/devel

Modified Files:
	.cvsignore sources 
Added Files:
	perl-Email-MIME-Encodings.spec 
Log Message:
auto-import perl-Email-MIME-Encodings-1.3-1 on branch devel from perl-Email-MIME-Encodings-1.3-1.src.rpm


--- NEW FILE perl-Email-MIME-Encodings.spec ---
Name:           perl-Email-MIME-Encodings
Version:        1.3
Release:        1%{?dist}
Summary:        Unified interface to MIME encoding and decoding

Group:          Development/Libraries
License:        GPL or Artistic
URL:            http://search.cpan.org/dist/Email-MIME-Encodings/
Source0:        http://www.cpan.org/authors/id/C/CW/CWEST/Email-MIME-Encodings-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildArch:      noarch
BuildRequires:  perl(MIME::Base64) >= 3.05
BuildRequires:  perl(MIME::QuotedPrint) >= 3.03
Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))

%description
This module simply wraps "MIME::Base64" and "MIME::QuotedPrint" so that
you can throw the contents of a "Content-Transfer-Encoding" header at
some text and have the right thing happen.


%prep
%setup -q -n Email-MIME-Encodings-%{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
make test


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc Changes README
%{perl_vendorlib}/Email/
%{_mandir}/man3/*.3pm*


%changelog
* Thu Sep 08 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.3-1
- First build.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-Encodings/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Apr 2006 03:20:28 -0000	1.1
+++ .cvsignore	29 Apr 2006 03:20:56 -0000	1.2
@@ -0,0 +1 @@
+Email-MIME-Encodings-1.3.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/perl-Email-MIME-Encodings/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Apr 2006 03:20:28 -0000	1.1
+++ sources	29 Apr 2006 03:20:56 -0000	1.2
@@ -0,0 +1 @@
+adb933af2ff9c3cc8e158bbdcf3d19e5  Email-MIME-Encodings-1.3.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 29 03:23:46 2006
From: fedora-extras-commits at redhat.com (Jose Pedro Oliveira (jpo))
Date: Fri, 28 Apr 2006 20:23:46 -0700
Subject: owners owners.list,1.918,1.919
Message-ID: <200604290323.k3T3Nm8i009418@cvs-int.fedora.redhat.com>

Author: jpo

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9401

Modified Files:
	owners.list 
Log Message:
New package: perl-Email-MIME-Encodings (#190237)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.918
retrieving revision 1.919
diff -u -r1.918 -r1.919
--- owners.list	29 Apr 2006 03:17:29 -0000	1.918
+++ owners.list	29 Apr 2006 03:23:45 -0000	1.919
@@ -964,6 +964,7 @@
 Fedora Extras|perl-Email-Address|RFC 2822 Address Parsing and Creation|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Email-MessageID|Generate world unique message-ids|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Email-MIME-ContentType|Parse a MIME Content-Type Header|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
+Fedora Extras|perl-Email-MIME-Encodings|Unified interface to MIME encoding and decoding|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Email-Simple|Simple parsing of RFC2822 message format and headers|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Error|Error Perl module|jpo at di.uminho.pt|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com
 Fedora Extras|perl-Exception-Class|Declare hierarchies of exception classes|steve at silug.org|extras-qa at fedoraproject.org|fedora-perl-devel-list at redhat.com



From fedora-extras-commits at redhat.com  Sat Apr 29 07:28:24 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 29 Apr 2006 00:28:24 -0700
Subject: comps comps-fe5.xml.in,1.39,1.40 comps-fe6.xml.in,1.2,1.3
Message-ID: <200604290728.k3T7SQ4h018797@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18778

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in 
Log Message:
added wings


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- comps-fe5.xml.in	21 Apr 2006 18:33:41 -0000	1.39
+++ comps-fe5.xml.in	29 Apr 2006 07:28:24 -0000	1.40
@@ -348,6 +348,7 @@
         <packagereq type="optional">skencil</packagereq>
         <packagereq type="optional">sodipodi</packagereq>
         <packagereq type="optional">tuxpaint</packagereq>
+        <packagereq type="optional">wings</packagereq>
     </packagelist>
   </group>
 


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- comps-fe6.xml.in	21 Apr 2006 18:33:41 -0000	1.2
+++ comps-fe6.xml.in	29 Apr 2006 07:28:24 -0000	1.3
@@ -348,6 +348,7 @@
         <packagereq type="optional">skencil</packagereq>
         <packagereq type="optional">sodipodi</packagereq>
         <packagereq type="optional">tuxpaint</packagereq>
+        <packagereq type="optional">wings</packagereq>
     </packagelist>
   </group>
 



From fedora-extras-commits at redhat.com  Sat Apr 29 07:33:52 2006
From: fedora-extras-commits at redhat.com (Jens Petersen (petersen))
Date: Sat, 29 Apr 2006 00:33:52 -0700
Subject: rpms/ghc/devel ghc.spec,1.12,1.13
Message-ID: <200604290733.k3T7Xsl6018864@cvs-int.fedora.redhat.com>

Author: petersen

Update of /cvs/extras/rpms/ghc/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18845

Modified Files:
	ghc.spec 
Log Message:
- buildrequire libXt-devel so that the X11 package and deps get built
  (Garrett Mitchener, #190201)



Index: ghc.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc/devel/ghc.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ghc.spec	21 Apr 2006 07:59:27 -0000	1.12
+++ ghc.spec	29 Apr 2006 07:33:52 -0000	1.13
@@ -6,7 +6,7 @@
 
 Name:		ghc
 Version:	6.4.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Glasgow Haskell Compilation system
 License:	BSD style
 Group:		Development/Languages
@@ -15,12 +15,14 @@
 Requires:	%{ghcver} = %{version}-%{release}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ghc, sed
-Buildrequires:  gmp-devel, readline-devel, libX11-devel, freeglut-devel, openal-devel
+Buildrequires:  gmp-devel, readline-devel
+Buildrequires:  libX11-devel, libXt-devel
+Buildrequires:  freeglut-devel, openal-devel
 %if %{build_doc}
-# haddock generates libraries/ docs
+# haddock generates docs in libraries
 Buildrequires: libxslt, docbook-style-xsl, haddock
 %endif
-Prefix: %{_prefix}
+Prefix:		%{_prefix}
 
 %description
 GHC is a state-of-the-art programming suite for Haskell, a purely
@@ -156,7 +158,11 @@
 %endif
 
 %changelog
-* Thu Apr 20 2006 Jens Petersen <petersen at redhat.com> - 6.4.2-1
+* Sat Apr 29 2006 Jens Petersen <petersen at redhat.com> - 6.4.2-2.fc6
+- buildrequire libXt-devel so that the X11 package and deps get built
+  (Garrett Mitchener, #190201)
+
+* Thu Apr 20 2006 Jens Petersen <petersen at redhat.com> - 6.4.2-1.fc6
 - update to 6.4.2 release
 
 * Thu Mar  2 2006 Jens Petersen <petersen at redhat.com> - 6.4.1-3.fc5



From fedora-extras-commits at redhat.com  Sat Apr 29 08:01:01 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sat, 29 Apr 2006 01:01:01 -0700
Subject: rpms/qgit/devel .cvsignore, 1.3, 1.4 qgit.spec, 1.3, 1.4 sources,
	1.3, 1.4
Message-ID: <200604290801.k3T8139i020857@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/qgit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19111

Modified Files:
	.cvsignore qgit.spec sources 
Log Message:
 - update to upstream version 1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qgit/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Mar 2006 16:46:45 -0000	1.3
+++ .cvsignore	29 Apr 2006 08:01:01 -0000	1.4
@@ -1 +1 @@
-qgit-1.1.1.tar.bz2
+qgit-1.2.tar.bz2


Index: qgit.spec
===================================================================
RCS file: /cvs/extras/rpms/qgit/devel/qgit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qgit.spec	19 Mar 2006 16:46:45 -0000	1.3
+++ qgit.spec	29 Apr 2006 08:01:01 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           qgit
-Version:        1.1.1
+Version:        1.2
 Release:        1%{?dist}
 Summary:        QGit is a git GUI repository browser
 
@@ -11,7 +11,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils, qt-devel
-Requires:       git-core >= 1.2.0
+Requires:       git-core >= 1.3.0
 
 %description
 With qgit you are able to browse revisions history, view patch content
@@ -46,6 +46,9 @@
 
 
 %changelog
+* Sat Apr 29 2006 Dan Horak <dan at danny.cz> 1.2-1
+- update to upstream version 1.2
+
 * Sun Mar 19 2006 Dan Horak <dan at danny.cz> 1.1.1-1
 - update to upstream version 1.1.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qgit/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Mar 2006 16:46:45 -0000	1.3
+++ sources	29 Apr 2006 08:01:01 -0000	1.4
@@ -1 +1 @@
-bf81d73fd1633fbd02cb74e0b5d5b0b4  qgit-1.1.1.tar.bz2
+b862efe8190446f129dcebdca69340f5  qgit-1.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Apr 29 08:03:52 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sat, 29 Apr 2006 01:03:52 -0700
Subject: rpms/qgit/FC-4 .cvsignore, 1.3, 1.4 qgit.spec, 1.3, 1.4 sources, 1.3,
	1.4
Message-ID: <200604290803.k3T83sgk021382@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/qgit/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21361

Modified Files:
	.cvsignore qgit.spec sources 
Log Message:
 - update to upstream version 1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qgit/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Mar 2006 16:50:10 -0000	1.3
+++ .cvsignore	29 Apr 2006 08:03:52 -0000	1.4
@@ -1 +1 @@
-qgit-1.1.1.tar.bz2
+qgit-1.2.tar.bz2


Index: qgit.spec
===================================================================
RCS file: /cvs/extras/rpms/qgit/FC-4/qgit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qgit.spec	19 Mar 2006 16:50:10 -0000	1.3
+++ qgit.spec	29 Apr 2006 08:03:52 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           qgit
-Version:        1.1.1
+Version:        1.2
 Release:        1%{?dist}
 Summary:        QGit is a git GUI repository browser
 
@@ -11,7 +11,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils, qt-devel
-Requires:       git-core >= 1.2.0
+Requires:       git-core >= 1.3.0
 
 %description
 With qgit you are able to browse revisions history, view patch content
@@ -46,6 +46,9 @@
 
 
 %changelog
+* Sat Apr 29 2006 Dan Horak <dan at danny.cz> 1.2-1
+- update to upstream version 1.2
+
 * Sun Mar 19 2006 Dan Horak <dan at danny.cz> 1.1.1-1
 - update to upstream version 1.1.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qgit/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Mar 2006 16:50:10 -0000	1.3
+++ sources	29 Apr 2006 08:03:52 -0000	1.4
@@ -1 +1 @@
-bf81d73fd1633fbd02cb74e0b5d5b0b4  qgit-1.1.1.tar.bz2
+b862efe8190446f129dcebdca69340f5  qgit-1.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Apr 29 08:05:46 2006
From: fedora-extras-commits at redhat.com (Dan Horak (sharkcz))
Date: Sat, 29 Apr 2006 01:05:46 -0700
Subject: rpms/qgit/FC-5 .cvsignore, 1.3, 1.4 qgit.spec, 1.3, 1.4 sources, 1.3,
	1.4
Message-ID: <200604290805.k3T85mJc021463@cvs-int.fedora.redhat.com>

Author: sharkcz

Update of /cvs/extras/rpms/qgit/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21441

Modified Files:
	.cvsignore qgit.spec sources 
Log Message:
 - update to upstream version 1.2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qgit/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Mar 2006 16:52:39 -0000	1.3
+++ .cvsignore	29 Apr 2006 08:05:46 -0000	1.4
@@ -1 +1 @@
-qgit-1.1.1.tar.bz2
+qgit-1.2.tar.bz2


Index: qgit.spec
===================================================================
RCS file: /cvs/extras/rpms/qgit/FC-5/qgit.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- qgit.spec	19 Mar 2006 16:52:39 -0000	1.3
+++ qgit.spec	29 Apr 2006 08:05:46 -0000	1.4
@@ -1,5 +1,5 @@
 Name:           qgit
-Version:        1.1.1
+Version:        1.2
 Release:        1%{?dist}
 Summary:        QGit is a git GUI repository browser
 
@@ -11,7 +11,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils, qt-devel
-Requires:       git-core >= 1.2.0
+Requires:       git-core >= 1.3.0
 
 %description
 With qgit you are able to browse revisions history, view patch content
@@ -46,6 +46,9 @@
 
 
 %changelog
+* Sat Apr 29 2006 Dan Horak <dan at danny.cz> 1.2-1
+- update to upstream version 1.2
+
 * Sun Mar 19 2006 Dan Horak <dan at danny.cz> 1.1.1-1
 - update to upstream version 1.1.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qgit/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Mar 2006 16:52:39 -0000	1.3
+++ sources	29 Apr 2006 08:05:46 -0000	1.4
@@ -1 +1 @@
-bf81d73fd1633fbd02cb74e0b5d5b0b4  qgit-1.1.1.tar.bz2
+b862efe8190446f129dcebdca69340f5  qgit-1.2.tar.bz2



From fedora-extras-commits at redhat.com  Sat Apr 29 09:21:55 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 29 Apr 2006 02:21:55 -0700
Subject: rpms/gauche/devel gauche.spec,1.1,1.2
Message-ID: <200604290921.k3T9Lv8M024257@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/gauche/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24240

Modified Files:
	gauche.spec 
Log Message:



Index: gauche.spec
===================================================================
RCS file: /cvs/extras/rpms/gauche/devel/gauche.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gauche.spec	28 Apr 2006 22:05:18 -0000	1.1
+++ gauche.spec	29 Apr 2006 09:21:55 -0000	1.2
@@ -1,6 +1,6 @@
 Name:		gauche
 Version:	0.8.7
-Release:	3%{?dist}
+Release:	4%{?dist}
 Summary:	Scheme script interpreter with multibyte character handling
 
 Group:		Development/Languages
@@ -40,9 +40,9 @@
 %configure --with-rpath=no --enable-threads=pthreads --enable-multibyte=utf-8
 perl -pi -e "s|POSTINSTALL = TARGETLIB=|POSTINSTALL = TARGETLIB=$RPM_BUILD_ROOT/|" src/Makefile
 %ifarch i386 i586 i686
-LD_LIBRARY_PATH=`pwd`/src make %{?_smp_mflags} OPTFLAGS="-fomit-frame-pointer"
+LD_LIBRARY_PATH=`pwd`/src make OPTFLAGS="-fomit-frame-pointer"
 %else
-LD_LIBRARY_PATH=`pwd`/src make %{?_smp_mflags}
+LD_LIBRARY_PATH=`pwd`/src make
 %endif
 
 



From fedora-extras-commits at redhat.com  Sat Apr 29 10:55:03 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Sat, 29 Apr 2006 03:55:03 -0700
Subject: rpms/mod_extract_forwarded - New directory
Message-ID: <200604291055.k3TAt5mL026792@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/mod_extract_forwarded
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26771/mod_extract_forwarded

Log Message:
Directory /cvs/extras/rpms/mod_extract_forwarded added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 29 10:55:04 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Sat, 29 Apr 2006 03:55:04 -0700
Subject: rpms/mod_extract_forwarded/devel - New directory
Message-ID: <200604291055.k3TAt6gq026795@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/mod_extract_forwarded/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26771/mod_extract_forwarded/devel

Log Message:
Directory /cvs/extras/rpms/mod_extract_forwarded/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 29 10:55:29 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Sat, 29 Apr 2006 03:55:29 -0700
Subject: rpms/mod_extract_forwarded Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604291055.k3TAtVtV026873@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/mod_extract_forwarded
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26840

Added Files:
	Makefile import.log 
Log Message:
Setup of module mod_extract_forwarded


--- NEW FILE Makefile ---
# Top level Makefile for module mod_extract_forwarded
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 29 10:55:27 2006
From: fedora-extras-commits at redhat.com (Ville Skytta (scop))
Date: Sat, 29 Apr 2006 03:55:27 -0700
Subject: extras-buildsys/utils extras-sync,1.1,1.2
Message-ID: <200604291055.k3TAtR5g026836@cvs-int.fedora.redhat.com>

Author: scop

Update of /cvs/fedora/extras-buildsys/utils
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26816

Modified Files:
	extras-sync 
Log Message:
Make a bit easier to adapt to other projects.


Index: extras-sync
===================================================================
RCS file: /cvs/fedora/extras-buildsys/utils/extras-sync,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- extras-sync	25 Apr 2006 01:54:07 -0000	1.1
+++ extras-sync	29 Apr 2006 10:55:24 -0000	1.2
@@ -1,16 +1,13 @@
 #!/bin/bash
+
 outputdir=/srv/rpmbuild/extras/tree/extras
+targetdir=build at fedora.linux.duke.edu:/srv/web/docroot/extras/
 
 echo "Test sync"
-rsync -navH --delete -e ssh $outputdir/* \
-   build at fedora.linux.duke.edu:/srv/web/docroot/extras/ | grep -v repodata
+rsync -navH --delete -e ssh $outputdir/* $targetdir | grep -v repodata
 
 echo "Real Sync"
 echo "Ctrl-C or kill to exit"
 echo "Sleeping for 30s"
 sleep 30
-rsync -avH --delete -e ssh $outputdir/* build at fedora.linux.duke.edu:/srv/web/docroot/extras/
-
-
-
-
+rsync -avH --delete -e ssh $outputdir/* $targetdir



From fedora-extras-commits at redhat.com  Sat Apr 29 10:55:29 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Sat, 29 Apr 2006 03:55:29 -0700
Subject: rpms/mod_extract_forwarded/devel .cvsignore, NONE, 1.1 Makefile,
	NONE, 1.1 sources, NONE, 1.1
Message-ID: <200604291055.k3TAtVYI026876@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/mod_extract_forwarded/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26840/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module mod_extract_forwarded


--- 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 Apr 29 10:56:09 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Sat, 29 Apr 2006 03:56:09 -0700
Subject: rpms/mod_extract_forwarded import.log,1.1,1.2
Message-ID: <200604291056.k3TAufJH026944@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/mod_extract_forwarded
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26909

Modified Files:
	import.log 
Log Message:
auto-import mod_extract_forwarded-2.0.2-1 on branch devel from mod_extract_forwarded-2.0.2-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/mod_extract_forwarded/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Apr 2006 10:55:29 -0000	1.1
+++ import.log	29 Apr 2006 10:56:09 -0000	1.2
@@ -0,0 +1 @@
+mod_extract_forwarded-2_0_2-1:HEAD:mod_extract_forwarded-2.0.2-1.src.rpm:1146308160



From fedora-extras-commits at redhat.com  Sat Apr 29 10:56:10 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Sat, 29 Apr 2006 03:56:10 -0700
Subject: rpms/mod_extract_forwarded/devel mod_extract_forwarded.conf, NONE, 
	1.1 mod_extract_forwarded.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604291056.k3TAugQt026948@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/rpms/mod_extract_forwarded/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26909/devel

Modified Files:
	.cvsignore sources 
Added Files:
	mod_extract_forwarded.conf mod_extract_forwarded.spec 
Log Message:
auto-import mod_extract_forwarded-2.0.2-1 on branch devel from mod_extract_forwarded-2.0.2-1.src.rpm


--- NEW FILE mod_extract_forwarded.conf ---
LoadModule extract_forwarded_module modules/mod_extract_forwarded.so

# MEForder can have either of two value 'refuse,accept' or 'accept,refuse' and 
# specifies the order in which the information in two associated directives,
# MEFaccept and MEFrefuse, are intepreted. The MEFaccept and MEFrefuse 
# directives are each used to spcifiy one or more IP numbers.

MEForder refuse,accept

# MEFrefuse can be 'all' OR a list of IP numbers and/or domain names of trusted
# proxy servers whose IP number can be derived by DNS from the domain name.
# The presence of 'all' overrides any particular IP numbers and means that no 
# proxy servers are to be trusted. Individual IP numbers mean that those proxy 
# servers having them are not to be trusted. This defaults to 'all'.

MEFrefuse all

# MEFaccept can be 'all' OR a list of IP numbers and/or domain names of trusted 
# proxy servers whose IP number can be derived by DNS from the domain name.
# The presence of 'all' overrides any particular IP numbers and means that all 
# proxy servers are to be trusted.
# Individual IP numbers mean that those the proxy servers having them are to be 
# trusted. This defaults to an empty list of trusted IP numbers.

# MEFaccept 1.2.3.4  1.2.3.5 

# Normal mode of use is to say:
#
#   MEForder refuse,accept
#   MEFrefuse all
#   MEFaccept <space separated list of your trusted proxy servers' IP numbers>
#
# with the MEForder directive saying apply the MEFrefuse rule first then the 
# MEFaccept rule.
# The MEFrefuse rule says do not trust any proxy servers but this is selectively
# overridden for particular IP numbers listed by the MEFaccept directive.

# MEFaddenv can be 'off', 'on' (the default) or a string. 'off' means that when
# spoofing, do not add an environment variable whose value is the IP number of
# the connecting machine. 'on' means that when spoofing, add an environment 
# variable called 'MEF_RPROXY_ADDR' whose value is the IP number of the 
# connecting machine.
# A string means that when spoofing, add an environment variable named by the 
# string supplied whose value is the IP number of the connecting machine.

MEFaddenv on

# MEFdebug can be 'on' or 'off' (the default). When turned 'on' information 
# about how the mod_extract_forwarded module is processing every request to your
# Apache 2 server, and any associated internal redirects or subsrequests, is 
# written to the server's error_log.
# The amount of output written and the way it is generated is such that you 
# would never normally want to turn this feature on.
# This feature is intended for debugging operation of the mod_extract_forwarded 
# module and it is unlikely you will want to do that.

MEFdebug off


--- NEW FILE mod_extract_forwarded.spec ---
Name:           mod_extract_forwarded
Version:        2.0.2
Release:        1%{?dist}
Summary:        Extract real source IP for forwarded HTTP requests

Group:          System Environment/Daemons
License:        Apache Software License
URL:            http://www.openinfo.co.uk/apache/
Source0:        http://www.openinfo.co.uk/apache/extract_forwarded-%{version}.tar.gz
Source1:	mod_extract_forwarded.conf
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:  httpd-devel >= 2.0.38
Requires:       httpd httpd-mmn = %([ -a %{_includedir}/httpd/.mmn ] && cat %{_includedir}/httpd/.mmn || echo missing)

%description
mod_extract_forwarded hooks itself into Apache's header parsing phase and looks 
for the X-Forwarded-For header which some (most?) proxies add to the proxied 
HTTP requests. It extracts the IP from the X-Forwarded-For and modifies the 
connection data so to the rest of Apache the request looks like it came from 
that IP rather than the proxy IP.

%prep
%setup -q -n extract_forwarded


%build
/usr/sbin/apxs -Wc,"%{optflags}" -c mod_extract_forwarded.c


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_libdir}/httpd/modules/
mkdir -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/
install -p .libs/mod_extract_forwarded.so %{buildroot}/%{_libdir}/httpd/modules/
install -m644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/httpd/conf.d/

# Docs don't need to be executable
chmod -x INSTALL README

%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc INSTALL README
%{_libdir}/httpd/modules/mod_extract_forwarded.so
%config(noreplace) /etc/httpd/conf.d/mod_extract_forwarded.conf


%changelog
* Wed Jan 11 2006 Tim Jackson <rpm at timj.co.uk> 2.0.2-1
- Initial build


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mod_extract_forwarded/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Apr 2006 10:55:29 -0000	1.1
+++ .cvsignore	29 Apr 2006 10:56:10 -0000	1.2
@@ -0,0 +1 @@
+extract_forwarded-2.0.2.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mod_extract_forwarded/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Apr 2006 10:55:29 -0000	1.1
+++ sources	29 Apr 2006 10:56:10 -0000	1.2
@@ -0,0 +1 @@
+d7aeb59fa81cbe74c485c33873ea1c65  extract_forwarded-2.0.2.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 29 10:59:20 2006
From: fedora-extras-commits at redhat.com (Tim Jackson (timj))
Date: Sat, 29 Apr 2006 03:59:20 -0700
Subject: owners owners.list,1.919,1.920
Message-ID: <200604291059.k3TAxMe4027004@cvs-int.fedora.redhat.com>

Author: timj

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26987

Modified Files:
	owners.list 
Log Message:
New package: mod_extract_forwarded (#177556)


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.919
retrieving revision 1.920
diff -u -r1.919 -r1.920
--- owners.list	29 Apr 2006 03:23:45 -0000	1.919
+++ owners.list	29 Apr 2006 10:59:20 -0000	1.920
@@ -748,6 +748,7 @@
 Fedora Extras|mod_annodex|Apache module for server-side support of annodex media|thomas at apestaart.org|extras-qa at fedoraproject.org|
 Fedora Extras|mod_auth_pam|PAM authentication module for Apache|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|mod_cband|Bandwidth limiting for virtual hosts|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|
+Fedora Extras|mod_extract_forwarded|Extract real source IP for forwarded HTTP requests|rpm at timj.co.uk|extras-qa at fedoraproject.org|
 Fedora Extras|mod_geoip|GeoIP module for the Apache HTTP Server|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|
 Fedora Extras|mod_security|Security module for the Apache HTTP Server|mfleming+rpm at enlartenment.com|extras-qa at fedoraproject.org|
 Fedora Extras|mod_suphp|An apache2 module for executing PHP scripts with the permissions of their owners|andreas at bawue.net|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Apr 29 15:32:51 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 29 Apr 2006 08:32:51 -0700
Subject: rpms/bsd-games - New directory
Message-ID: <200604291532.k3TFWrbD007079@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/bsd-games
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7055/bsd-games

Log Message:
Directory /cvs/extras/rpms/bsd-games added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 29 15:32:51 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 29 Apr 2006 08:32:51 -0700
Subject: rpms/bsd-games/devel - New directory
Message-ID: <200604291532.k3TFWr5Y007082@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/bsd-games/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7055/bsd-games/devel

Log Message:
Directory /cvs/extras/rpms/bsd-games/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 29 15:33:05 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 29 Apr 2006 08:33:05 -0700
Subject: rpms/bsd-games Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604291533.k3TFX7Bd007141@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/bsd-games
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7106

Added Files:
	Makefile import.log 
Log Message:
Setup of module bsd-games


--- NEW FILE Makefile ---
# Top level Makefile for module bsd-games
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 29 15:33:05 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 29 Apr 2006 08:33:05 -0700
Subject: rpms/bsd-games/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604291533.k3TFX7KA007144@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/bsd-games/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7106/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module bsd-games


--- 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 Apr 29 15:34:43 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 29 Apr 2006 08:34:43 -0700
Subject: rpms/bsd-games import.log,1.1,1.2
Message-ID: <200604291535.k3TFZFex007294@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/bsd-games
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7228

Modified Files:
	import.log 
Log Message:
auto-import bsd-games-2.17-8 on branch devel from bsd-games-2.17-8.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/bsd-games/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Apr 2006 15:33:04 -0000	1.1
+++ import.log	29 Apr 2006 15:34:42 -0000	1.2
@@ -0,0 +1 @@
+bsd-games-2_17-8:HEAD:bsd-games-2.17-8.src.rpm:1146324875



From fedora-extras-commits at redhat.com  Sat Apr 29 15:34:43 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 29 Apr 2006 08:34:43 -0700
Subject: rpms/bsd-games/devel bsd-games-2.17-debian.patch, NONE,
	1.1 bsd-games-2.17-getline.patch, NONE,
	1.1 bsd-games-2.17-hackgid.patch, NONE,
	1.1 bsd-games-2.17-ospeed.patch, NONE,
	1.1 bsd-games-2.17-phantasiagid.patch, NONE,
	1.1 bsd-games-2.17-setresgid.patch, NONE,
	1.1 bsd-games-2.17-tetrisgid.patch, NONE,
	1.1 bsd-games-2.17-utmpstruct.patch, NONE, 1.1 bsd-games.spec,
	NONE, 1.1 config.params, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200604291535.k3TFZFve007298@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/bsd-games/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7228/devel

Modified Files:
	.cvsignore sources 
Added Files:
	bsd-games-2.17-debian.patch bsd-games-2.17-getline.patch 
	bsd-games-2.17-hackgid.patch bsd-games-2.17-ospeed.patch 
	bsd-games-2.17-phantasiagid.patch 
	bsd-games-2.17-setresgid.patch bsd-games-2.17-tetrisgid.patch 
	bsd-games-2.17-utmpstruct.patch bsd-games.spec config.params 
Log Message:
auto-import bsd-games-2.17-8 on branch devel from bsd-games-2.17-8.src.rpm

bsd-games-2.17-debian.patch:

--- NEW FILE bsd-games-2.17-debian.patch ---
--- bsdgames-2.17.orig/fish/Makefrag
+++ bsdgames-2.17/fish/Makefrag
@@ -31,7 +31,9 @@
 fish_all:	fish/fish fish/fish.instr fish/fish.6
 
 fish_install:	fish_all
-	$(INSTALL_BINARY) fish/fish $(INSTALL_PREFIX)$(GAMESDIR)/fish
-	$(HIDE_GAME) fish
+	$(INSTALL_BINARY) fish/fish $(INSTALL_PREFIX)$(GAMESDIR)/go-fish
+	$(HIDE_GAME) go-fish
 	$(INSTALL_DATA) fish/fish.instr $(INSTALL_PREFIX)$(FISH_INSTRFILE)
-	$(INSTALL_MANUAL) fish/fish.6
+	ln -sf fish.6 fish/go-fish.6 # hack for rename
+	$(INSTALL_MANUAL) fish/go-fish.6
+	rm -f fish/go-fish.6
--- bsdgames-2.17.orig/fish/fish.6
+++ bsdgames-2.17/fish/fish.6
@@ -30,10 +30,10 @@
 .\"	@(#)fish.6	8.1 (Berkeley) 5/31/93
 .\"
 .Dd May 31, 1993
-.Dt FISH 6
+.Dt GO-FISH 6
 .Os
 .Sh NAME
-.Nm fish
+.Nm go-fish
 .Nd play
 .Dq Go Fish
 .Sh SYNOPSIS
--- bsdgames-2.17.orig/gomoku/gomoku.6
+++ bsdgames-2.17/gomoku/gomoku.6
@@ -45,7 +45,7 @@
 .Op Ar inputfile
 .Sh DESCRIPTION
 .Nm
-is a two player game were the object is to get 5 in a row horizontally,
+is a two player game where the object is to get 5 in a row horizontally,
 vertically or diagonally on a 19 by 19 grid.
 By convention, black always moves first.
 With no arguments,
--- bsdgames-2.17.orig/hack/Makefrag
+++ bsdgames-2.17/hack/Makefrag
@@ -56,7 +56,8 @@
 	$(INSTALL_SCORE_GAME) hack/hack $(INSTALL_PREFIX)$(GAMESDIR)/hack
 	$(HIDE_GAME) hack
 	$(INSTALL_HACK_DIR) $(INSTALL_PREFIX)$(HACK_DIR)
-	set -e; for f in data help hh rumors; do $(INSTALL_DATA) hack/$$f $(INSTALL_PREFIX)$(HACK_DIR)/$$f; done
+	install -d $(INSTALL_PREFIX)/usr/share/bsd-games/hack
+	set -e; for f in data help hh rumors; do $(INSTALL_DATA) hack/$$f $(INSTALL_PREFIX)/usr/share/bsd-games/hack/$$f; done
 	$(INSTALL_SCORE_FILE) $(HACK_DIR)/perm
 	$(INSTALL_SCORE_FILE) $(HACK_DIR)/record
 	$(INSTALL_MANUAL) hack/hack.6
--- bsdgames-2.17.orig/hack/config.h
+++ bsdgames-2.17/hack/config.h
@@ -88,13 +88,18 @@
 /* #define PYRAMID_BUG */	/* avoid a bug on the Pyramid */
 /* #define NOWAITINCLUDE */	/* neither <wait.h> nor <sys/wait.h> exists */
 
-#define WIZARD  "bruno"	/* the person allowed to use the -D option */
+/*
+ * Debian mods: use root for WIZARD, and move files that are static to
+ * /usr/share/ -- JEH
+ */
+#define WIZARD  "root"	/* the person allowed to use the -D option */
+#define SHAREDIR "/usr/share/bsd-games/hack/"
 #define RECORD	"record"/* the file containing the list of topscorers */
 #define	NEWS	"news"	/* the file containing the latest hack news */
-#define	HELP	"help"	/* the file containing a description of the commands */
-#define	SHELP	"hh"	/* abbreviated form of the same */
-#define	RUMORFILE	"rumors"	/* a file with fortune cookies */
-#define	DATAFILE	"data"	/* a file giving the meaning of symbols used */
+#define	HELP	SHAREDIR "help"	/* the file containing a description of the commands */
+#define	SHELP	SHAREDIR "hh"	/* abbreviated form of the same */
+#define	RUMORFILE	SHAREDIR "rumors"	/* a file with fortune cookies */
+#define	DATAFILE	SHAREDIR "data"	/* a file giving the meaning of symbols used */
 #define	FMASK	0660	/* file creation mask */
 #define	HLOCK	"perm"	/* an empty file used for locking purposes */
 #define LLOCK	"safelock"	/* link to previous */
--- bsdgames-2.17.orig/hunt/hunt/hunt.c
+++ bsdgames-2.17/hunt/hunt/hunt.c
@@ -394,7 +394,8 @@
 
 	vec_cnt = 0;
 	for (ip = ifp; ip; ip = ip->ifa_next)
-		if ((ip->ifa_addr->sa_family == AF_INET) &&
+		if (ip->ifa_addr &&
+		    (ip->ifa_addr->sa_family == AF_INET) &&
 		    (ip->ifa_flags & IFF_BROADCAST))
 			vec_cnt++;
 
@@ -405,7 +406,8 @@
 
 	vec_cnt = 0;
 	for (ip = ifp; ip; ip = ip->ifa_next)
-		if ((ip->ifa_addr->sa_family == AF_INET) &&
+		if (ip->ifa_addr &&
+		    (ip->ifa_addr->sa_family == AF_INET) &&
 		    (ip->ifa_flags & IFF_BROADCAST))
 			memcpy(&(*vector)[vec_cnt++], ip->ifa_broadaddr,
 			       sizeof(struct sockaddr_in));
--- bsdgames-2.17.orig/sail/pl_main.c
+++ bsdgames-2.17/sail/pl_main.c
@@ -219,7 +219,7 @@
 		printf("\nInitial broadside %s (grape, chain, round, double): ",
 			n ? "right" : "left");
 		fflush(stdout);
-		scanf("%s", buf);
+		scanf("%9s", buf);
 		switch (*buf) {
 		case 'g':
 			load = L_GRAPE;
--- bsdgames-2.17.orig/tetris/scores.c
+++ bsdgames-2.17/tetris/scores.c
@@ -335,7 +335,8 @@
 				continue;
 			}
 		}
-		levelfound[sp->hs_level] = 1;
+        if (sp->hs_level < NLEVELS && sp->hs_level >= 0)
+    		levelfound[sp->hs_level] = 1;
 		i++, sp++;
 	}
 	return (num > MAXHISCORES ? MAXHISCORES : num);
@@ -374,12 +375,14 @@
 	for (i = MINLEVEL; i < NLEVELS; i++)
 		levelfound[i] = 0;
 	for (i = 0, sp = scores; i < nscores; i++, sp++) {
-		if (levelfound[sp->hs_level])
-			sp->hs_time = 0;
-		else {
-			sp->hs_time = 1;
-			levelfound[sp->hs_level] = 1;
-		}
+        if (sp->hs_level < NLEVELS && sp->hs_level >= 0) {
+    		if (levelfound[sp->hs_level])
+	    		sp->hs_time = 0;
+		    else {
+			    sp->hs_time = 1;
+		    	levelfound[sp->hs_level] = 1;
+		    }
+        }
 	}
 
 	/*
@@ -433,7 +436,7 @@
 				continue;
 			}
 			sp = &hs[item];
-			(void)sprintf(buf,
+			(void)snprintf(buf, sizeof(buf),
 			    "%3d%c %6d  %-11s (%6d on %d)",
 			    item + offset, sp->hs_time ? '*' : ' ',
 			    sp->hs_score * sp->hs_level,

bsd-games-2.17-getline.patch:

--- NEW FILE bsd-games-2.17-getline.patch ---
diff -Naur bsd-games-2.17/boggle/boggle/bog.c bsd-games-2.17.new/boggle/boggle/bog.c
--- bsd-games-2.17/boggle/boggle/bog.c	2004-12-07 05:34:21.000000000 -0800
+++ bsd-games-2.17.new/boggle/boggle/bog.c	2006-04-04 14:15:20.000000000 -0700
@@ -336,7 +336,7 @@
 	}
 
 	while (1) {
-		if (getline(buf) == NULL) {
+		if (xgetline(buf) == NULL) {
 			if (feof(stdin))
 				clearerr(stdin);
 			break;
diff -Naur bsd-games-2.17/boggle/boggle/extern.h bsd-games-2.17.new/boggle/boggle/extern.h
--- bsd-games-2.17/boggle/boggle/extern.h	2004-01-27 12:52:07.000000000 -0800
+++ bsd-games-2.17.new/boggle/boggle/extern.h	2006-04-04 14:15:05.000000000 -0700
@@ -43,7 +43,7 @@
 long	 dictseek(FILE *, long, int);
 void	 findword(void);
 void	 flushin(FILE *);
-char	*getline(char *);
+char	*xgetline(char *);
 void	 getword(char *);
 int	 help(void);
 int	 inputch(void);
diff -Naur bsd-games-2.17/boggle/boggle/mach.c bsd-games-2.17.new/boggle/boggle/mach.c
--- bsd-games-2.17/boggle/boggle/mach.c	2004-12-07 05:34:21.000000000 -0800
+++ bsd-games-2.17.new/boggle/boggle/mach.c	2006-04-04 14:14:43.000000000 -0700
@@ -168,7 +168,7 @@
  * - doesn't accept words longer than MAXWORDLEN or containing caps
  */
 char *
-getline(q)
+xgetline(q)
 	char *q;
 {
 	int ch, done;
diff -Naur bsd-games-2.17/cribbage/cribbage.h bsd-games-2.17.new/cribbage/cribbage.h
--- bsd-games-2.17/cribbage/cribbage.h	2004-02-08 14:29:14.000000000 -0800
+++ bsd-games-2.17.new/cribbage/cribbage.h	2006-04-04 14:11:46.000000000 -0700
@@ -77,7 +77,7 @@
 int	 fifteens(const CARD [], int);
 void	 game(void);
 void	 gamescore(void);
-char	*getline(void);
+char	*xgetline(void);
 int	 getuchar(void);
 int	 incard(CARD *);
 int	 infrom(const CARD [], int, const char *);
diff -Naur bsd-games-2.17/cribbage/crib.c bsd-games-2.17.new/cribbage/crib.c
--- bsd-games-2.17/cribbage/crib.c	2004-01-27 12:52:07.000000000 -0800
+++ bsd-games-2.17.new/cribbage/crib.c	2006-04-04 14:11:05.000000000 -0700
@@ -221,7 +221,7 @@
 			if (!rflag) {			/* player cuts deck */
 				msg(quiet ? "Cut for crib? " :
 			    "Cut to see whose crib it is -- low card wins? ");
-				getline();
+				xgetline();
 			}
 			i = (rand() >> 4) % CARDS;	/* random cut */
 			do {	/* comp cuts deck */
@@ -397,7 +397,7 @@
 		if (!rflag) {	/* random cut */
 			msg(quiet ? "Cut the deck? " :
 		    "How many cards down do you wish to cut the deck? ");
-			getline();
+			xgetline();
 		}
 		i = (rand() >> 4) % (CARDS - pos);
 		turnover = deck[i + pos];
diff -Naur bsd-games-2.17/cribbage/io.c bsd-games-2.17.new/cribbage/io.c
--- bsd-games-2.17/cribbage/io.c	2004-12-07 05:34:21.000000000 -0800
+++ bsd-games-2.17.new/cribbage/io.c	2006-04-04 14:11:05.000000000 -0700
@@ -245,7 +245,7 @@
 
 	retval = FALSE;
 	rnk = sut = EMPTY;
-	if (!(line = getline()))
+	if (!(line = xgetline()))
 		goto gotit;
 	p = p1 = line;
 	while (*p1 != ' ' && *p1 != '\0')
@@ -346,7 +346,7 @@
 
 	for (sum = 0;;) {
 		msg(prompt);
-		if (!(p = getline()) || *p == '\0') {
+		if (!(p = xgetline()) || *p == '\0') {
 			msg(quiet ? "Not a number" :
 			    "That doesn't look like a number");
 			continue;
@@ -528,12 +528,12 @@
 }
 
 /*
- * getline:
+ * xgetline:
  *      Reads the next line up to '\n' or EOF.  Multiple spaces are
  *	compressed to one space; a space is inserted before a ','
  */
 char *
-getline()
+xgetline()
 {
 	char *sp;
 	int c, oy, ox;
diff -Naur bsd-games-2.17/gomoku/bdisp.c bsd-games-2.17.new/gomoku/bdisp.c
--- bsd-games-2.17/gomoku/bdisp.c	2003-12-16 18:47:37.000000000 -0800
+++ bsd-games-2.17.new/gomoku/bdisp.c	2006-04-04 14:11:05.000000000 -0700
@@ -241,7 +241,7 @@
 }
 
 int
-getline(buf, size)
+xgetline(buf, size)
 	char *buf;
 	int size;
 {
diff -Naur bsd-games-2.17/gomoku/gomoku.h bsd-games-2.17.new/gomoku/gomoku.h
--- bsd-games-2.17/gomoku/gomoku.h	2004-01-27 12:52:07.000000000 -0800
+++ bsd-games-2.17.new/gomoku/gomoku.h	2006-04-04 14:12:15.000000000 -0700
@@ -263,7 +263,7 @@
 
 void	bdinit(struct spotstr *);
 void	init_overlap(void);
-int	getline(char *, int);
+int	xgetline(char *, int);
 void	ask(const char *);
 void	dislog(const char *);
 void	bdump(FILE *);
diff -Naur bsd-games-2.17/gomoku/main.c bsd-games-2.17.new/gomoku/main.c
--- bsd-games-2.17/gomoku/main.c	2004-01-27 12:52:07.000000000 -0800
+++ bsd-games-2.17.new/gomoku/main.c	2006-04-04 14:11:05.000000000 -0700
@@ -155,7 +155,7 @@
 		if (inputfp == NULL && test == 0) {
 			for (;;) {
 				ask("black or white? ");
-				getline(buf, sizeof(buf));
+				xgetline(buf, sizeof(buf));
 				if (buf[0] == 'b' || buf[0] == 'B') {
 					color = BLACK;
 					break;
@@ -172,7 +172,7 @@
 		}
 	} else {
 		setbuf(stdout, 0);
-		getline(buf, sizeof(buf));
+		xgetline(buf, sizeof(buf));
 		if (strcmp(buf, "black") == 0)
 			color = BLACK;
 		else if (strcmp(buf, "white") == 0)
@@ -244,7 +244,7 @@
 		getinput:
 			if (interactive)
 				ask("move? ");
-			if (!getline(buf, sizeof(buf))) {
+			if (!xgetline(buf, sizeof(buf))) {
 				curmove = RESIGN;
 				break;
 			}
@@ -256,7 +256,7 @@
 					FILE *fp;
 
 					ask("save file name? ");
-					(void)getline(buf, sizeof(buf));
+					(void)xgetline(buf, sizeof(buf));
 					if ((fp = fopen(buf, "w")) == NULL) {
 						glog("cannot create save file");
 						goto getinput;
@@ -309,14 +309,14 @@
 		if (i != RESIGN) {
 		replay:
 			ask("replay? ");
-			if (getline(buf, sizeof(buf)) &&
+			if (xgetline(buf, sizeof(buf)) &&
 			    (buf[0] == 'y' || buf[0] == 'Y'))
 				goto again;
 			if (strcmp(buf, "save") == 0) {
 				FILE *fp;
 
 				ask("save file name? ");
-				(void)getline(buf, sizeof(buf));
+				(void)xgetline(buf, sizeof(buf));
 				if ((fp = fopen(buf, "w")) == NULL) {
 					glog("cannot create save file");
 					goto replay;
@@ -367,7 +367,7 @@
 		quit();
 top:
 	ask("cmd? ");
-	if (!getline(fmtbuf, sizeof(fmtbuf)))
+	if (!xgetline(fmtbuf, sizeof(fmtbuf)))
 		quit();
 	switch (*fmtbuf) {
 	case '\0':

bsd-games-2.17-hackgid.patch:

--- NEW FILE bsd-games-2.17-hackgid.patch ---
diff -Naur --exclude '*.swp' bsd-games-2.17/hack/hack.bones.c bsd-games-2.17.new/hack/hack.bones.c
--- bsd-games-2.17/hack/hack.bones.c	2003-12-16 18:47:37.000000000 -0800
+++ bsd-games-2.17.new/hack/hack.bones.c	2006-04-27 14:17:06.000000000 -0700
@@ -140,10 +140,14 @@
 						 * ghost */
 		}
 	}
-	if ((fd = creat(bones, FMASK)) < 0)
+        setgid(hackgid);
+	if ((fd = creat(bones, FMASK)) < 0) {
+                setgid(getgid());
 		return;
+        }
 	savelev(fd, dlevel);
 	(void) close(fd);
+        setgid(getgid());
 }
 
 int
@@ -168,9 +172,12 @@
 	if (!wizard)		/* duvel!frans: don't remove bones while
 				 * debugging */
 #endif	/* WiZARD */
+                setgid(hackgid);
 		if (unlink(bones) < 0) {
+                        setgid(getgid());
 			pline("Cannot unlink %s .", bones);
 			return (0);
 		}
+                setgid(getgid());
 	return (ok);
 }
diff -Naur --exclude '*.swp' bsd-games-2.17/hack/hack.do.c bsd-games-2.17.new/hack/hack.do.c
--- bsd-games-2.17/hack/hack.do.c	2004-01-27 12:52:07.000000000 -0800
+++ bsd-games-2.17.new/hack/hack.do.c	2006-04-27 14:32:43.000000000 -0700
@@ -206,7 +206,9 @@
 		return;		/* this can happen */
 
 	glo(dlevel);
+        setgid(hackgid);
 	fd = creat(lock, FMASK);
+        setgid(getgid());
 	if (fd < 0) {
 		/*
 		 * This is not quite impossible: e.g., we may have
@@ -231,8 +233,10 @@
 	u.ux = FAR;		/* hack */
 	(void) inshop();	/* probably was a trapdoor */
 
+        setgid(hackgid);
 	savelev(fd, dlevel);
 	(void) close(fd);
+        setgid(getgid());
 
 	dlevel = newlevel;
 	if (maxdlevel < dlevel)
diff -Naur --exclude '*.swp' bsd-games-2.17/hack/hack.end.c bsd-games-2.17.new/hack/hack.end.c
--- bsd-games-2.17/hack/hack.end.c	2003-12-16 18:47:37.000000000 -0800
+++ bsd-games-2.17.new/hack/hack.end.c	2006-04-27 15:48:03.000000000 -0700
@@ -290,7 +290,11 @@
 #ifdef WIZARD
 	if (!wizard)
 #endif	/* WIZARD */
-		topten();
+        {
+            setgid(hackgid);
+            topten();
+            setgid(getgid());
+        }
 	if (done_stopprint)
 		printf("\n\n");
 	exit(0);
diff -Naur --exclude '*.swp' bsd-games-2.17/hack/hack.h bsd-games-2.17.new/hack/hack.h
--- bsd-games-2.17/hack/hack.h	2004-01-27 12:52:07.000000000 -0800
+++ bsd-games-2.17.new/hack/hack.h	2006-04-27 11:48:15.000000000 -0700
@@ -218,6 +218,7 @@
 extern int bases[];
 extern int doorindex;
 extern int hackpid;
+extern gid_t hackgid;
 extern int multi;
 extern int nroom;
 extern long moves;
diff -Naur --exclude '*.swp' bsd-games-2.17/hack/hack.main.c bsd-games-2.17.new/hack/hack.main.c
--- bsd-games-2.17/hack/hack.main.c	2004-01-27 12:52:07.000000000 -0800
+++ bsd-games-2.17.new/hack/hack.main.c	2006-04-27 20:16:23.000000000 -0700
@@ -61,6 +61,7 @@
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __RCSID("$NetBSD: hack.main.c,v 1.9 2004/01/27 20:30:29 jsm Exp $");
@@ -70,6 +71,9 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <sys/types.h>
+#include <pwd.h>
+#include <limits.h>
 #include "hack.h"
 #include "extern.h"
 
@@ -83,12 +87,13 @@
 int             (*occupation)(void);
 const char           *occtxt;		/* defined when occupation != NULL */
 
+gid_t           hackgid;        /* privileged gid for writing scoreboard */
 int             hackpid;	/* current pid */
 int             locknum;	/* max num of players */
 #ifdef DEF_PAGER
 const char     *catmore;	/* default pager */
 #endif
-char            SAVEF[PL_NSIZ + 11] = "save/";	/* save/99999player */
+char            SAVEF[PATH_MAX + PL_NSIZ + 11] = ".hack.save";
 char           *hname;		/* name of the game (argv[0] of call) */
 char            obuf[BUFSIZ];	/* BUFSIZ is defined in stdio.h */
 
@@ -101,9 +106,10 @@
 	char           *argv[];
 {
 	int             fd;
-#ifdef CHDIR
-	char           *dir;
-#endif
+        char           *savedir = (char *)NULL;
+
+        hackgid = getegid();
+        setgid(getgid());
 
 	/* Check for dirty tricks with closed fds 0, 1, 2 */
 	fd = open("/dev/null", O_RDONLY);
@@ -114,31 +120,47 @@
 	hname = argv[0];
 	hackpid = getpid();
 
-#ifdef CHDIR			/* otherwise no chdir() */
 	/*
-	 * See if we must change directory to the playground.
-	 * (Perhaps hack runs suid and playground is inaccessible
-	 *  for the player.)
+         * Find the directory containing the save files.
 	 * The environment variable HACKDIR is overridden by a
 	 *  -d command line option (must be the first option given)
 	 */
 
-	dir = getenv("HACKDIR");
+	savedir = getenv("HACKDIR");
 	if (argc > 1 && !strncmp(argv[1], "-d", 2)) {
 		argc--;
 		argv++;
-		dir = argv[0] + 2;
-		if (*dir == '=' || *dir == ':')
-			dir++;
-		if (!*dir && argc > 1) {
+		savedir = argv[0] + 2;
+		if (*savedir == '=' || *savedir == ':')
+			savedir++;
+		if (!*savedir && argc > 1) {
 			argc--;
 			argv++;
-			dir = argv[0];
+			savedir = argv[0];
 		}
-		if (!*dir)
+		if (!*savedir)
 			error("Flag -d must be followed by a directory name.");
 	}
-#endif
+
+        /*
+         * If the user didn't tell us where the save games are stored then
+         * look in the home directory.
+         */
+        if (savedir == (char *)NULL) {
+            if ((savedir = getenv("HOME")) == (char *)NULL) {
+                struct passwd *pwe;
+                pwe = getpwuid(getuid());
+                if (pwe == NULL || (savedir = pwe->pw_dir) == (char *)NULL) {
+                    savedir = ".";
+                }
+            }
+        }
+        /*
+         * One final check in case we missed something earlier.
+         */
+        if (savedir == NULL || strlen(savedir) > PATH_MAX-30) {
+            savedir = ".";
+        }
 
 	/*
 	 * Who am i? Algorithm: 1. Use name as specified in HACKOPTIONS
@@ -155,12 +177,21 @@
 		char           *s;
 
 		initoptions();
-		if (!*plname && (s = getenv("USER")))
+		if (!*plname && (s = getenv("USER"))) {
 			(void) strncpy(plname, s, sizeof(plname) - 1);
-		if (!*plname && (s = getenv("LOGNAME")))
+                }
+		if (!*plname && (s = getenv("LOGNAME"))) {
 			(void) strncpy(plname, s, sizeof(plname) - 1);
-		if (!*plname && (s = getlogin()))
+                }
+		if (!*plname && (s = getlogin())) {
 			(void) strncpy(plname, s, sizeof(plname) - 1);
+                }
+                /*
+                 * Ensure that plname is null-terminated.  strncpy
+                 * doesn't guarantee it if the source is longer than
+                 * the destination.
+                 */
+                plname[sizeof(plname) - 1] = (char)NULL;
 	}
 
 	/*
@@ -169,11 +200,12 @@
 	 */
 	if (argc > 1 && !strncmp(argv[1], "-s", 2)) {
 #ifdef CHDIR
-		chdirx(dir, 0);
+		chdirx(_PATH_HACK, 0);
 #endif
 		prscore(argc, argv);
 		exit(0);
 	}
+
 	/*
 	 * It seems he really wants to play.
 	 * Remember tty modes, to be restored on exit.
@@ -191,13 +223,13 @@
 	 * Find the creation date of this game,
 	 * so as to avoid restoring outdated savefiles.
 	 */
-	gethdate(hname);
+	gethdate(argv[0]);
 
 	/*
 	 * We cannot do chdir earlier, otherwise gethdate will fail.
 	 */
 #ifdef CHDIR
-	chdirx(dir, 1);
+	chdirx(_PATH_HACK, 1);
 #endif
 
 	/*
@@ -277,7 +309,9 @@
 		(void) signal(SIGINT, SIG_IGN);
 		if (!locknum)
 			(void) strcpy(lock, plname);
+                setgid(hackgid);
 		getlock();	/* sets lock if locknum != 0 */
+                setgid(getgid());
 #ifdef WIZARD
 	} else {
 		char           *sfoo;
@@ -308,10 +342,21 @@
 	}
 #endif
 	setftty();
-	(void) sprintf(SAVEF, "save/%d%s", getuid(), plname);
-	regularize(SAVEF + 5);	/* avoid . or / in name */
-	if ((fd = open(SAVEF, O_RDONLY)) >= 0 &&
-	    (uptodate(fd) || unlink(SAVEF) == 666)) {
+
+	(void) snprintf(SAVEF, PATH_MAX, "%s/.hack.save-%d%s", savedir, getuid(), plname);
+        /* Disable this regularization.  It's only needed when using
+         * setgid and a a shared directory for save games.  In Fedora we've
+         * patched it to save games with normal user permissions (not setgid),
+         * so this isn't necessary anymore.
+         */
+	/*regularize(SAVEF + 5);*/	/* avoid . or / in name */
+        /*
+         * Removed check if the save game is up-to-date so we can avoid
+         * invalidating games during bugfix releases.  It would be
+         * _much_ better to store some sort of savefile version number
+         * in the savefile itself.
+         */
+	if ((fd = open(SAVEF, O_RDONLY)) >= 0) {
 		(void) signal(SIGINT, done1);
 		pline("Restoring old save file...");
 		(void) fflush(stdout);
@@ -540,16 +585,6 @@
 	boolean         wr;
 {
 
-#ifdef SECURE
-	if (dir			/* User specified directory? */
-#ifdef HACKDIR
-	    && strcmp(dir, HACKDIR)	/* and not the default? */
-#endif
-		) {
-		(void) setuid(getuid());	/* Ron Wessels */
-		(void) setregid(getgid(), getgid());
-	}
-#endif
 
 #ifdef HACKDIR
 	if (dir == NULL)
@@ -568,12 +603,34 @@
 
 		if (dir == NULL)
 			dir = ".";
-		if ((fd = open(RECORD, O_RDWR)) < 0) {
-			printf("Warning: cannot write %s/%s", dir, RECORD);
+
+                setgid(hackgid);
+		fd = open(RECORD, O_RDWR);
+                setgid(getgid());
+
+		if (fd < 0) {
+			printf("Warning: cannot write %s", RECORD);
 			getret();
 		} else
 			(void) close(fd);
 	}
+
+#ifdef SECURE
+	if (dir			/* User specified directory? */
+#ifdef HACKDIR
+	    && strcmp(dir, HACKDIR)	/* and not the default? */
+#endif
+		) {
+                if (setresuid(-1, getuid(), getuid()) == -1) {
+                    perror("Could not drop setuid privileges.  Aborting.");
+                    exit(1);
+                }
+                if (setresgid(-1, getgid(), getgid()) == -1) {
+                    perror("Could not drop setgid privileges.  Aborting.");
+                    exit(1);
+                }
+	}
+#endif
 }
 #endif
 
diff -Naur --exclude '*.swp' bsd-games-2.17/hack/hack.save.c bsd-games-2.17.new/hack/hack.save.c
--- bsd-games-2.17/hack/hack.save.c	2003-12-16 18:47:37.000000000 -0800
+++ bsd-games-2.17.new/hack/hack.save.c	2006-04-27 20:12:41.000000000 -0700
@@ -105,8 +105,9 @@
 	(void) signal(SIGHUP, SIG_IGN);
 	(void) signal(SIGINT, SIG_IGN);
 	if ((fd = creat(SAVEF, FMASK)) < 0) {
-		if (!hu)
-			pline("Cannot open save file. (Continue or Quit)");
+		if (!hu) {
+			pline("Cannot open save file %s. (Continue or Quit)", SAVEF);
+                }
 		(void) unlink(SAVEF);	/* ab at unido */
 		return (0);
 	}
@@ -198,10 +199,14 @@
 			break;
 		getlev(fd, 0, tmp);
 		glo(tmp);
-		if ((nfd = creat(lock, FMASK)) < 0)
+                setgid(hackgid);
+		if ((nfd = creat(lock, FMASK)) < 0) {
+                        setgid(getgid());
 			panic("Cannot open temp file %s!\n", lock);
+                }
 		savelev(nfd, tmp);
 		(void) close(nfd);
+                setgid(getgid());
 	}
 	(void) lseek(fd, (off_t) 0, SEEK_SET);
 	getlev(fd, 0, 0);
diff -Naur --exclude '*.swp' bsd-games-2.17/hack/hack.unix.c bsd-games-2.17.new/hack/hack.unix.c
--- bsd-games-2.17/hack/hack.unix.c	2003-12-16 18:47:37.000000000 -0800
+++ bsd-games-2.17.new/hack/hack.unix.c	2006-04-27 19:50:20.000000000 -0700
@@ -161,6 +161,9 @@
 
 struct stat     buf, hbuf;
 
+/*
+ * Get the timestamp of the named executable.
+ */
 void
 gethdate(name)
 	char           *name;
@@ -192,9 +195,15 @@
 	for (;;) {
 		if ((np = strchr(path, ':')) == NULL)
 			np = path + strlen(path);	/* point to end str */
-		if (np - path <= 1)	/* %% */
+		if (np - path <= 1) {	/* %% */
 			(void) strcpy(filename, name);
-		else {
+                } else if (strlen(path) >= MAXPATHLEN-strlen(name)-2) {
+                /*
+                 * Protect against long directories in PATH by skipping them.
+                 */
+                    path = np + 1;
+                    continue;
+                } else {
 			(void) strncpy(filename, path, np - path);
 			filename[np - path] = '/';
 			(void) strcpy(filename + (np - path) + 1, name);
@@ -231,6 +240,9 @@
 {
 	int             i;
 	time_t          date;
+        gid_t           initial_egid;
+
+        initial_egid = getegid();
 
 	if (fstat(fd, &buf))
 		return (0);	/* cannot get status */
@@ -255,13 +267,17 @@
 			return (0);
 	}
 	(void) close(fd);
+        setgid(hackgid);
 	for (i = 1; i <= MAXLEVEL; i++) {	/* try to remove all */
 		glo(i);
 		(void) unlink(lock);
 	}
 	glo(0);
-	if (unlink(lock))
+	if (unlink(lock)) {
+                setgid(initial_egid);
 		return (0);	/* cannot remove it */
+        }
+        setgid(initial_egid);
 	return (1);		/* success! */
 }
 
@@ -321,8 +337,9 @@
 	      : "There is a game in progress under your name.");
 gotlock:
 	fd = creat(lock, FMASK);
-	if (unlink(LLOCK) == -1)
+	if (unlink(LLOCK) == -1) {
 		error("Cannot unlink %s.", LLOCK);
+        }
 	if (fd == -1) {
 		error("cannot creat lock file.");
 	} else {

bsd-games-2.17-ospeed.patch:

--- NEW FILE bsd-games-2.17-ospeed.patch ---
diff -Naur bsd-games-2.17/backgammon/backgammon/main.c bsd-games-2.17.new/backgammon/backgammon/main.c
--- bsd-games-2.17/backgammon/backgammon/main.c	2005-02-15 22:24:50.000000000 -0800
+++ bsd-games-2.17.new/backgammon/backgammon/main.c	2006-04-03 21:52:19.000000000 -0700
@@ -30,6 +30,7 @@
  */
 
 #include <sys/cdefs.h>
+#include <termcap.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n");
@@ -53,7 +54,7 @@
 extern const char   *const instr[];		/* text of instructions */
 extern const char   *const message[];		/* update message */
 #ifndef NCURSES_VERSION
-short ospeed;			/* tty output speed */
+/*short ospeed;	*/		/* tty output speed */
 #endif
 
 const char   *const helpm[] = {		/* help message */
diff -Naur bsd-games-2.17/backgammon/teachgammon/teach.c bsd-games-2.17.new/backgammon/teachgammon/teach.c
--- bsd-games-2.17/backgammon/teachgammon/teach.c	2005-02-15 22:24:50.000000000 -0800
+++ bsd-games-2.17.new/backgammon/teachgammon/teach.c	2006-04-03 21:52:19.000000000 -0700
@@ -30,6 +30,7 @@
  */
 
 #include <sys/cdefs.h>
+#include <termcap.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n");
diff -Naur bsd-games-2.17/tetris/screen.c bsd-games-2.17.new/tetris/screen.c
--- bsd-games-2.17/tetris/screen.c	2004-01-27 12:52:07.000000000 -0800
+++ bsd-games-2.17.new/tetris/screen.c	2006-04-03 21:52:19.000000000 -0700
@@ -73,7 +73,7 @@
 extern char	PC, *BC, *UP;	/* tgoto requires globals: ugh! */
 static char BCdefault[] = "\b";
 #ifndef NCURSES_VERSION
-short	ospeed;
+/*short	ospeed;*/
 #endif
 
 static char

bsd-games-2.17-phantasiagid.patch:

--- NEW FILE bsd-games-2.17-phantasiagid.patch ---
diff -Naur --exclude '*.swp' bsd-games-2.17/phantasia/gamesupport.c bsd-games-2.17.new/phantasia/gamesupport.c
--- bsd-games-2.17/phantasia/gamesupport.c	2006-04-27 22:51:04.000000000 -0700
+++ bsd-games-2.17.new/phantasia/gamesupport.c	2006-04-27 21:01:11.000000000 -0700
@@ -518,7 +518,10 @@
 	long    loc = 0L;	/* location in scoreboard file */
 	bool    found = FALSE;	/* set if we found an entry for this login */
 
-	if ((fp = fopen(_PATH_SCORE, "r+")) != NULL) {
+        SET_PRIV_GID;
+	fp = fopen(_PATH_SCORE, "r+");
+        DROP_PRIV_GID;
+	if (fp != NULL) {
 		while (fread((char *) &sbuf, SZ_SCORESTRUCT, 1, fp) == 1)
 			if (strcmp(Player.p_login, sbuf.sb_login) == 0) {
 				found = TRUE;
diff -Naur --exclude '*.swp' bsd-games-2.17/phantasia/interplayer.c bsd-games-2.17.new/phantasia/interplayer.c
--- bsd-games-2.17/phantasia/interplayer.c	2006-04-27 22:51:04.000000000 -0700
+++ bsd-games-2.17.new/phantasia/interplayer.c	2006-04-27 21:01:45.000000000 -0700
@@ -640,14 +640,18 @@
 		mvaddstr(4, 0, "You have become king!\n");
 
 		/* let everyone else know */
+                SET_PRIV_GID;
 		fp = fopen(_PATH_MESS, "w");
+                DROP_PRIV_GID;
 		fprintf(fp, "All hail the new king!");
 		fclose(fp);
 
 		/* clear all energy voids; retain location of holy grail */
 		fseek(Energyvoidfp, 0L, SEEK_SET);
 		fread((char *) &Enrgyvoid, SZ_VOIDSTRUCT, 1, Energyvoidfp);
+                SET_PRIV_GID;
 		fp = fopen(_PATH_VOID, "w");
+                DROP_PRIV_GID;
 		fwrite((char *) &Enrgyvoid, SZ_VOIDSTRUCT, 1, fp);
 		fclose(fp);
 	}
@@ -716,7 +720,10 @@
 			break;
 
 		case '5':	/* collect accumulated taxes */
-			if ((fp = fopen(_PATH_GOLD, "r+")) != NULL)
+                        SET_PRIV_GID;
+			fp = fopen(_PATH_GOLD, "r+");
+                        DROP_PRIV_GID;
+			if (fp != NULL)
 				/* collect taxes */
 			{
 				fread((char *) &temp1, sizeof(double), 1, fp);
diff -Naur --exclude '*.swp' bsd-games-2.17/phantasia/macros.h bsd-games-2.17.new/phantasia/macros.h
--- bsd-games-2.17/phantasia/macros.h	1997-07-17 09:42:20.000000000 -0700
+++ bsd-games-2.17.new/phantasia/macros.h	2006-04-27 22:49:40.000000000 -0700
@@ -4,6 +4,10 @@
  * macros.h - macro definitions for Phantasia
  */
 
+/* setgid macros */
+#define SET_PRIV_GID setgid(phant_gid)
+#define DROP_PRIV_GID setgid(getgid())
+
 #define ROLL(BASE,INTERVAL)	floor((BASE) + (INTERVAL) * drandom())
 #define SGN(X)		((X) < 0 ? -1 : 1)
 #define CIRCLE(X, Y)	floor(distance(X, 0.0, Y, 0.0) / 125.0 + 1)
diff -Naur --exclude '*.swp' bsd-games-2.17/phantasia/main.c bsd-games-2.17.new/phantasia/main.c
--- bsd-games-2.17/phantasia/main.c	2006-04-27 22:51:04.000000000 -0700
+++ bsd-games-2.17.new/phantasia/main.c	2006-04-27 21:00:46.000000000 -0700
@@ -61,6 +61,9 @@
 #undef bool
 #include <curses.h>
 
+
+gid_t   phant_gid;
+
 int	main(int, char **);
 
 int
@@ -74,6 +77,9 @@
 	time_t  seconds;		/* for time of day */
 	double  dtemp;			/* for temporary calculations */
 
+        phant_gid = getegid();
+        DROP_PRIV_GID;
+
 	initialstate();			/* init globals */
 
 	/* process arguments */
@@ -290,22 +296,28 @@
 		Login = getpwuid(getuid())->pw_name;
 
 	/* open some files */
+        SET_PRIV_GID;
 	if ((Playersfp = fopen(_PATH_PEOPLE, "r+")) == NULL)
 		error(_PATH_PEOPLE);
+        DROP_PRIV_GID;
 	/* NOTREACHED */
 	if (fileno(Playersfp) < 3)
 		exit(1);
 
+        SET_PRIV_GID;
 	if ((Monstfp = fopen(_PATH_MONST, "r+")) == NULL)
 		error(_PATH_MONST);
+        DROP_PRIV_GID;
 	/* NOTREACHED */
 
 	if ((Messagefp = fopen(_PATH_MESS, "r")) == NULL)
 		error(_PATH_MESS);
 	/* NOTREACHED */
 
+        SET_PRIV_GID;
 	if ((Energyvoidfp = fopen(_PATH_VOID, "r+")) == NULL)
 		error(_PATH_VOID);
+        DROP_PRIV_GID;
 	if (fstat(fileno(Energyvoidfp), &sb) == -1)
 		error("stat");
 	if (sb.st_size == 0) {
@@ -508,7 +520,9 @@
 		getstring(Databuf, SZ_DATABUF);
 		/* we open the file for writing to erase any data which is
 		 * already there */
+                SET_PRIV_GID;
 		fp = fopen(_PATH_MESS, "w");
+                DROP_PRIV_GID;
 		if (Databuf[0] != '\0')
 			fprintf(fp, "%s: %s", Player.p_name, Databuf);
 		fclose(fp);
diff -Naur --exclude '*.swp' bsd-games-2.17/phantasia/misc.c bsd-games-2.17.new/phantasia/misc.c
--- bsd-games-2.17/phantasia/misc.c	2006-04-27 22:51:04.000000000 -0700
+++ bsd-games-2.17.new/phantasia/misc.c	2006-04-27 21:02:34.000000000 -0700
@@ -651,14 +651,18 @@
 	enterscore();		/* update score board */
 
 	/* put info in last dead file */
+        SET_PRIV_GID;
 	fp = fopen(_PATH_LASTDEAD, "w");
+        DROP_PRIV_GID;
 	fprintf(fp, "%s (%s, run by %s, level %.0f, killed by %s)",
 	    Player.p_name, descrtype(&Player, TRUE),
 	    Player.p_login, Player.p_level, how);
 	fclose(fp);
 
 	/* let other players know */
+        SET_PRIV_GID;
 	fp = fopen(_PATH_MESS, "w");
+        DROP_PRIV_GID;
 	fprintf(fp, "%s was killed by %s.", Player.p_name, how);
 	fclose(fp);
 
@@ -1060,7 +1064,10 @@
 	}
 	Player.p_gold -= taxes;
 
-	if ((fp = fopen(_PATH_GOLD, "r+")) != NULL)
+        SET_PRIV_GID;
+	fp = fopen(_PATH_GOLD, "r+");
+        DROP_PRIV_GID;
+	if (fp != NULL)
 		/* update taxes */
 	{
 		dtemp = 0.0;
diff -Naur --exclude '*.swp' bsd-games-2.17/phantasia/phantglobs.h bsd-games-2.17.new/phantasia/phantglobs.h
--- bsd-games-2.17/phantasia/phantglobs.h	2006-04-27 22:51:04.000000000 -0700
+++ bsd-games-2.17.new/phantasia/phantglobs.h	2006-04-27 20:25:34.000000000 -0700
@@ -4,6 +4,7 @@
  * phantglobs.h - global declarations for Phantasia
  */
 
+extern  gid_t   phant_gid;      /* gid under which the game runs */
 extern	double	Circle;		/* which circle player is in */
 extern	double	Shield;		/* force field thrown up in monster battle */
 

bsd-games-2.17-setresgid.patch:

--- NEW FILE bsd-games-2.17-setresgid.patch ---
diff -Naur --exclude '*.swp' bsd-games-2.17/adventure/main.c bsd-games-2.17.new/adventure/main.c
--- bsd-games-2.17/adventure/main.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/adventure/main.c	2006-04-07 17:27:16.000000000 -0700
@@ -34,6 +34,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1991, 1993\n\
@@ -71,7 +72,10 @@
 	struct text *kk;
 
 	/* revoke setgid privileges from dm */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	init();		/* Initialize everything */
 	signal(SIGINT, trapdel);
diff -Naur --exclude '*.swp' bsd-games-2.17/arithmetic/arithmetic.c bsd-games-2.17.new/arithmetic/arithmetic.c
--- bsd-games-2.17/arithmetic/arithmetic.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/arithmetic/arithmetic.c	2006-04-04 17:33:55.000000000 -0700
@@ -32,6 +32,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
@@ -117,7 +118,10 @@
 	int ch, cnt;
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	while ((ch = getopt(argc, argv, "r:o:")) != -1)
 		switch(ch) {
diff -Naur --exclude '*.swp' bsd-games-2.17/atc/main.c bsd-games-2.17.new/atc/main.c
--- bsd-games-2.17/atc/main.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/atc/main.c	2006-04-06 13:35:43.000000000 -0700
@@ -41,6 +41,7 @@
  * For more info on this and all of my stuff, mail edjames at berkeley.edu.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1990, 1993\n\
@@ -77,7 +78,10 @@
 
 	/* Open the score file then revoke setgid privileges */
 	open_score_file();
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	start_time = seed = time(NULL);
 
diff -Naur --exclude '*.swp' bsd-games-2.17/backgammon/backgammon/main.c bsd-games-2.17.new/backgammon/backgammon/main.c
--- bsd-games-2.17/backgammon/backgammon/main.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/backgammon/backgammon/main.c	2006-04-06 13:39:23.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #include <termcap.h>
 #ifndef lint
@@ -101,7 +102,10 @@
 	long    t;		/* time for random num generator */
 
 	/* revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	/* initialization */
 	bflag = 2;		/* default no board */
diff -Naur --exclude '*.swp' bsd-games-2.17/backgammon/teachgammon/teach.c bsd-games-2.17.new/backgammon/teachgammon/teach.c
--- bsd-games-2.17/backgammon/teachgammon/teach.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/backgammon/teachgammon/teach.c	2006-04-06 13:39:44.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #include <termcap.h>
 #ifndef lint
@@ -68,7 +69,10 @@
 	int     i;
 
 	/* revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	signal(SIGINT, getout);
 	if (tcgetattr(0, &old) == -1)	/* get old tty mode */
diff -Naur --exclude '*.swp' bsd-games-2.17/banner/banner.c bsd-games-2.17.new/banner/banner.c
--- bsd-games-2.17/banner/banner.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/banner/banner.c	2006-04-04 17:42:03.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1993, 1994\n\
@@ -1036,7 +1037,10 @@
 	int ch;
 
 	/* revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	while ((ch = getopt(argc, argv, "w:td")) != -1)
 		switch (ch) {
diff -Naur --exclude '*.swp' bsd-games-2.17/battlestar/battlestar.c bsd-games-2.17.new/battlestar/battlestar.c
--- bsd-games-2.17/battlestar/battlestar.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/battlestar/battlestar.c	2006-04-06 13:33:22.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\
@@ -64,7 +65,10 @@
 
 	/* Open the score file then revoke setgid privileges */
 	open_score_file();
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	if (argc < 2)
 		initialize(NULL);
diff -Naur --exclude '*.swp' bsd-games-2.17/bcd/bcd.c bsd-games-2.17.new/bcd/bcd.c
--- bsd-games-2.17/bcd/bcd.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/bcd/bcd.c	2006-04-04 17:34:57.000000000 -0700
@@ -32,6 +32,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
@@ -135,7 +136,10 @@
 	char cardline[80];
 
 	/* revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	/*
 	 * The original bcd prompts with a "%" when reading from stdin,
diff -Naur --exclude '*.swp' bsd-games-2.17/boggle/boggle/bog.c bsd-games-2.17.new/boggle/boggle/bog.c
--- bsd-games-2.17/boggle/boggle/bog.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/boggle/boggle/bog.c	2006-04-04 17:41:17.000000000 -0700
@@ -32,6 +32,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1993\n\
@@ -131,7 +132,10 @@
 	char *bspec, *p;
 
 	/* revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	seed = 0;
 	batch = debug = reuse = selfuse = sflag = 0;
diff -Naur --exclude '*.swp' bsd-games-2.17/caesar/caesar.c bsd-games-2.17.new/caesar/caesar.c
--- bsd-games-2.17/caesar/caesar.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/caesar/caesar.c	2006-04-04 17:31:41.000000000 -0700
@@ -37,6 +37,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
@@ -90,7 +91,10 @@
 	int obs[26], try, winner;
 
 	/* revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	winnerdot = 0;
 	if (argc > 1)
diff -Naur --exclude '*.swp' bsd-games-2.17/canfield/canfield/canfield.c bsd-games-2.17.new/canfield/canfield/canfield.c
--- bsd-games-2.17/canfield/canfield/canfield.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/canfield/canfield/canfield.c	2006-04-06 13:31:18.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
@@ -1666,6 +1667,20 @@
 }
 
 /*
+ * Open the high score file and then drop setgid.
+ */
+void
+open_score() {
+	dbfd = open(_PATH_SCORE, O_RDWR);
+
+	/* Revoke setgid privileges */
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
+}
+
+/*
  * procedure to initialize the game
  */
 void
@@ -1679,10 +1694,6 @@
 	uid = getuid();
 	if (uid < 0)
 		uid = 0;
-	dbfd = open(_PATH_SCORE, O_RDWR);
-
-	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
 
 	if (dbfd < 0)
 		return;
@@ -1797,6 +1808,8 @@
 		exit(0);
 	}
 #endif
+        open_score();
+
 	signal(SIGINT, askquit);
 	signal(SIGHUP, cleanup);
 	signal(SIGTERM, cleanup);
diff -Naur --exclude '*.swp' bsd-games-2.17/canfield/cfscores/cfscores.c bsd-games-2.17.new/canfield/cfscores/cfscores.c
--- bsd-games-2.17/canfield/cfscores/cfscores.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/canfield/cfscores/cfscores.c	2006-04-06 13:14:59.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\
@@ -78,7 +79,10 @@
 	int uid;
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	if (argc > 2) {
 		printf("Usage: cfscores [user]\n");
diff -Naur --exclude '*.swp' bsd-games-2.17/cribbage/crib.c bsd-games-2.17.new/cribbage/crib.c
--- bsd-games-2.17/cribbage/crib.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/cribbage/crib.c	2006-04-04 18:30:44.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
@@ -76,7 +77,10 @@
 		exit(1);
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	/* Set close-on-exec flag on log file */
 	if (f != NULL) {
diff -Naur --exclude '*.swp' bsd-games-2.17/cribbage/instr.c bsd-games-2.17.new/cribbage/instr.c
--- bsd-games-2.17/cribbage/instr.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/cribbage/instr.c	2006-04-04 17:30:46.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
@@ -71,6 +72,11 @@
 		 * for mailx and man.  We only use a pager if stdout is
 		 * a terminal, and we pass the file on stdin to sh -c pager.
 		 */
+		if (setresgid(-1, getgid(), getgid()) != 0) {
+		    perror("Could not drop setgid privileges.  Aborting.");
+		    exit(1);
+		}
+
 		if (!isatty(1))
 			path = "cat";
 		else {
diff -Naur --exclude '*.swp' bsd-games-2.17/factor/factor.c bsd-games-2.17.new/factor/factor.c
--- bsd-games-2.17/factor/factor.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/factor/factor.c	2006-04-07 17:26:49.000000000 -0700
@@ -32,6 +32,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
@@ -138,6 +139,12 @@
 	int ch;
 	char *p, buf[LINE_MAX];		/* > max number of digits. */
 
+	/* Revoke setgid privileges */
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
+
 #ifdef HAVE_OPENSSL 
 	ctx = BN_CTX_new();
 #endif
@@ -145,9 +152,6 @@
 	if (val == NULL)
 		errx(1, "can't initialise bignum");
 
-	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
-
 	while ((ch = getopt(argc, argv, "")) != -1)
 		switch (ch) {
 		case '?':
diff -Naur --exclude '*.swp' bsd-games-2.17/fish/fish.c bsd-games-2.17.new/fish/fish.c
--- bsd-games-2.17/fish/fish.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/fish/fish.c	2006-04-04 17:34:45.000000000 -0700
@@ -32,6 +32,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1990, 1993\n\
@@ -103,7 +104,10 @@
 	int ch, move;
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	while ((ch = getopt(argc, argv, "p")) != -1)
 		switch(ch) {
diff -Naur --exclude '*.swp' bsd-games-2.17/fortune/fortune/fortune.c bsd-games-2.17.new/fortune/fortune/fortune.c
--- bsd-games-2.17/fortune/fortune/fortune.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/fortune/fortune/fortune.c	2006-04-07 17:28:14.000000000 -0700
@@ -32,6 +32,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1986, 1993\n\
@@ -227,7 +228,10 @@
 #endif	/* OK_TO_WRITE_DISK */
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	getargs(ac, av);
 
diff -Naur --exclude '*.swp' bsd-games-2.17/gomoku/main.c bsd-games-2.17.new/gomoku/main.c
--- bsd-games-2.17/gomoku/main.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/gomoku/main.c	2006-04-04 17:35:38.000000000 -0700
@@ -32,6 +32,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1994\n\
@@ -95,7 +96,10 @@
 	};
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	color = curmove = 0;
 
diff -Naur --exclude '*.swp' bsd-games-2.17/hangman/main.c bsd-games-2.17.new/hangman/main.c
--- bsd-games-2.17/hangman/main.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/hangman/main.c	2006-04-04 17:35:55.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\
@@ -57,7 +58,10 @@
 	int ch;
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	while ((ch = getopt(argc, argv, "d:m:")) != -1) {
 		switch (ch) {
diff -Naur --exclude '*.swp' bsd-games-2.17/hunt/hunt/hunt.c bsd-games-2.17.new/hunt/hunt/hunt.c
--- bsd-games-2.17/hunt/hunt/hunt.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/hunt/hunt/hunt.c	2006-04-04 17:36:13.000000000 -0700
@@ -30,6 +30,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __RCSID("$NetBSD: hunt.c,v 1.23 2004/11/05 21:30:32 dsl Exp $");
@@ -138,7 +139,10 @@
 	long		enter_status;
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	enter_status = env_init((long) Q_CLOAK);
 	while ((c = getopt(ac, av, "Sbcfh:l:mn:op:qst:w:")) != -1) {
diff -Naur --exclude '*.swp' bsd-games-2.17/mille/mille.c bsd-games-2.17.new/mille/mille.c
--- bsd-games-2.17/mille/mille.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/mille/mille.c	2006-04-04 17:36:28.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1982, 1993\n\
@@ -58,7 +59,10 @@
 	bool	restore;
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	if (strcmp(av[0], "a.out") == 0) {
 		outf = fopen("q", "w");
diff -Naur --exclude '*.swp' bsd-games-2.17/monop/monop.c bsd-games-2.17.new/monop/monop.c
--- bsd-games-2.17/monop/monop.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/monop/monop.c	2006-04-04 17:36:51.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
@@ -65,7 +66,10 @@
 	char *av[];
 {
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	srand(getpid());
 	heapstart = sbrk(0);
diff -Naur --exclude '*.swp' bsd-games-2.17/morse/morse.c bsd-games-2.17.new/morse/morse.c
--- bsd-games-2.17/morse/morse.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/morse/morse.c	2006-04-04 17:37:05.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1988, 1993\n\
@@ -127,7 +128,10 @@
 	char *p;
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	while ((ch = getopt(argc, argv, "ds")) != -1)
 		switch((char)ch) {
diff -Naur --exclude '*.swp' bsd-games-2.17/number/number.c bsd-games-2.17.new/number/number.c
--- bsd-games-2.17/number/number.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/number/number.c	2006-04-07 17:30:32.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1988, 1993, 1994\n\
@@ -94,7 +95,10 @@
 	char line[256];
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	lflag = 0;
 	while ((ch = getopt(argc, argv, "l")) != -1)
diff -Naur --exclude '*.swp' bsd-games-2.17/pig/pig.c bsd-games-2.17.new/pig/pig.c
--- bsd-games-2.17/pig/pig.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/pig/pig.c	2006-04-04 17:37:19.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1992, 1993\n\
@@ -66,7 +67,10 @@
 	char buf[1024];
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	while ((ch = getopt(argc, argv, "")) != -1)
 		switch(ch) {
diff -Naur --exclude '*.swp' bsd-games-2.17/pom/pom.c bsd-games-2.17.new/pom/pom.c
--- bsd-games-2.17/pom/pom.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/pom/pom.c	2006-04-04 17:37:30.000000000 -0700
@@ -31,6 +31,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
@@ -101,7 +102,10 @@
 	char buf[1024];
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	if (time(&now) == (time_t)-1)
 		err(1, "time");
diff -Naur --exclude '*.swp' bsd-games-2.17/ppt/ppt.c bsd-games-2.17.new/ppt/ppt.c
--- bsd-games-2.17/ppt/ppt.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/ppt/ppt.c	2006-04-04 17:37:39.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1988, 1993\n\
@@ -73,7 +74,10 @@
 	int c, start, neednl, dflag;
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	dflag = 0;
 	while ((c = getopt(argc, argv, "dh")) != -1)
diff -Naur --exclude '*.swp' bsd-games-2.17/primes/primes.c bsd-games-2.17.new/primes/primes.c
--- bsd-games-2.17/primes/primes.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/primes/primes.c	2006-04-07 17:29:06.000000000 -0700
@@ -32,6 +32,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
@@ -119,7 +120,10 @@
 	char *p;
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	while ((ch = getopt(argc, argv, "")) != -1)
 		switch (ch) {
diff -Naur --exclude '*.swp' bsd-games-2.17/quiz/quiz.c bsd-games-2.17.new/quiz/quiz.c
--- bsd-games-2.17/quiz/quiz.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/quiz/quiz.c	2006-04-04 17:37:56.000000000 -0700
@@ -33,6 +33,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1991, 1993\n\
@@ -85,7 +86,10 @@
 	const char *indexfile;
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	indexfile = _PATH_QUIZIDX;
 	while ((ch = getopt(argc, argv, "i:t")) != -1)
diff -Naur --exclude '*.swp' bsd-games-2.17/rain/rain.c bsd-games-2.17.new/rain/rain.c
--- bsd-games-2.17/rain/rain.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/rain/rain.c	2006-04-04 17:38:07.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
@@ -77,7 +78,10 @@
 	int xpos[5], ypos[5];
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	while ((ch = getopt(argc, argv, "d:")) != -1)
 		switch (ch) {
diff -Naur --exclude '*.swp' bsd-games-2.17/random/random.c bsd-games-2.17.new/random/random.c
--- bsd-games-2.17/random/random.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/random/random.c	2006-04-04 17:38:19.000000000 -0700
@@ -32,6 +32,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1994\n\
@@ -73,7 +74,10 @@
 	char *ep;
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	denom = 0;
 	random_exit = unbuffer_output = 0;
diff -Naur --exclude '*.swp' bsd-games-2.17/robots/main.c bsd-games-2.17.new/robots/main.c
--- bsd-games-2.17/robots/main.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/robots/main.c	2006-04-06 13:35:58.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
@@ -68,7 +69,10 @@
 		exit(1);
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	show_only = FALSE;
 	Num_games = 1;
diff -Naur --exclude '*.swp' bsd-games-2.17/snake/snake/snake.c bsd-games-2.17.new/snake/snake/snake.c
--- bsd-games-2.17/snake/snake/snake.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/snake/snake/snake.c	2006-04-06 13:32:03.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
@@ -159,7 +160,10 @@
 		warn("fopen %s", _PATH_LOGFILE);
 		sleep(2);
 	}
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	(void) time(&tv);
 
diff -Naur --exclude '*.swp' bsd-games-2.17/snake/snscore/snscore.c bsd-games-2.17.new/snake/snscore/snscore.c
--- bsd-games-2.17/snake/snscore/snscore.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/snake/snscore/snscore.c	2006-04-06 13:15:19.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
@@ -75,7 +76,10 @@
 	struct	passwd	*p;
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	fd = fopen(recfile, "r");
 	if (fd == NULL)
diff -Naur --exclude '*.swp' bsd-games-2.17/trek/main.c bsd-games-2.17.new/trek/main.c
--- bsd-games-2.17/trek/main.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/trek/main.c	2006-04-04 17:38:38.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
@@ -173,7 +174,10 @@
 	struct	termios		argp;
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	av = argv;
 	ac = argc;
diff -Naur --exclude '*.swp' bsd-games-2.17/worm/worm.c bsd-games-2.17.new/worm/worm.c
--- bsd-games-2.17/worm/worm.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/worm/worm.c	2006-04-07 17:28:35.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
@@ -99,7 +100,10 @@
 {
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	setbuf(stdout, outbuf);
 	srand(getpid());
diff -Naur --exclude '*.swp' bsd-games-2.17/worms/worms.c bsd-games-2.17.new/worms/worms.c
--- bsd-games-2.17/worms/worms.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/worms/worms.c	2006-04-04 17:41:34.000000000 -0700
@@ -29,6 +29,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
@@ -199,7 +200,10 @@
 	unsigned int delay = 0;
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 	mp = NULL;
 	length = 16;
diff -Naur --exclude '*.swp' bsd-games-2.17/wump/wump.c bsd-games-2.17.new/wump/wump.c
--- bsd-games-2.17/wump/wump.c	2006-04-14 15:55:41.000000000 -0700
+++ bsd-games-2.17.new/wump/wump.c	2006-04-04 17:41:55.000000000 -0700
@@ -33,6 +33,7 @@
  * SUCH DAMAGE.
  */
 
+#define _GNU_SOURCE
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
@@ -145,7 +146,10 @@
 	int c;
 
 	/* Revoke setgid privileges */
-	setregid(getgid(), getgid());
+        if (setresgid(-1, getgid(), getgid()) == -1) {
+            perror("Could not drop setgid privileges.  Aborting.");
+            exit(1);
+        }
 
 #ifdef DEBUG
 	while ((c = getopt(argc, argv, "a:b:hp:r:t:d")) != -1)

bsd-games-2.17-tetrisgid.patch:

--- NEW FILE bsd-games-2.17-tetrisgid.patch ---
diff -Naur --exclude '*.swp' bsd-games-2.17/tetris/scores.c bsd-games-2.17.new/tetris/scores.c
--- bsd-games-2.17/tetris/scores.c	2006-04-22 20:46:56.000000000 -0700
+++ bsd-games-2.17.new/tetris/scores.c	2006-04-22 22:02:45.000000000 -0700
@@ -41,6 +41,7 @@
  *
  * Major whacks since then.
  */
+#define _GNU_SOURCE /* this must be done before the first include of unistd.h */
 #include <err.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -77,85 +78,88 @@
 
 static int checkscores(struct highscore *, int);
 static int cmpscores(const void *, const void *);
-static void getscores(FILE **);
+static void getscores(FILE *);
 static void printem(int, int, struct highscore *, int, const char *);
 static char *thisuser(void);
 
 /*
- * Read the score file.  Can be called from savescore (before showscores)
- * or showscores (if savescore will not be called).  If the given pointer
- * is not NULL, sets *fpp to an open file pointer that corresponds to a
- * read/write score file that is locked with LOCK_EX.  Otherwise, the
- * file is locked with LOCK_SH for the read and closed before return.
- *
- * Note, we assume closing the stdio file releases the lock.
+ * Read the score file from a previously opened file pointer.  If the file
+ * pointer is null, then read the scoreboard from a known location.  Otherwise,
+ * the FILE pointer is rewound, read, and left open to be read again later.
  */
 static void
-getscores(fpp)
-	FILE **fpp;
+getscores(fp)
+    FILE *fp;
 {
-	int sd, mint, lck;
-	mode_t mask;
-	const char *mstr, *human;
-	FILE *sf;
-
-	if (fpp != NULL) {
-		mint = O_RDWR | O_CREAT;
-		mstr = "r+";
-		human = "read/write";
-		lck = LOCK_EX;
-	} else {
-		mint = O_RDONLY;
-		mstr = "r";
-		human = "reading";
-		lck = LOCK_SH;
-	}
-	setegid(egid);
-	mask = umask(S_IWOTH);
-	sd = open(_PATH_SCOREFILE, mint, 0666);
-	(void)umask(mask);
-	if (sd < 0) {
-		if (fpp == NULL) {
-			nscores = 0;
-			setegid(gid);
-			return;
-		}
-		err(1, "cannot open %s for %s", _PATH_SCOREFILE, human);
-	}
-	if ((sf = fdopen(sd, mstr)) == NULL) {
-		err(1, "cannot fdopen %s for %s", _PATH_SCOREFILE, human);
-	}
-	setegid(gid);
+	int sd = -1;
+        FILE *sf = fp;
 
-	/*
-	 * Grab a lock.
-	 */
-	if (flock(sd, lck))
-		warn("warning: score file %s cannot be locked",
-		    _PATH_SCOREFILE);
+        if (sf == NULL) {
+            sd = open(_PATH_SCOREFILE, O_RDONLY, 0664);
+            if (sd < 0) {
+                    nscores = 0;
+                    return;
+                    err(1, "cannot open %s for reading", _PATH_SCOREFILE);
+            }
+            if ((sf = fdopen(sd, "r")) == NULL) {
+                    err(1, "cannot fdopen %s for reading", _PATH_SCOREFILE);
+            }
+        } else {
+            rewind(sf);
+        }
 
 	nscores = fread(scores, sizeof(scores[0]), MAXHISCORES, sf);
 	if (ferror(sf)) {
 		err(1, "error reading %s", _PATH_SCOREFILE);
 	}
 
-	if (fpp)
-		*fpp = sf;
-	else
-		(void)fclose(sf);
+	else {
+                if (fp == NULL) {
+                        (void)fclose(sf);
+                }
+        }
+}
+
+/*
+ * Open the high score file and then drop setgid privileges.  If running
+ * setgid, then calling this function a second time will result in a
+ * permission denied error since gid privileges will have been lost.
+ */
+void
+open_score(fd, fp)
+    int *fd;
+    FILE **fp;
+{
+    *fd = open(_PATH_SCOREFILE, O_RDWR | O_CREAT, 0664);
+    if (*fd < 0) {
+        err(1, "Could not open scoreboard file %s", _PATH_SCOREFILE);
+    } else {
+        *fp = fdopen(*fd, "r+");
+        if (*fp == NULL) {
+            err(1, "Could not open scoreboard file %s", _PATH_SCOREFILE);
+        }
+    }
+    if (setresgid(-1, getgid(), getgid()) == -1) {
+        perror("Could not drop setgid privileges.  Aborting.");
+        exit(1);
+    }
 }
 
 void
-savescore(level)
+savescore(level, sf)
 	int level;
+        FILE *sf;
 {
 	struct highscore *sp;
 	int i;
 	int change;
-	FILE *sf;
 	const char *me;
 
-	getscores(&sf);
+        if (sf == NULL) {
+            return;
+        }
+
+	getscores(sf);
 	gotscores = 1;
 	(void)time(&now);
 
@@ -215,14 +219,17 @@
 static char *
 thisuser()
 {
-	const char *p;
+	const char *p = (char *)NULL;
 	struct passwd *pw;
 	size_t l;
 	static char u[sizeof(scores[0].hs_name)];
 
 	if (u[0])
 		return (u);
+        /* Don't use getlogin() as it will return the wrong result
+         * for someone who has su'd to a different user.
 	p = getlogin();
+         */
 	if (p == NULL || *p == '\0') {
 		pw = getpwuid(getuid());
 		if (pw != NULL)
@@ -359,7 +366,7 @@
 	int levelfound[NLEVELS];
 
 	if (!gotscores)
-		getscores((FILE **)NULL);
+		getscores(NULL);
 	(void)printf("\n\t\t\t    Tetris High Scores\n");
 
 	/*
diff -Naur --exclude '*.swp' bsd-games-2.17/tetris/scores.h bsd-games-2.17.new/tetris/scores.h
--- bsd-games-2.17/tetris/scores.h	2006-04-22 20:46:56.000000000 -0700
+++ bsd-games-2.17.new/tetris/scores.h	2006-04-22 16:30:46.000000000 -0700
@@ -48,5 +48,6 @@
 #define MAXSCORES	9	/* maximum high score entries per person */
 #define	EXPIRATION	(5L * 365 * 24 * 60 * 60)
 
-void	savescore(int);
+void	savescore(int, FILE *);
+void    open_score(int *, FILE **);
 void	showscores(int);
diff -Naur --exclude '*.swp' bsd-games-2.17/tetris/tetris.c bsd-games-2.17.new/tetris/tetris.c
--- bsd-games-2.17/tetris/tetris.c	2006-04-22 20:46:56.000000000 -0700
+++ bsd-games-2.17.new/tetris/tetris.c	2006-04-22 21:02:27.000000000 -0700
@@ -135,10 +135,15 @@
 	char key_write[6][10];
 	int ch, i, j;
 	int fd;
+        int sd = 0;
+        FILE *sf = (FILE *)NULL;
 
-	gid = getgid();
-	egid = getegid();
-	setegid(gid);
+        /*
+         * This function has the side effect of dropping setgid privileges.
+         * sd is not used, but is kept around in case we want to add code
+         * to lock shared access to the scoreboard later.
+         */
+        open_score(&sd, &sf);
 
 	fd = open("/dev/null", O_RDONLY);
 	if (fd < 3)
@@ -307,7 +312,7 @@
 
 	(void)printf("Your score:  %d point%s  x  level %d  =  %d\n",
 	    score, score == 1 ? "" : "s", level, score * level);
-	savescore(level);
+	savescore(level, sf);
 
 	printf("\nHit RETURN to see high scores, ^C to skip.\n");
 

bsd-games-2.17-utmpstruct.patch:

--- NEW FILE bsd-games-2.17-utmpstruct.patch ---
--- bsd-games-2.17.new/dm/utmpentry.c	2004-10-23 05:17:21.000000000 -0700
+++ bsd-games-2.17/dm/utmpentry.c	2006-04-04 10:51:17.000000000 -0700
@@ -291,7 +291,8 @@
 	e->line[sizeof(e->line) - 1] = '\0';
 	(void)strncpy(e->host, up->ut_host, sizeof(up->ut_host));
 	e->name[sizeof(e->host) - 1] = '\0';
-	e->tv = up->ut_tv;
+	e->tv.tv_sec = up->ut_tv.tv_sec;
+	e->tv.tv_usec = up->ut_tv.tv_usec;
 	adjust_size(e);
 }
 #endif


--- NEW FILE bsd-games.spec ---
Summary: Collection of text-based games
Name: bsd-games
Version: 2.17
Release: 8%{?dist}
License: BSD
Group: Amusements/Games
URL: ftp://metalab.unc.edu/pub/Linux/games/
Source0: ftp://metalab.unc.edu/pub/Linux/games/bsd-games-%{version}.tar.gz
Source1: config.params
# A collection of patches from Debian.
Patch0: bsd-games-2.17-debian.patch
# Patches from Fedora Core 1
Patch1: bsd-games-2.17-ospeed.patch
Patch2: bsd-games-2.17-getline.patch
Patch3: bsd-games-2.17-utmpstruct.patch
# Additional new patches
Patch4: bsd-games-2.17-setresgid.patch
Patch5: bsd-games-2.17-tetrisgid.patch
Patch6: bsd-games-2.17-hackgid.patch
Patch7: bsd-games-2.17-phantasiagid.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# It looks like textutils became coreutils at some point.  I'm not sure
# what is needed from it, so I'm commenting it out until I can find out.
#Requires: textutils
BuildRequires: ncurses-devel libtermcap-devel words
Requires(Pre): /usr/sbin/groupadd

%description
Bsd-games includes adventure, arithmetic, atc, backgammon, battlestar,
bcd, caesar, canfield, cfscores, cribbage, go-fish, gomoku,
hunt, mille, monop, morse, number, phantasia, pig, pom, ppt, primes,
quiz, rain, random, robots, rot13, sail, snake, snscore, teachgammon,
tetris-bsd, trek, wargames, worm, worms and wump.

%prep
%setup -q
install -p -m 755 %{SOURCE1} .
%patch0 -p1 -b .debian
%patch1 -p1 -b .ospeed
%patch2 -p1 -b .getline
%patch3 -p1 -b .utmpstruct
%patch4 -p1 -b .setresgid
%patch5 -p1 -b .tetrisgid
%patch6 -p1 -b .hackgid
%patch7 -p1 -b .phantasiagid

%build
# We include a templatized configuration settings file to set
# reasonable defaults, and to tell the configure script not to
# run in interactive mode.
sed -i.bak -e "s#@DESTDIR@#$RPM_BUILD_ROOT#" \
    -e "s#@bindir@#%{_bindir}#" \
    -e "s#@docdir@#%{_docdir}#" \
    -e "s#@sbindir@#%{_sbindir}#" \
    -e "s#@datadir@#%{_datadir}#" \
    -e "s#@libdir@#%{_libdir}#" \
    -e "s#@mandir@#%{_mandir}#" \
    -e "s#@var@#%{_var}#" \
    -e "s#@RPM_OPT_FLAGS@#$RPM_OPT_FLAGS#" \
    config.params 

# Don't use %%configure.  This configure script wasn't generated by
# autoconf and doesn't obey things like --prefix.
./configure
make RPM_OPT_FLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE" %{?_smp_mflags}

# Rename one doc file to avoid naming collisions
cp hunt/README README.hunt

%install
rm -rf $RPM_BUILD_ROOT
make RPM_BUILD_ROOT="$RPM_BUILD_ROOT" install

# Change the binary name for monop to prevent a conflict with the mono-devel
# package
mv $RPM_BUILD_ROOT/%{_bindir}/monop $RPM_BUILD_ROOT/%{_bindir}/mpoly

# Remove this doc file.  We're copying it to a different location for Fedora.
rm -f $RPM_BUILD_ROOT/%{_docdir}/trek.me

%clean
rm -rf $RPM_BUILD_ROOT

%pre
%{_sbindir}/groupadd gamehack &>/dev/null || :
%{_sbindir}/groupadd gamesail &>/dev/null || :
%{_sbindir}/groupadd gamephant &>/dev/null || :

%files
%defattr(-,root,root)
%{_bindir}/adventure
%{_bindir}/arithmetic
%attr(2755,root,games) %{_bindir}/atc
%{_bindir}/backgammon
%{_bindir}/teachgammon
%attr(2755,root,games) %{_bindir}/battlestar
%{_bindir}/banner
%{_bindir}/boggle
%{_bindir}/bcd
%{_bindir}/caesar
%{_bindir}/dab
%{_bindir}/rot13
%attr(2755,root,games) %{_bindir}/canfield
%{_bindir}/cfscores
%attr(2755,root,games) %{_bindir}/cribbage
%{_bindir}/go-fish
%{_bindir}/gomoku
%attr(2755,root,gamehack) %{_bindir}/hack
%{_bindir}/hangman
%{_bindir}/hunt
%{_bindir}/mille
%{_bindir}/mpoly
%{_bindir}/morse
%{_bindir}/number
%attr(2755,root,gamephant) %{_bindir}/phantasia
%{_bindir}/pig
%{_bindir}/pom
%{_bindir}/ppt
%{_bindir}/primes
%{_bindir}/quiz
%{_bindir}/rain
%{_bindir}/random
%attr(2755,root,games) %{_bindir}/robots
%attr(2755,root,gamesail) %{_bindir}/sail
%attr(2755,root,games) %{_bindir}/snake
%{_bindir}/snscore
%attr(2755,root,games) %{_bindir}/tetris-bsd
%{_bindir}/trek
%{_bindir}/wargames
%{_bindir}/worm
%{_bindir}/worms
%{_bindir}/wtf
%{_bindir}/wump
%dir %{_datadir}/bsd-games
%{_datadir}/bsd-games/atc
%{_datadir}/bsd-games/boggle
%{_datadir}/bsd-games/cribbage.instr
%{_datadir}/bsd-games/fish.instr
%{_datadir}/bsd-games/monop-cards.pck
%{_datadir}/bsd-games/quiz
%{_datadir}/bsd-games/wump.info
%{_datadir}/misc/acronyms
%{_datadir}/misc/acronyms.comp
%{_mandir}/man6/*
%{_sbindir}/huntd
%attr(664,root,games) %{_var}/games/atc_score
%attr(664,root,games) %{_var}/games/battlestar.log
%attr(664,root,games) %{_var}/games/cfscores
%attr(664,root,games) %{_var}/games/criblog
%{_datadir}/bsd-games/hack/
%dir %attr(0775,root,gamehack) %{_var}/games/hack
%attr(664,root,gamehack) %{_var}/games/hack/*
%dir %attr(775,root,gamephant) %{_var}/games/phantasia
%attr(664,root,gamephant) %{_var}/games/phantasia/*
%dir %attr(775,root,gamesail) %{_var}/games/sail
%attr(644,root,games) %{_var}/games/robots_roll
%attr(664,root,gamesail) %{_var}/games/saillog
%attr(664,root,games) %{_var}/games/snake.log
%attr(664,root,games) %{_var}/games/snakerawscores
%attr(664,root,games) %{_var}/games/tetris-bsd.scores
%doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me

%changelog
* Fri Apr 28 2006 Wart <wart at kobold.org> 2.17-8
- Fix directory ownership of _datadir/bsd-games
- Change license to BSD

* Thu Apr 27 2006 Wart <wart at kobold.org> 2.17-7
- Remove dm for Fedora
- Turn off setgid bit for cfscores
- Limit setgid code segments in hack
- Limit setgid code segments in phantasia

* Wed Apr 26 2006 Wart <wart at kobold.org> 2.17-6
- Remove bones file modifications from hack and run with a custom group
  instead.

* Sun Apr 24 2006 Wart <wart at kobold.org> 2.17-5
- Modified bones file handling to allow us to drop setgid earlier.

* Sat Apr 22 2006 Wart <wart at kobold.org> 2.17-4
- Added dist tag to release number
- Added patch to limit potential security holes in tetris-bsd
- Added patch set from Debian's package, which includes a security patch
  for CVE-2006-1744
- Rename monop to mpoly to avoid conflict with the mono-devel package.

* Fri Apr 14 2006 Wart <wart at kobold.org> 2.17-3
- Updated setresgid patch to disable potential security holes from
  user-specified scoreboard files.
- Move hack save games to $HOME, but can be moved using HACKDIR or the
  '-d' command line option.

* Sat Apr 8 2006 Wart <wart at kobold.org> 2.17-2
- Added patch to change use of setregid to setresgid almost everywhere.
- Added missing BuildRequires

* Mon Apr 3 2006 Wart <wart at kobold.org> 2.17-1
- Updated to 2.17 with new configuration system
- Updated patches for 2.17
- Updated spec file for Fedora Extras

* Fri Feb 16 2001 Tim Powers <timp at redhat.com>
- fixed getline() redefinition, it is included in stdio.h now, so 
  getline had to be renamed. Also, -D_GNU_SOURCE
- fix bug 27850, where certain games need to be setgid games, and 
  their scorefiles etc. need to belong to group games

* Tue Aug 1 2000 Tim Powers <timp at redhat.com>
- fix bug #15013, bad dir permissions

* Mon Jul 24 2000 Prospector <prospector at redhat.com>
- rebuilt

* Thu Jul 13 2000 Trond Eivind Glomsr??d <teg at redhat.com>
- use %%{_tmppath}
- don't use internal rpm programs 
- kill countmail, no longer require frm from elm

* Mon Jun 5 2000 Tim Powers <timp at redhat.com>
- fixed man page location to be in %{_mandir}
- fixed so that regular users can build

* Fri May 5 2000 Tim Powers <timp at redhat.com>
- rebuilt for 7.0
- compress man pages

* Thu Feb 10 2000 Tim Powers <timp at redhat.com>
- strip binaries.

* Sun Nov 21 1999 Bernhard Rosenkraenzer <bero at redhat.com>
- 2.9

* Mon Nov 1 1999 Tim Powers <timp at redhat.com>
- updated source to 2.8
- fixed problem with ospeed being defined in the source instead of including
	termcap.h (new ospeed patch)
- using files list in %files section instead of entering
	_every_single_filename_.

* Sat Aug 21 1999 Bill Nottingham <notting at redhat.com>
- fix countmail (#3722). I must be bored.

* Mon Aug 16 1999 Bill Nottingham <notting at redhat.com>
- make dm setgid games, not setuid root...

* Fri Jul 9 1999 Tim Powers <timp at redhat.com>
- updated source to 2.7
- updated patches to fix bugs and the braindead configure script, 
  dropped a few of the older patches that made it into this release
- replaced -make install with make install-strip
- built for 6.1

* Wed May 12 1999 Bill Nottingham <notting at redhat.com>
- pick up some more files

* Thu Apr 01 1999 Michael Maher <mike at redhat.com>
- only a fool would add a dependency to this package on a 
  day like today.

* Fri Mar 18 1999 Michael Maher <mike at redhat.com>
- fixed bug 1550

* Mon Feb 08 1999 Michael Maher <mike at redhat.com>
- moved pacakge to PowerTools.

* Thu Jun 18 1998 Alan Cox <alan at redhat.com>
- Chris Evans pointed out a hole in sail I missed.

* Wed Jun 17 1998 Alan Cox <alan at redhat.com>
- Stopped people using cribbage to be able to cheat game score files.

* Tue May 05 1998 Prospector System <bugs at redhat.com>
- translations modified for de, fr, tr

* Thu Apr 30 1998 Cristian Gafton <gafton at redhat.com>
- fixed the config patch so that it will build on non /usr/src/redhat build
  trees

* Tue Apr 07 1998 Erik Troan <ewt at redhat.com>
- updated to bsd-games 2.1
- started over on package


--- NEW FILE config.params ---
#!/bin/sh

# This file contains the configuration settings for the bsd games
# collection as packaged for Fedora Extras.  Only some settings are
# listed here.  You'll have to comb through the configure script
# to discover other things that can be modified.

bsd_games_cfg_non_interactive=y
bsd_games_cfg_install_prefix=@DESTDIR@
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@
bsd_games_cfg_man6dir=@mandir@/man6
bsd_games_cfg_man8dir=@mandir@/man8
bsd_games_cfg_man5dir=@mandir@/man5
bsd_games_cfg_docdir=@docdir@
bsd_games_cfg_sharedir=@datadir@/bsd-games/
bsd_games_cfg_varlibdir=@var@/games/
# Don't try to chown the files.  This will fail for non-root users and
# will instead be handled in the rpm packaging.
bsd_games_cfg_do_chown=n
bsd_games_cfg_use_dot_so=.so
bsd_games_cfg_gzip_manpages=y
bsd_games_cfg_cc=gcc
bsd_games_cfg_cxx=g++
bsd_games_cfg_optimize_flags="@RPM_OPT_FLAGS@"
bsd_games_cfg_ncurses_lib=-lncurses
bsd_games_cfg_ncurses_includes=
bsd_games_cfg_base_libs=
bsd_games_cfg_yacc="bison -y"
bsd_games_cfg_lex=flex
bsd_games_cfg_lex_lib=-lfl
bsd_games_cfg_pager=/usr/bin/less
bsd_games_cfg_sail_dir="$bsd_games_cfg_varlibdir/sail"
bsd_games_cfg_sail_dir_owner="root"
bsd_games_cfg_sail_dir_group="root"
bsd_games_cfg_sail_dir_perms="0750"
bsd_games_cfg_hack_dir="/var/games/hack"
bsd_games_cfg_hack_dir_owner="root"
bsd_games_cfg_hack_dir_group="root"
bsd_games_cfg_hack_dir_perms="0755"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bsd-games/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Apr 2006 15:33:05 -0000	1.1
+++ .cvsignore	29 Apr 2006 15:34:43 -0000	1.2
@@ -0,0 +1 @@
+bsd-games-2.17.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bsd-games/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Apr 2006 15:33:05 -0000	1.1
+++ sources	29 Apr 2006 15:34:43 -0000	1.2
@@ -0,0 +1 @@
+238a38a3a017ca9b216fc42bde405639  bsd-games-2.17.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 29 15:42:44 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sat, 29 Apr 2006 08:42:44 -0700
Subject: rpms/heartbeat/devel .cvsignore, 1.3, 1.4 sources, 1.3,
	1.4 heartbeat.spec, 1.3, 1.4 heartbeat-fedora-chkconfig.patch,
	1.1, 1.2 heartbeat-fedora-pam.patch, 1.1, 1.2
Message-ID: <200604291542.k3TFgkgc007386@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/heartbeat/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7353

Modified Files:
	.cvsignore sources heartbeat.spec 
	heartbeat-fedora-chkconfig.patch heartbeat-fedora-pam.patch 
Log Message:
* Thu Apr 27 2006  Joost Soeterbroek <fedora at soeterbroek.com> - 2.0.5-1
- upstream version 2.0.5
- removed patch2 - ownership of /heartbeat/crm/cib.xml is no longer
  set in cts/CM_LinuxHAv2.py.in
  + Version 2.0.5 - significant bug fixes and a few feature deficits fixed
  + various portability fixes
  + enable GUI to run with pygtk 2.4
  + significant GUI improvements and speedups
  + numerous logging improvements (generally much quieter)
  + speed up CIB processing by writing it to disk asynchronously
  + add CIB on-disk checksums
  + removed dependency on openssl
  + added "failure stickiness" to the CIB/CRM
  + Several fixes to the membership code
  + We now log all output from resource agents
  + fixed STONITHd memory leaks.
  + Added an OCF RA for Xen guests
  + Added email alerts to ldirectord
  + Improvements to the haresources2cib upgrade tool
  + Several fixes to cibadmin
  + Fix some autoadd-related bugs
  + Added Chinese support to the GUI
  + Added a daemon to replace and generalize ipfail
    + Limited testing only
  + Significant improvements to CIM model, including modifying things
  + Extensive Master/slave testing and fixes
  + Use a digest of the parameters used in an action (smaller CIB)
  + Improved detection of "old" events that should be ignored by the PE
    (ensures resource monitoring is active when required)
  + Better detection of required and/or optimal behaviour in mixed
    (and formerly mixed) clusters
  + LRM now supports multiple concurrent monitor operations
  + Optional startup & runtime enforcement of DTD validation
    (Invalid changes are rejected)
  + cibadmin tool overhauled and verified to function correctly
  + Some deprecated CIB features now unsupported
    + Placing nvpair objects in crm_config (must now use
      cluster_property_set)
    + on_stopfail removed in favor of setting on_fail in the resource's
      stop operation
    + start_prereq removed in favor of setting prereq in the resource's
      start operation 



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	29 Mar 2006 18:40:39 -0000	1.3
+++ .cvsignore	29 Apr 2006 15:42:44 -0000	1.4
@@ -1 +1 @@
-heartbeat-2.0.4.tar.gz
+heartbeat-2.0.5.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	29 Mar 2006 18:40:00 -0000	1.3
+++ sources	29 Apr 2006 15:42:44 -0000	1.4
@@ -1 +1 @@
-659aae2365daea3a17e5a4a4ae0b0a3e  heartbeat-2.0.4.tar.gz
+209228b2948cfa4762a3a66454c6cc35  heartbeat-2.0.5.tar.gz


Index: heartbeat.spec
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/devel/heartbeat.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- heartbeat.spec	29 Mar 2006 18:41:54 -0000	1.3
+++ heartbeat.spec	29 Apr 2006 15:42:44 -0000	1.4
@@ -5,19 +5,19 @@
 %define           uname hacluster
 Summary:          Heartbeat subsystem for High-Availability Linux
 Name:             heartbeat
-Version:          2.0.4
-Release:          2%{?dist}
+Version:          2.0.5
+Release:          1%{?dist}
 License:          GPL/LGPL
 URL:              http://linux-ha.org/
 Group:            System Environment/Daemons
 Source0:          http://linux-ha.org/download/%{name}-%{version}.tar.gz
 Patch0:           heartbeat-fedora-pam.patch
 Patch1:           heartbeat-fedora-chkconfig.patch
-Patch2:           heartbeat-fedora-ccmuser.patch
+#Patch2:           heartbeat-fedora-ccmuser.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires:    glib2-devel
 BuildRequires:    iputils
-BuildRequires:    openssl-devel
+#BuildRequires:    openssl-devel
 BuildRequires:    libnet-devel
 BuildRequires:    libtool-ltdl-devel
 BuildRequires:    net-snmp-devel
@@ -108,7 +108,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+#%patch2 -p1
  
 %build
 # disable-fatal-warnings flag used to disable gcc4.x warnings of 'difference in signedness'
@@ -139,7 +139,6 @@
 
 sed -i -e '1i# -*-Shell-script-*-' $RPM_BUILD_ROOT/%{_libdir}/heartbeat/ocf-shellfuncs 
 sed -i -e '1i# -*-Shell-script-*-' $RPM_BUILD_ROOT/%{_sysconfdir}/ha.d/shellfuncs
-chmod -x $RPM_BUILD_ROOT/%{_libdir}/heartbeat/crmtest/helper.sh
 chmod -x $RPM_BUILD_ROOT/%{_libdir}/heartbeat/ocf-shellfuncs
 chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/ha.d/shellfuncs
 chmod -x $RPM_BUILD_ROOT/%{_libdir}/heartbeat/pymgmt.py
@@ -191,6 +190,7 @@
 %{_libdir}/libcib.so.*
 %{_libdir}/libclm.so.*
 %{_libdir}/libcrmcommon.so.*
+%{_libdir}/libtransitioner.so.*
 %{_libdir}/libhbclient.so.*
 %{_libdir}/liblrm.so.*
 %{_libdir}/libpengine.so.*
@@ -223,9 +223,13 @@
 %{_sbindir}/crm_attribute
 %{_sbindir}/crm_resource
 %{_sbindir}/crm_verify
+%{_sbindir}/attrd_updater
+%{_sbindir}/crm_failcount
+%{_sbindir}/crm_primitive.*
 %dir %attr (755, hacluster, haclient) %{_var}/run/heartbeat/ccm
 %dir %attr (755, hacluster, haclient) %{_var}/run/heartbeat/crm
 %dir %attr (755, hacluster, haclient) %{_var}/lib/heartbeat/crm
+%dir %attr (755, hacluster, haclient) %{_var}/lib/heartbeat/pengine
 %{_mandir}/man1/cl_status.1*
 %{_mandir}/man1/ha_logger.1*
 %{_mandir}/man1/hb_standby.1*
@@ -244,7 +248,7 @@
 %{_libdir}/libhbmgmtcommon.so.*
 %{_libdir}/libhbmgmttls.so.*
 %config(noreplace) %{_sysconfdir}/pam.d/hbmgmtd
-%{_datadir}/locale/zh_CN/LC_MESSAGES/haclient.zh_CN.mo
+%{_datadir}/locale/zh_CN/LC_MESSAGES/haclient.mo
 %endif
 
 %files -n ldirectord
@@ -276,6 +280,8 @@
 %doc doc/COPYING 
 %doc doc/README
 %defattr(-,root,root)
+/usr/include/pils
+%{_libdir}/libpils.*
 %{_libdir}/pils/
 
 %files devel
@@ -290,6 +296,49 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Apr 27 2006  Joost Soeterbroek <fedora at soeterbroek.com> - 2.0.5-1
+- upstream version 2.0.5
+- removed patch2 - ownership of /heartbeat/crm/cib.xml is no longer
+  set in cts/CM_LinuxHAv2.py.in
+  + Version 2.0.5 - significant bug fixes and a few feature deficits fixed
+  + various portability fixes
+  + enable GUI to run with pygtk 2.4
+  + significant GUI improvements and speedups
+  + numerous logging improvements (generally much quieter)
+  + speed up CIB processing by writing it to disk asynchronously
+  + add CIB on-disk checksums
+  + removed dependency on openssl
+  + added "failure stickiness" to the CIB/CRM
+  + Several fixes to the membership code
+  + We now log all output from resource agents
+  + fixed STONITHd memory leaks.
+  + Added an OCF RA for Xen guests
+  + Added email alerts to ldirectord
+  + Improvements to the haresources2cib upgrade tool
+  + Several fixes to cibadmin
+  + Fix some autoadd-related bugs
+  + Added Chinese support to the GUI
+  + Added a daemon to replace and generalize ipfail
+    + Limited testing only
+  + Significant improvements to CIM model, including modifying things
+  + Extensive Master/slave testing and fixes
+  + Use a digest of the parameters used in an action (smaller CIB)
+  + Improved detection of "old" events that should be ignored by the PE
+    (ensures resource monitoring is active when required)
+  + Better detection of required and/or optimal behaviour in mixed
+    (and formerly mixed) clusters
+  + LRM now supports multiple concurrent monitor operations
+  + Optional startup & runtime enforcement of DTD validation
+    (Invalid changes are rejected)
+  + cibadmin tool overhauled and verified to function correctly
+  + Some deprecated CIB features now unsupported
+    + Placing nvpair objects in crm_config (must now use
+      cluster_property_set)
+    + on_stopfail removed in favor of setting on_fail in the resource's
+      stop operation
+    + start_prereq removed in favor of setting prereq in the resource's
+      start operation 
+
 * Wed Mar 29 2006  Joost Soeterbroek <fedora at soeterbroek.com> - 2.0.4-2
 - Version 2.0.4
 

heartbeat-fedora-chkconfig.patch:

Index: heartbeat-fedora-chkconfig.patch
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/devel/heartbeat-fedora-chkconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- heartbeat-fedora-chkconfig.patch	29 Mar 2006 15:46:50 -0000	1.1
+++ heartbeat-fedora-chkconfig.patch	29 Apr 2006 15:42:44 -0000	1.2
@@ -1,6 +1,6 @@
-diff -Nur heartbeat-2.0.4.orig/heartbeat/init.d/heartbeat.in heartbeat-2.0.4/heartbeat/init.d/heartbeat.in
---- heartbeat-2.0.4.orig/heartbeat/init.d/heartbeat.in	2005-09-10 23:46:23.000000000 +0200
-+++ heartbeat-2.0.4/heartbeat/init.d/heartbeat.in	2006-03-27 19:55:19.000000000 +0200
+diff -Nur heartbeat-2.0.5.orig/heartbeat/init.d/heartbeat.in heartbeat-2.0.5/heartbeat/init.d/heartbeat.in
+--- heartbeat-2.0.5.orig/heartbeat/init.d/heartbeat.in	2006-04-14 21:25:33.000000000 +0200
++++ heartbeat-2.0.5/heartbeat/init.d/heartbeat.in	2006-04-27 20:32:29.000000000 +0200
 @@ -13,7 +13,7 @@
  #		We don't hate anyone, and like for everyone to use
  #		our software, no matter what OS or distribution you're using.
@@ -10,26 +10,7 @@
  # description: Startup script high-availability services.
  # processname: heartbeat
  # pidfile: @localstatedir@/run/heartbeat.pid
-@@ -51,18 +51,6 @@
- RUNDIR=@localstatedir@/run
- 
- if
--  [ -r /etc/SuSE-release ]
--then
--  # rc.status is new since SuSE 7.0
--  [ -r /etc/rc.status ] && . /etc/rc.status
--  [ -r /etc/rc.config ] && . /etc/rc.config
--
--  # Determine the base and follow a runlevel link name.
--  base=${0##*/}
--  link=${base#*[SK][0-9][0-9]}
--
--fi
--if
-   [ -z "$rc_done" ]
- then
-   rc_done="Done."
-@@ -391,12 +379,7 @@
+@@ -391,12 +391,7 @@
  	StartHA
  	RC=$?
  	Echo
@@ -43,7 +24,7 @@
  	RunStartStop post-start $RC
  	;;
  
-@@ -413,11 +396,7 @@
+@@ -413,11 +408,7 @@
  	StopHA
  	RC=$?
  	Echo
@@ -56,9 +37,9 @@
          RunStartStop post-stop $RC
  	StopLogd
  	;;
-diff -Nur heartbeat-2.0.4.orig/ldirectord/init.d/ldirectord heartbeat-2.0.4/ldirectord/init.d/ldirectord
---- heartbeat-2.0.4.orig/ldirectord/init.d/ldirectord	2005-10-17 14:49:21.000000000 +0200
-+++ heartbeat-2.0.4/ldirectord/init.d/ldirectord	2006-03-27 19:56:40.000000000 +0200
+diff -Nur heartbeat-2.0.5.orig/ldirectord/init.d/ldirectord heartbeat-2.0.5/ldirectord/init.d/ldirectord
+--- heartbeat-2.0.5.orig/ldirectord/init.d/ldirectord	2005-10-17 14:49:21.000000000 +0200
++++ heartbeat-2.0.5/ldirectord/init.d/ldirectord	2006-04-27 20:33:35.000000000 +0200
 @@ -2,7 +2,7 @@
  #
  # ldirectord  Linux Director Daemon

heartbeat-fedora-pam.patch:

Index: heartbeat-fedora-pam.patch
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/devel/heartbeat-fedora-pam.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- heartbeat-fedora-pam.patch	29 Mar 2006 15:46:50 -0000	1.1
+++ heartbeat-fedora-pam.patch	29 Apr 2006 15:42:44 -0000	1.2
@@ -1,6 +1,6 @@
-diff -Nur heartbeat-2.0.4.orig/mgmt/daemon/mgmtd.pam heartbeat-2.0.4/mgmt/daemon/mgmtd.pam
---- heartbeat-2.0.4.orig/mgmt/daemon/mgmtd.pam	2005-12-30 09:35:27.000000000 +0100
-+++ heartbeat-2.0.4/mgmt/daemon/mgmtd.pam	2006-03-27 19:59:12.000000000 +0200
+diff -Nur heartbeat-2.0.5.orig/mgmt/daemon/mgmtd.pam heartbeat-2.0.5/mgmt/daemon/mgmtd.pam
+--- heartbeat-2.0.5.orig/mgmt/daemon/mgmtd.pam	2005-12-30 09:35:27.000000000 +0100
++++ heartbeat-2.0.5/mgmt/daemon/mgmtd.pam	2006-04-27 20:36:29.000000000 +0200
 @@ -1,3 +1,8 @@
 -auth    required        pam_unix.so
 -account required        pam_unix.so



From fedora-extras-commits at redhat.com  Sat Apr 29 16:27:50 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 29 Apr 2006 09:27:50 -0700
Subject: rpms/kismet - New directory
Message-ID: <200604291627.k3TGRqll009987@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/kismet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9966/kismet

Log Message:
Directory /cvs/extras/rpms/kismet added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 29 16:27:51 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 29 Apr 2006 09:27:51 -0700
Subject: rpms/kismet/devel - New directory
Message-ID: <200604291627.k3TGRrB6009990@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/kismet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9966/kismet/devel

Log Message:
Directory /cvs/extras/rpms/kismet/devel added to the repository




From fedora-extras-commits at redhat.com  Sat Apr 29 16:28:14 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 29 Apr 2006 09:28:14 -0700
Subject: rpms/kismet Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604291628.k3TGSGL3010044@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/kismet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10011

Added Files:
	Makefile import.log 
Log Message:
Setup of module kismet


--- NEW FILE Makefile ---
# Top level Makefile for module kismet
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 29 16:28:15 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 29 Apr 2006 09:28:15 -0700
Subject: rpms/kismet/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604291628.k3TGSHmc010047@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/kismet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10011/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module kismet


--- 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 Apr 29 16:31:28 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 29 Apr 2006 09:31:28 -0700
Subject: rpms/kismet import.log,1.1,1.2
Message-ID: <200604291631.k3TGVUZR010189@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/kismet
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10145

Modified Files:
	import.log 
Log Message:
auto-import kismet-0.0.2006.04.R1-2 on branch devel from kismet-0.0.2006.04.R1-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/kismet/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	29 Apr 2006 16:28:14 -0000	1.1
+++ import.log	29 Apr 2006 16:31:28 -0000	1.2
@@ -0,0 +1 @@
+kismet-0_0_2006_04_R1-2:HEAD:kismet-0.0.2006.04.R1-2.src.rpm:1146328275



From fedora-extras-commits at redhat.com  Sat Apr 29 16:31:29 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 29 Apr 2006 09:31:29 -0700
Subject: rpms/kismet/devel kismet-2005-08-R1-jobcontrol.patch, NONE,
	1.1 kismet-2006-04-R1-alias.patch, NONE,
	1.1 kismet-2006-04-R1-alias1.patch, NONE,
	1.1 kismet-2006-04-R1-noret.patch, NONE,
	1.1 kismet-2006-04-R1-packed.patch, NONE,
	1.1 kismet-2006-04-R1-ssize.patch, NONE,
	1.1 kismet-2006-04-R1-strop.patch, NONE,
	1.1 kismet-2006-04-R1-uninit.patch, NONE,
	1.1 kismet-2006-04-R1.tar.gz.asc, NONE, 1.1 kismet.spec, NONE,
	1.1 sysconfig.kismet, NONE, 1.1 tmpwatch.kismet, NONE,
	1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604291631.k3TGVV6E010210@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/kismet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10145/devel

Modified Files:
	.cvsignore sources 
Added Files:
	kismet-2005-08-R1-jobcontrol.patch 
	kismet-2006-04-R1-alias.patch kismet-2006-04-R1-alias1.patch 
	kismet-2006-04-R1-noret.patch kismet-2006-04-R1-packed.patch 
	kismet-2006-04-R1-ssize.patch kismet-2006-04-R1-strop.patch 
	kismet-2006-04-R1-uninit.patch kismet-2006-04-R1.tar.gz.asc 
	kismet.spec sysconfig.kismet tmpwatch.kismet 
Log Message:
auto-import kismet-0.0.2006.04.R1-2 on branch devel from kismet-0.0.2006.04.R1-2.src.rpm

kismet-2005-08-R1-jobcontrol.patch:

--- NEW FILE kismet-2005-08-R1-jobcontrol.patch ---
2006-03-18  Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>

	- scripts/kismet.in: disable jobcontrol which simply does
	  not work: when starting the server with 'kismet_server
	  ... &', write operations will result into a SIGTTOU
	  causing malfunctions. So, it is better not to use job
	  control which seems to be required for specifying the
	  last job only. A plain 'wait' will suffice there.

--- kismet-2005-08-R1/scripts/kismet.in.jobcontrol	2005-08-16 03:22:38.000000000 +0200
+++ kismet-2005-08-R1/scripts/kismet.in	2006-03-18 11:52:24.000000000 +0100
@@ -7,8 +7,6 @@
 
 GREP_OPTIONS=""
 
-set -m
-
 gui=`grep -e "^gui=" ${ETC}/kismet_ui.conf | cut -d= -f2 | tr -d " \t"`
 piddir=`grep -e "^piddir=" ${ETC}/kismet.conf | cut -d= -f2 | tr -d " \t"`
 
@@ -74,7 +72,7 @@
 if test "$?" != "5"; then
 	echo "Killing server..."
 	kill $servpid
-	wait %-
+	wait
 fi
 
 echo "Kismet exited."

kismet-2006-04-R1-alias.patch:

--- NEW FILE kismet-2006-04-R1-alias.patch ---
2006-04-22  Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>

	* expat.cc, tcpclient.cc, gpsmap.cc, packetracker.cc:

	  avoid constructs like

	  | sscanf(..., "%u", (int *)&some_var);

	  where 'some_var' is not an 'int'. Depending on the platform,
	  this might caused unwanted effects (e.g. assigning a 64-bit
	  'int' to a 32-bit 'enum'; writing to unaligned addresses
	  causing kernel traps)

	  Some time-handling related hunks should be reworked before
	  2038 ;)


--- kismet-2006-04-R1/expat.cc.alias	2005-03-23 17:36:56.000000000 +0100
+++ kismet-2006-04-R1/expat.cc	2006-04-22 18:22:02.000000000 +0200
@@ -192,12 +192,14 @@ int NetXmlStr2Struct(wireless_network *i
         return -1;
     }
 
-    if (sscanf(xmlstrnodes[net_node_wn_maxrate].c_str(), "%f", (float *) &in_net->maxrate) < 1) {
+    float	tmpmaxrate;
+    if (sscanf(xmlstrnodes[net_node_wn_maxrate].c_str(), "%f", &tmpmaxrate) < 1) {
         if (verbose)
             fprintf(stderr, "WARNING:  Illegal maxrate '%s', skipping rest of network.\n",
                     xmlstrnodes[net_node_wn_maxrate].c_str());
         return -1;
     }
+    in_net->maxrate = tmpmaxrate;
 
     if (sscanf(xmlstrnodes[net_node_pk_LLC].c_str(), "%d", &in_net->llc_packets) < 1) {
         if (verbose)
--- kismet-2006-04-R1/tcpclient.cc.alias	2005-10-17 15:52:47.000000000 +0200
+++ kismet-2006-04-R1/tcpclient.cc	2006-04-22 18:22:02.000000000 +0200
@@ -277,6 +277,8 @@ int TcpClient::ParseData(char *in_data) 
     char bssid_str[18];
     mac_addr bssid;
     int junkmajor, junkminor, junktiny;
+#warning FIXME: implement reading of time_t types 
+    int		tmptime;	// HACK: should be some 64-bit type
 
     if (sscanf(in_data, "%64[^:]", header) < 1) {
         return 0;
@@ -294,14 +295,15 @@ int TcpClient::ParseData(char *in_data) 
         if (sscanf(in_data+hdrlen, "%d.%d.%d %d \001%32[^\001]\001 %24s %d "
                    "%24[^.].%24[^.].%24s",
                    &junkmajor, &junkminor, &junktiny, 
-                   (int *) &start_time, servername, 
+                   &tmptime, servername, 
                    build, &channel_hop,
                    major, minor, tiny) < 7)
             return 0;
+	start_time = tmptime;
     } else if (!strncmp(header, "*TIME", 64)) {
-        if (sscanf(in_data+hdrlen, "%d", (int *) &serv_time) < 1)
+        if (sscanf(in_data+hdrlen, "%d", &tmptime) < 1)
             return 0;
-
+	serv_time = tmptime;
     } else if (!strncmp(header, "*NETWORK", 64)) {
         wireless_network *net;
 
@@ -393,17 +395,23 @@ int TcpClient::ParseData(char *in_data) 
             newnet = 1;
         }
 
+	{
+	int		tmptype, tmpatype;
+	int		tmpturbocell_mode;
+#warning FIXME: implement reading of time_t types 
+	int		tmpfirst_time;	// HACK: should be some 64-bit type
+	int		tmplast_time;	// HACK: should be some 64-bit type
         scanned = sscanf(in_data+hdrlen+18, "%d \001%255[^\001]\001 "
 						 "\001%255[^\001]\001 "
                          "%d %d %d %d %d %d %d %d %d %hd.%hd.%hd.%hd "
                          "%d %f %f %f %f %f %f %f %f %d %d %d %f %d %d %d %d %d %d "
 						 "%f %f %f %lf %lf %lf %ld %ld"
                          "%d %d %d %d %d %d %d %d %lld",
-                         (int *) &type, ssid, beaconstr,
+                         &tmptype, ssid, beaconstr,
                          &llc_packets, &data_packets, &crypt_packets, 
                          &interesting_packets, &channel, &crypt_set, 
-                         (int *) &first_time, (int *) &last_time,
-                         (int *) &atype, &range[0], &range[1], &range[2], 
+                         &tmpfirst_time, &tmplast_time,
+                         &tmpatype, &range[0], &range[1], &range[2], 
                          &range[3], &gps_fixed, &min_lat, &min_lon, 
                          &min_alt, &min_spd, &max_lat, &max_lon, 
                          &max_alt, &max_spd, &octets, 
@@ -413,10 +420,16 @@ int TcpClient::ParseData(char *in_data) 
                          &best_lat, &best_lon, &best_alt,
                          &aggregate_lat, &aggregate_lon, &aggregate_alt,
                          &aggregate_points, &datasize,
-                         &turbocell_nid, (int *) &turbocell_mode, 
+                         &turbocell_nid, &tmpturbocell_mode, 
                          &turbocell_sat, &carrier_set, &maxseenrate, 
                          &encoding_set, &decrypted, &dupeiv_packets, &bss_timestamp);
-
+	type           = static_cast<wireless_network_type>(tmptype);
+	first_time     = tmpfirst_time;
+	last_time      = tmplast_time;
+	atype          = static_cast<address_type>(tmpatype);
+	turbocell_mode = static_cast<turbocell_type>(tmpturbocell_mode);
+	}
+	
         if (scanned < 51) {
             // fprintf(stderr, "Flubbed network, discarding... %s  '%s'\n", bssid_str, in_data);
 			// Can't delete us out of the tracker offhand if we're not a new network,
@@ -562,12 +575,17 @@ int TcpClient::ParseData(char *in_data) 
             return 0;
         }
 
+	{
+	int		tmptype, tmpatype;
+#warning FIXME: implement reading of time_t types 
+	int		tmpfirst_time;	// HACK: should be some 64-bit type
+	int		tmplast_time;	// HACK: should be some 64-bit type
         scanned = sscanf(in_data+hdrlen+36, "%d %d %d %d %d %d %d "
                          "%f %f %f %f %f %f %f %f %lf %lf "
                          "%lf %ld %f %d %d %d %d %d %d "
                          "%f %f %f %d %hd.%hd.%hd.%hd %ld %d %d %d %d",
-                         (int *) &type,
-                         (int *) &first_time, (int *) &last_time,
+                         &tmptype,
+                         &tmpfirst_time, &tmplast_time,
                          &data_packets, &crypt_packets,
                          &interesting_packets,
                          &gps_fixed, &min_lat, &min_lon,
@@ -580,9 +597,14 @@ int TcpClient::ParseData(char *in_data) 
                          &best_quality, &best_signal, 
 						 &best_noise,
                          &best_lat, &best_lon, &best_alt,
-                         (int *) &atype, &ip[0], &ip[1], &ip[2], &ip[3],
+                         &tmpatype, &ip[0], &ip[1], &ip[2], &ip[3],
                          &datasize, &maxseenrate, &encoding_set,
                          &decrypted, &crypt_set);
+	type       = static_cast<client_type>(tmptype);
+	first_time = tmpfirst_time;
+	last_time  = tmplast_time;
+	atype      = static_cast<address_type>(tmpatype);
+	}
 
         if (scanned < 39) {
             if (nclient)
@@ -767,20 +789,31 @@ int TcpClient::ParseData(char *in_data) 
         short int sip[4], dip[4];
         int sport, dport;
 
+	{
+	int	tmptype, tmpsubtype, tmptvsec;
+	int	tmpproto_type, tmpsport, tmpdport, tmpproto_nbtype;  
         if (sscanf(in_data+hdrlen, "%d %d %d %d %d %d %17s %17s %17s "
                    "\001%32[^\001]\001 %d %hd.%hd.%hd.%hd %hd.%hd.%hd.%hd %d %d %d "
                    "\001%16[^\001]\001\n",
-                   (int *) &packinfo.type,
-                   (int *) &packinfo.subtype,
-                   (int *) &packinfo.ts.tv_sec,
+                   &tmptype,
+                   &tmpsubtype,
+                   &tmptvsec,
                    &packinfo.encrypted, &packinfo.interesting, &packinfo.beacon,
                    smac, dmac, bmac,
                    packinfo.ssid,
-                   (int *) &packinfo.proto.type,
+		   &tmpproto_type,
                    &sip[0], &sip[1], &sip[2], &sip[3], &dip[0], &dip[1], &dip[2], &dip[3],
-                   (int *) &sport, (int *) &dport,
-                   (int *) &packinfo.proto.nbtype, packinfo.proto.netbios_source) < 22)
+                   &tmpsport, &tmpdport,
+                   &tmpproto_nbtype, packinfo.proto.netbios_source) < 22)
             return 0;
+	packinfo.type       = static_cast<packet_type>(tmptype);
+	packinfo.subtype    = static_cast<packet_sub_type>(tmpsubtype);
+	packinfo.ts.tv_sec  = tmptvsec;
+	packinfo.proto.type = static_cast<protocol_info_type>(tmpproto_type);
+	sport               = tmpsport;
+	dport               = tmpdport;
+	packinfo.proto.nbtype = static_cast<protocol_netbios_type>(tmpproto_nbtype);
+	}
 
         packinfo.source_mac = smac;
         packinfo.dest_mac = dmac;
--- kismet-2006-04-R1/gpsmap.cc.alias	2006-04-22 18:22:02.000000000 +0200
+++ kismet-2006-04-R1/gpsmap.cc	2006-04-22 18:22:03.000000000 +0200
@@ -2212,7 +2212,9 @@ void DrawNetPower(vector<gps_network *> 
     // Now wait for the threads to complete and come back
     int thread_status;
     for (int t = 0; t < numthreads; t++) {
-        pthread_join(mapthread[t], (void **) &thread_status);
+        void *tmp;
+        pthread_join(mapthread[t], &tmp);
+	thread_status = reinterpret_cast<int>(tmp);
     }
 #else
     // Run one instance of our "thread".  thread number 0, it should just crunch it all
--- kismet-2006-04-R1/packetracker.cc.alias	2006-04-22 18:22:02.000000000 +0200
+++ kismet-2006-04-R1/packetracker.cc	2006-04-22 18:22:03.000000000 +0200
@@ -2350,6 +2350,7 @@ void Packetracker::ReadIPMap(FILE *in_fi
         memset(&dat, 0, sizeof(net_ip_data));
 
         short int range[4];
+	int		tmpatype;
         /*
          , mask[4], gate[4];
          */
@@ -2357,10 +2358,11 @@ void Packetracker::ReadIPMap(FILE *in_fi
         // Fetch the line and continue if we're invalid...
         if (sscanf(dline, "%17s %d %d %hd %hd %hd %hd",
                    bssid_str,
-                   (int *) &dat.atype, &dat.octets,
+                   &tmpatype, &dat.octets,
                    &range[0], &range[1], &range[2], &range[3]
                   ) < 7)
             continue;
+	dat.atype = static_cast<address_type>(tmpatype);
 
         for (int x = 0; x < 4; x++) {
             dat.range_ip[x] = (uint8_t) range[x];

kismet-2006-04-R1-alias1.patch:

--- NEW FILE kismet-2006-04-R1-alias1.patch ---
2006-04-29  Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>

	* gpsmap.cc: fixed compilation errors on 64-bit platforms
	  which were created by my previous -alias patch. This patch
	  and the problems were reported by Hans de Goede at

	  https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=165314#c24

	  The value_ptr argument was ommited completely in the
	  pthread_join() call because the result will not be used
	  at all.

	  Alternatively,

	  | thread_status = reinterpret_cast<long>(tmp);

	  instead of

	  | thread_status = reinterpret_cast<int>(tmp);

	  should be possible.


diff --git a/gpsmap.cc b/gpsmap.cc
index 1ce771b..915a482 100644
--- a/gpsmap.cc
+++ b/gpsmap.cc
@@ -2210,11 +2210,8 @@ #ifdef HAVE_PTHREAD
     pthread_attr_destroy(&attr);
 
     // Now wait for the threads to complete and come back
-    int thread_status;
     for (int t = 0; t < numthreads; t++) {
-        void *tmp;
-        pthread_join(mapthread[t], &tmp);
-	thread_status = reinterpret_cast<int>(tmp);
+        pthread_join(mapthread[t], NULL);
     }
 #else
     // Run one instance of our "thread".  thread number 0, it should just crunch it all

kismet-2006-04-R1-noret.patch:

--- NEW FILE kismet-2006-04-R1-noret.patch ---
2006-04-22  Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>

	* prism2source.cc, util.cc, configfile.cc, pcapsource.cc,
	  manuf.cc, packetracker.cc, frontend.cc, panelfront.cc,
	  gpsmap.cc:

	  honor the return value of a lot of syscall/libc functions
	  marked with __attribute__((__warn_result__)).

	  Some/all of the 'fgets(...)==NULL || feof(...)' constructs
	  abort correctly on error but do not report the error.


--- kismet-2006-04-R1/prism2source.cc.noret	2004-08-12 03:59:50.000000000 +0200
+++ kismet-2006-04-R1/prism2source.cc	2006-04-22 18:22:02.000000000 +0200
@@ -107,7 +107,8 @@ int Prism2Source::FetchPacket(kis_packet
 
     if (FD_ISSET(read_sock, &rs)) {
         char a;
-        read(read_sock, &a, 1);
+        if (read(read_sock, &a, 1)!=1)
+	  return -1;
     }
 
 //    u_char buf[MAX_PACKET_LEN];
--- kismet-2006-04-R1/util.cc.noret	2005-06-15 23:54:08.000000000 +0200
+++ kismet-2006-04-R1/util.cc	2006-04-22 18:22:02.000000000 +0200
@@ -248,9 +248,7 @@ vector<int> Str2IntVec(string in_text) {
 }
 
 int RunSysCmd(char *in_cmd) {
-    system(in_cmd);
-    
-    return 0;
+    return system(in_cmd);
 }
 
 pid_t ExecSysCmd(char *in_cmd) {
--- kismet-2006-04-R1/configfile.cc.noret	2006-01-04 16:32:46.000000000 +0100
+++ kismet-2006-04-R1/configfile.cc	2006-04-22 18:22:02.000000000 +0200
@@ -38,9 +38,8 @@ int ConfigFile::ParseConfig(const char *
     }
 
     while (!feof(configf)) {
-        fgets(confline, 8192, configf);
-
-        if (feof(configf)) break;
+        if (fgets(confline, 8192, configf) == NULL ||
+	    feof(configf)) break;
 
         // It's easier to parse this using C++ functions
         string parsestr = StrStrip(confline);
--- kismet-2006-04-R1/pcapsource.cc.noret	2006-04-02 17:13:00.000000000 +0200
+++ kismet-2006-04-R1/pcapsource.cc	2006-04-22 18:22:02.000000000 +0200
@@ -2054,7 +2054,10 @@ int monitor_ipwlivetap(const char *in_de
 		return -1;
 	}
 
-	fgets(dynif, 32, sysf);
+	if (fgets(dynif, 32, sysf) == NULL) {
+	        fclose(sysf);
+	        return -1;
+	}
 
 	// We're done with the RO 
 	fclose(sysf);
@@ -2084,7 +2087,10 @@ int monitor_ipwlivetap(const char *in_de
 			return -1;
 		}
 
-		fgets(dynif, 32, sysf);
+		if (fgets(dynif, 32, sysf) == NULL) {
+		        fclose(sysf);
+			return -1;
+		}
 
 		fclose(sysf);
 
--- kismet-2006-04-R1/manuf.cc.noret	2004-01-14 03:18:32.000000000 +0100
+++ kismet-2006-04-R1/manuf.cc	2006-04-22 18:22:02.000000000 +0200
@@ -48,8 +48,8 @@ macmap<vector<manuf *> > ReadManufMap(FI
     // Read from the file
     char dline[8192];
     while (!feof(in_file)) {
-        fgets(dline, 8192, in_file);
-        if (feof(in_file)) break;
+        if (fgets(dline, 8192, in_file) == NULL ||
+	    feof(in_file)) break;
 
         linenum++;
 
--- kismet-2006-04-R1/packetracker.cc.noret	2006-04-01 18:37:07.000000000 +0200
+++ kismet-2006-04-R1/packetracker.cc	2006-04-22 18:22:03.000000000 +0200
@@ -2295,9 +2295,8 @@ void Packetracker::ReadSSIDMap(FILE *in_
     char bssid_str[18];
 
     while (!feof(in_file)) {
-        fgets(dline, 8192, in_file);
-
-        if (feof(in_file)) break;
+        if (fgets(dline, 8192, in_file) == NULL ||
+	    feof(in_file)) break;
 
         if (sscanf(dline, "%17s %1023[^\n]\n",
                    bssid_str, name) < 2)
@@ -2313,8 +2312,10 @@ void Packetracker::ReadSSIDMap(FILE *in_
 }
 
 void Packetracker::WriteSSIDMap(FILE *in_file) {
-    fseek(in_file, 0L, SEEK_SET);
-    ftruncate(fileno(in_file), 0);
+    if (fseek(in_file, 0L, SEEK_SET) == -1 ||
+	ftruncate(fileno(in_file), 0) == -1)
+      abort();		// HACK: implement better error-handling
+#warning FIXME: implement better error-handling
 
     char format[64];
     snprintf(format, 64, "%%.%ds %%.%ds\n", MAC_STR_LEN, SSID_SIZE);
@@ -2344,9 +2344,8 @@ void Packetracker::ReadIPMap(FILE *in_fi
     net_ip_data dat;
 
     while (!feof(in_file)) {
-        fgets(dline, 8192, in_file);
-
-        if (feof(in_file)) break;
+        if (fgets(dline, 8192, in_file) == NULL ||
+	    feof(in_file)) break;
 
         memset(&dat, 0, sizeof(net_ip_data));
 
@@ -2382,8 +2383,10 @@ void Packetracker::ReadIPMap(FILE *in_fi
 }
 
 void Packetracker::WriteIPMap(FILE *in_file) {
-    fseek(in_file, 0L, SEEK_SET);
-    ftruncate(fileno(in_file), 0);
+    if (fseek(in_file, 0L, SEEK_SET) == -1 ||
+        ftruncate(fileno(in_file), 0) == -1)
+        abort();		// HACK: better error-handling
+#warning FIXME: implement better error-handling
 
     for (map<mac_addr, net_ip_data>::iterator x = bssid_ip_map.begin();
          x != bssid_ip_map.end(); ++x) {
@@ -2445,8 +2447,10 @@ void Packetracker::RemoveNetwork(mac_add
 
 // Write a gpsdrive compatable waypoint file
 int Packetracker::WriteGpsdriveWaypt(FILE *in_file) {
-    fseek(in_file, 0L, SEEK_SET);
-    ftruncate(fileno(in_file), 0);
+    if (fseek(in_file, 0L, SEEK_SET) == -1 ||
+	ftruncate(fileno(in_file), 0) == -1)
+      abort();		// HACK: better error-handling
+#warning FIXME: implement better error-handling
 
     // Convert the map to a vector and sort it
     for (map<mac_addr, wireless_network *>::const_iterator i = bssid_map.begin();
--- kismet-2006-04-R1/frontend.cc.noret	2005-06-29 20:04:43.000000000 +0200
+++ kismet-2006-04-R1/frontend.cc	2006-04-22 18:22:02.000000000 +0200
@@ -722,9 +722,8 @@ void Frontend::ReadGroupMap(FILE *in_fil
     snprintf(format, 64, "%%6[^:]: %%%d[^ ] %%1024[^\n]\n", MAC_STR_LEN);
 
     while (!feof(in_file)) {
-        fgets(dline, 8192, in_file);
-
-        if (feof(in_file)) break;
+        if (fgets(dline, 8192, in_file) == NULL ||
+	    feof(in_file)) break;
 
         // Fetch the line and continue if we're invalid...
         if (sscanf(dline, format, type, parm1, parm2) < 3)
--- kismet-2006-04-R1/panelfront.cc.noret	2005-06-29 20:04:43.000000000 +0200
+++ kismet-2006-04-R1/panelfront.cc	2006-04-22 18:22:02.000000000 +0200
@@ -1398,16 +1398,14 @@ int PanelFront::Tick() {
             int ac_line_status, battery_status, flag, percentage, apm_time;
             char units[32];
 
-            if ((apm = fopen("/proc/apm", "r")) == NULL) {
+            if ((apm = fopen("/proc/apm", "r")) == NULL ||
+		fgets(buf, 128, apm) == NULL) {
                 bat_available = 0;
                 bat_ac = 0;
                 bat_percentage = 0;
                 bat_time = 0;
                 bat_charging = 0;
             } else {
-                fgets(buf, 128, apm);
-                fclose(apm);
-
                 sscanf(buf, "%*s %*d.%*d %*x %x %x %x %d%% %d %s\n", &ac_line_status,
                        &battery_status, &flag, &percentage, &apm_time, units);
 
@@ -1436,6 +1434,8 @@ int PanelFront::Tick() {
                 if (!strncmp(units, "min", 32))
                     bat_time *= 60;
             }
+	    if (apm!=NULL)
+	      fclose(apm);
         } else {
             DIR *batteries, *ac_adapters;
             struct dirent *this_battery, *this_adapter;
--- kismet-2006-04-R1/gpsmap.cc.noret	2005-11-02 22:16:07.000000000 +0100
+++ kismet-2006-04-R1/gpsmap.cc	2006-04-22 18:22:03.000000000 +0200
@@ -4178,7 +4180,10 @@ int main(int argc, char *argv[]) {
         } else {
             char geturl[1024];
             snprintf(geturl, 1024, download_template, url, mapname);
-            system(geturl);
+            if (system(geturl)!=0) {
+	      fprintf(stderr, "WARNING: failed to execute '%s'\n", geturl);
+	      exit(1);
+	    }
         }
 
         printf("Loading map into Imagemagick structures.\n");

kismet-2006-04-R1-packed.patch:

--- NEW FILE kismet-2006-04-R1-packed.patch ---
2006-04-22  Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>

	* packetstream.h, pcapsource.h, prism2source.h: placed compiler
	  attributes at the right place:

	  | struct foo {
	  |	  char  a __attribute__((packed));
	  |       int	b __attribute__((packed));
	  | };

          is wrong, while

	  | struct bar {
	  |       char	a;
	  |	  int	b;
	  | }  __attribute__((packed));

	  is right. This patch replaces 'packed' with '__packed__' too.


--- kismet-2006-04-R1/packetstream.h.packed	2005-05-26 16:51:45.000000000 +0200
+++ kismet-2006-04-R1/packetstream.h	2006-04-22 18:22:02.000000000 +0200
@@ -38,10 +38,10 @@
 #define STREAM_COMMAND_FLUSH -1
 
 typedef struct stream_frame_header {
-    uint32_t frame_sentinel __attribute__ ((packed));
-    uint8_t frame_type __attribute__ ((packed));
-    uint32_t frame_len __attribute__ ((packed));
-};
+    uint32_t frame_sentinel;
+    uint8_t frame_type;
+    uint32_t frame_len;
+} __attribute__((__packed__));
 
 typedef struct stream_version_packet {
     uint16_t drone_version;
@@ -49,34 +49,34 @@ typedef struct stream_version_packet {
 };
 
 typedef struct stream_packet_header {
-    uint32_t header_len __attribute__ ((packed));
-    uint16_t drone_version __attribute__ ((packed));
-    uint32_t len __attribute__ ((packed));
-    uint32_t caplen __attribute__ ((packed));
-    uint64_t tv_sec __attribute__ ((packed));
-    uint64_t tv_usec __attribute__ ((packed));
-    uint16_t quality __attribute__ ((packed));
-    uint16_t signal __attribute__ ((packed));
-    uint16_t noise __attribute__ ((packed));
-    uint8_t error __attribute__ ((packed));
-    uint8_t channel __attribute__ ((packed));
-    uint8_t carrier __attribute__ ((packed));
-    uint8_t encoding __attribute__ ((packed));
-    uint32_t datarate __attribute__ ((packed));
-
-    int16_t gps_lat __attribute__ ((packed));
-    int64_t gps_lat_mant __attribute__ ((packed));
-    int16_t gps_lon __attribute__ ((packed));
-    int64_t gps_lon_mant __attribute__ ((packed));
-    int16_t gps_alt __attribute__ ((packed));
-    int64_t gps_alt_mant __attribute__ ((packed));
-    int16_t gps_spd __attribute__ ((packed));
-    int64_t gps_spd_mant __attribute__ ((packed));
-    int16_t gps_heading __attribute__ ((packed));
-    int64_t gps_heading_mant __attribute__ ((packed));
-    int8_t gps_fix __attribute__ ((packed));
+    uint32_t header_len;
+    uint16_t drone_version;
+    uint32_t len;
+    uint32_t caplen;
+    uint64_t tv_sec;
+    uint64_t tv_usec;
+    uint16_t quality;
+    uint16_t signal;
+    uint16_t noise;
+    uint8_t error;
+    uint8_t channel;
+    uint8_t carrier;
+    uint8_t encoding;
+    uint32_t datarate;
+
+    int16_t gps_lat;
+    int64_t gps_lat_mant;
+    int16_t gps_lon;
+    int64_t gps_lon_mant;
+    int16_t gps_alt;
+    int64_t gps_alt_mant;
+    int16_t gps_spd;
+    int64_t gps_spd_mant;
+    int16_t gps_heading;
+    int64_t gps_heading_mant;
+    int8_t gps_fix;
 
-    uint8_t sourcename[32] __attribute__ ((packed));
-};
+    uint8_t sourcename[32];
+} __attribute__((__packed__));
 
 #endif
--- kismet-2006-04-R1/pcapsource.h.packed	2006-03-29 05:08:05.000000000 +0200
+++ kismet-2006-04-R1/pcapsource.h	2006-04-22 18:22:02.000000000 +0200
@@ -91,27 +91,27 @@ protected:
     // Prism 802.11 headers from wlan-ng tacked on to the beginning of a
     // pcap packet... Snagged from the wlan-ng source
     typedef struct {
-        uint32_t did __attribute__ ((packed));
-        uint16_t status __attribute__ ((packed));
-        uint16_t len __attribute__ ((packed));
-        uint32_t data __attribute__ ((packed));
-    } p80211item_uint32_t;
+        uint32_t did;
+        uint16_t status;
+        uint16_t len;
+        uint32_t data;
+    } __attribute__((__packed__)) p80211item_uint32_t;
 
     typedef struct {
-        uint32_t msgcode __attribute__ ((packed));
-        uint32_t msglen __attribute__ ((packed));
-        uint8_t devname[WLAN_DEVNAMELEN_MAX] __attribute__ ((packed));
-        p80211item_uint32_t hosttime __attribute__ ((packed));
-        p80211item_uint32_t mactime __attribute__ ((packed));
-        p80211item_uint32_t channel __attribute__ ((packed));
-        p80211item_uint32_t rssi __attribute__ ((packed));
-        p80211item_uint32_t sq __attribute__ ((packed));
-        p80211item_uint32_t signal __attribute__ ((packed));
-        p80211item_uint32_t noise __attribute__ ((packed));
-        p80211item_uint32_t rate __attribute__ ((packed));
-        p80211item_uint32_t istx __attribute__ ((packed));
-        p80211item_uint32_t frmlen __attribute__ ((packed));
-    } wlan_ng_prism2_header;
+        uint32_t msgcode;
+        uint32_t msglen;
+        uint8_t devname[WLAN_DEVNAMELEN_MAX];
+        p80211item_uint32_t hosttime;
+        p80211item_uint32_t mactime;
+        p80211item_uint32_t channel;
+        p80211item_uint32_t rssi;
+        p80211item_uint32_t sq;
+        p80211item_uint32_t signal;
+        p80211item_uint32_t noise;
+        p80211item_uint32_t rate;
+        p80211item_uint32_t istx;
+        p80211item_uint32_t frmlen;
+    }  __attribute__((__packed__)) wlan_ng_prism2_header;
 
     // Prism 802.11 headers from the openbsd Hermes drivers, even though they don't return
     // a valid linktype yet.  Structure lifted from bsd_airtools by dachb0den labs.
--- kismet-2006-04-R1/prism2source.h.packed	2004-08-09 06:36:01.000000000 +0200
+++ kismet-2006-04-R1/prism2source.h	2006-04-22 18:22:02.000000000 +0200
@@ -66,27 +66,27 @@ public:
 
 protected:
     typedef struct {
-        uint32_t did __attribute__ ((packed));
-        uint16_t status __attribute__ ((packed));
-        uint16_t len __attribute__ ((packed));
-        uint32_t data __attribute__ ((packed));
-    } p80211item_t;
+        uint32_t did;
+        uint16_t status;
+        uint16_t len;
+        uint32_t data;
+    } __attribute__((__packed__)) p80211item_t;
 
     typedef struct {
-        uint32_t msgcode __attribute__ ((packed));
-        uint32_t msglen __attribute__ ((packed));
-        uint8_t devname[DEVNAME_LEN] __attribute__ ((packed));
-        p80211item_t hosttime __attribute__ ((packed));
-        p80211item_t mactime __attribute__ ((packed));
-        p80211item_t channel __attribute__ ((packed));
-        p80211item_t rssi __attribute__ ((packed));
-        p80211item_t sq __attribute__ ((packed));
-        p80211item_t signal __attribute__ ((packed));
-        p80211item_t noise __attribute__ ((packed));
-        p80211item_t rate __attribute__ ((packed));
-        p80211item_t istx __attribute__ ((packed));
-        p80211item_t frmlen __attribute__ ((packed));
-    } sniff_packet_t;
+        uint32_t msgcode;
+        uint32_t msglen;
+        uint8_t devname[DEVNAME_LEN];
+        p80211item_t hosttime;
+        p80211item_t mactime;
+        p80211item_t channel;
+        p80211item_t rssi;
+        p80211item_t sq;
+        p80211item_t signal;
+        p80211item_t noise;
+        p80211item_t rate;
+        p80211item_t istx;
+        p80211item_t frmlen;
+    } __attribute__ ((__packed__)) sniff_packet_t;
 
     int Prism2Common(kis_packet *packet, uint8_t *data, uint8_t *moddata);
 

kismet-2006-04-R1-ssize.patch:

--- NEW FILE kismet-2006-04-R1-ssize.patch ---
2006-04-29  Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>

	* gpsmap.cc: this patch is originated by Hans de Goede posted at

	  https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=165314#c25


--- kismet-2006-04-R1/gpsmap.cc.64bit	2006-04-26 06:56:39.000000000 +0200
+++ kismet-2006-04-R1/gpsmap.cc	2006-04-26 06:57:03.000000000 +0200
@@ -864,8 +864,8 @@
                     orignetfile = "./" + orignetfile;
 
                 // Break up the path to the gpsxml file and form a path based on that
-                unsigned int lastslash = 0;
-                for (unsigned int x = origxmlfile.find('/'); x != string::npos;
+                string::size_type lastslash = 0;
+                for (string::size_type x = origxmlfile.find('/'); x != string::npos;
                      lastslash = x, x = origxmlfile.find('/', lastslash+1)) {
                     // We don't actually need to do anything...
                 }
@@ -873,7 +873,7 @@
                 comp = origxmlfile.substr(0, lastslash);
 
                 lastslash = 0;
-                for (unsigned int x = orignetfile.find('/'); x != string::npos;
+                for (string::size_type x = orignetfile.find('/'); x != string::npos;
                      lastslash = x, x = orignetfile.find('/', lastslash+1)) {
                     // We don't actually need to do anything...
                 }

kismet-2006-04-R1-strop.patch:

--- NEW FILE kismet-2006-04-R1-strop.patch ---
2006-04-22  Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>

	* extra/buzzme/buzzme.c, libpcap-0.9.1-kis/fad-glifc.c,
	  libpcap-0.9.1-kis/pcap-nit.c,
	  libpcap-0.9.1-kis/pcap-snoop.c,
	  libpcap-0.9.1-kis/fad-gifc.c,
	  libpcap-0.9.1-kis/pcap-linux.c,
	  pcapsource.cc, tcpclient.cc, gpsmap_cache.cc, ifcontrol.cc:

 	  ensure, that strings copied by 'strncpy()' will be terminated
 	  by '\0'. The following replacements are used for

	  | strncpy(buf, 0, buf_len);

	  a) when 'buf[buf_len-1] == '\0' can be guaranteed (e.g. by a
	     previous memset()):
             | strncpy(buf, 0, buf_len - 1);

	  b) when 'buf[buf_len-1] == '\0' can not be guaranteed:

	     | strncpy(buf, 0, buf_len);
             | buf[buf_len-1] = '\0';

	     on first glance it seems to be more efficient to use

	     | strncpy(buf, 0, buf_len-1);

	     But most 'buf_len' are multiples of 2 or 4 allowing the
	     compiler to generate more efficient code.

	  At same places,

          | strncpy(buf, 0, sizeof buf);

	  will be used where applicable.


	  Perhaps, it would be a good idea to use BSD's strlcpy()
	  there?

	* panelfront_display.cc

	  most hunks fixes some oddnesses in the assignment/range-check
	  for 'print_width'.

          A range-check was added in PanelFront::StatsPrinter() which
          was missing before.


--- kismet-2006-04-R1/extra/buzzme/buzzme.c.strop	2002-07-22 17:01:26.000000000 +0200
+++ kismet-2006-04-R1/extra/buzzme/buzzme.c	2006-04-22 21:08:37.000000000 +0200
@@ -94,6 +94,7 @@ main(int argc, char **argv)
 
   // Figure out program name. Remove path if needed.
   strncpy(pname,argv[0],sizeof(pname));
+  pname[sizeof(pname)-1] = '\0';
   if ((progname = rindex(pname,'/')) != NULL) {
      progname++; // skip slash.
   }
--- kismet-2006-04-R1/libpcap-0.9.1-kis/fad-glifc.c.strop	2005-06-21 02:58:08.000000000 +0200
+++ kismet-2006-04-R1/libpcap-0.9.1-kis/fad-glifc.c	2006-04-22 21:08:37.000000000 +0200
@@ -213,6 +213,7 @@ pcap_findalldevs(pcap_if_t **alldevsp, c
 		 */
 		strncpy(ifrflags.lifr_name, ifrp->lifr_name,
 		    sizeof(ifrflags.lifr_name));
+		ifrflags.lifr_name[sizeof(ifrflags.lifr_name)-1] = '\0';
 		if (ioctl(fd, SIOCGLIFFLAGS, (char *)&ifrflags) < 0) {
 			if (errno == ENXIO)
 				continue;
@@ -232,6 +233,7 @@ pcap_findalldevs(pcap_if_t **alldevsp, c
 		 */
 		strncpy(ifrnetmask.lifr_name, ifrp->lifr_name,
 		    sizeof(ifrnetmask.lifr_name));
+		ifrnetmask.lifr_name[sizeof(ifrnetmask.lifr_name)-1] = '\0';
 		memcpy(&ifrnetmask.lifr_addr, &ifrp->lifr_addr,
 		    sizeof(ifrnetmask.lifr_addr));
 		if (ioctl(fd, SIOCGLIFNETMASK, (char *)&ifrnetmask) < 0) {
@@ -259,6 +261,7 @@ pcap_findalldevs(pcap_if_t **alldevsp, c
 		if (ifrflags.lifr_flags & IFF_BROADCAST) {
 			strncpy(ifrbroadaddr.lifr_name, ifrp->lifr_name,
 			    sizeof(ifrbroadaddr.lifr_name));
+			ifrbroadaddr.lifr_name[sizeof(ifrbroadaddr.lifr_name)-1] = '\0';
 			memcpy(&ifrbroadaddr.lifr_addr, &ifrp->lifr_addr,
 			    sizeof(ifrbroadaddr.lifr_addr));
 			if (ioctl(fd, SIOCGLIFBRDADDR,
@@ -294,6 +297,7 @@ pcap_findalldevs(pcap_if_t **alldevsp, c
 		if (ifrflags.lifr_flags & IFF_POINTOPOINT) {
 			strncpy(ifrdstaddr.lifr_name, ifrp->lifr_name,
 			    sizeof(ifrdstaddr.lifr_name));
+			ifrdstaddr.lifr_name[sizeof(ifrdstaddr.lifr_name)-1] = '\0';
 			memcpy(&ifrdstaddr.lifr_addr, &ifrp->lifr_addr,
 			    sizeof(ifrdstaddr.lifr_addr));
 			if (ioctl(fd, SIOCGLIFDSTADDR,
--- kismet-2006-04-R1/libpcap-0.9.1-kis/pcap-nit.c.strop	2005-06-21 02:58:08.000000000 +0200
+++ kismet-2006-04-R1/libpcap-0.9.1-kis/pcap-nit.c	2006-04-22 21:08:37.000000000 +0200
@@ -199,7 +199,7 @@ pcap_inject_nit(pcap_t *p, const void *b
 	int ret;
 
 	memset(&sa, 0, sizeof(sa));
-	strncpy(sa.sa_data, device, sizeof(sa.sa_data));
+	strncpy(sa.sa_data, device, sizeof(sa.sa_data)-1);
 	ret = sendto(p->fd, buf, size, 0, &sa, sizeof(sa));
 	if (ret == -1) {
 		snprintf(p->errbuf, PCAP_ERRBUF_SIZE, "send: %s",
@@ -273,8 +273,9 @@ pcap_open_live(const char *device, int s
 		    "socket: %s", pcap_strerror(errno));
 		goto bad;
 	}
+	memset(&snit, 0, sizeof snit);
 	snit.snit_family = AF_NIT;
-	(void)strncpy(snit.snit_ifname, device, NITIFSIZ);
+	(void)strncpy(snit.snit_ifname, device, sizeof(snit.snit_ifname)-1);
 
 	if (bind(fd, (struct sockaddr *)&snit, sizeof(snit))) {
 		snprintf(ebuf, PCAP_ERRBUF_SIZE,
--- kismet-2006-04-R1/libpcap-0.9.1-kis/pcap-snoop.c.strop	2005-06-21 02:58:08.000000000 +0200
+++ kismet-2006-04-R1/libpcap-0.9.1-kis/pcap-snoop.c	2006-04-22 21:08:37.000000000 +0200
@@ -223,7 +223,7 @@ pcap_open_live(const char *device, int s
 	p->fd = fd;
 	memset(&sr, 0, sizeof(sr));
 	sr.sr_family = AF_RAW;
-	(void)strncpy(sr.sr_ifname, device, sizeof(sr.sr_ifname));
+	(void)strncpy(sr.sr_ifname, device, sizeof(sr.sr_ifname)-1);
 	if (bind(fd, (struct sockaddr *)&sr, sizeof(sr))) {
 		snprintf(ebuf, PCAP_ERRBUF_SIZE, "snoop bind: %s",
 		    pcap_strerror(errno));
@@ -316,6 +316,7 @@ pcap_open_live(const char *device, int s
 	 * to be no greater than the MTU.
 	 */
 	(void)strncpy(ifr.ifr_name, device, sizeof(ifr.ifr_name));
+	ifr.ifr_name[sizeof(ifr.ifr_name)-1] = '\0';
 	if (ioctl(fd, SIOCGIFMTU, (char *)&ifr) < 0) {
 		snprintf(ebuf, PCAP_ERRBUF_SIZE, "SIOCGIFMTU: %s",
 		    pcap_strerror(errno));
--- kismet-2006-04-R1/libpcap-0.9.1-kis/fad-gifc.c.strop	2005-06-21 02:58:08.000000000 +0200
+++ kismet-2006-04-R1/libpcap-0.9.1-kis/fad-gifc.c	2006-04-22 21:08:37.000000000 +0200
@@ -188,6 +188,7 @@ scan_proc_net_dev(pcap_if_t **devlistp, 
 		 * it's not up.
 		 */
 		strncpy(ifrflags.ifr_name, name, sizeof(ifrflags.ifr_name));
+		ifrflags.ifr_name[sizeof(ifrflags.ifr_name)-1] = '\0';
 		if (ioctl(fd, SIOCGIFFLAGS, (char *)&ifrflags) < 0) {
 			if (errno == ENXIO)
 				continue;
@@ -354,6 +355,7 @@ pcap_findalldevs(pcap_if_t **alldevsp, c
 		 */
 		strncpy(ifrflags.ifr_name, ifrp->ifr_name,
 		    sizeof(ifrflags.ifr_name));
+		ifrflags.ifr_name[sizeof(ifrflags.ifr_name)-1] = '\0';
 		if (ioctl(fd, SIOCGIFFLAGS, (char *)&ifrflags) < 0) {
 			if (errno == ENXIO)
 				continue;
@@ -373,6 +375,7 @@ pcap_findalldevs(pcap_if_t **alldevsp, c
 		 */
 		strncpy(ifrnetmask.ifr_name, ifrp->ifr_name,
 		    sizeof(ifrnetmask.ifr_name));
+		ifrnetmask.ifr_name[sizeof(ifrnetmask.ifr_name)-1] = '\0';
 		memcpy(&ifrnetmask.ifr_addr, &ifrp->ifr_addr,
 		    sizeof(ifrnetmask.ifr_addr));
 		if (ioctl(fd, SIOCGIFNETMASK, (char *)&ifrnetmask) < 0) {
@@ -403,6 +406,7 @@ pcap_findalldevs(pcap_if_t **alldevsp, c
 		if (ifrflags.ifr_flags & IFF_BROADCAST) {
 			strncpy(ifrbroadaddr.ifr_name, ifrp->ifr_name,
 			    sizeof(ifrbroadaddr.ifr_name));
+			ifrbroadaddr.ifr_name[sizeof(ifrbroadaddr.ifr_name)-1] = '\0';
 			memcpy(&ifrbroadaddr.ifr_addr, &ifrp->ifr_addr,
 			    sizeof(ifrbroadaddr.ifr_addr));
 			if (ioctl(fd, SIOCGIFBRDADDR,
@@ -442,6 +446,7 @@ pcap_findalldevs(pcap_if_t **alldevsp, c
 		if (ifrflags.ifr_flags & IFF_POINTOPOINT) {
 			strncpy(ifrdstaddr.ifr_name, ifrp->ifr_name,
 			    sizeof(ifrdstaddr.ifr_name));
+			ifrdstaddr.ifr_name[sizeof(ifrdstaddr.ifr_name)-1] = '\0';
 			memcpy(&ifrdstaddr.ifr_addr, &ifrp->ifr_addr,
 			    sizeof(ifrdstaddr.ifr_addr));
 			if (ioctl(fd, SIOCGIFDSTADDR,
--- kismet-2006-04-R1/libpcap-0.9.1-kis/pcap-linux.c.strop	2005-07-19 22:06:52.000000000 +0200
+++ kismet-2006-04-R1/libpcap-0.9.1-kis/pcap-linux.c	2006-04-22 21:08:37.000000000 +0200
@@ -1496,7 +1496,7 @@ iface_get_id(int fd, const char *device,
 	struct ifreq	ifr;
 
 	memset(&ifr, 0, sizeof(ifr));
-	strncpy(ifr.ifr_name, device, sizeof(ifr.ifr_name));
+	strncpy(ifr.ifr_name, device, sizeof(ifr.ifr_name)-1);
 
 	if (ioctl(fd, SIOCGIFINDEX, &ifr) == -1) {
 		snprintf(ebuf, PCAP_ERRBUF_SIZE,
@@ -1598,7 +1598,7 @@ static void	pcap_close_linux( pcap_t *ha
 		 * kernels.
 		 */
 		memset(&ifr, 0, sizeof(ifr));
-		strncpy(ifr.ifr_name, handle->md.device, sizeof(ifr.ifr_name));
+		strncpy(ifr.ifr_name, handle->md.device, sizeof(ifr.ifr_name)-1);
 		if (ioctl(handle->fd, SIOCGIFFLAGS, &ifr) == -1) {
 			fprintf(stderr,
 			    "Can't restore interface flags (SIOCGIFFLAGS failed: %s).\n"
@@ -1714,7 +1714,7 @@ live_open_old(pcap_t *handle, const char
 
 		if (promisc) {
 			memset(&ifr, 0, sizeof(ifr));
-			strncpy(ifr.ifr_name, device, sizeof(ifr.ifr_name));
+			strncpy(ifr.ifr_name, device, sizeof(ifr.ifr_name)-1);
 			if (ioctl(handle->fd, SIOCGIFFLAGS, &ifr) == -1) {
 				snprintf(ebuf, PCAP_ERRBUF_SIZE,
 					 "ioctl: %s", pcap_strerror(errno));
@@ -1792,7 +1792,7 @@ iface_bind_old(int fd, const char *devic
 	socklen_t	errlen = sizeof(err);
 
 	memset(&saddr, 0, sizeof(saddr));
-	strncpy(saddr.sa_data, device, sizeof(saddr.sa_data));
+	strncpy(saddr.sa_data, device, sizeof(saddr.sa_data)-1);
 	if (bind(fd, &saddr, sizeof(saddr)) == -1) {
 		snprintf(ebuf, PCAP_ERRBUF_SIZE,
 			 "bind: %s", pcap_strerror(errno));
@@ -1831,7 +1831,7 @@ iface_get_mtu(int fd, const char *device
 		return BIGGER_THAN_ALL_MTUS;
 
 	memset(&ifr, 0, sizeof(ifr));
-	strncpy(ifr.ifr_name, device, sizeof(ifr.ifr_name));
+	strncpy(ifr.ifr_name, device, sizeof(ifr.ifr_name)-1);
 
 	if (ioctl(fd, SIOCGIFMTU, &ifr) == -1) {
 		snprintf(ebuf, PCAP_ERRBUF_SIZE,
@@ -1851,7 +1851,7 @@ iface_get_arptype(int fd, const char *de
 	struct ifreq	ifr;
 
 	memset(&ifr, 0, sizeof(ifr));
-	strncpy(ifr.ifr_name, device, sizeof(ifr.ifr_name));
+	strncpy(ifr.ifr_name, device, sizeof(ifr.ifr_name)-1);
 
 	if (ioctl(fd, SIOCGIFHWADDR, &ifr) == -1) {
 		snprintf(ebuf, PCAP_ERRBUF_SIZE,
--- kismet-2006-04-R1/panelfront_display.cc.strop	2005-08-15 17:52:16.000000000 +0200
+++ kismet-2006-04-R1/panelfront_display.cc	2006-04-22 21:08:37.000000000 +0200
@@ -19,6 +19,7 @@
 #include "config.h"
 
 #include <math.h>
+#include <sys/param.h>
 
 #include "panelfront.h"
 #include "displaynetworksort.h"
@@ -1475,9 +1476,8 @@ int PanelFront::DetailsPrinter(void *in_
     char output[1024];
     kwin->text.clear();
 
-    int print_width = kwin->print_width;
-    if (print_width > 1024)
-        print_width = 1023;
+    size_t const print_width = MIN(static_cast<size_t>(kwin->print_width),
+				   sizeof(output));
 
 	if (details_network == NULL) {
 		kwin->text.push_back("The network or group being displayed");
@@ -1918,9 +1918,8 @@ int PanelFront::GpsPrinter(void *in_wind
 
     wireless_network *dnet = details_network->virtnet;
 
-    int print_width = kwin->print_width;
-    if (print_width > 1024)
-        print_width = 1023;
+    size_t const print_width = MIN(static_cast<size_t>(kwin->print_width),
+				   sizeof(output));
 
     if (print_width < 32) {
         kwin->text.push_back("Display not wide enough");
@@ -2603,7 +2602,8 @@ int PanelFront::StatsPrinter(void *in_wi
     vector<string> details_text;
     char output[1024];
 
-    const int print_width = kwin->print_width;
+    const size_t print_width = MIN(static_cast<size_t>(kwin->print_width),
+				   sizeof(output));
 
     snprintf(output, print_width, "Start   : %.24s", ctime((const time_t *) &start_time));
     details_text.push_back(output);
@@ -2921,9 +2921,8 @@ int PanelFront::DetailsClientPrinter(voi
     char temp[1024];
     kwin->text.clear();
 
-    int print_width = kwin->print_width;
-    if (print_width > 1024)
-        print_width = 1023;
+    size_t const print_width = MIN(static_cast<size_t>(kwin->print_width),
+				   sizeof(output));
 
     switch (details_client->type) {
     case client_fromds:
--- kismet-2006-04-R1/pcapsource.cc.strop	2006-04-22 21:08:37.000000000 +0200
+++ kismet-2006-04-R1/pcapsource.cc	2006-04-22 21:08:37.000000000 +0200
@@ -2756,7 +2756,7 @@ bool RadiotapBSD::getmediaopt(int& optio
         return false;
 
     memset(&ifmr, 0, sizeof(ifmr));
-    strncpy(ifmr.ifm_name, ifname.c_str(), sizeof(ifmr.ifm_name));
+    strncpy(ifmr.ifm_name, ifname.c_str(), sizeof(ifmr.ifm_name)-1);
 
     /*
      * We must go through the motions of reading all
@@ -2781,7 +2781,7 @@ bool RadiotapBSD::setmediaopt(int option
         return false;
 
     memset(&ifmr, 0, sizeof(ifmr));
-    strncpy(ifmr.ifm_name, ifname.c_str(), sizeof(ifmr.ifm_name));
+    strncpy(ifmr.ifm_name, ifname.c_str(), sizeof(ifmr.ifm_name)-1);
 
     /*
      * We must go through the motions of reading all
@@ -2809,7 +2809,7 @@ bool RadiotapBSD::setmediaopt(int option
     delete mwords;
 
     memset(&ifr, 0, sizeof(ifr));
-    strncpy(ifr.ifr_name, ifname.c_str(), sizeof(ifr.ifr_name));
+    strncpy(ifr.ifr_name, ifname.c_str(), sizeof(ifr.ifr_name)-1);
     ifr.ifr_media = (ifmr.ifm_current &~ IFM_OMASK) | options;
     ifr.ifr_media = (ifr.ifr_media &~ IFM_MMASK) | IFM_MAKEMODE(mode);
 
@@ -2863,7 +2863,7 @@ bool RadiotapBSD::get80211(int type, int
     if (!checksocket())
         return false;
     memset(&ireq, 0, sizeof(ireq));
-    strncpy(ireq.i_name, ifname.c_str(), sizeof(ireq.i_name));
+    strncpy(ireq.i_name, ifname.c_str(), sizeof(ireq.i_name)-1);
     ireq.i_type = type;
     ireq.i_len = len;
     ireq.i_data = data;
@@ -2881,7 +2881,7 @@ bool RadiotapBSD::set80211(int type, int
     if (!checksocket())
 	return false;
     memset(&ireq, 0, sizeof(ireq));
-    strncpy(ireq.i_name, ifname.c_str(), sizeof(ireq.i_name));
+    strncpy(ireq.i_name, ifname.c_str(), sizeof(ireq.i_name)-1);
     ireq.i_type = type;
     ireq.i_val = val;
     ireq.i_len = len;
@@ -2898,6 +2898,7 @@ bool RadiotapBSD::getifflags(int& flags)
         return false;
 
     strncpy(ifr.ifr_name, ifname.c_str(), sizeof (ifr.ifr_name));
+    ifr.ifr_name[sizeof (ifr.ifr_name)-1] = '\0';
     if (ioctl(s, SIOCGIFFLAGS, (caddr_t)&ifr) < 0) {
         perror("SIOCGIFFLAGS ioctl failed");
         return false;
--- kismet-2006-04-R1/tcpclient.cc.strop	2006-04-22 21:08:37.000000000 +0200
+++ kismet-2006-04-R1/tcpclient.cc	2006-04-22 21:08:37.000000000 +0200
@@ -107,6 +107,7 @@ int TcpClient::Connect(short int in_port
     }
 
     strncpy(hostname, in_host, MAXHOSTNAMELEN);
+    hostname[MAXHOSTNAMELEN-1] = '\0';
 
     // Set up our socket
     //bzero(&client_sock, sizeof(client_sock));
--- kismet-2006-04-R1/gpsmap_cache.cc.strop	2005-03-10 17:49:34.000000000 +0100
+++ kismet-2006-04-R1/gpsmap_cache.cc	2006-04-22 21:08:37.000000000 +0200
@@ -174,6 +174,8 @@ int ReadGpsCacheFile(const char *in_gpsf
 
         strncpy(pt->bssid, cpt.bssid, MAC_STR_LEN);
         strncpy(pt->source, cpt.source, MAC_STR_LEN);
+	pt->bssid[MAC_STR_LEN-1]  = '\0';
+	pt->source[MAC_STR_LEN-1] = '\0';
         pt->tv_sec = cpt.tv_sec;
         pt->tv_usec = cpt.tv_usec;
         pt->lat = cpt.lat;
@@ -344,9 +346,10 @@ int WriteGpsCacheFile(const char *in_gps
     for (unsigned int nsam = 0; nsam < fheader.num_points; nsam++) {
         gpscache_point cpt;
         gps_point *pt = (*in_points)[nsam];
-   
-        strncpy(cpt.bssid, pt->bssid, MAC_STR_LEN);
-        strncpy(cpt.source, pt->source, MAC_STR_LEN);
+
+	memset(&cpt, 0, sizeof cpt);
+        strncpy(cpt.bssid, pt->bssid, sizeof(cpt.bssid)-1);
+        strncpy(cpt.source, pt->source, sizeof(cpt.source)-1);
         cpt.tv_sec = pt->tv_sec;
         cpt.tv_usec = pt->tv_usec;
         cpt.lat = pt->lat;
--- kismet-2006-04-R1/ifcontrol.cc.strop	2004-08-09 06:36:01.000000000 +0200
+++ kismet-2006-04-R1/ifcontrol.cc	2006-04-22 21:08:37.000000000 +0200
@@ -32,7 +32,8 @@ int Ifconfig_Set_Flags(const char *in_de
     }
 
     // Fetch interface flags
-    strncpy(ifr.ifr_name, in_dev, IFNAMSIZ);
+    memset(&ifr, 0, sizeof ifr);
+    strncpy(ifr.ifr_name, in_dev, sizeof(ifr.ifr_name)-1);
     ifr.ifr_flags = flags;
     if (ioctl(skfd, SIOCSIFFLAGS, &ifr) < 0) {
         snprintf(errstr, STATUS_MAX, "SetIFFlags: Unknown interface %s: %s", 
@@ -58,7 +59,8 @@ int Ifconfig_Get_Flags(const char *in_de
     }
 
     // Fetch interface flags
-    strncpy(ifr.ifr_name, in_dev, IFNAMSIZ);
+    memset(&ifr, 0, sizeof ifr);
+    strncpy(ifr.ifr_name, in_dev, sizeof(ifr.ifr_name)-1);
     if (ioctl(skfd, SIOCGIFFLAGS, &ifr) < 0) {
         snprintf(errstr, STATUS_MAX, "GetIFFlags: interface %s: %s", 
                  in_dev, strerror(errno));
@@ -96,7 +98,8 @@ int Ifconfig_Get_Hwaddr(const char *in_d
     }
 
     // Fetch interface flags
-    strncpy(ifr.ifr_name, in_dev, IFNAMSIZ);
+    memset(&ifr, 0, sizeof ifr);
+    strncpy(ifr.ifr_name, in_dev, sizeof(ifr.ifr_name)-1);
     if (ioctl(skfd, SIOCGIFHWADDR, &ifr) < 0) {
         snprintf(errstr, STATUS_MAX, "Getting HWAddr: unknown interface %s: %s", 
                  in_dev, strerror(errno));
@@ -122,7 +125,8 @@ int Ifconfig_Set_Hwaddr(const char *in_d
         return -1;
     }
 
-    strncpy(ifr.ifr_name, in_dev, IFNAMSIZ);
+    memset(&ifr, 0, sizeof ifr);
+    strncpy(ifr.ifr_name, in_dev, sizeof(ifr.ifr_name)-1);
     memcpy(ifr.ifr_hwaddr.sa_data, in_hwaddr, 6);
     ifr.ifr_hwaddr.sa_family = ARPHRD_ETHER;
      
@@ -151,7 +155,8 @@ int Ifconfig_Set_MTU(const char *in_dev,
     }
 
     // Fetch interface flags
-    strncpy(ifr.ifr_name, in_dev, IFNAMSIZ);
+    memset(&ifr, 0, sizeof ifr);
+    strncpy(ifr.ifr_name, in_dev, sizeof(ifr.ifr_name)-1);
     ifr.ifr_mtu = in_mtu;
     if (ioctl(skfd, SIOCSIFMTU, &ifr) < 0) {
         snprintf(errstr, STATUS_MAX, "Setting MTU: unknown interface %s: %s", 

kismet-2006-04-R1-uninit.patch:

--- NEW FILE kismet-2006-04-R1-uninit.patch ---
2006-04-22  Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>

	* macaddr.h: initialized a 'second' attribute in an iterator
	  class which might be used uninitialized else

--- kismet-2006-04-R1/macaddr.h.uninit	2006-01-04 16:32:46.000000000 +0100
+++ kismet-2006-04-R1/macaddr.h	2006-04-22 18:22:02.000000000 +0200
@@ -290,6 +290,7 @@ public:
             } else {
                 singleton_itr = owner->singleton_map.end();
                 vector_itr = owner->mask_vec.size();
+		second     = NULL;
             }
         }
 


--- NEW FILE kismet-2006-04-R1.tar.gz.asc ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2.2 (GNU/Linux)

iD8DBQBEPdlU17KIInOLvbERAhT2AKCWL5TA/FwgFZbFubgKQc8so8bYPACaAwQd
3W60uDYNJgwGoxNwroHB5t4=
=KeKF
-----END PGP SIGNATURE-----


--- NEW FILE kismet.spec ---
## $Id: kismet.spec 1859 2006-04-23 11:47:18Z ensc at BIGO.ENSC.DE $

%global _version	2006-04-R1

## {Local macros...
%global username	kismet
%global crontabdir	%_sysconfdir/cron.daily
%global homedir		%_var/lib/%name
%global logdir		%_var/log/%name
%global cfgdir		%_sysconfdir/%name
%global _rpmversion	0.0.%(echo %_version | tr - .)
## ...local macros}

%{!?release_func:%global release_func() %1%{?dist}}

Summary:	WLAN detector, sniffer and IDS
Name:		kismet
Version:	%_rpmversion
Release:	%release_func 2
License:	GPL
Group:		Applications/Internet
URL:		http://www.kismetwireless.net/
Source0:	http://www.kismetwireless.net/code/%name-%_version.tar.gz
Source1:	http://www.kismetwireless.net/code/%name-%_version.tar.gz.asc
Source10:	tmpwatch.kismet
Source11:	sysconfig.kismet
Patch0:		kismet-2005-08-R1-jobcontrol.patch
Patch1:		kismet-2006-04-R1-packed.patch
Patch2:		kismet-2006-04-R1-noret.patch
Patch3:		kismet-2006-04-R1-uninit.patch
Patch4:		kismet-2006-04-R1-alias.patch
Patch5:		kismet-2006-04-R1-strop.patch
Patch6:		kismet-2006-04-R1-alias1.patch
Patch7:		kismet-2006-04-R1-ssize.patch
BuildRoot:	%_tmppath/%name-%version-%release-root
BuildRequires:		expat-devel ncurses-devel diffutils
BuildRequires:		gmp-devel wget glib-devel
BuildRequires:		ImageMagick-devel
# should be required by ImageMagick-devel but are missing in FC4
BuildRequires:		libtiff-devel libjpeg-devel
BuildRequires:		bzip2-devel
Requires(pre):		fedora-usermgmt
Requires(postun):	fedora-usermgmt
Requires(missingok):	tmpwatch
Requires(missingok):	crontabs
Requires(pre):		%crontabdir
Requires(postun):	%crontabdir


%package extras
Summary:	Non-core programs for 'kismet'
Group:		Applications/Internet
Requires:	%name = %version-%release


%description
Kismet is an 802.11 layer2 wireless network detector, sniffer, and
intrusion detection system. Kismet will work with any wireless card
which supports raw monitoring (rfmon) mode, and can sniff 802.11b,
802.11a, and 802.11g traffic.

Kismet identifies networks by passively collecting packets and detecting
standard named networks, detecting (and given time, decloaking) hidden
networks, and infering the presence of nonbeaconing networks via data
traffic.

%description extras
Kismet is an 802.11 layer2 wireless network detector, sniffer, and
intrusion detection system. Kismet will work with any wireless card
which supports raw monitoring (rfmon) mode, and can sniff 802.11b,
802.11a, and 802.11g traffic.

This subpackage contains programs which provide additional functionality
but introduce dependencies which are not needed for kismet to work.


%prep
%setup -q -n %name-%_version
%patch0 -p1 -b .jobcontrol
%patch1 -p1 -b .packed
%patch2 -p1 -b .noret
%patch3 -p1 -b .uninit
%patch4 -p1 -b .alias
%patch6 -p1 -b .alias1
%patch5 -p1 -b .strop
%patch7 -p1 -b .ssize

sed -e 's!/var/log/kismet!%logdir!g' %SOURCE10 >tmpwatch.kismet
touch --reference=%SOURCE10 tmpwatch.kismet || :	# keep timestamp

# set our 'kismet' user, disable GPS and log into %logdir by
# default
sed -i -e "s!your_user_here!%username!g;
           s!^gps=true!gps=false!;
           s!^logtemplate=%%!logtemplate=%logdir/%%!;
	   s!^configdir=.*!configdir=%h/!" \
		conf/kismet.conf.in conf/kismet_drone.conf

# do not strip installed binaries as it conflicts with the -debuginfo
# mechanism
sed -i -e "s!\(install .*\) -s !\1 !g" Makefile.in


%build
export ac_cv_header_linux_netlink_h=yes	# we have netlink.h; just the check is buggy
export ac_cv_lib_uClibcpp_main=no	# we do not want to build against uClibc++, even when available
%configure --enable-ipv6 --sysconfdir=%cfgdir

# HOME will be set to @srcdir@ which is disturbing distcc
make clean
make %{?_smp_mflags} HOME="$HOME"


%install
rm -rf $RPM_BUILD_ROOT
make install	\
	DESTDIR="$RPM_BUILD_ROOT" \
	INSTUSR="$(id -un)" INSTGRP="$(id -gn)" MANGRP="$(id -gn)"
install -d $RPM_BUILD_ROOT{%homedir,%logdir,%crontabdir,%_sysconfdir/sysconfig}
install -p -m755 tmpwatch.kismet $RPM_BUILD_ROOT%crontabdir
install -p -m644 %SOURCE11       $RPM_BUILD_ROOT%_sysconfdir/sysconfig/kismet


%pre
/usr/sbin/fedora-groupadd 12 -r %username &>/dev/null || :
/usr/sbin/fedora-useradd  12 -r -s /sbin/nologin -M -d %homedir		\
			     -c 'Kismet user' -g %username %username &>/dev/null || :


%postun
test "$1" != 0 || /usr/sbin/fedora-userdel  %username &>/dev/null || :
test "$1" != 0 || /usr/sbin/fedora-groupdel %username &>/dev/null || :


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc CHANGELOG* GPL README TODO docs
%dir %attr(0770,root,%username) %homedir
%dir %attr(0730,root,%username) %logdir
%dir %attr(0750,root,%username) %cfgdir
%config(noreplace) %cfgdir/*
%_bindir/kismet*
%_datadir/kismet
%_mandir/*/kismet*

%config            %crontabdir/tmpwatch.kismet
%config(noreplace) %_sysconfdir/sysconfig/kismet


%files extras
%defattr(-,root,root,-)
%_bindir/gps*
%_mandir/*/gps*


%changelog
* Sat Apr 29 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.0.2006.04.R1-2
- fixed compilation problems on AMD64 introduced by my -alias patch
  (reported by Hans de Goede)
- fixed ssize_t vs. int problem on AMD64 (found and reported by Hans
  de Goede)
- initial import into Fedora Extra (review #165314)

* Sat Apr 22 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.0.2006.04.R1-1
- updated to 2006-04-R1
- fixed/improved some ./configure checks
- removed the starting 'A' from the summary
- added a bunch of patches fixing compiler warnings

* Fri Mar 17 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.0.2005.08.R1-3
- fixed the usermgmt in the %%postun script: test for uninstallation
  and swap order of user- and groupdel operations
- moved logs to /var/log/kismet
- placed status information directly under /var/lib/kismet instead of
  /var/lib/kismet/.kismet
- added /etc/cron.dail/tmpwatch.kismet to cleanup the generated
  logfiles; used tmpwatch because kismet creates new, differently
  named logfiles.
- added -jobcontrol patch

* Thu Mar 16 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.0.2005.08.R1-2
- set *USR and *GRP variables to avoid problems with certain 'install'
  versions

* Thu Aug 18 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.0.2005.08.R1-1
- updated to 2005-08-R1 (SECURITY)
- do not use 'subst()' in %%prep anymore; the files *will* be touched
  so we do not need to care about the timestamp
- fixed copy&paste error in the gecos entry of the 'kismet' user

* Sun Aug  7 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.0.2005.07.R1a-1
- updated to 2005-07-R1a

* Sat Jul  9 2005 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.0.2005.06.R1-1
- Initial build.


## Local Variables:
## outline-regexp: "##\\s-*{.*\\.\\.\\."
## outline-heading-end-regexp: "##\\s-*\\.\\.\\..*}"
## End:


--- NEW FILE sysconfig.kismet ---
## set this flag when automatic removal of generated kismet logfiles
## is unwanted. Default: unset
# NO_TMPWATCH=

## set this option to the number of minimum number of hours the
## generated logfiles shall be kept. Default: 72 (3 days)
# TMPWATCH_TIME=72

## add additional options which shall be given to tmpwatch(8). Default:
## unset
# TMPWATCH_FLAGS=


--- NEW FILE tmpwatch.kismet ---
#! /bin/sh

TMPWATCH=/usr/sbin/tmpwatch
CFGFILE=/etc/sysconfig/kismet
LOGDIR=/var/log/kismet

NO_TMPWATCH=
TMPWATCH_TIME=72	# 3 days
TMPWATCH_FLAGS=
test ! -e $CFGFILE      || . $CFGFILE

test -z "$NO_LOGROTATE" || exit 0
test -x "$TMPWATCH"     || exit 0


exec $TMPWATCH $TMPWATCH_FLAGS "$TMPWATCH_TIME" "$LOGDIR"


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	29 Apr 2006 16:28:15 -0000	1.1
+++ .cvsignore	29 Apr 2006 16:31:28 -0000	1.2
@@ -0,0 +1 @@
+kismet-2006-04-R1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	29 Apr 2006 16:28:15 -0000	1.1
+++ sources	29 Apr 2006 16:31:28 -0000	1.2
@@ -0,0 +1 @@
+8ec2de513f2911df1b7edfcba5ad1c26  kismet-2006-04-R1.tar.gz



From fedora-extras-commits at redhat.com  Sat Apr 29 16:34:09 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 29 Apr 2006 09:34:09 -0700
Subject: owners owners.list,1.920,1.921
Message-ID: <200604291634.k3TGYBCt010278@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10259

Modified Files:
	owners.list 
Log Message:
added kismet


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.920
retrieving revision 1.921
diff -u -r1.920 -r1.921
--- owners.list	29 Apr 2006 10:59:20 -0000	1.920
+++ owners.list	29 Apr 2006 16:34:08 -0000	1.921
@@ -549,6 +549,7 @@
 Fedora Extras|kinput2|Japanese kanji input server for X11|tagoh at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|kiosktool|KIOSK administration tool for KDE|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|kipi-plugins|Plugins to use with Kipi|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
+Fedora Extras|kismet|WLAN detector, sniffer and IDS|enrico.scholz at informatik.tu-chemnitz.de|extras-qa at fedoraproject.org|
 Fedora Extras|kmymoney2|Personal finance|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|koffice|A set of office applications for KDE|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|koffice-langpack|Language files for koffic|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sat Apr 29 17:23:28 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 29 Apr 2006 10:23:28 -0700
Subject: rpms/kismet/devel kismet.spec,1.1,1.2
Message-ID: <200604291723.k3THNUB7014654@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/kismet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14637

Modified Files:
	kismet.spec 
Log Message:
try to find out why ImageMagick is not detect in -devel


Index: kismet.spec
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/kismet.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kismet.spec	29 Apr 2006 16:31:28 -0000	1.1
+++ kismet.spec	29 Apr 2006 17:23:28 -0000	1.2
@@ -105,6 +105,7 @@
 export ac_cv_header_linux_netlink_h=yes	# we have netlink.h; just the check is buggy
 export ac_cv_lib_uClibcpp_main=no	# we do not want to build against uClibc++, even when available
 %configure --enable-ipv6 --sysconfdir=%cfgdir
+cat config.log
 
 # HOME will be set to @srcdir@ which is disturbing distcc
 make clean



From fedora-extras-commits at redhat.com  Sat Apr 29 17:35:08 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 29 Apr 2006 10:35:08 -0700
Subject: rpms/kismet/devel kismet.spec,1.2,1.3
Message-ID: <200604291735.k3THZARU014748@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/kismet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14731

Modified Files:
	kismet.spec 
Log Message:
added 'freetype-devel' BR which is required for -devel branch


Index: kismet.spec
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/kismet.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- kismet.spec	29 Apr 2006 17:23:28 -0000	1.2
+++ kismet.spec	29 Apr 2006 17:35:08 -0000	1.3
@@ -37,7 +37,7 @@
 BuildRequires:		gmp-devel wget glib-devel
 BuildRequires:		ImageMagick-devel
 # should be required by ImageMagick-devel but are missing in FC4
-BuildRequires:		libtiff-devel libjpeg-devel
+BuildRequires:		libtiff-devel libjpeg-devel freetype-devel
 BuildRequires:		bzip2-devel
 Requires(pre):		fedora-usermgmt
 Requires(postun):	fedora-usermgmt
@@ -165,6 +165,7 @@
 - fixed ssize_t vs. int problem on AMD64 (found and reported by Hans
   de Goede)
 - initial import into Fedora Extra (review #165314)
+- added 'freetype-devel' BR which is required for -devel branch
 
 * Sat Apr 22 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.0.2006.04.R1-1
 - updated to 2006-04-R1



From fedora-extras-commits at redhat.com  Sat Apr 29 17:48:56 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sat, 29 Apr 2006 10:48:56 -0700
Subject: comps comps-fe5.xml.in,1.40,1.41 comps-fe6.xml.in,1.3,1.4
Message-ID: <200604291748.k3THmwFO014839@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14818

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in 
Log Message:
added gauche


Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- comps-fe5.xml.in	29 Apr 2006 07:28:24 -0000	1.40
+++ comps-fe5.xml.in	29 Apr 2006 17:48:56 -0000	1.41
@@ -38,6 +38,7 @@
         <packagereq type="optional">erlang</packagereq>
         <packagereq type="optional">fedora-rpmdevtools</packagereq>
         <packagereq type="optional">fpc</packagereq>
+        <packagereq type="optional">gauche</packagereq>
         <packagereq type="optional">gforth</packagereq>
         <packagereq type="optional">ghc</packagereq>
         <packagereq type="optional">git</packagereq>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- comps-fe6.xml.in	29 Apr 2006 07:28:24 -0000	1.3
+++ comps-fe6.xml.in	29 Apr 2006 17:48:56 -0000	1.4
@@ -38,6 +38,7 @@
         <packagereq type="optional">erlang</packagereq>
         <packagereq type="optional">fedora-rpmdevtools</packagereq>
         <packagereq type="optional">fpc</packagereq>
+        <packagereq type="optional">gauche</packagereq>
         <packagereq type="optional">gforth</packagereq>
         <packagereq type="optional">ghc</packagereq>
         <packagereq type="optional">git</packagereq>



From fedora-extras-commits at redhat.com  Sat Apr 29 18:11:06 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sat, 29 Apr 2006 11:11:06 -0700
Subject: rpms/kismet/devel kismet.spec,1.3,1.4
Message-ID: <200604291811.k3TIB8pG017094@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/kismet/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17077

Modified Files:
	kismet.spec 
Log Message:
removed the 'cat config.log' which was only used for debugging the freetype-devel BR issue


Index: kismet.spec
===================================================================
RCS file: /cvs/extras/rpms/kismet/devel/kismet.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kismet.spec	29 Apr 2006 17:35:08 -0000	1.3
+++ kismet.spec	29 Apr 2006 18:11:06 -0000	1.4
@@ -105,7 +105,6 @@
 export ac_cv_header_linux_netlink_h=yes	# we have netlink.h; just the check is buggy
 export ac_cv_lib_uClibcpp_main=no	# we do not want to build against uClibc++, even when available
 %configure --enable-ipv6 --sysconfdir=%cfgdir
-cat config.log
 
 # HOME will be set to @srcdir@ which is disturbing distcc
 make clean



From fedora-extras-commits at redhat.com  Sat Apr 29 18:56:35 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 29 Apr 2006 11:56:35 -0700
Subject: rpms/raidem/devel .cvsignore, 1.2, 1.3 raidem-0.3.1-syslibs.patch,
	1.1, 1.2 raidem.spec, 1.4, 1.5 sources, 1.2,
	1.3 raidem-0.3-loadpng.patch, 1.1, NONE raidem-0.3-no-mp3.patch,
	1.1, NONE raidem-0.3-syslibs.patch, 1.1,
	NONE raidem-0.3-warn.patch, 1.1, NONE
Message-ID: <200604291856.k3TIubYl017324@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/raidem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17298

Modified Files:
	.cvsignore raidem-0.3.1-syslibs.patch raidem.spec sources 
Removed Files:
	raidem-0.3-loadpng.patch raidem-0.3-no-mp3.patch 
	raidem-0.3-syslibs.patch raidem-0.3-warn.patch 
Log Message:
* Sat Apr 29 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.1-1
- New upstream release 0.3.1
- Upstream has merged most patches, dropped.
- Upstream has added ogg support (yeah!), add ogg and id3tag support.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/raidem/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	15 Mar 2006 18:43:34 -0000	1.2
+++ .cvsignore	29 Apr 2006 18:56:35 -0000	1.3
@@ -1 +1 @@
-raidem-0.3-src.zip
+raidem-0.3.1-src.zip

raidem-0.3.1-syslibs.patch:

Index: raidem-0.3.1-syslibs.patch
===================================================================
RCS file: /cvs/extras/rpms/raidem/devel/raidem-0.3.1-syslibs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- raidem-0.3.1-syslibs.patch	11 Apr 2006 20:46:48 -0000	1.1
+++ raidem-0.3.1-syslibs.patch	29 Apr 2006 18:56:35 -0000	1.2
@@ -1,20 +1,5 @@
-diff -ur raidem-0.3.1-src.orig/Makefile raidem-0.3.1-src/Makefile
---- raidem-0.3.1-src.orig/Makefile	2006-04-08 06:54:03.000000000 +0200
-+++ raidem-0.3.1-src/Makefile	2006-04-09 20:46:18.000000000 +0200
-@@ -4,8 +4,8 @@
- 
- include Makefile.cfg
- 
--CFLAGS += -W -Wall -Werror -Wno-deprecated-declarations \
--	-fno-strict-aliasing				\
-+CFLAGS += -W -Wall -Wno-deprecated-declarations \
-+	-fno-strict-aliasing			\
- 	-Iinclude -Ilib
- #CFLAGS += -g3
- 
-diff -ur raidem-0.3.1-src.orig/configure.ac raidem-0.3.1-src/configure.ac
---- raidem-0.3.1-src.orig/configure.ac	2006-04-08 10:48:00.000000000 +0200
-+++ raidem-0.3.1-src/configure.ac	2006-04-11 22:06:03.000000000 +0200
+--- raidem-0.3.1-src/configure.ac.syslibs	2006-04-08 10:48:00.000000000 +0200
++++ raidem-0.3.1-src/configure.ac	2006-04-29 15:01:51.000000000 +0200
 @@ -53,7 +53,8 @@
                                AC_MSG_NOTICE([===== Using lib/adime =====]) &&
                                (cd lib/adime; sh fix.sh unix --quick) &&
@@ -34,20 +19,62 @@
  AC_SUBST(NO_ALRAND, 1)
  fi
  
-@@ -124,7 +125,8 @@
+@@ -120,7 +121,7 @@
+ 
+ 
+ if ${ogg}; then
+-AC_HAVE_LIBRARY([alogg],
++PKG_CHECK_MODULES(AllegroOGG, [AllegroOGG >= 1.0.0],
                  AC_SUBST(HAVE_ALLEGROOGG, 1),
                  AC_CHECK_FILE([lib/allegroogg/Makefile],
                                AC_MSG_NOTICE([===== Using lib/allegroogg =====]),
--                              AC_SUBST(NO_OGG, 1)))
-+                              AC_SUBST(NO_OGG, 1)),
-+                [`$alcfg --libs`])
+--- raidem-0.3.1-src/src/map-editor/map-proc.m.syslibs	2006-01-20 03:33:33.000000000 +0100
++++ raidem-0.3.1-src/src/map-editor/map-proc.m	2006-04-29 15:01:51.000000000 +0200
+@@ -4,7 +4,7 @@
+ #include <allegro.h>
+ #include <assert.h>
+ #include <math.h>
+-#include "adime/include/adime.h"
++#include <adime.h>
+ #include "common.h"
+ #include "group.h"
+ #include "gui/gui-clip.h"
+--- raidem-0.3.1-src/Makefile.cfg.in.syslibs	2006-04-08 07:23:28.000000000 +0200
++++ raidem-0.3.1-src/Makefile.cfg.in	2006-04-29 15:01:51.000000000 +0200
+@@ -8,6 +8,7 @@
+ INSTALL := install
+ alcfg := @alcfg@
+ ftcfg := @ftcfg@
++pkgcfg := @PKG_CONFIG@
+ 
+ # Install paths.
+ prefix := @prefix@
+--- raidem-0.3.1-src/Makefile.syslibs	2006-04-08 06:54:03.000000000 +0200
++++ raidem-0.3.1-src/Makefile	2006-04-29 15:13:53.000000000 +0200
+@@ -4,8 +4,8 @@
+ 
+ include Makefile.cfg
+ 
+-CFLAGS += -W -Wall -Werror -Wno-deprecated-declarations \
+-	-fno-strict-aliasing				\
++CFLAGS += -W -Wall -Wno-deprecated-declarations \
++	-fno-strict-aliasing			\
+ 	-Iinclude -Ilib
+ #CFLAGS += -g3
+ 
+--- raidem-0.3.1-src/misc/Makefile.all.syslibs	2006-04-08 09:12:44.000000000 +0200
++++ raidem-0.3.1-src/misc/Makefile.all	2006-04-29 15:01:51.000000000 +0200
+@@ -30,7 +30,8 @@
+ CFLAGS += -DNO_OGG
  else
- AC_SUBST(NO_OGG, 1)
- fi
-diff -ur raidem-0.3.1-src.orig/misc/Makefile.all raidem-0.3.1-src/misc/Makefile.all
---- raidem-0.3.1-src.orig/misc/Makefile.all	2006-04-08 09:12:44.000000000 +0200
-+++ raidem-0.3.1-src/misc/Makefile.all	2006-04-09 21:06:03.000000000 +0200
-@@ -56,11 +56,14 @@
+ ifdef HAVE_ALLEGROOGG
+-LDLIBS += -lalogg
++LDLIBS += `$(pkgcfg) AllegroOGG --libs`
++CFLAGS += `$(pkgcfg) AllegroOGG --cflags`
+ else
+ CFLAGS += -Ilib/allegroogg/include
+ endif # HAVE_ALLEGROOGG
+@@ -56,11 +57,14 @@
  # Glyph-Keeper
  ifdef HAVE_GLYPH_KEEPER
  LDLIBS += -lglyph-alleg
@@ -63,15 +90,3 @@
  CFLAGS += -Ilib/freetype/include
  endif
  
-diff -ur raidem-0.3.1-src.orig/src/map-editor/map-proc.m raidem-0.3.1-src/src/map-editor/map-proc.m
---- raidem-0.3.1-src.orig/src/map-editor/map-proc.m	2006-01-20 03:33:33.000000000 +0100
-+++ raidem-0.3.1-src/src/map-editor/map-proc.m	2006-04-09 20:47:00.000000000 +0200
-@@ -4,7 +4,7 @@
- #include <allegro.h>
- #include <assert.h>
- #include <math.h>
--#include "adime/include/adime.h"
-+#include <adime.h>
- #include "common.h"
- #include "group.h"
- #include "gui/gui-clip.h"


Index: raidem.spec
===================================================================
RCS file: /cvs/extras/rpms/raidem/devel/raidem.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- raidem.spec	6 Apr 2006 20:26:44 -0000	1.4
+++ raidem.spec	29 Apr 2006 18:56:35 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           raidem
-Version:        0.3
-Release:        2%{?dist}
+Version:        0.3.1
+Release:        1%{?dist}
 Summary:        2d top-down shoot'em up
 Group:          Amusements/Games
 License:        zlib License
@@ -10,13 +10,11 @@
 Source0:        %{name}-%{version}-src.zip
 Source1:        raidem.png
 Source2:        raidem.desktop
-Patch0:         raidem-0.3-no-mp3.patch
-Patch1:         raidem-0.3-syslibs.patch
-Patch2:         raidem-0.3-warn.patch
-Patch3:         raidem-0.3-loadpng.patch
+Patch0:         raidem-0.3.1-syslibs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gcc-objc glyph-keeper-devel freetype-devel adime-devel
-BuildRequires:  zziplib-devel libpng-devel desktop-file-utils
+BuildRequires:  zziplib-devel libpng-devel libid3tag-devel AllegroOGG-devel
+BuildRequires:  automake desktop-file-utils
 
 %description
 Raid'em is a 2d top-down shoot'em up. It began as a remake of Raid II
@@ -29,30 +27,29 @@
 
 %prep
 %setup -q -n %{name}-%{version}-src
-%patch0 -p1 -z .no_mp3
-%patch1 -p1 -z .syslibs
-%patch2 -p1 -z .warn
-%patch3 -p1 -z .loadpng
+%patch0 -p1 -z .syslibs
 # remove all included system libs, to avoid using the included system headers.
 mv lib/loadpng .
 rm -fr lib/*
 mv loadpng lib
+aclocal
+autoconf
 
 
 %build
-make %{?_smp_mflags} lib/loadpng/libldpng.a raid \
-  CFLAGS="$RPM_OPT_FLAGS -fsigned-char -Iinclude -Ilib -D__LINUX__ -DNO_MP3 \
-    -DNO_ID3TAGS -DNO_FBLEND -DGLYPH_TARGET=GLYPH_TARGET_ALLEGRO -DITOUCH \
-    -DRAIDEM_DATA_DIR=\\\"%{_datadir}/%{name}/\\\"" \
-  LDLIBS="-lglyph-alleg `freetype-config --libs` lib/loadpng/libldpng.a -lpng \
-    -lzzip -ladime `allegro-config --libs` -lz -lpthread -lobjc"
+# override _datadir otherwise it expects its datafile directly under /use/share
+%define _datadir /usr/share/%{name}
+%configure
+%define _datadir /use/share
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-#DIY, since the Makefile uses hardcoded ( := assigned) paths.
+# DIY, since the Makefile uses hardcoded ( := assigned) paths and install -s
+# and install -g games, etc. Fixable but this is easier
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
-install -m 755 raid $RPM_BUILD_ROOT%{_bindir}/%{name}
+install -m 755 %{name} $RPM_BUILD_ROOT%{_bindir}/%{name}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
 cp -a data demos maps $RPM_BUILD_ROOT%{_datadir}/%{name}
 
@@ -89,11 +86,16 @@
 %doc ChangeLog docs/LICENCE.txt docs/README.txt docs/damages.txt
 %{_bindir}/%{name}
 %{_datadir}/%{name}
-%{_datadir}/applications/fedora-raidem.desktop
-%{_datadir}/icons/hicolor/48x48/apps/raidem.png
+%{_datadir}/applications/fedora-%{name}.desktop
+%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 
 
 %changelog
+* Sat Apr 29 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.1-1
+- New upstream release 0.3.1
+- Upstream has merged most patches, dropped.
+- Upstream has added ogg support (yeah!), add ogg and id3tag support.
+
 * Sun Apr  2 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3-2
 - Add missing RPM_OPT_FLAGS to CFLAGS
 - Add missing -D__LINUX__ to CFLAGS with this patch2 is no longer needed


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/raidem/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	15 Mar 2006 18:43:34 -0000	1.2
+++ sources	29 Apr 2006 18:56:35 -0000	1.3
@@ -1 +1 @@
-7a8de682a0fe122e784cc192b19ece4e  raidem-0.3-src.zip
+5bb3fa98b43e86afa453f88a8d90bf64  raidem-0.3.1-src.zip


--- raidem-0.3-loadpng.patch DELETED ---


--- raidem-0.3-no-mp3.patch DELETED ---


--- raidem-0.3-syslibs.patch DELETED ---


--- raidem-0.3-warn.patch DELETED ---



From fedora-extras-commits at redhat.com  Sat Apr 29 21:20:17 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Sat, 29 Apr 2006 14:20:17 -0700
Subject: rpms/doctorj/devel doctorj.spec,1.14,1.15
Message-ID: <200604292120.k3TLKJHM025104@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/doctorj/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25057/devel

Modified Files:
	doctorj.spec 
Log Message:
- changed Requires and BuildRequires based on advise from Ville Skytt?? 
- made package noarch



Index: doctorj.spec
===================================================================
RCS file: /cvs/extras/rpms/doctorj/devel/doctorj.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- doctorj.spec	29 Apr 2006 02:42:46 -0000	1.14
+++ doctorj.spec	29 Apr 2006 21:20:17 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           doctorj
 Version:        5.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Java source code analyzer
 
 Group:          Development/Tools
@@ -8,10 +8,14 @@
 URL:            http://doctorj.sourceforge.net/
 Source:         http://download.sf.net/doctorj/%{name}-%{version}.tar.gz
 Patch0:		classpath_fix.patch
-Requires:	java-1.4.2-gcj-compat
-BuildRequires:	java-1.4.2-gcj-compat-devel
+
+Requires: jre
+BuildRequires: java-devel
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildArch:	noarch
+
 %description
 DoctorJ analyzes Java code, in the following functional areas:
 documentation verification, statistics generation and syntax analysis.
@@ -39,6 +43,10 @@
 %{_datadir}/%{name}
 
 %changelog
+* Sun Apr 30 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.0.0-3
+- based on advise from Ville Skytt??, changed buildrequires and requires
+- made package noarch
+
 * Sat Apr 29 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.0.0-2
 - added patch to export classpath
 - added requires on java-1.4.2-gcj-compat



From fedora-extras-commits at redhat.com  Sat Apr 29 21:20:11 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Sat, 29 Apr 2006 14:20:11 -0700
Subject: rpms/doctorj/FC-4 doctorj.spec,1.12,1.13
Message-ID: <200604292120.k3TLKhdC025107@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/doctorj/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25057/FC-4

Modified Files:
	doctorj.spec 
Log Message:
- changed Requires and BuildRequires based on advise from Ville Skytt?? 
- made package noarch



Index: doctorj.spec
===================================================================
RCS file: /cvs/extras/rpms/doctorj/FC-4/doctorj.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- doctorj.spec	29 Apr 2006 02:47:55 -0000	1.12
+++ doctorj.spec	29 Apr 2006 21:20:11 -0000	1.13
@@ -1,6 +1,6 @@
 Name:           doctorj
 Version:        5.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Java source code analyzer
 
 Group:          Development/Tools
@@ -8,10 +8,14 @@
 URL:            http://doctorj.sourceforge.net/
 Source:         http://download.sf.net/doctorj/%{name}-%{version}.tar.gz
 Patch0:		classpath_fix.patch
-Requires:	java-1.4.2-gcj-compat
-BuildRequires:	java-1.4.2-gcj-compat-devel
+
+Requires: jre
+BuildRequires: java-devel
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildArch:	noarch
+
 %description
 DoctorJ analyzes Java code, in the following functional areas:
 documentation verification, statistics generation and syntax analysis.
@@ -39,6 +43,10 @@
 %{_datadir}/%{name}
 
 %changelog
+* Sun Apr 30 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.0.0-3
+- based on advise from Ville Skytt??, changed buildrequires and requires
+- made package noarch
+
 * Sat Apr 29 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.0.0-2
 - added patch to export classpath
 - added requires on java-1.4.2-gcj-compat



From fedora-extras-commits at redhat.com  Sat Apr 29 21:20:12 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Sat, 29 Apr 2006 14:20:12 -0700
Subject: rpms/doctorj/FC-5 doctorj.spec,1.13,1.14
Message-ID: <200604292120.k3TLKic2025110@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/doctorj/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25057/FC-5

Modified Files:
	doctorj.spec 
Log Message:
- changed Requires and BuildRequires based on advise from Ville Skytt?? 
- made package noarch



Index: doctorj.spec
===================================================================
RCS file: /cvs/extras/rpms/doctorj/FC-5/doctorj.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- doctorj.spec	29 Apr 2006 02:47:56 -0000	1.13
+++ doctorj.spec	29 Apr 2006 21:20:11 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           doctorj
 Version:        5.0.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Java source code analyzer
 
 Group:          Development/Tools
@@ -8,10 +8,14 @@
 URL:            http://doctorj.sourceforge.net/
 Source:         http://download.sf.net/doctorj/%{name}-%{version}.tar.gz
 Patch0:		classpath_fix.patch
-Requires:	java-1.4.2-gcj-compat
-BuildRequires:	java-1.4.2-gcj-compat-devel
+
+Requires: jre
+BuildRequires: java-devel
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+BuildArch:	noarch
+
 %description
 DoctorJ analyzes Java code, in the following functional areas:
 documentation verification, statistics generation and syntax analysis.
@@ -39,6 +43,10 @@
 %{_datadir}/%{name}
 
 %changelog
+* Sun Apr 30 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.0.0-3
+- based on advise from Ville Skytt??, changed buildrequires and requires
+- made package noarch
+
 * Sat Apr 29 2006 Michael J. Knox <michael[AT]knox.net.nz> - 5.0.0-2
 - added patch to export classpath
 - added requires on java-1.4.2-gcj-compat



From fedora-extras-commits at redhat.com  Sat Apr 29 21:23:15 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Sat, 29 Apr 2006 14:23:15 -0700
Subject: rpms/doctorj/FC-4 doctorj.spec,1.13,1.14
Message-ID: <200604292123.k3TLNHiR025245@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/doctorj/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25226

Modified Files:
	doctorj.spec 
Log Message:
bumped release cuz I messed up the tag for FC4



Index: doctorj.spec
===================================================================
RCS file: /cvs/extras/rpms/doctorj/FC-4/doctorj.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- doctorj.spec	29 Apr 2006 21:20:11 -0000	1.13
+++ doctorj.spec	29 Apr 2006 21:23:15 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           doctorj
 Version:        5.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Java source code analyzer
 
 Group:          Development/Tools



From fedora-extras-commits at redhat.com  Sat Apr 29 21:56:10 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Sat, 29 Apr 2006 14:56:10 -0700
Subject: rpms/doctorj/FC-5 doctorj.spec,1.14,1.15
Message-ID: <200604292156.k3TLuClW025358@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/doctorj/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25341

Modified Files:
	doctorj.spec 
Log Message:
bump release so FC4 is not newer than FC5, avoid breaking things. 



Index: doctorj.spec
===================================================================
RCS file: /cvs/extras/rpms/doctorj/FC-5/doctorj.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- doctorj.spec	29 Apr 2006 21:20:11 -0000	1.14
+++ doctorj.spec	29 Apr 2006 21:56:10 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           doctorj
 Version:        5.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Java source code analyzer
 
 Group:          Development/Tools



From fedora-extras-commits at redhat.com  Sat Apr 29 21:57:38 2006
From: fedora-extras-commits at redhat.com (Michael J Knox (mjk))
Date: Sat, 29 Apr 2006 14:57:38 -0700
Subject: rpms/doctorj/devel doctorj.spec,1.15,1.16
Message-ID: <200604292157.k3TLveBm025419@cvs-int.fedora.redhat.com>

Author: mjk

Update of /cvs/extras/rpms/doctorj/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25402

Modified Files:
	doctorj.spec 
Log Message:
bump release so FC4 is not newer than devel, avoid breaking things.




Index: doctorj.spec
===================================================================
RCS file: /cvs/extras/rpms/doctorj/devel/doctorj.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- doctorj.spec	29 Apr 2006 21:20:17 -0000	1.15
+++ doctorj.spec	29 Apr 2006 21:57:37 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           doctorj
 Version:        5.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Java source code analyzer
 
 Group:          Development/Tools



From fedora-extras-commits at redhat.com  Sat Apr 29 22:58:16 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 29 Apr 2006 15:58:16 -0700
Subject: rpms/bsd-games/devel bsd-games.spec,1.1,1.2
Message-ID: <200604292258.k3TMwICc027908@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/bsd-games/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27891

Modified Files:
	bsd-games.spec 
Log Message:
- Simplify files section
- Remove unnecessary comment
- Mark scoreboard files as %%config





Index: bsd-games.spec
===================================================================
RCS file: /cvs/extras/rpms/bsd-games/devel/bsd-games.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bsd-games.spec	29 Apr 2006 15:34:43 -0000	1.1
+++ bsd-games.spec	29 Apr 2006 22:58:16 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Collection of text-based games
 Name: bsd-games
 Version: 2.17
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: BSD
 Group: Amusements/Games
 URL: ftp://metalab.unc.edu/pub/Linux/games/
@@ -19,9 +19,6 @@
 Patch6: bsd-games-2.17-hackgid.patch
 Patch7: bsd-games-2.17-phantasiagid.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# It looks like textutils became coreutils at some point.  I'm not sure
-# what is needed from it, so I'm commenting it out until I can find out.
-#Requires: textutils
 BuildRequires: ncurses-devel libtermcap-devel words
 Requires(Pre): /usr/sbin/groupadd
 
@@ -131,36 +128,33 @@
 %{_bindir}/worms
 %{_bindir}/wtf
 %{_bindir}/wump
-%dir %{_datadir}/bsd-games
-%{_datadir}/bsd-games/atc
-%{_datadir}/bsd-games/boggle
-%{_datadir}/bsd-games/cribbage.instr
-%{_datadir}/bsd-games/fish.instr
-%{_datadir}/bsd-games/monop-cards.pck
-%{_datadir}/bsd-games/quiz
-%{_datadir}/bsd-games/wump.info
+%{_datadir}/%{name}
 %{_datadir}/misc/acronyms
 %{_datadir}/misc/acronyms.comp
 %{_mandir}/man6/*
 %{_sbindir}/huntd
-%attr(664,root,games) %{_var}/games/atc_score
-%attr(664,root,games) %{_var}/games/battlestar.log
-%attr(664,root,games) %{_var}/games/cfscores
-%attr(664,root,games) %{_var}/games/criblog
-%{_datadir}/bsd-games/hack/
+%config %attr(664,root,games) %{_var}/games/atc_score
+%config %attr(664,root,games) %{_var}/games/battlestar.log
+%config %attr(664,root,games) %{_var}/games/cfscores
+%config %attr(664,root,games) %{_var}/games/criblog
 %dir %attr(0775,root,gamehack) %{_var}/games/hack
-%attr(664,root,gamehack) %{_var}/games/hack/*
+%config %attr(664,root,gamehack) %{_var}/games/hack/*
 %dir %attr(775,root,gamephant) %{_var}/games/phantasia
-%attr(664,root,gamephant) %{_var}/games/phantasia/*
+%config %attr(664,root,gamephant) %{_var}/games/phantasia/*
 %dir %attr(775,root,gamesail) %{_var}/games/sail
-%attr(644,root,games) %{_var}/games/robots_roll
-%attr(664,root,gamesail) %{_var}/games/saillog
-%attr(664,root,games) %{_var}/games/snake.log
-%attr(664,root,games) %{_var}/games/snakerawscores
-%attr(664,root,games) %{_var}/games/tetris-bsd.scores
+%config %attr(644,root,games) %{_var}/games/robots_roll
+%config %attr(664,root,gamesail) %{_var}/games/saillog
+%config %attr(664,root,games) %{_var}/games/snake.log
+%config %attr(664,root,games) %{_var}/games/snakerawscores
+%config %attr(664,root,games) %{_var}/games/tetris-bsd.scores
 %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me
 
 %changelog
+* Sat Apr 29 2006 Wart <wart at kobold.org> 2.17-9
+- Simplify files section
+- Remove unnecessary comment
+- Mark scoreboard files as %%config
+
 * Fri Apr 28 2006 Wart <wart at kobold.org> 2.17-8
 - Fix directory ownership of _datadir/bsd-games
 - Change license to BSD



From fedora-extras-commits at redhat.com  Sat Apr 29 22:59:14 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 29 Apr 2006 15:59:14 -0700
Subject: rpms/bsd-games/FC-4 bsd-games.spec,1.1,1.2
Message-ID: <200604292259.k3TMxGAH027988@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/rpms/bsd-games/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27957/FC-4

Modified Files:
	bsd-games.spec 
Log Message:
- Simplify files section
- Remove unnecessary comment
- Mark scoreboard files as %%config




Index: bsd-games.spec
===================================================================
RCS file: /cvs/extras/rpms/bsd-games/FC-4/bsd-games.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bsd-games.spec	29 Apr 2006 15:34:43 -0000	1.1
+++ bsd-games.spec	29 Apr 2006 22:59:13 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Collection of text-based games
 Name: bsd-games
 Version: 2.17
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: BSD
 Group: Amusements/Games
 URL: ftp://metalab.unc.edu/pub/Linux/games/
@@ -19,9 +19,6 @@
 Patch6: bsd-games-2.17-hackgid.patch
 Patch7: bsd-games-2.17-phantasiagid.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# It looks like textutils became coreutils at some point.  I'm not sure
-# what is needed from it, so I'm commenting it out until I can find out.
-#Requires: textutils
 BuildRequires: ncurses-devel libtermcap-devel words
 Requires(Pre): /usr/sbin/groupadd
 
@@ -131,36 +128,33 @@
 %{_bindir}/worms
 %{_bindir}/wtf
 %{_bindir}/wump
-%dir %{_datadir}/bsd-games
-%{_datadir}/bsd-games/atc
-%{_datadir}/bsd-games/boggle
-%{_datadir}/bsd-games/cribbage.instr
-%{_datadir}/bsd-games/fish.instr
-%{_datadir}/bsd-games/monop-cards.pck
-%{_datadir}/bsd-games/quiz
-%{_datadir}/bsd-games/wump.info
+%{_datadir}/%{name}
 %{_datadir}/misc/acronyms
 %{_datadir}/misc/acronyms.comp
 %{_mandir}/man6/*
 %{_sbindir}/huntd
-%attr(664,root,games) %{_var}/games/atc_score
-%attr(664,root,games) %{_var}/games/battlestar.log
-%attr(664,root,games) %{_var}/games/cfscores
-%attr(664,root,games) %{_var}/games/criblog
-%{_datadir}/bsd-games/hack/
+%config %attr(664,root,games) %{_var}/games/atc_score
+%config %attr(664,root,games) %{_var}/games/battlestar.log
+%config %attr(664,root,games) %{_var}/games/cfscores
+%config %attr(664,root,games) %{_var}/games/criblog
 %dir %attr(0775,root,gamehack) %{_var}/games/hack
-%attr(664,root,gamehack) %{_var}/games/hack/*
+%config %attr(664,root,gamehack) %{_var}/games/hack/*
 %dir %attr(775,root,gamephant) %{_var}/games/phantasia
-%attr(664,root,gamephant) %{_var}/games/phantasia/*
+%config %attr(664,root,gamephant) %{_var}/games/phantasia/*
 %dir %attr(775,root,gamesail) %{_var}/games/sail
-%attr(644,root,games) %{_var}/games/robots_roll
-%attr(664,root,gamesail) %{_var}/games/saillog
-%attr(664,root,games) %{_var}/games/snake.log
-%attr(664,root,games) %{_var}/games/snakerawscores
-%attr(664,root,games) %{_var}/games/tetris-bsd.scores
+%config %attr(644,root,games) %{_var}/games/robots_roll
+%config %attr(664,root,gamesail) %{_var}/games/saillog
+%config %attr(664,root,games) %{_var}/games/snake.log
+%config %attr(664,root,games) %{_var}/games/snakerawscores
+%config %attr(664,root,games) %{_var}/games/tetris-bsd.scores
 %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me
 
 %changelog
+* Sat Apr 29 2006 Wart <wart at kobold.org> 2.17-9
+- Simplify files section
+- Remove unnecessary comment
+- Mark scoreboard files as %%config
+
 * Fri Apr 28 2006 Wart <wart at kobold.org> 2.17-8
 - Fix directory ownership of _datadir/bsd-games
 - Change license to BSD



From fedora-extras-commits at redhat.com  Sat Apr 29 22:59:14 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sat, 29 Apr 2006 15:59:14 -0700
Subject: rpms/bsd-games/FC-5 bsd-games.spec,1.1,1.2
Message-ID: <200604292259.k3TMxG2l027992@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-serv27957/FC-5

Modified Files:
	bsd-games.spec 
Log Message:
- Simplify files section
- Remove unnecessary comment
- Mark scoreboard files as %%config




Index: bsd-games.spec
===================================================================
RCS file: /cvs/extras/rpms/bsd-games/FC-5/bsd-games.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bsd-games.spec	29 Apr 2006 15:34:43 -0000	1.1
+++ bsd-games.spec	29 Apr 2006 22:59:14 -0000	1.2
@@ -1,7 +1,7 @@
 Summary: Collection of text-based games
 Name: bsd-games
 Version: 2.17
-Release: 8%{?dist}
+Release: 9%{?dist}
 License: BSD
 Group: Amusements/Games
 URL: ftp://metalab.unc.edu/pub/Linux/games/
@@ -19,9 +19,6 @@
 Patch6: bsd-games-2.17-hackgid.patch
 Patch7: bsd-games-2.17-phantasiagid.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# It looks like textutils became coreutils at some point.  I'm not sure
-# what is needed from it, so I'm commenting it out until I can find out.
-#Requires: textutils
 BuildRequires: ncurses-devel libtermcap-devel words
 Requires(Pre): /usr/sbin/groupadd
 
@@ -131,36 +128,33 @@
 %{_bindir}/worms
 %{_bindir}/wtf
 %{_bindir}/wump
-%dir %{_datadir}/bsd-games
-%{_datadir}/bsd-games/atc
-%{_datadir}/bsd-games/boggle
-%{_datadir}/bsd-games/cribbage.instr
-%{_datadir}/bsd-games/fish.instr
-%{_datadir}/bsd-games/monop-cards.pck
-%{_datadir}/bsd-games/quiz
-%{_datadir}/bsd-games/wump.info
+%{_datadir}/%{name}
 %{_datadir}/misc/acronyms
 %{_datadir}/misc/acronyms.comp
 %{_mandir}/man6/*
 %{_sbindir}/huntd
-%attr(664,root,games) %{_var}/games/atc_score
-%attr(664,root,games) %{_var}/games/battlestar.log
-%attr(664,root,games) %{_var}/games/cfscores
-%attr(664,root,games) %{_var}/games/criblog
-%{_datadir}/bsd-games/hack/
+%config %attr(664,root,games) %{_var}/games/atc_score
+%config %attr(664,root,games) %{_var}/games/battlestar.log
+%config %attr(664,root,games) %{_var}/games/cfscores
+%config %attr(664,root,games) %{_var}/games/criblog
 %dir %attr(0775,root,gamehack) %{_var}/games/hack
-%attr(664,root,gamehack) %{_var}/games/hack/*
+%config %attr(664,root,gamehack) %{_var}/games/hack/*
 %dir %attr(775,root,gamephant) %{_var}/games/phantasia
-%attr(664,root,gamephant) %{_var}/games/phantasia/*
+%config %attr(664,root,gamephant) %{_var}/games/phantasia/*
 %dir %attr(775,root,gamesail) %{_var}/games/sail
-%attr(644,root,games) %{_var}/games/robots_roll
-%attr(664,root,gamesail) %{_var}/games/saillog
-%attr(664,root,games) %{_var}/games/snake.log
-%attr(664,root,games) %{_var}/games/snakerawscores
-%attr(664,root,games) %{_var}/games/tetris-bsd.scores
+%config %attr(644,root,games) %{_var}/games/robots_roll
+%config %attr(664,root,gamesail) %{_var}/games/saillog
+%config %attr(664,root,games) %{_var}/games/snake.log
+%config %attr(664,root,games) %{_var}/games/snakerawscores
+%config %attr(664,root,games) %{_var}/games/tetris-bsd.scores
 %doc AUTHORS COPYING ChangeLog ChangeLog.0 THANKS YEAR2000 README.hunt trek/USD.doc/trek.me
 
 %changelog
+* Sat Apr 29 2006 Wart <wart at kobold.org> 2.17-9
+- Simplify files section
+- Remove unnecessary comment
+- Mark scoreboard files as %%config
+
 * Fri Apr 28 2006 Wart <wart at kobold.org> 2.17-8
 - Fix directory ownership of _datadir/bsd-games
 - Change license to BSD



From fedora-extras-commits at redhat.com  Sun Apr 30 04:28:33 2006
From: fedora-extras-commits at redhat.com (Rick L. Vinyard (rvinyard))
Date: Sat, 29 Apr 2006 21:28:33 -0700
Subject: rpms/cairomm - New directory
Message-ID: <200604300428.k3U4SZ9f010638@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/cairomm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10617/cairomm

Log Message:
Directory /cvs/extras/rpms/cairomm added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 30 04:28:33 2006
From: fedora-extras-commits at redhat.com (Rick L. Vinyard (rvinyard))
Date: Sat, 29 Apr 2006 21:28:33 -0700
Subject: rpms/cairomm/devel - New directory
Message-ID: <200604300428.k3U4SZJB010641@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/cairomm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10617/cairomm/devel

Log Message:
Directory /cvs/extras/rpms/cairomm/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 30 04:28:46 2006
From: fedora-extras-commits at redhat.com (Rick L. Vinyard (rvinyard))
Date: Sat, 29 Apr 2006 21:28:46 -0700
Subject: rpms/cairomm Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604300428.k3U4SmsP010695@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/cairomm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10662

Added Files:
	Makefile import.log 
Log Message:
Setup of module cairomm


--- NEW FILE Makefile ---
# Top level Makefile for module cairomm
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs checkout common

CVS/Root :
	@echo "ERROR: This does not look like a CVS checkout" && exit 1

clean :
	@find . -type f -name *~ -exec rm -fv {} \;


--- NEW FILE import.log ---



From fedora-extras-commits at redhat.com  Sun Apr 30 04:28:47 2006
From: fedora-extras-commits at redhat.com (Rick L. Vinyard (rvinyard))
Date: Sat, 29 Apr 2006 21:28:47 -0700
Subject: rpms/cairomm/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources,
	NONE, 1.1
Message-ID: <200604300428.k3U4SnoX010698@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/cairomm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10662/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module cairomm


--- 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 Apr 30 04:29:16 2006
From: fedora-extras-commits at redhat.com (Rick L. Vinyard (rvinyard))
Date: Sat, 29 Apr 2006 21:29:16 -0700
Subject: rpms/cairomm/devel cairomm.spec, NONE, 1.1 .cvsignore, 1.1,
	1.2 sources, 1.1, 1.2
Message-ID: <200604300429.k3U4Tmp6010764@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/cairomm/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10726/devel

Modified Files:
	.cvsignore sources 
Added Files:
	cairomm.spec 
Log Message:
auto-import cairomm-0.6.0-1 on branch devel from cairomm-0.6.0-1.src.rpm


--- NEW FILE cairomm.spec ---
Summary:          This library provides a C++ interface to cairo
Name:             cairomm
Version:          0.6.0
Release:          1%{?dist}
URL:		  http://www.cairographics.org
License:	  LGPL
Group:            System Environment/Libraries
Source:		  http://www.cairographics.org/releases/%{name}-%{version}.tar.gz
BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:    cairo-devel >= 1.0.4 pkgconfig

%description
This library provides a C++ interface to cairo.

%package        devel
Summary:        Headers for developing programs that will use %{name}
Group:          Development/Libraries
Requires:       %{name} = %{version}-%{release}
Requires:       cairo-devel >= 1.0.4 pkgconfig

%description    devel
This package contains the libraries and header files needed for
developing %{name} applications.

%prep
%setup -q 

%build
%configure --enable-static=no --enable-docs=no
%{__make} %{?_smp_mflags}

%install
%{__rm} -rf %{buildroot}
make DESTDIR=%{buildroot} install
find %{buildroot} -type f -name "*.la" -exec rm -f {} ';'
mv docs/reference/html .

%clean
%{__rm} -rf %{buildroot}

%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig

%files
%defattr(-,root,root,-)
%doc AUTHORS COPYING README NEWS
%{_libdir}/lib*.so.*

%files devel
%defattr(-,root,root,-)
%{_libdir}/*.so
%{_libdir}/pkgconfig/*
%{_includedir}/cairomm-1.0/
%doc ChangeLog html

%changelog
* Sun Apr  9 2006 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.6.0-1
- New upstream version should fix the upstream issues like AUTHORS and README
- Added pkgconfig to cairomm BuildRequires and cairomm-devel Requires
- Replaced makeinstall
- Fixed devel package description
- Modified includedir syntax
- docs included via the mv in install and in the devel files as html dir

* Sun Mar  5 2006 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.5.0-10
- Removed duplicate Group tag in devel
- Disabled docs till they're fixed upstream 

* Sun Mar  5 2006 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.5.0-9
- Removed requires since BuildRequires is present
- Cleaned up Source tag

* Fri Feb 24 2006 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.5.0-7
- Fixed URL and SOURCE tags
- Fixed header include directory

* Fri Feb 24 2006 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.5.0-6
- Fixed URL tag

* Wed Feb 22 2006 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.5.0-5
- Remove epoch 'leftovers'

* Wed Feb 22 2006 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.5.0-4
- Cleanup for FE

* Wed Feb 22 2006 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.5.0-3
- Added pre-release alphatag

* Wed Feb 22 2006 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.5.0-2
- Updated to current cairomm CVS
- Added documentation to devel package

* Fri Feb 03 2006 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.5.0-1
- Updated to current cairomm CVS

* Fri Jan 27 2006 Rick L Vinyard Jr <rvinyard at cs.nmsu.edu> - 0.4.0-1
- Initial creation from papyrus.spec.in



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/cairomm/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Apr 2006 04:28:47 -0000	1.1
+++ .cvsignore	30 Apr 2006 04:29:16 -0000	1.2
@@ -0,0 +1 @@
+cairomm-0.6.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/cairomm/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Apr 2006 04:28:47 -0000	1.1
+++ sources	30 Apr 2006 04:29:16 -0000	1.2
@@ -0,0 +1 @@
+9d967cf486b0ac59d451d47922c99e6f  cairomm-0.6.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 30 04:29:15 2006
From: fedora-extras-commits at redhat.com (Rick L. Vinyard (rvinyard))
Date: Sat, 29 Apr 2006 21:29:15 -0700
Subject: rpms/cairomm import.log,1.1,1.2
Message-ID: <200604300429.k3U4TlYl010760@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/rpms/cairomm
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10726

Modified Files:
	import.log 
Log Message:
auto-import cairomm-0.6.0-1 on branch devel from cairomm-0.6.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/cairomm/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Apr 2006 04:28:46 -0000	1.1
+++ import.log	30 Apr 2006 04:29:15 -0000	1.2
@@ -0,0 +1 @@
+cairomm-0_6_0-1:HEAD:cairomm-0.6.0-1.src.rpm:1146371372



From fedora-extras-commits at redhat.com  Sun Apr 30 04:34:40 2006
From: fedora-extras-commits at redhat.com (Rick L. Vinyard (rvinyard))
Date: Sat, 29 Apr 2006 21:34:40 -0700
Subject: owners owners.list,1.921,1.922
Message-ID: <200604300434.k3U4Ygea010836@cvs-int.fedora.redhat.com>

Author: rvinyard

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10817

Modified Files:
	owners.list 
Log Message:
Added cairomm entry



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.921
retrieving revision 1.922
diff -u -r1.921 -r1.922
--- owners.list	29 Apr 2006 16:34:08 -0000	1.921
+++ owners.list	30 Apr 2006 04:34:39 -0000	1.922
@@ -107,6 +107,7 @@
 Fedora Extras|c-ares|A library that performs asynchronous DNS operations|tcallawa at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|cabextract|A Microsoft Cabinet file extractor|ville.skytta at iki.fi|extras-qa at fedoraproject.org|
 Fedora Extras|cacti|An rrd based graphing tool|imlinux at gmail.com|extras-qa at fedoraproject.org|
+Fedora Extras|cairomm|C++ wrapper for cairo|rvinyard at cs.nmsu.edu|extras-qa at fedoraproject.org|
 Fedora Extras|camE|Rewrite of the xawtv webcam app, which adds imlib2 support|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|camstream|CamStream - a set of programs to make use of your webcam|nomis80 at nomis80.org|extras-qa at fedoraproject.org|
 Fedora Extras|Canna|A Japanese character set input system|tagoh at redhat.com|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Apr 30 05:03:15 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sat, 29 Apr 2006 22:03:15 -0700
Subject: rpms/qof/FC-5 qof-x86_64.patch, NONE, 1.1 .cvsignore, 1.3,
	1.4 qof.spec, 1.12, 1.13 sources, 1.3, 1.4 qof-0.6.1-build.patch,
	1.1, NONE qof-dependencies.patch, 1.1, NONE
Message-ID: <200604300503.k3U53lXI013079@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/qof/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13024

Modified Files:
	.cvsignore qof.spec sources 
Added Files:
	qof-x86_64.patch 
Removed Files:
	qof-0.6.1-build.patch qof-dependencies.patch 
Log Message:
* Mon Apr 17 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.6.4-1
- Update to qof 0.6.4.
- Patch a small compile problem in building tests on x86_64.


qof-x86_64.patch:

--- NEW FILE qof-x86_64.patch ---
Index: qof-0.6.4/qof/test/test-date.c
===================================================================
--- qof-0.6.4.orig/qof/test/test-date.c
+++ qof-0.6.4/qof/test/test-date.c
@@ -93,8 +93,8 @@ check_conversion (const char * str, Time
   if ((expected_ts.tv_sec != ts.tv_sec) || (expected_ts.tv_nsec != ts.tv_nsec)) 
   {
     fprintf (stderr, 
-             "\nmis-converted \"%s\" to %lld.%09ld seconds\n"
-             "\twas expecting %lld.%09ld seconds\n", 
+             "\nmis-converted \"%s\" to %" G_GUINT64_FORMAT ".%09ld seconds\n"
+             "\twas expecting %" G_GUINT64_FORMAT ".%09ld seconds\n", 
              str, ts.tv_sec, ts.tv_nsec, 
              expected_ts.tv_sec, expected_ts.tv_nsec); 
     failure ("misconverted timespec");


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/qof/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	15 Jan 2006 18:50:01 -0000	1.3
+++ .cvsignore	30 Apr 2006 05:03:15 -0000	1.4
@@ -1 +1 @@
-qof-0.6.1.tar.gz
+qof-0.6.4.tar.gz


Index: qof.spec
===================================================================
RCS file: /cvs/extras/rpms/qof/FC-5/qof.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- qof.spec	13 Feb 2006 18:09:57 -0000	1.12
+++ qof.spec	30 Apr 2006 05:03:15 -0000	1.13
@@ -1,14 +1,13 @@
 Name:           qof
-Version:        0.6.1
-Release:        2%{?dist}
+Version:        0.6.4
+Release:        1%{?dist}
 Summary:        Query engine library for C objects
 
 Group:          System Environment/Libraries
 License:        GPL
 URL:            http://qof.sf.net
 Source0:        http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0:		qof-0.6.1-build.patch
-Patch1:		qof-dependencies.patch
+Patch0: qof-x86_64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libxml2-devel
@@ -17,8 +16,6 @@
 BuildRequires: intltool
 # qof doesn't ship with pre-built documentation
 BuildRequires: doxygen
-# Patch1 modifies configure.in so we have to use autoconf
-BuildRequires: autoconf
 
 %description
 QOF - The Query Object Framework is a C library that provides a query engine
@@ -67,10 +64,8 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
-autoconf --force
 %configure --disable-static
 make
 
@@ -119,6 +114,10 @@
 %doc html
 
 %changelog
+* Mon Apr 17 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.6.4-1
+- Update to qof 0.6.4.
+- Patch a small compile problem in building tests on x86_64.
+  
 * Mon Feb 13 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.6.1-2
 - Bump and rebuild for FC5.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/qof/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	15 Jan 2006 18:50:01 -0000	1.3
+++ sources	30 Apr 2006 05:03:15 -0000	1.4
@@ -1 +1 @@
-2a1c4b231fb03e49d5d9237dc6698c3e  qof-0.6.1.tar.gz
+555787c7ea06a3412ff9119fe4127886  qof-0.6.4.tar.gz


--- qof-0.6.1-build.patch DELETED ---


--- qof-dependencies.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Apr 30 06:40:10 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 29 Apr 2006 23:40:10 -0700
Subject: rpms/AllegroOGG - New directory
Message-ID: <200604300640.k3U6eCri015492@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/AllegroOGG
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15466/AllegroOGG

Log Message:
Directory /cvs/extras/rpms/AllegroOGG added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 30 06:40:11 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 29 Apr 2006 23:40:11 -0700
Subject: rpms/AllegroOGG/devel - New directory
Message-ID: <200604300640.k3U6eDP7015495@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/AllegroOGG/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15466/AllegroOGG/devel

Log Message:
Directory /cvs/extras/rpms/AllegroOGG/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 30 06:40:26 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 29 Apr 2006 23:40:26 -0700
Subject: rpms/AllegroOGG Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604300640.k3U6eSBK015544@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/AllegroOGG
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15511

Added Files:
	Makefile import.log 
Log Message:
Setup of module AllegroOGG


--- NEW FILE Makefile ---
# Top level Makefile for module AllegroOGG
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 30 06:40:26 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 29 Apr 2006 23:40:26 -0700
Subject: rpms/AllegroOGG/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604300640.k3U6eSXa015547@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/AllegroOGG/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15511/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module AllegroOGG


--- 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 Apr 30 06:41:33 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 29 Apr 2006 23:41:33 -0700
Subject: rpms/AllegroOGG import.log,1.1,1.2
Message-ID: <200604300641.k3U6fZ10015614@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/AllegroOGG
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15580

Modified Files:
	import.log 
Log Message:
auto-import AllegroOGG-1.0.3-2 on branch devel from AllegroOGG-1.0.3-2.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/AllegroOGG/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Apr 2006 06:40:25 -0000	1.1
+++ import.log	30 Apr 2006 06:41:33 -0000	1.2
@@ -0,0 +1 @@
+AllegroOGG-1_0_3-2:HEAD:AllegroOGG-1.0.3-2.src.rpm:1146379228



From fedora-extras-commits at redhat.com  Sun Apr 30 06:41:34 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 29 Apr 2006 23:41:34 -0700
Subject: rpms/AllegroOGG/devel AllegroOGG.pc.in, NONE, 1.1 AllegroOGG.spec, 
	NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604300641.k3U6faGa015619@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/AllegroOGG/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15580/devel

Modified Files:
	.cvsignore sources 
Added Files:
	AllegroOGG.pc.in AllegroOGG.spec 
Log Message:
auto-import AllegroOGG-1.0.3-2 on branch devel from AllegroOGG-1.0.3-2.src.rpm


--- NEW FILE AllegroOGG.pc.in ---
prefix=@prefix@
exec_prefix=@prefix@
libdir=@libdir@
includedir=@includedir@

Name: @name@
Description: Ogg library for use with the Allegro game library
Version: @version@
Libs:   -l at name@
Cflags: -I${includedir}/@name@


--- NEW FILE AllegroOGG.spec ---
Name:		AllegroOGG
Version: 	1.0.3
Release:        2%{?dist}
Summary:        Ogg library for use with the Allegro game library
Group:          System Environment/Libraries
License:	BSD
URL:		http://nekros.freeshell.org/delirium/alogg.html
Source0:        http://www.hero6.com/filereviver/alogg.zip
Source1:        AllegroOGG.pc.in
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	allegro-devel libvorbis-devel

%description
%{name} is an Allegro wrapper for the Ogg Vorbis decoder from the Xiph.org
foundation. This lib lets you play OGGs and convert OGGs to Allegro SAMPLEs
amongst a lot of other capabilites.


%package devel
Summary:	Developmental libraries and include files for AllegroOgg
Group:		Development/Libraries
Requires:	%{name} = %{version}
Requires:	allegro-devel pkgconfig

%description devel
Development libraries and include files for developing applications using
the %{name} library.


%prep
%setup -q -c
%{__sed} -i 's/\r//' docs/A*.txt
%{__sed} -e "s#@prefix@#%{_prefix}#g" -e "s#@libdir@#%{_libdir}#g" \
  -e "s#@includedir@#%{_includedir}#g" -e "s#@version@#%{version}#g" \
  -e "s#@name@#%{name}#" %{SOURCE1} > %{name}.pc

%build
# makefile doesn't support creating an .so, and wants to use its own version
# of libogg and libvorbis and there is only one source file so lets DIY
gcc $RPM_OPT_FLAGS -fPIC -DPIC -Iinclude -c src/alogg.c -o src/alogg.o
gcc -g -shared -Wl,-soname=lib%{name}.so.0 -o lib%{name}.so.0 \
  src/alogg.o -logg -lvorbis -lvorbisfile \
  `allegro-config --libs | sed 's/-lalleg_unsharable//'`


%install
rm -rf $RPM_BUILD_ROOT

mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
install -m 755 lib%{name}.so.0 $RPM_BUILD_ROOT%{_libdir}
ln -s lib%{name}.so.0 $RPM_BUILD_ROOT%{_libdir}/lib%{name}.so
install -m 644 %{name}.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig

mkdir -p $RPM_BUILD_ROOT%{_includedir}/%{name}
install -m 644 include/* $RPM_BUILD_ROOT%{_includedir}/%{name}


%post -p /sbin/ldconfig

%postun -p /sbin/ldconfig


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc docs/*.txt
%{_libdir}/*.so.*

%files devel
%{_includedir}/%{name}
%{_libdir}/*.so
%{_libdir}/pkgconfig/%{name}.pc


%changelog
* Sat Apr 20 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0.3-2
- Rename .so file from liballog.so(.0) to libAllegroOGG.so(.0) and put the
  headers in /usr/include/AllegroOGG to avoid any future conflicts with the
  (unpackaged) alogg library which unsurprisingly installs libalogg.so too.
- Add a pkgconfig file to allow apps to get the proper CFLAGS and LIBS for
  this change. (bz 188625)

* Tue Apr 11 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0.3-1
- Initial spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/AllegroOGG/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Apr 2006 06:40:26 -0000	1.1
+++ .cvsignore	30 Apr 2006 06:41:34 -0000	1.2
@@ -0,0 +1 @@
+alogg.zip


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/AllegroOGG/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Apr 2006 06:40:26 -0000	1.1
+++ sources	30 Apr 2006 06:41:34 -0000	1.2
@@ -0,0 +1 @@
+b4e99081acdb4bedb3206bdfb3b4d209  alogg.zip



From fedora-extras-commits at redhat.com  Sun Apr 30 06:49:25 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sat, 29 Apr 2006 23:49:25 -0700
Subject: owners owners.list,1.922,1.923
Message-ID: <200604300649.k3U6nSpO015700@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15681/owners

Modified Files:
	owners.list 
Log Message:
add AllegroOGG


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.922
retrieving revision 1.923
diff -u -r1.922 -r1.923
--- owners.list	30 Apr 2006 04:34:39 -0000	1.922
+++ owners.list	30 Apr 2006 06:49:25 -0000	1.923
@@ -27,6 +27,7 @@
 Fedora Extras|akode|Audio-decoding framework|rdieter at math.unl.edu|extras-qa at fedoraproject.org|
 Fedora Extras|alacarte|Simple menu editor for GNOME|jpmahowald at gmail.com|extras-qa at fedoraproject.org|foolish at guezz.net
 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|alltray|Dock any application in the tray|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|alsa-firmware|Firmware for several ALSA-Supported soundcards|fedora at leemhuis.info|extras-qa at fedoraproject.org|
 Fedora Extras|alsa-tools|The ALSA Tools|fedora at leemhuis.info|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Apr 30 07:30:52 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sun, 30 Apr 2006 00:30:52 -0700
Subject: owners owners.list,1.923,1.924
Message-ID: <200604300730.k3U7Us9O018048@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18031

Modified Files:
	owners.list 
Log Message:
Added bsd-games




Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.923
retrieving revision 1.924
diff -u -r1.923 -r1.924
--- owners.list	30 Apr 2006 06:49:25 -0000	1.923
+++ owners.list	30 Apr 2006 07:30:52 -0000	1.924
@@ -95,6 +95,7 @@
 Fedora Extras|bochs|Bochs Project x86 PC Emulator|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 Fedora Extras|bonnie++|Bonnie++ filesystem and disk benchmark & burn-in suite|wtogami at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|brightside|Add reactivity to the corners and edges of your GNOME desktop|fedora at leemhuis.info|extras-qa at fedoraproject.org|
+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|
 Fedora Extras|bubblemon|A system monitoring dockapp|andreas.bierfert at lowlatency.de|extras-qa at fedoraproject.org|
 Fedora Extras|buildsystem|Fedora-Extras Buildsystem|skvidal at phy.duke.edu|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Apr 30 07:31:43 2006
From: fedora-extras-commits at redhat.com (Michael Thomas (wart))
Date: Sun, 30 Apr 2006 00:31:43 -0700
Subject: comps comps-fe5.xml.in,1.41,1.42 comps-fe6.xml.in,1.4,1.5
Message-ID: <200604300731.k3U7VjNx018078@cvs-int.fedora.redhat.com>

Author: wart

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18059

Modified Files:
	comps-fe5.xml.in comps-fe6.xml.in 
Log Message:
Added bsd-games collection




Index: comps-fe5.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe5.xml.in,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- comps-fe5.xml.in	29 Apr 2006 17:48:56 -0000	1.41
+++ comps-fe5.xml.in	30 Apr 2006 07:31:43 -0000	1.42
@@ -199,6 +199,7 @@
     <uservisible>true</uservisible>
     <packagelist>
         <packagereq type="optional">abe</packagereq>
+        <packagereq type="optional">bsd-games</packagereq>
         <packagereq type="optional">bzflag</packagereq>
         <packagereq type="optional">celestia</packagereq>
         <packagereq type="optional">cgoban</packagereq>


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- comps-fe6.xml.in	29 Apr 2006 17:48:56 -0000	1.4
+++ comps-fe6.xml.in	30 Apr 2006 07:31:43 -0000	1.5
@@ -199,6 +199,7 @@
     <uservisible>true</uservisible>
     <packagelist>
         <packagereq type="optional">abe</packagereq>
+        <packagereq type="optional">bsd-games</packagereq>
         <packagereq type="optional">bzflag</packagereq>
         <packagereq type="optional">celestia</packagereq>
         <packagereq type="optional">cgoban</packagereq>



From fedora-extras-commits at redhat.com  Sun Apr 30 07:50:56 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 30 Apr 2006 00:50:56 -0700
Subject: rpms/gcompris - New directory
Message-ID: <200604300750.k3U7owFR018189@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gcompris
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18162/gcompris

Log Message:
Directory /cvs/extras/rpms/gcompris added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 30 07:50:57 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 30 Apr 2006 00:50:57 -0700
Subject: rpms/gcompris/devel - New directory
Message-ID: <200604300751.k3U7ox00018192@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gcompris/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18162/gcompris/devel

Log Message:
Directory /cvs/extras/rpms/gcompris/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 30 07:51:17 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 30 Apr 2006 00:51:17 -0700
Subject: rpms/gcompris Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604300751.k3U7pJTk018241@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gcompris
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18208

Added Files:
	Makefile import.log 
Log Message:
Setup of module gcompris


--- NEW FILE Makefile ---
# Top level Makefile for module gcompris
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 30 07:51:18 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 30 Apr 2006 00:51:18 -0700
Subject: rpms/gcompris/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604300751.k3U7pK6t018244@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gcompris/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18208/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module gcompris


--- 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 Apr 30 08:28:51 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 30 Apr 2006 01:28:51 -0700
Subject: rpms/gcompris import.log,1.1,1.2
Message-ID: <200604300828.k3U8Srs6020584@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gcompris
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20545

Modified Files:
	import.log 
Log Message:
auto-import gcompris-7.4-4 on branch devel from gcompris-7.4-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/gcompris/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Apr 2006 07:51:17 -0000	1.1
+++ import.log	30 Apr 2006 08:28:51 -0000	1.2
@@ -0,0 +1 @@
+gcompris-7_4-4:HEAD:gcompris-7.4-4.src.rpm:1146385664



From fedora-extras-commits at redhat.com  Sun Apr 30 08:28:52 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 30 Apr 2006 01:28:52 -0700
Subject: rpms/gcompris/devel U006A.ogg, NONE,
	1.1 gcompris-click_on_letter.patch, NONE,
	1.1 gcompris-electric.patch, NONE, 1.1 gcompris-nl.patch, NONE,
	1.1 gcompris-sys-assetml.patch, NONE, 1.1 gcompris.6, NONE,
	1.1 gcompris.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Message-ID: <200604300828.k3U8Ssim020597@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/gcompris/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20545/devel

Modified Files:
	.cvsignore sources 
Added Files:
	U006A.ogg gcompris-click_on_letter.patch 
	gcompris-electric.patch gcompris-nl.patch 
	gcompris-sys-assetml.patch gcompris.6 gcompris.spec 
Log Message:
auto-import gcompris-7.4-4 on branch devel from gcompris-7.4-4.src.rpm


--- NEW FILE U006A.ogg ---
OggS
*???
2? ?L2???N:????:?(??B-??JL1?Vc??]|s?9??s?9??s?	BCV

2????U
*????*?(??2?,??2????:???C1??J,5?Vc????s?9Hk???Z+??RJ)? 4d

Y
???
)??R?)??R?1?RJ9??S?9??1??)?S?)???A????A(

Y	




??s?i
?????T:g?B????????;&>???6???d-r??SWlGc])??z???V-???h??{uzDji?jhBF?W?b?
?{[?5??\K.???^?C??e????K??5T+??
?J/???#[?.?w?c??e???o?
7?????A???aI<
bV???????s????f?,?p[?h???6H L?????,????c?ff??Sj4??j?B??H$.? ??/??z?K/??????bj??36 ?B??????????0]H
?g??
??
g???3?????yd?I?"!q??Yo>W???p'GS5x?T?M?Y?myn???"A?9&h?3???B?d??-?
??@??>y?&??C?ixm?z{doy?%IzaqVF??J?c?t-??4???K??c
?wX?x@?"??v??z?c?k?????

????\Q`
??^?.?|????jy??!
6'?:????8??VJ??\?GM_?????Mo?+?6
\~?'?c??j??H??^??y?qa?=p[!HLh?O?P?u????P???])k?#k?I?e?fE???
?a?;?GAF
?dm??qzQy?x??Q???g?&?rea?#
|?W?"??-???VFsT??a$???-??6?8????eU
??:?#?????h~hfwd?5ai???R ?u???o?
16gh*?xNM-??4'_8F???X?n{Br?B?y??$i????*????%????s??????U?P ??O???p??\*GE?[???n?
?????Ej!??????????????????-j?-????41?R/?y*?K
?X?=!V??{]1aB??w???,??\@???b??`s?a$C??}????H-??F?V???]|?9'????`G?
??/!Tr???????fm[???:<p????@???B!??/?? ????f?a????6oTUU?K?`????&???z??????V??u?
R?^?>??``??????
????du?<`???f}?W1?t??T?????r!`
?
?8-,???^?uW%5\???w?A??;???X???s)??????-/??????V??
????6???xn'
???
W?
D7?????a??????N??&d?k????5C?I???n?????V?a|?=??)
(??

??????????;?ut????
?_?fb{?g??p??????p??j???b}?tBT??k z??????3??yr??%, at N?a?K>
?D?\???B?
7x!I^??eS??????wy??{?XE<?
?eD?Xt???l??????2g??Zu?}?A?$??@A??????
???g?M'?!x%?%>\?W????
?k???(????Y#>?=?o??
?nMhi?Q????LjJe?n@[???iJ?.????qi?5`???G??b?(
???c????l?lG?~???t?????????g?';?BC?????d??^????N?q?<???R??
??r>???g???D??>E?Z5
?1?'???
????????P?l27?????q?Z?????$?3>?4???d??T???z,^?.?h?1jT??6??????
ZJ?4?P?5x94H????b3hDlw???!?tBV7??i;|?F?[?{???(
??????L.>?P?~I???????zi??!?y%hrp???
?Q?
&'uFt???T??s?42}??PS??U?5??m?????h
???nLNI?TH?????=)???.#C?1P?????\-9????|????,L?r?2o???!??I??y??cs?x2??5???z?U|F??X/Q.
;v

?E* ?*?4??e??U?????s?h?!?Ac??????
??_?N??&3???| ????~??.n?<p3@"h?/~NI?,T????;?
????

`???
?ZM???xU?4 |????d$?H2?!@7???:??B???4F?U??	
+??3?1]??????sz2^Zg???v?a? n?oI?v?QfO???^???T??*?)E[???c9????8		????"?M&
??Bk6r??????????^?x??? ????7??	???2??&t?B4??O3Y???#8>??&??;?,?>i.ma&z@???CvYo?]{?K??????q8???2,$?,?O?#??5???c?L??u?<??p

_?h???*?%j???4L1???6??_V???}?????wV
gcompris-click_on_letter.patch:

--- NEW FILE gcompris-click_on_letter.patch ---
--- /usr/src/redhat/BUILD/gcompris-7.4/src/boards/click_on_letter.c	2006-03-20 21:50:41.000000000 +0100
+++ gcompris/src/boards/click_on_letter.c	2006-04-29 10:41:45.000000000 +0200
@@ -21,6 +21,7 @@
 #include <math.h>
 #include <assert.h>
 #include <glib.h>
+#include <string.h>
 
 #include "gcompris/gcompris.h"
 
@@ -29,7 +30,7 @@
 #define SOUNDLISTFILE PACKAGE
 
 static GcomprisBoard *gcomprisBoard = NULL;
-static gboolean board_paused = TRUE;
+static gboolean board_paused;
 
 static void		 start_board (GcomprisBoard *agcomprisBoard);
 static void		 pause_board (gboolean pause);
@@ -55,6 +56,10 @@
 #define NUMBER_OF_LEVELS 5
 #define MAX_NUMBER_OF_LETTERS 4
 
+#define NOT_OK		0
+#define OK		1
+#define OK_NO_INIT	2
+
 #define TEXT_COLOR "white"
 
 static GnomeCanvasGroup *boardRootItem = NULL;
@@ -68,7 +73,6 @@
 static void click_on_letter_destroy_all_items(void);
 static void click_on_letter_next_level(void);
 static gint item_event(GnomeCanvasItem *item, GdkEvent *event, gpointer data);
-static gint phone_event(GnomeCanvasItem *item, GdkEvent *event, gpointer data);
 static gboolean sounds_are_fine();
 
 static int right_position;
@@ -76,7 +80,6 @@
 static gchar *right_letter;
 
 static gchar *alphabet;
-static void quit_board();
 
 static void sound_played(gchar *file);
 
@@ -137,6 +140,9 @@
 static void start_board (GcomprisBoard *agcomprisBoard)
 {
   GHashTable *config = gcompris_get_board_conf();
+  int ready;
+
+  board_paused = TRUE;
 
   gcompris_change_locale(g_hash_table_lookup( config, "locale"));
 
@@ -149,29 +155,37 @@
 
   g_hash_table_destroy(config);
 
-  sounds_are_fine();
+  ready = sounds_are_fine();
+
+  gcompris_pause_sound();
 
   if (agcomprisBoard!=NULL)
     {
       gcomprisBoard=agcomprisBoard;
-      gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), "images/scenery4_background.png");
+      gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas),
+			      "images/scenery4_background.png");
       gcomprisBoard->level=1;
       gcomprisBoard->maxlevel=NUMBER_OF_LEVELS;
       gcomprisBoard->sublevel=1;
-      gcomprisBoard->number_of_sublevel=NUMBER_OF_SUBLEVELS; /* Go to next level after this number of 'play' */
-      gcompris_bar_set(GCOMPRIS_BAR_CONFIG|GCOMPRIS_BAR_LEVEL|GCOMPRIS_BAR_REPEAT);
-      gcompris_score_start(SCORESTYLE_NOTE,
-			   50,
-			   50,
-			   gcomprisBoard->number_of_sublevel);
 
-      click_on_letter_next_level();
+      /* Go to next level after this number of 'play' */
+      gcomprisBoard->number_of_sublevel=NUMBER_OF_SUBLEVELS;
 
-      gamewon = FALSE;
-      pause_board(FALSE);
+      if(ready)
+	{
+	  /* Warning, bar buttons are set in click_on_letter_next_level()
+	     to avoid them to appear in the case a dialog is displayed */
+	  gcompris_score_start(SCORESTYLE_NOTE,
+			       50,
+			       50,
+			       gcomprisBoard->number_of_sublevel);
 
-      
+	  if(ready == OK)
+	    click_on_letter_next_level();
 
+	  gamewon = FALSE;
+	  pause_board(FALSE);
+	}
     }
 
 }
@@ -180,16 +194,13 @@
 {
   if(gcomprisBoard!=NULL)
     {
-      printf("end_board 1\n");
       pause_board(TRUE);
-      printf("end_board 1\n");
       gcompris_score_end();
-      printf("end_board 1\n");
       click_on_letter_destroy_all_items();
-      printf("end_board 1\n");
     }
   gcompris_reset_locale();
   gcomprisBoard = NULL;
+  gcompris_resume_sound();
 }
 
 /* ======================================= */
@@ -240,13 +251,17 @@
     }
 }
 
-static gboolean sounds_are_fine ()
+static gboolean sounds_are_fine()
 {
   char *str1 = NULL;
   char *str2 = NULL;
   GcomprisProperties	*properties = gcompris_get_properties();
   gchar *locale = NULL;
-  gboolean fine = TRUE;
+
+  if(!properties->fx) {
+    gcompris_dialog(_("Error: this activity cannot be played with the\nsound effects disabled.\nGo to the configuration dialog to\nenable the sound"), board_stop);
+    return(NOT_OK);
+  }
 
   /* TRANSLATORS: Put here the alphabet in your language */
   alphabet=_("abcdefghijklmnopqrstuvwxyz");
@@ -260,7 +275,7 @@
   str2 = gcompris_get_asset_file("gcompris alphabet", NULL, "audio/x-ogg", str1);
   g_free(str1);
   
-  if (!str2){
+  if (!str2) {
     locale = g_strndup(gcompris_get_locale(), 2);
     gcompris_reset_locale();
     gcompris_change_locale("en_US");
@@ -277,30 +292,27 @@
     str2 = gcompris_get_asset_file("gcompris alphabet", NULL, "audio/x-ogg", str1);
     g_free(str1);
 
-    if (!str2){
-      gchar *msg = g_strdup_printf( _("Error: this activity requires that you first install\nthe packages assetml-voices-alphabet-%s or %s"),
-					locale, "en");
-      gcompris_dialog(msg, board_stop);
-      g_free(msg);
-      return (fine);
-    }
-    else{
-      gchar *msg = g_strdup_printf( _("Error: this activity requires that you first install\nthe packages assetml-voices-alphabet-%s ! Fallback to english, sorry!"), locale);
-      gcompris_dialog(msg, NULL);
-      g_free(msg);
-    }
-  }
-
-  fine = TRUE;
-  if(!properties->fx) {
-    gcompris_dialog(_("Error: this activity cannot be played with the\nsound effects disabled.\nGo to the configuration dialogue to\nenable the sound"), board_stop);
-    fine = FALSE;
+    if (!str2)
+      {
+	gchar *msg = g_strdup_printf( _("Error: this activity requires that you first install\nthe packages assetml-voices-alphabet-%s or %s"),
+				      locale, "en");
+	gcompris_dialog(msg, board_stop);
+	g_free(msg);
+	return (NOT_OK);
+      }
+    else
+      {
+	gchar *msg = g_strdup_printf( _("Error: this activity requires that you first install\nthe packages assetml-voices-alphabet-%s ! Fallback to english, sorry!"), locale);
+	gcompris_dialog(msg, click_on_letter_next_level);
+	g_free(msg);
+	g_free(str2);
+	return(OK_NO_INIT);
+      }
   }
 
   g_free(str2);
-  
-  return(fine);
-  
+
+  return(OK);
 }
 
 /*-------------------------------------------------------------------------------*/
@@ -308,6 +320,9 @@
 /* set initial values for the next level */
 static void click_on_letter_next_level()
 {
+  /* It must be set it for the warning dialogs */
+  gcompris_bar_set(GCOMPRIS_BAR_CONFIG|GCOMPRIS_BAR_LEVEL|GCOMPRIS_BAR_REPEAT);
+
   gcompris_bar_set_level(gcomprisBoard);
 
   click_on_letter_destroy_all_items();
@@ -405,29 +420,29 @@
 
   for (i=0; i< number_of_letters; i++) {
 
-  buttons[i] = gnome_canvas_item_new (boardRootItem,
-				   gnome_canvas_pixbuf_get_type (),
-				   "pixbuf",  button_pixmap,
-				   "x",  (double) xOffset,
-				   "y",  (double) yOffset,
-				   NULL);
-
-
-  l_items[i] = gnome_canvas_item_new (boardRootItem,
-				      gnome_canvas_text_get_type (),
-				      "text", g_strdup(letters[i]),
-				      "font", gcompris_skin_font_board_huge_bold,
-				      "anchor", GTK_ANCHOR_CENTER,
-				      "fill_color_rgba", 0x0000ffff,
-				      "x",  (double) xOffset + gdk_pixbuf_get_width(button_pixmap)/2,
-				      "y",  (double) yOffset + gdk_pixbuf_get_height(button_pixmap)/2 - 5,
-				      NULL);
-  g_free(letters[i]);
-  xOffset +=HORIZONTAL_SEPARATION +gdk_pixbuf_get_width(button_pixmap);
-
-  gtk_signal_connect(GTK_OBJECT(l_items[i]), "event", (GtkSignalFunc) item_event, GINT_TO_POINTER(i));
-  gtk_signal_connect(GTK_OBJECT(buttons[i]), "event",  (GtkSignalFunc) item_event, GINT_TO_POINTER(i));
-  //  gtk_signal_connect(GTK_OBJECT(buttons[i]), "event", (GtkSignalFunc) gcompris_item_event_focus, NULL);
+    buttons[i] = gnome_canvas_item_new (boardRootItem,
+					gnome_canvas_pixbuf_get_type (),
+					"pixbuf",  button_pixmap,
+					"x",  (double) xOffset,
+					"y",  (double) yOffset,
+					NULL);
+
+
+    l_items[i] = gnome_canvas_item_new (boardRootItem,
+					gnome_canvas_text_get_type (),
+					"text", g_strdup(letters[i]),
+					"font", gcompris_skin_font_board_huge_bold,
+					"anchor", GTK_ANCHOR_CENTER,
+					"fill_color_rgba", 0x0000ffff,
+					"x",  (double) xOffset + gdk_pixbuf_get_width(button_pixmap)/2,
+					"y",  (double) yOffset + gdk_pixbuf_get_height(button_pixmap)/2 - 5,
+					NULL);
+    g_free(letters[i]);
+    xOffset +=HORIZONTAL_SEPARATION +gdk_pixbuf_get_width(button_pixmap);
+
+    gtk_signal_connect(GTK_OBJECT(l_items[i]), "event", (GtkSignalFunc) item_event, GINT_TO_POINTER(i));
+    gtk_signal_connect(GTK_OBJECT(buttons[i]), "event",  (GtkSignalFunc) item_event, GINT_TO_POINTER(i));
+    //  gtk_signal_connect(GTK_OBJECT(buttons[i]), "event", (GtkSignalFunc) gcompris_item_event_focus, NULL);
   }
 
 
@@ -463,18 +478,6 @@
   g_timeout_add(TIME_CLICK_TO_BONUS, process_ok_timeout, NULL);
 }
 /* ==================================== */
-static gint phone_event(GnomeCanvasItem *item, GdkEvent *event, gpointer data) {
-  switch (event->type)
-    {
-    case GDK_BUTTON_PRESS:
-      repeat();
-      break;
-    default:
-      break;
-    }
-  return TRUE;
-}
-/* ==================================== */
 static gint
 item_event(GnomeCanvasItem *item, GdkEvent *event, gpointer data)
 {
@@ -566,11 +569,12 @@
   return NULL;
 }
 
-static GcomprisConfCallback conf_ok(GHashTable *table)
+static void conf_ok(GHashTable *table)
 {
   if (!table){
     if (gcomprisBoard)
       pause_board(FALSE);
+
     return;
   }
     
@@ -591,12 +595,14 @@
     gcompris_change_locale(g_hash_table_lookup( config, "locale"));
     
     gchar *up_init_str = g_hash_table_lookup( config, "uppercase_only");
-    
-    if (up_init_str && (strcmp(up_init_str, "True")==0))
-      uppercase_only = TRUE;
-    else
-      uppercase_only = FALSE;
-    
+    if (up_init_str)
+      {
+	if(strcmp(up_init_str, "True")==0)
+	  uppercase_only = TRUE;
+	else
+	  uppercase_only = FALSE;
+      }
+
     if (profile_conf)
       g_hash_table_destroy(config);
     
--- /usr/src/redhat/BUILD/gcompris-7.4/src/boards/menu2.c	2006-03-30 01:06:42.000000000 +0200
+++ gcompris/src/boards/menu2.c	2006-04-29 10:41:45.000000000 +0200
@@ -1,6 +1,6 @@
 /* gcompris - menu2.c
  *
- * Time-stamp: <2006/03/30 01:06:42 bruno>
+ * Time-stamp: <2006/04/28 00:51:29 bruno>
  *
  * Copyright (C) 2000 Bruno Coudoin
  *
@@ -527,7 +527,7 @@
 	g_warning("Checking mandatory_sound_file %s\n", soundfile);
       }
 
-      if (!g_file_test (soundfile, G_FILE_TEST_EXISTS) || !gcompris_get_properties()->audio_works) 
+      if (!g_file_test (soundfile, G_FILE_TEST_EXISTS) || !gcompris_get_properties()->fx) 
 	{
 	  pixmap = gcompris_load_skin_pixmap("voice_bad.png");
 	}
--- /usr/src/redhat/BUILD/gcompris-7.4/src/boards/py-gcompris-properties.c	2005-09-20 19:07:33.000000000 +0200
+++ gcompris/src/boards/py-gcompris-properties.c	2006-04-29 10:41:45.000000000 +0200
@@ -63,15 +63,6 @@
 	return Py_False;
       }
     }
-    if(strcmp(name,"audio_works")==0){
-      if(self->cdata->audio_works){
-	Py_INCREF(Py_True);
-	return Py_True;
-      } else {
-	Py_INCREF(Py_False);
-	return Py_False;
-      }
-    }
     if(strcmp(name,"fullscreen")==0){
       if(self->cdata->fullscreen){
 	Py_INCREF(Py_True);
--- /usr/src/redhat/BUILD/gcompris-7.4/src/gcompris/properties.c	2006-03-02 01:08:31.000000000 +0100
+++ gcompris/src/gcompris/properties.c	2006-04-29 10:41:45.000000000 +0200
@@ -1,6 +1,6 @@
 /* gcompris - properties.c
  *
- * Time-stamp: <2006/03/02 01:08:31 bruno>
+ * Time-stamp: <2006/04/28 00:52:51 bruno>
  *
  * Copyright (C) 2000,2003 Bruno Coudoin
  *
@@ -294,9 +294,6 @@
 
   }
 
-  /* By default audio is said to work until libao fails to load it */
-  tmp->audio_works	= TRUE;
-
   /*
    * Warning, gcompris need a proper locale prefix to find suitable dataset
    * Some system use LOCALE 'C' for english. We have to set it explicitly
--- /usr/src/redhat/BUILD/gcompris-7.4/src/gcompris/properties.h	2006-03-02 00:48:25.000000000 +0100
+++ gcompris/src/gcompris/properties.h	2006-04-29 10:41:45.000000000 +0200
@@ -1,6 +1,6 @@
 /* gcompris - properties.h
  *
- * Time-stamp: <2006/03/02 00:48:25 bruno>
+ * Time-stamp: <2006/04/28 00:52:34 bruno>
  *
  * Copyright (C) 2000 Bruno Coudoin
  *
@@ -27,7 +27,6 @@
 typedef struct {
   gint		music;
   gint		fx;
-  gint		audio_works;
   gint		fullscreen;
   gint		noxrandr;
   gint		screensize;
--- /usr/src/redhat/BUILD/gcompris-7.4/src/boards/memory.c	2006-04-03 19:41:54.000000000 +0200
+++ gcompris/src/boards/memory.c	2006-04-19 00:18:14.000000000 +0200
@@ -1,6 +1,6 @@
 /* gcompris - memory.c
  *
- * Time-stamp: <2006/03/31 22:46:09 yves>
+ * Time-stamp: <2006/04/17 22:28:15 bruno>
  *
  * Copyright (C) 2000 Bruno Coudoin
  * 
@@ -813,6 +813,8 @@
 
       if (currentUiMode == UIMODE_SOUND)
 	{
+	  GcomprisProperties	*properties = gcompris_get_properties();
+
 	  gcompris_pause_sound();
 	  gcompris_set_background(gnome_canvas_root(gcomprisBoard->canvas), "images/gcompris_band.png");
 	  base_x1 = BASE_SOUND_X1;
@@ -820,6 +822,12 @@
 	  base_x2 = BASE_SOUND_X2;
 	  base_y2 = BASE_SOUND_Y2;
 	  base_x1_tux = BASE_SOUND_X1_TUX;
+
+	  if(!properties->fx) {
+	    gcompris_dialog(_("Error: this activity cannot be played with the\nsound effects disabled.\nGo to the configuration dialog to\nenable the sound"), board_stop);
+	    return;
+	  }
+
 	}
       else
 	{
--- gcompris-7.4.orig/boards/memory_sound.xml.in	2006-01-18 20:42:30.000000000 +0100
+++ gcompris-7.4/boards/memory_sound.xml.in	2006-04-30 09:02:32.000000000 +0200
@@ -7,6 +7,7 @@
 	 mode="sound" 
 	 difficulty="1"
 	 icon="boardicons/memory_sound.png" 
+	 mandatory_sound_file="memory/plick.ogg"
 	 author="Yves Combe (yves at ycombe.net)"
 	 boarddir="">
 	 <_title>Audio memory game</_title>
--- gcompris-7.4.orig/boards/memory_sound_tux.xml.in	2006-01-22 22:31:54.000000000 +0100
+++ gcompris-7.4/boards/memory_sound_tux.xml.in	2006-04-30 09:02:32.000000000 +0200
@@ -7,6 +7,7 @@
 	 mode="sound_tux" 
 	 difficulty="2"
 	 icon="boardicons/memory_sound_tux.png" 
+	 mandatory_sound_file="memory/plick.ogg"
 	 author="Yves Combe (yves at ycombe.net)"
 	 boarddir="">
 	 <_title>Audio memory game against Tux</_title>

gcompris-electric.patch:

--- NEW FILE gcompris-electric.patch ---
--- gcompris-7.4/src/boards/python/electric.py.mkstemp	2006-02-26 19:00:06.000000000 +0100
+++ gcompris-7.4/src/boards/python/electric.py	2006-04-23 22:32:19.000000000 +0200
@@ -26,8 +26,10 @@
 import gcompris.bonus
 import gtk
 import gtk.gdk
+import gobject
 
 import os
+import tempfile
 
 # Set to True to debug
 debug = False
@@ -195,6 +197,10 @@
     if self.gnucap_timer :
       gtk.timeout_remove(self.gnucap_timer)
       self.gnucap_timer = 0
+      
+    # remove the appended items from our tools
+    for i in range(0,len(self.tools)):
+      self.tools[i].pop()
 
     # No more component in the simulation set
     self.components = []
@@ -318,7 +323,7 @@
       return
 
     if not self.gnucap_timer:
-      self.gnucap_timer = gtk.timeout_add(self.gnucap_timer_interval, self.call_gnucap)
+      self.gnucap_timer = gobject.timeout_add(self.gnucap_timer_interval, self.call_gnucap)
 
   def call_gnucap(self):
     if not self.components:
@@ -334,9 +339,8 @@
     if not connected == 1:
       if debug: print "call_gnucap: No connected component"
     
-    filename = "/tmp/gcompris_electric.gnucap.%d" %(os.getpid(),)
-
-    f = file(filename, "w+")
+    fd, filename = tempfile.mkstemp(".gnucap", "gcompris_electric", None, True)
+    f = os.fdopen(fd, "w+t")
 
     gnucap = "Title GCompris\n"
 
@@ -421,7 +425,7 @@
           i += 2
 
       
-    os.remove(filename)
+    if not debug: os.remove(filename)
     self.gnucap_timer = 0
     
   # Convert a gnucap value back in a regular number

gcompris-nl.patch:

--- NEW FILE gcompris-nl.patch ---
--- gcompris-7.4/boards/sounds/nl/alphabet/gcompris_alphabet_nl.assetml.in.nl	2006-03-20 22:47:36.000000000 +0100
+++ gcompris-7.4/boards/sounds/nl/alphabet/gcompris_alphabet_nl.assetml.in	2006-04-23 14:07:51.000000000 +0200
@@ -1,233 +1,238 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<AssetML dataset="gcompris alphabet" rootdir="../gcompris/boards/sounds/nl/alphabet/" locale="nl">
-  <Asset file="a.ogg" mimetype="audio/x-ogg">
-   <Description>a</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="b.ogg" mimetype="audio/x-ogg">
-   <Description>b</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="c.ogg" mimetype="audio/x-ogg">
-   <Description>c</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="d.ogg" mimetype="audio/x-ogg">
-   <Description>d</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="e.ogg" mimetype="audio/x-ogg">
-   <Description>e</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="f.ogg" mimetype="audio/x-ogg">
-   <Description>f</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="g.ogg" mimetype="audio/x-ogg">
-   <Description>g</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="h.ogg" mimetype="audio/x-ogg">
-   <Description>h</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="i.ogg" mimetype="audio/x-ogg">
-   <Description>i</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="j.ogg" mimetype="audio/x-ogg">
-   <Description>j</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="k.ogg" mimetype="audio/x-ogg">
-   <Description>k</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="l.ogg" mimetype="audio/x-ogg">
-   <Description>l</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="m.ogg" mimetype="audio/x-ogg">
-   <Description>m</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="n.ogg" mimetype="audio/x-ogg">
-   <Description>n</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="o.ogg" mimetype="audio/x-ogg">
-   <Description>o</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="p.ogg" mimetype="audio/x-ogg">
-   <Description>p</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="q.ogg" mimetype="audio/x-ogg">
-   <Description>q</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="r.ogg" mimetype="audio/x-ogg">
-   <Description>r</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="s.ogg" mimetype="audio/x-ogg">
-   <Description>s</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="t.ogg" mimetype="audio/x-ogg">
-   <Description>t</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="u.ogg" mimetype="audio/x-ogg">
-   <Description>u</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="v.ogg" mimetype="audio/x-ogg">
-   <Description>v</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="w.ogg" mimetype="audio/x-ogg">
-   <Description>w</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="x.ogg" mimetype="audio/x-ogg">
-   <Description>x</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="y.ogg" mimetype="audio/x-ogg">
-   <Description>y</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="z.ogg" mimetype="audio/x-ogg">
-   <Description>z</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="1.ogg" mimetype="audio/x-ogg">
-   <Description>1</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="2.ogg" mimetype="audio/x-ogg">
-   <Description>2</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="3.ogg" mimetype="audio/x-ogg">
-   <Description>3</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="4.ogg" mimetype="audio/x-ogg">
-   <Description>4</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="5.ogg" mimetype="audio/x-ogg">
-   <Description>5</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="6.ogg" mimetype="audio/x-ogg">
-   <Description>6</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="7.ogg" mimetype="audio/x-ogg">
-   <Description>7</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="8.ogg" mimetype="audio/x-ogg">
-   <Description>8</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="9.ogg" mimetype="audio/x-ogg">
-   <Description>9</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="10.ogg" mimetype="audio/x-ogg">
-   <Description>10</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="11.ogg" mimetype="audio/x-ogg">
-   <Description>11</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="12.ogg" mimetype="audio/x-ogg">
-   <Description>12</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="13.ogg" mimetype="audio/x-ogg">
-   <Description>13</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="14.ogg" mimetype="audio/x-ogg">
-   <Description>14</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="15.ogg" mimetype="audio/x-ogg">
-   <Description>15</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="16.ogg" mimetype="audio/x-ogg">
-   <Description>16</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="17.ogg" mimetype="audio/x-ogg">
-   <Description>17</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="18.ogg" mimetype="audio/x-ogg">
-   <Description>18</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="19.ogg" mimetype="audio/x-ogg">
-   <Description>19</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
-  </Asset>
-  <Asset file="20.ogg" mimetype="audio/x-ogg">
-   <Description>20</Description>
-   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
-   <Categories>audio;alphabet</Categories>
+<AssetML rootdir='../gcompris/boards/sounds/nl/alphabet/' locale='nl' dataset='gcompris alphabet'>
+  <Asset name='U0061.ogg' mimetype='audio/x-ogg' file='U0061.ogg'>
+    <Description>a</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0062.ogg' mimetype='audio/x-ogg' file='U0062.ogg'>
+    <Description>b</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0063.ogg' mimetype='audio/x-ogg' file='U0063.ogg'>
+    <Description>c</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0064.ogg' mimetype='audio/x-ogg' file='U0064.ogg'>
+    <Description>d</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0065.ogg' mimetype='audio/x-ogg' file='U0065.ogg'>
+    <Description>e</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0066.ogg' mimetype='audio/x-ogg' file='U0066.ogg'>
+    <Description>f</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0067.ogg' mimetype='audio/x-ogg' file='U0067.ogg'>
+    <Description>g</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0068.ogg' mimetype='audio/x-ogg' file='U0068.ogg'>
+    <Description>h</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0069.ogg' mimetype='audio/x-ogg' file='U0069.ogg'>
+    <Description>i</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U006A.ogg' mimetype='audio/x-ogg' file='U006A.ogg'>
+    <Description>j</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U006B.ogg' mimetype='audio/x-ogg' file='U006B.ogg'>
+    <Description>k</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U006C.ogg' mimetype='audio/x-ogg' file='U006C.ogg'>
+    <Description>l</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U006D.ogg' mimetype='audio/x-ogg' file='U006D.ogg'>
+    <Description>m</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U006E.ogg' mimetype='audio/x-ogg' file='U006E.ogg'>
+    <Description>n</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U006F.ogg' mimetype='audio/x-ogg' file='U006F.ogg'>
+    <Description>o</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0070.ogg' mimetype='audio/x-ogg' file='U0070.ogg'>
+    <Description>p</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0071.ogg' mimetype='audio/x-ogg' file='U0071.ogg'>
+    <Description>q</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0072.ogg' mimetype='audio/x-ogg' file='U0072.ogg'>
+    <Description>r</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0073.ogg' mimetype='audio/x-ogg' file='U0073.ogg'>
+    <Description>s</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0074.ogg' mimetype='audio/x-ogg' file='U0074.ogg'>
+    <Description>t</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0075.ogg' mimetype='audio/x-ogg' file='U0075.ogg'>
+    <Description>u</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0076.ogg' mimetype='audio/x-ogg' file='U0076.ogg'>
+    <Description>v</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0077.ogg' mimetype='audio/x-ogg' file='U0077.ogg'>
+    <Description>w</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0078.ogg' mimetype='audio/x-ogg' file='U0078.ogg'>
+    <Description>x</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0079.ogg' mimetype='audio/x-ogg' file='U0079.ogg'>
+    <Description>y</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U007A.ogg' mimetype='audio/x-ogg' file='U007A.ogg'>
+    <Description>z</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0030.ogg' mimetype='audio/x-ogg' file='U0030.ogg'>
+    <Description>0</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0031.ogg' mimetype='audio/x-ogg' file='U0031.ogg'>
+    <Description>1</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0032.ogg' mimetype='audio/x-ogg' file='U0032.ogg'>
+    <Description>2</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0033.ogg' mimetype='audio/x-ogg' file='U0033.ogg'>
+    <Description>3</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0034.ogg' mimetype='audio/x-ogg' file='U0034.ogg'>
+    <Description>4</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0035.ogg' mimetype='audio/x-ogg' file='U0035.ogg'>
+    <Description>5</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0036.ogg' mimetype='audio/x-ogg' file='U0036.ogg'>
+    <Description>6</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0037.ogg' mimetype='audio/x-ogg' file='U0037.ogg'>
+    <Description>7</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0038.ogg' mimetype='audio/x-ogg' file='U0038.ogg'>
+    <Description>8</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset name='U0039.ogg' mimetype='audio/x-ogg' file='U0039.ogg'>
+    <Description>9</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset mimetype='audio/x-ogg' file='10.ogg'>
+    <Description>10</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset mimetype='audio/x-ogg' file='11.ogg'>
+    <Description>11</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset mimetype='audio/x-ogg' file='12.ogg'>
+    <Description>12</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset mimetype='audio/x-ogg' file='13.ogg'>
+    <Description>13</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset mimetype='audio/x-ogg' file='14.ogg'>
+    <Description>14</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset mimetype='audio/x-ogg' file='15.ogg'>
+    <Description>15</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset mimetype='audio/x-ogg' file='16.ogg'>
+    <Description>16</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset mimetype='audio/x-ogg' file='17.ogg'>
+    <Description>17</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset mimetype='audio/x-ogg' file='18.ogg'>
+    <Description>18</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset mimetype='audio/x-ogg' file='19.ogg'>
+    <Description>19</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
+  </Asset>
+  <Asset mimetype='audio/x-ogg' file='20.ogg'>
+    <Description>20</Description>
+    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+    <Categories>audio;alphabet</Categories>
   </Asset>
 </AssetML>
--- gcompris-7.4/boards/sounds/nl/misc/gcompris_misc_nl.assetml.in.nl	2006-03-27 01:45:17.000000000 +0200
+++ gcompris-7.4/boards/sounds/nl/misc/gcompris_misc_nl.assetml.in	2006-04-23 14:36:44.000000000 +0200
@@ -1,83 +1,108 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<AssetML dataset="gcompris misc" rootdir="../gcompris/boards/sounds/nl/misc/" locale="nl">
-  <Asset file="back.ogg" mimetype="audio/x-ogg">
+<AssetML rootdir="../gcompris/boards/sounds/nl/misc/" locale="nl" dataset="gcompris misc">
+  <Asset mimetype="audio/x-ogg" file="back.ogg">
    <Description>back</Description>
    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
    <Categories>audio;misc</Categories>
   </Asset>
-  <Asset file="by.ogg" mimetype="audio/x-ogg">
+  <Asset mimetype="audio/x-ogg" file="by.ogg">
    <Description>by</Description>
    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
    <Categories>audio;misc</Categories>
   </Asset>
-  <Asset file="click_on_letter.ogg" mimetype="audio/x-ogg">
+  <Asset mimetype="audio/x-ogg" file="click_on_letter.ogg">
    <Description>click_on_letter</Description>
    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
    <Categories>audio;misc</Categories>
   </Asset>
-  <Asset file="congratulation.ogg" mimetype="audio/x-ogg">
+  <Asset mimetype="audio/x-ogg" file="check_answer.ogg">
+   <Description>check_answer</Description>
+   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+   <Categories>audio;misc</Categories>
+  </Asset>
+  <Asset mimetype="audio/x-ogg" file="congratulation.ogg">
    <Description>congratulation</Description>
    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
    <Categories>audio;misc</Categories>
   </Asset>
-  <Asset file="equal.ogg" mimetype="audio/x-ogg">
+  <Asset mimetype="audio/x-ogg" file="equal.ogg">
    <Description>equal</Description>
    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
    <Categories>audio;misc</Categories>
   </Asset>
-  <Asset file="good.ogg" mimetype="audio/x-ogg">
+  <Asset mimetype="audio/x-ogg" file="good.ogg">
    <Description>good</Description>
    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
    <Categories>audio;misc</Categories>
   </Asset>
-  <Asset file="great.ogg" mimetype="audio/x-ogg">
+  <Asset mimetype="audio/x-ogg" file="great.ogg">
    <Description>great</Description>
    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
    <Categories>audio;misc</Categories>
   </Asset>
-  <Asset file="help.ogg" mimetype="audio/x-ogg">
+  <Asset mimetype="audio/x-ogg" file="help.ogg">
    <Description>help</Description>
    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
    <Categories>audio;misc</Categories>
   </Asset>
-  <Asset file="level.ogg" mimetype="audio/x-ogg">
+  <Asset mimetype="audio/x-ogg" file="level.ogg">
    <Description>level</Description>
    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
    <Categories>audio;misc</Categories>
   </Asset>
-  <Asset file="minus.ogg" mimetype="audio/x-ogg">
+  <Asset mimetype="audio/x-ogg" file="minus.ogg">
    <Description>minus</Description>
    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
    <Categories>audio;misc</Categories>
   </Asset>
-  <Asset file="ok.ogg" mimetype="audio/x-ogg">
+  <Asset mimetype="audio/x-ogg" file="ok.ogg">
    <Description>ok</Description>
    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
    <Categories>audio;misc</Categories>
   </Asset>
-  <Asset file="outof.ogg" mimetype="audio/x-ogg">
+  <Asset mimetype="audio/x-ogg" file="outof.ogg">
    <Description>outof</Description>
    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
    <Categories>audio;misc</Categories>
   </Asset>
-  <Asset file="plus.ogg" mimetype="audio/x-ogg">
+  <Asset mimetype="audio/x-ogg" file="plus.ogg">
    <Description>plus</Description>
    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
    <Categories>audio;misc</Categories>
   </Asset>
-  <Asset file="quit.ogg" mimetype="audio/x-ogg">
+  <Asset mimetype="audio/x-ogg" file="quit.ogg">
    <Description>quit</Description>
    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
    <Categories>audio;misc</Categories>
   </Asset>
-  <Asset file="super.ogg" mimetype="audio/x-ogg">
+  <Asset mimetype="audio/x-ogg" file="super.ogg">
    <Description>super</Description>
    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
    <Categories>audio;misc</Categories>
   </Asset>
-  <Asset file="welcome.ogg" mimetype="audio/x-ogg">
+  <Asset mimetype="audio/x-ogg" file="welcome.ogg">
    <Description>welcome</Description>
    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
    <Categories>audio;misc</Categories>
   </Asset>
+  <Asset mimetype="audio/x-ogg" file="awesome.ogg">
+   <Description>awesome</Description>
+   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+   <Categories>audio;misc</Categories>
+  </Asset>
+  <Asset mimetype="audio/x-ogg" file="fantastic.ogg">
+   <Description>fantastic</Description>
+   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+   <Categories>audio;misc</Categories>
+  </Asset>
+  <Asset mimetype="audio/x-ogg" file="waytogo.ogg">
+   <Description>waytogo</Description>
+   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+   <Categories>audio;misc</Categories>
+  </Asset>
+  <Asset mimetype="audio/x-ogg" file="perfect.ogg">
+   <Description>perfect</Description>
+   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
+   <Categories>audio;misc</Categories>
+  </Asset>
 </AssetML>
--- gcompris-7.4/boards/sounds/nl/geography/gcompris_geography_nl.assetml.in.nl	2006-03-27 01:44:38.000000000 +0200
+++ gcompris-7.4/boards/sounds/nl/geography/gcompris_geography_nl.assetml.in	2006-04-25 08:49:50.000000000 +0200
@@ -122,7 +122,7 @@
   </Asset>
   <Asset mimetype="audio/x-ogg" file="france.ogg">
    <Description>france</Description>
-   <Credits>Susan Rich 2004 / GPL</Credits>
+   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
    <Categories>audio;geography</Categories>
   </Asset>
   <Asset mimetype="audio/x-ogg" file="french_guiana.ogg">
@@ -147,7 +147,7 @@
   </Asset>
   <Asset mimetype="audio/x-ogg" file="germany.ogg">
    <Description>germany</Description>
-   <Credits>Susan Rich 2004 / GPL</Credits>
+   <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
    <Categories>audio;geography</Categories>
   </Asset>
   <Asset mimetype="audio/x-ogg" file="guyana.ogg">
@@ -340,4 +340,4 @@
    <Credits>Voice : Marina Snaaijer / Tech : Ivar Snaaijer / Licence : GPL 2 +</Credits>
    <Categories>audio;geography</Categories>
   </Asset>
-</AssetML>
\ No newline at end of file
+</AssetML>
--- gcompris-7.4/po/nl.po.nl	2006-04-04 23:33:49.000000000 +0200
+++ gcompris-7.4/po/nl.po	2006-04-24 10:56:20.000000000 +0200
@@ -13,7 +13,7 @@
 "Project-Id-Version: gcompris cvs\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-03-31 02:26+0200\n"
-"PO-Revision-Date: 2006-04-04 11:58+0200\n"
+"PO-Revision-Date: 2006-04-24 00:27+0200\n"
 "Last-Translator: Johan Blok <j.blok.2 at student.rug.nl>\n"
 "Language-Team: Dutch <nl at li.org>\n"
 "MIME-Version: 1.0\n"
@@ -1212,10 +1212,7 @@
 "Laurent Lacheny. Images and Artificial Intelligence taken from project "
 "4stattack by Jeroen Vloothuis. The original project can be found on &lt;"
 "http://forcedattack.sourceforge.net&gt;"
-msgstr ""
-"Laurent Lacheny. Afbeeldingen and Kunstmatige Intelligentie van project "
-"4stattack door Jeroen Vloothuis. Het oorspronkelijke project kan worden "
-"gevonden op &lt;http://forcedattack.sourceforge.net&gt"
+msgstr "Laurent Lacheny. Afbeeldingen and Kunstmatige Intelligentie van project 4stattack door Jeroen Vloothuis. Het oorspronkelijke project kan worden gevonden op &lt;http://forcedattack.sourceforge.net&gt;"
 
 #: ../boards/crane.xml.in.h:1
 msgid "Build the same model"
@@ -1387,10 +1384,7 @@
 "(&lt;http://schmode.net/&gt;) and from LE BERRE Daniel. These people kindly "
 "gave GCompris the authorization to include their pictures. Thanks a lot, "
 "both of you."
-msgstr ""
-"De prentjes van dieren komen van de Dierenfoto-pagina van Ralf Schmode (&lt;"
-"http://schmode.net/&gt) en van LE BERRE Daniel. Zij hebben GCompris "
-"toestemming gegeven om deze foto's te gebruiken. Bedankt!"
+msgstr "De prentjes van dieren komen van de Dierenfoto-pagina van Ralf Schmode (&lt;http://schmode.net/&gt;) en van LE BERRE Daniel. Zij hebben GCompris toestemming gegeven om deze foto's te gebruiken. Bedankt!"
 
 #: ../boards/erase.xml.in.h:4 ../src/boards/erase.c:112
 #: ../src/boards/machpuzzle.c:92

gcompris-sys-assetml.patch:

--- NEW FILE gcompris-sys-assetml.patch ---
--- gcompris-7.4/src/gcompris/assetml.c.sysassetml	2005-08-19 02:27:29.000000000 +0200
+++ gcompris-7.4/src/gcompris/assetml.c	2006-04-21 17:46:50.000000000 +0200
@@ -1,493 +0,0 @@
-/* assetml - assetml.c
- *
- * Copyright (C) 2003 Bruno Coudoin
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#include "glib.h"
-#include "assetml.h"
-#include <config.h>
-
-/* libxml includes */
-#include <libxml/tree.h>
-#include <libxml/parser.h>
-
-#include <locale.h>
-#include <string.h>
-
-#define FILE_EXT ".assetml"
-
-const gchar	*assetml_get_locale(void);
-static gchar	*reactivate_newline(gchar *str);
-static void	 dump_asset(AssetML *assetml);
-int		 selectAssetML(const gchar *dirent);
-void		 assetml_read_xml_file(GList **gl_result, char *fname,
-				       gchar *dataset, gchar* categories, gchar* mimetype, 
-				       const gchar *locale, gchar* file);
-void		 assetml_load_xml(GList **gl_result, gchar *dataset, gchar* categories, 
-				  gchar* mimetype, 
-				  const gchar* locale, gchar* file);
-void		 free_asset(AssetML *assetml);
-
-GHashTable *asset_cache = NULL;
-
-/*
- * This returns the locale for which text must be displayed
- *
- */
-const gchar *assetml_get_locale()
-{
-  const char *locale;
-
-  locale = g_getenv("LC_ALL");
-  if(locale == NULL)
-    locale = g_getenv("LC_MESSAGES");
-  if(locale == NULL)
-    locale = g_getenv("LANG");
-
-
-  if(locale!=NULL)
-    return(locale);
-
-  return("en_US.UTF-8");
-}
-
-/*
- * Return a copy of the given string in which it has
- * changes '\''n' to '\n'.
- * The recognized sequences are \b
- * \f \n \r \t \\ \" and the octal format.
- * 
- */
-static gchar *reactivate_newline(gchar *str)
-{
-  gchar *newstr;
-
-  if(str==NULL)
-    return NULL;
-
-  newstr = g_strcompress(str);
-  
-  g_free(str);
-
-  return newstr;
-}
-
-void dump_asset(AssetML *assetml)
-{
-
-  g_message("Dump Asset\n");
-
-  if(assetml==NULL)
-    return;
-
-  if(assetml->dataset)
-    g_message("  dataset     = %s\n",assetml->dataset);
-  if(assetml->file)
-    g_message("  file        = %s\n",assetml->file);
-  if(assetml->name)
-    g_message("  name        = %s\n",assetml->name);
-  if(assetml->locale)
-    g_message("  locale      = %s\n",assetml->locale);
-  if(assetml->description)
-    g_message("  description = %s\n",assetml->description);
-  if(assetml->categories)
-    g_message("  categories  = %s\n",assetml->categories);
-  if(assetml->mimetype)
-    g_message("  mimetype    = %s\n",assetml->mimetype);
-  if(assetml->credits)
-    g_message("  credits     = %s\n",assetml->credits);
-
-}
-
-/*
- * Thanks for George Lebl <jirka at 5z.com> for his Genealogy example
- * for all the XML stuff there
- */
-
-static AssetML *assetml_add_xml_to_data(xmlDocPtr doc,
-					xmlNodePtr xmlnode, 
-					gchar *rootdir,
-					GNode * child)
-{
-  AssetML *assetml = NULL;
-  gchar   *tmpstr;
-
-  if(/* if the node has no name */
-     !xmlnode->name ||
-     /* or if the name is not "Asset" */
-     (g_strcasecmp(xmlnode->name,"Asset")!=0)
-     )
-    return NULL;
-
-  assetml = g_malloc0 (sizeof (AssetML));
-
-  /* get the specific values */
-  tmpstr = xmlGetProp(xmlnode,"file");
-  if(tmpstr && strlen(tmpstr)>0)
-    if(rootdir[0]!='/')
-      /* This is a relative path, add ASSETML_DIR and rootdir prefix */
-      assetml->file		= g_build_filename(ASSETML_DIR, rootdir, tmpstr, NULL);
-    else
-      assetml->file		= g_build_filename(rootdir, tmpstr, NULL);
-  else
-    assetml->file		= NULL;
-  xmlFree(tmpstr);
-
-  tmpstr = xmlGetProp(xmlnode,"name");
-  if(tmpstr && strlen(tmpstr)>0)
-  assetml->name		= g_strdup(tmpstr);
-  else
-    assetml->name		= g_path_get_basename(assetml->file);
-  xmlFree(tmpstr);
-
-
-  tmpstr = xmlGetProp(xmlnode,"mimetype");
-  if(tmpstr && strlen(tmpstr)>0)
-  assetml->mimetype		= g_strdup(tmpstr);
-  else
-    assetml->mimetype		= NULL;
-  xmlFree(tmpstr);
-
-
-
-  xmlnode = xmlnode->xmlChildrenNode;
-  while (xmlnode != NULL) {
-    gchar *lang = xmlGetProp(xmlnode,"lang");
-
-    /* get the description of the asset */
-    if (!strcmp(xmlnode->name, "Description")
-	&& (lang==NULL ||
-	    !strcmp(lang, assetml_get_locale())
-	    || !strncmp(lang, assetml_get_locale(), 2)))
-      {
-	assetml->description = reactivate_newline(xmlNodeListGetString(doc, 
-								       xmlnode->xmlChildrenNode, 1));
-      }
-
-    /* get the description of the Credits */
-    if (!strcmp(xmlnode->name, "Credits")
-	&& (lang==NULL ||
-	    !strcmp(lang, assetml_get_locale())
-	    || !strncmp(lang, assetml_get_locale(), 2)))
-      {
-	assetml->credits = reactivate_newline(xmlNodeListGetString(doc, 
-								   xmlnode->xmlChildrenNode, 1));
-      }
-
-
-    /* get the description of the Categories */
-    if (!strcmp(xmlnode->name, "Categories")
-	&& (lang==NULL ||
-	    !strcmp(lang, assetml_get_locale())
-	    || !strncmp(lang, assetml_get_locale(), 2)))
-      {
-	assetml->categories = reactivate_newline(xmlNodeListGetString(doc, 
-								      xmlnode->xmlChildrenNode, 1));
-      }
-
-    xmlnode = xmlnode->next;
-  }
-
-  return(assetml);
-}
-
-/*
- * Given the assetml and the dataset, categories, name
- * return true if the assetml matches the requirements
- */
-static gboolean matching(AssetML *assetml, gchar *mydataset, 
-			 gchar *dataset, gchar* categories, gchar* mimetype, 
-			 const gchar* mylocale, const gchar* locale, gchar* name)
-{
-  g_assert(assetml);
-
-  if (!assetml->locale)
-    assetml->locale = g_strdup(mylocale);
-  if (!assetml->dataset)
-    assetml->dataset = g_strdup(mydataset);
-
-  if(assetml->dataset && dataset)
-    if(g_ascii_strcasecmp(assetml->dataset, dataset))
-      return FALSE;
-
-
-  /* Check the leading locale definition matches the leading user request so that
-   * File   Requested   Status
-   * fr     fr_FR.UTF8  OK
-   * pt     pt_BR       OK
-   * pt_BR  pt          NO
-   */
-  if (!assetml->locale)
-    assetml->locale = g_strdup(mylocale);
-
-  if(assetml->locale && locale)
-    if(g_ascii_strncasecmp(assetml->locale, locale, strlen(assetml->locale)))
-      return FALSE;
-
-  if(assetml->mimetype && mimetype)
-    if(g_ascii_strcasecmp(assetml->mimetype, mimetype))
-      return FALSE;
-
-  if(assetml->name && name)
-    if(g_ascii_strcasecmp(assetml->name, name))
-      return FALSE;
-
-/*  if(assetml->file && file)
-    {
-      gchar *str1;
-      gchar *str2;
-      gboolean nomatch;
-//      We test only the basename of the file so that caller do not need to specify a full path 
-      str1 = g_path_get_basename(assetml->file);
-      str2 = g_path_get_basename(file);
-
-      nomatch = g_ascii_strcasecmp(str1, str2);
-
-      g_free(str1);
-      g_free(str2);
-
-      if(nomatch)
-	return FALSE;
-    }*/
-
-  if(assetml->categories && categories)
-    {
-      guint i;
-      for(i=0; i<strlen(assetml->categories)-strlen(categories)+1; i++)
-	{
-	  if(!g_ascii_strncasecmp(assetml->categories+i, categories, strlen(categories)))
-	    {
-	      return TRUE;
-	    }
-	}
-      return FALSE;
-    }
-  
-  return TRUE;
-}
-
-/* parse the doc, add it to our internal structures and to the clist */
-static void
-parse_doc(GList **gl_result, xmlDocPtr doc, 
-	  gchar *mydataset, gchar *rootdir, gchar* mylocale,
-	  gchar *dataset, gchar* categories, gchar* mimetype, const gchar* locale, gchar* file, GList **cache)
-{
-  if (*cache){
-    GList *list;
-
-    for (list= *cache; list != NULL; list=list->next){
-      AssetML *assetml = (AssetML *) list->data;
-      
-      if (matching(assetml, mydataset, dataset, categories, 
-		   mimetype, mylocale, locale, file))
-	*gl_result = g_list_append (*gl_result, assetml);
-    }
-    return;
-  }
-
-  xmlNodePtr node;
-
-  /* find <Asset> nodes and add them to the list, this just
-     loops through all the children of the root of the document */
-  for(node = doc->children->children; node != NULL; node = node->next) {
-    /* add the board to the list, there are no children so
-       we pass NULL as the node of the child */
-    AssetML *assetml = assetml_add_xml_to_data(doc, node, rootdir, NULL);
-
-    if(assetml && matching(assetml, mydataset, dataset, categories, 
-			   mimetype, mylocale, locale, file)) {
-      g_message("if(assetml && matching  g_list_append)\n");
-
-      *gl_result = g_list_append (*gl_result, assetml);
-    }
-
-    if (assetml)
-      *cache = g_list_append( *cache,  assetml);
-
-  }
-}
-
-void assetml_real_free_assetlist(GList *assetlist)
-{
-  g_list_foreach (assetlist, (GFunc) free_asset, NULL);
-  g_list_free(assetlist);
-}
-
-/* read an xml file into our memory structures and update our view,
-   dump any old data we have in memory if we can load a new set
-   Fill the gl_result list with all matching asseml items
-*/
-void assetml_read_xml_file(GList **gl_result, char *assetmlfile,
-			   gchar *dataset, gchar* categories, gchar* mimetype, const gchar *locale, gchar* file)
-{
-  /* pointer to the new doc */
-  xmlDocPtr doc;
-  gchar *rootdir;
-  gchar *mylocale;
-  gchar *mydataset;
-
-  GList *cache = NULL;
-
-  g_return_if_fail(assetmlfile!=NULL);
-
-  /* cache asset for performance in non direct search */
-  if (!asset_cache){
-    asset_cache = g_hash_table_new_full( g_str_hash,
-					 g_str_equal,
-					 g_free,
-					 (GDestroyNotify) assetml_free_assetlist
-					 );
-  }
-
-  cache = g_hash_table_lookup (asset_cache, assetmlfile);
-
-  /* parse the new file and put the result into newdoc */
-  if (! cache){
-    doc = xmlParseFile(assetmlfile);
-
-    /* in case something went wrong */
-    if(!doc) {
-      g_warning("Oups, the parsing of %s failed", assetmlfile);
-      return;
-    }
-  
-    if(/* if there is no root element */
-       !doc->children ||
-       /* if it doesn't have a name */
-       !doc->children->name ||
-       /* if it isn't a Assetml node */
-       g_strcasecmp(doc->children->name,"AssetML")!=0) 
-      {
-	xmlFreeDoc(doc);
-	g_warning("Oups, the file %s is not of the assetml type", assetmlfile);
-	return;
-      }
-
-    rootdir   = xmlGetProp(doc->children,"rootdir");
-    mydataset = xmlGetProp(doc->children,"dataset");
-    mylocale  = xmlGetProp(doc->children,"locale");
-  }
-  else {
-    AssetML *myasset = (AssetML *) cache->data;
-
-    mylocale = myasset->locale;
-    mydataset = myasset->dataset;
-    rootdir = NULL;
-  }
-
-  /* parse our document and replace old data */
-  parse_doc(gl_result, doc, mydataset, rootdir, mylocale, dataset, categories, mimetype, locale, file, &cache);
-
-  if (rootdir)
-    g_hash_table_replace( asset_cache, g_strdup(assetmlfile), cache);
-
-  if (rootdir){
-    xmlFree(rootdir);
-    xmlFree(mydataset);
-    xmlFreeDoc(doc);
-  }
-}
-
-
-/*
- * Select only files with FILE_EXT
- */
-int selectAssetML(const gchar *dirent)
-{
-  guint ext_length = strlen(FILE_EXT);
-
-  if(strlen(dirent)<ext_length)
-    return 0;
-
-  return (strncmp (&dirent[strlen(dirent)-ext_length], FILE_EXT, ext_length) == 0);
-}
-
-/* load all the xml files in the assetml path
- * into our memory structures.
- */
-void assetml_load_xml(GList **gl_result, gchar *dataset, gchar* categories, gchar* mimetype, const gchar *locale, 
-		      gchar* name)
-{
-  const gchar  *one_dirent;
-  GDir    *dir;
-
-  dir = g_dir_open(ASSETML_DIR, 0, NULL);
-  if(!dir) {
-    g_warning("opendir returns no files with extension %s in directory %s", FILE_EXT, ASSETML_DIR);
-    return;
-  } else {
-    g_message("assetml_load_xml directory parsing=%s\n", ASSETML_DIR);
-  }
-
-  while((one_dirent = g_dir_read_name(dir)) != NULL) {
-
-    if(strstr(one_dirent, FILE_EXT)) {
-      gchar *assetmlfile = g_strdup_printf("%s/%s", ASSETML_DIR, one_dirent);
-      
-      assetml_read_xml_file(gl_result, assetmlfile,
-			    dataset, categories, mimetype, locale, name);
-      
-      g_free(assetmlfile);
-    }
-  }
-  g_dir_close(dir);
-}
-
-
-
-void free_asset(AssetML *assetml)
-{
-
-  xmlFree(assetml->locale);
-  xmlFree(assetml->dataset);
-  xmlFree(assetml->description);
-  xmlFree(assetml->categories);
-  xmlFree(assetml->file);
-  xmlFree(assetml->name);
-  xmlFree(assetml->mimetype);
-  xmlFree(assetml->credits);
-
-  g_free(assetml);
-}
-
-void assetml_free_assetlist(GList *assetlist)
-{
-  /* does not  free assets because cache */
-  //g_list_foreach (assetlist, (GFunc) free_asset, NULL);
-  g_list_free(assetlist);
-}
-
-GList*	 assetml_get_asset(gchar *dataset, gchar* categories, gchar* mimetype, const gchar *locale, gchar* file)
-{
-  GList *gl_result = NULL;
-
-  g_message("assetml_get_asset file=%s\n", file);
-
-  assetml_load_xml(&gl_result, dataset, categories, mimetype, locale, file);
-
-  if(gl_result && g_list_length(gl_result)==0)
-    {
-      g_list_free(gl_result);
-      return NULL;
-    }
-  else
-    {
-      g_message("assetml_get_asset file=%s number of matches=%d\n", file, g_list_length(gl_result));
-      g_list_foreach (gl_result, (GFunc) dump_asset, NULL);
-      return gl_result;
-    }
-}
--- gcompris-7.4/src/gcompris/assetml.h.sysassetml	2004-11-04 23:11:29.000000000 +0100
+++ gcompris-7.4/src/gcompris/assetml.h	2006-04-21 17:46:51.000000000 +0200
@@ -1,58 +0,0 @@
-/* gcompris - assetml.h
- *
- * Copyright (C) 2003 Bruno Coudoin
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-/*! \file assetml.h
-  \brief The libassetml API
-*/
-
-#ifndef ASSETML_H
-#define ASSETML_H
-
-#include <glib.h>
-
-/**
-   \fn GList*	 assetml_get_asset(gchar *dataset, gchar* categories, gchar* mimetype, gchar* name)
-   \brief Returns a list of AssetML struct
-   \param dataset the name of the dataset, NULL for ANY dataset
-   \param categories a list of categorie columns ';' separated (NULL for all)
-   \param mimetype an official mimetype describing the content (NULL for all)
-   \param locale is the locale to search for or NULL for the current locale
-   \param file the asset file name to get or NULL for any file name
-*/
-GList*	 assetml_get_asset(gchar *dataset, gchar* categories, gchar* mimetype, const gchar* locale, gchar* name);
-
-
-void	 assetml_free_assetlist(GList *assetlist);
-
-typedef struct _AssetML         AssetML;
-
-struct _AssetML
-{
-  gchar		*dataset;
-  gchar		*categories;
-  gchar		*locale;
-  gchar		*description;
-  gchar		*file;
-  gchar		*name;
-  gchar		*mimetype;
-  gchar		*credits;
-};
-
-
-#endif
--- gcompris-7.4/src/gcompris/Makefile.in.sysassetml	2006-04-12 01:13:48.000000000 +0200
+++ gcompris-7.4/src/gcompris/Makefile.in	2006-04-17 22:52:28.000000000 +0200
@@ -308,6 +308,8 @@
 @USE_SQLITE_TRUE at sqlite_cflags = $(SQLITE3_CFLAGS)
 @USE_SQLITE_FALSE at sqlite_cflags = 
 
+ASSETML_CFLAGS=`pkg-config libassetml --cflags`
+ASSETML_LIBS=`pkg-config libassetml --libs`
 
 #if USE_CAIRO
 #cairo_ldflags = $(CAIRO_LIBS)
@@ -333,7 +335,8 @@
 	$(SDL_CFLAGS) \
 	-DGNOME_DISABLE_DEPRECATED \
         $(sqlite_cflags) \
-	$(cairo_cflags)
+	$(cairo_cflags) \
+	$(ASSETML_CFLAGS)
 
 
 gcompris_SOURCES = \
@@ -358,7 +361,7 @@
 lib_LTLIBRARIES = libgcompris-1.la
 
 libgcompris_1_la_LIBADD = \
-	$(GCOMPRIS_LIBS) $(sqlite_ldadd) $(XML_LIBS)
+	$(GCOMPRIS_LIBS) $(sqlite_ldadd) $(XML_LIBS) $(ASSETML_LIBS)
 
 
 libgcompris_1_la_LDFLAGS = $(no_undefined) \
@@ -370,7 +373,6 @@
 libgcomprisinclude_HEADERS = \
 	about.h \
 	anim.h \
-	assetml.h \
 	bonus.h \
 	cursor.h \
 	gameutil.h \
@@ -423,7 +425,6 @@
 	about.c \
 	log.c \
 	sdlplayer.c \
-	assetml.c \
 	anim.c \
         $(profile_c) \
 	$(cairo_c)
@@ -465,7 +466,7 @@
 	gcompris_alphabeta.lo gcompris_files.lo gcompris_confirm.lo \
 	profile.lo wordlist.lo gcompris_db.lo gcompris_im.lo \
 	soundutil.lo cursor.lo bonus.lo timer.lo score.lo skin.lo \
-	config.lo about.lo log.lo sdlplayer.lo assetml.lo anim.lo \
+	config.lo about.lo log.lo sdlplayer.lo anim.lo \
 	$(am__objects_1) $(am__objects_1)
 libgcompris_1_la_OBJECTS = $(am_libgcompris_1_la_OBJECTS)
 bin_PROGRAMS = gcompris$(EXEEXT)
--- gcompris-7.4/src/gcompris/board_config.c.sysassetml	2006-03-01 01:02:02.000000000 +0100
+++ gcompris-7.4/src/gcompris/board_config.c	2006-04-17 22:52:28.000000000 +0200
@@ -20,9 +20,9 @@
  */
 
 #include <string.h>
+#include <libassetml/assetml.h>
 
 #include "gcompris.h"
-#include "assetml.h"
 
 #define COMBOBOX_COL_MAX 15
 
--- gcompris-7.4/src/gcompris/Makefile.am.sysassetml	2006-04-04 01:06:25.000000000 +0200
+++ gcompris-7.4/src/gcompris/Makefile.am	2006-04-17 22:53:11.000000000 +0200
@@ -15,6 +15,9 @@
 sqlite_cflags =
 endif
 
+ASSETML_CFLAGS=`pkg-config libassetml --cflags`
+ASSETML_LIBS=`pkg-config libassetml --libs`
+
 #if USE_CAIRO
 #cairo_ldflags = $(CAIRO_LIBS)
 #cairo_cflags = $(CAIRO_CFLAGS)
@@ -53,7 +56,8 @@
 	$(SDL_CFLAGS) \
 	-DGNOME_DISABLE_DEPRECATED \
         $(sqlite_cflags) \
-	$(cairo_cflags)
+	$(cairo_cflags) \
+	$(ASSETML_CFLAGS)
 
 gcompris_SOURCES = \
 	main.c
@@ -76,7 +80,7 @@
 lib_LTLIBRARIES = libgcompris-1.la
 
 libgcompris_1_la_LIBADD = \
-	$(GCOMPRIS_LIBS) $(sqlite_ldadd) $(XML_LIBS)
+	$(GCOMPRIS_LIBS) $(sqlite_ldadd) $(XML_LIBS) $(ASSETML_LIBS)
 
 libgcompris_1_la_LDFLAGS = $(no_undefined) \
 	-version-info $(LIBGCOMPRIS_CURRENT):$(LIBGCOMPRIS_REVISION):$(LIBGCOMPRIS_AGE) 
@@ -86,7 +90,6 @@
 libgcomprisinclude_HEADERS =			\
 	about.h \
 	anim.h \
-	assetml.h \
 	bonus.h \
 	cursor.h \
 	gameutil.h \
@@ -138,7 +141,6 @@
 	about.c \
 	log.c \
 	sdlplayer.c \
-	assetml.c \
 	anim.c \
         $(profile_c) \
 	$(cairo_c)
--- gcompris-7.4/src/gcompris/gameutil.c.sysassetml	2006-04-04 00:21:44.000000000 +0200
+++ gcompris-7.4/src/gcompris/gameutil.c	2006-04-17 22:52:28.000000000 +0200
@@ -27,11 +27,10 @@
 #include <libxml/tree.h>
 #include <libxml/parser.h>
 #include <libxml/parserInternals.h>
+#include <libassetml/assetml.h>
 
 #include "gcompris.h"
 
-#include "assetml.h"
-
 #define IMAGEEXTENSION ".png"
 
 #define MAX_DESCRIPTION_LENGTH 1000


--- NEW FILE gcompris.6 ---
.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.25.
.TH "GCOMPRIS" 6 "February 2002" "User Commands"
.SH NAME
gcompris \- educational games
.SH SYNOPSIS
.B gcompris
[\fIOPTION\fR...]
.SH DESCRIPTION
GNOME options
.TP
\fB\-\-disable\-sound\fR
Disable sound server usage
.TP
\fB\-\-enable\-sound\fR
Enable sound server usage
.TP
\fB\-\-espeaker\fR=\fIHOSTNAME\fR:PORT
Host:port on which the sound server to use is
running
.HP
\fB\-\-version\fR
.PP
Help options
.TP
-?, \fB\-\-help\fR
Show this help message
.TP
\fB\-\-usage\fR
Display brief usage message
.PP
GTK options
.TP
\fB\-\-gdk\-debug\fR=\fIFLAGS\fR
Gdk debugging flags to set
.TP
\fB\-\-gdk\-no\-debug\fR=\fIFLAGS\fR
Gdk debugging flags to unset
.TP
\fB\-\-display\fR=\fIDISPLAY\fR
X display to use
.TP
\fB\-\-sync\fR
Make X calls synchronous
.TP
\fB\-\-no\-xshm\fR
Don't use X shared memory extension
.TP
\fB\-\-name\fR=\fINAME\fR
Program name as used by the window manager
.TP
\fB\-\-class\fR=\fICLASS\fR
Program class as used by the window manager
.HP
\fB\-\-gxid_host\fR=\fIHOST\fR
.HP
\fB\-\-gxid_port\fR=\fIPORT\fR
.HP
\fB\-\-xim\-preedit\fR=\fISTYLE\fR
.HP
\fB\-\-xim\-status\fR=\fISTYLE\fR
.TP
\fB\-\-gtk\-debug\fR=\fIFLAGS\fR
Gtk+ debugging flags to set
.TP
\fB\-\-gtk\-no\-debug\fR=\fIFLAGS\fR
Gtk+ debugging flags to unset
.TP
\fB\-\-g\-fatal\-warnings\fR
Make all warnings fatal
.TP
\fB\-\-gtk\-module\fR=\fIMODULE\fR
Load an additional Gtk module
.PP
GNOME GUI options
.HP
\fB\-\-disable\-crash\-dialog\fR
.PP
Session management options
.TP
\fB\-\-sm\-client\-id\fR=\fIID\fR
Specify session management ID
.TP
\fB\-\-sm\-config\-prefix\fR=\fIPREFIX\fR
Specify prefix of saved configuration
.TP
\fB\-\-sm\-disable\fR
Disable connection to session manager
.PP
gcompris options
.TP
\fB\-f\fR, \fB\-\-fullscreen\fR
run gcompris in fullscreen mode.
.TP
\fB\-w\fR, \fB\-\-window\fR
run gcompris in window mode.
.TP
\fB\-s\fR, \fB\-\-sound\fR
run gcompris with sound enabled.
.TP
\fB\-m\fR, \fB\-\-mute\fR
run gcompris without sound.
.TP
\fB\-v\fR, \fB\-\-version\fR
Prints the version of gcompris
.PP
Help options
.TP
-?, \fB\-\-help\fR
Show this help message
.TP
\fB\-\-usage\fR
Display brief usage message
.SH "SEE ALSO"
The full documentation for
.B gcompris
is maintained as a Texinfo manual.  If the
.B info
and
.B gcompris
programs are properly installed at your site, the command
.IP
.B info gcompris
.PP
should give you access to the complete manual.


--- NEW FILE gcompris.spec ---
Name:           gcompris
Version:        7.4
Release:        4%{?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
Patch1:         gcompris-sys-assetml.patch
Patch2:         gcompris-nl.patch
Patch3:         gcompris-electric.patch
Patch4:         gcompris-click_on_letter.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Buildrequires:  libgnomeui-devel sqlite-devel libassetml-devel python-devel
Buildrequires:  pygtk2-devel SDL_mixer-devel libXt-devel libXrandr-devel
Buildrequires:  gnome-python2-canvas python-sqlite2 texinfo texi2html
Buildrequires:  perl(XML::Parser) gettext desktop-file-utils gnuchess
Requires:       gnuchess gnucap tuxpaint gcompris-flags
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info

%description
GCompris / I Got IT is an educationnal game for children starting at 2.
More than 100 different activities are proposed:
* Click on the animals => learn the mouse/click usage
* Type the falling letters => learn the keyboard usage
* Falling Dices
* Falling words
* Basic algebra
* Time learning with an analog clock
* Puzzle game with famous paintings
* Drive Plane to catch clouds in increasing number
* Balance the scales
* And much more ...

Some activities make use of sounds.  For those you'll have to install the         
gcompris-sound package for the languages you intend to use.


%description -l fr
GCompris / J'ai Compris est un logiciel ??ducatif pour les enfants 
?? partir de 2 ans.

Plus de 100 activit??s sont propos??es :
* Cliquer sur les animaux => apprentissage du click et de la souris
* Entrer les lettres qui tombent => Apprentissage du clavier
* Les d??s qui tombent
* Les mots qui tombent
* Alg??bre simple
* Apprentissage de la lecture de l'heure sur une horloge analogique
* Puzzle avec des tableaux c??l??bres
* Pilote un avion pour attraper les nuages dans l'ordre
* Equilibre la balance
* ...


%package libs
Summary:        GCompris core-engine library
Group:          System Environment/Libraries

%description libs
This package contains the shared library which contains the core-engine of
GCompris.


%package devel
Summary:        Development libraries and headers for gcompris-lib
Group:          Development/Libraries
Requires:	%{name}-lib = %{version}
Requires:       libgnomecanvas-devel pkgconfig

%description devel
Developmental files for the core-engine library of GCompris


%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.


%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.


%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.


%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.


%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.


%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.


%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.


%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.


%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.


%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.


%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.


%package sound-sv
Summary:        GCompris voices in Swedish
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.


%package sound-eu
Summary:        GCompris voices in Basque
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.


%package flags
Summary:        Country flags for use with GCompris (60x40 PNG)
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.


%prep
%setup -q
%patch1 -p1 -z .sysassetml -E
# no backup files for this patch, otherwise they get installed under /usr/share
%patch2 -p1
%patch3 -p1 -z .electric
%patch4 -p1 -z .click_on_letter
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


%build
# The configure check for python-gnome.canvas fails without X running,
# --enable-py-build-only works around this
%configure --enable-py-build-only
# 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
# the translations
sed -i 's/Name=Educational suite gcompris/Name=GCompris Educational suite/' \
  gcompris.desktop
sed -i \
  's/Comment=Administration for gcompris/GenericName=Administration for gcompris\nComment=Specify which activities may be used by whom/' \
  gcompris-edit.desktop


%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mandir}/man6
rm $RPM_BUILD_ROOT%{_libdir}/libgcompris-1.la
rm $RPM_BUILD_ROOT%{_libdir}/gcompris/lib*.la
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
rm -fr $RPM_BUILD_ROOT/usr/lib/menu
%find_lang %{name}

# below is the desktop file and icon stuff.
desktop-file-install --vendor fedora --delete-original                  \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications                         \
  --add-category X-Fedora                                               \
  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop

desktop-file-install --vendor fedora --delete-original                  \
  --dir $RPM_BUILD_ROOT%{_datadir}/applications                         \
  --add-category X-Fedora                                               \
  $RPM_BUILD_ROOT%{_datadir}/applications/%{name}-edit.desktop

mkdir -p $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps
mv $RPM_BUILD_ROOT/usr/share/pixmaps/%{name}.png \
  $RPM_BUILD_ROOT/usr/share/pixmaps/%{name}-edit.png \
  $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps
rmdir $RPM_BUILD_ROOT/usr/share/pixmaps


%clean
rm -rf $RPM_BUILD_ROOT


%post
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
/sbin/install-info %{_infodir}/%{name}.info %{_infodir}/dir || :

%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
if [ $1 = 0 ]; then
    /sbin/install-info --delete %{_infodir}/%{name}.info %{_infodir}/dir || :
fi

%post libs -p /sbin/ldconfig

%postun libs -p /sbin/ldconfig


%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README
%{_bindir}/%{name}
%{_libdir}/%{name}
%dir %{_datadir}/gcompris
%dir %{_datadir}/gcompris/boards
%{_datadir}/gcompris/boards/DOCUMENTATIONS
%{_datadir}/gcompris/boards/README
%{_datadir}/gcompris/boards/a*
%{_datadir}/gcompris/boards/b*
%{_datadir}/gcompris/boards/c*
%{_datadir}/gcompris/boards/d*
%{_datadir}/gcompris/boards/e*
%{_datadir}/gcompris/boards/f*.xml
%{_datadir}/gcompris/boards/fishes
%{_datadir}/gcompris/boards/g*
%{_datadir}/gcompris/boards/h*
%{_datadir}/gcompris/boards/i*
%{_datadir}/gcompris/boards/k*
%{_datadir}/gcompris/boards/l*
%{_datadir}/gcompris/boards/m*
%{_datadir}/gcompris/boards/n*
%{_datadir}/gcompris/boards/p*
%{_datadir}/gcompris/boards/r*
%{_datadir}/gcompris/boards/s*.xml
%{_datadir}/gcompris/boards/scales
%{_datadir}/gcompris/boards/skins
%dir %{_datadir}/gcompris/boards/sounds
%{_datadir}/gcompris/boards/sounds/*.ogg
%{_datadir}/gcompris/boards/sounds/melody
%{_datadir}/gcompris/boards/sounds/memory
%{_datadir}/gcompris/boards/sounds/chronos
%{_datadir}/gcompris/boards/sounds/LuneRouge
%{_datadir}/gcompris/boards/sounds/HOWTO_ENCODE
%{_datadir}/gcompris/boards/submarine
%{_datadir}/gcompris/boards/t*
%{_datadir}/gcompris/boards/w*
%{_datadir}/gcompris/python
%{_datadir}/gnome
%{_datadir}/icons/hicolor/48x48/apps/%{name}*.png
%{_datadir}/applications/fedora-%{name}*.desktop
%{_infodir}/%{name}.info.gz
%{_mandir}/man6/%{name}.6.gz

%files libs
%defattr(-,root,root,-)
%{_libdir}/libgcompris-1.so.*

%files devel
%defattr(-,root,root,-)
%{_includedir}/libgcompris-1.0
%{_libdir}/libgcompris-1.so
%{_libdir}/pkgconfig/libgcompris-1.0.pc

%files sound-da
%defattr(-,root,root,-)
%{_datadir}/assetml/gcompris_*_da.assetml
%dir %{_datadir}/gcompris
%dir %{_datadir}/gcompris/boards
%dir %{_datadir}/gcompris/boards/sounds
%{_datadir}/gcompris/boards/sounds/da

%files sound-de
%defattr(-,root,root,-)
%{_datadir}/assetml/gcompris_*_de.assetml
%dir %{_datadir}/gcompris
%dir %{_datadir}/gcompris/boards
%dir %{_datadir}/gcompris/boards/sounds
%{_datadir}/gcompris/boards/sounds/de

%files sound-en
%defattr(-,root,root,-)
%{_datadir}/assetml/gcompris_*_en.assetml
%dir %{_datadir}/gcompris
%dir %{_datadir}/gcompris/boards
%dir %{_datadir}/gcompris/boards/sounds
%{_datadir}/gcompris/boards/sounds/en

%files sound-es
%defattr(-,root,root,-)
%{_datadir}/assetml/gcompris_*_es.assetml
%dir %{_datadir}/gcompris
%dir %{_datadir}/gcompris/boards
%dir %{_datadir}/gcompris/boards/sounds
%{_datadir}/gcompris/boards/sounds/es

%files sound-fi
%defattr(-,root,root,-)
%{_datadir}/assetml/gcompris_*_fi.assetml
%dir %{_datadir}/gcompris
%dir %{_datadir}/gcompris/boards
%dir %{_datadir}/gcompris/boards/sounds
%{_datadir}/gcompris/boards/sounds/fi

%files sound-fr
%defattr(-,root,root,-)
%{_datadir}/assetml/gcompris_*_fr.assetml
%dir %{_datadir}/gcompris
%dir %{_datadir}/gcompris/boards
%dir %{_datadir}/gcompris/boards/sounds
%{_datadir}/gcompris/boards/sounds/fr

%files sound-hu
%defattr(-,root,root,-)
%{_datadir}/assetml/gcompris_*_hu.assetml
%dir %{_datadir}/gcompris
%dir %{_datadir}/gcompris/boards
%dir %{_datadir}/gcompris/boards/sounds
%{_datadir}/gcompris/boards/sounds/hu

%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-nl
%defattr(-,root,root,-)
%{_datadir}/assetml/gcompris_*_nl.assetml
%dir %{_datadir}/gcompris
%dir %{_datadir}/gcompris/boards
%dir %{_datadir}/gcompris/boards/sounds
%{_datadir}/gcompris/boards/sounds/nl

%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

%files sound-ru
%defattr(-,root,root,-)
%{_datadir}/assetml/gcompris_*_ru.assetml
%dir %{_datadir}/gcompris
%dir %{_datadir}/gcompris/boards
%dir %{_datadir}/gcompris/boards/sounds
%{_datadir}/gcompris/boards/sounds/ru

%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-eu
%defattr(-,root,root,-)
%{_datadir}/assetml/gcompris_*_eu.assetml
%dir %{_datadir}/gcompris
%dir %{_datadir}/gcompris/boards
%dir %{_datadir}/gcompris/boards/sounds
%{_datadir}/gcompris/boards/sounds/eu

%files flags
%defattr(-,root,root,-)
%{_datadir}/assetml/gcompris_flags.assetml
%dir %{_datadir}/gcompris
%dir %{_datadir}/gcompris/boards
%{_datadir}/gcompris/boards/flags


%changelog
* Sat Apr 29 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 7.4-4
- Add click_on_letter.patch from CVS which fixes a few problems with the
  click on letter activity when the sounds are not installed

* Thu Apr 27 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 7.4-3
- Don't use a patch on the .desktop files as that breaks the translations,
  instead use sed at the end of %%build

* Tue Apr 25 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 7.4-2
- Fix a few parser errors in nl.po
- Drop Patch0, instead use a configure option with the same effect

* Mon Apr 10 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 7.4-1
- Initial spec file


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Apr 2006 07:51:18 -0000	1.1
+++ .cvsignore	30 Apr 2006 08:28:51 -0000	1.2
@@ -0,0 +1 @@
+gcompris-7.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gcompris/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Apr 2006 07:51:18 -0000	1.1
+++ sources	30 Apr 2006 08:28:51 -0000	1.2
@@ -0,0 +1 @@
+d80e55da21170a98d671c98b3e582cc3  gcompris-7.4.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 30 09:27:59 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun, 30 Apr 2006 02:27:59 -0700
Subject: rpms/heartbeat/FC-4 .cvsignore, 1.3,
	1.4 heartbeat-fedora-chkconfig.patch, 1.1,
	1.2 heartbeat-fedora-pam.patch, 1.1, 1.2 heartbeat.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200604300928.k3U9S1Oq022998@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/heartbeat/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22949/FC-4

Modified Files:
	.cvsignore heartbeat-fedora-chkconfig.patch 
	heartbeat-fedora-pam.patch heartbeat.spec sources 
Log Message:
* Thu Apr 27 2006  Joost Soeterbroek <fedora at soeterbroek.com> - 2.0.5-1
- upstream version 2.0.5
- removed patch2 - ownership of /heartbeat/crm/cib.xml is no longer
  set in cts/CM_LinuxHAv2.py.in
  + Version 2.0.5 - significant bug fixes and a few feature deficits fixed
  + various portability fixes
  + enable GUI to run with pygtk 2.4
  + significant GUI improvements and speedups
  + numerous logging improvements (generally much quieter)
  + speed up CIB processing by writing it to disk asynchronously
  + add CIB on-disk checksums
  + removed dependency on openssl
  + added "failure stickiness" to the CIB/CRM
  + Several fixes to the membership code
  + We now log all output from resource agents
  + fixed STONITHd memory leaks.
  + Added an OCF RA for Xen guests
  + Added email alerts to ldirectord
  + Improvements to the haresources2cib upgrade tool
  + Several fixes to cibadmin
  + Fix some autoadd-related bugs
  + Added Chinese support to the GUI
  + Added a daemon to replace and generalize ipfail
    + Limited testing only
  + Significant improvements to CIM model, including modifying things
  + Extensive Master/slave testing and fixes
  + Use a digest of the parameters used in an action (smaller CIB)
  + Improved detection of "old" events that should be ignored by the PE
    (ensures resource monitoring is active when required)
  + Better detection of required and/or optimal behaviour in mixed
    (and formerly mixed) clusters
  + LRM now supports multiple concurrent monitor operations
  + Optional startup & runtime enforcement of DTD validation
    (Invalid changes are rejected)
  + cibadmin tool overhauled and verified to function correctly
  + Some deprecated CIB features now unsupported
    + Placing nvpair objects in crm_config (must now use
      cluster_property_set)
    + on_stopfail removed in favor of setting on_fail in the resource's
      stop operation
    + start_prereq removed in favor of setting prereq in the resource's
      start operation 



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/FC-4/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	30 Mar 2006 17:41:38 -0000	1.3
+++ .cvsignore	30 Apr 2006 09:27:59 -0000	1.4
@@ -1 +1 @@
-heartbeat-2.0.4.tar.gz
+heartbeat-2.0.5.tar.gz

heartbeat-fedora-chkconfig.patch:

Index: heartbeat-fedora-chkconfig.patch
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/FC-4/heartbeat-fedora-chkconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- heartbeat-fedora-chkconfig.patch	30 Mar 2006 17:41:38 -0000	1.1
+++ heartbeat-fedora-chkconfig.patch	30 Apr 2006 09:27:59 -0000	1.2
@@ -1,6 +1,6 @@
-diff -Nur heartbeat-2.0.4.orig/heartbeat/init.d/heartbeat.in heartbeat-2.0.4/heartbeat/init.d/heartbeat.in
---- heartbeat-2.0.4.orig/heartbeat/init.d/heartbeat.in	2005-09-10 23:46:23.000000000 +0200
-+++ heartbeat-2.0.4/heartbeat/init.d/heartbeat.in	2006-03-27 19:55:19.000000000 +0200
+diff -Nur heartbeat-2.0.5.orig/heartbeat/init.d/heartbeat.in heartbeat-2.0.5/heartbeat/init.d/heartbeat.in
+--- heartbeat-2.0.5.orig/heartbeat/init.d/heartbeat.in	2006-04-14 21:25:33.000000000 +0200
++++ heartbeat-2.0.5/heartbeat/init.d/heartbeat.in	2006-04-27 20:32:29.000000000 +0200
 @@ -13,7 +13,7 @@
  #		We don't hate anyone, and like for everyone to use
  #		our software, no matter what OS or distribution you're using.
@@ -10,26 +10,7 @@
  # description: Startup script high-availability services.
  # processname: heartbeat
  # pidfile: @localstatedir@/run/heartbeat.pid
-@@ -51,18 +51,6 @@
- RUNDIR=@localstatedir@/run
- 
- if
--  [ -r /etc/SuSE-release ]
--then
--  # rc.status is new since SuSE 7.0
--  [ -r /etc/rc.status ] && . /etc/rc.status
--  [ -r /etc/rc.config ] && . /etc/rc.config
--
--  # Determine the base and follow a runlevel link name.
--  base=${0##*/}
--  link=${base#*[SK][0-9][0-9]}
--
--fi
--if
-   [ -z "$rc_done" ]
- then
-   rc_done="Done."
-@@ -391,12 +379,7 @@
+@@ -391,12 +391,7 @@
  	StartHA
  	RC=$?
  	Echo
@@ -43,7 +24,7 @@
  	RunStartStop post-start $RC
  	;;
  
-@@ -413,11 +396,7 @@
+@@ -413,11 +408,7 @@
  	StopHA
  	RC=$?
  	Echo
@@ -56,9 +37,9 @@
          RunStartStop post-stop $RC
  	StopLogd
  	;;
-diff -Nur heartbeat-2.0.4.orig/ldirectord/init.d/ldirectord heartbeat-2.0.4/ldirectord/init.d/ldirectord
---- heartbeat-2.0.4.orig/ldirectord/init.d/ldirectord	2005-10-17 14:49:21.000000000 +0200
-+++ heartbeat-2.0.4/ldirectord/init.d/ldirectord	2006-03-27 19:56:40.000000000 +0200
+diff -Nur heartbeat-2.0.5.orig/ldirectord/init.d/ldirectord heartbeat-2.0.5/ldirectord/init.d/ldirectord
+--- heartbeat-2.0.5.orig/ldirectord/init.d/ldirectord	2005-10-17 14:49:21.000000000 +0200
++++ heartbeat-2.0.5/ldirectord/init.d/ldirectord	2006-04-27 20:33:35.000000000 +0200
 @@ -2,7 +2,7 @@
  #
  # ldirectord  Linux Director Daemon

heartbeat-fedora-pam.patch:

Index: heartbeat-fedora-pam.patch
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/FC-4/heartbeat-fedora-pam.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- heartbeat-fedora-pam.patch	30 Mar 2006 17:41:38 -0000	1.1
+++ heartbeat-fedora-pam.patch	30 Apr 2006 09:27:59 -0000	1.2
@@ -1,6 +1,6 @@
-diff -Nur heartbeat-2.0.4.orig/mgmt/daemon/mgmtd.pam heartbeat-2.0.4/mgmt/daemon/mgmtd.pam
---- heartbeat-2.0.4.orig/mgmt/daemon/mgmtd.pam	2005-12-30 09:35:27.000000000 +0100
-+++ heartbeat-2.0.4/mgmt/daemon/mgmtd.pam	2006-03-27 19:59:12.000000000 +0200
+diff -Nur heartbeat-2.0.5.orig/mgmt/daemon/mgmtd.pam heartbeat-2.0.5/mgmt/daemon/mgmtd.pam
+--- heartbeat-2.0.5.orig/mgmt/daemon/mgmtd.pam	2005-12-30 09:35:27.000000000 +0100
++++ heartbeat-2.0.5/mgmt/daemon/mgmtd.pam	2006-04-27 20:36:29.000000000 +0200
 @@ -1,3 +1,8 @@
 -auth    required        pam_unix.so
 -account required        pam_unix.so


Index: heartbeat.spec
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/FC-4/heartbeat.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- heartbeat.spec	30 Mar 2006 17:41:38 -0000	1.2
+++ heartbeat.spec	30 Apr 2006 09:27:59 -0000	1.3
@@ -5,19 +5,19 @@
 %define           uname hacluster
 Summary:          Heartbeat subsystem for High-Availability Linux
 Name:             heartbeat
-Version:          2.0.4
-Release:          2%{?dist}
+Version:          2.0.5
+Release:          1%{?dist}
 License:          GPL/LGPL
 URL:              http://linux-ha.org/
 Group:            System Environment/Daemons
 Source0:          http://linux-ha.org/download/%{name}-%{version}.tar.gz
 Patch0:           heartbeat-fedora-pam.patch
 Patch1:           heartbeat-fedora-chkconfig.patch
-Patch2:           heartbeat-fedora-ccmuser.patch
+#Patch2:           heartbeat-fedora-ccmuser.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires:    glib2-devel
 BuildRequires:    iputils
-BuildRequires:    openssl-devel
+#BuildRequires:    openssl-devel
 BuildRequires:    libnet-devel
 BuildRequires:    libtool-ltdl-devel
 BuildRequires:    net-snmp-devel
@@ -108,7 +108,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+#%patch2 -p1
  
 %build
 # disable-fatal-warnings flag used to disable gcc4.x warnings of 'difference in signedness'
@@ -139,7 +139,6 @@
 
 sed -i -e '1i# -*-Shell-script-*-' $RPM_BUILD_ROOT/%{_libdir}/heartbeat/ocf-shellfuncs 
 sed -i -e '1i# -*-Shell-script-*-' $RPM_BUILD_ROOT/%{_sysconfdir}/ha.d/shellfuncs
-chmod -x $RPM_BUILD_ROOT/%{_libdir}/heartbeat/crmtest/helper.sh
 chmod -x $RPM_BUILD_ROOT/%{_libdir}/heartbeat/ocf-shellfuncs
 chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/ha.d/shellfuncs
 chmod -x $RPM_BUILD_ROOT/%{_libdir}/heartbeat/pymgmt.py
@@ -191,6 +190,7 @@
 %{_libdir}/libcib.so.*
 %{_libdir}/libclm.so.*
 %{_libdir}/libcrmcommon.so.*
+%{_libdir}/libtransitioner.so.*
 %{_libdir}/libhbclient.so.*
 %{_libdir}/liblrm.so.*
 %{_libdir}/libpengine.so.*
@@ -223,9 +223,13 @@
 %{_sbindir}/crm_attribute
 %{_sbindir}/crm_resource
 %{_sbindir}/crm_verify
+%{_sbindir}/attrd_updater
+%{_sbindir}/crm_failcount
+%{_sbindir}/crm_primitive.*
 %dir %attr (755, hacluster, haclient) %{_var}/run/heartbeat/ccm
 %dir %attr (755, hacluster, haclient) %{_var}/run/heartbeat/crm
 %dir %attr (755, hacluster, haclient) %{_var}/lib/heartbeat/crm
+%dir %attr (755, hacluster, haclient) %{_var}/lib/heartbeat/pengine
 %{_mandir}/man1/cl_status.1*
 %{_mandir}/man1/ha_logger.1*
 %{_mandir}/man1/hb_standby.1*
@@ -244,7 +248,7 @@
 %{_libdir}/libhbmgmtcommon.so.*
 %{_libdir}/libhbmgmttls.so.*
 %config(noreplace) %{_sysconfdir}/pam.d/hbmgmtd
-%{_datadir}/locale/zh_CN/LC_MESSAGES/haclient.zh_CN.mo
+%{_datadir}/locale/zh_CN/LC_MESSAGES/haclient.mo
 %endif
 
 %files -n ldirectord
@@ -276,6 +280,8 @@
 %doc doc/COPYING 
 %doc doc/README
 %defattr(-,root,root)
+/usr/include/pils
+%{_libdir}/libpils.*
 %{_libdir}/pils/
 
 %files devel
@@ -290,6 +296,49 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Apr 27 2006  Joost Soeterbroek <fedora at soeterbroek.com> - 2.0.5-1
+- upstream version 2.0.5
+- removed patch2 - ownership of /heartbeat/crm/cib.xml is no longer
+  set in cts/CM_LinuxHAv2.py.in
+  + Version 2.0.5 - significant bug fixes and a few feature deficits fixed
+  + various portability fixes
+  + enable GUI to run with pygtk 2.4
+  + significant GUI improvements and speedups
+  + numerous logging improvements (generally much quieter)
+  + speed up CIB processing by writing it to disk asynchronously
+  + add CIB on-disk checksums
+  + removed dependency on openssl
+  + added "failure stickiness" to the CIB/CRM
+  + Several fixes to the membership code
+  + We now log all output from resource agents
+  + fixed STONITHd memory leaks.
+  + Added an OCF RA for Xen guests
+  + Added email alerts to ldirectord
+  + Improvements to the haresources2cib upgrade tool
+  + Several fixes to cibadmin
+  + Fix some autoadd-related bugs
+  + Added Chinese support to the GUI
+  + Added a daemon to replace and generalize ipfail
+    + Limited testing only
+  + Significant improvements to CIM model, including modifying things
+  + Extensive Master/slave testing and fixes
+  + Use a digest of the parameters used in an action (smaller CIB)
+  + Improved detection of "old" events that should be ignored by the PE
+    (ensures resource monitoring is active when required)
+  + Better detection of required and/or optimal behaviour in mixed
+    (and formerly mixed) clusters
+  + LRM now supports multiple concurrent monitor operations
+  + Optional startup & runtime enforcement of DTD validation
+    (Invalid changes are rejected)
+  + cibadmin tool overhauled and verified to function correctly
+  + Some deprecated CIB features now unsupported
+    + Placing nvpair objects in crm_config (must now use
+      cluster_property_set)
+    + on_stopfail removed in favor of setting on_fail in the resource's
+      stop operation
+    + start_prereq removed in favor of setting prereq in the resource's
+      start operation 
+
 * Wed Mar 29 2006  Joost Soeterbroek <fedora at soeterbroek.com> - 2.0.4-2
 - Version 2.0.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/FC-4/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 Mar 2006 17:41:38 -0000	1.3
+++ sources	30 Apr 2006 09:27:59 -0000	1.4
@@ -1 +1 @@
-659aae2365daea3a17e5a4a4ae0b0a3e  heartbeat-2.0.4.tar.gz
+209228b2948cfa4762a3a66454c6cc35  heartbeat-2.0.5.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 30 09:28:00 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun, 30 Apr 2006 02:28:00 -0700
Subject: rpms/heartbeat/FC-5 .cvsignore, 1.3,
	1.4 heartbeat-fedora-chkconfig.patch, 1.1,
	1.2 heartbeat-fedora-pam.patch, 1.1, 1.2 heartbeat.spec, 1.2,
	1.3 sources, 1.3, 1.4
Message-ID: <200604300928.k3U9S2b4023012@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/heartbeat/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22949/FC-5

Modified Files:
	.cvsignore heartbeat-fedora-chkconfig.patch 
	heartbeat-fedora-pam.patch heartbeat.spec sources 
Log Message:
* Thu Apr 27 2006  Joost Soeterbroek <fedora at soeterbroek.com> - 2.0.5-1
- upstream version 2.0.5
- removed patch2 - ownership of /heartbeat/crm/cib.xml is no longer
  set in cts/CM_LinuxHAv2.py.in
  + Version 2.0.5 - significant bug fixes and a few feature deficits fixed
  + various portability fixes
  + enable GUI to run with pygtk 2.4
  + significant GUI improvements and speedups
  + numerous logging improvements (generally much quieter)
  + speed up CIB processing by writing it to disk asynchronously
  + add CIB on-disk checksums
  + removed dependency on openssl
  + added "failure stickiness" to the CIB/CRM
  + Several fixes to the membership code
  + We now log all output from resource agents
  + fixed STONITHd memory leaks.
  + Added an OCF RA for Xen guests
  + Added email alerts to ldirectord
  + Improvements to the haresources2cib upgrade tool
  + Several fixes to cibadmin
  + Fix some autoadd-related bugs
  + Added Chinese support to the GUI
  + Added a daemon to replace and generalize ipfail
    + Limited testing only
  + Significant improvements to CIM model, including modifying things
  + Extensive Master/slave testing and fixes
  + Use a digest of the parameters used in an action (smaller CIB)
  + Improved detection of "old" events that should be ignored by the PE
    (ensures resource monitoring is active when required)
  + Better detection of required and/or optimal behaviour in mixed
    (and formerly mixed) clusters
  + LRM now supports multiple concurrent monitor operations
  + Optional startup & runtime enforcement of DTD validation
    (Invalid changes are rejected)
  + cibadmin tool overhauled and verified to function correctly
  + Some deprecated CIB features now unsupported
    + Placing nvpair objects in crm_config (must now use
      cluster_property_set)
    + on_stopfail removed in favor of setting on_fail in the resource's
      stop operation
    + start_prereq removed in favor of setting prereq in the resource's
      start operation 



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/FC-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	30 Mar 2006 17:42:04 -0000	1.3
+++ .cvsignore	30 Apr 2006 09:28:00 -0000	1.4
@@ -1 +1 @@
-heartbeat-2.0.4.tar.gz
+heartbeat-2.0.5.tar.gz

heartbeat-fedora-chkconfig.patch:

Index: heartbeat-fedora-chkconfig.patch
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/FC-5/heartbeat-fedora-chkconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- heartbeat-fedora-chkconfig.patch	30 Mar 2006 17:42:04 -0000	1.1
+++ heartbeat-fedora-chkconfig.patch	30 Apr 2006 09:28:00 -0000	1.2
@@ -1,6 +1,6 @@
-diff -Nur heartbeat-2.0.4.orig/heartbeat/init.d/heartbeat.in heartbeat-2.0.4/heartbeat/init.d/heartbeat.in
---- heartbeat-2.0.4.orig/heartbeat/init.d/heartbeat.in	2005-09-10 23:46:23.000000000 +0200
-+++ heartbeat-2.0.4/heartbeat/init.d/heartbeat.in	2006-03-27 19:55:19.000000000 +0200
+diff -Nur heartbeat-2.0.5.orig/heartbeat/init.d/heartbeat.in heartbeat-2.0.5/heartbeat/init.d/heartbeat.in
+--- heartbeat-2.0.5.orig/heartbeat/init.d/heartbeat.in	2006-04-14 21:25:33.000000000 +0200
++++ heartbeat-2.0.5/heartbeat/init.d/heartbeat.in	2006-04-27 20:32:29.000000000 +0200
 @@ -13,7 +13,7 @@
  #		We don't hate anyone, and like for everyone to use
  #		our software, no matter what OS or distribution you're using.
@@ -10,26 +10,7 @@
  # description: Startup script high-availability services.
  # processname: heartbeat
  # pidfile: @localstatedir@/run/heartbeat.pid
-@@ -51,18 +51,6 @@
- RUNDIR=@localstatedir@/run
- 
- if
--  [ -r /etc/SuSE-release ]
--then
--  # rc.status is new since SuSE 7.0
--  [ -r /etc/rc.status ] && . /etc/rc.status
--  [ -r /etc/rc.config ] && . /etc/rc.config
--
--  # Determine the base and follow a runlevel link name.
--  base=${0##*/}
--  link=${base#*[SK][0-9][0-9]}
--
--fi
--if
-   [ -z "$rc_done" ]
- then
-   rc_done="Done."
-@@ -391,12 +379,7 @@
+@@ -391,12 +391,7 @@
  	StartHA
  	RC=$?
  	Echo
@@ -43,7 +24,7 @@
  	RunStartStop post-start $RC
  	;;
  
-@@ -413,11 +396,7 @@
+@@ -413,11 +408,7 @@
  	StopHA
  	RC=$?
  	Echo
@@ -56,9 +37,9 @@
          RunStartStop post-stop $RC
  	StopLogd
  	;;
-diff -Nur heartbeat-2.0.4.orig/ldirectord/init.d/ldirectord heartbeat-2.0.4/ldirectord/init.d/ldirectord
---- heartbeat-2.0.4.orig/ldirectord/init.d/ldirectord	2005-10-17 14:49:21.000000000 +0200
-+++ heartbeat-2.0.4/ldirectord/init.d/ldirectord	2006-03-27 19:56:40.000000000 +0200
+diff -Nur heartbeat-2.0.5.orig/ldirectord/init.d/ldirectord heartbeat-2.0.5/ldirectord/init.d/ldirectord
+--- heartbeat-2.0.5.orig/ldirectord/init.d/ldirectord	2005-10-17 14:49:21.000000000 +0200
++++ heartbeat-2.0.5/ldirectord/init.d/ldirectord	2006-04-27 20:33:35.000000000 +0200
 @@ -2,7 +2,7 @@
  #
  # ldirectord  Linux Director Daemon

heartbeat-fedora-pam.patch:

Index: heartbeat-fedora-pam.patch
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/FC-5/heartbeat-fedora-pam.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- heartbeat-fedora-pam.patch	30 Mar 2006 17:42:04 -0000	1.1
+++ heartbeat-fedora-pam.patch	30 Apr 2006 09:28:00 -0000	1.2
@@ -1,6 +1,6 @@
-diff -Nur heartbeat-2.0.4.orig/mgmt/daemon/mgmtd.pam heartbeat-2.0.4/mgmt/daemon/mgmtd.pam
---- heartbeat-2.0.4.orig/mgmt/daemon/mgmtd.pam	2005-12-30 09:35:27.000000000 +0100
-+++ heartbeat-2.0.4/mgmt/daemon/mgmtd.pam	2006-03-27 19:59:12.000000000 +0200
+diff -Nur heartbeat-2.0.5.orig/mgmt/daemon/mgmtd.pam heartbeat-2.0.5/mgmt/daemon/mgmtd.pam
+--- heartbeat-2.0.5.orig/mgmt/daemon/mgmtd.pam	2005-12-30 09:35:27.000000000 +0100
++++ heartbeat-2.0.5/mgmt/daemon/mgmtd.pam	2006-04-27 20:36:29.000000000 +0200
 @@ -1,3 +1,8 @@
 -auth    required        pam_unix.so
 -account required        pam_unix.so


Index: heartbeat.spec
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/FC-5/heartbeat.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- heartbeat.spec	30 Mar 2006 17:42:04 -0000	1.2
+++ heartbeat.spec	30 Apr 2006 09:28:00 -0000	1.3
@@ -5,19 +5,19 @@
 %define           uname hacluster
 Summary:          Heartbeat subsystem for High-Availability Linux
 Name:             heartbeat
-Version:          2.0.4
-Release:          2%{?dist}
+Version:          2.0.5
+Release:          1%{?dist}
 License:          GPL/LGPL
 URL:              http://linux-ha.org/
 Group:            System Environment/Daemons
 Source0:          http://linux-ha.org/download/%{name}-%{version}.tar.gz
 Patch0:           heartbeat-fedora-pam.patch
 Patch1:           heartbeat-fedora-chkconfig.patch
-Patch2:           heartbeat-fedora-ccmuser.patch
+#Patch2:           heartbeat-fedora-ccmuser.patch
 BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 BuildRequires:    glib2-devel
 BuildRequires:    iputils
-BuildRequires:    openssl-devel
+#BuildRequires:    openssl-devel
 BuildRequires:    libnet-devel
 BuildRequires:    libtool-ltdl-devel
 BuildRequires:    net-snmp-devel
@@ -108,7 +108,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+#%patch2 -p1
  
 %build
 # disable-fatal-warnings flag used to disable gcc4.x warnings of 'difference in signedness'
@@ -139,7 +139,6 @@
 
 sed -i -e '1i# -*-Shell-script-*-' $RPM_BUILD_ROOT/%{_libdir}/heartbeat/ocf-shellfuncs 
 sed -i -e '1i# -*-Shell-script-*-' $RPM_BUILD_ROOT/%{_sysconfdir}/ha.d/shellfuncs
-chmod -x $RPM_BUILD_ROOT/%{_libdir}/heartbeat/crmtest/helper.sh
 chmod -x $RPM_BUILD_ROOT/%{_libdir}/heartbeat/ocf-shellfuncs
 chmod -x $RPM_BUILD_ROOT/%{_sysconfdir}/ha.d/shellfuncs
 chmod -x $RPM_BUILD_ROOT/%{_libdir}/heartbeat/pymgmt.py
@@ -191,6 +190,7 @@
 %{_libdir}/libcib.so.*
 %{_libdir}/libclm.so.*
 %{_libdir}/libcrmcommon.so.*
+%{_libdir}/libtransitioner.so.*
 %{_libdir}/libhbclient.so.*
 %{_libdir}/liblrm.so.*
 %{_libdir}/libpengine.so.*
@@ -223,9 +223,13 @@
 %{_sbindir}/crm_attribute
 %{_sbindir}/crm_resource
 %{_sbindir}/crm_verify
+%{_sbindir}/attrd_updater
+%{_sbindir}/crm_failcount
+%{_sbindir}/crm_primitive.*
 %dir %attr (755, hacluster, haclient) %{_var}/run/heartbeat/ccm
 %dir %attr (755, hacluster, haclient) %{_var}/run/heartbeat/crm
 %dir %attr (755, hacluster, haclient) %{_var}/lib/heartbeat/crm
+%dir %attr (755, hacluster, haclient) %{_var}/lib/heartbeat/pengine
 %{_mandir}/man1/cl_status.1*
 %{_mandir}/man1/ha_logger.1*
 %{_mandir}/man1/hb_standby.1*
@@ -244,7 +248,7 @@
 %{_libdir}/libhbmgmtcommon.so.*
 %{_libdir}/libhbmgmttls.so.*
 %config(noreplace) %{_sysconfdir}/pam.d/hbmgmtd
-%{_datadir}/locale/zh_CN/LC_MESSAGES/haclient.zh_CN.mo
+%{_datadir}/locale/zh_CN/LC_MESSAGES/haclient.mo
 %endif
 
 %files -n ldirectord
@@ -276,6 +280,8 @@
 %doc doc/COPYING 
 %doc doc/README
 %defattr(-,root,root)
+/usr/include/pils
+%{_libdir}/libpils.*
 %{_libdir}/pils/
 
 %files devel
@@ -290,6 +296,49 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Apr 27 2006  Joost Soeterbroek <fedora at soeterbroek.com> - 2.0.5-1
+- upstream version 2.0.5
+- removed patch2 - ownership of /heartbeat/crm/cib.xml is no longer
+  set in cts/CM_LinuxHAv2.py.in
+  + Version 2.0.5 - significant bug fixes and a few feature deficits fixed
+  + various portability fixes
+  + enable GUI to run with pygtk 2.4
+  + significant GUI improvements and speedups
+  + numerous logging improvements (generally much quieter)
+  + speed up CIB processing by writing it to disk asynchronously
+  + add CIB on-disk checksums
+  + removed dependency on openssl
+  + added "failure stickiness" to the CIB/CRM
+  + Several fixes to the membership code
+  + We now log all output from resource agents
+  + fixed STONITHd memory leaks.
+  + Added an OCF RA for Xen guests
+  + Added email alerts to ldirectord
+  + Improvements to the haresources2cib upgrade tool
+  + Several fixes to cibadmin
+  + Fix some autoadd-related bugs
+  + Added Chinese support to the GUI
+  + Added a daemon to replace and generalize ipfail
+    + Limited testing only
+  + Significant improvements to CIM model, including modifying things
+  + Extensive Master/slave testing and fixes
+  + Use a digest of the parameters used in an action (smaller CIB)
+  + Improved detection of "old" events that should be ignored by the PE
+    (ensures resource monitoring is active when required)
+  + Better detection of required and/or optimal behaviour in mixed
+    (and formerly mixed) clusters
+  + LRM now supports multiple concurrent monitor operations
+  + Optional startup & runtime enforcement of DTD validation
+    (Invalid changes are rejected)
+  + cibadmin tool overhauled and verified to function correctly
+  + Some deprecated CIB features now unsupported
+    + Placing nvpair objects in crm_config (must now use
+      cluster_property_set)
+    + on_stopfail removed in favor of setting on_fail in the resource's
+      stop operation
+    + start_prereq removed in favor of setting prereq in the resource's
+      start operation 
+
 * Wed Mar 29 2006  Joost Soeterbroek <fedora at soeterbroek.com> - 2.0.4-2
 - Version 2.0.4
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/heartbeat/FC-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	30 Mar 2006 17:42:04 -0000	1.3
+++ sources	30 Apr 2006 09:28:00 -0000	1.4
@@ -1 +1 @@
-659aae2365daea3a17e5a4a4ae0b0a3e  heartbeat-2.0.4.tar.gz
+209228b2948cfa4762a3a66454c6cc35  heartbeat-2.0.5.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 30 09:35:03 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun, 30 Apr 2006 02:35:03 -0700
Subject: rpms/heartbeat/FC-4 heartbeat-2.0.3-fedora-ccmuser.patch, 1.1,
	NONE heartbeat-2.0.3-fedora-chkconfig.patch, 1.1,
	NONE heartbeat-2.0.3-fedora-pam.patch, 1.1, NONE
Message-ID: <200604300935.k3U9Z5D0023154@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/heartbeat/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23126/FC-4

Removed Files:
	heartbeat-2.0.3-fedora-ccmuser.patch 
	heartbeat-2.0.3-fedora-chkconfig.patch 
	heartbeat-2.0.3-fedora-pam.patch 
Log Message:
removed patches with upstream version in filename in favor of patches that have non-versioned filenames..


--- heartbeat-2.0.3-fedora-ccmuser.patch DELETED ---


--- heartbeat-2.0.3-fedora-chkconfig.patch DELETED ---


--- heartbeat-2.0.3-fedora-pam.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Apr 30 09:35:04 2006
From: fedora-extras-commits at redhat.com (Joost Soeterbroek (jsoeterb))
Date: Sun, 30 Apr 2006 02:35:04 -0700
Subject: rpms/heartbeat/FC-5 heartbeat-2.0.3-fedora-ccmuser.patch, 1.1,
	NONE heartbeat-2.0.3-fedora-chkconfig.patch, 1.1,
	NONE heartbeat-2.0.3-fedora-pam.patch, 1.1, NONE
Message-ID: <200604300935.k3U9Z6Z1023157@cvs-int.fedora.redhat.com>

Author: jsoeterb

Update of /cvs/extras/rpms/heartbeat/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23126/FC-5

Removed Files:
	heartbeat-2.0.3-fedora-ccmuser.patch 
	heartbeat-2.0.3-fedora-chkconfig.patch 
	heartbeat-2.0.3-fedora-pam.patch 
Log Message:
removed patches with upstream version in filename in favor of patches that have non-versioned filenames..


--- heartbeat-2.0.3-fedora-ccmuser.patch DELETED ---


--- heartbeat-2.0.3-fedora-chkconfig.patch DELETED ---


--- heartbeat-2.0.3-fedora-pam.patch DELETED ---



From fedora-extras-commits at redhat.com  Sun Apr 30 10:07:15 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 30 Apr 2006 03:07:15 -0700
Subject: rpms/clamav/devel clamav-0.88.2-guys,
	please-read-the-compiler-warnings-before-doing-a-release.patch,
	NONE, 1.1 sources, 1.15, 1.16 clamav.spec, 1.34,
	1.35 clamav-0.88.1-guys,
	please-read-the-compiler-warnings-before-doing-a-release.patch,
	1.1, NONE
Message-ID: <200604301007.k3UA7HSx025469@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25449

Modified Files:
	sources clamav.spec 
Added Files:
	clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch 
Removed Files:
	clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch 
Log Message:
- updated to 0.88.2 (SECURITY)
- rediffed patches; most issues handled by 0.88.1-2 are fixed in
  0.88.2


***** Not enough context to create diffstat for file: clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch,NONE,1.1
***** Not enough context to create diff for file: clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch,NONE,1.1

Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	6 Apr 2006 16:50:58 -0000	1.15
+++ sources	30 Apr 2006 10:07:15 -0000	1.16
@@ -1,2 +1,2 @@
-9fe8c47037051e350077513dd94fb76a  clamav-0.88.1.tar.gz
-bc06324bf070679854689235df5042d8  clamav-0.88.1.tar.gz.sig
+f0a1c610a1fb70bd748a08bea69c736c  clamav-0.88.2.tar.gz
+6846cb50e005c18ab4b39ff9aa7126fc  clamav-0.88.2.tar.gz.sig


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/devel/clamav.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- clamav.spec	24 Apr 2006 22:05:44 -0000	1.34
+++ clamav.spec	30 Apr 2006 10:07:15 -0000	1.35
@@ -21,8 +21,8 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.88.1
-Release:	%release_func 2
+Version:	0.88.2
+Release:	%release_func 1
 
 License:	GPL
 Group:		Applications/File
@@ -36,7 +36,7 @@
 Source6:	clamav-update.logrotate
 Source7:	clamd.SERVICE.init
 Source8:	clamav-notify-servers
-Patch0:		clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch
+Patch0:		clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch
 Patch1:		clamav-0.88.1-strncpy.patch
 Patch20:	clamav-0.70-user.patch
 Patch21:	clamav-0.70-path.patch
@@ -432,6 +432,11 @@
 %endif	# _without_milter
 
 %changelog
+* Sun Apr 30 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88.2-1
+- updated to 0.88.2 (SECURITY)
+- rediffed patches; most issues handled by 0.88.1-2 are fixed in
+  0.88.2
+
 * Mon Apr 24 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88.1-2
 - added patch which fixes some classes of compiler warnings; at least
   the using of implicitly declared functions was reported to cause

***** Not enough context to create diffstat for file: clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch,1.1,NONE
***** Not enough context to create diff for file: clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch,1.1,NONE



From fedora-extras-commits at redhat.com  Sun Apr 30 10:33:39 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 30 Apr 2006 03:33:39 -0700
Subject: rpms/clamav/FC-4 clamav-0.88.2-guys,
	please-read-the-compiler-warnings-before-doing-a-release.patch,
	NONE, 1.1 clamav-0.88.1-strncpy.patch, NONE, 1.1 sources, 1.15,
	1.16 clamav.spec, 1.31, 1.32
Message-ID: <200604301033.k3UAXfIA025684@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25624/FC-4

Modified Files:
	sources clamav.spec 
Added Files:
	clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch 
	clamav-0.88.1-strncpy.patch 
Log Message:
- updated to 0.88.2 (SECURITY)
- added patch which fixes wrong usage of strncpy(3) in unrarlib.c
- added patch which fixes some classes of compiler warnings


***** Not enough context to create diffstat for file: clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch,NONE,1.1
***** Not enough context to create diff for file: clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch,NONE,1.1
clamav-0.88.1-strncpy.patch:

--- NEW FILE clamav-0.88.1-strncpy.patch ---
2006-04-24  Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>

	* libclamav/unrarlib.c/stricomp(): terminate the string copied
	  with strncpy() explicitly with '\0'. Does not seem to be
	  exploitable at the moment due to deeply buried constraints
	  (function will be called for buffers with a static size of
	  260 only).

	  But it is better to fix it now than to run into problems
	  when function is used for other purposes.

--- clamav-0.88.1/libclamav/unrarlib.c.strncpy	2005-06-23 22:03:12.000000000 +0200
+++ clamav-0.88.1/libclamav/unrarlib.c	2006-04-24 23:10:07.000000000 +0200
@@ -1180,8 +1180,10 @@ int stricomp(char *Str1,char *Str2)
   char S1[512],S2[512];
   char *chptr;
 
-  strncpy(S1,Str1,sizeof(S1));
-  strncpy(S2,Str2,sizeof(S2));
+  strncpy(S1,Str1,sizeof(S1));
+  strncpy(S2,Str2,sizeof(S2));
+  S1[sizeof(S1)-1] = '\0';
+  S2[sizeof(S2)-1] = '\0';
 
   while((chptr = strchr(S1, '\\')) != NULL) /* ignore backslash             */
   {
2006-04-24  Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>

	* libclamav/unrarlib.c/stricomp(): terminate the string copied
	  with strncpy() explicitly with '\0'. Does not seem to be
	  exploitable at the moment due to deeply buried constraints
	  (function will be called for buffers with a static size of
	  260 only).

	  But it is better to fix it now than to run into problems
	  when function is used for other purposes.

--- clamav-0.88.1/libclamav/unrarlib.c.strncpy	2005-06-23 22:03:12.000000000 +0200
+++ clamav-0.88.1/libclamav/unrarlib.c	2006-04-24 23:10:07.000000000 +0200
@@ -1180,8 +1180,10 @@ int stricomp(char *Str1,char *Str2)
   char S1[512],S2[512];
   char *chptr;
 
-  strncpy(S1,Str1,sizeof(S1));
-  strncpy(S2,Str2,sizeof(S2));
+  strncpy(S1,Str1,sizeof(S1));
+  strncpy(S2,Str2,sizeof(S2));
+  S1[sizeof(S1)-1] = '\0';
+  S2[sizeof(S2)-1] = '\0';
 
   while((chptr = strchr(S1, '\\')) != NULL) /* ignore backslash             */
   {


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-4/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	6 Apr 2006 16:50:59 -0000	1.15
+++ sources	30 Apr 2006 10:33:39 -0000	1.16
@@ -1,2 +1,2 @@
-9fe8c47037051e350077513dd94fb76a  clamav-0.88.1.tar.gz
-bc06324bf070679854689235df5042d8  clamav-0.88.1.tar.gz.sig
+f0a1c610a1fb70bd748a08bea69c736c  clamav-0.88.2.tar.gz
+6846cb50e005c18ab4b39ff9aa7126fc  clamav-0.88.2.tar.gz.sig


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-4/clamav.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- clamav.spec	6 Apr 2006 16:50:59 -0000	1.31
+++ clamav.spec	30 Apr 2006 10:33:39 -0000	1.32
@@ -21,7 +21,7 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.88.1
+Version:	0.88.2
 Release:	%release_func 1
 
 License:	GPL
@@ -36,6 +36,8 @@
 Source6:	clamav-update.logrotate
 Source7:	clamd.SERVICE.init
 Source8:	clamav-notify-servers
+Patch0:		clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch
+Patch1:		clamav-0.88.1-strncpy.patch
 Patch20:	clamav-0.70-user.patch
 Patch21:	clamav-0.70-path.patch
 Patch22:	clamav-0.80-initoff.patch
@@ -162,6 +164,9 @@
 
 %prep
 %setup -q
+%patch0  -p1 -b '.guys,please-read-the-compiler-warnings-before-doing-a-release.patch'
+%patch1  -p1 -b .strncpy
+
 %patch20 -p1 -b .user
 %patch21 -p1 -b .path
 %patch22 -p1 -b .initoff
@@ -186,6 +191,7 @@
 ## See https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 and
 ## http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0797
 ## also
+CFLAGS="$RPM_OPT_FLAGS -Wall -W -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99"
 %configure --disable-clamav --with-dbdir=/var/lib/clamav \
            --disable-zlib-vcheck \
 	   %{!?_without_milter:--enable-milter}
@@ -426,6 +432,11 @@
 %endif	# _without_milter
 
 %changelog
+* Sun Apr 30 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88.2-1
+- updated to 0.88.2 (SECURITY)
+- added patch which fixes wrong usage of strncpy(3) in unrarlib.c
+- added patch which fixes some classes of compiler warnings
+
 * Thu Apr 06 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88.1-1
 - updated to 0.88.1 (SECURITY)
 



From fedora-extras-commits at redhat.com  Sun Apr 30 10:33:40 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 30 Apr 2006 03:33:40 -0700
Subject: rpms/clamav/FC-3 clamav-0.88.2-guys,
	please-read-the-compiler-warnings-before-doing-a-release.patch,
	NONE, 1.1 clamav-0.88.1-strncpy.patch, NONE, 1.1 sources, 1.13,
	1.14 clamav.spec, 1.21, 1.22
Message-ID: <200604301033.k3UAXgZi025691@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25624/FC-3

Modified Files:
	sources clamav.spec 
Added Files:
	clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch 
	clamav-0.88.1-strncpy.patch 
Log Message:
- updated to 0.88.2 (SECURITY)
- added patch which fixes wrong usage of strncpy(3) in unrarlib.c
- added patch which fixes some classes of compiler warnings


***** Not enough context to create diffstat for file: clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch,NONE,1.1
***** Not enough context to create diff for file: clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch,NONE,1.1
clamav-0.88.1-strncpy.patch:

--- NEW FILE clamav-0.88.1-strncpy.patch ---
2006-04-24  Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>

	* libclamav/unrarlib.c/stricomp(): terminate the string copied
	  with strncpy() explicitly with '\0'. Does not seem to be
	  exploitable at the moment due to deeply buried constraints
	  (function will be called for buffers with a static size of
	  260 only).

	  But it is better to fix it now than to run into problems
	  when function is used for other purposes.

--- clamav-0.88.1/libclamav/unrarlib.c.strncpy	2005-06-23 22:03:12.000000000 +0200
+++ clamav-0.88.1/libclamav/unrarlib.c	2006-04-24 23:10:07.000000000 +0200
@@ -1180,8 +1180,10 @@ int stricomp(char *Str1,char *Str2)
   char S1[512],S2[512];
   char *chptr;
 
-  strncpy(S1,Str1,sizeof(S1));
-  strncpy(S2,Str2,sizeof(S2));
+  strncpy(S1,Str1,sizeof(S1));
+  strncpy(S2,Str2,sizeof(S2));
+  S1[sizeof(S1)-1] = '\0';
+  S2[sizeof(S2)-1] = '\0';
 
   while((chptr = strchr(S1, '\\')) != NULL) /* ignore backslash             */
   {
2006-04-24  Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>

	* libclamav/unrarlib.c/stricomp(): terminate the string copied
	  with strncpy() explicitly with '\0'. Does not seem to be
	  exploitable at the moment due to deeply buried constraints
	  (function will be called for buffers with a static size of
	  260 only).

	  But it is better to fix it now than to run into problems
	  when function is used for other purposes.

--- clamav-0.88.1/libclamav/unrarlib.c.strncpy	2005-06-23 22:03:12.000000000 +0200
+++ clamav-0.88.1/libclamav/unrarlib.c	2006-04-24 23:10:07.000000000 +0200
@@ -1180,8 +1180,10 @@ int stricomp(char *Str1,char *Str2)
   char S1[512],S2[512];
   char *chptr;
 
-  strncpy(S1,Str1,sizeof(S1));
-  strncpy(S2,Str2,sizeof(S2));
+  strncpy(S1,Str1,sizeof(S1));
+  strncpy(S2,Str2,sizeof(S2));
+  S1[sizeof(S1)-1] = '\0';
+  S2[sizeof(S2)-1] = '\0';
 
   while((chptr = strchr(S1, '\\')) != NULL) /* ignore backslash             */
   {


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-3/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- sources	9 Apr 2006 22:10:45 -0000	1.13
+++ sources	30 Apr 2006 10:33:39 -0000	1.14
@@ -1,2 +1,2 @@
-9fe8c47037051e350077513dd94fb76a  clamav-0.88.1.tar.gz
-bc06324bf070679854689235df5042d8  clamav-0.88.1.tar.gz.sig
+f0a1c610a1fb70bd748a08bea69c736c  clamav-0.88.2.tar.gz
+6846cb50e005c18ab4b39ff9aa7126fc  clamav-0.88.2.tar.gz.sig


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-3/clamav.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- clamav.spec	9 Apr 2006 22:10:45 -0000	1.21
+++ clamav.spec	30 Apr 2006 10:33:39 -0000	1.22
@@ -21,7 +21,7 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.88.1
+Version:	0.88.2
 Release:	%release_func 1
 
 License:	GPL
@@ -36,6 +36,8 @@
 Source6:	clamav-update.logrotate
 Source7:	clamd.SERVICE.init
 Source8:	clamav-notify-servers
+Patch0:		clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch
+Patch1:		clamav-0.88.1-strncpy.patch
 Patch20:	clamav-0.70-user.patch
 Patch21:	clamav-0.70-path.patch
 Patch22:	clamav-0.80-initoff.patch
@@ -162,6 +164,9 @@
 
 %prep
 %setup -q
+%patch0  -p1 -b '.guys,please-read-the-compiler-warnings-before-doing-a-release.patch'
+%patch1  -p1 -b .strncpy
+
 %patch20 -p1 -b .user
 %patch21 -p1 -b .path
 %patch22 -p1 -b .initoff
@@ -186,6 +191,7 @@
 ## See https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 and
 ## http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0797
 ## also
+CFLAGS="$RPM_OPT_FLAGS -Wall -W -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99"
 %configure --disable-clamav --with-dbdir=/var/lib/clamav \
            --disable-zlib-vcheck \
 	   %{!?_without_milter:--enable-milter}
@@ -426,6 +432,11 @@
 %endif	# _without_milter
 
 %changelog
+* Sun Apr 30 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88.2-1
+- updated to 0.88.2 (SECURITY)
+- added patch which fixes wrong usage of strncpy(3) in unrarlib.c
+- added patch which fixes some classes of compiler warnings
+
 * Mon Apr 10 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88.1-1
 - updated to 0.88.1 (SECURITY)
 



From fedora-extras-commits at redhat.com  Sun Apr 30 10:33:38 2006
From: fedora-extras-commits at redhat.com (Enrico Scholz (ensc))
Date: Sun, 30 Apr 2006 03:33:38 -0700
Subject: rpms/clamav/FC-5 clamav-0.88.1-strncpy.patch, NONE,
	1.1 clamav-0.88.1-guys,
	please-read-the-compiler-warnings-before-doing-a-release.patch,
	NONE, 1.1 sources, 1.15, 1.16 clamav.spec, 1.33, 1.34
Message-ID: <200604301034.k3UAYALr025699@cvs-int.fedora.redhat.com>

Author: ensc

Update of /cvs/extras/rpms/clamav/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25624/FC-5

Modified Files:
	sources clamav.spec 
Added Files:
	clamav-0.88.1-strncpy.patch 
	clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch 
Log Message:
- updated to 0.88.2 (SECURITY)
- added patch which fixes wrong usage of strncpy(3) in unrarlib.c
- added patch which fixes some classes of compiler warnings


clamav-0.88.1-strncpy.patch:

--- NEW FILE clamav-0.88.1-strncpy.patch ---
2006-04-24  Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>

	* libclamav/unrarlib.c/stricomp(): terminate the string copied
	  with strncpy() explicitly with '\0'. Does not seem to be
	  exploitable at the moment due to deeply buried constraints
	  (function will be called for buffers with a static size of
	  260 only).

	  But it is better to fix it now than to run into problems
	  when function is used for other purposes.

--- clamav-0.88.1/libclamav/unrarlib.c.strncpy	2005-06-23 22:03:12.000000000 +0200
+++ clamav-0.88.1/libclamav/unrarlib.c	2006-04-24 23:10:07.000000000 +0200
@@ -1180,8 +1180,10 @@ int stricomp(char *Str1,char *Str2)
   char S1[512],S2[512];
   char *chptr;
 
-  strncpy(S1,Str1,sizeof(S1));
-  strncpy(S2,Str2,sizeof(S2));
+  strncpy(S1,Str1,sizeof(S1));
+  strncpy(S2,Str2,sizeof(S2));
+  S1[sizeof(S1)-1] = '\0';
+  S2[sizeof(S2)-1] = '\0';
 
   while((chptr = strchr(S1, '\\')) != NULL) /* ignore backslash             */
   {
2006-04-24  Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>

	* libclamav/unrarlib.c/stricomp(): terminate the string copied
	  with strncpy() explicitly with '\0'. Does not seem to be
	  exploitable at the moment due to deeply buried constraints
	  (function will be called for buffers with a static size of
	  260 only).

	  But it is better to fix it now than to run into problems
	  when function is used for other purposes.

--- clamav-0.88.1/libclamav/unrarlib.c.strncpy	2005-06-23 22:03:12.000000000 +0200
+++ clamav-0.88.1/libclamav/unrarlib.c	2006-04-24 23:10:07.000000000 +0200
@@ -1180,8 +1180,10 @@ int stricomp(char *Str1,char *Str2)
   char S1[512],S2[512];
   char *chptr;
 
-  strncpy(S1,Str1,sizeof(S1));
-  strncpy(S2,Str2,sizeof(S2));
+  strncpy(S1,Str1,sizeof(S1));
+  strncpy(S2,Str2,sizeof(S2));
+  S1[sizeof(S1)-1] = '\0';
+  S2[sizeof(S2)-1] = '\0';
 
   while((chptr = strchr(S1, '\\')) != NULL) /* ignore backslash             */
   {

***** Not enough context to create diffstat for file: clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch,NONE,1.1
***** Not enough context to create diff for file: clamav-0.88.1-guys,please-read-the-compiler-warnings-before-doing-a-release.patch,NONE,1.1

Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-5/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	6 Apr 2006 16:50:58 -0000	1.15
+++ sources	30 Apr 2006 10:33:38 -0000	1.16
@@ -1,2 +1,2 @@
-9fe8c47037051e350077513dd94fb76a  clamav-0.88.1.tar.gz
-bc06324bf070679854689235df5042d8  clamav-0.88.1.tar.gz.sig
+f0a1c610a1fb70bd748a08bea69c736c  clamav-0.88.2.tar.gz
+6846cb50e005c18ab4b39ff9aa7126fc  clamav-0.88.2.tar.gz.sig


Index: clamav.spec
===================================================================
RCS file: /cvs/extras/rpms/clamav/FC-5/clamav.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- clamav.spec	6 Apr 2006 16:50:58 -0000	1.33
+++ clamav.spec	30 Apr 2006 10:33:38 -0000	1.34
@@ -21,7 +21,7 @@
 
 Summary:	End-user tools for the Clam Antivirus scanner
 Name:		clamav
-Version:	0.88.1
+Version:	0.88.2
 Release:	%release_func 1
 
 License:	GPL
@@ -36,6 +36,8 @@
 Source6:	clamav-update.logrotate
 Source7:	clamd.SERVICE.init
 Source8:	clamav-notify-servers
+Patch0:		clamav-0.88.2-guys,please-read-the-compiler-warnings-before-doing-a-release.patch
+Patch1:		clamav-0.88.1-strncpy.patch
 Patch20:	clamav-0.70-user.patch
 Patch21:	clamav-0.70-path.patch
 Patch22:	clamav-0.80-initoff.patch
@@ -162,6 +164,9 @@
 
 %prep
 %setup -q
+%patch0  -p1 -b '.guys,please-read-the-compiler-warnings-before-doing-a-release.patch'
+%patch1  -p1 -b .strncpy
+
 %patch20 -p1 -b .user
 %patch21 -p1 -b .path
 %patch22 -p1 -b .initoff
@@ -186,6 +191,7 @@
 ## See https://bugzilla.redhat.com/beta/show_bug.cgi?id=131385 and
 ## http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=CAN-2004-0797
 ## also
+CFLAGS="$RPM_OPT_FLAGS -Wall -W -W -Wmissing-prototypes -Wmissing-declarations -std=gnu99"
 %configure --disable-clamav --with-dbdir=/var/lib/clamav \
            --disable-zlib-vcheck \
 	   %{!?_without_milter:--enable-milter}
@@ -426,6 +432,11 @@
 %endif	# _without_milter
 
 %changelog
+* Sun Apr 30 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88.2-1
+- updated to 0.88.2 (SECURITY)
+- added patch which fixes wrong usage of strncpy(3) in unrarlib.c
+- added patch which fixes some classes of compiler warnings
+
 * Thu Apr 06 2006 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de> - 0.88.1-1
 - updated to 0.88.1 (SECURITY)
 



From fedora-extras-commits at redhat.com  Sun Apr 30 11:10:50 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 30 Apr 2006 04:10:50 -0700
Subject: extras-repoclosure - New directory
Message-ID: <200604301110.k3UBAosj032142@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32123/extras-repoclosure

Log Message:
Directory /cvs/fedora/extras-repoclosure added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 30 11:11:54 2006
From: fedora-extras-commits at redhat.com (Michael Schwendt (mschwendt))
Date: Sun, 30 Apr 2006 04:11:54 -0700
Subject: extras-repoclosure rc-modified, NONE, 1.1 rc-report.py, NONE,
	1.1 rc-run.py, NONE, 1.1 repoclosure.patch, NONE,
	1.1 yum.repoclosure.conf, NONE, 1.1
Message-ID: <200604301111.k3UBBsif032281@cvs-int.fedora.redhat.com>

Author: mschwendt

Update of /cvs/fedora/extras-repoclosure
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32253

Added Files:
	rc-modified rc-report.py rc-run.py repoclosure.patch 
	yum.repoclosure.conf 
Log Message:
initial import


--- NEW FILE rc-modified ---
#!/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.
# seth vidal 2005 (c) etc etc


#Read in the metadata of a series of repositories and check all the
#   dependencies in all packages for resolution. Print out the list of
#   packages with unresolved dependencies

import sys
import os

import yum
import yum.Errors
from yum.misc import getCacheDir
from optparse import OptionParser
import rpmUtils.arch
from yum.constants import *
from repomd.packageSack import ListPackageSack


def parseArgs():
    usage = "usage: %s [-c <config file>] [-a <arch>] [-r <repoid>] [-r <repoid2>]" % sys.argv[0]
    parser = OptionParser(usage=usage)
    parser.add_option("-c", "--config", default='/etc/yum.conf',
        help='config file to use (defaults to /etc/yum.conf)')
    parser.add_option("-a", "--arch", default=None,
        help='check as if running the specified arch (default: current arch)')
    parser.add_option("-r", "--repoid", default=[], action='append',
        help="specify repo ids to query, can be specified multiple times (default is all enabled)")
    parser.add_option("-t", "--tempcache", default=False, action="store_true", 
        help="Use a temp dir for storing/accessing yum-cache")
    parser.add_option("-q", "--quiet", default=0, action="store_true", 
                      help="quiet (no output to stderr)")
    parser.add_option("-n", "--newest", default=0, action="store_true",
                      help="check only the newest packages in the repos")
    (opts, args) = parser.parse_args()
    return (opts, args)

class RepoClosure(yum.YumBase):
    def __init__(self, arch = None, config = "/etc/yum.conf"):
        yum.YumBase.__init__(self)

        self.arch = arch
        self.doConfigSetup(fn = config)
        if hasattr(self.repos, 'sqlite'):
            self.repos.sqlite = False
            self.repos._selectSackType()
    
    def evrTupletoVer(self,tuple):
        """convert and evr tuple to a version string, return None if nothing
        to convert"""
    
        e, v,r = tuple

        if v is None:
            return None
    
        val = ''
        if e is not None:
            val = '%s:%s' % (e, v)
    
        if r is not None:
            val = '%s-%s' % (val, r)
    
        return val
    
    def readMetadata(self):
        self.doRepoSetup()
        self.doSackSetup(rpmUtils.arch.getArchList(self.arch))
        for repo in self.repos.listEnabled():
            self.repos.populateSack(which=[repo.id], with='filelists')

    def getBrokenDeps(self, newest=False):
        unresolved = {}
        resolved = {}
        if newest:
            pkgs = []
            for l in self.pkgSack.returnNewestByName():
                for p in l:
                    pkgs.append(p)
        else:
            pkgs = self.pkgSack

        mypkgSack = ListPackageSack(pkgs)
        pkgtuplist = mypkgSack.simplePkgList()
        
        for pkg in pkgs:
            for (req, flags, (reqe, reqv, reqr)) in pkg.returnPrco('requires'):
                if req.startswith('rpmlib'): continue # ignore rpmlib deps
            
                ver = self.evrTupletoVer((reqe, reqv, reqr))
                if resolved.has_key((req,flags,ver)):
                    continue
                try:
                    resolve_sack = self.whatProvides(req, flags, ver)
                except yum.Errors.RepoError, e:
                    pass
            
                if len(resolve_sack) < 1:
                    if not unresolved.has_key(pkg):
                        unresolved[pkg] = []
                    unresolved[pkg].append((req, flags, ver))
                    continue
                    
                if newest:
                    resolved_by_newest = False
                    for po in resolve_sack:# look through and make sure all our answers are newest-only
                        if po.pkgtup in pkgtuplist:
                            resolved_by_newest = True
                            break

                    if resolved_by_newest:                    
                        resolved[(req,flags,ver)] = 1
                    else:
                        if not unresolved.has_key(pkg):
                            unresolved[pkg] = []
                        unresolved[pkg].append((req, flags, ver))                        
                        
        return unresolved
    
    
    def log(self, value, msg):
        pass

def main():
    (opts, cruft) = parseArgs()
    my = RepoClosure(arch = opts.arch, config = opts.config)
    
    if opts.repoid:
        for repo in my.repos.repos.values():
            if repo.id not in opts.repoid:
                repo.disable()
            else:
                repo.enable()

    if os.geteuid() != 0 or opts.tempcache:
        cachedir = getCacheDir()
        if cachedir is None:
            print "Error: Could not make cachedir, exiting"
            sys.exit(50)
            
        my.repos.setCacheDir(cachedir)

    if not opts.quiet:
        print 'Reading in repository metadata - please wait....'

    try:
        my.readMetadata()
    except yum.Errors.RepoError, e:
        print 'Filelists not available for repo: %s' % repo
        print 'Some dependencies may not be complete for this repository'
        print 'Run as root to get all dependencies or use -t to enable a user temp cache'

    if not opts.quiet:
        print 'Checking Dependencies'

    baddeps = my.getBrokenDeps(opts.newest)
    if opts.newest:
        pkgs = []
        for l in my.pkgSack.returnNewestByName():
            for p in l:
                pkgs.append(p)
        num = len(pkgs)
    else:
        num = len(my.pkgSack)
        
    repos = my.repos.listEnabled()

    if not opts.quiet:
        print 'Repos looked at: %s' % len(repos)
        for repo in repos:
            print '   %s' % repo
        print 'Num Packages in Repos: %s' % num
    
    pkgs = baddeps.keys()
    pkgs.sort()
    for pkg in pkgs:
        srcrpm = pkg.returnSimple('sourcerpm')
        print 'source rpm: %s\npackage: %s from %s\n  unresolved deps: ' % (srcrpm, pkg, pkg.repoid)
        for (n, f, v) in baddeps[pkg]:
            req = '%s' % n
            if f: 
                flag = LETTERFLAGS[f]
                req = '%s %s'% (req, flag)
            if v:
                req = '%s %s' % (req, v)
            
            print '     %s' % req
        print

if __name__ == "__main__":
    main()
        


--- NEW FILE rc-report.py ---
#!/usr/bin/python
# -*- mode: Python; indent-tabs-mode: nil; -*-

import commands
import datetime, time
import os, sys
import re
import smtplib

domail = 1
mailsummary = 1
savehistory = 1
usehistory = True

maxmailsize = 39*1024

fromaddr = 'Fedora Extras repoclosure <buildsys at fedoraproject.org>'
replytoaddr = 'fedora-extras-list at redhat.com'
subject = 'Broken dependencies in Fedora Extras'

mailserver = 'localhost'
mailuser = ''
mailpasswd = ''

# Don't repeat a report for a src.rpm for 14 days.
waitdelta = datetime.timedelta( days = 14 )
today = datetime.date.today()


# Interface to Fedora Extras CVS owners/owners.list
class OwnersList:
    
    owners = {}  # map package name to email address, owners[name]

    def Download(self):
        # Remove 'owners' directory.
        for root, dirs, files in os.walk( 'owners', topdown=False ):
            for fname in files:
                os.remove(os.path.join( root, fname ))
            for dname in dirs:
                os.rmdir(os.path.join( root, dname ))
        # Retry CVS checkout a few times.
        for count in range(3):
            (rc, rv) = commands.getstatusoutput('LC_ALL=C CVS_RSH=rsh CVSROOT=:pserver:anonymous at cvs.fedora.redhat.com:/cvs/extras cvs co owners')
            if not rc:
                break
            time.sleep(300)
        if rc:
            print rv
            sys.exit(1)

    def Refresh(self):
        self.ownersfile = 'owners/owners.list'
        self.owners = {}
        # Dumb caching. Check that file exists and is "quite recent".
        try:
            fstats = os.stat(self.ownersfile)
            if ( not fstats.st_size or ((time.time() - fstats.st_ctime) > 3600*2) ):
                raise Exception
        except:
            self.Download()
        try:
            f = file( self.ownersfile )
        except:
            print 'ERROR: could not open %s' % self.ownersfile
            sys.exit(5)
        for line in f:
            if line.startswith('#') or line.isspace():
                continue
            try:
                (repo,pkgname,summary,email,qacontact,cc) = line.split('|')
                if email.find('@') < 0:  # owners.list is broken
                    raise Exception
                self.owners[pkgname] = email
                #print '%s -> %s' % (pkgname, self.owners[pkgname])
            except:
                print 'ERROR: owners.list is broken'
                print line
        f.close()

    def GetOwner(self,name):
        try:
            r = self.owners[name]
        except KeyError:
            r = ''
        return r
        
    def __init__(self):
        self.Refresh()



# We identify broken packages based on their src.rpm name and don't report
# them more than once until expiration.
class History:

    history = {}
    incoming = {}

    def __init__(self): # Load history map file and expire its contents.
        try:
            f = file ('history.txt')
            for line in f:
                (srcrpm,timestamp) = line.rstrip().split(' ')
                (y,m,d) = timestamp.split('-')
                timestamp = datetime.date( int(y), int(m), int(d) )
                if ( timestamp+waitdelta > today ):   # Filter out entries which are too old.
                    self.history[srcrpm] = timestamp
            f.close()
        except IOError:
            print 'WARNING: could not open history file for reading'
        except:
            pass

    def Save(self):
        for srcrpm,timestamp in self.incoming.iteritems():
            self.Set(srcrpm,timestamp)
        try:
            f = file ('history.txt','w')
            for srcrpm,timestamp in self.history.iteritems():
                f.write(  ('%s %s\n' % (srcrpm,timestamp)) )
            f.close()
        except:
            print 'WARNING: could not open history file for writing'

    def Set(self,srcrpmname,timestamp):
        self.history[srcrpmname] = timestamp

    def SetDelayed(self,srcrpmname,timestamp):
        self.incoming[srcrpmname] = timestamp

    def Get(self,srcrpmname):
        try:
            r = self.history[srcrpmname]
        except KeyError:
            r = 0
        return r



def mail(smtp, fromaddr, toaddrs, replytoaddr, subject, body):
    from email.Header import Header
    from email.MIMEText import MIMEText
    msg = MIMEText( body, 'plain' )
    from email.Utils import make_msgid
    msg['Message-Id'] = make_msgid()
    msg['Subject'] = Header(subject)
    msg['From'] = Header(fromaddr)
    from email.Utils import formatdate
    msg['Date'] = formatdate()
    if len(replytoaddr):
        msg['ReplyTo'] = Header(replytoaddr)

    if isinstance(toaddrs, basestring):
        toaddrs = [toaddrs]
    to = ''
    for t in toaddrs:
        if len(to):
            to += ', '
        to += t
    msg['To'] = Header(to)

    try:
        r = smtp.sendmail( fromaddr, toaddrs, msg.as_string(False) )
        for (name, errormsg) in r.iteritems():
            print name, ':', errormsg
    except smtplib.SMTPRecipientsRefused, obj:
        print 'ERROR: SMTPRecipientsRefused'
        for (addr, errormsg) in obj.recipients.iteritems():
            print addr, ':', errormsg
    except smtplib.SMTPException:
        print 'ERROR: SMTPException'



def mailsplit(smtp, fromaddr, toaddrs, replytoaddr, subject, body):
    # NB: crude implementation - could also split at line positions
    parts = 0
    start = 0
    end = len(body)
    slices = []
    while ( start < end ):
        if ( (end-start) > maxmailsize ):
            nextstart = body.rfind( 'package: ', start, start+maxmailsize )
            if ( nextstart < 0 ):
                nextstart = body.rfind( '\n', start, start+maxmailsize )
                if ( nextstart < 0 ):
                    print 'ERROR: cannot split mail body cleanly'
                    nextstart = end
        else:
            nextstart = end
        slices.append( (start, nextstart) )
        start = nextstart
        parts += 1

    curpart = 1
    for (start,end) in slices:
        if (parts>1):
            subjectmodified = ( '(%d/%d) %s' % (curpart, parts, subject) )
        else:
            subjectmodified = subject
        slicedbody = body[start:end]
        mail(smtp,fromaddr,toaddrs,replytoaddr,subjectmodified,slicedbody)
        curpart += 1



if len(sys.argv) != 3:
    print 'SYNTAX: %s <release> <logfile>' % sys.argv[0]
    sys.exit(22)
release = sys.argv[1]
logfilename = sys.argv[2]

# This is ugly to get the report date from the report file name.
datere = re.compile('-(?P<timestamp>[0-9]+-[0-9]+-[0-9]+).txt$')
res = datere.search(logfilename)
if res:
    datestring = res.group('timestamp')
else:
    datestring = today

subject += (' %s - %s' % (release,datestring))
summail = ''

owners = OwnersList()
history = History()
report = {}  # Map, report[email], mail message body to be sent to somebody.
summary = []  # list of "package version.arch" lines
oldproblems = []
repoids = {}  # affected repository ids

pkgre = re.compile('(?P<name>.*)-[^-]+-[^-]+$')
inbody = False
srcrpm = ''
ownedby = ''
createreport = False
try:
    f = file( logfilename )
except:
    print 'ERROR: could not open input file'
    sys.exit(5)

for line in f:
    if line.startswith('source rpm: '):
        w = line.rstrip().split(' ')
        if ( len(w) >= 3 ):
            srcrpm = w[2]
            inbody = True
            createreport = not (usehistory and history.Get(srcrpm))
            if not history.Get(srcrpm):
                history.SetDelayed(srcrpm,today)
        else:
            inbody = False
        continue
    elif inbody and line.startswith('package: '):
        w = line.rstrip().split(' ')
        repoid = w[5]
        # Only report broken packages in Fedora Extras.
        if ( repoid.find('extras') < 0 ):
            inbody = False
            continue

        res = pkgre.search(srcrpm) # try to get src.rpm "name"
        if not res: # only true for invalid input
            inbody = False
            continue
        name = res.group('name')
        
        ownedby = owners.GetOwner(name)
        if ownedby == '':
            x = 'ERROR: %s not in owners.list\nERROR: source rpm is %s' % ( name, srcrpm )
            summail += x + '\n'
            inbody = False
            continue
        # name  EVR.arch
        summary.append ( ' '.join( ['\t', w[1], '  ', w[3], repoid] ) )
        repoids[repoid] = 1
    if inbody:
        # Construct report for package owner.
        if createreport:
            try:
                report[ownedby] += line
            except KeyError:
                report[ownedby] = line
        else:
            oldproblems.append(line)

if savehistory:
    history.Save()

summary.sort()
repos = repoids.keys()
repos.sort()
for repoid in repos:
    count = 0
    summail += ('Summary of broken packages in %s:\n' % repoid) + '-'*70+'\n'
    for name in summary:
        p = name.find(repoid)
        if p >= 0:
            summail += name[:p]
            summail += '\n'
            count += 1
    if not count:
        summail += 'None\n'
    summail += '\n'

if domail:
    srv = smtplib.SMTP( mailserver )
    #srv.set_debuglevel(1)
    if ( len(mailuser) and len(mailpasswd) ):
        try:
            srv.login( mailuser, mailpasswd )
        except smtplib.SMTPException:
            print 'ERROR: mailserver login failed'
            sys.exit(-1)

# Send mail to every package owner with broken package dependencies.
for toaddr,body in report.iteritems():
    x = '='*70
    summail += x+'\n'
    x = 'New report for: %s\n\n%s' % ( toaddr.replace('@',' AT '), body)
    summail += x

    mailtext = 'This is an automated mail created by an experimental script.\nYour following packages in the repository contain broken dependencies:\n\n'
    mailtext += body
    if domail:
        mailsplit( srv, fromaddr, toaddr, replytoaddr, subject, mailtext )

if len(oldproblems):
    summail += '\n'+'='*70+'\n'
    for line in oldproblems:
        summail += line
if domail and mailsummary:
    toaddr = replytoaddr  # mail summary to list
    mailsplit( srv, fromaddr, toaddr, '', ('Summary - %s' % subject), summail )

if domail:
    srv.quit()


--- NEW FILE rc-run.py ---
#!/usr/bin/python
# -*- mode: Python; indent-tabs-mode: nil; -*-

# If executed as "rc-run-all.py" it processes all releases.

import fcntl, os, sys
import datetime, time

allreleases = [ '3', '4', '5', 'development' ]

archs = { '3' : ['i386','x86_64'],
          '4' : ['i386','x86_64','ppc'],
          '5' : ['i386','x86_64','ppc'],
          'development' : ['i386','x86_64','ppc']
          }

repos = { '3' : ['fedora-core','fedora-core-updates','fedora-extras'],
          '4' : ['fedora-core','fedora-core-updates','fedora-extras'],
          '5' : ['fedora-core','fedora-core-updates','fedora-extras'],
          'development' : ['fedora-core','fedora-extras']
          }

targetarchs = { 'i386' : 'i686',
                'x86_64' : 'x86_64',
                'ppc' : 'ppc'
                }

def makereport():
    try:
        os.remove(logfilename)
    except:
        pass
    for arch in archs[release]:
        rcargs = ('-a %s ' % targetarchs[arch])
        for r in repos[release]:
            repoid = '%s-%s-%s' % (r,release,arch)
            rcargs += ('-r %s ' % repoid)
        # -n, --newest : yum-utils 0.5
        rc = os.system('./rc-modified -q -n -c ./yum.repoclosure.conf %s >> %s' % (rcargs,logfilename))
        if rc:
            return False
    return True

# Main.

# Delete old log files.
import glob
now = time.time()
for file in glob.glob('./rc-fe*.txt'):
    if ( (now - os.stat(file).st_mtime) > 3600*24*14 ):
        try:
            os.remove(file)
        except:
            pass

today = datetime.date.today()
releases = []

f = open('rc-run.lockfile','w')
try:
    rc = fcntl.flock(f, fcntl.LOCK_EX | fcntl.LOCK_NB)
    f.write( ('%s' % today) )
except IOError:
    print 'ERROR: script locked via lockfile - it seems to be running already'
    sys.exit(11)

if sys.argv[0].endswith('rc-run-all.py'): # process all releases
    for release in allreleases:
        releases.append(release)
else: # process one release given as command-line argument
    if len(sys.argv) != 2:
        print 'SYNTAX: %s <release>' % sys.argv[0]
        sys.exit(22)
    release = sys.argv[1]
    if release not in archs:
        print 'ERROR: release %s is not supported' % release
        sys.exit(22)
    releases = [release]

goodlogs = []
badlogs = []
for release in releases:
    logfilename = ('rc-fe%s-%s.txt' % (release,today))
    rv = False
    for count in range(3):
        rv = makereport()
        if ( rv ):
            goodlogs.append( (release,logfilename) )
            break
        print 'ERROR: running repoclosure for %s failed' % release
        time.sleep(720)
    if ( not rv ):
        badlogs.append( (release,logfilename) )

for (release,logfilename) in goodlogs:
    rc = os.system('./rc-report.py %s %s' % (release,logfilename))

fcntl.flock(f, fcntl.LOCK_UN)
f.close()
sys.exit(0)

repoclosure.patch:

--- NEW FILE repoclosure.patch ---
Against yum-utils-0.5:

--- /usr/bin/repoclosure	2006-02-23 18:06:16.000000000 +0100
+++ rc-modified	2006-04-30 13:02:35.000000000 +0200
@@ -88,7 +88,10 @@
         unresolved = {}
         resolved = {}
         if newest:
-            pkgs = self.pkgSack.returnNewestByNameArch()
+            pkgs = []
+            for l in self.pkgSack.returnNewestByName():
+                for p in l:
+                    pkgs.append(p)
         else:
             pkgs = self.pkgSack
 
@@ -167,7 +170,11 @@
 
     baddeps = my.getBrokenDeps(opts.newest)
     if opts.newest:
-        num = len(my.pkgSack.returnNewestByNameArch())
+        pkgs = []
+        for l in my.pkgSack.returnNewestByName():
+            for p in l:
+                pkgs.append(p)
+        num = len(pkgs)
     else:
         num = len(my.pkgSack)
         
@@ -182,7 +189,8 @@
     pkgs = baddeps.keys()
     pkgs.sort()
     for pkg in pkgs:
-        print 'package: %s from %s\n  unresolved deps: ' % (pkg, pkg.repoid)
+        srcrpm = pkg.returnSimple('sourcerpm')
+        print 'source rpm: %s\npackage: %s from %s\n  unresolved deps: ' % (srcrpm, pkg, pkg.repoid)
         for (n, f, v) in baddeps[pkg]:
             req = '%s' % n
             if f: 
@@ -192,6 +200,7 @@
                 req = '%s %s' % (req, v)
             
             print '     %s' % req
+        print
 
 if __name__ == "__main__":
     main()


--- NEW FILE yum.repoclosure.conf ---
[main]
cachedir=/var/cache/yum
debuglevel=2
logfile=/var/log/yum.log
pkgpolicy=newest
distroverpkg=redhat-release
tolerant=1
exactarch=1
retries=20
obsoletes=1
gpgcheck=1


# ===============================================================
# ATTENTION!
# Fedora Extras repository ids must contain the string 'extras'!
# ===============================================================

# Fedora Extras Development

[fedora-core-development-i386]
name=Fedora Core development i386
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/i386/
enabled=0

[fedora-extras-development-i386]
name=Fedora Extras development i386
baseurl=http://fedoraproject.org/extras/development/i386/
enabled=0


[fedora-core-development-x86_64]
name=Fedora Core development x86_64
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/x86_64/
enabled=0

[fedora-extras-development-x86_64]
name=Fedora Extras development x86_64
baseurl=http://fedoraproject.org/extras/development/x86_64/
enabled=0


[fedora-core-development-ppc]
name=Fedora Core development ppc
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/development/ppc/
enabled=0

[fedora-extras-development-ppc]
name=Fedora Extras development ppc
baseurl=http://fedoraproject.org/extras/development/ppc/
enabled=0


# Fedora Extras 5

[fedora-core-5-i386]
name=Fedora Core 5 i386
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/5/i386/os/
enabled=0

[fedora-core-updates-5-i386]
name=Fedora Core 5 Updates i386
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/5/i386/
enabled=0

[fedora-extras-5-i386]
name=Fedora Extras 5 i386
baseurl=http://fedoraproject.org/extras/5/i386/
enabled=0


[fedora-core-5-x86_64]
name=Fedora Core 5 x86_64
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/5/x86_64/os/
enabled=0

[fedora-core-updates-5-x86_64]
name=Fedora Core 5 Updates x86_64
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/5/x86_64/
enabled=0

[fedora-extras-5-x86_64]
name=Fedora Extras 5 x86_64
baseurl=http://fedoraproject.org/extras/5/x86_64/
enabled=0


[fedora-core-5-ppc]
name=Fedora Core 5 ppc
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/5/ppc/os/
enabled=0

[fedora-core-updates-5-ppc]
name=Fedora Core 5 Updates ppc
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/5/ppc/
enabled=0

[fedora-extras-5-ppc]
name=Fedora Extras 5 ppc
baseurl=http://fedoraproject.org/extras/5/ppc/
enabled=0


## Fedora Extras 4

[fedora-core-4-i386]
name=Fedora Core 4 i386
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/4/i386/os/
enabled=0

[fedora-core-updates-4-i386]
name=Fedora Core 4 Updates i386
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/4/i386/
enabled=0

[fedora-extras-4-i386]
name=Fedora Extras 4 i386
baseurl=http://fedoraproject.org/extras/4/i386/
enabled=0


[fedora-core-4-x86_64]
name=Fedora Core 4 x86_64
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/4/x86_64/os/
enabled=0

[fedora-core-updates-4-x86_64]
name=Fedora Core 4 Updates x86_64
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/4/x86_64/
enabled=0

[fedora-extras-4-x86_64]
name=Fedora Extras 4 x86_64
baseurl=http://fedoraproject.org/extras/4/x86_64/
enabled=0


[fedora-core-4-ppc]
name=Fedora Core 4 ppc
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/4/ppc/os/
enabled=0

[fedora-core-updates-4-ppc]
name=Fedora Core 4 Updates ppc
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/4/ppc/
enabled=0

[fedora-extras-4-ppc]
name=Fedora Extras 4 ppc
baseurl=http://fedoraproject.org/extras/4/ppc/
enabled=0


## Fedora Extras 3

[fedora-core-3-i386]
name=Fedora Core 3 i386
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/3/i386/os/
enabled=0

[fedora-core-updates-3-i386]
name=Fedora Core 3 Updates i386
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/3/i386/
enabled=0

[fedora-extras-3-i386]
name=Fedora Extras 3 i386
baseurl=http://fedoraproject.org/extras/3/i386/
enabled=0


[fedora-core-3-x86_64]
name=Fedora Core 3 x86_64
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/3/x86_64/os/
enabled=0

[fedora-core-updates-3-x86_64]
name=Fedora Core 3 Updates x86_64
baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/3/x86_64/
enabled=0

[fedora-extras-3-x86_64]
name=Fedora Extras 3 x86_64
baseurl=http://fedoraproject.org/extras/3/x86_64/
enabled=0




From fedora-extras-commits at redhat.com  Sun Apr 30 11:23:47 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 30 Apr 2006 04:23:47 -0700
Subject: owners owners.list,1.924,1.925
Message-ID: <200604301123.k3UBNnJT000308@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32755/owners

Modified Files:
	owners.list 
Log Message:
add gcompris


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.924
retrieving revision 1.925
diff -u -r1.924 -r1.925
--- owners.list	30 Apr 2006 07:30:52 -0000	1.924
+++ owners.list	30 Apr 2006 11:23:46 -0000	1.925
@@ -322,6 +322,7 @@
 Fedora Extras|gcfilms|Movies collections management|tian at c-sait.net|extras-qa at fedoraproject.org|
 Fedora Extras|gcl|GNU Common Lisp|gemi at bluewin.ch|extras-qa at fedoraproject.org|
 Fedora Extras|gcombust|Powerful GTK+ front-end for mkisofs and cdrecord|matthias at rpmforge.net|extras-qa at fedoraproject.org|
+Fedora Extras|gcompris|Educational suite for kids 2-10 years old|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|
 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|gdeskcal|Eye-candy calendar for your desktop.|paul at all-the-johnsons.co.uk|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Apr 30 11:24:55 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 30 Apr 2006 04:24:55 -0700
Subject: comps comps-fe6.xml.in,1.5,1.6
Message-ID: <200604301124.k3UBOvZP000407@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/comps
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv386/comps

Modified Files:
	comps-fe6.xml.in 
Log Message:
add gcompris to Games


Index: comps-fe6.xml.in
===================================================================
RCS file: /cvs/extras/comps/comps-fe6.xml.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- comps-fe6.xml.in	30 Apr 2006 07:31:43 -0000	1.5
+++ comps-fe6.xml.in	30 Apr 2006 11:24:55 -0000	1.6
@@ -214,6 +214,7 @@
         <packagereq type="optional">freedoom</packagereq>
         <packagereq type="optional">freedroid</packagereq>
         <packagereq type="optional">freedroidrpg</packagereq>
+        <packagereq type="optional">gcompris</packagereq>
         <packagereq type="optional">gl-117</packagereq>
         <packagereq type="optional">gnofract4d</packagereq>
         <packagereq type="optional">gnome-sudoku</packagereq>



From fedora-extras-commits at redhat.com  Sun Apr 30 12:20:18 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sun, 30 Apr 2006 05:20:18 -0700
Subject: rpms/libsndfile/devel .cvsignore, 1.5, 1.6 libsndfile.spec, 1.11,
	1.12 sources, 1.5, 1.6
Message-ID: <200604301220.k3UCKKFK003402@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/libsndfile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3379

Modified Files:
	.cvsignore libsndfile.spec sources 
Log Message:
* Sun Apr 30 2006 Andreas Thienemann <andreas at bawue.net> - 1.0.16-1
- Updated to 1.0.16



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	29 Mar 2006 22:03:36 -0000	1.5
+++ .cvsignore	30 Apr 2006 12:20:18 -0000	1.6
@@ -1 +1 @@
-libsndfile-1.0.15.tar.gz
+libsndfile-1.0.16.tar.gz


Index: libsndfile.spec
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/devel/libsndfile.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- libsndfile.spec	29 Mar 2006 22:03:36 -0000	1.11
+++ libsndfile.spec	30 Apr 2006 12:20:18 -0000	1.12
@@ -1,6 +1,6 @@
 Summary:	Library for reading and writing sound files
 Name:		libsndfile
-Version:	1.0.15
+Version:	1.0.16
 Release:	1%{?dist}
 License:	LGPL
 Group:		System Environment/Libraries
@@ -77,6 +77,9 @@
 
 
 %changelog
+* Sun Apr 30 2006 Andreas Thienemann <andreas at bawue.net> - 1.0.16-1
+- Updated to 1.0.16
+
 * Thu Mar 30 2006 Andreas Thienemann <andreas at bawue.net> - 1.0.15-1
 - Updated to 1.0.15
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	29 Mar 2006 22:03:36 -0000	1.5
+++ sources	30 Apr 2006 12:20:18 -0000	1.6
@@ -1 +1 @@
-4171faabfad0ce550cbe9bf1b065e976  libsndfile-1.0.15.tar.gz
+773b6639672d39b6342030c7fd1e9719  libsndfile-1.0.16.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 30 15:43:09 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Sun, 30 Apr 2006 08:43:09 -0700
Subject: rpms/pan/devel .cvsignore, 1.5, 1.6 pan.spec, 1.9, 1.10 sources, 1.5,
	1.6
Message-ID: <200604301543.k3UFhB92010626@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/pan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10605

Modified Files:
	.cvsignore pan.spec sources 
Log Message:
devel update



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	25 Apr 2006 06:46:36 -0000	1.5
+++ .cvsignore	30 Apr 2006 15:43:09 -0000	1.6
@@ -1,3 +1,4 @@
 pan-0.14.2.91.tar.bz2
 pan-0.93.tar.bz2
 pan-0.94.tar.bz2
+pan-0.95.tar.bz2


Index: pan.spec
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pan.spec	25 Apr 2006 06:46:36 -0000	1.9
+++ pan.spec	30 Apr 2006 15:43:09 -0000	1.10
@@ -1,6 +1,6 @@
 Summary: A GNOME/GTK+ news reader for X
 Name: pan
-Version: 0.94
+Version: 0.95
 Release: 1%{?dist}
 Epoch: 1
 License: GPL
@@ -8,11 +8,9 @@
 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: libxml2-devel >= 2.4.22
-BuildRequires: gnet2-devel >= 2.0.4
 BuildRequires: desktop-file-utils
-BuildRequires: pcre-devel >= 4.0
-BuildRequires: gtkspell-devel >= 2.0.2
+BuildRequires: pcre-devel >= 5.0
+BuildRequires: gtkspell-devel >= 2.0.7
 BuildRequires: gettext
 BuildRequires: gmime-devel >= 2.1.0
 
@@ -29,11 +27,11 @@
 %prep
 %setup -q
 
-echo "StartupNotify=true" >> pan.desktop.in
+echo "StartupNotify=true" >> pan.desktop
 
 
 %build
-%configure --enable-gtkspell
+%configure 
 make
 
 %install
@@ -57,12 +55,15 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog README TODO
+%doc AUTHORS ChangeLog COPYING NEWS README TODO
 %{_bindir}/pan
 %{_datadir}/pixmaps/*
 %{_datadir}/applications/fedora-pan.desktop
 
 %changelog
+* Sun Apr 30 2006 Michael A. Peters <mpeters at mac.com> - 1:0.95-1
+- Update to 0.95
+
 * Mon Apr 24 2006 Michael A. Peters <mpeters at mac.com> - 1:0.94-1
 - Update to 0.94
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	25 Apr 2006 06:46:36 -0000	1.5
+++ sources	30 Apr 2006 15:43:09 -0000	1.6
@@ -1,2 +1,2 @@
-ca870a8a182f68b299796d90906918ca  pan-0.93.tar.bz2
 1013562743c330b07b84b749ed247c66  pan-0.94.tar.bz2
+3a0cff7a3bc8b77ad19af4a492859804  pan-0.95.tar.bz2



From fedora-extras-commits at redhat.com  Sun Apr 30 16:16:39 2006
From: fedora-extras-commits at redhat.com (Michael A. Peters (mpeters))
Date: Sun, 30 Apr 2006 09:16:39 -0700
Subject: rpms/pan/devel pan.spec,1.10,1.11
Message-ID: <200604301616.k3UGGfYS012944@cvs-int.fedora.redhat.com>

Author: mpeters

Update of /cvs/extras/rpms/pan/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12925

Modified Files:
	pan.spec 
Log Message:
fix rpmlint errors on debuginfo package



Index: pan.spec
===================================================================
RCS file: /cvs/extras/rpms/pan/devel/pan.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pan.spec	30 Apr 2006 15:43:09 -0000	1.10
+++ pan.spec	30 Apr 2006 16:16:39 -0000	1.11
@@ -1,7 +1,7 @@
 Summary: A GNOME/GTK+ news reader for X
 Name: pan
 Version: 0.95
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPL
 Group: Applications/Internet
@@ -29,6 +29,15 @@
 
 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
+
+
 
 %build
 %configure 
@@ -61,6 +70,9 @@
 %{_datadir}/applications/fedora-pan.desktop
 
 %changelog
+* Sun Apr 30 2006 Michael A. Peters <mpeters at mac.com> - 1:0.95-2
+- Fix rpmlint errors on debug package
+
 * Sun Apr 30 2006 Michael A. Peters <mpeters at mac.com> - 1:0.95-1
 - Update to 0.95
 



From fedora-extras-commits at redhat.com  Sun Apr 30 16:28:48 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sun, 30 Apr 2006 09:28:48 -0700
Subject: rpms/hevea - New directory
Message-ID: <200604301628.k3UGSot5013069@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/hevea
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13043/hevea

Log Message:
Directory /cvs/extras/rpms/hevea added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 30 16:28:49 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sun, 30 Apr 2006 09:28:49 -0700
Subject: rpms/hevea/devel - New directory
Message-ID: <200604301628.k3UGSpPJ013072@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/hevea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13043/hevea/devel

Log Message:
Directory /cvs/extras/rpms/hevea/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 30 16:29:12 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sun, 30 Apr 2006 09:29:12 -0700
Subject: rpms/hevea/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, 
	NONE, 1.1
Message-ID: <200604301629.k3UGTEgd013124@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/hevea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13088/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module hevea


--- 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 Apr 30 16:29:12 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sun, 30 Apr 2006 09:29:12 -0700
Subject: rpms/hevea Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604301629.k3UGTEdt013121@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/hevea
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13088

Added Files:
	Makefile import.log 
Log Message:
Setup of module hevea


--- NEW FILE Makefile ---
# Top level Makefile for module hevea
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 30 16:30:02 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sun, 30 Apr 2006 09:30:02 -0700
Subject: rpms/hevea import.log,1.1,1.2
Message-ID: <200604301630.k3UGU4Oj013192@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/hevea
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13157

Modified Files:
	import.log 
Log Message:
auto-import hevea-1.08-4 on branch devel from hevea-1.08-4.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/hevea/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Apr 2006 16:29:12 -0000	1.1
+++ import.log	30 Apr 2006 16:30:02 -0000	1.2
@@ -0,0 +1 @@
+hevea-1_08-4:HEAD:hevea-1.08-4.src.rpm:1146414593



From fedora-extras-commits at redhat.com  Sun Apr 30 16:30:03 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sun, 30 Apr 2006 09:30:03 -0700
Subject: rpms/hevea/devel hevea.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources,
	1.1, 1.2
Message-ID: <200604301630.k3UGU5dH013197@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/hevea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13157/devel

Modified Files:
	.cvsignore sources 
Added Files:
	hevea.spec 
Log Message:
auto-import hevea-1.08-4 on branch devel from hevea-1.08-4.src.rpm


--- NEW FILE hevea.spec ---
%{!?_texmf: %define _texmf %(eval "echo `kpsewhich -expand-var '$TEXMFMAIN'`")}

Name:           hevea
Version:        1.08
Release:        4%{?dist}
Summary:        LaTeX to HTML translator
Group:          Applications/Publishing
License:        QPL
URL:            http://hevea.inria.fr/
Source:         http://hevea.inria.fr/distri/hevea-%{version}.tar.gz
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires:	ocaml >= 3.0.7, /usr/bin/kpsewhich
Requires:       tetex-latex netpbm-progs ghostscript tetex-dvips

%description
HEVEA is a quite complete and fast LATEX to HTML translator.
HEVEA renders symbols by using the so-called HTML "entites", which modern
browsers display those entities correctly most of the time.


%prep
%setup -q


%build
make %{?_smp_mflags} \
	PREFIX=%{_prefix} \
	LIBDIR=%{_datadir}/hevea \
	BINDIR=%{_bindir} \
	LATEXLIBDIR=%{_texmf}/tex/latex/hevea


%install
rm -rf %{buildroot}
mkdir -p %{buildroot}%{_libdir}/hevea
mkdir -p %{buildroot}%{_bindir}
make install \
	DESTDIR=%{buildroot} \
	PREFIX=%{_prefix} \
	LIBDIR=%{_datadir}/hevea \
	BINDIR=%{_bindir} \
	LATEXLIBDIR=%{_texmf}/tex/latex/hevea

	
%clean
rm -rf %{buildroot}


%post -p /usr/bin/texhas


%postun -p /usr/bin/texhash


%files
%defattr(-,root,root,-)
%doc README CHANGES LICENSE
%{_bindir}/*
%{_datadir}/hevea
%{_texmf}/tex/latex/hevea/


%changelog
* Sun Apr 30 2006 Andreas Thienemann <andreas at bawue.net> - 1.08-4
- Included Requirements for imagen

* Fri Apr 28 2006 Andreas Thienemann <andreas at bawue.net> - 1.08-3
- Better comformity to FHS

* Fri Apr 28 2006 Andreas Thienemann <andreas at bawue.net> - 1.08-2
- Cleaned up and adapted for FE

* Sat Jul  2 2005 Gerard Milmeister <gemi at bluewin.ch> - 1.08-1
- New Version 1.08

* Fri Mar 19 2004 Gerard Milmeister <gemi at bluewin.ch> - 0:1.07-0.fdr.1
- First Fedora release


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/hevea/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	30 Apr 2006 16:29:12 -0000	1.1
+++ .cvsignore	30 Apr 2006 16:30:03 -0000	1.2
@@ -0,0 +1 @@
+hevea-1.08.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/hevea/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	30 Apr 2006 16:29:12 -0000	1.1
+++ sources	30 Apr 2006 16:30:03 -0000	1.2
@@ -0,0 +1 @@
+073c92c9408a9679a397ce65a076c796  hevea-1.08.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 30 16:50:01 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sun, 30 Apr 2006 09:50:01 -0700
Subject: owners owners.list,1.925,1.926
Message-ID: <200604301650.k3UGo3tX013322@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13234

Modified Files:
	owners.list 
Log Message:
Added hevea



Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.925
retrieving revision 1.926
diff -u -r1.925 -r1.926
--- owners.list	30 Apr 2006 11:23:46 -0000	1.925
+++ owners.list	30 Apr 2006 16:50:01 -0000	1.926
@@ -467,6 +467,7 @@
 Fedora Extras|help2man|Create simple man pages from --help output|rc040203 at freenet.de|extras-qa at fedoraproject.org|
 Fedora Extras|hercules|Hercules S/370, ESA/390, and z/Architecture emulator|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|Hermes|HERMES pixel format conversion library|thomas at apestaart.org|extras-qa at fedoraproject.org|
+Fedora Extras|hevea|LaTeX to HTML translator|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|hfsplusutils|Tools for reading Macintosh HFS+ volumes|dwmw2 at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|highlight|Universal source code to formatted text converter|Jochen at herr-schmitt.de|extras-qa at fedoraproject.org|
 Fedora Extras|hmmer|Profile HMM software for protein sequence analysis|Christian.Iseli at licr.org|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Apr 30 17:06:38 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 30 Apr 2006 10:06:38 -0700
Subject: rpms/ocaml/devel .cvsignore, 1.5, 1.6 ocaml.spec, 1.23, 1.24 sources,
	1.7, 1.8
Message-ID: <200604301706.k3UH6exA015564@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/ocaml/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15543

Modified Files:
	.cvsignore ocaml.spec sources 
Log Message:
new version 3.09.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ocaml/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	4 Jan 2006 23:17:43 -0000	1.5
+++ .cvsignore	30 Apr 2006 17:06:38 -0000	1.6
@@ -1,4 +1,4 @@
-ocaml-3.09.1.tar.bz2
+ocaml-3.09.2.tar.bz2
 ocaml-3.09-refman.html.tar.gz
 ocaml-3.09-refman.info.tar.gz
-ocaml-3.09-refman.ps.gz
+ocaml-3.09-refman.pdf


Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml/devel/ocaml.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ocaml.spec	17 Feb 2006 21:35:11 -0000	1.23
+++ ocaml.spec	30 Apr 2006 17:06:38 -0000	1.24
@@ -1,15 +1,15 @@
 Name:		ocaml
-Version:	3.09.1
-Release: 	2%{?dist}
+Version:	3.09.2
+Release: 	1%{?dist}
 
 Summary:	Objective Caml compiler and programming environment
 
 Group:		Development/Languages
 License:	QPL/LGPL
 URL:		http://www.ocaml.org
-Source0:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09.1.tar.bz2
+Source0:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09.2.tar.bz2
 Source1:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.html.tar.gz
-Source2:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.ps.gz
+Source2:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.pdf
 Source3:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.info.tar.gz
 Patch0:		ocaml-rpath.patch
 Patch1:		ocaml-user-cflags.patch
@@ -97,7 +97,7 @@
 %patch0 -p1
 %patch1 -p1 -b .cflags
 
-cp %{SOURCE2} refman.ps.gz
+cp %{SOURCE2} refman.pdf
 
 
 %build
@@ -199,7 +199,7 @@
 
 %files docs
 %defattr(-,root,root,-)
-%doc refman.ps.gz htmlman
+%doc refman.pdf htmlman
 
 
 %files emacs
@@ -210,6 +210,9 @@
 
 
 %changelog
+* Sun Apr 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.09.2-1
+- new version 3.09.2
+
 * Fri Feb 17 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.09.1-2
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocaml/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	4 Jan 2006 23:17:43 -0000	1.7
+++ sources	30 Apr 2006 17:06:38 -0000	1.8
@@ -1,4 +1,4 @@
-b6b380ae71f6f7bc7ff0989a0f8409e6  ocaml-3.09.1.tar.bz2
+63428ce7e114520e8f529c9ca809a1b0  ocaml-3.09.2.tar.bz2
 b25eb211bf91bcaa536b12d12731ceec  ocaml-3.09-refman.html.tar.gz
 280160b1fc7c8513074c3fda0446de29  ocaml-3.09-refman.info.tar.gz
-598bb8e86329afe1ae374385b2e177e7  ocaml-3.09-refman.ps.gz
+6ed0c6b1167dbf6c1cb10a78d302bc00  ocaml-3.09-refman.pdf



From fedora-extras-commits at redhat.com  Sun Apr 30 17:20:55 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 30 Apr 2006 10:20:55 -0700
Subject: rpms/ocaml/FC-3 .cvsignore, 1.6, 1.7 ocaml.spec, 1.14, 1.15 sources,
	1.7, 1.8
Message-ID: <200604301720.k3UHKvVH015687@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/ocaml/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15632/FC-3

Modified Files:
	.cvsignore ocaml.spec sources 
Log Message:
new version 3.09.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-3/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	4 Jan 2006 23:21:22 -0000	1.6
+++ .cvsignore	30 Apr 2006 17:20:54 -0000	1.7
@@ -1,4 +1,4 @@
-ocaml-3.09.1.tar.bz2
+ocaml-3.09.2.tar.bz2
 ocaml-3.09-refman.html.tar.gz
 ocaml-3.09-refman.info.tar.gz
-ocaml-3.09-refman.ps.gz
+ocaml-3.09-refman.pdf


Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-3/ocaml.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ocaml.spec	4 Jan 2006 23:21:22 -0000	1.14
+++ ocaml.spec	30 Apr 2006 17:20:54 -0000	1.15
@@ -1,5 +1,5 @@
 Name:		ocaml
-Version:	3.09.1
+Version:	3.09.2
 Release: 	1%{?dist}
 
 Summary:	Objective Caml compiler and programming environment
@@ -7,9 +7,9 @@
 Group:		Development/Languages
 License:	QPL/LGPL
 URL:		http://www.ocaml.org
-Source0:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09.1.tar.bz2
+Source0:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09.2.tar.bz2
 Source1:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.html.tar.gz
-Source2:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.ps.gz
+Source2:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.pdf
 Source3:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.info.tar.gz
 Patch0:		ocaml-rpath.patch
 Patch1:		ocaml-user-cflags.patch
@@ -81,7 +81,8 @@
 %patch0 -p1
 %patch1 -p1 -b .cflags
 
-cp %{SOURCE2} refman.ps.gz
+cp %{SOURCE2} refman.pdf
+
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" ./configure \
@@ -172,7 +173,8 @@
 
 %files docs
 %defattr(-,root,root,-)
-%doc refman.ps.gz htmlman
+%doc refman.pdf htmlman
+
 
 %files emacs
 %defattr(-,root,root,-)
@@ -181,6 +183,9 @@
 %doc emacs/README
 
 %changelog
+* Sun Apr 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.09.2-1
+- new version 3.09.2
+
 * Thu Jan  5 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.09.1-1
 - new version 3.09.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-3/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	4 Jan 2006 23:21:22 -0000	1.7
+++ sources	30 Apr 2006 17:20:54 -0000	1.8
@@ -1,4 +1,4 @@
-b6b380ae71f6f7bc7ff0989a0f8409e6  ocaml-3.09.1.tar.bz2
+63428ce7e114520e8f529c9ca809a1b0  ocaml-3.09.2.tar.bz2
 b25eb211bf91bcaa536b12d12731ceec  ocaml-3.09-refman.html.tar.gz
 280160b1fc7c8513074c3fda0446de29  ocaml-3.09-refman.info.tar.gz
-598bb8e86329afe1ae374385b2e177e7  ocaml-3.09-refman.ps.gz
+6ed0c6b1167dbf6c1cb10a78d302bc00  ocaml-3.09-refman.pdf



From fedora-extras-commits at redhat.com  Sun Apr 30 17:20:55 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 30 Apr 2006 10:20:55 -0700
Subject: rpms/ocaml/FC-4 .cvsignore, 1.7, 1.8 ocaml.spec, 1.20, 1.21 sources,
	1.7, 1.8
Message-ID: <200604301720.k3UHKvX2015693@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/ocaml/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15632/FC-4

Modified Files:
	.cvsignore ocaml.spec sources 
Log Message:
new version 3.09.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	4 Jan 2006 23:21:28 -0000	1.7
+++ .cvsignore	30 Apr 2006 17:20:55 -0000	1.8
@@ -1,4 +1,4 @@
-ocaml-3.09.1.tar.bz2
+ocaml-3.09.2.tar.bz2
 ocaml-3.09-refman.html.tar.gz
 ocaml-3.09-refman.info.tar.gz
-ocaml-3.09-refman.ps.gz
+ocaml-3.09-refman.pdf


Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-4/ocaml.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ocaml.spec	4 Jan 2006 23:21:28 -0000	1.20
+++ ocaml.spec	30 Apr 2006 17:20:55 -0000	1.21
@@ -1,5 +1,5 @@
 Name:		ocaml
-Version:	3.09.1
+Version:	3.09.2
 Release: 	1%{?dist}
 
 Summary:	Objective Caml compiler and programming environment
@@ -7,9 +7,9 @@
 Group:		Development/Languages
 License:	QPL/LGPL
 URL:		http://www.ocaml.org
-Source0:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09.1.tar.bz2
+Source0:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09.2.tar.bz2
 Source1:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.html.tar.gz
-Source2:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.ps.gz
+Source2:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.pdf
 Source3:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.info.tar.gz
 Patch0:		ocaml-rpath.patch
 Patch1:		ocaml-user-cflags.patch
@@ -88,7 +88,7 @@
 %patch0 -p1
 %patch1 -p1 -b .cflags
 
-cp %{SOURCE2} refman.ps.gz
+cp %{SOURCE2} refman.pdf
 
 
 %build
@@ -189,7 +189,7 @@
 
 %files docs
 %defattr(-,root,root,-)
-%doc refman.ps.gz htmlman
+%doc refman.pdf htmlman
 
 
 %files emacs
@@ -200,6 +200,9 @@
 
 
 %changelog
+* Sun Apr 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.09.2-1
+- new version 3.09.2
+
 * Thu Jan  5 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.09.1-1
 - new version 3.09.1
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	4 Jan 2006 23:21:28 -0000	1.7
+++ sources	30 Apr 2006 17:20:55 -0000	1.8
@@ -1,4 +1,4 @@
-b6b380ae71f6f7bc7ff0989a0f8409e6  ocaml-3.09.1.tar.bz2
+63428ce7e114520e8f529c9ca809a1b0  ocaml-3.09.2.tar.bz2
 b25eb211bf91bcaa536b12d12731ceec  ocaml-3.09-refman.html.tar.gz
 280160b1fc7c8513074c3fda0446de29  ocaml-3.09-refman.info.tar.gz
-598bb8e86329afe1ae374385b2e177e7  ocaml-3.09-refman.ps.gz
+6ed0c6b1167dbf6c1cb10a78d302bc00  ocaml-3.09-refman.pdf



From fedora-extras-commits at redhat.com  Sun Apr 30 17:20:56 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 30 Apr 2006 10:20:56 -0700
Subject: rpms/ocaml/FC-5 .cvsignore, 1.5, 1.6 ocaml.spec, 1.23, 1.24 sources,
	1.7, 1.8
Message-ID: <200604301721.k3UHKwKD015699@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/ocaml/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15632/FC-5

Modified Files:
	.cvsignore ocaml.spec sources 
Log Message:
new version 3.09.2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	4 Jan 2006 23:17:43 -0000	1.5
+++ .cvsignore	30 Apr 2006 17:20:56 -0000	1.6
@@ -1,4 +1,4 @@
-ocaml-3.09.1.tar.bz2
+ocaml-3.09.2.tar.bz2
 ocaml-3.09-refman.html.tar.gz
 ocaml-3.09-refman.info.tar.gz
-ocaml-3.09-refman.ps.gz
+ocaml-3.09-refman.pdf


Index: ocaml.spec
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-5/ocaml.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ocaml.spec	17 Feb 2006 21:35:11 -0000	1.23
+++ ocaml.spec	30 Apr 2006 17:20:56 -0000	1.24
@@ -1,15 +1,15 @@
 Name:		ocaml
-Version:	3.09.1
-Release: 	2%{?dist}
+Version:	3.09.2
+Release: 	1%{?dist}
 
 Summary:	Objective Caml compiler and programming environment
 
 Group:		Development/Languages
 License:	QPL/LGPL
 URL:		http://www.ocaml.org
-Source0:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09.1.tar.bz2
+Source0:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09.2.tar.bz2
 Source1:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.html.tar.gz
-Source2:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.ps.gz
+Source2:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.pdf
 Source3:	http://caml.inria.fr/distrib/ocaml-3.09/ocaml-3.09-refman.info.tar.gz
 Patch0:		ocaml-rpath.patch
 Patch1:		ocaml-user-cflags.patch
@@ -97,7 +97,7 @@
 %patch0 -p1
 %patch1 -p1 -b .cflags
 
-cp %{SOURCE2} refman.ps.gz
+cp %{SOURCE2} refman.pdf
 
 
 %build
@@ -199,7 +199,7 @@
 
 %files docs
 %defattr(-,root,root,-)
-%doc refman.ps.gz htmlman
+%doc refman.pdf htmlman
 
 
 %files emacs
@@ -210,6 +210,9 @@
 
 
 %changelog
+* Sun Apr 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.09.2-1
+- new version 3.09.2
+
 * Fri Feb 17 2006 Gerard Milmeister <gemi at bluewin.ch> - 3.09.1-2
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/ocaml/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	4 Jan 2006 23:17:43 -0000	1.7
+++ sources	30 Apr 2006 17:20:56 -0000	1.8
@@ -1,4 +1,4 @@
-b6b380ae71f6f7bc7ff0989a0f8409e6  ocaml-3.09.1.tar.bz2
+63428ce7e114520e8f529c9ca809a1b0  ocaml-3.09.2.tar.bz2
 b25eb211bf91bcaa536b12d12731ceec  ocaml-3.09-refman.html.tar.gz
 280160b1fc7c8513074c3fda0446de29  ocaml-3.09-refman.info.tar.gz
-598bb8e86329afe1ae374385b2e177e7  ocaml-3.09-refman.ps.gz
+6ed0c6b1167dbf6c1cb10a78d302bc00  ocaml-3.09-refman.pdf



From fedora-extras-commits at redhat.com  Sun Apr 30 17:21:05 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sun, 30 Apr 2006 10:21:05 -0700
Subject: rpms/qof/devel qof-gnc-date-char.patch,NONE,1.1 qof.spec,1.13,1.14
Message-ID: <200604301721.k3UHL7FI015721@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/qof/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15653

Modified Files:
	qof.spec 
Added Files:
	qof-gnc-date-char.patch 
Log Message:
- Patch to fix a signed/unsigned char problem on ppc.


qof-gnc-date-char.patch:

--- NEW FILE qof-gnc-date-char.patch ---
--- qof-0.6.4/qof/gnc-date.c.char	2006-04-30 10:08:44.000000000 -0700
+++ qof-0.6.4/qof/gnc-date.c	2006-04-30 10:09:38.000000000 -0700
@@ -1060,7 +1060,7 @@
 
     str +=3;
     if ('.' == *str) str++;
-    if (isdigit ((unsigned char)*str) && isdigit ((unsigned char)*(str+1)))
+    if (isdigit ((char)*str) && isdigit ((char)*(str+1)))
     {
       int cyn;
       /* copy sign from hour part */


Index: qof.spec
===================================================================
RCS file: /cvs/extras/rpms/qof/devel/qof.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- qof.spec	28 Apr 2006 21:45:27 -0000	1.13
+++ qof.spec	30 Apr 2006 17:21:05 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           qof
 Version:        0.6.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Query engine library for C objects
 
 Group:          System Environment/Libraries
@@ -8,6 +8,7 @@
 URL:            http://qof.sf.net
 Source0:        http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0: qof-x86_64.patch
+Patch1: qof-gnc-date-char.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libxml2-devel
@@ -64,7 +65,8 @@
 %prep
 %setup -q
 %patch0 -p1
-
+%patch1 -p1
+%
 %build
 %configure --disable-static
 make
@@ -114,6 +116,9 @@
 %doc html
 
 %changelog
+* Sun Apr 30 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.6.4-2
+- Patch to fix a signed/unsigned char problem on ppc.
+
 * Mon Apr 17 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.6.4-1
 - Update to qof 0.6.4.
 - Patch a small compile problem in building tests on x86_64.



From fedora-extras-commits at redhat.com  Sun Apr 30 17:34:54 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sun, 30 Apr 2006 10:34:54 -0700
Subject: rpms/qof/devel qof.spec,1.14,1.15
Message-ID: <200604301734.k3UHYuHf015912@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/qof/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15895

Modified Files:
	qof.spec 
Log Message:
* Fix stupid in ahurry typo.



Index: qof.spec
===================================================================
RCS file: /cvs/extras/rpms/qof/devel/qof.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- qof.spec	30 Apr 2006 17:21:05 -0000	1.14
+++ qof.spec	30 Apr 2006 17:34:54 -0000	1.15
@@ -1,6 +1,6 @@
 Name:           qof
 Version:        0.6.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Query engine library for C objects
 
 Group:          System Environment/Libraries
@@ -66,7 +66,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%
+
 %build
 %configure --disable-static
 make
@@ -116,6 +116,9 @@
 %doc html
 
 %changelog
+* Sun Apr 30 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.6.4-3
+- Fix stupid in a hurry typo.
+
 * Sun Apr 30 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.6.4-2
 - Patch to fix a signed/unsigned char problem on ppc.
 



From fedora-extras-commits at redhat.com  Sun Apr 30 19:53:25 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 30 Apr 2006 12:53:25 -0700
Subject: rpms/dclib/devel dclib-0.3.7-hashfix.patch, NONE,
	1.1 dclib-0.3.7-keylock.patch, NONE,
	1.1 dclib-0.3.7-permissions.patch, NONE, 1.1 dclib.spec, 1.7, 1.8
Message-ID: <200604301953.k3UJrRnP021111@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/dclib/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21083

Modified Files:
	dclib.spec 
Added Files:
	dclib-0.3.7-hashfix.patch dclib-0.3.7-keylock.patch 
	dclib-0.3.7-permissions.patch 
Log Message:
* Sun Apr 20 2006 Luke Macken <lmacken at redhat.com> 0.3.7-7
- dclib-0.3.7-permissions.patch
  make valknut use the umask instead of hardcoded permissions
- dclib-0.3.7-keylock.patch
  fixes $Lock-parsing problem
- dclib-0.3.7-hashfix.patch
  fixes production of wrong hashes



dclib-0.3.7-hashfix.patch:

--- NEW FILE dclib-0.3.7-hashfix.patch ---
--- dclib/csearchindex.cpp	2005-04-06 01:21:00.397324222 +0200
+++ dclib/csearchindex.cpp	2005-04-06 01:25:34.469238109 +0200
@@ -419,10 +419,12 @@
 	CString s;
 	CBase32 base32;
 	CByteArray dst,src;
-	
-	if ( hbi < m_pHashIndex->Size() )
+	struct hashbaseobject * hbo;
+
+	if ( hbi < m_pHashBaseArray->Size() )
 	{
-		src.Append(m_pHashIndex->Data()+hbi,TIGERSIZE);
+		hbo = (struct hashbaseobject *)(m_pHashBaseArray->Data()+hbi);
+		src.Append(m_pHashIndex->Data()+hbo->m_nHashIndex,TIGERSIZE);
 		base32.Encode( &dst, &src );
 		if ( dst.Size() > 0 )
 		{

dclib-0.3.7-keylock.patch:

--- NEW FILE dclib-0.3.7-keylock.patch ---
--- dclib/cmessagehandler.cpp	2005-06-24 13:32:11.000000000 +0200
+++ dclib/cmessagehandler.cpp	2005-06-26 00:09:12.000000000 +0200
@@ -428,7 +428,7 @@
 
 	int i,i1;
 
-	i = sContent.Find(' ');
+	i = sContent.Find(" Pk=");
 
 	if ( (msg = new CMessageLock()) != 0 )
 	{

dclib-0.3.7-permissions.patch:

--- NEW FILE dclib-0.3.7-permissions.patch ---
--- dclib/core/cdir.cpp	2005-06-24 13:32:11.000000000 +0200
+++ dclib/core/cdir.cpp	2005-06-24 13:41:38.000000000 +0200
@@ -553,7 +553,7 @@
 #ifdef WIN32
 			if ( _mkdir((Path()+DIRSEPARATOR+s1).Data()) != 0 )
 #else
-			if ( mkdir((ConvertSeparators(sPath)+DIRSEPARATOR+s1).Data(),S_IRUSR|S_IWUSR|S_IXUSR) != 0 )
+			if ( mkdir((ConvertSeparators(sPath)+DIRSEPARATOR+s1).Data(),0777) != 0 )
 #endif
 			{
 				if ( errno != EEXIST )
--- dclib/core/filecopy.cpp	2005-06-24 13:32:11.000000000 +0200
+++ dclib/core/filecopy.cpp	2005-06-24 13:40:54.000000000 +0200
@@ -94,7 +94,7 @@
 	
 	blen = sb.st_blksize;
 
-	while ((to_fd = open(to, O_CREAT | O_EXCL | O_TRUNC | O_WRONLY, 0)) < 0)
+	while ((to_fd = open(to, O_CREAT | O_EXCL | O_TRUNC | O_WRONLY, 0666)) < 0)
 	{
 		if (errno == EEXIST && unlink(to) == 0)
 			continue;
--- dclib/ctransfer.cpp	2005-06-24 13:32:11.000000000 +0200
+++ dclib/ctransfer.cpp	2005-06-24 13:39:08.000000000 +0200
@@ -488,7 +488,7 @@
 
 		mode |= IO_RAW | IO_WRITEONLY;
 
-		if ( m_File.Open( sSrcFilename, mode, MO_IRUSR|MO_IWUSR|MO_IRGRP|MO_IROTH ) == FALSE )
+		if ( m_File.Open( sSrcFilename, mode, MO_IRUSR|MO_IWUSR|MO_IRGRP|MO_IWGRP|MO_IROTH|MO_IWOTH ) == FALSE )
 		{
 			CallBack_SendError(strerror(errno));
 			perror("File open");


Index: dclib.spec
===================================================================
RCS file: /cvs/extras/rpms/dclib/devel/dclib.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- dclib.spec	13 Feb 2006 21:00:26 -0000	1.7
+++ dclib.spec	30 Apr 2006 19:53:25 -0000	1.8
@@ -1,14 +1,17 @@
 Name:           dclib
 Version:        0.3.7
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Direct Connect file sharing library
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://dcgui.berlios.de/
 Source0:        http://download.berlios.de/dcgui/%{name}-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Patch0:         %{name}-%{version}-hashfix.patch
+Patch1:         %{name}-%{version}-keylock.patch
+Patch2:         %{name}-%{version}-permissions.patch
 
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libxml2-devel, openssl-devel, bzip2-devel
 
 %description
@@ -31,6 +34,9 @@
 
 %prep
 %setup -q
+%patch0 -b .hashfix
+%patch1 -b .keylock
+%patch2 -b .perms
 
 
 %build
@@ -66,6 +72,14 @@
 
 
 %changelog
+* Sun Apr 20 2006 Luke Macken <lmacken at redhat.com> 0.3.7-7
+- dclib-0.3.7-permissions.patch
+  make valknut use the umask instead of hardcoded permissions
+- dclib-0.3.7-keylock.patch
+  fixes $Lock-parsing problem
+- dclib-0.3.7-hashfix.patch
+  fixes production of wrong hashes
+
 * Mon Feb 13 2006 Luke Macken <lmacken at redhat.com> 0.3.7-6
 - Rebuild for FE5
 



From fedora-extras-commits at redhat.com  Sun Apr 30 19:55:09 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 30 Apr 2006 12:55:09 -0700
Subject: rpms/global/FC-5 .cvsignore, 1.6, 1.7 global.spec, 1.13,
	1.14 sources, 1.6, 1.7
Message-ID: <200604301955.k3UJtBpE021273@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/global/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21200/FC-5

Modified Files:
	.cvsignore global.spec sources 
Log Message:
new version 5.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/global/FC-5/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	1 Oct 2005 17:58:27 -0000	1.6
+++ .cvsignore	30 Apr 2006 19:55:09 -0000	1.7
@@ -1 +1 @@
-global-4.8.7.tar.gz
+global-5.0.tar.gz


Index: global.spec
===================================================================
RCS file: /cvs/extras/rpms/global/FC-5/global.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- global.spec	17 Feb 2006 21:30:39 -0000	1.13
+++ global.spec	30 Apr 2006 19:55:09 -0000	1.14
@@ -1,13 +1,13 @@
 Name:           global
-Version:        4.8.7
-Release:	3%{?dist}
+Version:        5.0
+Release:	1%{?dist}
 
 Summary:        Source code tag system
 
 Group:          Development/Tools
 License:        GPL/BSD
 URL:            http://www.gnu.org/software/global
-Source:         http://tamacom.com/global/global-4.8.7.tar.gz
+Source:         http://tamacom.com/global/global-5.0.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -49,6 +49,9 @@
 %{_datadir}/gtags
 
 %changelog
+* Sun Apr 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.0-1
+- new version 5.0
+
 * Fri Feb 17 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.8.7-3
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/global/FC-5/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Oct 2005 17:58:27 -0000	1.6
+++ sources	30 Apr 2006 19:55:09 -0000	1.7
@@ -1 +1 @@
-35eec852b398f07e99cee08e9f6dd3c1  global-4.8.7.tar.gz
+4416b22ab4424122c6470187e5b0f552  global-5.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 30 19:55:10 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 30 Apr 2006 12:55:10 -0700
Subject: rpms/global/devel .cvsignore, 1.6, 1.7 global.spec, 1.13,
	1.14 sources, 1.6, 1.7
Message-ID: <200604301955.k3UJtCvP021279@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/global/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21200/devel

Modified Files:
	.cvsignore global.spec sources 
Log Message:
new version 5.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/global/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	1 Oct 2005 17:58:27 -0000	1.6
+++ .cvsignore	30 Apr 2006 19:55:09 -0000	1.7
@@ -1 +1 @@
-global-4.8.7.tar.gz
+global-5.0.tar.gz


Index: global.spec
===================================================================
RCS file: /cvs/extras/rpms/global/devel/global.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- global.spec	17 Feb 2006 21:30:39 -0000	1.13
+++ global.spec	30 Apr 2006 19:55:09 -0000	1.14
@@ -1,13 +1,13 @@
 Name:           global
-Version:        4.8.7
-Release:	3%{?dist}
+Version:        5.0
+Release:	1%{?dist}
 
 Summary:        Source code tag system
 
 Group:          Development/Tools
 License:        GPL/BSD
 URL:            http://www.gnu.org/software/global
-Source:         http://tamacom.com/global/global-4.8.7.tar.gz
+Source:         http://tamacom.com/global/global-5.0.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -49,6 +49,9 @@
 %{_datadir}/gtags
 
 %changelog
+* Sun Apr 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.0-1
+- new version 5.0
+
 * Fri Feb 17 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.8.7-3
 - Rebuild for Fedora Extras 5
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/global/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Oct 2005 17:58:27 -0000	1.6
+++ sources	30 Apr 2006 19:55:09 -0000	1.7
@@ -1 +1 @@
-35eec852b398f07e99cee08e9f6dd3c1  global-4.8.7.tar.gz
+4416b22ab4424122c6470187e5b0f552  global-5.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 30 19:55:03 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 30 Apr 2006 12:55:03 -0700
Subject: rpms/global/FC-3 .cvsignore, 1.5, 1.6 global.spec, 1.7, 1.8 sources,
	1.5, 1.6
Message-ID: <200604301955.k3UJtZBW021315@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/global/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21200/FC-3

Modified Files:
	.cvsignore global.spec sources 
Log Message:
new version 5.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/global/FC-3/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	1 Oct 2005 17:58:21 -0000	1.5
+++ .cvsignore	30 Apr 2006 19:55:02 -0000	1.6
@@ -1 +1 @@
-global-4.8.7.tar.gz
+global-5.0.tar.gz


Index: global.spec
===================================================================
RCS file: /cvs/extras/rpms/global/FC-3/global.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- global.spec	5 Oct 2005 11:21:26 -0000	1.7
+++ global.spec	30 Apr 2006 19:55:02 -0000	1.8
@@ -1,13 +1,13 @@
 Name:           global
-Version:        4.8.7
-Release:	2%{?dist}
+Version:        5.0
+Release:	1%{?dist}
 
 Summary:        Source code tag system
 
 Group:          Development/Tools
 License:        GPL/BSD
 URL:            http://www.gnu.org/software/global
-Source:         http://tamacom.com/global/global-4.8.7.tar.gz
+Source:         http://tamacom.com/global/global-5.0.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -49,6 +49,12 @@
 %{_datadir}/gtags
 
 %changelog
+* Sun Apr 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.0-1
+- new version 5.0
+
+* Fri Feb 17 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.8.7-3
+- Rebuild for Fedora Extras 5
+
 * Wed Oct  5 2005 Gerard Milmeister <gemi at bluewin.ch> - 4.8.7-2
 - Remove dir in /usr/share/info
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/global/FC-3/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	1 Oct 2005 17:58:21 -0000	1.5
+++ sources	30 Apr 2006 19:55:02 -0000	1.6
@@ -1 +1 @@
-35eec852b398f07e99cee08e9f6dd3c1  global-4.8.7.tar.gz
+4416b22ab4424122c6470187e5b0f552  global-5.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 30 19:55:03 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 30 Apr 2006 12:55:03 -0700
Subject: rpms/global/FC-4 .cvsignore, 1.6, 1.7 global.spec, 1.12,
	1.13 sources, 1.6, 1.7
Message-ID: <200604301955.k3UJtZd9021322@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/global/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21200/FC-4

Modified Files:
	.cvsignore global.spec sources 
Log Message:
new version 5.0


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/global/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	1 Oct 2005 17:58:22 -0000	1.6
+++ .cvsignore	30 Apr 2006 19:55:03 -0000	1.7
@@ -1 +1 @@
-global-4.8.7.tar.gz
+global-5.0.tar.gz


Index: global.spec
===================================================================
RCS file: /cvs/extras/rpms/global/FC-4/global.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- global.spec	5 Oct 2005 11:21:27 -0000	1.12
+++ global.spec	30 Apr 2006 19:55:03 -0000	1.13
@@ -1,13 +1,13 @@
 Name:           global
-Version:        4.8.7
-Release:	2%{?dist}
+Version:        5.0
+Release:	1%{?dist}
 
 Summary:        Source code tag system
 
 Group:          Development/Tools
 License:        GPL/BSD
 URL:            http://www.gnu.org/software/global
-Source:         http://tamacom.com/global/global-4.8.7.tar.gz
+Source:         http://tamacom.com/global/global-5.0.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -49,6 +49,12 @@
 %{_datadir}/gtags
 
 %changelog
+* Sun Apr 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.0-1
+- new version 5.0
+
+* Fri Feb 17 2006 Gerard Milmeister <gemi at bluewin.ch> - 4.8.7-3
+- Rebuild for Fedora Extras 5
+
 * Wed Oct  5 2005 Gerard Milmeister <gemi at bluewin.ch> - 4.8.7-2
 - Remove dir in /usr/share/info
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/global/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	1 Oct 2005 17:58:22 -0000	1.6
+++ sources	30 Apr 2006 19:55:03 -0000	1.7
@@ -1 +1 @@
-35eec852b398f07e99cee08e9f6dd3c1  global-4.8.7.tar.gz
+4416b22ab4424122c6470187e5b0f552  global-5.0.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 30 20:02:06 2006
From: fedora-extras-commits at redhat.com (Toshio Ernie Kuratomi (toshio))
Date: Sun, 30 Apr 2006 13:02:06 -0700
Subject: rpms/qof/FC-5 qof-gnc-date-char.patch,NONE,1.1 qof.spec,1.13,1.14
Message-ID: <200604302002.k3UK2ew3023855@cvs-int.fedora.redhat.com>

Author: toshio

Update of /cvs/extras/rpms/qof/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20784

Modified Files:
	qof.spec 
Added Files:
	qof-gnc-date-char.patch 
Log Message:
- Patch a signed/unsigned char bug that caused errors on ppc.


qof-gnc-date-char.patch:

--- NEW FILE qof-gnc-date-char.patch ---
--- qof-0.6.4/qof/gnc-date.c.char	2006-04-30 10:08:44.000000000 -0700
+++ qof-0.6.4/qof/gnc-date.c	2006-04-30 10:09:38.000000000 -0700
@@ -1060,7 +1060,7 @@
 
     str +=3;
     if ('.' == *str) str++;
-    if (isdigit ((unsigned char)*str) && isdigit ((unsigned char)*(str+1)))
+    if (isdigit ((char)*str) && isdigit ((char)*(str+1)))
     {
       int cyn;
       /* copy sign from hour part */


Index: qof.spec
===================================================================
RCS file: /cvs/extras/rpms/qof/FC-5/qof.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- qof.spec	30 Apr 2006 05:03:15 -0000	1.13
+++ qof.spec	30 Apr 2006 20:02:06 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           qof
 Version:        0.6.4
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Query engine library for C objects
 
 Group:          System Environment/Libraries
@@ -8,6 +8,7 @@
 URL:            http://qof.sf.net
 Source0:        http://dl.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
 Patch0: qof-x86_64.patch
+Patch1: qof-gnc-date-char.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libxml2-devel
@@ -64,6 +65,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %configure --disable-static
@@ -114,6 +116,12 @@
 %doc html
 
 %changelog
+* Sun Apr 30 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.6.4-3
+- Fix stupid in a hurry typo.
+
+* Sun Apr 30 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.6.4-2
+- Patch to fix a signed/unsigned char problem on ppc.
+
 * Mon Apr 17 2006 Toshio Kuratomi <toshio-tiki-lounge.com> - 0.6.4-1
 - Update to qof 0.6.4.
 - Patch a small compile problem in building tests on x86_64.



From fedora-extras-commits at redhat.com  Sun Apr 30 20:59:29 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 30 Apr 2006 13:59:29 -0700
Subject: rpms/raidem-music - New directory
Message-ID: <200604302059.k3UKxVKU024270@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/raidem-music
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24244/raidem-music

Log Message:
Directory /cvs/extras/rpms/raidem-music added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 30 20:59:30 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 30 Apr 2006 13:59:30 -0700
Subject: rpms/raidem-music/devel - New directory
Message-ID: <200604302059.k3UKxWsH024273@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/raidem-music/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24244/raidem-music/devel

Log Message:
Directory /cvs/extras/rpms/raidem-music/devel added to the repository




From fedora-extras-commits at redhat.com  Sun Apr 30 20:59:44 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 30 Apr 2006 13:59:44 -0700
Subject: rpms/raidem-music Makefile,NONE,1.1 import.log,NONE,1.1
Message-ID: <200604302059.k3UKxkoQ024322@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/raidem-music
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24289

Added Files:
	Makefile import.log 
Log Message:
Setup of module raidem-music


--- NEW FILE Makefile ---
# Top level Makefile for module raidem-music
all : CVS/Root common-update
	@cvs update

common-update : common
	@cd common && cvs update

common : CVS/Root
	@cvs 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 Apr 30 20:59:45 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 30 Apr 2006 13:59:45 -0700
Subject: rpms/raidem-music/devel .cvsignore, NONE, 1.1 Makefile, NONE,
	1.1 sources, NONE, 1.1
Message-ID: <200604302059.k3UKxlNM024325@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/raidem-music/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24289/devel

Added Files:
	.cvsignore Makefile sources 
Log Message:
Setup of module raidem-music


--- 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 Apr 30 21:22:52 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 30 Apr 2006 14:22:52 -0700
Subject: rpms/raidem-music import.log,1.1,1.2
Message-ID: <200604302122.k3ULMsFo026681@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/raidem-music
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26566

Modified Files:
	import.log 
Log Message:
auto-import raidem-music-1.0-1 on branch devel from raidem-music-1.0-1.src.rpm


Index: import.log
===================================================================
RCS file: /cvs/extras/rpms/raidem-music/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- import.log	30 Apr 2006 20:59:44 -0000	1.1
+++ import.log	30 Apr 2006 21:22:52 -0000	1.2
@@ -0,0 +1 @@
+raidem-music-1_0-1:HEAD:raidem-music-1.0-1.src.rpm:1146430764



From fedora-extras-commits at redhat.com  Sun Apr 30 21:22:53 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 30 Apr 2006 14:22:53 -0700
Subject: rpms/raidem-music/devel dilvie_-_east_of_the_sun.ogg, NONE,
	1.1 dilvie_-_half_baked.ogg, NONE,
	1.1 dilvie_-_the_dragonfly.ogg, NONE,
	1.1 dilvie_-_up_in_ashes.ogg, NONE, 1.1 license.txt, NONE,
	1.1 raidem-music.spec, NONE, 1.1
Message-ID: <200604302122.k3ULMtDe026684@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/raidem-music/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26566/devel

Added Files:
	dilvie_-_east_of_the_sun.ogg dilvie_-_half_baked.ogg 
	dilvie_-_the_dragonfly.ogg dilvie_-_up_in_ashes.ogg 
	license.txt raidem-music.spec 
Log Message:
auto-import raidem-music-1.0-1 on branch devel from raidem-music-1.0-1.src.rpm


--- NEW FILE dilvie_-_east_of_the_sun.ogg ---
OggS
b?9?=?dkM???[MJ)%
Y
*????*????2?,??2?,??2????:)??B??k??????5G)??RJ)???9?? 4d

Y
b?d!gA?:?!c?R???c?AB??R?ABCV


Y	

!? tB))U9?sJI)x?9)??RK?sJ	???Z.?PJ(??[???RJ)????"?PJJ???!?TRj?? ?????R?1!l,!??Z?5!?j)?k?A!\I??Xk
??sj-?Xk???[???
!?B)??RJI)?B!?RJ(%??RJ)?B(??PJ)???RJ!?PJ)??RBJ)?TB!?PJ)???RJ)?PJ)??RJ))??RJ)?PB)??RRJ)??R)??RJ)???RJ)?RB)??JI)??RJ??PJ)???RJ)??R*%?RJ)?
)??sJI5t?A????j????9*)?;!??Z??uLB)?c? t?R?)?:????J???PRJ-?cl??[?1?[+??c?1??Zk-
??????R?T?(E??	???NN??M?H
b4?9???F?V
??E?
?(???(?Q?????3??u???0z?G??v;?JA?a:F!?8????C????
"#???
q!mA
YRFD????'
?;??*?JX2I
yB?/??)K??XZB???!CZ??$%H?I	QBR&??P?D?(+
?%X??b49/&$??????4(?????
eX??)??C??)?t?:?"N??8
?a1N?uX	g;??p?Ch?rX&dU????
D??? [?E?????{
7?K??9??pc??ZJ?9f????&?????[?????o??It_?????L??3GK???,?h???T#???????Q?yh?ge?????y?	???'???H:-??W?+ix??IX????*?W?*???~b???7?T;?<y??+??s?N?M??	?#FgV0??Q???????d{O?[??sbG?(?????{?????jT?+kZLV?2???Q?"N???????=Q?7?%G????b^?s<f?????*fM?I??=?Z?????|??@?????4??????&33??/
????Lq??fUS???W?DbQ*?l,??????>GD??x?????c?G???+???1?>?VXVr^????????=??*?	"	"ln3q??"hr????????@????k?t?z????W????p@|?o?o?-???
????b?*??2?"Y???^}??Dov<W=#9???V????????!?????W?U????
?&?I??D5?????z???}y???,w?K??????Z????????o??G2?q;e?F????pK?GZ?B#??_f??WH???W ???Z?I??C
?x^a???c-?0gc??O?c^?jy3???6?Xz??W?????S?\yw?j???%?_dX???[???At:???V0?)?d???'CR????C????n??6w??v at U>??W??ga??J
?dc???
??????N?,?B
 ????????\???I??~?????B?cn?N}??????;_?@??g?????<??
?
1!#?(?|?"?????d??A?i?????<?U<??Nb??=?`v[??o??ly???8!x???O???
2A*	?)?Hj??pL]?b??q??F?I?!?p+*h??" ??2t??4(BOggS
????m?	mg'??MDwU'?Ce?e?5ACMI??B8?sFk?mM?6?v???(????????G?2???EO ? ??@???:?	???1L?N?qB
??(N???;8-C???~?=?%=w???AgtZMp?hft?cq?????SD?t ??Eu?d[?nl????[{?3?X(
?T6?bO????ep?
ur?,??	 Iz????LX,5??Pq??L?i,??8-c???sZ
??AUTpb?????
8u?:BB9j??	?I
#??Zi????:UE??
F/^?;V?c??P
???P?|????N$UA
?"bq????

????????+
?P?7?D?B?2 M???RW,1X
'H?%???Y!?1V?WgX?k
?<#N?u??*?qRJ[
1?ZT?m?S???j={?"*?)+x"? NT|?p???6?(!.?n?$?z?5 ???4?
l3???x"0?????p?'?B???`
?'?@`A??=?)?+??m4?????XQDD+F	z%$!?QE?Tp?HP???owf1D :#D?-???PD??*??Q+`??6???
?NT-?N+"D4??n??]e??H?A?r?
?P?s?M???1???C?f?Z??^??Zj
j?!ap?@QQ?8T<vT??A?`b?(?hh1???1?g??$????%?T"]]?La)t?0??\??B?l-???@
}.?]<6?Gd)?gF?7Q?????/qY.??"?iJ?u??9l?H$
I??
DSD+u??xJ???#???WC?18?iD?	?
??S??1:FU=??1t??1Ze????z"pZ
1??E?h
?5?P?A????Z?q
V[q 
"
??aV?z:?P?a?5?Q??TkMa4?F??????G????0?M?]k<ZJ?????2-E;?p??????????@?@???E??Qh?E???&?b?F0@?!??'??]1Z??j:??:?.<@?pu??1 ?{?v?
?.)?
??b?) F"????????Q??gtN??h??????g4?kQ??h]?????Qg?#??=z??
?7???!+?:Qt? I?F???2??:?E?&d???]???C0?????ZS,uTs?J??1o????6h(?$?a0?	cp8??5S?sC???????2???????\??44?H]%
ZO;????F??????????F??\]5???????q???-*0?0R
I???B?PPD? ?T?X?]??????S??6N???1.??Z_?b"
l*?????;???C"&??]RPWlD?
????	i?ABe%
E? O2??	VHdD9??X??8?!?NQT???S?1????T?paP?	Z??GW?Y??}?kI?,U??+g
r?1?%??M?X??BF??v?NOu??
??|??~?B???%?
E?"TGmki?CQ?8]??APQ?Z1???`AV??`?D??!??AU?(?BV?dOggS
(?(9`?hC??????(??H0???????
F]8?!??0&X31
B??!5???y!Nb????"V?;??BWG?)
?P??L??@Z?
?@?1?
,!		H?2!@?????(?!!??+?V????
?? ???T??+?3E????
!???????Q?X??u?EE?*?R(%
 *N
?)*???8@p?"?`?P?
&?
N??????)??`DU?bT
??XA?CQ?0tt?&??????L\B?A4?x<??4Q?????9
?.?@G??
8@e at 0???Nb4?GC????9??Q]?Jm;BG????C;?!?3xB
?? ?`?
?(?F????
 ?-
"?Y?I$????????JZp?4.[?NQ?
b?Q?u???D9b&!$A?b?S
?"??? ?
?mFe]Y??IY?{t?ls????<?,H<??????y? ??VW?? ???2
?,D"
#?~W?O????z?]F??$??CGb	?EE?f~]?
?????F?)/)=z
?:{ ???ZU???????B???P????5??s'vj?????????4?
?W.
T??2?r=O??wDg??0N?5??p4??LL??.?C0??L~^?
?w7??A?VT
H???ht"?.3?I,?t-N??H(p^E?????&?HP0??7vK^?DT???Z??z-????A??G1!V?7???1w6??-???????_?c??K
??\*??? ??`K?T?F2?
?Q?6
?
]l4-?u??9L?Fn??h?RPt??Yg?1qb4&??E??-?FMwt?DNG???X?[???????????Ub?X?0?????q?x???A?B??ad?0???)?E???H?'d
??
??????4?DFsz??B&Ba??u??,?L?>{?@????]??????7qa3i9?_"W????(C?z???D?=[?.??????B?R??????s%???????,?????H??JP0??wp?I?YO?

R?0(???`??
????C_2?>]N???d??Z?A?ERU????5???\K???Uo?NPay???`7??gH???-@,%??{?!?"??S$????fy?6?H??0???Y?]@i
52?g ?gN:[???I4I?P-??tw?!??9??(G?~
rF????B??"? ??0d{kf|?????t??????

N??Ka????1??c?X?k??h4??
*C?s?M%b?+gf@??Z???_$
Z???@??????|
q?0?_%???sBY????|+?~?????/~j?
??y#b???v?7;?2???N??}?;?????
P??h?R??"5F2D?J??^
 ?
<??]+???9b?l7???0p1h??	?s???Mo???	?B)Qk??*#
eq*?*?n?{Ed4E
?KWN?MW]C}[?m?@????l2#?=gO?Q??77?o??o?W?????"?J
??UO????a?????q??i???.qr&j???$
3?]?Gg?oqm??w???#?????A???s?z?w????????)?{???????9???eZB-?n??V?*l????????t??|z?o.?si?????
????????M??q???_???	Ue?X?b>?H at T??o??V?"P??T??+???0????	?({O???(???7?L?+;w?????2uC?O`b&?????!|??i$??iV+
?}????v?|?0?O<???n??q?"60??W)H|?C??Rg??
??z?b?hJ?XG??SD?????JJ4EcQEUoU?3&[???(6?I?Q?L??D**??????o]?M+33??*??US???}??S?
??t??????DHk%???w?0$E??o3?????-?^?8?O?W???

3
SKM??u?44?(?	???????-a??ttf??'}?v???a?????_8j?J?X?|?>??:???#?3??g=?|??9??2?[?3??????:??N?;??`?????v??????3?/_o-v??T{?z??v?NO~??z??>???@??????*d7'??;??
(s???/E?#y?+??g???R^?V???5?vn??2???{??
?RA6NU???\R???s(???w[????A
st%9??"?PzZ?`5DT?[???V;???n?????n
????B?????$?A??	???$x(?Z???KQ???????4?z?x??l>????s??"5?1e{?1??L
0?T?nGd?v?|??y???\?HDc??&
q??"?XI?e?]T??V5Z;??QLKI3A`M?????$????9"??(>-??S?a:De?o??yP{??H?`????|;?????l??7<??t????>0?W???????#c??,?u???9|ih?1??????%?pO<????????)?tH??R???w?<u?Z??h?c?)?F????1??KbG?????
??r?
 ?<???u

?[DD?K???"???R????K?? ????,???&????7VpP?
???
1?	'?n???V?t?;?????)?????sV???2	Zg????????AK}U?b?5-????????G?h?@???005D????82?????y??8t???{'?lLk?'??G?@??0"??l?(?
?????????suN"?
Qjf?????? Al??
?J????????,
?F^??y_t?S?]?[???a?"?????3???:??A

 
??>?i??????>
??
??mz???<????~??~%?_?????{.VL?^T&????g?{????4?BK
??c?Ok??u?*LZ?At6???v ?@?GClm?>K?}???????1?s?u)D???5???.
@?~??@???|????d?D^?????Y???A????T5?L]??}???????????CY??????
z???<*
eg'???B??t?!geo
r?}???@??????u[?t??-,??Q??qp????2?I????a?j^j???@iT??9??6D??QMQ???IU=?????]?/?0???????.<??\????z??8?X?GX|???????u?????}?????C?????w?^??R?Eg??"???*L?~?jY???	?`???"4??X?h.+????P?
??ln???M_??6]u3?_V????
c?l*?9IS?????	E??k??a???.??!j?IP!??"2
_3d??
E"$
??"u?;D?G-G?9??/ZQ???%
VE?#??DU?m?3?qm????$
?%$$?
FSTA???C!d"/?#N??Q-?z:?i?;?\??
?@.MR???r????tW????U??'=??q7	?6?)?c?g?#e%1???x??brS???y??????????????b???
?1?@???t?\??:B0????lJ=~?"svx??????;u???L????na?.??
`vH???
?????D? VA
?R??	
?p?@??u???C?2
????r>????(?La???fA??;???*`??,?+8TV?2=??^?hd??[f&??Wo4K?L?N?] mWK???C?y?7?t4oA??!???C~?46???}???X878???:
??H`????????]?!?!?8?????????l??vr1?B?????5
???`^
????X?j7R??@_F?@????A
?L
?x!f?PW??9m???J(???`p?\nK

??J???E??? ?SK.????P??4?$D
??X??`#44??ik???F
??D+??S
?E=9???????1?????x?U???~?*+??G??BSF??c????
*???6=??
?e?
???????r??_?iCq?NI?i%?89?m~Vn*?%????????	??7?WG?t?M+????[r at Z?q>h-&Cz???(??Y-??8?@??2????s?{?y8I?"c?,Bmga?TN?Z???R??>?wO?Z$t?????!IJ1??0?&????2?l?R??1?F?JNS?Q2?Ge
?k?Y?N5#?+????
??K?X???L?@??+?W?JE.	???f"??U2N-???N?v?(>?b?N-|??????????E?.'9?0??}6P???????om??B2YJ!Hld??X?TC-?????r^???4?????????n?E}?r???}rT??*
g?????5
?????????KYDF?i??Z??]?JH???L9Q?	R?,#*$???@???*$E$BX?p?]?a?2N5
.???0?j? $????)?
+&?T??b??????!?A]?I0p!2??R???e???.0QOV,eDy"	? ??r,?:?q?CD??@?'???c????u??T?paP?	???bg0g
??_=?????5P?h??+v???????5eN?????}??????Eu??'.1!??%?

??(%&	1 at D%(F?" ?L#%,a?
vd?y?ti????X?IRB??E	2K??$"_fi	*%C"?(@`bBc$??X??4?ee+*?1c??C?N??X?"X?1L@?F
*?+?EUE??@TJ`?,? J???a?
???`b?0??s?@?1j?
>?T?
=?(B}?~??j???I?/?O?]8g-c?(dn6{??e?vn????*????E$
"F?`?c?P=?Qk?u??
??
!???????Q?X??uK??U?B?(q?D,
bQ???(j?? ??m]X?J)?0?J at 7??
?:??J??????NtN????!j???m??n?c(!L(AP

????4??????
j????P
AE? 8h
H0?u?
V
D??? N+*?V?K?????f?????1?????4?@? %@H??????????
?Uq?[??.?]?qbA,?
?F?FGa????????X???'j"Z???'D3p	"
?0"Z??C?@????@?\c?? ?s????
 8?????a
*
lMP
_???K?*X
P???IT`\??j+?`\?4!??*?R??X?'`
@??SNV 
?`?'??H?PD??SJ?*????h&t>?,????Up???
B?H)?W?
F?P?
O(Ve\??b?
!??A??8"!Y?*TZ?T
YC!*H*e?$"????#[?QOggS
??h???
???ZJC??1???s??r>??.?[?=#luTGv\<XR+NI="?4 @??
d?`?5D-?
?
=?
K???:t?????AK+J(?AR?YF?YyZ?????????5P^?%????}???[????G?yE?EzDB?S?p?kkk8b?P??M8??c72<pp??h
gF?'?&??c2???kE???;!x0???????????;nre?V?????K????mM=???35u:
???A???3P<^?z?z2????4*?????????H
?6?Cd`A\ SP%??@?

 
??\k???X??JM.?"?????h?q?	?CN'l?????i\ ?HD?'?<b
?@?????I??dB???KY??eeEq8<??i1??h?VE??XKh?+RB??)F%???P?????? .\Cf2??9O?U8?"	m??P%T????E??Qs?\???.f
 /%?dd????d	P(???/?*???BFQy?e???@?DYAY?E?3P??qbE@[??b?
??~??ug?*mf????qKJ2kR-?
?:8?s5????F/??iu.n"?VR?UD?Ge?"v?????{
(?????VMu?
Y?H??V??-`E????KA,??1???(P?1ze?h?T?k=?Y??T?r??4????h
pwJ??)?9?	%????5?h????Y)$vIi->&?;??? ?w??
?C?/?jbgg?|<y[qUV?????L???C????hex???3?~v?@?7?)v?????I4?????/???????+ED?
Yl?
F}E???|B@????^d9X!u?$C???n0G????N?!?????????c*?`(??ZKz??????V
??_:L??<
??d??h.?T??!D
???'?K|?H???T%?N?????K\syuxpw?uR??sYdN
RUcM?:?;?^??=q??P?K???
VT??UI\I??~_>S(?????j)Q???????l??G??^4??l?H??<?Li?i?|kHK?nr?Ml??]E$mk??z;?uj?&?W??DJ?;GA??z?\????'?
?VR?^??O??l.??-J??????A???zZ??}???dp?d??/oS(:?
?J?(??O?0a~?+?>??'%?C???S?8

 ?|?h3c??M??>?u?lr?D?-?P?,?2#B~?c??

K?D?$
??.i?F?E ????J#p
?J????I4???k	??.?K!rTFNs??H????zno?gs????M?g??4:????;?
?????T???@a???=L??V?}x??????!-?Z??????l???U??y?????6?q???FAKC?I??$=??"??J??d????b????8k??_?H3Cx	{_????a
L[??<A?u?M?i????C3?H?????z:??(??kxu??4??????9f?$?mHSq????????7??{??8?1???9N?=?zl?~y??3Ss??:S??c???0s?k?
??

`
b??Lc??LR2r?G?'??~??J?"??l`j??????)y?=??/??\0???=??Y?????l??{???N-??T?.?0???????g:B?o?c????o7??g??ZLm2??a????e??-<IZeNOvR?2SP%?Jg?????z;???oM
?3
?Z?v	??	(?v??L?+??????H
???u? ??V:f?R??G??$?i?i?F?B
g;@?9?}9M]K??&]??1?'???,#&`J??tO0??-;2
U??v?o??O}|???pN???M???1x}.?UN=?(????????d?E,?%?`????W+?CY???)j??he#???????[}?A???4?(????cpJ???? ?]???qOK?
?:x8=?????"?[:?b1??????n?
??????
@y
???y?????v?-????U???^??	???Z???<o,;O?Dc????.??3?o???ByV???\=??W{?L?????
v?3TLh?!?	???????0?????6??s8W????s???0
??JD?n?9?Kt30???w?Ur?Y?i???R?RK?u???????{?????????j$?90?5?$A???:??D???????
?g??????EcF?qY
<??????z<F
??E?ZW?hJ5?R;??J\ +1???9MO??f?l?{?\?Xe???PZc??Ch?D?????w?f3j?U??I??]??+????
"3I??Iqh?*?:J??:?"?????,??X?{??UC???????2??Zkr	K??C?N??#v.?a?????P?i:+?"?>??<cue?@???M???
UAH
D??B?t	?H	???
??2???7?5??=u-YE V??Q?*???????????h*MP?g??4c?9Y?Xg??\bh???6?X?0?7b?&???
???o=?C?*>??6?????K5?l+?????(?%?lR?U?:~`???d?!?IZ?hg%?Y??p?2?\
??'?=	b???~?????? ?X??~??D??>u?uZ?{?c???????????<?`?????HI??

?JF?????T??2??????$????I ?k?H?HS??????"?w
[...40740 lines suppressed...]
 ??Xu??%? ??i8??J]??????L];.\??F?? `?$af00???A?
 ?t????)nQQF????_??iTg??]??????u?v?0CA<?
?@@?????.?O?8??F?
?a?AS;??Q??Q?w6b????
?Q?"???6J
C?@D\???6?????T??hC?
\?? b?^
????6aU????_&??J???e ?f???Q-=?h?C[??x4c????@??7?c??<aIaI!J,
?
8?????	@J??*wFG,???s????>E?v?0@?!???9/Vt3,p?*A34t??q?0 B?!?Q6??|.?#?
?"!?2????]M??Gz6???k??Nk??w??*Ow??.????1??d???
?t0?7]!?r???9??	r?X???P??tHm2u
JL?3X??WUg?E?
???
Z;?A?i8?=k?zF?A?B?3?\{????????? ??
?W??d?,?????Z#L????????????w?x?k??9???v~U??XbI$	
??LV?L4!R
nR?
?
*2>?D@=??????@?A??*?e?W???jV?G?????x~[;q?\[????
???\L?Xd?
)J?$?C$?$_?gx?5?B?????KRU?'5i?A?F&
cH)
????l0*?^7X??z?A???T
sE?0F_??f???(?t`$??0 c?~?4?MY?????c?a8????yI??C??	)	?A44????=??K??hn??}6?????-t$????cu??&??@? %?D
??4?V??????K
l??z`?4P?rK
&
????g??F? ?\?v????u?????y?yBl????????I???????S?t?3&=gv
I???Q?t???:2????G?.U?`8????w\y?{ ?=??????u??G??U?N?l??
?z'f??hml???t?o?*[?X
?	???O???Hk?g?_??IAm??$5??Y????V????KG?*e?9???>?3??UB???r?]?a at k??(?:ft?<?b(??%}?	4??X???|???[?????!x???b????A??s??FR]c"?sP?E?*?t???Mf?U:???r??MGkEp??K??C\??[O?%?????Ca?C??#?????J???O?J@{E?C???(??
??k?????u???}V?L?q?+S7@??????\I????I
(?@?KU??6f???L?!@?
)tIap? (V?}'???M
t??0?B?*?E?:?V??su??N#?7@?
?Z?J??b*G???bt0?Ng????:haEQe?P??VH???1?6FP??? ?
?$%?m,??????u?
r5M7?u???h??
K#p.??6????n??F%
???`???1?z???#??
4'?txR@*(qt?E?9?%???
?{30??Z???6o???
9??S?@???p?^???*2?<?qW??FK
R??2????5D??M
??
Fp?"?%P0:??
,?
?? ??A?^3?j???V??????]??(?ry?P?R?~9????A???g????u(?U#	?6????iG?1`y?l3[???0j?????` ?|[?????
??`???vE
???$6?
g
???U	?M??Zb??rV??$?$?B]?O
.?n?@;:I?h?bRud??M??FbV?@?MdZ????ZQU????)4??N6?????i????g@'?/t????t?+BM?T???0???EJq]?\????N?????t?<?t?D??4???Fo<?c??????f??	?z?)?h`???????????}???n???cb?????????0??5????Gj?0 ,yp??m??)*??)??*~?*G?(#(p????d?-m%N?5??E???F??2?>?????"?+;A?~????k???z}??e?Y??????lY??7????N+Ib1M
??"d???g????
(??B??fYL-????"$R?D?B?S?a?Ru???u>???J?i??<,???8?d??i??????_?\?e_r???I??q'?w????<????0%??x@?G-~??<s???I?G????cXGBC????????PcK??N???P???*w??"?X4??
d??|wy?B?` _???w*??
q?X?Z??D&?"l{?????{??i??
??? ?n?]?;???? ????}$*????%??[y???z?4>+???9?E?#?r??7???C?b=????~??
?v???v???$JX?H
??j?-Rr_bl??{,s??V%Q?oJ?+??%???????
/???_(`???em:???.2?D?8 $-J??G???????a?j???*](?W??????????4H??????k???X7?1F?
??!?? I?????E???w???l?:vt??????7???v????<?oQ??,Tj#+?2?{?;??#/~`e?a??(x?Q
"??}?Z????X?u????0zkp????????????^q??&?t??????ji??=??V??<c9???9??C?U0?H8?:?s?@uJ?\?U?????
?m/?@?C?????????Ga&?j??X?????mm???????6_??XV?$??????????\???#?? X#_??u??????????Z?7??l~?
b	]???CW?<?|:?&??%T??mA?????/e???B?G;'??U??9????D3|????c?V?????J?p?X
??^???J~?V?k}??c`|?B??C???<?^0???????k??????V??u=??V?	 Q?"???????X?M?Hx?k??A?:?Qi?f?O]?pB??'?h?d??????^?!
&"U=-?$???1???+??zzv?sBU?C?
?JV?
??t????
`#??????T????U??!?q?L4????`
???GO???????O??
???^??[?????V[?(??\-'+Y????????#?
`?
n?m
>B(:????d???????\?
&M
?\2.????=\??????sD????7?[???u?7???^?W?K?????z?Y???%?3??M??4?O?????	~?ei*
>?m?)?ge??B
?j??"?O?????K??1
???3x}-]f?8??(?&????=??
?E*S??r'x??I~nAC/??<zh??+q???zK???!=W\??_??Q?[g?????????mgz?<Od
9C??3
&?VSS2??M?$?
_?{p????.=?Z?+?:?]wW?-? ?????????v#Z???O>sT??P'#??Z_??j??=?2)-!
( ??*Z#??"?w$@Z?*????C??*	?z?RW#]?"rH?P
????P???a?F/?bbhM5?5??B??:
?????GCO??n}u??????(M%4
H0?R????z??Al?????[v??????????
'C?JA5m?? ???*!?4x.Vu????;$?$?A2G$b?b?Xh~,?"A??[??E?.?`??	??	??P???????t?:??S???j	A??`:??*?3?Z???W&[px???6??>???_Z??#??%??bV????/??Vq.:bu]?^r??:M(?I?5;?<O?6?b???????????udr???Q
?
?E??U??Uk?}??^?O,?n-??n?q????????{?????4
?;
????34??@Rj;AF
?P)0U4?	?
,?4	?RDF?????|
e??X?J????*??>:?7?gT/??hMh??hASQ:E?????ZH?VA}?r?+?x??A?B_????91???5j7???? ?????DdB:r?9u??Z??
??C[???,???
?
?~??%c?????W|??5W??
0???v?b?$?M$

?3q?p??eb
?w12?}>) ?JaH}?????#??r?3
????????O???W??????}_v_w??k??L?Z????

Z??>2????O??r}???????C:st eFW?'???e?Z???7?k?7?z??~
?<0?/??v???8?????U-)?v6??f?#???;?:-,??:Y?J?WA?O?#=?????^???u??_ F?R??3??8?E????C.8f,<??zM?n??d???w?a?#???4n? A??~??{?	?V??@?U??^??h????'??C????9??x??????{???3b???7? '#
=???sMMbf???&

????0???????~???
?,??A??????O??hMVu?
?iD??3??B?U???H?NMx?J??R???5!?k?Rf????.tT??)?7?????%????????SJ???0Z???????Z??????k??(?C?^q_??)
=??K???6?(?U#?0 _??P
E?t??b]?V?G???p?xJ??????
?2???R????Y?[p????:?QEhs??]??.?H"1?
h??|??WD-
E?????F???????l?)?BZ'D?FW"????3X???R?(K?F@&1????????0_n
???J2N
?7????)???(K	?uG??'V???I,?"
q??k1|???}
?????Y????Q?N?oR?$4
?????m???_?s??2?????S??????J???F????d:???F???:?{????t{t???W????=??R??Ry??F?X?????(??{oJ??????i??K
@?
?e!???Oi&8
?0??w?	QrTM?>/???/?z?q>A????R??$H????


VU?
?????W?R?X?^?w?&7??m^c??	???????p??^3???x?9??[??Pl??4m?-??_)?q???W?R??0????O?{??
?g??!Q?
J?L???Zu`???!????dD
??F?nv>^?MX?2a?\
Z????*3rQ???J?U??d?!?R?gj?F??>a?3%U?K?2?Qtx&z??v$?~g 7x+??Q?$`????=b?0????????5?\2??P.????????e??????Oz?y?Na?`????}?;??<
S????>L?ofs?U??lUJ?0I????y
Ga4

??K	?9#?j?|??JO??l
?/n?U?I??S??N@?Cf?b,tbU?D??lE?????T?Z?6???ft??.$????l?|???h?q????^??????:(?
j\yBN?Z>??s?)???h?n?????G;9{??????h????/???s????zW z??v]??-?
&P	O?$dnh??C?g????????;?]"u*??Q?????=b~?E???I?*?*??x?8[Ku@??#?k
)?S??=g????X?7>??v??g??T???R-????1??c??Q?Bt?5??l%h?m?
???TJ??B-}	G?j?9/Z??lX????
??g2Z???$H??????GX???d??A?Q:???c??/J?(??-
??!?2????
?5!=&?????g??<??<?j?s?C
\^?y$??%w?H?3??f?\r?R	-td? ???$|H
G???Q{??jsZ!?[P????a??#?A??
f??84?pAuN??m?M???!0:UK??
"???5Xj???(;|<?????w????v?-G?_2???q?&s???a?`zp?Q?? k{M?????!??rW??i????s?fg?c???F?*?U?k?????~?\?????az BB?m??	
.?????SA??[???M/O?`P
^???s?KU?#??+?N???3?p???!N*?\???cW?)
n?6????,Q??
K$P??e??t?8|efyd??
M?0?????3y2??A?~??,?$?Y7"^1xwH?[?I?e?c???B?E?7K?7?p????b~??M??????*?;???W???S??V7c4~??Q?u??jP&x?P??C??G?/{??Y9?0c????F?=?X?4?|??`]?^[??Uxt??^??????
?~?8?!ipd?M?4`?C??<?*k?7 ??w?z?:,?5??Zd??????????S??X??9???????
??nj'c?X?
?)?
]???%|??I?N
???x???(+U?G??h????4?3??c5<J???xK??9????-??f&?Eoo????!3??d???R7~
	!??Z2c??j??4??G?5????????{????JT?#?T???????zZ?wxl ?7;???Y*=Wx7??2WX?:v$J???j??N
L??
??Q?D???/C-t
??kO~B?p???G??N???;???>??v?56<(MH?????8??S)???1????#`>??c?<?:?Ql?j?
VJ????u???????J??;??R??S'?|???G???%,/??NXa?
?s?M??D?4?????u\6??\B?K?}
v????????????????%o?_???x!?l??????'?1Q#?@1???4B??????T?????>?;0?y??
???<Q???
???????-Q?*???OgW??
?*???;???&R/?a?]??6???H???a??w???N???o?&[??S?$?fw?+??3m?????~2???F?"??????:-Lsw;?|?QrRS??=??f?M??-R??{????<????[?I??????OJ?4n??P?jv??%????0??5w?5q????m?$?????kf?????c;Z?g3`_??????3???h??K????0??`??[s?????????[H?\??e?Hf	
V
?
};u@??5R?e?f????h3L?P?t?%??'??v??u?I%)??msm??Z8?t*4w?\????SL??7??? ??E]c>??F????B???A????y)????iB?Q????ku*1??p??'^Gm??????????t:?:z??E??'j???P??d????q&e'??M?F0.?	????l?u?????x?? '?T?3????)H??L_c???I&????55zG,????b????u??L??X	??5&<m???+_e
???
?
???$V8?"

?K???`z
)??9Q????V?Dl??1?e??f????)?????(?_F????6z?n?i%??7?Y??lG??7??;J?0?h?K??|K?w
?????LnL?~h?y?bd?x?????)?G??ylXC0mRQOggS
???:?A?z???,???Y??'??Ba8??4????|?h?A?
??pH?OI4?vU?T
??;_?V?N????*u?X?????n?4?????????'*g???}w???m?{????{??K?[E???V_??O??no?:?????y?|0j??K?b
	
????

?_Qn/?rv?\??;?z?=???N'?fso????3=??(c????0?'?????d????w????s
??)?????'?L?#?o/???8????????

?u?=\~????6
???w?????z??=?r=?????)??.?[?a?dGX
??"?k?+ ???s????8 at C.??F?*&??&"|????K???x????Z}<??*.?@???2?
?/Kj&??O?/???????[
?:?e9N??w?u6???^=?y????????-??ED?n????}??????'???>?y*???u<?;p?
E??N?S???&hO?W???j???#ME?????:?|????>
?J?#[??l??????!?:?-?H"d???S-???5*H\?U@??[??bc???????_h????|g?6??o?!??:np??G??b?t?j9@???k>K,???n??yX?N???FW??%????4=s8?????h???w???????!
??Kf	??5???g?????|k_3O??:e???/??7x????5?h?5?

?|D=]?u?z1@??B??1[?????x?????1?V<~x??8?????@C?"`???~???o `???{????|??[?=nn??cj
??6
[<????/?Z?h????SU-????l/??z??V?|c???????a9?\?!?T-?kU?b???w?t??z#?!dCFA`?,w?5s?F
(???C????????2
qb?;????~????-???l}?N?v?Y7?
??OY??}???q????
???/???_|??K?wg?'so?L&?8????e?H?{??????
g
??<?3?n&???Uc??
?M|2?
8?
?<Qye?U?2%?1ZPb????y??????x????(W?(e??? |???/)?L?}W?????IU?[???;L?<??y?QY??N-G?}?y?LD?0??~E??t???L??n?S?'y?x{?'z??]??????/n?]?4????@+ru???????72U)?s???qV)?6??????Uk<??dM|l????????????f2??#???|????m|*Ra????z^S}?O???B????5P?}M??J
22?
?5???+Nt1[??~V?VLa?@?[F??m??ry?^+?7?87?
_X

???O?????(???a?{????q[[??????!_L?+???t??????)?H?c?Jt!
?il???MmUN??7????nU?v?`????&??z?Y???[????}??RX???i>,/?+e?#??#?#_???+???????@?
4@??????o???????(6OggS
?Em
?k??I?Ah??<?~]??m??{??????Z???
??>p
`:?
*
v???????U??\?????????Z_??M?/
Gs??1?IM???La?b?qd??y??~-=!?I/?????~?<?/F?o????Z?Ye?C??d?????????a?
F???B???c??*v???
?
	????fN9???YS=D?g?%?
?	??=?[???'!??}????^?r?????31S?S?9?zkt??w,????????D?*?8?+*5?1??'{??
?????^???????F<k1??M????????^?|??e?T?????O??k??"??c????oHE?7lX{??w?b^d????N?k????/?!?vc~??O???=Y|c6??T+?\??}?0??k'??d
4????O~???ko/0M??/??
;?H
?
`
?X???Nl???9U??^?
??#?D?|??/=?@?-<e?WeO??wf???#??q??????g?{i????O???U?@"w?+r??T?	?&w?zk?&?V?1?m?y?z???????????=n(???{:?Y?j?,q9'?J6?U????j?6?z[e?`??????s?K?B?9?&?????cy_?_???[43
5_???-C,E?M??????~2??#?????0????uHf??????4dV>;?????,'6??w????s{?
P
l
*??S??i2??tyo???????G?n#?;???bcm36??>	??l?i0Fk??f???:??@f?p?;V#
wX?9	?%?:+?>??`a?k??.!????B??qdg?
@?L???{?R?|?)O4???/?Go~O at y??!9N7XaG@????2??g*???;???Ir\??'?K?#?^kR&??????|?_???9j?tj?F???3G?j?3?VrU????????D???|?3???CF??f??????n????og???????b?6??Z?9?????????J?_????n????????x^????m??1|?e3A???l`H,??kut
W????x?eMiNS??f?+?;o?'y?-34f}?)?N??}Y??Ml???4(w??>?b(X|
??D?J??????(g-?????t??Nn???5????>??Ah?????H*S?O??}w?
q
?
nN?%?X?
k?????????!A????????????1???#??L?
?5'O???!WC

>5?????
???+9??@!"????b??/????Zgw}_H????C#k?C??Kj?????????c??????L???uOb<??J??f<?"}??D?i??

???X?
C?M2??9??o?????,M??<*??????
n???h?X??3%lz9?1A??????X?????A^5<N???
???4O??*Iq???
|?,???/?0
2???????s?9?????}yY?.??r7e]??E?]L?Q?3]`=?HD=~a2???r???
V?i^??? W??~*??=B;?????ak??????Ot?4?$??c??4?4???????R??2 ?~??
]??P???3?;?c^????7???#t??|???>????5d???D?O?>?xg??????%c???n!^;???y?CDL?o?????,ZF?4?????o?:k?4?d???c?????S??r?Ft??~%-?J?}:r???_?8q??)?q
`?<??1?&NL???a??????:?????+???p?????]rd?c?????? P???L???
OkXm??????
????wVb?b?hq????6o?_?0?>?<?k?}d^5???+?^.??'	"A@Y;+??K?1???m]??[
5?^????g????)kS??Z??=6Y4?
?*?
pe?)L??????'2C???0????rwV?'z????N??\??w?%??+??????
1??12*??.???^s????>?p??5?{??}?]?X???????????6?
??????t??vG??v?LK???R???So?(?q??c?L????????
????L
>5<????
??qz?\???t?e?????????|?????????HDL?q?$ i:B*?l??pa????=+Ah????A}
`???????K^G???f??????-l1&??y??????HyG??xl???????????????#?]v??D?????g?W????c%???????????)?^?????~??%?????v?7??X?d??	g????`??
???F?9????<??I???EE?0e?~?	{??????d??a?rl????????nf?Q
>5<????P5<??
?05u??????1???
3??T????~po>???Q??~??lrO.?&?????}??5_?4??????????~?|?)o	???????T?V??eK?f?!e?s?????????%?~?"c?~?!?h~?~6???U=V???Sh?g????]??[???????????T????r???W>?/<>Y-r7??8???R?5????/????T???!xM6?O??k?tg?7?t0?f??[?c??5H?B=*????|?>??o?
??
?5?>5<???Y?????=??4@??
I????!??q?U??tm?+}?"4V?)#?*{?{?p??????????t??r?????k>???V???F?????
??????edc??I$^@
^5<??3???q???T,Q4hX????y?s?y??'\PG??3?$	??
|
?????7??X???s??
???[??T	??e?
??5?
?3?t??
1???3^~??[<Y_???RuP??5????.??????i}?Y?K??f?=O????B?+c?84??
???wgh??Pn
?Rq+????]?\?dr?y(O??[??'???N'???i?4??2??T?~??2???aF???/A!?#??Y2WZ????????!a???\??G,r???????????tp?J>??h7??N??'?? ?vdN"/X>5????A?:H??????9?A
`?/`?g?;??
0??C??+???if???k
??g???c}S?????N???o??IT6??U?^
??0?0?@'?We1
??{???????o??????9wG??/?k??)?-t?^n}"?woS?>;00?w???>?30:?K????m?K??OTQ?.?v,?>???w?S-??n????d|\??_?I??????????(e_??????-??~???o|??c???$??a???r?????O??????FXj|Wg?W??W????%?????d?l?y9?ej?YF???39???&??so?P????2????I?%?Y~?dj?lF?_6??!:??????R???"Ag?
,>?*?N??????j?	8?$?y??W?!?#$	
GF
0???????H???????T1?}/??????6??????=??jl?;????????w????S????????????????1F?Z??$???G? d???I????t^e???=C?????{?u?|bm????*?e????1y]??F??*???2??	??F?z^"?$j-?7?F??O?????{?;?|}????uXw?)??!ds??{uOggS
k?/l~?w"???]K?QUJ??/?@|z??????Kp:mE>?q]?A})0$g?YU?j????B?G?{???[p??L?=??BMf2??????Wwb?????5?8??????I&
^5???Sy?????k??J

??DYE???(????}??m????g?????#??????:{??x??RbJ??Q?H????M6~5|??g?
??x?????l=cZ??&??,?????????
?_t???)????'?????Fl{????tX??
|?????????n6
CN$H??T??V 7?n??Y????FX???m?E???p
???:?)V??VCL}??*d~???:~?k&Aq??^d??r?s?1?Aul??e??lv??n?*w?sv????????x^???[??e??_???>md)?>?]9?]K>???X?????*?}T?;'?N?\w???e???v
@???????!???????^?,??aye????9???V????e?f_z?l?Ee{J???c>,?y?	?(?????Y???!??_
??6???4O?f??p9?5{_??@??????n???bf?"????h?m8??w)'????j??????I????4?
???=?????G?!?)hI/?n??~k?n???i?fV??	&3?|w????3Lu?L[>F?d??????s?-???_?1?v???G???n?y???It??m?+}Y????8j<3?Z2????c?????p?Ly???????%????n2M????u<3?bj?'??x?????????\???0	?9?G?J??g???pD}i=xGd'??5??Ww;???K?W?r7??~i???^}?z
???8??i4???{??? ?wJ#?#?e{5?jOTS??H??i7??G??t;?t?E??2WlR???|????????????>b??C?? e-?????W???2E?0????
~5|??o[
?I?jx????
???f6??3O=$???(??X???-?vP?P?s??? 4?o?_q?M????6????8?Z??}m??$W???dd5)????B?J??????f???niaL?s?Td?f:?8??
g??????a???s
~5|??w$4?>??6
G??[????=????g#?????;??n????????"???cI??z?Eg????b?S\???????6jL??=/Zs//????.?rf??????t(?.??+????9??????{??,?/???&]|(?????-???"???,?^?{'?=S>???????!3[???2????x?7#G???df,A??~??????^??3?
????Gnb??c?P?+???????srjn?M??Z??????~(<U?????d|?????L?e9???*p
?????^??????????L;?b???.P?F??U	??#;^YYFA??bn?I2<??,
_
?????v?}??_b??????Z???G?9?{???:????2=L???G?U??C?~??}?}
??????????7??IG???H.gVv}?C??W?I????)1q??????jC??FL?{t???[????Y?L????Q?????sk?C????,N??%??9?????????>???y?	??????{????B??????????}?3???d??|??????z??k-'
%??????T~5???/??j??`B?~Ww??H,

ieB?	K
}?Na?\???Q?V????z???x??h??U??kK?f?V?????[??TY*?;vg+??!???B-?????/
??????????M}?????{???????W?N???Uu???'O??????~S^???wD??w????}w?L????
??>??td????t??|?<p?}:???j	
???

?????i
???{"k??>}???d???B??g????_3G?f????(???O?????{?l????7???}??????hX?x~????????Y???u?Y??j?7??u?rv????s<??\??A>oo?=*??QF???m?@??S??%?]?S?P9b-P.U??????q ???'_N???o?d?U??????f5??0??????#[5??.f?\

--- NEW FILE dilvie_-_half_baked.ogg ---
OggS
b?9?=?dkM???[MJ)%
Y
*????*????2?,??2?,??2????:)??B??k??????5G)??RJ)???9?? 4d

Y
b?d!gA?:?!c?R???c?AB??R?ABCV


Y	

!? tB))U9?sJI)x?9)??RK?sJ	???Z.?PJ(??[???RJ)????"?PJJ???!?TRj?? ?????R?1!l,!??Z?5!?j)?k?A!\I??Xk
??sj-?Xk???[???
!?B)??RJI)?B!?RJ(%??RJ)?B(??PJ)???RJ!?PJ)??RBJ)?TB!?PJ)???RJ)?PJ)??RJ))??RJ)?PB)??RRJ)??R)??RJ)???RJ)?RB)??JI)??RJ??PJ)???RJ)??R*%?RJ)?
)??sJI5t?A????j????9*)?;!??Z??uLB)?c? t?R?)?:????J???PRJ-?cl??[?1?[+??c?1??Zk-
0x???Pg)?Mk??-?eT',??y}
??I?????LL?X??OO????z?R????????????,?s8??3?4?@?????????

???|?????/
=?URHY??_%??i??
:%???nh?|???FS?Y?K?.?t*?)~*-eu??uv?A??k6gf???L?"?v?Is?tXN?P??-N?+*?????uZ`?4??<e?M3???Ly?F??????j?~;J+????^{??ar?Jo?/?????OEb?8Hm???YEa???S,K?e??4tu?XV??t?Uw??$?D
??q??7???,????????b??????.????	?R|??????2U?A?? ?????=?t?????
??????U?^?uj?????]^o???<????Y??,?*??????????A??/??3k??y0?9?w??1W?|R?2??:???b]??_?k??S?????P
^????"(?
Q??/|???"1????9w?
??w?\\?p?
<??4h??>?????V2??o???R??????O?Vw?u?!o?cJx??e5??ye
4?U??7?
??:|??????f????Z?P??W?mN???F?X???4???+??3A?\???X9??@???(???G^U??t????y9?????B%}V????TSg%????v????????U?????5U???i%???-
????.?NwR??H
F?? N??@?8T???6?????j??<9???a{???????ntr??"? 9??@???\XtO_{`3x?]?Md??&?/X??To??=JY???K???8?LK???$+W4?????(})?????x??G?$??^??I6}H?????P"?l?~I??d??<?Q7???CAjac?~???A] |??)??????f?:+??V?#?r??d?<?~????M4%??1???^?h?qK]]l???Ls60=?[6&?{#?Z~?]n"%??
a@y?B??(?@"???P`.???K?Fp8
?3 ???m(????(N?jq~????<Rr?	????+V}L?Af;????c
????f????r??*P?Z?Nz??z???????7??[?????B(?R?n?}$?G$P???????k"?]N???????Q???=???-G???Wt?X{2z??? *b3??????(?LW?M????f?S?O????M??V%???aR??e3
??????3/m?'?sM?y?"$g:;?g??_?XX?E???NO????#)I???&{W?{??\m?}??$c?J?*?????H/v<?2d???T??d??s{\?~???RVI$
?5*?XQQ? jw?+M?^???Y?????~"vj????????+???X4!?T?86??:????Def???????f??v??????xg*x?	??}?w????m??fg?????_1r??/???????S
?????+????h/:?(?3?dx?7??g?K???2??*?????s?Ldn????????i4W???(c?????[?O????G??????????????;??A?5??*\???E??_??????????8?Y??*????9?Co?EY8??5???U??=??????<?{??????+?R at VQ
????d?
???\
??`?/?Sr?^fYx96?A??O??|???\???SI?D
?
>??
L?I??)???ERM?!?@,	&uZ??g?C??l? ???C?z2???|/>F??}?J?_???#I?????#?w?
?e??2krb	?r???????S?@?I??x6??a0???
?????g????b??????g{?7?=????
?V?_?t??/?;:???_???WR2?pHm #

p???#???\??S??J??*???|T???w?w??
DB??P
?@??????
???&?aeh?u^
O<a>{Pj??@?
h
5
??n??G???S??E\?d"?u?R?O?sP?????
???????~??gY???E??p:g???"F??*??<B&H?
????*eM???o????UP?Vc??A-??????]????
?????2??x??z(?;x??f???????*????3??gr?????Y???V??E~??z????	?_j??W?	I??9\K>V?Ck???eNj7??e???*/???a?oer??	y?1X?E????V???~???j=??7)VOGC??2H?/'?m%?G????;?PQ+??_|?|Y"?R?
>]???
]???
DRAx??9?
??/??????
l?Z?E?r??? <?Rj???Vz????U?B??e?d9???r????jt??x?y??yD,.)?g?z??M?*???g???f???}L?u?V?Y-?n^??W?????~@?-f?x??????mO??@7??P??WnVO??Q??:3??x?FZ??~+??x??????^S??+??8?~foG4?\d??N?1)??)?t?o&3?????????x?epK?

???B?i2E??[???c???t?JU???@3??e?53T
zko??s???H
?R???}{|???=??s}*p)?}??vC?W??z&?g?-g?
H??K==?
?????L???6.{?[?e??BI!?Yr(.?<?a???_???wU?$Ibq
k??(L????NC-`?>????
?;?????)+???	
gH?t??\??/W?9??????s????+??(????_??+
?<"`?)????'O}?????W at K?????uS???y?gH????h????[?d??d&??Z:x???W???s?L%$bj?t??????^??'n,?:y[?s?~??i&Vm??X:??????2?K?Z?????lT\?????jf at 5??z?e???8???Ri9H?Lo@? ?lf7??>{??G~??O?\$???????8????e=?|Q~?????z?}???????q???g???F???W??}??@?2?"6???w?8{?z??.B?OggS
?????~}S?q9????I?????3d?????#<3u???Z at 8?,??
?
????&&}B,2?w
Ff}??

??9?j?*=3??w
???M?????}??q???G??[?=????t??@???V?
?\J?????<?????g5??u?b??VS??_*???=??M?V?[??[?
????????????.?J??*~,?o??7???M????????
?
?pg?J]?.mc=?"?4c???GV?D?n???^hj?N??c5?/???t???S??x~??)?
l?Q?qo??z>S"??m?M??NB~?x????????;>L?;??-?U??!??;M?f?f??3x%>??eD?v???g????-?????eL???o? ??MH???????
??2?YP?R???
q(??,$H
?S??????I???n(?.[?8p?q0_?????O?X1?
y?B????J?K6G?
?_9??u??????82??%Q_?;???o???o???c?F?B|]???_??z
??i???K??*?|;,??w)"U?,?'+w6?P	????hd???W?
???<Gy?$	??R2E?*C?K??D	AZBJd	AI?4,0?
,`?
t] .+?Px*?~+?]?`I?>???R??9??ZiWiC?Lu???X7
?a???&??4???<C??????#~?#_{???
]????@3=w?oz~????????x0]?~S??????hk?~#-2*S?R?r????,?|&??????B???$??????]???r>4??'??,????'F?????wCX??
2?K
<E????t???/??R??>K??Z?;??n>\?jt????8?_?J???e??xx???????~?K??8?)?=L}wp9?wy?j???]???$??Go???-??T??O?

???@??D?TW????DH
p???`???{??
??;/?%'dGWG??x???????z? Ow??@{?????????h??l???u??"????S??CE%??R	??????,v??zd????2??Z?????a?Wo???|.N?,??K?M<y?W6^?????????????q????-ZM??|???
?L?wvx2????y?3?-S&??u<YJ?-OJm:??!?M?g??/?x:?x\O??3????d<?-??`b?=y~?.????8????Z?????M?Fw_?t???e??????I??\???Y?R??????0?9?????*?TK=	uz????>]T?s=??'
???????mT??_???:????N???r??2????"O?-???e[4???8k^|
????????????D??-???3OggS
Z???i$???BeL??o?%	d?fL?s???????O!?gm????^/m???Z5?E?
????Y??O???,Y?}\??1?3=,?W?W?|?#=
???z?
!?^y?x?S?~x??????q?K|???r???A?l??~?:?V??9?+???~?T?jU?o????h?YKb5??&]f???????????????/YN#?"?????x????U)?Be?O
f???1?????.?L??z=L??????FG-gI?D" 
T???K?x??????2???????D)?T@??'???w2?\O?ZE?bU;S?V9/mK?q?
;???I???'?F?"?j?????z??}{?8M??	??w}?o?j???Fa4Z_?N8w?9????3??t?	?x?-{~S?vuM???A(???7?m???]f*D????]j?>??y?????o
??]??$??!)?[?}?????A?????^&?`C?x?nIFU?E???y??g?^Hf?k?/Q?&?7u?[?8??dD^????c?Y6n??
??k??b,C??O????V?T?
??=<???$9?R??vlG???W
o?G ~[????2????????T?"
???Hm.?v>??X???T?????>?g???^??Z??d????;Z?4?g??y?Hq6q
pk???B?R^R$S???,]T?[??$S????X????C
?Ux?w???j??fi???Vx
?|?|F???4?1????y?????s???.???????Y???rq??L???<+]???c??a4{~$
??~W*Wh?dz?wJ~???ODs?[KH???*?
E[?4u]U=?/kE?-S?
?A?h?B??	qA??e???5?o?<n???~????????e$?? ?????X|??Uy???(Q<HaI?4??C4???I^:?x???J[??8??SV?~??<ksz?&?????Z?/??^?????:?x????"?D
????(???"Q???q-+????;???7??????/
??E?DRy??????X?Xg?1?.n?Z?u[v??V????9????,??e??:???R???n6
??9??2?
??Jo?(T?2^a?q??????????^???R??????????==????T?TB??^?O{>88?Q?+p???6??V???X'`_???FB
??R??D& @F,?$?TV>P?????m?~??3???e?~k??09z?????yK??q<}?"
	????49W?
?s.??????D
??Kkp#Sa???0
???]??Y??`?[A?M?!?????9??????p?J????[?^?????S??f%2????9?????7Awj?U?v??F?#c?'mw`Kr??=??[Q?????????%!?m??u2f?5=?j?G?????????AI?{?]?!Y???+???????'??nT?'?| [????i3v???{zs?c^?{??"??!? I\
q?Ca?l
y???*c??????g??)h!??W??J'??c??????gO?V??[??????r*m!R?????.?9]]?>?z
HY?????f?????w??3?$??"?*o?h?}???????????mp?????????????@?/?+???O-"???_N3*???-??aY???P??:?w&?????o?~8}<??"?P?+?oo?y[Vu??;????&??<??0?R???=1?????????OE?+?-??UUNX?St?`ZP???G?d?
)?d?y]V

B?'??fg???$???cJD?}??7Y????????????\??????UoX???	?q?????{_??`?m?n??0?L??>???G???cC?r???wnm?????????SO????ju
t????AnT???Vs??6???????
??
?s?,O??????>??????4k?Aq??????v?b???o?>?nL-y????3m??w\??I?'???>?''G.??x?a?I?T
?Kw?Jz
?SW?|Ut???w????O?f?????????:?zC??Stk?
|???e???#?~??????????>???4A?h??6/????%+!_???'_???w?:?$~?-?%??D????T???9g
?J?w?(B<8u)???u??????JK?5??D	?%???G?????q?w>3o??????????xYu?O!??%??p
8???yg??}???J????2???.?s7????j??r???$???V?'???t??$?	?J
;??Y??K????yXQ????????r??-{,m/?c???],?w??,???vg??vq?n?y)?k?????)??,??7?[m'?[?e?$?-?}?/.?j??X$?{?jvL?
n??L?'?????XR???4$?????TX
??K?J??$a


?+?z+????M??/???????????q\?pbV??r??txZ?O???????1o??|?"????x?L^??$??<???o?????Z???9|?^?$???)?????????>i?Q2??m??????NVY?c???? ??I#h]???+??iI,?<R????CK????????[f? ??Q??<?z?v??&??	+y???~z??X;??~?????d?([?L?M?az???BR	L?????{?t:r~:?9~?|???????V?-
u??
??????????????????[?&;F?=!???5????c?i??$.a?D
?????&?%?l4d??d??^ 9??
WS?9~y?x???w??u=??????
c??h??)?-EU?q??4?ROqE?',?k?/V??Cc???`M"?|???2??-?8???(??(?,???\??]'I?H$
?k?L?w?>s???????????????)?%?ot|??5#????????????)?w??=2U7???????\??Ycn????-6?C[????,G???=?)???(B?i????"Tj??5??(?&??6]y!???????:?X?Q?b??Ez???/*???@dG???e??T?f?6V??{??49??\?#????N6o?SOggS
??f?z\.?:????\??}????,?U???b?p{????T?ka?Q???9'?q:v
d2???n??U?J?_???P?j??5Q??Z?I??L?Q???h?^,$[c?????O??W4????}?g?????oy???????zm?
LV?*/??r?
,>?^.?/!??*??^???~???.)?Rk? ??F?%?$?
??r?KNSs\_=??a???3J????M???????E)ZN????9??/?|?sg_E????sDV
???5?w?h????????Y??Vz]????^f?F?q????c{???|?XO?XO??/u{VP???W?WfV?????b???zg??????$U*?????2????=?.?S^G?2$?m|?YlN?bQ?????O~X?'v????????S???iw?3????
F??|z?4??l?b??y?sE??"&?Q}&??,?|?%?Es???V??::5?????|?k?s?????T??S`?q??8b?Ax???=?V?K?c"?O?
?r????K
;`????o?4???/???>??*??WQ
V??Y?(,D?@c?_?T`Q?/?pD?)??0?I?&EV/????9?sww??K\d&
TP
??r3?4t??k5]?[??????
A???R??o?*N??Z?K??2?[???????^????]???????s??Et>??`??q???????O????Y$z@-???z????w??9?
???a?).Ah(OO?S?:LY??}d}T>?45G????:v/???8=o???Z??n?_?uS(??C?i?????@6?tx?y???GI?C~??????????$M? e?8
?????5?{???GY??w??E???yf??#+????/e??v ?z??J????C??(?b???b(?B?^2#3?????d??L$
F7T}Jl??z2?(????|?3????k<???R%S????8???3?c)N}i
]????,?X*
	~8???2?????&?
9?(
2hjEGvt?^?v?8g????!H?????Py$???j=RC???rW?????????;M{zH;??e??<??f????????????????????7)?M?-??O?Ux?d??
???\J??{???????z?????????'????)6t?kO??????6[k??bqv???f?L?J???Q9???t??E???`H?2?
?????0*7D
?h}%??\??2?E?	/K?U??????????<G5???7????o?~?????slhoo5?.??N?u??m?M???Y?A??3?????uO?:?~??R??#?%?????P[?~??sz???????????B?G?N?/&h?6???r????-eM???????(	?s$?X?R???H???8?'?n??W?G??dd???w?Z?w?{??^?L???y0??H???A+??f??|?M99,?????L^+_?$?P?,???<??S]???6??B?w?*???qxu????u:??	????????{gffv?????\???L
?-U>??bb?I/PY
??tq??#*!Z
FN?#?X?0u**?vE8??A?????0E???0%?L???J?8+s??;+?\3?A?Z?@tD?H??lc?m
?0b??b??,Z???F#???L ???Q8V?Tz????K_?|C?A??6??(???????_???????Q?,
?n??:???????N???u4(S??7?'?7???zsQe???r?F?g?
?????x????*a?<??????PR(???E???D????C_Y?a?+??,?E?7nK?pz?q?i??8??6G,?A???<?_?-?`)??dn???0??7q????v?>]??m?+??????????df&
??^?????\/w??}?????????9???8?E?????Z(??l56???Jdf(S?2???v)?uD
?6Z????Z+????^???0"A?Z????w?~]?}:{?_?????[??G????????w?D|.Q??-?whm,??m{	q?8
??
?X???j'????I?)???x?%?G??_?{?????????L?r8?9_?K[ncO?@?>?E????????z??=???9?;?????q????~n]?RG_w?i???	H?*?;??b?}(?q???A?lD<??{6?&;B??Zk?}P?J?1??2???2[;???o?G?T???J??z2????}???e?o??)fY_??~

?2'?b?8?*
=O???;^?{??(|??*M??R.6?"?Th%?Y??
Eu&????X??????di? ??H{?$+?k\I
*?L?A???q@?1??[T"?Zq ,??b?*?E?? TP?P???????"???&QYU?N??k?i?(??Q)R???@iP?Z?8?V5n??:???F?I9??"*XF??R2????f???)?Z?t ??e??\a@?.z?>?T?E??V"??6H??c?B?lRM??V???c?????]?Y5???-?G??.f??{>Y???zJ?K?$O????,%O?]?V]H)?????SIL??????????M??@????7????V?\??[?b????plZ????9uY??rY?N
0??rl?m% CK???e|???
??E?????B?W????"?diH?????$?*??I
?L?TI0?
?#Y??????*P????=qO??
[%C?`0??F<?F?,??P??d???\
M??e?M???}l?X?F??
P?Lr??7L
?[???,?_c?
?r=D]?k???O9??-p}hS?2??&h?I?wL?^?df?OggS
@[?4??????D?}?0`@g?k8????????2
???????#?V?U?I??eN6????[?I?*-???????^xf????R?
H?????~?G??c??o2?3???Yd?[2>????Jd????n?6?@(?????H??xS'5joz?(?O??R
???l?d?1?S???8??%???
??d?6???x?6^6n7?)bA?HT?7
L??YMR9??H?>??^??=|<??#?S??Hp??j?Y?oK??1??;?B??,?O???t,?R???t??h;?+[4??cx???u/??????~???w?k??<?????D??????o??n???e??I_? (3?uG;??>nnz&
???I;?K??.???3??D??????|???S?lqi?!/C?-????
?s?,L^/??~gb=??d?????EJ???]??????r?\%??
?j]???D??Y????"H??M?O?J?:??%?"I??k??+W?p,1	
8j<q???,@@x?sI
XU-??R???I??_A??????U8&|??6pj?FE9???!FwnWI2V\Re&?
????(R?Z?h_??0???QX?N'??u??jD???E
W??zm5t?????P??????3????U????:?H;??+.i?S?dN^I?C?1*swl5U???>?.G??}???-y??\??=?G?d,??VG'?g??z8??D??a??U9???[?K	#o#/????????_v??Xvw?*??6??0?l?1^h???~????'??P??Z??qep???)?N???.;;e\??????m?^t?R?[4???????s)\?L
-?z0?4=5??>LRz&?O?9?5??-]???X?>L?Y7?oVR?????N???
w?????o??6"? ??z??????t???(???1???Z?B?~?WU??}H?H???

k?j??EI(??4?i???_e??i???2????>??2-?g?2?c???H???J??9?"
?#??s??	?Z?
?Yi???Z?y??"v'%?{4??j?uF??m?6????L4??I???j
??,A???%^!?S?F?
?D ??1N??FS
e

??????1??\P????????V?!?.??}??=?0??_?_b????
 ??????BP?????\`.??Z??p
????t?5*	b?{?mw%?z_??ws}j>S?*<????
|R??\????f5????>??p(???H<@??rVW%???R??2???t??*???(%?P8}v?Z??G?? ?.??wI????l$?S????j?6??=o?b??s6{??c
U???TD-PW????q,YKiQ?C?g?I??%?????(?G`{t???(y??s\??I??P?&?$?
e??\>??^?+?z????????bDH?vJ?qj?????|x;???l7???&eI3???
??5???????C>?????O?u?Q?sh?+}?$D????k?b????[????]/???l?C
?":.???????{M???zMyCA+??HX?7nu???NqH?7n-`??ESYqHA3??P???N.??.???+W????tF??\?G??p??????|?????L/B??H???K???????????7s8?]F????^??Y????<k???&x??q?!~???f?????Yq??[P+?Z?G/??]G]vf?/??{??2??Y????4
??:?)????4?QL?m/??5?7?s?D?>??3???U??????*z??f???%u??*?v_~\k????????S?a?????[A?`v1???)????2(???|[?5D?]Wd???e????	?.F???????lJ?_??gi??B?????28?;?<?D4??t#???/?(?f???*?????h??:?????k6{?|????t?r????^Zn???+?fTN?A?b???C?y5z??|?C,??L?P?N?
z?z??wl<	??YVk*??(4-?B???*P??b??[?hUhw?|-?jn3????;???YTV?w???????9]??_7?/5??I'F?6??
???n?*?K???a?r}$??Ir?ML???W??"!]]?w?????6T?-?U??????ZD?mU;O???_;??0??*7F???
?b at B????N??@y??Z??2%=.rB??2d????p?I?9

s?g???-????*??^|??Sk?????y?????q??B]?8iw??&w:???(e?u3????????Q????+K(??x??=r1????L???F???u?_?\Y????@[u??kH'?e~8?]?#n???????2V?ZucT?{??n????+??/?n?????g6?zs?!i???K??(?H???s??4???N???X?
>?V)b???u?2??]?T?
?HBB

&9??a??B?!:?ZPx;
rJ?r^???$oF?:?,?&?,N?h???[?e??v&???R???????V???8?Q`?dJ~?F??a?<?????CS????_zo[?1?m?b ???????O??.??Tz4???vh?(2??????7????k???????/?????????HJ5???X????2)?4?)??Y?????6??	u
E?U?
??\???7
SCLc?
???!=*????J??*?r2???
?.
????k
??P??!??I7?? `???????W??'????z???????J
?Z?9??????n?b?zd?K?g?????????%??M????$
x??z?:??9??Z?W{????b9?g????x>?C???*??5??	??L?{?{\w??????.????????;?+7?E?L????{N9=I???"???I|??/?t??`??_?d?
???,>R???|x-k??l??7{2??;?5;??:1???w?ZD????:4??_??M???4G2??_x?:rj?????&?_?	+????#???9KmV??,
J*???ii??Pm?rlp^}^?V????
/??I?"{???c??Nf58????O-&????	t??Uog9^?J?_?q??????????aw[????Yo??5????C:??M???)E|??O~??6???M?e?u??@???C?C????VA??9U~??9Y?3????????Sb???sj???<}??g????W
D???f??Y
?C????|?[??@?+?Y?R? ?ir???[>?q]???F????~L?T??zWI?r?W[?J!?v??v?6??y~[?b?l?s??yc>?9H5T
S??????V!?r??N????X?,???>V?}????????	??<???Z0?
?J??G$o+?Z_?/??????r.?]t+??I	
=?">????|???Xx?#?9C7?DR]?d	g?????J??>?k??8su???ob??????tY??ml?Bh3P??G??????r?????;?Q=t???'?f????R?1???"???0BC?????7?{??_?"j???^????O???d!??od??!?f???~?RT????3?Y.a?:???^??n??Lv??V?"T????T?6?|?=?I?
.?o??t?>??Q3k
V?Q?wo?*?S{%???q????]???[L
??|??9??? K\^jM??A?F{???(w"Dz???????A??[????#????i_?????n?Ub???/???????W?w??>???-?z?'?R~ kqX?`???Q&?
??/u*??kM???t??h???)??H?j???94r?g?^??????????{?'8?? ?G?Agt???
?L???$???WX?[??;Mv?/G?<"?|????|??(??K9?/t:8?n?????C?l??h????MT??z?g??0[??????5^?-g?Us?O?U??o?d???SI}`D[K?V??|?????????????o?-(???z????o??{\/?
RU??????????P???/????Y???|???+?i???>5Jb?-&??iU?C?E?????? 0??N?L?*L?????+/?`?????/???5-,????]?????+~?:????\?Z???r?n???????(????IO????I?_?????Wf??H7??????>/Z*????o??r???<1:?Wn??Oi???m??++?N2
?~??}?$?Wn??0????|?)?(??=?%?F(?/?zr?'^?%??????tY?Y?N?M?
?2?w???R?</??F??
?V????X?^?c????o?U?edM7?,H?
??y6
?Z???-#?Z??oK?.?&?"t:???????4T??x?	????g??.Q??C.k??n?$q:I?hf"

??+??L =&%?.B4?u???T??E?]WpW?H?HI?z
??
?$

L`j7?	?
?ok??R*?L}?u?U????A?? ?#??7??????L?????-?r<??K??[??LT?
?7DX+??q?????23
??????????_?c?*?????yB???T? ???^G??????K?=??????k??R?<?|?F??7B??N<???????n????S?
?5??x????????E?i!(???r???zU??u?/|?d??y?97?>??{??S?7?V??$??.1cm???
??w?o?o???????jr?~???.?<???C?+^?????Yh??=???e??~
|
?6?#?Y?]?????Cw????e?D5p???^??|n??i?+n3Oak???lo?7C?????p???;>??=????D^YMw?df(?????<L????}??_?G???i???2[?????5?
Ar??`)?(????@??4
?t??]M`??D
?x??????R??a
nm=??S????C?f??J?<????
C????2>)=?]?B%??]????k??_???|<???????N?R7?H?#~?p???D???Bv+V????W6???qQv?C-?i???h?+s?BT??? .'?:?N]#???uh7b+????Q%??1?=
R?u?V????Z??<"???}>?;??????>^??|!???s ?`??:???
|:????	????yv?4U???UZZ? ????
/?wd??x'kE?}????.D??!X?5~??7?????#So?Zt?O?%X??
???!k~?=z=oE/??b?????
'UAJ?ZM)?0????sK???vO9?eG{[m?'?Q?:?UR:??J??>????-z???????#?Z?hY?????h}W](V?7i?????_??K?s?]??????/??h???
?????q??g{g?m?Wf/Xu?Q&??_??;?VBg}?Go?A?U?r??EZ?????????Z?;$?;??s4V?{?@6?r
??d^????5@??*?
?3???
??N01?eV?h[???Sd*E??g???6E>?'eA???p?=?[??L?0??b??D??y??yz?fO?????W????!

l?H?}?y?Z1????????(?>???=??z??t?%	1f
???$Qv6??{???U??Y?/?{?[@?/??#22???????QX??(??~rZV????W???????N??X??<?]??f??X?:?Z???????{???|?J??????6[???bN???????NI?H?W???
???$????p.s????CT???r??o???^z???Y1[??Y?~??f4???xz?7
???+p???/????S?M?R?iE]??????G"??D?????????@5???Q??{??D??'?????>?53$.?/?K??G2?oK?'?{W
$?`????Q??>???Vp:??pl?Z_-?+??????bB??U4???;??0?#????N2?????Z?_S??????,?S???~9???cI"t?`???c?????xWD_??-C"/#????2K?
?q????t?SZ?O??]?j??????f?W?9??
?D>@^"i$
???x1j???????~??????:?l???5_?h??????y??j?J
?N?_??????i??%?M????[uZ)3??R
???%+????? ??Q?????{?????t????K?OxnW?L?;??8F?D?
?T'???6????]H\V??~\?~q?g??q?e????{p!??@s???tq@
?	???c3X>???dc??=?u?8?VP?w[?i{e?#???e??k{q???^??]?H??#<2?G/s???Ce??<?'%g}?? 3?$N?$?Ht???\,5?????dY?+o"??A??`?j??Q????k?/=4??????f~??c/??\????#
?^??S???S?b???????>?F?Tx"
"??V!S?t?4]]??J?i
?mMm?"?{?x?x?n?h??'/2\B??i??c?j_'????X?2?$?}????Y?(?x`r??7???gk?U????u???w?????q??O????y??????Ndr???QcE??V?G????Y5??????K?/?HA??H??0l?
+?#?@1??<?????=N??(?#?h????v=?j[[??
??oz!???<???h??s?f%
dB??~oro??T????s???3Jm?+
#???H?|??	S?W?:?o?????U??h9'y13??[????U???kB~r?????W/!?i?8?|x?a?O??f?w?D??/???????gL7?aV?????????j?|?.??O?'??zo?~?JF????y??"z;Ir3z?Xv?_?)q????;?W??;?????? ???q???????????=>?;;?n?\??xK?'??????_O*o?Y?p??'y.??,U'R,l@?,??.mxZ?^?}?(???R(<0\?Y	t<5?M???4?IRhW?/
o"??????W?Q?ys?O?,??????????;?2mF?Z??lV{?
T?X???y?]M{?)Q???<y?gFEZ?K??????+v??s,_?y???+?"??????	\?1?j?}9?s/?????
?&?????Yw????
???????S?I?B???_6??S???&VQoO?f?'???>2z??y}T??o?"??X2?	??????X?hT>W?@:?U?????z???=?4{j``w?x??i?<????(???W???`X????L?????U?????_???????MI	?>??U!tRC=?2?z??K.~?}t0c1???
?P
??L=f?>?b	?????'????P?=??=????1	
?y
?$u??$q?\??c
b?r-2H?t??%??l?l??M%?b????F
`????????????6Z??E???????
z;yQ????K?????????m??0A??i*?????Q?\g{????U??zD%K5?????ik?FD?[??&?\??r?-????Nqp???>.Z75??jF??w.?JQ?79?@~??%}UC?*?h}?"O???j????7k?T?
?4?^????A???p???Y???qJ???g^??/~p??L,??P,%????\x????m;???(
??B_?;?>C2??w?=????|(|?P?
'B?8Q(J???Xv??{n?U?
K
P??n????????e?^?rv????r?yw???r???L?d1a??5?97V????????U????#	?wIp?+c?
???)???k??k_|>????6?:vc??`?yw7z'|???????3?????)??$!????Y??r^?b^+????n????????j[u??m:c?A?n???;I??????{vR?8?[Y?h??9?6??_??>?g{???i;y}I?^?r?????TH??em
[...31150 lines suppressed...]

???5?w?h???_qF?+?????
O?{9W??x?:??C????A?\w$a?g????UY]?gfu?o?k?p?>3???;?k???????C?=???2????????H???6Z?+???????U???2?????, *z?*,S\?<-??????_?^?}?
G1!LaR?I??K?$'wN???]?????D

?n6+?FiS????k??~n?d???Q6AaN?r~@?4??U&?"##?3A?j?R??u?:?)??u??;^r?Y?i~?~m1?VN???C_??m ??u"?t>??`??j????N??<???Y$???
?5X??E??X?&?PTBC???.?Fx6????_??{-#qmO?????????m???>%O9??????D=>?nb?B???k????^??'?"&Bm??d??G.lrP?)?????????.???p??<5?8#?EJs????~?VB??x?`y???G)>!=?X?k??`?t?`"?L????W}4`u:z???7T??=OH;?u??:????
+?%??2?}???[`;?j}?????m??,'"(F?b"?<?]wE&??E?
?	I?$$m*!	?6$!??3#"????~O$F????X/??|/??
??_s?;?1/_?V????j????R???3??b)n???n???S???_"_uI??NGdeb??4???b?Rn?J????o??Q?6??ju?F??R???g????E???pV?VvW?CooVV,?NP?Z?a
=??X???(??Z|?lS???????CE????dL?q?{s?7$?}??????z?Xy?q???????x??Z?F?}??"&?t?????	???y??N?D???{.?4???w)?jx?? @#.?W?Mc??????dS??Cy?Q???v?^`
K]???v???8??^?????)	*??C???#'????(??^?+w??S??$?RI?
;??<Y?x??????k????4??w??;RD?:)!??kMk??H??<?d?*)/1yON??_??!?=?WZ9_?{???????E?,
gZ?n??
x???:???????%?M??<?A{??B!%?m?S$?>'gGo?<??zk???????^3]?$????Yml?$ ^F?-^?V?+???
8(?b-?6?X,
??+???*qI?$

?	V?[?6x?\*???.1??Ru^??Z?????????'9??#??%??2????k0Cu??r????S&???-?x*?c?,=?????????.??'U???X???%?\?q??????}?????g?f??e???x"UW?u?#??V???%t,N?2?m?E?<?d????h??p???/??_?_???$#`?Z?????`z??j6
f????;j?o?{????G???C;->J??<?M,+?6?V????\??)?{Z???????+??|??W?v?k????
?>;??e????6????J?N???t:?B??t:?V1??p8???$$!	IHB???$$?j;??>??}?C????cm?????Z???6?/???:%*nc?E{???
??lo???e?z?2????/i4?N?L??kN???t8N?4???8?? ?"??n??????p:????p:???CY??
]0??	?H??:??dc?/0b??0c??*bj?W/p???m55*GWbI?w????n?#H??
VE????T???0xHHC?G??C??T???DC)?6b??B?3?@K?vd'??wU?TG\>?Z??H?#??$cJ?^??6#cI#?Z?bg??1s 7??_???.??????M???&?z???W?q???}\I?
????235??Q?9kP???`
??=?/e?
??*bu
?[g?$\q???SB?q ??D???X?s?GG" ???L\???F?????<?[M?i?U?	J????D?+a:?D?????bo-P??AU?93??[?w^??1????t??Mw?IPtd7????h???
?????
?????~?,
.1???????7?m,nu?}??i?:??6{?
xF
(F???G=???N
????H?%S??b?@*?:????V:?y???*%??-?W?
R+C? C?S_??h6????^?V	?t???? @??"?qA? ??LG(1?y?p:/TD?ZE
WB???U???y??8F@?s
?*??
/?Uv,4?s5s>?.|0<??????3hI?6?f??3???-??1v???t????b,?????tf??"{???dM???????"??S&?)??.@????W???????>?n??0"nUWmG)2?`????cW?8b?$	
m?????(?BmX??D???
????r]
???4{???t?`JWZ3??y????j?b<????t%?????={???Gu?3?T?
?Mv??.??q)?b???
R)N?(??Dv???<CL?
?B5?Ej???VNE?x???Cu?TE!B5??ne???0????z??=?O-nQ0??1??????d????XOggS
?@??>I?u?J?KEf	
c?$??:4c???
ufAB?
E?gq=U?
?(p??
??U???[?T)??g??
p?v????8??????o7?
??%??1$a:???%???k????6;??/=mF??_,%??>@?(?9`V?Rg3???n??bhP1???	?	????V+?.?????T????*????UT]???8N?m?%??/_????d?\??K?????.??	?1`??????^*?????#?Hq?E???Hcfk?@%$????;
eEQ\??????Z????X?o,o???6??Z7?cJ?R'*
??{`??h?%??_?O?$????????9???]8???a
?z??Nc?VutLk?m??????wjT?S?
???[E???-?r?[?(*??BY?F???<?$3???L]I????I
?
T
)I?I?esI?<
?????%.q??I
g?W???D???2#J?BX??n?:?
'??* ?Q?????????
?Y?i}?x?B?#???tZ??)?????bu???+???fh???????SXoj??? ??G?._?3??Z<?????[?!h-??E|??h?
???\?v0?w?o???TP~(;?+OY]D???QR"?\]?????-,f?
T?? H?VDT	?????&?`1hxFQ?
5Q
????C?StC*?`????x???u??ue??"??D??1t???C?N??A??i
?(nq?.\???}??7
E?]?]?=Q??!J?`zBl??e@?
GQ?????2"?Eu?-?U?(??HS??1f?.??RI81?D
????
???E?????s??uL3 ??$?l?cp??smku?SS???r????c??J??@???
V?y?v?
?pS????'?i?h?????8????!L?
]?b?!D??zF?im|%?M??Z
?M?A??C???????a?/?84]pA@??q??m|??)??`B? C?P?U??EP
??C?|)A>?E???tC"?????S???"??}?];W?Jw?	?c?
j
]??G0?.?????
???u??[
???|??Q>??l??IM??gq??????Q
?????i?VR&?#??P<???
]???X?H????!v;?K???@\^
?
BA????S???R%A?H\?p?p4>?&6?|?tU lPt?$??E??3
??CT?0Mv^0?r?7?
?8?T.????|???_? ?7?kN^??e|rRI???A6?A"???3^?w????QO???9??J?th?f;?bw F????8)?
?r??s?????r????/?7??J??????t
??g|?R??XH??N)?1???KDg?Q?L??Zt?y?????e/V???J*??c???\?K$dF?^?#???J????A????K?!?	q???<??8?6
?^?n?El?????,Q?l?=[?K??????3????e=_?g??'
?1a~i??WV;#???^???L?q?????z?q6??2Et% ????/?5
?????y?A?IX?7??Q,m???G?\??fFD?
)
??Bv#!???g???d>?G??l??:?x??p?c?*e?%)??T???
???l?9<??z??{9?]Q?Ed at h?E,??*???p??AEM?8???|?me??FS?:{{{?3??Z?//?????'6????X?`?[???X
??h??x_??+??????L???-??*??>)???????)8-?y?????????'?B????,Z??????e#??q?????G?e???"q??*2Tn?Y?9?H6?*k??"g?5?????;W?tW?jT????#????????&?.Y
?t)
S???.?RfnbK?D??N?T?6??GW?z????<)P1?T"
?^*??????A???r???e???.??????p???2??????\?k?????????????V??[n????l
??o????C???h??Z
^???71?N?uId?"?h?eJ??"'?	!C????(.qI8?+	
+:DU???l\&?l.?!??(`j=2f?%R??14T?????????8??(M?`????!FEU?U?R??D??9??U???P?ULeNoZwj???3?s????~?DA)?;?? P?~4?U??????=?|?
????{^???^??:y?w???X3?W???1J-l?l??ZVm????????,~;e???Y~+??.??[?*???j????4*?V]???F?z??
???????????L?&???0Z?S??????2N
?????????????Vi&?C??!??3$??`m%r??>l>vM?????????r%?W?
??q
?OD??"d&U3??b?b*1?Yd]??('J?|Wq??s!&??M
PJ5h at 41a
?m?|?t<????Wxj?C?4W?Y????Q??!>?&eac}??i5D?Y
K??%?Zq?R?+W(?,?
?)IV??S?]???C|W~A???I?^??.?n[?u?H??,???/?:"N
?j??^?qk??N??/?I??c^c"?M????"q]?t]pV?2?
k\?????1Zw?q??<c,G"2?)??eS?8?'?h??????
?j???qv???????Y???S?%???5.
?a??+B?D????:+?"????r?W*g
QF??q?YS??h??L???t!?b??o|??W???V?v{a??
Z?o+ at _


%???-??ck?P??>?
?N?5&??k?h?'?
??'??qn?`o?m?AW??!&
??q}?]???????m#?fE??H?^?>S1??????8+? ????SD?.?p
C8??Ag?????u^??+]4m29???
/Edh?????{s<????1L?? ???n??(?[)C?P?t??wZ?$??????EPhg!?w???$?TE????
?1?`?n?i-TFU?J!T??b;D?yF?`m?????K?a?G4i???v??v?????.??????T?0?t?D???????o?n?Z)?4?G??oo??I?3?.?L???,??1??D????;?????$??????????
gL??b,:??2
?8|????F????Z?S?????4q5???hq???~
%Z;????&???r;?|?	????YQ
$P???????????$???]\%a3I?
2??<??,?:?z????W?,)?XQ?J??;??"??8?T?b
?k??R-????????????]kz??Q??-?c<qkH?{???A?7????Qs??@kO???U;?h'???e??????-A?
"?]9R$y??G??~?J??/???P?>????>U
Z}:?i?Qlz?????e?)?x??$?=CL???A??e?`??3??V??9??w?2<?f~CdP??P#
??QP?HN?????%SCGIN2?2?
O?'B?2?v#t?x?(???ss*?G??=?"=7P??????????`(\?>[}O?'???V???=??
?7FB????f?CJ??;?."K?$

??g?o??
u??VO[???Z??kkU5??_???5L?O?f?X?U???k????j??J?A?????PV"?5?B????t???Z?p???T$????;^???H?o?+J8?AJ?)??B?]???SF}5???????R???BF??4?!5qi
P?"?sKhtD?+????k:??????EhI??[??G$??)??W??z??????????t?%?L!2?`
????|???`?V????????x??[d?pE8f
%bP!*.?tuU??NQ	M3?"hX?Z?"t?)?????W*?T%k?u????+?	m???k?????Y??2B???dQ?Q?;?W????{r|???B???X??/B8D?????y?<?~l]?T???L??%??iU[O???_??N?:s8?s???p??k?9?3u&?e???? ???w??????t4?x;??T???0O?,5?????}fz????=M?P?|R!?K?L??????$l@?.??*??-C?^????????X?_?????7?E?Jy?:l?\??????%?&	
Zz????o??X/?wi????W?(??T???^?????2?<?GE??f?5?DE?F??7?(????dO??????????H??/Xh???????n???O3??)-?;.?S?g?12m?2?????/Rc????=??;?k^???<??{??#??h???em??????H
"???8?2???O}?X??????f?E?X??;???^Q?l?)??\??s??(???????<?????!?Z dJ?/
A???J?=
?;?@a^z?FYd??*?Q????????7%?W??;4\iI??????g??W???m#?????{?-S&<>?
d??f7
M?`M??????tde?R???&+??S}wG??U8l?44v??pZ?H!mlr??@??/?*??z?6?8??X#A'

H^*#o?%Kg;
?W&kO??k??FCnS at +???Aq?Z???H??
C
?7
?F???X#N[??n
?f??T-#I?1?W3??Z???Z??Q?p???:??0^?E??????{??<??""????x?D???5?SWT[?P?OggS
?<??q(c?<??T??,??It?8E?u???S?mE?V?n?a?jZ
X0Vp??t???"8??BH???K??Q?FeC???R
?C?"?-???85Tu?5???????? b(??@?2E@?1???I??`??R?I??Xzk??f?%?O?~????)??i?M???{z?P?p%??u?[??????G1ON?~?
Sb??k at B??????&?w???n?????????????wc?????T?Cn???>U?g>?$)?s?A[V@???G
`?>V?
?@?D
Zs??

J?D)?I????????*BA?EBu\??????-m?5V??
C??[??8Dq?R?E(????J?B?f[?D??6???H;? ")?Kg{{Wt??6?U???F:iUq????TA???#J6??J?M???^????????
??O???6?v]?/?	?FDyLd?4??(Z:G??&???? #??i?HMqC?
??????????Fq??m???Q????????(???<Mw?z?n?o?
?C?????o??????????6	`@??5T
???????fz??A?m??P"2?? &??a?j????b??D
?4??Y??"-????KJ1?q8U?0??????3_????i?0&??(?[d
J
<????2H+-5'?@??4?P????|???]?.w?a??????~?&T???????c?!&?r??b??}h%u
?h?+j??J???-???(?8?"dzZ?o??
?2
????_Q?j?{??O????:4R??! ?r:jF??;????
?vkK
?M?Pp(???[?H?F???L??@????|OU?o???Bm;?iR???Z"????v_`??C?4*??(?HR??.??vz?1?641?^$q??v|??,%ZO?]???k??$Q?m7+?x??
m2z)??8???
!?e
h*??
^???>Go?b+??^??#zzGA?M??$?$]??b????$?D&?
??nT}R?d?X4EA?6?	??[G?*??i????????*2!???l&???(???h;??z;9I?Q#??(Jj-R;???|??????V*?L??u???;S?&?T?s?j9?LH??0?o8?v????O???B????">1Z????????nc?]?cb5KjI#???(?U??!H?<?/??_~?N'?rl????????vF?`??0rwSC???
??8	opPL?X?F???RJ???;?~4?<??cX????????{?b?gt??}?
?
z}????(&?N?;??`Hf???RVU???EDa+??????"?M?
$?F?Go?"??????8L??FA?WIL??[?????z98??V?
'?*T3??	??a$& l?!(N?H?V:????tD`ek?6???I?????1?*hK=Ck???!???"NH?-F?H
@??*???(-??V??m????S?`J????:??"???`S?o?
N?1??0*?1?I?XkY?[;T@??fmb??0g?~*???Bd???O#B??5,Fe?]???w??3P
???Q???????W-??z?P
[2d^?O
??5D?r???&$w???C3h)??<Q?44(?
?G?g<?*????\???3i?J1??????f?
?N??fXm,>???;i8??hx5'
gsJ?'PE??O??b??????i???[???=?????n]S??0??x??m??7TZ????v?Ld?~??????o?
@????G*?e??E?F?q?(??S3hY9???'wA?b%??,T??#??????t?P???xj??L
????&?9?N??Z?<?"I??Cb?mR$?7j??k)n?k????o-R
(z^VN???Z??????x?DN??W???????????=sS??????M t4????+????\`
??2Y?q?*???8]?v?!?M>{V????7:Z??\?Q???Wm?[^???{8????,
D>?o??g??|?????5?j|???(B&???<???d????#?????0??:+?????e15?S?h??N?????7??}8? <??????u????
????8.?????????
??JkCw???>????n^??????z??????~?L|b??\/?b?Y??s????*?W[???I@"??????k[Ra??1[????p:jE+di???|????]?N?????=R9?T??3??{??VT6?/?9,?U?y\??s?????wIAf?IBP?
?V?u???\,5?????dY?+??a\?*JT?ya???v????\YU??+??\3;?c?ry??~[??9?f??s?G??(????N?!g1??jY)?RIP?e???R?
?Q??Q
?4CW????C?XS?????+???????t????b?y??/?
?"$???Q??2??Wt?62o[?????+?md?nG??????L?Oo????4mB8?Q{?u??????w1 ]??v???J]?Nt????9{~???}?s%-??????!??&?a??[iR????
4??W%e_?0

?]?4A??LOC"?
???R??+u??:q??!??C
V?8?-?1j?>8?f/A?Z???
??????C7t-?
??%?(?E?eD?Q+??:????5Aw???x:J???b?`??E?+?l?M??$d!Rdw;??ng??%??s?+?I?$

??1??k
???,x????mx???
?"?n&K??o??????sZ?????(?=?Sl??Svz?q???F?0L?n?-??[?"?(?c%1?OaP{{???@??4?
1?=???\?$I"

u?w????eV?1sa???s?%#?sjX???"??G~s?S?~L????no&??*??+?S.?
c3g????`????
?????5???L?=a?3?h?q????,?.>??	yo?i?:?6??I?U??![?????VP[????W?HpS%?)?JR???,/???K???b?
I???,???d????0J?[?7???Y?d?uL????H?????????'??kg?\P???@???3\u???J???h???'??U?#
???dC??????QE	?S?0?X???Z??i-F??Z\????)????Q^??AG?????Q^?# NM?SUD@?A????6???y???p??-`?N????1H??????UW
BJ?a????	??????Q|
???:??????V????Bw~(????T:C?k]??`????G?d??S?a?????S???=?AB????W??[??{???o|???~?0?v??0???05 KX
???:???d??_D?\Z$?wL??N??<t"w?f???J"??	?????QD????`???H2:!(?0h??^m1bZ?????35???N????w??<?N?VI
???+??9?O{?Zy;r>R???7?p
hx(3Z?u
?D@???j???6???g????`??{?f???T??m??A??Z?)??mu?u'G/?
{??????????????P?}]???NZqT~M????????8:?/).+gl
(1Gy?0?p??????S?I/a
??L???hR??"u????)???4??NA4R????i	Z
??ap?[??n+D?p??<m??Y&??>?A??L<2?h??)md6b5smWD??nk?49?%??A#m??k}L	?D?=U[?1?H??[??6J?A?-?a?`???K?*B?	
Z????#??ds??`?S??qD?????6??4Cd	?(?yK??a?gbICZ?La(
fhqe?CSg&_?!???/I??hJxq!)???E&???o%??U4??=?0E[??:?Q?_,?C??N?,5?
???OggS
Y??:4??v44??z??_?????k?????????N?u?a(?
?????I?G????cB}>J??2?????N??S 	?%??

2
???V??}.?jlQR~<????b??N????????/fQ???"??a?IS?iQQTj1?eJAK?(>^<?M(????j?c???+????uhYvP)?qzx*#?W?+?2E???8i?k??3Vl???????D?R?N?"R???UE??)H????iB?Z?fdh }l0?(?????eR???S'c?4T-??A?+?%???????Y](6q??L1??~%?:?= ??
?l???? ??{???G???A??9Zf?????zs(????K??7?,i????~??Tf,?CS:%4
X??S?j/?????p*??(?
?5R?IO~?????
??
?0^???-?HeA`?W?b??$B6e???A/??z???
?j?r-?WF?????r6?'_^????2+?
?
?&???t???	??|???*QU
??<???T?	?=?[??qW??"4vA???????7??c?????g?i]6??\?????B?|	????????F
?????X??????x
sro????'7??L?\?{?f??s??W`???zO??\
?
?????/
|
??XX??N??(?8???[V.?@????D??B??t^??xQ?+O:???{z>???|????zx?^?O??????L_?7?''??r??Q??=?+??E??`?(!JP?}????D???_?9??;?????^t?~gw+[???}??V]z????}????v????7}??????	7? ?b???x?*?T???????l1??X?	???Z??*	xe??)>'?+????U???????)\}~'???U???c????j????????yJ?A?~??.??M??Z?????_r???L?(
?J??m\??rA?S6?2'?%(???m}???.???~???$??o?q&?TQ,??????w??
,B J??,??@E?uiT???B????
???
?L?L=S?@?&?-????2?M(????v??e???:????j???g?/??!??????H?r5?????i?D?U?x?77uc????E???????(???????.??X??????h.?4-X?+??4???9???f{V???)??:,q???~?Gg????(+??{n"G????G\o?&{`W???U`?^;??????v)?z?F????o1.E?
?AB??YHW??$JIHJ????A?J7?"ok?????'??+0 +0
?,1?A?????T????DviM?f?X?
?tA?Al(9???G?????_??????E??|????	?j?w?j??o?'H
Y(??6?|??|]J??g??*??.2?v??pNgB??h?!?zj????y/fb????+M??l??G?u???i'?x?I???q?Oa?g
?V?=?J6?????y~k&???
l?WO$?5??tE??K6?{0????
????b??
?9}????^?9?2	?w?YGa?G7?????<i?^?}?t^????e1?U???]z?_?PE??QHzb?D`?2????????
?R???]?I?RI,?
8{?g?"	0F??N0HQ????GMT??X????5?x??#5?.2??*?????9?1b??z????h?Da???\D~?OcQn???UM????Uh?"}OD??|????6%?_y??m?o?????I???????xx.????$
8_=9???a??u`???`u???!??c??opL?T?
??j??????3e?(?m2{?	?????0??83g???}ENf?R?`?,
?7ZN?????e??-V2?????+l,??^?.???Z?zV'????f????jFv?vdq??A?)z??+??????[cN??????}s
?,??3????????s? ?|?????%??l??h??wY+7*?T???I:9d?e??j???Qo4$??k6???K???.??V?X?h????u<??????m?lv?2?^}?<????[a`F?	?Y???w'?????TPn?R????u4#??i??>L???j????
???<?s??X
??*?,???????>w?~?"K??e???5?????0Z5q?|r%}???S??Xon6+~?????<[?X???.???w????;5c?w?%??N??????T?[?V)?/???_{?????x?a????^p?+????????~b???dg??:?
???42??|n?^d?/?^N??t????Je?e??!?C?LR
????N?????6???????Q??F]?E????????>?w??x???W?[E?F4?u???=?}
?j???Oy??b???6?K^r?q5Q9)Cv? ?.?"??? (e]?_?1????!N-v
NV???Sn???@?`2????(??-
xG???	q?????????p?????N????i	??Ri?b??~i?U?????JP?R??????+lL^V*Id&?:?N???????!nW?x????a??v???{???|N????c?2?l
???'????-UH^?DB?k??F?-:?G}????T?N+???jq?:[?I??)??F??????2????U
?*%????%%e1D??????$??L
8?A??

&0p??b,?"5P??E?N?Z? ??TBPq @TP???+4??^???K?dU*?V?
?QP??T-f?4?1??MW?
G;=FL8??2JUT?60????y?-??Z2r??%<+??F????x~?7????(k?l??olvK;?6s????%???=d????
l???D?V?IhE5m?He~??g?$Pn?C+????*?r??%[??N??L?N%?f?"`??[???6?P??V4r?>,e?iZ??k??KI??-???????G??
?cjy??Hq??~~9?5?????;?????[w?&s^???U_?????\?V???Sn??w??]?'????e?m7"????=o?]??D3?n????~???w??_<"%????C??7Do!????\f?p?-???+?V-+??*1EX?R?'?!?$?C6??
>J]???G`k?)??_?7??k?Q.??!2UM!????y?H?\W,???Td"

V 
I?y?'Et!
?$
?YU??
?v$?e2eA?EA??Af? ??X?h
???Q?H??A?De?0???
j?p~????;??a\#?^???6???s??SW;H??<?d_?h/2??T| M?????Z?<??\?bkJ?????+'???Y?
?i/T&6P????W=y????7?:??M&,??$?
?????3???q,???o??u??h>W]_6/????t|?'??%?????5_[Rt????d%?Df?6?Wf"?[??!???? ?V<S?z'??N?7?< y?p:j*x?????~&7Q???o_{???Fv????{z"3?#W
??s????q?o????_?Y??<!,??(z??(?c?????w
?????Z=???f???w?~??(????????V[qP
???EE?;??L=~?EgW??}??N?o????	?????Uq?T??(?
??,$
?;@
`?6?
????~??$f,
?
^?F???|k????s?3??#??9????f
'&????\?5????Y?????=???-,??O??n????M??Y??@yuIl:I?x?y%?s^??<B???-???B?tp???E???lH?	
"WE??V?
???
T?5????2@$|l
?y?7?-,??????c??(;??????{><=?}5Rs?cX?yv;y;

?????6??[??w??[8??????e??????????=_????\?t9????????s=??+?????Siw?P?hS??m???1??[,???A[i???7?\??a????[lz|?\?+v????I??J??k`???EdS??&*b?????3?b???_??????|
??W??)g5????,??b??????????=S?[&???D?.??i&?I????'?~?1;x????W+{?B?~A?K?(??x???{?,e?aE????s???u?d;?s????O??6+??E}??C??Or?}??}???|8s?g?"?
????rJ??``~5?L??1?^???`ZX0?5|
x?:?Q???U???I9?v\?t?!?`~??????5'??"??jH????????????8=ocwG>Y??"????O??j?????p???d???w?Z??:????????VsP#L???}???L??|O??>a?????z
?d?@^??64??s?~???:?q?????8)?79Q3?'??f
?(?T?V9\?4Y?J??)p!W

 &"!+#%??S('+
??4?t#\6???.hZ????<??M?{?MD("?<!?B??K???????	?}????Z??*b?<T?:?"????Z??
?]?	 ?I??????E????dX?4?X?5X??A?E?"D05?? ?)N?j?????j!T?B?GW[??
?]mQn??8??????
?\?P?x?HYQ^?"?H?@
)??\?t???K.]?t?????K?5?XA,j????C?DU?
N??V?S?Z?	???t??p*?
MW|w?2??
?b?D ?D????U????
[?H,
?(&KK
????{?5v?0;
?1?z??.?lw???<??h
X?? ???x?;B?a???F	??:??uZ??!??6??NG
?]?
??<?Z??Xb&6??
?	j
Q	W???2?????a???jFx?i?`.?QlAka@?d"?=\?L?????C5?jYEAU?	?$H)??.u?1?PM??????????????m

	r????0A?f?=;
????3?0]?hh? ?h?F
t
&&Dy???I?#EQq)
b?P???
Uk?)??XA??PQ????Z+8?1??80?? ??4"F?j?j??18???!?j??C???*X?(?)X?18?	J)AP??y<???
?c????y4??? vGB
<??GAAA?&?
:?5`??P??0?j?4(??~M???a????MT-??~C0??BM?b?!
???q$???A?_;??c??5?A
'?b?
8Q??y?bu?"@,?
p??????a?CG???????`T??Uc

--- NEW FILE dilvie_-_the_dragonfly.ogg ---
OggS
b?9?=?dkM???[MJ)%
Y
*????*????2?,??2?,??2????:)??B??k??????5G)??RJ)???9?? 4d

Y
b?d!gA?:?!c?R???c?AB??R?ABCV


Y	

!? tB))U9?sJI)x?9)??RK?sJ	???Z.?PJ(??[???RJ)????"?PJJ???!?TRj?? ?????R?1!l,!??Z?5!?j)?k?A!\I??Xk
??sj-?Xk???[???
!?B)??RJI)?B!?RJ(%??RJ)?B(??PJ)???RJ!?PJ)??RBJ)?TB!?PJ)???RJ)?PJ)??RJ))??RJ)?PB)??RRJ)??R)??RJ)???RJ)?RB)??JI)??RJ??PJ)???RJ)??R*%?RJ)?
)??sJI5t?A????j????9*)?;!??Z??uLB)?c? t?R?)?:????J???PRJ-?cl??[?1?[+??c?1??Zk-
?P?00?????f??&
???A?f]?b PR a? Q?X??@(?Q]??Nu6
V?F?:?
??I
??rR	?L???&??Y3?,x?????
??
?@c??"X?$!??/??&0Ie	??5?rLe$H??\???
AF?

?XD1(.U?4??qTQ
?""??E??v?
NK??????
`?????~
	
?NI?I*?@Fi?LI	&	?dxf??,	`)Bi1IB? I
?h?
??A??B?B???
*j.$TJb?04N?r
?(&?5?\???C?U8t
IHH? II	???e2??f!? ?E?!??af0	
M???"?????=?? ??AyeJ??,/?????<(.E?%*?4m@?i? q?h:?H?
8&JL
??,Q??
?
??
M????}"??(?2??(j?d3IQ
?-??4@???$

?? 
?>k?
PW?
??
.??Z??D$?)P??3@Vq
?$
d	?"$??@?@?.
T
?&!?h,
?" -$B???????x?X
h`?`???@P?
,!$O?#?J?
?0Z?L?U,
PE?`?!
n?!????A?? ??
v??????Z????W?B??`????S?0q??1??Q?? F+=???pLt???	?:
E? ?v?D

e????????`???e????v61??qf?,

d???5?#7
?$???
X!8?&
W`?v[WGW?M?@?=???aP??0??D?p:?`????e ??<??????	
?


??????2)?D??E@???I??????MPaSB

??P
T] ?	?!??S
??*R91??=??w??q C??;?:??\????
d2??D????/??b????????????, XH?????'D??????NE?$??????6??Y??&??
\>?
@???l?
?l*avA??qV?I?]????WSV????#
pl)9???9H?!?J??u*FE)$?<DT0?P????Z?]D?
?
v??D?#?I?!{4?`hx?A??

}?%
0$U,?
	??T
#?(D?IV1??
???	
D
Ul?? ?
?

?

h??JA?b???????#j?-?aC?C?M?sv???Kg??\

d
??hb???8
utKC
?QC??q#b(?E???,??#??Z"?;,YD&d?!?????>MT2`
??l8??D&v??????
?	?tM?4
>P0?Di???^DR???g??
IuI??|????rbi??'?
???J?rd
?'&b\B`??????
??x?b)?<?r4??????

?6z??????8????
b???
??y{??@Y?_???2?<????/-		)??	IA?$?
)?	?bfHY?@`&?[? ?,m

?P
??J)Z
??z8?4y?$??Ic?$ ??D? 

(

Ht
@????????
?@&
??E@?b"?i?z_1??? :,FV?@?D???s?????p,y]?xi? ??'9
?l?#??`?d
??PJ P??
??+?PFc?
"?N
? n at A??u???.S?4??S:??Ny`?`a??0/60L???6{1@{FJLW&%
?x??(Cx??
????f?sgD??
V???H??3?;?HKG?$%??E??

	x?????|?(??C@Y*Gi

 Xy
 .?
9
???;??B?0??n?o?h-t??n<?C??{?QQa@7??`
?Q??J?n?Q??
X???*
?N~^???g
?
4????d?$$
?^
f?*
?i?
v?E????H?/????EU?Q?4?L?
?

?????n?3];Jy????????k0N@?_k???*\h_	"?N??
????? .?1?Hq"rI ?x 8
5????`??~(?KEFV???R"?"?{g?H??z?$?F?}??4?l??`??/?'l?????
?i?????
??
?R
???.
??

?
EFG?
(??nP?EF`?E
*?`?64?+8??f?????@????1
????	??fT?{????B?l1~9$?e??Mw???*???=
?a`YH??`?????~?U?%	
?!o???\??0?[???????K??J?41??J(?Y?8G? At??3B^N"?rm? ?^?????P???)??? pB?K
J?/?
"an'?1@?%(
D??h?+?&?	 Id5????
???aj!@
(?J
?
	"
v?????k~???a???? o&??e?-?
4 at 7ZW3?????bw????m\?? ????:?#a?|M$?9?FxG`??c???"?!??;>?*???6?u?#?v?n?_??4??????S
??8?<>?
???V??k?WB???5?%.<3r?
w?

6??FP^V?????d? ?????wFY@?-V?*?	
????9????(
??08???k
??Ya380	?
z???$?
???z??Z;?*??I?D??2????
?????
?x{+??+
?i?th??
?+?'??1U??{Z?g??SbR??Ju?oS???%?$?4???."??????+?e???????????U0?M???????
?X?Pp?????&_??Dt?k??;???d1f?
?Q[?q?RHA?????
?????+?=?S?K?????UW?J??W????s??? ?M
Q????l?h:?\+PHy?R?$4>??????y?n????U??9?["+?X????#k:?GG????t??t???^m1?????x|??H??2i??>?N9ct?
?QF???/m?
s????]]??_???+???&??????"???O?????'??o?
K????????g?0?????|??????,?4n?j?&q???r?w???????E??g??.LSG?o???????t:k
fn?c??4201
lZ?D?4??6???b]yEO?
??'???4#W@[?FI???S?? ?E??nM#?.!
???k?)?y??9???<????g?]???B????_S'?%w???t?8????Z4?fb???H +?HV!?

??o???C?y??x???h??p??X2
xJ?6?????????L??Y????????*/@")???0??/la??y|E?? ?P\??5?_?.?
t????R?m
?TQ

?l0??
?+?@?K
W3?

L
??Z?++H
??f?I?

??S??u@?X??=
0D
:c??4h?N3

?8???\??:??-T????@H???/???AL`???\V???"CLP?gs?? 9`?;??k
???^??q?k??
9?Qq??????S?????????>?;3,??t
BlO,DN?J Q,8??NL~?1?;?Z
??n?F:
?1X9'???
x+?hW[H????J??G???0RL &|#?	?y	???>@?x??E? 9????
??Q?cm????y1
??&????c	
 ?E?`??
?K??G?>W	R??+????&g??
F?????????%?@????L???????e
???Vu;

???????
V???e?
	
v??Q0??j????	?T??i0?-??b6 at pE??#E?	;x&{
???
?="?2I)????????*{?u??AZ???5?H	??H???H

-?!??.7?+u?bO???1?SR?:;?>/????
?????a*=g?z?E?W?:
??_??T?

h???????c?-?A???Bl`?3???x(?4M??:?,??=?l?jQ?
k]??=?,?i????QAb


E??j(
p??P???????7?O~v?t?V????$??@???{yOlgHFF????A??q?N]?????M??????d?O:vq???HD?Yqj=??\????P?g??@?8m|2?a??:?????	??s??????~b?d?h????y]?m??)?7+???K??`???(h?5??r?r?J??$S?k
IQ?Q?TD??8p8,
b??8??
?Q!1??(???'??%f???YMDLL??
	??Df?W?!??????
???D?CD????L
W?0,^S?Z?

U
87m?????o?gka+3?.
???N??Q?(5 q??d??9
?9RoN?nR?{5K?	9?
|??B??H?*
? :???<!?7@?^,H??:?r??6
???]w??

p?
X??^??
???{
???????[??8
"??
L????a?
H?h}
[...6544 lines suppressed...]
0??)???F!~F

?F?0=????v??n?y??>???v???h4?F??H?!?}}]
 0qH
?{???!?\??QV??haBi?
?K/\??
?q"
,
?~??%
~w???
?Q??>$??88????.Z????PxG???p???2IZC&??!?@?26??????5p
?@
@+"
P????P?'???
(???
???tl?_?	r0y????L

?i?x?1??
 Q???
??

?`??;80H?S?
????
????m?s???
?QV?

?/`9?????,0PE??
Aq?kL??/W??
!hZ;r???Q???????????IZ?
??;??Z???:????@
?	??
??`?@+(@?B??
(?_6
DB?1?

Q?Za)4?e???????"???"???Gw?#
??????^W
??F?
@??????93	
??)?&

????
^G???0??h
????d?5zIpv???	??dd?!G8?L?!??
??@q?????@
a???9?b??3vd g)IP
`?D??]??4?????T3?
AO?Q
etPs?9{??
??????????Y????
*X
{??4
@??@6
L??s
@	A???V3?6`??n?????t3?
??

???_{&??
yz?????
?{?A?L?/???

(
???B????R% =?u???+R??7????_??
%
Y^???


???*!
?t?	?4?????P?	]b??0K ?x?!Y0C2??
?p???

??\T?????8???
??]?VO
OkC?????)
???t^ ?????6
@?J?8O??l?]T???j??6?r??l??kC?????n*?q?z7???{?*
??
?n????~0???-?@
??
F/???|???0??
<l1f?
??
r???A?


?FI
????b?^P??h????%e?b?*~?????E?J?4f?R?j?wEU
?????	@????a???
?
vH???????,tSA?(v=$?<3??xP?[??X
>???% ??C??
8??q"??
??o=gf?????E????g?h`?????9[?
???3
/"??j]?H
(???R???b+???{<????D@????L?|7??
??>p?
???.rv
?n?`\?6th??

\????@?e?????`??-P}?,?F??w?|?5?'??~;???f???8???*
?? 9#??
???????D?@?.^??S?r??
???}???????V????<[??[????k??S?I2??????x??x???T??1(???oUi?yM?D}A?9Qr??POi??u??u?=???r?+[??????l??5???? ?B??P?S???)7e??
@??]??
?L????

?pV-????t???
gET??????W
=,??7
???C??^
?S@????????
?)??e???r??_
8?X??p??bj???4?????%b?
?Q?,?????VU???{???p????????
?e[??^?5e?@w

mrw??
+?
u???~?O?BUb?Y<zcc|f-????????NhV&?U?M?p????????;ovz??A?P^??e???/~`pn
R?0T$??	??xr???
??r?
???3???n25??
?6G|?;	???I?

\?*??K=????m????*?q%???	?? &p?$?$/U?M?/?#?%?k???ZB?QvI??l?
?
3f?6
?
 ?UwB?	
?c?/
?QK????LP[??????g?O"?

??|?\? ???S?`	<?K??q4??'h:aX6?u?s?b????I(Z???*=??N@??43#R??[.???\?? x???-?>????h"?m!^??u&?0c???b??V?){????????r?[b? |???w?????)-???"%????Tw?Ve?t$y?~??K?${OggS
??G^??h???|???n???(??t???!{??^???#
k~?g??#p?}?????o????k?!j???
??}?U??????w%?/t+?R??^,Q?u??CS=??:{?????j9????/7??????????6@`y?K1?&-?G?l. ???}?2\
@s%??k?@??,(??7y??f?0%H??
#&fo????0?????N?i??w=|???>??G0?6????(EU??j?-Q~??>??i>{M??iOa
??+?5lrK?D/Ez??j}*?(Fo?i]???????j????????}?????c?`?x?f
Xn?R&2
_??|????ONg7I?,?5????&??Y?????fG???(?\	??
??2}Z?<0?s'?f
?m????y????6d??z???p?	?2

kPEinez< ?eS?F?????5?
?ql??sM?@???u9&?????f?e?g9?y~??$K;?H?
???????=S<????5?I??-?|
??S5t??@+??????T}kd????
.??mf
???=
??)r??{s????
?????????i??6?
{??UC?N??9?????
??=c?????????

??3????#?
??7y?\4,??OggS
?A?]c????U?##9??Y??y?????
? ?A?)?
??V?????;
(+?H
o?J?6??
?p?????v?\Q?e
??H??PN????{J}????D?5
x?_g4??83?]N??*??????8???3??-4????H??=w^?d?<|$??V?? 
??/????z-?<??D?v??:??.??'(?????:=??2GA??99?E?5\??nMT?????F?S^4Fb??????n=?U???
k??|9?bI<?,?\@
??#?w-@???
??5???$G???"???*=????Y?O????J???+??????{8;v??[???????????'?S?V???(?{????yqe??d???
?j?Q?????hM?	?.?@??Y??X??F?7X???=`?\
??4{1???'bZ2???.g??????g??U
?
??{?j???$z???!	?Q%??$???e?>;s+
??R?R9Vt^k72f???\P????p<??8?SD?#0??`???)???G
aD?_?????Z?ruM?ZcbL<Yj???O??????W*???w??U?v??^R??H??b?{??_?
)?Y
0
?_;???<qff,f
2z&?G????]U?O?i??k?????qb;!?+H?u????R???"Y?#?$@
???sI8????z???
????????????????????????<??+?3:1w\???am?cx2?C?&???
H#c?{???T?????$v~#????x???~5???'?*???v?<??\?w???m6??ww?p?T??6O?N?L~u???,I
?

????
???g\?
??0??????o6??"O9?????US??????V(???
:?????????f????U?y????5?????c"5V?F??l?5???o??u???'c?T?????2	?>B????oVY7?C??fL2??&??z?[?t?l??S??S??\?,???o???D???V???P?f????????G?????[??S??'???y:?????????e???5?C????>
?m??|@????j?k?;??
~5???K???KZO??5??`????	@???????
??/?^0?39`?q?n?i
gR?)?6?5 0???
???/e?1'z??e?;???<Hs??g
:?????_???f5?????R??]?S{?v????4?V>?????n?S{?{`???Z????k???9?(c0Mfz????/???K??+?j2?%?d@?F???+?_???;;?Q???????
?m???-?l??????e>?=F?????????????S?@?_?2????	_???????`g2?????????j:???s~}y?=???Em??z4zKzb?5??-?8f?8
?7G?????@?	K6??`~5???[?i%I??5????$?#?5?????|?Z???
6P
??
?4??j
?5ldd?z??T???^??.??_??|{f5n???????????????:?9?????1G????]u??3[????RX;??~?e,?tL?M?
7?q????1I+IX"

(z?*g?$?$
?????
o?FO??A}%7?4V??C},|??
?lp?C|??
~5????0???R5\???;?P)?	 ?O?u?_?h???Q??6?
&????/?cA???K???X9????5t??C??4oqX?????f)??'????#??Aj?????cEe?{????????f??? g??U??_}`??Y?J?!
!8
l???|.f??????K[&??????b{?1D~?2???V??
??u??"???u?Yx??zV??n????rq?iZ?7???+?M??}F7??T!??J????A??#???S?y#'??W[??o?6?*d?N/I??????
?;?^T?CW7?????x1?1?+?????Q?*??|*?Q??a?M????????y7L??4?Y?????IBV??
?W6g?
d#????&????????
????x~<e?D?\???????????=?;?oF??v??$?6F[J???/w??>?X/?.??x}?'0???R?????,:?<Z???';M^???3r?%
???/???^-E??????.?u?????&p????!?v
?&O????rI\???????	x%??M?f??'?EO?v???;?????bc?G???T????n]???g??yz~zm^?/?????~?!????g???Y??ju??O??.k?HOo-v?%a1??}
?w]??o?\?3o?Y??kE$????W?????5ig???OggS
?DdO????q}~?9?_???????z?/iI???\???~?????/??I&Kfw?????sS??e?f??in???+h$?H?{8?????2????rv?nS????r?|?Ed???V?Tb???GR^Go3
?b???M????1?Q'?2~?????[??1?A?????g?|<;??>????<{???|?~s?????h????^K|?]R?W-????g?v?j?V\?ysK????{f??U?~??x?K??_O??~??????z???
'=???????+?g?Wa?Z???~???n??????C:4????:-DbV????????x?SNn??E?x?O)?n??&??|???jA@?k?If??l6sJ??u?M???Ru?;?????9????7d??Y2??6l?=?-Y????l?.`O???YI????
??h\V??????-
?~??Q?&????????{???V??????? ?.??????|M?o???w??????`u??/???~KDv?
}??6???*?|4?.?$??o??@M?;]???$GV?z??`??M?&??????????C
?}???3?p&?~?-y:?!Z?????x?B??
????k?$??l????k?????j??]A???_'?;@?9?'#G("r=???e??n???n\?*Q?????9Q??\????)????pS??n?h5?p.?i????s|\T?cb???y?;?ws`?LJ?????????????K?):m?q??W??A???i??????r?HH???????3)s????>?MG?~???????dD??j?;???%?5`???LVw???????%?????L?o???)?LD???G??-?rdb???=???I?n?fE?
?
!aH?|d??????{a?:?X?y????y?????<[?aZr???6b
F????L???q<????.??![???????aC???2?????D`R???s?/?3???3?<B????B??n?y??2?S????????'??'6A??H|?
{l>?C:U??;J!?=;?????F???????H?W??y????z??n??A?;`d??N????G????????R3??????3=???????Dh?	?????+Y?U???2
???)Z?N???W???????v??1????O??m?|+???q??c??~XD'?+?I?l??P??h?"_j???hZ??????5??F??hN???????????f??x??(K-?LY[?
?$^???S?????????????????x=e>Ru?????gD??x:???N?r???}?V?v????"H?????[;??k?rR??y?7
?H;9?.?????g?&?!l;S?U? 	~5??G?P?U??O?(?<	????6?P?w=?#??}
??c~??;?NF?w?c?l?}g???H;n??W????????
`;?0?a;??Q.SOs????\*&
#???V?}?_;?kws?syN<m]?1???nu???D???oW!??????????????KN???VGM??&?K|:???q?b%g????????????vW?a?>??z???????
?wt$??L?,???f??wT?+J????
m?????D??/??{???d?o?=???????????9o???y????^?bY&g.?}?+?A????~???~C."g/???????????'z?:GX?????j?kr???? ?w?1????JL?t???????????????|A?-?????kzK??U??+??Q???????U?|????W??f?s??<??X?:?&_E<vH?^?%5Iy?Ro?c?$??1]2k?[??R?

6????TWq???$
???????@??OggS
??jNV~%?c?29?9??|K??2?=???>?"?{t??n~???[4?P?/&Ul4^Xy?????O0?M???w?L??&?8:o?w?r?o???&?f?=}<?????l?y??J??N???9???m??:????	?R????C???ic??(r!MDa??M??n??p}??5|???!k?9-`?/B??#?\?o???BZ??0M~O+)?
Mi???0???V2?X??n.&Hw????b}?+?)?'j?E`
??y?b??Q]?5|?Wa???????A?	??	??x	??Z?8

a??9??????6G_???? D)@???Fu????~??y?b(??(?3?%~9?Ox??u??????3???\?)?]?**>
??????????Jc<????_T?*???
r>??/??T?GQ?
?

?y?'c?L?=?_?????^??}?ZO?Q?????????O?@?of?Q?]?-N?*?;U??#OggS
????~5|m???5???0???r2o?e?l???iZ

hS???????f????????"?Hp?????X???&?]N5s???^???????\;'9?8?y??}5?????????<???????v??YO~??U???ehG?^U7???5C?>?o??$]????"O?B??=???????@v?l}?N?gKv??_ 
??dd?cf?FW???
????}x???&x"g???????]?????:[??8?a\o?????I~
?5|n?7`?????X? ???????]_
????J\%I$
C???0????C???G
?|
#A`2EEP A?I"##'
?r?q!
IH>???6hH??Y??~?

biK?A?Dy??K$PT
?????Xp??=?fD`;?:TP?+?;j??aP
?2m?:7>7M?m(?v?s?s???????PX?<
???!???D???? ?
 2JE???mA?N'a?	|o??+??^ ?(?*&j?]?C8%
)%XEQ??
??L???P' ???1?P?
?d
?C

--- NEW FILE dilvie_-_up_in_ashes.ogg ---
OggS
*???
2? ?L2???N:????:?(??B-??JL1?Vc??]|s?9??s?9??s?	BCV

2????U
*????*?(??2?,??2????:???C1??J,5?Vc????s?9Hk???Z+??RJ)? 4d

Y
???
?aLBH!dRR*)?
B*%?RAH??R2J-??R!??J? ?RR)
?4M?TUU?i??i?????UUU]?ua????????u]?ue?????,
c?1?c?1?c?1?c?1?c?1?c?1?c?1?c?1?c?1?c?1?c?1?c?1?c?1?c?1?c?1?c?1?c?1?c?1?c?1?c?1?c?1?c?1?c?1??Zk??V
!?J)??RJI)?B	??RJ)???RJ)?J)??RJ)%??RJ??RJ)??RJJ)??J)??RJ)???RJ)?RJ)??RJ))??RJ??RJ)??RRJ)??R)??RJ)???RJ)?RJ)??RJI)??RJ??RJ)???RJ)??R*??RJ)?
?E@@.!???pL8'?6
iZQ?i?????O?1?v??c&SK?Mw?i<???f?????Oo?{1?9??(?$	??S??Ve
??|?E
`?x? <yeJ??)?>gxGw/mT\????dz2???cA??aX?U-<??g??>?S&?n@
f=u??,?X?N?n
?????????
???
?k????
???AQ??F?*??*?J`95F??????j:k&?3???R@?????`?M??? ?&??D?}??3?Z?]?GG??????cj??{^
?-?6???QDPl>???#???\?j}j????L???
&Af.???m??f:???????{?????b??`? j???SS????[???0w[?????????M???????
V??(??W
h?:??n??|?%~?6?%?

r<F??Y?rN\???
??u??.????{*5$?
?.,?8"R??H?
?G??(?5Ts=?6????P????e???
\
??
|?3?-??b?N?/?P??
4????

???-???pD2J?
~????v???<L
?_??????????fJ??=?c???K??~f?@????N?u?U1?Fc????
>???c4??W?4?2??^?>?G?h????\?????#?7???:???????}???i??????z??y??UNm?}??????_j????S8t???????%
?a?
3??o7??8z?7=/E
H?a?
?z?!?1???i?~9??
 ??

%[n?
??????@???????y?????p?0}?}
??h
	?
?t???8??q
?~~??]L??{3#?
x?W
???$*???>*???}$^F?lHLl<???
?Fd?Z??
??\????M???n?X??h?u??~54??.hMq}??????????CP?-????}?
?c?:?U
<S?=l?o?N??5?KV????O/I2?????@
@??/[Hlt????bA]?x??$Qa??#?Bn????=vH?2
3?Ng??0=i??
?b????i?)????M.&?D?^?%??U
? ??3??????~???M??6
Y????????|?R=??
Ls?
?Vv/v&? m??=7IY?@?
 zqB?
_Ya?????|T?$????#1??$????P>wI?O?????0?$?s????/?H8????J,?????:??!VR?
?!?{?[?t?c22?y?????t?L?m?	??????4??Y?\2?	?humW?j?:??????Rr.+?z??s?t?I????d?h
"i?
-i
?sp?k6???
L?{?)'??v??????????{Z6????o?????CG??>?Us??
?:??G?B??RX?????@

U?*
 ?????z??|???????o/??G
??[???{??3??YN!?C???8<?{%
{,?6)?
?

P????? ????K?$????m?????????/???/Tu?g???j???S???q?qA!???-?p???}?r\.K?#N%?v?"YJ?o?3???RS?\1????????w?7uW?i??: I(<?B??Q
N4?[TY<??j?@~??<\|????|)?'
?????
???y??>9tT??????|e
?T?

???}?
~x??g?7
,M?QC3 at Z
5?q?a??B?K?????I??????????2L??????X?r?C0?U???
????n?7
?%$????Z0??&??\?TYA+
w??+?V6??g? ??0'??w9??8????nPm5l???/?|:*?B?agc|??[????n?)?"Xi?9????Z???????XZ&tF?9??n/?'??????7Hr5?
?+?j^??x5

??.?}??}??y??>??@A?O57????3	]???c?_?z???5?Oyl??4????<dBw???0?tAz?G^k?]@???0;??Jz[U???????????:???,?
]L?P?N?+?Jp?????|??s??,?/?7?o>??~????
N??w?f?B??8????]`$
`????p ?l??????ff
????*?8?Tn8???_??????_4???X
?H?%??
??6x???m?
? @?

???	+8
)R at 2?A~^????
?2h?|
@?u(?7uh??|x?????Z??????W2
R???E>??VA?T?5C??????sc?aC?????^?C?????
???jc?|????o1??9=s?]?#??8??O???????????4w??L?:{?O?{?>????@??@?@)N
?sN?kE?;?????:?'??????M?EWO????i2?g?
uE????U)s?-=??
s\?6?????~p??c???c?o??67????F99???~??oh>n??U[?_[???:???????????2????v
AQW???d??@???0??`D5????m????zT
Y?K|???<(
?
? 4??i??H????;???o

ng7????o?RK???
??o?
?<$
?23|OA??"
??q??????????C?/?u-}?v???vp?5?CM?M6???"#s'j.?q?2?@{?? ?????&?)??o?g\?8i?k???&}???wJ?D???f@?:?G?<=d?;?d???@?
???	??4p??0O?-???P?X_~?????
?b?}w?3?????ah???N&?]???@
v?????r?
????iuSc?????Z???;?????z,sv?S{?$?z3????#??
??$q??
??=b???[m??
??Q?|??g[]????u?#v???oqZA

??H????a?W.?=?-???&?
\??Z??}?j\?}P?c??r????[???]????


??>?mn??C?FI????
O??N4e?d?B??/?c?
?"??"d????]D????U??,?7UdqH??E
>k?L1;??>H%2???P?O_M]??Su??H}??n??*@3`??&??x?jn???m???d?`?4MR?
??????Ebl??D?
?mR-?.??p

????9??{C??{?!B??E&????M?'??.x?v??n(??<Z4???y?j???L,?!@K??W?`a?P????p?"?Z0??????]d7??M?	??e|m?????????R?)8?Q??-??j2?N??"?
I????>$c??q??Q;??????K?o?4@??M)??`?Ix
qQ??&?_D?Yq~?'?nZ4@????7??t??O??*f?I?=?V;wdH35;?}]}?3?-?p????4
$8?	'??
5\????;5 at 9?I????????Ww?3Rx???????t\3rR?-;????????c:?G^??????O'<0????M?'r?3{p@?R??s?|?Fi?ZI???
H?
k??? {5l?dZ?$?
~h??????^E?Z]2k?H ?3??h?"??L
??W??????.	94&n????
????????4?BR??O}F???*??D$/?????>????x?*?????a?r???{???
u$?v
H???????Z
????c?|???r???
?8Z|R,?w?`?N???c????x???n?fx????
?mb??????k???a??/o??_?VR|FB|GC7R
n?
?X???.?XH??b?Z?8?q?D??????M?S???G?-o?d]?=???Zfx
?4y	?>??am?[eJYV
?8?)?4??3?jM$?n|?E}???J??
@
HD^'B](??+4???d]????????	?e=<?_?p????(~X?\k?8????Q???
	???^??=<
/
????S?U6+?7?[2_??s?D?{;}f=L?};c???9?q?%??

?!?Zt4X???
c???9?2?DVV;?j?H????7?B9?1(t?)??<&6?????
?C?Ls?5??????4???bH~???????????9????U9?q??U??8}??CV??H??^??H??tr???????fVQ???4]hK???C

????|????E}%?k
C?
H#	?h

????{xm??eT<??@Ob<>?&?S??%????

8:P?????{??z??dV?O??)?<	
BG??y8$??{?x?"C???~???|h?^???sr
?Q?M=vz;??????
hrx????ey%:wzh??I?y
??????T?=?????>??m??1??a0?W#?c?P??]??w?(pH????=?So??g??Y??tV??$of/???gN?KV????;?V4???n?3????;????Y?c3E????=e?

G
^8?\??^?$?C!1???r?/??Q?W?
?	X????????Q??????_)3?//70s???/??'
?m't?)????mKh??????}??WG????j
?O?u~?+??'~s???s??S?
????!??J? ?3?$??????R??T??L??]??N?*??=t?????+Qv/????U4?'?}5?????m?EQ????Y?
???\??/??3?9???E`?????
???
?????????'^?|6??:]f?
??
?j?NF?????r???yI? ?e???En93??????+?3???T
P?N^-????t#?"C??H??M}??m/?C?A?t??e?fS?W??7?f???~u?Y?%????k??????<??????\??
?uw<z??=G'??Ep?8?
????&??(5h
??? ?m
`??_?
`????I???q???
??
???_;G?r?6o^6?u????=
?w=O???B?;?<;???>8)?x^ |F??Z?l?<???$0r)?[??o&??}???gz~?P??D??????4???{U]?Y
?*xS~?0b.<?s?f???q6?L?DvL???&3d?bzd?3?;??d?3?*???d7#p{???^??cR??P
?IB?ox?@(??{p???b?]???T ?5u?
A!
^XLj???\e?Y<Vn??? +h<#b?^??C
@????.?m?^
????`i
???niv?5?????lEx?k?
?	c=z??I?a*???w?o?#
???,????IM?$?slr?=?ff????? Vk??`?8???2?-???<?!?=.:vN??T?T?w????????<	??<

?;???~????g|??qsN|??J3?>?????$s???R???????T
??Op?V?????a??\l??^??\?9??9K+???N{?I?|>?j??lj at Dg??d??????^?(
?????R.d?
?m?E???E
?KaT73Y?Y??A?#?{??id??`??z???z???????L???Q??<?3????f{(`?_??y???w?!/[U?\2\????}4???p*??k6?????t??!?g 'C?8????s????r??????????s??????O???J?????(??*????8?fmJ?K??.H?b`N5????a(CuU2??k????????4Lk?d?????'?
????7t??M+??we????.???
????>??#0lp??"3???<?,{??	
?RR?
?,c?I
`?

>??dK??EE??_??SN]?l5?
Ab???,??9?kf

@???|???~'???'/-h?7?M>36???;?w?:??	*?
?~?
v=????z???O???
t?r???w?]???=o

8?7?}??????w??|??~?}??
???
.;?}g&@?
McE???????bSJ
	
??$??????iQ??tU???????7[_"??]???/???S??d:u<?a??
?^@"?,H?
?`????????
?

??????t<e??]?\???e7?<???Xt??*`'?
b??Ov7
+??`???]*33U	
?g?a?u?3??y?V?R??VK????#?Lh???????O?????{B???B?
?,
??%?
?I1??@?II?7

?_????g???????!????3??|O?w??{?m?R?K???6???@o????pX?\??4r3???9%t???{oOY?t??u??`?]POf???'*???)??3??3/??3??? ???`????g?????
s??|i??????2??????????y
:Hh?????3????^?????pEsV?(??h??Y[X???CCf?;??_?:??NV???~k?BW???????e_>???$????$P?~t???????
???K

#>C?`$???????_??c?? ,&"??Y?????(h??
&?=f??-?$??~?2Lw????????[<?????5A8???/A??1??{???????
h?'w?^???$???L?z?K3IBCq???Q?c?Z????G????????M3??"???????????? ?
Y??]|????9?????Z??^<C(?f???C????L??
?1B?Z?_??1<R
?`a.??w/
??????W????
#8?V??
s\ ?????i??????zq??p?:??)?????o???Z,+???#?O????????JU.??K??%do?$`
?R^
????-B_?=???B???r?_?????M??x?%?????r??#???,?
?]????vQHr????\?
???????g??

?g?sn???<??_Em???6'??C?''b?

hU?'??k??????)?/?
???pF6d	?<|!?)
kGs`1?c?O??G<??G?<]?Ot	
O??[?=Wg?????????!{O}L??<[??9????0H?H?\??
$?????a?
??(?K?i??X?|0
???<p??w??25}kB]499h??r!??~?m
[...25817 lines suppressed...]
?
t&??????|	l;M?m{??/h???[w?`i.C???G-_=?
4*?~
,8???4;?Wf??????Bo	
?v???t???Pu??????{Xg????3EBC5W??x???M?i*/???u2t?????Hx?+@????}?
?Fs'

>6??fkT?P??k??!6?????:?_'?p?-e
?i??|??@}??????
?uLx>(?F?]K3
N??	??.??8?^?CS4@:+I??3!?tI*???	75?,????
&sb?????z?????????>?by?~???H

?K?X??V ?!`kx???|??
 _
?5????%??9?alu?R	????????4??????@?\???k??_
?AWU
/Zq?W?9?w:??=P?}(x??$?E????????/?>@~??E?4?
???|?[?!~???R?vW?*??u??$?(??1_3???????v??~??I`2??Pt?? k{??'??*@?{?????????i???0@????????%?,??p?W?T'??????,m??[?????cX???3c?*??{%?N?@???????d?@bh??????

-?f?pb?t?$?
?I1WdV?&`	? 4?
???IM??M I`?!j?)h5
lo????w???k??l??of?t1N?i&?@?HB
?Zm?
UD??$UY???k6U??3??<??pqvv??k??????g?i????????
L?????Q]?L?zkN???cDO?K4?`

??,?25}c/$/??(~?!???Am??Qx5[????yw????n
?m?W?%??b
@X
?C?gjn???!???j?{?A?????????Q??W
E$V
?nb


4??????8?/6/??n?l????o8???????,??t???????~?m???????_???3N?d1?????????J?????}??y?Cb2rn??.M?b1???r?L6d?u/??l?}N???S+<*`H8?Z???]?{?? 
??????k?U??z??????????9=?dW????????r??tX\F4
e??8???[
?+g}?t?}?GN2?KJT}	?JM?~?|????Z????????f?	???re???+???

??8????6
_A???MB??e:!2?y?~??r?


`L?
MZ?Kb?""'%kod??????o??/?,IW>u???(0?gp|?????X??L?k?$
?4?~ys??d???<
b&??S?8,
?
??C?kv?{.Q?????b?????????7?~?s~?
?
o???q?ej???d?`}?.`r??rfgr(???Pc?????Kf5?
 FH?$E?54???a???? ?{?e?e,9????]<:f???6??X}?

?p
6OZ3?B?AD?h
v??w????6?O???>?????0?=?MSm7?a??9J??????F
r?5I%?wn?~?y?&?????3~F?Y????????yH?\?>|R?f?dj?=k?N?%)N????a?
???M??????????z???x?&?|?.?u??c????9pgi
8?up??J`??
39??~??g6?r?????5??@???vK?6???w??['9}?????}?{0?0??o??????>
?o?6??,``?_??z???????]???9?
??>?L%??!??????pm?????9
K-
?!%?"?H%E+??I????G>????u??U???
??n? 
pjes???O??sg?m?D?????L???*??2{0??/?M0U\?q?
?? 	????R>@;??B??}?N??&???????b?9???D?kM?e???1?	fD?`?gn?\?
H???????5??,??.?~?	?/3?5CVW?=ch?I?T?????
?6`AK)	>y4?
?5d?H???`?."MRb?@?T?M????L0+'???????V?U?ibR@
?H_$`?L#?i??,
?5d=J???(????????????

??
????????????k?-5?]y2??	
???K?9p????2??N?E]{??.?*O?????3??m[\?=#"???fz<??k?En$?;?~?+????~L?n at 4?wJ?e ????C?=?F?%kL?????N?';
??p?
??~q??N?P???????a?
?

`?u	4?
?5???

,?ZY?;?????"o??@ru?????[?e???v?L^??????+
M???d
?? %???<4#???!?%?????MK???N
?1??
???;?
jgV_/?k;???F???????????L~ ???t?s?q.???>???????#?6
???a????????O??u???9??37;??w
n??NA??w3l]???X0?Z??M????S????3????T?:[@Y??v
0??r,A??=??x9?
???N?}

?E@#KJ??S???;?C?=$?d?wW???Y?k???4?bq????6??,7????}????????y:???????`y?C?=?????.1??{???_???7?[t??0G?%.???-???DX?&UBH+?
Hy4y>Pw?_?
U2q???lh?e?s?T4-?B?elc?P)-
?????60?
???hV???Z???
&&????w??f*E?
???
:xk??????????n??d?Y????????y77p????E??;??b?aO???????>s??)?j.@?
?e?????
HqV(??:^G?+:???6?????RK
?C?>????lL'E?
????????hC%Kf
?eWS????I????x?J??o7?{?????z7+?n??5.???????i?3???w??l?????nN??)?9????????gl>?o????u??Ny
iV??[pP5????^B,??L)??? ????\????0

???g?r?????c????|????a????
?>??x?V??s??Mmh?I?>3??_j???f??l???0?:?/????Y????????????l8?????3???O????>??l????).r????c?{?2?a?dg??>L?=??nm??????S??s??3?a?a?V?w??C?{??f=?M]????fN??s:9gq?l
?^????/S??]?.~???+???????????TG
??P$?2?)
??3????p???????"??Z??$?

?PuT?g?????M?
??='?/?pvu?3f?i??g?????????????y???6|8??UUg??v{?????2??w??W??rC@???T???h?T??W
??XV????J
J2?
xA?u?\???T~]?Z ?`????m!

nXa??????:!;{\??

%4??]?m?i?JQ?dA

?~??f
??"BU%3
8??s??????@}?n~???Cn8p6??N?
???P8?.?F?U?*%?

?! ?%?

J???
*	?e<??
???l??????TBn?uNf?g?MX?_??9???g??9?g???e&??~????>??o???L?=s?w???p:?u6Tf?7????????t???T?????,?{??g?:??T'????V??e??
_?c???y???????}k?&?/?hR?i?@:?????????
????
?B??F?a?FT??$3	
???x?j?o?e?x?j?o?e?x?j?o?e

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$
?B??F?a?FT??$3	

8=
k???j??R?$

--- NEW FILE license.txt ---
Creative Commons Legal Code
Attribution 1.0
CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS DRAFT LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE.
License 
THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE IS PROHIBITED. 
BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. 
1. Definitions 
a."Collective Work" means a work, such as a periodical issue, anthology or encyclopedia, in which the Work in its entirety in unmodified form, along with a number of other contributions, constituting separate and independent works in themselves, are assembled into a collective whole. A work that constitutes a Collective Work will not be considered a Derivative Work (as defined below) for the purposes of this License. 
b."Derivative Work" means a work based upon the Work or upon the Work and other pre-existing works, such as a translation, musical arrangement, dramatization, fictionalization, motion picture version, sound recording, art reproduction, abridgment, condensation, or any other form in which the Work may be recast, transformed, or adapted, except that a work that constitutes a Collective Work will not be considered a Derivative Work for the purpose of this License. 
c."Licensor" means the individual or entity that offers the Work under the terms of this License. 
d."Original Author" means the individual or entity who created the Work. 
e."Work" means the copyrightable work of authorship offered under the terms of this License. 
f."You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation. 
2. Fair Use Rights. Nothing in this license is intended to reduce, limit, or restrict any rights arising from fair use, first sale or other limitations on the exclusive rights of the copyright owner under copyright law or other applicable laws. 
3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below: 
a.to reproduce the Work, to incorporate the Work into one or more Collective Works, and to reproduce the Work as incorporated in the Collective Works; 
b.to create and reproduce Derivative Works; 
c.to distribute copies or phonorecords of, display publicly, perform publicly, and perform publicly by means of a digital audio transmission the Work including as incorporated in Collective Works; 
d.to distribute copies or phonorecords of, display publicly, perform publicly, and perform publicly by means of a digital audio transmission Derivative Works; 
The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. All rights not expressly granted by Licensor are hereby reserved. 
4. Restrictions. The license granted in Section 3 above is expressly made subject to and limited by the following restrictions: 
a.You may distribute, publicly display, publicly perform, or publicly digitally perform the Work only under the terms of this License, and You must include a copy of, or the Uniform Resource Identifier for, this License with every copy or phonorecord of the Work You distribute, publicly display, publicly perform, or publicly digitally perform. You may not offer or impose any terms on the Work that alter or restrict the terms of this License or the recipients' exercise of the rights granted hereunder. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties. You may not distribute, publicly display, publicly perform, or publicly digitally perform the Work with any technological measures that control access or use of the Work in a manner inconsistent with the terms of this License Agreement. The above applies to the Work as incorporated in a Collective Work, but this does not require the Collective Work ap!
 art from the Work itself to be made subject to the terms of this License. If You create a Collective Work, upon notice from any Licensor You must, to the extent practicable, remove from the Collective Work any reference to such Licensor or the Original Author, as requested. If You create a Derivative Work, upon notice from any Licensor You must, to the extent practicable, remove from the Derivative Work any reference to such Licensor or the Original Author, as requested. 
b.If you distribute, publicly display, publicly perform, or publicly digitally perform the Work or any Derivative Works or Collective Works, You must keep intact all copyright notices for the Work and give the Original Author credit reasonable to the medium or means You are utilizing by conveying the name (or pseudonym if applicable) of the Original Author if supplied; the title of the Work if supplied; in the case of a Derivative Work, a credit identifying the use of the Work in the Derivative Work (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). Such credit may be implemented in any reasonable manner; provided, however, that in the case of a Derivative Work or Collective Work, at a minimum such credit will appear where any other comparable authorship credit appears and in a manner at least as prominent as such other comparable authorship credit. 
5. Representations, Warranties and Disclaimer
a.By offering the Work for public release under this License, Licensor represents and warrants that, to the best of Licensor's knowledge after reasonable inquiry: 
i.Licensor has secured all rights in the Work necessary to grant the license rights hereunder and to permit the lawful exercise of the rights granted hereunder without You having any obligation to pay any royalties, compulsory license fees, residuals or any other payments; 
b.The Work does not infringe the copyright, trademark, publicity rights, common law rights or any other right of any third party or constitute defamation, invasion of privacy or other tortious injury to any third party. 
c.EXCEPT AS EXPRESSLY STATED IN THIS LICENSE OR OTHERWISE AGREED IN WRITING OR REQUIRED BY APPLICABLE LAW, THE WORK IS LICENSED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES REGARDING THE CONTENTS OR ACCURACY OF THE WORK. 
6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, AND EXCEPT FOR DAMAGES ARISING FROM LIABILITY TO A THIRD PARTY RESULTING FROM BREACH OF THE WARRANTIES IN SECTION 5, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 
7. Termination 
a.This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Derivative Works or Collective Works from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License. 
b.Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above. 
8. Miscellaneous 
a.Each time You distribute or publicly digitally perform the Work or a Collective Work, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License. 
b.Each time You distribute or publicly digitally perform a Derivative Work, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License. 
c.If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. 
d.No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent. 
e.This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You. 
Creative Commons is not a party to this License, and makes no warranty whatsoever in connection with the Work. Creative Commons will not be liable to You or any party on any legal theory for any damages whatsoever, including without limitation any general, special, incidental or consequential damages arising in connection to this license. Notwithstanding the foregoing two (2) sentences, if Creative Commons has expressly identified itself as the Licensor hereunder, it shall have all rights and obligations of Licensor. 
Except for the limited purpose of indicating to the public that the Work is licensed under the CCPL, neither party will use the trademark "Creative Commons" or any related trademark or logo of Creative Commons without the prior written consent of Creative Commons. Any permitted use will be in compliance with Creative Commons' then-current trademark usage guidelines, as may be published on its website or otherwise made available upon request from time to time.
Creative Commons may be contacted at http://creativecommons.org/.


--- NEW FILE raidem-music.spec ---
Name:           raidem-music
Version:        1.0
Release:        1%{?dist}
Summary:        Background music for the game raidem
Group:          Amusements/Games
License:        Creative Commons BY / Attribution
URL:            http://www.dilvie.com/
Source0:        http://www.dilvie.com/music/dilvie_-_the_dragonfly.ogg
# transcoded from: http://www.dilvie.com/music/dilvie_-_up_in_ashes.mp3
Source1:        dilvie_-_up_in_ashes.ogg
Source2:	http://www.dilvie.com/music/dilvie_-_half_baked.ogg
Source3:        http://www.dilvie.com/music/dilvie_-_east_of_the_sun.ogg
Source4:        license.txt
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Buildarch:      noarch
Requires:       raidem >= 0.3.1

%description
Music created by Eric Hamilton (dilvie) for the game Raid'em


%prep
%setup -q -c -T
cp %{SOURCE4} .


%build
# nothing todo content only


%install
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/raidem/music/menu
install -p -m 644 %{SOURCE0} $RPM_BUILD_ROOT%{_datadir}/raidem/music/menu
mkdir -p $RPM_BUILD_ROOT%{_datadir}/raidem/music/level1
install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/raidem/music/level1
mkdir -p $RPM_BUILD_ROOT%{_datadir}/raidem/music/level2
install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/raidem/music/level2
mkdir -p $RPM_BUILD_ROOT%{_datadir}/raidem/music/level3
install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/raidem/music/level3


%clean
rm -rf $RPM_BUILD_ROOT


%files
%defattr(-,root,root,-)
%doc license.txt
%{_datadir}/raidem/music


%changelog
* Sat Apr 29 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-1
- Initial spec file



From fedora-extras-commits at redhat.com  Sun Apr 30 21:27:53 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 30 Apr 2006 14:27:53 -0700
Subject: rpms/pl/devel .cvsignore,1.7,1.8 pl.spec,1.23,1.24 sources,1.7,1.8
Message-ID: <200604302127.k3ULRtbw026792@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/pl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26729/devel

Modified Files:
	.cvsignore pl.spec sources 
Log Message:
new version 5.6.12


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pl/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	8 Mar 2006 19:18:52 -0000	1.7
+++ .cvsignore	30 Apr 2006 21:27:52 -0000	1.8
@@ -1,3 +1,3 @@
-HTMLmanual.tar.gz
-pl-5.6.7.tar.gz
 userguide.html.tgz
+pl-5.6.12.tar.gz
+HTMLmanual.tar.gz


Index: pl.spec
===================================================================
RCS file: /cvs/extras/rpms/pl/devel/pl.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- pl.spec	8 Mar 2006 19:18:52 -0000	1.23
+++ pl.spec	30 Apr 2006 21:27:53 -0000	1.24
@@ -1,5 +1,5 @@
 Name:		pl
-Version:	5.6.7
+Version:	5.6.12
 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.7.tar.gz
+Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.12.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
@@ -95,6 +95,9 @@
 
 
 %changelog
+* Sun Apr 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.6.12-1
+- new version 5.6.12
+
 * Wed Mar  8 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.6.7-1
 - new version 5.6.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pl/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	8 Mar 2006 19:18:52 -0000	1.7
+++ sources	30 Apr 2006 21:27:53 -0000	1.8
@@ -1,3 +1,3 @@
-f1691c99e00622145c00d50caf4aef08  HTMLmanual.tar.gz
-63f8a2dd6a48333fb1f848f78c1c5409  pl-5.6.7.tar.gz
 72feb8797f134c45be719133873cae1f  userguide.html.tgz
+ba25b23284b0ea6563c060e666500e1f  pl-5.6.12.tar.gz
+ad62344ae892832ad2d450f7193e13e0  HTMLmanual.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 30 21:27:52 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 30 Apr 2006 14:27:52 -0700
Subject: rpms/pl/FC-5 .cvsignore,1.7,1.8 pl.spec,1.23,1.24 sources,1.7,1.8
Message-ID: <200604302127.k3ULRsUO026786@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/pl/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26729/FC-5

Modified Files:
	.cvsignore pl.spec sources 
Log Message:
new version 5.6.12


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-5/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	8 Mar 2006 19:18:52 -0000	1.7
+++ .cvsignore	30 Apr 2006 21:27:52 -0000	1.8
@@ -1,3 +1,3 @@
-HTMLmanual.tar.gz
-pl-5.6.7.tar.gz
 userguide.html.tgz
+pl-5.6.12.tar.gz
+HTMLmanual.tar.gz


Index: pl.spec
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-5/pl.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- pl.spec	8 Mar 2006 19:18:52 -0000	1.23
+++ pl.spec	30 Apr 2006 21:27:52 -0000	1.24
@@ -1,5 +1,5 @@
 Name:		pl
-Version:	5.6.7
+Version:	5.6.12
 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.7.tar.gz
+Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.12.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
@@ -95,6 +95,9 @@
 
 
 %changelog
+* Sun Apr 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.6.12-1
+- new version 5.6.12
+
 * Wed Mar  8 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.6.7-1
 - new version 5.6.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-5/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	8 Mar 2006 19:18:52 -0000	1.7
+++ sources	30 Apr 2006 21:27:52 -0000	1.8
@@ -1,3 +1,3 @@
-f1691c99e00622145c00d50caf4aef08  HTMLmanual.tar.gz
-63f8a2dd6a48333fb1f848f78c1c5409  pl-5.6.7.tar.gz
 72feb8797f134c45be719133873cae1f  userguide.html.tgz
+ba25b23284b0ea6563c060e666500e1f  pl-5.6.12.tar.gz
+ad62344ae892832ad2d450f7193e13e0  HTMLmanual.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 30 21:27:51 2006
From: fedora-extras-commits at redhat.com (Gérard Milmeister (gemi))
Date: Sun, 30 Apr 2006 14:27:51 -0700
Subject: rpms/pl/FC-4 .cvsignore,1.7,1.8 pl.spec,1.19,1.20 sources,1.7,1.8
Message-ID: <200604302127.k3ULRr8j026782@cvs-int.fedora.redhat.com>

Author: gemi

Update of /cvs/extras/rpms/pl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26729/FC-4

Modified Files:
	.cvsignore pl.spec sources 
Log Message:
new version 5.6.12


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-4/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	8 Mar 2006 19:18:46 -0000	1.7
+++ .cvsignore	30 Apr 2006 21:27:51 -0000	1.8
@@ -1,3 +1,3 @@
-HTMLmanual.tar.gz
-pl-5.6.7.tar.gz
 userguide.html.tgz
+pl-5.6.12.tar.gz
+HTMLmanual.tar.gz


Index: pl.spec
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-4/pl.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- pl.spec	8 Mar 2006 19:18:46 -0000	1.19
+++ pl.spec	30 Apr 2006 21:27:51 -0000	1.20
@@ -1,5 +1,5 @@
 Name:		pl
-Version:	5.6.7
+Version:	5.6.12
 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.7.tar.gz
+Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.12.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
@@ -85,6 +85,9 @@
 
 
 %changelog
+* Sun Apr 30 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.6.12-1
+- new version 5.6.12
+
 * Wed Mar  8 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.6.7-1
 - new version 5.6.7
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-4/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	8 Mar 2006 19:18:46 -0000	1.7
+++ sources	30 Apr 2006 21:27:51 -0000	1.8
@@ -1,3 +1,3 @@
-f1691c99e00622145c00d50caf4aef08  HTMLmanual.tar.gz
-63f8a2dd6a48333fb1f848f78c1c5409  pl-5.6.7.tar.gz
 72feb8797f134c45be719133873cae1f  userguide.html.tgz
+ba25b23284b0ea6563c060e666500e1f  pl-5.6.12.tar.gz
+ad62344ae892832ad2d450f7193e13e0  HTMLmanual.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 30 21:41:16 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 30 Apr 2006 14:41:16 -0700
Subject: owners owners.list,1.926,1.927
Message-ID: <200604302141.k3ULfIfT026984@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/owners
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26967/owners

Modified Files:
	owners.list 
Log Message:
unorphan monkey-bubble


Index: owners.list
===================================================================
RCS file: /cvs/extras/owners/owners.list,v
retrieving revision 1.926
retrieving revision 1.927
diff -u -r1.926 -r1.927
--- owners.list	30 Apr 2006 16:50:01 -0000	1.926
+++ owners.list	30 Apr 2006 21:41:16 -0000	1.927
@@ -760,7 +760,7 @@
 Fedora Extras|mod_suphp|An apache2 module for executing PHP scripts with the permissions of their owners|andreas at bawue.net|extras-qa at fedoraproject.org|
 Fedora Extras|moin|MoinMoin is a Python clone of WikiWiki|matthias at rpmforge.net|extras-qa at fedoraproject.org|
 Fedora Extras|moin-latex|LaTeX plugin for the MoinMoin wiki|ed at eh3.com|extras-qa at fedoraproject.org|
-Fedora Extras|monkey-bubble|Game in the spirit of Frozen Bubble|extras-orphan at fedoraproject.org|extras-qa at fedoraproject.org|
+Fedora Extras|monkey-bubble|Game in the spirit of Frozen Bubble|j.w.r.degoede at hhs.nl|extras-qa at fedoraproject.org|michael at knox.net.nz
 Fedora Extras|monotone|A free, distributed version control system|roland at redhat.com|extras-qa at fedoraproject.org|
 Fedora Extras|moodle|A Course Management System|ivazquez at ivazquez.net|extras-qa at fedoraproject.org|
 Fedora Extras|moodss|Powerful modular monitoring graphical application|jfontain at free.fr|extras-qa at fedoraproject.org|



From fedora-extras-commits at redhat.com  Sun Apr 30 21:58:26 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 30 Apr 2006 14:58:26 -0700
Subject: rpms/monkey-bubble/devel .cvsignore, 1.2, 1.3 monkey-bubble.spec,
	1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200604302158.k3ULwSVt027054@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/monkey-bubble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27033

Modified Files:
	.cvsignore monkey-bubble.spec sources 
Log Message:
* Sat Apr 29 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.2-1
- New upstream version 0.3.2
- Add a patch to make it use gstreamer-0.10 instead of 0.8
- Add a patch to fix some warnings
- Properly install the icon
- Fix the scripts to properly handle the GConf schemas and call
  scrollkeeper-update. Don't call ldconfig as there is no lib.



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monkey-bubble/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:52:25 -0000	1.2
+++ .cvsignore	30 Apr 2006 21:58:26 -0000	1.3
@@ -1 +1 @@
-monkey-bubble-0.1.6.tar.gz
+monkey-bubble-0.3.2.tar.gz


Index: monkey-bubble.spec
===================================================================
RCS file: /cvs/extras/rpms/monkey-bubble/devel/monkey-bubble.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- monkey-bubble.spec	2 Mar 2006 21:30:57 -0000	1.3
+++ monkey-bubble.spec	30 Apr 2006 21:58:26 -0000	1.4
@@ -1,55 +1,47 @@
-Name:           monkey-bubble
-Version:        0.1.6
-Release:        1
-Summary:        Game in the spirit of Frozen Bubble
-
-Group:          Amusements/Games
-License:        GPL
-URL:            http://monkey-bubble.tuxfamily.org/
-Source0:        http://monkey-bubble.tuxfamily.org/monkey-bubble-0.1.6.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  libgnomeui-devel
-BuildRequires:  librsvg2-devel
-BuildRequires:  gstreamer-devel
-BuildRequires:  libcroco-devel
-BuildRequires:  pkgconfig
-BuildRequires:  gettext
-BuildRequires:  desktop-file-utils
-Requires(post): GConf2
+Name:             monkey-bubble
+Version:          0.3.2
+Release:          1%{?dist}
+Summary:          Game in the spirit of Frozen Bubble
+Group:            Amusements/Games
+License:          GPL
+URL:              http://monkey-bubble.tuxfamily.org/
+Source0:          http://monkey-bubble.tuxfamily.org/%{name}-%{version}.tar.gz
+Patch0:           monkey-bubble-0.3.2-gstreamer.patch
+Patch1:           monkey-bubble-0.3.2-fixes.patch
+BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:    libgnomeui-devel librsvg2-devel gstreamer-devel gettext
+BuildRequires:    desktop-file-utils
+Requires(pre):    GConf2
+Requires(post):   GConf2 scrollkeeper
+Requires(preun):  GConf2
+Requires(postun): scrollkeeper
 
 %description
-Monkey Bubble is a bust'a'move clone built using Gnometechnologies. It
+Monkey Bubble is a bust'a'move clone built using Gnome technologies. It
 currently supports 1 and 2 player games, is levelcompatible with frozen bubble,
-and features svg vector graphics forresolution independent display.
-
+and features svg vector graphics for resolution independent display.
 
 
 %prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
-
 %setup -q
+%patch0 -p1 -z .gstreamer
+%patch1 -p1 -z .fixes
+%{__sed} -i s/monkey-bubble-icon/monkey-bubble/ %{name}.desktop.in
 
 
 %build
+export CFLAGS="$RPM_OPT_FLAGS -Wno-pointer-sign"
 %configure --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}
 
-find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
-install -p -D -m0644 ./pixmaps/monkey-bubble-icon.xpm ${RPM_BUILD_ROOT}/%{_datadir}/pixmaps/monkey-bubble-icon.xpm
+# below is the desktop file and icon stuff.
 desktop-file-install --vendor fedora --delete-original \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications      \
   --add-category X-Fedora                              \
@@ -57,41 +49,69 @@
   --add-category Game                                  \
   ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
+mv ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/monkey-bubble-icon.png \
+  ${RPM_BUILD_ROOT}/%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+rmdir ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
 
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
 
+%pre
+if [ "$1" -gt 1 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
+fi
 
 %post
-/sbin/ldconfig
-export GCONF_CONFIG_SOURCE="$(gconftool-2 --get-default-source)"
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null
-
-
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+/usr/bin/gconftool-2 --makefile-install-rule \
+  %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+%preun
+if [ "$1" -eq 0 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
+fi
 
 %postun
-/sbin/ldconfig
-
+scrollkeeper-update -q || :
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
-%config %{_sysconfdir}/gconf/schemas/*
-%{_bindir}/monkey*
-%{_libdir}/*.*
+%config %{_sysconfdir}/gconf/schemas/%{name}.schemas
+%{_bindir}/monkey-*
 %{_datadir}/%{name}
+%{_datadir}/gnome
+%{_datadir}/omf
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/pixmaps/*
-
-%exclude %{_bindir}/gsttest
-%exclude %{_libdir}/*so
-
+%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 
 
 %changelog
+* Sat Apr 29 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.2-1
+- New upstream version 0.3.2
+- Add a patch to make it use gstreamer-0.10 instead of 0.8
+- Add a patch to fix some warnings
+- Properly install the icon
+- Fix the scripts to properly handle the GConf schemas and call
+  scrollkeeper-update. Don't call ldconfig as there is no lib.
+
 * Fri Nov 21 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.1.6-0.fdr.4
 - Drop .so files (for real this time).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monkey-bubble/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:52:25 -0000	1.2
+++ sources	30 Apr 2006 21:58:26 -0000	1.3
@@ -1 +1 @@
-cba30bf4d1a33048cb9317b8893088c8  monkey-bubble-0.1.6.tar.gz
+37e91fa4cdbab9ec06b2ee2a5aa0683c  monkey-bubble-0.3.2.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 30 21:59:42 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 30 Apr 2006 14:59:42 -0700
Subject: rpms/monkey-bubble/devel monkey-bubble-0.3.2-fixes.patch, NONE,
	1.1 monkey-bubble-0.3.2-gstreamer.patch, NONE, 1.1
Message-ID: <200604302159.k3ULxist027121@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/monkey-bubble/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27100

Added Files:
	monkey-bubble-0.3.2-fixes.patch 
	monkey-bubble-0.3.2-gstreamer.patch 
Log Message:
* Sat Apr 29 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.2-1
- New upstream version 0.3.2
- Add a patch to make it use gstreamer-0.10 instead of 0.8
- Add a patch to fix some warnings
- Properly install the icon
- Fix the scripts to properly handle the GConf schemas and call
  scrollkeeper-update. Don't call ldconfig as there is no lib.


monkey-bubble-0.3.2-fixes.patch:

--- NEW FILE monkey-bubble-0.3.2-fixes.patch ---
--- monkey-bubble-0.3.2/src/ui/ui-network-client.c.fixes	2004-06-29 08:53:46.000000000 +0200
+++ monkey-bubble-0.3.2/src/ui/ui-network-client.c	2006-04-30 21:02:10.000000000 +0200
@@ -145,21 +145,21 @@
        list = gtk_list_store_new(3,G_TYPE_STRING,G_TYPE_BOOLEAN,G_TYPE_BOOLEAN);
 
         column = gtk_tree_view_column_new_with_attributes("Player name",gtk_cell_renderer_text_new(),
-                                                          "text",0);
+                                                          "text",0, (char *)NULL);
 
         gtk_tree_view_append_column (GTK_TREE_VIEW (item), column);
 
         column = gtk_tree_view_column_new();
 
         column = gtk_tree_view_column_new_with_attributes("Owner",gtk_cell_renderer_toggle_new(),
-                                                          "active",1);
+                                                          "active",1, (char *)NULL);
 
         gtk_tree_view_append_column (GTK_TREE_VIEW (item), column);
 
         column = gtk_tree_view_column_new();
 
         column = gtk_tree_view_column_new_with_attributes("Ready",gtk_cell_renderer_toggle_new(),
-                                                          "active",2);
+                                                          "active",2, (char *)NULL);
 
         gtk_tree_view_append_column (GTK_TREE_VIEW (item), column);
 
--- monkey-bubble-0.3.2/src/ui/ui-network-server.c.fixes	2004-06-29 08:53:46.000000000 +0200
+++ monkey-bubble-0.3.2/src/ui/ui-network-server.c	2006-04-30 21:02:10.000000000 +0200
@@ -155,21 +155,21 @@
        list = gtk_list_store_new(3,G_TYPE_STRING,G_TYPE_BOOLEAN,G_TYPE_BOOLEAN);
 
         column = gtk_tree_view_column_new_with_attributes("Player name",gtk_cell_renderer_text_new(),
-                                                          "text",0);
+                                                          "text",0, (char *)NULL);
 
         gtk_tree_view_append_column (GTK_TREE_VIEW (item), column);
 
         column = gtk_tree_view_column_new();
 
         column = gtk_tree_view_column_new_with_attributes("Owner",gtk_cell_renderer_toggle_new(),
-                                                          "active",1);
+                                                          "active",1, (char *)NULL);
 
         gtk_tree_view_append_column (GTK_TREE_VIEW (item), column);
 
         column = gtk_tree_view_column_new();
 
         column = gtk_tree_view_column_new_with_attributes("Ready",gtk_cell_renderer_toggle_new(),
-                                                          "active",2);
+                                                          "active",2, (char *)NULL);
 
         gtk_tree_view_append_column (GTK_TREE_VIEW (item), column);
 
--- monkey-bubble-0.3.2/src/ui/eggcellrendererkeys.c.fixes	2004-06-29 08:53:44.000000000 +0200
+++ monkey-bubble-0.3.2/src/ui/eggcellrendererkeys.c	2006-04-30 21:05:22.000000000 +0200
@@ -519,6 +519,7 @@
   EggCellRendererKeys *keys;
   GtkWidget *label;
   GtkWidget *eventbox;
+  GtkWidget **double_ptr;
   
   celltext = GTK_CELL_RENDERER_TEXT (cell);
   keys = EGG_CELL_RENDERER_KEYS (cell);
@@ -551,8 +552,9 @@
   eventbox = g_object_new (pointless_eventbox_subclass_get_type (),
                            NULL);
   keys->edit_widget = eventbox;
+  double_ptr = &(keys->edit_widget);
   g_object_add_weak_pointer (G_OBJECT (keys->edit_widget),
-                             (void**) &keys->edit_widget);
+                             (void**) double_ptr);
   
   label = gtk_label_new (NULL);
   gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
@@ -586,9 +588,9 @@
 }
 
 void
-egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys *keys,
-                                        guint                keyval,
-                                        GdkModifierType      mask)
+egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys   *keys,
+                                        guint                  keyval,
+                                        EggVirtualModifierType mask)
 {
   char *text;
   gboolean changed;
@@ -628,9 +630,9 @@
 }
 
 void
-egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys *keys,
-                                        guint               *keyval,
-                                        GdkModifierType     *mask)
+egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys    *keys,
+                                        guint                  *keyval,
+                                        EggVirtualModifierType *mask)
 {
   g_return_if_fail (EGG_IS_CELL_RENDERER_KEYS (keys));
 

monkey-bubble-0.3.2-gstreamer.patch:

--- NEW FILE monkey-bubble-0.3.2-gstreamer.patch ---
--- monkey-bubble-0.3.2/configure.in.gstreamer	2004-07-02 08:37:35.000000000 +0200
+++ monkey-bubble-0.3.2/configure.in	2006-04-30 22:06:54.000000000 +0200
@@ -68,8 +68,7 @@
 PKG_CHECK_MODULES(LIBMONKEYAUDIO_A,[
 	gtk+-2.0
 	gthread-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	])
 AC_SUBST(LIBMONKEYAUDIO_A_CFLAGS)
 AC_SUBST(LIBMONKEYAUDIO_A_LIBS)
@@ -88,8 +87,7 @@
 	gthread-2.0
 	librsvg-2.0
 	libgnomeui-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	gconf-2.0
 	libglade-2.0
 	])
--- monkey-bubble-0.3.2/src/audio/sound-manager.c.gstreamer	2004-07-02 08:30:15.000000000 +0200
+++ monkey-bubble-0.3.2/src/audio/sound-manager.c	2006-04-30 22:26:35.000000000 +0200
@@ -20,7 +20,6 @@
 #include "sound-manager.h"
 #include "playground.h"
 #include <gst/gst.h>
-#include <gst/gconf/gconf.h>
 #define PRIVATE(sound_manager) (sound_manager->private)
 
 static GObjectClass* parent_class = NULL;
@@ -28,17 +27,11 @@
 struct SoundManagerPrivate {
   GstElement * main_bin;
   GstElement * filesrc;
-    GstElement * oggdemux;
+  GstElement * oggdemux;
   GstElement * vorbis_dec;
-    GstElement * audioconvert;
+  GstElement * audioconvert;
   GstElement * output;
-
-	 gboolean new_pad_ok;
-  gboolean is_playing;
-  gint idle_id;
-
-	 GThread * loop_thread;
-	 gchar * current_music_path;
+  gchar * current_music_path;
 };
 
 
@@ -119,16 +112,31 @@
 	 return FALSE;
 }
 
-static void eos(GstElement *e ,gpointer user_data) {
-    g_print("end of fie..\n");
-
-	 //	 	 g_idle_add(ck,user_data);
-	 // g_idle_add(start_play,mbin);
-	 g_timeout_add(100, restart_play,user_data);
-}
-static void error_handler(GstElement * e,GObject * o,gchar * string,gpointer data) {
-    g_print("error : %s\n",string);
+static gboolean
+bus_call (GstBus     *bus,
+	  GstMessage *msg,
+	  gpointer    data)
+{
+  switch (GST_MESSAGE_TYPE (msg)) {
+    case GST_MESSAGE_EOS:
+      g_timeout_add(100, restart_play, data);
+      break;
+    case GST_MESSAGE_ERROR: {
+      gchar *debug;
+      GError *err;
+
+      gst_message_parse_error (msg, &err, &debug);
+      g_free (debug);
+
+      g_print ("Error: %s\n", err->message);
+      g_error_free (err);
+      break;
+    }
+    default:
+      break;
+  }
 
+  return TRUE;
 }
 
 
@@ -139,8 +147,7 @@
     sound_manager = SOUND_MANAGER (g_object_new (TYPE_SOUND_MANAGER, NULL));
 
     dp = PRIVATE(sound_manager);
-  
-    dp->is_playing = FALSE;			       
+    dp->main_bin = NULL;			       
     return sound_manager;
 }
 
@@ -148,43 +155,11 @@
 static void
 stop_play(SoundManager * m) 
 {
-
-    if( sound_active) {
-
-		  if( PRIVATE(m)->is_playing ) {
-				
-				PRIVATE(m)->is_playing = FALSE;
-				g_thread_join( PRIVATE(m)->loop_thread);
-
-				gst_element_set_state( PRIVATE(m)->main_bin,GST_STATE_NULL);
-				gst_bin_iterate( GST_BIN(PRIVATE(m)->main_bin));
-		  }
-		  
-
-		  
-		  g_object_unref( G_OBJECT(PRIVATE(m)->main_bin ));
-		  
-		  PRIVATE(m)->output = NULL;
-		  PRIVATE(m)->main_bin = NULL;
-		  PRIVATE(m)->vorbis_dec = NULL;
-		  PRIVATE(m)->filesrc = NULL;
-	 }
-}
-
-static gpointer
-loop(gpointer data) 
-{
-	 SoundManager * m;
-	 m = SOUND_MANAGER(data);
-	 while( PRIVATE(m)->is_playing) {
-		  g_usleep(10*1000);
-		  if( gst_bin_iterate( GST_BIN(PRIVATE(m)->main_bin)) == FALSE) {
-				PRIVATE(m)->is_playing = FALSE;
-		  }		  		  
-		  
-	 }
-
-	 return NULL;
+    if( PRIVATE(m)->main_bin ) {
+	gst_element_set_state( PRIVATE(m)->main_bin,GST_STATE_NULL);
+        g_object_unref( G_OBJECT(PRIVATE(m)->main_bin ));
+        PRIVATE(m)->main_bin = NULL;
+    }
 }
 
 
@@ -193,29 +168,9 @@
 		 GObject *new_pad,
 		 SoundManager * m)
 {
-   
-    gst_element_set_state (PRIVATE(m)->main_bin, GST_STATE_PAUSED);
-
-    gst_bin_add_many(GST_BIN(PRIVATE(m)->main_bin),
-		     PRIVATE(m)->vorbis_dec,
-		     PRIVATE(m)->audioconvert,
-		     PRIVATE(m)->output,
-		     NULL);
-
-  
-  gst_element_link_many(
-		     PRIVATE(m)->vorbis_dec,
-		     PRIVATE(m)->audioconvert,
-		     PRIVATE(m)->output,
-			NULL);
-  
-  GstPad * pad = gst_element_get_pad( GST_ELEMENT(PRIVATE(m)->vorbis_dec),"sink");
-
-  gst_pad_link( GST_PAD(new_pad), pad);
-  PRIVATE(m)->new_pad_ok = TRUE;
-
-    
-  gst_element_set_state (GST_ELEMENT(PRIVATE(m)->main_bin), GST_STATE_PLAYING); 
+  GstPad *sinkpad = gst_element_get_pad (PRIVATE(m)->vorbis_dec, "sink");
+  gst_pad_link (GST_PAD(new_pad), sinkpad);
+  gst_object_unref (sinkpad);
 }
 
 
@@ -223,47 +178,41 @@
 start_play(SoundManager *m, gchar * path) 
 {
   if( sound_active) {
-		PRIVATE(m)->new_pad_ok = FALSE;
 		PRIVATE(m)->main_bin = gst_pipeline_new("bin");
 		PRIVATE(m)->filesrc = gst_element_factory_make("filesrc","filesrc");
 		PRIVATE(m)->oggdemux = gst_element_factory_make("oggdemux","oggdemux");
 		PRIVATE(m)->vorbis_dec = gst_element_factory_make("vorbisdec","vorbisdec");
 		PRIVATE(m)->audioconvert = gst_element_factory_make("audioconvert","audioconvert");
-		PRIVATE(m)->output =  gst_gconf_get_default_audio_sink();
+		PRIVATE(m)->output = gst_element_factory_make ("alsasink", "alsa-output");
 
 		PRIVATE(m)->current_music_path = g_strdup(path);
 
-		g_signal_connect(G_OBJECT(PRIVATE(m)->main_bin),
-							  "error", GTK_SIGNAL_FUNC(error_handler),NULL);
-    
-		g_signal_connect( PRIVATE(m)->oggdemux, "new-pad", G_CALLBACK(oggdemux_new_pad),m);
-		
-		gst_bin_add_many( GST_BIN( PRIVATE(m)->main_bin),
-								PRIVATE(m)->filesrc,
-								PRIVATE(m)->oggdemux,
-								NULL);
-		
 		g_object_set( G_OBJECT( PRIVATE(m)->filesrc), "location",path,NULL);
 		
-		g_object_set( G_OBJECT( PRIVATE(m)->filesrc), "blocksize",10000,NULL);
-		
-		g_signal_connect(PRIVATE(m)->filesrc,
-							  "eos",
-							  G_CALLBACK(eos),
-							  m);
-	 
-		gst_element_link_many( PRIVATE(m)->filesrc, PRIVATE(m)->oggdemux,NULL);
-		
+//		g_object_set( G_OBJECT( PRIVATE(m)->filesrc), "blocksize",10000,NULL);
+                gst_bus_add_watch (gst_pipeline_get_bus (
+                     GST_PIPELINE (PRIVATE(m)->main_bin)),
+		     bus_call, m);
+
+		gst_bin_add_many( GST_BIN( PRIVATE(m)->main_bin),
+                        PRIVATE(m)->filesrc,
+			PRIVATE(m)->oggdemux,
+			PRIVATE(m)->vorbis_dec,
+			PRIVATE(m)->audioconvert,
+			PRIVATE(m)->output,
+			NULL);
+
+
+		gst_element_link( PRIVATE(m)->filesrc, PRIVATE(m)->oggdemux );
+                gst_element_link_many(
+		        PRIVATE(m)->vorbis_dec,
+		        PRIVATE(m)->audioconvert,
+		        PRIVATE(m)->output,
+			NULL);
+		g_signal_connect( PRIVATE(m)->oggdemux, "pad-added",
+		        G_CALLBACK(oggdemux_new_pad), m);
 		
 		gst_element_set_state( PRIVATE(m)->main_bin,GST_STATE_PLAYING);
-		
-		PRIVATE(m)->is_playing = TRUE;
-		
-		while( !PRIVATE(m)->new_pad_ok && gst_bin_iterate( GST_BIN( PRIVATE(m)->main_bin)) && PRIVATE(m)->is_playing );
-		
-		PRIVATE(m)->loop_thread =
-			 g_thread_create( loop,m,TRUE,NULL);
-
   }
 }
 
@@ -271,7 +220,7 @@
 
   g_assert(IS_SOUND_MANAGER(m));
   
-  if( PRIVATE(m)->is_playing == TRUE) {
+  if( PRIVATE(m)->main_bin) {
 		stop_play(m);		
   }
   
--- monkey-bubble-0.3.2/configure.gstreamer	2004-07-02 09:07:24.000000000 +0200
+++ monkey-bubble-0.3.2/configure	2006-04-30 22:06:54.000000000 +0200
@@ -20454,21 +20454,18 @@
         echo "$as_me:$LINENO: checking for
 	gtk+-2.0
 	gthread-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	" >&5
 echo $ECHO_N "checking for
 	gtk+-2.0
 	gthread-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	... $ECHO_C" >&6
 
         if $PKG_CONFIG --exists "
 	gtk+-2.0
 	gthread-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	" ; then
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
@@ -20479,8 +20476,7 @@
             LIBMONKEYAUDIO_A_CFLAGS=`$PKG_CONFIG --cflags "
 	gtk+-2.0
 	gthread-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	"`
             echo "$as_me:$LINENO: result: $LIBMONKEYAUDIO_A_CFLAGS" >&5
 echo "${ECHO_T}$LIBMONKEYAUDIO_A_CFLAGS" >&6
@@ -20490,8 +20486,7 @@
             LIBMONKEYAUDIO_A_LIBS=`$PKG_CONFIG --libs "
 	gtk+-2.0
 	gthread-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	"`
             echo "$as_me:$LINENO: result: $LIBMONKEYAUDIO_A_LIBS" >&5
 echo "${ECHO_T}$LIBMONKEYAUDIO_A_LIBS" >&6
@@ -20503,8 +20498,7 @@
             LIBMONKEYAUDIO_A_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
 	gtk+-2.0
 	gthread-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	"`
             echo $LIBMONKEYAUDIO_A_PKG_ERRORS
         fi
@@ -20523,14 +20517,12 @@
      { { echo "$as_me:$LINENO: error: Library requirements (
 	gtk+-2.0
 	gthread-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
 echo "$as_me: error: Library requirements (
 	gtk+-2.0
 	gthread-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
    { (exit 1); exit 1; }; }
   fi
@@ -20731,8 +20723,7 @@
 	gthread-2.0
 	librsvg-2.0
 	libgnomeui-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	gconf-2.0
 	libglade-2.0
 	" >&5
@@ -20741,8 +20732,7 @@
 	gthread-2.0
 	librsvg-2.0
 	libgnomeui-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	gconf-2.0
 	libglade-2.0
 	... $ECHO_C" >&6
@@ -20752,8 +20742,7 @@
 	gthread-2.0
 	librsvg-2.0
 	libgnomeui-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	gconf-2.0
 	libglade-2.0
 	" ; then
@@ -20768,8 +20757,7 @@
 	gthread-2.0
 	librsvg-2.0
 	libgnomeui-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	gconf-2.0
 	libglade-2.0
 	"`
@@ -20783,8 +20771,7 @@
 	gthread-2.0
 	librsvg-2.0
 	libgnomeui-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	gconf-2.0
 	libglade-2.0
 	"`
@@ -20800,8 +20787,7 @@
 	gthread-2.0
 	librsvg-2.0
 	libgnomeui-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	gconf-2.0
 	libglade-2.0
 	"`
@@ -20824,8 +20810,7 @@
 	gthread-2.0
 	librsvg-2.0
 	libgnomeui-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	gconf-2.0
 	libglade-2.0
 	) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
@@ -20834,8 +20819,7 @@
 	gthread-2.0
 	librsvg-2.0
 	libgnomeui-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	gconf-2.0
 	libglade-2.0
 	) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}



From fedora-extras-commits at redhat.com  Sun Apr 30 22:01:31 2006
From: fedora-extras-commits at redhat.com (Hans de Goede (jwrdegoede))
Date: Sun, 30 Apr 2006 15:01:31 -0700
Subject: rpms/monkey-bubble/FC-5 monkey-bubble-0.3.2-fixes.patch, NONE,
	1.1 monkey-bubble-0.3.2-gstreamer.patch, NONE, 1.1 .cvsignore,
	1.2, 1.3 monkey-bubble.spec, 1.3, 1.4 sources, 1.2, 1.3
Message-ID: <200604302202.k3UM24k2029353@cvs-int.fedora.redhat.com>

Author: jwrdegoede

Update of /cvs/extras/rpms/monkey-bubble/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29324

Modified Files:
	.cvsignore monkey-bubble.spec sources 
Added Files:
	monkey-bubble-0.3.2-fixes.patch 
	monkey-bubble-0.3.2-gstreamer.patch 
Log Message:
* Sat Apr 29 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.2-1
- New upstream version 0.3.2
- Add a patch to make it use gstreamer-0.10 instead of 0.8
- Add a patch to fix some warnings
- Properly install the icon
- Fix the scripts to properly handle the GConf schemas and call
  scrollkeeper-update. Don't call ldconfig as there is no lib.


monkey-bubble-0.3.2-fixes.patch:

--- NEW FILE monkey-bubble-0.3.2-fixes.patch ---
--- monkey-bubble-0.3.2/src/ui/ui-network-client.c.fixes	2004-06-29 08:53:46.000000000 +0200
+++ monkey-bubble-0.3.2/src/ui/ui-network-client.c	2006-04-30 21:02:10.000000000 +0200
@@ -145,21 +145,21 @@
        list = gtk_list_store_new(3,G_TYPE_STRING,G_TYPE_BOOLEAN,G_TYPE_BOOLEAN);
 
         column = gtk_tree_view_column_new_with_attributes("Player name",gtk_cell_renderer_text_new(),
-                                                          "text",0);
+                                                          "text",0, (char *)NULL);
 
         gtk_tree_view_append_column (GTK_TREE_VIEW (item), column);
 
         column = gtk_tree_view_column_new();
 
         column = gtk_tree_view_column_new_with_attributes("Owner",gtk_cell_renderer_toggle_new(),
-                                                          "active",1);
+                                                          "active",1, (char *)NULL);
 
         gtk_tree_view_append_column (GTK_TREE_VIEW (item), column);
 
         column = gtk_tree_view_column_new();
 
         column = gtk_tree_view_column_new_with_attributes("Ready",gtk_cell_renderer_toggle_new(),
-                                                          "active",2);
+                                                          "active",2, (char *)NULL);
 
         gtk_tree_view_append_column (GTK_TREE_VIEW (item), column);
 
--- monkey-bubble-0.3.2/src/ui/ui-network-server.c.fixes	2004-06-29 08:53:46.000000000 +0200
+++ monkey-bubble-0.3.2/src/ui/ui-network-server.c	2006-04-30 21:02:10.000000000 +0200
@@ -155,21 +155,21 @@
        list = gtk_list_store_new(3,G_TYPE_STRING,G_TYPE_BOOLEAN,G_TYPE_BOOLEAN);
 
         column = gtk_tree_view_column_new_with_attributes("Player name",gtk_cell_renderer_text_new(),
-                                                          "text",0);
+                                                          "text",0, (char *)NULL);
 
         gtk_tree_view_append_column (GTK_TREE_VIEW (item), column);
 
         column = gtk_tree_view_column_new();
 
         column = gtk_tree_view_column_new_with_attributes("Owner",gtk_cell_renderer_toggle_new(),
-                                                          "active",1);
+                                                          "active",1, (char *)NULL);
 
         gtk_tree_view_append_column (GTK_TREE_VIEW (item), column);
 
         column = gtk_tree_view_column_new();
 
         column = gtk_tree_view_column_new_with_attributes("Ready",gtk_cell_renderer_toggle_new(),
-                                                          "active",2);
+                                                          "active",2, (char *)NULL);
 
         gtk_tree_view_append_column (GTK_TREE_VIEW (item), column);
 
--- monkey-bubble-0.3.2/src/ui/eggcellrendererkeys.c.fixes	2004-06-29 08:53:44.000000000 +0200
+++ monkey-bubble-0.3.2/src/ui/eggcellrendererkeys.c	2006-04-30 21:05:22.000000000 +0200
@@ -519,6 +519,7 @@
   EggCellRendererKeys *keys;
   GtkWidget *label;
   GtkWidget *eventbox;
+  GtkWidget **double_ptr;
   
   celltext = GTK_CELL_RENDERER_TEXT (cell);
   keys = EGG_CELL_RENDERER_KEYS (cell);
@@ -551,8 +552,9 @@
   eventbox = g_object_new (pointless_eventbox_subclass_get_type (),
                            NULL);
   keys->edit_widget = eventbox;
+  double_ptr = &(keys->edit_widget);
   g_object_add_weak_pointer (G_OBJECT (keys->edit_widget),
-                             (void**) &keys->edit_widget);
+                             (void**) double_ptr);
   
   label = gtk_label_new (NULL);
   gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
@@ -586,9 +588,9 @@
 }
 
 void
-egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys *keys,
-                                        guint                keyval,
-                                        GdkModifierType      mask)
+egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys   *keys,
+                                        guint                  keyval,
+                                        EggVirtualModifierType mask)
 {
   char *text;
   gboolean changed;
@@ -628,9 +630,9 @@
 }
 
 void
-egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys *keys,
-                                        guint               *keyval,
-                                        GdkModifierType     *mask)
+egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys    *keys,
+                                        guint                  *keyval,
+                                        EggVirtualModifierType *mask)
 {
   g_return_if_fail (EGG_IS_CELL_RENDERER_KEYS (keys));
 

monkey-bubble-0.3.2-gstreamer.patch:

--- NEW FILE monkey-bubble-0.3.2-gstreamer.patch ---
--- monkey-bubble-0.3.2/configure.in.gstreamer	2004-07-02 08:37:35.000000000 +0200
+++ monkey-bubble-0.3.2/configure.in	2006-04-30 22:06:54.000000000 +0200
@@ -68,8 +68,7 @@
 PKG_CHECK_MODULES(LIBMONKEYAUDIO_A,[
 	gtk+-2.0
 	gthread-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	])
 AC_SUBST(LIBMONKEYAUDIO_A_CFLAGS)
 AC_SUBST(LIBMONKEYAUDIO_A_LIBS)
@@ -88,8 +87,7 @@
 	gthread-2.0
 	librsvg-2.0
 	libgnomeui-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	gconf-2.0
 	libglade-2.0
 	])
--- monkey-bubble-0.3.2/src/audio/sound-manager.c.gstreamer	2004-07-02 08:30:15.000000000 +0200
+++ monkey-bubble-0.3.2/src/audio/sound-manager.c	2006-04-30 22:26:35.000000000 +0200
@@ -20,7 +20,6 @@
 #include "sound-manager.h"
 #include "playground.h"
 #include <gst/gst.h>
-#include <gst/gconf/gconf.h>
 #define PRIVATE(sound_manager) (sound_manager->private)
 
 static GObjectClass* parent_class = NULL;
@@ -28,17 +27,11 @@
 struct SoundManagerPrivate {
   GstElement * main_bin;
   GstElement * filesrc;
-    GstElement * oggdemux;
+  GstElement * oggdemux;
   GstElement * vorbis_dec;
-    GstElement * audioconvert;
+  GstElement * audioconvert;
   GstElement * output;
-
-	 gboolean new_pad_ok;
-  gboolean is_playing;
-  gint idle_id;
-
-	 GThread * loop_thread;
-	 gchar * current_music_path;
+  gchar * current_music_path;
 };
 
 
@@ -119,16 +112,31 @@
 	 return FALSE;
 }
 
-static void eos(GstElement *e ,gpointer user_data) {
-    g_print("end of fie..\n");
-
-	 //	 	 g_idle_add(ck,user_data);
-	 // g_idle_add(start_play,mbin);
-	 g_timeout_add(100, restart_play,user_data);
-}
-static void error_handler(GstElement * e,GObject * o,gchar * string,gpointer data) {
-    g_print("error : %s\n",string);
+static gboolean
+bus_call (GstBus     *bus,
+	  GstMessage *msg,
+	  gpointer    data)
+{
+  switch (GST_MESSAGE_TYPE (msg)) {
+    case GST_MESSAGE_EOS:
+      g_timeout_add(100, restart_play, data);
+      break;
+    case GST_MESSAGE_ERROR: {
+      gchar *debug;
+      GError *err;
+
+      gst_message_parse_error (msg, &err, &debug);
+      g_free (debug);
+
+      g_print ("Error: %s\n", err->message);
+      g_error_free (err);
+      break;
+    }
+    default:
+      break;
+  }
 
+  return TRUE;
 }
 
 
@@ -139,8 +147,7 @@
     sound_manager = SOUND_MANAGER (g_object_new (TYPE_SOUND_MANAGER, NULL));
 
     dp = PRIVATE(sound_manager);
-  
-    dp->is_playing = FALSE;			       
+    dp->main_bin = NULL;			       
     return sound_manager;
 }
 
@@ -148,43 +155,11 @@
 static void
 stop_play(SoundManager * m) 
 {
-
-    if( sound_active) {
-
-		  if( PRIVATE(m)->is_playing ) {
-				
-				PRIVATE(m)->is_playing = FALSE;
-				g_thread_join( PRIVATE(m)->loop_thread);
-
-				gst_element_set_state( PRIVATE(m)->main_bin,GST_STATE_NULL);
-				gst_bin_iterate( GST_BIN(PRIVATE(m)->main_bin));
-		  }
-		  
-
-		  
-		  g_object_unref( G_OBJECT(PRIVATE(m)->main_bin ));
-		  
-		  PRIVATE(m)->output = NULL;
-		  PRIVATE(m)->main_bin = NULL;
-		  PRIVATE(m)->vorbis_dec = NULL;
-		  PRIVATE(m)->filesrc = NULL;
-	 }
-}
-
-static gpointer
-loop(gpointer data) 
-{
-	 SoundManager * m;
-	 m = SOUND_MANAGER(data);
-	 while( PRIVATE(m)->is_playing) {
-		  g_usleep(10*1000);
-		  if( gst_bin_iterate( GST_BIN(PRIVATE(m)->main_bin)) == FALSE) {
-				PRIVATE(m)->is_playing = FALSE;
-		  }		  		  
-		  
-	 }
-
-	 return NULL;
+    if( PRIVATE(m)->main_bin ) {
+	gst_element_set_state( PRIVATE(m)->main_bin,GST_STATE_NULL);
+        g_object_unref( G_OBJECT(PRIVATE(m)->main_bin ));
+        PRIVATE(m)->main_bin = NULL;
+    }
 }
 
 
@@ -193,29 +168,9 @@
 		 GObject *new_pad,
 		 SoundManager * m)
 {
-   
-    gst_element_set_state (PRIVATE(m)->main_bin, GST_STATE_PAUSED);
-
-    gst_bin_add_many(GST_BIN(PRIVATE(m)->main_bin),
-		     PRIVATE(m)->vorbis_dec,
-		     PRIVATE(m)->audioconvert,
-		     PRIVATE(m)->output,
-		     NULL);
-
-  
-  gst_element_link_many(
-		     PRIVATE(m)->vorbis_dec,
-		     PRIVATE(m)->audioconvert,
-		     PRIVATE(m)->output,
-			NULL);
-  
-  GstPad * pad = gst_element_get_pad( GST_ELEMENT(PRIVATE(m)->vorbis_dec),"sink");
-
-  gst_pad_link( GST_PAD(new_pad), pad);
-  PRIVATE(m)->new_pad_ok = TRUE;
-
-    
-  gst_element_set_state (GST_ELEMENT(PRIVATE(m)->main_bin), GST_STATE_PLAYING); 
+  GstPad *sinkpad = gst_element_get_pad (PRIVATE(m)->vorbis_dec, "sink");
+  gst_pad_link (GST_PAD(new_pad), sinkpad);
+  gst_object_unref (sinkpad);
 }
 
 
@@ -223,47 +178,41 @@
 start_play(SoundManager *m, gchar * path) 
 {
   if( sound_active) {
-		PRIVATE(m)->new_pad_ok = FALSE;
 		PRIVATE(m)->main_bin = gst_pipeline_new("bin");
 		PRIVATE(m)->filesrc = gst_element_factory_make("filesrc","filesrc");
 		PRIVATE(m)->oggdemux = gst_element_factory_make("oggdemux","oggdemux");
 		PRIVATE(m)->vorbis_dec = gst_element_factory_make("vorbisdec","vorbisdec");
 		PRIVATE(m)->audioconvert = gst_element_factory_make("audioconvert","audioconvert");
-		PRIVATE(m)->output =  gst_gconf_get_default_audio_sink();
+		PRIVATE(m)->output = gst_element_factory_make ("alsasink", "alsa-output");
 
 		PRIVATE(m)->current_music_path = g_strdup(path);
 
-		g_signal_connect(G_OBJECT(PRIVATE(m)->main_bin),
-							  "error", GTK_SIGNAL_FUNC(error_handler),NULL);
-    
-		g_signal_connect( PRIVATE(m)->oggdemux, "new-pad", G_CALLBACK(oggdemux_new_pad),m);
-		
-		gst_bin_add_many( GST_BIN( PRIVATE(m)->main_bin),
-								PRIVATE(m)->filesrc,
-								PRIVATE(m)->oggdemux,
-								NULL);
-		
 		g_object_set( G_OBJECT( PRIVATE(m)->filesrc), "location",path,NULL);
 		
-		g_object_set( G_OBJECT( PRIVATE(m)->filesrc), "blocksize",10000,NULL);
-		
-		g_signal_connect(PRIVATE(m)->filesrc,
-							  "eos",
-							  G_CALLBACK(eos),
-							  m);
-	 
-		gst_element_link_many( PRIVATE(m)->filesrc, PRIVATE(m)->oggdemux,NULL);
-		
+//		g_object_set( G_OBJECT( PRIVATE(m)->filesrc), "blocksize",10000,NULL);
+                gst_bus_add_watch (gst_pipeline_get_bus (
+                     GST_PIPELINE (PRIVATE(m)->main_bin)),
+		     bus_call, m);
+
+		gst_bin_add_many( GST_BIN( PRIVATE(m)->main_bin),
+                        PRIVATE(m)->filesrc,
+			PRIVATE(m)->oggdemux,
+			PRIVATE(m)->vorbis_dec,
+			PRIVATE(m)->audioconvert,
+			PRIVATE(m)->output,
+			NULL);
+
+
+		gst_element_link( PRIVATE(m)->filesrc, PRIVATE(m)->oggdemux );
+                gst_element_link_many(
+		        PRIVATE(m)->vorbis_dec,
+		        PRIVATE(m)->audioconvert,
+		        PRIVATE(m)->output,
+			NULL);
+		g_signal_connect( PRIVATE(m)->oggdemux, "pad-added",
+		        G_CALLBACK(oggdemux_new_pad), m);
 		
 		gst_element_set_state( PRIVATE(m)->main_bin,GST_STATE_PLAYING);
-		
-		PRIVATE(m)->is_playing = TRUE;
-		
-		while( !PRIVATE(m)->new_pad_ok && gst_bin_iterate( GST_BIN( PRIVATE(m)->main_bin)) && PRIVATE(m)->is_playing );
-		
-		PRIVATE(m)->loop_thread =
-			 g_thread_create( loop,m,TRUE,NULL);
-
   }
 }
 
@@ -271,7 +220,7 @@
 
   g_assert(IS_SOUND_MANAGER(m));
   
-  if( PRIVATE(m)->is_playing == TRUE) {
+  if( PRIVATE(m)->main_bin) {
 		stop_play(m);		
   }
   
--- monkey-bubble-0.3.2/configure.gstreamer	2004-07-02 09:07:24.000000000 +0200
+++ monkey-bubble-0.3.2/configure	2006-04-30 22:06:54.000000000 +0200
@@ -20454,21 +20454,18 @@
         echo "$as_me:$LINENO: checking for
 	gtk+-2.0
 	gthread-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	" >&5
 echo $ECHO_N "checking for
 	gtk+-2.0
 	gthread-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	... $ECHO_C" >&6
 
         if $PKG_CONFIG --exists "
 	gtk+-2.0
 	gthread-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	" ; then
             echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
@@ -20479,8 +20476,7 @@
             LIBMONKEYAUDIO_A_CFLAGS=`$PKG_CONFIG --cflags "
 	gtk+-2.0
 	gthread-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	"`
             echo "$as_me:$LINENO: result: $LIBMONKEYAUDIO_A_CFLAGS" >&5
 echo "${ECHO_T}$LIBMONKEYAUDIO_A_CFLAGS" >&6
@@ -20490,8 +20486,7 @@
             LIBMONKEYAUDIO_A_LIBS=`$PKG_CONFIG --libs "
 	gtk+-2.0
 	gthread-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	"`
             echo "$as_me:$LINENO: result: $LIBMONKEYAUDIO_A_LIBS" >&5
 echo "${ECHO_T}$LIBMONKEYAUDIO_A_LIBS" >&6
@@ -20503,8 +20498,7 @@
             LIBMONKEYAUDIO_A_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "
 	gtk+-2.0
 	gthread-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	"`
             echo $LIBMONKEYAUDIO_A_PKG_ERRORS
         fi
@@ -20523,14 +20517,12 @@
      { { echo "$as_me:$LINENO: error: Library requirements (
 	gtk+-2.0
 	gthread-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
 echo "$as_me: error: Library requirements (
 	gtk+-2.0
 	gthread-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
    { (exit 1); exit 1; }; }
   fi
@@ -20731,8 +20723,7 @@
 	gthread-2.0
 	librsvg-2.0
 	libgnomeui-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	gconf-2.0
 	libglade-2.0
 	" >&5
@@ -20741,8 +20732,7 @@
 	gthread-2.0
 	librsvg-2.0
 	libgnomeui-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	gconf-2.0
 	libglade-2.0
 	... $ECHO_C" >&6
@@ -20752,8 +20742,7 @@
 	gthread-2.0
 	librsvg-2.0
 	libgnomeui-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	gconf-2.0
 	libglade-2.0
 	" ; then
@@ -20768,8 +20757,7 @@
 	gthread-2.0
 	librsvg-2.0
 	libgnomeui-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	gconf-2.0
 	libglade-2.0
 	"`
@@ -20783,8 +20771,7 @@
 	gthread-2.0
 	librsvg-2.0
 	libgnomeui-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	gconf-2.0
 	libglade-2.0
 	"`
@@ -20800,8 +20787,7 @@
 	gthread-2.0
 	librsvg-2.0
 	libgnomeui-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	gconf-2.0
 	libglade-2.0
 	"`
@@ -20824,8 +20810,7 @@
 	gthread-2.0
 	librsvg-2.0
 	libgnomeui-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	gconf-2.0
 	libglade-2.0
 	) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
@@ -20834,8 +20819,7 @@
 	gthread-2.0
 	librsvg-2.0
 	libgnomeui-2.0
-	gstreamer-0.8
-	gstreamer-gconf-0.8
+	gstreamer-0.10
 	gconf-2.0
 	libglade-2.0
 	) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/monkey-bubble/FC-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:52:25 -0000	1.2
+++ .cvsignore	30 Apr 2006 22:01:31 -0000	1.3
@@ -1 +1 @@
-monkey-bubble-0.1.6.tar.gz
+monkey-bubble-0.3.2.tar.gz


Index: monkey-bubble.spec
===================================================================
RCS file: /cvs/extras/rpms/monkey-bubble/FC-5/monkey-bubble.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- monkey-bubble.spec	2 Mar 2006 21:30:57 -0000	1.3
+++ monkey-bubble.spec	30 Apr 2006 22:01:31 -0000	1.4
@@ -1,55 +1,47 @@
-Name:           monkey-bubble
-Version:        0.1.6
-Release:        1
-Summary:        Game in the spirit of Frozen Bubble
-
-Group:          Amusements/Games
-License:        GPL
-URL:            http://monkey-bubble.tuxfamily.org/
-Source0:        http://monkey-bubble.tuxfamily.org/monkey-bubble-0.1.6.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  libgnomeui-devel
-BuildRequires:  librsvg2-devel
-BuildRequires:  gstreamer-devel
-BuildRequires:  libcroco-devel
-BuildRequires:  pkgconfig
-BuildRequires:  gettext
-BuildRequires:  desktop-file-utils
-Requires(post): GConf2
+Name:             monkey-bubble
+Version:          0.3.2
+Release:          1%{?dist}
+Summary:          Game in the spirit of Frozen Bubble
+Group:            Amusements/Games
+License:          GPL
+URL:              http://monkey-bubble.tuxfamily.org/
+Source0:          http://monkey-bubble.tuxfamily.org/%{name}-%{version}.tar.gz
+Patch0:           monkey-bubble-0.3.2-gstreamer.patch
+Patch1:           monkey-bubble-0.3.2-fixes.patch
+BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires:    libgnomeui-devel librsvg2-devel gstreamer-devel gettext
+BuildRequires:    desktop-file-utils
+Requires(pre):    GConf2
+Requires(post):   GConf2 scrollkeeper
+Requires(preun):  GConf2
+Requires(postun): scrollkeeper
 
 %description
-Monkey Bubble is a bust'a'move clone built using Gnometechnologies. It
+Monkey Bubble is a bust'a'move clone built using Gnome technologies. It
 currently supports 1 and 2 player games, is levelcompatible with frozen bubble,
-and features svg vector graphics forresolution independent display.
-
+and features svg vector graphics for resolution independent display.
 
 
 %prep
-cat<<EOT
-
-Build disabled. Package is without maintainer.
-
-EOT
-exit 1
-
 %setup -q
+%patch0 -p1 -z .gstreamer
+%patch1 -p1 -z .fixes
+%{__sed} -i s/monkey-bubble-icon/monkey-bubble/ %{name}.desktop.in
 
 
 %build
+export CFLAGS="$RPM_OPT_FLAGS -Wno-pointer-sign"
 %configure --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}
 
-find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
-install -p -D -m0644 ./pixmaps/monkey-bubble-icon.xpm ${RPM_BUILD_ROOT}/%{_datadir}/pixmaps/monkey-bubble-icon.xpm
+# below is the desktop file and icon stuff.
 desktop-file-install --vendor fedora --delete-original \
   --dir ${RPM_BUILD_ROOT}%{_datadir}/applications      \
   --add-category X-Fedora                              \
@@ -57,41 +49,69 @@
   --add-category Game                                  \
   ${RPM_BUILD_ROOT}%{_datadir}/applications/%{name}.desktop
 
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
+mv ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/monkey-bubble-icon.png \
+  ${RPM_BUILD_ROOT}/%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+rmdir ${RPM_BUILD_ROOT}%{_datadir}/pixmaps
 
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
 
+%pre
+if [ "$1" -gt 1 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
+fi
 
 %post
-/sbin/ldconfig
-export GCONF_CONFIG_SOURCE="$(gconftool-2 --get-default-source)"
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/%{name}.schemas &>/dev/null
-
-
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+/usr/bin/gconftool-2 --makefile-install-rule \
+  %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
+scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+%preun
+if [ "$1" -eq 0 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
+fi
 
 %postun
-/sbin/ldconfig
-
+scrollkeeper-update -q || :
+touch --no-create %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog NEWS README
-%config %{_sysconfdir}/gconf/schemas/*
-%{_bindir}/monkey*
-%{_libdir}/*.*
+%config %{_sysconfdir}/gconf/schemas/%{name}.schemas
+%{_bindir}/monkey-*
 %{_datadir}/%{name}
+%{_datadir}/gnome
+%{_datadir}/omf
 %{_datadir}/applications/fedora-%{name}.desktop
-%{_datadir}/pixmaps/*
-
-%exclude %{_bindir}/gsttest
-%exclude %{_libdir}/*so
-
+%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 
 
 %changelog
+* Sat Apr 29 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 0.3.2-1
+- New upstream version 0.3.2
+- Add a patch to make it use gstreamer-0.10 instead of 0.8
+- Add a patch to fix some warnings
+- Properly install the icon
+- Fix the scripts to properly handle the GConf schemas and call
+  scrollkeeper-update. Don't call ldconfig as there is no lib.
+
 * Fri Nov 21 2003 Phillip Compton <pcompton[AT]proteinmedia.com> - 0:0.1.6-0.fdr.4
 - Drop .so files (for real this time).
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/monkey-bubble/FC-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:52:25 -0000	1.2
+++ sources	30 Apr 2006 22:01:31 -0000	1.3
@@ -1 +1 @@
-cba30bf4d1a33048cb9317b8893088c8  monkey-bubble-0.1.6.tar.gz
+37e91fa4cdbab9ec06b2ee2a5aa0683c  monkey-bubble-0.3.2.tar.gz



From fedora-extras-commits at redhat.com  Sun Apr 30 23:03:14 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sun, 30 Apr 2006 16:03:14 -0700
Subject: rpms/hevea/devel hevea.spec,1.1,1.2
Message-ID: <200604302303.k3UN3Gqw032501@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/hevea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32484

Modified Files:
	hevea.spec 
Log Message:
* Mon May 01 2006 Andreas Thienemann <andreas at bawue.net> - 1.08-5
- Typofix in %post



Index: hevea.spec
===================================================================
RCS file: /cvs/extras/rpms/hevea/devel/hevea.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hevea.spec	30 Apr 2006 16:30:03 -0000	1.1
+++ hevea.spec	30 Apr 2006 23:03:14 -0000	1.2
@@ -2,7 +2,7 @@
 
 Name:           hevea
 Version:        1.08
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        LaTeX to HTML translator
 Group:          Applications/Publishing
 License:        QPL
@@ -46,7 +46,7 @@
 rm -rf %{buildroot}
 
 
-%post -p /usr/bin/texhas
+%post -p /usr/bin/texhash
 
 
 %postun -p /usr/bin/texhash
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Mon May 01 2006 Andreas Thienemann <andreas at bawue.net> - 1.08-5
+- Typofix in %post
+
 * Sun Apr 30 2006 Andreas Thienemann <andreas at bawue.net> - 1.08-4
 - Included Requirements for imagen
 



From fedora-extras-commits at redhat.com  Sun Apr 30 23:04:46 2006
From: fedora-extras-commits at redhat.com (Andreas Thienemann (ixs))
Date: Sun, 30 Apr 2006 16:04:46 -0700
Subject: rpms/hevea/devel hevea.spec,1.2,1.3
Message-ID: <200604302304.k3UN4mV0032595@cvs-int.fedora.redhat.com>

Author: ixs

Update of /cvs/extras/rpms/hevea/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32578

Modified Files:
	hevea.spec 
Log Message:
Typofix 2



Index: hevea.spec
===================================================================
RCS file: /cvs/extras/rpms/hevea/devel/hevea.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- hevea.spec	30 Apr 2006 23:03:14 -0000	1.2
+++ hevea.spec	30 Apr 2006 23:04:46 -0000	1.3
@@ -14,8 +14,8 @@
 
 %description
 HEVEA is a quite complete and fast LATEX to HTML translator.
-HEVEA renders symbols by using the so-called HTML "entites", which modern
-browsers display those entities correctly most of the time.
+HEVEA renders symbols by using the so-called HTML "entites", which
+modern browsers display correctly most of the time.
 
 
 %prep



From fedora-extras-commits at redhat.com  Sun Apr 30 23:51:49 2006
From: fedora-extras-commits at redhat.com (Luke Macken (lmacken))
Date: Sun, 30 Apr 2006 16:51:49 -0700
Subject: rpms/valknut/devel valknut.desktop,1.1,1.2 valknut.spec,1.5,1.6
Message-ID: <200604302351.k3UNpplH000305@cvs-int.fedora.redhat.com>

Author: lmacken

Update of /cvs/extras/rpms/valknut/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32754

Modified Files:
	valknut.desktop valknut.spec 
Log Message:
execute with --disable-tray, since it is horribly broken


Index: valknut.desktop
===================================================================
RCS file: /cvs/extras/rpms/valknut/devel/valknut.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- valknut.desktop	4 Oct 2005 16:58:43 -0000	1.1
+++ valknut.desktop	30 Apr 2006 23:51:49 -0000	1.2
@@ -3,7 +3,7 @@
 Name=Valknut
 Comment=Direct Connect client
 Icon=valknut.png
-Exec=valknut
+Exec=valknut --disable-tray
 Terminal=false
 Type=Application
 Categories=Network;Application;X-Fedora;


Index: valknut.spec
===================================================================
RCS file: /cvs/extras/rpms/valknut/devel/valknut.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- valknut.spec	28 Feb 2006 18:57:35 -0000	1.5
+++ valknut.spec	30 Apr 2006 23:51:49 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           valknut
 Version:        0.3.7
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Valknut is a QT Direct Connect client
 
 Group:          Applications/Internet
@@ -58,6 +58,9 @@
 
 
 %changelog
+* Sun Apr 30 2006 Luke Macken <lmacken at redhat.com> 0.3.7-8
+- Execute with --disable-tray in desktop file, since it is horribly broken.
+
 * Tue Feb 28 2006 Luke Macken <lmacken at redhat.com> 0.3.7-7
 - Add patch to remove extra qualification build error